diff --git a/BUILDING.md b/BUILDING.md
index 83fbc72fdf..58d1a9d412 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -379,6 +379,12 @@ ctest -C Release -R testUsdShade -V
 
 See the [ctest documentation](https://cmake.org/cmake/help/latest/manual/ctest.1.html) for more options.
 
+##### Test Run Directories
+
+Each test is run out of an automatically-created temporary directory containing any additional files required by the test. Set the cmake
+option `PXR_TEST_RUN_TEMP_DIR_PREFIX` to prepend a prefix string to the name of these directories. For example, setting this option to
+"foo-" will create test run directories named "foo-<test dir>"
+
 ##### Diagnosing Failed Tests
 
 In order to aid with diagnosing of failing tests, test generated files for failing test are explicitly put in the following directories, where
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d37dcf43d..68e0ca21cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,629 @@
 # Change Log
 
+## [24.08] - 2024-07-25
+
+OpenUSD is now licensed under the Tomorrow Open Source Technology license. This
+is a renaming of the license, but the terms and conditions are the same as
+before. See [this forum post](https://forum.aousd.org/t/upcoming-openusd-license-update/1561) 
+for details.
+
+### Build
+
+- boost is now an optional dependency that is only required for building Python 
+  bindings. 
+  (PR: [#3028](https://github.com/PixarAnimationStudios/OpenUSD/pull/3028))
+
+- Added support for optionally building with oneTBB.
+  (PR: [#2457](https://github.com/PixarAnimationStudios/OpenUSD/pull/2457),
+   [#2458](https://github.com/PixarAnimationStudios/OpenUSD/pull/2458),
+   [#2459](https://github.com/PixarAnimationStudios/OpenUSD/pull/2459),
+   [#2462](https://github.com/PixarAnimationStudios/OpenUSD/pull/2462),
+   [#2463](https://github.com/PixarAnimationStudios/OpenUSD/pull/2463),
+   [#2464](https://github.com/PixarAnimationStudios/OpenUSD/pull/2464),
+   [#2465](https://github.com/PixarAnimationStudios/OpenUSD/pull/2465),
+   [#2466](https://github.com/PixarAnimationStudios/OpenUSD/pull/2466))
+
+- Various fixes and changes to build_usd.py:
+  - Added "--onetbb" option to use oneTBB instead of TBB.
+  - Added support for cross-compiling for iOS and visionOS.
+    (PR: [#2949](https://github.com/PixarAnimationStudios/OpenUSD/pull/2949), 
+     [#2950](https://github.com/PixarAnimationStudios/OpenUSD/pull/2950), 
+     [#3052](https://github.com/PixarAnimationStudios/OpenUSD/pull/3052))
+  - Disabled argument abbreviations. For example, "--debug" will no longer match 
+    "--debug-python".
+  - Updated to build with MaterialX v1.38.10.
+
+- Added support for Python 3.12 and deprecated support for 3.6 for usd-core
+  PyPI package.
+
+- Added the build type to the absolute path used to store the PCH result, 
+  preventing Debug/Release PCH files from over-writing each other causing linker 
+  issues.
+  (PR: [#2698](https://github.com/PixarAnimationStudios/OpenUSD/pull/2698))
+
+- Fixed absolute paths to GL libraries and libm.so in pxrConfig.cmake.
+  (PR: [#2827](https://github.com/PixarAnimationStudios/OpenUSD/pull/2827),
+   [#2796](https://github.com/PixarAnimationStudios/OpenUSD/pull/2796))
+
+- Added support for MSVC's standards-conformant preprocessor.
+  (PR: [#2990](https://github.com/PixarAnimationStudios/OpenUSD/pull/2990))
+
+- Added the ability to set a string prefix for test run temp directory names.
+
+### USD
+
+- Continued progress on namespace editing:
+  - Completed the work of adding relocates composition.
+  - UsdNamespaceEditor can now handle moving and deleting prims with opinions 
+    across composition arcs by authoring relocates.
+
+- Various updates for UsdCollectionAPI and path expressions:
+  - Allow leading & trailing whitespace in the SdfPathExpression constructor.
+  - Added PathExpression complement-of-complement cancellation.
+  - Allow path patterns that start with '//' to pass unchanged through both 
+    PcpMapFunction and UsdStage's prototype-to-instance path mapping.
+  - Added missing Python bindings for 
+    UsdCollectionMembershipQuery::UsesPathExpansionRuleMap and 
+    UsdCollectionAPI::ResolveCompleteMembershipExpression().
+  - Added UsdComputePathExpressionFromCollectionMembershipQueryRuleMap()
+    which computes an SdfPathExpression that matches the same paths as the
+    given UsdCollectionMembershipQuery::PathExpansionRuleMap.
+  - Allow PathExpression atoms to be constructed from SdfPaths directly.
+
+- Completed the first phase of the 
+[UsdValidation framework](https://github.com/PixarAnimationStudios/OpenUSD-proposals/tree/5a3c03b339db80052e45d2bda768ac0327653cb6/proposals/usd-validation-framework). 
+Users can now register UsdValidator validation functions with the 
+UsdValidationRegistry. Validation functions can be invoked by 
+UsdValidator::Validate() and will return any UsdValidationErrors. The following 
+validators were also added:
+  - CompositionErrorTest validator, which reports composition errors on a stage.
+  - UsdShade ShaderPropertyTypeConformance validator, which reports various 
+    errors associated with UsdShadeShader and SdrShader compliance.
+
+- Added TraceReporter::LoadReport(), which can be used to read reports generated 
+  by TraceReporters.
+
+- Added TfMallocTag::CallTree::LoadReport(), which can be used to read malloc 
+  tag reports generated by calling TfMallocTag::CallTree::Report().
+
+- Changed TfNormPath's and TfRealPath's behavior to match Python os.normpath and 
+  os.realpath. In particular, the casing of drive letters on Windows will be 
+  retained instead of forced to lower-case.
+  (Issue: [#3020](https://github.com/PixarAnimationStudios/OpenUSD/issues/3020))
+
+- Deprecated functions on GfMatrix{2,3,4}d and GfRotation that take and return 
+  GfVec3f values as they can potentially result in loss of precision. These 
+  functions will be removed in a subsequent release.
+ 
+- Added GfColor and GfColorSpace to represent colors and provide color
+  space transformations. This includes a set of built-in color spaces that
+  are always known to USD. Note that as before, USD represents colors
+  in scene description as float3, and properties and attributes may have
+  an associated color space token.
+
+- URI schemes used by Ar URI resolvers must now conform to the character set 
+  requirements in RFC2396. Support for the environment variable 
+  PXR_AR_DISABLE_STRICT_SCHEME_VALIDATION has been removed. Support for 
+  non-compliant schemes was deprecated in 23.11. 
+  (PR: [#2997](https://github.com/PixarAnimationStudios/OpenUSD/pull/2997))
+
+- Added support for sub-root default prims.
+  (Issue: [#2951](https://github.com/PixarAnimationStudios/OpenUSD/issues/2951))
+
+- Added a named sentinel value that is returned from SdfListProxy::Find when the 
+  value is not present in the list of operations.
+
+- Fixed an issue in PcpMapFunction where some functions wouldn't compose 
+  correctly.
+
+- Compose dynamic file format arguments through all non-dynamic arcs, which 
+  allows variant selections to impact dynamic payload arguments.
+
+- Added SdrShaderNode::CheckCompliance static method which checks if the same 
+  named properties of a given SdrShaderNode have matching types and default 
+  values.
+
+- usdGenSchema now correctly generates code when namespaces are used in a 
+  propertyNamespacePrefix.
+  (PR: [#3090](https://github.com/PixarAnimationStudios/OpenUSD/pull/3090))
+
+- We are deprecating the inclusion of API documentation in the "documentation" 
+  field of the schema prim and property definitions. This will be fully removed 
+  in 24.11.
+
+- Fixed issue with concurrent schema registry initialization and the Python GIL.
+  (Issue: [#3087](https://github.com/PixarAnimationStudios/OpenUSD/issues/3087))
+
+- Added UsdStage::GetAllCompositionErrors() for retrieving composition errors
+  for all prims and layer stacks on the stage.
+
+- Added UsdGeomBasisCurves::ComputeSegmentCounts().
+
+- Fixed the code for calculating mesh points on Capsule_1 prims with different 
+  bottom and top radii. 
+  (PR: [#3129](https://github.com/PixarAnimationStudios/OpenUSD/pull/3129))
+
+- UsdRenderPass schema refinements:
+  - Removed lightsRenderVisibility and geomRenderVisibility to consolidate with 
+    the existing renderVisibility collection.
+  - Specify that renderVisibility and cameraVisibility only apply to 
+    "renderable" prims, defined as geometry and lights but not render settings 
+    related types such as display or sample filters (which do otherwise obey the 
+    Hydra visibility schema). If a render pass intends to remove such types, a 
+    prune collection should be used instead.
+  - renderVisibility and cameraVisibility can only make scene objects invisible; 
+    they cannot make invisible objects visible again. The intuitive basis for 
+    this is that render pass visibility is used to partition the upstream scene, 
+    not to pull hidden things back into view.
+
+- Added 'deepRaster' to the allowed tokens list for the UsdRenderProduct's 
+  productType attribute.
+
+- Added an option to UsdUtilsModifyAssetPaths which will preserve the length of 
+  asset array attributes/metadata when empty paths are present or the modify 
+  function returns an empty string.
+  (Issue: [#3060](https://github.com/PixarAnimationStudios/OpenUSD/issues/3060), 
+   PR: [#3063](https://github.com/PixarAnimationStudios/OpenUSD/pull/3063))
+
+### Hydra
+
+- **Important**: HgiGL now defaults to using nearest sampling and not enabling 
+  anisotropic filtering for depth and stencil textures.
+
+- **Important**: Fixed a bug in the HdMergingSceneIndex that was not properly 
+  re-adding prims when removed in another input scene.
+
+- Added native support for .avif image files via the new hioAvif plugin. This 
+  plugin only supports reading these image files.
+
+- Optimized removal of rprims from HdRenderIndex. These changes improved many 
+  of the examples in the performance test by more than 100x.
+
+- HdxSelectionSceneIndexObserver::SetSceneIndex() now populates its initial 
+  selection in parallel, improving performance for consumers such as 
+  HdxColorizeSelectionTask::Prepare().
+
+- Certain Hdx task types now internally retain the GLSLFX form of their shaders 
+  to avoid re-parsing them each time a task is constructed. This improves
+  render startup time. 
+
+- Made change to ensure that HdsiPinnedCurveExpandingSceneIndex does not pull on 
+  the basisCurves schema when asked for unrelated scene index keys. This was 
+  causing a performance hit in the presence of generative procedurals producing 
+  curve data.
+
+- The Hydra Scene Browser can now display SdfPathVector values.  
+
+- Added Hydra schema for render passes. Added activeRenderPassPrim to 
+  HdSceneGlobals schema. Added render pass support to UsdImaging (when in scene 
+  index mode).
+
+- HdxFullscreenShader now supports specifying samplers for any textures bound 
+  to it.
+
+- HdGetSamplerParameters has a new overload that operates on a std::map.
+
+- Added current frame to the scene globals scene index and render settings 
+  schemas, and updated Prman to use this ri:Frame attribute.
+
+- Fixed the transformation of camera lights when using a scene camera for 
+  renderers other than Storm.
+
+- Updated TetMesh to use surfaceFaceVertexIndices instead of the 
+  tetVertexIndices.
+
+- Removed down cast of world space hit point in HdxPickHit.
+
+- Added HdUtils::ConvertHdMaterialNetworkToHdMaterialSchema() and 
+  ConvertHdMaterialNetworkToHdMaterialNetworkSchema().
+
+- Added HdEncapsulatingSceneIndex. The mix-in class allows inspection tools to 
+  traverse the directed acyclic graph of scene indices at different levels of 
+  detail. Note that hdui is not (yet) aware of encapsulating scenes and thus 
+  their use is protected by an env var. The use of encapsulating scene indices 
+  will eventually make env vars such as 
+  USDIMAGING_SHOW_POINT_PROTOTYPE_SCENE_INDICES unnecessary.
+
+- In HdSceneDelegate added overloads of SampleFOO methods explicitly taking the 
+  sampling interval as startTime and endTime. HdSceneIndexAdapterSceneDelegate 
+  is passing these arguments to 
+  HdSampledDataSource::GetContributingSampleTimesForInterval. This will allow us 
+  to get rid of HdPrman_MotionBlurSceneIndexPlugin::SetShutterInterval and the 
+  associated global variables in the future.
+
+- Moved HdTextureType out of Hydra core into Storm.
+
+- Added support to provide finer grained invalidation for light filter prims in 
+  emulation.
+
+- Added HdsiLightLinkingSceneIndex to implement light linking semantics in a 
+  scene index.
+
+- Fixed a bug in the evaluation of path expressions for collections with pruning 
+  semantics.
+
+- Fixed backend emulation handling of PrimsAdded messages for already-populated 
+  prims, to properly resync them.
+
+- Fixed a theoretical bug in HdDirtyList that would leave stale render tag prim 
+  state if Sync() was called without any render tags activated.
+
+- Fixed a linking error some builds would hit related to 
+  HdRenderIndex::InsertTask<T>.
+  (PR: [#3000](https://github.com/PixarAnimationStudios/OpenUSD/pull/3000))
+
+- Added missing <algorithm> include to several files.
+  (PR: [#3021](https://github.com/PixarAnimationStudios/OpenUSD/pull/3021))
+
+- Fixed a comment on the struct definition of HdDisplayStyle.
+  (Issue: [#3033](https://github.com/PixarAnimationStudios/OpenUSD/issues/3033))
+
+- Made HdRendererPluginRegistry more consistent about setting display name 
+  correctly, and added an HD_RENDERER_PLUGINS debug flag.
+
+- Added API tags to the pxr/imaging/hdui library.
+  (PR: [#2689](https://github.com/PixarAnimationStudios/OpenUSD/pull/2689))
+
+- Added a debug flag to provide detail when Hgi::IsBackendSupported() returns 
+  false.
+
+- Optimized HdSceneIndexAdapterSceneDelegate's usage of SdfPathTable to be more 
+  correct and cache-friendly.
+
+- Added deep picking support to HdxPickTask, via the "resolveDeep" resolve mode 
+  which is similar to "resolveUnique" but also includes results that are 
+  occluded in a typical id-render. 
+  (PR: [#3044](https://github.com/PixarAnimationStudios/OpenUSD/pull/3044)).
+
+- Updated stb_image to 2.29, and stb_image_resize to 2.07.
+  (PR: [#2880](https://github.com/PixarAnimationStudios/OpenUSD/pull/2880))
+
+- Added defensive coding in HioOIIOImage and switched int for size_t where 
+  appropriate 
+  (PR: [#3119](https://github.com/PixarAnimationStudios/OpenUSD/pull/3119))
+
+- When calling HdSceneDelegate::SamplePrimvar() for a time-varying primvar when 
+  the time sampling interval's start or end time falls between authored sample 
+  times, the bracketing authored sample times are now included in the output. 
+  Previously, only authored sample times within the interval were included, 
+  along with interpolated values at the interval start and end, as needed.
+  For example, if the primvar has authored values at T = [1, 2, 3], and the 
+  sampling interval is [1.5, 2.5], the new behavior provides the authored values 
+  at T =  [1, 2, 3], whereas the old behavior would provide values at 
+  T = [1.5, 2, 2.5], with the values at 1.5 and 2.5 being linear interpolations 
+  between the adjacent authored values.
+
+- The behavior of HdSampledDataSource::GetContributingSampleTimesForInterval() 
+  for data sources coming out of UsdImaging has been corrected consistent with 
+  the change to HdSceneDelegate::SamplePrimvar() described above. 
+
+- HdsiVelocityMotionResolvingSceneIndex, a reference implementation of USD 
+  velocity-based motion, has been added to the Hydra scene index library. It has 
+  been added to the Storm renderer, but is not a part of the UsdImaging default 
+  scene index stack.
+
+- HdGeomSubsetsSchema (plural 'Subsets') has been removed. In Hydra 2, geom 
+  subsets are no longer properties of the parent geometry. They now traverse the 
+  Hydra 2 scene indices as child prims of the parent geometry, so this schema is 
+  no longer required. This change should be transparent to consumers of the 
+  legacy HdSceneDelegate interface, but authors of Hydra 2 scene indices that 
+  need to be subset-aware will need to revise their implementations.
+
+- HdGeomSubsetSchema (singular 'Subset') now has a non-empty default locator, 
+  consistent with subsets' promotion from properties to prims. Data sources for 
+  geom subset fields will now be found under the "geomSubset" property of the 
+  geom subset prim, rather than at the top level of the prim. 
+  This change should be transparent to consumers of the legacy HdSceneDelegate 
+  interface.  
+
+### UsdImaging
+
+- Fixed an issue when scene lights are enabled and disabled.
+
+- Made fix to assign ReplacePrefix() return value to newLocators when changing 
+  directMaterialBindings locators to materialBindings locators.
+
+- Made sure the results of UsdImagingStageSceneIndex's GetPrim and 
+  GetChildPrim are consistent by using the same prim predicate.
+
+- UsdImagingDataSourceCustomPrimvars no longer stores attribute queries in a map 
+  but creates it every time a particular primvar is queried. This fixes a bug 
+  where a client would not see a primvar that has an authored value now but had 
+  no authored value when the primvars container was retrieved by the client. 
+  More generally, it also fixes bugs where the resolution info in the previous 
+  attribute query is no longer valid.
+
+- Replaced UsdImagingDataSourceSchemaBased with the more flexible 
+  UsdImagingDataSourceMapped.
+
+- Transport USD collections as data sources when using the stage scene index.  
+
+- Fixed performance issue where UsdImagingFieldAdapter would unnecessarily 
+  compute the total number of time samples for attributes, which could cause 
+  all value clip layers to be loaded.
+
+- Fixed sizing of result array when calling GetScenePrimPaths with some invalid 
+  instance indices.
+  (PR: [#2960](https://github.com/PixarAnimationStudios/OpenUSD/pull/2960))
+
+- Added imaging transport for uniform and constant primvars on 
+  UsdGeomPointInstancer, and fixed transport of "velocities", "accelerations", 
+  and "angularVelocities" on point instancers.
+  (PR: [#1731](https://github.com/PixarAnimationStudios/OpenUSD/pull/1731), 
+   [#1734](https://github.com/PixarAnimationStudios/OpenUSD/pull/1734))
+
+- Added null-prim checks when computing Hydra materials.
+  (PR: [#2930](https://github.com/PixarAnimationStudios/OpenUSD/pull/2930))
+
+- Fixed incorrect API tags in UsdSkelImaging and UsdVolImaging.
+  (PR: [#2691](https://github.com/PixarAnimationStudios/OpenUSD/pull/2691))
+
+- Added StageSceneIndex support for UsdLuxCylinderLight, and fixed support for 
+  UsdGeomSubset.
+
+- Fixed UsdImagingGLEngine::TestIntersection instancing-related out-params when 
+  using StageSceneIndex.
+
+- Ratcheted usdImagingGL test thresholds.
+  (PR: [#2970](https://github.com/PixarAnimationStudios/OpenUSD/pull/2970))
+
+- Fixed a bug where UsdImagingDelegate would sometimes end up with duplicate 
+  primvar entries.
+  (PR: [#2096](https://github.com/PixarAnimationStudios/OpenUSD/pull/2096))
+
+- Added StageSceneIndex invalidation support for UsdVolField prims.
+
+- Fixed UsdImagingGLEngine::DecodeIntersection when using StageSceneIndex
+
+- Added a new version of UsdImagingGL::TestIntersection that takes resolve mode, 
+  and returns a result vector instead of a single result.
+  (PR: [#3044](https://github.com/PixarAnimationStudios/OpenUSD/pull/3044))
+
+- UsdImagingPrimAdapter::SamplePrimvar() now includes bracketing authored sample 
+  times in certain scenarios, similar to the updated behavior of 
+  HdSceneDelegate::SamplePrimvar() described above.
+
+- Point instancer prototype prims are now relocated as children of the point 
+  instancer, rather than properties of it. Previously, each drawable leaf prim 
+  within the prototype of a point instancer was relocated as a direct child of 
+  the point instancer, but with a property path of the form 
+  `.proto0_<name>_id0`. This property form of path precluded the relocated 
+  prototype prim from having child prims of its own. The promotion of geom 
+  subsets from properties to prims therefore required also promoting the 
+  relocated prototype prims from property paths to prim paths.
+
+### Storm
+
+- Updated the default compute shader local size to (64, 1, 1) for compute 
+  shaders executed for GPU ext computations and the frustum culling compute 
+  pipeline.
+
+- Improved shader interstage slot calculation for Hgi resource generation, 
+  reducing the total number of interstage locations needed, and accounting for 
+  resources that take up more than one slot. Fixed adaptive subdivision shader 
+  compilation when using HgiVulkan.
+
+- Added function Hgi::CreateNamedHgi, which can be used to create a specific Hgi 
+  instance given a valid Hgi token. 
+  (PR: [#2850](https://github.com/PixarAnimationStudios/OpenUSD/pull/2850))
+
+- Use HgiHandle unique id in hashes rather than the pointer address, as the 
+  latter can be reused between different objects.
+
+- Added tests testHgiGL and testHgiVulkan.
+
+- Various HgiVulkan fixes and improvements:
+  - Improved handling of Vulkan viewport. Rather than flipping the Vulkan 
+    viewport in the Y-direction, instead allow the geometry to render upside 
+    down by using the same projection matrix and viewport used for OpenGL, but 
+    flipping the winding order. This change greatly simplifies and circumvents 
+    coordinate system differences between Vulkan and other graphics backends in 
+    Storm. 
+  - Added MaterialX support for Vulkan, using MaterialX::VkShaderGenerator.
+  - Added implementations for HgiVulkanBlitCmds::CopyTextureToBuffer and 
+    CopyBufferToTexture.
+  - Fixed a bug in HgiVulkanBlitCmds::CopyBufferGpuToCpu.
+  - Fixed bugs around HgiVulkan access masks for layout transition barriers.
+  - Added correct read usage flags for depth and stencil buffers in Vulkan.
+  - Fixed color correction shader and volume shader compilation bugs for Vulkan.
+
+- Fixed the behavior of HgiSubmitWaitTypeWaitUntilCompleted when submitting 
+  command buffers on Metal.
+  (PR: [#2794](https://github.com/PixarAnimationStudios/OpenUSD/pull/2794))
+
+- Fixed shading with Metal when geometry is flipped (e.g. scale -1,1,1).
+  (Issue: [#2536](https://github.com/PixarAnimationStudios/OpenUSD/issues/2536))
+
+- Fixed MaterialX shader gen for EDF type declarations.
+  (Issue: [#3049](https://github.com/PixarAnimationStudios/OpenUSD/issues/3049), 
+   [#3105](https://github.com/PixarAnimationStudios/OpenUSD/issues/3105), 
+   PR: [#3106](https://github.com/PixarAnimationStudios/OpenUSD/pull/3106))
+
+- Fixed Ptex GLSL layout sampler declaration and binding.
+
+- Fixed adaptive tessellation of subdivision surfaces to avoid 
+  under-tessellation artifacts.
+  (Issue: [#2981](https://github.com/PixarAnimationStudios/OpenUSD/issues/2981))
+
+- Fixed subdivision surface refinement of faceVarying primvar to avoid crashes 
+  when the faceVarying primvar topology is invalid.
+
+- Fixed an issue pulling fallback values from Sdr that was affecting material 
+  wrap modes, among others.
+  (PR: [#2519](https://github.com/PixarAnimationStudios/OpenUSD/pull/2519))
+
+- Fixed incorrect GPU skinning of meshes with blendshapes but no skeleton.
+  (Issue: [#2425](https://github.com/PixarAnimationStudios/OpenUSD/issues/2425),
+   PR: [#2696](https://github.com/PixarAnimationStudios/OpenUSD/pull/2696))
+
+- Added NAN guards to dome light convolution shader.
+  (PR: [#2383](https://github.com/PixarAnimationStudios/OpenUSD/pull/2383))
+
+- Fixed a bug where some BasisCurves pipelines were applying color overrides 
+  twice.
+  (PR: [#3124](https://github.com/PixarAnimationStudios/OpenUSD/pull/3124))
+
+- Storm now supports velocity-based motion of points-based geometry and point 
+  instances consistent with the USD velocity motion specification. 
+  Velocity-based motion will now be correctly applied to geometry points and to 
+  point instance positions and rotations at subframe sample times. Note that 
+  velocity-based motion is intended primarily for subframe sampling and should 
+  not be used as a physics engine or as a substitute for definitive, authored, 
+  per-frame position data. 
+  (Issue: [#2571](https://github.com/PixarAnimationStudios/OpenUSD/issues/2571))
+
+### RenderMan Hydra Plugin
+
+- hdPrman for RenderMan 25 is deprecated. Support for hdPrman for RenderMan 25 
+  will be removed in the 24.11 release.
+
+- Updated usdRiPxr to include schemas for Renderman 26.1. Also updated usdRiPxr 
+  CMakeLists to gather bundled schemas from yet to be released Renderman 26.2 
+  and above.
+
+- Added code to take advantage of new display APIs for RenderMan 26 and also 
+  add #ifdefs so that building against RenderMan 25 still works.
+
+- Fixed an issue where gprim Sync() would cause extra rounds of edit requests 
+  to the Riley API, stopping & restarting the render even when there were no 
+  actual edits required. 
+
+- RenderMan requires Ri:Frame to be an integer so force it to int(floor(time)).  
+  This ensures that it produces an independent sampling sequence per integer 
+  frame.
+
+- HdPrman now supports field-less RiVolume primitives. These are used for 
+  homogeneous fog volumes which do not require voxel data. Field-less volumes 
+  need the standard RenderMan parameters, Ri:type and Ri:Bounds.  
+
+- HdPrman now applies the render pass specified byHdSceneGlobalsSchema using an 
+  internal RenderPassSceneIndex.
+
+- Fixed a bug where a crash could occur when AOV names are received as a string 
+  rather than a TfToken.
+
+- Added support for usdRiPxr's PxrCameraAPI schema. This required a 
+  corresponding adapter in usdRiPxrImaging as well as removing the default 
+  values for shutterOpen/shutterClose/shutterOpening in hdPrman. The old default 
+  values were hard-coded and different between the interactive and 
+  non-interactive modes.
+
+- Removed code to dirty all rprims in 
+  HdPrmanRenderDelegate::SetRenderSetting("renderCameraPath", value). This is a 
+  performance improvement when switching cameras. However, it also means that 
+  clients of hdPrman need to invalidate all animated primvars if the shutter 
+  interval between the old and new camera is different. Note that even before 
+  the change, clients need to invalidate all animated primvars if the shutter 
+  interval changes for reasons other than the camera path changing. This 
+  behavior of hdPrman might be revisited in the future.
+
+- Register scene index plugin to perform light linking when the light linking 
+  collections are transported. For legacy clients (e.g. UsdImagingDelegate) that 
+  don't transport collections, light linking is performed at the scene delegate 
+  end and this scene index should not affect that behavior.
+
+- Improved determination of the display driver to factor the product type.
+
+- Renamed rtx_glfImage to rtx_hioImage.
+
+- Added RMAN_DISPLAYPATH environment variable to populate 3rd-party RenderMan 
+  display driver search paths.
+
+- Added HDPRMAN_TESSELLATE_IMPLICIT_SURFACES environment variable to make 
+  hdPrman tessellated implicit surfaces into meshes rather than use builtin 
+  representations.
+
+- PxrPathTracer support for purpose-based visibility has been temporarily 
+  removed, as it could cause unexpected problems for lights. An improved 
+  approach to this feature is now available via PbsPathTracer and will be 
+  applied to PxrPathTracer in a future release of RenderMan.
+
+### MaterialX
+
+- Added support for MaterialX v1.38.10.
+
+- Added the ability to control Dome Light intensity with MaterialX materials.
+
+- Fixed MaterialX shader generation for simple surface shaders like 
+  ND_convert_color3_surfaceshader.
+  (PR: [#3045](https://github.com/PixarAnimationStudios/OpenUSD/pull/3045))
+
+- Added traces to hdMtlx.
+  (PR: [#2665](https://github.com/PixarAnimationStudios/OpenUSD/pull/2665))
+
+- Fixed MaterialX shader objects getting garbage collected too early.
+  (PR: [#3051](https://github.com/PixarAnimationStudios/OpenUSD/pull/3051))
+
+- Fixed MaterialX material tag detection for glTF PBR.
+  (Issue: [#1882](https://github.com/PixarAnimationStudios/OpenUSD/issues/1882),
+   PR: [#3069](https://github.com/PixarAnimationStudios/OpenUSD/pull/3069))
+
+- Optimized MaterialX shader generation and reuse; improved material tag 
+  detection; added support for triplanar texture nodes.
+  (Issue: [#2330](https://github.com/PixarAnimationStudios/OpenUSD/issues/2330), 
+   [#3004](https://github.com/PixarAnimationStudios/OpenUSD/issues/3004), 
+   PR: [#3073](https://github.com/PixarAnimationStudios/OpenUSD/pull/3073))
+
+### usdrecord
+
+- Updated to support specifying an active render pass, which is set in 
+  HdsiSceneGlobalSceneIndex for use within Hydra.
+
+- Updated to use the startTimeCode from the USD stage as the default 
+  time code.
+
+- Changed default dome light camera visibility to false, and added an 
+  "--enableDomeLightVisibility" flag.
+  (PR: [#2352](https://github.com/PixarAnimationStudios/OpenUSD/pull/2352))
+
+### usdview 
+
+- Added the 'bboxStandin' command line argument to allow for unloaded prims to 
+  be displayed by their bounding boxes.
+  (Issue: [#2720](https://github.com/PixarAnimationStudios/OpenUSD/issues/2720))
+
+- Added workaround for issue in PySide that can cause the viewport to 
+  render incorrectly.
+  (Issue: [#2996](https://github.com/PixarAnimationStudios/OpenUSD/issues/2996), 
+   [#3009](https://github.com/PixarAnimationStudios/OpenUSD/issues/3009))
+
+- Added a keyboard shortcut (Ctrl + Shift + R) to reload stage.
+
+- Refactored Usdviewq.Launcher to make it easier to extend, e.g. by testusdview.
+
+- Fixed a bug in layer stack view when the root layer stack contained both muted 
+  and unloaded sublayers.
+
+- Fixed an issue where the OCIO menus would occasionally select an invalid 
+  colorspace, for certain OCIO configurations.
+  (PR: [#3017](https://github.com/PixarAnimationStudios/OpenUSD/pull/3017))
+
+### Documentation
+
+- Added infrastructure and [usdVol example content](https://openusd.org/release/user_guides/schemas/usdVol/usdVol_toc.html)
+  for a new schema user documentation process. User documentation can be added 
+  to schema definition files, using Markdown format. User documentation will be 
+  processed by usdGenSchema and added to the schema registry. User documentation 
+  can also be generated into HTML output using a script that generates 
+  Sphinx-compatible content files. See "Generating Schema User Docs" in 
+  docs/README.md for more details. 
+
+- Added new [testing guidelines](https://openusd.org/release/api/_page__testing__guidelines.html) 
+  and [code guidelines](https://openusd.org/release/api/_page__coding__guidelines.html) 
+  to documentation.
+
+- Added new [Collections and Patterns](https://openusd.org/release/user_guides/collections_and_patterns.html) 
+  user guide to documentation.
+
+- Made clarifications to Hydra 2.0 Getting Started Guide.
+
+- Revised UsdCollectionAPI documentation to explain what makes an instance be
+  in relationship-mode vs expression-mode, and how the built-in properties 
+  affect membership determination in each mode.
+ 
+<details open>
+  <summary><b>Previous Releases</b></summary>
+
 ## [24.05] - 2024-04-19
 
 ### Build
@@ -360,9 +984,6 @@
     (PR: [#2974](https://github.com/PixarAnimationStudios/OpenUSD/pull/2974))
   - Added some additional documentation for using Vulkan.
 
-<details open>
-  <summary><b>Previous Releases</b></summary>
-
 ## [24.03] - 2024-02-23
 
 ### Build
diff --git a/LICENSE.txt b/LICENSE.txt
index 2341d8e8bc..a2cdda092e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,12 @@
+============================================================
+OpenUSD
+============================================================
 
-                               Modified Apache 2.0 License
+Note: The Tomorrow Open Source Technology License 1.0 differs from the 
+original Apache License 2.0 in the following manner. Section 6 ("Trademarks") 
+is different.
 
+TOMORROW OPEN SOURCE TECHNOLOGY LICENSE 1.0
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -679,7 +685,7 @@ The Art of C++ : PEGTL (Parsing Expression Grammar Template Library)
 
 The MIT License (MIT)
 
-Copyright (c) 2007-2020 Dr. Colin Hirsch and Daniel Frey
+Copyright (c) 2007-2022 Dr. Colin Hirsch and Daniel Frey
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -699,31 +705,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-================================================================
-invoke.hpp
-================================================================
-
-MIT License
-
-Copyright (C) 2018-2023, by Matvey Cherevko (blackmatov@gmail.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 ================================================================
 Doxygen Awesome
 ================================================================
@@ -748,4 +729,124 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
+
+================================================================
+LibAvif v1.0.4
+================================================================
+
+Copyright 2019 Joe Drago. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================
+AVIF/src/obu.c, renamed in this repository as AVIF/src/avif_obu.c
+================================================================
+
+Copyright © 2018-2019, VideoLAN and dav1d authors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================
+AVIF/third_party/libyuv/*
+================================================================
+
+Copyright 2011 The LibYuv Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================
+libaom
+================================================================
+
+Copyright (c) 2016, Alliance for Open Media. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 77a2b28646..19ad9ce782 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@ Supported Platforms
 USD is primarily developed on Linux platforms (CentOS 7), but is built, tested 
 and supported on macOS and Windows.
 
+It is also possible to build USD libraries that can be embedded
+in iOS and visionOS apps.
+
 Please see [VERSIONS.md](VERSIONS.md) for explicitly tested versions. 
 
 Dependencies
@@ -46,12 +49,8 @@ Dependencies
 Required:
  - C/C++ compiler
  - [CMake](https://cmake.org/documentation/)
- - [Boost](https://boost.org)
  - [Intel TBB](https://www.threadingbuildingblocks.org/)
 
-Optional:
- - [Python](https://python.org)
-
 See [3rd Party Library and Application Versions](VERSIONS.md) for version information.
 
 Additional dependencies are required for the following components. These 
@@ -70,10 +69,16 @@ Optional:
  - [OSL (OpenShadingLanguage)](https://github.com/imageworks/OpenShadingLanguage)
  - [Ptex](http://ptex.us/)                          
 
-**usdview**
+**Python Bindings**
 
 Required:
+ - [Python](https://python.org)
+ - [Boost](https://boost.org)
+
+**usdview**
 
+Required:
+ - Python bindings
  - [PySide6](http://wiki.qt.io/PySide6) or [PySide2](http://wiki.qt.io/PySide2)
  - [PyOpenGL](https://pypi.python.org/pypi/PyOpenGL/)
 
@@ -129,7 +134,7 @@ then build and install USD into `/path/to/my_usd_install_dir`.
 > python OpenUSD/build_scripts/build_usd.py /path/to/my_usd_install_dir
 ```
 
-##### MacOS:
+##### macOS:
 
 In a terminal, run `xcode-select` to ensure command line developer tools are
 installed. Then run the script.
@@ -141,6 +146,33 @@ then build and install USD into `/path/to/my_usd_install_dir`.
 > python OpenUSD/build_scripts/build_usd.py /path/to/my_usd_install_dir
 ```
 
+##### iOS and visionOS:
+
+When building from a macOS system, you can cross compile
+for iOS based platforms.
+
+Cross compilation builds are restricted to building libraries that can be
+embedded in applications built for the target platform. It can be helpful
+to use a monolithic build when embedding USD
+(see [Advanced Build Configuration](BUILDING.md)).
+
+These builds do not support Python bindings or command line tools.
+
+Currently, these builds also do not support Imaging or USD Imaging.
+
+For example, the following will download, build, and install USD's dependencies,
+then build and install USD for iOS into `/path/to/my_usd_install_dir`.
+
+```
+> python OpenUSD/build_scripts/build_usd.py --build-target iOS --build-monolithic /path/to/my_usd_install_dir
+```
+
+Or for visionOS:
+
+```
+> python OpenUSD/build_scripts/build_usd.py --build-target visionOS --build-monolithic /path/to/my_usd_install_dir
+```
+
 ##### Windows:
 
 Launch the "x64 Native Tools Command Prompt" for your version of Visual Studio
diff --git a/VERSIONS.md b/VERSIONS.md
index 72bc5a8e85..c3caf2ed56 100644
--- a/VERSIONS.md
+++ b/VERSIONS.md
@@ -13,8 +13,8 @@ Our test machines have the following software versions installed.
 
 | Software      | Linux                | macOS                        | Windows                        |
 | ------------- | -------------------- | ---------------------------- | ------------------------------ |
-| OS            | CentOS Linux 7       | 12.6.3                       | Windows 10                     |
-| C++ Compiler  | gcc 9.3.1            | Apple clang 13.1.6 (Xcode 13.3) | Visual Studio 2017 15.9     |
+| OS            | CentOS Linux 7       | 12.6.3, 14.5 for visionOS  | Windows 10                     |
+| C++ Compiler  | gcc 9.3.1            | Apple clang 13.1.6 (Xcode 13.3)<br>Apple clang 15.0.0 (Xcode 15.4) for visionOS | Visual Studio 2017 15.9     |
 | CMake         | 3.17.5               | 3.19.5                       | 3.25.3                         |
 | Python        | 3.9.16               | 3.9.13                       | 3.9.13                         |
 | Boost         | 1.76.0               | 1.78.0                       | 1.76.0                         |
@@ -30,7 +30,7 @@ Our test machines have the following software versions installed.
 | RenderMan     | 25.3                 | 25.3                         | 25.3                           |
 | Alembic       | 1.8.5                | 1.8.5                        | 1.8.5                          |
 | OpenEXR       | 3.1.11               | 3.1.11                       | 3.1.11                         |
-| MaterialX     | 1.38.8               | 1.38.8                       | 1.38.8                         |
+| MaterialX     | 1.38.10              | 1.38.10                      | 1.38.10                        |
 | Jinja2        | 2.0                  |                              |                                |
 | Flex          | 2.5.39               |                              |                                |
 | Bison         | 2.4.1                |                              |                                |
diff --git a/azure-pypi-pipeline.yml b/azure-pypi-pipeline.yml
index f7f4d5dfa9..23a20bfad7 100644
--- a/azure-pypi-pipeline.yml
+++ b/azure-pypi-pipeline.yml
@@ -63,6 +63,9 @@ stages:
         Python311:
           PYTHON_INTERPRETER: /opt/python/cp311-cp311/bin/python
           PYTHON_TAG: cp311
+        Python312:
+          PYTHON_INTERPRETER: /opt/python/cp312-cp312/bin/python
+          PYTHON_TAG: cp312
     timeoutInMinutes: 90
     pool:
       vmImage: Ubuntu-20.04
@@ -134,6 +137,9 @@ stages:
         Python311:
           PYTHON_VERSION_SPEC: 3.11
           PYTHON_TAG: cp311
+        Python312:
+          PYTHON_VERSION_SPEC: 3.12
+          PYTHON_TAG: cp312
     timeoutInMinutes: 90
     pool:
       vmImage: 'windows-2019'
@@ -158,7 +164,7 @@ stages:
         dir D:\packaging\inst
       displayName: "Creating packaging directory"
     - script: |
-        python -m pip install wheel
+        python -m pip install wheel setuptools
       displayName: 'Installing python packages'
     - script: |
         cd D:\packaging
@@ -197,9 +203,13 @@ stages:
           PYTHON_VERSION_SPEC: 3.11
           PYTHON_INTERPRETER: python3.11
           PYTHON_TAG: cp311
+        Python312:
+          PYTHON_VERSION_SPEC: 3.12
+          PYTHON_INTERPRETER: python3.12
+          PYTHON_TAG: cp312
     timeoutInMinutes: 180
     pool:
-      vmImage: 'macOS-11'
+      vmImage: 'macOS-12'
     steps:
     - task: UsePythonVersion@0
       inputs:
@@ -210,7 +220,7 @@ stages:
         $(PYTHON_INTERPRETER) build_scripts/build_usd.py --build-args USD,"-DPXR_PY_UNDEFINED_DYNAMIC_LOOKUP=ON -DPXR_BUILD_USD_TOOLS=OFF -DPXR_INSTALL_LOCATION=../pluginfo" --no-materialx --no-imaging --no-examples --no-tutorials --generator Xcode --build-target universal --build $HOME/USDgen/build --src $HOME/USDgen/src $HOME/USDinst -v
       displayName: 'Building USD'
     - bash: |
-        $(PYTHON_INTERPRETER) -m pip install delocate~=0.10.2 wheel
+        $(PYTHON_INTERPRETER) -m pip install delocate~=0.10.2 wheel setuptools
       displayName: 'Installing python packages'
     - bash: |
         mkdir ./packaging
@@ -298,6 +308,10 @@ stages:
           PYTHON_VERSION_SPEC: 3.11
           IMAGE: 'Ubuntu-20.04'
           PYTHON_INTERPRETER: python3
+        Linux_Python312:
+          PYTHON_VERSION_SPEC: 3.12
+          IMAGE: 'Ubuntu-20.04'
+          PYTHON_INTERPRETER: python3
         Windows_Python36:
           PYTHON_VERSION_SPEC: 3.6
           IMAGE: 'windows-2019'
@@ -322,29 +336,37 @@ stages:
           PYTHON_VERSION_SPEC: 3.11
           IMAGE: 'windows-2019'
           PYTHON_INTERPRETER: python
+        Windows_Python312:
+          PYTHON_VERSION_SPEC: 3.12
+          IMAGE: 'windows-2019'
+          PYTHON_INTERPRETER: python
         Mac_Python36:
           PYTHON_VERSION_SPEC: 3.6
-          IMAGE: 'macOS-11'
+          IMAGE: 'macOS-12'
           PYTHON_INTERPRETER: python3
         Mac_Python37:
           PYTHON_VERSION_SPEC: 3.7
-          IMAGE: 'macOS-11'
+          IMAGE: 'macOS-12'
           PYTHON_INTERPRETER: python3
         Mac_Python38:
           PYTHON_VERSION_SPEC: 3.8
-          IMAGE: 'macOS-11'
+          IMAGE: 'macOS-12'
           PYTHON_INTERPRETER: python3
         Mac_Python39:
           PYTHON_VERSION_SPEC: 3.9
-          IMAGE: 'macOS-11'
+          IMAGE: 'macOS-12'
           PYTHON_INTERPRETER: python3
         Mac_Python310:
           PYTHON_VERSION_SPEC: 3.10
-          IMAGE: 'macOS-11'
+          IMAGE: 'macOS-12'
           PYTHON_INTERPRETER: python3
         Mac_Python311:
           PYTHON_VERSION_SPEC: 3.11
-          IMAGE: 'macOS-11'
+          IMAGE: 'macOS-12'
+          PYTHON_INTERPRETER: python3
+        Mac_Python312:
+          PYTHON_VERSION_SPEC: 3.12
+          IMAGE: 'macOS-12'
           PYTHON_INTERPRETER: python3
     timeoutInMinutes: 10
     pool:
diff --git a/build_scripts/apple_utils.py b/build_scripts/apple_utils.py
index 2c82243896..d2039a3d03 100644
--- a/build_scripts/apple_utils.py
+++ b/build_scripts/apple_utils.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Utilities for managing Apple OS build concerns.
@@ -35,36 +18,45 @@
 import platform
 import shlex
 import subprocess
+from typing import Optional, List
 
 TARGET_NATIVE = "native"
 TARGET_X86 = "x86_64"
 TARGET_ARM64 = "arm64"
 TARGET_UNIVERSAL = "universal"
+TARGET_IOS = "iOS"
+TARGET_VISIONOS = "visionOS"
+
+EMBEDDED_PLATFORMS = [TARGET_IOS, TARGET_VISIONOS]
 
 def GetBuildTargets():
     return [TARGET_NATIVE,
             TARGET_X86,
             TARGET_ARM64,
-            TARGET_UNIVERSAL]
+            TARGET_UNIVERSAL,
+            TARGET_IOS,
+            TARGET_VISIONOS]
 
 def GetBuildTargetDefault():
-    return TARGET_NATIVE;
+    return TARGET_NATIVE
 
 def MacOS():
     return platform.system() == "Darwin"
 
+def TargetEmbeddedOS(context):
+    return context.buildTarget in EMBEDDED_PLATFORMS
+
 def GetLocale():
     return sys.stdout.encoding or locale.getdefaultlocale()[1] or "UTF-8"
 
-def GetCommandOutput(command):
+def GetCommandOutput(command, **kwargs):
     """Executes the specified command and returns output or None."""
     try:
         return subprocess.check_output(
-            shlex.split(command),
-            stderr=subprocess.STDOUT).decode(GetLocale(), 'replace').strip()
-    except subprocess.CalledProcessError:
-        pass
-    return None
+            command, stderr=subprocess.STDOUT, **kwargs).decode(
+                                        GetLocale(), 'replace').strip()
+    except:
+        return None
 
 def GetTargetArmArch():
     # Allows the arm architecture string to be overridden by
@@ -72,7 +64,7 @@ def GetTargetArmArch():
     return os.environ.get('MACOS_ARM_ARCHITECTURE') or TARGET_ARM64
 
 def GetHostArch():
-    macArch = GetCommandOutput('arch').strip()
+    macArch = GetCommandOutput(["arch"])
     if macArch == "i386" or macArch == TARGET_X86:
         macArch = TARGET_X86
     else:
@@ -80,6 +72,9 @@ def GetHostArch():
     return macArch
 
 def GetTargetArch(context):
+    if TargetEmbeddedOS(context):
+        return GetTargetArmArch()
+
     if context.targetNative:
         macTargets = GetHostArch()
     else:
@@ -106,6 +101,8 @@ def GetTargetArchPair(context):
         primaryArch = TARGET_X86
     if context.targetARM64:
         primaryArch = GetTargetArmArch()
+    if context.buildTarget in EMBEDDED_PLATFORMS:
+        primaryArch = GetTargetArmArch()
     if context.targetUniversal:
         primaryArch = GetHostArch()
         if (primaryArch == TARGET_X86):
@@ -118,18 +115,34 @@ def GetTargetArchPair(context):
 def SupportsMacOSUniversalBinaries():
     if not MacOS():
         return False
-    XcodeOutput = GetCommandOutput('/usr/bin/xcodebuild -version')
+    XcodeOutput = GetCommandOutput(["/usr/bin/xcodebuild", "-version"])
     XcodeFind = XcodeOutput.rfind('Xcode ', 0, len(XcodeOutput))
     XcodeVersion = XcodeOutput[XcodeFind:].split(' ')[1]
     return (XcodeVersion > '11.0')
 
+def GetSDKRoot(context) -> Optional[str]:
+    sdk = "macosx"
+    if context.buildTarget == TARGET_IOS:
+        sdk = "iphoneos"
+    elif context.buildTarget == TARGET_VISIONOS:
+        sdk = "xros"
+
+    for arg in (context.cmakeBuildArgs or '').split():
+        if "CMAKE_OSX_SYSROOT" in arg:
+            override = arg.split('=')[1].strip('"').strip()
+            if override:
+                sdk = override
+    return GetCommandOutput(["xcrun", "--sdk", sdk, "--show-sdk-path"])
+
 def SetTarget(context, targetName):
     context.targetNative = (targetName == TARGET_NATIVE)
     context.targetX86 = (targetName == TARGET_X86)
     context.targetARM64 = (targetName == GetTargetArmArch())
     context.targetUniversal = (targetName == TARGET_UNIVERSAL)
+    context.targetIOS = (targetName == TARGET_IOS)
+    context.targetVisionOS = (targetName == TARGET_VISIONOS)
     if context.targetUniversal and not SupportsMacOSUniversalBinaries():
-        self.targetUniversal = False
+        context.targetUniversal = False
         raise ValueError(
                 "Universal binaries only supported in macOS 11.0 and later.")
 
@@ -138,7 +151,7 @@ def GetTargetName(context):
             TARGET_X86 if context.targetX86 else
             GetTargetArmArch() if context.targetARM64 else
             TARGET_UNIVERSAL if context.targetUniversal else
-            "")
+            context.buildTarget)
 
 devout = open(os.devnull, 'w')
 
@@ -217,3 +230,19 @@ def CreateUniversalBinaries(context, libNames, x86Dir, armDir):
                                 instDir=context.instDir, libName=targetName),
                        outputName)
     return lipoCommands
+
+def ConfigureCMakeExtraArgs(context, args:List[str]) -> List[str]:
+    system_name = None
+    if TargetEmbeddedOS(context):
+        system_name = context.buildTarget
+
+    if system_name:
+        args.append(f"-DCMAKE_SYSTEM_NAME={system_name}")
+        args.append(f"-DCMAKE_OSX_SYSROOT={GetSDKRoot(context)}")
+
+        # Required to find locally built libs not from the sysroot.
+        args.append(f"-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH")
+        args.append(f"-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH")
+        args.append(f"-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH")
+
+    return args
diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py
index b66fd12def..f31eecd19f 100644
--- a/build_scripts/build_usd.py
+++ b/build_scripts/build_usd.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # Check whether this script is being run under Python 2 first. Otherwise,
 # any Python 3-only code below will cause the script to fail with an
@@ -34,7 +17,6 @@
 import contextlib
 import ctypes
 import datetime
-import distutils
 import fnmatch
 import glob
 import locale
@@ -92,6 +74,9 @@ def MacOS():
 if MacOS():
     import apple_utils
 
+def MacOSTargetEmbedded(context):
+    return MacOS() and apple_utils.TargetEmbeddedOS(context)
+
 def GetLocale():
     if Windows():
         # Windows handles encoding a little differently then Linux / Mac
@@ -252,7 +237,7 @@ def GetCPUCount():
     except NotImplementedError:
         return 1
 
-def Run(cmd, logCommandOutput = True):
+def Run(cmd, logCommandOutput = True, env = None):
     """Run the specified command in a subprocess."""
     PrintInfo('Running "{cmd}"'.format(cmd=cmd))
 
@@ -266,7 +251,7 @@ def Run(cmd, logCommandOutput = True):
         # code will handle them.
         if logCommandOutput:
             p = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, 
-                                 stderr=subprocess.STDOUT)
+                                 stderr=subprocess.STDOUT, env=env)
             while True:
                 l = p.stdout.readline().decode(GetLocale(), 'replace')
                 if l:
@@ -275,7 +260,7 @@ def Run(cmd, logCommandOutput = True):
                 elif p.poll() is not None:
                     break
         else:
-            p = subprocess.Popen(shlex.split(cmd))
+            p = subprocess.Popen(shlex.split(cmd), env=env)
             p.wait()
 
     if p.returncode != 0:
@@ -303,6 +288,13 @@ def CopyFiles(context, src, dest):
         raise RuntimeError("File(s) to copy {src} not found".format(src=src))
 
     instDestDir = os.path.join(context.instDir, dest)
+    if not os.path.isdir(instDestDir):
+        try:
+            os.mkdir(instDestDir)
+        except Exception as e:
+            raise RuntimeError(
+                "Unable to create {destDir}".format(destDir=instDestDir)) from e
+
     for f in filesToCopy:
         PrintCommandOutput("Copying {file} to {destDir}\n"
                            .format(file=f, destDir=instDestDir))
@@ -421,6 +413,7 @@ def RunCMake(context, force, extraArgs = None):
             extraArgs.append('-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO')
 
         extraArgs.append('-DCMAKE_OSX_ARCHITECTURES={0}'.format(targetArch))
+        extraArgs = apple_utils.ConfigureCMakeExtraArgs(context, extraArgs)
 
     if context.ignorePaths:
         ignoredPaths = ";".join(context.ignorePaths)
@@ -690,6 +683,20 @@ def AnyPythonDependencies(deps):
 
 def InstallZlib(context, force, buildArgs):
     with CurrentWorkingDirectory(DownloadURL(ZLIB_URL, context, force)):
+        # The following test files aren't portable to embedded platforms.
+        # They're not required for use on any platforms, so we elide them
+        # for efficiency
+        PatchFile("CMakeLists.txt",
+                  [("add_executable(example test/example.c)",
+                    ""),
+                   ("add_executable(minigzip test/minigzip.c)",
+                    ""),
+                   ("target_link_libraries(example zlib)",
+                    ""),
+                   ("target_link_libraries(minigzip zlib)",
+                    ""),
+                   ("add_test(example example)",
+                    "")])
         RunCMake(context, force, buildArgs)
 
 ZLIB = Dependency("zlib", InstallZlib, "include/zlib.h")
@@ -941,6 +948,19 @@ def InstallBoost(context, force, buildArgs):
 
 BOOST = Dependency("boost", InstallBoost, *BOOST_VERSION_FILES)
 
+############################################################
+# Intel oneTBB
+
+ONETBB_URL = "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.9.0.zip"
+
+def InstallOneTBB(context, force, buildArgs):
+    with CurrentWorkingDirectory(DownloadURL(ONETBB_URL, context, force)):
+        RunCMake(context, force, 
+                 ['-DTBB_TEST=OFF',
+                  '-DTBB_STRICT=OFF'] + buildArgs)
+
+ONETBB = Dependency("oneTBB", InstallOneTBB, "include/oneapi/tbb.h")
+
 ############################################################
 # Intel TBB
 
@@ -991,6 +1011,31 @@ def InstallTBB_MacOS(context, force, buildArgs):
                   "ifeq ($(arch),$(filter $(arch),armv7 armv7s {0}))"
                         .format(apple_utils.GetTargetArmArch()))])
 
+        if context.buildTarget == apple_utils.TARGET_VISIONOS:
+            # Create visionOS config from iOS config
+            shutil.copy(
+                src="build/ios.macos.inc",
+                dst="build/visionos.macos.inc")
+
+            PatchFile("build/visionos.macos.inc",
+                      [("ios","visionos"),
+                       ("iOS", "visionOS"),
+                       ("iPhone", "XR"),
+                       ("IPHONEOS","XROS"),
+                       ("?= 8.0", "?= 1.0")])
+
+            # iOS clang just reuses the macOS one,
+            # so it's easier to copy it directly.
+            shutil.copy(src="build/macos.clang.inc",
+                        dst="build/visionos.clang.inc")
+
+            PatchFile("build/visionos.clang.inc",
+                      [("ios","visionos"),
+                       ("-miphoneos-version-min=", "-target arm64-apple-xros"),
+                       ("iOS", "visionOS"),
+                       ("iPhone", "XR"),
+                       ("IPHONEOS","XROS")])
+
         (primaryArch, secondaryArch) = apple_utils.GetTargetArchPair(context)
 
         # tbb uses different arch names
@@ -1004,10 +1049,14 @@ def InstallTBB_MacOS(context, force, buildArgs):
         def _RunBuild(arch):
             if not arch:
                 return
+            env = os.environ.copy()
+            if MacOSTargetEmbedded(context):
+                env["SDKROOT"] = apple_utils.GetSDKRoot(context)
+                buildArgs.append(f' compiler=clang arch=arm64 extra_inc=big_iron.inc target={context.buildTarget.lower()}')
             makeTBBCmd = 'make -j{procs} arch={arch} {buildArgs}'.format(
                 arch=arch, procs=context.numJobs,
                 buildArgs=" ".join(buildArgs))
-            Run(makeTBBCmd)
+            Run(makeTBBCmd, env=env)
 
         _RunBuild(primaryArch)
         _RunBuild(secondaryArch)
@@ -1476,13 +1525,20 @@ def InstallDraco(context, force, buildArgs):
 ############################################################
 # MaterialX
 
-MATERIALX_URL = "https://github.com/materialx/MaterialX/archive/v1.38.8.zip"
+MATERIALX_URL = "https://github.com/materialx/MaterialX/archive/v1.38.10.zip"
 
 def InstallMaterialX(context, force, buildArgs):
     with CurrentWorkingDirectory(DownloadURL(MATERIALX_URL, context, force)):
         cmakeOptions = ['-DMATERIALX_BUILD_SHARED_LIBS=ON',
                         '-DMATERIALX_BUILD_TESTS=OFF'
         ]
+
+        if MacOSTargetEmbedded(context):
+            cmakeOptions.extend([
+                '-DMATERIALX_BUILD_GEN_MSL=ON',
+                '-DMATERIALX_BUILD_GEN_GLSL=OFF',
+                '-DMATERIALX_BUILD_IOS=ON'])
+
         cmakeOptions += buildArgs
         RunCMake(context, force, cmakeOptions)
 
@@ -1767,6 +1823,11 @@ def InstallUSD(context, force, buildArgs):
 specified library and do not conflict with other options, otherwise build 
 errors may occur.
 
+- Embedded Build Targets
+When cross compiling for an embedded target operating system, e.g. iOS, the
+following components are disabled: python, tools, imaging, tests, examples,
+tutorials.
+
 - Python Versions and DCC Plugins:
 Some DCCs may ship with and run using their own version of Python. In that case,
 it is important that USD and the plugins for that DCC are built using the DCC's
@@ -1796,7 +1857,7 @@ def InstallUSD(context, force, buildArgs):
 
 parser = argparse.ArgumentParser(
     formatter_class=argparse.RawDescriptionHelpFormatter,
-    description=programDescription)
+    allow_abbrev=False, description=programDescription)
 
 parser.add_argument("install_dir", type=str, 
                     help="Directory where USD will be installed")
@@ -2049,6 +2110,14 @@ def InstallUSD(context, force, buildArgs):
 subgroup.add_argument("--no-materialx", dest="build_materialx", action="store_false",
                       help="Disable MaterialX support")
 
+group = parser.add_argument_group(title="TBB Options")
+subgroup = group.add_mutually_exclusive_group()
+subgroup.add_argument("--onetbb", dest="build_onetbb", action="store_true",
+                      default=False,
+                      help="Build using oneTBB instead of TBB")
+subgroup.add_argument("--no-onetbb", dest="build_onetbb", action="store_false",
+                      help="Build using TBB (default)")
+
 group = parser.add_argument_group(title="Spline Test Options")
 subgroup = group.add_mutually_exclusive_group()
 subgroup.add_argument("--mayapy-tests",
@@ -2169,12 +2238,15 @@ def __init__(self, args):
         self.forceBuildAll = args.force_all
         self.forceBuild = [dep.lower() for dep in args.force_build]
 
+        # Some components are disabled for embedded build targets
+        embedded = MacOSTargetEmbedded(self)
+
         # Optional components
-        self.buildTests = args.build_tests
-        self.buildPython = args.build_python
-        self.buildExamples = args.build_examples
-        self.buildTutorials = args.build_tutorials
-        self.buildTools = args.build_tools
+        self.buildTests = args.build_tests and not embedded
+        self.buildPython = args.build_python and not embedded
+        self.buildExamples = args.build_examples and not embedded
+        self.buildTutorials = args.build_tutorials and not embedded
+        self.buildTools = args.build_tools and not embedded
 
         # - Documentation
         self.buildDocs = args.build_docs or args.build_python_docs
@@ -2183,7 +2255,7 @@ def __init__(self, args):
 
         # - Imaging
         self.buildImaging = (args.build_imaging == IMAGING or
-                             args.build_imaging == USD_IMAGING)
+                             args.build_imaging == USD_IMAGING) and not embedded
         self.enablePtex = self.buildImaging and args.enable_ptex
         self.enableOpenVDB = self.buildImaging and args.enable_openvdb
 
@@ -2213,9 +2285,12 @@ def __init__(self, args):
         self.dracoLocation = (os.path.abspath(args.draco_location)
                                 if args.draco_location else None)
 
-        # - MaterialX Plugin
+        # - MaterialX
         self.buildMaterialX = args.build_materialx
 
+        # - TBB
+        self.buildOneTBB = args.build_onetbb
+
         # - Spline Tests
         self.buildMayapyTests = args.build_mayapy_tests
         self.mayapyLocation = args.mayapy_location
@@ -2257,7 +2332,13 @@ def ForceBuildDependency(self, dep):
 
 # Determine list of dependencies that are required based on options
 # user has selected.
-requiredDependencies = [ZLIB, BOOST, TBB]
+if context.buildOneTBB:
+    TBB = ONETBB
+
+requiredDependencies = [ZLIB, TBB]
+
+if context.buildPython:
+    requiredDependencies += [BOOST]
 
 if context.buildAlembic:
     if context.enableHDF5:
@@ -2307,6 +2388,33 @@ def ForceBuildDependency(self, dep):
     PrintError("Draco plugin can not be enabled for monolithic build on Windows")
     sys.exit(1)
 
+# The versions of Embree we currently support do not support oneTBB.
+if context.buildOneTBB and context.buildEmbree:
+    PrintError("Embree support cannot be enabled when building against oneTBB")
+    sys.exit(1)
+
+# Error out if user explicitly enabled components which aren't
+# supported for embedded build targets.
+if MacOSTargetEmbedded(context):
+    if "--tests" in sys.argv:
+        PrintError("Cannot build tests for embedded build targets")
+        sys.exit(1)
+    if "--python" in sys.argv:
+        PrintError("Cannot build python components for embedded build targets")
+        sys.exit(1)
+    if "--examples" in sys.argv:
+        PrintError("Cannot build examples for embedded build targets")
+        sys.exit(1)
+    if "--tutorials" in sys.argv:
+        PrintError("Cannot build tutorials for embedded build targets")
+        sys.exit(1)
+    if "--tools" in sys.argv:
+        PrintError("Cannot build tools for embedded build targets")
+        sys.exit(1)
+    if "--imaging" in sys.argv:
+        PrintError("Cannot build imaging for embedded build targets")
+        sys.exit(1)
+
 # Error out if user explicitly specified building usdview without required
 # components. Otherwise, usdview will be silently disabled. This lets users
 # specify "--no-python" without explicitly having to specify "--no-usdview",
@@ -2360,6 +2468,10 @@ def ForceBuildDependency(self, dep):
     elif MacOS():
         # Apple Silicon is not supported prior to 3.19
         cmake_required_version = (3, 19)
+
+        # visionOS support was added in CMake 3.28
+        if context.buildTarget == apple_utils.TARGET_VISIONOS:
+            cmake_required_version = (3, 28)
     else:
         # Linux, and vfx platform CY2020, are verified to work correctly with 3.14
         cmake_required_version = (3, 14)
@@ -2469,6 +2581,7 @@ def _JoinVersion(v):
       PRMan support:            {buildPrman}
     UsdImaging                  {buildUsdImaging}
       usdview:                  {buildUsdview}
+    MaterialX support           {buildMaterialX}
     Python support              {buildPython}
       Python Debug:             {debugPython}
       Python docs:              {buildPythonDocs}
@@ -2482,7 +2595,6 @@ def _JoinVersion(v):
     Alembic Plugin              {buildAlembic}
       HDF5 support:             {enableHDF5}
     Draco Plugin                {buildDraco}
-    MaterialX Plugin            {buildMaterialX}
 
   Dependencies                  {dependencies}"""
 
@@ -2610,8 +2722,11 @@ def FormatBuildArguments(buildArgs):
     if context.macOSCodesign:
         apple_utils.Codesign(context.usdInstDir, verbosity > 1)
 
-Print("""
-Success! To use USD, please ensure that you have:""")
+additionalInstructions = any([context.buildPython, context.buildTools, context.buildPrman])
+if additionalInstructions:
+    Print("\nSuccess! To use USD, please ensure that you have:")
+else:
+    Print("\nSuccess! USD libraries were built.")
 
 if context.buildPython:
     Print("""
@@ -2619,10 +2734,11 @@ def FormatBuildArguments(buildArgs):
     {requiredInPythonPath}""".format(
         requiredInPythonPath="\n    ".join(sorted(requiredInPythonPath))))
 
-Print("""
+if context.buildPython or context.buildTools:
+    Print("""
     The following in your PATH environment variable:
-    {requiredInPath}
-""".format(requiredInPath="\n    ".join(sorted(requiredInPath))))
+    {requiredInPath}""".format(
+        requiredInPath="\n    ".join(sorted(requiredInPath))))
     
 if context.buildPrman:
     Print("See documentation at http://openusd.org/docs/RenderMan-USD-Imaging-Plugin.html "
diff --git a/build_scripts/pypi/docker/Dockerfile b/build_scripts/pypi/docker/Dockerfile
index 5929c04847..c685a68a24 100644
--- a/build_scripts/pypi/docker/Dockerfile
+++ b/build_scripts/pypi/docker/Dockerfile
@@ -1,13 +1,8 @@
-FROM quay.io/pypa/manylinux2014_x86_64:2022-05-14-b55b680
+FROM quay.io/pypa/manylinux2014_x86_64:2023-10-03-72cdc42
 
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
 WORKDIR /opt/USD
 
-# XXX:
-# The above manylinux2014 image contains CMake 3.22, but we require
-# 3.27+ for Python 3.11 support. So we install 3.27 manually here.
-RUN pipx install --force cmake==3.27.9
-
 CMD bash
diff --git a/build_scripts/pypi/package_files/setup.py b/build_scripts/pypi/package_files/setup.py
index 094478476f..bcfcfa4e09 100644
--- a/build_scripts/pypi/package_files/setup.py
+++ b/build_scripts/pypi/package_files/setup.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import setuptools
 import argparse, glob, os, platform, re, shutil, sys
@@ -151,5 +134,5 @@ def windows():
         "Environment :: Console",
         "Topic :: Multimedia :: Graphics",
     ],
-    python_requires='>=3.6, <3.12',
+    python_requires='>=3.6, <3.13',
 )
diff --git a/build_scripts/pypi/test.py b/build_scripts/pypi/test.py
index 6b1746c8f4..ce7be96737 100644
--- a/build_scripts/pypi/test.py
+++ b/build_scripts/pypi/test.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import unittest
 
diff --git a/build_scripts/pypi/updatePluginfos.py b/build_scripts/pypi/updatePluginfos.py
index f8fc8cc2b6..8fc119aadf 100644
--- a/build_scripts/pypi/updatePluginfos.py
+++ b/build_scripts/pypi/updatePluginfos.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 '''Rewrite pluginfo library paths for changed library locations.
 
diff --git a/cmake/defaults/CTestCustom.cmake b/cmake/defaults/CTestCustom.cmake
index 5eb114ad1a..886db15bbb 100644
--- a/cmake/defaults/CTestCustom.cmake
+++ b/cmake/defaults/CTestCustom.cmake
@@ -1,3 +1,9 @@
+#
+# Copyright 2016 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 # set a timestamp id to identify this run of tests in the environment, if not
 # already set
 if (NOT DEFINED ENV{PXR_CTEST_RUN_ID})
diff --git a/cmake/defaults/CXXDefaults.cmake b/cmake/defaults/CXXDefaults.cmake
index c59d70c8b7..e9eee14f06 100644
--- a/cmake/defaults/CXXDefaults.cmake
+++ b/cmake/defaults/CXXDefaults.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 include(CXXHelpers)
 include(Version)
diff --git a/cmake/defaults/CXXHelpers.cmake b/cmake/defaults/CXXHelpers.cmake
index b5670659aa..c0108f2f9e 100644
--- a/cmake/defaults/CXXHelpers.cmake
+++ b/cmake/defaults/CXXHelpers.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 function(_add_define definition)
     list(APPEND _PXR_CXX_DEFINITIONS "-D${definition}")
diff --git a/cmake/defaults/Options.cmake b/cmake/defaults/Options.cmake
index b37ff6f16e..6c118a9479 100644
--- a/cmake/defaults/Options.cmake
+++ b/cmake/defaults/Options.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 option(PXR_STRICT_BUILD_MODE "Turn on additional warnings. Enforce all warnings as errors." OFF)
 option(PXR_VALIDATE_GENERATED_CODE "Validate script generated code" OFF)
@@ -111,6 +94,14 @@ set(PXR_OVERRIDE_PLUGINPATH_NAME ""
     "Name of the environment variable that will be used to get plugin paths."
 )
 
+set(PXR_TEST_RUN_TEMP_DIR_PREFIX ""
+    CACHE
+    STRING
+    "Prefix for test run temporary directory names. \
+    Setting this option to \"foo-\" will create directories like \
+    \"<temp dir>/foo-<test dir>\"."
+)
+
 set(PXR_ALL_LIBS ""
     CACHE
     INTERNAL
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
index 3f1400f617..fe60570b34 100644
--- a/cmake/defaults/Packages.cmake
+++ b/cmake/defaults/Packages.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Save the current value of BUILD_SHARED_LIBS and restore it at
@@ -37,23 +20,25 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_package(Threads REQUIRED)
 set(PXR_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
 
-# Find Boost package before getting any boost specific components as we need to
-# disable boost-provided cmake config, based on the boost version found.
-find_package(Boost REQUIRED)
-
-# Boost provided cmake files (introduced in boost version 1.70) result in 
-# inconsistent build failures on different platforms, when trying to find boost 
-# component dependencies like python, etc. Refer some related
-# discussions:
-# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-# https://github.com/boostorg/boost_install/issues/12#issuecomment-508683006
-#
-# Hence to avoid issues with Boost provided cmake config, Boost_NO_BOOST_CMAKE
-# is enabled by default for boost version 1.70 and above. If a user explicitly 
-# set Boost_NO_BOOST_CMAKE to Off, following will be a no-op.
-option(Boost_NO_BOOST_CMAKE "Disable boost-provided cmake config" ON)
-if (Boost_NO_BOOST_CMAKE)
-    message(STATUS "Disabling boost-provided cmake config")
+if(PXR_ENABLE_PYTHON_SUPPORT OR PXR_ENABLE_OPENVDB_SUPPORT)
+    # Find Boost package before getting any boost specific components as we need to
+    # disable boost-provided cmake config, based on the boost version found.
+    find_package(Boost REQUIRED)
+
+    # Boost provided cmake files (introduced in boost version 1.70) result in 
+    # inconsistent build failures on different platforms, when trying to find boost 
+    # component dependencies like python, etc. Refer some related
+    # discussions:
+    # https://github.com/boostorg/python/issues/262#issuecomment-483069294
+    # https://github.com/boostorg/boost_install/issues/12#issuecomment-508683006
+    #
+    # Hence to avoid issues with Boost provided cmake config, Boost_NO_BOOST_CMAKE
+    # is enabled by default for boost version 1.70 and above. If a user explicitly 
+    # set Boost_NO_BOOST_CMAKE to Off, following will be a no-op.
+    option(Boost_NO_BOOST_CMAKE "Disable boost-provided cmake config" ON)
+    if (Boost_NO_BOOST_CMAKE)
+      message(STATUS "Disabling boost-provided cmake config")
+    endif()
 endif()
 
 if(PXR_ENABLE_PYTHON_SUPPORT)
@@ -159,11 +144,8 @@ add_definitions(${TBB_DEFINITIONS})
 if(WIN32)
     # Math functions are linked automatically by including math.h on Windows.
     set(M_LIB "")
-elseif (APPLE)
-    # On Apple platforms, its idiomatic to just provide the -l linkage for sdk libs to be portable across SDK versions
-    set(M_LIB "-lm")
 else()
-    find_library(M_LIB m)
+    set(M_LIB m)
 endif()
 
 if (NOT PXR_MALLOC_LIBRARY)
@@ -231,11 +213,7 @@ if (PXR_BUILD_IMAGING)
         if (POLICY CMP0072)
             cmake_policy(SET CMP0072 OLD)
         endif()
-        if (APPLE)
-            set(OPENGL_gl_LIBRARY "-framework OpenGL")
-        else ()
-            find_package(OpenGL REQUIRED)
-        endif()
+        find_package(OpenGL REQUIRED)
         add_definitions(-DPXR_GL_SUPPORT_ENABLED)
     endif()
     # --Metal
@@ -361,4 +339,4 @@ if(REQUIRES_Imath)
     endif()
 endif()
 
-set(BUILD_SHARED_LIBS "${build_shared_libs}")
\ No newline at end of file
+set(BUILD_SHARED_LIBS "${build_shared_libs}")
diff --git a/cmake/defaults/ProjectDefaults.cmake b/cmake/defaults/ProjectDefaults.cmake
index 5e5f3f4144..a12889eeb2 100644
--- a/cmake/defaults/ProjectDefaults.cmake
+++ b/cmake/defaults/ProjectDefaults.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 if(APPLE)
     set(OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for OSX")
diff --git a/cmake/defaults/Version.cmake b/cmake/defaults/Version.cmake
index 34ffd4e4f3..427608ca83 100644
--- a/cmake/defaults/Version.cmake
+++ b/cmake/defaults/Version.cmake
@@ -1,29 +1,12 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # Versioning information
 set(PXR_MAJOR_VERSION "0")
 set(PXR_MINOR_VERSION "24")
-set(PXR_PATCH_VERSION "5") # NOTE: Must not have leading 0 for single digits
+set(PXR_PATCH_VERSION "8") # NOTE: Must not have leading 0 for single digits
 
 math(EXPR PXR_VERSION "${PXR_MAJOR_VERSION} * 10000 + ${PXR_MINOR_VERSION} * 100 + ${PXR_PATCH_VERSION}")
diff --git a/cmake/defaults/clangdefaults.cmake b/cmake/defaults/clangdefaults.cmake
index 4e20af3210..326c15f607 100644
--- a/cmake/defaults/clangdefaults.cmake
+++ b/cmake/defaults/clangdefaults.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 include(gccclangshareddefaults)
diff --git a/cmake/defaults/gccclangshareddefaults.cmake b/cmake/defaults/gccclangshareddefaults.cmake
index 0c13711f5e..cb5d21c5c2 100644
--- a/cmake/defaults/gccclangshareddefaults.cmake
+++ b/cmake/defaults/gccclangshareddefaults.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # This file contains a set of flags/settings shared between our 
diff --git a/cmake/defaults/gccdefaults.cmake b/cmake/defaults/gccdefaults.cmake
index 6bc015d9ca..8dd147345f 100644
--- a/cmake/defaults/gccdefaults.cmake
+++ b/cmake/defaults/gccdefaults.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 include(gccclangshareddefaults)
diff --git a/cmake/defaults/msvcdefaults.cmake b/cmake/defaults/msvcdefaults.cmake
index 0f7fb7ef64..78bde7a77e 100644
--- a/cmake/defaults/msvcdefaults.cmake
+++ b/cmake/defaults/msvcdefaults.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Enable exception handling.
diff --git a/cmake/macros/Private.cmake b/cmake/macros/Private.cmake
index f0bc34ed80..48fe107dd7 100644
--- a/cmake/macros/Private.cmake
+++ b/cmake/macros/Private.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 include(Version)
 
@@ -540,7 +523,7 @@ function(_pxr_enable_precompiled_header TARGET_NAME)
     # Headers live in subdirectories.
     set(rel_output_header_path "${PXR_PREFIX}/${TARGET_NAME}/${output_header_name}")
     set(abs_output_header_path "${PROJECT_BINARY_DIR}/include/${rel_output_header_path}")
-    set(abs_precompiled_path ${PROJECT_BINARY_DIR}/include/${PXR_PREFIX}/${TARGET_NAME}/${precompiled_name})
+    set(abs_precompiled_path ${PROJECT_BINARY_DIR}/include/${PXR_PREFIX}/${TARGET_NAME}/${CMAKE_BUILD_TYPE}/${precompiled_name})
 
     # Additional compile flags to use precompiled header.  This will be
     set(compile_flags "")
diff --git a/cmake/macros/Public.cmake b/cmake/macros/Public.cmake
index a9687afe12..9f3d358377 100644
--- a/cmake/macros/Public.cmake
+++ b/cmake/macros/Public.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 include(Private)
 
@@ -850,6 +833,10 @@ function(pxr_register_test TEST_NAME)
         set(testWrapperCmd ${testWrapperCmd} --env-var=${PXR_PLUGINPATH_NAME}=${CMAKE_INSTALL_PREFIX}/lib/usd)
     endif()
 
+    if (PXR_TEST_RUN_TEMP_DIR_PREFIX)
+          set(testWrapperCmd ${testWrapperCmd} --tempdirprefix=${PXR_TEST_RUN_TEMP_DIR_PREFIX})
+    endif()
+
     # Ensure that Python imports the Python files built by this build.
     # On Windows convert backslash to slash and don't change semicolons
     # to colons.
diff --git a/cmake/macros/compilePython.py b/cmake/macros/compilePython.py
index d1b561c49b..f9c537bc37 100755
--- a/cmake/macros/compilePython.py
+++ b/cmake/macros/compilePython.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 #
 # Usage: compilePython source.py dest.pyc
diff --git a/cmake/macros/copyHeaderForBuild.cmake b/cmake/macros/copyHeaderForBuild.cmake
index e4ffaa7d97..0eaf6eff73 100644
--- a/cmake/macros/copyHeaderForBuild.cmake
+++ b/cmake/macros/copyHeaderForBuild.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 file(READ ${infile} _tmp_file_content)
 file(WRITE ${outfile} "\#line 1 \"${infile}\"\n")
diff --git a/cmake/macros/shebang.py b/cmake/macros/shebang.py
index 75e0a93f15..53bdb0cb4a 100644
--- a/cmake/macros/shebang.py
+++ b/cmake/macros/shebang.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 #
 # Usage:
diff --git a/cmake/macros/testWrapper.py b/cmake/macros/testWrapper.py
index a570e2d9f4..9e4104028d 100644
--- a/cmake/macros/testWrapper.py
+++ b/cmake/macros/testWrapper.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 #
 # Usage: testWrapper.py <options> <cmd>
@@ -104,7 +87,9 @@ def _parseArgs():
                   'directory; if <PXR_CTEST_RUN_ID>" is in the value, it is '
                   'replaced with a timestamp identifying a given ctest '
                   'invocation'))
-
+    parser.add_argument('--tempdirprefix', metavar='PREFIX', type=str,
+            help='temp directory names will begin with PREFIX',
+            default=None)
     parser.add_argument('--expected-return-code', type=int, default=0,
             help='Expected return code of this test.')
     parser.add_argument('--env-var', dest='envVars', default=[], type=str, 
@@ -346,7 +331,7 @@ def _runCommand(raw_command, stdout_redir, stderr_redir, env,
                          "--clean-output-paths.")
         sys.exit(1)
 
-    testDir = tempfile.mkdtemp()
+    testDir = tempfile.mkdtemp(prefix=args.tempdirprefix)
     os.chdir(testDir)
     if args.verbose:
         print("chdir: {0}".format(testDir))
diff --git a/cmake/modules/FindAnimX.cmake b/cmake/modules/FindAnimX.cmake
index 1b6c593c03..4d50cea89a 100644
--- a/cmake/modules/FindAnimX.cmake
+++ b/cmake/modules/FindAnimX.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # Finds AnimX library.  Provides the results by defining the variables
 # ANIMX_LIBRARY and ANIMX_INCLUDES.
diff --git a/cmake/modules/FindDraco.cmake b/cmake/modules/FindDraco.cmake
index 6d25cb3c13..a822d29e98 100644
--- a/cmake/modules/FindDraco.cmake
+++ b/cmake/modules/FindDraco.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # Find Draco Compression Library using DRACO_ROOT as a hint location and
 # provides the results by defining the variables DRACO_INCLUDES and
diff --git a/cmake/modules/FindEmbree.cmake b/cmake/modules/FindEmbree.cmake
index e12639d6d9..cd52f6b7f5 100644
--- a/cmake/modules/FindEmbree.cmake
+++ b/cmake/modules/FindEmbree.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 #=============================================================================
 #
diff --git a/cmake/modules/FindJinja2.cmake b/cmake/modules/FindJinja2.cmake
index 820b19af71..72ca67648c 100644
--- a/cmake/modules/FindJinja2.cmake
+++ b/cmake/modules/FindJinja2.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # Jinja2 is a python library, ensure that it is available for use with our
 # specified version of Python.
diff --git a/cmake/modules/FindOSL.cmake b/cmake/modules/FindOSL.cmake
index 42392361f6..f5c77c5d24 100644
--- a/cmake/modules/FindOSL.cmake
+++ b/cmake/modules/FindOSL.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Find OSL header.
diff --git a/cmake/modules/FindOpenColorIO.cmake b/cmake/modules/FindOpenColorIO.cmake
index 26b8229a1f..8df6fe35f3 100644
--- a/cmake/modules/FindOpenColorIO.cmake
+++ b/cmake/modules/FindOpenColorIO.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 if(UNIX)
diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake
index cd77c50a3a..7cf5d46810 100644
--- a/cmake/modules/FindOpenEXR.cmake
+++ b/cmake/modules/FindOpenEXR.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 find_path(OPENEXR_INCLUDE_DIR
diff --git a/cmake/modules/FindOpenImageIO.cmake b/cmake/modules/FindOpenImageIO.cmake
index eca0607deb..4d2ff1ec4f 100644
--- a/cmake/modules/FindOpenImageIO.cmake
+++ b/cmake/modules/FindOpenImageIO.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 if(UNIX)
diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
index 2968a2294b..7919827297 100644
--- a/cmake/modules/FindOpenVDB.cmake
+++ b/cmake/modules/FindOpenVDB.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Find OpenVDB header.
diff --git a/cmake/modules/FindPyOpenGL.cmake b/cmake/modules/FindPyOpenGL.cmake
index 03aec92b81..a6b427857a 100644
--- a/cmake/modules/FindPyOpenGL.cmake
+++ b/cmake/modules/FindPyOpenGL.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 if (NOT PYTHON_EXECUTABLE)
     message(FATAL_ERROR "Unable to find Python executable - PyOpenGL not present")
diff --git a/cmake/modules/FindPySide.cmake b/cmake/modules/FindPySide.cmake
index 94d9199f37..1fd02ff886 100644
--- a/cmake/modules/FindPySide.cmake
+++ b/cmake/modules/FindPySide.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 if (NOT PYTHON_EXECUTABLE)
     message(FATAL_ERROR "Unable to find Python executable - PySide not present")
diff --git a/cmake/modules/FindRenderman.cmake b/cmake/modules/FindRenderman.cmake
index aa032edc2d..8d4e325de5 100644
--- a/cmake/modules/FindRenderman.cmake
+++ b/cmake/modules/FindRenderman.cmake
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 #=============================================================================
 #
@@ -138,8 +121,13 @@ get_filename_component(RENDERMAN_BINARY_DIR
 if (RENDERMAN_INCLUDE_DIR AND EXISTS "${RENDERMAN_INCLUDE_DIR}/prmanapi.h" )
     file(STRINGS "${RENDERMAN_INCLUDE_DIR}/prmanapi.h" TMP REGEX "^#define _PRMANAPI_VERSION_MAJOR_.*$")
     string(REGEX MATCHALL "[0-9]+" MAJOR ${TMP})
-
     set (RENDERMAN_VERSION_MAJOR ${MAJOR})
+
+    file(STRINGS "${RENDERMAN_INCLUDE_DIR}/prmanapi.h" TMP REGEX "^#define _PRMANAPI_VERSION_MINOR_.*$")
+    string(REGEX MATCHALL "[0-9]+" MINOR ${TMP})
+    set (RENDERMAN_VERSION_MINOR ${MINOR})
+    # Combine major and minor version numbers into a single version string
+    set(RENDERMAN_VERSION "${RENDERMAN_VERSION_MAJOR}.${RENDERMAN_VERSION_MINOR}")
 endif()
 
 # will set RENDERMAN_FOUND
@@ -150,6 +138,7 @@ list(APPEND required_vars "RENDERMAN_INCLUDE_DIR")
 list(APPEND required_vars "RENDERMAN_EXECUTABLE")
 list(APPEND required_vars "RENDERMAN_BINARY_DIR")
 list(APPEND required_vars "RENDERMAN_VERSION_MAJOR")
+list(APPEND required_vars "RENDERMAN_VERSION")
 list(APPEND required_vars "PRMAN_LIBRARY")
 list(APPEND required_vars "PRMAN_STATS_LIBRARY")
 list(APPEND required_vars "PXRCORE_LIBRARY")
diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake
index 9bf69a0229..1da6fe695a 100644
--- a/cmake/modules/FindTBB.cmake
+++ b/cmake/modules/FindTBB.cmake
@@ -197,7 +197,12 @@ if(NOT TBB_FOUND)
   ##################################
 
   if(TBB_INCLUDE_DIRS)
-    file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file)
+    # Use new oneTBB version header if it exists.
+    if(EXISTS "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h")
+      file(READ "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h" _tbb_version_file)
+    else()
+      file(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _tbb_version_file)
+    endif()
     string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
         TBB_VERSION_MAJOR "${_tbb_version_file}")
     string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1"
@@ -211,6 +216,13 @@ if(NOT TBB_FOUND)
   # Find TBB components
   ##################################
 
+  # oneTBB on Windows has interface version in the name.
+  if(WIN32 AND TBB_INTERFACE_VERSION GREATER_EQUAL 12000)
+    set(_tbb_library_name tbb12)
+  else()
+    set(_tbb_library_name tbb)
+  endif()
+
   if(TBB_VERSION VERSION_LESS 4.3)
     set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc tbb)
   else()
@@ -219,15 +231,21 @@ if(NOT TBB_FOUND)
 
   # Find each component
   foreach(_comp ${TBB_SEARCH_COMPOMPONENTS})
-    if(";${TBB_FIND_COMPONENTS};tbb;" MATCHES ";${_comp};")
+    if(";${TBB_FIND_COMPONENTS};tbb" MATCHES ";${_comp};")
+
+      if(${_comp} STREQUAL tbb)
+        set(_lib_name ${_tbb_library_name})
+      else()
+        set(_lib_name ${_comp})
+      endif()
 
       # Search for the libraries
-      find_library(TBB_${_comp}_LIBRARY_RELEASE ${_comp}
+      find_library(TBB_${_comp}_LIBRARY_RELEASE ${_lib_name}
           HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR}
           PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH
           PATH_SUFFIXES ${TBB_LIB_PATH_SUFFIX})
 
-      find_library(TBB_${_comp}_LIBRARY_DEBUG ${_comp}_debug
+      find_library(TBB_${_comp}_LIBRARY_DEBUG ${_lib_name}_debug
           HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR}
           PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH
           PATH_SUFFIXES ${TBB_LIB_PATH_SUFFIX})
diff --git a/docs/README.md b/docs/README.md
index 90b44c4c9d..0b164acec0 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -174,4 +174,99 @@ sphinx-build . /tmp/usddocs
 ```
 
 Sphinx tracks changed files, so subsequent builds will be faster than the first.
- 
\ No newline at end of file
+
+### Generating Schema User Docs
+
+Use the python/genSchemaDocs.py tool to generate Sphinx content files from 
+USD schemas. The process for authoring schema user doc is as follows:
+
+- Create (if it doesn't already exist) a sub-directory named "userDoc" where
+  your schema.usda lives.
+- In your userDoc directory, create (or update) overview "guide" markdown files 
+  for your schemas, using the 
+  [Myst Markdown](https://myst-parser.readthedocs.io/en/v0.15.1/sphinx/intro.html) 
+  format. Add any local image files to the user_doc directory as well.
+- In your userDoc directory, create (or update) "schemaUserDoc.usda". This
+  will contain reference user doc for your schema classes and properties. Your
+  schemaUserDoc.usda should sublayer your schema.usda, and provide overs for
+  schema classes you want to add user doc for. Each over should add "userDoc" 
+  and "userDocBrief" customData metadata strings for each schema class and 
+  property. The "userDoc" string is used to generate the Sphinx output, and
+  should be in 
+  [Myst Markdown](https://myst-parser.readthedocs.io/en/v0.15.1/sphinx/intro.html) 
+  format. The "userDocBrief" string is not used for Sphinx output, and is used
+  for brief user doc presented in the UI of DCC Tools. The custom data will
+  look something like the following:
+
+```
+over SchemaClass "SchemaClass" (
+    customData = {
+        string userDocBrief = """A short sentence or two describing the schema."""
+        string userDoc = """A longer set of paragraphs describing the schema
+in detail. Use Markdown format to include images, links, etc. Use Myst Markdown
+to add Sphinx directives like references and labels.
+"""
+)
+{
+    asset schemaAssetProperty (
+      customData = {
+          string userDocBrief = """A short sentence or two describing the 
+  property."""
+          string userDoc = """A longer set of paragraphs describing the property
+  in detail, again using Markdown and Sphinx directives as needed."""
+      }
+    )
+}
+```  
+
+  Your "schemaUserDoc.usda" should also provide a "GLOBAL" prim that contains
+  custom metadata for the schema domain name ("libraryName") and a short title 
+  for the table-of-contents page for the generated Sphinx files 
+  ("userDocTitle"). For example, for usdVol, the GLOBAL over in 
+  schemaUserDoc.usda looks like the following:
+
+```
+over "GLOBAL" (
+    customData = {
+        string libraryName = "usdVol"
+        string userDocTitle = "Volumes"
+    }
+)
+{
+}
+```  
+
+See pxr/usd/usdVol/userDoc/ for examples of the files mentioned above. Some
+additional notes:
+
+- Don't have any leading whitespace in your multiline doc strings. The 
+generation process doesn't strip this out (because that would break spacing in 
+things like codeblocks), and the extra whitespace will show up in the generated 
+HTML.
+- Don't add your own markdown headers (e.g. "# Title") in schemaUserDoc.usda. 
+The generation tool automatically creates headers and Sphinx labels for 
+classes and properties, and extra headers might result in confusing output.
+You don't need to add RST labels for schema classes and attributes 
+- The generation tool automatically adds Sphinx labels for classes and 
+properties, using a `<schema name>_<property name>` format.
+- In your overview guide markdown files, feel free to add labels to any 
+sections you might need to link to from your schemaUserDoc.usda content. 
+Using Myst Markdown, the syntax is "(label name)=" on its own line.
+
+To generate the Sphinx files from your schema user doc files, run the 
+genSchemaDocs.py tool pointing it at your userDocs directory and the 
+desired output path. For example, if your current working directory was
+docs/, you could generate usdVol Sphinx files into 
+docs/user_guides/schemas/usdVol/ using the following command:
+
+```
+python python/genSchemaDocs.py ../pxr/usd/usdVol/userDocs user_guides/schemas -t
+```
+
+This will parse the content in pxr/usd/usdVol/userDocs and generate Sphinx
+files into user_guides/schemas/usdVol, along with a usdVol_toc.rst 
+table-of-contents file that can be included in any Sphinx RST file (like
+docs/user_guides/schemas/index.rst).
+
+Current content in docs/user_guides/schemas have been generating using the 
+genSchemaDocs.py tool. 
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index f8fe3c3119..e6511ffb70 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -135,7 +135,7 @@ def GetSphinxLogger():
     'display_version': False,
     'collapse_navigation': False,
     'sticky_navigation': False,
-    'navigation_depth': 3,
+    'navigation_depth': 4,
     'style_nav_header_background': '#606060'
 }
 
diff --git a/docs/contributing_to_usd.rst b/docs/contributing_to_usd.rst
index a43946e5c6..98bf013555 100644
--- a/docs/contributing_to_usd.rst
+++ b/docs/contributing_to_usd.rst
@@ -105,7 +105,10 @@ Here is the workflow we recommend for contributing changes to USD:
 
        
 
-    #. Now you can work in your branch locally.
+    #. Now you can work in your branch locally. Please review the USD
+       `Coding Guidelines <api/_page__coding__guidelines.html>`__ and 
+       `Testing Guidelines <api/_page__testing__guidelines.html>`__ 
+       when making code changes.
 
         .. | space |
 
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in
index a2a8abd152..d8c444a718 100644
--- a/docs/doxygen/Doxyfile.in
+++ b/docs/doxygen/Doxyfile.in
@@ -757,6 +757,7 @@ WARN_LOGFILE           =
 INPUT                  = docs/doxygen/externalOverview.dox \
                          docs/doxygen/developer_guides.dox \
                          docs/doxygen/architecture-guides \
+                         docs/doxygen/developer-guidelines \
                          docs/include/pxr/extras/imaging \
                          docs/include/pxr/base \
                          docs/include/pxr/usd \
diff --git a/docs/doxygen/developer-guidelines/coding_guidelines.dox b/docs/doxygen/developer-guidelines/coding_guidelines.dox
new file mode 100644
index 0000000000..9a5cf08f57
--- /dev/null
+++ b/docs/doxygen/developer-guidelines/coding_guidelines.dox
@@ -0,0 +1,139 @@
+/*!
+\page Page_Coding_Guidelines Coding Guidelines for OpenUSD
+
+Use the following coding guidelines when making code changes to OpenUSD.
+
+\section Coding_Conventions_And_Formatting OpenUSD Code Conventions and Formatting Guidelines
+
+Code should follow the formatting rules:
+
+<ul>
+<li>Each line shouldn't exceed 80 characters.</li>
+<li>K&R style braces are required, even for: `if`, `for`, `while`, and similar 
+control-flow statements that have a single line in their bodies. Always put the 
+body code for a function or control-flow statement on a separate line.</li>
+<li>Naming conventions:</li>
+<ul> 
+<li>Class names should be upper camel case nouns, and should be preceded by the 
+library prefix (for example, `UsdLuxLightFilter`).</li>
+<li>Use CapWords style for method names (for example, `ReadImage()`). If 
+possible, prefix method and function names with a verb.</li>
+<li>Instance variables (data members) should start with a lowercase letter and 
+should use the mixedCase style for multiple words (for example, `imageData`).</li>
+<li>Begin private and protected methods, functions, and member variables with an 
+underscore (for example, `_PrivateMethod()`, `_privateData`).</li>
+</ul>
+<li>Make sure your code is wrapped in the `PXR` namespace. To do this:</li>
+<ul>
+<li>Add `PXR_NAMESPACE_OPEN_SCOPE` at the top of every C++ file, header and cpp, 
+after the includes.</li>
+<li>Add `PXR_NAMESPACE_CLOSE_SCOPE` at the bottom of every C++ file, header and 
+cpp.</li>
+<li>Add `PXR_NAMESPACE_USING_DIRECTIVE` at the top of any C++ test code, after 
+the includes.</li>
+</ul>
+<li>Protect header files from multiple inclusion by using guard macros, using a 
+macro name of the form `PACKAGENAME_HEADERNAME_H`. For example, in 
+`pxr/usd/usd/tokens.h` the following guard macros are used: 
+
+\code{.c}
+#ifndef USD_TOKENS_H
+#define USD_TOKENS_H
+...header content…
+#endif
+\endcode
+ 
+Use guard macros rather than `#pragma once` directives.</li>
+<li>For libraries, export your symbols by doing the following:</li>
+<ul>
+<li>Add an api.h file if needed (these are mostly boilerplate and you can copy and 
+edit an existing one from any existing library). Define a `LIBNAME_API` macro 
+for your library (e.g. `USD_API`, `SDF_API`, etc).</li>
+<li>API tags should go on (non-inlined) methods rather than classes. The only 
+exception is for subclasses of Qt classes; for these, you should use the macro 
+name `LIBNAME_API_CLASS` rather than `LIBNAME_API` for code-search purposes.</li>
+<li>Use your appropriate `LIBNAME_API` macro for any declaration you need to 
+export. This will typically include:</li>
+<ul> 
+<li>On non-templated public members of public classes, including statics and 
+operators.</li>
+<li>On non-templated public free functions and global data.</li>
+<li>On destructors of public classes.</li>
+<li>On protected members of public base classes that may be subclassed outside 
+the library.</li>
+<li>On public pure-virtual declarations of public base classes.</li>
+<li>On any function or datum (even private) that may be referenced from a 
+wrapping implementation, referenced from a public method marked inline, or that 
+may be called from a public templated function definition in a header file.</li>
+<li>On full specializations of public templated functions (i.e., `template<>` 
+with empty parameters).</li>
+<li>As a special declaration for templates that must have a common 
+instantiation, e.g. because of global data.</li>
+</ul>
+<li>Use your `LIBNAME_API` macro on declarations, not definitions. It should be 
+added after `template`, `class`, and/or `struct`, if present, and before `static`
+and/or `virtual`, if present, and before the symbol's type. For classes, you'll 
+typically mark individual methods/members, and not entire classes, although 
+small public structs may be exported in their entirety.</li>
+</ul>
+<li>License header: please add this text at the top of each new source file
+(in comments):
+
+\code{.unparsed}
+Copyright YYYY Pixar 
+
+Licensed under the terms set forth in the LICENSE.txt file available at https://openusd.org/license
+\endcode
+</li>
+</ul>
+
+\section Coding_General_Guidelines General Guidelines
+
+\subsection Coding_Small_Changes Make Small Atomic Changes
+
+Keep your changes small and atomic so it's easier to do code reviews, and, if 
+necessary, to troubleshoot regressions.  
+
+For example, split features into their own changelists; split API changes and 
+behavior changes into different changelists; split schema changes and 
+implementation into different changelists. Splitting up larger changes makes it 
+easier and less risky to incorporate these changes into the codebase.
+
+\subsection Coding_Testing Test Your Changes
+
+All code changes should have proper test coverage to ensure code quality. See 
+\ref Page_Testing_Guidelines for more information on writing tests.
+
+\subsection Coding_Add_Documentation Add Documentation
+
+Changes should be accompanied by API documentation and user documentation, if 
+applicable, to help other developers and users make the most of your changes.
+
+\subsubsection Coding_API_Documentation API Documentation
+
+If you are adding new or modifying existing APIs, please update the 
+corresponding documentation. This should be completed prior to getting a code 
+review, so the reviewer has more context and can also help identify anything in 
+the documentation that may cause confusion.
+
+For C++ code we use <a href="https://www.doxygen.nl/index.html">doxygen-style comments</a>
+for documentation and generate HTML documentation from these comments.
+
+If you are adding or updating USD schemas that will get generated into C++ code 
+from the schema.usda file (i.e. not codeless schemas), you should add your API 
+documentation (in doxygen-style format) in the "doc" metadata field string of 
+the schema class or attribute. These strings will be converted into C++ comments 
+in the generated code (via usdGenSchema.py).
+
+\subsubsection Coding_User_Documentation User Documentation
+
+User documentation is usually written in <a href="https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html">reStructured Text</a>
+(as .rst files) or <a href="https://mystmd.org/">Myst Markdown</a> 
+(as .md files) format, and generated into HTML using <a href="https://www.sphinx-doc.org/en/master/index.html">Sphinx</a>. 
+Content files and Sphinx scripts are currently in the `docs/` directory.
+
+If you are adding or updating USD schemas, you should also add user 
+documentation for the schema classes and properties using the "userDocBrief" 
+and "userDoc" custom metadata fields. See `docs/README.md` for more details.
+
+*/
\ No newline at end of file
diff --git a/docs/doxygen/developer-guidelines/testing_guidelines.dox b/docs/doxygen/developer-guidelines/testing_guidelines.dox
new file mode 100644
index 0000000000..d6f4f1e762
--- /dev/null
+++ b/docs/doxygen/developer-guidelines/testing_guidelines.dox
@@ -0,0 +1,413 @@
+/*!
+\page Page_Testing_Guidelines Testing Guidelines for OpenUSD
+
+All USD code changes should have proper test coverage to ensure code quality. 
+USD uses CMake's built-in CTest program for testing. Use the following 
+guidelines to understand how to write and run USD tests.
+
+\section Testing_Writing_Unit_Tests Writing Unit Tests
+
+Unit tests are required for all changes to a USD module. Unit tests can be 
+written in C++ and/or Python. USD unit test source files and asset files are 
+located in a testenv directory in the appropriate USD module's directory,
+and are added to the USD module's CMakeLists.txt, as described below.
+
+\subsection Testing_Naming_Conventions Test Naming Conventions
+
+Tests should be named using the format "test<USD module><Thing Being Tested>". 
+For example, "testUsdFlatten", or "testUsdGeomExtentTransform".  
+
+Within the test code, test methods should be named using the format 
+"test_<Some Behavior>". For example, "test_Flatten", "test_Export", etc.
+
+\subsection Testing_Adding_Test_Files Adding or Updating Test Files
+
+Test source files and resources (such as USD files, images, etc) should be 
+located as follows.
+
+<ul>
+<li>Test source (C++, Python) files should be added to the `testenv` directory for 
+a given USD module. For example, all test source files for usdLux are in 
+`pxr/usd/usdLux/testenv/`.</li>
+<li>Test resources, if needed, should be added to a subdirectory in `testenv` named 
+for the test. For example, USD files needed for the testUsdLuxLightListAPI test 
+are in `pxr/usd/usdLux/testenv/testUsdLuxLightListAPI/`.</li>
+</ul>
+
+\note Some test resource directories in USD currently are named with `.testenv` 
+appended to the test name. Appending `.testenv` is an older convention that is 
+not needed anymore.
+
+\subsection Testing_Registering_Tests Registering Tests
+
+Register your test in the USD module's CMakeLists.txt to ensure the CTest 
+harness runs your test. Tests are registered using the 
+`pxr_register_test wrapper` function, which also provides a list of steps the 
+harness will do to run your test. A list of common options for 
+`pxr_register_test` follows (note this is not a complete list of options, see 
+`cmake/macros/Public.cmake` for details on `pxr_register_test`):
+
+Option                      | Meaning
+--------------------------- | -------------
+`STDOUT_REDIRECT <file-name>` | Redirect stdout from a test to the file name specified.
+`STDERR_REDIRECT <file-name>` | Redirect stderr from a test to the file name specified.
+`DIFF_COMPARE <file-name>+`   | After the test has completed, diff file-name(s) against the corresponding file(s) in `<pxr_install_test_dir dir>/baseline/`
+`ENV <key=value>+`            | A set of key-value pairs specifying environment configuration to set.
+`EXPECTED_RETURN_CODE <num>`  | An exit code to match against after running the test.
+`PYTHON`                      | Indicates that the test is Python based.
+`REQUIRES_DISPLAY`            | Indicates that the test requires a connected display to run. If there is no display at the time of running the test, the wrapper will skip it.
+`COMMAND <cmd>`               | The main command to run.
+`PRE_COMMAND <cmd>` / `POST_COMMAND <cmd>` | Commands to run before or after the main command. These currently don't provide output redirection and expect an exit code of 0.
+
+<b>Example</b>
+
+The test registration for the testUsdFlatten Python test looks as follows:
+
+\code{.unparsed}
+pxr_register_test(testUsdFlatten
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdFlatten"
+    EXPECTED_RETURN_CODE 0
+)
+\endcode
+
+\subsection Testing_Test_InstallationTest Installation
+
+Use `pxr_install_test_dir` to specify where test assets should get installed 
+when the test harness is run. Note that the name used for `DEST` must exactly 
+match the name used in test registration. If your test does not use any 
+additional assets, you don't need to add a `pxr_install_test_dir` call nor add 
+the "<your test name>" directory to `testenv/`. 
+
+<b>Example</b>
+
+The install for testUsdFlatten assets looks like:
+
+\code{.unparsed}
+pxr_install_test_dir(
+    SRC testenv/testUsdFlatten
+    DEST testUsdFlatten
+)
+\endcode
+
+\subsection Testing_Python_Unit_Tests Python Unit Tests
+
+Python tests need to be added to CMakeLists.txt using the `pxr_test_scripts` 
+function. Python unit tests should use Python's <a href="https://docs.python.org/3/library/unittest.html">unittest module</a>. 
+
+\subsection Testing_CPP_Unit_Tests C++ Unit Tests
+
+Use the `pxr_build_test` function to CMakeLists.txt to specify how your C++ 
+test is built. Test binaries will be installed to 
+`${CMAKE_INSTALL_PREFIX}/tests/`. Any libraries needed by the test itself must 
+be explicitly listed in the `LIBRARIES` section.
+
+<b>Example</b>
+
+The `pxr_build_test` for the C++ testUsdAttributeBlockingCpp test looks like:
+
+\code{.unparsed}
+pxr_build_test(testUsdAttributeBlockingCpp
+    LIBRARIES
+        tf
+        usd
+    CPPFILES
+        testenv/testUsdAttributeBlocking.cpp
+)
+\endcode
+
+\section Testing_Building_Tests Building Tests
+
+To build the USD tests, use the `PXR_BUILD_TESTS` CMake build configuration 
+(this defaults to `ON` if not set), or use the `--tests` command line argument 
+if you are building using the build_usd.py script.
+
+\section Testing_Running_Tests Running Tests
+
+To run tests, use CMake's <a href="https://cmake.org/cmake/help/latest/manual/ctest.1.html">ctest command</a>
+and run from the build directory. 
+    
+To run all tests:
+
+\code{.unparsed}
+$ cd /my-build-directory/build/USD
+$ ctest -C Release
+\endcode
+
+To run an individual test:
+
+\code{.unparsed}
+$ cd /my-build-directory/build/USD
+$ ctest -C Release -R test-to-run
+\endcode
+
+An example individual test run will look something like the following:
+
+\code{.unparsed}
+$ ctest -C Release -R testUsdFlatten
+Test project /Users/dsyu/temp/tests-build/build/USD
+    Start 452: testUsdFlatten
+1/5 Test #452: testUsdFlatten ...................   Passed    0.55 sec
+    Start 453: testUsdFlatten2
+2/5 Test #453: testUsdFlatten2 ..................   Passed    0.33 sec
+    Start 454: testUsdFlatten3
+3/5 Test #454: testUsdFlatten3 ..................   Passed    0.31 sec
+    Start 455: testUsdFlatten4
+4/5 Test #455: testUsdFlatten4 ..................   Passed    0.33 sec
+    Start 456: testUsdFlattenLayerStack
+5/5 Test #456: testUsdFlattenLayerStack .........   Passed    0.33 sec
+
+100% tests passed, 0 tests failed out of 5
+
+Total Test time (real) =   1.92 sec
+\endcode
+
+\section Testing_Walkthroughs Unit Test Example Walkthroughs
+
+\subsection Testing_Python_Walkthrough Python Unit Test Example Walkthrough
+
+The following simple walkthrough describes the basic steps for adding a new 
+"testUsdGeomMyFeature" Python unit test to the usdGeom module.
+
+We add our Python test code by creating a new Python script, 
+testUsdGeomMyFeature.py, in `pxr/usd/usdGeom/testenv/`.
+
+\code{.py}
+#!/pxrpythonsubst
+#
+# Copyright 2024 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+
+import unittest
+
+from pxr import Vt, Gf, Sdf, Usd, UsdGeom
+
+class TestUsdGeomMyFeature(unittest.TestCase):
+
+    def test_MyFeaturePart1(self):
+        stage = Usd.Stage.CreateInMemory()
+
+        # ...various test and verification code...
+        # Use unittest asserts (assertTrue, assertFalse, assertEquals, etc) 
+        # for verifying test conditions
+        self.assertTrue(myTestCondition)
+
+    # ...more test methods as needed...
+
+if __name__ == "__main__":
+    unittest.main()
+\endcode
+
+We create a testUsdGeomMyFeature directory in `testenv/` for any test resources, 
+such as USD files, images, etc. We configure CTest to copy test resources from 
+this directory by adding the following to `pxr/usd/usdGeom/CMakeLists.txt`.
+
+\code{.unparsed}
+pxr_install_test_dir(
+    SRC testenv/testUsdGeomMyFeature
+    DEST testUsdGeomMyFeature
+)
+\endcode
+
+In CMakeLists.txt we register our new test by adding the following registration 
+steps:
+
+\code{.unparsed}
+pxr_register_test(testUsdGeomMyFeature
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdGeomMyFeature"
+    EXPECTED_RETURN_CODE 0
+)
+\endcode
+
+We then add our test to `pxr_test_scripts`:
+
+\code{.unparsed}
+pxr_test_scripts(
+    ...
+    testenv/testUsdGeomMyFeature.py
+)
+\endcode
+
+At this point, we can now build USD with our new test:
+
+\code{.unparsed}
+$ python3 build_scripts/build_usd.py /my-build-directory --no-examples --no-tutorials --tools --python --no-docs --tests
+  ...
+  Building                      Shared libraries
+    Variant                     Release
+    Target                      native
+    Imaging                     On
+      Ptex support:             Off
+      OpenVDB support:          Off
+      OpenImageIO support:      On 
+      OpenColorIO support:      Off 
+      PRMan support:            Off
+    UsdImaging                  On
+      usdview:                  On
+    MaterialX support           On
+    Python support              On
+      Python Debug:             Off
+      Python docs:              Off
+    Documentation               Off
+    Tests                       On
+    ...
+\endcode
+
+Once the build is complete and we've set the appropriate environment variables 
+(`PYTHONPATH` and `PATH`) for our build, we can cd to our build directory and 
+run our test:
+
+\code{.unparsed}
+$ cd /my-build-directory/build/USD
+$ ctest -C Release -R testUsdGeomMyFeature
+Test project /my-build-directory/build/USD
+    Start 501: testUsdGeomMyFeature
+1/1 Test #501: testUsdGeomMyFeature .............   Passed    0.48 sec
+
+100% tests passed, 0 tests failed out of 1
+
+Total Test time (real) =   0.53 sec
+\endcode
+
+\subsection Testing_CPP_Walkthrough C++ Unit Test Example Walkthrough
+
+The following simple walkthrough describes the basic steps for adding a new 
+"testUsdGeomMyFeature" C++ unit test to the usdGeom module.
+
+We start by adding our C++ test code to a new testUsdGeomMyFeature.cpp file in 
+`pxr/usd/usdGeom/testenv/`.
+
+\code{.c}
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/usd/usd/stage.h"
+#include "pxr/usd/sdf/layer.h"
+#include "pxr/base/vt/value.h" 
+#include "pxr/base/arch/fileSystem.h"
+// ...other includes as needed...
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+void
+TestMyFeature()
+{
+    // ...various test and verification code...
+    // You can use Tf macros like TF_VERIFY to verify test conditions 
+    TF_VERIFY(myTestCondition);
+}
+
+int main()
+{
+    TestMyFeature();
+
+    printf("\n\n>>> Test SUCCEEDED\n");
+}
+\endcode
+
+We create a testUsdGeomMyFeature directory in `testenv/` for any test resources, 
+such as USD files, images, etc. We configure CTest to copy test resources from 
+this directory by adding the following to `pxr/usd/usdGeom/CMakeLists.txt`.
+
+\code{.unparsed}
+pxr_install_test_dir(
+    SRC testenv/testUsdGeomMyFeature
+    DEST testUsdGeomMyFeature
+)
+\endcode
+
+In CMakeLists.txt we register our new test by adding the following registration 
+steps:
+
+\code{.unparsed}
+pxr_register_test(testUsdGeomMyFeature
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdGeomMyFeature"
+    EXPECTED_RETURN_CODE 0
+)
+\endcode
+
+We add the build steps for our test to CMakeLists.txt using `pxr_build_test`:
+
+\code{.unparsed}
+pxr_build_test(testUsdGeomMyFeature
+    LIBRARIES
+        usd
+        usdGeom
+    CPPFILES
+        testenv/testUsdGeomMyFeature.cpp
+)
+\endcode
+
+At this point, we can now build USD with our new test:
+
+\code{.unparsed}
+$ python3 build_scripts/build_usd.py /my-build-directory --no-examples --no-tutorials --tools --python --no-docs --tests
+
+  ...
+  Building                      Shared libraries
+    Variant                     Release
+    Target                      native
+    Imaging                     On
+      Ptex support:             Off
+      OpenVDB support:          Off
+      OpenImageIO support:      On 
+      OpenColorIO support:      Off 
+      PRMan support:            Off
+    UsdImaging                  On
+      usdview:                  On
+    MaterialX support           On
+    Python support              On
+      Python Debug:             Off
+      Python docs:              Off
+    Documentation               Off
+    Tests                       On
+    ...
+\endcode
+
+Once the build is complete and we've set the appropriate environment variables 
+(`PYTHONPATH` and `PATH`) for our build, we can cd to our build directory and 
+run our test:
+
+\code{.unparsed}
+$ cd /my-build-directory/build/USD
+$ ctest -C Release -R testUsdGeomMyFeature
+Test project /my-build-directory/build/USD
+    Start 501: testUsdGeomMyFeature
+1/1 Test #501: testUsdGeomMyFeature .............   Passed    0.48 sec
+
+100% tests passed, 0 tests failed out of 1
+
+Total Test time (real) =   0.53 sec
+\endcode
+
+\section Testing_Expectations Test Expectations for Open Source Submissions
+
+Please include unit tests for your changes in your submission. Don't forget to 
+include any additional resources (USD files, image files, etc) that your tests 
+use with your submission.
+
+Please make sure all unit tests are passing (including any tests you have added) 
+before submitting a PR. Note that currently the USD github CI/CD for PRs only 
+does verification builds and does not run tests. Please run and verify tests on 
+all platforms (Linux, macOS, Windows) if possible.
+
+If you do any additional testing, using your own test integrations, please note 
+the types of tests run and their results in the comments submitted with your 
+commits/PRs. This helps inform code reviewers and helps with troubleshooting 
+down the line.
+
+For submissions, Pixar will run an internal suite of tests to try to find 
+correctness or performance regressions before code is checked into the central 
+code repository. These tests often take several hours to complete. If test 
+issues crop up, a Pixar developer will do initial research into the errors and 
+reach out for help if needed.
+
+*/
\ No newline at end of file
diff --git a/docs/doxygen/developer_guides.dox b/docs/doxygen/developer_guides.dox
index 084691d514..7942726e80 100644
--- a/docs/doxygen/developer_guides.dox
+++ b/docs/doxygen/developer_guides.dox
@@ -1,13 +1,18 @@
 /*!
 \page Developer_Guides Developer Guides
 
-\section Developer_Guides_Hydra Hydra Guides
+<b>General Guidelines</b>
+
+- \subpage Page_Coding_Guidelines
+- \subpage Page_Testing_Guidelines
+
+<b>Hydra Guides</b>
 
 - \subpage Page_Hydra_Getting_Started_Guide
 - \subpage Page_Hydra_Scene_Browser
 - \subpage Page_Hydra_Prim_Schemas
 
-\section Developer_Guides_MaterialX MaterialX Guides
+<b>MaterialX Guides</b>
 
 - \subpage Page_MaterialX_In_Hydra_USD
 
diff --git a/docs/doxygen/externalOverview.dox b/docs/doxygen/externalOverview.dox
index 60ae3d09a3..3f410a5d85 100644
--- a/docs/doxygen/externalOverview.dox
+++ b/docs/doxygen/externalOverview.dox
@@ -28,7 +28,7 @@ or jump directly into the core of the \ref usd_page_front "Usd API."
 
 <HR>
 
-USD is distributed under a <a href="https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt"> modified Apache 2.0 license</a>
+USD is distributed under the <a href="https://openusd.org/license"> TOST license</a>
 */
 
 /*!
diff --git a/docs/glossary.rst b/docs/glossary.rst
index fbad4e4bfd..ded8b663d9 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -571,6 +571,10 @@ down the asset into meaningful groups) with other collections.
 
 We create and query Collections using :usdcpp:`UsdCollectionAPI`.
 
+For more details on Collections, including pattern-based collections that use
+a path expression to determine collection membership, 
+see :ref:`collections_and_patterns`.`
+
 .. _usdglossary-component:
 
 Component
diff --git a/docs/intro.rst b/docs/intro.rst
index 43f09a1d75..03305bbb50 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -33,9 +33,8 @@ In addition, because USD's core scenegraph and :ref:`composition engine
 extended in a maintainable way to encode and compose data in other domains.
 
 Concretely, USD is an `open source project
-<https://github.com/PixarAnimationStudios/OpenUSD>`_ released under a `modified
-Apache license
-<https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt>`_.
+<https://github.com/PixarAnimationStudios/OpenUSD>`_ released under the 
+`TOST license <https://openusd.org/license>`_.
 
 Why use USD?
 ============
diff --git a/docs/plugins_renderman.rst b/docs/plugins_renderman.rst
index 77ca3481ef..fecb224ca0 100644
--- a/docs/plugins_renderman.rst
+++ b/docs/plugins_renderman.rst
@@ -83,6 +83,12 @@ variables. We'll refer to the install location of your USD build with
    * - :envvar:`RMAN_TEXTUREPATH`
      - Search path for textures and RenderMan Rtx plugins
      - :filename:`$RMANTREE/lib/textures:$RMANTREE/lib/plugins:<inst>/plugin/usd`
+   * - :envvar:`RMAN_DISPLAYPATH`
+     - Search path for Renderman display plugins
+     - :filename:`$RMANTREE/lib/plugins`
+   * - :envvar:`RMAN_PROCEDURALPATH`
+     - Search path for Renderman procedural plugins
+     - :filename:`$RMANTREE/lib/plugins`
 
 Developer
 #########
diff --git a/docs/python/convertDoxygen.py b/docs/python/convertDoxygen.py
index 680d294370..f1073f897e 100644
--- a/docs/python/convertDoxygen.py
+++ b/docs/python/convertDoxygen.py
@@ -1,26 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
-#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # convertDoxygen.py
 #
diff --git a/docs/python/doxygenlib/cdDocElement.py b/docs/python/doxygenlib/cdDocElement.py
index 0215a51880..c2c82f0bf7 100644
--- a/docs/python/doxygenlib/cdDocElement.py
+++ b/docs/python/doxygenlib/cdDocElement.py
@@ -1,26 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
-#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # cdDocElement.py
 #
diff --git a/docs/python/doxygenlib/cdParser.py b/docs/python/doxygenlib/cdParser.py
index 78cdc335d0..c0d5b23c24 100644
--- a/docs/python/doxygenlib/cdParser.py
+++ b/docs/python/doxygenlib/cdParser.py
@@ -1,26 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
-#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # cdParser.py
 #
diff --git a/docs/python/doxygenlib/cdUtils.py b/docs/python/doxygenlib/cdUtils.py
index 7ef9a7e502..5f1d55656a 100644
--- a/docs/python/doxygenlib/cdUtils.py
+++ b/docs/python/doxygenlib/cdUtils.py
@@ -1,26 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
-#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # cdUtils.py
 #
diff --git a/docs/python/doxygenlib/cdWriterDocstring.py b/docs/python/doxygenlib/cdWriterDocstring.py
index 8ccf771a02..7cb4d58144 100644
--- a/docs/python/doxygenlib/cdWriterDocstring.py
+++ b/docs/python/doxygenlib/cdWriterDocstring.py
@@ -1,26 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
-#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # cdWriterDocstring.py
 #
diff --git a/docs/python/genSchemaDocs.py b/docs/python/genSchemaDocs.py
new file mode 100644
index 0000000000..2960d72782
--- /dev/null
+++ b/docs/python/genSchemaDocs.py
@@ -0,0 +1,617 @@
+#!/pxrpythonsubst
+#
+# Copyright 2024 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+"""
+This script generates Sphinx documentation (in "Myst" Markdown form)
+for USD schemas with user documentation content. It takes as input 
+a schema's "schemaUserDoc.usda" (and path) and produces markdown content
+with the schema class and property docs, along with any overview documentation
+(if provided by the schema).
+"""
+
+import sys
+import os
+from argparse import ArgumentParser
+import re
+import shutil
+import datetime
+from collections import namedtuple
+
+# Need to set the environment variable for disabling the schema registry's
+# loading of schema type prim definitions before importing any pxr libraries,
+# otherwise this setting won't take. We disable this to make sure we don't try
+# to load generatedSchema.usda files (which usdGenSchema generates) during
+# our processing of schema definitions, to ensure this script is really only
+# looking at our loaded schema.usda / schemaUserDoc.usda information.
+os.environ["USD_DISABLE_PRIM_DEFINITIONS_FOR_USDGENSCHEMA"] = "1"
+from pxr import Ar, Plug, Sdf, Usd, Vt, Tf
+
+#------------------------------------------------------------------------------#
+# Tokens                                                                       #
+#------------------------------------------------------------------------------#
+
+# Name of script, e.g. "genSchemaDocs"
+PROGRAM_NAME = os.path.splitext(os.path.basename(sys.argv[0]))[0]
+
+# Custom metadata tokens for user doc
+USERDOC_BRIEF = "userDocBrief"
+USERDOC_FULL = "userDoc"
+
+SCHEMAUSERDOC_FILENAME = "schemaUserDoc.usda"
+SCHEMA_FILENAME = "schema.usda"
+SCHEMAUSERDOC_DIRNAME = "userDoc"
+
+#------------------------------------------------------------------------------#
+# Helper classes                                                               #
+#------------------------------------------------------------------------------#
+
+class _Printer():
+    """
+    Object used for printing. This gives us a way to control output with regards 
+    to program arguments such as --quiet.
+    """
+    def __init__(self, quiet=False):
+        self._quiet = quiet
+
+    def __PrintImpl(self, stream, *args):
+        if len(args):
+            print(*args, file=stream)
+        else:
+            print(file=stream)
+
+    def __call__(self, *args):
+        if not self._quiet:
+            self.__PrintImpl(sys.stdout, *args)
+
+    def Err(self, *args):
+        self.__PrintImpl(sys.stderr, *args)
+
+    def SetQuiet(self, quiet):
+        self._quiet = quiet
+
+Print = _Printer()
+
+# Named tuple to hold data needed to document a property
+_PropertyData = namedtuple("_PropertyData",
+    "name className doc valueType defaultValue")
+
+class _SchemaDoc:
+    """
+    Convenience data class for schema class userDoc
+    """
+    def __init__(self, schemaDomain, schemaName, userDoc):
+        self.schemaDomain = schemaDomain
+        self.schemaName = schemaName
+        self.userDoc = userDoc
+        self.propertyDoc = {}
+        self.resourceFiles = []
+        resourceFiles = _GetResourceFilesFromMarkdownString(userDoc)
+        self.resourceFiles.extend(resourceFiles)
+        self.markdownWriter = _SchemaDocMarkdownGenerator(self.schemaDomain,
+            self.schemaName)
+        self.inheritsList = []
+
+    def SetInheritsList(self, inheritsClassList):
+        """
+        Set the inherits list for this schema
+        """
+        self.inheritsList = list(inheritsClassList)
+
+    def AddPropertyDoc(self, className, propertyName, propertyDoc, propertyType,
+        defaultValue):
+        """
+        Add the userDoc for a property. className refers to the class where
+        the property was defined, and helps track inherited properties.
+        """
+        if className not in self.propertyDoc:
+            self.propertyDoc[className] = {}
+        self.propertyDoc[className][propertyName] = _PropertyData(propertyName,
+            className, propertyDoc, propertyType, defaultValue)
+        # Extract image/resource files in propertyDoc, if any
+        resourceFiles = _GetResourceFilesFromMarkdownString(propertyDoc)
+        self.resourceFiles.extend(resourceFiles)
+
+    def WriteMystMarkdownFile(self, filepath):
+        """
+        Write schema class and property user doc to "schema.md" Myst markdown file
+        Returns path+filename to written file
+        """
+        # For now, writing as basic markdown. If we need additional features
+        # (e.g. tables, etc), consider using https://python-markdown.github.io/
+        filename = os.path.join(os.path.abspath(filepath), self.schemaName + ".md")
+        try:
+            with open(filename, 'w') as file:
+                self.markdownWriter.WriteHeader(file)
+                self.markdownWriter.WriteSchema(file, self.userDoc)
+                if len(self.propertyDoc) > 0:
+                    self.markdownWriter.WritePropertiesTitle(file)
+                    # List non-inherited properties first (if any)
+                    if self.schemaName in self.propertyDoc:
+                        nonInheritedProps = self.propertyDoc[self.schemaName]
+                        for prop in sorted(nonInheritedProps):
+                            self.markdownWriter.WriteProperty(file, nonInheritedProps[prop])
+                    # Followed by list of inherited properties (again, if any)
+                    if len(self.propertyDoc) > 1 or (len(self.propertyDoc) == 1 and
+                        self.schemaName not in self.propertyDoc):
+                        # Add in inherits hierarchy order
+                        for inheritsClass in self.inheritsList:
+                            if inheritsClass in self.propertyDoc:
+                                self.markdownWriter.WriteInheritedPropertiesTitle(
+                                    file, inheritsClass)
+                                for prop in sorted(self.propertyDoc[inheritsClass]):
+                                    self.markdownWriter.WriteProperty(
+                                        file, self.propertyDoc[inheritsClass][prop])
+                        # Add any "unknown" at the end?
+                        if "unknown" in self.propertyDoc:
+                            self.markdownWriter.WriteInheritedPropertiesTitle(
+                                file, "unknown")
+                            for prop in sorted(self.propertyDoc["unknown"]):
+                                self.markdownWriter.WriteProperty(
+                                    file, self.propertyDoc["unknown"][prop])
+        except IOError as openException:
+            Print.Err("Failed to write to " + filename + ": " + str(openException))
+        return filename
+
+    def GetResourceFiles(self):
+        """
+        Returns a list of discovered resource files, such as images, referenced
+        in class or property userdoc
+        """
+        return self.resourceFiles
+
+
+class _SchemaDocMarkdownGenerator:
+    """
+    Utility class for writing data from a _SchemaDoc to a Myst Markdown file
+    """
+    def __init__(self, schemaDomain, schemaName):
+        self.schemaDomain = schemaDomain
+        self.schemaName = schemaName
+
+    def __WriteSphinxLabel(self, file, labelString):
+        """
+        Writes a Sphinx/RST-style label to the file, which for Myst Markdown
+        is a line on its own of the format "(labelString)="
+        Note that in most circumstances you need to place the label _before_
+        a header for Sphinx to use it (as an anchor)
+        """
+        label = "(" + labelString + ")="
+        file.write("\n" + label + "\n")
+
+    def WriteHeader(self, file):
+        """
+        Write "header" markdown content (non-rendered file metadata)
+        """
+        # Write "comments"
+        workStr = ("% WARNING: THIS FILE IS GENERATED BY " + PROGRAM_NAME +
+            ". DO NOT EDIT.\n")
+        file.write(workStr)
+        workStr = "% Generated: " + datetime.datetime.now().strftime(
+            "%I:%M%p on %B %d, %Y") + "\n\n"
+        file.write(workStr)
+
+    def WriteSchema(self, file, schemaUserDoc):
+        """
+        Write markdown content for schema class (but not its properties)
+        """
+        # Add a label for the schema for other files to link/refer to
+        # This needs to come before the header
+        #workStr = self.schemaDomain + "_" + self.schemaName
+        workStr = self.schemaName
+        self.__WriteSphinxLabel(file, workStr)
+        # Write main title of page, which is the schema name
+        workStr = "# " + self.schemaName + "\n"
+        file.write(workStr)
+        workStr = "\n" + schemaUserDoc + "\n"
+        file.write(workStr)
+        # Add an in-page TOC for convenience
+        workStr = "```{contents}\n"
+        file.write(workStr)
+        workStr = ":depth: 2\n"
+        file.write(workStr)
+        workStr = ":local:\n"
+        file.write(workStr)
+        workStr = ":backlinks: none\n"
+        file.write(workStr)
+        workStr = "```\n"
+        file.write(workStr)
+
+    def WritePropertiesTitle(self, file):
+        """
+        Write markdown for properties section title
+        """
+        workStr = self.schemaName + "_properties"
+        self.__WriteSphinxLabel(file, workStr)
+        workStr = "\n" + "## Properties" + "\n"
+        file.write(workStr)
+
+    def WriteInheritedPropertiesTitle(self, file, parentClass):
+        """
+        Write markdown for inherited properties section title
+        Adds Sphinx reference to parentClass
+        """
+        workStr = self.schemaName + "_inheritedproperties_" + parentClass
+        self.__WriteSphinxLabel(file, workStr)
+        workStr = "\n" + "## Inherited Properties ("
+        workStr += "{ref}`" + parentClass + "`"
+        workStr += ")" + "\n"
+        file.write(workStr)
+
+    def WriteProperty(self, file, propData):
+        """
+        Write markdown content for a schema property
+        """
+        # Add a label for the property for linking/referring to
+        # note that this must come before the header for the property
+        workStr = self.schemaName + "_" + propData.name
+        self.__WriteSphinxLabel(file, workStr)
+        # Write a header for the property
+        workStr = "\n### " + propData.name + "\n"
+        file.write(workStr)
+        # Check if valueType is "rel" and note that the property is
+        # really a relationship
+        if propData.valueType == "rel":
+            workStr = ("\n**USD type**: `" + str(propData.valueType) +
+             "` (relationship)\n")
+        else:
+            workStr = ("\n**USD type**: `" + str(propData.valueType) + "`\n")
+        file.write(workStr)
+        if propData.defaultValue is not None:
+            workStr = ("\n**Fallback value**: `" + str(propData.defaultValue) +
+             "`\n")
+            file.write(workStr)
+        workStr = "\n" + propData.doc + "\n"
+        file.write(workStr)
+
+#------------------------------------------------------------------------------#
+# Helper functions                                                             #
+#------------------------------------------------------------------------------#
+
+def _GetResourceFilesFromMarkdownString(markdown):
+    """
+    Scans markdown string for any referenced local resource files (e.g. images)
+    and returns list of any files found. Used to determine what image files 
+    might need to get copied over to output dir
+    """
+    imageFileList = []
+    # Look for markdown-style image links of the format: ![link text](image link)
+    # via this regex: !\[[^\]]*\]\((.*?)\s*\)
+    imageMatches = re.findall(r'!\[[^\]]*\]\((.*?)\s*\)', markdown)
+    for match in imageMatches:
+        # We're only looking for local image files, so skip any URLs
+        if not match.startswith("http"):
+            imageFileList.append(match)
+    # We ignore HTML-style image links, as these most likely point to URLs,
+    # not local files
+    # Eventually we will also look for other possible resources:
+    # - Videos: through <video> HTML tag:
+    #   <video src="path/to/video.mp4" width="320" height="240" controls></video>
+    # - But ignore embedded URL videos like
+    #   [![alt text](https://img.youtube.com/vi/video-id/0.jpg)](https://www.youtube.com/watch?v=video-id)
+    return imageFileList
+
+
+def _GetArgs():
+    """
+    Get the cmdline args
+    """
+    usage = "Generate Sphinx user docs from schema USD files."
+    parser = ArgumentParser(description=usage)
+    # We can take either the schemaUserDoc.usda or a dir that contains it
+    # or even a schema.usda if schema author has decided to embed customData
+    # docstrings in schema.usda instead of schemaUserDoc.usda.
+    parser.add_argument('schemaUserDocPath',
+        nargs='?',
+        type=str,
+        default="./" + SCHEMAUSERDOC_FILENAME,
+        help='The source USD file where schema user doc is authored, or '
+        'directory where the USD file and supporting content files are located. '
+        '[Default: %(default)s]')
+    parser.add_argument('sphinxOutputPath',
+        nargs='?',
+        type=str,
+        default='.',
+        help='The target directory where the markdown should be generated. '
+        '[Default: %(default)s]')
+    parser.add_argument('-t', '--sphinxTocFile',
+        action='store_true',
+        help='Optionally generate example Sphinx table-of-contents file.')
+    parser.add_argument('-q', '--quiet',
+        action='store_true',
+        help='Do not output text during execution.')
+    args = parser.parse_args()
+    # Sanity check args
+    if not os.path.exists(args.schemaUserDocPath):
+        Print.Err('Usage Error: First positional argument must be a USD '
+        'schemaUserDoc file, or a directory that contains a schemaUserDoc file.')
+        parser.print_help()
+        sys.exit(1)
+    Print.SetQuiet(args.quiet)
+    return args
+
+
+def _ProcessGuides(userDocsPath):
+    """
+    Process any markdown "guides" included with schemaUserDoc.usda, if any. 
+    Currently these are expected to live in the same dir as schemaUserDoc.usda
+    Returns list of guide files and a separate list of any associated resource 
+    files, such as image files. 
+    """
+    # Use a set to avoid duplicate files
+    guideFiles = set()
+    resourceFiles = set()
+    # Currently we just look for guides in the top-level userDocs dir, but
+    # if we eventually need to allow for a subdir hierarchy, wrap the following
+    # in os.walk
+    files = os.listdir(userDocsPath)
+    # Filter for only markdown (and RST?) files
+    for file in files:
+        fileAndPath = os.path.join(userDocsPath,file)
+        if not os.path.isfile(fileAndPath):
+            continue
+        (shortname, extension) = os.path.splitext(file)
+        if extension == ".md":
+            # Scan file for any local image files
+            with open(fileAndPath, 'r') as checkedFile:
+                fileContent = checkedFile.read()
+                imageFiles = _GetResourceFilesFromMarkdownString(fileContent)
+                for imageFile in imageFiles:
+                    resourceFiles.add(imageFile)
+            guideFiles.add(file)
+    return list(guideFiles), list(resourceFiles)
+
+
+def _ProcessSchemaDocs(schemaFile):
+    """
+    Process schema user doc custom metadata fields, creating Myst markdown
+    files as needed.
+    """
+    # Load the schemaUserDoc.usda or schema.usda and compose into a stage
+    sdfLayer = Sdf.Layer.FindOrOpen(schemaFile)
+    stage = Usd.Stage.Open(sdfLayer)
+    # Get the domain from the global prim
+    globalPrim = stage.GetPrimAtPath("/GLOBAL")
+    domain = ""
+    domainTitle = ""
+    if globalPrim is not None:
+        if "libraryName" in globalPrim.GetCustomData():
+            domain = globalPrim.GetCustomData()["libraryName"]
+        if "userDocTitle" in globalPrim.GetCustomData():
+            domainTitle = globalPrim.GetCustomData()["userDocTitle"]
+    if domain == "":
+        Print.Err("No schema domain (libraryName) found in: " + schemaFile)
+    # Traverse root layer schema classes, extract the userDoc for each
+    # schema and schema property
+    classList = []
+    for sdfPrim in sdfLayer.rootPrims:
+        cls = stage.GetPrimAtPath(sdfPrim.path)
+        # Ignore GLOBAL
+        schemaName = cls.GetName()
+        if schemaName == "GLOBAL":
+            continue
+        # Get schema(class) userDoc from prim customData
+        schemaCustomData = cls.GetCustomData()
+        if USERDOC_FULL in schemaCustomData:
+            workSchema = _SchemaDoc(domain, schemaName,
+                schemaCustomData[USERDOC_FULL])
+        else:
+            Print("Warning: No user doc found for schema class: " + schemaName)
+            workSchema = _SchemaDoc(domain, schemaName, "")
+        # Get inheritance stack
+        inheritsClassList = []
+        inheritsList = cls.GetInherits().GetAllDirectInherits()
+        for inheritsPath in inheritsList:
+            inheritsClassList.append(inheritsPath.name)
+        workSchema.SetInheritsList(inheritsClassList)
+        # Get properties data
+        # Use UsdClass.GetProperties to get inherited/composed properties as well
+        for clsProp in cls.GetProperties():
+            propName = clsProp.GetBaseName()
+            # Get the property USD type and schema fallback value if any
+            if isinstance(clsProp, Usd.Attribute):
+                propTypeName = clsProp.GetTypeName()
+                # Because we're parsing the schema definitions themselves, we
+                # can't check the schema registry and instead have to inspect
+                # the UsdProperty values directly
+                if clsProp.HasAuthoredValue():
+                    propDefault = clsProp.Get()
+                else:
+                    propDefault = None
+            elif isinstance(clsProp, Usd.Relationship):
+                propTypeName = "rel"
+                # Relationships in schemas won't have any "default" targets
+                propDefault = None
+            else:
+                # Skip properties that are not attributes or relationships
+                Print.Err(f"Property {propName} is neither attribute nor "
+                 "relationship: " + clsProp.GetName())
+                continue
+            # We will get composed (inherited) properties as well, and
+            # need to track this so that later doc generation will list these
+            # properties separately.
+            propStack = clsProp.GetPropertyStack()
+            # Use the last spec in the property stack to get the parent class
+            if len(propStack) > 0:
+                propSpec = propStack[-1]
+                propClassName = propSpec.path.GetAbsoluteRootOrPrimPath().name
+                # Check to see if this property is only defined in an over,
+                # in case the property was renamed or deleted in the parent
+                # schema class
+                if len(propStack) == 1:
+                    primSpec = propSpec.owner
+                    # Make sure we have a primSpec and not a relationshipSpec
+                    if isinstance(primSpec, Sdf.PrimSpec):
+                        if primSpec.specifier == Sdf.SpecifierOver:
+                            Print(f"Warning: property {propName} defined in "
+                                f"over but not in schema class {schemaName}. "
+                                "Property may have been renamed or removed.")
+            else:
+                # Treat missing property stacks as errors, skip
+                Print.Err("No property stack found for " + propName)
+                continue
+            # Get property userDoc from property customData
+            propCustomData = clsProp.GetCustomData()
+            if USERDOC_FULL in propCustomData:
+                workSchema.AddPropertyDoc(propClassName, propName,
+                    propCustomData[USERDOC_FULL], propTypeName, propDefault)
+            else:
+                Print("Warning: No user doc found for property " + propName +
+                    " in schema class: " + schemaName)
+                workSchema.AddPropertyDoc(propClassName, propName,
+                    "", propTypeName, propDefault)
+        classList.append(workSchema)
+    return domain, domainTitle, classList
+
+
+def _GenerateSphinxTOC(fileList, outputFile, domain, domainTitle):
+    """
+    Generate a Sphinx TOC file (RST format) with the generated files.
+    This file can be included in a Sphinx build to pull in all doc files
+    for the schema.
+    """
+    try:
+        with open(outputFile, 'w') as file:
+            workStr = (".. WARNING: THIS FILE IS GENERATED BY " + PROGRAM_NAME +
+                ".  DO NOT EDIT.\n")
+            file.write(workStr)
+            workStr = ".. TOC for " + domain + "\n"
+            file.write(workStr)
+            workStr = ".. Generated: " + datetime.datetime.now().strftime(
+                "%I:%M%p on %B %d, %Y") + "\n\n"
+            file.write(workStr)
+            # Create a RST-style H1 header with domain title and name
+            if domainTitle is not None and len(domainTitle) > 0:
+                workTitle = f"{domainTitle} ({domain})"
+            else:
+                workTitle = domain
+            workStr = "#"
+            workStr = workStr.replace("#", "#" * len(workTitle)) + "\n"
+            file.write(workStr)
+            file.write(workTitle + "\n")
+            file.write(workStr)
+            workStr = "\n"
+            file.write(workStr)
+            # Add the TOC entries in the order listed in fileList
+            workStr = ".. toctree::\n"
+            file.write(workStr)
+            for generatedFile in fileList:
+                workStr = "   " + os.path.basename(generatedFile) + "\n"
+                file.write(workStr)
+    except IOError as openException:
+        Print.Err("Failed to write to " + outputFile + ": " + str(openException))
+
+def _InitializeResolver():
+    """
+    Copied from usdGenSchema.py
+
+    Initialize the resolver so that search paths pointing to schema.usda
+    files are resolved to the directories where those files are installed
+    """
+
+    # Force the use of the ArDefaultResolver so we can take advantage
+    # of its search path functionality.
+    Ar.SetPreferredResolver('ArDefaultResolver')
+
+    # Figure out where all the plugins that provide schemas are located
+    # and add their resource directories to the search path prefix list.
+    resourcePaths = set()
+    pr = Plug.Registry()
+    for t in pr.GetAllDerivedTypes('UsdSchemaBase'):
+        plugin = pr.GetPluginForType(t)
+        if plugin:
+            resourcePaths.add(plugin.resourcePath)
+
+    # The sorting shouldn't matter here, but we do it for consistency
+    # across runs.
+    Ar.DefaultResolver.SetDefaultSearchPath(sorted(list(resourcePaths)))
+
+#------------------------------------------------------------------------------#
+# main                                                                         #
+#------------------------------------------------------------------------------#
+
+if __name__ == '__main__':
+    #
+    # Parse Command-line
+    #
+    args = _GetArgs()
+
+    #
+    # Set resolver to find inherited schemas
+    #
+    _InitializeResolver()
+
+    #
+    # Gather and parse schema docs and guides
+    #
+    guidesList = []
+    classList = []
+    resourceList = []
+    if os.path.isdir(args.schemaUserDocPath):
+        # Look for schemaUserDoc.usda in dir
+        schemaFile = os.path.join(os.path.abspath(args.schemaUserDocPath),
+            SCHEMAUSERDOC_FILENAME)
+        if os.path.exists(schemaFile):
+            domain, domainTitle, classList = _ProcessSchemaDocs(schemaFile)
+        else:
+            schemaFile = os.path.join(os.path.abspath(args.schemaUserDocPath),
+                SCHEMA_FILENAME)
+            if os.path.exists(schemaFile):
+                domain, domainTitle, classList = _ProcessSchemaDocs(schemaFile)
+            else:
+                Print.Err("Usage Error: No " + SCHEMAUSERDOC_FILENAME + " or " +
+                    SCHEMA_FILENAME +
+                    " found in provided directory: " + args.schemaUserDocPath)
+                sys.exit(1)
+        # Look for any Markdown files and process accordingly
+        guidesList, resourceList = _ProcessGuides(args.schemaUserDocPath)
+    else:
+        # For now, if dir is not provided, assume that we only want to
+        # process the schemaUserDoc.usda or schema.usda file.
+        domain, domainTitle, classList = _ProcessSchemaDocs(args.schemaUserDocPath)
+
+    #
+    # Write Sphinx output
+    #
+    writtenContentFiles = []
+    writtenResourceFiles = []
+    writtenSchemaGeneratedFiles = []
+    # Create a dir with the schema domain name (e.g. "usdVol")
+    outputDir = os.path.join(os.path.abspath(args.sphinxOutputPath), domain)
+    if not os.path.isdir(outputDir):
+        try:
+            os.makedirs(outputDir, exist_ok=True)
+        except OSError as error:
+            Print.Err(f"Output directory {outputDir} cannot be created")
+            sys.exit(1)
+    # Copy guides and supporting files (first)
+    for file in guidesList:
+        srcFile = os.path.join(args.schemaUserDocPath, file)
+        destFile = os.path.join(outputDir,file)
+        shutil.copy2(srcFile, destFile)
+        writtenContentFiles.append(destFile)
+    for file in resourceList:
+        srcFile = os.path.join(args.schemaUserDocPath, file)
+        destFile = os.path.join(outputDir,file)
+        shutil.copy2(srcFile, destFile)
+        writtenResourceFiles.append(destFile)
+
+    # Copy schema files
+    for schemaClass in sorted(classList, key=lambda x: x.schemaName):
+        outputFile = schemaClass.WriteMystMarkdownFile(outputDir)
+        writtenSchemaGeneratedFiles.append(outputFile)
+        schemaResourceFiles = schemaClass.GetResourceFiles()
+        for file in schemaResourceFiles:
+            srcFile = os.path.join(args.schemaUserDocPath, file)
+            destFile = os.path.join(outputDir,file)
+            shutil.copy2(srcFile, destFile)
+        writtenResourceFiles.extend(schemaResourceFiles)
+    writtenContentFiles.extend(writtenSchemaGeneratedFiles)
+
+    # Generate TOC
+    if args.sphinxTocFile:
+        tocFile = os.path.join(outputDir, domain + "_toc.rst")
+        _GenerateSphinxTOC(writtenContentFiles, tocFile, domain, domainTitle)
diff --git a/docs/python/genToolsetDoc.py b/docs/python/genToolsetDoc.py
new file mode 100644
index 0000000000..ce31e2a425
--- /dev/null
+++ b/docs/python/genToolsetDoc.py
@@ -0,0 +1,115 @@
+#!/pxrpythonsubst
+#
+# Copyright 2024 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+"""
+This script generates a toolset.help file that is used to create the 
+documentation for the Toolset page (https://openusd.org/release/toolset.html)
+The script creates toolset.help with the cmdline "help" output from the 
+below list of tools. 
+"""
+
+import sys
+import os
+from argparse import ArgumentParser
+import subprocess
+import shutil
+
+# Name of script, e.g. "genToolsetDoc"
+PROGRAM_NAME = os.path.splitext(os.path.basename(sys.argv[0]))[0]
+
+# Default name of output file
+OUTPUT_FILE = "toolset.help"
+
+# List of tools to run and the "help" cmdline arg for each tool
+progAndArgList = [("usdedit", "-h"),
+("usdcat", "-h"),
+("usddiff", "-h"),
+("usdview","-h"),
+("usdrecord","-h"),
+("usdresolve","-h"),
+("usdtree","-h"),
+("usdzip","-h"),
+("usdchecker","-h"),
+("usdfixbrokenpixarschemas", "-h"),
+("usdstitch", "-h"),
+("usdstitchclips", "-h"),
+("usddumpcrate", "-h"),
+("sdfdump", "-h"),
+("sdffilter", "-h")
+]
+
+#------------------------------------------------------------------------------#
+# Helper functions                                                             #
+#------------------------------------------------------------------------------#
+
+def _GetArgs():
+    """
+    Get the cmdline args
+    """
+    usage = """Generate toolset.help used in the toolset.rst page. Assumes tools
+ are in the current PATH."""
+    parser = ArgumentParser(description=usage)
+    parser.add_argument('outputPath',
+        nargs='?',
+        type=str,
+        default="./" + OUTPUT_FILE,
+        help='The path and filename for the generated file. '
+        '[Default: %(default)s]')
+    resultArgs = parser.parse_args()
+    return resultArgs
+
+
+def _RunCommandAndCaptureStdout(commandName, arg):
+    """
+    Run the given cmdline command and capture and return the resulting stdout
+    as a string
+    """
+    result = subprocess.run([commandName, arg], stdout=subprocess.PIPE)
+    # Convert from bytes to UTF-8
+    resultStr = result.stdout.decode('utf-8')
+    return resultStr
+
+
+#------------------------------------------------------------------------------#
+# main                                                                         #
+#------------------------------------------------------------------------------#
+
+if __name__ == '__main__':
+
+    # Parse Command-line
+    args = _GetArgs()
+
+    # Check if outputPath is just a path, and append default filename if so
+    if os.path.isdir(args.outputPath):
+        # Append default filename to path
+        outputFile = os.path.join(args.outputPath, OUTPUT_FILE)
+    else:
+        outputFile = args.outputPath
+
+    try:
+        with open(outputFile, 'w') as file:
+            # Run our list of tools with "-h" and capture stdout and append to file
+            # (with markers so that output can be included in a codeblock in Sphinx RST)
+            # Note this assumes the desired version of the built tools are in the
+            # current process path.
+            for cmdAndArg in progAndArgList:
+                cmdStr = _RunCommandAndCaptureStdout(cmdAndArg[0], cmdAndArg[1])
+                # To guard against some commands which output the entire path in 
+                # their help output, we use shutil to get the binary path and
+                # filter out the path portion in cmdStr if found.
+                cmdPath = shutil.which(cmdAndArg[0])
+                cmdStr = cmdStr.replace(cmdPath, os.path.basename(cmdPath))
+                # Use markers in the file to separate output from different commands
+                # needed by Sphinx literalinclude directives in toolset.rst
+                workStr = "\n==== " + cmdAndArg[0] + " start ====\n"
+                file.write(workStr)
+                file.write(cmdStr)
+                workStr = "\n==== " + cmdAndArg[0] + " end ====\n"
+                file.write(workStr)
+    except IOError as openException:
+        print("Failed to write to " + outputFile + ": " + str(openException), file=sys.stderr)
+        sys.exit(1)
diff --git a/docs/toc.rst b/docs/toc.rst
index 3b2108acee..22f1679f90 100644
--- a/docs/toc.rst
+++ b/docs/toc.rst
@@ -22,9 +22,11 @@
    :caption: User Guides
    :maxdepth: 1
 
+   Collections and Patterns <user_guides/collections_and_patterns>
    Namespace Editing <user_guides/namespace_editing>
    Rendering with USD <user_guides/render_user_guide>
    USD Variable Expressions <user_guides/variable_expressions>
+   Schema Domains <user_guides/schemas/index>
 
 .. toctree::
    :hidden:
@@ -48,6 +50,7 @@
    Contributing <contributing_to_usd>
    Contributors <contributors>
    Release Schedule <release_schedule>
+   License <license>
 
 .. toctree::
    :hidden:
diff --git a/docs/toolset.help b/docs/toolset.help
new file mode 100644
index 0000000000..0dab58a874
--- /dev/null
+++ b/docs/toolset.help
@@ -0,0 +1,631 @@
+
+==== usdedit start ====
+usage: usdedit [-h] [-n] [-f] [-p PREFIX] usdFileName
+
+Convert a usd-readable file to the .usda text format in a temporary location
+and invoke an editor on it. After saving and quitting the editor, the edited
+file will be converted back to the original format and OVERWRITE the original
+file, unless you supply the "-n" (--noeffect) flag, in which case no changes
+will be saved back to the original file. The editor to use will be looked up
+as follows: - USD_EDITOR environment variable - EDITOR environment variable -
+emacs in PATH - vim in PATH - notepad in PATH
+
+positional arguments:
+  usdFileName           The usd file to edit.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -n, --noeffect        Do not edit the file.
+  -f, --forcewrite      Override file permissions to allow writing.
+  -p PREFIX, --prefix PREFIX
+                        Provide a prefix for the temporary file name.
+
+==== usdedit end ====
+
+==== usdcat start ====
+Write usd file(s) either as text to stdout or to a specified output file.
+Usage: usdcat [OPTIONS] inputFiles...
+
+Positionals:
+  inputFiles ...              A list of input files
+
+Options:
+  -h,--help                   Print this help message and exit
+  -o,--out file               Write a single input file to this output file instead of stdout.
+  --usdFormat usda|usdc       Use this underlying file format for output files
+                              with the extension 'usd'. For example, passing
+                              '-o output.usd --usdformat usda' will create
+                              output.usd as a text file. The USD_DEFAULT_FILE_FORMAT
+                              environment variable is another way to achieve this.
+  -l,--loadOnly               Attempt to load the specified input files and report 'OK'
+                              or 'ERR' for each one. After all files are processed, this
+                              script will exit with a non-zero exit code if any files
+                              failed to load.
+  -f,--flatten                Compose stages with the input files as root layers
+                              and write their flattened content.
+  --flattenLayerStack         Flatten the layer stack with the given root layer, and
+                              write out the results. Unlike --flatten, this does not flatten
+                              composition arcs (such as references).
+  --skipSourceFileComment     If --flatten is specified, skip adding a comment regarding the
+                              source of the flattened layer in the documentation field of the
+                              output layer.
+  --mask PRIMPATH[,PRIMPATH...]
+                              Limit stage population to these prims, their descendants and
+                              ancestors. To specify multiple paths, either use commas with no
+                              spaces, or quote the argument and separate paths by commas
+                              and/or spaces. Requires --flatten.
+  --layerMetadata             Load only layer metadata in the USD file.
+                              This option cannot be combined with either --flatten or
+                              --flattenLayerStack.
+
+==== usdcat end ====
+
+==== usddiff start ====
+usage: usddiff [-h] [-n] [-f] [-q] files [files ...]
+
+Compares two usd-readable files using a selected diff program. This is chosen
+by looking at the $USD_DIFF environment variable. If this is unset, it will
+consult the $DIFF environment variable. Lastly, if neither of these is set, it
+will try to use the canonical unix program, diff. This will relay the exit
+code of the selected diff program.When comparing two usdz files, each file
+contained in the package will be examined individually. The $USD_IMAGE_DIFF
+environment variable specifies a specific diff program for comparing image
+files. The $USD_IMAGE_DIFF_FORMATS environment variable specifies supported
+image formats using a "," separated list of file extensions.
+
+positional arguments:
+  files           The files to compare. These must be of the form DIR DIR,
+                  FILE... DIR, DIR FILE... or FILE FILE.
+
+optional arguments:
+  -h, --help      show this help message and exit
+  -n, --noeffect  Do not edit either file.
+  -f, --flatten   Fully compose both layers as Usd Stages and flatten into
+                  single layers.
+  -q, --brief     Do not return full results of diffs. Passes --brief to the
+                  diff command.
+
+==== usddiff end ====
+
+==== usdview start ====
+usage: usdview [-h] [--renderer {GL}]
+                                                [--select PRIMPATH]
+                                                [--camera CAMERA]
+                                                [--mask PRIMPATH[,PRIMPATH...]]
+                                                [--clearsettings]
+                                                [--config {}]
+                                                [--defaultsettings]
+                                                [--norender] [--noplugins]
+                                                [--unloaded] [--bboxStandin]
+                                                [--timing] [--allow-async]
+                                                [--traceToFile TRACETOFILE]
+                                                [--traceFormat {chrome,trace}]
+                                                [--tracePython]
+                                                [--memstats {none,stage,stageAndImaging}]
+                                                [--numThreads NUMTHREADS]
+                                                [--ff FIRSTFRAME]
+                                                [--lf LASTFRAME]
+                                                [--cf CURRENTFRAME]
+                                                [--complexity {low,medium,high,veryhigh}]
+                                                [--quitAfterStartup]
+                                                [--sessionLayer SESSIONLAYER]
+                                                [--mute MUTELAYERSRE]
+                                                [--detachLayers]
+                                                [--detachLayersInclude PATTERN[,PATTERN...]]
+                                                [--detachLayersExclude PATTERN[,PATTERN,...]]
+                                                usdFile
+
+View a usd file
+
+positional arguments:
+  usdFile               The file to view
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --renderer {GL}, -r {GL}
+                        Which render backend to use (named as it appears in
+                        the menu).
+  --select PRIMPATH     A prim path to initially select and frame
+  --camera CAMERA, -cam CAMERA
+                        Which camera to set the view to on open - may be given
+                        as either just the camera's prim name (ie, just the
+                        last element in the prim path), or as a full prim
+                        path. Note that if only the prim name is used, and
+                        more than one camera exists with the name, which is
+                        used will be effectively random (default=main_cam)
+  --mask PRIMPATH[,PRIMPATH...]
+                        Limit stage population to these prims, their
+                        descendants and ancestors. To specify multiple paths,
+                        either use commas with no spaces or quote the argument
+                        and separate paths by commas and/or spaces.
+  --clearsettings       Restores usdview settings to default
+  --config {}           Load usdview with the state settings found in the
+                        specified config. If not provided will use the
+                        previously saved application state and automatically
+                        persist state on close
+  --defaultsettings     Launch usdview with default settings
+  --norender            Display only hierarchy browser
+  --noplugins           Do not load plugins
+  --unloaded            Do not load payloads
+  --bboxStandin         Display unloaded prims with bounding boxes
+  --timing              Echo timing stats to console. NOTE: timings will be
+                        unreliable when the --memstats option is also in use
+  --allow-async         Enable asynchronous hydra scene processing
+  --traceToFile TRACETOFILE
+                        Start tracing at application startup and write
+                        --traceFormat specified format output to the specified
+                        trace file when the application quits
+  --traceFormat {chrome,trace}
+                        Output format for trace file specified by
+                        --traceToFile. 'chrome' files can be read in chrome,
+                        'trace' files are simple text reports.
+                        (default=chrome)
+  --tracePython         Enable python trace collection, requires --traceToFile
+                        to be set.
+  --memstats {none,stage,stageAndImaging}
+                        Use the Pxr MallocTags memory accounting system to
+                        profile USD, saving results to a tmp file, with a
+                        summary to the console. Will have no effect if
+                        MallocTags are not supported in the USD installation.
+  --numThreads NUMTHREADS
+                        Number of threads used for processing(0 is max,
+                        negative numbers imply max - N)
+  --ff FIRSTFRAME       Set the first frame of the viewer
+  --lf LASTFRAME        Set the last frame of the viewer
+  --cf CURRENTFRAME     Set the current frame of the viewer
+  --complexity {low,medium,high,veryhigh}, -c {low,medium,high,veryhigh}
+                        Set the initial mesh refinement complexity (low).
+  --quitAfterStartup    quit immediately after start up
+  --sessionLayer SESSIONLAYER
+                        If specified, the stage will be opened with the
+                        'sessionLayer' in place of the default anonymous
+                        layer. As this changes the session layer from
+                        anonymous to persistent, be aware that layers saved
+                        from Export Overrides will include the opinions in the
+                        persistent session layer.
+  --mute MUTELAYERSRE   Layer identifiers searched against this regular
+                        expression will be muted on the stage prior to, and
+                        after loading. Multiple expressions can be supplied
+                        using the | regex separator operator. Alternatively
+                        the argument may be used multiple times.
+
+Detached Layers:
+  Specify layers to be detached from their serialized data source when
+  loaded. This may increase time to load and memory usage but will avoid
+  issues like open file handles preventing other processes from safely
+  overwriting a loaded layer.
+
+  --detachLayers        Detach all layers
+  --detachLayersInclude PATTERN[,PATTERN...]
+                        Detach layers with identifiers containing any of the
+                        given patterns.
+  --detachLayersExclude PATTERN[,PATTERN,...]
+                        Exclude layers with identifiers containing any of the
+                        given patterns from the set of detached layers
+                        specified by the --detachLayers or
+                        --detachLayerIncludes arguments.
+
+==== usdview end ====
+
+==== usdrecord start ====
+usage: usdrecord [-h] [--mask PRIMPATH[,PRIMPATH...]]
+                 [--purposes PURPOSE[,PURPOSE...]]
+                 [--sessionLayer SESSIONLAYER] [--disableGpu]
+                 [--disableCameraLight] [--camera CAMERA]
+                 [--defaultTime | --frames FRAMESPEC[,FRAMESPEC...]]
+                 [--complexity {low,medium,high,veryhigh}]
+                 [--colorCorrectionMode {disabled,sRGB,openColorIO}]
+                 [--renderer {GL}] [--imageWidth IMAGEWIDTH]
+                 [--enableDomeLightVisibility]
+                 [--renderPassPrimPath RPPRIMPATH]
+                 [--renderSettingsPrimPath RSPRIMPATH]
+                 usdFilePath outputImagePath
+
+Generates images from a USD file
+
+positional arguments:
+  usdFilePath           USD file to record
+  outputImagePath       Output image path. For frame ranges, the path must
+                        contain exactly one frame number placeholder of the
+                        form "###" or "###.###". Note that the number of hash
+                        marks is variable in each group.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --mask PRIMPATH[,PRIMPATH...]
+                        Limit stage population to these prims, their
+                        descendants and ancestors. To specify multiple paths,
+                        either use commas with no spaces or quote the argument
+                        and separate paths by commas and/or spaces.
+  --purposes PURPOSE[,PURPOSE...]
+                        Specify which UsdGeomImageable purposes should be
+                        included in the renders. The "default" purpose is
+                        automatically included, so you need specify only the
+                        *additional* purposes. If you want more than one extra
+                        purpose, either use commas with no spaces or quote the
+                        argument and separate purposes by commas and/or
+                        spaces.
+  --sessionLayer SESSIONLAYER
+                        If specified, the stage will be opened with the
+                        'sessionLayer' in place of the default anonymous
+                        layer.
+  --disableGpu          Indicates if the GPU should not be used for rendering.
+                        If set this not only restricts renderers to those
+                        which only run on the CPU, but additionally it will
+                        prevent any tasks that require the GPU from being
+                        invoked.
+  --disableCameraLight  Indicates if the default camera lights should not be
+                        used for rendering.
+  --camera CAMERA, -cam CAMERA
+                        Which camera to use - may be given as either just the
+                        camera's prim name (i.e. just the last element in the
+                        prim path), or as a full prim path. Note that if only
+                        the prim name is used and more than one camera exists
+                        with that name, which one is used will effectively be
+                        random (default=main_cam)
+  --defaultTime, -d     explicitly operate at the Default time code (the
+                        default behavior is to operate at the startTimeCode
+                        authored on the UsdStage which defaults to 0.0)
+  --frames FRAMESPEC[,FRAMESPEC...], -f FRAMESPEC[,FRAMESPEC...]
+                        specify FrameSpec(s) of the time codes to operate on -
+                        A FrameSpec consists of up to three floating point
+                        values for the start time code, end time code, and
+                        stride of a time code range. A single time code can be
+                        specified, or a start and end time code can be
+                        specified separated by a colon (:). When a start and
+                        end time code are specified, the stride may optionally
+                        be specified as well, separating it from the start and
+                        end time codes with (x). Multiple FrameSpecs can be
+                        combined as a comma-separated list. The following are
+                        examples of valid FrameSpecs: 123 - 101:105 - 105:101
+                        - 101:109x2 - 101:110x2 - 101:104x0.5
+  --complexity {low,medium,high,veryhigh}, -c {low,medium,high,veryhigh}
+                        level of refinement to use (default=low)
+  --colorCorrectionMode {disabled,sRGB,openColorIO}, -color {disabled,sRGB,openColorIO}
+                        the color correction mode to use (default=sRGB)
+  --renderer {GL}, -r {GL}
+                        Hydra renderer plugin to use when generating images
+  --imageWidth IMAGEWIDTH, -w IMAGEWIDTH
+                        Width of the output image. The height will be computed
+                        from this value and the camera's aspect ratio
+                        (default=960)
+  --enableDomeLightVisibility
+                        Show the dome light background in the rendered output.
+                        If this option is not included and there is a dome
+                        light in the stage, the IBL from it will be used for
+                        lighting but not drawn into the background.
+  --renderPassPrimPath RPPRIMPATH, -rp RPPRIMPATH
+                        Specify the Render Pass Prim to use to render the
+                        given usdFile. Note that if a renderSettingsPrimPath
+                        has been specified in the stage metadata, using this
+                        argument will override that opinion. Furthermore any
+                        properties authored on the RenderSettings will
+                        override other arguments (imageWidth, camera,
+                        outputImagePath)
+  --renderSettingsPrimPath RSPRIMPATH, -rs RSPRIMPATH
+                        Specify the Render Settings Prim to use to render the
+                        given usdFile. Note that if a renderSettingsPrimPath
+                        has been specified in the stage metadata, using this
+                        argument will override that opinion. Furthermore any
+                        properties authored on the RenderSettings will
+                        override other arguments (imageWidth, camera,
+                        outputImagePath)
+
+==== usdrecord end ====
+
+==== usdresolve start ====
+usage: usdresolve [-h]
+                  [--createContextForAsset CREATECONTEXTFORASSET | --createContextFromString CREATECONTEXTFROMSTRING]
+                  [--anchorPath ANCHORPATH]
+                  inputPath
+
+Resolves an asset path using a fully configured USD Asset Resolver.
+
+positional arguments:
+  inputPath             An asset path to be resolved by the USD Asset
+                        Resolver.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --createContextForAsset CREATECONTEXTFORASSET
+                        Run CreateDefaultContextForAsset with the given asset
+                        path to create the context used for resolution.
+  --createContextFromString CREATECONTEXTFROMSTRING
+                        Run CreateContextFromString with the given string to
+                        create the context used for resolution. This accepts
+                        strings like [<URI Scheme>:]<Configuration String> and
+                        may be specified multiple times. ex: usdresolve
+                        --createContextFromString 'config_primary'
+                        --createContextFromString 'my_uri_scheme:config_uri'
+  --anchorPath ANCHORPATH
+                        Run CreateIdentifier with the input path and this
+                        anchor asset path and resolve the result. ex:
+                        usdresolve --anchorPath /asset/asset.usd sublayer.usd
+
+==== usdresolve end ====
+
+==== usdtree start ====
+usdtree : Writes the tree structure of a USD file. The default is to
+inspect a single USD file. Use the --flatten argument to see the
+flattened (or composed) Stage tree. Special metadata 'kind' and
+'active' are always shown if authored unless --simple is provided.
+
+Usage: usdtree [OPTIONS] inputPath
+
+Positionals:
+  inputPath TEXT REQUIRED     The input file to process
+
+Options:
+  -h,--help                   Print this help message and exit
+  --unloaded                  Do not load payloads.
+  -a,--attributes             Display authored attributes.
+  -m,--metadata               Display authored metadata (active and kind are part of the label and not shown as individual items
+  -s,--simple                 Only display prim names: no specifier, kind or active state.
+  -f,--flatten                Compose the stage with the input file as the root layer and write the flattened content.
+  --flattenLayerStack         Flatten the layer stack with the given root layer. Unlike --flatten, this does not flatten composition arcs (such as references).
+  --mask PRIMPATH[,PRIMPATH...]
+                              Limit stage population to these prims, their descendants and ancestors. To specify multiple paths, either use commas with no spaces, or quote the argument and separate paths by commas and/or spaces. Requires --flatten.
+
+==== usdtree end ====
+
+==== usdzip start ====
+usage: usdzip [-h] [-r] [-a ASSET] [--arkitAsset ARKITASSET] [-c]
+              [-l [LISTTARGET]] [-d [DUMPTARGET]] [-v]
+              [usdzFile] [inputFiles ...]
+
+Utility for creating a .usdz file containing USD assets and for inspecting
+existing .usdz files.
+
+positional arguments:
+  usdzFile              Name of the .usdz file to create or to inspect the
+                        contents of.
+  inputFiles            Files to include in the .usdz file.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -r, --recurse         If specified, files in sub-directories are recursively
+                        added to the package.
+  -a ASSET, --asset ASSET
+                        Resolvable asset path pointing to the root layer of
+                        the asset to be isolated and copied into the package.
+  --arkitAsset ARKITASSET
+                        Similar to the --asset option, the --arkitAsset option
+                        packages all of the dependencies of the named scene
+                        file. Assets targeted at the initial usdz
+                        implementation in ARKit operate under greater
+                        constraints than usdz files for more general 'in
+                        house' uses, and this option attempts to ensure that
+                        these constraints are honored; this may involve more
+                        transformations to the data, which may cause loss of
+                        features such as VariantSets.
+  -c, --checkCompliance
+                        Perform compliance checking of the input files. If the
+                        input asset or "root" layer fails any of the
+                        compliance checks, the package is not created and the
+                        program fails.
+  -l [LISTTARGET], --list [LISTTARGET]
+                        List contents of the specified usdz file. If a file-
+                        path argument is provided, the list is output to a
+                        file at the given path. If no argument is provided or
+                        if '-' is specified as the argument, the list is
+                        output to stdout.
+  -d [DUMPTARGET], --dump [DUMPTARGET]
+                        Dump contents of the specified usdz file. If a file-
+                        path argument is provided, the contents are output to
+                        a file at the given path. If no argument is provided
+                        or if '-' is specified as the argument, the contents
+                        are output to stdout.
+  -v, --verbose         Enable verbose mode, which causes messages regarding
+                        files being added to the package to be output to
+                        stdout.
+
+==== usdzip end ====
+
+==== usdchecker start ====
+usage: usdchecker [-h] [-s] [-p] [-o [OUTFILE]] [--noAssetChecks] [--arkit]
+                  [-d] [-v] [-t]
+                  [inputFile]
+
+Utility for checking the compliance of a given USD stage or a USDZ package.
+Only the first sample of any relevant time-sampled attribute is checked,
+currently. General USD checks are always performed, and more restrictive
+checks targeted at distributable consumer content are also applied when the "
+--arkit" option is specified.
+
+positional arguments:
+  inputFile             Name of the input file to inspect.
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -s, --skipVariants    If specified, only the prims that are present in the
+                        default (i.e. selected) variants are checked. When
+                        this option is not specified, prims in all possible
+                        combinations of variant selections are checked.
+  -p, --rootPackageOnly
+                        Check only the specifiedpackage. Nested packages,
+                        dependencies and their contents are not validated.
+  -o [OUTFILE], --out [OUTFILE]
+                        The file to which all the failed checks are output. If
+                        unspecified, the failed checks are output to stdout;
+                        if "stderr", terminal coloring will be surpressed.
+  --noAssetChecks       If specified, do NOT perform extra checks to help
+                        ensure the stage or package can be easily and safely
+                        referenced into aggregate stages.
+  --arkit               Check if the given USD stage is compatible with
+                        RealityKit's implementation of USDZ as of 2023. These
+                        assets operate under greater constraints that usdz
+                        files for more general in-house uses, and this option
+                        attempts to ensure that these constraints are met.
+  -d, --dumpRules       Dump the enumerated set of rules being checked for the
+                        given set of options.
+  -v, --verbose         Enable verbose output mode.
+  -t, --strict          Return failure code even if only warnings are issued,
+                        for stricter compliance.
+
+==== usdchecker end ====
+
+==== usdfixbrokenpixarschemas start ====
+usage: usdfixbrokenpixarschemas [-h] [--backup BACKUPFILE] [-v] [inputFile]
+
+Fixes usd / usdz layer by applying appropriate fixes defined in the
+UsdUtils.FixBrokenPixarSchemas. If the given usd file has any fixes to be
+saved, a backup is created for that file. If a usdz package is provided, it is
+extracted recursively at a temp location, and fixes are applied on each layer
+individually, which are then packaged into a new usdz package, while creating
+a backup of the original.
+
+positional arguments:
+  inputFile            Name of the input file to inspect and fix.
+
+optional arguments:
+  -h, --help           show this help message and exit
+  --backup BACKUPFILE  optional backup file path, if none provided creates a
+                       <inputFile>.bck.<usda|usdc|usdz> at the inputFile
+                       location
+  -v, --verbose        Enable verbose mode.
+
+==== usdfixbrokenpixarschemas end ====
+
+==== usdstitch start ====
+usage: usdstitch [-h] [-o OUT]
+                                                  usdFiles [usdFiles ...]
+
+Stitch multiple usd file(s) together into one. Opinion strength is determined
+by the order in which the file is given, with the first file getting the
+highest strength. The exception to this general behavior is in time samples,
+which are merged together as a union across the input layers. It is consistent
+in that, if two time sample keys conflict, the strong layer takes precedence.
+
+positional arguments:
+  usdFiles
+
+optional arguments:
+  -h, --help         show this help message and exit
+  -o OUT, --out OUT  specify a file to write out to
+
+==== usdstitch end ====
+
+==== usdstitchclips start ====
+usage: usdstitchclips [-h] [-o OUT] [-c CLIPPATH] [-s STARTTIMECODE]
+                      [-r STRIDE] [-e ENDTIMECODE] [-t] [-p TEMPLATEPATH]
+                      [--clipSet CLIPSET] [--activeOffset ACTIVEOFFSET]
+                      [--interpolateMissingClipValues] [-n]
+                      usdFiles [usdFiles ...]
+
+Stitch multiple usd file(s) together into one using value clips.
+An example command is:
+
+usdstitchclips --out result.usd --clipPath /World/fx/Particles_Splash clip1.usd clip2.usd 
+
+This will produce two files, a result.topology.usd and a result.usd.
+
+positional arguments:
+  usdFiles
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -o OUT, --out OUT     specify the filename for the top-level result file,
+                        which also serves as base-name for the topology and
+                        manifest files.
+  -c CLIPPATH, --clipPath CLIPPATH
+                        specify a prim path at which to begin stitching clip
+                        data.
+  -s STARTTIMECODE, --startTimeCode STARTTIMECODE
+                        specify the time at which the clips will become active
+  -r STRIDE, --stride STRIDE
+                        specify a stride for the numeric component of
+                        filenames for template metadata
+  -e ENDTIMECODE, --endTimeCode ENDTIMECODE
+                        specify the time at which the clips will cease being
+                        active
+  -t, --templateMetadata
+                        author template clip metadata in the root layer.
+  -p TEMPLATEPATH, --templatePath TEMPLATEPATH
+                        specify a template asset path to author
+  --clipSet CLIPSET     specify a named clipSet in which to author clip
+                        metadata, so that multiple sets of clips can be
+                        applied on the same prim.
+  --activeOffset ACTIVEOFFSET
+                        specify an offset for template-based clips, offsetting
+                        the frame number of each clip file.
+  --interpolateMissingClipValues
+                        specify whether values for clips without authored
+                        samples are interpolated from surrounding clips if no
+                        default value is authored in any clip.
+  -n, --noComment       do not write a comment specifying how the usd file was
+                        generated
+
+==== usdstitchclips end ====
+
+==== usddumpcrate start ====
+usage: usddumpcrate [-h] [-s] inputFiles [inputFiles ...]
+
+Write information about a usd crate (usdc) file to stdout
+
+positional arguments:
+  inputFiles
+
+optional arguments:
+  -h, --help     show this help message and exit
+  -s, --summary  report only a short summary
+
+==== usddumpcrate end ====
+
+==== sdfdump start ====
+Filter and display raw layer data
+Usage: sdfdump [OPTIONS] inputFiles...
+
+Positionals:
+  inputFiles ...              The input files to dump.
+
+Options:
+  -h,--help                   Print this help message and exit
+  -s,--summary                Report a high-level summary.
+  --validate                  Check validity by trying to read all data values.
+  -p,--path regex             Report only paths matching this regex.
+  -f,--field regex            Report only fields matching this regex.
+  -t,--time n or ff..lf       Report only these times (n) or time ranges (ff..lf) for 'timeSamples' fields
+  --timeTolerance tol         Report times that are close to those requested within this relative tolerance. Default: 0.000125
+  --sortBy path|field         Group output by either path or field. Default: path
+  --noValues                  Do not report field values.
+  --fullArrays                Report full array contents rather than number of elements
+
+==== sdfdump end ====
+
+==== sdffilter start ====
+Provides information in a variety of formats (including usda-like) about
+Sdf Layers or specified (filtered) parts of a layer.
+Usage: sdffilter [OPTIONS] inputFiles...
+
+Positionals:
+  inputFiles ...              The input files to process
+
+Options:
+  -h,--help                   Print this help message and exit
+  -p,--path regex             Report only paths matching this regex.
+  -f,--field regex            Report only fields matching this regex.
+  -t,--time n or ff..lf       Report only these times (n) or time ranges (ff..lf) for
+                              'timeSamples' fields
+  --timeTolerance tol         Report times that are close to those requested within this relative tolerance. Default: 0.000125
+  --arraySizeLimit INT        Truncate arrays with more than this many elements.  If -1, do not
+                              truncate arrays.  Default: 0 for 'outline' output, 8 for
+                              'pseudoLayer' output, and -1 for 'layer' output.
+  --timeSamplesSizeLimit INT  Truncate timeSamples with more than this many values.  If -1, do not
+                              truncate timeSamples.  Default: 0 for 'outline' output, 8 for
+                              'pseudoLayer' output, and -1 for 'layer' output.  Truncation
+                              performed after initial filtering by --time arguments.
+  -o,--out TEXT               Direct output to this file.  Use the 'outputFormat' for finer
+                              control over the underlying format for output formats that are
+                              not uniquely determined by file extension.
+  --outputType validity|summary|outline|pseudoLayer|layer
+                              Specify output format; 'summary' reports overall statistics,
+                              'outline' is a flat text report of paths and fields,
+                              'pseudoLayer' is similar to the sdf file format but with truncated
+                              array values and timeSamples for human readability, and 'layer' is
+                              true layer output, with the format controlled by the 'outputFile'
+                              and 'outputFormat' arguments. Default: outline
+  --sortBy path|field         Group 'outline' output by either path or field.  Ignored for other
+                              output types. Default: path
+  --noValues                  Do not report field values.
+
+==== sdffilter end ====
diff --git a/docs/toolset.rst b/docs/toolset.rst
index e076cf58c5..1c7062be18 100644
--- a/docs/toolset.rst
+++ b/docs/toolset.rst
@@ -16,26 +16,10 @@ will be converted back to the original file's format (assuming the
 :code:`FileFormatPlugin` for the format allows writing), and the original
 file's contents will be replaced with the edited contents.
 
-.. code-block:: none
-
-   > usdedit -h
-   
-   usage: usdedit [-h] [-n] [-f] usdFileName
-   
-   Convert a usd-readable file to the .usda text format in a temporary
-   location and invoke an editor on it. After saving and quitting the editor,
-   the edited file will be converted back to the original format and
-   OVERWRITE the original file, unless you supply the "-n" (--noeffect) flag,
-   in which case no changes will be saved back to the original file. The
-   editor to use will be queried from the EDITOR environment variable.
-   
-   positional arguments:
-     usdFileName           The usd file to edit.
-   
-   optional arguments:
-     -h, --help           Show this help message and exit
-     -n, --noeffect       Do not edit the file.
-     -f, --forcewrite     Override file permissions to allow writing.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdedit start ====
+   :end-before: ==== usdedit end ====
 
 **Notes:**
 
@@ -54,51 +38,10 @@ file's contents will be replaced with the edited contents.
 usdcat
 ******
 
-.. code-block:: none
-
-   > usdcat -h
-   usage: usdcat [-h] [-o file] [--usdFormat usda|usdc] [-l] [-f]
-                 [--flattenLayerStack] [--skipSourceFileComment]
-                 [--mask PRIMPATH[,PRIMPATH...]] [--layerMetadata]
-                 inputFiles [inputFiles ...]
-   
-   Write usd file(s) either as text to stdout or to a specified output file.
-   
-   positional arguments:
-     inputFiles
-   
-   optional arguments:
-     -h, --help            show this help message and exit
-     -o file, --out file   Write a single input file to this output file instead
-                           of stdout.
-     --usdFormat usda|usdc
-                           Use this underlying file format for output files with
-                           the extension 'usd'. For example, passing '-o
-                           output.usd --usdFormat usda' will create output.usd as
-                           a text file. The USD_DEFAULT_FILE_FORMAT environment
-                           variable is another way to achieve this.
-     -l, --loadOnly        Attempt to load the specified input files and report
-                           'OK' or 'ERR' for each one. After all files are
-                           processed, this script will exit with a non-zero exit
-                           code if any files failed to load.
-     -f, --flatten         Compose stages with the input files as root layers and
-                           write their flattened content.
-     --flattenLayerStack   Flatten the layer stack with the given root layer, and
-                           write out the result. Unlike --flatten, this does not
-                           flatten composition arcs (such as references).
-     --skipSourceFileComment
-                           If --flatten is specified, skip adding a comment
-                           regarding the source of the flattened layer in the
-                           documentation field of the output layer.
-     --mask PRIMPATH[,PRIMPATH...]
-                           Limit stage population to these prims, their
-                           descendants and ancestors. To specify multiple paths,
-                           either use commas with no spaces or quote the argument
-                           and separate paths by commas and/or spaces. Requires
-                           --flatten.
-     --layerMetadata       Load only layer metadata in the USD file. This option
-                           cannot be combined with either --flatten or
-                           --flattenStack
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdcat start ====
+   :end-before: ==== usdcat end ====
 
 **Notes:**
 
@@ -130,28 +73,10 @@ usddiff
 'ing two named USD-readable files. It is currently quite primitive, with
 limitations noted below, but even so can be quite useful.
 
-.. code-block:: none
-
-   > usddiff -h
-   usage: usddiff [-h] [-n] [-f] files [files ...]
-   
-   Compares two usd-readable files using a selected diff program. This is chosen
-   by looking at the $USD_DIFF environment variable. If this is unset, it will
-   consult the $DIFF environment variable. Lastly, if neither of these is set, it
-   will try to use the canonical unix program, diff. This will relay the exit
-   code of the selected diff program.
-   
-   positional arguments:
-     files           The files to compare. These must be of the form DIR DIR,
-                     FILE... DIR, DIR FILE... or FILE FILE.
-   
-   optional arguments:
-     -h, --help      show this help message and exit
-     -n, --noeffect  Do not edit either file.
-     -f, --flatten   Fully compose both layers as Usd Stages and flatten into
-                     single layers.
-     -q, --brief     Do not return full results of diffs. Passes --brief to the
-                     diff command.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usddiff start ====
+   :end-before: ==== usddiff end ====
 
 **Notes:**
 
@@ -166,78 +91,11 @@ usdview
 gl preview, scenegraph navigation and introspection, a (growing) set of
 diagnostic and debugging facilities, and an interactive python interpreter.
 
-.. code-block:: none
-
-   > usdview -h
-   usage: usdview
-          [-h] [--renderer {GL,Embree,Prman}]
-          [--select PRIMPATH] [--camera CAMERA] [--mask PRIMPATH[,PRIMPATH...]]
-          [--clearsettings] [--defaultsettings] [--norender] [--noplugins]
-          [--unloaded] [--timing] [--memstats {none,stage,stageAndImaging}]
-          [--numThreads NUMTHREADS] [--ff FIRSTFRAME] [--lf LASTFRAME]
-          [--cf CURRENTFRAME] [--complexity {low,medium,high,veryhigh}]
-          [--quitAfterStartup] [--sessionLayer SESSIONLAYER]
-          [--mute MUTELAYERSRE]
-          usdFile
-   
-   View a usd file
-   
-   positional arguments:
-     usdFile               The file to view
-   
-   optional arguments:
-     -h, --help            show this help message and exit
-     --renderer {GL,Embree,Prman}
-                           Which render backend to use (named as it appears in
-                           the menu).
-     --select PRIMPATH     A prim path to initially select and frame
-     --camera CAMERA, -cam CAMERA
-                           Which camera to set the view to on open - may be given
-                           as either just the camera's prim name (ie, just the
-                           last element in the prim path), or as a full prim
-                           path. Note that if only the prim name is used, and
-                           more than one camera exists with the name, which is
-                           used will be effectively random (default=main_cam)
-     --mask PRIMPATH[,PRIMPATH...]
-                           Limit stage population to these prims, their
-                           descendants and ancestors. To specify multiple paths,
-                           either use commas with no spaces or quote the argument
-                           and separate paths by commas and/or spaces.
-     --clearsettings       Restores usdview settings to default
-     --defaultsettings     Launch usdview with default settings
-     --norender            Display only hierarchy browser
-     --noplugins           Do not load plugins
-     --unloaded            Do not load payloads
-     --timing              echo timing stats to console. NOTE: timings will be
-                           unreliable when the --mallocTagStats option is also in
-                           use
-     --memstats {none,stage,stageAndImaging}
-                           Use the Pxr MallocTags memory accounting system to
-                           profile USD, saving results to a tmp file, with a
-                           summary to the console. Will have no effect if
-                           MallocTags are not supported in the USD installation.
-     --numThreads NUMTHREADS
-                           Number of threads used for processing(0 is max,
-                           negative numbers imply max - N)
-     --ff FIRSTFRAME       Set the first frame of the viewer
-     --lf LASTFRAME        Set the last frame of the viewer
-     --cf CURRENTFRAME     Set the current frame of the viewer
-     --complexity {low,medium,high,veryhigh}, -c {low,medium,high,veryhigh}
-                           Set the initial mesh refinement complexity (low).
-     --quitAfterStartup    quit immediately after start up
-     --sessionLayer SESSIONLAYER
-                           If specified, the stage will be opened with the
-                           'sessionLayer' in place of the default anonymous
-                           layer. As this changes the session layer from
-                           anonymous to persistent, be aware that layers saved
-                           from Export Overrides will include the opinions in the
-                           persistent session layer.
-     --mute MUTELAYERSRE   Layer identifiers searched against this regular
-                           expression will be muted on the stage prior to, and
-                           after loading. Multiple expressions can be supplied
-                           using the | regex separator operator. Alternatively
-                           the argument may be used multiple times.
-     
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdview start ====
+   :end-before: ==== usdview end ====
+
 **Further Notes on Command Line Options**
 
     * :option:`--renderer` : Can be used to select any of the render
@@ -284,66 +142,10 @@ usdrecord
 sequences of images) of a USD stage. Images output by this tool are generated
 by Hydra and are equivalent to those displayed in the viewer in `usdview`_ .
 
-.. code-block:: none
-
-   > usdrecord -h
-   usage: usdrecord [-h] [--mask PRIMPATH[,PRIMPATH...]] [--camera CAMERA]
-                    [--defaultTime | --frames FRAMESPEC[,FRAMESPEC...]]
-                    [--complexity {low,medium,high,veryhigh}]
-                    [--colorCorrectionMode {disabled,sRGB,openColorIO}]
-                    [--renderer {GL,Embree,Prman}]
-                    [--imageWidth IMAGEWIDTH]
-                    usdFilePath outputImagePath
-   
-   Generates images from a USD file
-   
-   positional arguments:
-     usdFilePath           USD file to record
-     outputImagePath       Output image path. For frame ranges, the path must
-                           contain exactly one frame number placeholder of the
-                           form "###" or "###.###". Note that the number of hash
-                           marks is variable in each group.
-   
-   optional arguments:
-     -h, --help            show this help message and exit
-     --mask PRIMPATH[,PRIMPATH...]
-                           Limit stage population to these prims, their
-                           descendants and ancestors. To specify multiple paths,
-                           either use commas with no spaces or quote the argument
-                           and separate paths by commas and/or spaces.
-     --camera CAMERA, -cam CAMERA
-                           Which camera to use - may be given as either just the
-                           camera's prim name (i.e. just the last element in the
-                           prim path), or as a full prim path. Note that if only
-                           the prim name is used and more than one camera exists
-                           with that name, which one is used will effectively be
-                           random (default=main_cam)
-     --defaultTime, -d     explicitly operate at the Default time code (the
-                           default behavior is to operate at the Earliest time
-                           code)
-     --frames FRAMESPEC[,FRAMESPEC...], -f FRAMESPEC[,FRAMESPEC...]
-                           specify FrameSpec(s) of the time codes to operate on -
-                           A FrameSpec consists of up to three floating point
-                           values for the start time code, end time code, and
-                           stride of a time code range. A single time code can be
-                           specified, or a start and end time code can be
-                           specified separated by a colon (:). When a start and
-                           end time code are specified, the stride may optionally
-                           be specified as well, separating it from the start and
-                           end time codes with (x). Multiple FrameSpecs can be
-                           combined as a comma-separated list. The following are
-                           examples of valid FrameSpecs: 123 - 101:105 - 105:101
-                           - 101:109x2 - 101:110x2 - 101:104x0.5
-     --complexity {low,medium,high,veryhigh}, -c {low,medium,high,veryhigh}
-                           level of refinement to use (default=high)
-     --colorCorrectionMode {disabled,sRGB,openColorIO}, -color {disabled,sRGB,openColorIO}
-                           the color correction mode to use (default=sRGB)
-     --renderer {GL,Embree,Prman}, -r {GL,Embree,Prman}
-                           Hydra renderer plugin to use when generating images
-     --imageWidth IMAGEWIDTH, -w IMAGEWIDTH
-                           Width of the output image. The height will be computed
-                           from this value and the camera's aspect ratio
-                           (default=960)
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdrecord start ====
+   :end-before: ==== usdrecord end ====
 
 **Further Notes on Command Line Options**
 
@@ -358,26 +160,10 @@ usdresolve
 
 Command-line ArResolver resolution of asset paths.
 
-.. code-block:: none
-
-   > usdresolve -h
-   
-   usage: usdresolve [-h] [--configureAssetPath CONFIGUREASSETPATH]
-                     [--anchorPath ANCHORPATH]
-                     inputPath
-   
-   Resolves an asset path using a fully configured USD Asset Resolver.
-   
-   positional arguments:
-     inputPath             An asset path to be resolved by the USD Asset
-                           Resolver.
-   
-   optional arguments:
-     -h, --help            show this help message and exit
-     --configureAssetPath CONFIGUREASSETPATH
-                           Run ConfigureResolverForAsset on the given asset path.
-     --anchorPath ANCHORPATH
-                           Run AnchorRelativePath on the given asset path.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdresolve start ====
+   :end-before: ==== usdresolve end ====
 
 ******************
 usdtree
@@ -385,41 +171,10 @@ usdtree
 
 Prints to terminal a unixtree-like summary of a USD layer or composition.
 
-.. code-block:: none
-
-   > usdtree -h
-   usage: usdtree [-h] [--unloaded] [--attributes] [--metadata] [--simple]
-                  [--flatten] [--flattenLayerStack]
-                  [--mask PRIMPATH[,PRIMPATH...]]
-                  inputPath
-   
-   Writes the tree structure of a USD file. The default is to inspect a single
-   USD file. Use the --flatten argument to see the flattened (or composed) Stage
-   tree. Special metadata "kind" and "active" are always shown if authored unless
-   --simple is provided.
-   
-   positional arguments:
-     inputPath
-   
-   optional arguments:
-     -h, --help            show this help message and exit
-     --unloaded            Do not load payloads
-     --attributes, -a      Display authored attributes
-     --metadata, -m        Display authored metadata (active and kind are part of
-                           the label and not shown as individual items)
-     --simple, -s          Only display prim names: no specifier, kind or active
-                           state.
-     --flatten, -f         Compose the stage with the input file as root layer
-                           and write the flattened content.
-     --flattenLayerStack   Flatten the layer stack with the given root layer.
-                           Unlike --flatten, this does not flatten composition
-                           arcs (such as references).
-     --mask PRIMPATH[,PRIMPATH...]
-                           Limit stage population to these prims, their
-                           descendants and ancestors. To specify multiple paths,
-                           either use commas with no spaces or quote the argument
-                           and separate paths by commas and/or spaces. Requires
-                           --flatten.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdtree start ====
+   :end-before: ==== usdtree end ====
 
 ******************
 usdzip
@@ -428,58 +183,10 @@ usdzip
 Utility for creating :doc:`USDZ packages <spec_usdz>` from USD compositions and
 the assets (images and others in future) they reference.
 
-.. code-block:: none
-
-   > usdzip -h
-   usage: usdzip [-h] [-r] [-a ASSET] [--arkitAsset ARKITASSET] [-c]
-                 [-l [LISTTARGET]] [-d [DUMPTARGET]] [-v]
-                 [usdzFile] [inputFiles [inputFiles ...]]
-   
-   Utility for creating a .usdz file containging USD assets and for inspecting
-   existing .usdz files.
-   
-   positional arguments:
-     usdzFile              Name of the .usdz file to create or to inspect the
-                           contents of.
-     inputFiles            Files to include in the .usdz file.
-   
-   optional arguments:
-     -h, --help            show this help message and exit
-     -r, --recurse         If specified, files in sub-directories are recursively
-                           added to the package.
-     -a ASSET, --asset ASSET
-                           Resolvable asset path pointing to the root layer of
-                           the asset to be isolated and copied into the package.
-     --arkitAsset ARKITASSET
-                           Similar to the --asset option, the --arkitAsset option
-                           packages all of the dependencies of the named scene
-                           file. Assets targeted at the initial usdz
-                           implementation in ARKit operate under greater
-                           constraints than usdz files for more general 'in
-                           house' uses, and this option attempts to ensure that
-                           these constraints are honored; this may involve more
-                           transformations to the data, which may cause loss of
-                           features such as VariantSets.
-     -c, --checkCompliance
-                           Perform compliance checking of the input files. If the
-                           input asset or "root" layer fails any of the
-                           compliance checks, the package is not created and the
-                           program fails.
-     -l [LISTTARGET], --list [LISTTARGET]
-                           List contents of the specified usdz file. If a file-
-                           path argument is provided, the list is output to a
-                           file at the given path. If no argument is provided or
-                           if '-' is specified as the argument, the list is
-                           output to stdout.
-     -d [DUMPTARGET], --dump [DUMPTARGET]
-                           Dump contents of the specified usdz file. If a file-
-                           path argument is provided, the contents are output to
-                           a file at the given path. If no argument is provided
-                           or if '-' is specified as the argument, the contents
-                           are output to stdout.
-     -v, --verbose         Enable verbose mode, which causes messages regarding
-                           files being added to the package to be output to
-                           stdout.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdzip start ====
+   :end-before: ==== usdzip end ====
 
 ******************
 usdchecker
@@ -490,68 +197,23 @@ of rules and metrics that will evolve over time.  This tool currently
 provides the best assurance that an asset will be properly interchangeable
 and renderable by Hydra.
 
-.. code-block:: none
-
-   > usdchecker -h
-   usage: usdchecker [-h] [-s] [-p] [-o [OUTFILE]] [--arkit] [-d] [-v] inputFile
-   
-   Utility for checking the compliance of a given USD stage or a USDZ package.
-   
-   positional arguments:
-     inputFile             Name of the input file to inspect.
-   
-   optional arguments:
-     -h, --help            show this help message and exit
-     -s, --skipVariants    If specified, only the prims that are present in the
-                           default (i.e. selected) variants are checked. When
-                           this option is not specified, prims in all possible
-                           combinations of variant selections are checked.
-     -p, --rootPackageOnly
-                           Check only the specifiedpackage. Nested packages,
-                           dependencies and their contents are not validated.
-     -o [OUTFILE], --out [OUTFILE]
-                           The file to which all the failed checks are output. If
-                           unspecified, the failed checks are output to stdout.
-     --noAssetChecks       If specified, do NOT perform extra checks to help
-                           ensure the stage or package can be easily and safely
-                           referenced into aggregate stages.
-     --arkit               Check if the given USD stage is compatible with
-                           ARKit's initial implementation of usdz. These assets
-                           operate under greater constraints that usdz files for
-                           more general in-house uses, and this option attempts
-                           to ensure that these constraints are met.
-     -d, --dumpRules       Dump the enumerated set of rules being checked.
-     -v, --verbose         Enable verbose output mode.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdchecker start ====
+   :end-before: ==== usdchecker end ====
 
-******************
+************************
 usdfixbrokenpixarschemas
-******************
+************************
 
 :program:`usdfixbrokenpixarschemas` attempts to fix usd(a|c|z) layers for any
 updates introduced by newer Pixar schema revisions. Note that this does not 
 provide a fixing mechanism for all validation tests listed in `usdchecker`_.
 
-.. code-block:: none
-
-    > usdfixbrokenpixarschemas -h
-    usage: usdfixbrokenpixarschemas [-h] [--backup BACKUPFILE] [-v] [inputFile]
-
-    Fixes usd / usdz layer by applying appropriate fixes defined in the
-    UsdUtils.FixBrokenPixarSchemas. If the given usd file has any fixes to be
-    saved, a backup is created for that file. If a usdz package is provided, it 
-    is extracted recursively at a temp location, and fixes are applied on each 
-    layer individually, which are then packaged into a new usdz package, while 
-    creating a backup of the original.
-
-    positional arguments:
-      inputFile            Name of the input file to inspect and fix.
-
-    optional arguments:
-      -h, --help           show this help message and exit
-      --backup BACKUPFILE  optional backup file path, if none provided creates a
-                           <inputFile>.bck.<usda|usdc|usdz> at the inputFile
-                           location
-      -v, --verbose        Enable verbose mode.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdfixbrokenpixarschemas start ====
+   :end-before: ==== usdfixbrokenpixarschemas end ====
 
 ******************
 usdstitch
@@ -584,26 +246,10 @@ subLayers) and guaranteeing the same evaluation behavior, thus (purely)
 optimizing N layers into one. One can flatten a LayerStack using `usdcat`_
 with its :option:`--flattenLayerStack` option.
 
-.. code-block:: none
-
-   > usdstitch -h
-   usage: [-h] [-o OUT]
-          usdFiles [usdFiles ...]
-   
-   Stitch multiple usd file(s) together into one. Opinion strength is determined
-   by the order in which the file is given, with the first file getting the
-   highest strength. The exception to this general behavior is in time samples,
-   which are merged together as a union across the input layers. It is consistent
-   in that, if two time sample keys conflict, the strong layer takes precedence.
-   
-   
-   positional arguments:
-     usdFiles
-   
-   
-   optional arguments:
-     -h, --help         show this help message and exit
-     -o OUT, --out OUT  specify a file to write out to
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdstitch start ====
+   :end-before: ==== usdstitch end ====
 
 ******************
 usdstitchclips
@@ -693,51 +339,10 @@ particular:
         filename.  **Note** that the *ACTIVEOFFSET* cannot exceed the
         absolute value of *STRIDE*.
 
-.. code-block:: none
-
-   > usdstitchclips -h
-   usage: usdstitchclips [-h] [-o OUT] [-c CLIPPATH] [-s STARTTIMECODE]
-                         [-r STRIDE] [-e ENDTIMECODE] [-t] [-p TEMPLATEPATH]
-                         [--clipSet CLIPSET] [--activeOffset ACTIVEOFFSET] [-n]
-                         usdFiles [usdFiles ...]
-   
-   Stitch multiple usd file(s) together into one using value clips.
-   An example command is:
-   
-   usdstitchclips --out result.usd --clipPath /World/fx/Particles_Splash clip1.usd clip2.usd 
-   
-   This will produce two files, a result.topology.usd and a result.usd.
-   
-   positional arguments:
-     usdFiles
-   
-   optional arguments:
-     -h, --help            show this help message and exit
-     -o OUT, --out OUT     specify the filename for the top-level result file,
-                           which also serves as base-name for the topology file.
-     -c CLIPPATH, --clipPath CLIPPATH
-                           specify a prim path at which to begin stitching clip
-                           data.
-     -s STARTTIMECODE, --startTimeCode STARTTIMECODE
-                           specify the time at which the clips will become active
-     -r STRIDE, --stride STRIDE
-                           specify a stride for the numeric component of
-                           filenames for template metadata
-     -e ENDTIMECODE, --endTimeCode ENDTIMECODE
-                           specify the time at which the clips will cease being
-                           active
-     -t, --templateMetadata
-                           author template clip metadata in the root layer.
-     -p TEMPLATEPATH, --templatePath TEMPLATEPATH
-                           specify a template asset path to author
-     --clipSet CLIPSET     specify a named clipSet in which to author clip
-                           metadata, so that multiple sets of clips can be
-                           applied on the same prim.
-     --activeOffset ACTIVEOFFSET
-                           specify an offset for template-based clips, offsetting
-                           the frame number of each clip file.
-     -n, --noComment       do not write a comment specifying how the usd file was
-                           generated
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usdstitchclips start ====
+   :end-before: ==== usdstitchclips end ====
 
 ******************
 usddumpcrate
@@ -747,19 +352,10 @@ usddumpcrate
 :ref:`USD's Crate File Format <glossary:Crate File Format>`.  This can be
 useful for very low-level debugging.
 
-.. code-block:: none
-
-   > usddumpcrate -h
-   usage: usddumpcrate [-h] [-s] inputFiles [inputFiles ...]
-   
-   Write information about a usd crate (usdc) file to stdout
-   
-   positional arguments:
-     inputFiles
-   
-   optional arguments:
-     -h, --help     show this help message and exit
-     -s, --summary  report only a short summary
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== usddumpcrate start ====
+   :end-before: ==== usddumpcrate end ====
 
 ******************
 sdfdump
@@ -768,25 +364,10 @@ sdfdump
 Provides information on :ref:`Sdf Layers <glossary:Layer>`, which are the
 containers for USD data.
 
-.. code-block:: none
-
-   > sdfdump -h
-   Usage: sdfdump [options] <input file>
-   Options:
-     -h [ --help ]                   Show help message.
-     -s [ --summary ]                Report a high-level summary.
-     --validate                      Check validity by trying to read all data 
-                                     values.
-     -p [ --path ] regex             Report only paths matching this regex.
-     -f [ --field ] regex            Report only fields matching this regex.
-     -t [ --time ] n or ff..lf       Report only these times or time ranges for 
-                                     'timeSamples' fields.
-     --timeTolerance tol (=0.000125) Report times that are close to those 
-                                     requested within this relative tolerance.
-     --sortBy path|field (=path)     Group output by either path or field.
-     --noValues                      Do not report field values.
-     --fullArrays                    Report full array contents rather than number
-                                     of elements.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== sdfdump start ====
+   :end-before: ==== sdfdump end ====
 
 ******************
 sdffilter
@@ -798,58 +379,7 @@ layer. Uses range from finding full information about specific properties, to
 creating "suitable for web/index display" versions of USD files that elide
 large array data.
 
-.. code-block:: none
-
-   > sdffilter -h
-   Usage: sdffilter [options] <input files>
-   Options:
-     -h [ --help ]                         Show help message.
-     -p [ --path ] regex                   Report only paths matching this regex. 
-                                           For 'layer' and 'pseudoLayer' output 
-                                           types, include all descendants of 
-                                           matching paths.
-     -f [ --field ] regex                  Report only fields matching this regex.
-     -t [ --time ] n or ff..lf             Report only these times or time ranges 
-                                           for 'timeSamples' fields.
-     --timeTolerance tol (=0.000125)       Report times that are close to those 
-                                           requested within this relative 
-                                           tolerance.
-     --arraySizeLimit N                    Truncate arrays with more than this 
-                                           many elements.  If -1, do not truncate 
-                                           arrays.  Default: 0 for 'outline' 
-                                           output, 8 for 'pseudoLayer' output, and
-                                           -1 for 'layer' output.
-     --timeSamplesSizeLimit N              Truncate timeSamples with more than 
-                                           this many values.  If -1, do not 
-                                           truncate timeSamples.  Default: 0 for 
-                                           'outline' output, 8 for 'pseudoLayer' 
-                                           output, and -1 for 'layer' output.  
-                                           Truncation performed after initial 
-                                           filtering by --time arguments.
-     -o [ --out ] outputFile               Direct output to this file.  Use the 
-                                           'outputFormat' for finer control over 
-                                           the underlying format for output 
-                                           formats that are not uniquely 
-                                           determined by file extension.
-     --outputType validity|summary|outline|pseudoLayer|layer (=outline)
-                                           Specify output format; 'summary' 
-                                           reports overall statistics, 'outline' 
-                                           is a flat text report of paths and 
-                                           fields, 'pseudoLayer' is similar to the
-                                           sdf file format but with truncated 
-                                           array values and timeSamples for human 
-                                           readability, and 'layer' is true layer 
-                                           output, with the format controlled by 
-                                           the 'outputFile' and 'outputFormat' 
-                                           arguments.
-     --outputFormat format                 Supply this as the 'format' entry of 
-                                           SdfFileFormatArguments for 'layer' 
-                                           output to a file.  Requires both 
-                                           'layer' output and a specified 
-                                           'outputFile'.
-     --sortBy path|field (=path)           Group 'outline' output by either path 
-                                           or field.  Ignored for other output 
-                                           types.
-     --noValues                            Do not report field values for 
-                                           'outline' output.  Ignored for other 
-                                           output types.
+.. literalinclude:: toolset.help
+   :language: none
+   :start-after: ==== sdffilter start ====
+   :end-before: ==== sdffilter end ====
diff --git a/docs/tut_setup_version_badge.rst b/docs/tut_setup_version_badge.rst
index 377baec7bc..e4b5ca917b 100644
--- a/docs/tut_setup_version_badge.rst
+++ b/docs/tut_setup_version_badge.rst
@@ -2,4 +2,4 @@
 
    :fa:`cogs` :ref:`Configure your Environment <tut_usd_tutorials:Environment Setup>`
 
-   :fa:`check` Tested with `USD 24.05 <https://github.com/PixarAnimationStudios/OpenUSD/tree/v24.05>`_
+   :fa:`check` Tested with `USD 24.08 <https://github.com/PixarAnimationStudios/OpenUSD/tree/v24.08>`_
diff --git a/docs/user_guides/collections_and_patterns.rst b/docs/user_guides/collections_and_patterns.rst
new file mode 100644
index 0000000000..6141154db6
--- /dev/null
+++ b/docs/user_guides/collections_and_patterns.rst
@@ -0,0 +1,727 @@
+.. include:: ../rolesAndUtils.rst
+
+.. _collections_and_patterns:
+
+########################
+Collections and Patterns
+########################
+
+Use collections to describe a group of heterogeneous objects within the scene.
+Collections can directly identify prims and properties belonging to prims, and 
+can also identify other collections, whose entire contents will then be included 
+in the collection as well.
+
+Collections are used to facilitate workflows that need a flexible representation
+of sets of objects in a scene. Example use-cases for collections in USD
+include features such as light-linking, where you specify a collection of 
+objects that a given light illuminates, and binding materials to collections, 
+where you can bind a material to a complex collection of logical "parts" of a 
+model. You can even aggregate collections in your workflow by including
+collections in other collections. 
+
+A collection's membership is specified in one of two ways. The first way uses
+target-based rules to specify which objects are included (and excluded) from
+the collection. Collections configured this way are considered to be in 
+**relationship-mode**. A second way of specifying membership uses an 
+expression-based syntax to match objects to be included in the collection. 
+Collections configured this way are **pattern-based collections** and the 
+collection is considered to be in **expression-mode**. Note that you cannot mix 
+collection configurations. Collections can be configured to work in 
+relationship-mode or expression-mode, but not a mix of the two.
+
+Collections are defined in a prim with the CollectionAPI schema applied. The
+CollectionAPI schema is a multiple-apply schema, so it can be applied to a prim 
+multiple times with different instance names to define several collections on a 
+single prim.
+
+The following example shows a single prim with two collections. The 
+``relCollection`` collection is a relationship-mode collection that includes all 
+objects at the :sdfpath:`/World/Clothing/Shirts` and :sdfpath:`/World/Clothing/Pants`
+paths. The ``expCollection`` collection is a pattern-based collection that 
+matches all objects at the :sdfpath:`/World/Clothing/Shirts` path that start 
+with "Red", and any descendants of those objects.
+
+.. code-block:: usda
+
+    def "CollectionPrim" (
+        prepend apiSchemas = ["CollectionAPI:relCollection", "CollectionAPI:expCollection"]
+    )
+    {
+        # Specify collection membership using "includes"
+        rel collection:relCollection:includes = [
+            </World/Clothing/Shirts>,
+            </World/Clothing/Pants>,
+        ]
+
+        # Specify collection membership using a path expression
+        pathExpression collection:expCollection:membershipExpression = "/World/Clothing/Shirts/Red*//"
+    }
+
+.. contents:: Table of Contents
+    :local:
+    :depth: 3
+
+.. _basic_usage:
+
+***********
+Basic Usage
+***********
+
+To create and configure a collection, use the following steps:
+
+1. Apply the CollectionAPI schema to the prim that will contain the collection,
+   either in your USD data or programmatically.
+
+   .. code-block:: usda
+
+       def "CollectionPrim" (
+           prepend apiSchemas = ["CollectionAPI:myCollection"]
+       )
+       {
+           ...
+       }
+
+   .. code-block:: python
+
+       collectionPrim = stage.DefinePrim("/CollectionPrim")
+       myCollection = Usd.CollectionAPI.Apply(collectionPrim, "myCollection")
+
+2. Configure what objects are in the collection by setting properties for
+   a relationship-mode collection or a pattern-based collection, described in
+   :ref:`relationship_mode_collections` and :ref:`pattern_based_collections` 
+   below.
+
+To query a configured collection for objects or paths from the collection, use 
+the following steps:
+
+1. Compute the fully resolved set of objects based on the collection 
+   configuration by calling its ``ComputeMembershipQuery()`` method. This 
+   returns a  ``CollectionMembershipQuery`` object used for querying the 
+   collection. Note that you need to call ``ComputeMembershipQuery()`` whenever 
+   the collection configuration changes.
+
+   .. code-block:: python
+
+       query = myCollection.ComputeMembershipQuery()
+
+2. Use the query object along with the ``ComputeIncludedObjects()`` or
+   ``ComputeIncludedPaths()`` APIs to get the set of matching objects or paths 
+   (respectively) for the collection, queried against a specific stage.
+
+   .. code-block:: python
+
+       matchedObjects = Usd.CollectionAPI.ComputeIncludedObjects(query, stage)
+       for obj in matchedObjects:
+           # ... do something with each matching object ...
+
+       matchedPaths = Usd.CollectionAPI.ComputeIncludedPaths(query, stage)
+       for path in matchedPaths:
+           # ... do something with each matching path ...
+
+   Note that ``ComputeIncludedObjects()`` and ``ComputeIncludedPaths()`` take 
+   an optional ``PrimFlagsPredicate`` argument that defaults to 
+   ``Usd.PrimDefaultPredicate``. If you need to match abstract (class) prims, 
+   you'll need to use a traversal predicate that includes abstract prims, such 
+   as ``PrimAllPrimsPredicate``.
+
+   .. code-block:: python
+
+       # Get all prims including abstract prims
+       matchedObjects = Usd.CollectionAPI.ComputeIncludedObjects(query, stage, Usd.PrimAllPrimsPredicate)
+
+3. If you already are traversing objects in a scene and want to include 
+   checking whether objects are in a collection as part of the traversal, 
+   the query object provides the ``IsPathIncluded()`` method to directly check
+   if a path is in a collection. 
+
+   .. code-block:: python
+
+       # Check to see if /MyPath/PrimA is in myCollection
+       if query.IsPathIncluded("/MyPath/PrimA"):
+           # ...PrimA is in collection, process accordingly...
+
+.. _relationship_mode_collections:
+
+*****************************
+Relationship-Mode Collections
+*****************************
+
+A relationship-mode collection uses "include/exclude" rules to define 
+membership in the collection. These rules are defined via ``includes`` and 
+``excludes`` relationships, and an ``includeRoot`` property, on the 
+collection prim. Additionally, the ``expansionRule`` property controls how
+the ``includes`` and ``excludes`` rules are expanded.
+
+.. _configuring_relationship_mode_collections:
+
+Configuring Relationship-Mode Collections
+=========================================
+
+Use the following built-in properties from the CollectionAPI schema to configure
+membership in a collection in relationship-mode, where ``instanceName`` is the 
+user-provided applied API schema instance name:
+
+* ``rel collection:instanceName:includes``: Specifies a list of targets that are 
+  included in the collection. This can target prims or properties directly. A 
+  collection can insert the rules of another collection by making its includes 
+  relationship target the ``collection:otherInstanceName`` property from the 
+  collection to be included. Note that including another collection does not 
+  guarantee the contents of that collection will be in the final collection; 
+  instead, the rules are merged. This means, for example, an exclude entry may 
+  exclude a portion of the included collection. When a collection includes one 
+  or more collections, the order in which targets are added to the ``includes`` 
+  relationship may become significant, if there are conflicting opinions about 
+  the same path. Targets that are added later are considered to be stronger than 
+  earlier targets for the same path.
+
+* ``rel collection:instanceName:excludes``: Specifies a list of targets that are 
+  excluded below the included paths in this collection. This can target prims or 
+  properties directly, but cannot target another collection. This is to keep the 
+  membership determining logic simple, efficient and easier to reason about. 
+  It is invalid for a collection to exclude paths that are not included in it. 
+  The presence of such "orphaned" excluded paths will not affect the set of 
+  paths included in the collection, but may affect the performance of querying 
+  membership of a path in the collection or of enumerating the objects belonging 
+  to the collection.
+
+  In some scenarios it is useful to express a collection that includes
+  everything except certain paths. To support this, a relationship-mode
+  collection that has an exclude that is not descendant to any include will
+  include the pseudo-root path :sdfpath:`/`.
+
+* ``bool collection:instanceName:includeRoot``: Indicates whether the 
+  pseudo-root path :sdfpath:`/` should be counted as one of the included target 
+  paths. This separate attribute is required because relationships cannot 
+  directly target the root. The fallback value is ``false``. 
+
+The following properties provide additional configuration aspects for 
+collections: 
+
+* ``uniform token collection:instanceName:expansionRule``: Specifies how to 
+  expand the includes and excludes relationship targets to determine the 
+  collection's members. Possible values include:
+
+  * ``expandPrims``: All the prims descendent to the ``includes`` relationship 
+    targets (and not descendent to ``excludes`` relationship targets) belong to 
+    the collection. Any includes-targeted property paths also belong to the 
+    collection. This is the default behavior. 
+  * ``expandPrimsAndProperties``: Like ``expandPrims``, but all properties on 
+    all included prims also belong to the collection. 
+  * ``explicitOnly``: Only paths in the ``includes`` relationship targets and 
+    not those in the ``excludes`` relationship targets belong to the collection.
+
+The following example shows a relationship-mode collection configured to 
+include all prims (but not properties) at 
+:sdfpath:`/World/Lights` and prims from a separate collection at 
+:sdfpath:`/ExtraLights.collection:allExtraLights`, but exclude prims at 
+:sdfpath:`/World/Lights/TestLights`.
+
+.. code-block:: usda
+
+    def "CollectionPrim" (
+        prepend apiSchemas = ["CollectionAPI:allProdLights"]
+    )
+    {
+        # Set the collection expansion rule to specify how the paths for collection are expanded
+        uniform token collection:myCollection:expansionRule = "expandPrims"
+
+        # Set includes/excludes to include all lights except those under /World/Lights/TestLights
+        rel collection:allProdLights:includes = [
+            </World/Lights>,
+            </ExtraLights.collection:allExtraLights>
+        ]
+        rel collection:allProdLights:excludes = [
+            </World/Lights/TestLights>,
+        ]
+    }
+
+.. _pattern_based_collections:
+
+*************************
+Pattern-Based Collections
+*************************
+
+Pattern-based collections provide an alternative way to define the set of 
+objects in a USD collection. Rather than specifying rules for paths to include 
+and exclude in the collection, you provide a **path expression** that the 
+collection API uses to match against objects in your stage. 
+
+Pattern-based collections are helpful in scenarios where the scene hierarchy and 
+composition is complex, and it's not possible to set include and exclude rules 
+that represent the collection you want. Pattern-based collections use 
+expressions that can match path names, object characteristics, and other 
+mechanisms that aren't strictly tied to scene hierarchy. You can also create 
+expressions that reference other expressions for even greater flexibility.
+
+One example use case for pattern-based collections is light-linking. When 
+rendering your USD scene, you might need to control which geometry is 
+illuminated by a particular light. To support this, USD provides light-linking 
+which uses the ``collection:lightLink`` object collection (part of the LightAPI
+schema) to specify which objects are illuminated by a light. However, the 
+lights in your scene might be widely distributed across many layers with 
+different hierarchies. It might be difficult to come up with a set of 
+include/exclude rules that properly capture all the lights you want to add to 
+your collection, and the rules might not work with future changes to lights in 
+the scene. With pattern-based collections, you can use name and path wildcards, 
+expression logic, and other qualifiers, like requiring a prim have the LightAPI 
+schema applied, to assemble your collection.
+
+Pattern-based collections are defined in a prim with the CollectionAPI 
+schema applied and the ``membershipExpression`` attribute set to a valid
+path expression. 
+
+.. note:: 
+    Collections cannot mix includes/excludes and expressions. You can't set both 
+    includes/excludes rules and an expression on a single collection. If a
+    collection has ``includes`` or ``excludes`` rules set, or has its 
+    ``includeRoot`` attribute set to ``true``, the collection is in 
+    relationship-mode and any expression authored on the 
+    ``membershipExpression`` attribute is ignored.
+
+.. _path_expressions:
+
+Path Expressions
+================
+
+A path expression contains zero or more patterns, operators, and references to 
+other expressions, used to capture the set of objects you want to match. You'll 
+typically author your path expressions as strings, and use these strings to set 
+pathExpression attributes on prims with the CollectionAPI schema applied 
+(see :ref:`configuring_pattern_based_collections` below for more details).
+
+.. _path_patterns:
+
+Path Patterns
+-------------
+
+A pattern is a sequence of characters that follow the syntax rules for a 
+``Sdf.Path``, combined with optional glob-style wildcard characters and optional 
+predicate functions. Paths in a pattern can be absolute, or relative.
+
+.. _glob_style_wildcards:
+
+Glob-Style Wildcards
+^^^^^^^^^^^^^^^^^^^^
+
+The supported glob-style wildcard characters are:
+
+* ``*``: Match zero or more characters, but not path or property separators. 
+  Example: ``/char*`` can match :sdfpath:`/char`, :sdfpath:`/character`, 
+  but not :sdfpath:`/char/arm` or :sdfpath:`/char.myAttribute`.
+* ``?``: Match any single character, but not a path or property separator. 
+  Example: ``/appl?`` can match :sdfpath:`/apple` or :sdfpath:`/apply` but not 
+  :sdfpath:`/applesauce` or :sdfpath:`/appl.price`.
+* ``//``: Match any path hierarchy, used to match any arbitrary length path 
+  sequence. Example: ``/primA//leafB`` can match :sdfpath:`primA/leafB` 
+  or :sdfpath:`/primA/child1/child2/leafB`.
+
+.. _predicate_functions:
+
+Predicate Functions
+^^^^^^^^^^^^^^^^^^^
+
+You can optionally include a predicate function in a pattern. Predicate 
+functions let you add additional qualifiers for matching prims and properties. 
+For example, you can specify that any objects that match a specific base pattern 
+(e.g. ``/foo*``) also need to have a particular API schema applied to 
+match, by adding a ``hasAPI`` predicate function:
+
+.. code-block:: 
+
+    /foo*{hasAPI:MaterialBindingAPI}
+
+Predicate functions can take arguments, including named arguments, and may have 
+default values for arguments. USD provides several built-in predicate functions 
+(listed below). 
+
+To use a predicate function with your pattern, specify the predicate function 
+using the ``{predicate-name}`` format. The following example matches root-level 
+prims starting with "char" that are abstract (classes):
+
+.. code-block::
+
+    /char*{abstract}
+
+If a predicate function takes arguments, you can list them in-order using a 
+format of ``{predicate-name:arg1, arg2, etc}`` or using a format of 
+``{predicate-name(arg1, arg2, etc)}``. The following examples match root-level 
+prims starting with "char" that are classes or overs:
+
+.. code-block::
+
+    /char*{specifier:class,over}
+    /char*{specifier(class,over)}
+
+If a predicate function takes named arguments, you can specify them by name, 
+using a format of ``{predicate-name(arg1name=arg1value, arg3name = arg3value, arg2name=arg2value, etc)}``. 
+The following example matches root-level prims starting with "char" that have a 
+variant selection of ``blue`` for the variant set ``myVariantSet`` and a variant 
+selection of ``red`` for the variant set ``myVariantSet2``.
+
+.. code-block::
+
+    /char*{variant(myVariantSet=blue, myVariantSet2=red)}
+
+If a predicate function is not preceded by a pattern, ``*`` is implied to be
+the desired pattern. Similarly, if an expression only consists of a predicate
+function, it's assumed ``//*`` is the intended pattern.
+
+.. code-block::
+
+    /primA/{abstract} # equivalent to "/primA/*{abstract}", all objects under primA that are abstract
+    {abstract}        # equivalent to "//*{abstract}", all objects in the scene that are abstract
+
+Predicate functions can be combined using ``not``, ``and``, ``or`` boolean
+operators, and grouped using ``( )``. The following matches prims that start
+with ``standin`` that have the MaterialBindingAPI schema applied, and are
+not Spheres or Cubes.
+
+.. code-block::
+
+    /standin*{hasAPI:MaterialBindingAPI and not (isa:Sphere or isa:Cube)}
+
+CollectionAPI provides the following built-in predicate functions:
+
+* ``abstract(bool=true)`` match prims that are or are not abstract.
+* ``defined(bool=true)`` match prims that are or are not defined.
+* ``model(bool=true)`` match prims that are or are not considered models.
+* ``group(bool=true)`` match prims that are or are not considered groups.
+* ``kind(kind1, ... kindN, strict=false)`` match prims of any of the given kinds. 
+  If ``strict=true``, matching subkinds is not allowed, only exact matches pass.
+* ``specifier(specifier1, ... specifierN)`` match prims with any of the given 
+  specifiers.
+* ``isa(typeName1, ... typeNameN, strict=false)`` match prims that are any typed 
+  schema typeName1..N or subtypes. Disallow subtypes if ``strict=true``.
+* ``hasAPI(typeName1, ... typeNameN, instanceName='')`` match prims that have any 
+  of the applied API schemas 1..N. If ``instanceName`` is provided, the prim must 
+  have an applied API schema with that instanceName.
+* ``variant(setName1 = selGlob1, ... , setNameN = selGlobN)`` match prims that have 
+  variant selections matching the literal names or glob patterns in 
+  selGlob1..selGlobN for the variant sets setName1..N.
+
+.. _logical_operators:
+
+Logical Operators
+^^^^^^^^^^^^^^^^^
+
+Use operators to apply algebraic logic with patterns and expression references 
+in order to refine your expression. Most operators are used between 
+patterns or expression references (e.g. "leftPattern <operator> rightPattern").
+
+The supported operators are:
+
+* ``+``: Union. Matches all objects matched by either left or right pattern 
+  operands, or objects matched by both patterns. Example: ``/foo* + /*bar`` 
+  can match :sdfpath:`/foofoo`, :sdfpath:`/barbar`, and :sdfpath:`/foobar`.
+* ``(white space)``: Implied union. White space between patterns is 
+  treated as an implied union, and behaves exactly like a union. 
+  ``/foo* /*bar`` is the same as ``/foo* + /*bar``.
+* ``&``: Intersection. Matches only objects matched by both left and right 
+  pattern operands. For example ``/foo* & /*bar`` can match :sdfpath:`/foobar`, 
+  but not :sdfpath:`/foofoo` or :sdfpath:`/barbar`.  
+* ``-``: Difference. Matches objects matched by the left pattern operand, but 
+  discards any matches that would also be matched by the right pattern operand. 
+  For example, ``/foo* - /*bar`` can match :sdfpath:`/foo` and 
+  :sdfpath:`/foofoo` but not :sdfpath:`/foobar`, nor :sdfpath:`/barbar`.
+* ``~``: Complement. Matches everything not matched by the pattern operand. For 
+  example, ``~/foo*`` matches everything except paths like 
+  :sdfpath:`/foo`, :sdfpath:`/foofoo`, etc. 
+* ``( )``: Group. Use parenthesis to group patterns-plus-operators into a 
+  logical group to enforce evaluation order. 
+
+.. _expression_references:
+
+Expression References
+^^^^^^^^^^^^^^^^^^^^^
+
+Expressions can reference other expressions, which is useful for building 
+complex expressions from sets of "base" expressions, or re-using expressions 
+in your scene or in code.
+
+An expression reference starts with ``%`` followed by a prim path, a ``:``, and 
+a name. The name of the sub-expression can be defined in USD data or in code. 
+Note that wildcards are not allowed in the names of expression references.
+
+For example, you might have a "allFruit" expression that consists of 
+``/Fruit/apple /Fruit/banana /Fruit/*berry``, and a "allFood" expression 
+that references allFruit: ``%/myPrim:allFruit + /Cheese* + /Meat*``. When 
+the "allFood" expression is resolved, the resolved expression for "allFruit" 
+will be included where the allFruit expression is referenced. 
+
+If you need to reference an expression from a sibling collection on the same
+prim, you can omit the prim path. Using the previous example, if allFruit
+and allFood happened to be expression attributes for two different collections
+in the same prim, the allFood expression could reference allFruit as:
+``%:allFruit + /Cheese* + /Meat*``
+
+.. note::
+    Note that you can't reference a relationship-mode collection (that uses 
+    includes/excludes rules) as a sub-expression in a pattern-based collection. 
+    You can only reference other pattern-based collection expressions as 
+    sub-expressions. See :ref:`expression_for_relationship_mode_collection` for
+    details on computing the equivalent expression for a relationship-mode 
+    collection that you can then reference.
+
+.. _resolving_expressions:
+
+Resolving Expressions That Use Expression References
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When resolving named expression references in pattern-based collections, the 
+expression name is the property name that contains the ``membershipExpression`` 
+for the collection. Using the previous allFruit and allFood example, in your 
+USD data you might have a prim with the CollectionAPI schema applied, that looks
+something like:
+
+.. code-block:: usda
+
+    def "Food" 
+    (
+        prepend apiSchemas = ["CollectionAPI:allFruit", "CollectionAPI:allFood"]
+    )
+    {
+        pathExpression collection:allFruit:membershipExpression = "/Fruit/apple /Fruit/banana /Fruit/*berry"
+
+        pathExpression collection:allFood:membershipExpression = "%:allFruit + /Cheese* + /Meat*"
+        ...
+    }
+
+USD will look for pathExpression properties with the referenced name when 
+resolving the full expression. The expressions will automatically be resolved 
+using the composed stage when the collections are queried. You can
+also get the fully resolved expression by calling 
+``ResolveCompleteMembershipExpression()``. Using the previous example, the 
+following Python example gets the fully resolved expression from the allFood 
+collection.
+
+.. code-block:: python
+
+    collectionPrim = stage.GetPrimAtPath("/Food")
+    allFoodCollection = Usd.CollectionAPI(collectionPrim, "allFood")
+    resolvedExp = allFoodCollection.ResolveCompleteMembershipExpression()
+
+Any expression references that can't be resolved are replaced with the
+empty/nothing expression.
+
+.. note::
+    Normally you should not need to resolve the membership expression yourself, 
+    since the ``CollectionMembershipQuery`` used to
+    :ref:`query which objects belong to the collection <basic_usage>` 
+    will do it for you. But if you are working with path expressions directly, 
+    you can use ``Sdf.PathExpression`` APIs such as 
+    :usdcpp:`Sdf.PathExpression.ResolveReferences()<SdfPathExpression::ResolveReferences>` 
+    and :usdcpp:`Sdf.PathExpression.ComposeOver()<SdfPathExpression::ComposeOver>` 
+    to do your own custom expression reference resolving.
+
+.. _weaker_expression_references:
+
+Working With Weaker Expression References
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+There is an additional convenience "weaker" expression reference which 
+uses the ``%_`` syntax to reference a weaker expression. A weaker 
+expression is an expression property opinion from a weaker composition arc
+for the expression property making the reference. For example, you might have 
+the following collection prim "Animals" defined in a layer:
+
+.. code-block:: usda
+
+    def "World" ()
+    {
+        def "Animals" (
+            prepend apiSchemas = ["CollectionAPI:expTest"]
+        )
+        {
+            pathExpression collection:expTest:membershipExpression = "/World/Animals/Fish/Halibut"
+
+            def "Fish"
+            {
+                def "Tuna"
+                {
+                }
+                def "Salmon"
+                {
+                }
+                def "Halibut"
+                {                
+                }
+            }
+        }
+    }
+
+In another layer, you reference the :sdfpath:`/World/Animals` prim, but 
+override the expTest path expression property:
+
+.. code-block:: usda
+
+    def "World" ()
+    {
+        def "Animals" (
+            prepend apiSchemas = ["CollectionAPI:expTest"]
+            references = @weakerSubRef.usda@</World/Animals>
+        )
+        {
+            pathExpression collection:expTest:membershipExpression = "/World/Animals/Fish/Goldfish"
+
+            def "Fish"
+            {
+                def "Goldfish"
+                {
+                }
+            }
+        }
+    }
+
+Querying the expTest collection will only match :sdfpath:`/World/Animals/Fish/Goldfish`. 
+If you wanted to also include matches from the expTest expression in the 
+referenced prim, you would use the ``%_`` syntax:
+
+.. code-block:: usda
+
+    def "World" ()
+    {
+        def "Animals" (
+            prepend apiSchemas = ["CollectionAPI:expTest"]
+            references = @weakerSubRef.usda@</World/Animals>
+        )
+        {
+            pathExpression collection:expTest:membershipExpression = "/World/Animals/Fish/Goldfish + %_"
+
+            def "Fish"
+            {
+                def "Goldfish"
+                {
+                }
+            }
+        }
+    }
+
+The expTest collection would now include matches from the weaker :sdfpath:`/World/Animals` 
+reference, and the collection would match :sdfpath:`/World/Animals/Fish/Goldfish` 
+and :sdfpath:`/World/Animals/Fish/Halibut`.
+
+If USD is unable to resolve the weaker expression from the composed scene, the
+``%_`` reference will be replaced with the empty/nothing expression.
+
+.. _additional_considerations:
+
+Additional Expressions Considerations
+-------------------------------------
+
+USD will automatically simplify expressions when possible. Leading and trailing 
+whitespace is ignored, and expression logic is simplified. For example, an 
+expression of ``// - /foo`` gets simplified to ``~/foo``
+automatically. If you need to know the simplified expression, use 
+``PathExpression.GetText()``:
+
+.. code-block:: python
+
+    testExpressionString = "// - /foo"  # This should get simplified to "~/foo"
+    testExpression = Sdf.PathExpression(testExpressionString)
+    print("Simplified expression text: " + testExpression.GetText()) # Should return "~/foo"
+
+USD provides several convenience expressions, such as "Nothing" and "Everything"
+
+.. code-block:: python
+
+    pathExp = Sdf.PathExpression()            # Empty expression, matches nothing
+    pathExp = Sdf.PathExpression.Nothing()    # Same as empty expression, matches nothing
+    pathExp = Sdf.PathExpression.Everything() # Matches everything, equivalent to "//"
+
+.. _configuring_pattern_based_collections:
+
+Configuring Pattern-Based Collections
+=====================================
+
+Use the following built-in properties from the CollectionAPI schema to configure
+membership in a pattern-based collection, where ``instanceName`` is the 
+user-provided applied API schema instance name:
+
+* ``uniform pathExpression collection:instanceName:membershipExpression``: 
+  Defines the path expression used to test objects in the collection for 
+  membership.
+
+The following properties provide additional configuration aspects for 
+collections: 
+
+* ``uniform token collection:instanceName:expansionRule``: Specifies 
+  specifies how matching scene objects against the ``membershipExpression`` 
+  proceeds. Possible values include:
+
+  * ``expandPrims``: The ``ComputeIncludedObjectsFromCollection()`` 
+    and ``ComputeIncludedPathsFromCollection()`` CollectionAPI APIs only test 
+    prims against the ``membershipExpression`` to determine membership. This
+    is the default behavior.
+  * ``expandPrimsAndProperties``: Like ``expandPrims``, but all properties on 
+    all included prims also belong to the collection. 
+  * ``explicitOnly``: Only applies to relationship-mode collections. For 
+    pattern-based collections, if ``expansionRule`` is set to ``explicitOnly``, 
+    the ``ComputeIncludedObjectsFromCollection()`` 
+    and ``ComputeIncludedPathsFromCollection()`` CollectionAPI APIs return no
+    results.
+
+The following example shows a pattern-based collection configured to 
+match prims (but not properties) that have the LightAPI schema applied, and
+match the "/World/Light*" path expression.
+
+.. code-block:: usda
+
+    def "CollectionPrim" (
+        prepend apiSchemas = ["CollectionAPI:myCollection"]
+    )
+    {
+        # Set the collection expansion rule to specify how the paths for collection are expanded
+        token collection:myCollection:expansionRule = "expandPrims"
+
+        # Set myCollection:membershipExpression with the path expression we want
+        pathExpression collection:myCollection:membershipExpression = "/World/Light*{hasAPI:LightAPI}"
+    }
+
+You can also use CollectionAPI methods to programmatically set the attribute:
+
+.. code-block:: python
+
+    collectionPrim = stage.DefinePrim("/CollectionPrim")
+    myCollection = Usd.CollectionAPI.Apply(collectionPrim, "myCollection")
+    myCollection.CreateExpansionRuleAttr(Usd.Tokens.expandPrims)  
+    pathExp = Sdf.PathExpression("/World/Light*{hasAPI:LightAPI}") 
+    expressionAttr = myCollection.CreateMembershipExpressionAttr(pathExp)
+
+.. _expression_for_relationship_mode_collection:
+
+Getting the Expression for a Relationship-Mode Collection
+=========================================================
+
+As mentioned earlier, collections can work in relationship-mode, using
+include/exclude rules, or expression-mode, using path expressions. A collection
+can't work in both modes. Additionally, you can't reference a relationship-mode
+collection in an expression-mode collection's path expression. However, you
+can have USD compute the equivalent expression for a relationship-mode
+collection, and then reference that expression if needed. 
+
+To compute the equivalent expression, use 
+``ComputePathExpressionFromCollectionMembershipQueryRuleMap()``. The 
+following example shows how to get the equivalent expression from a 
+relationship-mode collection. 
+
+.. code-block:: python
+
+    # Get an existing relationship-mode collection
+    collectionPrim = stage.GetPrimAtPath("/World/MyCollection")
+    relationshipModeCollection = Usd.CollectionAPI(collectionPrim, "relationshipCollection")    
+
+    # First compute the membership query for the relationship-mode collection
+    collectionQuery = relationshipModeCollection.ComputeMembershipQuery()
+
+    # Get the equivalent expression
+    equivalentExpression = Usd.ComputePathExpressionFromCollectionMembershipQueryRuleMap(
+                collectionQuery.GetAsPathExpansionRuleMap())
+
+    # ...use equivalentExpression as needed...
+
+Once you have the equivalent expression, you can author that expression on the
+``membershipExpression`` of a new or existing collection. You can use the 
+equivalent expression to convert a relationship-mode collection to an equivalent 
+expression-mode collection by authoring ``membershipExpression`` with the
+equivalent expression **and** clearing out the ``includes``, ``excludes``, and 
+``includeRoot`` relationship-mode properties.
diff --git a/docs/user_guides/render_user_guide.rst b/docs/user_guides/render_user_guide.rst
index 1f5e80f37d..bf190db1e8 100644
--- a/docs/user_guides/render_user_guide.rst
+++ b/docs/user_guides/render_user_guide.rst
@@ -433,7 +433,7 @@ Using Light-linking to Filter Objects Affected by Lights
 You might need to control which geometry 
 is illuminated by a particular light. To support this, USD provides 
 *light-linking* which uses the 
-:usda:`collection:lightLink` :ref:`object collection <usdglossary-collection>`
+:usda:`collection:lightLink` :ref:`object collection<collections_and_patterns>`
 to specify which objects are illuminated by a light. 
 By default the collection has :usda:`includeRoot` set to true, indicating that 
 the light will potentially illuminate all objects. To illuminate only a specific 
@@ -494,7 +494,8 @@ Material bindings inherit down the prim namespace and come in two forms:
 - Direct bindings, in which a prim directly names (via relationship) the 
   Material it wants to bind, as shown in the previous example.
 
-- Collection-based bindings, in which a USD Collection identifies a set of prims, 
+- Collection-based bindings, in which a 
+  :ref:`USD Collection<collections_and_patterns>` identifies a set of prims, 
   and the binding (again, a relationship) names both the Collection and the 
   Material to which the collected prims should be bound. See 
   :ref:`material_collection_binding` for more information on collection-based 
@@ -962,6 +963,8 @@ representing a building, and applies a material binding to those collections.
 Note that a fallback binding is provided in the above example, which is used if 
 no collection-based binding applies to Gprims in the model hierarchy. 
 
+For more details on collections, see :ref:`collections_and_patterns`.
+
 .. _material_collection_binding_strength:
 
 Setting Collection Binding Strength
@@ -1406,7 +1409,8 @@ dependencies between passes. A single pass generally represents not just a
 single set of products, but a sequence of temporally varying frames of outputs 
 that depend on temporally varying inputs.
 
-RenderPass also lets you specify collections of prims that are visible to the 
+RenderPass also lets you specify 
+:ref:`collections of prims<collections_and_patterns>` that are visible to the 
 renderer for that pass, using the :usda:`collection:renderVisibility` collection. 
 Use this collection if you have separate passes for different sets of objects 
 in the stage (e.g., separate foreground and background passes), or passes that 
diff --git a/docs/user_guides/schemas/index.rst b/docs/user_guides/schemas/index.rst
new file mode 100644
index 0000000000..30599ff810
--- /dev/null
+++ b/docs/user_guides/schemas/index.rst
@@ -0,0 +1,8 @@
+##############
+Schema Domains
+##############
+
+.. toctree::
+   :maxdepth: 2
+
+   usdVol/usdVol_toc
\ No newline at end of file
diff --git a/docs/user_guides/schemas/usdVol/Field3DAsset.md b/docs/user_guides/schemas/usdVol/Field3DAsset.md
new file mode 100644
index 0000000000..43e0e58d7d
--- /dev/null
+++ b/docs/user_guides/schemas/usdVol/Field3DAsset.md
@@ -0,0 +1,187 @@
+% WARNING: THIS FILE IS GENERATED BY genSchemaDocs. DO NOT EDIT.
+% Generated: 04:05PM on May 16, 2024
+
+
+(Field3DAsset)=
+# Field3DAsset
+
+A Field representing a Field3D volume field. See
+the [Field3D github repo](https://github.com/imageworks/Field3D/tree/master)
+for more information on Field3D.
+
+An example Field3DAsset referencing a single density field in a .f3d file:
+
+```{code-block} usda
+def Field3DAsset "densityField3D"
+{
+    token fieldDataType = "float"
+    token fieldName = "density"
+    token fieldPurpose = "cluster_0"
+    asset filePath.timeSamples = {
+        1: @/f3ddata/Volumes_Cumulus01_Puff01M.1.f3d@,
+    }
+}
+```
+
+The FieldAsset `filePath` attribute must specify a file in the Field3D (.f3d) 
+format on disk.
+
+```{contents}
+:depth: 2
+:local:
+:backlinks: none
+```
+
+(Field3DAsset_properties)=
+
+## Properties
+
+(Field3DAsset_fieldPurpose)=
+
+### fieldPurpose
+
+**USD type**: `token`
+
+Specifies the purpose or grouping of an 
+individual field. Clients which consume Field3D files should treat this as the 
+Field3D field *name*. This attribute is optional.
+
+
+(Field3DAsset_inheritedproperties_FieldAsset)=
+
+## Inherited Properties ({ref}`FieldAsset`)
+
+(Field3DAsset_fieldDataType)=
+
+### fieldDataType
+
+**USD type**: `token`
+
+The data type of a field, such as "float".
+
+Use this attribute to tell consumers more about the field without requiring the 
+consumer access the asset file directly. The list of allowed tokens reflects the 
+available choices for Field3D. 
+
+
+(Field3DAsset_fieldIndex)=
+
+### fieldIndex
+
+**USD type**: `int`
+
+The index of a field within a FieldAsset asset
+file. This attribute is optional.
+
+An asset file can contain multiple fields with the same name. This optional 
+attribute is an index used to disambiguate between multiple fields with the same 
+name. For example, in an OpenVDB file asset, there might be two Grids named 
+"density". A `fieldIndex` of 0 would specify that this Field refers to the first 
+"density" Grid.
+
+
+(Field3DAsset_fieldName)=
+
+### fieldName
+
+**USD type**: `token`
+
+Represents the name of an individual field within
+a FieldAsset asset file. 
+
+A FieldAsset file asset may contain multiple fields in a single asset file. This 
+attribute specifies the name of field **within** the asset file. For example, an 
+OpenVDB file asset might have multiple named Grids, such as "density", 
+"temperature", etc. `fieldName` would specify one of the named Grids in the 
+OpenVDB file asset.
+
+Note that a Volume also provides a way to specify the "name" for a field, via 
+the field relationship. This name is not associated with asset data and is used 
+by the Volume for organizing fields for the rendering pipeline. See
+{ref}`usdVol_understanding_fieldname` for more details on how the field's 
+relationship name differs from `fieldName`.
+
+
+(Field3DAsset_filePath)=
+
+### filePath
+
+**USD type**: `asset`
+
+An asset path attribute that points to a file on disk.
+
+The asset pointed to by filePath must be a file type that the FieldAsset-derived
+schema supports. For example, for OpenVDBAsset, the file type must be an 
+OpenVDB (.vdb) file. For Field3DAsset, the file type must be a Field3D (.f3d)
+file.
+
+This attribute's value can be animated over time, as most
+volume asset formats represent just a single timeSample of
+a volume. However, it does not, at this time, support
+any pattern substitutions like "$F". 
+
+See {ref}`usdVol_using_animated_field_data` for an example of using `filePath`
+to refer to animated volumetric data.
+
+
+(Field3DAsset_vectorDataRoleHint)=
+
+### vectorDataRoleHint
+
+**USD type**: `token`
+
+**Fallback value**: `None`
+
+Specifies the role of a vector valued field,
+such as "Color". This can drive the data type in which fields are made available 
+in a renderer or whether the vector values are to be transformed. This attribute 
+is optional.
+
+This token can drive the data type in which fields are made available in a 
+renderer or whether the vector values are to be transformed. Allowed tokens 
+include `None`, `Point`, `Normal`, `Vector`, and `Color`.
+
+
+(Field3DAsset_inheritedproperties_Xformable)=
+
+## Inherited Properties ({ref}`Xformable`)
+
+(Field3DAsset_xformOpOrder)=
+
+### xformOpOrder
+
+**USD type**: `token[]`
+
+
+
+(Field3DAsset_inheritedproperties_Imageable)=
+
+## Inherited Properties ({ref}`Imageable`)
+
+(Field3DAsset_proxyPrim)=
+
+### proxyPrim
+
+**USD type**: `rel` (relationship)
+
+
+
+(Field3DAsset_purpose)=
+
+### purpose
+
+**USD type**: `token`
+
+**Fallback value**: `default`
+
+
+
+(Field3DAsset_visibility)=
+
+### visibility
+
+**USD type**: `token`
+
+**Fallback value**: `inherited`
+
+
diff --git a/docs/user_guides/schemas/usdVol/FieldAsset.md b/docs/user_guides/schemas/usdVol/FieldAsset.md
new file mode 100644
index 0000000000..a8ebec8e81
--- /dev/null
+++ b/docs/user_guides/schemas/usdVol/FieldAsset.md
@@ -0,0 +1,167 @@
+% WARNING: THIS FILE IS GENERATED BY genSchemaDocs. DO NOT EDIT.
+% Generated: 04:05PM on May 16, 2024
+
+
+(FieldAsset)=
+# FieldAsset
+
+FieldAsset is an abstract schema (that inherits
+from {ref}`FieldBase`) that represents a volumetric field
+where the volumetric data is stored outside the layer, e.g. in a file asset.
+It is used as a base class for schemas that reference specific volume data
+asset types, such as OpenVDB data. 
+
+If you need to extend UsdVol with your own custom file-based field schemas, 
+your custom schemas should inherit from FieldAsset.
+
+```{admonition} Create Prims Using FieldAsset-derived Schemas
+:class: note
+
+Like FieldBase, FieldAsset is an abstract schema. In practice you will most
+likely create prims using one of the field schemas that inherit from FieldAsset,
+such as OpenVDBAsset or Field3DAsset.
+```
+
+```{contents}
+:depth: 2
+:local:
+:backlinks: none
+```
+
+(FieldAsset_properties)=
+
+## Properties
+
+(FieldAsset_fieldDataType)=
+
+### fieldDataType
+
+**USD type**: `token`
+
+The data type of a field, such as "float".
+
+Use this attribute to tell consumers more about the field without requiring the 
+consumer access the asset file directly. The list of allowed tokens is specified 
+with the specific asset type. A missing value is considered an error.
+
+(FieldAsset_fieldIndex)=
+
+### fieldIndex
+
+**USD type**: `int`
+
+The index of a field within a FieldAsset asset
+file. This attribute is optional.
+
+An asset file can contain multiple fields with the same name. This optional 
+attribute is an index used to disambiguate between multiple fields with the same 
+name. For example, in an OpenVDB file asset, there might be two Grids named 
+"density". A `fieldIndex` of 0 would specify that this Field refers to the first 
+"density" Grid.
+
+
+(FieldAsset_fieldName)=
+
+### fieldName
+
+**USD type**: `token`
+
+Represents the name of an individual field within
+a FieldAsset asset file. 
+
+A FieldAsset file asset may contain multiple fields in a single asset file. This 
+attribute specifies the name of field **within** the asset file. For example, an 
+OpenVDB file asset might have multiple named Grids, such as "density", 
+"temperature", etc. `fieldName` would specify one of the named Grids in the 
+OpenVDB file asset.
+
+Note that a Volume also provides a way to specify the "name" for a field, via 
+the field relationship. This name is not associated with asset data and is used 
+by the Volume for organizing fields for the rendering pipeline. See
+{ref}`usdVol_understanding_fieldname` for more details on how the field's 
+relationship name differs from `fieldName`.
+
+
+(FieldAsset_filePath)=
+
+### filePath
+
+**USD type**: `asset`
+
+An asset path attribute that points to a file on disk.
+
+The asset pointed to by filePath must be a file type that the FieldAsset-derived
+schema supports. For example, for OpenVDBAsset, the file type must be an 
+OpenVDB (.vdb) file. For Field3DAsset, the file type must be a Field3D (.f3d)
+file.
+
+This attribute's value can be animated over time, as most
+volume asset formats represent just a single timeSample of
+a volume. However, it does not, at this time, support
+any pattern substitutions like "$F". 
+
+See {ref}`usdVol_using_animated_field_data` for an example of using `filePath`
+to refer to animated volumetric data.
+
+
+(FieldAsset_vectorDataRoleHint)=
+
+### vectorDataRoleHint
+
+**USD type**: `token`
+
+**Fallback value**: `None`
+
+Specifies the role of a vector valued field,
+such as "Color". This can drive the data type in which fields are made available 
+in a renderer or whether the vector values are to be transformed. This attribute 
+is optional.
+
+This token can drive the data type in which fields are made available in a 
+renderer or whether the vector values are to be transformed. Allowed tokens 
+include `None`, `Point`, `Normal`, `Vector`, and `Color`.
+
+
+(FieldAsset_inheritedproperties_Xformable)=
+
+## Inherited Properties ({ref}`Xformable`)
+
+(FieldAsset_xformOpOrder)=
+
+### xformOpOrder
+
+**USD type**: `token[]`
+
+
+
+(FieldAsset_inheritedproperties_Imageable)=
+
+## Inherited Properties ({ref}`Imageable`)
+
+(FieldAsset_proxyPrim)=
+
+### proxyPrim
+
+**USD type**: `rel` (relationship)
+
+
+
+(FieldAsset_purpose)=
+
+### purpose
+
+**USD type**: `token`
+
+**Fallback value**: `default`
+
+
+
+(FieldAsset_visibility)=
+
+### visibility
+
+**USD type**: `token`
+
+**Fallback value**: `inherited`
+
+
diff --git a/docs/user_guides/schemas/usdVol/FieldBase.md b/docs/user_guides/schemas/usdVol/FieldBase.md
new file mode 100644
index 0000000000..b4d7f7eefd
--- /dev/null
+++ b/docs/user_guides/schemas/usdVol/FieldBase.md
@@ -0,0 +1,73 @@
+% WARNING: THIS FILE IS GENERATED BY genSchemaDocs. DO NOT EDIT.
+% Generated: 04:05PM on May 16, 2024
+
+
+(FieldBase)=
+# FieldBase
+
+FieldBase is an abstract schema that acts as the
+base class for all UsdVol field schemas. If you need to extend UsdVol with your
+own custom Field schemas, your Field schemas should directly or indirectly
+inherit from FieldBase.
+
+```{admonition} Don't Create FieldBase Prims Directly
+:class: note
+
+As FieldBase is an abstract schema, in practice you will most likely use one
+of the various derived field schemas when creating new field prims, such as 
+OpenVDBAsset or Field3DAsset.
+```
+
+```{contents}
+:depth: 2
+:local:
+:backlinks: none
+```
+
+(FieldBase_properties)=
+
+## Properties
+
+(FieldBase_inheritedproperties_Xformable)=
+
+## Inherited Properties ({ref}`Xformable`)
+
+(FieldBase_xformOpOrder)=
+
+### xformOpOrder
+
+**USD type**: `token[]`
+
+
+
+(FieldBase_inheritedproperties_Imageable)=
+
+## Inherited Properties ({ref}`Imageable`)
+
+(FieldBase_proxyPrim)=
+
+### proxyPrim
+
+**USD type**: `rel` (relationship)
+
+
+
+(FieldBase_purpose)=
+
+### purpose
+
+**USD type**: `token`
+
+**Fallback value**: `default`
+
+
+
+(FieldBase_visibility)=
+
+### visibility
+
+**USD type**: `token`
+
+**Fallback value**: `inherited`
+
+
diff --git a/docs/user_guides/schemas/usdVol/OpenVDBAsset.md b/docs/user_guides/schemas/usdVol/OpenVDBAsset.md
new file mode 100644
index 0000000000..83a037b71e
--- /dev/null
+++ b/docs/user_guides/schemas/usdVol/OpenVDBAsset.md
@@ -0,0 +1,192 @@
+% WARNING: THIS FILE IS GENERATED BY genSchemaDocs. DO NOT EDIT.
+% Generated: 04:05PM on May 16, 2024
+
+
+(OpenVDBAsset)=
+# OpenVDBAsset
+
+A Field representing an OpenVDB volume grid. See
+the [OpenVDB website](https://www.openvdb.org/documentation/doxygen/index.html)
+for more information on OpenVDB.
+
+An example OpenVDBAsset referencing a single density field in a .vdb file:
+
+```{code-block} usda
+def OpenVDBAsset "densityVDB"
+{
+    token fieldDataType = "float"
+    int fieldIndex.timeSamples = {
+        10: 0,
+    }
+    token fieldName = "density"
+    asset filePath.timeSamples = {
+        10: @/vdb_test_data/grids.vdb@,
+    }
+}
+
+```
+
+The FieldAsset `filePath` attribute must specify a file in the OpenVDB (.vdb) 
+format on disk.
+
+```{contents}
+:depth: 2
+:local:
+:backlinks: none
+```
+
+(OpenVDBAsset_properties)=
+
+## Properties
+
+(OpenVDBAsset_fieldClass)=
+
+### fieldClass
+
+**USD type**: `token`
+
+Represents the class of an indivdual grid.
+This attribute is optional.
+
+This is a mapping to OpenVDB's openvdb::GridClass where the values are 
+`GRID_LEVEL_SET`, `GRID_FOG_VOLUME`, `GRID_STAGGERED`, and `GRID_UNKNOWN`.
+
+
+(OpenVDBAsset_inheritedproperties_FieldAsset)=
+
+## Inherited Properties ({ref}`FieldAsset`)
+
+(OpenVDBAsset_fieldDataType)=
+
+### fieldDataType
+
+**USD type**: `token`
+
+The data type of a field, such as "float".
+
+Use this attribute to tell consumers more about the field without requiring the 
+consumer access the asset file directly. The list of allowed tokens reflects the 
+available choices for OpenVDB volumes. 
+
+
+(OpenVDBAsset_fieldIndex)=
+
+### fieldIndex
+
+**USD type**: `int`
+
+The index of a field within a FieldAsset asset
+file. This attribute is optional.
+
+An asset file can contain multiple fields with the same name. This optional 
+attribute is an index used to disambiguate between multiple fields with the same 
+name. For example, in an OpenVDB file asset, there might be two Grids named 
+"density". A `fieldIndex` of 0 would specify that this Field refers to the first 
+"density" Grid.
+
+
+(OpenVDBAsset_fieldName)=
+
+### fieldName
+
+**USD type**: `token`
+
+Represents the name of an individual field within
+a FieldAsset asset file. 
+
+A FieldAsset file asset may contain multiple fields in a single asset file. This 
+attribute specifies the name of field **within** the asset file. For example, an 
+OpenVDB file asset might have multiple named Grids, such as "density", 
+"temperature", etc. `fieldName` would specify one of the named Grids in the 
+OpenVDB file asset.
+
+Note that a Volume also provides a way to specify the "name" for a field, via 
+the field relationship. This name is not associated with asset data and is used 
+by the Volume for organizing fields for the rendering pipeline. See
+{ref}`usdVol_understanding_fieldname` for more details on how the field's 
+relationship name differs from `fieldName`.
+
+
+(OpenVDBAsset_filePath)=
+
+### filePath
+
+**USD type**: `asset`
+
+An asset path attribute that points to a file on disk.
+
+The asset pointed to by filePath must be a file type that the FieldAsset-derived
+schema supports. For example, for OpenVDBAsset, the file type must be an 
+OpenVDB (.vdb) file. For Field3DAsset, the file type must be a Field3D (.f3d)
+file.
+
+This attribute's value can be animated over time, as most
+volume asset formats represent just a single timeSample of
+a volume. However, it does not, at this time, support
+any pattern substitutions like "$F". 
+
+See {ref}`usdVol_using_animated_field_data` for an example of using `filePath`
+to refer to animated volumetric data.
+
+
+(OpenVDBAsset_vectorDataRoleHint)=
+
+### vectorDataRoleHint
+
+**USD type**: `token`
+
+**Fallback value**: `None`
+
+Specifies the role of a vector valued field,
+such as "Color". This can drive the data type in which fields are made available 
+in a renderer or whether the vector values are to be transformed. This attribute 
+is optional.
+
+This token can drive the data type in which fields are made available in a 
+renderer or whether the vector values are to be transformed. Allowed tokens 
+include `None`, `Point`, `Normal`, `Vector`, and `Color`.
+
+
+(OpenVDBAsset_inheritedproperties_Xformable)=
+
+## Inherited Properties ({ref}`Xformable`)
+
+(OpenVDBAsset_xformOpOrder)=
+
+### xformOpOrder
+
+**USD type**: `token[]`
+
+
+
+(OpenVDBAsset_inheritedproperties_Imageable)=
+
+## Inherited Properties ({ref}`Imageable`)
+
+(OpenVDBAsset_proxyPrim)=
+
+### proxyPrim
+
+**USD type**: `rel` (relationship)
+
+
+
+(OpenVDBAsset_purpose)=
+
+### purpose
+
+**USD type**: `token`
+
+**Fallback value**: `default`
+
+
+
+(OpenVDBAsset_visibility)=
+
+### visibility
+
+**USD type**: `token`
+
+**Fallback value**: `inherited`
+
+
diff --git a/docs/user_guides/schemas/usdVol/Volume.md b/docs/user_guides/schemas/usdVol/Volume.md
new file mode 100644
index 0000000000..af7a426638
--- /dev/null
+++ b/docs/user_guides/schemas/usdVol/Volume.md
@@ -0,0 +1,148 @@
+% WARNING: THIS FILE IS GENERATED BY genSchemaDocs. DO NOT EDIT.
+% Generated: 04:05PM on May 16, 2024
+
+
+(Volume)=
+# Volume
+
+A renderable volume containing one or more
+volumetric data fields, used to represent a volume effect such as smoke or fire.
+
+Volume inherits from GPrim and inherits GPrim and Imageable schema properties,
+so volumes are transformable, renderable, can have a material binding, etc.
+
+Volume also contains any number of volumetric fields, specified via 
+relationships to FieldBase-derived primitives using a namespace prefix of 
+"field". The relationship names, such as "density", are used by the renderer to 
+associate individual fields with the named input parameters on a volume shader.
+
+For example, the following Volume defines a field relationship to an 
+OpenVDBField asset. The field relationship name specifies that the OpenVDB asset 
+contains data that the renderer and volume shader should use to render the 
+optical density ("extinction") of the volume.
+
+```{code-block} usda
+def Volume "Volume" (
+)
+{
+    custom rel field:extinction = </Volume/densityVDB>
+    uniform token purpose = "render"
+
+    def OpenVDBAsset "densityVDB"
+    {
+        token fieldName = "density"
+        asset filePath = @/vdbdata/smoke_plume.101.vdb@,
+        }
+    }
+}
+
+```
+
+See {ref}`usdVol_working_with_volumes` for best practices when working with
+Volumes.
+
+```{contents}
+:depth: 2
+:local:
+:backlinks: none
+```
+
+(Volume_properties)=
+
+## Properties
+
+(Volume_inheritedproperties_Gprim)=
+
+## Inherited Properties ({ref}`Gprim`)
+
+(Volume_displayColor)=
+
+### displayColor
+
+**USD type**: `color3f[]`
+
+
+
+(Volume_displayOpacity)=
+
+### displayOpacity
+
+**USD type**: `float[]`
+
+
+
+(Volume_doubleSided)=
+
+### doubleSided
+
+**USD type**: `bool`
+
+**Fallback value**: `False`
+
+
+
+(Volume_orientation)=
+
+### orientation
+
+**USD type**: `token`
+
+**Fallback value**: `rightHanded`
+
+
+
+(Volume_inheritedproperties_Boundable)=
+
+## Inherited Properties ({ref}`Boundable`)
+
+(Volume_extent)=
+
+### extent
+
+**USD type**: `float3[]`
+
+
+
+(Volume_inheritedproperties_Xformable)=
+
+## Inherited Properties ({ref}`Xformable`)
+
+(Volume_xformOpOrder)=
+
+### xformOpOrder
+
+**USD type**: `token[]`
+
+
+
+(Volume_inheritedproperties_Imageable)=
+
+## Inherited Properties ({ref}`Imageable`)
+
+(Volume_proxyPrim)=
+
+### proxyPrim
+
+**USD type**: `rel` (relationship)
+
+
+
+(Volume_purpose)=
+
+### purpose
+
+**USD type**: `token`
+
+**Fallback value**: `default`
+
+
+
+(Volume_visibility)=
+
+### visibility
+
+**USD type**: `token`
+
+**Fallback value**: `inherited`
+
+
diff --git a/docs/user_guides/schemas/usdVol/overview.md b/docs/user_guides/schemas/usdVol/overview.md
new file mode 100644
index 0000000000..b56e08ddd2
--- /dev/null
+++ b/docs/user_guides/schemas/usdVol/overview.md
@@ -0,0 +1,148 @@
+# Overview
+
+The UsdVol schema domain contains schemas for working with volumes and
+volumetric data. Volumes encapsulate fields of discretized volumetric data, 
+where the data can potentially be sparse or time-varying. Volumes can be used 
+to represent effects like smoke or fire. 
+
+The volumetric data referenced by Volumes can be contained in OpenVDB or Field3D
+assets. UsdVol can also be extended to support other volume formats or sources.
+
+The following screenshot shows a Volume with density fields that point to 
+OpenVDB assets.
+
+![Example screenshot](volExample.png)
+
+(usdVol_working_with_volumes)=
+## Working With Volumes
+
+A Volume prim represents a renderable volume, such as a fog or fire effect.
+
+Volumes contain volumetric data represented as relationships to prims that
+have a FieldBase-derived schema applied. Each field relationship is specified 
+as a relationship with a namespace prefix of "field". The relationship names,
+such as "density", are used by the renderer to associate individual fields with 
+the named input parameters on a volume shader.
+
+For example, the following Volume defines a field relationship to an OpenVDB
+asset. The field relationship name specifies that the OpenVDB asset contains
+data that the renderer and volume shader should use for the density of the
+volume. The Volume also has a material binding to a Material (not defined in 
+this example).
+
+```{code-block} usda
+def Volume "Volume" (
+    prepend apiSchemas = ["MaterialBindingAPI"]
+)
+{
+    custom rel field:density = </Volume/densityVDB>
+    uniform token purpose = "render"
+    double3 xformOp:scale = (1, 1, 1)
+    double3 xformOp:translate = (0, -3, 0)
+    token[] xformOpOrder = ["xformOp:translate", "xformOp:scale"]
+    rel material:binding = </Materials/VolumeMaterial>    
+
+    def OpenVDBAsset "densityVDB"
+    {
+        token fieldName = "density"
+        asset filePath = @/vdbdata/smoke_plume.101.vdb@,
+        }
+    }
+}
+
+```
+
+Volume additionally inherits from GPrim and inherits GPrim and Imageable
+schema properties for rendering, and supports using primvars to bind data
+to the USD Material/Shader pipeline during rendering. In the above example, 
+the bound material, :usda:`</Materials/VolumeMaterial>`, would have a volume 
+shader as a terminal node in the Material's shader network, and you would 
+provide primvars to bind Volume or GPrim data to that shader to control how 
+your Volume is rendered. Note that Hydra uses a fallback volume material if
+your Volume doesn't have a material binding.
+
+```{admonition} Volume Use Cases 
+:class: note
+
+Because Volume inherits from GPrim, it is primarily intended to
+be used for renderable/imageable volumes. However, UsdVol Volume prims could
+be used for "non-renderable" use cases such as encapsulating volumetric data 
+used for simulations, depending on your workflow.
+```
+
+(usdVol_working_with_fields)=
+## Working With Fields
+
+UsdVol provides a several abstract schemas that other field schemas inherit 
+from, including FieldBase (the base schema class for all field schemas) and 
+FieldAsset (the base schema class for schemas that represent a field asset with 
+volumetric data stored outside the layer, e.g. in a file asset). In practice, 
+you'll use FieldAsset-derived schemas, such as OpenVDBAsset or Field3DAsset, 
+to work with volumetric data of a specific format.
+
+### Making Fields Child Prims of Volumes
+
+A general best practice is to make your Field prims children of the containing
+Volume prim. This helps organize things in your USD scene, making the Fields
+easy to find and reference. Also, the grid extracted from a Field prim is 
+positioned in world space by the local-to-world transformation of the Field 
+prim, plus, in the case of prims with Field-Asset derived schemas, any 
+transformation contained in the external asset encoding. By making 
+the Field prim a child of a Volume, re-positioning the Volume will automatically 
+move all its child Field prims along with it.
+
+```{admonition} Using Fields in Multiple Volumes
+:class: note
+
+While it is recommended, it is not required to have Field prims be children of
+Volume prims. If you have a use-case where need to use the same Field prim
+for multiple Volumes, you may find it helpful organizationally to not have the
+Field prim as a child of any Volume prim. 
+```
+
+(usdVol_using_animated_field_data)=
+### Using Animated Field Data
+
+Volumetric data is often animated. For Volumes with FieldAsset-derived Fields, 
+animation is represented by setting time samples on the filePath attribute.
+The following example sets time samples in a OpenVDBAsset field to different
+VDB assets:
+
+```{code}
+def Volume "wisp"
+{
+    float3[] extent = [(-57, -91, -44), (57, 31, -23)]
+
+    rel field:density = </wisp/density>
+
+    def OpenVDBAsset "density"
+    {
+        asset filePath.timeSamples = {
+            101: @./wisp_01.101.vdb@,
+            102: @./wisp_01.102.vdb@,
+            103: @./wisp_01.103.vdb@,
+            104: @./wisp_01.104.vdb@,
+        }
+        token fieldName = "density"
+    }
+}
+```
+
+(usdVol_understanding_fieldname)=
+### Understanding `fieldName` and the Field's Relationship Name 
+
+FieldAsset-derived fields provide a `fieldName` attribute that is used to 
+identify the name of a field in the Field's asset. In an OpenVDB asset, this 
+might be the name of a grid in a VDB file. A Volume also provides a way to
+specify the "name" for a field, via the 
+{ref}`relationships grouped inside the 'field' namespace <Volume>`, but 
+this name is not tied to the asset data. Instead, a Volume defines fields using 
+names appropriate for the Volume and/or rendering pipeline. Additionally, being 
+able to define a field name at the Volume level lets you re-use Field prims for 
+multiple volume fields if needed.
+
+For example, you might have a situation where your Volume needs a "velocity" 
+field for the purposes of shader parameters, but you have an OpenVDB asset with 
+a grid named "vel". You would specify a `field:velocity` relationship in your
+Volume prim to the OpenVDBAsset that references the desired VDB data with a
+"vel" fieldName.
diff --git a/docs/user_guides/schemas/usdVol/usdVol_toc.rst b/docs/user_guides/schemas/usdVol/usdVol_toc.rst
new file mode 100644
index 0000000000..d5d9555054
--- /dev/null
+++ b/docs/user_guides/schemas/usdVol/usdVol_toc.rst
@@ -0,0 +1,15 @@
+.. WARNING: THIS FILE IS GENERATED BY genSchemaDocs.  DO NOT EDIT.
+.. TOC for usdVol
+.. Generated: 04:05PM on May 16, 2024
+
+################
+Volumes (usdVol)
+################
+
+.. toctree::
+   overview.md
+   Field3DAsset.md
+   FieldAsset.md
+   FieldBase.md
+   OpenVDBAsset.md
+   Volume.md
diff --git a/docs/user_guides/schemas/usdVol/volExample.png b/docs/user_guides/schemas/usdVol/volExample.png
new file mode 100644
index 0000000000..1bd4ba06de
Binary files /dev/null and b/docs/user_guides/schemas/usdVol/volExample.png differ
diff --git a/docs/user_guides/variable_expressions.rst b/docs/user_guides/variable_expressions.rst
index c9af1aaa16..954a243f9e 100644
--- a/docs/user_guides/variable_expressions.rst
+++ b/docs/user_guides/variable_expressions.rst
@@ -250,7 +250,7 @@ characters.
 
     # The following expression evaluates to "C:\USD\test.usd" or "D:\USD\test.usd" 
     # (depending on if COND evaluates to true or false) due to escaped backslashes
-    `if(${COND}, "C:\\USD\\test.usd", "D:\\USD\test.usd")`  
+    `if(${COND}, "C:\\USD\\test.usd", "D:\\USD\\test.usd")`  
 
     # The following evaluates to "escaped_var_${X}". No substitutions occur due 
     # to the escaped "$".
diff --git a/extras/imaging/docs/examples_hydra_getting_started.cpp b/extras/imaging/docs/examples_hydra_getting_started.cpp
index 950dcc8b7c..091da66913 100644
--- a/extras/imaging/docs/examples_hydra_getting_started.cpp
+++ b/extras/imaging/docs/examples_hydra_getting_started.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/dataSource.h"
diff --git a/extras/imaging/docs/hydra_getting_started_guide.dox b/extras/imaging/docs/hydra_getting_started_guide.dox
index 360060d0ed..36eedc0cca 100644
--- a/extras/imaging/docs/hydra_getting_started_guide.dox
+++ b/extras/imaging/docs/hydra_getting_started_guide.dox
@@ -55,11 +55,37 @@ notifications from a scene index can subclass the HdSceneIndexObserver interface
 
 \snippet examples_hydra_getting_started.cpp HdSceneIndexObserverExcerpt
 
-Note the semantics around adds (with regard to resync) and removals and renames 
-(with regard to the paths being subtree paths). The old Hydra scene API had no 
-concept of renames, but otherwise PrimsAdded/PrimsRemoved/PrimsDirtied 
-conceptually map to HdRenderIndex's InsertRprim()
-and RemoveRprimSubtree(), and HdChangeTracker's MarkRprimDirty().
+PrimsAdded takes individual prim (path, type) tuples.  A PrimsAdded notice can
+be sent for a prim already in the scene, in which case it should be interpreted
+as a resync; if the notice has a new type, the prim type should be updated, and
+all prim data should be considered dirty (as if there were a PrimsDirtied message
+invalidating the root locator).  PrimsAdded conceptually maps to the
+HdRenderIndex Insert(R,S,B)prim() calls.
+
+PrimsRemoved takes a subtree path, rather than a prim path.  Sparse removals
+can be accomplished by resyncing prims to the empty type. PrimsRemoved
+conceptually maps to the HdRenderIndex Remove(R,S,B)prim() calls.
+
+PrimsRenamed offers a way to rename a subtree, updating all prims under the old
+subtree to have paths with the old subtree prefix swapped for the new one. This
+is semantically equivalent to removing the old subtree and adding it in the new
+location, but provided as a separate notice for optimization purposes since
+frequently a rename can be handled by updating map keys at much less cost.
+Note that HdRenderIndex doesn't have any concept of renaming.
+
+PrimsDirtied takes an individual prim path, and a set of locators to datasources.
+Datasources are the attribute model in the scene index API, and are grouped
+into a multi-level hierarchy; the locator is a path into that hierarchy.
+A dirty locator on a prim means that attribute and all child attributes are
+invalidated. Any caches containing a datasource handle for that attribute or
+any child attributes need to be cleared and re-fetched. PrimsDirtied conceptually
+maps to the HdChangeTracker Mark(R,S,B)primDirty() calls.
+
+An important invariant of the system is that the list of prim paths produced by
+evaluating PrimsAdded and PrimsRemoved messages should match the list of prim
+paths generated by traversing the scene from the root, using GetChildPrimPaths().
+Any prims not reachable by traversal should return an empty prim, with an
+empty type and a null root datasource.
 
 \image html scene_index_2.png
 
@@ -266,7 +292,19 @@ A filter that sets the display color for everything to be green:
 Note here the use of two utility classes: \ref containerDataSourceEditor.h "HdContainerDataSourceEditor" 
 and HdOverlayContainerDataSource. These are both useful for doing 
 datasource-level composition, and can recursively merge and combine their inputs 
-(lazily!) as needed. Another noteworthy utility class is HdSceneIndexPrimView:
+(lazily!) as needed.
+
+A measure of caution is required for conditional overrides; due to the PrimsDirtied
+semantics, if GreeningSceneIndexFilter only overlays data on top of prim.dataSource
+when _enabled is true, then when the value of _enabled changes GreeningSceneIndexFilter
+will need to send a dirty message with the root locator, rather than
+"primvars/displayColor", since the root datasource has changed and we need to
+notify any listeners (e.g. the flattening scene index) to discard cached copies.
+A more efficient way to do a conditional override is to unconditionally override
+the prim datasource, but conditionally override the target datasource, so that
+only the target datasource needs to be marked dirty.
+
+Another noteworthy utility class is HdSceneIndexPrimView:
 
 \snippet examples_hydra_getting_started.cpp HdSceneIndexPrimViewExample
 
@@ -510,4 +548,4 @@ requiring any porting effort. We're planning to maintain these emulation layers
 even as we port and deprecate all of our HdSceneDelegate implementations 
 internally.
 
-*/
\ No newline at end of file
+*/
diff --git a/extras/imaging/examples/hdTiny/mesh.cpp b/extras/imaging/examples/hdTiny/mesh.cpp
index b2f8635510..51f2f14ff5 100644
--- a/extras/imaging/examples/hdTiny/mesh.cpp
+++ b/extras/imaging/examples/hdTiny/mesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "mesh.h"
 
diff --git a/extras/imaging/examples/hdTiny/mesh.h b/extras/imaging/examples/hdTiny/mesh.h
index 711507c135..bb01e8763a 100644
--- a/extras/imaging/examples/hdTiny/mesh.h
+++ b/extras/imaging/examples/hdTiny/mesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXTRAS_IMAGING_EXAMPLES_HD_TINY_MESH_H
 #define EXTRAS_IMAGING_EXAMPLES_HD_TINY_MESH_H
diff --git a/extras/imaging/examples/hdTiny/renderDelegate.cpp b/extras/imaging/examples/hdTiny/renderDelegate.cpp
index ac93148a44..672aab67d8 100644
--- a/extras/imaging/examples/hdTiny/renderDelegate.cpp
+++ b/extras/imaging/examples/hdTiny/renderDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "renderDelegate.h"
 #include "mesh.h"
diff --git a/extras/imaging/examples/hdTiny/renderDelegate.h b/extras/imaging/examples/hdTiny/renderDelegate.h
index 8914bf0b57..9d428355e1 100644
--- a/extras/imaging/examples/hdTiny/renderDelegate.h
+++ b/extras/imaging/examples/hdTiny/renderDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXTRAS_IMAGING_EXAMPLES_HD_TINY_RENDER_DELEGATE_H
 #define EXTRAS_IMAGING_EXAMPLES_HD_TINY_RENDER_DELEGATE_H
diff --git a/extras/imaging/examples/hdTiny/renderPass.cpp b/extras/imaging/examples/hdTiny/renderPass.cpp
index b526ad1f1d..260e67c800 100644
--- a/extras/imaging/examples/hdTiny/renderPass.cpp
+++ b/extras/imaging/examples/hdTiny/renderPass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "renderPass.h"
 
diff --git a/extras/imaging/examples/hdTiny/renderPass.h b/extras/imaging/examples/hdTiny/renderPass.h
index 876744efe3..fe043d4257 100644
--- a/extras/imaging/examples/hdTiny/renderPass.h
+++ b/extras/imaging/examples/hdTiny/renderPass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXTRAS_IMAGING_EXAMPLES_HD_TINY_RENDER_PASS_H
 #define EXTRAS_IMAGING_EXAMPLES_HD_TINY_RENDER_PASS_H
diff --git a/extras/imaging/examples/hdTiny/rendererPlugin.cpp b/extras/imaging/examples/hdTiny/rendererPlugin.cpp
index 6c4a7d7ffb..677e60e433 100644
--- a/extras/imaging/examples/hdTiny/rendererPlugin.cpp
+++ b/extras/imaging/examples/hdTiny/rendererPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "rendererPlugin.h"
 #include "renderDelegate.h"
diff --git a/extras/imaging/examples/hdTiny/rendererPlugin.h b/extras/imaging/examples/hdTiny/rendererPlugin.h
index f681fa6918..659c66cc18 100644
--- a/extras/imaging/examples/hdTiny/rendererPlugin.h
+++ b/extras/imaging/examples/hdTiny/rendererPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXTRAS_IMAGING_EXAMPLES_HD_TINY_RENDERER_PLUGIN_H
 #define EXTRAS_IMAGING_EXAMPLES_HD_TINY_RENDERER_PLUGIN_H
diff --git a/extras/imaging/examples/hdTiny/testenv/testHdTiny.cpp b/extras/imaging/examples/hdTiny/testenv/testHdTiny.cpp
index b8977e89cc..303c1590ba 100644
--- a/extras/imaging/examples/hdTiny/testenv/testHdTiny.cpp
+++ b/extras/imaging/examples/hdTiny/testenv/testHdTiny.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/extras/imaging/examples/hdui/api.h b/extras/imaging/examples/hdui/api.h
new file mode 100644
index 0000000000..531bc626eb
--- /dev/null
+++ b/extras/imaging/examples/hdui/api.h
@@ -0,0 +1,32 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXTRAS_IMAGING_EXAMPLES_HDUI_API_H
+#define EXTRAS_IMAGING_EXAMPLES_HDUI_API_H
+
+#include "pxr/base/arch/export.h"
+
+#if defined(PXR_STATIC)
+#   define HDUI_API
+#   define HDUI_API_TEMPLATE_CLASS(...)
+#   define HDUI_API_TEMPLATE_STRUCT(...)
+#   define HDUI_LOCAL
+#else
+#   if defined(HDUI_EXPORTS)
+#       define HDUI_API ARCH_EXPORT
+#       define HDUI_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__)
+#       define HDUI_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__)
+#   else
+#       define HDUI_API ARCH_IMPORT
+#       define HDUI_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__)
+#       define HDUI_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__)
+#   endif
+#   define HDUI_LOCAL ARCH_HIDDEN
+#endif
+
+#define HDUI_API_CLASS HDUI_API
+
+#endif // EXTRAS_IMAGING_EXAMPLES_HDUI_API_H
diff --git a/extras/imaging/examples/hdui/dataSourceTreeWidget.cpp b/extras/imaging/examples/hdui/dataSourceTreeWidget.cpp
index 058c3bd750..7bf52cabc0 100644
--- a/extras/imaging/examples/hdui/dataSourceTreeWidget.cpp
+++ b/extras/imaging/examples/hdui/dataSourceTreeWidget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "dataSourceTreeWidget.h"
 
diff --git a/extras/imaging/examples/hdui/dataSourceTreeWidget.h b/extras/imaging/examples/hdui/dataSourceTreeWidget.h
index 69c18563a0..402a765de9 100644
--- a/extras/imaging/examples/hdui/dataSourceTreeWidget.h
+++ b/extras/imaging/examples/hdui/dataSourceTreeWidget.h
@@ -1,36 +1,23 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDUI_DATA_SOURCE_TREE_WIDGET_H
 #define PXR_IMAGING_HDUI_DATA_SOURCE_TREE_WIDGET_H
 
+#include "pxr/pxr.h"
+
+#include "api.h"
+
 #include "pxr/imaging/hd/sceneIndex.h"
 
 #include <QTreeWidget>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-class HduiDataSourceTreeWidget : public QTreeWidget
+class HDUI_API_CLASS HduiDataSourceTreeWidget : public QTreeWidget
 {
     Q_OBJECT;
 
diff --git a/extras/imaging/examples/hdui/dataSourceValueTreeView.cpp b/extras/imaging/examples/hdui/dataSourceValueTreeView.cpp
index f33de26275..99d2fe0400 100644
--- a/extras/imaging/examples/hdui/dataSourceValueTreeView.cpp
+++ b/extras/imaging/examples/hdui/dataSourceValueTreeView.cpp
@@ -1,31 +1,15 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "dataSourceValueTreeView.h"
 #include "pxr/imaging/hd/dataSourceTypeDefs.h"
 
 #include <QAbstractItemModel>
 #include <QHeaderView>
+#include <QString>
 
 #include <sstream>
 
@@ -55,8 +39,22 @@ class Hdui_ValueItemModel : public QAbstractItemModel
         if (index.row() == 0) {
             if (index.column() == 0) {
                 std::ostringstream buffer;
-                buffer << _value;
-                return QVariant(buffer.str().data());
+                if (_value.IsHolding<SdfPathVector>()) {
+                    // Special case for SdfPathVector.
+                    //
+                    // Arguably, this would be even more useful defined as
+                    // SdfPath::operator<<(); however, it is unclear what
+                    // formatting would make the most sense there, whereas
+                    // in hdui a newline separator is best for readability.
+                    SdfPathVector paths = _value.Get<SdfPathVector>();
+                    for (SdfPath const& path: paths) {
+                        buffer << path << "\n";
+                    }
+                } else {
+                    buffer << _value;
+                }
+                std::string str = buffer.str();
+                return QVariant(QString::fromUtf8(str.data(), str.size()));
             }
         }
 
@@ -141,7 +139,8 @@ class Hdui_TypedArrayValueItemModel : public Hdui_ValueItemModel
             if (index.row() < static_cast<int>(_array.size())) {
                 std::ostringstream buffer;
                 buffer << _array.cdata()[index.row()];
-                return QVariant(buffer.str().data());
+                std::string str = buffer.str();
+                return QVariant(QString::fromUtf8(str.data(), str.size()));
             }
         }
 
@@ -154,7 +153,8 @@ class Hdui_TypedArrayValueItemModel : public Hdui_ValueItemModel
             if (section == 1) {
                 std::ostringstream buffer;
                 buffer << _array.size() << " values";
-                return QVariant(buffer.str().c_str());
+                std::string str = buffer.str();
+                return QVariant(QString::fromUtf8(str.data(), str.size()));
             }
         }
 
@@ -286,4 +286,4 @@ HduiDataSourceValueTreeView::Refresh()
 
 //-----------------------------------------------------------------------------
 
-PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/extras/imaging/examples/hdui/dataSourceValueTreeView.h b/extras/imaging/examples/hdui/dataSourceValueTreeView.h
index 28fe4d72ad..b4349e522a 100644
--- a/extras/imaging/examples/hdui/dataSourceValueTreeView.h
+++ b/extras/imaging/examples/hdui/dataSourceValueTreeView.h
@@ -1,36 +1,23 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDUI_DATA_SOURCE_VALUE_TREE_VIEW_H
 #define PXR_IMAGING_HDUI_DATA_SOURCE_VALUE_TREE_VIEW_H
 
+#include "pxr/pxr.h"
+
+#include "api.h"
+
 #include "pxr/imaging/hd/dataSource.h"
 
 #include <QTreeView>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-class HduiDataSourceValueTreeView : public QTreeView
+class HDUI_API_CLASS HduiDataSourceValueTreeView : public QTreeView
 {
     Q_OBJECT;
 public:
@@ -43,4 +30,4 @@ class HduiDataSourceValueTreeView : public QTreeView
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
-#endif
\ No newline at end of file
+#endif
diff --git a/extras/imaging/examples/hdui/registeredSceneIndexChooser.cpp b/extras/imaging/examples/hdui/registeredSceneIndexChooser.cpp
index f0af0ac29e..0b0881693e 100644
--- a/extras/imaging/examples/hdui/registeredSceneIndexChooser.cpp
+++ b/extras/imaging/examples/hdui/registeredSceneIndexChooser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "registeredSceneIndexChooser.h"
 
diff --git a/extras/imaging/examples/hdui/registeredSceneIndexChooser.h b/extras/imaging/examples/hdui/registeredSceneIndexChooser.h
index 6a4cf90fcd..15e89ae0c3 100644
--- a/extras/imaging/examples/hdui/registeredSceneIndexChooser.h
+++ b/extras/imaging/examples/hdui/registeredSceneIndexChooser.h
@@ -1,29 +1,16 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDUI_REGISTERED_SCENE_INDEX_CHOOSER_H
 #define PXR_IMAGING_HDUI_REGISTERED_SCENE_INDEX_CHOOSER_H
 
+#include "pxr/pxr.h"
+
+#include "api.h"
+
 #include "pxr/imaging/hd/sceneIndex.h"
 
 #include <QPushButton>
@@ -31,7 +18,7 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-class HduiRegisteredSceneIndexChooser : public QPushButton
+class HDUI_API_CLASS HduiRegisteredSceneIndexChooser : public QPushButton
 {
     Q_OBJECT;
 public:
diff --git a/extras/imaging/examples/hdui/sceneIndexDebuggerWidget.cpp b/extras/imaging/examples/hdui/sceneIndexDebuggerWidget.cpp
index 4ae20e4cce..f1b749571b 100644
--- a/extras/imaging/examples/hdui/sceneIndexDebuggerWidget.cpp
+++ b/extras/imaging/examples/hdui/sceneIndexDebuggerWidget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "sceneIndexDebuggerWidget.h"
 #include "dataSourceTreeWidget.h"
@@ -37,7 +20,6 @@
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QSplitter>
 #include <QWidgetAction>
 
 #include <fstream>
@@ -47,8 +29,12 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-HduiSceneIndexDebuggerWidget::HduiSceneIndexDebuggerWidget(QWidget *parent)
+HduiSceneIndexDebuggerWidget::HduiSceneIndexDebuggerWidget(
+    QWidget *parent,
+    const Options &options)
 : QWidget(parent)
+, _goToInputButton(Q_NULLPTR)
+, _goToInputButtonMenu(Q_NULLPTR)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     QHBoxLayout *toolbarLayout = new QHBoxLayout;
@@ -57,10 +43,12 @@ HduiSceneIndexDebuggerWidget::HduiSceneIndexDebuggerWidget(QWidget *parent)
     _siChooser = new HduiRegisteredSceneIndexChooser;
     toolbarLayout->addWidget(_siChooser);
 
-    _goToInputButton = new QPushButton("Inputs");
-    _goToInputButton->setEnabled(false);
-    _goToInputButtonMenu = new QMenu(this);
-    _goToInputButton->setMenu(_goToInputButtonMenu);
+    if (options.showInputsButton) {
+        _goToInputButton = new QPushButton("Inputs");
+        _goToInputButton->setEnabled(false);
+        _goToInputButtonMenu = new QMenu(this);
+        _goToInputButton->setMenu(_goToInputButtonMenu);
+    }
 
     toolbarLayout->addWidget(_goToInputButton);
 
@@ -75,17 +63,17 @@ HduiSceneIndexDebuggerWidget::HduiSceneIndexDebuggerWidget(QWidget *parent)
 
     toolbarLayout->addStretch();
 
-    QSplitter * splitter = new QSplitter(Qt::Horizontal);
-    mainLayout->addWidget(splitter, 10);
+    _splitter = new QSplitter(Qt::Horizontal);
+    mainLayout->addWidget(_splitter, 10);
 
     _siTreeWidget = new HduiSceneIndexTreeWidget;
-    splitter->addWidget(_siTreeWidget);
+    _splitter->addWidget(_siTreeWidget);
 
     _dsTreeWidget = new HduiDataSourceTreeWidget;
-    splitter->addWidget(_dsTreeWidget);
+    _splitter->addWidget(_dsTreeWidget);
 
     _valueTreeView = new HduiDataSourceValueTreeView;
-    splitter->addWidget(_valueTreeView);
+    _splitter->addWidget(_valueTreeView);
 
     QObject::connect(_siTreeWidget, &HduiSceneIndexTreeWidget::PrimSelected,
         [this](const SdfPath &primPath,
@@ -112,11 +100,13 @@ HduiSceneIndexDebuggerWidget::HduiSceneIndexDebuggerWidget(QWidget *parent)
             &HduiRegisteredSceneIndexChooser::SceneIndexSelected,
         [this](const std::string &name,
                 HdSceneIndexBaseRefPtr sceneIndex) {
-            this->SetSceneIndex(name, sceneIndex, true);
+            this->SetRegisteredSceneIndex(name, sceneIndex);
     });
 
-    QObject::connect(_goToInputButtonMenu, &QMenu::aboutToShow, this,
-            &HduiSceneIndexDebuggerWidget::_FillGoToInputMenu);
+    if (_goToInputButtonMenu) {
+        QObject::connect(_goToInputButtonMenu, &QMenu::aboutToShow, this,
+                         &HduiSceneIndexDebuggerWidget::_FillGoToInputMenu);
+    }
 
 
     QObject::connect(loggerButton, &QPushButton::clicked,
@@ -161,6 +151,14 @@ HduiSceneIndexDebuggerWidget::HduiSceneIndexDebuggerWidget(QWidget *parent)
     });
 }
 
+void
+HduiSceneIndexDebuggerWidget::SetRegisteredSceneIndex(
+    const std::string &registeredName,
+    HdSceneIndexBaseRefPtr sceneIndex)
+{
+    SetSceneIndex(registeredName, std::move(sceneIndex), true);
+}
+
 void
 HduiSceneIndexDebuggerWidget::SetSceneIndex(const std::string &displayName,
     HdSceneIndexBaseRefPtr sceneIndex, bool pullRoot)
@@ -175,7 +173,9 @@ HduiSceneIndexDebuggerWidget::SetSceneIndex(const std::string &displayName,
         }
     }
 
-    _goToInputButton->setEnabled(inputsPresent);
+    if (_goToInputButton) {
+        _goToInputButton->setEnabled(inputsPresent);
+    }
 
     std::ostringstream buffer;
     if (sceneIndex) {
@@ -217,12 +217,16 @@ HduiSceneIndexDebuggerWidget::_FillGoToInputMenu()
     QMenu *menu = _goToInputButtonMenu;
     menu->clear();
 
+    QSizePolicy policy = menu->sizePolicy();
+    policy.setHorizontalPolicy(QSizePolicy::Expanding);
+    menu->setSizePolicy(policy);
+
     QTreeWidget *menuTreeWidget = new QTreeWidget;
     menuTreeWidget->setHeaderHidden(true);
     menuTreeWidget->setAllColumnsShowFocus(true);
     menuTreeWidget->setMouseTracking(true);
     menuTreeWidget->setSizeAdjustPolicy(
-            QAbstractScrollArea::AdjustToContentsOnFirstShow);
+            QAbstractScrollArea::AdjustToContents);
 
     QObject::connect(menuTreeWidget, &QTreeWidget::itemEntered,
         [menuTreeWidget](QTreeWidgetItem *item, int column) {
@@ -231,7 +235,7 @@ HduiSceneIndexDebuggerWidget::_FillGoToInputMenu()
     });
 
     QObject::connect(menuTreeWidget, &QTreeWidget::itemClicked,
-        [this, menu, menuTreeWidget](QTreeWidgetItem *item, int column) {
+        [this, menu](QTreeWidgetItem *item, int column) {
 
             if (_InputSelectionItem *selectionItem =
                     dynamic_cast<_InputSelectionItem*>(item)) {
@@ -264,7 +268,7 @@ HduiSceneIndexDebuggerWidget::_AddSceneIndexToTreeMenu(
             sceneIndex->GetDisplayName().c_str());
 
         item->sceneIndex = sceneIndex;
-        
+        item->treeWidget()->resizeColumnToContents(0);
         parentItem = item;
     }
 
diff --git a/extras/imaging/examples/hdui/sceneIndexDebuggerWidget.h b/extras/imaging/examples/hdui/sceneIndexDebuggerWidget.h
index cd3de3fe70..04cab0635b 100644
--- a/extras/imaging/examples/hdui/sceneIndexDebuggerWidget.h
+++ b/extras/imaging/examples/hdui/sceneIndexDebuggerWidget.h
@@ -1,35 +1,23 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDUI_SCENE_INDEX_DEBUGGING_WIDGET_H
 #define PXR_IMAGING_HDUI_SCENE_INDEX_DEBUGGING_WIDGET_H
 
+#include "pxr/pxr.h"
+
+#include "api.h"
+
 #include "pxr/imaging/hd/sceneIndex.h"
 
 #include <QLabel>
 #include <QPushButton>
 #include <QMenu>
 #include <QTreeWidgetItem>
+#include <QSplitter>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -38,15 +26,38 @@ class HduiDataSourceTreeWidget;
 class HduiDataSourceValueTreeView;
 class HduiRegisteredSceneIndexChooser;
 
-class HduiSceneIndexDebuggerWidget : public QWidget, public TfWeakBase
+class HDUI_API_CLASS HduiSceneIndexDebuggerWidget
+    : public QWidget, public TfWeakBase
 {
     Q_OBJECT;
 public:
+    struct Options
+    {
+        Options() {};
+        bool showInputsButton = true;
+    };
 
-    HduiSceneIndexDebuggerWidget(QWidget *parent = Q_NULLPTR);
+    // customSceneIndexGraphWidget: clients can pass their own custom
+    // widget. It will be added as first column in the debugger and is
+    // in charge of selecting the scene index to be inspected.
+    // Thus, we suppress the "Inputs" button to select a scene index if
+    // such a custom widget is given.
+    //
+    HduiSceneIndexDebuggerWidget(
+        QWidget *parent = Q_NULLPTR,
+        const Options &options = Options());
 
+    // Called when we select a registered (terminal) scene index.
+    virtual void SetRegisteredSceneIndex(
+        const std::string &registeredName,
+        HdSceneIndexBaseRefPtr sceneIndex);
+
+    // Sets which scene index we are inspecting.
     void SetSceneIndex(const std::string &displayName,
-        HdSceneIndexBaseRefPtr sceneIndex, bool pullRoot);
+                       HdSceneIndexBaseRefPtr sceneIndex, bool pullRoot);
+
+protected:
+    QSplitter *_splitter;
 
 private Q_SLOTS:
     void _FillGoToInputMenu();
diff --git a/extras/imaging/examples/hdui/sceneIndexObserverLoggingTreeView.cpp b/extras/imaging/examples/hdui/sceneIndexObserverLoggingTreeView.cpp
index 2df4a4ca87..513d4a4c98 100644
--- a/extras/imaging/examples/hdui/sceneIndexObserverLoggingTreeView.cpp
+++ b/extras/imaging/examples/hdui/sceneIndexObserverLoggingTreeView.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "sceneIndexObserverLoggingTreeView.h"
 
diff --git a/extras/imaging/examples/hdui/sceneIndexObserverLoggingTreeView.h b/extras/imaging/examples/hdui/sceneIndexObserverLoggingTreeView.h
index ee93f3157a..51ea5ba0e8 100644
--- a/extras/imaging/examples/hdui/sceneIndexObserverLoggingTreeView.h
+++ b/extras/imaging/examples/hdui/sceneIndexObserverLoggingTreeView.h
@@ -1,36 +1,23 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDUI_SCENE_INDEX_OBSERVER_LOGGING_TREE_VIEW_H
 #define PXR_IMAGING_HDUI_SCENE_INDEX_OBSERVER_LOGGING_TREE_VIEW_H
 
+#include "pxr/pxr.h"
+
+#include "api.h"
+
 #include "pxr/imaging/hd/sceneIndex.h"
 
 #include <QTreeView>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-class HduiSceneIndexObserverLoggingTreeView : public QTreeView
+class HDUI_API_CLASS HduiSceneIndexObserverLoggingTreeView : public QTreeView
 {
     Q_OBJECT;
 public:
@@ -50,7 +37,7 @@ public Q_SLOTS:
 
 private:
 
-    class _ObserverModel :
+    class HDUI_API_CLASS _ObserverModel :
         public HdSceneIndexObserver, public QAbstractItemModel
     {
     public:
diff --git a/extras/imaging/examples/hdui/sceneIndexObserverLoggingWidget.cpp b/extras/imaging/examples/hdui/sceneIndexObserverLoggingWidget.cpp
index 9042d7167e..5066d6fac4 100644
--- a/extras/imaging/examples/hdui/sceneIndexObserverLoggingWidget.cpp
+++ b/extras/imaging/examples/hdui/sceneIndexObserverLoggingWidget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "sceneIndexObserverLoggingWidget.h"
 #include "sceneIndexObserverLoggingTreeView.h"
diff --git a/extras/imaging/examples/hdui/sceneIndexObserverLoggingWidget.h b/extras/imaging/examples/hdui/sceneIndexObserverLoggingWidget.h
index 78a957b6e2..31cf5ea5a7 100644
--- a/extras/imaging/examples/hdui/sceneIndexObserverLoggingWidget.h
+++ b/extras/imaging/examples/hdui/sceneIndexObserverLoggingWidget.h
@@ -1,31 +1,16 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDUI_SCENE_INDEX_OBSERVER_LOGGING_WIDGET_H
 #define PXR_IMAGING_HDUI_SCENE_INDEX_OBSERVER_LOGGING_WIDGET_H
 
 #include "pxr/pxr.h"
 
+#include "api.h"
+
 #include <QPushButton>
 #include <QLabel>
 
@@ -33,7 +18,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 class HduiSceneIndexObserverLoggingTreeView;
 
-class HduiSceneIndexObserverLoggingWidget : public QWidget
+class HDUI_API_CLASS HduiSceneIndexObserverLoggingWidget : public QWidget
 {
     Q_OBJECT;
 public:
diff --git a/extras/imaging/examples/hdui/sceneIndexTreeWidget.cpp b/extras/imaging/examples/hdui/sceneIndexTreeWidget.cpp
index 5e46202ab0..90d37bca5e 100644
--- a/extras/imaging/examples/hdui/sceneIndexTreeWidget.cpp
+++ b/extras/imaging/examples/hdui/sceneIndexTreeWidget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "sceneIndexTreeWidget.h"
 
diff --git a/extras/imaging/examples/hdui/sceneIndexTreeWidget.h b/extras/imaging/examples/hdui/sceneIndexTreeWidget.h
index 6653c1024a..7b8baf664e 100644
--- a/extras/imaging/examples/hdui/sceneIndexTreeWidget.h
+++ b/extras/imaging/examples/hdui/sceneIndexTreeWidget.h
@@ -1,29 +1,15 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDUI_SCENE_INDEX_TREE_WIDGET_H
 #define PXR_IMAGING_HDUI_SCENE_INDEX_TREE_WIDGET_H
 
+#include "pxr/pxr.h"
+
+#include "api.h"
 
 #include "pxr/imaging/hd/sceneIndex.h"
 
@@ -36,7 +22,8 @@ class Hdui_SceneIndexPrimTreeWidgetItem;
 
 //-----------------------------------------------------------------------------
 
-class HduiSceneIndexTreeWidget : public QTreeWidget, public HdSceneIndexObserver
+class HDUI_API_CLASS HduiSceneIndexTreeWidget
+    : public QTreeWidget, public HdSceneIndexObserver
 {
     Q_OBJECT;
 public:
diff --git a/extras/imaging/examples/hdui/sceneObserver.cpp b/extras/imaging/examples/hdui/sceneObserver.cpp
index f5acee8c96..bb81bbff8f 100644
--- a/extras/imaging/examples/hdui/sceneObserver.cpp
+++ b/extras/imaging/examples/hdui/sceneObserver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdui/sceneObserver.h"
 
diff --git a/extras/imaging/examples/hdui/sceneObserver.h b/extras/imaging/examples/hdui/sceneObserver.h
index c7a99f4b23..ecd31e4a79 100644
--- a/extras/imaging/examples/hdui/sceneObserver.h
+++ b/extras/imaging/examples/hdui/sceneObserver.h
@@ -1,29 +1,14 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDUI_SCENE_OBSERVER_H
 #define PXR_IMAGING_HDUI_SCENE_OBSERVER_H
 
+#include "pxr/pxr.h"
+
 #include "pxr/imaging/hd/sceneIndexObserver.h"
 
 #include <QObject>
diff --git a/extras/usd/examples/usdDancingCubesExample/dancingCubes.usda b/extras/usd/examples/usdDancingCubesExample/dancingCubes.usda
index 348d9bc0f0..c26015738e 100644
--- a/extras/usd/examples/usdDancingCubesExample/dancingCubes.usda
+++ b/extras/usd/examples/usdDancingCubesExample/dancingCubes.usda
@@ -5,6 +5,16 @@
 )
 
 def "Root" (
+    references = </Params>
+    # Payload to the dynamic file. This can be an anonymous file because 
+    # its contents are completely generated from parameters above and 
+    # the file format allows the reading of anonymous files.
+    payload = @anon:dummy:cubes.usddancingcubesexample@
+)
+{
+}
+
+def "Params" (
     # Dictionary value metadata field that provides all the parameters to
     # generate the layer in the payload. Change these values to change the 
     # contents of the file.
@@ -14,12 +24,23 @@ def "Root" (
         int numFrames = 200
         double distance = 6.0
         double moveScale = 1.5
-        token geomType = "Cube"
     }
-    # Payload to the dynamic file. This can be an anonymous file because 
-    # its contents are completely generated from parameters above and 
-    # the file format allows the reading of anonymous files.
-    payload = @anon:dummy:cubes.usddancingcubesexample@
-)
+
+    variants = {
+        string geomTypeVariant = "cube"
+    }
+    prepend variantSets = "geomTypeVariant"
+) 
 {
+    variantSet "geomTypeVariant" = {
+    "cube" {
+      token geomType = "Cube"
+    }
+    "sphere" {
+      token geomType = "Sphere"
+    }
+    "cone" {
+      token geomType = "Cone"
+    }
+  }
 }
diff --git a/extras/usd/examples/usdDancingCubesExample/data.cpp b/extras/usd/examples/usdDancingCubesExample/data.cpp
index 880c91936a..63c7623454 100644
--- a/extras/usd/examples/usdDancingCubesExample/data.cpp
+++ b/extras/usd/examples/usdDancingCubesExample/data.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/extras/usd/examples/usdDancingCubesExample/data.h b/extras/usd/examples/usdDancingCubesExample/data.h
index e4580b2759..1f98417083 100644
--- a/extras/usd/examples/usdDancingCubesExample/data.h
+++ b/extras/usd/examples/usdDancingCubesExample/data.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_EXTRAS_USD_EXAMPLES_USD_DANCING_CUBES_EXAMPLE_DATA_H
 #define PXR_EXTRAS_USD_EXAMPLES_USD_DANCING_CUBES_EXAMPLE_DATA_H
diff --git a/extras/usd/examples/usdDancingCubesExample/dataImpl.cpp b/extras/usd/examples/usdDancingCubesExample/dataImpl.cpp
index b87641c529..14625acc89 100644
--- a/extras/usd/examples/usdDancingCubesExample/dataImpl.cpp
+++ b/extras/usd/examples/usdDancingCubesExample/dataImpl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/extras/usd/examples/usdDancingCubesExample/dataImpl.h b/extras/usd/examples/usdDancingCubesExample/dataImpl.h
index 9fe9b538a2..7f39dd786d 100644
--- a/extras/usd/examples/usdDancingCubesExample/dataImpl.h
+++ b/extras/usd/examples/usdDancingCubesExample/dataImpl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_EXTRAS_USD_EXAMPLES_USD_DANCING_CUBES_EXAMPLE_DATA_IMPL_H
 #define PXR_EXTRAS_USD_EXAMPLES_USD_DANCING_CUBES_EXAMPLE_DATA_IMPL_H
diff --git a/extras/usd/examples/usdDancingCubesExample/fileFormat.cpp b/extras/usd/examples/usdDancingCubesExample/fileFormat.cpp
index a78510d726..fa65a29150 100644
--- a/extras/usd/examples/usdDancingCubesExample/fileFormat.cpp
+++ b/extras/usd/examples/usdDancingCubesExample/fileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "data.h"
diff --git a/extras/usd/examples/usdDancingCubesExample/fileFormat.h b/extras/usd/examples/usdDancingCubesExample/fileFormat.h
index 147b91f988..63b759b695 100644
--- a/extras/usd/examples/usdDancingCubesExample/fileFormat.h
+++ b/extras/usd/examples/usdDancingCubesExample/fileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_EXTRAS_USD_EXAMPLES_USD_DANCING_CUBES_EXAMPLE_FILE_FORMAT_H
 #define PXR_EXTRAS_USD_EXAMPLES_USD_DANCING_CUBES_EXAMPLE_FILE_FORMAT_H
diff --git a/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample.py b/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample.py
index 5337c2c1f4..7d9b89cbec 100644
--- a/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample.py
+++ b/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Sdf, Usd, Plug
@@ -51,13 +34,15 @@
 p = stage.GetPrimAtPath('/Root')
 md = p.GetMetadata("Usd_DCE_Params")
 p.SetMetadata("Usd_DCE_Params",
-              {'geomType': 'Cone', 
-               'distance': 4.0, 
+              { 'distance': 4.0, 
                'numFrames': 20, 
                'perSide': 3, 
                'framesPerCycle': 12, 
                'moveScale': 4.5 })
 
+# Confirm that variants affect dynamic payload arguments
+p.GetVariantSets().GetVariantSet("geomTypeVariant").SetVariantSelection("sphere")
+
 # Find the dynamic layer again. Note that this layer has a different identity
 # as the file format arguments have changed.
 dynamicLayers = list(filter(lambda l: l.GetFileFormat() == dynamicFormat, 
diff --git a/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample/baseline/newDynamicContents.usda b/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample/baseline/newDynamicContents.usda
index 676baa0d11..105052aaf2 100644
--- a/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample/baseline/newDynamicContents.usda
+++ b/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample/baseline/newDynamicContents.usda
@@ -11,7 +11,7 @@ def "Root"
     {
         def "prim_0"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -85,7 +85,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -159,7 +159,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -236,7 +236,7 @@ def "Root"
 
         def "prim_1"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -310,7 +310,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -384,7 +384,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -461,7 +461,7 @@ def "Root"
 
         def "prim_2"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -535,7 +535,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -609,7 +609,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -689,7 +689,7 @@ def "Root"
     {
         def "prim_0"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -763,7 +763,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -837,7 +837,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -914,7 +914,7 @@ def "Root"
 
         def "prim_1"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -988,7 +988,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1062,7 +1062,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1139,7 +1139,7 @@ def "Root"
 
         def "prim_2"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1213,7 +1213,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1287,7 +1287,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1367,7 +1367,7 @@ def "Root"
     {
         def "prim_0"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1441,7 +1441,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1515,7 +1515,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1592,7 +1592,7 @@ def "Root"
 
         def "prim_1"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1666,7 +1666,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1740,7 +1740,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1817,7 +1817,7 @@ def "Root"
 
         def "prim_2"
         {
-            def Cone "prim_0"
+            def Sphere "prim_0"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1891,7 +1891,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_1"
+            def Sphere "prim_1"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
@@ -1965,7 +1965,7 @@ def "Root"
                 token[] xformOpOrder = ["xformOp:translate", "xformOp:rotateXYZ"]
             }
 
-            def Cone "prim_2"
+            def Sphere "prim_2"
             {
                 float3[] primvars:displayColor = [(1, 1, 1)]
                 float3[] primvars:displayColor.timeSamples = {
diff --git a/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample/test.usda b/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample/test.usda
index cd3cb8d7a2..2c8f488541 100644
--- a/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample/test.usda
+++ b/extras/usd/examples/usdDancingCubesExample/testenv/testUsdDancingCubesExample/test.usda
@@ -5,6 +5,15 @@
 )
 
 def "Root" (
+    references = </Params>
+    # Payload to the dynamic file. The file must exist but its contents are
+    # irrelevant as everything is generated from parameters above.
+    payload = @anon:dummy:e.usddancingcubesexample@
+)
+{
+}
+
+def "Params" (
     # Dictionary value metadata field that provides all the parameters to
     # generate the layer in the payload. Change these values to change the 
     # contents of the file.
@@ -16,9 +25,22 @@ def "Root" (
         double moveScale = 1.5
         token geomType = "Cube"
     }
-    # Payload to the dynamic file. The file must exist but its contents are
-    # irrelevant as everything is generated from parameters above.
-    payload = @anon:dummy:e.usddancingcubesexample@
-)
+
+    variants = {
+        string geomTypeVariant = "cube"
+    }
+    prepend variantSets = "geomTypeVariant"
+) 
 {
-}
+    variantSet "geomTypeVariant" = {
+    "cube" {
+      token geomType = "Cube"
+    }
+    "sphere" {
+      token geomType = "Sphere"
+    }
+    "cone" {
+      token geomType = "Cone"
+    }
+  }
+}
\ No newline at end of file
diff --git a/extras/usd/examples/usdMakeFileVariantModelAsset/usdMakeFileVariantModelAsset.py b/extras/usd/examples/usdMakeFileVariantModelAsset/usdMakeFileVariantModelAsset.py
index e6b3c1a04d..dd62374231 100644
--- a/extras/usd/examples/usdMakeFileVariantModelAsset/usdMakeFileVariantModelAsset.py
+++ b/extras/usd/examples/usdMakeFileVariantModelAsset/usdMakeFileVariantModelAsset.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 '''
diff --git a/extras/usd/examples/usdObj/fileFormat.cpp b/extras/usd/examples/usdObj/fileFormat.cpp
index 1bde9df0cc..b8d041bc3c 100644
--- a/extras/usd/examples/usdObj/fileFormat.cpp
+++ b/extras/usd/examples/usdObj/fileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "fileFormat.h"
diff --git a/extras/usd/examples/usdObj/fileFormat.h b/extras/usd/examples/usdObj/fileFormat.h
index 5b615598c3..a9ced0b33d 100644
--- a/extras/usd/examples/usdObj/fileFormat.h
+++ b/extras/usd/examples/usdObj/fileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_EXTRAS_USD_EXAMPLES_USD_OBJ_FILE_FORMAT_H
 #define PXR_EXTRAS_USD_EXAMPLES_USD_OBJ_FILE_FORMAT_H
diff --git a/extras/usd/examples/usdObj/pch.h b/extras/usd/examples/usdObj/pch.h
index 6a8744cbc7..725c110142 100644
--- a/extras/usd/examples/usdObj/pch.h
+++ b/extras/usd/examples/usdObj/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,15 +22,15 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
+#include <charconv>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -69,8 +53,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -79,62 +64,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
@@ -148,26 +86,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -175,7 +96,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/extras/usd/examples/usdObj/stream.cpp b/extras/usd/examples/usdObj/stream.cpp
index 8721af585f..74aef29b51 100644
--- a/extras/usd/examples/usdObj/stream.cpp
+++ b/extras/usd/examples/usdObj/stream.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "stream.h"
diff --git a/extras/usd/examples/usdObj/stream.h b/extras/usd/examples/usdObj/stream.h
index c5d754b0f2..2df825b6bd 100644
--- a/extras/usd/examples/usdObj/stream.h
+++ b/extras/usd/examples/usdObj/stream.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_EXTRAS_USD_EXAMPLES_USD_OBJ_STREAM_H
 #define PXR_EXTRAS_USD_EXAMPLES_USD_OBJ_STREAM_H
diff --git a/extras/usd/examples/usdObj/streamIO.cpp b/extras/usd/examples/usdObj/streamIO.cpp
index 699e6e9040..df8ad490f0 100644
--- a/extras/usd/examples/usdObj/streamIO.cpp
+++ b/extras/usd/examples/usdObj/streamIO.cpp
@@ -1,38 +1,20 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "streamIO.h"
 #include "stream.h"
 #include "pxr/base/tf/stringUtils.h"
 
-#include <boost/lexical_cast.hpp>
-#include <boost/iterator.hpp>
-
 #include <algorithm>
+#include <charconv>
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <utility>
 
 using std::string;
 using std::vector;
@@ -59,22 +41,22 @@ UsdObjReadDataFromFile(std::string const &fileName,
 static UsdObjStream::Point
 _ParsePoint(string const &str)
 {
-    using boost::iterator_range;
-    using boost::make_iterator_range;
-    using boost::lexical_cast;
-
     UsdObjStream::Point result;
 
     // Break the string up into up to 3 segments separated by slashes.
-    iterator_range<char const *> ranges[3];
     int numRanges = 0;
     char const *from = str.data(),
         *pos = str.data(), *end = str.data() + strlen(str.data());
+    std::pair<char const*, char const*> ranges[3] = {
+        { end, end }, { end, end }, { end, end }
+    };
+
     while (numRanges != 3) {
         pos = std::find(from, end, '/');
-        ranges[numRanges++] = make_iterator_range(from, pos);
-        if (pos == end)
+        ranges[numRanges++] = std::make_pair(from, pos);
+        if (pos == end) {
             break;
+        }
         from = pos + 1;
     }
 
@@ -82,8 +64,10 @@ _ParsePoint(string const &str)
     // 1-based in the file, but we store them 0-based in the data structure.
     int *indexes[] = {&result.vertIndex, &result.uvIndex, &result.normalIndex};
     for (int i = 0; i != numRanges; ++i) {
-        if (!ranges[i].empty())
-            *indexes[i] = lexical_cast<int>(ranges[i]) - 1;
+        if (std::from_chars(ranges[i].first, ranges[i].second, *indexes[i]).ec 
+                == std::errc{}) {
+            --(*indexes[i]);
+        }
     }
 
     return result;
diff --git a/extras/usd/examples/usdObj/streamIO.h b/extras/usd/examples/usdObj/streamIO.h
index c744ff0a53..1fe21e4d07 100644
--- a/extras/usd/examples/usdObj/streamIO.h
+++ b/extras/usd/examples/usdObj/streamIO.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_EXTRAS_USD_EXAMPLES_USD_OBJ_STREAM_IO_H
 #define PXR_EXTRAS_USD_EXAMPLES_USD_OBJ_STREAM_IO_H
diff --git a/extras/usd/examples/usdObj/translator.cpp b/extras/usd/examples/usdObj/translator.cpp
index 96fd3492ec..2809bc8ab6 100644
--- a/extras/usd/examples/usdObj/translator.cpp
+++ b/extras/usd/examples/usdObj/translator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "translator.h"
diff --git a/extras/usd/examples/usdObj/translator.h b/extras/usd/examples/usdObj/translator.h
index 0789c5d1f9..f955b78b0d 100644
--- a/extras/usd/examples/usdObj/translator.h
+++ b/extras/usd/examples/usdObj/translator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_EXTRAS_USD_EXAMPLES_USD_OBJ_TRANSLATOR_H
 #define PXR_EXTRAS_USD_EXAMPLES_USD_OBJ_TRANSLATOR_H
diff --git a/extras/usd/examples/usdRecursivePayloadsExample/fileFormat.cpp b/extras/usd/examples/usdRecursivePayloadsExample/fileFormat.cpp
index c1aee67794..a83b58beb7 100644
--- a/extras/usd/examples/usdRecursivePayloadsExample/fileFormat.cpp
+++ b/extras/usd/examples/usdRecursivePayloadsExample/fileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "fileFormat.h"
diff --git a/extras/usd/examples/usdRecursivePayloadsExample/fileFormat.h b/extras/usd/examples/usdRecursivePayloadsExample/fileFormat.h
index b945e1c5ff..0d8c5ff233 100644
--- a/extras/usd/examples/usdRecursivePayloadsExample/fileFormat.h
+++ b/extras/usd/examples/usdRecursivePayloadsExample/fileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_EXTRAS_USD_EXAMPLES_USD_RECURSIVE_PAYLOADS_EXAMPLE_FILE_FORMAT_H
 #define PXR_EXTRAS_USD_EXAMPLES_USD_RECURSIVE_PAYLOADS_EXAMPLE_FILE_FORMAT_H
diff --git a/extras/usd/examples/usdRecursivePayloadsExample/testenv/testUsdRecursivePayloadsExample.py b/extras/usd/examples/usdRecursivePayloadsExample/testenv/testUsdRecursivePayloadsExample.py
index 5cd1c4c239..582dbff85f 100644
--- a/extras/usd/examples/usdRecursivePayloadsExample/testenv/testUsdRecursivePayloadsExample.py
+++ b/extras/usd/examples/usdRecursivePayloadsExample/testenv/testUsdRecursivePayloadsExample.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Sdf, Usd, Plug
diff --git a/extras/usd/examples/usdResolverExample/__init__.py b/extras/usd/examples/usdResolverExample/__init__.py
index 989e9465c7..0b93b57461 100644
--- a/extras/usd/examples/usdResolverExample/__init__.py
+++ b/extras/usd/examples/usdResolverExample/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/extras/usd/examples/usdResolverExample/api.h b/extras/usd/examples/usdResolverExample/api.h
index 5cdb2bc840..877f32b4c8 100644
--- a/extras/usd/examples/usdResolverExample/api.h
+++ b/extras/usd/examples/usdResolverExample/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USD_RESOLVER_EXAMPLE_API_H
 #define USD_RESOLVER_EXAMPLE_API_H
diff --git a/extras/usd/examples/usdResolverExample/module.cpp b/extras/usd/examples/usdResolverExample/module.cpp
index 7b01e7b7df..34c6b7eef4 100644
--- a/extras/usd/examples/usdResolverExample/module.cpp
+++ b/extras/usd/examples/usdResolverExample/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/extras/usd/examples/usdResolverExample/moduleDeps.cpp b/extras/usd/examples/usdResolverExample/moduleDeps.cpp
index e8152cf61f..72d28a6125 100644
--- a/extras/usd/examples/usdResolverExample/moduleDeps.cpp
+++ b/extras/usd/examples/usdResolverExample/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/extras/usd/examples/usdResolverExample/resolver.cpp b/extras/usd/examples/usdResolverExample/resolver.cpp
index 8129d76729..8e1933cadd 100644
--- a/extras/usd/examples/usdResolverExample/resolver.cpp
+++ b/extras/usd/examples/usdResolverExample/resolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/extras/usd/examples/usdResolverExample/resolver.h b/extras/usd/examples/usdResolverExample/resolver.h
index 09e8bb2f01..4667682531 100644
--- a/extras/usd/examples/usdResolverExample/resolver.h
+++ b/extras/usd/examples/usdResolverExample/resolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/extras/usd/examples/usdResolverExample/resolverContext.cpp b/extras/usd/examples/usdResolverExample/resolverContext.cpp
index 1da6057313..72b4874c44 100644
--- a/extras/usd/examples/usdResolverExample/resolverContext.cpp
+++ b/extras/usd/examples/usdResolverExample/resolverContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/extras/usd/examples/usdResolverExample/resolverContext.h b/extras/usd/examples/usdResolverExample/resolverContext.h
index 6321752616..e17ba0b692 100644
--- a/extras/usd/examples/usdResolverExample/resolverContext.h
+++ b/extras/usd/examples/usdResolverExample/resolverContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/extras/usd/examples/usdResolverExample/testenv/testUsdResolverExample.py b/extras/usd/examples/usdResolverExample/testenv/testUsdResolverExample.py
index ed75858215..9a1720398e 100644
--- a/extras/usd/examples/usdResolverExample/testenv/testUsdResolverExample.py
+++ b/extras/usd/examples/usdResolverExample/testenv/testUsdResolverExample.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import json
 import os
diff --git a/extras/usd/examples/usdResolverExample/wrapResolverContext.cpp b/extras/usd/examples/usdResolverExample/wrapResolverContext.cpp
index 6c43fbe56c..4a15c18483 100644
--- a/extras/usd/examples/usdResolverExample/wrapResolverContext.cpp
+++ b/extras/usd/examples/usdResolverExample/wrapResolverContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/extras/usd/examples/usdSchemaExamples/__init__.py b/extras/usd/examples/usdSchemaExamples/__init__.py
index 21792ee990..d830462be1 100644
--- a/extras/usd/examples/usdSchemaExamples/__init__.py
+++ b/extras/usd/examples/usdSchemaExamples/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/extras/usd/examples/usdSchemaExamples/api.h b/extras/usd/examples/usdSchemaExamples/api.h
index b20e28cf29..29d18022a6 100644
--- a/extras/usd/examples/usdSchemaExamples/api.h
+++ b/extras/usd/examples/usdSchemaExamples/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSCHEMAEXAMPLES_API_H
 #define USDSCHEMAEXAMPLES_API_H
diff --git a/extras/usd/examples/usdSchemaExamples/complex.cpp b/extras/usd/examples/usdSchemaExamples/complex.cpp
index dcda5ed50e..d29238b57f 100644
--- a/extras/usd/examples/usdSchemaExamples/complex.cpp
+++ b/extras/usd/examples/usdSchemaExamples/complex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "./complex.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/extras/usd/examples/usdSchemaExamples/complex.h b/extras/usd/examples/usdSchemaExamples/complex.h
index d41a72aef1..6372cfe346 100644
--- a/extras/usd/examples/usdSchemaExamples/complex.h
+++ b/extras/usd/examples/usdSchemaExamples/complex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSCHEMAEXAMPLES_GENERATED_COMPLEX_H
 #define USDSCHEMAEXAMPLES_GENERATED_COMPLEX_H
diff --git a/extras/usd/examples/usdSchemaExamples/module.cpp b/extras/usd/examples/usdSchemaExamples/module.cpp
index 32265e167c..64e79a44d5 100644
--- a/extras/usd/examples/usdSchemaExamples/module.cpp
+++ b/extras/usd/examples/usdSchemaExamples/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pySafePython.h"
 #include "pxr/pxr.h"
diff --git a/extras/usd/examples/usdSchemaExamples/moduleDeps.cpp b/extras/usd/examples/usdSchemaExamples/moduleDeps.cpp
index 0d2302a643..7dd4e51cd6 100644
--- a/extras/usd/examples/usdSchemaExamples/moduleDeps.cpp
+++ b/extras/usd/examples/usdSchemaExamples/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/extras/usd/examples/usdSchemaExamples/paramsAPI.cpp b/extras/usd/examples/usdSchemaExamples/paramsAPI.cpp
index 2415d614d2..d543ddf08c 100644
--- a/extras/usd/examples/usdSchemaExamples/paramsAPI.cpp
+++ b/extras/usd/examples/usdSchemaExamples/paramsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "./paramsAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/extras/usd/examples/usdSchemaExamples/paramsAPI.h b/extras/usd/examples/usdSchemaExamples/paramsAPI.h
index dd72bdc684..3de61d9e7a 100644
--- a/extras/usd/examples/usdSchemaExamples/paramsAPI.h
+++ b/extras/usd/examples/usdSchemaExamples/paramsAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSCHEMAEXAMPLES_GENERATED_PARAMSAPI_H
 #define USDSCHEMAEXAMPLES_GENERATED_PARAMSAPI_H
diff --git a/extras/usd/examples/usdSchemaExamples/pch.h b/extras/usd/examples/usdSchemaExamples/pch.h
index 47666439a2..3b58a92a35 100644
--- a/extras/usd/examples/usdSchemaExamples/pch.h
+++ b/extras/usd/examples/usdSchemaExamples/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cinttypes>
@@ -66,8 +49,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -76,6 +60,7 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -83,53 +68,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -142,6 +80,8 @@
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
+#include <boost/python/operators.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
@@ -150,26 +90,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -177,7 +100,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/extras/usd/examples/usdSchemaExamples/simple.cpp b/extras/usd/examples/usdSchemaExamples/simple.cpp
index 740b632265..b5ca11d95f 100644
--- a/extras/usd/examples/usdSchemaExamples/simple.cpp
+++ b/extras/usd/examples/usdSchemaExamples/simple.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "./simple.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/extras/usd/examples/usdSchemaExamples/simple.h b/extras/usd/examples/usdSchemaExamples/simple.h
index d3c0ecf261..1b75faa31d 100644
--- a/extras/usd/examples/usdSchemaExamples/simple.h
+++ b/extras/usd/examples/usdSchemaExamples/simple.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSCHEMAEXAMPLES_GENERATED_SIMPLE_H
 #define USDSCHEMAEXAMPLES_GENERATED_SIMPLE_H
diff --git a/extras/usd/examples/usdSchemaExamples/tokens.cpp b/extras/usd/examples/usdSchemaExamples/tokens.cpp
index a67a16358e..1acfac5270 100644
--- a/extras/usd/examples/usdSchemaExamples/tokens.cpp
+++ b/extras/usd/examples/usdSchemaExamples/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "./tokens.h"
 
diff --git a/extras/usd/examples/usdSchemaExamples/tokens.h b/extras/usd/examples/usdSchemaExamples/tokens.h
index 5756be76d7..cbe3ed6eac 100644
--- a/extras/usd/examples/usdSchemaExamples/tokens.h
+++ b/extras/usd/examples/usdSchemaExamples/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSCHEMAEXAMPLES_TOKENS_H
 #define USDSCHEMAEXAMPLES_TOKENS_H
diff --git a/extras/usd/examples/usdSchemaExamples/wrapComplex.cpp b/extras/usd/examples/usdSchemaExamples/wrapComplex.cpp
index 3d2bb1142c..3ffb511948 100644
--- a/extras/usd/examples/usdSchemaExamples/wrapComplex.cpp
+++ b/extras/usd/examples/usdSchemaExamples/wrapComplex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "./complex.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/extras/usd/examples/usdSchemaExamples/wrapParamsAPI.cpp b/extras/usd/examples/usdSchemaExamples/wrapParamsAPI.cpp
index a8b2fd37c4..f9d528b799 100644
--- a/extras/usd/examples/usdSchemaExamples/wrapParamsAPI.cpp
+++ b/extras/usd/examples/usdSchemaExamples/wrapParamsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "./paramsAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/extras/usd/examples/usdSchemaExamples/wrapSimple.cpp b/extras/usd/examples/usdSchemaExamples/wrapSimple.cpp
index a2d4b0315b..fba73f4a7f 100644
--- a/extras/usd/examples/usdSchemaExamples/wrapSimple.cpp
+++ b/extras/usd/examples/usdSchemaExamples/wrapSimple.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "./simple.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/extras/usd/examples/usdSchemaExamples/wrapTokens.cpp b/extras/usd/examples/usdSchemaExamples/wrapTokens.cpp
index 82da7eb0d7..5ced1826e2 100644
--- a/extras/usd/examples/usdSchemaExamples/wrapTokens.cpp
+++ b/extras/usd/examples/usdSchemaExamples/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/extras/usd/examples/usdviewPlugins/sendMail.py b/extras/usd/examples/usdviewPlugins/sendMail.py
index f3a1a10637..f06d85473c 100644
--- a/extras/usd/examples/usdviewPlugins/sendMail.py
+++ b/extras/usd/examples/usdviewPlugins/sendMail.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # Sendmail Plugin
 #
diff --git a/extras/usd/tutorials/animatedTop/generate_examples.py b/extras/usd/tutorials/animatedTop/generate_examples.py
index 04e6e25095..a02e95415c 100644
--- a/extras/usd/tutorials/animatedTop/generate_examples.py
+++ b/extras/usd/tutorials/animatedTop/generate_examples.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2016 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 # This is an example script from the USD tutorial,
 # "Transformations, Time-sampled Animation, and Layer Offsets".
 #
diff --git a/extras/usd/tutorials/authoringProperties/authorProperties.py b/extras/usd/tutorials/authoringProperties/authorProperties.py
index 840f9677c3..30fa8b1121 100644
--- a/extras/usd/tutorials/authoringProperties/authorProperties.py
+++ b/extras/usd/tutorials/authoringProperties/authorProperties.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/extras/usd/tutorials/authoringVariants/authorVariants.py b/extras/usd/tutorials/authoringVariants/authorVariants.py
index 0f04d88a1c..89f2c22052 100644
--- a/extras/usd/tutorials/authoringVariants/authorVariants.py
+++ b/extras/usd/tutorials/authoringVariants/authorVariants.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/extras/usd/tutorials/endToEnd/scripts/create_asset.py b/extras/usd/tutorials/endToEnd/scripts/create_asset.py
index f44809fba8..f4c632002d 100644
--- a/extras/usd/tutorials/endToEnd/scripts/create_asset.py
+++ b/extras/usd/tutorials/endToEnd/scripts/create_asset.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 '''
diff --git a/extras/usd/tutorials/endToEnd/scripts/create_shot.py b/extras/usd/tutorials/endToEnd/scripts/create_shot.py
index d938b45dbf..fe300c2ac7 100644
--- a/extras/usd/tutorials/endToEnd/scripts/create_shot.py
+++ b/extras/usd/tutorials/endToEnd/scripts/create_shot.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 '''
diff --git a/extras/usd/tutorials/endToEnd/tutorial_scripts/add_set_to_s00.py b/extras/usd/tutorials/endToEnd/tutorial_scripts/add_set_to_s00.py
index b69e06734b..b9212b18bb 100644
--- a/extras/usd/tutorials/endToEnd/tutorial_scripts/add_set_to_s00.py
+++ b/extras/usd/tutorials/endToEnd/tutorial_scripts/add_set_to_s00.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/extras/usd/tutorials/endToEnd/tutorial_scripts/add_shadingVariants.py b/extras/usd/tutorials/endToEnd/tutorial_scripts/add_shadingVariants.py
index f6c8c076e2..0387a2fd82 100644
--- a/extras/usd/tutorials/endToEnd/tutorial_scripts/add_shadingVariants.py
+++ b/extras/usd/tutorials/endToEnd/tutorial_scripts/add_shadingVariants.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 '''
diff --git a/extras/usd/tutorials/endToEnd/tutorial_scripts/anim_shot_s00_01.py b/extras/usd/tutorials/endToEnd/tutorial_scripts/anim_shot_s00_01.py
index ef26e0e409..223ef150f7 100644
--- a/extras/usd/tutorials/endToEnd/tutorial_scripts/anim_shot_s00_01.py
+++ b/extras/usd/tutorials/endToEnd/tutorial_scripts/anim_shot_s00_01.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/extras/usd/tutorials/endToEnd/tutorial_scripts/create_Room_set.py b/extras/usd/tutorials/endToEnd/tutorial_scripts/create_Room_set.py
index 6d10769967..20851fc56a 100644
--- a/extras/usd/tutorials/endToEnd/tutorial_scripts/create_Room_set.py
+++ b/extras/usd/tutorials/endToEnd/tutorial_scripts/create_Room_set.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 '''
diff --git a/extras/usd/tutorials/endToEnd/tutorial_scripts/layout_shot_s00_01.py b/extras/usd/tutorials/endToEnd/tutorial_scripts/layout_shot_s00_01.py
index 228b259eac..0ca3452bc1 100644
--- a/extras/usd/tutorials/endToEnd/tutorial_scripts/layout_shot_s00_01.py
+++ b/extras/usd/tutorials/endToEnd/tutorial_scripts/layout_shot_s00_01.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/extras/usd/tutorials/helloWorld/helloWorld.py b/extras/usd/tutorials/helloWorld/helloWorld.py
index 5be435c51a..e3cecd70be 100644
--- a/extras/usd/tutorials/helloWorld/helloWorld.py
+++ b/extras/usd/tutorials/helloWorld/helloWorld.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd, UsdGeom
diff --git a/extras/usd/tutorials/helloWorld/helloWorldRedux.py b/extras/usd/tutorials/helloWorld/helloWorldRedux.py
index 1efbeb2862..da882d4ffb 100644
--- a/extras/usd/tutorials/helloWorld/helloWorldRedux.py
+++ b/extras/usd/tutorials/helloWorld/helloWorldRedux.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd
diff --git a/extras/usd/tutorials/referencingLayers/authorReferences.py b/extras/usd/tutorials/referencingLayers/authorReferences.py
index f3bd572b62..ffb92ec8ce 100644
--- a/extras/usd/tutorials/referencingLayers/authorReferences.py
+++ b/extras/usd/tutorials/referencingLayers/authorReferences.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Assumes that $USD_INSTALL_ROOT/lib/python is in sys.path
diff --git a/extras/usd/tutorials/simpleShading/generate_simpleShading.py b/extras/usd/tutorials/simpleShading/generate_simpleShading.py
index c410a101a4..1c7cdae743 100644
--- a/extras/usd/tutorials/simpleShading/generate_simpleShading.py
+++ b/extras/usd/tutorials/simpleShading/generate_simpleShading.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # This is an example script from the USD tutorial,
diff --git a/extras/usd/tutorials/traversingStage/traversingStage.py b/extras/usd/tutorials/traversingStage/traversingStage.py
index 4f7f70dd62..363131d6af 100644
--- a/extras/usd/tutorials/traversingStage/traversingStage.py
+++ b/extras/usd/tutorials/traversingStage/traversingStage.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd, UsdGeom
diff --git a/pxr/base/CMakeLists.txt b/pxr/base/CMakeLists.txt
index 1f0303f6f4..f5c8318ae0 100644
--- a/pxr/base/CMakeLists.txt
+++ b/pxr/base/CMakeLists.txt
@@ -2,6 +2,7 @@ set(DIRS
     arch
     tf
     gf
+    pegtl
     js
     trace
     work
diff --git a/pxr/base/arch/align.cpp b/pxr/base/arch/align.cpp
index 8e1aa4029c..772d118768 100644
--- a/pxr/base/arch/align.cpp
+++ b/pxr/base/arch/align.cpp
@@ -1,24 +1,7 @@
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/align.h b/pxr/base/arch/align.h
index 1dba8a94a3..d00a10ce29 100644
--- a/pxr/base/arch/align.h
+++ b/pxr/base/arch/align.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_ALIGN_H
 #define PXR_BASE_ARCH_ALIGN_H
diff --git a/pxr/base/arch/api.h b/pxr/base/arch/api.h
index 5202767e2f..680e4a90f5 100644
--- a/pxr/base/arch/api.h
+++ b/pxr/base/arch/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_API_H
 #define PXR_BASE_ARCH_API_H
diff --git a/pxr/base/arch/assumptions.cpp b/pxr/base/arch/assumptions.cpp
index 3952f136ca..d17c293d31 100644
--- a/pxr/base/arch/assumptions.cpp
+++ b/pxr/base/arch/assumptions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/attributes.cpp b/pxr/base/arch/attributes.cpp
index 1be3446177..1309d6f249 100644
--- a/pxr/base/arch/attributes.cpp
+++ b/pxr/base/arch/attributes.cpp
@@ -1,24 +1,7 @@
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/attributes.h b/pxr/base/arch/attributes.h
index 409156e332..1d2820d1e7 100644
--- a/pxr/base/arch/attributes.h
+++ b/pxr/base/arch/attributes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_ATTRIBUTES_H
 #define PXR_BASE_ARCH_ATTRIBUTES_H
diff --git a/pxr/base/arch/buildMode.h b/pxr/base/arch/buildMode.h
index bf4bb47d5d..4e6bf047d8 100644
--- a/pxr/base/arch/buildMode.h
+++ b/pxr/base/arch/buildMode.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_BUILD_MODE_H
 #define PXR_BASE_ARCH_BUILD_MODE_H
diff --git a/pxr/base/arch/daemon.cpp b/pxr/base/arch/daemon.cpp
index 33cf10de06..ef14034933 100644
--- a/pxr/base/arch/daemon.cpp
+++ b/pxr/base/arch/daemon.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/daemon.h b/pxr/base/arch/daemon.h
index 3187851d06..225584d414 100644
--- a/pxr/base/arch/daemon.h
+++ b/pxr/base/arch/daemon.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_DAEMON_H
 #define PXR_BASE_ARCH_DAEMON_H
diff --git a/pxr/base/arch/debugger.cpp b/pxr/base/arch/debugger.cpp
index 4039d0d57e..e1596b3ac9 100644
--- a/pxr/base/arch/debugger.cpp
+++ b/pxr/base/arch/debugger.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file debugger.cpp
 
diff --git a/pxr/base/arch/debugger.h b/pxr/base/arch/debugger.h
index a16511d920..bab6e2f0f2 100644
--- a/pxr/base/arch/debugger.h
+++ b/pxr/base/arch/debugger.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_DEBUGGER_H
 #define PXR_BASE_ARCH_DEBUGGER_H
diff --git a/pxr/base/arch/defines.h b/pxr/base/arch/defines.h
index 5b1a086018..021dd28cf5 100644
--- a/pxr/base/arch/defines.h
+++ b/pxr/base/arch/defines.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_DEFINES_H
 #define PXR_BASE_ARCH_DEFINES_H
@@ -107,4 +90,16 @@
 #define ARCH_HAS_MMAP_MAP_POPULATE
 #endif
 
+// When using MSVC, provide an easy way to detect whether the older
+// "traditional" preprocessor is being used as opposed to the newer, more
+// standards-conforming preprocessor. The traditional preprocessor may require
+// custom versions of macros.
+// See here for more detail about MSVC's preprocessors:
+// https://learn.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview
+#if defined(ARCH_COMPILER_MSVC)
+    #if !defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL
+    #define ARCH_PREPROCESSOR_MSVC_TRADITIONAL
+    #endif
+#endif
+
 #endif // PXR_BASE_ARCH_DEFINES_H 
diff --git a/pxr/base/arch/demangle.cpp b/pxr/base/arch/demangle.cpp
index 4a7e502567..683fcf2aee 100644
--- a/pxr/base/arch/demangle.cpp
+++ b/pxr/base/arch/demangle.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/demangle.h b/pxr/base/arch/demangle.h
index 861fc9b1f2..0646b48504 100644
--- a/pxr/base/arch/demangle.h
+++ b/pxr/base/arch/demangle.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_DEMANGLE_H
 #define PXR_BASE_ARCH_DEMANGLE_H
diff --git a/pxr/base/arch/env.cpp b/pxr/base/arch/env.cpp
index a0f5ae757c..490eb54769 100644
--- a/pxr/base/arch/env.cpp
+++ b/pxr/base/arch/env.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/env.h"
diff --git a/pxr/base/arch/env.h b/pxr/base/arch/env.h
index 6d863f3587..e8d0300c6a 100644
--- a/pxr/base/arch/env.h
+++ b/pxr/base/arch/env.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_ENV_H
 #define PXR_BASE_ARCH_ENV_H
diff --git a/pxr/base/arch/errno.cpp b/pxr/base/arch/errno.cpp
index 7dcae2839f..c30e52059c 100644
--- a/pxr/base/arch/errno.cpp
+++ b/pxr/base/arch/errno.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/errno.h b/pxr/base/arch/errno.h
index fbc71b7a60..dbb4669d6c 100644
--- a/pxr/base/arch/errno.h
+++ b/pxr/base/arch/errno.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_ERRNO_H
 #define PXR_BASE_ARCH_ERRNO_H
diff --git a/pxr/base/arch/error.cpp b/pxr/base/arch/error.cpp
index 719919ebee..a996160bcd 100644
--- a/pxr/base/arch/error.cpp
+++ b/pxr/base/arch/error.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/error.h b/pxr/base/arch/error.h
index efd3c939f9..8b421cfb44 100644
--- a/pxr/base/arch/error.h
+++ b/pxr/base/arch/error.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_ERROR_H
 #define PXR_BASE_ARCH_ERROR_H
diff --git a/pxr/base/arch/export.h b/pxr/base/arch/export.h
index 55ae61b5e5..06246ab742 100644
--- a/pxr/base/arch/export.h
+++ b/pxr/base/arch/export.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_EXPORT_H
 #define PXR_BASE_ARCH_EXPORT_H
diff --git a/pxr/base/arch/fileSystem.cpp b/pxr/base/arch/fileSystem.cpp
index e2d5db4447..50ce636cb3 100644
--- a/pxr/base/arch/fileSystem.cpp
+++ b/pxr/base/arch/fileSystem.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/fileSystem.h"
@@ -378,15 +361,10 @@ ArchNormPath(const string& inPath, bool stripDriveSpecifier)
 
     // Extract the drive specifier.  Note that we don't correctly handle
     // UNC paths or paths that start with \\? (which allow longer paths).
-    //
-    // Also make sure drive letters are always lower-case out of ArchNormPath
-    // on Windows -- this is so that we can be sure we can reliably use the
-    // paths as keys in tables, etc.
     string prefix;
     if (path.size() >= 2 && path[1] == ':') {
         if (!stripDriveSpecifier) {
-            prefix.assign(2, ':');
-            prefix[0] = std::tolower(path[0]);
+            prefix = path.substr(0,2);
         }
         path.erase(0, 2);
     }
diff --git a/pxr/base/arch/fileSystem.h b/pxr/base/arch/fileSystem.h
index cc08b716cb..432d6d7063 100644
--- a/pxr/base/arch/fileSystem.h
+++ b/pxr/base/arch/fileSystem.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_FILE_SYSTEM_H
 #define PXR_BASE_ARCH_FILE_SYSTEM_H
diff --git a/pxr/base/arch/function.cpp b/pxr/base/arch/function.cpp
index 08fbb92c16..7a27b04e81 100644
--- a/pxr/base/arch/function.cpp
+++ b/pxr/base/arch/function.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/function.h b/pxr/base/arch/function.h
index f65ade7c39..7d313a06e8 100644
--- a/pxr/base/arch/function.h
+++ b/pxr/base/arch/function.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_FUNCTION_H
 #define PXR_BASE_ARCH_FUNCTION_H
diff --git a/pxr/base/arch/functionLite.h b/pxr/base/arch/functionLite.h
index a04db36067..c65148c754 100644
--- a/pxr/base/arch/functionLite.h
+++ b/pxr/base/arch/functionLite.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_FUNCTION_LITE_H
 #define PXR_BASE_ARCH_FUNCTION_LITE_H
diff --git a/pxr/base/arch/hash.cpp b/pxr/base/arch/hash.cpp
index e235b68909..1f55ce70a7 100644
--- a/pxr/base/arch/hash.cpp
+++ b/pxr/base/arch/hash.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/hash.h b/pxr/base/arch/hash.h
index afa58017ad..ff5c689c7b 100644
--- a/pxr/base/arch/hash.h
+++ b/pxr/base/arch/hash.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_HASH_H
 #define PXR_BASE_ARCH_HASH_H
diff --git a/pxr/base/arch/hints.h b/pxr/base/arch/hints.h
index 8faa4d5bb4..49fe606824 100644
--- a/pxr/base/arch/hints.h
+++ b/pxr/base/arch/hints.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_HINTS_H
 #define PXR_BASE_ARCH_HINTS_H
diff --git a/pxr/base/arch/initConfig.cpp b/pxr/base/arch/initConfig.cpp
index 15a8e7b257..f3d9257488 100644
--- a/pxr/base/arch/initConfig.cpp
+++ b/pxr/base/arch/initConfig.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/inttypes.h b/pxr/base/arch/inttypes.h
index 80721b76a1..ad7d9b9537 100644
--- a/pxr/base/arch/inttypes.h
+++ b/pxr/base/arch/inttypes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_INTTYPES_H
 #define PXR_BASE_ARCH_INTTYPES_H
diff --git a/pxr/base/arch/library.cpp b/pxr/base/arch/library.cpp
index 65e6b4bd22..7319ef1b64 100644
--- a/pxr/base/arch/library.cpp
+++ b/pxr/base/arch/library.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/library.h b/pxr/base/arch/library.h
index fff7683490..4347a8ccca 100644
--- a/pxr/base/arch/library.h
+++ b/pxr/base/arch/library.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_LIBRARY_H
 #define PXR_BASE_ARCH_LIBRARY_H
diff --git a/pxr/base/arch/mallocHook.cpp b/pxr/base/arch/mallocHook.cpp
index cf776feb8a..6679414543 100644
--- a/pxr/base/arch/mallocHook.cpp
+++ b/pxr/base/arch/mallocHook.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/mallocHook.h b/pxr/base/arch/mallocHook.h
index 48c1e85593..7764494248 100644
--- a/pxr/base/arch/mallocHook.h
+++ b/pxr/base/arch/mallocHook.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_MALLOC_HOOK_H
 #define PXR_BASE_ARCH_MALLOC_HOOK_H
diff --git a/pxr/base/arch/math.h b/pxr/base/arch/math.h
index 59a1734c9e..a7191db09f 100644
--- a/pxr/base/arch/math.h
+++ b/pxr/base/arch/math.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_MATH_H
 #define PXR_BASE_ARCH_MATH_H
diff --git a/pxr/base/arch/pch.h b/pxr/base/arch/pch.h
index e12a42b037..a2358aa1e3 100644
--- a/pxr/base/arch/pch.h
+++ b/pxr/base/arch/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -35,17 +18,20 @@
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/param.h>
+#include <sys/ptrace.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
+#include <sys/wait.h>
 #include <unistd.h>
+#include <mach-o/arch.h>
 #include <mach-o/dyld.h>
 #include <mach-o/loader.h>
 #include <mach-o/swap.h>
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
-#include <csignal>
+#include <chrono>
 #include <dlfcn.h>
 #include <glob.h>
 #include <limits.h>
@@ -76,6 +62,7 @@
 #include <intrin.h>
 #include <io.h>
 #include <process.h>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
 #include <atomic>
@@ -83,11 +70,13 @@
 #include <cerrno>
 #include <cinttypes>
 #include <cmath>
+#include <csignal>
 #include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <errno.h>
 #include <fcntl.h>
 #include <fstream>
@@ -99,6 +88,7 @@
 #include <map>
 #include <memory>
 #include <mutex>
+#include <numeric>
 #include <ostream>
 #include <regex>
 #include <set>
@@ -114,6 +104,7 @@
 #include <sys/types.h>
 #include <thread>
 #include <time.h>
+#include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <utility>
diff --git a/pxr/base/arch/pragmas.h b/pxr/base/arch/pragmas.h
index ce9e15e319..1d15ab7434 100644
--- a/pxr/base/arch/pragmas.h
+++ b/pxr/base/arch/pragmas.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_PRAGMAS_H
 #define PXR_BASE_ARCH_PRAGMAS_H
diff --git a/pxr/base/arch/regex.cpp b/pxr/base/arch/regex.cpp
index ee37af280b..e2e30a260f 100644
--- a/pxr/base/arch/regex.cpp
+++ b/pxr/base/arch/regex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/regex.h b/pxr/base/arch/regex.h
index 2350bc9061..e09a244253 100644
--- a/pxr/base/arch/regex.h
+++ b/pxr/base/arch/regex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_REGEX_H
 #define PXR_BASE_ARCH_REGEX_H
diff --git a/pxr/base/arch/stackTrace.cpp b/pxr/base/arch/stackTrace.cpp
index 1d75c7799a..1d1e92bc57 100644
--- a/pxr/base/arch/stackTrace.cpp
+++ b/pxr/base/arch/stackTrace.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
@@ -427,7 +410,7 @@ char* asitoa(char* s, long x)
     // Write the minus sign.
     if (x < 0) {
         x = -x;
-        *s = '-';
+        *s++ = '-';
     }
 
     // Skip to the end and write the terminating NUL.
diff --git a/pxr/base/arch/stackTrace.h b/pxr/base/arch/stackTrace.h
index d0eb56b098..6eb75771eb 100644
--- a/pxr/base/arch/stackTrace.h
+++ b/pxr/base/arch/stackTrace.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_STACK_TRACE_H
 #define PXR_BASE_ARCH_STACK_TRACE_H
diff --git a/pxr/base/arch/symbols.cpp b/pxr/base/arch/symbols.cpp
index 299c71aab6..ac5b8ad44b 100644
--- a/pxr/base/arch/symbols.cpp
+++ b/pxr/base/arch/symbols.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/symbols.h b/pxr/base/arch/symbols.h
index 8ee6c08361..72211f1e62 100644
--- a/pxr/base/arch/symbols.h
+++ b/pxr/base/arch/symbols.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_SYMBOLS_H
 #define PXR_BASE_ARCH_SYMBOLS_H
diff --git a/pxr/base/arch/systemInfo.cpp b/pxr/base/arch/systemInfo.cpp
index d667c43ec9..bc61e3e111 100644
--- a/pxr/base/arch/systemInfo.cpp
+++ b/pxr/base/arch/systemInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/systemInfo.h b/pxr/base/arch/systemInfo.h
index 9a6c331c93..55ff393111 100644
--- a/pxr/base/arch/systemInfo.h
+++ b/pxr/base/arch/systemInfo.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_SYSTEM_INFO_H
 #define PXR_BASE_ARCH_SYSTEM_INFO_H
diff --git a/pxr/base/arch/testArchAbi.h b/pxr/base/arch/testArchAbi.h
index c8eb586fe0..c4872f5e45 100644
--- a/pxr/base/arch/testArchAbi.h
+++ b/pxr/base/arch/testArchAbi.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testArchUtil.h b/pxr/base/arch/testArchUtil.h
index 8ea8e90b76..30b9d01e94 100644
--- a/pxr/base/arch/testArchUtil.h
+++ b/pxr/base/arch/testArchUtil.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_TEST_ARCH_UTIL_H
 #define PXR_BASE_ARCH_TEST_ARCH_UTIL_H
diff --git a/pxr/base/arch/testenv/testArchAbi.cpp b/pxr/base/arch/testenv/testArchAbi.cpp
index 646fab00f8..aa1f25d56f 100644
--- a/pxr/base/arch/testenv/testArchAbi.cpp
+++ b/pxr/base/arch/testenv/testArchAbi.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testArchAbiPlugin.cpp b/pxr/base/arch/testenv/testArchAbiPlugin.cpp
index c272fe3cd3..a3e454a93f 100644
--- a/pxr/base/arch/testenv/testArchAbiPlugin.cpp
+++ b/pxr/base/arch/testenv/testArchAbiPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/arch/export.h"
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testArchPRead.cpp b/pxr/base/arch/testenv/testArchPRead.cpp
index 70f8502af6..8ee8efd205 100644
--- a/pxr/base/arch/testenv/testArchPRead.cpp
+++ b/pxr/base/arch/testenv/testArchPRead.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testArchUtil.cpp b/pxr/base/arch/testenv/testArchUtil.cpp
index 174156337e..cf219ff9c8 100644
--- a/pxr/base/arch/testenv/testArchUtil.cpp
+++ b/pxr/base/arch/testenv/testArchUtil.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define _CRT_SECURE_NO_WARNINGS
 
diff --git a/pxr/base/arch/testenv/testAttributes.cpp b/pxr/base/arch/testenv/testAttributes.cpp
index dbeaf9be8a..0133e6e3fd 100644
--- a/pxr/base/arch/testenv/testAttributes.cpp
+++ b/pxr/base/arch/testenv/testAttributes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testDemangle.cpp b/pxr/base/arch/testenv/testDemangle.cpp
index 6f534ec6ff..c94d9915f7 100644
--- a/pxr/base/arch/testenv/testDemangle.cpp
+++ b/pxr/base/arch/testenv/testDemangle.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testErrno.cpp b/pxr/base/arch/testenv/testErrno.cpp
index 2ea4428105..f7f005f975 100644
--- a/pxr/base/arch/testenv/testErrno.cpp
+++ b/pxr/base/arch/testenv/testErrno.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testError.cpp b/pxr/base/arch/testenv/testError.cpp
index 7ac77a7f44..e42778c2da 100644
--- a/pxr/base/arch/testenv/testError.cpp
+++ b/pxr/base/arch/testenv/testError.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Written by dhl (10 Jul 2006)
 //
diff --git a/pxr/base/arch/testenv/testFileSystem.cpp b/pxr/base/arch/testenv/testFileSystem.cpp
index 626605ee62..bbd790699d 100644
--- a/pxr/base/arch/testenv/testFileSystem.cpp
+++ b/pxr/base/arch/testenv/testFileSystem.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -53,8 +36,10 @@ TestArchNormPath()
             "foo/bar/../../../../../../baz") == "../../../../baz");
 
 #if defined(ARCH_OS_WINDOWS)
-    ARCH_AXIOM(ArchNormPath("C:\\foo\\bar") == "c:/foo/bar");
-    ARCH_AXIOM(ArchNormPath("C:foo\\bar") == "c:foo/bar");
+    ARCH_AXIOM(ArchNormPath("C:\\foo\\bar") == "C:/foo/bar");
+    ARCH_AXIOM(ArchNormPath("C:foo\\bar") == "C:foo/bar");
+    ARCH_AXIOM(ArchNormPath("c:\\foo\\bar") == "c:/foo/bar");
+    ARCH_AXIOM(ArchNormPath("c:foo\\bar") == "c:foo/bar");
     ARCH_AXIOM(ArchNormPath(
             "C:\\foo\\bar", /* stripDriveSpecifier = */ true) == "/foo/bar");
     ARCH_AXIOM(ArchNormPath(
diff --git a/pxr/base/arch/testenv/testFunction.cpp b/pxr/base/arch/testenv/testFunction.cpp
index 5dca47d4bc..7816371ab3 100644
--- a/pxr/base/arch/testenv/testFunction.cpp
+++ b/pxr/base/arch/testenv/testFunction.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testMath.cpp b/pxr/base/arch/testenv/testMath.cpp
index f6f052fa8b..6a0c57ab69 100644
--- a/pxr/base/arch/testenv/testMath.cpp
+++ b/pxr/base/arch/testenv/testMath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testStackTrace.cpp b/pxr/base/arch/testenv/testStackTrace.cpp
index 731abeaf4e..5b1c7e7e75 100644
--- a/pxr/base/arch/testenv/testStackTrace.cpp
+++ b/pxr/base/arch/testenv/testStackTrace.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testSymbols.cpp b/pxr/base/arch/testenv/testSymbols.cpp
index 872bd44758..dca6178521 100644
--- a/pxr/base/arch/testenv/testSymbols.cpp
+++ b/pxr/base/arch/testenv/testSymbols.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testSystemInfo.cpp b/pxr/base/arch/testenv/testSystemInfo.cpp
index 09365adf05..6b806b2955 100644
--- a/pxr/base/arch/testenv/testSystemInfo.cpp
+++ b/pxr/base/arch/testenv/testSystemInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testThreads.cpp b/pxr/base/arch/testenv/testThreads.cpp
index 80cad01ea8..2d3c78c0af 100644
--- a/pxr/base/arch/testenv/testThreads.cpp
+++ b/pxr/base/arch/testenv/testThreads.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testTiming.cpp b/pxr/base/arch/testenv/testTiming.cpp
index de68a84819..179cecc657 100644
--- a/pxr/base/arch/testenv/testTiming.cpp
+++ b/pxr/base/arch/testenv/testTiming.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/testenv/testVsnprintf.cpp b/pxr/base/arch/testenv/testVsnprintf.cpp
index 5e9cddd5cd..7e677292e3 100644
--- a/pxr/base/arch/testenv/testVsnprintf.cpp
+++ b/pxr/base/arch/testenv/testVsnprintf.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/threads.cpp b/pxr/base/arch/threads.cpp
index 8d76c68d32..6f8eb31edd 100644
--- a/pxr/base/arch/threads.cpp
+++ b/pxr/base/arch/threads.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/threads.h b/pxr/base/arch/threads.h
index 7a3dde0473..3e140d96d9 100644
--- a/pxr/base/arch/threads.h
+++ b/pxr/base/arch/threads.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_THREADS_H
 #define PXR_BASE_ARCH_THREADS_H
diff --git a/pxr/base/arch/timing.cpp b/pxr/base/arch/timing.cpp
index 3c5063c4df..6cd99dd6b4 100644
--- a/pxr/base/arch/timing.cpp
+++ b/pxr/base/arch/timing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
index 88bdb15524..d5e71f128c 100644
--- a/pxr/base/arch/timing.h
+++ b/pxr/base/arch/timing.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_TIMING_H
 #define PXR_BASE_ARCH_TIMING_H
diff --git a/pxr/base/arch/virtualMemory.cpp b/pxr/base/arch/virtualMemory.cpp
index 3c409fab48..46f45527a1 100644
--- a/pxr/base/arch/virtualMemory.cpp
+++ b/pxr/base/arch/virtualMemory.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/virtualMemory.h"
diff --git a/pxr/base/arch/virtualMemory.h b/pxr/base/arch/virtualMemory.h
index d99371ca7f..3fe1eafb63 100644
--- a/pxr/base/arch/virtualMemory.h
+++ b/pxr/base/arch/virtualMemory.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_VIRTUAL_MEMORY_H
 #define PXR_BASE_ARCH_VIRTUAL_MEMORY_H
diff --git a/pxr/base/arch/vsnprintf.cpp b/pxr/base/arch/vsnprintf.cpp
index bc9ead81d0..2616571580 100644
--- a/pxr/base/arch/vsnprintf.cpp
+++ b/pxr/base/arch/vsnprintf.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/arch/vsnprintf.h b/pxr/base/arch/vsnprintf.h
index 17f205b1f3..f6b345b6bb 100644
--- a/pxr/base/arch/vsnprintf.h
+++ b/pxr/base/arch/vsnprintf.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_ARCH_VSNPRINTF_H
 #define PXR_BASE_ARCH_VSNPRINTF_H
diff --git a/pxr/base/gf/CMakeLists.txt b/pxr/base/gf/CMakeLists.txt
index 42a1c8af8a..b98922bf47 100644
--- a/pxr/base/gf/CMakeLists.txt
+++ b/pxr/base/gf/CMakeLists.txt
@@ -12,6 +12,8 @@ pxr_library(gf
     PUBLIC_CLASSES
         bbox3d
         camera
+        color
+        colorSpace
         dualQuatd
         dualQuatf
         dualQuath
@@ -75,12 +77,16 @@ pxr_library(gf
         numericCast.h
         traits.h
 
+    CPPFILES
+        nc/nanocolor.c
+
     PRIVATE_CLASSES
         ostreamHelpers
 
     PRIVATE_HEADERS
         ilmbase_eLut.h
         ilmbase_toFloat.h
+        nc/nanocolor.h
 
     PYTHON_CPPFILES
         moduleDeps.cpp
@@ -170,7 +176,14 @@ pxr_build_test(testGfHardToReach
         gf
     CPPFILES
         testenv/testGfHardToReach.cpp
-) 
+)
+
+pxr_build_test(testGfColor
+    LIBRARIES
+        gf
+    CPPFILES
+        testenv/testGfColor.cpp
+)
 
 pxr_test_scripts(
     testenv/testGfBBox3d.py
@@ -201,6 +214,9 @@ pxr_register_test(testGfBBox3d
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testGfBBox3d"
 )
+pxr_register_test(testGfColor
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testGfColor"
+)
 pxr_register_test(testGfDecomposeRotation
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testGfDecomposeRotation"
diff --git a/pxr/base/gf/__init__.py b/pxr/base/gf/__init__.py
index a2e61ff9c8..d0d19dfb1e 100644
--- a/pxr/base/gf/__init__.py
+++ b/pxr/base/gf/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 Graphics Foundation
diff --git a/pxr/base/gf/api.h b/pxr/base/gf/api.h
index f173c7958b..7a8e0eef56 100644
--- a/pxr/base/gf/api.h
+++ b/pxr/base/gf/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_API_H
 #define PXR_BASE_GF_API_H
diff --git a/pxr/base/gf/bbox3d.cpp b/pxr/base/gf/bbox3d.cpp
index 28200efd51..8b315a16fd 100644
--- a/pxr/base/gf/bbox3d.cpp
+++ b/pxr/base/gf/bbox3d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/bbox3d.h b/pxr/base/gf/bbox3d.h
index cb9d14a805..db36be2669 100644
--- a/pxr/base/gf/bbox3d.h
+++ b/pxr/base/gf/bbox3d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_BBOX3D_H
 #define PXR_BASE_GF_BBOX3D_H
diff --git a/pxr/base/gf/camera.cpp b/pxr/base/gf/camera.cpp
index 44e6f29d48..81ffd3682a 100644
--- a/pxr/base/gf/camera.cpp
+++ b/pxr/base/gf/camera.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/camera.h b/pxr/base/gf/camera.h
index f34ed3d201..6c3ace0289 100644
--- a/pxr/base/gf/camera.h
+++ b/pxr/base/gf/camera.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_CAMERA_H
 #define PXR_BASE_GF_CAMERA_H
diff --git a/pxr/base/gf/color.cpp b/pxr/base/gf/color.cpp
new file mode 100644
index 0000000000..e47003e6ad
--- /dev/null
+++ b/pxr/base/gf/color.cpp
@@ -0,0 +1,96 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/pxr.h"
+#include "pxr/base/gf/color.h"
+#include "pxr/base/gf/colorSpace.h"
+#include "pxr/base/gf/ostreamHelpers.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/base/tf/registryManager.h"
+#include "pxr/base/tf/type.h"
+#include "nc/nanocolor.h"
+#include "colorSpace_data.h"
+#include <iostream>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_REGISTRY_FUNCTION(TfType) {
+    TfType::Define<GfColor>();
+}
+
+std::ostream& 
+operator<<(std::ostream &out, GfColor const &v)
+{
+    GfVec3f rgb = v.GetRGB();
+    return out << '(' 
+        << Gf_OstreamHelperP(rgb[0]) << ", " 
+        << Gf_OstreamHelperP(rgb[1]) << ", " 
+        << Gf_OstreamHelperP(rgb[2]) << ", "
+        << Gf_OstreamHelperP(v.GetColorSpace().GetName().GetString()) << ')';
+}
+
+// The default constructor creates black, in the "lin_rec709" space.
+GfColor::GfColor()
+: GfColor(GfColorSpace(GfColorSpaceNames->LinearRec709))
+{
+}
+
+// Construct from a colorspace.
+GfColor::GfColor(const GfColorSpace& colorSpace)
+: _colorSpace(colorSpace)
+, _rgb(0, 0, 0)
+{
+}
+
+// Construct from an rgb tuple and colorspace.
+GfColor::GfColor(const GfVec3f &rgb, const GfColorSpace& colorSpace)
+: _colorSpace(colorSpace)
+, _rgb(rgb)
+{
+}
+
+// Construct a color from another color into the specified color space.
+GfColor::GfColor(const GfColor &srcColor, const GfColorSpace& dstColorSpace)
+: _colorSpace(dstColorSpace)
+{
+    const NcColorSpace* src = srcColor._colorSpace._data->colorSpace;
+    const NcColorSpace* dst = dstColorSpace._data->colorSpace;
+    NcRGB srcRGB = { srcColor._rgb[0], srcColor._rgb[1], srcColor._rgb[2] };
+    NcRGB dstRGB = NcTransformColor(dst, src, srcRGB);
+    _rgb = GfVec3f(dstRGB.r, dstRGB.g, dstRGB.b);
+}
+
+// Set the color from the Planckian locus (blackbody radiation) temperature
+// in Kelvin, in the existing color space.
+// Values are computed for temperatures between 1000K and 15000K.
+// Note that temperatures below 1900K are out of gamut for Rec709.
+void GfColor::SetFromPlanckianLocus(float kelvin, float lumimance)
+{
+    NcYxy c = NcKelvinToYxy(kelvin, lumimance);
+    NcRGB rgb = NcYxyToRGB(_colorSpace._data->colorSpace, c);
+    _rgb = GfVec3f(rgb.r, rgb.g, rgb.b);
+}
+
+// Get the CIEXY coordinate of the color in the chromaticity chart,
+// For use in testing.
+GF_API
+GfVec2f GfColor::_GetChromaticity() const {
+    NcRGB src = {_rgb[0], _rgb[1], _rgb[2]};
+    NcXYZ rgb = NcRGBToXYZ(_colorSpace._data->colorSpace, src);
+    NcYxy chroma = NcXYZToYxy(rgb);
+    return GfVec2f(chroma.x, chroma.y);
+}
+
+// Set the color from a CIEXY coordinate in the chromaticity chart.
+// For use in testing.
+GF_API
+void GfColor::_SetFromChromaticity(const GfVec2f& xy) {
+    NcYxy c = { 1.f, xy[0], xy[1] };
+    NcRGB rgb = NcYxyToRGB(_colorSpace._data->colorSpace, c);
+    _rgb = GfVec3f(rgb.r, rgb.g, rgb.b);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/base/gf/color.h b/pxr/base/gf/color.h
new file mode 100644
index 0000000000..8c669070ff
--- /dev/null
+++ b/pxr/base/gf/color.h
@@ -0,0 +1,132 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_BASE_GF_COLOR_H
+#define PXR_BASE_GF_COLOR_H
+
+/// \file gf/color.h
+/// \ingroup group_gf_Color
+
+#include "pxr/pxr.h"
+#include "pxr/base/gf/colorSpace.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/base/gf/matrix3f.h"
+#include "pxr/base/gf/api.h"
+
+#include <iosfwd>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class GfColor
+/// \brief Represents a color in a specific color space.
+/// \ingroup group_gf_Color
+/// 
+/// Basic type: Color
+///
+/// The GfColor class represents a color in a specific color space. It provides
+/// various methods for constructing, manipulating, and retrieving color values.
+///
+/// The color values are stored as an RGB tuple and are associated with a color
+/// space. The color space determines the interpretation of the RGB values. The
+/// values are colorimetric, but not photometric as there is no normalizing
+/// constant (such as a luminance factor).
+///
+/// This class provides methods for setting and getting color values, converting
+/// between color spaces, normalizing luminance, and comparing colors.
+
+class GfColor {
+public:
+    /// The default constructor creates black, in the "lin_rec709" color space.
+    GF_API GfColor();
+
+    /// Construct a black color in the given color space.
+    /// \param colorSpace The color space.
+    GF_API
+    explicit GfColor(const GfColorSpace& colorSpace);
+
+    /// Construct a color from an RGB tuple and color space.
+    /// \param rgb The RGB tuple (red, green, blue), in the color space
+    /// provided.
+    /// \param colorSpace The color space.
+    GF_API
+    GfColor(const GfVec3f &rgb, const GfColorSpace& colorSpace);
+
+    /// Construct a color by converting the source color into the specified color space.
+    /// \param color The color to convert, in its color space.
+    /// \param colorSpace The desired color space.
+    GF_API
+    GfColor(const GfColor &color, const GfColorSpace& colorSpace);
+
+    /// Set the color from the Planckian locus (blackbody radiation) temperature
+    /// in Kelvin, in the existing color space.
+    /// Values are computed for temperatures between 1000K and 15000K.
+    /// Note that temperatures below 1900K are out of gamut for Rec709.
+    /// \param kelvin The temperature in Kelvin.
+    /// \param luminance The desired luminance.
+    GF_API
+    void SetFromPlanckianLocus(float kelvin, float luminance);
+
+    /// Get the RGB tuple.
+    /// \return The RGB tuple.
+    GfVec3f GetRGB() const { return _rgb; }
+
+    /// Get the color space.
+    /// \return The color space.
+    GfColorSpace GetColorSpace() const { return _colorSpace; }
+
+    /// Equality operator.
+    /// \param rh The right-hand side color.
+    /// \return True if the colors are equal, false otherwise.
+    bool operator ==(const GfColor &rh) const {
+        return _rgb == rh._rgb && _colorSpace == rh._colorSpace;
+    }
+
+    /// Inequality operator.
+    /// \param r The right-hand side color.
+    /// \return True if the colors are not equal, false otherwise.
+    bool operator !=(const GfColor &rh) const { return !(*this == rh); }
+
+protected:
+    GfColorSpace _colorSpace; ///< The color space.
+    GfVec3f      _rgb;        ///< The RGB tuple.
+
+    // Get the CIEXY coordinate of the color in the chromaticity chart,
+    // For use in testing.
+    GF_API
+    GfVec2f _GetChromaticity() const;
+
+    // Set the color from a CIEXY coordinate in the chromaticity chart.
+    // For use in testing.
+    GF_API
+    void _SetFromChromaticity(const GfVec2f& xy);
+};
+
+
+/// Tests for equality of the RGB tuple in a color with a given tolerance, 
+/// returning \c true if the length of the difference vector is less than or 
+/// equal to \p tolerance. This comparison does not adapt the colors to the
+/// same color space before comparing, and is not a perceptual comparison.
+inline bool
+GfIsClose(GfColor const &c1, GfColor const &c2, double tolerance)
+{
+    return GfIsClose(c1.GetRGB(), c2.GetRGB(), tolerance);
+}
+
+/// Output a GfColor.
+/// \ingroup group_gf_DebuggingOutput
+/// @brief Stream insertion operator for outputting GfColor objects to an output stream.
+///
+/// This operator allows GfColor objects to be written to an output stream.
+///
+/// @param os The output stream to write to.
+/// @param color The GfColor object to be outputted.
+/// @return The output stream after writing the GfColor object.
+std::ostream& operator<<(std::ostream &, GfColor const &);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_BASE_GF_COLOR_H
diff --git a/pxr/base/gf/colorSpace.cpp b/pxr/base/gf/colorSpace.cpp
new file mode 100644
index 0000000000..1ed49a304c
--- /dev/null
+++ b/pxr/base/gf/colorSpace.cpp
@@ -0,0 +1,189 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/pxr.h"
+#include "pxr/base/gf/color.h"
+#include "pxr/base/gf/colorSpace.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/base/tf/registryManager.h"
+#include "pxr/base/tf/type.h"
+#include "nc/nanocolor.h"
+#include "colorSpace_data.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_REGISTRY_FUNCTION(TfType) {
+    TfType::Define<GfColorSpace>();
+}
+
+TF_DEFINE_PUBLIC_TOKENS(GfColorSpaceNames, GF_COLORSPACE_NAME_TOKENS);
+
+GfColorSpace::GfColorSpace(const TfToken& name)
+: _data(new _Data())
+{
+    _data->colorSpace = NcGetNamedColorSpace(name.GetString().c_str());
+    if (!_data->colorSpace) {
+        // A color space constructed with a name that is not a registered name
+        // should function like an identity color space; the only reason to do
+        // this is to have a sentinel color space meant for comparison and
+        // hashing.
+        NcColorSpaceM33Descriptor identity;
+        identity.name = name.GetString().c_str();
+        identity.rgbToXYZ = { 1.0f, 0.0f, 0.0f,
+                              0.0f, 1.0f, 0.0f,
+                              0.0f, 0.0f, 1.0f };
+        identity.gamma = 1.0f;
+        identity.linearBias = 0.0f;
+        _data->colorSpace = NcCreateColorSpaceM33(&identity, nullptr);
+    }
+}
+
+// construct a custom colorspace from raw values
+GfColorSpace::GfColorSpace(const TfToken& name,
+                           const GfVec2f &redChroma,
+                           const GfVec2f &greenChroma,
+                           const GfVec2f &blueChroma,
+                           const GfVec2f &whitePoint,
+                           float gamma,
+                           float linearBias)
+: _data(new _Data())
+{
+    NcColorSpaceDescriptor desc;
+    desc.name = name.GetString().c_str();
+    desc.redPrimary.x = redChroma[0];
+    desc.redPrimary.y = redChroma[1];
+    desc.greenPrimary.x = greenChroma[0];
+    desc.greenPrimary.y = greenChroma[1];
+    desc.bluePrimary.x = blueChroma[0];
+    desc.bluePrimary.y = blueChroma[1];
+    desc.whitePoint.x = whitePoint[0];
+    desc.whitePoint.y = whitePoint[1];
+    desc.gamma = gamma;
+    desc.linearBias = linearBias;
+    _data->colorSpace = NcCreateColorSpace(&desc);
+}
+
+// construct a custom colorspace from a 3x3 matrix and linearization parameters
+GfColorSpace::GfColorSpace(const TfToken& name,
+                           const GfMatrix3f &rgbToXYZ,
+                           float gamma,
+                           float linearBias)
+: _data(new _Data())
+{
+    NcColorSpaceM33Descriptor desc;
+    desc.name = name.GetString().c_str();
+    desc.rgbToXYZ.m[0] = rgbToXYZ[0][0];
+    desc.rgbToXYZ.m[1] = rgbToXYZ[0][1];
+    desc.rgbToXYZ.m[2] = rgbToXYZ[0][2];
+    desc.rgbToXYZ.m[3] = rgbToXYZ[1][0];
+    desc.rgbToXYZ.m[4] = rgbToXYZ[1][1];
+    desc.rgbToXYZ.m[5] = rgbToXYZ[1][2];
+    desc.rgbToXYZ.m[6] = rgbToXYZ[2][0];
+    desc.rgbToXYZ.m[7] = rgbToXYZ[2][1];
+    desc.rgbToXYZ.m[8] = rgbToXYZ[2][2];
+    desc.gamma = gamma;
+    desc.linearBias = linearBias;
+    _data->colorSpace = NcCreateColorSpaceM33(&desc, nullptr);
+}
+
+bool GfColorSpace::operator==(const GfColorSpace &lh) const
+{
+    return NcColorSpaceEqual(_data->colorSpace, lh._data->colorSpace);
+}
+
+/// Convert a packed array of RGB values from one color space to another
+void GfColorSpace::ConvertRGBSpan(const GfColorSpace& to, TfSpan<float> rgb) const
+{
+    // Convert the RGB values in place
+    size_t count = rgb.size() / 3;
+    if (!count || (count * 3 != rgb.size())) {
+        TF_CODING_ERROR("RGB array size must be a multiple of 3");
+        return;
+    }
+    NcTransformColors(to._data->colorSpace, _data->colorSpace, 
+                      (NcRGB*) rgb.data(), (int) count);
+}
+
+/// Convert a packed array of RGBA values from one color space to another
+void GfColorSpace::ConvertRGBASpan(const GfColorSpace& to, TfSpan<float> rgba) const
+{
+    // Convert the RGBA values in place
+    size_t count = rgba.size() / 4;
+    if (!count || (count * 4 != rgba.size())) {
+        TF_CODING_ERROR("RGBA array size must be a multiple of 4");
+        return;
+    }
+    NcTransformColorsWithAlpha(to._data->colorSpace, _data->colorSpace, 
+                               rgba.data(), (int) count);
+}
+
+GfColor GfColorSpace::Convert(const GfColorSpace& srcColorSpace, const GfVec3f& rgb) const
+{
+    GfColor c(rgb, srcColorSpace);
+    return GfColor(c, *this);
+}
+
+TfToken GfColorSpace::GetName() const
+{
+    NcColorSpaceM33Descriptor desc;
+    if (!NcGetColorSpaceM33Descriptor(_data->colorSpace, &desc)) {
+        return TfToken();
+    }
+    return TfToken(desc.name);
+}
+
+GfMatrix3f GfColorSpace::GetRGBToXYZ() const
+{
+    NcColorSpaceM33Descriptor desc;
+    if (!NcGetColorSpaceM33Descriptor(_data->colorSpace, &desc)) {
+        return GfMatrix3f(1.0f);
+    }
+    float* m = desc.rgbToXYZ.m;
+    return GfMatrix3f(m[0], m[1], m[2],
+                      m[3], m[4], m[5],
+                      m[6], m[7], m[8]);
+}
+
+float GfColorSpace::GetLinearBias() const
+{
+    NcColorSpaceM33Descriptor desc;
+    if (!NcGetColorSpaceM33Descriptor(_data->colorSpace, &desc)) {
+        return 0.0f;
+    }
+    return desc.linearBias;
+}
+
+float GfColorSpace::GetGamma() const
+{
+    NcColorSpaceM33Descriptor desc;
+    if (!NcGetColorSpaceM33Descriptor(_data->colorSpace, &desc)) {
+        return 1.0f;
+    }
+    return desc.gamma;
+}
+
+std::pair<float, float> GfColorSpace::GetTransferFunctionParams() const
+{
+    float K0, phi;
+    NcGetK0Phi(_data->colorSpace, &K0, &phi);
+    return std::make_pair(K0, phi);
+}
+
+std::tuple<GfVec2f, GfVec2f, GfVec2f, GfVec2f>
+    GfColorSpace::GetPrimariesAndWhitePoint() const
+{
+    NcColorSpaceDescriptor desc;
+    if (!NcGetColorSpaceDescriptor(_data->colorSpace, &desc)) {
+        return std::make_tuple(GfVec2f(0.0f), GfVec2f(0.0f), GfVec2f(0.0f), GfVec2f(0.0f));
+    }
+    return std::make_tuple(GfVec2f(desc.redPrimary.x, desc.redPrimary.y),
+                           GfVec2f(desc.greenPrimary.x, desc.greenPrimary.y),
+                           GfVec2f(desc.bluePrimary.x, desc.bluePrimary.y),
+                           GfVec2f(desc.whitePoint.x, desc.whitePoint.y));
+}
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/base/gf/colorSpace.h b/pxr/base/gf/colorSpace.h
new file mode 100644
index 0000000000..cbdba22acd
--- /dev/null
+++ b/pxr/base/gf/colorSpace.h
@@ -0,0 +1,216 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_BASE_GF_COLORSPACE_H
+#define PXR_BASE_GF_COLORSPACE_H
+
+/// \file gf/color.h
+/// \ingroup group_gf_Color
+
+#include "pxr/pxr.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/base/gf/matrix3f.h"
+#include "pxr/base/gf/api.h"
+#include "pxr/base/tf/span.h"
+#include "pxr/base/tf/staticTokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \enum GfColorSpace
+/// \ingroup group_gf_Color
+///
+/// Color spaces natively supported by Gf.
+/// The token names correspond to the canonical names defined
+/// by the OpenColorIO Nanocolor project
+///
+/// In general, the names have the form <curve>_<name> where <curve>
+/// is the transfer curve, and <name> is a common name for the color space.
+/// If the <curve> portion is ommitted, then it is the same as the <name>.
+///
+/// Identity, Raw:    No transformation occurs with these.
+/// ACEScg:           The Academy Color Encoding System, a color space designed
+///                     for cinematic content creation and exchange, with AP1 primaries.
+///                     ACEScg also specifies a display transform.
+/// AP0:              The ACES AP0 primaries and white point.
+/// AP1:              The ACES AP1 primaries and white point.
+/// Rec709:           Primaries and whitepoint and EOTF per the Rec. 709 specification.
+/// AdobeRGB:         A color space developed by Adobe Systems. It has a wider gamut
+///                     than sRGB and is suitable for photography and printing
+/// DisplayP3:        DisplayP3 gamut, and linear gamma. Commonly used by wide
+///                     gamut HDR monitors.
+/// SRGB:             sRGB primaries and whitepoint and EOTF transform function.
+/// Texture:          A synonym for identity.
+/// sRGB:             A synonym for sRGB_Texture.
+/// Rec2020:          Rec2020 primaries, white point, and EOTF.
+/// CIEXYZ:           The CIE 1931 XYZ color space, a standard color space used
+///                     in color science.
+///
+/// Colorspaces outside of the set may be defined through explicit construction.
+///
+#define GF_COLORSPACE_NAME_TOKENS  \
+    ((Identity, "identity"))                 \
+    ((Raw, "raw"))                           \
+    ((ACEScg, "acescg"))                     \
+    ((AdobeRGB, "adobergb"))                 \
+    ((LinearAdobeRGB, "lin_adobergb"))       \
+    ((CIEXYZ, "CIEXYZ"))                     \
+    ((LinearAP0, "lin_ap0"))                 \
+    ((LinearAP1, "lin_ap1"))                 \
+    ((G18AP1, "g18_ap1"))                    \
+    ((G22AP1, "g22_ap1"))                    \
+    ((LinearRec2020, "lin_rec2020"))         \
+    ((LinearRec709, "lin_rec709"))           \
+    ((G18Rec709, "g18_rec709"))              \
+    ((G22Rec709, "g22_rec709"))              \
+    ((LinearDisplayP3, "lin_displayp3"))     \
+    ((LinearSRGB, "lin_srgb"))               \
+    ((SRGBTexture, "srgb_texture"))          \
+    ((SRGB, "sRGB"))                         \
+    ((SRGBDisplayP3, "srgb_displayp3"))      \
+
+TF_DECLARE_PUBLIC_TOKENS(GfColorSpaceNames, GF_API, 
+                         GF_COLORSPACE_NAME_TOKENS);
+
+class GfColor;
+
+/// \class GfColorSpace
+/// \ingroup group_gf_Color
+///
+/// Basic type: ColorSpace
+///
+/// This class represents a colorspace. Color spaces may be created by
+/// name, parameterization, or by a 3x3 matrix and a gamma operator.
+///
+/// The parameters used to construct the color space are not available for
+/// introspection ~ the color space object is intended for color conversion
+/// operations on a GfColor.
+///
+/// The color spaces natively recognized by GfColorSpace are listed in 
+/// GfColorSpaceNames.
+
+class GfColorSpace {
+    friend class GfColor;
+public:    
+    /// Construct a GfColorSpace from a name token.
+    ///
+    /// \param name The name token of the color space.
+    GF_API 
+    explicit GfColorSpace(const TfToken& name);
+
+    /// Construct a custom color space from raw values.
+    ///
+    /// \param name The name token of the color space.
+    /// \param redChroma The red chromaticity coordinates.
+    /// \param greenChroma The green chromaticity coordinates.
+    /// \param blueChroma The blue chromaticity coordinates.
+    /// \param whitePoint The white point chromaticity coordinates.
+    /// \param gamma The gamma value of the log section.
+    /// \param linearBias The linear bias of the log section.
+    /// \param K0 The linear break point.
+    /// \param phi The slope of the linear section.
+    GF_API 
+    explicit GfColorSpace(const TfToken& name,
+                          const GfVec2f &redChroma,
+                          const GfVec2f &greenChroma,
+                          const GfVec2f &blueChroma,
+                          const GfVec2f &whitePoint,
+                          float gamma,
+                          float linearBias);
+
+    /// Construct a color space from a 3x3 matrix and linearization parameters.
+    ///
+    /// \param name The name token of the color space.
+    /// \param rgbToXYZ The RGB to XYZ conversion matrix.
+    /// \param gamma The gamma value of the log section.
+    /// \param linearBias The linear bias of the log section.
+    /// \param K0 The linear break point.
+    /// \param phi The slope of the linear section.
+    GF_API 
+    explicit GfColorSpace(const TfToken& name,
+                          const GfMatrix3f &rgbToXYZ,
+                          float gamma,
+                          float linearBias);
+    
+    /// Get the name of the color space.
+    ///
+    /// \return The name of the color space.
+    GF_API 
+    TfToken GetName() const;
+
+    /// Check if two color spaces are equal.
+    ///
+    /// \param lh The left-hand side color space.
+    /// \return True if the color spaces are equal, false otherwise.
+    GF_API 
+    bool operator ==(const GfColorSpace &rh) const;
+
+    /// Check if two color spaces are not equal.
+    ///
+    /// \param rh The rigt-hand side color space.
+    /// \return True if the color spaces are not equal, false otherwise.
+    bool operator !=(const GfColorSpace &rh) const { return !(*this == rh); }
+
+    /// Convert in place a packed array of RGB values from one color space to "this" one.
+    ///
+    /// \param to The target color space.
+    /// \param rgb The packed array of RGB values to convert.
+    GF_API 
+    void ConvertRGBSpan(const GfColorSpace& srcColorSpace, TfSpan<float> rgb) const;
+
+    /// Convert in place a packed array of RGBA values from one color space to "this one.
+    ///
+    /// \param to The target color space.
+    /// \param rgba The packed array of RGBA values to convert.
+    GF_API 
+    void ConvertRGBASpan(const GfColorSpace& srcColorSpace, TfSpan<float> rgba) const;
+
+    /// Convert a rgb triplet in a certain color space to "this" color space.
+    GF_API
+    GfColor Convert(const GfColorSpace& srcColorSpace, const GfVec3f& rgb) const;
+
+    /// Get the RGB to XYZ conversion matrix.
+    ///
+    /// \return The RGB to XYZ conversion matrix.
+    GF_API 
+    GfMatrix3f GetRGBToXYZ() const;
+
+    /// Get the gamma value of the color space.
+    ///
+    /// \return The gamma value of the color space.
+    GF_API 
+    float GetGamma() const;
+
+    /// Get the linear bias of the color space.
+    ///
+    /// \return The linear bias of the color space.
+    GF_API 
+    float GetLinearBias() const;
+
+    /// Get the computed K0 and Phi values for use in the transfer function.
+    ///
+    GF_API 
+    std::pair<float, float> GetTransferFunctionParams() const;
+
+    /// Get the chromaticity coordinates and white point if the color space
+    /// was constructed from primaries. The primaries and white points will
+    /// be in the order red, green, blue, white. The values will be 
+    /// valid if the color space was constructed from primaries or a well formed
+    /// primary matrix.
+    ///
+    /// \return The chromaticity coordinates and white point; 
+    /// an empty optional if the color space was not constructed from primaries.
+    GF_API 
+    std::tuple<GfVec2f, GfVec2f, GfVec2f, GfVec2f>
+        GetPrimariesAndWhitePoint() const;
+
+private:
+    struct _Data;
+    std::shared_ptr<_Data> _data;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_BASE_GF_COLORSPACE_H
diff --git a/pxr/base/gf/colorSpace_data.h b/pxr/base/gf/colorSpace_data.h
new file mode 100644
index 0000000000..a8a0e51771
--- /dev/null
+++ b/pxr/base/gf/colorSpace_data.h
@@ -0,0 +1,19 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+struct GfColorSpace::_Data
+{
+    ~_Data() {
+        NcFreeColorSpace(colorSpace);
+    }
+
+    const NcColorSpace* colorSpace = nullptr;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/base/gf/declare.h b/pxr/base/gf/declare.h
index 0c678f3123..006f7bcc13 100644
--- a/pxr/base/gf/declare.h
+++ b/pxr/base/gf/declare.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_DECLARE_H
 #define PXR_BASE_GF_DECLARE_H
diff --git a/pxr/base/gf/dualQuat.template.cpp b/pxr/base/gf/dualQuat.template.cpp
index 73b4aef51f..b285eb165a 100644
--- a/pxr/base/gf/dualQuat.template.cpp
+++ b/pxr/base/gf/dualQuat.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/dualQuat.template.h b/pxr/base/gf/dualQuat.template.h
index 9e4976bc6f..617fce23ba 100644
--- a/pxr/base/gf/dualQuat.template.h
+++ b/pxr/base/gf/dualQuat.template.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/dualQuatd.cpp b/pxr/base/gf/dualQuatd.cpp
index 63ec227683..48e3c172a1 100644
--- a/pxr/base/gf/dualQuatd.cpp
+++ b/pxr/base/gf/dualQuatd.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/dualQuatd.h b/pxr/base/gf/dualQuatd.h
index 274a57cdfb..4aa7aafb1f 100644
--- a/pxr/base/gf/dualQuatd.h
+++ b/pxr/base/gf/dualQuatd.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/dualQuatf.cpp b/pxr/base/gf/dualQuatf.cpp
index 9824d4e9f6..04334028a9 100644
--- a/pxr/base/gf/dualQuatf.cpp
+++ b/pxr/base/gf/dualQuatf.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/dualQuatf.h b/pxr/base/gf/dualQuatf.h
index d4002704ac..a1bbba2a60 100644
--- a/pxr/base/gf/dualQuatf.h
+++ b/pxr/base/gf/dualQuatf.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/dualQuath.cpp b/pxr/base/gf/dualQuath.cpp
index 439a14b812..6f46e8a546 100644
--- a/pxr/base/gf/dualQuath.cpp
+++ b/pxr/base/gf/dualQuath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/dualQuath.h b/pxr/base/gf/dualQuath.h
index 4ddfc4e5c7..95a6c1770c 100644
--- a/pxr/base/gf/dualQuath.h
+++ b/pxr/base/gf/dualQuath.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/frustum.cpp b/pxr/base/gf/frustum.cpp
index cd7d978ed8..7fb9664d45 100644
--- a/pxr/base/gf/frustum.cpp
+++ b/pxr/base/gf/frustum.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/frustum.h b/pxr/base/gf/frustum.h
index 1aaada2308..4afbe177bc 100644
--- a/pxr/base/gf/frustum.h
+++ b/pxr/base/gf/frustum.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_FRUSTUM_H
 #define PXR_BASE_GF_FRUSTUM_H
diff --git a/pxr/base/gf/gamma.cpp b/pxr/base/gf/gamma.cpp
index 951624c40f..f230ade187 100644
--- a/pxr/base/gf/gamma.cpp
+++ b/pxr/base/gf/gamma.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/gamma.h b/pxr/base/gf/gamma.h
index b377b97b18..b8c2048199 100644
--- a/pxr/base/gf/gamma.h
+++ b/pxr/base/gf/gamma.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_GAMMA_H
 #define PXR_BASE_GF_GAMMA_H
diff --git a/pxr/base/gf/gfGenCode.py b/pxr/base/gf/gfGenCode.py
index 98c208a65a..0ddb3681ef 100644
--- a/pxr/base/gf/gfGenCode.py
+++ b/pxr/base/gf/gfGenCode.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 ########################################################################
diff --git a/pxr/base/gf/half.cpp b/pxr/base/gf/half.cpp
index 5f17ee0b0c..a50baa3bc3 100644
--- a/pxr/base/gf/half.cpp
+++ b/pxr/base/gf/half.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/gf/half.h"
diff --git a/pxr/base/gf/half.h b/pxr/base/gf/half.h
index 93510865e3..ce2e58c0b0 100644
--- a/pxr/base/gf/half.h
+++ b/pxr/base/gf/half.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_HALF_H
 #define PXR_BASE_GF_HALF_H
diff --git a/pxr/base/gf/homogeneous.cpp b/pxr/base/gf/homogeneous.cpp
index 9a8a6bd61a..d10891e0e3 100644
--- a/pxr/base/gf/homogeneous.cpp
+++ b/pxr/base/gf/homogeneous.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/homogeneous.h b/pxr/base/gf/homogeneous.h
index 78653448ff..a3ea4afb8d 100644
--- a/pxr/base/gf/homogeneous.h
+++ b/pxr/base/gf/homogeneous.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_HOMOGENEOUS_H
 #define PXR_BASE_GF_HOMOGENEOUS_H
diff --git a/pxr/base/gf/interval.cpp b/pxr/base/gf/interval.cpp
index bd75b379c2..8bcb54bd35 100644
--- a/pxr/base/gf/interval.cpp
+++ b/pxr/base/gf/interval.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/interval.h b/pxr/base/gf/interval.h
index bf1688b03d..c360833003 100644
--- a/pxr/base/gf/interval.h
+++ b/pxr/base/gf/interval.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_INTERVAL_H
 #define PXR_BASE_GF_INTERVAL_H
diff --git a/pxr/base/gf/limits.h b/pxr/base/gf/limits.h
index dfda8d9e18..492e376937 100644
--- a/pxr/base/gf/limits.h
+++ b/pxr/base/gf/limits.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_LIMITS_H
 #define PXR_BASE_GF_LIMITS_H
diff --git a/pxr/base/gf/line.cpp b/pxr/base/gf/line.cpp
index 37bb9926e5..c2dd9b6bf1 100644
--- a/pxr/base/gf/line.cpp
+++ b/pxr/base/gf/line.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/line.h b/pxr/base/gf/line.h
index 17f3bdd115..8a1a5f7e5f 100644
--- a/pxr/base/gf/line.h
+++ b/pxr/base/gf/line.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_LINE_H
 #define PXR_BASE_GF_LINE_H
diff --git a/pxr/base/gf/line2d.cpp b/pxr/base/gf/line2d.cpp
index 41291d44c6..eb066da388 100644
--- a/pxr/base/gf/line2d.cpp
+++ b/pxr/base/gf/line2d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/line2d.h b/pxr/base/gf/line2d.h
index f01bdff580..4b111d7fda 100644
--- a/pxr/base/gf/line2d.h
+++ b/pxr/base/gf/line2d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_LINE2D_H
 #define PXR_BASE_GF_LINE2D_H
diff --git a/pxr/base/gf/lineSeg.cpp b/pxr/base/gf/lineSeg.cpp
index cbd2ec764c..1f30743e50 100644
--- a/pxr/base/gf/lineSeg.cpp
+++ b/pxr/base/gf/lineSeg.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/lineSeg.h b/pxr/base/gf/lineSeg.h
index 8a0a707630..4e0cb04ed6 100644
--- a/pxr/base/gf/lineSeg.h
+++ b/pxr/base/gf/lineSeg.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_LINE_SEG_H
 #define PXR_BASE_GF_LINE_SEG_H
diff --git a/pxr/base/gf/lineSeg2d.cpp b/pxr/base/gf/lineSeg2d.cpp
index 98e39d3d14..2c7512b081 100644
--- a/pxr/base/gf/lineSeg2d.cpp
+++ b/pxr/base/gf/lineSeg2d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/lineSeg2d.h b/pxr/base/gf/lineSeg2d.h
index ebb4ddffee..c324614afe 100644
--- a/pxr/base/gf/lineSeg2d.h
+++ b/pxr/base/gf/lineSeg2d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_LINE_SEG2D_H
 #define PXR_BASE_GF_LINE_SEG2D_H
diff --git a/pxr/base/gf/math.cpp b/pxr/base/gf/math.cpp
index 91df1af866..220df9fcb8 100644
--- a/pxr/base/gf/math.cpp
+++ b/pxr/base/gf/math.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/math.h b/pxr/base/gf/math.h
index 3bdf7945e4..1d4a2ac4f2 100644
--- a/pxr/base/gf/math.h
+++ b/pxr/base/gf/math.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_MATH_H
 #define PXR_BASE_GF_MATH_H
diff --git a/pxr/base/gf/matrix.template.cpp b/pxr/base/gf/matrix.template.cpp
index ef9ea3e328..10dacf1552 100644
--- a/pxr/base/gf/matrix.template.cpp
+++ b/pxr/base/gf/matrix.template.cpp
@@ -2,25 +2,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #}
 
diff --git a/pxr/base/gf/matrix.template.h b/pxr/base/gf/matrix.template.h
index b01ffec463..d2aebb07e4 100644
--- a/pxr/base/gf/matrix.template.h
+++ b/pxr/base/gf/matrix.template.h
@@ -2,25 +2,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #}
 #ifndef PXR_BASE_GF_{{ UPPER(MAT)[2:] }}_H
@@ -348,11 +331,21 @@ class {{ MAT }}
 {% if SCL == 'double' %}
     /// Returns the product of a matrix \e m and a column vector \e vec.
     /// Note that the return type is a \c GfVec{{ DIM }}f.
+    ///
+    /// \deprecated
+    /// This function is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec{{ SUFFIX }} operator *(const {{ MAT }}&, const GfVec{{ SUFFIX }} &)
+    /// instead and explicitly convert the result to GfVec3f, if necessary.
     GF_API
     friend GfVec{{ DIM }}f operator *(const {{ MAT }}& m, const GfVec{{ DIM }}f& vec);
 
     /// Returns the product of row vector \e vec and a matrix \e m.
     /// Note that the return type is a \c GfVec{{ DIM }}f.
+    ///
+    /// \deprecated
+    /// This function is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec{{ SUFFIX }} operator *(const GfVec{{ SUFFIX }} &, const {{ MAT }}&)
+    /// instead and explicitly convert the result to GfVec3f, if necessary.
     GF_API
     friend GfVec{{ DIM }}f operator *(const GfVec{{ DIM }}f &vec, const {{ MAT }}& m);
 
diff --git a/pxr/base/gf/matrix2.template.cpp b/pxr/base/gf/matrix2.template.cpp
index 4cdac8afcb..4357e3324c 100644
--- a/pxr/base/gf/matrix2.template.cpp
+++ b/pxr/base/gf/matrix2.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix2.template.h b/pxr/base/gf/matrix2.template.h
index fd424a092b..59bdfb5867 100644
--- a/pxr/base/gf/matrix2.template.h
+++ b/pxr/base/gf/matrix2.template.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix2d.cpp b/pxr/base/gf/matrix2d.cpp
index 747a7af140..b1a0e1dab9 100644
--- a/pxr/base/gf/matrix2d.cpp
+++ b/pxr/base/gf/matrix2d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix2d.h b/pxr/base/gf/matrix2d.h
index a58de681b0..9b2e7631e7 100644
--- a/pxr/base/gf/matrix2d.h
+++ b/pxr/base/gf/matrix2d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
@@ -348,11 +331,21 @@ class GfMatrix2d
 
     /// Returns the product of a matrix \e m and a column vector \e vec.
     /// Note that the return type is a \c GfVec2f.
+    ///
+    /// \deprecated
+    /// This function is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec2d operator *(const GfMatrix2d&, const GfVec2d &)
+    /// instead and explicitly convert the result to GfVec3f, if necessary.
     GF_API
     friend GfVec2f operator *(const GfMatrix2d& m, const GfVec2f& vec);
 
     /// Returns the product of row vector \e vec and a matrix \e m.
     /// Note that the return type is a \c GfVec2f.
+    ///
+    /// \deprecated
+    /// This function is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec2d operator *(const GfVec2d &, const GfMatrix2d&)
+    /// instead and explicitly convert the result to GfVec3f, if necessary.
     GF_API
     friend GfVec2f operator *(const GfVec2f &vec, const GfMatrix2d& m);
 
diff --git a/pxr/base/gf/matrix2f.cpp b/pxr/base/gf/matrix2f.cpp
index e500556c5c..d22dfdf330 100644
--- a/pxr/base/gf/matrix2f.cpp
+++ b/pxr/base/gf/matrix2f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix2f.h b/pxr/base/gf/matrix2f.h
index 8bab33c4b2..469035e0b3 100644
--- a/pxr/base/gf/matrix2f.h
+++ b/pxr/base/gf/matrix2f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix3.template.cpp b/pxr/base/gf/matrix3.template.cpp
index c365f53fb9..e87b6b92f7 100644
--- a/pxr/base/gf/matrix3.template.cpp
+++ b/pxr/base/gf/matrix3.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix3.template.h b/pxr/base/gf/matrix3.template.h
index 965ca506bd..23ab9aa6dc 100644
--- a/pxr/base/gf/matrix3.template.h
+++ b/pxr/base/gf/matrix3.template.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix3d.cpp b/pxr/base/gf/matrix3d.cpp
index dbe9548931..6e1995362a 100644
--- a/pxr/base/gf/matrix3d.cpp
+++ b/pxr/base/gf/matrix3d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix3d.h b/pxr/base/gf/matrix3d.h
index e8e8d207b4..b5b6de86f8 100644
--- a/pxr/base/gf/matrix3d.h
+++ b/pxr/base/gf/matrix3d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
@@ -426,11 +409,21 @@ class GfMatrix3d
 
     /// Returns the product of a matrix \e m and a column vector \e vec.
     /// Note that the return type is a \c GfVec3f.
+    ///
+    /// \deprecated
+    /// This function is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d operator *(const GfMatrix3d&, const GfVec3d &)
+    /// instead and explicitly convert the result to GfVec3f, if necessary.
     GF_API
     friend GfVec3f operator *(const GfMatrix3d& m, const GfVec3f& vec);
 
     /// Returns the product of row vector \e vec and a matrix \e m.
     /// Note that the return type is a \c GfVec3f.
+    ///
+    /// \deprecated
+    /// This function is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d operator *(const GfVec3d &, const GfMatrix3d&)
+    /// instead and explicitly convert the result to GfVec3f, if necessary.
     GF_API
     friend GfVec3f operator *(const GfVec3f &vec, const GfMatrix3d& m);
 
diff --git a/pxr/base/gf/matrix3f.cpp b/pxr/base/gf/matrix3f.cpp
index 75aa8a75f8..0177c2c360 100644
--- a/pxr/base/gf/matrix3f.cpp
+++ b/pxr/base/gf/matrix3f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix3f.h b/pxr/base/gf/matrix3f.h
index 29c69f4927..28aac36978 100644
--- a/pxr/base/gf/matrix3f.h
+++ b/pxr/base/gf/matrix3f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix4.template.cpp b/pxr/base/gf/matrix4.template.cpp
index a5c6ceb673..7a535d9e40 100644
--- a/pxr/base/gf/matrix4.template.cpp
+++ b/pxr/base/gf/matrix4.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix4.template.h b/pxr/base/gf/matrix4.template.h
index 6ec9c8616f..5f24f84045 100644
--- a/pxr/base/gf/matrix4.template.h
+++ b/pxr/base/gf/matrix4.template.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
@@ -325,6 +308,13 @@ class GfMatrix3{{ SCL[0] }};
     /// This treats the vector as a 4-component vector whose fourth component
     /// is 1. This is an overloaded method; it differs from the other version
     /// in that it returns a different value type.
+{% if SCL == 'double' %}
+    ///
+    /// \deprecated
+    /// This method is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d Transform(const GfVec3d &) instead and
+    /// explicitly convert the result to GfVec3f, if necessary.
+{% endif %}
     GfVec3f Transform(const GfVec3f &vec) const {
 {% if SCL == 'float' %}
         return (GfProject(GfVec4f(
@@ -354,6 +344,13 @@ class GfMatrix3{{ SCL[0] }};
     /// a 4-component vector whose fourth component is 0.  This is an
     /// overloaded method; it differs from the other version in that it
     /// returns a different value type.
+{% if SCL == 'double' %}
+    ///
+    /// \deprecated
+    /// This method is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d TransformDir(const GfVec3d &) instead and
+    /// explicitly convert the result to GfVec3f, if necessary.
+{% endif %}
     GfVec3f TransformDir(const GfVec3f &vec) const {
         return GfVec3f(
             {{ LIST("vec[%(i)s] * _mtx[%(i)s][0]", sep=" + ", num=3) }},
@@ -376,6 +373,13 @@ class GfMatrix3{{ SCL[0] }};
     /// This treats the vector as a 4-component vector whose fourth component
     /// is 1 and ignores the fourth column of the matrix (i.e. assumes it is
     /// (0, 0, 0, 1)).
+{% if SCL == 'double' %}
+    ///
+    /// \deprecated
+    /// This method is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d TransformAffine(const GfVec3d &) instead and
+    /// explicitly convert the result to GfVec3f, if necessary.
+{% endif %}
     GfVec3f TransformAffine(const GfVec3f &vec) const {
         return GfVec3f(
             {{ LIST("vec[%(i)s] * _mtx[%(i)s][0]", sep=" + ", num=3) }} + _mtx[3][0],
diff --git a/pxr/base/gf/matrix4d.cpp b/pxr/base/gf/matrix4d.cpp
index 0049580f35..eff71714ae 100644
--- a/pxr/base/gf/matrix4d.cpp
+++ b/pxr/base/gf/matrix4d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix4d.h b/pxr/base/gf/matrix4d.h
index 9108e5b296..76b678ad14 100644
--- a/pxr/base/gf/matrix4d.h
+++ b/pxr/base/gf/matrix4d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
@@ -507,11 +490,21 @@ class GfMatrix4d
 
     /// Returns the product of a matrix \e m and a column vector \e vec.
     /// Note that the return type is a \c GfVec4f.
+    ///
+    /// \deprecated
+    /// This function is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec4d operator *(const GfMatrix4d&, const GfVec4d &)
+    /// instead and explicitly convert the result to GfVec3f, if necessary.
     GF_API
     friend GfVec4f operator *(const GfMatrix4d& m, const GfVec4f& vec);
 
     /// Returns the product of row vector \e vec and a matrix \e m.
     /// Note that the return type is a \c GfVec4f.
+    ///
+    /// \deprecated
+    /// This function is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec4d operator *(const GfVec4d &, const GfMatrix4d&)
+    /// instead and explicitly convert the result to GfVec3f, if necessary.
     GF_API
     friend GfVec4f operator *(const GfVec4f &vec, const GfMatrix4d& m);
 
@@ -678,6 +671,11 @@ class GfMatrix4d
     /// This treats the vector as a 4-component vector whose fourth component
     /// is 1. This is an overloaded method; it differs from the other version
     /// in that it returns a different value type.
+    ///
+    /// \deprecated
+    /// This method is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d Transform(const GfVec3d &) instead and
+    /// explicitly convert the result to GfVec3f, if necessary.
     GfVec3f Transform(const GfVec3f &vec) const {
         return GfVec3f(GfProject(GfVec4d(
             vec[0] * _mtx[0][0] + vec[1] * _mtx[1][0] + vec[2] * _mtx[2][0] + _mtx[3][0],
@@ -703,6 +701,11 @@ class GfMatrix4d
     /// a 4-component vector whose fourth component is 0.  This is an
     /// overloaded method; it differs from the other version in that it
     /// returns a different value type.
+    ///
+    /// \deprecated
+    /// This method is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d TransformDir(const GfVec3d &) instead and
+    /// explicitly convert the result to GfVec3f, if necessary.
     GfVec3f TransformDir(const GfVec3f &vec) const {
         return GfVec3f(
             vec[0] * _mtx[0][0] + vec[1] * _mtx[1][0] + vec[2] * _mtx[2][0],
@@ -725,6 +728,11 @@ class GfMatrix4d
     /// This treats the vector as a 4-component vector whose fourth component
     /// is 1 and ignores the fourth column of the matrix (i.e. assumes it is
     /// (0, 0, 0, 1)).
+    ///
+    /// \deprecated
+    /// This method is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d TransformAffine(const GfVec3d &) instead and
+    /// explicitly convert the result to GfVec3f, if necessary.
     GfVec3f TransformAffine(const GfVec3f &vec) const {
         return GfVec3f(
             vec[0] * _mtx[0][0] + vec[1] * _mtx[1][0] + vec[2] * _mtx[2][0] + _mtx[3][0],
diff --git a/pxr/base/gf/matrix4f.cpp b/pxr/base/gf/matrix4f.cpp
index d30a7c5bb2..5330127965 100644
--- a/pxr/base/gf/matrix4f.cpp
+++ b/pxr/base/gf/matrix4f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrix4f.h b/pxr/base/gf/matrix4f.h
index 9e2c65c3ae..d074b727e3 100644
--- a/pxr/base/gf/matrix4f.h
+++ b/pxr/base/gf/matrix4f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/matrixData.cpp b/pxr/base/gf/matrixData.cpp
index 8c46d15d5f..87bd421d95 100644
--- a/pxr/base/gf/matrixData.cpp
+++ b/pxr/base/gf/matrixData.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/gf/matrixData.h"
diff --git a/pxr/base/gf/matrixData.h b/pxr/base/gf/matrixData.h
index 0395f0e438..efbe8d31c8 100644
--- a/pxr/base/gf/matrixData.h
+++ b/pxr/base/gf/matrixData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_MATRIX_DATA_H
 #define PXR_BASE_GF_MATRIX_DATA_H
diff --git a/pxr/base/gf/module.cpp b/pxr/base/gf/module.cpp
index 066117a211..ab8d7fec54 100644
--- a/pxr/base/gf/module.cpp
+++ b/pxr/base/gf/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/moduleDeps.cpp b/pxr/base/gf/moduleDeps.cpp
index fde59a8bc0..233f5f9312 100644
--- a/pxr/base/gf/moduleDeps.cpp
+++ b/pxr/base/gf/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/base/gf/multiInterval.cpp b/pxr/base/gf/multiInterval.cpp
index f6214e7caf..305b995c68 100644
--- a/pxr/base/gf/multiInterval.cpp
+++ b/pxr/base/gf/multiInterval.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/multiInterval.h b/pxr/base/gf/multiInterval.h
index 93e1f5e895..5db66c99ba 100644
--- a/pxr/base/gf/multiInterval.h
+++ b/pxr/base/gf/multiInterval.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_MULTI_INTERVAL_H
 #define PXR_BASE_GF_MULTI_INTERVAL_H
diff --git a/pxr/base/gf/nc/nanocolor.c b/pxr/base/gf/nc/nanocolor.c
new file mode 100644
index 0000000000..663ee50837
--- /dev/null
+++ b/pxr/base/gf/nc/nanocolor.c
@@ -0,0 +1,1000 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "nanocolor.h"
+#include <stdbool.h>
+#include <string.h>
+#include <math.h>
+#include <stdlib.h>
+
+#ifdef __SSE2__
+#include <xmmintrin.h>
+#include <smmintrin.h>
+#endif
+
+#ifdef __ARM_NEON
+#include <arm_neon.h>
+#endif
+
+// Internal data structure to hold computed color space data, and the initial
+// decsriptor.
+struct NcColorSpace {
+    NcColorSpaceDescriptor desc;
+    float K0, phi;
+    NcM33f rgbToXYZ;
+};
+
+static void _NcInitColorSpace(NcColorSpace* cs);
+
+static float nc_FromLinear(const NcColorSpace* cs, float t) {
+    const float gamma = cs->desc.gamma;
+    if (t < cs->K0 / cs->phi)
+        return t * cs->phi;
+    const float a = cs->desc.linearBias;
+    return (1.f + a) * powf(t, 1.f / gamma) - a;
+}
+
+static float nc_ToLinear(const NcColorSpace* cs, float t) {
+    const float gamma = cs->desc.gamma;
+    if (t < cs->K0)
+        return t / cs->phi;
+    const float a = cs->desc.linearBias;
+    return powf((t + a) / (1.f + a), gamma);
+}
+
+static const char _acescg[] = "acescg";
+const char* Nc_acescg = _acescg;
+static const char _adobergb[] = "adobergb";
+const char* Nc_adobergb = _adobergb;
+static const char _g18_ap1[] = "g18_ap1";
+const char* Nc_g18_ap1 = _g18_ap1;
+static const char _g18_rec709[] = "g18_rec709";
+const char* Nc_g18_rec709 = _g18_rec709;
+static const char _g22_ap1[] = "g22_ap1";
+const char* Nc_g22_ap1 = _g22_ap1;
+static const char _g22_rec709[] = "g22_rec709";
+const char* Nc_g22_rec709 = _g22_rec709;
+static const char _identity[] = "identity";
+const char* Nc_identity = _identity;
+static const char _lin_adobergb[] = "lin_adobergb";
+const char* Nc_lin_adobergb = _lin_adobergb;
+static const char _lin_ap0[] = "lin_ap0";
+const char* Nc_lin_ap0 = _lin_ap0;
+static const char _lin_ap1[] = "lin_ap1";
+const char* Nc_lin_ap1 = _lin_ap1;
+static const char _lin_displayp3[] = "lin_displayp3";
+const char* Nc_lin_displayp3 = _lin_displayp3;
+static const char _lin_rec709[] = "lin_rec709";
+const char* Nc_lin_rec709 = _lin_rec709;
+static const char _lin_rec2020[] = "lin_rec2020";
+const char* Nc_lin_rec2020 = _lin_rec2020;
+static const char _lin_srgb[] = "lin_srgb";
+const char* Nc_lin_srgb = _lin_srgb;
+static const char _raw[] = "raw";
+const char* Nc_raw = _raw;
+static const char _srgb_displayp3[] = "srgb_displayp3";
+const char* Nc_srgb_displayp3 = _srgb_displayp3;
+static const char _sRGB[] = "sRGB";
+const char* Nc_sRGB = _sRGB;
+static const char _srgb_texture[] = "srgb_texture";
+const char* Nc_srgb_texture = _srgb_texture;
+
+NCAPI const char*  NcGetDescription(const NcColorSpace* cs) {
+    if (!cs)
+        return NULL;
+
+    if (!strcmp(cs->desc.name, Nc_acescg))
+        return "Academy Color Encoding System (ACEScg), a color space designed for computer graphics.";
+    if (!strcmp(cs->desc.name, Nc_adobergb))
+        return "Adobe RGB (1998), a color space developed by Adobe Systems.";
+    if (!strcmp(cs->desc.name, Nc_g18_ap1))
+        return "Gamma 1.8, primaries from ACES, white point from ACES.";
+    if (!strcmp(cs->desc.name, Nc_g18_rec709))
+        return "Gamma 1.8, primaries from Rec. 709, white point from D65.";
+    if (!strcmp(cs->desc.name, Nc_g22_ap1))
+        return "Gamma 2.2, primaries from ACES, white point from ACES.";
+    if (!strcmp(cs->desc.name, Nc_g22_rec709))
+        return "Gamma 2.2, primaries from Rec. 709, white point from D65.";
+    if (!strcmp(cs->desc.name, Nc_identity))
+        return "Identity color space, no conversion.";
+    if (!strcmp(cs->desc.name, Nc_lin_adobergb))
+        return "Linear Adobe RGB (1998), a color space developed by Adobe Systems.";
+    if (!strcmp(cs->desc.name, Nc_lin_ap0))
+        return "Linear transfer, AP1 primaries, white point from ACES.";
+    if (!strcmp(cs->desc.name, Nc_lin_ap1))
+        return "Linear transfer, AP0 primaries, white point from ACES.";
+    if (!strcmp(cs->desc.name, Nc_lin_displayp3))
+        return "Linear Display P3, a color space using the Display P3 primaries.";
+    if (!strcmp(cs->desc.name, Nc_lin_rec709))
+        return "Linear Rec. 709, a color space using the Rec. 709 primaries.";
+    if (!strcmp(cs->desc.name, Nc_lin_rec2020))
+        return "Linear Rec. 2020, a color space using the Rec. 2020 primaries.";
+    if (!strcmp(cs->desc.name, Nc_lin_srgb))
+        return "Linear sRGB, a color space using the sRGB primaries.";
+    if (!strcmp(cs->desc.name, Nc_raw))
+        return "Raw color space, no conversion.";
+    if (!strcmp(cs->desc.name, Nc_srgb_displayp3))
+        return "sRGB Display P3, a color space using the Display P3 primaries.";
+    if (!strcmp(cs->desc.name, Nc_sRGB))
+        return "sRGB, a display color space developed by HP and Microsoft.";
+    if (!strcmp(cs->desc.name, Nc_srgb_texture))
+        return "sRGB Texture, a color space using the sRGB primaries.";
+    return cs->desc.name;
+}
+
+// White point chromaticities.
+#define _WpD65 { 0.3127, 0.3290 }
+#define _WpACES { 0.32168, 0.33767 }
+
+static NcColorSpace _colorSpaces[] = {
+    {
+        _acescg,
+        { 0.713, 0.293 },
+        { 0.165, 0.830 },
+        { 0.128, 0.044 },
+        _WpACES,
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _adobergb,
+        { 0.64, 0.33 },
+        { 0.21, 0.71 },
+        { 0.15, 0.06 },
+        _WpD65,
+        563.0/256.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _g18_ap1,
+        { 0.713, 0.293 },
+        { 0.165, 0.830 },
+        { 0.128, 0.044 },
+        _WpACES,
+        1.8,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _g22_ap1,
+        { 0.713, 0.293 },
+        { 0.165, 0.830 },
+        { 0.128, 0.044 },
+        _WpACES,
+        2.2,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _g18_rec709,
+        { 0.640, 0.330 },
+        { 0.300, 0.600 },
+        { 0.150, 0.060 },
+        _WpD65,
+        1.8,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _g22_rec709,
+        { 0.640, 0.330 },
+        { 0.300, 0.600 },
+        { 0.150, 0.060 },
+        _WpD65,
+        2.2,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _lin_adobergb,
+        { 0.64, 0.33 },
+        { 0.21, 0.71 },
+        { 0.15, 0.06 },
+        _WpD65,
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _lin_ap0,
+        { 0.7347, 0.2653  },
+        { 0.0000, 1.0000  },
+        { 0.0001, -0.0770 },
+        _WpACES,
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _lin_ap1,                      // same primaries and wp as acescg
+        { 0.713, 0.293 },
+        { 0.165, 0.830 },
+        { 0.128, 0.044 },
+        _WpACES,
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _lin_displayp3,
+        { 0.6800, 0.3200 },
+        { 0.2650, 0.6900 },
+        { 0.1500, 0.0600 },
+        _WpD65,
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _lin_rec709,
+        { 0.640, 0.330 },
+        { 0.300, 0.600 },
+        { 0.150, 0.060 },
+        _WpD65,
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _lin_rec2020,
+        { 0.708, 0.292 },
+        { 0.170, 0.797 },
+        { 0.131, 0.046 },
+        _WpD65,
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _lin_srgb,
+        { 0.640, 0.330 },
+        { 0.300, 0.600 },
+        { 0.150, 0.060 },
+        _WpD65,
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _srgb_displayp3,
+        { 0.6800, 0.3200 },
+        { 0.2650, 0.6900 },
+        { 0.1500, 0.0600 },
+        _WpD65,
+        2.4,
+        0.055,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _srgb_texture,
+        { 0.640, 0.330 },
+        { 0.300, 0.600 },
+        { 0.150, 0.060 },
+        _WpD65,
+        2.4,
+        0.055,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _sRGB,
+        { 0.640, 0.330 },
+        { 0.300, 0.600 },
+        { 0.150, 0.060 },
+        _WpD65,
+        2.4,
+        0.055,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _identity,
+        { 1.0, 0.0 }, // these chromaticities generate identity
+        { 0.0, 1.0 },
+        { 0.0, 0.0 },
+        { 1.0/3.0, 1.0/3.0 },
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    },
+    {
+        _raw,
+        { 1.0, 0.0 }, // these chromaticities generate identity
+        { 0.0, 1.0 },
+        { 0.0, 0.0 },
+        { 1.0/3.0, 1.0/3.0 },
+        1.0,
+        0.0,
+        0, 0,
+        { 0,0,0, 0,0,0, 0,0,0 }
+    }
+};
+
+static const char* _colorSpaceNames[] = {
+    _acescg,
+    _adobergb,
+    _g18_ap1,
+    _g18_rec709,
+    _g22_ap1,
+    _g22_rec709,
+    _identity,
+    _lin_adobergb,
+    _lin_ap0,
+    _lin_ap1,
+    _lin_displayp3,
+    _lin_rec709,
+    _lin_rec2020,
+    _lin_srgb,
+    _raw,
+    _srgb_displayp3,
+    _sRGB,
+    _srgb_texture,
+    NULL
+};
+
+const char** NcRegisteredColorSpaceNames()
+{
+    return _colorSpaceNames;
+}
+
+bool NcColorSpaceEqual(const NcColorSpace* cs1, const NcColorSpace* cs2) {
+    if (!cs1 || !cs2) {
+        return false;
+    }
+
+    if (cs1->desc.name == NULL || cs2->desc.name == NULL) {
+        return false;
+    }
+
+    if (strcmp(cs1->desc.name, cs1->desc.name) != 0) {
+        return false;
+    }
+
+    // compare color transform op matrix and transfer op
+    for (int i = 0; i < 9; i++) {
+        if (fabsf(cs1->rgbToXYZ.m[i] - cs2->rgbToXYZ.m[i]) > 1e-5f) {
+            return false;
+        }
+    }
+    if (fabsf(cs1->desc.gamma - cs2->desc.gamma) > 1e-3f) {
+        return false;
+    }
+    if (fabsf(cs1->desc.linearBias - cs2->desc.linearBias) > 1e-3f) {
+        return false;
+    }
+    return true;
+}
+
+static NcM33f NcM3ffInvert(NcM33f m) {
+    NcM33f inv;
+    const int M0 = 0, M1 = 3, M2 = 6, M3 = 1, M4 = 4, M5 = 7, M6 = 2, M7 = 5, M8 = 8;
+    float det = m.m[M0] * (m.m[M4] * m.m[M8] - m.m[M5] * m.m[M7]) -
+    m.m[M1] * (m.m[M3] * m.m[M8] - m.m[M5] * m.m[M6]) +
+    m.m[M2] * (m.m[M3] * m.m[M7] - m.m[M4] * m.m[M6]);
+    float invdet = 1.0 / det;
+    inv.m[M0] = (m.m[M4] * m.m[M8] - m.m[M5] * m.m[M7]) * invdet;
+    inv.m[M1] = (m.m[M2] * m.m[M7] - m.m[M1] * m.m[M8]) * invdet;
+    inv.m[M2] = (m.m[M1] * m.m[M5] - m.m[M2] * m.m[M4]) * invdet;
+    inv.m[M3] = (m.m[M5] * m.m[M6] - m.m[M3] * m.m[M8]) * invdet;
+    inv.m[M4] = (m.m[M0] * m.m[M8] - m.m[M2] * m.m[M6]) * invdet;
+    inv.m[M5] = (m.m[M2] * m.m[M3] - m.m[M0] * m.m[M5]) * invdet;
+    inv.m[M6] = (m.m[M3] * m.m[M7] - m.m[M4] * m.m[M6]) * invdet;
+    inv.m[M7] = (m.m[M1] * m.m[M6] - m.m[M0] * m.m[M7]) * invdet;
+    inv.m[M8] = (m.m[M0] * m.m[M4] - m.m[M1] * m.m[M3]) * invdet;
+    return inv;
+}
+
+static NcM33f NcM33fMultiply(NcM33f lh, NcM33f rh) {
+    NcM33f m;
+    m.m[0] = lh.m[0] * rh.m[0] + lh.m[1] * rh.m[3] + lh.m[2] * rh.m[6];
+    m.m[1] = lh.m[0] * rh.m[1] + lh.m[1] * rh.m[4] + lh.m[2] * rh.m[7];
+    m.m[2] = lh.m[0] * rh.m[2] + lh.m[1] * rh.m[5] + lh.m[2] * rh.m[8];
+    m.m[3] = lh.m[3] * rh.m[0] + lh.m[4] * rh.m[3] + lh.m[5] * rh.m[6];
+    m.m[4] = lh.m[3] * rh.m[1] + lh.m[4] * rh.m[4] + lh.m[5] * rh.m[7];
+    m.m[5] = lh.m[3] * rh.m[2] + lh.m[4] * rh.m[5] + lh.m[5] * rh.m[8];
+    m.m[6] = lh.m[6] * rh.m[0] + lh.m[7] * rh.m[3] + lh.m[8] * rh.m[6];
+    m.m[7] = lh.m[6] * rh.m[1] + lh.m[7] * rh.m[4] + lh.m[8] * rh.m[7];
+    m.m[8] = lh.m[6] * rh.m[2] + lh.m[7] * rh.m[5] + lh.m[8] * rh.m[8];
+    return m;
+}
+
+static void _NcInitColorSpace(NcColorSpace* cs) {
+    if (!cs || cs->rgbToXYZ.m[8] != 0.0)
+        return;
+        
+    const float a = cs->desc.linearBias;
+    const float gamma = cs->desc.gamma;
+    
+    if (gamma == 1.f) {
+        cs->K0 = 1.e9f;
+        cs->phi = 1.f;
+    }
+    else {
+        if (a <= 0.f) {
+            cs->K0 = 0.f;
+            cs->phi = 1.f;
+        }
+        else {
+            cs->K0 = a / (gamma - 1.f);
+            cs->phi = (a /
+                       expf(logf(gamma * a /
+                       (gamma + gamma * a - 1.f - a)) * gamma)) /
+                       (gamma - 1.f);
+        }
+    }
+    
+    // if the primaries are zero, the cs was defined by the 3x3 matrix, don't overwrite it.
+    if (cs->desc.whitePoint.x == 0.f)
+        return;
+    
+    NcM33f m;
+    // To be consistent, we use SMPTE RP 177-1993
+    // compute xyz [little xyz]
+    float red[3]   = { cs->desc.redPrimary.x,
+                       cs->desc.redPrimary.y,
+                       1.f - cs->desc.redPrimary.x - cs->desc.redPrimary.y };
+    
+    float green[3] = { cs->desc.greenPrimary.x,
+                       cs->desc.greenPrimary.y,
+                       1.f - cs->desc.greenPrimary.x - cs->desc.greenPrimary.y };
+    
+    float blue[3]  = { cs->desc.bluePrimary.x,
+                       cs->desc.bluePrimary.y,
+                       1.f - cs->desc.bluePrimary.x - cs->desc.bluePrimary.y };
+    
+    float white[3] = { cs->desc.whitePoint.x,
+                       cs->desc.whitePoint.y,
+                       1.f - cs->desc.whitePoint.x - cs->desc.whitePoint.y };
+    
+    // Build the P matrix by column binding red, green, and blue:
+    m.m[0] = red[0];
+    m.m[1] = green[0];
+    m.m[2] = blue[0];
+    m.m[3] = red[1];
+    m.m[4] = green[1];
+    m.m[5] = blue[1];
+    m.m[6] = red[2];
+    m.m[7] = green[2];
+    m.m[8] = blue[2];
+    
+    // and W
+    // white has luminance factor of 1.0, ie Y = 1
+    float W[3] = { white[0] / white[1], white[1] / white[1], white[2] / white[1] };
+    
+    // compute the coefficients to scale primaries
+    NcM33f mInv = NcM3ffInvert(m);
+    float C[3] = {
+        mInv.m[0] * W[0] + mInv.m[1] * W[1] + mInv.m[2] * W[2],
+        mInv.m[3] * W[0] + mInv.m[4] * W[1] + mInv.m[5] * W[2],
+        mInv.m[6] * W[0] + mInv.m[7] * W[1] + mInv.m[8] * W[2]
+    };
+    
+    // multiply the P matrix by the diagonal matrix of coefficients
+    m.m[0] *= C[0];
+    m.m[1] *= C[1];
+    m.m[2] *= C[2];
+    m.m[3] *= C[0];
+    m.m[4] *= C[1];
+    m.m[5] *= C[2];
+    m.m[6] *= C[0];
+    m.m[7] *= C[1];
+    m.m[8] *= C[2];
+    
+    cs->rgbToXYZ = m;
+}
+
+void  NcInitColorSpaceLibrary(void) {
+    for (size_t i = 0; i < sizeof(_colorSpaces) / sizeof(_colorSpaces[0]); i++) {
+        _NcInitColorSpace(&_colorSpaces[i]);
+    }
+}
+
+const NcColorSpace* NcCreateColorSpace(const NcColorSpaceDescriptor* csd) {
+    if (!csd)
+        return NULL;
+    
+    NcColorSpace* cs = (NcColorSpace*) calloc(1, sizeof(*cs));
+    cs->desc = *csd;
+    cs->desc.name = strdup(csd->name);
+    _NcInitColorSpace(cs);
+    return cs;
+}
+
+const NcColorSpace* NcCreateColorSpaceM33(const NcColorSpaceM33Descriptor* csd, 
+                                          bool* matrixIsNormalized) {
+    if (!csd)
+        return NULL;
+    
+    NcColorSpace* cs = (NcColorSpace*) calloc(1, sizeof(*cs));
+    cs->desc.name = strdup(csd->name);
+    cs->desc.gamma = csd->gamma;
+    cs->desc.linearBias = csd->linearBias;
+    cs->rgbToXYZ = csd->rgbToXYZ;
+    _NcInitColorSpace(cs);
+
+    // fill in the assumed chromaticities
+    NcXYZ whiteXYZ = NcRGBToXYZ(cs, (NcRGB){ 1, 1, 1 });
+    NcYxy whiteYxy = NcXYZToYxy(whiteXYZ);
+    NcXYZ redXYZ = NcRGBToXYZ(cs, (NcRGB){ 1, 0, 0 });
+    NcXYZ greenXYZ = NcRGBToXYZ(cs, (NcRGB){ 0, 1, 0 });
+    NcXYZ blueXYZ = NcRGBToXYZ(cs, (NcRGB){ 0, 0, 1 });
+    NcYxy redYxy = NcXYZToYxy(redXYZ);
+    NcYxy greenYxy = NcXYZToYxy(greenXYZ);
+    NcYxy blueYxy = NcXYZToYxy(blueXYZ);
+
+    // if the Y components are not close to one, the matrix was not a normalized
+    // primary matrix; report that if requested.
+    if (matrixIsNormalized)
+        *matrixIsNormalized = (fabsf(redYxy.Y - 1) < 1e-3f &&
+                               fabsf(greenYxy.Y - 1) < 1e-3f &&
+                               fabsf(blueYxy.Y - 1) < 1e-3f &&
+                               fabsf(whiteYxy.Y - 1) < 1e-3f);
+
+    cs->desc.redPrimary = (NcChromaticity) { redYxy.x, redYxy.y };
+    cs->desc.greenPrimary = (NcChromaticity) { greenYxy.x, greenYxy.y };
+    cs->desc.bluePrimary = (NcChromaticity) { blueYxy.x, blueYxy.y };
+    cs->desc.whitePoint = (NcChromaticity) { whiteYxy.x, whiteYxy.y };
+    return cs;
+}
+
+void NcFreeColorSpace(const NcColorSpace* cs) {
+    if (!cs)
+        return;
+
+    // don't free the built in color spaces
+    for (size_t i = 0; i < sizeof(_colorSpaces) / sizeof(_colorSpaces[0]); i++) {
+        if (cs == &_colorSpaces[i]) {
+            return;
+        }
+    }
+    
+    free((void*)cs->desc.name);
+    free((void*)cs);
+}
+
+NcM33f NcGetRGBToXYZMatrix(const NcColorSpace* cs) {
+    if (!cs)
+        return (NcM33f) {1,0,0, 0,1,0, 0,0,1};
+
+    return cs->rgbToXYZ;
+}
+
+NcM33f NcGetXYZToRGBMatrix(const NcColorSpace* cs) {
+    if (!cs)
+        return (NcM33f) {1,0,0, 0,1,0, 0,0,1};
+
+    return NcM3ffInvert(NcGetRGBToXYZMatrix(cs));
+}
+
+NcM33f GetRGBtoRGBMatrix(const NcColorSpace* src, const NcColorSpace* dst) {
+    NcM33f t = NcM33fMultiply(NcM3ffInvert(NcGetRGBToXYZMatrix(src)),
+                                 NcGetXYZToRGBMatrix(dst));
+    return t;
+}
+
+NcM33f NcGetRGBToRGBMatrix(const NcColorSpace* src, const NcColorSpace* dst) {
+    if (!dst || !src) {
+        return (NcM33f){1,0,0,0,1,0,0,0,1};
+    }
+    
+    NcM33f toXYZ = NcGetRGBToXYZMatrix(src);
+    NcM33f fromXYZ = NcGetXYZToRGBMatrix(dst);
+    
+    NcM33f tx = NcM33fMultiply(fromXYZ, toXYZ);
+    return tx;
+}
+
+NcRGB NcTransformColor(const NcColorSpace* dst, const NcColorSpace* src, NcRGB rgb) {
+    if (!dst || !src) {
+        return rgb;
+    }
+    
+    NcM33f tx = NcM33fMultiply(NcGetRGBToXYZMatrix(src),
+                               NcGetXYZToRGBMatrix(dst));
+    
+    // if the source color space indicates a curve remove it.
+    rgb.r = nc_ToLinear(src, rgb.r);
+    rgb.g = nc_ToLinear(src, rgb.g);
+    rgb.b = nc_ToLinear(src, rgb.b);
+
+    NcRGB out;
+    out.r = tx.m[0] * rgb.r + tx.m[1] * rgb.g + tx.m[2] * rgb.b;
+    out.g = tx.m[3] * rgb.r + tx.m[4] * rgb.g + tx.m[5] * rgb.b;
+    out.b = tx.m[6] * rgb.r + tx.m[7] * rgb.g + tx.m[8] * rgb.b;
+    
+    // if the destination color space indicates a curve apply it.
+    out.r = nc_FromLinear(dst, out.r);
+    out.g = nc_FromLinear(dst, out.g);
+    out.b = nc_FromLinear(dst, out.b);
+    return out;
+}
+
+void NcTransformColors(const NcColorSpace* dst, const NcColorSpace* src, NcRGB* rgb, size_t count)
+{
+    if (!dst || !src || !rgb)
+        return;
+    
+    NcM33f tx = NcM33fMultiply(NcGetRGBToXYZMatrix(src),
+                               NcGetXYZToRGBMatrix(dst));
+    
+    // if the source color space indicates a curve remove it.
+    for (size_t i = 0; i < count; i++) {
+        NcRGB out = rgb[i];
+        out.r = nc_ToLinear(src, out.r);
+        out.g = nc_ToLinear(src, out.g);
+        out.b = nc_ToLinear(src, out.b);
+        rgb[i] = out;
+    }
+    
+    int start = 0;
+#if HAVE_SSE2
+    __m128 m0 = _mm_set_ps(tx.m[0], tx.m[1], tx.m[2], 0);
+    __m128 m1 = _mm_set_ps(tx.m[3], tx.m[4], tx.m[5], 0);
+    __m128 m2 = _mm_set_ps(tx.m[6], tx.m[7], tx.m[8], 0);
+    __m128 m3 = _mm_set_ps(0, 0, 0, 1);
+    
+    for (size_t i = 0; i < count - 1; i++) {
+        __m128 rgba = _mm_loadu_ps(&rgb[i].r);   // load rgbr
+        
+        // Set alpha component to 1.0 before multiplication
+        rgba = _mm_add_ps(rgba, m3);
+        
+        // Perform the matrix multiplication
+        __m128 rout = _mm_mul_ps(m0, rgba);
+        rout = _mm_add_ps(rout, _mm_mul_ps(m1, rgba));
+        rout = _mm_add_ps(rout, _mm_mul_ps(m2, rgba));
+        rout = _mm_add_ps(rout, _mm_mul_ps(m3, rgba));
+        
+        // Store the result
+        _mm_storeu_ps(&rgb[i].r, rout);
+    }
+    
+    // transform the last value separately, because _mm_storeu_ps
+    // writes 4 floats, and we may not have 4 floats left
+    start = count - 2;
+    count = 1;
+#elif HAVE_NEON
+    float32x4_t m0 = { tx.m[0], tx.m[1], tx.m[2], 0 };
+    float32x4_t m1 = { tx.m[3], tx.m[4], tx.m[5], 0 };
+    float32x4_t m2 = { tx.m[6], tx.m[7], tx.m[8], 0 };
+    float32x4_t m3 = { 0, 0, 0, 1 };
+    
+    for (size_t i = 0; i < count - 1; i++) {
+        float32x4_t rgba = vld1q_f32(&rgb[i].r);   // load rgbr
+        
+        // Set alpha component to 1.0 before multiplication
+        rgba = vsetq_lane_f32(1.0f, rgba, 3);
+        
+        // Perform the matrix multiplication
+        float32x4_t rout = vmulq_f32(m0, rgba);
+        rout = vmlaq_f32(rout, m1, rgba);
+        rout = vmlaq_f32(rout, m2, rgba);
+        rout = vmlaq_f32(rout, m3, rgba);
+        
+        // Store the result
+        vst1q_f32(&rgb[i].r, rout);
+    }
+    // transform the last value separately, because _mm_storeu_ps
+    // writes 4 floats, and we may not have 4 floats left
+    start = count - 2;
+    count = 1;
+#else
+    for (size_t i = start; i < count; i++) {
+        NcRGB in = rgb[i];
+        NcRGB out = {
+            tx.m[0] * in.r + tx.m[1] * in.g + tx.m[2] * in.b,
+            tx.m[3] * in.r + tx.m[4] * in.g + tx.m[5] * in.b,
+            tx.m[6] * in.r + tx.m[7] * in.g + tx.m[8] * in.b
+        };
+        rgb[i] = out;
+    }
+#endif
+    
+    // if the destination color space indicates a curve apply it.
+    for (size_t i = 0; i < count; i++) {
+        NcRGB out = rgb[i];
+        out.r = nc_FromLinear(dst, out.r);
+        out.g = nc_FromLinear(dst, out.g);
+        out.b = nc_FromLinear(dst, out.b);
+        rgb[i] = out;
+    }
+}
+
+// same as NcTransformColor, but preserve alpha in the transformation
+void NcTransformColorsWithAlpha(const NcColorSpace* dst, const NcColorSpace* src,
+                                float* rgba, size_t count)
+{
+    if (!dst || !src || !rgba)
+        return;
+    
+    NcM33f tx = NcM33fMultiply(NcGetRGBToXYZMatrix(src),
+                               NcGetXYZToRGBMatrix(dst));
+    
+    // if the source color space indicates a curve remove it.
+    for (size_t i = 0; i < count; i++) {
+        NcRGB out = { rgba[i * 4 + 0], rgba[i * 4 + 1], rgba[i * 4 + 2] };
+        out.r = nc_ToLinear(src, out.r);
+        out.g = nc_ToLinear(src, out.g);
+        out.b = nc_ToLinear(src, out.b);
+        rgba[i * 4 + 0] = out.r;
+        rgba[i * 4 + 1] = out.g;
+        rgba[i * 4 + 2] = out.b;
+    }
+    
+#if HAVE_SSE2
+    __m128 m0 = _mm_set_ps(tx.m[0], tx.m[1], tx.m[2], 0);
+    __m128 m1 = _mm_set_ps(tx.m[3], tx.m[4], tx.m[5], 0);
+    __m128 m2 = _mm_set_ps(tx.m[6], tx.m[7], tx.m[8], 0);
+    __m128 m3 = _mm_set_ps(0,0,0,1);
+    
+    for (size_t i = 0; i < count; i += 4) {
+        __m128 rgbaVec = _mm_loadu_ps(&rgba[i * 4]);  // Load all components (r, g, b, a)
+        
+        __m128  rout = _mm_mul_ps(m0, rgbaVec);
+        rout = _mm_add_ps(rout, _mm_mul_ps(m1, rgbaVec));
+        rout = _mm_add_ps(rout, _mm_mul_ps(m2, rgbaVec));
+        rout = _mm_add_ps(rout, _mm_mul_ps(m3, rgbaVec));
+        
+        _mm_storeu_ps(&rgba[i * 4], rout);  // Store the result
+    }
+#elif HAVE_NEON
+    float32x4x4_t matrix = {
+        {tx.m[0], tx.m[1], tx.m[2], 0},
+        {tx.m[3], tx.m[4], tx.m[5], 0},
+        {tx.m[6], tx.m[7], tx.m[8], 0},
+        {0, 0, 0, 1}
+    };
+    
+    for (size_t i = 0; i < count; i += 4) {
+        float32x4x4_t rgba_values = vld4q_f32(&rgba[i * 4]);
+        
+        float32x4_t rout = vmulq_f32(matrix.val[0], rgba_values.val[0]);
+        rout = vmlaq_f32(rout, matrix.val[1], rgba_values.val[1]);
+        rout = vmlaq_f32(rout, matrix.val[2], rgba_values.val[2]);
+        rout = vmlaq_f32(rout, matrix.val[3], rgba_values.val[3]);
+        
+        vst1q_f32(&rgba[i * 4], rout);
+    }
+#else
+    for (size_t i = 0; i < count; i++) {
+        NcRGB in = { rgba[i * 4 + 0], rgba[i * 4 + 1], rgba[i * 4 + 2] };
+        NcRGB out = {
+            tx.m[0] * in.r + tx.m[1] * in.g + tx.m[2] * in.b,
+            tx.m[3] * in.r + tx.m[4] * in.g + tx.m[5] * in.b,
+            tx.m[6] * in.r + tx.m[7] * in.g + tx.m[8] * in.b
+        };
+        rgba[i * 4 + 0] = out.r;
+        rgba[i * 4 + 1] = out.g;
+        rgba[i * 4 + 2] = out.b;
+        // leave alpha alone
+    }
+#endif
+
+    // if the destination color space indicates a curve apply it.
+    for (size_t i = 0; i < count; i++) {
+        NcRGB out = { rgba[i * 4 + 0], rgba[i * 4 + 1], rgba[i * 4 + 2] };
+        out.r = nc_FromLinear(dst, out.r);
+        out.g = nc_FromLinear(dst, out.g);
+        out.b = nc_FromLinear(dst, out.b);
+        rgba[i * 4 + 0] = out.r;
+        rgba[i * 4 + 1] = out.g;
+        rgba[i * 4 + 2] = out.b;
+    }
+}
+
+NcRGB NcNormalizeLuminance(const NcColorSpace* cs, NcRGB rgb, float luminance) {
+    if (!cs)
+        return rgb;
+    
+    NcXYZ xyz = NcRGBToXYZ(cs, rgb);
+    float sum = xyz.x + xyz.y + xyz.z;
+    if (sum == 0.f)
+        return rgb;
+
+    // NcRGBtoXYZ will linearize rgb.
+    NcXYZ XYZ = NcRGBToXYZ(cs, rgb);
+    rgb.r = nc_FromLinear(cs, luminance * rgb.r / XYZ.y);
+    rgb.g = nc_FromLinear(cs, luminance * rgb.g / XYZ.y);
+    rgb.b = nc_FromLinear(cs, luminance * rgb.b / XYZ.y);
+    return rgb;
+}
+
+NcXYZ NcRGBToXYZ(const NcColorSpace* ct, NcRGB rgb) {
+    if (!ct)
+        return (NcXYZ) {0,0,0};
+    
+    rgb.r = nc_ToLinear(ct, rgb.r);
+    rgb.g = nc_ToLinear(ct, rgb.g);
+    rgb.b = nc_ToLinear(ct, rgb.b);
+
+    NcM33f m = NcGetRGBToXYZMatrix(ct);
+    return (NcXYZ) {
+        m.m[0] * rgb.r + m.m[1] * rgb.g + m.m[2] * rgb.b,
+        m.m[3] * rgb.r + m.m[4] * rgb.g + m.m[5] * rgb.b,
+        m.m[6] * rgb.r + m.m[7] * rgb.g + m.m[8] * rgb.b
+    };
+}
+
+NcRGB NcXYZToRGB(const NcColorSpace* ct, NcXYZ xyz) {
+    if (!ct)
+        return (NcRGB) {0,0,0};
+    
+    NcM33f m = NcGetXYZToRGBMatrix(ct);
+    
+    NcRGB rgb = {
+        m.m[0] * xyz.x + m.m[1] * xyz.y + m.m[2] * xyz.z,
+        m.m[3] * xyz.x + m.m[4] * xyz.y + m.m[5] * xyz.z,
+        m.m[6] * xyz.x + m.m[7] * xyz.y + m.m[8] * xyz.z
+    };
+    
+    rgb.r = nc_FromLinear(ct, rgb.r);
+    rgb.g = nc_FromLinear(ct, rgb.g);
+    rgb.b = nc_FromLinear(ct, rgb.b);
+    return rgb;
+}
+
+NcYxy NcXYZToYxy(NcXYZ xyz) {
+    float sum = xyz.x + xyz.y + xyz.z;
+    if (sum == 0.f)
+        return (NcYxy) {0, 0, xyz.y};
+    
+    return (NcYxy) {xyz.y, xyz.x / sum, xyz.y / sum};
+}
+
+NCAPI NcXYZ NcYxyToXYZ(NcYxy Yxy) {
+    return (NcXYZ) { 
+        Yxy.Y * Yxy.x / Yxy.y,
+        Yxy.Y,
+        Yxy.Y * (1.f - Yxy.x - Yxy.y) / Yxy.y };
+}
+
+const NcColorSpace* NcGetNamedColorSpace(const char* name)
+{
+    if (name) {
+        for (size_t i = 0; i < sizeof(_colorSpaces) / sizeof(_colorSpaces[0]); i++) {
+            if (strcmp(name, _colorSpaces[i].desc.name) == 0) {
+                _NcInitColorSpace((NcColorSpace*) &_colorSpaces[i]); // ensure initialization
+                return &_colorSpaces[i];
+            }
+        }
+    }
+    
+    // currently Nanocolor doesn't have a concept of registering new color spaces
+    return NULL;
+}
+
+static bool CompareChromaticity(const NcChromaticity* a, const NcChromaticity* b, float threshold) {
+    return fabsf(a->x - b->x) < threshold &&
+           fabsf(a->y - b->y) < threshold;
+}
+
+// The main reason this exists is that OpenEXR encodes colorspaces via primaries
+// and white point, and it would be good to be able to match an EXR file to a
+// known colorspace, rather than setting up unique transforms for each image.
+// Therefore constructing the namespaced name here via macro, to avoid including
+// utils itself.
+
+const char*
+NcMatchLinearColorSpace(NcChromaticity redPrimary, NcChromaticity greenPrimary, NcChromaticity bluePrimary,
+                        NcChromaticity  whitePoint, float threshold) {
+    for (size_t i = 0; i < sizeof(_colorSpaces) / sizeof(NcColorSpace); ++i) {
+        if (_colorSpaces[i].desc.gamma != 1.0f)
+            continue;
+        if (CompareChromaticity(&_colorSpaces[i].desc.redPrimary, &redPrimary, threshold) &&
+            CompareChromaticity(&_colorSpaces[i].desc.greenPrimary, &greenPrimary, threshold) &&
+            CompareChromaticity(&_colorSpaces[i].desc.bluePrimary, &bluePrimary, threshold) &&
+            CompareChromaticity(&_colorSpaces[i].desc.whitePoint, &whitePoint, threshold))
+            return _colorSpaces[i].desc.name;
+    }
+    return NULL;
+}
+
+bool NcGetColorSpaceDescriptor(const NcColorSpace* cs, NcColorSpaceDescriptor* desc) {
+    if (!cs || !desc)
+        return false;
+    if (cs->desc.whitePoint.x == 0.f)
+        return false;
+    memcpy(desc, &cs->desc, sizeof(NcColorSpaceDescriptor));
+    return true;
+}
+
+bool NcGetColorSpaceM33Descriptor(const NcColorSpace* cs, NcColorSpaceM33Descriptor* desc) {
+    if (!cs || !desc)
+        return false;
+    desc->name = cs->desc.name;
+    desc->gamma = cs->desc.gamma;
+    desc->linearBias = cs->desc.linearBias;
+    desc->rgbToXYZ = cs->rgbToXYZ;
+    return true;
+}
+
+void NcGetK0Phi(const NcColorSpace* cs, float* K0, float* phi) {
+    if (cs && K0 && phi) {
+        *K0 = cs->K0;
+        *phi = cs->phi;
+    }
+}
+
+/* This is actually u'v', u'v' is uv scaled by 1.5 along the v axis
+*/
+
+typedef struct {
+    float Y;
+    float u;
+    float v;
+} NcYuvPrime;
+
+NcYxy _NcYuv2Yxy(NcYuvPrime c) {
+    float d = 6.f * c.u - 16.f * c.v + 12.f;
+    return (NcYxy) {
+        c.Y,
+        9.f * c.u / d,
+        4.f * c.v / d
+    };
+}
+
+/* Equations from the paper "An Algorithm to Calculate Correlated Colour 
+   Temperature" by M. Krystek in 1985, using a rational Chebyshev approximation.
+*/
+NcYxy NcKelvinToYxy(float T, float luminance) {
+    if (T < 1000 || T > 15000)
+        return (NcYxy) { 0, 0, 0 };
+
+    float u = (0.860117757 + 1.54118254e-4 * T + 1.2864121e-7 * T * T) /
+              (1.0 + 8.42420235e-4 * T + 7.08145163e-7 * T * T);
+    float v = (0.317398726 + 4.22806245e-5 * T + 4.20481691e-8 * T * T) /
+              (1.0 - 2.89741816e-5 * T + 1.61456053e-7 * T * T);
+
+    return _NcYuv2Yxy((NcYuvPrime) {luminance, u, 3.f * v / 2.f });
+}
+
+NcYxy NcNormalizeYxy(NcYxy c) {
+    return (NcYxy) {
+        c.Y,
+        c.Y * c.x / c.y,
+        c.Y * (1.f - c.x - c.y) / c.y
+    };
+}
+
+static inline float sign_of(float x) {
+    return x > 0 ? 1.f : (x < 0) ? -1.f : 0.f;
+}
+
+NcRGB NcYxyToRGB(const NcColorSpace* cs, NcYxy c) {
+    NcYxy cYxy = NcNormalizeYxy(c);
+    NcRGB rgb = NcXYZToRGB(cs, (NcXYZ) { cYxy.x, cYxy.Y, cYxy.y });
+    NcRGB magRgb = {
+        fabsf(rgb.r),
+        fabsf(rgb.g),
+        fabsf(rgb.b) };
+
+    float maxc = (magRgb.r > magRgb.g) ? magRgb.r : magRgb.g;
+    maxc = maxc > magRgb.b ? maxc : magRgb.b;
+    NcRGB ret = (NcRGB) {
+        sign_of(rgb.r) * rgb.r / maxc,
+        sign_of(rgb.g) * rgb.g / maxc,
+        sign_of(rgb.b) * rgb.b / maxc };
+    return ret;
+}
+
diff --git a/pxr/base/gf/nc/nanocolor.h b/pxr/base/gf/nc/nanocolor.h
new file mode 100644
index 0000000000..2ccee35342
--- /dev/null
+++ b/pxr/base/gf/nc/nanocolor.h
@@ -0,0 +1,435 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_BASE_GF_NC_NANOCOLOR_H
+#define PXR_BASE_GF_NC_NANOCOLOR_H
+
+#include <stdbool.h>
+#include <stddef.h>
+
+// NCNAMESPACE is allows the introduction of a namespace to the symbols so that 
+// multiple libraries can include the nanocolor library without symbol 
+// conflicts. The default is nc_1_0_ to indicate the 1.0 version of Nanocolor.
+//
+// pxr: note that the PXR namespace macros are in pxr/pxr.h which
+// is a C++ only header; so the generated namespace prefixes can't be
+// used here.
+#ifndef NCNAMESPACE
+#define NCNAMESPACE pxr_nc_1_0_
+#endif
+
+// The NCCONCAT macro is used to apply a namespace to the symbols in the public
+// interface.
+#define NCCONCAT1(a, b) a ## b
+#define NCCONCAT(a, b) NCCONCAT1(a, b)
+
+// NCAPI may be overridden externally to control symbol visibility.
+#ifndef NCAPI
+#define NCAPI
+#endif
+
+#ifdef __cplusplus
+#define NCEXTERNC extern "C" NCAPI
+#else
+#define NCEXTERNC extern NCAPI
+#endif
+
+#define NcChromaticity NCCONCAT(NCNAMESPACE, Chromaticity)
+#define NcXYZ NCCONCAT(NCNAMESPACE, XYZ)
+#define NcYxy NCCONCAT(NCNAMESPACE, Yxy)
+#define NcRGB NCCONCAT(NCNAMESPACE, RGB)
+#define NcM33f NCCONCAT(NCNAMESPACE, M33f)
+#define NcColorSpaceDescriptor NCCONCAT(NCNAMESPACE, ColorSpaceDescriptor)
+#define NcColorSpaceM33Descriptor NCCONCAT(NCNAMESPACE, ColorSpaceM33Descriptor)
+#define NcColorSpace NCCONCAT(NCNAMESPACE, ColorSpace)
+
+// NcChromaticity is a single coordinate in the CIE 1931 xy chromaticity diagram.
+typedef struct {
+    float x, y;
+} NcChromaticity;
+
+// NcXYZ is a coordinate in the CIE 1931 2-degree XYZ color space.
+typedef struct {
+    float x, y, z;
+} NcXYZ;
+
+// NcYxy is a chromaticity coordinate with luminance.
+typedef struct {
+    float Y, x, y;
+} NcYxy;
+
+// NcRGB is an rgb coordinate with no intrinsic color space.
+typedef struct {
+    float r, g, b;
+} NcRGB;
+
+// NcM33f is a 3x3 matrix of floats used for color space conversions.
+// It's stored in row major order, such that posting multiplying an NcRGB
+// as a column vector by an NcM33f will yield another NcRGB column
+// transformed by that matrix.
+typedef struct {
+    float m[9];
+} NcM33f;
+
+// NcColorSpaceDescriptor describes a color space.
+// The color space is defined by the red, green, and blue primaries,
+// the white point, the gamma of the log section, and the linear bias.
+typedef struct {
+    const char*       name;
+    NcChromaticity    redPrimary, greenPrimary, bluePrimary;
+    NcChromaticity    whitePoint;
+    float             gamma;      // gamma of log section
+    float             linearBias; // where the linear section ends
+} NcColorSpaceDescriptor;
+
+// NcColorSpaceM33Descriptor describes a color space defined in terms of a 
+// 3x3 matrix, the gamma of the log section, and the linear bias.
+typedef struct {
+    const char*       name;
+    NcM33f            rgbToXYZ;
+    float             gamma;      // gamma of log section
+    float             linearBias; // where the linear section ends
+} NcColorSpaceM33Descriptor;
+
+// Opaque struct for the public interface
+typedef struct NcColorSpace NcColorSpace;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ The named color spaces provided by Nanocolor are as follows.
+ Note that the names are shared with libraries such as MaterialX.
+
+ - acescg:           The Academy Color Encoding System, a color space designed
+                     for cinematic content creation and exchange, using AP1 primaries
+ - adobergb:         A color space developed by Adobe Systems. It has a wider gamut
+                     than sRGB and is suitable for photography and printing
+ - g18_ap1:          A color space with a 1.8 gamma and an AP1 primaries color gamut
+ - g18_rec709:       A color space with a 1.8 gamma, and primaries per the Rec. 709
+                     standard, commonly used in HDTV
+ - g22_ap1:          A color space with a 2.2 gamma and an AP1 primaries color gamut
+ - g22_rec709:       A color space with a 2.2 gamma, and primaries per the Rec. 709
+                     standard, commonly used in HDTV
+ - identity:         Indicates that no transform is applied.
+ - lin_adobergb:     The AdobeRGB gamut, and linear gamma
+ - lin_ap0:          AP0 primaries, and linear gamma
+ - lin_ap1:          AP1 primaries, and linear gamma; these are the ACESCg primaries
+ - lin_displayp3:    DisplayP3 gamut, and linear gamma
+ - lin_rec709:       A linearized version of the Rec. 709 color space.
+ - lin_rec2020:      Rec2020 gamut, and linear gamma
+ - lin_srgb:         sRGB gamut, linear gamma
+ - raw:              Indicates that no transform is applied.
+ - srgb_displayp3:   sRGB color space adapted to the Display P3 primaries
+ - sRGB:             The sRGB color space.
+ - srgb_texture:     The sRGB color space.
+*/
+
+NCEXTERNC const char* Nc_acescg;
+NCEXTERNC const char* Nc_adobergb;
+NCEXTERNC const char* Nc_g18_ap1;
+NCEXTERNC const char* Nc_g18_rec709;
+NCEXTERNC const char* Nc_g22_ap1;
+NCEXTERNC const char* Nc_g22_rec709;
+NCEXTERNC const char* Nc_identity;
+NCEXTERNC const char* Nc_lin_adobergb;
+NCEXTERNC const char* Nc_lin_ap0;
+NCEXTERNC const char* Nc_lin_ap1;
+NCEXTERNC const char* Nc_lin_displayp3;
+NCEXTERNC const char* Nc_lin_rec709;
+NCEXTERNC const char* Nc_lin_rec2020;
+NCEXTERNC const char* Nc_lin_srgb;
+NCEXTERNC const char* Nc_raw;
+NCEXTERNC const char* Nc_srgb_displayp3;
+NCEXTERNC const char* Nc_sRGB;
+NCEXTERNC const char* Nc_srgb_texture;
+
+// Declare the public interface using the namespacing macro.
+#define NcColorSpaceEqual            NCCONCAT(NCNAMESPACE, ColorSpaceEqual)
+#define NcCreateColorSpace           NCCONCAT(NCNAMESPACE, CreateColorSpace)
+#define NcCreateColorSpaceM33        NCCONCAT(NCNAMESPACE, CreateColorSpaceM33)
+#define NcFreeColorSpace             NCCONCAT(NCNAMESPACE, FreeColorSpace)
+#define NcGetColorSpaceDescriptor    NCCONCAT(NCNAMESPACE, GetColorSpaceDescriptor)
+#define NcGetColorSpaceM33Descriptor NCCONCAT(NCNAMESPACE, GetColorSpaceM33Descriptor)
+#define NcGetDescription             NCCONCAT(NCNAMESPACE, GetDescription)
+#define NcGetK0Phi                   NCCONCAT(NCNAMESPACE, GetK0Phi)
+#define NcGetNamedColorSpace         NCCONCAT(NCNAMESPACE, GetNamedColorSpace)
+#define NcGetRGBToRGBMatrix          NCCONCAT(NCNAMESPACE, GetRGBToRGBMatrix)
+#define NcGetRGBToXYZMatrix          NCCONCAT(NCNAMESPACE, GetRGBtoXYZMatrix)
+#define NcGetXYZToRGBMatrix          NCCONCAT(NCNAMESPACE, GetXYZtoRGBMatrix)
+#define NcInitColorSpaceLibrary      NCCONCAT(NCNAMESPACE, InitColorSpaceLibrary)
+#define NcKelvinToYxy                NCCONCAT(NCNAMESPACE, KelvinToYxy)
+#define NcMatchLinearColorSpace      NCCONCAT(NCNAMESPACE, MatchLinearColorSpace)
+#define NcRegisteredColorSpaceNames  NCCONCAT(NCNAMESPACE, RegisteredColorSpaceNames)
+#define NcRGBToXYZ                   NCCONCAT(NCNAMESPACE, RGBToXYZ)
+#define NcTransformColor             NCCONCAT(NCNAMESPACE, TransformColor)
+#define NcTransformColors            NCCONCAT(NCNAMESPACE, TransformColors)
+#define NcTransformColorsWithAlpha   NCCONCAT(NCNAMESPACE, TransformColorsWithAlpha)
+#define NcXYZToRGB                   NCCONCAT(NCNAMESPACE, XYZToRGB)
+#define NcXYZToYxy                   NCCONCAT(NCNAMESPACE, XYZToYxy)
+#define NcYxyToRGB                   NCCONCAT(NCNAMESPACE, YxyToRGB)
+#define NcYxyToXYZ                   NCCONCAT(NCNAMESPACE, YxyToXYZ)
+
+/**
+ * @brief Initializes the color space library.
+ * 
+ * Initializes the color spaces provided in the built-in color space library. 
+ * This function is not thread-safe and must be called before NcGetNamedColorSpace
+ * is called.
+ * 
+ * @return void
+ */
+NCAPI void NcInitColorSpaceLibrary(void);
+
+/**
+ * @brief Retrieves the names of the registered color spaces.
+ * 
+ * Retrieves the names of the color spaces that have been registered.
+ * This function must not be called before NcInitColorSpaceLibrary is called.
+ * 
+ * @return Pointer to an array of strings containing the names of the registered color spaces.
+ */
+NCAPI const char** NcRegisteredColorSpaceNames(void);
+
+/**
+ * @brief Retrieves a named color space.
+ * 
+ * Retrieves a color space object based on the provided name.
+ * This function must not be called before NcInitColorSpaceLibrary is called.
+ * 
+ * @param name The name of the color space to retrieve.
+ * @return Pointer to the color space object, or NULL if not found.
+ */
+NCAPI const NcColorSpace* NcGetNamedColorSpace(const char* name);
+
+/**
+ * Creates a color space object based on the provided color space descriptor.
+ * 
+ * @param cs Pointer to the color space descriptor.
+ * @return Pointer to the created color space object, or NULL if creation fails.
+ */
+NCAPI const NcColorSpace* NcCreateColorSpace(const NcColorSpaceDescriptor* cs);
+
+/**
+ * Creates a color space object based on the provided 3x3 matrix color space descriptor.
+ * 
+ * @param cs Pointer to the 3x3 matrix color space descriptor.
+ * @return Pointer to the created color space object, or NULL if creation fails.
+ */
+NCAPI const NcColorSpace* NcCreateColorSpaceM33(const NcColorSpaceM33Descriptor* cs,
+                                                bool* matrixIsNormalized);
+
+/**
+ * @brief Frees the memory associated with a color space object.
+ * 
+ * Frees the memory associated with a color space object. 
+ * If this function is called on one of the built in library color spaces, it will
+ * return without freeing the memory.
+ * 
+ * @param cs Pointer to the color space object to be freed.
+ * @return void
+ */
+NCAPI void NcFreeColorSpace(const NcColorSpace* cs);
+
+/**
+ * Retrieves the RGB to XYZ transformation matrix for a given color space.
+ * 
+ * @param cs Pointer to the color space object.
+ * @return The 3x3 transformation matrix.
+ */
+NCAPI NcM33f NcGetRGBToXYZMatrix(const NcColorSpace* cs);
+
+/**
+ * Retrieves the XYZ to RGB transformation matrix for a given color space.
+ * 
+ * @param cs Pointer to the color space object.
+ * @return The 3x3 transformation matrix.
+ */
+NCAPI NcM33f NcGetXYZToRGBMatrix(const NcColorSpace* cs);
+
+/**
+ * Retrieves the RGB to RGB transformation matrix from source to destination color space.
+ * 
+ * @param src Pointer to the source color space object.
+ * @param dst Pointer to the destination color space object.
+ * @return The 3x3 transformation matrix.
+ */
+NCAPI NcM33f NcGetRGBToRGBMatrix(const NcColorSpace* src, const NcColorSpace* dst);
+
+/**
+ * Transforms a color from one color space to another.
+ * 
+ * @param dst Pointer to the destination color space object.
+ * @param src Pointer to the source color space object.
+ * @param rgb The RGB color to transform.
+ * @return The transformed RGB color in the destination color space.
+ */
+NCAPI NcRGB NcTransformColor(const NcColorSpace* dst, const NcColorSpace* src, NcRGB rgb);
+
+/**
+ * Transforms an array of colors from one color space to another.
+ * 
+ * @param dst Pointer to the destination color space object.
+ * @param src Pointer to the source color space object.
+ * @param rgb Pointer to the array of RGB colors to transform.
+ * @param count Number of colors in the array.
+ * @return void
+ */
+NCAPI void NcTransformColors(const NcColorSpace* dst, const NcColorSpace* src, 
+                             NcRGB* rgb, size_t count);
+
+/**
+ * Transforms an array of colors with alpha channel from one color space to another.
+ * 
+ * @param dst Pointer to the destination color space object.
+ * @param src Pointer to the source color space object.
+ * @param rgba Pointer to the array of RGBA colors to transform.
+ * @param count Number of colors in the array.
+ * @return void
+ */
+NCAPI void NcTransformColorsWithAlpha(const NcColorSpace* dst, const NcColorSpace* src,
+                                      float* rgba, size_t count);
+
+/**
+ * Converts an RGB color to XYZ color space using the provided color space.
+ * 
+ * @param cs Pointer to the color space object.
+ * @param rgb The RGB color to convert.
+ * @return The XYZ color.
+ */
+NCAPI NcXYZ  NcRGBToXYZ(const NcColorSpace* cs, NcRGB rgb);
+
+/**
+ * Converts a XYZ color to RGB color space using the provided color space.
+ * 
+ * @param cs Pointer to the color space object.
+ * @param xyz The XYZ color to convert.
+ * @return The RGB color.
+ */
+NCAPI NcRGB NcXYZToRGB(const NcColorSpace* cs, NcXYZ xyz);
+
+/**
+ * Converts a XYZ color to Yxy color space.
+ * 
+ * @param xyz The XYZ color to convert.
+ * @return The Yxy color.
+*/
+NCAPI NcYxy NcXYZToYxy(NcXYZ xyz);
+
+/**
+ * Converts an Yxy color coordinate to XYZ.
+ * 
+ * @param Yxy The Yxy color coordinate.
+ * @return The XYZ color coordinate.
+ */
+NCAPI NcXYZ NcYxyToXYZ(NcYxy Yxy);
+
+/**
+ * Converts an Yxy color coordinate to RGB using the specified color space.
+ * 
+ * @param cs The color space.
+ * @param c The Yxy color coordinate.
+ * @return The RGB color coordinate.
+ */
+NCAPI NcRGB NcYxyToRGB(const NcColorSpace* cs, NcYxy c);
+
+/**
+ * Checks if two color space objects are equal by comparing their properties.
+ * 
+ * @param cs1 Pointer to the first color space object.
+ * @param cs2 Pointer to the second color space object.
+ * @return True if the color space objects are equal, false otherwise.
+ */
+NCAPI bool NcColorSpaceEqual(const NcColorSpace* cs1, const NcColorSpace* cs2);
+
+/**
+ * @brief Retrieves the color space descriptor.
+ * 
+ * Returns true if the color space descriptor was filled in. Color spaces initialized 
+ * using a 3x3 matrix will not fill in the values. Note that 'name' within the populated 
+ * descriptor is a pointer to a string owned by the color space, and is valid only as 
+ * long as 'cs' is valid.
+ * 
+ * @param cs Pointer to the color space object.
+ * @param desc Pointer to the color space descriptor to be filled in.
+ * @return True if the descriptor was filled in, false otherwise.
+ */
+NCAPI bool NcGetColorSpaceDescriptor(const NcColorSpace* cs, NcColorSpaceDescriptor*);
+
+/**
+ * @brief Retrieves the 3x3 matrix color space descriptor.
+ * 
+ * Returns true if the color space descriptor was filled in. All properly initialized 
+ * color spaces will be able to fill in the values. Note that 'name' within the populated 
+ * descriptor is a pointer to a string owned by the color space, and is valid only as 
+ * long as 'cs' is valid.
+ * 
+ * @param cs Pointer to the color space object.
+ * @param desc Pointer to the 3x3 matrix color space descriptor to be filled in.
+ * @return True if the descriptor was filled in, false otherwise.
+ */
+NCAPI bool NcGetColorSpaceM33Descriptor(const NcColorSpace* cs, NcColorSpaceM33Descriptor*);
+
+/**
+ * Returns a string describing the color space.
+ * 
+ * @param cs Pointer to the color space object.
+ * @return A string describing the color space.
+ */
+NCAPI const char* NcGetDescription(const NcColorSpace* cs);
+
+/**
+ * @brief Retrieves the K0 and phi values of the color space.
+ * 
+ * Retrieves the K0 and Phi values of the color space, which are used in curve
+ * transformations. K0 represents the transition point in the curve function,
+ * and Phi represents the slope of the linear segment before the transition.
+ * 
+ * @param cs Pointer to the color space object.
+ * @param K0 Pointer to store the K0 value.
+ * @param phi Pointer to store the phi value.
+ * @return void
+ */
+NCAPI void NcGetK0Phi(const NcColorSpace* cs, float* K0, float* phi);
+
+/**
+ * @brief Matches a linear color space based on specified primaries and white point.
+ * 
+ * Returns a string describing the color space that best matches the specified primaries
+ * and white point. A reasonable epsilon for the comparison is 1e-4 because most color 
+ * spaces are defined to that precision.
+ * 
+ * @param redPrimary Red primary chromaticity.
+ * @param greenPrimary Green primary chromaticity.
+ * @param bluePrimary Blue primary chromaticity.
+ * @param whitePoint White point chromaticity.
+ * @param epsilon Epsilon value for comparison.
+ * @return A string describing the matched color space.
+ */
+NCAPI const char* NcMatchLinearColorSpace(NcChromaticity redPrimary,
+                                          NcChromaticity greenPrimary,
+                                          NcChromaticity bluePrimary,
+                                          NcChromaticity whitePoint,
+                                          float epsilon);
+
+/**
+ * @brief Returns an Yxy coordinate on the blackbody emission spectrum
+ *
+ * Returns an Yxy coordinate on the blackbody emission spectrum for values 
+ * between 1000 and 15000K. Note that temperatures below 1900 are out of gamut
+ * for some common colorspaces, such as Rec709.
+ * 
+ *  @param temperature The blackbody temperature in Kelvin.
+ *  @param luminosity The luminosity.
+ *  @return An Yxy coordinate.
+ */
+NCAPI NcYxy NcKelvinToYxy(float temperature, float luminosity);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* PXR_BASE_GF_NC_NANOCOLOR_H */
diff --git a/pxr/base/gf/numericCast.h b/pxr/base/gf/numericCast.h
index 342f9966cc..73a1639995 100644
--- a/pxr/base/gf/numericCast.h
+++ b/pxr/base/gf/numericCast.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_NUMERIC_CAST_H
 #define PXR_BASE_GF_NUMERIC_CAST_H
diff --git a/pxr/base/gf/ostreamHelpers.cpp b/pxr/base/gf/ostreamHelpers.cpp
index 02e5fcee82..f698149c9d 100644
--- a/pxr/base/gf/ostreamHelpers.cpp
+++ b/pxr/base/gf/ostreamHelpers.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/gf/ostreamHelpers.h"
diff --git a/pxr/base/gf/ostreamHelpers.h b/pxr/base/gf/ostreamHelpers.h
index f4add102e5..4f6eab710c 100644
--- a/pxr/base/gf/ostreamHelpers.h
+++ b/pxr/base/gf/ostreamHelpers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_OSTREAM_HELPERS_H
 #define PXR_BASE_GF_OSTREAM_HELPERS_H
diff --git a/pxr/base/gf/pch.h b/pxr/base/gf/pch.h
index 13f35f9775..39161e8bd4 100644
--- a/pxr/base/gf/pch.h
+++ b/pxr/base/gf/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -28,16 +11,12 @@
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
-#if defined(ARCH_OS_WINDOWS)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <assert.h>
 #include <atomic>
 #include <cfloat>
@@ -46,13 +25,12 @@
 #include <cstdarg>
 #include <cstddef>
 #include <cstdint>
-#include <cstdlib>
 #include <cstring>
 #include <deque>
 #include <float.h>
 #include <functional>
-#include <initializer_list>
 #include <iosfwd>
+#include <iostream>
 #include <istream>
 #include <iterator>
 #include <limits>
@@ -61,13 +39,11 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
 #include <type_traits>
@@ -77,28 +53,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/args.hpp>
 #include <boost/python/class.hpp>
@@ -137,14 +91,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility/enable_if.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/base/gf/plane.cpp b/pxr/base/gf/plane.cpp
index 8a22040613..a42cc61123 100644
--- a/pxr/base/gf/plane.cpp
+++ b/pxr/base/gf/plane.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/plane.h b/pxr/base/gf/plane.h
index f4df8796e4..b1cc633ead 100644
--- a/pxr/base/gf/plane.h
+++ b/pxr/base/gf/plane.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_PLANE_H
 #define PXR_BASE_GF_PLANE_H
diff --git a/pxr/base/gf/pyBufferUtils.cpp b/pxr/base/gf/pyBufferUtils.cpp
index 96dc56a252..ded3de4229 100644
--- a/pxr/base/gf/pyBufferUtils.cpp
+++ b/pxr/base/gf/pyBufferUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/pyBufferUtils.h b/pxr/base/gf/pyBufferUtils.h
index 73a6ac1482..e74aeba88c 100644
--- a/pxr/base/gf/pyBufferUtils.h
+++ b/pxr/base/gf/pyBufferUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_PY_BUFFER_UTILS_H
 #define PXR_BASE_GF_PY_BUFFER_UTILS_H
diff --git a/pxr/base/gf/quat.template.cpp b/pxr/base/gf/quat.template.cpp
index eb77d14a92..c7425d8665 100644
--- a/pxr/base/gf/quat.template.cpp
+++ b/pxr/base/gf/quat.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/quat.template.h b/pxr/base/gf/quat.template.h
index 658e53697a..7fcfec554d 100644
--- a/pxr/base/gf/quat.template.h
+++ b/pxr/base/gf/quat.template.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/quatd.cpp b/pxr/base/gf/quatd.cpp
index 10444378b2..4801cb0608 100644
--- a/pxr/base/gf/quatd.cpp
+++ b/pxr/base/gf/quatd.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/quatd.h b/pxr/base/gf/quatd.h
index b28e0444fc..a1793fcba1 100644
--- a/pxr/base/gf/quatd.h
+++ b/pxr/base/gf/quatd.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/quaternion.cpp b/pxr/base/gf/quaternion.cpp
index ccbff0a9da..c80a62b70d 100644
--- a/pxr/base/gf/quaternion.cpp
+++ b/pxr/base/gf/quaternion.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/quaternion.h b/pxr/base/gf/quaternion.h
index 01fa3a9d29..2bcc6e3360 100644
--- a/pxr/base/gf/quaternion.h
+++ b/pxr/base/gf/quaternion.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_QUATERNION_H
 #define PXR_BASE_GF_QUATERNION_H
diff --git a/pxr/base/gf/quatf.cpp b/pxr/base/gf/quatf.cpp
index c84d472aa3..aabd71b7c8 100644
--- a/pxr/base/gf/quatf.cpp
+++ b/pxr/base/gf/quatf.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/quatf.h b/pxr/base/gf/quatf.h
index 1042be388a..054e39d591 100644
--- a/pxr/base/gf/quatf.h
+++ b/pxr/base/gf/quatf.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/quath.cpp b/pxr/base/gf/quath.cpp
index ac1a561ead..0a05a402ee 100644
--- a/pxr/base/gf/quath.cpp
+++ b/pxr/base/gf/quath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/quath.h b/pxr/base/gf/quath.h
index 6addda91c9..03c633e49c 100644
--- a/pxr/base/gf/quath.h
+++ b/pxr/base/gf/quath.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range.template.cpp b/pxr/base/gf/range.template.cpp
index a7cf48ad56..8c781be071 100644
--- a/pxr/base/gf/range.template.cpp
+++ b/pxr/base/gf/range.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range.template.h b/pxr/base/gf/range.template.h
index 8f1adaef42..ddea13e8f8 100644
--- a/pxr/base/gf/range.template.h
+++ b/pxr/base/gf/range.template.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range1d.cpp b/pxr/base/gf/range1d.cpp
index e6ede16dc0..b34dc2f46d 100644
--- a/pxr/base/gf/range1d.cpp
+++ b/pxr/base/gf/range1d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range1d.h b/pxr/base/gf/range1d.h
index d80fddaca2..b7c76363cb 100644
--- a/pxr/base/gf/range1d.h
+++ b/pxr/base/gf/range1d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range1f.cpp b/pxr/base/gf/range1f.cpp
index b2064dc85c..7e1144892d 100644
--- a/pxr/base/gf/range1f.cpp
+++ b/pxr/base/gf/range1f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range1f.h b/pxr/base/gf/range1f.h
index 007c405df3..1273bc9625 100644
--- a/pxr/base/gf/range1f.h
+++ b/pxr/base/gf/range1f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range2d.cpp b/pxr/base/gf/range2d.cpp
index 9980a74cf3..ab8a04f6e7 100644
--- a/pxr/base/gf/range2d.cpp
+++ b/pxr/base/gf/range2d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range2d.h b/pxr/base/gf/range2d.h
index cd6f6899c9..8da621de7f 100644
--- a/pxr/base/gf/range2d.h
+++ b/pxr/base/gf/range2d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range2f.cpp b/pxr/base/gf/range2f.cpp
index e3de2ba29a..522bea5522 100644
--- a/pxr/base/gf/range2f.cpp
+++ b/pxr/base/gf/range2f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range2f.h b/pxr/base/gf/range2f.h
index dc8326b0b7..9a36daf7fc 100644
--- a/pxr/base/gf/range2f.h
+++ b/pxr/base/gf/range2f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range3d.cpp b/pxr/base/gf/range3d.cpp
index 60aca67560..755a8206e8 100644
--- a/pxr/base/gf/range3d.cpp
+++ b/pxr/base/gf/range3d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range3d.h b/pxr/base/gf/range3d.h
index 9c0fa55d98..c808534a71 100644
--- a/pxr/base/gf/range3d.h
+++ b/pxr/base/gf/range3d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range3f.cpp b/pxr/base/gf/range3f.cpp
index 425ef94e1b..49757cd42d 100644
--- a/pxr/base/gf/range3f.cpp
+++ b/pxr/base/gf/range3f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/range3f.h b/pxr/base/gf/range3f.h
index 6a206f610b..668c43a9b5 100644
--- a/pxr/base/gf/range3f.h
+++ b/pxr/base/gf/range3f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/ray.cpp b/pxr/base/gf/ray.cpp
index 305a87865e..a843fc88d9 100644
--- a/pxr/base/gf/ray.cpp
+++ b/pxr/base/gf/ray.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/ray.h b/pxr/base/gf/ray.h
index 1af8820862..1fa64119bc 100644
--- a/pxr/base/gf/ray.h
+++ b/pxr/base/gf/ray.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_RAY_H
 #define PXR_BASE_GF_RAY_H
diff --git a/pxr/base/gf/rect2i.cpp b/pxr/base/gf/rect2i.cpp
index 00faeb39a3..c63b6bb9a7 100644
--- a/pxr/base/gf/rect2i.cpp
+++ b/pxr/base/gf/rect2i.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/rect2i.h b/pxr/base/gf/rect2i.h
index 2bcfa5efeb..a8939c6e89 100644
--- a/pxr/base/gf/rect2i.h
+++ b/pxr/base/gf/rect2i.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_RECT2I_H
 #define PXR_BASE_GF_RECT2I_H
diff --git a/pxr/base/gf/rotation.cpp b/pxr/base/gf/rotation.cpp
index d7e9969393..1816e18a21 100644
--- a/pxr/base/gf/rotation.cpp
+++ b/pxr/base/gf/rotation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/rotation.h b/pxr/base/gf/rotation.h
index de9204b9c9..8aef944a7b 100644
--- a/pxr/base/gf/rotation.h
+++ b/pxr/base/gf/rotation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_ROTATION_H
 #define PXR_BASE_GF_ROTATION_H
@@ -211,6 +194,11 @@ class GfRotation {
         double *thetaTw, double *thetaFB, double *thetaLR, double *thetaSw);
 
     /// Transforms row vector \p vec by the rotation, returning the result. 
+    ///
+    /// \deprecated
+    /// This method is deprecated, as it can result in unintentional loss of
+    /// precision. Call GfVec3d TransformDir(const GfVec3d &) instead and
+    /// explicitly convert the result to GfVec3f, if necessary.
     GF_API
     GfVec3f TransformDir( const GfVec3f &vec ) const;
 
diff --git a/pxr/base/gf/size2.cpp b/pxr/base/gf/size2.cpp
index 4d0ea59771..19f095774e 100644
--- a/pxr/base/gf/size2.cpp
+++ b/pxr/base/gf/size2.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/size2.h b/pxr/base/gf/size2.h
index b6bc79a270..9a0ce4076a 100644
--- a/pxr/base/gf/size2.h
+++ b/pxr/base/gf/size2.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_SIZE2_H
 #define PXR_BASE_GF_SIZE2_H
diff --git a/pxr/base/gf/size3.cpp b/pxr/base/gf/size3.cpp
index bec7ccbdea..1bae2aeeaf 100644
--- a/pxr/base/gf/size3.cpp
+++ b/pxr/base/gf/size3.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/size3.h b/pxr/base/gf/size3.h
index 33545e43ff..797afe57d4 100644
--- a/pxr/base/gf/size3.h
+++ b/pxr/base/gf/size3.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_SIZE3_H
 #define PXR_BASE_GF_SIZE3_H
diff --git a/pxr/base/gf/testenv/testGfBBox3d.py b/pxr/base/gf/testenv/testGfBBox3d.py
index 7a56d2fc76..e6040e39d3 100644
--- a/pxr/base/gf/testenv/testGfBBox3d.py
+++ b/pxr/base/gf/testenv/testGfBBox3d.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfCamera.py b/pxr/base/gf/testenv/testGfCamera.py
index 770d908e06..92bb523dba 100644
--- a/pxr/base/gf/testenv/testGfCamera.py
+++ b/pxr/base/gf/testenv/testGfCamera.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 from pxr import Gf
diff --git a/pxr/base/gf/testenv/testGfColor.cpp b/pxr/base/gf/testenv/testGfColor.cpp
new file mode 100644
index 0000000000..dde038c324
--- /dev/null
+++ b/pxr/base/gf/testenv/testGfColor.cpp
@@ -0,0 +1,363 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/base/gf/color.h"
+#include "pxr/base/gf/colorSpace.h"
+#include "pxr/base/tf/diagnostic.h"
+#include "../nc/nanocolor.h"
+#include "../colorSpace_data.h"
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+class GfColorTest : public GfColor {
+public:
+    // wrap the constructors
+    GfColorTest() : GfColor() {}
+    GfColorTest(const GfColorSpace& colorSpace) : GfColor(colorSpace) {}
+    GfColorTest(const GfVec3f &rgb, const GfColorSpace& colorSpace) 
+        : GfColor(rgb, colorSpace) {}
+    GfColorTest(const GfColor& srcColor, const GfColorSpace& dstColorSpace) 
+        : GfColor(srcColor, dstColorSpace) {}
+    GfColorTest(const GfColor& srcColor) : GfColor(srcColor) {}
+
+    // Get the CIEXY coordinate of the color in the chromaticity chart.
+    GfVec2f GetChromaticity() const {
+        return _GetChromaticity();
+    }
+
+    // Set the color from a CIEXY coordinate in the chromaticity chart.
+    void SetFromChromaticity(const GfVec2f& xy) {
+        _SetFromChromaticity(xy);
+    }
+
+};
+
+
+bool ColorApproxEq(const GfColorTest& c1, const GfColorTest& c2)
+{
+    return GfIsClose(c1.GetRGB(), c2.GetRGB(), 1e-5f);
+}
+
+// Calculate barycentric coordinates of a point p with respect to a triangle formed by vertices v0, v1, and v2
+bool PointInTriangle(const GfVec2f& p, const GfVec2f& v0, const GfVec2f& v1, const GfVec2f& v2) {
+    GfVec2f v0v1 = v1 - v0;
+    GfVec2f v0v2 = v2 - v0;
+    GfVec2f vp = p - v0;
+
+    float dot00 = GfDot(v0v1, v0v1);
+    float dot01 = GfDot(v0v1, v0v2);
+    float dot02 = GfDot(v0v1, vp);
+    float dot11 = GfDot(v0v2, v0v2);
+    float dot12 = GfDot(v0v2, vp);
+
+    // Compute barycentric coordinates
+    float invDenom = 1.0f / (dot00 * dot11 - dot01 * dot01);
+    float u = (dot11 * dot02 - dot01 * dot12) * invDenom;
+    float v = (dot00 * dot12 - dot01 * dot02) * invDenom;
+
+    // Check if point p is inside the triangle
+    return (u >= 0) && (v >= 0) && (u + v <= 1);
+}
+
+/*
+    Note that by necessity, GfColor & GfColorSpace are tested together.
+ */
+
+int
+main(int argc, char *argv[])
+{
+    GfColorSpace csSRGB(GfColorSpaceNames->SRGB);
+    GfColorSpace csLinearSRGB(GfColorSpaceNames->LinearSRGB);
+    GfColorSpace csLinearRec709(GfColorSpaceNames->LinearRec709);
+    GfColorSpace csG22Rec709(GfColorSpaceNames->G22Rec709);
+    GfColorSpace csAp0(GfColorSpaceNames->LinearAP0);
+    GfColorSpace csSRGBP3(GfColorSpaceNames->SRGBDisplayP3);
+    GfColorSpace csLinearRec2020(GfColorSpaceNames->LinearRec2020);
+    GfColorSpace csIdentity(GfColorSpaceNames->Identity);
+
+    GfColor mauveLinear(GfVec3f(0.5f, 0.25f, 0.125f), csLinearRec709);
+    GfColor mauveGamma(mauveLinear, csG22Rec709);
+
+    GfVec2f cr_baseline_linear = GfColorTest(mauveLinear).GetChromaticity();
+    GfVec2f cr_baseline_curve = GfColorTest(mauveGamma).GetChromaticity();
+    GfVec2f wpD65xy = GfColorTest(GfVec3f(1.0f, 1.0f, 1.0f), csLinearRec709).GetChromaticity();
+
+    GfVec2f ap0Primaries[3] = {
+        { 0.7347, 0.2653  },
+        { 0.0000, 1.0000  },
+        { 0.0001, -0.0770 },
+    };
+    GfVec2f rec2020Primaries[3] = {
+        { 0.708, 0.292 },
+        { 0.170, 0.797 },
+        { 0.131, 0.046 },
+    };
+    GfVec2f rec709Primaries[3] = {
+        { 0.640, 0.330 },
+        { 0.300, 0.600 },
+        { 0.150, 0.060 },
+    };
+
+    // test default construction
+    {
+        GfColor c;
+        TF_AXIOM(c.GetColorSpace() == csLinearRec709);
+        TF_AXIOM(c.GetRGB() == GfVec3f(0, 0, 0));
+    }
+    // test copy construction
+    {
+        GfColor c(GfVec3f(0.5f, 0.5f, 0.5f), csSRGB);
+        GfColor c2(c);
+        TF_AXIOM(c2.GetColorSpace() == csSRGB);
+        TF_AXIOM(c2.GetRGB() == GfVec3f(0.5f, 0.5f, 0.5f));
+    }
+    // test construction with color space
+    {
+        GfColor c(csSRGB);
+        TF_AXIOM(c.GetColorSpace() == csSRGB);
+        TF_AXIOM(c.GetRGB() == GfVec3f(0, 0, 0));
+    }
+    // test construction with color space and RGB
+    {
+        GfColor c(GfVec3f(0.5f, 0.5f, 0.5f), csSRGB);
+        TF_AXIOM(c.GetColorSpace() == csSRGB);
+        TF_AXIOM(c.GetRGB() == GfVec3f(0.5f, 0.5f, 0.5f));
+    }
+    {
+        // test that a EOTF curve <-> Linear works
+        GfColor c1(mauveLinear, csSRGB);    // convert linear to SRGB
+        GfColor c2(c1, csLinearSRGB);
+        TF_AXIOM(GfIsClose(mauveLinear, c2, 1e-6f));
+        GfColor c3(c2, csSRGB);
+        TF_AXIOM(GfIsClose(c1, c3, 1e-7f));
+    }
+    {
+        // test round tripping to Rec2020
+        GfColor c1(mauveLinear, csLinearRec2020);
+        GfColor c2(c1, csLinearSRGB);
+        TF_AXIOM(GfIsClose(mauveLinear, c2, 1e-7f));
+    }
+    // test CIE XY equality, and thus also GetChromaticity
+    {
+        // MauveLinear and Gamma are both have a D65 white point.
+        GfColorTest col_SRGB(mauveLinear, csSRGB);
+        GfColorTest col_ap0(col_SRGB, csAp0);                      // different white point
+        GfColorTest col_SRGBP3(col_ap0, csSRGBP3);                // adapt to d65 for comparison
+        GfColorTest col_SRGB_2(col_ap0, csSRGB);
+        GfColorTest col_SRGB_3(col_SRGBP3, csSRGB);
+
+        GfVec2f cr_SRGB = col_SRGB.GetChromaticity();
+        GfVec2f cr_SRGB_2 = col_SRGB_2.GetChromaticity();
+        GfVec2f cr_SRGB_3 = col_SRGB_3.GetChromaticity();
+
+        TF_AXIOM(GfIsClose(cr_baseline_linear, cr_baseline_curve, 1e-5f));
+        TF_AXIOM(GfIsClose(cr_baseline_linear, cr_SRGB, 1e-5f));
+        TF_AXIOM(GfIsClose(cr_SRGB_2, cr_SRGB_3, 2e-2f));
+        TF_AXIOM(GfIsClose(cr_baseline_linear, cr_SRGB_2, 5e-2f));
+        TF_AXIOM(GfIsClose(cr_baseline_linear, cr_SRGB_3, 2e-2f));
+    }
+    // test construction with conversion
+    {
+        //print out all the values as we go and report to Rick
+
+        GfColorTest colG22Rec709(mauveLinear, csG22Rec709);
+        TF_AXIOM(GfIsClose(colG22Rec709, mauveGamma, 1e-5f));
+        GfColorTest colLinRec709(colG22Rec709, csLinearRec709);
+        TF_AXIOM(GfIsClose(colLinRec709, mauveLinear, 1e-5f));
+
+        // verify assignment didn't mutate cs
+        TF_AXIOM(colG22Rec709.GetColorSpace() == csG22Rec709);
+
+        TF_AXIOM(colLinRec709.GetColorSpace() == csLinearRec709);
+        GfColorTest colSRGB_2(colLinRec709, csSRGB);
+        GfVec2f xy1 = colG22Rec709.GetChromaticity();
+        GfVec2f xy2 = colSRGB_2.GetChromaticity();
+        TF_AXIOM(GfIsClose(xy1, xy2, 1e-5f));
+        GfColorTest colAp0(colSRGB_2, csAp0);
+        GfVec2f xy3 = colAp0.GetChromaticity();
+        TF_AXIOM(GfIsClose(xy1, xy3, 3e-2f));
+        GfColorTest colSRGB_3(colAp0, csSRGB);
+        GfVec2f xy4 = colAp0.GetChromaticity();
+        TF_AXIOM(GfIsClose(xy1, xy4, 3e-2f));
+        GfColorTest col_SRGBP3(colSRGB_3, csSRGBP3);
+        GfVec2f xy5 = col_SRGBP3.GetChromaticity();
+        TF_AXIOM(GfIsClose(xy1, xy5, 3e-2f));
+
+        // all the way back to rec709
+        GfColorTest colLinRec709_2(col_SRGBP3, csLinearRec709);
+        TF_AXIOM(GfIsClose(colLinRec709_2, colLinRec709, 1e-5f));
+    }
+    // test move constructor
+    {
+        GfColor c1(GfVec3f(0.5f, 0.25f, 0.125f), csAp0);
+        GfColor c2(std::move(c1));
+        GfColorSpace c1cs = c1.GetColorSpace();
+        TF_AXIOM(c2.GetColorSpace() == csAp0);
+        TF_AXIOM(GfIsClose(c2.GetRGB(), GfVec3f(0.5f, 0.25f, 0.125f), 1e-5f));
+    }
+    // test copy assignment
+    {
+        GfColor c1(GfVec3f(0.5f, 0.25f, 0.125f), csSRGB);
+        GfColor c2 = c1;
+        TF_AXIOM(GfIsClose(c1, c2, 1e-5f));
+        TF_AXIOM(c1.GetColorSpace() == c2.GetColorSpace());
+
+        // move assignment, overwriting existing values
+        GfColor c3(GfVec3f(0.5f, 0.25f, 0.125f), csAp0);
+        GfColor c4(GfVec3f(0.25f, 0.5f, 0.125f), csSRGB);
+        c3 = std::move(c4);
+        TF_AXIOM(GfIsClose(c3.GetRGB(), GfVec3f(0.25f, 0.5f, 0.125f), 1e-5f));
+        TF_AXIOM(c3.GetColorSpace() == csSRGB);
+    }
+    // test color space inequality
+    {
+        TF_AXIOM(csSRGB != csLinearSRGB);
+        TF_AXIOM(csSRGB != csLinearRec709);
+        TF_AXIOM(csSRGB != csG22Rec709);
+        TF_AXIOM(csSRGB != csAp0);
+        TF_AXIOM(csSRGB != csSRGBP3);
+        TF_AXIOM(csSRGB != csLinearRec2020);
+    }
+    // test that constructing from Kelvin at 6504 is in the near vicinity of
+    // the chromaticity of D65, even though spectrally, they are unrelated.
+    // nb. 6504 is the CCT match to D65
+    {
+        GfColorTest c;
+        c.SetFromPlanckianLocus(6504, 1.0f);
+        GfVec2f xy = c.GetChromaticity();
+        TF_AXIOM(GfIsClose(xy, wpD65xy, 1e-2f));
+    }
+    // test that primaries correspond to unit vectors in their color space
+    {
+        GfColorTest c1(csAp0);
+        c1.SetFromChromaticity(ap0Primaries[0]);
+        GfColorTest c2(csAp0);
+        c2.SetFromChromaticity(ap0Primaries[1]);
+        GfColorTest c3(csAp0);
+        c3.SetFromChromaticity(ap0Primaries[2]);
+        TF_AXIOM(GfIsClose(c1, GfColorTest(GfVec3f(1, 0, 0), csAp0), 1e-5f));
+        TF_AXIOM(GfIsClose(c2, GfColorTest(GfVec3f(0, 1, 0), csAp0), 1e-5f));
+        TF_AXIOM(GfIsClose(c3, GfColorTest(GfVec3f(0, 0, 1), csAp0), 1e-5f));
+
+        GfColorTest c4(csLinearRec2020);
+        c4.SetFromChromaticity(rec2020Primaries[0]);
+        GfColorTest c5(csLinearRec2020);
+        c5.SetFromChromaticity(rec2020Primaries[1]);
+        GfColorTest c6(csLinearRec2020);
+        c6.SetFromChromaticity(rec2020Primaries[2]);
+        TF_AXIOM(GfIsClose(c4, GfColorTest(GfVec3f(1, 0, 0), csLinearRec2020), 1e-5f));
+        TF_AXIOM(GfIsClose(c5, GfColorTest(GfVec3f(0, 1, 0), csLinearRec2020), 1e-5f));
+        TF_AXIOM(GfIsClose(c6, GfColorTest(GfVec3f(0, 0, 1), csLinearRec2020), 1e-5f));
+
+        GfColorTest c7(csLinearRec709);
+        c7.SetFromChromaticity(rec709Primaries[0]);
+        GfColorTest c8(csLinearRec709);
+        c8.SetFromChromaticity(rec709Primaries[1]);
+        GfColorTest c9(csLinearRec709);
+        c9.SetFromChromaticity(rec709Primaries[2]);
+        TF_AXIOM(GfIsClose(c7, GfColorTest(GfVec3f(1, 0, 0), csLinearRec709), 1e-5f));
+        TF_AXIOM(GfIsClose(c8, GfColorTest(GfVec3f(0, 1, 0), csLinearRec709), 1e-5f));
+        TF_AXIOM(GfIsClose(c9, GfColorTest(GfVec3f(0, 0, 1), csLinearRec709), 1e-5f));
+    }
+
+    // permute the rec709 primaries through rec2020 and ap0
+    // and verify that at each point the converted colors are contained
+    // within the gamut of the target color space by testing that the
+    // converted color is within the triangle formed by the target color
+    // space's primaries
+    {
+        // Create converted colors
+        GfColorTest red709(GfVec3f(1.0f, 0.0f, 0.0f), csLinearRec709);
+        GfColorTest green709(GfVec3f(0.0f, 1.0f, 0.0f), csLinearRec709);
+        GfColorTest blue709(GfVec3f(0.0f, 0.0f, 1.0f), csLinearRec709);
+        GfColorTest red2020(GfVec3f(1.0f, 0.0f, 0.0f), csLinearRec2020);
+        GfColorTest green2020(GfVec3f(0.0f, 1.0f, 0.0f), csLinearRec2020);
+        GfColorTest blue2020(GfVec3f(0.0f, 0.0f, 1.0f), csLinearRec2020);
+        GfColorTest redAp0(GfVec3f(1.0f, 0.0f, 0.0f), csAp0);
+        GfColorTest greenAp0(GfVec3f(0.0f, 1.0f, 0.0f), csAp0);
+        GfColorTest blueAp0(GfVec3f(0.0f, 0.0f, 1.0f), csAp0);
+
+        // Verify that converted 709 colors are within rec2020 gamut
+        TF_AXIOM(PointInTriangle(red709.GetChromaticity(),
+                                 red2020.GetChromaticity(), 
+                                 green2020.GetChromaticity(),
+                                 blue2020.GetChromaticity()));
+        TF_AXIOM(PointInTriangle(green709.GetChromaticity(),
+                                 red2020.GetChromaticity(), 
+                                 green2020.GetChromaticity(),
+                                 blue2020.GetChromaticity()));
+        TF_AXIOM(PointInTriangle(blue709.GetChromaticity(),
+                                 red2020.GetChromaticity(), 
+                                 green2020.GetChromaticity(),
+                                 blue2020.GetChromaticity()));
+
+        // Verify that converted 709 colors are within ap0 gamut
+        TF_AXIOM(PointInTriangle(red709.GetChromaticity(),
+                                 redAp0.GetChromaticity(), 
+                                 greenAp0.GetChromaticity(),
+                                 blueAp0.GetChromaticity()));
+        TF_AXIOM(PointInTriangle(green709.GetChromaticity(),
+                                 redAp0.GetChromaticity(), 
+                                 greenAp0.GetChromaticity(),
+                                 blueAp0.GetChromaticity()));
+        TF_AXIOM(PointInTriangle(blue709.GetChromaticity(),
+                                 redAp0.GetChromaticity(), 
+                                 greenAp0.GetChromaticity(),
+                                 blueAp0.GetChromaticity()));
+
+        // Verify that converted rec2020 colors are within ap0 gamut
+        TF_AXIOM(PointInTriangle(red2020.GetChromaticity(),
+                                 redAp0.GetChromaticity(), 
+                                 greenAp0.GetChromaticity(),
+                                 blueAp0.GetChromaticity()));
+        TF_AXIOM(PointInTriangle(green2020.GetChromaticity(),
+                                 redAp0.GetChromaticity(), 
+                                 greenAp0.GetChromaticity(),
+                                 blueAp0.GetChromaticity()));
+        TF_AXIOM(PointInTriangle(blue2020.GetChromaticity(),
+                                 redAp0.GetChromaticity(), 
+                                 greenAp0.GetChromaticity(),
+                                 blueAp0.GetChromaticity()));
+    }
+
+    // Test Kelvin to Yxy conversion for values that are 1000K apart from
+    // 1000 to 15000 Kelvin
+    {
+        GfVec2f tableOfKnownValues[] = {
+            { 0.6530877f, 0.3446811f },
+            { 0.5266493f, 0.4133117f },
+            { 0.4370493f, 0.4043753f },
+            { 0.3804111f, 0.3765993f },
+            { 0.3450407f, 0.3512992f },
+            { 0.3220662f, 0.3315561f },
+            { 0.3064031f, 0.3165002f },
+            { 0.2952405f, 0.3049043f },
+            { 0.2869792f, 0.2958082f },
+            { 0.2806694f, 0.2885335f },
+            { 0.2757214f, 0.2826093f },
+            { 0.2717545f, 0.2777060f },
+            { 0.2685138f, 0.2735892f },
+            { 0.2658236f, 0.2700888f },
+            { 0.2635591f, 0.2670793f },
+        };
+        // test against known values. Although the approximation returns
+        // values between 1000 and 2000, they are slightly divergent from
+        // canonical values.
+        for (int kelvin = 1000; kelvin <= 15000; kelvin += 1000) {
+            GfColorTest c(csIdentity);
+            c.SetFromPlanckianLocus(kelvin, 1.0f);
+            GfVec2f xy = c.GetChromaticity();
+            int index = (kelvin - 1000) / 1000;
+            GfVec2f known = tableOfKnownValues[index];
+            TF_AXIOM(GfIsClose(xy, known, 1e-3f));
+        }
+    }
+
+    printf("OK\n");
+    return 0;
+}
diff --git a/pxr/base/gf/testenv/testGfDecomposeRotation.py b/pxr/base/gf/testenv/testGfDecomposeRotation.py
index 12139725a2..daf44381e0 100644
--- a/pxr/base/gf/testenv/testGfDecomposeRotation.py
+++ b/pxr/base/gf/testenv/testGfDecomposeRotation.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # pylint: disable=range-builtin-not-iterating
 #
diff --git a/pxr/base/gf/testenv/testGfDualQuaternion.py b/pxr/base/gf/testenv/testGfDualQuaternion.py
index 4b4f19827c..6a40495944 100644
--- a/pxr/base/gf/testenv/testGfDualQuaternion.py
+++ b/pxr/base/gf/testenv/testGfDualQuaternion.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfFrustum.py b/pxr/base/gf/testenv/testGfFrustum.py
index 2a49843908..1a85ef374e 100644
--- a/pxr/base/gf/testenv/testGfFrustum.py
+++ b/pxr/base/gf/testenv/testGfFrustum.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfGamma.py b/pxr/base/gf/testenv/testGfGamma.py
index e632403b45..21fe25a6a2 100644
--- a/pxr/base/gf/testenv/testGfGamma.py
+++ b/pxr/base/gf/testenv/testGfGamma.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 from pxr import Gf
diff --git a/pxr/base/gf/testenv/testGfHardToReach.cpp b/pxr/base/gf/testenv/testGfHardToReach.cpp
index 9aa3080216..d2e1c91003 100644
--- a/pxr/base/gf/testenv/testGfHardToReach.cpp
+++ b/pxr/base/gf/testenv/testGfHardToReach.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/testenv/testGfHomogeneous.py b/pxr/base/gf/testenv/testGfHomogeneous.py
index 0c794553bb..422269eb57 100644
--- a/pxr/base/gf/testenv/testGfHomogeneous.py
+++ b/pxr/base/gf/testenv/testGfHomogeneous.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfInterval.py b/pxr/base/gf/testenv/testGfInterval.py
index dedb4d7367..3befc3fdd9 100644
--- a/pxr/base/gf/testenv/testGfInterval.py
+++ b/pxr/base/gf/testenv/testGfInterval.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfLine.py b/pxr/base/gf/testenv/testGfLine.py
index 7480ffb4be..742ff76e27 100644
--- a/pxr/base/gf/testenv/testGfLine.py
+++ b/pxr/base/gf/testenv/testGfLine.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfLineSeg.py b/pxr/base/gf/testenv/testGfLineSeg.py
index 24290e5f35..693d37aeb0 100644
--- a/pxr/base/gf/testenv/testGfLineSeg.py
+++ b/pxr/base/gf/testenv/testGfLineSeg.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfMath.py b/pxr/base/gf/testenv/testGfMath.py
index 08f57bc44d..b3cc13bfc5 100644
--- a/pxr/base/gf/testenv/testGfMath.py
+++ b/pxr/base/gf/testenv/testGfMath.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfMatrix.py b/pxr/base/gf/testenv/testGfMatrix.py
index 3d3b050f58..d9806419ba 100644
--- a/pxr/base/gf/testenv/testGfMatrix.py
+++ b/pxr/base/gf/testenv/testGfMatrix.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 from __future__ import division
diff --git a/pxr/base/gf/testenv/testGfMultiInterval.py b/pxr/base/gf/testenv/testGfMultiInterval.py
index 01c0f9823d..5f9f089107 100644
--- a/pxr/base/gf/testenv/testGfMultiInterval.py
+++ b/pxr/base/gf/testenv/testGfMultiInterval.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # pylint: disable=range-builtin-not-iterating
 #
diff --git a/pxr/base/gf/testenv/testGfPlane.py b/pxr/base/gf/testenv/testGfPlane.py
index 14663e4b76..6e4eb537a8 100644
--- a/pxr/base/gf/testenv/testGfPlane.py
+++ b/pxr/base/gf/testenv/testGfPlane.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfQuaternion.py b/pxr/base/gf/testenv/testGfQuaternion.py
index 20f9cc0fc7..fa683a5e99 100644
--- a/pxr/base/gf/testenv/testGfQuaternion.py
+++ b/pxr/base/gf/testenv/testGfQuaternion.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfRange.py b/pxr/base/gf/testenv/testGfRange.py
index 17748d9b77..050af94d10 100644
--- a/pxr/base/gf/testenv/testGfRange.py
+++ b/pxr/base/gf/testenv/testGfRange.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/base/gf/testenv/testGfRay.py b/pxr/base/gf/testenv/testGfRay.py
index e581b01808..55e452cf6e 100644
--- a/pxr/base/gf/testenv/testGfRay.py
+++ b/pxr/base/gf/testenv/testGfRay.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfRect2i.py b/pxr/base/gf/testenv/testGfRect2i.py
index 18fd9cbbf8..be1c64f5fe 100644
--- a/pxr/base/gf/testenv/testGfRect2i.py
+++ b/pxr/base/gf/testenv/testGfRect2i.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfRotation.py b/pxr/base/gf/testenv/testGfRotation.py
index 52ac9e7876..6d35eb2b78 100644
--- a/pxr/base/gf/testenv/testGfRotation.py
+++ b/pxr/base/gf/testenv/testGfRotation.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfSize.py b/pxr/base/gf/testenv/testGfSize.py
index d9a2ba1677..937bd67ecb 100644
--- a/pxr/base/gf/testenv/testGfSize.py
+++ b/pxr/base/gf/testenv/testGfSize.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfTransform.py b/pxr/base/gf/testenv/testGfTransform.py
index 5f6d4ee108..be783e1864 100644
--- a/pxr/base/gf/testenv/testGfTransform.py
+++ b/pxr/base/gf/testenv/testGfTransform.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/testenv/testGfVec.py b/pxr/base/gf/testenv/testGfVec.py
index da7bf15df3..76a31fc77b 100644
--- a/pxr/base/gf/testenv/testGfVec.py
+++ b/pxr/base/gf/testenv/testGfVec.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import division
 
diff --git a/pxr/base/gf/traits.h b/pxr/base/gf/traits.h
index 27c59c0ce0..5b1ab216ff 100644
--- a/pxr/base/gf/traits.h
+++ b/pxr/base/gf/traits.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_TRAITS_H
 #define PXR_BASE_GF_TRAITS_H
diff --git a/pxr/base/gf/transform.cpp b/pxr/base/gf/transform.cpp
index 9fd293b77c..713c528aed 100644
--- a/pxr/base/gf/transform.cpp
+++ b/pxr/base/gf/transform.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/transform.h b/pxr/base/gf/transform.h
index 7e43973d13..7475ecc614 100644
--- a/pxr/base/gf/transform.h
+++ b/pxr/base/gf/transform.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_GF_TRANSFORM_H
 #define PXR_BASE_GF_TRANSFORM_H
diff --git a/pxr/base/gf/vec.template.cpp b/pxr/base/gf/vec.template.cpp
index 20e22db5ed..5b2e266619 100644
--- a/pxr/base/gf/vec.template.cpp
+++ b/pxr/base/gf/vec.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec.template.h b/pxr/base/gf/vec.template.h
index 10361af854..6bec06303d 100644
--- a/pxr/base/gf/vec.template.h
+++ b/pxr/base/gf/vec.template.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec2d.cpp b/pxr/base/gf/vec2d.cpp
index 1de70f902c..11c522ef6f 100644
--- a/pxr/base/gf/vec2d.cpp
+++ b/pxr/base/gf/vec2d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec2d.h b/pxr/base/gf/vec2d.h
index bb28425257..469f100af4 100644
--- a/pxr/base/gf/vec2d.h
+++ b/pxr/base/gf/vec2d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec2f.cpp b/pxr/base/gf/vec2f.cpp
index e55d8a3003..d2e958bcfc 100644
--- a/pxr/base/gf/vec2f.cpp
+++ b/pxr/base/gf/vec2f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec2f.h b/pxr/base/gf/vec2f.h
index e3c46ebc1e..10496e9d12 100644
--- a/pxr/base/gf/vec2f.h
+++ b/pxr/base/gf/vec2f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec2h.cpp b/pxr/base/gf/vec2h.cpp
index d6a1f41fc4..5b265f5c73 100644
--- a/pxr/base/gf/vec2h.cpp
+++ b/pxr/base/gf/vec2h.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec2h.h b/pxr/base/gf/vec2h.h
index fd284f5c9d..17a00fc92b 100644
--- a/pxr/base/gf/vec2h.h
+++ b/pxr/base/gf/vec2h.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec2i.cpp b/pxr/base/gf/vec2i.cpp
index a23ca5725c..63cb136c74 100644
--- a/pxr/base/gf/vec2i.cpp
+++ b/pxr/base/gf/vec2i.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec2i.h b/pxr/base/gf/vec2i.h
index 8f4e22bf1d..0a87fefaa2 100644
--- a/pxr/base/gf/vec2i.h
+++ b/pxr/base/gf/vec2i.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec3d.cpp b/pxr/base/gf/vec3d.cpp
index fb9d1422a2..8fdcbef68d 100644
--- a/pxr/base/gf/vec3d.cpp
+++ b/pxr/base/gf/vec3d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec3d.h b/pxr/base/gf/vec3d.h
index ffcf0222b8..586bafabce 100644
--- a/pxr/base/gf/vec3d.h
+++ b/pxr/base/gf/vec3d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec3f.cpp b/pxr/base/gf/vec3f.cpp
index e6cb38655b..3e5cbd8f95 100644
--- a/pxr/base/gf/vec3f.cpp
+++ b/pxr/base/gf/vec3f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec3f.h b/pxr/base/gf/vec3f.h
index c216ce8eba..24b6e8293c 100644
--- a/pxr/base/gf/vec3f.h
+++ b/pxr/base/gf/vec3f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec3h.cpp b/pxr/base/gf/vec3h.cpp
index 13f1d56f08..d0fbb524be 100644
--- a/pxr/base/gf/vec3h.cpp
+++ b/pxr/base/gf/vec3h.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec3h.h b/pxr/base/gf/vec3h.h
index 1f690480db..5e2e0f196d 100644
--- a/pxr/base/gf/vec3h.h
+++ b/pxr/base/gf/vec3h.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec3i.cpp b/pxr/base/gf/vec3i.cpp
index 575bb7de92..0e5b0d6e23 100644
--- a/pxr/base/gf/vec3i.cpp
+++ b/pxr/base/gf/vec3i.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec3i.h b/pxr/base/gf/vec3i.h
index 1a1b5e50e0..b1d1d58aba 100644
--- a/pxr/base/gf/vec3i.h
+++ b/pxr/base/gf/vec3i.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec4d.cpp b/pxr/base/gf/vec4d.cpp
index 068d73e083..a933b6f62a 100644
--- a/pxr/base/gf/vec4d.cpp
+++ b/pxr/base/gf/vec4d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec4d.h b/pxr/base/gf/vec4d.h
index f307ceeff9..b99f4bed9a 100644
--- a/pxr/base/gf/vec4d.h
+++ b/pxr/base/gf/vec4d.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec4f.cpp b/pxr/base/gf/vec4f.cpp
index 82a4daf022..8a562bdd20 100644
--- a/pxr/base/gf/vec4f.cpp
+++ b/pxr/base/gf/vec4f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec4f.h b/pxr/base/gf/vec4f.h
index 0b88bf9896..769351fda6 100644
--- a/pxr/base/gf/vec4f.h
+++ b/pxr/base/gf/vec4f.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec4h.cpp b/pxr/base/gf/vec4h.cpp
index 72ee7ad562..d24b10aac8 100644
--- a/pxr/base/gf/vec4h.cpp
+++ b/pxr/base/gf/vec4h.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec4h.h b/pxr/base/gf/vec4h.h
index 079586533b..e491170c65 100644
--- a/pxr/base/gf/vec4h.h
+++ b/pxr/base/gf/vec4h.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec4i.cpp b/pxr/base/gf/vec4i.cpp
index 4ba5661fa9..3407b3d254 100644
--- a/pxr/base/gf/vec4i.cpp
+++ b/pxr/base/gf/vec4i.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/vec4i.h b/pxr/base/gf/vec4i.h
index 02a80a3b88..f9cae058f8 100644
--- a/pxr/base/gf/vec4i.h
+++ b/pxr/base/gf/vec4i.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapBBox3d.cpp b/pxr/base/gf/wrapBBox3d.cpp
index b70ea776bc..db569010b6 100644
--- a/pxr/base/gf/wrapBBox3d.cpp
+++ b/pxr/base/gf/wrapBBox3d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapCamera.cpp b/pxr/base/gf/wrapCamera.cpp
index 9eb3cd3994..389f70f613 100644
--- a/pxr/base/gf/wrapCamera.cpp
+++ b/pxr/base/gf/wrapCamera.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file gf/wrapCamera.h
diff --git a/pxr/base/gf/wrapDualQuat.template.cpp b/pxr/base/gf/wrapDualQuat.template.cpp
index fb01d6a5e7..6c35de808e 100644
--- a/pxr/base/gf/wrapDualQuat.template.cpp
+++ b/pxr/base/gf/wrapDualQuat.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapDualQuatd.cpp b/pxr/base/gf/wrapDualQuatd.cpp
index 0097708159..df5f59ae74 100644
--- a/pxr/base/gf/wrapDualQuatd.cpp
+++ b/pxr/base/gf/wrapDualQuatd.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapDualQuatf.cpp b/pxr/base/gf/wrapDualQuatf.cpp
index e7da79f8df..c402f8085c 100644
--- a/pxr/base/gf/wrapDualQuatf.cpp
+++ b/pxr/base/gf/wrapDualQuatf.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapDualQuath.cpp b/pxr/base/gf/wrapDualQuath.cpp
index 9274ad34bd..a8a2c24f67 100644
--- a/pxr/base/gf/wrapDualQuath.cpp
+++ b/pxr/base/gf/wrapDualQuath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapFrustum.cpp b/pxr/base/gf/wrapFrustum.cpp
index a19f5ca0be..d01438c9a3 100644
--- a/pxr/base/gf/wrapFrustum.cpp
+++ b/pxr/base/gf/wrapFrustum.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapGamma.cpp b/pxr/base/gf/wrapGamma.cpp
index 0b00c7389c..8ebdcd1949 100644
--- a/pxr/base/gf/wrapGamma.cpp
+++ b/pxr/base/gf/wrapGamma.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/def.hpp>
 
diff --git a/pxr/base/gf/wrapHalf.cpp b/pxr/base/gf/wrapHalf.cpp
index 98685886e4..38deeb4a5f 100644
--- a/pxr/base/gf/wrapHalf.cpp
+++ b/pxr/base/gf/wrapHalf.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapHomogeneous.cpp b/pxr/base/gf/wrapHomogeneous.cpp
index fd70318aa8..9ad5f62b60 100644
--- a/pxr/base/gf/wrapHomogeneous.cpp
+++ b/pxr/base/gf/wrapHomogeneous.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/def.hpp>
 
diff --git a/pxr/base/gf/wrapInterval.cpp b/pxr/base/gf/wrapInterval.cpp
index 8567309f93..a5b83f0c8b 100644
--- a/pxr/base/gf/wrapInterval.cpp
+++ b/pxr/base/gf/wrapInterval.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapLimits.cpp b/pxr/base/gf/wrapLimits.cpp
index d7bc14b3c7..686e62b8cd 100644
--- a/pxr/base/gf/wrapLimits.cpp
+++ b/pxr/base/gf/wrapLimits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/scope.hpp>
 
diff --git a/pxr/base/gf/wrapLine.cpp b/pxr/base/gf/wrapLine.cpp
index 971695e8da..14c6266289 100644
--- a/pxr/base/gf/wrapLine.cpp
+++ b/pxr/base/gf/wrapLine.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapLineSeg.cpp b/pxr/base/gf/wrapLineSeg.cpp
index ace8d94649..1799ebf27b 100644
--- a/pxr/base/gf/wrapLineSeg.cpp
+++ b/pxr/base/gf/wrapLineSeg.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapMath.cpp b/pxr/base/gf/wrapMath.cpp
index d36c2bc2a6..49aa99a98c 100644
--- a/pxr/base/gf/wrapMath.cpp
+++ b/pxr/base/gf/wrapMath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/def.hpp>
 
diff --git a/pxr/base/gf/wrapMatrix.template.cpp b/pxr/base/gf/wrapMatrix.template.cpp
index bb6d7b35e4..58338a9f5f 100644
--- a/pxr/base/gf/wrapMatrix.template.cpp
+++ b/pxr/base/gf/wrapMatrix.template.cpp
@@ -2,25 +2,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #}
 
diff --git a/pxr/base/gf/wrapMatrix2.template.cpp b/pxr/base/gf/wrapMatrix2.template.cpp
index ed99ddd635..979511421c 100644
--- a/pxr/base/gf/wrapMatrix2.template.cpp
+++ b/pxr/base/gf/wrapMatrix2.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // This file is generated by a script.  Do not edit directly.  Edit the
 // wrapMatrix2.template.cpp file to make changes.
diff --git a/pxr/base/gf/wrapMatrix2d.cpp b/pxr/base/gf/wrapMatrix2d.cpp
index ec5bc64b51..b46a525e0e 100644
--- a/pxr/base/gf/wrapMatrix2d.cpp
+++ b/pxr/base/gf/wrapMatrix2d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // This file is generated by a script.  Do not edit directly.  Edit the
 // wrapMatrix2.template.cpp file to make changes.
diff --git a/pxr/base/gf/wrapMatrix2f.cpp b/pxr/base/gf/wrapMatrix2f.cpp
index 075aa60fda..a2977acfd4 100644
--- a/pxr/base/gf/wrapMatrix2f.cpp
+++ b/pxr/base/gf/wrapMatrix2f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // This file is generated by a script.  Do not edit directly.  Edit the
 // wrapMatrix2.template.cpp file to make changes.
diff --git a/pxr/base/gf/wrapMatrix3.template.cpp b/pxr/base/gf/wrapMatrix3.template.cpp
index 78af10df03..36f5b2fb9b 100644
--- a/pxr/base/gf/wrapMatrix3.template.cpp
+++ b/pxr/base/gf/wrapMatrix3.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapMatrix3d.cpp b/pxr/base/gf/wrapMatrix3d.cpp
index e6790914aa..3010f461a0 100644
--- a/pxr/base/gf/wrapMatrix3d.cpp
+++ b/pxr/base/gf/wrapMatrix3d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapMatrix3f.cpp b/pxr/base/gf/wrapMatrix3f.cpp
index ca0294f6f7..a2df5cb737 100644
--- a/pxr/base/gf/wrapMatrix3f.cpp
+++ b/pxr/base/gf/wrapMatrix3f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapMatrix4.template.cpp b/pxr/base/gf/wrapMatrix4.template.cpp
index fad048b078..e139a6e6a8 100644
--- a/pxr/base/gf/wrapMatrix4.template.cpp
+++ b/pxr/base/gf/wrapMatrix4.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // This file is generated by a script.  Do not edit directly.  Edit the
 // wrapMatrix4.template.cpp file to make changes.
diff --git a/pxr/base/gf/wrapMatrix4d.cpp b/pxr/base/gf/wrapMatrix4d.cpp
index 6013cef14c..38f52221e3 100644
--- a/pxr/base/gf/wrapMatrix4d.cpp
+++ b/pxr/base/gf/wrapMatrix4d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // This file is generated by a script.  Do not edit directly.  Edit the
 // wrapMatrix4.template.cpp file to make changes.
diff --git a/pxr/base/gf/wrapMatrix4f.cpp b/pxr/base/gf/wrapMatrix4f.cpp
index d5dec7d56c..ac8664f7ad 100644
--- a/pxr/base/gf/wrapMatrix4f.cpp
+++ b/pxr/base/gf/wrapMatrix4f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // This file is generated by a script.  Do not edit directly.  Edit the
 // wrapMatrix4.template.cpp file to make changes.
diff --git a/pxr/base/gf/wrapMultiInterval.cpp b/pxr/base/gf/wrapMultiInterval.cpp
index 3482181173..79a8a96b2c 100644
--- a/pxr/base/gf/wrapMultiInterval.cpp
+++ b/pxr/base/gf/wrapMultiInterval.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapPlane.cpp b/pxr/base/gf/wrapPlane.cpp
index 16e865525e..1fb035fb87 100644
--- a/pxr/base/gf/wrapPlane.cpp
+++ b/pxr/base/gf/wrapPlane.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapQuat.template.cpp b/pxr/base/gf/wrapQuat.template.cpp
index bab4cf8a33..0f6adc4b07 100644
--- a/pxr/base/gf/wrapQuat.template.cpp
+++ b/pxr/base/gf/wrapQuat.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapQuatd.cpp b/pxr/base/gf/wrapQuatd.cpp
index 4f3218e54a..cb01e86629 100644
--- a/pxr/base/gf/wrapQuatd.cpp
+++ b/pxr/base/gf/wrapQuatd.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapQuaternion.cpp b/pxr/base/gf/wrapQuaternion.cpp
index 1345f23bf1..62adb52140 100644
--- a/pxr/base/gf/wrapQuaternion.cpp
+++ b/pxr/base/gf/wrapQuaternion.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapQuatf.cpp b/pxr/base/gf/wrapQuatf.cpp
index 6ecb32473b..3b4c77bc6d 100644
--- a/pxr/base/gf/wrapQuatf.cpp
+++ b/pxr/base/gf/wrapQuatf.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapQuath.cpp b/pxr/base/gf/wrapQuath.cpp
index 0bbc789199..3242a1e24c 100644
--- a/pxr/base/gf/wrapQuath.cpp
+++ b/pxr/base/gf/wrapQuath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapRange.template.cpp b/pxr/base/gf/wrapRange.template.cpp
index 39a5704ea5..ee454f2b5e 100644
--- a/pxr/base/gf/wrapRange.template.cpp
+++ b/pxr/base/gf/wrapRange.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapRange1d.cpp b/pxr/base/gf/wrapRange1d.cpp
index c0b2c62144..6232f8c24e 100644
--- a/pxr/base/gf/wrapRange1d.cpp
+++ b/pxr/base/gf/wrapRange1d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapRange1f.cpp b/pxr/base/gf/wrapRange1f.cpp
index 886e31cfbb..506f8d17b7 100644
--- a/pxr/base/gf/wrapRange1f.cpp
+++ b/pxr/base/gf/wrapRange1f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapRange2d.cpp b/pxr/base/gf/wrapRange2d.cpp
index 508b960a00..82d39196ae 100644
--- a/pxr/base/gf/wrapRange2d.cpp
+++ b/pxr/base/gf/wrapRange2d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapRange2f.cpp b/pxr/base/gf/wrapRange2f.cpp
index 9598218bdf..3e0434568f 100644
--- a/pxr/base/gf/wrapRange2f.cpp
+++ b/pxr/base/gf/wrapRange2f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapRange3d.cpp b/pxr/base/gf/wrapRange3d.cpp
index 4e2430cee4..46b631d356 100644
--- a/pxr/base/gf/wrapRange3d.cpp
+++ b/pxr/base/gf/wrapRange3d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapRange3f.cpp b/pxr/base/gf/wrapRange3f.cpp
index 7b1cfbeae4..519f9e6536 100644
--- a/pxr/base/gf/wrapRange3f.cpp
+++ b/pxr/base/gf/wrapRange3f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapRay.cpp b/pxr/base/gf/wrapRay.cpp
index c26a3b20fc..d4630359b4 100644
--- a/pxr/base/gf/wrapRay.cpp
+++ b/pxr/base/gf/wrapRay.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapRect2i.cpp b/pxr/base/gf/wrapRect2i.cpp
index 108158e22e..54261f48a2 100644
--- a/pxr/base/gf/wrapRect2i.cpp
+++ b/pxr/base/gf/wrapRect2i.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapRotation.cpp b/pxr/base/gf/wrapRotation.cpp
index 5531f64f5a..71b48340dd 100644
--- a/pxr/base/gf/wrapRotation.cpp
+++ b/pxr/base/gf/wrapRotation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapSize2.cpp b/pxr/base/gf/wrapSize2.cpp
index 18e07798e1..26806d0702 100644
--- a/pxr/base/gf/wrapSize2.cpp
+++ b/pxr/base/gf/wrapSize2.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapSize3.cpp b/pxr/base/gf/wrapSize3.cpp
index d6b8e7594c..b304fba6d4 100644
--- a/pxr/base/gf/wrapSize3.cpp
+++ b/pxr/base/gf/wrapSize3.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapTransform.cpp b/pxr/base/gf/wrapTransform.cpp
index d4f74e5960..978171e44c 100644
--- a/pxr/base/gf/wrapTransform.cpp
+++ b/pxr/base/gf/wrapTransform.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/gf/wrapVec.template.cpp b/pxr/base/gf/wrapVec.template.cpp
index 53c0f7d2b5..94841b1190 100644
--- a/pxr/base/gf/wrapVec.template.cpp
+++ b/pxr/base/gf/wrapVec.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec2d.cpp b/pxr/base/gf/wrapVec2d.cpp
index 676181f153..b3295e6a79 100644
--- a/pxr/base/gf/wrapVec2d.cpp
+++ b/pxr/base/gf/wrapVec2d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec2f.cpp b/pxr/base/gf/wrapVec2f.cpp
index 2678eea927..98682931d9 100644
--- a/pxr/base/gf/wrapVec2f.cpp
+++ b/pxr/base/gf/wrapVec2f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec2h.cpp b/pxr/base/gf/wrapVec2h.cpp
index 43c23e65de..57907f082d 100644
--- a/pxr/base/gf/wrapVec2h.cpp
+++ b/pxr/base/gf/wrapVec2h.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec2i.cpp b/pxr/base/gf/wrapVec2i.cpp
index 3494dd7884..7584f2d8e6 100644
--- a/pxr/base/gf/wrapVec2i.cpp
+++ b/pxr/base/gf/wrapVec2i.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec3d.cpp b/pxr/base/gf/wrapVec3d.cpp
index cf343fe189..7386effb3d 100644
--- a/pxr/base/gf/wrapVec3d.cpp
+++ b/pxr/base/gf/wrapVec3d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec3f.cpp b/pxr/base/gf/wrapVec3f.cpp
index 0cc2602696..cd28de69ca 100644
--- a/pxr/base/gf/wrapVec3f.cpp
+++ b/pxr/base/gf/wrapVec3f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec3h.cpp b/pxr/base/gf/wrapVec3h.cpp
index c25928df41..a215f1fae2 100644
--- a/pxr/base/gf/wrapVec3h.cpp
+++ b/pxr/base/gf/wrapVec3h.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec3i.cpp b/pxr/base/gf/wrapVec3i.cpp
index 76935f92d3..d7ad178d0b 100644
--- a/pxr/base/gf/wrapVec3i.cpp
+++ b/pxr/base/gf/wrapVec3i.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec4d.cpp b/pxr/base/gf/wrapVec4d.cpp
index 1f2ae4473e..365a9ff77c 100644
--- a/pxr/base/gf/wrapVec4d.cpp
+++ b/pxr/base/gf/wrapVec4d.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec4f.cpp b/pxr/base/gf/wrapVec4f.cpp
index 7756c88579..586e9db955 100644
--- a/pxr/base/gf/wrapVec4f.cpp
+++ b/pxr/base/gf/wrapVec4f.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec4h.cpp b/pxr/base/gf/wrapVec4h.cpp
index a46e2d4271..101e6cee1e 100644
--- a/pxr/base/gf/wrapVec4h.cpp
+++ b/pxr/base/gf/wrapVec4h.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/gf/wrapVec4i.cpp b/pxr/base/gf/wrapVec4i.cpp
index dbcbfed9b1..becaf3f5e8 100644
--- a/pxr/base/gf/wrapVec4i.cpp
+++ b/pxr/base/gf/wrapVec4i.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 // This file is generated by a script.  Do not edit directly.  Edit the
diff --git a/pxr/base/js/api.h b/pxr/base/js/api.h
index 7fa721e44d..9f76c78ca2 100644
--- a/pxr/base/js/api.h
+++ b/pxr/base/js/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_JS_API_H
 #define PXR_BASE_JS_API_H
diff --git a/pxr/base/js/converter.h b/pxr/base/js/converter.h
index 26d0abceef..73e3d34ad2 100644
--- a/pxr/base/js/converter.h
+++ b/pxr/base/js/converter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_JS_CONVERTER_H
 #define PXR_BASE_JS_CONVERTER_H
diff --git a/pxr/base/js/json.cpp b/pxr/base/js/json.cpp
index 4d447ba8b1..b1806a25f2 100644
--- a/pxr/base/js/json.cpp
+++ b/pxr/base/js/json.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file js/json.cpp
diff --git a/pxr/base/js/json.h b/pxr/base/js/json.h
index 88d2259a92..ff2b53297b 100644
--- a/pxr/base/js/json.h
+++ b/pxr/base/js/json.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_JS_JSON_H
diff --git a/pxr/base/js/pch.h b/pxr/base/js/pch.h
index 00eaef7f70..2915c83def 100644
--- a/pxr/base/js/pch.h
+++ b/pxr/base/js/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -27,18 +10,14 @@
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
-#if defined(ARCH_OS_WINDOWS)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
+#include <cmath>
 #include <cstdarg>
 #include <cstdint>
 #include <cstring>
@@ -47,7 +26,9 @@
 #include <list>
 #include <locale>
 #include <map>
+#include <math.h>
 #include <memory>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -57,26 +38,6 @@
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
+#include <utility>
+#include <variant>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/none.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
diff --git a/pxr/base/js/testenv/testJsConverter.cpp b/pxr/base/js/testenv/testJsConverter.cpp
index 6d0c1b31e6..384a847fc4 100644
--- a/pxr/base/js/testenv/testJsConverter.cpp
+++ b/pxr/base/js/testenv/testJsConverter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file testenv/testJsConverter.cpp
diff --git a/pxr/base/js/testenv/testJsDouble.cpp b/pxr/base/js/testenv/testJsDouble.cpp
index d85aeb4b58..4fc34ebc10 100644
--- a/pxr/base/js/testenv/testJsDouble.cpp
+++ b/pxr/base/js/testenv/testJsDouble.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file testenv/testJsDouble.cpp
diff --git a/pxr/base/js/testenv/testJsIO.cpp b/pxr/base/js/testenv/testJsIO.cpp
index e702235e5a..d76c953250 100644
--- a/pxr/base/js/testenv/testJsIO.cpp
+++ b/pxr/base/js/testenv/testJsIO.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file testenv/testJsIO.cpp
diff --git a/pxr/base/js/testenv/testJsUtils.cpp b/pxr/base/js/testenv/testJsUtils.cpp
index 32c4ff5525..5ac00943e0 100644
--- a/pxr/base/js/testenv/testJsUtils.cpp
+++ b/pxr/base/js/testenv/testJsUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file testenv/testJsUtils.cpp
diff --git a/pxr/base/js/testenv/testJsWriter.cpp b/pxr/base/js/testenv/testJsWriter.cpp
index bd2a1788a0..6a08a7b50d 100644
--- a/pxr/base/js/testenv/testJsWriter.cpp
+++ b/pxr/base/js/testenv/testJsWriter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file testenv/testJsWriter.cpp
diff --git a/pxr/base/js/types.h b/pxr/base/js/types.h
index e9e4e287df..8bf9498046 100644
--- a/pxr/base/js/types.h
+++ b/pxr/base/js/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_JS_TYPES_H
 #define PXR_BASE_JS_TYPES_H
diff --git a/pxr/base/js/utils.cpp b/pxr/base/js/utils.cpp
index 6d3adc8578..1bbf81f472 100644
--- a/pxr/base/js/utils.cpp
+++ b/pxr/base/js/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file js/utils.cpp
diff --git a/pxr/base/js/utils.h b/pxr/base/js/utils.h
index f633dee65b..ed93556104 100644
--- a/pxr/base/js/utils.h
+++ b/pxr/base/js/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_JS_UTILS_H
 #define PXR_BASE_JS_UTILS_H
diff --git a/pxr/base/js/value.cpp b/pxr/base/js/value.cpp
index 654ba81dcf..a4122acb49 100644
--- a/pxr/base/js/value.cpp
+++ b/pxr/base/js/value.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file js/value.cpp
diff --git a/pxr/base/js/value.h b/pxr/base/js/value.h
index 486e969051..345c2f93bc 100644
--- a/pxr/base/js/value.h
+++ b/pxr/base/js/value.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_JS_VALUE_H
 #define PXR_BASE_JS_VALUE_H
diff --git a/pxr/base/pegtl/CMakeLists.txt b/pxr/base/pegtl/CMakeLists.txt
new file mode 100644
index 0000000000..649d3d26ca
--- /dev/null
+++ b/pxr/base/pegtl/CMakeLists.txt
@@ -0,0 +1,206 @@
+set(PXR_PREFIX pxr/base)
+set(PXR_PACKAGE pegtl)
+
+pxr_library(pegtl
+    # Workaround lack of build support for header-only libs.
+    LIBRARIES
+       arch
+    
+    PUBLIC_HEADERS
+        pegtl.hpp
+        pegtl/apply_mode.hpp
+        pegtl/argv_input.hpp
+        pegtl/ascii.hpp
+        pegtl/buffer_input.hpp
+        pegtl/change_action.hpp
+        pegtl/change_action_and_state.hpp
+        pegtl/change_action_and_states.hpp
+        pegtl/change_control.hpp
+        pegtl/change_state.hpp
+        pegtl/change_states.hpp
+        pegtl/config.hpp
+        pegtl/contrib/abnf.hpp
+        pegtl/contrib/add_state.hpp
+        pegtl/contrib/alphabet.hpp
+        pegtl/contrib/analyze.hpp
+        pegtl/contrib/analyze_traits.hpp
+        pegtl/contrib/check_bytes.hpp
+        pegtl/contrib/control_action.hpp
+        pegtl/contrib/coverage.hpp
+        pegtl/contrib/forward.hpp
+        pegtl/contrib/function.hpp
+        pegtl/contrib/http.hpp
+        pegtl/contrib/icu/internal.hpp
+        pegtl/contrib/icu/utf16.hpp
+        pegtl/contrib/icu/utf32.hpp
+        pegtl/contrib/icu/utf8.hpp
+        pegtl/contrib/if_then.hpp
+        pegtl/contrib/instantiate.hpp
+        pegtl/contrib/integer.hpp
+        pegtl/contrib/internal/endian.hpp
+        pegtl/contrib/internal/endian_gcc.hpp
+        pegtl/contrib/internal/endian_win.hpp
+        pegtl/contrib/internal/peek_mask_uint.hpp
+        pegtl/contrib/internal/peek_mask_uint8.hpp
+        pegtl/contrib/internal/peek_uint.hpp
+        pegtl/contrib/internal/peek_uint8.hpp
+        pegtl/contrib/internal/peek_utf16.hpp
+        pegtl/contrib/internal/peek_utf32.hpp
+        pegtl/contrib/internal/read_uint.hpp
+        pegtl/contrib/internal/set_stack_guard.hpp
+        pegtl/contrib/internal/vector_stack_guard.hpp
+        pegtl/contrib/iri.hpp
+        pegtl/contrib/json.hpp
+        pegtl/contrib/json_pointer.hpp
+        pegtl/contrib/limit_bytes.hpp
+        pegtl/contrib/limit_depth.hpp
+        pegtl/contrib/parse_tree.hpp
+        pegtl/contrib/parse_tree_to_dot.hpp
+        pegtl/contrib/peg.hpp
+        pegtl/contrib/predicates.hpp
+        pegtl/contrib/print.hpp
+        pegtl/contrib/print_coverage.hpp
+        pegtl/contrib/proto3.hpp
+        pegtl/contrib/raw_string.hpp
+        pegtl/contrib/remove_first_state.hpp
+        pegtl/contrib/remove_last_states.hpp
+        pegtl/contrib/rep_one_min_max.hpp
+        pegtl/contrib/rep_string.hpp
+        pegtl/contrib/separated_seq.hpp
+        pegtl/contrib/shuffle_states.hpp
+        pegtl/contrib/state_control.hpp
+        pegtl/contrib/to_string.hpp
+        pegtl/contrib/trace.hpp
+        pegtl/contrib/uint16.hpp
+        pegtl/contrib/uint32.hpp
+        pegtl/contrib/uint64.hpp
+        pegtl/contrib/uint8.hpp
+        pegtl/contrib/unescape.hpp
+        pegtl/contrib/uri.hpp
+        pegtl/contrib/utf16.hpp
+        pegtl/contrib/utf32.hpp
+        pegtl/cstream_input.hpp
+        pegtl/demangle.hpp
+        pegtl/disable_action.hpp
+        pegtl/discard_input.hpp
+        pegtl/discard_input_on_failure.hpp
+        pegtl/discard_input_on_success.hpp
+        pegtl/enable_action.hpp
+        pegtl/eol.hpp
+        pegtl/eol_pair.hpp
+        pegtl/file_input.hpp
+        pegtl/internal/action.hpp
+        pegtl/internal/action_input.hpp
+        pegtl/internal/any.hpp
+        pegtl/internal/apply.hpp
+        pegtl/internal/apply0.hpp
+        pegtl/internal/apply0_single.hpp
+        pegtl/internal/apply_single.hpp
+        pegtl/internal/at.hpp
+        pegtl/internal/bof.hpp
+        pegtl/internal/bol.hpp
+        pegtl/internal/bump.hpp
+        pegtl/internal/bump_help.hpp
+        pegtl/internal/bytes.hpp
+        pegtl/internal/control.hpp
+        pegtl/internal/cr_crlf_eol.hpp
+        pegtl/internal/cr_eol.hpp
+        pegtl/internal/crlf_eol.hpp
+        pegtl/internal/cstream_reader.hpp
+        pegtl/internal/cstring_reader.hpp
+        pegtl/internal/dependent_false.hpp
+        pegtl/internal/disable.hpp
+        pegtl/internal/discard.hpp
+        pegtl/internal/enable.hpp
+        pegtl/internal/enable_control.hpp
+        pegtl/internal/eof.hpp
+        pegtl/internal/eol.hpp
+        pegtl/internal/eolf.hpp
+        pegtl/internal/failure.hpp
+        pegtl/internal/file_mapper_posix.hpp
+        pegtl/internal/file_mapper_win32.hpp
+        pegtl/internal/file_reader.hpp
+        pegtl/internal/filesystem.hpp
+        pegtl/internal/has_apply.hpp
+        pegtl/internal/has_apply0.hpp
+        pegtl/internal/has_match.hpp
+        pegtl/internal/has_unwind.hpp
+        pegtl/internal/identifier.hpp
+        pegtl/internal/if_apply.hpp
+        pegtl/internal/if_must.hpp
+        pegtl/internal/if_must_else.hpp
+        pegtl/internal/if_then_else.hpp
+        pegtl/internal/input_pair.hpp
+        pegtl/internal/istream_reader.hpp
+        pegtl/internal/istring.hpp
+        pegtl/internal/iterator.hpp
+        pegtl/internal/lf_crlf_eol.hpp
+        pegtl/internal/lf_eol.hpp
+        pegtl/internal/list.hpp
+        pegtl/internal/list_must.hpp
+        pegtl/internal/list_tail.hpp
+        pegtl/internal/list_tail_pad.hpp
+        pegtl/internal/marker.hpp
+        pegtl/internal/minus.hpp
+        pegtl/internal/missing_apply.hpp
+        pegtl/internal/missing_apply0.hpp
+        pegtl/internal/must.hpp
+        pegtl/internal/not_at.hpp
+        pegtl/internal/one.hpp
+        pegtl/internal/opt.hpp
+        pegtl/internal/pad.hpp
+        pegtl/internal/pad_opt.hpp
+        pegtl/internal/path_to_string.hpp
+        pegtl/internal/peek_char.hpp
+        pegtl/internal/peek_utf8.hpp
+        pegtl/internal/pegtl_string.hpp
+        pegtl/internal/plus.hpp
+        pegtl/internal/raise.hpp
+        pegtl/internal/range.hpp
+        pegtl/internal/ranges.hpp
+        pegtl/internal/rematch.hpp
+        pegtl/internal/rep.hpp
+        pegtl/internal/rep_min.hpp
+        pegtl/internal/rep_min_max.hpp
+        pegtl/internal/rep_opt.hpp
+        pegtl/internal/require.hpp
+        pegtl/internal/result_on_found.hpp
+        pegtl/internal/rules.hpp
+        pegtl/internal/seq.hpp
+        pegtl/internal/sor.hpp
+        pegtl/internal/star.hpp
+        pegtl/internal/star_must.hpp
+        pegtl/internal/state.hpp
+        pegtl/internal/string.hpp
+        pegtl/internal/success.hpp
+        pegtl/internal/try_catch_type.hpp
+        pegtl/internal/until.hpp
+        pegtl/internal/unwind_guard.hpp
+        pegtl/istream_input.hpp
+        pegtl/match.hpp
+        pegtl/memory_input.hpp
+        pegtl/mmap_input.hpp
+        pegtl/must_if.hpp
+        pegtl/normal.hpp
+        pegtl/nothing.hpp
+        pegtl/parse.hpp
+        pegtl/parse_error.hpp
+        pegtl/position.hpp
+        pegtl/read_input.hpp
+        pegtl/require_apply.hpp
+        pegtl/require_apply0.hpp
+        pegtl/rewind_mode.hpp
+        pegtl/rules.hpp
+        pegtl/string_input.hpp
+        pegtl/tracking_mode.hpp
+        pegtl/type_list.hpp
+        pegtl/utf8.hpp
+        pegtl/version.hpp
+        pegtl/visit.hpp
+
+    CPPFILES
+        # Workaround lack of build support for header-only libs.
+        build-workaround.cpp
+
+    DISABLE_PRECOMPILED_HEADERS
+)
diff --git a/pxr/base/pegtl/README.md b/pxr/base/pegtl/README.md
new file mode 100644
index 0000000000..3a3a74320e
--- /dev/null
+++ b/pxr/base/pegtl/README.md
@@ -0,0 +1,47 @@
+# The Art of C++ : PEGTL (Parsing Expression Grammar Template Library)
+
+[PEGTL](https://github.com/taocpp/PEGTL) is a library for creating
+parsers according to a Parsing Expression Grammar.
+
+## Version
+
+v3.2.7
+
+## Setup
+
+Refer to the [Installing and Using](https://github.com/taocpp/PEGTL/blob/3.x/doc/Installing-and-Using.md)
+documentation
+
+## Copy headers
+
+1. Copy PEGTL-3.2.7/include/tao/... to pxr/base/pegtl/...
+
+2. Replace Macro Names
+
+Change macro names from TAO_PEGTL_ to PXR_PEGTL_.  You can do this in a
+bash-like shell with the following:
+
+`sed -i 's/TAO_PEGTL_/PXR_PEGTL_/g' $(find -name '[^.]*.[hc]pp')`
+
+3. Update CMakeLists.txt and any other build configuration files.
+
+You can get a full list of the header files by running:
+
+`find -type f`
+
+4. Update pxr/base/pegtl/pegtl/config.hpp
+
+This file defines the namespace name that PEGTL uses:
+
+```
+// Define PXR_PEGTL_NAMESPACE based on the internal namespace to isolate
+// it from other versions of USD/PEGTL in client code.
+#include "pxr/pxr.h"
+
+#if PXR_USE_NAMESPACES
+#define PXR_PEGTL_NAMESPACE PXR_INTERNAL_NS ## _pegtl
+#else
+#define PXR_PEGTL_NAMESPACE pxr_pegtl
+#endif
+```
+
diff --git a/pxr/base/pegtl/build-workaround.cpp b/pxr/base/pegtl/build-workaround.cpp
new file mode 100644
index 0000000000..66bf2b510b
--- /dev/null
+++ b/pxr/base/pegtl/build-workaround.cpp
@@ -0,0 +1,14 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+// This is required since our build does not currently support header-only
+// libraries.  Without this the headers install okay, but other libs that try to
+// use this library will fail to link, like: `ld: cannot find -lpegtl`.  By
+// adding this, an "empty" .so gets built and other libs can link it.
+
+#include "pxr/base/arch/export.h"
+
+ARCH_EXPORT int __pxr_pegtl_workaround__;
diff --git a/pxr/base/pegtl/pegtl.hpp b/pxr/base/pegtl/pegtl.hpp
new file mode 100644
index 0000000000..94b5a52074
--- /dev/null
+++ b/pxr/base/pegtl/pegtl.hpp
@@ -0,0 +1,48 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_HPP
+#define PXR_PEGTL_HPP
+
+#include "pegtl/config.hpp"
+#include "pegtl/demangle.hpp"
+#include "pegtl/parse.hpp"
+#include "pegtl/version.hpp"
+
+#include "pegtl/ascii.hpp"
+#include "pegtl/rules.hpp"
+#include "pegtl/utf8.hpp"
+
+#include "pegtl/argv_input.hpp"
+#include "pegtl/buffer_input.hpp"
+#include "pegtl/cstream_input.hpp"
+#include "pegtl/istream_input.hpp"
+#include "pegtl/memory_input.hpp"
+#include "pegtl/read_input.hpp"
+#include "pegtl/string_input.hpp"
+
+// This has to be included *after* the above inputs,
+// otherwise the amalgamated header will not work!
+#include "pegtl/file_input.hpp"
+
+#include "pegtl/change_action.hpp"
+#include "pegtl/change_action_and_state.hpp"
+#include "pegtl/change_action_and_states.hpp"
+#include "pegtl/change_control.hpp"
+#include "pegtl/change_state.hpp"
+#include "pegtl/change_states.hpp"
+
+#include "pegtl/disable_action.hpp"
+#include "pegtl/enable_action.hpp"
+
+#include "pegtl/discard_input.hpp"
+#include "pegtl/discard_input_on_failure.hpp"
+#include "pegtl/discard_input_on_success.hpp"
+
+#include "pegtl/visit.hpp"
+
+#if defined( __cpp_exceptions )
+#include "pegtl/must_if.hpp"
+#endif
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/apply_mode.hpp b/pxr/base/pegtl/pegtl/apply_mode.hpp
new file mode 100644
index 0000000000..4b9f6564cc
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/apply_mode.hpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_APPLY_MODE_HPP
+#define PXR_PEGTL_APPLY_MODE_HPP
+
+#include "config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   enum class apply_mode : bool
+   {
+      action = true,
+      nothing = false
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/argv_input.hpp b/pxr/base/pegtl/pegtl/argv_input.hpp
new file mode 100644
index 0000000000..3fc5e189a5
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/argv_input.hpp
@@ -0,0 +1,49 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_ARGV_INPUT_HPP
+#define PXR_PEGTL_ARGV_INPUT_HPP
+
+#include <cstddef>
+#include <sstream>
+#include <string>
+#include <utility>
+
+#include "config.hpp"
+#include "eol.hpp"
+#include "memory_input.hpp"
+#include "tracking_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      [[nodiscard]] inline std::string make_argv_source( const std::size_t argn )
+      {
+         std::ostringstream oss;
+         oss << "argv[" << argn << ']';
+         return std::move( oss ).str();
+      }
+
+   }  // namespace internal
+
+   template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
+   struct argv_input
+      : memory_input< P, Eol >
+   {
+      template< typename T >
+      argv_input( char** argv, const std::size_t argn, T&& in_source )
+         : memory_input< P, Eol >( static_cast< const char* >( argv[ argn ] ), std::forward< T >( in_source ) )
+      {}
+
+      argv_input( char** argv, const std::size_t argn )
+         : argv_input( argv, argn, internal::make_argv_source( argn ) )
+      {}
+   };
+
+   template< typename... Ts >
+   argv_input( Ts&&... ) -> argv_input<>;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/ascii.hpp b/pxr/base/pegtl/pegtl/ascii.hpp
new file mode 100644
index 0000000000..5084d8675a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/ascii.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_ASCII_HPP
+#define PXR_PEGTL_ASCII_HPP
+
+#include "config.hpp"
+
+#include "internal/result_on_found.hpp"
+#include "internal/rules.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   inline namespace ascii
+   {
+      // clang-format off
+      struct alnum : internal::ranges< internal::peek_char, 'a', 'z', 'A', 'Z', '0', '9' > {};
+      struct alpha : internal::ranges< internal::peek_char, 'a', 'z', 'A', 'Z' > {};
+      struct any : internal::any< internal::peek_char > {};
+      struct blank : internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\t' > {};
+      struct digit : internal::range< internal::result_on_found::success, internal::peek_char, '0', '9' > {};
+      struct ellipsis : internal::string< '.', '.', '.' > {};
+      template< char... Cs > struct forty_two : internal::rep< 42, internal::one< internal::result_on_found::success, internal::peek_char, Cs... > > {};
+      struct identifier_first : internal::identifier_first {};
+      struct identifier_other : internal::identifier_other {};
+      struct identifier : internal::identifier {};
+      template< char... Cs > struct istring : internal::istring< Cs... > {};
+      template< char... Cs > struct keyword : internal::seq< internal::string< Cs... >, internal::not_at< internal::identifier_other > > { static_assert( sizeof...( Cs ) > 0 ); };
+      struct lower : internal::range< internal::result_on_found::success, internal::peek_char, 'a', 'z' > {};
+      template< char... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_char, Cs... > {};
+      template< char Lo, char Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_char, Lo, Hi > {};
+      struct nul : internal::one< internal::result_on_found::success, internal::peek_char, char( 0 ) > {};
+      struct odigit : internal::range< internal::result_on_found::success, internal::peek_char, '0', '7' > {};
+      template< char... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_char, Cs... > {};
+      struct print : internal::range< internal::result_on_found::success, internal::peek_char, char( 32 ), char( 126 ) > {};
+      template< char Lo, char Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_char, Lo, Hi > {};
+      template< char... Cs > struct ranges : internal::ranges< internal::peek_char, Cs... > {};
+      struct seven : internal::range< internal::result_on_found::success, internal::peek_char, char( 0 ), char( 127 ) > {};
+      struct shebang : internal::seq< internal::string< '#', '!' >, internal::until< internal::eolf > > {};
+      struct space : internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\n', '\r', '\t', '\v', '\f' > {};
+      template< char... Cs > struct string : internal::string< Cs... > {};
+      template< char C > struct three : internal::string< C, C, C > {};
+      template< char C > struct two : internal::string< C, C > {};
+      struct upper : internal::range< internal::result_on_found::success, internal::peek_char, 'A', 'Z' > {};
+      struct xdigit : internal::ranges< internal::peek_char, '0', '9', 'a', 'f', 'A', 'F' > {};
+      // clang-format on
+
+   }  // namespace ascii
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#include "internal/pegtl_string.hpp"
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/buffer_input.hpp b/pxr/base/pegtl/pegtl/buffer_input.hpp
new file mode 100644
index 0000000000..f2d980e83a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/buffer_input.hpp
@@ -0,0 +1,226 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_BUFFER_INPUT_HPP
+#define PXR_PEGTL_BUFFER_INPUT_HPP
+
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <memory>
+#include <string>
+
+#if defined( __cpp_exceptions )
+#include <stdexcept>
+#else
+#include <cstdio>
+#include <exception>
+#endif
+
+#include "config.hpp"
+#include "eol.hpp"
+#include "memory_input.hpp"
+#include "position.hpp"
+#include "tracking_mode.hpp"
+
+#include "internal/action_input.hpp"
+#include "internal/bump.hpp"
+#include "internal/iterator.hpp"
+#include "internal/marker.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename Reader, typename Eol = eol::lf_crlf, typename Source = std::string, std::size_t Chunk = 64 >
+   class buffer_input
+   {
+   public:
+      using reader_t = Reader;
+
+      using eol_t = Eol;
+      using source_t = Source;
+
+      using iterator_t = internal::iterator;
+
+      using action_t = internal::action_input< buffer_input >;
+
+      static constexpr std::size_t chunk_size = Chunk;
+      static constexpr tracking_mode tracking_mode_v = tracking_mode::eager;
+
+      template< typename T, typename... As >
+      buffer_input( T&& in_source, const std::size_t maximum, As&&... as )
+         : m_reader( std::forward< As >( as )... ),
+           m_maximum( maximum + Chunk ),
+           m_buffer( new char[ maximum + Chunk ] ),
+           m_current( m_buffer.get() ),
+           m_end( m_buffer.get() ),
+           m_source( std::forward< T >( in_source ) )
+      {
+         static_assert( Chunk != 0, "zero chunk size not implemented" );
+         assert( m_maximum > maximum );  // Catches overflow; change to >= when zero chunk size is implemented.
+      }
+
+      buffer_input( const buffer_input& ) = delete;
+      buffer_input( buffer_input&& ) = delete;
+
+      ~buffer_input() = default;
+
+      buffer_input& operator=( const buffer_input& ) = delete;
+      buffer_input& operator=( buffer_input&& ) = delete;
+
+      [[nodiscard]] bool empty()
+      {
+         require( 1 );
+         return m_current.data == m_end;
+      }
+
+      [[nodiscard]] std::size_t size( const std::size_t amount )
+      {
+         require( amount );
+         return buffer_occupied();
+      }
+
+      [[nodiscard]] const char* current() const noexcept
+      {
+         return m_current.data;
+      }
+
+      [[nodiscard]] const char* end( const std::size_t amount )
+      {
+         require( amount );
+         return m_end;
+      }
+
+      [[nodiscard]] std::size_t byte() const noexcept
+      {
+         return m_current.byte;
+      }
+
+      [[nodiscard]] std::size_t line() const noexcept
+      {
+         return m_current.line;
+      }
+
+      [[nodiscard]] std::size_t column() const noexcept
+      {
+         return m_current.column;
+      }
+
+      [[nodiscard]] const Source& source() const noexcept
+      {
+         return m_source;
+      }
+
+      [[nodiscard]] char peek_char( const std::size_t offset = 0 ) const noexcept
+      {
+         return m_current.data[ offset ];
+      }
+
+      [[nodiscard]] std::uint8_t peek_uint8( const std::size_t offset = 0 ) const noexcept
+      {
+         return static_cast< std::uint8_t >( peek_char( offset ) );
+      }
+
+      void bump( const std::size_t in_count = 1 ) noexcept
+      {
+         internal::bump( m_current, in_count, Eol::ch );
+      }
+
+      void bump_in_this_line( const std::size_t in_count = 1 ) noexcept
+      {
+         internal::bump_in_this_line( m_current, in_count );
+      }
+
+      void bump_to_next_line( const std::size_t in_count = 1 ) noexcept
+      {
+         internal::bump_to_next_line( m_current, in_count );
+      }
+
+      void discard() noexcept
+      {
+         if( m_current.data > m_buffer.get() + Chunk ) {
+            const auto s = m_end - m_current.data;
+            std::memmove( m_buffer.get(), m_current.data, s );
+            m_current.data = m_buffer.get();
+            m_end = m_buffer.get() + s;
+         }
+      }
+
+      void require( const std::size_t amount )
+      {
+         if( m_current.data + amount <= m_end ) {
+            return;
+         }
+         if( m_current.data + amount > m_buffer.get() + m_maximum ) {
+#if defined( __cpp_exceptions )
+            throw std::overflow_error( "require() beyond end of buffer" );
+#else
+            std::fputs( "overflow error: require() beyond end of buffer\n", stderr );
+            std::terminate();
+#endif
+         }
+         if( const auto r = m_reader( m_end, ( std::min )( buffer_free_after_end(), ( std::max )( amount - buffer_occupied(), Chunk ) ) ) ) {
+            m_end += r;
+         }
+      }
+
+      template< rewind_mode M >
+      [[nodiscard]] internal::marker< iterator_t, M > mark() noexcept
+      {
+         return internal::marker< iterator_t, M >( m_current );
+      }
+
+      [[nodiscard]] PXR_PEGTL_NAMESPACE::position position( const iterator_t& it ) const
+      {
+         return PXR_PEGTL_NAMESPACE::position( it, m_source );
+      }
+
+      [[nodiscard]] PXR_PEGTL_NAMESPACE::position position() const
+      {
+         return position( m_current );
+      }
+
+      [[nodiscard]] const iterator_t& iterator() const noexcept
+      {
+         return m_current;
+      }
+
+      [[nodiscard]] std::size_t buffer_capacity() const noexcept
+      {
+         return m_maximum;
+      }
+
+      [[nodiscard]] std::size_t buffer_occupied() const noexcept
+      {
+         assert( m_end >= m_current.data );
+         return std::size_t( m_end - m_current.data );
+      }
+
+      [[nodiscard]] std::size_t buffer_free_before_current() const noexcept
+      {
+         assert( m_current.data >= m_buffer.get() );
+         return std::size_t( m_current.data - m_buffer.get() );
+      }
+
+      [[nodiscard]] std::size_t buffer_free_after_end() const noexcept
+      {
+         assert( m_buffer.get() + m_maximum >= m_end );
+         return std::size_t( m_buffer.get() + m_maximum - m_end );
+      }
+
+   private:
+      Reader m_reader;
+      std::size_t m_maximum;
+      std::unique_ptr< char[] > m_buffer;
+      iterator_t m_current;
+      char* m_end;
+      const Source m_source;
+
+   public:
+      std::size_t private_depth = 0;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/change_action.hpp b/pxr/base/pegtl/pegtl/change_action.hpp
new file mode 100644
index 0000000000..f56e5aa8cc
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/change_action.hpp
@@ -0,0 +1,38 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CHANGE_ACTION_HPP
+#define PXR_PEGTL_CHANGE_ACTION_HPP
+
+#include <type_traits>
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< template< typename... > class NewAction >
+   struct change_action
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         static_assert( !std::is_same_v< Action< void >, NewAction< void > >, "old and new action class templates are identical" );
+         return Control< Rule >::template match< A, M, NewAction, Control >( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/change_action_and_state.hpp b/pxr/base/pegtl/pegtl/change_action_and_state.hpp
new file mode 100644
index 0000000000..6e4037acfc
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/change_action_and_state.hpp
@@ -0,0 +1,71 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CHANGE_ACTION_AND_STATE_HPP
+#define PXR_PEGTL_CHANGE_ACTION_AND_STATE_HPP
+
+#include <type_traits>
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+#include "internal/dependent_false.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< template< typename... > class NewAction, typename NewState >
+   struct change_action_and_state
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         static_assert( !std::is_same_v< Action< void >, NewAction< void > >, "old and new action class templates are identical" );
+
+         if constexpr( std::is_constructible_v< NewState, const ParseInput&, States... > ) {
+            NewState s( static_cast< const ParseInput& >( in ), st... );
+            if( Control< Rule >::template match< A, M, NewAction, Control >( in, s ) ) {
+               if constexpr( A == apply_mode::action ) {
+                  Action< Rule >::success( static_cast< const ParseInput& >( in ), s, st... );
+               }
+               return true;
+            }
+            return false;
+         }
+         else if constexpr( std::is_default_constructible_v< NewState > ) {
+            NewState s;
+            if( Control< Rule >::template match< A, M, NewAction, Control >( in, s ) ) {
+               if constexpr( A == apply_mode::action ) {
+                  Action< Rule >::success( static_cast< const ParseInput& >( in ), s, st... );
+               }
+               return true;
+            }
+            return false;
+         }
+         else {
+            static_assert( internal::dependent_false< NewState >, "unable to instantiate new state" );
+         }
+      }
+
+      template< typename ParseInput,
+                typename... States >
+      static void success( const ParseInput& in, NewState& s, States&&... st ) noexcept( noexcept( s.success( in, st... ) ) )
+      {
+         s.success( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/change_action_and_states.hpp b/pxr/base/pegtl/pegtl/change_action_and_states.hpp
new file mode 100644
index 0000000000..2da0319e0e
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/change_action_and_states.hpp
@@ -0,0 +1,62 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CHANGE_ACTION_AND_STATES_HPP
+#define PXR_PEGTL_CHANGE_ACTION_AND_STATES_HPP
+
+#include <tuple>
+#include <utility>
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< template< typename... > class NewAction, typename... NewStates >
+   struct change_action_and_states
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                std::size_t... Ns,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( std::index_sequence< Ns... > /*unused*/, ParseInput& in, States&&... st )
+      {
+         auto t = std::tie( st... );
+         if( Control< Rule >::template match< A, M, NewAction, Control >( in, std::get< Ns >( t )... ) ) {
+            if constexpr( A == apply_mode::action ) {
+               Action< Rule >::success( static_cast< const ParseInput& >( in ), st... );
+            }
+            return true;
+         }
+         return false;
+      }
+
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         static_assert( !std::is_same_v< Action< void >, NewAction< void > >, "old and new action class templates are identical" );
+         return match< Rule, A, M, Action, Control >( std::index_sequence_for< NewStates... >(), in, NewStates()..., st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/change_control.hpp b/pxr/base/pegtl/pegtl/change_control.hpp
new file mode 100644
index 0000000000..9657b6dd8a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/change_control.hpp
@@ -0,0 +1,36 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CHANGE_CONTROL_HPP
+#define PXR_PEGTL_CHANGE_CONTROL_HPP
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< template< typename... > class NewControl >
+   struct change_control
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, NewControl >( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/change_state.hpp b/pxr/base/pegtl/pegtl/change_state.hpp
new file mode 100644
index 0000000000..0941856eab
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/change_state.hpp
@@ -0,0 +1,69 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CHANGE_STATE_HPP
+#define PXR_PEGTL_CHANGE_STATE_HPP
+
+#include <type_traits>
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+#include "internal/dependent_false.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename NewState >
+   struct change_state
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if constexpr( std::is_constructible_v< NewState, const ParseInput&, States... > ) {
+            NewState s( static_cast< const ParseInput& >( in ), st... );
+            if( PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, s ) ) {
+               if constexpr( A == apply_mode::action ) {
+                  Action< Rule >::success( static_cast< const ParseInput& >( in ), s, st... );
+               }
+               return true;
+            }
+            return false;
+         }
+         else if constexpr( std::is_default_constructible_v< NewState > ) {
+            NewState s;
+            if( PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, s ) ) {
+               if constexpr( A == apply_mode::action ) {
+                  Action< Rule >::success( static_cast< const ParseInput& >( in ), s, st... );
+               }
+               return true;
+            }
+            return false;
+         }
+         else {
+            static_assert( internal::dependent_false< NewState >, "unable to instantiate new state" );
+         }
+      }
+
+      template< typename ParseInput,
+                typename... States >
+      static void success( const ParseInput& in, NewState& s, States&&... st ) noexcept( noexcept( s.success( in, st... ) ) )
+      {
+         s.success( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/change_states.hpp b/pxr/base/pegtl/pegtl/change_states.hpp
new file mode 100644
index 0000000000..2b40deb428
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/change_states.hpp
@@ -0,0 +1,61 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CHANGE_STATES_HPP
+#define PXR_PEGTL_CHANGE_STATES_HPP
+
+#include <tuple>
+#include <utility>
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename... NewStates >
+   struct change_states
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                std::size_t... Ns,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( std::index_sequence< Ns... > /*unused*/, ParseInput& in, States&&... st )
+      {
+         auto t = std::tie( st... );
+         if( PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, std::get< Ns >( t )... ) ) {
+            if constexpr( A == apply_mode::action ) {
+               Action< Rule >::success( static_cast< const ParseInput& >( in ), st... );
+            }
+            return true;
+         }
+         return false;
+      }
+
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return match< Rule, A, M, Action, Control >( std::index_sequence_for< NewStates... >(), in, NewStates()..., st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/config.hpp b/pxr/base/pegtl/pegtl/config.hpp
new file mode 100644
index 0000000000..0894f76e34
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/config.hpp
@@ -0,0 +1,17 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONFIG_HPP
+#define PXR_PEGTL_CONFIG_HPP
+
+// Define PXR_PEGTL_NAMESPACE based on internal namespace to isolate
+// it from other versions of USD/PEGTL in client code.
+#include "pxr/pxr.h"
+
+#if PXR_USE_NAMESPACES
+#define PXR_PEGTL_NAMESPACE PXR_INTERNAL_NS ## _pegtl
+#else
+#define PXR_PEGTL_NAMESPACE pxr_pegtl
+#endif
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/abnf.hpp b/pxr/base/pegtl/pegtl/contrib/abnf.hpp
new file mode 100644
index 0000000000..e42b800f5b
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/abnf.hpp
@@ -0,0 +1,35 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ABNF_HPP
+#define PXR_PEGTL_CONTRIB_ABNF_HPP
+
+#include "../config.hpp"
+#include "../internal/rules.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::abnf
+{
+   // Core ABNF rules according to RFC 5234, Appendix B
+
+   // clang-format off
+   struct ALPHA : internal::ranges< internal::peek_char, 'a', 'z', 'A', 'Z' > {};
+   struct BIT : internal::one< internal::result_on_found::success, internal::peek_char, '0', '1' > {};
+   struct CHAR : internal::range< internal::result_on_found::success, internal::peek_char, char( 1 ), char( 127 ) > {};
+   struct CR : internal::one< internal::result_on_found::success, internal::peek_char, '\r' > {};
+   struct CRLF : internal::string< '\r', '\n' > {};
+   struct CTL : internal::ranges< internal::peek_char, char( 0 ), char( 31 ), char( 127 ) > {};
+   struct DIGIT : internal::range< internal::result_on_found::success, internal::peek_char, '0', '9' > {};
+   struct DQUOTE : internal::one< internal::result_on_found::success, internal::peek_char, '"' > {};
+   struct HEXDIG : internal::ranges< internal::peek_char, '0', '9', 'a', 'f', 'A', 'F' > {};
+   struct HTAB : internal::one< internal::result_on_found::success, internal::peek_char, '\t' > {};
+   struct LF : internal::one< internal::result_on_found::success, internal::peek_char, '\n' > {};
+   struct LWSP : internal::star< internal::sor< internal::string< '\r', '\n' >, internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\t' > >, internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\t' > > {};
+   struct OCTET : internal::any< internal::peek_char > {};
+   struct SP : internal::one< internal::result_on_found::success, internal::peek_char, ' ' > {};
+   struct VCHAR : internal::range< internal::result_on_found::success, internal::peek_char, char( 33 ), char( 126 ) > {};
+   struct WSP : internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\t' > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::abnf
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/add_state.hpp b/pxr/base/pegtl/pegtl/contrib/add_state.hpp
new file mode 100644
index 0000000000..edf18c3f2d
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/add_state.hpp
@@ -0,0 +1,69 @@
+// Copyright (c) 2021-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ADD_STATE_HPP
+#define PXR_PEGTL_CONTRIB_ADD_STATE_HPP
+
+#include <type_traits>
+
+#include "../apply_mode.hpp"
+#include "../config.hpp"
+#include "../match.hpp"
+#include "../nothing.hpp"
+#include "../rewind_mode.hpp"
+
+#include "../internal/dependent_false.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename AddState >
+   struct add_state
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if constexpr( std::is_constructible_v< AddState, const ParseInput&, States... > ) {
+            AddState s( static_cast< const ParseInput& >( in ), st... );
+            if( PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, s, st... ) ) {
+               if constexpr( A == apply_mode::action ) {
+                  Action< Rule >::success( static_cast< const ParseInput& >( in ), s, st... );
+               }
+               return true;
+            }
+            return false;
+         }
+         else if constexpr( std::is_default_constructible_v< AddState > ) {
+            AddState s;
+            if( PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, s, st... ) ) {
+               if constexpr( A == apply_mode::action ) {
+                  Action< Rule >::success( static_cast< const ParseInput& >( in ), s, st... );
+               }
+               return true;
+            }
+            return false;
+         }
+         else {
+            static_assert( internal::dependent_false< AddState >, "unable to instantiate new state" );
+         }
+      }
+
+      template< typename ParseInput,
+                typename... States >
+      static void success( const ParseInput& in, AddState& s, States&&... st ) noexcept( noexcept( s.success( in, st... ) ) )
+      {
+         s.success( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/alphabet.hpp b/pxr/base/pegtl/pegtl/contrib/alphabet.hpp
new file mode 100644
index 0000000000..cdb66f1478
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/alphabet.hpp
@@ -0,0 +1,67 @@
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ALPHABET_HPP
+#define PXR_PEGTL_CONTRIB_ALPHABET_HPP
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::alphabet
+{
+   static const char a = 'a';
+   static const char b = 'b';
+   static const char c = 'c';
+   static const char d = 'd';
+   static const char e = 'e';
+   static const char f = 'f';
+   static const char g = 'g';
+   static const char h = 'h';
+   static const char i = 'i';
+   static const char j = 'j';
+   static const char k = 'k';
+   static const char l = 'l';
+   static const char m = 'm';
+   static const char n = 'n';
+   static const char o = 'o';
+   static const char p = 'p';
+   static const char q = 'q';
+   static const char r = 'r';
+   static const char s = 's';
+   static const char t = 't';
+   static const char u = 'u';
+   static const char v = 'v';
+   static const char w = 'w';
+   static const char x = 'x';
+   static const char y = 'y';
+   static const char z = 'z';
+
+   static const char A = 'A';  // NOLINT(readability-identifier-naming)
+   static const char B = 'B';  // NOLINT(readability-identifier-naming)
+   static const char C = 'C';  // NOLINT(readability-identifier-naming)
+   static const char D = 'D';  // NOLINT(readability-identifier-naming)
+   static const char E = 'E';  // NOLINT(readability-identifier-naming)
+   static const char F = 'F';  // NOLINT(readability-identifier-naming)
+   static const char G = 'G';  // NOLINT(readability-identifier-naming)
+   static const char H = 'H';  // NOLINT(readability-identifier-naming)
+   static const char I = 'I';  // NOLINT(readability-identifier-naming)
+   static const char J = 'J';  // NOLINT(readability-identifier-naming)
+   static const char K = 'K';  // NOLINT(readability-identifier-naming)
+   static const char L = 'L';  // NOLINT(readability-identifier-naming)
+   static const char M = 'M';  // NOLINT(readability-identifier-naming)
+   static const char N = 'N';  // NOLINT(readability-identifier-naming)
+   static const char O = 'O';  // NOLINT(readability-identifier-naming)
+   static const char P = 'P';  // NOLINT(readability-identifier-naming)
+   static const char Q = 'Q';  // NOLINT(readability-identifier-naming)
+   static const char R = 'R';  // NOLINT(readability-identifier-naming)
+   static const char S = 'S';  // NOLINT(readability-identifier-naming)
+   static const char T = 'T';  // NOLINT(readability-identifier-naming)
+   static const char U = 'U';  // NOLINT(readability-identifier-naming)
+   static const char V = 'V';  // NOLINT(readability-identifier-naming)
+   static const char W = 'W';  // NOLINT(readability-identifier-naming)
+   static const char X = 'X';  // NOLINT(readability-identifier-naming)
+   static const char Y = 'Y';  // NOLINT(readability-identifier-naming)
+   static const char Z = 'Z';  // NOLINT(readability-identifier-naming)
+
+}  // namespace PXR_PEGTL_NAMESPACE::alphabet
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/analyze.hpp b/pxr/base/pegtl/pegtl/contrib/analyze.hpp
new file mode 100644
index 0000000000..6db48422fe
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/analyze.hpp
@@ -0,0 +1,189 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ANALYZE_HPP
+#define PXR_PEGTL_CONTRIB_ANALYZE_HPP
+
+#include <cassert>
+#include <cstddef>
+#include <iostream>
+#include <map>
+#include <set>
+#include <stdexcept>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+#include "../config.hpp"
+#include "../demangle.hpp"
+
+#include "analyze_traits.hpp"
+
+#include "internal/set_stack_guard.hpp"
+#include "internal/vector_stack_guard.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      struct analyze_entry
+      {
+         explicit analyze_entry( const analyze_type in_type ) noexcept
+            : type( in_type )
+         {}
+
+         const analyze_type type;
+         std::vector< std::string_view > subs;
+      };
+
+      class analyze_cycles_impl
+      {
+      public:
+         analyze_cycles_impl( analyze_cycles_impl&& ) = delete;
+         analyze_cycles_impl( const analyze_cycles_impl& ) = delete;
+
+         ~analyze_cycles_impl() = default;
+
+         analyze_cycles_impl& operator=( analyze_cycles_impl&& ) = delete;
+         analyze_cycles_impl& operator=( const analyze_cycles_impl& ) = delete;
+
+         [[nodiscard]] std::size_t problems()
+         {
+            for( auto& i : m_entries ) {
+               assert( m_trace.empty() );
+               assert( m_stack.empty() );
+               m_results[ i.first ] = work( i, false );
+            }
+            // The number of problems returned is not very informative as some problems will be found multiple times.
+            return m_problems;
+         }
+
+         template< typename Rule >
+         [[nodiscard]] bool consumes() const
+         {
+            // The name "consumes" is a shortcut for "the analyze cycles algorithm could prove that this rule always consumes when it succeeds".
+            return m_results.at( demangle< Rule >() );
+         }
+
+      protected:
+         explicit analyze_cycles_impl( const int verbose ) noexcept
+            : m_verbose( verbose ),
+              m_problems( 0 )
+         {}
+
+         [[nodiscard]] const std::pair< const std::string_view, analyze_entry >& find( const std::string_view name ) const noexcept
+         {
+            const auto iter = m_entries.find( name );
+            assert( iter != m_entries.end() );
+            return *iter;
+         }
+
+         [[nodiscard]] bool work( const std::pair< const std::string_view, analyze_entry >& entry, const bool accum )
+         {
+            if( const auto g = set_stack_guard( m_stack, entry.first ) ) {
+               const auto v = vector_stack_guard( m_trace, entry.first );
+               switch( entry.second.type ) {
+                  case analyze_type::any: {
+                     bool a = false;
+                     for( const auto& r : entry.second.subs ) {
+                        a = a || work( find( r ), accum || a );
+                     }
+                     return true;
+                  }
+                  case analyze_type::opt: {
+                     bool a = false;
+                     for( const auto& r : entry.second.subs ) {
+                        a = a || work( find( r ), accum || a );
+                     }
+                     return false;
+                  }
+                  case analyze_type::seq: {
+                     bool a = false;
+                     for( const auto& r : entry.second.subs ) {
+                        a = a || work( find( r ), accum || a );
+                     }
+                     return a;
+                  }
+                  case analyze_type::sor: {
+                     bool a = true;
+                     for( const auto& r : entry.second.subs ) {
+                        a = a && work( find( r ), accum );
+                     }
+                     return a;
+                  }
+               }
+               assert( false );  // LCOV_EXCL_LINE
+            }
+            assert( !m_trace.empty() );
+
+            if( !accum ) {
+               ++m_problems;
+               // LCOV_EXCL_START
+               if( ( m_verbose >= 0 ) && ( m_trace.front() == entry.first ) ) {
+                  for( const auto& r : m_trace ) {
+                     if( r < entry.first ) {
+                        return accum;
+                     }
+                  }
+                  std::cerr << "WARNING: Possible cycle without progress at rule " << entry.first << std::endl;
+                  if( m_verbose > 0 ) {
+                     for( const auto& r : m_trace ) {
+                        std::cerr << "- involved (transformed) rule: " << r << std::endl;
+                     }
+                  }
+               }
+               // LCOV_EXCL_STOP
+            }
+            return accum;
+         }
+
+         const int m_verbose;
+
+         std::size_t m_problems;
+
+         std::set< std::string_view > m_stack;
+         std::vector< std::string_view > m_trace;
+         std::map< std::string_view, bool > m_results;
+         std::map< std::string_view, analyze_entry > m_entries;
+      };
+
+      template< typename Name >
+      std::string_view analyze_insert( std::map< std::string_view, analyze_entry >& entry )
+      {
+         using Traits = analyze_traits< Name, typename Name::rule_t >;
+
+         const auto [ i, b ] = entry.try_emplace( demangle< Name >(), Traits::type_v );
+         if( b ) {
+            analyze_insert_impl( typename Traits::subs_t(), i->second.subs, entry );
+         }
+         return i->first;
+      }
+
+      template< typename... Subs >
+      void analyze_insert_impl( type_list< Subs... > /*unused*/, std::vector< std::string_view >& subs, std::map< std::string_view, analyze_entry >& entry )
+      {
+         ( subs.emplace_back( analyze_insert< Subs >( entry ) ), ... );
+      }
+
+      template< typename Grammar >
+      struct analyze_cycles
+         : analyze_cycles_impl
+      {
+         explicit analyze_cycles( const int verbose )
+            : analyze_cycles_impl( verbose )
+         {
+            analyze_insert< Grammar >( m_entries );
+         }
+      };
+
+   }  // namespace internal
+
+   template< typename Grammar >
+   [[nodiscard]] std::size_t analyze( const int verbose = 1 )
+   {
+      return internal::analyze_cycles< Grammar >( verbose ).problems();
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/analyze_traits.hpp b/pxr/base/pegtl/pegtl/contrib/analyze_traits.hpp
new file mode 100644
index 0000000000..bfbb5f64b6
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/analyze_traits.hpp
@@ -0,0 +1,277 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ANALYZE_TRAITS_HPP
+#define PXR_PEGTL_CONTRIB_ANALYZE_TRAITS_HPP
+
+#include <type_traits>
+
+#include "../ascii.hpp"
+#include "../config.hpp"
+#include "../rules.hpp"
+#include "../type_list.hpp"
+
+#include "forward.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      enum class analyze_type
+      {
+         any,  // Consumption-on-success is always true; assumes bounded repetition of conjunction of sub-rules.
+         opt,  // Consumption-on-success not necessarily true; assumes bounded repetition of conjunction of sub-rules.
+         seq,  // Consumption-on-success depends on consumption of (non-zero bounded repetition of) conjunction of sub-rules.
+         sor   // Consumption-on-success depends on consumption of (non-zero bounded repetition of) disjunction of sub-rules.
+      };
+
+   }  // namespace internal
+
+   template< typename... Rules >
+   struct analyze_any_traits
+   {
+      static constexpr internal::analyze_type type_v = internal::analyze_type::any;
+      using subs_t = type_list< Rules... >;
+   };
+
+   template< typename... Rules >
+   struct analyze_opt_traits
+   {
+      static constexpr internal::analyze_type type_v = internal::analyze_type::opt;
+      using subs_t = type_list< Rules... >;
+   };
+
+   template< typename... Rules >
+   struct analyze_seq_traits
+   {
+      static constexpr internal::analyze_type type_v = internal::analyze_type::seq;
+      using subs_t = type_list< Rules... >;
+   };
+
+   template< typename... Rules >
+   struct analyze_sor_traits
+   {
+      static constexpr internal::analyze_type type_v = internal::analyze_type::sor;
+      using subs_t = type_list< Rules... >;
+   };
+
+   template< typename Name, template< typename... > class Action, typename... Rules >
+   struct analyze_traits< Name, internal::action< Action, Rules... > >
+      : analyze_traits< Name, typename seq< Rules... >::rule_t >
+   {};
+
+   template< typename Name, typename Peek >
+   struct analyze_traits< Name, internal::any< Peek > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename... Actions >
+   struct analyze_traits< Name, internal::apply< Actions... > >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name, typename... Actions >
+   struct analyze_traits< Name, internal::apply0< Actions... > >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name, typename... Rules >
+   struct analyze_traits< Name, internal::at< Rules... > >
+      : analyze_traits< Name, typename opt< Rules... >::rule_t >
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, internal::bof >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, internal::bol >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name, unsigned Cnt >
+   struct analyze_traits< Name, internal::bytes< Cnt > >
+      : std::conditional_t< ( Cnt != 0 ), analyze_any_traits<>, analyze_opt_traits<> >
+   {};
+
+   template< typename Name, template< typename... > class Control, typename... Rules >
+   struct analyze_traits< Name, internal::control< Control, Rules... > >
+      : analyze_traits< Name, typename seq< Rules... >::rule_t >
+   {};
+
+   template< typename Name, typename... Rules >
+   struct analyze_traits< Name, internal::disable< Rules... > >
+      : analyze_traits< Name, typename seq< Rules... >::rule_t >
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, internal::discard >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name, typename... Rules >
+   struct analyze_traits< Name, internal::enable< Rules... > >
+      : analyze_traits< Name, typename seq< Rules... >::rule_t >
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, internal::eof >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, internal::eol >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, internal::eolf >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, internal::failure >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename Rule, typename... Actions >
+   struct analyze_traits< Name, internal::if_apply< Rule, Actions... > >
+      : analyze_traits< Name, typename Rule::rule_t >
+   {};
+
+   template< typename Name, typename Cond, typename Then, typename Else >
+   struct analyze_traits< Name, internal::if_then_else< Cond, Then, Else > >
+      : analyze_traits< Name, typename sor< seq< Cond, Then >, Else >::rule_t >
+   {};
+
+   template< typename Name, char... Cs >
+   struct analyze_traits< Name, internal::istring< Cs... > >
+      : std::conditional_t< ( sizeof...( Cs ) != 0 ), analyze_any_traits<>, analyze_opt_traits<> >
+   {};
+
+   template< typename Name, typename... Rules >
+   struct analyze_traits< Name, internal::not_at< Rules... > >
+      : analyze_traits< Name, typename opt< Rules... >::rule_t >
+   {};
+
+   template< typename Name, internal::result_on_found R, typename Peek, typename Peek::data_t... Cs >
+   struct analyze_traits< Name, internal::one< R, Peek, Cs... > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename Rule, typename... Rules >
+   struct analyze_traits< Name, internal::opt< Rule, Rules... > >
+      : analyze_opt_traits< Rule, Rules... >
+   {};
+
+   template< typename Name, typename... Rules >
+   struct analyze_traits< Name, internal::plus< Rules... > >
+      : analyze_traits< Name, typename seq< Rules..., opt< Name > >::rule_t >
+   {};
+
+   template< typename Name, internal::result_on_found R, typename Peek, typename Peek::data_t Lo, typename Peek::data_t Hi >
+   struct analyze_traits< Name, internal::range< R, Peek, Lo, Hi > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename Peek, typename Peek::data_t... Cs >
+   struct analyze_traits< Name, internal::ranges< Peek, Cs... > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename Head, typename... Rules >
+   struct analyze_traits< Name, internal::rematch< Head, Rules... > >
+      : analyze_traits< Name, typename sor< Head, sor< seq< Rules, any >... > >::rule_t >  // TODO: Correct (enough)?
+   {};
+
+   template< typename Name, unsigned Cnt, typename... Rules >
+   struct analyze_traits< Name, internal::rep< Cnt, Rules... > >
+      : analyze_traits< Name, std::conditional_t< ( Cnt != 0 ), typename seq< Rules... >::rule_t, typename opt< Rules... >::rule_t > >
+   {};
+
+   template< typename Name, unsigned Min, unsigned Max, typename... Rules >
+   struct analyze_traits< Name, internal::rep_min_max< Min, Max, Rules... > >
+      : analyze_traits< Name, std::conditional_t< ( Min != 0 ), typename seq< Rules... >::rule_t, typename opt< Rules... >::rule_t > >
+   {};
+
+   template< typename Name, unsigned Max, typename... Rules >
+   struct analyze_traits< Name, internal::rep_opt< Max, Rules... > >
+      : analyze_traits< Name, typename opt< Rules... >::rule_t >
+   {};
+
+   template< typename Name, unsigned Amount >
+   struct analyze_traits< Name, internal::require< Amount > >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name, typename Rule, typename... Rules >
+   struct analyze_traits< Name, internal::seq< Rule, Rules... > >
+      : analyze_seq_traits< Rule, Rules... >
+   {};
+
+   template< typename Name, typename Rule, typename... Rules >
+   struct analyze_traits< Name, internal::sor< Rule, Rules... > >
+      : analyze_sor_traits< Rule, Rules... >
+   {};
+
+   template< typename Name, typename... Rules >
+   struct analyze_traits< Name, internal::star< Rules... > >
+      : analyze_traits< Name, typename opt< Rules..., Name >::rule_t >
+   {};
+
+   template< typename Name, typename State, typename... Rules >
+   struct analyze_traits< Name, internal::state< State, Rules... > >
+      : analyze_traits< Name, typename seq< Rules... >::rule_t >
+   {};
+
+   template< typename Name, char... Cs >
+   struct analyze_traits< Name, internal::string< Cs... > >
+      : std::conditional_t< ( sizeof...( Cs ) != 0 ), analyze_any_traits<>, analyze_opt_traits<> >
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, internal::success >
+      : analyze_opt_traits<>
+   {};
+
+   template< typename Name, typename Cond >
+   struct analyze_traits< Name, internal::until< Cond > >
+      : analyze_traits< Name, typename Cond::rule_t >
+   {};
+
+   template< typename Name, typename Cond, typename... Rules >
+   struct analyze_traits< Name, internal::until< Cond, Rules... > >
+      : analyze_traits< Name, typename seq< star< Rules... >, Cond >::rule_t >
+   {};
+
+#if defined( __cpp_exceptions )
+   template< typename Name, typename Cond, typename... Rules >
+   struct analyze_traits< Name, internal::if_must< true, Cond, Rules... > >
+      : analyze_traits< Name, typename opt< Cond, Rules... >::rule_t >
+   {};
+
+   template< typename Name, typename Cond, typename... Rules >
+   struct analyze_traits< Name, internal::if_must< false, Cond, Rules... > >
+      : analyze_traits< Name, typename seq< Cond, Rules... >::rule_t >
+   {};
+
+   template< typename Name, typename... Rules >
+   struct analyze_traits< Name, internal::must< Rules... > >
+      : analyze_traits< Name, typename seq< Rules... >::rule_t >
+   {};
+
+   template< typename Name, typename T >
+   struct analyze_traits< Name, internal::raise< T > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename Exception, typename... Rules >
+   struct analyze_traits< Name, internal::try_catch_type< Exception, Rules... > >
+      : analyze_traits< Name, typename seq< Rules... >::rule_t >
+   {};
+#endif
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/check_bytes.hpp b/pxr/base/pegtl/pegtl/contrib/check_bytes.hpp
new file mode 100644
index 0000000000..a4c8ed9970
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/check_bytes.hpp
@@ -0,0 +1,55 @@
+// Copyright (c) 2021-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_CHECK_BYTES_HPP
+#define PXR_PEGTL_CONTRIB_CHECK_BYTES_HPP
+
+#include "../apply_mode.hpp"
+#include "../config.hpp"
+#include "../match.hpp"
+#include "../nothing.hpp"
+#include "../rewind_mode.hpp"
+
+#if defined( __cpp_exceptions )
+#include "../parse_error.hpp"
+#else
+#include <cstdio>
+#include <exception>
+#endif
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< std::size_t Maximum >
+   struct check_bytes
+      : maybe_nothing
+   {
+      template< typename Rule,
+                pegtl::apply_mode A,
+                pegtl::rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      static bool match( ParseInput& in, States&&... st )
+      {
+         const auto* start = in.current();
+         if( PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... ) ) {
+            if( std::size_t( in.current() - start ) > Maximum ) {
+#if defined( __cpp_exceptions )
+               throw PXR_PEGTL_NAMESPACE::parse_error( "maximum allowed rule consumption exceeded", in );
+#else
+               std::fputs( "maximum allowed rule consumption exceeded\n", stderr );
+               std::terminate();
+#endif
+            }
+            return true;
+         }
+         return false;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/control_action.hpp b/pxr/base/pegtl/pegtl/contrib/control_action.hpp
new file mode 100644
index 0000000000..42edf0c4db
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/control_action.hpp
@@ -0,0 +1,93 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_CONTROL_ACTION_HPP
+#define PXR_PEGTL_CONTRIB_CONTROL_ACTION_HPP
+
+#include <utility>
+
+#include "../config.hpp"
+#include "../match.hpp"
+#include "../nothing.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename, typename Rule, template< typename... > class Action, typename ParseInput, typename... States >
+      inline constexpr bool action_has_unwind = false;
+
+      template< typename Rule, template< typename... > class Action, typename ParseInput, typename... States >
+      inline constexpr bool action_has_unwind< decltype( (void)Action< Rule >::unwind( std::declval< const ParseInput& >(), std::declval< States&& >()... ) ), Rule, Action, ParseInput, States... > = true;
+
+   }  // namespace internal
+
+   struct control_action
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+#if defined( __cpp_exceptions )
+         if constexpr( internal::action_has_unwind< void, Rule, Action, ParseInput, States... > ) {
+            try {
+               return control_action::match_impl< Rule, A, M, Action, Control >( in, st... );
+            }
+            catch( ... ) {
+               Action< Rule >::unwind( const_cast< const ParseInput& >( in ), st... );
+               throw;
+            }
+         }
+         else {
+            return control_action::match_impl< Rule, A, M, Action, Control >( in, st... );
+         }
+#else
+         return control_action::match_impl< Rule, A, M, Action, Control >( in, st... );
+#endif
+      }
+
+      template< typename ParseInput, typename... States >
+      static void start( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+      {}
+
+      template< typename ParseInput, typename... States >
+      static void success( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+      {}
+
+      template< typename ParseInput, typename... States >
+      static void failure( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+      {}
+
+   private:
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match_impl( ParseInput& in, States&&... st )
+      {
+         Action< Rule >::start( const_cast< const ParseInput& >( in ), st... );
+         if( PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... ) ) {
+            Action< Rule >::success( const_cast< const ParseInput& >( in ), st... );
+            return true;
+         }
+         Action< Rule >::failure( const_cast< const ParseInput& >( in ), st... );
+         return false;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/coverage.hpp b/pxr/base/pegtl/pegtl/contrib/coverage.hpp
new file mode 100644
index 0000000000..d01ea507d9
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/coverage.hpp
@@ -0,0 +1,151 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_COVERAGE_HPP
+#define PXR_PEGTL_CONTRIB_COVERAGE_HPP
+
+#include <cstddef>
+#include <map>
+#include <string_view>
+#include <vector>
+
+#include "state_control.hpp"
+
+#include "../apply_mode.hpp"
+#include "../config.hpp"
+#include "../demangle.hpp"
+#include "../normal.hpp"
+#include "../nothing.hpp"
+#include "../parse.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+#include "../visit.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct coverage_info
+   {
+      std::size_t start = 0;
+      std::size_t success = 0;
+      std::size_t failure = 0;
+      std::size_t unwind = 0;
+      std::size_t raise = 0;
+   };
+
+   struct coverage_entry
+      : coverage_info
+   {
+      std::map< std::string_view, coverage_info > branches;
+   };
+
+   using coverage_result = std::map< std::string_view, coverage_entry >;
+
+   namespace internal
+   {
+      template< typename Rule >
+      struct coverage_insert
+      {
+         static void visit( std::map< std::string_view, coverage_entry >& map )
+         {
+            visit_branches( map.try_emplace( demangle< Rule >() ).first->second.branches, typename Rule::subs_t() );
+         }
+
+         template< typename... Ts >
+         static void visit_branches( std::map< std::string_view, coverage_info >& branches, type_list< Ts... > /*unused*/ )
+         {
+            ( branches.try_emplace( demangle< Ts >() ), ... );
+         }
+      };
+
+      struct coverage_state
+      {
+         template< typename Rule >
+         static constexpr bool enable = true;
+
+         explicit coverage_state( coverage_result& in_result )
+            : result( in_result )
+         {}
+
+         coverage_result& result;
+         std::vector< std::string_view > stack;
+
+         template< typename Rule, typename ParseInput, typename... States >
+         void start( const ParseInput& /*unused*/, States&&... /*unused*/ )
+         {
+            const auto name = demangle< Rule >();
+            ++result.at( name ).start;
+            if( !stack.empty() ) {
+               ++result.at( stack.back() ).branches.at( name ).start;
+            }
+            stack.push_back( name );
+         }
+
+         template< typename Rule, typename ParseInput, typename... States >
+         void success( const ParseInput& /*unused*/, States&&... /*unused*/ )
+         {
+            stack.pop_back();
+            const auto name = demangle< Rule >();
+            ++result.at( name ).success;
+            if( !stack.empty() ) {
+               ++result.at( stack.back() ).branches.at( name ).success;
+            }
+         }
+
+         template< typename Rule, typename ParseInput, typename... States >
+         void failure( const ParseInput& /*unused*/, States&&... /*unused*/ )
+         {
+            stack.pop_back();
+            const auto name = demangle< Rule >();
+            ++result.at( name ).failure;
+            if( !stack.empty() ) {
+               ++result.at( stack.back() ).branches.at( name ).failure;
+            }
+         }
+
+         template< typename Rule, typename ParseInput, typename... States >
+         void raise( const ParseInput& /*unused*/, States&&... /*unused*/ )
+         {
+            const auto name = demangle< Rule >();
+            ++result.at( name ).raise;
+            if( !stack.empty() ) {
+               ++result.at( stack.back() ).branches.at( name ).raise;
+            }
+         }
+
+         template< typename Rule, typename ParseInput, typename... States >
+         void unwind( const ParseInput& /*unused*/, States&&... /*unused*/ )
+         {
+            stack.pop_back();
+            const auto name = demangle< Rule >();
+            ++result.at( name ).unwind;
+            if( !stack.empty() ) {
+               ++result.at( stack.back() ).branches.at( name ).unwind;
+            }
+         }
+
+         template< typename Rule, typename ParseInput, typename... States >
+         void apply( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+         {}
+
+         template< typename Rule, typename ParseInput, typename... States >
+         void apply0( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+         {}
+      };
+
+   }  // namespace internal
+
+   template< typename Rule,
+             template< typename... > class Action = nothing,
+             template< typename... > class Control = normal,
+             typename ParseInput,
+             typename... States >
+   bool coverage( ParseInput&& in, coverage_result& result, States&&... st )
+   {
+      internal::coverage_state state( result );
+      visit< Rule, internal::coverage_insert >( state.result );  // Fill map with all sub-rules of the grammar.
+      return parse< Rule, Action, state_control< Control >::template type >( in, st..., state );
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/forward.hpp b/pxr/base/pegtl/pegtl/contrib/forward.hpp
new file mode 100644
index 0000000000..54c39f7bfb
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/forward.hpp
@@ -0,0 +1,16 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_FORWARD_HPP
+#define PXR_PEGTL_CONTRIB_FORWARD_HPP
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename Name, typename Rule, typename = void >
+   struct analyze_traits;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/function.hpp b/pxr/base/pegtl/pegtl/contrib/function.hpp
new file mode 100644
index 0000000000..6fcad083a9
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/function.hpp
@@ -0,0 +1,52 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_FUNCTION_HPP
+#define PXR_PEGTL_CONTRIB_FUNCTION_HPP
+
+#include "../config.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+#include "../internal/enable_control.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename F, F U >
+      struct function;
+
+      template< typename ParseInput, typename... States, bool ( *U )( ParseInput&, States... ) >
+      struct function< bool ( * )( ParseInput&, States... ), U >
+      {
+         using rule_t = function;
+         using subs_t = empty_list;
+
+         template< apply_mode A,
+                   rewind_mode M,
+                   template< typename... >
+                   class Action,
+                   template< typename... >
+                   class Control >
+         [[nodiscard]] static bool match( ParseInput& in, States... st ) noexcept( noexcept( U( in, st... ) ) )
+         {
+            return U( in, st... );
+         }
+      };
+
+      template< typename F, F U >
+      inline constexpr bool enable_control< function< F, U > > = false;
+
+   }  // namespace internal
+
+   template< auto F >
+   struct function
+      : internal::function< decltype( F ), F >
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/http.hpp b/pxr/base/pegtl/pegtl/contrib/http.hpp
new file mode 100644
index 0000000000..4845b5ffb2
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/http.hpp
@@ -0,0 +1,277 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_HTTP_HPP
+#define PXR_PEGTL_CONTRIB_HTTP_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/contrib/http.hpp"
+#else
+
+#include "../ascii.hpp"
+#include "../config.hpp"
+#include "../nothing.hpp"
+#include "../rules.hpp"
+#include "../utf8.hpp"
+
+#include "abnf.hpp"
+#include "forward.hpp"
+#include "remove_first_state.hpp"
+#include "uri.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::http
+{
+   // HTTP 1.1 grammar according to RFC 7230.
+
+   // This grammar is a direct PEG translation of the original HTTP grammar.
+   // It should be considered experimental -- in case of any issues, in particular
+   // missing rules for attached actions, please contact the developers.
+
+   using OWS = star< abnf::WSP >;  // optional whitespace
+   using RWS = plus< abnf::WSP >;  // required whitespace
+   using BWS = OWS;                // "bad" whitespace
+
+   using obs_text = not_range< 0x00, 0x7F >;
+   using obs_fold = seq< abnf::CRLF, plus< abnf::WSP > >;
+
+   // clang-format off
+   struct tchar : sor< abnf::ALPHA, abnf::DIGIT, one< '!', '#', '$', '%', '&', '\'', '*', '+', '-', '.', '^', '_', '`', '|', '~' > > {};
+   struct token : plus< tchar > {};
+
+   struct field_name : token {};
+
+   struct field_vchar : sor< abnf::VCHAR, obs_text > {};
+   struct field_content : list< field_vchar, plus< abnf::WSP > > {};
+   struct field_value : star< sor< field_content, obs_fold > > {};
+
+   struct header_field : seq< field_name, one< ':' >, OWS, field_value, OWS > {};
+
+   struct method : token {};
+
+   struct absolute_path : plus< one< '/' >, uri::segment > {};
+
+   struct origin_form : seq< absolute_path, uri::opt_query >  {};
+   struct absolute_form : uri::absolute_URI {};
+   struct authority_form : uri::authority {};
+   struct asterisk_form : one< '*' > {};
+
+   struct request_target : sor< origin_form, absolute_form, authority_form, asterisk_form > {};
+
+   struct status_code : rep< 3, abnf::DIGIT > {};
+   struct reason_phrase : star< sor< abnf::VCHAR, obs_text, abnf::WSP > > {};
+
+   struct HTTP_version : if_must< string< 'H', 'T', 'T', 'P', '/' >, abnf::DIGIT, one< '.' >, abnf::DIGIT > {};
+
+   struct request_line : if_must< method, abnf::SP, request_target, abnf::SP, HTTP_version, abnf::CRLF > {};
+   struct status_line : if_must< HTTP_version, abnf::SP, status_code, abnf::SP, reason_phrase, abnf::CRLF > {};
+   struct start_line : sor< status_line, request_line > {};
+
+   struct message_body : star< abnf::OCTET > {};
+   struct HTTP_message : seq< start_line, star< header_field, abnf::CRLF >, abnf::CRLF, opt< message_body > > {};
+
+   struct Content_Length : plus< abnf::DIGIT > {};
+
+   struct uri_host : uri::host {};
+   struct port : uri::port {};
+
+   struct Host : seq< uri_host, opt< one< ':' >, port > > {};
+
+   // PEG are different from CFGs! (this replaces ctext and qdtext)
+   using text = sor< abnf::HTAB, range< 0x20, 0x7E >, obs_text >;
+
+   struct quoted_pair : if_must< one< '\\' >, sor< abnf::VCHAR, obs_text, abnf::WSP > > {};
+   struct quoted_string : if_must< abnf::DQUOTE, until< abnf::DQUOTE, sor< quoted_pair, text > > > {};
+
+   struct transfer_parameter : seq< token, BWS, one< '=' >, BWS, sor< token, quoted_string > > {};
+   struct transfer_extension : seq< token, star< OWS, one< ';' >, OWS, transfer_parameter > > {};
+   struct transfer_coding : sor< istring< 'c', 'h', 'u', 'n', 'k', 'e', 'd' >,
+                                 istring< 'c', 'o', 'm', 'p', 'r', 'e', 's', 's' >,
+                                 istring< 'd', 'e', 'f', 'l', 'a', 't', 'e' >,
+                                 istring< 'g', 'z', 'i', 'p' >,
+                                 transfer_extension > {};
+
+   struct rank : sor< seq< one< '0' >, opt< one< '.' >, rep_opt< 3, abnf::DIGIT > > >,
+                      seq< one< '1' >, opt< one< '.' >, rep_opt< 3, one< '0' > > > > > {};
+
+   struct t_ranking : seq< OWS, one< ';' >, OWS, one< 'q', 'Q' >, one< '=' >, rank > {};
+   struct t_codings : sor< istring< 't', 'r', 'a', 'i', 'l', 'e', 'r', 's' >, seq< transfer_coding, opt< t_ranking > > > {};
+
+   struct TE : opt< sor< one< ',' >, t_codings >, star< OWS, one< ',' >, opt< OWS, t_codings > > > {};
+
+   template< typename T >
+   using make_comma_list = seq< star< one< ',' >, OWS >, T, star< OWS, one< ',' >, opt< OWS, T > > >;
+
+   struct connection_option : token {};
+   struct Connection : make_comma_list< connection_option > {};
+
+   struct Trailer : make_comma_list< field_name > {};
+
+   struct Transfer_Encoding : make_comma_list< transfer_coding > {};
+
+   struct protocol_name : token {};
+   struct protocol_version : token {};
+   struct protocol : seq< protocol_name, opt< one< '/' >, protocol_version > > {};
+   struct Upgrade : make_comma_list< protocol > {};
+
+   struct pseudonym : token {};
+
+   struct received_protocol : seq< opt< protocol_name, one< '/' > >, protocol_version > {};
+   struct received_by : sor< seq< uri_host, opt< one< ':' >, port > >, pseudonym > {};
+
+   struct comment : if_must< one< '(' >, until< one< ')' >, sor< comment, quoted_pair, text > > > {};
+
+   struct Via : make_comma_list< seq< received_protocol, RWS, received_by, opt< RWS, comment > > > {};
+
+   struct http_URI : if_must< istring< 'h', 't', 't', 'p', ':', '/', '/' >, uri::authority, uri::path_abempty, uri::opt_query, uri::opt_fragment > {};
+   struct https_URI : if_must< istring< 'h', 't', 't', 'p', 's', ':', '/', '/' >, uri::authority, uri::path_abempty, uri::opt_query, uri::opt_fragment > {};
+
+   struct partial_URI : seq< uri::relative_part, uri::opt_query > {};
+   // clang-format on
+
+   struct chunk_size
+   {
+      using rule_t = plus< abnf::HEXDIG >::rule_t;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, std::size_t& size, States&&... /*unused*/ )
+      {
+         size = 0;
+         std::size_t i = 0;
+         while( in.size( i + 1 ) >= i + 1 ) {
+            const auto c = in.peek_char( i );
+            if( ( '0' <= c ) && ( c <= '9' ) ) {
+               size <<= 4;
+               size |= std::size_t( c - '0' );
+               ++i;
+               continue;
+            }
+            if( ( 'a' <= c ) && ( c <= 'f' ) ) {
+               size <<= 4;
+               size |= std::size_t( c - 'a' + 10 );
+               ++i;
+               continue;
+            }
+            if( ( 'A' <= c ) && ( c <= 'F' ) ) {
+               size <<= 4;
+               size |= std::size_t( c - 'A' + 10 );
+               ++i;
+               continue;
+            }
+            break;
+         }
+         in.bump_in_this_line( i );
+         return i > 0;
+      }
+   };
+
+   // clang-format off
+   struct chunk_ext_name : token {};
+   struct chunk_ext_val : sor< quoted_string, token > {};
+   struct chunk_ext : star_must< one< ';' >, chunk_ext_name, if_must< one< '=' >, chunk_ext_val > > {};
+   // clang-format on
+
+   struct chunk_data
+   {
+      using rule_t = star< abnf::OCTET >::rule_t;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, const std::size_t size, States&&... /*unused*/ )
+      {
+         if( in.size( size ) >= size ) {
+            in.bump( size );
+            return true;
+         }
+         return false;
+      }
+   };
+
+   namespace internal::chunk_helper
+   {
+      template< typename Base >
+      struct control;
+
+      template< template< typename... > class Control, typename Rule >
+      struct control< Control< Rule > >
+         : Control< Rule >
+      {
+         template< apply_mode A,
+                   rewind_mode M,
+                   template< typename... >
+                   class Action,
+                   template< typename... >
+                   class,
+                   typename ParseInput,
+                   typename State,
+                   typename... States >
+         [[nodiscard]] static bool match( ParseInput& in, State&& /*unused*/, States&&... st )
+         {
+            return Control< Rule >::template match< A, M, Action, Control >( in, st... );
+         }
+      };
+
+      template< template< typename... > class Control >
+      struct control< Control< chunk_size > >
+         : remove_first_state< Control< chunk_size > >
+      {};
+
+      template< template< typename... > class Control >
+      struct control< Control< chunk_data > >
+         : remove_first_state< Control< chunk_data > >
+      {};
+
+      template< template< typename... > class Control >
+      struct bind
+      {
+         template< typename Rule >
+         using type = control< Control< Rule > >;
+      };
+
+   }  // namespace internal::chunk_helper
+
+   struct chunk
+   {
+      using impl = seq< chunk_size, chunk_ext, abnf::CRLF, chunk_data, abnf::CRLF >;
+
+      using rule_t = impl::rule_t;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         std::size_t size{};
+         return impl::template match< A, M, Action, internal::chunk_helper::bind< Control >::template type >( in, size, st... );
+      }
+   };
+
+   // clang-format off
+   struct last_chunk : seq< plus< one< '0' > >, not_at< digit >, chunk_ext, abnf::CRLF > {};
+
+   struct trailer_part : star< header_field, abnf::CRLF > {};
+
+   struct chunked_body : seq< until< last_chunk, chunk >, trailer_part, abnf::CRLF > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::http
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/icu/internal.hpp b/pxr/base/pegtl/pegtl/contrib/icu/internal.hpp
new file mode 100644
index 0000000000..52185b458a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/icu/internal.hpp
@@ -0,0 +1,98 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ICU_INTERNAL_HPP
+#define PXR_PEGTL_CONTRIB_ICU_INTERNAL_HPP
+
+#include <unicode/uchar.h>
+
+#include "../analyze_traits.hpp"
+
+#include "../../config.hpp"
+#include "../../type_list.hpp"
+
+#include "../../internal/enable_control.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      namespace icu
+      {
+         template< typename Peek, UProperty P, bool V = true >
+         struct binary_property
+         {
+            using peek_t = Peek;
+            using data_t = typename Peek::data_t;
+
+            using rule_t = binary_property;
+            using subs_t = empty_list;
+
+            [[nodiscard]] static bool test( const data_t c ) noexcept
+            {
+               return u_hasBinaryProperty( c, P ) == V;
+            }
+
+            template< typename ParseInput >
+            [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( Peek::peek( in ) ) )
+            {
+               if( const auto t = Peek::peek( in ) ) {
+                  if( test( t.data ) ) {
+                     in.bump( t.size );
+                     return true;
+                  }
+               }
+               return false;
+            }
+         };
+
+         template< typename Peek, UProperty P, int V >
+         struct property_value
+         {
+            using peek_t = Peek;
+            using data_t = typename Peek::data_t;
+
+            using rule_t = property_value;
+            using subs_t = empty_list;
+
+            [[nodiscard]] static bool test( const data_t c ) noexcept
+            {
+               return u_getIntPropertyValue( c, P ) == V;
+            }
+
+            template< typename ParseInput >
+            [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( Peek::peek( in ) ) )
+            {
+               if( const auto t = Peek::peek( in ) ) {
+                  if( test( t.data ) ) {
+                     in.bump( t.size );
+                     return true;
+                  }
+               }
+               return false;
+            }
+         };
+
+      }  // namespace icu
+
+      template< typename Peek, UProperty P, bool V >
+      inline constexpr bool enable_control< icu::binary_property< Peek, P, V > > = false;
+
+      template< typename Peek, UProperty P, int V >
+      inline constexpr bool enable_control< icu::property_value< Peek, P, V > > = false;
+
+   }  // namespace internal
+
+   template< typename Name, typename Peek, UProperty P, bool V >
+   struct analyze_traits< Name, internal::icu::binary_property< Peek, P, V > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename Peek, UProperty P, int V >
+   struct analyze_traits< Name, internal::icu::property_value< Peek, P, V > >
+      : analyze_any_traits<>
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/icu/utf16.hpp b/pxr/base/pegtl/pegtl/contrib/icu/utf16.hpp
new file mode 100644
index 0000000000..932696b1d6
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/icu/utf16.hpp
@@ -0,0 +1,196 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ICU_UTF16_HPP
+#define PXR_PEGTL_CONTRIB_ICU_UTF16_HPP
+
+#include "internal.hpp"
+
+#include "../../config.hpp"
+#include "../utf16.hpp"
+
+#include "../internal/peek_utf16.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace utf16_be::icu
+   {
+      template< UProperty P, bool V = true >
+      struct binary_property
+         : internal::icu::binary_property< internal::peek_utf16_be, P, V >
+      {};
+
+      template< UProperty P, int V >
+      struct property_value
+         : internal::icu::property_value< internal::peek_utf16_be, P, V >
+      {};
+
+      // clang-format off
+      struct alphabetic : binary_property< UCHAR_ALPHABETIC > {};
+      struct ascii_hex_digit : binary_property< UCHAR_ASCII_HEX_DIGIT > {};
+      struct bidi_control : binary_property< UCHAR_BIDI_CONTROL > {};
+      struct bidi_mirrored : binary_property< UCHAR_BIDI_MIRRORED > {};
+      struct case_sensitive : binary_property< UCHAR_CASE_SENSITIVE > {};
+      struct dash : binary_property< UCHAR_DASH > {};
+      struct default_ignorable_code_point : binary_property< UCHAR_DEFAULT_IGNORABLE_CODE_POINT > {};
+      struct deprecated : binary_property< UCHAR_DEPRECATED > {};
+      struct diacritic : binary_property< UCHAR_DIACRITIC > {};
+      struct extender : binary_property< UCHAR_EXTENDER > {};
+      struct full_composition_exclusion : binary_property< UCHAR_FULL_COMPOSITION_EXCLUSION > {};
+      struct grapheme_base : binary_property< UCHAR_GRAPHEME_BASE > {};
+      struct grapheme_extend : binary_property< UCHAR_GRAPHEME_EXTEND > {};
+      struct grapheme_link : binary_property< UCHAR_GRAPHEME_LINK > {};
+      struct hex_digit : binary_property< UCHAR_HEX_DIGIT > {};
+      struct hyphen : binary_property< UCHAR_HYPHEN > {};
+      struct id_continue : binary_property< UCHAR_ID_CONTINUE > {};
+      struct id_start : binary_property< UCHAR_ID_START > {};
+      struct ideographic : binary_property< UCHAR_IDEOGRAPHIC > {};
+      struct ids_binary_operator : binary_property< UCHAR_IDS_BINARY_OPERATOR > {};
+      struct ids_trinary_operator : binary_property< UCHAR_IDS_TRINARY_OPERATOR > {};
+      struct join_control : binary_property< UCHAR_JOIN_CONTROL > {};
+      struct logical_order_exception : binary_property< UCHAR_LOGICAL_ORDER_EXCEPTION > {};
+      struct lowercase : binary_property< UCHAR_LOWERCASE > {};
+      struct math : binary_property< UCHAR_MATH > {};
+      struct nfc_inert : binary_property< UCHAR_NFC_INERT > {};
+      struct nfd_inert : binary_property< UCHAR_NFD_INERT > {};
+      struct nfkc_inert : binary_property< UCHAR_NFKC_INERT > {};
+      struct nfkd_inert : binary_property< UCHAR_NFKD_INERT > {};
+      struct noncharacter_code_point : binary_property< UCHAR_NONCHARACTER_CODE_POINT > {};
+      struct pattern_syntax : binary_property< UCHAR_PATTERN_SYNTAX > {};
+      struct pattern_white_space : binary_property< UCHAR_PATTERN_WHITE_SPACE > {};
+      struct posix_alnum : binary_property< UCHAR_POSIX_ALNUM > {};
+      struct posix_blank : binary_property< UCHAR_POSIX_BLANK > {};
+      struct posix_graph : binary_property< UCHAR_POSIX_GRAPH > {};
+      struct posix_print : binary_property< UCHAR_POSIX_PRINT > {};
+      struct posix_xdigit : binary_property< UCHAR_POSIX_XDIGIT > {};
+      struct quotation_mark : binary_property< UCHAR_QUOTATION_MARK > {};
+      struct radical : binary_property< UCHAR_RADICAL > {};
+      struct s_term : binary_property< UCHAR_S_TERM > {};
+      struct segment_starter : binary_property< UCHAR_SEGMENT_STARTER > {};
+      struct soft_dotted : binary_property< UCHAR_SOFT_DOTTED > {};
+      struct terminal_punctuation : binary_property< UCHAR_TERMINAL_PUNCTUATION > {};
+      struct unified_ideograph : binary_property< UCHAR_UNIFIED_IDEOGRAPH > {};
+      struct uppercase : binary_property< UCHAR_UPPERCASE > {};
+      struct variation_selector : binary_property< UCHAR_VARIATION_SELECTOR > {};
+      struct white_space : binary_property< UCHAR_WHITE_SPACE > {};
+      struct xid_continue : binary_property< UCHAR_XID_CONTINUE > {};
+      struct xid_start : binary_property< UCHAR_XID_START > {};
+
+      template< UCharDirection V > struct bidi_class : property_value< UCHAR_BIDI_CLASS, V > {};
+      template< UBlockCode V > struct block : property_value< UCHAR_BLOCK, V > {};
+      template< UDecompositionType V > struct decomposition_type : property_value< UCHAR_DECOMPOSITION_TYPE, V > {};
+      template< UEastAsianWidth V > struct east_asian_width : property_value< UCHAR_EAST_ASIAN_WIDTH, V > {};
+      template< UCharCategory V > struct general_category : property_value< UCHAR_GENERAL_CATEGORY, V > {};
+      template< UGraphemeClusterBreak V > struct grapheme_cluster_break : property_value< UCHAR_GRAPHEME_CLUSTER_BREAK, V > {};
+      template< UHangulSyllableType V > struct hangul_syllable_type : property_value< UCHAR_HANGUL_SYLLABLE_TYPE, V > {};
+      template< UJoiningGroup V > struct joining_group : property_value< UCHAR_JOINING_GROUP, V > {};
+      template< UJoiningType V > struct joining_type : property_value< UCHAR_JOINING_TYPE, V > {};
+      template< ULineBreak V > struct line_break : property_value< UCHAR_LINE_BREAK, V > {};
+      // UNormalizationCheckResult requires an additional header <unicode/unorm2.h>:
+      // template< UNormalizationCheckResult V > struct nfc_quick_check : property_value< UCHAR_NFC_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfd_quick_check : property_value< UCHAR_NFD_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfkc_quick_check : property_value< UCHAR_NFKC_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfkd_quick_check : property_value< UCHAR_NFKD_QUICK_CHECK, V > {};
+      template< UNumericType V > struct numeric_type : property_value< UCHAR_NUMERIC_TYPE, V > {};
+      template< USentenceBreak V > struct sentence_break : property_value< UCHAR_SENTENCE_BREAK, V > {};
+      template< UWordBreakValues V > struct word_break : property_value< UCHAR_WORD_BREAK, V > {};
+
+      template< std::uint8_t V > struct canonical_combining_class : property_value< UCHAR_CANONICAL_COMBINING_CLASS, V > {};
+      template< std::uint8_t V > struct lead_canonical_combining_class : property_value< UCHAR_LEAD_CANONICAL_COMBINING_CLASS, V > {};
+      template< std::uint8_t V > struct trail_canonical_combining_class : property_value< UCHAR_TRAIL_CANONICAL_COMBINING_CLASS, V > {};
+      // clang-format on
+
+   }  // namespace utf16_be::icu
+
+   namespace utf16_le::icu
+   {
+      template< UProperty P, bool V = true >
+      struct binary_property
+         : internal::icu::binary_property< internal::peek_utf16_le, P, V >
+      {};
+
+      template< UProperty P, int V >
+      struct property_value
+         : internal::icu::property_value< internal::peek_utf16_le, P, V >
+      {};
+
+      // clang-format off
+      struct alphabetic : binary_property< UCHAR_ALPHABETIC > {};
+      struct ascii_hex_digit : binary_property< UCHAR_ASCII_HEX_DIGIT > {};
+      struct bidi_control : binary_property< UCHAR_BIDI_CONTROL > {};
+      struct bidi_mirrored : binary_property< UCHAR_BIDI_MIRRORED > {};
+      struct case_sensitive : binary_property< UCHAR_CASE_SENSITIVE > {};
+      struct dash : binary_property< UCHAR_DASH > {};
+      struct default_ignorable_code_point : binary_property< UCHAR_DEFAULT_IGNORABLE_CODE_POINT > {};
+      struct deprecated : binary_property< UCHAR_DEPRECATED > {};
+      struct diacritic : binary_property< UCHAR_DIACRITIC > {};
+      struct extender : binary_property< UCHAR_EXTENDER > {};
+      struct full_composition_exclusion : binary_property< UCHAR_FULL_COMPOSITION_EXCLUSION > {};
+      struct grapheme_base : binary_property< UCHAR_GRAPHEME_BASE > {};
+      struct grapheme_extend : binary_property< UCHAR_GRAPHEME_EXTEND > {};
+      struct grapheme_link : binary_property< UCHAR_GRAPHEME_LINK > {};
+      struct hex_digit : binary_property< UCHAR_HEX_DIGIT > {};
+      struct hyphen : binary_property< UCHAR_HYPHEN > {};
+      struct id_continue : binary_property< UCHAR_ID_CONTINUE > {};
+      struct id_start : binary_property< UCHAR_ID_START > {};
+      struct ideographic : binary_property< UCHAR_IDEOGRAPHIC > {};
+      struct ids_binary_operator : binary_property< UCHAR_IDS_BINARY_OPERATOR > {};
+      struct ids_trinary_operator : binary_property< UCHAR_IDS_TRINARY_OPERATOR > {};
+      struct join_control : binary_property< UCHAR_JOIN_CONTROL > {};
+      struct logical_order_exception : binary_property< UCHAR_LOGICAL_ORDER_EXCEPTION > {};
+      struct lowercase : binary_property< UCHAR_LOWERCASE > {};
+      struct math : binary_property< UCHAR_MATH > {};
+      struct nfc_inert : binary_property< UCHAR_NFC_INERT > {};
+      struct nfd_inert : binary_property< UCHAR_NFD_INERT > {};
+      struct nfkc_inert : binary_property< UCHAR_NFKC_INERT > {};
+      struct nfkd_inert : binary_property< UCHAR_NFKD_INERT > {};
+      struct noncharacter_code_point : binary_property< UCHAR_NONCHARACTER_CODE_POINT > {};
+      struct pattern_syntax : binary_property< UCHAR_PATTERN_SYNTAX > {};
+      struct pattern_white_space : binary_property< UCHAR_PATTERN_WHITE_SPACE > {};
+      struct posix_alnum : binary_property< UCHAR_POSIX_ALNUM > {};
+      struct posix_blank : binary_property< UCHAR_POSIX_BLANK > {};
+      struct posix_graph : binary_property< UCHAR_POSIX_GRAPH > {};
+      struct posix_print : binary_property< UCHAR_POSIX_PRINT > {};
+      struct posix_xdigit : binary_property< UCHAR_POSIX_XDIGIT > {};
+      struct quotation_mark : binary_property< UCHAR_QUOTATION_MARK > {};
+      struct radical : binary_property< UCHAR_RADICAL > {};
+      struct s_term : binary_property< UCHAR_S_TERM > {};
+      struct segment_starter : binary_property< UCHAR_SEGMENT_STARTER > {};
+      struct soft_dotted : binary_property< UCHAR_SOFT_DOTTED > {};
+      struct terminal_punctuation : binary_property< UCHAR_TERMINAL_PUNCTUATION > {};
+      struct unified_ideograph : binary_property< UCHAR_UNIFIED_IDEOGRAPH > {};
+      struct uppercase : binary_property< UCHAR_UPPERCASE > {};
+      struct variation_selector : binary_property< UCHAR_VARIATION_SELECTOR > {};
+      struct white_space : binary_property< UCHAR_WHITE_SPACE > {};
+      struct xid_continue : binary_property< UCHAR_XID_CONTINUE > {};
+      struct xid_start : binary_property< UCHAR_XID_START > {};
+
+      template< UCharDirection V > struct bidi_class : property_value< UCHAR_BIDI_CLASS, V > {};
+      template< UBlockCode V > struct block : property_value< UCHAR_BLOCK, V > {};
+      template< UDecompositionType V > struct decomposition_type : property_value< UCHAR_DECOMPOSITION_TYPE, V > {};
+      template< UEastAsianWidth V > struct east_asian_width : property_value< UCHAR_EAST_ASIAN_WIDTH, V > {};
+      template< UCharCategory V > struct general_category : property_value< UCHAR_GENERAL_CATEGORY, V > {};
+      template< UGraphemeClusterBreak V > struct grapheme_cluster_break : property_value< UCHAR_GRAPHEME_CLUSTER_BREAK, V > {};
+      template< UHangulSyllableType V > struct hangul_syllable_type : property_value< UCHAR_HANGUL_SYLLABLE_TYPE, V > {};
+      template< UJoiningGroup V > struct joining_group : property_value< UCHAR_JOINING_GROUP, V > {};
+      template< UJoiningType V > struct joining_type : property_value< UCHAR_JOINING_TYPE, V > {};
+      template< ULineBreak V > struct line_break : property_value< UCHAR_LINE_BREAK, V > {};
+      // UNormalizationCheckResult requires an additional header <unicode/unorm2.h>:
+      // template< UNormalizationCheckResult V > struct nfc_quick_check : property_value< UCHAR_NFC_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfd_quick_check : property_value< UCHAR_NFD_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfkc_quick_check : property_value< UCHAR_NFKC_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfkd_quick_check : property_value< UCHAR_NFKD_QUICK_CHECK, V > {};
+      template< UNumericType V > struct numeric_type : property_value< UCHAR_NUMERIC_TYPE, V > {};
+      template< USentenceBreak V > struct sentence_break : property_value< UCHAR_SENTENCE_BREAK, V > {};
+      template< UWordBreakValues V > struct word_break : property_value< UCHAR_WORD_BREAK, V > {};
+
+      template< std::uint8_t V > struct canonical_combining_class : property_value< UCHAR_CANONICAL_COMBINING_CLASS, V > {};
+      template< std::uint8_t V > struct lead_canonical_combining_class : property_value< UCHAR_LEAD_CANONICAL_COMBINING_CLASS, V > {};
+      template< std::uint8_t V > struct trail_canonical_combining_class : property_value< UCHAR_TRAIL_CANONICAL_COMBINING_CLASS, V > {};
+      // clang-format on
+
+   }  // namespace utf16_le::icu
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/icu/utf32.hpp b/pxr/base/pegtl/pegtl/contrib/icu/utf32.hpp
new file mode 100644
index 0000000000..cb800cbf41
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/icu/utf32.hpp
@@ -0,0 +1,196 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ICU_UTF32_HPP
+#define PXR_PEGTL_CONTRIB_ICU_UTF32_HPP
+
+#include "internal.hpp"
+
+#include "../../config.hpp"
+#include "../utf32.hpp"
+
+#include "../internal/peek_utf32.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace utf32_be::icu
+   {
+      template< UProperty P, bool V = true >
+      struct binary_property
+         : internal::icu::binary_property< internal::peek_utf32_be, P, V >
+      {};
+
+      template< UProperty P, int V >
+      struct property_value
+         : internal::icu::property_value< internal::peek_utf32_be, P, V >
+      {};
+
+      // clang-format off
+      struct alphabetic : binary_property< UCHAR_ALPHABETIC > {};
+      struct ascii_hex_digit : binary_property< UCHAR_ASCII_HEX_DIGIT > {};
+      struct bidi_control : binary_property< UCHAR_BIDI_CONTROL > {};
+      struct bidi_mirrored : binary_property< UCHAR_BIDI_MIRRORED > {};
+      struct case_sensitive : binary_property< UCHAR_CASE_SENSITIVE > {};
+      struct dash : binary_property< UCHAR_DASH > {};
+      struct default_ignorable_code_point : binary_property< UCHAR_DEFAULT_IGNORABLE_CODE_POINT > {};
+      struct deprecated : binary_property< UCHAR_DEPRECATED > {};
+      struct diacritic : binary_property< UCHAR_DIACRITIC > {};
+      struct extender : binary_property< UCHAR_EXTENDER > {};
+      struct full_composition_exclusion : binary_property< UCHAR_FULL_COMPOSITION_EXCLUSION > {};
+      struct grapheme_base : binary_property< UCHAR_GRAPHEME_BASE > {};
+      struct grapheme_extend : binary_property< UCHAR_GRAPHEME_EXTEND > {};
+      struct grapheme_link : binary_property< UCHAR_GRAPHEME_LINK > {};
+      struct hex_digit : binary_property< UCHAR_HEX_DIGIT > {};
+      struct hyphen : binary_property< UCHAR_HYPHEN > {};
+      struct id_continue : binary_property< UCHAR_ID_CONTINUE > {};
+      struct id_start : binary_property< UCHAR_ID_START > {};
+      struct ideographic : binary_property< UCHAR_IDEOGRAPHIC > {};
+      struct ids_binary_operator : binary_property< UCHAR_IDS_BINARY_OPERATOR > {};
+      struct ids_trinary_operator : binary_property< UCHAR_IDS_TRINARY_OPERATOR > {};
+      struct join_control : binary_property< UCHAR_JOIN_CONTROL > {};
+      struct logical_order_exception : binary_property< UCHAR_LOGICAL_ORDER_EXCEPTION > {};
+      struct lowercase : binary_property< UCHAR_LOWERCASE > {};
+      struct math : binary_property< UCHAR_MATH > {};
+      struct nfc_inert : binary_property< UCHAR_NFC_INERT > {};
+      struct nfd_inert : binary_property< UCHAR_NFD_INERT > {};
+      struct nfkc_inert : binary_property< UCHAR_NFKC_INERT > {};
+      struct nfkd_inert : binary_property< UCHAR_NFKD_INERT > {};
+      struct noncharacter_code_point : binary_property< UCHAR_NONCHARACTER_CODE_POINT > {};
+      struct pattern_syntax : binary_property< UCHAR_PATTERN_SYNTAX > {};
+      struct pattern_white_space : binary_property< UCHAR_PATTERN_WHITE_SPACE > {};
+      struct posix_alnum : binary_property< UCHAR_POSIX_ALNUM > {};
+      struct posix_blank : binary_property< UCHAR_POSIX_BLANK > {};
+      struct posix_graph : binary_property< UCHAR_POSIX_GRAPH > {};
+      struct posix_print : binary_property< UCHAR_POSIX_PRINT > {};
+      struct posix_xdigit : binary_property< UCHAR_POSIX_XDIGIT > {};
+      struct quotation_mark : binary_property< UCHAR_QUOTATION_MARK > {};
+      struct radical : binary_property< UCHAR_RADICAL > {};
+      struct s_term : binary_property< UCHAR_S_TERM > {};
+      struct segment_starter : binary_property< UCHAR_SEGMENT_STARTER > {};
+      struct soft_dotted : binary_property< UCHAR_SOFT_DOTTED > {};
+      struct terminal_punctuation : binary_property< UCHAR_TERMINAL_PUNCTUATION > {};
+      struct unified_ideograph : binary_property< UCHAR_UNIFIED_IDEOGRAPH > {};
+      struct uppercase : binary_property< UCHAR_UPPERCASE > {};
+      struct variation_selector : binary_property< UCHAR_VARIATION_SELECTOR > {};
+      struct white_space : binary_property< UCHAR_WHITE_SPACE > {};
+      struct xid_continue : binary_property< UCHAR_XID_CONTINUE > {};
+      struct xid_start : binary_property< UCHAR_XID_START > {};
+
+      template< UCharDirection V > struct bidi_class : property_value< UCHAR_BIDI_CLASS, V > {};
+      template< UBlockCode V > struct block : property_value< UCHAR_BLOCK, V > {};
+      template< UDecompositionType V > struct decomposition_type : property_value< UCHAR_DECOMPOSITION_TYPE, V > {};
+      template< UEastAsianWidth V > struct east_asian_width : property_value< UCHAR_EAST_ASIAN_WIDTH, V > {};
+      template< UCharCategory V > struct general_category : property_value< UCHAR_GENERAL_CATEGORY, V > {};
+      template< UGraphemeClusterBreak V > struct grapheme_cluster_break : property_value< UCHAR_GRAPHEME_CLUSTER_BREAK, V > {};
+      template< UHangulSyllableType V > struct hangul_syllable_type : property_value< UCHAR_HANGUL_SYLLABLE_TYPE, V > {};
+      template< UJoiningGroup V > struct joining_group : property_value< UCHAR_JOINING_GROUP, V > {};
+      template< UJoiningType V > struct joining_type : property_value< UCHAR_JOINING_TYPE, V > {};
+      template< ULineBreak V > struct line_break : property_value< UCHAR_LINE_BREAK, V > {};
+      // UNormalizationCheckResult requires an additional header <unicode/unorm2.h>:
+      // template< UNormalizationCheckResult V > struct nfc_quick_check : property_value< UCHAR_NFC_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfd_quick_check : property_value< UCHAR_NFD_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfkc_quick_check : property_value< UCHAR_NFKC_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfkd_quick_check : property_value< UCHAR_NFKD_QUICK_CHECK, V > {};
+      template< UNumericType V > struct numeric_type : property_value< UCHAR_NUMERIC_TYPE, V > {};
+      template< USentenceBreak V > struct sentence_break : property_value< UCHAR_SENTENCE_BREAK, V > {};
+      template< UWordBreakValues V > struct word_break : property_value< UCHAR_WORD_BREAK, V > {};
+
+      template< std::uint8_t V > struct canonical_combining_class : property_value< UCHAR_CANONICAL_COMBINING_CLASS, V > {};
+      template< std::uint8_t V > struct lead_canonical_combining_class : property_value< UCHAR_LEAD_CANONICAL_COMBINING_CLASS, V > {};
+      template< std::uint8_t V > struct trail_canonical_combining_class : property_value< UCHAR_TRAIL_CANONICAL_COMBINING_CLASS, V > {};
+      // clang-format on
+
+   }  // namespace utf32_be::icu
+
+   namespace utf32_le::icu
+   {
+      template< UProperty P, bool V = true >
+      struct binary_property
+         : internal::icu::binary_property< internal::peek_utf32_le, P, V >
+      {};
+
+      template< UProperty P, int V >
+      struct property_value
+         : internal::icu::property_value< internal::peek_utf32_le, P, V >
+      {};
+
+      // clang-format off
+      struct alphabetic : binary_property< UCHAR_ALPHABETIC > {};
+      struct ascii_hex_digit : binary_property< UCHAR_ASCII_HEX_DIGIT > {};
+      struct bidi_control : binary_property< UCHAR_BIDI_CONTROL > {};
+      struct bidi_mirrored : binary_property< UCHAR_BIDI_MIRRORED > {};
+      struct case_sensitive : binary_property< UCHAR_CASE_SENSITIVE > {};
+      struct dash : binary_property< UCHAR_DASH > {};
+      struct default_ignorable_code_point : binary_property< UCHAR_DEFAULT_IGNORABLE_CODE_POINT > {};
+      struct deprecated : binary_property< UCHAR_DEPRECATED > {};
+      struct diacritic : binary_property< UCHAR_DIACRITIC > {};
+      struct extender : binary_property< UCHAR_EXTENDER > {};
+      struct full_composition_exclusion : binary_property< UCHAR_FULL_COMPOSITION_EXCLUSION > {};
+      struct grapheme_base : binary_property< UCHAR_GRAPHEME_BASE > {};
+      struct grapheme_extend : binary_property< UCHAR_GRAPHEME_EXTEND > {};
+      struct grapheme_link : binary_property< UCHAR_GRAPHEME_LINK > {};
+      struct hex_digit : binary_property< UCHAR_HEX_DIGIT > {};
+      struct hyphen : binary_property< UCHAR_HYPHEN > {};
+      struct id_continue : binary_property< UCHAR_ID_CONTINUE > {};
+      struct id_start : binary_property< UCHAR_ID_START > {};
+      struct ideographic : binary_property< UCHAR_IDEOGRAPHIC > {};
+      struct ids_binary_operator : binary_property< UCHAR_IDS_BINARY_OPERATOR > {};
+      struct ids_trinary_operator : binary_property< UCHAR_IDS_TRINARY_OPERATOR > {};
+      struct join_control : binary_property< UCHAR_JOIN_CONTROL > {};
+      struct logical_order_exception : binary_property< UCHAR_LOGICAL_ORDER_EXCEPTION > {};
+      struct lowercase : binary_property< UCHAR_LOWERCASE > {};
+      struct math : binary_property< UCHAR_MATH > {};
+      struct nfc_inert : binary_property< UCHAR_NFC_INERT > {};
+      struct nfd_inert : binary_property< UCHAR_NFD_INERT > {};
+      struct nfkc_inert : binary_property< UCHAR_NFKC_INERT > {};
+      struct nfkd_inert : binary_property< UCHAR_NFKD_INERT > {};
+      struct noncharacter_code_point : binary_property< UCHAR_NONCHARACTER_CODE_POINT > {};
+      struct pattern_syntax : binary_property< UCHAR_PATTERN_SYNTAX > {};
+      struct pattern_white_space : binary_property< UCHAR_PATTERN_WHITE_SPACE > {};
+      struct posix_alnum : binary_property< UCHAR_POSIX_ALNUM > {};
+      struct posix_blank : binary_property< UCHAR_POSIX_BLANK > {};
+      struct posix_graph : binary_property< UCHAR_POSIX_GRAPH > {};
+      struct posix_print : binary_property< UCHAR_POSIX_PRINT > {};
+      struct posix_xdigit : binary_property< UCHAR_POSIX_XDIGIT > {};
+      struct quotation_mark : binary_property< UCHAR_QUOTATION_MARK > {};
+      struct radical : binary_property< UCHAR_RADICAL > {};
+      struct s_term : binary_property< UCHAR_S_TERM > {};
+      struct segment_starter : binary_property< UCHAR_SEGMENT_STARTER > {};
+      struct soft_dotted : binary_property< UCHAR_SOFT_DOTTED > {};
+      struct terminal_punctuation : binary_property< UCHAR_TERMINAL_PUNCTUATION > {};
+      struct unified_ideograph : binary_property< UCHAR_UNIFIED_IDEOGRAPH > {};
+      struct uppercase : binary_property< UCHAR_UPPERCASE > {};
+      struct variation_selector : binary_property< UCHAR_VARIATION_SELECTOR > {};
+      struct white_space : binary_property< UCHAR_WHITE_SPACE > {};
+      struct xid_continue : binary_property< UCHAR_XID_CONTINUE > {};
+      struct xid_start : binary_property< UCHAR_XID_START > {};
+
+      template< UCharDirection V > struct bidi_class : property_value< UCHAR_BIDI_CLASS, V > {};
+      template< UBlockCode V > struct block : property_value< UCHAR_BLOCK, V > {};
+      template< UDecompositionType V > struct decomposition_type : property_value< UCHAR_DECOMPOSITION_TYPE, V > {};
+      template< UEastAsianWidth V > struct east_asian_width : property_value< UCHAR_EAST_ASIAN_WIDTH, V > {};
+      template< UCharCategory V > struct general_category : property_value< UCHAR_GENERAL_CATEGORY, V > {};
+      template< UGraphemeClusterBreak V > struct grapheme_cluster_break : property_value< UCHAR_GRAPHEME_CLUSTER_BREAK, V > {};
+      template< UHangulSyllableType V > struct hangul_syllable_type : property_value< UCHAR_HANGUL_SYLLABLE_TYPE, V > {};
+      template< UJoiningGroup V > struct joining_group : property_value< UCHAR_JOINING_GROUP, V > {};
+      template< UJoiningType V > struct joining_type : property_value< UCHAR_JOINING_TYPE, V > {};
+      template< ULineBreak V > struct line_break : property_value< UCHAR_LINE_BREAK, V > {};
+      // UNormalizationCheckResult requires an additional header <unicode/unorm2.h>:
+      // template< UNormalizationCheckResult V > struct nfc_quick_check : property_value< UCHAR_NFC_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfd_quick_check : property_value< UCHAR_NFD_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfkc_quick_check : property_value< UCHAR_NFKC_QUICK_CHECK, V > {};
+      // template< UNormalizationCheckResult V > struct nfkd_quick_check : property_value< UCHAR_NFKD_QUICK_CHECK, V > {};
+      template< UNumericType V > struct numeric_type : property_value< UCHAR_NUMERIC_TYPE, V > {};
+      template< USentenceBreak V > struct sentence_break : property_value< UCHAR_SENTENCE_BREAK, V > {};
+      template< UWordBreakValues V > struct word_break : property_value< UCHAR_WORD_BREAK, V > {};
+
+      template< std::uint8_t V > struct canonical_combining_class : property_value< UCHAR_CANONICAL_COMBINING_CLASS, V > {};
+      template< std::uint8_t V > struct lead_canonical_combining_class : property_value< UCHAR_LEAD_CANONICAL_COMBINING_CLASS, V > {};
+      template< std::uint8_t V > struct trail_canonical_combining_class : property_value< UCHAR_TRAIL_CANONICAL_COMBINING_CLASS, V > {};
+      // clang-format on
+
+   }  // namespace utf32_le::icu
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/icu/utf8.hpp b/pxr/base/pegtl/pegtl/contrib/icu/utf8.hpp
new file mode 100644
index 0000000000..19f3e02051
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/icu/utf8.hpp
@@ -0,0 +1,103 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_ICU_UTF8_HPP
+#define PXR_PEGTL_CONTRIB_ICU_UTF8_HPP
+
+#include "internal.hpp"
+
+#include "../../config.hpp"
+#include "../../utf8.hpp"
+
+#include "../../internal/peek_utf8.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::utf8::icu
+{
+   template< UProperty P, bool V = true >
+   struct binary_property
+      : internal::icu::binary_property< internal::peek_utf8, P, V >
+   {};
+
+   template< UProperty P, int V >
+   struct property_value
+      : internal::icu::property_value< internal::peek_utf8, P, V >
+   {};
+
+   // clang-format off
+   struct alphabetic : binary_property< UCHAR_ALPHABETIC > {};
+   struct ascii_hex_digit : binary_property< UCHAR_ASCII_HEX_DIGIT > {};
+   struct bidi_control : binary_property< UCHAR_BIDI_CONTROL > {};
+   struct bidi_mirrored : binary_property< UCHAR_BIDI_MIRRORED > {};
+   struct case_sensitive : binary_property< UCHAR_CASE_SENSITIVE > {};
+   struct dash : binary_property< UCHAR_DASH > {};
+   struct default_ignorable_code_point : binary_property< UCHAR_DEFAULT_IGNORABLE_CODE_POINT > {};
+   struct deprecated : binary_property< UCHAR_DEPRECATED > {};
+   struct diacritic : binary_property< UCHAR_DIACRITIC > {};
+   struct extender : binary_property< UCHAR_EXTENDER > {};
+   struct full_composition_exclusion : binary_property< UCHAR_FULL_COMPOSITION_EXCLUSION > {};
+   struct grapheme_base : binary_property< UCHAR_GRAPHEME_BASE > {};
+   struct grapheme_extend : binary_property< UCHAR_GRAPHEME_EXTEND > {};
+   struct grapheme_link : binary_property< UCHAR_GRAPHEME_LINK > {};
+   struct hex_digit : binary_property< UCHAR_HEX_DIGIT > {};
+   struct hyphen : binary_property< UCHAR_HYPHEN > {};
+   struct id_continue : binary_property< UCHAR_ID_CONTINUE > {};
+   struct id_start : binary_property< UCHAR_ID_START > {};
+   struct ideographic : binary_property< UCHAR_IDEOGRAPHIC > {};
+   struct ids_binary_operator : binary_property< UCHAR_IDS_BINARY_OPERATOR > {};
+   struct ids_trinary_operator : binary_property< UCHAR_IDS_TRINARY_OPERATOR > {};
+   struct join_control : binary_property< UCHAR_JOIN_CONTROL > {};
+   struct logical_order_exception : binary_property< UCHAR_LOGICAL_ORDER_EXCEPTION > {};
+   struct lowercase : binary_property< UCHAR_LOWERCASE > {};
+   struct math : binary_property< UCHAR_MATH > {};
+   struct nfc_inert : binary_property< UCHAR_NFC_INERT > {};
+   struct nfd_inert : binary_property< UCHAR_NFD_INERT > {};
+   struct nfkc_inert : binary_property< UCHAR_NFKC_INERT > {};
+   struct nfkd_inert : binary_property< UCHAR_NFKD_INERT > {};
+   struct noncharacter_code_point : binary_property< UCHAR_NONCHARACTER_CODE_POINT > {};
+   struct pattern_syntax : binary_property< UCHAR_PATTERN_SYNTAX > {};
+   struct pattern_white_space : binary_property< UCHAR_PATTERN_WHITE_SPACE > {};
+   struct posix_alnum : binary_property< UCHAR_POSIX_ALNUM > {};
+   struct posix_blank : binary_property< UCHAR_POSIX_BLANK > {};
+   struct posix_graph : binary_property< UCHAR_POSIX_GRAPH > {};
+   struct posix_print : binary_property< UCHAR_POSIX_PRINT > {};
+   struct posix_xdigit : binary_property< UCHAR_POSIX_XDIGIT > {};
+   struct quotation_mark : binary_property< UCHAR_QUOTATION_MARK > {};
+   struct radical : binary_property< UCHAR_RADICAL > {};
+   struct s_term : binary_property< UCHAR_S_TERM > {};
+   struct segment_starter : binary_property< UCHAR_SEGMENT_STARTER > {};
+   struct soft_dotted : binary_property< UCHAR_SOFT_DOTTED > {};
+   struct terminal_punctuation : binary_property< UCHAR_TERMINAL_PUNCTUATION > {};
+   struct unified_ideograph : binary_property< UCHAR_UNIFIED_IDEOGRAPH > {};
+   struct uppercase : binary_property< UCHAR_UPPERCASE > {};
+   struct variation_selector : binary_property< UCHAR_VARIATION_SELECTOR > {};
+   struct white_space : binary_property< UCHAR_WHITE_SPACE > {};
+   struct xid_continue : binary_property< UCHAR_XID_CONTINUE > {};
+   struct xid_start : binary_property< UCHAR_XID_START > {};
+
+   template< UCharDirection V > struct bidi_class : property_value< UCHAR_BIDI_CLASS, V > {};
+   template< UBlockCode V > struct block : property_value< UCHAR_BLOCK, V > {};
+   template< UDecompositionType V > struct decomposition_type : property_value< UCHAR_DECOMPOSITION_TYPE, V > {};
+   template< UEastAsianWidth V > struct east_asian_width : property_value< UCHAR_EAST_ASIAN_WIDTH, V > {};
+   template< UCharCategory V > struct general_category : property_value< UCHAR_GENERAL_CATEGORY, V > {};
+   template< UGraphemeClusterBreak V > struct grapheme_cluster_break : property_value< UCHAR_GRAPHEME_CLUSTER_BREAK, V > {};
+   template< UHangulSyllableType V > struct hangul_syllable_type : property_value< UCHAR_HANGUL_SYLLABLE_TYPE, V > {};
+   template< UJoiningGroup V > struct joining_group : property_value< UCHAR_JOINING_GROUP, V > {};
+   template< UJoiningType V > struct joining_type : property_value< UCHAR_JOINING_TYPE, V > {};
+   template< ULineBreak V > struct line_break : property_value< UCHAR_LINE_BREAK, V > {};
+   // UNormalizationCheckResult requires an additional header <unicode/unorm2.h>:
+   // template< UNormalizationCheckResult V > struct nfc_quick_check : property_value< UCHAR_NFC_QUICK_CHECK, V > {};
+   // template< UNormalizationCheckResult V > struct nfd_quick_check : property_value< UCHAR_NFD_QUICK_CHECK, V > {};
+   // template< UNormalizationCheckResult V > struct nfkc_quick_check : property_value< UCHAR_NFKC_QUICK_CHECK, V > {};
+   // template< UNormalizationCheckResult V > struct nfkd_quick_check : property_value< UCHAR_NFKD_QUICK_CHECK, V > {};
+   template< UNumericType V > struct numeric_type : property_value< UCHAR_NUMERIC_TYPE, V > {};
+   template< USentenceBreak V > struct sentence_break : property_value< UCHAR_SENTENCE_BREAK, V > {};
+   template< UWordBreakValues V > struct word_break : property_value< UCHAR_WORD_BREAK, V > {};
+
+   template< std::uint8_t V > struct canonical_combining_class : property_value< UCHAR_CANONICAL_COMBINING_CLASS, V > {};
+   template< std::uint8_t V > struct lead_canonical_combining_class : property_value< UCHAR_LEAD_CANONICAL_COMBINING_CLASS, V > {};
+   template< std::uint8_t V > struct trail_canonical_combining_class : property_value< UCHAR_TRAIL_CANONICAL_COMBINING_CLASS, V > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::utf8::icu
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/if_then.hpp b/pxr/base/pegtl/pegtl/contrib/if_then.hpp
new file mode 100644
index 0000000000..aaa33f71e7
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/if_then.hpp
@@ -0,0 +1,56 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_IF_THEN_HPP
+#define PXR_PEGTL_CONTRIB_IF_THEN_HPP
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+#include "../internal/enable_control.hpp"
+#include "../internal/failure.hpp"
+#include "../internal/if_then_else.hpp"
+#include "../internal/seq.hpp"
+#include "../internal/success.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename Cond, typename Then >
+      struct if_pair
+      {};
+
+      template< typename... Pairs >
+      struct if_then;
+
+      template< typename Cond, typename Then, typename... Pairs >
+      struct if_then< if_pair< Cond, Then >, Pairs... >
+         : if_then_else< Cond, Then, if_then< Pairs... > >
+      {
+         template< typename ElseCond, typename... Thens >
+         using else_if_then = if_then< if_pair< Cond, Then >, Pairs..., if_pair< ElseCond, seq< Thens... > > >;
+
+         template< typename... Thens >
+         using else_then = if_then_else< Cond, Then, if_then< Pairs..., if_pair< success, seq< Thens... > > > >;
+      };
+
+      template<>
+      struct if_then<>
+         : failure
+      {};
+
+      template< typename... Pairs >
+      inline constexpr bool enable_control< if_then< Pairs... > > = false;
+
+   }  // namespace internal
+
+   template< typename Cond, typename... Thens >
+   struct if_then
+      : internal::if_then< internal::if_pair< Cond, internal::seq< Thens... > > >
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/instantiate.hpp b/pxr/base/pegtl/pegtl/contrib/instantiate.hpp
new file mode 100644
index 0000000000..9b26e25350
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/instantiate.hpp
@@ -0,0 +1,38 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INSTANTIATE_HPP
+#define PXR_PEGTL_CONTRIB_INSTANTIATE_HPP
+
+#include "../config.hpp"
+
+#include "../apply_mode.hpp"
+#include "../match.hpp"
+#include "../nothing.hpp"
+#include "../rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename T >
+   struct instantiate
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         const T t( static_cast< const ParseInput& >( in ), st... );
+         return PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/integer.hpp b/pxr/base/pegtl/pegtl/contrib/integer.hpp
new file mode 100644
index 0000000000..6df142c5a2
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/integer.hpp
@@ -0,0 +1,468 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTEGER_HPP
+#define PXR_PEGTL_CONTRIB_INTEGER_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/contrib/integer.hpp"
+#else
+
+#include <cstdint>
+#include <cstdlib>
+
+#include <limits>
+#include <string_view>
+#include <type_traits>
+
+#include "../ascii.hpp"
+#include "../parse.hpp"
+#include "../parse_error.hpp"
+#include "../rules.hpp"
+
+#include "analyze_traits.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct unsigned_rule_old
+      : plus< digit >
+   {
+      // Pre-3.0 version of this rule.
+   };
+
+   struct unsigned_rule_new
+      : if_then_else< one< '0' >, not_at< digit >, plus< digit > >
+   {
+      // New version that does not allow leading zeros.
+   };
+
+   struct signed_rule_old
+      : seq< opt< one< '-', '+' > >, plus< digit > >
+   {
+      // Pre-3.0 version of this rule.
+   };
+
+   struct signed_rule_new
+      : seq< opt< one< '-', '+' > >, if_then_else< one< '0' >, not_at< digit >, plus< digit > > >
+   {
+      // New version that does not allow leading zeros.
+   };
+
+   struct signed_rule_bis
+      : seq< opt< one< '-' > >, if_then_else< one< '0' >, not_at< digit >, plus< digit > > >
+   {};
+
+   struct signed_rule_ter
+      : seq< one< '-', '+' >, if_then_else< one< '0' >, not_at< digit >, plus< digit > > >
+   {};
+
+   namespace internal
+   {
+      [[nodiscard]] constexpr bool is_digit( const char c ) noexcept
+      {
+         // We don't use std::isdigit() because it might
+         // return true for other values on MS platforms.
+
+         return ( '0' <= c ) && ( c <= '9' );
+      }
+
+      template< typename Integer, Integer Maximum = ( std::numeric_limits< Integer >::max )() >
+      [[nodiscard]] constexpr bool accumulate_digit( Integer& result, const char digit ) noexcept
+      {
+         // Assumes that digit is a digit as per is_digit(); returns false on overflow.
+
+         static_assert( std::is_integral_v< Integer > );
+
+         constexpr Integer cutoff = Maximum / 10;
+         constexpr Integer cutlim = Maximum % 10;
+
+         const Integer c = digit - '0';
+
+         if( ( result > cutoff ) || ( ( result == cutoff ) && ( c > cutlim ) ) ) {
+            return false;
+         }
+         result *= 10;
+         result += c;
+         return true;
+      }
+
+      template< typename Integer, Integer Maximum = ( std::numeric_limits< Integer >::max )() >
+      [[nodiscard]] constexpr bool accumulate_digits( Integer& result, const std::string_view input ) noexcept
+      {
+         // Assumes input is a non-empty sequence of digits; returns false on overflow.
+
+         for( char c : input ) {
+            if( !accumulate_digit< Integer, Maximum >( result, c ) ) {
+               return false;
+            }
+         }
+         return true;
+      }
+
+      template< typename Integer, Integer Maximum = ( std::numeric_limits< Integer >::max )() >
+      [[nodiscard]] constexpr bool convert_positive( Integer& result, const std::string_view input ) noexcept
+      {
+         // Assumes result == 0 and that input is a non-empty sequence of digits; returns false on overflow.
+
+         static_assert( std::is_integral_v< Integer > );
+         return accumulate_digits< Integer, Maximum >( result, input );
+      }
+
+      template< typename Signed >
+      [[nodiscard]] constexpr bool convert_negative( Signed& result, const std::string_view input ) noexcept
+      {
+         // Assumes result == 0 and that input is a non-empty sequence of digits; returns false on overflow.
+
+         static_assert( std::is_signed_v< Signed > );
+         using Unsigned = std::make_unsigned_t< Signed >;
+         constexpr Unsigned maximum = static_cast< Unsigned >( ( std::numeric_limits< Signed >::max )() ) + 1;
+         Unsigned temporary = 0;
+         if( accumulate_digits< Unsigned, maximum >( temporary, input ) ) {
+            result = static_cast< Signed >( ~temporary ) + 1;
+            return true;
+         }
+         return false;
+      }
+
+      template< typename Unsigned, Unsigned Maximum = ( std::numeric_limits< Unsigned >::max )() >
+      [[nodiscard]] constexpr bool convert_unsigned( Unsigned& result, const std::string_view input ) noexcept
+      {
+         // Assumes result == 0 and that input is a non-empty sequence of digits; returns false on overflow.
+
+         static_assert( std::is_unsigned_v< Unsigned > );
+         return accumulate_digits< Unsigned, Maximum >( result, input );
+      }
+
+      template< typename Signed >
+      [[nodiscard]] constexpr bool convert_signed( Signed& result, const std::string_view input ) noexcept
+      {
+         // Assumes result == 0 and that input is an optional sign followed by a non-empty sequence of digits; returns false on overflow.
+
+         static_assert( std::is_signed_v< Signed > );
+         if( input[ 0 ] == '-' ) {
+            return convert_negative< Signed >( result, std::string_view( input.data() + 1, input.size() - 1 ) );
+         }
+         const auto offset = unsigned( input[ 0 ] == '+' );
+         return convert_positive< Signed >( result, std::string_view( input.data() + offset, input.size() - offset ) );
+      }
+
+      template< typename ParseInput >
+      [[nodiscard]] bool match_unsigned( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         if( !in.empty() ) {
+            const char c = in.peek_char();
+            if( is_digit( c ) ) {
+               in.bump_in_this_line();
+               if( c == '0' ) {
+                  return in.empty() || ( !is_digit( in.peek_char() ) );
+               }
+               while( ( !in.empty() ) && is_digit( in.peek_char() ) ) {
+                  in.bump_in_this_line();
+               }
+               return true;
+            }
+         }
+         return false;
+      }
+
+      template< typename ParseInput,
+                typename Unsigned,
+                Unsigned Maximum = ( std::numeric_limits< Unsigned >::max )() >
+      [[nodiscard]] bool match_and_convert_unsigned_with_maximum_throws( ParseInput& in, Unsigned& st )
+      {
+         // Assumes st == 0.
+
+         if( !in.empty() ) {
+            char c = in.peek_char();
+            if( is_digit( c ) ) {
+               if( c == '0' ) {
+                  in.bump_in_this_line();
+                  return in.empty() || ( !is_digit( in.peek_char() ) );
+               }
+               do {
+                  if( !accumulate_digit< Unsigned, Maximum >( st, c ) ) {
+                     throw PXR_PEGTL_NAMESPACE::parse_error( "integer overflow", in );
+                  }
+                  in.bump_in_this_line();
+               } while( ( !in.empty() ) && is_digit( c = in.peek_char() ) );
+               return true;
+            }
+         }
+         return false;
+      }
+
+      template< typename ParseInput,
+                typename Unsigned,
+                Unsigned Maximum = ( std::numeric_limits< Unsigned >::max )() >
+      [[nodiscard]] bool match_and_convert_unsigned_with_maximum_nothrow( ParseInput& in, Unsigned& st )
+      {
+         // Assumes st == 0.
+
+         if( !in.empty() ) {
+            char c = in.peek_char();
+            if( c == '0' ) {
+               if( ( in.size( 2 ) < 2 ) || ( !is_digit( in.peek_char( 1 ) ) ) ) {
+                  in.bump_in_this_line();
+                  return true;
+               }
+               return false;
+            }
+            if( is_digit( c ) ) {
+               unsigned b = 0;
+
+               do {
+                  if( !accumulate_digit< Unsigned, Maximum >( st, c ) ) {
+                     return false;
+                  }
+                  ++b;
+               } while( ( !in.empty() ) && is_digit( c = in.peek_char( b ) ) );
+               in.bump_in_this_line( b );
+               return true;
+            }
+         }
+         return false;
+      }
+
+   }  // namespace internal
+
+   struct unsigned_action
+   {
+      // Assumes that 'in' contains a non-empty sequence of ASCII digits.
+
+      template< typename ActionInput, typename Unsigned >
+      static void apply( const ActionInput& in, Unsigned& st )
+      {
+         // This function "only" offers basic exception safety.
+         st = 0;
+         if( !internal::convert_unsigned( st, in.string_view() ) ) {
+            throw parse_error( "unsigned integer overflow", in );
+         }
+      }
+   };
+
+   struct unsigned_rule
+   {
+      using rule_t = unsigned_rule;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         return internal::match_unsigned( in );  // Does not check for any overflow.
+      }
+   };
+
+   struct unsigned_rule_with_action
+   {
+      using rule_t = unsigned_rule_with_action;
+      using subs_t = empty_list;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static auto match( ParseInput& in, States&&... /*unused*/ ) noexcept( noexcept( in.empty() ) ) -> std::enable_if_t< A == apply_mode::nothing, bool >
+      {
+         return internal::match_unsigned( in );  // Does not check for any overflow.
+      }
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename Unsigned >
+      [[nodiscard]] static auto match( ParseInput& in, Unsigned& st ) -> std::enable_if_t< ( A == apply_mode::action ) && std::is_unsigned_v< Unsigned >, bool >
+      {
+         // This function "only" offers basic exception safety.
+         st = 0;
+         return internal::match_and_convert_unsigned_with_maximum_throws( in, st );  // Throws on overflow.
+      }
+   };
+
+   template< typename Unsigned, Unsigned Maximum >
+   struct maximum_action
+   {
+      // Assumes that 'in' contains a non-empty sequence of ASCII digits.
+
+      static_assert( std::is_unsigned_v< Unsigned > );
+
+      template< typename ActionInput, typename Unsigned2 >
+      static void apply( const ActionInput& in, Unsigned2& st )
+      {
+         // This function "only" offers basic exception safety.
+         st = 0;
+         if( !internal::convert_unsigned< Unsigned, Maximum >( st, in.string_view() ) ) {
+            throw parse_error( "unsigned integer overflow", in );
+         }
+      }
+   };
+
+   template< typename Unsigned, Unsigned Maximum = ( std::numeric_limits< Unsigned >::max )() >
+   struct maximum_rule
+   {
+      using rule_t = maximum_rule;
+      using subs_t = empty_list;
+
+      static_assert( std::is_unsigned_v< Unsigned > );
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in )
+      {
+         Unsigned st = 0;
+         return internal::match_and_convert_unsigned_with_maximum_nothrow< ParseInput, Unsigned, Maximum >( in, st );
+      }
+   };
+
+   template< typename Unsigned, Unsigned Maximum = ( std::numeric_limits< Unsigned >::max )() >
+   struct maximum_rule_with_action
+   {
+      using rule_t = maximum_rule_with_action;
+      using subs_t = empty_list;
+
+      static_assert( std::is_unsigned_v< Unsigned > );
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static auto match( ParseInput& in, States&&... /*unused*/ ) -> std::enable_if_t< A == apply_mode::nothing, bool >
+      {
+         Unsigned st = 0;
+         return internal::match_and_convert_unsigned_with_maximum_throws< ParseInput, Unsigned, Maximum >( in, st );
+      }
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename Unsigned2 >
+      [[nodiscard]] static auto match( ParseInput& in, Unsigned2& st ) -> std::enable_if_t< ( A == apply_mode::action ) && std::is_same_v< Unsigned, Unsigned2 >, bool >
+      {
+         // This function "only" offers basic exception safety.
+         st = 0;
+         return internal::match_and_convert_unsigned_with_maximum_throws< ParseInput, Unsigned, Maximum >( in, st );
+      }
+   };
+
+   struct signed_action
+   {
+      // Assumes that 'in' contains a non-empty sequence of ASCII digits,
+      // with optional leading sign; with sign, in.size() must be >= 2.
+
+      template< typename ActionInput, typename Signed >
+      static void apply( const ActionInput& in, Signed& st )
+      {
+         // This function "only" offers basic exception safety.
+         st = 0;
+         if( !internal::convert_signed( st, in.string_view() ) ) {
+            throw parse_error( "signed integer overflow", in );
+         }
+      }
+   };
+
+   struct signed_rule
+   {
+      using rule_t = signed_rule;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         return PXR_PEGTL_NAMESPACE::parse< signed_rule_new >( in );  // Does not check for any overflow.
+      }
+   };
+
+   namespace internal
+   {
+      template< typename Rule >
+      struct signed_action_action
+         : nothing< Rule >
+      {};
+
+      template<>
+      struct signed_action_action< signed_rule_new >
+         : signed_action
+      {};
+
+   }  // namespace internal
+
+   struct signed_rule_with_action
+   {
+      using rule_t = signed_rule_with_action;
+      using subs_t = empty_list;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static auto match( ParseInput& in, States&&... /*unused*/ ) noexcept( noexcept( in.empty() ) ) -> std::enable_if_t< A == apply_mode::nothing, bool >
+      {
+         return PXR_PEGTL_NAMESPACE::parse< signed_rule_new >( in );  // Does not check for any overflow.
+      }
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename Signed >
+      [[nodiscard]] static auto match( ParseInput& in, Signed& st ) -> std::enable_if_t< ( A == apply_mode::action ) && std::is_signed_v< Signed >, bool >
+      {
+         return PXR_PEGTL_NAMESPACE::parse< signed_rule_new, internal::signed_action_action >( in, st );  // Throws on overflow.
+      }
+   };
+
+   template< typename Name >
+   struct analyze_traits< Name, unsigned_rule >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, unsigned_rule_with_action >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename Integer, Integer Maximum >
+   struct analyze_traits< Name, maximum_rule< Integer, Maximum > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, typename Integer, Integer Maximum >
+   struct analyze_traits< Name, maximum_rule_with_action< Integer, Maximum > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, signed_rule >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name >
+   struct analyze_traits< Name, signed_rule_with_action >
+      : analyze_any_traits<>
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/endian.hpp b/pxr/base/pegtl/pegtl/contrib/internal/endian.hpp
new file mode 100644
index 0000000000..8f47bf1343
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/endian.hpp
@@ -0,0 +1,77 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_HPP
+
+#include <cstdint>
+#include <cstring>
+
+#include "../../config.hpp"
+
+#if defined( _WIN32 ) && !defined( __MINGW32__ ) && !defined( __CYGWIN__ )
+#include "endian_win.hpp"
+#else
+#include "endian_gcc.hpp"
+#endif
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   enum class endian
+   {
+#if defined( _WIN32 )
+      little = 0,
+      big = 1,
+      native = little
+#elif defined( __BYTE_ORDER__ )
+      little = __ORDER_LITTLE_ENDIAN__,
+      big = __ORDER_BIG_ENDIAN__,
+      native = __BYTE_ORDER__
+#else
+#error Unknown endianness.
+#endif
+   };
+
+   template< typename N >
+   [[nodiscard]] N h_to_be( const N n ) noexcept
+   {
+      return N( to_and_from_be< sizeof( N ) >::convert( n ) );
+   }
+
+   template< typename N >
+   [[nodiscard]] N be_to_h( const N n ) noexcept
+   {
+      return h_to_be( n );
+   }
+
+   template< typename N >
+   [[nodiscard]] N be_to_h( const void* p ) noexcept
+   {
+      N n;
+      std::memcpy( &n, p, sizeof( n ) );
+      return internal::be_to_h( n );
+   }
+
+   template< typename N >
+   [[nodiscard]] N h_to_le( const N n ) noexcept
+   {
+      return N( to_and_from_le< sizeof( N ) >::convert( n ) );
+   }
+
+   template< typename N >
+   [[nodiscard]] N le_to_h( const N n ) noexcept
+   {
+      return h_to_le( n );
+   }
+
+   template< typename N >
+   [[nodiscard]] N le_to_h( const void* p ) noexcept
+   {
+      N n;
+      std::memcpy( &n, p, sizeof( n ) );
+      return internal::le_to_h( n );
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/endian_gcc.hpp b/pxr/base/pegtl/pegtl/contrib/internal/endian_gcc.hpp
new file mode 100644
index 0000000000..a531dc0e46
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/endian_gcc.hpp
@@ -0,0 +1,198 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_GCC_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_GCC_HPP
+
+#include <cstdint>
+#include <cstring>
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+#if !defined( __BYTE_ORDER__ )
+#error No byte order defined!
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+
+   template< std::size_t S >
+   struct to_and_from_be
+   {
+      template< typename T >
+      [[nodiscard]] static T convert( const T n ) noexcept
+      {
+         return n;
+      }
+   };
+
+   template< std::size_t S >
+   struct to_and_from_le;
+
+   template<>
+   struct to_and_from_le< 1 >
+   {
+      [[nodiscard]] static std::uint8_t convert( const std::uint8_t n ) noexcept
+      {
+         return n;
+      }
+
+      [[nodiscard]] static std::int8_t convert( const std::int8_t n ) noexcept
+      {
+         return n;
+      }
+   };
+
+   template<>
+   struct to_and_from_le< 2 >
+   {
+      [[nodiscard]] static std::int16_t convert( const std::int16_t n ) noexcept
+      {
+         return static_cast< std::int16_t >( __builtin_bswap16( static_cast< std::uint16_t >( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint16_t convert( const std::uint16_t n ) noexcept
+      {
+         return __builtin_bswap16( n );
+      }
+   };
+
+   template<>
+   struct to_and_from_le< 4 >
+   {
+      [[nodiscard]] static float convert( float n ) noexcept
+      {
+         std::uint32_t u;
+         std::memcpy( &u, &n, 4 );
+         u = convert( u );
+         std::memcpy( &n, &u, 4 );
+         return n;
+      }
+
+      [[nodiscard]] static std::int32_t convert( const std::int32_t n ) noexcept
+      {
+         return static_cast< std::int32_t >( __builtin_bswap32( static_cast< std::uint32_t >( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint32_t convert( const std::uint32_t n ) noexcept
+      {
+         return __builtin_bswap32( n );
+      }
+   };
+
+   template<>
+   struct to_and_from_le< 8 >
+   {
+      [[nodiscard]] static double convert( double n ) noexcept
+      {
+         std::uint64_t u;
+         std::memcpy( &u, &n, 8 );
+         u = convert( u );
+         std::memcpy( &n, &u, 8 );
+         return n;
+      }
+
+      [[nodiscard]] static std::int64_t convert( const std::int64_t n ) noexcept
+      {
+         return static_cast< std::int64_t >( __builtin_bswap64( static_cast< std::uint64_t >( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint64_t convert( const std::uint64_t n ) noexcept
+      {
+         return __builtin_bswap64( n );
+      }
+   };
+
+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+
+   template< std::size_t S >
+   struct to_and_from_le
+   {
+      template< typename T >
+      [[nodiscard]] static T convert( const T n ) noexcept
+      {
+         return n;
+      }
+   };
+
+   template< std::size_t S >
+   struct to_and_from_be;
+
+   template<>
+   struct to_and_from_be< 1 >
+   {
+      [[nodiscard]] static std::int8_t convert( const std::int8_t n ) noexcept
+      {
+         return n;
+      }
+
+      [[nodiscard]] static std::uint8_t convert( const std::uint8_t n ) noexcept
+      {
+         return n;
+      }
+   };
+
+   template<>
+   struct to_and_from_be< 2 >
+   {
+      [[nodiscard]] static std::int16_t convert( const std::int16_t n ) noexcept
+      {
+         return static_cast< std::int16_t >( __builtin_bswap16( static_cast< std::uint16_t >( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint16_t convert( const std::uint16_t n ) noexcept
+      {
+         return __builtin_bswap16( n );
+      }
+   };
+
+   template<>
+   struct to_and_from_be< 4 >
+   {
+      [[nodiscard]] static float convert( float n ) noexcept
+      {
+         std::uint32_t u;
+         std::memcpy( &u, &n, 4 );
+         u = convert( u );
+         std::memcpy( &n, &u, 4 );
+         return n;
+      }
+
+      [[nodiscard]] static std::int32_t convert( const std::int32_t n ) noexcept
+      {
+         return static_cast< std::int32_t >( __builtin_bswap32( static_cast< std::uint32_t >( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint32_t convert( const std::uint32_t n ) noexcept
+      {
+         return __builtin_bswap32( n );
+      }
+   };
+
+   template<>
+   struct to_and_from_be< 8 >
+   {
+      [[nodiscard]] static double convert( double n ) noexcept
+      {
+         std::uint64_t u;
+         std::memcpy( &u, &n, 8 );
+         u = convert( u );
+         std::memcpy( &n, &u, 8 );
+         return n;
+      }
+
+      [[nodiscard]] static std::int64_t convert( const std::int64_t n ) noexcept
+      {
+         return static_cast< std::int64_t >( __builtin_bswap64( static_cast< std::uint64_t >( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint64_t convert( const std::uint64_t n ) noexcept
+      {
+         return __builtin_bswap64( n );
+      }
+   };
+
+#else
+#error Unknown host byte order!
+#endif
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/endian_win.hpp b/pxr/base/pegtl/pegtl/contrib/internal/endian_win.hpp
new file mode 100644
index 0000000000..41b706ce23
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/endian_win.hpp
@@ -0,0 +1,102 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_WIN_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_WIN_HPP
+
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< std::size_t S >
+   struct to_and_from_le
+   {
+      template< typename T >
+      [[nodiscard]] static T convert( const T t ) noexcept
+      {
+         return t;
+      }
+   };
+
+   template< std::size_t S >
+   struct to_and_from_be;
+
+   template<>
+   struct to_and_from_be< 1 >
+   {
+      [[nodiscard]] static std::int8_t convert( const std::int8_t n ) noexcept
+      {
+         return n;
+      }
+
+      [[nodiscard]] static std::uint8_t convert( const std::uint8_t n ) noexcept
+      {
+         return n;
+      }
+   };
+
+   template<>
+   struct to_and_from_be< 2 >
+   {
+      [[nodiscard]] static std::int16_t convert( const std::int16_t n ) noexcept
+      {
+         return std::int16_t( _byteswap_ushort( std::uint16_t( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint16_t convert( const std::uint16_t n ) noexcept
+      {
+         return _byteswap_ushort( n );
+      }
+   };
+
+   template<>
+   struct to_and_from_be< 4 >
+   {
+      [[nodiscard]] static float convert( float n ) noexcept
+      {
+         std::uint32_t u;
+         std::memcpy( &u, &n, 4 );
+         u = convert( u );
+         std::memcpy( &n, &u, 4 );
+         return n;
+      }
+
+      [[nodiscard]] static std::int32_t convert( const std::int32_t n ) noexcept
+      {
+         return std::int32_t( _byteswap_ulong( std::uint32_t( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint32_t convert( const std::uint32_t n ) noexcept
+      {
+         return _byteswap_ulong( n );
+      }
+   };
+
+   template<>
+   struct to_and_from_be< 8 >
+   {
+      [[nodiscard]] static double convert( double n ) noexcept
+      {
+         std::uint64_t u;
+         std::memcpy( &u, &n, 8 );
+         u = convert( u );
+         std::memcpy( &n, &u, 8 );
+         return n;
+      }
+
+      [[nodiscard]] static std::int64_t convert( const std::int64_t n ) noexcept
+      {
+         return std::int64_t( _byteswap_uint64( std::uint64_t( n ) ) );
+      }
+
+      [[nodiscard]] static std::uint64_t convert( const std::uint64_t n ) noexcept
+      {
+         return _byteswap_uint64( n );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/peek_mask_uint.hpp b/pxr/base/pegtl/pegtl/contrib/internal/peek_mask_uint.hpp
new file mode 100644
index 0000000000..9e5ba39ede
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/peek_mask_uint.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_PEEK_MASK_UINT_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_PEEK_MASK_UINT_HPP
+
+#include <cstddef>
+#include <cstdint>
+
+#include "../../config.hpp"
+#include "../../internal/input_pair.hpp"
+
+#include "read_uint.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename R, typename R::type M >
+   struct peek_mask_uint_impl
+   {
+      using data_t = typename R::type;
+      using pair_t = input_pair< data_t >;
+
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek( ParseInput& in ) noexcept( noexcept( in.size( sizeof( data_t ) ) ) )
+      {
+         if( in.size( sizeof( data_t ) ) < sizeof( data_t ) ) {
+            return { 0, 0 };
+         }
+         const data_t data = R::read( in.current() ) & M;
+         return { data, sizeof( data_t ) };
+      }
+   };
+
+   template< std::uint16_t M >
+   using peek_mask_uint16_be = peek_mask_uint_impl< read_uint16_be, M >;
+
+   template< std::uint16_t M >
+   using peek_mask_uint16_le = peek_mask_uint_impl< read_uint16_le, M >;
+
+   template< std::uint32_t M >
+   using peek_mask_uint32_be = peek_mask_uint_impl< read_uint32_be, M >;
+
+   template< std::uint32_t M >
+   using peek_mask_uint32_le = peek_mask_uint_impl< read_uint32_le, M >;
+
+   template< std::uint64_t M >
+   using peek_mask_uint64_be = peek_mask_uint_impl< read_uint64_be, M >;
+
+   template< std::uint64_t M >
+   using peek_mask_uint64_le = peek_mask_uint_impl< read_uint64_le, M >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/peek_mask_uint8.hpp b/pxr/base/pegtl/pegtl/contrib/internal/peek_mask_uint8.hpp
new file mode 100644
index 0000000000..a2a1a9ee19
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/peek_mask_uint8.hpp
@@ -0,0 +1,33 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_PEEK_MASK_UINT8_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_PEEK_MASK_UINT8_HPP
+
+#include <cstddef>
+#include <cstdint>
+
+#include "../../config.hpp"
+#include "../../internal/input_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< std::uint8_t M >
+   struct peek_mask_uint8
+   {
+      using data_t = std::uint8_t;
+      using pair_t = input_pair< std::uint8_t >;
+
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         if( in.empty() ) {
+            return { 0, 0 };
+         }
+         return { std::uint8_t( in.peek_uint8() & M ), 1 };
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/peek_uint.hpp b/pxr/base/pegtl/pegtl/contrib/internal/peek_uint.hpp
new file mode 100644
index 0000000000..bda64483bd
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/peek_uint.hpp
@@ -0,0 +1,45 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_PEEK_UINT_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_PEEK_UINT_HPP
+
+#include <cstddef>
+#include <cstdint>
+
+#include "../../config.hpp"
+#include "../../internal/input_pair.hpp"
+
+#include "read_uint.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename R >
+   struct peek_uint_impl
+   {
+      using data_t = typename R::type;
+      using pair_t = input_pair< data_t >;
+
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek( ParseInput& in ) noexcept( noexcept( in.size( sizeof( data_t ) ) ) )
+      {
+         if( in.size( sizeof( data_t ) ) < sizeof( data_t ) ) {
+            return { 0, 0 };
+         }
+         const data_t data = R::read( in.current() );
+         return { data, sizeof( data_t ) };
+      }
+   };
+
+   using peek_uint16_be = peek_uint_impl< read_uint16_be >;
+   using peek_uint16_le = peek_uint_impl< read_uint16_le >;
+
+   using peek_uint32_be = peek_uint_impl< read_uint32_be >;
+   using peek_uint32_le = peek_uint_impl< read_uint32_le >;
+
+   using peek_uint64_be = peek_uint_impl< read_uint64_be >;
+   using peek_uint64_le = peek_uint_impl< read_uint64_le >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/peek_uint8.hpp b/pxr/base/pegtl/pegtl/contrib/internal/peek_uint8.hpp
new file mode 100644
index 0000000000..f6e915d552
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/peek_uint8.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_PEEK_UINT8_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_PEEK_UINT8_HPP
+
+#include <cstddef>
+#include <cstdint>
+
+#include "../../config.hpp"
+#include "../../internal/input_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct peek_uint8
+   {
+      using data_t = std::uint8_t;
+      using pair_t = input_pair< std::uint8_t >;
+
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         if( in.empty() ) {
+            return { 0, 0 };
+         }
+         return { in.peek_uint8(), 1 };
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/peek_utf16.hpp b/pxr/base/pegtl/pegtl/contrib/internal/peek_utf16.hpp
new file mode 100644
index 0000000000..3ecc1b9b0a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/peek_utf16.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_PEEK_UTF16_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_PEEK_UTF16_HPP
+
+#include <type_traits>
+
+#include "../../config.hpp"
+#include "../../internal/input_pair.hpp"
+
+#include "read_uint.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename R >
+   struct peek_utf16_impl
+   {
+      using data_t = char32_t;
+      using pair_t = input_pair< char32_t >;
+
+      using short_t = std::make_unsigned< char16_t >::type;
+
+      static_assert( sizeof( short_t ) == 2 );
+      static_assert( sizeof( char16_t ) == 2 );
+
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek( ParseInput& in ) noexcept( noexcept( in.size( 4 ) ) )
+      {
+         if( in.size( 2 ) < 2 ) {
+            return { 0, 0 };
+         }
+         const char32_t t = R::read( in.current() );
+         if( ( t < 0xd800 ) || ( t > 0xdfff ) ) {
+            return { t, 2 };
+         }
+         if( ( t >= 0xdc00 ) || ( in.size( 4 ) < 4 ) ) {
+            return { 0, 0 };
+         }
+         const char32_t u = R::read( in.current() + 2 );
+         if( ( u >= 0xdc00 ) && ( u <= 0xdfff ) ) {
+            const auto cp = ( ( ( t & 0x03ff ) << 10 ) | ( u & 0x03ff ) ) + 0x10000;
+            return { cp, 4 };
+         }
+         return { 0, 0 };
+      }
+   };
+
+   using peek_utf16_be = peek_utf16_impl< read_uint16_be >;
+   using peek_utf16_le = peek_utf16_impl< read_uint16_le >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/peek_utf32.hpp b/pxr/base/pegtl/pegtl/contrib/internal/peek_utf32.hpp
new file mode 100644
index 0000000000..2965f755b9
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/peek_utf32.hpp
@@ -0,0 +1,43 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_PEEK_UTF32_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_PEEK_UTF32_HPP
+
+#include <cstddef>
+
+#include "../../config.hpp"
+#include "../../internal/input_pair.hpp"
+
+#include "read_uint.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename R >
+   struct peek_utf32_impl
+   {
+      using data_t = char32_t;
+      using pair_t = input_pair< char32_t >;
+
+      static_assert( sizeof( char32_t ) == 4 );
+
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek( ParseInput& in ) noexcept( noexcept( in.size( 4 ) ) )
+      {
+         if( in.size( 4 ) < 4 ) {
+            return { 0, 0 };
+         }
+         const char32_t t = R::read( in.current() );
+         if( ( t <= 0x10ffff ) && !( t >= 0xd800 && t <= 0xdfff ) ) {
+            return { t, 4 };
+         }
+         return { 0, 0 };
+      }
+   };
+
+   using peek_utf32_be = peek_utf32_impl< read_uint32_be >;
+   using peek_utf32_le = peek_utf32_impl< read_uint32_le >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/read_uint.hpp b/pxr/base/pegtl/pegtl/contrib/internal/read_uint.hpp
new file mode 100644
index 0000000000..a2a08a2855
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/read_uint.hpp
@@ -0,0 +1,77 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_READ_UINT_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_READ_UINT_HPP
+
+#include <cstdint>
+
+#include "../../config.hpp"
+
+#include "endian.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct read_uint16_be
+   {
+      using type = std::uint16_t;
+
+      [[nodiscard]] static std::uint16_t read( const void* d ) noexcept
+      {
+         return be_to_h< std::uint16_t >( d );
+      }
+   };
+
+   struct read_uint16_le
+   {
+      using type = std::uint16_t;
+
+      [[nodiscard]] static std::uint16_t read( const void* d ) noexcept
+      {
+         return le_to_h< std::uint16_t >( d );
+      }
+   };
+
+   struct read_uint32_be
+   {
+      using type = std::uint32_t;
+
+      [[nodiscard]] static std::uint32_t read( const void* d ) noexcept
+      {
+         return be_to_h< std::uint32_t >( d );
+      }
+   };
+
+   struct read_uint32_le
+   {
+      using type = std::uint32_t;
+
+      [[nodiscard]] static std::uint32_t read( const void* d ) noexcept
+      {
+         return le_to_h< std::uint32_t >( d );
+      }
+   };
+
+   struct read_uint64_be
+   {
+      using type = std::uint64_t;
+
+      [[nodiscard]] static std::uint64_t read( const void* d ) noexcept
+      {
+         return be_to_h< std::uint64_t >( d );
+      }
+   };
+
+   struct read_uint64_le
+   {
+      using type = std::uint64_t;
+
+      [[nodiscard]] static std::uint64_t read( const void* d ) noexcept
+      {
+         return le_to_h< std::uint64_t >( d );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/set_stack_guard.hpp b/pxr/base/pegtl/pegtl/contrib/internal/set_stack_guard.hpp
new file mode 100644
index 0000000000..21d28d771d
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/set_stack_guard.hpp
@@ -0,0 +1,52 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_SET_STACK_GUARD_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_SET_STACK_GUARD_HPP
+
+#include <set>
+#include <utility>
+
+#include "../../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Cs >
+   class [[nodiscard]] set_stack_guard
+   {
+   public:
+      template< typename... Ts >
+      set_stack_guard( std::set< Cs... >& set, Ts&&... ts )
+         : m_i( set.emplace( std::forward< Ts >( ts )... ) ),
+           m_s( set )
+      {}
+
+      set_stack_guard( set_stack_guard&& ) = delete;
+      set_stack_guard( const set_stack_guard& ) = delete;
+
+      set_stack_guard& operator=( set_stack_guard&& ) = delete;
+      set_stack_guard& operator=( const set_stack_guard& ) = delete;
+
+      ~set_stack_guard()
+      {
+         if( m_i.second ) {
+            m_s.erase( m_i.first );
+         }
+      }
+
+      explicit operator bool() const noexcept
+      {
+         return m_i.second;
+      }
+
+   private:
+      const std::pair< typename std::set< Cs... >::iterator, bool > m_i;
+      std::set< Cs... >& m_s;
+   };
+
+   template< typename... Cs >
+   set_stack_guard( std::set< Cs... >&, const typename std::set< Cs... >::value_type& ) -> set_stack_guard< Cs... >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/internal/vector_stack_guard.hpp b/pxr/base/pegtl/pegtl/contrib/internal/vector_stack_guard.hpp
new file mode 100644
index 0000000000..9377e9b7d9
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/internal/vector_stack_guard.hpp
@@ -0,0 +1,45 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_INTERNAL_VECTOR_STACK_GUARD_HPP
+#define PXR_PEGTL_CONTRIB_INTERNAL_VECTOR_STACK_GUARD_HPP
+
+#include <utility>
+#include <vector>
+
+#include "../../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Cs >
+   class [[nodiscard]] vector_stack_guard
+   {
+   public:
+      template< typename... Ts >
+      vector_stack_guard( std::vector< Cs... >& vector, Ts&&... ts )
+         : m_s( vector )
+      {
+         m_s.emplace_back( std::forward< Ts >( ts )... );
+      }
+
+      vector_stack_guard( vector_stack_guard&& ) = delete;
+      vector_stack_guard( const vector_stack_guard& ) = delete;
+
+      vector_stack_guard& operator=( vector_stack_guard&& ) = delete;
+      vector_stack_guard& operator=( const vector_stack_guard& ) = delete;
+
+      ~vector_stack_guard()
+      {
+         m_s.pop_back();
+      }
+
+   private:
+      std::vector< Cs... >& m_s;
+   };
+
+   template< typename... Cs >
+   vector_stack_guard( std::vector< Cs... >&, const typename std::vector< Cs... >::value_type& ) -> vector_stack_guard< Cs... >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/iri.hpp b/pxr/base/pegtl/pegtl/contrib/iri.hpp
new file mode 100644
index 0000000000..1cdede75a0
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/iri.hpp
@@ -0,0 +1,106 @@
+// Copyright (c) 2021 Kelvin Hammond
+// Copyright (c) 2021-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_IRI_HPP
+#define PXR_PEGTL_CONTRIB_IRI_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/contrib/iri.hpp"
+#else
+
+#include "../config.hpp"
+#include "../rules.hpp"
+#include "../utf8.hpp"
+
+#include "abnf.hpp"
+#include "uri.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::iri
+{
+   // IRI grammar according to RFC 3987.
+
+   // This grammar is a direct PEG translation of the original URI grammar.
+   // It should be considered experimental -- in case of any issues, in particular
+   // missing rules for attached actions, please contact the developers.
+
+   // Note that this grammar has multiple top-level rules.
+
+   using uri::scheme;
+   using uri::port;
+   using uri::dslash;
+   using uri::IP_literal;
+   using uri::IPv4address;
+   using uri::pct_encoded;
+   using uri::sub_delims;
+   using uri::colon;
+
+   // clang-format off
+   struct ucschar : utf8::ranges<
+      0xA0, 0xD7FF,
+      0xF900, 0xFDCF,
+      0xFDF0, 0xFFEF,
+      0x10000, 0x1FFFD,
+      0x20000, 0x2FFFD,
+      0x30000, 0x3FFFD,
+      0x40000, 0x4FFFD,
+      0x50000, 0x5FFFD,
+      0x60000, 0x6FFFD,
+      0x70000, 0x7FFFD,
+      0x80000, 0x8FFFD,
+      0x90000, 0x9FFFD,
+      0xA0000, 0xAFFFD,
+      0xB0000, 0xBFFFD,
+      0xC0000, 0xCFFFD,
+      0xD0000, 0xDFFFD,
+      0xE1000, 0xEFFFD > {};
+
+   struct iprivate : utf8::ranges< 0xE000, 0xF8FF, 0xF0000, 0xFFFFD, 0x100000, 0x10FFFD > {};
+
+   struct iunreserved : sor< abnf::ALPHA, abnf::DIGIT, one< '-', '.', '_', '~' >, ucschar > {};
+
+   struct ipchar : sor< iunreserved, pct_encoded, sub_delims, one< ':', '@' > > {};
+
+   struct isegment : star< ipchar > {};
+   struct isegment_nz : plus< ipchar > {};
+   // non-zero-length segment without any colon ":"
+   struct isegment_nz_nc : plus< sor< iunreserved, pct_encoded, sub_delims, one< '@' > > > {};
+
+   struct ipath_abempty : star< one< '/' >, isegment > {};
+   struct ipath_absolute : seq< one< '/' >, opt< isegment_nz, star< one< '/' >, isegment > > > {};
+   struct ipath_noscheme : seq< isegment_nz_nc, star< one< '/' >, isegment > > {};
+   struct ipath_rootless : seq< isegment_nz, star< one< '/' >, isegment > > {};
+   struct ipath_empty : success {};
+
+   struct ipath : sor< ipath_noscheme,  // begins with a non-colon segment
+                       ipath_rootless,  // begins with a segment
+                       ipath_absolute,  // begins with "/" but not "//"
+                       ipath_abempty >  // begins with "/" or is empty
+   {};
+
+   struct ireg_name : star< sor< iunreserved, pct_encoded, sub_delims > > {};
+
+   struct ihost : sor< IP_literal, IPv4address, ireg_name > {};
+   struct iuserinfo : star< sor< iunreserved, pct_encoded, sub_delims, colon > > {};
+   struct opt_iuserinfo : opt< iuserinfo, one< '@' > > {};
+   struct iauthority : seq< opt_iuserinfo, ihost, opt< colon, port > > {};
+
+   struct iquery : star< sor< ipchar, iprivate, one< '/', '?' > > > {};
+   struct ifragment : star< sor< ipchar, one< '/', '?' > > > {};
+
+   struct opt_iquery : opt_must< one< '?' >, iquery > {};
+   struct opt_ifragment : opt_must< one< '#' >, ifragment > {};
+
+   struct ihier_part : sor< if_must< dslash, iauthority, ipath_abempty >, ipath_rootless, ipath_absolute, ipath_empty > {};
+   struct irelative_part : sor< if_must< dslash, iauthority, ipath_abempty >, ipath_noscheme, ipath_absolute, ipath_empty > {};
+   struct irelative_ref : seq< irelative_part, opt_iquery, opt_ifragment > {};
+
+   struct IRI : seq< scheme, one< ':' >, ihier_part, opt_iquery, opt_ifragment > {};
+   struct IRI_reference : sor< IRI, irelative_ref > {};
+   struct absolute_IRI : seq< scheme, one< ':' >, ihier_part, opt_iquery > {};
+   // clang-format off
+
+}  // namespace PXR_PEGTL_NAMESPACE::iri
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/json.hpp b/pxr/base/pegtl/pegtl/contrib/json.hpp
new file mode 100644
index 0000000000..7ce4148d67
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/json.hpp
@@ -0,0 +1,91 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_JSON_HPP
+#define PXR_PEGTL_CONTRIB_JSON_HPP
+
+#include "../ascii.hpp"
+#include "../config.hpp"
+#include "../rules.hpp"
+#include "../utf8.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::json
+{
+   // JSON grammar according to RFC 8259
+
+   // clang-format off
+   struct ws : one< ' ', '\t', '\n', '\r' > {};
+
+   template< typename R, typename P = ws >
+   struct padr : seq< R, star< P > > {};
+
+   struct begin_array : padr< one< '[' > > {};
+   struct begin_object : padr< one< '{' > > {};
+   struct end_array : one< ']' > {};
+   struct end_object : one< '}' > {};
+   struct name_separator : pad< one< ':' >, ws > {};
+   struct value_separator : padr< one< ',' > > {};
+
+   struct false_ : string< 'f', 'a', 'l', 's', 'e' > {};  // NOLINT(readability-identifier-naming)
+   struct null : string< 'n', 'u', 'l', 'l' > {};
+   struct true_ : string< 't', 'r', 'u', 'e' > {};  // NOLINT(readability-identifier-naming)
+
+   struct digits : plus< digit > {};
+   struct exp : seq< one< 'e', 'E' >, opt< one< '-', '+'> >, digits > {};
+   struct frac : seq< one< '.' >, digits > {};
+   struct int_ : sor< one< '0' >, plus< digit > > {};  // NOLINT(readability-identifier-naming)
+   struct number : seq< opt< one< '-' > >, int_, opt< frac >, opt< exp > > {};
+
+   struct xdigit : pegtl::xdigit {};
+   struct unicode : list< seq< one< 'u' >, rep< 4, xdigit > >, one< '\\' > > {};
+   struct escaped_char : one< '"', '\\', '/', 'b', 'f', 'n', 'r', 't' > {};
+   struct escaped : sor< escaped_char, unicode > {};
+   struct unescaped : utf8::range< 0x20, 0x10FFFF > {};
+   struct char_ : if_then_else< one< '\\' >, escaped, unescaped > {};  // NOLINT(readability-identifier-naming)
+
+   struct string_content : until< at< one< '"' > >, char_ > {};
+   struct string : seq< one< '"' >, string_content, any >
+   {
+      using content = string_content;
+   };
+
+   struct key_content : until< at< one< '"' > >, char_ > {};
+   struct key : seq< one< '"' >, key_content, any >
+   {
+      using content = key_content;
+   };
+
+   struct value;
+
+   struct array_element;
+   struct next_array_element : seq< array_element > {};
+   struct array_content : opt< array_element, star< value_separator, next_array_element > > {};
+   struct array : seq< begin_array, array_content, end_array >
+   {
+      using begin = begin_array;
+      using end = end_array;
+      using element = array_element;
+      using content = array_content;
+   };
+
+   struct member_value : padr< value > {};
+   struct member : seq< key, name_separator, member_value > {};
+   struct next_member : seq< member > {};
+   struct object_content : opt< member, star< value_separator, next_member > > {};
+   struct object : seq< begin_object, object_content, end_object >
+   {
+      using begin = begin_object;
+      using end = end_object;
+      using element = member;
+      using content = object_content;
+   };
+
+   struct value : sor< string, number, object, array, false_, true_, null > {};
+   struct array_element : padr< value > {};
+
+   struct text : pad< value, ws > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::json
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/json_pointer.hpp b/pxr/base/pegtl/pegtl/contrib/json_pointer.hpp
new file mode 100644
index 0000000000..521671dce5
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/json_pointer.hpp
@@ -0,0 +1,33 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_JSON_POINTER_HPP
+#define PXR_PEGTL_CONTRIB_JSON_POINTER_HPP
+
+#include "../ascii.hpp"
+#include "../config.hpp"
+#include "../rules.hpp"
+#include "../utf8.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::json_pointer
+{
+   // JSON pointer grammar according to RFC 6901
+
+   // clang-format off
+   struct unescaped : utf8::ranges< 0x0, 0x2E, 0x30, 0x7D, 0x7F, 0x10FFFF > {};
+   struct escaped : seq< one< '~' >, one< '0', '1' > > {};
+
+   struct reference_token : star< sor< unescaped, escaped > > {};
+   struct json_pointer : star< one< '/' >, reference_token > {};
+   // clang-format on
+
+   // relative JSON pointer, see ...
+
+   // clang-format off
+   struct non_negative_integer : sor< one< '0' >, plus< digit > > {};
+   struct relative_json_pointer : seq< non_negative_integer, sor< one< '#' >, json_pointer > > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::json_pointer
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/limit_bytes.hpp b/pxr/base/pegtl/pegtl/contrib/limit_bytes.hpp
new file mode 100644
index 0000000000..abd81d4dc1
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/limit_bytes.hpp
@@ -0,0 +1,88 @@
+// Copyright (c) 2021-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_LIMIT_BYTES_HPP
+#define PXR_PEGTL_CONTRIB_LIMIT_BYTES_HPP
+
+#include <algorithm>
+
+#include "../apply_mode.hpp"
+#include "../config.hpp"
+#include "../match.hpp"
+#include "../nothing.hpp"
+#include "../rewind_mode.hpp"
+
+#if defined( __cpp_exceptions )
+#include "../parse_error.hpp"
+#else
+#include <cstdio>
+#include <exception>
+#endif
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< std::size_t Maximum, typename MemoryInput >
+      struct [[nodiscard]] bytes_guard
+      {
+         MemoryInput& m_in;
+         const char* m_end;
+
+         explicit bytes_guard( MemoryInput& in_in ) noexcept
+            : m_in( in_in ),
+              m_end( in_in.end() )
+         {
+            m_in.private_set_end( m_in.begin() + std::min( m_in.size(), Maximum ) );
+         }
+
+         bytes_guard( bytes_guard&& ) = delete;
+         bytes_guard( const bytes_guard& ) = delete;
+
+         ~bytes_guard()
+         {
+            m_in.private_set_end( m_end );
+         }
+
+         bytes_guard& operator=( bytes_guard&& ) = delete;
+         bytes_guard& operator=( const bytes_guard& ) = delete;
+      };
+
+      // C++17 does not allow for partial deduction guides.
+
+   }  // namespace internal
+
+   template< std::size_t Maximum >
+   struct limit_bytes
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         internal::bytes_guard< Maximum, ParseInput > bg( in );
+         if( PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... ) ) {
+            if( in.empty() && ( bg.m_end != in.current() ) ) {
+#if defined( __cpp_exceptions )
+               throw PXR_PEGTL_NAMESPACE::parse_error( "maximum allowed rule consumption reached", in );
+#else
+               std::fputs( "maximum allowed rule consumption reached\n", stderr );
+               std::terminate();
+#endif
+            }
+            return true;
+         }
+         return false;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/limit_depth.hpp b/pxr/base/pegtl/pegtl/contrib/limit_depth.hpp
new file mode 100644
index 0000000000..b35bc567cd
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/limit_depth.hpp
@@ -0,0 +1,83 @@
+// Copyright (c) 2021-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_LIMIT_DEPTH_HPP
+#define PXR_PEGTL_CONTRIB_LIMIT_DEPTH_HPP
+
+#include "../apply_mode.hpp"
+#include "../config.hpp"
+#include "../match.hpp"
+#include "../nothing.hpp"
+#include "../rewind_mode.hpp"
+
+#if defined( __cpp_exceptions )
+#include "../parse_error.hpp"
+#else
+#include <cstdio>
+#include <exception>
+#endif
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      struct [[nodiscard]] depth_guard
+      {
+         std::size_t& m_depth;
+
+         explicit depth_guard( std::size_t& depth ) noexcept
+            : m_depth( depth )
+         {
+            ++m_depth;
+         }
+
+         depth_guard( depth_guard&& ) = delete;
+         depth_guard( const depth_guard& ) = delete;
+
+         ~depth_guard()
+         {
+            --m_depth;
+         }
+
+         depth_guard& operator=( depth_guard&& ) = delete;
+         depth_guard& operator=( const depth_guard& ) = delete;
+      };
+
+   }  // namespace internal
+
+   template< std::size_t Maximum >
+   struct limit_depth
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if constexpr( Control< Rule >::enable ) {
+            const internal::depth_guard dg( in.private_depth );
+            if( in.private_depth > Maximum ) {
+#if defined( __cpp_exceptions )
+               throw PXR_PEGTL_NAMESPACE::parse_error( "maximum parser rule nesting depth exceeded", in );
+#else
+               std::fputs( "maximum parser rule nesting depth exceeded\n", stderr );
+               std::terminate();
+#endif
+            }
+            return PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
+         }
+         else {
+            return PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
+         }
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/parse_tree.hpp b/pxr/base/pegtl/pegtl/contrib/parse_tree.hpp
new file mode 100644
index 0000000000..e68b7ff009
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/parse_tree.hpp
@@ -0,0 +1,456 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_PARSE_TREE_HPP
+#define PXR_PEGTL_CONTRIB_PARSE_TREE_HPP
+
+#include <cassert>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <tuple>
+#include <type_traits>
+#include <typeindex>
+#include <utility>
+#include <vector>
+
+#include "remove_first_state.hpp"
+#include "shuffle_states.hpp"
+
+#include "../apply_mode.hpp"
+#include "../config.hpp"
+#include "../demangle.hpp"
+#include "../memory_input.hpp"
+#include "../normal.hpp"
+#include "../nothing.hpp"
+#include "../parse.hpp"
+#include "../rewind_mode.hpp"
+
+#include "../internal/enable_control.hpp"
+#include "../internal/has_unwind.hpp"
+#include "../internal/iterator.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::parse_tree
+{
+   template< typename T, typename Source = std::string_view >
+   struct basic_node
+   {
+      using node_t = T;
+      using children_t = std::vector< std::unique_ptr< node_t > >;
+      children_t children;
+
+      std::string_view type;
+      Source source;
+
+      PXR_PEGTL_NAMESPACE::internal::iterator m_begin;
+      PXR_PEGTL_NAMESPACE::internal::iterator m_end;
+
+      // each node will be default constructed
+      basic_node() = default;
+
+      // no copy/move is necessary
+      // (nodes are always owned/handled by a std::unique_ptr)
+      basic_node( const basic_node& ) = delete;
+      basic_node( basic_node&& ) = delete;
+
+      ~basic_node() = default;
+
+      // no assignment either
+      basic_node& operator=( const basic_node& ) = delete;
+      basic_node& operator=( basic_node&& ) = delete;
+
+      [[nodiscard]] bool is_root() const noexcept
+      {
+         return type.empty();
+      }
+
+      template< typename U >
+      [[nodiscard]] bool is_type() const noexcept
+      {
+         const auto u = demangle< U >();
+         return ( ( type.data() == u.data() ) && ( type.size() == u.size() ) ) || ( type == u );
+      }
+
+      template< typename U >
+      void set_type() noexcept
+      {
+         type = demangle< U >();
+      }
+
+      [[nodiscard]] position begin() const
+      {
+         return position( m_begin, source );
+      }
+
+      [[nodiscard]] position end() const
+      {
+         return position( m_end, source );
+      }
+
+      [[nodiscard]] bool has_content() const noexcept
+      {
+         return m_end.data != nullptr;
+      }
+
+      [[nodiscard]] std::string_view string_view() const noexcept
+      {
+         assert( has_content() );
+         return std::string_view( m_begin.data, m_end.data - m_begin.data );
+      }
+
+      [[nodiscard]] std::string string() const
+      {
+         assert( has_content() );
+         return std::string( m_begin.data, m_end.data );
+      }
+
+      template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
+      [[nodiscard]] memory_input< P, Eol > as_memory_input() const
+      {
+         assert( has_content() );
+         return { m_begin.data, m_end.data, source, m_begin.byte, m_begin.line, m_begin.column };
+      }
+
+      template< typename... States >
+      void remove_content( States&&... /*unused*/ ) noexcept
+      {
+         m_end = PXR_PEGTL_NAMESPACE::internal::iterator();
+      }
+
+      // all non-root nodes are initialized by calling this method
+      template< typename Rule, typename ParseInput, typename... States >
+      void start( const ParseInput& in, States&&... /*unused*/ )
+      {
+         set_type< Rule >();
+         source = in.source();
+         m_begin = PXR_PEGTL_NAMESPACE::internal::iterator( in.iterator() );
+      }
+
+      // if parsing of the rule succeeded, this method is called
+      template< typename Rule, typename ParseInput, typename... States >
+      void success( const ParseInput& in, States&&... /*unused*/ ) noexcept
+      {
+         m_end = PXR_PEGTL_NAMESPACE::internal::iterator( in.iterator() );
+      }
+
+      // if parsing of the rule failed, this method is called
+      template< typename Rule, typename ParseInput, typename... States >
+      void failure( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+      {}
+
+      // if parsing succeeded and the (optional) transform call
+      // did not discard the node, it is appended to its parent.
+      // note that "child" is the node whose Rule just succeeded
+      // and "*this" is the parent where the node should be appended.
+      template< typename... States >
+      void emplace_back( std::unique_ptr< node_t >&& child, States&&... /*unused*/ )
+      {
+         assert( child );
+         children.emplace_back( std::move( child ) );
+      }
+   };
+
+   struct node
+      : basic_node< node >
+   {};
+
+   namespace internal
+   {
+      template< typename Node >
+      struct state
+      {
+         std::vector< std::unique_ptr< Node > > stack;
+
+         state()
+         {
+            emplace_back();
+         }
+
+         void emplace_back()
+         {
+            stack.emplace_back( std::make_unique< Node >() );
+         }
+
+         [[nodiscard]] std::unique_ptr< Node >& back() noexcept
+         {
+            assert( !stack.empty() );
+            return stack.back();
+         }
+
+         void pop_back() noexcept
+         {
+            assert( !stack.empty() );
+            return stack.pop_back();
+         }
+      };
+
+      template< typename Selector, typename... Parameters >
+      void transform( Parameters&&... /*unused*/ ) noexcept
+      {}
+
+      template< typename Selector, typename ParseInput, typename Node, typename... States >
+      auto transform( const ParseInput& in, std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( Selector::transform( in, n, st... ) ) )
+         -> decltype( (void)Selector::transform( in, n, st... ) )
+      {
+         Selector::transform( in, n, st... );
+      }
+
+      template< typename Selector, typename ParseInput, typename Node, typename... States >
+      auto transform( const ParseInput& /*unused*/, std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( Selector::transform( n, st... ) ) )
+         -> decltype( (void)Selector::transform( n, st... ) )
+      {
+         Selector::transform( n, st... );
+      }
+
+      template< typename Rule, template< typename... > class Selector >
+      inline constexpr bool is_selected_node = ( PXR_PEGTL_NAMESPACE::internal::enable_control< Rule > && Selector< Rule >::value );
+
+      template< unsigned Level, typename Subs, template< typename... > class Selector >
+      inline constexpr bool is_leaf{};
+
+      template< typename... Rules, template< typename... > class Selector >
+      inline constexpr bool is_leaf< 0, type_list< Rules... >, Selector > = ( sizeof...( Rules ) == 0 );
+
+      template< unsigned Level, typename Rule, template< typename... > class Selector >
+      inline constexpr bool is_unselected_branch = ( !is_selected_node< Rule, Selector > && is_leaf< Level, typename Rule::subs_t, Selector > );
+
+      template< unsigned Level, typename... Rules, template< typename... > class Selector >
+      inline constexpr bool is_leaf< Level, type_list< Rules... >, Selector > = ( is_unselected_branch< Level - 1, Rules, Selector > && ... );
+
+      template< typename Node, template< typename... > class Selector, template< typename... > class Control >
+      struct make_control
+      {
+         template< typename Rule, bool, bool >
+         struct state_handler;
+
+         template< typename Rule >
+         using type = rotate_states_right< state_handler< Rule, is_selected_node< Rule, Selector >, is_leaf< 8, typename Rule::subs_t, Selector > > >;
+      };
+
+      template< typename, typename, typename... >
+      inline constexpr bool node_has_unwind = false;
+
+      template< typename Node, typename Rule, typename... States >
+      inline constexpr bool node_has_unwind< Node,
+                                             Rule,
+                                             decltype( std::declval< Node >().template unwind< Rule >( std::declval< States >()... ) ),
+                                             States... > = true;
+
+      template< typename Control, typename... States >
+      inline constexpr bool control_has_unwind = PXR_PEGTL_NAMESPACE::internal::has_unwind< Control, void, States... >;
+
+      template< typename Node, template< typename... > class Selector, template< typename... > class Control >
+      template< typename Rule >
+      struct make_control< Node, Selector, Control >::state_handler< Rule, false, true >
+         : remove_first_state< Control< Rule > >
+      {};
+
+      template< typename Node, template< typename... > class Selector, template< typename... > class Control >
+      template< typename Rule >
+      struct make_control< Node, Selector, Control >::state_handler< Rule, false, false >
+         : remove_first_state< Control< Rule > >
+      {
+         static constexpr bool enable = true;
+
+         template< typename ParseInput, typename... States >
+         static void start( const ParseInput& /*unused*/, state< Node >& state, States&&... /*unused*/ )
+         {
+            state.emplace_back();
+         }
+
+         template< typename ParseInput, typename... States >
+         static void success( const ParseInput& /*unused*/, state< Node >& state, States&&... /*unused*/ )
+         {
+            auto n = std::move( state.back() );
+            state.pop_back();
+            for( auto& c : n->children ) {
+               state.back()->children.emplace_back( std::move( c ) );
+            }
+         }
+
+         template< typename ParseInput, typename... States >
+         static void failure( const ParseInput& /*unused*/, state< Node >& state, States&&... /*unused*/ )
+         {
+            state.pop_back();
+         }
+
+         template< typename ParseInput, typename... States >
+         static void unwind( const ParseInput& /*unused*/, state< Node >& state, States&&... /*unused*/ )
+         {
+            state.pop_back();
+         }
+      };
+
+      template< typename Node, template< typename... > class Selector, template< typename... > class Control >
+      template< typename Rule, bool B >
+      struct make_control< Node, Selector, Control >::state_handler< Rule, true, B >
+         : remove_first_state< Control< Rule > >
+      {
+         template< typename ParseInput, typename... States >
+         static void start( const ParseInput& in, state< Node >& state, States&&... st )
+         {
+            Control< Rule >::start( in, st... );
+            state.emplace_back();
+            state.back()->template start< Rule >( in, st... );
+         }
+
+         template< typename ParseInput, typename... States >
+         static void success( const ParseInput& in, state< Node >& state, States&&... st )
+         {
+            auto n = std::move( state.back() );
+            state.pop_back();
+            n->template success< Rule >( in, st... );
+            transform< Selector< Rule > >( in, n, st... );
+            if( n ) {
+               state.back()->emplace_back( std::move( n ), st... );
+            }
+            Control< Rule >::success( in, st... );
+         }
+
+         template< typename ParseInput, typename... States >
+         static void failure( const ParseInput& in, state< Node >& state, States&&... st )
+         {
+            state.back()->template failure< Rule >( in, st... );
+            state.pop_back();
+            Control< Rule >::failure( in, st... );
+         }
+
+         template< typename ParseInput, typename... States >
+         static void unwind( [[maybe_unused]] const ParseInput& in, [[maybe_unused]] state< Node >& state, States&&... st )
+         {
+            if constexpr( node_has_unwind< Node, Rule, void, const ParseInput&, States... > ) {
+               state.back()->template unwind< Rule >( in, st... );
+            }
+            state.pop_back();
+            if constexpr( control_has_unwind< Control< Rule >, const ParseInput&, States... > ) {
+               Control< Rule >::unwind( in, st... );
+            }
+#if defined( _MSC_VER )
+            ( (void)st,
+              ... );
+#endif
+         }
+      };
+
+      template< typename >
+      using store_all = std::true_type;
+
+      template< typename >
+      struct selector;
+
+      template< typename T >
+      struct selector< std::tuple< T > >
+      {
+         using type = typename T::type;
+      };
+
+      template< typename... Ts >
+      struct selector< std::tuple< Ts... > >
+      {
+         static_assert( sizeof...( Ts ) == 0, "multiple matches found" );
+         using type = std::false_type;
+      };
+
+      template< typename T >
+      using selector_t = typename selector< T >::type;
+
+      template< typename Rule, typename Collection >
+      using select_tuple = std::conditional_t< Collection::template contains< Rule >, std::tuple< Collection >, std::tuple<> >;
+
+   }  // namespace internal
+
+   template< typename Rule, typename... Collections >
+   using selector = internal::selector_t< decltype( std::tuple_cat( std::declval< internal::select_tuple< Rule, Collections > >()... ) ) >;
+
+   template< typename Base >
+   struct apply
+      : std::true_type
+   {
+      template< typename... Rules >
+      struct on
+      {
+         using type = Base;
+
+         template< typename Rule >
+         static constexpr bool contains = ( std::is_same_v< Rule, Rules > || ... );
+      };
+   };
+
+   struct store_content
+      : apply< store_content >
+   {};
+
+   // some nodes don't need to store their content
+   struct remove_content
+      : apply< remove_content >
+   {
+      template< typename Node, typename... States >
+      static void transform( std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( n->Node::remove_content( st... ) ) )
+      {
+         n->remove_content( st... );
+      }
+   };
+
+   // if a node has only one child, replace the node with its child, otherwise remove content
+   struct fold_one
+      : apply< fold_one >
+   {
+      template< typename Node, typename... States >
+      static void transform( std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( n->children.size(), n->Node::remove_content( st... ) ) )
+      {
+         if( n->children.size() == 1 ) {
+            n = std::move( n->children.front() );
+         }
+         else {
+            n->remove_content( st... );
+         }
+      }
+   };
+
+   // if a node has no children, discard the node, otherwise remove content
+   struct discard_empty
+      : apply< discard_empty >
+   {
+      template< typename Node, typename... States >
+      static void transform( std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( (void)n->children.empty(), n->Node::remove_content( st... ) ) )
+      {
+         if( n->children.empty() ) {
+            n.reset();
+         }
+         else {
+            n->remove_content( st... );
+         }
+      }
+   };
+
+   template< typename Rule,
+             typename Node,
+             template< typename... > class Selector = internal::store_all,
+             template< typename... > class Action = nothing,
+             template< typename... > class Control = normal,
+             typename ParseInput,
+             typename... States >
+   [[nodiscard]] std::unique_ptr< Node > parse( ParseInput&& in, States&&... st )
+   {
+      internal::state< Node > state;
+      if( !PXR_PEGTL_NAMESPACE::parse< Rule, Action, internal::make_control< Node, Selector, Control >::template type >( in, st..., state ) ) {
+         return nullptr;
+      }
+      assert( state.stack.size() == 1 );
+      return std::move( state.back() );
+   }
+
+   template< typename Rule,
+             template< typename... > class Selector = internal::store_all,
+             template< typename... > class Action = nothing,
+             template< typename... > class Control = normal,
+             typename ParseInput,
+             typename... States >
+   [[nodiscard]] std::unique_ptr< node > parse( ParseInput&& in, States&&... st )
+   {
+      return parse< Rule, node, Selector, Action, Control >( in, st... );
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::parse_tree
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/parse_tree_to_dot.hpp b/pxr/base/pegtl/pegtl/contrib/parse_tree_to_dot.hpp
new file mode 100644
index 0000000000..258df36662
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/parse_tree_to_dot.hpp
@@ -0,0 +1,111 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_PARSE_TREE_TO_DOT_HPP
+#define PXR_PEGTL_CONTRIB_PARSE_TREE_TO_DOT_HPP
+
+#include <cassert>
+#include <ostream>
+#include <string>
+
+#include "parse_tree.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::parse_tree
+{
+   namespace internal
+   {
+      inline void escape( std::ostream& os, const std::string_view s )
+      {
+         static const char* h = "0123456789abcdef";
+
+         const char* p = s.data();
+         const char* l = p;
+         const char* const e = s.data() + s.size();
+         while( p != e ) {
+            const unsigned char c = *p;
+            if( c == '\\' ) {
+               os.write( l, p - l );
+               l = ++p;
+               os << "\\\\\\\\";
+            }
+            else if( c == '"' ) {
+               os.write( l, p - l );
+               l = ++p;
+               os << "\\\\\\\"";
+            }
+            else if( c < 32 ) {
+               os.write( l, p - l );
+               l = ++p;
+               switch( c ) {
+                  case '\a':
+                     os << "\\\\a";
+                     break;
+                  case '\b':
+                     os << "\\\\b";
+                     break;
+                  case '\f':
+                     os << "\\\\f";
+                     break;
+                  case '\n':
+                     os << "\\\\n";
+                     break;
+                  case '\r':
+                     os << "\\\\r";
+                     break;
+                  case '\t':
+                     os << "\\\\t";
+                     break;
+                  case '\v':
+                     os << "\\\\v";
+                     break;
+                  default:
+                     os << "\\\\u00" << h[ ( c & 0xf0 ) >> 4 ] << h[ c & 0x0f ];
+               }
+            }
+            else if( c == 127 ) {
+               os.write( l, p - l );
+               l = ++p;
+               os << "\\\\u007f";
+            }
+            else {
+               ++p;
+            }
+         }
+         os.write( l, p - l );
+      }
+
+      template< typename Node >
+      void print_dot_node( std::ostream& os, const Node& n, const std::string_view s )
+      {
+         os << "  x" << &n << " [ label=\"";
+         escape( os, s );
+         if( n.has_content() ) {
+            os << "\\n\\\"";
+            escape( os, n.string_view() );
+            os << "\\\"";
+         }
+         os << "\" ]\n";
+         if( !n.children.empty() ) {
+            os << "  x" << &n << " -> { ";
+            for( auto& up : n.children ) {
+               os << "x" << up.get() << ( ( up == n.children.back() ) ? " }\n" : ", " );
+            }
+            for( auto& up : n.children ) {
+               print_dot_node( os, *up, up->type );
+            }
+         }
+      }
+
+   }  // namespace internal
+
+   template< typename Node >
+   void print_dot( std::ostream& os, const Node& n )
+   {
+      os << "digraph parse_tree\n{\n";
+      internal::print_dot_node( os, n, n.is_root() ? "ROOT" : n.type );
+      os << "}\n";
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::parse_tree
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/peg.hpp b/pxr/base/pegtl/pegtl/contrib/peg.hpp
new file mode 100644
index 0000000000..4a1ab4df51
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/peg.hpp
@@ -0,0 +1,121 @@
+// Copyright (c) 2021 Daniel Deptford
+// Copyright (c) 2021-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_PEG_HPP
+#define PXR_PEGTL_CONTRIB_PEG_HPP
+
+#include <tao/pegtl.hpp>
+
+namespace PXR_PEGTL_NAMESPACE::peg
+{
+   // PEG grammar from https://pdos.csail.mit.edu/~baford/packrat/popl04/peg-popl04.pdf
+   namespace grammar
+   {
+      // clang-format off
+      struct AND;
+      struct Char;
+      struct Class;
+      struct CLOSE;
+      struct Comment;
+      struct Definition;
+      struct DOT;
+      struct EndOfFile;
+      struct EndOfLine;
+      struct Expression;
+      struct QUESTION;
+      struct IdentCont;
+      struct Identifier;
+      struct IdentStart;
+      struct LEFTARROW;
+      struct Literal;
+      struct NOT;
+      struct OPEN;
+      struct PLUS;
+      struct Prefix;
+      struct Primary;
+      struct Range;
+      struct Sequence;
+      struct SLASH;
+      struct Space;
+      struct Spacing;
+      struct STAR;
+      struct Suffix;
+
+      struct Grammar : seq< Spacing, plus< Definition >, EndOfFile > {};
+
+      struct Definition : seq< Identifier, LEFTARROW, Expression > {};
+      struct Expression : list< Sequence, SLASH > {};
+      struct Sequence : star< Prefix > {};
+
+      struct Prefix : seq< opt< sor< AND, NOT > >, Suffix > {};
+      struct Suffix : seq< Primary, opt< sor< QUESTION, STAR, PLUS > > > {};
+
+      struct Primary : sor<
+         seq< Identifier, not_at< LEFTARROW > >,
+         seq< OPEN, Expression, CLOSE >,
+         Literal,
+         Class,
+         DOT
+         > {};
+
+      struct Identifier : seq< IdentStart, star< IdentCont >, Spacing > {};
+
+      struct IdentStart : identifier_first {};
+
+      struct IdentCont : identifier_other {};
+
+      struct Literal : sor<
+         seq< one< '\'' >, until< one< '\'' >, Char >, Spacing >,
+         seq< one< '"' >, until< one< '"' >, Char >, Spacing >
+         > {};
+
+      struct Class : seq< one< '[' >, until< one< ']' >, Range >, Spacing > {};
+
+      struct Range : sor<
+         seq< Char, one< '-' >, Char >,
+         Char
+         > {};
+
+      struct Char : sor<
+         seq<
+            one< '\\' >,
+            one< 'n', 'r', 't', '\'', '"', '[', ']', '\\' > >,
+         seq<
+            one< '\\' >,
+            range< '0', '2' >,
+            range< '0', '7' >,
+            range< '0', '7' > >,
+         seq<
+            one< '\\' >,
+            range< '0','7' >,
+            opt< range< '0','7' > > >,
+         seq<
+            not_at< one< '\\' > >,
+            any >
+         > {};
+
+      struct LEFTARROW : seq< string< '<','-' >, Spacing > {};
+      struct SLASH : seq< one< '/' >, Spacing > {};
+      struct AND : seq< one< '&' >, Spacing > {};
+      struct NOT : seq< one< '!' >, Spacing > {};
+      struct QUESTION : seq< one< '?' >, Spacing > {};
+      struct STAR : seq< one< '*' >, Spacing > {};
+      struct PLUS : seq< one< '+' >, Spacing > {};
+      struct OPEN : seq< one< '(' >, Spacing > {};
+      struct CLOSE : seq< one< ')' >, Spacing > {};
+      struct DOT : seq< one< '.' >, Spacing > {};
+
+      struct Spacing : star< sor< Space, Comment > > {};
+      struct Comment : seq< one< '#' >, until< EndOfLine > > {};
+
+      struct Space : sor< one< ' ', '\t' >, EndOfLine > {};
+      struct EndOfLine : sor< string< '\r', '\n' >, one< '\n' >, one< '\r' > > {};
+      struct EndOfFile : eof {};
+      // clang-format on
+
+   }  // namespace grammar
+
+}  // namespace PXR_PEGTL_NAMESPACE::peg
+
+#endif  // PXR_PEGTL_CONTRIB_PEG_HPP
diff --git a/pxr/base/pegtl/pegtl/contrib/predicates.hpp b/pxr/base/pegtl/pegtl/contrib/predicates.hpp
new file mode 100644
index 0000000000..a90455739d
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/predicates.hpp
@@ -0,0 +1,126 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_PREDICATES_HPP
+#define PXR_PEGTL_CONTRIB_PREDICATES_HPP
+
+#include "../config.hpp"
+#include "../type_list.hpp"
+
+#include "../internal/bump_help.hpp"
+#include "../internal/dependent_false.hpp"
+#include "../internal/enable_control.hpp"
+#include "../internal/failure.hpp"
+#include "../internal/peek_char.hpp"
+#include "../internal/peek_utf8.hpp"
+
+#include "analyze_traits.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename Peek, typename... Ps >
+      struct predicates_and_test
+      {
+         using peek_t = Peek;
+         using data_t = typename Peek::data_t;
+
+         [[nodiscard]] static constexpr bool test( const data_t c ) noexcept
+         {
+            return ( Ps::test( c ) && ... );  // TODO: Static assert that Ps::peek_t is the same as peek_t?!
+         }
+      };
+
+      template< typename Peek, typename P >
+      struct predicate_not_test
+      {
+         using peek_t = Peek;
+         using data_t = typename Peek::data_t;
+
+         [[nodiscard]] static constexpr bool test( const data_t c ) noexcept
+         {
+            return !P::test( c );  // TODO: Static assert that P::peek_t is the same as peek_t?!
+         }
+      };
+
+      template< typename Peek, typename... Ps >
+      struct predicates_or_test
+      {
+         using peek_t = Peek;
+         using data_t = typename Peek::data_t;
+
+         [[nodiscard]] static constexpr bool test( const data_t c ) noexcept
+         {
+            return ( Ps::test( c ) || ... );  // TODO: Static assert that Ps::peek_t is the same as peek_t?!
+         }
+      };
+
+      template< template< typename, typename... > class Test, typename Peek, typename... Ps >
+      struct predicates
+         : private Test< Peek, Ps... >
+      {
+         using peek_t = Peek;
+         using data_t = typename Peek::data_t;
+
+         using rule_t = predicates;
+         using subs_t = empty_list;
+
+         using base_t = Test< Peek, Ps... >;
+         using base_t::test;
+
+         template< int Eol >
+         static constexpr bool can_match_eol = test( Eol );
+
+         template< typename ParseInput >
+         [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( Peek::peek( in ) ) )
+         {
+            if( const auto t = Peek::peek( in ) ) {
+               if( test( t.data ) ) {
+                  bump_help< predicates >( in, t.size );
+                  return true;
+               }
+            }
+            return false;
+         }
+      };
+
+      template< template< typename, typename... > class Test, typename Peek >
+      struct predicates< Test, Peek >
+      {
+         static_assert( dependent_false< Peek >, "Empty predicate list is not allowed!" );
+      };
+
+      template< template< typename, typename... > class Test, typename Peek, typename... Ps >
+      inline constexpr bool enable_control< predicates< Test, Peek, Ps... > > = false;
+
+   }  // namespace internal
+
+   inline namespace ascii
+   {
+      // clang-format off
+      template< typename... Ps > struct predicates_and : internal::predicates< internal::predicates_and_test, internal::peek_char, Ps... > {};
+      template< typename P > struct predicate_not : internal::predicates< internal::predicate_not_test, internal::peek_char, P > {};
+      template< typename... Ps > struct predicates_or : internal::predicates< internal::predicates_or_test, internal::peek_char, Ps... > {};
+      // clang-format on
+
+   }  // namespace ascii
+
+   namespace utf8
+   {
+      // clang-format off
+      template< typename... Ps > struct predicates_and : internal::predicates< internal::predicates_and_test, internal::peek_utf8, Ps... > {};
+      template< typename P > struct predicate_not : internal::predicates< internal::predicate_not_test, internal::peek_utf8, P > {};
+      template< typename... Ps > struct predicates_or : internal::predicates< internal::predicates_or_test, internal::peek_utf8, Ps... > {};
+      // clang-format on
+
+   }  // namespace utf8
+
+   template< typename Name, template< typename, typename... > class Test, typename Peek, typename... Ps >
+   struct analyze_traits< Name, internal::predicates< Test, Peek, Ps... > >
+      : analyze_any_traits<>
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/print.hpp b/pxr/base/pegtl/pegtl/contrib/print.hpp
new file mode 100644
index 0000000000..ed804dd984
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/print.hpp
@@ -0,0 +1,75 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_PRINT_HPP
+#define PXR_PEGTL_CONTRIB_PRINT_HPP
+
+#include <ostream>
+
+#include "../config.hpp"
+#include "../demangle.hpp"
+#include "../type_list.hpp"
+#include "../visit.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename Name >
+      struct print_names
+      {
+         static void visit( std::ostream& os )
+         {
+            os << demangle< Name >() << '\n';
+         }
+      };
+
+      template< typename Name >
+      struct print_debug
+      {
+         static void visit( std::ostream& os )
+         {
+            const auto first = demangle< Name >();
+            os << first << '\n';
+
+            const auto second = demangle< typename Name::rule_t >();
+            if( first != second ) {
+               os << " (aka) " << second << '\n';
+            }
+
+            print_subs( os, typename Name::subs_t() );
+
+            os << '\n';
+         }
+
+      private:
+         template< typename... Rules >
+         static void print_subs( std::ostream& os, type_list< Rules... > /*unused*/ )
+         {
+            ( print_sub< Rules >( os ), ... );
+         }
+
+         template< typename Rule >
+         static void print_sub( std::ostream& os )
+         {
+            os << " (sub) " << demangle< Rule >() << '\n';
+         }
+      };
+
+   }  // namespace internal
+
+   template< typename Grammar >
+   void print_names( std::ostream& os )
+   {
+      visit< Grammar, internal::print_names >( os );
+   }
+
+   template< typename Grammar >
+   void print_debug( std::ostream& os )
+   {
+      visit< Grammar, internal::print_debug >( os );
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/print_coverage.hpp b/pxr/base/pegtl/pegtl/contrib/print_coverage.hpp
new file mode 100644
index 0000000000..bf10707790
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/print_coverage.hpp
@@ -0,0 +1,53 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_PRINT_COVERAGE_HPP
+#define PXR_PEGTL_CONTRIB_PRINT_COVERAGE_HPP
+
+#include <ostream>
+
+#include "coverage.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   inline std::ostream& operator<<( std::ostream& os, const coverage_result& result )
+   {
+      os << "[\n";
+      bool f = true;
+      for( const auto& [ k, v ] : result ) {
+         if( f ) {
+            f = false;
+         }
+         else {
+            os << ",\n";
+         }
+         os << "  {\n"
+            << "    \"rule\": \"" << k << "\",\n"
+            << "    \"start\": " << v.start << ", \"success\": " << v.success << ", \"failure\": " << v.failure << ", \"unwind\": " << v.unwind << ", \"raise\": " << v.raise << ",\n";
+         if( v.branches.empty() ) {
+            os << "    \"branches\": []\n";
+         }
+         else {
+            os << "    \"branches\": [\n";
+            bool f2 = true;
+            for( const auto& [ k2, v2 ] : v.branches ) {
+               if( f2 ) {
+                  f2 = false;
+               }
+               else {
+                  os << ",\n";
+               }
+               os << "      { \"branch\": \"" << k2 << "\", \"start\": " << v2.start << ", \"success\": " << v2.success << ", \"failure\": " << v2.failure << ", \"unwind\": " << v2.unwind << ", \"raise\": " << v2.raise << " }";
+            }
+            os << "\n    ]\n";
+         }
+         os << "  }";
+      }
+      os << "\n";
+      os << "]\n";
+      return os;
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/proto3.hpp b/pxr/base/pegtl/pegtl/contrib/proto3.hpp
new file mode 100644
index 0000000000..49b51fd382
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/proto3.hpp
@@ -0,0 +1,142 @@
+// Copyright (c) 2021-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_PROTO3_HPP
+#define PXR_PEGTL_CONTRIB_PROTO3_HPP
+
+#include "../ascii.hpp"
+#include "../config.hpp"
+#include "../rules.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::proto3
+{
+   // protocol buffer v3
+   // https://developers.google.com/protocol-buffers/docs/reference/proto3-spec
+
+   // clang-format off
+   struct comment_sl : seq< two< '/' >, until< eolf > > {};
+   struct comment_ml : if_must< string< '/', '*' >, until< string< '*', '/' > > > {};
+   struct sp : sor< space, comment_sl, comment_ml > {};
+   struct sps : star< sp > {};
+
+   struct comma : one< ',' > {};
+   struct dot : one< '.' > {};
+   struct equ : one< '=' > {};
+   struct semi : one< ';' > {};
+
+   struct option;
+   struct message;
+   struct extend;
+
+   struct ident_first : ranges< 'a', 'z', 'A', 'Z' > {};  // NOTE: Yes, no '_'.
+   struct ident_other : ranges< 'a', 'z', 'A', 'Z', '0', '9', '_' > {};
+   struct ident : seq< ident_first, star< ident_other > > {};
+   struct full_ident : list_must< ident, dot > {};
+
+   struct hex_lit : seq< one< '0' >, one< 'x', 'X' >, plus< xdigit > > {};
+   struct oct_lit : seq< one< '0' >, plus< odigit > > {};
+   struct dec_lit : seq< range< '1', '9' >, star< digit > >  {};
+   struct int_lit : sor< hex_lit, oct_lit, dec_lit > {};
+
+   struct sign : one< '+', '-' > {};
+   struct exp : seq< one< 'E', 'e' >, opt< sign >, plus< digit > > {};
+   struct float_lit : sor<
+      seq< plus< digit >, dot, exp >,
+      seq< plus< digit >, dot, star< digit >, opt< exp > >,
+      seq< dot, plus< digit >, opt< exp > >,
+      keyword< 'i', 'n', 'f' >,
+      keyword< 'n', 'a', 'n' > > {};
+
+   struct bool_lit : sor< keyword< 't', 'r', 'u', 'e' >,
+                          keyword< 'f', 'a', 'l', 's', 'e' > > {};
+
+   struct hex_escape : if_must< one< 'x', 'X' >, xdigit, xdigit > {};
+   struct oct_escape : if_must< odigit, odigit, odigit > {};
+   struct char_escape : one< 'a', 'b', 'f', 'n', 'r', 't', 'v', '\\', '\'', '"' > {};
+   struct escape : if_must< one< '\\' >, hex_escape, oct_escape, char_escape > {};
+   struct char_value : sor< escape, not_one< '\n', '\0' > > {};  // NOTE: No need to exclude '\' from not_one<>, see escape rule.
+   template< char Q >
+   struct str_impl : if_must< one< Q >, until< one< Q >, char_value > > {};
+   struct str_lit : sor< str_impl< '\'' >, str_impl< '"' > > {};
+
+   struct constant : sor< bool_lit, seq< opt< sign >, float_lit >, seq< opt< sign >, int_lit >, str_lit, full_ident > {};
+
+   struct option_name : seq< sor< ident, if_must< one< '(' >, full_ident, one< ')' > > >, star_must< dot, ident > > {};
+   struct option : if_must< keyword< 'o', 'p', 't', 'i', 'o', 'n' >, sps, option_name, sps, equ, sps, constant, sps, semi > {};
+
+   struct bool_type : keyword< 'b', 'o', 'o', 'l' > {};
+   struct bytes_type : keyword< 'b', 'y', 't', 'e', 's' > {};
+   struct double_type : keyword< 'd', 'o', 'u', 'b', 'l', 'e' > {};
+   struct float_type : keyword< 'f', 'l', 'o', 'a', 't' > {};
+   struct string_type : keyword< 's', 't', 'r', 'i', 'n', 'g' > {};
+
+   struct int32_type : keyword< 'i', 'n', 't', '3', '2' > {};
+   struct int64_type : keyword< 'i', 'n', 't', '6', '4' > {};
+   struct sint32_type : keyword< 's', 'i', 'n', 't', '3', '2' > {};
+   struct sint64_type : keyword< 's', 'i', 'n', 't', '6', '4' > {};
+   struct uint32_type : keyword< 'u', 'i', 'n', 't', '3', '2' > {};
+   struct uint64_type : keyword< 'u', 'i', 'n', 't', '6', '4' > {};
+   struct fixed32_type : keyword< 'f', 'i', 'x', 'e', 'd', '3', '2' > {};
+   struct fixed64_type : keyword< 'f', 'i', 'x', 'e', 'd', '6', '4' > {};
+   struct sfixed32_type : keyword< 's', 'f', 'i', 'x', 'e', 'd', '3', '2' > {};
+   struct sfixed64_type : keyword< 's', 'f', 'i', 'x', 'e', 'd', '6', '4' > {};
+
+   struct builtin_type : sor< bool_type, bytes_type, double_type, float_type, string_type, int32_type, int64_type, sint32_type, sint64_type, uint32_type, uint64_type, fixed32_type, fixed64_type, sfixed32_type, sfixed64_type > {};
+
+   struct defined_type : seq< opt< dot >, full_ident > {};  // NOTE: This replaces both message_type and enum_type -- they have the same syntax.
+
+   struct type : sor< builtin_type, defined_type > {};
+
+   struct field_option : if_must< option_name, sps, equ, sps, constant > {};
+   struct field_options : if_must< one< '[' >, sps, list< field_option, comma, sp >, sps, one< ']' > > {};
+   struct field_name : ident {};
+   struct field_number : int_lit {};
+   struct field : seq< opt< sor< keyword< 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l' >, keyword< 'r', 'e', 'p', 'e', 'a', 't', 'e', 'd' > >, sps >, type, sps, field_name, sps, equ, sps, field_number, sps, opt< field_options, sps >, semi > {};
+
+   struct oneof_name : ident {};
+   struct oneof_field : if_must< type, sps, field_name, sps, equ, sps, field_number, sps, opt< field_options, sps >, semi > {};
+   struct oneof_body : sor< oneof_field, semi > {};
+   struct oneof : if_must< keyword< 'o', 'n', 'e', 'o', 'f' >, sps, oneof_name, sps, one< '{' >, sps, until< one< '}' >, oneof_body, sps >, sps > {};
+
+   struct key_type : seq< sor< bool_type, string_type, int32_type, int64_type, sint32_type, sint64_type, uint32_type, uint64_type, fixed32_type, fixed64_type, sfixed32_type, sfixed64_type >, not_at< ident_other > > {};
+   struct map_name : ident {};
+   struct map_field : if_must< keyword< 'm', 'a', 'p' >, sps, one< '<' >, sps, key_type, sps, comma, sps, type, sps, one< '>' >, sps, map_name, sps, equ, sps, field_number, sps, opt< field_options, sps >, semi > {};
+
+   struct range : if_must< int_lit, sps, keyword< 't', 'o' >, sps, sor< int_lit, keyword< 'm', 'a', 'x' > > > {};
+   struct ranges : list_must< range, comma, sp > {};
+   struct field_names : list_must< field_name, comma, sp > {};
+   struct reserved : if_must< keyword< 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd' >, sps, sor< ranges, field_names >, sps, semi > {};
+
+   struct enum_name : ident {};
+   struct enum_value_option : seq< option_name, sps, equ, sps, constant > {};
+   struct enum_field : seq< ident, sps, equ, sps, int_lit, sps, opt_must< one< '[' >, sps, list_must< enum_value_option, comma, sp >, sps, one< ']' >, sps >, semi > {};
+   struct enum_body : if_must< one< '{' >, sps, star< sor< option, enum_field, semi >, sps >, one< '}' > > {};
+   struct enum_def : if_must< keyword< 'e', 'n', 'u', 'm' >, sps, enum_name, sps, enum_body > {};
+
+   struct message_thing : sor< field, enum_def, message, option, oneof, map_field, reserved, extend, semi > {};
+   struct message_body : seq< one<'{'>, sps, star< message_thing, sps >, one<'}'> > {};
+   struct message : if_must< keyword< 'm', 'e', 's', 's', 'a', 'g', 'e' >, sps, defined_type, sps, message_body > {};
+   struct extend : if_must< keyword< 'e', 'x', 't', 'e', 'n', 'd' >, sps, defined_type, sps, message_body > {};
+
+   struct package : if_must< keyword< 'p', 'a', 'c', 'k', 'a', 'g', 'e' >, sps, full_ident, sps, semi > {};
+
+   struct import_option : opt< sor< keyword< 'w', 'e', 'a', 'k' >, keyword< 'p', 'u', 'b', 'l', 'i', 'c' > > > {};
+   struct import : if_must< keyword< 'i', 'm', 'p', 'o', 'r', 't' >, sps, import_option, sps, str_lit, sps, semi > {};
+
+   struct rpc_name : ident {};
+   struct rpc_type : if_must< one< '(' >, sps, opt< keyword< 's', 't', 'r', 'e', 'a', 'm' >, sps >, defined_type, sps, one< ')' > > {};
+   struct rpc_options : if_must< one< '{' >, sps, star< sor< option, semi >, sps >, one< '}' > > {};
+   struct rpc : if_must< keyword< 'r', 'p', 'c' >, sps, rpc_name, sps, rpc_type, sps, keyword< 'r', 'e', 't', 'u', 'r', 'n', 's' >, sps, rpc_type, sps, sor< semi, rpc_options > > {};
+   struct service_name : ident {};
+   struct service : if_must< keyword< 's', 'e', 'r', 'v', 'i', 'c', 'e' >, sps, service_name, sps, one< '{' >, sps, star< sor< option, rpc, semi >, sps >, one< '}' > > {};
+
+   struct body : sor< import, package, option, message, enum_def, service, extend, semi > {};
+
+   struct quote : one< '\'', '"' > {};
+   struct head : if_must< keyword< 's', 'y', 'n', 't', 'a', 'x' >, sps, equ, sps, quote, string< 'p', 'r', 'o', 't', 'o', '3' >, quote, sps, semi > {};
+   struct proto : must< sps, head, sps, star< body, sps >, eof > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::proto3
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/raw_string.hpp b/pxr/base/pegtl/pegtl/contrib/raw_string.hpp
new file mode 100644
index 0000000000..b8c28214a5
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/raw_string.hpp
@@ -0,0 +1,232 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_RAW_STRING_HPP
+#define PXR_PEGTL_CONTRIB_RAW_STRING_HPP
+
+#include <cstddef>
+#include <type_traits>
+
+#include "../apply_mode.hpp"
+#include "../ascii.hpp"
+#include "../config.hpp"
+#include "../rewind_mode.hpp"
+#include "../rules.hpp"
+
+#include "analyze_traits.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< char Open, char Marker >
+      struct raw_string_open
+      {
+         using rule_t = raw_string_open;
+         using subs_t = empty_list;
+
+         template< apply_mode A,
+                   rewind_mode,
+                   template< typename... >
+                   class Action,
+                   template< typename... >
+                   class Control,
+                   typename ParseInput >
+         [[nodiscard]] static bool match( ParseInput& in, std::size_t& marker_size ) noexcept( noexcept( in.size( 0 ) ) )
+         {
+            if( in.empty() || ( in.peek_char( 0 ) != Open ) ) {
+               return false;
+            }
+            for( std::size_t i = 1; i < in.size( i + 1 ); ++i ) {
+               switch( const auto c = in.peek_char( i ) ) {
+                  case Open:
+                     marker_size = i + 1;
+                     in.bump_in_this_line( marker_size );
+                     (void)eol::match( in );
+                     return true;
+                  case Marker:
+                     break;
+                  default:
+                     return false;
+               }
+            }
+            return false;
+         }
+      };
+
+      template< char Open, char Marker >
+      inline constexpr bool enable_control< raw_string_open< Open, Marker > > = false;
+
+      template< char Marker, char Close >
+      struct at_raw_string_close
+      {
+         using rule_t = at_raw_string_close;
+         using subs_t = empty_list;
+
+         template< apply_mode A,
+                   rewind_mode,
+                   template< typename... >
+                   class Action,
+                   template< typename... >
+                   class Control,
+                   typename ParseInput >
+         [[nodiscard]] static bool match( ParseInput& in, const std::size_t& marker_size ) noexcept( noexcept( in.size( 0 ) ) )
+         {
+            if( in.size( marker_size ) < marker_size ) {
+               return false;
+            }
+            if( in.peek_char( 0 ) != Close ) {
+               return false;
+            }
+            if( in.peek_char( marker_size - 1 ) != Close ) {
+               return false;
+            }
+            for( std::size_t i = 0; i < ( marker_size - 2 ); ++i ) {
+               if( in.peek_char( i + 1 ) != Marker ) {
+                  return false;
+               }
+            }
+            return true;
+         }
+      };
+
+      template< char Marker, char Close >
+      inline constexpr bool enable_control< at_raw_string_close< Marker, Close > > = false;
+
+      template< typename Cond, typename... Rules >
+      struct raw_string_until
+         : raw_string_until< Cond, seq< Rules... > >
+      {};
+
+      template< typename Cond >
+      struct raw_string_until< Cond >
+      {
+         using rule_t = raw_string_until;
+         using subs_t = type_list< Cond >;
+
+         template< apply_mode A,
+                   rewind_mode M,
+                   template< typename... >
+                   class Action,
+                   template< typename... >
+                   class Control,
+                   typename ParseInput,
+                   typename... States >
+         [[nodiscard]] static bool match( ParseInput& in, const std::size_t& marker_size, States&&... /*unused*/ )
+         {
+            auto m = in.template mark< M >();
+
+            while( !Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, marker_size ) ) {
+               if( in.empty() ) {
+                  return false;
+               }
+               in.bump();
+            }
+            return m( true );
+         }
+      };
+
+      template< typename Cond, typename Rule >
+      struct raw_string_until< Cond, Rule >
+      {
+         using rule_t = raw_string_until;
+         using subs_t = type_list< Cond, Rule >;
+
+         template< apply_mode A,
+                   rewind_mode M,
+                   template< typename... >
+                   class Action,
+                   template< typename... >
+                   class Control,
+                   typename ParseInput,
+                   typename... States >
+         [[nodiscard]] static bool match( ParseInput& in, const std::size_t& marker_size, States&&... st )
+         {
+            auto m = in.template mark< M >();
+            using m_t = decltype( m );
+
+            while( !Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, marker_size ) ) {
+               if( !Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ) {
+                  return false;
+               }
+            }
+            return m( true );
+         }
+      };
+
+      template< typename Cond, typename... Rules >
+      inline constexpr bool enable_control< raw_string_until< Cond, Rules... > > = false;
+
+   }  // namespace internal
+
+   // raw_string matches Lua-style long literals.
+   //
+   // The following description was taken from the Lua documentation
+   // (see http://www.lua.org/docs.html):
+   //
+   // - An "opening long bracket of level n" is defined as an opening square
+   //   bracket followed by n equal signs followed by another opening square
+   //   bracket. So, an opening long bracket of level 0 is written as `[[`,
+   //   an opening long bracket of level 1 is written as `[=[`, and so on.
+   // - A "closing long bracket" is defined similarly; for instance, a closing
+   //   long bracket of level 4 is written as `]====]`.
+   // - A "long literal" starts with an opening long bracket of any level and
+   //   ends at the first closing long bracket of the same level. It can
+   //   contain any text except a closing bracket of the same level.
+   // - Literals in this bracketed form can run for several lines, do not
+   //   interpret any escape sequences, and ignore long brackets of any other
+   //   level.
+   // - For convenience, when the opening long bracket is eagerly followed
+   //   by a newline, the newline is not included in the string.
+   //
+   // Note that unlike Lua's long literal, a raw_string is customizable to use
+   // other characters than `[`, `=` and `]` for matching. Also note that Lua
+   // introduced newline-specific replacements in Lua 5.2, which we do not
+   // support on the grammar level.
+
+   template< char Open, char Marker, char Close, typename... Contents >
+   struct raw_string
+   {
+      // This is used for binding the apply()-method and for error-reporting
+      // when a raw string is not closed properly or has invalid content.
+      struct content
+         : internal::raw_string_until< internal::at_raw_string_close< Marker, Close >, Contents... >
+      {};
+
+      using rule_t = raw_string;
+      using subs_t = empty_list;  // type_list< internal::raw_string_open< Open, Marker >, content >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         std::size_t marker_size;
+         if( Control< internal::raw_string_open< Open, Marker > >::template match< A, M, Action, Control >( in, marker_size ) ) {
+            if( Control< content >::template match< A, M, Action, Control >( in, marker_size, st... ) ) {
+               in.bump_in_this_line( marker_size );
+               return true;
+            }
+         }
+         return false;
+      }
+   };
+
+   template< typename Name, char Open, char Marker, char Close >
+   struct analyze_traits< Name, raw_string< Open, Marker, Close > >
+      : analyze_any_traits<>
+   {};
+
+   template< typename Name, char Open, char Marker, char Close, typename... Contents >
+   struct analyze_traits< Name, raw_string< Open, Marker, Close, Contents... > >
+      : analyze_traits< Name, typename seq< any, star< Contents... >, any >::rule_t >
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/remove_first_state.hpp b/pxr/base/pegtl/pegtl/contrib/remove_first_state.hpp
new file mode 100644
index 0000000000..2ce80d0c1c
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/remove_first_state.hpp
@@ -0,0 +1,72 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_REMOVE_FIRST_STATE_HPP
+#define PXR_PEGTL_CONTRIB_REMOVE_FIRST_STATE_HPP
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+#include "../internal/has_unwind.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   // The first state is removed for most of the control functions forwarded to Base,
+   // start(), success(), failure(), unwind(), raise(), apply(), and apply0(). The call
+   // to match() is unchanged because it can call other grammar rules that require all
+   // states when starting their match to keep an even playing field.
+
+   template< typename Base >
+   struct remove_first_state
+      : Base
+   {
+      template< typename ParseInput, typename State, typename... States >
+      static void start( const ParseInput& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::start( in, st... ) ) )
+      {
+         Base::start( in, st... );
+      }
+
+      template< typename ParseInput, typename State, typename... States >
+      static void success( const ParseInput& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::success( in, st... ) ) )
+      {
+         Base::success( in, st... );
+      }
+
+      template< typename ParseInput, typename State, typename... States >
+      static void failure( const ParseInput& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::failure( in, st... ) ) )
+      {
+         Base::failure( in, st... );
+      }
+
+      template< typename ParseInput, typename State, typename... States >
+      [[noreturn]] static void raise( const ParseInput& in, State&& /*unused*/, States&&... st )
+      {
+         Base::raise( in, st... );
+      }
+
+      template< typename ParseInput, typename State, typename... States >
+      static auto unwind( const ParseInput& in, State&& /*unused*/, States&&... st )
+         -> std::enable_if_t< internal::has_unwind< Base, void, const ParseInput&, States... > >
+      {
+         Base::unwind( in, st... );
+      }
+
+      template< template< typename... > class Action, typename Iterator, typename ParseInput, typename State, typename... States >
+      static auto apply( const Iterator& begin, const ParseInput& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::template apply< Action >( begin, in, st... ) ) )
+         -> decltype( Base::template apply< Action >( begin, in, st... ) )
+      {
+         return Base::template apply< Action >( begin, in, st... );
+      }
+
+      template< template< typename... > class Action, typename ParseInput, typename State, typename... States >
+      static auto apply0( const ParseInput& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::template apply0< Action >( in, st... ) ) )
+         -> decltype( Base::template apply0< Action >( in, st... ) )
+      {
+         return Base::template apply0< Action >( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/remove_last_states.hpp b/pxr/base/pegtl/pegtl/contrib/remove_last_states.hpp
new file mode 100644
index 0000000000..0accd277fc
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/remove_last_states.hpp
@@ -0,0 +1,121 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_REMOVE_LAST_STATES_HPP
+#define PXR_PEGTL_CONTRIB_REMOVE_LAST_STATES_HPP
+
+#include <tuple>
+#include <utility>
+
+#include "../config.hpp"
+
+#include "../internal/has_unwind.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   // The last N states are removed for most of the control functions forwarded to Base,
+   // start(), success(), failure(), unwind(), raise(), apply(), and apply0(). The call
+   // to match() is unchanged because it can call other grammar rules that require all
+   // states when starting their match to keep an even playing field.
+
+   template< typename Base, std::size_t N >
+   struct remove_last_states
+      : Base
+   {
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      static void start_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::start( in, std::get< Is >( t )... ) ) )
+      {
+         Base::start( in, std::get< Is >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      static void start( const ParseInput& in, States&&... st ) noexcept( noexcept( start_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() ) ) )
+      {
+         start_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() );
+      }
+
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      static void success_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::success( in, std::get< Is >( t )... ) ) )
+      {
+         Base::success( in, std::get< Is >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      static void success( const ParseInput& in, States&&... st ) noexcept( noexcept( success_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() ) ) )
+      {
+         success_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() );
+      }
+
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      static void failure_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::failure( in, std::get< Is >( t )... ) ) )
+      {
+         Base::failure( in, std::get< Is >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      static void failure( const ParseInput& in, States&&... st ) noexcept( noexcept( failure_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() ) ) )
+      {
+         failure_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() );
+      }
+
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      [[noreturn]] static void raise_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ )
+      {
+         Base::raise( in, std::get< Is >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      [[noreturn]] static void raise( const ParseInput& in, States&&... st )
+      {
+         raise_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() );
+      }
+
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      static auto unwind_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ )
+         -> std::enable_if_t< internal::has_unwind< Base, void, const ParseInput&, std::tuple_element_t< Is, Tuple >... > >
+      {
+         Base::unwind( in, std::get< Is >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      static auto unwind( const ParseInput& in, States&&... st )
+         -> decltype( unwind_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() ) )
+      {
+         unwind_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() );
+      }
+
+      template< template< typename... > class Action, typename Iterator, typename ParseInput, typename Tuple, std::size_t... Is >
+      static auto apply_impl( const Iterator& begin, const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::template apply< Action >( begin, in, std::get< Is >( t )... ) ) )
+         -> decltype( Base::template apply< Action >( begin, in, std::get< Is >( t )... ) )
+      {
+         return Base::template apply< Action >( begin, in, std::get< Is >( t )... );
+      }
+
+      template< template< typename... > class Action, typename Iterator, typename ParseInput, typename... States >
+      static auto apply( const Iterator& begin, const ParseInput& in, States&&... st ) noexcept( noexcept( apply_impl< Action >( begin, in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() ) ) )
+         -> decltype( apply_impl< Action >( begin, in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() ) )
+      {
+         return apply_impl< Action >( begin, in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() );
+      }
+
+      template< template< typename... > class Action, typename ParseInput, typename Tuple, std::size_t... Is >
+      static auto apply0_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::template apply0< Action >( in, std::get< Is >( t )... ) ) )
+         -> decltype( Base::template apply0< Action >( in, std::get< Is >( t )... ) )
+      {
+         return Base::template apply0< Action >( in, std::get< Is >( t )... );
+      }
+
+      template< template< typename... > class Action, typename ParseInput, typename... States >
+      static auto apply0( const ParseInput& in, States&&... st ) noexcept( noexcept( apply0_impl< Action >( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() ) ) )
+         -> decltype( apply0_impl< Action >( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() ) )
+      {
+         return apply0_impl< Action >( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) - N >() );
+      }
+   };
+
+   template< typename Base >
+   using remove_last_state = remove_last_states< Base, 1 >;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/rep_one_min_max.hpp b/pxr/base/pegtl/pegtl/contrib/rep_one_min_max.hpp
new file mode 100644
index 0000000000..d07628bea2
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/rep_one_min_max.hpp
@@ -0,0 +1,100 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_REP_ONE_MIN_MAX_HPP
+#define PXR_PEGTL_CONTRIB_REP_ONE_MIN_MAX_HPP
+
+#include <algorithm>
+#include <type_traits>
+
+#include "../config.hpp"
+#include "../type_list.hpp"
+
+#include "../internal/bump_help.hpp"
+#include "../internal/bytes.hpp"
+#include "../internal/enable_control.hpp"
+#include "../internal/opt.hpp"
+
+#include "analyze_traits.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< unsigned Min, unsigned Max, char C >
+      struct rep_one_min_max
+      {
+         using rule_t = rep_one_min_max;
+         using subs_t = empty_list;
+
+         static_assert( Min <= Max );
+
+         template< int Eol >
+         static constexpr bool can_match_eol = ( C == Eol );
+
+         template< typename ParseInput >
+         [[nodiscard]] static bool match( ParseInput& in )
+         {
+            const auto size = in.size( Max + 1 );
+            if( size < Min ) {
+               return false;
+            }
+            std::size_t i = 0;
+            while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
+               ++i;
+            }
+            if( ( Min <= i ) && ( i <= Max ) ) {
+               bump_help< rep_one_min_max >( in, i );
+               return true;
+            }
+            return false;
+         }
+      };
+
+      template< unsigned Max, char C >
+      struct rep_one_min_max< 0, Max, C >
+      {
+         using rule_t = rep_one_min_max;
+         using subs_t = empty_list;
+
+         template< int Eol >
+         static constexpr bool can_match_eol = ( C == Eol );
+
+         template< typename ParseInput >
+         [[nodiscard]] static bool match( ParseInput& in )
+         {
+            const auto size = in.size( Max + 1 );
+            std::size_t i = 0;
+            while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
+               ++i;
+            }
+            if( i <= Max ) {
+               bump_help< rep_one_min_max >( in, i );
+               return true;
+            }
+            return false;
+         }
+      };
+
+      template< unsigned Min, unsigned Max, char C >
+      inline constexpr bool enable_control< rep_one_min_max< Min, Max, C > > = false;
+
+   }  // namespace internal
+
+   inline namespace ascii
+   {
+      template< unsigned Min, unsigned Max, char C >
+      struct rep_one_min_max
+         : internal::rep_one_min_max< Min, Max, C >
+      {};
+
+   }  // namespace ascii
+
+   template< typename Name, unsigned Min, unsigned Max, char C >
+   struct analyze_traits< Name, internal::rep_one_min_max< Min, Max, C > >
+      : std::conditional_t< ( Min != 0 ), analyze_any_traits<>, analyze_opt_traits<> >
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/rep_string.hpp b/pxr/base/pegtl/pegtl/contrib/rep_string.hpp
new file mode 100644
index 0000000000..3e884df9bd
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/rep_string.hpp
@@ -0,0 +1,43 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_REP_STRING_HPP
+#define PXR_PEGTL_CONTRIB_REP_STRING_HPP
+
+#include <cstddef>
+
+#include "../config.hpp"
+#include "../internal/string.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< std::size_t, typename, char... >
+      struct make_rep_string;
+
+      template< char... Ss, char... Cs >
+      struct make_rep_string< 0, string< Ss... >, Cs... >
+      {
+         using type = string< Ss... >;
+      };
+
+      template< std::size_t N, char... Ss, char... Cs >
+      struct make_rep_string< N, string< Ss... >, Cs... >
+         : make_rep_string< N - 1, string< Ss..., Cs... >, Cs... >
+      {};
+
+   }  // namespace internal
+
+   inline namespace ascii
+   {
+      template< std::size_t N, char... Cs >
+      struct rep_string
+         : internal::make_rep_string< N, internal::string<>, Cs... >::type
+      {};
+
+   }  // namespace ascii
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/separated_seq.hpp b/pxr/base/pegtl/pegtl/contrib/separated_seq.hpp
new file mode 100644
index 0000000000..63d3200575
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/separated_seq.hpp
@@ -0,0 +1,45 @@
+// Copyright (c) 2021-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_SEPARATED_SEQ_HPP
+#define PXR_PEGTL_CONTRIB_SEPARATED_SEQ_HPP
+
+#include "../config.hpp"
+
+#include "../internal/seq.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename... >
+      struct sep;
+
+      template< typename... Ts, typename S, typename Rule, typename... Rules >
+      struct sep< type_list< Ts... >, S, Rule, Rules... >
+         : sep< type_list< Ts..., Rule, S >, S, Rules... >
+      {};
+
+      template< typename... Ts, typename S, typename Rule >
+      struct sep< type_list< Ts... >, S, Rule >
+      {
+         using type = seq< Ts..., Rule >;
+      };
+
+      template< typename S >
+      struct sep< type_list<>, S >
+      {
+         using type = seq<>;
+      };
+
+   }  // namespace internal
+
+   template< typename S, typename... Rules >
+   struct separated_seq
+      : internal::sep< type_list<>, S, Rules... >::type
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/shuffle_states.hpp b/pxr/base/pegtl/pegtl/contrib/shuffle_states.hpp
new file mode 100644
index 0000000000..936a789933
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/shuffle_states.hpp
@@ -0,0 +1,193 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_SHUFFLE_STATES_HPP
+#define PXR_PEGTL_CONTRIB_SHUFFLE_STATES_HPP
+
+#include <tuple>
+#include <type_traits>
+#include <utility>
+
+#include "../config.hpp"
+
+#include "../internal/has_unwind.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< std::size_t N >
+      struct rotate_left
+      {
+         template< std::size_t I, std::size_t S >
+         static constexpr std::size_t value = ( I + N ) % S;
+      };
+
+      template< std::size_t N >
+      struct rotate_right
+      {
+         template< std::size_t I, std::size_t S >
+         static constexpr std::size_t value = ( I + S - N ) % S;
+      };
+
+      struct reverse
+      {
+         template< std::size_t I, std::size_t S >
+         static constexpr std::size_t value = ( S - 1 ) - I;
+      };
+
+   }  // namespace internal
+
+   // Applies 'Shuffle' to the states of start(), success(), failure(), raise(), apply(), and apply0()
+   template< typename Base, typename Shuffle >
+   struct shuffle_states
+      : Base
+   {
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      static void start_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::start( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... ) ) )
+      {
+         Base::start( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      static void start( const ParseInput& in, States&&... st ) noexcept( noexcept( start_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() ) ) )
+      {
+         start_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() );
+      }
+
+      template< typename ParseInput, typename State >
+      static void start( const ParseInput& in, State&& st ) noexcept( noexcept( Base::start( in, st ) ) )
+      {
+         Base::start( in, st );
+      }
+
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      static void success_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::success( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... ) ) )
+      {
+         Base::success( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      static void success( const ParseInput& in, States&&... st ) noexcept( noexcept( success_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() ) ) )
+      {
+         success_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() );
+      }
+
+      template< typename ParseInput, typename State >
+      static void success( const ParseInput& in, State&& st ) noexcept( noexcept( Base::success( in, st ) ) )
+      {
+         Base::success( in, st );
+      }
+
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      static void failure_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::failure( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... ) ) )
+      {
+         Base::failure( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      static void failure( const ParseInput& in, States&&... st ) noexcept( noexcept( failure_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() ) ) )
+      {
+         failure_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() );
+      }
+
+      template< typename ParseInput, typename State >
+      static void failure( const ParseInput& in, State&& st ) noexcept( noexcept( Base::failure( in, st ) ) )
+      {
+         Base::failure( in, st );
+      }
+
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      [[noreturn]] static void raise_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ )
+      {
+         Base::raise( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      [[noreturn]] static void raise( const ParseInput& in, States&&... st )
+      {
+         raise_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() );
+      }
+
+      template< typename ParseInput, typename State >
+      [[noreturn]] static void raise( const ParseInput& in, State&& st )
+      {
+         Base::raise( in, st );
+      }
+
+      template< typename ParseInput, typename Tuple, std::size_t... Is >
+      static auto unwind_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ )
+         -> std::enable_if_t< internal::has_unwind< Base, void, const ParseInput&, std::tuple_element_t< Shuffle::template value< Is, sizeof...( Is ) >, Tuple >... > >
+      {
+         Base::unwind( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... );
+      }
+
+      template< typename ParseInput, typename... States >
+      static auto unwind( const ParseInput& in, States&&... st )
+         -> decltype( unwind_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() ) )
+      {
+         unwind_impl( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() );
+      }
+
+      template< typename ParseInput, typename State >
+      static auto unwind( const ParseInput& in, State&& st )
+         -> std::enable_if_t< internal::has_unwind< Base, void, const ParseInput&, State > >
+      {
+         Base::unwind( in, st );
+      }
+
+      template< template< typename... > class Action, typename Iterator, typename ParseInput, typename Tuple, std::size_t... Is >
+      static auto apply_impl( const Iterator& begin, const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::template apply< Action >( begin, in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... ) ) )
+         -> decltype( Base::template apply< Action >( begin, in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... ) )
+      {
+         return Base::template apply< Action >( begin, in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... );
+      }
+
+      template< template< typename... > class Action, typename Iterator, typename ParseInput, typename... States >
+      static auto apply( const Iterator& begin, const ParseInput& in, States&&... st ) noexcept( noexcept( apply_impl< Action >( begin, in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() ) ) )
+         -> decltype( apply_impl< Action >( begin, in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() ) )
+      {
+         return apply_impl< Action >( begin, in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() );
+      }
+
+      template< template< typename... > class Action, typename Iterator, typename ParseInput, typename State >
+      static auto apply( const Iterator& begin, const ParseInput& in, State&& st ) noexcept( noexcept( Base::template apply< Action >( begin, in, st ) ) )
+         -> decltype( Base::template apply< Action >( begin, in, st ) )
+      {
+         return Base::template apply< Action >( begin, in, st );
+      }
+
+      template< template< typename... > class Action, typename ParseInput, typename Tuple, std::size_t... Is >
+      static auto apply0_impl( const ParseInput& in, const Tuple& t, std::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::template apply0< Action >( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... ) ) )
+         -> decltype( Base::template apply0< Action >( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... ) )
+      {
+         return Base::template apply0< Action >( in, std::get< Shuffle::template value< Is, sizeof...( Is ) > >( t )... );
+      }
+
+      template< template< typename... > class Action, typename ParseInput, typename... States >
+      static auto apply0( const ParseInput& in, States&&... st ) noexcept( noexcept( apply0_impl< Action >( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() ) ) )
+         -> decltype( apply0_impl< Action >( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() ) )
+      {
+         return apply0_impl< Action >( in, std::tie( st... ), std::make_index_sequence< sizeof...( st ) >() );
+      }
+
+      template< template< typename... > class Action, typename ParseInput, typename State >
+      static auto apply0( const ParseInput& in, State&& st ) noexcept( noexcept( Base::template apply0< Action >( in, st ) ) )
+         -> decltype( Base::template apply0< Action >( in, st ) )
+      {
+         return Base::template apply0< Action >( in, st );
+      }
+   };
+
+   template< typename Base, std::size_t N = 1 >
+   using rotate_states_left = shuffle_states< Base, internal::rotate_left< N > >;
+
+   template< typename Base, std::size_t N = 1 >
+   using rotate_states_right = shuffle_states< Base, internal::rotate_right< N > >;
+
+   template< typename Base >
+   using reverse_states = shuffle_states< Base, internal::reverse >;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/state_control.hpp b/pxr/base/pegtl/pegtl/contrib/state_control.hpp
new file mode 100644
index 0000000000..c1ec46e590
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/state_control.hpp
@@ -0,0 +1,122 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_STATE_CONTROL_HPP
+#define PXR_PEGTL_CONTRIB_STATE_CONTROL_HPP
+
+#include <type_traits>
+
+#include "shuffle_states.hpp"
+
+#include "../config.hpp"
+#include "../internal/has_unwind.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< template< typename... > class Control >
+   struct state_control
+   {
+      template< typename Rule >
+      struct control
+         : Control< Rule >
+      {
+         static constexpr bool enable = true;
+
+         template< typename ParseInput, typename State, typename... States >
+         static void start( [[maybe_unused]] const ParseInput& in, [[maybe_unused]] State& state, [[maybe_unused]] States&&... st )
+         {
+            if constexpr( Control< Rule >::enable ) {
+               Control< Rule >::start( in, st... );
+            }
+            if constexpr( State::template enable< Rule > ) {
+               state.template start< Rule >( in, st... );
+            }
+#if defined( _MSC_VER )
+            ( (void)st,
+              ... );
+#endif
+         }
+
+         template< typename ParseInput, typename State, typename... States >
+         static void success( [[maybe_unused]] const ParseInput& in, [[maybe_unused]] State& state, [[maybe_unused]] States&&... st )
+         {
+            if constexpr( State::template enable< Rule > ) {
+               state.template success< Rule >( in, st... );
+            }
+            if constexpr( Control< Rule >::enable ) {
+               Control< Rule >::success( in, st... );
+            }
+#if defined( _MSC_VER )
+            ( (void)st,
+              ... );
+#endif
+         }
+
+         template< typename ParseInput, typename State, typename... States >
+         static void failure( [[maybe_unused]] const ParseInput& in, [[maybe_unused]] State& state, [[maybe_unused]] States&&... st )
+         {
+            if constexpr( State::template enable< Rule > ) {
+               state.template failure< Rule >( in, st... );
+            }
+            if constexpr( Control< Rule >::enable ) {
+               Control< Rule >::failure( in, st... );
+            }
+#if defined( _MSC_VER )
+            ( (void)st,
+              ... );
+#endif
+         }
+
+         template< typename ParseInput, typename State, typename... States >
+         [[noreturn]] static void raise( const ParseInput& in, [[maybe_unused]] State& state, States&&... st )
+         {
+            if constexpr( State::template enable< Rule > ) {
+               state.template raise< Rule >( in, st... );
+            }
+            Control< Rule >::raise( in, st... );
+         }
+
+         template< typename ParseInput, typename State, typename... States >
+         static auto unwind( [[maybe_unused]] const ParseInput& in, [[maybe_unused]] State& state, [[maybe_unused]] States&&... st )
+            -> std::enable_if_t< State::template enable< Rule > || ( Control< Rule >::enable && internal::has_unwind< Control< Rule >, void, const ParseInput&, States... > ) >
+         {
+            if constexpr( State::template enable< Rule > ) {
+               state.template unwind< Rule >( in, st... );
+            }
+            if constexpr( Control< Rule >::enable && internal::has_unwind< Control< Rule >, void, const ParseInput&, States... > ) {
+               Control< Rule >::unwind( in, st... );
+            }
+#if defined( _MSC_VER )
+            ( (void)st,
+              ... );
+#endif
+         }
+
+         template< template< typename... > class Action, typename Iterator, typename ParseInput, typename State, typename... States >
+         static auto apply( const Iterator& begin, const ParseInput& in, [[maybe_unused]] State& state, States&&... st )
+            -> decltype( Control< Rule >::template apply< Action >( begin, in, st... ) )
+         {
+            if constexpr( State::template enable< Rule > ) {
+               state.template apply< Rule >( in, st... );
+            }
+            return Control< Rule >::template apply< Action >( begin, in, st... );
+         }
+
+         template< template< typename... > class Action, typename ParseInput, typename State, typename... States >
+         static auto apply0( const ParseInput& in, [[maybe_unused]] State& state, States&&... st )
+            -> decltype( Control< Rule >::template apply0< Action >( in, st... ) )
+         {
+            if constexpr( State::template enable< Rule > ) {
+               state.template apply0< Rule >( in, st... );
+            }
+            return Control< Rule >::template apply0< Action >( in, st... );
+         }
+      };
+
+      template< typename Rule >
+      using type = rotate_states_right< control< Rule > >;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/to_string.hpp b/pxr/base/pegtl/pegtl/contrib/to_string.hpp
new file mode 100644
index 0000000000..d19540fef8
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/to_string.hpp
@@ -0,0 +1,38 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_TO_STRING_HPP
+#define PXR_PEGTL_CONTRIB_TO_STRING_HPP
+
+#include <string>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename >
+      struct to_string;
+
+      template< template< char... > class X, char... Cs >
+      struct to_string< X< Cs... > >
+      {
+         [[nodiscard]] static std::string get()
+         {
+            const char s[] = { Cs..., 0 };
+            return std::string( s, sizeof...( Cs ) );
+         }
+      };
+
+   }  // namespace internal
+
+   template< typename T >
+   [[nodiscard]] std::string to_string()
+   {
+      return internal::to_string< T >::get();
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/trace.hpp b/pxr/base/pegtl/pegtl/contrib/trace.hpp
new file mode 100644
index 0000000000..b789b0d680
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/trace.hpp
@@ -0,0 +1,227 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_TRACE_HPP
+#define PXR_PEGTL_CONTRIB_TRACE_HPP
+
+#include <cstddef>
+#include <iomanip>
+#include <iostream>
+#include <string_view>
+#include <tuple>
+
+#include "state_control.hpp"
+
+#include "../apply_mode.hpp"
+#include "../config.hpp"
+#include "../demangle.hpp"
+#include "../normal.hpp"
+#include "../nothing.hpp"
+#include "../parse.hpp"
+#include "../rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< bool HideInternal = false, bool UseColor = true, std::size_t IndentIncrement = 2, std::size_t InitialIndent = 8 >
+   struct tracer_traits
+   {
+      template< typename Rule >
+      static constexpr bool enable = ( HideInternal ? normal< Rule >::enable : true );
+
+      static constexpr std::size_t initial_indent = InitialIndent;
+      static constexpr std::size_t indent_increment = IndentIncrement;
+
+      static constexpr std::string_view ansi_reset = UseColor ? "\033[m" : "";
+      static constexpr std::string_view ansi_rule = UseColor ? "\033[36m" : "";
+      static constexpr std::string_view ansi_hide = UseColor ? "\033[37m" : "";
+
+      static constexpr std::string_view ansi_position = UseColor ? "\033[1;34m" : "";
+      static constexpr std::string_view ansi_success = UseColor ? "\033[32m" : "";
+      static constexpr std::string_view ansi_failure = UseColor ? "\033[31m" : "";
+      static constexpr std::string_view ansi_raise = UseColor ? "\033[1;31m" : "";
+      static constexpr std::string_view ansi_unwind = UseColor ? "\033[31m" : "";
+      static constexpr std::string_view ansi_apply = UseColor ? "\033[1;36m" : "";
+   };
+
+   using standard_tracer_traits = tracer_traits< true >;
+   using complete_tracer_traits = tracer_traits< false >;
+
+   template< typename TracerTraits >
+   struct tracer
+   {
+      const std::ios_base::fmtflags m_flags;
+      std::size_t m_count = 0;
+      std::vector< std::size_t > m_stack;
+      position m_position;
+
+      template< typename Rule >
+      static constexpr bool enable = TracerTraits::template enable< Rule >;
+
+      template< typename ParseInput >
+      explicit tracer( const ParseInput& in )
+         : m_flags( std::cerr.flags() ),
+           m_position( in.position() )
+      {
+         std::cerr << std::left;
+         print_position();
+      }
+
+      tracer( const tracer& ) = delete;
+      tracer( tracer&& ) = delete;
+
+      ~tracer()
+      {
+         std::cerr.flags( m_flags );
+      }
+
+      tracer& operator=( const tracer& ) = delete;
+      tracer& operator=( tracer&& ) = delete;
+
+      [[nodiscard]] std::size_t indent() const noexcept
+      {
+         return TracerTraits::initial_indent + TracerTraits::indent_increment * m_stack.size();
+      }
+
+      void print_position() const
+      {
+         std::cerr << std::setw( indent() ) << ' ' << TracerTraits::ansi_position << "position" << TracerTraits::ansi_reset << ' ' << m_position << '\n';
+      }
+
+      void update_position( const position& p )
+      {
+         if( m_position != p ) {
+            m_position = p;
+            print_position();
+         }
+      }
+
+      template< typename Rule, typename ParseInput, typename... States >
+      void start( const ParseInput& /*unused*/, States&&... /*unused*/ )
+      {
+         std::cerr << '#' << std::setw( indent() - 1 ) << ++m_count << TracerTraits::ansi_rule << demangle< Rule >() << TracerTraits::ansi_reset << '\n';
+         m_stack.push_back( m_count );
+      }
+
+      template< typename Rule, typename ParseInput, typename... States >
+      void success( const ParseInput& in, States&&... /*unused*/ )
+      {
+         const auto prev = m_stack.back();
+         m_stack.pop_back();
+         std::cerr << std::setw( indent() ) << ' ' << TracerTraits::ansi_success << "success" << TracerTraits::ansi_reset;
+         if( m_count != prev ) {
+            std::cerr << " #" << prev << ' ' << TracerTraits::ansi_hide << demangle< Rule >() << TracerTraits::ansi_reset;
+         }
+         std::cerr << '\n';
+         update_position( in.position() );
+      }
+
+      template< typename Rule, typename ParseInput, typename... States >
+      void failure( const ParseInput& in, States&&... /*unused*/ )
+      {
+         const auto prev = m_stack.back();
+         m_stack.pop_back();
+         std::cerr << std::setw( indent() ) << ' ' << TracerTraits::ansi_failure << "failure" << TracerTraits::ansi_reset;
+         if( m_count != prev ) {
+            std::cerr << " #" << prev << ' ' << TracerTraits::ansi_hide << demangle< Rule >() << TracerTraits::ansi_reset;
+         }
+         std::cerr << '\n';
+         update_position( in.position() );
+      }
+
+      template< typename Rule, typename ParseInput, typename... States >
+      void raise( const ParseInput& /*unused*/, States&&... /*unused*/ )
+      {
+         std::cerr << std::setw( indent() ) << ' ' << TracerTraits::ansi_raise << "raise" << TracerTraits::ansi_reset << ' ' << TracerTraits::ansi_rule << demangle< Rule >() << TracerTraits::ansi_reset << '\n';
+      }
+
+      template< typename Rule, typename ParseInput, typename... States >
+      void unwind( const ParseInput& in, States&&... /*unused*/ )
+      {
+         const auto prev = m_stack.back();
+         m_stack.pop_back();
+         std::cerr << std::setw( indent() ) << ' ' << TracerTraits::ansi_unwind << "unwind" << TracerTraits::ansi_reset;
+         if( m_count != prev ) {
+            std::cerr << " #" << prev << ' ' << TracerTraits::ansi_hide << demangle< Rule >() << TracerTraits::ansi_reset;
+         }
+         std::cerr << '\n';
+         update_position( in.position() );
+      }
+
+      template< typename Rule, typename ParseInput, typename... States >
+      void apply( const ParseInput& /*unused*/, States&&... /*unused*/ )
+      {
+         std::cerr << std::setw( static_cast< int >( indent() - TracerTraits::indent_increment ) ) << ' ' << TracerTraits::ansi_apply << "apply" << TracerTraits::ansi_reset << '\n';
+      }
+
+      template< typename Rule, typename ParseInput, typename... States >
+      void apply0( const ParseInput& /*unused*/, States&&... /*unused*/ )
+      {
+         std::cerr << std::setw( static_cast< int >( indent() - TracerTraits::indent_increment ) ) << ' ' << TracerTraits::ansi_apply << "apply0" << TracerTraits::ansi_reset << '\n';
+      }
+
+      template< typename Rule,
+                template< typename... > class Action = nothing,
+                template< typename... > class Control = normal,
+                typename ParseInput,
+                typename... States >
+      bool parse( ParseInput&& in, States&&... st )
+      {
+         return PXR_PEGTL_NAMESPACE::parse< Rule, Action, state_control< Control >::template type >( in, st..., *this );
+      }
+   };
+
+   template< typename Rule,
+             template< typename... > class Action = nothing,
+             template< typename... > class Control = normal,
+             typename ParseInput,
+             typename... States >
+   bool standard_trace( ParseInput&& in, States&&... st )
+   {
+      tracer< standard_tracer_traits > tr( in );
+      return tr.parse< Rule, Action, Control >( in, st... );
+   }
+
+   template< typename Rule,
+             template< typename... > class Action = nothing,
+             template< typename... > class Control = normal,
+             typename ParseInput,
+             typename... States >
+   bool complete_trace( ParseInput&& in, States&&... st )
+   {
+      tracer< complete_tracer_traits > tr( in );
+      return tr.parse< Rule, Action, Control >( in, st... );
+   }
+
+   template< typename Tracer >
+   struct trace
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if constexpr( sizeof...( st ) == 0 ) {
+            return PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, state_control< Control >::template type >( in, st..., Tracer( in ) );
+         }
+         else if constexpr( !std::is_same_v< std::tuple_element_t< sizeof...( st ) - 1, std::tuple< States... > >, Tracer& > ) {
+            return PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, state_control< Control >::template type >( in, st..., Tracer( in ) );
+         }
+         else {
+            return PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
+         }
+      }
+   };
+
+   using trace_standard = trace< tracer< standard_tracer_traits > >;
+   using trace_complete = trace< tracer< complete_tracer_traits > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/uint16.hpp b/pxr/base/pegtl/pegtl/contrib/uint16.hpp
new file mode 100644
index 0000000000..82e30ca981
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/uint16.hpp
@@ -0,0 +1,62 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_UINT16_HPP
+#define PXR_PEGTL_CONTRIB_UINT16_HPP
+
+#include "../config.hpp"
+#include "../internal/result_on_found.hpp"
+#include "../internal/rules.hpp"
+
+#include "internal/peek_mask_uint.hpp"
+#include "internal/peek_uint.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace uint16_be
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_uint16_be > {};
+
+      template< std::uint16_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint16_be, Cs... > {};
+      template< std::uint16_t Lo, std::uint16_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint16_be, Lo, Hi > {};
+      template< std::uint16_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint16_be, Cs... > {};
+      template< std::uint16_t Lo, std::uint16_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint16_be, Lo, Hi > {};
+      template< std::uint16_t... Cs > struct ranges : internal::ranges< internal::peek_uint16_be, Cs... > {};
+      template< std::uint16_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint16_be, Cs >... > {};
+
+      template< std::uint16_t M, std::uint16_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint16_be< M >, Cs... > {};
+      template< std::uint16_t M, std::uint16_t Lo, std::uint16_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint16_be< M >, Lo, Hi > {};
+      template< std::uint16_t M, std::uint16_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint16_be< M >, Cs... > {};
+      template< std::uint16_t M, std::uint16_t Lo, std::uint16_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint16_be< M >, Lo, Hi > {};
+      template< std::uint16_t M, std::uint16_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint16_be< M >, Cs... > {};
+      template< std::uint16_t M, std::uint16_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint16_be< M >, Cs >... > {};
+      // clang-format on
+
+   }  // namespace uint16_be
+
+   namespace uint16_le
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_uint16_le > {};
+
+      template< std::uint16_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint16_le, Cs... > {};
+      template< std::uint16_t Lo, std::uint16_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint16_le, Lo, Hi > {};
+      template< std::uint16_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint16_le, Cs... > {};
+      template< std::uint16_t Lo, std::uint16_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint16_le, Lo, Hi > {};
+      template< std::uint16_t... Cs > struct ranges : internal::ranges< internal::peek_uint16_le, Cs... > {};
+      template< std::uint16_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint16_le, Cs >... > {};
+
+      template< std::uint16_t M, std::uint16_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint16_le< M >, Cs... > {};
+      template< std::uint16_t M, std::uint16_t Lo, std::uint16_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint16_le< M >, Lo, Hi > {};
+      template< std::uint16_t M, std::uint16_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint16_le< M >, Cs... > {};
+      template< std::uint16_t M, std::uint16_t Lo, std::uint16_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint16_le< M >, Lo, Hi > {};
+      template< std::uint16_t M, std::uint16_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint16_le< M >, Cs... > {};
+      template< std::uint16_t M, std::uint16_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint16_le< M >, Cs >... > {};
+      // clang-format on
+
+   }  // namespace uint16_le
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/uint32.hpp b/pxr/base/pegtl/pegtl/contrib/uint32.hpp
new file mode 100644
index 0000000000..12079d9c10
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/uint32.hpp
@@ -0,0 +1,62 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_UINT32_HPP
+#define PXR_PEGTL_CONTRIB_UINT32_HPP
+
+#include "../config.hpp"
+#include "../internal/result_on_found.hpp"
+#include "../internal/rules.hpp"
+
+#include "internal/peek_mask_uint.hpp"
+#include "internal/peek_uint.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace uint32_be
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_uint32_be > {};
+
+      template< std::uint32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint32_be, Cs... > {};
+      template< std::uint32_t Lo, std::uint32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint32_be, Lo, Hi > {};
+      template< std::uint32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint32_be, Cs... > {};
+      template< std::uint32_t Lo, std::uint32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint32_be, Lo, Hi > {};
+      template< std::uint32_t... Cs > struct ranges : internal::ranges< internal::peek_uint32_be, Cs... > {};
+      template< std::uint32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint32_be, Cs >... > {};
+
+      template< std::uint32_t M, std::uint32_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint32_be< M >, Cs... > {};
+      template< std::uint32_t M, std::uint32_t Lo, std::uint32_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint32_be< M >, Lo, Hi > {};
+      template< std::uint32_t M, std::uint32_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint32_be< M >, Cs... > {};
+      template< std::uint32_t M, std::uint32_t Lo, std::uint32_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint32_be< M >, Lo, Hi > {};
+      template< std::uint32_t M, std::uint32_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint32_be< M >, Cs... > {};
+      template< std::uint32_t M, std::uint32_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint32_be< M >, Cs >... > {};
+      // clang-format on
+
+   }  // namespace uint32_be
+
+   namespace uint32_le
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_uint32_le > {};
+
+      template< std::uint32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint32_le, Cs... > {};
+      template< std::uint32_t Lo, std::uint32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint32_le, Lo, Hi > {};
+      template< std::uint32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint32_le, Cs... > {};
+      template< std::uint32_t Lo, std::uint32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint32_le, Lo, Hi > {};
+      template< std::uint32_t... Cs > struct ranges : internal::ranges< internal::peek_uint32_le, Cs... > {};
+      template< std::uint32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint32_le, Cs >... > {};
+
+      template< std::uint32_t M, std::uint32_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint32_le< M >, Cs... > {};
+      template< std::uint32_t M, std::uint32_t Lo, std::uint32_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint32_le< M >, Lo, Hi > {};
+      template< std::uint32_t M, std::uint32_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint32_le< M >, Cs... > {};
+      template< std::uint32_t M, std::uint32_t Lo, std::uint32_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint32_le< M >, Lo, Hi > {};
+      template< std::uint32_t M, std::uint32_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint32_le< M >, Cs... > {};
+      template< std::uint32_t M, std::uint32_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint32_le< M >, Cs >... > {};
+      // clang-format on
+
+   }  // namespace uint32_le
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/uint64.hpp b/pxr/base/pegtl/pegtl/contrib/uint64.hpp
new file mode 100644
index 0000000000..6f5caf18d2
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/uint64.hpp
@@ -0,0 +1,63 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_UINT64_HPP
+#define PXR_PEGTL_CONTRIB_UINT64_HPP
+
+#include "../config.hpp"
+#include "../internal/result_on_found.hpp"
+#include "../internal/rules.hpp"
+
+#include "internal/peek_mask_uint.hpp"
+#include "internal/peek_uint.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace uint64_be
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_uint64_be > {};
+
+      template< std::uint64_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint64_be, Cs... > {};
+      template< std::uint64_t Lo, std::uint64_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint64_be, Lo, Hi > {};
+      template< std::uint64_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint64_be, Cs... > {};
+      template< std::uint64_t Lo, std::uint64_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint64_be, Lo, Hi > {};
+      template< std::uint64_t... Cs > struct ranges : internal::ranges< internal::peek_uint64_be, Cs... > {};
+      template< std::uint64_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint64_be, Cs >... > {};
+
+
+      template< std::uint64_t M, std::uint64_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint64_be< M >, Cs... > {};
+      template< std::uint64_t M, std::uint64_t Lo, std::uint64_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint64_be< M >, Lo, Hi > {};
+      template< std::uint64_t M, std::uint64_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint64_be< M >, Cs... > {};
+      template< std::uint64_t M, std::uint64_t Lo, std::uint64_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint64_be< M >, Lo, Hi > {};
+      template< std::uint64_t M, std::uint64_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint64_be< M >, Cs... > {};
+      template< std::uint64_t M, std::uint64_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint64_be< M >, Cs >... > {};
+      // clang-format on
+
+   }  // namespace uint64_be
+
+   namespace uint64_le
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_uint64_le > {};
+
+      template< std::uint64_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint64_le, Cs... > {};
+      template< std::uint64_t Lo, std::uint64_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint64_le, Lo, Hi > {};
+      template< std::uint64_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint64_le, Cs... > {};
+      template< std::uint64_t Lo, std::uint64_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint64_le, Lo, Hi > {};
+      template< std::uint64_t... Cs > struct ranges : internal::ranges< internal::peek_uint64_le, Cs... > {};
+      template< std::uint64_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint64_le, Cs >... > {};
+
+      template< std::uint64_t M, std::uint64_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint64_le< M >, Cs... > {};
+      template< std::uint64_t M, std::uint64_t Lo, std::uint64_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint64_le< M >, Lo, Hi > {};
+      template< std::uint64_t M, std::uint64_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint64_le< M >, Cs... > {};
+      template< std::uint64_t M, std::uint64_t Lo, std::uint64_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint64_le< M >, Lo, Hi > {};
+      template< std::uint64_t M, std::uint64_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint64_le< M >, Cs... > {};
+      template< std::uint64_t M, std::uint64_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint64_le< M >, Cs >... > {};
+      // clang-format on
+
+   }  // namespace uint64_le
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/uint8.hpp b/pxr/base/pegtl/pegtl/contrib/uint8.hpp
new file mode 100644
index 0000000000..867d13e2e8
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/uint8.hpp
@@ -0,0 +1,36 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_UINT8_HPP
+#define PXR_PEGTL_CONTRIB_UINT8_HPP
+
+#include "../config.hpp"
+#include "../internal/result_on_found.hpp"
+#include "../internal/rules.hpp"
+
+#include "internal/peek_mask_uint8.hpp"
+#include "internal/peek_uint8.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::uint8
+{
+   // clang-format off
+   struct any : internal::any< internal::peek_uint8 > {};
+
+   template< std::uint8_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint8, Cs... > {};
+   template< std::uint8_t Lo, std::uint8_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint8, Lo, Hi > {};
+   template< std::uint8_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint8, Cs... > {};
+   template< std::uint8_t Lo, std::uint8_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint8, Lo, Hi > {};
+   template< std::uint8_t... Cs > struct ranges : internal::ranges< internal::peek_uint8, Cs... > {};
+   template< std::uint8_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint8, Cs >... > {};
+
+   template< std::uint8_t M, std::uint8_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint8< M >, Cs... > {};
+   template< std::uint8_t M, std::uint8_t Lo, std::uint8_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint8< M >, Lo, Hi > {};
+   template< std::uint8_t M, std::uint8_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint8< M >, Cs... > {};
+   template< std::uint8_t M, std::uint8_t Lo, std::uint8_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint8< M >, Lo, Hi > {};
+   template< std::uint8_t M, std::uint8_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint8< M >, Cs... > {};
+   template< std::uint8_t M, std::uint8_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint8< M >, Cs >... > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::uint8
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/unescape.hpp b/pxr/base/pegtl/pegtl/contrib/unescape.hpp
new file mode 100644
index 0000000000..d611120f29
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/unescape.hpp
@@ -0,0 +1,214 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_UNESCAPE_HPP
+#define PXR_PEGTL_CONTRIB_UNESCAPE_HPP
+
+#include <cassert>
+#include <exception>
+#include <string>
+
+#include "../ascii.hpp"
+#include "../config.hpp"
+#include "../parse_error.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::unescape
+{
+   // Utility functions for the unescape actions.
+
+   [[nodiscard]] inline bool utf8_append_utf32( std::string& string, const unsigned utf32 )
+   {
+      if( utf32 <= 0x7f ) {
+         string += char( utf32 & 0xff );
+         return true;
+      }
+      if( utf32 <= 0x7ff ) {
+         char tmp[] = { char( ( ( utf32 & 0x7c0 ) >> 6 ) | 0xc0 ),
+                        char( ( ( utf32 & 0x03f ) ) | 0x80 ) };
+         string.append( tmp, sizeof( tmp ) );
+         return true;
+      }
+      if( utf32 <= 0xffff ) {
+         if( utf32 >= 0xd800 && utf32 <= 0xdfff ) {
+            // nope, this is a UTF-16 surrogate
+            return false;
+         }
+         char tmp[] = { char( ( ( utf32 & 0xf000 ) >> 12 ) | 0xe0 ),
+                        char( ( ( utf32 & 0x0fc0 ) >> 6 ) | 0x80 ),
+                        char( ( ( utf32 & 0x003f ) ) | 0x80 ) };
+         string.append( tmp, sizeof( tmp ) );
+         return true;
+      }
+      if( utf32 <= 0x10ffff ) {
+         char tmp[] = { char( ( ( utf32 & 0x1c0000 ) >> 18 ) | 0xf0 ),
+                        char( ( ( utf32 & 0x03f000 ) >> 12 ) | 0x80 ),
+                        char( ( ( utf32 & 0x000fc0 ) >> 6 ) | 0x80 ),
+                        char( ( ( utf32 & 0x00003f ) ) | 0x80 ) };
+         string.append( tmp, sizeof( tmp ) );
+         return true;
+      }
+      return false;
+   }
+
+   // This function MUST only be called for characters matching PXR_PEGTL_NAMESPACE::ascii::xdigit!
+   template< typename I >
+   [[nodiscard]] I unhex_char( const char c )
+   {
+      switch( c ) {
+         case '0':
+         case '1':
+         case '2':
+         case '3':
+         case '4':
+         case '5':
+         case '6':
+         case '7':
+         case '8':
+         case '9':
+            return I( c - '0' );
+         case 'a':
+         case 'b':
+         case 'c':
+         case 'd':
+         case 'e':
+         case 'f':
+            return I( c - 'a' + 10 );
+         case 'A':
+         case 'B':
+         case 'C':
+         case 'D':
+         case 'E':
+         case 'F':
+            return I( c - 'A' + 10 );
+         default:              // LCOV_EXCL_LINE
+            std::terminate();  // LCOV_EXCL_LINE
+      }
+   }
+
+   template< typename I >
+   [[nodiscard]] I unhex_string( const char* begin, const char* end )
+   {
+      I r = 0;
+      while( begin != end ) {
+         r <<= 4;
+         r += unhex_char< I >( *begin++ );
+      }
+      return r;
+   }
+
+   // Actions for common unescape situations.
+
+   struct append_all
+   {
+      template< typename ActionInput >
+      static void apply( const ActionInput& in, std::string& s )
+      {
+         s.append( in.begin(), in.size() );
+      }
+   };
+
+   // This action MUST be called for a character matching T which MUST be PXR_PEGTL_NAMESPACE::one< ... >.
+   template< typename T, char... Rs >
+   struct unescape_c
+   {
+      template< typename ActionInput >
+      static void apply( const ActionInput& in, std::string& s )
+      {
+         assert( in.size() == 1 );
+         s += apply_one( in, static_cast< const T* >( nullptr ) );
+      }
+
+      template< typename ActionInput, char... Qs >
+      [[nodiscard]] static char apply_one( const ActionInput& in, const one< Qs... >* /*unused*/ )
+      {
+         static_assert( sizeof...( Qs ) == sizeof...( Rs ), "size mismatch between escaped characters and their mappings" );
+         return apply_two( in, { Qs... }, { Rs... } );
+      }
+
+      template< typename ActionInput >
+      [[nodiscard]] static char apply_two( const ActionInput& in, const std::initializer_list< char >& q, const std::initializer_list< char >& r )
+      {
+         const char c = *in.begin();
+         for( std::size_t i = 0; i < q.size(); ++i ) {
+            if( *( q.begin() + i ) == c ) {
+               return *( r.begin() + i );
+            }
+         }
+         std::terminate();  // LCOV_EXCL_LINE
+      }
+   };
+
+   // See src/example/pegtl/unescape.cpp for why the following two actions
+   // skip the first input character. They also MUST be called
+   // with non-empty matched inputs!
+
+   struct unescape_u
+   {
+#if defined( __cpp_exceptions )
+      template< typename ActionInput >
+      static void apply( const ActionInput& in, std::string& s )
+      {
+         assert( !in.empty() );  // First character MUST be present, usually 'u' or 'U'.
+         if( !utf8_append_utf32( s, unhex_string< unsigned >( in.begin() + 1, in.end() ) ) ) {
+            throw parse_error( "invalid escaped unicode code point", in );
+         }
+      }
+#else
+      template< typename ActionInput >
+      static bool apply( const ActionInput& in, std::string& s )
+      {
+         assert( !in.empty() );  // First character MUST be present, usually 'u' or 'U'.
+         return utf8_append_utf32( s, unhex_string< unsigned >( in.begin() + 1, in.end() ) );
+      }
+#endif
+   };
+
+   struct unescape_x
+   {
+      template< typename ActionInput >
+      static void apply( const ActionInput& in, std::string& s )
+      {
+         assert( !in.empty() );  // First character MUST be present, usually 'x'.
+         s += unhex_string< char >( in.begin() + 1, in.end() );
+      }
+   };
+
+   // The unescape_j action is similar to unescape_u, however unlike
+   // unescape_u it
+   // (a) assumes exactly 4 hexdigits per escape sequence,
+   // (b) accepts multiple consecutive escaped 16-bit values.
+   // When applied to more than one escape sequence, unescape_j
+   // translates UTF-16 surrogate pairs in the input into a single
+   // UTF-8 sequence in s, as required for JSON by RFC 8259.
+
+   struct unescape_j
+   {
+      template< typename ActionInput >
+      static bool apply( const ActionInput& in, std::string& s )
+      {
+         assert( ( ( in.size() + 1 ) % 6 ) == 0 );  // Expects multiple "\\u1234", starting with the first "u".
+         for( const char* b = in.begin() + 1; b < in.end(); b += 6 ) {
+            const auto c = unhex_string< unsigned >( b, b + 4 );
+            if( ( 0xd800 <= c ) && ( c <= 0xdbff ) && ( b + 6 < in.end() ) ) {
+               const auto d = unhex_string< unsigned >( b + 6, b + 10 );
+               if( ( 0xdc00 <= d ) && ( d <= 0xdfff ) ) {
+                  b += 6;
+                  (void)utf8_append_utf32( s, ( ( ( c & 0x03ff ) << 10 ) | ( d & 0x03ff ) ) + 0x10000 );
+                  continue;
+               }
+            }
+            if( !utf8_append_utf32( s, c ) ) {
+#if defined( __cpp_exceptions )
+               throw parse_error( "invalid escaped unicode code point", in );
+#else
+               return false;
+#endif
+            }
+         }
+         return true;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::unescape
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/uri.hpp b/pxr/base/pegtl/pegtl/contrib/uri.hpp
new file mode 100644
index 0000000000..1ae245405e
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/uri.hpp
@@ -0,0 +1,111 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_URI_HPP
+#define PXR_PEGTL_CONTRIB_URI_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/contrib/uri.hpp"
+#else
+
+#include <cstdint>
+
+#include "../ascii.hpp"
+#include "../config.hpp"
+#include "../rules.hpp"
+#include "../utf8.hpp"
+
+#include "abnf.hpp"
+#include "integer.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::uri
+{
+   // URI grammar according to RFC 3986.
+
+   // This grammar is a direct PEG translation of the original URI grammar.
+   // It should be considered experimental -- in case of any issues, in particular
+   // missing rules for attached actions, please contact the developers.
+
+   // Note that this grammar has multiple top-level rules.
+
+   using dot = one< '.' >;
+   using colon = one< ':' >;
+
+   // clang-format off
+   struct dec_octet : maximum_rule< std::uint8_t > {};
+
+   struct IPv4address : seq< dec_octet, dot, dec_octet, dot, dec_octet, dot, dec_octet > {};
+
+   struct h16 : rep_min_max< 1, 4, abnf::HEXDIG > {};
+   struct ls32 : sor< seq< h16, colon, h16 >, IPv4address > {};
+
+   struct dcolon : two< ':' > {};
+
+   struct IPv6address : sor< seq<                                               rep< 6, h16, colon >, ls32 >,
+                             seq<                                       dcolon, rep< 5, h16, colon >, ls32 >,
+                             seq< opt< h16                           >, dcolon, rep< 4, h16, colon >, ls32 >,
+                             seq< opt< h16,     opt<    colon, h16 > >, dcolon, rep< 3, h16, colon >, ls32 >,
+                             seq< opt< h16, rep_opt< 2, colon, h16 > >, dcolon, rep< 2, h16, colon >, ls32 >,
+                             seq< opt< h16, rep_opt< 3, colon, h16 > >, dcolon,         h16, colon,   ls32 >,
+                             seq< opt< h16, rep_opt< 4, colon, h16 > >, dcolon,                       ls32 >,
+                             seq< opt< h16, rep_opt< 5, colon, h16 > >, dcolon,                       h16  >,
+                             seq< opt< h16, rep_opt< 6, colon, h16 > >, dcolon                             > > {};
+
+   struct gen_delims : one< ':', '/', '?', '#', '[', ']', '@' > {};
+   struct sub_delims : one< '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=' > {};
+
+   struct unreserved : sor< abnf::ALPHA, abnf::DIGIT, one< '-', '.', '_', '~' > > {};
+   struct reserved : sor< gen_delims, sub_delims > {};
+
+   struct IPvFuture : if_must< one< 'v', 'V' >, plus< abnf::HEXDIG >, dot, plus< sor< unreserved, sub_delims, colon > > > {};
+
+   struct IP_literal : if_must< one< '[' >, sor< IPvFuture, IPv6address >, one< ']' > > {};
+
+   struct pct_encoded : if_must< one< '%' >, abnf::HEXDIG, abnf::HEXDIG > {};
+   struct pchar : sor< unreserved, pct_encoded, sub_delims, one< ':', '@' > > {};
+
+   struct query : star< sor< pchar, one< '/', '?' > > > {};
+   struct fragment : star< sor< pchar, one< '/', '?' > > > {};
+
+   struct segment : star< pchar > {};
+   struct segment_nz : plus< pchar > {};
+   struct segment_nz_nc : plus< sor< unreserved, pct_encoded, sub_delims, one< '@' > > > {}; // non-zero-length segment without any colon ":"
+
+   struct path_abempty : star< one< '/' >, segment > {};
+   struct path_absolute : seq< one< '/' >, opt< segment_nz, star< one< '/' >, segment > > > {};
+   struct path_noscheme : seq< segment_nz_nc, star< one< '/' >, segment > > {};
+   struct path_rootless : seq< segment_nz, star< one< '/' >, segment > > {};
+   struct path_empty : success {};
+
+   struct path : sor< path_noscheme,     // begins with a non-colon segment
+                      path_rootless,     // begins with a segment
+                      path_absolute,     // begins with "/" but not "//"
+                      path_abempty > {}; // begins with "/" or is empty
+
+   struct reg_name : star< sor< unreserved, pct_encoded, sub_delims > > {};
+
+   struct port : star< abnf::DIGIT > {};
+   struct host : sor< IP_literal, IPv4address, reg_name > {};
+   struct userinfo : star< sor< unreserved, pct_encoded, sub_delims, colon > > {};
+   struct opt_userinfo : opt< userinfo, one< '@' > > {};
+   struct authority : seq< opt_userinfo, host, opt< colon, port > > {};
+
+   struct scheme : seq< abnf::ALPHA, star< sor< abnf::ALPHA, abnf::DIGIT, one< '+', '-', '.' > > > > {};
+
+   using dslash = two< '/' >;
+   using opt_query = opt_must< one< '?' >, query >;
+   using opt_fragment = opt_must< one< '#' >, fragment >;
+
+   struct hier_part : sor< if_must< dslash, authority, path_abempty >, path_rootless, path_absolute, path_empty > {};
+   struct relative_part : sor< if_must< dslash, authority, path_abempty >, path_noscheme, path_absolute, path_empty > {};
+   struct relative_ref : seq< relative_part, opt_query, opt_fragment > {};
+
+   struct URI : seq< scheme, one< ':' >, hier_part, opt_query, opt_fragment > {};
+   struct URI_reference : sor< URI, relative_ref > {};
+   struct absolute_URI : seq< scheme, one< ':' >, hier_part, opt_query > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::uri
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/utf16.hpp b/pxr/base/pegtl/pegtl/contrib/utf16.hpp
new file mode 100644
index 0000000000..2d3fd23d27
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/utf16.hpp
@@ -0,0 +1,57 @@
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_UTF16_HPP
+#define PXR_PEGTL_CONTRIB_UTF16_HPP
+
+#include "../config.hpp"
+#include "../internal/result_on_found.hpp"
+#include "../internal/rules.hpp"
+
+#include "internal/peek_utf16.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace utf16_be
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_utf16_be > {};
+      struct bom : internal::one< internal::result_on_found::success, internal::peek_utf16_be, 0xfeff > {};
+      template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf16_be, Cs... > {};
+      template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf16_be, Lo, Hi > {};
+      template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf16_be, Cs... > {};
+      template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf16_be, Lo, Hi > {};
+      template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf16_be, Cs... > {};
+      template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf16_be, Cs >... > {};
+      // clang-format on
+
+   }  // namespace utf16_be
+
+   namespace utf16_le
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_utf16_le > {};
+      struct bom : internal::one< internal::result_on_found::success, internal::peek_utf16_le, 0xfeff > {};
+      template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf16_le, Cs... > {};
+      template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf16_le, Lo, Hi > {};
+      template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf16_le, Cs... > {};
+      template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf16_le, Lo, Hi > {};
+      template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf16_le, Cs... > {};
+      template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf16_le, Cs >... > {};
+      // clang-format on
+
+   }  // namespace utf16_le
+
+#if defined( _WIN32 ) && !defined( __MINGW32__ ) && !defined( __CYGWIN__ )
+   namespace utf16 = utf16_le;
+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+   namespace utf16 = utf16_le;
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+   namespace utf16 = utf16_be;
+#else
+#error Unknown endianness.
+#endif
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/contrib/utf32.hpp b/pxr/base/pegtl/pegtl/contrib/utf32.hpp
new file mode 100644
index 0000000000..e70f79ab9f
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/contrib/utf32.hpp
@@ -0,0 +1,57 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CONTRIB_UTF32_HPP
+#define PXR_PEGTL_CONTRIB_UTF32_HPP
+
+#include "../config.hpp"
+#include "../internal/result_on_found.hpp"
+#include "../internal/rules.hpp"
+
+#include "internal/peek_utf32.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace utf32_be
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_utf32_be > {};
+      struct bom : internal::one< internal::result_on_found::success, internal::peek_utf32_be, 0xfeff > {};
+      template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf32_be, Cs... > {};
+      template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf32_be, Lo, Hi > {};
+      template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf32_be, Cs... > {};
+      template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf32_be, Lo, Hi > {};
+      template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf32_be, Cs... > {};
+      template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf32_be, Cs >... > {};
+      // clang-format on
+
+   }  // namespace utf32_be
+
+   namespace utf32_le
+   {
+      // clang-format off
+      struct any : internal::any< internal::peek_utf32_le > {};
+      struct bom : internal::one< internal::result_on_found::success, internal::peek_utf32_le, 0xfeff > {};
+      template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf32_le, Cs... > {};
+      template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf32_le, Lo, Hi > {};
+      template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf32_le, Cs... > {};
+      template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf32_le, Lo, Hi > {};
+      template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf32_le, Cs... > {};
+      template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf32_le, Cs >... > {};
+      // clang-format on
+
+   }  // namespace utf32_le
+
+#if defined( _WIN32 ) && !defined( __MINGW32__ ) && !defined( __CYGWIN__ )
+   namespace utf32 = utf32_le;
+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+   namespace utf32 = utf32_le;
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+   namespace utf32 = utf32_be;
+#else
+#error Unknown endianness.
+#endif
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/cstream_input.hpp b/pxr/base/pegtl/pegtl/cstream_input.hpp
new file mode 100644
index 0000000000..e5ce8aea27
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/cstream_input.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_CSTREAM_INPUT_HPP
+#define PXR_PEGTL_CSTREAM_INPUT_HPP
+
+#include <cstdio>
+
+#include "buffer_input.hpp"
+#include "config.hpp"
+#include "eol.hpp"
+
+#include "internal/cstream_reader.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename Eol = eol::lf_crlf, std::size_t Chunk = 64 >
+   struct cstream_input
+      : buffer_input< internal::cstream_reader, Eol, std::string, Chunk >
+   {
+      template< typename T >
+      cstream_input( std::FILE* in_stream, const std::size_t in_maximum, T&& in_source )
+         : buffer_input< internal::cstream_reader, Eol, std::string, Chunk >( std::forward< T >( in_source ), in_maximum, in_stream )
+      {}
+   };
+
+   template< typename... Ts >
+   cstream_input( Ts&&... ) -> cstream_input<>;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/demangle.hpp b/pxr/base/pegtl/pegtl/demangle.hpp
new file mode 100644
index 0000000000..3abfe49754
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/demangle.hpp
@@ -0,0 +1,182 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_DEMANGLE_HPP
+#define PXR_PEGTL_DEMANGLE_HPP
+
+#include <string_view>
+
+#include "config.hpp"
+
+// ensure a consistent interface
+namespace PXR_PEGTL_NAMESPACE
+{
+#if !defined( __clang__ ) && defined( __GNUC__ ) && ( __GNUC__ == 7 )
+
+   template< typename T >
+   [[nodiscard]] std::string_view demangle() noexcept;
+
+#else
+
+   template< typename T >
+   [[nodiscard]] constexpr std::string_view demangle() noexcept;
+
+#endif
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#if defined( __clang__ )
+
+#if defined( _LIBCPP_VERSION )
+
+template< typename T >
+[[nodiscard]] constexpr std::string_view PXR_PEGTL_NAMESPACE::demangle() noexcept
+{
+   constexpr std::string_view sv = __PRETTY_FUNCTION__;
+   constexpr auto begin = sv.find( '=' );
+   static_assert( begin != std::string_view::npos );
+   return sv.substr( begin + 2, sv.size() - begin - 3 );
+}
+
+#else
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   // When using libstdc++ with clang, std::string_view::find is not constexpr :(
+   template< char C >
+   constexpr const char* string_view_find( const char* p, std::size_t n ) noexcept
+   {
+      while( n ) {
+         if( *p == C ) {
+            return p;
+         }
+         ++p;
+         --n;
+      }
+      return nullptr;
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+template< typename T >
+[[nodiscard]] constexpr std::string_view PXR_PEGTL_NAMESPACE::demangle() noexcept
+{
+   constexpr std::string_view sv = __PRETTY_FUNCTION__;
+   constexpr auto begin = internal::string_view_find< '=' >( sv.data(), sv.size() );
+   static_assert( begin != nullptr );
+   return { begin + 2, sv.data() + sv.size() - begin - 3 };
+}
+
+#endif
+
+#elif defined( __GNUC__ )
+
+#if( __GNUC__ == 7 )
+
+// GCC 7 wrongly sometimes disallows __PRETTY_FUNCTION__ in constexpr functions,
+// therefore we drop the 'constexpr' and hope for the best.
+template< typename T >
+[[nodiscard]] std::string_view PXR_PEGTL_NAMESPACE::demangle() noexcept
+{
+   const std::string_view sv = __PRETTY_FUNCTION__;
+   const auto begin = sv.find( '=' );
+   const auto tmp = sv.substr( begin + 2 );
+   const auto end = tmp.rfind( ';' );
+   return tmp.substr( 0, end );
+}
+
+#elif( __GNUC__ == 9 ) && ( __GNUC_MINOR__ < 3 )
+
+#if !defined( __cpp_rtti )
+#error "RTTI support required for GCC 9.1/9.2"
+#else
+
+#include <typeinfo>
+
+// GCC 9.1 and 9.2 have a bug that leads to truncated __PRETTY_FUNCTION__ names,
+// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91155
+template< typename T >
+[[nodiscard]] constexpr std::string_view PXR_PEGTL_NAMESPACE::demangle() noexcept
+{
+   // fallback: requires RTTI, no demangling
+   return typeid( T ).name();
+}
+
+#endif
+
+#else
+
+namespace PXR_PEGTL_NAMESPACE::special
+{
+   template< typename T >
+   [[nodiscard]] constexpr std::string_view demangle() noexcept
+   {
+      constexpr std::string_view sv = __PRETTY_FUNCTION__;
+      constexpr auto begin = sv.find( '=' );
+      static_assert( begin != std::string_view::npos );
+      constexpr auto tmp = sv.substr( begin + 2 );
+      constexpr auto end = tmp.rfind( ';' );
+      static_assert( end != std::string_view::npos );
+      return tmp.substr( 0, end );
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::special
+
+template< typename T >
+[[nodiscard]] constexpr std::string_view PXR_PEGTL_NAMESPACE::demangle() noexcept
+{
+   return special::demangle< T >();
+}
+
+#endif
+
+#elif defined( _MSC_VER )
+
+#if( _MSC_VER < 1920 )
+
+template< typename T >
+[[nodiscard]] constexpr std::string_view PXR_PEGTL_NAMESPACE::demangle() noexcept
+{
+   const std::string_view sv = __FUNCSIG__;
+   const auto begin = sv.find( "demangle<" );
+   const auto tmp = sv.substr( begin + 9 );
+   const auto end = tmp.rfind( '>' );
+   return tmp.substr( 0, end );
+}
+
+#else
+
+template< typename T >
+[[nodiscard]] constexpr std::string_view PXR_PEGTL_NAMESPACE::demangle() noexcept
+{
+   // we can not add static_assert for additional safety,
+   // see issues #296, #301 and #308
+   constexpr std::string_view sv = __FUNCSIG__;
+   constexpr auto begin = sv.find( "demangle<" );
+   constexpr auto tmp = sv.substr( begin + 9 );
+   constexpr auto end = tmp.rfind( '>' );
+   return tmp.substr( 0, end );
+}
+
+#endif
+
+#else
+
+#if !defined( __cpp_rtti )
+#error "RTTI support required for unknown compilers"
+#else
+
+#include <typeinfo>
+
+template< typename T >
+[[nodiscard]] constexpr std::string_view PXR_PEGTL_NAMESPACE::demangle() noexcept
+{
+   // fallback: requires RTTI, no demangling
+   return typeid( T ).name();
+}
+
+#endif
+
+#endif
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/disable_action.hpp b/pxr/base/pegtl/pegtl/disable_action.hpp
new file mode 100644
index 0000000000..6c88452f58
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/disable_action.hpp
@@ -0,0 +1,35 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_DISABLE_ACTION_HPP
+#define PXR_PEGTL_DISABLE_ACTION_HPP
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct disable_action
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return PXR_PEGTL_NAMESPACE::match< Rule, apply_mode::nothing, M, Action, Control >( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/discard_input.hpp b/pxr/base/pegtl/pegtl/discard_input.hpp
new file mode 100644
index 0000000000..e9a57dda37
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/discard_input.hpp
@@ -0,0 +1,37 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_DISCARD_INPUT_HPP
+#define PXR_PEGTL_DISCARD_INPUT_HPP
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct discard_input
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         const bool result = PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
+         in.discard();
+         return result;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/discard_input_on_failure.hpp b/pxr/base/pegtl/pegtl/discard_input_on_failure.hpp
new file mode 100644
index 0000000000..0839ab06db
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/discard_input_on_failure.hpp
@@ -0,0 +1,39 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_DISCARD_INPUT_ON_FAILURE_HPP
+#define PXR_PEGTL_DISCARD_INPUT_ON_FAILURE_HPP
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct discard_input_on_failure
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         const bool result = PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
+         if( !result ) {
+            in.discard();
+         }
+         return result;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/discard_input_on_success.hpp b/pxr/base/pegtl/pegtl/discard_input_on_success.hpp
new file mode 100644
index 0000000000..5400209839
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/discard_input_on_success.hpp
@@ -0,0 +1,39 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_DISCARD_INPUT_ON_SUCCESS_HPP
+#define PXR_PEGTL_DISCARD_INPUT_ON_SUCCESS_HPP
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct discard_input_on_success
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         const bool result = PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
+         if( result ) {
+            in.discard();
+         }
+         return result;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/enable_action.hpp b/pxr/base/pegtl/pegtl/enable_action.hpp
new file mode 100644
index 0000000000..96e4030f3d
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/enable_action.hpp
@@ -0,0 +1,35 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_ENABLE_ACTION_HPP
+#define PXR_PEGTL_ENABLE_ACTION_HPP
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "nothing.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct enable_action
+      : maybe_nothing
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return PXR_PEGTL_NAMESPACE::match< Rule, apply_mode::action, M, Action, Control >( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/eol.hpp b/pxr/base/pegtl/pegtl/eol.hpp
new file mode 100644
index 0000000000..50d372a937
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/eol.hpp
@@ -0,0 +1,37 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_EOL_HPP
+#define PXR_PEGTL_EOL_HPP
+
+#include "config.hpp"
+
+#include "internal/eol.hpp"
+
+#include "internal/cr_crlf_eol.hpp"
+#include "internal/cr_eol.hpp"
+#include "internal/crlf_eol.hpp"
+#include "internal/lf_crlf_eol.hpp"
+#include "internal/lf_eol.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   inline namespace ascii
+   {
+      // this is both a rule and a pseudo-namespace for eol::cr, ...
+      struct eol : internal::eol
+      {
+         // clang-format off
+         struct cr : internal::cr_eol {};
+         struct cr_crlf : internal::cr_crlf_eol {};
+         struct crlf : internal::crlf_eol {};
+         struct lf : internal::lf_eol {};
+         struct lf_crlf : internal::lf_crlf_eol {};
+         // clang-format on
+      };
+
+   }  // namespace ascii
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/eol_pair.hpp b/pxr/base/pegtl/pegtl/eol_pair.hpp
new file mode 100644
index 0000000000..caee52ad0a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/eol_pair.hpp
@@ -0,0 +1,18 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_EOL_PAIR_HPP
+#define PXR_PEGTL_EOL_PAIR_HPP
+
+#include <cstddef>
+#include <utility>
+
+#include "config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   using eol_pair = std::pair< bool, std::size_t >;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/file_input.hpp b/pxr/base/pegtl/pegtl/file_input.hpp
new file mode 100644
index 0000000000..5b7578b7fd
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/file_input.hpp
@@ -0,0 +1,44 @@
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_FILE_INPUT_HPP
+#define PXR_PEGTL_FILE_INPUT_HPP
+
+#include "config.hpp"
+#include "eol.hpp"
+#include "tracking_mode.hpp"
+
+#if defined( __unix__ ) || ( defined( __APPLE__ ) && defined( __MACH__ ) )
+#include <unistd.h>  // Required for _POSIX_MAPPED_FILES
+#endif
+
+#if defined( _POSIX_MAPPED_FILES ) || defined( _WIN32 )
+#include "mmap_input.hpp"
+#else
+#include "read_input.hpp"
+#endif
+
+namespace PXR_PEGTL_NAMESPACE
+{
+#if defined( _POSIX_MAPPED_FILES ) || defined( _WIN32 )
+   template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
+   struct file_input
+      : mmap_input< P, Eol >
+   {
+      using mmap_input< P, Eol >::mmap_input;
+   };
+#else
+   template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
+   struct file_input
+      : read_input< P, Eol >
+   {
+      using read_input< P, Eol >::read_input;
+   };
+#endif
+
+   template< typename... Ts >
+   explicit file_input( Ts&&... ) -> file_input<>;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/action.hpp b/pxr/base/pegtl/pegtl/internal/action.hpp
new file mode 100644
index 0000000000..b530bb6d3c
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/action.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ACTION_HPP
+#define PXR_PEGTL_INTERNAL_ACTION_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< template< typename... > class Action, typename... Rules >
+   struct action
+      : action< Action, seq< Rules... > >
+   {};
+
+   template< template< typename... > class Action >
+   struct action< Action >
+      : success
+   {};
+
+   template< template< typename... > class Action, typename Rule >
+   struct action< Action, Rule >
+   {
+      using rule_t = action;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return Control< Rule >::template match< A, M, Action, Control >( in, st... );
+      }
+   };
+
+   template< template< typename... > class Action, typename... Rules >
+   inline constexpr bool enable_control< action< Action, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/action_input.hpp b/pxr/base/pegtl/pegtl/internal/action_input.hpp
new file mode 100644
index 0000000000..57039bacb3
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/action_input.hpp
@@ -0,0 +1,106 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ACTION_INPUT_HPP
+#define PXR_PEGTL_INTERNAL_ACTION_INPUT_HPP
+
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <string_view>
+
+#include "iterator.hpp"
+
+#include "../config.hpp"
+#include "../position.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename ParseInput >
+   class action_input
+   {
+   public:
+      using input_t = ParseInput;
+      using iterator_t = typename ParseInput::iterator_t;
+
+      action_input( const iterator_t& in_begin, const ParseInput& in_input ) noexcept
+         : m_begin( in_begin ),
+           m_input( in_input )
+      {}
+
+      action_input( const action_input& ) = delete;
+      action_input( action_input&& ) = delete;
+
+      ~action_input() = default;
+
+      action_input& operator=( const action_input& ) = delete;
+      action_input& operator=( action_input&& ) = delete;
+
+      [[nodiscard]] const iterator_t& iterator() const noexcept
+      {
+         return m_begin;
+      }
+
+      [[nodiscard]] const ParseInput& input() const noexcept
+      {
+         return m_input;
+      }
+
+      [[nodiscard]] const char* begin() const noexcept
+      {
+         if constexpr( std::is_same_v< iterator_t, const char* > ) {
+            return iterator();
+         }
+         else {
+            return iterator().data;
+         }
+      }
+
+      [[nodiscard]] const char* end() const noexcept
+      {
+         return input().current();
+      }
+
+      [[nodiscard]] bool empty() const noexcept
+      {
+         return begin() == end();
+      }
+
+      [[nodiscard]] std::size_t size() const noexcept
+      {
+         return std::size_t( end() - begin() );
+      }
+
+      [[nodiscard]] std::string string() const
+      {
+         return std::string( begin(), size() );
+      }
+
+      [[nodiscard]] std::string_view string_view() const noexcept
+      {
+         return std::string_view( begin(), size() );
+      }
+
+      [[nodiscard]] char peek_char( const std::size_t offset = 0 ) const noexcept
+      {
+         return begin()[ offset ];
+      }
+
+      [[nodiscard]] std::uint8_t peek_uint8( const std::size_t offset = 0 ) const noexcept
+      {
+         return static_cast< std::uint8_t >( peek_char( offset ) );
+      }
+
+      [[nodiscard]] PXR_PEGTL_NAMESPACE::position position() const
+      {
+         return input().position( iterator() );  // NOTE: Not efficient with lazy inputs.
+      }
+
+   protected:
+      const iterator_t m_begin;
+      const ParseInput& m_input;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/any.hpp b/pxr/base/pegtl/pegtl/internal/any.hpp
new file mode 100644
index 0000000000..33b289f9bc
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/any.hpp
@@ -0,0 +1,77 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ANY_HPP
+#define PXR_PEGTL_INTERNAL_ANY_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "peek_char.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Peek >
+   struct any;
+
+   template<>
+   struct any< peek_char >
+   {
+      using peek_t = peek_char;
+      using data_t = char;
+
+      using rule_t = any;
+      using subs_t = empty_list;
+
+      [[nodiscard]] static bool test( const char /*unused*/ ) noexcept
+      {
+         return true;
+      }
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         if( !in.empty() ) {
+            in.bump();
+            return true;
+         }
+         return false;
+      }
+   };
+
+   template< typename Peek >
+   struct any
+   {
+      using peek_t = Peek;
+      using data_t = typename Peek::data_t;
+
+      using rule_t = any;
+      using subs_t = empty_list;
+
+      template< int Eol >
+      static constexpr bool can_match_eol = true;
+
+      [[nodiscard]] static bool test( const data_t /*unused*/ ) noexcept
+      {
+         return true;
+      }
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( Peek::peek( in ) ) )
+      {
+         if( const auto t = Peek::peek( in ) ) {
+            in.bump( t.size );
+            return true;
+         }
+         return false;
+      }
+   };
+
+   template< typename Peek >
+   inline constexpr bool enable_control< any< Peek > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/apply.hpp b/pxr/base/pegtl/pegtl/internal/apply.hpp
new file mode 100644
index 0000000000..36fdf98ac1
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/apply.hpp
@@ -0,0 +1,53 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_APPLY_HPP
+#define PXR_PEGTL_INTERNAL_APPLY_HPP
+
+#include "../config.hpp"
+
+#include "apply_single.hpp"
+#include "enable_control.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Actions >
+   struct apply
+   {
+      using rule_t = apply;
+      using subs_t = empty_list;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( [[maybe_unused]] ParseInput& in, [[maybe_unused]] States&&... st )
+      {
+         if constexpr( ( A == apply_mode::action ) && ( sizeof...( Actions ) > 0 ) ) {
+            using action_t = typename ParseInput::action_t;
+            const action_t i2( in.iterator(), in );  // No data -- range is from begin to begin.
+            return ( apply_single< Actions >::match( i2, st... ) && ... );
+         }
+         else {
+#if defined( _MSC_VER )
+            ( (void)st, ... );
+#endif
+            return true;
+         }
+      }
+   };
+
+   template< typename... Actions >
+   inline constexpr bool enable_control< apply< Actions... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/apply0.hpp b/pxr/base/pegtl/pegtl/internal/apply0.hpp
new file mode 100644
index 0000000000..aa9d2afd9a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/apply0.hpp
@@ -0,0 +1,51 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_APPLY0_HPP
+#define PXR_PEGTL_INTERNAL_APPLY0_HPP
+
+#include "../config.hpp"
+
+#include "apply0_single.hpp"
+#include "enable_control.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Actions >
+   struct apply0
+   {
+      using rule_t = apply0;
+      using subs_t = empty_list;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& /*unused*/, [[maybe_unused]] States&&... st )
+      {
+         if constexpr( A == apply_mode::action ) {
+            return ( apply0_single< Actions >::match( st... ) && ... );
+         }
+         else {
+#if defined( _MSC_VER )
+            ( (void)st, ... );
+#endif
+            return true;
+         }
+      }
+   };
+
+   template< typename... Actions >
+   inline constexpr bool enable_control< apply0< Actions... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/apply0_single.hpp b/pxr/base/pegtl/pegtl/internal/apply0_single.hpp
new file mode 100644
index 0000000000..c6ea4a1fa8
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/apply0_single.hpp
@@ -0,0 +1,34 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_APPLY0_SINGLE_HPP
+#define PXR_PEGTL_INTERNAL_APPLY0_SINGLE_HPP
+
+#include "../config.hpp"
+
+#include <type_traits>
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Action >
+   struct apply0_single
+   {
+      template< typename... States >
+      [[nodiscard]] static auto match( States&&... st ) noexcept( noexcept( Action::apply0( st... ) ) )
+         -> std::enable_if_t< std::is_same_v< decltype( Action::apply0( st... ) ), void >, bool >
+      {
+         Action::apply0( st... );
+         return true;
+      }
+
+      template< typename... States >
+      [[nodiscard]] static auto match( States&&... st ) noexcept( noexcept( Action::apply0( st... ) ) )
+         -> std::enable_if_t< std::is_same_v< decltype( Action::apply0( st... ) ), bool >, bool >
+      {
+         return Action::apply0( st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/apply_single.hpp b/pxr/base/pegtl/pegtl/internal/apply_single.hpp
new file mode 100644
index 0000000000..a292975031
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/apply_single.hpp
@@ -0,0 +1,34 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_APPLY_SINGLE_HPP
+#define PXR_PEGTL_INTERNAL_APPLY_SINGLE_HPP
+
+#include "../config.hpp"
+
+#include <type_traits>
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Action >
+   struct apply_single
+   {
+      template< typename ActionInput, typename... States >
+      [[nodiscard]] static auto match( const ActionInput& in, States&&... st ) noexcept( noexcept( Action::apply( in, st... ) ) )
+         -> std::enable_if_t< std::is_same_v< decltype( Action::apply( in, st... ) ), void >, bool >
+      {
+         Action::apply( in, st... );
+         return true;
+      }
+
+      template< typename ActionInput, typename... States >
+      [[nodiscard]] static auto match( const ActionInput& in, States&&... st ) noexcept( noexcept( Action::apply( in, st... ) ) )
+         -> std::enable_if_t< std::is_same_v< decltype( Action::apply( in, st... ) ), bool >, bool >
+      {
+         return Action::apply( in, st... );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/at.hpp b/pxr/base/pegtl/pegtl/internal/at.hpp
new file mode 100644
index 0000000000..cc551abf08
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/at.hpp
@@ -0,0 +1,55 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_AT_HPP
+#define PXR_PEGTL_INTERNAL_AT_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Rules >
+   struct at
+      : at< seq< Rules... > >
+   {};
+
+   template<>
+   struct at<>
+      : success
+   {};
+
+   template< typename Rule >
+   struct at< Rule >
+   {
+      using rule_t = at;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode,
+                rewind_mode,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         const auto m = in.template mark< rewind_mode::required >();
+         return Control< Rule >::template match< apply_mode::nothing, rewind_mode::active, Action, Control >( in, st... );
+      }
+   };
+
+   template< typename... Rules >
+   inline constexpr bool enable_control< at< Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/bof.hpp b/pxr/base/pegtl/pegtl/internal/bof.hpp
new file mode 100644
index 0000000000..2c8a786f59
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/bof.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_BOF_HPP
+#define PXR_PEGTL_INTERNAL_BOF_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct bof
+   {
+      using rule_t = bof;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept
+      {
+         return in.byte() == 0;
+      }
+   };
+
+   template<>
+   inline constexpr bool enable_control< bof > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/bol.hpp b/pxr/base/pegtl/pegtl/internal/bol.hpp
new file mode 100644
index 0000000000..08dad2e2c8
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/bol.hpp
@@ -0,0 +1,31 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_BOL_HPP
+#define PXR_PEGTL_INTERNAL_BOL_HPP
+
+#include "../config.hpp"
+#include "../type_list.hpp"
+
+#include "enable_control.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct bol
+   {
+      using rule_t = bol;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept
+      {
+         return in.column() == 1;
+      }
+   };
+
+   template<>
+   inline constexpr bool enable_control< bol > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/bump.hpp b/pxr/base/pegtl/pegtl/internal/bump.hpp
new file mode 100644
index 0000000000..75aa60e54d
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/bump.hpp
@@ -0,0 +1,45 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_BUMP_HPP
+#define PXR_PEGTL_INTERNAL_BUMP_HPP
+
+#include "../config.hpp"
+
+#include "iterator.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   inline void bump( iterator& iter, const std::size_t count, const int ch ) noexcept
+   {
+      for( std::size_t i = 0; i < count; ++i ) {
+         if( iter.data[ i ] == ch ) {
+            ++iter.line;
+            iter.column = 1;
+         }
+         else {
+            ++iter.column;
+         }
+      }
+      iter.byte += count;
+      iter.data += count;
+   }
+
+   inline void bump_in_this_line( iterator& iter, const std::size_t count ) noexcept
+   {
+      iter.data += count;
+      iter.byte += count;
+      iter.column += count;
+   }
+
+   inline void bump_to_next_line( iterator& iter, const std::size_t count ) noexcept
+   {
+      ++iter.line;
+      iter.byte += count;
+      iter.column = 1;
+      iter.data += count;
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/bump_help.hpp b/pxr/base/pegtl/pegtl/internal/bump_help.hpp
new file mode 100644
index 0000000000..fba0e8504f
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/bump_help.hpp
@@ -0,0 +1,26 @@
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_BUMP_HELP_HPP
+#define PXR_PEGTL_INTERNAL_BUMP_HELP_HPP
+
+#include <cstddef>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename ParseInput >
+   void bump_help( ParseInput& in, const std::size_t count )
+   {
+      if constexpr( Rule::template can_match_eol< ParseInput::eol_t::ch > ) {
+         in.bump( count );
+      }
+      else {
+         in.bump_in_this_line( count );
+      }
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/bytes.hpp b/pxr/base/pegtl/pegtl/internal/bytes.hpp
new file mode 100644
index 0000000000..3989077de4
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/bytes.hpp
@@ -0,0 +1,43 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_BYTES_HPP
+#define PXR_PEGTL_INTERNAL_BYTES_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "success.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< unsigned Cnt >
+   struct bytes
+   {
+      using rule_t = bytes;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.size( 0 ) ) )
+      {
+         if( in.size( Cnt ) >= Cnt ) {
+            in.bump( Cnt );
+            return true;
+         }
+         return false;
+      }
+   };
+
+   template<>
+   struct bytes< 0 >
+      : success
+   {};
+
+   template< unsigned Cnt >
+   inline constexpr bool enable_control< bytes< Cnt > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/control.hpp b/pxr/base/pegtl/pegtl/internal/control.hpp
new file mode 100644
index 0000000000..857b9b2c36
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/control.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_CONTROL_HPP
+#define PXR_PEGTL_INTERNAL_CONTROL_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< template< typename... > class Control, typename... Rules >
+   struct control
+      : control< Control, seq< Rules... > >
+   {};
+
+   template< template< typename... > class Control >
+   struct control< Control >
+      : success
+   {};
+
+   template< template< typename... > class Control, typename Rule >
+   struct control< Control, Rule >
+   {
+      using rule_t = control;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return Control< Rule >::template match< A, M, Action, Control >( in, st... );
+      }
+   };
+
+   template< template< typename... > class Control, typename... Rules >
+   inline constexpr bool enable_control< control< Control, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/cr_crlf_eol.hpp b/pxr/base/pegtl/pegtl/internal/cr_crlf_eol.hpp
new file mode 100644
index 0000000000..d73dedb187
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/cr_crlf_eol.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_CR_CRLF_EOL_HPP
+#define PXR_PEGTL_INTERNAL_CR_CRLF_EOL_HPP
+
+#include "../config.hpp"
+#include "../eol_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct cr_crlf_eol
+   {
+      static constexpr int ch = '\r';
+
+      template< typename ParseInput >
+      [[nodiscard]] static eol_pair match( ParseInput& in ) noexcept( noexcept( in.size( 2 ) ) )
+      {
+         eol_pair p = { false, in.size( 2 ) };
+         if( p.second ) {
+            if( in.peek_char() == '\r' ) {
+               in.bump_to_next_line( 1 + ( ( p.second > 1 ) && ( in.peek_char( 1 ) == '\n' ) ) );
+               p.first = true;
+            }
+         }
+         return p;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/cr_eol.hpp b/pxr/base/pegtl/pegtl/internal/cr_eol.hpp
new file mode 100644
index 0000000000..14ed447d55
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/cr_eol.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_CR_EOL_HPP
+#define PXR_PEGTL_INTERNAL_CR_EOL_HPP
+
+#include "../config.hpp"
+#include "../eol_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct cr_eol
+   {
+      static constexpr int ch = '\r';
+
+      template< typename ParseInput >
+      [[nodiscard]] static eol_pair match( ParseInput& in ) noexcept( noexcept( in.size( 1 ) ) )
+      {
+         eol_pair p = { false, in.size( 1 ) };
+         if( p.second ) {
+            if( in.peek_char() == '\r' ) {
+               in.bump_to_next_line();
+               p.first = true;
+            }
+         }
+         return p;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/crlf_eol.hpp b/pxr/base/pegtl/pegtl/internal/crlf_eol.hpp
new file mode 100644
index 0000000000..7bf76ac140
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/crlf_eol.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_CRLF_EOL_HPP
+#define PXR_PEGTL_INTERNAL_CRLF_EOL_HPP
+
+#include "../config.hpp"
+#include "../eol_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct crlf_eol
+   {
+      static constexpr int ch = '\n';
+
+      template< typename ParseInput >
+      [[nodiscard]] static eol_pair match( ParseInput& in ) noexcept( noexcept( in.size( 2 ) ) )
+      {
+         eol_pair p = { false, in.size( 2 ) };
+         if( p.second > 1 ) {
+            if( ( in.peek_char() == '\r' ) && ( in.peek_char( 1 ) == '\n' ) ) {
+               in.bump_to_next_line( 2 );
+               p.first = true;
+            }
+         }
+         return p;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/cstream_reader.hpp b/pxr/base/pegtl/pegtl/internal/cstream_reader.hpp
new file mode 100644
index 0000000000..588fc62cbd
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/cstream_reader.hpp
@@ -0,0 +1,58 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_CSTREAM_READER_HPP
+#define PXR_PEGTL_INTERNAL_CSTREAM_READER_HPP
+
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+
+#if defined( __cpp_exceptions )
+#include <system_error>
+#else
+#include <exception>
+#endif
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct cstream_reader
+   {
+      explicit cstream_reader( std::FILE* s ) noexcept
+         : m_cstream( s )
+      {
+         assert( m_cstream != nullptr );
+      }
+
+      [[nodiscard]] std::size_t operator()( char* buffer, const std::size_t length ) const
+      {
+         if( const auto r = std::fread( buffer, 1, length, m_cstream ) ) {
+            return r;
+         }
+         if( std::feof( m_cstream ) != 0 ) {
+            return 0;
+         }
+
+         // Please contact us if you know how to provoke the following exception.
+         // The example on cppreference.com doesn't work, at least not on macOS.
+
+         // LCOV_EXCL_START
+#if defined( __cpp_exceptions )
+         const auto ec = std::ferror( m_cstream );
+         assert( ec != 0 );
+         throw std::system_error( ec, std::system_category(), "std::fread() failed" );
+#else
+         std::fputs( "std::fread() failed\n", stderr );
+         std::terminate();
+#endif
+         // LCOV_EXCL_STOP
+      }
+
+      std::FILE* m_cstream;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/cstring_reader.hpp b/pxr/base/pegtl/pegtl/internal/cstring_reader.hpp
new file mode 100644
index 0000000000..87b7241930
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/cstring_reader.hpp
@@ -0,0 +1,40 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_CSTRING_READER_HPP
+#define PXR_PEGTL_INTERNAL_CSTRING_READER_HPP
+
+#include <cassert>
+#include <cstddef>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct cstring_reader
+   {
+      explicit cstring_reader( const char* zero_terminated ) noexcept
+         : m_cstring( zero_terminated )
+      {
+         assert( m_cstring != nullptr );
+      }
+
+      [[nodiscard]] std::size_t operator()( char* buffer, const std::size_t length ) noexcept
+      {
+         std::size_t i = 0;
+         char c;
+
+         while( ( i < length ) && ( ( c = m_cstring[ i ] ) != 0 ) ) {
+            *buffer++ = c;
+            ++i;
+         }
+         m_cstring += i;
+         return i;
+      }
+
+      const char* m_cstring;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/dependent_false.hpp b/pxr/base/pegtl/pegtl/internal/dependent_false.hpp
new file mode 100644
index 0000000000..1cf128cab1
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/dependent_false.hpp
@@ -0,0 +1,16 @@
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_DEPENDENT_FALSE_HPP
+#define PXR_PEGTL_INTERNAL_DEPENDENT_FALSE_HPP
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... >
+   inline constexpr bool dependent_false = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/disable.hpp b/pxr/base/pegtl/pegtl/internal/disable.hpp
new file mode 100644
index 0000000000..d89a4f3d5a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/disable.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_DISABLE_HPP
+#define PXR_PEGTL_INTERNAL_DISABLE_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Rules >
+   struct disable
+      : disable< seq< Rules... > >
+   {};
+
+   template<>
+   struct disable<>
+      : success
+   {};
+
+   template< typename Rule >
+   struct disable< Rule >
+   {
+      using rule_t = disable;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return Control< Rule >::template match< apply_mode::nothing, M, Action, Control >( in, st... );
+      }
+   };
+
+   template< typename... Rules >
+   inline constexpr bool enable_control< disable< Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/discard.hpp b/pxr/base/pegtl/pegtl/internal/discard.hpp
new file mode 100644
index 0000000000..d769351eef
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/discard.hpp
@@ -0,0 +1,34 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_DISCARD_HPP
+#define PXR_PEGTL_INTERNAL_DISCARD_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct discard
+   {
+      using rule_t = discard;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept
+      {
+         static_assert( noexcept( in.discard() ) );
+         in.discard();
+         return true;
+      }
+   };
+
+   template<>
+   inline constexpr bool enable_control< discard > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/enable.hpp b/pxr/base/pegtl/pegtl/internal/enable.hpp
new file mode 100644
index 0000000000..db6d66d225
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/enable.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ENABLE_HPP
+#define PXR_PEGTL_INTERNAL_ENABLE_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Rules >
+   struct enable
+      : enable< seq< Rules... > >
+   {};
+
+   template<>
+   struct enable<>
+      : success
+   {};
+
+   template< typename Rule >
+   struct enable< Rule >
+   {
+      using rule_t = enable;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return Control< Rule >::template match< apply_mode::action, M, Action, Control >( in, st... );
+      }
+   };
+
+   template< typename... Rules >
+   inline constexpr bool enable_control< enable< Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/enable_control.hpp b/pxr/base/pegtl/pegtl/internal/enable_control.hpp
new file mode 100644
index 0000000000..54ee04c383
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/enable_control.hpp
@@ -0,0 +1,25 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ENABLE_CONTROL_HPP
+#define PXR_PEGTL_INTERNAL_ENABLE_CONTROL_HPP
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   // This class is a simple tagging mechanism.
+   // By default, enable_control< Rule > is  'true'.
+   // Each internal (!) rule that should be hidden
+   // from the control and action class' callbacks
+   // simply specializes enable_control<> to return
+   // 'true' for the above expression.
+
+   template< typename Rule >
+   inline constexpr bool enable_control = true;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/eof.hpp b/pxr/base/pegtl/pegtl/internal/eof.hpp
new file mode 100644
index 0000000000..d5d80408dc
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/eof.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_EOF_HPP
+#define PXR_PEGTL_INTERNAL_EOF_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct eof
+   {
+      using rule_t = eof;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         return in.empty();
+      }
+   };
+
+   template<>
+   inline constexpr bool enable_control< eof > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/eol.hpp b/pxr/base/pegtl/pegtl/internal/eol.hpp
new file mode 100644
index 0000000000..8c14522727
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/eol.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_EOL_HPP
+#define PXR_PEGTL_INTERNAL_EOL_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct eol
+   {
+      using rule_t = eol;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( ParseInput::eol_t::match( in ) ) )
+      {
+         return ParseInput::eol_t::match( in ).first;
+      }
+   };
+
+   template<>
+   inline constexpr bool enable_control< eol > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/eolf.hpp b/pxr/base/pegtl/pegtl/internal/eolf.hpp
new file mode 100644
index 0000000000..30d1291d9e
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/eolf.hpp
@@ -0,0 +1,33 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_EOLF_HPP
+#define PXR_PEGTL_INTERNAL_EOLF_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct eolf
+   {
+      using rule_t = eolf;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( ParseInput::eol_t::match( in ) ) )
+      {
+         const auto p = ParseInput::eol_t::match( in );
+         return p.first || ( !p.second );
+      }
+   };
+
+   template<>
+   inline constexpr bool enable_control< eolf > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/failure.hpp b/pxr/base/pegtl/pegtl/internal/failure.hpp
new file mode 100644
index 0000000000..231d1ae80f
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/failure.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_FAILURE_HPP
+#define PXR_PEGTL_INTERNAL_FAILURE_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct failure
+   {
+      using rule_t = failure;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& /*unused*/ ) noexcept
+      {
+         return false;
+      }
+   };
+
+   template<>
+   inline constexpr bool enable_control< failure > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/file_mapper_posix.hpp b/pxr/base/pegtl/pegtl/internal/file_mapper_posix.hpp
new file mode 100644
index 0000000000..f9b3bafcd3
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/file_mapper_posix.hpp
@@ -0,0 +1,159 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_FILE_MAPPER_POSIX_HPP
+#define PXR_PEGTL_INTERNAL_FILE_MAPPER_POSIX_HPP
+
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#if !defined( __cpp_exceptions )
+#include <cstdio>
+#include <exception>
+#endif
+
+#include <utility>
+
+#include "../config.hpp"
+
+#include "filesystem.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct file_opener
+   {
+      explicit file_opener( const internal::filesystem::path& path )  // NOLINT(modernize-pass-by-value)
+         : m_path( path ),
+           m_fd( open() )
+      {}
+
+      file_opener( const file_opener& ) = delete;
+      file_opener( file_opener&& ) = delete;
+
+      ~file_opener()
+      {
+         ::close( m_fd );
+      }
+
+      file_opener& operator=( const file_opener& ) = delete;
+      file_opener& operator=( file_opener&& ) = delete;
+
+      [[nodiscard]] std::size_t size() const
+      {
+         struct stat st;
+         errno = 0;
+         if( ::fstat( m_fd, &st ) < 0 ) {
+            // LCOV_EXCL_START
+#if defined( __cpp_exceptions )
+            internal::error_code ec( errno, internal::system_category() );
+            throw internal::filesystem::filesystem_error( "fstat() failed", m_path, ec );
+#else
+            std::perror( "fstat() failed" );
+            std::terminate();
+#endif
+            // LCOV_EXCL_STOP
+         }
+         return std::size_t( st.st_size );
+      }
+
+      const internal::filesystem::path m_path;
+      const int m_fd;
+
+   private:
+      [[nodiscard]] int open() const
+      {
+         errno = 0;
+         const int fd = ::open( m_path.c_str(),
+                                O_RDONLY
+#if defined( O_CLOEXEC )
+                                   | O_CLOEXEC
+#endif
+         );
+         if( fd >= 0 ) {
+            return fd;
+         }
+#if defined( __cpp_exceptions )
+         internal::error_code ec( errno, internal::system_category() );
+         throw internal::filesystem::filesystem_error( "open() failed", m_path, ec );
+#else
+         std::perror( "open() failed" );
+         std::terminate();
+#endif
+      }
+   };
+
+   class file_mapper
+   {
+   public:
+      explicit file_mapper( const internal::filesystem::path& path )
+         : file_mapper( file_opener( path ) )
+      {}
+
+      explicit file_mapper( const file_opener& reader )
+         : m_size( reader.size() ),
+           m_data( static_cast< const char* >( ::mmap( nullptr, m_size, PROT_READ, MAP_PRIVATE, reader.m_fd, 0 ) ) )
+      {
+         if( ( m_size != 0 ) && ( intptr_t( m_data ) == -1 ) ) {
+            // LCOV_EXCL_START
+#if defined( __cpp_exceptions )
+            internal::error_code ec( errno, internal::system_category() );
+            throw internal::filesystem::filesystem_error( "mmap() failed", reader.m_path, ec );
+#else
+            std::perror( "mmap() failed" );
+            std::terminate();
+#endif
+            // LCOV_EXCL_STOP
+         }
+      }
+
+      file_mapper( const file_mapper& ) = delete;
+      file_mapper( file_mapper&& ) = delete;
+
+      ~file_mapper()
+      {
+         // Legacy C interface requires pointer-to-mutable but does not write through the pointer.
+         ::munmap( const_cast< char* >( m_data ), m_size );
+      }
+
+      file_mapper& operator=( const file_mapper& ) = delete;
+      file_mapper& operator=( file_mapper&& ) = delete;
+
+      [[nodiscard]] bool empty() const noexcept
+      {
+         return m_size == 0;
+      }
+
+      [[nodiscard]] std::size_t size() const noexcept
+      {
+         return m_size;
+      }
+
+      using iterator = const char*;
+      using const_iterator = const char*;
+
+      [[nodiscard]] iterator data() const noexcept
+      {
+         return m_data;
+      }
+
+      [[nodiscard]] iterator begin() const noexcept
+      {
+         return m_data;
+      }
+
+      [[nodiscard]] iterator end() const noexcept
+      {
+         return m_data + m_size;
+      }
+
+   private:
+      const std::size_t m_size;
+      const char* const m_data;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/file_mapper_win32.hpp b/pxr/base/pegtl/pegtl/internal/file_mapper_win32.hpp
new file mode 100644
index 0000000000..e41000ed1a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/file_mapper_win32.hpp
@@ -0,0 +1,243 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_FILE_MAPPER_WIN32_HPP
+#define PXR_PEGTL_INTERNAL_FILE_MAPPER_WIN32_HPP
+
+#if !defined( NOMINMAX )
+#define NOMINMAX
+#define PXR_PEGTL_NOMINMAX_WAS_DEFINED
+#endif
+
+#if !defined( WIN32_LEAN_AND_MEAN )
+#define WIN32_LEAN_AND_MEAN
+#define PXR_PEGTL_WIN32_LEAN_AND_MEAN_WAS_DEFINED
+#endif
+
+#include <windows.h>
+
+#if defined( PXR_PEGTL_NOMINMAX_WAS_DEFINED )
+#undef NOMINMAX
+#undef PXR_PEGTL_NOMINMAX_WAS_DEFINED
+#endif
+
+#if defined( PXR_PEGTL_WIN32_LEAN_AND_MEAN_WAS_DEFINED )
+#undef WIN32_LEAN_AND_MEAN
+#undef PXR_PEGTL_WIN32_LEAN_AND_MEAN_WAS_DEFINED
+#endif
+
+#include "../config.hpp"
+
+#if !defined( __cpp_exceptions )
+#include <cstdio>
+#include <exception>
+#endif
+
+#include "filesystem.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct file_opener
+   {
+      explicit file_opener( const internal::filesystem::path& path )
+         : m_path( path ),
+           m_handle( open() )
+      {}
+
+      file_opener( const file_opener& ) = delete;
+      file_opener( file_opener&& ) = delete;
+
+      ~file_opener()
+      {
+         ::CloseHandle( m_handle );
+      }
+
+      file_opener& operator=( const file_opener& ) = delete;
+      file_opener& operator=( file_opener&& ) = delete;
+
+      [[nodiscard]] std::size_t size() const
+      {
+         LARGE_INTEGER size;
+         if( !::GetFileSizeEx( m_handle, &size ) ) {
+#if defined( __cpp_exceptions )
+            internal::error_code ec( ::GetLastError(), internal::system_category() );
+            throw internal::filesystem::filesystem_error( "GetFileSizeEx() failed", m_path, ec );
+#else
+            std::perror( "GetFileSizeEx() failed" );
+            std::terminate();
+#endif
+         }
+         return std::size_t( size.QuadPart );
+      }
+
+      const internal::filesystem::path m_path;
+      const HANDLE m_handle;
+
+   private:
+      [[nodiscard]] HANDLE open() const
+      {
+         SetLastError( 0 );
+#if( _WIN32_WINNT >= 0x0602 )
+         const HANDLE handle = ::CreateFile2( m_path.c_str(),
+                                              GENERIC_READ,
+                                              FILE_SHARE_READ,
+                                              OPEN_EXISTING,
+                                              nullptr );
+         if( handle != INVALID_HANDLE_VALUE ) {
+            return handle;
+         }
+#if defined( __cpp_exceptions )
+         internal::error_code ec( ::GetLastError(), internal::system_category() );
+         throw internal::filesystem::filesystem_error( "CreateFile2() failed", m_path, ec );
+#else
+         std::perror( "CreateFile2() failed" );
+         std::terminate();
+#endif
+#else
+         const HANDLE handle = ::CreateFileW( m_path.c_str(),
+                                              GENERIC_READ,
+                                              FILE_SHARE_READ,
+                                              nullptr,
+                                              OPEN_EXISTING,
+                                              FILE_ATTRIBUTE_NORMAL,
+                                              nullptr );
+         if( handle != INVALID_HANDLE_VALUE ) {
+            return handle;
+         }
+#if defined( __cpp_exceptions )
+         internal::error_code ec( ::GetLastError(), internal::system_category() );
+         throw internal::filesystem::filesystem_error( "CreateFileW()", m_path, ec );
+#else
+         std::perror( "CreateFileW() failed" );
+         std::terminate();
+#endif
+#endif
+      }
+   };
+
+   struct win32_file_mapper
+   {
+      explicit win32_file_mapper( const internal::filesystem::path& path )
+         : win32_file_mapper( file_opener( path ) )
+      {}
+
+      explicit win32_file_mapper( const file_opener& reader )
+         : m_size( reader.size() ),
+           m_handle( open( reader ) )
+      {}
+
+      win32_file_mapper( const win32_file_mapper& ) = delete;
+      win32_file_mapper( win32_file_mapper&& ) = delete;
+
+      ~win32_file_mapper()
+      {
+         ::CloseHandle( m_handle );
+      }
+
+      win32_file_mapper& operator=( const win32_file_mapper& ) = delete;
+      win32_file_mapper& operator=( win32_file_mapper&& ) = delete;
+
+      const size_t m_size;
+      const HANDLE m_handle;
+
+   private:
+      [[nodiscard]] HANDLE open( const file_opener& reader ) const
+      {
+         const uint64_t file_size = reader.size();
+         SetLastError( 0 );
+         // Use `CreateFileMappingW` because a) we're not specifying a
+         // mapping name, so the character type is of no consequence, and
+         // b) it's defined in `memoryapi.h`, unlike
+         // `CreateFileMappingA`(?!)
+         const HANDLE handle = ::CreateFileMappingW( reader.m_handle,
+                                                     nullptr,
+                                                     PAGE_READONLY,
+                                                     DWORD( file_size >> 32 ),
+                                                     DWORD( file_size & 0xffffffff ),
+                                                     nullptr );
+         if( handle != NULL || file_size == 0 ) {
+            return handle;
+         }
+#if defined( __cpp_exceptions )
+         internal::error_code ec( ::GetLastError(), internal::system_category() );
+         throw internal::filesystem::filesystem_error( "CreateFileMappingW() failed", reader.m_path, ec );
+#else
+         std::perror( "CreateFileMappingW() failed" );
+         std::terminate();
+#endif
+      }
+   };
+
+   class file_mapper
+   {
+   public:
+      explicit file_mapper( const internal::filesystem::path& path )
+         : file_mapper( win32_file_mapper( path ) )
+      {}
+
+      explicit file_mapper( const win32_file_mapper& mapper )
+         : m_size( mapper.m_size ),
+           m_data( static_cast< const char* >( ::MapViewOfFile( mapper.m_handle,
+                                                                FILE_MAP_READ,
+                                                                0,
+                                                                0,
+                                                                0 ) ) )
+      {
+         if( ( m_size != 0 ) && ( intptr_t( m_data ) == 0 ) ) {
+#if defined( __cpp_exceptions )
+            internal::error_code ec( ::GetLastError(), internal::system_category() );
+            throw internal::filesystem::filesystem_error( "MapViewOfFile() failed", ec );
+#else
+            std::perror( "MapViewOfFile() failed" );
+            std::terminate();
+#endif
+         }
+      }
+
+      file_mapper( const file_mapper& ) = delete;
+      file_mapper( file_mapper&& ) = delete;
+
+      ~file_mapper()
+      {
+         ::UnmapViewOfFile( LPCVOID( m_data ) );
+      }
+
+      file_mapper& operator=( const file_mapper& ) = delete;
+      file_mapper& operator=( file_mapper&& ) = delete;
+
+      [[nodiscard]] bool empty() const noexcept
+      {
+         return m_size == 0;
+      }
+
+      [[nodiscard]] std::size_t size() const noexcept
+      {
+         return m_size;
+      }
+
+      using iterator = const char*;
+      using const_iterator = const char*;
+
+      [[nodiscard]] iterator data() const noexcept
+      {
+         return m_data;
+      }
+
+      [[nodiscard]] iterator begin() const noexcept
+      {
+         return m_data;
+      }
+
+      [[nodiscard]] iterator end() const noexcept
+      {
+         return m_data + m_size;
+      }
+
+   private:
+      const std::size_t m_size;
+      const char* const m_data;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/file_reader.hpp b/pxr/base/pegtl/pegtl/internal/file_reader.hpp
new file mode 100644
index 0000000000..b81c09c8ae
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/file_reader.hpp
@@ -0,0 +1,152 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_FILE_READER_HPP
+#define PXR_PEGTL_INTERNAL_FILE_READER_HPP
+
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <utility>
+
+#if !defined( __cpp_exceptions )
+#include <exception>
+#endif
+
+#include "../config.hpp"
+
+#include "filesystem.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   [[nodiscard]] inline std::FILE* file_open( const internal::filesystem::path& path )
+   {
+      errno = 0;
+#if defined( _MSC_VER )
+      std::FILE* file;
+      if( ::_wfopen_s( &file, path.c_str(), L"rb" ) == 0 ) {
+         return file;
+      }
+#if defined( __cpp_exceptions )
+      internal::error_code ec( errno, internal::system_category() );
+      throw internal::filesystem::filesystem_error( "_wfopen_s() failed", path, ec );
+#else
+      std::perror( "_wfopen_s() failed" );
+      std::terminate();
+#endif
+#else
+#if defined( __MINGW32__ )
+      if( auto* file = std::fopen( path.string().c_str(), "rb" ) )
+#else
+      if( auto* file = std::fopen( path.c_str(), "rbe" ) )
+#endif
+      {
+         return file;
+      }
+#if defined( __cpp_exceptions )
+      internal::error_code ec( errno, internal::system_category() );
+      throw internal::filesystem::filesystem_error( "std::fopen() failed", path, ec );
+#else
+      std::perror( "std::fopen() failed" );
+      std::terminate();
+#endif
+#endif
+   }
+
+   struct file_close
+   {
+      void operator()( FILE* f ) const noexcept
+      {
+         std::fclose( f );
+      }
+   };
+
+   class file_reader
+   {
+   public:
+      explicit file_reader( const internal::filesystem::path& path )
+         : file_reader( file_open( path ), path )
+      {}
+
+      file_reader( FILE* file, const internal::filesystem::path& path )  // NOLINT(modernize-pass-by-value)
+         : m_path( path ),
+           m_file( file )
+      {}
+
+      file_reader( const file_reader& ) = delete;
+      file_reader( file_reader&& ) = delete;
+
+      ~file_reader() = default;
+
+      file_reader& operator=( const file_reader& ) = delete;
+      file_reader& operator=( file_reader&& ) = delete;
+
+      [[nodiscard]] std::size_t size() const
+      {
+         errno = 0;
+         if( std::fseek( m_file.get(), 0, SEEK_END ) != 0 ) {
+            // LCOV_EXCL_START
+#if defined( __cpp_exceptions )
+            internal::error_code ec( errno, internal::system_category() );
+            throw internal::filesystem::filesystem_error( "std::fseek() failed [SEEK_END]", m_path, ec );
+#else
+            std::perror( "std::fseek() failed [SEEK_END]" );
+            std::terminate();
+#endif
+            // LCOV_EXCL_STOP
+         }
+         errno = 0;
+         const auto s = std::ftell( m_file.get() );
+         if( s < 0 ) {
+            // LCOV_EXCL_START
+#if defined( __cpp_exceptions )
+            internal::error_code ec( errno, internal::system_category() );
+            throw internal::filesystem::filesystem_error( "std::ftell() failed", m_path, ec );
+#else
+            std::perror( "std::ftell() failed" );
+            std::terminate();
+#endif
+            // LCOV_EXCL_STOP
+         }
+         errno = 0;
+         if( std::fseek( m_file.get(), 0, SEEK_SET ) != 0 ) {
+            // LCOV_EXCL_START
+#if defined( __cpp_exceptions )
+            internal::error_code ec( errno, internal::system_category() );
+            throw internal::filesystem::filesystem_error( "std::fseek() failed [SEEK_SET]", m_path, ec );
+#else
+            std::perror( "std::fseek() failed [SEEK_SET]" );
+            std::terminate();
+#endif
+            // LCOV_EXCL_STOP
+         }
+         return std::size_t( s );
+      }
+
+      [[nodiscard]] std::string read() const
+      {
+         std::string nrv;
+         nrv.resize( size() );
+         errno = 0;
+         if( !nrv.empty() && ( std::fread( &nrv[ 0 ], nrv.size(), 1, m_file.get() ) != 1 ) ) {
+            // LCOV_EXCL_START
+#if defined( __cpp_exceptions )
+            internal::error_code ec( errno, internal::system_category() );
+            throw internal::filesystem::filesystem_error( "std::fread() failed", m_path, ec );
+#else
+            std::perror( "std::fread() failed" );
+            std::terminate();
+#endif
+            // LCOV_EXCL_STOP
+         }
+         return nrv;
+      }
+
+   private:
+      const internal::filesystem::path m_path;
+      const std::unique_ptr< std::FILE, file_close > m_file;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/filesystem.hpp b/pxr/base/pegtl/pegtl/internal/filesystem.hpp
new file mode 100644
index 0000000000..6de3e90339
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/filesystem.hpp
@@ -0,0 +1,64 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_FILESYSTEM_HPP
+#define PXR_PEGTL_INTERNAL_FILESYSTEM_HPP
+
+#include "../config.hpp"
+
+#if defined( PXR_PEGTL_BOOST_FILESYSTEM )
+
+#define BOOST_FILESYSTEM_NO_DEPRECATED
+
+#include <boost/filesystem.hpp>
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   namespace filesystem = ::boost::filesystem;
+
+   using error_code = ::boost::system::error_code;
+
+   inline const auto& system_category() noexcept
+   {
+      return ::boost::system::system_category();
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#elif defined( PXR_PEGTL_STD_EXPERIMENTAL_FILESYSTEM )
+
+#include <experimental/filesystem>
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   namespace filesystem = ::std::experimental::filesystem;
+
+   using error_code = ::std::error_code;
+
+   inline const auto& system_category() noexcept
+   {
+      return ::std::system_category();
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#else
+
+#include <filesystem>
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   namespace filesystem = ::std::filesystem;
+
+   using error_code = ::std::error_code;
+
+   inline const auto& system_category() noexcept
+   {
+      return ::std::system_category();
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/has_apply.hpp b/pxr/base/pegtl/pegtl/internal/has_apply.hpp
new file mode 100644
index 0000000000..d4926162e9
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/has_apply.hpp
@@ -0,0 +1,21 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_HAS_APPLY_HPP
+#define PXR_PEGTL_INTERNAL_HAS_APPLY_HPP
+
+#include <utility>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename, typename, template< typename... > class, typename... >
+   inline constexpr bool has_apply = false;
+
+   template< typename C, template< typename... > class Action, typename... S >
+   inline constexpr bool has_apply< C, decltype( C::template apply< Action >( std::declval< S >()... ) ), Action, S... > = true;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/has_apply0.hpp b/pxr/base/pegtl/pegtl/internal/has_apply0.hpp
new file mode 100644
index 0000000000..d3a46d3643
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/has_apply0.hpp
@@ -0,0 +1,21 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_HAS_APPLY0_HPP
+#define PXR_PEGTL_INTERNAL_HAS_APPLY0_HPP
+
+#include <utility>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename, typename, template< typename... > class, typename... >
+   inline constexpr bool has_apply0 = false;
+
+   template< typename C, template< typename... > class Action, typename... S >
+   inline constexpr bool has_apply0< C, decltype( C::template apply0< Action >( std::declval< S >()... ) ), Action, S... > = true;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/has_match.hpp b/pxr/base/pegtl/pegtl/internal/has_match.hpp
new file mode 100644
index 0000000000..4c1952e3dd
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/has_match.hpp
@@ -0,0 +1,40 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_HAS_MATCH_HPP
+#define PXR_PEGTL_INTERNAL_HAS_MATCH_HPP
+
+#include <utility>
+
+#include "../apply_mode.hpp"
+#include "../config.hpp"
+#include "../rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename,
+             typename Rule,
+             apply_mode A,
+             rewind_mode M,
+             template< typename... >
+             class Action,
+             template< typename... >
+             class Control,
+             typename ParseInput,
+             typename... States >
+   inline constexpr bool has_match = false;
+
+   template< typename Rule,
+             apply_mode A,
+             rewind_mode M,
+             template< typename... >
+             class Action,
+             template< typename... >
+             class Control,
+             typename ParseInput,
+             typename... States >
+   inline constexpr bool has_match< decltype( (void)Action< Rule >::template match< Rule, A, M, Action, Control >( std::declval< ParseInput& >(), std::declval< States&& >()... ), bool() ), Rule, A, M, Action, Control, ParseInput, States... > = true;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/has_unwind.hpp b/pxr/base/pegtl/pegtl/internal/has_unwind.hpp
new file mode 100644
index 0000000000..a800626784
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/has_unwind.hpp
@@ -0,0 +1,21 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_HAS_UNWIND_HPP
+#define PXR_PEGTL_INTERNAL_HAS_UNWIND_HPP
+
+#include <utility>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename, typename... >
+   inline constexpr bool has_unwind = false;
+
+   template< typename C, typename... S >
+   inline constexpr bool has_unwind< C, decltype( C::unwind( std::declval< S >()... ) ), S... > = true;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/identifier.hpp b/pxr/base/pegtl/pegtl/internal/identifier.hpp
new file mode 100644
index 0000000000..3a60c4fd3e
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/identifier.hpp
@@ -0,0 +1,22 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_IDENTIFIER_HPP
+#define PXR_PEGTL_INTERNAL_IDENTIFIER_HPP
+
+#include "../config.hpp"
+
+#include "peek_char.hpp"
+#include "ranges.hpp"
+#include "seq.hpp"
+#include "star.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   using identifier_first = ranges< peek_char, 'a', 'z', 'A', 'Z', '_' >;
+   using identifier_other = ranges< peek_char, 'a', 'z', 'A', 'Z', '0', '9', '_' >;
+   using identifier = seq< identifier_first, star< identifier_other > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/if_apply.hpp b/pxr/base/pegtl/pegtl/internal/if_apply.hpp
new file mode 100644
index 0000000000..67ca4d2b6e
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/if_apply.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_IF_APPLY_HPP
+#define PXR_PEGTL_INTERNAL_IF_APPLY_HPP
+
+#include "../config.hpp"
+
+#include "apply_single.hpp"
+#include "enable_control.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename... Actions >
+   struct if_apply
+   {
+      using rule_t = if_apply;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if constexpr( ( A == apply_mode::action ) && ( sizeof...( Actions ) != 0 ) ) {
+            using action_t = typename ParseInput::action_t;
+            auto m = in.template mark< rewind_mode::required >();
+            if( Control< Rule >::template match< apply_mode::action, rewind_mode::active, Action, Control >( in, st... ) ) {
+               const action_t i2( m.iterator(), in );
+               return m( ( apply_single< Actions >::match( i2, st... ) && ... ) );
+            }
+            return false;
+         }
+         else {
+            return Control< Rule >::template match< A, M, Action, Control >( in, st... );
+         }
+      }
+   };
+
+   template< typename Rule, typename... Actions >
+   inline constexpr bool enable_control< if_apply< Rule, Actions... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/if_must.hpp b/pxr/base/pegtl/pegtl/internal/if_must.hpp
new file mode 100644
index 0000000000..203a98d0f9
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/if_must.hpp
@@ -0,0 +1,52 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_IF_MUST_HPP
+#define PXR_PEGTL_INTERNAL_IF_MUST_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/internal/if_must.hpp"
+#else
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "must.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< bool Default, typename Cond, typename... Rules >
+   struct if_must
+   {
+      using rule_t = if_must;
+      using subs_t = type_list< Cond, must< Rules... > >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if( Control< Cond >::template match< A, M, Action, Control >( in, st... ) ) {
+            (void)Control< must< Rules... > >::template match< A, M, Action, Control >( in, st... );
+            return true;
+         }
+         return Default;
+      }
+   };
+
+   template< bool Default, typename Cond, typename... Rules >
+   inline constexpr bool enable_control< if_must< Default, Cond, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/if_must_else.hpp b/pxr/base/pegtl/pegtl/internal/if_must_else.hpp
new file mode 100644
index 0000000000..d7b53a39f3
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/if_must_else.hpp
@@ -0,0 +1,26 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_IF_MUST_ELSE_HPP
+#define PXR_PEGTL_INTERNAL_IF_MUST_ELSE_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/internal/if_must_else.hpp"
+#else
+
+#include "../config.hpp"
+
+#include "if_then_else.hpp"
+#include "must.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Cond, typename Then, typename Else >
+   using if_must_else = if_then_else< Cond, must< Then >, must< Else > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/if_then_else.hpp b/pxr/base/pegtl/pegtl/internal/if_then_else.hpp
new file mode 100644
index 0000000000..99c2a906d5
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/if_then_else.hpp
@@ -0,0 +1,51 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_IF_THEN_ELSE_HPP
+#define PXR_PEGTL_INTERNAL_IF_THEN_ELSE_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "not_at.hpp"
+#include "seq.hpp"
+#include "sor.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Cond, typename Then, typename Else >
+   struct if_then_else
+   {
+      using rule_t = if_then_else;
+      using subs_t = type_list< Cond, Then, Else >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         auto m = in.template mark< M >();
+         using m_t = decltype( m );
+
+         if( Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
+            return m( Control< Then >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) );
+         }
+         return m( Control< Else >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) );
+      }
+   };
+
+   template< typename Cond, typename Then, typename Else >
+   inline constexpr bool enable_control< if_then_else< Cond, Then, Else > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/input_pair.hpp b/pxr/base/pegtl/pegtl/internal/input_pair.hpp
new file mode 100644
index 0000000000..dfd69a54a7
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/input_pair.hpp
@@ -0,0 +1,29 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_INPUT_PAIR_HPP
+#define PXR_PEGTL_INTERNAL_INPUT_PAIR_HPP
+
+#include <cstdint>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Data >
+   struct input_pair
+   {
+      Data data;
+      std::uint8_t size;
+
+      using data_t = Data;
+
+      explicit operator bool() const noexcept
+      {
+         return size > 0;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/istream_reader.hpp b/pxr/base/pegtl/pegtl/internal/istream_reader.hpp
new file mode 100644
index 0000000000..3178cf7b16
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/istream_reader.hpp
@@ -0,0 +1,50 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ISTREAM_READER_HPP
+#define PXR_PEGTL_INTERNAL_ISTREAM_READER_HPP
+
+#include <istream>
+
+#if defined( __cpp_exceptions )
+#include <system_error>
+#else
+#include <cstdio>
+#include <exception>
+#endif
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct istream_reader
+   {
+      explicit istream_reader( std::istream& s ) noexcept
+         : m_istream( s )
+      {}
+
+      [[nodiscard]] std::size_t operator()( char* buffer, const std::size_t length )
+      {
+         m_istream.read( buffer, std::streamsize( length ) );
+
+         if( const auto r = m_istream.gcount() ) {
+            return std::size_t( r );
+         }
+         if( m_istream.eof() ) {
+            return 0;
+         }
+#if defined( __cpp_exceptions )
+         const auto ec = errno;
+         throw std::system_error( ec, std::system_category(), "std::istream::read() failed" );
+#else
+         std::fputs( "std::istream::read() failed\n", stderr );
+         std::terminate();
+#endif
+      }
+
+      std::istream& m_istream;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/istring.hpp b/pxr/base/pegtl/pegtl/internal/istring.hpp
new file mode 100644
index 0000000000..39524ac09c
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/istring.hpp
@@ -0,0 +1,81 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ISTRING_HPP
+#define PXR_PEGTL_INTERNAL_ISTRING_HPP
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+#include "bump_help.hpp"
+#include "enable_control.hpp"
+#include "one.hpp"
+#include "result_on_found.hpp"
+#include "success.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< char C >
+   inline constexpr bool is_alpha = ( ( 'a' <= C ) && ( C <= 'z' ) ) || ( ( 'A' <= C ) && ( C <= 'Z' ) );
+
+   template< char C >
+   [[nodiscard]] constexpr bool ichar_equal( const char c ) noexcept
+   {
+      if constexpr( is_alpha< C > ) {
+         return ( C | 0x20 ) == ( c | 0x20 );
+      }
+      else {
+         return c == C;
+      }
+   }
+
+   template< char... Cs >
+   [[nodiscard]] constexpr bool istring_equal( const char* r ) noexcept
+   {
+      return ( ichar_equal< Cs >( *r++ ) && ... );
+   }
+
+   template< char... Cs >
+   struct istring;
+
+   template<>
+   struct istring<>
+      : success
+   {};
+
+   // template< char C >
+   // struct istring< C >
+   //    : std::conditional_t< is_alpha< C >, one< result_on_found::success, peek_char, C | 0x20, C & ~0x20 >, one< result_on_found::success, peek_char, C > >
+   // {};
+
+   template< char... Cs >
+   struct istring
+   {
+      using rule_t = istring;
+      using subs_t = empty_list;
+
+      template< int Eol >
+      static constexpr bool can_match_eol = one< result_on_found::success, peek_char, Cs... >::template can_match_eol< Eol >;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.size( 0 ) ) )
+      {
+         if( in.size( sizeof...( Cs ) ) >= sizeof...( Cs ) ) {
+            if( istring_equal< Cs... >( in.current() ) ) {
+               bump_help< istring >( in, sizeof...( Cs ) );
+               return true;
+            }
+         }
+         return false;
+      }
+   };
+
+   template< char... Cs >
+   inline constexpr bool enable_control< istring< Cs... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/iterator.hpp b/pxr/base/pegtl/pegtl/internal/iterator.hpp
new file mode 100644
index 0000000000..d9df2c58a1
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/iterator.hpp
@@ -0,0 +1,49 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ITERATOR_HPP
+#define PXR_PEGTL_INTERNAL_ITERATOR_HPP
+
+#include <cassert>
+#include <cstdlib>
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct iterator
+   {
+      iterator() = default;
+
+      explicit iterator( const char* in_data ) noexcept
+         : data( in_data )
+      {}
+
+      iterator( const char* in_data, const std::size_t in_byte, const std::size_t in_line, const std::size_t in_column ) noexcept
+         : data( in_data ),
+           byte( in_byte ),
+           line( in_line ),
+           column( in_column )
+      {
+         assert( in_line != 0 );
+         assert( in_column != 0 );
+      }
+
+      iterator( const iterator& ) = default;
+      iterator( iterator&& ) = default;
+
+      ~iterator() = default;
+
+      iterator& operator=( const iterator& ) = default;
+      iterator& operator=( iterator&& ) = default;
+
+      const char* data = nullptr;
+
+      std::size_t byte = 0;
+      std::size_t line = 1;
+      std::size_t column = 1;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/lf_crlf_eol.hpp b/pxr/base/pegtl/pegtl/internal/lf_crlf_eol.hpp
new file mode 100644
index 0000000000..332b4f36ad
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/lf_crlf_eol.hpp
@@ -0,0 +1,37 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_LF_CRLF_EOL_HPP
+#define PXR_PEGTL_INTERNAL_LF_CRLF_EOL_HPP
+
+#include "../config.hpp"
+#include "../eol_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct lf_crlf_eol
+   {
+      static constexpr int ch = '\n';
+
+      template< typename ParseInput >
+      [[nodiscard]] static eol_pair match( ParseInput& in ) noexcept( noexcept( in.size( 2 ) ) )
+      {
+         eol_pair p = { false, in.size( 2 ) };
+         if( p.second ) {
+            const auto a = in.peek_char();
+            if( a == '\n' ) {
+               in.bump_to_next_line();
+               p.first = true;
+            }
+            else if( ( a == '\r' ) && ( p.second > 1 ) && ( in.peek_char( 1 ) == '\n' ) ) {
+               in.bump_to_next_line( 2 );
+               p.first = true;
+            }
+         }
+         return p;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/lf_eol.hpp b/pxr/base/pegtl/pegtl/internal/lf_eol.hpp
new file mode 100644
index 0000000000..d417405973
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/lf_eol.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_LF_EOL_HPP
+#define PXR_PEGTL_INTERNAL_LF_EOL_HPP
+
+#include "../config.hpp"
+#include "../eol_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct lf_eol
+   {
+      static constexpr int ch = '\n';
+
+      template< typename ParseInput >
+      [[nodiscard]] static eol_pair match( ParseInput& in ) noexcept( noexcept( in.size( 1 ) ) )
+      {
+         eol_pair p = { false, in.size( 1 ) };
+         if( p.second ) {
+            if( in.peek_char() == '\n' ) {
+               in.bump_to_next_line();
+               p.first = true;
+            }
+         }
+         return p;
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/list.hpp b/pxr/base/pegtl/pegtl/internal/list.hpp
new file mode 100644
index 0000000000..a046519d69
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/list.hpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_LIST_HPP
+#define PXR_PEGTL_INTERNAL_LIST_HPP
+
+#include "../config.hpp"
+
+#include "seq.hpp"
+#include "star.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename Sep >
+   using list = seq< Rule, star< Sep, Rule > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/list_must.hpp b/pxr/base/pegtl/pegtl/internal/list_must.hpp
new file mode 100644
index 0000000000..61d8132467
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/list_must.hpp
@@ -0,0 +1,25 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_LIST_MUST_HPP
+#define PXR_PEGTL_INTERNAL_LIST_MUST_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/internal/list_must.hpp"
+#else
+
+#include "../config.hpp"
+
+#include "must.hpp"
+#include "seq.hpp"
+#include "star.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename Sep >
+   using list_must = seq< Rule, star< Sep, must< Rule > > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/list_tail.hpp b/pxr/base/pegtl/pegtl/internal/list_tail.hpp
new file mode 100644
index 0000000000..1cbcdb9280
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/list_tail.hpp
@@ -0,0 +1,22 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_LIST_TAIL_HPP
+#define PXR_PEGTL_INTERNAL_LIST_TAIL_HPP
+
+#include "../config.hpp"
+
+#include "opt.hpp"
+#include "seq.hpp"
+#include "star.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename Sep >
+   using list_tail = seq< Rule, star< Sep, Rule >, opt< Sep > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/list_tail_pad.hpp b/pxr/base/pegtl/pegtl/internal/list_tail_pad.hpp
new file mode 100644
index 0000000000..3d2c534413
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/list_tail_pad.hpp
@@ -0,0 +1,22 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_LIST_TAIL_PAD_HPP
+#define PXR_PEGTL_INTERNAL_LIST_TAIL_PAD_HPP
+
+#include "../config.hpp"
+
+#include "list.hpp"
+#include "opt.hpp"
+#include "pad.hpp"
+#include "seq.hpp"
+#include "star.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename Sep, typename Pad >
+   using list_tail_pad = seq< Rule, star< pad< Sep, Pad >, Rule >, opt< star< Pad >, Sep > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/marker.hpp b/pxr/base/pegtl/pegtl/internal/marker.hpp
new file mode 100644
index 0000000000..dd35e9ca97
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/marker.hpp
@@ -0,0 +1,80 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_MARKER_HPP
+#define PXR_PEGTL_INTERNAL_MARKER_HPP
+
+#include "../config.hpp"
+#include "../rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Iterator, rewind_mode M >
+   class [[nodiscard]] marker
+   {
+   public:
+      static constexpr rewind_mode next_rewind_mode = M;
+
+      explicit marker( const Iterator& /*unused*/ ) noexcept
+      {}
+
+      marker( const marker& ) = delete;
+      marker( marker&& ) = delete;
+
+      ~marker() = default;
+
+      marker& operator=( const marker& ) = delete;
+      marker& operator=( marker&& ) = delete;
+
+      [[nodiscard]] bool operator()( const bool result ) const noexcept
+      {
+         return result;
+      }
+   };
+
+   template< typename Iterator >
+   class [[nodiscard]] marker< Iterator, rewind_mode::required >
+   {
+   public:
+      static constexpr rewind_mode next_rewind_mode = rewind_mode::active;
+
+      explicit marker( Iterator& i ) noexcept
+         : m_saved( i ),
+           m_input( &i )
+      {}
+
+      marker( const marker& ) = delete;
+      marker( marker&& ) = delete;
+
+      ~marker()
+      {
+         if( m_input != nullptr ) {
+            ( *m_input ) = m_saved;
+         }
+      }
+
+      marker& operator=( const marker& ) = delete;
+      marker& operator=( marker&& ) = delete;
+
+      [[nodiscard]] bool operator()( const bool result ) noexcept
+      {
+         if( result ) {
+            m_input = nullptr;
+            return true;
+         }
+         return false;
+      }
+
+      [[nodiscard]] const Iterator& iterator() const noexcept
+      {
+         return m_saved;
+      }
+
+   private:
+      const Iterator m_saved;
+      Iterator* m_input;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/minus.hpp b/pxr/base/pegtl/pegtl/internal/minus.hpp
new file mode 100644
index 0000000000..e8de8f710e
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/minus.hpp
@@ -0,0 +1,21 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_MINUS_HPP
+#define PXR_PEGTL_INTERNAL_MINUS_HPP
+
+#include "../config.hpp"
+
+#include "eof.hpp"
+#include "not_at.hpp"
+#include "rematch.hpp"
+#include "seq.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename M, typename S >
+   using minus = rematch< M, not_at< S, eof > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/missing_apply.hpp b/pxr/base/pegtl/pegtl/internal/missing_apply.hpp
new file mode 100644
index 0000000000..e8bae871af
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/missing_apply.hpp
@@ -0,0 +1,28 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_MISSING_APPLY_HPP
+#define PXR_PEGTL_INTERNAL_MISSING_APPLY_HPP
+
+#include "../config.hpp"
+#include "../rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Control,
+             template< typename... >
+             class Action,
+             typename ParseInput,
+             typename... States >
+   void missing_apply( ParseInput& in, States&&... st )
+   {
+      // This function only exists for better error messages, which means that it is only called when we know that it won't compile.
+      // LCOV_EXCL_START
+      auto m = in.template mark< rewind_mode::required >();
+      (void)Control::template apply< Action >( m.iterator(), in, st... );
+      // LCOV_EXCL_STOP
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/missing_apply0.hpp b/pxr/base/pegtl/pegtl/internal/missing_apply0.hpp
new file mode 100644
index 0000000000..60cbdd6863
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/missing_apply0.hpp
@@ -0,0 +1,26 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_MISSING_APPLY0_HPP
+#define PXR_PEGTL_INTERNAL_MISSING_APPLY0_HPP
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Control,
+             template< typename... >
+             class Action,
+             typename ParseInput,
+             typename... States >
+   void missing_apply0( ParseInput& in, States&&... st )
+   {
+      // This function only exists for better error messages, which means that it is only called when we know that it won't compile.
+      // LCOV_EXCL_START
+      (void)Control::template apply0< Action >( in, st... );
+      // LCOV_EXCL_STOP
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/must.hpp b/pxr/base/pegtl/pegtl/internal/must.hpp
new file mode 100644
index 0000000000..90363c8566
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/must.hpp
@@ -0,0 +1,69 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_MUST_HPP
+#define PXR_PEGTL_INTERNAL_MUST_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/internal/must.hpp"
+#else
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   // The general case applies must<> to each of the
+   // rules in the 'Rules' parameter pack individually.
+
+   template< typename... Rules >
+   struct must
+      : seq< must< Rules >... >
+   {};
+
+   template<>
+   struct must<>
+      : success
+   {};
+
+   // While in theory the implementation for a single rule could
+   // be simplified to must< Rule > = sor< Rule, raise< Rule > >, this
+   // would result in some unnecessary run-time overhead.
+
+   template< typename Rule >
+   struct must< Rule >
+   {
+      using rule_t = must;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if( !Control< Rule >::template match< A, rewind_mode::dontcare, Action, Control >( in, st... ) ) {
+            Control< Rule >::raise( static_cast< const ParseInput& >( in ), st... );
+         }
+         return true;
+      }
+   };
+
+   template< typename... Rules >
+   inline constexpr bool enable_control< must< Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/not_at.hpp b/pxr/base/pegtl/pegtl/internal/not_at.hpp
new file mode 100644
index 0000000000..54b7deeca9
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/not_at.hpp
@@ -0,0 +1,55 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_NOT_AT_HPP
+#define PXR_PEGTL_INTERNAL_NOT_AT_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "failure.hpp"
+#include "seq.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Rules >
+   struct not_at
+      : not_at< seq< Rules... > >
+   {};
+
+   template<>
+   struct not_at<>
+      : failure
+   {};
+
+   template< typename Rule >
+   struct not_at< Rule >
+   {
+      using rule_t = not_at;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode,
+                rewind_mode,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         const auto m = in.template mark< rewind_mode::required >();
+         return !Control< Rule >::template match< apply_mode::nothing, rewind_mode::active, Action, Control >( in, st... );
+      }
+   };
+
+   template< typename... Rules >
+   inline constexpr bool enable_control< not_at< Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/one.hpp b/pxr/base/pegtl/pegtl/internal/one.hpp
new file mode 100644
index 0000000000..ebf84c6713
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/one.hpp
@@ -0,0 +1,66 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_ONE_HPP
+#define PXR_PEGTL_INTERNAL_ONE_HPP
+
+#include <cstddef>
+
+#include "../config.hpp"
+
+#include "any.hpp"
+#include "bump_help.hpp"
+#include "enable_control.hpp"
+#include "failure.hpp"
+#include "result_on_found.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< result_on_found R, typename Peek, typename Peek::data_t... Cs >
+   struct one
+   {
+      using peek_t = Peek;
+      using data_t = typename Peek::data_t;
+
+      using rule_t = one;
+      using subs_t = empty_list;
+
+      [[nodiscard]] static constexpr bool test( const data_t c ) noexcept
+      {
+         return ( ( c == Cs ) || ... ) == bool( R );
+      }
+
+      template< int Eol >
+      static constexpr bool can_match_eol = test( Eol );
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( Peek::peek( in ) ) )
+      {
+         if( const auto t = Peek::peek( in ) ) {
+            if( test( t.data ) ) {
+               bump_help< one >( in, t.size );
+               return true;
+            }
+         }
+         return false;
+      }
+   };
+
+   template< typename Peek >
+   struct one< result_on_found::success, Peek >
+      : failure
+   {};
+
+   template< typename Peek >
+   struct one< result_on_found::failure, Peek >
+      : any< Peek >
+   {};
+
+   template< result_on_found R, typename Peek, typename Peek::data_t... Cs >
+   inline constexpr bool enable_control< one< R, Peek, Cs... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/opt.hpp b/pxr/base/pegtl/pegtl/internal/opt.hpp
new file mode 100644
index 0000000000..073d629f05
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/opt.hpp
@@ -0,0 +1,57 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_OPT_HPP
+#define PXR_PEGTL_INTERNAL_OPT_HPP
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Rules >
+   struct opt
+      : opt< seq< Rules... > >
+   {};
+
+   template<>
+   struct opt<>
+      : success
+   {};
+
+   template< typename Rule >
+   struct opt< Rule >
+   {
+      using rule_t = opt;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         (void)Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... );
+         return true;
+      }
+   };
+
+   template< typename... Rules >
+   inline constexpr bool enable_control< opt< Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/pad.hpp b/pxr/base/pegtl/pegtl/internal/pad.hpp
new file mode 100644
index 0000000000..fe526ee198
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/pad.hpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_PAD_HPP
+#define PXR_PEGTL_INTERNAL_PAD_HPP
+
+#include "../config.hpp"
+
+#include "seq.hpp"
+#include "star.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename Pad1, typename Pad2 = Pad1 >
+   using pad = seq< star< Pad1 >, Rule, star< Pad2 > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/pad_opt.hpp b/pxr/base/pegtl/pegtl/internal/pad_opt.hpp
new file mode 100644
index 0000000000..6b1d9daf93
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/pad_opt.hpp
@@ -0,0 +1,20 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_PAD_OPT_HPP
+#define PXR_PEGTL_INTERNAL_PAD_OPT_HPP
+
+#include "../config.hpp"
+
+#include "opt.hpp"
+#include "seq.hpp"
+#include "star.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename Pad >
+   using pad_opt = seq< star< Pad >, opt< Rule, star< Pad > > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/path_to_string.hpp b/pxr/base/pegtl/pegtl/internal/path_to_string.hpp
new file mode 100644
index 0000000000..c800f43804
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/path_to_string.hpp
@@ -0,0 +1,28 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_PATH_TO_STRING_HPP
+#define PXR_PEGTL_INTERNAL_PATH_TO_STRING_HPP
+
+#include <string>
+
+#include "../config.hpp"
+#include "filesystem.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   [[nodiscard]] inline std::string path_to_string( const internal::filesystem::path& path )
+   {
+#if defined( PXR_PEGTL_BOOST_FILESYSTEM )
+      return path.string();
+#elif defined( __cpp_char8_t )
+      const auto s = path.u8string();
+      return { reinterpret_cast< const char* >( s.data() ), s.size() };
+#else
+      return path.u8string();
+#endif
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/peek_char.hpp b/pxr/base/pegtl/pegtl/internal/peek_char.hpp
new file mode 100644
index 0000000000..321c78bfcc
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/peek_char.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_PEEK_CHAR_HPP
+#define PXR_PEGTL_INTERNAL_PEEK_CHAR_HPP
+
+#include <cstddef>
+
+#include "../config.hpp"
+
+#include "input_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct peek_char
+   {
+      using data_t = char;
+      using pair_t = input_pair< char >;
+
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         if( in.empty() ) {
+            return { 0, 0 };
+         }
+         return { in.peek_char(), 1 };
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/peek_utf8.hpp b/pxr/base/pegtl/pegtl/internal/peek_utf8.hpp
new file mode 100644
index 0000000000..401dc3944e
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/peek_utf8.hpp
@@ -0,0 +1,89 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_PEEK_UTF8_HPP
+#define PXR_PEGTL_INTERNAL_PEEK_UTF8_HPP
+
+#include "../config.hpp"
+
+#include "input_pair.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct peek_utf8
+   {
+      using data_t = char32_t;
+      using pair_t = input_pair< char32_t >;
+
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek( ParseInput& in ) noexcept( noexcept( in.empty() ) )
+      {
+         if( in.empty() ) {
+            return { 0, 0 };
+         }
+         const char32_t c0 = in.peek_uint8();
+         if( ( c0 & 0x80 ) == 0 ) {
+            return { c0, 1 };
+         }
+         return peek_impl( in, c0 );
+      }
+
+   private:
+      template< typename ParseInput >
+      [[nodiscard]] static pair_t peek_impl( ParseInput& in, char32_t c0 ) noexcept( noexcept( in.size( 4 ) ) )
+      {
+         if( ( c0 & 0xE0 ) == 0xC0 ) {
+            if( in.size( 2 ) >= 2 ) {
+               const char32_t c1 = in.peek_uint8( 1 );
+               if( ( c1 & 0xC0 ) == 0x80 ) {
+                  c0 &= 0x1F;
+                  c0 <<= 6;
+                  c0 |= ( c1 & 0x3F );
+                  if( c0 >= 0x80 ) {
+                     return { c0, 2 };
+                  }
+               }
+            }
+         }
+         else if( ( c0 & 0xF0 ) == 0xE0 ) {
+            if( in.size( 3 ) >= 3 ) {
+               const char32_t c1 = in.peek_uint8( 1 );
+               const char32_t c2 = in.peek_uint8( 2 );
+               if( ( ( c1 & 0xC0 ) == 0x80 ) && ( ( c2 & 0xC0 ) == 0x80 ) ) {
+                  c0 &= 0x0F;
+                  c0 <<= 6;
+                  c0 |= ( c1 & 0x3F );
+                  c0 <<= 6;
+                  c0 |= ( c2 & 0x3F );
+                  if( c0 >= 0x800 && !( c0 >= 0xD800 && c0 <= 0xDFFF ) ) {
+                     return { c0, 3 };
+                  }
+               }
+            }
+         }
+         else if( ( c0 & 0xF8 ) == 0xF0 ) {
+            if( in.size( 4 ) >= 4 ) {
+               const char32_t c1 = in.peek_uint8( 1 );
+               const char32_t c2 = in.peek_uint8( 2 );
+               const char32_t c3 = in.peek_uint8( 3 );
+               if( ( ( c1 & 0xC0 ) == 0x80 ) && ( ( c2 & 0xC0 ) == 0x80 ) && ( ( c3 & 0xC0 ) == 0x80 ) ) {
+                  c0 &= 0x07;
+                  c0 <<= 6;
+                  c0 |= ( c1 & 0x3F );
+                  c0 <<= 6;
+                  c0 |= ( c2 & 0x3F );
+                  c0 <<= 6;
+                  c0 |= ( c3 & 0x3F );
+                  if( c0 >= 0x10000 && c0 <= 0x10FFFF ) {
+                     return { c0, 4 };
+                  }
+               }
+            }
+         }
+         return { 0, 0 };
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/pegtl_string.hpp b/pxr/base/pegtl/pegtl/internal/pegtl_string.hpp
new file mode 100644
index 0000000000..209e8885e0
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/pegtl_string.hpp
@@ -0,0 +1,90 @@
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_PEGTL_STRING_HPP
+#define PXR_PEGTL_INTERNAL_PEGTL_STRING_HPP
+
+#include <cstddef>
+#include <type_traits>
+
+#include "../ascii.hpp"
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   // Inspired by https://github.com/irrequietus/typestring
+   // Rewritten and reduced to what is needed for the PEGTL
+   // and to work with Visual Studio 2015.
+
+   template< typename, typename, typename, typename, typename, typename, typename, typename >
+   struct string_join;
+
+   template< template< char... > class S, char... C0s, char... C1s, char... C2s, char... C3s, char... C4s, char... C5s, char... C6s, char... C7s >
+   struct string_join< S< C0s... >, S< C1s... >, S< C2s... >, S< C3s... >, S< C4s... >, S< C5s... >, S< C6s... >, S< C7s... > >
+   {
+      using type = S< C0s..., C1s..., C2s..., C3s..., C4s..., C5s..., C6s..., C7s... >;
+   };
+
+   template< template< char... > class S, char, bool >
+   struct string_at
+   {
+      using type = S<>;
+   };
+
+   template< template< char... > class S, char C >
+   struct string_at< S, C, true >
+   {
+      using type = S< C >;
+   };
+
+   template< typename T, std::size_t S >
+   struct string_max_length
+   {
+      static_assert( S <= 512, "String longer than 512 (excluding terminating \\0)!" );
+      using type = T;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#define PXR_PEGTL_INTERNAL_EMPTY()
+#define PXR_PEGTL_INTERNAL_DEFER( X ) X PXR_PEGTL_INTERNAL_EMPTY()
+#define PXR_PEGTL_INTERNAL_EXPAND( ... ) __VA_ARGS__
+
+#define PXR_PEGTL_INTERNAL_STRING_AT( S, x, n ) \
+   PXR_PEGTL_NAMESPACE::internal::string_at< S, ( 0##n < ( sizeof( x ) / sizeof( char ) ) ) ? ( x )[ 0##n ] : 0, ( 0##n < ( sizeof( x ) / sizeof( char ) ) - 1 ) >::type
+
+#define PXR_PEGTL_INTERNAL_JOIN_8( M, S, x, n )                                             \
+   PXR_PEGTL_NAMESPACE::internal::string_join< PXR_PEGTL_INTERNAL_DEFER( M )( S, x, n##0 ), \
+                                               PXR_PEGTL_INTERNAL_DEFER( M )( S, x, n##1 ), \
+                                               PXR_PEGTL_INTERNAL_DEFER( M )( S, x, n##2 ), \
+                                               PXR_PEGTL_INTERNAL_DEFER( M )( S, x, n##3 ), \
+                                               PXR_PEGTL_INTERNAL_DEFER( M )( S, x, n##4 ), \
+                                               PXR_PEGTL_INTERNAL_DEFER( M )( S, x, n##5 ), \
+                                               PXR_PEGTL_INTERNAL_DEFER( M )( S, x, n##6 ), \
+                                               PXR_PEGTL_INTERNAL_DEFER( M )( S, x, n##7 ) >::type
+
+#define PXR_PEGTL_INTERNAL_STRING_8( S, x, n ) \
+   PXR_PEGTL_INTERNAL_JOIN_8( PXR_PEGTL_INTERNAL_STRING_AT, S, x, n )
+
+#define PXR_PEGTL_INTERNAL_STRING_64( S, x, n ) \
+   PXR_PEGTL_INTERNAL_JOIN_8( PXR_PEGTL_INTERNAL_STRING_8, S, x, n )
+
+#define PXR_PEGTL_INTERNAL_STRING_512( S, x, n ) \
+   PXR_PEGTL_INTERNAL_JOIN_8( PXR_PEGTL_INTERNAL_STRING_64, S, x, n )
+
+#define PXR_PEGTL_INTERNAL_STRING( S, x ) \
+   PXR_PEGTL_INTERNAL_EXPAND(             \
+      PXR_PEGTL_INTERNAL_EXPAND(          \
+         PXR_PEGTL_INTERNAL_EXPAND(       \
+            PXR_PEGTL_NAMESPACE::internal::string_max_length< PXR_PEGTL_INTERNAL_STRING_512( S, x, ), sizeof( x ) - 1 >::type ) ) )
+
+#define PXR_PEGTL_STRING( x ) \
+   PXR_PEGTL_INTERNAL_STRING( PXR_PEGTL_NAMESPACE::ascii::string, x )
+
+#define PXR_PEGTL_ISTRING( x ) \
+   PXR_PEGTL_INTERNAL_STRING( PXR_PEGTL_NAMESPACE::ascii::istring, x )
+
+#define PXR_PEGTL_KEYWORD( x ) \
+   PXR_PEGTL_INTERNAL_STRING( PXR_PEGTL_NAMESPACE::ascii::keyword, x )
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/plus.hpp b/pxr/base/pegtl/pegtl/internal/plus.hpp
new file mode 100644
index 0000000000..03b9a3b2e0
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/plus.hpp
@@ -0,0 +1,60 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_PLUS_HPP
+#define PXR_PEGTL_INTERNAL_PLUS_HPP
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   // While plus<> could easily be implemented with
+   // seq< Rule, Rules ..., star< Rule, Rules ... > > we
+   // provide an explicit implementation to optimise away
+   // the otherwise created input mark.
+
+   template< typename Rule, typename... Rules >
+   struct plus
+      : plus< seq< Rule, Rules... > >
+   {};
+
+   template< typename Rule >
+   struct plus< Rule >
+   {
+      using rule_t = plus;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if( Control< Rule >::template match< A, M, Action, Control >( in, st... ) ) {
+            while( Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
+            }
+            return true;
+         }
+         return false;
+      }
+   };
+
+   template< typename Rule, typename... Rules >
+   inline constexpr bool enable_control< plus< Rule, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/raise.hpp b/pxr/base/pegtl/pegtl/internal/raise.hpp
new file mode 100644
index 0000000000..8ce1fb8b4a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/raise.hpp
@@ -0,0 +1,49 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_RAISE_HPP
+#define PXR_PEGTL_INTERNAL_RAISE_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/internal/raise.hpp"
+#else
+
+#include <stdexcept>
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename T >
+   struct raise
+   {
+      using rule_t = raise;
+      using subs_t = empty_list;
+
+      template< apply_mode,
+                rewind_mode,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[noreturn]] static bool match( ParseInput& in, States&&... st )
+      {
+         Control< T >::raise( static_cast< const ParseInput& >( in ), st... );
+      }
+   };
+
+   template< typename T >
+   inline constexpr bool enable_control< raise< T > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/range.hpp b/pxr/base/pegtl/pegtl/internal/range.hpp
new file mode 100644
index 0000000000..970a90ee26
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/range.hpp
@@ -0,0 +1,60 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_RANGE_HPP
+#define PXR_PEGTL_INTERNAL_RANGE_HPP
+
+#include "../config.hpp"
+
+#include "bump_help.hpp"
+#include "enable_control.hpp"
+#include "one.hpp"
+#include "result_on_found.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< result_on_found R, typename Peek, typename Peek::data_t Lo, typename Peek::data_t Hi >
+   struct range
+   {
+      using peek_t = Peek;
+      using data_t = typename Peek::data_t;
+
+      using rule_t = range;
+      using subs_t = empty_list;
+
+      static_assert( Lo < Hi, "invalid range" );
+
+      [[nodiscard]] static constexpr bool test( const data_t c ) noexcept
+      {
+         return ( ( Lo <= c ) && ( c <= Hi ) ) == bool( R );
+      }
+
+      template< int Eol >
+      static constexpr bool can_match_eol = test( Eol );
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( Peek::peek( in ) ) )
+      {
+         if( const auto t = Peek::peek( in ) ) {
+            if( test( t.data ) ) {
+               bump_help< range >( in, t.size );
+               return true;
+            }
+         }
+         return false;
+      }
+   };
+
+   template< result_on_found R, typename Peek, typename Peek::data_t C >
+   struct range< R, Peek, C, C >
+      : one< R, Peek, C >
+   {};
+
+   template< result_on_found R, typename Peek, typename Peek::data_t Lo, typename Peek::data_t Hi >
+   inline constexpr bool enable_control< range< R, Peek, Lo, Hi > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/ranges.hpp b/pxr/base/pegtl/pegtl/internal/ranges.hpp
new file mode 100644
index 0000000000..446a6572be
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/ranges.hpp
@@ -0,0 +1,90 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_RANGES_HPP
+#define PXR_PEGTL_INTERNAL_RANGES_HPP
+
+#include "../config.hpp"
+
+#include <utility>
+
+#include "bump_help.hpp"
+#include "enable_control.hpp"
+#include "failure.hpp"
+#include "one.hpp"
+#include "range.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Char, Char Lo, Char Hi >
+   constexpr bool validate_range( Char c ) noexcept
+   {
+      static_assert( Lo <= Hi, "invalid range" );
+      return ( Lo <= c ) && ( c <= Hi );
+   }
+
+   template< typename Peek, typename Peek::data_t... Cs >
+   struct ranges
+   {
+      using peek_t = Peek;
+      using data_t = typename Peek::data_t;
+
+      using rule_t = ranges;
+      using subs_t = empty_list;
+
+      template< std::size_t... Is >
+      [[nodiscard]] static constexpr bool test( std::index_sequence< Is... > /*unused*/, const data_t c ) noexcept
+      {
+         constexpr const data_t cs[] = { Cs... };
+         if constexpr( sizeof...( Cs ) % 2 == 0 ) {
+            return ( validate_range< data_t, cs[ 2 * Is ], cs[ 2 * Is + 1 ] >( c ) || ... );
+         }
+         else {
+            return ( validate_range< data_t, cs[ 2 * Is ], cs[ 2 * Is + 1 ] >( c ) || ... ) || ( c == cs[ sizeof...( Cs ) - 1 ] );
+         }
+      }
+
+      [[nodiscard]] static constexpr bool test( const data_t c ) noexcept
+      {
+         return test( std::make_index_sequence< sizeof...( Cs ) / 2 >(), c );
+      }
+
+      template< int Eol >
+      static constexpr bool can_match_eol = test( Eol );
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( Peek::peek( in ) ) )
+      {
+         if( const auto t = Peek::peek( in ) ) {
+            if( test( t.data ) ) {
+               bump_help< ranges >( in, t.size );
+               return true;
+            }
+         }
+         return false;
+      }
+   };
+
+   template< typename Peek, typename Peek::data_t Lo, typename Peek::data_t Hi >
+   struct ranges< Peek, Lo, Hi >
+      : range< result_on_found::success, Peek, Lo, Hi >
+   {};
+
+   template< typename Peek, typename Peek::data_t C >
+   struct ranges< Peek, C >
+      : one< result_on_found::success, Peek, C >
+   {};
+
+   template< typename Peek >
+   struct ranges< Peek >
+      : failure
+   {};
+
+   template< typename Peek, typename Peek::data_t... Cs >
+   inline constexpr bool enable_control< ranges< Peek, Cs... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/rematch.hpp b/pxr/base/pegtl/pegtl/internal/rematch.hpp
new file mode 100644
index 0000000000..bf8f497bc3
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/rematch.hpp
@@ -0,0 +1,72 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_REMATCH_HPP
+#define PXR_PEGTL_INTERNAL_REMATCH_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../apply_mode.hpp"
+#include "../memory_input.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Head, typename... Rules >
+   struct rematch;
+
+   template< typename Head >
+   struct rematch< Head >
+   {
+      using rule_t = rematch;
+      using subs_t = type_list< Head >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return Control< Head >::template match< A, M, Action, Control >( in, st... );
+      }
+   };
+
+   template< typename Head, typename Rule, typename... Rules >
+   struct rematch< Head, Rule, Rules... >
+   {
+      using rule_t = rematch;
+      using subs_t = type_list< Head, Rule, Rules... >;
+
+      template< apply_mode A,
+                rewind_mode,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         auto m = in.template mark< rewind_mode::required >();
+
+         if( Control< Head >::template match< A, rewind_mode::active, Action, Control >( in, st... ) ) {
+            memory_input< ParseInput::tracking_mode_v, typename ParseInput::eol_t, typename ParseInput::source_t > i2( m.iterator(), in.current(), in.source() );
+            return m( ( Control< Rule >::template match< A, rewind_mode::active, Action, Control >( i2, st... ) && ... && ( i2.restart( m ), Control< Rules >::template match< A, rewind_mode::active, Action, Control >( i2, st... ) ) ) );
+         }
+         return false;
+      }
+   };
+
+   template< typename Head, typename... Rules >
+   inline constexpr bool enable_control< rematch< Head, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/rep.hpp b/pxr/base/pegtl/pegtl/internal/rep.hpp
new file mode 100644
index 0000000000..c05a1b32cf
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/rep.hpp
@@ -0,0 +1,67 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_REP_HPP
+#define PXR_PEGTL_INTERNAL_REP_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< unsigned Cnt, typename... Rules >
+   struct rep
+      : rep< Cnt, seq< Rules... > >
+   {};
+
+   template< unsigned Cnt >
+   struct rep< Cnt >
+      : success
+   {};
+
+   template< typename Rule >
+   struct rep< 0, Rule >
+      : success
+   {};
+
+   template< unsigned Cnt, typename Rule >
+   struct rep< Cnt, Rule >
+   {
+      using rule_t = rep;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         auto m = in.template mark< M >();
+         using m_t = decltype( m );
+
+         for( unsigned i = 0; i != Cnt; ++i ) {
+            if( !Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ) {
+               return false;
+            }
+         }
+         return m( true );
+      }
+   };
+
+   template< unsigned Cnt, typename... Rules >
+   inline constexpr bool enable_control< rep< Cnt, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/rep_min.hpp b/pxr/base/pegtl/pegtl/internal/rep_min.hpp
new file mode 100644
index 0000000000..126c216668
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/rep_min.hpp
@@ -0,0 +1,20 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_REP_MIN_HPP
+#define PXR_PEGTL_INTERNAL_REP_MIN_HPP
+
+#include "../config.hpp"
+
+#include "rep.hpp"
+#include "seq.hpp"
+#include "star.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< unsigned Min, typename Rule, typename... Rules >
+   using rep_min = seq< rep< Min, Rule, Rules... >, star< Rule, Rules... > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/rep_min_max.hpp b/pxr/base/pegtl/pegtl/internal/rep_min_max.hpp
new file mode 100644
index 0000000000..67091b4f36
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/rep_min_max.hpp
@@ -0,0 +1,81 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_REP_MIN_MAX_HPP
+#define PXR_PEGTL_INTERNAL_REP_MIN_MAX_HPP
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "failure.hpp"
+#include "not_at.hpp"
+#include "seq.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< unsigned Min, unsigned Max, typename... Rules >
+   struct rep_min_max
+      : rep_min_max< Min, Max, seq< Rules... > >
+   {
+      static_assert( Min <= Max );
+   };
+
+   template< unsigned Min, unsigned Max >
+   struct rep_min_max< Min, Max >
+      : failure
+   {
+      static_assert( Min <= Max );
+   };
+
+   template< typename Rule >
+   struct rep_min_max< 0, 0, Rule >
+      : not_at< Rule >
+   {};
+
+   template< unsigned Min, unsigned Max, typename Rule >
+   struct rep_min_max< Min, Max, Rule >
+   {
+      using rule_t = rep_min_max;
+      using subs_t = type_list< Rule >;
+
+      static_assert( Min <= Max );
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         auto m = in.template mark< M >();
+         using m_t = decltype( m );
+
+         for( unsigned i = 0; i != Min; ++i ) {
+            if( !Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ) {
+               return false;
+            }
+         }
+         for( unsigned i = Min; i != Max; ++i ) {
+            if( !Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
+               return m( true );
+            }
+         }
+         return m( Control< not_at< Rule > >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) );  // NOTE that not_at<> will always rewind.
+      }
+   };
+
+   template< unsigned Min, unsigned Max, typename... Rules >
+   inline constexpr bool enable_control< rep_min_max< Min, Max, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/rep_opt.hpp b/pxr/base/pegtl/pegtl/internal/rep_opt.hpp
new file mode 100644
index 0000000000..a624eb03db
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/rep_opt.hpp
@@ -0,0 +1,61 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_REP_OPT_HPP
+#define PXR_PEGTL_INTERNAL_REP_OPT_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< unsigned Max, typename... Rules >
+   struct rep_opt
+      : rep_opt< Max, seq< Rules... > >
+   {};
+
+   template< unsigned Max >
+   struct rep_opt< Max >
+      : success
+   {};
+
+   template< typename... Rules >
+   struct rep_opt< 0, Rules... >
+      : success
+   {};
+
+   template< unsigned Max, typename Rule >
+   struct rep_opt< Max, Rule >
+   {
+      using rule_t = rep_opt;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         for( unsigned i = 0; ( i != Max ) && Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... ); ++i ) {
+         }
+         return true;
+      }
+   };
+
+   template< unsigned Max, typename... Rules >
+   inline constexpr bool enable_control< rep_opt< Max, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/require.hpp b/pxr/base/pegtl/pegtl/internal/require.hpp
new file mode 100644
index 0000000000..290ee9c5e8
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/require.hpp
@@ -0,0 +1,42 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_REQUIRE_HPP
+#define PXR_PEGTL_INTERNAL_REQUIRE_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "success.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< unsigned Amount >
+   struct require;
+
+   template<>
+   struct require< 0 >
+      : success
+   {};
+
+   template< unsigned Amount >
+   struct require
+   {
+      using rule_t = require;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.size( 0 ) ) )
+      {
+         return in.size( Amount ) >= Amount;
+      }
+   };
+
+   template< unsigned Amount >
+   inline constexpr bool enable_control< require< Amount > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/result_on_found.hpp b/pxr/base/pegtl/pegtl/internal/result_on_found.hpp
new file mode 100644
index 0000000000..669d942137
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/result_on_found.hpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_RESULT_ON_FOUND_HPP
+#define PXR_PEGTL_INTERNAL_RESULT_ON_FOUND_HPP
+
+#include "../config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   enum class result_on_found : bool
+   {
+      success = true,
+      failure = false
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/rules.hpp b/pxr/base/pegtl/pegtl/internal/rules.hpp
new file mode 100644
index 0000000000..cee1ffd68a
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/rules.hpp
@@ -0,0 +1,64 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_RULES_HPP
+#define PXR_PEGTL_INTERNAL_RULES_HPP
+
+#include "action.hpp"
+#include "any.hpp"
+#include "apply.hpp"
+#include "apply0.hpp"
+#include "at.hpp"
+#include "bof.hpp"
+#include "bol.hpp"
+#include "bytes.hpp"
+#include "control.hpp"
+#include "disable.hpp"
+#include "discard.hpp"
+#include "enable.hpp"
+#include "enable_control.hpp"
+#include "eof.hpp"
+#include "eol.hpp"
+#include "eolf.hpp"
+#include "failure.hpp"
+#include "identifier.hpp"
+#include "if_apply.hpp"
+#include "if_then_else.hpp"
+#include "istring.hpp"
+#include "list.hpp"
+#include "list_tail.hpp"
+#include "list_tail_pad.hpp"
+#include "minus.hpp"
+#include "not_at.hpp"
+#include "one.hpp"
+#include "opt.hpp"
+#include "pad.hpp"
+#include "pad_opt.hpp"
+#include "plus.hpp"
+#include "range.hpp"
+#include "ranges.hpp"
+#include "rematch.hpp"
+#include "rep.hpp"
+#include "rep_min.hpp"
+#include "rep_min_max.hpp"
+#include "rep_opt.hpp"
+#include "require.hpp"
+#include "seq.hpp"
+#include "sor.hpp"
+#include "star.hpp"
+#include "state.hpp"
+#include "string.hpp"
+#include "success.hpp"
+#include "until.hpp"
+
+#if defined( __cpp_exceptions )
+#include "if_must.hpp"
+#include "if_must_else.hpp"
+#include "list_must.hpp"
+#include "must.hpp"
+#include "raise.hpp"
+#include "star_must.hpp"
+#include "try_catch_type.hpp"
+#endif
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/seq.hpp b/pxr/base/pegtl/pegtl/internal/seq.hpp
new file mode 100644
index 0000000000..eb8be589f5
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/seq.hpp
@@ -0,0 +1,58 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_SEQ_HPP
+#define PXR_PEGTL_INTERNAL_SEQ_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Rules >
+   struct seq;
+
+   template<>
+   struct seq<>
+      : success
+   {};
+
+   template< typename... Rules >
+   struct seq
+   {
+      using rule_t = seq;
+      using subs_t = type_list< Rules... >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if constexpr( sizeof...( Rules ) == 1 ) {
+            return Control< Rules... >::template match< A, M, Action, Control >( in, st... );
+         }
+         else {
+            auto m = in.template mark< M >();
+            using m_t = decltype( m );
+            return m( ( Control< Rules >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) && ... ) );
+         }
+      }
+   };
+
+   template< typename... Rules >
+   inline constexpr bool enable_control< seq< Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/sor.hpp b/pxr/base/pegtl/pegtl/internal/sor.hpp
new file mode 100644
index 0000000000..2b080213cf
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/sor.hpp
@@ -0,0 +1,67 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_SOR_HPP
+#define PXR_PEGTL_INTERNAL_SOR_HPP
+
+#include <utility>
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "failure.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename... Rules >
+   struct sor;
+
+   template<>
+   struct sor<>
+      : failure
+   {};
+
+   template< typename... Rules >
+   struct sor
+   {
+      using rule_t = sor;
+      using subs_t = type_list< Rules... >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                std::size_t... Indices,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( std::index_sequence< Indices... > /*unused*/, ParseInput& in, States&&... st )
+      {
+         return ( Control< Rules >::template match< A, ( ( Indices == ( sizeof...( Rules ) - 1 ) ) ? M : rewind_mode::required ), Action, Control >( in, st... ) || ... );
+      }
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         return match< A, M, Action, Control >( std::index_sequence_for< Rules... >(), in, st... );
+      }
+   };
+
+   template< typename... Rules >
+   inline constexpr bool enable_control< sor< Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/star.hpp b/pxr/base/pegtl/pegtl/internal/star.hpp
new file mode 100644
index 0000000000..205c33571f
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/star.hpp
@@ -0,0 +1,52 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_STAR_HPP
+#define PXR_PEGTL_INTERNAL_STAR_HPP
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Rule, typename... Rules >
+   struct star
+      : star< seq< Rule, Rules... > >
+   {};
+
+   template< typename Rule >
+   struct star< Rule >
+   {
+      using rule_t = star;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         while( Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
+         }
+         return true;
+      }
+   };
+
+   template< typename Rule, typename... Rules >
+   inline constexpr bool enable_control< star< Rule, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/star_must.hpp b/pxr/base/pegtl/pegtl/internal/star_must.hpp
new file mode 100644
index 0000000000..d720ca9b26
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/star_must.hpp
@@ -0,0 +1,24 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_STAR_MUST_HPP
+#define PXR_PEGTL_INTERNAL_STAR_MUST_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/internal/star_must.hpp"
+#else
+
+#include "../config.hpp"
+
+#include "if_must.hpp"
+#include "star.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Cond, typename... Rules >
+   using star_must = star< if_must< false, Cond, Rules... > >;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/state.hpp b/pxr/base/pegtl/pegtl/internal/state.hpp
new file mode 100644
index 0000000000..6b770f06b2
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/state.hpp
@@ -0,0 +1,75 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_STATE_HPP
+#define PXR_PEGTL_INTERNAL_STATE_HPP
+
+#include "../config.hpp"
+
+#include <type_traits>
+
+#include "dependent_false.hpp"
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename NewState, typename... Rules >
+   struct state
+      : state< NewState, seq< Rules... > >
+   {};
+
+   template< typename NewState >
+   struct state< NewState >
+      : success
+   {};
+
+   template< typename NewState, typename Rule >
+   struct state< NewState, Rule >
+   {
+      using rule_t = state;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if constexpr( std::is_constructible_v< NewState, const ParseInput&, States... > ) {
+            NewState s( static_cast< const ParseInput& >( in ), st... );
+            if( Control< Rule >::template match< A, M, Action, Control >( in, s ) ) {
+               s.success( static_cast< const ParseInput& >( in ), st... );
+               return true;
+            }
+            return false;
+         }
+         else if constexpr( std::is_default_constructible_v< NewState > ) {
+            NewState s;
+            if( Control< Rule >::template match< A, M, Action, Control >( in, s ) ) {
+               s.success( static_cast< const ParseInput& >( in ), st... );
+               return true;
+            }
+            return false;
+         }
+         else {
+            static_assert( internal::dependent_false< NewState >, "unable to instantiate new state" );
+         }
+      }
+   };
+
+   template< typename NewState, typename... Rules >
+   inline constexpr bool enable_control< state< NewState, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/string.hpp b/pxr/base/pegtl/pegtl/internal/string.hpp
new file mode 100644
index 0000000000..4515c66368
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/string.hpp
@@ -0,0 +1,67 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_STRING_HPP
+#define PXR_PEGTL_INTERNAL_STRING_HPP
+
+#include <cstring>
+#include <utility>
+
+#include "../config.hpp"
+
+#include "bump_help.hpp"
+#include "enable_control.hpp"
+#include "one.hpp"
+#include "result_on_found.hpp"
+#include "success.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   [[nodiscard]] inline bool unsafe_equals( const char* s, const std::initializer_list< char >& l ) noexcept
+   {
+      return std::memcmp( s, &*l.begin(), l.size() ) == 0;
+   }
+
+   template< char... Cs >
+   struct string;
+
+   template<>
+   struct string<>
+      : success
+   {};
+
+   // template< char C >
+   // struct string
+   //    : one< C >
+   // {};
+
+   template< char... Cs >
+   struct string
+   {
+      using rule_t = string;
+      using subs_t = empty_list;
+
+      template< int Eol >
+      static constexpr bool can_match_eol = one< result_on_found::success, peek_char, Cs... >::template can_match_eol< Eol >;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.size( 0 ) ) )
+      {
+         if( in.size( sizeof...( Cs ) ) >= sizeof...( Cs ) ) {
+            if( unsafe_equals( in.current(), { Cs... } ) ) {
+               bump_help< string >( in, sizeof...( Cs ) );
+               return true;
+            }
+         }
+         return false;
+      }
+   };
+
+   template< char... Cs >
+   inline constexpr bool enable_control< string< Cs... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/success.hpp b/pxr/base/pegtl/pegtl/internal/success.hpp
new file mode 100644
index 0000000000..834d6c2fac
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/success.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_SUCCESS_HPP
+#define PXR_PEGTL_INTERNAL_SUCCESS_HPP
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   struct success
+   {
+      using rule_t = success;
+      using subs_t = empty_list;
+
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& /*unused*/ ) noexcept
+      {
+         return true;
+      }
+   };
+
+   template<>
+   inline constexpr bool enable_control< success > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/try_catch_type.hpp b/pxr/base/pegtl/pegtl/internal/try_catch_type.hpp
new file mode 100644
index 0000000000..34821537f0
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/try_catch_type.hpp
@@ -0,0 +1,69 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_TRY_CATCH_TYPE_HPP
+#define PXR_PEGTL_INTERNAL_TRY_CATCH_TYPE_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/internal/try_catch_type.hpp"
+#else
+
+#include <type_traits>
+
+#include "../config.hpp"
+
+#include "enable_control.hpp"
+#include "seq.hpp"
+#include "success.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Exception, typename... Rules >
+   struct try_catch_type
+      : try_catch_type< Exception, seq< Rules... > >
+   {};
+
+   template< typename Exception >
+   struct try_catch_type< Exception >
+      : success
+   {};
+
+   template< typename Exception, typename Rule >
+   struct try_catch_type< Exception, Rule >
+   {
+      using rule_t = try_catch_type;
+      using subs_t = type_list< Rule >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         auto m = in.template mark< M >();
+         using m_t = decltype( m );
+
+         try {
+            return m( Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) );
+         }
+         catch( const Exception& ) {
+            return false;
+         }
+      }
+   };
+
+   template< typename Exception, typename... Rules >
+   inline constexpr bool enable_control< try_catch_type< Exception, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/until.hpp b/pxr/base/pegtl/pegtl/internal/until.hpp
new file mode 100644
index 0000000000..0bad8903c3
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/until.hpp
@@ -0,0 +1,88 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_UNTIL_HPP
+#define PXR_PEGTL_INTERNAL_UNTIL_HPP
+
+#include "../config.hpp"
+
+#include "bytes.hpp"
+#include "enable_control.hpp"
+#include "eof.hpp"
+#include "not_at.hpp"
+#include "seq.hpp"
+#include "star.hpp"
+
+#include "../apply_mode.hpp"
+#include "../rewind_mode.hpp"
+#include "../type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Cond, typename... Rules >
+   struct until
+      : until< Cond, seq< Rules... > >
+   {};
+
+   template< typename Cond >
+   struct until< Cond >
+   {
+      using rule_t = until;
+      using subs_t = type_list< Cond >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         auto m = in.template mark< M >();
+
+         while( !Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
+            if( in.empty() ) {
+               return false;
+            }
+            in.bump();
+         }
+         return m( true );
+      }
+   };
+
+   template< typename Cond, typename Rule >
+   struct until< Cond, Rule >
+   {
+      using rule_t = until;
+      using subs_t = type_list< Cond, Rule >;
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         auto m = in.template mark< M >();
+         using m_t = decltype( m );
+
+         while( !Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
+            if( !Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ) {
+               return false;
+            }
+         }
+         return m( true );
+      }
+   };
+
+   template< typename Cond, typename... Rules >
+   inline constexpr bool enable_control< until< Cond, Rules... > > = false;
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/internal/unwind_guard.hpp b/pxr/base/pegtl/pegtl/internal/unwind_guard.hpp
new file mode 100644
index 0000000000..e9811ae815
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/internal/unwind_guard.hpp
@@ -0,0 +1,39 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_INTERNAL_UNWIND_GUARD_HPP
+#define PXR_PEGTL_INTERNAL_UNWIND_GUARD_HPP
+
+#include "../config.hpp"
+
+#include <optional>
+#include <utility>
+
+namespace PXR_PEGTL_NAMESPACE::internal
+{
+   template< typename Unwind >
+   struct unwind_guard
+   {
+      explicit unwind_guard( Unwind&& unwind_impl )
+         : unwind( std::move( unwind_impl ) )
+      {}
+
+      ~unwind_guard()
+      {
+         if( unwind ) {
+            ( *unwind )();
+         }
+      }
+
+      unwind_guard( const unwind_guard& ) = delete;
+      unwind_guard( unwind_guard&& ) noexcept = delete;
+
+      unwind_guard& operator=( const unwind_guard& ) = delete;
+      unwind_guard& operator=( unwind_guard&& ) noexcept = delete;
+
+      std::optional< Unwind > unwind;
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE::internal
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/istream_input.hpp b/pxr/base/pegtl/pegtl/istream_input.hpp
new file mode 100644
index 0000000000..9924677f22
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/istream_input.hpp
@@ -0,0 +1,32 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_ISTREAM_INPUT_HPP
+#define PXR_PEGTL_ISTREAM_INPUT_HPP
+
+#include <istream>
+
+#include "buffer_input.hpp"
+#include "config.hpp"
+#include "eol.hpp"
+
+#include "internal/istream_reader.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename Eol = eol::lf_crlf, std::size_t Chunk = 64 >
+   struct istream_input
+      : buffer_input< internal::istream_reader, Eol, std::string, Chunk >
+   {
+      template< typename T >
+      istream_input( std::istream& in_stream, const std::size_t in_maximum, T&& in_source )
+         : buffer_input< internal::istream_reader, Eol, std::string, Chunk >( std::forward< T >( in_source ), in_maximum, in_stream )
+      {}
+   };
+
+   template< typename... Ts >
+   istream_input( Ts&&... ) -> istream_input<>;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/match.hpp b/pxr/base/pegtl/pegtl/match.hpp
new file mode 100644
index 0000000000..fc286497b8
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/match.hpp
@@ -0,0 +1,173 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_MATCH_HPP
+#define PXR_PEGTL_MATCH_HPP
+
+#include <type_traits>
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "nothing.hpp"
+#include "require_apply.hpp"
+#include "require_apply0.hpp"
+#include "rewind_mode.hpp"
+
+#include "internal/has_apply.hpp"
+#include "internal/has_apply0.hpp"
+#include "internal/has_unwind.hpp"
+#include "internal/marker.hpp"
+#include "internal/missing_apply.hpp"
+#include "internal/missing_apply0.hpp"
+#include "internal/unwind_guard.hpp"
+
+#if defined( _MSC_VER )
+#pragma warning( push )
+#pragma warning( disable : 4702 )
+#endif
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static auto match_no_control( ParseInput& in, States&&... st )
+         -> decltype( Rule::template match< A, M, Action, Control >( in, st... ) )
+      {
+         return Rule::template match< A, M, Action, Control >( in, st... );
+      }
+
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static auto match_no_control( ParseInput& in, States&&... /*unused*/ )
+         -> decltype( Rule::match( in ) )
+      {
+         return Rule::match( in );
+      }
+
+      template< typename Rule,
+                apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] auto match_control_unwind( ParseInput& in, States&&... st )
+      {
+#if defined( __cpp_exceptions )
+         if constexpr( has_unwind< Control< Rule >, void, const ParseInput&, States... > ) {
+            unwind_guard ug( [ & ] {
+               Control< Rule >::unwind( static_cast< const ParseInput& >( in ), st... );
+            } );
+            const auto result = match_no_control< Rule, A, M, Action, Control >( in, st... );
+            ug.unwind.reset();
+            return result;
+         }
+         else {
+            return match_no_control< Rule, A, M, Action, Control >( in, st... );
+         }
+#else
+         return match_no_control< Rule, A, M, Action, Control >( in, st... );
+#endif
+      }
+
+   }  // namespace internal
+
+   template< typename Rule,
+             apply_mode A,
+             rewind_mode M,
+             template< typename... >
+             class Action,
+             template< typename... >
+             class Control,
+             typename ParseInput,
+             typename... States >
+   [[nodiscard]] auto match( ParseInput& in, States&&... st )
+   {
+      if constexpr( !Control< Rule >::enable ) {
+         return internal::match_no_control< Rule, A, M, Action, Control >( in, st... );
+      }
+      else {
+         constexpr bool enable_action = ( A == apply_mode::action );
+
+         using iterator_t = typename ParseInput::iterator_t;
+         constexpr bool has_apply_void = enable_action && internal::has_apply< Control< Rule >, void, Action, const iterator_t&, const ParseInput&, States... >;
+         constexpr bool has_apply_bool = enable_action && internal::has_apply< Control< Rule >, bool, Action, const iterator_t&, const ParseInput&, States... >;
+         constexpr bool has_apply = has_apply_void || has_apply_bool;
+
+         constexpr bool has_apply0_void = enable_action && internal::has_apply0< Control< Rule >, void, Action, const ParseInput&, States... >;
+         constexpr bool has_apply0_bool = enable_action && internal::has_apply0< Control< Rule >, bool, Action, const ParseInput&, States... >;
+         constexpr bool has_apply0 = has_apply0_void || has_apply0_bool;
+
+         static_assert( !( has_apply && has_apply0 ), "both apply() and apply0() defined" );
+
+         constexpr bool is_nothing = std::is_base_of_v< nothing< Rule >, Action< Rule > >;
+         static_assert( !( has_apply && is_nothing ), "unexpected apply() defined" );
+         static_assert( !( has_apply0 && is_nothing ), "unexpected apply0() defined" );
+
+         if constexpr( !has_apply && std::is_base_of_v< require_apply, Action< Rule > > ) {
+            internal::missing_apply< Control< Rule >, Action >( in, st... );
+         }
+
+         if constexpr( !has_apply0 && std::is_base_of_v< require_apply0, Action< Rule > > ) {
+            internal::missing_apply0< Control< Rule >, Action >( in, st... );
+         }
+
+         constexpr bool validate_nothing = std::is_base_of_v< maybe_nothing, Action< void > >;
+         constexpr bool is_maybe_nothing = std::is_base_of_v< maybe_nothing, Action< Rule > >;
+         static_assert( !enable_action || !validate_nothing || is_nothing || is_maybe_nothing || has_apply || has_apply0, "either apply() or apply0() must be defined" );
+
+         constexpr bool use_marker = has_apply || has_apply0_bool;
+
+         auto m = in.template mark< ( use_marker ? rewind_mode::required : rewind_mode::dontcare ) >();
+         Control< Rule >::start( static_cast< const ParseInput& >( in ), st... );
+         auto result = internal::match_control_unwind< Rule, A, ( use_marker ? rewind_mode::active : M ), Action, Control >( in, st... );
+         if( result ) {
+            if constexpr( has_apply_void ) {
+               Control< Rule >::template apply< Action >( m.iterator(), static_cast< const ParseInput& >( in ), st... );
+            }
+            else if constexpr( has_apply_bool ) {
+               result = Control< Rule >::template apply< Action >( m.iterator(), static_cast< const ParseInput& >( in ), st... );
+            }
+            else if constexpr( has_apply0_void ) {
+               Control< Rule >::template apply0< Action >( static_cast< const ParseInput& >( in ), st... );
+            }
+            else if constexpr( has_apply0_bool ) {
+               result = Control< Rule >::template apply0< Action >( static_cast< const ParseInput& >( in ), st... );
+            }
+         }
+         if( result ) {
+            Control< Rule >::success( static_cast< const ParseInput& >( in ), st... );
+         }
+         else {
+            Control< Rule >::failure( static_cast< const ParseInput& >( in ), st... );
+         }
+         (void)m( result );
+         return result;
+      }
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#if defined( _MSC_VER )
+#pragma warning( pop )
+#endif
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/memory_input.hpp b/pxr/base/pegtl/pegtl/memory_input.hpp
new file mode 100644
index 0000000000..1213fedc00
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/memory_input.hpp
@@ -0,0 +1,378 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_MEMORY_INPUT_HPP
+#define PXR_PEGTL_MEMORY_INPUT_HPP
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <string>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+
+#include "config.hpp"
+#include "eol.hpp"
+#include "normal.hpp"
+#include "nothing.hpp"
+#include "position.hpp"
+#include "tracking_mode.hpp"
+
+#include "internal/action_input.hpp"
+#include "internal/at.hpp"
+#include "internal/bump.hpp"
+#include "internal/eolf.hpp"
+#include "internal/iterator.hpp"
+#include "internal/marker.hpp"
+#include "internal/until.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< tracking_mode, typename Eol, typename Source >
+      class memory_input_base;
+
+      template< typename Eol, typename Source >
+      class memory_input_base< tracking_mode::eager, Eol, Source >
+      {
+      public:
+         using iterator_t = internal::iterator;
+
+         template< typename T >
+         memory_input_base( const iterator_t& in_begin, const char* in_end, T&& in_source ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+            : m_begin( in_begin.data ),
+              m_current( in_begin ),
+              m_end( in_end ),
+              m_source( std::forward< T >( in_source ) )
+         {}
+
+         template< typename T >
+         memory_input_base( const char* in_begin, const char* in_end, T&& in_source ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+            : m_begin( in_begin ),
+              m_current( in_begin ),
+              m_end( in_end ),
+              m_source( std::forward< T >( in_source ) )
+         {}
+
+         memory_input_base( const memory_input_base& ) = delete;
+         memory_input_base( memory_input_base&& ) = delete;
+
+         ~memory_input_base() = default;
+
+         memory_input_base& operator=( const memory_input_base& ) = delete;
+         memory_input_base& operator=( memory_input_base&& ) = delete;
+
+         [[nodiscard]] const char* current() const noexcept
+         {
+            return m_current.data;
+         }
+
+         [[nodiscard]] const char* begin() const noexcept
+         {
+            return m_begin;
+         }
+
+         [[nodiscard]] const char* end( const std::size_t /*unused*/ = 0 ) const noexcept
+         {
+            return m_end;
+         }
+
+         [[nodiscard]] std::size_t byte() const noexcept
+         {
+            return m_current.byte;
+         }
+
+         [[nodiscard]] std::size_t line() const noexcept
+         {
+            return m_current.line;
+         }
+
+         [[nodiscard]] std::size_t column() const noexcept
+         {
+            return m_current.column;
+         }
+
+         void bump( const std::size_t in_count = 1 ) noexcept
+         {
+            internal::bump( m_current, in_count, Eol::ch );
+         }
+
+         void bump_in_this_line( const std::size_t in_count = 1 ) noexcept
+         {
+            internal::bump_in_this_line( m_current, in_count );
+         }
+
+         void bump_to_next_line( const std::size_t in_count = 1 ) noexcept
+         {
+            internal::bump_to_next_line( m_current, in_count );
+         }
+
+         [[nodiscard]] PXR_PEGTL_NAMESPACE::position position( const iterator_t& it ) const
+         {
+            return PXR_PEGTL_NAMESPACE::position( it, m_source );
+         }
+
+         void restart( const std::size_t in_byte = 0, const std::size_t in_line = 1, const std::size_t in_column = 1 )
+         {
+            assert( in_line != 0 );
+            assert( in_column != 0 );
+
+            m_current.data = m_begin;
+            m_current.byte = in_byte;
+            m_current.line = in_line;
+            m_current.column = in_column;
+            private_depth = 0;
+         }
+
+      protected:
+         const char* const m_begin;
+         iterator_t m_current;
+         const char* m_end;
+         const Source m_source;
+
+      public:
+         std::size_t private_depth = 0;
+      };
+
+      template< typename Eol, typename Source >
+      class memory_input_base< tracking_mode::lazy, Eol, Source >
+      {
+      public:
+         using iterator_t = const char*;
+
+         template< typename T >
+         memory_input_base( const internal::iterator& in_begin, const char* in_end, T&& in_source ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+            : m_begin( in_begin ),
+              m_current( in_begin.data ),
+              m_end( in_end ),
+              m_source( std::forward< T >( in_source ) )
+         {}
+
+         template< typename T >
+         memory_input_base( const char* in_begin, const char* in_end, T&& in_source ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+            : m_begin( in_begin ),
+              m_current( in_begin ),
+              m_end( in_end ),
+              m_source( std::forward< T >( in_source ) )
+         {}
+
+         memory_input_base( const memory_input_base& ) = delete;
+         memory_input_base( memory_input_base&& ) = delete;
+
+         ~memory_input_base() = default;
+
+         memory_input_base& operator=( const memory_input_base& ) = delete;
+         memory_input_base& operator=( memory_input_base&& ) = delete;
+
+         [[nodiscard]] const char* current() const noexcept
+         {
+            return m_current;
+         }
+
+         [[nodiscard]] const char* begin() const noexcept
+         {
+            return m_begin.data;
+         }
+
+         [[nodiscard]] const char* end( const std::size_t /*unused*/ = 0 ) const noexcept
+         {
+            return m_end;
+         }
+
+         [[nodiscard]] std::size_t byte() const noexcept
+         {
+            return std::size_t( current() - m_begin.data );
+         }
+
+         void bump( const std::size_t in_count = 1 ) noexcept
+         {
+            m_current += in_count;
+         }
+
+         void bump_in_this_line( const std::size_t in_count = 1 ) noexcept
+         {
+            m_current += in_count;
+         }
+
+         void bump_to_next_line( const std::size_t in_count = 1 ) noexcept
+         {
+            m_current += in_count;
+         }
+
+         [[nodiscard]] PXR_PEGTL_NAMESPACE::position position( const iterator_t it ) const
+         {
+            internal::iterator c( m_begin );
+            internal::bump( c, std::size_t( it - m_begin.data ), Eol::ch );
+            return PXR_PEGTL_NAMESPACE::position( c, m_source );
+         }
+
+         void restart()
+         {
+            m_current = m_begin.data;
+            private_depth = 0;
+         }
+
+      protected:
+         const internal::iterator m_begin;
+         iterator_t m_current;
+         const char* m_end;
+         const Source m_source;
+
+      public:
+         std::size_t private_depth = 0;
+      };
+
+   }  // namespace internal
+
+   template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf, typename Source = std::string >
+   class memory_input
+      : public internal::memory_input_base< P, Eol, Source >
+   {
+   public:
+      static constexpr tracking_mode tracking_mode_v = P;
+
+      using eol_t = Eol;
+      using source_t = Source;
+
+      using typename internal::memory_input_base< P, Eol, Source >::iterator_t;
+
+      using action_t = internal::action_input< memory_input >;
+
+      using internal::memory_input_base< P, Eol, Source >::memory_input_base;
+
+      template< typename T >
+      memory_input( const char* in_begin, const std::size_t in_size, T&& in_source ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+         : memory_input( in_begin, in_begin + in_size, std::forward< T >( in_source ) )
+      {}
+
+      template< typename T >
+      memory_input( const std::string& in_string, T&& in_source ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+         : memory_input( in_string.data(), in_string.size(), std::forward< T >( in_source ) )
+      {}
+
+      template< typename T >
+      memory_input( const std::string_view in_string, T&& in_source ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+         : memory_input( in_string.data(), in_string.size(), std::forward< T >( in_source ) )
+      {}
+
+      template< typename T >
+      memory_input( std::string&&, T&& ) = delete;
+
+      template< typename T >
+      memory_input( const char* in_begin, T&& in_source ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+         : memory_input( in_begin, std::strlen( in_begin ), std::forward< T >( in_source ) )
+      {}
+
+      template< typename T >
+      memory_input( const char* in_begin, const char* in_end, T&& in_source, const std::size_t in_byte, const std::size_t in_line, const std::size_t in_column ) noexcept( std::is_nothrow_constructible_v< Source, T&& > )
+         : memory_input( { in_begin, in_byte, in_line, in_column }, in_end, std::forward< T >( in_source ) )
+      {}
+
+      memory_input( const memory_input& ) = delete;
+      memory_input( memory_input&& ) = delete;
+
+      ~memory_input() = default;
+
+      memory_input& operator=( const memory_input& ) = delete;
+      memory_input& operator=( memory_input&& ) = delete;
+
+      [[nodiscard]] const Source& source() const noexcept
+      {
+         return this->m_source;
+      }
+
+      [[nodiscard]] bool empty() const noexcept
+      {
+         return this->current() == this->end();
+      }
+
+      [[nodiscard]] std::size_t size( const std::size_t /*unused*/ = 0 ) const noexcept
+      {
+         return std::size_t( this->end() - this->current() );
+      }
+
+      [[nodiscard]] char peek_char( const std::size_t offset = 0 ) const noexcept
+      {
+         return this->current()[ offset ];
+      }
+
+      [[nodiscard]] std::uint8_t peek_uint8( const std::size_t offset = 0 ) const noexcept
+      {
+         return static_cast< std::uint8_t >( peek_char( offset ) );
+      }
+
+      [[nodiscard]] iterator_t& iterator() noexcept
+      {
+         return this->m_current;
+      }
+
+      [[nodiscard]] const iterator_t& iterator() const noexcept
+      {
+         return this->m_current;
+      }
+
+      using internal::memory_input_base< P, Eol, Source >::restart;
+
+      template< rewind_mode M >
+      void restart( const internal::marker< iterator_t, M >& m ) noexcept
+      {
+         iterator() = m.iterator();
+      }
+
+      using internal::memory_input_base< P, Eol, Source >::position;
+
+      [[nodiscard]] PXR_PEGTL_NAMESPACE::position position() const
+      {
+         return position( iterator() );
+      }
+
+      void discard() const noexcept {}
+
+      void require( const std::size_t /*unused*/ ) const noexcept {}
+
+      template< rewind_mode M >
+      [[nodiscard]] internal::marker< iterator_t, M > mark() noexcept
+      {
+         return internal::marker< iterator_t, M >( iterator() );
+      }
+
+      [[nodiscard]] const char* at( const PXR_PEGTL_NAMESPACE::position& p ) const noexcept
+      {
+         return this->begin() + p.byte;
+      }
+
+      [[nodiscard]] const char* begin_of_line( const PXR_PEGTL_NAMESPACE::position& p ) const noexcept
+      {
+         return at( p ) - ( p.column - 1 );
+      }
+
+      [[nodiscard]] const char* end_of_line( const PXR_PEGTL_NAMESPACE::position& p ) const noexcept
+      {
+         using input_t = memory_input< tracking_mode::lazy, Eol, const char* >;
+         input_t in( at( p ), this->end(), "" );
+         using grammar = internal::until< internal::at< internal::eolf > >;
+         (void)normal< grammar >::match< apply_mode::nothing, rewind_mode::dontcare, nothing, normal >( in );
+         return in.current();
+      }
+
+      [[nodiscard]] std::string_view line_at( const PXR_PEGTL_NAMESPACE::position& p ) const noexcept
+      {
+         const char* b = begin_of_line( p );
+         return std::string_view( b, static_cast< std::size_t >( end_of_line( p ) - b ) );
+      }
+
+      void private_set_end( const char* new_end ) noexcept
+      {
+         this->m_end = new_end;
+      }
+   };
+
+   template< typename... Ts >
+   memory_input( Ts&&... ) -> memory_input<>;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/mmap_input.hpp b/pxr/base/pegtl/pegtl/mmap_input.hpp
new file mode 100644
index 0000000000..a927fe70a5
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/mmap_input.hpp
@@ -0,0 +1,79 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_MMAP_INPUT_HPP
+#define PXR_PEGTL_MMAP_INPUT_HPP
+
+#include <string>
+
+#include "config.hpp"
+#include "eol.hpp"
+#include "memory_input.hpp"
+#include "tracking_mode.hpp"
+
+#include "internal/filesystem.hpp"
+#include "internal/path_to_string.hpp"
+
+#if defined( __unix__ ) || ( defined( __APPLE__ ) && defined( __MACH__ ) )
+#include <unistd.h>  // Required for _POSIX_MAPPED_FILES
+#endif
+
+#if defined( _POSIX_MAPPED_FILES )
+#include "internal/file_mapper_posix.hpp"
+#elif defined( _WIN32 )
+#include "internal/file_mapper_win32.hpp"
+#else
+#endif
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      struct mmap_holder
+      {
+         const file_mapper data;
+
+         explicit mmap_holder( const internal::filesystem::path& path )
+            : data( path )
+         {}
+
+         mmap_holder( const mmap_holder& ) = delete;
+         mmap_holder( mmap_holder&& ) = delete;
+
+         ~mmap_holder() = default;
+
+         mmap_holder& operator=( const mmap_holder& ) = delete;
+         mmap_holder& operator=( mmap_holder&& ) = delete;
+      };
+
+   }  // namespace internal
+
+   template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
+   struct mmap_input
+      : private internal::mmap_holder,
+        public memory_input< P, Eol >
+   {
+      mmap_input( const internal::filesystem::path& path, const std::string& source )
+         : internal::mmap_holder( path ),
+           memory_input< P, Eol >( data.begin(), data.end(), source )
+      {}
+
+      explicit mmap_input( const internal::filesystem::path& path )
+         : mmap_input( path, internal::path_to_string( path ) )
+      {}
+
+      mmap_input( const mmap_input& ) = delete;
+      mmap_input( mmap_input&& ) = delete;
+
+      ~mmap_input() = default;
+
+      mmap_input& operator=( const mmap_input& ) = delete;
+      mmap_input& operator=( mmap_input&& ) = delete;
+   };
+
+   template< typename... Ts >
+   explicit mmap_input( Ts&&... ) -> mmap_input<>;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/must_if.hpp b/pxr/base/pegtl/pegtl/must_if.hpp
new file mode 100644
index 0000000000..65ceea7fce
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/must_if.hpp
@@ -0,0 +1,69 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_MUST_IF_HPP
+#define PXR_PEGTL_MUST_IF_HPP
+
+#if !defined( __cpp_exceptions )
+#error "Exception support required for tao/pegtl/internal/must.hpp"
+#else
+
+#include <type_traits>
+
+#include "config.hpp"
+#include "normal.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename Errors, typename Rule, typename = void >
+      inline constexpr bool raise_on_failure = ( Errors::template message< Rule > != nullptr );
+
+      template< typename Errors, typename Rule >
+      inline constexpr bool raise_on_failure< Errors, Rule, std::void_t< decltype( Errors::template raise_on_failure< Rule > ) > > = Errors::template raise_on_failure< Rule >;
+
+   }  // namespace internal
+
+   template< typename Errors, template< typename... > class Base = normal, bool RequireMessage = true >
+   struct must_if
+   {
+      template< typename Rule >
+      struct control
+         : Base< Rule >
+      {
+         template< typename ParseInput, typename... States >
+         static void failure( const ParseInput& in, States&&... st ) noexcept( noexcept( Base< Rule >::failure( in, st... ) ) && !internal::raise_on_failure< Errors, Rule > )
+         {
+            if constexpr( internal::raise_on_failure< Errors, Rule > ) {
+               raise( in, st... );
+            }
+            else {
+               Base< Rule >::failure( in, st... );
+            }
+         }
+
+         template< typename ParseInput, typename... States >
+         [[noreturn]] static void raise( const ParseInput& in, [[maybe_unused]] States&&... st )
+         {
+            if constexpr( RequireMessage ) {
+               static_assert( Errors::template message< Rule > != nullptr );
+            }
+            if constexpr( Errors::template message< Rule > != nullptr ) {
+               constexpr const char* p = Errors::template message< Rule >;
+               throw parse_error( p, in );
+#if defined( _MSC_VER )
+               ( (void)st, ... );
+#endif
+            }
+            else {
+               Base< Rule >::raise( in, st... );
+            }
+         }
+      };
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
+#endif
diff --git a/pxr/base/pegtl/pegtl/normal.hpp b/pxr/base/pegtl/pegtl/normal.hpp
new file mode 100644
index 0000000000..6983c77bec
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/normal.hpp
@@ -0,0 +1,99 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_NORMAL_HPP
+#define PXR_PEGTL_NORMAL_HPP
+
+#include <string>
+#include <type_traits>
+#include <utility>
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "match.hpp"
+#include "parse_error.hpp"
+#include "rewind_mode.hpp"
+
+#include "internal/enable_control.hpp"
+#include "internal/has_match.hpp"
+
+#if defined( __cpp_exceptions )
+#include "demangle.hpp"
+#else
+#include "internal/dependent_false.hpp"
+#include <exception>
+#endif
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename Rule >
+   struct normal
+   {
+      static constexpr bool enable = internal::enable_control< Rule >;
+
+      template< typename ParseInput, typename... States >
+      static void start( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+      {}
+
+      template< typename ParseInput, typename... States >
+      static void success( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+      {}
+
+      template< typename ParseInput, typename... States >
+      static void failure( const ParseInput& /*unused*/, States&&... /*unused*/ ) noexcept
+      {}
+
+      template< typename ParseInput, typename... States >
+      [[noreturn]] static void raise( const ParseInput& in, States&&... /*unused*/ )
+      {
+#if defined( __cpp_exceptions )
+         throw parse_error( "parse error matching " + std::string( demangle< Rule >() ), in );
+#else
+         static_assert( internal::dependent_false< Rule >, "exception support required for normal< Rule >::raise()" );
+         (void)in;
+         std::terminate();
+#endif
+      }
+
+      template< template< typename... > class Action,
+                typename Iterator,
+                typename ParseInput,
+                typename... States >
+      static auto apply( const Iterator& begin, const ParseInput& in, States&&... st ) noexcept( noexcept( Action< Rule >::apply( std::declval< const typename ParseInput::action_t& >(), st... ) ) )
+         -> decltype( Action< Rule >::apply( std::declval< const typename ParseInput::action_t& >(), st... ) )
+      {
+         const typename ParseInput::action_t action_input( begin, in );
+         return Action< Rule >::apply( action_input, st... );
+      }
+
+      template< template< typename... > class Action,
+                typename ParseInput,
+                typename... States >
+      static auto apply0( const ParseInput& /*unused*/, States&&... st ) noexcept( noexcept( Action< Rule >::apply0( st... ) ) )
+         -> decltype( Action< Rule >::apply0( st... ) )
+      {
+         return Action< Rule >::apply0( st... );
+      }
+
+      template< apply_mode A,
+                rewind_mode M,
+                template< typename... >
+                class Action,
+                template< typename... >
+                class Control,
+                typename ParseInput,
+                typename... States >
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
+      {
+         if constexpr( internal::has_match< bool, Rule, A, M, Action, Control, ParseInput, States... > ) {
+            return Action< Rule >::template match< Rule, A, M, Action, Control >( in, st... );
+         }
+         else {
+            return PXR_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
+         }
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/nothing.hpp b/pxr/base/pegtl/pegtl/nothing.hpp
new file mode 100644
index 0000000000..b30d947157
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/nothing.hpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_NOTHING_HPP
+#define PXR_PEGTL_NOTHING_HPP
+
+#include "config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename Rule >
+   struct nothing
+   {};
+
+   using maybe_nothing = nothing< void >;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/parse.hpp b/pxr/base/pegtl/pegtl/parse.hpp
new file mode 100644
index 0000000000..20b857b8f4
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/parse.hpp
@@ -0,0 +1,72 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_PARSE_HPP
+#define PXR_PEGTL_PARSE_HPP
+
+#include <type_traits>
+
+#include "apply_mode.hpp"
+#include "config.hpp"
+#include "normal.hpp"
+#include "nothing.hpp"
+#include "parse_error.hpp"
+#include "position.hpp"
+#include "rewind_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      [[nodiscard]] inline auto get_position( const position& p ) noexcept( std::is_nothrow_copy_constructible_v< position > )
+      {
+         return p;
+      }
+
+      template< typename ParseInput >
+      [[nodiscard]] position get_position( const ParseInput& in ) noexcept( noexcept( position( in.position() ) ) )
+      {
+         return in.position();
+      }
+
+   }  // namespace internal
+
+   template< typename Rule,
+             template< typename... > class Action = nothing,
+             template< typename... > class Control = normal,
+             apply_mode A = apply_mode::action,
+             rewind_mode M = rewind_mode::required,
+             typename ParseInput,
+             typename... States >
+   auto parse( ParseInput&& in, States&&... st )
+   {
+      return Control< Rule >::template match< A, M, Action, Control >( in, st... );
+   }
+
+   template< typename Rule,
+             template< typename... > class Action = nothing,
+             template< typename... > class Control = normal,
+             apply_mode A = apply_mode::action,
+             rewind_mode M = rewind_mode::required,
+             typename Outer,
+             typename ParseInput,
+             typename... States >
+   auto parse_nested( const Outer& o, ParseInput&& in, States&&... st )
+   {
+#if defined( __cpp_exceptions )
+      try {
+         return parse< Rule, Action, Control, A, M >( in, st... );
+      }
+      catch( parse_error& e ) {
+         e.add_position( internal::get_position( o ) );
+         throw;
+      }
+#else
+      (void)o;
+      return parse< Rule, Action, Control, A, M >( in, st... );
+#endif
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/parse_error.hpp b/pxr/base/pegtl/pegtl/parse_error.hpp
new file mode 100644
index 0000000000..3e5b9175ad
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/parse_error.hpp
@@ -0,0 +1,119 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_PARSE_ERROR_HPP
+#define PXR_PEGTL_PARSE_ERROR_HPP
+
+#include <cstddef>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+#include "config.hpp"
+#include "position.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      class parse_error
+      {
+      private:
+         std::string m_msg;
+         std::size_t m_prefix = 0;
+         std::vector< position > m_positions;
+
+      public:
+         explicit parse_error( const char* msg )
+            : m_msg( msg )
+         {}
+
+         [[nodiscard]] const char* what() const noexcept
+         {
+            return m_msg.c_str();
+         }
+
+         [[nodiscard]] std::string_view message() const noexcept
+         {
+            return { m_msg.data() + m_prefix, m_msg.size() - m_prefix };
+         }
+
+         [[nodiscard]] const std::vector< position >& positions() const noexcept
+         {
+            return m_positions;
+         }
+
+         void add_position( position&& p )
+         {
+            const auto prefix = to_string( p );
+            m_msg = prefix + ": " + m_msg;
+            m_prefix += prefix.size() + 2;
+            m_positions.emplace_back( std::move( p ) );
+         }
+      };
+
+   }  // namespace internal
+
+   class parse_error
+      : public std::runtime_error
+   {
+   private:
+      std::shared_ptr< internal::parse_error > m_impl;
+
+   public:
+      parse_error( const char* msg, position p )
+         : std::runtime_error( msg ),
+           m_impl( std::make_shared< internal::parse_error >( msg ) )
+      {
+         m_impl->add_position( std::move( p ) );
+      }
+
+      parse_error( const std::string& msg, position p )
+         : parse_error( msg.c_str(), std::move( p ) )
+      {}
+
+      template< typename ParseInput >
+      parse_error( const char* msg, const ParseInput& in )
+         : parse_error( msg, in.position() )
+      {}
+
+      template< typename ParseInput >
+      parse_error( const std::string& msg, const ParseInput& in )
+         : parse_error( msg, in.position() )
+      {}
+
+      [[nodiscard]] const char* what() const noexcept override
+      {
+         return m_impl->what();
+      }
+
+      [[nodiscard]] std::string_view message() const noexcept
+      {
+         return m_impl->message();
+      }
+
+      [[nodiscard]] const std::vector< position >& positions() const noexcept
+      {
+         return m_impl->positions();
+      }
+
+      void add_position( position&& p )
+      {
+         if( m_impl.use_count() > 1 ) {
+            m_impl = std::make_shared< internal::parse_error >( *m_impl );
+         }
+         m_impl->add_position( std::move( p ) );
+      }
+
+      void add_position( const position& p )
+      {
+         add_position( position( p ) );
+      }
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/position.hpp b/pxr/base/pegtl/pegtl/position.hpp
new file mode 100644
index 0000000000..7793fc5403
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/position.hpp
@@ -0,0 +1,98 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_POSITION_HPP
+#define PXR_PEGTL_POSITION_HPP
+
+#include <cstdlib>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <utility>
+
+#include "config.hpp"
+
+#include "internal/iterator.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct position
+   {
+      position() = delete;
+
+#if defined( __GNUC__ ) && !defined( __clang__ )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+      position( position&& p ) noexcept
+         : byte( p.byte ),
+           line( p.line ),
+           column( p.column ),
+           source( std::move( p.source ) )
+      {}
+#if defined( __GNUC__ ) && !defined( __clang__ )
+#pragma GCC diagnostic pop
+#endif
+
+      position( const position& ) = default;
+
+      position& operator=( position&& p ) noexcept
+      {
+         byte = p.byte;
+         line = p.line;
+         column = p.column;
+         source = std::move( p.source );
+         return *this;
+      }
+
+      position& operator=( const position& ) = default;
+
+      template< typename T >
+      position( const internal::iterator& in_iter, T&& in_source )
+         : byte( in_iter.byte ),
+           line( in_iter.line ),
+           column( in_iter.column ),
+           source( std::forward< T >( in_source ) )
+      {}
+
+      template< typename T >
+      position( const std::size_t in_byte, const std::size_t in_line, const std::size_t in_column, T&& in_source )
+         : byte( in_byte ),
+           line( in_line ),
+           column( in_column ),
+           source( in_source )
+      {}
+
+      ~position() = default;
+
+      std::size_t byte;
+      std::size_t line;
+      std::size_t column;
+      std::string source;
+   };
+
+   inline bool operator==( const position& lhs, const position& rhs ) noexcept
+   {
+      return ( lhs.byte == rhs.byte ) && ( lhs.source == rhs.source );
+   }
+
+   inline bool operator!=( const position& lhs, const position& rhs ) noexcept
+   {
+      return !( lhs == rhs );
+   }
+
+   inline std::ostream& operator<<( std::ostream& os, const position& p )
+   {
+      return os << p.source << ':' << p.line << ':' << p.column;
+   }
+
+   [[nodiscard]] inline std::string to_string( const position& p )
+   {
+      std::ostringstream oss;
+      oss << p;
+      return std::move( oss ).str();
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/read_input.hpp b/pxr/base/pegtl/pegtl/read_input.hpp
new file mode 100644
index 0000000000..a899cbd072
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/read_input.hpp
@@ -0,0 +1,54 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_READ_INPUT_HPP
+#define PXR_PEGTL_READ_INPUT_HPP
+
+#include <string>
+
+#include "config.hpp"
+#include "eol.hpp"
+#include "string_input.hpp"
+#include "tracking_mode.hpp"
+
+#include "internal/file_reader.hpp"
+#include "internal/filesystem.hpp"
+#include "internal/path_to_string.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
+   struct read_input
+      : string_input< P, Eol >
+   {
+      read_input( const internal::filesystem::path& path, const std::string& source )
+         : string_input< P, Eol >( internal::file_reader( path ).read(), source )
+      {}
+
+      explicit read_input( const internal::filesystem::path& path )
+         : read_input( path, internal::path_to_string( path ) )
+      {}
+
+      read_input( FILE* file, const internal::filesystem::path& path, const std::string& source )
+         : string_input< P, Eol >( internal::file_reader( file, path ).read(), source )
+      {}
+
+      read_input( FILE* file, const internal::filesystem::path& path )
+         : read_input( file, path, internal::path_to_string( path ) )
+      {}
+
+      read_input( const read_input& ) = delete;
+      read_input( read_input&& ) = delete;
+
+      ~read_input() = default;
+
+      read_input& operator=( const read_input& ) = delete;
+      read_input& operator=( read_input&& ) = delete;
+   };
+
+   template< typename... Ts >
+   explicit read_input( Ts&&... ) -> read_input<>;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/require_apply.hpp b/pxr/base/pegtl/pegtl/require_apply.hpp
new file mode 100644
index 0000000000..8eb3a52476
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/require_apply.hpp
@@ -0,0 +1,16 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_REQUIRE_APPLY_HPP
+#define PXR_PEGTL_REQUIRE_APPLY_HPP
+
+#include "config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct require_apply
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/require_apply0.hpp b/pxr/base/pegtl/pegtl/require_apply0.hpp
new file mode 100644
index 0000000000..93c849d521
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/require_apply0.hpp
@@ -0,0 +1,16 @@
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_REQUIRE_APPLY0_HPP
+#define PXR_PEGTL_REQUIRE_APPLY0_HPP
+
+#include "config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   struct require_apply0
+   {};
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/rewind_mode.hpp b/pxr/base/pegtl/pegtl/rewind_mode.hpp
new file mode 100644
index 0000000000..904ebff51f
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/rewind_mode.hpp
@@ -0,0 +1,20 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_REWIND_MODE_HPP
+#define PXR_PEGTL_REWIND_MODE_HPP
+
+#include "config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   enum class rewind_mode : char
+   {
+      active,
+      required,
+      dontcare
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/rules.hpp b/pxr/base/pegtl/pegtl/rules.hpp
new file mode 100644
index 0000000000..8e5ee7b9d8
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/rules.hpp
@@ -0,0 +1,71 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_RULES_HPP
+#define PXR_PEGTL_RULES_HPP
+
+#include "config.hpp"
+#include "parse_error.hpp"
+
+#include "internal/rules.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   // clang-format off
+   template< template< typename... > class Action, typename... Rules > struct action : internal::action< Action, Rules... > {};
+   template< typename... Actions > struct apply : internal::apply< Actions... > {};
+   template< typename... Actions > struct apply0 : internal::apply0< Actions... > {};
+   template< typename... Rules > struct at : internal::at< Rules... > {};
+   struct bof : internal::bof {};
+   struct bol : internal::bol {};
+   template< unsigned Num > struct bytes : internal::bytes< Num > {};
+   template< template< typename... > class Control, typename... Rules > struct control : internal::control< Control, Rules... > {};
+   template< typename... Rules > struct disable : internal::disable< Rules... > {};
+   struct discard : internal::discard {};
+   template< typename... Rules > struct enable : internal::enable< Rules... > {};
+   struct eof : internal::eof {};
+   struct eolf : internal::eolf {};
+   struct failure : internal::failure {};
+   template< typename Rule, typename... Actions > struct if_apply : internal::if_apply< Rule, Actions... > {};
+   template< typename Cond, typename Then, typename Else > struct if_then_else : internal::if_then_else< Cond, Then, Else > {};
+   template< typename Rule, typename Sep, typename Pad = void > struct list : internal::list< Rule, internal::pad< Sep, Pad > > {};
+   template< typename Rule, typename Sep > struct list< Rule, Sep, void > : internal::list< Rule, Sep > {};
+   template< typename Rule, typename Sep, typename Pad = void > struct list_tail : internal::list_tail_pad< Rule, Sep, Pad > {};
+   template< typename Rule, typename Sep > struct list_tail< Rule, Sep, void > : internal::list_tail< Rule, Sep > {};
+   template< typename M, typename S > struct minus : internal::minus< M, S > {};
+   template< typename... Rules > struct not_at : internal::not_at< Rules... > {};
+   template< typename... Rules > struct opt : internal::opt< Rules... > {};
+   template< typename Rule, typename Pad1, typename Pad2 = Pad1 > struct pad : internal::pad< Rule, Pad1, Pad2 > {};
+   template< typename Rule, typename Pad > struct pad_opt : internal::pad_opt< Rule, Pad > {};
+   template< typename Rule, typename... Rules > struct plus : internal::plus< Rule, Rules... > {};
+   template< typename Head, typename... Rules > struct rematch : internal::rematch< Head, Rules... > {};
+   template< unsigned Num, typename... Rules > struct rep : internal::rep< Num, Rules... > {};
+   template< unsigned Max, typename... Rules > struct rep_max : internal::rep_min_max< 0, Max, Rules... > {};
+   template< unsigned Min, typename Rule, typename... Rules > struct rep_min : internal::rep_min< Min, Rule, Rules... > {};
+   template< unsigned Min, unsigned Max, typename... Rules > struct rep_min_max : internal::rep_min_max< Min, Max, Rules... > {};
+   template< unsigned Max, typename... Rules > struct rep_opt : internal::rep_opt< Max, Rules... > {};
+   template< unsigned Amount > struct require : internal::require< Amount > {};
+   template< typename... Rules > struct seq : internal::seq< Rules... > {};
+   template< typename... Rules > struct sor : internal::sor< Rules... > {};
+   template< typename Rule, typename... Rules > struct star : internal::star< Rule, Rules... > {};
+   template< typename State, typename... Rules > struct state : internal::state< State, Rules... > {};
+   struct success : internal::success {};
+   template< typename Cond, typename... Rules > struct until : internal::until< Cond, Rules... > {};
+
+#if defined( __cpp_exceptions )
+   template< typename Cond, typename... Thens > struct if_must : internal::if_must< false, Cond, Thens... > {};
+   template< typename Cond, typename Then, typename Else > struct if_must_else : internal::if_must_else< Cond, Then, Else > {};
+   template< typename Rule, typename Sep, typename Pad = void > struct list_must : internal::list_must< Rule, internal::pad< Sep, Pad > > {};
+   template< typename Rule, typename Sep > struct list_must< Rule, Sep, void > : internal::list_must< Rule, Sep > {};
+   template< typename... Rules > struct must : internal::must< Rules... > {};
+   template< typename Cond, typename... Rules > struct opt_must : internal::if_must< true, Cond, Rules... > {};
+   template< typename Exception > struct raise : internal::raise< Exception > {};
+   template< typename Cond, typename... Rules > struct star_must : internal::star_must< Cond, Rules... > {};
+   template< typename... Rules > struct try_catch : internal::try_catch_type< parse_error, Rules... > {};
+   template< typename Exception, typename... Rules > struct try_catch_type : internal::seq< internal::try_catch_type< Exception, Rules... > > {};
+#endif
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/string_input.hpp b/pxr/base/pegtl/pegtl/string_input.hpp
new file mode 100644
index 0000000000..7ee8e4e3c1
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/string_input.hpp
@@ -0,0 +1,64 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_STRING_INPUT_HPP
+#define PXR_PEGTL_STRING_INPUT_HPP
+
+#include <string>
+#include <utility>
+
+#include "config.hpp"
+#include "eol.hpp"
+#include "memory_input.hpp"
+#include "tracking_mode.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      struct string_holder
+      {
+         const std::string data;
+
+         template< typename T >
+         explicit string_holder( T&& in_data )
+            : data( std::forward< T >( in_data ) )
+         {}
+
+         string_holder( const string_holder& ) = delete;
+         string_holder( string_holder&& ) = delete;
+
+         ~string_holder() = default;
+
+         string_holder& operator=( const string_holder& ) = delete;
+         string_holder& operator=( string_holder&& ) = delete;
+      };
+
+   }  // namespace internal
+
+   template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf, typename Source = std::string >
+   struct string_input
+      : private internal::string_holder,
+        public memory_input< P, Eol, Source >
+   {
+      template< typename V, typename T, typename... Ts >
+      explicit string_input( V&& in_data, T&& in_source, Ts&&... ts )
+         : internal::string_holder( std::forward< V >( in_data ) ),
+           memory_input< P, Eol, Source >( data.data(), data.size(), std::forward< T >( in_source ), std::forward< Ts >( ts )... )
+      {}
+
+      string_input( const string_input& ) = delete;
+      string_input( string_input&& ) = delete;
+
+      ~string_input() = default;
+
+      string_input& operator=( const string_input& ) = delete;
+      string_input& operator=( string_input&& ) = delete;
+   };
+
+   template< typename... Ts >
+   explicit string_input( Ts&&... ) -> string_input<>;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/tracking_mode.hpp b/pxr/base/pegtl/pegtl/tracking_mode.hpp
new file mode 100644
index 0000000000..9a35812a8b
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/tracking_mode.hpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_TRACKING_MODE_HPP
+#define PXR_PEGTL_TRACKING_MODE_HPP
+
+#include "config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   enum class tracking_mode : bool
+   {
+      eager,
+      lazy
+   };
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/type_list.hpp b/pxr/base/pegtl/pegtl/type_list.hpp
new file mode 100644
index 0000000000..d5e5d782be
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/type_list.hpp
@@ -0,0 +1,46 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_TYPE_LIST_HPP
+#define PXR_PEGTL_TYPE_LIST_HPP
+
+#include <cstddef>
+
+#include "config.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   template< typename... Ts >
+   struct type_list
+   {
+      static constexpr std::size_t size = sizeof...( Ts );
+   };
+
+   using empty_list = type_list<>;
+
+   template< typename... >
+   struct type_list_concat;
+
+   template<>
+   struct type_list_concat<>
+   {
+      using type = empty_list;
+   };
+
+   template< typename... Ts >
+   struct type_list_concat< type_list< Ts... > >
+   {
+      using type = type_list< Ts... >;
+   };
+
+   template< typename... T0s, typename... T1s, typename... Ts >
+   struct type_list_concat< type_list< T0s... >, type_list< T1s... >, Ts... >
+      : type_list_concat< type_list< T0s..., T1s... >, Ts... >
+   {};
+
+   template< typename... Ts >
+   using type_list_concat_t = typename type_list_concat< Ts... >::type;
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/utf8.hpp b/pxr/base/pegtl/pegtl/utf8.hpp
new file mode 100644
index 0000000000..e7dc3d81b1
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/utf8.hpp
@@ -0,0 +1,28 @@
+// Copyright (c) 2014-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_UTF8_HPP
+#define PXR_PEGTL_UTF8_HPP
+
+#include "config.hpp"
+
+#include "internal/peek_utf8.hpp"
+#include "internal/result_on_found.hpp"
+#include "internal/rules.hpp"
+
+namespace PXR_PEGTL_NAMESPACE::utf8
+{
+   // clang-format off
+   struct any : internal::any< internal::peek_utf8 > {};
+   struct bom : internal::one< internal::result_on_found::success, internal::peek_utf8, 0xfeff > {};  // Lemon curry?
+   template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf8, Cs... > {};
+   template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf8, Lo, Hi > {};
+   template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf8, Cs... > {};
+   template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf8, Lo, Hi > {};
+   template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf8, Cs... > {};
+   template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf8, Cs >... > {};
+   // clang-format on
+
+}  // namespace PXR_PEGTL_NAMESPACE::utf8
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/version.hpp b/pxr/base/pegtl/pegtl/version.hpp
new file mode 100644
index 0000000000..a6ae6aee09
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/version.hpp
@@ -0,0 +1,13 @@
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_VERSION_HPP
+#define PXR_PEGTL_VERSION_HPP
+
+#define PXR_PEGTL_VERSION "3.2.7"
+
+#define PXR_PEGTL_VERSION_MAJOR 3
+#define PXR_PEGTL_VERSION_MINOR 2
+#define PXR_PEGTL_VERSION_PATCH 7
+
+#endif
diff --git a/pxr/base/pegtl/pegtl/visit.hpp b/pxr/base/pegtl/pegtl/visit.hpp
new file mode 100644
index 0000000000..dc0a6f61e8
--- /dev/null
+++ b/pxr/base/pegtl/pegtl/visit.hpp
@@ -0,0 +1,80 @@
+// Copyright (c) 2020-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef PXR_PEGTL_VISIT_HPP
+#define PXR_PEGTL_VISIT_HPP
+
+#include <type_traits>
+
+#include "config.hpp"
+#include "type_list.hpp"
+
+namespace PXR_PEGTL_NAMESPACE
+{
+   namespace internal
+   {
+      template< typename Type, typename... Types >
+      inline constexpr bool contains_v = ( std::is_same_v< Type, Types > || ... );
+
+      template< typename Type, typename... Types >
+      struct contains
+         : std::bool_constant< contains_v< Type, Types... > >
+      {};
+
+      template< typename Type, typename... Types >
+      struct contains< Type, type_list< Types... > >
+         : contains< Type, Types... >
+      {};
+
+      template< typename Rules, typename Todo, typename Done >
+      struct filter
+      {
+         using type = Todo;
+      };
+
+      template< typename Rule, typename... Rules, typename... Todo, typename... Done >
+      struct filter< type_list< Rule, Rules... >, type_list< Todo... >, type_list< Done... > >
+         : filter< type_list< Rules... >, std::conditional_t< contains_v< Rule, Todo..., Done... >, type_list< Todo... >, type_list< Rule, Todo... > >, type_list< Done... > >
+      {};
+
+      template< typename Rules, typename Todo, typename Done >
+      using filter_t = typename filter< Rules, Todo, Done >::type;
+
+      template< typename Done, typename... Rules >
+      struct visit_list
+      {
+         using NextDone = type_list_concat_t< type_list< Rules... >, Done >;
+         using NextSubs = type_list_concat_t< typename Rules::subs_t... >;
+         using NextTodo = filter_t< NextSubs, empty_list, NextDone >;
+
+         using type = typename std::conditional_t< std::is_same_v< NextTodo, empty_list >, type_list_concat< NextDone >, visit_list< NextDone, NextTodo > >::type;
+      };
+
+      template< typename Done, typename... Rules >
+      struct visit_list< Done, type_list< Rules... > >
+         : visit_list< Done, Rules... >
+      {};
+
+      template< template< typename... > class Func, typename... Args, typename... Rules >
+      void visit( type_list< Rules... > /*unused*/, Args&&... args )
+      {
+         ( Func< Rules >::visit( args... ), ... );
+      }
+
+   }  // namespace internal
+
+   template< typename Grammar >
+   using rule_list_t = typename internal::visit_list< empty_list, Grammar >::type;
+
+   template< typename Grammar, typename Rule >
+   inline constexpr bool contains_v = internal::contains< Rule, rule_list_t< Grammar > >::value;
+
+   template< typename Rule, template< typename... > class Func, typename... Args >
+   void visit( Args&&... args )
+   {
+      internal::visit< Func >( rule_list_t< Rule >(), args... );
+   }
+
+}  // namespace PXR_PEGTL_NAMESPACE
+
+#endif
diff --git a/pxr/base/plug/__init__.py b/pxr/base/plug/__init__.py
index 65b2b57377..a9e8084629 100644
--- a/pxr/base/plug/__init__.py
+++ b/pxr/base/plug/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 This package defines facilities for dealing with plugins.
diff --git a/pxr/base/plug/api.h b/pxr/base/plug/api.h
index 299b571965..02e879f34e 100644
--- a/pxr/base/plug/api.h
+++ b/pxr/base/plug/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_API_H
 #define PXR_BASE_PLUG_API_H
diff --git a/pxr/base/plug/debugCodes.cpp b/pxr/base/plug/debugCodes.cpp
index d8ff1cee1e..83d0a7ee38 100644
--- a/pxr/base/plug/debugCodes.cpp
+++ b/pxr/base/plug/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/plug/debugCodes.h"
diff --git a/pxr/base/plug/debugCodes.h b/pxr/base/plug/debugCodes.h
index 586480e8f7..f5b669aab8 100644
--- a/pxr/base/plug/debugCodes.h
+++ b/pxr/base/plug/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_DEBUG_CODES_H
 #define PXR_BASE_PLUG_DEBUG_CODES_H
diff --git a/pxr/base/plug/info.cpp b/pxr/base/plug/info.cpp
index 5ffc8ad48e..722273e7c0 100644
--- a/pxr/base/plug/info.cpp
+++ b/pxr/base/plug/info.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/info.h b/pxr/base/plug/info.h
index adb6b2ef1e..7db977a226 100644
--- a/pxr/base/plug/info.h
+++ b/pxr/base/plug/info.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_INFO_H
 #define PXR_BASE_PLUG_INFO_H
diff --git a/pxr/base/plug/initConfig.cpp b/pxr/base/plug/initConfig.cpp
index 11b1f11194..996945b2af 100644
--- a/pxr/base/plug/initConfig.cpp
+++ b/pxr/base/plug/initConfig.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/interfaceFactory.cpp b/pxr/base/plug/interfaceFactory.cpp
index 8fced14a4e..0ee5c6a91d 100644
--- a/pxr/base/plug/interfaceFactory.cpp
+++ b/pxr/base/plug/interfaceFactory.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file interfaceFactory.cpp
 
diff --git a/pxr/base/plug/interfaceFactory.h b/pxr/base/plug/interfaceFactory.h
index 5d37c9ed00..ab01003bda 100644
--- a/pxr/base/plug/interfaceFactory.h
+++ b/pxr/base/plug/interfaceFactory.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_INTERFACE_FACTORY_H
 #define PXR_BASE_PLUG_INTERFACE_FACTORY_H
diff --git a/pxr/base/plug/module.cpp b/pxr/base/plug/module.cpp
index 368722ae8a..3b195d8acb 100644
--- a/pxr/base/plug/module.cpp
+++ b/pxr/base/plug/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/moduleDeps.cpp b/pxr/base/plug/moduleDeps.cpp
index 8b88120d5a..3e08febc6e 100644
--- a/pxr/base/plug/moduleDeps.cpp
+++ b/pxr/base/plug/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/base/plug/notice.cpp b/pxr/base/plug/notice.cpp
index c5fc8d5911..88d2fb78a8 100644
--- a/pxr/base/plug/notice.cpp
+++ b/pxr/base/plug/notice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/notice.h b/pxr/base/plug/notice.h
index 8bee765f81..1d99a5b35b 100644
--- a/pxr/base/plug/notice.h
+++ b/pxr/base/plug/notice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_NOTICE_H
 #define PXR_BASE_PLUG_NOTICE_H
diff --git a/pxr/base/plug/pch.h b/pxr/base/plug/pch.h
index 98b6fc7825..8cccd3d101 100644
--- a/pxr/base/plug/pch.h
+++ b/pxr/base/plug/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,13 +31,14 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -78,16 +62,18 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <regex>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -95,50 +81,9 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/vector.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/if.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/bases.hpp>
 #include <boost/python/call.hpp>
@@ -172,23 +117,13 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
+#include <tbb/task.h>
 #include <tbb/task_arena.h>
 #include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/base/plug/plugin.cpp b/pxr/base/plug/plugin.cpp
index 7c1b2d5d80..2db2cf12a9 100644
--- a/pxr/base/plug/plugin.cpp
+++ b/pxr/base/plug/plugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/plugin.h b/pxr/base/plug/plugin.h
index f88280d70a..7da29bbb77 100644
--- a/pxr/base/plug/plugin.h
+++ b/pxr/base/plug/plugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_PLUGIN_H
 #define PXR_BASE_PLUG_PLUGIN_H
diff --git a/pxr/base/plug/registry.cpp b/pxr/base/plug/registry.cpp
index cd53b184bd..d87a6d843f 100644
--- a/pxr/base/plug/registry.cpp
+++ b/pxr/base/plug/registry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/registry.h b/pxr/base/plug/registry.h
index ac45f17d43..e1ec30314a 100644
--- a/pxr/base/plug/registry.h
+++ b/pxr/base/plug/registry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_REGISTRY_H
 #define PXR_BASE_PLUG_REGISTRY_H
diff --git a/pxr/base/plug/staticInterface.cpp b/pxr/base/plug/staticInterface.cpp
index d1ce002037..4b503e6a29 100644
--- a/pxr/base/plug/staticInterface.cpp
+++ b/pxr/base/plug/staticInterface.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file staticInterface.cpp
 
diff --git a/pxr/base/plug/staticInterface.h b/pxr/base/plug/staticInterface.h
index 6a9253f4d1..d0dc6c0922 100644
--- a/pxr/base/plug/staticInterface.h
+++ b/pxr/base/plug/staticInterface.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_STATIC_INTERFACE_H
 #define PXR_BASE_PLUG_STATIC_INTERFACE_H
diff --git a/pxr/base/plug/testPlug.py b/pxr/base/plug/testPlug.py
index 82c0a7e895..ba8feed7da 100644
--- a/pxr/base/plug/testPlug.py
+++ b/pxr/base/plug/testPlug.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import sys, os
diff --git a/pxr/base/plug/testPlugBase.cpp b/pxr/base/plug/testPlugBase.cpp
index 242bc125e1..5ae9d36d5e 100644
--- a/pxr/base/plug/testPlugBase.cpp
+++ b/pxr/base/plug/testPlugBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/testPlugBase.h b/pxr/base/plug/testPlugBase.h
index 105dd1ed46..9b17ae5aaa 100644
--- a/pxr/base/plug/testPlugBase.h
+++ b/pxr/base/plug/testPlugBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_TEST_PLUG_BASE_H
 #define PXR_BASE_PLUG_TEST_PLUG_BASE_H
diff --git a/pxr/base/plug/testenv/TestPlugDso1.cpp b/pxr/base/plug/testenv/TestPlugDso1.cpp
index 46e2db6414..6b88bf20f2 100644
--- a/pxr/base/plug/testenv/TestPlugDso1.cpp
+++ b/pxr/base/plug/testenv/TestPlugDso1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/testenv/TestPlugDso2.cpp b/pxr/base/plug/testenv/TestPlugDso2.cpp
index 6e7095a4b2..f3b249f443 100644
--- a/pxr/base/plug/testenv/TestPlugDso2.cpp
+++ b/pxr/base/plug/testenv/TestPlugDso2.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/testenv/TestPlugDso3.cpp b/pxr/base/plug/testenv/TestPlugDso3.cpp
index fa9041f528..3c5cb4ee3e 100644
--- a/pxr/base/plug/testenv/TestPlugDso3.cpp
+++ b/pxr/base/plug/testenv/TestPlugDso3.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/testenv/TestPlugDsoEmpty.cpp b/pxr/base/plug/testenv/TestPlugDsoEmpty.cpp
index 43316d5e92..28cf8c606b 100644
--- a/pxr/base/plug/testenv/TestPlugDsoEmpty.cpp
+++ b/pxr/base/plug/testenv/TestPlugDsoEmpty.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/testenv/TestPlugDsoIncomplete.cpp b/pxr/base/plug/testenv/TestPlugDsoIncomplete.cpp
index 4bb38c105e..0b8d1160de 100644
--- a/pxr/base/plug/testenv/TestPlugDsoIncomplete.cpp
+++ b/pxr/base/plug/testenv/TestPlugDsoIncomplete.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/testenv/TestPlugDsoUnloadable.cpp b/pxr/base/plug/testenv/TestPlugDsoUnloadable.cpp
index 428551bcd4..11aee11073 100644
--- a/pxr/base/plug/testenv/TestPlugDsoUnloadable.cpp
+++ b/pxr/base/plug/testenv/TestPlugDsoUnloadable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/testenv/TestPlugModule1__init__.py b/pxr/base/plug/testenv/TestPlugModule1__init__.py
index bd786f77f7..2f16f74f99 100644
--- a/pxr/base/plug/testenv/TestPlugModule1__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModule1__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug, Tf
 
diff --git a/pxr/base/plug/testenv/TestPlugModule2__init__.py b/pxr/base/plug/testenv/TestPlugModule2__init__.py
index ae9628806c..49c572ae27 100644
--- a/pxr/base/plug/testenv/TestPlugModule2__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModule2__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug, Tf
 
diff --git a/pxr/base/plug/testenv/TestPlugModule3__init__.py b/pxr/base/plug/testenv/TestPlugModule3__init__.py
index 363c06fe6a..d24e36985c 100644
--- a/pxr/base/plug/testenv/TestPlugModule3__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModule3__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug, Tf
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleDepBadBase__init__.py b/pxr/base/plug/testenv/TestPlugModuleDepBadBase__init__.py
index 6e531cf674..e3ec7dfe06 100644
--- a/pxr/base/plug/testenv/TestPlugModuleDepBadBase__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleDepBadBase__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleDepBadDep2__init__.py b/pxr/base/plug/testenv/TestPlugModuleDepBadDep2__init__.py
index f3b773a51f..9637990cc8 100644
--- a/pxr/base/plug/testenv/TestPlugModuleDepBadDep2__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleDepBadDep2__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleDepBadDep__init__.py b/pxr/base/plug/testenv/TestPlugModuleDepBadDep__init__.py
index 87fcc9e41b..f27991e352 100644
--- a/pxr/base/plug/testenv/TestPlugModuleDepBadDep__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleDepBadDep__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleDepBadLoad__init__.py b/pxr/base/plug/testenv/TestPlugModuleDepBadLoad__init__.py
index 862b044b16..6a623be51b 100644
--- a/pxr/base/plug/testenv/TestPlugModuleDepBadLoad__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleDepBadLoad__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleDepCycle__init__.py b/pxr/base/plug/testenv/TestPlugModuleDepCycle__init__.py
index 1c7b2c022d..92f8567ac6 100644
--- a/pxr/base/plug/testenv/TestPlugModuleDepCycle__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleDepCycle__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleEmpty__init__.py b/pxr/base/plug/testenv/TestPlugModuleEmpty__init__.py
index 00ac93bb20..dbe0163411 100644
--- a/pxr/base/plug/testenv/TestPlugModuleEmpty__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleEmpty__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleIncomplete__init__.py b/pxr/base/plug/testenv/TestPlugModuleIncomplete__init__.py
index 3d3502ad74..08c2cd6c42 100644
--- a/pxr/base/plug/testenv/TestPlugModuleIncomplete__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleIncomplete__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleLoadedBadBase__init__.py b/pxr/base/plug/testenv/TestPlugModuleLoadedBadBase__init__.py
index 0aa6d7935b..0280cc3e14 100644
--- a/pxr/base/plug/testenv/TestPlugModuleLoadedBadBase__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleLoadedBadBase__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug, Tf
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleLoaded__init__.py b/pxr/base/plug/testenv/TestPlugModuleLoaded__init__.py
index afb3ecf892..b8dee36702 100644
--- a/pxr/base/plug/testenv/TestPlugModuleLoaded__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleLoaded__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug, Tf
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleUnicode__init__.py b/pxr/base/plug/testenv/TestPlugModuleUnicode__init__.py
index ddcfe79825..1a96d74380 100644
--- a/pxr/base/plug/testenv/TestPlugModuleUnicode__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleUnicode__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleUnloadable2__init__.py b/pxr/base/plug/testenv/TestPlugModuleUnloadable2__init__.py
index 697a12e978..5616ad3593 100644
--- a/pxr/base/plug/testenv/TestPlugModuleUnloadable2__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleUnloadable2__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/testenv/TestPlugModuleUnloadable__init__.py b/pxr/base/plug/testenv/TestPlugModuleUnloadable__init__.py
index 4aa0bd2ba2..ffc6763a06 100644
--- a/pxr/base/plug/testenv/TestPlugModuleUnloadable__init__.py
+++ b/pxr/base/plug/testenv/TestPlugModuleUnloadable__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Plug
 
diff --git a/pxr/base/plug/thisPlugin.h b/pxr/base/plug/thisPlugin.h
index c732cf6fb2..511975d4b9 100644
--- a/pxr/base/plug/thisPlugin.h
+++ b/pxr/base/plug/thisPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_PLUG_THIS_PLUGIN_H
 #define PXR_BASE_PLUG_THIS_PLUGIN_H
diff --git a/pxr/base/plug/wrapNotice.cpp b/pxr/base/plug/wrapNotice.cpp
index fb8a07324a..fabf8b3728 100644
--- a/pxr/base/plug/wrapNotice.cpp
+++ b/pxr/base/plug/wrapNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/wrapPlugin.cpp b/pxr/base/plug/wrapPlugin.cpp
index c53dbe65b3..8d009cd26f 100644
--- a/pxr/base/plug/wrapPlugin.cpp
+++ b/pxr/base/plug/wrapPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/wrapRegistry.cpp b/pxr/base/plug/wrapRegistry.cpp
index d55f8f9386..be574cbec1 100644
--- a/pxr/base/plug/wrapRegistry.cpp
+++ b/pxr/base/plug/wrapRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/plug/wrapTestPlugBase.cpp b/pxr/base/plug/wrapTestPlugBase.cpp
index c66ef83218..8d81012dca 100644
--- a/pxr/base/plug/wrapTestPlugBase.cpp
+++ b/pxr/base/plug/wrapTestPlugBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/CMakeLists.txt b/pxr/base/tf/CMakeLists.txt
index 88176f68f0..b236184c47 100644
--- a/pxr/base/tf/CMakeLists.txt
+++ b/pxr/base/tf/CMakeLists.txt
@@ -237,7 +237,6 @@ pxr_library(tf
         instantiateType.h
         meta.h
         pxrCLI11/CLI11.h
-        pxrPEGTL/pegtl.h
         pxrTslRobinMap/robin_growth_policy.h
         pxrTslRobinMap/robin_hash.h
         pxrTslRobinMap/robin_map.h
@@ -498,6 +497,7 @@ pxr_build_test(testTf
 pxr_test_scripts(
     testenv/testTfCrashHandler.py
     testenv/testTfFileUtils.py
+    testenv/testTfMallocTagReport.py
     testenv/testTfNamedTemporaryFile.py
     testenv/testTfPathUtils.py
     testenv/testTfPython.py
@@ -651,6 +651,10 @@ pxr_register_test(TfEnum
     STDOUT_REDIRECT enum.out
     DIFF_COMPARE enum.out
 )
+pxr_register_test(TfMallocTagReport
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testTfMallocTagReport"
+)
 pxr_register_test(TfNotice
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testTf TfNotice"
     STDOUT_REDIRECT notice.out
diff --git a/pxr/base/tf/__init__.py b/pxr/base/tf/__init__.py
index dc2d122516..e3238cc766 100644
--- a/pxr/base/tf/__init__.py
+++ b/pxr/base/tf/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 Tf -- Tools Foundation
diff --git a/pxr/base/tf/anyUniquePtr.cpp b/pxr/base/tf/anyUniquePtr.cpp
index f075532555..ef371c4dab 100644
--- a/pxr/base/tf/anyUniquePtr.cpp
+++ b/pxr/base/tf/anyUniquePtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/anyUniquePtr.h"
diff --git a/pxr/base/tf/anyUniquePtr.h b/pxr/base/tf/anyUniquePtr.h
index 11583dac2f..6eeaaa405c 100644
--- a/pxr/base/tf/anyUniquePtr.h
+++ b/pxr/base/tf/anyUniquePtr.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ANY_UNIQUE_PTR_H
 #define PXR_BASE_TF_ANY_UNIQUE_PTR_H
diff --git a/pxr/base/tf/anyWeakPtr.cpp b/pxr/base/tf/anyWeakPtr.cpp
index 4489dcdc44..61221a4f5f 100644
--- a/pxr/base/tf/anyWeakPtr.cpp
+++ b/pxr/base/tf/anyWeakPtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/anyWeakPtr.h b/pxr/base/tf/anyWeakPtr.h
index 9e6effdfc4..7b5db192bb 100644
--- a/pxr/base/tf/anyWeakPtr.h
+++ b/pxr/base/tf/anyWeakPtr.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ANY_WEAK_PTR_H
 #define PXR_BASE_TF_ANY_WEAK_PTR_H
diff --git a/pxr/base/tf/api.h b/pxr/base/tf/api.h
index 0c51ebb060..c617b67ae6 100644
--- a/pxr/base/tf/api.h
+++ b/pxr/base/tf/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_API_H
 #define PXR_BASE_TF_API_H
diff --git a/pxr/base/tf/atomicOfstreamWrapper.cpp b/pxr/base/tf/atomicOfstreamWrapper.cpp
index b3dbd0a251..308fb2db6b 100644
--- a/pxr/base/tf/atomicOfstreamWrapper.cpp
+++ b/pxr/base/tf/atomicOfstreamWrapper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Tf/AtomicOfstreamWrapper.cpp
diff --git a/pxr/base/tf/atomicOfstreamWrapper.h b/pxr/base/tf/atomicOfstreamWrapper.h
index 1310cffca1..abcfe2dab3 100644
--- a/pxr/base/tf/atomicOfstreamWrapper.h
+++ b/pxr/base/tf/atomicOfstreamWrapper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ATOMIC_OFSTREAM_WRAPPER_H
 #define PXR_BASE_TF_ATOMIC_OFSTREAM_WRAPPER_H
diff --git a/pxr/base/tf/atomicRenameUtil.cpp b/pxr/base/tf/atomicRenameUtil.cpp
index 6cf5079af6..caa6e3d0e0 100644
--- a/pxr/base/tf/atomicRenameUtil.cpp
+++ b/pxr/base/tf/atomicRenameUtil.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/base/tf/atomicRenameUtil.h b/pxr/base/tf/atomicRenameUtil.h
index 0ecadf0436..0606c11390 100644
--- a/pxr/base/tf/atomicRenameUtil.h
+++ b/pxr/base/tf/atomicRenameUtil.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/base/tf/bigRWMutex.cpp b/pxr/base/tf/bigRWMutex.cpp
index 8ebc88273b..c3db9d079a 100644
--- a/pxr/base/tf/bigRWMutex.cpp
+++ b/pxr/base/tf/bigRWMutex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/bigRWMutex.h b/pxr/base/tf/bigRWMutex.h
index f998b8ca29..88901179e8 100644
--- a/pxr/base/tf/bigRWMutex.h
+++ b/pxr/base/tf/bigRWMutex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_BIG_RW_MUTEX_H
 #define PXR_BASE_TF_BIG_RW_MUTEX_H
diff --git a/pxr/base/tf/bitUtils.cpp b/pxr/base/tf/bitUtils.cpp
index c49cb0a423..e227565fe4 100644
--- a/pxr/base/tf/bitUtils.cpp
+++ b/pxr/base/tf/bitUtils.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/bitUtils.h"
diff --git a/pxr/base/tf/bitUtils.h b/pxr/base/tf/bitUtils.h
index bb364588e0..aaf40d9929 100644
--- a/pxr/base/tf/bitUtils.h
+++ b/pxr/base/tf/bitUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_BIT_UTILS_H
 #define PXR_BASE_TF_BIT_UTILS_H
diff --git a/pxr/base/tf/callContext.h b/pxr/base/tf/callContext.h
index 7cc7cfd6e2..1019f96352 100644
--- a/pxr/base/tf/callContext.h
+++ b/pxr/base/tf/callContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_CALL_CONTEXT_H
 #define PXR_BASE_TF_CALL_CONTEXT_H
diff --git a/pxr/base/tf/cxxCast.h b/pxr/base/tf/cxxCast.h
index f24934f35d..3da34ef606 100644
--- a/pxr/base/tf/cxxCast.h
+++ b/pxr/base/tf/cxxCast.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_CXX_CAST_H
 #define PXR_BASE_TF_CXX_CAST_H
diff --git a/pxr/base/tf/debug.cpp b/pxr/base/tf/debug.cpp
index f26c9e9695..ec954c268a 100644
--- a/pxr/base/tf/debug.cpp
+++ b/pxr/base/tf/debug.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/debug.h b/pxr/base/tf/debug.h
index 705d173261..64b31821ec 100644
--- a/pxr/base/tf/debug.h
+++ b/pxr/base/tf/debug.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DEBUG_H
 #define PXR_BASE_TF_DEBUG_H
diff --git a/pxr/base/tf/debugCodes.cpp b/pxr/base/tf/debugCodes.cpp
index 86a1b0fe11..936ca5c6ec 100644
--- a/pxr/base/tf/debugCodes.cpp
+++ b/pxr/base/tf/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/debugCodes.h b/pxr/base/tf/debugCodes.h
index 5e90cff7a9..7025b0c1a7 100644
--- a/pxr/base/tf/debugCodes.h
+++ b/pxr/base/tf/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DEBUG_CODES_H
 #define PXR_BASE_TF_DEBUG_CODES_H
diff --git a/pxr/base/tf/debugNotice.cpp b/pxr/base/tf/debugNotice.cpp
index 2b6ed510d0..e8540b82bf 100644
--- a/pxr/base/tf/debugNotice.cpp
+++ b/pxr/base/tf/debugNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/debugNotice.h b/pxr/base/tf/debugNotice.h
index e2bbe6305b..616cb03a4c 100644
--- a/pxr/base/tf/debugNotice.h
+++ b/pxr/base/tf/debugNotice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DEBUG_NOTICE_H
 #define PXR_BASE_TF_DEBUG_NOTICE_H
diff --git a/pxr/base/tf/declarePtrs.h b/pxr/base/tf/declarePtrs.h
index 87533ea277..cb012d2c13 100644
--- a/pxr/base/tf/declarePtrs.h
+++ b/pxr/base/tf/declarePtrs.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DECLARE_PTRS_H
 #define PXR_BASE_TF_DECLARE_PTRS_H
diff --git a/pxr/base/tf/delegatedCountPtr.h b/pxr/base/tf/delegatedCountPtr.h
index 29668d1b80..2bd7f61288 100644
--- a/pxr/base/tf/delegatedCountPtr.h
+++ b/pxr/base/tf/delegatedCountPtr.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TF_DELEGATED_COUNT_PTR_H
diff --git a/pxr/base/tf/denseHashMap.cpp b/pxr/base/tf/denseHashMap.cpp
index 88975793c0..34b0f93e77 100644
--- a/pxr/base/tf/denseHashMap.cpp
+++ b/pxr/base/tf/denseHashMap.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/denseHashMap.h"
diff --git a/pxr/base/tf/denseHashMap.h b/pxr/base/tf/denseHashMap.h
index 9ba61992fd..b838c47da8 100644
--- a/pxr/base/tf/denseHashMap.h
+++ b/pxr/base/tf/denseHashMap.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DENSE_HASH_MAP_H
 #define PXR_BASE_TF_DENSE_HASH_MAP_H
diff --git a/pxr/base/tf/denseHashSet.cpp b/pxr/base/tf/denseHashSet.cpp
index e0f81c1039..202e3be1c1 100644
--- a/pxr/base/tf/denseHashSet.cpp
+++ b/pxr/base/tf/denseHashSet.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/denseHashSet.h"
diff --git a/pxr/base/tf/denseHashSet.h b/pxr/base/tf/denseHashSet.h
index 8136fbf2f5..ab90ae5595 100644
--- a/pxr/base/tf/denseHashSet.h
+++ b/pxr/base/tf/denseHashSet.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DENSE_HASH_SET_H
 #define PXR_BASE_TF_DENSE_HASH_SET_H
diff --git a/pxr/base/tf/diagnostic.cpp b/pxr/base/tf/diagnostic.cpp
index 9816110fbe..dbb6ea9b94 100644
--- a/pxr/base/tf/diagnostic.cpp
+++ b/pxr/base/tf/diagnostic.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/diagnostic.h b/pxr/base/tf/diagnostic.h
index a4870acce4..e6e5483c80 100644
--- a/pxr/base/tf/diagnostic.h
+++ b/pxr/base/tf/diagnostic.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DIAGNOSTIC_H
 #define PXR_BASE_TF_DIAGNOSTIC_H
diff --git a/pxr/base/tf/diagnosticBase.cpp b/pxr/base/tf/diagnosticBase.cpp
index e0c70eeb53..cff28e88ab 100644
--- a/pxr/base/tf/diagnosticBase.cpp
+++ b/pxr/base/tf/diagnosticBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/diagnosticBase.h b/pxr/base/tf/diagnosticBase.h
index 72014beb31..d65129f547 100644
--- a/pxr/base/tf/diagnosticBase.h
+++ b/pxr/base/tf/diagnosticBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DIAGNOSTIC_BASE_H
 #define PXR_BASE_TF_DIAGNOSTIC_BASE_H
diff --git a/pxr/base/tf/diagnosticHelper.cpp b/pxr/base/tf/diagnosticHelper.cpp
index 2e26c3806c..26107f13fb 100644
--- a/pxr/base/tf/diagnosticHelper.cpp
+++ b/pxr/base/tf/diagnosticHelper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/diagnosticHelper.h b/pxr/base/tf/diagnosticHelper.h
index 295052c387..c0b9d2d070 100644
--- a/pxr/base/tf/diagnosticHelper.h
+++ b/pxr/base/tf/diagnosticHelper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DIAGNOSTIC_HELPER_H
 #define PXR_BASE_TF_DIAGNOSTIC_HELPER_H
diff --git a/pxr/base/tf/diagnosticLite.h b/pxr/base/tf/diagnosticLite.h
index 6420b8b28a..889dd62f86 100644
--- a/pxr/base/tf/diagnosticLite.h
+++ b/pxr/base/tf/diagnosticLite.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DIAGNOSTIC_LITE_H
 #define PXR_BASE_TF_DIAGNOSTIC_LITE_H
diff --git a/pxr/base/tf/diagnosticMgr.cpp b/pxr/base/tf/diagnosticMgr.cpp
index 5e9e48dbb8..59fad8c394 100644
--- a/pxr/base/tf/diagnosticMgr.cpp
+++ b/pxr/base/tf/diagnosticMgr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/diagnosticMgr.h b/pxr/base/tf/diagnosticMgr.h
index 593535bee1..962b12f974 100644
--- a/pxr/base/tf/diagnosticMgr.h
+++ b/pxr/base/tf/diagnosticMgr.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DIAGNOSTIC_MGR_H
 #define PXR_BASE_TF_DIAGNOSTIC_MGR_H
diff --git a/pxr/base/tf/dl.cpp b/pxr/base/tf/dl.cpp
index 6bd39864c2..c511b82bee 100644
--- a/pxr/base/tf/dl.cpp
+++ b/pxr/base/tf/dl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/arch/library.h"
 #include "pxr/base/tf/dl.h"
diff --git a/pxr/base/tf/dl.h b/pxr/base/tf/dl.h
index 1de08c735c..78f2ede21d 100644
--- a/pxr/base/tf/dl.h
+++ b/pxr/base/tf/dl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_DL_H
 #define PXR_BASE_TF_DL_H
diff --git a/pxr/base/tf/enum.cpp b/pxr/base/tf/enum.cpp
index dd204a26f0..516632fdd6 100644
--- a/pxr/base/tf/enum.cpp
+++ b/pxr/base/tf/enum.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -113,11 +96,15 @@ class Tf_EnumRegistry {
 TF_INSTANTIATE_SINGLETON(Tf_EnumRegistry);
 
 void
-TfEnum::_AddName(TfEnum val, const string &valName, const string &displayName)
+TfEnum::_AddName(TfEnum val,
+                 char const *valNameCstr, char const *displayNameCstr)
 {
     TfAutoMallocTag2 tag("Tf", "TfEnum::_AddName");
     string typeName = ArchGetDemangled(val.GetType());
 
+    const string valName = TfSafeString(valNameCstr);
+    const string displayName = TfSafeString(displayNameCstr);
+    
     /*
      * In case valName looks like "stuff::VALUE", strip off the leading
      * prefix.
diff --git a/pxr/base/tf/enum.h b/pxr/base/tf/enum.h
index f6d5dddc99..1cbbbf6e7f 100644
--- a/pxr/base/tf/enum.h
+++ b/pxr/base/tf/enum.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ENUM_H
 #define PXR_BASE_TF_ENUM_H
@@ -388,15 +371,19 @@ class TfEnum
     /// should NOT be called directly. Instead, call AddName(), which does
     /// exactly the same thing.
     TF_API
-    static void _AddName(TfEnum val, const std::string &valName,
-                         const std::string &displayName="");
+    static void _AddName(TfEnum val, char const *valName,
+                         char const *displayName);
+
+    // Helper for TF_ADD_ENUM_NAME() dealing with empty vs nonempty __VA_ARGS__
+    static char const *
+    _NameIdent(char const *str = nullptr) { return str; }
 
     /// Associates a name with an enumerated value.
     /// \see _AddName().
     static void AddName(TfEnum val, const std::string &valName,
                         const std::string &displayName="")
     {
-        _AddName(val, valName, displayName);
+        _AddName(val, valName.c_str(), displayName.c_str());
     }
      
     template <typename T>
@@ -469,7 +456,7 @@ TF_API std::ostream& operator<<(std::ostream& out, const TfEnum & e);
 /// \hideinitializer
 #define TF_ADD_ENUM_NAME(VAL, ...)                               \
     TfEnum::_AddName(VAL, TF_PP_STRINGIZE(VAL),                  \
-                     std::string{__VA_ARGS__});
+                     TfEnum::_NameIdent(__VA_ARGS__));
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
diff --git a/pxr/base/tf/envSetting.cpp b/pxr/base/tf/envSetting.cpp
index fe6d20cef6..ac3a4382e7 100644
--- a/pxr/base/tf/envSetting.cpp
+++ b/pxr/base/tf/envSetting.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/envSetting.h b/pxr/base/tf/envSetting.h
index 9415b41515..aea505ddfa 100644
--- a/pxr/base/tf/envSetting.h
+++ b/pxr/base/tf/envSetting.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ENV_SETTING_H
 #define PXR_BASE_TF_ENV_SETTING_H
diff --git a/pxr/base/tf/error.cpp b/pxr/base/tf/error.cpp
index 5bce9f46f5..c233038c8e 100644
--- a/pxr/base/tf/error.cpp
+++ b/pxr/base/tf/error.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/error.h b/pxr/base/tf/error.h
index c1fb93a63f..1f9a856a99 100644
--- a/pxr/base/tf/error.h
+++ b/pxr/base/tf/error.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ERROR_H
 #define PXR_BASE_TF_ERROR_H
diff --git a/pxr/base/tf/errorMark.cpp b/pxr/base/tf/errorMark.cpp
index ee97f55739..10a6aaa596 100644
--- a/pxr/base/tf/errorMark.cpp
+++ b/pxr/base/tf/errorMark.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/errorMark.h b/pxr/base/tf/errorMark.h
index 4f377aa48b..06df583113 100644
--- a/pxr/base/tf/errorMark.h
+++ b/pxr/base/tf/errorMark.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ERROR_MARK_H
 #define PXR_BASE_TF_ERROR_MARK_H
diff --git a/pxr/base/tf/errorTransport.cpp b/pxr/base/tf/errorTransport.cpp
index baea66e39f..01583f1485 100644
--- a/pxr/base/tf/errorTransport.cpp
+++ b/pxr/base/tf/errorTransport.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/errorTransport.h b/pxr/base/tf/errorTransport.h
index 19817e3205..32259cb147 100644
--- a/pxr/base/tf/errorTransport.h
+++ b/pxr/base/tf/errorTransport.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ERROR_TRANSPORT_H
 #define PXR_BASE_TF_ERROR_TRANSPORT_H
diff --git a/pxr/base/tf/exception.cpp b/pxr/base/tf/exception.cpp
index 7c3eb60b18..71e98408d0 100644
--- a/pxr/base/tf/exception.cpp
+++ b/pxr/base/tf/exception.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/exception.h b/pxr/base/tf/exception.h
index 2eef2f4aaa..68463e11b0 100644
--- a/pxr/base/tf/exception.h
+++ b/pxr/base/tf/exception.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TF_EXCEPTION_H
diff --git a/pxr/base/tf/expiryNotifier.cpp b/pxr/base/tf/expiryNotifier.cpp
index af857b5f71..235f14f90e 100644
--- a/pxr/base/tf/expiryNotifier.cpp
+++ b/pxr/base/tf/expiryNotifier.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/expiryNotifier.h b/pxr/base/tf/expiryNotifier.h
index 3edf85ebea..70e3930369 100644
--- a/pxr/base/tf/expiryNotifier.h
+++ b/pxr/base/tf/expiryNotifier.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_EXPIRY_NOTIFIER_H
 #define PXR_BASE_TF_EXPIRY_NOTIFIER_H
diff --git a/pxr/base/tf/fastCompression.cpp b/pxr/base/tf/fastCompression.cpp
index 677411f8cb..55f455d424 100644
--- a/pxr/base/tf/fastCompression.cpp
+++ b/pxr/base/tf/fastCompression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/fastCompression.h b/pxr/base/tf/fastCompression.h
index db51bc53b8..6186c116f0 100644
--- a/pxr/base/tf/fastCompression.h
+++ b/pxr/base/tf/fastCompression.h
@@ -1,25 +1,8 @@
 //`
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_BASE_TF_FAST_COMPRESSION_H
 #define PXR_BASE_TF_FAST_COMPRESSION_H
diff --git a/pxr/base/tf/fileUtils.cpp b/pxr/base/tf/fileUtils.cpp
index 8a544dd2f5..d4b10e4c2a 100644
--- a/pxr/base/tf/fileUtils.cpp
+++ b/pxr/base/tf/fileUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/fileUtils.h b/pxr/base/tf/fileUtils.h
index f3d82cc3b0..ca6baded45 100644
--- a/pxr/base/tf/fileUtils.h
+++ b/pxr/base/tf/fileUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_FILE_UTILS_H
 #define PXR_BASE_TF_FILE_UTILS_H
diff --git a/pxr/base/tf/functionRef.h b/pxr/base/tf/functionRef.h
index ed51614d7c..6d2bbe598e 100644
--- a/pxr/base/tf/functionRef.h
+++ b/pxr/base/tf/functionRef.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_FUNCTION_REF_H
 #define PXR_BASE_TF_FUNCTION_REF_H
diff --git a/pxr/base/tf/functionTraits.h b/pxr/base/tf/functionTraits.h
index a220208030..3d8b5a61d6 100644
--- a/pxr/base/tf/functionTraits.h
+++ b/pxr/base/tf/functionTraits.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TF_FUNCTION_TRAITS_H
diff --git a/pxr/base/tf/getenv.cpp b/pxr/base/tf/getenv.cpp
index a7c69a2f62..98e8906f3a 100644
--- a/pxr/base/tf/getenv.cpp
+++ b/pxr/base/tf/getenv.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/getenv.h b/pxr/base/tf/getenv.h
index 052436f974..42ccb772cc 100644
--- a/pxr/base/tf/getenv.h
+++ b/pxr/base/tf/getenv.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_GETENV_H
 #define PXR_BASE_TF_GETENV_H
diff --git a/pxr/base/tf/hash.cpp b/pxr/base/tf/hash.cpp
index 476cdd5be3..e567000906 100644
--- a/pxr/base/tf/hash.cpp
+++ b/pxr/base/tf/hash.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/hash.h b/pxr/base/tf/hash.h
index 6734f44ddc..9e8b84e32a 100644
--- a/pxr/base/tf/hash.h
+++ b/pxr/base/tf/hash.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_HASH_H
 #define PXR_BASE_TF_HASH_H
diff --git a/pxr/base/tf/hashmap.h b/pxr/base/tf/hashmap.h
index 07d9487ee2..8d69cc0b1a 100644
--- a/pxr/base/tf/hashmap.h
+++ b/pxr/base/tf/hashmap.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Wrap one of various unordered map implementations.  The exposed API
 // is similar to std::unordered_map but is missing some methods and
diff --git a/pxr/base/tf/hashset.h b/pxr/base/tf/hashset.h
index b0e94522ad..489e8553c4 100644
--- a/pxr/base/tf/hashset.h
+++ b/pxr/base/tf/hashset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Wrap one of various unordered set implementations.  The exposed API
 // is similar to std::unordered_set but is missing some methods and
diff --git a/pxr/base/tf/initConfig.cpp b/pxr/base/tf/initConfig.cpp
index 21b0b18367..80b10a2a1f 100644
--- a/pxr/base/tf/initConfig.cpp
+++ b/pxr/base/tf/initConfig.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/instantiateSingleton.h b/pxr/base/tf/instantiateSingleton.h
index cef9949068..3f7bcae591 100644
--- a/pxr/base/tf/instantiateSingleton.h
+++ b/pxr/base/tf/instantiateSingleton.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /*
  * This header is not meant to be included in a .h file.
@@ -42,10 +25,25 @@
 #include "pxr/base/tf/mallocTag.h"
 #include "pxr/base/arch/demangle.h"
 
+#include <memory>
 #include <thread>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+// This GIL-releasing helper is implemented in singleton.cpp.  We do it this way
+// to avoid including the Python headers here.
+struct Tf_SingletonPyGILDropper
+{
+    TF_API
+    Tf_SingletonPyGILDropper();
+    TF_API
+    ~Tf_SingletonPyGILDropper();
+private:
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+    std::unique_ptr<class TfPyLock> _pyLock;
+#endif // PXR_PYTHON_SUPPORT_ENABLED
+};
+
 template <class T> std::atomic<T *> TfSingleton<T>::_instance;
 
 template <class T>
@@ -68,6 +66,10 @@ TfSingleton<T>::_CreateInstance(std::atomic<T *> &instance)
     TfAutoMallocTag2 tag("Tf", "TfSingleton::_CreateInstance",
                          "Create Singleton " + ArchGetDemangled<T>());
 
+    // Drop the GIL if we have it, before possibly locking to create the
+    // singleton instance.
+    Tf_SingletonPyGILDropper dropGIL;
+
     // Try to take isInitializing false -> true.  If we do it, then check to see
     // if we don't yet have an instance.  If we don't, then we get to create it.
     // Otherwise we just wait until the instance shows up.
diff --git a/pxr/base/tf/instantiateStacked.h b/pxr/base/tf/instantiateStacked.h
index b9ff2b6202..c6289168d9 100644
--- a/pxr/base/tf/instantiateStacked.h
+++ b/pxr/base/tf/instantiateStacked.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifdef PXR_BASE_TF_INSTANTIATE_STACKED_H
 #error This file may be included only once in a translation unit (.cpp file).
diff --git a/pxr/base/tf/instantiateType.h b/pxr/base/tf/instantiateType.h
index 502efd7da3..1c66e19bb7 100644
--- a/pxr/base/tf/instantiateType.h
+++ b/pxr/base/tf/instantiateType.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /*
  * This header is not meant to be included in a .h file.
diff --git a/pxr/base/tf/iterator.cpp b/pxr/base/tf/iterator.cpp
index 2ee487aa91..0477201348 100644
--- a/pxr/base/tf/iterator.cpp
+++ b/pxr/base/tf/iterator.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/iterator.h"
diff --git a/pxr/base/tf/iterator.h b/pxr/base/tf/iterator.h
index b4d1ca3bf7..30523f8aaa 100644
--- a/pxr/base/tf/iterator.h
+++ b/pxr/base/tf/iterator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_ITERATOR_H
 #define PXR_BASE_TF_ITERATOR_H
diff --git a/pxr/base/tf/makePyConstructor.cpp b/pxr/base/tf/makePyConstructor.cpp
index 0d6d2baccc..3b6c81ebba 100644
--- a/pxr/base/tf/makePyConstructor.cpp
+++ b/pxr/base/tf/makePyConstructor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/makePyConstructor.h b/pxr/base/tf/makePyConstructor.h
index 1af0ca9b5d..fe3a12ee48 100644
--- a/pxr/base/tf/makePyConstructor.h
+++ b/pxr/base/tf/makePyConstructor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TF_MAKE_PY_CONSTRUCTOR_H
diff --git a/pxr/base/tf/mallocTag.cpp b/pxr/base/tf/mallocTag.cpp
index 3fd235e9ab..9852a55b93 100644
--- a/pxr/base/tf/mallocTag.cpp
+++ b/pxr/base/tf/mallocTag.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -48,12 +31,15 @@
 
 #include <algorithm>
 #include <atomic>
+#include <istream>
+#include <ostream>
+#include <regex>
+#include <stack>
 #include <string>
 #include <stdlib.h>
 #include <thread>
 #include <type_traits>
 #include <vector>
-#include <ostream>
 
 using std::map;
 using std::make_pair;
@@ -1214,13 +1200,15 @@ TfMallocTag::_Begin(const char* name, _ThreadData *threadData)
 }
 
 void
-TfMallocTag::_End(TfMallocTag::_ThreadData *tls)
+TfMallocTag::_End(int nTags, TfMallocTag::_ThreadData *tls)
 {
     if (!tls) {
         tls = &TfMallocTag::Tls::Find();
     }
 
-    tls->Pop();
+    while (nTags--) {
+        tls->Pop();
+    }
 }
 
 // Returns the given number as a string with commas used as thousands
@@ -1567,12 +1555,19 @@ TfMallocTag::CallTree::Report(
     Report(out, emptyRootName);
 }
 
+static const std::string &
+_GetTreeHeader()
+{
+    static const std::string treeHeader("Tree view  ==============");
+    return treeHeader;
+}
+
 void
 TfMallocTag::CallTree::Report(
     std::ostream &out,
     const std::string &rootName) const
 {
-    out << "\nTree view  ==============\n";
+    out << "\n" << _GetTreeHeader() << "\n";
     out << "      inclusive       exclusive\n";
 
     _ReportMallocNode(out, this->root, 0, &rootName);
@@ -1586,4 +1581,104 @@ TfMallocTag::CallTree::Report(
     }
 }
 
+bool
+TfMallocTag::CallTree::LoadReport(
+    std::istream &in)
+{
+    // The matches here are:
+    // 1. Exclusive memory (in bytes)
+    // 2. Inclusive memory (in bytes)
+    // 3. The number of allocations recorded
+    // 4. The indentation string, which we match exactly (excluding leading
+    //    whitespace) so that we can use the length to compute the depth, below.
+    // 5. The name of the callsite.
+    static const std::regex re(
+        R"( *([\d].*) B *([\d].*) B *([\d].*) samples    ([ |]*)(.*))");
+
+    // State of the parser. 
+    enum class State {
+        // Tree header not yet found
+        FindingTree,
+        // Found root, reading scopes
+        ReadingTree
+    } state = State::FindingTree;
+
+    // Initialize the stack with a synthetic root node, so that we can support
+    // loading multiple report trees. (This root node will be elided later if we
+    // end up loading a single tree.)
+    root = {0, 0, 0, "root", {}};
+    std::stack<PathNode *> nodes;
+    nodes.push(&root);
+
+    // Parse the file contents
+    for (std::string line; std::getline(in, line);) {
+        // When finding the tree, only parse for the tree header.
+        if (state == State::FindingTree) {
+            if (line == _GetTreeHeader()) {
+                state = State::ReadingTree;
+            }
+            continue;
+        }
+        if (!TF_VERIFY(state == State::ReadingTree)) {
+            break;
+        }
+
+        // When we see an empty line, that means we've gotten a full tree. Clear
+        // the stack and switch back to tree finding.
+        if (TfStringTrim(line).empty()) {
+            state = State::FindingTree;
+            nodes = {};
+            nodes.push(&root);
+            continue;
+        }
+
+        std::cmatch match;
+        if (!std::regex_match(line.c_str(), match, re)) {
+            continue;
+        }
+
+        const size_t nBytes =
+            TfStringToULong(TfStringReplace(match[1].str(), ",", ""));
+        const size_t nBytesDirect =
+            TfStringToULong(TfStringReplace(match[2].str(), ",", ""));
+        const size_t nAllocations = TfStringToULong(match[3].str());
+        const size_t depth = match[4].length() / 2;
+        const std::string& siteName = match[5].str();
+
+        // Pop nodes off the stack until the top is the parent of the node we
+        // just parsed. (We add one here to account for the synthetic root
+        // node.)
+        while (nodes.size() > depth + 1) {
+            nodes.pop();
+        }
+
+        PathNode *const parent = nodes.top();
+
+        // Add the current node as a child.
+        parent->children.push_back(
+            {nBytes, nBytesDirect, nAllocations, siteName, {}});
+
+        // Push the child onto the stack.
+        PathNode *const child = &(parent->children.back());
+        nodes.push(child);
+    }
+
+    // If we only ended up with one tree, elide the root node, since we only
+    // created it to support reading multiple trees. Otherwise, sum up the child
+    // allocations, mainly so we have a non-zero value at the root, so that we
+    // don't produce an empty report by pruning at the root.
+    if (root.children.size() == 1) {
+        // Here, we copy the root's child before overwriting the root. While we
+        // squeaked by here on linux, on windows we didn't get so (un)lucky.
+        const PathNode newRoot = root.children[0];
+        root = newRoot;
+    } else {
+        for (const PathNode& child : root.children) {
+            root.nBytes += child.nBytes;
+        }
+    }
+
+    return true;
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/base/tf/mallocTag.h b/pxr/base/tf/mallocTag.h
index 0cda8c1598..e4b326c9c0 100644
--- a/pxr/base/tf/mallocTag.h
+++ b/pxr/base/tf/mallocTag.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_MALLOC_TAG_H
 #define PXR_BASE_TF_MALLOC_TAG_H
@@ -99,8 +82,6 @@ class TfMallocTag {
             size_t nBytes;          ///< Allocated bytes.
         };
 
-        // Note: enum below must be kept in sync with tfmodule/mallocCallTree.h
-
         /// Specify which parts of the report to print.
         enum PrintSetting {
             TREE = 0,                   ///< Print the full call tree
@@ -108,6 +89,10 @@ class TfMallocTag {
             BOTH                        ///< Print both tree and call sites
         };
 
+
+        /// \name Input/Output
+        /// @{
+
         /// Return the malloc report string.
         ///
         /// Get a malloc report of the tree and/or callsites.
@@ -134,19 +119,28 @@ class TfMallocTag {
 
         /// Generates a report to the ostream \p out.
         ///
-        /// This report is printed in a way that is intended to be used by
-        /// xxtracediff.  If \p rootName is non-empty it will replace the name
-        /// of the tree root in the report.
+        /// If \p rootName is non-empty it will replace the name of the tree
+        /// root in the report.
         TF_API
         void Report(
             std::ostream &out,
             const std::string &rootName) const;
 
-        /// \overload
+        /// Generates a report to the ostream \p out.
         TF_API
         void Report(
             std::ostream &out) const;
 
+        /// Load the contents of \p in into the root of the call tree.
+        ///
+        /// Returns true if the report loaded successfully, false otherwise.
+        TF_API
+        bool LoadReport(
+            std::istream &in);
+
+        /// @}
+
+
         /// All call sites.
         std::vector<CallSite> callSites;
 
@@ -280,9 +274,12 @@ class TfMallocTag {
         template <class Str, class... Strs>
         explicit Auto(Str &&name1, Strs &&... nameN)
             : _threadData(TfMallocTag::_Push(_CStr(std::forward<Str>(name1))))
-            , _nTags(_threadData
-                     ? 1 + _PushImpl(std::forward<Strs>(nameN)...)
-                     : 0) {}
+            , _nTags(_threadData ? 1 + sizeof...(Strs) : 0) {
+            if (_threadData) {
+                (..., TfMallocTag::_Begin(
+                    _CStr(std::forward<Strs>(nameN)), _threadData));
+            }
+        }
 
         /// Pop the tag from the stack before it is destructed.
         ///
@@ -295,10 +292,10 @@ class TfMallocTag {
         /// TfMallocTag::Pop() because it isn't vulnerable to early returns or
         /// exceptions.
         inline void Release() {
-            while (_nTags--) {
-                TfMallocTag::_End(_threadData);
+            if (_threadData) {
+                TfMallocTag::_End(_nTags, _threadData);
+                _threadData = nullptr;
             }
-            _threadData = nullptr;
         }
 
         /// Pop a memory tag from the local-call stack.
@@ -314,18 +311,7 @@ class TfMallocTag {
 
         char const *_CStr(char const *cstr) const { return cstr; }
         char const *_CStr(std::string const &str) const { return str.c_str(); }
-        
-        template <class Str, class... Strs>
-        int _PushImpl(Str &&tag, Strs &&... rest) {
-            TfMallocTag::_Begin(_CStr(std::forward<Str>(tag)), _threadData);
-            return 1 + _PushImpl(std::forward<Strs>(rest)...);
-        }
 
-        int _PushImpl() {
-            // Recursion termination base-case.
-            return 0;
-        }
-        
         _ThreadData* _threadData;
         int _nTags;
 
@@ -431,7 +417,7 @@ class TfMallocTag {
 
     TF_API static _ThreadData *_Begin(char const *name,
                                       _ThreadData *threadData = nullptr);
-    TF_API static void _End(_ThreadData *threadData = nullptr);
+    TF_API static void _End(int nTags = 1, _ThreadData *threadData = nullptr);
 
     static void* _MallocWrapper(size_t, const void*);
     static void* _ReallocWrapper(void*, size_t, const void*);
diff --git a/pxr/base/tf/meta.h b/pxr/base/tf/meta.h
index ca5454e40d..8cd9a4c787 100644
--- a/pxr/base/tf/meta.h
+++ b/pxr/base/tf/meta.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TF_META_H
diff --git a/pxr/base/tf/module.cpp b/pxr/base/tf/module.cpp
index 3d0525a10a..f29716a9a0 100644
--- a/pxr/base/tf/module.cpp
+++ b/pxr/base/tf/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/moduleDeps.cpp b/pxr/base/tf/moduleDeps.cpp
index 72784a74ff..8ce3addbd2 100644
--- a/pxr/base/tf/moduleDeps.cpp
+++ b/pxr/base/tf/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/base/tf/notice.cpp b/pxr/base/tf/notice.cpp
index 50de43947e..a79236ddb4 100644
--- a/pxr/base/tf/notice.cpp
+++ b/pxr/base/tf/notice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/notice.h b/pxr/base/tf/notice.h
index 699ff27965..02556098aa 100644
--- a/pxr/base/tf/notice.h
+++ b/pxr/base/tf/notice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_NOTICE_H
 #define PXR_BASE_TF_NOTICE_H
diff --git a/pxr/base/tf/noticeRegistry.cpp b/pxr/base/tf/noticeRegistry.cpp
index 13a8f03c66..c0c682c317 100644
--- a/pxr/base/tf/noticeRegistry.cpp
+++ b/pxr/base/tf/noticeRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/noticeRegistry.h b/pxr/base/tf/noticeRegistry.h
index 9b77739e5c..c44501a129 100644
--- a/pxr/base/tf/noticeRegistry.h
+++ b/pxr/base/tf/noticeRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_NOTICE_REGISTRY_H
 #define PXR_BASE_TF_NOTICE_REGISTRY_H
diff --git a/pxr/base/tf/nullPtr.cpp b/pxr/base/tf/nullPtr.cpp
index 84704e80fa..eb28f08937 100644
--- a/pxr/base/tf/nullPtr.cpp
+++ b/pxr/base/tf/nullPtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/nullPtr.h b/pxr/base/tf/nullPtr.h
index 09f04c6e5c..ac1fce4801 100644
--- a/pxr/base/tf/nullPtr.h
+++ b/pxr/base/tf/nullPtr.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_NULL_PTR_H
 #define PXR_BASE_TF_NULL_PTR_H
diff --git a/pxr/base/tf/ostreamMethods.cpp b/pxr/base/tf/ostreamMethods.cpp
index 371fa715b7..baec64fdaa 100644
--- a/pxr/base/tf/ostreamMethods.cpp
+++ b/pxr/base/tf/ostreamMethods.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/ostreamMethods.h"
diff --git a/pxr/base/tf/ostreamMethods.h b/pxr/base/tf/ostreamMethods.h
index b4b76cc2ef..2aae41cb26 100644
--- a/pxr/base/tf/ostreamMethods.h
+++ b/pxr/base/tf/ostreamMethods.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_OSTREAM_METHODS_H
 #define PXR_BASE_TF_OSTREAM_METHODS_H
diff --git a/pxr/base/tf/pathUtils.cpp b/pxr/base/tf/pathUtils.cpp
index d8da7fbfd5..a0a902598d 100644
--- a/pxr/base/tf/pathUtils.cpp
+++ b/pxr/base/tf/pathUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -154,12 +137,6 @@ TfRealPath(string const& path, bool allowInaccessibleSuffix, string* error)
     }
     std::string resolved = _ExpandSymlinks(prefix);
 
-    // Make sure drive letters are always lower-case out of TfRealPath on
-    // Windows -- this is so that we can be sure we can reliably use the
-    // paths as keys in tables, etc.
-    if (resolved[0] && resolved[1] == ':') {
-        resolved[0] = tolower(resolved[0]);
-    }
     return TfAbsPath(resolved + suffix);
 #else
     char resolved[ARCH_PATH_MAX];
diff --git a/pxr/base/tf/pathUtils.h b/pxr/base/tf/pathUtils.h
index 4eb9fdda1f..fbed197901 100644
--- a/pxr/base/tf/pathUtils.h
+++ b/pxr/base/tf/pathUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PATH_UTILS_H
 #define PXR_BASE_TF_PATH_UTILS_H
diff --git a/pxr/base/tf/patternMatcher.cpp b/pxr/base/tf/patternMatcher.cpp
index 44a0105ccb..7fc20aeeba 100644
--- a/pxr/base/tf/patternMatcher.cpp
+++ b/pxr/base/tf/patternMatcher.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/patternMatcher.h b/pxr/base/tf/patternMatcher.h
index 862e16f210..d3b651fbb9 100644
--- a/pxr/base/tf/patternMatcher.h
+++ b/pxr/base/tf/patternMatcher.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PATTERN_MATCHER_H
 #define PXR_BASE_TF_PATTERN_MATCHER_H
diff --git a/pxr/base/tf/pch.h b/pxr/base/tf/pch.h
index 64e232c846..fa3f9ee464 100644
--- a/pxr/base/tf/pch.h
+++ b/pxr/base/tf/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -35,8 +18,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <utime.h>
-#include <boost/preprocessor/comparison/greater_equal.hpp>
-#include <boost/preprocessor/config/limits.hpp>
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
@@ -48,8 +29,6 @@
 #include <unistd.h>
 #include <utime.h>
 #include <x86intrin.h>
-#include <boost/preprocessor/comparison/greater_equal.hpp>
-#include <boost/preprocessor/config/limits.hpp>
 #endif
 #if defined(ARCH_OS_WINDOWS)
 #ifndef WIN32_LEAN_AND_MEAN
@@ -60,11 +39,11 @@
 #include <Shlwapi.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <cctype>
 #include <cerrno>
@@ -79,9 +58,11 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <ctype.h>
 #include <deque>
 #include <errno.h>
+#include <exception>
 #include <fcntl.h>
 #include <fstream>
 #include <functional>
@@ -89,6 +70,7 @@
 #include <inttypes.h>
 #include <iosfwd>
 #include <iostream>
+#include <istream>
 #include <iterator>
 #include <limits.h>
 #include <limits>
@@ -99,75 +81,37 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <ostream>
+#include <regex>
 #include <set>
 #include <signal.h>
 #include <sstream>
+#include <stack>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdexcept>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
+#include <string_view>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/assign.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/vector.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
 #include <boost/optional.hpp>
-#include <boost/preprocessor.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/if.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/bases.hpp>
 #include <boost/python/borrowed.hpp>
@@ -186,6 +130,7 @@
 #include <boost/python/dict.hpp>
 #include <boost/python/docstring_options.hpp>
 #include <boost/python/errors.hpp>
+#include <boost/python/exception_translator.hpp>
 #include <boost/python/extract.hpp>
 #include <boost/python/handle.hpp>
 #include <boost/python/has_back_reference.hpp>
@@ -224,29 +169,12 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/has_left_shift.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/is_signed.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/utility/in_place_factory.hpp>
-#include <boost/variant.hpp>
-#include <boost/variant/get.hpp>
-#include <boost/variant/variant.hpp>
-#include <tbb/atomic.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #include <frameobject.h>
+#include <patchlevel.h>
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/base/tf/pointerAndBits.cpp b/pxr/base/tf/pointerAndBits.cpp
index 736a07f4af..df818f8460 100644
--- a/pxr/base/tf/pointerAndBits.cpp
+++ b/pxr/base/tf/pointerAndBits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pointerAndBits.h"
 
diff --git a/pxr/base/tf/pointerAndBits.h b/pxr/base/tf/pointerAndBits.h
index 180213d01a..fc757f710d 100644
--- a/pxr/base/tf/pointerAndBits.h
+++ b/pxr/base/tf/pointerAndBits.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_POINTER_AND_BITS_H
 #define PXR_BASE_TF_POINTER_AND_BITS_H
diff --git a/pxr/base/tf/preprocessorUtilsLite.h b/pxr/base/tf/preprocessorUtilsLite.h
index bdf6d28db7..48d9aa9a24 100644
--- a/pxr/base/tf/preprocessorUtilsLite.h
+++ b/pxr/base/tf/preprocessorUtilsLite.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PREPROCESSOR_UTILS_LITE_H
 #define PXR_BASE_TF_PREPROCESSOR_UTILS_LITE_H
@@ -45,7 +28,7 @@
 /// Expand and convert the argument to a string, using a most minimal macro.
 #define TF_PP_STRINGIZE(x) TF_PP_STRINGIZE_IMPL(x)
 
-#ifdef ARCH_COMPILER_MSVC
+#ifdef ARCH_PREPROCESSOR_MSVC_TRADITIONAL
 
 /// Expand to the number of arguments passed.  For example,
 /// TF_PP_VARIADIC_SIZE(foo, bar, baz) expands to 3.  Supports up to 64
@@ -70,7 +53,7 @@
 /// and TF_PP_VARIADIC_ELEM(1, a, b, c) expands to b.
 #define TF_PP_VARIADIC_ELEM(n, ...) TF_PP_CAT(TF_PP_VAE_, n)(__VA_ARGS__,)
 
-#endif // ARCH_COMPILER_MSVC
+#endif // ARCH_PREPROCESSOR_MSVC_TRADITIONAL
 
 #define TF_PP_VARIADIC_SIZE_IMPL(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25, a26, a27, a28, a29, a30, a31, a32, a33, a34, a35, a36, a37, a38, a39, a40, a41, a42, a43, a44, a45, a46, a47, a48, a49, a50, a51, a52, a53, a54, a55, a56, a57, a58, a59, a60, a61, a62, a63, size, ...) size
 
@@ -139,7 +122,7 @@
 #define TF_PP_VAE_62(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25, a26, a27, a28, a29, a30, a31, a32, a33, a34, a35, a36, a37, a38, a39, a40, a41, a42, a43, a44, a45, a46, a47, a48, a49, a50, a51, a52, a53, a54, a55, a56, a57, a58, a59, a60, a61, a62, ...) a62
 #define TF_PP_VAE_63(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25, a26, a27, a28, a29, a30, a31, a32, a33, a34, a35, a36, a37, a38, a39, a40, a41, a42, a43, a44, a45, a46, a47, a48, a49, a50, a51, a52, a53, a54, a55, a56, a57, a58, a59, a60, a61, a62, a63, ...) a63
 
-#ifdef ARCH_COMPILER_MSVC
+#ifdef ARCH_PREPROCESSOR_MSVC_TRADITIONAL
 
 #define TF_PP_FE_0(_macro, ...)
 #define TF_PP_FE_1(_macro, a) _macro(a)
@@ -275,7 +258,7 @@
 
 #endif
 
-#ifdef ARCH_COMPILER_MSVC
+#ifdef ARCH_PREPROCESSOR_MSVC_TRADITIONAL
 
 /// Expand the macro \p x on every variadic argument.  For example
 /// TF_PP_FOR_EACH(MACRO, foo, bar, baz) expands to MACRO(foo) MACRO(bar)
@@ -415,7 +398,7 @@
     _TF_PP_SEQ_EXPAND(_TF_PP_SEQ_DISCARD_HEAD _TF_PP_SEQ_PARTITION_HEAD(seq))
 
 #define _TF_PP_SEQ_FE_0(_macro, ...)
-#ifdef ARCH_COMPILER_MSVC
+#ifdef ARCH_PREPROCESSOR_MSVC_TRADITIONAL
 #define _TF_PP_SEQ_FE_1(_macro, data, seq) TF_PP_CAT(_macro(data, _TF_PP_SEQ_HEAD(seq)),)
 // # Generates _TF_PP_SEQ_FE_{2:229} (MSVC)
 // python3 -c 'print("\n".join(f"#define _TF_PP_SEQ_FE_{i}(_macro, data, seq) TF_PP_CAT(_macro(data, _TF_PP_SEQ_HEAD(seq)),) TF_PP_CAT(_TF_PP_SEQ_FE_{i-1}(_macro, data, _TF_PP_SEQ_TAIL(seq)),)" for i in range(2, 230)))'
@@ -889,7 +872,7 @@
 /// #undef _PRINT
 /// \endcode
 /// Limited to sequences of up to 229 elements
-#ifdef ARCH_COMPILER_MSVC
+#ifdef ARCH_PREPROCESSOR_MSVC_TRADITIONAL
 #define _TF_PP_SEQ_FOR_EACH_IMPL(_macro, size, data, seq)                   \
     TF_PP_CAT(TF_PP_CAT(_TF_PP_SEQ_FE_, size),(_macro, data, seq))
 #define TF_PP_SEQ_FOR_EACH(_macro, data, seq)                               \
diff --git a/pxr/base/tf/pxrPEGTL/README.md b/pxr/base/tf/pxrPEGTL/README.md
deleted file mode 100644
index 30f37bc4b9..0000000000
--- a/pxr/base/tf/pxrPEGTL/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# The Art of C++ : PEGTL (Parsing Expression Grammar Template Library)
-
-[PEGTL](https://github.com/taocpp/PEGTL) is a library for creating
-parsers according to a Parsing Expression Grammar.
-
-## Version
-
-v2.8.3 ( 64af78c6a7959cd5753ad165ec9f65591aa96f2d )
-
-## Setup
-
-Refer to the [Installing and Using](https://github.com/taocpp/PEGTL/blob/2.x/doc/Installing-and-Using.md)
-documentation for instructions on how to generate this header.
-
-1. Follow the instructions in the "Single Header Version" section to generate
-   a single pegtl.hpp file.
-
-2. Rename the pegtl.hpp file to pegtl.h
-
-3. Apply the pxr-pegtl.patch file to apply Pixar-specific patches.
diff --git a/pxr/base/tf/pxrPEGTL/pegtl.h b/pxr/base/tf/pxrPEGTL/pegtl.h
deleted file mode 100644
index 300466e059..0000000000
--- a/pxr/base/tf/pxrPEGTL/pegtl.h
+++ /dev/null
@@ -1,12483 +0,0 @@
-/*
-
-Welcome to the Parsing Expression Grammar Template Library (PEGTL).
-See https://github.com/taocpp/PEGTL/ for more information, documentation, etc.
-
-The library is licensed as follows:
-
-The MIT License (MIT)
-
-Copyright (c) 2007-2020 Dr. Colin Hirsch and Daniel Frey
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-*/
-
-// PIXAR:
-// This header is not meant to be included in a .h file, to guard against
-// conflicts if a program includes their own pegtl header and then transitively
-// includes this header.
-#ifdef PXR_PEGTL_H
-#error This file should only be included once in any given source (.cpp) file.
-#endif
-#define PXR_PEGTL_H
-
-// PIXAR: 
-// Define TAO_PEGTL_NAMESPACE based on internal namespace to isolate
-// it from other versions of USD/PEGTL in client code.
-//
-// This would typically be done by wrapping the contents of this header in
-// PXR_NAMESPACE_OPEN_SCOPE and PXR_NAMESPACE_CLOSE_SCOPE, but that would
-// require more invasive changes to this header since there are STL header
-// includes scattered throughout.
-#include "pxr/pxr.h"
-
-#if PXR_USE_NAMESPACES
-#define TAO_PEGTL_NAMESPACE PXR_INTERNAL_NS ## _pegtl
-#else
-#define TAO_PEGTL_NAMESPACE pxr_pegtl
-#endif
-
-#line 1 "amalgamated.hpp"
-#line 1 "<built-in>"
-#line 1 "<command-line>"
-#line 1 "amalgamated.hpp"
-#line 1 "tao/pegtl.hpp"
-       
-#line 1 "tao/pegtl.hpp"
-
-
-
-#ifndef TAO_PEGTL_HPP
-#define TAO_PEGTL_HPP
-
-#line 1 "tao/pegtl/config.hpp"
-       
-#line 1 "tao/pegtl/config.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONFIG_HPP
-#define TAO_PEGTL_CONFIG_HPP
-
-// Compatibility, remove with 3.0.0
-#ifdef TAOCPP_PEGTL_NAMESPACE
-#define TAO_PEGTL_NAMESPACE TAOCPP_PEGTL_NAMESPACE
-#endif
-
-#ifndef TAO_PEGTL_NAMESPACE
-#define TAO_PEGTL_NAMESPACE pegtl
-#endif
-
-// Enable some improvements to the readability of
-// demangled type names under some circumstances.
-// #define TAO_PEGTL_PRETTY_DEMANGLE
-
-#endif
-#line 8 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/version.hpp"
-       
-#line 1 "tao/pegtl/version.hpp"
-
-
-
-#ifndef TAO_PEGTL_VERSION_HPP
-#define TAO_PEGTL_VERSION_HPP
-
-#define TAO_PEGTL_VERSION "2.8.3"
-
-#define TAO_PEGTL_VERSION_MAJOR 2
-#define TAO_PEGTL_VERSION_MINOR 8
-#define TAO_PEGTL_VERSION_PATCH 3
-
-// Compatibility, remove with 3.0.0
-#define TAOCPP_PEGTL_VERSION TAO_PEGTL_VERSION
-#define TAOCPP_PEGTL_VERSION_MAJOR TAO_PEGTL_VERSION_MAJOR
-#define TAOCPP_PEGTL_VERSION_MINOR TAO_PEGTL_VERSION_MINOR
-#define TAOCPP_PEGTL_VERSION_PATCH TAO_PEGTL_VERSION_PATCH
-
-#endif
-#line 9 "tao/pegtl.hpp"
-
-#line 1 "tao/pegtl/parse.hpp"
-       
-#line 1 "tao/pegtl/parse.hpp"
-
-
-
-#ifndef TAO_PEGTL_PARSE_HPP
-#define TAO_PEGTL_PARSE_HPP
-
-#include <cassert>
-
-#line 1 "tao/pegtl/apply_mode.hpp"
-       
-#line 1 "tao/pegtl/apply_mode.hpp"
-
-
-
-#ifndef TAO_PEGTL_APPLY_MODE_HPP
-#define TAO_PEGTL_APPLY_MODE_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      enum class apply_mode : bool
-      {
-         action = true,
-         nothing = false,
-
-         // Compatibility, remove with 3.0.0
-         ACTION = action,
-         NOTHING = nothing
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/parse.hpp"
-
-#line 1 "tao/pegtl/normal.hpp"
-       
-#line 1 "tao/pegtl/normal.hpp"
-
-
-
-#ifndef TAO_PEGTL_NORMAL_HPP
-#define TAO_PEGTL_NORMAL_HPP
-
-#include <type_traits>
-#include <utility>
-
-
-
-#line 1 "tao/pegtl/match.hpp"
-       
-#line 1 "tao/pegtl/match.hpp"
-
-
-
-#ifndef TAO_PEGTL_MATCH_HPP
-#define TAO_PEGTL_MATCH_HPP
-
-#include <type_traits>
-
-
-
-#line 1 "tao/pegtl/nothing.hpp"
-       
-#line 1 "tao/pegtl/nothing.hpp"
-
-
-
-#ifndef TAO_PEGTL_NOTHING_HPP
-#define TAO_PEGTL_NOTHING_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename Rule >
-      struct nothing
-      {
-      };
-
-      using maybe_nothing = nothing< void >;
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/match.hpp"
-#line 1 "tao/pegtl/require_apply.hpp"
-       
-#line 1 "tao/pegtl/require_apply.hpp"
-
-
-
-#ifndef TAO_PEGTL_REQUIRE_APPLY_HPP
-#define TAO_PEGTL_REQUIRE_APPLY_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct require_apply
-      {};
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/match.hpp"
-#line 1 "tao/pegtl/require_apply0.hpp"
-       
-#line 1 "tao/pegtl/require_apply0.hpp"
-
-
-
-#ifndef TAO_PEGTL_REQUIRE_APPLY0_HPP
-#define TAO_PEGTL_REQUIRE_APPLY0_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct require_apply0
-      {};
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl/match.hpp"
-#line 1 "tao/pegtl/rewind_mode.hpp"
-       
-#line 1 "tao/pegtl/rewind_mode.hpp"
-
-
-
-#ifndef TAO_PEGTL_REWIND_MODE_HPP
-#define TAO_PEGTL_REWIND_MODE_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      enum class rewind_mode : char
-      {
-         active,
-         required,
-         dontcare,
-
-         // Compatibility, remove with 3.0.0
-         ACTIVE = active,
-         REQUIRED = required,
-         DONTCARE = dontcare
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 15 "tao/pegtl/match.hpp"
-
-#line 1 "tao/pegtl/internal/dusel_mode.hpp"
-       
-#line 1 "tao/pegtl/internal/dusel_mode.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_DUSEL_MODE_HPP
-#define TAO_PEGTL_INTERNAL_DUSEL_MODE_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         enum class dusel_mode : char
-         {
-            nothing = 0,
-            control = 1,
-            control_and_apply_void = 2,
-            control_and_apply_bool = 3,
-            control_and_apply0_void = 4,
-            control_and_apply0_bool = 5,
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 17 "tao/pegtl/match.hpp"
-#line 1 "tao/pegtl/internal/duseltronik.hpp"
-       
-#line 1 "tao/pegtl/internal/duseltronik.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_DUSELTRONIK_HPP
-#define TAO_PEGTL_INTERNAL_DUSELTRONIK_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   dusel_mode = dusel_mode::nothing >
-         struct duseltronik;
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control >
-         struct duseltronik< Rule, A, M, Action, Control, dusel_mode::nothing >
-         {
-            template< typename Input, typename... States >
-            static auto match( Input& in, States&&... st )
-               -> decltype( Rule::template match< A, M, Action, Control >( in, st... ), true )
-            {
-               return Rule::template match< A, M, Action, Control >( in, st... );
-            }
-
-            // NOTE: The additional "int = 0" is a work-around for missing expression SFINAE in VS2015.
-
-            template< typename Input, typename... States, int = 0 >
-            static auto match( Input& in, States&&... /*unused*/ )
-               -> decltype( Rule::match( in ), true )
-            {
-               return Rule::match( in );
-            }
-         };
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control >
-         struct duseltronik< Rule, A, M, Action, Control, dusel_mode::control >
-         {
-            template< typename Input, typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               Control< Rule >::start( static_cast< const Input& >( in ), st... );
-
-               if( duseltronik< Rule, A, M, Action, Control, dusel_mode::nothing >::match( in, st... ) ) {
-                  Control< Rule >::success( static_cast< const Input& >( in ), st... );
-                  return true;
-               }
-               Control< Rule >::failure( static_cast< const Input& >( in ), st... );
-               return false;
-            }
-         };
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control >
-         struct duseltronik< Rule, A, M, Action, Control, dusel_mode::control_and_apply_void >
-         {
-            template< typename Input, typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< rewind_mode::required >();
-
-               Control< Rule >::start( static_cast< const Input& >( in ), st... );
-
-               if( duseltronik< Rule, A, rewind_mode::active, Action, Control, dusel_mode::nothing >::match( in, st... ) ) {
-                  Control< Rule >::template apply< Action >( m.iterator(), static_cast< const Input& >( in ), st... );
-                  Control< Rule >::success( static_cast< const Input& >( in ), st... );
-                  return m( true );
-               }
-               Control< Rule >::failure( static_cast< const Input& >( in ), st... );
-               return false;
-            }
-         };
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control >
-         struct duseltronik< Rule, A, M, Action, Control, dusel_mode::control_and_apply_bool >
-         {
-            template< typename Input, typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< rewind_mode::required >();
-
-               Control< Rule >::start( static_cast< const Input& >( in ), st... );
-
-               if( duseltronik< Rule, A, rewind_mode::active, Action, Control, dusel_mode::nothing >::match( in, st... ) ) {
-                  if( Control< Rule >::template apply< Action >( m.iterator(), static_cast< const Input& >( in ), st... ) ) {
-                     Control< Rule >::success( static_cast< const Input& >( in ), st... );
-                     return m( true );
-                  }
-               }
-               Control< Rule >::failure( static_cast< const Input& >( in ), st... );
-               return false;
-            }
-         };
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control >
-         struct duseltronik< Rule, A, M, Action, Control, dusel_mode::control_and_apply0_void >
-         {
-            template< typename Input, typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               Control< Rule >::start( static_cast< const Input& >( in ), st... );
-
-               if( duseltronik< Rule, A, M, Action, Control, dusel_mode::nothing >::match( in, st... ) ) {
-                  Control< Rule >::template apply0< Action >( static_cast< const Input& >( in ), st... );
-                  Control< Rule >::success( static_cast< const Input& >( in ), st... );
-                  return true;
-               }
-               Control< Rule >::failure( static_cast< const Input& >( in ), st... );
-               return false;
-            }
-         };
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control >
-         struct duseltronik< Rule, A, M, Action, Control, dusel_mode::control_and_apply0_bool >
-         {
-            template< typename Input, typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< rewind_mode::required >();
-
-               Control< Rule >::start( static_cast< const Input& >( in ), st... );
-
-               if( duseltronik< Rule, A, rewind_mode::active, Action, Control, dusel_mode::nothing >::match( in, st... ) ) {
-                  if( Control< Rule >::template apply0< Action >( static_cast< const Input& >( in ), st... ) ) {
-                     Control< Rule >::success( static_cast< const Input& >( in ), st... );
-                     return m( true );
-                  }
-               }
-               Control< Rule >::failure( static_cast< const Input& >( in ), st... );
-               return false;
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 18 "tao/pegtl/match.hpp"
-#line 1 "tao/pegtl/internal/has_apply.hpp"
-       
-#line 1 "tao/pegtl/internal/has_apply.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_HAS_APPLY_HPP
-#define TAO_PEGTL_INTERNAL_HAS_APPLY_HPP
-
-#include <type_traits>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename, typename, template< typename... > class, typename... >
-         struct has_apply
-            : std::false_type
-         {};
-
-         template< typename C, template< typename... > class Action, typename... S >
-         struct has_apply< C, decltype( C::template apply< Action >( std::declval< S >()... ) ), Action, S... >
-            : std::true_type
-         {};
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 19 "tao/pegtl/match.hpp"
-#line 1 "tao/pegtl/internal/has_apply0.hpp"
-       
-#line 1 "tao/pegtl/internal/has_apply0.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_HAS_APPLY0_HPP
-#define TAO_PEGTL_INTERNAL_HAS_APPLY0_HPP
-
-#include <type_traits>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename, typename, template< typename... > class, typename... >
-         struct has_apply0
-            : std::false_type
-         {};
-
-         template< typename C, template< typename... > class Action, typename... S >
-         struct has_apply0< C, decltype( C::template apply0< Action >( std::declval< S >()... ) ), Action, S... >
-            : std::true_type
-         {};
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 20 "tao/pegtl/match.hpp"
-#line 1 "tao/pegtl/internal/if_missing.hpp"
-       
-#line 1 "tao/pegtl/internal/if_missing.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_IF_MISSING_HPP
-#define TAO_PEGTL_INTERNAL_IF_MISSING_HPP
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< bool >
-         struct if_missing;
-
-         template<>
-         struct if_missing< true >
-         {
-            template< typename Control,
-                      template< typename... >
-                      class Action,
-                      typename Input,
-                      typename... States >
-            static void apply( Input& in, States&&... st )
-            {
-               auto m = in.template mark< rewind_mode::required >();
-               Control::template apply< Action >( m.iterator(), in, st... );
-            }
-
-            template< typename Control,
-                      template< typename... >
-                      class Action,
-                      typename Input,
-                      typename... States >
-            static void apply0( Input& in, States&&... st )
-            {
-               Control::template apply0< Action >( in, st... );
-            }
-         };
-
-         template<>
-         struct if_missing< false >
-         {
-            template< typename Control,
-                      template< typename... >
-                      class Action,
-                      typename Input,
-                      typename... States >
-            static void apply( Input& /*unused*/, States&&... /*unused*/ )
-            {
-            }
-
-            template< typename Control,
-                      template< typename... >
-                      class Action,
-                      typename Input,
-                      typename... States >
-            static void apply0( Input& /*unused*/, States&&... /*unused*/ )
-            {
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 21 "tao/pegtl/match.hpp"
-#line 1 "tao/pegtl/internal/skip_control.hpp"
-       
-#line 1 "tao/pegtl/internal/skip_control.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_SKIP_CONTROL_HPP
-#define TAO_PEGTL_INTERNAL_SKIP_CONTROL_HPP
-
-#include <type_traits>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         // This class is a simple tagging mechanism.
-         // By default, skip_control< Rule >::value
-         // is 'false'. Each internal (!) rule that should
-         // be hidden from the control and action class'
-         // callbacks simply specializes skip_control<>
-         // to return 'true' for the above expression.
-
-         template< typename Rule >
-         struct skip_control : std::false_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 22 "tao/pegtl/match.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename Rule,
-                apply_mode A,
-                rewind_mode M,
-                template< typename... >
-                class Action,
-                template< typename... >
-                class Control,
-                typename Input,
-                typename... States >
-      bool match( Input& in, States&&... st )
-      {
-         constexpr bool enable_control = !internal::skip_control< Rule >::value;
-         constexpr bool enable_action = enable_control && ( A == apply_mode::action );
-
-         using iterator_t = typename Input::iterator_t;
-         constexpr bool has_apply_void = enable_action && internal::has_apply< Control< Rule >, void, Action, const iterator_t&, const Input&, States... >::value;
-         constexpr bool has_apply_bool = enable_action && internal::has_apply< Control< Rule >, bool, Action, const iterator_t&, const Input&, States... >::value;
-         constexpr bool has_apply = has_apply_void || has_apply_bool;
-
-         constexpr bool has_apply0_void = enable_action && internal::has_apply0< Control< Rule >, void, Action, const Input&, States... >::value;
-         constexpr bool has_apply0_bool = enable_action && internal::has_apply0< Control< Rule >, bool, Action, const Input&, States... >::value;
-         constexpr bool has_apply0 = has_apply0_void || has_apply0_bool;
-
-         static_assert( !( has_apply && has_apply0 ), "both apply() and apply0() defined" );
-
-         constexpr bool is_nothing = std::is_base_of< nothing< Rule >, Action< Rule > >::value;
-         static_assert( !( has_apply && is_nothing ), "unexpected apply() defined" );
-         static_assert( !( has_apply0 && is_nothing ), "unexpected apply0() defined" );
-
-         internal::if_missing< !has_apply && std::is_base_of< require_apply, Action< Rule > >::value >::template apply< Control< Rule >, Action >( in, st... );
-         internal::if_missing< !has_apply0 && std::is_base_of< require_apply0, Action< Rule > >::value >::template apply0< Control< Rule >, Action >( in, st... );
-
-         constexpr bool validate_nothing = std::is_base_of< maybe_nothing, Action< void > >::value;
-         constexpr bool is_maybe_nothing = std::is_base_of< maybe_nothing, Action< Rule > >::value;
-         static_assert( !enable_action || !validate_nothing || is_nothing || is_maybe_nothing || has_apply || has_apply0, "either apply() or apply0() must be defined" );
-
-         constexpr auto mode = static_cast< internal::dusel_mode >( enable_control + has_apply_void + 2 * has_apply_bool + 3 * has_apply0_void + 4 * has_apply0_bool );
-         return internal::duseltronik< Rule, A, M, Action, Control, mode >::match( in, st... );
-      }
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/normal.hpp"
-#line 1 "tao/pegtl/parse_error.hpp"
-       
-#line 1 "tao/pegtl/parse_error.hpp"
-
-
-
-#ifndef TAO_PEGTL_PARSE_ERROR_HPP
-#define TAO_PEGTL_PARSE_ERROR_HPP
-
-#include <stdexcept>
-#include <vector>
-
-
-#line 1 "tao/pegtl/position.hpp"
-       
-#line 1 "tao/pegtl/position.hpp"
-
-
-
-#ifndef TAO_PEGTL_POSITION_HPP
-#define TAO_PEGTL_POSITION_HPP
-
-#include <cstdlib>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <utility>
-
-
-
-#line 1 "tao/pegtl/internal/iterator.hpp"
-       
-#line 1 "tao/pegtl/internal/iterator.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ITERATOR_HPP
-#define TAO_PEGTL_INTERNAL_ITERATOR_HPP
-
-#include <cstdlib>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct iterator
-         {
-            iterator() noexcept = default;
-
-            explicit iterator( const char* in_data ) noexcept
-               : data( in_data )
-            {
-            }
-
-            iterator( const char* in_data, const std::size_t in_byte, const std::size_t in_line, const std::size_t in_byte_in_line ) noexcept
-               : data( in_data ),
-                 byte( in_byte ),
-                 line( in_line ),
-                 byte_in_line( in_byte_in_line )
-            {
-            }
-
-            iterator( const iterator& ) = default;
-            iterator( iterator&& ) = default;
-
-            ~iterator() = default;
-
-            iterator& operator=( const iterator& ) = default;
-            iterator& operator=( iterator&& ) = default;
-
-            void reset() noexcept
-            {
-               *this = iterator();
-            }
-
-            const char* data = nullptr;
-
-            std::size_t byte = 0;
-            std::size_t line = 1;
-            std::size_t byte_in_line = 0;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 16 "tao/pegtl/position.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct position
-      {
-         template< typename T >
-         position( const internal::iterator& in_iter, T&& in_source )
-            : byte( in_iter.byte ),
-              line( in_iter.line ),
-              byte_in_line( in_iter.byte_in_line ),
-              source( std::forward< T >( in_source ) )
-         {
-         }
-
-         std::size_t byte;
-         std::size_t line;
-         std::size_t byte_in_line;
-         std::string source;
-      };
-
-      inline std::ostream& operator<<( std::ostream& o, const position& p )
-      {
-         return o << p.source << ':' << p.line << ':' << p.byte_in_line << '(' << p.byte << ')';
-      }
-
-      inline std::string to_string( const position& p )
-      {
-         std::ostringstream o;
-         o << p;
-         return o.str();
-      }
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/parse_error.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct parse_error
-         : public std::runtime_error
-      {
-         parse_error( const std::string& msg, std::vector< position >&& in_positions )
-            : std::runtime_error( msg ),
-              positions( std::move( in_positions ) )
-         {
-         }
-
-         template< typename Input >
-         parse_error( const std::string& msg, const Input& in )
-            : parse_error( msg, in.position() )
-         {
-         }
-
-         parse_error( const std::string& msg, const position& pos )
-            : std::runtime_error( to_string( pos ) + ": " + msg ),
-              positions( 1, pos )
-         {
-         }
-
-         parse_error( const std::string& msg, position&& pos )
-            : std::runtime_error( to_string( pos ) + ": " + msg )
-         {
-            positions.emplace_back( std::move( pos ) );
-         }
-
-         std::vector< position > positions;
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl/normal.hpp"
-
-
-#line 1 "tao/pegtl/internal/demangle.hpp"
-       
-#line 1 "tao/pegtl/internal/demangle.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_DEMANGLE_HPP
-#define TAO_PEGTL_INTERNAL_DEMANGLE_HPP
-
-#include <string>
-#include <typeinfo>
-
-
-
-#if defined( __clang__ )
-#if __has_feature( cxx_rtti )
-#define TAO_PEGTL_RTTI_ENABLED
-#endif
-#elif defined( __GNUC__ )
-#if defined( __GXX_RTTI )
-#define TAO_PEGTL_RTTI_ENABLED
-#endif
-#elif defined( _MSC_VER )
-#if defined( _CPPRTTI )
-#define TAO_PEGTL_RTTI_ENABLED
-#endif
-#else
-#define TAO_PEGTL_RTTI_ENABLED
-#endif
-
-#if !defined( TAO_PEGTL_RTTI_ENABLED )
-#include <cassert>
-#include <cstring>
-#endif
-
-#if defined( TAO_PEGTL_RTTI_ENABLED )
-#if defined( __GLIBCXX__ )
-#define TAO_PEGTL_USE_CXXABI_DEMANGLE
-#elif defined( __has_include )
-#if __has_include( <cxxabi.h> )
-#define TAO_PEGTL_USE_CXXABI_DEMANGLE
-#endif
-#endif
-#endif
-
-#if defined( TAO_PEGTL_USE_CXXABI_DEMANGLE )
-#line 1 "tao/pegtl/internal/demangle_cxxabi.hpp"
-       
-#line 1 "tao/pegtl/internal/demangle_cxxabi.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_DEMANGLE_CXXABI_HPP
-#define TAO_PEGTL_INTERNAL_DEMANGLE_CXXABI_HPP
-
-#include <cstdlib>
-#include <cxxabi.h>
-#include <memory>
-#include <string>
-
-
-
-#line 1 "tao/pegtl/internal/demangle_sanitise.hpp"
-       
-#line 1 "tao/pegtl/internal/demangle_sanitise.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_DEMANGLE_SANITISE_HPP
-#define TAO_PEGTL_INTERNAL_DEMANGLE_SANITISE_HPP
-
-#include <string>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         inline void demangle_sanitise_chars( std::string& s )
-         {
-            std::string::size_type p;
-            while( ( p = s.find( "(char)" ) ) != std::string::npos ) {
-               int c = 0;
-               std::string::size_type q;
-               for( q = p + 6; ( q < s.size() ) && ( s[ q ] >= '0' ) && ( s[ q ] <= '9' ); ++q ) {
-                  c *= 10;
-                  c += s[ q ] - '0';
-               }
-               if( c == '\'' ) {
-                  s.replace( p, q - p, "'\\''" );
-               }
-               else if( c == '\\' ) {
-                  s.replace( p, q - p, "'\\\\'" );
-               }
-               else if( ( c < 32 ) || ( c > 126 ) ) {
-                  s.replace( p, 6, std::string() );
-               }
-               else {
-                  s.replace( p, q - p, std::string( 1, '\'' ) + char( c ) + '\'' );
-               }
-            }
-         }
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 15 "tao/pegtl/internal/demangle_cxxabi.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         inline std::string demangle( const char* symbol )
-         {
-            const std::unique_ptr< char, decltype( &std::free ) > demangled( abi::__cxa_demangle( symbol, nullptr, nullptr, nullptr ), &std::free );
-            if( !demangled ) {
-               return symbol;
-            }
-            std::string result( demangled.get() );
-#ifdef TAO_PEGTL_PRETTY_DEMANGLE
-            demangle_sanitise_chars( result ); // LCOV_EXCL_LINE
-#endif
-            return result;
-         }
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 45 "tao/pegtl/internal/demangle.hpp"
-#undef TAO_PEGTL_USE_CXXABI_DEMANGLE
-#else
-#line 1 "tao/pegtl/internal/demangle_nop.hpp"
-       
-#line 1 "tao/pegtl/internal/demangle_nop.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_DEMANGLE_NOP_HPP
-#define TAO_PEGTL_INTERNAL_DEMANGLE_NOP_HPP
-
-#include <string>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         inline std::string demangle( const char* symbol )
-         {
-            return symbol;
-         }
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 48 "tao/pegtl/internal/demangle.hpp"
-#endif
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename T >
-         std::string demangle()
-         {
-#if defined( TAO_PEGTL_RTTI_ENABLED )
-            return demangle( typeid( T ).name() );
-#else
-            const char* start = nullptr;
-            const char* stop = nullptr;
-#if defined( __clang__ ) || defined( __GNUC__ )
-            start = std::strchr( __PRETTY_FUNCTION__, '=' ) + 2;
-            stop = std::strrchr( start, ';' );
-#elif defined( _MSC_VER )
-            start = std::strstr( __FUNCSIG__, "demangle<" ) + ( sizeof( "demangle<" ) - 1 );
-            stop = std::strrchr( start, '>' );
-#else
-            static_assert( false, "expected to use rtti with this compiler" );
-#endif
-            assert( start != nullptr );
-            assert( stop != nullptr );
-            return { start, std::size_t( stop - start ) };
-#endif
-         }
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 17 "tao/pegtl/normal.hpp"
-#line 1 "tao/pegtl/internal/has_match.hpp"
-       
-#line 1 "tao/pegtl/internal/has_match.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_HAS_MATCH_HPP
-#define TAO_PEGTL_INTERNAL_HAS_MATCH_HPP
-
-#include <type_traits>
-#include <utility>
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename,
-                   typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         struct has_match
-            : std::false_type
-         {};
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         struct has_match< decltype( Action< Rule >::template match< Rule, A, M, Action, Control >( std::declval< Input& >(), std::declval< States&& >()... ), void() ), Rule, A, M, Action, Control, Input, States... >
-            : std::true_type
-         {};
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 18 "tao/pegtl/normal.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename Rule >
-      struct normal
-      {
-         template< typename Input, typename... States >
-         static void start( const Input& /*unused*/, States&&... /*unused*/ ) noexcept
-         {
-         }
-
-         template< typename Input, typename... States >
-         static void success( const Input& /*unused*/, States&&... /*unused*/ ) noexcept
-         {
-         }
-
-         template< typename Input, typename... States >
-         static void failure( const Input& /*unused*/, States&&... /*unused*/ ) noexcept
-         {
-         }
-
-         template< typename Input, typename... States >
-         static void raise( const Input& in, States&&... /*unused*/ )
-         {
-            throw parse_error( "parse error matching " + internal::demangle< Rule >(), in );
-         }
-
-         template< template< typename... > class Action, typename Input, typename... States >
-         static auto apply0( const Input& /*unused*/, States&&... st )
-            -> decltype( Action< Rule >::apply0( st... ) )
-         {
-            return Action< Rule >::apply0( st... );
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename... States >
-         static auto apply( const Iterator& begin, const Input& in, States&&... st )
-            -> decltype( Action< Rule >::apply( std::declval< typename Input::action_t >(), st... ) )
-         {
-            const typename Input::action_t action_input( begin, in );
-            return Action< Rule >::apply( action_input, st... );
-         }
-
-         template< apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static auto match( Input& in, States&&... st )
-            -> typename std::enable_if< internal::has_match< void, Rule, A, M, Action, Control, Input, States... >::value, bool >::type
-         {
-            return Action< Rule >::template match< Rule, A, M, Action, Control >( in, st... );
-         }
-
-         template< apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States,
-                   int = 1 >
-         static auto match( Input& in, States&&... st )
-            -> typename std::enable_if< !internal::has_match< void, Rule, A, M, Action, Control, Input, States... >::value, bool >::type
-         {
-            return TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/parse.hpp"
-
-
-
-
-#line 1 "tao/pegtl/internal/action_input.hpp"
-       
-#line 1 "tao/pegtl/internal/action_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ACTION_INPUT_HPP
-#define TAO_PEGTL_INTERNAL_ACTION_INPUT_HPP
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         inline const char* begin_c_ptr( const char* p ) noexcept
-         {
-            return p;
-         }
-
-         inline const char* begin_c_ptr( const iterator& it ) noexcept
-         {
-            return it.data;
-         }
-
-         template< typename Input >
-         class action_input
-         {
-         public:
-            using input_t = Input;
-            using iterator_t = typename Input::iterator_t;
-
-            action_input( const iterator_t& in_begin, const Input& in_input ) noexcept
-               : m_begin( in_begin ),
-                 m_input( in_input )
-            {
-            }
-
-            action_input( const action_input& ) = delete;
-            action_input( action_input&& ) = delete;
-
-            ~action_input() = default;
-
-            action_input& operator=( const action_input& ) = delete;
-            action_input& operator=( action_input&& ) = delete;
-
-            const iterator_t& iterator() const noexcept
-            {
-               return m_begin;
-            }
-
-            const Input& input() const noexcept
-            {
-               return m_input;
-            }
-
-            const char* begin() const noexcept
-            {
-               return begin_c_ptr( iterator() );
-            }
-
-            const char* end() const noexcept
-            {
-               return input().current();
-            }
-
-            bool empty() const noexcept
-            {
-               return begin() == end();
-            }
-
-            std::size_t size() const noexcept
-            {
-               return std::size_t( end() - begin() );
-            }
-
-            std::string string() const
-            {
-               return std::string( begin(), end() );
-            }
-
-            char peek_char( const std::size_t offset = 0 ) const noexcept
-            {
-               return begin()[ offset ];
-            }
-
-            std::uint8_t peek_uint8( const std::size_t offset = 0 ) const noexcept
-            {
-               return static_cast< std::uint8_t >( peek_char( offset ) );
-            }
-
-            // Compatibility, remove with 3.0.0
-            std::uint8_t peek_byte( const std::size_t offset = 0 ) const noexcept
-            {
-               return static_cast< std::uint8_t >( peek_char( offset ) );
-            }
-
-            TAO_PEGTL_NAMESPACE::position position() const
-            {
-               return input().position( iterator() ); // NOTE: Not efficient with lazy inputs.
-            }
-
-         protected:
-            const iterator_t m_begin;
-            const Input& m_input;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 17 "tao/pegtl/parse.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename Rule,
-                template< typename... > class Action = nothing,
-                template< typename... > class Control = normal,
-                apply_mode A = apply_mode::action,
-                rewind_mode M = rewind_mode::required,
-                typename Input,
-                typename... States >
-      bool parse( Input&& in, States&&... st )
-      {
-         return Control< Rule >::template match< A, M, Action, Control >( in, st... );
-      }
-
-      template< typename Rule,
-                template< typename... > class Action = nothing,
-                template< typename... > class Control = normal,
-                apply_mode A = apply_mode::action,
-                rewind_mode M = rewind_mode::required,
-                typename Outer,
-                typename Input,
-                typename... States >
-      bool parse_nested( const Outer& oi, Input&& in, States&&... st )
-      {
-         try {
-            return parse< Rule, Action, Control, A, M >( in, st... );
-         }
-         catch( parse_error& e ) {
-            e.positions.push_back( oi.position() );
-            throw;
-         }
-      }
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl.hpp"
-
-#line 1 "tao/pegtl/ascii.hpp"
-       
-#line 1 "tao/pegtl/ascii.hpp"
-
-
-
-#ifndef TAO_PEGTL_ASCII_HPP
-#define TAO_PEGTL_ASCII_HPP
-
-
-#line 1 "tao/pegtl/eol.hpp"
-       
-#line 1 "tao/pegtl/eol.hpp"
-
-
-
-#ifndef TAO_PEGTL_EOL_HPP
-#define TAO_PEGTL_EOL_HPP
-
-
-
-#line 1 "tao/pegtl/internal/eol.hpp"
-       
-#line 1 "tao/pegtl/internal/eol.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_EOL_HPP
-#define TAO_PEGTL_INTERNAL_EOL_HPP
-
-
-
-
-
-#line 1 "tao/pegtl/internal/../analysis/generic.hpp"
-       
-#line 1 "tao/pegtl/internal/../analysis/generic.hpp"
-
-
-
-#ifndef TAO_PEGTL_ANALYSIS_GENERIC_HPP
-#define TAO_PEGTL_ANALYSIS_GENERIC_HPP
-
-
-
-#line 1 "tao/pegtl/internal/../analysis/grammar_info.hpp"
-       
-#line 1 "tao/pegtl/internal/../analysis/grammar_info.hpp"
-
-
-
-#ifndef TAO_PEGTL_ANALYSIS_GRAMMAR_INFO_HPP
-#define TAO_PEGTL_ANALYSIS_GRAMMAR_INFO_HPP
-
-#include <map>
-#include <string>
-#include <utility>
-
-
-
-
-#line 1 "tao/pegtl/internal/../analysis/rule_info.hpp"
-       
-#line 1 "tao/pegtl/internal/../analysis/rule_info.hpp"
-
-
-
-#ifndef TAO_PEGTL_ANALYSIS_RULE_INFO_HPP
-#define TAO_PEGTL_ANALYSIS_RULE_INFO_HPP
-
-#include <string>
-#include <vector>
-
-
-
-#line 1 "tao/pegtl/internal/../analysis/rule_type.hpp"
-       
-#line 1 "tao/pegtl/internal/../analysis/rule_type.hpp"
-
-
-
-#ifndef TAO_PEGTL_ANALYSIS_RULE_TYPE_HPP
-#define TAO_PEGTL_ANALYSIS_RULE_TYPE_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace analysis
-      {
-         enum class rule_type : char
-         {
-            any, // Consumption-on-success is always true; assumes bounded repetition of conjunction of sub-rules.
-            opt, // Consumption-on-success not necessarily true; assumes bounded repetition of conjunction of sub-rules.
-            seq, // Consumption-on-success depends on consumption of (non-zero bounded repetition of) conjunction of sub-rules.
-            sor, // Consumption-on-success depends on consumption of (non-zero bounded repetition of) disjunction of sub-rules.
-
-            // Compatibility, remove with 3.0.0
-            ANY = any,
-            OPT = opt,
-            SEQ = seq,
-            SOR = sor
-         };
-
-      } // namespace analysis
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/internal/../analysis/rule_info.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace analysis
-      {
-         struct rule_info
-         {
-            explicit rule_info( const rule_type in_type ) noexcept
-               : type( in_type )
-            {
-            }
-
-            rule_type type;
-            std::vector< std::string > rules;
-         };
-
-      } // namespace analysis
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 15 "tao/pegtl/internal/../analysis/grammar_info.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace analysis
-      {
-         struct grammar_info
-         {
-            using map_t = std::map< std::string, rule_info >;
-            map_t map;
-
-            template< typename Name >
-            std::pair< map_t::iterator, bool > insert( const rule_type type )
-            {
-               return map.insert( map_t::value_type( internal::demangle< Name >(), rule_info( type ) ) );
-            }
-         };
-
-      } // namespace analysis
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/../analysis/generic.hpp"
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace analysis
-      {
-         template< rule_type Type, typename... Rules >
-         struct generic
-         {
-            template< typename Name >
-            static std::string insert( grammar_info& g )
-            {
-               const auto r = g.insert< Name >( Type );
-               if( r.second ) {
-#ifdef __cpp_fold_expressions
-                  ( r.first->second.rules.push_back( Rules::analyze_t::template insert< Rules >( g ) ), ... );
-#else
-                  using swallow = bool[];
-                  (void)swallow{ ( r.first->second.rules.push_back( Rules::analyze_t::template insert< Rules >( g ) ), true )..., true };
-#endif
-               }
-               return r.first->first;
-            }
-         };
-
-      } // namespace analysis
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/internal/eol.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct eol
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( Input::eol_t::match( in ) ) )
-            {
-               return Input::eol_t::match( in ).first;
-            }
-         };
-
-         template<>
-         struct skip_control< eol > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/eol.hpp"
-
-#line 1 "tao/pegtl/internal/cr_crlf_eol.hpp"
-       
-#line 1 "tao/pegtl/internal/cr_crlf_eol.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_CR_CRLF_EOL_HPP
-#define TAO_PEGTL_INTERNAL_CR_CRLF_EOL_HPP
-
-
-#line 1 "tao/pegtl/internal/../eol_pair.hpp"
-       
-#line 1 "tao/pegtl/internal/../eol_pair.hpp"
-
-
-
-#ifndef TAO_PEGTL_EOL_PAIR_HPP
-#define TAO_PEGTL_EOL_PAIR_HPP
-
-#include <cstddef>
-#include <utility>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      using eol_pair = std::pair< bool, std::size_t >;
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 9 "tao/pegtl/internal/cr_crlf_eol.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct cr_crlf_eol
-         {
-            static constexpr int ch = '\r';
-
-            template< typename Input >
-            static eol_pair match( Input& in ) noexcept( noexcept( in.size( 2 ) ) )
-            {
-               eol_pair p = { false, in.size( 2 ) };
-               if( p.second ) {
-                  if( in.peek_char() == '\r' ) {
-                     in.bump_to_next_line( 1 + ( ( p.second > 1 ) && ( in.peek_char( 1 ) == '\n' ) ) );
-                     p.first = true;
-                  }
-               }
-               return p;
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/eol.hpp"
-#line 1 "tao/pegtl/internal/cr_eol.hpp"
-       
-#line 1 "tao/pegtl/internal/cr_eol.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_CR_EOL_HPP
-#define TAO_PEGTL_INTERNAL_CR_EOL_HPP
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct cr_eol
-         {
-            static constexpr int ch = '\r';
-
-            template< typename Input >
-            static eol_pair match( Input& in ) noexcept( noexcept( in.size( 1 ) ) )
-            {
-               eol_pair p = { false, in.size( 1 ) };
-               if( p.second ) {
-                  if( in.peek_char() == '\r' ) {
-                     in.bump_to_next_line();
-                     p.first = true;
-                  }
-               }
-               return p;
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/eol.hpp"
-#line 1 "tao/pegtl/internal/crlf_eol.hpp"
-       
-#line 1 "tao/pegtl/internal/crlf_eol.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_CRLF_EOL_HPP
-#define TAO_PEGTL_INTERNAL_CRLF_EOL_HPP
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct crlf_eol
-         {
-            static constexpr int ch = '\n';
-
-            template< typename Input >
-            static eol_pair match( Input& in ) noexcept( noexcept( in.size( 2 ) ) )
-            {
-               eol_pair p = { false, in.size( 2 ) };
-               if( p.second > 1 ) {
-                  if( ( in.peek_char() == '\r' ) && ( in.peek_char( 1 ) == '\n' ) ) {
-                     in.bump_to_next_line( 2 );
-                     p.first = true;
-                  }
-               }
-               return p;
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl/eol.hpp"
-#line 1 "tao/pegtl/internal/lf_crlf_eol.hpp"
-       
-#line 1 "tao/pegtl/internal/lf_crlf_eol.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_LF_CRLF_EOL_HPP
-#define TAO_PEGTL_INTERNAL_LF_CRLF_EOL_HPP
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct lf_crlf_eol
-         {
-            static constexpr int ch = '\n';
-
-            template< typename Input >
-            static eol_pair match( Input& in ) noexcept( noexcept( in.size( 2 ) ) )
-            {
-               eol_pair p = { false, in.size( 2 ) };
-               if( p.second ) {
-                  const auto a = in.peek_char();
-                  if( a == '\n' ) {
-                     in.bump_to_next_line();
-                     p.first = true;
-                  }
-                  else if( ( a == '\r' ) && ( p.second > 1 ) && ( in.peek_char( 1 ) == '\n' ) ) {
-                     in.bump_to_next_line( 2 );
-                     p.first = true;
-                  }
-               }
-               return p;
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 15 "tao/pegtl/eol.hpp"
-#line 1 "tao/pegtl/internal/lf_eol.hpp"
-       
-#line 1 "tao/pegtl/internal/lf_eol.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_LF_EOL_HPP
-#define TAO_PEGTL_INTERNAL_LF_EOL_HPP
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct lf_eol
-         {
-            static constexpr int ch = '\n';
-
-            template< typename Input >
-            static eol_pair match( Input& in ) noexcept( noexcept( in.size( 1 ) ) )
-            {
-               eol_pair p = { false, in.size( 1 ) };
-               if( p.second ) {
-                  if( in.peek_char() == '\n' ) {
-                     in.bump_to_next_line();
-                     p.first = true;
-                  }
-               }
-               return p;
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 16 "tao/pegtl/eol.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      inline namespace ascii
-      {
-         // this is both a rule and a pseudo-namespace for eol::cr, ...
-         struct eol : internal::eol
-         {
-            // clang-format off
-            struct cr : internal::cr_eol {};
-            struct cr_crlf : internal::cr_crlf_eol {};
-            struct crlf : internal::crlf_eol {};
-            struct lf : internal::lf_eol {};
-            struct lf_crlf : internal::lf_crlf_eol {};
-            // clang-format on
-         };
-
-      } // namespace ascii
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 9 "tao/pegtl/ascii.hpp"
-
-#line 1 "tao/pegtl/internal/always_false.hpp"
-       
-#line 1 "tao/pegtl/internal/always_false.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ALWAYS_FALSE_HPP
-#define TAO_PEGTL_INTERNAL_ALWAYS_FALSE_HPP
-
-
-
-#include <type_traits>
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename... >
-         struct always_false
-            : std::false_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl/ascii.hpp"
-#line 1 "tao/pegtl/internal/result_on_found.hpp"
-       
-#line 1 "tao/pegtl/internal/result_on_found.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_RESULT_ON_FOUND_HPP
-#define TAO_PEGTL_INTERNAL_RESULT_ON_FOUND_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         enum class result_on_found : bool
-         {
-            success = true,
-            failure = false,
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/ascii.hpp"
-#line 1 "tao/pegtl/internal/rules.hpp"
-       
-#line 1 "tao/pegtl/internal/rules.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_RULES_HPP
-#define TAO_PEGTL_INTERNAL_RULES_HPP
-
-#line 1 "tao/pegtl/internal/action.hpp"
-       
-#line 1 "tao/pegtl/internal/action.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ACTION_HPP
-#define TAO_PEGTL_INTERNAL_ACTION_HPP
-
-
-
-#line 1 "tao/pegtl/internal/seq.hpp"
-       
-#line 1 "tao/pegtl/internal/seq.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_SEQ_HPP
-#define TAO_PEGTL_INTERNAL_SEQ_HPP
-
-
-
-
-#line 1 "tao/pegtl/internal/trivial.hpp"
-       
-#line 1 "tao/pegtl/internal/trivial.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_TRIVIAL_HPP
-#define TAO_PEGTL_INTERNAL_TRIVIAL_HPP
-
-
-
-
-
-#line 1 "tao/pegtl/internal/../analysis/counted.hpp"
-       
-#line 1 "tao/pegtl/internal/../analysis/counted.hpp"
-
-
-
-#ifndef TAO_PEGTL_ANALYSIS_COUNTED_HPP
-#define TAO_PEGTL_ANALYSIS_COUNTED_HPP
-
-
-
-#include <cstddef>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace analysis
-      {
-         template< rule_type Type, std::size_t Count, typename... Rules >
-         struct counted
-            : generic< ( Count != 0 ) ? Type : rule_type::opt, Rules... >
-         {
-         };
-
-      } // namespace analysis
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/internal/trivial.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< bool Result >
-         struct trivial
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::any, unsigned( !Result ) >;
-
-            template< typename Input >
-            static bool match( Input& /*unused*/ ) noexcept
-            {
-               return Result;
-            }
-         };
-
-         template< bool Result >
-         struct skip_control< trivial< Result > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl/internal/seq.hpp"
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename... Rules >
-         struct seq;
-
-         template<>
-         struct seq<>
-            : trivial< true >
-         {
-         };
-
-         template< typename Rule >
-         struct seq< Rule >
-         {
-            using analyze_t = typename Rule::analyze_t;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Rule >::template match< A, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename... Rules >
-         struct seq
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, Rules... >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< M >();
-               using m_t = decltype( m );
-#ifdef __cpp_fold_expressions
-               return m( ( Control< Rules >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) && ... ) );
-#else
-               bool result = true;
-               using swallow = bool[];
-               (void)swallow{ result = result && Control< Rules >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... )... };
-               return m( result );
-#endif
-            }
-
-         }; // namespace internal
-
-         template< typename... Rules >
-         struct skip_control< seq< Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/action.hpp"
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< template< typename... > class Action, typename... Rules >
-         struct action
-            : action< Action, seq< Rules... > >
-         {
-         };
-
-         template< template< typename... > class Action, typename Rule >
-         struct action< Action, Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, Rule >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Rule >::template match< A, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< template< typename... > class Action, typename... Rules >
-         struct skip_control< action< Action, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 8 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/alnum.hpp"
-       
-#line 1 "tao/pegtl/internal/alnum.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ALNUM_HPP
-#define TAO_PEGTL_INTERNAL_ALNUM_HPP
-
-
-
-#line 1 "tao/pegtl/internal/peek_char.hpp"
-       
-#line 1 "tao/pegtl/internal/peek_char.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEEK_CHAR_HPP
-#define TAO_PEGTL_INTERNAL_PEEK_CHAR_HPP
-
-#include <cstddef>
-
-
-
-#line 1 "tao/pegtl/internal/input_pair.hpp"
-       
-#line 1 "tao/pegtl/internal/input_pair.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_INPUT_PAIR_HPP
-#define TAO_PEGTL_INTERNAL_INPUT_PAIR_HPP
-
-#include <cstdint>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Data >
-         struct input_pair
-         {
-            Data data;
-            std::uint8_t size;
-
-            using data_t = Data;
-
-            explicit operator bool() const noexcept
-            {
-               return size > 0;
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/internal/peek_char.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct peek_char
-         {
-            using data_t = char;
-            using pair_t = input_pair< char >;
-
-            template< typename Input >
-            static pair_t peek( Input& in ) noexcept( noexcept( in.empty() ) )
-            {
-               if( in.empty() ) {
-                  return { 0, 0 };
-               }
-               return { in.peek_char(), 1 };
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/alnum.hpp"
-#line 1 "tao/pegtl/internal/ranges.hpp"
-       
-#line 1 "tao/pegtl/internal/ranges.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_RANGES_HPP
-#define TAO_PEGTL_INTERNAL_RANGES_HPP
-
-
-
-#line 1 "tao/pegtl/internal/bump_help.hpp"
-       
-#line 1 "tao/pegtl/internal/bump_help.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_BUMP_HELP_HPP
-#define TAO_PEGTL_INTERNAL_BUMP_HELP_HPP
-
-#include <cstddef>
-#include <type_traits>
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< bool >
-         struct bump_impl;
-
-         template<>
-         struct bump_impl< true >
-         {
-            template< typename Input >
-            static void bump( Input& in, const std::size_t count ) noexcept
-            {
-               in.bump( count );
-            }
-         };
-
-         template<>
-         struct bump_impl< false >
-         {
-            template< typename Input >
-            static void bump( Input& in, const std::size_t count ) noexcept
-            {
-               in.bump_in_this_line( count );
-            }
-         };
-
-         template< bool... >
-         struct bool_list
-         {
-         };
-
-         template< bool... Bs >
-         using bool_and = std::is_same< bool_list< Bs..., true >, bool_list< true, Bs... > >;
-
-         template< result_on_found R, typename Input, typename Char, Char... Cs >
-         void bump_help( Input& in, const std::size_t count ) noexcept
-         {
-            bump_impl< bool_and< ( Cs != Input::eol_t::ch )... >::value != bool( R ) >::bump( in, count );
-         }
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/ranges.hpp"
-#line 1 "tao/pegtl/internal/range.hpp"
-       
-#line 1 "tao/pegtl/internal/range.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_RANGE_HPP
-#define TAO_PEGTL_INTERNAL_RANGE_HPP
-#line 15 "tao/pegtl/internal/range.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< result_on_found R, typename Peek, typename Peek::data_t Lo, typename Peek::data_t Hi >
-         struct range
-         {
-            static_assert( Lo <= Hi, "invalid range detected" );
-
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-            template< int Eol >
-            struct can_match_eol
-            {
-               static constexpr bool value = ( ( ( Lo <= Eol ) && ( Eol <= Hi ) ) == bool( R ) );
-            };
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( Peek::peek( in ) ) )
-            {
-               if( const auto t = Peek::peek( in ) ) {
-                  if( ( ( Lo <= t.data ) && ( t.data <= Hi ) ) == bool( R ) ) {
-                     bump_impl< can_match_eol< Input::eol_t::ch >::value >::bump( in, t.size );
-                     return true;
-                  }
-               }
-               return false;
-            }
-         };
-
-         template< result_on_found R, typename Peek, typename Peek::data_t Lo, typename Peek::data_t Hi >
-         struct skip_control< range< R, Peek, Lo, Hi > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl/internal/ranges.hpp"
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< int Eol, typename Char, Char... Cs >
-         struct ranges_impl;
-
-         template< int Eol, typename Char >
-         struct ranges_impl< Eol, Char >
-         {
-            static constexpr bool can_match_eol = false;
-
-            static bool match( const Char /*unused*/ ) noexcept
-            {
-               return false;
-            }
-         };
-
-         template< int Eol, typename Char, Char Eq >
-         struct ranges_impl< Eol, Char, Eq >
-         {
-            static constexpr bool can_match_eol = ( Eq == Eol );
-
-            static bool match( const Char c ) noexcept
-            {
-               return c == Eq;
-            }
-         };
-
-         template< int Eol, typename Char, Char Lo, Char Hi, Char... Cs >
-         struct ranges_impl< Eol, Char, Lo, Hi, Cs... >
-         {
-            static_assert( Lo <= Hi, "invalid range detected" );
-
-            static constexpr bool can_match_eol = ( ( ( Lo <= Eol ) && ( Eol <= Hi ) ) || ranges_impl< Eol, Char, Cs... >::can_match_eol );
-
-            static bool match( const Char c ) noexcept
-            {
-               return ( ( Lo <= c ) && ( c <= Hi ) ) || ranges_impl< Eol, Char, Cs... >::match( c );
-            }
-         };
-
-         template< typename Peek, typename Peek::data_t... Cs >
-         struct ranges
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-            template< int Eol >
-            struct can_match_eol
-            {
-               static constexpr bool value = ranges_impl< Eol, typename Peek::data_t, Cs... >::can_match_eol;
-            };
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( Peek::peek( in ) ) )
-            {
-               if( const auto t = Peek::peek( in ) ) {
-                  if( ranges_impl< Input::eol_t::ch, typename Peek::data_t, Cs... >::match( t.data ) ) {
-                     bump_impl< can_match_eol< Input::eol_t::ch >::value >::bump( in, t.size );
-                     return true;
-                  }
-               }
-               return false;
-            }
-         };
-
-         template< typename Peek, typename Peek::data_t Lo, typename Peek::data_t Hi >
-         struct ranges< Peek, Lo, Hi >
-            : range< result_on_found::success, Peek, Lo, Hi >
-         {
-         };
-
-         template< typename Peek, typename Peek::data_t... Cs >
-         struct skip_control< ranges< Peek, Cs... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl/internal/alnum.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         using alnum = ranges< peek_char, 'a', 'z', 'A', 'Z', '0', '9' >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 9 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/alpha.hpp"
-       
-#line 1 "tao/pegtl/internal/alpha.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ALPHA_HPP
-#define TAO_PEGTL_INTERNAL_ALPHA_HPP
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         using alpha = ranges< peek_char, 'a', 'z', 'A', 'Z' >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/any.hpp"
-       
-#line 1 "tao/pegtl/internal/any.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ANY_HPP
-#define TAO_PEGTL_INTERNAL_ANY_HPP
-#line 14 "tao/pegtl/internal/any.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Peek >
-         struct any;
-
-         template<>
-         struct any< peek_char >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( in.empty() ) )
-            {
-               if( !in.empty() ) {
-                  in.bump();
-                  return true;
-               }
-               return false;
-            }
-         };
-
-         template< typename Peek >
-         struct any
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( Peek::peek( in ) ) )
-            {
-               if( const auto t = Peek::peek( in ) ) {
-                  in.bump( t.size );
-                  return true;
-               }
-               return false;
-            }
-         };
-
-         template< typename Peek >
-         struct skip_control< any< Peek > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/apply.hpp"
-       
-#line 1 "tao/pegtl/internal/apply.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_APPLY_HPP
-#define TAO_PEGTL_INTERNAL_APPLY_HPP
-
-
-
-#line 1 "tao/pegtl/internal/apply_single.hpp"
-       
-#line 1 "tao/pegtl/internal/apply_single.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_APPLY_SINGLE_HPP
-#define TAO_PEGTL_INTERNAL_APPLY_SINGLE_HPP
-
-
-
-#include <type_traits>
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Action >
-         struct apply_single
-         {
-            template< typename Input, typename... States >
-            static auto match( const Input& i2, States&&... st )
-               -> typename std::enable_if< std::is_same< decltype( Action::apply( i2, st... ) ), void >::value, bool >::type
-            {
-               Action::apply( i2, st... );
-               return true;
-            }
-
-            template< typename Input, typename... States >
-            static auto match( const Input& i2, States&&... st )
-               -> typename std::enable_if< std::is_same< decltype( Action::apply( i2, st... ) ), bool >::value, bool >::type
-            {
-               return Action::apply( i2, st... );
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/apply.hpp"
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< apply_mode A, typename... Actions >
-         struct apply_impl;
-
-         template<>
-         struct apply_impl< apply_mode::action >
-         {
-            template< typename Input, typename... States >
-            static bool match( Input& /*unused*/, States&&... /*unused*/ )
-            {
-               return true;
-            }
-         };
-
-         template< typename... Actions >
-         struct apply_impl< apply_mode::action, Actions... >
-         {
-            template< typename Input, typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               using action_t = typename Input::action_t;
-               const action_t i2( in.iterator(), in ); // No data -- range is from begin to begin.
-#ifdef __cpp_fold_expressions
-               return ( apply_single< Actions >::match( i2, st... ) && ... );
-#else
-               bool result = true;
-               using swallow = bool[];
-               (void)swallow{ result = result && apply_single< Actions >::match( i2, st... )... };
-               return result;
-#endif
-            }
-         };
-
-         template< typename... Actions >
-         struct apply_impl< apply_mode::nothing, Actions... >
-         {
-            template< typename Input, typename... States >
-            static bool match( Input& /*unused*/, States&&... /*unused*/ )
-            {
-               return true;
-            }
-         };
-
-         template< typename... Actions >
-         struct apply
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::any, 0 >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return apply_impl< A, Actions... >::match( in, st... );
-            }
-         };
-
-         template< typename... Actions >
-         struct skip_control< apply< Actions... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/apply0.hpp"
-       
-#line 1 "tao/pegtl/internal/apply0.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_APPLY0_HPP
-#define TAO_PEGTL_INTERNAL_APPLY0_HPP
-
-
-
-#line 1 "tao/pegtl/internal/apply0_single.hpp"
-       
-#line 1 "tao/pegtl/internal/apply0_single.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_APPLY0_SINGLE_HPP
-#define TAO_PEGTL_INTERNAL_APPLY0_SINGLE_HPP
-
-
-
-#include <type_traits>
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Action >
-         struct apply0_single
-         {
-            template< typename... States >
-            static auto match( States&&... st )
-               -> typename std::enable_if< std::is_same< decltype( Action::apply0( st... ) ), void >::value, bool >::type
-            {
-               Action::apply0( st... );
-               return true;
-            }
-
-            template< typename... States >
-            static auto match( States&&... st )
-               -> typename std::enable_if< std::is_same< decltype( Action::apply0( st... ) ), bool >::value, bool >::type
-            {
-               return Action::apply0( st... );
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/apply0.hpp"
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< apply_mode A, typename... Actions >
-         struct apply0_impl;
-
-         template<>
-         struct apply0_impl< apply_mode::action >
-         {
-            template< typename... States >
-            static bool match( States&&... /*unused*/ ) noexcept
-            {
-               return true;
-            }
-         };
-
-         template< typename... Actions >
-         struct apply0_impl< apply_mode::action, Actions... >
-         {
-            template< typename... States >
-            static bool match( States&&... st )
-            {
-#ifdef __cpp_fold_expressions
-               return ( apply0_single< Actions >::match( st... ) && ... );
-#else
-               bool result = true;
-               using swallow = bool[];
-               (void)swallow{ result = result && apply0_single< Actions >::match( st... )... };
-               return result;
-#endif
-            }
-         };
-
-         template< typename... Actions >
-         struct apply0_impl< apply_mode::nothing, Actions... >
-         {
-            template< typename... States >
-            static bool match( States&&... /*unused*/ ) noexcept
-            {
-               return true;
-            }
-         };
-
-         template< typename... Actions >
-         struct apply0
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::any, 0 >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& /*unused*/, States&&... st )
-            {
-               return apply0_impl< A, Actions... >::match( st... );
-            }
-         };
-
-         template< typename... Actions >
-         struct skip_control< apply0< Actions... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/at.hpp"
-       
-#line 1 "tao/pegtl/internal/at.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_AT_HPP
-#define TAO_PEGTL_INTERNAL_AT_HPP
-#line 18 "tao/pegtl/internal/at.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename... Rules >
-         struct at
-            : at< seq< Rules... > >
-         {
-         };
-
-         template<>
-         struct at<>
-            : trivial< true >
-         {
-         };
-
-         template< typename Rule >
-         struct at< Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt, Rule >;
-
-            template< apply_mode,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               const auto m = in.template mark< rewind_mode::required >();
-               return Control< Rule >::template match< apply_mode::nothing, rewind_mode::active, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename... Rules >
-         struct skip_control< at< Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/bof.hpp"
-       
-#line 1 "tao/pegtl/internal/bof.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_BOF_HPP
-#define TAO_PEGTL_INTERNAL_BOF_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct bof
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept
-            {
-               return in.byte() == 0;
-            }
-         };
-
-         template<>
-         struct skip_control< bof > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 15 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/bol.hpp"
-       
-#line 1 "tao/pegtl/internal/bol.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_BOL_HPP
-#define TAO_PEGTL_INTERNAL_BOL_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct bol
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept
-            {
-               return in.byte_in_line() == 0;
-            }
-         };
-
-         template<>
-         struct skip_control< bol > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 16 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/bytes.hpp"
-       
-#line 1 "tao/pegtl/internal/bytes.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_BYTES_HPP
-#define TAO_PEGTL_INTERNAL_BYTES_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< unsigned Num >
-         struct bytes
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::any, Num >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( in.size( 0 ) ) )
-            {
-               if( in.size( Num ) >= Num ) {
-                  in.bump( Num );
-                  return true;
-               }
-               return false;
-            }
-         };
-
-         template< unsigned Num >
-         struct skip_control< bytes< Num > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 17 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/control.hpp"
-       
-#line 1 "tao/pegtl/internal/control.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_CONTROL_HPP
-#define TAO_PEGTL_INTERNAL_CONTROL_HPP
-#line 17 "tao/pegtl/internal/control.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< template< typename... > class Control, typename... Rules >
-         struct control
-            : control< Control, seq< Rules... > >
-         {
-         };
-
-         template< template< typename... > class Control, typename Rule >
-         struct control< Control, Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, Rule >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Rule >::template match< A, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< template< typename... > class Control, typename... Rules >
-         struct skip_control< control< Control, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 18 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/disable.hpp"
-       
-#line 1 "tao/pegtl/internal/disable.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_DISABLE_HPP
-#define TAO_PEGTL_INTERNAL_DISABLE_HPP
-#line 17 "tao/pegtl/internal/disable.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename... Rules >
-         struct disable
-            : disable< seq< Rules... > >
-         {
-         };
-
-         template< typename Rule >
-         struct disable< Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, Rule >;
-
-            template< apply_mode,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Rule >::template match< apply_mode::nothing, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename... Rules >
-         struct skip_control< disable< Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 19 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/discard.hpp"
-       
-#line 1 "tao/pegtl/internal/discard.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_DISCARD_HPP
-#define TAO_PEGTL_INTERNAL_DISCARD_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct discard
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept
-            {
-               static_assert( noexcept( in.discard() ), "an input's discard()-method must be noexcept" );
-               in.discard();
-               return true;
-            }
-         };
-
-         template<>
-         struct skip_control< discard > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 20 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/enable.hpp"
-       
-#line 1 "tao/pegtl/internal/enable.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ENABLE_HPP
-#define TAO_PEGTL_INTERNAL_ENABLE_HPP
-#line 17 "tao/pegtl/internal/enable.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename... Rules >
-         struct enable
-            : enable< seq< Rules... > >
-         {
-         };
-
-         template< typename Rule >
-         struct enable< Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, Rule >;
-
-            template< apply_mode,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Rule >::template match< apply_mode::action, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename... Rules >
-         struct skip_control< enable< Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 21 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/eof.hpp"
-       
-#line 1 "tao/pegtl/internal/eof.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_EOF_HPP
-#define TAO_PEGTL_INTERNAL_EOF_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct eof
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( in.empty() ) )
-            {
-               return in.empty();
-            }
-         };
-
-         template<>
-         struct skip_control< eof > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 22 "tao/pegtl/internal/rules.hpp"
-
-#line 1 "tao/pegtl/internal/eolf.hpp"
-       
-#line 1 "tao/pegtl/internal/eolf.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_EOLF_HPP
-#define TAO_PEGTL_INTERNAL_EOLF_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct eolf
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( Input::eol_t::match( in ) ) )
-            {
-               const auto p = Input::eol_t::match( in );
-               return p.first || ( !p.second );
-            }
-         };
-
-         template<>
-         struct skip_control< eolf > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 24 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/identifier.hpp"
-       
-#line 1 "tao/pegtl/internal/identifier.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_IDENTIFIER_HPP
-#define TAO_PEGTL_INTERNAL_IDENTIFIER_HPP
-
-
-
-
-
-
-#line 1 "tao/pegtl/internal/star.hpp"
-       
-#line 1 "tao/pegtl/internal/star.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_STAR_HPP
-#define TAO_PEGTL_INTERNAL_STAR_HPP
-
-#include <type_traits>
-#line 19 "tao/pegtl/internal/star.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Rule, typename... Rules >
-         struct star
-            : star< seq< Rule, Rules... > >
-         {};
-
-         template< typename Rule >
-         struct star< Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt, Rule, star >;
-
-            template< apply_mode A,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               while( Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
-               }
-               return true;
-            }
-         };
-
-         template< typename Rule, typename... Rules >
-         struct skip_control< star< Rule, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/internal/identifier.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         using identifier_first = ranges< peek_char, 'a', 'z', 'A', 'Z', '_' >;
-         using identifier_other = ranges< peek_char, 'a', 'z', 'A', 'Z', '0', '9', '_' >;
-         using identifier = seq< identifier_first, star< identifier_other > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 25 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/if_apply.hpp"
-       
-#line 1 "tao/pegtl/internal/if_apply.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_IF_APPLY_HPP
-#define TAO_PEGTL_INTERNAL_IF_APPLY_HPP
-#line 16 "tao/pegtl/internal/if_apply.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< apply_mode A, typename Rule, typename... Actions >
-         struct if_apply_impl;
-
-         template< typename Rule >
-         struct if_apply_impl< apply_mode::action, Rule >
-         {
-            template< rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Rule >::template match< apply_mode::action, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename Rule, typename... Actions >
-         struct if_apply_impl< apply_mode::action, Rule, Actions... >
-         {
-            template< rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               using action_t = typename Input::action_t;
-
-               auto m = in.template mark< rewind_mode::required >();
-
-               if( Control< Rule >::template match< apply_mode::action, rewind_mode::active, Action, Control >( in, st... ) ) {
-                  const action_t i2( m.iterator(), in );
-#ifdef __cpp_fold_expressions
-                  return m( ( apply_single< Actions >::match( i2, st... ) && ... ) );
-#else
-                  bool result = true;
-                  using swallow = bool[];
-                  (void)swallow{ result = result && apply_single< Actions >::match( i2, st... )... };
-                  return m( result );
-#endif
-               }
-               return false;
-            }
-         };
-
-         template< typename Rule, typename... Actions >
-         struct if_apply_impl< apply_mode::nothing, Rule, Actions... >
-         {
-            template< rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Rule >::template match< apply_mode::nothing, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename Rule, typename... Actions >
-         struct if_apply
-         {
-            using analyze_t = typename Rule::analyze_t;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return if_apply_impl< A, Rule, Actions... >::template match< M, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename Rule, typename... Actions >
-         struct skip_control< if_apply< Rule, Actions... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 26 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/if_must.hpp"
-       
-#line 1 "tao/pegtl/internal/if_must.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_IF_MUST_HPP
-#define TAO_PEGTL_INTERNAL_IF_MUST_HPP
-
-
-
-#line 1 "tao/pegtl/internal/must.hpp"
-       
-#line 1 "tao/pegtl/internal/must.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_MUST_HPP
-#define TAO_PEGTL_INTERNAL_MUST_HPP
-
-
-
-#line 1 "tao/pegtl/internal/raise.hpp"
-       
-#line 1 "tao/pegtl/internal/raise.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_RAISE_HPP
-#define TAO_PEGTL_INTERNAL_RAISE_HPP
-
-#include <cstdlib>
-#include <stdexcept>
-#include <type_traits>
-#line 19 "tao/pegtl/internal/raise.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename T >
-         struct raise
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-#ifdef _MSC_VER
-#pragma warning( push )
-#pragma warning( disable : 4702 )
-#endif
-            template< apply_mode,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               Control< T >::raise( static_cast< const Input& >( in ), st... );
-               throw std::logic_error( "code should be unreachable: Control< T >::raise() did not throw an exception" ); // NOLINT, LCOV_EXCL_LINE
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif
-            }
-         };
-
-         template< typename T >
-         struct skip_control< raise< T > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/must.hpp"
-#line 18 "tao/pegtl/internal/must.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         // The general case applies must<> to each of the
-         // rules in the 'Rules' parameter pack individually.
-
-         template< typename... Rules >
-         struct must
-            : seq< must< Rules >... >
-         {
-         };
-
-         // While in theory the implementation for a single rule could
-         // be simplified to must< Rule > = sor< Rule, raise< Rule > >, this
-         // would result in some unnecessary run-time overhead.
-
-         template< typename Rule >
-         struct must< Rule >
-         {
-            using analyze_t = typename Rule::analyze_t;
-
-            template< apply_mode A,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               if( !Control< Rule >::template match< A, rewind_mode::dontcare, Action, Control >( in, st... ) ) {
-                  raise< Rule >::template match< A, rewind_mode::dontcare, Action, Control >( in, st... );
-               }
-               return true;
-            }
-         };
-
-         template< typename... Rules >
-         struct skip_control< must< Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/if_must.hpp"
-#line 18 "tao/pegtl/internal/if_must.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< bool Default, typename Cond, typename... Rules >
-         struct if_must
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::seq, Default ? 0 : 1, Cond, must< Rules... > >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               if( Control< Cond >::template match< A, M, Action, Control >( in, st... ) ) {
-                  Control< must< Rules... > >::template match< A, M, Action, Control >( in, st... );
-                  return true;
-               }
-               return Default;
-            }
-         };
-
-         template< bool Default, typename Cond, typename... Rules >
-         struct skip_control< if_must< Default, Cond, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 27 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/if_must_else.hpp"
-       
-#line 1 "tao/pegtl/internal/if_must_else.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_IF_MUST_ELSE_HPP
-#define TAO_PEGTL_INTERNAL_IF_MUST_ELSE_HPP
-
-
-
-#line 1 "tao/pegtl/internal/if_then_else.hpp"
-       
-#line 1 "tao/pegtl/internal/if_then_else.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_IF_THEN_ELSE_HPP
-#define TAO_PEGTL_INTERNAL_IF_THEN_ELSE_HPP
-
-
-
-#line 1 "tao/pegtl/internal/not_at.hpp"
-       
-#line 1 "tao/pegtl/internal/not_at.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_NOT_AT_HPP
-#define TAO_PEGTL_INTERNAL_NOT_AT_HPP
-#line 18 "tao/pegtl/internal/not_at.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename... Rules >
-         struct not_at
-            : not_at< seq< Rules... > >
-         {
-         };
-
-         template<>
-         struct not_at<>
-            : trivial< false >
-         {
-         };
-
-         template< typename Rule >
-         struct not_at< Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt, Rule >;
-
-            template< apply_mode,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               const auto m = in.template mark< rewind_mode::required >();
-               return !Control< Rule >::template match< apply_mode::nothing, rewind_mode::active, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename... Rules >
-         struct skip_control< not_at< Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/if_then_else.hpp"
-
-
-#line 1 "tao/pegtl/internal/sor.hpp"
-       
-#line 1 "tao/pegtl/internal/sor.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_SOR_HPP
-#define TAO_PEGTL_INTERNAL_SOR_HPP
-
-
-
-#line 1 "tao/pegtl/internal/integer_sequence.hpp"
-       
-#line 1 "tao/pegtl/internal/integer_sequence.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_INTEGER_SEQUENCE_HPP
-#define TAO_PEGTL_INTERNAL_INTEGER_SEQUENCE_HPP
-
-#include <cstddef>
-#include <type_traits>
-#include <utility>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename T, T... Ns >
-         struct integer_sequence
-         {
-            using value_type = T;
-
-            static constexpr std::size_t size() noexcept
-            {
-               return sizeof...( Ns );
-            }
-         };
-
-         template< std::size_t... Ns >
-         using index_sequence = integer_sequence< std::size_t, Ns... >;
-
-         template< bool V, bool E >
-         struct generate_sequence;
-
-         template<>
-         struct generate_sequence< false, true >
-         {
-            template< typename T, T M, T N, std::size_t S, T... Ns >
-            using f = integer_sequence< T, Ns... >;
-         };
-
-         template<>
-         struct generate_sequence< true, true >
-         {
-            template< typename T, T M, T N, std::size_t S, T... Ns >
-            using f = integer_sequence< T, Ns..., S >;
-         };
-
-         template<>
-         struct generate_sequence< false, false >
-         {
-            template< typename T, T M, T N, std::size_t S, T... Ns >
-            using f = typename generate_sequence< ( N & ( M / 2 ) ) != 0, ( M / 2 ) == 0 >::template f< T, M / 2, N, 2 * S, Ns..., ( Ns + S )... >;
-         };
-
-         template<>
-         struct generate_sequence< true, false >
-         {
-            template< typename T, T M, T N, std::size_t S, T... Ns >
-            using f = typename generate_sequence< ( N & ( M / 2 ) ) != 0, ( M / 2 ) == 0 >::template f< T, M / 2, N, 2 * S + 1, Ns..., ( Ns + S )..., 2 * S >;
-         };
-
-         template< typename T, T N >
-         struct memoize_sequence
-         {
-            static_assert( N < T( 1 << 20 ), "N too large" );
-            using type = typename generate_sequence< false, false >::template f< T, ( N < T( 1 << 1 ) ) ? T( 1 << 1 ) : ( N < T( 1 << 2 ) ) ? T( 1 << 2 ) : ( N < T( 1 << 3 ) ) ? T( 1 << 3 ) : ( N < T( 1 << 4 ) ) ? T( 1 << 4 ) : ( N < T( 1 << 5 ) ) ? T( 1 << 5 ) : ( N < T( 1 << 6 ) ) ? T( 1 << 6 ) : ( N < T( 1 << 7 ) ) ? T( 1 << 7 ) : ( N < T( 1 << 8 ) ) ? T( 1 << 8 ) : ( N < T( 1 << 9 ) ) ? T( 1 << 9 ) : ( N < T( 1 << 10 ) ) ? T( 1 << 10 ) : ( N < T( 1 << 11 ) ) ? T( 1 << 11 ) : ( N < T( 1 << 12 ) ) ? T( 1 << 12 ) : ( N < T( 1 << 13 ) ) ? T( 1 << 13 ) : ( N < T( 1 << 14 ) ) ? T( 1 << 14 ) : ( N < T( 1 << 15 ) ) ? T( 1 << 15 ) : ( N < T( 1 << 16 ) ) ? T( 1 << 16 ) : ( N < T( 1 << 17 ) ) ? T( 1 << 17 ) : ( N < T( 1 << 18 ) ) ? T( 1 << 18 ) : ( N < T( 1 << 19 ) ) ? T( 1 << 19 ) : T( 1 << 20 ), N, 0 >;
-         };
-
-         template< typename T, T N >
-         using make_integer_sequence = typename memoize_sequence< T, N >::type;
-
-         template< std::size_t N >
-         using make_index_sequence = make_integer_sequence< std::size_t, N >;
-
-         template< typename... Ts >
-         using index_sequence_for = make_index_sequence< sizeof...( Ts ) >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/sor.hpp"
-#line 18 "tao/pegtl/internal/sor.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename... Rules >
-         struct sor;
-
-         template<>
-         struct sor<>
-            : trivial< false >
-         {
-         };
-
-         template< typename... Rules >
-         struct sor
-            : sor< index_sequence_for< Rules... >, Rules... >
-         {
-         };
-
-         template< std::size_t... Indices, typename... Rules >
-         struct sor< index_sequence< Indices... >, Rules... >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::sor, Rules... >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-#ifdef __cpp_fold_expressions
-               return ( Control< Rules >::template match < A, ( Indices == ( sizeof...( Rules ) - 1 ) ) ? M : rewind_mode::required, Action, Control > ( in, st... ) || ... );
-#else
-               bool result = false;
-               using swallow = bool[];
-               (void)swallow{ result = result || Control< Rules >::template match < A, ( Indices == ( sizeof...( Rules ) - 1 ) ) ? M : rewind_mode::required, Action, Control > ( in, st... )... };
-               return result;
-#endif
-            }
-         };
-
-         template< typename... Rules >
-         struct skip_control< sor< Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/internal/if_then_else.hpp"
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Cond, typename Then, typename Else >
-         struct if_then_else
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::sor, seq< Cond, Then >, seq< not_at< Cond >, Else > >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< M >();
-               using m_t = decltype( m );
-
-               if( Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
-                  return m( Control< Then >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) );
-               }
-               return m( Control< Else >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) );
-            }
-         };
-
-         template< typename Cond, typename Then, typename Else >
-         struct skip_control< if_then_else< Cond, Then, Else > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/internal/if_must_else.hpp"
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Cond, typename Then, typename Else >
-         using if_must_else = if_then_else< Cond, must< Then >, must< Else > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 28 "tao/pegtl/internal/rules.hpp"
-
-#line 1 "tao/pegtl/internal/istring.hpp"
-       
-#line 1 "tao/pegtl/internal/istring.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ISTRING_HPP
-#define TAO_PEGTL_INTERNAL_ISTRING_HPP
-
-#include <type_traits>
-#line 18 "tao/pegtl/internal/istring.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< char C >
-         using is_alpha = std::integral_constant< bool, ( ( 'a' <= C ) && ( C <= 'z' ) ) || ( ( 'A' <= C ) && ( C <= 'Z' ) ) >;
-
-         template< char C, bool A = is_alpha< C >::value >
-         struct ichar_equal;
-
-         template< char C >
-         struct ichar_equal< C, true >
-         {
-            static bool match( const char c ) noexcept
-            {
-               return ( C | 0x20 ) == ( c | 0x20 );
-            }
-         };
-
-         template< char C >
-         struct ichar_equal< C, false >
-         {
-            static bool match( const char c ) noexcept
-            {
-               return c == C;
-            }
-         };
-
-         template< char... Cs >
-         struct istring_equal;
-
-         template<>
-         struct istring_equal<>
-         {
-            static bool match( const char* /*unused*/ ) noexcept
-            {
-               return true;
-            }
-         };
-
-         template< char C, char... Cs >
-         struct istring_equal< C, Cs... >
-         {
-            static bool match( const char* r ) noexcept
-            {
-               return ichar_equal< C >::match( *r ) && istring_equal< Cs... >::match( r + 1 );
-            }
-         };
-
-         template< char... Cs >
-         struct istring;
-
-         template<>
-         struct istring<>
-            : trivial< true >
-         {
-         };
-
-         template< char... Cs >
-         struct istring
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::any, sizeof...( Cs ) >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( in.size( 0 ) ) )
-            {
-               if( in.size( sizeof...( Cs ) ) >= sizeof...( Cs ) ) {
-                  if( istring_equal< Cs... >::match( in.current() ) ) {
-                     bump_help< result_on_found::success, Input, char, Cs... >( in, sizeof...( Cs ) );
-                     return true;
-                  }
-               }
-               return false;
-            }
-         };
-
-         template< char... Cs >
-         struct skip_control< istring< Cs... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 30 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/list.hpp"
-       
-#line 1 "tao/pegtl/internal/list.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_LIST_HPP
-#define TAO_PEGTL_INTERNAL_LIST_HPP
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Rule, typename Sep >
-         using list = seq< Rule, star< Sep, Rule > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 31 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/list_must.hpp"
-       
-#line 1 "tao/pegtl/internal/list_must.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_LIST_MUST_HPP
-#define TAO_PEGTL_INTERNAL_LIST_MUST_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Rule, typename Sep >
-         using list_must = seq< Rule, star< Sep, must< Rule > > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 32 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/list_tail.hpp"
-       
-#line 1 "tao/pegtl/internal/list_tail.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_LIST_TAIL_HPP
-#define TAO_PEGTL_INTERNAL_LIST_TAIL_HPP
-
-
-
-
-#line 1 "tao/pegtl/internal/opt.hpp"
-       
-#line 1 "tao/pegtl/internal/opt.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_OPT_HPP
-#define TAO_PEGTL_INTERNAL_OPT_HPP
-
-#include <type_traits>
-#line 20 "tao/pegtl/internal/opt.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename... Rules >
-         struct opt
-            : opt< seq< Rules... > >
-         {
-         };
-
-         template<>
-         struct opt<>
-            : trivial< true >
-         {
-         };
-
-         template< typename Rule >
-         struct opt< Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt, Rule >;
-
-            template< apply_mode A,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... );
-               return true;
-            }
-         };
-
-         template< typename... Rules >
-         struct skip_control< opt< Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl/internal/list_tail.hpp"
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Rule, typename Sep >
-         using list_tail = seq< list< Rule, Sep >, opt< Sep > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 33 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/list_tail_pad.hpp"
-       
-#line 1 "tao/pegtl/internal/list_tail_pad.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_LIST_TAIL_PAD_HPP
-#define TAO_PEGTL_INTERNAL_LIST_TAIL_PAD_HPP
-
-
-
-
-
-#line 1 "tao/pegtl/internal/pad.hpp"
-       
-#line 1 "tao/pegtl/internal/pad.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PAD_HPP
-#define TAO_PEGTL_INTERNAL_PAD_HPP
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Rule, typename Pad1, typename Pad2 = Pad1 >
-         using pad = seq< star< Pad1 >, Rule, star< Pad2 > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/internal/list_tail_pad.hpp"
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Rule, typename Sep, typename Pad >
-         using list_tail_pad = seq< list< Rule, pad< Sep, Pad > >, opt< star< Pad >, Sep > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 34 "tao/pegtl/internal/rules.hpp"
-
-
-#line 1 "tao/pegtl/internal/one.hpp"
-       
-#line 1 "tao/pegtl/internal/one.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ONE_HPP
-#define TAO_PEGTL_INTERNAL_ONE_HPP
-
-#include <algorithm>
-#include <utility>
-#line 18 "tao/pegtl/internal/one.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Char >
-         bool contains( const Char c, const std::initializer_list< Char >& l ) noexcept
-         {
-            return std::find( l.begin(), l.end(), c ) != l.end();
-         }
-
-         template< result_on_found R, typename Peek, typename Peek::data_t... Cs >
-         struct one
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( Peek::peek( in ) ) )
-            {
-               if( const auto t = Peek::peek( in ) ) {
-                  if( contains( t.data, { Cs... } ) == bool( R ) ) {
-                     bump_help< R, Input, typename Peek::data_t, Cs... >( in, t.size );
-                     return true;
-                  }
-               }
-               return false;
-            }
-         };
-
-         template< result_on_found R, typename Peek, typename Peek::data_t C >
-         struct one< R, Peek, C >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( Peek::peek( in ) ) )
-            {
-               if( const auto t = Peek::peek( in ) ) {
-                  if( ( t.data == C ) == bool( R ) ) {
-                     bump_help< R, Input, typename Peek::data_t, C >( in, t.size );
-                     return true;
-                  }
-               }
-               return false;
-            }
-         };
-
-         template< result_on_found R, typename Peek, typename Peek::data_t... Cs >
-         struct skip_control< one< R, Peek, Cs... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 37 "tao/pegtl/internal/rules.hpp"
-
-
-#line 1 "tao/pegtl/internal/pad_opt.hpp"
-       
-#line 1 "tao/pegtl/internal/pad_opt.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PAD_OPT_HPP
-#define TAO_PEGTL_INTERNAL_PAD_OPT_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Rule, typename Pad >
-         using pad_opt = seq< star< Pad >, opt< Rule, star< Pad > > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 40 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/plus.hpp"
-       
-#line 1 "tao/pegtl/internal/plus.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PLUS_HPP
-#define TAO_PEGTL_INTERNAL_PLUS_HPP
-
-#include <type_traits>
-#line 21 "tao/pegtl/internal/plus.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         // While plus<> could easily be implemented with
-         // seq< Rule, Rules ..., star< Rule, Rules ... > > we
-         // provide an explicit implementation to optimise away
-         // the otherwise created input mark.
-
-         template< typename Rule, typename... Rules >
-         struct plus
-            : plus< seq< Rule, Rules... > >
-         {
-         };
-
-         template< typename Rule >
-         struct plus< Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, Rule, opt< plus > >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Rule >::template match< A, M, Action, Control >( in, st... ) && Control< star< Rule > >::template match< A, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename Rule, typename... Rules >
-         struct skip_control< plus< Rule, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 41 "tao/pegtl/internal/rules.hpp"
-
-
-
-#line 1 "tao/pegtl/internal/rematch.hpp"
-       
-#line 1 "tao/pegtl/internal/rematch.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_REMATCH_HPP
-#define TAO_PEGTL_INTERNAL_REMATCH_HPP
-
-
-
-
-
-
-#line 1 "tao/pegtl/internal/../memory_input.hpp"
-       
-#line 1 "tao/pegtl/internal/../memory_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_MEMORY_INPUT_HPP
-#define TAO_PEGTL_MEMORY_INPUT_HPP
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-
-
-
-
-
-#line 1 "tao/pegtl/internal/../tracking_mode.hpp"
-       
-#line 1 "tao/pegtl/internal/../tracking_mode.hpp"
-
-
-
-#ifndef TAO_PEGTL_TRACKING_MODE_HPP
-#define TAO_PEGTL_TRACKING_MODE_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      enum class tracking_mode : bool
-      {
-         eager,
-         lazy,
-
-         // Compatibility, remove with 3.0.0
-         IMMEDIATE = eager,
-         LAZY = lazy
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 20 "tao/pegtl/internal/../memory_input.hpp"
-
-
-
-#line 1 "tao/pegtl/internal/../internal/bump.hpp"
-       
-#line 1 "tao/pegtl/internal/../internal/bump.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_BUMP_HPP
-#define TAO_PEGTL_INTERNAL_BUMP_HPP
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         inline void bump( iterator& iter, const std::size_t count, const int ch ) noexcept
-         {
-            for( std::size_t i = 0; i < count; ++i ) {
-               if( iter.data[ i ] == ch ) {
-                  ++iter.line;
-                  iter.byte_in_line = 0;
-               }
-               else {
-                  ++iter.byte_in_line;
-               }
-            }
-            iter.byte += count;
-            iter.data += count;
-         }
-
-         inline void bump_in_this_line( iterator& iter, const std::size_t count ) noexcept
-         {
-            iter.data += count;
-            iter.byte += count;
-            iter.byte_in_line += count;
-         }
-
-         inline void bump_to_next_line( iterator& iter, const std::size_t count ) noexcept
-         {
-            ++iter.line;
-            iter.byte += count;
-            iter.byte_in_line = 0;
-            iter.data += count;
-         }
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 24 "tao/pegtl/internal/../memory_input.hpp"
-
-
-#line 1 "tao/pegtl/internal/../internal/marker.hpp"
-       
-#line 1 "tao/pegtl/internal/../internal/marker.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_MARKER_HPP
-#define TAO_PEGTL_INTERNAL_MARKER_HPP
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Iterator, rewind_mode M >
-         class marker
-         {
-         public:
-            static constexpr rewind_mode next_rewind_mode = M;
-
-            explicit marker( const Iterator& /*unused*/ ) noexcept
-            {
-            }
-
-            marker( const marker& ) = delete;
-
-            marker( marker&& /*unused*/ ) noexcept
-            {
-            }
-
-            ~marker() = default;
-
-            void operator=( const marker& ) = delete;
-            void operator=( marker&& ) = delete;
-
-            bool operator()( const bool result ) const noexcept
-            {
-               return result;
-            }
-         };
-
-         template< typename Iterator >
-         class marker< Iterator, rewind_mode::required >
-         {
-         public:
-            static constexpr rewind_mode next_rewind_mode = rewind_mode::active;
-
-            explicit marker( Iterator& i ) noexcept
-               : m_saved( i ),
-                 m_input( &i )
-            {
-            }
-
-            marker( const marker& ) = delete;
-
-            marker( marker&& i ) noexcept
-               : m_saved( i.m_saved ),
-                 m_input( i.m_input )
-            {
-               i.m_input = nullptr;
-            }
-
-            ~marker() noexcept
-            {
-               if( m_input != nullptr ) {
-                  ( *m_input ) = m_saved;
-               }
-            }
-
-            void operator=( const marker& ) = delete;
-            void operator=( marker&& ) = delete;
-
-            bool operator()( const bool result ) noexcept
-            {
-               if( result ) {
-                  m_input = nullptr;
-                  return true;
-               }
-               return false;
-            }
-
-            const Iterator& iterator() const noexcept
-            {
-               return m_saved;
-            }
-
-         private:
-            const Iterator m_saved;
-            Iterator* m_input;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 27 "tao/pegtl/internal/../memory_input.hpp"
-#line 1 "tao/pegtl/internal/../internal/until.hpp"
-       
-#line 1 "tao/pegtl/internal/../internal/until.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_UNTIL_HPP
-#define TAO_PEGTL_INTERNAL_UNTIL_HPP
-#line 21 "tao/pegtl/internal/../internal/until.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Cond, typename... Rules >
-         struct until
-            : until< Cond, seq< Rules... > >
-         {
-         };
-
-         template< typename Cond >
-         struct until< Cond >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, star< not_at< Cond >, not_at< eof >, bytes< 1 > >, Cond >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< M >();
-
-               while( !Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
-                  if( in.empty() ) {
-                     return false;
-                  }
-                  in.bump();
-               }
-               return m( true );
-            }
-         };
-
-         template< typename Cond, typename Rule >
-         struct until< Cond, Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, star< not_at< Cond >, not_at< eof >, Rule >, Cond >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< M >();
-               using m_t = decltype( m );
-
-               while( !Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
-                  if( !Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ) {
-                     return false;
-                  }
-               }
-               return m( true );
-            }
-         };
-
-         template< typename Cond, typename... Rules >
-         struct skip_control< until< Cond, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 28 "tao/pegtl/internal/../memory_input.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< tracking_mode, typename Eol, typename Source >
-         class memory_input_base;
-
-         template< typename Eol, typename Source >
-         class memory_input_base< tracking_mode::eager, Eol, Source >
-         {
-         public:
-            using iterator_t = internal::iterator;
-
-            template< typename T >
-            memory_input_base( const iterator_t& in_begin, const char* in_end, T&& in_source ) noexcept( std::is_nothrow_constructible< Source, T&& >::value )
-               : m_begin( in_begin.data ),
-                 m_current( in_begin ),
-                 m_end( in_end ),
-                 m_source( std::forward< T >( in_source ) )
-            {
-            }
-
-            template< typename T >
-            memory_input_base( const char* in_begin, const char* in_end, T&& in_source ) noexcept( std::is_nothrow_constructible< Source, T&& >::value )
-               : m_begin( in_begin ),
-                 m_current( in_begin ),
-                 m_end( in_end ),
-                 m_source( std::forward< T >( in_source ) )
-            {
-            }
-
-            memory_input_base( const memory_input_base& ) = delete;
-            memory_input_base( memory_input_base&& ) = delete;
-
-            ~memory_input_base() = default;
-
-            memory_input_base operator=( const memory_input_base& ) = delete;
-            memory_input_base operator=( memory_input_base&& ) = delete;
-
-            const char* current() const noexcept
-            {
-               return m_current.data;
-            }
-
-            const char* begin() const noexcept
-            {
-               return m_begin;
-            }
-
-            const char* end( const std::size_t /*unused*/ = 0 ) const noexcept
-            {
-               return m_end;
-            }
-
-            std::size_t byte() const noexcept
-            {
-               return m_current.byte;
-            }
-
-            std::size_t line() const noexcept
-            {
-               return m_current.line;
-            }
-
-            std::size_t byte_in_line() const noexcept
-            {
-               return m_current.byte_in_line;
-            }
-
-            void bump( const std::size_t in_count = 1 ) noexcept
-            {
-               internal::bump( m_current, in_count, Eol::ch );
-            }
-
-            void bump_in_this_line( const std::size_t in_count = 1 ) noexcept
-            {
-               internal::bump_in_this_line( m_current, in_count );
-            }
-
-            void bump_to_next_line( const std::size_t in_count = 1 ) noexcept
-            {
-               internal::bump_to_next_line( m_current, in_count );
-            }
-
-            TAO_PEGTL_NAMESPACE::position position( const iterator_t& it ) const
-            {
-               return TAO_PEGTL_NAMESPACE::position( it, m_source );
-            }
-
-            void restart( const std::size_t in_byte = 0, const std::size_t in_line = 1, const std::size_t in_byte_in_line = 0 )
-            {
-               m_current.data = m_begin;
-               m_current.byte = in_byte;
-               m_current.line = in_line;
-               m_current.byte_in_line = in_byte_in_line;
-            }
-
-         protected:
-            const char* const m_begin;
-            iterator_t m_current;
-            const char* const m_end;
-            const Source m_source;
-         };
-
-         template< typename Eol, typename Source >
-         class memory_input_base< tracking_mode::lazy, Eol, Source >
-         {
-         public:
-            using iterator_t = const char*;
-
-            template< typename T >
-            memory_input_base( const internal::iterator& in_begin, const char* in_end, T&& in_source ) noexcept( std::is_nothrow_constructible< Source, T&& >::value )
-               : m_begin( in_begin ),
-                 m_current( in_begin.data ),
-                 m_end( in_end ),
-                 m_source( std::forward< T >( in_source ) )
-            {
-            }
-
-            template< typename T >
-            memory_input_base( const char* in_begin, const char* in_end, T&& in_source ) noexcept( std::is_nothrow_constructible< Source, T&& >::value )
-               : m_begin( in_begin ),
-                 m_current( in_begin ),
-                 m_end( in_end ),
-                 m_source( std::forward< T >( in_source ) )
-            {
-            }
-
-            memory_input_base( const memory_input_base& ) = delete;
-            memory_input_base( memory_input_base&& ) = delete;
-
-            ~memory_input_base() = default;
-
-            memory_input_base operator=( const memory_input_base& ) = delete;
-            memory_input_base operator=( memory_input_base&& ) = delete;
-
-            const char* current() const noexcept
-            {
-               return m_current;
-            }
-
-            const char* begin() const noexcept
-            {
-               return m_begin.data;
-            }
-
-            const char* end( const std::size_t /*unused*/ = 0 ) const noexcept
-            {
-               return m_end;
-            }
-
-            std::size_t byte() const noexcept
-            {
-               return std::size_t( current() - m_begin.data );
-            }
-
-            void bump( const std::size_t in_count = 1 ) noexcept
-            {
-               m_current += in_count;
-            }
-
-            void bump_in_this_line( const std::size_t in_count = 1 ) noexcept
-            {
-               m_current += in_count;
-            }
-
-            void bump_to_next_line( const std::size_t in_count = 1 ) noexcept
-            {
-               m_current += in_count;
-            }
-
-            TAO_PEGTL_NAMESPACE::position position( const iterator_t it ) const
-            {
-               internal::iterator c( m_begin );
-               internal::bump( c, std::size_t( it - m_begin.data ), Eol::ch );
-               return TAO_PEGTL_NAMESPACE::position( c, m_source );
-            }
-
-            void restart()
-            {
-               m_current = m_begin.data;
-            }
-
-         protected:
-            const internal::iterator m_begin;
-            iterator_t m_current;
-            const char* const m_end;
-            const Source m_source;
-         };
-
-      } // namespace internal
-
-      template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf, typename Source = std::string >
-      class memory_input
-         : public internal::memory_input_base< P, Eol, Source >
-      {
-      public:
-         static constexpr tracking_mode tracking_mode_v = P;
-
-         using eol_t = Eol;
-         using source_t = Source;
-
-         using typename internal::memory_input_base< P, Eol, Source >::iterator_t;
-
-         using action_t = internal::action_input< memory_input >;
-
-         using internal::memory_input_base< P, Eol, Source >::memory_input_base;
-
-         template< typename T >
-         memory_input( const char* in_begin, const std::size_t in_size, T&& in_source ) noexcept( std::is_nothrow_constructible< Source, T&& >::value )
-            : memory_input( in_begin, in_begin + in_size, std::forward< T >( in_source ) )
-         {
-         }
-
-         template< typename T >
-         memory_input( const std::string& in_string, T&& in_source ) noexcept( std::is_nothrow_constructible< Source, T&& >::value )
-            : memory_input( in_string.data(), in_string.size(), std::forward< T >( in_source ) )
-         {
-         }
-
-         template< typename T >
-         memory_input( std::string&&, T&& ) = delete;
-
-         template< typename T >
-         memory_input( const char* in_begin, T&& in_source ) noexcept( std::is_nothrow_constructible< Source, T&& >::value )
-            : memory_input( in_begin, std::strlen( in_begin ), std::forward< T >( in_source ) )
-         {
-         }
-
-         template< typename T >
-         memory_input( const char* in_begin, const char* in_end, T&& in_source, const std::size_t in_byte, const std::size_t in_line, const std::size_t in_byte_in_line ) noexcept( std::is_nothrow_constructible< Source, T&& >::value )
-            : memory_input( { in_begin, in_byte, in_line, in_byte_in_line }, in_end, std::forward< T >( in_source ) )
-         {
-         }
-
-         memory_input( const memory_input& ) = delete;
-         memory_input( memory_input&& ) = delete;
-
-         ~memory_input() = default;
-
-         memory_input operator=( const memory_input& ) = delete;
-         memory_input operator=( memory_input&& ) = delete;
-
-         const Source& source() const noexcept
-         {
-            return this->m_source;
-         }
-
-         bool empty() const noexcept
-         {
-            return this->current() == this->end();
-         }
-
-         std::size_t size( const std::size_t /*unused*/ = 0 ) const noexcept
-         {
-            return std::size_t( this->end() - this->current() );
-         }
-
-         char peek_char( const std::size_t offset = 0 ) const noexcept
-         {
-            return this->current()[ offset ];
-         }
-
-         std::uint8_t peek_uint8( const std::size_t offset = 0 ) const noexcept
-         {
-            return static_cast< std::uint8_t >( peek_char( offset ) );
-         }
-
-         // Compatibility, remove with 3.0.0
-         std::uint8_t peek_byte( const std::size_t offset = 0 ) const noexcept
-         {
-            return static_cast< std::uint8_t >( peek_char( offset ) );
-         }
-
-         iterator_t& iterator() noexcept
-         {
-            return this->m_current;
-         }
-
-         const iterator_t& iterator() const noexcept
-         {
-            return this->m_current;
-         }
-
-         using internal::memory_input_base< P, Eol, Source >::restart;
-
-         template< rewind_mode M >
-         void restart( const internal::marker< iterator_t, M >& m )
-         {
-            iterator() = m.iterator();
-         }
-
-         using internal::memory_input_base< P, Eol, Source >::position;
-
-         TAO_PEGTL_NAMESPACE::position position() const
-         {
-            return position( iterator() );
-         }
-
-         void discard() const noexcept
-         {
-         }
-
-         void require( const std::size_t /*unused*/ ) const noexcept
-         {
-         }
-
-         template< rewind_mode M >
-         internal::marker< iterator_t, M > mark() noexcept
-         {
-            return internal::marker< iterator_t, M >( iterator() );
-         }
-
-         const char* at( const TAO_PEGTL_NAMESPACE::position& p ) const noexcept
-         {
-            return this->begin() + p.byte;
-         }
-
-         const char* begin_of_line( const TAO_PEGTL_NAMESPACE::position& p ) const noexcept
-         {
-            return at( p ) - p.byte_in_line;
-         }
-
-         const char* end_of_line( const TAO_PEGTL_NAMESPACE::position& p ) const noexcept
-         {
-            using input_t = memory_input< tracking_mode::lazy, Eol, const char* >;
-            input_t in( at( p ), this->end(), "" );
-            using grammar = internal::until< internal::at< internal::eolf > >;
-            normal< grammar >::match< apply_mode::nothing, rewind_mode::dontcare, nothing, normal >( in );
-            return in.current();
-         }
-
-         std::string line_at( const TAO_PEGTL_NAMESPACE::position& p ) const
-         {
-            return std::string( begin_of_line( p ), end_of_line( p ) );
-         }
-      };
-
-#ifdef __cpp_deduction_guides
-      template< typename... Ts >
-      memory_input( Ts&&... )->memory_input<>;
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/internal/rematch.hpp"
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Head, typename... Rules >
-         struct rematch;
-
-         template< typename Head >
-         struct rematch< Head >
-         {
-            using analyze_t = typename Head::analyze_t;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               return Control< Head >::template match< A, M, Action, Control >( in, st... );
-            }
-         };
-
-         template< typename Head, typename Rule, typename... Rules >
-         struct rematch< Head, Rule, Rules... >
-         {
-            using analyze_t = typename Head::analyze_t; // NOTE: Rule and Rules are ignored for analyze().
-
-            template< apply_mode A,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< rewind_mode::required >();
-
-               if( Control< Head >::template match< A, rewind_mode::active, Action, Control >( in, st... ) ) {
-                  memory_input< Input::tracking_mode_v, typename Input::eol_t, typename Input::source_t > i2( m.iterator(), in.current(), in.source() );
-#ifdef __cpp_fold_expressions
-                  return m( ( Control< Rule >::template match< A, rewind_mode::active, Action, Control >( i2, st... ) && ... && ( i2.restart( m ), Control< Rules >::template match< A, rewind_mode::active, Action, Control >( i2, st... ) ) ) );
-#else
-                  bool result = Control< Rule >::template match< A, rewind_mode::active, Action, Control >( i2, st... );
-                  using swallow = bool[];
-                  (void)swallow{ result = result && ( i2.restart( m ), Control< Rules >::template match< A, rewind_mode::active, Action, Control >( i2, st... ) )..., true };
-                  return m( result );
-#endif
-               }
-               return false;
-            }
-         };
-
-         template< typename Head, typename... Rules >
-         struct skip_control< rematch< Head, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 45 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/rep.hpp"
-       
-#line 1 "tao/pegtl/internal/rep.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_REP_HPP
-#define TAO_PEGTL_INTERNAL_REP_HPP
-#line 18 "tao/pegtl/internal/rep.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< unsigned Num, typename... Rules >
-         struct rep
-            : rep< Num, seq< Rules... > >
-         {
-         };
-
-         template< unsigned Num >
-         struct rep< Num >
-            : trivial< true >
-         {
-         };
-
-         template< typename Rule >
-         struct rep< 0, Rule >
-            : trivial< true >
-         {
-         };
-
-         template< unsigned Num, typename Rule >
-         struct rep< Num, Rule >
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::seq, Num, Rule >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< M >();
-               using m_t = decltype( m );
-
-               for( unsigned i = 0; i != Num; ++i ) {
-                  if( !Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ) {
-                     return false;
-                  }
-               }
-               return m( true );
-            }
-         };
-
-         template< unsigned Num, typename... Rules >
-         struct skip_control< rep< Num, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 46 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/rep_min.hpp"
-       
-#line 1 "tao/pegtl/internal/rep_min.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_REP_MIN_HPP
-#define TAO_PEGTL_INTERNAL_REP_MIN_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< unsigned Min, typename Rule, typename... Rules >
-         using rep_min = seq< rep< Min, Rule, Rules... >, star< Rule, Rules... > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 47 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/rep_min_max.hpp"
-       
-#line 1 "tao/pegtl/internal/rep_min_max.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_REP_MIN_MAX_HPP
-#define TAO_PEGTL_INTERNAL_REP_MIN_MAX_HPP
-
-#include <type_traits>
-#line 21 "tao/pegtl/internal/rep_min_max.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< unsigned Min, unsigned Max, typename... Rules >
-         struct rep_min_max
-            : rep_min_max< Min, Max, seq< Rules... > >
-         {
-         };
-
-         template< unsigned Min, unsigned Max >
-         struct rep_min_max< Min, Max >
-            : trivial< false >
-         {
-            static_assert( Min <= Max, "invalid rep_min_max rule (maximum number of repetitions smaller than minimum)" );
-         };
-
-         template< typename Rule >
-         struct rep_min_max< 0, 0, Rule >
-            : not_at< Rule >
-         {
-         };
-
-         template< unsigned Min, unsigned Max, typename Rule >
-         struct rep_min_max< Min, Max, Rule >
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::seq, Min, Rule >;
-
-            static_assert( Min <= Max, "invalid rep_min_max rule (maximum number of repetitions smaller than minimum)" );
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< M >();
-               using m_t = decltype( m );
-
-               for( unsigned i = 0; i != Min; ++i ) {
-                  if( !Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ) {
-                     return false;
-                  }
-               }
-               for( unsigned i = Min; i != Max; ++i ) {
-                  if( !Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... ) ) {
-                     return m( true );
-                  }
-               }
-               return m( Control< not_at< Rule > >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ); // NOTE that not_at<> will always rewind.
-            }
-         };
-
-         template< unsigned Min, unsigned Max, typename... Rules >
-         struct skip_control< rep_min_max< Min, Max, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 48 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/rep_opt.hpp"
-       
-#line 1 "tao/pegtl/internal/rep_opt.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_REP_OPT_HPP
-#define TAO_PEGTL_INTERNAL_REP_OPT_HPP
-#line 17 "tao/pegtl/internal/rep_opt.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< unsigned Max, typename... Rules >
-         struct rep_opt
-            : rep_opt< Max, seq< Rules... > >
-         {
-         };
-
-         template< unsigned Max, typename Rule >
-         struct rep_opt< Max, Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt, Rule >;
-
-            template< apply_mode A,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               for( unsigned i = 0; ( i != Max ) && Control< Rule >::template match< A, rewind_mode::required, Action, Control >( in, st... ); ++i ) {
-               }
-               return true;
-            }
-         };
-
-         template< unsigned Max, typename... Rules >
-         struct skip_control< rep_opt< Max, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 49 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/require.hpp"
-       
-#line 1 "tao/pegtl/internal/require.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_REQUIRE_HPP
-#define TAO_PEGTL_INTERNAL_REQUIRE_HPP
-#line 14 "tao/pegtl/internal/require.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< unsigned Amount >
-         struct require;
-
-         template<>
-         struct require< 0 >
-            : trivial< true >
-         {
-         };
-
-         template< unsigned Amount >
-         struct require
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( in.size( 0 ) ) )
-            {
-               return in.size( Amount ) >= Amount;
-            }
-         };
-
-         template< unsigned Amount >
-         struct skip_control< require< Amount > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 50 "tao/pegtl/internal/rules.hpp"
-
-
-
-
-#line 1 "tao/pegtl/internal/star_must.hpp"
-       
-#line 1 "tao/pegtl/internal/star_must.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_STAR_MUST_HPP
-#define TAO_PEGTL_INTERNAL_STAR_MUST_HPP
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Cond, typename... Rules >
-         using star_must = star< if_must< false, Cond, Rules... > >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 55 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/state.hpp"
-       
-#line 1 "tao/pegtl/internal/state.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_STATE_HPP
-#define TAO_PEGTL_INTERNAL_STATE_HPP
-#line 17 "tao/pegtl/internal/state.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename State, typename... Rules >
-         struct state
-            : state< State, seq< Rules... > >
-         {
-         };
-
-         template< typename State, typename Rule >
-         struct state< State, Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, Rule >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static auto success( State& s, const Input& in, States&&... st )
-               -> decltype( s.template success< A, M, Action, Control >( in, st... ), void() )
-            {
-               s.template success< A, M, Action, Control >( in, st... );
-            }
-
-            // NOTE: The additional "int = 0" is a work-around for missing expression SFINAE in VS2015.
-
-            template< apply_mode,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States,
-                      int = 0 >
-            static auto success( State& s, const Input& in, States&&... st )
-               -> decltype( s.success( in, st... ), void() )
-            {
-               s.success( in, st... );
-            }
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               State s( static_cast< const Input& >( in ), st... );
-
-               if( Control< Rule >::template match< A, M, Action, Control >( in, s ) ) {
-                  success< A, M, Action, Control >( s, in, st... );
-                  return true;
-               }
-               return false;
-            }
-         };
-
-         template< typename State, typename... Rules >
-         struct skip_control< state< State, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 56 "tao/pegtl/internal/rules.hpp"
-#line 1 "tao/pegtl/internal/string.hpp"
-       
-#line 1 "tao/pegtl/internal/string.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_STRING_HPP
-#define TAO_PEGTL_INTERNAL_STRING_HPP
-
-#include <cstring>
-#include <utility>
-#line 19 "tao/pegtl/internal/string.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         inline bool unsafe_equals( const char* s, const std::initializer_list< char >& l ) noexcept
-         {
-            return std::memcmp( s, &*l.begin(), l.size() ) == 0;
-         }
-
-         template< char... Cs >
-         struct string;
-
-         template<>
-         struct string<>
-            : trivial< true >
-         {
-         };
-
-         template< char... Cs >
-         struct string
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::any, sizeof...( Cs ) >;
-
-            template< typename Input >
-            static bool match( Input& in ) noexcept( noexcept( in.size( 0 ) ) )
-            {
-               if( in.size( sizeof...( Cs ) ) >= sizeof...( Cs ) ) {
-                  if( unsafe_equals( in.current(), { Cs... } ) ) {
-                     bump_help< result_on_found::success, Input, char, Cs... >( in, sizeof...( Cs ) );
-                     return true;
-                  }
-               }
-               return false;
-            }
-         };
-
-         template< char... Cs >
-         struct skip_control< string< Cs... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 57 "tao/pegtl/internal/rules.hpp"
-
-#line 1 "tao/pegtl/internal/try_catch_type.hpp"
-       
-#line 1 "tao/pegtl/internal/try_catch_type.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_TRY_CATCH_TYPE_HPP
-#define TAO_PEGTL_INTERNAL_TRY_CATCH_TYPE_HPP
-
-#include <type_traits>
-#line 20 "tao/pegtl/internal/try_catch_type.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Exception, typename... Rules >
-         struct try_catch_type
-            : try_catch_type< Exception, seq< Rules... > >
-         {
-         };
-
-         template< typename Exception >
-         struct try_catch_type< Exception >
-            : trivial< true >
-         {
-         };
-
-         template< typename Exception, typename Rule >
-         struct try_catch_type< Exception, Rule >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, Rule >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               auto m = in.template mark< M >();
-               using m_t = decltype( m );
-
-               try {
-                  return m( Control< Rule >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) );
-               }
-               catch( const Exception& ) {
-                  return false;
-               }
-            }
-         };
-
-         template< typename Exception, typename... Rules >
-         struct skip_control< try_catch_type< Exception, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 59 "tao/pegtl/internal/rules.hpp"
-
-
-#endif
-#line 13 "tao/pegtl/ascii.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      inline namespace ascii
-      {
-         // clang-format off
-         struct alnum : internal::alnum {};
-         struct alpha : internal::alpha {};
-         struct any : internal::any< internal::peek_char > {};
-         struct blank : internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\t' > {};
-         struct digit : internal::range< internal::result_on_found::success, internal::peek_char, '0', '9' > {};
-         struct ellipsis : internal::string< '.', '.', '.' > {};
-         struct eolf : internal::eolf {};
-         template< char... Cs > struct forty_two : internal::rep< 42, internal::one< internal::result_on_found::success, internal::peek_char, Cs... > > {};
-         struct identifier_first : internal::identifier_first {};
-         struct identifier_other : internal::identifier_other {};
-         struct identifier : internal::identifier {};
-         template< char... Cs > struct istring : internal::istring< Cs... > {};
-         template< char... Cs > struct keyword : internal::seq< internal::string< Cs... >, internal::not_at< internal::identifier_other > > {};
-         struct lower : internal::range< internal::result_on_found::success, internal::peek_char, 'a', 'z' > {};
-         template< char... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_char, Cs... > {};
-         template< char Lo, char Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_char, Lo, Hi > {};
-         struct nul : internal::one< internal::result_on_found::success, internal::peek_char, char( 0 ) > {};
-         template< char... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_char, Cs... > {};
-         struct print : internal::range< internal::result_on_found::success, internal::peek_char, char( 32 ), char( 126 ) > {};
-         template< char Lo, char Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_char, Lo, Hi > {};
-         template< char... Cs > struct ranges : internal::ranges< internal::peek_char, Cs... > {};
-         struct seven : internal::range< internal::result_on_found::success, internal::peek_char, char( 0 ), char( 127 ) > {};
-         struct shebang : internal::if_must< false, internal::string< '#', '!' >, internal::until< internal::eolf > > {};
-         struct space : internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\n', '\r', '\t', '\v', '\f' > {};
-         template< char... Cs > struct string : internal::string< Cs... > {};
-         template< char C > struct three : internal::string< C, C, C > {};
-         template< char C > struct two : internal::string< C, C > {};
-         struct upper : internal::range< internal::result_on_found::success, internal::peek_char, 'A', 'Z' > {};
-         struct xdigit : internal::ranges< internal::peek_char, '0', '9', 'a', 'f', 'A', 'F' > {};
-         // clang-format on
-
-         template<>
-         struct keyword<>
-         {
-            template< typename Input >
-            static bool match( Input& /*unused*/ ) noexcept
-            {
-               static_assert( internal::always_false< Input >::value, "empty keywords not allowed" );
-               return false;
-            }
-         };
-
-      } // namespace ascii
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#line 1 "tao/pegtl/internal/pegtl_string.hpp"
-       
-#line 1 "tao/pegtl/internal/pegtl_string.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEGTL_STRING_HPP
-#define TAO_PEGTL_INTERNAL_PEGTL_STRING_HPP
-
-#include <cstddef>
-#include <type_traits>
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      // Inspired by https://github.com/irrequietus/typestring
-      // Rewritten and reduced to what is needed for the PEGTL
-      // and to work with Visual Studio 2015.
-
-      namespace internal
-      {
-         template< typename, typename, typename, typename, typename, typename, typename, typename >
-         struct string_join;
-
-         template< template< char... > class S, char... C0s, char... C1s, char... C2s, char... C3s, char... C4s, char... C5s, char... C6s, char... C7s >
-         struct string_join< S< C0s... >, S< C1s... >, S< C2s... >, S< C3s... >, S< C4s... >, S< C5s... >, S< C6s... >, S< C7s... > >
-         {
-            using type = S< C0s..., C1s..., C2s..., C3s..., C4s..., C5s..., C6s..., C7s... >;
-         };
-
-         template< template< char... > class S, char, bool >
-         struct string_at
-         {
-            using type = S<>;
-         };
-
-         template< template< char... > class S, char C >
-         struct string_at< S, C, true >
-         {
-            using type = S< C >;
-         };
-
-         template< typename T, std::size_t S >
-         struct string_max_length
-         {
-            static_assert( S <= 512, "String longer than 512 (excluding terminating \\0)!" );
-            using type = T;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#define TAO_PEGTL_INTERNAL_EMPTY()
-#define TAO_PEGTL_INTERNAL_DEFER( X ) X TAO_PEGTL_INTERNAL_EMPTY()
-#define TAO_PEGTL_INTERNAL_EXPAND( ... ) __VA_ARGS__
-
-#define TAO_PEGTL_INTERNAL_STRING_AT( S, x, n )    tao::TAO_PEGTL_NAMESPACE::internal::string_at< S, ( 0##n < ( sizeof( x ) / sizeof( char ) ) ) ? ( x )[ 0##n ] : 0, ( 0##n < ( sizeof( x ) / sizeof( char ) ) - 1 ) >::type
-
-
-#define TAO_PEGTL_INTERNAL_JOIN_8( M, S, x, n )                                                     tao::TAO_PEGTL_NAMESPACE::internal::string_join< TAO_PEGTL_INTERNAL_DEFER( M )( S, x, n##0 ),                                                     TAO_PEGTL_INTERNAL_DEFER( M )( S, x, n##1 ),                                                     TAO_PEGTL_INTERNAL_DEFER( M )( S, x, n##2 ),                                                     TAO_PEGTL_INTERNAL_DEFER( M )( S, x, n##3 ),                                                     TAO_PEGTL_INTERNAL_DEFER( M )( S, x, n##4 ),                                                     TAO_PEGTL_INTERNAL_DEFER( M )( S, x, n##5 ),                                                     TAO_PEGTL_INTERNAL_DEFER( M )( S, x, n##6 ),                                                     TAO_PEGTL_INTERNAL_DEFER( M )( S, x, n##7 ) >::type
-#line 74 "tao/pegtl/internal/pegtl_string.hpp"
-#define TAO_PEGTL_INTERNAL_STRING_8( S, x, n )    TAO_PEGTL_INTERNAL_JOIN_8( TAO_PEGTL_INTERNAL_STRING_AT, S, x, n )
-
-
-#define TAO_PEGTL_INTERNAL_STRING_64( S, x, n )    TAO_PEGTL_INTERNAL_JOIN_8( TAO_PEGTL_INTERNAL_STRING_8, S, x, n )
-
-
-#define TAO_PEGTL_INTERNAL_STRING_512( S, x, n )    TAO_PEGTL_INTERNAL_JOIN_8( TAO_PEGTL_INTERNAL_STRING_64, S, x, n )
-
-
-#define TAO_PEGTL_INTERNAL_STRING( S, x )    TAO_PEGTL_INTERNAL_EXPAND(                   TAO_PEGTL_INTERNAL_EXPAND(                   TAO_PEGTL_INTERNAL_EXPAND(                   tao::TAO_PEGTL_NAMESPACE::internal::string_max_length< TAO_PEGTL_INTERNAL_STRING_512( S, x, ), sizeof( x ) - 1 >::type ) ) )
-
-
-
-
-
-#define TAO_PEGTL_STRING( x )    TAO_PEGTL_INTERNAL_STRING( tao::TAO_PEGTL_NAMESPACE::ascii::string, x )
-
-
-#define TAO_PEGTL_ISTRING( x )    TAO_PEGTL_INTERNAL_STRING( tao::TAO_PEGTL_NAMESPACE::ascii::istring, x )
-
-
-#define TAO_PEGTL_KEYWORD( x )    TAO_PEGTL_INTERNAL_STRING( tao::TAO_PEGTL_NAMESPACE::ascii::keyword, x )
-
-
-// Compatibility, remove with 3.0.0
-#define TAOCPP_PEGTL_STRING( x ) TAO_PEGTL_STRING( x )
-#define TAOCPP_PEGTL_ISTRING( x ) TAO_PEGTL_ISTRING( x )
-#define TAOCPP_PEGTL_KEYWORD( x ) TAO_PEGTL_KEYWORD( x )
-
-#endif
-#line 70 "tao/pegtl/ascii.hpp"
-
-#endif
-#line 13 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/rules.hpp"
-       
-#line 1 "tao/pegtl/rules.hpp"
-
-
-
-#ifndef TAO_PEGTL_RULES_HPP
-#define TAO_PEGTL_RULES_HPP
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      // clang-format off
-      template< typename... Actions > struct apply : internal::apply< Actions... > {};
-      template< typename... Actions > struct apply0 : internal::apply0< Actions... > {};
-      template< template< typename... > class Action, typename... Rules > struct action : internal::action< Action, Rules... > {};
-      template< typename... Rules > struct at : internal::at< Rules... > {};
-      struct bof : internal::bof {};
-      struct bol : internal::bol {};
-      template< unsigned Num > struct bytes : internal::bytes< Num > {};
-      template< template< typename... > class Control, typename... Rules > struct control : internal::control< Control, Rules... > {};
-      template< typename... Rules > struct disable : internal::disable< Rules... > {};
-      struct discard : internal::discard {};
-      template< typename... Rules > struct enable : internal::enable< Rules... > {};
-      struct eof : internal::eof {};
-      struct failure : internal::trivial< false > {};
-      template< typename Rule, typename... Actions > struct if_apply : internal::if_apply< Rule, Actions... > {};
-      template< typename Cond, typename... Thens > struct if_must : internal::if_must< false, Cond, Thens... > {};
-      template< typename Cond, typename Then, typename Else > struct if_must_else : internal::if_must_else< Cond, Then, Else > {};
-      template< typename Cond, typename Then, typename Else > struct if_then_else : internal::if_then_else< Cond, Then, Else > {};
-      template< typename Rule, typename Sep, typename Pad = void > struct list : internal::list< Rule, internal::pad< Sep, Pad > > {};
-      template< typename Rule, typename Sep > struct list< Rule, Sep, void > : internal::list< Rule, Sep > {};
-      template< typename Rule, typename Sep, typename Pad = void > struct list_must : internal::list_must< Rule, internal::pad< Sep, Pad > > {};
-      template< typename Rule, typename Sep > struct list_must< Rule, Sep, void > : internal::list_must< Rule, Sep > {};
-      template< typename Rule, typename Sep, typename Pad = void > struct list_tail : internal::list_tail_pad< Rule, Sep, Pad > {};
-      template< typename Rule, typename Sep > struct list_tail< Rule, Sep, void > : internal::list_tail< Rule, Sep > {};
-      template< typename M, typename S > struct minus : internal::rematch< M, internal::not_at< S, internal::eof > > {};
-      template< typename... Rules > struct must : internal::must< Rules... > {};
-      template< typename... Rules > struct not_at : internal::not_at< Rules... > {};
-      template< typename... Rules > struct opt : internal::opt< Rules... > {};
-      template< typename Cond, typename... Rules > struct opt_must : internal::if_must< true, Cond, Rules... > {};
-      template< typename Rule, typename Pad1, typename Pad2 = Pad1 > struct pad : internal::pad< Rule, Pad1, Pad2 > {};
-      template< typename Rule, typename Pad > struct pad_opt : internal::pad_opt< Rule, Pad > {};
-      template< typename Rule, typename... Rules > struct plus : internal::plus< Rule, Rules... > {};
-      template< typename Exception > struct raise : internal::raise< Exception > {};
-      template< typename Head, typename... Rules > struct rematch : internal::rematch< Head, Rules... > {};
-      template< unsigned Num, typename... Rules > struct rep : internal::rep< Num, Rules... > {};
-      template< unsigned Max, typename... Rules > struct rep_max : internal::rep_min_max< 0, Max, Rules... > {};
-      template< unsigned Min, typename Rule, typename... Rules > struct rep_min : internal::rep_min< Min, Rule, Rules... > {};
-      template< unsigned Min, unsigned Max, typename... Rules > struct rep_min_max : internal::rep_min_max< Min, Max, Rules... > {};
-      template< unsigned Max, typename... Rules > struct rep_opt : internal::rep_opt< Max, Rules... > {};
-      template< unsigned Amount > struct require : internal::require< Amount > {};
-      template< typename... Rules > struct seq : internal::seq< Rules... > {};
-      template< typename... Rules > struct sor : internal::sor< Rules... > {};
-      template< typename Rule, typename... Rules > struct star : internal::star< Rule, Rules... > {};
-      template< typename Cond, typename... Rules > struct star_must : internal::star_must< Cond, Rules... > {};
-      template< typename State, typename... Rules > struct state : internal::state< State, Rules... > {};
-      struct success : internal::trivial< true > {};
-      template< typename... Rules > struct try_catch : internal::seq< internal::try_catch_type< parse_error, Rules... > > {};
-      template< typename Exception, typename... Rules > struct try_catch_type : internal::seq< internal::try_catch_type< Exception, Rules... > > {};
-      template< typename Cond, typename... Rules > struct until : internal::until< Cond, Rules... > {};
-      // clang-format on
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/uint16.hpp"
-       
-#line 1 "tao/pegtl/uint16.hpp"
-
-
-
-#ifndef TAO_PEGTL_UINT16_HPP
-#define TAO_PEGTL_UINT16_HPP
-
-
-
-#line 1 "tao/pegtl/internal/peek_mask_uint.hpp"
-       
-#line 1 "tao/pegtl/internal/peek_mask_uint.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEEK_MASK_UINT_HPP
-#define TAO_PEGTL_INTERNAL_PEEK_MASK_UINT_HPP
-
-#include <cstddef>
-#include <cstdint>
-
-
-
-
-#line 1 "tao/pegtl/internal/read_uint.hpp"
-       
-#line 1 "tao/pegtl/internal/read_uint.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_READ_UINT_HPP
-#define TAO_PEGTL_INTERNAL_READ_UINT_HPP
-
-#include <cstdint>
-
-
-
-#line 1 "tao/pegtl/internal/endian.hpp"
-       
-#line 1 "tao/pegtl/internal/endian.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ENDIAN_HPP
-#define TAO_PEGTL_INTERNAL_ENDIAN_HPP
-
-#include <cstdint>
-#include <cstring>
-
-
-
-#if defined( _WIN32 ) && !defined( __MINGW32__ )
-#line 1 "tao/pegtl/internal/endian_win.hpp"
-       
-#line 1 "tao/pegtl/internal/endian_win.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ENDIAN_WIN_HPP
-#define TAO_PEGTL_INTERNAL_ENDIAN_WIN_HPP
-
-#include <cstdint>
-#include <cstring>
-
-#include <stdlib.h>
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< std::size_t S >
-         struct to_and_from_le
-         {
-            template< typename T >
-            static T convert( const T t ) noexcept
-            {
-               return t;
-            }
-         };
-
-         template< std::size_t S >
-         struct to_and_from_be;
-
-         template<>
-         struct to_and_from_be< 1 >
-         {
-            static std::int8_t convert( const std::int8_t n ) noexcept
-            {
-               return n;
-            }
-
-            static std::uint8_t convert( const std::uint8_t n ) noexcept
-            {
-               return n;
-            }
-         };
-
-         template<>
-         struct to_and_from_be< 2 >
-         {
-            static std::int16_t convert( const std::int16_t n ) noexcept
-            {
-               return std::int16_t( _byteswap_ushort( std::uint16_t( n ) ) );
-            }
-
-            static std::uint16_t convert( const std::uint16_t n ) noexcept
-            {
-               return _byteswap_ushort( n );
-            }
-         };
-
-         template<>
-         struct to_and_from_be< 4 >
-         {
-            static float convert( float n ) noexcept
-            {
-               std::uint32_t u;
-               std::memcpy( &u, &n, 4 );
-               u = convert( u );
-               std::memcpy( &n, &u, 4 );
-               return n;
-            }
-
-            static std::int32_t convert( const std::int32_t n ) noexcept
-            {
-               return std::int32_t( _byteswap_ulong( std::uint32_t( n ) ) );
-            }
-
-            static std::uint32_t convert( const std::uint32_t n ) noexcept
-            {
-               return _byteswap_ulong( n );
-            }
-         };
-
-         template<>
-         struct to_and_from_be< 8 >
-         {
-            static double convert( double n ) noexcept
-            {
-               std::uint64_t u;
-               std::memcpy( &u, &n, 8 );
-               u = convert( u );
-               std::memcpy( &n, &u, 8 );
-               return n;
-            }
-
-            static std::int64_t convert( const std::int64_t n ) noexcept
-            {
-               return std::int64_t( _byteswap_uint64( std::uint64_t( n ) ) );
-            }
-
-            static std::uint64_t convert( const std::uint64_t n ) noexcept
-            {
-               return _byteswap_uint64( n );
-            }
-         };
-
-#define TAO_PEGTL_NATIVE_ORDER le
-#define TAO_PEGTL_NATIVE_UTF16 utf16_le
-#define TAO_PEGTL_NATIVE_UTF32 utf32_le
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl/internal/endian.hpp"
-#else
-#line 1 "tao/pegtl/internal/endian_gcc.hpp"
-       
-#line 1 "tao/pegtl/internal/endian_gcc.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ENDIAN_GCC_HPP
-#define TAO_PEGTL_INTERNAL_ENDIAN_GCC_HPP
-
-#include <cstdint>
-#include <cstring>
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-#if !defined( __BYTE_ORDER__ )
-#error No byte order defined!
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-
-         template< std::size_t S >
-         struct to_and_from_be
-         {
-            template< typename T >
-            static T convert( const T n ) noexcept
-            {
-               return n;
-            }
-         };
-
-         template< std::size_t S >
-         struct to_and_from_le;
-
-         template<>
-         struct to_and_from_le< 1 >
-         {
-            static std::uint8_t convert( const std::uint8_t n ) noexcept
-            {
-               return n;
-            }
-
-            static std::int8_t convert( const std::int8_t n ) noexcept
-            {
-               return n;
-            }
-         };
-
-         template<>
-         struct to_and_from_le< 2 >
-         {
-            static std::int16_t convert( const std::int16_t n ) noexcept
-            {
-               return static_cast< std::int16_t >( __builtin_bswap16( static_cast< std::uint16_t >( n ) ) );
-            }
-
-            static std::uint16_t convert( const std::uint16_t n ) noexcept
-            {
-               return __builtin_bswap16( n );
-            }
-         };
-
-         template<>
-         struct to_and_from_le< 4 >
-         {
-            static float convert( float n ) noexcept
-            {
-               std::uint32_t u;
-               std::memcpy( &u, &n, 4 );
-               u = convert( u );
-               std::memcpy( &n, &u, 4 );
-               return n;
-            }
-
-            static std::int32_t convert( const std::int32_t n ) noexcept
-            {
-               return static_cast< std::int32_t >( __builtin_bswap32( static_cast< std::uint32_t >( n ) ) );
-            }
-
-            static std::uint32_t convert( const std::uint32_t n ) noexcept
-            {
-               return __builtin_bswap32( n );
-            }
-         };
-
-         template<>
-         struct to_and_from_le< 8 >
-         {
-            static double convert( double n ) noexcept
-            {
-               std::uint64_t u;
-               std::memcpy( &u, &n, 8 );
-               u = convert( u );
-               std::memcpy( &n, &u, 8 );
-               return n;
-            }
-
-            static std::int64_t convert( const std::int64_t n ) noexcept
-            {
-               return static_cast< std::int64_t >( __builtin_bswap64( static_cast< std::uint64_t >( n ) ) );
-            }
-
-            static std::uint64_t convert( const std::uint64_t n ) noexcept
-            {
-               return __builtin_bswap64( n );
-            }
-         };
-
-#define TAO_PEGTL_NATIVE_ORDER be
-#define TAO_PEGTL_NATIVE_UTF16 utf16_be
-#define TAO_PEGTL_NATIVE_UTF32 utf32_be
-
-#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-
-         template< std::size_t S >
-         struct to_and_from_le
-         {
-            template< typename T >
-            static T convert( const T n ) noexcept
-            {
-               return n;
-            }
-         };
-
-         template< std::size_t S >
-         struct to_and_from_be;
-
-         template<>
-         struct to_and_from_be< 1 >
-         {
-            static std::int8_t convert( const std::int8_t n ) noexcept
-            {
-               return n;
-            }
-
-            static std::uint8_t convert( const std::uint8_t n ) noexcept
-            {
-               return n;
-            }
-         };
-
-         template<>
-         struct to_and_from_be< 2 >
-         {
-            static std::int16_t convert( const std::int16_t n ) noexcept
-            {
-               return static_cast< std::int16_t >( __builtin_bswap16( static_cast< std::uint16_t >( n ) ) );
-            }
-
-            static std::uint16_t convert( const std::uint16_t n ) noexcept
-            {
-               return __builtin_bswap16( n );
-            }
-         };
-
-         template<>
-         struct to_and_from_be< 4 >
-         {
-            static float convert( float n ) noexcept
-            {
-               std::uint32_t u;
-               std::memcpy( &u, &n, 4 );
-               u = convert( u );
-               std::memcpy( &n, &u, 4 );
-               return n;
-            }
-
-            static std::int32_t convert( const std::int32_t n ) noexcept
-            {
-               return static_cast< std::int32_t >( __builtin_bswap32( static_cast< std::uint32_t >( n ) ) );
-            }
-
-            static std::uint32_t convert( const std::uint32_t n ) noexcept
-            {
-               return __builtin_bswap32( n );
-            }
-         };
-
-         template<>
-         struct to_and_from_be< 8 >
-         {
-            static double convert( double n ) noexcept
-            {
-               std::uint64_t u;
-               std::memcpy( &u, &n, 8 );
-               u = convert( u );
-               std::memcpy( &n, &u, 8 );
-               return n;
-            }
-
-            static std::int64_t convert( const std::int64_t n ) noexcept
-            {
-               return static_cast< std::int64_t >( __builtin_bswap64( static_cast< std::uint64_t >( n ) ) );
-            }
-
-            static std::uint64_t convert( const std::uint64_t n ) noexcept
-            {
-               return __builtin_bswap64( n );
-            }
-         };
-
-#define TAO_PEGTL_NATIVE_ORDER le
-#define TAO_PEGTL_NATIVE_UTF16 utf16_le
-#define TAO_PEGTL_NATIVE_UTF32 utf32_le
-
-#else
-#error Unknown host byte order!
-#endif
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 16 "tao/pegtl/internal/endian.hpp"
-#endif
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename N >
-         N h_to_be( const N n ) noexcept
-         {
-            return N( to_and_from_be< sizeof( N ) >::convert( n ) );
-         }
-
-         template< typename N >
-         N be_to_h( const N n ) noexcept
-         {
-            return h_to_be( n );
-         }
-
-         template< typename N >
-         N be_to_h( const void* p ) noexcept
-         {
-            N n;
-            std::memcpy( &n, p, sizeof( n ) );
-            return internal::be_to_h( n );
-         }
-
-         template< typename N >
-         N h_to_le( const N n ) noexcept
-         {
-            return N( to_and_from_le< sizeof( N ) >::convert( n ) );
-         }
-
-         template< typename N >
-         N le_to_h( const N n ) noexcept
-         {
-            return h_to_le( n );
-         }
-
-         template< typename N >
-         N le_to_h( const void* p ) noexcept
-         {
-            N n;
-            std::memcpy( &n, p, sizeof( n ) );
-            return internal::le_to_h( n );
-         }
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/internal/read_uint.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct read_uint16_be
-         {
-            using type = std::uint16_t;
-
-            static std::uint16_t read( const void* d ) noexcept
-            {
-               return be_to_h< std::uint16_t >( d );
-            }
-         };
-
-         struct read_uint16_le
-         {
-            using type = std::uint16_t;
-
-            static std::uint16_t read( const void* d ) noexcept
-            {
-               return le_to_h< std::uint16_t >( d );
-            }
-         };
-
-         struct read_uint32_be
-         {
-            using type = std::uint32_t;
-
-            static std::uint32_t read( const void* d ) noexcept
-            {
-               return be_to_h< std::uint32_t >( d );
-            }
-         };
-
-         struct read_uint32_le
-         {
-            using type = std::uint32_t;
-
-            static std::uint32_t read( const void* d ) noexcept
-            {
-               return le_to_h< std::uint32_t >( d );
-            }
-         };
-
-         struct read_uint64_be
-         {
-            using type = std::uint64_t;
-
-            static std::uint64_t read( const void* d ) noexcept
-            {
-               return be_to_h< std::uint64_t >( d );
-            }
-         };
-
-         struct read_uint64_le
-         {
-            using type = std::uint64_t;
-
-            static std::uint64_t read( const void* d ) noexcept
-            {
-               return le_to_h< std::uint64_t >( d );
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl/internal/peek_mask_uint.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename R, typename R::type M >
-         struct peek_mask_uint_impl
-         {
-            using data_t = typename R::type;
-            using pair_t = input_pair< data_t >;
-
-            template< typename Input >
-            static pair_t peek( Input& in ) noexcept( noexcept( in.size( sizeof( data_t ) ) ) )
-            {
-               if( in.size( sizeof( data_t ) ) < sizeof( data_t ) ) {
-                  return { 0, 0 };
-               }
-               const data_t data = R::read( in.current() ) & M;
-               return { data, sizeof( data_t ) };
-            }
-         };
-
-         template< std::uint16_t M >
-         using peek_mask_uint16_be = peek_mask_uint_impl< read_uint16_be, M >;
-
-         template< std::uint16_t M >
-         using peek_mask_uint16_le = peek_mask_uint_impl< read_uint16_le, M >;
-
-         template< std::uint32_t M >
-         using peek_mask_uint32_be = peek_mask_uint_impl< read_uint32_be, M >;
-
-         template< std::uint32_t M >
-         using peek_mask_uint32_le = peek_mask_uint_impl< read_uint32_le, M >;
-
-         template< std::uint64_t M >
-         using peek_mask_uint64_be = peek_mask_uint_impl< read_uint64_be, M >;
-
-         template< std::uint64_t M >
-         using peek_mask_uint64_le = peek_mask_uint_impl< read_uint64_le, M >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/uint16.hpp"
-#line 1 "tao/pegtl/internal/peek_uint.hpp"
-       
-#line 1 "tao/pegtl/internal/peek_uint.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEEK_UINT_HPP
-#define TAO_PEGTL_INTERNAL_PEEK_UINT_HPP
-
-#include <cstddef>
-#include <cstdint>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename R >
-         struct peek_uint_impl
-         {
-            using data_t = typename R::type;
-            using pair_t = input_pair< data_t >;
-
-            template< typename Input >
-            static pair_t peek( Input& in ) noexcept( noexcept( in.size( sizeof( data_t ) ) ) )
-            {
-               if( in.size( sizeof( data_t ) ) < sizeof( data_t ) ) {
-                  return { 0, 0 };
-               }
-               const data_t data = R::read( in.current() );
-               return { data, sizeof( data_t ) };
-            }
-         };
-
-         using peek_uint16_be = peek_uint_impl< read_uint16_be >;
-         using peek_uint16_le = peek_uint_impl< read_uint16_le >;
-
-         using peek_uint32_be = peek_uint_impl< read_uint32_be >;
-         using peek_uint32_le = peek_uint_impl< read_uint32_le >;
-
-         using peek_uint64_be = peek_uint_impl< read_uint64_be >;
-         using peek_uint64_le = peek_uint_impl< read_uint64_le >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl/uint16.hpp"
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace uint16_be
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_uint16_be > {};
-
-         template< std::uint16_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint16_be, Cs... > {};
-         template< std::uint16_t Lo, std::uint16_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint16_be, Lo, Hi > {};
-         template< std::uint16_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint16_be, Cs... > {};
-         template< std::uint16_t Lo, std::uint16_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint16_be, Lo, Hi > {};
-         template< std::uint16_t... Cs > struct ranges : internal::ranges< internal::peek_uint16_be, Cs... > {};
-         template< std::uint16_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint16_be, Cs >... > {};
-
-         template< std::uint16_t M, std::uint16_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint16_be< M >, Cs... > {};
-         template< std::uint16_t M, std::uint16_t Lo, std::uint16_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint16_be< M >, Lo, Hi > {};
-         template< std::uint16_t M, std::uint16_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint16_be< M >, Cs... > {};
-         template< std::uint16_t M, std::uint16_t Lo, std::uint16_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint16_be< M >, Lo, Hi > {};
-         template< std::uint16_t M, std::uint16_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint16_be< M >, Cs... > {};
-         template< std::uint16_t M, std::uint16_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint16_be< M >, Cs >... > {};
-         // clang-format on
-
-      } // namespace uint16_be
-
-      namespace uint16_le
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_uint16_le > {};
-
-         template< std::uint16_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint16_le, Cs... > {};
-         template< std::uint16_t Lo, std::uint16_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint16_le, Lo, Hi > {};
-         template< std::uint16_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint16_le, Cs... > {};
-         template< std::uint16_t Lo, std::uint16_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint16_le, Lo, Hi > {};
-         template< std::uint16_t... Cs > struct ranges : internal::ranges< internal::peek_uint16_le, Cs... > {};
-         template< std::uint16_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint16_le, Cs >... > {};
-
-         template< std::uint16_t M, std::uint16_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint16_le< M >, Cs... > {};
-         template< std::uint16_t M, std::uint16_t Lo, std::uint16_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint16_le< M >, Lo, Hi > {};
-         template< std::uint16_t M, std::uint16_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint16_le< M >, Cs... > {};
-         template< std::uint16_t M, std::uint16_t Lo, std::uint16_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint16_le< M >, Lo, Hi > {};
-         template< std::uint16_t M, std::uint16_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint16_le< M >, Cs... > {};
-         template< std::uint16_t M, std::uint16_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint16_le< M >, Cs >... > {};
-         // clang-format on
-
-      } // namespace uint16_le
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 15 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/uint32.hpp"
-       
-#line 1 "tao/pegtl/uint32.hpp"
-
-
-
-#ifndef TAO_PEGTL_UINT32_HPP
-#define TAO_PEGTL_UINT32_HPP
-#line 14 "tao/pegtl/uint32.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace uint32_be
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_uint32_be > {};
-
-         template< std::uint32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint32_be, Cs... > {};
-         template< std::uint32_t Lo, std::uint32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint32_be, Lo, Hi > {};
-         template< std::uint32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint32_be, Cs... > {};
-         template< std::uint32_t Lo, std::uint32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint32_be, Lo, Hi > {};
-         template< std::uint32_t... Cs > struct ranges : internal::ranges< internal::peek_uint32_be, Cs... > {};
-         template< std::uint32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint32_be, Cs >... > {};
-
-         template< std::uint32_t M, std::uint32_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint32_be< M >, Cs... > {};
-         template< std::uint32_t M, std::uint32_t Lo, std::uint32_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint32_be< M >, Lo, Hi > {};
-         template< std::uint32_t M, std::uint32_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint32_be< M >, Cs... > {};
-         template< std::uint32_t M, std::uint32_t Lo, std::uint32_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint32_be< M >, Lo, Hi > {};
-         template< std::uint32_t M, std::uint32_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint32_be< M >, Cs... > {};
-         template< std::uint32_t M, std::uint32_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint32_be< M >, Cs >... > {};
-         // clang-format on
-
-      } // namespace uint32_be
-
-      namespace uint32_le
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_uint32_le > {};
-
-         template< std::uint32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint32_le, Cs... > {};
-         template< std::uint32_t Lo, std::uint32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint32_le, Lo, Hi > {};
-         template< std::uint32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint32_le, Cs... > {};
-         template< std::uint32_t Lo, std::uint32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint32_le, Lo, Hi > {};
-         template< std::uint32_t... Cs > struct ranges : internal::ranges< internal::peek_uint32_le, Cs... > {};
-         template< std::uint32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint32_le, Cs >... > {};
-
-         template< std::uint32_t M, std::uint32_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint32_le< M >, Cs... > {};
-         template< std::uint32_t M, std::uint32_t Lo, std::uint32_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint32_le< M >, Lo, Hi > {};
-         template< std::uint32_t M, std::uint32_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint32_le< M >, Cs... > {};
-         template< std::uint32_t M, std::uint32_t Lo, std::uint32_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint32_le< M >, Lo, Hi > {};
-         template< std::uint32_t M, std::uint32_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint32_le< M >, Cs... > {};
-         template< std::uint32_t M, std::uint32_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint32_le< M >, Cs >... > {};
-         // clang-format on
-
-      } // namespace uint32_le
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 16 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/uint64.hpp"
-       
-#line 1 "tao/pegtl/uint64.hpp"
-
-
-
-#ifndef TAO_PEGTL_UINT64_HPP
-#define TAO_PEGTL_UINT64_HPP
-#line 14 "tao/pegtl/uint64.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace uint64_be
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_uint64_be > {};
-
-         template< std::uint64_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint64_be, Cs... > {};
-         template< std::uint64_t Lo, std::uint64_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint64_be, Lo, Hi > {};
-         template< std::uint64_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint64_be, Cs... > {};
-         template< std::uint64_t Lo, std::uint64_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint64_be, Lo, Hi > {};
-         template< std::uint64_t... Cs > struct ranges : internal::ranges< internal::peek_uint64_be, Cs... > {};
-         template< std::uint64_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint64_be, Cs >... > {};
-
-
-         template< std::uint64_t M, std::uint64_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint64_be< M >, Cs... > {};
-         template< std::uint64_t M, std::uint64_t Lo, std::uint64_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint64_be< M >, Lo, Hi > {};
-         template< std::uint64_t M, std::uint64_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint64_be< M >, Cs... > {};
-         template< std::uint64_t M, std::uint64_t Lo, std::uint64_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint64_be< M >, Lo, Hi > {};
-         template< std::uint64_t M, std::uint64_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint64_be< M >, Cs... > {};
-         template< std::uint64_t M, std::uint64_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint64_be< M >, Cs >... > {};
-         // clang-format on
-
-      } // namespace uint64_be
-
-      namespace uint64_le
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_uint64_le > {};
-
-         template< std::uint64_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint64_le, Cs... > {};
-         template< std::uint64_t Lo, std::uint64_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint64_le, Lo, Hi > {};
-         template< std::uint64_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint64_le, Cs... > {};
-         template< std::uint64_t Lo, std::uint64_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint64_le, Lo, Hi > {};
-         template< std::uint64_t... Cs > struct ranges : internal::ranges< internal::peek_uint64_le, Cs... > {};
-         template< std::uint64_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint64_le, Cs >... > {};
-
-         template< std::uint64_t M, std::uint64_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint64_le< M >, Cs... > {};
-         template< std::uint64_t M, std::uint64_t Lo, std::uint64_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint64_le< M >, Lo, Hi > {};
-         template< std::uint64_t M, std::uint64_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint64_le< M >, Cs... > {};
-         template< std::uint64_t M, std::uint64_t Lo, std::uint64_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint64_le< M >, Lo, Hi > {};
-         template< std::uint64_t M, std::uint64_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint64_le< M >, Cs... > {};
-         template< std::uint64_t M, std::uint64_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint64_le< M >, Cs >... > {};
-         // clang-format on
-
-      } // namespace uint64_le
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 17 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/uint8.hpp"
-       
-#line 1 "tao/pegtl/uint8.hpp"
-
-
-
-#ifndef TAO_PEGTL_UINT8_HPP
-#define TAO_PEGTL_UINT8_HPP
-
-
-
-#line 1 "tao/pegtl/internal/peek_mask_uint8.hpp"
-       
-#line 1 "tao/pegtl/internal/peek_mask_uint8.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEEK_MASK_UINT8_HPP
-#define TAO_PEGTL_INTERNAL_PEEK_MASK_UINT8_HPP
-
-#include <cstddef>
-#include <cstdint>
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< std::uint8_t M >
-         struct peek_mask_uint8
-         {
-            using data_t = std::uint8_t;
-            using pair_t = input_pair< std::uint8_t >;
-
-            template< typename Input >
-            static pair_t peek( Input& in ) noexcept( noexcept( in.empty() ) )
-            {
-               if( in.empty() ) {
-                  return { 0, 0 };
-               }
-               return { std::uint8_t( in.peek_uint8() & M ), 1 };
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/uint8.hpp"
-#line 1 "tao/pegtl/internal/peek_uint8.hpp"
-       
-#line 1 "tao/pegtl/internal/peek_uint8.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEEK_UINT8_HPP
-#define TAO_PEGTL_INTERNAL_PEEK_UINT8_HPP
-
-#include <cstddef>
-#include <cstdint>
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct peek_uint8
-         {
-            using data_t = std::uint8_t;
-            using pair_t = input_pair< std::uint8_t >;
-
-            template< typename Input >
-            static pair_t peek( Input& in ) noexcept( noexcept( in.empty() ) )
-            {
-               if( in.empty() ) {
-                  return { 0, 0 };
-               }
-               return { in.peek_uint8(), 1 };
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "tao/pegtl/uint8.hpp"
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace uint8
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_uint8 > {};
-
-         template< std::uint8_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_uint8, Cs... > {};
-         template< std::uint8_t Lo, std::uint8_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_uint8, Lo, Hi > {};
-         template< std::uint8_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_uint8, Cs... > {};
-         template< std::uint8_t Lo, std::uint8_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_uint8, Lo, Hi > {};
-         template< std::uint8_t... Cs > struct ranges : internal::ranges< internal::peek_uint8, Cs... > {};
-         template< std::uint8_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_uint8, Cs >... > {};
-
-         template< std::uint8_t M, std::uint8_t... Cs > struct mask_not_one : internal::one< internal::result_on_found::failure, internal::peek_mask_uint8< M >, Cs... > {};
-         template< std::uint8_t M, std::uint8_t Lo, std::uint8_t Hi > struct mask_not_range : internal::range< internal::result_on_found::failure, internal::peek_mask_uint8< M >, Lo, Hi > {};
-         template< std::uint8_t M, std::uint8_t... Cs > struct mask_one : internal::one< internal::result_on_found::success, internal::peek_mask_uint8< M >, Cs... > {};
-         template< std::uint8_t M, std::uint8_t Lo, std::uint8_t Hi > struct mask_range : internal::range< internal::result_on_found::success, internal::peek_mask_uint8< M >, Lo, Hi > {};
-         template< std::uint8_t M, std::uint8_t... Cs > struct mask_ranges : internal::ranges< internal::peek_mask_uint8< M >, Cs... > {};
-         template< std::uint8_t M, std::uint8_t... Cs > struct mask_string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_mask_uint8< M >, Cs >... > {};
-         // clang-format on
-
-      } // namespace uint8
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 18 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/utf16.hpp"
-       
-#line 1 "tao/pegtl/utf16.hpp"
-
-
-
-#ifndef TAO_PEGTL_UTF16_HPP
-#define TAO_PEGTL_UTF16_HPP
-
-
-
-#line 1 "tao/pegtl/internal/peek_utf16.hpp"
-       
-#line 1 "tao/pegtl/internal/peek_utf16.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEEK_UTF16_HPP
-#define TAO_PEGTL_INTERNAL_PEEK_UTF16_HPP
-
-#include <type_traits>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename R >
-         struct peek_utf16_impl
-         {
-            using data_t = char32_t;
-            using pair_t = input_pair< char32_t >;
-
-            using short_t = std::make_unsigned< char16_t >::type;
-
-            static_assert( sizeof( short_t ) == 2, "expected size 2 for 16bit value" );
-            static_assert( sizeof( char16_t ) == 2, "expected size 2 for 16bit value" );
-
-            template< typename Input >
-            static pair_t peek( Input& in ) noexcept( noexcept( in.size( 4 ) ) )
-            {
-               if( in.size( 2 ) < 2 ) {
-                  return { 0, 0 };
-               }
-               const char32_t t = R::read( in.current() );
-               if( ( t < 0xd800 ) || ( t > 0xdfff ) ) {
-                  return { t, 2 };
-               }
-               if( ( t >= 0xdc00 ) || ( in.size( 4 ) < 4 ) ) {
-                  return { 0, 0 };
-               }
-               const char32_t u = R::read( in.current() + 2 );
-               if( ( u >= 0xdc00 ) && ( u <= 0xdfff ) ) {
-                  const auto cp = ( ( ( t & 0x03ff ) << 10 ) | ( u & 0x03ff ) ) + 0x10000;
-                  return { cp, 4 };
-               }
-               return { 0, 0 };
-            }
-         };
-
-         using peek_utf16_be = peek_utf16_impl< read_uint16_be >;
-         using peek_utf16_le = peek_utf16_impl< read_uint16_le >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/utf16.hpp"
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace utf16_be
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_utf16_be > {};
-         struct bom : internal::one< internal::result_on_found::success, internal::peek_utf16_be, 0xfeff > {};
-         template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf16_be, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf16_be, Lo, Hi > {};
-         template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf16_be, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf16_be, Lo, Hi > {};
-         template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf16_be, Cs... > {};
-         template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf16_be, Cs >... > {};
-         // clang-format on
-
-      } // namespace utf16_be
-
-      namespace utf16_le
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_utf16_le > {};
-         struct bom : internal::one< internal::result_on_found::success, internal::peek_utf16_le, 0xfeff > {};
-         template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf16_le, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf16_le, Lo, Hi > {};
-         template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf16_le, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf16_le, Lo, Hi > {};
-         template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf16_le, Cs... > {};
-         template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf16_le, Cs >... > {};
-         // clang-format on
-
-      } // namespace utf16_le
-
-      namespace utf16 = TAO_PEGTL_NATIVE_UTF16;
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 19 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/utf32.hpp"
-       
-#line 1 "tao/pegtl/utf32.hpp"
-
-
-
-#ifndef TAO_PEGTL_UTF32_HPP
-#define TAO_PEGTL_UTF32_HPP
-
-
-
-#line 1 "tao/pegtl/internal/peek_utf32.hpp"
-       
-#line 1 "tao/pegtl/internal/peek_utf32.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEEK_UTF32_HPP
-#define TAO_PEGTL_INTERNAL_PEEK_UTF32_HPP
-
-#include <cstddef>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename R >
-         struct peek_utf32_impl
-         {
-            using data_t = char32_t;
-            using pair_t = input_pair< char32_t >;
-
-            static_assert( sizeof( char32_t ) == 4, "expected size 4 for 32bit value" );
-
-            template< typename Input >
-            static pair_t peek( Input& in ) noexcept( noexcept( in.size( 4 ) ) )
-            {
-               if( in.size( 4 ) < 4 ) {
-                  return { 0, 0 };
-               }
-               const char32_t t = R::read( in.current() );
-               if( ( t <= 0x10ffff ) && !( t >= 0xd800 && t <= 0xdfff ) ) {
-                  return { t, 4 };
-               }
-               return { 0, 0 };
-            }
-         };
-
-         using peek_utf32_be = peek_utf32_impl< read_uint32_be >;
-         using peek_utf32_le = peek_utf32_impl< read_uint32_le >;
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/utf32.hpp"
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace utf32_be
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_utf32_be > {};
-         struct bom : internal::one< internal::result_on_found::success, internal::peek_utf32_be, 0xfeff > {};
-         template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf32_be, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf32_be, Lo, Hi > {};
-         template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf32_be, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf32_be, Lo, Hi > {};
-         template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf32_be, Cs... > {};
-         template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf32_be, Cs >... > {};
-         // clang-format on
-
-      } // namespace utf32_be
-
-      namespace utf32_le
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_utf32_le > {};
-         struct bom : internal::one< internal::result_on_found::success, internal::peek_utf32_le, 0xfeff > {};
-         template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf32_le, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf32_le, Lo, Hi > {};
-         template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf32_le, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf32_le, Lo, Hi > {};
-         template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf32_le, Cs... > {};
-         template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf32_le, Cs >... > {};
-         // clang-format on
-
-      } // namespace utf32_le
-
-      namespace utf32 = TAO_PEGTL_NATIVE_UTF32;
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 20 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/utf8.hpp"
-       
-#line 1 "tao/pegtl/utf8.hpp"
-
-
-
-#ifndef TAO_PEGTL_UTF8_HPP
-#define TAO_PEGTL_UTF8_HPP
-
-
-
-#line 1 "tao/pegtl/internal/peek_utf8.hpp"
-       
-#line 1 "tao/pegtl/internal/peek_utf8.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_PEEK_UTF8_HPP
-#define TAO_PEGTL_INTERNAL_PEEK_UTF8_HPP
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct peek_utf8
-         {
-            using data_t = char32_t;
-            using pair_t = input_pair< char32_t >;
-
-            template< typename Input >
-            static pair_t peek( Input& in ) noexcept( noexcept( in.empty() ) )
-            {
-               if( in.empty() ) {
-                  return { 0, 0 };
-               }
-               char32_t c0 = in.peek_uint8();
-               if( ( c0 & 0x80 ) == 0 ) {
-                  return { c0, 1 };
-               }
-               return peek_impl( in, c0 );
-            }
-
-         private:
-            template< typename Input >
-            static pair_t peek_impl( Input& in, char32_t c0 ) noexcept( noexcept( in.size( 4 ) ) )
-            {
-               if( ( c0 & 0xE0 ) == 0xC0 ) {
-                  if( in.size( 2 ) >= 2 ) {
-                     const char32_t c1 = in.peek_uint8( 1 );
-                     if( ( c1 & 0xC0 ) == 0x80 ) {
-                        c0 &= 0x1F;
-                        c0 <<= 6;
-                        c0 |= ( c1 & 0x3F );
-                        if( c0 >= 0x80 ) {
-                           return { c0, 2 };
-                        }
-                     }
-                  }
-               }
-               else if( ( c0 & 0xF0 ) == 0xE0 ) {
-                  if( in.size( 3 ) >= 3 ) {
-                     const char32_t c1 = in.peek_uint8( 1 );
-                     const char32_t c2 = in.peek_uint8( 2 );
-                     if( ( ( c1 & 0xC0 ) == 0x80 ) && ( ( c2 & 0xC0 ) == 0x80 ) ) {
-                        c0 &= 0x0F;
-                        c0 <<= 6;
-                        c0 |= ( c1 & 0x3F );
-                        c0 <<= 6;
-                        c0 |= ( c2 & 0x3F );
-                        if( c0 >= 0x800 && !( c0 >= 0xD800 && c0 <= 0xDFFF ) ) {
-                           return { c0, 3 };
-                        }
-                     }
-                  }
-               }
-               else if( ( c0 & 0xF8 ) == 0xF0 ) {
-                  if( in.size( 4 ) >= 4 ) {
-                     const char32_t c1 = in.peek_uint8( 1 );
-                     const char32_t c2 = in.peek_uint8( 2 );
-                     const char32_t c3 = in.peek_uint8( 3 );
-                     if( ( ( c1 & 0xC0 ) == 0x80 ) && ( ( c2 & 0xC0 ) == 0x80 ) && ( ( c3 & 0xC0 ) == 0x80 ) ) {
-                        c0 &= 0x07;
-                        c0 <<= 6;
-                        c0 |= ( c1 & 0x3F );
-                        c0 <<= 6;
-                        c0 |= ( c2 & 0x3F );
-                        c0 <<= 6;
-                        c0 |= ( c3 & 0x3F );
-                        if( c0 >= 0x10000 && c0 <= 0x10FFFF ) {
-                           return { c0, 4 };
-                        }
-                     }
-                  }
-               }
-               return { 0, 0 };
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/utf8.hpp"
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace utf8
-      {
-         // clang-format off
-         struct any : internal::any< internal::peek_utf8 > {};
-         struct bom : internal::one< internal::result_on_found::success, internal::peek_utf8, 0xfeff > {};
-         template< char32_t... Cs > struct not_one : internal::one< internal::result_on_found::failure, internal::peek_utf8, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct not_range : internal::range< internal::result_on_found::failure, internal::peek_utf8, Lo, Hi > {};
-         template< char32_t... Cs > struct one : internal::one< internal::result_on_found::success, internal::peek_utf8, Cs... > {};
-         template< char32_t Lo, char32_t Hi > struct range : internal::range< internal::result_on_found::success, internal::peek_utf8, Lo, Hi > {};
-         template< char32_t... Cs > struct ranges : internal::ranges< internal::peek_utf8, Cs... > {};
-         template< char32_t... Cs > struct string : internal::seq< internal::one< internal::result_on_found::success, internal::peek_utf8, Cs >... > {};
-         // clang-format on
-
-      } // namespace utf8
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 21 "tao/pegtl.hpp"
-
-#line 1 "tao/pegtl/argv_input.hpp"
-       
-#line 1 "tao/pegtl/argv_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_ARGV_INPUT_HPP
-#define TAO_PEGTL_ARGV_INPUT_HPP
-
-#include <cstddef>
-#include <sstream>
-#include <string>
-#include <utility>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         inline std::string make_argv_source( const std::size_t argn )
-         {
-            std::ostringstream os;
-            os << "argv[" << argn << ']';
-            return os.str();
-         }
-
-      } // namespace internal
-
-      template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
-      struct argv_input
-         : public memory_input< P, Eol >
-      {
-         template< typename T >
-         argv_input( char** argv, const std::size_t argn, T&& in_source )
-            : memory_input< P, Eol >( static_cast< const char* >( argv[ argn ] ), std::forward< T >( in_source ) )
-         {
-         }
-
-         argv_input( char** argv, const std::size_t argn )
-            : argv_input( argv, argn, internal::make_argv_source( argn ) )
-         {
-         }
-      };
-
-#ifdef __cpp_deduction_guides
-      template< typename... Ts >
-      argv_input( Ts&&... )->argv_input<>;
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 23 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/buffer_input.hpp"
-       
-#line 1 "tao/pegtl/buffer_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_BUFFER_INPUT_HPP
-#define TAO_PEGTL_BUFFER_INPUT_HPP
-
-#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#line 27 "tao/pegtl/buffer_input.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename Reader, typename Eol = eol::lf_crlf, typename Source = std::string, std::size_t Chunk = 64 >
-      class buffer_input
-      {
-      public:
-         using reader_t = Reader;
-
-         using eol_t = Eol;
-         using source_t = Source;
-
-         using iterator_t = internal::iterator;
-
-         using action_t = internal::action_input< buffer_input >;
-
-         static constexpr std::size_t chunk_size = Chunk;
-         static constexpr tracking_mode tracking_mode_v = tracking_mode::eager;
-
-         template< typename T, typename... As >
-         buffer_input( T&& in_source, const std::size_t maximum, As&&... as )
-            : m_reader( std::forward< As >( as )... ),
-              m_maximum( maximum + Chunk ),
-              m_buffer( new char[ maximum + Chunk ] ),
-              m_current( m_buffer.get() ),
-              m_end( m_buffer.get() ),
-              m_source( std::forward< T >( in_source ) )
-         {
-            static_assert( Chunk != 0, "zero chunk size not implemented" );
-            assert( m_maximum > maximum ); // Catches overflow; change to >= when zero chunk size is implemented.
-         }
-
-         buffer_input( const buffer_input& ) = delete;
-         buffer_input( buffer_input&& ) = delete;
-
-         ~buffer_input() = default;
-
-         void operator=( const buffer_input& ) = delete;
-         void operator=( buffer_input&& ) = delete;
-
-         bool empty()
-         {
-            require( 1 );
-            return m_current.data == m_end;
-         }
-
-         std::size_t size( const std::size_t amount )
-         {
-            require( amount );
-            return buffer_occupied();
-         }
-
-         const char* current() const noexcept
-         {
-            return m_current.data;
-         }
-
-         const char* end( const std::size_t amount )
-         {
-            require( amount );
-            return m_end;
-         }
-
-         std::size_t byte() const noexcept
-         {
-            return m_current.byte;
-         }
-
-         std::size_t line() const noexcept
-         {
-            return m_current.line;
-         }
-
-         std::size_t byte_in_line() const noexcept
-         {
-            return m_current.byte_in_line;
-         }
-
-         const Source& source() const noexcept
-         {
-            return m_source;
-         }
-
-         char peek_char( const std::size_t offset = 0 ) const noexcept
-         {
-            return m_current.data[ offset ];
-         }
-
-         std::uint8_t peek_uint8( const std::size_t offset = 0 ) const noexcept
-         {
-            return static_cast< std::uint8_t >( peek_char( offset ) );
-         }
-
-         // Compatibility, remove with 3.0.0
-         std::uint8_t peek_byte( const std::size_t offset = 0 ) const noexcept
-         {
-            return static_cast< std::uint8_t >( peek_char( offset ) );
-         }
-
-         void bump( const std::size_t in_count = 1 ) noexcept
-         {
-            internal::bump( m_current, in_count, Eol::ch );
-         }
-
-         void bump_in_this_line( const std::size_t in_count = 1 ) noexcept
-         {
-            internal::bump_in_this_line( m_current, in_count );
-         }
-
-         void bump_to_next_line( const std::size_t in_count = 1 ) noexcept
-         {
-            internal::bump_to_next_line( m_current, in_count );
-         }
-
-         void discard() noexcept
-         {
-            if( m_current.data > m_buffer.get() + Chunk ) {
-               const auto s = m_end - m_current.data;
-               std::memmove( m_buffer.get(), m_current.data, s );
-               m_current.data = m_buffer.get();
-               m_end = m_buffer.get() + s;
-            }
-         }
-
-         void require( const std::size_t amount )
-         {
-            if( m_current.data + amount <= m_end ) {
-               return;
-            }
-            if( m_current.data + amount > m_buffer.get() + m_maximum ) {
-               throw std::overflow_error( "require beyond end of buffer" );
-            }
-            if( const auto r = m_reader( m_end, ( std::min )( buffer_free_after_end(), ( std::max )( amount - buffer_occupied(), Chunk ) ) ) ) {
-               m_end += r;
-            }
-         }
-
-         template< rewind_mode M >
-         internal::marker< iterator_t, M > mark() noexcept
-         {
-            return internal::marker< iterator_t, M >( m_current );
-         }
-
-         TAO_PEGTL_NAMESPACE::position position( const iterator_t& it ) const
-         {
-            return TAO_PEGTL_NAMESPACE::position( it, m_source );
-         }
-
-         TAO_PEGTL_NAMESPACE::position position() const
-         {
-            return position( m_current );
-         }
-
-         const iterator_t& iterator() const noexcept
-         {
-            return m_current;
-         }
-
-         std::size_t buffer_capacity() const noexcept
-         {
-            return m_maximum;
-         }
-
-         std::size_t buffer_occupied() const noexcept
-         {
-            assert( m_end >= m_current.data );
-            return std::size_t( m_end - m_current.data );
-         }
-
-         std::size_t buffer_free_before_current() const noexcept
-         {
-            assert( m_current.data >= m_buffer.get() );
-            return std::size_t( m_current.data - m_buffer.get() );
-         }
-
-         std::size_t buffer_free_after_end() const noexcept
-         {
-            assert( m_buffer.get() + m_maximum >= m_end );
-            return std::size_t( m_buffer.get() + m_maximum - m_end );
-         }
-
-      private:
-         Reader m_reader;
-         std::size_t m_maximum;
-         std::unique_ptr< char[] > m_buffer; // NOLINT
-         iterator_t m_current;
-         char* m_end;
-         const Source m_source;
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 24 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/cstream_input.hpp"
-       
-#line 1 "tao/pegtl/cstream_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_CSTREAM_INPUT_HPP
-#define TAO_PEGTL_CSTREAM_INPUT_HPP
-
-#include <cstdio>
-
-
-
-
-
-#line 1 "tao/pegtl/internal/cstream_reader.hpp"
-       
-#line 1 "tao/pegtl/internal/cstream_reader.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_CSTREAM_READER_HPP
-#define TAO_PEGTL_INTERNAL_CSTREAM_READER_HPP
-
-#include <cassert>
-#include <cstddef>
-#include <cstdio>
-
-
-#line 1 "tao/pegtl/internal/../input_error.hpp"
-       
-#line 1 "tao/pegtl/internal/../input_error.hpp"
-
-
-
-#ifndef TAO_PEGTL_INPUT_ERROR_HPP
-#define TAO_PEGTL_INPUT_ERROR_HPP
-
-#include <cerrno>
-#include <sstream>
-#include <stdexcept>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct input_error
-         : std::runtime_error
-      {
-         input_error( const std::string& message, const int in_errorno )
-            : std::runtime_error( message ),
-              errorno( in_errorno )
-         {
-         }
-
-         int errorno;
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#define TAO_PEGTL_INTERNAL_UNWRAP( ... ) __VA_ARGS__
-
-#define TAO_PEGTL_THROW_INPUT_ERROR( MESSAGE )                                             do {                                                                                       const int errorno = errno;                                                              std::ostringstream oss;                                                                 oss << "pegtl: " << TAO_PEGTL_INTERNAL_UNWRAP( MESSAGE ) << " errno " << errorno;       throw tao::TAO_PEGTL_NAMESPACE::input_error( oss.str(), errorno );                   } while( false )
-
-
-
-
-
-
-
-#define TAO_PEGTL_THROW_INPUT_WIN32_ERROR( MESSAGE )                                                do {                                                                                                const int errorno = GetLastError();                                                              std::ostringstream oss;                                                                          oss << "pegtl: " << TAO_PEGTL_INTERNAL_UNWRAP( MESSAGE ) << " GetLastError() " << errorno;       throw tao::TAO_PEGTL_NAMESPACE::input_error( oss.str(), errorno );                            } while( false )
-
-
-
-
-
-
-
-#endif
-#line 13 "tao/pegtl/internal/cstream_reader.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct cstream_reader
-         {
-            explicit cstream_reader( std::FILE* s ) noexcept
-               : m_cstream( s )
-            {
-               assert( m_cstream != nullptr );
-            }
-
-            std::size_t operator()( char* buffer, const std::size_t length ) const
-            {
-               if( const auto r = std::fread( buffer, 1, length, m_cstream ) ) {
-                  return r;
-               }
-               if( std::feof( m_cstream ) != 0 ) {
-                  return 0;
-               }
-               // Please contact us if you know how to provoke the following exception.
-               // The example on cppreference.com doesn't work, at least not on macOS.
-               TAO_PEGTL_THROW_INPUT_ERROR( "error in fread() from cstream" ); // LCOV_EXCL_LINE
-            }
-
-            std::FILE* m_cstream;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl/cstream_input.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename Eol = eol::lf_crlf, std::size_t Chunk = 64 >
-      struct cstream_input
-         : buffer_input< internal::cstream_reader, Eol, std::string, Chunk >
-      {
-         template< typename T >
-         cstream_input( std::FILE* in_stream, const std::size_t in_maximum, T&& in_source )
-            : buffer_input< internal::cstream_reader, Eol, std::string, Chunk >( std::forward< T >( in_source ), in_maximum, in_stream )
-         {
-         }
-      };
-
-#ifdef __cpp_deduction_guides
-      template< typename... Ts >
-      cstream_input( Ts&&... )->cstream_input<>;
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 25 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/istream_input.hpp"
-       
-#line 1 "tao/pegtl/istream_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_ISTREAM_INPUT_HPP
-#define TAO_PEGTL_ISTREAM_INPUT_HPP
-
-#include <istream>
-
-
-
-
-
-#line 1 "tao/pegtl/internal/istream_reader.hpp"
-       
-#line 1 "tao/pegtl/internal/istream_reader.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_ISTREAM_READER_HPP
-#define TAO_PEGTL_INTERNAL_ISTREAM_READER_HPP
-
-#include <istream>
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct istream_reader
-         {
-            explicit istream_reader( std::istream& s ) noexcept
-               : m_istream( s )
-            {
-            }
-
-            std::size_t operator()( char* buffer, const std::size_t length )
-            {
-               m_istream.read( buffer, std::streamsize( length ) );
-
-               if( const auto r = m_istream.gcount() ) {
-                  return std::size_t( r );
-               }
-               if( m_istream.eof() ) {
-                  return 0;
-               }
-               TAO_PEGTL_THROW_INPUT_ERROR( "error in istream.read()" );
-            }
-
-            std::istream& m_istream;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "tao/pegtl/istream_input.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename Eol = eol::lf_crlf, std::size_t Chunk = 64 >
-      struct istream_input
-         : buffer_input< internal::istream_reader, Eol, std::string, Chunk >
-      {
-         template< typename T >
-         istream_input( std::istream& in_stream, const std::size_t in_maximum, T&& in_source )
-            : buffer_input< internal::istream_reader, Eol, std::string, Chunk >( std::forward< T >( in_source ), in_maximum, in_stream )
-         {
-         }
-      };
-
-#ifdef __cpp_deduction_guides
-      template< typename... Ts >
-      istream_input( Ts&&... )->istream_input<>;
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 26 "tao/pegtl.hpp"
-
-#line 1 "tao/pegtl/read_input.hpp"
-       
-#line 1 "tao/pegtl/read_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_READ_INPUT_HPP
-#define TAO_PEGTL_READ_INPUT_HPP
-
-#include <string>
-
-
-
-#line 1 "tao/pegtl/string_input.hpp"
-       
-#line 1 "tao/pegtl/string_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_STRING_INPUT_HPP
-#define TAO_PEGTL_STRING_INPUT_HPP
-
-#include <string>
-#include <utility>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct string_holder
-         {
-            const std::string data;
-
-            template< typename T >
-            explicit string_holder( T&& in_data )
-               : data( std::forward< T >( in_data ) )
-            {
-            }
-
-            string_holder( const string_holder& ) = delete;
-            string_holder( string_holder&& ) = delete;
-
-            ~string_holder() = default;
-
-            void operator=( const string_holder& ) = delete;
-            void operator=( string_holder&& ) = delete;
-         };
-
-      } // namespace internal
-
-      template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf, typename Source = std::string >
-      struct string_input
-         : private internal::string_holder,
-           public memory_input< P, Eol, Source >
-      {
-         template< typename V, typename T, typename... Ts >
-         explicit string_input( V&& in_data, T&& in_source, Ts&&... ts )
-            : internal::string_holder( std::forward< V >( in_data ) ),
-              memory_input< P, Eol, Source >( data.data(), data.size(), std::forward< T >( in_source ), std::forward< Ts >( ts )... )
-         {
-         }
-
-         string_input( const string_input& ) = delete;
-         string_input( string_input&& ) = delete;
-
-         ~string_input() = default;
-
-         void operator=( const string_input& ) = delete;
-         void operator=( string_input&& ) = delete;
-      };
-
-#ifdef __cpp_deduction_guides
-      template< typename... Ts >
-      explicit string_input( Ts&&... )->string_input<>;
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "tao/pegtl/read_input.hpp"
-
-
-#line 1 "tao/pegtl/internal/file_reader.hpp"
-       
-#line 1 "tao/pegtl/internal/file_reader.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_FILE_READER_HPP
-#define TAO_PEGTL_INTERNAL_FILE_READER_HPP
-
-#include <cstdio>
-#include <memory>
-#include <string>
-#include <utility>
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         inline std::FILE* file_open( const char* filename )
-         {
-            errno = 0;
-#if defined( _MSC_VER )
-            std::FILE* file;
-            if( ::fopen_s( &file, filename, "rb" ) == 0 )
-#elif defined( __MINGW32__ )
-            if( auto* file = std::fopen( filename, "rb" ) ) // NOLINT
-#else
-            if( auto* file = std::fopen( filename, "rbe" ) ) // NOLINT
-#endif
-            {
-               return file;
-            }
-            TAO_PEGTL_THROW_INPUT_ERROR( "unable to fopen() file " << filename << " for reading" );
-         }
-
-         struct file_close
-         {
-            void operator()( FILE* f ) const noexcept
-            {
-               std::fclose( f ); // NOLINT
-            }
-         };
-
-         class file_reader
-         {
-         public:
-            explicit file_reader( const char* filename )
-               : m_source( filename ),
-                 m_file( file_open( m_source ) )
-            {
-            }
-
-            file_reader( FILE* file, const char* filename ) noexcept
-               : m_source( filename ),
-                 m_file( file )
-            {
-            }
-
-            file_reader( const file_reader& ) = delete;
-            file_reader( file_reader&& ) = delete;
-
-            ~file_reader() = default;
-
-            void operator=( const file_reader& ) = delete;
-            void operator=( file_reader&& ) = delete;
-
-            std::size_t size() const
-            {
-               errno = 0;
-               if( std::fseek( m_file.get(), 0, SEEK_END ) != 0 ) {
-                  TAO_PEGTL_THROW_INPUT_ERROR( "unable to fseek() to end of file " << m_source ); // LCOV_EXCL_LINE
-               }
-               errno = 0;
-               const auto s = std::ftell( m_file.get() );
-               if( s < 0 ) {
-                  TAO_PEGTL_THROW_INPUT_ERROR( "unable to ftell() file size of file " << m_source ); // LCOV_EXCL_LINE
-               }
-               errno = 0;
-               if( std::fseek( m_file.get(), 0, SEEK_SET ) != 0 ) {
-                  TAO_PEGTL_THROW_INPUT_ERROR( "unable to fseek() to beginning of file " << m_source ); // LCOV_EXCL_LINE
-               }
-               return std::size_t( s );
-            }
-
-            std::string read() const
-            {
-               std::string nrv;
-               nrv.resize( size() );
-               errno = 0;
-               if( !nrv.empty() && ( std::fread( &nrv[ 0 ], nrv.size(), 1, m_file.get() ) != 1 ) ) {
-                  TAO_PEGTL_THROW_INPUT_ERROR( "unable to fread() file " << m_source << " size " << nrv.size() ); // LCOV_EXCL_LINE
-               }
-               return nrv;
-            }
-
-         private:
-            const char* const m_source;
-            const std::unique_ptr< std::FILE, file_close > m_file;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 15 "tao/pegtl/read_input.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct filename_holder
-         {
-            const std::string filename;
-
-            template< typename T >
-            explicit filename_holder( T&& in_filename )
-               : filename( std::forward< T >( in_filename ) )
-            {
-            }
-
-            filename_holder( const filename_holder& ) = delete;
-            filename_holder( filename_holder&& ) = delete;
-
-            ~filename_holder() = default;
-
-            void operator=( const filename_holder& ) = delete;
-            void operator=( filename_holder&& ) = delete;
-         };
-
-      } // namespace internal
-
-      template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
-      struct read_input
-         : private internal::filename_holder,
-           public string_input< P, Eol, const char* >
-      {
-         template< typename T >
-         explicit read_input( T&& in_filename )
-            : internal::filename_holder( std::forward< T >( in_filename ) ),
-              string_input< P, Eol, const char* >( internal::file_reader( filename.c_str() ).read(), filename.c_str() )
-         {
-         }
-
-         template< typename T >
-         read_input( FILE* in_file, T&& in_filename )
-            : internal::filename_holder( std::forward< T >( in_filename ) ),
-              string_input< P, Eol, const char* >( internal::file_reader( in_file, filename.c_str() ).read(), filename.c_str() )
-         {
-         }
-
-         read_input( const read_input& ) = delete;
-         read_input( read_input&& ) = delete;
-
-         ~read_input() = default;
-
-         void operator=( const read_input& ) = delete;
-         void operator=( read_input&& ) = delete;
-      };
-
-#ifdef __cpp_deduction_guides
-      template< typename... Ts >
-      explicit read_input( Ts&&... )->read_input<>;
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 28 "tao/pegtl.hpp"
-
-
-// this has to be included *after* the above inputs,
-// otherwise the amalgamated header will not work!
-#line 1 "tao/pegtl/file_input.hpp"
-       
-#line 1 "tao/pegtl/file_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_FILE_INPUT_HPP
-#define TAO_PEGTL_FILE_INPUT_HPP
-
-
-
-
-
-#if defined( __unix__ ) || ( defined( __APPLE__ ) && defined( __MACH__ ) )
-#include <unistd.h>  // Required for _POSIX_MAPPED_FILES
-#endif
-
-#if defined( _POSIX_MAPPED_FILES ) || defined( _WIN32 )
-#line 1 "tao/pegtl/mmap_input.hpp"
-       
-#line 1 "tao/pegtl/mmap_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_MMAP_INPUT_HPP
-#define TAO_PEGTL_MMAP_INPUT_HPP
-
-#include <string>
-#include <utility>
-
-
-
-
-
-
-#if defined( __unix__ ) || ( defined( __APPLE__ ) && defined( __MACH__ ) )
-#include <unistd.h>  // Required for _POSIX_MAPPED_FILES
-#endif
-
-#if defined( _POSIX_MAPPED_FILES )
-#line 1 "tao/pegtl/internal/file_mapper_posix.hpp"
-       
-#line 1 "tao/pegtl/internal/file_mapper_posix.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_FILE_MAPPER_POSIX_HPP
-#define TAO_PEGTL_INTERNAL_FILE_MAPPER_POSIX_HPP
-
-#include <sys/mman.h>
-#include <unistd.h>
-
-
-
-#line 1 "tao/pegtl/internal/file_opener.hpp"
-       
-#line 1 "tao/pegtl/internal/file_opener.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_FILE_OPENER_HPP
-#define TAO_PEGTL_INTERNAL_FILE_OPENER_HPP
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <utility>
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct file_opener
-         {
-            explicit file_opener( const char* filename )
-               : m_source( filename ),
-                 m_fd( open() )
-            {
-            }
-
-            file_opener( const file_opener& ) = delete;
-            file_opener( file_opener&& ) = delete;
-
-            ~file_opener() noexcept
-            {
-               ::close( m_fd );
-            }
-
-            void operator=( const file_opener& ) = delete;
-            void operator=( file_opener&& ) = delete;
-
-            std::size_t size() const
-            {
-               struct stat st; // NOLINT
-               errno = 0;
-               if( ::fstat( m_fd, &st ) < 0 ) {
-                  TAO_PEGTL_THROW_INPUT_ERROR( "unable to fstat() file " << m_source << " descriptor " << m_fd );
-               }
-               return std::size_t( st.st_size );
-            }
-
-            const char* const m_source;
-            const int m_fd;
-
-         private:
-            int open() const
-            {
-               errno = 0;
-               const int fd = ::open( m_source, // NOLINT
-                                      O_RDONLY
-#ifdef O_CLOEXEC
-                                         | O_CLOEXEC
-#endif
-               );
-               if( fd >= 0 ) {
-                  return fd;
-               }
-               TAO_PEGTL_THROW_INPUT_ERROR( "unable to open() file " << m_source << " for reading" );
-            }
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "tao/pegtl/internal/file_mapper_posix.hpp"
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         class file_mapper
-         {
-         public:
-            explicit file_mapper( const char* filename )
-               : file_mapper( file_opener( filename ) )
-            {
-            }
-
-            explicit file_mapper( const file_opener& reader )
-               : m_size( reader.size() ),
-                 m_data( static_cast< const char* >( ::mmap( nullptr, m_size, PROT_READ, MAP_PRIVATE, reader.m_fd, 0 ) ) )
-            {
-               if( ( m_size != 0 ) && ( intptr_t( m_data ) == -1 ) ) {
-                  TAO_PEGTL_THROW_INPUT_ERROR( "unable to mmap() file " << reader.m_source << " descriptor " << reader.m_fd );
-               }
-            }
-
-            file_mapper( const file_mapper& ) = delete;
-            file_mapper( file_mapper&& ) = delete;
-
-            ~file_mapper() noexcept
-            {
-               // Legacy C interface requires pointer-to-mutable but does not write through the pointer.
-               ::munmap( const_cast< char* >( m_data ), m_size ); // NOLINT
-            }
-
-            void operator=( const file_mapper& ) = delete;
-            void operator=( file_mapper&& ) = delete;
-
-            bool empty() const noexcept
-            {
-               return m_size == 0;
-            }
-
-            std::size_t size() const noexcept
-            {
-               return m_size;
-            }
-
-            using iterator = const char*;
-            using const_iterator = const char*;
-
-            iterator data() const noexcept
-            {
-               return m_data;
-            }
-
-            iterator begin() const noexcept
-            {
-               return m_data;
-            }
-
-            iterator end() const noexcept
-            {
-               return m_data + m_size;
-            }
-
-            std::string string() const
-            {
-               return std::string( m_data, m_size );
-            }
-
-         private:
-            const std::size_t m_size;
-            const char* const m_data;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 21 "tao/pegtl/mmap_input.hpp"
-#elif defined( _WIN32 )
-#line 1 "tao/pegtl/internal/file_mapper_win32.hpp"
-       
-#line 1 "tao/pegtl/internal/file_mapper_win32.hpp"
-
-
-
-#ifndef TAO_PEGTL_INTERNAL_FILE_MAPPER_WIN32_HPP
-#define TAO_PEGTL_INTERNAL_FILE_MAPPER_WIN32_HPP
-
-#if !defined( NOMINMAX )
-#define NOMINMAX
-#define TAO_PEGTL_NOMINMAX_WAS_DEFINED
-#endif
-
-#if !defined( WIN32_LEAN_AND_MEAN )
-#define WIN32_LEAN_AND_MEAN
-#define TAO_PEGTL_WIN32_LEAN_AND_MEAN_WAS_DEFINED
-#endif
-
-#include <windows.h>
-
-#if defined( TAO_PEGTL_NOMINMAX_WAS_DEFINED )
-#undef NOMINMAX
-#undef TAO_PEGTL_NOMINMAX_WAS_DEFINED
-#endif
-
-#if defined( TAO_PEGTL_WIN32_LEAN_AND_MEAN_WAS_DEFINED )
-#undef WIN32_LEAN_AND_MEAN
-#undef TAO_PEGTL_WIN32_LEAN_AND_MEAN_WAS_DEFINED
-#endif
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct win32_file_opener
-         {
-            explicit win32_file_opener( const char* filename )
-               : m_source( filename ),
-                 m_handle( open() )
-            {
-            }
-
-            win32_file_opener( const win32_file_opener& ) = delete;
-            win32_file_opener( win32_file_opener&& ) = delete;
-
-            ~win32_file_opener() noexcept
-            {
-               ::CloseHandle( m_handle );
-            }
-
-            void operator=( const win32_file_opener& ) = delete;
-            void operator=( win32_file_opener&& ) = delete;
-
-            std::size_t size() const
-            {
-               LARGE_INTEGER size;
-               if( !::GetFileSizeEx( m_handle, &size ) ) {
-                  TAO_PEGTL_THROW_INPUT_WIN32_ERROR( "unable to GetFileSizeEx() file " << m_source << " handle " << m_handle );
-               }
-               return std::size_t( size.QuadPart );
-            }
-
-            const char* const m_source;
-            const HANDLE m_handle;
-
-         private:
-            HANDLE open() const
-            {
-               SetLastError( 0 );
-               std::wstring ws( m_source, m_source + strlen( m_source ) );
-
-#if( _WIN32_WINNT >= 0x0602 )
-               const HANDLE handle = ::CreateFile2( ws.c_str(),
-                                                    GENERIC_READ,
-                                                    FILE_SHARE_READ,
-                                                    OPEN_EXISTING,
-                                                    nullptr );
-               if( handle != INVALID_HANDLE_VALUE ) {
-                  return handle;
-               }
-               TAO_PEGTL_THROW_INPUT_WIN32_ERROR( "CreateFile2() failed opening file " << m_source << " for reading" );
-#else
-               const HANDLE handle = ::CreateFileW( ws.c_str(),
-                                                    GENERIC_READ,
-                                                    FILE_SHARE_READ,
-                                                    nullptr,
-                                                    OPEN_EXISTING,
-                                                    FILE_ATTRIBUTE_NORMAL,
-                                                    nullptr );
-               if( handle != INVALID_HANDLE_VALUE ) {
-                  return handle;
-               }
-               TAO_PEGTL_THROW_INPUT_WIN32_ERROR( "CreateFileW() failed opening file " << m_source << " for reading" );
-#endif
-            }
-         };
-
-         struct win32_file_mapper
-         {
-            explicit win32_file_mapper( const char* filename )
-               : win32_file_mapper( win32_file_opener( filename ) )
-            {
-            }
-
-            explicit win32_file_mapper( const win32_file_opener& reader )
-               : m_size( reader.size() ),
-                 m_handle( open( reader ) )
-            {
-            }
-
-            win32_file_mapper( const win32_file_mapper& ) = delete;
-            win32_file_mapper( win32_file_mapper&& ) = delete;
-
-            ~win32_file_mapper() noexcept
-            {
-               ::CloseHandle( m_handle );
-            }
-
-            void operator=( const win32_file_mapper& ) = delete;
-            void operator=( win32_file_mapper&& ) = delete;
-
-            const size_t m_size;
-            const HANDLE m_handle;
-
-         private:
-            HANDLE open( const win32_file_opener& reader ) const
-            {
-               const uint64_t file_size = reader.size();
-               SetLastError( 0 );
-               // Use `CreateFileMappingW` because a) we're not specifying a
-               // mapping name, so the character type is of no consequence, and
-               // b) it's defined in `memoryapi.h`, unlike
-               // `CreateFileMappingA`(?!)
-               const HANDLE handle = ::CreateFileMappingW( reader.m_handle,
-                                                           nullptr,
-                                                           PAGE_READONLY,
-                                                           DWORD( file_size >> 32 ),
-                                                           DWORD( file_size & 0xffffffff ),
-                                                           nullptr );
-               if( handle != NULL || file_size == 0 ) {
-                  return handle;
-               }
-               TAO_PEGTL_THROW_INPUT_WIN32_ERROR( "unable to CreateFileMappingW() file " << reader.m_source << " for reading" );
-            }
-         };
-
-         class file_mapper
-         {
-         public:
-            explicit file_mapper( const char* filename )
-               : file_mapper( win32_file_mapper( filename ) )
-            {
-            }
-
-            explicit file_mapper( const win32_file_mapper& mapper )
-               : m_size( mapper.m_size ),
-                 m_data( static_cast< const char* >( ::MapViewOfFile( mapper.m_handle,
-                                                                      FILE_MAP_READ,
-                                                                      0,
-                                                                      0,
-                                                                      0 ) ) )
-            {
-               if( ( m_size != 0 ) && ( intptr_t( m_data ) == 0 ) ) {
-                  TAO_PEGTL_THROW_INPUT_WIN32_ERROR( "unable to MapViewOfFile() file mapping object with handle " << mapper.m_handle );
-               }
-            }
-
-            file_mapper( const file_mapper& ) = delete;
-            file_mapper( file_mapper&& ) = delete;
-
-            ~file_mapper() noexcept
-            {
-               ::UnmapViewOfFile( LPCVOID( m_data ) );
-            }
-
-            void operator=( const file_mapper& ) = delete;
-            void operator=( file_mapper&& ) = delete;
-
-            bool empty() const noexcept
-            {
-               return m_size == 0;
-            }
-
-            std::size_t size() const noexcept
-            {
-               return m_size;
-            }
-
-            using iterator = const char*;
-            using const_iterator = const char*;
-
-            iterator data() const noexcept
-            {
-               return m_data;
-            }
-
-            iterator begin() const noexcept
-            {
-               return m_data;
-            }
-
-            iterator end() const noexcept
-            {
-               return m_data + m_size;
-            }
-
-            std::string string() const
-            {
-               return std::string( m_data, m_size );
-            }
-
-         private:
-            const std::size_t m_size;
-            const char* const m_data;
-         };
-
-      } // namespace internal
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 23 "tao/pegtl/mmap_input.hpp"
-#else
-#endif
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         struct mmap_holder
-         {
-            const std::string filename;
-            const file_mapper data;
-
-            template< typename T >
-            explicit mmap_holder( T&& in_filename )
-               : filename( std::forward< T >( in_filename ) ),
-                 data( filename.c_str() )
-            {
-            }
-
-            mmap_holder( const mmap_holder& ) = delete;
-            mmap_holder( mmap_holder&& ) = delete;
-
-            ~mmap_holder() = default;
-
-            void operator=( const mmap_holder& ) = delete;
-            void operator=( mmap_holder&& ) = delete;
-         };
-
-      } // namespace internal
-
-      template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
-      struct mmap_input
-         : private internal::mmap_holder,
-           public memory_input< P, Eol, const char* >
-      {
-         template< typename T >
-         explicit mmap_input( T&& in_filename )
-            : internal::mmap_holder( std::forward< T >( in_filename ) ),
-              memory_input< P, Eol, const char* >( data.begin(), data.end(), filename.c_str() )
-         {
-         }
-
-         mmap_input( const mmap_input& ) = delete;
-         mmap_input( mmap_input&& ) = delete;
-
-         ~mmap_input() = default;
-
-         void operator=( const mmap_input& ) = delete;
-         void operator=( mmap_input&& ) = delete;
-      };
-
-#ifdef __cpp_deduction_guides
-      template< typename... Ts >
-      explicit mmap_input( Ts&&... )->mmap_input<>;
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 17 "tao/pegtl/file_input.hpp"
-#else
-
-#endif
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-#if defined( _POSIX_MAPPED_FILES ) || defined( _WIN32 )
-      template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
-      struct file_input
-         : mmap_input< P, Eol >
-      {
-         using mmap_input< P, Eol >::mmap_input;
-      };
-#else
-      template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
-      struct file_input
-         : read_input< P, Eol >
-      {
-         using read_input< P, Eol >::read_input;
-      };
-#endif
-
-#ifdef __cpp_deduction_guides
-      template< typename... Ts >
-      explicit file_input( Ts&&... )->file_input<>;
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 33 "tao/pegtl.hpp"
-
-#line 1 "tao/pegtl/change_action.hpp"
-       
-#line 1 "tao/pegtl/change_action.hpp"
-
-
-
-#ifndef TAO_PEGTL_CHANGE_ACTION_HPP
-#define TAO_PEGTL_CHANGE_ACTION_HPP
-
-#include <type_traits>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< template< typename... > class NewAction >
-      struct change_action
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static bool match( Input& in, States&&... st )
-         {
-            static_assert( !std::is_same< Action< void >, NewAction< void > >::value, "old and new action class templates are identical" );
-            return Control< Rule >::template match< A, M, NewAction, Control >( in, st... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 35 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/change_action_and_state.hpp"
-       
-#line 1 "tao/pegtl/change_action_and_state.hpp"
-
-
-
-#ifndef TAO_PEGTL_CHANGE_ACTION_AND_STATE_HPP
-#define TAO_PEGTL_CHANGE_ACTION_AND_STATE_HPP
-
-#include <type_traits>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< template< typename... > class NewAction, typename NewState >
-      struct change_action_and_state
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static auto match( Input& in, States&&... st )
-            -> typename std::enable_if< ( A == apply_mode::action ), bool >::type
-         {
-            static_assert( !std::is_same< Action< void >, NewAction< void > >::value, "old and new action class templates are identical" );
-            NewState s( static_cast< const Input& >( in ), st... );
-            if( Control< Rule >::template match< A, M, NewAction, Control >( in, s ) ) {
-               Action< Rule >::success( static_cast< const Input& >( in ), s, st... );
-               return true;
-            }
-            return false;
-         }
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States,
-                   int = 1 >
-         static auto match( Input& in, States&&... st )
-            -> typename std::enable_if< ( A == apply_mode::nothing ), bool >::type
-         {
-            static_assert( !std::is_same< Action< void >, NewAction< void > >::value, "old and new action class templates are identical" );
-            NewState s( static_cast< const Input& >( in ), st... );
-            return Control< Rule >::template match< A, M, NewAction, Control >( in, s );
-         }
-
-         template< typename Input,
-                   typename... States >
-         static void success( const Input& in, NewState& s, States&&... st ) noexcept( noexcept( s.success( in, st... ) ) )
-         {
-            s.success( in, st... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 36 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/change_action_and_states.hpp"
-       
-#line 1 "tao/pegtl/change_action_and_states.hpp"
-
-
-
-#ifndef TAO_PEGTL_CHANGE_ACTION_AND_STATES_HPP
-#define TAO_PEGTL_CHANGE_ACTION_AND_STATES_HPP
-
-#include <tuple>
-#include <type_traits>
-#line 17 "tao/pegtl/change_action_and_states.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< template< typename... > class NewAction, typename... NewStates >
-      struct change_action_and_states
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   std::size_t... Ns,
-                   typename Input,
-                   typename... States >
-         static bool match( TAO_PEGTL_NAMESPACE::internal::index_sequence< Ns... >, Input& in, States&&... st )
-         {
-            auto t = std::tie( st... );
-            if( Control< Rule >::template match< A, M, NewAction, Control >( in, std::get< Ns >( t )... ) ) {
-               Action< Rule >::success( static_cast< const Input& >( in ), st... );
-               return true;
-            }
-            return false;
-         }
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static auto match( Input& in, States&&... st )
-            -> typename std::enable_if< ( A == apply_mode::action ), bool >::type
-         {
-            static_assert( !std::is_same< Action< void >, NewAction< void > >::value, "old and new action class templates are identical" );
-            return match< Rule, A, M, Action, Control >( TAO_PEGTL_NAMESPACE::internal::index_sequence_for< NewStates... >(), in, NewStates()..., st... );
-         }
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States,
-                   int = 1 >
-         static auto match( Input& in, States&&... /*unused*/ )
-            -> typename std::enable_if< ( A == apply_mode::nothing ), bool >::type
-         {
-            static_assert( !std::is_same< Action< void >, NewAction< void > >::value, "old and new action class templates are identical" );
-            return Control< Rule >::template match< A, M, NewAction, Control >( in, NewStates()... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 37 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/change_control.hpp"
-       
-#line 1 "tao/pegtl/change_control.hpp"
-
-
-
-#ifndef TAO_PEGTL_CHANGE_CONTROL_HPP
-#define TAO_PEGTL_CHANGE_CONTROL_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< template< typename... > class NewControl >
-      struct change_control
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static bool match( Input& in, States&&... st )
-         {
-            return TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, NewControl >( in, st... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 38 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/change_state.hpp"
-       
-#line 1 "tao/pegtl/change_state.hpp"
-
-
-
-#ifndef TAO_PEGTL_CHANGE_STATE_HPP
-#define TAO_PEGTL_CHANGE_STATE_HPP
-
-#include <type_traits>
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename NewState >
-      struct change_state
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static auto match( Input& in, States&&... st )
-            -> typename std::enable_if< ( A == apply_mode::action ), bool >::type
-         {
-            NewState s( static_cast< const Input& >( in ), st... );
-            if( TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, s ) ) {
-               Action< Rule >::success( static_cast< const Input& >( in ), s, st... );
-               return true;
-            }
-            return false;
-         }
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States,
-                   int = 1 >
-         static auto match( Input& in, States&&... st )
-            -> typename std::enable_if< ( A == apply_mode::nothing ), bool >::type
-         {
-            NewState s( static_cast< const Input& >( in ), st... );
-            return TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, s );
-         }
-
-         template< typename Input,
-                   typename... States >
-         static void success( const Input& in, NewState& s, States&&... st ) noexcept( noexcept( s.success( in, st... ) ) )
-         {
-            s.success( in, st... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 39 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/change_states.hpp"
-       
-#line 1 "tao/pegtl/change_states.hpp"
-
-
-
-#ifndef TAO_PEGTL_CHANGE_STATES_HPP
-#define TAO_PEGTL_CHANGE_STATES_HPP
-
-#include <tuple>
-#line 17 "tao/pegtl/change_states.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename... NewStates >
-      struct change_states
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   std::size_t... Ns,
-                   typename Input,
-                   typename... States >
-         static bool match( TAO_PEGTL_NAMESPACE::internal::index_sequence< Ns... >, Input& in, States&&... st )
-         {
-            auto t = std::tie( st... );
-            if( TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, std::get< Ns >( t )... ) ) {
-               Action< Rule >::success( static_cast< const Input& >( in ), st... );
-               return true;
-            }
-            return false;
-         }
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static auto match( Input& in, States&&... st )
-            -> typename std::enable_if< ( A == apply_mode::action ), bool >::type
-         {
-            return match< Rule, A, M, Action, Control >( TAO_PEGTL_NAMESPACE::internal::index_sequence_for< NewStates... >(), in, NewStates()..., st... );
-         }
-
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States,
-                   int = 1 >
-         static auto match( Input& in, States&&... /*unused*/ )
-            -> typename std::enable_if< ( A == apply_mode::nothing ), bool >::type
-         {
-            return TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, NewStates()... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 40 "tao/pegtl.hpp"
-
-#line 1 "tao/pegtl/disable_action.hpp"
-       
-#line 1 "tao/pegtl/disable_action.hpp"
-
-
-
-#ifndef TAO_PEGTL_DISABLE_ACTION_HPP
-#define TAO_PEGTL_DISABLE_ACTION_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct disable_action
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static bool match( Input& in, States&&... st )
-         {
-            return TAO_PEGTL_NAMESPACE::match< Rule, apply_mode::nothing, M, Action, Control >( in, st... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 42 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/enable_action.hpp"
-       
-#line 1 "tao/pegtl/enable_action.hpp"
-
-
-
-#ifndef TAO_PEGTL_ENABLE_ACTION_HPP
-#define TAO_PEGTL_ENABLE_ACTION_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct enable_action
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static bool match( Input& in, States&&... st )
-         {
-            return TAO_PEGTL_NAMESPACE::match< Rule, apply_mode::action, M, Action, Control >( in, st... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 43 "tao/pegtl.hpp"
-
-#line 1 "tao/pegtl/discard_input.hpp"
-       
-#line 1 "tao/pegtl/discard_input.hpp"
-
-
-
-#ifndef TAO_PEGTL_DISCARD_INPUT_HPP
-#define TAO_PEGTL_DISCARD_INPUT_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct discard_input
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static bool match( Input& in, States&&... st )
-         {
-            const bool result = TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
-            in.discard();
-            return result;
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 45 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/discard_input_on_failure.hpp"
-       
-#line 1 "tao/pegtl/discard_input_on_failure.hpp"
-
-
-
-#ifndef TAO_PEGTL_DISCARD_INPUT_ON_FAILURE_HPP
-#define TAO_PEGTL_DISCARD_INPUT_ON_FAILURE_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct discard_input_on_failure
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static bool match( Input& in, States&&... st )
-         {
-            const bool result = TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
-            if( !result ) {
-               in.discard();
-            }
-            return result;
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 46 "tao/pegtl.hpp"
-#line 1 "tao/pegtl/discard_input_on_success.hpp"
-       
-#line 1 "tao/pegtl/discard_input_on_success.hpp"
-
-
-
-#ifndef TAO_PEGTL_DISCARD_INPUT_ON_SUCCESS_HPP
-#define TAO_PEGTL_DISCARD_INPUT_ON_SUCCESS_HPP
-
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct discard_input_on_success
-         : maybe_nothing
-      {
-         template< typename Rule,
-                   apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static bool match( Input& in, States&&... st )
-         {
-            const bool result = TAO_PEGTL_NAMESPACE::match< Rule, A, M, Action, Control >( in, st... );
-            if( result ) {
-               in.discard();
-            }
-            return result;
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 47 "tao/pegtl.hpp"
-
-// The following are not included by
-// default because they include <iostream>.
-
-// #include "pegtl/analyze.hpp"
-
-#endif
-#line 2 "amalgamated.hpp"
-#line 1 "tao/pegtl/analyze.hpp"
-       
-#line 1 "tao/pegtl/analyze.hpp"
-
-
-
-#ifndef TAO_PEGTL_ANALYZE_HPP
-#define TAO_PEGTL_ANALYZE_HPP
-
-
-
-#line 1 "tao/pegtl/analysis/analyze_cycles.hpp"
-       
-#line 1 "tao/pegtl/analysis/analyze_cycles.hpp"
-
-
-
-#ifndef TAO_PEGTL_ANALYSIS_ANALYZE_CYCLES_HPP
-#define TAO_PEGTL_ANALYSIS_ANALYZE_CYCLES_HPP
-
-#include <cassert>
-
-#include <map>
-#include <set>
-#include <stdexcept>
-
-#include <iostream>
-#include <utility>
-
-
-
-
-#line 1 "tao/pegtl/analysis/insert_guard.hpp"
-       
-#line 1 "tao/pegtl/analysis/insert_guard.hpp"
-
-
-
-#ifndef TAO_PEGTL_ANALYSIS_INSERT_GUARD_HPP
-#define TAO_PEGTL_ANALYSIS_INSERT_GUARD_HPP
-
-#include <utility>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace analysis
-      {
-         template< typename C >
-         class insert_guard
-         {
-         public:
-            insert_guard( C& container, const typename C::value_type& value )
-               : m_i( container.insert( value ) ),
-                 m_c( &container )
-            {
-            }
-
-            insert_guard( const insert_guard& ) = delete;
-
-            insert_guard( insert_guard&& other ) noexcept
-               : m_i( other.m_i ),
-                 m_c( other.m_c )
-            {
-               other.m_c = nullptr;
-            }
-
-            ~insert_guard()
-            {
-               if( m_c && m_i.second ) {
-                  m_c->erase( m_i.first );
-               }
-            }
-
-            void operator=( const insert_guard& ) = delete;
-            void operator=( insert_guard&& ) = delete;
-
-            explicit operator bool() const noexcept
-            {
-               return m_i.second;
-            }
-
-         private:
-            const std::pair< typename C::iterator, bool > m_i;
-            C* m_c;
-         };
-
-         template< typename C >
-         insert_guard< C > make_insert_guard( C& container, const typename C::value_type& value )
-         {
-            return insert_guard< C >( container, value );
-         }
-
-      } // namespace analysis
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 20 "tao/pegtl/analysis/analyze_cycles.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace analysis
-      {
-         class analyze_cycles_impl
-         {
-         protected:
-            explicit analyze_cycles_impl( const bool verbose ) noexcept
-               : m_verbose( verbose ),
-                 m_problems( 0 )
-            {
-            }
-
-            const bool m_verbose;
-            unsigned m_problems;
-            grammar_info m_info;
-            std::set< std::string > m_stack;
-            std::map< std::string, bool > m_cache;
-            std::map< std::string, bool > m_results;
-
-            std::map< std::string, rule_info >::const_iterator find( const std::string& name ) const noexcept
-            {
-               const auto iter = m_info.map.find( name );
-               assert( iter != m_info.map.end() );
-               return iter;
-            }
-
-            bool work( const std::map< std::string, rule_info >::const_iterator& start, const bool accum )
-            {
-               const auto j = m_cache.find( start->first );
-
-               if( j != m_cache.end() ) {
-                  return j->second;
-               }
-               if( const auto g = make_insert_guard( m_stack, start->first ) ) {
-                  switch( start->second.type ) {
-                     case rule_type::any: {
-                        bool a = false;
-                        for( const auto& r : start->second.rules ) {
-                           a = a || work( find( r ), accum || a );
-                        }
-                        return m_cache[ start->first ] = true;
-                     }
-                     case rule_type::opt: {
-                        bool a = false;
-                        for( const auto& r : start->second.rules ) {
-                           a = a || work( find( r ), accum || a );
-                        }
-                        return m_cache[ start->first ] = false;
-                     }
-                     case rule_type::seq: {
-                        bool a = false;
-                        for( const auto& r : start->second.rules ) {
-                           a = a || work( find( r ), accum || a );
-                        }
-                        return m_cache[ start->first ] = a;
-                     }
-                     case rule_type::sor: {
-                        bool a = true;
-                        for( const auto& r : start->second.rules ) {
-                           a = a && work( find( r ), accum );
-                        }
-                        return m_cache[ start->first ] = a;
-                     }
-                  }
-                  throw std::logic_error( "code should be unreachable: invalid rule_type value" ); // NOLINT, LCOV_EXCL_LINE
-               }
-               if( !accum ) {
-                  ++m_problems;
-                  if( m_verbose ) {
-                     std::cout << "problem: cycle without progress detected at rule class " << start->first << std::endl; // LCOV_EXCL_LINE
-                  }
-               }
-               return m_cache[ start->first ] = accum;
-            }
-         };
-
-         template< typename Grammar >
-         class analyze_cycles
-            : private analyze_cycles_impl
-         {
-         public:
-            explicit analyze_cycles( const bool verbose )
-               : analyze_cycles_impl( verbose )
-            {
-               Grammar::analyze_t::template insert< Grammar >( m_info );
-            }
-
-            std::size_t problems()
-            {
-               for( auto i = m_info.map.begin(); i != m_info.map.end(); ++i ) {
-                  m_results[ i->first ] = work( i, false );
-                  m_cache.clear();
-               }
-               return m_problems;
-            }
-
-            template< typename Rule >
-            bool consumes() const noexcept
-            {
-               const auto i = m_results.find( internal::demangle< Rule >() );
-               assert( i != m_results.end() );
-               return i->second;
-            }
-         };
-
-      } // namespace analysis
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "tao/pegtl/analyze.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      template< typename Rule >
-      std::size_t analyze( const bool verbose = true )
-      {
-         return analysis::analyze_cycles< Rule >( verbose ).problems();
-      }
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 3 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/abnf.hpp"
-       
-#line 1 "tao/pegtl/contrib/abnf.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_ABNF_HPP
-#define TAO_PEGTL_CONTRIB_ABNF_HPP
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace abnf
-      {
-         // Core ABNF rules according to RFC 5234, Appendix B
-
-         // clang-format off
-         struct ALPHA : internal::ranges< internal::peek_char, 'a', 'z', 'A', 'Z' > {};
-         struct BIT : internal::one< internal::result_on_found::success, internal::peek_char, '0', '1' > {};
-         struct CHAR : internal::range< internal::result_on_found::success, internal::peek_char, char( 1 ), char( 127 ) > {};
-         struct CR : internal::one< internal::result_on_found::success, internal::peek_char, '\r' > {};
-         struct CRLF : internal::string< '\r', '\n' > {};
-         struct CTL : internal::ranges< internal::peek_char, char( 0 ), char( 31 ), char( 127 ) > {};
-         struct DIGIT : internal::range< internal::result_on_found::success, internal::peek_char, '0', '9' > {};
-         struct DQUOTE : internal::one< internal::result_on_found::success, internal::peek_char, '"' > {};
-         struct HEXDIG : internal::ranges< internal::peek_char, '0', '9', 'a', 'f', 'A', 'F' > {};
-         struct HTAB : internal::one< internal::result_on_found::success, internal::peek_char, '\t' > {};
-         struct LF : internal::one< internal::result_on_found::success, internal::peek_char, '\n' > {};
-         struct LWSP : internal::star< internal::sor< internal::string< '\r', '\n' >, internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\t' > >, internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\t' > > {};
-         struct OCTET : internal::any< internal::peek_char > {};
-         struct SP : internal::one< internal::result_on_found::success, internal::peek_char, ' ' > {};
-         struct VCHAR : internal::range< internal::result_on_found::success, internal::peek_char, char( 33 ), char( 126 ) > {};
-         struct WSP : internal::one< internal::result_on_found::success, internal::peek_char, ' ', '\t' > {};
-         // clang-format on
-
-      } // namespace abnf
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 4 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/alphabet.hpp"
-       
-#line 1 "tao/pegtl/contrib/alphabet.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_ALPHABET_HPP
-#define TAO_PEGTL_CONTRIB_ALPHABET_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace alphabet
-      {
-         static const int a = 'a'; // NOLINT
-         static const int b = 'b'; // NOLINT
-         static const int c = 'c'; // NOLINT
-         static const int d = 'd'; // NOLINT
-         static const int e = 'e'; // NOLINT
-         static const int f = 'f'; // NOLINT
-         static const int g = 'g'; // NOLINT
-         static const int h = 'h'; // NOLINT
-         static const int i = 'i'; // NOLINT
-         static const int j = 'j'; // NOLINT
-         static const int k = 'k'; // NOLINT
-         static const int l = 'l'; // NOLINT
-         static const int m = 'm'; // NOLINT
-         static const int n = 'n'; // NOLINT
-         static const int o = 'o'; // NOLINT
-         static const int p = 'p'; // NOLINT
-         static const int q = 'q'; // NOLINT
-         static const int r = 'r'; // NOLINT
-         static const int s = 's'; // NOLINT
-         static const int t = 't'; // NOLINT
-         static const int u = 'u'; // NOLINT
-         static const int v = 'v'; // NOLINT
-         static const int w = 'w'; // NOLINT
-         static const int x = 'x'; // NOLINT
-         static const int y = 'y'; // NOLINT
-         static const int z = 'z'; // NOLINT
-
-         static const int A = 'A'; // NOLINT
-         static const int B = 'B'; // NOLINT
-         static const int C = 'C'; // NOLINT
-         static const int D = 'D'; // NOLINT
-         static const int E = 'E'; // NOLINT
-         static const int F = 'F'; // NOLINT
-         static const int G = 'G'; // NOLINT
-         static const int H = 'H'; // NOLINT
-         static const int I = 'I'; // NOLINT
-         static const int J = 'J'; // NOLINT
-         static const int K = 'K'; // NOLINT
-         static const int L = 'L'; // NOLINT
-         static const int M = 'M'; // NOLINT
-         static const int N = 'N'; // NOLINT
-         static const int O = 'O'; // NOLINT
-         static const int P = 'P'; // NOLINT
-         static const int Q = 'Q'; // NOLINT
-         static const int R = 'R'; // NOLINT
-         static const int S = 'S'; // NOLINT
-         static const int T = 'T'; // NOLINT
-         static const int U = 'U'; // NOLINT
-         static const int V = 'V'; // NOLINT
-         static const int W = 'W'; // NOLINT
-         static const int X = 'X'; // NOLINT
-         static const int Y = 'Y'; // NOLINT
-         static const int Z = 'Z'; // NOLINT
-
-      } // namespace alphabet
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 5 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/counter.hpp"
-       
-#line 1 "tao/pegtl/contrib/counter.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_COUNTER_HPP
-#define TAO_PEGTL_CONTRIB_COUNTER_HPP
-
-#include <map>
-#include <string>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      struct counter_data
-      {
-         unsigned start = 0;
-         unsigned success = 0;
-         unsigned failure = 0;
-      };
-
-      struct counter_state
-      {
-         std::map< std::string, counter_data > counts;
-      };
-
-      template< typename Rule >
-      struct counter
-         : normal< Rule >
-      {
-         template< typename Input >
-         static void start( const Input& /*unused*/, counter_state& ts )
-         {
-            ++ts.counts[ internal::demangle< Rule >() ].start;
-         }
-
-         template< typename Input >
-         static void success( const Input& /*unused*/, counter_state& ts )
-         {
-            ++ts.counts[ internal::demangle< Rule >() ].success;
-         }
-
-         template< typename Input >
-         static void failure( const Input& /*unused*/, counter_state& ts )
-         {
-            ++ts.counts[ internal::demangle< Rule >() ].failure;
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 6 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/http.hpp"
-       
-#line 1 "tao/pegtl/contrib/http.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_HTTP_HPP
-#define TAO_PEGTL_CONTRIB_HTTP_HPP
-#line 14 "tao/pegtl/contrib/http.hpp"
-#line 1 "tao/pegtl/contrib/remove_first_state.hpp"
-       
-#line 1 "tao/pegtl/contrib/remove_first_state.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_REMOVE_FIRST_STATE_HPP
-#define TAO_PEGTL_CONTRIB_REMOVE_FIRST_STATE_HPP
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      // Applies to start(), success(), failure(), raise(), apply(), and apply0():
-      // The first state is removed when the call is forwarded to Base.
-      template< typename Base >
-      struct remove_first_state
-         : Base
-      {
-         template< typename Input, typename State, typename... States >
-         static void start( const Input& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::start( in, st... ) ) )
-         {
-            Base::start( in, st... );
-         }
-
-         template< typename Input, typename State, typename... States >
-         static void success( const Input& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::success( in, st... ) ) )
-         {
-            Base::success( in, st... );
-         }
-
-         template< typename Input, typename State, typename... States >
-         static void failure( const Input& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::failure( in, st... ) ) )
-         {
-            Base::failure( in, st... );
-         }
-
-         template< typename Input, typename State, typename... States >
-         static void raise( const Input& in, State&& /*unused*/, States&&... st )
-         {
-            Base::raise( in, st... );
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename State, typename... States >
-         static auto apply( const Iterator& begin, const Input& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::template apply< Action >( begin, in, st... ) ) )
-            -> decltype( Base::template apply< Action >( begin, in, st... ) )
-         {
-            return Base::template apply< Action >( begin, in, st... );
-         }
-
-         template< template< typename... > class Action, typename Input, typename State, typename... States >
-         static auto apply0( const Input& in, State&& /*unused*/, States&&... st ) noexcept( noexcept( Base::template apply0< Action >( in, st... ) ) )
-            -> decltype( Base::template apply0< Action >( in, st... ) )
-         {
-            return Base::template apply0< Action >( in, st... );
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 15 "tao/pegtl/contrib/http.hpp"
-#line 1 "tao/pegtl/contrib/uri.hpp"
-       
-#line 1 "tao/pegtl/contrib/uri.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_URI_HPP
-#define TAO_PEGTL_CONTRIB_URI_HPP
-#line 14 "tao/pegtl/contrib/uri.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace uri
-      {
-         // URI grammar according to RFC 3986.
-
-         // This grammar is a direct PEG translation of the original URI grammar.
-         // It should be considered experimental -- in case of any issues, in particular
-         // missing rules for attached actions, please contact the developers.
-
-         // Note that this grammar has multiple top-level rules.
-
-         using dot = one< '.' >;
-         using colon = one< ':' >;
-
-         // clang-format off
-         struct dec_octet : sor< one< '0' >,
-                                 rep_min_max< 1, 2, abnf::DIGIT >,
-                                 seq< one< '1' >, abnf::DIGIT, abnf::DIGIT >,
-                                 seq< one< '2' >, range< '0', '4' >, abnf::DIGIT >,
-                                 seq< string< '2', '5' >, range< '0', '5' > > > {};
-
-         struct IPv4address : seq< dec_octet, dot, dec_octet, dot, dec_octet, dot, dec_octet > {};
-
-         struct h16 : rep_min_max< 1, 4, abnf::HEXDIG > {};
-         struct ls32 : sor< seq< h16, colon, h16 >, IPv4address > {};
-
-         struct dcolon : two< ':' > {};
-
-         struct IPv6address : sor< seq< rep< 6, h16, colon >, ls32 >,
-                                   seq< dcolon, rep< 5, h16, colon >, ls32 >,
-                                   seq< opt< h16 >, dcolon, rep< 4, h16, colon >, ls32 >,
-                                   seq< opt< h16, opt< colon, h16 > >, dcolon, rep< 3, h16, colon >, ls32 >,
-                                   seq< opt< h16, rep_opt< 2, colon, h16 > >, dcolon, rep< 2, h16, colon >, ls32 >,
-                                   seq< opt< h16, rep_opt< 3, colon, h16 > >, dcolon, h16, colon, ls32 >,
-                                   seq< opt< h16, rep_opt< 4, colon, h16 > >, dcolon, ls32 >,
-                                   seq< opt< h16, rep_opt< 5, colon, h16 > >, dcolon, h16 >,
-                                   seq< opt< h16, rep_opt< 6, colon, h16 > >, dcolon > > {};
-
-         struct gen_delims : one< ':', '/', '?', '#', '[', ']', '@' > {};
-         struct sub_delims : one< '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=' > {};
-
-         struct unreserved : sor< abnf::ALPHA, abnf::DIGIT, one< '-', '.', '_', '~' > > {};
-         struct reserved : sor< gen_delims, sub_delims > {};
-
-         struct IPvFuture : if_must< one< 'v' >, plus< abnf::HEXDIG >, dot, plus< sor< unreserved, sub_delims, colon > > > {};
-
-         struct IP_literal : if_must< one< '[' >, sor< IPvFuture, IPv6address >, one< ']' > > {};
-
-         struct pct_encoded : if_must< one< '%' >, abnf::HEXDIG, abnf::HEXDIG > {};
-         struct pchar : sor< unreserved, pct_encoded, sub_delims, one< ':', '@' > > {};
-
-         struct query : star< sor< pchar, one< '/', '?' > > > {};
-         struct fragment : star< sor< pchar, one< '/', '?' > > > {};
-
-         struct segment : star< pchar > {};
-         struct segment_nz : plus< pchar > {};
-         struct segment_nz_nc : plus< sor< unreserved, pct_encoded, sub_delims, one< '@' > > > {}; // non-zero-length segment without any colon ":"
-
-         struct path_abempty : star< one< '/' >, segment > {};
-         struct path_absolute : seq< one< '/' >, opt< segment_nz, star< one< '/' >, segment > > > {};
-         struct path_noscheme : seq< segment_nz_nc, star< one< '/' >, segment > > {};
-         struct path_rootless : seq< segment_nz, star< one< '/' >, segment > > {};
-         struct path_empty : success {};
-
-         struct path : sor< path_noscheme, // begins with a non-colon segment
-                            path_rootless, // begins with a segment
-                            path_absolute, // begins with "/" but not "//"
-                            path_abempty > {}; // begins with "/" or is empty
-
-         struct reg_name : star< sor< unreserved, pct_encoded, sub_delims > > {};
-
-         struct port : star< abnf::DIGIT > {};
-         struct host : sor< IP_literal, IPv4address, reg_name > {};
-         struct userinfo : star< sor< unreserved, pct_encoded, sub_delims, colon > > {};
-         struct opt_userinfo : opt< userinfo, one< '@' > > {};
-         struct authority : seq< opt_userinfo, host, opt< colon, port > > {};
-
-         struct scheme : seq< abnf::ALPHA, star< sor< abnf::ALPHA, abnf::DIGIT, one< '+', '-', '.' > > > > {};
-
-         using dslash = two< '/' >;
-         using opt_query = opt_must< one< '?' >, query >;
-         using opt_fragment = opt_must< one< '#' >, fragment >;
-
-         struct hier_part : sor< if_must< dslash, authority, path_abempty >, path_rootless, path_absolute, path_empty > {};
-         struct relative_part : sor< if_must< dslash, authority, path_abempty >, path_noscheme, path_absolute, path_empty > {};
-         struct relative_ref : seq< relative_part, opt_query, opt_fragment > {};
-
-         struct URI : seq< scheme, one< ':' >, hier_part, opt_query, opt_fragment > {};
-         struct URI_reference : sor< URI, relative_ref > {};
-         struct absolute_URI : seq< scheme, one< ':' >, hier_part, opt_query > {};
-         // clang-format on
-
-      } // namespace uri
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 16 "tao/pegtl/contrib/http.hpp"
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace http
-      {
-         // HTTP 1.1 grammar according to RFC 7230.
-
-         // This grammar is a direct PEG translation of the original HTTP grammar.
-         // It should be considered experimental -- in case of any issues, in particular
-         // missing rules for attached actions, please contact the developers.
-
-         using OWS = star< abnf::WSP >; // optional whitespace
-         using RWS = plus< abnf::WSP >; // required whitespace
-         using BWS = OWS; // "bad" whitespace
-
-         using obs_text = not_range< 0x00, 0x7F >;
-         using obs_fold = seq< abnf::CRLF, plus< abnf::WSP > >;
-
-         // clang-format off
-         struct tchar : sor< abnf::ALPHA, abnf::DIGIT, one< '!', '#', '$', '%', '&', '\'', '*', '+', '-', '.', '^', '_', '`', '|', '~' > > {};
-         struct token : plus< tchar > {};
-
-         struct field_name : token {};
-
-         struct field_vchar : sor< abnf::VCHAR, obs_text > {};
-         struct field_content : list< field_vchar, plus< abnf::WSP > > {};
-         struct field_value : star< sor< field_content, obs_fold > > {};
-
-         struct header_field : seq< field_name, one< ':' >, OWS, field_value, OWS > {};
-
-         struct method : token {};
-
-         struct absolute_path : plus< one< '/' >, uri::segment > {};
-
-         struct origin_form : seq< absolute_path, uri::opt_query > {};
-         struct absolute_form : uri::absolute_URI {};
-         struct authority_form : uri::authority {};
-         struct asterisk_form : one< '*' > {};
-
-         struct request_target : sor< origin_form, absolute_form, authority_form, asterisk_form > {};
-
-         struct status_code : rep< 3, abnf::DIGIT > {};
-         struct reason_phrase : star< sor< abnf::VCHAR, obs_text, abnf::WSP > > {};
-
-         struct HTTP_version : if_must< string< 'H', 'T', 'T', 'P', '/' >, abnf::DIGIT, one< '.' >, abnf::DIGIT > {};
-
-         struct request_line : if_must< method, abnf::SP, request_target, abnf::SP, HTTP_version, abnf::CRLF > {};
-         struct status_line : if_must< HTTP_version, abnf::SP, status_code, abnf::SP, reason_phrase, abnf::CRLF > {};
-         struct start_line : sor< status_line, request_line > {};
-
-         struct message_body : star< abnf::OCTET > {};
-         struct HTTP_message : seq< start_line, star< header_field, abnf::CRLF >, abnf::CRLF, opt< message_body > > {};
-
-         struct Content_Length : plus< abnf::DIGIT > {};
-
-         struct uri_host : uri::host {};
-         struct port : uri::port {};
-
-         struct Host : seq< uri_host, opt< one< ':' >, port > > {};
-
-         // PEG are different from CFGs! (this replaces ctext and qdtext)
-         using text = sor< abnf::HTAB, range< 0x20, 0x7E >, obs_text >;
-
-         struct quoted_pair : if_must< one< '\\' >, sor< abnf::VCHAR, obs_text, abnf::WSP > > {};
-         struct quoted_string : if_must< abnf::DQUOTE, until< abnf::DQUOTE, sor< quoted_pair, text > > > {};
-
-         struct transfer_parameter : seq< token, BWS, one< '=' >, BWS, sor< token, quoted_string > > {};
-         struct transfer_extension : seq< token, star< OWS, one< ';' >, OWS, transfer_parameter > > {};
-         struct transfer_coding : sor< istring< 'c', 'h', 'u', 'n', 'k', 'e', 'd' >,
-                                       istring< 'c', 'o', 'm', 'p', 'r', 'e', 's', 's' >,
-                                       istring< 'd', 'e', 'f', 'l', 'a', 't', 'e' >,
-                                       istring< 'g', 'z', 'i', 'p' >,
-                                       transfer_extension > {};
-
-         struct rank : sor< seq< one< '0' >, opt< one< '.' >, rep_opt< 3, abnf::DIGIT > > >,
-                            seq< one< '1' >, opt< one< '.' >, rep_opt< 3, one< '0' > > > > > {};
-
-         struct t_ranking : seq< OWS, one< ';' >, OWS, one< 'q', 'Q' >, one< '=' >, rank > {};
-         struct t_codings : sor< istring< 't', 'r', 'a', 'i', 'l', 'e', 'r', 's' >, seq< transfer_coding, opt< t_ranking > > > {};
-
-         struct TE : opt< sor< one< ',' >, t_codings >, star< OWS, one< ',' >, opt< OWS, t_codings > > > {};
-
-         template< typename T >
-         using make_comma_list = seq< star< one< ',' >, OWS >, T, star< OWS, one< ',' >, opt< OWS, T > > >;
-
-         struct connection_option : token {};
-         struct Connection : make_comma_list< connection_option > {};
-
-         struct Trailer : make_comma_list< field_name > {};
-
-         struct Transfer_Encoding : make_comma_list< transfer_coding > {};
-
-         struct protocol_name : token {};
-         struct protocol_version : token {};
-         struct protocol : seq< protocol_name, opt< one< '/' >, protocol_version > > {};
-         struct Upgrade : make_comma_list< protocol > {};
-
-         struct pseudonym : token {};
-
-         struct received_protocol : seq< opt< protocol_name, one< '/' > >, protocol_version > {};
-         struct received_by : sor< seq< uri_host, opt< one< ':' >, port > >, pseudonym > {};
-
-         struct comment : if_must< one< '(' >, until< one< ')' >, sor< comment, quoted_pair, text > > > {};
-
-         struct Via : make_comma_list< seq< received_protocol, RWS, received_by, opt< RWS, comment > > > {};
-
-         struct http_URI : if_must< istring< 'h', 't', 't', 'p', ':', '/', '/' >, uri::authority, uri::path_abempty, uri::opt_query, uri::opt_fragment > {};
-         struct https_URI : if_must< istring< 'h', 't', 't', 'p', 's', ':', '/', '/' >, uri::authority, uri::path_abempty, uri::opt_query, uri::opt_fragment > {};
-
-         struct partial_URI : seq< uri::relative_part, uri::opt_query > {};
-
-         // clang-format on
-         struct chunk_size
-         {
-            using analyze_t = plus< abnf::HEXDIG >::analyze_t;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, std::size_t& size, States&&... /*unused*/ )
-            {
-               size = 0;
-               std::size_t i = 0;
-               while( in.size( i + 1 ) >= i + 1 ) {
-                  const auto c = in.peek_char( i );
-                  if( ( '0' <= c ) && ( c <= '9' ) ) {
-                     size <<= 4;
-                     size |= std::size_t( c - '0' );
-                     ++i;
-                     continue;
-                  }
-                  if( ( 'a' <= c ) && ( c <= 'f' ) ) {
-                     size <<= 4;
-                     size |= std::size_t( c - 'a' + 10 );
-                     ++i;
-                     continue;
-                  }
-                  if( ( 'A' <= c ) && ( c <= 'F' ) ) {
-                     size <<= 4;
-                     size |= std::size_t( c - 'A' + 10 );
-                     ++i;
-                     continue;
-                  }
-                  break;
-               }
-               in.bump_in_this_line( i );
-               return i > 0;
-            }
-         };
-         // clang-format off
-
-         struct chunk_ext_name : token {};
-         struct chunk_ext_val : sor< quoted_string, token > {};
-         struct chunk_ext : star_must< one< ';' >, chunk_ext_name, if_must< one< '=' >, chunk_ext_val > > {};
-
-         // clang-format on
-         struct chunk_data
-         {
-            using analyze_t = star< abnf::OCTET >::analyze_t;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, const std::size_t size, States&&... /*unused*/ )
-            {
-               if( in.size( size ) >= size ) {
-                  in.bump( size );
-                  return true;
-               }
-               return false;
-            }
-         };
-
-         namespace internal
-         {
-            namespace chunk_helper
-            {
-               template< typename Base >
-               struct control;
-
-               template< template< typename... > class Control, typename Rule >
-               struct control< Control< Rule > >
-                  : Control< Rule >
-               {
-                  template< apply_mode A,
-                            rewind_mode M,
-                            template< typename... >
-                            class Action,
-                            template< typename... >
-                            class,
-                            typename Input,
-                            typename State,
-                            typename... States >
-                  static bool match( Input& in, State&& /*unused*/, States&&... st )
-                  {
-                     return Control< Rule >::template match< A, M, Action, Control >( in, st... );
-                  }
-               };
-
-               template< template< typename... > class Control >
-               struct control< Control< chunk_size > >
-                  : remove_first_state< Control< chunk_size > >
-               {};
-
-               template< template< typename... > class Control >
-               struct control< Control< chunk_data > >
-                  : remove_first_state< Control< chunk_data > >
-               {};
-
-               template< template< typename... > class Control >
-               struct bind
-               {
-                  template< typename Rule >
-                  using type = control< Control< Rule > >;
-               };
-
-            } // namespace chunk_helper
-
-         } // namespace internal
-
-         struct chunk
-         {
-            using impl = seq< chunk_size, chunk_ext, abnf::CRLF, chunk_data, abnf::CRLF >;
-            using analyze_t = impl::analyze_t;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, States&&... st )
-            {
-               std::size_t size{};
-               return impl::template match< A, M, Action, internal::chunk_helper::bind< Control >::template type >( in, size, st... );
-            }
-         };
-
-         // clang-format off
-         struct last_chunk : seq< plus< one< '0' > >, not_at< digit >, chunk_ext, abnf::CRLF > {};
-
-         struct trailer_part : star< header_field, abnf::CRLF > {};
-
-         struct chunked_body : seq< until< last_chunk, chunk >, trailer_part, abnf::CRLF > {};
-         // clang-format on
-
-      } // namespace http
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 7 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/if_then.hpp"
-       
-#line 1 "tao/pegtl/contrib/if_then.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_IF_THEN_HPP
-#define TAO_PEGTL_CONTRIB_IF_THEN_HPP
-
-#include <type_traits>
-#line 16 "tao/pegtl/contrib/if_then.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Cond, typename Then >
-         struct if_pair
-         {
-         };
-
-         template< typename... Pairs >
-         struct if_then;
-
-         template< typename Cond, typename Then, typename... Pairs >
-         struct if_then< if_pair< Cond, Then >, Pairs... >
-            : if_then_else< Cond, Then, if_then< Pairs... > >
-         {
-            template< typename ElseCond, typename... Thens >
-            using else_if_then = if_then< if_pair< Cond, Then >, Pairs..., if_pair< ElseCond, seq< Thens... > > >;
-
-            template< typename... Thens >
-            using else_then = if_then_else< Cond, Then, if_then< Pairs..., if_pair< trivial< true >, seq< Thens... > > > >;
-         };
-
-         template<>
-         struct if_then<>
-            : trivial< false >
-         {
-         };
-
-         template< typename... Pairs >
-         struct skip_control< if_then< Pairs... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-      template< typename Cond, typename... Thens >
-      using if_then = internal::if_then< internal::if_pair< Cond, internal::seq< Thens... > > >;
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 8 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/integer.hpp"
-       
-#line 1 "tao/pegtl/contrib/integer.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_INTEGER_HPP
-#define TAO_PEGTL_CONTRIB_INTEGER_HPP
-
-#include <limits>
-#include <type_traits>
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace integer
-      {
-         namespace internal
-         {
-            template< typename I, I Limit, typename Input >
-            I actual_convert( const Input& in, std::size_t index )
-            {
-               static constexpr I cutoff = Limit / 10;
-               static constexpr I cutlim = Limit % 10;
-
-               I out = in.peek_char( index ) - '0';
-               while( ++index < in.size() ) {
-                  const I c = in.peek_char( index ) - '0';
-                  if( ( out > cutoff ) || ( ( out == cutoff ) && ( c > cutlim ) ) ) {
-                     throw parse_error( "integer out of range", in );
-                  }
-                  out *= 10;
-                  out += c;
-               }
-               return out;
-            }
-
-            template< typename I, typename Input >
-            I convert_positive( const Input& in, std::size_t index )
-            {
-               static constexpr I limit = ( std::numeric_limits< I >::max )();
-               return actual_convert< I, limit >( in, index );
-            }
-
-            template< typename I, typename Input >
-            I convert_negative( const Input& in, std::size_t index )
-            {
-               using U = typename std::make_unsigned< I >::type;
-               static constexpr U limit = static_cast< U >( ( std::numeric_limits< I >::max )() ) + 1;
-               return static_cast< I >( ~actual_convert< U, limit >( in, index ) ) + 1;
-            }
-
-         } // namespace internal
-
-         struct unsigned_rule
-            : plus< digit >
-         {
-         };
-
-         struct unsigned_action
-         {
-            // Assumes that 'in' contains a non-empty sequence of ASCII digits.
-
-            template< typename Input, typename State, typename... States >
-            static void apply( const Input& in, State& st, States&&... /*unused*/ )
-            {
-               using T = typename std::decay< decltype( st.converted ) >::type;
-               static_assert( std::is_integral< T >::value, "need integral type" );
-               static_assert( std::is_unsigned< T >::value, "need unsigned type" );
-               st.converted = internal::convert_positive< T >( in, 0 );
-            }
-         };
-
-         struct signed_rule
-            : seq< opt< one< '+', '-' > >, plus< digit > >
-         {
-         };
-
-         struct signed_action
-         {
-            // Assumes that 'in' contains a non-empty sequence of ASCII digits,
-            // with optional leading sign; with sign, in.size() must be >= 2.
-
-            template< typename Input, typename State, typename... States >
-            static void apply( const Input& in, State& st, States&&... /*unused*/ )
-            {
-               using T = typename std::decay< decltype( st.converted ) >::type;
-               static_assert( std::is_integral< T >::value, "need integral type" );
-               static_assert( std::is_signed< T >::value, "need signed type" );
-               const auto c = in.peek_char();
-               if( c == '-' ) {
-                  st.converted = internal::convert_negative< T >( in, 1 );
-               }
-               else {
-                  st.converted = internal::convert_positive< T >( in, std::size_t( c == '+' ) );
-               }
-            }
-         };
-
-      } // namespace integer
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 9 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/json.hpp"
-       
-#line 1 "tao/pegtl/contrib/json.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_JSON_HPP
-#define TAO_PEGTL_CONTRIB_JSON_HPP
-#line 14 "tao/pegtl/contrib/json.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace json
-      {
-         // JSON grammar according to RFC 8259
-
-         // clang-format off
-         struct ws : one< ' ', '\t', '\n', '\r' > {};
-
-         template< typename R, typename P = ws >
-         struct padr : internal::seq< R, internal::star< P > > {};
-
-         struct begin_array : padr< one< '[' > > {};
-         struct begin_object : padr< one< '{' > > {};
-         struct end_array : one< ']' > {};
-         struct end_object : one< '}' > {};
-         struct name_separator : pad< one< ':' >, ws > {};
-         struct value_separator : padr< one< ',' > > {};
-
-         struct false_ : string< 'f', 'a', 'l', 's', 'e' > {}; // NOLINT
-         struct null : string< 'n', 'u', 'l', 'l' > {};
-         struct true_ : string< 't', 'r', 'u', 'e' > {}; // NOLINT
-
-         struct digits : plus< abnf::DIGIT > {};
-         struct exp : seq< one< 'e', 'E' >, opt< one< '-', '+'> >, must< digits > > {};
-         struct frac : if_must< one< '.' >, digits > {};
-         struct int_ : sor< one< '0' >, digits > {}; // NOLINT
-         struct number : seq< opt< one< '-' > >, int_, opt< frac >, opt< exp > > {};
-
-         struct xdigit : abnf::HEXDIG {};
-         struct unicode : list< seq< one< 'u' >, rep< 4, must< xdigit > > >, one< '\\' > > {};
-         struct escaped_char : one< '"', '\\', '/', 'b', 'f', 'n', 'r', 't' > {};
-         struct escaped : sor< escaped_char, unicode > {};
-         struct unescaped : utf8::range< 0x20, 0x10FFFF > {};
-         struct char_ : if_then_else< one< '\\' >, must< escaped >, unescaped > {}; // NOLINT
-
-         struct string_content : until< at< one< '"' > >, must< char_ > > {};
-         struct string : seq< one< '"' >, must< string_content >, any >
-         {
-            using content = string_content;
-         };
-
-         struct key_content : until< at< one< '"' > >, must< char_ > > {};
-         struct key : seq< one< '"' >, must< key_content >, any >
-         {
-            using content = key_content;
-         };
-
-         struct value;
-
-         struct array_element;
-         struct array_content : opt< list_must< array_element, value_separator > > {};
-         struct array : seq< begin_array, array_content, must< end_array > >
-         {
-            using begin = begin_array;
-            using end = end_array;
-            using element = array_element;
-            using content = array_content;
-         };
-
-         struct member : if_must< key, name_separator, value > {};
-         struct object_content : opt< list_must< member, value_separator > > {};
-         struct object : seq< begin_object, object_content, must< end_object > >
-         {
-            using begin = begin_object;
-            using end = end_object;
-            using element = member;
-            using content = object_content;
-         };
-
-         struct value : padr< sor< string, number, object, array, false_, true_, null > > {};
-         struct array_element : seq< value > {};
-
-         struct text : seq< star< ws >, value > {};
-         // clang-format on
-
-      } // namespace json
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 10 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/json_pointer.hpp"
-       
-#line 1 "tao/pegtl/contrib/json_pointer.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_JSON_POINTER_HPP
-#define TAO_PEGTL_CONTRIB_JSON_POINTER_HPP
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace json_pointer
-      {
-         // JSON pointer grammar according to RFC 6901
-
-         // clang-format off
-         struct unescaped : utf8::ranges< 0x0, 0x2E, 0x30, 0x7D, 0x7F, 0x10FFFF > {};
-         struct escaped : seq< one< '~' >, one< '0', '1' > > {};
-
-         struct reference_token : star< sor< unescaped, escaped > > {};
-         struct json_pointer : star< one< '/' >, reference_token > {};
-         // clang-format on
-
-         // relative JSON pointer, see ...
-
-         // clang-format off
-         struct non_negative_integer : sor< one< '0' >, plus< digit > > {};
-         struct relative_json_pointer : seq< non_negative_integer, sor< one< '#' >, json_pointer > > {};
-         // clang-format on
-
-      } // namespace json_pointer
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 11 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/parse_tree.hpp"
-       
-#line 1 "tao/pegtl/contrib/parse_tree.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_PARSE_TREE_HPP
-#define TAO_PEGTL_CONTRIB_PARSE_TREE_HPP
-
-#include <cassert>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <typeindex>
-#include <utility>
-#include <vector>
-
-
-#line 1 "tao/pegtl/contrib/shuffle_states.hpp"
-       
-#line 1 "tao/pegtl/contrib/shuffle_states.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_SHUFFLE_STATES_HPP
-#define TAO_PEGTL_CONTRIB_SHUFFLE_STATES_HPP
-
-#include <tuple>
-#include <utility>
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< std::size_t N >
-         struct rotate_left
-         {
-            template< std::size_t I, std::size_t S >
-            using type = std::integral_constant< std::size_t, ( I + N ) % S >;
-         };
-
-         template< std::size_t N >
-         struct rotate_right
-         {
-            template< std::size_t I, std::size_t S >
-            using type = std::integral_constant< std::size_t, ( I + S - N ) % S >;
-         };
-
-         struct reverse
-         {
-            template< std::size_t I, std::size_t S >
-            using type = std::integral_constant< std::size_t, ( S - 1 ) - I >;
-         };
-
-      } // namespace internal
-
-      // Applies 'Shuffle' to the states of start(), success(), failure(), raise(), apply(), and apply0()
-      template< typename Base, typename Shuffle >
-      struct shuffle_states
-         : Base
-      {
-         template< typename Input, typename Tuple, std::size_t... Is >
-         static void start_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::start( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... ) ) )
-         {
-            Base::start( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... );
-         }
-
-         template< typename Input, typename... States >
-         static void start( const Input& in, States&&... st ) noexcept( noexcept( start_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() ) ) )
-         {
-            start_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() );
-         }
-
-         template< typename Input, typename State >
-         static void start( const Input& in, State&& st ) noexcept( noexcept( Base::start( in, st ) ) )
-         {
-            Base::start( in, st );
-         }
-
-         template< typename Input, typename Tuple, std::size_t... Is >
-         static void success_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::success( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... ) ) )
-         {
-            Base::success( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... );
-         }
-
-         template< typename Input, typename... States >
-         static void success( const Input& in, States&&... st ) noexcept( noexcept( success_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() ) ) )
-         {
-            success_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() );
-         }
-
-         template< typename Input, typename State >
-         static void success( const Input& in, State&& st ) noexcept( noexcept( Base::success( in, st ) ) )
-         {
-            Base::success( in, st );
-         }
-
-         template< typename Input, typename Tuple, std::size_t... Is >
-         static void failure_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::failure( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... ) ) )
-         {
-            Base::failure( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... );
-         }
-
-         template< typename Input, typename... States >
-         static void failure( const Input& in, States&&... st ) noexcept( noexcept( failure_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() ) ) )
-         {
-            failure_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() );
-         }
-
-         template< typename Input, typename State >
-         static void failure( const Input& in, State&& st ) noexcept( noexcept( Base::failure( in, st ) ) )
-         {
-            Base::failure( in, st );
-         }
-
-         template< typename Input, typename Tuple, std::size_t... Is >
-         static void raise_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ )
-         {
-            Base::raise( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... );
-         }
-
-         template< typename Input, typename... States >
-         static void raise( const Input& in, States&&... st )
-         {
-            raise_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() );
-         }
-
-         template< typename Input, typename State >
-         static void raise( const Input& in, State&& st )
-         {
-            Base::raise( in, st );
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename Tuple, std::size_t... Is >
-         static auto apply_impl( const Iterator& begin, const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::template apply< Action >( begin, in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... ) ) )
-            -> decltype( Base::template apply< Action >( begin, in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... ) )
-         {
-            return Base::template apply< Action >( begin, in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... );
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename... States >
-         static auto apply( const Iterator& begin, const Input& in, States&&... st ) noexcept( noexcept( apply_impl< Action >( begin, in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() ) ) )
-            -> decltype( apply_impl< Action >( begin, in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() ) )
-         {
-            return apply_impl< Action >( begin, in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() );
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename State >
-         static auto apply( const Iterator& begin, const Input& in, State&& st ) noexcept( noexcept( Base::template apply< Action >( begin, in, st ) ) )
-            -> decltype( Base::template apply< Action >( begin, in, st ) )
-         {
-            return Base::template apply< Action >( begin, in, st );
-         }
-
-         template< template< typename... > class Action, typename Input, typename Tuple, std::size_t... Is >
-         static auto apply0_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::template apply0< Action >( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... ) ) )
-            -> decltype( Base::template apply0< Action >( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... ) )
-         {
-            return Base::template apply0< Action >( in, std::get< Shuffle::template type< Is, sizeof...( Is ) >::value >( t )... );
-         }
-
-         template< template< typename... > class Action, typename Input, typename... States >
-         static auto apply0( const Input& in, States&&... st ) noexcept( noexcept( apply0_impl< Action >( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() ) ) )
-            -> decltype( apply0_impl< Action >( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() ) )
-         {
-            return apply0_impl< Action >( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) >() );
-         }
-
-         template< template< typename... > class Action, typename Input, typename State >
-         static auto apply0( const Input& in, State&& st ) noexcept( noexcept( Base::template apply0< Action >( in, st ) ) )
-            -> decltype( Base::template apply0< Action >( in, st ) )
-         {
-            return Base::template apply0< Action >( in, st );
-         }
-      };
-
-      template< typename Base, std::size_t N = 1 >
-      using rotate_states_left = shuffle_states< Base, internal::rotate_left< N > >;
-
-      template< typename Base, std::size_t N = 1 >
-      using rotate_states_right = shuffle_states< Base, internal::rotate_right< N > >;
-
-      template< typename Base >
-      using reverse_states = shuffle_states< Base, internal::reverse >;
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 18 "tao/pegtl/contrib/parse_tree.hpp"
-#line 35 "tao/pegtl/contrib/parse_tree.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace parse_tree
-      {
-         template< typename T >
-         struct basic_node
-         {
-            using node_t = T;
-            using children_t = std::vector< std::unique_ptr< node_t > >;
-            children_t children;
-
-            std::type_index id = std::type_index( typeid( void ) );
-            std::string source;
-
-            TAO_PEGTL_NAMESPACE::internal::iterator m_begin;
-            TAO_PEGTL_NAMESPACE::internal::iterator m_end;
-
-            // each node will be default constructed
-            basic_node() = default;
-
-            // no copy/move is necessary
-            // (nodes are always owned/handled by a std::unique_ptr)
-            basic_node( const basic_node& ) = delete;
-            basic_node( basic_node&& ) = delete;
-
-            ~basic_node() = default;
-
-            // no assignment either
-            basic_node& operator=( const basic_node& ) = delete;
-            basic_node& operator=( basic_node&& ) = delete;
-
-            bool is_root() const noexcept
-            {
-               return id == typeid( void );
-            }
-
-            template< typename U >
-            bool is() const noexcept
-            {
-               return id == typeid( U );
-            }
-
-            std::string name() const
-            {
-               assert( !is_root() );
-               return TAO_PEGTL_NAMESPACE::internal::demangle( id.name() );
-            }
-
-            position begin() const
-            {
-               return position( m_begin, source );
-            }
-
-            position end() const
-            {
-               return position( m_end, source );
-            }
-
-            bool has_content() const noexcept
-            {
-               return m_end.data != nullptr;
-            }
-
-            std::string string() const
-            {
-               assert( has_content() );
-               return std::string( m_begin.data, m_end.data );
-            }
-
-            // Compatibility, remove with 3.0.0
-            std::string content() const
-            {
-               return string();
-            }
-
-            template< tracking_mode P = tracking_mode::eager, typename Eol = eol::lf_crlf >
-            memory_input< P, Eol > as_memory_input() const
-            {
-               assert( has_content() );
-               return { m_begin.data, m_end.data, source, m_begin.byte, m_begin.line, m_begin.byte_in_line };
-            }
-
-            template< typename... States >
-            void remove_content( States&&... /*unused*/ ) noexcept
-            {
-               m_end.reset();
-            }
-
-            // all non-root nodes are initialized by calling this method
-            template< typename Rule, typename Input, typename... States >
-            void start( const Input& in, States&&... /*unused*/ )
-            {
-               id = typeid( Rule );
-               source = in.source();
-               m_begin = TAO_PEGTL_NAMESPACE::internal::iterator( in.iterator() );
-            }
-
-            // if parsing of the rule succeeded, this method is called
-            template< typename Rule, typename Input, typename... States >
-            void success( const Input& in, States&&... /*unused*/ ) noexcept
-            {
-               m_end = TAO_PEGTL_NAMESPACE::internal::iterator( in.iterator() );
-            }
-
-            // if parsing of the rule failed, this method is called
-            template< typename Rule, typename Input, typename... States >
-            void failure( const Input& /*unused*/, States&&... /*unused*/ ) noexcept
-            {
-            }
-
-            // if parsing succeeded and the (optional) transform call
-            // did not discard the node, it is appended to its parent.
-            // note that "child" is the node whose Rule just succeeded
-            // and "*this" is the parent where the node should be appended.
-            template< typename... States >
-            void emplace_back( std::unique_ptr< node_t >&& child, States&&... /*unused*/ )
-            {
-               assert( child );
-               children.emplace_back( std::move( child ) );
-            }
-         };
-
-         struct node
-            : basic_node< node >
-         {
-         };
-
-         namespace internal
-         {
-            template< typename >
-            struct is_try_catch_type
-               : std::false_type
-            {
-            };
-
-            template< typename Exception, typename... Rules >
-            struct is_try_catch_type< TAO_PEGTL_NAMESPACE::internal::try_catch_type< Exception, Rules... > >
-               : std::true_type
-            {
-            };
-
-            template< typename Node >
-            struct state
-            {
-               std::vector< std::unique_ptr< Node > > stack;
-
-               state()
-               {
-                  emplace_back();
-               }
-
-               void emplace_back()
-               {
-                  stack.emplace_back( std::unique_ptr< Node >( new Node ) );
-               }
-
-               std::unique_ptr< Node >& back() noexcept
-               {
-                  assert( !stack.empty() );
-                  return stack.back();
-               }
-
-               void pop_back() noexcept
-               {
-                  assert( !stack.empty() );
-                  return stack.pop_back();
-               }
-            };
-
-            template< typename Selector, typename... Parameters >
-            void transform( Parameters&&... /*unused*/ ) noexcept
-            {
-            }
-
-            template< typename Selector, typename Input, typename Node, typename... States >
-            auto transform( const Input& in, std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( Selector::transform( in, n, st... ) ) )
-               -> decltype( Selector::transform( in, n, st... ), void() )
-            {
-               Selector::transform( in, n, st... );
-            }
-
-            template< typename Selector, typename Input, typename Node, typename... States >
-            auto transform( const Input& /*unused*/, std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( Selector::transform( n, st... ) ) )
-               -> decltype( Selector::transform( n, st... ), void() )
-            {
-               Selector::transform( n, st... );
-            }
-
-            template< typename Rule, template< typename... > class Selector >
-            struct is_selected_node
-               : std::integral_constant< bool, !TAO_PEGTL_NAMESPACE::internal::skip_control< Rule >::value && Selector< Rule >::value >
-            {
-            };
-
-            template< unsigned Level, typename Analyse, template< typename... > class Selector >
-            struct is_leaf
-               : std::false_type
-            {
-            };
-
-            template< analysis::rule_type Type, template< typename... > class Selector >
-            struct is_leaf< 0, analysis::generic< Type >, Selector >
-               : std::true_type
-            {
-            };
-
-            template< analysis::rule_type Type, std::size_t Count, template< typename... > class Selector >
-            struct is_leaf< 0, analysis::counted< Type, Count >, Selector >
-               : std::true_type
-            {
-            };
-
-            template< analysis::rule_type Type, typename... Rules, template< typename... > class Selector >
-            struct is_leaf< 0, analysis::generic< Type, Rules... >, Selector >
-               : std::false_type
-            {
-            };
-
-            template< analysis::rule_type Type, std::size_t Count, typename... Rules, template< typename... > class Selector >
-            struct is_leaf< 0, analysis::counted< Type, Count, Rules... >, Selector >
-               : std::false_type
-            {
-            };
-
-            template< bool... >
-            struct bool_sequence;
-
-            template< bool... Bs >
-            struct is_all
-               : std::is_same< bool_sequence< Bs..., true >, bool_sequence< true, Bs... > >
-            {
-            };
-
-            template< bool... Bs >
-            struct is_none
-               : std::integral_constant< bool, !is_all< !Bs... >::value >
-            {
-            };
-
-            template< unsigned Level, typename Rule, template< typename... > class Selector >
-            using is_unselected_leaf = std::integral_constant< bool, !is_selected_node< Rule, Selector >::value && is_leaf< Level, typename Rule::analyze_t, Selector >::value >;
-
-            template< unsigned Level, analysis::rule_type Type, typename... Rules, template< typename... > class Selector >
-            struct is_leaf< Level, analysis::generic< Type, Rules... >, Selector >
-               : is_all< is_unselected_leaf< Level - 1, Rules, Selector >::value... >
-            {
-            };
-
-            template< unsigned Level, analysis::rule_type Type, std::size_t Count, typename... Rules, template< typename... > class Selector >
-            struct is_leaf< Level, analysis::counted< Type, Count, Rules... >, Selector >
-               : is_all< is_unselected_leaf< Level - 1, Rules, Selector >::value... >
-            {
-            };
-
-            template< typename Node, template< typename... > class Selector, template< typename... > class Control >
-            struct make_control
-            {
-               template< typename Rule, bool, bool >
-               struct state_handler;
-
-               template< typename Rule >
-               using type = rotate_states_right< state_handler< Rule, is_selected_node< Rule, Selector >::value, is_leaf< 8, typename Rule::analyze_t, Selector >::value > >;
-            };
-
-            template< typename Node, template< typename... > class Selector, template< typename... > class Control >
-            template< typename Rule >
-            struct make_control< Node, Selector, Control >::state_handler< Rule, false, true >
-               : remove_first_state< Control< Rule > >
-            {
-            };
-
-            template< typename Node, template< typename... > class Selector, template< typename... > class Control >
-            template< typename Rule >
-            struct make_control< Node, Selector, Control >::state_handler< Rule, false, false >
-               : remove_first_state< Control< Rule > >
-            {
-               template< apply_mode A,
-                         rewind_mode M,
-                         template< typename... >
-                         class Action,
-                         template< typename... >
-                         class Control2,
-                         typename Input,
-                         typename... States >
-               static bool match( Input& in, States&&... st )
-               {
-                  auto& state = std::get< sizeof...( st ) - 1 >( std::tie( st... ) );
-                  if( is_try_catch_type< Rule >::value ) {
-                     internal::state< Node > tmp;
-                     tmp.emplace_back();
-                     tmp.stack.swap( state.stack );
-                     const bool result = Control< Rule >::template match< A, M, Action, Control2 >( in, st... );
-                     tmp.stack.swap( state.stack );
-                     if( result ) {
-                        for( auto& c : tmp.back()->children ) {
-                           state.back()->children.emplace_back( std::move( c ) );
-                        }
-                     }
-                     return result;
-                  }
-                  state.emplace_back();
-                  const bool result = Control< Rule >::template match< A, M, Action, Control2 >( in, st... );
-                  if( result ) {
-                     auto n = std::move( state.back() );
-                     state.pop_back();
-                     for( auto& c : n->children ) {
-                        state.back()->children.emplace_back( std::move( c ) );
-                     }
-                  }
-                  else {
-                     state.pop_back();
-                  }
-                  return result;
-               }
-            };
-
-            template< typename Node, template< typename... > class Selector, template< typename... > class Control >
-            template< typename Rule, bool B >
-            struct make_control< Node, Selector, Control >::state_handler< Rule, true, B >
-               : remove_first_state< Control< Rule > >
-            {
-               template< typename Input, typename... States >
-               static void start( const Input& in, state< Node >& state, States&&... st )
-               {
-                  Control< Rule >::start( in, st... );
-                  state.emplace_back();
-                  state.back()->template start< Rule >( in, st... );
-               }
-
-               template< typename Input, typename... States >
-               static void success( const Input& in, state< Node >& state, States&&... st )
-               {
-                  Control< Rule >::success( in, st... );
-                  auto n = std::move( state.back() );
-                  state.pop_back();
-                  n->template success< Rule >( in, st... );
-                  transform< Selector< Rule > >( in, n, st... );
-                  if( n ) {
-                     state.back()->emplace_back( std::move( n ), st... );
-                  }
-               }
-
-               template< typename Input, typename... States >
-               static void failure( const Input& in, state< Node >& state, States&&... st ) noexcept( noexcept( Control< Rule >::failure( in, st... ) ) && noexcept( std::declval< Node& >().template failure< Rule >( in, st... ) ) )
-               {
-                  Control< Rule >::failure( in, st... );
-                  state.back()->template failure< Rule >( in, st... );
-                  state.pop_back();
-               }
-            };
-
-            template< typename >
-            using store_all = std::true_type;
-
-            template< typename >
-            struct selector;
-
-            template<>
-            struct selector< std::tuple<> >
-            {
-               using type = std::false_type;
-            };
-
-            template< typename T >
-            struct selector< std::tuple< T > >
-            {
-               using type = typename T::type;
-            };
-
-            template< typename... Ts >
-            struct selector< std::tuple< Ts... > >
-            {
-               static_assert( sizeof...( Ts ) == 0, "multiple matches found" );
-            };
-
-            template< typename Rule, typename Collection >
-            using select_tuple = typename std::conditional< Collection::template contains< Rule >::value, std::tuple< Collection >, std::tuple<> >::type;
-
-         } // namespace internal
-
-         template< typename Rule, typename... Collections >
-         struct selector
-            : internal::selector< decltype( std::tuple_cat( std::declval< internal::select_tuple< Rule, Collections > >()... ) ) >::type
-         {};
-
-         template< typename Base >
-         struct apply
-            : std::true_type
-         {
-            template< typename... Rules >
-            struct on
-            {
-               using type = Base;
-
-               template< typename Rule >
-               using contains = internal::is_none< std::is_same< Rule, Rules >::value... >;
-            };
-         };
-
-         struct store_content
-            : apply< store_content >
-         {};
-
-         // some nodes don't need to store their content
-         struct remove_content
-            : apply< remove_content >
-         {
-            template< typename Node, typename... States >
-            static void transform( std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( n->Node::remove_content( st... ) ) )
-            {
-               n->remove_content( st... );
-            }
-         };
-
-         // if a node has only one child, replace the node with its child, otherwise remove content
-         struct fold_one
-            : apply< fold_one >
-         {
-            template< typename Node, typename... States >
-            static void transform( std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( n->children.size(), n->Node::remove_content( st... ) ) )
-            {
-               if( n->children.size() == 1 ) {
-                  n = std::move( n->children.front() );
-               }
-               else {
-                  n->remove_content( st... );
-               }
-            }
-         };
-
-         // if a node has no children, discard the node, otherwise remove content
-         struct discard_empty
-            : apply< discard_empty >
-         {
-            template< typename Node, typename... States >
-            static void transform( std::unique_ptr< Node >& n, States&&... st ) noexcept( noexcept( n->children.empty(), n->Node::remove_content( st... ) ) )
-            {
-               if( n->children.empty() ) {
-                  n.reset();
-               }
-               else {
-                  n->remove_content( st... );
-               }
-            }
-         };
-
-         template< typename Rule,
-                   typename Node,
-                   template< typename... > class Selector = internal::store_all,
-                   template< typename... > class Action = nothing,
-                   template< typename... > class Control = normal,
-                   typename Input,
-                   typename... States >
-         std::unique_ptr< Node > parse( Input&& in, States&&... st )
-         {
-            internal::state< Node > state;
-            if( !TAO_PEGTL_NAMESPACE::parse< Rule, Action, internal::make_control< Node, Selector, Control >::template type >( in, st..., state ) ) {
-               return nullptr;
-            }
-            assert( state.stack.size() == 1 );
-            return std::move( state.back() );
-         }
-
-         template< typename Rule,
-                   template< typename... > class Selector = internal::store_all,
-                   template< typename... > class Action = nothing,
-                   template< typename... > class Control = normal,
-                   typename Input,
-                   typename... States >
-         std::unique_ptr< node > parse( Input&& in, States&&... st )
-         {
-            return parse< Rule, node, Selector, Action, Control >( in, st... );
-         }
-
-      } // namespace parse_tree
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 12 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/parse_tree_to_dot.hpp"
-       
-#line 1 "tao/pegtl/contrib/parse_tree_to_dot.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_PARSE_TREE_TO_DOT_HPP
-#define TAO_PEGTL_CONTRIB_PARSE_TREE_TO_DOT_HPP
-
-#include <cassert>
-#include <ostream>
-#include <string>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace parse_tree
-      {
-         namespace internal
-         {
-            inline void escape( std::ostream& os, const char* p, const std::size_t s )
-            {
-               static const char* h = "0123456789abcdef";
-
-               const char* l = p;
-               const char* const e = p + s;
-               while( p != e ) {
-                  const unsigned char c = *p;
-                  if( c == '\\' ) {
-                     os.write( l, p - l );
-                     l = ++p;
-                     os << "\\\\";
-                  }
-                  else if( c == '"' ) {
-                     os.write( l, p - l );
-                     l = ++p;
-                     os << "\\\"";
-                  }
-                  else if( c < 32 ) {
-                     os.write( l, p - l );
-                     l = ++p;
-                     switch( c ) {
-                        case '\b':
-                           os << "\\b";
-                           break;
-                        case '\f':
-                           os << "\\f";
-                           break;
-                        case '\n':
-                           os << "\\n";
-                           break;
-                        case '\r':
-                           os << "\\r";
-                           break;
-                        case '\t':
-                           os << "\\t";
-                           break;
-                        default:
-                           os << "\\u00" << h[ ( c & 0xf0 ) >> 4 ] << h[ c & 0x0f ];
-                     }
-                  }
-                  else if( c == 127 ) {
-                     os.write( l, p - l );
-                     l = ++p;
-                     os << "\\u007f";
-                  }
-                  else {
-                     ++p;
-                  }
-               }
-               os.write( l, p - l );
-            }
-
-            inline void escape( std::ostream& os, const std::string& s )
-            {
-               escape( os, s.data(), s.size() );
-            }
-
-            template< typename Node >
-            void print_dot_node( std::ostream& os, const Node& n, const std::string& s )
-            {
-               os << "  x" << &n << " [ label=\"";
-               escape( os, s );
-               if( n.has_content() ) {
-                  os << "\\n";
-                  escape( os, n.m_begin.data, n.m_end.data - n.m_begin.data );
-               }
-               os << "\" ]\n";
-               if( !n.children.empty() ) {
-                  os << "  x" << &n << " -> { ";
-                  for( auto& up : n.children ) {
-                     os << "x" << up.get() << ( ( up == n.children.back() ) ? " }\n" : ", " );
-                  }
-                  for( auto& up : n.children ) {
-                     print_dot_node( os, *up, up->name() );
-                  }
-               }
-            }
-
-         } // namespace internal
-
-         template< typename Node >
-         void print_dot( std::ostream& os, const Node& n )
-         {
-            os << "digraph parse_tree\n{\n";
-            internal::print_dot_node( os, n, n.is_root() ? "ROOT" : n.name() );
-            os << "}\n";
-         }
-
-      } // namespace parse_tree
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 13 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/raw_string.hpp"
-       
-#line 1 "tao/pegtl/contrib/raw_string.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_RAW_STRING_HPP
-#define TAO_PEGTL_CONTRIB_RAW_STRING_HPP
-
-#include <cstddef>
-#include <type_traits>
-#line 25 "tao/pegtl/contrib/raw_string.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< char Open, char Marker >
-         struct raw_string_open
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::any >;
-
-            template< apply_mode A,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, std::size_t& marker_size, States&&... /*unused*/ ) noexcept( noexcept( in.size( 0 ) ) )
-            {
-               if( in.empty() || ( in.peek_char( 0 ) != Open ) ) {
-                  return false;
-               }
-               for( std::size_t i = 1; i < in.size( i + 1 ); ++i ) {
-                  switch( const auto c = in.peek_char( i ) ) {
-                     case Open:
-                        marker_size = i + 1;
-                        in.bump_in_this_line( marker_size );
-                        eol::match( in );
-                        return true;
-                     case Marker:
-                        break;
-                     default:
-                        return false;
-                  }
-               }
-               return false;
-            }
-         };
-
-         template< char Open, char Marker >
-         struct skip_control< raw_string_open< Open, Marker > > : std::true_type
-         {
-         };
-
-         template< char Marker, char Close >
-         struct at_raw_string_close
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::opt >;
-
-            template< apply_mode A,
-                      rewind_mode,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, const std::size_t& marker_size, States&&... /*unused*/ ) noexcept( noexcept( in.size( 0 ) ) )
-            {
-               if( in.size( marker_size ) < marker_size ) {
-                  return false;
-               }
-               if( in.peek_char( 0 ) != Close ) {
-                  return false;
-               }
-               if( in.peek_char( marker_size - 1 ) != Close ) {
-                  return false;
-               }
-               for( std::size_t i = 0; i < ( marker_size - 2 ); ++i ) {
-                  if( in.peek_char( i + 1 ) != Marker ) {
-                     return false;
-                  }
-               }
-               return true;
-            }
-         };
-
-         template< char Marker, char Close >
-         struct skip_control< at_raw_string_close< Marker, Close > > : std::true_type
-         {
-         };
-
-         template< typename Cond, typename... Rules >
-         struct raw_string_until;
-
-         template< typename Cond >
-         struct raw_string_until< Cond >
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, star< not_at< Cond >, not_at< eof >, bytes< 1 > >, Cond >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, const std::size_t& marker_size, States&&... st )
-            {
-               auto m = in.template mark< M >();
-
-               while( !Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, marker_size, st... ) ) {
-                  if( in.empty() ) {
-                     return false;
-                  }
-                  in.bump();
-               }
-               return m( true );
-            }
-         };
-
-         template< typename Cond, typename... Rules >
-         struct raw_string_until
-         {
-            using analyze_t = analysis::generic< analysis::rule_type::seq, star< not_at< Cond >, not_at< eof >, Rules... >, Cond >;
-
-            template< apply_mode A,
-                      rewind_mode M,
-                      template< typename... >
-                      class Action,
-                      template< typename... >
-                      class Control,
-                      typename Input,
-                      typename... States >
-            static bool match( Input& in, const std::size_t& marker_size, States&&... st )
-            {
-               auto m = in.template mark< M >();
-               using m_t = decltype( m );
-
-               while( !Control< Cond >::template match< A, rewind_mode::required, Action, Control >( in, marker_size, st... ) ) {
-                  if( in.empty() || ( !Control< seq< Rules... > >::template match< A, m_t::next_rewind_mode, Action, Control >( in, st... ) ) ) {
-                     return false;
-                  }
-               }
-               return m( true );
-            }
-         };
-
-         template< typename Cond, typename... Rules >
-         struct skip_control< raw_string_until< Cond, Rules... > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-      // raw_string matches Lua-style long literals.
-      //
-      // The following description was taken from the Lua documentation
-      // (see http://www.lua.org/docs.html):
-      //
-      // - An "opening long bracket of level n" is defined as an opening square
-      //   bracket followed by n equal signs followed by another opening square
-      //   bracket. So, an opening long bracket of level 0 is written as `[[`,
-      //   an opening long bracket of level 1 is written as `[=[`, and so on.
-      // - A "closing long bracket" is defined similarly; for instance, a closing
-      //   long bracket of level 4 is written as `]====]`.
-      // - A "long literal" starts with an opening long bracket of any level and
-      //   ends at the first closing long bracket of the same level. It can
-      //   contain any text except a closing bracket of the same level.
-      // - Literals in this bracketed form can run for several lines, do not
-      //   interpret any escape sequences, and ignore long brackets of any other
-      //   level.
-      // - For convenience, when the opening long bracket is immediately followed
-      //   by a newline, the newline is not included in the string.
-      //
-      // Note that unlike Lua's long literal, a raw_string is customizable to use
-      // other characters than `[`, `=` and `]` for matching. Also note that Lua
-      // introduced newline-specific replacements in Lua 5.2, which we do not
-      // support on the grammar level.
-
-      template< char Open, char Marker, char Close, typename... Contents >
-      struct raw_string
-      {
-         // This is used for binding the apply()-method and for error-reporting
-         // when a raw string is not closed properly or has invalid content.
-         struct content
-            : internal::raw_string_until< internal::at_raw_string_close< Marker, Close >, Contents... >
-         {
-         };
-
-         using analyze_t = typename internal::seq< internal::bytes< 1 >, content, internal::bytes< 1 > >::analyze_t;
-
-         template< apply_mode A,
-                   rewind_mode M,
-                   template< typename... >
-                   class Action,
-                   template< typename... >
-                   class Control,
-                   typename Input,
-                   typename... States >
-         static bool match( Input& in, States&&... st )
-         {
-            std::size_t marker_size;
-            if( internal::raw_string_open< Open, Marker >::template match< A, M, Action, Control >( in, marker_size, st... ) ) {
-               internal::must< content >::template match< A, M, Action, Control >( in, marker_size, st... );
-               in.bump_in_this_line( marker_size );
-               return true;
-            }
-            return false;
-         }
-      };
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 14 "amalgamated.hpp"
-
-#line 1 "tao/pegtl/contrib/remove_last_states.hpp"
-       
-#line 1 "tao/pegtl/contrib/remove_last_states.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_REMOVE_LAST_STATES_HPP
-#define TAO_PEGTL_CONTRIB_REMOVE_LAST_STATES_HPP
-
-#include <tuple>
-#include <utility>
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      // Remove the last N states of start(), success(), failure(), raise(), apply(), and apply0()
-      template< typename Base, std::size_t N >
-      struct remove_last_states
-         : Base
-      {
-         template< typename Input, typename Tuple, std::size_t... Is >
-         static void start_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::start( in, std::get< Is >( t )... ) ) )
-         {
-            Base::start( in, std::get< Is >( t )... );
-         }
-
-         template< typename Input, typename... States >
-         static void start( const Input& in, States&&... st ) noexcept( noexcept( start_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() ) ) )
-         {
-            start_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() );
-         }
-
-         template< typename Input, typename Tuple, std::size_t... Is >
-         static void success_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::success( in, std::get< Is >( t )... ) ) )
-         {
-            Base::success( in, std::get< Is >( t )... );
-         }
-
-         template< typename Input, typename... States >
-         static void success( const Input& in, States&&... st ) noexcept( noexcept( success_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() ) ) )
-         {
-            success_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() );
-         }
-
-         template< typename Input, typename Tuple, std::size_t... Is >
-         static void failure_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::failure( in, std::get< Is >( t )... ) ) )
-         {
-            Base::failure( in, std::get< Is >( t )... );
-         }
-
-         template< typename Input, typename... States >
-         static void failure( const Input& in, States&&... st ) noexcept( noexcept( failure_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() ) ) )
-         {
-            failure_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() );
-         }
-
-         template< typename Input, typename Tuple, std::size_t... Is >
-         static void raise_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ )
-         {
-            Base::raise( in, std::get< Is >( t )... );
-         }
-
-         template< typename Input, typename... States >
-         static void raise( const Input& in, States&&... st )
-         {
-            raise_impl( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() );
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename Tuple, std::size_t... Is >
-         static auto apply_impl( const Iterator& begin, const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::template apply< Action >( begin, in, std::get< Is >( t )... ) ) )
-            -> decltype( Base::template apply< Action >( begin, in, std::get< Is >( t )... ) )
-         {
-            return Base::template apply< Action >( begin, in, std::get< Is >( t )... );
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename... States >
-         static auto apply( const Iterator& begin, const Input& in, States&&... st ) noexcept( noexcept( apply_impl< Action >( begin, in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() ) ) )
-            -> decltype( apply_impl< Action >( begin, in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() ) )
-         {
-            return apply_impl< Action >( begin, in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() );
-         }
-
-         template< template< typename... > class Action, typename Input, typename Tuple, std::size_t... Is >
-         static auto apply0_impl( const Input& in, const Tuple& t, internal::index_sequence< Is... > /*unused*/ ) noexcept( noexcept( Base::template apply0< Action >( in, std::get< Is >( t )... ) ) )
-            -> decltype( Base::template apply0< Action >( in, std::get< Is >( t )... ) )
-         {
-            return Base::template apply0< Action >( in, std::get< Is >( t )... );
-         }
-
-         template< template< typename... > class Action, typename Input, typename... States >
-         static auto apply0( const Input& in, States&&... st ) noexcept( noexcept( apply0_impl< Action >( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() ) ) )
-            -> decltype( apply0_impl< Action >( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() ) )
-         {
-            return apply0_impl< Action >( in, std::tie( st... ), internal::make_index_sequence< sizeof...( st ) - N >() );
-         }
-      };
-
-      template< typename Base >
-      using remove_last_state = remove_last_states< Base, 1 >;
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 16 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/rep_one_min_max.hpp"
-       
-#line 1 "tao/pegtl/contrib/rep_one_min_max.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_REP_ONE_MIN_MAX_HPP
-#define TAO_PEGTL_CONTRIB_REP_ONE_MIN_MAX_HPP
-
-#include <algorithm>
-#line 16 "tao/pegtl/contrib/rep_one_min_max.hpp"
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< unsigned Min, unsigned Max, char C >
-         struct rep_one_min_max
-         {
-            using analyze_t = analysis::counted< analysis::rule_type::any, Min >;
-
-            static_assert( Min <= Max, "invalid rep_one_min_max rule (maximum number of repetitions smaller than minimum)" );
-
-            template< typename Input >
-            static bool match( Input& in )
-            {
-               const auto size = in.size( Max + 1 );
-               if( size < Min ) {
-                  return false;
-               }
-               std::size_t i = 0;
-               while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
-                  ++i;
-               }
-               if( ( Min <= i ) && ( i <= Max ) ) {
-                  bump_help< result_on_found::success, Input, char, C >( in, i );
-                  return true;
-               }
-               return false;
-            }
-         };
-
-         template< unsigned Min, unsigned Max, char C >
-         struct skip_control< rep_one_min_max< Min, Max, C > > : std::true_type
-         {
-         };
-
-      } // namespace internal
-
-      inline namespace ascii
-      {
-         template< unsigned Min, unsigned Max, char C >
-         struct rep_one_min_max : internal::rep_one_min_max< Min, Max, C >
-         {
-         };
-
-      } // namespace ascii
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 17 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/rep_string.hpp"
-       
-#line 1 "tao/pegtl/contrib/rep_string.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_REP_STRING_HPP
-#define TAO_PEGTL_CONTRIB_REP_STRING_HPP
-
-#include <cstddef>
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< std::size_t, typename, char... >
-         struct make_rep_string;
-
-         template< char... Ss, char... Cs >
-         struct make_rep_string< 0, string< Ss... >, Cs... >
-         {
-            using type = string< Ss... >;
-         };
-
-         template< std::size_t N, char... Ss, char... Cs >
-         struct make_rep_string< N, string< Ss... >, Cs... >
-            : make_rep_string< N - 1, string< Ss..., Cs... >, Cs... >
-         {};
-
-      } // namespace internal
-
-      inline namespace ascii
-      {
-         template< std::size_t N, char... Cs >
-         struct rep_string
-            : internal::make_rep_string< N, internal::string<>, Cs... >::type
-         {};
-
-      } // namespace ascii
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 18 "amalgamated.hpp"
-
-#line 1 "tao/pegtl/contrib/to_string.hpp"
-       
-#line 1 "tao/pegtl/contrib/to_string.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_TO_STRING_HPP
-#define TAO_PEGTL_CONTRIB_TO_STRING_HPP
-
-#include <string>
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename >
-         struct to_string;
-
-         template< template< char... > class X, char... Cs >
-         struct to_string< X< Cs... > >
-         {
-            static std::string get()
-            {
-               const char s[] = { Cs..., 0 };
-               return std::string( s, sizeof...( Cs ) );
-            }
-         };
-
-      } // namespace internal
-
-      template< typename T >
-      std::string to_string()
-      {
-         return internal::to_string< T >::get();
-      }
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 20 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/tracer.hpp"
-       
-#line 1 "tao/pegtl/contrib/tracer.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_TRACER_HPP
-#define TAO_PEGTL_CONTRIB_TRACER_HPP
-
-#include <cassert>
-#include <iomanip>
-#include <iostream>
-#include <utility>
-#include <vector>
-
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace internal
-      {
-         template< typename Input >
-         void print_current( const Input& in )
-         {
-            if( in.empty() ) {
-               std::cerr << "<eof>";
-            }
-            else {
-               const auto c = in.peek_uint8();
-               switch( c ) {
-                  case 0:
-                     std::cerr << "<nul> = ";
-                     break;
-                  case 9:
-                     std::cerr << "<ht> = ";
-                     break;
-                  case 10:
-                     std::cerr << "<lf> = ";
-                     break;
-                  case 13:
-                     std::cerr << "<cr> = ";
-                     break;
-                  default:
-                     if( isprint( c ) ) {
-                        std::cerr << '\'' << c << "' = ";
-                     }
-               }
-               std::cerr << "(char)" << unsigned( c );
-            }
-         }
-
-      } // namespace internal
-
-      struct trace_state
-      {
-         unsigned rule = 0;
-         unsigned line = 0;
-         std::vector< unsigned > stack;
-      };
-
-#if defined( _MSC_VER ) && ( _MSC_VER < 1910 )
-
-      template< typename Rule >
-      struct tracer
-         : normal< Rule >
-      {
-         template< typename Input, typename... States >
-         static void start( const Input& in, States&&... /*unused*/ )
-         {
-            std::cerr << in.position() << "  start  " << internal::demangle< Rule >() << "; current ";
-            print_current( in );
-            std::cerr << std::endl;
-         }
-
-         template< typename Input, typename... States >
-         static void start( const Input& in, trace_state& ts, States&&... st )
-         {
-            std::cerr << std::setw( 6 ) << ++ts.line << " " << std::setw( 6 ) << ++ts.rule << " ";
-            start( in, st... );
-            ts.stack.push_back( ts.rule );
-         }
-
-         template< typename Input, typename... States >
-         static void success( const Input& in, States&&... /*unused*/ )
-         {
-            std::cerr << in.position() << " success " << internal::demangle< Rule >() << "; next ";
-            print_current( in );
-            std::cerr << std::endl;
-         }
-
-         template< typename Input, typename... States >
-         static void success( const Input& in, trace_state& ts, States&&... st )
-         {
-            assert( !ts.stack.empty() );
-            std::cerr << std::setw( 6 ) << ++ts.line << " " << std::setw( 6 ) << ts.stack.back() << " ";
-            success( in, st... );
-            ts.stack.pop_back();
-         }
-
-         template< typename Input, typename... States >
-         static void failure( const Input& in, States&&... /*unused*/ )
-         {
-            std::cerr << in.position() << " failure " << internal::demangle< Rule >() << std::endl;
-         }
-
-         template< typename Input, typename... States >
-         static void failure( const Input& in, trace_state& ts, States&&... st )
-         {
-            assert( !ts.stack.empty() );
-            std::cerr << std::setw( 6 ) << ++ts.line << " " << std::setw( 6 ) << ts.stack.back() << " ";
-            failure( in, st... );
-            ts.stack.pop_back();
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename... States >
-         static auto apply( const Iterator& begin, const Input& in, States&&... st )
-            -> decltype( normal< Rule >::template apply< Action >( begin, in, st... ) )
-         {
-            std::cerr << in.position() << "  apply  " << internal::demangle< Rule >() << std::endl;
-            return normal< Rule >::template apply< Action >( begin, in, st... );
-         }
-
-         template< template< typename... > class Action, typename Iterator, typename Input, typename... States >
-         static auto apply( const Iterator& begin, const Input& in, trace_state& ts, States&&... st )
-            -> decltype( apply< Action >( begin, in, st... ) )
-         {
-            std::cerr << std::setw( 6 ) << ++ts.line << "        ";
-            return apply< Action >( begin, in, st... );
-         }
-
-         template< template< typename... > class Action, typename Input, typename... States >
-         static auto apply0( const Input& in, States&&... st )
-            -> decltype( normal< Rule >::template apply0< Action >( in, st... ) )
-         {
-            std::cerr << in.position() << "  apply0 " << internal::demangle< Rule >() << std::endl;
-            return normal< Rule >::template apply0< Action >( in, st... );
-         }
-
-         template< template< typename... > class Action, typename Input, typename... States >
-         static auto apply0( const Input& in, trace_state& ts, States&&... st )
-            -> decltype( apply0< Action >( in, st... ) )
-         {
-            std::cerr << std::setw( 6 ) << ++ts.line << "        ";
-            return apply0< Action >( in, st... );
-         }
-      };
-
-#else
-
-      template< template< typename... > class Base >
-      struct trace
-      {
-         template< typename Rule >
-         struct control
-            : Base< Rule >
-         {
-            template< typename Input, typename... States >
-            static void start( const Input& in, States&&... st )
-            {
-               std::cerr << in.position() << "  start  " << internal::demangle< Rule >() << "; current ";
-               print_current( in );
-               std::cerr << std::endl;
-               Base< Rule >::start( in, st... );
-            }
-
-            template< typename Input, typename... States >
-            static void start( const Input& in, trace_state& ts, States&&... st )
-            {
-               std::cerr << std::setw( 6 ) << ++ts.line << " " << std::setw( 6 ) << ++ts.rule << " ";
-               start( in, st... );
-               ts.stack.push_back( ts.rule );
-            }
-
-            template< typename Input, typename... States >
-            static void success( const Input& in, States&&... st )
-            {
-               std::cerr << in.position() << " success " << internal::demangle< Rule >() << "; next ";
-               print_current( in );
-               std::cerr << std::endl;
-               Base< Rule >::success( in, st... );
-            }
-
-            template< typename Input, typename... States >
-            static void success( const Input& in, trace_state& ts, States&&... st )
-            {
-               assert( !ts.stack.empty() );
-               std::cerr << std::setw( 6 ) << ++ts.line << " " << std::setw( 6 ) << ts.stack.back() << " ";
-               success( in, st... );
-               ts.stack.pop_back();
-            }
-
-            template< typename Input, typename... States >
-            static void failure( const Input& in, States&&... st )
-            {
-               std::cerr << in.position() << " failure " << internal::demangle< Rule >() << std::endl;
-               Base< Rule >::failure( in, st... );
-            }
-
-            template< typename Input, typename... States >
-            static void failure( const Input& in, trace_state& ts, States&&... st )
-            {
-               assert( !ts.stack.empty() );
-               std::cerr << std::setw( 6 ) << ++ts.line << " " << std::setw( 6 ) << ts.stack.back() << " ";
-               failure( in, st... );
-               ts.stack.pop_back();
-            }
-
-            template< template< typename... > class Action, typename Iterator, typename Input, typename... States >
-            static auto apply( const Iterator& begin, const Input& in, States&&... st )
-               -> decltype( Base< Rule >::template apply< Action >( begin, in, st... ) )
-            {
-               std::cerr << in.position() << "  apply  " << internal::demangle< Rule >() << std::endl;
-               return Base< Rule >::template apply< Action >( begin, in, st... );
-            }
-
-            template< template< typename... > class Action, typename Iterator, typename Input, typename... States >
-            static auto apply( const Iterator& begin, const Input& in, trace_state& ts, States&&... st )
-               -> decltype( apply< Action >( begin, in, st... ) )
-            {
-               std::cerr << std::setw( 6 ) << ++ts.line << "        ";
-               return apply< Action >( begin, in, st... );
-            }
-
-            template< template< typename... > class Action, typename Input, typename... States >
-            static auto apply0( const Input& in, States&&... st )
-               -> decltype( Base< Rule >::template apply0< Action >( in, st... ) )
-            {
-               std::cerr << in.position() << "  apply0 " << internal::demangle< Rule >() << std::endl;
-               return Base< Rule >::template apply0< Action >( in, st... );
-            }
-
-            template< template< typename... > class Action, typename Input, typename... States >
-            static auto apply0( const Input& in, trace_state& ts, States&&... st )
-               -> decltype( apply0< Action >( in, st... ) )
-            {
-               std::cerr << std::setw( 6 ) << ++ts.line << "        ";
-               return apply0< Action >( in, st... );
-            }
-         };
-      };
-
-      template< typename Rule >
-      using tracer = trace< normal >::control< Rule >;
-
-#endif
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 21 "amalgamated.hpp"
-#line 1 "tao/pegtl/contrib/unescape.hpp"
-       
-#line 1 "tao/pegtl/contrib/unescape.hpp"
-
-
-
-#ifndef TAO_PEGTL_CONTRIB_UNESCAPE_HPP
-#define TAO_PEGTL_CONTRIB_UNESCAPE_HPP
-
-#include <cassert>
-#include <string>
-
-
-
-
-
-namespace tao
-{
-   namespace TAO_PEGTL_NAMESPACE
-   {
-      namespace unescape
-      {
-         // Utility functions for the unescape actions.
-
-         inline bool utf8_append_utf32( std::string& string, const unsigned utf32 )
-         {
-            if( utf32 <= 0x7f ) {
-               string += char( utf32 & 0xff );
-               return true;
-            }
-            if( utf32 <= 0x7ff ) {
-               char tmp[] = { char( ( ( utf32 & 0x7c0 ) >> 6 ) | 0xc0 ), // NOLINT
-                              char( ( ( utf32 & 0x03f ) ) | 0x80 ) };
-               string.append( tmp, sizeof( tmp ) );
-               return true;
-            }
-            if( utf32 <= 0xffff ) {
-               if( utf32 >= 0xd800 && utf32 <= 0xdfff ) {
-                  // nope, this is a UTF-16 surrogate
-                  return false;
-               }
-               char tmp[] = { char( ( ( utf32 & 0xf000 ) >> 12 ) | 0xe0 ), // NOLINT
-                              char( ( ( utf32 & 0x0fc0 ) >> 6 ) | 0x80 ),
-                              char( ( ( utf32 & 0x003f ) ) | 0x80 ) };
-               string.append( tmp, sizeof( tmp ) );
-               return true;
-            }
-            if( utf32 <= 0x10ffff ) {
-               char tmp[] = { char( ( ( utf32 & 0x1c0000 ) >> 18 ) | 0xf0 ), // NOLINT
-                              char( ( ( utf32 & 0x03f000 ) >> 12 ) | 0x80 ),
-                              char( ( ( utf32 & 0x000fc0 ) >> 6 ) | 0x80 ),
-                              char( ( ( utf32 & 0x00003f ) ) | 0x80 ) };
-               string.append( tmp, sizeof( tmp ) );
-               return true;
-            }
-            return false;
-         }
-
-         // This function MUST only be called for characters matching TAO_PEGTL_NAMESPACE::ascii::xdigit!
-         template< typename I >
-         I unhex_char( const char c )
-         {
-            switch( c ) {
-               case '0':
-               case '1':
-               case '2':
-               case '3':
-               case '4':
-               case '5':
-               case '6':
-               case '7':
-               case '8':
-               case '9':
-                  return I( c - '0' );
-               case 'a':
-               case 'b':
-               case 'c':
-               case 'd':
-               case 'e':
-               case 'f':
-                  return I( c - 'a' + 10 );
-               case 'A':
-               case 'B':
-               case 'C':
-               case 'D':
-               case 'E':
-               case 'F':
-                  return I( c - 'A' + 10 );
-               default: // LCOV_EXCL_LINE
-                  throw std::runtime_error( "invalid character in unhex" ); // NOLINT, LCOV_EXCL_LINE
-            }
-         }
-
-         template< typename I >
-         I unhex_string( const char* begin, const char* end )
-         {
-            I r = 0;
-            while( begin != end ) {
-               r <<= 4;
-               r += unhex_char< I >( *begin++ );
-            }
-            return r;
-         }
-
-         // Actions for common unescape situations.
-
-         struct append_all
-         {
-            template< typename Input >
-            static void apply( const Input& in, std::string& s )
-            {
-               s.append( in.begin(), in.size() );
-            }
-         };
-
-         // This action MUST be called for a character matching T which MUST be TAO_PEGTL_NAMESPACE::one< ... >.
-         template< typename T, char... Rs >
-         struct unescape_c
-         {
-            template< typename Input >
-            static void apply( const Input& in, std::string& s )
-            {
-               assert( in.size() == 1 );
-               s += apply_one( in, static_cast< const T* >( nullptr ) );
-            }
-
-            template< typename Input, char... Qs >
-            static char apply_one( const Input& in, const one< Qs... >* /*unused*/ )
-            {
-               static_assert( sizeof...( Qs ) == sizeof...( Rs ), "size mismatch between escaped characters and their mappings" );
-               return apply_two( in, { Qs... }, { Rs... } );
-            }
-
-            template< typename Input >
-            static char apply_two( const Input& in, const std::initializer_list< char >& q, const std::initializer_list< char >& r )
-            {
-               const char c = *in.begin();
-               for( std::size_t i = 0; i < q.size(); ++i ) {
-                  if( *( q.begin() + i ) == c ) {
-                     return *( r.begin() + i );
-                  }
-               }
-               throw parse_error( "invalid character in unescape", in ); // NOLINT, LCOV_EXCL_LINE
-            }
-         };
-
-         // See src/example/pegtl/unescape.cpp for why the following two actions
-         // skip the first input character. They also MUST be called
-         // with non-empty matched inputs!
-
-         struct unescape_u
-         {
-            template< typename Input >
-            static void apply( const Input& in, std::string& s )
-            {
-               assert( !in.empty() ); // First character MUST be present, usually 'u' or 'U'.
-               if( !utf8_append_utf32( s, unhex_string< unsigned >( in.begin() + 1, in.end() ) ) ) {
-                  throw parse_error( "invalid escaped unicode code point", in );
-               }
-            }
-         };
-
-         struct unescape_x
-         {
-            template< typename Input >
-            static void apply( const Input& in, std::string& s )
-            {
-               assert( !in.empty() ); // First character MUST be present, usually 'x'.
-               s += unhex_string< char >( in.begin() + 1, in.end() );
-            }
-         };
-
-         // The unescape_j action is similar to unescape_u, however unlike
-         // unescape_u it
-         // (a) assumes exactly 4 hexdigits per escape sequence,
-         // (b) accepts multiple consecutive escaped 16-bit values.
-         // When applied to more than one escape sequence, unescape_j
-         // translates UTF-16 surrogate pairs in the input into a single
-         // UTF-8 sequence in s, as required for JSON by RFC 8259.
-
-         struct unescape_j
-         {
-            template< typename Input >
-            static void apply( const Input& in, std::string& s )
-            {
-               assert( ( ( in.size() + 1 ) % 6 ) == 0 ); // Expects multiple "\\u1234", starting with the first "u".
-               for( const char* b = in.begin() + 1; b < in.end(); b += 6 ) {
-                  const auto c = unhex_string< unsigned >( b, b + 4 );
-                  if( ( 0xd800 <= c ) && ( c <= 0xdbff ) && ( b + 6 < in.end() ) ) {
-                     const auto d = unhex_string< unsigned >( b + 6, b + 10 );
-                     if( ( 0xdc00 <= d ) && ( d <= 0xdfff ) ) {
-                        b += 6;
-                        (void)utf8_append_utf32( s, ( ( ( c & 0x03ff ) << 10 ) | ( d & 0x03ff ) ) + 0x10000 );
-                        continue;
-                     }
-                  }
-                  if( !utf8_append_utf32( s, c ) ) {
-                     throw parse_error( "invalid escaped unicode code point", in );
-                  }
-               }
-            }
-         };
-
-      } // namespace unescape
-
-   } // namespace TAO_PEGTL_NAMESPACE
-
-} // namespace tao
-
-#endif
-#line 22 "amalgamated.hpp"
diff --git a/pxr/base/tf/pxrPEGTL/pxr-pegtl.patch b/pxr/base/tf/pxrPEGTL/pxr-pegtl.patch
deleted file mode 100644
index 058d8e2dff..0000000000
--- a/pxr/base/tf/pxrPEGTL/pxr-pegtl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/pxr/base/tf/pxrPEGTL/pegtl.h b/pxr/base/tf/pxrPEGTL/pegtl.h
-index b14aebed2..e6b8962d7 100644
---- a/pxr/base/tf/pxrPEGTL/pegtl.h
-+++ b/pxr/base/tf/pxrPEGTL/pegtl.h
-@@ -29,6 +29,31 @@ SOFTWARE.
- 
- */
- 
-+// PIXAR:
-+// This header is not meant to be included in a .h file, to guard against
-+// conflicts if a program includes their own pegtl header and then transitively
-+// includes this header.
-+#ifdef PXR_PEGTL_H
-+#error This file should only be included once in any given source (.cpp) file.
-+#endif
-+#define PXR_PEGTL_H
-+
-+// PIXAR: 
-+// Define TAO_PEGTL_NAMESPACE based on internal namespace to isolate
-+// it from other versions of USD/PEGTL in client code.
-+//
-+// This would typically be done by wrapping the contents of this header in
-+// PXR_NAMESPACE_OPEN_SCOPE and PXR_NAMESPACE_CLOSE_SCOPE, but that would
-+// require more invasive changes to this header since there are STL header
-+// includes scattered throughout.
-+#include "pxr/pxr.h"
-+
-+#if PXR_USE_NAMESPACES
-+#define TAO_PEGTL_NAMESPACE PXR_INTERNAL_NS ## _pegtl
-+#else
-+#define TAO_PEGTL_NAMESPACE pxr_pegtl
-+#endif
-+
- #line 1 "amalgamated.hpp"
- #line 1 "<built-in>"
- #line 1 "<command-line>"
diff --git a/pxr/base/tf/py3Compat.h b/pxr/base/tf/py3Compat.h
index 365517f69b..94226cf8f0 100644
--- a/pxr/base/tf/py3Compat.h
+++ b/pxr/base/tf/py3Compat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_3_COMPAT_H
 #define PXR_BASE_TF_PY_3_COMPAT_H
diff --git a/pxr/base/tf/pyAnnotatedBoolResult.cpp b/pxr/base/tf/pyAnnotatedBoolResult.cpp
index 5f839de2e0..6d555c9d34 100644
--- a/pxr/base/tf/pyAnnotatedBoolResult.cpp
+++ b/pxr/base/tf/pyAnnotatedBoolResult.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyAnnotatedBoolResult.h"
diff --git a/pxr/base/tf/pyAnnotatedBoolResult.h b/pxr/base/tf/pyAnnotatedBoolResult.h
index ee33a7bf05..6d87485338 100644
--- a/pxr/base/tf/pyAnnotatedBoolResult.h
+++ b/pxr/base/tf/pyAnnotatedBoolResult.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_ANNOTATED_BOOL_RESULT_H
 #define PXR_BASE_TF_PY_ANNOTATED_BOOL_RESULT_H
diff --git a/pxr/base/tf/pyArg.cpp b/pxr/base/tf/pyArg.cpp
index 67c820c9a9..49505939ec 100644
--- a/pxr/base/tf/pyArg.cpp
+++ b/pxr/base/tf/pyArg.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyArg.h b/pxr/base/tf/pyArg.h
index 95723147d8..65c12c8562 100644
--- a/pxr/base/tf/pyArg.h
+++ b/pxr/base/tf/pyArg.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_ARG_H
 #define PXR_BASE_TF_PY_ARG_H
diff --git a/pxr/base/tf/pyCall.cpp b/pxr/base/tf/pyCall.cpp
index a8132af360..980bea800c 100644
--- a/pxr/base/tf/pyCall.cpp
+++ b/pxr/base/tf/pyCall.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyCall.h"
diff --git a/pxr/base/tf/pyCall.h b/pxr/base/tf/pyCall.h
index d2796fe29e..335c52f398 100644
--- a/pxr/base/tf/pyCall.h
+++ b/pxr/base/tf/pyCall.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_CALL_H
 #define PXR_BASE_TF_PY_CALL_H
diff --git a/pxr/base/tf/pyCallContext.cpp b/pxr/base/tf/pyCallContext.cpp
index f650b0aae0..02d4561758 100644
--- a/pxr/base/tf/pyCallContext.cpp
+++ b/pxr/base/tf/pyCallContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyCallContext.h b/pxr/base/tf/pyCallContext.h
index c8ccfeadfe..c13dcf206e 100644
--- a/pxr/base/tf/pyCallContext.h
+++ b/pxr/base/tf/pyCallContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_CALL_CONTEXT_H
 #define PXR_BASE_TF_PY_CALL_CONTEXT_H
diff --git a/pxr/base/tf/pyClassMethod.cpp b/pxr/base/tf/pyClassMethod.cpp
index e8ee02ff8c..b7c174b3b3 100644
--- a/pxr/base/tf/pyClassMethod.cpp
+++ b/pxr/base/tf/pyClassMethod.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyClassMethod.h"
diff --git a/pxr/base/tf/pyClassMethod.h b/pxr/base/tf/pyClassMethod.h
index 569e1740d8..c2abe48a19 100644
--- a/pxr/base/tf/pyClassMethod.h
+++ b/pxr/base/tf/pyClassMethod.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_CLASS_METHOD_H
 #define PXR_BASE_TF_PY_CLASS_METHOD_H
diff --git a/pxr/base/tf/pyContainerConversions.cpp b/pxr/base/tf/pyContainerConversions.cpp
index 3e3cf738e3..02aa6bea05 100644
--- a/pxr/base/tf/pyContainerConversions.cpp
+++ b/pxr/base/tf/pyContainerConversions.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyContainerConversions.h"
diff --git a/pxr/base/tf/pyContainerConversions.h b/pxr/base/tf/pyContainerConversions.h
index 11f47c1a93..363a8b1a56 100644
--- a/pxr/base/tf/pyContainerConversions.h
+++ b/pxr/base/tf/pyContainerConversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_CONTAINER_CONVERSIONS_H
 #define PXR_BASE_TF_PY_CONTAINER_CONVERSIONS_H
diff --git a/pxr/base/tf/pyEnum.cpp b/pxr/base/tf/pyEnum.cpp
index 92def9deec..a9d7fa5439 100644
--- a/pxr/base/tf/pyEnum.cpp
+++ b/pxr/base/tf/pyEnum.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyEnum.h b/pxr/base/tf/pyEnum.h
index 114695a66e..dbd23a2cba 100644
--- a/pxr/base/tf/pyEnum.h
+++ b/pxr/base/tf/pyEnum.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_ENUM_H
 #define PXR_BASE_TF_PY_ENUM_H
diff --git a/pxr/base/tf/pyError.cpp b/pxr/base/tf/pyError.cpp
index e3c30d1c4f..65e0c63eef 100644
--- a/pxr/base/tf/pyError.cpp
+++ b/pxr/base/tf/pyError.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyError.h b/pxr/base/tf/pyError.h
index 2823190f00..06487fa495 100644
--- a/pxr/base/tf/pyError.h
+++ b/pxr/base/tf/pyError.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_ERROR_H
 #define PXR_BASE_TF_PY_ERROR_H
@@ -102,17 +85,6 @@ struct TfPyRaiseOnError : Base
     }
 };
 
-struct Tf_PyErrorClearer {
-    Tf_PyErrorClearer() : clearOnDestruction(true) {}
-    ~Tf_PyErrorClearer() {
-        if (clearOnDestruction)
-            mark.Clear();
-    }
-    void Dismiss() { clearOnDestruction = false; }
-    TfErrorMark mark;
-    bool clearOnDestruction;
-};
-
 PXR_NAMESPACE_CLOSE_SCOPE
 
 #endif // PXR_BASE_TF_PY_ERROR_H
diff --git a/pxr/base/tf/pyErrorInternal.cpp b/pxr/base/tf/pyErrorInternal.cpp
index 4310a22408..2c19aa3f31 100644
--- a/pxr/base/tf/pyErrorInternal.cpp
+++ b/pxr/base/tf/pyErrorInternal.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyErrorInternal.h b/pxr/base/tf/pyErrorInternal.h
index 8f745fbe11..63a4780262 100644
--- a/pxr/base/tf/pyErrorInternal.h
+++ b/pxr/base/tf/pyErrorInternal.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_ERROR_INTERNAL_H
 #define PXR_BASE_TF_PY_ERROR_INTERNAL_H
diff --git a/pxr/base/tf/pyExceptionState.cpp b/pxr/base/tf/pyExceptionState.cpp
index 31cae5d71d..8489821def 100644
--- a/pxr/base/tf/pyExceptionState.cpp
+++ b/pxr/base/tf/pyExceptionState.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyExceptionState.h b/pxr/base/tf/pyExceptionState.h
index f350287641..053fb72225 100644
--- a/pxr/base/tf/pyExceptionState.h
+++ b/pxr/base/tf/pyExceptionState.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyFunction.cpp b/pxr/base/tf/pyFunction.cpp
index 67034c4455..f230eb7f63 100644
--- a/pxr/base/tf/pyFunction.cpp
+++ b/pxr/base/tf/pyFunction.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyFunction.h"
diff --git a/pxr/base/tf/pyFunction.h b/pxr/base/tf/pyFunction.h
index cbf555c022..616e623b7f 100644
--- a/pxr/base/tf/pyFunction.h
+++ b/pxr/base/tf/pyFunction.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_FUNCTION_H
 #define PXR_BASE_TF_PY_FUNCTION_H
diff --git a/pxr/base/tf/pyIdentity.cpp b/pxr/base/tf/pyIdentity.cpp
index 8e68f64ada..e87ecb5aca 100644
--- a/pxr/base/tf/pyIdentity.cpp
+++ b/pxr/base/tf/pyIdentity.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pySafePython.h"
 
diff --git a/pxr/base/tf/pyIdentity.h b/pxr/base/tf/pyIdentity.h
index 4f412e1fc0..f4a8f8e31b 100644
--- a/pxr/base/tf/pyIdentity.h
+++ b/pxr/base/tf/pyIdentity.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_IDENTITY_H
 #define PXR_BASE_TF_PY_IDENTITY_H
diff --git a/pxr/base/tf/pyInterpreter.cpp b/pxr/base/tf/pyInterpreter.cpp
index d46d94d955..a8354fc795 100644
--- a/pxr/base/tf/pyInterpreter.cpp
+++ b/pxr/base/tf/pyInterpreter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyInterpreter.h b/pxr/base/tf/pyInterpreter.h
index b7b6ab52d6..4316dd3281 100644
--- a/pxr/base/tf/pyInterpreter.h
+++ b/pxr/base/tf/pyInterpreter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_INTERPRETER_H
 #define PXR_BASE_TF_PY_INTERPRETER_H
diff --git a/pxr/base/tf/pyInvoke.cpp b/pxr/base/tf/pyInvoke.cpp
index b08b3a585f..78764d31dd 100644
--- a/pxr/base/tf/pyInvoke.cpp
+++ b/pxr/base/tf/pyInvoke.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyInvoke.h b/pxr/base/tf/pyInvoke.h
index 5b699467d4..f15735ee45 100644
--- a/pxr/base/tf/pyInvoke.h
+++ b/pxr/base/tf/pyInvoke.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_INVOKE_H
 #define PXR_BASE_TF_PY_INVOKE_H
diff --git a/pxr/base/tf/pyLock.cpp b/pxr/base/tf/pyLock.cpp
index 41a9bd3757..25bbc6a3f9 100644
--- a/pxr/base/tf/pyLock.cpp
+++ b/pxr/base/tf/pyLock.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyLock.h b/pxr/base/tf/pyLock.h
index 1d797dd976..496e59ebe5 100644
--- a/pxr/base/tf/pyLock.h
+++ b/pxr/base/tf/pyLock.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_LOCK_H
 #define PXR_BASE_TF_PY_LOCK_H
diff --git a/pxr/base/tf/pyModule.cpp b/pxr/base/tf/pyModule.cpp
index 223cfa7b3f..8eb786d06b 100644
--- a/pxr/base/tf/pyModule.cpp
+++ b/pxr/base/tf/pyModule.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Do not include pyModule.h or we'd need an implementation of WrapModule().
 //#include "pxr/base/tf/pyModule.h"
@@ -276,12 +259,14 @@ class Tf_ModuleProcessor {
         } else if (IsProperty(obj)) {
             // Replace owner's name attribute with a new property, decorating the
             // get, set, and del functions.
-            if (owner.attr(name) != obj) {
-                // XXX If accessing the attribute by normal lookup does not produce
-                // the same object, descriptors are likely at play (even on the
-                // class) which at least for now means that this is likely a static
-                // property.  For now, just not wrapping static properties with
-                // error handling.
+
+            // XXX: In Python 3.9+ this is equivalent to
+            // if (!Py_IS_TYPE(obj.ptr(), &PyProperty_Type)) {
+            if (Py_TYPE(obj.ptr()) != &PyProperty_Type) {
+                // XXX If the type of this object is not Python's built-in
+                // property descriptor, this at least for now means that this 
+                // is likely a static property. For now, we just don't wrap
+                // static properties with error handling.
             } else {
                 object propType(handle<>(borrowed(&PyProperty_Type)));
                 object newfget =
diff --git a/pxr/base/tf/pyModule.h b/pxr/base/tf/pyModule.h
index 2edea33178..a86bcf74fa 100644
--- a/pxr/base/tf/pyModule.h
+++ b/pxr/base/tf/pyModule.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifdef PXR_BASE_TF_PY_MODULE_H
 #error This file should only be included once in any given source (.cpp) file.
diff --git a/pxr/base/tf/pyModuleNotice.cpp b/pxr/base/tf/pyModuleNotice.cpp
index ae85649d9e..f95510ed1b 100644
--- a/pxr/base/tf/pyModuleNotice.cpp
+++ b/pxr/base/tf/pyModuleNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyModuleNotice.h b/pxr/base/tf/pyModuleNotice.h
index 953046e036..dfd013cc67 100644
--- a/pxr/base/tf/pyModuleNotice.h
+++ b/pxr/base/tf/pyModuleNotice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_MODULE_NOTICE_H
 #define PXR_BASE_TF_PY_MODULE_NOTICE_H
diff --git a/pxr/base/tf/pyNoticeWrapper.cpp b/pxr/base/tf/pyNoticeWrapper.cpp
index ab80d40682..a38132b3c5 100644
--- a/pxr/base/tf/pyNoticeWrapper.cpp
+++ b/pxr/base/tf/pyNoticeWrapper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyNoticeWrapper.h b/pxr/base/tf/pyNoticeWrapper.h
index 38d763119c..a399844787 100644
--- a/pxr/base/tf/pyNoticeWrapper.h
+++ b/pxr/base/tf/pyNoticeWrapper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_NOTICE_WRAPPER_H
 #define PXR_BASE_TF_PY_NOTICE_WRAPPER_H
diff --git a/pxr/base/tf/pyObjWrapper.cpp b/pxr/base/tf/pyObjWrapper.cpp
index 18c3e81e32..7c559ac0bf 100644
--- a/pxr/base/tf/pyObjWrapper.cpp
+++ b/pxr/base/tf/pyObjWrapper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyObjWrapper.h b/pxr/base/tf/pyObjWrapper.h
index 91617121e4..03327686ae 100644
--- a/pxr/base/tf/pyObjWrapper.h
+++ b/pxr/base/tf/pyObjWrapper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_OBJ_WRAPPER_H
 #define PXR_BASE_TF_PY_OBJ_WRAPPER_H
diff --git a/pxr/base/tf/pyObjectFinder.cpp b/pxr/base/tf/pyObjectFinder.cpp
index 8742330f41..cea8364857 100644
--- a/pxr/base/tf/pyObjectFinder.cpp
+++ b/pxr/base/tf/pyObjectFinder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyObjectFinder.h b/pxr/base/tf/pyObjectFinder.h
index 23bbf64441..9d641ea3b1 100644
--- a/pxr/base/tf/pyObjectFinder.h
+++ b/pxr/base/tf/pyObjectFinder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_OBJECT_FINDER_H
 #define PXR_BASE_TF_PY_OBJECT_FINDER_H
diff --git a/pxr/base/tf/pyOptional.cpp b/pxr/base/tf/pyOptional.cpp
index 8ea4030a21..e04c8d70e5 100644
--- a/pxr/base/tf/pyOptional.cpp
+++ b/pxr/base/tf/pyOptional.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file tf/pyOptional.cpp
diff --git a/pxr/base/tf/pyOptional.h b/pxr/base/tf/pyOptional.h
index 2d0cea7c5e..e40a143c45 100644
--- a/pxr/base/tf/pyOptional.h
+++ b/pxr/base/tf/pyOptional.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_OPTIONAL_H
 #define PXR_BASE_TF_PY_OPTIONAL_H
@@ -29,7 +12,6 @@
 #include "pxr/pxr.h"
 
 #include "pxr/base/tf/pyUtils.h"
-#include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <boost/python/converter/from_python.hpp>
 #include <boost/python/extract.hpp>
@@ -65,8 +47,10 @@ struct register_python_conversion
 };
 
 template <typename T>
-struct python_optional : public boost::noncopyable
+struct python_optional
 {
+    python_optional(const python_optional&) = delete;
+    python_optional& operator=(const python_optional&) = delete;
     template <typename Optional>
     struct optional_to_python
     {
diff --git a/pxr/base/tf/pyOverride.cpp b/pxr/base/tf/pyOverride.cpp
index 5aed81b16a..6c0f3d6733 100644
--- a/pxr/base/tf/pyOverride.cpp
+++ b/pxr/base/tf/pyOverride.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyOverride.h"
diff --git a/pxr/base/tf/pyOverride.h b/pxr/base/tf/pyOverride.h
index a6a1d0ecbf..df76574e86 100644
--- a/pxr/base/tf/pyOverride.h
+++ b/pxr/base/tf/pyOverride.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_OVERRIDE_H
 #define PXR_BASE_TF_PY_OVERRIDE_H
diff --git a/pxr/base/tf/pyPolymorphic.cpp b/pxr/base/tf/pyPolymorphic.cpp
index 3d5bb5d31a..b4fd41d8d9 100644
--- a/pxr/base/tf/pyPolymorphic.cpp
+++ b/pxr/base/tf/pyPolymorphic.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyPolymorphic.h"
 
diff --git a/pxr/base/tf/pyPolymorphic.h b/pxr/base/tf/pyPolymorphic.h
index ce1c923779..8e3ca18121 100644
--- a/pxr/base/tf/pyPolymorphic.h
+++ b/pxr/base/tf/pyPolymorphic.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_POLYMORPHIC_H
 #define PXR_BASE_TF_PY_POLYMORPHIC_H
diff --git a/pxr/base/tf/pyPtrHelpers.cpp b/pxr/base/tf/pyPtrHelpers.cpp
index 0382850f7a..e78fa07dda 100644
--- a/pxr/base/tf/pyPtrHelpers.cpp
+++ b/pxr/base/tf/pyPtrHelpers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyPtrHelpers.h"
 
diff --git a/pxr/base/tf/pyPtrHelpers.h b/pxr/base/tf/pyPtrHelpers.h
index cbe3f1cccf..eae329c45f 100644
--- a/pxr/base/tf/pyPtrHelpers.h
+++ b/pxr/base/tf/pyPtrHelpers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_PTR_HELPERS_H
 #define PXR_BASE_TF_PY_PTR_HELPERS_H
diff --git a/pxr/base/tf/pyResultConversions.cpp b/pxr/base/tf/pyResultConversions.cpp
index a590d0afa0..670a9b1028 100644
--- a/pxr/base/tf/pyResultConversions.cpp
+++ b/pxr/base/tf/pyResultConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyResultConversions.h"
 
diff --git a/pxr/base/tf/pyResultConversions.h b/pxr/base/tf/pyResultConversions.h
index 50e1d62124..bc24668e8e 100644
--- a/pxr/base/tf/pyResultConversions.h
+++ b/pxr/base/tf/pyResultConversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_RESULT_CONVERSIONS_H
 #define PXR_BASE_TF_PY_RESULT_CONVERSIONS_H
diff --git a/pxr/base/tf/pySafePython.h b/pxr/base/tf/pySafePython.h
index 30ca1c2eee..d23427feca 100644
--- a/pxr/base/tf/pySafePython.h
+++ b/pxr/base/tf/pySafePython.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_SAFE_PYTHON_H
 #define PXR_BASE_TF_PY_SAFE_PYTHON_H
diff --git a/pxr/base/tf/pySignatureExt.h b/pxr/base/tf/pySignatureExt.h
index 2ba8c6ac10..92c67f4948 100644
--- a/pxr/base/tf/pySignatureExt.h
+++ b/pxr/base/tf/pySignatureExt.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_SIGNATURE_EXT_H
 #define PXR_BASE_TF_PY_SIGNATURE_EXT_H
diff --git a/pxr/base/tf/pySingleton.cpp b/pxr/base/tf/pySingleton.cpp
index cd9fd59642..dbd6f7cb86 100644
--- a/pxr/base/tf/pySingleton.cpp
+++ b/pxr/base/tf/pySingleton.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pySingleton.h b/pxr/base/tf/pySingleton.h
index ed5809159f..0ac1f2b4d7 100644
--- a/pxr/base/tf/pySingleton.h
+++ b/pxr/base/tf/pySingleton.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_SINGLETON_H
 #define PXR_BASE_TF_PY_SINGLETON_H
diff --git a/pxr/base/tf/pyStaticTokens.h b/pxr/base/tf/pyStaticTokens.h
index 7a554b76ff..5183c46e58 100644
--- a/pxr/base/tf/pyStaticTokens.h
+++ b/pxr/base/tf/pyStaticTokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TF_PY_STATIC_TOKENS_H
diff --git a/pxr/base/tf/pyTracing.cpp b/pxr/base/tf/pyTracing.cpp
index 34640c8fb9..9c05137e06 100644
--- a/pxr/base/tf/pyTracing.cpp
+++ b/pxr/base/tf/pyTracing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyTracing.h b/pxr/base/tf/pyTracing.h
index 696e83a90c..bcde577950 100644
--- a/pxr/base/tf/pyTracing.h
+++ b/pxr/base/tf/pyTracing.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_TRACING_H
 #define PXR_BASE_TF_PY_TRACING_H
diff --git a/pxr/base/tf/pyUtils.cpp b/pxr/base/tf/pyUtils.cpp
index 432018e2e4..5d35d38528 100644
--- a/pxr/base/tf/pyUtils.cpp
+++ b/pxr/base/tf/pyUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyUtils.h b/pxr/base/tf/pyUtils.h
index 51514939e2..a91ebdc5ec 100644
--- a/pxr/base/tf/pyUtils.h
+++ b/pxr/base/tf/pyUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_UTILS_H
 #define PXR_BASE_TF_PY_UTILS_H
diff --git a/pxr/base/tf/pyWeakObject.cpp b/pxr/base/tf/pyWeakObject.cpp
index 32d11e10b9..929fa971b0 100644
--- a/pxr/base/tf/pyWeakObject.cpp
+++ b/pxr/base/tf/pyWeakObject.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/base/tf/pyWeakObject.h b/pxr/base/tf/pyWeakObject.h
index 3d470a4709..6bf4eaaa38 100644
--- a/pxr/base/tf/pyWeakObject.h
+++ b/pxr/base/tf/pyWeakObject.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_WEAK_OBJECT_H
 #define PXR_BASE_TF_PY_WEAK_OBJECT_H
diff --git a/pxr/base/tf/pyWrapContext.cpp b/pxr/base/tf/pyWrapContext.cpp
index 4523e03eb9..34714414a0 100644
--- a/pxr/base/tf/pyWrapContext.cpp
+++ b/pxr/base/tf/pyWrapContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/pyWrapContext.h b/pxr/base/tf/pyWrapContext.h
index 995bd112c8..73622fa86b 100644
--- a/pxr/base/tf/pyWrapContext.h
+++ b/pxr/base/tf/pyWrapContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_PY_WRAP_CONTEXT_H
 #define PXR_BASE_TF_PY_WRAP_CONTEXT_H
@@ -28,8 +11,6 @@
 
 #include "pxr/base/tf/singleton.h"
 
-#include <boost/noncopyable.hpp>
-
 #include <string>
 #include <vector>
 
@@ -37,7 +18,10 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 // This is used internally by the Tf python wrapping infrastructure.
 
-class Tf_PyWrapContextManager : public boost::noncopyable {
+class Tf_PyWrapContextManager {
+    Tf_PyWrapContextManager(const Tf_PyWrapContextManager&) = delete;
+    Tf_PyWrapContextManager&
+    operator=(const Tf_PyWrapContextManager&) = delete;
 
   public:
 
diff --git a/pxr/base/tf/refBase.cpp b/pxr/base/tf/refBase.cpp
index f72a85577d..f085d4fdf3 100644
--- a/pxr/base/tf/refBase.cpp
+++ b/pxr/base/tf/refBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/refBase.h b/pxr/base/tf/refBase.h
index c591d6cf4e..ff14260989 100644
--- a/pxr/base/tf/refBase.h
+++ b/pxr/base/tf/refBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_REF_BASE_H
 #define PXR_BASE_TF_REF_BASE_H
diff --git a/pxr/base/tf/refPtr.cpp b/pxr/base/tf/refPtr.cpp
index 0f03de4dd4..e109e55d5c 100644
--- a/pxr/base/tf/refPtr.cpp
+++ b/pxr/base/tf/refPtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/refPtr.h b/pxr/base/tf/refPtr.h
index 2fdbe9930b..33a07c0d9b 100644
--- a/pxr/base/tf/refPtr.h
+++ b/pxr/base/tf/refPtr.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_REF_PTR_H
 #define PXR_BASE_TF_REF_PTR_H
diff --git a/pxr/base/tf/refPtrTracker.cpp b/pxr/base/tf/refPtrTracker.cpp
index c5fce21806..f5e3a07cdb 100644
--- a/pxr/base/tf/refPtrTracker.cpp
+++ b/pxr/base/tf/refPtrTracker.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file refPtrTracker.h
 
diff --git a/pxr/base/tf/refPtrTracker.h b/pxr/base/tf/refPtrTracker.h
index 1ba8f31c0f..95e726c7b6 100644
--- a/pxr/base/tf/refPtrTracker.h
+++ b/pxr/base/tf/refPtrTracker.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_REF_PTR_TRACKER_H
 #define PXR_BASE_TF_REF_PTR_TRACKER_H
diff --git a/pxr/base/tf/regTest.cpp b/pxr/base/tf/regTest.cpp
index 9142af8090..0171c8a625 100644
--- a/pxr/base/tf/regTest.cpp
+++ b/pxr/base/tf/regTest.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/regTest.h b/pxr/base/tf/regTest.h
index c60a7dedd3..1d8f1adff5 100644
--- a/pxr/base/tf/regTest.h
+++ b/pxr/base/tf/regTest.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_REG_TEST_H
 #define PXR_BASE_TF_REG_TEST_H
diff --git a/pxr/base/tf/registryManager.cpp b/pxr/base/tf/registryManager.cpp
index 4fa7b7d7ce..848343b358 100644
--- a/pxr/base/tf/registryManager.cpp
+++ b/pxr/base/tf/registryManager.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // The registry manager is used to lazily run code needed by consumers of
 // some type.  This code is found automatically by the registry manager
diff --git a/pxr/base/tf/registryManager.h b/pxr/base/tf/registryManager.h
index ba71e6bd61..b23a2e24d6 100644
--- a/pxr/base/tf/registryManager.h
+++ b/pxr/base/tf/registryManager.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_REGISTRY_MANAGER_H
 #define PXR_BASE_TF_REGISTRY_MANAGER_H
diff --git a/pxr/base/tf/safeOutputFile.cpp b/pxr/base/tf/safeOutputFile.cpp
index 3ff2d35f47..5417ec0f94 100644
--- a/pxr/base/tf/safeOutputFile.cpp
+++ b/pxr/base/tf/safeOutputFile.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Tf/safeOutputFile.cpp
diff --git a/pxr/base/tf/safeOutputFile.h b/pxr/base/tf/safeOutputFile.h
index 04b0808d1f..5e5cac5767 100644
--- a/pxr/base/tf/safeOutputFile.h
+++ b/pxr/base/tf/safeOutputFile.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SAFE_OUTPUT_FILE_H
 #define PXR_BASE_TF_SAFE_OUTPUT_FILE_H
diff --git a/pxr/base/tf/safeTypeCompare.h b/pxr/base/tf/safeTypeCompare.h
index 64b16e3d50..33bafcfe37 100644
--- a/pxr/base/tf/safeTypeCompare.h
+++ b/pxr/base/tf/safeTypeCompare.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SAFE_TYPE_COMPARE_H
 #define PXR_BASE_TF_SAFE_TYPE_COMPARE_H
diff --git a/pxr/base/tf/scopeDescription.cpp b/pxr/base/tf/scopeDescription.cpp
index 2450388c0a..c3b233eac8 100644
--- a/pxr/base/tf/scopeDescription.cpp
+++ b/pxr/base/tf/scopeDescription.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/scopeDescription.h b/pxr/base/tf/scopeDescription.h
index 20aa42786a..840dcc7760 100644
--- a/pxr/base/tf/scopeDescription.h
+++ b/pxr/base/tf/scopeDescription.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SCOPE_DESCRIPTION_H
 #define PXR_BASE_TF_SCOPE_DESCRIPTION_H
diff --git a/pxr/base/tf/scopeDescriptionPrivate.h b/pxr/base/tf/scopeDescriptionPrivate.h
index 8919eabf7c..9e2e9945e8 100644
--- a/pxr/base/tf/scopeDescriptionPrivate.h
+++ b/pxr/base/tf/scopeDescriptionPrivate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SCOPE_DESCRIPTION_PRIVATE_H
 #define PXR_BASE_TF_SCOPE_DESCRIPTION_PRIVATE_H
diff --git a/pxr/base/tf/scoped.cpp b/pxr/base/tf/scoped.cpp
index 6a1afbe7de..5ec7979575 100644
--- a/pxr/base/tf/scoped.cpp
+++ b/pxr/base/tf/scoped.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/scoped.h"
diff --git a/pxr/base/tf/scoped.h b/pxr/base/tf/scoped.h
index b1f2e09f21..a01c232b85 100644
--- a/pxr/base/tf/scoped.h
+++ b/pxr/base/tf/scoped.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SCOPED_H
 #define PXR_BASE_TF_SCOPED_H
diff --git a/pxr/base/tf/scriptModuleLoader.cpp b/pxr/base/tf/scriptModuleLoader.cpp
index 639fe4b924..72289f253d 100644
--- a/pxr/base/tf/scriptModuleLoader.cpp
+++ b/pxr/base/tf/scriptModuleLoader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/scriptModuleLoader.h b/pxr/base/tf/scriptModuleLoader.h
index 7f91b0e537..92c8daa3a5 100644
--- a/pxr/base/tf/scriptModuleLoader.h
+++ b/pxr/base/tf/scriptModuleLoader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SCRIPT_MODULE_LOADER_H
 #define PXR_BASE_TF_SCRIPT_MODULE_LOADER_H
diff --git a/pxr/base/tf/setenv.cpp b/pxr/base/tf/setenv.cpp
index a2b07c2ab1..ff757221bf 100644
--- a/pxr/base/tf/setenv.cpp
+++ b/pxr/base/tf/setenv.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/setenv.h b/pxr/base/tf/setenv.h
index 53f2a7045c..71c12ea28e 100644
--- a/pxr/base/tf/setenv.h
+++ b/pxr/base/tf/setenv.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SETENV_H
 #define PXR_BASE_TF_SETENV_H
diff --git a/pxr/base/tf/singleton.cpp b/pxr/base/tf/singleton.cpp
index 16b228c30b..59239a3a43 100644
--- a/pxr/base/tf/singleton.cpp
+++ b/pxr/base/tf/singleton.cpp
@@ -1,24 +1,33 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
+
+#include "pxr/pxr.h"
 #include "pxr/base/tf/singleton.h"
+#include "pxr/base/tf/instantiateSingleton.h"
+#include "pxr/base/tf/pyLock.h"
+
+#include <memory>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// This GIL-releasing helper is declared in tf/instantiateSingleton.h.  It
+// exists so that users of instantiateSingleton.h don't need to pull in the
+// Python headers via tf/pyLock.h.
+
+Tf_SingletonPyGILDropper::Tf_SingletonPyGILDropper()
+{
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+    if (PyGILState_Check()) {
+        _pyLock = std::make_unique<TfPyLock>();
+        _pyLock->BeginAllowThreads();
+    }
+#endif // PXR_PYTHON_SUPPORT_ENABLED
+}
+
+Tf_SingletonPyGILDropper::~Tf_SingletonPyGILDropper() = default;
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/base/tf/singleton.h b/pxr/base/tf/singleton.h
index 326782e2a4..8b2b48ae88 100644
--- a/pxr/base/tf/singleton.h
+++ b/pxr/base/tf/singleton.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SINGLETON_H
 #define PXR_BASE_TF_SINGLETON_H
diff --git a/pxr/base/tf/smallVector.cpp b/pxr/base/tf/smallVector.cpp
index 3b4010bbe6..713d46d979 100644
--- a/pxr/base/tf/smallVector.cpp
+++ b/pxr/base/tf/smallVector.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/smallVector.h"
diff --git a/pxr/base/tf/smallVector.h b/pxr/base/tf/smallVector.h
index 8145ba4eb5..f38a91919f 100644
--- a/pxr/base/tf/smallVector.h
+++ b/pxr/base/tf/smallVector.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SMALL_VECTOR_H
 #define PXR_BASE_TF_SMALL_VECTOR_H
@@ -46,9 +29,24 @@ PXR_NAMESPACE_OPEN_SCOPE
 // *all* of TfSmallVector's template parameters.
 class TfSmallVectorBase
 {
+protected:
+    // We present the public size_type and difference_type as std::size_t and
+    // std::ptrdiff_t to match std::vector, but internally we store size &
+    // capacity as uint32_t.
+    using _SizeMemberType = std::uint32_t;
+
+    // Union type containing local storage or a pointer to heap storage.
+    template <size_t Size, size_t Align, size_t NumLocal>
+    union _DataUnion;
+
+    // Helper alias to produce the right _DataUnion instantiation for a given
+    // ValueType and NumLocal elements.
+    template <class ValueType, size_t NumLocal>
+    using _Data = _DataUnion<sizeof(ValueType), alignof(ValueType), NumLocal>;
+
 public:
-    using size_type = std::uint32_t;
-    using difference_type = std::int32_t;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
 
     // Returns the local capacity that may be used without increasing the size
     // of the TfSmallVector.  TfSmallVector<T, N> will never use more local
@@ -62,6 +60,20 @@ class TfSmallVectorBase
     }
 
 protected:
+
+    // Enabler used to disambiguate the range-based constructor (begin, end)
+    // from the n-copies constructor (size_t n, value_type const &value)
+    // when the value_type is integral.
+    template<typename _ForwardIterator>
+    using _EnableIfForwardIterator =
+        std::enable_if_t<
+            std::is_convertible_v<
+                typename std::iterator_traits<
+                    _ForwardIterator>::iterator_category,
+                std::forward_iterator_tag
+                >
+        >;
+    
     // Invoke std::uninitialized_copy that either moves or copies entries,
     // depending on whether the type is move constructible or not.
     template <typename Iterator>
@@ -83,72 +95,37 @@ class TfSmallVectorBase
     // The data storage, which is a union of both the local storage, as well
     // as a pointer, holding the address to the remote storage on the heap, if
     // used.
-    template < typename U, size_type M >
-    union _Data {
-    public:
-
-        U *GetLocalStorage() { 
-            return reinterpret_cast<U *>(_local);
-        }
-
-        const U *GetLocalStorage() const {
-            return reinterpret_cast<const U *>(_local);
-        }
-
-        U *GetRemoteStorage() {
-            return _remote;
-        }
-
-        const U *GetRemoteStorage() const {
-            return _remote;
-        }
-
-        void SetRemoteStorage(U *p) {
-            _remote = p;
-        }
-
-    private:
-
-        alignas(U) char _local[sizeof(U)*M];
-        U* _remote;
-
-    };
-
-    // For N == 0 the _Data class has been specialized to elide the local
-    // storage completely. This way we don't have to rely on compiler-specific
-    // support for 0-sized arrays.
-    template < typename U >
-    union _Data<U, 0> {
+    template <size_t Size, size_t Align, size_t NumLocal>
+    union _DataUnion {
     public:
+        // XXX: Could in principle assert in calls to GetLocalStorage() when
+        // HasLocal is false. Add dependency on tf/diagnostic.h?
+        static constexpr bool HasLocal = NumLocal != 0;
 
-        U *GetLocalStorage() {
-            // XXX: Could assert here. Introduce dependency on tf/diagnostic.h?
-            return nullptr;
+        void *GetLocalStorage() {
+            return HasLocal ? _local : nullptr;
         }
-
-        const U *GetLocalStorage() const {
-            // XXX: Could assert here. Introduce dependency on tf/diagnostic.h?
-            return nullptr;
+        const void *GetLocalStorage() const {
+            return HasLocal ? _local : nullptr;
         }
 
-        U *GetRemoteStorage() {
+        void *GetRemoteStorage() {
             return _remote;
         }
-
-        const U *GetRemoteStorage() const {
+        const void *GetRemoteStorage() const {
             return _remote;
         }
 
-        void SetRemoteStorage(U *p) {
+        void SetRemoteStorage(void *p) {
             _remote = p;
         }
-
     private:
-
-        U* _remote;
-
+        // Pointer to heap storage.
+        void *_remote;
+        // Local storage -- min size is sizeof(_remote).
+        alignas(NumLocal == 0 ? std::alignment_of_v<void *> : Align)
+        char _local[std::max<size_t>(Size * NumLocal, sizeof(_remote))];
     };
-
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -173,9 +150,8 @@ class TfSmallVectorBase
 /// Note that a TfSmallVector that has grown beyond its local storage, will
 /// NOT move its entries back into the local storage once it shrinks back to N.
 ///
-template < typename T, uint32_t N >
-class TfSmallVector
-    : public TfSmallVectorBase
+template <typename T, uint32_t N>
+class TfSmallVector : public TfSmallVectorBase
 {
 public:
 
@@ -253,7 +229,7 @@ class TfSmallVector
         // If rhs can not be stored locally, take rhs's remote storage and
         // reset rhs to empty.
         if (rhs.size() > N) {
-            _data.SetRemoteStorage(rhs._data.GetRemoteStorage());
+            _SetRemoteStorage(rhs._GetRemoteStorage());
             std::swap(_capacity, rhs._capacity);
         }
 
@@ -273,16 +249,6 @@ class TfSmallVector
         : TfSmallVector(values.begin(), values.end()) {
     }
 
-    template<typename _ForwardIterator>
-    using _EnableIfForwardIterator =
-        typename std::enable_if<
-            std::is_convertible<
-                typename std::iterator_traits<
-                    _ForwardIterator>::iterator_category,
-                    std::forward_iterator_tag
-                >::value
-            >::type;
-
     /// Creates a new vector containing copies of the data between 
     /// \p first and \p last. 
     template<typename ForwardIterator,
@@ -350,9 +316,9 @@ class TfSmallVector
         // Both this vector and rhs are stored remotely. Simply swap the
         // pointers, as well as size and capacity.
         else if (!_IsLocal() && !rhs._IsLocal()) {
-            value_type *tmp = _data.GetRemoteStorage();
-            _data.SetRemoteStorage(rhs._data.GetRemoteStorage());
-            rhs._data.SetRemoteStorage(tmp);
+            value_type *tmp = _GetRemoteStorage();
+            _SetRemoteStorage(rhs._GetRemoteStorage());
+            rhs._SetRemoteStorage(tmp);
 
             std::swap(_size, rhs._size);
             std::swap(_capacity, rhs._capacity);
@@ -375,14 +341,13 @@ class TfSmallVector
             // source will become the one with the remote storage, so those
             // entries will be essentially freed.
             for (size_type i = 0; i < local->size(); ++i) {
-                _MoveConstruct(
-                    remote->_data.GetLocalStorage() + i, &(*local)[i]);
+                _MoveConstruct(remote->_GetLocalStorage() + i, &(*local)[i]);
                 (*local)[i].~value_type();
             }
 
             // Swap the remote storage into the vector which previously had the
             // local storage. It's been properly cleaned up now.
-            local->_data.SetRemoteStorage(remoteStorage);
+            local->_SetRemoteStorage(remoteStorage);
 
             // Swap sizes and capacities. Easy peasy. 
             std::swap(remote->_size, local->_size);
@@ -575,7 +540,7 @@ class TfSmallVector
             // Destroy old data and set up this new buffer.
             _Destruct();
             _FreeStorage();
-            _data.SetRemoteStorage(newStorage);
+            _SetRemoteStorage(newStorage);
             _capacity = nextCapacity;
         }
         else {
@@ -633,7 +598,7 @@ class TfSmallVector
     /// Returns the maximum size of this vector.
     ///
     static constexpr size_type max_size() {
-        return std::numeric_limits<size_type>::max();
+        return std::numeric_limits<_SizeMemberType>::max();
     }
 
     /// Returns \c true if this vector is empty.
@@ -742,25 +707,25 @@ class TfSmallVector
     /// Returns the last element in the vector.
     ///
     reference back() {
-        return *(data() + size() - 1);
+        return data()[size() - 1];
     }
 
     /// Returns the last elements in the vector.
     ///
     const_reference back() const {
-        return *(data() + size() - 1);
+        return data()[size() - 1];
     }
 
     /// Access the specified element.
     ///
     reference operator[](size_type i) {
-        return *(data() + i);
+        return data()[i];
     }
 
     /// Access the specified element.
     ///
     const_reference operator[](size_type i) const {
-        return *(data() + i);
+        return data()[i];
     }
 
     /// Direct access to the underlying array.
@@ -789,6 +754,25 @@ class TfSmallVector
     
 private:
 
+    // Raw data access.
+    value_type *_GetLocalStorage() {
+        return static_cast<value_type *>(_data.GetLocalStorage());
+    }
+    const value_type *_GetLocalStorage() const {
+        return static_cast<const value_type *>(_data.GetLocalStorage());
+    }
+
+    value_type *_GetRemoteStorage() {
+        return static_cast<value_type *>(_data.GetRemoteStorage());
+    }
+    const value_type *_GetRemoteStorage() const {
+        return static_cast<const value_type *>(_data.GetRemoteStorage());
+    }
+
+    void _SetRemoteStorage(value_type *p) {
+        _data.SetRemoteStorage(static_cast<void *>(p));
+    }
+    
     // Returns true if the local storage is used.
     bool _IsLocal() const {
         return _capacity <= N;
@@ -797,19 +781,19 @@ class TfSmallVector
     // Return a pointer to the storage, which is either local or remote
     // depending on the current capacity.
     value_type *_GetStorage() {
-        return _IsLocal() ? _data.GetLocalStorage() : _data.GetRemoteStorage();
+        return _IsLocal() ? _GetLocalStorage() : _GetRemoteStorage();
     }
 
     // Return a const pointer to the storage, which is either local or remote
     // depending on the current capacity.
     const value_type *_GetStorage() const {
-        return _IsLocal() ? _data.GetLocalStorage() : _data.GetRemoteStorage();
+        return _IsLocal() ? _GetLocalStorage() : _GetRemoteStorage();
     }
 
     // Free the remotely allocated storage.
     void _FreeStorage() {
         if (!_IsLocal()) {
-            free(_data.GetRemoteStorage());
+            free(_GetRemoteStorage());
         }
     }
 
@@ -830,20 +814,20 @@ class TfSmallVector
     // Initialize the vector with new storage, updating the capacity and size.
     void _InitStorage(size_type size) {
         if (size > capacity()) {
-            _data.SetRemoteStorage(_Allocate(size));
+            _SetRemoteStorage(_Allocate(size));
             _capacity = size;
         }
         _size = size;
     }
 
     // Grow the storage to be able to accommodate newCapacity entries. This
-    // always allocates remotes storage.
+    // always allocates remote storage.
     void _GrowStorage(const size_type newCapacity) {
         value_type *newStorage = _Allocate(newCapacity);
         _UninitializedMove(begin(), end(), iterator(newStorage));
         _Destruct();
         _FreeStorage();
-        _data.SetRemoteStorage(newStorage);
+        _SetRemoteStorage(newStorage);
         _capacity = newCapacity;
     }
 
@@ -889,7 +873,7 @@ class TfSmallVector
             _Destruct();
             _FreeStorage();
 
-            _data.SetRemoteStorage(newStorage);
+            _SetRemoteStorage(newStorage);
             _capacity = newCapacity;
         }
 
@@ -917,11 +901,11 @@ class TfSmallVector
     _Data<value_type, N> _data;
 
     // The current size of the vector, i.e. how many entries it contains.
-    size_type _size;
+    _SizeMemberType _size;
 
     // The current capacity of the vector, i.e. how big the currently allocated
     // storage space is.
-    size_type _capacity;
+    _SizeMemberType _capacity;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/pxr/base/tf/span.h b/pxr/base/tf/span.h
index 38f38c2a24..9032b7d6e1 100644
--- a/pxr/base/tf/span.h
+++ b/pxr/base/tf/span.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SPAN_H
 #define PXR_BASE_TF_SPAN_H
diff --git a/pxr/base/tf/spinMutex.cpp b/pxr/base/tf/spinMutex.cpp
index 8dce49ba12..a1ba343f23 100644
--- a/pxr/base/tf/spinMutex.cpp
+++ b/pxr/base/tf/spinMutex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/spinMutex.h b/pxr/base/tf/spinMutex.h
index d7dbb8dca1..f5c023fc67 100644
--- a/pxr/base/tf/spinMutex.h
+++ b/pxr/base/tf/spinMutex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SPIN_MUTEX_H
 #define PXR_BASE_TF_SPIN_MUTEX_H
diff --git a/pxr/base/tf/spinRWMutex.cpp b/pxr/base/tf/spinRWMutex.cpp
index 3629df6e69..22ed2b9604 100644
--- a/pxr/base/tf/spinRWMutex.cpp
+++ b/pxr/base/tf/spinRWMutex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/spinRWMutex.h b/pxr/base/tf/spinRWMutex.h
index 5b5219f668..b3ce15e3bb 100644
--- a/pxr/base/tf/spinRWMutex.h
+++ b/pxr/base/tf/spinRWMutex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_SPIN_RW_MUTEX_H
 #define PXR_BASE_TF_SPIN_RW_MUTEX_H
diff --git a/pxr/base/tf/stackTrace.cpp b/pxr/base/tf/stackTrace.cpp
index 0d8928302e..233ee166dd 100644
--- a/pxr/base/tf/stackTrace.cpp
+++ b/pxr/base/tf/stackTrace.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/stackTrace.h b/pxr/base/tf/stackTrace.h
index 17cc4dc3dc..3e390e081d 100644
--- a/pxr/base/tf/stackTrace.h
+++ b/pxr/base/tf/stackTrace.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_STACK_TRACE_H
 #define PXR_BASE_TF_STACK_TRACE_H
diff --git a/pxr/base/tf/stacked.cpp b/pxr/base/tf/stacked.cpp
index df7f17a821..79670905e7 100644
--- a/pxr/base/tf/stacked.cpp
+++ b/pxr/base/tf/stacked.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/stacked.h"
 
diff --git a/pxr/base/tf/stacked.h b/pxr/base/tf/stacked.h
index 8b640cbe42..e2d64f2951 100644
--- a/pxr/base/tf/stacked.h
+++ b/pxr/base/tf/stacked.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_STACKED_H
 #define PXR_BASE_TF_STACKED_H
diff --git a/pxr/base/tf/staticData.h b/pxr/base/tf/staticData.h
index 5e03e003cd..b7cd0a5e69 100644
--- a/pxr/base/tf/staticData.h
+++ b/pxr/base/tf/staticData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_STATIC_DATA_H
 #define PXR_BASE_TF_STATIC_DATA_H
diff --git a/pxr/base/tf/staticTokens.h b/pxr/base/tf/staticTokens.h
index 78cd3376b5..d4b98b12fa 100644
--- a/pxr/base/tf/staticTokens.h
+++ b/pxr/base/tf/staticTokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 //todo: cleanup: TF_DEFINE_PRIVATE_TOKENS, should use the public versions
 //todo: cleanup: document each macro extensively
diff --git a/pxr/base/tf/status.cpp b/pxr/base/tf/status.cpp
index fbbeac6623..b9651700e3 100644
--- a/pxr/base/tf/status.cpp
+++ b/pxr/base/tf/status.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/status.h"
 
diff --git a/pxr/base/tf/status.h b/pxr/base/tf/status.h
index ed70738aad..dbecbb77ec 100644
--- a/pxr/base/tf/status.h
+++ b/pxr/base/tf/status.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_STATUS_H
 #define PXR_BASE_TF_STATUS_H
diff --git a/pxr/base/tf/stl.cpp b/pxr/base/tf/stl.cpp
index 08f635c279..36e38d57c0 100644
--- a/pxr/base/tf/stl.cpp
+++ b/pxr/base/tf/stl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/stl.h b/pxr/base/tf/stl.h
index 6861c83fde..3160c7f744 100644
--- a/pxr/base/tf/stl.h
+++ b/pxr/base/tf/stl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_STL_H
 #define PXR_BASE_TF_STL_H
diff --git a/pxr/base/tf/stopwatch.cpp b/pxr/base/tf/stopwatch.cpp
index 90c24949ba..9ed19a2e2c 100644
--- a/pxr/base/tf/stopwatch.cpp
+++ b/pxr/base/tf/stopwatch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/stopwatch.h b/pxr/base/tf/stopwatch.h
index 59cad05acc..dc404acfde 100644
--- a/pxr/base/tf/stopwatch.h
+++ b/pxr/base/tf/stopwatch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_STOPWATCH_H
 #define PXR_BASE_TF_STOPWATCH_H
diff --git a/pxr/base/tf/stringUtils.cpp b/pxr/base/tf/stringUtils.cpp
index c2f3dc3286..7110aee3e8 100644
--- a/pxr/base/tf/stringUtils.cpp
+++ b/pxr/base/tf/stringUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/stringUtils.h b/pxr/base/tf/stringUtils.h
index 9122afc51e..0a65677366 100644
--- a/pxr/base/tf/stringUtils.h
+++ b/pxr/base/tf/stringUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_STRING_UTILS_H
 #define PXR_BASE_TF_STRING_UTILS_H
diff --git a/pxr/base/tf/templateString.cpp b/pxr/base/tf/templateString.cpp
index b227731856..06986743e0 100644
--- a/pxr/base/tf/templateString.cpp
+++ b/pxr/base/tf/templateString.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Tf/TemplateString.cpp
diff --git a/pxr/base/tf/templateString.h b/pxr/base/tf/templateString.h
index 48bfaa7ed1..b19a614b16 100644
--- a/pxr/base/tf/templateString.h
+++ b/pxr/base/tf/templateString.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_TEMPLATE_STRING_H
 #define PXR_BASE_TF_TEMPLATE_STRING_H
diff --git a/pxr/base/tf/testenv/SIGFPE.cpp b/pxr/base/tf/testenv/SIGFPE.cpp
index d87ffcb82e..8140b015db 100644
--- a/pxr/base/tf/testenv/SIGFPE.cpp
+++ b/pxr/base/tf/testenv/SIGFPE.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/SIGSEGV.cpp b/pxr/base/tf/testenv/SIGSEGV.cpp
index 73a682dc4d..3259cf2beb 100644
--- a/pxr/base/tf/testenv/SIGSEGV.cpp
+++ b/pxr/base/tf/testenv/SIGSEGV.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/SIGSEGV2.cpp b/pxr/base/tf/testenv/SIGSEGV2.cpp
index d8006fc24b..e657cf578f 100644
--- a/pxr/base/tf/testenv/SIGSEGV2.cpp
+++ b/pxr/base/tf/testenv/SIGSEGV2.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/TestTfDl.cpp b/pxr/base/tf/testenv/TestTfDl.cpp
index c5a9167dc1..c3e83160b9 100644
--- a/pxr/base/tf/testenv/TestTfDl.cpp
+++ b/pxr/base/tf/testenv/TestTfDl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 //
 // This is a dummy shared library whose only purpose in life is to
diff --git a/pxr/base/tf/testenv/TestTfRegistryFunctionPlugin.cpp b/pxr/base/tf/testenv/TestTfRegistryFunctionPlugin.cpp
index 990634f7e1..d6a5ce9d03 100644
--- a/pxr/base/tf/testenv/TestTfRegistryFunctionPlugin.cpp
+++ b/pxr/base/tf/testenv/TestTfRegistryFunctionPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 //
 // Shared library with a registry function.
diff --git a/pxr/base/tf/testenv/TfPyDllLinkTestEnv/testTfPyDllLinkModule/__init__.py b/pxr/base/tf/testenv/TfPyDllLinkTestEnv/testTfPyDllLinkModule/__init__.py
index 7b302587dd..ac7bd21138 100644
--- a/pxr/base/tf/testenv/TfPyDllLinkTestEnv/testTfPyDllLinkModule/__init__.py
+++ b/pxr/base/tf/testenv/TfPyDllLinkTestEnv/testTfPyDllLinkModule/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/base/tf/testenv/__init__.py b/pxr/base/tf/testenv/__init__.py
index fdfe354da0..cd5ffdf2ae 100644
--- a/pxr/base/tf/testenv/__init__.py
+++ b/pxr/base/tf/testenv/__init__.py
@@ -1,24 +1,7 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
diff --git a/pxr/base/tf/testenv/anyUniquePtr.cpp b/pxr/base/tf/testenv/anyUniquePtr.cpp
index a957669acf..70a71da63c 100644
--- a/pxr/base/tf/testenv/anyUniquePtr.cpp
+++ b/pxr/base/tf/testenv/anyUniquePtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/anyUniquePtr.h"
diff --git a/pxr/base/tf/testenv/atomicOfstreamWrapper.cpp b/pxr/base/tf/testenv/atomicOfstreamWrapper.cpp
index 8205b74862..e175eeb3d7 100644
--- a/pxr/base/tf/testenv/atomicOfstreamWrapper.cpp
+++ b/pxr/base/tf/testenv/atomicOfstreamWrapper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file test/atomicOfstreamWrapper.cpp
diff --git a/pxr/base/tf/testenv/bitUtils.cpp b/pxr/base/tf/testenv/bitUtils.cpp
index 5381ea8d3c..7355df13f7 100644
--- a/pxr/base/tf/testenv/bitUtils.cpp
+++ b/pxr/base/tf/testenv/bitUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/debug.cpp b/pxr/base/tf/testenv/debug.cpp
index aa3ecf7d09..b0f94388ce 100644
--- a/pxr/base/tf/testenv/debug.cpp
+++ b/pxr/base/tf/testenv/debug.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/testenv/delegate.cpp b/pxr/base/tf/testenv/delegate.cpp
index e26b8b5a00..b18c23bdd5 100644
--- a/pxr/base/tf/testenv/delegate.cpp
+++ b/pxr/base/tf/testenv/delegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/delegatedCountPtr.cpp b/pxr/base/tf/testenv/delegatedCountPtr.cpp
index d5cdff76e5..0fd5499c66 100644
--- a/pxr/base/tf/testenv/delegatedCountPtr.cpp
+++ b/pxr/base/tf/testenv/delegatedCountPtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/denseHashMap.cpp b/pxr/base/tf/testenv/denseHashMap.cpp
index dd352523bc..09394738da 100644
--- a/pxr/base/tf/testenv/denseHashMap.cpp
+++ b/pxr/base/tf/testenv/denseHashMap.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/dl.cpp b/pxr/base/tf/testenv/dl.cpp
index ec9f9c1549..c817cb2689 100644
--- a/pxr/base/tf/testenv/dl.cpp
+++ b/pxr/base/tf/testenv/dl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/enum.cpp b/pxr/base/tf/testenv/enum.cpp
index d903f8fec9..bc2e250b76 100644
--- a/pxr/base/tf/testenv/enum.cpp
+++ b/pxr/base/tf/testenv/enum.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/testenv/envSetting.cpp b/pxr/base/tf/testenv/envSetting.cpp
index 805759c409..bd1f71f8ba 100644
--- a/pxr/base/tf/testenv/envSetting.cpp
+++ b/pxr/base/tf/testenv/envSetting.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/diagnosticLite.h"
diff --git a/pxr/base/tf/testenv/error.cpp b/pxr/base/tf/testenv/error.cpp
index e8eed44a4d..79cbfee5ff 100644
--- a/pxr/base/tf/testenv/error.cpp
+++ b/pxr/base/tf/testenv/error.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
@@ -29,7 +12,7 @@
 
 #include "pxr/base/arch/functionLite.h"
 
-#include <tbb/tbb_thread.h>
+#include <thread>
 
 #define FILENAME   "error.cpp"
 
@@ -195,7 +178,7 @@ Test_TfErrorThreadTransport()
     printf("Creating TfErrorMark\n");
     TfErrorMark m;
     printf("Launching thread\n");
-    tbb::tbb_thread t([&transport]() { _ThreadTask(&transport); });
+    std::thread t([&transport]() { _ThreadTask(&transport); });
     TF_AXIOM(m.IsClean());
     t.join();
     printf("Thread completed, posting error.\n");
diff --git a/pxr/base/tf/testenv/exception.cpp b/pxr/base/tf/testenv/exception.cpp
index 7e56c3f74c..77e60d8081 100644
--- a/pxr/base/tf/testenv/exception.cpp
+++ b/pxr/base/tf/testenv/exception.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/exception.h"
diff --git a/pxr/base/tf/testenv/fastCompression.cpp b/pxr/base/tf/testenv/fastCompression.cpp
index 7525e0fd2a..eaadaebc83 100644
--- a/pxr/base/tf/testenv/fastCompression.cpp
+++ b/pxr/base/tf/testenv/fastCompression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/fileUtils.cpp b/pxr/base/tf/testenv/fileUtils.cpp
index 96c17d7bd4..7ac8414f29 100644
--- a/pxr/base/tf/testenv/fileUtils.cpp
+++ b/pxr/base/tf/testenv/fileUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/errorMark.h"
diff --git a/pxr/base/tf/testenv/functionRef.cpp b/pxr/base/tf/testenv/functionRef.cpp
index aee75461f3..ca24d6c28d 100644
--- a/pxr/base/tf/testenv/functionRef.cpp
+++ b/pxr/base/tf/testenv/functionRef.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/getenv.cpp b/pxr/base/tf/testenv/getenv.cpp
index 995958d142..494ae9169e 100644
--- a/pxr/base/tf/testenv/getenv.cpp
+++ b/pxr/base/tf/testenv/getenv.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/hash.cpp b/pxr/base/tf/testenv/hash.cpp
index 6c071b81c6..d14f2308ec 100644
--- a/pxr/base/tf/testenv/hash.cpp
+++ b/pxr/base/tf/testenv/hash.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/hash.h"
diff --git a/pxr/base/tf/testenv/iterator.cpp b/pxr/base/tf/testenv/iterator.cpp
index c2e60137dc..f93a962b38 100644
--- a/pxr/base/tf/testenv/iterator.cpp
+++ b/pxr/base/tf/testenv/iterator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/testenv/main.cpp b/pxr/base/tf/testenv/main.cpp
index 2664bce54a..11025b6787 100644
--- a/pxr/base/tf/testenv/main.cpp
+++ b/pxr/base/tf/testenv/main.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/testenv/mallocTag.cpp b/pxr/base/tf/testenv/mallocTag.cpp
index df98a31708..be6aa3a3fa 100644
--- a/pxr/base/tf/testenv/mallocTag.cpp
+++ b/pxr/base/tf/testenv/mallocTag.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/diagnosticLite.h"
diff --git a/pxr/base/tf/testenv/meta.cpp b/pxr/base/tf/testenv/meta.cpp
index eefe776c29..f3207dbd87 100644
--- a/pxr/base/tf/testenv/meta.cpp
+++ b/pxr/base/tf/testenv/meta.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/notice.cpp b/pxr/base/tf/testenv/notice.cpp
index 797052eacc..3db99a41bc 100644
--- a/pxr/base/tf/testenv/notice.cpp
+++ b/pxr/base/tf/testenv/notice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/testenv/pathUtils.cpp b/pxr/base/tf/testenv/pathUtils.cpp
index 1a1f84d702..e95161280e 100644
--- a/pxr/base/tf/testenv/pathUtils.cpp
+++ b/pxr/base/tf/testenv/pathUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/diagnosticLite.h"
@@ -103,17 +86,6 @@ TestTfRealPath()
     }
 
     if (testSymlinks) {
-#if defined(ARCH_OS_WINDOWS)
-        // On Windows, TfRealPath explicitly lower-cases drive letters if the given path contains symlinks,
-        // otherwise it returns the same as os.path.abspath.
-        // This is inconsistent, using TfNormPath to test the current behavior.
-        // Leaf dir is symlink
-        TF_AXIOM(TfNormPath(TfRealPath("d", true)) == TfNormPath(TfAbsPath("subdir")));
-        // Symlinks through to dir
-        TF_AXIOM(TfNormPath(TfRealPath("d/e", true)) == TfNormPath(TfAbsPath("subdir/e")));
-        // Symlinks through to nonexistent dirs
-        TF_AXIOM(TfNormPath(TfRealPath("d/e/f/g/h", true)) == TfNormPath(TfAbsPath("subdir/e/f/g/h")));
-#else
         // Leaf dir is symlink
         TF_AXIOM(TfRealPath("d", true) == TfAbsPath("subdir"));
         // Symlinks through to dir
@@ -121,8 +93,6 @@ TestTfRealPath()
         // Symlinks through to nonexistent dirs
         TF_AXIOM(TfRealPath("d/e/f/g/h", true) == TfAbsPath("subdir/e/f/g/h"));
         // Symlinks through to broken link
-#endif
-        // Symlinks through to broken link
         TF_AXIOM(TfRealPath("g", true) == "");
     }
 
@@ -142,7 +112,7 @@ TestTfRealPath()
     }
 
 #if defined(ARCH_OS_WINDOWS)
-    string thisdir = TfNormPath(TfRealPath("."));
+    string thisdir = TfRealPath(".");
     // This directory on Windows should start with a drive letter.
     TF_AXIOM(thisdir.length() > 2 && thisdir[1] == ':');
     // Strip off the drive letter, leaving a path that starts with a slash,
@@ -150,7 +120,7 @@ TestTfRealPath()
     // (because of the "current drive" concept in Windows).
     string testdir = thisdir;
     testdir.erase(0, 2);
-    TF_AXIOM(TfNormPath(TfRealPath(testdir)) == thisdir);
+    TF_AXIOM(TfRealPath(testdir) == thisdir);
     if (testSymlinks) {
         // Call Windows function to change the current working directory to
         // put us inside a directory that is a symlink. Then validate that
@@ -159,17 +129,17 @@ TestTfRealPath()
         ::SetCurrentDirectory("b");
         string thissubdir = thisdir;
         thissubdir += "/subdir";
-        TF_AXIOM(TfNormPath(TfRealPath(".")) == thissubdir);
+        TF_AXIOM(TfRealPath(".") == thissubdir);
         ::SetCurrentDirectory("..");
         // Then from outside the directory, validate that the more indirect
         // symlink (d->c->b->subdir) also resolves properly. We can't actually
         // "cd" to "d", because it isn't configured as a "directory" symlink.
         string testsubdir = thisdir;
         testsubdir += "/d";
-        TF_AXIOM(TfNormPath(TfRealPath(testsubdir)) == thissubdir);
+        TF_AXIOM(TfRealPath(testsubdir) == thissubdir);
         // Test the more direct and indirect symlinks as relative paths.
-        TF_AXIOM(TfNormPath(TfRealPath("b")) == thissubdir);
-        TF_AXIOM(TfNormPath(TfRealPath("d")) == thissubdir);
+        TF_AXIOM(TfRealPath("b") == thissubdir);
+        TF_AXIOM(TfRealPath("d") == thissubdir);
     }
 #endif
 
diff --git a/pxr/base/tf/testenv/patternMatcher.cpp b/pxr/base/tf/testenv/patternMatcher.cpp
index a477d967a9..9e5d6c6ec6 100644
--- a/pxr/base/tf/testenv/patternMatcher.cpp
+++ b/pxr/base/tf/testenv/patternMatcher.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/patternMatcher.h"
diff --git a/pxr/base/tf/testenv/pointerAndBits.cpp b/pxr/base/tf/testenv/pointerAndBits.cpp
index e097d83d5e..7782a7607e 100644
--- a/pxr/base/tf/testenv/pointerAndBits.cpp
+++ b/pxr/base/tf/testenv/pointerAndBits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/diagnosticLite.h"
diff --git a/pxr/base/tf/testenv/preprocessorUtilsLite.cpp b/pxr/base/tf/testenv/preprocessorUtilsLite.cpp
index df1b1fc69b..a4ffcb62cd 100644
--- a/pxr/base/tf/testenv/preprocessorUtilsLite.cpp
+++ b/pxr/base/tf/testenv/preprocessorUtilsLite.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define TF_MAX_ARITY 24
 
diff --git a/pxr/base/tf/testenv/probe.cpp b/pxr/base/tf/testenv/probe.cpp
index 7d05f5cfa3..d63c729982 100644
--- a/pxr/base/tf/testenv/probe.cpp
+++ b/pxr/base/tf/testenv/probe.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/refPtr.cpp b/pxr/base/tf/testenv/refPtr.cpp
index 2d84c37238..87991fea46 100644
--- a/pxr/base/tf/testenv/refPtr.cpp
+++ b/pxr/base/tf/testenv/refPtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/testenv/registryManager.cpp b/pxr/base/tf/testenv/registryManager.cpp
index b82feeb0ba..e03a6132e9 100644
--- a/pxr/base/tf/testenv/registryManager.cpp
+++ b/pxr/base/tf/testenv/registryManager.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/registryManagerUnload.cpp b/pxr/base/tf/testenv/registryManagerUnload.cpp
index 5b0b198be2..7f844964a5 100644
--- a/pxr/base/tf/testenv/registryManagerUnload.cpp
+++ b/pxr/base/tf/testenv/registryManagerUnload.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/rwMutexes.cpp b/pxr/base/tf/testenv/rwMutexes.cpp
index 6070bdc417..993c27b0a1 100644
--- a/pxr/base/tf/testenv/rwMutexes.cpp
+++ b/pxr/base/tf/testenv/rwMutexes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/safeOutputFile.cpp b/pxr/base/tf/testenv/safeOutputFile.cpp
index ceb4b672e4..a52c1bb242 100644
--- a/pxr/base/tf/testenv/safeOutputFile.cpp
+++ b/pxr/base/tf/testenv/safeOutputFile.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file test/safeOutputFile.cpp
diff --git a/pxr/base/tf/testenv/scopeDescription.cpp b/pxr/base/tf/testenv/scopeDescription.cpp
index 2103047938..a67334f2b8 100644
--- a/pxr/base/tf/testenv/scopeDescription.cpp
+++ b/pxr/base/tf/testenv/scopeDescription.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/scoped.cpp b/pxr/base/tf/testenv/scoped.cpp
index d5eeca97f7..30ab5bf0cb 100644
--- a/pxr/base/tf/testenv/scoped.cpp
+++ b/pxr/base/tf/testenv/scoped.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/testenv/setenv.cpp b/pxr/base/tf/testenv/setenv.cpp
index a3c3cdc9a8..ebdee75b2c 100644
--- a/pxr/base/tf/testenv/setenv.cpp
+++ b/pxr/base/tf/testenv/setenv.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/smallVector.cpp b/pxr/base/tf/testenv/smallVector.cpp
index 645c139f5f..5825ed7718 100644
--- a/pxr/base/tf/testenv/smallVector.cpp
+++ b/pxr/base/tf/testenv/smallVector.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/smallVector.h"
@@ -997,7 +980,7 @@ testInsertionTrivial()
             if (a.capacity() > 4*numInsertedElems*(i+1)) {
                 TF_FATAL_ERROR(
                     "Capacity too large; after %d insertions of %zu elements, "
-                    "vector has size %u and capacity %u",
+                    "vector has size %zu and capacity %zu",
                     i+1, numInsertedElems, a.size(), a.capacity());
             }
         }
diff --git a/pxr/base/tf/testenv/stacked.cpp b/pxr/base/tf/testenv/stacked.cpp
index b618c95a9e..1d6a966c2e 100644
--- a/pxr/base/tf/testenv/stacked.cpp
+++ b/pxr/base/tf/testenv/stacked.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/staticData.cpp b/pxr/base/tf/testenv/staticData.cpp
index eb940a7719..71173c3911 100644
--- a/pxr/base/tf/testenv/staticData.cpp
+++ b/pxr/base/tf/testenv/staticData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/staticTokens.cpp b/pxr/base/tf/testenv/staticTokens.cpp
index 584c75752a..34207420c7 100644
--- a/pxr/base/tf/testenv/staticTokens.cpp
+++ b/pxr/base/tf/testenv/staticTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/export.h"
diff --git a/pxr/base/tf/testenv/stl.cpp b/pxr/base/tf/testenv/stl.cpp
index f7c264b2d7..62c33a193c 100644
--- a/pxr/base/tf/testenv/stl.cpp
+++ b/pxr/base/tf/testenv/stl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/stopwatch.cpp b/pxr/base/tf/testenv/stopwatch.cpp
index 6e6214504a..553e71be42 100644
--- a/pxr/base/tf/testenv/stopwatch.cpp
+++ b/pxr/base/tf/testenv/stopwatch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/stringUtils.cpp b/pxr/base/tf/testenv/stringUtils.cpp
index 7b27665941..975d59885f 100644
--- a/pxr/base/tf/testenv/stringUtils.cpp
+++ b/pxr/base/tf/testenv/stringUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/diagnosticLite.h"
diff --git a/pxr/base/tf/testenv/templateString.cpp b/pxr/base/tf/testenv/templateString.cpp
index 69269dcac8..429b2c29fe 100644
--- a/pxr/base/tf/testenv/templateString.cpp
+++ b/pxr/base/tf/testenv/templateString.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/errorMark.h"
diff --git a/pxr/base/tf/testenv/testTfCast.cpp b/pxr/base/tf/testenv/testTfCast.cpp
index 1f31c362f9..6bf649c4c2 100644
--- a/pxr/base/tf/testenv/testTfCast.cpp
+++ b/pxr/base/tf/testenv/testTfCast.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/cxxCast.h"
diff --git a/pxr/base/tf/testenv/testTfCrashHandler.py b/pxr/base/tf/testenv/testTfCrashHandler.py
index 6ce7e6aec3..8a9ecfc9de 100644
--- a/pxr/base/tf/testenv/testTfCrashHandler.py
+++ b/pxr/base/tf/testenv/testTfCrashHandler.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/base/tf/testenv/testTfFileUtils.py b/pxr/base/tf/testenv/testTfFileUtils.py
index 07de81f42d..40623939b2 100644
--- a/pxr/base/tf/testenv/testTfFileUtils.py
+++ b/pxr/base/tf/testenv/testTfFileUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/base/tf/testenv/testTfMallocTagReport.py b/pxr/base/tf/testenv/testTfMallocTagReport.py
new file mode 100644
index 0000000000..b906d8aea3
--- /dev/null
+++ b/pxr/base/tf/testenv/testTfMallocTagReport.py
@@ -0,0 +1,282 @@
+#!/pxrpythonsubst
+#
+# Copyright 2024 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+from pxr import Tf
+
+import contextlib
+import dataclasses
+import os
+import tempfile
+import textwrap
+from typing import Generator, List, Tuple
+import unittest
+
+@contextlib.contextmanager
+def MallocTagTextFile(contents: str) -> Generator[str, None, None]:
+    """
+    Context object which returns the filepath of a temporary file that contains
+    the given contents.
+    """
+
+    # Note that Windows has a strict file locking policy which prevents us from
+    # having multiple handles into the same file. To workaround this, close out
+    # our handle to it before yielding the path, and manually clean it up when 
+    # we're done.
+    try:
+        with tempfile.NamedTemporaryFile(
+            suffix=".mallocTag", mode="w+", delete=False) as tmp:
+            tmp.write(contents)
+            tmp.flush()
+        yield tmp.name
+    finally:
+        os.remove(tmp.name)
+
+@dataclasses.dataclass
+class NodeData:
+    """
+    A simple dataclass for verifying malloc tag trees.
+    """
+    key: str
+    inclusive: int
+    exclusive: int
+    samples: int
+    children: List["NodeData"] = dataclasses.field(default_factory=list)
+
+def GetNodeDataTree(tree: Tf.MallocTag.CallTree):
+    def _GetNodeDataTree(node: Tf.MallocTag.CallTree.PathNode):
+        """
+        Convert a MallocTag CallTree into a NodeData tree.
+        """
+        nodeData = NodeData(
+            node.siteName, node.nBytes, node.nBytesDirect, node.nAllocations)
+        for child in node.GetChildren():
+            nodeData.children.append(_GetNodeDataTree(child))
+        return nodeData
+    return _GetNodeDataTree(tree.GetRoot())
+
+
+def BuildNodeDataTree(data: List[Tuple[int, int, int, str]]):
+    """
+    Convenience class for converting a list of tuples into a NodeData tree.
+
+    Each item in the list must contain, in order:
+        inclusive time, exclusive time, samples, and indented tag
+
+    The number of leading spaces / 2 in the indented tag indicates the depth of
+    that node.
+
+    The returned tree will be rooted under a node named "root."
+
+    For example,
+
+    BuildNodeDataTree([
+        # incl    excl    samp  indent+tag
+        ( 251109,      0,  0,   "__root"),
+        (   1803,   1803,  0,   "  AfPallette"),
+        ( 242760,      0,  0,   "  Aui"),
+        (   9776,   9776,  0,   "    AuiIconManager::_GetIcon"),
+        ( 232984,      0,  0,   "    Aui"),
+        ( 232984, 232984,  0,   "      AuiIconManager::_LoadPixmaps"),
+        (   3573,      0,  0,   "  Browserq"),
+        (    600,    600,  0,   "    BrowserqPrimDataSource::_GetChildren"),
+        (   2973,   2973,  0,   "  BrowserqPalette")])
+    """
+
+    root = None
+    stack = []
+
+    for (incl, excl, samples, depthAndKey) in data:
+        key = depthAndKey.lstrip()
+        depth = (len(depthAndKey) - len(key))/2
+        nodeData = NodeData(key, incl, excl, samples)
+
+        if not root:
+            root = nodeData
+            stack.append(nodeData)
+            continue
+
+        # Pop the stack to get the parent
+        while len(stack) > depth:
+            stack.pop()
+        parent = stack[-1]
+        parent.children.append(nodeData)
+        stack.append(nodeData)
+
+    return root
+
+class TestMallocTagReporterLoadMallocTag(unittest.TestCase):
+    def AssertNodeTreesEqual(self, 
+        rootA: NodeData,
+        rootB: NodeData):
+        """
+        Compare two NodeData trees.
+        """
+        self.assertEqual(rootA.key, rootB.key, 
+            msg="keys are different")
+        self.assertEqual(rootA.inclusive, rootB.inclusive,
+            msg=f"{rootA.key}: inclusive memory is different")
+        self.assertEqual(rootA.exclusive, rootB.exclusive,
+            msg=f"{rootA.key}: exclusive memory is different")
+        self.assertEqual(rootA.samples, rootB.samples,
+            msg=f"{rootA.key}: sample counts are different")
+        self.assertEqual(len(rootA.children), len(rootB.children), 
+            msg=f"{rootA.key}: child counts are different")
+
+        for childA, childB in zip(rootA.children, rootB.children):
+            self.AssertNodeTreesEqual(childA, childB)
+
+    def AssertRoundTripValid(self, parsed: Tf.MallocTag.CallTree):
+        """
+        Take an already parsed report, write it to a temporary file, and then 
+        re-parse it.
+
+        This will verify that the re-parsed report is identical to the first 
+        parsed report, which will ensure that saving and loading are consistent.
+        """
+
+        with MallocTagTextFile("") as filepath:
+            parsed.Report(filepath)
+
+            with open(filepath, 'r') as file:
+                print(f"Saved report for {self.id().split('.')[-1]}:")
+                print(file.read())
+
+            newParsed = Tf.MallocTag.GetCallTree()
+            self.assertTrue(newParsed.LoadReport(filepath))
+
+            self.AssertNodeTreesEqual(
+                GetNodeDataTree(parsed), GetNodeDataTree(newParsed))
+
+    def test_Basic(self):
+        """
+        Test that a basic malloc tag report text file can be parsed.
+        """
+        trace = MallocTagTextFile(textwrap.dedent("""
+        Tree view  ==============
+              inclusive       exclusive
+            2,952 B         1,232 B      20 samples    __root
+              432 B             0 B       0 samples    | Csd
+              176 B            64 B       2 samples    |   CsdAttribute::_New
+              112 B             0 B       0 samples    |   | Csd
+               88 B            88 B       1 samples    |   |   CsdProperty
+               24 B            24 B       1 samples    |   |   Csd_Identity::New
+               16 B            16 B       1 samples    |   CsdBase::_GetRemnantForHandles
+              112 B           112 B       1 samples    |   CsdScene::_GetComposedSymmetryData
+               96 B            96 B       3 samples    |   CsdScene::_PopulateComposedPropertyCache
+               32 B            32 B       1 samples    |   Csd_PrimCache
+            1,288 B             0 B       0 samples    | Did
+              120 B           120 B       1 samples    |   DidArena::_NewState(inverse, inverseTag)
+            1,168 B           992 B       7 samples    |   DidManager::AddLogMessage
+              176 B             0 B       0 samples    |   | Did
+              176 B           176 B       2 samples    |   |   DidManager::_BeginInteraction
+        """))
+        with trace as filepath:
+            parsed = Tf.MallocTag.GetCallTree()
+            self.assertTrue(parsed.LoadReport(filepath))
+            parsed.Report()
+
+            # Spot test to make sure we read in the report correctly.
+            root = parsed.GetRoot()
+            self.assertEqual(len(root.GetChildren()), 2)
+            self.assertEqual(root.nBytes, 2952)
+
+        expected = BuildNodeDataTree([
+            # incl  excl samp indent+tag
+            ( 2952, 1232, 20, "__root"),
+            (  432,    0,  0, "  Csd"),
+            (  176,   64,  2, "    CsdAttribute::_New"),
+            (  112,    0,  0, "      Csd"),
+            (   88,   88,  1, "        CsdProperty"),
+            (   24,   24,  1, "        Csd_Identity::New"),
+            (   16,   16,  1, "    CsdBase::_GetRemnantForHandles"),
+            (  112,  112,  1, "    CsdScene::_GetComposedSymmetryData"),
+            (   96,   96,  3, "    CsdScene::_PopulateComposedPropertyCache"),
+            (   32,   32,  1, "    Csd_PrimCache"),
+            ( 1288,    0,  0, "  Did"),
+            (  120,  120,  1, "    DidArena::_NewState(inverse, inverseTag)"),
+            ( 1168,  992,  7, "    DidManager::AddLogMessage"),
+            (  176,    0,  0, "      Did"),
+            (  176,  176,  2, "        DidManager::_BeginInteraction")])
+
+        self.AssertNodeTreesEqual(expected, GetNodeDataTree(parsed))
+        self.AssertRoundTripValid(parsed)
+
+    def test_MultipleTrees(self):
+        """
+        Test reading a report that contains multiple malloc tag report trees.
+        """
+
+        # Load a report with more than one tree.
+        #
+        # Note that the trees have to be sorted by descending inclusive memory
+        # in order for the test to work because that's how we sort when
+        # reporting.
+        trace = MallocTagTextFile(textwrap.dedent("""
+            Tree view  ==============
+                  inclusive       exclusive
+              297,871,934 B   283,163,709 B 1063871 samples    mem_after_activate
+                    1,803 B         1,803 B      27 samples    | AfPalette
+               13,218,646 B             0 B       0 samples    | Aui
+               13,218,646 B        29,480 B     283 samples    |   AuiIconManager::_GetIcon
+               13,189,166 B    13,189,166 B    1195 samples    |   | AuiIconManager::_LoadPixmaps
+                    2,080 B             0 B       0 samples    | Browserq
+                    2,080 B         2,080 B      39 samples    |   BrowserqPrimDataSource::_GetChildren
+                    2,973 B         2,973 B      38 samples    | BrowserqPalette
+                1,482,723 B             0 B       0 samples    | Cmd
+                1,482,723 B     1,482,723 B   21068 samples    |   CmdRegistry::CreateCommand
+
+            --------------------------------------------------------------------------------
+
+            Malloc Tag Report
+
+
+            Total bytes = 564,840,530
+
+
+            Runner Info: > TestOpenShot
+
+            Tree view  ==============
+                  inclusive       exclusive
+              108,248,789 B    94,582,913 B  517043 samples    mem_after_instantiate
+                    1,803 B         1,803 B      27 samples    | AfPalette
+               12,181,350 B             0 B       0 samples    | Aui
+               12,181,350 B        27,824 B     253 samples    |   AuiIconManager::_GetIcon
+               12,153,526 B    12,153,526 B    1189 samples    |   | AuiIconManager::_LoadPixmaps
+                1,482,723 B             0 B       0 samples    | Cmd
+                1,482,723 B     1,482,723 B   21068 samples    |   CmdRegistry::CreateCommand
+
+            --------------------------------------------------------------------------------
+
+            Malloc Tag Report
+
+
+            Total bytes = 3,410,460,789
+            """))
+        with trace as filepath:
+            parsed = Tf.MallocTag.GetCallTree()
+            self.assertTrue(parsed.LoadReport(filepath))
+            self.AssertRoundTripValid(parsed)
+
+            # Spot test to make sure we read in the trees correctly.
+            rootChildren = parsed.GetRoot().GetChildren()
+            self.assertEqual(len(rootChildren), 2)
+            self.assertEqual(rootChildren[0].nBytes, 297871934)
+            self.assertEqual(rootChildren[1].nBytes, 108248789)
+
+    def test_Errors(self):
+        """
+        Test error conditions.
+        """
+
+        # Attempt to load a report with a path to a file that doesn't exist.
+        with self.assertRaises(Tf.ErrorException):
+            parsed = Tf.MallocTag.GetCallTree()
+            self.assertFalse(parsed.LoadReport("bad_file_path"))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/pxr/base/tf/testenv/testTfNamedTemporaryFile.py b/pxr/base/tf/testenv/testTfNamedTemporaryFile.py
index 4a7d51a387..af62626088 100644
--- a/pxr/base/tf/testenv/testTfNamedTemporaryFile.py
+++ b/pxr/base/tf/testenv/testTfNamedTemporaryFile.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 """
diff --git a/pxr/base/tf/testenv/testTfPathUtils.py b/pxr/base/tf/testenv/testTfPathUtils.py
index 2a30928490..647135dd9f 100644
--- a/pxr/base/tf/testenv/testTfPathUtils.py
+++ b/pxr/base/tf/testenv/testTfPathUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import logging
@@ -55,29 +38,17 @@ def test_TfRealPath(self):
                 if not os.path.islink('g'):
                     os.symlink('f', 'g')
 
-                # XXX:
-                # On Windows, TfRealPath explicitly lower-cases drive letters
-                # if the given path contains symlinks, otherwise it returns
-                # the same as os.path.abspath. This is inconsistent but
-                # fixing it is a bit riskier. So for now, we just test the
-                # the current behavior.
-                def _TestSymlink(expected, got):
-                    if platform.system() == 'Windows':
-                        drive, tail = os.path.splitdrive(expected)
-                        expected = drive.lower() + tail
-                    self.assertEqual(expected, got)
-
                 self.log.info('leaf dir is symlink')
-                _TestSymlink(os.path.abspath('subdir'),
+                self.assertEqual(os.path.abspath('subdir'),
                              Tf.RealPath('d', True))
                 self.log.info('symlinks through to dir')
-                _TestSymlink(os.path.abspath('subdir/e'),
+                self.assertEqual(os.path.abspath('subdir/e'),
                              Tf.RealPath('d/e', True))
                 self.log.info('symlinks through to nonexistent dirs')
-                _TestSymlink(os.path.abspath('subdir/e/f/g/h'),
+                self.assertEqual(os.path.abspath('subdir/e/f/g/h'),
                              Tf.RealPath('d/e/f/g/h', True))
                 self.log.info('symlinks through to broken link')
-                _TestSymlink('', Tf.RealPath('g', True))
+                self.assertEqual('', Tf.RealPath('g', True))
 
                 self.log.info('symlinks through to broken link, '
                               'raiseOnError=True')
@@ -95,7 +66,7 @@ def _TestSymlink(expected, got):
                             cwd = os.getcwd()
                             try:
                                 os.chdir(r'C:/symlink-test-link')
-                                _TestSymlink(os.path.abspath('C:/symlink-test'),
+                                self.assertEqual(os.path.abspath('C:/symlink-test'),
                                              Tf.RealPath(r'C:/symlink-test-link'))
                             finally:
                                 # Restore cwd before trying to remove the test
diff --git a/pxr/base/tf/testenv/testTfPyDllLink.py b/pxr/base/tf/testenv/testTfPyDllLink.py
index 1d03536ae6..ca9ddd6c68 100644
--- a/pxr/base/tf/testenv/testTfPyDllLink.py
+++ b/pxr/base/tf/testenv/testTfPyDllLink.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import os
diff --git a/pxr/base/tf/testenv/testTfPyDllLinkImplementationBad.cpp b/pxr/base/tf/testenv/testTfPyDllLinkImplementationBad.cpp
index 3fed50d34d..7bfdadcf8f 100644
--- a/pxr/base/tf/testenv/testTfPyDllLinkImplementationBad.cpp
+++ b/pxr/base/tf/testenv/testTfPyDllLinkImplementationBad.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include <cstdio>
diff --git a/pxr/base/tf/testenv/testTfPyDllLinkImplementationGood.cpp b/pxr/base/tf/testenv/testTfPyDllLinkImplementationGood.cpp
index 65524bc4aa..b78b90ebf2 100644
--- a/pxr/base/tf/testenv/testTfPyDllLinkImplementationGood.cpp
+++ b/pxr/base/tf/testenv/testTfPyDllLinkImplementationGood.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include <cstdio>
diff --git a/pxr/base/tf/testenv/testTfPyDllLinkModule.c b/pxr/base/tf/testenv/testTfPyDllLinkModule.c
index 3a3e947cc4..5151e03611 100644
--- a/pxr/base/tf/testenv/testTfPyDllLinkModule.c
+++ b/pxr/base/tf/testenv/testTfPyDllLinkModule.c
@@ -1,25 +1,8 @@
 /*
  * Copyright 2023 Pixar
  *
- * Licensed under the Apache License, Version 2.0 (the "Apache License")
- * with the following modification; you may not use this file except in
- * compliance with the Apache License and the following modification to it:
- * Section 6. Trademarks. is deleted and replaced with:
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- *    names, trademarks, service marks, or product names of the Licensor
- *    and its affiliates, except as required to comply with Section 4(c) of
- *    the License and to reproduce the content of the NOTICE file.
- *
- * You may obtain a copy of the Apache License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Apache License with the above modification is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the Apache License for the specific
- * language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
  */
 
 
diff --git a/pxr/base/tf/testenv/testTfPyFunction.cpp b/pxr/base/tf/testenv/testTfPyFunction.cpp
index b949ac87ec..64f63dcf65 100644
--- a/pxr/base/tf/testenv/testTfPyFunction.cpp
+++ b/pxr/base/tf/testenv/testTfPyFunction.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/testTfPyInterpreter.cpp b/pxr/base/tf/testenv/testTfPyInterpreter.cpp
index f5e7e67bca..af9bd4ea2a 100644
--- a/pxr/base/tf/testenv/testTfPyInterpreter.cpp
+++ b/pxr/base/tf/testenv/testTfPyInterpreter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // testTfPyInterpreter.mm
 
diff --git a/pxr/base/tf/testenv/testTfPyInvoke.cpp b/pxr/base/tf/testenv/testTfPyInvoke.cpp
index 0fa36c2bf8..b60cf564ff 100644
--- a/pxr/base/tf/testenv/testTfPyInvoke.cpp
+++ b/pxr/base/tf/testenv/testTfPyInvoke.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/testTfPyInvoke_callees.py b/pxr/base/tf/testenv/testTfPyInvoke_callees.py
index 580c5064cd..56080a662c 100644
--- a/pxr/base/tf/testenv/testTfPyInvoke_callees.py
+++ b/pxr/base/tf/testenv/testTfPyInvoke_callees.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/base/tf/testenv/testTfPyLock.cpp b/pxr/base/tf/testenv/testTfPyLock.cpp
index 028e9b57c4..0f9d88634c 100644
--- a/pxr/base/tf/testenv/testTfPyLock.cpp
+++ b/pxr/base/tf/testenv/testTfPyLock.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // testTfPyLock.mm
 //
diff --git a/pxr/base/tf/testenv/testTfPyNotice.py b/pxr/base/tf/testenv/testTfPyNotice.py
index 1290288171..45d21c0830 100644
--- a/pxr/base/tf/testenv/testTfPyNotice.py
+++ b/pxr/base/tf/testenv/testTfPyNotice.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/base/tf/testenv/testTfPyOptional.py b/pxr/base/tf/testenv/testTfPyOptional.py
index 31beeb6b86..35e6a94481 100644
--- a/pxr/base/tf/testenv/testTfPyOptional.py
+++ b/pxr/base/tf/testenv/testTfPyOptional.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import sys
 from pxr import Tf
diff --git a/pxr/base/tf/testenv/testTfPyResultConversions.cpp b/pxr/base/tf/testenv/testTfPyResultConversions.cpp
index ae58afe0dd..40ff6b853b 100644
--- a/pxr/base/tf/testenv/testTfPyResultConversions.cpp
+++ b/pxr/base/tf/testenv/testTfPyResultConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/testTfPyScopeDescription.py b/pxr/base/tf/testenv/testTfPyScopeDescription.py
index 1961be5fc7..59476a460a 100644
--- a/pxr/base/tf/testenv/testTfPyScopeDescription.py
+++ b/pxr/base/tf/testenv/testTfPyScopeDescription.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import sys
diff --git a/pxr/base/tf/testenv/testTfPyStaticTokens.py b/pxr/base/tf/testenv/testTfPyStaticTokens.py
index 3fe710a139..bc8f782f16 100644
--- a/pxr/base/tf/testenv/testTfPyStaticTokens.py
+++ b/pxr/base/tf/testenv/testTfPyStaticTokens.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/base/tf/testenv/testTfPython.py b/pxr/base/tf/testenv/testTfPython.py
index 328c6736bd..2d86bfd0f4 100644
--- a/pxr/base/tf/testenv/testTfPython.py
+++ b/pxr/base/tf/testenv/testTfPython.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
@@ -151,14 +134,81 @@ def test_CppException(self):
             Tf._CallThrowTest(lambda : Tf._ThrowTest('py-to-cpp-to-py'))
         print(cm.exception)
 
-    def test_StaticMethodPosting(self):
-        with self.assertRaises(Tf.ErrorException):
-            Tf._TestStaticMethodError.Error()
-
+    def test_DiagnosticsFromPython(self):
         Tf.Warn("expected warning, for coverage")
-
         Tf.Status("expected status message, for coverage")
 
+    def test_InvokeWithErrorHandling(self):
+        """Verify that Tf errors emitted from Python-wrapped C++ functions
+        are converted to Python exceptions."""
+        def testClass(cls):
+            with self.assertRaises(Tf.ErrorException):
+                obj = cls()
+
+            with self.assertRaises(Tf.ErrorException):
+                obj = cls("overload")
+
+            with self.assertRaises(Tf.ErrorException):
+                cls.StaticMethod()
+
+            with self.assertRaises(Tf.ErrorException):
+                cls.StaticMethod("overload")
+
+            with self.assertRaises(Tf.ErrorException):
+                cls.ClassMethod()
+
+            with self.assertRaises(Tf.ErrorException):
+                cls.ClassMethod("overload")
+
+            obj = cls.Create()
+
+            with self.assertRaises(Tf.ErrorException):
+                obj.InstanceMethod()
+
+            with self.assertRaises(Tf.ErrorException):
+                obj.InstanceMethod("overload")
+
+            with self.assertRaises(Tf.ErrorException):
+                value = obj.property
+
+            with self.assertRaises(Tf.ErrorException):
+                obj.property = "Set value"
+
+            with self.assertRaises(Tf.ErrorException):
+                value = obj.property_2
+
+            with self.assertRaises(Tf.ErrorException):
+                obj.property_2 = "Set value"
+
+            # XXX: 
+            # Methods wrapped as static properties currently do not
+            # translate Tf errors to Python exceptions as expected.
+
+            # with self.assertRaises(Tf.ErrorException):
+            #     value = obj.static_property
+
+            # with self.assertRaises(Tf.ErrorException):
+            #     obj.static_property = "Set value"
+
+            # with self.assertRaises(Tf.ErrorException):
+            #     value = obj.static_property_2
+
+            # with self.assertRaises(Tf.ErrorException):
+            #     obj.static_property_2 = "Set value"
+
+        testClass(Tf._TestErrorClass1)
+        testClass(Tf._TestErrorClass1._TestErrorClass2)
+
+        def testFunction(fn):
+            with self.assertRaises(Tf.ErrorException):
+                fn()
+
+            with self.assertRaises(Tf.ErrorException):
+                fn("overload")
+
+        testFunction(Tf._TestErrorFunction)
+        testFunction(Tf._TestErrorClass1._TestErrorFunction)
+
     def test_NoticeListener(self):
         global noticesHandled
         noticesHandled = 0
diff --git a/pxr/base/tf/testenv/testTfScriptModuleLoader.py b/pxr/base/tf/testenv/testTfScriptModuleLoader.py
index f1c4fe68a3..a88f7a00ce 100644
--- a/pxr/base/tf/testenv/testTfScriptModuleLoader.py
+++ b/pxr/base/tf/testenv/testTfScriptModuleLoader.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/base/tf/testenv/testTfScriptModuleLoader_AAA_RaisesError.py b/pxr/base/tf/testenv/testTfScriptModuleLoader_AAA_RaisesError.py
index 518c055be8..b72a5c27b3 100644
--- a/pxr/base/tf/testenv/testTfScriptModuleLoader_AAA_RaisesError.py
+++ b/pxr/base/tf/testenv/testTfScriptModuleLoader_AAA_RaisesError.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 
diff --git a/pxr/base/tf/testenv/testTfScriptModuleLoader_DepLoadsAll.py b/pxr/base/tf/testenv/testTfScriptModuleLoader_DepLoadsAll.py
index ba65ce9512..a1f0eb7ba8 100644
--- a/pxr/base/tf/testenv/testTfScriptModuleLoader_DepLoadsAll.py
+++ b/pxr/base/tf/testenv/testTfScriptModuleLoader_DepLoadsAll.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 
diff --git a/pxr/base/tf/testenv/testTfScriptModuleLoader_LoadsAll.py b/pxr/base/tf/testenv/testTfScriptModuleLoader_LoadsAll.py
index c4501ebf98..7a5c29020b 100644
--- a/pxr/base/tf/testenv/testTfScriptModuleLoader_LoadsAll.py
+++ b/pxr/base/tf/testenv/testTfScriptModuleLoader_LoadsAll.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 
diff --git a/pxr/base/tf/testenv/testTfScriptModuleLoader_LoadsUnknown.py b/pxr/base/tf/testenv/testTfScriptModuleLoader_LoadsUnknown.py
index a46dd3ed22..f76f9a8d9b 100644
--- a/pxr/base/tf/testenv/testTfScriptModuleLoader_LoadsUnknown.py
+++ b/pxr/base/tf/testenv/testTfScriptModuleLoader_LoadsUnknown.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 
diff --git a/pxr/base/tf/testenv/testTfScriptModuleLoader_Other.py b/pxr/base/tf/testenv/testTfScriptModuleLoader_Other.py
index 640735fa1e..de4b78b161 100644
--- a/pxr/base/tf/testenv/testTfScriptModuleLoader_Other.py
+++ b/pxr/base/tf/testenv/testTfScriptModuleLoader_Other.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 
diff --git a/pxr/base/tf/testenv/testTfScriptModuleLoader_Test.py b/pxr/base/tf/testenv/testTfScriptModuleLoader_Test.py
index a57103d189..05645d5a94 100644
--- a/pxr/base/tf/testenv/testTfScriptModuleLoader_Test.py
+++ b/pxr/base/tf/testenv/testTfScriptModuleLoader_Test.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 pass
 
diff --git a/pxr/base/tf/testenv/testTfScriptModuleLoader_Unknown.py b/pxr/base/tf/testenv/testTfScriptModuleLoader_Unknown.py
index 68148a4655..0bc619009c 100644
--- a/pxr/base/tf/testenv/testTfScriptModuleLoader_Unknown.py
+++ b/pxr/base/tf/testenv/testTfScriptModuleLoader_Unknown.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 
diff --git a/pxr/base/tf/testenv/testTfSpan.cpp b/pxr/base/tf/testenv/testTfSpan.cpp
index 522e5f6fc0..7ab986befa 100644
--- a/pxr/base/tf/testenv/testTfSpan.cpp
+++ b/pxr/base/tf/testenv/testTfSpan.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/testenv/testTfStringUtils.py b/pxr/base/tf/testenv/testTfStringUtils.py
index 9f82db0364..c1a5b6cf2b 100644
--- a/pxr/base/tf/testenv/testTfStringUtils.py
+++ b/pxr/base/tf/testenv/testTfStringUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/base/tf/testenv/testTfTemplateString.py b/pxr/base/tf/testenv/testTfTemplateString.py
index 57fb04aeb9..6c6d0fa227 100644
--- a/pxr/base/tf/testenv/testTfTemplateString.py
+++ b/pxr/base/tf/testenv/testTfTemplateString.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/base/tf/testenv/testTfType.py b/pxr/base/tf/testenv/testTfType.py
index 1eabfafbdb..8654c4f70c 100644
--- a/pxr/base/tf/testenv/testTfType.py
+++ b/pxr/base/tf/testenv/testTfType.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/base/tf/testenv/testTf_PyAnnotatedBoolResult.py b/pxr/base/tf/testenv/testTf_PyAnnotatedBoolResult.py
index bc84eebaba..2eff9ac85a 100644
--- a/pxr/base/tf/testenv/testTf_PyAnnotatedBoolResult.py
+++ b/pxr/base/tf/testenv/testTf_PyAnnotatedBoolResult.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/base/tf/testenv/testTf_PyContainerConversions.py b/pxr/base/tf/testenv/testTf_PyContainerConversions.py
index 694a074d34..4c235ba7b7 100644
--- a/pxr/base/tf/testenv/testTf_PyContainerConversions.py
+++ b/pxr/base/tf/testenv/testTf_PyContainerConversions.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/base/tf/testenv/testTf_PyPtrHolder.py b/pxr/base/tf/testenv/testTf_PyPtrHolder.py
index 8017f4345a..4b9c52573a 100644
--- a/pxr/base/tf/testenv/testTf_PyPtrHolder.py
+++ b/pxr/base/tf/testenv/testTf_PyPtrHolder.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/base/tf/testenv/token.cpp b/pxr/base/tf/testenv/token.cpp
index 6c374a456e..b370fd9d94 100644
--- a/pxr/base/tf/testenv/token.cpp
+++ b/pxr/base/tf/testenv/token.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/testenv/type.cpp b/pxr/base/tf/testenv/type.cpp
index 705edc6acc..a9cc1126e4 100644
--- a/pxr/base/tf/testenv/type.cpp
+++ b/pxr/base/tf/testenv/type.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/declarePtrs.h"
diff --git a/pxr/base/tf/testenv/typeInfoMap.cpp b/pxr/base/tf/testenv/typeInfoMap.cpp
index 253b49e9dd..58d6f40476 100644
--- a/pxr/base/tf/testenv/typeInfoMap.cpp
+++ b/pxr/base/tf/testenv/typeInfoMap.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/typeInfoMap.h"
diff --git a/pxr/base/tf/testenv/typeMultipleInheritance.cpp b/pxr/base/tf/testenv/typeMultipleInheritance.cpp
index 901848cf37..a0d485aee9 100644
--- a/pxr/base/tf/testenv/typeMultipleInheritance.cpp
+++ b/pxr/base/tf/testenv/typeMultipleInheritance.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/type.h"
diff --git a/pxr/base/tf/testenv/unicodeUtils.cpp b/pxr/base/tf/testenv/unicodeUtils.cpp
index 4350e810de..a174998777 100644
--- a/pxr/base/tf/testenv/unicodeUtils.cpp
+++ b/pxr/base/tf/testenv/unicodeUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/diagnosticLite.h"
diff --git a/pxr/base/tf/testenv/weakPtr.cpp b/pxr/base/tf/testenv/weakPtr.cpp
index c7f0dd2e3d..ef3e726d07 100644
--- a/pxr/base/tf/testenv/weakPtr.cpp
+++ b/pxr/base/tf/testenv/weakPtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/regTest.h"
diff --git a/pxr/base/tf/tf.cpp b/pxr/base/tf/tf.cpp
index c547c3bb50..af36198f32 100644
--- a/pxr/base/tf/tf.cpp
+++ b/pxr/base/tf/tf.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/tf.h"
diff --git a/pxr/base/tf/tf.h b/pxr/base/tf/tf.h
index 107dadb23b..e015bc2bc9 100644
--- a/pxr/base/tf/tf.h
+++ b/pxr/base/tf/tf.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_TF_H
 #define PXR_BASE_TF_TF_H
diff --git a/pxr/base/tf/token.cpp b/pxr/base/tf/token.cpp
index c1b87a9430..3c9017cbb8 100644
--- a/pxr/base/tf/token.cpp
+++ b/pxr/base/tf/token.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/token.h b/pxr/base/tf/token.h
index f6fa46e627..c3bc23f19e 100644
--- a/pxr/base/tf/token.h
+++ b/pxr/base/tf/token.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_TOKEN_H
 #define PXR_BASE_TF_TOKEN_H
diff --git a/pxr/base/tf/type.cpp b/pxr/base/tf/type.cpp
index 8533ad6c77..0d3ea4d752 100644
--- a/pxr/base/tf/type.cpp
+++ b/pxr/base/tf/type.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -1236,7 +1219,50 @@ TfType::GetSizeof() const
     return _info->sizeofType;
 }
 
+TfType const &
+TfType::_DeclareImpl(
+    const std::type_info &thisTypeInfo,
+    const std::type_info **baseTypeInfos,
+    size_t numBaseTypes)
+{
+    TfAutoMallocTag2 tag2("Tf", "TfType::Declare");
+
+    // Declare base types.
+    std::vector<TfType> baseTfTypes;
+    baseTfTypes.reserve(numBaseTypes);
+    for (size_t i = 0; i != numBaseTypes; ++i) {
+        baseTfTypes.push_back(Declare(GetCanonicalTypeName(*baseTypeInfos[i])));
+    }
+    
+    // Declare this type.
+    return Declare(GetCanonicalTypeName(thisTypeInfo), baseTfTypes);
+}
 
+TfType const &
+TfType::_DefineImpl(
+    const std::type_info &thisTypeInfo,
+    const std::type_info **baseTypeInfos,
+    _CastFunction *castFunctions,
+    size_t numBaseTypes,
+    size_t sizeofThisType, bool isPod, bool isEnum)
+{
+    TfAutoMallocTag2 tag2("Tf", "TfType::Define");
+
+    // Declare this type.
+    TfType const &newType =
+        _DeclareImpl(thisTypeInfo, baseTypeInfos, numBaseTypes);
+
+    // Record traits information about T.
+    newType._DefineCppType(thisTypeInfo, sizeofThisType, isPod, isEnum);
+
+    // Register casts.
+    for (size_t i = 0; i != numBaseTypes; ++i) {
+        newType._AddCppCastFunc(*baseTypeInfos[i], castFunctions[i]);
+    }
+
+    return newType;
+}
+    
 TF_REGISTRY_FUNCTION(TfType)
 {
     TfType::Define<void>();
diff --git a/pxr/base/tf/type.h b/pxr/base/tf/type.h
index 61240dbcff..9abaeb9b83 100644
--- a/pxr/base/tf/type.h
+++ b/pxr/base/tf/type.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_TYPE_H
 #define PXR_BASE_TF_TYPE_H
@@ -269,7 +252,10 @@ class TfType
 
     /// Return a C++ RTTI type_info for this type.
     ///
-    /// If this type is unknown or has not yet had a C++ type defined,
+    /// If this type is unknown, this will return a unique \c type_info
+    /// specifically for the unknown type.
+    ///
+    /// If this type has been declared, but not yet had a C++ type defined,
     /// \c typeid(void) will be returned.
     ///
     /// \see Define()
@@ -715,6 +701,20 @@ class TfType
                         bool isPodType,
                         bool isEnumType) const;
 
+    TF_API
+    static TfType const &_DeclareImpl(
+        const std::type_info &thisTypeInfo,
+        const std::type_info **baseTypeInfos,
+        size_t numBaseTypes);
+
+    TF_API
+    static TfType const &_DefineImpl(
+        const std::type_info &thisTypeInfo,
+        const std::type_info **baseTypeInfos,
+        _CastFunction *castFunctions,
+        size_t numBaseTypes,
+        size_t sizeofThisType, bool isPod, bool isEnum);
+
     // Execute the definition callback if one exists.
     void _ExecuteDefinitionCallback() const;
 
diff --git a/pxr/base/tf/typeFunctions.cpp b/pxr/base/tf/typeFunctions.cpp
index 640fa2131f..4ef34d1cde 100644
--- a/pxr/base/tf/typeFunctions.cpp
+++ b/pxr/base/tf/typeFunctions.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/typeFunctions.h"
diff --git a/pxr/base/tf/typeFunctions.h b/pxr/base/tf/typeFunctions.h
index 6972423a85..cc84e7f809 100644
--- a/pxr/base/tf/typeFunctions.h
+++ b/pxr/base/tf/typeFunctions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_TYPE_FUNCTIONS_H
 #define PXR_BASE_TF_TYPE_FUNCTIONS_H
diff --git a/pxr/base/tf/typeInfoMap.h b/pxr/base/tf/typeInfoMap.h
index e6ed9d1137..7691354084 100644
--- a/pxr/base/tf/typeInfoMap.h
+++ b/pxr/base/tf/typeInfoMap.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_TYPE_INFO_MAP_H
 #define PXR_BASE_TF_TYPE_INFO_MAP_H
diff --git a/pxr/base/tf/typeNotice.cpp b/pxr/base/tf/typeNotice.cpp
index cb33cd2dd6..beb0f03b31 100644
--- a/pxr/base/tf/typeNotice.cpp
+++ b/pxr/base/tf/typeNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/typeNotice.h b/pxr/base/tf/typeNotice.h
index ef264d5a96..d049397c59 100644
--- a/pxr/base/tf/typeNotice.h
+++ b/pxr/base/tf/typeNotice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_TYPE_NOTICE_H
 #define PXR_BASE_TF_TYPE_NOTICE_H
diff --git a/pxr/base/tf/type_Impl.h b/pxr/base/tf/type_Impl.h
index e5e923a925..3d2d314d25 100644
--- a/pxr/base/tf/type_Impl.h
+++ b/pxr/base/tf/type_Impl.h
@@ -1,107 +1,77 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_TYPE_IMPL_H
 #define PXR_BASE_TF_TYPE_IMPL_H
 
-#include "pxr/base/tf/mallocTag.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 template <class DERIVED, class BASE>
 inline void*
 Tf_CastToParent(void* addr, bool derivedToBase);
 
-// Declare and register casts for all the C++ bases in the given TypeVector.
 template <typename TypeVector>
-struct Tf_AddBases;
+struct Tf_BaseTypeInfos;
+
+template <>
+struct Tf_BaseTypeInfos<TfType::Bases<>>
+{
+    static const size_t NumBases = 0;
+    std::type_info const **baseTypeInfos = nullptr;
+};
 
 template <typename... Bases>
-struct Tf_AddBases<TfType::Bases<Bases...>>
+struct Tf_BaseTypeInfos<TfType::Bases<Bases...>>
 {
-    // Declare types in Bases as TfTypes and accumulate them into a runtime
-    // vector.
-    static std::vector<TfType>
-    Declare()
-    {
-        return std::vector<TfType> {
-            TfType::Declare(
-                TfType::GetCanonicalTypeName( typeid(Bases) ))...
-        };
-    }
+    static const size_t NumBases = sizeof...(Bases);
+    std::type_info const *baseTypeInfos[NumBases] = { &typeid(Bases)... };
+};
 
-    // Register casts to and from Derived and each base type in Bases.
-    template <typename Derived>
-    static void
-    RegisterCasts(TfType const* type)
-    {
-        (type->_AddCppCastFunc(
-            typeid(Bases), &Tf_CastToParent<Derived, Bases>), ...);
-    }
+template <class Derived, typename TypeVector>
+struct Tf_TypeCastFunctions;
+
+template <class Derived>
+struct Tf_TypeCastFunctions<Derived, TfType::Bases<>>
+{
+    using CastFunction = void *(*)(void *, bool);
+    CastFunction *castFunctions = nullptr;
+};
+
+template <class Derived, typename... Bases>
+struct Tf_TypeCastFunctions<Derived, TfType::Bases<Bases...>>
+{
+    using CastFunction = void *(*)(void *, bool);
+    CastFunction castFunctions[sizeof...(Bases)] = {
+        &Tf_CastToParent<Derived, Bases>... };
 };
 
 template <class T, class BaseTypes>
 TfType const &
 TfType::Declare()
 {
-    // Declare each of the base types.
-    std::vector<TfType> baseTfTypes = Tf_AddBases<BaseTypes>::Declare();
-    // Declare our type T.
-    const std::type_info &typeInfo = typeid(T);
-    const std::string typeName = TfType::GetCanonicalTypeName(typeInfo);
-    return TfType::Declare(typeName, baseTfTypes);
+    Tf_BaseTypeInfos<BaseTypes> btis;
+    return _DeclareImpl(typeid(T), btis.baseTypeInfos, btis.NumBases);
 }
 
 template <typename T, typename BaseTypes>
-TfType const&
+TfType const &
 TfType::Define()
 {
-    TfAutoMallocTag2 tag2("Tf", "TfType::Define");
-
-    // Declare each of the base types.
-    std::vector<TfType> baseTfTypes = Tf_AddBases<BaseTypes>::Declare();
-
-    // Declare our type T.
-    const std::type_info &typeInfo = typeid(T);
-    const std::string typeName = TfType::GetCanonicalTypeName(typeInfo);
-    TfType const& newType = TfType::Declare(typeName, baseTfTypes);
-
-    // Record traits information about T.
-    const bool isPodType = std::is_pod<T>::value;
-    const bool isEnumType = std::is_enum<T>::value;
-    const size_t sizeofType = TfSizeofType<T>::value;
-
-    newType._DefineCppType(typeInfo, sizeofType, isPodType, isEnumType);
-    Tf_AddBases<BaseTypes>::template RegisterCasts<T>(&newType);
-
-    return newType;
+    Tf_BaseTypeInfos<BaseTypes> btis;
+    Tf_TypeCastFunctions<T, BaseTypes> tcfs;
+    return _DefineImpl(
+        typeid(T), btis.baseTypeInfos, tcfs.castFunctions, btis.NumBases,
+        TfSizeofType<T>::value, std::is_pod_v<T>, std::is_enum_v<T>);
 }
 
 template <typename T>
 TfType const&
 TfType::Define()
 {
-    return Define<T, Bases<> >();
+    return Define<T, Bases<>>();
 }
 
 // Helper function to implement up/down casts between TfType types.
diff --git a/pxr/base/tf/unicode/tfGenCharacterClasses.py b/pxr/base/tf/unicode/tfGenCharacterClasses.py
index 5e7b340a29..f1e98964e2 100644
--- a/pxr/base/tf/unicode/tfGenCharacterClasses.py
+++ b/pxr/base/tf/unicode/tfGenCharacterClasses.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # A script for generating the character class sets for XID_Start and
 # XID_Continue character classes.  This takes a source UnicodeData.txt
diff --git a/pxr/base/tf/unicode/unicodeCharacterClasses.template.cpp b/pxr/base/tf/unicode/unicodeCharacterClasses.template.cpp
index fed07c5d6e..2cdf80c275 100644
--- a/pxr/base/tf/unicode/unicodeCharacterClasses.template.cpp
+++ b/pxr/base/tf/unicode/unicodeCharacterClasses.template.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/unicodeCharacterClasses.cpp b/pxr/base/tf/unicodeCharacterClasses.cpp
index 5569548731..8771e1f2ff 100644
--- a/pxr/base/tf/unicodeCharacterClasses.cpp
+++ b/pxr/base/tf/unicodeCharacterClasses.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/unicodeCharacterClasses.h b/pxr/base/tf/unicodeCharacterClasses.h
index ad476da79a..fae55234ed 100644
--- a/pxr/base/tf/unicodeCharacterClasses.h
+++ b/pxr/base/tf/unicodeCharacterClasses.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_UNICODE_CHARACTER_CLASSES_H
 #define PXR_BASE_TF_UNICODE_CHARACTER_CLASSES_H
diff --git a/pxr/base/tf/unicodeUtils.cpp b/pxr/base/tf/unicodeUtils.cpp
index 309aa3ec7e..3be38ad582 100644
--- a/pxr/base/tf/unicodeUtils.cpp
+++ b/pxr/base/tf/unicodeUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/diagnostic.h"
diff --git a/pxr/base/tf/unicodeUtils.h b/pxr/base/tf/unicodeUtils.h
index ffeca9ba01..0d8fa18162 100644
--- a/pxr/base/tf/unicodeUtils.h
+++ b/pxr/base/tf/unicodeUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_UNICODE_UTILS_H
 #define PXR_BASE_TF_UNICODE_UTILS_H
diff --git a/pxr/base/tf/warning.cpp b/pxr/base/tf/warning.cpp
index e285b7181d..9964c6a69a 100644
--- a/pxr/base/tf/warning.cpp
+++ b/pxr/base/tf/warning.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/warning.h"
diff --git a/pxr/base/tf/warning.h b/pxr/base/tf/warning.h
index 3195157f90..30888ae7fc 100644
--- a/pxr/base/tf/warning.h
+++ b/pxr/base/tf/warning.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_WARNING_H
 #define PXR_BASE_TF_WARNING_H
diff --git a/pxr/base/tf/weakBase.cpp b/pxr/base/tf/weakBase.cpp
index 96717f2fb8..c05f6082df 100644
--- a/pxr/base/tf/weakBase.cpp
+++ b/pxr/base/tf/weakBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/base/tf/weakBase.h b/pxr/base/tf/weakBase.h
index 68422a0131..1da8ee4865 100644
--- a/pxr/base/tf/weakBase.h
+++ b/pxr/base/tf/weakBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_WEAK_BASE_H
 #define PXR_BASE_TF_WEAK_BASE_H
diff --git a/pxr/base/tf/weakPtr.cpp b/pxr/base/tf/weakPtr.cpp
index 037c299537..29a27e6347 100644
--- a/pxr/base/tf/weakPtr.cpp
+++ b/pxr/base/tf/weakPtr.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/weakPtr.h"
diff --git a/pxr/base/tf/weakPtr.h b/pxr/base/tf/weakPtr.h
index 6ea28f2848..0df2a7ebc7 100644
--- a/pxr/base/tf/weakPtr.h
+++ b/pxr/base/tf/weakPtr.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_WEAK_PTR_H
 #define PXR_BASE_TF_WEAK_PTR_H
diff --git a/pxr/base/tf/weakPtrFacade.cpp b/pxr/base/tf/weakPtrFacade.cpp
index 7de11cd3fe..99a9975799 100644
--- a/pxr/base/tf/weakPtrFacade.cpp
+++ b/pxr/base/tf/weakPtrFacade.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/weakPtrFacade.h"
diff --git a/pxr/base/tf/weakPtrFacade.h b/pxr/base/tf/weakPtrFacade.h
index db3ea1cbf6..33c0b1aa63 100644
--- a/pxr/base/tf/weakPtrFacade.h
+++ b/pxr/base/tf/weakPtrFacade.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_WEAK_PTR_FACADE_H
 #define PXR_BASE_TF_WEAK_PTR_FACADE_H
diff --git a/pxr/base/tf/wrapAnyWeakPtr.cpp b/pxr/base/tf/wrapAnyWeakPtr.cpp
index 60fdffad71..c0ec285ded 100644
--- a/pxr/base/tf/wrapAnyWeakPtr.cpp
+++ b/pxr/base/tf/wrapAnyWeakPtr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/anyWeakPtr.h"
diff --git a/pxr/base/tf/wrapCallContext.cpp b/pxr/base/tf/wrapCallContext.cpp
index 3b9845755f..254cff1d2e 100644
--- a/pxr/base/tf/wrapCallContext.cpp
+++ b/pxr/base/tf/wrapCallContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapDebug.cpp b/pxr/base/tf/wrapDebug.cpp
index a82090d779..607f217031 100644
--- a/pxr/base/tf/wrapDebug.cpp
+++ b/pxr/base/tf/wrapDebug.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/arch/fileSystem.h"
 #include "pxr/base/tf/debug.h"
diff --git a/pxr/base/tf/wrapDiagnostic.cpp b/pxr/base/tf/wrapDiagnostic.cpp
index 6b1af98c3b..f1732dc32c 100644
--- a/pxr/base/tf/wrapDiagnostic.cpp
+++ b/pxr/base/tf/wrapDiagnostic.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/pyEnum.h"
diff --git a/pxr/base/tf/wrapDiagnosticBase.cpp b/pxr/base/tf/wrapDiagnosticBase.cpp
index 43be5cdd45..8eb148a403 100644
--- a/pxr/base/tf/wrapDiagnosticBase.cpp
+++ b/pxr/base/tf/wrapDiagnosticBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapEnum.cpp b/pxr/base/tf/wrapEnum.cpp
index b83bea119a..181f4f7eef 100644
--- a/pxr/base/tf/wrapEnum.cpp
+++ b/pxr/base/tf/wrapEnum.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include "pxr/base/tf/pyEnum.h"
diff --git a/pxr/base/tf/wrapEnvSetting.cpp b/pxr/base/tf/wrapEnvSetting.cpp
index b05b498a69..ca48803c7a 100644
--- a/pxr/base/tf/wrapEnvSetting.cpp
+++ b/pxr/base/tf/wrapEnvSetting.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/base/tf/wrapError.cpp b/pxr/base/tf/wrapError.cpp
index 0af952b289..80ddf2224d 100644
--- a/pxr/base/tf/wrapError.cpp
+++ b/pxr/base/tf/wrapError.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -39,7 +22,6 @@
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/errors.hpp>
-#include <boost/python/raw_function.hpp>
 #include <boost/python/return_by_value.hpp>
 #include <boost/python/return_value_policy.hpp>
 #include <boost/python/scope.hpp>
@@ -92,29 +74,6 @@ _Fatal(string const &msg, string const& moduleName, string const& functionName,
 }
 // CODE_COVERAGE_ON
 
-static handle<>
-_InvokeWithErrorHandling(tuple const &args, dict const &kw)
-{
-    // This function uses basically bare Python C API since it wants to be as
-    // fast as it can be.
-    TfErrorMark m;
-    PyObject *argsp = args.ptr();
-    // first tuple element is the callable.
-    PyObject *callable = PyTuple_GET_ITEM(argsp, 0);
-    // remove callable from positional args.
-    handle<> args_tail(PyTuple_GetSlice(argsp, 1, PyTuple_GET_SIZE(argsp)));
-    // call the callable -- if this raises a python exception, handle<>'s
-    // constructor will throw a c++ exception which will exit this function and
-    // return to python.
-    handle<> ret(PyObject_Call(callable, args_tail.get(), kw.ptr()));
-    // if the call completed successfully, then we need to see if any tf errors
-    // occurred, and if so, convert them to python exceptions.
-    if (!m.IsClean() && TfPyConvertTfErrorsToPythonException(m))
-        throw_error_already_set();
-    // if we made it this far, we return the result.
-    return ret;
-}
-
 static string
 TfError__repr__(TfError const &self) 
 {
@@ -224,7 +183,6 @@ void wrapError() {
     def("SetPythonExceptionDebugTracingEnabled",
         _SetPythonExceptionDebugTracingEnabled, arg("enabled"));
     def("__SetErrorExceptionClass", Tf_PySetErrorExceptionClass);
-    def("InvokeWithErrorHandling", raw_function(_InvokeWithErrorHandling, 1));
     TfPyContainerConversions::from_python_sequence< vector<TfError>,
         TfPyContainerConversions::variable_capacity_policy >();
 
diff --git a/pxr/base/tf/wrapException.cpp b/pxr/base/tf/wrapException.cpp
index 702c05e935..62fd041e9e 100644
--- a/pxr/base/tf/wrapException.cpp
+++ b/pxr/base/tf/wrapException.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapFileUtils.cpp b/pxr/base/tf/wrapFileUtils.cpp
index 8a17f8359f..11a0280297 100644
--- a/pxr/base/tf/wrapFileUtils.cpp
+++ b/pxr/base/tf/wrapFileUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapFunction.cpp b/pxr/base/tf/wrapFunction.cpp
index 7f1c07651a..7e0c7581da 100644
--- a/pxr/base/tf/wrapFunction.cpp
+++ b/pxr/base/tf/wrapFunction.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapMallocTag.cpp b/pxr/base/tf/wrapMallocTag.cpp
index 054473ed29..61ac6a25d0 100644
--- a/pxr/base/tf/wrapMallocTag.cpp
+++ b/pxr/base/tf/wrapMallocTag.cpp
@@ -1,29 +1,13 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/mallocTag.h"
 
+#include "pxr/base/tf/diagnosticLite.h"
 #include "pxr/base/tf/fileUtils.h"
 #include "pxr/base/tf/iterator.h"
 #include "pxr/base/tf/pyResultConversions.h"
@@ -154,6 +138,21 @@ _ReportToFile(
     self.Report(os, rootName);
 }
 
+static bool
+_LoadReport(
+    TfMallocTag::CallTree  &self,
+    std::string const &fileName)
+{
+    std::ifstream in(fileName.c_str());
+    if (!in.good()) {
+        TF_RUNTIME_ERROR(
+            "Failed to open file '%s'.", fileName.c_str());
+        return false;
+    }
+
+    return self.LoadReport(in);
+}
+
 static std::string
 _LogReport(
     TfMallocTag::CallTree const &self,
@@ -202,6 +201,8 @@ void wrapMallocTag()
             (arg("rootName")=std::string()))
         .def("Report", _ReportToFile,
              (arg("fileName"), arg("rootName")=std::string()))
+        .def("LoadReport", _LoadReport,
+             (arg("fileName")))
         .def("LogReport", _LogReport,
              (arg("rootName")=std::string()))
         ;
diff --git a/pxr/base/tf/wrapNotice.cpp b/pxr/base/tf/wrapNotice.cpp
index 29018da56f..58c8ebcb9d 100644
--- a/pxr/base/tf/wrapNotice.cpp
+++ b/pxr/base/tf/wrapNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapPathUtils.cpp b/pxr/base/tf/wrapPathUtils.cpp
index 7e6f452111..3f089182e6 100644
--- a/pxr/base/tf/wrapPathUtils.cpp
+++ b/pxr/base/tf/wrapPathUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file tf/wrapPathUtils.cpp
diff --git a/pxr/base/tf/wrapPyContainerConversions.cpp b/pxr/base/tf/wrapPyContainerConversions.cpp
index 197955d90b..e63d927cb1 100644
--- a/pxr/base/tf/wrapPyContainerConversions.cpp
+++ b/pxr/base/tf/wrapPyContainerConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapPyModuleNotice.cpp b/pxr/base/tf/wrapPyModuleNotice.cpp
index 72cc243302..9c54c52bd0 100644
--- a/pxr/base/tf/wrapPyModuleNotice.cpp
+++ b/pxr/base/tf/wrapPyModuleNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapPyObjWrapper.cpp b/pxr/base/tf/wrapPyObjWrapper.cpp
index f1c44baea6..eeadafc73c 100644
--- a/pxr/base/tf/wrapPyObjWrapper.cpp
+++ b/pxr/base/tf/wrapPyObjWrapper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapPyOptional.cpp b/pxr/base/tf/wrapPyOptional.cpp
index 4782067f9c..b89661ac26 100644
--- a/pxr/base/tf/wrapPyOptional.cpp
+++ b/pxr/base/tf/wrapPyOptional.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file tf/wrapOptional.cpp
diff --git a/pxr/base/tf/wrapRefPtrTracker.cpp b/pxr/base/tf/wrapRefPtrTracker.cpp
index 98014c4d0e..4db4028b31 100644
--- a/pxr/base/tf/wrapRefPtrTracker.cpp
+++ b/pxr/base/tf/wrapRefPtrTracker.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapRefPtrTracker.cpp
 
diff --git a/pxr/base/tf/wrapScopeDescription.cpp b/pxr/base/tf/wrapScopeDescription.cpp
index f2f8212c46..1c00e5136c 100644
--- a/pxr/base/tf/wrapScopeDescription.cpp
+++ b/pxr/base/tf/wrapScopeDescription.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapScriptModuleLoader.cpp b/pxr/base/tf/wrapScriptModuleLoader.cpp
index 191797a41b..fb04e2a08a 100644
--- a/pxr/base/tf/wrapScriptModuleLoader.cpp
+++ b/pxr/base/tf/wrapScriptModuleLoader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapSingleton.cpp b/pxr/base/tf/wrapSingleton.cpp
index 8a6124f6bf..2f754ddea7 100644
--- a/pxr/base/tf/wrapSingleton.cpp
+++ b/pxr/base/tf/wrapSingleton.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapStackTrace.cpp b/pxr/base/tf/wrapStackTrace.cpp
index e1c3139f87..c8f30c6dd5 100644
--- a/pxr/base/tf/wrapStackTrace.cpp
+++ b/pxr/base/tf/wrapStackTrace.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapStatus.cpp b/pxr/base/tf/wrapStatus.cpp
index 540353bd29..f6fe2c3a6e 100644
--- a/pxr/base/tf/wrapStatus.cpp
+++ b/pxr/base/tf/wrapStatus.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapStopwatch.cpp b/pxr/base/tf/wrapStopwatch.cpp
index 6cd4321740..c566abeb86 100644
--- a/pxr/base/tf/wrapStopwatch.cpp
+++ b/pxr/base/tf/wrapStopwatch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapStringUtils.cpp b/pxr/base/tf/wrapStringUtils.cpp
index 0ca105ee05..bd2871adda 100644
--- a/pxr/base/tf/wrapStringUtils.cpp
+++ b/pxr/base/tf/wrapStringUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapTemplateString.cpp b/pxr/base/tf/wrapTemplateString.cpp
index ba9d6ba5d8..8a356a2540 100644
--- a/pxr/base/tf/wrapTemplateString.cpp
+++ b/pxr/base/tf/wrapTemplateString.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapTestPyAnnotatedBoolResult.cpp b/pxr/base/tf/wrapTestPyAnnotatedBoolResult.cpp
index 391560c265..42bfa450c2 100644
--- a/pxr/base/tf/wrapTestPyAnnotatedBoolResult.cpp
+++ b/pxr/base/tf/wrapTestPyAnnotatedBoolResult.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapTestPyContainerConversions.cpp b/pxr/base/tf/wrapTestPyContainerConversions.cpp
index d3139908fe..e06b27e68a 100644
--- a/pxr/base/tf/wrapTestPyContainerConversions.cpp
+++ b/pxr/base/tf/wrapTestPyContainerConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapTestPyStaticTokens.cpp b/pxr/base/tf/wrapTestPyStaticTokens.cpp
index a41caccd79..3a7dfc7a82 100644
--- a/pxr/base/tf/wrapTestPyStaticTokens.cpp
+++ b/pxr/base/tf/wrapTestPyStaticTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapTestPyStaticTokens.cpp
 
diff --git a/pxr/base/tf/wrapTestTfPyOptional.cpp b/pxr/base/tf/wrapTestTfPyOptional.cpp
index 4bc9a3d508..aecdbd38ed 100644
--- a/pxr/base/tf/wrapTestTfPyOptional.cpp
+++ b/pxr/base/tf/wrapTestTfPyOptional.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file tf/wrapTestTfPython.cpp
diff --git a/pxr/base/tf/wrapTestTfPython.cpp b/pxr/base/tf/wrapTestTfPython.cpp
index 2168b75ebd..8c6ace119b 100644
--- a/pxr/base/tf/wrapTestTfPython.cpp
+++ b/pxr/base/tf/wrapTestTfPython.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -27,6 +10,7 @@
 #include "pxr/base/tf/declarePtrs.h"
 #include "pxr/base/tf/enum.h"
 #include "pxr/base/tf/error.h"
+#include "pxr/base/tf/errorMark.h"
 #include "pxr/base/tf/makePyConstructor.h"
 #include "pxr/base/tf/notice.h"
 #include "pxr/base/tf/pyCall.h"
@@ -227,14 +211,132 @@ static void doErrors() {
     TF_STATUS("status message %d", 4);
 };
 
+template <int I>
+struct _TestErrorClass
+{
+    _TestErrorClass()
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from default constructor");
+    }
 
-struct _TestStaticMethodError {
-    static void Error() {
-        TF_ERROR(TF_TEST_ERROR_1, "Test error 1!");
+    _TestErrorClass(std::string const&)
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from constructor");
+    }
+    
+    static _TestErrorClass Create()
+    {
+        TfErrorMark m;
+        auto obj = _TestErrorClass();
+        m.Clear();
+        return obj;
+    }
+
+    static void ClassMethod(object& pyClassObj)
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from class method");
     }
+
+    static void ClassMethod(object& pyClassObj, std::string const&)
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from class method overload");
+    }
+
+    static void StaticMethod()
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from static method");
+    }
+
+    static void StaticMethod(std::string const&)
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from static method overload");
+    }
+
+    static std::string StaticGetter()
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from static property getter");
+        return "StaticGetter";
+    }
+
+    static void StaticSetter(std::string const&)
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from static property setter");
+    }
+
+    void InstanceMethod() const
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from instance method");
+    }
+
+    void InstanceMethod(std::string const&) const
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from instance method overload");
+    }
+
+    std::string Getter() const
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from property getter");
+        return "Getter";
+    }
+
+    void Setter(std::string const&)
+    {
+        TF_ERROR(TF_TEST_ERROR_1, "Error from property setter");
+    }
+
+    using Self = _TestErrorClass<I>;
+    static class_<Self> Wrap(char const* name)
+    {
+        return class_<Self>(name)
+            .def(init<std::string const&>())
+
+            .def("Create", &Self::Create)
+            .staticmethod("Create")
+
+            .def("ClassMethod", 
+                (void(*)(object&))&Self::ClassMethod)
+            .def("ClassMethod", 
+                (void(*)(object&, std::string const&))&Self::ClassMethod)
+            .def(TfPyClassMethod("ClassMethod"))
+
+            .def("StaticMethod", 
+                (void(*)())&Self::StaticMethod)
+            .def("StaticMethod", 
+                (void(*)(std::string const&))&Self::StaticMethod)
+            .staticmethod("StaticMethod")
+
+            .def("InstanceMethod", 
+                (void(Self::*)() const)&Self::InstanceMethod)
+            .def("InstanceMethod", 
+                (void(Self::*)(std::string const&) const)&Self::InstanceMethod)
+
+            .add_property("property", &Self::Getter, &Self::Setter)
+            .add_property("property_2",
+                +[](Self const& s) { return s.Getter(); },
+                +[](Self& s, std::string const& v) { s.Setter(v); })
+            
+            .add_static_property("static_property", 
+                &Self::StaticGetter, &Self::StaticSetter)
+            .add_static_property("static_property_2",
+                +[]() { return Self::StaticGetter(); },
+                +[](std::string const& v) { Self::StaticSetter(v); })
+            ;
+    }
+
 };
 
+using _TestErrorClass1 = _TestErrorClass<1>;
+using _TestErrorClass2 = _TestErrorClass<2>;
+
+static void TestErrorFunction()
+{
+    TF_ERROR(TF_TEST_ERROR_1, "Error from function");
+}
 
+static void TestErrorFunction(std::string const&)
+{
+    TF_ERROR(TF_TEST_ERROR_1, "Error from function overload");
+}
 
 ////////////////////////////////
 // Enums
@@ -542,11 +644,18 @@ void wrapTf_TestTfPython()
     def("_ThrowCppException", _ThrowCppException);
 
     def("_TakesVecVecString", TakesVecVecString);
-    
-    class_<_TestStaticMethodError>("_TestStaticMethodError", no_init)
-        .def("Error", &_TestStaticMethodError::Error)
-        .staticmethod("Error")
-        ;
+
+    {
+        def("_TestErrorFunction", (void(*)())&TestErrorFunction);
+        def("_TestErrorFunction", 
+            (void(*)(std::string const&))&TestErrorFunction);
+        scope s = _TestErrorClass1::Wrap("_TestErrorClass1");
+
+        def("_TestErrorFunction", (void(*)())&TestErrorFunction);
+        def("_TestErrorFunction", 
+            (void(*)(std::string const&))&TestErrorFunction);
+        _TestErrorClass2::Wrap("_TestErrorClass2");        
+    }
 
     def("_TakesReference", TakesReference);
     def("_TakesConstBase", TakesConstBase);
diff --git a/pxr/base/tf/wrapToken.cpp b/pxr/base/tf/wrapToken.cpp
index a142f03f53..b2f4f4c805 100644
--- a/pxr/base/tf/wrapToken.cpp
+++ b/pxr/base/tf/wrapToken.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapType.cpp b/pxr/base/tf/wrapType.cpp
index 6313b90177..cd15e79f54 100644
--- a/pxr/base/tf/wrapType.cpp
+++ b/pxr/base/tf/wrapType.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapTypeHelpers.cpp b/pxr/base/tf/wrapTypeHelpers.cpp
index ee3a61a060..56965e11af 100644
--- a/pxr/base/tf/wrapTypeHelpers.cpp
+++ b/pxr/base/tf/wrapTypeHelpers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/tf/wrapTypeHelpers.h b/pxr/base/tf/wrapTypeHelpers.h
index ad79e175c4..e4bd7318bb 100644
--- a/pxr/base/tf/wrapTypeHelpers.h
+++ b/pxr/base/tf/wrapTypeHelpers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TF_WRAP_TYPE_HELPERS_H
 #define PXR_BASE_TF_WRAP_TYPE_HELPERS_H
diff --git a/pxr/base/tf/wrapWarning.cpp b/pxr/base/tf/wrapWarning.cpp
index b40b9de864..4c6658d837 100644
--- a/pxr/base/tf/wrapWarning.cpp
+++ b/pxr/base/tf/wrapWarning.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/trace/CMakeLists.txt b/pxr/base/trace/CMakeLists.txt
index 9b4c5e1025..db302e077a 100644
--- a/pxr/base/trace/CMakeLists.txt
+++ b/pxr/base/trace/CMakeLists.txt
@@ -56,6 +56,7 @@ pxr_library(trace
     PYMODULE_CPPFILES
         module.cpp
         wrapAggregateNode.cpp
+        wrapAggregateTree.cpp
         wrapCollector.cpp
         wrapReporter.cpp
         wrapTestTrace.cpp
@@ -151,6 +152,7 @@ pxr_test_scripts(
     testenv/testTraceRecursion.py
     testenv/testTraceReports.py
     testenv/testTraceReporter.py
+    testenv/testTraceReporterLoadTrace.py
 )
 
 pxr_install_test_dir(
@@ -265,6 +267,11 @@ pxr_register_test(testTraceReporter
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testTraceReporter"
 )
 
+pxr_register_test(testTraceReporterLoadTrace
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testTraceReporterLoadTrace"
+)
+
 pxr_register_test(testTraceSerialization
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testTraceSerialization"
 )
diff --git a/pxr/base/trace/__init__.py b/pxr/base/trace/__init__.py
index 3575520f81..22fe581982 100644
--- a/pxr/base/trace/__init__.py
+++ b/pxr/base/trace/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 Trace -- Utilities for counting and recording events.
diff --git a/pxr/base/trace/__main__.py b/pxr/base/trace/__main__.py
index 195228b354..1c4354c3f1 100644
--- a/pxr/base/trace/__main__.py
+++ b/pxr/base/trace/__main__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Execute a script with tracing enabled.
diff --git a/pxr/base/trace/aggregateNode.cpp b/pxr/base/trace/aggregateNode.cpp
index 1a3a274edf..5188d2a3d2 100644
--- a/pxr/base/trace/aggregateNode.cpp
+++ b/pxr/base/trace/aggregateNode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/aggregateNode.h"
diff --git a/pxr/base/trace/aggregateNode.h b/pxr/base/trace/aggregateNode.h
index 174089cf2f..0c4957206f 100644
--- a/pxr/base/trace/aggregateNode.h
+++ b/pxr/base/trace/aggregateNode.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_AGGREGATE_NODE_H
diff --git a/pxr/base/trace/aggregateTree.cpp b/pxr/base/trace/aggregateTree.cpp
index 3f5dbaafda..c53bce0e51 100644
--- a/pxr/base/trace/aggregateTree.cpp
+++ b/pxr/base/trace/aggregateTree.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/aggregateTree.h"
diff --git a/pxr/base/trace/aggregateTree.h b/pxr/base/trace/aggregateTree.h
index 7c454228e5..98a3cfb130 100644
--- a/pxr/base/trace/aggregateTree.h
+++ b/pxr/base/trace/aggregateTree.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_AGGREGATE_TREE_H
diff --git a/pxr/base/trace/aggregateTreeBuilder.cpp b/pxr/base/trace/aggregateTreeBuilder.cpp
index ac78f96c11..96f479e17a 100644
--- a/pxr/base/trace/aggregateTreeBuilder.cpp
+++ b/pxr/base/trace/aggregateTreeBuilder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/aggregateTreeBuilder.h"
diff --git a/pxr/base/trace/aggregateTreeBuilder.h b/pxr/base/trace/aggregateTreeBuilder.h
index 1d8da4690e..d6911cd3c7 100644
--- a/pxr/base/trace/aggregateTreeBuilder.h
+++ b/pxr/base/trace/aggregateTreeBuilder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_AGGREGATE_TREE_BUILDER_H
diff --git a/pxr/base/trace/api.h b/pxr/base/trace/api.h
index afbff36b53..c774ee05e4 100644
--- a/pxr/base/trace/api.h
+++ b/pxr/base/trace/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_TRACE_API_H
 #define PXR_BASE_TRACE_API_H
diff --git a/pxr/base/trace/category.cpp b/pxr/base/trace/category.cpp
index cdb37c7b34..a10eec8a14 100644
--- a/pxr/base/trace/category.cpp
+++ b/pxr/base/trace/category.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/category.h"
diff --git a/pxr/base/trace/category.h b/pxr/base/trace/category.h
index ea01a04b60..5f507663d9 100644
--- a/pxr/base/trace/category.h
+++ b/pxr/base/trace/category.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_CATEGORY_H
diff --git a/pxr/base/trace/collection.cpp b/pxr/base/trace/collection.cpp
index b08a398275..658f7291e4 100644
--- a/pxr/base/trace/collection.cpp
+++ b/pxr/base/trace/collection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/collection.h"
diff --git a/pxr/base/trace/collection.h b/pxr/base/trace/collection.h
index 4f45989b95..17ee87a8b4 100644
--- a/pxr/base/trace/collection.h
+++ b/pxr/base/trace/collection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_COLLECTION_H
diff --git a/pxr/base/trace/collectionNotice.cpp b/pxr/base/trace/collectionNotice.cpp
index 12d86c26b6..e6a2f11028 100644
--- a/pxr/base/trace/collectionNotice.cpp
+++ b/pxr/base/trace/collectionNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/collectionNotice.h"
diff --git a/pxr/base/trace/collectionNotice.h b/pxr/base/trace/collectionNotice.h
index 55ca9c1f73..1298e82428 100644
--- a/pxr/base/trace/collectionNotice.h
+++ b/pxr/base/trace/collectionNotice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_COLLECTION_NOTICE_H
diff --git a/pxr/base/trace/collector.cpp b/pxr/base/trace/collector.cpp
index 4956516fa7..3f1d7cf534 100644
--- a/pxr/base/trace/collector.cpp
+++ b/pxr/base/trace/collector.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/collector.h"
diff --git a/pxr/base/trace/collector.h b/pxr/base/trace/collector.h
index 4be6353048..32a87cb82b 100644
--- a/pxr/base/trace/collector.h
+++ b/pxr/base/trace/collector.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_COLLECTOR_H
diff --git a/pxr/base/trace/concurrentList.h b/pxr/base/trace/concurrentList.h
index 0337933a31..0c6b789f8d 100644
--- a/pxr/base/trace/concurrentList.h
+++ b/pxr/base/trace/concurrentList.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_CONCURRENT_LIST_H
@@ -111,7 +94,7 @@ class TraceConcurrentList {
         while (curNode) {
             Node* nodeToDelete = curNode;
             curNode = curNode->next;
-            _alloc.destroy(nodeToDelete);
+            nodeToDelete->~Node();
             _alloc.deallocate(nodeToDelete, 1);
         }
     }
@@ -130,7 +113,7 @@ class TraceConcurrentList {
     /// the newly created item.
     iterator Insert() {
         Node* newNode = _alloc.allocate(1);
-        _alloc.construct(newNode);
+        new(newNode) Node();
 
         // Add the node to the linked list in an atomic manner.
         do {
diff --git a/pxr/base/trace/counterAccumulator.cpp b/pxr/base/trace/counterAccumulator.cpp
index 5672418320..930a47014c 100644
--- a/pxr/base/trace/counterAccumulator.cpp
+++ b/pxr/base/trace/counterAccumulator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 
diff --git a/pxr/base/trace/counterAccumulator.h b/pxr/base/trace/counterAccumulator.h
index bb6126e05c..5b5cbab704 100644
--- a/pxr/base/trace/counterAccumulator.h
+++ b/pxr/base/trace/counterAccumulator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_COUNTER_ACCUMULATOR_H
diff --git a/pxr/base/trace/dataBuffer.cpp b/pxr/base/trace/dataBuffer.cpp
index e08edb17fe..764d4ec1df 100644
--- a/pxr/base/trace/dataBuffer.cpp
+++ b/pxr/base/trace/dataBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/dataBuffer.h"
diff --git a/pxr/base/trace/dataBuffer.h b/pxr/base/trace/dataBuffer.h
index 5b1b426c40..4b3b3a432c 100644
--- a/pxr/base/trace/dataBuffer.h
+++ b/pxr/base/trace/dataBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_DATA_BUFFER_H
diff --git a/pxr/base/trace/dynamicKey.cpp b/pxr/base/trace/dynamicKey.cpp
index bc0243c05b..9314756d67 100644
--- a/pxr/base/trace/dynamicKey.cpp
+++ b/pxr/base/trace/dynamicKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/dynamicKey.h"
\ No newline at end of file
diff --git a/pxr/base/trace/dynamicKey.h b/pxr/base/trace/dynamicKey.h
index 7dd394a8db..f23a5c7b8d 100644
--- a/pxr/base/trace/dynamicKey.h
+++ b/pxr/base/trace/dynamicKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_DYNAMIC_KEY_H
diff --git a/pxr/base/trace/event.cpp b/pxr/base/trace/event.cpp
index 9f6fa0f5dd..7fbe0f7c05 100644
--- a/pxr/base/trace/event.cpp
+++ b/pxr/base/trace/event.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/event.h"
diff --git a/pxr/base/trace/event.h b/pxr/base/trace/event.h
index df7b625925..a924842180 100644
--- a/pxr/base/trace/event.h
+++ b/pxr/base/trace/event.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_EVENT_H
diff --git a/pxr/base/trace/eventContainer.cpp b/pxr/base/trace/eventContainer.cpp
index 18ce5da92e..b6a06a6d02 100644
--- a/pxr/base/trace/eventContainer.cpp
+++ b/pxr/base/trace/eventContainer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/trace/eventContainer.h b/pxr/base/trace/eventContainer.h
index f9c5fd007e..a85011411f 100644
--- a/pxr/base/trace/eventContainer.h
+++ b/pxr/base/trace/eventContainer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_EVENT_CONTAINER_H
diff --git a/pxr/base/trace/eventData.cpp b/pxr/base/trace/eventData.cpp
index f92b916f78..db9b22c762 100644
--- a/pxr/base/trace/eventData.cpp
+++ b/pxr/base/trace/eventData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/eventData.h"
diff --git a/pxr/base/trace/eventData.h b/pxr/base/trace/eventData.h
index 82a69b2e3a..4ab14629f9 100644
--- a/pxr/base/trace/eventData.h
+++ b/pxr/base/trace/eventData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_EVENT_DATA_H
diff --git a/pxr/base/trace/eventList.cpp b/pxr/base/trace/eventList.cpp
index f4810379d9..57b88858f2 100644
--- a/pxr/base/trace/eventList.cpp
+++ b/pxr/base/trace/eventList.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/eventList.h"
diff --git a/pxr/base/trace/eventList.h b/pxr/base/trace/eventList.h
index ec945cbc67..b508436a4a 100644
--- a/pxr/base/trace/eventList.h
+++ b/pxr/base/trace/eventList.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_EVENT_LIST_H
diff --git a/pxr/base/trace/eventNode.cpp b/pxr/base/trace/eventNode.cpp
index e588140fbe..bfcd8939f4 100644
--- a/pxr/base/trace/eventNode.cpp
+++ b/pxr/base/trace/eventNode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/eventNode.h"
diff --git a/pxr/base/trace/eventNode.h b/pxr/base/trace/eventNode.h
index c660683154..45a534b58b 100644
--- a/pxr/base/trace/eventNode.h
+++ b/pxr/base/trace/eventNode.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_EVENT_NODE_H
diff --git a/pxr/base/trace/eventTree.cpp b/pxr/base/trace/eventTree.cpp
index 46b0dc8fc7..4507d008b4 100644
--- a/pxr/base/trace/eventTree.cpp
+++ b/pxr/base/trace/eventTree.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/eventTree.h"
diff --git a/pxr/base/trace/eventTree.h b/pxr/base/trace/eventTree.h
index cbebd9f957..110f5652a0 100644
--- a/pxr/base/trace/eventTree.h
+++ b/pxr/base/trace/eventTree.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_EVENT_TREE_H
diff --git a/pxr/base/trace/eventTreeBuilder.cpp b/pxr/base/trace/eventTreeBuilder.cpp
index 57c6e6f4ec..d7f4b0dc79 100644
--- a/pxr/base/trace/eventTreeBuilder.cpp
+++ b/pxr/base/trace/eventTreeBuilder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/eventTreeBuilder.h"
diff --git a/pxr/base/trace/eventTreeBuilder.h b/pxr/base/trace/eventTreeBuilder.h
index ddb4c894e2..e8d4f675fa 100644
--- a/pxr/base/trace/eventTreeBuilder.h
+++ b/pxr/base/trace/eventTreeBuilder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_EVENT_TREE_BUILDER_H
diff --git a/pxr/base/trace/jsonSerialization.cpp b/pxr/base/trace/jsonSerialization.cpp
index 0841e0ea46..7d26d9917e 100644
--- a/pxr/base/trace/jsonSerialization.cpp
+++ b/pxr/base/trace/jsonSerialization.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/jsonSerialization.h"
diff --git a/pxr/base/trace/jsonSerialization.h b/pxr/base/trace/jsonSerialization.h
index 65190974f9..a4aa40f046 100644
--- a/pxr/base/trace/jsonSerialization.h
+++ b/pxr/base/trace/jsonSerialization.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_JSON_SERIALIZATION_H
diff --git a/pxr/base/trace/key.cpp b/pxr/base/trace/key.cpp
index d8ef77b577..05b1711734 100644
--- a/pxr/base/trace/key.cpp
+++ b/pxr/base/trace/key.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/key.h"
diff --git a/pxr/base/trace/key.h b/pxr/base/trace/key.h
index 89ce886722..f7f9997d1b 100644
--- a/pxr/base/trace/key.h
+++ b/pxr/base/trace/key.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_KEY_H
diff --git a/pxr/base/trace/module.cpp b/pxr/base/trace/module.cpp
index 945a44eabc..412be2bdfb 100644
--- a/pxr/base/trace/module.cpp
+++ b/pxr/base/trace/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -32,6 +15,7 @@ TF_WRAP_MODULE
 {
     TF_WRAP( Collector );
     TF_WRAP( AggregateNode );
+    TF_WRAP( AggregateTree );
     TF_WRAP( Reporter );
 
     TF_WRAP( TestTrace );
diff --git a/pxr/base/trace/moduleDeps.cpp b/pxr/base/trace/moduleDeps.cpp
index 8d7457fb7c..819af7d2d9 100644
--- a/pxr/base/trace/moduleDeps.cpp
+++ b/pxr/base/trace/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/base/trace/pch.h b/pxr/base/trace/pch.h
index 25f4b5d6cf..cc1750d7f8 100644
--- a/pxr/base/trace/pch.h
+++ b/pxr/base/trace/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,13 +22,14 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
+#include <chrono>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -53,10 +38,10 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <deque>
 #include <fstream>
 #include <functional>
-#include <initializer_list>
 #include <inttypes.h>
 #include <iosfwd>
 #include <iostream>
@@ -67,70 +52,29 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <ostream>
+#include <regex>
 #include <set>
 #include <sstream>
 #include <stack>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/none.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/if.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/class.hpp>
 #include <boost/python/converter/from_python.hpp>
@@ -149,15 +93,13 @@
 #include <boost/python/handle.hpp>
 #include <boost/python/implicit.hpp>
 #include <boost/python/list.hpp>
-#include <boost/python/make_constructor.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/object.hpp>
 #include <boost/python/object/iterator.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
-#include <boost/python/operators.hpp>
 #include <boost/python/raw_function.hpp>
-#include <boost/python/refcount.hpp>
+#include <boost/python/return_value_policy.hpp>
 #include <boost/python/scope.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
@@ -167,18 +109,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_vector.h>
diff --git a/pxr/base/trace/reporter.cpp b/pxr/base/trace/reporter.cpp
index 917f94066a..4d639a162d 100644
--- a/pxr/base/trace/reporter.cpp
+++ b/pxr/base/trace/reporter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/reporter.h"
@@ -39,7 +22,10 @@
 #include <algorithm>
 #include <map>
 #include <ostream>
+#include <regex>
+#include <string>
 #include <vector>
+#include <stack>
 
 using std::ostream;
 using std::string;
@@ -236,6 +222,153 @@ TraceReporter::Report(
     s << "\n";
 }
 
+/* static */ std::vector<TraceReporter::ParsedTree> 
+TraceReporter::LoadReport(
+    std::istream &stream)
+{
+    // Regular expression for the reported number of iterations.
+    static const std::regex itCountRE(R"(Number of iterations: (\d+))");
+
+    // Every report has this header.
+    static const std::string treeHeader("Tree view  ==============");
+
+    // Regular expression for each trace line in a report.
+    static const auto traceRowRE = std::invoke([]() -> std::regex {
+        // Note that the expression we build will have exactly 5 capture groups:
+        // 
+        // 1. The inclusive time entry (may be empty)
+        // 
+        // 2. The exclusive time entry (may also be empty)
+        //
+        // 3. The sample count (required)
+        //
+        // 4. The indentation string (e.g., "| | ", may be empty)
+        //
+        // 5. The tag
+
+        // Match time entries:
+        //
+        // - Time entries are in milliseconds and always rounded to 1000ths 
+        //   place, so expect exactly 3 digits after the decimal.
+        //
+        // - Trace Reporter will either output 0, 1, or 2 time entries.
+        //
+        // - The first entry, if present, is always the inclusive time entry.
+        //
+        // Note: This is structured this way to maintain compatibility with 
+        // Windows. For some reason, if we just have two optional time entry 
+        // patterns, and if only one has match, Linux and Windows will disagree
+        // on whether the matched entry belongs to the first or second capture
+        // group. To work around this, we nest the expression to match either:
+        //
+        // - Required time entry followed by an optional time entry
+        //
+        // - or an empty group.
+        //
+        const std::string msEntryPattern = R"((?:(\d+\.\d{3}) ms))";
+        const std::string msPattern = TfStringPrintf(R"(%s\s+%s?\s+)", 
+            msEntryPattern.c_str(), msEntryPattern.c_str());
+        const std::string msPatternOptional = TfStringPrintf(
+            R"((?:%s|(?:)\s+))", msPattern.c_str());
+
+        // Match sample entry
+        // - Can be either an integer or a floating point number (for traces
+        //   with iterations)
+        const std::string samplePattern = R"((\d+|\d+\.\d{3}) samples\s+)";
+
+        // Match indentation string
+        const std::string indentPattern = R"(([ |]+))";
+
+        // Match tag
+        const std::string tagPattern = R"((.*))";
+
+        return std::regex(R"(\s*)" + msPatternOptional + samplePattern 
+            + indentPattern + tagPattern);
+    });
+
+    // Current state of the parser. 
+    enum class State {
+        // Tree view header not yet found
+        FindingTree,
+        // Found Tree view header, searching for others
+        ReadingTree
+    } state = State::FindingTree;
+
+    std::cmatch match;
+
+    TraceAggregateTreeRefPtr currentTree;
+
+    // By default assume 1 iteration. Only trees with non-1 iteration counts
+    // have the the iteration count line.
+    int currentIters = 1;
+
+    std::vector<ParsedTree> result;
+    std::stack<TraceAggregateNodePtr> stack;
+    for (std::string line; std::getline(stream, line);) {
+        // When finding the tree, only parse for the tree header and the 
+        // iteration count.
+        if (state == State::FindingTree) {
+            if (line == treeHeader) {
+                state = State::ReadingTree;
+                currentTree = TraceAggregateTree::New();
+                stack.push(currentTree->GetRoot());
+
+                // By this point we've already seen the iteration count for this
+                // tree.
+                result.push_back({currentTree, currentIters});
+                continue;
+            }
+
+            if (std::regex_match(line.c_str(), match, itCountRE)) {
+                currentIters = std::stoi(match[1]);
+            }
+
+            continue;
+        }
+
+        if (!TF_VERIFY(state == State::ReadingTree)) {
+            // If we're not finding a tree, we should be reading a tree.
+            break;
+        }
+
+        // When we see an empty line, that means we've gotten a full tree. Clear
+        // the stack and switch back to tree finding.
+        if (TfStringTrim(line).empty()) {
+            state = State::FindingTree;
+            stack = {};
+            currentIters = 1;
+            continue;
+        }
+
+        if (!std::regex_match(line.c_str(), match, traceRowRE)) {
+            continue;
+        }
+
+        // The indentation string always has a size of 2x the depth.
+        //
+        // Determine the depth and then pop the stack until we have the parent
+        // node.
+        const size_t depth = match[4].length() / 2;
+        while (stack.size() > depth+1) {
+            stack.pop();
+        }
+        TraceAggregateNodePtr &parent = stack.top();
+
+        // Add a new node.
+        // Sample count may be a double if there's >1 iterations.
+        const int samples = std::round(currentIters*TfStringToDouble(match[3]));
+        stack.push(parent->Append(
+            TraceReporter::CreateValidEventId(),
+            /* key */ TfToken(match[5].str()),
+            /* timestamp */ ArchSecondsToTicks(
+                currentIters*TfStringToDouble(match[1])/1000.0),
+            /* count */ samples,
+            /* exclusiveCount */ samples));
+    }
+
+    return result;
+}
+
 void
 TraceReporter::ReportTimes(std::ostream &s)
 {
diff --git a/pxr/base/trace/reporter.h b/pxr/base/trace/reporter.h
index dabadb304a..5049708138 100644
--- a/pxr/base/trace/reporter.h
+++ b/pxr/base/trace/reporter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_REPORTER_H
@@ -115,6 +98,28 @@ class TraceReporter :
 
     /// @}
 
+    /// \name Report Loading.
+    /// @{
+
+    /// Aggregate tree and its iteration count, parsed from a report.
+    struct ParsedTree {
+        TraceAggregateTreeRefPtr tree;
+        int iterationCount;  
+    };
+
+    /// Load an aggregate tree report from the \p stream, as written by 
+    /// Report().
+    ///
+    /// Since multiple reports may be appended to a given trace file, this will
+    /// return a vector of each tree and their iteration count. 
+    ///
+    /// This will multiply the parsed values for each aggregate tree by their 
+    /// iteration count.
+    TRACE_API static std::vector<ParsedTree> LoadReport(
+        std::istream &stream);
+
+    /// @}
+
     /// Returns the root node of the aggregated call tree.
     TRACE_API TraceAggregateNodePtr GetAggregateTreeRoot();
 
diff --git a/pxr/base/trace/reporterBase.cpp b/pxr/base/trace/reporterBase.cpp
index 00dad427a8..06eb9bac3c 100644
--- a/pxr/base/trace/reporterBase.cpp
+++ b/pxr/base/trace/reporterBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/reporterBase.h"
diff --git a/pxr/base/trace/reporterBase.h b/pxr/base/trace/reporterBase.h
index 526dc71c74..23e1e756a4 100644
--- a/pxr/base/trace/reporterBase.h
+++ b/pxr/base/trace/reporterBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_REPORTER_BASE_H
diff --git a/pxr/base/trace/reporterDataSourceBase.cpp b/pxr/base/trace/reporterDataSourceBase.cpp
index 7f1f30e786..9c5a559f2c 100644
--- a/pxr/base/trace/reporterDataSourceBase.cpp
+++ b/pxr/base/trace/reporterDataSourceBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/reporterDataSourceBase.h"
diff --git a/pxr/base/trace/reporterDataSourceBase.h b/pxr/base/trace/reporterDataSourceBase.h
index 7a02e264cd..3caae8ffe6 100644
--- a/pxr/base/trace/reporterDataSourceBase.h
+++ b/pxr/base/trace/reporterDataSourceBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_REPORTER_DATA_SOURCE_BASE_H
diff --git a/pxr/base/trace/reporterDataSourceCollection.cpp b/pxr/base/trace/reporterDataSourceCollection.cpp
index 5dd6433bbc..8ee49ac4c5 100644
--- a/pxr/base/trace/reporterDataSourceCollection.cpp
+++ b/pxr/base/trace/reporterDataSourceCollection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/reporterDataSourceCollection.h"
diff --git a/pxr/base/trace/reporterDataSourceCollection.h b/pxr/base/trace/reporterDataSourceCollection.h
index b6dad7aa6f..6fa5431d7f 100644
--- a/pxr/base/trace/reporterDataSourceCollection.h
+++ b/pxr/base/trace/reporterDataSourceCollection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_REPORTER_DATA_SOURCE_COLLECTION_H
diff --git a/pxr/base/trace/reporterDataSourceCollector.cpp b/pxr/base/trace/reporterDataSourceCollector.cpp
index 70c3b4e452..445cf10860 100644
--- a/pxr/base/trace/reporterDataSourceCollector.cpp
+++ b/pxr/base/trace/reporterDataSourceCollector.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/reporterDataSourceCollector.h"
diff --git a/pxr/base/trace/reporterDataSourceCollector.h b/pxr/base/trace/reporterDataSourceCollector.h
index e8dc6b2ab9..bad89e5c02 100644
--- a/pxr/base/trace/reporterDataSourceCollector.h
+++ b/pxr/base/trace/reporterDataSourceCollector.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_REPORTER_DATA_SOURCE_COLLECTOR_H
diff --git a/pxr/base/trace/serialization.cpp b/pxr/base/trace/serialization.cpp
index 590835a30f..7317d69467 100644
--- a/pxr/base/trace/serialization.cpp
+++ b/pxr/base/trace/serialization.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/trace/serialization.h"
 
diff --git a/pxr/base/trace/serialization.h b/pxr/base/trace/serialization.h
index 2bb8011255..27ec7d7839 100644
--- a/pxr/base/trace/serialization.h
+++ b/pxr/base/trace/serialization.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_SERIALIZATION_H
diff --git a/pxr/base/trace/staticKeyData.cpp b/pxr/base/trace/staticKeyData.cpp
index ead773c68c..055a2ca042 100644
--- a/pxr/base/trace/staticKeyData.cpp
+++ b/pxr/base/trace/staticKeyData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/staticKeyData.h"
diff --git a/pxr/base/trace/staticKeyData.h b/pxr/base/trace/staticKeyData.h
index 7ce07d1e7b..93afc2e6c5 100644
--- a/pxr/base/trace/staticKeyData.h
+++ b/pxr/base/trace/staticKeyData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_STATIC_KEY_DATA_H
diff --git a/pxr/base/trace/stringHash.h b/pxr/base/trace/stringHash.h
index f62d88c4be..8c7fafc94c 100644
--- a/pxr/base/trace/stringHash.h
+++ b/pxr/base/trace/stringHash.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_STRING_HASH_H
diff --git a/pxr/base/trace/testenv/testTrace.py b/pxr/base/trace/testenv/testTrace.py
index 41e1837956..605011780b 100644
--- a/pxr/base/trace/testenv/testTrace.py
+++ b/pxr/base/trace/testenv/testTrace.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/base/trace/testenv/testTraceCategory.cpp b/pxr/base/trace/testenv/testTraceCategory.cpp
index cfa8050d06..6335d84f58 100644
--- a/pxr/base/trace/testenv/testTraceCategory.cpp
+++ b/pxr/base/trace/testenv/testTraceCategory.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceCounters.cpp b/pxr/base/trace/testenv/testTraceCounters.cpp
index f7ffbbe684..5770bd38f4 100644
--- a/pxr/base/trace/testenv/testTraceCounters.cpp
+++ b/pxr/base/trace/testenv/testTraceCounters.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceData.cpp b/pxr/base/trace/testenv/testTraceData.cpp
index bc7657b77d..4375677a06 100644
--- a/pxr/base/trace/testenv/testTraceData.cpp
+++ b/pxr/base/trace/testenv/testTraceData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceEventContainer.cpp b/pxr/base/trace/testenv/testTraceEventContainer.cpp
index 952d28bc13..cd819f116b 100644
--- a/pxr/base/trace/testenv/testTraceEventContainer.cpp
+++ b/pxr/base/trace/testenv/testTraceEventContainer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceHash.cpp b/pxr/base/trace/testenv/testTraceHash.cpp
index 7c35658e12..c867d4227a 100644
--- a/pxr/base/trace/testenv/testTraceHash.cpp
+++ b/pxr/base/trace/testenv/testTraceHash.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/stringHash.h"
diff --git a/pxr/base/trace/testenv/testTraceMacros.cpp b/pxr/base/trace/testenv/testTraceMacros.cpp
index 862755ce7a..cd9e2815bf 100644
--- a/pxr/base/trace/testenv/testTraceMacros.cpp
+++ b/pxr/base/trace/testenv/testTraceMacros.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceMarkers.cpp b/pxr/base/trace/testenv/testTraceMarkers.cpp
index 054b84eb96..c8ebb6fa8f 100644
--- a/pxr/base/trace/testenv/testTraceMarkers.cpp
+++ b/pxr/base/trace/testenv/testTraceMarkers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceOverhead.cpp b/pxr/base/trace/testenv/testTraceOverhead.cpp
index 01b18fac46..79f602f72a 100644
--- a/pxr/base/trace/testenv/testTraceOverhead.cpp
+++ b/pxr/base/trace/testenv/testTraceOverhead.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceRecursion.py b/pxr/base/trace/testenv/testTraceRecursion.py
index 0013ca158c..1646fc9d17 100644
--- a/pxr/base/trace/testenv/testTraceRecursion.py
+++ b/pxr/base/trace/testenv/testTraceRecursion.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/base/trace/testenv/testTraceReportPerf.cpp b/pxr/base/trace/testenv/testTraceReportPerf.cpp
index 48e8e99c5e..8ead4ab89c 100644
--- a/pxr/base/trace/testenv/testTraceReportPerf.cpp
+++ b/pxr/base/trace/testenv/testTraceReportPerf.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceReporter.py b/pxr/base/trace/testenv/testTraceReporter.py
index d836a6fcfc..dffc6ec629 100644
--- a/pxr/base/trace/testenv/testTraceReporter.py
+++ b/pxr/base/trace/testenv/testTraceReporter.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import unittest
diff --git a/pxr/base/trace/testenv/testTraceReporterLoadTrace.py b/pxr/base/trace/testenv/testTraceReporterLoadTrace.py
new file mode 100644
index 0000000000..18a92530d6
--- /dev/null
+++ b/pxr/base/trace/testenv/testTraceReporterLoadTrace.py
@@ -0,0 +1,325 @@
+#!/pxrpythonsubst
+#
+# Copyright 2024 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+from pxr import Trace
+
+import contextlib
+import dataclasses
+import os
+import tempfile
+import textwrap
+from typing import Generator, List, Tuple
+import unittest
+
+@contextlib.contextmanager
+def TraceTextFile(contents: str) -> Generator[str, None, None]:
+    """
+    Context object which returns the filepath of a temporary file that contains
+    the given contents.
+    """
+
+    # Note that Windows has a strict file locking policy which prevents us from
+    # having multiple handles into the same file. To workaround this, close out
+    # our handle to it before yielding the path, and manually clean it up when 
+    # we're done.
+    try:
+        with tempfile.NamedTemporaryFile(
+            suffix=".trace", mode="w+", delete=False) as tmp:
+            tmp.write(contents)
+            tmp.flush()
+        yield tmp.name
+    finally:
+        os.remove(tmp.name)
+
+@dataclasses.dataclass
+class NodeData:
+    """
+    A simple dataclass for verifying trace trees.
+    """
+    key: str
+    inclusive: float
+    exclusive: float
+    samples: int
+    children: List["NodeData"] = dataclasses.field(default_factory=list)
+
+def GetNodeDataTree(tree: Trace.AggregateTree):
+    def _GetNodeDataTree(node: Trace.AggregateNode):
+        """
+        Convert a TraceAggregateTree into a NodeData tree.
+        """
+        nodeData = NodeData(
+            node.key, node.inclusiveTime, node.exclusiveTime, node.count)
+        for child in node.children:
+            nodeData.children.append(_GetNodeDataTree(child))
+        return nodeData
+    return _GetNodeDataTree(tree.root)
+
+def BuildNodeDataTree(data: List[Tuple[float, float, int, str]]):
+    """
+    Convenience class for converting a list of tuples into a NodeData tree.
+
+    Each item in the list must contain, in order:
+        inclusive time, exclusive time, samples, and indented tag
+
+    The number of leading spaces / 2 in the indented tag indicates the depth of
+    that node.
+
+    The returned tree will be rooted under a node named "root."
+
+    For example,
+
+    BuildNodeDataTree([
+        # incl    excl    samp  indent+tag
+        (484.707, 31.384,  2,   "Main Thread"),
+        (  0.000,  0.001,  1,   "  CmdRegistry::_HandleNotice"),
+        (  0.064,  0.058,  3,   "  AppIterationFinished"),
+        (  0.006,  0.006,  3,   "    AppIterationFinished: Send AppNotice::IterationFinished"),
+        (453.258,  0.044, 24,   "  UiqApplication::Exec (Event loop)")])
+    """
+    root = NodeData("root", 0.0, 0.0, 0)
+    stack = [root]
+    for (incl, excl, samples, depthAndKey) in data:
+        key = depthAndKey.lstrip()
+        depth = (len(depthAndKey) - len(key))/2
+
+        # Pop the stack to get the parent
+        while len(stack) > depth+1:
+            stack.pop()
+        parent = stack[-1]
+
+        # Build the node data.
+        nodeData = NodeData(key, incl, excl, samples)
+        parent.children.append(nodeData)
+        stack.append(nodeData)
+
+    return root
+
+# The reporter only reports up to 3 decimal places.
+THRESHOLD = 0.001
+
+class TestTraceReporterLoadTrace(unittest.TestCase):
+    def AssertNodeTreesEqual(self, 
+        rootA: NodeData, rootB: NodeData, delta=THRESHOLD):
+        """
+        Compare two NodeData trees.
+        """
+        self.assertEqual(rootA.key, rootB.key, 
+            msg="keys are different")
+        self.assertAlmostEqual(rootA.inclusive, rootB.inclusive, delta=delta,
+            msg=f"{rootA.key}: inclusive times are different")
+        self.assertAlmostEqual(rootA.exclusive, rootB.exclusive, delta=delta,
+            msg=f"{rootA.key}: exclusive times are different")
+        self.assertEqual(rootA.samples, rootB.samples,
+            msg=f"{rootA.key}: sample counts are different")
+        self.assertEqual(len(rootA.children), len(rootB.children), 
+            msg=f"{rootA.key}: child counts are different")
+
+        for childA, childB in zip(rootA.children, rootB.children):
+            self.AssertNodeTreesEqual(childA, childB, delta)
+
+    def AssertRoundTripValid(self, 
+        parsed: Trace.Reporter.ParsedTree, delta=THRESHOLD):
+        """
+        Take an already parsed report, write it to a temporary file, and then 
+        re-parse it.
+
+        This will verify that the re-parsed report is identical to the first 
+        parsed report, which will ensure that saving and loading are consistent.
+        """
+        with TraceTextFile("") as filepath:
+            for index, parsedEntry in enumerate(parsed):
+                tree, iterationCount = \
+                    parsedEntry.tree, parsedEntry.iterationCount
+
+                reporter = Trace.Reporter(f"{self.id()}_{index}")
+                root = reporter.aggregateTreeRoot
+                for child in tree.root.children:
+                    root.Append(child)
+                reporter.Report(filepath, iterationCount, append=True)
+
+            with open(filepath, 'r') as file:
+                print(f"Saved report for {self.id().split('.')[-1]}:")
+                print(file.read())
+
+            newParsed = Trace.Reporter.LoadReport(filepath)
+            self.assertEqual(len(parsed), len(newParsed),
+                msg="Number of trees saved != number of trees loaded")
+            for old, new in zip(parsed, newParsed):
+                self.assertEqual(old.iterationCount, new.iterationCount,
+                    msg="iterationCount saved != iterationCount loaded")
+                self.AssertNodeTreesEqual(
+                    GetNodeDataTree(old.tree), GetNodeDataTree(new.tree), delta)
+
+    def test_Basic(self):
+        """
+        Test that a basic trace text file can be parsed.
+        """
+        trace = TraceTextFile(textwrap.dedent("""
+            Tree view  ==============
+                inclusive    exclusive        
+               484.707 ms    31.384 ms       2 samples    Main Thread
+                 0.001 ms     0.001 ms       1 samples    | CmdRegistry::_HandleNotice
+                 0.064 ms     0.058 ms       3 samples    | AppIterationFinished
+                 0.006 ms     0.006 ms       3 samples    |   AppIterationFinished: Send AppNotice::IterationFinished
+                                             1 samples    |   | DidManager::FlushPendingInteractions
+               453.258 ms     0.044 ms      24 samples    | UiqApplication::Exec (Event loop)
+               453.214 ms   440.033 ms      24 samples    |   UiqApplication::Exec (Process Qt events)
+                13.181 ms    13.181 ms      30 samples    |   | UiqApplication::_notify
+                                             1 samples    |   |   AppExecuteQueuedLaterFunctions
+            """))
+        with trace as filepath:
+            parsed = Trace.Reporter.LoadReport(filepath)
+        
+        self.assertEqual(len(parsed), 1)
+        self.assertEqual(parsed[0].iterationCount, 1)
+
+        expected = BuildNodeDataTree([
+            #   incl     excl samp  indent+tag
+            (484.707,  31.384,   2, "Main Thread"),
+            (  0.001,   0.001,   1, "  CmdRegistry::_HandleNotice"),
+            (  0.064,   0.058,   3, "  AppIterationFinished"),
+            (  0.006,   0.006,   3, "    AppIterationFinished: Send AppNotice::IterationFinished"),
+            (  0.000,   0.000,   1, "      DidManager::FlushPendingInteractions"),
+            (453.258,   0.044,  24, "  UiqApplication::Exec (Event loop)"),
+            (453.214, 440.033,  24, "    UiqApplication::Exec (Process Qt events)"),
+            ( 13.181,  13.181,  30, "      UiqApplication::_notify"),
+            (  0.000,   0.000,   1, "        AppExecuteQueuedLaterFunctions")
+        ])
+        self.AssertNodeTreesEqual(expected, GetNodeDataTree(parsed[0].tree))
+
+        self.AssertRoundTripValid(parsed)
+
+    def test_BlankEntryOnMainThreadExclusiveTime(self):
+        """
+        Regression test: main thread's times gets incorrectly parsed if its 
+        exclusive time entry is blank.
+        """
+        trace = TraceTextFile(textwrap.dedent("""
+            Tree view  ==============
+               inclusive    exclusive        
+                9.064 ms                    1 samples    Main Thread
+                9.064 ms     0.072 ms       1 samples    | Tormentor::menva_read_time
+                8.992 ms     5.792 ms       1 samples    |   SdfLayer::FindOrOpen
+                3.200 ms     3.200 ms       1 samples    |   | SdfLayer::_ComputeInfoToFindOrOpenLayer
+            """))
+        with trace as filepath:
+            parsed = Trace.Reporter.LoadReport(filepath)
+        
+        self.assertEqual(len(parsed), 1)
+        self.assertEqual(parsed[0].iterationCount, 1)
+
+        expected = BuildNodeDataTree([
+            # incl   excl samp  indent+tag
+            (9.064, 0.000,   1, "Main Thread"),
+            (9.064, 0.072,   1, "  Tormentor::menva_read_time"),
+            (8.992, 5.792,   1, "    SdfLayer::FindOrOpen"),
+            (3.200, 3.200,   1, "      SdfLayer::_ComputeInfoToFindOrOpenLayer")
+        ])
+        self.AssertNodeTreesEqual(expected, GetNodeDataTree(parsed[0].tree))
+
+        self.AssertRoundTripValid(parsed)
+
+    def test_Iters(self):
+        """
+        Test reading a trace tree with iterations.
+        """
+        trace = TraceTextFile(textwrap.dedent("""
+            Number of iterations: 36
+        
+            Tree view  ==============
+            inclusive    exclusive        
+                0.040 ms                    0.028 samples    Main Thread
+                0.040 ms     0.004 ms       0.028 samples    | AppIterationFinished
+                0.036 ms                    0.028 samples    |   AppExecuteQueuedLaterFunctions
+                0.036 ms     0.012 ms       0.028 samples    |   | UpPlayer::_SendPendingPlayModeNotification
+                0.024 ms     0.002 ms       0.028 samples    |   |   UpPlayer::_SendPendingPlayModeNotification (_PlaybackDidStop)
+                0.022 ms     0.006 ms       0.028 samples    |   |   | uncached_frame_change
+                                            0.111 samples    |   |   |   UpPlayer::IsTimeMunging
+                0.001 ms     0.001 ms       0.083 samples    |   |   |   CmdRegistry::_HandleNotice
+                0.015 ms     0.015 ms       0.028 samples    |   |   |   UpPlayer::SetPaused
+            """))
+        with trace as filepath:
+            parsed = Trace.Reporter.LoadReport(filepath)
+        
+        self.assertEqual(len(parsed), 1)
+
+        iters = 36
+        self.assertEqual(parsed[0].iterationCount, iters)
+
+        expected = BuildNodeDataTree([
+            #    incl      excl                      samp  indent+tag
+            (iters*0.040, iters*0.000, round(iters*0.028), "Main Thread"),
+            (iters*0.040, iters*0.004, round(iters*0.028), "  AppIterationFinished"),
+            (iters*0.036, iters*0.000, round(iters*0.028), "    AppExecuteQueuedLaterFunctions"),
+            (iters*0.036, iters*0.012, round(iters*0.028), "      UpPlayer::_SendPendingPlayModeNotification"),
+            (iters*0.024, iters*0.002, round(iters*0.028), "        UpPlayer::_SendPendingPlayModeNotification (_PlaybackDidStop)"),
+            (iters*0.022, iters*0.006, round(iters*0.028), "          uncached_frame_change"),
+            (iters*0.000, iters*0.000, round(iters*0.111), "            UpPlayer::IsTimeMunging"),
+            (iters*0.001, iters*0.001, round(iters*0.083), "            CmdRegistry::_HandleNotice"),
+            (iters*0.015, iters*0.015, round(iters*0.028), "            UpPlayer::SetPaused")
+        ])
+        self.AssertNodeTreesEqual(expected, GetNodeDataTree(parsed[0].tree))
+
+        # The parser and reporter round to the nearest thousandths place, but 
+        # also divide/multiply the iteration count respectively, so some 
+        # precision seems to be lost, and we need to check with a weaker 
+        # threshold.
+        #
+        # XXX: This threshold is only needed for the debug build, and seems 
+        # higher than expected. We should investigate this further.
+        self.AssertRoundTripValid(parsed, THRESHOLD*iters)
+
+    def test_MultipleTrees(self):
+        """
+        Test reading traces with multiple trees.
+        """
+        trace = TraceTextFile(textwrap.dedent("""
+            Tree view  ==============
+            inclusive    exclusive        
+            123.442 ms                    1 samples    Main Thread
+            123.442 ms     0.120 ms       1 samples    | Kitchen_set_flattened.usd
+            123.322 ms   123.320 ms       1 samples    |   SdfLayer::_WriteToFile
+              0.002 ms     0.002 ms       1 samples    |   | Sdf_FileFormatRegistry::FindByExtension
+
+
+            Tree view  ==============
+            inclusive    exclusive        
+              2.226 ms                    1 samples    Main Thread
+              2.226 ms     0.035 ms       1 samples    | s035_1c_fx_confetti_162.usd
+              2.191 ms     2.185 ms       1 samples    |   SdfLayer::_WriteToFile
+              0.006 ms     0.006 ms       1 samples    |   | Sdf_FileFormatRegistry::FindByExtension
+        """))
+        with trace as filepath:
+            parsed = Trace.Reporter.LoadReport(filepath)
+
+        self.assertEqual(len(parsed), 2)
+        self.assertEqual(parsed[0].iterationCount, 1)
+        self.assertEqual(parsed[1].iterationCount, 1)
+
+        expected1 = BuildNodeDataTree([
+            # incl       excl samp  indent+tag
+            (123.442,   0.000,   1, "Main Thread"),
+            (123.442,   0.120,   1, "  Kitchen_set_flattened.usd"),
+            (123.322, 123.320,   1, "    SdfLayer::_WriteToFile"),
+            (  0.002,   0.002,   1, "      Sdf_FileFormatRegistry::FindByExtension")
+        ])
+        expected2 = BuildNodeDataTree([
+            # incl   excl samp  indent+tag
+            (2.226, 0.000,   1, "Main Thread"),
+            (2.226, 0.035,   1, "  s035_1c_fx_confetti_162.usd"),
+            (2.191, 2.185,   1, "    SdfLayer::_WriteToFile"),
+            (0.006, 0.006,   1, "      Sdf_FileFormatRegistry::FindByExtension")
+        ])
+
+        self.AssertNodeTreesEqual(expected1, GetNodeDataTree(parsed[0].tree))
+        self.AssertNodeTreesEqual(expected2, GetNodeDataTree(parsed[1].tree))
+
+        self.AssertRoundTripValid(parsed)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/pxr/base/trace/testenv/testTraceReports.py b/pxr/base/trace/testenv/testTraceReports.py
index f654b52360..4643c6a716 100644
--- a/pxr/base/trace/testenv/testTraceReports.py
+++ b/pxr/base/trace/testenv/testTraceReports.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/base/trace/testenv/testTraceSerialization.cpp b/pxr/base/trace/testenv/testTraceSerialization.cpp
index f38fc28600..dac488c2be 100644
--- a/pxr/base/trace/testenv/testTraceSerialization.cpp
+++ b/pxr/base/trace/testenv/testTraceSerialization.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/testenv/testTraceThreading.cpp b/pxr/base/trace/testenv/testTraceThreading.cpp
index 07fb9e953d..0e2ddbdfc3 100644
--- a/pxr/base/trace/testenv/testTraceThreading.cpp
+++ b/pxr/base/trace/testenv/testTraceThreading.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/base/trace/threads.cpp b/pxr/base/trace/threads.cpp
index 940ae53555..3f5256a7cb 100644
--- a/pxr/base/trace/threads.cpp
+++ b/pxr/base/trace/threads.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/trace/threads.h"
diff --git a/pxr/base/trace/threads.h b/pxr/base/trace/threads.h
index 3d63e5a3a0..76da8137c8 100644
--- a/pxr/base/trace/threads.h
+++ b/pxr/base/trace/threads.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_THREADS_H
diff --git a/pxr/base/trace/trace.h b/pxr/base/trace/trace.h
index 244c65517c..8ca485031d 100644
--- a/pxr/base/trace/trace.h
+++ b/pxr/base/trace/trace.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TRACE_TRACE_H
diff --git a/pxr/base/trace/wrapAggregateNode.cpp b/pxr/base/trace/wrapAggregateNode.cpp
index 7e76805e2a..345a2ff8d6 100644
--- a/pxr/base/trace/wrapAggregateNode.cpp
+++ b/pxr/base/trace/wrapAggregateNode.cpp
@@ -1,31 +1,15 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
 
 #include "pxr/base/trace/aggregateNode.h"
 
+#include "pxr/base/tf/makePyConstructor.h"
 #include "pxr/base/tf/pyResultConversions.h"
 #include "pxr/base/tf/pyPtrHelpers.h"
 #include "pxr/base/tf/stringUtils.h"
@@ -58,6 +42,25 @@ GetCount(TraceAggregateNodePtr &self) {
     return self->GetCount(false /* recursive */);
 }
 
+static void
+_Append(
+    TraceAggregateNodePtr &self, 
+    const TraceAggregateNodePtr &other)
+{
+    self->Append(other);
+}
+
+static TraceAggregateNodeRefPtr
+_New(const TfToken &key,
+    const double timeMS,
+    const int count,
+    const int exclusiveCount)
+{
+    return TraceAggregateNode::New(
+        TraceAggregateNode::Id(), 
+        key, ArchSecondsToTicks(timeMS / 1e3), count, exclusiveCount);
+}
+
 void wrapAggregateNode()
 {
     using This = TraceAggregateNode;
@@ -65,6 +68,12 @@ void wrapAggregateNode()
 
     class_<This, ThisPtr>("AggregateNode", no_init)
         .def(TfPyWeakPtr())
+        .def("__init__", 
+            TfMakePyConstructor(_New),
+            (arg("key") = TfToken("root"),
+             arg("timeMS") = 0,
+             arg("count") = 1,
+             arg("exclusiveCount") = 1))
         .add_property("key", &This::GetKey )
         .add_property("id", 
             make_function(&This::GetId, 
@@ -77,7 +86,7 @@ void wrapAggregateNode()
             make_function(&This::GetChildren,
                           return_value_policy<TfPySequenceToList>()) )
         .add_property("expanded", &This::IsExpanded, &This::SetExpanded)
-        
+        .def("Append", _Append)
         ;
 
 };
diff --git a/pxr/base/trace/wrapAggregateTree.cpp b/pxr/base/trace/wrapAggregateTree.cpp
new file mode 100644
index 0000000000..f87371c036
--- /dev/null
+++ b/pxr/base/trace/wrapAggregateTree.cpp
@@ -0,0 +1,31 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+
+#include "pxr/base/trace/aggregateTree.h"
+
+#include "pxr/base/tf/makePyConstructor.h"
+#include "pxr/base/tf/pyPtrHelpers.h"
+
+#include <boost/python/class.hpp>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+using namespace boost::python;
+
+void wrapAggregateTree()
+{
+    using This = TraceAggregateTree;
+    using ThisPtr = TraceAggregateTreePtr;
+
+    class_<This, ThisPtr>("AggregateTree", no_init)
+        .def(TfPyRefAndWeakPtr())
+        .def(TfMakePyConstructor(&This::New))
+        .add_property("root", &This::GetRoot)
+    ;
+}
diff --git a/pxr/base/trace/wrapCollector.cpp b/pxr/base/trace/wrapCollector.cpp
index ae201a5b52..974f106796 100644
--- a/pxr/base/trace/wrapCollector.cpp
+++ b/pxr/base/trace/wrapCollector.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/trace/wrapReporter.cpp b/pxr/base/trace/wrapReporter.cpp
index 866d03469b..28e880e04a 100644
--- a/pxr/base/trace/wrapReporter.cpp
+++ b/pxr/base/trace/wrapReporter.cpp
@@ -1,37 +1,23 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
 
 #include "pxr/base/trace/reporter.h"
+
+#include "pxr/base/trace/aggregateTree.h"
 #include "pxr/base/trace/reporterDataSourceCollector.h"
 
 #include "pxr/base/tf/makePyConstructor.h"
 #include "pxr/base/tf/pyPtrHelpers.h"
-#include "pxr/base/tf/pyEnum.h"
+#include "pxr/base/tf/pyResultConversions.h"
 
 #include <boost/python/class.hpp>
+#include <boost/python/scope.hpp>
 
 #include <iostream>
 #include <fstream>
@@ -68,7 +54,6 @@ _ReportTimes(TraceReporterPtr self)
     self->ReportTimes(std::cout);
 }
 
-
 static void
 _ReportChromeTracing(
     const TraceReporterPtr &self)
@@ -85,6 +70,18 @@ _ReportChromeTracingToFile(
     self->ReportChromeTracing(os);
 }
 
+static std::vector<TraceReporter::ParsedTree> 
+_LoadReport(
+    const std::string &fileName)
+{
+    std::ifstream fileStream(fileName.c_str());
+    if (!fileStream.is_open()) {
+        TF_RUNTIME_ERROR("Failed to open file at %s", fileName.c_str());
+        return {};
+    }
+
+    return TraceReporter::LoadReport(fileStream);
+}
 
 static TraceReporterRefPtr
 _Constructor1(const std::string &label)
@@ -97,7 +94,7 @@ void wrapReporter()
     using This = TraceReporter;
     using ThisPtr = TraceReporterPtr;
 
-    object reporter_class = 
+    scope reporter_class = 
         class_<This, ThisPtr, boost::noncopyable>("Reporter", no_init)
         .def(TfPyRefAndWeakPtr())
         .def(TfMakePyConstructor(_Constructor1))
@@ -117,6 +114,11 @@ void wrapReporter()
         .def("ReportChromeTracing", &::_ReportChromeTracing)
         .def("ReportChromeTracingToFile", &::_ReportChromeTracingToFile)
 
+        .def("LoadReport", &::_LoadReport, 
+            (arg("fileName")),
+            return_value_policy<TfPySequenceToList>())
+        .staticmethod("LoadReport")
+
         .add_property("aggregateTreeRoot", &This::GetAggregateTreeRoot)
 
         .def("UpdateTraceTrees", &This::UpdateTraceTrees)
@@ -135,4 +137,13 @@ void wrapReporter()
 
         .add_static_property("globalReporter", &This::GetGlobalReporter)
         ;
+
+    class_<This::ParsedTree>("ParsedTree", no_init)
+        .add_property("tree", 
+            make_function(+[](const This::ParsedTree &self) {
+                return self.tree;
+            },
+            return_value_policy<TfPyRefPtrFactory<>>()))
+        .def_readonly("iterationCount", &This::ParsedTree::iterationCount)
+        ;
 };
diff --git a/pxr/base/trace/wrapTestTrace.cpp b/pxr/base/trace/wrapTestTrace.cpp
index c00eb31f89..8a329c5023 100644
--- a/pxr/base/trace/wrapTestTrace.cpp
+++ b/pxr/base/trace/wrapTestTrace.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/TsTest_Comparator.py b/pxr/base/ts/TsTest_Comparator.py
index f4cb8c0529..9b6b796ed1 100644
--- a/pxr/base/ts/TsTest_Comparator.py
+++ b/pxr/base/ts/TsTest_Comparator.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from .TsTest_Grapher import TsTest_Grapher
diff --git a/pxr/base/ts/TsTest_CompareBaseline.py b/pxr/base/ts/TsTest_CompareBaseline.py
index 53607c9106..41a0a239dd 100644
--- a/pxr/base/ts/TsTest_CompareBaseline.py
+++ b/pxr/base/ts/TsTest_CompareBaseline.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from .TsTest_Grapher import TsTest_Grapher
diff --git a/pxr/base/ts/TsTest_Grapher.py b/pxr/base/ts/TsTest_Grapher.py
index 95a9915f0a..eb8ac2e199 100644
--- a/pxr/base/ts/TsTest_Grapher.py
+++ b/pxr/base/ts/TsTest_Grapher.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from . import TsTest_SplineData as SData
diff --git a/pxr/base/ts/TsTest_MayapyDriver.py b/pxr/base/ts/TsTest_MayapyDriver.py
index b717406ff6..f443a7d7bc 100644
--- a/pxr/base/ts/TsTest_MayapyDriver.py
+++ b/pxr/base/ts/TsTest_MayapyDriver.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 #
diff --git a/pxr/base/ts/TsTest_MayapyEvaluator.py b/pxr/base/ts/TsTest_MayapyEvaluator.py
index 11e620eb22..48fa678ce4 100644
--- a/pxr/base/ts/TsTest_MayapyEvaluator.py
+++ b/pxr/base/ts/TsTest_MayapyEvaluator.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Ts
diff --git a/pxr/base/ts/__init__.py b/pxr/base/ts/__init__.py
index 0b2ca51e55..5e1d588110 100644
--- a/pxr/base/ts/__init__.py
+++ b/pxr/base/ts/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/base/ts/api.h b/pxr/base/ts/api.h
index 1ed73f4d87..6bfa1b4a43 100644
--- a/pxr/base/ts/api.h
+++ b/pxr/base/ts/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_TS_API_H
diff --git a/pxr/base/ts/data.cpp b/pxr/base/ts/data.cpp
index 9b7e75de48..b6ba996532 100644
--- a/pxr/base/ts/data.cpp
+++ b/pxr/base/ts/data.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/data.h b/pxr/base/ts/data.h
index 96a27c3382..e88111e482 100644
--- a/pxr/base/ts/data.h
+++ b/pxr/base/ts/data.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_DATA_H
diff --git a/pxr/base/ts/diff.cpp b/pxr/base/ts/diff.cpp
index f24b6fa13c..d5a8c093d9 100644
--- a/pxr/base/ts/diff.cpp
+++ b/pxr/base/ts/diff.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/diff.h b/pxr/base/ts/diff.h
index 3a070cbf30..e16d73776d 100644
--- a/pxr/base/ts/diff.h
+++ b/pxr/base/ts/diff.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_DIFF_H
diff --git a/pxr/base/ts/evalCache.cpp b/pxr/base/ts/evalCache.cpp
index b2c979ad8d..8851e1daf2 100644
--- a/pxr/base/ts/evalCache.cpp
+++ b/pxr/base/ts/evalCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/evalCache.h b/pxr/base/ts/evalCache.h
index 984f4e459e..5c118c7df3 100644
--- a/pxr/base/ts/evalCache.h
+++ b/pxr/base/ts/evalCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_EVAL_CACHE_H
diff --git a/pxr/base/ts/evalUtils.cpp b/pxr/base/ts/evalUtils.cpp
index e4b6ab86ab..08a68a8dd5 100644
--- a/pxr/base/ts/evalUtils.cpp
+++ b/pxr/base/ts/evalUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/evalUtils.h b/pxr/base/ts/evalUtils.h
index 5ee3308725..3ef9a92f8e 100644
--- a/pxr/base/ts/evalUtils.h
+++ b/pxr/base/ts/evalUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_EVAL_UTILS_H
diff --git a/pxr/base/ts/evaluator.h b/pxr/base/ts/evaluator.h
index 0d392c5182..a68bef2299 100644
--- a/pxr/base/ts/evaluator.h
+++ b/pxr/base/ts/evaluator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_EVALUATOR_H
diff --git a/pxr/base/ts/keyFrame.cpp b/pxr/base/ts/keyFrame.cpp
index f0196d11a1..291c984111 100644
--- a/pxr/base/ts/keyFrame.cpp
+++ b/pxr/base/ts/keyFrame.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/keyFrame.h b/pxr/base/ts/keyFrame.h
index 6f367c3480..4c527c6479 100644
--- a/pxr/base/ts/keyFrame.h
+++ b/pxr/base/ts/keyFrame.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_KEY_FRAME_H
@@ -35,7 +18,7 @@
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/stringUtils.h"
 
-#include <iostream>
+#include <iosfwd>
 #include <typeinfo>
 
 PXR_NAMESPACE_OPEN_SCOPE
diff --git a/pxr/base/ts/keyFrameMap.cpp b/pxr/base/ts/keyFrameMap.cpp
index 49a99799ef..22dd1b9850 100644
--- a/pxr/base/ts/keyFrameMap.cpp
+++ b/pxr/base/ts/keyFrameMap.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/keyFrameMap.h b/pxr/base/ts/keyFrameMap.h
index 84ba49c8da..f10d57ffa1 100644
--- a/pxr/base/ts/keyFrameMap.h
+++ b/pxr/base/ts/keyFrameMap.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_KEY_FRAME_MAP_H
diff --git a/pxr/base/ts/keyFrameUtils.cpp b/pxr/base/ts/keyFrameUtils.cpp
index fcb5d59f47..23047c55f0 100644
--- a/pxr/base/ts/keyFrameUtils.cpp
+++ b/pxr/base/ts/keyFrameUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/keyFrameUtils.h b/pxr/base/ts/keyFrameUtils.h
index 51e13484f5..6dcebabf8e 100644
--- a/pxr/base/ts/keyFrameUtils.h
+++ b/pxr/base/ts/keyFrameUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_KEY_FRAME_UTILS_H
diff --git a/pxr/base/ts/loopParams.cpp b/pxr/base/ts/loopParams.cpp
index 9956eda250..9bdc3834df 100644
--- a/pxr/base/ts/loopParams.cpp
+++ b/pxr/base/ts/loopParams.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/loopParams.h b/pxr/base/ts/loopParams.h
index 2d96a314bb..4cb0757c57 100644
--- a/pxr/base/ts/loopParams.h
+++ b/pxr/base/ts/loopParams.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_LOOP_PARAMS_H
diff --git a/pxr/base/ts/mathUtils.cpp b/pxr/base/ts/mathUtils.cpp
index aff34638a9..c8fc7a38d2 100644
--- a/pxr/base/ts/mathUtils.cpp
+++ b/pxr/base/ts/mathUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/mathUtils.h b/pxr/base/ts/mathUtils.h
index 62741b24c5..994cde938d 100644
--- a/pxr/base/ts/mathUtils.h
+++ b/pxr/base/ts/mathUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_MATH_UTILS_H
diff --git a/pxr/base/ts/module.cpp b/pxr/base/ts/module.cpp
index 73a4421f60..88ce1c24ac 100644
--- a/pxr/base/ts/module.cpp
+++ b/pxr/base/ts/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/moduleDeps.cpp b/pxr/base/ts/moduleDeps.cpp
index 7abee1c4b8..5e009e3d9e 100644
--- a/pxr/base/ts/moduleDeps.cpp
+++ b/pxr/base/ts/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/pch.h b/pxr/base/ts/pch.h
index 646797e89e..73c4088666 100644
--- a/pxr/base/ts/pch.h
+++ b/pxr/base/ts/pch.h
@@ -1,25 +1,8 @@
 //
-// Copyright 2023 Pixar
+// Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -39,7 +22,8 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-
+#include <Windows.h>
+#include <intrin.h>
 #endif
 #include <algorithm>
 #include <any>
@@ -57,7 +41,6 @@
 #include <deque>
 #include <float.h>
 #include <functional>
-#include <intrin.h>
 #include <iosfwd>
 #include <iostream>
 #include <iterator>
@@ -70,6 +53,7 @@
 #include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -85,13 +69,8 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/preprocessor/seq/enum.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/function.hpp>
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/converter/from_python.hpp>
diff --git a/pxr/base/ts/simplify.cpp b/pxr/base/ts/simplify.cpp
index 19a4626a3c..5f8e0edc50 100644
--- a/pxr/base/ts/simplify.cpp
+++ b/pxr/base/ts/simplify.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/simplify.h b/pxr/base/ts/simplify.h
index 031aeb39a3..87ad2d46f5 100644
--- a/pxr/base/ts/simplify.h
+++ b/pxr/base/ts/simplify.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_SIMPLIFY_H
diff --git a/pxr/base/ts/spline.cpp b/pxr/base/ts/spline.cpp
index ddb858802b..7319d9643d 100644
--- a/pxr/base/ts/spline.cpp
+++ b/pxr/base/ts/spline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/spline.h b/pxr/base/ts/spline.h
index 2c2b96a025..753cd6859b 100644
--- a/pxr/base/ts/spline.h
+++ b/pxr/base/ts/spline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_SPLINE_H
diff --git a/pxr/base/ts/spline_KeyFrames.cpp b/pxr/base/ts/spline_KeyFrames.cpp
index b31dc37928..685e2b8637 100644
--- a/pxr/base/ts/spline_KeyFrames.cpp
+++ b/pxr/base/ts/spline_KeyFrames.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/spline_KeyFrames.h b/pxr/base/ts/spline_KeyFrames.h
index 6743bfd425..ae4c79bf63 100644
--- a/pxr/base/ts/spline_KeyFrames.h
+++ b/pxr/base/ts/spline_KeyFrames.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_SPLINE_KEY_FRAMES_H
diff --git a/pxr/base/ts/testenv/testTsDerivatives.py b/pxr/base/ts/testenv/testTsDerivatives.py
index d4dfb6bd4e..eaaf7836de 100644
--- a/pxr/base/ts/testenv/testTsDerivatives.py
+++ b/pxr/base/ts/testenv/testTsDerivatives.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Ts, Gf
diff --git a/pxr/base/ts/testenv/testTsKeyFrame.py b/pxr/base/ts/testenv/testTsKeyFrame.py
index 5f98b31faa..acb65acf15 100644
--- a/pxr/base/ts/testenv/testTsKeyFrame.py
+++ b/pxr/base/ts/testenv/testTsKeyFrame.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import sys
diff --git a/pxr/base/ts/testenv/testTsSimplify.py b/pxr/base/ts/testenv/testTsSimplify.py
index e375b4772d..8a2ee329fe 100644
--- a/pxr/base/ts/testenv/testTsSimplify.py
+++ b/pxr/base/ts/testenv/testTsSimplify.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Ts, Gf
diff --git a/pxr/base/ts/testenv/testTsSpline.py b/pxr/base/ts/testenv/testTsSpline.py
index 484de09142..94a7d8ee4c 100644
--- a/pxr/base/ts/testenv/testTsSpline.py
+++ b/pxr/base/ts/testenv/testTsSpline.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Ts, Tf, Gf
diff --git a/pxr/base/ts/testenv/testTsSplineAPI.py b/pxr/base/ts/testenv/testTsSplineAPI.py
index 832fd6f52f..50a1591ba6 100644
--- a/pxr/base/ts/testenv/testTsSplineAPI.py
+++ b/pxr/base/ts/testenv/testTsSplineAPI.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/base/ts/testenv/testTsThreadedCOW.cpp b/pxr/base/ts/testenv/testTsThreadedCOW.cpp
index 8d31bfcda8..7da04864a8 100644
--- a/pxr/base/ts/testenv/testTsThreadedCOW.cpp
+++ b/pxr/base/ts/testenv/testTsThreadedCOW.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/testenv/testTs_HardToReach.cpp b/pxr/base/ts/testenv/testTs_HardToReach.cpp
index 9f0040f8c6..dca58a7587 100644
--- a/pxr/base/ts/testenv/testTs_HardToReach.cpp
+++ b/pxr/base/ts/testenv/testTs_HardToReach.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/testenv/tsTest_AnimXFramework.py b/pxr/base/ts/testenv/tsTest_AnimXFramework.py
index d7a3eca98a..d5b562bfe1 100644
--- a/pxr/base/ts/testenv/tsTest_AnimXFramework.py
+++ b/pxr/base/ts/testenv/tsTest_AnimXFramework.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Ts import TsTest_Museum as Museum
diff --git a/pxr/base/ts/testenv/tsTest_MayapyFramework.py b/pxr/base/ts/testenv/tsTest_MayapyFramework.py
index b589f57653..01dd458dca 100644
--- a/pxr/base/ts/testenv/tsTest_MayapyFramework.py
+++ b/pxr/base/ts/testenv/tsTest_MayapyFramework.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Ts import TsTest_Museum as Museum
diff --git a/pxr/base/ts/testenv/tsTest_MayapyVsAnimX.py b/pxr/base/ts/testenv/tsTest_MayapyVsAnimX.py
index c739b7551c..554d61eba1 100644
--- a/pxr/base/ts/testenv/tsTest_MayapyVsAnimX.py
+++ b/pxr/base/ts/testenv/tsTest_MayapyVsAnimX.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Ts import TsTest_Museum as Museum
diff --git a/pxr/base/ts/testenv/tsTest_TsFramework.py b/pxr/base/ts/testenv/tsTest_TsFramework.py
index ba5461e52a..6c670c5f30 100644
--- a/pxr/base/ts/testenv/tsTest_TsFramework.py
+++ b/pxr/base/ts/testenv/tsTest_TsFramework.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Ts import TsTest_Museum as Museum
diff --git a/pxr/base/ts/testenv/tsTest_TsVsMayapy.py b/pxr/base/ts/testenv/tsTest_TsVsMayapy.py
index 072a1fc936..62693dee85 100644
--- a/pxr/base/ts/testenv/tsTest_TsVsMayapy.py
+++ b/pxr/base/ts/testenv/tsTest_TsVsMayapy.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Ts import TsTest_Museum as Museum
diff --git a/pxr/base/ts/tsTest_AnimXEvaluator.cpp b/pxr/base/ts/tsTest_AnimXEvaluator.cpp
index 5dfb8ceec4..f1a16b1060 100644
--- a/pxr/base/ts/tsTest_AnimXEvaluator.cpp
+++ b/pxr/base/ts/tsTest_AnimXEvaluator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/tsTest_AnimXEvaluator.h b/pxr/base/ts/tsTest_AnimXEvaluator.h
index 9833945b0c..f0df0686e6 100644
--- a/pxr/base/ts/tsTest_AnimXEvaluator.h
+++ b/pxr/base/ts/tsTest_AnimXEvaluator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_EXTRAS_BASE_TS_TEST_ANIM_X
diff --git a/pxr/base/ts/tsTest_Evaluator.cpp b/pxr/base/ts/tsTest_Evaluator.cpp
index eb55bfbb34..409bdcb3db 100644
--- a/pxr/base/ts/tsTest_Evaluator.cpp
+++ b/pxr/base/ts/tsTest_Evaluator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/tsTest_Evaluator.h b/pxr/base/ts/tsTest_Evaluator.h
index 6080bc58e3..b059b1d49c 100644
--- a/pxr/base/ts/tsTest_Evaluator.h
+++ b/pxr/base/ts/tsTest_Evaluator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TS_TEST_EVALUATOR_H
diff --git a/pxr/base/ts/tsTest_Museum.cpp b/pxr/base/ts/tsTest_Museum.cpp
index 40a612dcb2..d10551e188 100644
--- a/pxr/base/ts/tsTest_Museum.cpp
+++ b/pxr/base/ts/tsTest_Museum.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/tsTest_Museum.h b/pxr/base/ts/tsTest_Museum.h
index 95e5366b05..364d3afdaf 100644
--- a/pxr/base/ts/tsTest_Museum.h
+++ b/pxr/base/ts/tsTest_Museum.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TS_TEST_MUSEUM_H
diff --git a/pxr/base/ts/tsTest_SampleBezier.cpp b/pxr/base/ts/tsTest_SampleBezier.cpp
index a88132e502..8831008c93 100644
--- a/pxr/base/ts/tsTest_SampleBezier.cpp
+++ b/pxr/base/ts/tsTest_SampleBezier.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/tsTest_SampleBezier.h b/pxr/base/ts/tsTest_SampleBezier.h
index 7d51f5ce7d..902fc1bec0 100644
--- a/pxr/base/ts/tsTest_SampleBezier.h
+++ b/pxr/base/ts/tsTest_SampleBezier.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TS_TEST_SAMPLE_BEZIER_H
diff --git a/pxr/base/ts/tsTest_SampleTimes.cpp b/pxr/base/ts/tsTest_SampleTimes.cpp
index 691903c406..0d54bac798 100644
--- a/pxr/base/ts/tsTest_SampleTimes.cpp
+++ b/pxr/base/ts/tsTest_SampleTimes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/tsTest_SampleTimes.h b/pxr/base/ts/tsTest_SampleTimes.h
index 1b2bce32f8..6437dc84c9 100644
--- a/pxr/base/ts/tsTest_SampleTimes.h
+++ b/pxr/base/ts/tsTest_SampleTimes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TS_TEST_SAMPLE_TIMES_H
diff --git a/pxr/base/ts/tsTest_SplineData.cpp b/pxr/base/ts/tsTest_SplineData.cpp
index c02b2d5c9d..ddaf4bcb45 100644
--- a/pxr/base/ts/tsTest_SplineData.cpp
+++ b/pxr/base/ts/tsTest_SplineData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/tsTest_SplineData.h b/pxr/base/ts/tsTest_SplineData.h
index b658161099..575b49a2a5 100644
--- a/pxr/base/ts/tsTest_SplineData.h
+++ b/pxr/base/ts/tsTest_SplineData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TS_TEST_SPLINE_DATA_H
diff --git a/pxr/base/ts/tsTest_TsEvaluator.cpp b/pxr/base/ts/tsTest_TsEvaluator.cpp
index a60d6cc0f6..754f150761 100644
--- a/pxr/base/ts/tsTest_TsEvaluator.cpp
+++ b/pxr/base/ts/tsTest_TsEvaluator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/tsTest_TsEvaluator.h b/pxr/base/ts/tsTest_TsEvaluator.h
index b17d27d15e..51d8ae207f 100644
--- a/pxr/base/ts/tsTest_TsEvaluator.h
+++ b/pxr/base/ts/tsTest_TsEvaluator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TS_TEST_TS_EVALUATOR_H
diff --git a/pxr/base/ts/tsTest_Types.cpp b/pxr/base/ts/tsTest_Types.cpp
index a6feb79fc6..160fd52d8d 100644
--- a/pxr/base/ts/tsTest_Types.cpp
+++ b/pxr/base/ts/tsTest_Types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/tsTest_Types.h b/pxr/base/ts/tsTest_Types.h
index 6c3fc68461..dd3d85cdee 100644
--- a/pxr/base/ts/tsTest_Types.h
+++ b/pxr/base/ts/tsTest_Types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TS_TEST_TYPES_H
diff --git a/pxr/base/ts/typeRegistry.cpp b/pxr/base/ts/typeRegistry.cpp
index 80a0375679..7404a387f7 100644
--- a/pxr/base/ts/typeRegistry.cpp
+++ b/pxr/base/ts/typeRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/typeRegistry.h b/pxr/base/ts/typeRegistry.h
index 3594d9b020..18d5bf490b 100644
--- a/pxr/base/ts/typeRegistry.h
+++ b/pxr/base/ts/typeRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TYPE_REGISTRY_H
diff --git a/pxr/base/ts/types.cpp b/pxr/base/ts/types.cpp
index ad585e5e5d..159bf56917 100644
--- a/pxr/base/ts/types.cpp
+++ b/pxr/base/ts/types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/types.h b/pxr/base/ts/types.h
index 04f760dc12..6ab2f34116 100644
--- a/pxr/base/ts/types.h
+++ b/pxr/base/ts/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_TYPES_H
diff --git a/pxr/base/ts/wrapKeyFrame.cpp b/pxr/base/ts/wrapKeyFrame.cpp
index 03df7e3014..28a37f0f09 100644
--- a/pxr/base/ts/wrapKeyFrame.cpp
+++ b/pxr/base/ts/wrapKeyFrame.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapLoopParams.cpp b/pxr/base/ts/wrapLoopParams.cpp
index ea760c97c0..71a4373b39 100644
--- a/pxr/base/ts/wrapLoopParams.cpp
+++ b/pxr/base/ts/wrapLoopParams.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapSimplify.cpp b/pxr/base/ts/wrapSimplify.cpp
index f7e74337a9..0890625689 100644
--- a/pxr/base/ts/wrapSimplify.cpp
+++ b/pxr/base/ts/wrapSimplify.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapSpline.cpp b/pxr/base/ts/wrapSpline.cpp
index 9cff885f3d..ee465019aa 100644
--- a/pxr/base/ts/wrapSpline.cpp
+++ b/pxr/base/ts/wrapSpline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -305,7 +288,7 @@ _Iter( const TsSpline & val )
     // complete.
     PyObject *iter = PyObject_GetIter(kf_list);
 
-    // XXX decref on kf_list?
+    Py_DECREF(kf_list);
 
     return iter;
 }
diff --git a/pxr/base/ts/wrapTsTest_AnimXEvaluator.cpp b/pxr/base/ts/wrapTsTest_AnimXEvaluator.cpp
index 49a2837327..445648286f 100644
--- a/pxr/base/ts/wrapTsTest_AnimXEvaluator.cpp
+++ b/pxr/base/ts/wrapTsTest_AnimXEvaluator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapTsTest_Evaluator.cpp b/pxr/base/ts/wrapTsTest_Evaluator.cpp
index 12ca4c0ec4..37f06909d4 100644
--- a/pxr/base/ts/wrapTsTest_Evaluator.cpp
+++ b/pxr/base/ts/wrapTsTest_Evaluator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapTsTest_Museum.cpp b/pxr/base/ts/wrapTsTest_Museum.cpp
index dc69587e12..716ad4ccae 100644
--- a/pxr/base/ts/wrapTsTest_Museum.cpp
+++ b/pxr/base/ts/wrapTsTest_Museum.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapTsTest_SampleBezier.cpp b/pxr/base/ts/wrapTsTest_SampleBezier.cpp
index 459ddba542..611ec81b7e 100644
--- a/pxr/base/ts/wrapTsTest_SampleBezier.cpp
+++ b/pxr/base/ts/wrapTsTest_SampleBezier.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapTsTest_SampleTimes.cpp b/pxr/base/ts/wrapTsTest_SampleTimes.cpp
index 89d7bc6217..8e13be32dc 100644
--- a/pxr/base/ts/wrapTsTest_SampleTimes.cpp
+++ b/pxr/base/ts/wrapTsTest_SampleTimes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapTsTest_SplineData.cpp b/pxr/base/ts/wrapTsTest_SplineData.cpp
index 3aaea2b751..26a7639fdf 100644
--- a/pxr/base/ts/wrapTsTest_SplineData.cpp
+++ b/pxr/base/ts/wrapTsTest_SplineData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapTsTest_TsEvaluator.cpp b/pxr/base/ts/wrapTsTest_TsEvaluator.cpp
index d2a359383c..37989ec8c5 100644
--- a/pxr/base/ts/wrapTsTest_TsEvaluator.cpp
+++ b/pxr/base/ts/wrapTsTest_TsEvaluator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapTsTest_Types.cpp b/pxr/base/ts/wrapTsTest_Types.cpp
index 0b96b72a8b..3257666168 100644
--- a/pxr/base/ts/wrapTsTest_Types.cpp
+++ b/pxr/base/ts/wrapTsTest_Types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapTypes.cpp b/pxr/base/ts/wrapTypes.cpp
index c14c549875..c0f1cc4779 100644
--- a/pxr/base/ts/wrapTypes.cpp
+++ b/pxr/base/ts/wrapTypes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/ts/wrapUtils.h b/pxr/base/ts/wrapUtils.h
index 7b64c0729d..7bd1026fcd 100644
--- a/pxr/base/ts/wrapUtils.h
+++ b/pxr/base/ts/wrapUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_BASE_TS_WRAP_UTILS_H
diff --git a/pxr/base/vt/CMakeLists.txt b/pxr/base/vt/CMakeLists.txt
index 6d103ebcbb..87fb59a762 100644
--- a/pxr/base/vt/CMakeLists.txt
+++ b/pxr/base/vt/CMakeLists.txt
@@ -17,7 +17,6 @@ pxr_library(vt
     PUBLIC_CLASSES
         array
         dictionary
-        functions
         hash
         streamOut
         types
@@ -73,7 +72,6 @@ pxr_build_test(testVtCpp
 pxr_test_scripts(
     testenv/testVtArray.py
     testenv/testVtValue.py
-    testenv/testVtFunctions.py
 )
 pxr_register_test(testVtValue
     PYTHON
@@ -83,10 +81,6 @@ pxr_register_test(testVtArray
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testVtArray"
 )
-pxr_register_test(testVtFunctions
-    PYTHON
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testVtFunctions"
-)
 pxr_register_test(testVtCpp
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testVtCpp"
 )
diff --git a/pxr/base/vt/__init__.py b/pxr/base/vt/__init__.py
index 9032cf67db..48c31f4f30 100644
--- a/pxr/base/vt/__init__.py
+++ b/pxr/base/vt/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """Vt Value Types library
 
diff --git a/pxr/base/vt/api.h b/pxr/base/vt/api.h
index 67d66c4a6d..7ce9317720 100644
--- a/pxr/base/vt/api.h
+++ b/pxr/base/vt/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_API_H
 #define PXR_BASE_VT_API_H
diff --git a/pxr/base/vt/array.cpp b/pxr/base/vt/array.cpp
index 681a05da71..ce66730aa4 100644
--- a/pxr/base/vt/array.cpp
+++ b/pxr/base/vt/array.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/array.h b/pxr/base/vt/array.h
index 5c684acc27..79157fa9b6 100644
--- a/pxr/base/vt/array.h
+++ b/pxr/base/vt/array.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_ARRAY_H
 #define PXR_BASE_VT_ARRAY_H
diff --git a/pxr/base/vt/arrayPyBuffer.cpp b/pxr/base/vt/arrayPyBuffer.cpp
index c5ed6f71e5..1e98068b13 100644
--- a/pxr/base/vt/arrayPyBuffer.cpp
+++ b/pxr/base/vt/arrayPyBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/arrayPyBuffer.h b/pxr/base/vt/arrayPyBuffer.h
index bdb1847209..56abdc0ceb 100644
--- a/pxr/base/vt/arrayPyBuffer.h
+++ b/pxr/base/vt/arrayPyBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_ARRAY_PY_BUFFER_H
 #define PXR_BASE_VT_ARRAY_PY_BUFFER_H
diff --git a/pxr/base/vt/dictionary.cpp b/pxr/base/vt/dictionary.cpp
index 4231aba56a..e96ac8e78b 100644
--- a/pxr/base/vt/dictionary.cpp
+++ b/pxr/base/vt/dictionary.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/dictionary.h b/pxr/base/vt/dictionary.h
index 80fc512243..16487a58da 100644
--- a/pxr/base/vt/dictionary.h
+++ b/pxr/base/vt/dictionary.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_DICTIONARY_H
 #define PXR_BASE_VT_DICTIONARY_H
diff --git a/pxr/base/vt/functions.h b/pxr/base/vt/functions.h
deleted file mode 100644
index 00540d2896..0000000000
--- a/pxr/base/vt/functions.h
+++ /dev/null
@@ -1,348 +0,0 @@
-//
-// Copyright 2016 Pixar
-//
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
-//
-#if !BOOST_PP_IS_ITERATING
-
-#ifndef PXR_BASE_VT_FUNCTIONS_H
-#define PXR_BASE_VT_FUNCTIONS_H
-
-/// \file vt/functions.h
-
-#include "pxr/pxr.h"
-#include "pxr/base/vt/api.h"
-#include "pxr/base/vt/array.h"
-#include <boost/preprocessor/enum_params.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/repeat.hpp>
-#include <vector>
-
-PXR_NAMESPACE_OPEN_SCOPE
-
-#define VT_FUNCTIONS_MAX_ARGS 6
-
-// Set up preprocessor iterations to allow various functions to accept multiple
-// arguments.
-
-// VtCat
-#define BOOST_PP_ITERATION_PARAMS_1 (4, \
-    (0, VT_FUNCTIONS_MAX_ARGS, "pxr/base/vt/functions.h", 0))
-#include BOOST_PP_ITERATE()
-
-// ****************************************************************************
-// Doc headers for functions that are generated through macros.  These get
-// decent doxygen (and epydoc) output even though we can't put them on the
-// real functions because they're expanded through boost or cpp macros.
-// ****************************************************************************
-
-// documentation for bool-result array comparison functions
-#ifdef doxygen
-
-/// Returns a bool array specifying, element-by-element, if the two inputs
-/// contain equal values.  The shape of the return array is the same as the
-/// shape of the largest input array.
-///
-/// If one input is a single element (either a single-element array or a scalar
-/// of the same type held in the array), it is compared to all the elements
-/// in the other array.  Otherwise both arrays must have the same shape.
-template<typename T>
-VtArray<T>
-VtEqual( VtArray<T> const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtEqual( T const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtEqual( VtArray<T> const &a, T const &b );
-
-/// Returns a bool array specifying, element-by-element, if the two inputs
-/// contain inequal values.  The shape of the return array is the same as the
-/// shape of the largest input array.
-///
-/// If one input is a single element (either a single-element array or a scalar
-/// of the same type held in the array), it is compared to all the elements
-/// in the other array.  Otherwise both arrays must have the same shape.
-template<typename T>
-VtArray<T>
-VtNotEqual( VtArray<T> const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtNotEqual( T const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtNotEqual( VtArray<T> const &a, T const &b );
-
-/// Returns a bool array specifying, element-by-element, if the first input
-/// contains values greater than those in the second input. The shape of the
-/// return array is the same as the shape of the largest input array.
-///
-/// If one input is a single element (either a single-element array or a scalar
-/// of the same type held in the array), it is compared to all the elements
-/// in the other array.  Otherwise both arrays must have the same shape.
-template<typename T>
-VtArray<T>
-VtGreater( VtArray<T> const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtGreater( T const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtGreater( VtArray<T> const &a, T const &b );
-
-/// Returns a bool array specifying, element-by-element, if the first input
-/// contains values less than those in the second input. The shape of the
-/// return array is the same as the shape of the largest input array.
-///
-/// If one input is a single element (either a single-element array or a scalar
-/// of the same type held in the array), it is compared to all the elements
-/// in the other array.  Otherwise both arrays must have the same shape.
-template<typename T>
-VtArray<T>
-VtLess( VtArray<T> const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtLess( T const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtLess( VtArray<T> const &a, T const &b );
-
-/// Returns a bool array specifying, element-by-element, if the first input
-/// contains values greater than or equal to those in the second input. The
-/// shape of the return array is the same as the shape of the largest input
-/// array.
-///
-/// If one input is a single element (either a single-element array or a scalar
-/// of the same type held in the array), it is compared to all the elements
-/// in the other array.  Otherwise both arrays must have the same shape.
-template<typename T>
-VtArray<T>
-VtGreaterOrEqual( VtArray<T> const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtGreaterOrEqual( T const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtGreaterOrEqual( VtArray<T> const &a, T const &b );
-
-/// Returns a bool array specifying, element-by-element, if the first input
-/// contains values less than or equal to those in the second input. The shape
-/// of the return array is the same as the shape of the largest input array.
-///
-/// If one input is a single element (either a single-element array or a scalar
-/// of the same type held in the array), it is compared to all the elements
-/// in the other array.  Otherwise both arrays must have the same shape.
-template<typename T>
-VtArray<T>
-VtLessOrEqual( VtArray<T> const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtLessOrEqual( T const &a, VtArray<T> const &b );
-template<typename T>
-VtArray<T>
-VtLessOrEqual( VtArray<T> const &a, T const &b );
-
-#endif
-
-// provide documentation for functions with variable numbers of inputs
-#ifdef doxygen
-
-/// Concatenates arrays.
-///
-/// The result is an array with length equal to the sum of the number
-/// of elements in the source arrays.
-template<typename T>
-VtArray<T>
-VtCat( VtArray<T> const &a0, VtArray<T> const &a1, ... VtArray<T> const &aN);
-
-#endif
-
-// ****************************************************************************
-// Fixed-number-of-arguments functions go here (no preprocessor iteration to
-// handle multiple args)
-// ****************************************************************************
-
-/// Returns true if any element of input array is not VtZero, else false.
-///
-/// Intended to be used to evaluate results of boolean operations on arrays, e.g.
-/// \code
-/// a = Vt.StringArray((3,),("foo","bar","baz"))
-/// t = Vt.AnyTrue(Vt.Equal(a,"bar"))
-/// \endcode
-///
-/// (This example, if 
-/// you look carefully, evaluates this function not on the strings, but on
-/// the results of the comparison).
-template<typename T>
-bool VtAnyTrue(VtArray<T> const &a)
-{
-    if (a.empty())
-        return false;
-
-    for (size_t i = 0; i != a.size(); ++i) {
-        if (a[i] != VtZero<T>())
-            return true;
-    }
-
-    return false;
-}
-
-
-/// Returns true if every element of input array is not VtZero, else false.
-///
-/// Intended to be used to evaluate results of boolean operations on arrays, e.g.
-/// \code
-/// a = Vt.StringArray((3,),("foo","bar","baz"))
-/// t = Vt.AllTrue(Vt.Equal(a,"bar"))
-/// \endcode
-///
-/// (This example, if you look carefully, evaluates this function not on the
-/// strings, but on the results of the comparison).
-template<typename T>
-bool
-VtAllTrue(VtArray<T> const &a)
-{
-    if (a.empty())
-        return false;
-
-    for (size_t i = 0; i != a.size(); ++i) {
-        if (a[i] == VtZero<T>())
-            return false;
-    }
-
-    return true;
-}
-
-// Macro defining functions for element-by-element comparison
-// operators (i.e. Equal, etc).  There are three versions; each returns
-// a VtBoolArray of the same shape as the largest input.
-// *) two input arrays:
-//    If one array contains a single element, it is compared to all the elements
-//    in the other array.  Otherwise both arrays must have the same shape.
-// *) scalar and array:
-//    The scalar is compared to all the elements in the array.
-// *) array and scalar:
-//    The same as scalar and array.
-#define VTFUNCTION_BOOL(funcname,op)                                \
-template<typename T>                                                \
-VtArray<bool>                                                       \
-funcname(T const &scalar, VtArray<T> const &vec) {                  \
-    VtArray<bool> ret(vec.size());                                  \
-    for (size_t i = 0, n = vec.size(); i != n; ++i) {               \
-        ret[i] = (scalar op vec[i]);                                \
-    }                                                               \
-    return ret;                                                     \
-}                                                                   \
-template<typename T>                                                \
-VtArray<bool>                                                       \
-funcname(VtArray<T> const &vec, T const &scalar) {                  \
-    VtArray<bool> ret(vec.size());                                  \
-    for (size_t i = 0, n = vec.size(); i != n; ++i) {               \
-        ret[i] = (vec[i] op scalar);                                \
-    }                                                               \
-    return ret;                                                     \
-}                                                                   \
-template<typename T>                                                \
-VtArray<bool>                                                       \
-funcname(VtArray<T> const &a, VtArray<T> const &b)                  \
-{                                                                   \
-    if (a.empty() || b.empty()) {                                   \
-        return VtArray<bool>();                                     \
-    }                                                               \
-                                                                    \
-    if (a.size() == 1) {                                            \
-        return funcname(a[0], b);                                   \
-    } else if (b.size() == 1) {                                     \
-        return funcname(a, b[0]);                                   \
-    } else if (a.size() == b.size()) {                              \
-        VtArray<bool> ret(a.size());                                \
-        for (size_t i = 0, n = a.size(); i != n; ++i) {             \
-            ret[i] = (a[i] op b[i]);                                \
-        }                                                           \
-        return ret;                                                 \
-    } else {                                                        \
-        TF_CODING_ERROR("Non-conforming inputs.");                  \
-        return VtArray<bool>();                                     \
-    }                                                               \
-}
-
-VTFUNCTION_BOOL(VtEqual,==)
-VTFUNCTION_BOOL(VtNotEqual,!=)
-VTFUNCTION_BOOL(VtGreater,>)
-VTFUNCTION_BOOL(VtLess,<)
-VTFUNCTION_BOOL(VtGreaterOrEqual,>=)
-VTFUNCTION_BOOL(VtLessOrEqual,<=)
-
-PXR_NAMESPACE_CLOSE_SCOPE
-
-#endif // PXR_BASE_VT_FUNCTIONS_H
-
-#else // BOOST_PP_IS_ITERATING
-
-// ****************************************************************************
-// Variable-number-of-arguments functions go here; preprocessor iteration
-// includes this file again and again, but turns off the pieces we don't
-// want to use for a particular function.
-// ****************************************************************************
-
-#define N BOOST_PP_ITERATION()
-
-#if BOOST_PP_ITERATION_FLAGS() == 0 // VtCat
-
-#define VtCat_SIZE(dummy, n, dummy2) newSize += s##n.size();
-#define VtCat_COPY(dummy, n, dummy2) \
-    for (size_t i = 0; i < s##n.size(); ++i) \
-        ret[offset+i] = s##n[i]; \
-    offset += s##n.size();
-
-// real documentation is above (for doxygen purposes)
-template<typename T>
-VtArray<T>
-VtCat( BOOST_PP_ENUM_PARAMS(N, VtArray<T> const &s) )
-{
-    size_t newSize = 0;
-
-    BOOST_PP_REPEAT( N, VtCat_SIZE, ignored )
-
-    if (newSize == 0)
-        return VtArray<T>();
-
-    // new array with flattened size
-    VtArray<T> ret(newSize);
-
-    // fill it with data from old arrays
-#if N > 0
-    size_t offset = 0;
-    BOOST_PP_REPEAT( N, VtCat_COPY, ignored )
-#endif
-
-    return ret;
-}
-
-#undef VtCat_SIZE
-#undef VtCat_COPY
-
-#endif // BOOST_PP_ITERATION_FLAGS
-
-#undef N
-
-#endif // BOOST_PP_IS_ITERATING
-
diff --git a/pxr/base/vt/hash.cpp b/pxr/base/vt/hash.cpp
index a08869f162..ca49d52c77 100644
--- a/pxr/base/vt/hash.cpp
+++ b/pxr/base/vt/hash.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/hash.h b/pxr/base/vt/hash.h
index 6df07c58f3..411566f49b 100644
--- a/pxr/base/vt/hash.h
+++ b/pxr/base/vt/hash.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_HASH_H
 #define PXR_BASE_VT_HASH_H
diff --git a/pxr/base/vt/module.cpp b/pxr/base/vt/module.cpp
index 815fa40010..62c3b146ab 100644
--- a/pxr/base/vt/module.cpp
+++ b/pxr/base/vt/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/moduleDeps.cpp b/pxr/base/vt/moduleDeps.cpp
index d5cbb0011c..8948e55455 100644
--- a/pxr/base/vt/moduleDeps.cpp
+++ b/pxr/base/vt/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/base/vt/pch.h b/pxr/base/vt/pch.h
index 75f03bee27..4f7c9852de 100644
--- a/pxr/base/vt/pch.h
+++ b/pxr/base/vt/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,13 +22,14 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
+#include <cfloat>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -53,8 +38,9 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <deque>
-#include <fstream>
+#include <float.h>
 #include <functional>
 #include <initializer_list>
 #include <iosfwd>
@@ -66,17 +52,18 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
+#include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -84,45 +71,9 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/numeric/conversion/cast.hpp>
-#include <boost/operators.hpp>
 #include <boost/optional.hpp>
-#include <boost/preprocessor.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/enum_params.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repeat.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/call.hpp>
 #include <boost/python/class.hpp>
@@ -158,20 +109,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/enumerable_thread_specific.h>
diff --git a/pxr/base/vt/pyOperators.h b/pxr/base/vt/pyOperators.h
index c9067ea86c..aa84dab783 100644
--- a/pxr/base/vt/pyOperators.h
+++ b/pxr/base/vt/pyOperators.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -119,26 +102,6 @@ struct _ArrayPyOpHelp<bool> {
     .def(#rmethod,rmethod##tuple<Type>)                     \
     .def(#rmethod,rmethod##list<Type>)                
 
-// to be used for wrapping conditional functions that return bool arrays
-// (i.e. Equal, etc)
-#define VTOPERATOR_WRAP_PYTYPE_BOOL_BASE(func,arg1,arg2,expr)         \
-    template <typename T> static                                      \
-    VtArray<bool> Vt##func(arg1, arg2)                                \
-    {                                                                 \
-        size_t length = len(obj);                                     \
-        if (length != vec.size()) {                                   \
-            TfPyThrowValueError("Non-conforming inputs for " #func);  \
-            return VtArray<bool>();                                   \
-        }                                                             \
-        VtArray<bool> ret(vec.size());                                \
-        for (size_t i = 0; i < length; ++i) {                         \
-            if (!extract<T>(obj[i]).check())                          \
-                TfPyThrowValueError("Element is of incorrect type."); \
-            ret[i] = expr;                                            \
-        }                                                             \
-        return ret;                                                   \
-    }
-
 // array OP pytype
 // pytype OP array
 #define VTOPERATOR_WRAP_PYTYPE_BOOL(func,pytype,op)         \
@@ -152,29 +115,6 @@ struct _ArrayPyOpHelp<bool> {
 #define VTOPERATOR_WRAP_BOOL(func,op)                       \
         VTOPERATOR_WRAP_PYTYPE_BOOL(func,list,op)           \
         VTOPERATOR_WRAP_PYTYPE_BOOL(func,tuple,op)          
-
-// to be used to actually declare the wrapping with def() on the class
-#define VTOPERATOR_WRAPDECLARE_BOOL(func)                   \
-       def(#func,(VtArray<bool> (*)                         \
-            (VtArray<Type> const &,VtArray<Type> const &))  \
-            Vt##func<Type>);                                \
-        def(#func,(VtArray<bool> (*)                        \
-            (Type const &,VtArray<Type> const &))           \
-            Vt##func<Type>);                                \
-        def(#func,(VtArray<bool> (*)                        \
-            (VtArray<Type> const &,Type const &))           \
-            Vt##func<Type>);                                \
-        def(#func,(VtArray<bool> (*)                        \
-            (VtArray<Type> const &,tuple const &))          \
-            Vt##func<Type>);                                \
-        def(#func,(VtArray<bool> (*)                        \
-            (tuple const &,VtArray<Type> const &))          \
-            Vt##func<Type>);                                \
-        def(#func,(VtArray<bool> (*)                        \
-            (VtArray<Type> const &,list const &))           \
-            Vt##func<Type>);                                \
-        def(#func,(VtArray<bool> (*)                        \
-            (list const &,VtArray<Type> const &))           \
-            Vt##func<Type>);                                
+                      
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/base/vt/streamOut.cpp b/pxr/base/vt/streamOut.cpp
index 9efb9819d1..6008463d24 100644
--- a/pxr/base/vt/streamOut.cpp
+++ b/pxr/base/vt/streamOut.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/streamOut.h b/pxr/base/vt/streamOut.h
index 2ea6eff013..ea0284a05f 100644
--- a/pxr/base/vt/streamOut.h
+++ b/pxr/base/vt/streamOut.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_STREAM_OUT_H
 #define PXR_BASE_VT_STREAM_OUT_H
diff --git a/pxr/base/vt/testenv/testVtArray.py b/pxr/base/vt/testenv/testVtArray.py
index c172d13761..6f48ce453b 100644
--- a/pxr/base/vt/testenv/testVtArray.py
+++ b/pxr/base/vt/testenv/testVtArray.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # pylint: disable=range-builtin-not-iterating
 #
diff --git a/pxr/base/vt/testenv/testVtCpp.cpp b/pxr/base/vt/testenv/testVtCpp.cpp
index b122d3b819..2942d367c3 100644
--- a/pxr/base/vt/testenv/testVtCpp.cpp
+++ b/pxr/base/vt/testenv/testVtCpp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -28,7 +11,6 @@
 #include "pxr/base/vt/value.h"
 #include "pxr/base/vt/streamOut.h"
 #include "pxr/base/vt/types.h"
-#include "pxr/base/vt/functions.h"
 #include "pxr/base/vt/visitValue.h"
 
 #include "pxr/base/gf/matrix2f.h"
@@ -551,34 +533,6 @@ static void testArray() {
     }
 }
 
-static void testArrayOperators() {
-
-    {
-        VtDoubleArray a(3), b(3);
-        a[0] = 1;
-        a[1] = 2;
-        a[2] = 3;
-        b[0] = 4;
-        b[1] = 5;
-        b[2] = 6;
-
-        VtDoubleArray c = VtCat(a,b);
-        VtDoubleArray d = c * 2.0;
-        TF_AXIOM(d[3] == 8);
-        VtDoubleArray e = a * b / 2.0;
-        TF_AXIOM(e[2] == 9);
-        TF_AXIOM(VtAnyTrue(VtEqual(a,VtZero<double>())) == false);
-        TF_AXIOM(VtAllTrue(VtEqual(a-a,VtZero<double>())) == true);
-        std::string empty = VtZero<std::string>();
-        VtStringArray s(4);
-        s[0] = empty;
-        s[1] = "a";
-        s[2] = "test";
-        s[3] = "array";
-        TF_AXIOM(VtAllTrue(VtNotEqual(s,VtZero<std::string>())) == false);
-    }
-}
-
 static void testRecursiveDictionaries()
 {
     VtDictionary outer;
@@ -1877,7 +1831,6 @@ static void testVtCheapToCopy() {
 int main(int argc, char *argv[])
 {
     testArray();
-    testArrayOperators();
 
     testDictionary();
     testDictionaryKeyPathAPI();
diff --git a/pxr/base/vt/testenv/testVtFunctions.py b/pxr/base/vt/testenv/testVtFunctions.py
deleted file mode 100644
index 4b69c372e8..0000000000
--- a/pxr/base/vt/testenv/testVtFunctions.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/pxrpythonsubst
-#
-# Copyright 2016 Pixar
-#
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
-#
-# pylint: disable=range-builtin-not-iterating
-#
-import unittest
-from pxr import Tf, Vt
-
-class TestVtFunctions(unittest.TestCase):
-
-    empty = Vt.FloatArray()
-
-    def test_Constructors(self):
-        v = Vt.FloatArray((1,2,3,4,5,6))
-        w = Vt.FloatArray(range(9))
-
-    def test_Cat(self):
-        v = Vt.FloatArray((1,2,3,4,5,6))
-
-        vcat = Vt.Cat(v,v)
-        self.assertEqual(len(vcat), 12)
-        self.assertEqual(vcat[11], 6)
-        vcat = Vt.Cat(Vt.Cat(v),Vt.Cat(v,v,v,v),Vt.Cat(v,v,v,v,v))
-        self.assertEqual(len(vcat), 60)
-        self.assertEqual(vcat[58], 5)
-        vcat = Vt.Cat(v,self.empty)
-        self.assertEqual(vcat, Vt.Cat(v))
-        e = Vt.Cat(self.empty,self.empty)
-        self.assertEqual((len(e)), 0)
-
-    def test_AnyTrue(self):
-        self.assertTrue(Vt.AnyTrue(Vt.FloatArray((1,0,0))))
-        self.assertFalse(Vt.AnyTrue(Vt.FloatArray((0,0,0))))
-        self.assertTrue(Vt.AnyTrue(Vt.FloatArray((1,2,3))))
-        self.assertFalse(Vt.AnyTrue(self.empty))
-
-    def test_AllTrue(self):
-        self.assertFalse(Vt.AllTrue(Vt.FloatArray((1,0,0))))
-        self.assertFalse(Vt.AllTrue(Vt.FloatArray((0,0,0))))
-        self.assertTrue(Vt.AllTrue(Vt.FloatArray((1,2,3))))
-        self.assertFalse(Vt.AllTrue(self.empty))
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pxr/base/vt/testenv/testVtValue.py b/pxr/base/vt/testenv/testVtValue.py
index 7e8476a644..b71218a70f 100644
--- a/pxr/base/vt/testenv/testVtValue.py
+++ b/pxr/base/vt/testenv/testVtValue.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import unittest
@@ -113,6 +96,19 @@ def test_Dictionary(self):
         with self.assertRaises(TypeError):
             Vt._ReturnDictionary(bad2)
 
+        # Test passing and returning python lists of dicts <->
+        # std::vector<VtDictionary>
+        testDictList = [{'foo':'bar'}, {'baz':123}, {'good':good}]
+        self.assertEqual(testDictList, Vt._DictionaryArrayIdent(testDictList))
+        self.assertEqual([], Vt._DictionaryArrayIdent([]))
+
+        with self.assertRaises(TypeError):
+            Vt._DictionaryArrayIdent('notAList')
+        with self.assertRaises(TypeError):
+            Vt._DictionaryArrayIdent(['notADict'])
+        with self.assertRaises(TypeError):
+            Vt._DictionaryArrayIdent([{1234:'keyNotAString'}])
+
     def test_WrappedTypesComparable(self):
         """
         Makes sure that values wrapped in a value wrapper are still
diff --git a/pxr/base/vt/traits.h b/pxr/base/vt/traits.h
index 33ff769a60..d8f3835867 100644
--- a/pxr/base/vt/traits.h
+++ b/pxr/base/vt/traits.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_TRAITS_H
 #define PXR_BASE_VT_TRAITS_H
diff --git a/pxr/base/vt/typeHeaders.h b/pxr/base/vt/typeHeaders.h
index 82a09e28ff..798039cde0 100644
--- a/pxr/base/vt/typeHeaders.h
+++ b/pxr/base/vt/typeHeaders.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_TYPE_HEADERS_H
 #define PXR_BASE_VT_TYPE_HEADERS_H
diff --git a/pxr/base/vt/types.cpp b/pxr/base/vt/types.cpp
index fb758f3b6e..0ffb755bbc 100644
--- a/pxr/base/vt/types.cpp
+++ b/pxr/base/vt/types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/types.h b/pxr/base/vt/types.h
index a71a4d063c..4d940596eb 100644
--- a/pxr/base/vt/types.h
+++ b/pxr/base/vt/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_TYPES_H
 #define PXR_BASE_VT_TYPES_H
diff --git a/pxr/base/vt/value.cpp b/pxr/base/vt/value.cpp
index f2ea69fc30..4180f7a334 100644
--- a/pxr/base/vt/value.cpp
+++ b/pxr/base/vt/value.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/value.h b/pxr/base/vt/value.h
index 4be250c97e..51c0d5205f 100644
--- a/pxr/base/vt/value.h
+++ b/pxr/base/vt/value.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_VALUE_H
 #define PXR_BASE_VT_VALUE_H
diff --git a/pxr/base/vt/valueFromPython.cpp b/pxr/base/vt/valueFromPython.cpp
index 53f3ba02ec..b709da6c39 100644
--- a/pxr/base/vt/valueFromPython.cpp
+++ b/pxr/base/vt/valueFromPython.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/valueFromPython.h b/pxr/base/vt/valueFromPython.h
index c025bfd670..85566e934f 100644
--- a/pxr/base/vt/valueFromPython.h
+++ b/pxr/base/vt/valueFromPython.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_VALUE_FROM_PYTHON_H
 #define PXR_BASE_VT_VALUE_FROM_PYTHON_H
diff --git a/pxr/base/vt/visitValue.h b/pxr/base/vt/visitValue.h
index f8e5dc0900..3b498f3d5d 100644
--- a/pxr/base/vt/visitValue.h
+++ b/pxr/base/vt/visitValue.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_VISIT_VALUE_H
 #define PXR_BASE_VT_VISIT_VALUE_H
diff --git a/pxr/base/vt/wrapArray.cpp b/pxr/base/vt/wrapArray.cpp
index 9ac1977545..f7c177a09f 100644
--- a/pxr/base/vt/wrapArray.cpp
+++ b/pxr/base/vt/wrapArray.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/wrapArray.h b/pxr/base/vt/wrapArray.h
index 9bf4e573c0..b883a919d3 100644
--- a/pxr/base/vt/wrapArray.h
+++ b/pxr/base/vt/wrapArray.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_VT_WRAP_ARRAY_H
 #define PXR_BASE_VT_WRAP_ARRAY_H
@@ -30,7 +13,6 @@
 #include "pxr/base/vt/types.h"
 #include "pxr/base/vt/value.h"
 #include "pxr/base/vt/pyOperators.h"
-#include "pxr/base/vt/functions.h"
 
 #include "pxr/base/arch/math.h"
 #include "pxr/base/arch/inttypes.h"
@@ -50,9 +32,6 @@
 #include "pxr/base/tf/tf.h"
 #include "pxr/base/tf/wrapTypeHelpers.h"
 
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-
 #include <boost/python/class.hpp>
 #include <boost/python/copy_const_reference.hpp>
 #include <boost/python/def.hpp>
@@ -429,12 +408,6 @@ VTOPERATOR_WRAP(__mul__,__rmul__)
 VTOPERATOR_WRAP_NONCOMM(__div__,__rdiv__)
 VTOPERATOR_WRAP_NONCOMM(__mod__,__rmod__)
 
-VTOPERATOR_WRAP_BOOL(Equal,==)
-VTOPERATOR_WRAP_BOOL(NotEqual,!=)
-VTOPERATOR_WRAP_BOOL(Greater,>)
-VTOPERATOR_WRAP_BOOL(Less,<)
-VTOPERATOR_WRAP_BOOL(GreaterOrEqual,>=)
-VTOPERATOR_WRAP_BOOL(LessOrEqual,<=)
 ARCH_PRAGMA_POP
 }
 
@@ -522,15 +495,6 @@ void VtWrapArray()
 
         ;
 
-#define WRITE(z, n, data) BOOST_PP_COMMA_IF(n) data
-#define VtCat_DEF(z, n, unused) \
-    def("Cat",(VtArray<Type> (*)( BOOST_PP_REPEAT(n, WRITE, VtArray<Type> const &) ))VtCat<Type>);
-    BOOST_PP_REPEAT_FROM_TO(1, VT_FUNCTIONS_MAX_ARGS, VtCat_DEF, ~)
-#undef VtCat_DEF
-
-    VTOPERATOR_WRAPDECLARE_BOOL(Equal)
-    VTOPERATOR_WRAPDECLARE_BOOL(NotEqual)
-
     // Wrap conversions from python sequences.
     TfPyContainerConversions::from_python_sequence<
         This,
@@ -542,24 +506,6 @@ void VtWrapArray()
     implicitly_convertible<This, TfSpan<const Type> >();
 }
 
-// wrapping for functions that work for base types that support comparisons
-template <typename T>
-void VtWrapComparisonFunctions()
-{
-    using namespace Vt_WrapArray;
-    
-    typedef T This;
-    typedef typename This::ElementType Type;
-
-    def("AnyTrue", VtAnyTrue<Type>);
-    def("AllTrue", VtAllTrue<Type>);
-
-    VTOPERATOR_WRAPDECLARE_BOOL(Greater)
-    VTOPERATOR_WRAPDECLARE_BOOL(Less)
-    VTOPERATOR_WRAPDECLARE_BOOL(GreaterOrEqual)
-    VTOPERATOR_WRAPDECLARE_BOOL(LessOrEqual)
-}
-
 template <class Array>
 VtValue
 Vt_ConvertFromPySequenceOrIter(TfPyObjWrapper const &obj)
@@ -643,8 +589,6 @@ void VtRegisterValueCastsFromPythonSequencesToArray()
 
 #define VT_WRAP_ARRAY(unused, elem)          \
     VtWrapArray< VtArray< VT_TYPE(elem) > >();
-#define VT_WRAP_COMPARISON(unused, elem)        \
-    VtWrapComparisonFunctions< VtArray< VT_TYPE(elem) > >();
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
diff --git a/pxr/base/vt/wrapArrayBase.cpp b/pxr/base/vt/wrapArrayBase.cpp
index 69f169af26..7cc7252eac 100644
--- a/pxr/base/vt/wrapArrayBase.cpp
+++ b/pxr/base/vt/wrapArrayBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/vt/wrapArrayDualQuaternion.cpp b/pxr/base/vt/wrapArrayDualQuaternion.cpp
index 1da44fadf4..cfbc2386e8 100644
--- a/pxr/base/vt/wrapArrayDualQuaternion.cpp
+++ b/pxr/base/vt/wrapArrayDualQuaternion.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define ADDITION_OPERATOR
 #define SUBTRACTION_OPERATOR
diff --git a/pxr/base/vt/wrapArrayFloat.cpp b/pxr/base/vt/wrapArrayFloat.cpp
index e1b41b97ce..587f70b73b 100644
--- a/pxr/base/vt/wrapArrayFloat.cpp
+++ b/pxr/base/vt/wrapArrayFloat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define NUMERIC_OPERATORS
 
@@ -33,6 +16,4 @@ PXR_NAMESPACE_USING_DIRECTIVE
 void wrapArrayFloat() {
     TF_PP_SEQ_FOR_EACH(VT_WRAP_ARRAY, ~,
                        VT_FLOATING_POINT_BUILTIN_VALUE_TYPES);
-    TF_PP_SEQ_FOR_EACH(VT_WRAP_COMPARISON, ~,
-                       VT_FLOATING_POINT_BUILTIN_VALUE_TYPES);
 }
diff --git a/pxr/base/vt/wrapArrayIntegral.cpp b/pxr/base/vt/wrapArrayIntegral.cpp
index 1d1b5eda4f..abbc48415a 100644
--- a/pxr/base/vt/wrapArrayIntegral.cpp
+++ b/pxr/base/vt/wrapArrayIntegral.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define NUMERIC_OPERATORS
 #define MOD_OPERATOR
@@ -34,6 +17,4 @@ PXR_NAMESPACE_USING_DIRECTIVE
 void wrapArrayIntegral() {
     TF_PP_SEQ_FOR_EACH(VT_WRAP_ARRAY, ~,
                        VT_INTEGRAL_BUILTIN_VALUE_TYPES);
-    TF_PP_SEQ_FOR_EACH(VT_WRAP_COMPARISON, ~,
-                       VT_INTEGRAL_BUILTIN_VALUE_TYPES);
 }
diff --git a/pxr/base/vt/wrapArrayMatrix.cpp b/pxr/base/vt/wrapArrayMatrix.cpp
index 5cca62cff5..f208cb3720 100644
--- a/pxr/base/vt/wrapArrayMatrix.cpp
+++ b/pxr/base/vt/wrapArrayMatrix.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define NUMERIC_OPERATORS
 #define DOUBLE_MULT_OPERATOR
diff --git a/pxr/base/vt/wrapArrayQuaternion.cpp b/pxr/base/vt/wrapArrayQuaternion.cpp
index 47f2e5b7dd..d1d35922c7 100644
--- a/pxr/base/vt/wrapArrayQuaternion.cpp
+++ b/pxr/base/vt/wrapArrayQuaternion.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define ADDITION_OPERATOR
 #define SUBTRACTION_OPERATOR
diff --git a/pxr/base/vt/wrapArrayRange.cpp b/pxr/base/vt/wrapArrayRange.cpp
index 9227f7bace..e83066be53 100644
--- a/pxr/base/vt/wrapArrayRange.cpp
+++ b/pxr/base/vt/wrapArrayRange.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define ADDITION_OPERATOR
 
diff --git a/pxr/base/vt/wrapArrayString.cpp b/pxr/base/vt/wrapArrayString.cpp
index 6e905a564c..a3c09cc25b 100644
--- a/pxr/base/vt/wrapArrayString.cpp
+++ b/pxr/base/vt/wrapArrayString.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define ADDITION_OPERATOR
 
@@ -34,5 +17,4 @@ PXR_NAMESPACE_USING_DIRECTIVE
 
 void wrapArrayString() {
     VtWrapArray<VtArray<string> >();
-    VtWrapComparisonFunctions<VtArray<string> >();
 }
diff --git a/pxr/base/vt/wrapArrayToken.cpp b/pxr/base/vt/wrapArrayToken.cpp
index abfb1b2d5f..dc67f98038 100644
--- a/pxr/base/vt/wrapArrayToken.cpp
+++ b/pxr/base/vt/wrapArrayToken.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -30,5 +13,4 @@ PXR_NAMESPACE_USING_DIRECTIVE
 
 void wrapArrayToken() {
     VtWrapArray<VtArray<TfToken> >();
-    VtWrapComparisonFunctions<VtArray<TfToken> >();
 }
diff --git a/pxr/base/vt/wrapArrayVec.cpp b/pxr/base/vt/wrapArrayVec.cpp
index 9323d9dee1..9bd37d0d2a 100644
--- a/pxr/base/vt/wrapArrayVec.cpp
+++ b/pxr/base/vt/wrapArrayVec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #define ADDITION_OPERATOR
 #define SUBTRACTION_OPERATOR
diff --git a/pxr/base/vt/wrapDictionary.cpp b/pxr/base/vt/wrapDictionary.cpp
index a420eff63c..94cefd1479 100644
--- a/pxr/base/vt/wrapDictionary.cpp
+++ b/pxr/base/vt/wrapDictionary.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -65,6 +48,21 @@ struct VtValueArrayToPython
     }
 };
 
+// Converter from std::vector<VtDictionary> to python list
+struct VtDictionaryArrayToPython
+{
+    static PyObject* convert(const std::vector<VtDictionary> &v)
+    {
+        // TODO Use result converter. TfPySequenceToList.
+        list result;
+        TF_FOR_ALL(i, v) {
+            object o = TfPyObject(*i);
+            result.append(o);
+        }
+        return incref(result.ptr());
+    }
+};
+
 // Converter from VtDictionary to python dict.
 struct VtDictionaryToPython
 {
@@ -228,6 +226,57 @@ struct _VtDictionaryFromPython {
     }
 };
 
+// Converter from python list to std::vector<VtDictionary>.
+struct _VtDictionaryArrayFromPython {
+    _VtDictionaryArrayFromPython() {
+        converter::registry::insert(&convertible, &construct,
+                                    type_id<std::vector<VtDictionary>>());
+    }
+
+    // Returns p if p can convert to an array, NULL otherwise.
+    // If result is non-NULL, does the conversion into *result.
+    static PyObject *convert(PyObject *p, std::vector<VtDictionary> *result) {
+        extract<list> dProxy(p);
+        if (!dProxy.check()) {
+            return NULL;
+        }
+        list d = dProxy();
+        int numElts = len(d);
+
+        if (result) {
+            result->reserve(numElts);
+        }
+        for (int i = 0; i < numElts; i++) {
+            object pVal = d[i];
+            extract<VtDictionary> e(pVal);
+            if (!e.check()) {
+                return nullptr;
+            }
+            if (result) {
+                result->push_back(e());
+            }
+        }
+        return p;
+    }
+    
+    static void *convertible(PyObject *p) {
+        return convert(p, NULL);
+    }
+
+    static void construct(PyObject* source, converter::
+                          rvalue_from_python_stage1_data* data) {
+        TfAutoMallocTag2
+            tag("Vt", "_VtDictionaryArrayFromPython::construct");
+        void* storage = (
+            (converter::rvalue_from_python_storage<std::vector<VtDictionary> >*)
+            data)->storage.bytes;
+        new (storage) std::vector<VtDictionary>();
+        data->convertible = storage;
+        convert(source, static_cast<std::vector<VtDictionary>*>(storage));
+    }
+};
+
+
 // Converter from python list to VtValue holding VtValueArray.
 struct _VtValueHoldingVtValueArrayFromPython {
     _VtValueHoldingVtValueArrayFromPython() {
@@ -292,16 +341,24 @@ _ReturnDictionary(VtDictionary const &x) {
     return x;
 }
 
+static std::vector<VtDictionary>
+_DictionaryArrayIdent(std::vector<VtDictionary> const &v) {
+    return v;
+}
+
 } // anonymous namespace 
 
 void wrapDictionary()
 {
     def("_ReturnDictionary", _ReturnDictionary);
+    def("_DictionaryArrayIdent", _DictionaryArrayIdent);
 
     to_python_converter<VtDictionary, VtDictionaryToPython>();
+    to_python_converter<std::vector<VtDictionary>, VtDictionaryArrayToPython>();
     to_python_converter<std::vector<VtValue>, VtValueArrayToPython>();
     _VtValueArrayFromPython();
     _VtDictionaryFromPython();
+    _VtDictionaryArrayFromPython();
     _VtValueHoldingVtValueArrayFromPython();
     _VtValueHoldingVtDictionaryFromPython();
 }
diff --git a/pxr/base/vt/wrapValue.cpp b/pxr/base/vt/wrapValue.cpp
index 49fb87fd9d..bd51a59152 100644
--- a/pxr/base/vt/wrapValue.cpp
+++ b/pxr/base/vt/wrapValue.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/work/__init__.py b/pxr/base/work/__init__.py
index 35e8511816..8c3094328f 100644
--- a/pxr/base/work/__init__.py
+++ b/pxr/base/work/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 Work
diff --git a/pxr/base/work/api.h b/pxr/base/work/api.h
index 682ae77a3f..d12b796381 100644
--- a/pxr/base/work/api.h
+++ b/pxr/base/work/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_API_H
 #define PXR_BASE_WORK_API_H
diff --git a/pxr/base/work/detachedTask.cpp b/pxr/base/work/detachedTask.cpp
index 2017779589..1b305bad89 100644
--- a/pxr/base/work/detachedTask.cpp
+++ b/pxr/base/work/detachedTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/work/detachedTask.h b/pxr/base/work/detachedTask.h
index 876fee68c9..a97137ce4f 100644
--- a/pxr/base/work/detachedTask.h
+++ b/pxr/base/work/detachedTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_DETACHED_TASK_H
 #define PXR_BASE_WORK_DETACHED_TASK_H
@@ -41,7 +24,7 @@ struct Work_DetachedTask
 {
     explicit Work_DetachedTask(Fn &&fn) : _fn(std::move(fn)) {}
     explicit Work_DetachedTask(Fn const &fn) : _fn(fn) {}
-    void operator()() {
+    void operator()() const {
         TfErrorMark m;
         _fn();
         m.Clear();
diff --git a/pxr/base/work/dispatcher.cpp b/pxr/base/work/dispatcher.cpp
index adba7dff31..8cc8dbbfcd 100644
--- a/pxr/base/work/dispatcher.cpp
+++ b/pxr/base/work/dispatcher.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -32,27 +15,49 @@ WorkDispatcher::WorkDispatcher()
         tbb::task_group_context::isolated,
         tbb::task_group_context::concurrent_wait | 
         tbb::task_group_context::default_traits)
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+      , _taskGroup(_context)
+#endif
 {
     _waitCleanupFlag.clear();
     
+#if TBB_INTERFACE_VERSION_MAJOR < 12
     // The concurrent_wait flag used with the task_group_context ensures
     // the ref count will remain at 1 after all predecessor tasks are
     // completed, so we don't need to keep resetting it in Wait().
     _rootTask = new(tbb::task::allocate_root(_context)) tbb::empty_task;
     _rootTask->set_ref_count(1);
+#endif
 }
 
-WorkDispatcher::~WorkDispatcher()
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+inline tbb::detail::d1::wait_context& 
+WorkDispatcher::_TaskGroup::_GetInternalWaitContext() {
+    return m_wait_ctx;
+}
+#endif
+
+WorkDispatcher::~WorkDispatcher() noexcept
 {
     Wait();
+
+#if TBB_INTERFACE_VERSION_MAJOR < 12
     tbb::task::destroy(*_rootTask);
+#endif
 }
 
 void
 WorkDispatcher::Wait()
 {
     // Wait for tasks to complete.
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+    // The native task_group::wait() has a comment saying its call to the
+    // context reset method is not thread safe. So we do our own
+    // synchronization to ensure it is called once.
+    tbb::detail::d1::wait(_taskGroup._GetInternalWaitContext(), _context);
+#else
     _rootTask->wait_for_all();
+#endif
 
     // If we take the flag from false -> true, we do the cleanup.
     if (_waitCleanupFlag.test_and_set() == false) {
@@ -73,7 +78,11 @@ WorkDispatcher::Wait()
 void
 WorkDispatcher::Cancel()
 {
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+    _taskGroup.cancel();
+#else
     _context.cancel_group_execution();
+#endif
 }
 
 /* static */
diff --git a/pxr/base/work/dispatcher.h b/pxr/base/work/dispatcher.h
index 2c499d6ab5..b35bcd8318 100644
--- a/pxr/base/work/dispatcher.h
+++ b/pxr/base/work/dispatcher.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_DISPATCHER_H
 #define PXR_BASE_WORK_DISPATCHER_H
@@ -33,8 +16,15 @@
 #include "pxr/base/tf/errorMark.h"
 #include "pxr/base/tf/errorTransport.h"
 
+// Blocked range is not used in this file, but this header happens to pull in
+// the TBB version header in a way that works in all TBB versions.
+#include <tbb/blocked_range.h>
 #include <tbb/concurrent_vector.h>
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+#include <tbb/task_group.h>
+#else
 #include <tbb/task.h>
+#endif
 
 #include <functional>
 #include <type_traits>
@@ -79,7 +69,7 @@ class WorkDispatcher
     WORK_API WorkDispatcher();
 
     /// Wait() for any pending tasks to complete, then destroy the dispatcher.
-    WORK_API ~WorkDispatcher();
+    WORK_API ~WorkDispatcher() noexcept;
 
     WorkDispatcher(WorkDispatcher const &) = delete;
     WorkDispatcher &operator=(WorkDispatcher const &) = delete;
@@ -103,7 +93,11 @@ class WorkDispatcher
 
     template <class Callable>
     inline void Run(Callable &&c) {
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+        _taskGroup.run(_InvokerTask<typename std::remove_reference<Callable>::type>(std::forward<Callable>(c), &_errors));
+#else
         _rootTask->spawn(_MakeInvokerTask(std::forward<Callable>(c)));
+#endif
     }
 
     template <class Callable, class A0, class ... Args>
@@ -136,19 +130,46 @@ class WorkDispatcher
     // Function invoker helper that wraps the invocation with an ErrorMark so we
     // can transmit errors that occur back to the thread that Wait() s for tasks
     // to complete.
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
     template <class Fn>
-    struct _InvokerTask : public tbb::task {
+    struct _InvokerTask {
         explicit _InvokerTask(Fn &&fn, _ErrorTransports *err) 
             : _fn(std::move(fn)), _errors(err) {}
 
         explicit _InvokerTask(Fn const &fn, _ErrorTransports *err) 
             : _fn(fn), _errors(err) {}
 
-        virtual tbb::task* execute() {
+        // Ensure only moves happen, no copies.
+        _InvokerTask(_InvokerTask &&other) = default;
+        _InvokerTask(const _InvokerTask &other) = delete;
+        _InvokerTask &operator=(const _InvokerTask &other) = delete;
+
+        void operator()() const {
             TfErrorMark m;
             _fn();
             if (!m.IsClean())
                 WorkDispatcher::_TransportErrors(m, _errors);
+        }
+    private:
+        Fn _fn;
+        _ErrorTransports *_errors;
+    };
+#else
+    template <class Fn>
+    struct _InvokerTask : public tbb::task {
+        explicit _InvokerTask(Fn &&fn, _ErrorTransports *err)
+            : _fn(std::move(fn)), _errors(err) {}
+
+        explicit _InvokerTask(Fn const &fn, _ErrorTransports *err)
+            : _fn(fn), _errors(err) {}
+
+        virtual tbb::task* execute() {
+            TfErrorMark m;
+            // In anticipation of OneTBB, ensure that _fn meets OneTBB's
+            // requirement that a task's call operator must be const.
+            const_cast<_InvokerTask const *>(this)->_fn();
+            if (!m.IsClean())
+                WorkDispatcher::_TransportErrors(m, _errors);
             return NULL;
         }
     private:
@@ -164,16 +185,29 @@ class WorkDispatcher
             _InvokerTask<typename std::remove_reference<Fn>::type>(
                 std::forward<Fn>(fn), &_errors);
     }
+#endif
 
     // Helper function that removes errors from \p m and stores them in a new
     // entry in \p errors.
     WORK_API static void
     _TransportErrors(const TfErrorMark &m, _ErrorTransports *errors);
 
-    // Task group context and associated root task that allows us to cancel
-    // tasks invoked directly by this dispatcher.
+    // Task group context to run tasks in.
     tbb::task_group_context _context;
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+    // Custom task group that lets us implement thread safe concurrent wait.
+    class _TaskGroup : public tbb::task_group {
+    public:
+        _TaskGroup(tbb::task_group_context& ctx) : tbb::task_group(ctx) {}
+         inline tbb::detail::d1::wait_context& _GetInternalWaitContext();
+    };
+
+    _TaskGroup _taskGroup;
+#else
+    // Root task that allows us to cancel tasks invoked directly by this
+    // dispatcher.
     tbb::empty_task* _rootTask;
+#endif
 
     // The error transports we use to transmit errors in other threads back to
     // this thread.
@@ -183,8 +217,42 @@ class WorkDispatcher
     std::atomic_flag _waitCleanupFlag;
 };
 
+// Wrapper class for non-const tasks.
+template <class Fn>
+struct Work_DeprecatedMutableTask {
+    explicit Work_DeprecatedMutableTask(Fn &&fn) 
+        : _fn(std::move(fn)) {}
+
+    explicit Work_DeprecatedMutableTask(Fn const &fn) 
+        : _fn(fn) {}
+
+    // Ensure only moves happen, no copies.
+    Work_DeprecatedMutableTask
+        (Work_DeprecatedMutableTask &&other) = default;
+    Work_DeprecatedMutableTask
+        (const Work_DeprecatedMutableTask &other) = delete;
+    Work_DeprecatedMutableTask
+        &operator= (const Work_DeprecatedMutableTask &other) = delete;
+
+    void operator()() const {
+        _fn();
+    }
+private:
+    mutable Fn _fn;
+};
+
+// Wrapper function to convert non-const tasks to a Work_DeprecatedMutableTask. 
+// When adding new tasks refrain from using this wrapper, instead ensure the 
+// call operator of the task is const such that it is compatible with oneTBB.
+template <typename Fn>
+Work_DeprecatedMutableTask<typename std::remove_reference_t<Fn>> 
+WorkMakeDeprecatedMutableTask(Fn &&fn) {
+    return Work_DeprecatedMutableTask<typename std::remove_reference_t<Fn>>
+            (std::forward<Fn>(fn));
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_BASE_WORK_DISPATCHER_H
+#endif // PXR_BASE_WORK_DISPATCHER_H
\ No newline at end of file
diff --git a/pxr/base/work/loops.cpp b/pxr/base/work/loops.cpp
index afcfc7caeb..12dffb4f4d 100644
--- a/pxr/base/work/loops.cpp
+++ b/pxr/base/work/loops.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // loops.cpp
 //
diff --git a/pxr/base/work/loops.h b/pxr/base/work/loops.h
index 76ae9e8d8e..0b3aec8483 100644
--- a/pxr/base/work/loops.h
+++ b/pxr/base/work/loops.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_LOOPS_H
 #define PXR_BASE_WORK_LOOPS_H
diff --git a/pxr/base/work/module.cpp b/pxr/base/work/module.cpp
index 3a2c9b63f5..efe69c3c0a 100644
--- a/pxr/base/work/module.cpp
+++ b/pxr/base/work/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/work/moduleDeps.cpp b/pxr/base/work/moduleDeps.cpp
index 23941b8e74..277f2f9d95 100644
--- a/pxr/base/work/moduleDeps.cpp
+++ b/pxr/base/work/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/base/work/pch.h b/pxr/base/work/pch.h
index 228b18d0d8..6c8c44c477 100644
--- a/pxr/base/work/pch.h
+++ b/pxr/base/work/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,13 +22,13 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
+#include <chrono>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -55,18 +39,20 @@
 #include <deque>
 #include <functional>
 #include <iosfwd>
+#include <iterator>
 #include <list>
 #include <locale>
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <string>
 #include <sys/types.h>
+#include <thread>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -74,27 +60,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/def.hpp>
 #include <boost/python/dict.hpp>
@@ -104,21 +69,14 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
-#include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
+#include <tbb/info.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_for_each.h>
 #include <tbb/parallel_reduce.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
 #include <tbb/task_arena.h>
-#include <tbb/task_scheduler_init.h>
+#include <tbb/task_group.h>
diff --git a/pxr/base/work/reduce.cpp b/pxr/base/work/reduce.cpp
index 3909908f41..f3c942444b 100644
--- a/pxr/base/work/reduce.cpp
+++ b/pxr/base/work/reduce.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // reduce.cpp
 //
diff --git a/pxr/base/work/reduce.h b/pxr/base/work/reduce.h
index 332ec20a21..132148b90c 100644
--- a/pxr/base/work/reduce.h
+++ b/pxr/base/work/reduce.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_REDUCE_H
 #define PXR_BASE_WORK_REDUCE_H
diff --git a/pxr/base/work/singularTask.cpp b/pxr/base/work/singularTask.cpp
index c5f0f1821f..0d650300b6 100644
--- a/pxr/base/work/singularTask.cpp
+++ b/pxr/base/work/singularTask.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/work/singularTask.h"
diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
index bc82bbf748..79a55b0db5 100644
--- a/pxr/base/work/singularTask.h
+++ b/pxr/base/work/singularTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_SINGULAR_TASK_H
 #define PXR_BASE_WORK_SINGULAR_TASK_H
diff --git a/pxr/base/work/testenv/testWorkDetachedTask.cpp b/pxr/base/work/testenv/testWorkDetachedTask.cpp
index 7c94a06742..6487fae9b8 100644
--- a/pxr/base/work/testenv/testWorkDetachedTask.cpp
+++ b/pxr/base/work/testenv/testWorkDetachedTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/work/detachedTask.h"
diff --git a/pxr/base/work/testenv/testWorkDispatcher.cpp b/pxr/base/work/testenv/testWorkDispatcher.cpp
index 40decdcba1..3328f6c034 100644
--- a/pxr/base/work/testenv/testWorkDispatcher.cpp
+++ b/pxr/base/work/testenv/testWorkDispatcher.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/work/testenv/testWorkLoops.cpp b/pxr/base/work/testenv/testWorkLoops.cpp
index e349218787..6ec64d8e5a 100644
--- a/pxr/base/work/testenv/testWorkLoops.cpp
+++ b/pxr/base/work/testenv/testWorkLoops.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -35,6 +18,7 @@
 #include <functional>
 
 #include <cstdio>
+#include <cstring>
 #include <numeric>
 #include <iostream>
 #include <vector>
diff --git a/pxr/base/work/testenv/testWorkReduce.cpp b/pxr/base/work/testenv/testWorkReduce.cpp
index 10f94e4806..e88d17955e 100644
--- a/pxr/base/work/testenv/testWorkReduce.cpp
+++ b/pxr/base/work/testenv/testWorkReduce.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -35,6 +18,7 @@
 #include <functional>
 
 #include <cstdio>
+#include <cstring>
 #include <iostream>
 #include <vector>
 
diff --git a/pxr/base/work/testenv/testWorkThreadLimits.cpp b/pxr/base/work/testenv/testWorkThreadLimits.cpp
index 414bba2c02..49ef1d1117 100644
--- a/pxr/base/work/testenv/testWorkThreadLimits.cpp
+++ b/pxr/base/work/testenv/testWorkThreadLimits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -38,6 +21,10 @@
 #include <set>
 #include <thread>
 
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+#include <tbb/global_control.h>
+#endif
+
 using namespace std::placeholders;
 
 PXR_NAMESPACE_USING_DIRECTIVE
@@ -56,16 +43,41 @@ _CountThreads(size_t begin, size_t end)
     _uniqueThreads->insert(std::this_thread::get_id());
 }
 
+static unsigned
+_GetConcurrencyLimit()
+{
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+    // For oneTBB, get limit in an arena with max concurrency as
+    // WorkSetConcurrencyLimit by itself no longer increases the concurrency
+    // beyond the number of cores by itself.
+    unsigned limit;
+    tbb::task_arena arena(tbb::global_control::active_value(tbb::global_control::max_allowed_parallelism));
+    arena.execute([&]() {
+        limit = WorkGetConcurrencyLimit();
+    });
+    return limit;
+#else
+    return WorkGetConcurrencyLimit();
+#endif
+}
+
 static size_t
 _ExpectedLimit(const int envVal, const size_t n)
 {
     // If envVal is non-zero, it wins over n!
     // envVal may also be a negative number, which means all but that many
     // cores.
-    return envVal ? 
+    const size_t val = envVal ? 
         (envVal < 0 ?
             std::max<int>(1, envVal+WorkGetPhysicalConcurrencyLimit()) : envVal)
         : n;
+
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+    // oneTBB has an internal limit of 256 + 1 threads.
+    return std::min<size_t>(val, 257);
+#else
+    return val;
+#endif
 }
 
 static void
@@ -101,41 +113,41 @@ _TestArguments(const int envVal)
     // Set to maximum concurrency, which should remain within envVal.
     const int numCores = WorkGetPhysicalConcurrencyLimit();
     WorkSetConcurrencyLimitArgument(numCores);
-    TF_AXIOM(WorkGetConcurrencyLimit() == _ExpectedLimit(envVal, numCores));
+    TF_AXIOM(_GetConcurrencyLimit() == _ExpectedLimit(envVal, numCores));
 
     // n = 0, means "no change"
     WorkSetConcurrencyLimitArgument(0);
-    TF_AXIOM(WorkGetConcurrencyLimit() == _ExpectedLimit(envVal, numCores));
+    TF_AXIOM(_GetConcurrencyLimit() == _ExpectedLimit(envVal, numCores));
 
     // n = 1 means no threading
     WorkSetConcurrencyLimitArgument(1);
-    TF_AXIOM(WorkGetConcurrencyLimit() == _ExpectedLimit(envVal, 1));
+    TF_AXIOM(_GetConcurrencyLimit() == _ExpectedLimit(envVal, 1));
 
     // n = 3 means 3
     WorkSetConcurrencyLimitArgument(3);
-    TF_AXIOM(WorkGetConcurrencyLimit() == _ExpectedLimit(envVal, 3));
+    TF_AXIOM(_GetConcurrencyLimit() == _ExpectedLimit(envVal, 3));
 
     // n = 1000 means 1000
     WorkSetConcurrencyLimitArgument(1000);
-    TF_AXIOM(WorkGetConcurrencyLimit() == _ExpectedLimit(envVal, 1000));
+    TF_AXIOM(_GetConcurrencyLimit() == _ExpectedLimit(envVal, 1000));
 
     // n = -1 means numCores - 1, with a minimum of 1
     WorkSetConcurrencyLimitArgument(-1);
-    TF_AXIOM(WorkGetConcurrencyLimit() == 
+    TF_AXIOM(_GetConcurrencyLimit() == 
              _ExpectedLimit(envVal, std::max(1, numCores-1)));
 
     // n = -3 means numCores - 3, with a minimum of 1
     WorkSetConcurrencyLimitArgument(-3);
-    TF_AXIOM(WorkGetConcurrencyLimit() == 
+    TF_AXIOM(_GetConcurrencyLimit() == 
              _ExpectedLimit(envVal, std::max(1, numCores-3)));
 
     // n = -numCores means 1 (no threading)
     WorkSetConcurrencyLimitArgument(-numCores);
-    TF_AXIOM(WorkGetConcurrencyLimit() == _ExpectedLimit(envVal, 1));
+    TF_AXIOM(_GetConcurrencyLimit() == _ExpectedLimit(envVal, 1));
 
     // n = -numCores*10 means 1 (no threading)
     WorkSetConcurrencyLimitArgument(-numCores*10);
-    TF_AXIOM(WorkGetConcurrencyLimit() == _ExpectedLimit(envVal, 1));
+    TF_AXIOM(_GetConcurrencyLimit() == _ExpectedLimit(envVal, 1));
 }
 
 struct _RawTBBCounter
@@ -218,35 +230,35 @@ main(int argc, char **argv)
     // Test with full concurrency.
     std::cout << "Testing full concurrency...\n";
     WorkSetMaximumConcurrencyLimit();
-    TF_AXIOM(WorkGetConcurrencyLimit() == 
+    TF_AXIOM(_GetConcurrencyLimit() ==
         _ExpectedLimit(envVal, WorkGetPhysicalConcurrencyLimit()));
     _TestThreadLimit(envVal, WorkGetPhysicalConcurrencyLimit());
 
     // Test with no concurrency.
     std::cout << "Testing turning off concurrency...\n";
     WorkSetConcurrencyLimit(1);
-    TF_AXIOM(WorkGetConcurrencyLimit() == 
+    TF_AXIOM(_GetConcurrencyLimit() ==
         _ExpectedLimit(envVal, 1));
     _TestThreadLimit(envVal, 1);
 
     // Test with 2 threads.
     std::cout << "Testing with 2 threads...\n";
     WorkSetConcurrencyLimit(2);
-    TF_AXIOM(WorkGetConcurrencyLimit() == 
+    TF_AXIOM(_GetConcurrencyLimit() ==
         _ExpectedLimit(envVal, 2));
     _TestThreadLimit(envVal, 2);
 
     // Test with 4 threads.
     std::cout << "Testing with 4 threads...\n";
     WorkSetConcurrencyLimit(4);
-    TF_AXIOM(WorkGetConcurrencyLimit() ==
+    TF_AXIOM(_GetConcurrencyLimit() ==
         _ExpectedLimit(envVal, 4));
     _TestThreadLimit(envVal, 4);
 
     // Test with 1000 threads.
     std::cout << "Testing with 1000 threads...\n";
     WorkSetConcurrencyLimit(1000);
-    TF_AXIOM(WorkGetConcurrencyLimit() ==
+    TF_AXIOM(_GetConcurrencyLimit() ==
         _ExpectedLimit(envVal, 1000));
     _TestThreadLimit(envVal, 1000);
 
diff --git a/pxr/base/work/threadLimits.cpp b/pxr/base/work/threadLimits.cpp
index bc629b8124..a1fafdd64d 100644
--- a/pxr/base/work/threadLimits.cpp
+++ b/pxr/base/work/threadLimits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // threadLimits.cpp
 //
@@ -29,9 +12,18 @@
 
 #include "pxr/base/tf/envSetting.h"
 
-#include <tbb/task_scheduler_init.h>
+// Blocked range is not used in this file, but this header happens to pull in
+// the TBB version header in a way that works in all TBB versions.
+#include <tbb/blocked_range.h>
 #include <tbb/task_arena.h>
 
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+#include <tbb/global_control.h>
+#include <tbb/info.h>
+#else
+#include <tbb/task_scheduler_init.h>
+#endif
+
 #include <algorithm>
 #include <atomic>
 
@@ -58,16 +50,25 @@ TF_DEFINE_ENV_SETTING(
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-// We create a task_scheduler_init instance at static initialization time if
-// PXR_WORK_THREAD_LIMIT is set to a nonzero value.  Otherwise this stays NULL.
-static tbb::task_scheduler_init *_tbbTaskSchedInit;
+// We create a global_control or task_scheduler_init instance at static
+// initialization time if PXR_WORK_THREAD_LIMIT is set to a nonzero value.
+// Otherwise this stays NULL.
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+static tbb::global_control *_tbbGlobalControl = nullptr;
+#else
+static tbb::task_scheduler_init *_tbbTaskSchedInit = nullptr;
+#endif
 
 unsigned
 WorkGetPhysicalConcurrencyLimit()
 {
     // Use TBB here, since it pays attention to the affinity mask on Linux and
     // Windows.
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+    return tbb::info::default_concurrency();
+#else
     return tbb::task_scheduler_init::default_num_threads();
+#endif
 }
 
 // This function always returns an actual thread count >= 1.
@@ -123,7 +124,12 @@ Work_InitializeThreading()
     // previously initialized by the hosting environment (e.g. if we are running
     // as a plugin to another application.)
     if (settingVal) {
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+        _tbbGlobalControl = new tbb::global_control(
+            tbb::global_control::max_allowed_parallelism, threadLimit);
+#else
         _tbbTaskSchedInit = new tbb::task_scheduler_init(threadLimit);
+#endif
     }
 }
 static int _forceInitialization = (Work_InitializeThreading(), 0);
@@ -153,6 +159,12 @@ WorkSetConcurrencyLimit(unsigned n)
         threadLimit = WorkGetConcurrencyLimit();
     }
 
+    
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+    delete _tbbGlobalControl;
+    _tbbGlobalControl = new tbb::global_control(
+        tbb::global_control::max_allowed_parallelism, threadLimit);
+#else
     // Note that we need to do some performance testing and decide if it's
     // better here to simply delete the task_scheduler_init object instead
     // of re-initializing it.  If we decide that it's better to re-initialize
@@ -168,6 +180,7 @@ WorkSetConcurrencyLimit(unsigned n)
     } else {
         _tbbTaskSchedInit = new tbb::task_scheduler_init(threadLimit);
     }
+#endif
 }
 
 void 
@@ -185,7 +198,17 @@ WorkSetConcurrencyLimitArgument(int n)
 unsigned
 WorkGetConcurrencyLimit()
 {
+#if TBB_INTERFACE_VERSION_MAJOR >= 12
+    // The effective concurrency requires taking into account both the
+    // task_arena and internal thread pool size set by global_control.
+    // https://github.com/oneapi-src/oneTBB/issues/405
+    return std::min<unsigned>(
+        tbb::global_control::active_value(
+            tbb::global_control::max_allowed_parallelism), 
+        tbb::this_task_arena::max_concurrency());
+#else
     return tbb::this_task_arena::max_concurrency();
+#endif
 }
 
 bool
diff --git a/pxr/base/work/threadLimits.h b/pxr/base/work/threadLimits.h
index d9fd154fe2..11bd658c0c 100644
--- a/pxr/base/work/threadLimits.h
+++ b/pxr/base/work/threadLimits.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_THREAD_LIMITS_H
 #define PXR_BASE_WORK_THREAD_LIMITS_H
diff --git a/pxr/base/work/utils.cpp b/pxr/base/work/utils.cpp
index f712798c78..2d841d5758 100644
--- a/pxr/base/work/utils.cpp
+++ b/pxr/base/work/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/base/work/utils.h b/pxr/base/work/utils.h
index a7f6dda767..227d7cb45b 100644
--- a/pxr/base/work/utils.h
+++ b/pxr/base/work/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_UTILS_H
 #define PXR_BASE_WORK_UTILS_H
diff --git a/pxr/base/work/withScopedParallelism.h b/pxr/base/work/withScopedParallelism.h
index f5a4c823f5..0dc6f2eea8 100644
--- a/pxr/base/work/withScopedParallelism.h
+++ b/pxr/base/work/withScopedParallelism.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_BASE_WORK_WITH_SCOPED_PARALLELISM_H
 #define PXR_BASE_WORK_WITH_SCOPED_PARALLELISM_H
diff --git a/pxr/base/work/wrapThreadLimits.cpp b/pxr/base/work/wrapThreadLimits.cpp
index ca4091eedb..fe34fcc6ff 100644
--- a/pxr/base/work/wrapThreadLimits.cpp
+++ b/pxr/base/work/wrapThreadLimits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/imaging/cameraUtil/__init__.py b/pxr/imaging/cameraUtil/__init__.py
index ff527aa911..d9d17c248b 100644
--- a/pxr/imaging/cameraUtil/__init__.py
+++ b/pxr/imaging/cameraUtil/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 Camera utilities.
diff --git a/pxr/imaging/cameraUtil/api.h b/pxr/imaging/cameraUtil/api.h
index 8c3420ffde..07f210d7d8 100644
--- a/pxr/imaging/cameraUtil/api.h
+++ b/pxr/imaging/cameraUtil/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_CAMERA_UTIL_API_H
 #define PXR_IMAGING_CAMERA_UTIL_API_H
diff --git a/pxr/imaging/cameraUtil/conformWindow.cpp b/pxr/imaging/cameraUtil/conformWindow.cpp
index aba02438cc..9b2f64e8ef 100644
--- a/pxr/imaging/cameraUtil/conformWindow.cpp
+++ b/pxr/imaging/cameraUtil/conformWindow.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/cameraUtil/conformWindow.h"
 
diff --git a/pxr/imaging/cameraUtil/conformWindow.h b/pxr/imaging/cameraUtil/conformWindow.h
index 931a4de72c..af9febac17 100644
--- a/pxr/imaging/cameraUtil/conformWindow.h
+++ b/pxr/imaging/cameraUtil/conformWindow.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_CAMERA_UTIL_CONFORM_WINDOW_H
 #define PXR_IMAGING_CAMERA_UTIL_CONFORM_WINDOW_H
diff --git a/pxr/imaging/cameraUtil/framing.cpp b/pxr/imaging/cameraUtil/framing.cpp
index 7e77a54505..a92a8af771 100644
--- a/pxr/imaging/cameraUtil/framing.cpp
+++ b/pxr/imaging/cameraUtil/framing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/cameraUtil/framing.h"
 
diff --git a/pxr/imaging/cameraUtil/framing.h b/pxr/imaging/cameraUtil/framing.h
index 7cd9b4bff9..f97b03daf8 100644
--- a/pxr/imaging/cameraUtil/framing.h
+++ b/pxr/imaging/cameraUtil/framing.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_CAMERA_UTIL_FRAMING_H
 #define PXR_IMAGING_CAMERA_UTIL_FRAMING_H
diff --git a/pxr/imaging/cameraUtil/module.cpp b/pxr/imaging/cameraUtil/module.cpp
index 2873e81669..18493d5fe8 100644
--- a/pxr/imaging/cameraUtil/module.cpp
+++ b/pxr/imaging/cameraUtil/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/imaging/cameraUtil/moduleDeps.cpp b/pxr/imaging/cameraUtil/moduleDeps.cpp
index 9965f6ad12..d4186ddb1f 100644
--- a/pxr/imaging/cameraUtil/moduleDeps.cpp
+++ b/pxr/imaging/cameraUtil/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/cameraUtil/pch.h b/pxr/imaging/cameraUtil/pch.h
index 2cbc054b29..03d7daec4c 100644
--- a/pxr/imaging/cameraUtil/pch.h
+++ b/pxr/imaging/cameraUtil/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -27,15 +10,11 @@
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
-#if defined(ARCH_OS_WINDOWS)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #endif
+#include <any>
+#include <array>
 #include <atomic>
 #include <cfloat>
 #include <cinttypes>
@@ -43,12 +22,10 @@
 #include <cstdarg>
 #include <cstddef>
 #include <cstdint>
-#include <cstdlib>
 #include <cstring>
 #include <deque>
 #include <float.h>
 #include <functional>
-#include <initializer_list>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -57,12 +34,10 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
 #include <type_traits>
@@ -72,28 +47,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -119,12 +72,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/cameraUtil/screenWindowParameters.cpp b/pxr/imaging/cameraUtil/screenWindowParameters.cpp
index f8e4695252..ba724c2d7d 100644
--- a/pxr/imaging/cameraUtil/screenWindowParameters.cpp
+++ b/pxr/imaging/cameraUtil/screenWindowParameters.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/cameraUtil/screenWindowParameters.h"
 
diff --git a/pxr/imaging/cameraUtil/screenWindowParameters.h b/pxr/imaging/cameraUtil/screenWindowParameters.h
index 3e9bad7417..761ee2e5c9 100644
--- a/pxr/imaging/cameraUtil/screenWindowParameters.h
+++ b/pxr/imaging/cameraUtil/screenWindowParameters.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_CAMERA_UTIL_SCREEN_WINDOW_PARAMETERS_H
 #define PXR_IMAGING_CAMERA_UTIL_SCREEN_WINDOW_PARAMETERS_H
diff --git a/pxr/imaging/cameraUtil/testenv/testCameraUtil.py b/pxr/imaging/cameraUtil/testenv/testCameraUtil.py
index aa04579149..25deaa74d3 100644
--- a/pxr/imaging/cameraUtil/testenv/testCameraUtil.py
+++ b/pxr/imaging/cameraUtil/testenv/testCameraUtil.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import CameraUtil, Gf
 import unittest
diff --git a/pxr/imaging/cameraUtil/wrapConformWindow.cpp b/pxr/imaging/cameraUtil/wrapConformWindow.cpp
index 155dc81c31..d46bb9f035 100644
--- a/pxr/imaging/cameraUtil/wrapConformWindow.cpp
+++ b/pxr/imaging/cameraUtil/wrapConformWindow.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file camera/wrapConformWindow.h
diff --git a/pxr/imaging/cameraUtil/wrapFraming.cpp b/pxr/imaging/cameraUtil/wrapFraming.cpp
index 6c2f893bf4..3c6fc66748 100644
--- a/pxr/imaging/cameraUtil/wrapFraming.cpp
+++ b/pxr/imaging/cameraUtil/wrapFraming.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/cameraUtil/framing.h"
 
diff --git a/pxr/imaging/cameraUtil/wrapScreenWindowParameters.cpp b/pxr/imaging/cameraUtil/wrapScreenWindowParameters.cpp
index d4b257e0ff..b14a924a63 100644
--- a/pxr/imaging/cameraUtil/wrapScreenWindowParameters.cpp
+++ b/pxr/imaging/cameraUtil/wrapScreenWindowParameters.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file camera/wrapScreenWindowParameters.h
diff --git a/pxr/imaging/garch/CMakeLists.txt b/pxr/imaging/garch/CMakeLists.txt
index 1b32198b17..c7732bc213 100644
--- a/pxr/imaging/garch/CMakeLists.txt
+++ b/pxr/imaging/garch/CMakeLists.txt
@@ -27,7 +27,7 @@ pxr_library(garch
         arch
         tf
         ${X11_LIBRARIES}
-        ${OPENGL_gl_LIBRARY}
+        OpenGL::GL
         ${GARCH_PLATFORM_LIBRARIES}
 
     INCLUDE_DIRS
diff --git a/pxr/imaging/garch/__init__.py b/pxr/imaging/garch/__init__.py
index 56d77c4ef3..24a999b81e 100644
--- a/pxr/imaging/garch/__init__.py
+++ b/pxr/imaging/garch/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 garch
diff --git a/pxr/imaging/garch/api.h b/pxr/imaging/garch/api.h
index 23fc5a527c..f415f12280 100644
--- a/pxr/imaging/garch/api.h
+++ b/pxr/imaging/garch/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_API_H
 #define PXR_IMAGING_GARCH_API_H
diff --git a/pxr/imaging/garch/gl.h b/pxr/imaging/garch/gl.h
index 6ff7a4c8fc..7ccb720fae 100644
--- a/pxr/imaging/garch/gl.h
+++ b/pxr/imaging/garch/gl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_H
 #define PXR_IMAGING_GARCH_GL_H
diff --git a/pxr/imaging/garch/glApi.cpp b/pxr/imaging/garch/glApi.cpp
index c7a376a3df..e28a41a1ec 100644
--- a/pxr/imaging/garch/glApi.cpp
+++ b/pxr/imaging/garch/glApi.cpp
@@ -1,25 +1,8 @@
 //
 //   Copyright 2020 Pixar
 //
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glApi.h"
diff --git a/pxr/imaging/garch/glApi.h b/pxr/imaging/garch/glApi.h
index a2809aada5..429261f6ef 100644
--- a/pxr/imaging/garch/glApi.h
+++ b/pxr/imaging/garch/glApi.h
@@ -1,25 +1,8 @@
 //
 //   Copyright 2020 Pixar
 //
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_GARCH_GLAPI_H
diff --git a/pxr/imaging/garch/glDebugWindow.cpp b/pxr/imaging/garch/glDebugWindow.cpp
index 18c372cc86..d3e1628f7d 100644
--- a/pxr/imaging/garch/glDebugWindow.cpp
+++ b/pxr/imaging/garch/glDebugWindow.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glDebugWindow.h"
diff --git a/pxr/imaging/garch/glDebugWindow.h b/pxr/imaging/garch/glDebugWindow.h
index 16d1bb669c..a06a708245 100644
--- a/pxr/imaging/garch/glDebugWindow.h
+++ b/pxr/imaging/garch/glDebugWindow.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_DEBUG_WINDOW_H
 #define PXR_IMAGING_GARCH_GL_DEBUG_WINDOW_H
diff --git a/pxr/imaging/garch/glPlatformContext.h b/pxr/imaging/garch/glPlatformContext.h
index de864498e5..bc13f7347b 100644
--- a/pxr/imaging/garch/glPlatformContext.h
+++ b/pxr/imaging/garch/glPlatformContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_PLATFORM_CONTEXT_H
 #define PXR_IMAGING_GARCH_GL_PLATFORM_CONTEXT_H
diff --git a/pxr/imaging/garch/glPlatformContextDarwin.h b/pxr/imaging/garch/glPlatformContextDarwin.h
index eae2880de0..398beb3731 100644
--- a/pxr/imaging/garch/glPlatformContextDarwin.h
+++ b/pxr/imaging/garch/glPlatformContextDarwin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_PLATFORM_CONTEXT_DARWIN_H
 #define PXR_IMAGING_GARCH_GL_PLATFORM_CONTEXT_DARWIN_H
diff --git a/pxr/imaging/garch/glPlatformContextDarwin.mm b/pxr/imaging/garch/glPlatformContextDarwin.mm
index 950663319f..e79b85803c 100644
--- a/pxr/imaging/garch/glPlatformContextDarwin.mm
+++ b/pxr/imaging/garch/glPlatformContextDarwin.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #import <Foundation/Foundation.h>
 #import <AppKit/NSOpenGL.h>
diff --git a/pxr/imaging/garch/glPlatformContextGLX.cpp b/pxr/imaging/garch/glPlatformContextGLX.cpp
index 823d6b4328..e78fb75354 100644
--- a/pxr/imaging/garch/glPlatformContextGLX.cpp
+++ b/pxr/imaging/garch/glPlatformContextGLX.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file glPlatformContext.cpp
 
diff --git a/pxr/imaging/garch/glPlatformContextGLX.h b/pxr/imaging/garch/glPlatformContextGLX.h
index 3deb82bc0b..aa8d70e507 100644
--- a/pxr/imaging/garch/glPlatformContextGLX.h
+++ b/pxr/imaging/garch/glPlatformContextGLX.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_PLATFORM_CONTEXT_GLX_H
 #define PXR_IMAGING_GARCH_GL_PLATFORM_CONTEXT_GLX_H
diff --git a/pxr/imaging/garch/glPlatformContextWindows.cpp b/pxr/imaging/garch/glPlatformContextWindows.cpp
index 29176706dd..ea37bec024 100644
--- a/pxr/imaging/garch/glPlatformContextWindows.cpp
+++ b/pxr/imaging/garch/glPlatformContextWindows.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glPlatformContextWindows.h"
 #include "pxr/base/tf/hash.h"
diff --git a/pxr/imaging/garch/glPlatformContextWindows.h b/pxr/imaging/garch/glPlatformContextWindows.h
index b948ce0e10..9fe5854936 100644
--- a/pxr/imaging/garch/glPlatformContextWindows.h
+++ b/pxr/imaging/garch/glPlatformContextWindows.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_PLATFORM_CONTEXT_WINDOWS_H
 #define PXR_IMAGING_GARCH_GL_PLATFORM_CONTEXT_WINDOWS_H
diff --git a/pxr/imaging/garch/glPlatformDebugContext.cpp b/pxr/imaging/garch/glPlatformDebugContext.cpp
index 335cdf4175..6bc5792ee7 100644
--- a/pxr/imaging/garch/glPlatformDebugContext.cpp
+++ b/pxr/imaging/garch/glPlatformDebugContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glPlatformDebugContext.h"
 
diff --git a/pxr/imaging/garch/glPlatformDebugContext.h b/pxr/imaging/garch/glPlatformDebugContext.h
index 8f21dde2f7..590c8df958 100644
--- a/pxr/imaging/garch/glPlatformDebugContext.h
+++ b/pxr/imaging/garch/glPlatformDebugContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_PLATFORM_DEBUG_CONTEXT_H
 #define PXR_IMAGING_GARCH_GL_PLATFORM_DEBUG_CONTEXT_H
diff --git a/pxr/imaging/garch/glPlatformDebugWindowDarwin.h b/pxr/imaging/garch/glPlatformDebugWindowDarwin.h
index 56e550ccfe..89985d98f5 100644
--- a/pxr/imaging/garch/glPlatformDebugWindowDarwin.h
+++ b/pxr/imaging/garch/glPlatformDebugWindowDarwin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_PLATFORM_DEBUG_WINDOW_DARWIN_H
 #define PXR_IMAGING_GARCH_GL_PLATFORM_DEBUG_WINDOW_DARWIN_H
diff --git a/pxr/imaging/garch/glPlatformDebugWindowDarwin.mm b/pxr/imaging/garch/glPlatformDebugWindowDarwin.mm
index 22b2fe1218..ff1d3d2298 100644
--- a/pxr/imaging/garch/glPlatformDebugWindowDarwin.mm
+++ b/pxr/imaging/garch/glPlatformDebugWindowDarwin.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/imaging/garch/glPlatformDebugWindowGLX.cpp b/pxr/imaging/garch/glPlatformDebugWindowGLX.cpp
index 5eeb855508..dd7f3de09a 100644
--- a/pxr/imaging/garch/glPlatformDebugWindowGLX.cpp
+++ b/pxr/imaging/garch/glPlatformDebugWindowGLX.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glDebugWindow.h"
diff --git a/pxr/imaging/garch/glPlatformDebugWindowGLX.h b/pxr/imaging/garch/glPlatformDebugWindowGLX.h
index 91ee37096c..a4d1be15b2 100644
--- a/pxr/imaging/garch/glPlatformDebugWindowGLX.h
+++ b/pxr/imaging/garch/glPlatformDebugWindowGLX.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_PLATFORM_DEBUG_WINDOW_GLX_H
 #define PXR_IMAGING_GARCH_GL_PLATFORM_DEBUG_WINDOW_GLX_H
diff --git a/pxr/imaging/garch/glPlatformDebugWindowWindows.cpp b/pxr/imaging/garch/glPlatformDebugWindowWindows.cpp
index 17cfea150c..f52e74d7f6 100644
--- a/pxr/imaging/garch/glPlatformDebugWindowWindows.cpp
+++ b/pxr/imaging/garch/glPlatformDebugWindowWindows.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glPlatformDebugWindowWindows.h"
diff --git a/pxr/imaging/garch/glPlatformDebugWindowWindows.h b/pxr/imaging/garch/glPlatformDebugWindowWindows.h
index 5fcb34b203..6d243315fb 100644
--- a/pxr/imaging/garch/glPlatformDebugWindowWindows.h
+++ b/pxr/imaging/garch/glPlatformDebugWindowWindows.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GARCH_GL_PLATFORM_DEBUG_WINDOW_WINDOWS_H
 #define PXR_IMAGING_GARCH_GL_PLATFORM_DEBUG_WINDOW_WINDOWS_H
diff --git a/pxr/imaging/garch/module.cpp b/pxr/imaging/garch/module.cpp
index 3684ec8f16..d2119a1cef 100644
--- a/pxr/imaging/garch/module.cpp
+++ b/pxr/imaging/garch/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/pyModule.h"
 
diff --git a/pxr/imaging/garch/moduleDeps.cpp b/pxr/imaging/garch/moduleDeps.cpp
index 138f79588f..1d1d0d1756 100644
--- a/pxr/imaging/garch/moduleDeps.cpp
+++ b/pxr/imaging/garch/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/garch/pch.h b/pxr/imaging/garch/pch.h
index 7ef3bd8afd..1814db58c0 100644
--- a/pxr/imaging/garch/pch.h
+++ b/pxr/imaging/garch/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #include <X11/Xlib.h>
 #endif
@@ -39,11 +23,13 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#include <tchar.h>
 #include <Windows.h>
+#include <tchar.h>
 #include <intrin.h>
-#include <map>
 #endif
+#include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <cassert>
 #include <cinttypes>
@@ -56,14 +42,15 @@
 #include <cstring>
 #include <deque>
 #include <functional>
-#include <initializer_list>
 #include <inttypes.h>
 #include <iosfwd>
+#include <iterator>
 #include <list>
 #include <locale>
+#include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -71,6 +58,7 @@
 #include <stdint.h>
 #include <string>
 #include <sys/types.h>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -78,35 +66,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/class.hpp>
 #include <boost/python/converter/from_python.hpp>
@@ -137,15 +96,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/spin_rw_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/garch/wrapPlatformDebugContext.cpp b/pxr/imaging/garch/wrapPlatformDebugContext.cpp
index 36ec36c4e8..50c5a44bda 100644
--- a/pxr/imaging/garch/wrapPlatformDebugContext.cpp
+++ b/pxr/imaging/garch/wrapPlatformDebugContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glPlatformDebugContext.h"
 
diff --git a/pxr/imaging/geomUtil/__init__.py b/pxr/imaging/geomUtil/__init__.py
index 61a4a350ea..cd11c58bb8 100644
--- a/pxr/imaging/geomUtil/__init__.py
+++ b/pxr/imaging/geomUtil/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 Utilities to help image common geometry.
diff --git a/pxr/imaging/geomUtil/api.h b/pxr/imaging/geomUtil/api.h
index 8c5f208116..87d06a1287 100644
--- a/pxr/imaging/geomUtil/api.h
+++ b/pxr/imaging/geomUtil/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GEOM_UTIL_API_H
 #define PXR_IMAGING_GEOM_UTIL_API_H
diff --git a/pxr/imaging/geomUtil/capsuleMeshGenerator.cpp b/pxr/imaging/geomUtil/capsuleMeshGenerator.cpp
index 6222ea223e..e44b239217 100644
--- a/pxr/imaging/geomUtil/capsuleMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/capsuleMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/capsuleMeshGenerator.h"
 
@@ -121,7 +104,7 @@ GeomUtilCapsuleMeshGenerator::_GeneratePointsImpl(
 
         // Now, the latidude at which to clip the sphere is the angle of
         // this point from the horizontal:
-        latitudeRange = acos(rDiff / height);
+        latitudeRange = atan(rDiff / height);
     }
 
     // Bottom point:
diff --git a/pxr/imaging/geomUtil/capsuleMeshGenerator.h b/pxr/imaging/geomUtil/capsuleMeshGenerator.h
index a2e933e02b..48a0dceac3 100644
--- a/pxr/imaging/geomUtil/capsuleMeshGenerator.h
+++ b/pxr/imaging/geomUtil/capsuleMeshGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GEOM_UTIL_CAPSULE_MESH_GENERATOR_H
 #define PXR_IMAGING_GEOM_UTIL_CAPSULE_MESH_GENERATOR_H
diff --git a/pxr/imaging/geomUtil/coneMeshGenerator.cpp b/pxr/imaging/geomUtil/coneMeshGenerator.cpp
index 0e46f0fc4e..a7a4e01832 100644
--- a/pxr/imaging/geomUtil/coneMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/coneMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/coneMeshGenerator.h"
 
diff --git a/pxr/imaging/geomUtil/coneMeshGenerator.h b/pxr/imaging/geomUtil/coneMeshGenerator.h
index 522a1fc55e..5ed61c48bc 100644
--- a/pxr/imaging/geomUtil/coneMeshGenerator.h
+++ b/pxr/imaging/geomUtil/coneMeshGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GEOM_UTIL_CONE_MESH_GENERATOR_H
 #define PXR_IMAGING_GEOM_UTIL_CONE_MESH_GENERATOR_H
diff --git a/pxr/imaging/geomUtil/cuboidMeshGenerator.cpp b/pxr/imaging/geomUtil/cuboidMeshGenerator.cpp
index 19b16b8a58..61417ace30 100644
--- a/pxr/imaging/geomUtil/cuboidMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/cuboidMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/cuboidMeshGenerator.h"
 
diff --git a/pxr/imaging/geomUtil/cuboidMeshGenerator.h b/pxr/imaging/geomUtil/cuboidMeshGenerator.h
index 29c2260a38..1228da273c 100644
--- a/pxr/imaging/geomUtil/cuboidMeshGenerator.h
+++ b/pxr/imaging/geomUtil/cuboidMeshGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GEOM_UTIL_CUBOID_MESH_GENERATOR_H
 #define PXR_IMAGING_GEOM_UTIL_CUBOID_MESH_GENERATOR_H
diff --git a/pxr/imaging/geomUtil/cylinderMeshGenerator.cpp b/pxr/imaging/geomUtil/cylinderMeshGenerator.cpp
index d11a5a867b..485289ce86 100644
--- a/pxr/imaging/geomUtil/cylinderMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/cylinderMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/cylinderMeshGenerator.h"
 
diff --git a/pxr/imaging/geomUtil/cylinderMeshGenerator.h b/pxr/imaging/geomUtil/cylinderMeshGenerator.h
index 33cd7a4516..0be856781a 100644
--- a/pxr/imaging/geomUtil/cylinderMeshGenerator.h
+++ b/pxr/imaging/geomUtil/cylinderMeshGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GEOM_UTIL_CYLINDER_MESH_GENERATOR_H
 #define PXR_IMAGING_GEOM_UTIL_CYLINDER_MESH_GENERATOR_H
diff --git a/pxr/imaging/geomUtil/meshGeneratorBase.cpp b/pxr/imaging/geomUtil/meshGeneratorBase.cpp
index 7b486b077d..bfdb99c584 100644
--- a/pxr/imaging/geomUtil/meshGeneratorBase.cpp
+++ b/pxr/imaging/geomUtil/meshGeneratorBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/meshGeneratorBase.h"
 
diff --git a/pxr/imaging/geomUtil/meshGeneratorBase.h b/pxr/imaging/geomUtil/meshGeneratorBase.h
index 7a8bdf03ea..292ef33d44 100644
--- a/pxr/imaging/geomUtil/meshGeneratorBase.h
+++ b/pxr/imaging/geomUtil/meshGeneratorBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GEOM_UTIL_MESH_GENERATOR_BASE_H
 #define PXR_IMAGING_GEOM_UTIL_MESH_GENERATOR_BASE_H
diff --git a/pxr/imaging/geomUtil/module.cpp b/pxr/imaging/geomUtil/module.cpp
index 0fd58ee758..de568b2db2 100644
--- a/pxr/imaging/geomUtil/module.cpp
+++ b/pxr/imaging/geomUtil/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/imaging/geomUtil/moduleDeps.cpp b/pxr/imaging/geomUtil/moduleDeps.cpp
index a06c6233cb..17ef043a8c 100644
--- a/pxr/imaging/geomUtil/moduleDeps.cpp
+++ b/pxr/imaging/geomUtil/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/geomUtil/pch.h b/pxr/imaging/geomUtil/pch.h
index 0eb05452df..f2fd10debb 100644
--- a/pxr/imaging/geomUtil/pch.h
+++ b/pxr/imaging/geomUtil/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -27,17 +10,14 @@
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
-#if defined(ARCH_OS_WINDOWS)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #endif
+#include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
-#include <cfloat>
+#include <cinttypes>
 #include <cmath>
 #include <cstdarg>
 #include <cstddef>
@@ -45,23 +25,23 @@
 #include <cstdlib>
 #include <cstring>
 #include <deque>
-#include <float.h>
-#include <inttypes.h>
+#include <functional>
 #include <iosfwd>
-#include <iostream>
+#include <iterator>
 #include <limits>
 #include <list>
+#include <locale>
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
+#include <new>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -69,69 +49,17 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/empty.hpp>
-#include <boost/mpl/front.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/pop_front.hpp>
-#include <boost/mpl/remove.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/python.hpp>
 #include <boost/python/class.hpp>
-#include <boost/python/converter/from_python.hpp>
-#include <boost/python/converter/registered.hpp>
-#include <boost/python/converter/rvalue_from_python_data.hpp>
 #include <boost/python/dict.hpp>
-#include <boost/python/extract.hpp>
-#include <boost/python/handle.hpp>
-#include <boost/python/list.hpp>
 #include <boost/python/module.hpp>
-#include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
-#include <boost/python/operators.hpp>
-#include <boost/python/refcount.hpp>
-#include <boost/python/scope.hpp>
-#include <boost/python/to_python_converter.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/type_id.hpp>
 #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
 #undef tolower
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/scoped_ptr.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_class.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
-#include <Python.h>
+#include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/geomUtil/sphereMeshGenerator.cpp b/pxr/imaging/geomUtil/sphereMeshGenerator.cpp
index 2ca93b3755..15f5c44349 100644
--- a/pxr/imaging/geomUtil/sphereMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/sphereMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/sphereMeshGenerator.h"
 
diff --git a/pxr/imaging/geomUtil/sphereMeshGenerator.h b/pxr/imaging/geomUtil/sphereMeshGenerator.h
index 8393fd842c..44183a359f 100644
--- a/pxr/imaging/geomUtil/sphereMeshGenerator.h
+++ b/pxr/imaging/geomUtil/sphereMeshGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GEOM_UTIL_SPHERE_MESH_GENERATOR_H
 #define PXR_IMAGING_GEOM_UTIL_SPHERE_MESH_GENERATOR_H
diff --git a/pxr/imaging/geomUtil/testenv/testMeshGenerators.cpp b/pxr/imaging/geomUtil/testenv/testMeshGenerators.cpp
index 9e9a1bfbd1..2729994a4a 100644
--- a/pxr/imaging/geomUtil/testenv/testMeshGenerators.cpp
+++ b/pxr/imaging/geomUtil/testenv/testMeshGenerators.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/imaging/geomUtil/wrapCapsuleMeshGenerator.cpp b/pxr/imaging/geomUtil/wrapCapsuleMeshGenerator.cpp
index a7c6c218eb..5cc261d9c0 100644
--- a/pxr/imaging/geomUtil/wrapCapsuleMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/wrapCapsuleMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/capsuleMeshGenerator.h"
 
diff --git a/pxr/imaging/geomUtil/wrapConeMeshGenerator.cpp b/pxr/imaging/geomUtil/wrapConeMeshGenerator.cpp
index 94e041b9da..7fe2d95ab5 100644
--- a/pxr/imaging/geomUtil/wrapConeMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/wrapConeMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/coneMeshGenerator.h"
 
diff --git a/pxr/imaging/geomUtil/wrapCuboidMeshGenerator.cpp b/pxr/imaging/geomUtil/wrapCuboidMeshGenerator.cpp
index 1ec5f9430a..61d5175e55 100644
--- a/pxr/imaging/geomUtil/wrapCuboidMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/wrapCuboidMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/cuboidMeshGenerator.h"
 
diff --git a/pxr/imaging/geomUtil/wrapCylinderMeshGenerator.cpp b/pxr/imaging/geomUtil/wrapCylinderMeshGenerator.cpp
index ed77b14178..07a5a6854d 100644
--- a/pxr/imaging/geomUtil/wrapCylinderMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/wrapCylinderMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/cylinderMeshGenerator.h"
 
diff --git a/pxr/imaging/geomUtil/wrapSphereMeshGenerator.cpp b/pxr/imaging/geomUtil/wrapSphereMeshGenerator.cpp
index 15c58de4a5..a08ba702f8 100644
--- a/pxr/imaging/geomUtil/wrapSphereMeshGenerator.cpp
+++ b/pxr/imaging/geomUtil/wrapSphereMeshGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/geomUtil/sphereMeshGenerator.h"
 
diff --git a/pxr/imaging/glf/CMakeLists.txt b/pxr/imaging/glf/CMakeLists.txt
index 7425510d5f..6a90806549 100644
--- a/pxr/imaging/glf/CMakeLists.txt
+++ b/pxr/imaging/glf/CMakeLists.txt
@@ -28,7 +28,7 @@ pxr_library(glf
         trace
         sdf
         ${Boost_PYTHON_LIBRARY}
-        ${OPENGL_gl_LIBRARY}
+        OpenGL::GL
         ${X11_LIBRARIES}
         ${optionalLibs}
 
diff --git a/pxr/imaging/glf/__init__.py b/pxr/imaging/glf/__init__.py
index ee8a03a95d..7ba36a72b0 100644
--- a/pxr/imaging/glf/__init__.py
+++ b/pxr/imaging/glf/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 glf
diff --git a/pxr/imaging/glf/api.h b/pxr/imaging/glf/api.h
index f64254b624..b4d362bf14 100644
--- a/pxr/imaging/glf/api.h
+++ b/pxr/imaging/glf/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_API_H
 #define PXR_IMAGING_GLF_API_H
diff --git a/pxr/imaging/glf/bindingMap.cpp b/pxr/imaging/glf/bindingMap.cpp
index 14416dbf76..67b8f05f3a 100644
--- a/pxr/imaging/glf/bindingMap.cpp
+++ b/pxr/imaging/glf/bindingMap.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file bindingMap.cpp
 
diff --git a/pxr/imaging/glf/bindingMap.h b/pxr/imaging/glf/bindingMap.h
index 6ffc2d4b77..04249172bb 100644
--- a/pxr/imaging/glf/bindingMap.h
+++ b/pxr/imaging/glf/bindingMap.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_BINDING_MAP_H
 #define PXR_IMAGING_GLF_BINDING_MAP_H
diff --git a/pxr/imaging/glf/contextCaps.cpp b/pxr/imaging/glf/contextCaps.cpp
index c4367c2925..df6e5a6205 100644
--- a/pxr/imaging/glf/contextCaps.cpp
+++ b/pxr/imaging/glf/contextCaps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glApi.h"
diff --git a/pxr/imaging/glf/contextCaps.h b/pxr/imaging/glf/contextCaps.h
index fe146e5019..4ee8dd12f1 100644
--- a/pxr/imaging/glf/contextCaps.h
+++ b/pxr/imaging/glf/contextCaps.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_CONTEXT_CAPS_H
 #define PXR_IMAGING_GLF_CONTEXT_CAPS_H
diff --git a/pxr/imaging/glf/debugCodes.cpp b/pxr/imaging/glf/debugCodes.cpp
index 8ec41d1a16..0ca528e82a 100644
--- a/pxr/imaging/glf/debugCodes.cpp
+++ b/pxr/imaging/glf/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file debugCodes.cpp
 
diff --git a/pxr/imaging/glf/debugCodes.h b/pxr/imaging/glf/debugCodes.h
index 3abfb0f4a6..1b0e8cf9c3 100644
--- a/pxr/imaging/glf/debugCodes.h
+++ b/pxr/imaging/glf/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_DEBUG_CODES_H
 #define PXR_IMAGING_GLF_DEBUG_CODES_H
diff --git a/pxr/imaging/glf/diagnostic.cpp b/pxr/imaging/glf/diagnostic.cpp
index 20514bd941..db778a8edc 100644
--- a/pxr/imaging/glf/diagnostic.cpp
+++ b/pxr/imaging/glf/diagnostic.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Diagnostic.cpp
 //
diff --git a/pxr/imaging/glf/diagnostic.h b/pxr/imaging/glf/diagnostic.h
index 10eb154101..61b31228bb 100644
--- a/pxr/imaging/glf/diagnostic.h
+++ b/pxr/imaging/glf/diagnostic.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_DIAGNOSTIC_H
 #define PXR_IMAGING_GLF_DIAGNOSTIC_H
diff --git a/pxr/imaging/glf/drawTarget.cpp b/pxr/imaging/glf/drawTarget.cpp
index b1f8b2b22d..2cc071a5bd 100644
--- a/pxr/imaging/glf/drawTarget.cpp
+++ b/pxr/imaging/glf/drawTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // glf/drawTarget.cpp
 //
diff --git a/pxr/imaging/glf/drawTarget.h b/pxr/imaging/glf/drawTarget.h
index 998451f073..3b585270fd 100644
--- a/pxr/imaging/glf/drawTarget.h
+++ b/pxr/imaging/glf/drawTarget.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_DRAW_TARGET_H
 #define PXR_IMAGING_GLF_DRAW_TARGET_H
diff --git a/pxr/imaging/glf/glContext.cpp b/pxr/imaging/glf/glContext.cpp
index 782118ea63..90ae0d1df1 100644
--- a/pxr/imaging/glf/glContext.cpp
+++ b/pxr/imaging/glf/glContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/glf/glContext.h"
 #include "pxr/imaging/glf/glContextRegistry.h"
diff --git a/pxr/imaging/glf/glContext.h b/pxr/imaging/glf/glContext.h
index 622bba0dbc..424c58ec19 100644
--- a/pxr/imaging/glf/glContext.h
+++ b/pxr/imaging/glf/glContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_GL_CONTEXT_H
 #define PXR_IMAGING_GLF_GL_CONTEXT_H
diff --git a/pxr/imaging/glf/glContextRegistry.cpp b/pxr/imaging/glf/glContextRegistry.cpp
index 2224163c8e..ded4d92dd5 100644
--- a/pxr/imaging/glf/glContextRegistry.cpp
+++ b/pxr/imaging/glf/glContextRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file glContextRegistry.cpp
 
diff --git a/pxr/imaging/glf/glContextRegistry.h b/pxr/imaging/glf/glContextRegistry.h
index 7b1cd42c49..2ad7cb3e6b 100644
--- a/pxr/imaging/glf/glContextRegistry.h
+++ b/pxr/imaging/glf/glContextRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_GL_CONTEXT_REGISTRY_H
 #define PXR_IMAGING_GLF_GL_CONTEXT_REGISTRY_H
diff --git a/pxr/imaging/glf/glRawContext.cpp b/pxr/imaging/glf/glRawContext.cpp
index dbe77e05dc..bf2eed8849 100644
--- a/pxr/imaging/glf/glRawContext.cpp
+++ b/pxr/imaging/glf/glRawContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file glRawContext.cpp
 
diff --git a/pxr/imaging/glf/glRawContext.h b/pxr/imaging/glf/glRawContext.h
index 8580ece6b4..346d92cac1 100644
--- a/pxr/imaging/glf/glRawContext.h
+++ b/pxr/imaging/glf/glRawContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_GL_RAW_CONTEXT_H
 #define PXR_IMAGING_GLF_GL_RAW_CONTEXT_H
diff --git a/pxr/imaging/glf/info.cpp b/pxr/imaging/glf/info.cpp
index 3394d2c700..8e778083dd 100644
--- a/pxr/imaging/glf/info.cpp
+++ b/pxr/imaging/glf/info.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // info.cpp
 //
diff --git a/pxr/imaging/glf/info.h b/pxr/imaging/glf/info.h
index 63596b6984..14c6ef60b9 100644
--- a/pxr/imaging/glf/info.h
+++ b/pxr/imaging/glf/info.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_INFO_H
 #define PXR_IMAGING_GLF_INFO_H
diff --git a/pxr/imaging/glf/module.cpp b/pxr/imaging/glf/module.cpp
index 32e1eebc14..34eaccde85 100644
--- a/pxr/imaging/glf/module.cpp
+++ b/pxr/imaging/glf/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/imaging/glf/moduleDeps.cpp b/pxr/imaging/glf/moduleDeps.cpp
index 5f2fb668df..5053a12246 100644
--- a/pxr/imaging/glf/moduleDeps.cpp
+++ b/pxr/imaging/glf/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/glf/pch.h b/pxr/imaging/glf/pch.h
index 9a7e85a6c4..9b00261292 100644
--- a/pxr/imaging/glf/pch.h
+++ b/pxr/imaging/glf/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -51,14 +34,12 @@
 #include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
-#include <cassert>
-#include <cfloat>
 #include <cinttypes>
 #include <climits>
 #include <cmath>
@@ -68,10 +49,12 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <deque>
 #include <fcntl.h>
 #include <functional>
 #include <initializer_list>
+#include <inttypes.h>
 #include <iosfwd>
 #include <iostream>
 #include <iterator>
@@ -83,6 +66,7 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -102,48 +86,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/bases.hpp>
 #include <boost/python/class.hpp>
@@ -180,35 +122,11 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
-#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/enumerable_thread_specific.h>
-#include <tbb/parallel_for.h>
-#include <tbb/parallel_for_each.h>
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
-#include <tbb/task.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/glf/shaders/pcfShader.glslfx b/pxr/imaging/glf/shaders/pcfShader.glslfx
index c03cd8e85d..e6003f1e41 100644
--- a/pxr/imaging/glf/shaders/pcfShader.glslfx
+++ b/pxr/imaging/glf/shaders/pcfShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 ---Percentage-Closer Filtering (PCF)
diff --git a/pxr/imaging/glf/shaders/simpleLighting.glslfx b/pxr/imaging/glf/shaders/simpleLighting.glslfx
index 6dbfa6d59c..aea52730b4 100644
--- a/pxr/imaging/glf/shaders/simpleLighting.glslfx
+++ b/pxr/imaging/glf/shaders/simpleLighting.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/glf/simpleLight.cpp b/pxr/imaging/glf/simpleLight.cpp
index 41b770ca97..260c3ff40a 100644
--- a/pxr/imaging/glf/simpleLight.cpp
+++ b/pxr/imaging/glf/simpleLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file simpleLight.cpp
 
diff --git a/pxr/imaging/glf/simpleLight.h b/pxr/imaging/glf/simpleLight.h
index a472b91e28..31fd6bcd22 100644
--- a/pxr/imaging/glf/simpleLight.h
+++ b/pxr/imaging/glf/simpleLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_SIMPLE_LIGHT_H
 #define PXR_IMAGING_GLF_SIMPLE_LIGHT_H
diff --git a/pxr/imaging/glf/simpleLightingContext.cpp b/pxr/imaging/glf/simpleLightingContext.cpp
index 613090f438..00d1a36ece 100644
--- a/pxr/imaging/glf/simpleLightingContext.cpp
+++ b/pxr/imaging/glf/simpleLightingContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file simpleLightingContext.cpp
 
diff --git a/pxr/imaging/glf/simpleLightingContext.h b/pxr/imaging/glf/simpleLightingContext.h
index a29c412f03..09df1d26ee 100644
--- a/pxr/imaging/glf/simpleLightingContext.h
+++ b/pxr/imaging/glf/simpleLightingContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_SIMPLE_LIGHTING_CONTEXT_H
 #define PXR_IMAGING_GLF_SIMPLE_LIGHTING_CONTEXT_H
diff --git a/pxr/imaging/glf/simpleMaterial.cpp b/pxr/imaging/glf/simpleMaterial.cpp
index 16fbe36e58..1231ba6c47 100644
--- a/pxr/imaging/glf/simpleMaterial.cpp
+++ b/pxr/imaging/glf/simpleMaterial.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file simpleMaterial.cpp
 
diff --git a/pxr/imaging/glf/simpleMaterial.h b/pxr/imaging/glf/simpleMaterial.h
index 02d0fd5622..00d632218e 100644
--- a/pxr/imaging/glf/simpleMaterial.h
+++ b/pxr/imaging/glf/simpleMaterial.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_SIMPLE_MATERIAL_H
 #define PXR_IMAGING_GLF_SIMPLE_MATERIAL_H
diff --git a/pxr/imaging/glf/simpleShadowArray.cpp b/pxr/imaging/glf/simpleShadowArray.cpp
index 14e7d9221a..48e50d2e53 100644
--- a/pxr/imaging/glf/simpleShadowArray.cpp
+++ b/pxr/imaging/glf/simpleShadowArray.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file simpleShadowArray.cpp
 
diff --git a/pxr/imaging/glf/simpleShadowArray.h b/pxr/imaging/glf/simpleShadowArray.h
index f5acc3fd62..51b1c80d9f 100644
--- a/pxr/imaging/glf/simpleShadowArray.h
+++ b/pxr/imaging/glf/simpleShadowArray.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_SIMPLE_SHADOW_ARRAY_H
 #define PXR_IMAGING_GLF_SIMPLE_SHADOW_ARRAY_H
diff --git a/pxr/imaging/glf/testGLContext.cpp b/pxr/imaging/glf/testGLContext.cpp
index 1d250770f6..ac21a9c14e 100644
--- a/pxr/imaging/glf/testGLContext.cpp
+++ b/pxr/imaging/glf/testGLContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/glf/testGLContext.h"
 
diff --git a/pxr/imaging/glf/testGLContext.h b/pxr/imaging/glf/testGLContext.h
index c3bf79783c..0a000ac6ad 100644
--- a/pxr/imaging/glf/testGLContext.h
+++ b/pxr/imaging/glf/testGLContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_TEST_GLCONTEXT_H
 #define PXR_IMAGING_GLF_TEST_GLCONTEXT_H
diff --git a/pxr/imaging/glf/texture.cpp b/pxr/imaging/glf/texture.cpp
index 6d8586fc5c..9c00f9dab0 100644
--- a/pxr/imaging/glf/texture.cpp
+++ b/pxr/imaging/glf/texture.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file texture.cpp
 #include "pxr/imaging/glf/texture.h"
diff --git a/pxr/imaging/glf/texture.h b/pxr/imaging/glf/texture.h
index 6576d115a2..9ead12878d 100644
--- a/pxr/imaging/glf/texture.h
+++ b/pxr/imaging/glf/texture.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_TEXTURE_H
 #define PXR_IMAGING_GLF_TEXTURE_H
diff --git a/pxr/imaging/glf/uniformBlock.cpp b/pxr/imaging/glf/uniformBlock.cpp
index 7f8e9f73dd..38d638a73d 100644
--- a/pxr/imaging/glf/uniformBlock.cpp
+++ b/pxr/imaging/glf/uniformBlock.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // uniformBlock.cpp
 //
diff --git a/pxr/imaging/glf/uniformBlock.h b/pxr/imaging/glf/uniformBlock.h
index cce98b3b84..e7f44f4c86 100644
--- a/pxr/imaging/glf/uniformBlock.h
+++ b/pxr/imaging/glf/uniformBlock.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_UNIFORM_BLOCK_H
 #define PXR_IMAGING_GLF_UNIFORM_BLOCK_H
diff --git a/pxr/imaging/glf/utils.cpp b/pxr/imaging/glf/utils.cpp
index 1b1389f6ab..47462cc259 100644
--- a/pxr/imaging/glf/utils.cpp
+++ b/pxr/imaging/glf/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // utils.cpp
 //
diff --git a/pxr/imaging/glf/utils.h b/pxr/imaging/glf/utils.h
index a43b20fc2b..b2b694764c 100644
--- a/pxr/imaging/glf/utils.h
+++ b/pxr/imaging/glf/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_GLF_UTILS_H
 #define PXR_IMAGING_GLF_UTILS_H
diff --git a/pxr/imaging/glf/wrapDiagnostic.cpp b/pxr/imaging/glf/wrapDiagnostic.cpp
index b0dfb363dd..59d0e8ecde 100644
--- a/pxr/imaging/glf/wrapDiagnostic.cpp
+++ b/pxr/imaging/glf/wrapDiagnostic.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/glf/diagnostic.h"
 
diff --git a/pxr/imaging/glf/wrapDrawTarget.cpp b/pxr/imaging/glf/wrapDrawTarget.cpp
index 4c160a6d86..3ba17c140c 100644
--- a/pxr/imaging/glf/wrapDrawTarget.cpp
+++ b/pxr/imaging/glf/wrapDrawTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/glf/drawTarget.h"
 
diff --git a/pxr/imaging/glf/wrapSimpleLight.cpp b/pxr/imaging/glf/wrapSimpleLight.cpp
index 376f5db482..aeca0f90e8 100644
--- a/pxr/imaging/glf/wrapSimpleLight.cpp
+++ b/pxr/imaging/glf/wrapSimpleLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/glf/simpleLight.h"
 
diff --git a/pxr/imaging/glf/wrapSimpleMaterial.cpp b/pxr/imaging/glf/wrapSimpleMaterial.cpp
index 3d5b9b4d56..33cf9115be 100644
--- a/pxr/imaging/glf/wrapSimpleMaterial.cpp
+++ b/pxr/imaging/glf/wrapSimpleMaterial.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/glf/simpleMaterial.h"
 
diff --git a/pxr/imaging/glf/wrapTexture.cpp b/pxr/imaging/glf/wrapTexture.cpp
index ba727a5aff..2be248d653 100644
--- a/pxr/imaging/glf/wrapTexture.cpp
+++ b/pxr/imaging/glf/wrapTexture.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/glf/texture.h"
 
diff --git a/pxr/imaging/hd/CMakeLists.txt b/pxr/imaging/hd/CMakeLists.txt
index c98274cc7b..99017ff85b 100644
--- a/pxr/imaging/hd/CMakeLists.txt
+++ b/pxr/imaging/hd/CMakeLists.txt
@@ -88,7 +88,6 @@ pxr_library(hd
         flatNormals
         geomSubset
         geomSubsetSchema
-        geomSubsetsSchema
         imageShader
         imageShaderSchema
         instanceCategoriesSchema
@@ -101,6 +100,7 @@ pxr_library(hd
         integratorSchema
         lazyContainerDataSource
         legacyDisplayStyleSchema
+        legacyGeomSubsetSceneIndex
         legacyPrimSceneIndex
         lensDistortionSchema
         light
@@ -148,6 +148,7 @@ pxr_library(hd
         rendererPluginRegistry
         renderIndex
         renderPass
+        renderPassSchema
         renderPassState
         renderProductSchema
         renderSettings
@@ -170,6 +171,7 @@ pxr_library(hd
         sceneIndexPlugin
         sceneIndexPluginRegistry
         sceneIndexPrimView
+        sceneIndexUtil
         schema
         selection
         selectionSchema
@@ -348,6 +350,17 @@ pxr_build_test(testHdSortedIds
        testenv/testHdSortedIds.cpp
 )
 
+pxr_build_test(testHdSortedIdsPerf
+   LIBRARIES
+       hd
+       sdf
+       tf
+       arch
+
+   CPPFILES
+       testenv/testHdSortedIdsPerf.cpp
+)
+
 pxr_build_test(testHdTimeSampleArray
    LIBRARIES
        hd
diff --git a/pxr/imaging/hd/aov.cpp b/pxr/imaging/hd/aov.cpp
index 2b4b3f3d0d..18412f0dfa 100644
--- a/pxr/imaging/hd/aov.cpp
+++ b/pxr/imaging/hd/aov.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/aov.h"
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hd/aov.h b/pxr/imaging/hd/aov.h
index b7e7345021..c39a890b0e 100644
--- a/pxr/imaging/hd/aov.h
+++ b/pxr/imaging/hd/aov.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_AOV_H
 #define PXR_IMAGING_HD_AOV_H
diff --git a/pxr/imaging/hd/api.h b/pxr/imaging/hd/api.h
index 226cda81f5..5084d5241e 100644
--- a/pxr/imaging/hd/api.h
+++ b/pxr/imaging/hd/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_API_H
 #define PXR_IMAGING_HD_API_H
diff --git a/pxr/imaging/hd/basisCurves.cpp b/pxr/imaging/hd/basisCurves.cpp
index 26097badeb..c318849acd 100644
--- a/pxr/imaging/hd/basisCurves.cpp
+++ b/pxr/imaging/hd/basisCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/basisCurves.h"
diff --git a/pxr/imaging/hd/basisCurves.h b/pxr/imaging/hd/basisCurves.h
index 3e1ca99a8b..7db1712d64 100644
--- a/pxr/imaging/hd/basisCurves.h
+++ b/pxr/imaging/hd/basisCurves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_BASIS_CURVES_H
 #define PXR_IMAGING_HD_BASIS_CURVES_H
diff --git a/pxr/imaging/hd/basisCurvesSchema.cpp b/pxr/imaging/hd/basisCurvesSchema.cpp
index 17292101f4..96185934cc 100644
--- a/pxr/imaging/hd/basisCurvesSchema.cpp
+++ b/pxr/imaging/hd/basisCurvesSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -56,22 +39,14 @@ HdBasisCurvesSchema::GetTopology() const
         HdBasisCurvesSchemaTokens->topology));
 }
 
-HdGeomSubsetsSchema
-HdBasisCurvesSchema::GetGeomSubsets() const
-{
-    return HdGeomSubsetsSchema(_GetTypedDataSource<HdContainerDataSource>(
-        HdBasisCurvesSchemaTokens->geomSubsets));
-}
-
 /*static*/
 HdContainerDataSourceHandle
 HdBasisCurvesSchema::BuildRetained(
-        const HdContainerDataSourceHandle &topology,
-        const HdContainerDataSourceHandle &geomSubsets
+        const HdContainerDataSourceHandle &topology
 )
 {
-    TfToken _names[2];
-    HdDataSourceBaseHandle _values[2];
+    TfToken _names[1];
+    HdDataSourceBaseHandle _values[1];
 
     size_t _count = 0;
 
@@ -79,11 +54,6 @@ HdBasisCurvesSchema::BuildRetained(
         _names[_count] = HdBasisCurvesSchemaTokens->topology;
         _values[_count++] = topology;
     }
-
-    if (geomSubsets) {
-        _names[_count] = HdBasisCurvesSchemaTokens->geomSubsets;
-        _values[_count++] = geomSubsets;
-    }
     return HdRetainedContainerDataSource::New(_count, _names, _values);
 }
 
@@ -95,20 +65,11 @@ HdBasisCurvesSchema::Builder::SetTopology(
     return *this;
 }
 
-HdBasisCurvesSchema::Builder &
-HdBasisCurvesSchema::Builder::SetGeomSubsets(
-    const HdContainerDataSourceHandle &geomSubsets)
-{
-    _geomSubsets = geomSubsets;
-    return *this;
-}
-
 HdContainerDataSourceHandle
 HdBasisCurvesSchema::Builder::Build()
 {
     return HdBasisCurvesSchema::BuildRetained(
-        _topology,
-        _geomSubsets
+        _topology
     );
 }
 
@@ -147,16 +108,6 @@ HdBasisCurvesSchema::GetTopologyLocator()
         GetDefaultLocator().Append(
             HdBasisCurvesSchemaTokens->topology);
     return locator;
-}
-
-/* static */
-const HdDataSourceLocator &
-HdBasisCurvesSchema::GetGeomSubsetsLocator()
-{
-    static const HdDataSourceLocator locator =
-        GetDefaultLocator().Append(
-            HdBasisCurvesSchemaTokens->geomSubsets);
-    return locator;
 } 
 
 PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/pxr/imaging/hd/basisCurvesSchema.h b/pxr/imaging/hd/basisCurvesSchema.h
index 5a40ca1d97..7dd77a5af6 100644
--- a/pxr/imaging/hd/basisCurvesSchema.h
+++ b/pxr/imaging/hd/basisCurvesSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -39,7 +22,6 @@
 
 #include "pxr/imaging/hd/api.h"
 #include "pxr/imaging/hd/basisCurvesTopologySchema.h"
-#include "pxr/imaging/hd/geomSubsetsSchema.h"
 
 #include "pxr/imaging/hd/schema.h"
 
@@ -54,7 +36,6 @@ PXR_NAMESPACE_OPEN_SCOPE
 #define HD_BASIS_CURVES_SCHEMA_TOKENS \
     (basisCurves) \
     (topology) \
-    (geomSubsets) \
 
 TF_DECLARE_PUBLIC_TOKENS(HdBasisCurvesSchemaTokens, HD_API,
     HD_BASIS_CURVES_SCHEMA_TOKENS);
@@ -89,10 +70,7 @@ class HdBasisCurvesSchema : public HdSchema
     /// @{
 
     HD_API
-    HdBasisCurvesTopologySchema GetTopology() const;
-
-    HD_API
-    HdGeomSubsetsSchema GetGeomSubsets() const; 
+    HdBasisCurvesTopologySchema GetTopology() const; 
 
     /// @}
 
@@ -123,10 +101,6 @@ class HdBasisCurvesSchema : public HdSchema
     /// Prim-level relative data source locator to locate topology.
     HD_API
     static const HdDataSourceLocator &GetTopologyLocator();
-
-    /// Prim-level relative data source locator to locate geomSubsets.
-    HD_API
-    static const HdDataSourceLocator &GetGeomSubsetsLocator();
     /// @} 
 
     /// \name Schema construction
@@ -142,8 +116,7 @@ class HdBasisCurvesSchema : public HdSchema
     HD_API
     static HdContainerDataSourceHandle
     BuildRetained(
-        const HdContainerDataSourceHandle &topology,
-        const HdContainerDataSourceHandle &geomSubsets
+        const HdContainerDataSourceHandle &topology
     );
 
     /// \class HdBasisCurvesSchema::Builder
@@ -158,9 +131,6 @@ class HdBasisCurvesSchema : public HdSchema
         HD_API
         Builder &SetTopology(
             const HdContainerDataSourceHandle &topology);
-        HD_API
-        Builder &SetGeomSubsets(
-            const HdContainerDataSourceHandle &geomSubsets);
 
         /// Returns a container data source containing the members set thus far.
         HD_API
@@ -168,7 +138,6 @@ class HdBasisCurvesSchema : public HdSchema
 
     private:
         HdContainerDataSourceHandle _topology;
-        HdContainerDataSourceHandle _geomSubsets;
 
     };
 
diff --git a/pxr/imaging/hd/basisCurvesTopology.cpp b/pxr/imaging/hd/basisCurvesTopology.cpp
index 85a17496bc..b0f8e6fd59 100644
--- a/pxr/imaging/hd/basisCurvesTopology.cpp
+++ b/pxr/imaging/hd/basisCurvesTopology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/basisCurvesTopology.h"
 #include "pxr/imaging/hd/perfLog.h"
diff --git a/pxr/imaging/hd/basisCurvesTopology.h b/pxr/imaging/hd/basisCurvesTopology.h
index 89c39fbe27..4509909c51 100644
--- a/pxr/imaging/hd/basisCurvesTopology.h
+++ b/pxr/imaging/hd/basisCurvesTopology.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_BASIS_CURVES_TOPOLOGY_H
 #define PXR_IMAGING_HD_BASIS_CURVES_TOPOLOGY_H
diff --git a/pxr/imaging/hd/basisCurvesTopologySchema.cpp b/pxr/imaging/hd/basisCurvesTopologySchema.cpp
index f119d1653d..45fad0a0bd 100644
--- a/pxr/imaging/hd/basisCurvesTopologySchema.cpp
+++ b/pxr/imaging/hd/basisCurvesTopologySchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/basisCurvesTopologySchema.h b/pxr/imaging/hd/basisCurvesTopologySchema.h
index cec81af30c..7f213e3485 100644
--- a/pxr/imaging/hd/basisCurvesTopologySchema.h
+++ b/pxr/imaging/hd/basisCurvesTopologySchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/bprim.cpp b/pxr/imaging/hd/bprim.cpp
index eba103bbce..b46e93d602 100644
--- a/pxr/imaging/hd/bprim.cpp
+++ b/pxr/imaging/hd/bprim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/bprim.h"
 
diff --git a/pxr/imaging/hd/bprim.h b/pxr/imaging/hd/bprim.h
index 66e2870020..3e47a62146 100644
--- a/pxr/imaging/hd/bprim.h
+++ b/pxr/imaging/hd/bprim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_BPRIM_H
 #define PXR_IMAGING_HD_BPRIM_H
diff --git a/pxr/imaging/hd/bufferArray.cpp b/pxr/imaging/hd/bufferArray.cpp
index 57cb1323fa..fa0a9f4f8c 100644
--- a/pxr/imaging/hd/bufferArray.cpp
+++ b/pxr/imaging/hd/bufferArray.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/bufferArray.h"
 #include "pxr/imaging/hd/bufferArrayRange.h"
diff --git a/pxr/imaging/hd/bufferArray.h b/pxr/imaging/hd/bufferArray.h
index 9eeb749cd8..2588850093 100644
--- a/pxr/imaging/hd/bufferArray.h
+++ b/pxr/imaging/hd/bufferArray.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_BUFFER_ARRAY_H
 #define PXR_IMAGING_HD_BUFFER_ARRAY_H
diff --git a/pxr/imaging/hd/bufferArrayRange.cpp b/pxr/imaging/hd/bufferArrayRange.cpp
index deef9b7acb..0bb6d64c0e 100644
--- a/pxr/imaging/hd/bufferArrayRange.cpp
+++ b/pxr/imaging/hd/bufferArrayRange.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/bufferArrayRange.h"
 #include "pxr/imaging/hd/bufferSpec.h"
diff --git a/pxr/imaging/hd/bufferArrayRange.h b/pxr/imaging/hd/bufferArrayRange.h
index a3fe9956ee..2fee042bac 100644
--- a/pxr/imaging/hd/bufferArrayRange.h
+++ b/pxr/imaging/hd/bufferArrayRange.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_BUFFER_ARRAY_RANGE_H
 #define PXR_IMAGING_HD_BUFFER_ARRAY_RANGE_H
diff --git a/pxr/imaging/hd/bufferSource.cpp b/pxr/imaging/hd/bufferSource.cpp
index 059c46dbed..97e6043260 100644
--- a/pxr/imaging/hd/bufferSource.cpp
+++ b/pxr/imaging/hd/bufferSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/bufferSource.h"
 
diff --git a/pxr/imaging/hd/bufferSource.h b/pxr/imaging/hd/bufferSource.h
index 92571f2b71..f7de893265 100644
--- a/pxr/imaging/hd/bufferSource.h
+++ b/pxr/imaging/hd/bufferSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_BUFFER_SOURCE_H
 #define PXR_IMAGING_HD_BUFFER_SOURCE_H
diff --git a/pxr/imaging/hd/bufferSpec.cpp b/pxr/imaging/hd/bufferSpec.cpp
index 089944d7d9..6e3463cf10 100644
--- a/pxr/imaging/hd/bufferSpec.cpp
+++ b/pxr/imaging/hd/bufferSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/bufferSpec.h"
 #include "pxr/imaging/hd/perfLog.h"
diff --git a/pxr/imaging/hd/bufferSpec.h b/pxr/imaging/hd/bufferSpec.h
index 5df0962090..a115319086 100644
--- a/pxr/imaging/hd/bufferSpec.h
+++ b/pxr/imaging/hd/bufferSpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_BUFFER_SPEC_H
 #define PXR_IMAGING_HD_BUFFER_SPEC_H
diff --git a/pxr/imaging/hd/camera.cpp b/pxr/imaging/hd/camera.cpp
index 97327299cf..151e1c982e 100644
--- a/pxr/imaging/hd/camera.cpp
+++ b/pxr/imaging/hd/camera.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/camera.h"
 
diff --git a/pxr/imaging/hd/camera.h b/pxr/imaging/hd/camera.h
index ef728cbf3d..9a4cc88d76 100644
--- a/pxr/imaging/hd/camera.h
+++ b/pxr/imaging/hd/camera.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_CAMERA_H
 #define PXR_IMAGING_HD_CAMERA_H
diff --git a/pxr/imaging/hd/cameraSchema.cpp b/pxr/imaging/hd/cameraSchema.cpp
index b165374f09..06e4e1c3de 100644
--- a/pxr/imaging/hd/cameraSchema.cpp
+++ b/pxr/imaging/hd/cameraSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -168,6 +151,13 @@ HdCameraSchema::GetLensDistortion() const
         HdCameraSchemaTokens->lensDistortion));
 }
 
+HdSampledDataSourceContainerContainerSchema
+HdCameraSchema::GetNamespacedProperties() const
+{
+    return HdSampledDataSourceContainerContainerSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdCameraSchemaTokens->namespacedProperties));
+}
+
 /*static*/
 HdContainerDataSourceHandle
 HdCameraSchema::BuildRetained(
@@ -187,11 +177,12 @@ HdCameraSchema::BuildRetained(
         const HdBoolDataSourceHandle &focusOn,
         const HdFloatDataSourceHandle &dofAspect,
         const HdContainerDataSourceHandle &splitDiopter,
-        const HdContainerDataSourceHandle &lensDistortion
+        const HdContainerDataSourceHandle &lensDistortion,
+        const HdContainerDataSourceHandle &namespacedProperties
 )
 {
-    TfToken _names[17];
-    HdDataSourceBaseHandle _values[17];
+    TfToken _names[18];
+    HdDataSourceBaseHandle _values[18];
 
     size_t _count = 0;
 
@@ -279,6 +270,11 @@ HdCameraSchema::BuildRetained(
         _names[_count] = HdCameraSchemaTokens->lensDistortion;
         _values[_count++] = lensDistortion;
     }
+
+    if (namespacedProperties) {
+        _names[_count] = HdCameraSchemaTokens->namespacedProperties;
+        _values[_count++] = namespacedProperties;
+    }
     return HdRetainedContainerDataSource::New(_count, _names, _values);
 }
 
@@ -418,6 +414,14 @@ HdCameraSchema::Builder::SetLensDistortion(
     return *this;
 }
 
+HdCameraSchema::Builder &
+HdCameraSchema::Builder::SetNamespacedProperties(
+    const HdContainerDataSourceHandle &namespacedProperties)
+{
+    _namespacedProperties = namespacedProperties;
+    return *this;
+}
+
 HdContainerDataSourceHandle
 HdCameraSchema::Builder::Build()
 {
@@ -438,7 +442,8 @@ HdCameraSchema::Builder::Build()
         _focusOn,
         _dofAspect,
         _splitDiopter,
-        _lensDistortion
+        _lensDistortion,
+        _namespacedProperties
     );
 }
 
@@ -489,6 +494,16 @@ HdCameraSchema::GetShutterCloseLocator()
     return locator;
 }
 
+/* static */
+const HdDataSourceLocator &
+HdCameraSchema::GetNamespacedPropertiesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdCameraSchemaTokens->namespacedProperties);
+    return locator;
+}
+
 /*static*/
 HdTokenDataSourceHandle
 HdCameraSchema::BuildProjectionDataSource(
diff --git a/pxr/imaging/hd/cameraSchema.h b/pxr/imaging/hd/cameraSchema.h
index 0fef7cae5b..8af0a4f6f8 100644
--- a/pxr/imaging/hd/cameraSchema.h
+++ b/pxr/imaging/hd/cameraSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -38,6 +21,7 @@
 /// \file
 
 #include "pxr/imaging/hd/api.h"
+#include "pxr/imaging/hd/schemaTypeDefs.h"
 #include "pxr/imaging/hd/splitDiopterSchema.h"
 #include "pxr/imaging/hd/lensDistortionSchema.h"
 
@@ -70,6 +54,7 @@ PXR_NAMESPACE_OPEN_SCOPE
     (dofAspect) \
     (splitDiopter) \
     (lensDistortion) \
+    (namespacedProperties) \
     (perspective) \
     (orthographic) \
 
@@ -154,7 +139,10 @@ class HdCameraSchema : public HdSchema
     HdSplitDiopterSchema GetSplitDiopter() const;
 
     HD_API
-    HdLensDistortionSchema GetLensDistortion() const; 
+    HdLensDistortionSchema GetLensDistortion() const;
+
+    HD_API
+    HdSampledDataSourceContainerContainerSchema GetNamespacedProperties() const; 
 
     /// @}
 
@@ -189,6 +177,10 @@ class HdCameraSchema : public HdSchema
     /// Prim-level relative data source locator to locate shutterClose.
     HD_API
     static const HdDataSourceLocator &GetShutterCloseLocator();
+
+    /// Prim-level relative data source locator to locate namespacedProperties.
+    HD_API
+    static const HdDataSourceLocator &GetNamespacedPropertiesLocator();
     /// @} 
 
     /// \name Schema construction
@@ -220,7 +212,8 @@ class HdCameraSchema : public HdSchema
         const HdBoolDataSourceHandle &focusOn,
         const HdFloatDataSourceHandle &dofAspect,
         const HdContainerDataSourceHandle &splitDiopter,
-        const HdContainerDataSourceHandle &lensDistortion
+        const HdContainerDataSourceHandle &lensDistortion,
+        const HdContainerDataSourceHandle &namespacedProperties
     );
 
     /// \class HdCameraSchema::Builder
@@ -283,6 +276,9 @@ class HdCameraSchema : public HdSchema
         HD_API
         Builder &SetLensDistortion(
             const HdContainerDataSourceHandle &lensDistortion);
+        HD_API
+        Builder &SetNamespacedProperties(
+            const HdContainerDataSourceHandle &namespacedProperties);
 
         /// Returns a container data source containing the members set thus far.
         HD_API
@@ -306,6 +302,7 @@ class HdCameraSchema : public HdSchema
         HdFloatDataSourceHandle _dofAspect;
         HdContainerDataSourceHandle _splitDiopter;
         HdContainerDataSourceHandle _lensDistortion;
+        HdContainerDataSourceHandle _namespacedProperties;
 
     };
 
diff --git a/pxr/imaging/hd/capsuleSchema.cpp b/pxr/imaging/hd/capsuleSchema.cpp
index f33fcc3851..f85df64e57 100644
--- a/pxr/imaging/hd/capsuleSchema.cpp
+++ b/pxr/imaging/hd/capsuleSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/capsuleSchema.h b/pxr/imaging/hd/capsuleSchema.h
index c25cb4d1af..e9db4c452a 100644
--- a/pxr/imaging/hd/capsuleSchema.h
+++ b/pxr/imaging/hd/capsuleSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/categoriesSchema.cpp b/pxr/imaging/hd/categoriesSchema.cpp
index 757887cb58..28582c7050 100644
--- a/pxr/imaging/hd/categoriesSchema.cpp
+++ b/pxr/imaging/hd/categoriesSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/categoriesSchema.h b/pxr/imaging/hd/categoriesSchema.h
index 55429a7656..2b26935b91 100644
--- a/pxr/imaging/hd/categoriesSchema.h
+++ b/pxr/imaging/hd/categoriesSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -79,10 +62,13 @@ class HdCategoriesSchema : public HdSchema
     /// @}
 
 // --(BEGIN CUSTOM CODE: Schema Methods)--
-
+    HD_API
     VtArray<TfToken> GetIncludedCategoryNames();
+
+    HD_API
     bool IsIncludedInCategory(const TfToken &categoryName);
 
+    HD_API
     static HdContainerDataSourceHandle BuildRetained(
         size_t includedNameCount,
         const TfToken *includedNames,
diff --git a/pxr/imaging/hd/changeTracker.cpp b/pxr/imaging/hd/changeTracker.cpp
index ebd684491e..19ae4a29b0 100644
--- a/pxr/imaging/hd/changeTracker.cpp
+++ b/pxr/imaging/hd/changeTracker.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/changeTracker.h"
 
diff --git a/pxr/imaging/hd/changeTracker.h b/pxr/imaging/hd/changeTracker.h
index e74c60269a..c4d982186c 100644
--- a/pxr/imaging/hd/changeTracker.h
+++ b/pxr/imaging/hd/changeTracker.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_CHANGE_TRACKER_H
 #define PXR_IMAGING_HD_CHANGE_TRACKER_H
diff --git a/pxr/imaging/hd/codegenTemplates/schemaClass.cpp b/pxr/imaging/hd/codegenTemplates/schemaClass.cpp
index 695ad40e36..a787d1449c 100644
--- a/pxr/imaging/hd/codegenTemplates/schemaClass.cpp
+++ b/pxr/imaging/hd/codegenTemplates/schemaClass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/codegenTemplates/schemaClass.h b/pxr/imaging/hd/codegenTemplates/schemaClass.h
index ed5523c2d7..aff00a12fe 100644
--- a/pxr/imaging/hd/codegenTemplates/schemaClass.h
+++ b/pxr/imaging/hd/codegenTemplates/schemaClass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/collectionExpressionEvaluator.cpp b/pxr/imaging/hd/collectionExpressionEvaluator.cpp
index b67c247380..fe6a1233f6 100644
--- a/pxr/imaging/hd/collectionExpressionEvaluator.cpp
+++ b/pxr/imaging/hd/collectionExpressionEvaluator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/collectionExpressionEvaluator.h"
@@ -35,40 +18,6 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
 
-// SdfPathExpressionEval::Match currently takes in a domain object and two 
-// functors to provide the translation from path-to-object and vice versa.
-// See comment below in HdCollectionExpressionEvaluator::Match.
-// 
-struct _PathToSceneIndexPrim
-{
-    const HdSceneIndexPrim operator() (const SdfPath &path) const
-    {
-        if (sceneIndex) {
-            return sceneIndex->GetPrim(path);
-        }
-        return {};
-    }
-
-    const HdSceneIndexBaseRefPtr &sceneIndex;
-};
-
-// XXX A scene index prim cannot be queried for its path.
-//     We'd need to traverse the scene index and test for equality to get the
-//     path given a prim.
-//     For now, just take the path on construction and return it.
-//     Revisit this when adding support for incremental searcher.
-//
-struct _SceneIndexPrimToPath
-{
-    SdfPath operator() (const HdSceneIndexPrim &prim) const
-    {
-        TF_UNUSED(prim);
-        return path;
-    }
-
-    SdfPath const &path;
-};
-
 // Traverse the subtree at `rootPath` and add descendant prim paths to `result`.
 void
 _AddAllDescendants(
@@ -129,7 +78,13 @@ HdCollectionExpressionEvaluator::Match(
     //     children of room instead of stopping the evaluation at
     //     /world/sets/room.
     //     
-    return _eval.Match(path, _PathToSceneIndexPrim {_sceneIndex});
+
+    // Note that _sceneIndex must be non-null due to the IsEmpty() check above.
+    return _eval.Match(
+        path,
+        [sceneIndex = get_pointer(_sceneIndex)](SdfPath const &path) {
+            return sceneIndex->GetPrim(path);
+        });
 }
 
 void
diff --git a/pxr/imaging/hd/collectionExpressionEvaluator.h b/pxr/imaging/hd/collectionExpressionEvaluator.h
index ef844ece24..3eba8fd422 100644
--- a/pxr/imaging/hd/collectionExpressionEvaluator.h
+++ b/pxr/imaging/hd/collectionExpressionEvaluator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_COLLECTION_EXPRESSION_EVALUATOR_H
diff --git a/pxr/imaging/hd/collectionPredicateLibrary.cpp b/pxr/imaging/hd/collectionPredicateLibrary.cpp
index 648869a3ae..2024b5f2e2 100644
--- a/pxr/imaging/hd/collectionPredicateLibrary.cpp
+++ b/pxr/imaging/hd/collectionPredicateLibrary.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/collectionPredicateLibrary.h"
diff --git a/pxr/imaging/hd/collectionPredicateLibrary.h b/pxr/imaging/hd/collectionPredicateLibrary.h
index 3d3c781ecc..75a0784451 100644
--- a/pxr/imaging/hd/collectionPredicateLibrary.h
+++ b/pxr/imaging/hd/collectionPredicateLibrary.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_COLLECTION_PREDICATE_LIBRARY_H
diff --git a/pxr/imaging/hd/collectionSchema.cpp b/pxr/imaging/hd/collectionSchema.cpp
index 1f7854b24d..d4e4cc719f 100644
--- a/pxr/imaging/hd/collectionSchema.cpp
+++ b/pxr/imaging/hd/collectionSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/collectionSchema.h b/pxr/imaging/hd/collectionSchema.h
index 10cf4115f8..5fbee7996b 100644
--- a/pxr/imaging/hd/collectionSchema.h
+++ b/pxr/imaging/hd/collectionSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/collectionsSchema.cpp b/pxr/imaging/hd/collectionsSchema.cpp
index 4f323e5b64..d0fef65279 100644
--- a/pxr/imaging/hd/collectionsSchema.cpp
+++ b/pxr/imaging/hd/collectionsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/collectionsSchema.h b/pxr/imaging/hd/collectionsSchema.h
index 4ec0e1b8e9..89f8a15b93 100644
--- a/pxr/imaging/hd/collectionsSchema.h
+++ b/pxr/imaging/hd/collectionsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/command.cpp b/pxr/imaging/hd/command.cpp
index 92707bfa4d..3f94acdc16 100644
--- a/pxr/imaging/hd/command.cpp
+++ b/pxr/imaging/hd/command.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/command.h"
 
diff --git a/pxr/imaging/hd/command.h b/pxr/imaging/hd/command.h
index 67e8db3ce2..d7c8f8874a 100644
--- a/pxr/imaging/hd/command.h
+++ b/pxr/imaging/hd/command.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_COMMAND_H
 #define PXR_IMAGING_HD_COMMAND_H
diff --git a/pxr/imaging/hd/coneSchema.cpp b/pxr/imaging/hd/coneSchema.cpp
index fe1dddeee8..4d97ed77ab 100644
--- a/pxr/imaging/hd/coneSchema.cpp
+++ b/pxr/imaging/hd/coneSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/coneSchema.h b/pxr/imaging/hd/coneSchema.h
index 0dc1d88a7d..7e5e439aca 100644
--- a/pxr/imaging/hd/coneSchema.h
+++ b/pxr/imaging/hd/coneSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/containerDataSourceEditor.cpp b/pxr/imaging/hd/containerDataSourceEditor.cpp
index 47bce21651..97460add82 100644
--- a/pxr/imaging/hd/containerDataSourceEditor.cpp
+++ b/pxr/imaging/hd/containerDataSourceEditor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/containerDataSourceEditor.h"
 #include "pxr/imaging/hd/overlayContainerDataSource.h"
diff --git a/pxr/imaging/hd/containerDataSourceEditor.h b/pxr/imaging/hd/containerDataSourceEditor.h
index 162203ef9c..0dd6e7b445 100644
--- a/pxr/imaging/hd/containerDataSourceEditor.h
+++ b/pxr/imaging/hd/containerDataSourceEditor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_CONTAINER_DATA_SOURCE_EDITOR_H
 #define PXR_IMAGING_HD_CONTAINER_DATA_SOURCE_EDITOR_H
diff --git a/pxr/imaging/hd/containerSchema.cpp b/pxr/imaging/hd/containerSchema.cpp
index 212c502499..6beed11130 100644
--- a/pxr/imaging/hd/containerSchema.cpp
+++ b/pxr/imaging/hd/containerSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/containerSchema.h"
diff --git a/pxr/imaging/hd/containerSchema.h b/pxr/imaging/hd/containerSchema.h
index 18579ca70e..f3ef59515a 100644
--- a/pxr/imaging/hd/containerSchema.h
+++ b/pxr/imaging/hd/containerSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_CONTAINER_SCHEMA_H
diff --git a/pxr/imaging/hd/coordSys.cpp b/pxr/imaging/hd/coordSys.cpp
index 58fa97d643..6fbe568dcb 100644
--- a/pxr/imaging/hd/coordSys.cpp
+++ b/pxr/imaging/hd/coordSys.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/coordSys.h"
 
diff --git a/pxr/imaging/hd/coordSys.h b/pxr/imaging/hd/coordSys.h
index 41a55b335c..c059ea62be 100644
--- a/pxr/imaging/hd/coordSys.h
+++ b/pxr/imaging/hd/coordSys.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_COORD_SYS_H
 #define PXR_IMAGING_HD_COORD_SYS_H
diff --git a/pxr/imaging/hd/coordSysBindingSchema.cpp b/pxr/imaging/hd/coordSysBindingSchema.cpp
index ce7d31bb9d..5caf90c675 100644
--- a/pxr/imaging/hd/coordSysBindingSchema.cpp
+++ b/pxr/imaging/hd/coordSysBindingSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/coordSysBindingSchema.h b/pxr/imaging/hd/coordSysBindingSchema.h
index 0ef0fcc6d9..7b2ff7886f 100644
--- a/pxr/imaging/hd/coordSysBindingSchema.h
+++ b/pxr/imaging/hd/coordSysBindingSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/coordSysSchema.cpp b/pxr/imaging/hd/coordSysSchema.cpp
index 710d596575..b1bbc00301 100644
--- a/pxr/imaging/hd/coordSysSchema.cpp
+++ b/pxr/imaging/hd/coordSysSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/coordSysSchema.h b/pxr/imaging/hd/coordSysSchema.h
index 95bf2c1ba0..1824b2ccb8 100644
--- a/pxr/imaging/hd/coordSysSchema.h
+++ b/pxr/imaging/hd/coordSysSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/cubeSchema.cpp b/pxr/imaging/hd/cubeSchema.cpp
index 4556368df5..1f4afa1e24 100644
--- a/pxr/imaging/hd/cubeSchema.cpp
+++ b/pxr/imaging/hd/cubeSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/cubeSchema.h b/pxr/imaging/hd/cubeSchema.h
index 05d4304704..efc0398970 100644
--- a/pxr/imaging/hd/cubeSchema.h
+++ b/pxr/imaging/hd/cubeSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/cylinderSchema.cpp b/pxr/imaging/hd/cylinderSchema.cpp
index 96437bbef2..d93d6be739 100644
--- a/pxr/imaging/hd/cylinderSchema.cpp
+++ b/pxr/imaging/hd/cylinderSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/cylinderSchema.h b/pxr/imaging/hd/cylinderSchema.h
index 09a5627805..039ad27080 100644
--- a/pxr/imaging/hd/cylinderSchema.h
+++ b/pxr/imaging/hd/cylinderSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/dataSource.cpp b/pxr/imaging/hd/dataSource.cpp
index 9c1fb92c67..5fd2e5d3b3 100644
--- a/pxr/imaging/hd/dataSource.cpp
+++ b/pxr/imaging/hd/dataSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/dataSource.h"
 
diff --git a/pxr/imaging/hd/dataSource.h b/pxr/imaging/hd/dataSource.h
index 779cf1295e..aded38fbd1 100644
--- a/pxr/imaging/hd/dataSource.h
+++ b/pxr/imaging/hd/dataSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DATASOURCE_H
 #define PXR_IMAGING_HD_DATASOURCE_H
diff --git a/pxr/imaging/hd/dataSourceHash.cpp b/pxr/imaging/hd/dataSourceHash.cpp
index fba9404c4e..29cf49e74e 100644
--- a/pxr/imaging/hd/dataSourceHash.cpp
+++ b/pxr/imaging/hd/dataSourceHash.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/dataSourceHash.h"
diff --git a/pxr/imaging/hd/dataSourceHash.h b/pxr/imaging/hd/dataSourceHash.h
index a94eb08a35..416fd2c83a 100644
--- a/pxr/imaging/hd/dataSourceHash.h
+++ b/pxr/imaging/hd/dataSourceHash.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DATASOURCE_HASH_H
 #define PXR_IMAGING_HD_DATASOURCE_HASH_H
diff --git a/pxr/imaging/hd/dataSourceLegacyPrim.cpp b/pxr/imaging/hd/dataSourceLegacyPrim.cpp
index 6c1dab2c6f..869bb26736 100644
--- a/pxr/imaging/hd/dataSourceLegacyPrim.cpp
+++ b/pxr/imaging/hd/dataSourceLegacyPrim.cpp
@@ -1,42 +1,31 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/dataSourceLegacyPrim.h"
 
 #include "pxr/imaging/hd/camera.h"
+#include "pxr/imaging/hd/dataSource.h"
 #include "pxr/imaging/hd/material.h"
 #include "pxr/imaging/hd/light.h"
-#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/meshTopology.h"
 #include "pxr/imaging/hd/renderSettings.h"
 #include "pxr/imaging/hd/retainedDataSource.h"
 #include "pxr/imaging/hd/sceneDelegate.h"
 #include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/utils.h"
 
 #include "pxr/imaging/hd/basisCurvesSchema.h"
 #include "pxr/imaging/hd/basisCurvesTopologySchema.h"
 #include "pxr/imaging/hd/cameraSchema.h"
 #include "pxr/imaging/hd/categoriesSchema.h"
+#include "pxr/imaging/hd/collectionSchema.h"
+#include "pxr/imaging/hd/collectionsSchema.h"
 #include "pxr/imaging/hd/coordSysBindingSchema.h"
+#include "pxr/imaging/hd/dependenciesSchema.h"
+#include "pxr/imaging/hd/dependencySchema.h"
 #include "pxr/imaging/hd/displayFilterSchema.h"
 #include "pxr/imaging/hd/extComputationInputComputationSchema.h"
 #include "pxr/imaging/hd/extComputationOutputSchema.h"
@@ -44,20 +33,15 @@
 #include "pxr/imaging/hd/extComputationPrimvarsSchema.h"
 #include "pxr/imaging/hd/extComputationSchema.h"
 #include "pxr/imaging/hd/extentSchema.h"
-#include "pxr/imaging/hd/geomSubsetSchema.h"
-#include "pxr/imaging/hd/geomSubsetsSchema.h"
 #include "pxr/imaging/hd/imageShaderSchema.h"
 #include "pxr/imaging/hd/instanceCategoriesSchema.h"
 #include "pxr/imaging/hd/instancedBySchema.h"
 #include "pxr/imaging/hd/instancerTopologySchema.h"
-#include "pxr/imaging/hd/instanceSchema.h"
 #include "pxr/imaging/hd/integratorSchema.h"
 #include "pxr/imaging/hd/legacyDisplayStyleSchema.h"
 #include "pxr/imaging/hd/lensDistortionSchema.h"
 #include "pxr/imaging/hd/lightSchema.h"
 #include "pxr/imaging/hd/materialBindingsSchema.h"
-#include "pxr/imaging/hd/materialConnectionSchema.h"
-#include "pxr/imaging/hd/materialNetworkSchema.h"
 #include "pxr/imaging/hd/materialNodeSchema.h"
 #include "pxr/imaging/hd/materialNodeParameterSchema.h"
 #include "pxr/imaging/hd/materialSchema.h"
@@ -78,7 +62,12 @@
 #include "pxr/imaging/hd/volumeFieldSchema.h"
 #include "pxr/imaging/hd/xformSchema.h"
 
+#include "pxr/usd/sdf/path.h"
+
+#include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/stringUtils.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/vt/types.h"
 
 #include <algorithm>
 
@@ -92,6 +81,7 @@ TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
     (binding)
     (coordSys)
+    (lightLinkingCollectionsDependency)
 );
 
 // ----------------------------------------------------------------------------
@@ -201,7 +191,7 @@ class Hd_DataSourceLegacyPrimvarValue : public HdSampledDataSource
         // returned samples to be in the right range.
         _FillSampleTimes(_timeSamples, startTime, endTime, outSampleTimes);
 
-        return true;
+        return outSampleTimes->size() > 1;
     }
 
 private:
@@ -666,7 +656,6 @@ class Hd_DataSourceMesh : public HdContainerDataSource
             HdMeshSchemaTokens->subdivisionTags,
             HdMeshSchemaTokens->subdivisionScheme,
             HdMeshSchemaTokens->doubleSided,
-            HdMeshSchemaTokens->geomSubsets,
         };
     }
 
@@ -716,116 +705,11 @@ class Hd_DataSourceMesh : public HdContainerDataSource
             return HdRetainedTypedSampledDataSource<bool>::New(
                 _sceneDelegate->GetDoubleSided(_id));
         }
-
-        if (name == HdMeshSchemaTokens->geomSubsets) {
-            return _BuildGeomSubsets();
-        }
         
         return nullptr;
     }
 
 private:
-    HdDataSourceBaseHandle _BuildGeomSubsets()
-    {
-        std::vector<TfToken> names;
-        std::vector<HdDataSourceBaseHandle> values;
-
-        const HdGeomSubsets &gs =
-            _GetMeshTopologyStore()->Get()->GetGeomSubsets();
-        for (const HdGeomSubset &geomSubset : gs) {
-            static const TfToken purposes[] = {
-                HdMaterialBindingsSchemaTokens->allPurpose
-            };
-            HdDataSourceBaseHandle const materialBindingSources[] = {
-                HdMaterialBindingSchema::Builder()
-                    .SetPath(
-                        HdRetainedTypedSampledDataSource<SdfPath>::New(
-                            geomSubset.materialId))
-                    .Build()
-            };
-
-            names.push_back(TfToken(geomSubset.id.GetText()));
-            values.push_back(
-                HdOverlayContainerDataSource::New(
-                    HdGeomSubsetSchema::Builder()
-                       .SetType(
-                           HdGeomSubsetSchema::BuildTypeDataSource(
-                               HdGeomSubsetSchemaTokens->typeFaceSet))
-                       .SetIndices(
-                           HdRetainedTypedSampledDataSource<VtIntArray>::New(
-                               geomSubset.indices))
-                       .Build(),
-                    HdRetainedContainerDataSource::New(
-                        HdMaterialBindingsSchema::GetSchemaToken(),
-                        HdMaterialBindingsSchema::BuildRetained(
-                            TfArraySize(purposes),
-                            purposes,
-                            materialBindingSources))));
-        }
-
-        static const TfToken invisibleFacesToken("__invisibleFaces");
-        static const TfToken invisiblePointsToken("__invisiblePoints");
-
-        VtIntArray invisibleFaces =
-            _GetMeshTopologyStore()->Get()->GetInvisibleFaces();
-        if (!invisibleFaces.empty()) {
-            HdContainerDataSourceHandle containers[2] = {
-                HdGeomSubsetSchema::Builder()
-                    .SetType(
-                        HdGeomSubsetSchema::BuildTypeDataSource(
-                            HdGeomSubsetSchemaTokens->typeFaceSet))
-                    .SetIndices(
-                        HdRetainedTypedSampledDataSource<VtIntArray>::New(
-                            invisibleFaces))
-                    .Build(),
-                HdRetainedContainerDataSource::New(
-                    HdVisibilitySchemaTokens->visibility,
-                    HdVisibilitySchema::Builder()
-                        .SetVisibility(
-                            HdRetainedTypedSampledDataSource<bool>::New(false))
-                        .Build())
-            };
-
-            names.push_back(invisibleFacesToken);
-            values.push_back(
-                HdOverlayContainerDataSource::New(
-                    TfArraySize(containers), containers));
-        }
-
-        VtIntArray invisiblePoints =
-            _GetMeshTopologyStore()->Get()->GetInvisiblePoints();
-        if (!invisiblePoints.empty()) {
-            HdContainerDataSourceHandle containers[2] = {
-                HdGeomSubsetSchema::Builder()
-                   .SetType(
-                       HdGeomSubsetSchema::BuildTypeDataSource(
-                           HdGeomSubsetSchemaTokens->typePointSet))
-                   .SetIndices(
-                       HdRetainedTypedSampledDataSource<VtIntArray>::New(
-                           invisiblePoints))
-                   .Build(),
-                HdRetainedContainerDataSource::New(
-                    HdVisibilitySchemaTokens->visibility,
-                    HdVisibilitySchema::Builder()
-                        .SetVisibility(
-                            HdRetainedTypedSampledDataSource<bool>::New(false))
-                        .Build())
-            };
-
-            names.push_back(invisiblePointsToken);
-            values.push_back(
-                HdOverlayContainerDataSource::New(
-                    TfArraySize(containers), containers));
-        }
-
-        if (names.empty()) {
-            return nullptr;
-        } else {
-            return HdRetainedContainerDataSource::New(
-                names.size(), names.data(), values.data());
-        }
-    }
-
     Hd_MeshTopologyStoreSharedPtr _GetMeshTopologyStore()
     {
         Hd_MeshTopologyStoreSharedPtr mts =
@@ -1010,8 +894,6 @@ class Hd_DataSourceBasisCurves : public HdContainerDataSource
     {
         return {
             HdBasisCurvesSchemaTokens->topology,
-            HdBasisCurvesSchemaTokens->geomSubsets,
-            
         };
     }
 
@@ -1022,86 +904,9 @@ class Hd_DataSourceBasisCurves : public HdContainerDataSource
                 _GetBasisCurvesTopologyStore());
         }
 
-        if (name == HdBasisCurvesSchemaTokens->geomSubsets) {
-            return _BuildGeomSubsets();
-        }
-
         return nullptr;
     }
 private:
-
-    HdDataSourceBaseHandle _BuildGeomSubsets()
-    {
-       // Build the geom subsets datasource.
-        static const TfToken invisiblePointsToken("__invisiblePoints");
-        static const TfToken invisibleCurvesToken("__invisibleCurves");
-
-        std::vector<TfToken> names;
-        std::vector<HdDataSourceBaseHandle> values;
-
-        VtIntArray invisibleCurves =
-            _GetBasisCurvesTopologyStore()->Get()->GetInvisibleCurves();
-
-        if (!invisibleCurves.empty()) {
-            HdContainerDataSourceHandle containers[2] = {
-                HdGeomSubsetSchema::Builder()
-                    .SetType(
-                        HdGeomSubsetSchema::BuildTypeDataSource(
-                            HdGeomSubsetSchemaTokens->typeCurveSet))
-                    .SetIndices(
-                        HdRetainedTypedSampledDataSource<VtIntArray>::New(
-                            invisibleCurves))
-                    .Build(),
-                HdRetainedContainerDataSource::New(
-                        HdVisibilitySchemaTokens->visibility,
-                        HdVisibilitySchema::Builder()
-                            .SetVisibility(
-                                HdRetainedTypedSampledDataSource<bool>::New(false))
-                            .Build())
-            };
-
-            names.push_back(invisibleCurvesToken);
-            values.push_back(
-                HdOverlayContainerDataSource::New(
-                    TfArraySize(containers), containers));
-        }
-
-        VtIntArray invisiblePoints = 
-            _GetBasisCurvesTopologyStore()->Get()->GetInvisiblePoints();
-
-        if (!invisiblePoints.empty()) {
-            HdContainerDataSourceHandle containers[2] = {
-                HdGeomSubsetSchema::Builder()
-                    .SetType(
-                        HdGeomSubsetSchema::BuildTypeDataSource(
-                            HdGeomSubsetSchemaTokens->typePointSet))
-                    .SetIndices(
-                        HdRetainedTypedSampledDataSource<VtIntArray>::New(
-                            invisiblePoints))
-                    .Build(),
-                HdRetainedContainerDataSource::New(
-                        HdVisibilitySchemaTokens->visibility,
-                        HdVisibilitySchema::Builder()
-                            .SetVisibility(
-                                HdRetainedTypedSampledDataSource<bool>::New(false))
-                            .Build())
-            };
-
-            names.push_back(invisiblePointsToken);
-            values.push_back(
-                HdOverlayContainerDataSource::New(
-                    TfArraySize(containers), containers));
-        }
-
-        if (names.empty()) {
-            return nullptr;
-        } else {
-            return HdRetainedContainerDataSource::New(
-                names.size(), names.data(), values.data());
-        }
-    }
-
-
     Hd_BasisCurvesTopologyStoreSharedPtr _GetBasisCurvesTopologyStore()
     {
         Hd_BasisCurvesTopologyStoreSharedPtr bcts =
@@ -1484,6 +1289,103 @@ class Hd_DataSourceLight : public HdContainerDataSource
 
 // ----------------------------------------------------------------------------
 
+HdDataSourceBaseHandle
+_BuildCollectionDataSourceFromLightParam(
+    const SdfPath &id,
+    HdSceneDelegate *sceneDelegate,
+    const TfToken &exprToken)
+{
+    VtValue v = sceneDelegate->GetLightParamValue(id, exprToken);
+    if (v.IsHolding<SdfPathExpression>()) {
+        return
+            HdCollectionSchema::Builder()
+            .SetMembershipExpression(
+                HdRetainedTypedSampledDataSource<SdfPathExpression>::New(
+                    v.UncheckedGet<SdfPathExpression>()))
+            .Build();
+    }
+    return nullptr;
+}
+
+
+class Hd_DataSourceLightCollections : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(Hd_DataSourceLightCollections);
+
+    Hd_DataSourceLightCollections(
+        const SdfPath &id,
+        HdSceneDelegate *sceneDelegate)
+    : _id(id), _sceneDelegate(sceneDelegate)
+    {
+        TF_VERIFY(_sceneDelegate);
+    }
+
+    TfTokenVector GetNames() override
+    {
+        return
+            {HdCollectionEmulationTokens->lightLinkCollection,
+             HdCollectionEmulationTokens->shadowLinkCollection};
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        if (name == HdCollectionEmulationTokens->lightLinkCollection) {
+            return _BuildCollectionDataSourceFromLightParam(
+                _id, _sceneDelegate,
+                HdCollectionEmulationTokens->lightLinkCollectionMembershipExpression);
+        }
+
+        if (name == HdCollectionEmulationTokens->shadowLinkCollection) {
+            return _BuildCollectionDataSourceFromLightParam(
+                _id, _sceneDelegate,
+                HdCollectionEmulationTokens->shadowLinkCollectionMembershipExpression);
+        }
+
+        return nullptr;
+    }
+
+private:
+    SdfPath _id;
+    HdSceneDelegate *_sceneDelegate;
+};
+
+class Hd_DataSourceLightFilterCollections : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(Hd_DataSourceLightFilterCollections);
+
+    Hd_DataSourceLightFilterCollections(
+        const SdfPath &id,
+        HdSceneDelegate *sceneDelegate)
+    : _id(id), _sceneDelegate(sceneDelegate)
+    {
+        TF_VERIFY(_sceneDelegate);
+    }
+
+    TfTokenVector GetNames() override
+    {
+        return {HdCollectionEmulationTokens->filterLinkCollection};
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        if (name == HdCollectionEmulationTokens->filterLinkCollection) {
+            return _BuildCollectionDataSourceFromLightParam(
+                _id, _sceneDelegate,
+                HdCollectionEmulationTokens->filterLinkCollectionMembershipExpression);
+        }
+
+        return nullptr;
+    }
+
+private:
+    SdfPath _id;
+    HdSceneDelegate *_sceneDelegate;
+};
+
+// ----------------------------------------------------------------------------
+
 class Hd_DataSourceVolumeField : public HdContainerDataSource
 {
 public:
@@ -2370,165 +2272,6 @@ class Hd_DataSourceRenderSettings : public HdContainerDataSource
 
 // ----------------------------------------------------------------------------
 
-static
-HdContainerDataSourceHandle
-_ToMaterialNetworkSchema(
-    const HdMaterialNetworkMap& hdNetworkMap)
-{
-    HD_TRACE_FUNCTION();
-
-    TfTokenVector terminalsNames;
-    std::vector<HdDataSourceBaseHandle> terminalsValues;
-    std::vector<TfToken> nodeNames;
-    std::vector<HdDataSourceBaseHandle> nodeValues;
-
-    struct ParamData {
-        VtValue value;
-        TfToken colorSpace;
-    };
-
-    for (auto const &iter: hdNetworkMap.map) {
-        const TfToken &terminalName = iter.first;
-        const HdMaterialNetwork &hdNetwork = iter.second;
-
-        if (hdNetwork.nodes.empty()) {
-            continue;
-        }
-
-        terminalsNames.push_back(terminalName);
-
-        // Transfer over individual nodes.
-        // Note that the same nodes may be shared by multiple terminals.
-        // We simply overwrite them here.
-        for (const HdMaterialNode &node : hdNetwork.nodes) {
-            std::vector<TfToken> paramsNames;
-            std::vector<HdDataSourceBaseHandle> paramsValues;
-
-            // Gather parameter value and colorspace metadata in paramsInfo, a 
-            // mapping of the parameter name to its value and colorspace data.
-            std::map<std::string, ParamData> paramsInfo;
-            for (const auto &p : node.parameters) {
-
-                // Strip "colorSpace" prefix 
-                const std::pair<std::string, bool> res = 
-                    SdfPath::StripPrefixNamespace(p.first, 
-                        HdMaterialNodeParameterSchemaTokens->colorSpace);
-
-                // Colorspace metadata
-                if (res.second) {
-                    paramsInfo[res.first].colorSpace = p.second.Get<TfToken>();
-                }
-                // Value 
-                else {
-                    paramsInfo[p.first].value = p.second.Get<VtValue>();
-                }
-            }
-
-            // Create and store the HdMaterialNodeParameter DataSource
-            for (const auto &item : paramsInfo) {
-                paramsNames.push_back(TfToken(item.first));
-                paramsValues.push_back(
-                    HdMaterialNodeParameterSchema::Builder()
-                        .SetValue(
-                            HdRetainedTypedSampledDataSource<VtValue>::New(
-                                item.second.value))
-                        .SetColorSpace(
-                            item.second.colorSpace.IsEmpty()
-                            ? nullptr
-                            : HdRetainedTypedSampledDataSource<TfToken>::New(
-                                item.second.colorSpace))
-                        .Build()
-                );
-            }
-
-            // Accumulate array connections to the same input
-            TfDenseHashMap<TfToken,
-                TfSmallVector<HdDataSourceBaseHandle, 8>, TfToken::HashFunctor> 
-                    connectionsMap;
-
-            TfSmallVector<TfToken, 8> cNames;
-            TfSmallVector<HdDataSourceBaseHandle, 8> cValues;
-
-            for (const HdMaterialRelationship &rel : hdNetwork.relationships) {
-                if (rel.outputId == node.path) {
-                    TfToken outputPath = rel.inputId.GetToken(); 
-                    TfToken outputName = TfToken(rel.inputName.GetString());
-
-                    HdDataSourceBaseHandle c = 
-                        HdMaterialConnectionSchema::Builder()
-                            .SetUpstreamNodePath(
-                                HdRetainedTypedSampledDataSource<TfToken>::New(
-                                    outputPath))
-                            .SetUpstreamNodeOutputName(
-                                HdRetainedTypedSampledDataSource<TfToken>::New(
-                                    outputName))
-                            .Build();
-
-                    connectionsMap[
-                        TfToken(rel.outputName.GetString())].push_back(c);
-                }
-            }
-
-            cNames.reserve(connectionsMap.size());
-            cValues.reserve(connectionsMap.size());
-
-            // NOTE: not const because HdRetainedSmallVectorDataSource needs
-            //       a non-const HdDataSourceBaseHandle*
-            for (auto &entryPair : connectionsMap) {
-                cNames.push_back(entryPair.first);
-                cValues.push_back(
-                    HdRetainedSmallVectorDataSource::New(
-                        entryPair.second.size(), entryPair.second.data()));
-            }
-
-            nodeNames.push_back(node.path.GetToken());
-            nodeValues.push_back(
-                HdMaterialNodeSchema::Builder()
-                    .SetParameters(
-                        HdRetainedContainerDataSource::New(
-                            paramsNames.size(), 
-                            paramsNames.data(),
-                            paramsValues.data()))
-                    .SetInputConnections(
-                        HdRetainedContainerDataSource::New(
-                            cNames.size(), 
-                            cNames.data(),
-                            cValues.data()))
-                    .SetNodeIdentifier(
-                        HdRetainedTypedSampledDataSource<TfToken>::New(
-                            node.identifier))
-                    .Build());
-        }
-
-        terminalsValues.push_back(
-            HdMaterialConnectionSchema::Builder()
-                .SetUpstreamNodePath(
-                    HdRetainedTypedSampledDataSource<TfToken>::New(
-                        hdNetwork.nodes.back().path.GetToken()))
-                .SetUpstreamNodeOutputName(
-                    HdRetainedTypedSampledDataSource<TfToken>::New(
-                        terminalsNames.back()))
-                .Build());
-    }
-
-    HdContainerDataSourceHandle nodesDefaultContext = 
-        HdRetainedContainerDataSource::New(
-            nodeNames.size(),
-            nodeNames.data(),
-            nodeValues.data());
-
-    HdContainerDataSourceHandle terminalsDefaultContext = 
-        HdRetainedContainerDataSource::New(
-            terminalsNames.size(),
-            terminalsNames.data(),
-            terminalsValues.data());
-
-    return HdMaterialNetworkSchema::Builder()
-        .SetNodes(nodesDefaultContext)
-        .SetTerminals(terminalsDefaultContext)
-        .Build();
-}
-
 class Hd_DataSourceImageShader : public HdContainerDataSource
 {
 public:
@@ -2603,8 +2346,9 @@ class Hd_DataSourceImageShader : public HdContainerDataSource
             const VtValue value = _sceneDelegate->Get(
                 _id, HdImageShaderSchemaTokens->materialNetwork);
             if (value.IsHolding<HdMaterialNetworkMap>()) {
-                return _ToMaterialNetworkSchema(
-                    value.UncheckedGet<HdMaterialNetworkMap>());
+                return 
+                    HdUtils::ConvertHdMaterialNetworkToHdMaterialNetworkSchema(
+                        value.UncheckedGet<HdMaterialNetworkMap>());
             } else {
                 return nullptr;
             }
@@ -2655,8 +2399,8 @@ HdExtComputationCallbackDataSource::Invoke(HdExtComputationContext *context)
 // ----------------------------------------------------------------------------
 
 HdDataSourceLegacyPrim::HdDataSourceLegacyPrim(
-    SdfPath id, 
-    TfToken type, 
+    const SdfPath& id, 
+    const TfToken& type, 
     HdSceneDelegate *sceneDelegate)
 : _id(id),
   _type(type),
@@ -2762,6 +2506,8 @@ HdDataSourceLegacyPrim::GetNames()
         result.push_back(HdMaterialSchemaTokens->material);
         result.push_back(HdXformSchemaTokens->xform);
         result.push_back(HdLightSchemaTokens->light);
+        result.push_back(HdCollectionsSchemaTokens->collections);
+        result.push_back(HdDependenciesSchemaTokens->__dependencies);
     }
 
     if (_type == HdPrimTypeTokens->material) {
@@ -2832,23 +2578,6 @@ HdDataSourceLegacyPrim::GetNames()
     return result;
 }
 
-static bool
-_ConvertHdMaterialNetworkToHdDataSources(
-    const HdMaterialNetworkMap &hdNetworkMap,
-    HdContainerDataSourceHandle *result)
-{
-    // Create the material network, potentially one per network selector
-    HdDataSourceBaseHandle network = _ToMaterialNetworkSchema(hdNetworkMap);
-
-    TfToken defaultContext = HdMaterialSchemaTokens->universalRenderContext;
-    *result = HdMaterialSchema::BuildRetained(
-        1, 
-        &defaultContext, 
-        &network);
-    
-    return true;
-}
-
 template <typename SchemaType>
 static HdContainerDataSourceHandle
 _ConvertRenderTerminalResourceToHdDataSource(const VtValue &outputNodeValue)
@@ -3018,13 +2747,7 @@ HdDataSourceLegacyPrim::_GetMaterialDataSource()
 
     HdMaterialNetworkMap hdNetworkMap = 
         materialContainer.UncheckedGet<HdMaterialNetworkMap>();
-    HdContainerDataSourceHandle materialDS = nullptr;    
-    if (!_ConvertHdMaterialNetworkToHdDataSources(
-        hdNetworkMap,
-        &materialDS) ) {
-        return nullptr;
-    }
-    return materialDS;
+    return HdUtils::ConvertHdMaterialNetworkToHdMaterialSchema(hdNetworkMap);
 }
 
 HdDataSourceBaseHandle
@@ -3288,6 +3011,23 @@ HdDataSourceLegacyPrim::Get(const TfToken &name)
         return Hd_DataSourceLegacyExtComputation::New(_id, _sceneDelegate);
     } else if (name == HdImageShaderSchemaTokens->imageShader) {
         return Hd_DataSourceImageShader::New(_id, _sceneDelegate);
+    } else if (name == HdCollectionsSchemaTokens->collections) {
+        // Hydra 1.0 doesn't transport the USD notion of collections.
+        // Instead, behaviors that leverage collections (e.g. light linking)
+        // are implemented on the scene delegate end.
+        //
+        // Below, we "promote" membership expression attributes on the light or
+        // light filter as collections. This bit of glue code helps unify
+        // the light linking scene index handling for emulated and native
+        // scene indices.
+        //
+        if (_IsLight()) {
+            return Hd_DataSourceLightCollections::New(_id, _sceneDelegate);
+        }
+        if (_type == HdPrimTypeTokens->lightFilter) {
+            return Hd_DataSourceLightFilterCollections::New(
+                _id, _sceneDelegate);
+        }
     }
 
     return nullptr;
diff --git a/pxr/imaging/hd/dataSourceLegacyPrim.h b/pxr/imaging/hd/dataSourceLegacyPrim.h
index 8e016fd1bc..b7ab10f3e9 100644
--- a/pxr/imaging/hd/dataSourceLegacyPrim.h
+++ b/pxr/imaging/hd/dataSourceLegacyPrim.h
@@ -1,32 +1,24 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DATA_SOURCE_LEGACY_PRIM_H
 #define PXR_IMAGING_HD_DATA_SOURCE_LEGACY_PRIM_H
 
-#include "pxr/imaging/hd/sceneIndex.h"
 #include "pxr/imaging/hd/api.h"
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
+
+#include "pxr/usd/sdf/path.h"
+
 #include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/tf/token.h"
+
+#include "pxr/pxr.h"
+
+#include <atomic>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -88,12 +80,13 @@ class HdDataSourceLegacyPrim : public HdContainerDataSource
     /// Return which locators PrimDirtied will respond to...
     static const HdDataSourceLocatorSet &GetCachedLocators();
 
-private:
+protected:
     HdDataSourceLegacyPrim(
-        SdfPath id, 
-        TfToken type, 
+        const SdfPath& id, 
+        const TfToken& type, 
         HdSceneDelegate *sceneDelegate);
 
+private:
     HdDataSourceBaseHandle _GetPrimvarsDataSource();
     HdDataSourceBaseHandle _GetExtComputationPrimvarsDataSource();
     HdDataSourceBaseHandle _GetMaterialBindingsDataSource();
@@ -116,11 +109,12 @@ class HdDataSourceLegacyPrim : public HdContainerDataSource
     bool _IsLight();
     bool _IsInstanceable();
 
-private:
+protected:
     SdfPath _id;
     TfToken _type;
     HdSceneDelegate *_sceneDelegate;
 
+private:
     std::atomic_bool _primvarsBuilt;
     bool _extComputationPrimvarsBuilt : 1;
 
diff --git a/pxr/imaging/hd/dataSourceLocator.cpp b/pxr/imaging/hd/dataSourceLocator.cpp
index 610a3fb17c..2acc372b07 100644
--- a/pxr/imaging/hd/dataSourceLocator.cpp
+++ b/pxr/imaging/hd/dataSourceLocator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/dataSourceLocator.h"
 
diff --git a/pxr/imaging/hd/dataSourceLocator.h b/pxr/imaging/hd/dataSourceLocator.h
index 414f62f7ab..f6361ba7fb 100644
--- a/pxr/imaging/hd/dataSourceLocator.h
+++ b/pxr/imaging/hd/dataSourceLocator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DATASOURCELOCATOR_H
 #define PXR_IMAGING_HD_DATASOURCELOCATOR_H
diff --git a/pxr/imaging/hd/dataSourceMaterialNetworkInterface.cpp b/pxr/imaging/hd/dataSourceMaterialNetworkInterface.cpp
index 53a7451497..777a30de8b 100644
--- a/pxr/imaging/hd/dataSourceMaterialNetworkInterface.cpp
+++ b/pxr/imaging/hd/dataSourceMaterialNetworkInterface.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/dataSourceMaterialNetworkInterface.h"
 #include "pxr/imaging/hd/materialConnectionSchema.h"
diff --git a/pxr/imaging/hd/dataSourceMaterialNetworkInterface.h b/pxr/imaging/hd/dataSourceMaterialNetworkInterface.h
index be6bcacf06..f550aa2b89 100644
--- a/pxr/imaging/hd/dataSourceMaterialNetworkInterface.h
+++ b/pxr/imaging/hd/dataSourceMaterialNetworkInterface.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HD_DATA_SOURCE_MATERIAL_NETWORK_INTERFACE_H
 #define HD_DATA_SOURCE_MATERIAL_NETWORK_INTERFACE_H
diff --git a/pxr/imaging/hd/dataSourceTypeDefs.h b/pxr/imaging/hd/dataSourceTypeDefs.h
index 6073e79839..cff23fff40 100644
--- a/pxr/imaging/hd/dataSourceTypeDefs.h
+++ b/pxr/imaging/hd/dataSourceTypeDefs.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DATASOURCETYPEDEFS_H
 #define PXR_IMAGING_HD_DATASOURCETYPEDEFS_H
@@ -100,6 +83,8 @@ using HdVec2dArrayDataSourceHandle = HdVec2dArrayDataSource::Handle;
 
 using HdVec3iDataSource = HdTypedSampledDataSource<GfVec3i>;
 using HdVec3iDataSourceHandle = HdVec3iDataSource::Handle;
+using HdVec3iArrayDataSource = HdTypedSampledDataSource<VtArray<GfVec3i>>;
+using HdVec3iArrayDataSourceHandle = HdVec3iArrayDataSource::Handle;
 using HdVec3fDataSource = HdTypedSampledDataSource<GfVec3f>;
 using HdVec3fDataSourceHandle = HdVec3fDataSource::Handle;
 using HdVec3fArrayDataSource = HdTypedSampledDataSource<VtArray<GfVec3f>>;
diff --git a/pxr/imaging/hd/debugCodes.cpp b/pxr/imaging/hd/debugCodes.cpp
index 9f45002593..cd56184b20 100644
--- a/pxr/imaging/hd/debugCodes.cpp
+++ b/pxr/imaging/hd/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/debugCodes.h"
 
@@ -85,6 +68,9 @@ TF_REGISTRY_FUNCTION(TfDebug)
     TF_DEBUG_ENVIRONMENT_SYMBOL(HD_RENDER_SETTINGS,
         "Report render settings changes");
 
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HD_RENDERER_PLUGIN,
+        "Report debug info on renderer plugins");
+
     TF_DEBUG_ENVIRONMENT_SYMBOL(HD_RPRIM_ADDED,
         "Report when rprims are added");
     TF_DEBUG_ENVIRONMENT_SYMBOL(HD_RPRIM_CLEANED,
diff --git a/pxr/imaging/hd/debugCodes.h b/pxr/imaging/hd/debugCodes.h
index 7bea9cfd0f..3b00b128ed 100644
--- a/pxr/imaging/hd/debugCodes.h
+++ b/pxr/imaging/hd/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DEBUG_CODES_H
 #define PXR_IMAGING_HD_DEBUG_CODES_H
@@ -54,6 +37,7 @@ TF_DEBUG_CODES(
     HD_INSTANCER_REMOVED,
     HD_INSTANCER_UPDATED,
     HD_RENDER_SETTINGS,
+    HD_RENDERER_PLUGIN,
     HD_RPRIM_ADDED,
     HD_RPRIM_CLEANED,
     HD_RPRIM_REMOVED,
diff --git a/pxr/imaging/hd/dependenciesSchema.cpp b/pxr/imaging/hd/dependenciesSchema.cpp
index d288a17a99..90fe5f38e1 100644
--- a/pxr/imaging/hd/dependenciesSchema.cpp
+++ b/pxr/imaging/hd/dependenciesSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/dependenciesSchema.h b/pxr/imaging/hd/dependenciesSchema.h
index 907d8fe1a5..1586680b20 100644
--- a/pxr/imaging/hd/dependenciesSchema.h
+++ b/pxr/imaging/hd/dependenciesSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/dependencyForwardingSceneIndex.cpp b/pxr/imaging/hd/dependencyForwardingSceneIndex.cpp
index d9bbc3b659..6bc17f9795 100644
--- a/pxr/imaging/hd/dependencyForwardingSceneIndex.cpp
+++ b/pxr/imaging/hd/dependencyForwardingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/dependencyForwardingSceneIndex.h"
 #include "pxr/imaging/hd/dependenciesSchema.h"
@@ -217,7 +200,7 @@ HdDependencyForwardingSceneIndex::_PrimDirtied(
 void 
 HdDependencyForwardingSceneIndex::_ClearDependencies(const SdfPath &primPath)
 {
-    _AffectedPrimToDependsOnPathsEntryMap::const_iterator it =
+    _AffectedPrimToDependsOnPathsEntryMap::iterator it =
         _affectedPrimToDependsOnPathsMap.find(primPath);
     if (it == _affectedPrimToDependsOnPathsMap.end()) {
         return;
diff --git a/pxr/imaging/hd/dependencyForwardingSceneIndex.h b/pxr/imaging/hd/dependencyForwardingSceneIndex.h
index ddd14d10f5..16cdddbc20 100644
--- a/pxr/imaging/hd/dependencyForwardingSceneIndex.h
+++ b/pxr/imaging/hd/dependencyForwardingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DEPENDENCY_FORWARDING_SCENE_INDEX_H
 #define PXR_IMAGING_HD_DEPENDENCY_FORWARDING_SCENE_INDEX_H
diff --git a/pxr/imaging/hd/dependencySchema.cpp b/pxr/imaging/hd/dependencySchema.cpp
index cb56e312e7..2b7e4f4437 100644
--- a/pxr/imaging/hd/dependencySchema.cpp
+++ b/pxr/imaging/hd/dependencySchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/dependencySchema.h b/pxr/imaging/hd/dependencySchema.h
index 768073804c..1482089e04 100644
--- a/pxr/imaging/hd/dependencySchema.h
+++ b/pxr/imaging/hd/dependencySchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/dirtyBitsTranslator.cpp b/pxr/imaging/hd/dirtyBitsTranslator.cpp
index b2614e4947..f0b382777a 100644
--- a/pxr/imaging/hd/dirtyBitsTranslator.cpp
+++ b/pxr/imaging/hd/dirtyBitsTranslator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/dirtyBitsTranslator.h"
 
@@ -41,6 +24,7 @@
 #include "pxr/imaging/hd/cameraSchema.h"
 #include "pxr/imaging/hd/categoriesSchema.h"
 #include "pxr/imaging/hd/capsuleSchema.h"
+#include "pxr/imaging/hd/collectionsSchema.h"
 #include "pxr/imaging/hd/coneSchema.h"
 #include "pxr/imaging/hd/coordSysSchema.h"
 #include "pxr/imaging/hd/coordSysBindingSchema.h"
@@ -53,7 +37,6 @@
 #include "pxr/imaging/hd/extComputationSchema.h"
 #include "pxr/imaging/hd/extentSchema.h"
 #include "pxr/imaging/hd/geomSubsetSchema.h"
-#include "pxr/imaging/hd/geomSubsetsSchema.h"
 #include "pxr/imaging/hd/imageShaderSchema.h"
 #include "pxr/imaging/hd/instanceCategoriesSchema.h"
 #include "pxr/imaging/hd/instancedBySchema.h"
@@ -118,8 +101,7 @@ HdDirtyBitsTranslator::RprimDirtyBitsToLocatorSet(TfToken const& primType,
 
     if (primType == HdPrimTypeTokens->basisCurves) {
         if (bits & HdChangeTracker::DirtyTopology) {
-            // could either be topology or geomsubsets
-            set->append(HdBasisCurvesSchema::GetDefaultLocator());
+            set->append(HdBasisCurvesTopologySchema::GetDefaultLocator());
         }
     }
 
@@ -188,7 +170,6 @@ HdDirtyBitsTranslator::RprimDirtyBitsToLocatorSet(TfToken const& primType,
         }
 
         if (bits & HdChangeTracker::DirtyTopology) {
-            set->append(HdMeshSchema::GetGeomSubsetsLocator());
             set->append(HdMeshSchema::GetSubdivisionSchemeLocator());
         }
 
@@ -276,6 +257,8 @@ HdDirtyBitsTranslator::SprimDirtyBitsToLocatorSet(TfToken const& primType,
             set->append(HdXformSchema::GetDefaultLocator());
         }
     } else if (HdPrimTypeIsLight(primType)
+            // Lights and light filters are handled similarly in emulation.
+            || primType == HdPrimTypeTokens->lightFilter
             // special case for mesh lights coming from emulated scene
             // for which the type will be mesh even though we are receiving
             // sprim-specific dirty bits.
@@ -298,6 +281,10 @@ HdDirtyBitsTranslator::SprimDirtyBitsToLocatorSet(TfToken const& primType,
                 set->append(HdPrimvarsSchema::GetDefaultLocator());
             }
             set->append(HdVisibilitySchema::GetDefaultLocator());
+
+            // Invalidate collections manufactured for light linking in
+            // emulation.
+            set->append(HdCollectionsSchema::GetDefaultLocator());
         }
         if (bits & HdLight::DirtyTransform) {
             set->append(HdXformSchema::GetDefaultLocator());
@@ -432,6 +419,9 @@ HdDirtyBitsTranslator::BprimDirtyBitsToLocatorSet(TfToken const& primType,
         if (bits & HdRenderSettings::DirtyActive) {
             set->append(HdRenderSettingsSchema::GetActiveLocator());
         }
+        if (bits & HdRenderSettings::DirtyFrameNumber) {
+            set->append(HdRenderSettingsSchema::GetFrameLocator());
+        }
         if (bits & HdRenderSettings::DirtyNamespacedSettings) {
             set->append(HdRenderSettingsSchema::GetNamespacedSettingsLocator());
         }
@@ -532,15 +522,7 @@ HdDirtyBitsTranslator::RprimLocatorSetToDirtyBits(
     // "basisCurvesTopology", setting us up to check for displayStyle.
     if (primType == HdPrimTypeTokens->basisCurves) {
 
-        // Locator (*): basisCurves > geomSubsets
-
-        if (_FindLocator(HdBasisCurvesSchema::GetGeomSubsetsLocator(),
-                         end, &it)) {
-            bits |= HdChangeTracker::DirtyTopology;
-        }
-
-        // Locator (*): basisCurves > geomSubsets
-
+        // Locator (*): basisCurves > topology
         if (_FindLocator(HdBasisCurvesTopologySchema::GetDefaultLocator(),
                          end, &it)) {
             bits |= HdChangeTracker::DirtyTopology;
@@ -660,12 +642,6 @@ HdDirtyBitsTranslator::RprimLocatorSetToDirtyBits(
             bits |= HdChangeTracker::DirtyDoubleSided;
         }
 
-        // Locator (*): mesh > geomSubsets
-
-        if (_FindLocator(HdMeshSchema::GetGeomSubsetsLocator(), end, &it)) {
-            bits |= HdChangeTracker::DirtyTopology;
-        }
-
         // Locator (*): mesh > subdivisionScheme
 
         if (_FindLocator(HdMeshSchema::GetSubdivisionSchemeLocator(), end, &it)) {
@@ -794,12 +770,16 @@ HdDirtyBitsTranslator::SprimLocatorSetToDirtyBits(
         if (_FindLocator(HdXformSchema::GetDefaultLocator(), end, &it)) {
             bits |= HdCamera::DirtyTransform;
         }
-    } else if (HdPrimTypeIsLight(primType)) {
+    } else if (HdPrimTypeIsLight(primType)
+        // Lights and light filters are handled similarly in emulation.
+        || primType == HdPrimTypeTokens->lightFilter) {
+
         if (_FindLocator(HdInstancedBySchema::GetDefaultLocator(), end, &it)) {
             bits |= HdLight::DirtyInstancer;
         }
         if (_FindLocator(HdLightSchema::GetDefaultLocator(), end, &it)) {
             bits |= HdLight::DirtyParams |
+                HdLight::DirtyResource |
                 HdLight::DirtyShadowParams |
                 HdLight::DirtyCollection;
         }
@@ -996,8 +976,12 @@ HdDirtyBitsTranslator::BprimLocatorSetToDirtyBits(
                 end, &it)) {
             bits |= HdRenderSettings::DirtyActive;
         }
+        if (_FindLocator(HdRenderSettingsSchema::GetFrameLocator(),
+                end, &it)) {
+            bits |= HdRenderSettings::DirtyFrameNumber;
+        }
         if (_FindLocator(HdRenderSettingsSchema::GetNamespacedSettingsLocator(),
-                 end, &it)) {
+                end, &it)) {
             bits |= HdRenderSettings::DirtyNamespacedSettings;
         }
         if (_FindLocator(HdRenderSettingsSchema::GetRenderProductsLocator(),
diff --git a/pxr/imaging/hd/dirtyBitsTranslator.h b/pxr/imaging/hd/dirtyBitsTranslator.h
index b71fb4f868..22e2bd19af 100644
--- a/pxr/imaging/hd/dirtyBitsTranslator.h
+++ b/pxr/imaging/hd/dirtyBitsTranslator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DIRTY_BITS_TRANSLATOR_H
 #define PXR_IMAGING_HD_DIRTY_BITS_TRANSLATOR_H
diff --git a/pxr/imaging/hd/dirtyList.cpp b/pxr/imaging/hd/dirtyList.cpp
index 1bd2600f6c..e04ba360ac 100644
--- a/pxr/imaging/hd/dirtyList.cpp
+++ b/pxr/imaging/hd/dirtyList.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/dirtyList.h"
 
@@ -56,6 +39,10 @@ _DirtyRprimIdsFilterPredicate(
     const HdDirtyBits bits = tracker.GetRprimDirtyBits(rprimID);
     
     if (mask == HdChangeTracker::Clean || bits & mask) {
+        // Update the render tag if needed.
+        const TfToken& primRenderTag =
+            renderIndex->UpdateRenderTag(rprimID, bits);
+
         // XXX An empty render tag set means everything passes the filter
         //     We should use an explicit token to indicate all render tags.
         //     When aggregating render tags from the tasks, an empty render
@@ -68,8 +55,6 @@ _DirtyRprimIdsFilterPredicate(
 
         // As the number of tags is expected to be low (<10)
         // use a simple linear search.
-        const TfToken& primRenderTag =
-            renderIndex->UpdateRenderTag(rprimID, bits);
         const size_t numRenderTags = filterParam->renderTags.size();
         for (size_t tagNum = 0u; tagNum < numRenderTags; ++tagNum) {
             if (filterParam->renderTags[tagNum] == primRenderTag) {
diff --git a/pxr/imaging/hd/dirtyList.h b/pxr/imaging/hd/dirtyList.h
index 7624afaa0d..49fa5f8e11 100644
--- a/pxr/imaging/hd/dirtyList.h
+++ b/pxr/imaging/hd/dirtyList.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DIRTY_LIST_H
 #define PXR_IMAGING_HD_DIRTY_LIST_H
diff --git a/pxr/imaging/hd/displayFilterSchema.cpp b/pxr/imaging/hd/displayFilterSchema.cpp
index b5bbcbdfe5..4b988698d5 100644
--- a/pxr/imaging/hd/displayFilterSchema.cpp
+++ b/pxr/imaging/hd/displayFilterSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/displayFilterSchema.h b/pxr/imaging/hd/displayFilterSchema.h
index 17043dc8fb..4b206d13f4 100644
--- a/pxr/imaging/hd/displayFilterSchema.h
+++ b/pxr/imaging/hd/displayFilterSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/drawItem.cpp b/pxr/imaging/hd/drawItem.cpp
index c927490372..2cf67ceff0 100644
--- a/pxr/imaging/hd/drawItem.cpp
+++ b/pxr/imaging/hd/drawItem.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/drawItem.h"
 
diff --git a/pxr/imaging/hd/drawItem.h b/pxr/imaging/hd/drawItem.h
index 9129a85abd..be1495b039 100644
--- a/pxr/imaging/hd/drawItem.h
+++ b/pxr/imaging/hd/drawItem.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DRAW_ITEM_H
 #define PXR_IMAGING_HD_DRAW_ITEM_H
diff --git a/pxr/imaging/hd/drawingCoord.cpp b/pxr/imaging/hd/drawingCoord.cpp
index c1df4e7bac..17ffdaff72 100644
--- a/pxr/imaging/hd/drawingCoord.cpp
+++ b/pxr/imaging/hd/drawingCoord.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/drawingCoord.h"
 
diff --git a/pxr/imaging/hd/drawingCoord.h b/pxr/imaging/hd/drawingCoord.h
index 03d498cdf2..d0d1d7ff31 100644
--- a/pxr/imaging/hd/drawingCoord.h
+++ b/pxr/imaging/hd/drawingCoord.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DRAWING_COORD_H
 #define PXR_IMAGING_HD_DRAWING_COORD_H
diff --git a/pxr/imaging/hd/driver.h b/pxr/imaging/hd/driver.h
index 89742b5923..ceee31bb40 100644
--- a/pxr/imaging/hd/driver.h
+++ b/pxr/imaging/hd/driver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_DRIVER_H
 #define PXR_IMAGING_HD_DRIVER_H
diff --git a/pxr/imaging/hd/engine.cpp b/pxr/imaging/hd/engine.cpp
index 47e65e9866..450c799e06 100644
--- a/pxr/imaging/hd/engine.cpp
+++ b/pxr/imaging/hd/engine.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/engine.h"
 
diff --git a/pxr/imaging/hd/engine.h b/pxr/imaging/hd/engine.h
index 54fbe8d0d9..082491056c 100644
--- a/pxr/imaging/hd/engine.h
+++ b/pxr/imaging/hd/engine.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ENGINE_H
 #define PXR_IMAGING_HD_ENGINE_H
diff --git a/pxr/imaging/hd/enums.cpp b/pxr/imaging/hd/enums.cpp
index ae499190f1..a239636103 100644
--- a/pxr/imaging/hd/enums.cpp
+++ b/pxr/imaging/hd/enums.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/imaging/hd/enums.h b/pxr/imaging/hd/enums.h
index 0900c13e84..f2e96170c6 100644
--- a/pxr/imaging/hd/enums.h
+++ b/pxr/imaging/hd/enums.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ENUMS_H
 #define PXR_IMAGING_HD_ENUMS_H
@@ -203,29 +186,6 @@ enum HdInterpolation
     HdInterpolationCount
 };
 
-///
-/// \enum HdTextureType
-/// Enumerates Hydra's supported texture types.
-///
-/// Uv:    Sample the uv coordinates and accesses a single 2d texture.
-///
-/// Field: Transform coordinates by matrix before accessing a single 3d
-///        texture.
-///
-/// Ptex:  Use the ptex connectivity information to sample a ptex texture.
-///
-/// Udim:  Remap the uv coordinates into udim coordinates using a maximum
-///        tile width of 10 and sample all the udim tiles found in the
-///        file system.
-///
-enum class HdTextureType
-{
-    Uv,
-    Field,
-    Ptex,
-    Udim
-};
-
 /// \enum HdDepthPriority
 /// Sets the priorities for a depth based operation
 ///
diff --git a/pxr/imaging/hd/extComputation.cpp b/pxr/imaging/hd/extComputation.cpp
index 044db289c0..f6dd66ef89 100644
--- a/pxr/imaging/hd/extComputation.cpp
+++ b/pxr/imaging/hd/extComputation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/extComputation.h"
diff --git a/pxr/imaging/hd/extComputation.h b/pxr/imaging/hd/extComputation.h
index ba62b1738b..70918832c4 100644
--- a/pxr/imaging/hd/extComputation.h
+++ b/pxr/imaging/hd/extComputation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_EXT_COMPUTATION_H
 #define PXR_IMAGING_HD_EXT_COMPUTATION_H
diff --git a/pxr/imaging/hd/extComputationContext.cpp b/pxr/imaging/hd/extComputationContext.cpp
index 324aef27d5..40085e3466 100644
--- a/pxr/imaging/hd/extComputationContext.cpp
+++ b/pxr/imaging/hd/extComputationContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/extComputationContext.h"
diff --git a/pxr/imaging/hd/extComputationContext.h b/pxr/imaging/hd/extComputationContext.h
index cc9682c0f8..9fb119851b 100644
--- a/pxr/imaging/hd/extComputationContext.h
+++ b/pxr/imaging/hd/extComputationContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_EXT_COMPUTATION_CONTEXT_H
 #define PXR_IMAGING_HD_EXT_COMPUTATION_CONTEXT_H
diff --git a/pxr/imaging/hd/extComputationContextInternal.cpp b/pxr/imaging/hd/extComputationContextInternal.cpp
index eb5de55fa7..8f769c9b2a 100644
--- a/pxr/imaging/hd/extComputationContextInternal.cpp
+++ b/pxr/imaging/hd/extComputationContextInternal.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/extComputationContextInternal.h"
diff --git a/pxr/imaging/hd/extComputationContextInternal.h b/pxr/imaging/hd/extComputationContextInternal.h
index d6edf4a1eb..78db13fdcd 100644
--- a/pxr/imaging/hd/extComputationContextInternal.h
+++ b/pxr/imaging/hd/extComputationContextInternal.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_EXT_COMPUTATION_CONTEXT_INTERNAL_H
 #define PXR_IMAGING_HD_EXT_COMPUTATION_CONTEXT_INTERNAL_H
diff --git a/pxr/imaging/hd/extComputationInputComputationSchema.cpp b/pxr/imaging/hd/extComputationInputComputationSchema.cpp
index d52c3000cb..eabd845b76 100644
--- a/pxr/imaging/hd/extComputationInputComputationSchema.cpp
+++ b/pxr/imaging/hd/extComputationInputComputationSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationInputComputationSchema.h b/pxr/imaging/hd/extComputationInputComputationSchema.h
index c7fe567a43..a6424b5904 100644
--- a/pxr/imaging/hd/extComputationInputComputationSchema.h
+++ b/pxr/imaging/hd/extComputationInputComputationSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationOutputSchema.cpp b/pxr/imaging/hd/extComputationOutputSchema.cpp
index 66932856f7..86c6e9529d 100644
--- a/pxr/imaging/hd/extComputationOutputSchema.cpp
+++ b/pxr/imaging/hd/extComputationOutputSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationOutputSchema.h b/pxr/imaging/hd/extComputationOutputSchema.h
index 537de57a58..f5b9ec47e3 100644
--- a/pxr/imaging/hd/extComputationOutputSchema.h
+++ b/pxr/imaging/hd/extComputationOutputSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationPrimvarSchema.cpp b/pxr/imaging/hd/extComputationPrimvarSchema.cpp
index acc4d3b996..a720bba2dc 100644
--- a/pxr/imaging/hd/extComputationPrimvarSchema.cpp
+++ b/pxr/imaging/hd/extComputationPrimvarSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationPrimvarSchema.h b/pxr/imaging/hd/extComputationPrimvarSchema.h
index 734aa84453..ff495d5bba 100644
--- a/pxr/imaging/hd/extComputationPrimvarSchema.h
+++ b/pxr/imaging/hd/extComputationPrimvarSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationPrimvarsSchema.cpp b/pxr/imaging/hd/extComputationPrimvarsSchema.cpp
index 39a0718ab0..66166e1c75 100644
--- a/pxr/imaging/hd/extComputationPrimvarsSchema.cpp
+++ b/pxr/imaging/hd/extComputationPrimvarsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationPrimvarsSchema.h b/pxr/imaging/hd/extComputationPrimvarsSchema.h
index dd3e5bff7d..aa31f515f4 100644
--- a/pxr/imaging/hd/extComputationPrimvarsSchema.h
+++ b/pxr/imaging/hd/extComputationPrimvarsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationSchema.cpp b/pxr/imaging/hd/extComputationSchema.cpp
index f37d58d20e..4218323d75 100644
--- a/pxr/imaging/hd/extComputationSchema.cpp
+++ b/pxr/imaging/hd/extComputationSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationSchema.h b/pxr/imaging/hd/extComputationSchema.h
index 4658318056..ebd9fc9708 100644
--- a/pxr/imaging/hd/extComputationSchema.h
+++ b/pxr/imaging/hd/extComputationSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extComputationUtils.cpp b/pxr/imaging/hd/extComputationUtils.cpp
index ef71ac451d..79501eeb06 100644
--- a/pxr/imaging/hd/extComputationUtils.cpp
+++ b/pxr/imaging/hd/extComputationUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/extComputationUtils.h"
diff --git a/pxr/imaging/hd/extComputationUtils.h b/pxr/imaging/hd/extComputationUtils.h
index df02124786..3d9d86470c 100644
--- a/pxr/imaging/hd/extComputationUtils.h
+++ b/pxr/imaging/hd/extComputationUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_EXT_COMPUTATION_UTILS_H
 #define PXR_IMAGING_HD_EXT_COMPUTATION_UTILS_H
diff --git a/pxr/imaging/hd/extentSchema.cpp b/pxr/imaging/hd/extentSchema.cpp
index 9180c602b2..bf73b4d337 100644
--- a/pxr/imaging/hd/extentSchema.cpp
+++ b/pxr/imaging/hd/extentSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/extentSchema.h b/pxr/imaging/hd/extentSchema.h
index 588f03aab5..b62a2bde9a 100644
--- a/pxr/imaging/hd/extentSchema.h
+++ b/pxr/imaging/hd/extentSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/field.cpp b/pxr/imaging/hd/field.cpp
index 70bfd22e08..9a00404a61 100644
--- a/pxr/imaging/hd/field.cpp
+++ b/pxr/imaging/hd/field.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/field.h"
 
diff --git a/pxr/imaging/hd/field.h b/pxr/imaging/hd/field.h
index eb4a369dad..b0390ebd96 100644
--- a/pxr/imaging/hd/field.h
+++ b/pxr/imaging/hd/field.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FIELD_H
 #define PXR_IMAGING_HD_FIELD_H
diff --git a/pxr/imaging/hd/filteringSceneIndex.cpp b/pxr/imaging/hd/filteringSceneIndex.cpp
index b4c7e43e68..4db286e6ec 100644
--- a/pxr/imaging/hd/filteringSceneIndex.cpp
+++ b/pxr/imaging/hd/filteringSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/filteringSceneIndex.h"
 
@@ -27,6 +10,14 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+HdEncapsulatingSceneIndexBase *
+HdEncapsulatingSceneIndexBase::Cast(const HdSceneIndexBaseRefPtr &scene)
+{
+    return
+        dynamic_cast<HdEncapsulatingSceneIndexBase *>(
+            boost::get_pointer(scene));
+}
+
 // This is a fallback scene index that we use in case an invalid sceneIndex is
 // passed in to the filtering scene index c'tor.
 class _NoOpSceneIndex final : public HdSceneIndexBase
diff --git a/pxr/imaging/hd/filteringSceneIndex.h b/pxr/imaging/hd/filteringSceneIndex.h
index fb7969f60e..c5093c4880 100644
--- a/pxr/imaging/hd/filteringSceneIndex.h
+++ b/pxr/imaging/hd/filteringSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FILTERING_SCENE_INDEX_H
 #define PXR_IMAGING_HD_FILTERING_SCENE_INDEX_H
@@ -54,6 +37,79 @@ class HdFilteringSceneIndexBase : public HdSceneIndexBase
     virtual std::vector<HdSceneIndexBaseRefPtr> GetInputScenes() const = 0;
 };
 
+///
+/// \class HdEncapsulatingSceneIndexBase
+///
+/// A mix-in class for scene indices that implement their behaviour by
+/// creating other scene indices (internally).
+///
+/// Note that this can be combined with the HdFilteringSceneIndexBase.
+///
+/// The intention here is that we can traverse the scene index topology
+/// at different levels of detail in, e.g., a piece of software to display
+/// the scene index graph.
+///
+/// More precisely, the topology of scene indices should be imagined as a
+/// nested directed acyclic graph, that is, each node of the graph itself
+/// contains a graph. The high-level directed acyclic graph structure is
+/// obtained by recursing GetInputScenes. A node itself contains a graph
+/// if the node corresponds to an encapsulating scene index. This nested
+/// graph consists of the scene indices internal to the encapsulating scene
+/// index as defined below. We also need some extra information in how
+/// some of the internal scene indices are connected to the external scene
+/// indices to completely describe the scene index topology.
+///
+/// Given a scene index that is both an HdFilteringSceneIndexBase and an
+/// HdEncapsulatingSceneIndexBase, we call the result of GetInputScenes()
+/// the "external" scene indices. Now consider the scene indices that can be
+/// reached by first calling GetEncapsulatingScenes and then recursing
+/// GetInputScenes until we hit an external scene index. We call these scene
+/// indices "internal". If the scene index is not subclassing from
+/// HdFilteringSceneIndexBase, we compute the internal scene indices in the
+/// same way under the premise that there are no external scene indices.
+///
+/// If this mix-in class is combined with HdFilteringSceneIndexBase, then
+/// GetInputScenes() should be a subset of the scene indices obtained by
+/// recursively calling GetInputScenes or GetEncapsulatedScenes (or a mix of
+/// those).
+///
+///
+/// Example:
+/// B filtering scene index with inputs {A}
+/// C filtering scene index with inputs {B}
+/// D filtering scene index with inputs {B}
+/// E filtering scene index with inputs {C, D}
+/// F filtering and encapsulating scene index with inputs {B} and
+///                 encapsulated scenes {E}
+/// G filtering scene index with inputs {F}
+///
+/// Nested scene index Graph:
+///
+///                A
+///                |
+///                B
+///               / \                                  |
+///      -F------/---\--------
+///      |      /     \      |
+///      |     C       D     |
+///      |      \     /      |
+///      |       \   /       |
+///      |        \ /        |
+///      |         E         |
+///      |                   |
+///      ---------------------
+///                |
+///                G
+///
+class HdEncapsulatingSceneIndexBase
+{
+public:
+    virtual std::vector<HdSceneIndexBaseRefPtr>
+    GetEncapsulatedScenes() const = 0;
+
+    static HdEncapsulatingSceneIndexBase * Cast(const HdSceneIndexBaseRefPtr &);
+};
+
 TF_DECLARE_WEAK_AND_REF_PTRS(HdSingleInputFilteringSceneIndexBase);
 
 ///
diff --git a/pxr/imaging/hd/flatNormals.cpp b/pxr/imaging/hd/flatNormals.cpp
index d301a80ccd..7613994f85 100644
--- a/pxr/imaging/hd/flatNormals.cpp
+++ b/pxr/imaging/hd/flatNormals.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/flatNormals.h"
 #include "pxr/imaging/hd/meshTopology.h"
diff --git a/pxr/imaging/hd/flatNormals.h b/pxr/imaging/hd/flatNormals.h
index 1a8a1ebb8e..c88c4c750e 100644
--- a/pxr/imaging/hd/flatNormals.h
+++ b/pxr/imaging/hd/flatNormals.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLAT_NORMALS_H
 #define PXR_IMAGING_HD_FLAT_NORMALS_H
diff --git a/pxr/imaging/hd/flattenedDataSourceProvider.cpp b/pxr/imaging/hd/flattenedDataSourceProvider.cpp
index a6b113cf52..9b6726b5d4 100644
--- a/pxr/imaging/hd/flattenedDataSourceProvider.cpp
+++ b/pxr/imaging/hd/flattenedDataSourceProvider.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/flattenedDataSourceProvider.h"
 
@@ -57,4 +40,6 @@ GetFlattenedDataSourceFromParentPrim() const
         _name);
 }
 
+HdFlattenedDataSourceProvider::~HdFlattenedDataSourceProvider() = default;
+
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hd/flattenedDataSourceProvider.h b/pxr/imaging/hd/flattenedDataSourceProvider.h
index 43d0620c75..dd8f144aa0 100644
--- a/pxr/imaging/hd/flattenedDataSourceProvider.h
+++ b/pxr/imaging/hd/flattenedDataSourceProvider.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLATTENED_DATA_SOURCE_PROVIDER_H
 #define PXR_IMAGING_HD_FLATTENED_DATA_SOURCE_PROVIDER_H
@@ -76,6 +59,9 @@ class HdFlattenedDataSourceProvider
         const HdContainerDataSourceHandle &_inputPrimDataSource;
     };
 
+    HD_API
+    virtual ~HdFlattenedDataSourceProvider();
+
     /// Returns flattened data source.
     virtual HdContainerDataSourceHandle GetFlattenedDataSource(
         const Context &ctx) const = 0;
diff --git a/pxr/imaging/hd/flattenedDataSourceProviders.cpp b/pxr/imaging/hd/flattenedDataSourceProviders.cpp
index 4714bff351..2301c81afd 100644
--- a/pxr/imaging/hd/flattenedDataSourceProviders.cpp
+++ b/pxr/imaging/hd/flattenedDataSourceProviders.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/flattenedDataSourceProviders.h"
diff --git a/pxr/imaging/hd/flattenedDataSourceProviders.h b/pxr/imaging/hd/flattenedDataSourceProviders.h
index cea32cd55e..5afee6abbc 100644
--- a/pxr/imaging/hd/flattenedDataSourceProviders.h
+++ b/pxr/imaging/hd/flattenedDataSourceProviders.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLATTENED_DATA_SOURCE_PROVIDERS_H
 #define PXR_IMAGING_HD_FLATTENED_DATA_SOURCE_PROVIDERS_H
diff --git a/pxr/imaging/hd/flattenedOverlayDataSourceProvider.cpp b/pxr/imaging/hd/flattenedOverlayDataSourceProvider.cpp
index a7e1116512..60a2259c81 100644
--- a/pxr/imaging/hd/flattenedOverlayDataSourceProvider.cpp
+++ b/pxr/imaging/hd/flattenedOverlayDataSourceProvider.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/flattenedOverlayDataSourceProvider.h"
 
diff --git a/pxr/imaging/hd/flattenedOverlayDataSourceProvider.h b/pxr/imaging/hd/flattenedOverlayDataSourceProvider.h
index 39cf8f77cb..3e2e7534b8 100644
--- a/pxr/imaging/hd/flattenedOverlayDataSourceProvider.h
+++ b/pxr/imaging/hd/flattenedOverlayDataSourceProvider.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLATTENED_OVERLAY_DATA_SOURCE_PROVIDER_H
 #define PXR_IMAGING_HD_FLATTENED_OVERLAY_DATA_SOURCE_PROVIDER_H
diff --git a/pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.cpp b/pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.cpp
index efa2415705..5ef1a61e24 100644
--- a/pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.cpp
+++ b/pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.h"
 
diff --git a/pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.h b/pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.h
index d64e12b214..d0d2e9b796 100644
--- a/pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.h
+++ b/pxr/imaging/hd/flattenedPrimvarsDataSourceProvider.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLATTENED_PRIMVARS_DATA_SOURCE_PROVIDER_H
 #define PXR_IMAGING_HD_FLATTENED_PRIMVARS_DATA_SOURCE_PROVIDER_H
diff --git a/pxr/imaging/hd/flattenedPurposeDataSourceProvider.cpp b/pxr/imaging/hd/flattenedPurposeDataSourceProvider.cpp
index b4557599cc..07d9a82a30 100644
--- a/pxr/imaging/hd/flattenedPurposeDataSourceProvider.cpp
+++ b/pxr/imaging/hd/flattenedPurposeDataSourceProvider.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/flattenedPurposeDataSourceProvider.h"
 
diff --git a/pxr/imaging/hd/flattenedPurposeDataSourceProvider.h b/pxr/imaging/hd/flattenedPurposeDataSourceProvider.h
index c70e9dca71..24cfb9ef65 100644
--- a/pxr/imaging/hd/flattenedPurposeDataSourceProvider.h
+++ b/pxr/imaging/hd/flattenedPurposeDataSourceProvider.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLATTENED_PURPOSE_DATA_SOURCE_PROVIDER_H
 #define PXR_IMAGING_HD_FLATTENED_PURPOSE_DATA_SOURCE_PROVIDER_H
diff --git a/pxr/imaging/hd/flattenedVisibilityDataSourceProvider.cpp b/pxr/imaging/hd/flattenedVisibilityDataSourceProvider.cpp
index f42bc5419f..32d02286c5 100644
--- a/pxr/imaging/hd/flattenedVisibilityDataSourceProvider.cpp
+++ b/pxr/imaging/hd/flattenedVisibilityDataSourceProvider.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/flattenedVisibilityDataSourceProvider.h"
 
diff --git a/pxr/imaging/hd/flattenedVisibilityDataSourceProvider.h b/pxr/imaging/hd/flattenedVisibilityDataSourceProvider.h
index e93dee0097..052a799cdf 100644
--- a/pxr/imaging/hd/flattenedVisibilityDataSourceProvider.h
+++ b/pxr/imaging/hd/flattenedVisibilityDataSourceProvider.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLATTENED_VISIBILITY_DATA_SOURCE_PROVIDER_H
 #define PXR_IMAGING_HD_FLATTENED_VISIBILITY_DATA_SOURCE_PROVIDER_H
diff --git a/pxr/imaging/hd/flattenedXformDataSourceProvider.cpp b/pxr/imaging/hd/flattenedXformDataSourceProvider.cpp
index 3d6f59c697..865d1bb991 100644
--- a/pxr/imaging/hd/flattenedXformDataSourceProvider.cpp
+++ b/pxr/imaging/hd/flattenedXformDataSourceProvider.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/flattenedXformDataSourceProvider.h"
 
diff --git a/pxr/imaging/hd/flattenedXformDataSourceProvider.h b/pxr/imaging/hd/flattenedXformDataSourceProvider.h
index 0bf2809f0f..957aa13055 100644
--- a/pxr/imaging/hd/flattenedXformDataSourceProvider.h
+++ b/pxr/imaging/hd/flattenedXformDataSourceProvider.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLATTENED_XFORM_DATA_SOURCE_PROVIDER_H
 #define PXR_IMAGING_HD_FLATTENED_XFORM_DATA_SOURCE_PROVIDER_H
diff --git a/pxr/imaging/hd/flatteningSceneIndex.cpp b/pxr/imaging/hd/flatteningSceneIndex.cpp
index 171b667fc5..dcf357fe67 100644
--- a/pxr/imaging/hd/flatteningSceneIndex.cpp
+++ b/pxr/imaging/hd/flatteningSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/flatteningSceneIndex.h"
 #include "pxr/imaging/hd/flattenedDataSourceProvider.h"
diff --git a/pxr/imaging/hd/flatteningSceneIndex.h b/pxr/imaging/hd/flatteningSceneIndex.h
index fb04f6e2f9..ad025faacc 100644
--- a/pxr/imaging/hd/flatteningSceneIndex.h
+++ b/pxr/imaging/hd/flatteningSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_FLATTENING_SCENE_H
 #define PXR_IMAGING_HD_FLATTENING_SCENE_H
diff --git a/pxr/imaging/hd/geomSubset.cpp b/pxr/imaging/hd/geomSubset.cpp
index f7d57afd57..e91c8ca294 100644
--- a/pxr/imaging/hd/geomSubset.cpp
+++ b/pxr/imaging/hd/geomSubset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/geomSubset.h"
 
diff --git a/pxr/imaging/hd/geomSubset.h b/pxr/imaging/hd/geomSubset.h
index 48cad62569..784c77b359 100644
--- a/pxr/imaging/hd/geomSubset.h
+++ b/pxr/imaging/hd/geomSubset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_GEOM_SUBSET_H
 #define PXR_IMAGING_HD_GEOM_SUBSET_H
diff --git a/pxr/imaging/hd/geomSubsetSchema.cpp b/pxr/imaging/hd/geomSubsetSchema.cpp
index 881b71e36b..36843056bb 100644
--- a/pxr/imaging/hd/geomSubsetSchema.cpp
+++ b/pxr/imaging/hd/geomSubsetSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -112,6 +95,33 @@ HdGeomSubsetSchema::Builder::Build()
     );
 }
 
+/*static*/
+HdGeomSubsetSchema
+HdGeomSubsetSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdGeomSubsetSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdGeomSubsetSchemaTokens->geomSubset))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdGeomSubsetSchema::GetSchemaToken()
+{
+    return HdGeomSubsetSchemaTokens->geomSubset;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdGeomSubsetSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
 /*static*/
 HdTokenDataSourceHandle
 HdGeomSubsetSchema::BuildTypeDataSource(
diff --git a/pxr/imaging/hd/geomSubsetSchema.h b/pxr/imaging/hd/geomSubsetSchema.h
index 95c061630b..30a6a3affc 100644
--- a/pxr/imaging/hd/geomSubsetSchema.h
+++ b/pxr/imaging/hd/geomSubsetSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -50,6 +33,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 // --(END CUSTOM CODE: Declares)--
 
 #define HD_GEOM_SUBSET_SCHEMA_TOKENS \
+    (geomSubset) \
     (type) \
     (indices) \
     (typeFaceSet) \
@@ -71,6 +55,15 @@ class HdGeomSubsetSchema : public HdSchema
     HdGeomSubsetSchema(HdContainerDataSourceHandle container)
       : HdSchema(container) {}
 
+    /// Retrieves a container data source with the schema's default name token
+    /// "geomSubset" from the parent container and constructs a
+    /// HdGeomSubsetSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HD_API
+    static HdGeomSubsetSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
     /// @}
 
 // --(BEGIN CUSTOM CODE: Schema Methods)--
@@ -85,6 +78,21 @@ class HdGeomSubsetSchema : public HdSchema
     HD_API
     HdIntArrayDataSourceHandle GetIndices() const; 
 
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HD_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HD_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
     /// @} 
 
     /// \name Schema construction
diff --git a/pxr/imaging/hd/geomSubsetsSchema.cpp b/pxr/imaging/hd/geomSubsetsSchema.cpp
deleted file mode 100644
index 115a0f07f3..0000000000
--- a/pxr/imaging/hd/geomSubsetsSchema.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// Copyright 2023 Pixar
-//
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
-//
-////////////////////////////////////////////////////////////////////////
-
-/* ************************************************************************** */
-/* **                                                                      ** */
-/* ** This file is generated by a script.                                  ** */
-/* **                                                                      ** */
-/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
-/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
-/* **                                                                      ** */
-/* ************************************************************************** */
-
-#include "pxr/imaging/hd/geomSubsetsSchema.h"
-
-#include "pxr/imaging/hd/retainedDataSource.h"
-
-#include "pxr/base/trace/trace.h"
-
-// --(BEGIN CUSTOM CODE: Includes)--
-// --(END CUSTOM CODE: Includes)--
-
-PXR_NAMESPACE_OPEN_SCOPE
-
-TF_DEFINE_PUBLIC_TOKENS(HdGeomSubsetsSchemaTokens,
-    HD_GEOM_SUBSETS_SCHEMA_TOKENS);
-
-// --(BEGIN CUSTOM CODE: Schema Methods)--
-// --(END CUSTOM CODE: Schema Methods)--
-
-TfTokenVector
-HdGeomSubsetsSchema::GetGeomSubsetNames() const
-{
-    if (_container) {
-        return _container->GetNames();
-    } else {
-        return {};
-    }
-}
-
-HdGeomSubsetSchema
-HdGeomSubsetsSchema::GetGeomSubset(const TfToken &name) const
-{
-    return HdGeomSubsetSchema(
-        _GetTypedDataSource<HdContainerDataSource>(name));
-}
-
-/*static*/
-HdContainerDataSourceHandle
-HdGeomSubsetsSchema::BuildRetained(
-    const size_t count,
-    const TfToken * const names,
-    const HdDataSourceBaseHandle * const values)
-{
-    return HdRetainedContainerDataSource::New(count, names, values);
-}
-
-/*static*/
-HdGeomSubsetsSchema
-HdGeomSubsetsSchema::GetFromParent(
-        const HdContainerDataSourceHandle &fromParentContainer)
-{
-    return HdGeomSubsetsSchema(
-        fromParentContainer
-        ? HdContainerDataSource::Cast(fromParentContainer->Get(
-                HdGeomSubsetsSchemaTokens->geomSubsets))
-        : nullptr);
-}
-
-/*static*/
-const TfToken &
-HdGeomSubsetsSchema::GetSchemaToken()
-{
-    return HdGeomSubsetsSchemaTokens->geomSubsets;
-} 
-
-PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/pxr/imaging/hd/geomSubsetsSchema.h b/pxr/imaging/hd/geomSubsetsSchema.h
deleted file mode 100644
index 044e22c9c0..0000000000
--- a/pxr/imaging/hd/geomSubsetsSchema.h
+++ /dev/null
@@ -1,120 +0,0 @@
-//
-// Copyright 2023 Pixar
-//
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
-//
-////////////////////////////////////////////////////////////////////////
-
-/* ************************************************************************** */
-/* **                                                                      ** */
-/* ** This file is generated by a script.                                  ** */
-/* **                                                                      ** */
-/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
-/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
-/* **                                                                      ** */
-/* ************************************************************************** */
-
-#ifndef PXR_IMAGING_HD_GEOM_SUBSETS_SCHEMA_H
-#define PXR_IMAGING_HD_GEOM_SUBSETS_SCHEMA_H
-
-/// \file
-
-#include "pxr/imaging/hd/api.h"
-#include "pxr/imaging/hd/geomSubsetSchema.h"
-
-#include "pxr/imaging/hd/schema.h"
-
-// --(BEGIN CUSTOM CODE: Includes)--
-// --(END CUSTOM CODE: Includes)--
-
-PXR_NAMESPACE_OPEN_SCOPE
-
-// --(BEGIN CUSTOM CODE: Declares)--
-// --(END CUSTOM CODE: Declares)--
-
-#define HD_GEOM_SUBSETS_SCHEMA_TOKENS \
-    (geomSubsets) \
-
-TF_DECLARE_PUBLIC_TOKENS(HdGeomSubsetsSchemaTokens, HD_API,
-    HD_GEOM_SUBSETS_SCHEMA_TOKENS);
-
-//-----------------------------------------------------------------------------
-
-
-class HdGeomSubsetsSchema : public HdSchema
-{
-public:
-    /// \name Schema retrieval
-    /// @{
-
-    HdGeomSubsetsSchema(HdContainerDataSourceHandle container)
-      : HdSchema(container) {}
-
-    /// Retrieves a container data source with the schema's default name token
-    /// "geomSubsets" from the parent container and constructs a
-    /// HdGeomSubsetsSchema instance.
-    /// Because the requested container data source may not exist, the result
-    /// should be checked with IsDefined() or a bool comparison before use.
-    HD_API
-    static HdGeomSubsetsSchema GetFromParent(
-        const HdContainerDataSourceHandle &fromParentContainer);
-
-    /// @}
-
-// --(BEGIN CUSTOM CODE: Schema Methods)--
-// --(END CUSTOM CODE: Schema Methods)--
-
-    /// \name Member accessor
-    /// @{
-
-    HD_API
-    TfTokenVector GetGeomSubsetNames() const;
-
-    HD_API
-    HdGeomSubsetSchema GetGeomSubset(const TfToken &name) const; 
-
-    /// @}
-
-    /// \name Schema location
-    /// @{
-
-    /// Returns a token where the container representing this schema is found in
-    /// a container by default.
-    HD_API
-    static const TfToken &GetSchemaToken();
-
-    /// @} 
-
-    /// \name Schema construction
-    /// @{
-    HD_API
-    static HdContainerDataSourceHandle
-    BuildRetained(
-        size_t count,
-        const TfToken *names,
-        const HdDataSourceBaseHandle *values);
-
-    /// @}
-};
-
-PXR_NAMESPACE_CLOSE_SCOPE
-
-#endif
\ No newline at end of file
diff --git a/pxr/imaging/hd/hdGenSchema.py b/pxr/imaging/hd/hdGenSchema.py
index c5da438b31..ef90e53335 100644
--- a/pxr/imaging/hd/hdGenSchema.py
+++ b/pxr/imaging/hd/hdGenSchema.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from jinja2 import Environment, FileSystemLoader, Template, pass_context
@@ -54,6 +37,7 @@
 T_VEC2FARRAY = "HdVec2fArrayDataSource"
 T_VEC2DARRAY = "HdVec2dArrayDataSource"
 T_VEC3I = "HdVec3iDataSource"
+T_VEC3IARRAY = "HdVec3iArrayDataSource"
 T_VEC3F = "HdVec3fDataSource"
 T_VEC3D = "HdVec3dDataSource"
 T_VEC3FARRAY = "HdVec3fArrayDataSource"
diff --git a/pxr/imaging/hd/hdSchemaDefs.py b/pxr/imaging/hd/hdSchemaDefs.py
index 13977318a8..0d72bc53a2 100644
--- a/pxr/imaging/hd/hdSchemaDefs.py
+++ b/pxr/imaging/hd/hdSchemaDefs.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 [
     dict(
@@ -78,6 +61,7 @@
     # geomSubset
     dict(
         SCHEMA_NAME = 'GeomSubset',
+        SCHEMA_TOKEN = 'geomSubset',
         MEMBERS = [
             ('type', T_TOKEN, {}),
             ('indices', T_INTARRAY, {}),
@@ -86,15 +70,8 @@
         STATIC_TOKEN_DATASOURCE_BUILDERS = [ # optional for shared token ds's
             ('type', ['typeFaceSet', 'typePointSet', 'typeCurveSet']),
         ],
-    ),
-
-    #--------------------------------------------------------------------------
-    # geomSubsets
-    dict(
-        SCHEMA_NAME = 'GeomSubsets',
-        SCHEMA_TOKEN = 'geomSubsets',
-        GENERIC_MEMBER = ('geomSubset', 'HdGeomSubsetSchema', {}),
-        SCHEMA_INCLUDES = ['{{LIBRARY_PATH}}/geomSubsetSchema'],
+        
+        ADD_DEFAULT_LOCATOR = True,
     ),
 
     #--------------------------------------------------------------------------
@@ -104,15 +81,13 @@
         SCHEMA_TOKEN = 'mesh',
         SCHEMA_INCLUDES =
             ['{{LIBRARY_PATH}}/meshTopologySchema',
-             '{{LIBRARY_PATH}}/subdivisionTagsSchema',
-             '{{LIBRARY_PATH}}/geomSubsetsSchema'],
+             '{{LIBRARY_PATH}}/subdivisionTagsSchema'],
         
         MEMBERS = [
             ('ALL_MEMBERS', '', dict(ADD_LOCATOR = True)),
             ('topology', 'HdMeshTopologySchema', {}),
             ('subdivisionScheme', T_TOKEN, {}),
             ('subdivisionTags', 'HdSubdivisionTagsSchema', {}),
-            ('geomSubsets', 'HdGeomSubsetsSchema', {}),
             ('doubleSided', T_BOOL, {}),
         ],
 
@@ -165,6 +140,7 @@
         SCHEMA_TOKEN = 'topology',
         MEMBERS = [
             ('tetVertexIndices', T_VEC4IARRAY, dict(ADD_LOCATOR = True)),
+            ('surfaceFaceVertexIndices', T_VEC3IARRAY, dict(ADD_LOCATOR = True)),
             ('orientation', T_TOKEN, {}),
         ],
         IMPL_SCHEMA_INCLUDES = ['{{LIBRARY_PATH}}/tetMeshSchema'],
@@ -231,13 +207,11 @@
         SCHEMA_NAME = 'BasisCurves',
         SCHEMA_TOKEN = 'basisCurves',
         SCHEMA_INCLUDES =
-            ['{{LIBRARY_PATH}}/basisCurvesTopologySchema',
-             '{{LIBRARY_PATH}}/geomSubsetsSchema'],
+            ['{{LIBRARY_PATH}}/basisCurvesTopologySchema'],
 
         MEMBERS = [
             ('ALL_MEMBERS', '', dict(ADD_LOCATOR = True)),
             ('topology', 'HdBasisCurvesTopologySchema', {}),
-            ('geomSubsets', 'HdGeomSubsetsSchema', {}),
         ],
 
         ADD_DEFAULT_LOCATOR = True,
@@ -731,6 +705,20 @@
         ADD_DEFAULT_LOCATOR = True,
     ),
 
+    #--------------------------------------------------------------------------
+    # renderPass
+    dict(
+        SCHEMA_NAME = 'RenderPass',
+        SCHEMA_TOKEN = 'renderPass',
+        ADD_DEFAULT_LOCATOR = True,
+        SCHEMA_INCLUDES = ['{{LIBRARY_PATH}}/schemaTypeDefs'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR = True)),
+            ('passType', T_TOKEN, {}),
+            ('renderSource', T_PATH, {}),
+        ],
+    ),
+
     #--------------------------------------------------------------------------
     # renderSettings
     dict(
@@ -873,6 +861,7 @@
         SCHEMA_NAME = 'Camera',
         SCHEMA_TOKEN = 'camera',
         SCHEMA_INCLUDES = [
+            '{{LIBRARY_PATH}}/schemaTypeDefs',
             '{{LIBRARY_PATH}}/splitDiopterSchema',
             '{{LIBRARY_PATH}}/lensDistortionSchema'],
         ADD_DEFAULT_LOCATOR = True,
@@ -894,6 +883,7 @@
             ('dofAspect', T_FLOAT, {}),
             ('splitDiopter', 'HdSplitDiopterSchema', {}),
             ('lensDistortion', 'HdLensDistortionSchema', {}),
+            ('namespacedProperties', 'HdSampledDataSourceContainerContainerSchema', dict(ADD_LOCATOR = True)),
         ],
         STATIC_TOKEN_DATASOURCE_BUILDERS = [ # optional for shared token ds's
             ('projection', ['perspective', 'orthographic']),
@@ -1150,11 +1140,12 @@
     dict(
         SCHEMA_NAME = 'SceneGlobals',
         DOC = '''The {{ SCHEMA_CLASS_NAME }} encapsulates "global" state to orchestrate a
-                 render. It currently houses the active render settings prim path that
-                 describes the information necessary to generate images from a single
-                 invocation of a renderer, and the active time sample range that
-                 may be relevant to downstream scene indices (e.g. procedural
-                 evaluation).
+                 render. It currently houses the active render settings
+                 and pass prim paths that describe the information
+                 necessary to generate images from a single invocation
+                 of a renderer, and the active time sample range and current  
+                 frame number that may be relevant to downstream scene indices 
+                 (e.g. procedural evaluation).
 
                  We shall use the convention of a container data source at the root prim
                  of the scene index that is populated with this global state.
@@ -1164,9 +1155,11 @@
         ADD_DEFAULT_LOCATOR = True,
         MEMBERS = [
             ('ALL_MEMBERS', '', dict(ADD_LOCATOR = True)),
+            ('activeRenderPassPrim', T_PATH, {}),
             ('activeRenderSettingsPrim', T_PATH, {}),
             ('startTimeCode', T_DOUBLE, {}),
             ('endTimeCode', T_DOUBLE, {}),
+            ('currentFrame', T_DOUBLE, {}),
         ],
     ),
 
diff --git a/pxr/imaging/hd/imageShader.cpp b/pxr/imaging/hd/imageShader.cpp
index 3cf556fd19..9dfdc065d2 100644
--- a/pxr/imaging/hd/imageShader.cpp
+++ b/pxr/imaging/hd/imageShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/imageShader.h"
 
diff --git a/pxr/imaging/hd/imageShader.h b/pxr/imaging/hd/imageShader.h
index 70699bdf3c..c895251fbe 100644
--- a/pxr/imaging/hd/imageShader.h
+++ b/pxr/imaging/hd/imageShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_IMAGE_SHADER_H
 #define PXR_IMAGING_HD_IMAGE_SHADER_H
diff --git a/pxr/imaging/hd/imageShaderSchema.cpp b/pxr/imaging/hd/imageShaderSchema.cpp
index a54c1b914a..c898065215 100644
--- a/pxr/imaging/hd/imageShaderSchema.cpp
+++ b/pxr/imaging/hd/imageShaderSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/imageShaderSchema.h b/pxr/imaging/hd/imageShaderSchema.h
index 7930e23c67..1ca8198d58 100644
--- a/pxr/imaging/hd/imageShaderSchema.h
+++ b/pxr/imaging/hd/imageShaderSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instanceCategoriesSchema.cpp b/pxr/imaging/hd/instanceCategoriesSchema.cpp
index 9d96af4381..7d10d8ef25 100644
--- a/pxr/imaging/hd/instanceCategoriesSchema.cpp
+++ b/pxr/imaging/hd/instanceCategoriesSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instanceCategoriesSchema.h b/pxr/imaging/hd/instanceCategoriesSchema.h
index e54c3b1a4b..6a2897b3d6 100644
--- a/pxr/imaging/hd/instanceCategoriesSchema.h
+++ b/pxr/imaging/hd/instanceCategoriesSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instanceIndicesSchema.cpp b/pxr/imaging/hd/instanceIndicesSchema.cpp
index c6eaae7f93..84826cfdeb 100644
--- a/pxr/imaging/hd/instanceIndicesSchema.cpp
+++ b/pxr/imaging/hd/instanceIndicesSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instanceIndicesSchema.h b/pxr/imaging/hd/instanceIndicesSchema.h
index 3cd7f48870..6c545ba9fb 100644
--- a/pxr/imaging/hd/instanceIndicesSchema.h
+++ b/pxr/imaging/hd/instanceIndicesSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instanceRegistry.cpp b/pxr/imaging/hd/instanceRegistry.cpp
index 9e665831c3..6b3f31c066 100644
--- a/pxr/imaging/hd/instanceRegistry.cpp
+++ b/pxr/imaging/hd/instanceRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/instanceRegistry.h"
 
diff --git a/pxr/imaging/hd/instanceRegistry.h b/pxr/imaging/hd/instanceRegistry.h
index c526364185..871564b186 100644
--- a/pxr/imaging/hd/instanceRegistry.h
+++ b/pxr/imaging/hd/instanceRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_INSTANCE_REGISTRY_H
 #define PXR_IMAGING_HD_INSTANCE_REGISTRY_H
diff --git a/pxr/imaging/hd/instanceSchema.cpp b/pxr/imaging/hd/instanceSchema.cpp
index fc6c3c3ddf..b2a722e24a 100644
--- a/pxr/imaging/hd/instanceSchema.cpp
+++ b/pxr/imaging/hd/instanceSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instanceSchema.h b/pxr/imaging/hd/instanceSchema.h
index 6e9c91d134..e1fb3ed73d 100644
--- a/pxr/imaging/hd/instanceSchema.h
+++ b/pxr/imaging/hd/instanceSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instancedBySchema.cpp b/pxr/imaging/hd/instancedBySchema.cpp
index 19381562d0..db4bd2e5d8 100644
--- a/pxr/imaging/hd/instancedBySchema.cpp
+++ b/pxr/imaging/hd/instancedBySchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instancedBySchema.h b/pxr/imaging/hd/instancedBySchema.h
index 62c98e6026..4f2c62b5d1 100644
--- a/pxr/imaging/hd/instancedBySchema.h
+++ b/pxr/imaging/hd/instancedBySchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instancer.cpp b/pxr/imaging/hd/instancer.cpp
index 4aa3694a54..2964c78729 100644
--- a/pxr/imaging/hd/instancer.cpp
+++ b/pxr/imaging/hd/instancer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/instancer.h"
 #include "pxr/imaging/hd/renderDelegate.h"
diff --git a/pxr/imaging/hd/instancer.h b/pxr/imaging/hd/instancer.h
index d6cb55353c..0e9180f1ea 100644
--- a/pxr/imaging/hd/instancer.h
+++ b/pxr/imaging/hd/instancer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_INSTANCER_H
 #define PXR_IMAGING_HD_INSTANCER_H
diff --git a/pxr/imaging/hd/instancerTopologySchema.cpp b/pxr/imaging/hd/instancerTopologySchema.cpp
index 17cfe7b660..55abf3f956 100644
--- a/pxr/imaging/hd/instancerTopologySchema.cpp
+++ b/pxr/imaging/hd/instancerTopologySchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/instancerTopologySchema.h b/pxr/imaging/hd/instancerTopologySchema.h
index 79b5365e7d..948691091e 100644
--- a/pxr/imaging/hd/instancerTopologySchema.h
+++ b/pxr/imaging/hd/instancerTopologySchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/integratorSchema.cpp b/pxr/imaging/hd/integratorSchema.cpp
index a148658f18..9f0f3fe16f 100644
--- a/pxr/imaging/hd/integratorSchema.cpp
+++ b/pxr/imaging/hd/integratorSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/integratorSchema.h b/pxr/imaging/hd/integratorSchema.h
index aa8ab94f2d..23c9cee47f 100644
--- a/pxr/imaging/hd/integratorSchema.h
+++ b/pxr/imaging/hd/integratorSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/invalidatableContainerDataSource.h b/pxr/imaging/hd/invalidatableContainerDataSource.h
index 3eefb87c4e..232381e80e 100644
--- a/pxr/imaging/hd/invalidatableContainerDataSource.h
+++ b/pxr/imaging/hd/invalidatableContainerDataSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_INVALIDATABLE_CONTAINER_DATA_SOURCE_H
 #define PXR_IMAGING_HD_INVALIDATABLE_CONTAINER_DATA_SOURCE_H
diff --git a/pxr/imaging/hd/lazyContainerDataSource.cpp b/pxr/imaging/hd/lazyContainerDataSource.cpp
index df5639ca1b..b660397437 100644
--- a/pxr/imaging/hd/lazyContainerDataSource.cpp
+++ b/pxr/imaging/hd/lazyContainerDataSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hd/lazyContainerDataSource.h"
 
diff --git a/pxr/imaging/hd/lazyContainerDataSource.h b/pxr/imaging/hd/lazyContainerDataSource.h
index 9fc3733221..11c83d9307 100644
--- a/pxr/imaging/hd/lazyContainerDataSource.h
+++ b/pxr/imaging/hd/lazyContainerDataSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_LAZY_CONTAINER_DATA_SOURCE_H
 #define PXR_IMAGING_HD_LAZY_CONTAINER_DATA_SOURCE_H
diff --git a/pxr/imaging/hd/legacyDisplayStyleSchema.cpp b/pxr/imaging/hd/legacyDisplayStyleSchema.cpp
index 6c4aa20b06..68d0fcbe29 100644
--- a/pxr/imaging/hd/legacyDisplayStyleSchema.cpp
+++ b/pxr/imaging/hd/legacyDisplayStyleSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/legacyDisplayStyleSchema.h b/pxr/imaging/hd/legacyDisplayStyleSchema.h
index 7b1fd7c436..aefa96d9f9 100644
--- a/pxr/imaging/hd/legacyDisplayStyleSchema.h
+++ b/pxr/imaging/hd/legacyDisplayStyleSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/legacyGeomSubsetSceneIndex.cpp b/pxr/imaging/hd/legacyGeomSubsetSceneIndex.cpp
new file mode 100644
index 0000000000..9b615aa0ac
--- /dev/null
+++ b/pxr/imaging/hd/legacyGeomSubsetSceneIndex.cpp
@@ -0,0 +1,496 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/imaging/hd/legacyGeomSubsetSceneIndex.h"
+
+#include "pxr/imaging/hd/basisCurvesTopology.h"
+#include "pxr/imaging/hd/basisCurvesTopologySchema.h"
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/dataSourceLegacyPrim.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/geomSubset.h"
+#include "pxr/imaging/hd/geomSubsetSchema.h"
+#include "pxr/imaging/hd/materialBindingSchema.h"
+#include "pxr/imaging/hd/materialBindingsSchema.h"
+#include "pxr/imaging/hd/meshTopology.h"
+#include "pxr/imaging/hd/meshTopologySchema.h"
+#include "pxr/imaging/hd/primvarsSchema.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexObserver.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/visibilitySchema.h"
+
+#include "pxr/usd/sdf/path.h"
+
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/base/tf/refPtr.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/vt/types.h"
+
+#include "pxr/pxr.h"
+
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((invisiblePoints, "__invisiblePoints"))
+    ((invisibleCurves, "__invisibleCurves"))
+    ((invisibleFaces,  "__invisibleFaces" )));
+
+namespace {
+
+HdSceneDelegate*
+_GetSceneDelegate(const HdContainerDataSourceHandle& primSource)
+{
+    if (primSource) {
+        if (const auto ds = HdTypedSampledDataSource<HdSceneDelegate*>::Cast(
+            primSource->Get(HdSceneIndexEmulationTokens->sceneDelegate))) {
+            return ds->GetTypedValue(0.0f);
+        }
+    }
+    return nullptr;
+}
+
+// added     = set_difference(after, before) (after - before)
+// removed   = set_difference(before, after) (before - after)
+// unchanged = set_intersection(before, after)
+// Note: inputs must be sorted!
+template<class InputIt1, class InputIt2, class OutputIt>
+void set_differences(
+    InputIt1 beforeIt, InputIt1 beforeEndIt,
+    InputIt2 afterIt, InputIt2 afterItEnd,
+    OutputIt addedIt, OutputIt removedIt, OutputIt unchangedIt)
+{
+    while (beforeIt != beforeEndIt && afterIt != afterItEnd) {
+        if (*beforeIt < *afterIt) {
+            *removedIt++ = *beforeIt++;
+        } else {
+            if (*afterIt < *beforeIt) {
+                *addedIt++ = *afterIt++;
+            } else {
+                *unchangedIt++ = *beforeIt++;
+                ++afterIt;
+            }
+        }
+    }
+    while (beforeIt != beforeEndIt) {
+        *removedIt++ = *beforeIt++;
+    }
+    while (afterIt != afterItEnd) {
+        *addedIt++ = *afterIt++;
+    }
+}
+
+// XXX: This class derives from HdDataSourceLegacyPrim primarily for asthetic
+// reasons. It relies on the base class only for access to the scene delegate.
+class _HdDataSourceLegacyGeomSubset
+  : public HdDataSourceLegacyPrim
+{
+public:
+    HD_DECLARE_DATASOURCE(_HdDataSourceLegacyGeomSubset);
+    
+    TfTokenVector GetNames() override;
+    HdDataSourceBaseHandle Get(const TfToken& name) override;
+    
+private:
+    _HdDataSourceLegacyGeomSubset(
+        const SdfPath& id,
+        const SdfPath& parentId,
+        const TfToken& parentType,
+        HdSceneDelegate* sceneDelegate);
+    
+    struct _Subset
+    {
+        TfToken type;
+        VtIntArray indices;
+        bool visibility = false;
+        SdfPath materialBinding;
+        
+        operator bool() const {
+            return (!type.IsEmpty() && !indices.empty());
+        }
+    };
+    
+    _Subset
+    _FindSubset() const;
+    
+    SdfPath _parentId;
+    TfToken _parentType;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_HdDataSourceLegacyGeomSubset);
+
+_HdDataSourceLegacyGeomSubset::_HdDataSourceLegacyGeomSubset(
+    const SdfPath& id, const SdfPath& parentId, const TfToken& parentType,
+    HdSceneDelegate* delegate)
+  : HdDataSourceLegacyPrim(id, HdPrimTypeTokens->geomSubset, delegate)
+  , _parentId(parentId)
+  , _parentType(parentType)
+{
+    TF_VERIFY(HdPrimTypeSupportsGeomSubsets(_parentType));
+}
+
+TfTokenVector
+_HdDataSourceLegacyGeomSubset::GetNames()
+{
+    TfTokenVector names;
+    names.push_back(HdGeomSubsetSchema::GetSchemaToken());
+    names.push_back(HdVisibilitySchema::GetSchemaToken());
+    names.push_back(HdMaterialBindingsSchema::GetSchemaToken());
+    names.push_back(HdPrimvarsSchema::GetSchemaToken());
+    names.push_back(HdSceneIndexEmulationTokens->sceneDelegate);
+    return names;
+}
+
+HdDataSourceBaseHandle
+_HdDataSourceLegacyGeomSubset::Get(const TfToken& name)
+{
+    if (name == HdGeomSubsetSchema::GetSchemaToken()) {
+        if (const _Subset& subset = _FindSubset()) {
+            return HdGeomSubsetSchema::Builder()
+                .SetType(HdRetainedTypedSampledDataSource<TfToken>::New(
+                    subset.type))
+                .SetIndices(HdRetainedTypedSampledDataSource<VtIntArray>::New(
+                    subset.indices))
+                .Build();
+        }
+    }
+    
+    // We must intercept visibility and materialBindings because the
+    // base class does not know how to compute these for geom subsets.
+    if (name == HdVisibilitySchema::GetSchemaToken()) {
+        if (const _Subset& subset = _FindSubset()) {
+            return HdVisibilitySchema::Builder()
+                .SetVisibility(HdRetainedTypedSampledDataSource<bool>::New(
+                    subset.visibility))
+                .Build();
+        }
+    }
+    if (name == HdMaterialBindingsSchema::GetSchemaToken()) {
+        if (const _Subset& subset = _FindSubset()) {
+            if (!subset.materialBinding.IsEmpty()) {
+                static const TfTokenVector names {
+                    HdMaterialBindingsSchemaTokens->allPurpose };
+                const std::vector<HdDataSourceBaseHandle> sources {
+                    HdMaterialBindingSchema::Builder()
+                        .SetPath(HdRetainedTypedSampledDataSource<SdfPath>::New(
+                            subset.materialBinding))
+                        .Build() };
+                return HdMaterialBindingsSchema::BuildRetained(
+                    names.size(), names.data(), sources.data());
+            }
+        }
+    }
+
+    // We must intercept primvars, otherwise the base class will try to look
+    // them up via the scene delegate. We return empty primvars instead of
+    // just a nullptr because a lot of stuff downstream expects everything
+    // to have primvars. See above at HdDataSourceLegacyPrim::GetNames().
+    if (name == HdPrimvarsSchema::GetSchemaToken()) {
+        static const HdContainerDataSourceHandle emptyPrimvarsDs =
+            HdPrimvarsSchema::BuildRetained(0, nullptr, nullptr);
+        return emptyPrimvarsDs;
+    }
+    
+    // To block everything else, and so prevent calling something on the
+    // sceneDelegate for a geom subset path about which it knows nothing, we
+    // only defer to base class for sceneDelegate.
+    if (name == HdSceneIndexEmulationTokens->sceneDelegate) {
+        return HdDataSourceLegacyPrim::Get(name);
+    }
+    
+    return nullptr;
+}
+
+_HdDataSourceLegacyGeomSubset::_Subset
+_HdDataSourceLegacyGeomSubset::_FindSubset() const
+{
+    const TfToken& name = _id.GetNameToken();
+    if (_parentType == HdPrimTypeTokens->basisCurves) {
+        const HdBasisCurvesTopology& topo =
+            _sceneDelegate->GetBasisCurvesTopology(_parentId);
+        if (name == _tokens->invisibleCurves) {
+            return { HdGeomSubsetSchemaTokens->typeCurveSet,
+                topo.GetInvisibleCurves() };
+        }
+        if (name == _tokens->invisiblePoints) {
+            return { HdGeomSubsetSchemaTokens->typePointSet,
+                topo.GetInvisiblePoints() };
+        }
+    } else if (_parentType == HdPrimTypeTokens->mesh) {
+        const HdMeshTopology& topo = _sceneDelegate->GetMeshTopology(_parentId);
+        if (name == _tokens->invisibleFaces) {
+            return { HdGeomSubsetSchemaTokens->typeFaceSet,
+                topo.GetInvisibleFaces() };
+        }
+        if (name == _tokens->invisiblePoints) {
+            return { HdGeomSubsetSchemaTokens->typePointSet,
+                topo.GetInvisiblePoints() };
+        }
+        for (const HdGeomSubset& subset : topo.GetGeomSubsets()) {
+            if (subset.id.GetNameToken() == name) {
+                return { HdGeomSubsetSchemaTokens->typeFaceSet,
+                    subset.indices, true, subset.materialId };
+            }
+        }
+    } else {
+        // XXX: At construction, we checked _parentType with
+        // HdPrimTypeSupportsGeomSubsets(), so this should not happen.
+        TF_CODING_ERROR("Unsupported geomSubset parent type: `%s`",
+            _parentType.GetText());
+    }
+    return _Subset();
+}
+
+} // anonymous namespace
+
+HdLegacyGeomSubsetSceneIndexRefPtr
+HdLegacyGeomSubsetSceneIndex::New(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    return TfCreateRefPtr(
+        new HdLegacyGeomSubsetSceneIndex(inputSceneIndex));
+}
+
+HdLegacyGeomSubsetSceneIndex::HdLegacyGeomSubsetSceneIndex(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+  : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+{ }
+
+HdLegacyGeomSubsetSceneIndex::~HdLegacyGeomSubsetSceneIndex() = default;
+
+HdSceneIndexPrim
+HdLegacyGeomSubsetSceneIndex::GetPrim(const SdfPath& primPath) const
+{
+    const HdSceneIndexPrim& prim = _GetInputSceneIndex()->GetPrim(primPath);
+    // If primPath is for a legacy subset, the input scene index will
+    // not know anything about it. We can bail early if dataSorce is null.
+    if (!prim.dataSource) {
+        const SdfPath& parentPath = primPath.GetParentPath();
+        if (_parentPrims.find(parentPath) != _parentPrims.end()) {
+            const HdSceneIndexPrim& parent =
+                _GetInputSceneIndex()->GetPrim(parentPath);
+            if (HdSceneDelegate* delegate =
+                _GetSceneDelegate(parent.dataSource)) {
+                return {
+                    HdPrimTypeTokens->geomSubset,
+                    _HdDataSourceLegacyGeomSubset::New(
+                        primPath, parentPath,
+                        parent.primType, delegate) };
+            }
+        }
+    }
+    return prim;
+}
+
+SdfPathVector
+HdLegacyGeomSubsetSceneIndex::GetChildPrimPaths(const SdfPath& primPath) const
+{
+    // XXX: To the extent there are authored mesh subsets in here, we must
+    // return them in their original authored order. We could get that by
+    // pulling the mesh topology from the delegate, but by doing so we would be
+    // giving up the ability to do fine-grained invalidation in _PrimsDirtied.
+    SdfPathVector paths = _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+    const auto it = _parentPrims.find(primPath);
+    if (it != _parentPrims.end()) {
+        paths.insert(paths.end(), it->second.begin(), it->second.end());
+    }
+    return paths;
+}
+
+void
+HdLegacyGeomSubsetSceneIndex::_PrimsAdded(
+    const HdSceneIndexBase&  /*sender*/,
+    const HdSceneIndexObserver::AddedPrimEntries& entries)
+{                
+    HdSceneIndexObserver::AddedPrimEntries newEntries;
+    for (const HdSceneIndexObserver::AddedPrimEntry& entry : entries) {
+        if (!HdPrimTypeSupportsGeomSubsets(entry.primType)) {
+            continue;
+        }
+        const HdSceneIndexPrim& prim =
+            _GetInputSceneIndex()->GetPrim(entry.primPath);
+        const SdfPathVector& paths = _ListDelegateSubsets(entry.primPath, prim);
+        if (paths.empty()) {
+            continue;
+        }
+        // Only add prims with subsets to _parentPrims to save on memory.
+        _parentPrims.insert({ entry.primPath, paths });        
+        for (const SdfPath& path : paths) {
+            newEntries.push_back({ path, HdPrimTypeTokens->geomSubset });
+        }
+    }
+    if (!newEntries.empty()) {
+        newEntries.insert(newEntries.begin(), entries.cbegin(), entries.cend());
+        return _SendPrimsAdded(newEntries);
+    }
+    _SendPrimsAdded(entries);
+}
+
+void
+HdLegacyGeomSubsetSceneIndex::_PrimsRemoved(
+    const HdSceneIndexBase&  /*sender*/,
+    const HdSceneIndexObserver::RemovedPrimEntries& entries)
+{
+    HdSceneIndexObserver::RemovedPrimEntries removedEntries;
+    for (const HdSceneIndexObserver::RemovedPrimEntry& entry : entries) {
+        auto it = _parentPrims.find(entry.primPath);
+        if (it != _parentPrims.end()) {
+            for (const SdfPath& path : it->second) {
+                removedEntries.push_back({ path });
+            }
+            _parentPrims.erase(it);
+        }
+    }
+    if (!removedEntries.empty()) {
+        removedEntries.insert(
+            removedEntries.begin(), entries.cbegin(), entries.cend());
+        return _SendPrimsRemoved(removedEntries);
+    }
+    _SendPrimsRemoved(entries);
+}
+
+void
+HdLegacyGeomSubsetSceneIndex::_PrimsDirtied(
+    const HdSceneIndexBase& /*sender*/,
+    const HdSceneIndexObserver::DirtiedPrimEntries& entries)
+{
+    // XXX: We cache each parent prim's subset paths so we can tell when
+    // dirty topology means one or more subsets were added or removed.
+    // Otherwise, we would have to remove and add every subset every time the
+    // topology was dirty, even when the list of subsets does not change.
+    // We always send an add, remove, or dirty signal for every subset though.
+    // Downstream consumers may be able to handle a dirty subset more
+    // efficiently than a destroyed and recreated one.
+    static const HdDataSourceLocatorSet topologyLocators {
+        HdBasisCurvesTopologySchema::GetDefaultLocator(),
+        HdMeshTopologySchema::GetDefaultLocator() };
+    static const HdDataSourceLocatorSet emptyLocatorSet {
+        HdDataSourceLocator::EmptyLocator() };
+        
+    HdSceneIndexObserver::AddedPrimEntries addedEntries;
+    HdSceneIndexObserver::RemovedPrimEntries removedEntries;
+    HdSceneIndexObserver::DirtiedPrimEntries dirtiedEntries;
+    
+    for (const HdSceneIndexObserver::DirtiedPrimEntry& entry : entries) {
+        if (!entry.dirtyLocators.Intersects(topologyLocators)) {
+            // If the change didn't affect topology, we can continue. This is
+            // either not a mesh/basisCurves or the subsets didn't change.
+            continue;
+        }
+        const HdSceneIndexPrim& prim =
+            _GetInputSceneIndex()->GetPrim(entry.primPath);
+        // Immediately fetch the new list of subsets
+        SdfPathVector after  = _ListDelegateSubsets(entry.primPath, prim);
+        auto it = _parentPrims.find(entry.primPath);
+        if (it == _parentPrims.end()) {
+            // This mesh/basisCurves did not previously have subsets
+            // but some may have been added. If none have been added,
+            // we can continue.
+            if (after.empty()) {
+                continue;
+            }
+            // There are new subsets for this mesh/basisCurves;
+            // add an entry to _parentPrims.
+            it = _parentPrims.insert({entry.primPath, {}}).first;
+        }
+        SdfPathVector before = it->second; // a copy!
+        SdfPathVector added, removed, dirtied;
+        // update cached child paths
+        it->second.clear();
+        it->second.insert(it->second.end(), after.begin(), after.end());
+        if (before.empty()) {
+            added = after;
+        } else if (after.empty()) {
+            removed = before;
+        } else {
+            // set_differences requires before and after to be sorted
+            std::sort(before.begin(), before.end());
+            std::sort(after.begin(), after.end());
+            set_differences(
+                before.begin(), before.end(),
+                after.begin(), after.end(),
+                std::back_inserter(added),
+                std::back_inserter(removed),
+                std::back_inserter(dirtied));
+        }
+        for (const SdfPath& path : added) {
+            addedEntries.push_back({ path, HdPrimTypeTokens->geomSubset });
+        }
+        for (const SdfPath& path : removed) {
+            removedEntries.push_back({ path });
+        }
+        for (const SdfPath& path : dirtied) {
+            dirtiedEntries.push_back({ path, emptyLocatorSet });
+        }
+    }
+    if (!removedEntries.empty()) {
+        _SendPrimsRemoved(removedEntries);
+    }
+    if (!dirtiedEntries.empty()) {
+        dirtiedEntries.insert(
+            dirtiedEntries.begin(), entries.cbegin(), entries.cend());
+        _SendPrimsDirtied(dirtiedEntries);
+    } else {
+        _SendPrimsDirtied(entries);
+    }
+    if (!addedEntries.empty()) {
+        _SendPrimsAdded(addedEntries);
+    }
+}
+
+SdfPathVector
+HdLegacyGeomSubsetSceneIndex::_ListDelegateSubsets(
+    const SdfPath& parentPath,
+    const HdSceneIndexPrim& parentPrim) 
+{
+    SdfPathVector paths;
+    if (!parentPrim.dataSource ||
+        !HdPrimTypeSupportsGeomSubsets(parentPrim.primType)) {
+        return paths;
+    }
+    if (HdSceneDelegate* delegate = _GetSceneDelegate(parentPrim.dataSource)) {
+        if (parentPrim.primType == HdPrimTypeTokens->basisCurves) {
+            const HdBasisCurvesTopology& topo =
+                delegate->GetBasisCurvesTopology(parentPath);
+            if (!topo.GetInvisibleCurves().empty()) {
+                paths.push_back(parentPath.AppendChild(
+                    _tokens->invisibleCurves));
+            }
+            if (!topo.GetInvisiblePoints().empty()) {
+                paths.push_back(parentPath.AppendChild(
+                    _tokens->invisiblePoints));
+            }
+        } else if (parentPrim.primType == HdPrimTypeTokens->mesh) {
+            const HdMeshTopology& topo =
+                delegate->GetMeshTopology(parentPath);
+            for (const HdGeomSubset& subset : topo.GetGeomSubsets()) {
+                paths.push_back(parentPath.AppendChild(
+                    subset.id.GetNameToken()));
+            }
+            if (!topo.GetInvisibleFaces().empty()) {
+                paths.push_back(parentPath.AppendChild(
+                    _tokens->invisibleFaces));
+            }
+            if (!topo.GetInvisiblePoints().empty()) {
+                paths.push_back(parentPath.AppendChild(
+                    _tokens->invisiblePoints));
+            }
+            
+        }
+    }
+    return paths;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hd/legacyGeomSubsetSceneIndex.h b/pxr/imaging/hd/legacyGeomSubsetSceneIndex.h
new file mode 100644
index 0000000000..6db85e6f45
--- /dev/null
+++ b/pxr/imaging/hd/legacyGeomSubsetSceneIndex.h
@@ -0,0 +1,88 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_IMAGING_HD_LEGACY_GEOM_SUBSET_SCENE_INDEX_H
+#define PXR_IMAGING_HD_LEGACY_GEOM_SUBSET_SCENE_INDEX_H
+
+#include "pxr/imaging/hd/api.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexObserver.h"
+
+#include "pxr/usd/sdf/path.h"
+
+#include "pxr/base/tf/declarePtrs.h"
+
+#include "pxr/pxr.h"
+
+#include <unordered_map>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DECLARE_REF_PTRS(HdLegacyGeomSubsetSceneIndex);
+
+///
+/// HdLegacyGeomSubsetSceneIndex
+///
+/// This scene index converts legacy geom subsets (from mesh or basis curves
+/// topology, including invisible components) into Hydra geomSubset prims. It
+/// preserves the authored order of named mesh subsets as USD requires.
+/// It MUST have a notice-batching scene index before it so that it can access
+/// topology via the scene delegate during insertion.
+///
+/// For the most part, this scene index will pull information from the scene
+/// delegate on demand. However, it does keep a cache of all the subset paths
+/// it has added (organized by parent) so it can be more precise about
+/// invalidation. Having this cache incidentally provides a few other
+/// shortcuts to avoid expensive operations.
+class HdLegacyGeomSubsetSceneIndex
+  : public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    HD_API
+    static HdLegacyGeomSubsetSceneIndexRefPtr New(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex);
+    
+    HD_API
+    ~HdLegacyGeomSubsetSceneIndex() override;
+    
+    HD_API
+    HdSceneIndexPrim GetPrim(const SdfPath& primPath) const override;
+    
+    HD_API
+    SdfPathVector GetChildPrimPaths(const SdfPath& primPath) const override;
+
+protected:
+    HdLegacyGeomSubsetSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex);
+    
+    void _PrimsAdded(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::AddedPrimEntries& entries) override;
+    
+    void _PrimsRemoved(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::RemovedPrimEntries& entries) override;
+    
+    void _PrimsDirtied(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries& entries) override;
+
+private:    
+    static SdfPathVector
+    _ListDelegateSubsets(
+        const SdfPath& parentPath,
+        const HdSceneIndexPrim& parentPrim);
+    
+    // Unordered map of parent path -> [subset paths...]
+    // XXX: Do not use SdfPathTable because we do not want it
+    // to implicitly include the extra ancestor paths.
+    std::unordered_map<SdfPath, SdfPathVector, SdfPath::Hash> _parentPrims;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HD_LEGACY_GEOM_SUBSET_SCENE_INDEX_H
diff --git a/pxr/imaging/hd/legacyPrimSceneIndex.cpp b/pxr/imaging/hd/legacyPrimSceneIndex.cpp
index de3b6a2210..eaebdf30a9 100644
--- a/pxr/imaging/hd/legacyPrimSceneIndex.cpp
+++ b/pxr/imaging/hd/legacyPrimSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/legacyPrimSceneIndex.h"
 #include "pxr/imaging/hd/dataSourceLegacyPrim.h"
diff --git a/pxr/imaging/hd/legacyPrimSceneIndex.h b/pxr/imaging/hd/legacyPrimSceneIndex.h
index b89986ef75..a1efe6d6f1 100644
--- a/pxr/imaging/hd/legacyPrimSceneIndex.h
+++ b/pxr/imaging/hd/legacyPrimSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_LEGACY_PRIM_SCENE_INDEX_H
 #define PXR_IMAGING_HD_LEGACY_PRIM_SCENE_INDEX_H
diff --git a/pxr/imaging/hd/lensDistortionSchema.cpp b/pxr/imaging/hd/lensDistortionSchema.cpp
index 5879f7861a..22ecde0510 100644
--- a/pxr/imaging/hd/lensDistortionSchema.cpp
+++ b/pxr/imaging/hd/lensDistortionSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/lensDistortionSchema.h b/pxr/imaging/hd/lensDistortionSchema.h
index 0775cce446..aee574e44a 100644
--- a/pxr/imaging/hd/lensDistortionSchema.h
+++ b/pxr/imaging/hd/lensDistortionSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/light.cpp b/pxr/imaging/hd/light.cpp
index bdcd8eba27..15b19ba30c 100644
--- a/pxr/imaging/hd/light.cpp
+++ b/pxr/imaging/hd/light.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/light.h"
 
diff --git a/pxr/imaging/hd/light.h b/pxr/imaging/hd/light.h
index 76313a7f8b..61fdd04a16 100644
--- a/pxr/imaging/hd/light.h
+++ b/pxr/imaging/hd/light.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_LIGHT_H
 #define PXR_IMAGING_HD_LIGHT_H
@@ -92,6 +75,8 @@ class HdLight : public HdSprim
     enum DirtyBits : HdDirtyBits {
         Clean                 = 0,
         DirtyTransform        = 1 << 0,
+        // Note: Because DirtyVisibility wasn't added, DirtyParams does double
+        //       duty for params and visibility.
         DirtyParams           = 1 << 1,
         DirtyShadowParams     = 1 << 2,
         DirtyCollection       = 1 << 3,
diff --git a/pxr/imaging/hd/lightSchema.cpp b/pxr/imaging/hd/lightSchema.cpp
index 01a482ce1e..712015a33f 100644
--- a/pxr/imaging/hd/lightSchema.cpp
+++ b/pxr/imaging/hd/lightSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/lightSchema.h b/pxr/imaging/hd/lightSchema.h
index 1841c1d95b..235d933180 100644
--- a/pxr/imaging/hd/lightSchema.h
+++ b/pxr/imaging/hd/lightSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/mapContainerDataSource.cpp b/pxr/imaging/hd/mapContainerDataSource.cpp
index 467dc6e684..53f0d48903 100644
--- a/pxr/imaging/hd/mapContainerDataSource.cpp
+++ b/pxr/imaging/hd/mapContainerDataSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/mapContainerDataSource.h"
 
diff --git a/pxr/imaging/hd/mapContainerDataSource.h b/pxr/imaging/hd/mapContainerDataSource.h
index 020130af26..c96db25ba9 100644
--- a/pxr/imaging/hd/mapContainerDataSource.h
+++ b/pxr/imaging/hd/mapContainerDataSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MAP_CONTAINER_DATA_SOURCE_H
 #define PXR_IMAGING_HD_MAP_CONTAINER_DATA_SOURCE_H
diff --git a/pxr/imaging/hd/material.cpp b/pxr/imaging/hd/material.cpp
index b7b5bdd57d..e7c28e2881 100644
--- a/pxr/imaging/hd/material.cpp
+++ b/pxr/imaging/hd/material.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/material.h"
 #include "pxr/imaging/hd/tokens.h"
@@ -125,20 +108,20 @@ HdConvertToHdMaterialNetwork2(
     return result;
 }
 
-// Look up value from material node parameters and fallback to
-// corresponding value on given SdrNode.
+// Look up value from the parameters map and fallback to corresponding value on
+// given SdrNode.
 template<typename T>
 static
 auto
 _ResolveParameter(
-    const HdMaterialNode2& node,
+    const std::map<TfToken, VtValue>& parameters,
     const SdrShaderNodeConstPtr& sdrNode,
     const TfToken& name,
     const T& defaultValue) -> T
 {
-    // First consult node parameters...
-    const auto it = node.parameters.find(name);
-    if (it != node.parameters.end()) {
+    // First consult parameters...
+    const auto it = parameters.find(name);
+    if (it != parameters.end()) {
         const VtValue& value = it->second;
         if (value.IsHolding<T>()) {
             return value.UncheckedGet<T>();
@@ -149,7 +132,7 @@ _ResolveParameter(
     if (sdrNode) {
         if (const SdrShaderPropertyConstPtr input =
                                         sdrNode->GetShaderInput(name)) {
-            const VtValue& value = input->GetDefaultValue();
+            const VtValue& value = input->GetDefaultValueAsSdfType();
             if (value.IsHolding<T>()) {
                 return value.UncheckedGet<T>();
             }
@@ -162,13 +145,14 @@ _ResolveParameter(
 static
 HdWrap
 _ResolveWrapSamplerParameter(
-    const SdfPath& nodePath,
-    const HdMaterialNode2& node,
+    const TfToken& nodeTypeId,
+    const std::map<TfToken, VtValue>& parameters,
     const SdrShaderNodeConstPtr& sdrNode,
+    const SdfPath& nodePath,
     const TfToken& name)
 {
     const TfToken value = _ResolveParameter(
-        node, sdrNode, name, _tokens->useMetadata);
+        parameters, sdrNode, name, _tokens->useMetadata);
 
     if (value == _tokens->repeat) {
         return HdWrapRepeat;
@@ -187,14 +171,18 @@ _ResolveWrapSamplerParameter(
     }
 
     if (value == _tokens->useMetadata) {
-        if (node.nodeTypeId == _tokens->HwUvTexture_1) {
+        if (nodeTypeId == _tokens->HwUvTexture_1) {
             return HdWrapLegacy;
         }
         return HdWrapUseMetadata;
     }
 
-    TF_WARN("Unknown wrap mode on prim %s: %s",
-            nodePath.GetText(), value.GetText());
+    if (!nodePath.IsEmpty()) {
+        TF_WARN("Unknown wrap mode on prim %s: %s",
+                nodePath.GetText(), value.GetText());
+    } else {
+        TF_WARN("Unknown wrap mode: %s", value.GetText());
+    }
 
     return HdWrapUseMetadata;
 }
@@ -202,9 +190,10 @@ _ResolveWrapSamplerParameter(
 static
 HdMinFilter
 _ResolveMinSamplerParameter(
-    const SdfPath& nodePath,
-    const HdMaterialNode2& node,
-    const SdrShaderNodeConstPtr& sdrNode)
+    const TfToken& nodeTypeId,
+    const std::map<TfToken, VtValue>& parameters,
+    const SdrShaderNodeConstPtr& sdrNode,
+    const SdfPath& nodePath)
 {
     // Using linearMipmapLinear as fallback value.
 
@@ -215,7 +204,7 @@ _ResolveMinSamplerParameter(
     // token was authored, linear was used.
 
     const TfToken value = _ResolveParameter(
-        node, sdrNode, _tokens->minFilter,
+        parameters, sdrNode, _tokens->minFilter,
         _tokens->linearMipmapLinear);
 
     if (value == _tokens->nearest) {
@@ -248,12 +237,13 @@ _ResolveMinSamplerParameter(
 static
 HdMagFilter
 _ResolveMagSamplerParameter(
-    const SdfPath& nodePath,
-    const HdMaterialNode2& node,
-    const SdrShaderNodeConstPtr& sdrNode)
+    const TfToken& nodeTypeId,
+    const std::map<TfToken, VtValue>& parameters,
+    const SdrShaderNodeConstPtr& sdrNode,
+    const SdfPath& nodePath)
 {
     const TfToken value = _ResolveParameter(
-        node, sdrNode, _tokens->magFilter, _tokens->linear);
+        parameters, sdrNode, _tokens->magFilter, _tokens->linear);
 
     if (value == _tokens->nearest) {
         return HdMagFilterNearest;
@@ -262,27 +252,55 @@ _ResolveMagSamplerParameter(
     return HdMagFilterLinear;
 }
 
+static
 HdSamplerParameters
-HdGetSamplerParameters(
-    const SdfPath& nodePath,
-    const HdMaterialNode2& node,
-    const SdrShaderNodeConstPtr& sdrNode)
+_GetSamplerParameters(
+    const TfToken& nodeTypeId,
+    const std::map<TfToken, VtValue>& parameters,
+    const SdrShaderNodeConstPtr& sdrNode,
+    const SdfPath& nodePath)
 {
     return { _ResolveWrapSamplerParameter(
-                 nodePath, node, sdrNode, _tokens->wrapS),
+                 nodeTypeId, parameters, sdrNode, nodePath, _tokens->wrapS),
              _ResolveWrapSamplerParameter(
-                 nodePath, node, sdrNode, _tokens->wrapT),
+                 nodeTypeId, parameters, sdrNode, nodePath, _tokens->wrapT),
              _ResolveWrapSamplerParameter(
-                 nodePath, node, sdrNode, _tokens->wrapR),
+                 nodeTypeId, parameters, sdrNode, nodePath, _tokens->wrapR),
              _ResolveMinSamplerParameter(
-                 nodePath, node, sdrNode),
+                 nodeTypeId, parameters, sdrNode, nodePath),
              _ResolveMagSamplerParameter(
-                 nodePath, node, sdrNode),
+                 nodeTypeId, parameters, sdrNode, nodePath),
              HdBorderColorTransparentBlack, 
              /*enableCompare*/false, 
              HdCmpFuncNever };
 }
 
+HdSamplerParameters
+HdGetSamplerParameters(
+    const HdMaterialNode2& node,
+    const SdrShaderNodeConstPtr& sdrNode,
+    const SdfPath& nodePath)
+{
+    return _GetSamplerParameters(
+        node.nodeTypeId,
+        node.parameters,
+        sdrNode,
+        nodePath);
+}
+
+HdSamplerParameters
+HdGetSamplerParameters(
+    const TfToken& nodeTypeId,
+    const std::map<TfToken, VtValue>& parameters,
+    const SdfPath& nodePath)
+{
+    return _GetSamplerParameters(
+        nodeTypeId,
+        parameters,
+        nullptr,
+        nodePath);
+}
+
 
 // -------------------------------------------------------------------------- //
 // VtValue Requirements
diff --git a/pxr/imaging/hd/material.h b/pxr/imaging/hd/material.h
index e17abe5238..b00da88e21 100644
--- a/pxr/imaging/hd/material.h
+++ b/pxr/imaging/hd/material.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MATERIAL_H
 #define PXR_IMAGING_HD_MATERIAL_H
@@ -197,10 +180,20 @@ HdMaterialNetwork2 HdConvertToHdMaterialNetwork2(
 /// present.  Otherwise extracts the sampler parameters from the SdrNode.
 HD_API
 HdSamplerParameters HdGetSamplerParameters(
-    const SdfPath& nodePath,
     const HdMaterialNode2& node,
-    const SdrShaderNodeConstPtr& sdrNode);
-
+    const SdrShaderNodeConstPtr& sdrNode,
+    const SdfPath& nodePath = SdfPath::EmptyPath());
+
+/// Extract HdSamplerParameters from the given parameter map for the given node
+/// type id.  Functionally this works essentially the same as the other
+/// HdGetSamplerParameters that operates on an HdMaterialNode2, but this allows
+/// extracting sampler parameters from the map without requiring an
+/// HdMaterialNode2.
+HD_API
+HdSamplerParameters HdGetSamplerParameters(
+    const TfToken& nodeTypeId,
+    const std::map<TfToken, VtValue>& parameters,
+    const SdfPath& nodePath = SdfPath::EmptyPath());
 
 // VtValue requirements
 HD_API
diff --git a/pxr/imaging/hd/materialBindingSchema.cpp b/pxr/imaging/hd/materialBindingSchema.cpp
index b521ddf94c..ebe27ec87a 100644
--- a/pxr/imaging/hd/materialBindingSchema.cpp
+++ b/pxr/imaging/hd/materialBindingSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialBindingSchema.h b/pxr/imaging/hd/materialBindingSchema.h
index dd3781d7d8..b67c94d001 100644
--- a/pxr/imaging/hd/materialBindingSchema.h
+++ b/pxr/imaging/hd/materialBindingSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialBindingsSchema.cpp b/pxr/imaging/hd/materialBindingsSchema.cpp
index ccc8d85ed8..bbfaad765b 100644
--- a/pxr/imaging/hd/materialBindingsSchema.cpp
+++ b/pxr/imaging/hd/materialBindingsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialBindingsSchema.h b/pxr/imaging/hd/materialBindingsSchema.h
index b1ec84432f..4d3c86986c 100644
--- a/pxr/imaging/hd/materialBindingsSchema.h
+++ b/pxr/imaging/hd/materialBindingsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialConnectionSchema.cpp b/pxr/imaging/hd/materialConnectionSchema.cpp
index fd01cb5495..f129e73bc0 100644
--- a/pxr/imaging/hd/materialConnectionSchema.cpp
+++ b/pxr/imaging/hd/materialConnectionSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialConnectionSchema.h b/pxr/imaging/hd/materialConnectionSchema.h
index 275dbfe45d..9f8b15f310 100644
--- a/pxr/imaging/hd/materialConnectionSchema.h
+++ b/pxr/imaging/hd/materialConnectionSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialFilteringSceneIndexBase.cpp b/pxr/imaging/hd/materialFilteringSceneIndexBase.cpp
index aca8081699..06a8b9d553 100644
--- a/pxr/imaging/hd/materialFilteringSceneIndexBase.cpp
+++ b/pxr/imaging/hd/materialFilteringSceneIndexBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/materialFilteringSceneIndexBase.h"
 #include "pxr/imaging/hd/dataSourceMaterialNetworkInterface.h"
diff --git a/pxr/imaging/hd/materialFilteringSceneIndexBase.h b/pxr/imaging/hd/materialFilteringSceneIndexBase.h
index b9ccce65d5..e14ef9f990 100644
--- a/pxr/imaging/hd/materialFilteringSceneIndexBase.h
+++ b/pxr/imaging/hd/materialFilteringSceneIndexBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICEN SE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HD_MATERIAL_FILTERING_SCENE_INDEX_H
 #define HD_MATERIAL_FILTERING_SCENE_INDEX_H
diff --git a/pxr/imaging/hd/materialInterfaceMappingSchema.cpp b/pxr/imaging/hd/materialInterfaceMappingSchema.cpp
index 710370a1df..489f49688b 100644
--- a/pxr/imaging/hd/materialInterfaceMappingSchema.cpp
+++ b/pxr/imaging/hd/materialInterfaceMappingSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialInterfaceMappingSchema.h b/pxr/imaging/hd/materialInterfaceMappingSchema.h
index d4a8dfa744..b1f6785e9d 100644
--- a/pxr/imaging/hd/materialInterfaceMappingSchema.h
+++ b/pxr/imaging/hd/materialInterfaceMappingSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialNetwork2Interface.cpp b/pxr/imaging/hd/materialNetwork2Interface.cpp
index f095deace4..d4a8169ff0 100644
--- a/pxr/imaging/hd/materialNetwork2Interface.cpp
+++ b/pxr/imaging/hd/materialNetwork2Interface.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/materialNetwork2Interface.h"
 
diff --git a/pxr/imaging/hd/materialNetwork2Interface.h b/pxr/imaging/hd/materialNetwork2Interface.h
index 60bdf6a00c..deed2404e5 100644
--- a/pxr/imaging/hd/materialNetwork2Interface.h
+++ b/pxr/imaging/hd/materialNetwork2Interface.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HD_MATERIAL_NETWORK_2_INTERFACE_H
 #define HD_MATERIAL_NETWORK_2_INTERFACE_H
diff --git a/pxr/imaging/hd/materialNetworkInterface.h b/pxr/imaging/hd/materialNetworkInterface.h
index 1c375b1830..4c9c4e703e 100644
--- a/pxr/imaging/hd/materialNetworkInterface.h
+++ b/pxr/imaging/hd/materialNetworkInterface.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MATERIAL_NETWORK_INTERFACE_H
 #define PXR_IMAGING_HD_MATERIAL_NETWORK_INTERFACE_H
diff --git a/pxr/imaging/hd/materialNetworkSchema.cpp b/pxr/imaging/hd/materialNetworkSchema.cpp
index ea95e7ccc5..ceebfc57f1 100644
--- a/pxr/imaging/hd/materialNetworkSchema.cpp
+++ b/pxr/imaging/hd/materialNetworkSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialNetworkSchema.h b/pxr/imaging/hd/materialNetworkSchema.h
index cb943970ec..984815f8f1 100644
--- a/pxr/imaging/hd/materialNetworkSchema.h
+++ b/pxr/imaging/hd/materialNetworkSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialNodeParameterSchema.cpp b/pxr/imaging/hd/materialNodeParameterSchema.cpp
index ba62674ab7..c1f5067bd3 100644
--- a/pxr/imaging/hd/materialNodeParameterSchema.cpp
+++ b/pxr/imaging/hd/materialNodeParameterSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialNodeParameterSchema.h b/pxr/imaging/hd/materialNodeParameterSchema.h
index 8f22814626..0929725ce3 100644
--- a/pxr/imaging/hd/materialNodeParameterSchema.h
+++ b/pxr/imaging/hd/materialNodeParameterSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialNodeSchema.cpp b/pxr/imaging/hd/materialNodeSchema.cpp
index 42be68cfaf..d6d426ef97 100644
--- a/pxr/imaging/hd/materialNodeSchema.cpp
+++ b/pxr/imaging/hd/materialNodeSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialNodeSchema.h b/pxr/imaging/hd/materialNodeSchema.h
index 1a9d89aa73..468f037801 100644
--- a/pxr/imaging/hd/materialNodeSchema.h
+++ b/pxr/imaging/hd/materialNodeSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialSchema.cpp b/pxr/imaging/hd/materialSchema.cpp
index d2e10aa6b8..14b04550f7 100644
--- a/pxr/imaging/hd/materialSchema.cpp
+++ b/pxr/imaging/hd/materialSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/materialSchema.h b/pxr/imaging/hd/materialSchema.h
index d9eeed9431..b222d6b22d 100644
--- a/pxr/imaging/hd/materialSchema.h
+++ b/pxr/imaging/hd/materialSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/mergingSceneIndex.cpp b/pxr/imaging/hd/mergingSceneIndex.cpp
index bb2d55b076..dc638db35e 100644
--- a/pxr/imaging/hd/mergingSceneIndex.cpp
+++ b/pxr/imaging/hd/mergingSceneIndex.cpp
@@ -1,28 +1,12 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/mergingSceneIndex.h"
 #include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPrimView.h"
 #include "pxr/base/tf/denseHashSet.h"
 #include "pxr/base/trace/trace.h"
 #include "pxr/base/work/dispatcher.h"
@@ -407,8 +391,11 @@ HdMergingSceneIndex::_PrimsRemoved(
         if (primFullyRemoved) {
             filteredEntries.push_back(entry);
         } else {
-            addedEntries.emplace_back(entry.primPath,
-                    GetPrim(entry.primPath).primType);
+            for (const SdfPath& descendantPath : HdSceneIndexPrimView(
+                     HdMergingSceneIndexRefPtr(this), entry.primPath)) {
+                addedEntries.emplace_back(
+                    descendantPath, GetPrim(descendantPath).primType);
+            }
         }
     }
 
diff --git a/pxr/imaging/hd/mergingSceneIndex.h b/pxr/imaging/hd/mergingSceneIndex.h
index c64b4150b7..f1a01c0eff 100644
--- a/pxr/imaging/hd/mergingSceneIndex.h
+++ b/pxr/imaging/hd/mergingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MERGING_SCENE_H
 #define PXR_IMAGING_HD_MERGING_SCENE_H
diff --git a/pxr/imaging/hd/mesh.cpp b/pxr/imaging/hd/mesh.cpp
index 080f3c5fa7..366be8264f 100644
--- a/pxr/imaging/hd/mesh.cpp
+++ b/pxr/imaging/hd/mesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/mesh.h"
diff --git a/pxr/imaging/hd/mesh.h b/pxr/imaging/hd/mesh.h
index e0d5ec644d..d7e454bdcd 100644
--- a/pxr/imaging/hd/mesh.h
+++ b/pxr/imaging/hd/mesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MESH_H
 #define PXR_IMAGING_HD_MESH_H
diff --git a/pxr/imaging/hd/meshSchema.cpp b/pxr/imaging/hd/meshSchema.cpp
index ec27654b02..5ae588891f 100644
--- a/pxr/imaging/hd/meshSchema.cpp
+++ b/pxr/imaging/hd/meshSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -70,13 +53,6 @@ HdMeshSchema::GetSubdivisionTags() const
         HdMeshSchemaTokens->subdivisionTags));
 }
 
-HdGeomSubsetsSchema
-HdMeshSchema::GetGeomSubsets() const
-{
-    return HdGeomSubsetsSchema(_GetTypedDataSource<HdContainerDataSource>(
-        HdMeshSchemaTokens->geomSubsets));
-}
-
 HdBoolDataSourceHandle
 HdMeshSchema::GetDoubleSided() const
 {
@@ -90,12 +66,11 @@ HdMeshSchema::BuildRetained(
         const HdContainerDataSourceHandle &topology,
         const HdTokenDataSourceHandle &subdivisionScheme,
         const HdContainerDataSourceHandle &subdivisionTags,
-        const HdContainerDataSourceHandle &geomSubsets,
         const HdBoolDataSourceHandle &doubleSided
 )
 {
-    TfToken _names[5];
-    HdDataSourceBaseHandle _values[5];
+    TfToken _names[4];
+    HdDataSourceBaseHandle _values[4];
 
     size_t _count = 0;
 
@@ -114,11 +89,6 @@ HdMeshSchema::BuildRetained(
         _values[_count++] = subdivisionTags;
     }
 
-    if (geomSubsets) {
-        _names[_count] = HdMeshSchemaTokens->geomSubsets;
-        _values[_count++] = geomSubsets;
-    }
-
     if (doubleSided) {
         _names[_count] = HdMeshSchemaTokens->doubleSided;
         _values[_count++] = doubleSided;
@@ -150,14 +120,6 @@ HdMeshSchema::Builder::SetSubdivisionTags(
     return *this;
 }
 
-HdMeshSchema::Builder &
-HdMeshSchema::Builder::SetGeomSubsets(
-    const HdContainerDataSourceHandle &geomSubsets)
-{
-    _geomSubsets = geomSubsets;
-    return *this;
-}
-
 HdMeshSchema::Builder &
 HdMeshSchema::Builder::SetDoubleSided(
     const HdBoolDataSourceHandle &doubleSided)
@@ -173,7 +135,6 @@ HdMeshSchema::Builder::Build()
         _topology,
         _subdivisionScheme,
         _subdivisionTags,
-        _geomSubsets,
         _doubleSided
     );
 }
@@ -235,16 +196,6 @@ HdMeshSchema::GetSubdivisionTagsLocator()
     return locator;
 }
 
-/* static */
-const HdDataSourceLocator &
-HdMeshSchema::GetGeomSubsetsLocator()
-{
-    static const HdDataSourceLocator locator =
-        GetDefaultLocator().Append(
-            HdMeshSchemaTokens->geomSubsets);
-    return locator;
-}
-
 /* static */
 const HdDataSourceLocator &
 HdMeshSchema::GetDoubleSidedLocator()
diff --git a/pxr/imaging/hd/meshSchema.h b/pxr/imaging/hd/meshSchema.h
index 868660f74d..cc472746fa 100644
--- a/pxr/imaging/hd/meshSchema.h
+++ b/pxr/imaging/hd/meshSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -40,7 +23,6 @@
 #include "pxr/imaging/hd/api.h"
 #include "pxr/imaging/hd/meshTopologySchema.h"
 #include "pxr/imaging/hd/subdivisionTagsSchema.h"
-#include "pxr/imaging/hd/geomSubsetsSchema.h"
 
 #include "pxr/imaging/hd/schema.h"
 
@@ -57,7 +39,6 @@ PXR_NAMESPACE_OPEN_SCOPE
     (topology) \
     (subdivisionScheme) \
     (subdivisionTags) \
-    (geomSubsets) \
     (doubleSided) \
 
 TF_DECLARE_PUBLIC_TOKENS(HdMeshSchemaTokens, HD_API,
@@ -101,9 +82,6 @@ class HdMeshSchema : public HdSchema
     HD_API
     HdSubdivisionTagsSchema GetSubdivisionTags() const;
 
-    HD_API
-    HdGeomSubsetsSchema GetGeomSubsets() const;
-
     HD_API
     HdBoolDataSourceHandle GetDoubleSided() const; 
 
@@ -145,10 +123,6 @@ class HdMeshSchema : public HdSchema
     HD_API
     static const HdDataSourceLocator &GetSubdivisionTagsLocator();
 
-    /// Prim-level relative data source locator to locate geomSubsets.
-    HD_API
-    static const HdDataSourceLocator &GetGeomSubsetsLocator();
-
     /// Prim-level relative data source locator to locate doubleSided.
     HD_API
     static const HdDataSourceLocator &GetDoubleSidedLocator();
@@ -170,7 +144,6 @@ class HdMeshSchema : public HdSchema
         const HdContainerDataSourceHandle &topology,
         const HdTokenDataSourceHandle &subdivisionScheme,
         const HdContainerDataSourceHandle &subdivisionTags,
-        const HdContainerDataSourceHandle &geomSubsets,
         const HdBoolDataSourceHandle &doubleSided
     );
 
@@ -193,9 +166,6 @@ class HdMeshSchema : public HdSchema
         Builder &SetSubdivisionTags(
             const HdContainerDataSourceHandle &subdivisionTags);
         HD_API
-        Builder &SetGeomSubsets(
-            const HdContainerDataSourceHandle &geomSubsets);
-        HD_API
         Builder &SetDoubleSided(
             const HdBoolDataSourceHandle &doubleSided);
 
@@ -207,7 +177,6 @@ class HdMeshSchema : public HdSchema
         HdContainerDataSourceHandle _topology;
         HdTokenDataSourceHandle _subdivisionScheme;
         HdContainerDataSourceHandle _subdivisionTags;
-        HdContainerDataSourceHandle _geomSubsets;
         HdBoolDataSourceHandle _doubleSided;
 
     };
diff --git a/pxr/imaging/hd/meshTopology.cpp b/pxr/imaging/hd/meshTopology.cpp
index 34626eac8f..5bd08c5fd4 100644
--- a/pxr/imaging/hd/meshTopology.cpp
+++ b/pxr/imaging/hd/meshTopology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/meshTopology.h"
 #include "pxr/imaging/hd/perfLog.h"
diff --git a/pxr/imaging/hd/meshTopology.h b/pxr/imaging/hd/meshTopology.h
index ae6f28ab0c..cc3fd94ac7 100644
--- a/pxr/imaging/hd/meshTopology.h
+++ b/pxr/imaging/hd/meshTopology.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MESH_TOPOLOGY_H
 #define PXR_IMAGING_HD_MESH_TOPOLOGY_H
diff --git a/pxr/imaging/hd/meshTopologySchema.cpp b/pxr/imaging/hd/meshTopologySchema.cpp
index c3b6899965..c01aadc449 100644
--- a/pxr/imaging/hd/meshTopologySchema.cpp
+++ b/pxr/imaging/hd/meshTopologySchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/meshTopologySchema.h b/pxr/imaging/hd/meshTopologySchema.h
index 0578c15949..ca63bbe95c 100644
--- a/pxr/imaging/hd/meshTopologySchema.h
+++ b/pxr/imaging/hd/meshTopologySchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/meshUtil.cpp b/pxr/imaging/hd/meshUtil.cpp
index 56d98fe97c..9a81dc94d4 100644
--- a/pxr/imaging/hd/meshUtil.cpp
+++ b/pxr/imaging/hd/meshUtil.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/meshUtil.h"
 
diff --git a/pxr/imaging/hd/meshUtil.h b/pxr/imaging/hd/meshUtil.h
index 0d2449ecf2..1628f5f198 100644
--- a/pxr/imaging/hd/meshUtil.h
+++ b/pxr/imaging/hd/meshUtil.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MESH_UTIL_H
 #define PXR_IMAGING_HD_MESH_UTIL_H
diff --git a/pxr/imaging/hd/noticeBatchingSceneIndex.cpp b/pxr/imaging/hd/noticeBatchingSceneIndex.cpp
index 61c4f0fc9a..ea7b14fb27 100644
--- a/pxr/imaging/hd/noticeBatchingSceneIndex.cpp
+++ b/pxr/imaging/hd/noticeBatchingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/noticeBatchingSceneIndex.h"
 
diff --git a/pxr/imaging/hd/noticeBatchingSceneIndex.h b/pxr/imaging/hd/noticeBatchingSceneIndex.h
index 5d10073cd2..db3c50335f 100644
--- a/pxr/imaging/hd/noticeBatchingSceneIndex.h
+++ b/pxr/imaging/hd/noticeBatchingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_NOTICE_BATCHING_SCENE_INDEX_H
 #define PXR_IMAGING_HD_NOTICE_BATCHING_SCENE_INDEX_H
diff --git a/pxr/imaging/hd/nurbsCurvesSchema.cpp b/pxr/imaging/hd/nurbsCurvesSchema.cpp
index 3389c78756..0b0106cb2b 100644
--- a/pxr/imaging/hd/nurbsCurvesSchema.cpp
+++ b/pxr/imaging/hd/nurbsCurvesSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/nurbsCurvesSchema.h b/pxr/imaging/hd/nurbsCurvesSchema.h
index 7a75dc88e9..8055e592a6 100644
--- a/pxr/imaging/hd/nurbsCurvesSchema.h
+++ b/pxr/imaging/hd/nurbsCurvesSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/nurbsPatchSchema.cpp b/pxr/imaging/hd/nurbsPatchSchema.cpp
index 958bf6321f..6d74c1fa70 100644
--- a/pxr/imaging/hd/nurbsPatchSchema.cpp
+++ b/pxr/imaging/hd/nurbsPatchSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/nurbsPatchSchema.h b/pxr/imaging/hd/nurbsPatchSchema.h
index f2bd1f8c4d..5c3b84df0e 100644
--- a/pxr/imaging/hd/nurbsPatchSchema.h
+++ b/pxr/imaging/hd/nurbsPatchSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/nurbsPatchTrimCurveSchema.cpp b/pxr/imaging/hd/nurbsPatchTrimCurveSchema.cpp
index 49fb1f7a6b..bbd47c81e1 100644
--- a/pxr/imaging/hd/nurbsPatchTrimCurveSchema.cpp
+++ b/pxr/imaging/hd/nurbsPatchTrimCurveSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/nurbsPatchTrimCurveSchema.h b/pxr/imaging/hd/nurbsPatchTrimCurveSchema.h
index 0baf1debde..562dd43b7f 100644
--- a/pxr/imaging/hd/nurbsPatchTrimCurveSchema.h
+++ b/pxr/imaging/hd/nurbsPatchTrimCurveSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/overlayContainerDataSource.cpp b/pxr/imaging/hd/overlayContainerDataSource.cpp
index 9853106fca..56f0aa990d 100644
--- a/pxr/imaging/hd/overlayContainerDataSource.cpp
+++ b/pxr/imaging/hd/overlayContainerDataSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/overlayContainerDataSource.h"
 
diff --git a/pxr/imaging/hd/overlayContainerDataSource.h b/pxr/imaging/hd/overlayContainerDataSource.h
index 2fe191f9a8..27eaeb543c 100644
--- a/pxr/imaging/hd/overlayContainerDataSource.h
+++ b/pxr/imaging/hd/overlayContainerDataSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_OVERLAY_CONTAINER_DATA_SOURCE_H
 #define PXR_IMAGING_HD_OVERLAY_CONTAINER_DATA_SOURCE_H
diff --git a/pxr/imaging/hd/pch.h b/pxr/imaging/hd/pch.h
index 604861b7b1..cbf4d8753c 100644
--- a/pxr/imaging/hd/pch.h
+++ b/pxr/imaging/hd/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,12 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <cfloat>
 #include <cinttypes>
@@ -70,12 +54,15 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <string>
 #include <sys/types.h>
 #include <thread>
@@ -87,46 +74,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -135,28 +82,12 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
+#include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
@@ -165,6 +96,7 @@
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
 #include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hd/perfLog.cpp b/pxr/imaging/hd/perfLog.cpp
index 635a9e5499..b401a8f777 100644
--- a/pxr/imaging/hd/perfLog.cpp
+++ b/pxr/imaging/hd/perfLog.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/perfLog.h"
 
diff --git a/pxr/imaging/hd/perfLog.h b/pxr/imaging/hd/perfLog.h
index 086eb966fe..d29e26b7c0 100644
--- a/pxr/imaging/hd/perfLog.h
+++ b/pxr/imaging/hd/perfLog.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_PERF_LOG_H
 #define PXR_IMAGING_HD_PERF_LOG_H
diff --git a/pxr/imaging/hd/pluginRenderDelegateUniqueHandle.cpp b/pxr/imaging/hd/pluginRenderDelegateUniqueHandle.cpp
index 771b9addf3..bcc7fcbbfd 100644
--- a/pxr/imaging/hd/pluginRenderDelegateUniqueHandle.cpp
+++ b/pxr/imaging/hd/pluginRenderDelegateUniqueHandle.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h"
 
diff --git a/pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h b/pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h
index 9018d631af..14f11248d8 100644
--- a/pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h
+++ b/pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_PLUGIN_RENDER_DELEGATE_UNIQUE_HANDLE_H
 #define PXR_IMAGING_HD_PLUGIN_RENDER_DELEGATE_UNIQUE_HANDLE_H
diff --git a/pxr/imaging/hd/points.cpp b/pxr/imaging/hd/points.cpp
index e1f575ee2c..a85eb69cd6 100644
--- a/pxr/imaging/hd/points.cpp
+++ b/pxr/imaging/hd/points.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/points.h"
diff --git a/pxr/imaging/hd/points.h b/pxr/imaging/hd/points.h
index 61bdb2d664..50b8b14bbf 100644
--- a/pxr/imaging/hd/points.h
+++ b/pxr/imaging/hd/points.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_POINTS_H
 #define PXR_IMAGING_HD_POINTS_H
diff --git a/pxr/imaging/hd/prefixingSceneIndex.cpp b/pxr/imaging/hd/prefixingSceneIndex.cpp
index 9a4224aef5..affe04a0cd 100644
--- a/pxr/imaging/hd/prefixingSceneIndex.cpp
+++ b/pxr/imaging/hd/prefixingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/prefixingSceneIndex.h"
diff --git a/pxr/imaging/hd/prefixingSceneIndex.h b/pxr/imaging/hd/prefixingSceneIndex.h
index 53d231618c..c0eae22004 100644
--- a/pxr/imaging/hd/prefixingSceneIndex.h
+++ b/pxr/imaging/hd/prefixingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_PREFIXING_SCENE_INDEX_H
 #define PXR_IMAGING_HD_PREFIXING_SCENE_INDEX_H
diff --git a/pxr/imaging/hd/primDataSourceOverlayCache.cpp b/pxr/imaging/hd/primDataSourceOverlayCache.cpp
index a9aed90323..517cb4234b 100644
--- a/pxr/imaging/hd/primDataSourceOverlayCache.cpp
+++ b/pxr/imaging/hd/primDataSourceOverlayCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "primDataSourceOverlayCache.h"
 
diff --git a/pxr/imaging/hd/primDataSourceOverlayCache.h b/pxr/imaging/hd/primDataSourceOverlayCache.h
index 12f737c53d..da36115170 100644
--- a/pxr/imaging/hd/primDataSourceOverlayCache.h
+++ b/pxr/imaging/hd/primDataSourceOverlayCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_PRIM_DATA_SOURCE_OVERLAY_CACHE_H
 #define PXR_IMAGING_HD_PRIM_DATA_SOURCE_OVERLAY_CACHE_H
diff --git a/pxr/imaging/hd/primGather.cpp b/pxr/imaging/hd/primGather.cpp
index dc3ab4b071..68a3c62c85 100644
--- a/pxr/imaging/hd/primGather.cpp
+++ b/pxr/imaging/hd/primGather.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/primGather.h"
diff --git a/pxr/imaging/hd/primGather.h b/pxr/imaging/hd/primGather.h
index 7d415f3e48..80b4a615cf 100644
--- a/pxr/imaging/hd/primGather.h
+++ b/pxr/imaging/hd/primGather.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_PRIM_GATHER_H
 #define PXR_IMAGING_HD_PRIM_GATHER_H
diff --git a/pxr/imaging/hd/primOriginSchema.cpp b/pxr/imaging/hd/primOriginSchema.cpp
index 238e59bcb3..e3730fc483 100644
--- a/pxr/imaging/hd/primOriginSchema.cpp
+++ b/pxr/imaging/hd/primOriginSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/primOriginSchema.h b/pxr/imaging/hd/primOriginSchema.h
index 0b72497f08..892935e859 100644
--- a/pxr/imaging/hd/primOriginSchema.h
+++ b/pxr/imaging/hd/primOriginSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/primTypeIndex.cpp b/pxr/imaging/hd/primTypeIndex.cpp
index ee4e113e36..79143ce28e 100644
--- a/pxr/imaging/hd/primTypeIndex.cpp
+++ b/pxr/imaging/hd/primTypeIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/primTypeIndex.h"
 #include "pxr/imaging/hd/bprim.h"
diff --git a/pxr/imaging/hd/primTypeIndex.h b/pxr/imaging/hd/primTypeIndex.h
index 4ebf9b3731..9f72435bcd 100644
--- a/pxr/imaging/hd/primTypeIndex.h
+++ b/pxr/imaging/hd/primTypeIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_PRIM_TYPE_INDEX_H
 #define PXR_IMAGING_HD_PRIM_TYPE_INDEX_H
diff --git a/pxr/imaging/hd/primvarSchema.cpp b/pxr/imaging/hd/primvarSchema.cpp
index 39c195eaa0..6461a79800 100644
--- a/pxr/imaging/hd/primvarSchema.cpp
+++ b/pxr/imaging/hd/primvarSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/primvarSchema.h b/pxr/imaging/hd/primvarSchema.h
index 95e76cf0e9..e059932bee 100644
--- a/pxr/imaging/hd/primvarSchema.h
+++ b/pxr/imaging/hd/primvarSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/primvarsSchema.cpp b/pxr/imaging/hd/primvarsSchema.cpp
index e2b38a0e5c..085ce7948b 100644
--- a/pxr/imaging/hd/primvarsSchema.cpp
+++ b/pxr/imaging/hd/primvarsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/primvarsSchema.h b/pxr/imaging/hd/primvarsSchema.h
index 5c60622652..680a9d1c67 100644
--- a/pxr/imaging/hd/primvarsSchema.h
+++ b/pxr/imaging/hd/primvarsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/purposeSchema.cpp b/pxr/imaging/hd/purposeSchema.cpp
index dbdb2ce4c7..e870046541 100644
--- a/pxr/imaging/hd/purposeSchema.cpp
+++ b/pxr/imaging/hd/purposeSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/purposeSchema.h b/pxr/imaging/hd/purposeSchema.h
index 191d9882a7..ce0feabccb 100644
--- a/pxr/imaging/hd/purposeSchema.h
+++ b/pxr/imaging/hd/purposeSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/renderBuffer.cpp b/pxr/imaging/hd/renderBuffer.cpp
index 06c1cb3b9f..8564a26874 100644
--- a/pxr/imaging/hd/renderBuffer.cpp
+++ b/pxr/imaging/hd/renderBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/renderBuffer.h"
 #include "pxr/imaging/hd/sceneDelegate.h"
diff --git a/pxr/imaging/hd/renderBuffer.h b/pxr/imaging/hd/renderBuffer.h
index ac10c04fa1..37f5e9ad33 100644
--- a/pxr/imaging/hd/renderBuffer.h
+++ b/pxr/imaging/hd/renderBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDER_BUFFER_H
 #define PXR_IMAGING_HD_RENDER_BUFFER_H
diff --git a/pxr/imaging/hd/renderBufferSchema.cpp b/pxr/imaging/hd/renderBufferSchema.cpp
index 46992a54f8..6b8e3e7e3d 100644
--- a/pxr/imaging/hd/renderBufferSchema.cpp
+++ b/pxr/imaging/hd/renderBufferSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/renderBufferSchema.h b/pxr/imaging/hd/renderBufferSchema.h
index cc4a1315b1..c355843223 100644
--- a/pxr/imaging/hd/renderBufferSchema.h
+++ b/pxr/imaging/hd/renderBufferSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/renderCapabilitiesSchema.cpp b/pxr/imaging/hd/renderCapabilitiesSchema.cpp
index 6818b0fc2d..fe9bc7e885 100644
--- a/pxr/imaging/hd/renderCapabilitiesSchema.cpp
+++ b/pxr/imaging/hd/renderCapabilitiesSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/renderCapabilitiesSchema.h b/pxr/imaging/hd/renderCapabilitiesSchema.h
index fcf8144bd3..7d41383b21 100644
--- a/pxr/imaging/hd/renderCapabilitiesSchema.h
+++ b/pxr/imaging/hd/renderCapabilitiesSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/renderDelegate.cpp b/pxr/imaging/hd/renderDelegate.cpp
index 5d6c33bbbd..c462135386 100644
--- a/pxr/imaging/hd/renderDelegate.cpp
+++ b/pxr/imaging/hd/renderDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/renderDelegate.h"
 #include "pxr/imaging/hd/renderPassState.h"
@@ -234,7 +217,7 @@ HdRenderDelegate::Pause()
 }
 
 bool HdRenderDelegate::IsParallelSyncEnabled(
-    TfToken primType) const
+    const TfToken &primType) const
 {
     if (primType == HdPrimTypeTokens->extComputation) {
         return true;
diff --git a/pxr/imaging/hd/renderDelegate.h b/pxr/imaging/hd/renderDelegate.h
index 8cb67733f4..7c3daac89c 100644
--- a/pxr/imaging/hd/renderDelegate.h
+++ b/pxr/imaging/hd/renderDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDER_DELEGATE_H
 #define PXR_IMAGING_HD_RENDER_DELEGATE_H
@@ -522,8 +505,10 @@ class HdRenderDelegate
     HD_API
     virtual void Update();
 
-    /// Whether or not multithreaded sync is enabled for the specified prim type.
-    bool IsParallelSyncEnabled(TfToken primType) const;
+    /// Whether or not multithreaded sync is enabled for the
+    /// specified prim type.
+    HD_API
+    virtual bool IsParallelSyncEnabled(const TfToken &primType) const;
 
 protected:
     /// This class must be derived from.
@@ -549,7 +534,7 @@ class HdRenderDelegate
 
 private:
 
-    friend class HdRendererPluginRegistry;
+    friend class HdRendererPlugin;
     ///
     /// Populated when instantiated via the HdRendererPluginRegistry and
     /// currently used to associate a renderer delegate instance with related
diff --git a/pxr/imaging/hd/renderIndex.cpp b/pxr/imaging/hd/renderIndex.cpp
index cfd0a4614b..bce04a0093 100644
--- a/pxr/imaging/hd/renderIndex.cpp
+++ b/pxr/imaging/hd/renderIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/renderIndex.h"
 
@@ -32,6 +15,7 @@
 #include "pxr/imaging/hd/enums.h"
 #include "pxr/imaging/hd/extComputation.h"
 #include "pxr/imaging/hd/instancer.h"
+#include "pxr/imaging/hd/legacyGeomSubsetSceneIndex.h"
 #include "pxr/imaging/hd/mesh.h"
 #include "pxr/imaging/hd/perfLog.h"
 #include "pxr/imaging/hd/points.h"
@@ -125,6 +109,9 @@ HdRenderIndex::HdRenderIndex(
             _emulationNoticeBatchingSceneIndex, SdfPath::AbsoluteRootPath());
 
         _terminalSceneIndex = _mergingSceneIndex;
+        
+        _terminalSceneIndex = HdLegacyGeomSubsetSceneIndex::New(
+            _terminalSceneIndex);
 
         _terminalSceneIndex =
             HdSceneIndexAdapterSceneDelegate::AppendDefaultSceneFilters(
@@ -540,12 +527,17 @@ HdRenderIndex::_Clear()
 
 void
 HdRenderIndex::_TrackDelegateTask(HdSceneDelegate* delegate,
-                                    SdfPath const& taskId,
-                                    HdTaskSharedPtr const& task)
+                                  SdfPath const& taskId,
+                                  HdTaskCreateFnc taskCreateFnc)
 {
+    HD_TRACE_FUNCTION();
+    HF_MALLOC_TAG_FUNCTION();
+
     if (taskId == SdfPath()) {
         return;
     }
+
+    HdTaskSharedPtr task = taskCreateFnc(delegate, taskId);
     _tracker.TaskInserted(taskId, task->GetInitialDirtyBitsMask());
     _taskMap.emplace(taskId, _TaskInfo{delegate, task});
 }
diff --git a/pxr/imaging/hd/renderIndex.h b/pxr/imaging/hd/renderIndex.h
index c3fe916bed..320b38c340 100644
--- a/pxr/imaging/hd/renderIndex.h
+++ b/pxr/imaging/hd/renderIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDER_INDEX_H
 #define PXR_IMAGING_HD_RENDER_INDEX_H
@@ -441,13 +424,16 @@ class HdRenderIndex final
     // Allocate the next available instance id to the prim
     void _AllocatePrimId(HdRprim* prim);
 
+    using HdTaskCreateFnc =
+            std::function<HdTaskSharedPtr(HdSceneDelegate*, SdfPath const&)>;
+
     // Inserts the task into the index and updates tracking state.
     // _TrackDelegateTask is called by the inlined InsertTask<T>, so it needs
     // to be marked HD_API.
     HD_API
     void _TrackDelegateTask(HdSceneDelegate* delegate, 
                             SdfPath const& taskId,
-                            HdTaskSharedPtr const& task);
+                            HdTaskCreateFnc taskCreateFnc);
 
     template <typename T>
     static inline const TfToken & _GetTypeId();
@@ -593,11 +579,12 @@ template <typename T>
 void
 HdRenderIndex::InsertTask(HdSceneDelegate* delegate, SdfPath const& id)
 {
-    HD_TRACE_FUNCTION();
-    HF_MALLOC_TAG_FUNCTION();
+    auto createTask = [](HdSceneDelegate* _delegate, SdfPath const& _id) -> HdTaskSharedPtr
+    {
+        return std::make_shared<T>(_delegate, _id);
+    };
 
-    HdTaskSharedPtr task = std::make_shared<T>(delegate, id);
-    _TrackDelegateTask(delegate, id, task);
+    _TrackDelegateTask(delegate, id, createTask);
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hd/renderPass.cpp b/pxr/imaging/hd/renderPass.cpp
index 59389d8032..820e6ac6fa 100644
--- a/pxr/imaging/hd/renderPass.cpp
+++ b/pxr/imaging/hd/renderPass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/renderPass.h"
 
diff --git a/pxr/imaging/hd/renderPass.h b/pxr/imaging/hd/renderPass.h
index b900b062d1..18ffcb1b7b 100644
--- a/pxr/imaging/hd/renderPass.h
+++ b/pxr/imaging/hd/renderPass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDER_PASS_H
 #define PXR_IMAGING_HD_RENDER_PASS_H
diff --git a/pxr/imaging/hd/renderPassSchema.cpp b/pxr/imaging/hd/renderPassSchema.cpp
new file mode 100644
index 0000000000..e33159ee7e
--- /dev/null
+++ b/pxr/imaging/hd/renderPassSchema.cpp
@@ -0,0 +1,145 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "pxr/imaging/hd/renderPassSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdRenderPassSchemaTokens,
+    HD_RENDER_PASS_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdTokenDataSourceHandle
+HdRenderPassSchema::GetPassType() const
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdRenderPassSchemaTokens->passType);
+}
+
+HdPathDataSourceHandle
+HdRenderPassSchema::GetRenderSource() const
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdRenderPassSchemaTokens->renderSource);
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdRenderPassSchema::BuildRetained(
+        const HdTokenDataSourceHandle &passType,
+        const HdPathDataSourceHandle &renderSource
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (passType) {
+        _names[_count] = HdRenderPassSchemaTokens->passType;
+        _values[_count++] = passType;
+    }
+
+    if (renderSource) {
+        _names[_count] = HdRenderPassSchemaTokens->renderSource;
+        _values[_count++] = renderSource;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdRenderPassSchema::Builder &
+HdRenderPassSchema::Builder::SetPassType(
+    const HdTokenDataSourceHandle &passType)
+{
+    _passType = passType;
+    return *this;
+}
+
+HdRenderPassSchema::Builder &
+HdRenderPassSchema::Builder::SetRenderSource(
+    const HdPathDataSourceHandle &renderSource)
+{
+    _renderSource = renderSource;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdRenderPassSchema::Builder::Build()
+{
+    return HdRenderPassSchema::BuildRetained(
+        _passType,
+        _renderSource
+    );
+}
+
+/*static*/
+HdRenderPassSchema
+HdRenderPassSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdRenderPassSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdRenderPassSchemaTokens->renderPass))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdRenderPassSchema::GetSchemaToken()
+{
+    return HdRenderPassSchemaTokens->renderPass;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdRenderPassSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdRenderPassSchema::GetPassTypeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdRenderPassSchemaTokens->passType);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdRenderPassSchema::GetRenderSourceLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdRenderPassSchemaTokens->renderSource);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/pxr/imaging/hd/renderPassSchema.h b/pxr/imaging/hd/renderPassSchema.h
new file mode 100644
index 0000000000..3bb201fc90
--- /dev/null
+++ b/pxr/imaging/hd/renderPassSchema.h
@@ -0,0 +1,162 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef PXR_IMAGING_HD_RENDER_PASS_SCHEMA_H
+#define PXR_IMAGING_HD_RENDER_PASS_SCHEMA_H
+
+/// \file
+
+#include "pxr/imaging/hd/api.h"
+#include "pxr/imaging/hd/schemaTypeDefs.h"
+
+#include "pxr/imaging/hd/schema.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_RENDER_PASS_SCHEMA_TOKENS \
+    (renderPass) \
+    (passType) \
+    (renderSource) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdRenderPassSchemaTokens, HD_API,
+    HD_RENDER_PASS_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdRenderPassSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdRenderPassSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "renderPass" from the parent container and constructs a
+    /// HdRenderPassSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HD_API
+    static HdRenderPassSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HD_API
+    HdTokenDataSourceHandle GetPassType() const;
+
+    HD_API
+    HdPathDataSourceHandle GetRenderSource() const; 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HD_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HD_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate passType.
+    HD_API
+    static const HdDataSourceLocator &GetPassTypeLocator();
+
+    /// Prim-level relative data source locator to locate renderSource.
+    HD_API
+    static const HdDataSourceLocator &GetRenderSourceLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HD_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdTokenDataSourceHandle &passType,
+        const HdPathDataSourceHandle &renderSource
+    );
+
+    /// \class HdRenderPassSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HD_API
+        Builder &SetPassType(
+            const HdTokenDataSourceHandle &passType);
+        HD_API
+        Builder &SetRenderSource(
+            const HdPathDataSourceHandle &renderSource);
+
+        /// Returns a container data source containing the members set thus far.
+        HD_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdTokenDataSourceHandle _passType;
+        HdPathDataSourceHandle _renderSource;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/pxr/imaging/hd/renderPassState.cpp b/pxr/imaging/hd/renderPassState.cpp
index 5130c6a1b6..6809597717 100644
--- a/pxr/imaging/hd/renderPassState.cpp
+++ b/pxr/imaging/hd/renderPassState.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/renderPassState.h"
 
diff --git a/pxr/imaging/hd/renderPassState.h b/pxr/imaging/hd/renderPassState.h
index 40b621c697..5b6e6025dc 100644
--- a/pxr/imaging/hd/renderPassState.h
+++ b/pxr/imaging/hd/renderPassState.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDER_PASS_STATE_H
 #define PXR_IMAGING_HD_RENDER_PASS_STATE_H
diff --git a/pxr/imaging/hd/renderProductSchema.cpp b/pxr/imaging/hd/renderProductSchema.cpp
index 5c5a6c9221..d2fa0df5c4 100644
--- a/pxr/imaging/hd/renderProductSchema.cpp
+++ b/pxr/imaging/hd/renderProductSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/renderProductSchema.h b/pxr/imaging/hd/renderProductSchema.h
index 6bc0cb6c80..b79df93d5a 100644
--- a/pxr/imaging/hd/renderProductSchema.h
+++ b/pxr/imaging/hd/renderProductSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/renderSettings.cpp b/pxr/imaging/hd/renderSettings.cpp
index 2622627810..e1e4e4acf1 100644
--- a/pxr/imaging/hd/renderSettings.cpp
+++ b/pxr/imaging/hd/renderSettings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/renderSettings.h"
 
diff --git a/pxr/imaging/hd/renderSettings.h b/pxr/imaging/hd/renderSettings.h
index 5d87fcfae3..784b01a25a 100644
--- a/pxr/imaging/hd/renderSettings.h
+++ b/pxr/imaging/hd/renderSettings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDER_SETTINGS_H
 #define PXR_IMAGING_HD_RENDER_SETTINGS_H
@@ -77,6 +60,7 @@ class HdRenderSettings : public HdBprim
         DirtyMaterialBindingPurposes = 1 << 5,
         DirtyRenderingColorSpace     = 1 << 6,
         DirtyShutterInterval         = 1 << 7,
+        DirtyFrameNumber             = 1 << 8,
         AllDirty                     =    DirtyActive
                                         | DirtyNamespacedSettings
                                         | DirtyRenderProducts
@@ -84,6 +68,7 @@ class HdRenderSettings : public HdBprim
                                         | DirtyMaterialBindingPurposes
                                         | DirtyRenderingColorSpace
                                         | DirtyShutterInterval
+                                        | DirtyFrameNumber
     };
 
     // Parameters that may be queried and invalidated.
diff --git a/pxr/imaging/hd/renderSettingsSchema.cpp b/pxr/imaging/hd/renderSettingsSchema.cpp
index 07d06baf96..51e136bc94 100644
--- a/pxr/imaging/hd/renderSettingsSchema.cpp
+++ b/pxr/imaging/hd/renderSettingsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -47,6 +30,21 @@ TF_DEFINE_PUBLIC_TOKENS(HdRenderSettingsSchemaTokens,
     HD_RENDER_SETTINGS_SCHEMA_TOKENS);
 
 // --(BEGIN CUSTOM CODE: Schema Methods)--
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (frame)
+);
+
+/* static */
+const HdDataSourceLocator &
+HdRenderSettingsSchema::GetFrameLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(_tokens->frame);
+    return locator;
+}
+
 // --(END CUSTOM CODE: Schema Methods)--
 
 HdContainerDataSourceHandle
diff --git a/pxr/imaging/hd/renderSettingsSchema.h b/pxr/imaging/hd/renderSettingsSchema.h
index e98c09f207..00c55c9e59 100644
--- a/pxr/imaging/hd/renderSettingsSchema.h
+++ b/pxr/imaging/hd/renderSettingsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -90,6 +73,12 @@ class HdRenderSettingsSchema : public HdSchema
     /// @}
 
 // --(BEGIN CUSTOM CODE: Schema Methods)--
+
+    /// This locator is to pass along dirtying of the currentFrame locator 
+    /// on the Scene Globals Scene Index through the render Settings prim. 
+    HD_API
+    static const HdDataSourceLocator &GetFrameLocator();
+
 // --(END CUSTOM CODE: Schema Methods)--
 
     /// \name Member accessor
diff --git a/pxr/imaging/hd/renderThread.cpp b/pxr/imaging/hd/renderThread.cpp
index 92c6b7669e..a0df7c3276 100644
--- a/pxr/imaging/hd/renderThread.cpp
+++ b/pxr/imaging/hd/renderThread.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/renderThread.h"
 #include "pxr/base/tf/diagnostic.h"
diff --git a/pxr/imaging/hd/renderThread.h b/pxr/imaging/hd/renderThread.h
index 4da29dfa59..4fdece5570 100644
--- a/pxr/imaging/hd/renderThread.h
+++ b/pxr/imaging/hd/renderThread.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDER_THREAD_H
 #define PXR_IMAGING_HD_RENDER_THREAD_H
diff --git a/pxr/imaging/hd/renderVarSchema.cpp b/pxr/imaging/hd/renderVarSchema.cpp
index 5ee298a69b..170ddeda56 100644
--- a/pxr/imaging/hd/renderVarSchema.cpp
+++ b/pxr/imaging/hd/renderVarSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/renderVarSchema.h b/pxr/imaging/hd/renderVarSchema.h
index b92ce8e3c8..7c60d7f942 100644
--- a/pxr/imaging/hd/renderVarSchema.h
+++ b/pxr/imaging/hd/renderVarSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/rendererPlugin.cpp b/pxr/imaging/hd/rendererPlugin.cpp
index d446a4d5f2..65f3ad2b68 100644
--- a/pxr/imaging/hd/rendererPlugin.cpp
+++ b/pxr/imaging/hd/rendererPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/rendererPlugin.h"
 
@@ -66,9 +49,29 @@ HdRendererPlugin::CreateDelegate(HdRenderSettingsMap const& settingsMap)
 
     HdRendererPluginRegistry::GetInstance().AddPluginReference(this);
 
-    return HdPluginRenderDelegateUniqueHandle(
-        HdRendererPluginHandle(this),
-        CreateRenderDelegate(settingsMap));
+    HdPluginRenderDelegateUniqueHandle result =
+        HdPluginRenderDelegateUniqueHandle(
+            HdRendererPluginHandle(this),
+            CreateRenderDelegate(settingsMap));
+
+    if (TfDebug::IsEnabled(HD_RENDERER_PLUGIN)) {
+        std::stringstream ss;
+        for (const auto& pair : settingsMap) {
+            ss << "\t" << pair.first << ": " << pair.second << "\n";
+        }
+        TF_DEBUG(HD_RENDERER_PLUGIN).Msg(
+            "%s instance of renderer plugin '%s' with settings map:\n%s",
+            result ? "Created" : "Failed to create",
+            GetPluginId().GetText(), ss.str().c_str());
+    }
+
+    // provide render delegate instance with display name to facilitate
+    // association of this renderer to other code and resources
+    if (result) {
+        result->_SetRendererDisplayName(GetDisplayName());
+    }
+
+    return result;
 }
 
 TfToken
@@ -77,5 +80,23 @@ HdRendererPlugin::GetPluginId() const
     return HdRendererPluginRegistry::GetInstance().GetPluginId(this);
 }
 
+std::string
+HdRendererPlugin::GetDisplayName() const
+{
+    TfToken pluginId =
+        HdRendererPluginRegistry::GetInstance().GetPluginId(this);
+    HfPluginDesc desc;
+    if (!HdRendererPluginRegistry::GetInstance()
+            .GetPluginDesc(pluginId, &desc)) {
+        // Note, this is unlikely since if pluginId were illegal, this class
+        // would not have been instantiated...
+        TF_CODING_ERROR("Unable to get display name for '%s'",
+                pluginId.GetText());
+        return std::string();
+    }
+
+    return desc.displayName;
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
 
diff --git a/pxr/imaging/hd/rendererPlugin.h b/pxr/imaging/hd/rendererPlugin.h
index 6e83b4e8d0..d0e5876927 100644
--- a/pxr/imaging/hd/rendererPlugin.h
+++ b/pxr/imaging/hd/rendererPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDERER_PLUGIN_H
 #define PXR_IMAGING_HD_RENDERER_PLUGIN_H
@@ -64,6 +47,12 @@ class HdRendererPlugin : public HfPluginBase {
     HD_API
     TfToken GetPluginId() const;
 
+    ///
+    /// Look-up display name in plugin registry.
+    ///
+    HD_API
+    std::string GetDisplayName() const;
+
     ///
     /// Clients should use CreateDelegate since this method
     /// will eventually become protected, use CreateRenderDelegateHandle
diff --git a/pxr/imaging/hd/rendererPluginHandle.cpp b/pxr/imaging/hd/rendererPluginHandle.cpp
index c49e076c35..6a7cdf92b4 100644
--- a/pxr/imaging/hd/rendererPluginHandle.cpp
+++ b/pxr/imaging/hd/rendererPluginHandle.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/rendererPluginHandle.h"
diff --git a/pxr/imaging/hd/rendererPluginHandle.h b/pxr/imaging/hd/rendererPluginHandle.h
index 5c552e7d5f..3679662c0a 100644
--- a/pxr/imaging/hd/rendererPluginHandle.h
+++ b/pxr/imaging/hd/rendererPluginHandle.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDERER_PLUGIN_HANDLE_H
 #define PXR_IMAGING_HD_RENDERER_PLUGIN_HANDLE_H
diff --git a/pxr/imaging/hd/rendererPluginRegistry.cpp b/pxr/imaging/hd/rendererPluginRegistry.cpp
index 41bc0c1097..b93f70aa64 100644
--- a/pxr/imaging/hd/rendererPluginRegistry.cpp
+++ b/pxr/imaging/hd/rendererPluginRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/rendererPluginRegistry.h"
 #include "pxr/imaging/hd/rendererPlugin.h"
@@ -69,12 +52,19 @@ HdRendererPluginRegistry::GetDefaultPluginId(bool gpuEnabled)
         // expensive.
         if (plugin && plugin->IsSupported(gpuEnabled)) {
             HdRendererPluginRegistry::GetInstance().ReleasePlugin(plugin);
+
+            TF_DEBUG(HD_RENDERER_PLUGIN).Msg(
+                "Default renderer plugin (gpu: %s): %s\n",
+                gpuEnabled ? "y" : "n", desc.id.GetText());
             return desc.id;
         }
 
         HdRendererPluginRegistry::GetInstance().ReleasePlugin(plugin);
     }
 
+    TF_DEBUG(HD_RENDERER_PLUGIN).Msg(
+        "Default renderer plugin (gpu: %s): none\n",
+        gpuEnabled ? "y" : "n");
     return TfToken();
 }
 
@@ -87,7 +77,8 @@ HdRendererPluginRegistry::GetRendererPlugin(const TfToken &pluginId)
 HdRendererPluginHandle
 HdRendererPluginRegistry::GetOrCreateRendererPlugin(const TfToken &pluginId)
 {
-    return HdRendererPluginHandle(GetRendererPlugin(pluginId));
+    return HdRendererPluginHandle(
+            static_cast<HdRendererPlugin*>(GetPlugin(pluginId)));
 }
 
 HdPluginRenderDelegateUniqueHandle
@@ -104,17 +95,17 @@ HdRendererPluginRegistry::CreateRenderDelegate(
     HdPluginRenderDelegateUniqueHandle result =
         plugin->CreateDelegate(settingsMap);
 
-    if (result) {
-        HfPluginDesc desc;
-        if (GetPluginDesc(pluginId, &desc)) {
-            // provide render delegate instance with display name to facilitate
-            // association of this renderer to other code and resources
-            result->_SetRendererDisplayName(desc.displayName);
-        }
-    }
-
     return result;
 }
 
+void
+HdRendererPluginRegistry::_CollectAdditionalMetadata(
+    const PlugRegistry &plugRegistry, const TfType &pluginType)
+{
+    TF_DEBUG(HD_RENDERER_PLUGIN).Msg(
+        "Renderer plugin discovery: %s\n",
+        pluginType.GetTypeName().c_str());
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
 
diff --git a/pxr/imaging/hd/rendererPluginRegistry.h b/pxr/imaging/hd/rendererPluginRegistry.h
index b49f33a62e..c1184a96c1 100644
--- a/pxr/imaging/hd/rendererPluginRegistry.h
+++ b/pxr/imaging/hd/rendererPluginRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RENDERER_PLUGIN_REGISTRY_H
 #define PXR_IMAGING_HD_RENDERER_PLUGIN_REGISTRY_H
@@ -95,6 +78,9 @@ class HdRendererPluginRegistry final  : public HfPluginRegistry
     // Friend required by TfSingleton to access constructor (as it is private).
     friend class TfSingleton<HdRendererPluginRegistry>;
 
+    void _CollectAdditionalMetadata(
+        const PlugRegistry &plugRegistry, const TfType &pluginType) override;
+
     // Singleton gets private constructed
     HdRendererPluginRegistry();
     ~HdRendererPluginRegistry() override;
diff --git a/pxr/imaging/hd/repr.cpp b/pxr/imaging/hd/repr.cpp
index 7c3e0e9acb..432551be78 100644
--- a/pxr/imaging/hd/repr.cpp
+++ b/pxr/imaging/hd/repr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/repr.h"
 #include "pxr/base/tf/hash.h"
diff --git a/pxr/imaging/hd/repr.h b/pxr/imaging/hd/repr.h
index 84102fb520..d4ac44f447 100644
--- a/pxr/imaging/hd/repr.h
+++ b/pxr/imaging/hd/repr.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_REPR_H
 #define PXR_IMAGING_HD_REPR_H
diff --git a/pxr/imaging/hd/resourceRegistry.cpp b/pxr/imaging/hd/resourceRegistry.cpp
index 17021f01d8..536d0fe1f8 100644
--- a/pxr/imaging/hd/resourceRegistry.cpp
+++ b/pxr/imaging/hd/resourceRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/resourceRegistry.h"
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hd/resourceRegistry.h b/pxr/imaging/hd/resourceRegistry.h
index c330fbd5ac..8cebd0aec0 100644
--- a/pxr/imaging/hd/resourceRegistry.h
+++ b/pxr/imaging/hd/resourceRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RESOURCE_REGISTRY_H
 #define PXR_IMAGING_HD_RESOURCE_REGISTRY_H
diff --git a/pxr/imaging/hd/retainedDataSource.cpp b/pxr/imaging/hd/retainedDataSource.cpp
index 176926978e..6a3c7b122b 100644
--- a/pxr/imaging/hd/retainedDataSource.cpp
+++ b/pxr/imaging/hd/retainedDataSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/retainedDataSource.h"
 
@@ -387,6 +370,9 @@ struct Hd_CreateTypedRetainedDataSourceVisitor
         } else if (v.IsHolding<SdfPathVector>()) {
             return HdRetainedTypedSampledDataSource<SdfPathVector>::New(
                 v.UncheckedGet<SdfPathVector>());
+        } else if (v.IsHolding<SdfPathExpression>()) {
+            return HdRetainedTypedSampledDataSource<SdfPathExpression>::New(
+                v.UncheckedGet<SdfPathExpression>());
         } else if (v.IsEmpty()) {
             return HdSampledDataSourceHandle(nullptr);
         } else {
diff --git a/pxr/imaging/hd/retainedDataSource.h b/pxr/imaging/hd/retainedDataSource.h
index d39cf2273a..6eb54aefb9 100644
--- a/pxr/imaging/hd/retainedDataSource.h
+++ b/pxr/imaging/hd/retainedDataSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RETAINEDDATASOURCE_H
 #define PXR_IMAGING_HD_RETAINEDDATASOURCE_H
@@ -29,6 +12,8 @@
 #include "pxr/imaging/hd/api.h"
 #include "pxr/imaging/hd/dataSource.h"
 
+#include "pxr/usd/sdf/pathExpression.h"
+
 #include "pxr/base/tf/smallVector.h"
 #include "pxr/base/tf/denseHashMap.h"
 
diff --git a/pxr/imaging/hd/retainedSceneIndex.cpp b/pxr/imaging/hd/retainedSceneIndex.cpp
index 4ed8f84cbb..d92da1cda6 100644
--- a/pxr/imaging/hd/retainedSceneIndex.cpp
+++ b/pxr/imaging/hd/retainedSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/retainedSceneIndex.h"
 #include "pxr/base/trace/trace.h"
diff --git a/pxr/imaging/hd/retainedSceneIndex.h b/pxr/imaging/hd/retainedSceneIndex.h
index befc52adad..5ff8a5ad26 100644
--- a/pxr/imaging/hd/retainedSceneIndex.h
+++ b/pxr/imaging/hd/retainedSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RETAINED_SCENE_INDEX_H
 #define PXR_IMAGING_HD_RETAINED_SCENE_INDEX_H
diff --git a/pxr/imaging/hd/rprim.cpp b/pxr/imaging/hd/rprim.cpp
index fedce1f8c5..225d4d73d0 100644
--- a/pxr/imaging/hd/rprim.cpp
+++ b/pxr/imaging/hd/rprim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/rprim.h"
 
diff --git a/pxr/imaging/hd/rprim.h b/pxr/imaging/hd/rprim.h
index 8f1bc354e3..a1f60b765b 100644
--- a/pxr/imaging/hd/rprim.h
+++ b/pxr/imaging/hd/rprim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RPRIM_H
 #define PXR_IMAGING_HD_RPRIM_H
diff --git a/pxr/imaging/hd/rprimCollection.cpp b/pxr/imaging/hd/rprimCollection.cpp
index 4042a04ff6..f5c5d11904 100644
--- a/pxr/imaging/hd/rprimCollection.cpp
+++ b/pxr/imaging/hd/rprimCollection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/rprimCollection.h"
 
diff --git a/pxr/imaging/hd/rprimCollection.h b/pxr/imaging/hd/rprimCollection.h
index 8feaf54a76..72da4e4a9b 100644
--- a/pxr/imaging/hd/rprimCollection.h
+++ b/pxr/imaging/hd/rprimCollection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RPRIM_COLLECTION_H
 #define PXR_IMAGING_HD_RPRIM_COLLECTION_H
diff --git a/pxr/imaging/hd/rprimSharedData.cpp b/pxr/imaging/hd/rprimSharedData.cpp
index 1e6f502d2d..b8722fcc73 100644
--- a/pxr/imaging/hd/rprimSharedData.cpp
+++ b/pxr/imaging/hd/rprimSharedData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/rprimSharedData.h"
 
diff --git a/pxr/imaging/hd/rprimSharedData.h b/pxr/imaging/hd/rprimSharedData.h
index 1b2e9fe85b..65d512f571 100644
--- a/pxr/imaging/hd/rprimSharedData.h
+++ b/pxr/imaging/hd/rprimSharedData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_RPRIM_SHARED_DATA_H
 #define PXR_IMAGING_HD_RPRIM_SHARED_DATA_H
diff --git a/pxr/imaging/hd/sampleFilterSchema.cpp b/pxr/imaging/hd/sampleFilterSchema.cpp
index f1dbb6e5c4..86b28ba451 100644
--- a/pxr/imaging/hd/sampleFilterSchema.cpp
+++ b/pxr/imaging/hd/sampleFilterSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/sampleFilterSchema.h b/pxr/imaging/hd/sampleFilterSchema.h
index bb48eeb421..4767fd99d0 100644
--- a/pxr/imaging/hd/sampleFilterSchema.h
+++ b/pxr/imaging/hd/sampleFilterSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/sceneDelegate.cpp b/pxr/imaging/hd/sceneDelegate.cpp
index ed8067f045..67d70b51c2 100644
--- a/pxr/imaging/hd/sceneDelegate.cpp
+++ b/pxr/imaging/hd/sceneDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sceneDelegate.h"
 
@@ -46,9 +29,7 @@ HdSceneDelegate::HdSceneDelegate(HdRenderIndex *parentIndex,
     }
 }
 
-HdSceneDelegate::~HdSceneDelegate()
-{
-}
+HdSceneDelegate::~HdSceneDelegate() = default;
 
 /*virtual*/
 void
@@ -134,6 +115,18 @@ HdSceneDelegate::SampleTransform(SdfPath const & id,
     return 0;
 }
 
+/*virtual*/
+size_t
+HdSceneDelegate::SampleTransform(SdfPath const & id,
+                                 float startTime,
+                                 float endTime,
+                                 size_t maxSampleCount,
+                                 float *sampleTimes,
+                                 GfMatrix4d *sampleValues)
+{
+    return SampleTransform(id, maxSampleCount, sampleTimes, sampleValues);
+}
+
 /*virtual*/
 bool
 HdSceneDelegate::GetVisible(SdfPath const & id)
@@ -206,7 +199,20 @@ HdSceneDelegate::SamplePrimvar(SdfPath const& id,
 
 /*virtual*/
 size_t
-HdSceneDelegate::SampleIndexedPrimvar(SdfPath const& id, 
+HdSceneDelegate::SamplePrimvar(SdfPath const& id, 
+                               TfToken const& key,
+                               float startTime,
+                               float endTime,
+                               size_t maxSampleCount,
+                               float *sampleTimes,
+                               VtValue *sampleValues)
+{
+    return SamplePrimvar(id, key, maxSampleCount, sampleTimes, sampleValues);
+}
+
+/*virtual*/
+size_t
+HdSceneDelegate::SampleIndexedPrimvar(SdfPath const& id,
                                TfToken const& key,
                                size_t maxSampleCount,
                                float *sampleTimes,
@@ -221,6 +227,23 @@ HdSceneDelegate::SampleIndexedPrimvar(SdfPath const& id,
     return 0;
 }
 
+/*virtual*/
+size_t
+HdSceneDelegate::SampleIndexedPrimvar(SdfPath const& id, 
+                               TfToken const& key,
+                               float startTime,
+                               float endTime,
+                               size_t maxSampleCount,
+                               float *sampleTimes,
+                               VtValue *sampleValues,
+                               VtIntArray *sampleIndices)
+{
+    return
+        SampleIndexedPrimvar(
+            id, key, maxSampleCount,
+            sampleTimes, sampleValues, sampleIndices);
+}
+
 /*virtual*/
 HdReprSelector
 HdSceneDelegate::GetReprSelector(SdfPath const &id)
@@ -301,6 +324,19 @@ HdSceneDelegate::SampleInstancerTransform(SdfPath const &instancerId,
     return 0;
 }
 
+/*virtual*/
+size_t
+HdSceneDelegate::SampleInstancerTransform(SdfPath const &instancerId,
+                                          float startTime,
+                                          float endTime,
+                                          size_t maxSampleCount,
+                                          float *sampleTimes,
+                                          GfMatrix4d *sampleValues)
+{
+    return SampleInstancerTransform(
+        instancerId, maxSampleCount, sampleTimes, sampleValues);
+}
+
 /*virtual*/
 SdfPath
 HdSceneDelegate::GetScenePrimPath(SdfPath const& rprimId,
@@ -465,6 +501,21 @@ HdSceneDelegate::SampleExtComputationInput(SdfPath const& computationId,
     return 0;
 }
 
+/*virtual*/
+size_t
+HdSceneDelegate::SampleExtComputationInput(SdfPath const& computationId,
+                                           TfToken const& input,
+                                           float startTime,
+                                           float endTime,
+                                           size_t maxSampleCount,
+                                           float *sampleTimes,
+                                           VtValue *sampleValues)
+{
+    return
+        SampleExtComputationInput(
+            computationId, input, maxSampleCount, sampleTimes, sampleValues);
+}
+
 /*virtual*/
 std::string
 HdSceneDelegate::GetExtComputationKernel(SdfPath const& id)
diff --git a/pxr/imaging/hd/sceneDelegate.h b/pxr/imaging/hd/sceneDelegate.h
index 77aa5cf41c..0b7475a9f9 100644
--- a/pxr/imaging/hd/sceneDelegate.h
+++ b/pxr/imaging/hd/sceneDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SCENE_DELEGATE_H
 #define PXR_IMAGING_HD_SCENE_DELEGATE_H
@@ -119,7 +102,7 @@ struct HdDisplayStyle {
     /// \param refineLevel_ the refine level to display.
     ///        Valid range is [0, 8].
     /// \param flatShading enables flat shading, defaults to false.
-    /// \param displacement enables displacement shading, defaults to false.
+    /// \param displacement enables displacement shading, defaults to true.
     /// \param occludedSelectionShowsThrough controls whether the prim lets
     ///        occluded selection show through it, defaults to false.
     /// \param pointsShadingEnabled controls whether the prim's points 
@@ -553,29 +536,35 @@ class HdSceneDelegate {
                     float *sampleTimes, 
                     GfMatrix4d *sampleValues);
 
+    // An overload of SampleTransform that explicitly takes the startTime
+    // and endTime rather than relying on the scene delegate having state
+    // about what the source of the current shutter interval should be.
+    HD_API
+    virtual size_t
+    SampleTransform(SdfPath const & id,
+                    float startTime,
+                    float endTime,
+                    size_t maxSampleCount,
+                    float *sampleTimes,
+                    GfMatrix4d *sampleValues);
+
     /// Convenience form of SampleTransform() that takes an HdTimeSampleArray.
     /// This function returns the union of the authored transform samples 
     /// and the boundaries of the current camera shutter interval.
     template <unsigned int CAPACITY>
-    void 
+    void
     SampleTransform(SdfPath const & id,
-                    HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa) {
-        size_t authoredSamples = 
-            SampleTransform(id, CAPACITY, sa->times.data(), sa->values.data());
-        if (authoredSamples > CAPACITY) {
-            sa->Resize(authoredSamples);
-            size_t authoredSamplesSecondAttempt = 
-                SampleTransform(
-                    id, 
-                    authoredSamples, 
-                    sa->times.data(), 
-                    sa->values.data());
-            // Number of samples should be consisntent through multiple
-            // invokations of the sampling function.
-            TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
-        }
-        sa->count = authoredSamples;
-    }
+                    HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa);
+
+    /// Convenience form of SampleTransform() that takes an HdTimeSampleArray.
+    /// This function returns the union of the authored transform samples 
+    /// and the boundaries of the current camera shutter interval.
+    template <unsigned int CAPACITY>
+    void
+    SampleTransform(SdfPath const & id,
+                    float startTime,
+                    float endTime,
+                    HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa);
 
     /// Store up to \a maxSampleCount transform samples in \a *sampleValues.
     /// Returns the union of the authored samples and the boundaries 
@@ -591,6 +580,19 @@ class HdSceneDelegate {
                              float *sampleTimes,
                              GfMatrix4d *sampleValues);
 
+    // An overload of SampleInstancerTransform that explicitly takes the
+    // startTime and endTime rather than relying on the scene delegate
+    // having state about what the source of the current shutter interval
+    // should be.
+    HD_API
+    virtual size_t
+    SampleInstancerTransform(SdfPath const &instancerId,
+                             float startTime,
+                             float endTime,
+                             size_t maxSampleCount, 
+                             float *sampleTimes,
+                             GfMatrix4d *sampleValues);
+
     /// Convenience form of SampleInstancerTransform()
     /// that takes an HdTimeSampleArray.
     /// This function returns the union of the authored samples 
@@ -598,27 +600,17 @@ class HdSceneDelegate {
     template <unsigned int CAPACITY>
     void
     SampleInstancerTransform(SdfPath const &instancerId,
-                             HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa) {
-        size_t authoredSamples = 
-            SampleInstancerTransform(
-                instancerId, 
-                CAPACITY, 
-                sa->times.data(), 
-                sa->values.data());
-        if (authoredSamples > CAPACITY) {
-            sa->Resize(authoredSamples);
-            size_t authoredSamplesSecondAttempt = 
-                SampleInstancerTransform(
-                    instancerId, 
-                    authoredSamples, 
-                    sa->times.data(), 
-                    sa->values.data());
-            // Number of samples should be consisntent through multiple
-            // invokations of the sampling function.
-            TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
-        }
-        sa->count = authoredSamples;
-    }
+                             HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa);
+
+    /// Convenience form of SampleInstancerTransform()
+    /// that takes an HdTimeSampleArray.
+    /// This function returns the union of the authored samples 
+    /// and the boundaries of the current camera shutter interval.
+    template <unsigned int CAPACITY>
+    void
+    SampleInstancerTransform(SdfPath const &instancerId,
+                             float startTime, float endTime,
+                             HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa);
 
     /// Store up to \a maxSampleCount primvar samples in \a *samplesValues.
     /// Returns the union of the authored samples and the boundaries 
@@ -645,6 +637,19 @@ class HdSceneDelegate {
                   float *sampleTimes, 
                   VtValue *sampleValues);
 
+    // An overload of SamplePrimvar that explicitly takes the startTime
+    // and endTime rather than relying on the scene delegate having state
+    // about what the source of the current shutter interval should be.
+    HD_API
+    virtual size_t
+    SamplePrimvar(SdfPath const& id, 
+                  TfToken const& key,
+                  float startTime,
+                  float endTime,
+                  size_t maxSampleCount, 
+                  float *sampleTimes, 
+                  VtValue *sampleValues);
+
     /// Convenience form of SamplePrimvar() that takes an HdTimeSampleArray.
     /// This function returns the union of the authored samples 
     /// and the boundaries of the current camera shutter interval.
@@ -654,6 +659,17 @@ class HdSceneDelegate {
                   TfToken const& key,
                   HdTimeSampleArray<VtValue, CAPACITY> *sa);
 
+    /// Convenience form of SamplePrimvar() that takes an HdTimeSampleArray.
+    /// This function returns the union of the authored samples 
+    /// and the boundaries of the current camera shutter interval.
+    template <unsigned int CAPACITY>
+    void 
+    SamplePrimvar(SdfPath const &id, 
+                  TfToken const& key,
+                  float startTime,
+                  float endTime,
+                  HdTimeSampleArray<VtValue, CAPACITY> *sa);
+    
     /// SamplePrimvar() for getting an unflattened primvar and its indices. If 
     /// \a *sampleIndices is not nullptr and the primvar has indices, it will 
     /// return unflattened primvar samples in \a *sampleValues and the primvar's 
@@ -668,6 +684,21 @@ class HdSceneDelegate {
                          VtValue *sampleValues,
                          VtIntArray *sampleIndices);
 
+    // An overload of SampleIndexedPrimvar that explicitly takes the startTime
+    // and endTime rather than relying on the scene delegate having state
+    // about what the source of the current shutter interval should be.
+    HD_API
+    virtual size_t
+    SampleIndexedPrimvar(SdfPath const& id, 
+                         TfToken const& key,
+                         float startTime,
+                         float endTime,
+                         size_t maxSampleCount, 
+                         float *sampleTimes, 
+                         VtValue *sampleValues,
+                         VtIntArray *sampleIndices);
+    
+    
     /// Convenience form of SampleIndexedPrimvar() that takes 
     /// HdTimeSampleArrays. This function returns the union of the authored 
     /// samples and the boundaries of the current camera shutter interval.
@@ -677,6 +708,17 @@ class HdSceneDelegate {
                          TfToken const& key,
                          HdIndexedTimeSampleArray<VtValue, CAPACITY> *sa);
 
+    /// Convenience form of SampleIndexedPrimvar() that takes 
+    /// HdTimeSampleArrays. This function returns the union of the authored 
+    /// samples and the boundaries of the current camera shutter interval.
+    template <unsigned int CAPACITY>
+    void 
+    SampleIndexedPrimvar(SdfPath const &id, 
+                         TfToken const& key,
+                         float startTime,
+                         float endTime,
+                         HdIndexedTimeSampleArray<VtValue, CAPACITY> *sa);
+
     // -----------------------------------------------------------------------//
     /// \name Instancer prototypes
     // -----------------------------------------------------------------------//
@@ -848,6 +890,18 @@ class HdSceneDelegate {
                                              float *sampleTimes,
                                              VtValue *sampleValues);
 
+    // An overload of SampleTransform that explicitly takes the startTime
+    // and endTime rather than relying on the scene delegate having state
+    // about what the source of the current shutter interval should be.
+    HD_API
+    virtual size_t SampleExtComputationInput(SdfPath const& computationId,
+                                             TfToken const& input,
+                                             float startTime,
+                                             float endTime,
+                                             size_t maxSampleCount,
+                                             float *sampleTimes,
+                                             VtValue *sampleValues);
+
     /// Convenience form of SampleExtComputationInput() that takes an
     /// HdTimeSampleArray.
     /// Returns the union of the authored samples and the boundaries
@@ -855,22 +909,18 @@ class HdSceneDelegate {
     template <unsigned int CAPACITY>
     void SampleExtComputationInput(SdfPath const& computationId,
                                    TfToken const& input,
-                                   HdTimeSampleArray<VtValue, CAPACITY> *sa) {
-        size_t authoredSamples = SampleExtComputationInput(
-                computationId, input, CAPACITY,
-                sa->times.data(), sa->values.data());
-
-        if (authoredSamples > CAPACITY) {
-            sa->Resize(authoredSamples);
-            size_t authoredSamplesSecondAttempt = SampleExtComputationInput(
-                    computationId, input, authoredSamples,
-                    sa->times.data(), sa->values.data());
-            // Number of samples should be consisntent through multiple
-            // invokations of the sampling function.
-            TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
-        }
-        sa->count = authoredSamples;
-    }
+                                   HdTimeSampleArray<VtValue, CAPACITY> *sa);
+
+    /// Convenience form of SampleExtComputationInput() that takes an
+    /// HdTimeSampleArray.
+    /// Returns the union of the authored samples and the boundaries
+    /// of the current camera shutter interval.
+    template <unsigned int CAPACITY>
+    void SampleExtComputationInput(SdfPath const& computationId,
+                                   TfToken const& input,
+                                   float startTime,
+                                   float endTime,
+                                   HdTimeSampleArray<VtValue, CAPACITY> *sa);
 
     /// Returns the kernel source assigned to the computation at the path id.
     /// If the string is empty the computation has no GPU kernel and the
@@ -916,6 +966,110 @@ class HdSceneDelegate {
     HdSceneDelegate &operator=(HdSceneDelegate &) =  delete;
 };
 
+template <unsigned int CAPACITY>
+void 
+HdSceneDelegate::SampleTransform(SdfPath const & id,
+                                 HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa) {
+    size_t authoredSamples = 
+        SampleTransform(id, CAPACITY, sa->times.data(), sa->values.data());
+    if (authoredSamples > CAPACITY) {
+        sa->Resize(authoredSamples);
+        size_t authoredSamplesSecondAttempt = 
+            SampleTransform(
+                id, 
+                authoredSamples, 
+                sa->times.data(), 
+                sa->values.data());
+        // Number of samples should be consisntent through multiple
+        // invokations of the sampling function.
+        TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
+    }
+    sa->count = authoredSamples;
+}
+
+template <unsigned int CAPACITY>
+void 
+HdSceneDelegate::SampleTransform(SdfPath const & id,
+                                 float startTime,
+                                 float endTime,
+                                 HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa) {
+    size_t authoredSamples = 
+        SampleTransform(id, startTime, endTime, CAPACITY,
+                        sa->times.data(), sa->values.data());
+    if (authoredSamples > CAPACITY) {
+        sa->Resize(authoredSamples);
+        size_t authoredSamplesSecondAttempt = 
+            SampleTransform(
+                id, 
+                startTime,
+                endTime,
+                authoredSamples,
+                sa->times.data(), 
+                sa->values.data());
+        // Number of samples should be consisntent through multiple
+        // invokations of the sampling function.
+        TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
+    }
+    sa->count = authoredSamples;
+}
+
+template <unsigned int CAPACITY>
+void
+HdSceneDelegate::SampleInstancerTransform(
+        SdfPath const &instancerId,
+        HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa) {
+    size_t authoredSamples = 
+        SampleInstancerTransform(
+            instancerId, 
+            CAPACITY, 
+            sa->times.data(), 
+            sa->values.data());
+    if (authoredSamples > CAPACITY) {
+        sa->Resize(authoredSamples);
+        size_t authoredSamplesSecondAttempt = 
+            SampleInstancerTransform(
+                instancerId, 
+                authoredSamples, 
+                sa->times.data(), 
+                sa->values.data());
+        // Number of samples should be consisntent through multiple
+        // invokations of the sampling function.
+        TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
+    }
+    sa->count = authoredSamples;
+}
+
+template <unsigned int CAPACITY>
+void
+HdSceneDelegate::SampleInstancerTransform(
+        SdfPath const &instancerId,
+        float startTime, float endTime,
+        HdTimeSampleArray<GfMatrix4d, CAPACITY> *sa) {
+    size_t authoredSamples = 
+        SampleInstancerTransform(
+            instancerId,
+            startTime,
+            endTime,
+            CAPACITY, 
+            sa->times.data(), 
+            sa->values.data());
+    if (authoredSamples > CAPACITY) {
+        sa->Resize(authoredSamples);
+        size_t authoredSamplesSecondAttempt = 
+            SampleInstancerTransform(
+                instancerId,
+                startTime,
+                endTime,
+                authoredSamples, 
+                sa->times.data(), 
+                sa->values.data());
+        // Number of samples should be consisntent through multiple
+        // invokations of the sampling function.
+        TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
+    }
+    sa->count = authoredSamples;
+}
+
 template <unsigned int CAPACITY>
 void 
 HdSceneDelegate::SamplePrimvar(SdfPath const &id, 
@@ -924,7 +1078,7 @@ HdSceneDelegate::SamplePrimvar(SdfPath const &id,
     size_t authoredSamples = 
         SamplePrimvar(
             id, 
-            key, 
+            key,
             CAPACITY, 
             sa->times.data(), 
             sa->values.data());
@@ -933,7 +1087,7 @@ HdSceneDelegate::SamplePrimvar(SdfPath const &id,
         size_t authoredSamplesSecondAttempt = 
             SamplePrimvar(
                 id, 
-                key, 
+                key,
                 authoredSamples, 
                 sa->times.data(), 
                 sa->values.data());
@@ -946,13 +1100,47 @@ HdSceneDelegate::SamplePrimvar(SdfPath const &id,
 
 template <unsigned int CAPACITY>
 void 
-HdSceneDelegate::SampleIndexedPrimvar(SdfPath const &id, 
+HdSceneDelegate::SamplePrimvar(SdfPath const &id, 
+                               TfToken const& key,
+                               float startTime,
+                               float endTime,
+                               HdTimeSampleArray<VtValue, CAPACITY> *sa) {
+    size_t authoredSamples = 
+        SamplePrimvar(
+            id, 
+            key,
+            startTime,
+            endTime,
+            CAPACITY, 
+            sa->times.data(), 
+            sa->values.data());
+    if (authoredSamples > CAPACITY) {
+        sa->Resize(authoredSamples);
+        size_t authoredSamplesSecondAttempt = 
+            SamplePrimvar(
+                id, 
+                key,
+                startTime,
+                endTime,
+                authoredSamples, 
+                sa->times.data(), 
+                sa->values.data());
+        // Number of samples should be consistent through multiple
+        // invocations of the sampling function.
+        TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
+    }
+    sa->count = authoredSamples;
+}
+
+template <unsigned int CAPACITY>
+void 
+HdSceneDelegate::SampleIndexedPrimvar(SdfPath const &id,
                          TfToken const& key,
                          HdIndexedTimeSampleArray<VtValue, CAPACITY> *sa) {
     size_t authoredSamples = 
         SampleIndexedPrimvar(
             id, 
-            key, 
+            key,
             CAPACITY, 
             sa->times.data(), 
             sa->values.data(),
@@ -962,7 +1150,7 @@ HdSceneDelegate::SampleIndexedPrimvar(SdfPath const &id,
         size_t authoredSamplesSecondAttempt = 
             SampleIndexedPrimvar(
                 id, 
-                key, 
+                key,
                 authoredSamples, 
                 sa->times.data(), 
                 sa->values.data(),
@@ -974,6 +1162,88 @@ HdSceneDelegate::SampleIndexedPrimvar(SdfPath const &id,
     sa->count = authoredSamples;
 }
 
+template <unsigned int CAPACITY>
+void 
+HdSceneDelegate::SampleIndexedPrimvar(SdfPath const &id,
+                         TfToken const& key,
+                         float startTime,
+                         float endTime,
+                         HdIndexedTimeSampleArray<VtValue, CAPACITY> *sa) {
+    size_t authoredSamples = 
+        SampleIndexedPrimvar(
+            id, 
+            key,
+            startTime,
+            endTime,
+            CAPACITY, 
+            sa->times.data(), 
+            sa->values.data(),
+            sa->indices.data());
+    if (authoredSamples > CAPACITY) {
+        sa->Resize(authoredSamples);
+        size_t authoredSamplesSecondAttempt = 
+            SampleIndexedPrimvar(
+                id, 
+                key,
+                startTime,
+                endTime,
+                authoredSamples, 
+                sa->times.data(), 
+                sa->values.data(),
+                sa->indices.data());
+        // Number of samples should be consistent through multiple
+        // invocations of the sampling function.
+        TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
+    }
+    sa->count = authoredSamples;
+}
+
+template <unsigned int CAPACITY>
+void
+HdSceneDelegate::SampleExtComputationInput(
+        SdfPath const& computationId,
+        TfToken const& input,
+        HdTimeSampleArray<VtValue, CAPACITY> *sa) {
+    size_t authoredSamples = SampleExtComputationInput(
+        computationId, input, CAPACITY,
+        sa->times.data(), sa->values.data());
+
+    if (authoredSamples > CAPACITY) {
+        sa->Resize(authoredSamples);
+        size_t authoredSamplesSecondAttempt = SampleExtComputationInput(
+            computationId, input, authoredSamples,
+            sa->times.data(), sa->values.data());
+        // Number of samples should be consisntent through multiple
+        // invokations of the sampling function.
+        TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
+    }
+    sa->count = authoredSamples;
+}
+
+template <unsigned int CAPACITY>
+void
+HdSceneDelegate::SampleExtComputationInput(
+        SdfPath const& computationId,
+        TfToken const& input,
+        float startTime,
+        float endTime,
+        HdTimeSampleArray<VtValue, CAPACITY> *sa) {
+    size_t authoredSamples = SampleExtComputationInput(
+        computationId, input, startTime, endTime, CAPACITY,
+        sa->times.data(), sa->values.data());
+
+    if (authoredSamples > CAPACITY) {
+        sa->Resize(authoredSamples);
+        size_t authoredSamplesSecondAttempt = SampleExtComputationInput(
+            computationId, input, startTime, endTime, authoredSamples,
+            sa->times.data(), sa->values.data());
+        // Number of samples should be consisntent through multiple
+        // invokations of the sampling function.
+        TF_VERIFY(authoredSamples == authoredSamplesSecondAttempt);
+    }
+    sa->count = authoredSamples;
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
 
 #endif //PXR_IMAGING_HD_SCENE_DELEGATE_H
diff --git a/pxr/imaging/hd/sceneGlobalsSchema.cpp b/pxr/imaging/hd/sceneGlobalsSchema.cpp
index 14c4c41aad..4e354d2f5f 100644
--- a/pxr/imaging/hd/sceneGlobalsSchema.cpp
+++ b/pxr/imaging/hd/sceneGlobalsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -64,6 +47,13 @@ HdSceneGlobalsSchema::GetFromSceneIndex(
 
 // --(END CUSTOM CODE: Schema Methods)--
 
+HdPathDataSourceHandle
+HdSceneGlobalsSchema::GetActiveRenderPassPrim() const
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdSceneGlobalsSchemaTokens->activeRenderPassPrim);
+}
+
 HdPathDataSourceHandle
 HdSceneGlobalsSchema::GetActiveRenderSettingsPrim() const
 {
@@ -85,19 +75,33 @@ HdSceneGlobalsSchema::GetEndTimeCode() const
         HdSceneGlobalsSchemaTokens->endTimeCode);
 }
 
+HdDoubleDataSourceHandle
+HdSceneGlobalsSchema::GetCurrentFrame() const
+{
+    return _GetTypedDataSource<HdDoubleDataSource>(
+        HdSceneGlobalsSchemaTokens->currentFrame);
+}
+
 /*static*/
 HdContainerDataSourceHandle
 HdSceneGlobalsSchema::BuildRetained(
+        const HdPathDataSourceHandle &activeRenderPassPrim,
         const HdPathDataSourceHandle &activeRenderSettingsPrim,
         const HdDoubleDataSourceHandle &startTimeCode,
-        const HdDoubleDataSourceHandle &endTimeCode
+        const HdDoubleDataSourceHandle &endTimeCode,
+        const HdDoubleDataSourceHandle &currentFrame
 )
 {
-    TfToken _names[3];
-    HdDataSourceBaseHandle _values[3];
+    TfToken _names[5];
+    HdDataSourceBaseHandle _values[5];
 
     size_t _count = 0;
 
+    if (activeRenderPassPrim) {
+        _names[_count] = HdSceneGlobalsSchemaTokens->activeRenderPassPrim;
+        _values[_count++] = activeRenderPassPrim;
+    }
+
     if (activeRenderSettingsPrim) {
         _names[_count] = HdSceneGlobalsSchemaTokens->activeRenderSettingsPrim;
         _values[_count++] = activeRenderSettingsPrim;
@@ -112,9 +116,22 @@ HdSceneGlobalsSchema::BuildRetained(
         _names[_count] = HdSceneGlobalsSchemaTokens->endTimeCode;
         _values[_count++] = endTimeCode;
     }
+
+    if (currentFrame) {
+        _names[_count] = HdSceneGlobalsSchemaTokens->currentFrame;
+        _values[_count++] = currentFrame;
+    }
     return HdRetainedContainerDataSource::New(_count, _names, _values);
 }
 
+HdSceneGlobalsSchema::Builder &
+HdSceneGlobalsSchema::Builder::SetActiveRenderPassPrim(
+    const HdPathDataSourceHandle &activeRenderPassPrim)
+{
+    _activeRenderPassPrim = activeRenderPassPrim;
+    return *this;
+}
+
 HdSceneGlobalsSchema::Builder &
 HdSceneGlobalsSchema::Builder::SetActiveRenderSettingsPrim(
     const HdPathDataSourceHandle &activeRenderSettingsPrim)
@@ -139,13 +156,23 @@ HdSceneGlobalsSchema::Builder::SetEndTimeCode(
     return *this;
 }
 
+HdSceneGlobalsSchema::Builder &
+HdSceneGlobalsSchema::Builder::SetCurrentFrame(
+    const HdDoubleDataSourceHandle &currentFrame)
+{
+    _currentFrame = currentFrame;
+    return *this;
+}
+
 HdContainerDataSourceHandle
 HdSceneGlobalsSchema::Builder::Build()
 {
     return HdSceneGlobalsSchema::BuildRetained(
+        _activeRenderPassPrim,
         _activeRenderSettingsPrim,
         _startTimeCode,
-        _endTimeCode
+        _endTimeCode,
+        _currentFrame
     );
 }
 
@@ -176,6 +203,16 @@ HdSceneGlobalsSchema::GetDefaultLocator()
     return locator;
 }
 
+/* static */
+const HdDataSourceLocator &
+HdSceneGlobalsSchema::GetActiveRenderPassPrimLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdSceneGlobalsSchemaTokens->activeRenderPassPrim);
+    return locator;
+}
+
 /* static */
 const HdDataSourceLocator &
 HdSceneGlobalsSchema::GetActiveRenderSettingsPrimLocator()
@@ -204,6 +241,16 @@ HdSceneGlobalsSchema::GetEndTimeCodeLocator()
         GetDefaultLocator().Append(
             HdSceneGlobalsSchemaTokens->endTimeCode);
     return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdSceneGlobalsSchema::GetCurrentFrameLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdSceneGlobalsSchemaTokens->currentFrame);
+    return locator;
 } 
 
 PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/pxr/imaging/hd/sceneGlobalsSchema.h b/pxr/imaging/hd/sceneGlobalsSchema.h
index 312c2051f1..b72d2ba845 100644
--- a/pxr/imaging/hd/sceneGlobalsSchema.h
+++ b/pxr/imaging/hd/sceneGlobalsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -53,9 +36,11 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 #define HD_SCENE_GLOBALS_SCHEMA_TOKENS \
     (sceneGlobals) \
+    (activeRenderPassPrim) \
     (activeRenderSettingsPrim) \
     (startTimeCode) \
     (endTimeCode) \
+    (currentFrame) \
 
 TF_DECLARE_PUBLIC_TOKENS(HdSceneGlobalsSchemaTokens, HD_API,
     HD_SCENE_GLOBALS_SCHEMA_TOKENS);
@@ -63,10 +48,11 @@ TF_DECLARE_PUBLIC_TOKENS(HdSceneGlobalsSchemaTokens, HD_API,
 //-----------------------------------------------------------------------------
 
 // The HdSceneGlobalsSchema encapsulates "global" state to orchestrate a
-// render. It currently houses the active render settings prim path that
-// describes the information necessary to generate images from a single
-// invocation of a renderer, and the active time sample range that may be
-// relevant to downstream scene indices (e.g. procedural evaluation).
+// render. It currently houses the active render settings and pass prim paths
+// that describe the information necessary to generate images from a single
+// invocation of a renderer, and the active time sample range and current
+// frame number that may be relevant to downstream scene indices (e.g.
+// procedural evaluation).
 //
 // We shall use the convention of a container data source at the root prim of
 // the scene index that is populated with this global state. The renderer and
@@ -119,6 +105,9 @@ class HdSceneGlobalsSchema : public HdSchema
     /// \name Member accessor
     /// @{
 
+    HD_API
+    HdPathDataSourceHandle GetActiveRenderPassPrim() const;
+
     HD_API
     HdPathDataSourceHandle GetActiveRenderSettingsPrim() const;
 
@@ -126,7 +115,10 @@ class HdSceneGlobalsSchema : public HdSchema
     HdDoubleDataSourceHandle GetStartTimeCode() const;
 
     HD_API
-    HdDoubleDataSourceHandle GetEndTimeCode() const; 
+    HdDoubleDataSourceHandle GetEndTimeCode() const;
+
+    HD_API
+    HdDoubleDataSourceHandle GetCurrentFrame() const; 
 
     /// @}
 
@@ -154,6 +146,10 @@ class HdSceneGlobalsSchema : public HdSchema
     /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
     /// @{
 
+    /// Prim-level relative data source locator to locate activeRenderPassPrim.
+    HD_API
+    static const HdDataSourceLocator &GetActiveRenderPassPrimLocator();
+
     /// Prim-level relative data source locator to locate activeRenderSettingsPrim.
     HD_API
     static const HdDataSourceLocator &GetActiveRenderSettingsPrimLocator();
@@ -165,6 +161,10 @@ class HdSceneGlobalsSchema : public HdSchema
     /// Prim-level relative data source locator to locate endTimeCode.
     HD_API
     static const HdDataSourceLocator &GetEndTimeCodeLocator();
+
+    /// Prim-level relative data source locator to locate currentFrame.
+    HD_API
+    static const HdDataSourceLocator &GetCurrentFrameLocator();
     /// @} 
 
     /// \name Schema construction
@@ -180,9 +180,11 @@ class HdSceneGlobalsSchema : public HdSchema
     HD_API
     static HdContainerDataSourceHandle
     BuildRetained(
+        const HdPathDataSourceHandle &activeRenderPassPrim,
         const HdPathDataSourceHandle &activeRenderSettingsPrim,
         const HdDoubleDataSourceHandle &startTimeCode,
-        const HdDoubleDataSourceHandle &endTimeCode
+        const HdDoubleDataSourceHandle &endTimeCode,
+        const HdDoubleDataSourceHandle &currentFrame
     );
 
     /// \class HdSceneGlobalsSchema::Builder
@@ -195,6 +197,9 @@ class HdSceneGlobalsSchema : public HdSchema
     {
     public:
         HD_API
+        Builder &SetActiveRenderPassPrim(
+            const HdPathDataSourceHandle &activeRenderPassPrim);
+        HD_API
         Builder &SetActiveRenderSettingsPrim(
             const HdPathDataSourceHandle &activeRenderSettingsPrim);
         HD_API
@@ -203,15 +208,20 @@ class HdSceneGlobalsSchema : public HdSchema
         HD_API
         Builder &SetEndTimeCode(
             const HdDoubleDataSourceHandle &endTimeCode);
+        HD_API
+        Builder &SetCurrentFrame(
+            const HdDoubleDataSourceHandle &currentFrame);
 
         /// Returns a container data source containing the members set thus far.
         HD_API
         HdContainerDataSourceHandle Build();
 
     private:
+        HdPathDataSourceHandle _activeRenderPassPrim;
         HdPathDataSourceHandle _activeRenderSettingsPrim;
         HdDoubleDataSourceHandle _startTimeCode;
         HdDoubleDataSourceHandle _endTimeCode;
+        HdDoubleDataSourceHandle _currentFrame;
 
     };
 
diff --git a/pxr/imaging/hd/sceneIndex.cpp b/pxr/imaging/hd/sceneIndex.cpp
index 9c22db43c7..d263e19e0f 100644
--- a/pxr/imaging/hd/sceneIndex.cpp
+++ b/pxr/imaging/hd/sceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sceneIndex.h"
 #include "pxr/imaging/hd/filteringSceneIndex.h"
diff --git a/pxr/imaging/hd/sceneIndex.h b/pxr/imaging/hd/sceneIndex.h
index 26539ed516..b8f29cc907 100644
--- a/pxr/imaging/hd/sceneIndex.h
+++ b/pxr/imaging/hd/sceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SCENE_INDEX_H
 #define PXR_IMAGING_HD_SCENE_INDEX_H
diff --git a/pxr/imaging/hd/sceneIndexAdapterSceneDelegate.cpp b/pxr/imaging/hd/sceneIndexAdapterSceneDelegate.cpp
index 5f5f46e99c..0de30d0d4c 100644
--- a/pxr/imaging/hd/sceneIndexAdapterSceneDelegate.cpp
+++ b/pxr/imaging/hd/sceneIndexAdapterSceneDelegate.cpp
@@ -1,58 +1,38 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sceneIndexAdapterSceneDelegate.h"
 
+#include "pxr/imaging/hd/aov.h"
+#include "pxr/imaging/hd/basisCurvesTopology.h"
 #include "pxr/imaging/hd/camera.h"
-#include "pxr/imaging/hd/coordSys.h"
+#include "pxr/imaging/hd/changeTracker.h"
 #include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/dataSourceLegacyPrim.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
 #include "pxr/imaging/hd/dataSourceTypeDefs.h"
-#include "pxr/imaging/hd/extComputation.h"
+#include "pxr/imaging/hd/dirtyBitsTranslator.h"
+#include "pxr/imaging/hd/enums.h"
 #include "pxr/imaging/hd/field.h"
 #include "pxr/imaging/hd/geomSubset.h"
-#include "pxr/imaging/hd/material.h"
 #include "pxr/imaging/hd/light.h"
+#include "pxr/imaging/hd/material.h"
 #include "pxr/imaging/hd/meshTopology.h"
-#include "pxr/imaging/hd/renderBuffer.h"
+#include "pxr/imaging/hd/prefixingSceneIndex.h"
 #include "pxr/imaging/hd/renderDelegate.h"
 #include "pxr/imaging/hd/renderSettings.h"
+#include "pxr/imaging/hd/repr.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
 #include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexObserver.h"
+#include "pxr/imaging/hd/schemaTypeDefs.h"
 #include "pxr/imaging/hd/tokens.h"
 #include "pxr/imaging/hd/topology.h"
-#include "pxr/imaging/pxOsd/tokens.h"
-#include "pxr/base/trace/trace.h"
-
-#include "pxr/base/arch/vsnprintf.h"
-#include "pxr/base/tf/diagnostic.h"
-#include "pxr/base/tf/token.h"
-#include "pxr/base/vt/types.h"
+#include "pxr/imaging/hd/types.h"
 
-#include "pxr/imaging/hd/dataSourceLegacyPrim.h"
-#include "pxr/imaging/hd/dataSourceLocator.h"
-#include "pxr/imaging/hd/dirtyBitsTranslator.h"
-
-#include "pxr/imaging/hd/flatteningSceneIndex.h"
-#include "pxr/imaging/hd/prefixingSceneIndex.h"
 
 #include "pxr/imaging/hd/basisCurvesSchema.h"
 #include "pxr/imaging/hd/basisCurvesTopologySchema.h"
@@ -60,12 +40,11 @@
 #include "pxr/imaging/hd/capsuleSchema.h"
 #include "pxr/imaging/hd/categoriesSchema.h"
 #include "pxr/imaging/hd/coneSchema.h"
-#include "pxr/imaging/hd/coordSysSchema.h"
 #include "pxr/imaging/hd/coordSysBindingSchema.h"
+#include "pxr/imaging/hd/coordSysSchema.h"
 #include "pxr/imaging/hd/cubeSchema.h"
 #include "pxr/imaging/hd/cylinderSchema.h"
-#include "pxr/imaging/hd/dependenciesSchema.h"
-#include "pxr/imaging/hd/dependencySchema.h"
+#include "pxr/imaging/hd/displayFilterSchema.h"
 #include "pxr/imaging/hd/extComputationInputComputationSchema.h"
 #include "pxr/imaging/hd/extComputationOutputSchema.h"
 #include "pxr/imaging/hd/extComputationPrimvarSchema.h"
@@ -73,21 +52,19 @@
 #include "pxr/imaging/hd/extComputationSchema.h"
 #include "pxr/imaging/hd/extentSchema.h"
 #include "pxr/imaging/hd/geomSubsetSchema.h"
-#include "pxr/imaging/hd/geomSubsetsSchema.h"
 #include "pxr/imaging/hd/imageShaderSchema.h"
 #include "pxr/imaging/hd/instanceCategoriesSchema.h"
 #include "pxr/imaging/hd/instancedBySchema.h"
 #include "pxr/imaging/hd/instancerTopologySchema.h"
-#include "pxr/imaging/hd/instanceSchema.h"
 #include "pxr/imaging/hd/integratorSchema.h"
 #include "pxr/imaging/hd/legacyDisplayStyleSchema.h"
 #include "pxr/imaging/hd/lightSchema.h"
-#include "pxr/imaging/hd/materialBindingsSchema.h"
 #include "pxr/imaging/hd/materialBindingSchema.h"
+#include "pxr/imaging/hd/materialBindingsSchema.h"
 #include "pxr/imaging/hd/materialConnectionSchema.h"
 #include "pxr/imaging/hd/materialNetworkSchema.h"
-#include "pxr/imaging/hd/materialNodeSchema.h"
 #include "pxr/imaging/hd/materialNodeParameterSchema.h"
+#include "pxr/imaging/hd/materialNodeSchema.h"
 #include "pxr/imaging/hd/materialSchema.h"
 #include "pxr/imaging/hd/meshSchema.h"
 #include "pxr/imaging/hd/meshTopologySchema.h"
@@ -99,7 +76,6 @@
 #include "pxr/imaging/hd/renderSettingsSchema.h"
 #include "pxr/imaging/hd/renderVarSchema.h"
 #include "pxr/imaging/hd/sampleFilterSchema.h"
-#include "pxr/imaging/hd/displayFilterSchema.h"
 #include "pxr/imaging/hd/sphereSchema.h"
 #include "pxr/imaging/hd/subdivisionTagsSchema.h"
 #include "pxr/imaging/hd/visibilitySchema.h"
@@ -107,18 +83,52 @@
 #include "pxr/imaging/hd/volumeFieldSchema.h"
 #include "pxr/imaging/hd/xformSchema.h"
 
-#include "tbb/concurrent_unordered_set.h"
-
 #include "pxr/imaging/hf/perfLog.h"
+#include "pxr/imaging/pxOsd/subdivTags.h"
+#include "pxr/imaging/pxOsd/tokens.h"
+
+#include "pxr/usd/sdf/path.h"
+
+#include "pxr/base/arch/vsnprintf.h"
+#include "pxr/base/gf/matrix4d.h"
+#include "pxr/base/gf/range1f.h"
+#include "pxr/base/gf/range2f.h"
+#include "pxr/base/gf/range3d.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/base/gf/vec3d.h"
+#include "pxr/base/gf/vec4d.h"
+#include "pxr/base/gf/vec4f.h"
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/base/tf/stl.h"
+#include "pxr/base/tf/stringUtils.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/trace/trace.h"
+#include "pxr/base/vt/dictionary.h"
+#include "pxr/base/vt/types.h"
+#include "pxr/base/vt/value.h"
+
+#include "pxr/pxr.h"
+
+#include "tbb/concurrent_unordered_set.h"
 
 #include <algorithm>
-#include <iterator>
+#include <cstddef>
+#include <limits>
+#include <map>
+#include <string>
+#include <thread>
 #include <unordered_set>
 #include <utility>
 #include <vector>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+//
+// If the input prim is a datasource prim, we need some sensible default
+// here...  For now, we pass [0,0] to turn off multisampling.
+constexpr float _fallbackStartTime = 0.0f;
+constexpr float _fallbackEndTime   = 0.0f;
+
 /* static */
 HdSceneIndexBaseRefPtr
 HdSceneIndexAdapterSceneDelegate::AppendDefaultSceneFilters(
@@ -191,7 +201,13 @@ HdSceneIndexAdapterSceneDelegate::_PrimAdded(
     SdfPath indexPath = primPath;
     _PrimCacheTable::iterator it = _primCache.find(indexPath);
 
-    bool insertIfNeeded = true;
+    // There are 3 possible cases here:
+    // (1) The prim doesn't exist yet and we add the prim.
+    // (2) The prim exists, but has the wrong type; we remove the prim
+    //     and re-insert with the correct type.
+    // (3) The prim exists, and has the right type; in this case, we don't
+    //     remove the prim but we should invalidate all of its properties.
+    bool isResync = false;
 
     if (it != _primCache.end()) {
         _PrimCacheEntry &entry = (*it).second;
@@ -205,67 +221,75 @@ HdSceneIndexAdapterSceneDelegate::_PrimAdded(
                 GetRenderIndex()._RemoveBprim(existingType, indexPath);
             } else if (existingType == HdPrimTypeTokens->instancer) {
                 GetRenderIndex()._RemoveInstancer(indexPath);
+            } else if (existingType == HdPrimTypeTokens->geomSubset) {
+                GetRenderIndex().GetChangeTracker()._MarkRprimDirty(
+                    indexPath.GetParentPath(), HdChangeTracker::DirtyTopology);
             }
-
-            // If the prim type of an existing entry changed, also clear any
-            // cached data associated with it, e.g. computed primvars.
-            entry.primvarDescriptors.clear();
-            entry.primvarDescriptorsState.store(
-                _PrimCacheEntry::ReadStateUnread);
-            entry.extCmpPrimvarDescriptors.clear();
-            entry.extCmpPrimvarDescriptorsState.store(
-                _PrimCacheEntry::ReadStateUnread);
-
         } else {
-            insertIfNeeded = false;
+            isResync = true;
         }
     }
 
-    if (insertIfNeeded) {
-        enum PrimType {
-            PrimType_None = 0, 
-            PrimType_R, 
-            PrimType_S,
-            PrimType_B,
-            PrimType_I,
-        };
+    if (!isResync) {
+        if (GetRenderIndex().IsRprimTypeSupported(primType)) {
+            GetRenderIndex()._InsertRprim(primType, this, indexPath);
+        } else if (GetRenderIndex().IsSprimTypeSupported(primType)) {
+            GetRenderIndex()._InsertSprim(primType, this, indexPath);
+        } else if (GetRenderIndex().IsBprimTypeSupported(primType)) {
+            GetRenderIndex()._InsertBprim(primType, this, indexPath);
+        } else if (primType == HdPrimTypeTokens->instancer) {
+            GetRenderIndex()._InsertInstancer(this, indexPath);
+        } else if (primType == HdPrimTypeTokens->geomSubset) {
+            GetRenderIndex().GetChangeTracker()._MarkRprimDirty(
+                indexPath.GetParentPath(), HdChangeTracker::DirtyTopology);
+        }
+    }
+    
+    if (it != _primCache.end()) {
+        _PrimCacheEntry & entry = (*it).second;
+
+        // Make sure prim type is up-to-date and clear caches.
+        entry.primType = primType;
+        std::atomic_store(&(entry.primvarDescriptors),
+            std::shared_ptr<_PrimCacheEntry::PrimvarDescriptorsArray>());
+        std::atomic_store(&(entry.extCmpPrimvarDescriptors),
+            std::shared_ptr<_PrimCacheEntry::ExtCmpPrimvarDescriptorsArray>());
+    } else {
+        _primCache[indexPath].primType = primType;
+    }
 
-        PrimType hydraPrimType = PrimType_None;
+    if (isResync) {
+        // For resyncs, we need to invalidate the prim.
+        // Note that since this only runs if we don't insert the prim, we
+        // don't have any duplicate IsRprimTypeSupported/etc calls here.
+        static HdDataSourceLocatorSet allDirty = { HdDataSourceLocator() };
         if (GetRenderIndex().IsRprimTypeSupported(primType)) {
-            hydraPrimType = PrimType_R;
+            HdDirtyBits allDirtyRprim =
+                HdDirtyBitsTranslator::RprimLocatorSetToDirtyBits(
+                    primType, allDirty);
+            GetRenderIndex().GetChangeTracker().
+                _MarkRprimDirty(indexPath, allDirtyRprim);
         } else if (GetRenderIndex().IsSprimTypeSupported(primType)) {
-            hydraPrimType = PrimType_S;
+            HdDirtyBits allDirtySprim =
+                HdDirtyBitsTranslator::SprimLocatorSetToDirtyBits(
+                    primType, allDirty);
+            GetRenderIndex().GetChangeTracker().
+                _MarkSprimDirty(indexPath, allDirtySprim);
         } else if (GetRenderIndex().IsBprimTypeSupported(primType)) {
-            hydraPrimType = PrimType_B;
+            HdDirtyBits allDirtyBprim =
+                HdDirtyBitsTranslator::BprimLocatorSetToDirtyBits(
+                    primType, allDirty);
+            GetRenderIndex().GetChangeTracker().
+                _MarkBprimDirty(indexPath, allDirtyBprim);
         } else if (primType == HdPrimTypeTokens->instancer) {
-            hydraPrimType = PrimType_I;
-        }
-
-        if (hydraPrimType) {
-            switch (hydraPrimType)
-            {
-            case PrimType_R:
-                GetRenderIndex()._InsertRprim(primType, this, indexPath);
-                break;
-            case PrimType_S:
-                GetRenderIndex()._InsertSprim(primType, this, indexPath);
-                break;
-            case PrimType_B:
-                GetRenderIndex()._InsertBprim(primType, this, indexPath);
-                break;
-            case PrimType_I:
-                GetRenderIndex()._InsertInstancer(this, indexPath);
-                break;
-            default:
-                break;
-            };
-        }
-
-        if (it != _primCache.end()) {
-            _PrimCacheEntry & entry = (*it).second;
-            entry.primType = primType;
-        } else {
-            _primCache[indexPath].primType = primType;
+            HdDirtyBits allDirtyInst =
+                HdDirtyBitsTranslator::InstancerLocatorSetToDirtyBits(
+                    primType, allDirty);
+            GetRenderIndex().GetChangeTracker().
+                _MarkInstancerDirty(indexPath, allDirtyInst);
+        } else if (primType == HdPrimTypeTokens->geomSubset) {
+            GetRenderIndex().GetChangeTracker()._MarkRprimDirty(
+                indexPath.GetParentPath(), HdChangeTracker::DirtyTopology);
         }
     }
 }
@@ -333,6 +357,10 @@ HdSceneIndexAdapterSceneDelegate::PrimsRemoved(
                 GetRenderIndex()._RemoveBprim(primType, entry.primPath);
             } else if (primType == HdPrimTypeTokens->instancer) {
                 GetRenderIndex()._RemoveInstancer(entry.primPath);
+            } else if (primType == HdPrimTypeTokens->geomSubset) {
+                GetRenderIndex().GetChangeTracker()._MarkRprimDirty(
+                    entry.primPath.GetParentPath(),
+                    HdChangeTracker::DirtyTopology);
             }
         } else {
             // Otherwise, there's a subtree and we need to call _RemoveSubtree.
@@ -340,6 +368,7 @@ HdSceneIndexAdapterSceneDelegate::PrimsRemoved(
         }
         _primCache.erase(it);
     }
+
     if (!entries.empty()) {
         _sceneDelegatesBuilt = false;
     }
@@ -406,20 +435,21 @@ HdSceneIndexAdapterSceneDelegate::PrimsDirtied(
                 GetRenderIndex().GetChangeTracker()._MarkInstancerDirty(
                     indexPath, dirtyBits);
             }
+        } else if (primType == HdPrimTypeTokens->geomSubset) {
+            GetRenderIndex().GetChangeTracker()._MarkRprimDirty(
+                indexPath.GetParentPath(), HdChangeTracker::DirtyTopology);
         }
 
         if (entry.dirtyLocators.Intersects(
                 HdPrimvarsSchema::GetDefaultLocator())) {
-            it->second.primvarDescriptors.clear();
-            it->second.primvarDescriptorsState.store(
-                _PrimCacheEntry::ReadStateUnread);
+            std::atomic_store(&(it->second.primvarDescriptors),
+                std::shared_ptr<_PrimCacheEntry::PrimvarDescriptorsArray>());
         }
 
         if (entry.dirtyLocators.Intersects(
                 HdExtComputationPrimvarsSchema::GetDefaultLocator())) {
-            it->second.extCmpPrimvarDescriptors.clear();
-            it->second.extCmpPrimvarDescriptorsState.store(
-                _PrimCacheEntry::ReadStateUnread);
+            std::atomic_store(&(it->second.extCmpPrimvarDescriptors),
+                std::shared_ptr<_PrimCacheEntry::ExtCmpPrimvarDescriptorsArray>());
         }
     }
 }
@@ -483,51 +513,36 @@ static void
 _GatherGeomSubsets(
     const SdfPath& parentPath,
     const HdSceneIndexBaseRefPtr& sceneIndex,
-    const HdGeomSubsetsSchema& subsetsSchema,
     HdTopology* topology)
 {
     TF_VERIFY(topology);
-    std::vector<std::pair<const TfToken, const HdGeomSubsetSchema>> schemas;
-    
-    // Child prims (modern)
+    HdGeomSubsets subsets;
+    // Not all direct children are subsets, but all subsets are direct children.
+    // XXX: Both UsdImagingStageSceneIndex and HdLegacyGeomSubsetSceneIndex
+    // should report child prim paths in authored order.
     for (const SdfPath& childPath : sceneIndex->GetChildPrimPaths(parentPath)) {
-        const HdSceneIndexPrim child = sceneIndex->GetPrim(childPath);
+        const HdSceneIndexPrim& child = sceneIndex->GetPrim(childPath);
         if (child.primType != HdPrimTypeTokens->geomSubset ||
             child.dataSource == nullptr) {
             continue;
         }
-        schemas.push_back(
-            { childPath.GetNameToken(), HdGeomSubsetSchema(child.dataSource) });
-    }
-    
-    // HdGeomSubsetsSchema (legacy)
-    if (subsetsSchema.IsDefined()) {
-        for (const TfToken& name : subsetsSchema.GetGeomSubsetNames()) {
-            schemas.push_back({ name, subsetsSchema.GetGeomSubset(name) });
-        }
-    }
-    
-    // common
-    const HdSceneIndexPrim parent = sceneIndex->GetPrim(parentPath);
-    HdGeomSubsets subsets;
-    for (auto& pair : schemas) {
-        if (!pair.second.IsDefined()) {
+        const auto& schema =
+            HdGeomSubsetSchema::GetFromParent(child.dataSource);
+        if (!schema.IsDefined()) {
             continue;
         }
-        const HdGeomSubsetSchema& schema = pair.second;
         const HdTokenDataSourceHandle typeDs = schema.GetType();
         if (!typeDs) {
             continue;
         }
         const TfToken type = typeDs->GetTypedValue(0.0f);
         const HdIntArrayDataSourceHandle indicesDs = schema.GetIndices();
+        static const VtIntArray emptyIndices;
         const VtIntArray indices = indicesDs
           ? indicesDs->GetTypedValue(0.0f)
-          : VtIntArray(0);
-        // XXX: topology comes to _GatherGeomSubsets() with empty invisible
-        // components, so no need to clear them before starting this loop.
-        if (!_IsVisible(schema.GetContainer())) {
-            if (auto topo = dynamic_cast<HdMeshTopology*>(topology)) {
+          : emptyIndices;
+        if (!_IsVisible(child.dataSource)) {
+            if (auto* topo = dynamic_cast<HdMeshTopology*>(topology)) {
                 if (type == HdGeomSubsetSchemaTokens->typeFaceSet) {
                     topo->SetInvisibleFaces(
                         _Union(topo->GetInvisibleFaces(), indices));
@@ -535,7 +550,7 @@ _GatherGeomSubsets(
                     topo->SetInvisiblePoints(
                         _Union(topo->GetInvisiblePoints(), indices));
                 }
-            } else if (auto topo =
+            } else if (auto* topo =
                 dynamic_cast<HdBasisCurvesTopology*>(topology)) {
                 if (type == HdGeomSubsetSchemaTokens->typeCurveSet) {
                     topo->SetInvisibleCurves(
@@ -547,7 +562,7 @@ _GatherGeomSubsets(
             }
             continue;
         }
-        const SdfPath materialId = _GetBoundMaterialPath(schema.GetContainer());
+        const SdfPath materialId = _GetBoundMaterialPath(child.dataSource);
         if (materialId.IsEmpty()) {
             continue;
         }
@@ -555,15 +570,12 @@ _GatherGeomSubsets(
             
             // XXX: Hard-coded face type since it is the only one supported.
             HdGeomSubset::Type::TypeFaceSet,
-            
-            // XXX: This is just the name token, but HdGeomSubset takes a path.
-            // The lack of a full path here does not appear to break anything.
-            SdfPath(pair.first),
+            childPath,
             materialId,
             indices });
     }
     
-    if (auto topo = dynamic_cast<HdMeshTopology*>(topology)) {
+    if (auto* topo = dynamic_cast<HdMeshTopology*>(topology)) {
         topo->SetGeomSubsets(subsets);
     }
 }
@@ -619,8 +631,7 @@ HdSceneIndexAdapterSceneDelegate::GetMeshTopology(SdfPath const &id)
         faceVertexIndicesDataSource->GetTypedValue(0.0f),
         holeIndices);
     
-    _GatherGeomSubsets(
-        id, _inputSceneIndex, meshSchema.GetGeomSubsets(), &meshTopology);
+    _GatherGeomSubsets(id, _inputSceneIndex, &meshTopology);
 
     return meshTopology;
 }
@@ -829,8 +840,7 @@ HdSceneIndexAdapterSceneDelegate::GetBasisCurvesTopology(SdfPath const &id)
         curveVertexCountsDataSource->GetTypedValue(0.0f),
         curveIndices);
 
-    _GatherGeomSubsets(
-        id, _inputSceneIndex, basisCurvesSchema.GetGeomSubsets(), &result);
+    _GatherGeomSubsets(id, _inputSceneIndex, &result);
 
     return result;
 }
@@ -1235,10 +1245,10 @@ HdSceneIndexAdapterSceneDelegate::GetCameraParamValue(
         return VtValue();
     }
 
-    HdContainerDataSourceHandle camera =
-        HdContainerDataSource::Cast(
-            prim.dataSource->Get(HdCameraSchemaTokens->camera));
-    if (!camera) {
+    HdCameraSchema cameraSchema =
+        HdCameraSchema::GetFromParent(prim.dataSource);
+
+    if (!cameraSchema) {
         return VtValue();
     }
 
@@ -1250,9 +1260,20 @@ HdSceneIndexAdapterSceneDelegate::GetCameraParamValue(
     if (!locator.IsEmpty()) {
         if (HdSampledDataSourceHandle const ds =
                 HdSampledDataSource::Cast(
-                    HdContainerDataSource::Get(camera, locator))) {
+                    HdContainerDataSource::Get(
+                        cameraSchema.GetNamespacedProperties().GetContainer(),
+                        locator))) {
+            return ds->GetValue(0.0f);
+        }
+
+        if (HdSampledDataSourceHandle const ds =
+                HdSampledDataSource::Cast(
+                    HdContainerDataSource::Get(
+                        cameraSchema.GetContainer(),
+                        locator))) {
             return ds->GetValue(0.0f);
         }
+
         // If there was no nested data source for the data source locator
         // we constructed, fall through to query for "foo:bar".
         //
@@ -1272,7 +1293,7 @@ HdSceneIndexAdapterSceneDelegate::GetCameraParamValue(
 
     HdSampledDataSourceHandle valueDs =
         HdSampledDataSource::Cast(
-            camera->Get(cameraSchemaToken));
+            cameraSchema.GetContainer()->Get(cameraSchemaToken));
     if (!valueDs) {
         return VtValue();
     }
@@ -1641,28 +1662,50 @@ HdSceneIndexAdapterSceneDelegate::GetPrimvarDescriptors(
 {
     TRACE_FUNCTION();
     HF_MALLOC_TAG_FUNCTION();
-    HdPrimvarDescriptorVector result;
 
     _PrimCacheTable::iterator it = _primCache.find(id);
     if (it == _primCache.end()) {
-        return result;
+        return {};
     }
 
-    if (it->second.primvarDescriptorsState.load() ==
-            _PrimCacheEntry::ReadStateRead) {
-        return it->second.primvarDescriptors[interpolation];
+    std::shared_ptr<_PrimCacheEntry::PrimvarDescriptorsArray> expected =
+        std::atomic_load(&(it->second.primvarDescriptors));
+    if (expected) {
+        return (*expected)[interpolation];
     }
 
     HdSceneIndexPrim prim = _GetInputPrim(id);
     if (!prim.dataSource) {
-        it->second.primvarDescriptorsState.store(
-            _PrimCacheEntry::ReadStateRead);
-        return result;
+        return {};
+    }
+
+    std::shared_ptr<_PrimCacheEntry::PrimvarDescriptorsArray> desired =
+        _ComputePrimvarDescriptors(prim.dataSource);
+
+    // Since multiple threads may arrive here at once, we only let the first one
+    // write, and later threads discard their version.
+    if (std::atomic_compare_exchange_strong(
+            &(it->second.primvarDescriptors),
+            &expected,
+            desired)) {
+        return (*desired)[interpolation];
+    } else {
+        return (*expected)[interpolation];
+    }
+}
+
+std::shared_ptr<HdSceneIndexAdapterSceneDelegate::_PrimCacheEntry::PrimvarDescriptorsArray>
+HdSceneIndexAdapterSceneDelegate::_ComputePrimvarDescriptors(
+    const HdContainerDataSourceHandle &primDataSource)
+{
+    if (!TF_VERIFY(primDataSource)) {
+        return nullptr;
     }
 
-    std::map<HdInterpolation, HdPrimvarDescriptorVector> descriptors;
+    _PrimCacheEntry::PrimvarDescriptorsArray descriptors;
+
     if (HdPrimvarsSchema primvars =
-        HdPrimvarsSchema::GetFromParent(prim.dataSource)) {
+        HdPrimvarsSchema::GetFromParent(primDataSource)) {
         for (const TfToken &name : primvars.GetPrimvarNames()) {
             HdPrimvarSchema primvar = primvars.GetPrimvar(name);
             if (!primvar) {
@@ -1681,6 +1724,10 @@ HdSceneIndexAdapterSceneDelegate::GetPrimvarDescriptors(
             HdInterpolation interpolation =
                 Hd_InterpolationAsEnum(interpolationToken);
 
+            if (interpolation >= HdInterpolationCount) {
+                continue;
+            }
+
             TfToken roleToken;
             if (HdTokenDataSourceHandle roleDataSource =
                     primvar.GetRole()) {
@@ -1694,17 +1741,8 @@ HdSceneIndexAdapterSceneDelegate::GetPrimvarDescriptors(
         }
     }
 
-    _PrimCacheEntry::ReadState current = _PrimCacheEntry::ReadStateUnread;
-    if (it->second.primvarDescriptorsState.compare_exchange_strong(
-            current, _PrimCacheEntry::ReadStateReading)) {
-        it->second.primvarDescriptors = std::move(descriptors);
-        it->second.primvarDescriptorsState.store(
-            _PrimCacheEntry::ReadStateRead);
-
-        return it->second.primvarDescriptors[interpolation];
-    }
-
-    return descriptors[interpolation];
+    return std::make_shared<_PrimCacheEntry::PrimvarDescriptorsArray>(
+            std::move(descriptors));
 }
 
 HdExtComputationPrimvarDescriptorVector
@@ -1713,29 +1751,50 @@ HdSceneIndexAdapterSceneDelegate::GetExtComputationPrimvarDescriptors(
 {
     TRACE_FUNCTION();
     HF_MALLOC_TAG_FUNCTION();
-    HdExtComputationPrimvarDescriptorVector result;
 
     _PrimCacheTable::iterator it = _primCache.find(id);
     if (it == _primCache.end()) {
-        return result;
+        return {};
     }
 
-    if (it->second.extCmpPrimvarDescriptorsState.load() ==
-            _PrimCacheEntry::ReadStateRead) {
-        return it->second.extCmpPrimvarDescriptors[interpolation];
+    std::shared_ptr<_PrimCacheEntry::ExtCmpPrimvarDescriptorsArray> expected =
+        std::atomic_load(&(it->second.extCmpPrimvarDescriptors));
+    if (expected) {
+        return (*expected)[interpolation];
     }
 
     HdSceneIndexPrim prim = _GetInputPrim(id);
     if (!prim.dataSource) {
-        it->second.extCmpPrimvarDescriptorsState.store(
-            _PrimCacheEntry::ReadStateRead);
-        return result;
+        return {};
+    }
+
+    std::shared_ptr<_PrimCacheEntry::ExtCmpPrimvarDescriptorsArray> desired =
+        _ComputeExtCmpPrimvarDescriptors(prim.dataSource);
+
+    // Since multiple threads may arrive here at once, we only let the first one
+    // write, and later threads discard their version.
+    if (std::atomic_compare_exchange_strong(
+            (&it->second.extCmpPrimvarDescriptors),
+            &expected,
+            desired)) {
+        return (*desired)[interpolation];
+    } else {
+        return (*expected)[interpolation];
     }
+}
+
+std::shared_ptr<HdSceneIndexAdapterSceneDelegate::_PrimCacheEntry::ExtCmpPrimvarDescriptorsArray>
+HdSceneIndexAdapterSceneDelegate::_ComputeExtCmpPrimvarDescriptors(
+    const HdContainerDataSourceHandle &primDataSource)
+{
+    if (!TF_VERIFY(primDataSource)) {
+        return nullptr;
+    }
+
+    _PrimCacheEntry::ExtCmpPrimvarDescriptorsArray descriptors;
 
-    std::map<HdInterpolation, HdExtComputationPrimvarDescriptorVector>
-        descriptors;
     if (HdExtComputationPrimvarsSchema primvars =
-        HdExtComputationPrimvarsSchema::GetFromParent(prim.dataSource)) {
+        HdExtComputationPrimvarsSchema::GetFromParent(primDataSource)) {
         for (const TfToken &name : primvars.GetExtComputationPrimvarNames()) {
             HdExtComputationPrimvarSchema primvar = primvars.GetPrimvar(name);
             if (!primvar) {
@@ -1753,6 +1812,10 @@ HdSceneIndexAdapterSceneDelegate::GetExtComputationPrimvarDescriptors(
             HdInterpolation interpolation =
                 Hd_InterpolationAsEnum(interpolationToken);
 
+            if (interpolation >= HdInterpolationCount) {
+                continue;
+            }
+
             TfToken roleToken;
             if (HdTokenDataSourceHandle roleDataSource =
                     primvar.GetRole()) {
@@ -1784,22 +1847,8 @@ HdSceneIndexAdapterSceneDelegate::GetExtComputationPrimvarDescriptors(
         }
     }
 
-    if (it->second.extCmpPrimvarDescriptorsState.load() ==
-            _PrimCacheEntry::ReadStateUnread) {
-        it->second.extCmpPrimvarDescriptorsState.store(
-            _PrimCacheEntry::ReadStateReading);
-        it->second.extCmpPrimvarDescriptors = std::move(descriptors);
-        it->second.extCmpPrimvarDescriptorsState.store(
-            _PrimCacheEntry::ReadStateRead);
-    } else {
-        // if someone is in the process of filling the entry, just
-        // return our value instead of trying to assign
-        return descriptors[interpolation];
-    }
-    
-    return it->second.extCmpPrimvarDescriptors[interpolation];
-
-
+    return std::make_shared<_PrimCacheEntry::ExtCmpPrimvarDescriptorsArray>(
+            std::move(descriptors));
 }
 
 VtValue 
@@ -2061,23 +2110,54 @@ HdSceneIndexAdapterSceneDelegate::SamplePrimvar(
         size_t maxSampleCount, float *sampleTimes, 
         VtValue *sampleValues)
 {
-    return _SamplePrimvar(id, key, maxSampleCount, sampleTimes, sampleValues,
+    return _SamplePrimvar(
+        id, key, _fallbackStartTime, _fallbackEndTime,
+        maxSampleCount, sampleTimes, sampleValues,
         nullptr);
 }
 
+size_t
+HdSceneIndexAdapterSceneDelegate::SamplePrimvar(
+        SdfPath const &id, TfToken const &key,
+        float startTime, float endTime,
+        size_t maxSampleCount, float *sampleTimes, 
+        VtValue *sampleValues)
+{
+    return _SamplePrimvar(
+        id, key, startTime, endTime,
+        maxSampleCount, sampleTimes, sampleValues,
+        nullptr);
+}
+
+size_t
+HdSceneIndexAdapterSceneDelegate::SampleIndexedPrimvar(
+        SdfPath const &id, TfToken const &key,
+        size_t maxSampleCount, float *sampleTimes, 
+        VtValue *sampleValues, VtIntArray *sampleIndices)
+{
+    return _SamplePrimvar(
+        id, key, _fallbackStartTime, _fallbackEndTime,
+        maxSampleCount, sampleTimes, sampleValues,
+        sampleIndices);
+}
+
 size_t
 HdSceneIndexAdapterSceneDelegate::SampleIndexedPrimvar(
         SdfPath const &id, TfToken const &key,
+        float startTime, float endTime,
         size_t maxSampleCount, float *sampleTimes, 
         VtValue *sampleValues, VtIntArray *sampleIndices)
 {
-    return _SamplePrimvar(id, key, maxSampleCount, sampleTimes, sampleValues,
+    return _SamplePrimvar(
+        id, key, startTime, endTime,
+        maxSampleCount, sampleTimes, sampleValues,
         sampleIndices);
 }
 
 size_t
 HdSceneIndexAdapterSceneDelegate::_SamplePrimvar(
         SdfPath const &id, TfToken const &key,
+        float startTime, float endTime,
         size_t maxSampleCount, float *sampleTimes, 
         VtValue *sampleValues, VtIntArray *sampleIndices)
 {
@@ -2133,9 +2213,6 @@ HdSceneIndexAdapterSceneDelegate::_SamplePrimvar(
     // responsible for setting the shutter window.  We can't query it, but
     // we pass the infinite window to accept all time samples from the
     // scene delegate.
-    //
-    // If the input prim is a datasource prim, we need some sensible default
-    // here...  For now, we pass [0,0] to turn off multisampling.
     if (prim.dataSource->Get(HdSceneIndexEmulationTokens->sceneDelegate)) {
         valueSource->GetContributingSampleTimesForInterval(
                 std::numeric_limits<float>::lowest(),
@@ -2148,7 +2225,7 @@ HdSceneIndexAdapterSceneDelegate::_SamplePrimvar(
     } else {
         const bool isVarying =
             valueSource->GetContributingSampleTimesForInterval(
-                0, 0, &times);
+                startTime, endTime, &times);
         if (isVarying) {
             if (times.empty()) {
                 TF_CODING_ERROR("No contributing sample times returned for "
@@ -2218,6 +2295,17 @@ size_t
 HdSceneIndexAdapterSceneDelegate::SampleTransform(
         SdfPath const &id, size_t maxSampleCount,
         float *sampleTimes, GfMatrix4d *sampleValues)
+{
+    return SampleTransform(
+        id, _fallbackStartTime, _fallbackEndTime,
+        maxSampleCount, sampleTimes, sampleValues);
+}
+
+size_t
+HdSceneIndexAdapterSceneDelegate::SampleTransform(
+        SdfPath const &id, float startTime, float endTime,
+        size_t maxSampleCount,
+        float *sampleTimes, GfMatrix4d *sampleValues)
 {
     TRACE_FUNCTION();
     HF_MALLOC_TAG_FUNCTION();
@@ -2239,16 +2327,13 @@ HdSceneIndexAdapterSceneDelegate::SampleTransform(
     // responsible for setting the shutter window.  We can't query it, but
     // we pass the infinite window to accept all time samples from the
     // scene delegate.
-    //
-    // If the input prim is a datasource prim, we need some sensible default
-    // here...  For now, we pass [0,0] to turn off multisampling.
     if (prim.dataSource->Get(HdSceneIndexEmulationTokens->sceneDelegate)) {
         matrixSource->GetContributingSampleTimesForInterval(
                 std::numeric_limits<float>::lowest(),
                 std::numeric_limits<float>::max(), &times);
     } else {
         matrixSource->GetContributingSampleTimesForInterval(
-                0, 0, &times);
+            startTime, endTime, &times);
     }
 
     // XXX fallback to include a single sample
@@ -2277,6 +2362,15 @@ HdSceneIndexAdapterSceneDelegate::SampleInstancerTransform(
     return SampleTransform(id, maxSampleCount, sampleTimes, sampleValues);
 }
 
+size_t
+HdSceneIndexAdapterSceneDelegate::SampleInstancerTransform(
+        SdfPath const &id, float startTime, float endTime,
+        size_t maxSampleCount,
+        float *sampleTimes, GfMatrix4d *sampleValues)
+{
+    return SampleTransform(
+        id, startTime, endTime, maxSampleCount, sampleTimes, sampleValues);
+}
 
 std::vector<VtArray<TfToken>>
 HdSceneIndexAdapterSceneDelegate::GetInstanceCategories(
@@ -2445,8 +2539,22 @@ HdSceneIndexAdapterSceneDelegate::GetExtComputationInput(
 
 size_t
 HdSceneIndexAdapterSceneDelegate::SampleExtComputationInput(
-        SdfPath const &computationId,
-        TfToken const &input, size_t maxSampleCount,
+        SdfPath const &computationId, TfToken const &input,
+        size_t maxSampleCount,
+        float *sampleTimes, VtValue *sampleValues)
+{
+    return
+        SampleExtComputationInput(
+            computationId, input,
+            _fallbackStartTime, _fallbackEndTime,
+            maxSampleCount, sampleTimes, sampleValues);
+}
+
+size_t
+HdSceneIndexAdapterSceneDelegate::SampleExtComputationInput(
+        SdfPath const &computationId, TfToken const &input,
+        float startTime, float endTime,
+        size_t maxSampleCount,
         float *sampleTimes, VtValue *sampleValues)
 {
     TRACE_FUNCTION();
@@ -2473,16 +2581,13 @@ HdSceneIndexAdapterSceneDelegate::SampleExtComputationInput(
     // responsible for setting the shutter window.  We can't query it, but
     // we pass the infinite window to accept all time samples from the
     // scene delegate.
-    //
-    // If the input prim is a datasource prim, we need some sensible default
-    // here...  For now, we pass [0,0] to turn off multisampling.
     if (prim.dataSource->Get(HdSceneIndexEmulationTokens->sceneDelegate)) {
         valueDs->GetContributingSampleTimesForInterval(
                 std::numeric_limits<float>::lowest(),
                 std::numeric_limits<float>::max(), &times);
     } else {
         valueDs->GetContributingSampleTimesForInterval(
-                0, 0, &times);
+                startTime, endTime, &times);
     }
 
     size_t authoredSamples = times.size();
diff --git a/pxr/imaging/hd/sceneIndexAdapterSceneDelegate.h b/pxr/imaging/hd/sceneIndexAdapterSceneDelegate.h
index 11b31d1ac0..ab112c11c3 100644
--- a/pxr/imaging/hd/sceneIndexAdapterSceneDelegate.h
+++ b/pxr/imaging/hd/sceneIndexAdapterSceneDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SCENE_INDEX_ADAPTER_SCENE_DELEGATE_H
 #define PXR_IMAGING_HD_SCENE_INDEX_ADAPTER_SCENE_DELEGATE_H
@@ -103,12 +86,20 @@ class HdSceneIndexAdapterSceneDelegate
     GfMatrix4d GetTransform(SdfPath const &id) override;
     size_t SampleTransform(SdfPath const &id, size_t maxSampleCount,
         float *sampleTimes, GfMatrix4d *sampleValues) override;
+    size_t SampleTransform(SdfPath const &id,
+        float startTime, float endTime,
+        size_t maxSampleCount,
+        float *sampleTimes, GfMatrix4d *sampleValues) override;
 
     GfMatrix4d GetInstancerTransform(
         SdfPath const &instancerId) override;
     size_t SampleInstancerTransform(SdfPath const &instancerId,
         size_t maxSampleCount, float *sampleTimes,
         GfMatrix4d *sampleValues) override;
+    size_t SampleInstancerTransform(SdfPath const &instancerId,
+        float startTime, float endTime,
+        size_t maxSampleCount, float *sampleTimes,
+        GfMatrix4d *sampleValues) override;
 
     // ------------------------------------------------------------------------
     // Primvar API
@@ -124,10 +115,17 @@ class HdSceneIndexAdapterSceneDelegate
     size_t SamplePrimvar(SdfPath const &id, TfToken const &key,
             size_t maxSampleCount, float *sampleTimes, 
             VtValue *sampleValues) override;
+    size_t SamplePrimvar(SdfPath const &id, TfToken const &key,
+            float startTime, float endTime,
+            size_t maxSampleCount, float *sampleTimes, 
+            VtValue *sampleValues) override;
     size_t SampleIndexedPrimvar(SdfPath const &id, TfToken const &key,
             size_t maxNumSamples, float *times, VtValue *samples, 
             VtIntArray *sampleIndices) override;
-
+    size_t SampleIndexedPrimvar(SdfPath const &id, TfToken const &key,
+            float startTime, float endTime,                                
+            size_t maxNumSamples, float *times, VtValue *samples, 
+            VtIntArray *sampleIndices) override;
     
     // ------------------------------------------------------------------------
     // Instancer API
@@ -183,6 +181,14 @@ class HdSceneIndexAdapterSceneDelegate
         size_t maxSampleCount,
         float *sampleTimes,
         VtValue *sampleValues) override;
+    size_t SampleExtComputationInput(
+        SdfPath const &computationId,
+        TfToken const &input,
+        float startTime,
+        float endTime,
+        size_t maxSampleCount,
+        float *sampleTimes,
+        VtValue *sampleValues) override;
 
     HdExtComputationInputDescriptorVector GetExtComputationInputDescriptors(
         SdfPath const &computationId) override;
@@ -233,6 +239,7 @@ class HdSceneIndexAdapterSceneDelegate
         const TfToken& key);
 
     size_t _SamplePrimvar(SdfPath const &id, TfToken const &key,
+        float startTime, float endTime,
         size_t maxNumSamples, float *times, VtValue *samples, 
         VtIntArray *sampleIndices);
 
@@ -240,38 +247,27 @@ class HdSceneIndexAdapterSceneDelegate
 
     struct _PrimCacheEntry
     {
-        _PrimCacheEntry()
-        : primvarDescriptorsState(ReadStateUnread)
-        , extCmpPrimvarDescriptorsState(ReadStateUnread)
-        {}
-
-        _PrimCacheEntry(const _PrimCacheEntry &rhs)
-        {
-            primType = rhs.primType;
-            primvarDescriptorsState.store(rhs.primvarDescriptorsState.load());
-            extCmpPrimvarDescriptorsState.store(
-                rhs.extCmpPrimvarDescriptorsState.load());
-        }
-
         TfToken primType;
 
-        enum ReadState : unsigned char {
-            ReadStateUnread = 0,
-            ReadStateReading,
-            ReadStateRead,
-        };
-
-        std::atomic<ReadState> primvarDescriptorsState;
-        std::atomic<ReadState> extCmpPrimvarDescriptorsState;
-        std::map<HdInterpolation, HdPrimvarDescriptorVector>
-            primvarDescriptors;
-        std::map<HdInterpolation, HdExtComputationPrimvarDescriptorVector> 
-            extCmpPrimvarDescriptors;
+        using PrimvarDescriptorsArray =
+            std::array<HdPrimvarDescriptorVector, HdInterpolationCount>;
+        std::shared_ptr<PrimvarDescriptorsArray> primvarDescriptors;
+        using ExtCmpPrimvarDescriptorsArray =
+            std::array<HdExtComputationPrimvarDescriptorVector,
+                HdInterpolationCount>;
+        std::shared_ptr<ExtCmpPrimvarDescriptorsArray> extCmpPrimvarDescriptors;
     };
 
     using _PrimCacheTable = SdfPathTable<_PrimCacheEntry>;
     _PrimCacheTable _primCache;
 
+    std::shared_ptr<_PrimCacheEntry::PrimvarDescriptorsArray>
+        _ComputePrimvarDescriptors(
+            const HdContainerDataSourceHandle &primDataSource);
+    std::shared_ptr<_PrimCacheEntry::ExtCmpPrimvarDescriptorsArray>
+        _ComputeExtCmpPrimvarDescriptors(
+            const HdContainerDataSourceHandle &primDataSource);
+
     bool _sceneDelegatesBuilt;
     std::vector<HdSceneDelegate*> _sceneDelegates;
 
diff --git a/pxr/imaging/hd/sceneIndexObserver.cpp b/pxr/imaging/hd/sceneIndexObserver.cpp
index ee3ded8024..91c13a18a4 100644
--- a/pxr/imaging/hd/sceneIndexObserver.cpp
+++ b/pxr/imaging/hd/sceneIndexObserver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sceneIndexObserver.h"
 #include "pxr/imaging/hd/sceneIndex.h"
diff --git a/pxr/imaging/hd/sceneIndexObserver.h b/pxr/imaging/hd/sceneIndexObserver.h
index 4b73e3cc62..68beb91cd5 100644
--- a/pxr/imaging/hd/sceneIndexObserver.h
+++ b/pxr/imaging/hd/sceneIndexObserver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SCENE_INDEX_OBSERVER_H
 #define PXR_IMAGING_HD_SCENE_INDEX_OBSERVER_H
diff --git a/pxr/imaging/hd/sceneIndexPlugin.cpp b/pxr/imaging/hd/sceneIndexPlugin.cpp
index 70efd977e6..5fbc249d22 100644
--- a/pxr/imaging/hd/sceneIndexPlugin.cpp
+++ b/pxr/imaging/hd/sceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sceneIndexPlugin.h"
 #include "pxr/base/tf/registryManager.h"
diff --git a/pxr/imaging/hd/sceneIndexPlugin.h b/pxr/imaging/hd/sceneIndexPlugin.h
index 7a7efa012f..7087e860d3 100644
--- a/pxr/imaging/hd/sceneIndexPlugin.h
+++ b/pxr/imaging/hd/sceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/hd/sceneIndexPluginRegistry.cpp b/pxr/imaging/hd/sceneIndexPluginRegistry.cpp
index 24a6062577..52ef1ec605 100644
--- a/pxr/imaging/hd/sceneIndexPluginRegistry.cpp
+++ b/pxr/imaging/hd/sceneIndexPluginRegistry.cpp
@@ -1,28 +1,12 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
 #include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "pxr/imaging/hd/sceneIndexUtil.h"
 #include "pxr/imaging/hd/overlayContainerDataSource.h"
 #include "pxr/imaging/hd/retainedDataSource.h"
 
@@ -201,8 +185,15 @@ HdSceneIndexPluginRegistry::AppendSceneIndicesForRenderer(
         }
     }
 
-    return _AppendForPhases(inputScene, mergedPhasesMap,
-                            underlayArgs, renderInstanceId);
+    HdSceneIndexBaseRefPtr scene =
+        _AppendForPhases(inputScene, mergedPhasesMap,
+                         underlayArgs, renderInstanceId);
+    if (TfGetEnvSetting<bool>(HD_USE_ENCAPSULATING_SCENE_INDICES)) {
+        scene = HdMakeEncapsulatingSceneIndex(
+            { inputScene }, scene);
+        scene->SetDisplayName("Scene index plugins");
+    }
+    return scene;
 }
 
 void
diff --git a/pxr/imaging/hd/sceneIndexPluginRegistry.h b/pxr/imaging/hd/sceneIndexPluginRegistry.h
index 40f7c40644..6d7727120c 100644
--- a/pxr/imaging/hd/sceneIndexPluginRegistry.h
+++ b/pxr/imaging/hd/sceneIndexPluginRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SCENE_INDEX_PLUGIN_REGISTRY_H
 #define PXR_IMAGING_HD_SCENE_INDEX_PLUGIN_REGISTRY_H
diff --git a/pxr/imaging/hd/sceneIndexPrimView.cpp b/pxr/imaging/hd/sceneIndexPrimView.cpp
index c0cf6a365f..ce1b41638a 100644
--- a/pxr/imaging/hd/sceneIndexPrimView.cpp
+++ b/pxr/imaging/hd/sceneIndexPrimView.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sceneIndexPrimView.h"
 
diff --git a/pxr/imaging/hd/sceneIndexPrimView.h b/pxr/imaging/hd/sceneIndexPrimView.h
index 6929c46ff3..bb9b7b8cc5 100644
--- a/pxr/imaging/hd/sceneIndexPrimView.h
+++ b/pxr/imaging/hd/sceneIndexPrimView.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SCENE_INDEX_PRIM_VIEW_H
 #define PXR_IMAGING_HD_SCENE_INDEX_PRIM_VIEW_H
diff --git a/pxr/imaging/hd/sceneIndexUtil.cpp b/pxr/imaging/hd/sceneIndexUtil.cpp
new file mode 100644
index 0000000000..a85b6cb85c
--- /dev/null
+++ b/pxr/imaging/hd/sceneIndexUtil.cpp
@@ -0,0 +1,244 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/imaging/hd/sceneIndexUtil.h"
+
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+
+#include "pxr/base/trace/trace.h"
+
+#include <unordered_set>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_ENV_SETTING(
+    HD_USE_ENCAPSULATING_SCENE_INDICES,
+    false,
+    "Whether to use encapsulating scene indices.");
+
+namespace
+{
+
+class _EncapsulatingSceneIndexBase : public HdSceneIndexBase
+{
+public:
+    _EncapsulatingSceneIndexBase(
+        std::vector<HdSceneIndexBaseRefPtr> inputScenes)
+    {
+    }
+};
+    
+class _FilteringEncapsulatingSceneIndexBase : public HdFilteringSceneIndexBase
+{
+public:
+    _FilteringEncapsulatingSceneIndexBase(
+        std::vector<HdSceneIndexBaseRefPtr> inputScenes)
+      : _inputScenes(std::move(inputScenes))
+    {
+    }
+    
+    std::vector<HdSceneIndexBaseRefPtr> GetInputScenes() const override
+    {
+        return _inputScenes;
+    }
+
+private:
+    const std::vector<HdSceneIndexBaseRefPtr> _inputScenes;
+};
+
+template<typename Base>
+class _EncapsulatingSceneIndex : public Base, public HdEncapsulatingSceneIndexBase
+{
+public:
+    using This = _EncapsulatingSceneIndex<Base>;
+
+    static TfRefPtr<This> New(
+        const std::vector<HdSceneIndexBaseRefPtr> &inputScenes,
+        HdSceneIndexBaseRefPtr const &encapsulatedScene)
+    {
+        return TfCreateRefPtr(
+            new _EncapsulatingSceneIndex(
+                inputScenes, encapsulatedScene));
+    }
+
+    std::vector<HdSceneIndexBaseRefPtr> GetEncapsulatedScenes() const override {
+        return { _encapsulatedScene };
+    }
+
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override {
+        return _encapsulatedScene->GetPrim(primPath);
+    }
+
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override {
+        return _encapsulatedScene->GetChildPrimPaths(primPath);
+    }
+
+private:
+    _EncapsulatingSceneIndex(
+        const std::vector<HdSceneIndexBaseRefPtr> &inputScenes,
+        HdSceneIndexBaseRefPtr const &encapsulatedScene)
+      : Base(inputScenes)
+      , _encapsulatedScene(encapsulatedScene)
+      , _observer(this)
+    {
+        _encapsulatedScene->AddObserver(HdSceneIndexObserverPtr(&_observer));
+    }
+
+    class _Observer : public HdSceneIndexObserver
+    {
+    public:
+        _Observer(This *owner)
+      : _owner(owner) {}
+
+        void PrimsAdded(
+            const HdSceneIndexBase &sender,
+            const AddedPrimEntries &entries) override
+        {
+            _owner->_SendPrimsAdded(entries);
+        }
+
+        void PrimsRemoved(
+            const HdSceneIndexBase &sender,
+            const RemovedPrimEntries &entries) override
+        {
+            _owner->_SendPrimsRemoved(entries);
+        }
+
+        void PrimsDirtied(
+            const HdSceneIndexBase &sender,
+            const DirtiedPrimEntries &entries) override
+        {
+            _owner->_SendPrimsDirtied(entries);
+        }
+
+        void PrimsRenamed(
+            const HdSceneIndexBase &sender,
+            const RenamedPrimEntries &entries) override
+        {
+            _owner->_SendPrimsRenamed(entries);
+        }
+    private:
+        This * const _owner;
+    };
+
+    HdSceneIndexBaseRefPtr const _encapsulatedScene;
+
+    _Observer _observer;
+};
+
+// Validation code.
+
+using _SceneIndexSet = std::unordered_set<HdSceneIndexBasePtr, TfHash>;
+
+void
+_RecurseInputScenes(HdSceneIndexBasePtr const &sceneIndex,
+                    const _SceneIndexSet &givenInputScenes,
+                    _SceneIndexSet * const allInputScenes,
+                    _SceneIndexSet * const externalScenes)
+{
+    const auto [it, inserted] = allInputScenes->insert(sceneIndex);
+    if (!inserted) {
+        return;
+    }
+
+    if (givenInputScenes.count(sceneIndex)) {
+        externalScenes->insert(sceneIndex);
+        return;
+    }
+
+    auto const filteringSceneIndex =
+        TfDynamic_cast<HdFilteringSceneIndexBasePtr>(sceneIndex);
+    if (!filteringSceneIndex) {
+        return;
+    }
+
+    for (HdSceneIndexBasePtr const &inputScene
+             : filteringSceneIndex->GetInputScenes()) {
+        _RecurseInputScenes(
+            inputScene,
+            givenInputScenes,
+            allInputScenes,
+            externalScenes);
+    }
+}
+
+void
+_ValidateInputScenesCanBeReached(
+    const std::vector<HdSceneIndexBaseRefPtr> &inputScenes,
+    HdSceneIndexBaseRefPtr const &encapsulatedScene)
+{
+    TRACE_FUNCTION();
+
+    const _SceneIndexSet givenInputScenes(
+        inputScenes.begin(), inputScenes.end());
+
+    _SceneIndexSet allInputScenes;
+    _SceneIndexSet externalScenes;
+
+    _RecurseInputScenes(
+        encapsulatedScene,
+        givenInputScenes,
+        &allInputScenes,
+        &externalScenes);
+
+    if (givenInputScenes.size() == externalScenes.size()) {
+        return;
+    }
+
+    std::string missingInputs;
+    for (HdSceneIndexBasePtr const &inputScene : givenInputScenes) {
+        if (externalScenes.count(inputScene)) {
+            continue;
+        }
+        if (!missingInputs.empty()) {
+            missingInputs += ", ";
+        }
+        if (inputScene) {
+            missingInputs += inputScene->GetDisplayName();
+        } else {
+            missingInputs += "[NULL]";
+        }
+    }
+
+    TF_CODING_ERROR(
+        "In HdMakeEncapsulatingSceneIndex, the following given input scenes "
+        "could not be reached from the encapsulated scene (%s): %s.",
+        encapsulatedScene->GetDisplayName().c_str(),
+        missingInputs.c_str());
+}
+
+}
+
+HdSceneIndexBaseRefPtr
+HdMakeEncapsulatingSceneIndex(
+    const std::vector<HdSceneIndexBaseRefPtr> &inputScenes,
+    HdSceneIndexBaseRefPtr const &encapsulatedScene)
+{
+    if (!encapsulatedScene) {
+        if (!inputScenes.empty()) {
+            TF_CODING_ERROR("Expected encapsulatedScene");
+        }
+        return TfNullPtr;
+    }
+
+    if (inputScenes.empty()) {
+        using Base = _EncapsulatingSceneIndexBase;
+        return _EncapsulatingSceneIndex<Base>::New(
+            inputScenes, encapsulatedScene);
+    } else {
+        // Raise coding error if the input scenes cannot be
+        // reached from the encapsulated scene.
+        _ValidateInputScenesCanBeReached(
+            inputScenes, encapsulatedScene);
+
+        using Base = _FilteringEncapsulatingSceneIndexBase;
+        return _EncapsulatingSceneIndex<Base>::New(
+            inputScenes, encapsulatedScene);
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hd/sceneIndexUtil.h b/pxr/imaging/hd/sceneIndexUtil.h
new file mode 100644
index 0000000000..51f6f7a9f7
--- /dev/null
+++ b/pxr/imaging/hd/sceneIndexUtil.h
@@ -0,0 +1,46 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_IMAGING_HD_SCENE_INDEX_UTIL_H
+#define PXR_IMAGING_HD_SCENE_INDEX_UTIL_H
+
+#include "pxr/pxr.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/base/tf/envSetting.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// The open-source version of the Hydra Scene Browser cannot descend into
+/// HdEncapsulatingSceneIndexBase. Thus, we have an environment variable to
+/// disable the use HdEncapsulatingSceneIndexBase.
+///
+HD_API
+extern TfEnvSetting<bool> HD_USE_ENCAPSULATING_SCENE_INDICES;
+
+/// Make a scene index that encapsulates the given scene and (recursively)
+/// all its inputs until a given input scene is hit.
+///
+/// The resulting scene index is simply forwarding any calls to the
+/// given encapsulated scene index.
+///
+/// See HdEncapsulatingSceneIndexBase and HdFilteringSceneIndexBase for
+/// details.
+///
+/// The resulting scene index should be thought of one node in the
+/// nested scene index graph. The inputs of this node are the given
+/// input scenes. The terminal node in the graph internal to the resulting
+/// scene index is the given encapsulated scene index.
+///
+HD_API
+HdSceneIndexBaseRefPtr
+HdMakeEncapsulatingSceneIndex(
+    const std::vector<HdSceneIndexBaseRefPtr> &inputScenes,
+    HdSceneIndexBaseRefPtr const &encapsulatedScene);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HD_SCENE_INDEX_UTIL_H
diff --git a/pxr/imaging/hd/schema.cpp b/pxr/imaging/hd/schema.cpp
index 1b00f3c61a..21f8b1b5d6 100644
--- a/pxr/imaging/hd/schema.cpp
+++ b/pxr/imaging/hd/schema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/schema.h"
diff --git a/pxr/imaging/hd/schema.h b/pxr/imaging/hd/schema.h
index 17eedccb26..f625b877fd 100644
--- a/pxr/imaging/hd/schema.h
+++ b/pxr/imaging/hd/schema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_SCHEMA_H
diff --git a/pxr/imaging/hd/schemaTypeDefs.h b/pxr/imaging/hd/schemaTypeDefs.h
index 00ec239c9c..7d1543b8a3 100644
--- a/pxr/imaging/hd/schemaTypeDefs.h
+++ b/pxr/imaging/hd/schemaTypeDefs.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SCHEMA_TYPE_DEFS_H
 #define PXR_IMAGING_HD_SCHEMA_TYPE_DEFS_H
@@ -63,6 +46,8 @@ using HdMaterialNetworkContainerSchema =
     HdSchemaBasedContainerSchema<class HdMaterialNetworkSchema>;
 using HdMaterialConnectionContainerSchema =
     HdSchemaBasedContainerSchema<HdMaterialConnectionSchema>;
+using HdSampledDataSourceContainerContainerSchema =
+    HdSchemaBasedContainerSchema<HdSampledDataSourceContainerSchema>;
 
 // Containers of vectors of schemas
 using HdMaterialConnectionVectorContainerSchema =
diff --git a/pxr/imaging/hd/selection.cpp b/pxr/imaging/hd/selection.cpp
index 6551f80ce0..f1037da554 100644
--- a/pxr/imaging/hd/selection.cpp
+++ b/pxr/imaging/hd/selection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/selection.h"
 
diff --git a/pxr/imaging/hd/selection.h b/pxr/imaging/hd/selection.h
index 82ab305c4a..b26ef45e60 100644
--- a/pxr/imaging/hd/selection.h
+++ b/pxr/imaging/hd/selection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SELECTION_H
 #define PXR_IMAGING_HD_SELECTION_H
diff --git a/pxr/imaging/hd/selectionSchema.cpp b/pxr/imaging/hd/selectionSchema.cpp
index 2a770f1f11..b42f780533 100644
--- a/pxr/imaging/hd/selectionSchema.cpp
+++ b/pxr/imaging/hd/selectionSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/selectionSchema.h b/pxr/imaging/hd/selectionSchema.h
index 7f2454d2dd..04aa455bd5 100644
--- a/pxr/imaging/hd/selectionSchema.h
+++ b/pxr/imaging/hd/selectionSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/selectionsSchema.cpp b/pxr/imaging/hd/selectionsSchema.cpp
index 886bab08ab..0e608ce2d8 100644
--- a/pxr/imaging/hd/selectionsSchema.cpp
+++ b/pxr/imaging/hd/selectionsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/selectionsSchema.h"
diff --git a/pxr/imaging/hd/selectionsSchema.h b/pxr/imaging/hd/selectionsSchema.h
index 3521d328dd..cb829cd956 100644
--- a/pxr/imaging/hd/selectionsSchema.h
+++ b/pxr/imaging/hd/selectionsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_SELECTIONS_SCHEMA_H
diff --git a/pxr/imaging/hd/smoothNormals.cpp b/pxr/imaging/hd/smoothNormals.cpp
index 2e01e5f6ec..61bd197d2b 100644
--- a/pxr/imaging/hd/smoothNormals.cpp
+++ b/pxr/imaging/hd/smoothNormals.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/smoothNormals.h"
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hd/smoothNormals.h b/pxr/imaging/hd/smoothNormals.h
index ce93f93725..0042ef64cc 100644
--- a/pxr/imaging/hd/smoothNormals.h
+++ b/pxr/imaging/hd/smoothNormals.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SMOOTH_NORMALS_H
 #define PXR_IMAGING_HD_SMOOTH_NORMALS_H
diff --git a/pxr/imaging/hd/sortedIds.cpp b/pxr/imaging/hd/sortedIds.cpp
index 0fc15b1701..2046946baf 100644
--- a/pxr/imaging/hd/sortedIds.cpp
+++ b/pxr/imaging/hd/sortedIds.cpp
@@ -1,57 +1,165 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sortedIds.h"
 #include "pxr/imaging/hd/perfLog.h"
 
-static const ptrdiff_t INVALID_DELETE_POINT = -1;
+#include <algorithm>
+#include <bitset>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-//
-// Tweakable value
-//
-// If the count of unsorted ids is this value or lower, use insert
-// sort rather than a full sort.
-//
-static const size_t INSERTION_SORT_MAX_ENTRIES = 32;
+namespace {
 
-Hd_SortedIds::Hd_SortedIds()
- : _ids()
- , _sortedCount(0)
- , _afterLastDeletePoint(INVALID_DELETE_POINT)
+// A simple bloom filter to help determine if we need to search the removes list
+// for insertions or vice-versa during mixed remove/insert updates.
+class _PathBloomFilter
 {
+    // With 65536 bits in the bloom filter, 2 hash functions, at capacity 1024
+    // the expected probability of a false positive is 1/1056.
+    static constexpr size_t _LgNumBits = 16;
+    static constexpr size_t _NumBits = size_t(1) << _LgNumBits;
+    static constexpr size_t _Capacity = 1024;
+
+public:
+
+    // Insert an item.
+    void Insert(SdfPath const &p) {
+        const uint64_t hash = p.GetHash();
+        _bits.set(_Index1(hash));
+        _bits.set(_Index2(hash));
+        ++_size;
+    }
 
-}
+    // Return true if there's a possibility that the filter contains `p`,
+    // false if it is definitely not present.
+    bool MightContain(SdfPath const &p) const {
+        const uint64_t hash = p.GetHash();
+        return _bits.test(_Index1(hash)) && _bits.test(_Index2(hash));
+    }
+
+    // Return true if the number of Insert() calls is at or over capacity.
+    bool IsFull() const {
+        return _size >= _Capacity;
+    }
+
+private:
+    // The two hash functions just take the lowest 2 chunks of LgNumBits.
+    uint32_t _Index1(uint64_t hash) const {
+        return hash & (_NumBits-1);
+    }
+    uint32_t _Index2(uint64_t hash) const {
+        return (hash >> _LgNumBits) & (_NumBits-1);
+    }
+
+    size_t _size = 0;
+    std::bitset<_NumBits> _bits;
+};
+
+} // anon
+
+// The purpose of this helper is to ensure correct semantics for queued mixed
+// inserts & removals.  The problem is that order matters.  For example, if the
+// existing list is [], then the sequence Remove('A'), Insert('A') should
+// produce ['A'], while the sequence Insert('A'), Remove('A') should produce [].
+// However, if the queued inserts & removals are disjoint with no elements in
+// common, then they can be performed in either order.
+//
+// In practice, callers rarely if ever call Insert() and Remove() with common
+// elements.  The typical case is a "rename" operation where the old names are
+// removed and the new names are inserted.  So we use a bloom filter to quickly
+// check if a path is in the other list when we are asked to Insert() or
+// Remove().  If it is definitely not present, we can just push_back.  Otherwise
+// we linear-search the other list to see if it truly is present.  If it is, we
+// reject the operation, and the caller will _Sort() the ids and retry from
+// there.
+struct Hd_SortedIds::_UpdateImpl
+{
+    // Try to arrange to batch-insert `id`. If there's a preexising remove for
+    // `id` or if we're over capacity, we reject and return false.  In that case
+    // the caller has to _Sort() and retry the insert.
+    bool Insert(SdfPathVector *insertsPtr, SdfPath const &id) {
+        SdfPathVector &inserts = *insertsPtr;
+        // If we're at capacity for inserts, or we have an existing remove for
+        // this id, we can't take the insert, caller must _Sort.
+        if (_insertsBloom.IsFull() ||
+            (_removesBloom.MightContain(id) && _Find(_removes, id))) {
+            return false;
+        }
+        // Otherwise append it to inserts & insert in its bloom filter.
+        inserts.push_back(id);
+        _insertsBloom.Insert(id);
+        return true;
+    }
 
-Hd_SortedIds::Hd_SortedIds(Hd_SortedIds &&other)
- : _ids(std::move(other._ids))
- , _sortedCount(other._sortedCount)
- , _afterLastDeletePoint(other._afterLastDeletePoint)
+    // Try to arrange to batch-remove `id`. If there's a preexising insert for
+    // `id` or if we're over capacity, we reject and return false.  In that case
+    // the caller has to _Sort() and retry the remove.
+    bool Remove(SdfPathVector *insertsPtr, SdfPath const &id) {
+        SdfPathVector &inserts = *insertsPtr;
+        // If we're at capacity for removes, or we have an existing insert for
+        // this id, we can't take the remove, caller must _Sort.
+        if (_removesBloom.IsFull() ||
+            (_insertsBloom.MightContain(id) && _Find(inserts, id))) {
+            return false;
+        }
+        // Otherwise append it to _removes & insert in its bloom filter.
+        _removes.push_back(id);
+        _removesBloom.Insert(id);
+        return true;
+    }
+
+    // Return _moves by std::move(), leave it indeterminate.
+    SdfPathVector TakeRemoves() {
+        return std::move(_removes);
+    }
+
+private:
+    bool _Find(SdfPathVector &ids, SdfPath const &id) const {
+        // Just linear search.  We hit this very rarely unless we have Insert()
+        // & Remove() calls with the same ids.
+        return std::find(ids.begin(), ids.end(), id) != ids.end();
+    }
+    
+    SdfPathVector _removes;
+    // The _inserts is stored as the Hd_SortedIds::_edits, and passed to
+    // Insert() and Remove() functions
+    _PathBloomFilter _insertsBloom;
+    _PathBloomFilter _removesBloom;
+};
+
+Hd_SortedIds::Hd_SortedIds() = default;
+
+Hd_SortedIds::~Hd_SortedIds() = default;
+
+Hd_SortedIds::Hd_SortedIds(Hd_SortedIds const &other)
+    : _ids(other._ids)
+    , _edits(other._edits)
+    , _mode(other._mode)
+    , _updater(other._updater ? new _UpdateImpl { *other._updater } : nullptr)
 {
+}
+
+HD_API
+Hd_SortedIds::Hd_SortedIds(Hd_SortedIds &&) = default;
 
+Hd_SortedIds &
+Hd_SortedIds::operator=(Hd_SortedIds const &other)
+{
+    _ids = other._ids;
+    _edits = other._edits;
+    _mode = other._mode;
+    _updater.reset(
+        other._updater ? new _UpdateImpl { *other._updater } : nullptr);
+    return *this;
 }
 
+HD_API
+Hd_SortedIds &Hd_SortedIds::operator=(Hd_SortedIds &&) = default;
+
 const SdfPathVector &
 Hd_SortedIds::GetIds()
 {
@@ -62,131 +170,54 @@ Hd_SortedIds::GetIds()
 void
 Hd_SortedIds::Insert(const SdfPath &id)
 {
-    _ids.push_back(id);
-    _afterLastDeletePoint = INVALID_DELETE_POINT;
+    if (_mode == _NoMode) {
+        _mode = _InsertMode;
+    }
+    if (_mode == _InsertMode) {
+        _edits.push_back(id);
+        return;
+    }
+    if (_mode != _UpdateMode) {
+        _Sort();
+        _mode = _UpdateMode;
+        _updater.reset(new _UpdateImpl);
+    }
+    if (!_updater->Insert(&_edits, id)) {
+        // If the updater can't take this insert, we _Sort() and retry.
+        _Sort();
+        Insert(id);
+    }
 }
 
 void
 Hd_SortedIds::Remove(const SdfPath &id)
 {
-    // The first implementation of this deletion code deleted the
-    // element in place.  This kept the list sorted, but was a
-    // performance issue on unloading a stage as a lot of prims
-    // get removed and the shifting of the vector become a bottleneck
-    // So instead, we do a more efficient removal (by swapping the
-    // element to be removed with the element on the end of the vector).
-    // The down side is that the list is now unsorted, so needs to be
-    // sorted again (which is deferred).
-    //
-    // However, this means that the list is now unsorted in mass removal.
-    // In order to use the binary search, we need a sorted list, but sorting
-    // again would be too expensive in this case.
-    //
-    // We still need to optimize for batch deletions.  Typically these
-    // will be a sort list where the path to delete will be the next one
-    // in the list after the path just deleted.
-    //
-    // If it is not that path, then check to see if it is in the sorted
-    // portion.  If it is not in the sorted portion, do a linear search
-    // through the unsorted portion.
-
-    // Try last removal point
-    SdfPathVector::iterator idToRemove = _ids.end();
-
-    if (_afterLastDeletePoint != INVALID_DELETE_POINT) {
-        if (_ids[_afterLastDeletePoint] == id) {
-            idToRemove = _ids.begin() + _afterLastDeletePoint;
-        }
+    if (_mode == _NoMode) {
+        _mode = _RemoveMode;
     }
-
-    // See if we can binary search sorted portion
-    if (idToRemove == _ids.end()) {
-        if (_sortedCount > 0) {
-            // Check to see if id is somewhere within the sorted range
-            if (id <= _ids[_sortedCount - 1]) {
-
-                SdfPathVector::iterator endSortedElements =
-                                                    _ids.begin() + _sortedCount;
-                idToRemove = std::lower_bound(_ids.begin(),
-                                              endSortedElements,
-                                              id);
-
-                if (idToRemove != endSortedElements) {
-                    // Id could actually exist in the unsorted part
-                    // because of an insert.
-                    // Lower bound will then return an iterator to
-                    // the element after where id should be.
-                    if (*idToRemove != id) {
-                        idToRemove = _ids.end();
-                    }
-                } else {
-                    // We checked that id should be in the sorted range
-                    // so lower_bound should return an iterator between
-                    // begin and endSortedElements - 1.
-                    TF_CODING_ERROR("Id (%s) greater than all items in "
-                                    " sorted list",
-                                    id.GetText());
-                    idToRemove = _ids.end();
-                }
-            }
-        }
+    if (_mode == _RemoveMode) {
+        _edits.push_back(id);
+        return;
     }
-
-    // If all else fail, linear search through unsorted portion
-    if (idToRemove == _ids.end()) {
-        idToRemove = std::find(_ids.begin() + _sortedCount,
-                               _ids.end(),
-                               id);
+    if (_mode != _UpdateMode) {
+        _Sort();
+        _mode = _UpdateMode;
+        _updater.reset(new _UpdateImpl);
     }
-
-    if (idToRemove != _ids.end()) {
-        if (*idToRemove == id) {
-            SdfPathVector::iterator lastElement = _ids.end();
-            --lastElement;
-
-            if (idToRemove != lastElement) {
-                std::iter_swap(idToRemove, lastElement);
-
-                if (std::distance(idToRemove, lastElement) == 1) {
-                    // idToRemove points to the last element after pop_back()
-                    _afterLastDeletePoint = INVALID_DELETE_POINT;
-                } else {
-                    _afterLastDeletePoint = idToRemove - _ids.begin();
-                    ++_afterLastDeletePoint;
-                }
-                _ids.pop_back();
-
-                // As we've moved an element from the end into the middle
-                // the list is now only sorted up to the place where the element
-                // was removed.
-
-                _sortedCount = std::min(_sortedCount,
-                                        static_cast<size_t>(
-                                                  (idToRemove - _ids.begin())));
-            } else {
-                _ids.pop_back();
-                _afterLastDeletePoint = INVALID_DELETE_POINT;
-
-                // As we've removed an element from the end of the list
-                // the list remains in the same sort state, so
-                // trim the length if necessary.
-                // Note: Can't use the idToRemove iterator as that has
-                // been invalidated.
-                _sortedCount = std::min(_sortedCount, _ids.size());
-            }
-        }
+    if (!_updater->Remove(&_edits, id)) {
+        // If the updater can't take this remove, we _Sort() and retry.
+        _Sort();
+        Remove(id);
     }
 }
 
-
-HD_API
 void Hd_SortedIds::RemoveRange(size_t start, size_t end)
 {
     size_t numIds = _ids.size();
     size_t numToRemove = (end - start + 1);
 
-    if (_sortedCount != numIds) {
-        TF_CODING_ERROR("RemoveRange can only be called while list sorted\n");
+    if (!_edits.empty()) {
+        TF_CODING_ERROR("RemoveRange can only be called while list sorted");
         return;
     }
 
@@ -199,70 +230,202 @@ void Hd_SortedIds::RemoveRange(size_t start, size_t end)
     SdfPathVector::iterator itEnd   = _ids.begin() + (end + 1);
 
     _ids.erase(itStart, itEnd);
-    _sortedCount -= numToRemove;
-    _afterLastDeletePoint = INVALID_DELETE_POINT;
 }
 
 void
 Hd_SortedIds::Clear()
 {
     _ids.clear();
-    _sortedCount = 0;
-    _afterLastDeletePoint = INVALID_DELETE_POINT;
+    _edits.clear();
+    _mode = _NoMode;
+    _updater.reset();
 }
 
-void
-Hd_SortedIds::_InsertSort()
+// The C++ standard requires that the output cannot overlap with either range.
+// This implementation allows the output range to start at the first input
+// range.
+template <class Iter1, class Iter2, class OutIter>
+static inline OutIter
+_SetDifference(Iter1 f1, Iter1 l1, Iter2 f2, Iter2 l2, OutIter out)
 {
-    SdfPathVector::iterator sortPosIt = _ids.begin();
-    // skip already sorted items
-    sortPosIt += _sortedCount;
-
-    while (sortPosIt != _ids.end()) {
-        SdfPathVector::iterator insertPosIt = std::lower_bound(_ids.begin(),
-                                                               sortPosIt,
-                                                               *sortPosIt);
-
-        std::rotate(insertPosIt, sortPosIt, sortPosIt + 1);
-        ++sortPosIt;
+    while (f1 != l1 && f2 != l2) {
+        if (*f1 < *f2) {
+            *out = *f1;
+            ++out, ++f1;
+        }
+        else if (*f2 < *f1) {
+            ++f2;
+        }
+        else {
+            ++f1, ++f2;
+        }
     }
+    return std::copy(f1, l1, out);
 }
 
 void
-Hd_SortedIds::_FullSort()
+Hd_SortedIds::_Sort()
 {
-    // Sort the unsorted part
-    SdfPathVector::iterator mid = _ids.begin() + _sortedCount;
-    std::sort(mid, _ids.end());
-
-    // If needed, merge
-    if (mid == _ids.begin() || *(mid-1) < *(mid)) {
-        // List is fully sorted.
-    } else {
-        std::inplace_merge(_ids.begin(), mid, _ids.end());
+    // The most important thing to do here performance-wise is to minimize the
+    // number of lexicographical SdfPath less-than operations that we do on
+    // paths that are not equal.
+
+    if (_mode != _UpdateMode && _edits.empty()) {
+        _mode = _NoMode;
+        return;
     }
-}
 
-void
-Hd_SortedIds::_Sort()
-{
     HD_TRACE_FUNCTION();
 
-    size_t numIds = _ids.size();
+    // To handle Update()s, extract the removals and insertions into separate
+    // lists and treat as a _RemoveMode batch followed by an _InsertMode batch.
+    // This works correctly wrt ordering, since the _updater has ensured that
+    // the sets of removes and inserts are disjoint.
+    if (_mode == _UpdateMode) {
+        // Inserts are in _edits, Removes are in _updater->_removes
 
+        // Move inserts aside for a moment.
+        SdfPathVector inserts = std::move(_edits);
 
-    if (_sortedCount == numIds) {
+        // Move _removes into _edits, set _RemoveMode, then _Sort().
+        _edits = _updater->TakeRemoves();
+        _mode = _RemoveMode;
+        _Sort();
+
+        // Now move inserts to _edits, set _InsertMode, then _Sort().
+        _edits = std::move(inserts);
+        _mode = _InsertMode;
+        _Sort();
+
+        // Done.
+        _updater.reset();
         return;
     }
 
-    if (numIds - _sortedCount < INSERTION_SORT_MAX_ENTRIES) {
-        _InsertSort();
-    } else {
-        _FullSort();
+    // Here we're either in _InsertMode or _RemoveMode.  Sort the updates.
+    std::sort(_edits.begin(), _edits.end());
+
+    bool removing = (_mode == _RemoveMode);
+    
+    // Important case: adding new ids, _ids is currently empty.
+    if (!removing && _ids.empty()) {
+        swap(_ids, _edits);
+        _mode = _NoMode;
+        return;
+    }
+
+    if (removing) {
+        // Find the range in _ids that we will remove from.
+        auto removeBegin =
+            lower_bound(_ids.begin(), _ids.end(), _edits.front());
+
+        if (_edits.size() == 1) {
+            // For a single remove, we can just erase it if present.
+            if (removeBegin != _ids.end() && *removeBegin == _edits.front()) {
+                _ids.erase(removeBegin);
+            }
+        }
+        else {
+            auto removeEnd =
+                upper_bound(_ids.begin(), _ids.end(), _edits.back());
+
+            // If the number of elements we're removing is small compared to the
+            // size of the range, then do individual binary search & erase
+            // rather than a set-difference over the range.
+            //
+            // Empirical testing suggests the break-event point is with very low
+            // density -- about one removal per 6400 elements to search.  Note
+            // that the best value for this constant could depend quite a lot on
+            // the performance characterisitcs of the hardware.  The test
+            // "testHdSortedIdsPerf" can be useful to help find an optimal value
+            // for this.
+            //
+            // One reason it's such a low density, even though set-difference
+            // needs to do operator< on every path, is that almost all of those
+            // operator< will be performed on the same two paths, and that
+            // special case is really fast.
+            static constexpr size_t BinarySearchFrac = 6400;
+            const size_t removeRangeSize = distance(removeBegin, removeEnd);
+            if (removeRangeSize / BinarySearchFrac > _edits.size()) {
+                // Binary search & erase each _edits element.
+                auto updateIter = _edits.begin();
+                const auto updateEnd = _edits.end();
+                while (removeBegin != removeEnd && updateIter != updateEnd) {
+                    if (*removeBegin == *updateIter) {
+                        --removeEnd;
+                        removeBegin = _ids.erase(removeBegin);
+                    }
+                    removeBegin = ++updateIter != updateEnd
+                        ? lower_bound(removeBegin, removeEnd, *updateIter)
+                        : removeEnd;
+                }
+            }
+            else {
+                // Take the difference.
+                auto newRemoveEnd = _SetDifference(
+                    make_move_iterator(removeBegin),
+                    make_move_iterator(removeEnd),
+                    make_move_iterator(_edits.begin()),
+                    make_move_iterator(_edits.end()),
+                    removeBegin);
+
+                // Shift remaining backward.
+                const auto dst = std::move(removeEnd, _ids.end(), newRemoveEnd);
+                _ids.erase(dst, _ids.end());
+            }
+        }
     }
+    else {
+        // Find the range in _ids that we will add to.
+        auto addBegin = lower_bound(_ids.begin(), _ids.end(), _edits.front());
 
-    _sortedCount = numIds;
-    _afterLastDeletePoint = INVALID_DELETE_POINT;
+        if (_edits.size() == 1) {
+            // For a single add, we just insert it (even if present).
+            _ids.insert(addBegin, std::move(_edits.front()));
+        }
+        else {
+            auto addEnd =
+                upper_bound(_ids.begin(), _ids.end(), _edits.back());
+
+            if (std::distance(addBegin, addEnd) == 0) {
+                // We're inserting into an empty range in _ids.
+                _ids.insert(addBegin,
+                            std::make_move_iterator(_edits.begin()),
+                            std::make_move_iterator(_edits.end()));
+            }
+            else {
+                // Create tmp space to write the union to, then do the union.
+                SdfPathVector tmp;
+                tmp.reserve(std::distance(addBegin, addEnd) + _edits.size());
+                // We explicitly use merge rather than set_union here to
+                // preserve the semantics that inserting duplicates always
+                // succeeds.
+                std::merge(make_move_iterator(addBegin),
+                           make_move_iterator(addEnd),
+                           make_move_iterator(_edits.begin()),
+                           make_move_iterator(_edits.end()),
+                           back_inserter(tmp));
+                
+                size_t numAdded = tmp.size() - std::distance(addBegin, addEnd);
+
+                // Resize _ids and refetch possibly invalidated iterators.
+                const size_t addBeginIdx = distance(_ids.begin(), addBegin);
+                const size_t addEndIdx = distance(_ids.begin(), addEnd);
+                _ids.resize(_ids.size() + numAdded);
+                addBegin = _ids.begin() + addBeginIdx;
+                addEnd = _ids.begin() + addEndIdx;
+
+                // Shift remaining items to end.
+                std::move_backward(addEnd, _ids.end()-numAdded, _ids.end());
+                
+                // Move the union to its final place in _ids.
+                std::move(tmp.begin(), tmp.end(), addBegin);
+            }
+        }
+    }
+    
+    _edits.clear();
+    _mode = _NoMode;
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hd/sortedIds.h b/pxr/imaging/hd/sortedIds.h
index 1ddfae7ac9..4a41e3161f 100644
--- a/pxr/imaging/hd/sortedIds.h
+++ b/pxr/imaging/hd/sortedIds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SORTED_IDS_H
 #define PXR_IMAGING_HD_SORTED_IDS_H
@@ -29,37 +12,52 @@
 
 #include "pxr/usd/sdf/path.h"
 
+#include <memory>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 ///
 /// Manages a container of Hydra Ids in a sorted order.
 ///
-/// For performance reasons, sorting of the list is deferred
-/// due to inserting a large number of items at once.
-///
-/// The class chooses the type of sort based on how many unsorted items
-/// there are in the list.
+/// Note that this class behaves like a multiset.  Duplicate elements are
+/// allowed.
 ///
 class Hd_SortedIds {
 public:
+    /// Default ctor produces an empty container.
     HD_API
     Hd_SortedIds();
 
     HD_API
-    ~Hd_SortedIds() = default;
+    ~Hd_SortedIds();
+
+    /// Copy construct.
+    HD_API
+    Hd_SortedIds(Hd_SortedIds const &);
+
+    /// Move construct.
+    HD_API
+    Hd_SortedIds(Hd_SortedIds &&);
+
+    /// Copy assign.
+    HD_API
+    Hd_SortedIds &operator=(Hd_SortedIds const &);
 
+    /// Move assign.
     HD_API
-    Hd_SortedIds(Hd_SortedIds &&other);
+    Hd_SortedIds &operator=(Hd_SortedIds &&);
 
     /// Sorts the ids if needed and returns the sorted list of ids.
     HD_API
     const SdfPathVector &GetIds();
 
-    /// Add a new id to the collection
+    /// Add an id to the collection.  If the id is already present in the
+    /// collection, a duplicate id is added.
     HD_API
     void Insert(const SdfPath &id);
 
-    /// Remove an id from the collection.
+    /// Remove up to one occurrence of id from the collection.  If the id is not
+    /// present, do nothing.  Otherwise remove one copy of id.
     HD_API
     void Remove(const SdfPath &id);
 
@@ -74,16 +72,16 @@ class Hd_SortedIds {
     void Clear();
 
 private:
-    SdfPathVector           _ids;
-    size_t                  _sortedCount;
-    ptrdiff_t               _afterLastDeletePoint;
+    class _UpdateImpl;
 
-    void _InsertSort();
-    void _FullSort();
+    enum _EditMode { _NoMode, _InsertMode, _RemoveMode, _UpdateMode };
+    
     void _Sort();
 
-    Hd_SortedIds(const Hd_SortedIds &) = delete;
-    Hd_SortedIds &operator =(const Hd_SortedIds &) = delete;
+    SdfPathVector                            _ids;
+    SdfPathVector                            _edits;
+    _EditMode                                _mode = _NoMode;
+    std::unique_ptr<_UpdateImpl>             _updater;
 };
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hd/sphereSchema.cpp b/pxr/imaging/hd/sphereSchema.cpp
index 22a718a9e5..ee40ae50b5 100644
--- a/pxr/imaging/hd/sphereSchema.cpp
+++ b/pxr/imaging/hd/sphereSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/sphereSchema.h b/pxr/imaging/hd/sphereSchema.h
index e3a2be3e16..e6d1dbef9c 100644
--- a/pxr/imaging/hd/sphereSchema.h
+++ b/pxr/imaging/hd/sphereSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/splitDiopterSchema.cpp b/pxr/imaging/hd/splitDiopterSchema.cpp
index d091fd7d58..6b717e3cfd 100644
--- a/pxr/imaging/hd/splitDiopterSchema.cpp
+++ b/pxr/imaging/hd/splitDiopterSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/splitDiopterSchema.h b/pxr/imaging/hd/splitDiopterSchema.h
index dc47417c58..384ce460a6 100644
--- a/pxr/imaging/hd/splitDiopterSchema.h
+++ b/pxr/imaging/hd/splitDiopterSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/sprim.cpp b/pxr/imaging/hd/sprim.cpp
index b8c34bb029..fbe74b9fcf 100644
--- a/pxr/imaging/hd/sprim.cpp
+++ b/pxr/imaging/hd/sprim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/sprim.h"
 
diff --git a/pxr/imaging/hd/sprim.h b/pxr/imaging/hd/sprim.h
index f31906c3b7..efed6e849c 100644
--- a/pxr/imaging/hd/sprim.h
+++ b/pxr/imaging/hd/sprim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SPRIM_H
 #define PXR_IMAGING_HD_SPRIM_H
diff --git a/pxr/imaging/hd/subdivisionTagsSchema.cpp b/pxr/imaging/hd/subdivisionTagsSchema.cpp
index f188c2910a..09a0bb3fb3 100644
--- a/pxr/imaging/hd/subdivisionTagsSchema.cpp
+++ b/pxr/imaging/hd/subdivisionTagsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/subdivisionTagsSchema.h b/pxr/imaging/hd/subdivisionTagsSchema.h
index 26bfc440a6..ea30db2865 100644
--- a/pxr/imaging/hd/subdivisionTagsSchema.h
+++ b/pxr/imaging/hd/subdivisionTagsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/systemMessages.cpp b/pxr/imaging/hd/systemMessages.cpp
index 3952ce0f90..48f25db3c9 100644
--- a/pxr/imaging/hd/systemMessages.cpp
+++ b/pxr/imaging/hd/systemMessages.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/systemMessages.h"
 
diff --git a/pxr/imaging/hd/systemMessages.h b/pxr/imaging/hd/systemMessages.h
index 7c14b94083..24533df57e 100644
--- a/pxr/imaging/hd/systemMessages.h
+++ b/pxr/imaging/hd/systemMessages.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_SYSTEM_MESSAGES_H
 #define PXR_IMAGING_HD_SYSTEM_MESSAGES_H
diff --git a/pxr/imaging/hd/systemSchema.cpp b/pxr/imaging/hd/systemSchema.cpp
index 83d06d1819..07eead03e3 100644
--- a/pxr/imaging/hd/systemSchema.cpp
+++ b/pxr/imaging/hd/systemSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/systemSchema.h b/pxr/imaging/hd/systemSchema.h
index bf8f04e413..2cedc03257 100644
--- a/pxr/imaging/hd/systemSchema.h
+++ b/pxr/imaging/hd/systemSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/task.cpp b/pxr/imaging/hd/task.cpp
index 14ceca3aeb..17e4c17d43 100644
--- a/pxr/imaging/hd/task.cpp
+++ b/pxr/imaging/hd/task.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/task.h"
 #include "pxr/imaging/hd/perfLog.h"
diff --git a/pxr/imaging/hd/task.h b/pxr/imaging/hd/task.h
index 0e55da0378..f03def45d0 100644
--- a/pxr/imaging/hd/task.h
+++ b/pxr/imaging/hd/task.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_TASK_H
 #define PXR_IMAGING_HD_TASK_H
diff --git a/pxr/imaging/hd/testenv/testHdBufferSourceEmptyVal.cpp b/pxr/imaging/hd/testenv/testHdBufferSourceEmptyVal.cpp
index 78ae1fcee5..aa481eb750 100644
--- a/pxr/imaging/hd/testenv/testHdBufferSourceEmptyVal.cpp
+++ b/pxr/imaging/hd/testenv/testHdBufferSourceEmptyVal.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hd/testenv/testHdBufferSpec.cpp b/pxr/imaging/hd/testenv/testHdBufferSpec.cpp
index 3c557fb7d8..c6fd2b95a8 100644
--- a/pxr/imaging/hd/testenv/testHdBufferSpec.cpp
+++ b/pxr/imaging/hd/testenv/testHdBufferSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/bufferSpec.h"
diff --git a/pxr/imaging/hd/testenv/testHdCollectionExpressionEvaluator.cpp b/pxr/imaging/hd/testenv/testHdCollectionExpressionEvaluator.cpp
index d81874cbe2..8902a922c0 100644
--- a/pxr/imaging/hd/testenv/testHdCollectionExpressionEvaluator.cpp
+++ b/pxr/imaging/hd/testenv/testHdCollectionExpressionEvaluator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <iostream>
 
diff --git a/pxr/imaging/hd/testenv/testHdCommand.cpp b/pxr/imaging/hd/testenv/testHdCommand.cpp
index da1b08d54a..03cb52d1a2 100644
--- a/pxr/imaging/hd/testenv/testHdCommand.cpp
+++ b/pxr/imaging/hd/testenv/testHdCommand.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/unitTestHelper.h"
diff --git a/pxr/imaging/hd/testenv/testHdContainerDataSourceUtils.cpp b/pxr/imaging/hd/testenv/testHdContainerDataSourceUtils.cpp
index dc92786eef..8af1720f6f 100644
--- a/pxr/imaging/hd/testenv/testHdContainerDataSourceUtils.cpp
+++ b/pxr/imaging/hd/testenv/testHdContainerDataSourceUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/containerDataSourceEditor.h"
 #include "pxr/imaging/hd/overlayContainerDataSource.h"
diff --git a/pxr/imaging/hd/testenv/testHdDataSource.cpp b/pxr/imaging/hd/testenv/testHdDataSource.cpp
index 2dc51b78d3..7ab5ee8d1c 100644
--- a/pxr/imaging/hd/testenv/testHdDataSource.cpp
+++ b/pxr/imaging/hd/testenv/testHdDataSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <iostream>
 #include "pxr/imaging/hd/retainedDataSource.h"
diff --git a/pxr/imaging/hd/testenv/testHdDataSourceLocator.cpp b/pxr/imaging/hd/testenv/testHdDataSourceLocator.cpp
index 0438ac162a..b8f0a33871 100644
--- a/pxr/imaging/hd/testenv/testHdDataSourceLocator.cpp
+++ b/pxr/imaging/hd/testenv/testHdDataSourceLocator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/dataSourceLocator.h"
 #include "pxr/base/tf/denseHashSet.h"
diff --git a/pxr/imaging/hd/testenv/testHdDirtyBitsTranslator.cpp b/pxr/imaging/hd/testenv/testHdDirtyBitsTranslator.cpp
index 5843526387..62dce2b1a1 100644
--- a/pxr/imaging/hd/testenv/testHdDirtyBitsTranslator.cpp
+++ b/pxr/imaging/hd/testenv/testHdDirtyBitsTranslator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/cameraSchema.h"
 #include "pxr/imaging/hd/changeTracker.h"
diff --git a/pxr/imaging/hd/testenv/testHdDirtyList.cpp b/pxr/imaging/hd/testenv/testHdDirtyList.cpp
index a179523e12..8f5cf3b266 100644
--- a/pxr/imaging/hd/testenv/testHdDirtyList.cpp
+++ b/pxr/imaging/hd/testenv/testHdDirtyList.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hd/testenv/testHdExtCompDependencySort.cpp b/pxr/imaging/hd/testenv/testHdExtCompDependencySort.cpp
index a552768436..de9e3cdeb5 100644
--- a/pxr/imaging/hd/testenv/testHdExtCompDependencySort.cpp
+++ b/pxr/imaging/hd/testenv/testHdExtCompDependencySort.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/extComputation.h"
diff --git a/pxr/imaging/hd/testenv/testHdExtComputationUtils.cpp b/pxr/imaging/hd/testenv/testHdExtComputationUtils.cpp
index d0d89fc793..70f5b24437 100644
--- a/pxr/imaging/hd/testenv/testHdExtComputationUtils.cpp
+++ b/pxr/imaging/hd/testenv/testHdExtComputationUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hd/testenv/testHdMergingSceneIndex.cpp b/pxr/imaging/hd/testenv/testHdMergingSceneIndex.cpp
new file mode 100644
index 0000000000..ae36a21520
--- /dev/null
+++ b/pxr/imaging/hd/testenv/testHdMergingSceneIndex.cpp
@@ -0,0 +1,250 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/imaging/hd/api.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/mergingSceneIndex.h"
+#include "pxr/imaging/hd/retainedSceneIndex.h"
+
+#include "pxr/base/tf/declarePtrs.h"
+
+#include <iostream>
+
+template <typename T>
+bool
+_CompareValue(const char* msg, const T& v1, const T& v2)
+{
+    if (v1 == v2) {
+        std::cout << msg << " matches." << std::endl;
+    }
+    else {
+        std::cerr << msg << " doesn't match. Expecting " << v2 << " got " << v1
+                  << std::endl;
+        return false;
+    }
+    return true;
+}
+
+TF_DECLARE_REF_PTRS(_MySceneIndex);
+
+using _LogEntry = std::tuple<std::string, SdfPath>;
+
+static std::ostream&
+operator<<(std::ostream& out, const _LogEntry& entry)
+{
+    auto [what, path] = entry;
+    out << "LogEntry(" << what << ", " << path << ")";
+    return out;
+}
+
+template <typename T>
+static std::ostream&
+operator<<(std::ostream& out, const std::vector<T>& v)
+{
+    out << "[";
+    for (const auto& elem : v) {
+        out << elem << ", ";
+    }
+    out << "]";
+    return out;
+}
+
+class _MySceneIndex final : public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static _MySceneIndexRefPtr New(const HdSceneIndexBaseRefPtr& inputScene)
+    {
+        return TfCreateRefPtr(new _MySceneIndex(inputScene));
+    }
+
+    void Disable()
+    {
+        _enabled = false;
+
+        HdSceneIndexObserver::RemovedPrimEntries entries;
+        entries.emplace_back(SdfPath("/"));
+        _SendPrimsRemoved(entries);
+    }
+
+    HdSceneIndexPrim GetPrim(const SdfPath& primPath) const override
+    {
+        if (_enabled) {
+            if (auto si = _GetInputSceneIndex()) {
+                return si->GetPrim(primPath);
+            }
+        }
+        return HdSceneIndexPrim();
+    }
+
+    SdfPathVector GetChildPrimPaths(const SdfPath& primPath) const override
+    {
+        if (_enabled) {
+            if (auto si = _GetInputSceneIndex()) {
+                return si->GetChildPrimPaths(primPath);
+            }
+        }
+        return {};
+    }
+
+protected:
+    _MySceneIndex(const HdSceneIndexBaseRefPtr& inputScene)
+        : HdSingleInputFilteringSceneIndexBase(inputScene)
+    {
+    }
+    ~_MySceneIndex() override = default;
+
+    void _PrimsAdded(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::AddedPrimEntries& entries) override
+    {
+        if (_enabled) {
+            _SendPrimsAdded(entries);
+        }
+    }
+
+    void _PrimsRemoved(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::RemovedPrimEntries& entries) override
+    {
+        if (_enabled) {
+            _SendPrimsRemoved(entries);
+        }
+    }
+
+    void _PrimsDirtied(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries& entries) override
+    {
+        if (_enabled) {
+            _SendPrimsDirtied(entries);
+        }
+    }
+
+private:
+    bool _enabled = true;
+};
+
+class _Logger : public HdSceneIndexObserver
+{
+public:
+    void Reset()
+    {
+        _log.clear();
+    }
+
+public:
+    void PrimsAdded(
+        const HdSceneIndexBase& sender,
+        const AddedPrimEntries& entries) override
+    {
+        for (const AddedPrimEntry& entry : entries) {
+            _log.emplace_back("add", entry.primPath);
+        }
+    }
+
+    void PrimsRemoved(
+        const HdSceneIndexBase& sender,
+        const RemovedPrimEntries& entries) override
+    {
+        for (const RemovedPrimEntry& entry : entries) {
+            _log.emplace_back("remove", entry.primPath);
+        }
+    }
+
+    void PrimsDirtied(
+        const HdSceneIndexBase& sender,
+        const DirtiedPrimEntries& entries) override
+    {
+        for (const DirtiedPrimEntry& entry : entries) {
+            _log.emplace_back("dirty", entry.primPath);
+        }
+    }
+
+    void PrimsRenamed(
+        const HdSceneIndexBase& sender,
+        const RenamedPrimEntries& entries) override
+    {
+        for (const RenamedPrimEntry& entry : entries) {
+            _log.emplace_back("rename", entry.oldPrimPath);
+        }
+    }
+
+    std::vector<_LogEntry> GetLog() const
+    {
+        return _log;
+    }
+
+private:
+    std::vector<std::tuple<std::string, SdfPath>> _log;
+};
+
+static bool
+_TestNoticesAfterRemove()
+{
+    HdRetainedSceneIndexRefPtr siA = HdRetainedSceneIndex::New();
+    siA->AddPrims({ { SdfPath("/Parent"), TfToken("A"), nullptr },
+                    { SdfPath("/Parent/Child"), TfToken("A"), nullptr } });
+
+    HdRetainedSceneIndexRefPtr siB = HdRetainedSceneIndex::New();
+    siB->AddPrims({ { SdfPath("/Parent"), TfToken("B"), nullptr },
+                    { SdfPath("/Parent/Child"), TfToken("B"), nullptr } });
+
+    _MySceneIndexRefPtr dA = _MySceneIndex::New(siA);
+    _MySceneIndexRefPtr dB = _MySceneIndex::New(siB);
+
+    // mergingSceneIndex merges 2 scene indices that have the same prim
+    // hierarchy, but the "A" branch has type "A" and the "B" branch has type
+    // "B".
+    HdMergingSceneIndexRefPtr mergingSceneIndex = HdMergingSceneIndex::New();
+    static const SdfPath rootPath = SdfPath::AbsoluteRootPath();
+    mergingSceneIndex->AddInputScene(dA, rootPath);
+    mergingSceneIndex->AddInputScene(dB, rootPath);
+
+    // We attach a logger so we can see what entries get emitted when we disable
+    // "A" (the stronger of the input scenes).  When we disable "A", the merging
+    // scene index will get a notice that the "A" prims are removed.  Since it
+    // is a merging scene index, downstream scene indices should now be seeing
+    // all of those prim, but now with type "B".
+    _Logger logger;
+    mergingSceneIndex->AddObserver(HdSceneIndexObserverPtr(&logger));
+    dA->Disable();
+
+    auto logEntries = logger.GetLog();
+
+    return _CompareValue(
+        "NOTICES", logEntries,
+        {
+            _LogEntry("add", "/"),
+            _LogEntry("add", "/Parent"),
+            _LogEntry("add", "/Parent/Child"),
+        });
+}
+
+#define xstr(s) str(s)
+#define str(s) #s
+#define TEST(X)                                                                \
+    std::cout << (++i) << ") " << str(X) << "..." << std::endl;                \
+    if (!X()) {                                                                \
+        std::cout << "FAILED" << std::endl;                                    \
+        return -1;                                                             \
+    }                                                                          \
+    else                                                                       \
+        std::cout << "...SUCCEEDED" << std::endl;
+
+int
+main(int argc, char** argv)
+{
+    //-------------------------------------------------------------------------
+    std::cout << "STARTING testHdMergingSceneIndex" << std::endl;
+
+    int i = 0;
+    TEST(_TestNoticesAfterRemove);
+
+    //-------------------------------------------------------------------------
+    std::cout << "DONE testHdMergingSceneIndex" << std::endl;
+    return 0;
+}
diff --git a/pxr/imaging/hd/testenv/testHdPerfLog.cpp b/pxr/imaging/hd/testenv/testHdPerfLog.cpp
index c7562fbb13..bbbc3622b3 100644
--- a/pxr/imaging/hd/testenv/testHdPerfLog.cpp
+++ b/pxr/imaging/hd/testenv/testHdPerfLog.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/renderIndex.h"
diff --git a/pxr/imaging/hd/testenv/testHdSceneIndex.cpp b/pxr/imaging/hd/testenv/testHdSceneIndex.cpp
index d5cb43ec7e..f2b0ab2b6d 100644
--- a/pxr/imaging/hd/testenv/testHdSceneIndex.cpp
+++ b/pxr/imaging/hd/testenv/testHdSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <algorithm>
 #include <iostream>
diff --git a/pxr/imaging/hd/testenv/testHdSortedIds.cpp b/pxr/imaging/hd/testenv/testHdSortedIds.cpp
index 1eba6dd22d..469df5adf4 100644
--- a/pxr/imaging/hd/testenv/testHdSortedIds.cpp
+++ b/pxr/imaging/hd/testenv/testHdSortedIds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/sortedIds.h"
@@ -383,21 +366,110 @@ RemoveLastItemTest()
     return true;
 }
 
+static
+bool
+InsertRemoveDupesTest()
+{
+    std::cout << "\n\nInsertRemoveDupesTest():\n";
+    
+    using P = SdfPath;
+    Hd_SortedIds sortedIds;
+    SdfPathVector expected;
+
+    sortedIds.Insert(P("/B"));
+    sortedIds.Insert(P("/A"));
+
+    expected = {P("/A"),P("/B")};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+    
+    sortedIds.Insert(P("/B"));
+    sortedIds.Insert(P("/A"));
+    sortedIds.Insert(P("/B"));
+    sortedIds.Insert(P("/A"));
+
+    expected = {P("/A"),P("/A"),P("/A"),P("/B"),P("/B"),P("/B")};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+
+    sortedIds.Remove(P("/B"));
+
+    expected = {P("/A"),P("/A"),P("/A"),P("/B"),P("/B")};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+
+    sortedIds.Remove(P("/A"));
+    sortedIds.Remove(P("/B"));
+
+    expected = {P("/A"),P("/A"),P("/B")};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+
+    sortedIds.Remove(P("/A"));
+    sortedIds.Remove(P("/B"));
+
+    expected = {P("/A")};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+
+    sortedIds.Remove(P("/A"));
+
+    expected = {};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+
+    // Ensure that inserting and removing without calling GetIds() between works
+    // as expected.
+
+    sortedIds.Insert(P("B"));
+    sortedIds.Insert(P("B"));
+    sortedIds.Remove(P("B"));
+    sortedIds.Insert(P("A"));
+    sortedIds.Insert(P("B"));
+    sortedIds.Insert(P("A"));
+    sortedIds.Insert(P("A"));
+    sortedIds.Remove(P("B"));
+    sortedIds.Remove(P("A"));
+    sortedIds.Remove(P("A"));
+
+    expected = {P("A"),P("B")};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+
+    sortedIds.Insert(P("C"));
+    sortedIds.Remove(P("B"));
+    sortedIds.Remove(P("B"));
+    sortedIds.Insert(P("C"));
+    sortedIds.Insert(P("A"));
+    sortedIds.Insert(P("B"));
+    sortedIds.Remove(P("C"));
+    sortedIds.Insert(P("C"));
+    sortedIds.Remove(P("C"));
+    sortedIds.Remove(P("A"));
+
+    expected = {P("A"),P("B"),P("C")};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+
+    sortedIds.Insert(P("D"));
+    sortedIds.Remove(P("D"));
+    sortedIds.Remove(P("B"));
+
+    expected = {P("A"),P("C")};
+    TF_AXIOM(sortedIds.GetIds() == expected);
+
+    return true;
+}
+
 int main()
 {
     TfErrorMark mark;
 
-    bool success  = PopulateTest()
-                 && SingleInsertTest()
-                 && MultiInsertTest()
-                 && RemoveTest()
-                 && RemoveOnlyElementTest()
-                 && RemoveRangeTest()
-                 && RemoveBatchTest()
-                 && RemoveSortedTest()
-                 && RemoveUnsortedTest()
-                 && RemoveAfterInsertNoSync()
-                 && RemoveLastItemTest();
+    bool success = PopulateTest()
+        && SingleInsertTest()
+        && MultiInsertTest()
+        && RemoveTest()
+        && RemoveOnlyElementTest()
+        && RemoveRangeTest()
+        && RemoveBatchTest()
+        && RemoveSortedTest()
+        && RemoveUnsortedTest()
+        && RemoveAfterInsertNoSync()
+        && RemoveLastItemTest()
+        && InsertRemoveDupesTest()
+        ;
 
     TF_VERIFY(mark.IsClean());
 
diff --git a/pxr/imaging/hd/testenv/testHdSortedIdsPerf.cpp b/pxr/imaging/hd/testenv/testHdSortedIdsPerf.cpp
new file mode 100644
index 0000000000..92dd59ae3a
--- /dev/null
+++ b/pxr/imaging/hd/testenv/testHdSortedIdsPerf.cpp
@@ -0,0 +1,394 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sortedIds.h"
+#include "pxr/usd/sdf/path.h"
+#include "pxr/base/arch/timing.h"
+#include "pxr/base/tf/stringUtils.h"
+#include <random>
+#include <algorithm>
+#include <iterator>
+
+PXR_NAMESPACE_USING_DIRECTIVE;
+
+static char firstLevelChar[] = "ABYZ";
+static const size_t numFirstLevel = sizeof(firstLevelChar) /
+                                    sizeof(firstLevelChar[0]) - 1;
+
+ARCH_PRAGMA_UNUSED_FUNCTION;
+
+static
+SdfPathVector const &
+_GetInitPaths()
+{
+    static SdfPathVector theInitPaths = []() {
+        SdfPathVector paths;
+        
+        char primName[] = "/_/_/_/_";
+        
+        for (size_t firstLevel = 0; firstLevel < numFirstLevel; ++firstLevel) {
+            primName[1] = firstLevelChar[firstLevel];
+            for (char secondLevel = 'A'; secondLevel <= 'Z'; ++secondLevel) {
+                primName[3] = secondLevel;
+                for (char thirdLevel = 'A'; thirdLevel <= 'Z'; ++thirdLevel) {
+                    primName[5] = thirdLevel;
+                    for (char fourthLevel = 'A'; fourthLevel <= 'Z'; ++fourthLevel) {
+                        primName[7] = fourthLevel;
+                        paths.push_back(SdfPath(primName));
+                    }
+                }
+            }
+        }
+        // Shuffle paths randomly.
+        const size_t seed = 5109223000;
+        std::mt19937 randomGen(seed);
+        std::shuffle(paths.begin(), paths.end(), randomGen);
+
+        printf("Using %zu initial paths\n", paths.size());
+        
+        return paths;
+    }();
+
+    return theInitPaths;
+}
+
+// Metric name to time in nanoseconds.
+using Metrics = std::vector<std::pair<std::string, int64_t>>;
+
+// Replace interior '/' with '_', e.g. '/foo/bar' -> 'foo_bar'.
+static std::string
+_PathToLabel(SdfPath const &p)
+{
+    std::string str = p.GetAsString();
+    if (TfStringStartsWith(str, "/")) {
+        str = str.substr(1);
+    }
+    return TfStringReplace(str, "/", "_");
+}
+
+static
+void
+PopulateTest(Metrics &metrics)
+{
+    int64_t ticks = ArchMeasureExecutionTime([]() {
+        Hd_SortedIds result;
+        for (SdfPath const &p: _GetInitPaths()) {
+            result.Insert(p);
+        }
+        result.GetIds(); // Ensure it's sorted.
+    });
+    metrics.emplace_back("populate", ArchTicksToNanoseconds(ticks));
+}
+
+static
+Hd_SortedIds const &
+_GetPopulatedIds() {
+    static const Hd_SortedIds theIds = []() {
+        Hd_SortedIds ids;
+        for (SdfPath const &p: _GetInitPaths()) {
+            ids.Insert(p);
+        }
+        ids.GetIds(); // Ensure it's sorted.
+        return ids;
+    }();
+    return theIds;
+}
+
+static
+void
+SingleRemoveInsertTest(Metrics &metrics)
+{
+    SdfPathVector testPaths = {
+        SdfPath("/A/A/A/A"),
+        SdfPath("/B/Y/O/B"),
+        SdfPath("/Y/M/M/V"),
+        SdfPath("/Z/Z/Z/Z")
+    };
+
+    Hd_SortedIds ids = _GetPopulatedIds();
+
+    for (SdfPath const &path: testPaths) {
+        int64_t ticks = ArchMeasureExecutionTime([&ids, &path]() {
+            ids.Remove(path);
+            ids.GetIds(); // force sort.
+            ids.Insert(path);
+            ids.GetIds(); // force sort.
+        });
+        metrics.emplace_back("add_del_" + _PathToLabel(path),
+                             ArchTicksToNanoseconds(ticks));
+    }
+}
+
+static
+void
+MultiRemoveInsertTest(Metrics &metrics)
+{
+    SdfPathVector testPaths = {
+        SdfPath("/A/A/A/A"),
+        SdfPath("/B/Y/O/B"),
+        SdfPath("/Y/M/M/V"),
+        SdfPath("/Z/Z/Z/Z")
+    };
+
+    Hd_SortedIds ids = _GetPopulatedIds();
+
+    int64_t ticks = ArchMeasureExecutionTime([&ids, &testPaths]() {
+        for (SdfPath const &path: testPaths) {
+            ids.Remove(path);
+        }
+        ids.GetIds(); // force sort.
+        for (SdfPath const &path: testPaths) {
+            ids.Insert(path);
+        }
+        ids.GetIds(); // force sort.
+    });
+    
+    metrics.emplace_back("add_del_multiple", ArchTicksToNanoseconds(ticks));
+}
+
+static
+void
+SubtreeRemoveInsertTest(Metrics &metrics)
+{
+    const SdfPathVector prefixes = {
+        SdfPath("/A/A/A"),
+        SdfPath("/B/Y/O"),
+        SdfPath("/Y/M/M"),
+        SdfPath("/Z/Z/Z")
+    };
+
+    const std::vector<SdfPathVector> subtreePathVecs = [&prefixes]() {
+        std::vector<SdfPathVector> ret;
+        for (SdfPath const &prefix: prefixes) {
+            ret.emplace_back();
+            for (SdfPath const &path: _GetInitPaths()) {
+                if (path.HasPrefix(prefix)) {
+                    ret.back().push_back(path);
+                }
+            }
+        }
+        return ret;
+    }();
+
+    // These must correspond.
+    TF_AXIOM(prefixes.size() == subtreePathVecs.size());
+
+    Hd_SortedIds ids = _GetPopulatedIds();
+
+    std::vector<int64_t> timings;
+    
+    for (SdfPathVector const &subtreePaths: subtreePathVecs) {
+        timings.push_back(
+            ArchMeasureExecutionTime([&ids, &subtreePaths]() {
+                for (SdfPath const &path: subtreePaths) {
+                    ids.Remove(path);
+                }
+                ids.GetIds(); // force sort.
+                for (SdfPath const &path: subtreePaths) {
+                    ids.Insert(path);
+                }
+                ids.GetIds(); // force sort.
+            }));
+    }
+
+    for (size_t i = 0; i != timings.size(); ++i) {
+        metrics.emplace_back("add_del_subtree_" + _PathToLabel(prefixes[i]),
+                             ArchTicksToNanoseconds(timings[i]));
+    }
+}
+
+static
+void
+PartialSubtreeRemoveInsertTest(Metrics &metrics)
+{
+    const SdfPathVector prefixes = {
+        SdfPath("/A/A/A"),
+        SdfPath("/B/Y/O"),
+        SdfPath("/Y/M/M"),
+        SdfPath("/Z/Z/Z")
+    };
+
+    const std::vector<SdfPathVector> subtreePathVecs = [&prefixes]() {
+        size_t counter = 0;
+        std::vector<SdfPathVector> ret;
+        for (SdfPath const &prefix: prefixes) {
+            ret.emplace_back();
+            for (SdfPath const &path: _GetInitPaths()) {
+                if (path.HasPrefix(prefix) && (++counter % 3 == 0)) {
+                    ret.back().push_back(path);
+                }
+            }
+        }
+        return ret;
+    }();
+
+    // These must correspond.
+    TF_AXIOM(prefixes.size() == subtreePathVecs.size());
+
+    Hd_SortedIds ids = _GetPopulatedIds();
+
+    std::vector<int64_t> timings;
+    
+    for (SdfPathVector const &subtreePaths: subtreePathVecs) {
+        timings.push_back(
+            ArchMeasureExecutionTime([&ids, &subtreePaths]() {
+                for (SdfPath const &path: subtreePaths) {
+                    ids.Remove(path);
+                }
+                ids.GetIds(); // force sort.
+                for (SdfPath const &path: subtreePaths) {
+                    ids.Insert(path);
+                }
+                ids.GetIds(); // force sort.
+            }));
+    }
+
+    for (size_t i = 0; i != timings.size(); ++i) {
+        metrics.emplace_back(
+            "add_del_partial_subtree_" + _PathToLabel(prefixes[i]),
+            ArchTicksToNanoseconds(timings[i]));
+    }
+}
+
+static
+void
+ScatteredRemoveInsertTest(Metrics &metrics, unsigned divisor,
+                          std::string const &lbl)
+{
+    const SdfPathVector paths = [&]() {
+        SdfPathVector ret;
+        const SdfPathVector &initPaths = _GetInitPaths();
+        // Take random indexes that cover 10% of the total.
+        std::mt19937 gen(5109223000);
+        std::uniform_int_distribution<> distrib(0, initPaths.size()-1);
+        for (size_t i = 0; i != initPaths.size() / divisor; ++i) {
+            ret.push_back(initPaths[distrib(gen)]);
+        }
+        return ret;
+    }();
+
+    Hd_SortedIds ids = _GetPopulatedIds();
+    int64_t ticks = ArchMeasureExecutionTime([&ids, &paths]() {
+        for (SdfPath const &path: paths) {
+            ids.Remove(path);
+        }
+        ids.GetIds(); // force sort.
+        for (SdfPath const &path: paths) {
+            ids.Insert(path);
+        }
+        ids.GetIds(); // force sort.
+    });
+
+    metrics.emplace_back("add_del_" + lbl + "_scattered",
+                         ArchTicksToNanoseconds(ticks));
+}
+
+static
+void
+SpreadRemoveInsertTest(Metrics &metrics, size_t numElts)
+{
+    Hd_SortedIds ids = _GetPopulatedIds();
+
+    // Determine which we'll remove/reinsert -- select evenly spread elements
+    // from ids.
+    SdfPathVector paths;
+    for (size_t x = 0; x != numElts; ++x) {
+        size_t idx = (ids.GetIds().size() * (x+1)) / (numElts+1);
+        paths.push_back(ids.GetIds()[idx]);
+    }
+        
+    int64_t ticks = ArchMeasureExecutionTime([&ids, &paths]() {
+        for (SdfPath const &path: paths) {
+            ids.Remove(path);
+        }
+        ids.GetIds(); // force sort.
+        for (SdfPath const &path: paths) {
+            ids.Insert(path);
+        }
+        ids.GetIds(); // force sort.
+    });
+
+    metrics.emplace_back(TfStringPrintf("add_del_%zu_spread", numElts),
+                         ArchTicksToNanoseconds(ticks));
+}
+
+static
+void
+SubtreeRenameTest(Metrics &metrics,
+                  SdfPath const &oldPrefix,
+                  SdfPath const &newPrefix)
+{
+    const std::vector<std::pair<SdfPath, SdfPath>> renames = [&]() {
+        std::vector<std::pair<SdfPath, SdfPath>> ret;
+        for (SdfPath const &path: _GetInitPaths()) {
+            if (path.HasPrefix(oldPrefix)) {
+                ret.emplace_back(
+                    path, path.ReplacePrefix(oldPrefix, newPrefix));
+            }
+        }
+        return ret;
+    }();
+
+    Hd_SortedIds ids = _GetPopulatedIds();
+
+    int64_t ticks =
+        ArchMeasureExecutionTime([&ids, &renames]() {
+            for (auto &names: renames) {
+                ids.Remove(names.first);
+                ids.Insert(names.second);
+            }
+            ids.GetIds(); // force sort.
+            for (auto &names: renames) {
+                ids.Remove(names.second);
+                ids.Insert(names.first);
+            }
+            ids.GetIds(); // force sort.
+        });
+
+    metrics.emplace_back(
+        "rename_" + _PathToLabel(oldPrefix) + "_to_" + _PathToLabel(newPrefix),
+        ArchTicksToNanoseconds(ticks));
+}
+
+int main()
+{
+    Metrics metrics;
+    
+    PopulateTest(metrics);
+    SingleRemoveInsertTest(metrics);
+    MultiRemoveInsertTest(metrics);
+    SubtreeRemoveInsertTest(metrics);
+    PartialSubtreeRemoveInsertTest(metrics);
+    ScatteredRemoveInsertTest(metrics, 10000, "0_01pct");
+    ScatteredRemoveInsertTest(metrics, 1000, "0_1pct");
+    ScatteredRemoveInsertTest(metrics, 100, "1pct");
+    ScatteredRemoveInsertTest(metrics, 20, "5pct");
+    ScatteredRemoveInsertTest(metrics, 10, "10pct");
+    ScatteredRemoveInsertTest(metrics, 5, "20pct");
+    ScatteredRemoveInsertTest(metrics, 2, "50pct");
+    SpreadRemoveInsertTest(metrics, 1);
+    SpreadRemoveInsertTest(metrics, 2);
+    SpreadRemoveInsertTest(metrics, 5);
+    SpreadRemoveInsertTest(metrics, 10);
+    SpreadRemoveInsertTest(metrics, 20);
+    SpreadRemoveInsertTest(metrics, 50);
+    SpreadRemoveInsertTest(metrics, 100);
+    SubtreeRenameTest(metrics, SdfPath("/A/B/C"), SdfPath("/A/B/_C"));
+    SubtreeRenameTest(metrics, SdfPath("/A/B"), SdfPath("/A/_B"));
+    SubtreeRenameTest(metrics, SdfPath("/Z/Z"), SdfPath("/A/B/_Z"));
+    
+    FILE *statsFile = fopen("perfstats.raw", "w");
+    for (const auto &[metricName, ns]: metrics) {
+        fprintf(statsFile,
+                "{'profile':'%s','metric':'time','value':%zd,'samples':1}\n",
+                metricName.c_str(), ns);
+        printf("%s : %zd ns\n", metricName.c_str(), ns);
+    }
+    fclose(statsFile);
+    
+    printf("OK\n");
+}
diff --git a/pxr/imaging/hd/testenv/testHdTimeSampleArray.cpp b/pxr/imaging/hd/testenv/testHdTimeSampleArray.cpp
index debf015c86..b032a4889a 100644
--- a/pxr/imaging/hd/testenv/testHdTimeSampleArray.cpp
+++ b/pxr/imaging/hd/testenv/testHdTimeSampleArray.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/timeSampleArray.h"
 #include "pxr/base/tf/errorMark.h"
diff --git a/pxr/imaging/hd/testenv/testHdTypes.cpp b/pxr/imaging/hd/testenv/testHdTypes.cpp
index 091cd2923f..6831b7b008 100644
--- a/pxr/imaging/hd/testenv/testHdTypes.cpp
+++ b/pxr/imaging/hd/testenv/testHdTypes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/types.h"
diff --git a/pxr/imaging/hd/testenv/testHdUtils.cpp b/pxr/imaging/hd/testenv/testHdUtils.cpp
new file mode 100644
index 0000000000..c55d263ee3
--- /dev/null
+++ b/pxr/imaging/hd/testenv/testHdUtils.cpp
@@ -0,0 +1,88 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/pxr.h"
+
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/utils.h"
+#include "pxr/base/tf/errorMark.h"
+
+#include <iostream>
+#include <fstream>
+#include <string>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+static
+bool
+BasicTest()
+{
+    // Create a representation of a material network
+    HdMaterialNetwork materialNetwork;
+    materialNetwork.nodes.reserve(3);
+
+    const SdfPath materialPath("/Asset/Looks/Material");
+
+    HdMaterialNode textureNode;
+    textureNode.path = SdfPath("/Asset/Looks/Material/Texture");
+    textureNode.identifier = TfToken("Texture_5");
+    textureNode.parameters[TfToken("inputs:filename")] = \
+        VtValue("studio/patterns/checkerboard/checkerboard.tex");
+    materialNetwork.nodes.push_back(textureNode);
+
+    HdMaterialNode materialLayerNode;
+    materialLayerNode.path = SdfPath("/Asset/Looks/Material/MaterialLayer");
+    materialLayerNode.identifier = TfToken("MaterialLayer_3");
+    materialNetwork.nodes.push_back(materialLayerNode);
+
+    HdMaterialNode standInNode;
+    standInNode.path = SdfPath("/Asset/Looks/Material/StandIn");
+    standInNode.identifier = TfToken("PbsNetworkMaterialStandIn_3");
+    materialNetwork.nodes.push_back(standInNode);
+
+    // Connect the nodes
+    HdMaterialRelationship textureMaterialLayerRel;
+    textureMaterialLayerRel.inputId = textureNode.path;
+    textureMaterialLayerRel.inputName = TfToken("resultRGB");
+    textureMaterialLayerRel.outputId = materialLayerNode.path;
+    textureMaterialLayerRel.outputName = TfToken("albedo");
+    materialNetwork.relationships.push_back(textureMaterialLayerRel);
+
+    HdMaterialRelationship materialLayerStandInRel;
+    materialLayerStandInRel.inputId = materialLayerNode.path;
+    materialLayerStandInRel.inputName = TfToken("pbsMaterialOut");
+    materialLayerStandInRel.outputId = standInNode.path;
+    materialLayerStandInRel.outputName = TfToken("multiMaterialIn");
+    materialNetwork.relationships.push_back(materialLayerStandInRel);
+
+    HdMaterialNetworkMap networkMap;
+    networkMap.map[TfToken("surface")] = materialNetwork;
+
+    HdContainerDataSourceHandle ds = 
+        HdUtils::ConvertHdMaterialNetworkToHdMaterialSchema(networkMap);
+
+    std::ofstream outdata("testHdUtils_material.txt", std::ios::out);
+    HdDebugPrintDataSource(outdata, ds);
+    outdata.close();
+
+    return true;
+}
+
+int main()
+{
+    TfErrorMark mark;
+    bool success = BasicTest();
+
+    TF_VERIFY(mark.IsClean());
+
+    if (success && mark.IsClean()) {
+        std::cout << "OK" << std::endl;
+        return EXIT_SUCCESS;
+    } else {
+        std::cout << "FAILED" << std::endl;
+        return EXIT_FAILURE;
+    }
+}
diff --git a/pxr/imaging/hd/testenv/testHdUtils/baseline/testHdUtils_material.txt b/pxr/imaging/hd/testenv/testHdUtils/baseline/testHdUtils_material.txt
new file mode 100644
index 0000000000..05d03bd688
--- /dev/null
+++ b/pxr/imaging/hd/testenv/testHdUtils/baseline/testHdUtils_material.txt
@@ -0,0 +1,38 @@
+[]
+	[nodes]
+		[/Asset/Looks/Material/MaterialLayer]
+			[inputConnections]
+				[albedo]
+					[0]
+						[upstreamNodeOutputName]
+							resultRGB
+						[upstreamNodePath]
+							/Asset/Looks/Material/Texture
+			[nodeIdentifier]
+				MaterialLayer_3
+			[parameters]
+		[/Asset/Looks/Material/StandIn]
+			[inputConnections]
+				[multiMaterialIn]
+					[0]
+						[upstreamNodeOutputName]
+							pbsMaterialOut
+						[upstreamNodePath]
+							/Asset/Looks/Material/MaterialLayer
+			[nodeIdentifier]
+				PbsNetworkMaterialStandIn_3
+			[parameters]
+		[/Asset/Looks/Material/Texture]
+			[inputConnections]
+			[nodeIdentifier]
+				Texture_5
+			[parameters]
+				[inputs:filename]
+					[value]
+						studio/patterns/checkerboard/checkerboard.tex
+	[terminals]
+		[surface]
+			[upstreamNodeOutputName]
+				surface
+			[upstreamNodePath]
+				/Asset/Looks/Material/StandIn
diff --git a/pxr/imaging/hd/tetMeshSchema.cpp b/pxr/imaging/hd/tetMeshSchema.cpp
index 6a8e9b9343..0f2199cf08 100644
--- a/pxr/imaging/hd/tetMeshSchema.cpp
+++ b/pxr/imaging/hd/tetMeshSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/tetMeshSchema.h b/pxr/imaging/hd/tetMeshSchema.h
index 9b7989c787..60e8025faf 100644
--- a/pxr/imaging/hd/tetMeshSchema.h
+++ b/pxr/imaging/hd/tetMeshSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/tetMeshTopologySchema.cpp b/pxr/imaging/hd/tetMeshTopologySchema.cpp
index 649db19824..d4cc6ff9f5 100644
--- a/pxr/imaging/hd/tetMeshTopologySchema.cpp
+++ b/pxr/imaging/hd/tetMeshTopologySchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -57,6 +40,13 @@ HdTetMeshTopologySchema::GetTetVertexIndices() const
         HdTetMeshTopologySchemaTokens->tetVertexIndices);
 }
 
+HdVec3iArrayDataSourceHandle
+HdTetMeshTopologySchema::GetSurfaceFaceVertexIndices() const
+{
+    return _GetTypedDataSource<HdVec3iArrayDataSource>(
+        HdTetMeshTopologySchemaTokens->surfaceFaceVertexIndices);
+}
+
 HdTokenDataSourceHandle
 HdTetMeshTopologySchema::GetOrientation() const
 {
@@ -68,11 +58,12 @@ HdTetMeshTopologySchema::GetOrientation() const
 HdContainerDataSourceHandle
 HdTetMeshTopologySchema::BuildRetained(
         const HdVec4iArrayDataSourceHandle &tetVertexIndices,
+        const HdVec3iArrayDataSourceHandle &surfaceFaceVertexIndices,
         const HdTokenDataSourceHandle &orientation
 )
 {
-    TfToken _names[2];
-    HdDataSourceBaseHandle _values[2];
+    TfToken _names[3];
+    HdDataSourceBaseHandle _values[3];
 
     size_t _count = 0;
 
@@ -81,6 +72,11 @@ HdTetMeshTopologySchema::BuildRetained(
         _values[_count++] = tetVertexIndices;
     }
 
+    if (surfaceFaceVertexIndices) {
+        _names[_count] = HdTetMeshTopologySchemaTokens->surfaceFaceVertexIndices;
+        _values[_count++] = surfaceFaceVertexIndices;
+    }
+
     if (orientation) {
         _names[_count] = HdTetMeshTopologySchemaTokens->orientation;
         _values[_count++] = orientation;
@@ -96,6 +92,14 @@ HdTetMeshTopologySchema::Builder::SetTetVertexIndices(
     return *this;
 }
 
+HdTetMeshTopologySchema::Builder &
+HdTetMeshTopologySchema::Builder::SetSurfaceFaceVertexIndices(
+    const HdVec3iArrayDataSourceHandle &surfaceFaceVertexIndices)
+{
+    _surfaceFaceVertexIndices = surfaceFaceVertexIndices;
+    return *this;
+}
+
 HdTetMeshTopologySchema::Builder &
 HdTetMeshTopologySchema::Builder::SetOrientation(
     const HdTokenDataSourceHandle &orientation)
@@ -109,6 +113,7 @@ HdTetMeshTopologySchema::Builder::Build()
 {
     return HdTetMeshTopologySchema::BuildRetained(
         _tetVertexIndices,
+        _surfaceFaceVertexIndices,
         _orientation
     );
 }
@@ -151,6 +156,16 @@ HdTetMeshTopologySchema::GetTetVertexIndicesLocator()
     return locator;
 }
 
+/* static */
+const HdDataSourceLocator &
+HdTetMeshTopologySchema::GetSurfaceFaceVertexIndicesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdTetMeshTopologySchemaTokens->surfaceFaceVertexIndices);
+    return locator;
+}
+
 /*static*/
 HdTokenDataSourceHandle
 HdTetMeshTopologySchema::BuildOrientationDataSource(
diff --git a/pxr/imaging/hd/tetMeshTopologySchema.h b/pxr/imaging/hd/tetMeshTopologySchema.h
index 05a2caea48..a72088f18d 100644
--- a/pxr/imaging/hd/tetMeshTopologySchema.h
+++ b/pxr/imaging/hd/tetMeshTopologySchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -52,6 +35,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 #define HD_TET_MESH_TOPOLOGY_SCHEMA_TOKENS \
     (topology) \
     (tetVertexIndices) \
+    (surfaceFaceVertexIndices) \
     (orientation) \
     (leftHanded) \
     (rightHanded) \
@@ -91,6 +75,9 @@ class HdTetMeshTopologySchema : public HdSchema
     HD_API
     HdVec4iArrayDataSourceHandle GetTetVertexIndices() const;
 
+    HD_API
+    HdVec3iArrayDataSourceHandle GetSurfaceFaceVertexIndices() const;
+
     HD_API
     HdTokenDataSourceHandle GetOrientation() const; 
 
@@ -123,6 +110,10 @@ class HdTetMeshTopologySchema : public HdSchema
     /// Prim-level relative data source locator to locate tetVertexIndices.
     HD_API
     static const HdDataSourceLocator &GetTetVertexIndicesLocator();
+
+    /// Prim-level relative data source locator to locate surfaceFaceVertexIndices.
+    HD_API
+    static const HdDataSourceLocator &GetSurfaceFaceVertexIndicesLocator();
     /// @} 
 
     /// \name Schema construction
@@ -139,6 +130,7 @@ class HdTetMeshTopologySchema : public HdSchema
     static HdContainerDataSourceHandle
     BuildRetained(
         const HdVec4iArrayDataSourceHandle &tetVertexIndices,
+        const HdVec3iArrayDataSourceHandle &surfaceFaceVertexIndices,
         const HdTokenDataSourceHandle &orientation
     );
 
@@ -155,6 +147,9 @@ class HdTetMeshTopologySchema : public HdSchema
         Builder &SetTetVertexIndices(
             const HdVec4iArrayDataSourceHandle &tetVertexIndices);
         HD_API
+        Builder &SetSurfaceFaceVertexIndices(
+            const HdVec3iArrayDataSourceHandle &surfaceFaceVertexIndices);
+        HD_API
         Builder &SetOrientation(
             const HdTokenDataSourceHandle &orientation);
 
@@ -164,6 +159,7 @@ class HdTetMeshTopologySchema : public HdSchema
 
     private:
         HdVec4iArrayDataSourceHandle _tetVertexIndices;
+        HdVec3iArrayDataSourceHandle _surfaceFaceVertexIndices;
         HdTokenDataSourceHandle _orientation;
 
     };
diff --git a/pxr/imaging/hd/timeSampleArray.cpp b/pxr/imaging/hd/timeSampleArray.cpp
index f097baf90d..d2777c167a 100644
--- a/pxr/imaging/hd/timeSampleArray.cpp
+++ b/pxr/imaging/hd/timeSampleArray.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/timeSampleArray.h"
diff --git a/pxr/imaging/hd/timeSampleArray.h b/pxr/imaging/hd/timeSampleArray.h
index 15b2a6bd5d..b2b2420d3c 100644
--- a/pxr/imaging/hd/timeSampleArray.h
+++ b/pxr/imaging/hd/timeSampleArray.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_TIME_SAMPLE_ARRAY_H
 #define PXR_IMAGING_HD_TIME_SAMPLE_ARRAY_H
diff --git a/pxr/imaging/hd/tokens.cpp b/pxr/imaging/hd/tokens.cpp
index 9c9b5d7f73..ac682bdee3 100644
--- a/pxr/imaging/hd/tokens.cpp
+++ b/pxr/imaging/hd/tokens.cpp
@@ -1,28 +1,15 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/tokens.h"
 
+#include "pxr/base/tf/token.h"
+
+#include <algorithm>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PUBLIC_TOKENS(HdTokens, HD_TOKENS);
@@ -49,6 +36,9 @@ TF_DEFINE_PUBLIC_TOKENS(HdModelDrawModeTokens, HD_MODEL_DRAWMODE_TOKENS);
 
 TF_DEFINE_PUBLIC_TOKENS(HdOptionTokens, HD_OPTION_TOKENS);
 
+TF_DEFINE_PUBLIC_TOKENS(HdLightTypeTokens, HD_LIGHT_TYPE_TOKENS);
+TF_DEFINE_PUBLIC_TOKENS(HdLightFilterTypeTokens, HD_LIGHT_FILTER_TYPE_TOKENS);
+
 TF_DEFINE_PUBLIC_TOKENS(HdRprimTypeTokens, HD_RPRIMTYPE_TOKENS);
 TF_DEFINE_PUBLIC_TOKENS(HdSprimTypeTokens, HD_SPRIMTYPE_TOKENS);
 TF_DEFINE_PUBLIC_TOKENS(HdBprimTypeTokens, HD_BPRIMTYPE_TOKENS);
@@ -72,6 +62,9 @@ TF_DEFINE_PUBLIC_TOKENS(HdResourceTypeTokens, HD_RESOURCE_TYPE_TOKENS);
 TF_DEFINE_PUBLIC_TOKENS(HdSceneIndexEmulationTokens, 
     HD_SCENE_INDEX_EMULATION_TOKENS);
 
+TF_DEFINE_PUBLIC_TOKENS(HdCollectionEmulationTokens, 
+    HD_COLLECTION_EMULATION_TOKENS);
+
 bool HdPrimTypeIsGprim(TfToken const& primType)
 {
     return (primType == HdPrimTypeTokens->mesh ||
@@ -82,30 +75,23 @@ bool HdPrimTypeIsGprim(TfToken const& primType)
 
 const TfTokenVector &HdLightPrimTypeTokens()
 {
-    static const TfTokenVector vec = {
-        HdPrimTypeTokens->simpleLight,
-        HdPrimTypeTokens->cylinderLight,
-        HdPrimTypeTokens->diskLight,
-        HdPrimTypeTokens->distantLight,
-        HdPrimTypeTokens->domeLight,
-        HdPrimTypeTokens->light,
-        HdPrimTypeTokens->pluginLight,
-        HdPrimTypeTokens->rectLight,
-        HdPrimTypeTokens->sphereLight,
-        HdPrimTypeTokens->meshLight
-    };
-    return vec;
+    return HdLightTypeTokens->allTokens;
 }
 
-
 bool HdPrimTypeIsLight(TfToken const& primType)
 {
-    for (const TfToken &lightPrimType : HdLightPrimTypeTokens()) {
-        if (primType == lightPrimType) {
-            return true;
-        }
-    }
-    return false;
+    const auto &lightTypes = HdLightPrimTypeTokens();
+    return std::find(lightTypes.begin(), lightTypes.end(), primType) !=
+        lightTypes.end();
+}
+
+bool HdPrimTypeSupportsGeomSubsets(const TfToken& primType) {
+    static const TfTokenVector types = {
+        HdPrimTypeTokens->mesh,
+        HdPrimTypeTokens->basisCurves,
+        // XXX: tetMesh not yet supported
+    };
+    return std::find(types.begin(), types.end(), primType) != types.end();
 }
 
 TfToken HdAovTokensMakePrimvar(TfToken const& primvar)
diff --git a/pxr/imaging/hd/tokens.h b/pxr/imaging/hd/tokens.h
index ee53434ce9..3b85717a2c 100644
--- a/pxr/imaging/hd/tokens.h
+++ b/pxr/imaging/hd/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_TOKENS_H
 #define PXR_IMAGING_HD_TOKENS_H
@@ -35,6 +18,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 #define HD_TOKENS                               \
     (accelerations)                             \
     (adjacency)                                 \
+    (angularVelocities)                         \
     (bboxLocalMin)                              \
     (bboxLocalMax)                              \
     (bbox)                                      \
@@ -78,6 +62,7 @@ PXR_NAMESPACE_OPEN_SCOPE
     (leftHanded)                                \
     (linear)                                    \
     (lightLink)                                 \
+    (filterLink)                                \
     (lightFilterLink)                           \
     (lightFilterType)                           \
     (meshLight)                                 \
@@ -295,6 +280,23 @@ PXR_NAMESPACE_OPEN_SCOPE
     (volume)                                    \
     (model)
 
+// XXX Unfortunately, we export a function of the name HdLightPrimTypeTokens.
+//     Omit 'Prim' from the name.
+#define HD_LIGHT_TYPE_TOKENS                    \
+    (cylinderLight)                             \
+    (diskLight)                                 \
+    (distantLight)                              \
+    (domeLight)                                 \
+    (light)                                     \
+    (meshLight)                                 \
+    (pluginLight)                               \
+    (rectLight)                                 \
+    (simpleLight)                               \
+    (sphereLight)
+
+#define HD_LIGHT_FILTER_TYPE_TOKENS             \
+    (lightFilter)
+
 #define HD_SPRIMTYPE_TOKENS                     \
     /* Sprims */                                \
     (camera)                                    \
@@ -307,18 +309,10 @@ PXR_NAMESPACE_OPEN_SCOPE
     (sampleFilter)                              \
     (displayFilter)                             \
     (imageShader)                               \
-    /* Sprims Lights */                         \
-    (simpleLight)                               \
-    (cylinderLight)                             \
-    (diskLight)                                 \
-    (distantLight)                              \
-    (domeLight)                                 \
-    (light)                                     \
-    (lightFilter)                               \
-    (meshLight)                                 \
-    (pluginLight)                               \
-    (rectLight)                                 \
-    (sphereLight)                               \
+                                                \
+    HD_LIGHT_TYPE_TOKENS                        \
+    HD_LIGHT_FILTER_TYPE_TOKENS                 \
+                                                \
     /* Sprims ExtComputations */                \
     (extComputation)                            \
 
@@ -331,6 +325,8 @@ PXR_NAMESPACE_OPEN_SCOPE
     HD_RPRIMTYPE_TOKENS                         \
     HD_SPRIMTYPE_TOKENS                         \
     HD_BPRIMTYPE_TOKENS                         \
+    /* Scene-index-only prim types */           \
+    (renderPass)
 
 HD_API
 bool HdPrimTypeIsGprim(TfToken const& primType);
@@ -338,6 +334,9 @@ bool HdPrimTypeIsGprim(TfToken const& primType);
 HD_API
 bool HdPrimTypeIsLight(TfToken const& primType);
 
+HD_API
+bool HdPrimTypeSupportsGeomSubsets(const TfToken& primType);
+
 HD_API
 const TfTokenVector &HdLightPrimTypeTokens();
 
@@ -468,6 +467,18 @@ TfToken HdAovTokensMakeShader(TfToken const& shader);
 #define HD_SCENE_INDEX_EMULATION_TOKENS               \
     (sceneDelegate)                                   \
 
+/* Tokens used to emulate collections for light linking. The collection names
+   match the UsdLuxLightAPI. Hydra 1.0 uses lightFilterLink instead of
+   filterLink.
+*/
+#define HD_COLLECTION_EMULATION_TOKENS                \
+    ((lightLinkCollection, "lightLink"))              \
+    ((shadowLinkCollection, "shadowLink"))            \
+    ((filterLinkCollection, "filterLink"))            \
+    (lightLinkCollectionMembershipExpression)         \
+    (shadowLinkCollectionMembershipExpression)        \
+    (filterLinkCollectionMembershipExpression)
+
 TF_DECLARE_PUBLIC_TOKENS(HdTokens, HD_API, HD_TOKENS);
 TF_DECLARE_PUBLIC_TOKENS(HdInstancerTokens, HD_API, HD_INSTANCER_TOKENS);
 TF_DECLARE_PUBLIC_TOKENS(HdReprTokens, HD_API, HD_REPR_TOKENS);
@@ -482,6 +493,9 @@ TF_DECLARE_PUBLIC_TOKENS(HdMaterialTerminalTokens, HD_API,
 TF_DECLARE_PUBLIC_TOKENS(HdRenderTagTokens, HD_API, HD_RENDERTAG_TOKENS);
 TF_DECLARE_PUBLIC_TOKENS(HdRenderContextTokens, HD_API, HD_RENDER_CONTEXT_TOKENS);
 TF_DECLARE_PUBLIC_TOKENS(HdOptionTokens, HD_API, HD_OPTION_TOKENS);
+TF_DECLARE_PUBLIC_TOKENS(HdLightTypeTokens, HD_API, HD_LIGHT_TYPE_TOKENS);
+TF_DECLARE_PUBLIC_TOKENS(HdLightFilterTypeTokens, HD_API,
+    HD_LIGHT_FILTER_TYPE_TOKENS);
 TF_DECLARE_PUBLIC_TOKENS(HdRprimTypeTokens, HD_API, HD_RPRIMTYPE_TOKENS);
 TF_DECLARE_PUBLIC_TOKENS(HdSprimTypeTokens, HD_API, HD_SPRIMTYPE_TOKENS);
 TF_DECLARE_PUBLIC_TOKENS(HdBprimTypeTokens, HD_API, HD_BPRIMTYPE_TOKENS);
@@ -496,6 +510,8 @@ TF_DECLARE_PUBLIC_TOKENS(HdAspectRatioConformPolicyTokens, HD_API,
 TF_DECLARE_PUBLIC_TOKENS(HdResourceTypeTokens, HD_API, HD_RESOURCE_TYPE_TOKENS);
 TF_DECLARE_PUBLIC_TOKENS(HdSceneIndexEmulationTokens, HD_API, 
                          HD_SCENE_INDEX_EMULATION_TOKENS);
+TF_DECLARE_PUBLIC_TOKENS(HdCollectionEmulationTokens, HD_API, 
+                         HD_COLLECTION_EMULATION_TOKENS);
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
diff --git a/pxr/imaging/hd/topology.cpp b/pxr/imaging/hd/topology.cpp
index f1a253e0f2..a1681954c9 100644
--- a/pxr/imaging/hd/topology.cpp
+++ b/pxr/imaging/hd/topology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/topology.h"
 
diff --git a/pxr/imaging/hd/topology.h b/pxr/imaging/hd/topology.h
index 7df7974517..ee81d9f620 100644
--- a/pxr/imaging/hd/topology.h
+++ b/pxr/imaging/hd/topology.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_TOPOLOGY_H
 #define PXR_IMAGING_HD_TOPOLOGY_H
diff --git a/pxr/imaging/hd/types.cpp b/pxr/imaging/hd/types.cpp
index 11238dff32..8224f03f11 100644
--- a/pxr/imaging/hd/types.cpp
+++ b/pxr/imaging/hd/types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/types.h"
diff --git a/pxr/imaging/hd/types.h b/pxr/imaging/hd/types.h
index 4bbcb67508..7972ad90d2 100644
--- a/pxr/imaging/hd/types.h
+++ b/pxr/imaging/hd/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_TYPES_H
 #define PXR_IMAGING_HD_TYPES_H
diff --git a/pxr/imaging/hd/unitTestDelegate.cpp b/pxr/imaging/hd/unitTestDelegate.cpp
index a6302e2901..6caee27433 100644
--- a/pxr/imaging/hd/unitTestDelegate.cpp
+++ b/pxr/imaging/hd/unitTestDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/unitTestDelegate.h"
 
diff --git a/pxr/imaging/hd/unitTestDelegate.h b/pxr/imaging/hd/unitTestDelegate.h
index a6b8a72ce7..ad5e859869 100644
--- a/pxr/imaging/hd/unitTestDelegate.h
+++ b/pxr/imaging/hd/unitTestDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_UNIT_TEST_DELEGATE_H
 #define PXR_IMAGING_HD_UNIT_TEST_DELEGATE_H
diff --git a/pxr/imaging/hd/unitTestHelper.cpp b/pxr/imaging/hd/unitTestHelper.cpp
index ca2872eba3..252f7157c1 100644
--- a/pxr/imaging/hd/unitTestHelper.cpp
+++ b/pxr/imaging/hd/unitTestHelper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/unitTestHelper.h"
 #include "pxr/imaging/hd/camera.h"
diff --git a/pxr/imaging/hd/unitTestHelper.h b/pxr/imaging/hd/unitTestHelper.h
index 231a0d104e..12b3006f50 100644
--- a/pxr/imaging/hd/unitTestHelper.h
+++ b/pxr/imaging/hd/unitTestHelper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_UNIT_TEST_HELPER_H
 #define PXR_IMAGING_HD_UNIT_TEST_HELPER_H
diff --git a/pxr/imaging/hd/unitTestNullRenderDelegate.cpp b/pxr/imaging/hd/unitTestNullRenderDelegate.cpp
index 44151cf817..54daec7093 100644
--- a/pxr/imaging/hd/unitTestNullRenderDelegate.cpp
+++ b/pxr/imaging/hd/unitTestNullRenderDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/unitTestNullRenderDelegate.h"
 #include "pxr/imaging/hd/bufferArray.h"
diff --git a/pxr/imaging/hd/unitTestNullRenderDelegate.h b/pxr/imaging/hd/unitTestNullRenderDelegate.h
index 752135505e..fe39e6a2fb 100644
--- a/pxr/imaging/hd/unitTestNullRenderDelegate.h
+++ b/pxr/imaging/hd/unitTestNullRenderDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_UNIT_TEST_NULL_RENDER_DELEGATE_H
 #define PXR_IMAGING_HD_UNIT_TEST_NULL_RENDER_DELEGATE_H
diff --git a/pxr/imaging/hd/unitTestNullRenderPass.cpp b/pxr/imaging/hd/unitTestNullRenderPass.cpp
index c12022acb2..d77a3ced01 100644
--- a/pxr/imaging/hd/unitTestNullRenderPass.cpp
+++ b/pxr/imaging/hd/unitTestNullRenderPass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/unitTestNullRenderPass.h"
 
diff --git a/pxr/imaging/hd/unitTestNullRenderPass.h b/pxr/imaging/hd/unitTestNullRenderPass.h
index 7921d3d544..304a748751 100644
--- a/pxr/imaging/hd/unitTestNullRenderPass.h
+++ b/pxr/imaging/hd/unitTestNullRenderPass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_UNIT_TEST_NULL_RENDER_PASS_H
 #define PXR_IMAGING_HD_UNIT_TEST_NULL_RENDER_PASS_H
diff --git a/pxr/imaging/hd/utils.cpp b/pxr/imaging/hd/utils.cpp
index 832cdc837e..49b56da471 100644
--- a/pxr/imaging/hd/utils.cpp
+++ b/pxr/imaging/hd/utils.cpp
@@ -1,29 +1,20 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/utils.h"
 
+#include "pxr/imaging/hd/materialConnectionSchema.h"
+#include "pxr/imaging/hd/materialNetworkInterface.h"
+#include "pxr/imaging/hd/materialNetworkSchema.h"
+#include "pxr/imaging/hd/materialNodeSchema.h"
+#include "pxr/imaging/hd/materialNodeParameterSchema.h"
+#include "pxr/imaging/hd/materialSchema.h"
+#include "pxr/imaging/hd/perfLog.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
 #include "pxr/imaging/hd/sceneGlobalsSchema.h"
 #include "pxr/imaging/hd/sceneIndex.h"
 #include "pxr/imaging/hd/sceneIndexPrimView.h"
@@ -50,9 +41,40 @@ HasActiveRenderSettingsPrim(
     }
 
     if (auto pathHandle = sgSchema.GetActiveRenderSettingsPrim()) {
-        if (primPath) {
-            *primPath = pathHandle->GetTypedValue(0);
+        const SdfPath rspPath = pathHandle->GetTypedValue(0);
+        // Validate prim.
+        HdSceneIndexPrim prim = si->GetPrim(rspPath);
+        if (prim.primType == HdPrimTypeTokens->renderSettings &&
+            prim.dataSource) {
+            if (primPath) {
+                *primPath = rspPath;
+            }
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/* static */
+bool
+GetCurrentFrame(const HdSceneIndexBaseRefPtr &si, double *frame)
+{
+    if (!si) {
+        return false;
+    }
+
+    HdSceneGlobalsSchema sgSchema = HdSceneGlobalsSchema::GetFromSceneIndex(si);
+    if (!sgSchema) {
+        return false;
+    }
+
+    if (auto frameHandle = sgSchema.GetCurrentFrame()) {
+        const double frameValue = frameHandle->GetTypedValue(0);
+        if (std::isnan(frameValue)) {
+            return false;
         }
+        *frame = frameValue;
         return true;
     }
 
@@ -112,6 +134,178 @@ PrintSceneIndex(
     }
 }
 
+HdContainerDataSourceHandle
+ConvertHdMaterialNetworkToHdMaterialNetworkSchema(
+    const HdMaterialNetworkMap& hdNetworkMap)
+{
+    HD_TRACE_FUNCTION();
+
+    TfTokenVector terminalsNames;
+    std::vector<HdDataSourceBaseHandle> terminalsValues;
+    std::vector<TfToken> nodeNames;
+    std::vector<HdDataSourceBaseHandle> nodeValues;
+
+    struct ParamData {
+        VtValue value;
+        TfToken colorSpace;
+    };
+
+    for (auto const &iter: hdNetworkMap.map) {
+        const TfToken &terminalName = iter.first;
+        const HdMaterialNetwork &hdNetwork = iter.second;
+
+        if (hdNetwork.nodes.empty()) {
+            continue;
+        }
+
+        terminalsNames.push_back(terminalName);
+
+        // Transfer over individual nodes.
+        // Note that the same nodes may be shared by multiple terminals.
+        // We simply overwrite them here.
+        for (const HdMaterialNode &node : hdNetwork.nodes) {
+            std::vector<TfToken> paramsNames;
+            std::vector<HdDataSourceBaseHandle> paramsValues;
+
+            // Gather parameter value and colorspace metadata in paramsInfo, a 
+            // mapping of the parameter name to its value and colorspace data.
+            std::map<std::string, ParamData> paramsInfo;
+            for (const auto &p : node.parameters) {
+
+                // Strip "colorSpace" prefix 
+                const std::pair<std::string, bool> res = 
+                    SdfPath::StripPrefixNamespace(p.first, 
+                        HdMaterialNodeParameterSchemaTokens->colorSpace);
+
+                // Colorspace metadata
+                if (res.second) {
+                    paramsInfo[res.first].colorSpace = p.second.Get<TfToken>();
+                }
+                // Value 
+                else {
+                    paramsInfo[p.first].value = p.second.Get<VtValue>();
+                }
+            }
+
+            // Create and store the HdMaterialNodeParameter DataSource
+            for (const auto &item : paramsInfo) {
+                paramsNames.push_back(TfToken(item.first));
+                paramsValues.push_back(
+                    HdMaterialNodeParameterSchema::Builder()
+                        .SetValue(
+                            HdRetainedTypedSampledDataSource<VtValue>::New(
+                                item.second.value))
+                        .SetColorSpace(
+                            item.second.colorSpace.IsEmpty()
+                            ? nullptr
+                            : HdRetainedTypedSampledDataSource<TfToken>::New(
+                                item.second.colorSpace))
+                        .Build()
+                );
+            }
+
+            // Accumulate array connections to the same input
+            TfDenseHashMap<TfToken,
+                TfSmallVector<HdDataSourceBaseHandle, 8>, TfToken::HashFunctor> 
+                    connectionsMap;
+
+            TfSmallVector<TfToken, 8> cNames;
+            TfSmallVector<HdDataSourceBaseHandle, 8> cValues;
+
+            for (const HdMaterialRelationship &rel : hdNetwork.relationships) {
+                if (rel.outputId == node.path) {
+                    TfToken outputPath = rel.inputId.GetToken(); 
+                    TfToken outputName = TfToken(rel.inputName.GetString());
+
+                    HdDataSourceBaseHandle c = 
+                        HdMaterialConnectionSchema::Builder()
+                            .SetUpstreamNodePath(
+                                HdRetainedTypedSampledDataSource<TfToken>::New(
+                                    outputPath))
+                            .SetUpstreamNodeOutputName(
+                                HdRetainedTypedSampledDataSource<TfToken>::New(
+                                    outputName))
+                            .Build();
+
+                    connectionsMap[
+                        TfToken(rel.outputName.GetString())].push_back(c);
+                }
+            }
+
+            cNames.reserve(connectionsMap.size());
+            cValues.reserve(connectionsMap.size());
+
+            // NOTE: not const because HdRetainedSmallVectorDataSource needs
+            //       a non-const HdDataSourceBaseHandle*
+            for (auto &entryPair : connectionsMap) {
+                cNames.push_back(entryPair.first);
+                cValues.push_back(
+                    HdRetainedSmallVectorDataSource::New(
+                        entryPair.second.size(), entryPair.second.data()));
+            }
+
+            nodeNames.push_back(node.path.GetToken());
+            nodeValues.push_back(
+                HdMaterialNodeSchema::Builder()
+                    .SetParameters(
+                        HdRetainedContainerDataSource::New(
+                            paramsNames.size(), 
+                            paramsNames.data(),
+                            paramsValues.data()))
+                    .SetInputConnections(
+                        HdRetainedContainerDataSource::New(
+                            cNames.size(), 
+                            cNames.data(),
+                            cValues.data()))
+                    .SetNodeIdentifier(
+                        HdRetainedTypedSampledDataSource<TfToken>::New(
+                            node.identifier))
+                    .Build());
+        }
+
+        terminalsValues.push_back(
+            HdMaterialConnectionSchema::Builder()
+                .SetUpstreamNodePath(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        hdNetwork.nodes.back().path.GetToken()))
+                .SetUpstreamNodeOutputName(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        terminalsNames.back()))
+                .Build());
+    }
+
+    HdContainerDataSourceHandle nodesDefaultContext = 
+        HdRetainedContainerDataSource::New(
+            nodeNames.size(),
+            nodeNames.data(),
+            nodeValues.data());
+
+    HdContainerDataSourceHandle terminalsDefaultContext = 
+        HdRetainedContainerDataSource::New(
+            terminalsNames.size(),
+            terminalsNames.data(),
+            terminalsValues.data());
+
+    return HdMaterialNetworkSchema::Builder()
+        .SetNodes(nodesDefaultContext)
+        .SetTerminals(terminalsDefaultContext)
+        .Build();
+}
+
+HdContainerDataSourceHandle
+ConvertHdMaterialNetworkToHdMaterialSchema(
+    const HdMaterialNetworkMap &hdNetworkMap)
+{
+    // Create the material network, potentially one per network selector
+    HdDataSourceBaseHandle network = 
+        ConvertHdMaterialNetworkToHdMaterialNetworkSchema(hdNetworkMap);
+
+    TfToken defaultContext = HdMaterialSchemaTokens->universalRenderContext;
+    return HdMaterialSchema::BuildRetained(
+        1, 
+        &defaultContext, 
+        &network);
+}
 
 }
 
diff --git a/pxr/imaging/hd/utils.h b/pxr/imaging/hd/utils.h
index a92b407aa7..379fe22e47 100644
--- a/pxr/imaging/hd/utils.h
+++ b/pxr/imaging/hd/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_UTILS_H
@@ -27,6 +10,8 @@
 
 #include "pxr/pxr.h"
 #include "pxr/imaging/hd/api.h"
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/material.h"
 #include "pxr/imaging/cameraUtil/conformWindow.h"
 
 #include "pxr/base/tf/declarePtrs.h"
@@ -137,6 +122,14 @@ HasActiveRenderSettingsPrim(
     const HdSceneIndexBaseRefPtr &si,
     SdfPath *primPath = nullptr);
 
+/// Retreives the current frame number from the input scene index \p si. 
+/// Returns true if a data source for the associated locator was found
+/// with the result in \p frame, and false otherwise.
+///
+HD_API
+bool
+GetCurrentFrame(const HdSceneIndexBaseRefPtr &si, double *frame);
+
 /// Translate the given aspect ratio conform policy \p token into an equivalent 
 /// CameraUtilConformWindowPolicy enum. 
 ///
@@ -154,6 +147,22 @@ PrintSceneIndex(
     const HdSceneIndexBaseRefPtr &si,
     const SdfPath &rootPath = SdfPath::AbsoluteRootPath());
 
+/// Convert the supplied HdMaterialNetworkMap to an HdMaterialNetworkSchema 
+/// container data source.
+/// 
+HD_API
+HdContainerDataSourceHandle
+ConvertHdMaterialNetworkToHdMaterialNetworkSchema(
+    const HdMaterialNetworkMap& hdNetworkMap);
+
+/// Convert the supplied HdMaterialNetworkMap to an HdMaterialSchema 
+/// container data source.
+///
+HD_API
+HdContainerDataSourceHandle
+ConvertHdMaterialNetworkToHdMaterialSchema(
+    const HdMaterialNetworkMap &hdNetworkMap);
+
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hd/vectorSchema.cpp b/pxr/imaging/hd/vectorSchema.cpp
index 0e0b5a85e6..81cc0077ed 100644
--- a/pxr/imaging/hd/vectorSchema.cpp
+++ b/pxr/imaging/hd/vectorSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/vectorSchema.h"
diff --git a/pxr/imaging/hd/vectorSchema.h b/pxr/imaging/hd/vectorSchema.h
index 369ecbae63..fa803cd120 100644
--- a/pxr/imaging/hd/vectorSchema.h
+++ b/pxr/imaging/hd/vectorSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_VECTOR_SCHEMA_H
diff --git a/pxr/imaging/hd/vectorSchemaTypeDefs.h b/pxr/imaging/hd/vectorSchemaTypeDefs.h
index e46cfae861..9f824dc897 100644
--- a/pxr/imaging/hd/vectorSchemaTypeDefs.h
+++ b/pxr/imaging/hd/vectorSchemaTypeDefs.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_VECTOR_SCHEMA_TYPE_DEFS_H
 #define PXR_IMAGING_HD_VECTOR_SCHEMA_TYPE_DEFS_H
diff --git a/pxr/imaging/hd/version.h b/pxr/imaging/hd/version.h
index e4422c258c..e75fdff645 100644
--- a/pxr/imaging/hd/version.h
+++ b/pxr/imaging/hd/version.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_VERSION_H
 #define PXR_IMAGING_HD_VERSION_H
@@ -102,9 +85,15 @@
 //           hydra schemas const.
 // 66 -> 67: Removes legacy internal instancer primvar names and the
 //           TfEnvSetting for using them (see 56).
+// 67 -> 68: Adds HdSceneDelegate::SampleFOO with startTime and endTime.
+// 68 -> 69: Removes HdGeomSubsetsSchema. Geom subsets are now represented
+//           in Hydra as child prims of their parent geometry.
+// 69 -> 70: Add dirty bit translation for light filter prims in backend
+//           emulation.
+// 70 -> 71: Add virtual HdRenderDelegate::IsParallelSyncEnabled.
 //
 
-#define HD_API_VERSION 67
+#define HD_API_VERSION 71
 
 // 1  ->  2: SimpleLighting -> FallbackLighting
 #define HD_SHADER_API 2
diff --git a/pxr/imaging/hd/vertexAdjacency.cpp b/pxr/imaging/hd/vertexAdjacency.cpp
index 270f373ace..56658065a4 100644
--- a/pxr/imaging/hd/vertexAdjacency.cpp
+++ b/pxr/imaging/hd/vertexAdjacency.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/vertexAdjacency.h"
 #include "pxr/imaging/hd/meshTopology.h"
diff --git a/pxr/imaging/hd/vertexAdjacency.h b/pxr/imaging/hd/vertexAdjacency.h
index 81a25a1f6c..ee7fc54114 100644
--- a/pxr/imaging/hd/vertexAdjacency.h
+++ b/pxr/imaging/hd/vertexAdjacency.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_VERTEX_ADJACENCY_H
 #define PXR_IMAGING_HD_VERTEX_ADJACENCY_H
diff --git a/pxr/imaging/hd/visibilitySchema.cpp b/pxr/imaging/hd/visibilitySchema.cpp
index 6929cc560a..32e171701d 100644
--- a/pxr/imaging/hd/visibilitySchema.cpp
+++ b/pxr/imaging/hd/visibilitySchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/visibilitySchema.h b/pxr/imaging/hd/visibilitySchema.h
index 8d4f0591e8..60c39d89c8 100644
--- a/pxr/imaging/hd/visibilitySchema.h
+++ b/pxr/imaging/hd/visibilitySchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/volume.cpp b/pxr/imaging/hd/volume.cpp
index ec98da83e6..241e4eb489 100644
--- a/pxr/imaging/hd/volume.cpp
+++ b/pxr/imaging/hd/volume.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/volume.h"
 
diff --git a/pxr/imaging/hd/volume.h b/pxr/imaging/hd/volume.h
index d81e414e24..0f57972e1d 100644
--- a/pxr/imaging/hd/volume.h
+++ b/pxr/imaging/hd/volume.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_VOLUME_H
 #define PXR_IMAGING_HD_VOLUME_H
diff --git a/pxr/imaging/hd/volumeFieldBindingSchema.cpp b/pxr/imaging/hd/volumeFieldBindingSchema.cpp
index fff082ee55..2a6d129124 100644
--- a/pxr/imaging/hd/volumeFieldBindingSchema.cpp
+++ b/pxr/imaging/hd/volumeFieldBindingSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/volumeFieldBindingSchema.h b/pxr/imaging/hd/volumeFieldBindingSchema.h
index ec3cb3e1fb..2f40b61e4a 100644
--- a/pxr/imaging/hd/volumeFieldBindingSchema.h
+++ b/pxr/imaging/hd/volumeFieldBindingSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/volumeFieldSchema.cpp b/pxr/imaging/hd/volumeFieldSchema.cpp
index 8c8e5bf781..dcfdd8ccfd 100644
--- a/pxr/imaging/hd/volumeFieldSchema.cpp
+++ b/pxr/imaging/hd/volumeFieldSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/volumeFieldSchema.h b/pxr/imaging/hd/volumeFieldSchema.h
index ddb65a1549..dce7231abb 100644
--- a/pxr/imaging/hd/volumeFieldSchema.h
+++ b/pxr/imaging/hd/volumeFieldSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/vtBufferSource.cpp b/pxr/imaging/hd/vtBufferSource.cpp
index e7258ca0bd..2bac3eda22 100644
--- a/pxr/imaging/hd/vtBufferSource.cpp
+++ b/pxr/imaging/hd/vtBufferSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/vtBufferSource.h"
 #include "pxr/imaging/hd/perfLog.h"
diff --git a/pxr/imaging/hd/vtBufferSource.h b/pxr/imaging/hd/vtBufferSource.h
index d65d64bfdc..207c9ef3f5 100644
--- a/pxr/imaging/hd/vtBufferSource.h
+++ b/pxr/imaging/hd/vtBufferSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_VT_BUFFER_SOURCE_H
 #define PXR_IMAGING_HD_VT_BUFFER_SOURCE_H
diff --git a/pxr/imaging/hd/xformSchema.cpp b/pxr/imaging/hd/xformSchema.cpp
index 703000c07b..4f53cd2233 100644
--- a/pxr/imaging/hd/xformSchema.cpp
+++ b/pxr/imaging/hd/xformSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hd/xformSchema.h b/pxr/imaging/hd/xformSchema.h
index 7e2dd2ef6c..d97ef36498 100644
--- a/pxr/imaging/hd/xformSchema.h
+++ b/pxr/imaging/hd/xformSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hdGp/api.h b/pxr/imaging/hdGp/api.h
index 7b44d5c0b5..0f3ac0fcad 100644
--- a/pxr/imaging/hdGp/api.h
+++ b/pxr/imaging/hdGp/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDGP_API_H
 #define PXR_IMAGING_HDGP_API_H
diff --git a/pxr/imaging/hdGp/generativeProcedural.cpp b/pxr/imaging/hdGp/generativeProcedural.cpp
index 1bc7ff0e4a..797887e357 100644
--- a/pxr/imaging/hdGp/generativeProcedural.cpp
+++ b/pxr/imaging/hdGp/generativeProcedural.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "generativeProcedural.h"
 
diff --git a/pxr/imaging/hdGp/generativeProcedural.h b/pxr/imaging/hdGp/generativeProcedural.h
index de7f75f7af..ffeeca6cff 100644
--- a/pxr/imaging/hdGp/generativeProcedural.h
+++ b/pxr/imaging/hdGp/generativeProcedural.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_H
 #define PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_H
diff --git a/pxr/imaging/hdGp/generativeProceduralFilteringSceneIndex.cpp b/pxr/imaging/hdGp/generativeProceduralFilteringSceneIndex.cpp
index 16b84b98a8..62a7acede0 100644
--- a/pxr/imaging/hdGp/generativeProceduralFilteringSceneIndex.cpp
+++ b/pxr/imaging/hdGp/generativeProceduralFilteringSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "generativeProceduralFilteringSceneIndex.h"
 #include "generativeProceduralPluginRegistry.h"
diff --git a/pxr/imaging/hdGp/generativeProceduralFilteringSceneIndex.h b/pxr/imaging/hdGp/generativeProceduralFilteringSceneIndex.h
index e5f8804e83..ef964d5600 100644
--- a/pxr/imaging/hdGp/generativeProceduralFilteringSceneIndex.h
+++ b/pxr/imaging/hdGp/generativeProceduralFilteringSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_FILTERING_SCENE_INDEX_H
 #define PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_FILTERING_SCENE_INDEX_H
diff --git a/pxr/imaging/hdGp/generativeProceduralPlugin.cpp b/pxr/imaging/hdGp/generativeProceduralPlugin.cpp
index d707646eb6..8a38b55f5b 100644
--- a/pxr/imaging/hdGp/generativeProceduralPlugin.cpp
+++ b/pxr/imaging/hdGp/generativeProceduralPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "generativeProceduralPlugin.h"
 
diff --git a/pxr/imaging/hdGp/generativeProceduralPlugin.h b/pxr/imaging/hdGp/generativeProceduralPlugin.h
index 9851bf8de3..8a28967fdc 100644
--- a/pxr/imaging/hdGp/generativeProceduralPlugin.h
+++ b/pxr/imaging/hdGp/generativeProceduralPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_PLUGIN_H
 #define PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_PLUGIN_H
diff --git a/pxr/imaging/hdGp/generativeProceduralPluginRegistry.cpp b/pxr/imaging/hdGp/generativeProceduralPluginRegistry.cpp
index a9b31bbeca..8fb353ce3c 100644
--- a/pxr/imaging/hdGp/generativeProceduralPluginRegistry.cpp
+++ b/pxr/imaging/hdGp/generativeProceduralPluginRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "generativeProceduralPluginRegistry.h"
 
diff --git a/pxr/imaging/hdGp/generativeProceduralPluginRegistry.h b/pxr/imaging/hdGp/generativeProceduralPluginRegistry.h
index d6205bdc7b..dc89152e53 100644
--- a/pxr/imaging/hdGp/generativeProceduralPluginRegistry.h
+++ b/pxr/imaging/hdGp/generativeProceduralPluginRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_PLUGIN_REGISTRY_H
 #define PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_PLUGIN_REGISTRY_H
diff --git a/pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.cpp b/pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.cpp
index f5dd965628..23fcb4d47d 100644
--- a/pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.cpp
+++ b/pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "generativeProceduralResolvingSceneIndex.h"
 #include "generativeProceduralPluginRegistry.h"
@@ -190,6 +173,10 @@ HdGpGenerativeProceduralResolvingSceneIndex::_PrimsAdded(
 
     for (auto it = entries.begin(), e = entries.end(); it != e; ++it) {
         const HdSceneIndexObserver::AddedPrimEntry &entry = *it;
+        if (entry.primPath.IsAbsoluteRootPath()) {
+            continue;
+        }
+
         if (entry.primType == _targetPrimTypeName) {
             if (!entriesCopied) {
                 entriesCopied = true;
@@ -209,9 +196,12 @@ HdGpGenerativeProceduralResolvingSceneIndex::_PrimsAdded(
             }
         }
 
+        // We've already skipped the case where entry.primPath is the absolute
+        // root, so GetParentPath() makes sense here.
+        const SdfPath entryPrimParentPath = entry.primPath.GetParentPath();
         // NOTE: potentially share code with primsremoved
         _DependencyMap::const_iterator dIt =
-            _dependencies.find(entry.primPath.GetParentPath());
+            _dependencies.find(entryPrimParentPath);
         if (dIt != _dependencies.end()) {
             for (const SdfPath &dependentPath : dIt->second) {
                 // don't bother checking a procedural which already scheduled
@@ -228,7 +218,7 @@ HdGpGenerativeProceduralResolvingSceneIndex::_PrimsAdded(
 
                 const _ProcEntry &procEntry = procIt->second;
                 const auto dslIt =
-                    procEntry.dependencies.find(entry.primPath.GetParentPath());
+                    procEntry.dependencies.find(entryPrimParentPath);
                 
                 if (dslIt == procEntry.dependencies.end()) {
                     continue;
diff --git a/pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.h b/pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.h
index e9915a84c5..ce11da3bb5 100644
--- a/pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.h
+++ b/pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_RESOLVING_SCENE_INDEX_H
 #define PXR_IMAGING_HD_GP_GENERATIVE_PROCEDURAL_RESOLVING_SCENE_INDEX_H
@@ -124,8 +107,9 @@ class HdGpGenerativeProceduralResolvingSceneIndex
 
     static void _CombinePathArrays(const _DensePathSet &s, SdfPathVector *v);
 
-    struct _ProcEntry : public TfWeakBase
+    class _ProcEntry : public TfWeakBase
     {
+    public:
         enum State : unsigned char {
             StateUncooked = 0,
             StateDependenciesCooking,
diff --git a/pxr/imaging/hdGp/pch.h b/pxr/imaging/hdGp/pch.h
index bf09080c29..60166ea85a 100644
--- a/pxr/imaging/hdGp/pch.h
+++ b/pxr/imaging/hdGp/pch.h
@@ -1,45 +1,44 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
 
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
+#include "pxr/base/arch/defines.h"
+#if defined(ARCH_OS_DARWIN)
+#include <mach/mach_time.h>
+#endif
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
+#include <x86intrin.h>
+#endif
+#if defined(ARCH_OS_WINDOWS)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <Windows.h>
+#include <intrin.h>
+#endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
 #include <cstddef>
 #include <cstdint>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <functional>
 #include <initializer_list>
-#include <intrin.h>
 #include <iosfwd>
-#include <iostream>
 #include <iterator>
 #include <limits>
 #include <list>
@@ -49,14 +48,15 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -64,43 +64,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -109,24 +72,17 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
+#include <tbb/concurrent_vector.h>
+#include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_for_each.h>
+#include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
+#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hdGp/sceneIndexPlugin.cpp b/pxr/imaging/hdGp/sceneIndexPlugin.cpp
index 3bdbbfdfa1..8a864567ad 100644
--- a/pxr/imaging/hdGp/sceneIndexPlugin.cpp
+++ b/pxr/imaging/hdGp/sceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdGp/sceneIndexPlugin.h"
 #include "pxr/imaging/hdGp/generativeProceduralResolvingSceneIndex.h"
diff --git a/pxr/imaging/hdGp/sceneIndexPlugin.h b/pxr/imaging/hdGp/sceneIndexPlugin.h
index 339890276c..6e46e3e9cb 100644
--- a/pxr/imaging/hdGp/sceneIndexPlugin.h
+++ b/pxr/imaging/hdGp/sceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_GP_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_GP_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/hdMtlx/api.h b/pxr/imaging/hdMtlx/api.h
index fb9288a6de..6a46655853 100644
--- a/pxr/imaging/hdMtlx/api.h
+++ b/pxr/imaging/hdMtlx/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MTLX_API_H
 #define PXR_IMAGING_HD_MTLX_API_H
diff --git a/pxr/imaging/hdMtlx/hdMtlx.cpp b/pxr/imaging/hdMtlx/hdMtlx.cpp
index c7aac6ef40..ce0ae2c897 100644
--- a/pxr/imaging/hdMtlx/hdMtlx.cpp
+++ b/pxr/imaging/hdMtlx/hdMtlx.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdMtlx/hdMtlx.h"
 #include "pxr/imaging/hd/material.h"
@@ -37,6 +20,7 @@
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/getenv.h"
 #include "pxr/base/tf/token.h"
+#include "pxr/base/trace/trace.h"
 
 #include "pxr/usd/usdMtlx/utils.h"
 
@@ -288,13 +272,15 @@ _AddMaterialXNode(
         }
     }
 
-    // MaterialX nodes that use textures are assumed to have a filename input
-    if (mxNodeDef->getNodeGroup() == "texture2d") {
-        if (mxHdData) {
-            // Save the corresponding MaterialX and Hydra names for ShaderGen
-            mxHdData->mxHdTextureMap[mxNodeName] = connectionName;
-            // Save the path to adjust parameters after traversing the network
-            mxHdData->hdTextureNodes.insert(hdNodePath);
+    // MaterialX nodes that use textures can have more than one filename input
+    if (mxHdData) {
+        for (mx::InputPtr const& mxInput : mxNodeDef->getActiveInputs()) {
+            if (mxInput->getType() == "filename") {
+                // Save the corresponding Mx and Hydra names for ShaderGen
+                mxHdData->mxHdTextureMap[mxNodeName].insert(mxInput->getName());
+                // Save the path to adjust parameters after for ShaderGen
+                mxHdData->hdTextureNodes.insert(hdNodePath);
+            }
         }
     }
 
@@ -569,6 +555,7 @@ HdMtlxCreateMtlxDocumentFromHdMaterialNetworkInterface(
     MaterialX::DocumentPtr const& libraries,
     HdMtlxTexturePrimvarData *mxHdData)
 {
+    TRACE_FUNCTION_SCOPE("Create Mtlx Document from HdMaterialNetwork")
     if (!netInterface) {
         return nullptr;
     }
@@ -599,12 +586,14 @@ HdMtlxCreateMtlxDocumentFromHdMaterialNetworkInterface(
         mxShaderNode);
 
     // Validate the MaterialX Document.
-    std::string message;
-    if (!mxDoc->validate(&message)) {
-        TF_WARN("Validation warnings for generated MaterialX file.\n%s", 
+    {
+        TRACE_FUNCTION_SCOPE("Validate created Mtlx Document")
+        std::string message;
+        if (!mxDoc->validate(&message)) {
+            TF_WARN("Validation warnings for generated MaterialX file.\n%s\n", 
                 message.c_str());
+        }
     }
-
     return mxDoc;
 }
 
diff --git a/pxr/imaging/hdMtlx/hdMtlx.h b/pxr/imaging/hdMtlx/hdMtlx.h
index 76d31a2ac2..f706139205 100644
--- a/pxr/imaging/hdMtlx/hdMtlx.h
+++ b/pxr/imaging/hdMtlx/hdMtlx.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_MTLX_HDMTLX_H
 #define PXR_IMAGING_HD_MTLX_HDMTLX_H
@@ -67,13 +50,11 @@ HdMtlxConvertToString(VtValue const& hdParameterValue);
 
 // Storing MaterialX-Hydra texture and primvar information
 struct HdMtlxTexturePrimvarData {
-    HdMtlxTexturePrimvarData() 
-        : mxHdTextureMap(MaterialX::StringMap()), // Mx-Hd texture name mapping
-          hdTextureNodes(std::set<SdfPath>()),    // Paths to HdTexture Nodes
-          hdPrimvarNodes(std::set<SdfPath>()) {}  // Paths to HdPrimvar nodes
-    MaterialX::StringMap mxHdTextureMap;
-    std::set<SdfPath> hdTextureNodes;
-    std::set<SdfPath> hdPrimvarNodes;
+    HdMtlxTexturePrimvarData() = default;
+    using TextureMap = std::map<std::string, std::set<std::string>>;
+    TextureMap mxHdTextureMap; // Mx-Hd texture name mapping
+    std::set<SdfPath> hdTextureNodes; // Paths to HdTexture Nodes
+    std::set<SdfPath> hdPrimvarNodes; // Paths to HdPrimvar nodes
 };
 
 /// Creates and returns a MaterialX Document from the given HdMaterialNetwork2 
diff --git a/pxr/imaging/hdMtlx/pch.h b/pxr/imaging/hdMtlx/pch.h
index bf8ff6a368..ed5c01e7fe 100644
--- a/pxr/imaging/hdMtlx/pch.h
+++ b/pxr/imaging/hdMtlx/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -28,9 +11,19 @@
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
 #if defined(ARCH_OS_DARWIN)
+#include <glob.h>
+#include <limits.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <unistd.h>
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <glob.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/statfs.h>
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +31,14 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
+#include <io.h>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
-#include <array>
+#include <any>
 #include <atomic>
-#include <cfloat>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -53,6 +48,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <deque>
+#include <fcntl.h>
 #include <functional>
 #include <initializer_list>
 #include <iosfwd>
@@ -65,15 +61,18 @@
 #include <memory>
 #include <mutex>
 #include <new>
-#include <ostream>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -81,69 +80,28 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
 #include <MaterialXCore/Document.h>
+#include <MaterialXCore/Library.h>
 #include <MaterialXCore/Node.h>
 #include <MaterialXFormat/Util.h>
 #include <MaterialXFormat/XmlIo.h>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
+#endif // PXR_MATERIALX_SUPPORT_ENABLED
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/python/dict.hpp>
+#include <boost/python/extract.hpp>
+#include <boost/python/handle.hpp>
+#include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
+#include <boost/python/type_id.hpp>
 #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
 #undef tolower
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
-#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
-#include <tbb/enumerable_thread_specific.h>
 #include <tbb/spin_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
diff --git a/pxr/imaging/hdSt/CMakeLists.txt b/pxr/imaging/hdSt/CMakeLists.txt
index 9228824956..5f3e459c30 100644
--- a/pxr/imaging/hdSt/CMakeLists.txt
+++ b/pxr/imaging/hdSt/CMakeLists.txt
@@ -46,10 +46,12 @@ pxr_library(hdSt
         sdr
         tf
         trace
+        ${TBB_tbb_LIBRARY}
         ${OPENSUBDIV_LIBRARIES}
         ${optionalLibs}
 
     INCLUDE_DIRS
+        ${TBB_INCLUDE_DIRS}
         ${OPENSUBDIV_INCLUDE_DIR}
         ${optionalIncludeDirs}
 
@@ -132,12 +134,14 @@ pxr_library(hdSt
         unitTestGLDrawing
         vboMemoryManager
         vboSimpleMemoryManager
+        velocityMotionResolvingSceneIndexPlugin
         volume
         ${optionalPublicClasses}
 
     PUBLIC_HEADERS
         api.h
         dynamicUvTextureImplementation.h
+        enums.h
 
     PRIVATE_CLASSES
         assetUvTextureCpuData
@@ -662,8 +666,12 @@ pxr_install_test_dir(
     DEST testHdStClipPlanes
 )
 pxr_install_test_dir(
-    SRC testenv/testHdStCodeGen
-    DEST testHdStCodeGen
+    SRC testenv/testHdStCodeGen_GL
+    DEST testHdStCodeGen_GL
+)
+pxr_install_test_dir(
+    SRC testenv/testHdStCodeGen_Vulkan
+    DEST testHdStCodeGen_Vulkan
 )
 pxr_install_test_dir(
     SRC testenv/testHdStCurveDrawing
@@ -2366,162 +2374,270 @@ pxr_register_test(testHdStClipPlanes2
     ENV
         TF_DEBUG=HD_SAFE_MODE
 )
-pxr_register_test(testHdStCodeGen_Mesh_Indirect
+pxr_register_test(testHdStCodeGen_GL_Mesh_Indirect
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_indirect.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_indirect.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_indirect.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Mesh_Bindless_Indirect
+pxr_register_test(testHdStCodeGen_GL_Mesh_Bindless_Indirect
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --bindless | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_bindless_indirect.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Mesh_Bindless_Indirect_SmoothNormals
+pxr_register_test(testHdStCodeGen_GL_Mesh_Bindless_Indirect_SmoothNormals
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --bindless --smoothNormals | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_bindless_indirect_smoothNormals.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect_smoothNormals.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_smoothNormals.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect_smoothNormals.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_smoothNormals.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Mesh_Bindless_Indirect_DoubleSided
+pxr_register_test(testHdStCodeGen_GL_Mesh_Bindless_Indirect_DoubleSided
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --bindless --doubleSided | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_bindless_indirect_doubleSided.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect_doubleSided.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_doubleSided.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect_doubleSided.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_doubleSided.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Mesh_Bindless_Indirect_FaceVarying
+pxr_register_test(testHdStCodeGen_GL_Mesh_Bindless_Indirect_FaceVarying
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --bindless --faceVarying | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_bindless_indirect_faceVarying.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect_faceVarying.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_faceVarying.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect_faceVarying.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_faceVarying.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Mesh_Indirect_Instance
+pxr_register_test(testHdStCodeGen_GL_Mesh_Indirect_Instance
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --instance | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_indirect_instance.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect_instance.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_indirect_instance.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect_instance.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_indirect_instance.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Mesh_Bindless_Indirect_Instance
+pxr_register_test(testHdStCodeGen_GL_Mesh_Bindless_Indirect_Instance
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --bindless --instance | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_bindless_indirect_instance.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect_instance.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_instance.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_bindless_indirect_instance.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_instance.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Mesh_EdgeOnly
+pxr_register_test(testHdStCodeGen_GL_Mesh_EdgeOnly
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --edgeOnly | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_edgeonly.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_edgeonly.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_edgeonly.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_edgeonly.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_edgeonly.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Mesh_EdgeOnly_BlendWireframe
+pxr_register_test(testHdStCodeGen_GL_Mesh_EdgeOnly_BlendWireframe
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --edgeOnly --blendWireframe | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_mesh_edgeonly_blendwireframe.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_edgeonly_blendwireframe.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_mesh_edgeonly_blendwireframe.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_edgeonly_blendwireframe.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_mesh_edgeonly_blendwireframe.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Curves_Bindless
+pxr_register_test(testHdStCodeGen_GL_Curves_Bindless
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --curves --bindless | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_curves_bindless.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_curves_bindless.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_curves_bindless.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_curves_bindless.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_curves_bindless.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Curves_Indirect
+pxr_register_test(testHdStCodeGen_GL_Curves_Indirect
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --curves | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_curves_indirect.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_curves_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_curves_indirect.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_curves_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_curves_indirect.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Points_Bindless
+pxr_register_test(testHdStCodeGen_GL_Points_Bindless
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --points --bindless | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_points_bindless.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_points_bindless.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_points_bindless.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_points_bindless.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_points_bindless.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
 )
-pxr_register_test(testHdStCodeGen_Points_Indirect
+pxr_register_test(testHdStCodeGen_GL_Points_Indirect
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --points | grep -v '// line'"
     EXPECTED_RETURN_CODE 0
     STDOUT_REDIRECT codegen_points_indirect.out
-    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_points_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen/baseline/codegen_points_indirect.out"
-    TESTENV testHdStCodeGen
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_points_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_GL/baseline/codegen_points_indirect.out"
+    TESTENV testHdStCodeGen_GL
     ENV
         TF_DEBUG=HD_SAFE_MODE
         HGIGL_ENABLE_BINDLESS_BUFFER=1
         HGIGL_ENABLE_BINDLESS_TEXTURE=1
         HGIGL_GLSL_VERSION=450
+        HGI_ENABLE_VULKAN=0
+)
+
+# Skip Vulkan codegen tests if not supported by build.
+if (${PXR_ENABLE_VULKAN_SUPPORT})
+pxr_register_test(testHdStCodeGen_Vulkan_Mesh_Indirect
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_mesh_indirect.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
+)
+pxr_register_test(testHdStCodeGen_Vulkan_Mesh_Indirect_SmoothNormals
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --smoothNormals | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_mesh_indirect_smoothNormals.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect_smoothNormals.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_smoothNormals.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
+)
+pxr_register_test(testHdStCodeGen_Vulkan_Mesh_Indirect_DoubleSided
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --doubleSided | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_mesh_indirect_doubleSided.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect_doubleSided.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_doubleSided.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
+)
+pxr_register_test(testHdStCodeGen_Vulkan_Mesh_Indirect_FaceVarying
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --faceVarying | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_mesh_indirect_faceVarying.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect_faceVarying.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_faceVarying.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
+)
+pxr_register_test(testHdStCodeGen_Vulkan_Mesh_Indirect_Instance
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --instance | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_mesh_indirect_instance.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_indirect_instance.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_instance.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
+)
+pxr_register_test(testHdStCodeGen_Vulkan_Mesh_EdgeOnly
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --edgeOnly | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_mesh_edgeonly.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_edgeonly.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_mesh_edgeonly.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
+)
+pxr_register_test(testHdStCodeGen_Vulkan_Mesh_EdgeOnly_BlendWireframe
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --mesh --edgeOnly --blendWireframe | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_mesh_edgeonly_blendwireframe.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_mesh_edgeonly_blendwireframe.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_mesh_edgeonly_blendwireframe.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
 )
+pxr_register_test(testHdStCodeGen_Vulkan_Curves_Indirect
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --curves | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_curves_indirect.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_curves_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_curves_indirect.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
+)
+pxr_register_test(testHdStCodeGen_Vulkan_Points_Indirect
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCodeGen --points | grep -v '// line'"
+    EXPECTED_RETURN_CODE 0
+    STDOUT_REDIRECT codegen_points_indirect.out
+    POST_COMMAND "diff -I '\".*\.glslfx\"' codegen_points_indirect.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStCodeGen_Vulkan/baseline/codegen_points_indirect.out"
+    TESTENV testHdStCodeGen_Vulkan
+    ENV
+        TF_DEBUG=HD_SAFE_MODE
+        HGI_ENABLE_VULKAN=1
+)
+endif() # PXR_ENABLE_VULKAN_SUPPORT
+
 pxr_register_test(testHdStCurveDrawing_lv0_refined
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStCurveDrawing --offscreen --repr refined --refineLevel 0 --write testHdStCurveDrawing_lv0_refined.png"
     EXPECTED_RETURN_CODE 0
@@ -2789,6 +2905,7 @@ pxr_register_test(testHdStIndirectDrawBatchCodeGen
     EXPECTED_RETURN_CODE 0
     ENV
         HD_ENABLE_GPU_FRUSTUM_CULLING=false
+        HGI_ENABLE_VULKAN=0
 )
 pxr_register_test(testHdStIndirectDrawBatchCulling
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStIndirectDrawBatchCulling"
@@ -2965,7 +3082,7 @@ pxr_register_test(testHdStMaterialXShaderGen_SStextured
     TESTENV testHdStMaterialXShaderGen
 )
 pxr_register_test(testHdStMaterialXShaderGen_UsdPSglass
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStMaterialXShaderGen --filename usd_preview_surface_glass.mtlx --materialTag translucent"
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHdStMaterialXShaderGen --filename usd_preview_surface_glass.mtlx"
     STDOUT_REDIRECT shadergen_UsdPSglass.out
     EXPECTED_RETURN_CODE 0
     POST_COMMAND "diff -B -b shadergen_UsdPSglass.out ${CMAKE_INSTALL_PREFIX}/tests/ctest/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSglass.out"
diff --git a/pxr/imaging/hdSt/api.h b/pxr/imaging/hdSt/api.h
index 31fda4a555..18842da3b1 100644
--- a/pxr/imaging/hdSt/api.h
+++ b/pxr/imaging/hdSt/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_API_H
 #define PXR_IMAGING_HD_ST_API_H
diff --git a/pxr/imaging/hdSt/assetUvTextureCpuData.cpp b/pxr/imaging/hdSt/assetUvTextureCpuData.cpp
index 40e0ecb749..c279f1c0d7 100644
--- a/pxr/imaging/hdSt/assetUvTextureCpuData.cpp
+++ b/pxr/imaging/hdSt/assetUvTextureCpuData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/assetUvTextureCpuData.h"
 #include "pxr/imaging/hdSt/textureUtils.h"
diff --git a/pxr/imaging/hdSt/assetUvTextureCpuData.h b/pxr/imaging/hdSt/assetUvTextureCpuData.h
index 621821ddc3..3282b84ae7 100644
--- a/pxr/imaging/hdSt/assetUvTextureCpuData.h
+++ b/pxr/imaging/hdSt/assetUvTextureCpuData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDST_ASSET_UV_TEXTURE_CPU_DATA_H
 #define PXR_IMAGING_HDST_ASSET_UV_TEXTURE_CPU_DATA_H
diff --git a/pxr/imaging/hdSt/basisCurves.cpp b/pxr/imaging/hdSt/basisCurves.cpp
index b3f0e09c7d..8a8810367a 100644
--- a/pxr/imaging/hdSt/basisCurves.cpp
+++ b/pxr/imaging/hdSt/basisCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdSt/basisCurves.h b/pxr/imaging/hdSt/basisCurves.h
index 9f3e59235a..655b9b77c5 100644
--- a/pxr/imaging/hdSt/basisCurves.h
+++ b/pxr/imaging/hdSt/basisCurves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_BASIS_CURVES_H
 #define PXR_IMAGING_HD_ST_BASIS_CURVES_H
diff --git a/pxr/imaging/hdSt/basisCurvesComputations.cpp b/pxr/imaging/hdSt/basisCurvesComputations.cpp
index 6f7f4bf7d1..ee4e618a62 100644
--- a/pxr/imaging/hdSt/basisCurvesComputations.cpp
+++ b/pxr/imaging/hdSt/basisCurvesComputations.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/imaging/hdSt/basisCurvesComputations.h b/pxr/imaging/hdSt/basisCurvesComputations.h
index 2e31417cb7..0a83314ab9 100644
--- a/pxr/imaging/hdSt/basisCurvesComputations.h
+++ b/pxr/imaging/hdSt/basisCurvesComputations.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_BASIS_CURVES_COMPUTATIONS_H
 #define PXR_IMAGING_HD_ST_BASIS_CURVES_COMPUTATIONS_H
diff --git a/pxr/imaging/hdSt/basisCurvesShaderKey.cpp b/pxr/imaging/hdSt/basisCurvesShaderKey.cpp
index f0ada8a7e5..405f4a39b5 100644
--- a/pxr/imaging/hdSt/basisCurvesShaderKey.cpp
+++ b/pxr/imaging/hdSt/basisCurvesShaderKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdSt/basisCurvesShaderKey.h b/pxr/imaging/hdSt/basisCurvesShaderKey.h
index a7ec375699..d99f1e6227 100644
--- a/pxr/imaging/hdSt/basisCurvesShaderKey.h
+++ b/pxr/imaging/hdSt/basisCurvesShaderKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_BASIS_CURVES_SHADER_KEY_H
 #define PXR_IMAGING_HD_ST_BASIS_CURVES_SHADER_KEY_H
diff --git a/pxr/imaging/hdSt/basisCurvesTopology.cpp b/pxr/imaging/hdSt/basisCurvesTopology.cpp
index eca804d281..be4820c7f8 100644
--- a/pxr/imaging/hdSt/basisCurvesTopology.cpp
+++ b/pxr/imaging/hdSt/basisCurvesTopology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/basisCurvesTopology.h"
diff --git a/pxr/imaging/hdSt/basisCurvesTopology.h b/pxr/imaging/hdSt/basisCurvesTopology.h
index 281fcbbe76..89260b92b1 100644
--- a/pxr/imaging/hdSt/basisCurvesTopology.h
+++ b/pxr/imaging/hdSt/basisCurvesTopology.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_BASIS_CURVES_TOPOLOGY_H
 #define PXR_IMAGING_HD_ST_BASIS_CURVES_TOPOLOGY_H
diff --git a/pxr/imaging/hdSt/binding.cpp b/pxr/imaging/hdSt/binding.cpp
index 4965836f90..4bc3f41aad 100644
--- a/pxr/imaging/hdSt/binding.cpp
+++ b/pxr/imaging/hdSt/binding.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/binding.h"
 
diff --git a/pxr/imaging/hdSt/binding.h b/pxr/imaging/hdSt/binding.h
index cdddfae581..7c1d5758e0 100644
--- a/pxr/imaging/hdSt/binding.h
+++ b/pxr/imaging/hdSt/binding.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDST_BINDING_H
 #define PXR_IMAGING_HDST_BINDING_H
diff --git a/pxr/imaging/hdSt/bufferArrayRange.cpp b/pxr/imaging/hdSt/bufferArrayRange.cpp
index da89d070ce..627c619a03 100644
--- a/pxr/imaging/hdSt/bufferArrayRange.cpp
+++ b/pxr/imaging/hdSt/bufferArrayRange.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/bufferArrayRange.h"
 #include "pxr/imaging/hdSt/bufferResource.h"
diff --git a/pxr/imaging/hdSt/bufferArrayRange.h b/pxr/imaging/hdSt/bufferArrayRange.h
index 6952404f40..ce7cb274f1 100644
--- a/pxr/imaging/hdSt/bufferArrayRange.h
+++ b/pxr/imaging/hdSt/bufferArrayRange.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_BUFFER_ARRAY_RANGE_H
 #define PXR_IMAGING_HD_ST_BUFFER_ARRAY_RANGE_H
diff --git a/pxr/imaging/hdSt/bufferArrayRegistry.cpp b/pxr/imaging/hdSt/bufferArrayRegistry.cpp
index d0a3b16419..60d5796407 100644
--- a/pxr/imaging/hdSt/bufferArrayRegistry.cpp
+++ b/pxr/imaging/hdSt/bufferArrayRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/bufferArrayRegistry.h"
 #include "pxr/imaging/hd/bufferArray.h"
diff --git a/pxr/imaging/hdSt/bufferArrayRegistry.h b/pxr/imaging/hdSt/bufferArrayRegistry.h
index 1c4a5bf755..178eeca309 100644
--- a/pxr/imaging/hdSt/bufferArrayRegistry.h
+++ b/pxr/imaging/hdSt/bufferArrayRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_BUFFER_ARRAY_REGISTRY_H
 #define PXR_IMAGING_HD_ST_BUFFER_ARRAY_REGISTRY_H
diff --git a/pxr/imaging/hdSt/bufferResource.cpp b/pxr/imaging/hdSt/bufferResource.cpp
index 7edc0215ff..cce5eb99b4 100644
--- a/pxr/imaging/hdSt/bufferResource.cpp
+++ b/pxr/imaging/hdSt/bufferResource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/bufferResource.h"
diff --git a/pxr/imaging/hdSt/bufferResource.h b/pxr/imaging/hdSt/bufferResource.h
index 09a1fca41a..f132a543c8 100644
--- a/pxr/imaging/hdSt/bufferResource.h
+++ b/pxr/imaging/hdSt/bufferResource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_BUFFER_RESOURCE_H
 #define PXR_IMAGING_HD_ST_BUFFER_RESOURCE_H
diff --git a/pxr/imaging/hdSt/bufferUtils.cpp b/pxr/imaging/hdSt/bufferUtils.cpp
index 0e11808eb5..c2d65b71ef 100644
--- a/pxr/imaging/hdSt/bufferUtils.cpp
+++ b/pxr/imaging/hdSt/bufferUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/bufferUtils.h"
 #include "pxr/imaging/hdSt/resourceRegistry.h"
diff --git a/pxr/imaging/hdSt/bufferUtils.h b/pxr/imaging/hdSt/bufferUtils.h
index d74065aae3..69b33800bf 100644
--- a/pxr/imaging/hdSt/bufferUtils.h
+++ b/pxr/imaging/hdSt/bufferUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_BUFFER_UTILS_H
 #define PXR_IMAGING_HD_ST_BUFFER_UTILS_H
diff --git a/pxr/imaging/hdSt/codeGen.cpp b/pxr/imaging/hdSt/codeGen.cpp
index d21e3687f8..047c657547 100644
--- a/pxr/imaging/hdSt/codeGen.cpp
+++ b/pxr/imaging/hdSt/codeGen.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/codeGen.h"
 #include "pxr/imaging/hdSt/binding.h"
@@ -145,6 +128,7 @@ TF_DEFINE_PRIVATE_TOKENS(
     (line_strip)
     (triangle_strip)
     (early_fragment_tests)
+    (OsdPerPatchVertexBezier)
 );
 
 TF_DEFINE_ENV_SETTING(HDST_ENABLE_HGI_RESOURCE_GENERATION, false,
@@ -582,6 +566,7 @@ class _ResourceGenerator
     ~_ResourceGenerator() = default;
 
     void _GenerateHgiResources(
+        Hgi const * hgi,
         HgiShaderFunctionDesc *funcDesc,
         TfToken const & shaderStage,
         HioGlslfxResourceLayout::ElementVector const & elements,
@@ -606,6 +591,12 @@ class _ResourceGenerator
         HioGlslfxResourceLayout::TextureElementVector const & textureElements,
         HdSt_ResourceBinder::MetaData const & metaData);
 
+    void  _AdvanceShaderStage()
+    {
+        // Reset interstage slot counter when moving to next stage.
+        _nextInterstageSlot = 0;
+    }
+
 private:
     using _SlotTable = std::unordered_map<TfToken, int32_t, TfHash>;
 
@@ -625,16 +616,17 @@ class _ResourceGenerator
         return _nextOutputLocation++;
     }
 
-    int32_t _GetSlot(TfToken const & name, uint32_t const count = 1)
+    int32_t _GetSlot(TfToken const & name, bool in, uint32_t const count = 1)
     {
         _SlotTable::iterator entry = _interstageSlotTable.find(name);
 
-        if (entry != _interstageSlotTable.end()) {
+        // For input interstage slots, check slot table.
+        if (in && entry != _interstageSlotTable.end()) {
             return entry->second;
         }
 
         int32_t const currentSlot = _nextInterstageSlot;
-        _interstageSlotTable.insert({name, currentSlot});
+        _interstageSlotTable.insert_or_assign(name, currentSlot);
         _nextInterstageSlot += count;
 
         return currentSlot;
@@ -713,8 +705,27 @@ _IsVertexAttribInputStage(TfToken const & shaderStage)
            (shaderStage == HdShaderTokens->postTessVertexShader);
 }
 
+// Most data types we use in Storm take up one location slot. There are some 
+// exceptions, which we can add here as we find them.
+uint32_t
+_GetLocationCount(Hgi const * hgi, TfToken const & dataType)
+{
+    if (dataType == _tokens->OsdPerPatchVertexBezier) {
+        return 2;
+    }
+    
+    // In Vulkan, 64-bit three or four component vectors take up two slots.
+    if ((dataType == _tokens->dvec3 || dataType == _tokens->dvec4) && 
+        hgi->GetAPIName() == HgiTokens->Vulkan) {
+        return 2;
+    }
+    
+    return 1;
+}
+
 void
 _ResourceGenerator::_GenerateHgiResources(
+    Hgi const * hgi,
     HgiShaderFunctionDesc *funcDesc,
     TfToken const & shaderStage,
     HioGlslfxResourceLayout::ElementVector const & elements,
@@ -740,7 +751,8 @@ _ResourceGenerator::_GenerateHgiResources(
                     HgiShaderFunctionParamDesc param;
                     param.nameInShader = element.name;
                     param.type = element.dataType;
-                    param.interstageSlot = _GetSlot(element.name);
+                    param.interstageSlot = _GetSlot(element.name, /*in*/true,
+                        _GetLocationCount(hgi, element.dataType));
                     param.interpolation = _GetInterpolation(element.qualifiers);
                     param.sampling = _GetSamplingQualifier(element.qualifiers);
                     param.storage = _GetStorageQualifier(element.qualifiers);
@@ -758,7 +770,8 @@ _ResourceGenerator::_GenerateHgiResources(
                     HgiShaderFunctionParamDesc param;
                     param.nameInShader = element.name,
                     param.type = element.dataType,
-                    param.interstageSlot = _GetSlot(element.name);
+                    param.interstageSlot = _GetSlot(element.name, /*in*/false,
+                        _GetLocationCount(hgi, element.dataType));
                     param.interpolation = _GetInterpolation(element.qualifiers);
                     param.sampling = _GetSamplingQualifier(element.qualifiers);
                     param.storage = _GetStorageQualifier(element.qualifiers);
@@ -775,7 +788,13 @@ _ResourceGenerator::_GenerateHgiResources(
             TfToken const firstMemberBlockName =
                 _GetFlattenedName(element.aggregateName,
                                   element.members.front().name);
-            paramBlock.interstageSlot = _GetSlot(firstMemberBlockName);
+
+            uint32_t locationCount = 0;
+            for (const auto& member : element.members) {
+                locationCount += _GetLocationCount(hgi, member.dataType);
+            }
+            paramBlock.interstageSlot = _GetSlot(firstMemberBlockName,
+                /*in*/element.inOut == InOut::STAGE_IN, locationCount);
 
             for (auto const & member : element.members) {
                 HgiShaderFunctionParamBlockDesc::Member paramMember;
@@ -1211,6 +1230,26 @@ _ResourceGenerator::_GenerateGLSLResources(
     }
 }
 
+static
+std::string
+_GetGLSLSamplerTypePrefix(HioFormat hioFormat)
+{
+    GLenum const hioType = HioGetHioType(hioFormat);
+    switch (hioType) {
+        case HioTypeUnsignedByte:
+        case HioTypeUnsignedByteSRGB:
+        case HioTypeUnsignedShort:
+        case HioTypeUnsignedInt:
+            return "u";
+        case HioTypeSignedByte:
+        case HioTypeSignedShort:
+        case HioTypeInt:
+            return "i";
+        default:
+            return "";
+    }
+}
+
 void
 _ResourceGenerator::_GenerateGLSLTextureResources(
     std::stringstream &str,
@@ -1227,13 +1266,18 @@ _ResourceGenerator::_GenerateGLSLTextureResources(
 
         bool const isArrayOfTexture = (texture.arraySize > 0);
 
+        const std::string typePrefix =
+            _GetGLSLSamplerTypePrefix(texture.format);
+
         std::string const samplerType =
+            typePrefix +
             (isShadowTexture
                 ? "sampler" + std::to_string(texture.dim) + "DShadow"
                 : "sampler" + std::to_string(texture.dim) + "D") +
             (isArrayTexture ? "Array" : "");
 
         std::string const resultType =
+            typePrefix +
             (isShadowTexture ? "float" : "vec4");
 
         std::string const resourceName =
@@ -2443,6 +2487,7 @@ HdSt_CodeGen::_GenerateComputeParameters(HgiShaderFunctionDesc * const csDesc)
     // main
     _genCS << "void main() {\n";
     _genCS << "  int computeCoordinate = int(hd_GlobalInvocationID.x);\n";
+    _genCS << "  if (computeCoordinate >= indexEnd) {\n    return;\n  };\n";
     _genCS << "  compute(computeCoordinate);\n";
     _genCS << "}\n";
 
@@ -2510,42 +2555,6 @@ HdSt_CodeGen::_CompileWithGeneratedGLSLResources(
         }
         shaderCompiled = true;
     }
-    if (_hasFS) {
-        HgiShaderFunctionDesc desc;
-        std::stringstream resDecl;
-        resourceGen._GenerateGLSLResources(&desc, resDecl,
-            HdShaderTokens->fragmentShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateGLSLResources(&desc, resDecl,
-            HdShaderTokens->fragmentShader, _resFS, _GetMetaData());
-
-        // material in FS
-        resourceGen._GenerateGLSLResources(&desc, resDecl,
-            HdShaderTokens->fragmentShader, _resMaterial, _GetMetaData());
-        resourceGen._GenerateGLSLTextureResources(resDecl,
-            HdShaderTokens->fragmentShader, _resTextures, _GetMetaData());
-
-        std::string const source =
-            _genDefines.str() + _genDecl.str() + resDecl.str() + _osd.str() +
-            _genAccessors.str() + _genFS.str();
-
-        desc.shaderStage = HgiShaderStageFragment;
-        desc.shaderCode = source.c_str();
-        desc.generatedShaderCodeOut = &_fsSource;
-
-        const bool builtinBarycentricsEnabled =
-            registry->GetHgi()->GetCapabilities()->IsSet(
-                HgiDeviceCapabilitiesBitsBuiltinBarycentrics);
-        if (builtinBarycentricsEnabled) {
-            HgiShaderFunctionAddStageInput(
-                &desc, "hd_BaryCoordNoPersp", "vec3",
-                HgiShaderKeywordTokens->hdBaryCoordNoPersp);
-        }
-
-        if (!glslProgram->CompileShader(desc)) {
-            return nullptr;
-        }
-        shaderCompiled = true;
-    }
     if (_hasTCS) {
         HgiShaderFunctionDesc desc;
         std::stringstream resDecl;
@@ -2636,6 +2645,42 @@ HdSt_CodeGen::_CompileWithGeneratedGLSLResources(
         }
         shaderCompiled = true;
     }
+    if (_hasFS) {
+        HgiShaderFunctionDesc desc;
+        std::stringstream resDecl;
+        resourceGen._GenerateGLSLResources(&desc, resDecl,
+            HdShaderTokens->fragmentShader, _resCommon, _GetMetaData());
+        resourceGen._GenerateGLSLResources(&desc, resDecl,
+            HdShaderTokens->fragmentShader, _resFS, _GetMetaData());
+
+        // material in FS
+        resourceGen._GenerateGLSLResources(&desc, resDecl,
+            HdShaderTokens->fragmentShader, _resMaterial, _GetMetaData());
+        resourceGen._GenerateGLSLTextureResources(resDecl,
+            HdShaderTokens->fragmentShader, _resTextures, _GetMetaData());
+
+        std::string const source =
+            _genDefines.str() + _genDecl.str() + resDecl.str() + _osd.str() +
+            _genAccessors.str() + _genFS.str();
+
+        desc.shaderStage = HgiShaderStageFragment;
+        desc.shaderCode = source.c_str();
+        desc.generatedShaderCodeOut = &_fsSource;
+
+        const bool builtinBarycentricsEnabled =
+            registry->GetHgi()->GetCapabilities()->IsSet(
+                HgiDeviceCapabilitiesBitsBuiltinBarycentrics);
+        if (builtinBarycentricsEnabled) {
+            HgiShaderFunctionAddStageInput(
+                &desc, "hd_BaryCoordNoPersp", "vec3",
+                HgiShaderKeywordTokens->hdBaryCoordNoPersp);
+        }
+
+        if (!glslProgram->CompileShader(desc)) {
+            return nullptr;
+        }
+        shaderCompiled = true;
+    }
 
     if (!shaderCompiled) {
         return nullptr;
@@ -2667,11 +2712,12 @@ HdSt_CodeGen::_CompileWithGeneratedHgiResources(
         HgiShaderFunctionDesc vsDesc;
         vsDesc.shaderStage = HgiShaderStageVertex;
 
-        resourceGen._GenerateHgiResources(&vsDesc,
+        resourceGen._AdvanceShaderStage();
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &vsDesc,
             HdShaderTokens->vertexShader, _resAttrib, _GetMetaData());
-        resourceGen._GenerateHgiResources(&vsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &vsDesc,
             HdShaderTokens->vertexShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateHgiResources(&vsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &vsDesc,
             HdShaderTokens->vertexShader, _resVS, _GetMetaData());
 
         std::string const declarations = _genDefines.str() + _genDecl.str();
@@ -2723,62 +2769,14 @@ HdSt_CodeGen::_CompileWithGeneratedHgiResources(
         shaderCompiled = true;
     }
 
-    if (_hasFS) {
-        HgiShaderFunctionDesc fsDesc;
-        fsDesc.shaderStage = HgiShaderStageFragment;
-
-        resourceGen._GenerateHgiResources(&fsDesc,
-            HdShaderTokens->fragmentShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateHgiResources(&fsDesc,
-            HdShaderTokens->fragmentShader, _resFS, _GetMetaData());
-
-        // material in FS
-        resourceGen._GenerateHgiResources(&fsDesc,
-            HdShaderTokens->fragmentShader, _resMaterial, _GetMetaData());
-        resourceGen._GenerateHgiTextureResources(&fsDesc,
-            HdShaderTokens->fragmentShader, _resTextures, _GetMetaData());
-
-        std::string const declarations =
-            _genDefines.str() + _genDecl.str() + _osd.str();
-        std::string const source = _genAccessors.str() + _genFS.str();
-
-        fsDesc.shaderCodeDeclarations = declarations.c_str();
-        fsDesc.shaderCode = source.c_str();
-        fsDesc.generatedShaderCodeOut = &_fsSource;
-
-        // builtins
-        HgiShaderFunctionAddStageInput(
-            &fsDesc, "gl_PrimitiveID", "uint",
-            HgiShaderKeywordTokens->hdPrimitiveID);
-        HgiShaderFunctionAddStageInput(
-            &fsDesc, "gl_FrontFacing", "bool",
-            HgiShaderKeywordTokens->hdFrontFacing);
-        HgiShaderFunctionAddStageInput(
-            &fsDesc, "gl_FragCoord", "vec4",
-            HgiShaderKeywordTokens->hdPosition);
-        const bool builtinBarycentricsEnabled =
-            registry->GetHgi()->GetCapabilities()->IsSet(
-                HgiDeviceCapabilitiesBitsBuiltinBarycentrics);
-        if (builtinBarycentricsEnabled) {
-            HgiShaderFunctionAddStageInput(
-                &fsDesc, "hd_BaryCoordNoPersp", "vec3",
-                HgiShaderKeywordTokens->hdBaryCoordNoPersp);
-        }
-
-        if (!glslProgram->CompileShader(fsDesc)) {
-            return nullptr;
-        }
-
-        shaderCompiled = true;
-    }
-
     if (_hasTCS) {
         HgiShaderFunctionDesc tcsDesc;
         tcsDesc.shaderStage = HgiShaderStageTessellationControl;
 
-        resourceGen._GenerateHgiResources(&tcsDesc,
+        resourceGen._AdvanceShaderStage();
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &tcsDesc,
             HdShaderTokens->tessControlShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateHgiResources(&tcsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &tcsDesc,
             HdShaderTokens->tessControlShader, _resTCS, _GetMetaData());
 
         std::string const declarations =
@@ -2800,9 +2798,10 @@ HdSt_CodeGen::_CompileWithGeneratedHgiResources(
         HgiShaderFunctionDesc tesDesc;
         tesDesc.shaderStage = HgiShaderStageTessellationEval;
 
-        resourceGen._GenerateHgiResources(&tesDesc,
+        resourceGen._AdvanceShaderStage();
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &tesDesc,
             HdShaderTokens->tessEvalShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateHgiResources(&tesDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &tesDesc,
             HdShaderTokens->tessEvalShader, _resTES, _GetMetaData());
 
         std::string const declarations =
@@ -2856,15 +2855,16 @@ HdSt_CodeGen::_CompileWithGeneratedHgiResources(
             HgiShaderFunctionTessellationDesc::PatchType::Isolines;
         }
 
-        resourceGen._GenerateHgiResources(&ptcsDesc,
+        resourceGen._AdvanceShaderStage();
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &ptcsDesc,
             HdShaderTokens->postTessControlShader, _resAttrib, _GetMetaData());
-        resourceGen._GenerateHgiResources(&ptcsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &ptcsDesc,
             HdShaderTokens->postTessControlShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateHgiResources(&ptcsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &ptcsDesc,
             HdShaderTokens->postTessControlShader, _resPTCS, _GetMetaData());
 
         // material in PTCS
-        resourceGen._GenerateHgiResources(&ptcsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &ptcsDesc,
             HdShaderTokens->postTessControlShader, _resMaterial, _GetMetaData());
         resourceGen._GenerateHgiTextureResources(&ptcsDesc,
             HdShaderTokens->postTessControlShader, _resTextures, _GetMetaData());
@@ -2942,15 +2942,16 @@ HdSt_CodeGen::_CompileWithGeneratedHgiResources(
                 HgiShaderFunctionTessellationDesc::PatchType::Isolines;
         }
 
-        resourceGen._GenerateHgiResources(&ptvsDesc,
+        resourceGen._AdvanceShaderStage();
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &ptvsDesc,
             HdShaderTokens->postTessVertexShader, _resAttrib, _GetMetaData());
-        resourceGen._GenerateHgiResources(&ptvsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &ptvsDesc,
             HdShaderTokens->postTessVertexShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateHgiResources(&ptvsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &ptvsDesc,
             HdShaderTokens->postTessVertexShader, _resPTVS, _GetMetaData());
 
         // material in PTVS
-        resourceGen._GenerateHgiResources(&ptvsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &ptvsDesc,
             HdShaderTokens->postTessVertexShader, _resMaterial, _GetMetaData());
         resourceGen._GenerateHgiTextureResources(&ptvsDesc,
             HdShaderTokens->postTessVertexShader, _resTextures, _GetMetaData());
@@ -3016,13 +3017,14 @@ HdSt_CodeGen::_CompileWithGeneratedHgiResources(
         HgiShaderFunctionDesc gsDesc;
         gsDesc.shaderStage = HgiShaderStageGeometry;
 
-        resourceGen._GenerateHgiResources(&gsDesc,
+        resourceGen._AdvanceShaderStage();
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &gsDesc,
             HdShaderTokens->geometryShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateHgiResources(&gsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &gsDesc,
             HdShaderTokens->geometryShader, _resGS, _GetMetaData());
 
         // material in GS
-        resourceGen._GenerateHgiResources(&gsDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &gsDesc,
             HdShaderTokens->geometryShader, _resMaterial, _GetMetaData());
         resourceGen._GenerateHgiTextureResources(&gsDesc,
             HdShaderTokens->geometryShader, _resTextures, _GetMetaData());
@@ -3048,19 +3050,73 @@ HdSt_CodeGen::_CompileWithGeneratedHgiResources(
         shaderCompiled = true;
     }
 
+    if (_hasFS) {
+        HgiShaderFunctionDesc fsDesc;
+        fsDesc.shaderStage = HgiShaderStageFragment;
+
+        resourceGen._AdvanceShaderStage();
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &fsDesc,
+            HdShaderTokens->fragmentShader, _resCommon, _GetMetaData());
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &fsDesc,
+            HdShaderTokens->fragmentShader, _resFS, _GetMetaData());
+
+        // material in FS
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &fsDesc,
+            HdShaderTokens->fragmentShader, _resMaterial, _GetMetaData());
+        resourceGen._GenerateHgiTextureResources(&fsDesc,
+            HdShaderTokens->fragmentShader, _resTextures, _GetMetaData());
+
+        std::string const declarations =
+            _genDefines.str() + _genDecl.str() + _osd.str();
+        std::string const source = _genAccessors.str() + _genFS.str();
+
+        fsDesc.shaderCodeDeclarations = declarations.c_str();
+        fsDesc.shaderCode = source.c_str();
+        fsDesc.generatedShaderCodeOut = &_fsSource;
+
+        // builtins
+        HgiShaderFunctionAddStageInput(
+            &fsDesc, "gl_PrimitiveID", "uint",
+            HgiShaderKeywordTokens->hdPrimitiveID);
+        HgiShaderFunctionAddStageInput(
+            &fsDesc, "gl_FrontFacing", "bool",
+            HgiShaderKeywordTokens->hdFrontFacing);
+        HgiShaderFunctionAddStageInput(
+            &fsDesc, "gl_FragCoord", "vec4",
+            HgiShaderKeywordTokens->hdPosition);
+        const bool builtinBarycentricsEnabled =
+            registry->GetHgi()->GetCapabilities()->IsSet(
+                HgiDeviceCapabilitiesBitsBuiltinBarycentrics);
+        if (builtinBarycentricsEnabled) {
+            HgiShaderFunctionAddStageInput(
+                &fsDesc, "hd_BaryCoordNoPersp", "vec3",
+                HgiShaderKeywordTokens->hdBaryCoordNoPersp);
+        }
+
+        if (!glslProgram->CompileShader(fsDesc)) {
+            return nullptr;
+        }
+
+        shaderCompiled = true;
+    }
+
     if (_hasCS) {
         HgiShaderFunctionDesc csDesc;
         csDesc.shaderStage = HgiShaderStageCompute;
+        csDesc.computeDescriptor.localSize = GfVec3i(64, 1, 1);
 
         _GenerateComputeParameters(&csDesc);
 
-        resourceGen._GenerateHgiResources(&csDesc,
+        resourceGen._AdvanceShaderStage();
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &csDesc,
             HdShaderTokens->computeShader, _resAttrib, _GetMetaData());
-        resourceGen._GenerateHgiResources(&csDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &csDesc,
             HdShaderTokens->computeShader, _resCommon, _GetMetaData());
-        resourceGen._GenerateHgiResources(&csDesc,
+        resourceGen._GenerateHgiResources(registry->GetHgi(), &csDesc,
             HdShaderTokens->computeShader, _resCS, _GetMetaData());
 
+        HgiShaderFunctionAddConstantParam(&csDesc, "indexEnd", _tokens->_uint);
+
         std::string const declarations = _genDefines.str() + _genDecl.str();
         std::string const source = _genAccessors.str() + _genCS.str();
 
diff --git a/pxr/imaging/hdSt/codeGen.h b/pxr/imaging/hdSt/codeGen.h
index 26df57bda5..b2fcb99865 100644
--- a/pxr/imaging/hdSt/codeGen.h
+++ b/pxr/imaging/hdSt/codeGen.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_CODE_GEN_H
 #define PXR_IMAGING_HD_ST_CODE_GEN_H
diff --git a/pxr/imaging/hdSt/commandBuffer.cpp b/pxr/imaging/hdSt/commandBuffer.cpp
index 8fb2429672..3469792b21 100644
--- a/pxr/imaging/hdSt/commandBuffer.cpp
+++ b/pxr/imaging/hdSt/commandBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/commandBuffer.h"
 #include "pxr/imaging/hdSt/debugCodes.h"
diff --git a/pxr/imaging/hdSt/commandBuffer.h b/pxr/imaging/hdSt/commandBuffer.h
index a8e5d7e36a..85cc539181 100644
--- a/pxr/imaging/hdSt/commandBuffer.h
+++ b/pxr/imaging/hdSt/commandBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_COMMAND_BUFFER_H
 #define PXR_IMAGING_HD_ST_COMMAND_BUFFER_H
diff --git a/pxr/imaging/hdSt/computation.cpp b/pxr/imaging/hdSt/computation.cpp
index 72ae944381..ec9d2ed03f 100644
--- a/pxr/imaging/hdSt/computation.cpp
+++ b/pxr/imaging/hdSt/computation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/computation.h"
 
diff --git a/pxr/imaging/hdSt/computation.h b/pxr/imaging/hdSt/computation.h
index 6b290f8523..4f4b3c3362 100644
--- a/pxr/imaging/hdSt/computation.h
+++ b/pxr/imaging/hdSt/computation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_COMPUTATION_H
 #define PXR_IMAGING_HD_ST_COMPUTATION_H
diff --git a/pxr/imaging/hdSt/copyComputation.cpp b/pxr/imaging/hdSt/copyComputation.cpp
index 07f2f861e0..5c67b4de5e 100644
--- a/pxr/imaging/hdSt/copyComputation.cpp
+++ b/pxr/imaging/hdSt/copyComputation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/copyComputation.h"
 #include "pxr/imaging/hdSt/bufferArrayRange.h"
diff --git a/pxr/imaging/hdSt/copyComputation.h b/pxr/imaging/hdSt/copyComputation.h
index 2ca2bafb65..2ade7e2d30 100644
--- a/pxr/imaging/hdSt/copyComputation.h
+++ b/pxr/imaging/hdSt/copyComputation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_COPY_COMPUTATION_H
 #define PXR_IMAGING_HD_ST_COPY_COMPUTATION_H
diff --git a/pxr/imaging/hdSt/cullingShaderKey.cpp b/pxr/imaging/hdSt/cullingShaderKey.cpp
index 7c272ff490..b26b48d75a 100644
--- a/pxr/imaging/hdSt/cullingShaderKey.cpp
+++ b/pxr/imaging/hdSt/cullingShaderKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/cullingShaderKey.h"
 #include "pxr/base/tf/staticTokens.h"
diff --git a/pxr/imaging/hdSt/cullingShaderKey.h b/pxr/imaging/hdSt/cullingShaderKey.h
index 4318bea24e..c1c2157668 100644
--- a/pxr/imaging/hdSt/cullingShaderKey.h
+++ b/pxr/imaging/hdSt/cullingShaderKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_CULLING_SHADER_KEY_H
 #define PXR_IMAGING_HD_ST_CULLING_SHADER_KEY_H
diff --git a/pxr/imaging/hdSt/debugCodes.cpp b/pxr/imaging/hdSt/debugCodes.cpp
index ca0962c074..03bb6617bb 100644
--- a/pxr/imaging/hdSt/debugCodes.cpp
+++ b/pxr/imaging/hdSt/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/debugCodes.h"
 
diff --git a/pxr/imaging/hdSt/debugCodes.h b/pxr/imaging/hdSt/debugCodes.h
index 46e529afec..26252037b7 100644
--- a/pxr/imaging/hdSt/debugCodes.h
+++ b/pxr/imaging/hdSt/debugCodes.h
@@ -1,25 +1,8 @@
 
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DEBUG_CODES_H
 #define PXR_IMAGING_HD_ST_DEBUG_CODES_H
diff --git a/pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.cpp b/pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.cpp
index 0bdd551f6c..476ef91306 100644
--- a/pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.cpp
+++ b/pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.h"
 
diff --git a/pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.h b/pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.h
index fa377cc2e7..911f080f76 100644
--- a/pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.h
+++ b/pxr/imaging/hdSt/dependencyForwardingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_HD_ST_DEPENDENCY_FORWARDING_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_ST_DEPENDENCY_FORWARDING_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/hdSt/dependencySceneIndexPlugin.cpp b/pxr/imaging/hdSt/dependencySceneIndexPlugin.cpp
index f9c60f9bd2..37e23881c1 100644
--- a/pxr/imaging/hdSt/dependencySceneIndexPlugin.cpp
+++ b/pxr/imaging/hdSt/dependencySceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdSt/dependencySceneIndexPlugin.h"
 
diff --git a/pxr/imaging/hdSt/dependencySceneIndexPlugin.h b/pxr/imaging/hdSt/dependencySceneIndexPlugin.h
index 5515f69069..c6ced55b30 100644
--- a/pxr/imaging/hdSt/dependencySceneIndexPlugin.h
+++ b/pxr/imaging/hdSt/dependencySceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_HD_ST_DEPENDENCY_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_ST_DEPENDENCY_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/hdSt/dispatchBuffer.cpp b/pxr/imaging/hdSt/dispatchBuffer.cpp
index 1733ae4cc0..d22510a31c 100644
--- a/pxr/imaging/hdSt/dispatchBuffer.cpp
+++ b/pxr/imaging/hdSt/dispatchBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/dispatchBuffer.h"
 #include "pxr/imaging/hdSt/resourceRegistry.h"
diff --git a/pxr/imaging/hdSt/dispatchBuffer.h b/pxr/imaging/hdSt/dispatchBuffer.h
index 6f5e9c4f5b..8dcd250967 100644
--- a/pxr/imaging/hdSt/dispatchBuffer.h
+++ b/pxr/imaging/hdSt/dispatchBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DISPATCH_BUFFER_H
 #define PXR_IMAGING_HD_ST_DISPATCH_BUFFER_H
diff --git a/pxr/imaging/hdSt/domeLightComputations.cpp b/pxr/imaging/hdSt/domeLightComputations.cpp
index 0f3859685c..ea5ead4d1f 100644
--- a/pxr/imaging/hdSt/domeLightComputations.cpp
+++ b/pxr/imaging/hdSt/domeLightComputations.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/domeLightComputations.h"
 #include "pxr/imaging/hdSt/hgiConversions.h"
diff --git a/pxr/imaging/hdSt/domeLightComputations.h b/pxr/imaging/hdSt/domeLightComputations.h
index a80ab433e2..f496164f06 100644
--- a/pxr/imaging/hdSt/domeLightComputations.h
+++ b/pxr/imaging/hdSt/domeLightComputations.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DOME_LIGHT_COMPUTATIONS_H
 #define PXR_IMAGING_HD_ST_DOME_LIGHT_COMPUTATIONS_H
diff --git a/pxr/imaging/hdSt/drawBatch.cpp b/pxr/imaging/hdSt/drawBatch.cpp
index 2e552fe075..af6559fae8 100644
--- a/pxr/imaging/hdSt/drawBatch.cpp
+++ b/pxr/imaging/hdSt/drawBatch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/binding.h"
 #include "pxr/imaging/hdSt/codeGen.h"
diff --git a/pxr/imaging/hdSt/drawBatch.h b/pxr/imaging/hdSt/drawBatch.h
index a431718be4..82bd8ee8f7 100644
--- a/pxr/imaging/hdSt/drawBatch.h
+++ b/pxr/imaging/hdSt/drawBatch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DRAW_BATCH_H
 #define PXR_IMAGING_HD_ST_DRAW_BATCH_H
diff --git a/pxr/imaging/hdSt/drawItem.cpp b/pxr/imaging/hdSt/drawItem.cpp
index 79c0c09306..8871e7e696 100644
--- a/pxr/imaging/hdSt/drawItem.cpp
+++ b/pxr/imaging/hdSt/drawItem.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/drawItem.h"
 #include "pxr/imaging/hdSt/materialNetworkShader.h"
diff --git a/pxr/imaging/hdSt/drawItem.h b/pxr/imaging/hdSt/drawItem.h
index 9eda766d85..9806b215e1 100644
--- a/pxr/imaging/hdSt/drawItem.h
+++ b/pxr/imaging/hdSt/drawItem.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DRAW_ITEM_H
 #define PXR_IMAGING_HD_ST_DRAW_ITEM_H
diff --git a/pxr/imaging/hdSt/drawItemInstance.cpp b/pxr/imaging/hdSt/drawItemInstance.cpp
index c4bbf404ac..60cbb89b81 100644
--- a/pxr/imaging/hdSt/drawItemInstance.cpp
+++ b/pxr/imaging/hdSt/drawItemInstance.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/drawItemInstance.h"
 #include "pxr/imaging/hdSt/drawBatch.h"
diff --git a/pxr/imaging/hdSt/drawItemInstance.h b/pxr/imaging/hdSt/drawItemInstance.h
index f38a3ce5a5..82e500293e 100644
--- a/pxr/imaging/hdSt/drawItemInstance.h
+++ b/pxr/imaging/hdSt/drawItemInstance.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DRAW_ITEM_INSTANCE_H
 #define PXR_IMAGING_HD_ST_DRAW_ITEM_INSTANCE_H
diff --git a/pxr/imaging/hdSt/drawItemsCache.cpp b/pxr/imaging/hdSt/drawItemsCache.cpp
index 5386c5fb57..6c1c0d6c40 100644
--- a/pxr/imaging/hdSt/drawItemsCache.cpp
+++ b/pxr/imaging/hdSt/drawItemsCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/drawItemsCache.h"
 #include "pxr/imaging/hdSt/debugCodes.h"
diff --git a/pxr/imaging/hdSt/drawItemsCache.h b/pxr/imaging/hdSt/drawItemsCache.h
index 41b4c663f0..562ff18374 100644
--- a/pxr/imaging/hdSt/drawItemsCache.h
+++ b/pxr/imaging/hdSt/drawItemsCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDST_DRAW_ITEMS_CACHE_H
 #define PXR_IMAGING_HDST_DRAW_ITEMS_CACHE_H
diff --git a/pxr/imaging/hdSt/drawTarget.cpp b/pxr/imaging/hdSt/drawTarget.cpp
index c153402c89..1eb6e1d815 100644
--- a/pxr/imaging/hdSt/drawTarget.cpp
+++ b/pxr/imaging/hdSt/drawTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/drawTarget.h"
 
diff --git a/pxr/imaging/hdSt/drawTarget.h b/pxr/imaging/hdSt/drawTarget.h
index 07490c18a6..8443fe814d 100644
--- a/pxr/imaging/hdSt/drawTarget.h
+++ b/pxr/imaging/hdSt/drawTarget.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DRAW_TARGET_H
 #define PXR_IMAGING_HD_ST_DRAW_TARGET_H
diff --git a/pxr/imaging/hdSt/drawTargetRenderPassState.cpp b/pxr/imaging/hdSt/drawTargetRenderPassState.cpp
index 70f7ddaa9d..eeb7ff8ae7 100644
--- a/pxr/imaging/hdSt/drawTargetRenderPassState.cpp
+++ b/pxr/imaging/hdSt/drawTargetRenderPassState.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/drawTargetRenderPassState.h"
 #include "pxr/base/vt/value.h"
diff --git a/pxr/imaging/hdSt/drawTargetRenderPassState.h b/pxr/imaging/hdSt/drawTargetRenderPassState.h
index 37c9abef60..e612f5a41d 100644
--- a/pxr/imaging/hdSt/drawTargetRenderPassState.h
+++ b/pxr/imaging/hdSt/drawTargetRenderPassState.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DRAW_TARGET_RENDER_PASS_STATE_H
 #define PXR_IMAGING_HD_ST_DRAW_TARGET_RENDER_PASS_STATE_H
diff --git a/pxr/imaging/hdSt/dynamicUvTextureImplementation.h b/pxr/imaging/hdSt/dynamicUvTextureImplementation.h
index 9bb454ce31..3403452cfe 100644
--- a/pxr/imaging/hdSt/dynamicUvTextureImplementation.h
+++ b/pxr/imaging/hdSt/dynamicUvTextureImplementation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DYNAMIC_UV_TEXTURE_IMPLEMENTATION_H
 #define PXR_IMAGING_HD_ST_DYNAMIC_UV_TEXTURE_IMPLEMENTATION_H
diff --git a/pxr/imaging/hdSt/dynamicUvTextureObject.cpp b/pxr/imaging/hdSt/dynamicUvTextureObject.cpp
index ff666d3b24..5647be29fa 100644
--- a/pxr/imaging/hdSt/dynamicUvTextureObject.cpp
+++ b/pxr/imaging/hdSt/dynamicUvTextureObject.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/dynamicUvTextureObject.h"
diff --git a/pxr/imaging/hdSt/dynamicUvTextureObject.h b/pxr/imaging/hdSt/dynamicUvTextureObject.h
index e1fbfc62bd..de71b6592f 100644
--- a/pxr/imaging/hdSt/dynamicUvTextureObject.h
+++ b/pxr/imaging/hdSt/dynamicUvTextureObject.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_DYNAMIC_UV_TEXTURE_OBJECT_H
 #define PXR_IMAGING_HD_ST_DYNAMIC_UV_TEXTURE_OBJECT_H
diff --git a/pxr/imaging/hdSt/enums.h b/pxr/imaging/hdSt/enums.h
new file mode 100644
index 0000000000..a9e89d083c
--- /dev/null
+++ b/pxr/imaging/hdSt/enums.h
@@ -0,0 +1,40 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_IMAGING_HDST_ENUMS_H
+#define PXR_IMAGING_HDST_ENUMS_H
+
+#include "pxr/pxr.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+///
+/// \enum HdStTextureType
+///
+/// Enumerates Storm's supported texture types.
+///
+/// Uv:    Sample the uv coordinates and accesses a single 2d texture.
+///
+/// Field: Transform coordinates by matrix before accessing a single 3d
+///        texture.
+///
+/// Ptex:  Use the ptex connectivity information to sample a ptex texture.
+///
+/// Udim:  Remap the uv coordinates into udim coordinates using a maximum
+///        tile width of 10 and sample all the udim tiles found in the
+///        file system.
+///
+enum class HdStTextureType
+{
+    Uv,
+    Field,
+    Ptex,
+    Udim
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HDST_ENUMS_H
diff --git a/pxr/imaging/hdSt/extCompComputeShader.cpp b/pxr/imaging/hdSt/extCompComputeShader.cpp
index bd63476e68..3f660bf2e6 100644
--- a/pxr/imaging/hdSt/extCompComputeShader.cpp
+++ b/pxr/imaging/hdSt/extCompComputeShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/extCompComputeShader.h"
 #include "pxr/imaging/hdSt/extComputation.h"
diff --git a/pxr/imaging/hdSt/extCompComputeShader.h b/pxr/imaging/hdSt/extCompComputeShader.h
index 4a2041c8d6..fa0d666cc3 100644
--- a/pxr/imaging/hdSt/extCompComputeShader.h
+++ b/pxr/imaging/hdSt/extCompComputeShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_COMPUTE_SHADER_H
 #define PXR_IMAGING_HD_ST_EXT_COMP_COMPUTE_SHADER_H
diff --git a/pxr/imaging/hdSt/extCompComputedInputSource.cpp b/pxr/imaging/hdSt/extCompComputedInputSource.cpp
index 529aa5ee11..9774b92fbe 100644
--- a/pxr/imaging/hdSt/extCompComputedInputSource.cpp
+++ b/pxr/imaging/hdSt/extCompComputedInputSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/extCompComputedInputSource.h"
 #include "pxr/imaging/hdSt/extCompCpuComputation.h"
diff --git a/pxr/imaging/hdSt/extCompComputedInputSource.h b/pxr/imaging/hdSt/extCompComputedInputSource.h
index c0541de5a0..88702e6f68 100644
--- a/pxr/imaging/hdSt/extCompComputedInputSource.h
+++ b/pxr/imaging/hdSt/extCompComputedInputSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_COMPUTED_INPUT_SOURCE_H
diff --git a/pxr/imaging/hdSt/extCompCpuComputation.cpp b/pxr/imaging/hdSt/extCompCpuComputation.cpp
index 39cca6843a..a9e4e01afe 100644
--- a/pxr/imaging/hdSt/extCompCpuComputation.cpp
+++ b/pxr/imaging/hdSt/extCompCpuComputation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/extCompCpuComputation.h"
diff --git a/pxr/imaging/hdSt/extCompCpuComputation.h b/pxr/imaging/hdSt/extCompCpuComputation.h
index 29d22b439e..1c6944d239 100644
--- a/pxr/imaging/hdSt/extCompCpuComputation.h
+++ b/pxr/imaging/hdSt/extCompCpuComputation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_CPU_COMPUTATION_H
 #define PXR_IMAGING_HD_ST_EXT_COMP_CPU_COMPUTATION_H
diff --git a/pxr/imaging/hdSt/extCompGpuComputation.cpp b/pxr/imaging/hdSt/extCompGpuComputation.cpp
index 199aa28528..5bb4d599a1 100644
--- a/pxr/imaging/hdSt/extCompGpuComputation.cpp
+++ b/pxr/imaging/hdSt/extCompGpuComputation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/bufferArrayRange.h"
 #include "pxr/imaging/hdSt/bufferResource.h"
@@ -162,7 +145,7 @@ HdStExtCompGpuComputation::Execute(
             // Assumes non-SSBO allocator for the stride
             _uniforms.push_back(buffer->GetStride() / componentSize);
 
-            rbHash = TfHash::Combine(rbHash, buffer->GetHandle().Get());
+            rbHash = TfHash::Combine(rbHash, buffer->GetHandle().GetId());
         }
     }
 
@@ -195,10 +178,11 @@ HdStExtCompGpuComputation::Execute(
                         binding.GetType());
                 }
 
-                rbHash = TfHash::Combine(rbHash, buffer->GetHandle().Get());
+                rbHash = TfHash::Combine(rbHash, buffer->GetHandle().GetId());
             }
         }
     }
+    _uniforms.push_back(GetDispatchCount());
 
     Hgi* hgi = hdStResourceRegistry->GetHgi();
 
diff --git a/pxr/imaging/hdSt/extCompGpuComputation.h b/pxr/imaging/hdSt/extCompGpuComputation.h
index 6e17150640..38e6b8d263 100644
--- a/pxr/imaging/hdSt/extCompGpuComputation.h
+++ b/pxr/imaging/hdSt/extCompGpuComputation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_GPU_COMPUTATION_H
 #define PXR_IMAGING_HD_ST_EXT_COMP_GPU_COMPUTATION_H
diff --git a/pxr/imaging/hdSt/extCompGpuComputationResource.cpp b/pxr/imaging/hdSt/extCompGpuComputationResource.cpp
index 1a0f6a1765..f3d7b00f7c 100644
--- a/pxr/imaging/hdSt/extCompGpuComputationResource.cpp
+++ b/pxr/imaging/hdSt/extCompGpuComputationResource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/bufferArrayRange.h"
 #include "pxr/imaging/hdSt/codeGen.h"
diff --git a/pxr/imaging/hdSt/extCompGpuComputationResource.h b/pxr/imaging/hdSt/extCompGpuComputationResource.h
index 3dd00efd07..046cc5cbf3 100644
--- a/pxr/imaging/hdSt/extCompGpuComputationResource.h
+++ b/pxr/imaging/hdSt/extCompGpuComputationResource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_GPU_COMPUTATION_RESOURCE_H
 #define PXR_IMAGING_HD_ST_EXT_COMP_GPU_COMPUTATION_RESOURCE_H
diff --git a/pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.cpp b/pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.cpp
index 365b2e3b0d..355c6c73e6 100644
--- a/pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.cpp
+++ b/pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.h"
 
diff --git a/pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.h b/pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.h
index 8d2ad301c3..28e3873cb3 100644
--- a/pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.h
+++ b/pxr/imaging/hdSt/extCompGpuPrimvarBufferSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_GPU_PRIMVAR_BUFFER_SOURCE_H
 #define PXR_IMAGING_HD_ST_EXT_COMP_GPU_PRIMVAR_BUFFER_SOURCE_H
diff --git a/pxr/imaging/hdSt/extCompInputSource.cpp b/pxr/imaging/hdSt/extCompInputSource.cpp
index f24b098c0c..a55a83b1cc 100644
--- a/pxr/imaging/hdSt/extCompInputSource.cpp
+++ b/pxr/imaging/hdSt/extCompInputSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/extCompInputSource.h"
diff --git a/pxr/imaging/hdSt/extCompInputSource.h b/pxr/imaging/hdSt/extCompInputSource.h
index 94472cf471..c7552366b3 100644
--- a/pxr/imaging/hdSt/extCompInputSource.h
+++ b/pxr/imaging/hdSt/extCompInputSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_INPUT_SOURCE_H
diff --git a/pxr/imaging/hdSt/extCompPrimvarBufferSource.cpp b/pxr/imaging/hdSt/extCompPrimvarBufferSource.cpp
index 556c58b59e..c86a32b79f 100644
--- a/pxr/imaging/hdSt/extCompPrimvarBufferSource.cpp
+++ b/pxr/imaging/hdSt/extCompPrimvarBufferSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/extCompPrimvarBufferSource.h"
 #include "pxr/imaging/hdSt/extCompCpuComputation.h"
diff --git a/pxr/imaging/hdSt/extCompPrimvarBufferSource.h b/pxr/imaging/hdSt/extCompPrimvarBufferSource.h
index 0ae29385ae..7e59bcb685 100644
--- a/pxr/imaging/hdSt/extCompPrimvarBufferSource.h
+++ b/pxr/imaging/hdSt/extCompPrimvarBufferSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_PRIMVAR_BUFFER_SOURCE_H
 #define PXR_IMAGING_HD_ST_EXT_COMP_PRIMVAR_BUFFER_SOURCE_H
diff --git a/pxr/imaging/hdSt/extCompSceneInputSource.cpp b/pxr/imaging/hdSt/extCompSceneInputSource.cpp
index 246e89fa5e..2aa6616c3e 100644
--- a/pxr/imaging/hdSt/extCompSceneInputSource.cpp
+++ b/pxr/imaging/hdSt/extCompSceneInputSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/extCompSceneInputSource.h"
diff --git a/pxr/imaging/hdSt/extCompSceneInputSource.h b/pxr/imaging/hdSt/extCompSceneInputSource.h
index 687106f393..0408fc3bd4 100644
--- a/pxr/imaging/hdSt/extCompSceneInputSource.h
+++ b/pxr/imaging/hdSt/extCompSceneInputSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_EXT_COMP_SCENE_INPUT_SOURCE_H
 #define PXR_IMAGING_HD_ST_EXT_COMP_SCENE_INPUT_SOURCE_H
diff --git a/pxr/imaging/hdSt/extComputation.cpp b/pxr/imaging/hdSt/extComputation.cpp
index c39c61bfa9..bdb8be00f0 100644
--- a/pxr/imaging/hdSt/extComputation.cpp
+++ b/pxr/imaging/hdSt/extComputation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/extComputation.h"
diff --git a/pxr/imaging/hdSt/extComputation.h b/pxr/imaging/hdSt/extComputation.h
index e0e5f25e1b..9fabb39afd 100644
--- a/pxr/imaging/hdSt/extComputation.h
+++ b/pxr/imaging/hdSt/extComputation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_EXT_COMPUTATION_H
 #define PXR_IMAGING_HD_ST_EXT_COMPUTATION_H
diff --git a/pxr/imaging/hdSt/fallbackLightingShader.cpp b/pxr/imaging/hdSt/fallbackLightingShader.cpp
index d9aa5b60f8..849062ef20 100644
--- a/pxr/imaging/hdSt/fallbackLightingShader.cpp
+++ b/pxr/imaging/hdSt/fallbackLightingShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/fallbackLightingShader.h"
 #include "pxr/imaging/hdSt/binding.h"
diff --git a/pxr/imaging/hdSt/fallbackLightingShader.h b/pxr/imaging/hdSt/fallbackLightingShader.h
index a3fe40e32e..15a179d2f3 100644
--- a/pxr/imaging/hdSt/fallbackLightingShader.h
+++ b/pxr/imaging/hdSt/fallbackLightingShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_FALLBACK_LIGHTING_SHADER_H
 #define PXR_IMAGING_HD_ST_FALLBACK_LIGHTING_SHADER_H
diff --git a/pxr/imaging/hdSt/field.cpp b/pxr/imaging/hdSt/field.cpp
index b5ef124ce4..3eb16ff0ee 100644
--- a/pxr/imaging/hdSt/field.cpp
+++ b/pxr/imaging/hdSt/field.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/field.h"
 #include "pxr/imaging/hdSt/fieldSubtextureIdentifier.h"
diff --git a/pxr/imaging/hdSt/field.h b/pxr/imaging/hdSt/field.h
index 7581a5ddfb..b34ff05b89 100644
--- a/pxr/imaging/hdSt/field.h
+++ b/pxr/imaging/hdSt/field.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_FIELD_H
 #define PXR_IMAGING_HD_ST_FIELD_H
diff --git a/pxr/imaging/hdSt/fieldSubtextureIdentifier.cpp b/pxr/imaging/hdSt/fieldSubtextureIdentifier.cpp
index deeb6f872e..80ad8036f1 100644
--- a/pxr/imaging/hdSt/fieldSubtextureIdentifier.cpp
+++ b/pxr/imaging/hdSt/fieldSubtextureIdentifier.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/fieldSubtextureIdentifier.h"
diff --git a/pxr/imaging/hdSt/fieldSubtextureIdentifier.h b/pxr/imaging/hdSt/fieldSubtextureIdentifier.h
index e186e0c46c..a45b6c7253 100644
--- a/pxr/imaging/hdSt/fieldSubtextureIdentifier.h
+++ b/pxr/imaging/hdSt/fieldSubtextureIdentifier.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_FIELD_SUBTEXTURE_IDENTIFIER_H
 #define PXR_IMAGING_HD_ST_FIELD_SUBTEXTURE_IDENTIFIER_H
diff --git a/pxr/imaging/hdSt/fieldTextureCpuData.cpp b/pxr/imaging/hdSt/fieldTextureCpuData.cpp
index 93b74bf987..7d9f159547 100644
--- a/pxr/imaging/hdSt/fieldTextureCpuData.cpp
+++ b/pxr/imaging/hdSt/fieldTextureCpuData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/fieldTextureCpuData.h"
 
@@ -84,6 +67,12 @@ HdSt_FieldTextureCpuData::HdSt_FieldTextureCpuData(
     _textureDesc.format = HdStTextureUtils::GetHgiFormat(
         hioFormat,
         premultiplyAlpha);
+
+    if (_textureDesc.format == HgiFormatInvalid) {
+        TF_WARN("Unsupported texture format for field");
+        return;
+    }
+
     const HdStTextureUtils::ConversionFunction conversionFunction =
         HdStTextureUtils::GetHioToHgiConversion(
             hioFormat,
diff --git a/pxr/imaging/hdSt/fieldTextureCpuData.h b/pxr/imaging/hdSt/fieldTextureCpuData.h
index 4ff58fd9e6..62cdc34116 100644
--- a/pxr/imaging/hdSt/fieldTextureCpuData.h
+++ b/pxr/imaging/hdSt/fieldTextureCpuData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_FIELD_TEXTURE_CPU_DATA_H
 #define PXR_IMAGING_HD_ST_FIELD_TEXTURE_CPU_DATA_H
diff --git a/pxr/imaging/hdSt/flatNormals.cpp b/pxr/imaging/hdSt/flatNormals.cpp
index 6e8c9735d5..5a26418314 100644
--- a/pxr/imaging/hdSt/flatNormals.cpp
+++ b/pxr/imaging/hdSt/flatNormals.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/flatNormals.h"
 
@@ -441,10 +424,10 @@ HdSt_FlatNormalsComputationGPU::Execute(
     // Generate hash for resource bindings and pipeline.
     // XXX Needs fingerprint hash to avoid collisions
     uint64_t rbHash = (uint64_t) TfHash::Combine(
-        points->GetHandle().Get(),
-        normals->GetHandle().Get(),
-        indices->GetHandle().Get(),
-        primitiveParam->GetHandle().Get());
+        points->GetHandle().GetId(),
+        normals->GetHandle().GetId(),
+        indices->GetHandle().GetId(),
+        primitiveParam->GetHandle().GetId());
 
     uint64_t pHash = (uint64_t) TfHash::Combine(
         computeProgram->GetProgram().Get(),
diff --git a/pxr/imaging/hdSt/flatNormals.h b/pxr/imaging/hdSt/flatNormals.h
index 4e68ca821c..8bdd08975f 100644
--- a/pxr/imaging/hdSt/flatNormals.h
+++ b/pxr/imaging/hdSt/flatNormals.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_FLAT_NORMALS_H
 #define PXR_IMAGING_HD_ST_FLAT_NORMALS_H
diff --git a/pxr/imaging/hdSt/geometricShader.cpp b/pxr/imaging/hdSt/geometricShader.cpp
index e6b1a3d251..32c7809194 100644
--- a/pxr/imaging/hdSt/geometricShader.cpp
+++ b/pxr/imaging/hdSt/geometricShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/geometricShader.h"
diff --git a/pxr/imaging/hdSt/geometricShader.h b/pxr/imaging/hdSt/geometricShader.h
index bb6b6ea61b..4a69824b7b 100644
--- a/pxr/imaging/hdSt/geometricShader.h
+++ b/pxr/imaging/hdSt/geometricShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_GEOMETRIC_SHADER_H
 #define PXR_IMAGING_HD_ST_GEOMETRIC_SHADER_H
diff --git a/pxr/imaging/hdSt/glConversions.cpp b/pxr/imaging/hdSt/glConversions.cpp
index 9d6092dedd..136053f231 100644
--- a/pxr/imaging/hdSt/glConversions.cpp
+++ b/pxr/imaging/hdSt/glConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hdSt/glConversions.h b/pxr/imaging/hdSt/glConversions.h
index 5ae9a4732b..3e609deab6 100644
--- a/pxr/imaging/hdSt/glConversions.h
+++ b/pxr/imaging/hdSt/glConversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_GL_CONVERSIONS_H
 #define PXR_IMAGING_HD_ST_GL_CONVERSIONS_H
diff --git a/pxr/imaging/hdSt/glslProgram.cpp b/pxr/imaging/hdSt/glslProgram.cpp
index 771555d3de..e8220352aa 100644
--- a/pxr/imaging/hdSt/glslProgram.cpp
+++ b/pxr/imaging/hdSt/glslProgram.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hio/glslfx.h"
 #include "pxr/imaging/hd/perfLog.h"
@@ -261,10 +244,11 @@ HdStGLSLProgram::~HdStGLSLProgram()
 {
     Hgi *const hgi = _registry->GetHgi();
 
+    for (HgiShaderFunctionHandle fn : _programDesc.shaderFunctions) {
+        hgi->DestroyShaderFunction(&fn);
+    }
+
     if (_program) {
-        for (HgiShaderFunctionHandle fn : _program->GetShaderFunctions()) {
-            hgi->DestroyShaderFunction(&fn);
-        }
         hgi->DestroyShaderProgram(&_program);
     }
 }
diff --git a/pxr/imaging/hdSt/glslProgram.h b/pxr/imaging/hdSt/glslProgram.h
index af9c2d2eed..2dc53d2cc6 100644
--- a/pxr/imaging/hdSt/glslProgram.h
+++ b/pxr/imaging/hdSt/glslProgram.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_GLSL_PROGRAM_H
 #define PXR_IMAGING_HD_ST_GLSL_PROGRAM_H
diff --git a/pxr/imaging/hdSt/glslfxShader.cpp b/pxr/imaging/hdSt/glslfxShader.cpp
index 95aac8e078..56f8e545ea 100644
--- a/pxr/imaging/hdSt/glslfxShader.cpp
+++ b/pxr/imaging/hdSt/glslfxShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/glslfxShader.h"
 
diff --git a/pxr/imaging/hdSt/glslfxShader.h b/pxr/imaging/hdSt/glslfxShader.h
index 41d80dee5a..c534c821ad 100644
--- a/pxr/imaging/hdSt/glslfxShader.h
+++ b/pxr/imaging/hdSt/glslfxShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_GLSLFX_SHADER_H
 #define PXR_IMAGING_HD_ST_GLSLFX_SHADER_H
diff --git a/pxr/imaging/hdSt/hgiConversions.cpp b/pxr/imaging/hdSt/hgiConversions.cpp
index 2d50b1f41f..abd0948c79 100644
--- a/pxr/imaging/hdSt/hgiConversions.cpp
+++ b/pxr/imaging/hdSt/hgiConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/hgiConversions.h"
 #include "pxr/base/tf/iterator.h"
diff --git a/pxr/imaging/hdSt/hgiConversions.h b/pxr/imaging/hdSt/hgiConversions.h
index 290b91097c..7ec5223d71 100644
--- a/pxr/imaging/hdSt/hgiConversions.h
+++ b/pxr/imaging/hdSt/hgiConversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_HGI_CONVERSIONS_H
 #define PXR_IMAGING_HD_ST_HGI_CONVERSIONS_H
diff --git a/pxr/imaging/hdSt/hioConversions.cpp b/pxr/imaging/hdSt/hioConversions.cpp
index 8b8e261a55..f97c348cc1 100644
--- a/pxr/imaging/hdSt/hioConversions.cpp
+++ b/pxr/imaging/hdSt/hioConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/hioConversions.h"
 #include "pxr/base/tf/iterator.h"
diff --git a/pxr/imaging/hdSt/hioConversions.h b/pxr/imaging/hdSt/hioConversions.h
index f00dcefe10..01b2cd936d 100644
--- a/pxr/imaging/hdSt/hioConversions.h
+++ b/pxr/imaging/hdSt/hioConversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_HIO_CONVERSIONS_H
 #define PXR_IMAGING_HD_ST_HIO_CONVERSIONS_H
diff --git a/pxr/imaging/hdSt/imageShaderRenderPass.cpp b/pxr/imaging/hdSt/imageShaderRenderPass.cpp
index 8e06583d84..022cff08c1 100644
--- a/pxr/imaging/hdSt/imageShaderRenderPass.cpp
+++ b/pxr/imaging/hdSt/imageShaderRenderPass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/imageShaderRenderPass.h"
diff --git a/pxr/imaging/hdSt/imageShaderRenderPass.h b/pxr/imaging/hdSt/imageShaderRenderPass.h
index 4840b70dea..d0dd33b4d1 100644
--- a/pxr/imaging/hdSt/imageShaderRenderPass.h
+++ b/pxr/imaging/hdSt/imageShaderRenderPass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_IMAGE_SHADER_RENDER_PASS_H
 #define PXR_IMAGING_HD_ST_IMAGE_SHADER_RENDER_PASS_H
diff --git a/pxr/imaging/hdSt/imageShaderShaderKey.cpp b/pxr/imaging/hdSt/imageShaderShaderKey.cpp
index f332e46294..a0e34ea80d 100644
--- a/pxr/imaging/hdSt/imageShaderShaderKey.cpp
+++ b/pxr/imaging/hdSt/imageShaderShaderKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/imageShaderShaderKey.h"
 #include "pxr/base/tf/staticTokens.h"
diff --git a/pxr/imaging/hdSt/imageShaderShaderKey.h b/pxr/imaging/hdSt/imageShaderShaderKey.h
index 63366bd8db..0e5b5b24ab 100644
--- a/pxr/imaging/hdSt/imageShaderShaderKey.h
+++ b/pxr/imaging/hdSt/imageShaderShaderKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_IMAGE_SHADER_SHADER_KEY_H
 #define PXR_IMAGING_HD_ST_IMAGE_SHADER_SHADER_KEY_H
diff --git a/pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.cpp b/pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.cpp
index 7280a0117f..0cdd89dec2 100644
--- a/pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.cpp
+++ b/pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.h"
 
diff --git a/pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.h b/pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.h
index de9fc65b68..6b29ba9c90 100644
--- a/pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.h
+++ b/pxr/imaging/hdSt/implicitSurfaceSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_HD_ST_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_ST_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/hdSt/indirectDrawBatch.cpp b/pxr/imaging/hdSt/indirectDrawBatch.cpp
index cdf400222f..2b88b2f0fb 100644
--- a/pxr/imaging/hdSt/indirectDrawBatch.cpp
+++ b/pxr/imaging/hdSt/indirectDrawBatch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hdSt/indirectDrawBatch.h b/pxr/imaging/hdSt/indirectDrawBatch.h
index 13da3917b0..2b4c9dafbe 100644
--- a/pxr/imaging/hdSt/indirectDrawBatch.h
+++ b/pxr/imaging/hdSt/indirectDrawBatch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_INDIRECT_DRAW_BATCH_H
 #define PXR_IMAGING_HD_ST_INDIRECT_DRAW_BATCH_H
diff --git a/pxr/imaging/hdSt/instancer.cpp b/pxr/imaging/hdSt/instancer.cpp
index 453a096a75..43334df42e 100644
--- a/pxr/imaging/hdSt/instancer.cpp
+++ b/pxr/imaging/hdSt/instancer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/instancer.h"
 
diff --git a/pxr/imaging/hdSt/instancer.h b/pxr/imaging/hdSt/instancer.h
index dbbebb94e4..ef2a2913f8 100644
--- a/pxr/imaging/hdSt/instancer.h
+++ b/pxr/imaging/hdSt/instancer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_INSTANCER_H
 #define PXR_IMAGING_HD_ST_INSTANCER_H
diff --git a/pxr/imaging/hdSt/interleavedMemoryManager.cpp b/pxr/imaging/hdSt/interleavedMemoryManager.cpp
index 19e97048b9..1aa4664e0a 100644
--- a/pxr/imaging/hdSt/interleavedMemoryManager.cpp
+++ b/pxr/imaging/hdSt/interleavedMemoryManager.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/interleavedMemoryManager.h"
 #include "pxr/imaging/hdSt/bufferResource.h"
diff --git a/pxr/imaging/hdSt/interleavedMemoryManager.h b/pxr/imaging/hdSt/interleavedMemoryManager.h
index 6265d86c36..3b7c5fceae 100644
--- a/pxr/imaging/hdSt/interleavedMemoryManager.h
+++ b/pxr/imaging/hdSt/interleavedMemoryManager.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_INTERLEAVED_MEMORY_MANAGER_H
 #define PXR_IMAGING_HD_ST_INTERLEAVED_MEMORY_MANAGER_H
diff --git a/pxr/imaging/hdSt/light.cpp b/pxr/imaging/hdSt/light.cpp
index e828c7b0d6..4aa67c9600 100644
--- a/pxr/imaging/hdSt/light.cpp
+++ b/pxr/imaging/hdSt/light.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/light.h"
 #include "pxr/imaging/hdSt/tokens.h"
diff --git a/pxr/imaging/hdSt/light.h b/pxr/imaging/hdSt/light.h
index 210b42d90d..004a5e302d 100644
--- a/pxr/imaging/hdSt/light.h
+++ b/pxr/imaging/hdSt/light.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_LIGHT_H
 #define PXR_IMAGING_HD_ST_LIGHT_H
diff --git a/pxr/imaging/hdSt/lightingShader.cpp b/pxr/imaging/hdSt/lightingShader.cpp
index c1d932e3fc..d3ff1f5c50 100644
--- a/pxr/imaging/hdSt/lightingShader.cpp
+++ b/pxr/imaging/hdSt/lightingShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/lightingShader.h"
 
diff --git a/pxr/imaging/hdSt/lightingShader.h b/pxr/imaging/hdSt/lightingShader.h
index 8c3dd65e15..5816190282 100644
--- a/pxr/imaging/hdSt/lightingShader.h
+++ b/pxr/imaging/hdSt/lightingShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_LIGHTING_SHADER_H
 #define PXR_IMAGING_HD_ST_LIGHTING_SHADER_H
diff --git a/pxr/imaging/hdSt/material.cpp b/pxr/imaging/hdSt/material.cpp
index a83b884525..5c66f893d1 100644
--- a/pxr/imaging/hdSt/material.cpp
+++ b/pxr/imaging/hdSt/material.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/material.h"
 #include "pxr/imaging/hdSt/debugCodes.h"
@@ -95,7 +78,7 @@ _GetTextureIdentifier(
                 sceneDelegate->GetRenderIndex().GetBprim(
                     HdPrimTypeTokens->renderBuffer, desc.texturePrim))) {
 
-        if (desc.type == HdTextureType::Uv) {
+        if (desc.type == HdStTextureType::Uv) {
             return renderBuffer->GetTextureIdentifier(
                 /* multiSampled = */ false);
         }
@@ -326,7 +309,7 @@ HdStMaterial::Sync(HdSceneDelegate *sceneDelegate,
         } else if (param.IsTexture()) {
             HdSt_MaterialNetworkShader::AddFallbackValueToSpecsAndSources(
                 param, &specs, &sources);
-            if (param.textureType == HdTextureType::Ptex) {
+            if (param.textureType == HdStTextureType::Ptex) {
                 hasPtex = true;
             }
         }
diff --git a/pxr/imaging/hdSt/material.h b/pxr/imaging/hdSt/material.h
index 9ee14188d2..2bcb6ca6b1 100644
--- a/pxr/imaging/hdSt/material.h
+++ b/pxr/imaging/hdSt/material.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MATERIAL_H
 #define PXR_IMAGING_HD_ST_MATERIAL_H
diff --git a/pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.cpp b/pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.cpp
index 0c8804a91d..517a3bb14e 100644
--- a/pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.cpp
+++ b/pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #include "pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.h"
 
 #include "pxr/imaging/hdsi/materialBindingResolvingSceneIndex.h"
diff --git a/pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.h b/pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.h
index 6cafc89184..1a7d89536a 100644
--- a/pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.h
+++ b/pxr/imaging/hdSt/materialBindingResolvingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HD_ST_MATERIAL_BINDING_RESOLVING_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_ST_MATERIAL_BINDING_RESOLVING_SCENE_INDEX_PLUGIN_H
 
diff --git a/pxr/imaging/hdSt/materialNetwork.cpp b/pxr/imaging/hdSt/materialNetwork.cpp
index 3f5796ef5f..8a8ebcb62c 100644
--- a/pxr/imaging/hdSt/materialNetwork.cpp
+++ b/pxr/imaging/hdSt/materialNetwork.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/materialNetwork.h"
@@ -575,21 +558,21 @@ _ResolveParameter(
 static
 std::unique_ptr<HdStSubtextureIdentifier>
 _GetSubtextureIdentifier(
-    const HdTextureType textureType,
+    const HdStTextureType textureType,
     const TfToken &nodeType,
     const bool premultiplyAlpha,
     const TfToken &sourceColorSpace)
 {
-    if (textureType == HdTextureType::Uv) {
+    if (textureType == HdStTextureType::Uv) {
         const bool flipVertically = (nodeType == _tokens->HwUvTexture_1);
         return std::make_unique<HdStAssetUvSubtextureIdentifier>(flipVertically, 
             premultiplyAlpha, sourceColorSpace);
     } 
-    if (textureType == HdTextureType::Udim) {
+    if (textureType == HdStTextureType::Udim) {
         return std::make_unique<HdStUdimSubtextureIdentifier>(premultiplyAlpha, 
             sourceColorSpace);
     }
-    if (textureType == HdTextureType::Ptex) {
+    if (textureType == HdStTextureType::Ptex) {
         return std::make_unique<HdStPtexSubtextureIdentifier>(premultiplyAlpha);
     }
     return nullptr;
@@ -629,9 +612,9 @@ _MakeMaterialParamsForTexture(
     }
 
     // Determine the texture type
-    texParam.textureType = HdTextureType::Uv;
+    texParam.textureType = HdStTextureType::Uv;
     if (sdrNode && sdrNode->GetMetadata().count(_tokens->isPtex)) {
-        texParam.textureType = HdTextureType::Ptex;
+        texParam.textureType = HdStTextureType::Ptex;
     }
 
     // Determine if texture should be pre-multiplied on CPU
@@ -674,8 +657,21 @@ _MakeMaterialParamsForTexture(
     NdrTokenVec const& assetIdentifierPropertyNames = 
         sdrNode->GetAssetIdentifierInputNames();
 
-    if (assetIdentifierPropertyNames.size() == 1) {
-        TfToken const& fileProp = assetIdentifierPropertyNames[0];
+    if (!assetIdentifierPropertyNames.empty()) {
+        TfToken fileProp = assetIdentifierPropertyNames[0];
+
+        // Some MaterialX nodes can have multiple file inputs. Take the first
+        // one that matches the param name. If we lookup a <trilinear> texture
+        // against an output named "N42_fileY", we will find the right one.
+        if (assetIdentifierPropertyNames.size() > 1) {
+            for (auto const& propName: assetIdentifierPropertyNames) {
+                if (TfStringEndsWith(outputName.GetString(), propName)) {
+                    fileProp = propName;
+                    break;
+                }
+            }
+        }
+
         auto const& it = node.parameters.find(fileProp);
         if (it != node.parameters.end()){
             const VtValue &v = it->second;
@@ -711,7 +707,7 @@ _MakeMaterialParamsForTexture(
                 const std::string filePath = _ResolveAssetPath(v);
 
                 if (HdStIsSupportedUdimTexture(filePath)) {
-                    texParam.textureType = HdTextureType::Udim;
+                    texParam.textureType = HdStTextureType::Udim;
                 }
                 
                 useTexturePrimToFindTexture = false;
@@ -859,7 +855,7 @@ _MakeMaterialParamsForTexture(
         { paramName,
           textureId,
           texParam.textureType,
-          HdGetSamplerParameters(nodePath, node, sdrNode),
+          HdGetSamplerParameters(node, sdrNode, nodePath),
           memoryRequest,
           useTexturePrimToFindTexture,
           texturePrimPathForSceneDelegate });
@@ -1107,7 +1103,7 @@ HdStMaterialNetwork::ProcessMaterialNetwork(
 
 #ifdef PXR_MATERIALX_SUPPORT_ENABLED
         if (!isVolume) {
-            HdSt_ApplyMaterialXFilter(&surfaceNetwork, materialId,
+            _materialXGfx = HdSt_ApplyMaterialXFilter(&surfaceNetwork, materialId,
                                       *surfTerminal, surfTerminalPath,
                                       &_materialParams, resourceRegistry);
         }
diff --git a/pxr/imaging/hdSt/materialNetwork.h b/pxr/imaging/hdSt/materialNetwork.h
index 1e6fd628d1..85d6ddc804 100644
--- a/pxr/imaging/hdSt/materialNetwork.h
+++ b/pxr/imaging/hdSt/materialNetwork.h
@@ -1,36 +1,23 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MATERIAL_NETWORK_H
 #define PXR_IMAGING_HD_ST_MATERIAL_NETWORK_H
 
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/api.h"
-#include "pxr/imaging/hd/enums.h"
+#include "pxr/imaging/hdSt/enums.h"
 #include "pxr/imaging/hd/material.h"
 #include "pxr/imaging/hdSt/textureIdentifier.h"
 #include "pxr/base/vt/dictionary.h"
 
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
+#include <MaterialXGenShader/Shader.h>
+#endif
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class HdStResourceRegistry;
@@ -88,7 +75,7 @@ class HdStMaterialNetwork final
         // node is connected to.
         TfToken name;
         HdStTextureIdentifier textureId;
-        HdTextureType type;
+        HdStTextureType type;
         HdSamplerParameters samplerParameters;
         // Memory request in bytes.
         size_t memoryRequest;
@@ -119,6 +106,9 @@ class HdStMaterialNetwork final
     TextureDescriptorVector _textureDescriptors;
     HioGlslfxSharedPtr _surfaceGfx;
     size_t _surfaceGfxHash;
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
+    MaterialX::ShaderPtr _materialXGfx;
+#endif
 };
 
 
diff --git a/pxr/imaging/hdSt/materialNetworkShader.cpp b/pxr/imaging/hdSt/materialNetworkShader.cpp
index f9824a9a0d..e1ccd5a864 100644
--- a/pxr/imaging/hdSt/materialNetworkShader.cpp
+++ b/pxr/imaging/hdSt/materialNetworkShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/materialNetworkShader.h"
 #include "pxr/imaging/hdSt/binding.h"
diff --git a/pxr/imaging/hdSt/materialNetworkShader.h b/pxr/imaging/hdSt/materialNetworkShader.h
index 9ae028d357..d6eb5ceed8 100644
--- a/pxr/imaging/hdSt/materialNetworkShader.h
+++ b/pxr/imaging/hdSt/materialNetworkShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MATERIAL_NETWORK_SHADER_H
 #define PXR_IMAGING_HD_ST_MATERIAL_NETWORK_SHADER_H
diff --git a/pxr/imaging/hdSt/materialParam.cpp b/pxr/imaging/hdSt/materialParam.cpp
index 63d14308a4..a63a671fd8 100644
--- a/pxr/imaging/hdSt/materialParam.cpp
+++ b/pxr/imaging/hdSt/materialParam.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/materialParam.h"
 
@@ -34,7 +17,7 @@ HdSt_MaterialParam::HdSt_MaterialParam()
     , name()
     , fallbackValue()
     , samplerCoords()
-    , textureType(HdTextureType::Uv)
+    , textureType(HdStTextureType::Uv)
     , swizzle()
     , isPremultiplied(false)
     , arrayOfTexturesSize(0)
@@ -45,7 +28,7 @@ HdSt_MaterialParam::HdSt_MaterialParam(ParamType paramType,
                                  TfToken const& name, 
                                  VtValue const& fallbackValue,
                                  TfTokenVector const& samplerCoords,
-                                 HdTextureType textureType,
+                                 HdStTextureType textureType,
                                  std::string const& swizzle,
                                  bool const isPremultiplied,
                                  size_t const arrayOfTexturesSize)
diff --git a/pxr/imaging/hdSt/materialParam.h b/pxr/imaging/hdSt/materialParam.h
index a20b33aea3..ca66f25a09 100644
--- a/pxr/imaging/hdSt/materialParam.h
+++ b/pxr/imaging/hdSt/materialParam.h
@@ -1,33 +1,15 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MATERIAL_PARAM_H
 #define PXR_IMAGING_HD_ST_MATERIAL_PARAM_H
 
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/api.h"
-
-#include "pxr/imaging/hd/enums.h"
+#include "pxr/imaging/hdSt/enums.h"
 #include "pxr/imaging/hd/types.h"
 #include "pxr/usd/sdf/path.h"
 #include "pxr/base/vt/value.h"
@@ -78,7 +60,7 @@ class HdSt_MaterialParam final {
                     TfToken const& name, 
                     VtValue const& fallbackValue,
                     TfTokenVector const& samplerCoords=TfTokenVector(),
-                    HdTextureType textureType=HdTextureType::Uv,
+                    HdStTextureType textureType=HdStTextureType::Uv,
                     std::string const& swizzle=std::string(),
                     bool const isPremultiplied=false,
                     size_t const arrayOfTexturesSize=0);
@@ -120,7 +102,7 @@ class HdSt_MaterialParam final {
     TfToken name;
     VtValue fallbackValue;
     TfTokenVector samplerCoords;
-    HdTextureType textureType;
+    HdStTextureType textureType;
     std::string swizzle;
     bool isPremultiplied;
 
diff --git a/pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.cpp b/pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.cpp
index db1f1d7453..eadea7cd6c 100644
--- a/pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.cpp
+++ b/pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.h"
 
diff --git a/pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.h b/pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.h
index bc42b4c1a4..64063ee762 100644
--- a/pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.h
+++ b/pxr/imaging/hdSt/materialPrimvarTransferSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_ST_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/hdSt/materialXFilter.cpp b/pxr/imaging/hdSt/materialXFilter.cpp
index f645bd3e85..8897c5e723 100644
--- a/pxr/imaging/hdSt/materialXFilter.cpp
+++ b/pxr/imaging/hdSt/materialXFilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/materialParam.h"
 #include "pxr/imaging/hdSt/materialXFilter.h"
@@ -29,6 +12,7 @@
 #include "pxr/imaging/hdMtlx/hdMtlx.h"
 #include "pxr/imaging/hgi/tokens.h"
 
+#include "pxr/usd/sdf/schema.h"
 #include "pxr/usd/sdr/registry.h"
 #include "pxr/imaging/hio/glslfx.h"
 #include "pxr/imaging/hgi/capabilities.h"
@@ -59,11 +43,28 @@ TF_DEFINE_PRIVATE_TOKENS(
     (geomprop)
     (index)
     ((defaultInput, "default"))
+    (filename)
 
-    // Opacity Parameters
+    // Opacity Parameters - USD Preview Surface
+    (UsdPreviewSurface)
     (opacity)
     (opacityThreshold)
+    // Opacity Parameters - Standard Surface
+    (standard_surface)
     (transmission)
+    // Opacity Parameters - Open PBR
+    (open_pbr_surface)
+    (transmission_weight)
+    (geometry_opacity)
+    // Opacity Parameters - GlTF 
+    (gltf_pbr)
+    (alpha_mode)
+    (alpha_cutoff)
+    (alpha)
+    // Opacity Parameters - Other Surface shaders
+    (convert)
+    (ND_convert_color4_surfaceshader)
+    (ND_convert_vector4_surfaceshader)
 
     // Fallback Dome Light Tokens
     (domeLightFallback)
@@ -71,10 +72,53 @@ TF_DEFINE_PRIVATE_TOKENS(
     (file)
 
     // Colorspace Tokens
-    (colorSpace)
     (sourceColorSpace)
+
+    // Anonymization constants
+    (NG_Anonymized)
+
+    // Primvar detection constants
+    (geompropvalue)
 );
 
+TF_DEFINE_PRIVATE_TOKENS(
+    _topologicalTokens,
+    // This represents living knowledge of the internals of the MaterialX 
+    // shader generator for both GLSL and Metal. Such knowledge should reside
+    // inside the generator class provided by MaterialX.
+
+    // Dot filename is always topological due to code that prevents creating 
+    // extra OpenGL samplers this is the only shader node id required. All 
+    // other tests are done on the shader family.
+    (ND_dot_filename)
+    // Topo affecting nodes due to object/model/world space parameter
+    (position)
+    (normal)
+    (tangent)
+    (bitangent)
+    // Topo affecting nodes due to channel index.
+    (texcoord)
+    (geomcolor)
+    // Geompropvalue primvar name is topo-affecting.
+    (geompropvalue)
+    // Swizzles are inlined into the codegen and affect topology.
+    (swizzle)
+    // Some conversion nodes are implemented by codegen.
+    (convert)
+    // Constants: they get inlined in the source.
+    (constant)
+);
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _mxTextureParamTokens,    // mxTextureTokens <-> HdStTextureTokens
+    (filtertype)
+    (uaddressmode)
+    (vaddressmode)
+);
+
+// To store the mapping between the node paths in the HdMaterialNetwork to  
+// the corresponding anonymized node paths - <hdNodePath, annonNodePath> 
+using HdAnnonNodePathMap = std::unordered_map<SdfPath, SdfPath, SdfPath::Hash>;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shader Gen Functions
@@ -82,10 +126,11 @@ TF_DEFINE_PRIVATE_TOKENS(
 // Generate the Glsl Pixel Shader based on the given mxContext and mxElement
 // Based on MaterialXViewer Material::generateShader()
 static mx::ShaderPtr
-_GenMaterialXShader(mx::GenContext & mxContext, mx::ElementPtr const& mxElem)
+_GenMaterialXShader(
+    mx::GenContext & mxContext,
+    mx::ElementPtr const& mxElem)
 {
-    bool hasTransparency = mx::isTransparentSurface(mxElem,
-                               mxContext.getShaderGenerator().getTarget());
+    bool hasTransparency = mxContext.getOptions().hwTransparency;
 
     mx::GenContext materialContext = mxContext;
     materialContext.getOptions().hwTransparency = hasTransparency;
@@ -124,6 +169,9 @@ _CreateHdStMaterialXContext(
     if (apiName == HgiTokens->Metal) {
         return HdStMaterialXShaderGenMsl::create(mxHdInfo);
     }
+    if (apiName == HgiTokens->Vulkan) {
+        return HdStMaterialXShaderGenVkGlsl::create(mxHdInfo);
+    }
     if (apiName == HgiTokens->OpenGL) {
         return HdStMaterialXShaderGenGlsl::create(mxHdInfo);
     }
@@ -145,9 +193,13 @@ HdSt_GenMaterialXShader(
     HdSt_MxShaderGenInfo const& mxHdInfo,
     TfToken const& apiName)
 {
+    TRACE_FUNCTION_SCOPE("Create GlslShader from MtlxDocument")
     // Initialize the Context for shaderGen. 
     mx::GenContext mxContext = _CreateHdStMaterialXContext(mxHdInfo, apiName);
 
+    mxContext.getOptions().hwTransparency
+        = mxHdInfo.materialTag != HdStMaterialTagTokens->defaultMaterialTag;
+
     // Starting from MaterialX 1.38.4 at PR 877, we must remove the "libraries" part:
     mx::FileSearchPath libSearchPaths;
     for (const mx::FilePath &path : searchPaths) {
@@ -199,7 +251,8 @@ HdSt_GenMaterialXShader(
     mx::NodePtr node = renderableElem->asA<mx::Node>();
     if (node && node->getType() == mx::MATERIAL_TYPE_STRING) {
         // Use auto so can compile against MaterialX 1.38.0 or 1.38.1
-        auto mxShaderNodes = mx::getShaderNodes(node, mx::SURFACE_SHADER_TYPE_STRING);
+        auto mxShaderNodes = 
+            mx::getShaderNodes(node, mx::SURFACE_SHADER_TYPE_STRING);
         if (!mxShaderNodes.empty()) {
             renderableElem = *mxShaderNodes.begin();
         }
@@ -248,17 +301,18 @@ _GetHdSamplerValue(std::string const& mxInputValue)
     return VtValue(HdStTextureTokens->repeat);
 }
 
-// Translate the MaterialX texture node input into the Hydra equivalents
+// Translate the MaterialX texture node input into the Hydra equivalents and
+// store in the given hdTextureParams map
 static void
-_GetHdTextureParameters(
+_GetMxInputAsHdTextureParam(
     std::string const& mxInputName,
     std::string const& mxInputValue,
     std::map<TfToken, VtValue>* hdTextureParams)
 {
-    // MaterialX has two texture2d node types <image> and <tiledimage>
+    // MaterialX stdlib has two texture2d node types <image> and <tiledimage>
 
     // Properties common to both <image> and <tiledimage> texture nodes:
-    if (mxInputName == "filtertype") {
+    if (mxInputName == _mxTextureParamTokens->filtertype) {
         (*hdTextureParams)[HdStTextureTokens->minFilter] = 
             _GetHdFilterValue(mxInputValue);
         (*hdTextureParams)[HdStTextureTokens->magFilter] = 
@@ -266,133 +320,84 @@ _GetHdTextureParameters(
     }
 
     // Properties specific to <image> nodes:
-    else if (mxInputName == "uaddressmode") {
+    else if (mxInputName == _mxTextureParamTokens->uaddressmode) {
         (*hdTextureParams)[HdStTextureTokens->wrapS] = 
             _GetHdSamplerValue(mxInputValue);
     }
-    else if (mxInputName == "vaddressmode") {
+    else if (mxInputName == _mxTextureParamTokens->vaddressmode) {
         (*hdTextureParams)[HdStTextureTokens->wrapT] = 
             _GetHdSamplerValue(mxInputValue);
     }
 }
 
 static void
-_AddDefaultMtlxTextureValues(std::map<TfToken, VtValue>* hdTextureParams)
-{
-    // MaterialX uses repeat/periodic for the default wrap values, without
-    // this the texture will use the Hydra default useMetadata. 
-    // Note that these will get overwritten by any authored values
-    (*hdTextureParams)[HdStTextureTokens->wrapS] = 
-        VtValue(HdStTextureTokens->repeat);
-    (*hdTextureParams)[HdStTextureTokens->wrapT] = 
-        VtValue(HdStTextureTokens->repeat);
-
-    // Set the default colorSpace to be 'raw'. This allows MaterialX to handle
-    // colorspace transforms.
-    (*hdTextureParams) [_tokens->sourceColorSpace] = VtValue(HdStTokens->raw);
-}
-
-// Find the HdNode and its corresponding NodePath in the given HdNetwork 
-// based on the given HdConnection
-static bool 
-_FindConnectedNode(
-    HdMaterialNetwork2 const& hdNetwork,
-    HdMaterialConnection2 const& hdConnection,
-    HdMaterialNode2* hdNode,
-    SdfPath* hdNodePath)
-{
-    // Get the path to the connected node
-    const SdfPath & connectionPath = hdConnection.upstreamNode;
+_AddDefaultMtlxTextureValues(
+    mx::NodeDefPtr const& nodeDef,
+    std::map<TfToken, VtValue>* hdTextureParams)
+{    
+    // Add the stdlib texture node default values 
+    {
+        // MaterialX uses repeat/periodic for the default wrap values, without
+        // this the texture will use the Hydra default useMetadata. 
+        // Note that these will get overwritten by any authored values
+        (*hdTextureParams)[HdStTextureTokens->wrapS] = 
+            VtValue(HdStTextureTokens->repeat);
+        (*hdTextureParams)[HdStTextureTokens->wrapT] = 
+            VtValue(HdStTextureTokens->repeat);
 
-    // If this path is not in the network raise a warning
-    auto hdNodeIt = hdNetwork.nodes.find(connectionPath);
-    if (hdNodeIt == hdNetwork.nodes.end()) {
-        TF_WARN("Unknown material node '%s'", connectionPath.GetText());
-        return false;
+        // Set the default colorSpace to be 'raw'. This allows MaterialX to 
+        // handle colorspace transforms.
+        (*hdTextureParams) [_tokens->sourceColorSpace] =
+            VtValue(HdStTokens->raw);
     }
 
-    // Otherwise return the HdNode and corresponding NodePath
-    *hdNode = hdNodeIt->second;
-    *hdNodePath = connectionPath;
-    return true;
-}
-
-// Return the specified or default Texture coordinate name as a TfToken, 
-// and initialize the primvar type or default name for MaterialX ShaderGen.
-static TfToken
-_GetTextureCoordinateName(
-    mx::DocumentPtr const& mxDoc,
-    HdMaterialNetwork2* hdNetwork,
-    HdMaterialNode2 const& hdTextureNode,
-    SdfPath const& hdTextureNodePath,
-    mx::StringMap* mxHdPrimvarMap,
-    std::string* defaultTexcoordName)
-{
-    // Get the Texture Coordinate name through the connected node
-    bool textureCoordSet = false;
-    std::string textureCoordName;
-    for (auto const& inputConnections : hdTextureNode.inputConnections) {
-        // Texture Coordinates are connected through the 'texcoord' input
-        if ( inputConnections.first != _tokens->texcoord) {
-            continue;
+    // Add custom texture node default values
+    {
+        // All custom Texture nodes boil down to an <image> node. Go into the 
+        // implementation nodegraph to get the default texture values in 
+        // case they differ from the above stdlib defaults
+
+        // XXX Unsure about triplanar that has 3 image nodes. Does Storm
+        // require per-image texture params? How does one specify that using a 
+        // single token?
+
+        // XXX We should recursively search for the <image> node in case it is 
+        // nested more than one level deep via custom NodeDefs. For now, we 
+        // only dig one level down since this is sufficient for the default 
+        // set of MaterialX texture nodes.
+
+        // Get the underlying image node from the implementation nodegraph
+        const mx::InterfaceElementPtr& impl = nodeDef->getImplementation();
+        if (!(impl && impl->isA<mx::NodeGraph>())) {
+            return;
+        }
+        const auto imageNodes = 
+            impl->asA<mx::NodeGraph>()->getNodes(mx::ShaderNode::IMAGE);
+        if (imageNodes.empty()) {
+            return;
         }
 
-        for (auto const& currConnection : inputConnections.second) {
-            // Get the connected Texture Coordinate node
-            SdfPath hdCoordNodePath;
-            HdMaterialNode2 hdCoordNode;
-            const bool found = _FindConnectedNode(*hdNetwork, currConnection,
-                                            &hdCoordNode, &hdCoordNodePath);
-            if (!found) {
+        // Get the default values for the underlying image node 
+        for (TfToken const& inputName: _mxTextureParamTokens->allTokens) {
+            mx::InputPtr mxInput = imageNodes.front()->getInput(inputName);
+            if (!mxInput) {
                 continue;
             }
-            
-            // Get the texture coordinate name from the 'geomprop' parameter
-            auto coordNameIt = hdCoordNode.parameters.find(_tokens->geomprop);
-            if (coordNameIt != hdCoordNode.parameters.end()) {
-
-                textureCoordName = HdMtlxConvertToString(coordNameIt->second);
-
-                // Save texture coordinate primvar name for the glslfx header;
-                // figure out the mx typename
-                const mx::NodeDefPtr mxNodeDef = mxDoc->getNodeDef(
-                        hdCoordNode.nodeTypeId.GetString());
-                if (mxNodeDef) {
-                    (*mxHdPrimvarMap)[textureCoordName] = mxNodeDef->getType();
-                    textureCoordSet = true;
-                    break;
-                }
+            if (mxInput->hasInterfaceName()) {
+                mxInput = nodeDef->getActiveInput(mxInput->getInterfaceName());
+            }
+            if (mxInput->hasValueString()) {
+                _GetMxInputAsHdTextureParam(
+                    inputName, mxInput->getValueString(), hdTextureParams);
             }
         }
     }
-    
-    // If we did not have a connected node, and the 'st' parameter is not set
-    // get the default texture cordinate name from the textureNodes sdr metadata 
-    if ( !textureCoordSet && hdTextureNode.parameters.find(_tokens->st) == 
-                             hdTextureNode.parameters.end()) {
-        // Get the sdr node for the mxTexture node
-        SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
-        const SdrShaderNodeConstPtr sdrTextureNode = 
-            sdrRegistry.GetShaderNodeByIdentifierAndType(
-                hdTextureNode.nodeTypeId, _tokens->mtlx);
-
-        if (sdrTextureNode) {
-            // Get the texture coordinate name from the sdrTextureNode metadata
-            auto metadata = sdrTextureNode->GetMetadata();
-            textureCoordName = metadata[SdrNodeMetadata->Primvars];
-
-            // Save the default texture coordinate name for the glslfx header
-            *defaultTexcoordName = textureCoordName;
-        }
-    }
-    return TfToken(textureCoordName);
 }
 
 static void
 _AddFallbackDomeLightTextureNode(
     HdMaterialNetwork2* hdNetwork,
-    SdfPath const& hdTerminalNodePath,
-    mx::StringMap* mxHdTextureMap=nullptr)
+    SdfPath const& hdTerminalNodePath)
 {
     // Create and add a Fallback Dome Light Texture Node to the hdNetwork
     HdMaterialNode2 hdDomeTextureNode;
@@ -411,236 +416,60 @@ _AddFallbackDomeLightTextureNode(
     domeTextureConn.upstreamOutputName = domeTexturePath.GetNameToken();
     hdNetwork->nodes[hdTerminalNodePath].
         inputConnections[domeTextureConn.upstreamOutputName] = {domeTextureConn};
-
-    // Add the Dome Texture name to the TextureMap for MaterialXShaderGen
-    if (mxHdTextureMap) {
-        (*mxHdTextureMap)[domeTexturePath.GetName()] = domeTexturePath.GetName();
-    }
-}
-
-static TfToken
-_GetHdNodeTypeId(mx::NodePtr const& mxNode)
-{
-    std::string nodeDefName = mxNode->getNodeDefString();
-    if (nodeDefName.empty()) {
-        if (mx::NodeDefPtr const& imageNodeDef = mxNode->getNodeDef()) {
-            nodeDefName = imageNodeDef->getName();
-        }
-    }
-    return TfToken(nodeDefName);
 }
 
-// If the imageNode is connected to the given filenameInput, return 
-// the hdNodeTypeId and any texture parameters on the node
-static bool
-_GatherTextureNodeInformation(
-    mx::NodePtr const& imageNode,
-    std::string const& filenameInputName,
-    TfToken* textureNodeTypeId,
-    std::map<TfToken, VtValue>* hdParameters)
-{
-    const mx::InputPtr fileInput = imageNode->getActiveInput("file");
-    if (!fileInput || fileInput->getInterfaceName() != filenameInputName) {
-        return false;
-    }
-    *textureNodeTypeId = _GetHdNodeTypeId(imageNode);
-    for (mx::InputPtr const& input : imageNode->getActiveInputs()) {
-        _GetHdTextureParameters(
-            input->getName(), input->getValueString(), hdParameters);
-    }
-    return true;
-}
-
-// Replace the filenameInput parameter with a connection to a new texture node
-static void
-_ReplaceFilenameInput(
-    mx::DocumentPtr const& mxDoc,
-    HdMaterialNetwork2* hdNetwork,
+// Store texture node connections, default dome light texture path and any
+// filename inputs from the terminal nodeto the mxHdTextureMap
+static void 
+_UpdateMxHdTextureMap(
+    std::set<SdfPath> const& hdTextureNodes,
+    HdMtlxTexturePrimvarData::TextureMap const& hdMtlxTextureInfo,
     HdMaterialNode2 const& hdTerminalNode,
     SdfPath const& hdTerminalNodePath,
-    mx::NodeDefPtr const& mxNodeDef,
-    std::string const& filenameInputName,
-    mx::StringMap* mxHdTextureMap,
-    mx::StringMap* mxHdPrimvarMap,
-    std::string* defaultTexcoordName)
+    mx::StringMap* mxHdTextureMap)
 {
-    // Get the Stdlib Image node from the Implementation Nodegraph and gather 
-    // nodeTypeId and parameter information. 
-    TfToken terminalTextureTypeId;
-    std::map<TfToken, VtValue> terminalTextureParams;
-    _AddDefaultMtlxTextureValues(&terminalTextureParams);
-    const mx::InterfaceElementPtr impl = mxNodeDef->getImplementation();
-    if (impl && impl->isA<mx::NodeGraph>()) {
-        const mx::NodeGraphPtr ng = impl->asA<mx::NodeGraph>();
-
-        // Check the custom Material for <image> nodes
-        for (mx::NodePtr const& imageNode : ng->getNodes("image")) {
-            const bool foundConnectedImageNode =
-                _GatherTextureNodeInformation(imageNode, filenameInputName, 
-                    &terminalTextureTypeId, &terminalTextureParams);
-            if (foundConnectedImageNode) {
-                break;
-            }
-        }
-        // Check the custom Material for <tiledimage> nodes
-        for (mx::NodePtr const& imageNode : ng->getNodes("tiledimage")) {
-            const bool foundConnectedImageNode = 
-                _GatherTextureNodeInformation(imageNode, filenameInputName, 
-                    &terminalTextureTypeId, &terminalTextureParams);
-            if (foundConnectedImageNode) {
-                break;
+    // Store the added connection to the terminal node for MaterialXShaderGen
+    for (SdfPath const& texturePath : hdTextureNodes) {
+        auto mtlxTextureInfo = hdMtlxTextureInfo.find(texturePath.GetName());
+        if (mtlxTextureInfo != hdMtlxTextureInfo.end()) {
+            for (std::string const& fileInputName: mtlxTextureInfo->second) {
+                // Note these connections were made in _UpdateTextureNode()
+                const std::string newConnName =
+                    texturePath.GetName() + "_" + fileInputName;
+                mxHdTextureMap->emplace(newConnName, newConnName);
             }
         }
     }
-    if (terminalTextureTypeId.IsEmpty()) {
-        return;
-    }
-
-    // Gather the Hydra Texture Parameters on the terminal node.
-    for (auto const& param : hdTerminalNode.parameters) {
-        // Get the Hydra equivalents for the Mx Texture node parameters
-        std::string const& mxInputName = param.first.GetString();
-        std::string const mxInputValue = HdMtlxConvertToString(param.second);
-        _GetHdTextureParameters(
-            mxInputName, mxInputValue, &terminalTextureParams);
-    }
-
-    // Get the filename parameter value from the terminal node
-    const TfToken filenameToken(filenameInputName);
-    auto filenameParamIt = hdTerminalNode.parameters.find(filenameToken);
-    if (filenameParamIt == hdTerminalNode.parameters.end()) {
-        return;
-    }
-
-    // Create a new Texture Node
-    HdMaterialNode2 terminalTextureNode;
-    terminalTextureNode.nodeTypeId = terminalTextureTypeId;
-    terminalTextureNode.parameters[_tokens->file] = filenameParamIt->second;
-    terminalTextureNode.parameters[_tokens->st] = _GetTextureCoordinateName(
-        mxDoc, hdNetwork, hdTerminalNode, hdTerminalNodePath, 
-        mxHdPrimvarMap, defaultTexcoordName);
-    for (auto const& param : terminalTextureParams) {
-        terminalTextureNode.parameters[param.first] = param.second;
-    }
-
-    // Add the Texture Node to the hdNetwork 
-    const SdfPath terminalTexturePath = 
-        hdTerminalNodePath.AppendChild(filenameToken);
-    hdNetwork->nodes.insert({terminalTexturePath, terminalTextureNode});
-
-    // Make a new connection to the terminal node
-    HdMaterialConnection2 terminalTextureConn;
-    terminalTextureConn.upstreamNode = terminalTexturePath;
-    terminalTextureConn.upstreamOutputName = terminalTexturePath.GetNameToken();
 
-    // Replace the filename parameter with the TerminalTextureConnection
-    hdNetwork->nodes[hdTerminalNodePath].parameters.erase(filenameParamIt);
-    hdNetwork->nodes[hdTerminalNodePath].
-        inputConnections[terminalTextureConn.upstreamOutputName] =
-            {terminalTextureConn};
-
-    // Insert the new texture into the mxHdTextureMap for MxShaderGen
-    if (mxHdTextureMap) {
-        (*mxHdTextureMap)[filenameInputName] = filenameInputName;
-    }
-}
+    // Add the Dome Texture name to the TextureMap for MaterialXShaderGen
+    const SdfPath domeTexturePath =
+        hdTerminalNodePath.ReplaceName(_tokens->domeLightFallback);
+    (*mxHdTextureMap)[domeTexturePath.GetName()] = domeTexturePath.GetName();
 
-// Add the Hydra texture node parameters to the texture nodes and connect the 
-// texture nodes to the terminal node
-static void 
-_UpdateTextureNodes(
-    mx::DocumentPtr const &mxDoc,
-    HdMaterialNetwork2* hdNetwork,
-    HdMaterialNode2 const& hdTerminalNode,
-    SdfPath const& hdTerminalNodePath,
-    std::set<SdfPath> const& hdTextureNodes,
-    mx::StringMap const& hdMtlxTextureInfo,
-    mx::StringMap* mxHdTextureMap,
-    mx::StringMap* mxHdPrimvarMap,
-    std::string* defaultTexcoordName)
-{
-    // Storm does not expect textures to be direct inputs on materials, replace 
-    // each 'filename' input on the material with a connection to an image node
-    const mx::NodeDefPtr mxMaterialNodeDef = 
-        mxDoc->getNodeDef(hdTerminalNode.nodeTypeId.GetString());
+    // Check the terminal node for any filename inputs requiring special
+    // handling due to node remapping:
+    const mx::NodeDefPtr mxMaterialNodeDef =
+        HdMtlxStdLibraries()->getNodeDef(hdTerminalNode.nodeTypeId.GetString());
     if (mxMaterialNodeDef) {
         for (auto const& mxInput : mxMaterialNodeDef->getActiveInputs()) {
-            if (mxInput->getType() == "filename") {
-                _ReplaceFilenameInput(
-                    mxDoc, hdNetwork, hdTerminalNode, hdTerminalNodePath, 
-                    mxMaterialNodeDef, mxInput->getName(), 
-                    mxHdTextureMap, mxHdPrimvarMap, defaultTexcoordName);
+            if (mxInput->getType() == _tokens->filename) {
+                (*mxHdTextureMap)[mxInput->getName()] = mxInput->getName();
             }
         }
     }
-
-    for (SdfPath const& texturePath : hdTextureNodes) {
-        HdMaterialNode2 hdTextureNode = hdNetwork->nodes[texturePath];
-
-        // Set the texture coordinate name as the 'st' parameter.
-        hdNetwork->nodes[texturePath].parameters[_tokens->st] =
-            _GetTextureCoordinateName(
-                mxDoc, hdNetwork, hdTextureNode, texturePath, 
-                mxHdPrimvarMap, defaultTexcoordName);
-
-        // Gather the Hydra Texture Parameters
-        std::map<TfToken, VtValue> hdParameters;
-        _AddDefaultMtlxTextureValues(&hdParameters);
-        for (auto const& param : hdTextureNode.parameters) {
-            // Get the Hydra equivalents for the Mx Texture node parameters
-            std::string const& mxInputName = param.first.GetString();
-            std::string const mxInputValue = HdMtlxConvertToString(param.second);
-            _GetHdTextureParameters(mxInputName, mxInputValue, &hdParameters);
-        }
-
-        // Add the Hydra Texture Parameters to the Texture Node
-        for (auto const& param : hdParameters) {
-            hdNetwork->nodes[texturePath].parameters[param.first] = param.second;
-        }
-
-        // Connect the texture node to the terminal node for HdStMaterialNetwork
-        // Create a unique name for the new connection, and store in the 
-        // mxHdTextureMap so Hydra's codegen and HdStMaterialXShaderGen 
-        // match up correctly.
-        std::string newConnName = texturePath.GetName() + "_" + 
-            hdMtlxTextureInfo.find(texturePath.GetName())->second;
-
-        // Replace the texturePath.GetName() in the textureMap to the variable
-        // name used in the shader: textureName_fileInputName 
-        std::string fileInputName = "file";
-        const mx::NodeDefPtr mxNodeDef =
-            mxDoc->getNodeDef(hdTextureNode.nodeTypeId.GetString());
-        if (mxNodeDef) {
-            for (auto const& mxInput : mxNodeDef->getActiveInputs()) {
-                if (mxInput->getType() == "filename") {
-                    fileInputName = mxInput->getName();
-                }
-            }
-        }
-        mxHdTextureMap->insert(std::pair<std::string, std::string>(
-                texturePath.GetName() + "_" + fileInputName, newConnName));
-
-        // Make and add a new connection to the terminal node
-        HdMaterialConnection2 textureConn;
-        textureConn.upstreamNode = texturePath;
-        textureConn.upstreamOutputName = TfToken(newConnName);
-        hdNetwork->nodes[hdTerminalNodePath].
-            inputConnections[textureConn.upstreamOutputName] = {textureConn};
-    }
 }
 
 // Connect the primvar nodes to the terminal node
 static void 
 _UpdatePrimvarNodes(
     mx::DocumentPtr const& mxDoc,
-    HdMaterialNetwork2* hdNetwork,
-    SdfPath const& hdTerminalNodePath,
+    HdMaterialNetwork2 const& hdNetwork,
     std::set<SdfPath> const& hdPrimvarNodes,
     mx::StringMap* mxHdPrimvarMap,
     mx::StringMap* mxHdPrimvarDefaultValueMap)
 {
     for (auto const& primvarPath : hdPrimvarNodes) {
-        HdMaterialNode2 hdPrimvarNode = hdNetwork->nodes[primvarPath];
+        const HdMaterialNode2& hdPrimvarNode = hdNetwork.nodes.at(primvarPath);
 
         // Save primvar name for the glslfx header
         auto primvarNameIt = hdPrimvarNode.parameters.find(_tokens->geomprop);
@@ -689,222 +518,700 @@ _UpdatePrimvarNodes(
                 (*mxHdPrimvarMap)[texCoordName] = mxNodeDef->getType();
             }
         }
+    }
+}
 
-        // Connect the primvar node to the terminal node for HdStMaterialNetwork
-        // Create a unique name for the new connection.
-        std::string newConnName = primvarPath.GetName() + "_primvarconn";
-        HdMaterialConnection2 primvarConn;
-        primvarConn.upstreamNode = primvarPath;
-        primvarConn.upstreamOutputName = TfToken(newConnName);
-        hdNetwork->nodes[hdTerminalNodePath]
-            .inputConnections[primvarConn.upstreamOutputName] = {primvarConn};
+////////////////////////////////////////////////////////////////////////////////
+// Helper functions to get the Material Tag 
+
+template <typename T>
+static bool
+_ParamDiffersFrom(
+    HdMaterialNode2 const& terminal,
+    TfToken const& paramName,
+    T const& paramValue)
+{
+    // A connected value is always considered to differ
+    if (terminal.inputConnections.find(paramName) != 
+        terminal.inputConnections.end()) {
+        return true;
+    }
+    // Check the value itself
+    const auto paramIt = terminal.parameters.find(paramName);
+    if (paramIt != terminal.parameters.end() && paramIt->second != paramValue) {
+        return true;
     }
+    // Assume a default value is equal to the paramValue.
+    return false;
 }
 
 static std::string const&
-_GetMaterialTag(HdMaterialNode2 const& terminal)
+_GetUsdPreviewSurfaceMaterialTag(HdMaterialNode2 const& terminal)
 {
-    // Masked MaterialTag:
-    // UsdPreviewSurface: terminal.opacityThreshold value > 0
-    // StandardSurface materials do not have an opacityThreshold parameter
-    // so we StandardSurface will not use the Masked materialTag.
-    for (auto const& currParam : terminal.parameters) {
-        if (currParam.first != _tokens->opacityThreshold) continue;
-
-        if (currParam.second.Get<float>() > 0.0f) {
-            return HdStMaterialTagTokens->masked.GetString();
-        }
+    // See https://openusd.org/release/spec_usdpreviewsurface.html
+    // and implementation in MaterialX libraries/bxdf/usd_preview_surface.mtlx
+
+    // Non-zero opacityThreshold (or connected) triggers masked mode:
+    if (_ParamDiffersFrom(terminal, _tokens->opacityThreshold, 0.0f)) {
+        return HdStMaterialTagTokens->masked.GetString();
     }
 
-    // Translucent MaterialTag
-    bool isTranslucent = false;
+    // Opacity less than 1.0 (or connected) triggers transparent mode:
+    if (_ParamDiffersFrom(terminal, _tokens->opacity, 1.0f)) {
+        return HdStMaterialTagTokens->translucent.GetString();
+    }
 
-    // UsdPreviewSurface uses the opacity parameter to indicate the transparency
-    // when 1.0 the material is fully opaque, the smaller the value the more 
-    // translucent the material, with a default value of 1.0 
-    // StandardSurface indicates material transparency through two different 
-    // parameters; the transmission parameter (float) where the greater the 
-    // value the more transparent the material and a default value of 0.0,
-    // the opacity parameter (color3) indicating the opacity of the entire 
-    // material, where the default value of (1,1,1) is fully opaque.
+    return HdStMaterialTagTokens->defaultMaterialTag.GetString();
+}
 
-    // First check the opacity and transmission connections
-    auto const& opacityConnIt = terminal.inputConnections.find(_tokens->opacity);
-    if (opacityConnIt != terminal.inputConnections.end()) {
+static std::string const&
+_GetStandardSurfaceMaterialTag(HdMaterialNode2 const& terminal)
+{
+    // See https://autodesk.github.io/standard-surface/
+    // and implementation in MaterialX libraries/bxdf/standard_surface.mtlx
+    if (_ParamDiffersFrom(terminal, _tokens->transmission, 0.0f) ||
+        _ParamDiffersFrom(terminal, _tokens->opacity, GfVec3f(1.0f))) {
         return HdStMaterialTagTokens->translucent.GetString();
     }
 
-    auto const& transmissionConnIt = terminal.inputConnections.find(
-                                                _tokens->transmission);
-    isTranslucent = (transmissionConnIt != terminal.inputConnections.end());
+    return HdStMaterialTagTokens->defaultMaterialTag.GetString();
+}
 
-    // Then check the opacity and transmission parameter value
-    if (!isTranslucent) {
-        for (auto const& currParam : terminal.parameters) {
+static std::string const&
+_GetOpenPBRSurfaceMaterialTag(HdMaterialNode2 const& terminal)
+{
+    // See https://academysoftwarefoundation.github.io/OpenPBR/
+    // and the provided implementation
+    if (_ParamDiffersFrom(terminal, _tokens->transmission_weight, 0.0f) ||
+        _ParamDiffersFrom(terminal, _tokens->geometry_opacity, GfVec3f(1.0f))) {
+        return HdStMaterialTagTokens->translucent.GetString();
+    }
 
-            // UsdPreviewSurface
-            if (currParam.first == _tokens->opacity && 
-                currParam.second.IsHolding<float>()) {
-                isTranslucent = currParam.second.Get<float>() < 1.0f;
-                break;
-            }
-            // StandardSurface
-            if (currParam.first == _tokens->opacity && 
-                currParam.second.IsHolding<GfVec3f>()) {
-                GfVec3f opacityColor = currParam.second.Get<GfVec3f>();
-                isTranslucent |= ( opacityColor[0] < 1.0f 
-                                || opacityColor[1] < 1.0f
-                                || opacityColor[2] < 1.0f );
+    return HdStMaterialTagTokens->defaultMaterialTag.GetString();
+}
+
+static std::string const&
+_GetGlTFSurfaceMaterialTag(HdMaterialNode2 const& terminal)
+{
+    // See https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#alpha-coverage
+    // And implementation in MaterialX /libraries/bxdf/gltf_pbr.mtlx
+
+    int alphaMode = 0; // Opaque
+    if (terminal.inputConnections.find(_tokens->alpha_mode) != 
+        terminal.inputConnections.end()) {
+        // A connected alpha_mode is non-standard, but is considered to 
+        // imply blend.
+        alphaMode = 2; // Blend
+    } else {
+        const auto alphaModeIt = terminal.parameters.find(_tokens->alpha_mode);
+        if (alphaModeIt != terminal.parameters.end()) {
+            if (alphaModeIt->second.IsHolding<int>()) {
+                const auto value = alphaModeIt->second.UncheckedGet<int>();
+                if (value >= 0 && value <= 2) {
+                    alphaMode = value;
+                }
             }
-            if (currParam.first == _tokens->transmission && 
-                currParam.second.IsHolding<float>()) {
-                isTranslucent |= currParam.second.Get<float>() > 0.0f;
+        }
+    }
+
+    TfToken materialToken = HdStMaterialTagTokens->defaultMaterialTag;
+    if (alphaMode == 1) { // Mask
+        if (_ParamDiffersFrom(terminal, _tokens->alpha_cutoff, 1.0f) && 
+            _ParamDiffersFrom(terminal, _tokens->alpha, 1.0f)) {
+            materialToken = HdStMaterialTagTokens->masked;
+        }
+    }
+    else if (alphaMode == 2) { // Blend
+        if (_ParamDiffersFrom(terminal, _tokens->alpha, 1.0f)) {
+            materialToken = HdStMaterialTagTokens->translucent;
+        }
+    }
+
+    if (_ParamDiffersFrom(terminal, _tokens->transmission, 0.0f)) {
+        return HdStMaterialTagTokens->translucent.GetString();
+    }
+
+    return materialToken.GetString();
+}
+
+static const mx::TypeDesc*
+_GetMxTypeDescription(std::string const& typeName)
+{
+    // Add whatever is necessary for current codebase:
+    static const auto _typeLibrary = 
+        std::map<std::string, const mx::TypeDesc*>{
+            {"float", mx::Type::FLOAT},
+            {"color3", mx::Type::COLOR3},
+            {"color4", mx::Type::COLOR4},
+            {"vector2", mx::Type::VECTOR2},
+            {"vector3", mx::Type::VECTOR3},
+            {"vector4", mx::Type::VECTOR4},
+            {"surfaceshader", mx::Type::SURFACESHADER}
+        };
+
+    const auto typeDescIt = _typeLibrary.find(typeName);
+    if (typeDescIt != _typeLibrary.end()) {
+        return typeDescIt->second;
+    }
+    return nullptr;
+}
+
+// This function adds a stripped down version of the surfaceshader node to the
+// given MaterialX document. Parameters are added as inputs and any connections
+// are replaced with dummy values (0.5). 
+static mx::NodePtr
+_AddStrippedSurfaceNode(
+    mx::DocumentPtr mxDocument,
+    std::string const& nodeName,
+    HdMaterialNode2 const& hdNode,
+    HdMaterialNetwork2 const& hdNetwork)
+{
+    // Add the hdNode to the mxDocument
+    mx::NodeDefPtr mxNodeDef =
+        HdMtlxStdLibraries()->getNodeDef(hdNode.nodeTypeId.GetString());
+    mx::NodePtr mxNode = mxDocument->addNodeInstance(mxNodeDef, nodeName);
+
+    // Add inputs to the hdNode for each connection
+    for (auto const& connIt: hdNode.inputConnections) {
+        const mx::InputPtr mxInputDef =
+            mxNodeDef->getActiveInput(connIt.first.GetString());
+        if (!mxInputDef) {
+            continue;
+        }
+        auto const* mxTypeDesc = _GetMxTypeDescription(mxInputDef->getType());
+        if (!mxTypeDesc) {
+            continue;
+        }
+        // If hdNode is connected to the surfaceshader node, recursively call 
+        // this function to make sure that surfaceshader node is added to 
+        // the mxDocument
+        if (mxTypeDesc == mx::Type::SURFACESHADER) {
+            auto const& hdConnectedPath = connIt.second.front().upstreamNode;
+            auto const& hdConnectedNode = hdNetwork.nodes.at(hdConnectedPath);
+            mx::NodePtr mxConnectedNode =
+                _AddStrippedSurfaceNode(mxDocument, hdConnectedPath.GetName(),
+                                        hdConnectedNode, hdNetwork);
+            mx::InputPtr mxInput =
+                mxNode->addInput(mxInput->getName(), mxInput->getType());
+            mxInput->setConnectedNode(mxConnectedNode);
+        }
+        // Add the connection as an input with each component set to 0.5
+        else if (mxTypeDesc->getBaseType() == mx::TypeDesc::BASETYPE_FLOAT &&
+                 mxTypeDesc->getSemantic() != mx::TypeDesc::SEMANTIC_MATRIX) {
+            std::string valueStr = "0.5";
+            for (size_t i = 1; i < mxTypeDesc->getSize(); ++i) {
+                valueStr += ", 0.5";
             }
+            mx::InputPtr mxInput =
+                mxNode->addInput(mxInputDef->getName(), mxInputDef->getType());
+            mxInput->setValueString(valueStr);
+        }
+    }
+
+    // Add inputs to the hdNode for each parameter
+    for (auto const& paramIt: hdNode.parameters) {
+        const mx::InputPtr mxInputDef =
+            mxNodeDef->getActiveInput(paramIt.first.GetString());
+        if (!mxInputDef) {
+            continue;
+        }
+        auto const* mxTypeDesc = _GetMxTypeDescription(mxInputDef->getType());
+        if (!mxTypeDesc) {
+            continue;
+        }
+
+        if (mxTypeDesc->getBaseType() == mx::TypeDesc::BASETYPE_FLOAT &&
+            mxTypeDesc->getSemantic() != mx::TypeDesc::SEMANTIC_MATRIX) {
+            // Add the parameter as an input to the mxNode in the mx Document
+            mx::InputPtr mxInput =
+                mxNode->addInput(mxInputDef->getName(), mxInputDef->getType());
+            mxInput->setValueString(HdMtlxConvertToString(paramIt.second));
         }
     }
+    return mxNode;
+}
 
-    if (isTranslucent) {
+// Use MaterialX to determine if the given terminal is a transparent surface
+static bool
+_IsTransparentShader(
+    HdMaterialNetwork2 const& hdNetwork,
+    HdMaterialNode2 const& terminal)
+{
+    // Create a materialX document with a simplified version of the hdNetwork
+    // containing a stripped down version of the surfaceshader node without the
+    // full shader graph so we can use the MaterialX utility below to determine
+    // if the network contains a transparent surface
+
+    mx::DocumentPtr mxDocument = mx::createDocument();
+    mxDocument->importLibrary(HdMtlxStdLibraries());
+
+    mx::NodePtr terminalNode = _AddStrippedSurfaceNode(
+        mxDocument, "MxTerminalNode", terminal, hdNetwork);
+
+    return mx::isTransparentSurface(terminalNode);
+}
+
+static std::string const&
+_GetMaterialTag(
+    HdMaterialNetwork2 const& hdNetwork,
+    HdMaterialNode2 const& terminal)
+{
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+    const SdrShaderNodeConstPtr mtlxSdrNode =
+        sdrRegistry.GetShaderNodeByIdentifierAndType(
+            terminal.nodeTypeId, _tokens->mtlx);
+    
+    // Cover the most frequent and fully specified terminal nodes
+    const TfToken & mtlxNodeFamily = mtlxSdrNode->GetFamily();
+    if (mtlxNodeFamily == _tokens->UsdPreviewSurface) {
+        return _GetUsdPreviewSurfaceMaterialTag(terminal);
+    }
+    if (mtlxNodeFamily == _tokens->standard_surface) {
+        return _GetStandardSurfaceMaterialTag(terminal);
+    }
+    if (mtlxNodeFamily == _tokens->open_pbr_surface) {
+        return _GetOpenPBRSurfaceMaterialTag(terminal);
+    }
+    if (mtlxNodeFamily == _tokens->gltf_pbr) {
+        return _GetGlTFSurfaceMaterialTag(terminal);
+    }
+
+    // For terminal nodes not fully specified we require more MaterialX info
+    const mx::DocumentPtr& stdLibraries = HdMtlxStdLibraries();
+    mx::NodeDefPtr mxNodeDef =
+        stdLibraries->getNodeDef(mtlxSdrNode->GetIdentifier().GetString());
+
+    const auto activeOutputs = mxNodeDef->getActiveOutputs();
+    if (activeOutputs.size() != 1 || 
+        activeOutputs.back()->getType() != mx::SURFACE_SHADER_TYPE_STRING) {
+        // Outputting anything that is not a surfaceshader will be
+        // considered opaque, unless outputting a color4 or vector4.
+        // XXX This is not fully per USD specs, but is supported by MaterialX.
+        auto const* typeDesc = 
+            _GetMxTypeDescription(activeOutputs.back()->getType());
+        if (typeDesc == mx::Type::COLOR4 || typeDesc == mx::Type::VECTOR4) {
+            return HdStMaterialTagTokens->translucent.GetString();
+        }
+        return HdStMaterialTagTokens->defaultMaterialTag.GetString();
+    }
+
+    if (mtlxNodeFamily == _tokens->convert) {
+        if (terminal.nodeTypeId == _tokens->ND_convert_color4_surfaceshader ||
+            terminal.nodeTypeId == _tokens->ND_convert_vector4_surfaceshader) {
+            return HdStMaterialTagTokens->translucent.GetString();
+        }
+        return HdStMaterialTagTokens->defaultMaterialTag.GetString();
+    }
+
+    // Out of easy answers, delegate to MaterialX
+    if (_IsTransparentShader(hdNetwork, terminal)) {
         return HdStMaterialTagTokens->translucent.GetString();
     }
     return HdStMaterialTagTokens->defaultMaterialTag.GetString();
 }
 
-// Gather the Material Params from the glslfx ShaderPtr
-void
-_AddMaterialXParams(
-    mx::ShaderPtr const& glslfxShader,
-    HdSt_MaterialParamVector* materialParams)
+////////////////////////////////////////////////////////////////////////////////
+// Helper functions for to make sure the hdNetwork is organized in a way that 
+// Storm can find all the textures and primvars. 
+
+// Returns true is the given mtlxSdrNode requires primvar support for texcoords
+static bool
+_NodeUsesTexcoordPrimvar(const SdrShaderNodeConstPtr mtlxSdrNode)
 {
-    if (!glslfxShader) {
-        return;
+    if (mtlxSdrNode->GetFamily() == _tokens->texcoord) {
+        return true;
     }
 
-    const mx::ShaderStage& pxlStage = glslfxShader->getStage(mx::Stage::PIXEL);
-    const auto& paramsBlock = pxlStage.getUniformBlock(mx::HW::PUBLIC_UNIFORMS);
-    for (size_t i = 0; i < paramsBlock.size(); ++i) {
+    const mx::DocumentPtr& stdLibraries = HdMtlxStdLibraries();
+    mx::NodeDefPtr mxNodeDef =
+        stdLibraries->getNodeDef(mtlxSdrNode->GetIdentifier().GetString());
+    mx::InterfaceElementPtr impl = mxNodeDef->getImplementation();
+    if (impl && impl->isA<mx::NodeGraph>()) {
+        mx::NodeGraphPtr nodegraph = impl->asA<mx::NodeGraph>();
+        if (!nodegraph->getNodes(_tokens->texcoord).empty()) {
+            return true;
+        }
+    }
+    return false;
+}
 
-        // MaterialX parameter Information
-        const auto variable = paramsBlock[i];
-        const auto varValue = variable->getValue();
-        std::istringstream valueStream(varValue 
-            ? varValue->getValueString() : std::string());
+// Browse the nodes to find primvar connections to add to the terminal node
+static void
+_ConnectPrimvarNodesToTerminalNode(
+    SdfPath const& terminalNodePath,
+    HdMaterialNetwork2* hdNetwork)
+{
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
 
-        // Create a corresponding HdSt_MaterialParam
-        HdSt_MaterialParam param;
-        param.paramType = HdSt_MaterialParam::ParamTypeFallback;
-        param.name = TfToken(variable->getVariable());
+    for (auto& hdNodePair: hdNetwork->nodes) {
+        const SdrShaderNodeConstPtr mtlxSdrNode =
+            sdrRegistry.GetShaderNodeByIdentifierAndType(
+                hdNodePair.second.nodeTypeId,_tokens->mtlx);
 
-        std::string separator;
-        const auto varType = variable->getType();
-        if (varType->getBaseType() == mx::TypeDesc::BASETYPE_BOOLEAN) {
-            const bool val = valueStream.str() == "true";
-            param.fallbackValue = VtValue(val);
+        if (mtlxSdrNode->GetFamily() != _tokens->geompropvalue ||
+            !_NodeUsesTexcoordPrimvar(mtlxSdrNode)) {
+            return;
         }
-        else if (varType->getBaseType() == mx::TypeDesc::BASETYPE_FLOAT) {
-            if (varType->getSize() == 1) {
-                float val;
-                valueStream >> val;
-                param.fallbackValue = VtValue(val);
-            }
-            else if (varType->getSize() == 2) {
-                GfVec2f val;
-                valueStream >> val[0] >> separator >> val[1];
-                param.fallbackValue = VtValue(val);
+
+        // Connect the primvar node to the terminal node for HdStMaterialNetwork
+        // And create a unique name for the new connection.
+        const std::string newConnName =
+            hdNodePair.first.GetName() + "_primvarconn";
+        HdMaterialConnection2 primvarConn;
+        primvarConn.upstreamNode = hdNodePair.first;
+        primvarConn.upstreamOutputName = TfToken(newConnName);
+
+        hdNetwork->nodes[terminalNodePath]
+            .inputConnections[primvarConn.upstreamOutputName] = {primvarConn};
+    }
+}
+
+// Returns the default texture cordinate name from the textureNodes sdr metadata
+// if no name was specified return 'st'
+static TfToken
+_GetDefaultTexcoordName()
+{
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+    const SdrShaderNodeConstPtr mtlxSdrNode =
+        sdrRegistry.GetShaderNodeByIdentifierAndType(
+            _tokens->ND_image_color3, _tokens->mtlx);
+    auto const& metadata = mtlxSdrNode->GetMetadata();
+    const auto primvarIt = metadata.find(SdrNodeMetadata->Primvars);
+    return primvarIt != metadata.end() 
+            ? TfToken(primvarIt->second) 
+            : _tokens->st;
+}
+
+// Add the Hydra texture node parameters to the texture node and connect the 
+// texture node to the terminal node
+static void
+_UpdateTextureNode(
+    TfToken mtlxParamName,
+    HdMaterialNetwork2* hdNetwork,
+    SdfPath const& terminalNodePath,
+    SdfPath const& textureNodePath)
+{
+    HdMaterialNode2& hdTextureNode = hdNetwork->nodes[textureNodePath];
+
+    // Set the default texture coordinate name as the 'st' parameter.
+    hdTextureNode.parameters[_tokens->st] = TfToken(_GetDefaultTexcoordName());
+
+    // Gather the default Texture Parameters
+    std::map<TfToken, VtValue> hdParameters;
+    _AddDefaultMtlxTextureValues(
+        HdMtlxStdLibraries()->getNodeDef(hdTextureNode.nodeTypeId.GetString()), 
+        &hdParameters);
+
+    // Gather the authored Texture Parameters
+    for (auto const& param : hdTextureNode.parameters) {
+        // Get the Hydra equivalents for the Mx Texture node parameters
+        std::string const& mxInputName = param.first.GetString();
+        std::string const mxInputValue = HdMtlxConvertToString(param.second);
+        _GetMxInputAsHdTextureParam(mxInputName, mxInputValue, &hdParameters);
+    }
+
+    // Add the Hydra Texture Parameters to the Texture Node
+    for (auto const& param : hdParameters) {
+        hdTextureNode.parameters[param.first] = param.second;
+    }
+
+    // Make and add a new connection to the terminal node
+    HdMaterialConnection2 textureConn;
+    textureConn.upstreamOutputName = mtlxParamName;
+    textureConn.upstreamNode = textureNodePath;
+    hdNetwork->nodes[terminalNodePath].
+        inputConnections[mtlxParamName] = {textureConn};
+}
+
+static void
+_ReplaceFilenameInput(
+    HdMaterialNetwork2* hdNetwork,
+    SdfPath const& hdTerminalNodePath,
+    std::string const& mxFilenameInputName)
+{
+    const auto& hdTerminalNode = hdNetwork->nodes.at(hdTerminalNodePath);
+    const mx::NodeDefPtr mxNodeDef =
+        HdMtlxStdLibraries()->getNodeDef(hdTerminalNode.nodeTypeId.GetString());
+    if (!mxNodeDef) {
+        return;
+    }
+    const mx::InputPtr mxInput = mxNodeDef->getActiveInput(mxFilenameInputName);
+    if (!mxInput) {
+        return;
+    }
+    const mx::InterfaceElementPtr impl = mxNodeDef->getImplementation();
+    if (!impl || !impl->isA<mx::NodeGraph>()) {
+        return;
+    }
+
+    // Find the mxTextureNode in the nodegraph that interfaces with the
+    // filename input
+    mx::NodePtr mxTextureNode;
+    std::string mxTextureNodefilenameInputName;
+    for (mx::NodePtr const& node: impl->asA<mx::NodeGraph>()->getNodes()) {
+        for (mx::InputPtr const& input: node->getInputs()) {
+            if (input->getType() != _tokens->filename) {
+                continue;
             }
-            else if (varType->getSize() == 3) {
-                GfVec3f val;
-                valueStream >> val[0] >> separator >> val[1] >> separator 
-                            >> val[2];
-                param.fallbackValue = VtValue(val);
+            // Get the Texture node and input name for the filename input
+            mxTextureNodefilenameInputName = input->getName();
+            if (input->getInterfaceName() == mxFilenameInputName) {
+                mxTextureNode = node;
+                break;
             }
-            else if (varType->getSize() == 4) {
-                GfVec4f val;
-                valueStream >> val[0] >> separator >> val[1] >> separator
-                            >> val[2] >> separator >> val[3];
-                param.fallbackValue = VtValue(val);
+            // We need to handle correctly the situation where there are
+            // "dot" nodes in the NodeGraph.
+            mx::NodePtr dotNode = input->getConnectedNode();
+            while (dotNode && dotNode->getCategory() == "dot") {
+                mx::InputPtr dotInput = dotNode->getInput("in");
+                if (dotInput && 
+                    dotInput->getInterfaceName() == mxFilenameInputName) {
+                    mxTextureNode = node;
+                    break;
+                }
+                dotNode = dotNode->getConnectedNode("in");
             }
         }
-        else if (varType->getBaseType() == mx::TypeDesc::BASETYPE_INTEGER) {
-            if (varType->getSize() == 1) {
-                int val;
-                valueStream >> val;
-                param.fallbackValue = VtValue(val);
-            }
-            else if (varType->getSize() == 2) {
-                GfVec2i val;
-                valueStream >> val[0] >> separator >> val[1];
-                param.fallbackValue = VtValue(val);
-            }
-            else if (varType->getSize() == 3) {
-                GfVec3i val;
-                valueStream >> val[0] >> separator >> val[1] >> separator 
-                            >> val[2];
-                param.fallbackValue = VtValue(val);
-            }
-            else if (varType->getSize() == 4) {
-                GfVec4i val;
-                valueStream >> val[0] >> separator >> val[1] >> separator
-                    >> val[2] >> separator >> val[3];
-                param.fallbackValue = VtValue(val);
-            }
+        if (mxTextureNode) {
+            break;
         }
+    }
 
-        if (!param.fallbackValue.IsEmpty()) {
-            materialParams->push_back(std::move(param));
+    if (!mxTextureNode) {
+        return;
+    }
+    const mx::NodeDefPtr mxTextureNodeDef = mxTextureNode->getNodeDef();
+    if (!mxTextureNodeDef) {
+        return;
+    }
+
+    // Gather texture parameters on the found mxTextureNode
+    std::map<TfToken, VtValue> terminalTextureParams;
+    _AddDefaultMtlxTextureValues(mxTextureNodeDef, &terminalTextureParams);
+    for (TfToken const& mxInputName: _mxTextureParamTokens->allTokens) {
+        const mx::InputPtr mxInput = mxTextureNode->getInput(mxInputName);
+        // Get the Hydra equivalents for the Mx Texture node parameters
+        if (mxInput && mxInput->hasValueString()) {
+            _GetMxInputAsHdTextureParam(
+                mxInputName, mxInput->getValueString(), &terminalTextureParams);
         }
     }
+    // Gather the Hydra Texture Parameters on the terminal node.
+    for (auto const& param : hdTerminalNode.parameters) {
+        // Get the Hydra equivalents for the Mx Texture node parameters
+        std::string const& mxInputName = param.first.GetString();
+        std::string const mxInputValue = HdMtlxConvertToString(param.second);
+        _GetMxInputAsHdTextureParam(
+            mxInputName, mxInputValue, &terminalTextureParams);
+    }
+
+    // Get the texture node from the Implementation Nodegraph and gather the
+    // nodeTypeId and parameter information.
+
+    // Get the filename parameter value from the terminal node
+    const TfToken filenameToken(mxFilenameInputName);
+    auto filenameParamIt = hdTerminalNode.parameters.find(filenameToken);
+    if (filenameParamIt == hdTerminalNode.parameters.end()) {
+        return;
+    }
+
+    // Create a new Texture Node
+    HdMaterialNode2 terminalTextureNode;
+    terminalTextureNode.nodeTypeId = TfToken(mxTextureNodeDef->getName());
+    terminalTextureNode.parameters[TfToken(mxTextureNodefilenameInputName)] =
+        filenameParamIt->second;
+    terminalTextureNode.parameters[_tokens->st] = _tokens->st;
+    for (auto const& param : terminalTextureParams) {
+        terminalTextureNode.parameters[param.first] = param.second;
+    }
+
+    // Add the Texture Node to the hdNetwork
+    const SdfPath terminalTexturePath =
+        hdTerminalNodePath.AppendChild(filenameToken);
+    hdNetwork->nodes.insert({terminalTexturePath, terminalTextureNode});
+
+    // Make a new connection to the terminal node
+    HdMaterialConnection2 terminalTextureConn;
+    terminalTextureConn.upstreamNode = terminalTexturePath;
+    terminalTextureConn.upstreamOutputName = terminalTexturePath.GetNameToken();
+
+    // Replace the filename parameter with the TerminalTextureConnection
+    hdNetwork->nodes[hdTerminalNodePath].parameters.erase(filenameParamIt);
+    hdNetwork->nodes[hdTerminalNodePath].
+        inputConnections[terminalTextureConn.upstreamOutputName] =
+            {terminalTextureConn};
+
 }
 
-// Gather the Material Params from the terminal HdMaterialNode/SdrShaderNode
-void 
+// Gather the Material Params from the glslfx ShaderPtr
+void
 _AddMaterialXParams(
     mx::ShaderPtr const& glslfxShader,
-    HdMaterialNode2 const& terminalNode,
-    SdrShaderNodeConstPtr const& mtlxSdrNode,
+    HdMaterialNetwork2* hdNetwork,
+    SdfPath const& terminalNodePath,
+    HdAnnonNodePathMap const& hdToAnnonNodePathMap,
     HdSt_MaterialParamVector* materialParams)
 {
+    TRACE_FUNCTION_SCOPE("Collect Mtlx params from glslfx shader.")
     if (!glslfxShader) {
         return;
     }
 
+    // Storm can only find primvar nodes when they are connected to the terminal
+    _ConnectPrimvarNodesToTerminalNode(terminalNodePath, hdNetwork);
+
+    // Store all the parameter values, mapped by the anonymized names used 
+    // for MaterialXShaderGen
+    // <annonNodeName_paramName, hdParamVtValue>
+    std::map<std::string, VtValue> mxParamNameToValue;
+    for (auto const& node: hdNetwork->nodes) {
+        // Terminal Node parameters are not prefixed.
+        std::string annonNodeNamePrefix;
+        if (node.first != terminalNodePath) {
+            const auto annonNodePathIt = hdToAnnonNodePathMap.find(node.first);
+            if (annonNodePathIt != hdToAnnonNodePathMap.end()) {
+                annonNodeNamePrefix = annonNodePathIt->second.GetName() + "_";
+            }
+        }
+        for (auto const& param: node.second.parameters) {
+            if (param.second.IsHolding<std::string>() ||
+                param.second.IsHolding<TfToken>()) {
+                continue;
+            }
+            mxParamNameToValue.emplace(
+                annonNodeNamePrefix + param.first.GetString(), param.second);
+        }
+    }
+
+    // Build a mapping from the anonymized node name to the original Hydra
+    // SdfPath. This is to help find texture nodes associated with filename 
+    // inputs found in the uniform block below.
+    std::map<std::string, SdfPath> annonToHdNodePathMap;
+    for (auto const& pathPair: hdToAnnonNodePathMap) {
+        if (pathPair.first != terminalNodePath) {
+            annonToHdNodePathMap.emplace(
+                pathPair.second.GetName(), pathPair.first);
+        }
+    }
+
     const mx::ShaderStage& pxlStage = glslfxShader->getStage(mx::Stage::PIXEL);
     const auto& paramsBlock = pxlStage.getUniformBlock(mx::HW::PUBLIC_UNIFORMS);
     for (size_t i = 0; i < paramsBlock.size(); ++i) {
 
         // MaterialX parameter Information
-        const mx::ShaderPort* variable = paramsBlock[i];
+        const auto* variable = paramsBlock[i];
+        const auto varType = variable->getType();
 
         // Create a corresponding HdSt_MaterialParam
         HdSt_MaterialParam param;
         param.paramType = HdSt_MaterialParam::ParamTypeFallback;
         param.name = TfToken(variable->getVariable());
 
-        const auto varType = variable->getType()->getBaseType();
-        if (varType == mx::TypeDesc::BASETYPE_FLOAT ||
-            varType == mx::TypeDesc::BASETYPE_INTEGER ||
-            varType == mx::TypeDesc::BASETYPE_BOOLEAN) {
-            
-            // Get the paramter value from the terminal node
-            const auto paramIt = terminalNode.parameters.find(param.name);
-            if (paramIt != terminalNode.parameters.end()) {
-                param.fallbackValue = paramIt->second;
+        // Get the parameter value from the map created above
+        const auto paramValueIt =
+            mxParamNameToValue.find(variable->getVariable());
+        if (paramValueIt != mxParamNameToValue.end()) {
+            if (varType->getBaseType() == mx::TypeDesc::BASETYPE_BOOLEAN ||
+                varType->getBaseType() == mx::TypeDesc::BASETYPE_FLOAT ||
+                varType->getBaseType() == mx::TypeDesc::BASETYPE_INTEGER) {
+                param.fallbackValue = paramValueIt->second;
             }
-            // Only the authored values are in the terminalNode.parameters
-            // get the default value from the mtlxSdrNode.
-            else if (const auto input = mtlxSdrNode->GetInput(param.name)) {
-                param.fallbackValue = input->GetDefaultValue();
+        }
+        // If it was not found in the mapping use the value from the MaterialX
+        // variable to get the value. 
+        else {
+            std::string separator;
+            const auto varValue = variable->getValue();
+            std::istringstream valueStream(varValue
+                ? varValue->getValueString() : std::string());
+            if (varType->getBaseType() == mx::TypeDesc::BASETYPE_BOOLEAN) {
+                const bool val = valueStream.str() == "true";
+                param.fallbackValue = VtValue(val);
+            }
+            else if (varType->getBaseType() == mx::TypeDesc::BASETYPE_FLOAT) {
+                if (varType->getSize() == 1) {
+                    float val;
+                    valueStream >> val;
+                    param.fallbackValue = VtValue(val);
+                }
+                else if (varType->getSize() == 2) {
+                    GfVec2f val;
+                    valueStream >> val[0] >> separator >> val[1];
+                    param.fallbackValue = VtValue(val);
+                }
+                else if (varType->getSize() == 3) {
+                    GfVec3f val;
+                    valueStream >> val[0] >> separator >> val[1] >> separator 
+                                >> val[2];
+                    param.fallbackValue = VtValue(val);
+                }
+                else if (varType->getSize() == 4) {
+                    GfVec4f val;
+                    valueStream >> val[0] >> separator >> val[1] >> separator
+                                >> val[2] >> separator >> val[3];
+                    param.fallbackValue = VtValue(val);
+                }
+            }
+            else if (varType->getBaseType() == mx::TypeDesc::BASETYPE_INTEGER) {
+                if (varType->getSize() == 1) {
+                    int val;
+                    valueStream >> val;
+                    param.fallbackValue = VtValue(val);
+                }
+                else if (varType->getSize() == 2) {
+                    GfVec2i val;
+                    valueStream >> val[0] >> separator >> val[1];
+                    param.fallbackValue = VtValue(val);
+                }
+                else if (varType->getSize() == 3) {
+                    GfVec3i val;
+                    valueStream >> val[0] >> separator >> val[1] >> separator 
+                                >> val[2];
+                    param.fallbackValue = VtValue(val);
+                }
+                else if (varType->getSize() == 4) {
+                    GfVec4i val;
+                    valueStream >> val[0] >> separator >> val[1] >> separator
+                        >> val[2] >> separator >> val[3];
+                    param.fallbackValue = VtValue(val);
+                }
             }
         }
 
         if (!param.fallbackValue.IsEmpty()) {
             materialParams->push_back(std::move(param));
         }
+
+        // For filename inputs, manage the associated texture node
+        if (varType->getSemantic() == mx::TypeDesc::SEMANTIC_FILENAME) {
+            // Get the anonymized MaterialX node name from the param name
+            // annonNodeName_paramName -> annonNodeName
+            std::string mxNodeName = variable->getVariable();
+            const auto underscorePos = mxNodeName.find('_');
+            if (underscorePos != std::string_view::npos) {
+                mxNodeName = mxNodeName.substr(0, underscorePos);
+            }
+
+            // Get the original hdNodeName from the MaterialX node name
+            const auto hdNodePathIt = annonToHdNodePathMap.find(mxNodeName);
+            if (hdNodePathIt != annonToHdNodePathMap.end()) {
+                _UpdateTextureNode(
+                    param.name, hdNetwork, 
+                    terminalNodePath, hdNodePathIt->second);
+            } else {
+                // Storm does not expect textures/filename to be direct inputs 
+                // on materials, replace this filename input with a connection
+                // to an image node
+                _ReplaceFilenameInput(
+                    hdNetwork, terminalNodePath, variable->getVariable());
+            }
+        }
     }
 }
 
 static mx::ShaderPtr
 _GenerateMaterialXShader(
-    HdMaterialNetwork2* hdNetwork,
+    HdMaterialNetwork2 const& hdNetwork,
     SdfPath const& materialPath,
     HdMaterialNode2 const& terminalNode,
     SdfPath const& terminalNodePath,
@@ -919,38 +1226,188 @@ _GenerateMaterialXShader(
     // Create the MaterialX Document from the HdMaterialNetwork
     HdSt_MxShaderGenInfo mxHdInfo;
     HdMtlxTexturePrimvarData hdMtlxData;
-    mx::DocumentPtr mtlxDoc = HdMtlxCreateMtlxDocumentFromHdNetwork(
-                                    *hdNetwork,
-                                    terminalNode,   // MaterialX HdNode
-                                    terminalNodePath,
-                                    materialPath,
-                                    stdLibraries,
-                                    &hdMtlxData);
-
-    // Add a Fallback DomeLight texture node to make sure the indirect
-    // light computations always has a texture to sample from
-    _AddFallbackDomeLightTextureNode(
-        hdNetwork, terminalNodePath, &mxHdInfo.textureMap);
-
-    // Add Hydra parameters for each of the Texture nodes
-    _UpdateTextureNodes(mtlxDoc, hdNetwork, terminalNode, terminalNodePath, 
-                        hdMtlxData.hdTextureNodes, hdMtlxData.mxHdTextureMap,
-                        &mxHdInfo.textureMap, &mxHdInfo.primvarMap, 
-                        &mxHdInfo.defaultTexcoordName);
-
-    _UpdatePrimvarNodes(mtlxDoc, hdNetwork, terminalNodePath,
-                        hdMtlxData.hdPrimvarNodes, &mxHdInfo.primvarMap,
-                        &mxHdInfo.primvarDefaultValueMap);
+    const mx::DocumentPtr mtlxDoc =
+        HdMtlxCreateMtlxDocumentFromHdNetwork(
+            hdNetwork, terminalNode, terminalNodePath, materialPath,
+            stdLibraries, &hdMtlxData);
+
+    // Add domelight and other textures to mxHdInfo so the proper entry points
+    // get generated in MaterialXShaderGen
+    _UpdateMxHdTextureMap(
+        hdMtlxData.hdTextureNodes, hdMtlxData.mxHdTextureMap,
+        terminalNode, terminalNodePath, &mxHdInfo.textureMap);
+
+    _UpdatePrimvarNodes(
+        mtlxDoc, hdNetwork, hdMtlxData.hdPrimvarNodes, 
+        &mxHdInfo.primvarMap, &mxHdInfo.primvarDefaultValueMap);
 
     mxHdInfo.materialTag = materialTagToken.GetString();
     mxHdInfo.bindlessTexturesEnabled = bindlessTexturesEnabled;
-    
+
     // Generate the glslfx source code from the mtlxDoc
     return HdSt_GenMaterialXShader(
         mtlxDoc, stdLibraries, searchPaths, mxHdInfo, apiName);
 }
 
-void
+////////////////////////////////////////////////////////////////////////////////
+// Helper functions to create an anonymized HdMaterialNetwork2
+//
+
+static bool
+_IsTopologicalShader(TfToken const& nodeId)
+{
+    static const TfToken::HashSet topologicalTokenSet(
+        _topologicalTokens->allTokens.begin(),
+        _topologicalTokens->allTokens.end());
+
+    if (nodeId == _topologicalTokens->ND_dot_filename) {
+        return true;
+    }
+
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+    const SdrShaderNodeConstPtr sdrNode = 
+        sdrRegistry.GetShaderNodeByIdentifierAndType(nodeId, _tokens->mtlx);
+
+    return sdrNode && topologicalTokenSet.count(sdrNode->GetFamily()) > 0;
+}
+
+// Build the topoNetwork, equivalent to the given hdNetwork but anonymized and 
+// stripped of non-topological parameters to better re-use the generated shader.  
+size_t _BuildEquivalentMaterialNetwork(
+    HdMaterialNetwork2 const& hdNetwork,
+    HdMaterialNetwork2* topoNetwork,
+    HdAnnonNodePathMap* annonNodePathMap)
+{
+    // The goal here is to strip all local names in the network paths in order 
+    // to produce MaterialX data that does not have uniform parameter names 
+    // that vary based on USD node names.
+    // We also want to strip all non-topological parameters in order to get a 
+    // shader that has default values for all parameters and can be re-used.
+    annonNodePathMap->clear();
+
+    // Annonymized paths will be of the form:
+    //   /NG_Anonymized/N0, /NG_Anonymized/N1, /NG_Anonymized/N2...
+    SdfPath annonBaseName(_tokens->NG_Anonymized);
+
+    // Create anonymized names for each of the nodes in the material network. 
+    // To do this we process the network in a depth-first traversal starting
+    // at the terminals. This provides a stable traversal and consistant 
+    // anonymized renaming that will not be affected by the ordering of the 
+    // SdfPaths in the hdNetwork. 
+    size_t nodeCounter = 0;
+    std::vector<const SdfPath*> pathsToTraverse;
+    for (const auto& terminal : hdNetwork.terminals) {
+        const auto& connection = terminal.second;
+        pathsToTraverse.push_back(&(connection.upstreamNode));
+    }
+    while (!pathsToTraverse.empty()) {
+        const SdfPath *path = pathsToTraverse.back();
+        pathsToTraverse.pop_back();
+
+        if (!annonNodePathMap->count(*path)) {
+            const HdMaterialNode2& node = hdNetwork.nodes.find(*path)->second;
+            (*annonNodePathMap)[*path] = annonBaseName.AppendChild(
+                TfToken("N" + std::to_string(nodeCounter++)));
+
+            for (const auto& input : node.inputConnections) {
+                for (const auto& connection : input.second) {
+                    pathsToTraverse.push_back(&(connection.upstreamNode));
+                }
+            }
+        }
+    }
+
+    // Copy the incoming hdNetwork to the topoNetwork using only the 
+    // anonymized names
+    topoNetwork->primvars = hdNetwork.primvars;
+    for (const auto& terminal : hdNetwork.terminals) {
+        topoNetwork->terminals.emplace(
+            terminal.first,
+            HdMaterialConnection2 { 
+                (*annonNodePathMap)[terminal.second.upstreamNode],
+                terminal.second.upstreamOutputName });
+    }
+    for (const auto& nodePair : hdNetwork.nodes) {
+        const HdMaterialNode2& inNode = nodePair.second;
+
+        HdMaterialNode2 outNode;
+        outNode.nodeTypeId = inNode.nodeTypeId;
+        if (_IsTopologicalShader(inNode.nodeTypeId)) {
+            // Topological nodes have parameters that affect topology. 
+            // We can not strip them.
+            outNode.parameters = inNode.parameters;
+        } else {
+            // Parameters that are color managed are also topological as they
+            // result in different nodes being added in the MaterialX graph
+            for (const auto& param: inNode.parameters) {
+                const auto colorManagedInput = 
+                    SdfPath::StripPrefixNamespace(param.first.GetString(),
+                                                  SdfFieldKeys->ColorSpace);
+                // If this parameter is to indicate a colorspace on a color 
+                // managed input, find and add that corresponding input
+                if (colorManagedInput.second) {
+                    outNode.parameters.insert(param);
+
+                    // Get the parameter value for the input
+                    const TfToken colorInputParam(colorManagedInput.first);
+                    const auto colorInputIt =
+                        inNode.parameters.find(colorInputParam);
+                    if (colorInputIt != inNode.parameters.end()) {
+                        VtValue colorInputValue = colorInputIt->second;
+
+                        // Use an empty asset for color managed files
+                        if (colorInputValue.IsHolding<SdfAssetPath>()) {
+                            colorInputValue = VtValue(SdfAssetPath());
+                        }
+                        outNode.parameters.emplace(
+                            colorInputParam, 
+                            colorInputValue); 
+                    }
+                }
+            }
+        }
+
+        for (const auto& connPair : inNode.inputConnections) {
+            std::vector<HdMaterialConnection2> outConn;
+            for (const auto& inConn : connPair.second) {
+                outConn.emplace_back(
+                    HdMaterialConnection2 { 
+                        (*annonNodePathMap)[inConn.upstreamNode], 
+                        inConn.upstreamOutputName });
+            }
+            outNode.inputConnections.emplace(connPair.first, std::move(outConn));
+        }
+        topoNetwork->nodes.emplace(
+            (*annonNodePathMap)[nodePair.first], std::move(outNode));
+    }
+
+    // Build the topo hash from the topo network
+    Tf_HashState topoHash;
+    for (const auto& terminal : topoNetwork->terminals) {
+        TfHashAppend(topoHash, terminal.first);
+        TfHashAppend(topoHash, terminal.second.upstreamNode.GetName());
+    }
+    for (const auto& node : topoNetwork->nodes) {
+        TfHashAppend(topoHash, node.first.GetName());
+        TfHashAppend(topoHash, node.second.nodeTypeId);
+        for (const auto& param : node.second.parameters) {
+            TfHashAppend(topoHash, param.first);
+            TfHashAppend(topoHash, param.second.GetHash());
+        }
+        for (const auto& connection : node.second.inputConnections) {
+            TfHashAppend(topoHash, connection.first);
+            for (const auto& source : connection.second) {
+                TfHashAppend(topoHash, source.upstreamNode.GetName());
+                TfHashAppend(topoHash, source.upstreamOutputName);
+            }
+        }
+    }
+
+    return topoHash.GetCode();
+}
+
+
+mx::ShaderPtr
 HdSt_ApplyMaterialXFilter(
     HdMaterialNetwork2* hdNetwork,
     SdfPath const& materialPath,
@@ -964,95 +1421,81 @@ HdSt_ApplyMaterialXFilter(
     const SdrShaderNodeConstPtr mtlxSdrNode = 
         sdrRegistry.GetShaderNodeByIdentifierAndType(terminalNode.nodeTypeId, 
                                                      _tokens->mtlx);
+    if (!mtlxSdrNode) {
+        return nullptr;
+    }
 
-    if (mtlxSdrNode) {
-
-        mx::ShaderPtr glslfxShader;
-        const TfToken materialTagToken(_GetMaterialTag(terminalNode));
-        const bool bindlessTexturesEnabled = 
-            resourceRegistry->GetHgi()->GetCapabilities()->IsSet(
-                HgiDeviceCapabilitiesBitsBindlessTextures);
-        const TfToken apiName = resourceRegistry->GetHgi()->GetAPIName();
-
-        // If the MaterialNetwork has just a terminal node, utilize the
-        // Resource Registry to cache the generated MaterialX glslfx Shader
-        if (hdNetwork->nodes.size() == 1) {
-            // Get the glslfx ShaderPtr for the terminal node
-            Tf_HashState terminalNodeHash;
-            TfHashAppend(terminalNodeHash, terminalNode.nodeTypeId);
-            TfHashAppend(terminalNodeHash, materialTagToken);
-            for (auto param : terminalNode.parameters) {
-                auto result = SdfPath::StripPrefixNamespace(
-                        param.first.GetString(), _tokens->colorSpace);
-                if (result.second) {
-                    TfHashAppend(terminalNodeHash, param);
-                }
-            }
-            HdInstance<mx::ShaderPtr> glslfxInstance = 
-                resourceRegistry->RegisterMaterialXShader(
-                    terminalNodeHash.GetCode());
-
-            if (glslfxInstance.IsFirstInstance()) {
-                // Generate the MaterialX glslfx ShaderPtr
-                try {
-                    glslfxShader = _GenerateMaterialXShader(
-                        hdNetwork, materialPath, terminalNode, terminalNodePath,
-                        materialTagToken, apiName, bindlessTexturesEnabled);
-                } catch (mx::Exception& exception) {
-                    TF_CODING_ERROR("Unable to create the Glslfx Shader.\n"
-                        "MxException: %s", exception.what());
-                }
-
-                // Store the mx::ShaderPtr 
-                glslfxInstance.SetValue(glslfxShader);
-
-                // Add material parameters from the glslfxShader
-                _AddMaterialXParams(glslfxShader, materialParams);
-
-            } else {
-                // Get the mx::ShaderPtr from the resource registry
-                glslfxShader = glslfxInstance.GetValue();
-
-                // Add a Fallback DomeLight texture node to the network
-                _AddFallbackDomeLightTextureNode(hdNetwork, terminalNodePath);
-
-                // Add material parameters from the terminal node
-                _AddMaterialXParams(glslfxShader, terminalNode, mtlxSdrNode, 
-                                    materialParams);
-            }
+    TRACE_FUNCTION_SCOPE("ApplyMaterialXFilter: Found Mtlx Node.")
+
+    // Anonymize the network to make sure shader code does not depend
+    // on node names
+    HdAnnonNodePathMap annonNodePathMap;
+    HdMaterialNetwork2 annonNetwork;
+    auto topoHash = _BuildEquivalentMaterialNetwork(
+        *hdNetwork, &annonNetwork, &annonNodePathMap);
+    SdfPath anonTerminalNodePath = annonNodePathMap[terminalNodePath];
+
+    mx::ShaderPtr glslfxShader;
+    const TfToken materialTag(_GetMaterialTag(*hdNetwork, terminalNode));
+    const bool bindlessTexturesEnabled = 
+        resourceRegistry->GetHgi()->GetCapabilities()->IsSet(
+            HgiDeviceCapabilitiesBitsBindlessTextures);
+    const TfToken apiName = resourceRegistry->GetHgi()->GetAPIName();
+
+    // Use the Resource Registry to cache the generated MaterialX 
+    // glslfx Shader
+    Tf_HashState shaderHash;
+    TfHashAppend(shaderHash, topoHash);
+    TfHashAppend(shaderHash, materialTag);
+    HdInstance<mx::ShaderPtr> glslfxInstance =
+        resourceRegistry->RegisterMaterialXShader(shaderHash.GetCode());
+
+    if (glslfxInstance.IsFirstInstance()) {
+        try {
+            glslfxShader = _GenerateMaterialXShader(
+                annonNetwork, materialPath, terminalNode, 
+                anonTerminalNodePath, materialTag, apiName, 
+                bindlessTexturesEnabled);
+        } catch (mx::Exception& exception) {
+            TF_CODING_ERROR("Unable to create the Glslfx Shader.\n"
+                "MxException: %s", exception.what());
         }
-        else {
-            // Process the network and generate the MaterialX glslfx ShaderPtr
-            try {
-                glslfxShader = _GenerateMaterialXShader(
-                    hdNetwork, materialPath, terminalNode, terminalNodePath, 
-                    materialTagToken, apiName, bindlessTexturesEnabled);
-            } catch (mx::Exception& exception) {
-                TF_CODING_ERROR("Unable to create the Glslfx Shader.\n"
-                    "MxException: %s", exception.what());
-            }
 
-            // Add material parameters from the glslfxShader
-            _AddMaterialXParams(glslfxShader, materialParams);
-        }
+        // Store the mx::ShaderPtr
+        glslfxInstance.SetValue(glslfxShader);
+    }
+    else {
+        // Get the mx::ShaderPtr from the resource registry
+        glslfxShader = glslfxInstance.GetValue();
+    }
 
-        // Create a new terminal node with the glslfxShader
-        if (glslfxShader) {
-            const std::string glslfxSourceCode =
-                glslfxShader->getSourceCode(mx::Stage::PIXEL);
-            SdrShaderNodeConstPtr sdrNode = 
-                sdrRegistry.GetShaderNodeFromSourceCode(glslfxSourceCode, 
-                                                        HioGlslfxTokens->glslfx,
-                                                        NdrTokenMap()); // metadata
-            HdMaterialNode2 newTerminalNode;
-            newTerminalNode.nodeTypeId = sdrNode->GetIdentifier();
-            newTerminalNode.inputConnections = terminalNode.inputConnections;
-            newTerminalNode.parameters = terminalNode.parameters;
-
-            // Replace the original terminalNode with this newTerminalNode
-            hdNetwork->nodes[terminalNodePath] = newTerminalNode;
-        }
+    // Add a Fallback DomeLight texture node to the network
+    _AddFallbackDomeLightTextureNode(hdNetwork, terminalNodePath);
+
+    // Add material parameters from the original network
+    _AddMaterialXParams(
+        glslfxShader, hdNetwork, terminalNodePath,
+        annonNodePathMap, materialParams);
+
+    // Create a new terminal node with the glslfxShader
+    if (glslfxShader) {
+        const std::string glslfxSourceCode =
+            glslfxShader->getSourceCode(mx::Stage::PIXEL);
+        SdrShaderNodeConstPtr sdrNode =
+            sdrRegistry.GetShaderNodeFromSourceCode(
+                glslfxSourceCode,
+                HioGlslfxTokens->glslfx,
+                NdrTokenMap()); // metadata
+        HdMaterialNode2 newTerminalNode;
+        newTerminalNode.nodeTypeId = sdrNode->GetIdentifier();
+        newTerminalNode.inputConnections = terminalNode.inputConnections;
+        newTerminalNode.parameters = terminalNode.parameters;
+
+        // Replace the original terminalNode with this newTerminalNode
+        hdNetwork->nodes[terminalNodePath] = newTerminalNode;
     }
+
+    return glslfxShader;
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdSt/materialXFilter.h b/pxr/imaging/hdSt/materialXFilter.h
index adb6cf15f5..df2e349eb8 100644
--- a/pxr/imaging/hdSt/materialXFilter.h
+++ b/pxr/imaging/hdSt/materialXFilter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MATERIALX_FILTER_H
 #define PXR_IMAGING_HD_ST_MATERIALX_FILTER_H
@@ -54,7 +37,7 @@ struct HdSt_MxShaderGenInfo {
 
 /// MaterialX Filter
 /// Converting a MaterialX node to one with a generated MaterialX glslfx file
-void HdSt_ApplyMaterialXFilter(
+MaterialX::ShaderPtr HdSt_ApplyMaterialXFilter(
     HdMaterialNetwork2* hdNetwork,
     SdfPath const& materialPath,
     HdMaterialNode2 const& terminalNode,
@@ -72,4 +55,4 @@ MaterialX::ShaderPtr HdSt_GenMaterialXShader(
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
-#endif
\ No newline at end of file
+#endif
diff --git a/pxr/imaging/hdSt/materialXShaderGen.cpp b/pxr/imaging/hdSt/materialXShaderGen.cpp
index a53d821f10..30674b5219 100644
--- a/pxr/imaging/hdSt/materialXShaderGen.cpp
+++ b/pxr/imaging/hdSt/materialXShaderGen.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/materialXShaderGen.h"
 #include "pxr/imaging/hdSt/materialXFilter.h"
@@ -65,6 +48,9 @@ R"(#if NUM_LIGHTS > 0
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -401,8 +387,10 @@ HdStMaterialXShaderGen<Base>::_EmitMxInitFunction(
     Base::emitComment("Convert HdData to MxData", mxStage);
 
     // Initialize the position of the view in worldspace
-    emitLine("u_viewPosition = vec3(HdGet_worldToViewInverseMatrix()"
-             " * vec4(0.0, 0.0, 0.0, 1.0))", mxStage);
+    if (mxStage.getUniformBlock(mx::HW::PRIVATE_UNIFORMS).find(mx::HW::T_VIEW_POSITION)) {
+        emitLine("u_viewPosition = vec3(HdGet_worldToViewInverseMatrix()"
+            " * vec4(0.0, 0.0, 0.0, 1.0))", mxStage);
+    }
     
     // Calculate the worldspace position, normal and tangent vectors
     const std::string texcoordName =
@@ -413,11 +401,13 @@ HdStMaterialXShaderGen<Base>::_EmitMxInitFunction(
         mxStage);
 
     // Add the vd declaration that translates HdVertexData -> MxVertexData
-    std::string mxVertexDataName = "mx" + vertexData.getName();
-    _EmitMxVertexDataDeclarations(vertexData, mxVertexDataName, 
-                                  vertexData.getInstance(), 
-                                  mx::Syntax::COMMA, mxStage);
-    Base::emitLineBreak(mxStage);
+    if (!vertexData.empty()) {
+        std::string mxVertexDataName = "mx" + vertexData.getName();
+        _EmitMxVertexDataDeclarations(vertexData, mxVertexDataName,
+            vertexData.getInstance(),
+            mx::Syntax::COMMA, mxStage);
+        Base::emitLineBreak(mxStage);
+    }
 
     // Initialize MaterialX parameters with HdGet_ equivalents
     Base::emitComment("Initialize Material Parameters", mxStage);
@@ -504,11 +494,9 @@ HdStMaterialXShaderGen<Base>::_EmitMxVertexDataDeclarations(
     }
 
     for (size_t i = 0; i < block.size(); ++i) {
-        line += _EmitMxVertexDataLine(block[i], separator);
-        // remove the separator from the last data line
-        if (i == block.size() - 1) {
-            line = line.substr(0, line.size() - separator.size());
-        }
+        auto const& lineSeparator =
+            (i == block.size() - 1) ? mx::EMPTY_STRING : separator;
+        line += _EmitMxVertexDataLine(block[i], lineSeparator);
     }
 
     // add ending ) or }
@@ -544,6 +532,10 @@ HdStMaterialXShaderGen<Base>::_EmitMxVertexDataLine(
 
         hdVariableDef  = "HdGet_points()" + separator;
     }
+    else if (mxVariableName.compare(mx::HW::T_NORMAL_OBJECT) == 0) {
+
+        hdVariableDef  = "HdGet_normals()" + separator;
+    }
     else if (mxVariableName.compare(0, mx::HW::T_TEXCOORD.size(), 
                                     mx::HW::T_TEXCOORD) == 0) {
         
@@ -551,12 +543,14 @@ HdStMaterialXShaderGen<Base>::_EmitMxVertexDataLine(
         // the st primvar
         hdVariableDef = TfStringPrintf("\n"
                 "    #ifdef HD_HAS_%s\n"
-                "        HdGet_%s(),\n"
+                "        HdGet_%s()%s\n"
                 "    #else\n"
-                "        %s(0.0),\n"
+                "        %s(0.0)%s\n"
                 "    #endif\n        ", 
                 _defaultTexcoordName.c_str(), _defaultTexcoordName.c_str(),
-                Base::_syntax->getTypeName(variable->getType()).c_str());
+                separator.c_str(),
+                Base::_syntax->getTypeName(variable->getType()).c_str(),
+                separator.c_str());
     }
     else if (mxVariableName.compare(0, mx::HW::T_IN_GEOMPROP.size(), 
                                     mx::HW::T_IN_GEOMPROP) == 0) {
@@ -580,12 +574,14 @@ HdStMaterialXShaderGen<Base>::_EmitMxVertexDataLine(
         }
         hdVariableDef = TfStringPrintf("\n"
                 "    #ifdef HD_HAS_%s\n"
-                "        HdGet_%s(),\n"
+                "        HdGet_%s()%s\n"
                 "    #else\n"
-                "        %s,\n"
+                "        %s%s\n"
                 "    #endif\n        ", 
                 geompropName.c_str(), geompropName.c_str(),
-                defaultValueString.c_str());
+                separator.c_str(),
+                defaultValueString.c_str(),
+                separator.c_str());
     }
     else {
         const std::string valueStr = variable->getValue() 
@@ -688,7 +684,6 @@ HdStMaterialXShaderGen<Base>::_EmitConstantsUniformsAndTypeDefs(
                 mxContext.getOptions().hwDirectionalAlbedoMethod)),
             mxStage, false);
     Base::emitLineBreak(mxStage);
-    Base::emitTypeDefinitions(mxContext, mxStage);
 
     // Add all constants and ensure that values are initialized
     const mx::VariableBlock& constants = mxStage.getConstantBlock();
@@ -769,11 +764,11 @@ HdStMaterialXShaderGen<Base>::_EmitDataStructsAndFunctionDefinitions(
         emitLine(mxVertexDataName + " " + vertexData.getInstance(), mxStage);
         Base::emitLineBreak(mxStage);
         Base::emitLineBreak(mxStage);
-
-        // add the mxInit function to convert Hd -> Mx data
-        _EmitMxInitFunction(vertexData, mxStage);
     }
 
+    // add the mxInit function to convert Hd -> Mx data
+    _EmitMxInitFunction(vertexData, mxStage);
+
     // Emit lighting and shadowing code
     if (lighting) {
         Base::emitSpecularEnvironment(mxContext, mxStage);
@@ -835,7 +830,7 @@ HdStMaterialXShaderGen<Base>::_EmitDataStructsAndFunctionDefinitions(
 }
 
 // ----------------------------------------------------------------------------
-//                          HdSt MaterialX ShaderGen GLSL
+//                          HdSt MaterialX ShaderGen OpenGL GLSL
 // ----------------------------------------------------------------------------
 
 namespace {
@@ -941,6 +936,10 @@ HdStMaterialXShaderGenGlsl::_EmitMxFunctions(
     mx::ShaderGenerator::emitLibraryInclude(
         "stdlib/" + mx::GlslShaderGenerator::TARGET
         + "/lib/mx_math.glsl", mxContext, mxStage);
+
+    // Add type definitions
+    emitTypeDefinitions(mxContext, mxStage);
+
     _EmitConstantsUniformsAndTypeDefs(
         mxContext, mxStage, _syntax->getConstantQualifier());
 
@@ -984,6 +983,157 @@ HdStMaterialXShaderGenGlsl::_EmitMxFunctions(
         mxGraph, mxContext, mxStage, &_tokenSubstitutions);
 }
 
+// ----------------------------------------------------------------------------
+//                    HdSt MaterialX ShaderGen Vulkan GLSL
+// ----------------------------------------------------------------------------
+
+namespace {
+    // Create a customized version of the class mx::SurfaceNodeGlsl
+    // to be able to notify the shader generator when we start/end
+    // emitting the code for the SurfaceNode
+    class HdStMaterialXSurfaceNodeGenVkGlsl : public mx::SurfaceNodeGlsl
+    {
+    public:
+        static mx::ShaderNodeImplPtr create() {
+            return std::make_shared<HdStMaterialXSurfaceNodeGenVkGlsl>();
+        }
+
+        void emitFunctionCall(
+            const mx::ShaderNode& node, 
+            mx::GenContext& context,
+            mx::ShaderStage& stage) const override
+        {
+            HdStMaterialXShaderGenVkGlsl& shadergen =
+                static_cast<HdStMaterialXShaderGenVkGlsl&>(
+                    context.getShaderGenerator());
+            
+            shadergen.SetEmittingSurfaceNode(true);
+            mx::SurfaceNodeGlsl::emitFunctionCall(node, context, stage);
+            shadergen.SetEmittingSurfaceNode(false);
+        }
+    };
+}
+
+template<>
+HdStMaterialXShaderGen<mx::VkShaderGenerator>::HdStMaterialXShaderGen(
+    HdSt_MxShaderGenInfo const& mxHdInfo)
+    : mx::VkShaderGenerator(),
+      _mxHdTextureMap(mxHdInfo.textureMap),
+      _mxHdPrimvarMap(mxHdInfo.primvarMap),
+      _mxHdPrimvarDefaultValueMap(mxHdInfo.primvarDefaultValueMap),
+      _materialTag(mxHdInfo.materialTag),
+      _bindlessTexturesEnabled(mxHdInfo.bindlessTexturesEnabled),
+      _emittingSurfaceNode(false)
+{
+    _defaultTexcoordName =
+        (mxHdInfo.defaultTexcoordName == mx::EMPTY_STRING)
+            ? "st" : mxHdInfo.defaultTexcoordName;
+
+}
+
+HdStMaterialXShaderGenVkGlsl::HdStMaterialXShaderGenVkGlsl(
+    HdSt_MxShaderGenInfo const& mxHdInfo)
+    : HdStMaterialXShaderGen<mx::VkShaderGenerator>(mxHdInfo)
+{
+    // Register the customized version of the Surface node generator
+    registerImplementation("IM_surface_" + mx::VkShaderGenerator::TARGET,
+        HdStMaterialXSurfaceNodeGenVkGlsl::create);
+}
+
+// Based on GlslShaderGenerator::generate()
+// Generates a glslfx shader and stores that in the pixel shader stage where it
+// can be retrieved with getSourceCode()
+mx::ShaderPtr
+HdStMaterialXShaderGenVkGlsl::generate(
+    const std::string& shaderName,
+    mx::ElementPtr mxElement,
+    mx::GenContext & mxContext) const
+{
+    mx::ShaderPtr shader = createShader(shaderName, mxElement, mxContext);
+
+    // Turn on fixed float formatting to make sure float values are
+    // emitted with a decimal point and not as integers, and to avoid
+    // any scientific notation which isn't supported by all OpenGL targets.
+    mx::ScopedFloatFormatting fmt(mx::Value::FloatFormatFixed);
+
+    // Create the glslfx (Pixel) Shader
+    mx::ShaderStage& shaderStage = shader->getStage(mx::Stage::PIXEL);
+    _EmitGlslfxShader(shader->getGraph(), mxContext, shaderStage);
+    replaceTokens(_tokenSubstitutions, shaderStage);
+    return shader;
+}
+
+void
+HdStMaterialXShaderGenVkGlsl::_EmitGlslfxShader(
+    const mx::ShaderGraph& mxGraph,
+    mx::GenContext& mxContext,
+    mx::ShaderStage& mxStage) const
+{
+    // Add a per-light shadowOcclusion value to the lightData uniform block
+    addStageUniform(mx::HW::LIGHT_DATA, mx::Type::FLOAT,
+        "shadowOcclusion", mxStage);
+
+    _EmitGlslfxHeader(mxStage);
+    _EmitMxFunctions(mxGraph, mxContext, mxStage);
+    _EmitMxSurfaceShader(mxGraph, mxContext, mxStage);
+}
+
+// Similar to GlslShaderGenerator::emitPixelStage() with alterations and
+// additions to match Pxr's codeGen
+void
+HdStMaterialXShaderGenVkGlsl::_EmitMxFunctions(
+    const mx::ShaderGraph& mxGraph,
+    mx::GenContext& mxContext,
+    mx::ShaderStage& mxStage) const
+{
+    emitLibraryInclude("stdlib/" + mx::VkShaderGenerator::TARGET
+                       + "/lib/mx_math.glsl", mxContext, mxStage);
+
+    // Add type definitions
+    emitTypeDefinitions(mxContext, mxStage);
+
+    _EmitConstantsUniformsAndTypeDefs(
+        mxContext, mxStage, _syntax->getConstantQualifier());
+
+    // If bindlessTextures are not enabled, the above for loop skips
+    // initializing textures. Initialize them here by defining mappings
+    // to the appropriate HdGetSampler function.
+    if (!_bindlessTexturesEnabled) {
+
+        // Define mappings for the DomeLight Textures
+        emitLine("#ifdef HD_HAS_domeLightIrradiance", mxStage, false);
+        emitLine("#define u_envRadiance "
+                 "HdGetSampler_domeLightPrefilter() ", mxStage, false);
+        emitLine("#define u_envIrradiance "
+                "HdGetSampler_domeLightIrradiance() ", mxStage, false);
+        emitLine("#else", mxStage, false);
+        emitLine("#define u_envRadiance "
+                "HdGetSampler_domeLightFallback()", mxStage, false);
+        emitLine("#define u_envIrradiance "
+                "HdGetSampler_domeLightFallback()", mxStage, false);
+        emitLine("#endif", mxStage, false);
+        emitLineBreak(mxStage);
+
+        // Define mappings for the MaterialX Textures
+        if (!_mxHdTextureMap.empty()) {
+            emitComment("Define MaterialX to Hydra Sampler mappings", mxStage);
+            for (mx::StringMap::const_reference texturePair : _mxHdTextureMap) {
+                if (texturePair.first == "domeLightFallback") {
+                    continue;
+                }
+                emitLine(TfStringPrintf(
+                    "#define %s HdGetSampler_%s()",
+                        texturePair.first.c_str(),
+                        texturePair.second.c_str()),
+                    mxStage, false);
+            }
+            emitLineBreak(mxStage);
+        }
+    }
+
+    _EmitDataStructsAndFunctionDefinitions(
+        mxGraph, mxContext, mxStage, &_tokenSubstitutions);
+}
 
 // ----------------------------------------------------------------------------
 //                          HdSt MaterialX ShaderGen Metal
@@ -1103,6 +1253,8 @@ HdStMaterialXShaderGenMsl::_EmitGlslfxMetalShader(
         "shadowOcclusion", mxStage);
 
     // Add type definitions
+    emitTypeDefinitions(mxContext, mxStage);
+
     emitConstantBufferDeclarations(mxContext, resourceBindingCtx, mxStage);
 
     // Add all constants
diff --git a/pxr/imaging/hdSt/materialXShaderGen.h b/pxr/imaging/hdSt/materialXShaderGen.h
index dcf3151492..e61bd13a43 100644
--- a/pxr/imaging/hdSt/materialXShaderGen.h
+++ b/pxr/imaging/hdSt/materialXShaderGen.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MATERIALX_SHADER_GEN_H
 #define PXR_IMAGING_HD_ST_MATERIALX_SHADER_GEN_H
@@ -28,6 +11,7 @@
 
 #include <MaterialXGenGlsl/GlslShaderGenerator.h>
 #include <MaterialXGenMsl/MslShaderGenerator.h>
+#include <MaterialXGenGlsl/VkShaderGenerator.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -118,7 +102,7 @@ class HdStMaterialXShaderGen : public Base
 /// \class HdStMaterialXShaderGenGlsl
 ///
 /// Generates a glslfx shader with a surfaceShader function for a MaterialX 
-/// network
+/// network, targeting OpenGL GLSL.
 
 class HdStMaterialXShaderGenGlsl
     : public HdStMaterialXShaderGen<MaterialX::GlslShaderGenerator>
@@ -145,11 +129,40 @@ class HdStMaterialXShaderGenGlsl
                           MaterialX::ShaderStage& mxStage) const;
 };
 
+/// \class HdStMaterialXShaderGenVkGlsl
+///
+/// Generates a glslfx shader with a surfaceShader function for a MaterialX 
+/// network, targeting Vulkan GLSL.
+
+class HdStMaterialXShaderGenVkGlsl
+    : public HdStMaterialXShaderGen<MaterialX::VkShaderGenerator>
+{
+public:
+    HdStMaterialXShaderGenVkGlsl(HdSt_MxShaderGenInfo const& mxHdInfo);
+    
+    static MaterialX::ShaderGeneratorPtr create(
+            HdSt_MxShaderGenInfo const& mxHdInfo) {
+        return std::make_shared<HdStMaterialXShaderGenVkGlsl>(mxHdInfo);
+    }
+    
+    MaterialX::ShaderPtr generate(const std::string& shaderName,
+                           MaterialX::ElementPtr mxElement,
+                           MaterialX::GenContext& mxContext) const override;
+
+private:
+    void _EmitGlslfxShader(const MaterialX::ShaderGraph& mxGraph,
+                           MaterialX::GenContext& mxContext,
+                           MaterialX::ShaderStage& mxStage) const;
+
+    void _EmitMxFunctions(const MaterialX::ShaderGraph& mxGraph,
+                          MaterialX::GenContext& mxContext,
+                          MaterialX::ShaderStage& mxStage) const;
+};
 
 /// \class HdStMaterialXShaderGenMsl
 ///
-/// Generates a Glslfx shader with some additional Metal code, and a 
-/// surfaceShader function for a MaterialX network
+/// Generates a glslfx shader with a surfaceShader function for a MaterialX 
+/// network, targeting Metal Shading Language.
 
 class HdStMaterialXShaderGenMsl
     : public HdStMaterialXShaderGen<MaterialX::MslShaderGenerator>
diff --git a/pxr/imaging/hdSt/mesh.cpp b/pxr/imaging/hdSt/mesh.cpp
index d93620b7f5..59f27ff75f 100644
--- a/pxr/imaging/hdSt/mesh.cpp
+++ b/pxr/imaging/hdSt/mesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
@@ -1871,6 +1854,14 @@ HdStMesh::_PopulateFaceVaryingPrimvars(HdSceneDelegate *sceneDelegate,
             if (doRefine) {
                 channel = 
                     _fvarTopologyTracker->GetChannelFromPrimvar(primvar.name);
+
+                // Invalid fvar topologies may have been skipped when
+                // processed by _GatherFaceVaryingTopologies() in which
+                // case a validation warning will have been posted already
+                // and we should skip further refinement here.
+                if (channel < 0) {
+                    continue;
+                }
             }
 
             source = _RefineOrQuadrangulateOrTriangulateFaceVaryingPrimvar(
diff --git a/pxr/imaging/hdSt/mesh.h b/pxr/imaging/hdSt/mesh.h
index 68700233d8..0a62d4f974 100644
--- a/pxr/imaging/hdSt/mesh.h
+++ b/pxr/imaging/hdSt/mesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MESH_H
 #define PXR_IMAGING_HD_ST_MESH_H
diff --git a/pxr/imaging/hdSt/meshShaderKey.cpp b/pxr/imaging/hdSt/meshShaderKey.cpp
index 556c2d3c42..7b311ba710 100644
--- a/pxr/imaging/hdSt/meshShaderKey.cpp
+++ b/pxr/imaging/hdSt/meshShaderKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
@@ -110,6 +93,7 @@ TF_DEFINE_PRIVATE_TOKENS(
 
     // main for all the shader stages
     ((mainVS,                      "Mesh.Vertex"))
+    ((mainPatchCommonTCS,          "Mesh.TessControl.PatchCommon"))
     ((mainBSplineQuadTCS,          "Mesh.TessControl.BSplineQuad"))
     ((mainBezierQuadTES,           "Mesh.TessEval.BezierQuad"))
     ((mainBoxSplineTriangleTCS,    "Mesh.TessControl.BoxSplineTriangle"))
@@ -118,6 +102,7 @@ TF_DEFINE_PRIVATE_TOKENS(
     ((mainTrianglePTVS,            "Mesh.PostTessVertex.Triangle"))
     ((mainQuadPTVS,                "Mesh.PostTessVertex.Quad"))
     ((mainTriQuadPTVS,             "Mesh.PostTessVertex.TriQuad"))
+    ((mainPatchCommonPTCS,         "Mesh.PostTessControl.PatchCommon"))
     ((mainBSplineQuadPTCS,         "Mesh.PostTessControl.BSplineQuad"))
     ((mainBSplineQuadPTVS,         "Mesh.PostTessVertex.BSplineQuad"))
     ((mainBoxSplineTrianglePTCS,   "Mesh.PostTessControl.BoxSplineTriangle"))
@@ -347,10 +332,12 @@ HdSt_MeshShaderKey::HdSt_MeshShaderKey(
             PTVS[ptvsIndex++] = _tokens->mainTriQuadPTVS;
         } else if (isPrimTypePatchesBSpline) {
             PTCS[ptcsIndex++] = _tokens->instancing;
+            PTCS[ptcsIndex++] = _tokens->mainPatchCommonPTCS;
             PTCS[ptcsIndex++] = _tokens->mainBSplineQuadPTCS;
             PTVS[ptvsIndex++] = _tokens->mainBSplineQuadPTVS;
         } else if (isPrimTypePatchesBoxSplineTriangle) {
             PTCS[ptcsIndex++] = _tokens->instancing;
+            PTCS[ptcsIndex++] = _tokens->mainPatchCommonPTCS;
             PTCS[ptcsIndex++] = _tokens->mainBoxSplineTrianglePTCS;
             PTVS[ptvsIndex++] = _tokens->mainBoxSplineTrianglePTVS;
         }
@@ -362,22 +349,24 @@ HdSt_MeshShaderKey::HdSt_MeshShaderKey(
     bool const ptvsStageEnabled = !PTVS[0].IsEmpty();
 
     // tessellation control shader
-    if (!ptvsStageEnabled) {
-        TCS[0] = isPrimTypePatches ? _tokens->instancing : TfToken();
-        TCS[1] = isPrimTypePatches ? isPrimTypePatchesBSpline
-                                     ? _tokens->mainBSplineQuadTCS
-                                     : _tokens->mainBoxSplineTriangleTCS
-                                   : TfToken();
-        TCS[2] = TfToken();
+    if (isPrimTypePatches && !ptvsStageEnabled) {
+        TCS[0] = _tokens->instancing;
+        TCS[1] = _tokens->mainPatchCommonTCS;
+        TCS[2] = isPrimTypePatchesBSpline
+                     ? _tokens->mainBSplineQuadTCS
+                     : _tokens->mainBoxSplineTriangleTCS;
+        TCS[3] = TfToken();
 
         // tessellation evaluation shader
-        TES[0] = isPrimTypePatches ? _tokens->instancing : TfToken();
-        TES[1] = isPrimTypePatches ? isPrimTypePatchesBSpline
-                                     ? _tokens->mainBezierQuadTES
-                                     : _tokens->mainBezierTriangleTES
-                                   : TfToken();
-        TES[2] = isPrimTypePatches ? _tokens->mainVaryingInterpTES : TfToken();
+        TES[0] = _tokens->instancing;
+        TES[1] = isPrimTypePatchesBSpline
+                     ? _tokens->mainBezierQuadTES
+                     : _tokens->mainBezierTriangleTES;
+        TES[2] = _tokens->mainVaryingInterpTES;
         TES[3] = TfToken();
+    } else {
+        TCS[0] = TfToken();
+        TES[0] = TfToken();
     }
 
     // geometry shader
diff --git a/pxr/imaging/hdSt/meshShaderKey.h b/pxr/imaging/hdSt/meshShaderKey.h
index 7783212498..51c045eeb3 100644
--- a/pxr/imaging/hdSt/meshShaderKey.h
+++ b/pxr/imaging/hdSt/meshShaderKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MESH_SHADER_KEY_H
 #define PXR_IMAGING_HD_ST_MESH_SHADER_KEY_H
@@ -118,9 +101,9 @@ struct HdSt_MeshShaderKey : public HdSt_ShaderKey
 
     TfToken glslfx;
     TfToken VS[7];
-    TfToken TCS[3];
+    TfToken TCS[4];
     TfToken TES[4];
-    TfToken PTCS[5];
+    TfToken PTCS[4];
     TfToken PTVS[12];
     TfToken GS[10];
     TfToken FS[22];
diff --git a/pxr/imaging/hdSt/meshTopology.cpp b/pxr/imaging/hdSt/meshTopology.cpp
index 368c4d2da3..6c931d12a0 100644
--- a/pxr/imaging/hdSt/meshTopology.cpp
+++ b/pxr/imaging/hdSt/meshTopology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdSt/meshTopology.h b/pxr/imaging/hdSt/meshTopology.h
index b76ae49a88..87fc5c9a0d 100644
--- a/pxr/imaging/hdSt/meshTopology.h
+++ b/pxr/imaging/hdSt/meshTopology.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_MESH_TOPOLOGY_H
 #define PXR_IMAGING_HD_ST_MESH_TOPOLOGY_H
diff --git a/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.cpp b/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.cpp
index c93799066c..5eaaced530 100644
--- a/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.cpp
+++ b/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.h"
 
diff --git a/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.h b/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.h
index 0b246ba6c5..8f297004e3 100644
--- a/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.h
+++ b/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HD_ST_NODE_IDENTIFIER_RESOLVING_SCENE_INDEX_H
 #define PXR_IMAGING_HD_ST_NODE_IDENTIFIER_RESOLVING_SCENE_INDEX_H
 
diff --git a/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndexPlugin.cpp b/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndexPlugin.cpp
index c1965fec5a..8c4e151f28 100644
--- a/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndexPlugin.cpp
+++ b/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #include "nodeIdentifierResolvingSceneIndexPlugin.h"
 
 #include "nodeIdentifierResolvingSceneIndex.h"
diff --git a/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndexPlugin.h b/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndexPlugin.h
index eca863849f..a876c8d751 100644
--- a/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndexPlugin.h
+++ b/pxr/imaging/hdSt/nodeIdentifierResolvingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HD_ST_NODE_IDENTIFIER_RESOLVING_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_ST_NODE_IDENTIFIER_RESOLVING_SCENE_INDEX_PLUGIN_H
 
diff --git a/pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.cpp b/pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.cpp
index be261ef0cf..fa30681097 100644
--- a/pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.cpp
+++ b/pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #include "pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.h"
 
 #include "pxr/imaging/hdsi/nurbsApproximatingSceneIndex.h"
diff --git a/pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.h b/pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.h
index f907f938d3..80eb9499c2 100644
--- a/pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.h
+++ b/pxr/imaging/hdSt/nurbsApproximatingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HD_ST_NURBS_APPROXIMATING_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_ST_NURBS_APPROXIMATING_SCENE_INDEX_PLUGIN_H
 
diff --git a/pxr/imaging/hdSt/package.cpp b/pxr/imaging/hdSt/package.cpp
index f60609bc6e..60e8225657 100644
--- a/pxr/imaging/hdSt/package.cpp
+++ b/pxr/imaging/hdSt/package.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/package.h"
 
diff --git a/pxr/imaging/hdSt/package.h b/pxr/imaging/hdSt/package.h
index a107b40546..219be7f4d1 100644
--- a/pxr/imaging/hdSt/package.h
+++ b/pxr/imaging/hdSt/package.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_PACKAGE_H
 #define PXR_IMAGING_HD_ST_PACKAGE_H
diff --git a/pxr/imaging/hdSt/pch.h b/pxr/imaging/hdSt/pch.h
index 196960f7b7..1b066a9637 100644
--- a/pxr/imaging/hdSt/pch.h
+++ b/pxr/imaging/hdSt/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -28,9 +11,19 @@
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
 #if defined(ARCH_OS_DARWIN)
+#include <glob.h>
+#include <limits.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <unistd.h>
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <glob.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/statfs.h>
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -40,12 +33,14 @@
 
 #include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <io.h>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
+#include <cassert>
 #include <cctype>
 #include <cfloat>
 #include <cinttypes>
@@ -59,10 +54,12 @@
 #include <cstdlib>
 #include <cstring>
 #include <deque>
+#include <fcntl.h>
 #include <float.h>
 #include <fstream>
 #include <functional>
 #include <initializer_list>
+#include <inttypes.h>
 #include <iosfwd>
 #include <iostream>
 #include <iterator>
@@ -74,12 +71,18 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <set>
+#include <shared_mutex>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
 #include <tuple>
@@ -90,52 +93,21 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/pointer_cast.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
+#include <MaterialXCore/Library.h>
+#include <MaterialXCore/Value.h>
+#include <MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.h>
+#include <MaterialXGenMsl/MslResourceBindingContext.h>
+#include <MaterialXGenMsl/MslShaderGenerator.h>
+#include <MaterialXGenMsl/Nodes/SurfaceNodeMsl.h>
+#include <MaterialXGenShader/DefaultColorManagementSystem.h>
+#include <MaterialXGenShader/Shader.h>
+#include <MaterialXGenShader/ShaderGenerator.h>
+#include <MaterialXGenShader/Syntax.h>
+#include <MaterialXGenShader/Util.h>
+#include <MaterialXRender/LightHandler.h>
+#include <MaterialXRender/Util.h>
+#endif // PXR_MATERIALX_SUPPORT_ENABLED
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -144,43 +116,24 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
 #include <opensubdiv/far/patchTable.h>
 #include <opensubdiv/far/patchTableFactory.h>
 #include <opensubdiv/far/stencilTable.h>
 #include <opensubdiv/far/stencilTableFactory.h>
 #include <opensubdiv/far/topologyRefiner.h>
-#include <opensubdiv/osd/cpuEvaluator.h>
-#include <opensubdiv/osd/cpuVertexBuffer.h>
-#include <opensubdiv/osd/mesh.h>
 #include <opensubdiv/version.h>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
+#include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_for_each.h>
 #include <tbb/spin_mutex.h>
-#include <tbb/task.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hdSt/pipelineDrawBatch.cpp b/pxr/imaging/hdSt/pipelineDrawBatch.cpp
index ea77c9719a..6a9c2cc6b5 100644
--- a/pxr/imaging/hdSt/pipelineDrawBatch.cpp
+++ b/pxr/imaging/hdSt/pipelineDrawBatch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/pipelineDrawBatch.h"
 
@@ -1672,6 +1655,7 @@ HdSt_PipelineDrawBatch::_ExecuteFrustumCull(
         GfMatrix4f cullMatrix;
         GfVec2f drawRangeNDC;
         uint32_t drawCommandNumUints;
+        uint32_t indexEnd;
     };
 
     // We perform frustum culling in a compute shader, stomping the
@@ -1746,17 +1730,19 @@ HdSt_PipelineDrawBatch::_ExecuteFrustumCull(
     HdStBufferResourceSharedPtr paramBuffer = _dispatchBuffer->
         GetBufferArrayRange()->GetResource(HdTokens->drawDispatch);
 
+    int const inputCount = _dispatchBufferCullInput->GetCount();
+
     // set instanced cull parameters
     Uniforms cullParams;
     cullParams.cullMatrix = cullMatrix;
     cullParams.drawRangeNDC = drawRangeNdc;
     cullParams.drawCommandNumUints = _dispatchBuffer->GetCommandNumUints();
+    cullParams.indexEnd = inputCount;
 
     computeCmds->SetConstantValues(
         psoHandle, 0,
         sizeof(Uniforms), &cullParams);
 
-    int const inputCount = _dispatchBufferCullInput->GetCount();
     computeCmds->Dispatch(inputCount, 1);
     computeCmds->PopDebugGroup();
 
diff --git a/pxr/imaging/hdSt/pipelineDrawBatch.h b/pxr/imaging/hdSt/pipelineDrawBatch.h
index 647f7e487c..55637eee8a 100644
--- a/pxr/imaging/hdSt/pipelineDrawBatch.h
+++ b/pxr/imaging/hdSt/pipelineDrawBatch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_PIPELINE_DRAW_BATCH_H
 #define PXR_IMAGING_HD_ST_PIPELINE_DRAW_BATCH_H
diff --git a/pxr/imaging/hdSt/plugInfo.json b/pxr/imaging/hdSt/plugInfo.json
index 3c13956b04..66a94cd835 100644
--- a/pxr/imaging/hdSt/plugInfo.json
+++ b/pxr/imaging/hdSt/plugInfo.json
@@ -50,6 +50,12 @@
                         "loadWithRenderer" : "GL",
                         "priority": 0,
                         "displayName": "Scene Index to convert tet meshes into standard triangle based meshes."
+                    },
+                    "HdSt_VelocityMotionResolvingSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "GL",
+                        "priority": 0,
+                        "displayName": "Scene index to resolve velocity-based motion."
                     }
                 },
                 "ShaderResources": "shaders"
diff --git a/pxr/imaging/hdSt/points.cpp b/pxr/imaging/hdSt/points.cpp
index 37893c6556..1102458600 100644
--- a/pxr/imaging/hdSt/points.cpp
+++ b/pxr/imaging/hdSt/points.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdSt/points.h b/pxr/imaging/hdSt/points.h
index 871ec507d0..2d373c71a6 100644
--- a/pxr/imaging/hdSt/points.h
+++ b/pxr/imaging/hdSt/points.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_POINTS_H
 #define PXR_IMAGING_HD_ST_POINTS_H
diff --git a/pxr/imaging/hdSt/pointsShaderKey.cpp b/pxr/imaging/hdSt/pointsShaderKey.cpp
index 78e920d844..bcb5456da1 100644
--- a/pxr/imaging/hdSt/pointsShaderKey.cpp
+++ b/pxr/imaging/hdSt/pointsShaderKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/pointsShaderKey.h"
diff --git a/pxr/imaging/hdSt/pointsShaderKey.h b/pxr/imaging/hdSt/pointsShaderKey.h
index a917fc594d..be71588de8 100644
--- a/pxr/imaging/hdSt/pointsShaderKey.h
+++ b/pxr/imaging/hdSt/pointsShaderKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_POINTS_SHADER_KEY_H
 #define PXR_IMAGING_HD_ST_POINTS_SHADER_KEY_H
diff --git a/pxr/imaging/hdSt/primUtils.cpp b/pxr/imaging/hdSt/primUtils.cpp
index 00d3a36d7b..a715d2accb 100644
--- a/pxr/imaging/hdSt/primUtils.cpp
+++ b/pxr/imaging/hdSt/primUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/primUtils.h"
diff --git a/pxr/imaging/hdSt/primUtils.h b/pxr/imaging/hdSt/primUtils.h
index 6da20ccd7d..683a02d994 100644
--- a/pxr/imaging/hdSt/primUtils.h
+++ b/pxr/imaging/hdSt/primUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_PRIM_UTILS_H
 #define PXR_IMAGING_HD_ST_PRIM_UTILS_H
diff --git a/pxr/imaging/hdSt/ptexMipmapTextureLoader.cpp b/pxr/imaging/hdSt/ptexMipmapTextureLoader.cpp
index 1d976e464c..5356322e32 100644
--- a/pxr/imaging/hdSt/ptexMipmapTextureLoader.cpp
+++ b/pxr/imaging/hdSt/ptexMipmapTextureLoader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/ptexMipmapTextureLoader.h"
 
diff --git a/pxr/imaging/hdSt/ptexMipmapTextureLoader.h b/pxr/imaging/hdSt/ptexMipmapTextureLoader.h
index 2cd928e703..935f727e72 100644
--- a/pxr/imaging/hdSt/ptexMipmapTextureLoader.h
+++ b/pxr/imaging/hdSt/ptexMipmapTextureLoader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HDST_PTEX_MIPMAP_TEXTURE_LOADER_H
 #define HDST_PTEX_MIPMAP_TEXTURE_LOADER_H
diff --git a/pxr/imaging/hdSt/ptexTextureObject.cpp b/pxr/imaging/hdSt/ptexTextureObject.cpp
index f31424c698..91c5b84fbb 100644
--- a/pxr/imaging/hdSt/ptexTextureObject.cpp
+++ b/pxr/imaging/hdSt/ptexTextureObject.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/ptexTextureObject.h"
 
@@ -212,6 +195,11 @@ HdStPtexTextureObject::_Load()
         hioFormat,
         /* premultiplyAlpha = */ false);
 
+    if (_format == HgiFormatInvalid) {
+        TF_WARN("Unsupported texture format for PTEX");
+        return;
+    }
+
     const HdStTextureUtils::ConversionFunction conversionFunction =
         HdStTextureUtils::GetHioToHgiConversion(
             hioFormat,
@@ -336,10 +324,10 @@ HdStPtexTextureObject::IsValid() const
     return _format != HgiFormatInvalid;
 }
 
-HdTextureType
+HdStTextureType
 HdStPtexTextureObject::GetTextureType() const
 {
-    return HdTextureType::Ptex;
+    return HdStTextureType::Ptex;
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdSt/ptexTextureObject.h b/pxr/imaging/hdSt/ptexTextureObject.h
index 198a2fb568..ac73d798af 100644
--- a/pxr/imaging/hdSt/ptexTextureObject.h
+++ b/pxr/imaging/hdSt/ptexTextureObject.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_PTEX_TEXTURE_OBJECT_H
 #define PXR_IMAGING_HD_ST_PTEX_TEXTURE_OBJECT_H
@@ -83,7 +66,7 @@ class HdStPtexTextureObject final : public HdStTextureObject
     bool IsValid() const override;
 
     HDST_API
-    HdTextureType GetTextureType() const override;
+    HdStTextureType GetTextureType() const override;
 
 protected:
     HDST_API
@@ -110,7 +93,7 @@ class HdStPtexTextureObject final : public HdStTextureObject
 };
 
 template<>
-struct HdSt_TypedTextureObjectHelper<HdTextureType::Ptex> {
+struct HdSt_TypedTextureObjectHelper<HdStTextureType::Ptex> {
     using type = HdStPtexTextureObject;
 };
 
diff --git a/pxr/imaging/hdSt/quadrangulate.cpp b/pxr/imaging/hdSt/quadrangulate.cpp
index 9d5466dcea..e554ab757f 100644
--- a/pxr/imaging/hdSt/quadrangulate.cpp
+++ b/pxr/imaging/hdSt/quadrangulate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
@@ -609,8 +592,8 @@ HdSt_QuadrangulateComputationGPU::Execute(
     // Generate hash for resource bindings and pipeline.
     // XXX Needs fingerprint hash to avoid collisions
     uint64_t rbHash = (uint64_t) TfHash::Combine(
-        primvar->GetHandle().Get(),
-        quadrangulateTable->GetHandle().Get());
+        primvar->GetHandle().GetId(),
+        quadrangulateTable->GetHandle().GetId());
 
     uint64_t pHash = (uint64_t) TfHash::Combine(
         computeProgram->GetProgram().Get(),
diff --git a/pxr/imaging/hdSt/quadrangulate.h b/pxr/imaging/hdSt/quadrangulate.h
index b338c3b320..9aad28c7fe 100644
--- a/pxr/imaging/hdSt/quadrangulate.h
+++ b/pxr/imaging/hdSt/quadrangulate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_QUADRANGULATE_H
 #define PXR_IMAGING_HD_ST_QUADRANGULATE_H
diff --git a/pxr/imaging/hdSt/renderBuffer.cpp b/pxr/imaging/hdSt/renderBuffer.cpp
index 3e0d496bc9..3f25575388 100644
--- a/pxr/imaging/hdSt/renderBuffer.cpp
+++ b/pxr/imaging/hdSt/renderBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/renderBuffer.h"
 
@@ -37,16 +20,18 @@ PXR_NAMESPACE_OPEN_SCOPE
 static 
 HgiTextureUsage _GetTextureUsage(HdFormat format, TfToken const &name)
 {
+    // We are assuming at some point in a render buffer's lifetime it could be
+    // used to read from, so provide that ability to the render buffer. This is 
+    // especially useful for the HgiVulkan backend.
+
     if (HdAovHasDepthSemantic(name)) {
-        return HgiTextureUsageBitsDepthTarget;
+        return HgiTextureUsageBitsDepthTarget | HgiTextureUsageBitsShaderRead;
     } else if (HdAovHasDepthStencilSemantic(name)) {
         return HgiTextureUsageBitsDepthTarget |
-               HgiTextureUsageBitsStencilTarget;
+               HgiTextureUsageBitsStencilTarget |
+               HgiTextureUsageBitsShaderRead;
     }
 
-    // We are assuming at some point in a render buffer's lifetime it could be
-    // used to read from, so provide that ability to the render buffer. This is 
-    // especially useful when for the HgiVulkan back-end.
     return HgiTextureUsageBitsColorTarget | HgiTextureUsageBitsShaderRead;
 }
 
@@ -146,7 +131,7 @@ HdStRenderBuffer::Allocate(
             std::dynamic_pointer_cast<HdStDynamicUvTextureObject>(
                 _resourceRegistry->AllocateTextureObject(
                     GetTextureIdentifier(/*multiSampled = */ false),
-                    HdTextureType::Uv));
+                    HdStTextureType::Uv));
         if (!_textureObject) {
             TF_CODING_ERROR("Expected HdStDynamicUvTextureObject");
             return false;
@@ -160,7 +145,7 @@ HdStRenderBuffer::Allocate(
                 std::dynamic_pointer_cast<HdStDynamicUvTextureObject>(
                     _resourceRegistry->AllocateTextureObject(
                         GetTextureIdentifier(/*multiSampled = */ true),
-                        HdTextureType::Uv));
+                        HdStTextureType::Uv));
             if (!_textureMSAAObject) {
                 TF_CODING_ERROR("Expected HdStDynamicUvTextureObject");
                 return false;
diff --git a/pxr/imaging/hdSt/renderBuffer.h b/pxr/imaging/hdSt/renderBuffer.h
index 690d2365d9..9b9ca30d29 100644
--- a/pxr/imaging/hdSt/renderBuffer.h
+++ b/pxr/imaging/hdSt/renderBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_RENDER_BUFFER_H
 #define PXR_IMAGING_HD_ST_RENDER_BUFFER_H
diff --git a/pxr/imaging/hdSt/renderDelegate.cpp b/pxr/imaging/hdSt/renderDelegate.cpp
index ab9975221e..37d22c5127 100644
--- a/pxr/imaging/hdSt/renderDelegate.cpp
+++ b/pxr/imaging/hdSt/renderDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/renderDelegate.h"
@@ -259,10 +242,10 @@ HdStRenderDelegate::SetDrivers(HdDriverVector const& drivers)
         }
     }
     
+    TF_VERIFY(_hgi, "HdSt requires Hgi HdDriver");
+
     _resourceRegistry =
         _HgiToResourceRegistryMap::GetInstance().GetOrCreateRegistry(_hgi);
-
-    TF_VERIFY(_hgi, "HdSt requires Hgi HdDriver");
 }
 
 const TfTokenVector &
@@ -599,7 +582,7 @@ HdStRenderDelegate::_ApplyTextureSettings()
                      HdStVolume::defaultMaxTextureMemoryPerField));
 
     _resourceRegistry->SetMemoryRequestForTextureType(
-        HdTextureType::Field, 1048576 * memInMb);
+        HdStTextureType::Field, 1048576 * memInMb);
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdSt/renderDelegate.h b/pxr/imaging/hdSt/renderDelegate.h
index 3ef5303542..fdf305be0b 100644
--- a/pxr/imaging/hdSt/renderDelegate.h
+++ b/pxr/imaging/hdSt/renderDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HD_ST_RENDER_DELEGATE_H
 #define PXR_IMAGING_HD_ST_RENDER_DELEGATE_H
 
diff --git a/pxr/imaging/hdSt/renderParam.cpp b/pxr/imaging/hdSt/renderParam.cpp
index 982deb171b..2f6617b040 100644
--- a/pxr/imaging/hdSt/renderParam.cpp
+++ b/pxr/imaging/hdSt/renderParam.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/renderParam.h"
diff --git a/pxr/imaging/hdSt/renderParam.h b/pxr/imaging/hdSt/renderParam.h
index 741d2314a0..711e7be7f5 100644
--- a/pxr/imaging/hdSt/renderParam.h
+++ b/pxr/imaging/hdSt/renderParam.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_ST_RENDER_PARAM_H
 #define PXR_IMAGING_PLUGIN_HD_ST_RENDER_PARAM_H
diff --git a/pxr/imaging/hdSt/renderPass.cpp b/pxr/imaging/hdSt/renderPass.cpp
index 253e9fb4d8..5d448c2b31 100644
--- a/pxr/imaging/hdSt/renderPass.cpp
+++ b/pxr/imaging/hdSt/renderPass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/renderPass.h"
 
diff --git a/pxr/imaging/hdSt/renderPass.h b/pxr/imaging/hdSt/renderPass.h
index 7d3c9fa667..3c360d16a7 100644
--- a/pxr/imaging/hdSt/renderPass.h
+++ b/pxr/imaging/hdSt/renderPass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_RENDER_PASS_H
 #define PXR_IMAGING_HD_ST_RENDER_PASS_H
diff --git a/pxr/imaging/hdSt/renderPassShader.cpp b/pxr/imaging/hdSt/renderPassShader.cpp
index f0e82f1dd2..d7687179a8 100644
--- a/pxr/imaging/hdSt/renderPassShader.cpp
+++ b/pxr/imaging/hdSt/renderPassShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/aov.h"
 #include "pxr/imaging/hd/tokens.h"
@@ -126,8 +109,15 @@ HdStRenderPassShader::HdStRenderPassShader()
 
 HdStRenderPassShader::HdStRenderPassShader(TfToken const &glslfxFile)
     : HdStShaderCode()
-    , _glslfxFile(glslfxFile)   // user-defined
-    , _glslfx(std::make_unique<HioGlslfx>(glslfxFile))
+    , _glslfx(std::make_shared<HioGlslfx>(glslfxFile))
+    , _hash(0)
+    , _hashValid(false)
+{
+}
+
+HdStRenderPassShader::HdStRenderPassShader(HioGlslfxSharedPtr const &glslfx)
+    : HdStShaderCode()
+    , _glslfx(glslfx)
     , _hash(0)
     , _hashValid(false)
 {
@@ -313,7 +303,7 @@ HdStRenderPassShader::UpdateAovInputTextures(
         HdStTextureHandleSharedPtr textureHandle =
             resourceRegistry->AllocateTextureHandle(
                 namedTextureIdentifier.id,
-                HdTextureType::Uv,
+                HdStTextureType::Uv,
                 samplerParameters,
                 /* memoryRequest = */ 0,
                 shared_from_this());
@@ -322,7 +312,7 @@ HdStRenderPassShader::UpdateAovInputTextures(
         _namedTextureHandles.push_back(
             HdStShaderCode::NamedTextureHandle{
                 namedTextureIdentifier.name,
-                HdTextureType::Uv,
+                HdStTextureType::Uv,
                 std::move(textureHandle),
                 /* hash = */ 0});
         
diff --git a/pxr/imaging/hdSt/renderPassShader.h b/pxr/imaging/hdSt/renderPassShader.h
index b967e8c94b..3b1dd3f3af 100644
--- a/pxr/imaging/hdSt/renderPassShader.h
+++ b/pxr/imaging/hdSt/renderPassShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_RENDER_PASS_SHADER_H
 #define PXR_IMAGING_HD_ST_RENDER_PASS_SHADER_H
@@ -55,6 +38,8 @@ class HdStRenderPassShader : public HdStShaderCode {
     HDST_API
     HdStRenderPassShader(TfToken const &glslfxFile);
     HDST_API
+    HdStRenderPassShader(HioGlslfxSharedPtr const &glslfx);
+    HDST_API
     ~HdStRenderPassShader() override;
 
     /// HdShader overrides
@@ -100,8 +85,7 @@ class HdStRenderPassShader : public HdStShaderCode {
         HdRenderIndex * const renderIndex);
 
 private:
-    TfToken _glslfxFile;
-    std::unique_ptr<HioGlslfx> _glslfx;
+    HioGlslfxSharedPtr _glslfx;
     mutable size_t  _hash;
     mutable bool    _hashValid;
 
diff --git a/pxr/imaging/hdSt/renderPassState.cpp b/pxr/imaging/hdSt/renderPassState.cpp
index 5c4d2fac07..1cd4918f4d 100644
--- a/pxr/imaging/hdSt/renderPassState.cpp
+++ b/pxr/imaging/hdSt/renderPassState.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hdSt/renderPassState.h b/pxr/imaging/hdSt/renderPassState.h
index f47b5984ae..14b68e0584 100644
--- a/pxr/imaging/hdSt/renderPassState.h
+++ b/pxr/imaging/hdSt/renderPassState.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_RENDER_PASS_STATE_H
 #define PXR_IMAGING_HD_ST_RENDER_PASS_STATE_H
diff --git a/pxr/imaging/hdSt/resourceBinder.cpp b/pxr/imaging/hdSt/resourceBinder.cpp
index 7c3b3aad27..84d8deb25c 100644
--- a/pxr/imaging/hdSt/resourceBinder.cpp
+++ b/pxr/imaging/hdSt/resourceBinder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
@@ -715,7 +698,7 @@ HdSt_ResourceBinder::ResolveBindings(
                     = MetaData::ShaderParameterAccessor(glName, 
                                                         /*type=*/glType);
             } else if (param.IsTexture()) {
-                if (param.textureType == HdTextureType::Ptex) {
+                if (param.textureType == HdStTextureType::Ptex) {
                     // ptex texture
                     HdStBinding texelBinding = bindless
                         ? HdStBinding(HdStBinding::BINDLESS_TEXTURE_PTEX_TEXEL,
@@ -752,7 +735,7 @@ HdSt_ResourceBinder::ResolveBindings(
                     const TfToken layoutName(_ConcatLayout(name));
                     // used for non-bindless
                     _bindingMap[layoutName] = layoutBinding; 
-                } else if (param.textureType == HdTextureType::Udim) {
+                } else if (param.textureType == HdStTextureType::Udim) {
                     // Texture Array for UDIM
                     HdStBinding textureBinding = bindless
                         ? HdStBinding(HdStBinding::BINDLESS_TEXTURE_UDIM_ARRAY,
@@ -790,7 +773,7 @@ HdSt_ResourceBinder::ResolveBindings(
 
                     // used for non-bindless
                     _bindingMap[layoutName] = layoutBinding;
-                } else if (param.textureType == HdTextureType::Uv) {
+                } else if (param.textureType == HdStTextureType::Uv) {
                     if (param.IsArrayOfTextures()) {
                         size_t const numTextures = param.arrayOfTexturesSize;
                         
@@ -844,7 +827,7 @@ HdSt_ResourceBinder::ResolveBindings(
                         // used for non-bindless
                         _bindingMap[name] = textureBinding;
                     }
-                } else if (param.textureType == HdTextureType::Field) {
+                } else if (param.textureType == HdStTextureType::Field) {
                     // 3d texture
                     HdStBinding textureBinding = bindless
                         ? HdStBinding(HdStBinding::BINDLESS_TEXTURE_FIELD,
@@ -1870,26 +1853,14 @@ _IsBindless(HdStBinding const & binding)
 }
 
 static
-GLenum
-_GetTextureTarget(HdStBinding const & binding)
+void
+_BindGLTextureAndSampler(
+    int const textureUnit,
+    GLuint const textureId,
+    GLuint const samplerId)
 {
-    switch (binding.GetType()) {
-        case HdStBinding::TEXTURE_2D:
-        case HdStBinding::ARRAY_OF_TEXTURE_2D:
-            return GL_TEXTURE_2D;
-        case HdStBinding::TEXTURE_FIELD:
-            return GL_TEXTURE_3D;
-        case HdStBinding::TEXTURE_UDIM_ARRAY:
-        case HdStBinding::TEXTURE_PTEX_TEXEL:
-            return GL_TEXTURE_2D_ARRAY;
-        case HdStBinding::TEXTURE_UDIM_LAYOUT:
-            return GL_TEXTURE_1D;
-        case HdStBinding::TEXTURE_PTEX_LAYOUT:
-            return GL_TEXTURE_1D_ARRAY;
-        default:
-            TF_CODING_ERROR("Unknown texture binding type");
-            return GL_NONE;
-    }
+    glBindTextureUnit(textureUnit, textureId);
+    glBindSampler(textureUnit, samplerId);
 }
 
 void
@@ -1899,40 +1870,15 @@ HdSt_ResourceBinder::BindTexture(
         HgiTextureHandle const &textureHandle,
         const bool bind) const
 {
-    const HdStBinding binding = GetBinding(name);
+    HdStBinding const binding = GetBinding(name);
     if (_IsBindless(binding)) {
         return;
     }
 
-    const int samplerUnit = binding.GetTextureUnit();
-
-    glActiveTexture(GL_TEXTURE0 + samplerUnit);
-
-    const HgiTexture * const tex = textureHandle.Get();
-    const HgiGLTexture * const glTex =
-        dynamic_cast<const HgiGLTexture*>(tex);
-
-    if (tex && !glTex) {
-        TF_CODING_ERROR("Resource binder only supports OpenGL");
-    }
-
-    const GLuint texName =
-        (bind && glTex) ? glTex->GetTextureId() : 0;
-    glBindTexture(_GetTextureTarget(binding), texName);
-
-    const HgiSampler * const sampler = samplerHandle.Get();
-    const HgiGLSampler * const glSampler =
-        dynamic_cast<const HgiGLSampler*>(sampler);
-
-    if (sampler && !glSampler) {
-        TF_CODING_ERROR("Resource binder only supports OpenGL");
-    }
-
-    const GLuint samplerName =
-        (bind && glSampler) ? glSampler->GetSamplerId() : 0;
-    glBindSampler(samplerUnit, samplerName);
-
-    glActiveTexture(GL_TEXTURE0);
+    _BindGLTextureAndSampler(
+        binding.GetTextureUnit(),
+        (bind && textureHandle) ? textureHandle->GetRawResource() : 0,
+        (bind && samplerHandle) ? samplerHandle->GetRawResource() : 0);
 }
 
 void
@@ -1940,36 +1886,26 @@ HdSt_ResourceBinder::BindTextureWithLayout(
         TfToken const &name,
         HgiSamplerHandle const &texelSampler,
         HgiTextureHandle const &texelTexture,
+        HgiSamplerHandle const &layoutSampler,
         HgiTextureHandle const &layoutTexture,
         const bool bind) const
 {
-    const HdStBinding texelBinding = GetBinding(name);
+    HdStBinding const texelBinding = GetBinding(name);
     if (_IsBindless(texelBinding)) {
         return;
     }
 
-    const int texelSamplerUnit = texelBinding.GetTextureUnit();
+    _BindGLTextureAndSampler(
+        texelBinding.GetTextureUnit(),
+        (bind && texelTexture) ? texelTexture->GetRawResource() : 0,
+        (bind && texelSampler) ? texelSampler->GetRawResource() : 0);
 
-    glActiveTexture(GL_TEXTURE0 + texelSamplerUnit);
-    glBindTexture(_GetTextureTarget(texelBinding),
-              (bind && texelTexture) ? texelTexture->GetRawResource() : 0);
-
-    const HgiGLSampler * const glSampler =
-        bind ? dynamic_cast<HgiGLSampler*>(texelSampler.Get()) : nullptr;
-
-    if (glSampler) {
-        glBindSampler(texelSamplerUnit, (GLuint)glSampler->GetSamplerId());
-    } else {
-        glBindSampler(texelSamplerUnit, 0);
-    }
-
-    const HdStBinding layoutBinding = GetBinding(_ConcatLayout(name));
-    const int layoutSamplerUnit = layoutBinding.GetTextureUnit();
+    HdStBinding const layoutBinding = GetBinding(_ConcatLayout(name));
 
-    glActiveTexture(GL_TEXTURE0 + layoutSamplerUnit);
-    glBindTexture(_GetTextureTarget(layoutBinding),
-              (bind && layoutTexture) ? layoutTexture->GetRawResource() : 0);
-    glActiveTexture(GL_TEXTURE0);
+    _BindGLTextureAndSampler(
+        layoutBinding.GetTextureUnit(),
+        (bind && layoutTexture) ? layoutTexture->GetRawResource() : 0,
+        (bind && layoutSampler) ? layoutSampler->GetRawResource() : 0);
 }
 
 
diff --git a/pxr/imaging/hdSt/resourceBinder.h b/pxr/imaging/hdSt/resourceBinder.h
index e4f5f8265b..39a116d35f 100644
--- a/pxr/imaging/hdSt/resourceBinder.h
+++ b/pxr/imaging/hdSt/resourceBinder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_RESOURCE_BINDER_H
 #define PXR_IMAGING_HD_ST_RESOURCE_BINDER_H
@@ -529,6 +512,7 @@ class HdSt_ResourceBinder {
     void BindTextureWithLayout(TfToken const &name,
                                HgiSamplerHandle const &texelSampler,
                                HgiTextureHandle const &texelTexture,
+                               HgiSamplerHandle const &layoutSampler,
                                HgiTextureHandle const &layoutTexture,
                                const bool bind) const;
 
diff --git a/pxr/imaging/hdSt/resourceRegistry.cpp b/pxr/imaging/hdSt/resourceRegistry.cpp
index de9d66eb7d..1a9ab174d9 100644
--- a/pxr/imaging/hdSt/resourceRegistry.cpp
+++ b/pxr/imaging/hdSt/resourceRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/work/loops.h"
 
@@ -1327,7 +1310,7 @@ HdStResourceRegistry::_TallyResourceAllocation(VtDictionary *result) const
 HdStTextureHandleSharedPtr
 HdStResourceRegistry::AllocateTextureHandle(
         HdStTextureIdentifier const &textureId,
-        const HdTextureType textureType,
+        const HdStTextureType textureType,
         HdSamplerParameters const &samplerParams,
         const size_t memoryRequest,
         HdStShaderCodePtr const &shaderCode)
@@ -1341,7 +1324,7 @@ HdStResourceRegistry::AllocateTextureHandle(
 HdStTextureObjectSharedPtr
 HdStResourceRegistry::AllocateTextureObject(
         HdStTextureIdentifier const &textureId,
-        const HdTextureType textureType)
+        const HdStTextureType textureType)
 {
     HdSt_TextureObjectRegistry * const reg = 
         _textureHandleRegistry->GetTextureObjectRegistry();
@@ -1353,7 +1336,7 @@ HdStResourceRegistry::AllocateTextureObject(
 
 void
 HdStResourceRegistry::SetMemoryRequestForTextureType(
-    const HdTextureType textureType,
+    const HdStTextureType textureType,
     const size_t memoryRequest)
 {
     _textureHandleRegistry->SetMemoryRequestForTextureType(
diff --git a/pxr/imaging/hdSt/resourceRegistry.h b/pxr/imaging/hdSt/resourceRegistry.h
index ae32462c44..3ce14672ec 100644
--- a/pxr/imaging/hdSt/resourceRegistry.h
+++ b/pxr/imaging/hdSt/resourceRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_RESOURCE_REGISTRY_H
 #define PXR_IMAGING_HD_ST_RESOURCE_REGISTRY_H
@@ -29,13 +12,13 @@
 
 #include "pxr/imaging/hdSt/api.h"
 #include "pxr/imaging/hdSt/bufferArrayRegistry.h"
+#include "pxr/imaging/hdSt/enums.h"
 
 #include "pxr/imaging/hgi/hgi.h"
 
 #include "pxr/imaging/hd/bufferArrayRange.h"
 #include "pxr/imaging/hd/bufferSource.h"
 #include "pxr/imaging/hd/bufferSpec.h"
-#include "pxr/imaging/hd/enums.h"
 #include "pxr/imaging/hd/instanceRegistry.h"
 #include "pxr/imaging/hd/resourceRegistry.h"
 
@@ -161,7 +144,7 @@ class HdStResourceRegistry final : public HdResourceRegistry
         /// file containing several grids, movie file containing frames).
         const HdStTextureIdentifier &textureId,
         /// Texture type, e.g., uv, ptex, ...
-        HdTextureType textureType,
+        HdStTextureType textureType,
         /// Sampling parameters such as wrapS, ...
         /// wrapS, wrapT, wrapR mode, min filer, mag filter
         const HdSamplerParameters &samplerParams,
@@ -188,7 +171,7 @@ class HdStResourceRegistry final : public HdResourceRegistry
         /// file containing several grids, movie file containing frames).
         const HdStTextureIdentifier &textureId,
         /// Texture type, e.g., uv, ptex, ...
-        HdTextureType textureType);
+        HdStTextureType textureType);
 
     /// Sets how much memory a single texture can consume in bytes by
     /// texture type.
@@ -199,7 +182,7 @@ class HdStResourceRegistry final : public HdResourceRegistry
     ///
     HDST_API
     void SetMemoryRequestForTextureType(
-        HdTextureType textureType,
+        HdStTextureType textureType,
         size_t memoryRequest);
 
     /// ------------------------------------------------------------------------
diff --git a/pxr/imaging/hdSt/samplerObject.cpp b/pxr/imaging/hdSt/samplerObject.cpp
index 97ef56d65f..9aa8b6b0a6 100644
--- a/pxr/imaging/hdSt/samplerObject.cpp
+++ b/pxr/imaging/hdSt/samplerObject.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/samplerObject.h"
 #include "pxr/imaging/hdSt/ptexTextureObject.h"
diff --git a/pxr/imaging/hdSt/samplerObject.h b/pxr/imaging/hdSt/samplerObject.h
index bd1d5275ac..ccd99ba601 100644
--- a/pxr/imaging/hdSt/samplerObject.h
+++ b/pxr/imaging/hdSt/samplerObject.h
@@ -1,34 +1,17 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_SAMPLER_OBJECT_H
 #define PXR_IMAGING_HD_ST_SAMPLER_OBJECT_H
 
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/api.h"
+#include "pxr/imaging/hdSt/enums.h"
 
 #include "pxr/imaging/hgi/handle.h"
-#include "pxr/imaging/hd/enums.h"
 #include "pxr/imaging/hd/types.h"
 
 #include <memory>
@@ -187,35 +170,35 @@ class HdStUdimSamplerObject final : public HdStSamplerObject {
     HgiSamplerHandle _layoutSampler;
 };
 
-template<HdTextureType textureType>
+template<HdStTextureType textureType>
 struct HdSt_TypedSamplerObjectHelper;
 
 /// \class HdStTypedSamplerObject
 ///
 /// A template alias such that, e.g., HdStUvSamplerObject can be
-/// accessed as HdStTypedSamplerObject<HdTextureType::Uv>.
+/// accessed as HdStTypedSamplerObject<HdStTextureType::Uv>.
 ///
-template<HdTextureType textureType>
+template<HdStTextureType textureType>
 using HdStTypedSamplerObject =
     typename HdSt_TypedSamplerObjectHelper<textureType>::type;
 
 template<>
-struct HdSt_TypedSamplerObjectHelper<HdTextureType::Uv> {
+struct HdSt_TypedSamplerObjectHelper<HdStTextureType::Uv> {
     using type = HdStUvSamplerObject;
 };
 
 template<>
-struct HdSt_TypedSamplerObjectHelper<HdTextureType::Field> {
+struct HdSt_TypedSamplerObjectHelper<HdStTextureType::Field> {
     using type = HdStFieldSamplerObject;
 };
 
 template<>
-struct HdSt_TypedSamplerObjectHelper<HdTextureType::Ptex> {
+struct HdSt_TypedSamplerObjectHelper<HdStTextureType::Ptex> {
     using type = HdStPtexSamplerObject;
 };
 
 template<>
-struct HdSt_TypedSamplerObjectHelper<HdTextureType::Udim> {
+struct HdSt_TypedSamplerObjectHelper<HdStTextureType::Udim> {
     using type = HdStUdimSamplerObject;
 };
 
diff --git a/pxr/imaging/hdSt/samplerObjectRegistry.cpp b/pxr/imaging/hdSt/samplerObjectRegistry.cpp
index b7d08ea8bb..894c4ac8d4 100644
--- a/pxr/imaging/hdSt/samplerObjectRegistry.cpp
+++ b/pxr/imaging/hdSt/samplerObjectRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/samplerObjectRegistry.h"
 
@@ -41,7 +24,7 @@ HdSt_SamplerObjectRegistry::HdSt_SamplerObjectRegistry(
 
 HdSt_SamplerObjectRegistry::~HdSt_SamplerObjectRegistry() = default;
 
-template<HdTextureType textureType>
+template<HdStTextureType textureType>
 static
 HdStSamplerObjectSharedPtr
 _MakeTypedSamplerObject(
@@ -75,23 +58,23 @@ _MakeSamplerObject(
     HdSt_SamplerObjectRegistry * const samplerObjectRegistry)
 {
     switch(texture->GetTextureType()) {
-    case HdTextureType::Uv:
-        return _MakeTypedSamplerObject<HdTextureType::Uv>(
+    case HdStTextureType::Uv:
+        return _MakeTypedSamplerObject<HdStTextureType::Uv>(
             texture,
             samplerParameters,
             samplerObjectRegistry);
-    case HdTextureType::Field:
-        return _MakeTypedSamplerObject<HdTextureType::Field>(
+    case HdStTextureType::Field:
+        return _MakeTypedSamplerObject<HdStTextureType::Field>(
             texture,
             samplerParameters,
             samplerObjectRegistry);
-    case HdTextureType::Ptex:
-        return _MakeTypedSamplerObject<HdTextureType::Ptex>(
+    case HdStTextureType::Ptex:
+        return _MakeTypedSamplerObject<HdStTextureType::Ptex>(
             texture,
             samplerParameters,
             samplerObjectRegistry);
-    case HdTextureType::Udim:
-        return _MakeTypedSamplerObject<HdTextureType::Udim>(
+    case HdStTextureType::Udim:
+        return _MakeTypedSamplerObject<HdStTextureType::Udim>(
             texture,
             samplerParameters,
             samplerObjectRegistry);
diff --git a/pxr/imaging/hdSt/samplerObjectRegistry.h b/pxr/imaging/hdSt/samplerObjectRegistry.h
index ec59364fea..1d121c9bad 100644
--- a/pxr/imaging/hdSt/samplerObjectRegistry.h
+++ b/pxr/imaging/hdSt/samplerObjectRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_SAMPLER_OBJECT_REGISTRY_H
 #define PXR_IMAGING_HD_ST_SAMPLER_OBJECT_REGISTRY_H
diff --git a/pxr/imaging/hdSt/shaderCode.cpp b/pxr/imaging/hdSt/shaderCode.cpp
index d1e3965c6e..d17f8df09e 100644
--- a/pxr/imaging/hdSt/shaderCode.cpp
+++ b/pxr/imaging/hdSt/shaderCode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/shaderCode.h"
 
diff --git a/pxr/imaging/hdSt/shaderCode.h b/pxr/imaging/hdSt/shaderCode.h
index 197973486a..56d6e11632 100644
--- a/pxr/imaging/hdSt/shaderCode.h
+++ b/pxr/imaging/hdSt/shaderCode.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_SHADER_CODE_H
 #define PXR_IMAGING_HD_ST_SHADER_CODE_H
@@ -27,8 +10,8 @@
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/api.h"
 #include "pxr/imaging/hdSt/resourceRegistry.h"
+#include "pxr/imaging/hdSt/enums.h"
 #include "pxr/imaging/hd/version.h"
-#include "pxr/imaging/hd/enums.h"
 
 #include "pxr/usd/sdf/path.h"
 
@@ -150,7 +133,7 @@ class HdStShaderCode : public std::enable_shared_from_this<HdStShaderCode>
         /// completely determine the creation of the texture accesor
         /// HdGet_name(...)).
         ///
-        HdTextureType type;
+        HdStTextureType type;
         /// The texture.
         HdStTextureHandleSharedPtr handle;
 
diff --git a/pxr/imaging/hdSt/shaderKey.cpp b/pxr/imaging/hdSt/shaderKey.cpp
index 3afbb8a581..2b9dbeec5f 100644
--- a/pxr/imaging/hdSt/shaderKey.cpp
+++ b/pxr/imaging/hdSt/shaderKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/shaderKey.h"
 
diff --git a/pxr/imaging/hdSt/shaderKey.h b/pxr/imaging/hdSt/shaderKey.h
index 362074971e..fe2d3c699c 100644
--- a/pxr/imaging/hdSt/shaderKey.h
+++ b/pxr/imaging/hdSt/shaderKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_SHADER_KEY_H
 #define PXR_IMAGING_HD_ST_SHADER_KEY_H
diff --git a/pxr/imaging/hdSt/shaders/basisCurves.glslfx b/pxr/imaging/hdSt/shaders/basisCurves.glslfx
index de2cb7608c..4b973a03bc 100644
--- a/pxr/imaging/hdSt/shaders/basisCurves.glslfx
+++ b/pxr/imaging/hdSt/shaders/basisCurves.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
@@ -1203,8 +1186,6 @@ void main(void)
 #ifdef HD_HAS_displayOpacity
     color.a = HdGet_displayOpacity();
 #endif
-    color.rgb = ApplyColorOverrides(color).rgb;
-
     vec3 Peye = inData.Peye.xyz / inData.Peye.w;
 
     // We would like to have a better oriented normal here, however to keep the
@@ -1213,9 +1194,7 @@ void main(void)
 
     vec4 patchCoord = vec4(0);
 
-    color.rgb = mix(color.rgb,
-                    ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord).rgb,
-                    GetLightingBlendAmount());
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
 
 #ifdef HD_MATERIAL_TAG_MASKED   
     if (ShouldDiscardByAlpha(color)) {
@@ -1256,16 +1235,12 @@ void main(void)
 #ifdef HD_HAS_displayOpacity
     color.a = HdGet_displayOpacity();
 #endif
-    color.rgb = ApplyColorOverrides(color).rgb;
-
     vec3 Peye = inData.Peye.xyz / inData.Peye.w;
 
     vec3 Neye = fragmentNormal(Peye, inData.Neye, v);
 
     vec4 patchCoord = vec4(0);
-    color.rgb = mix(color.rgb, 
-                    ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord).rgb,
-                    GetLightingBlendAmount());
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
 
 #ifdef HD_MATERIAL_TAG_MASKED   
     if (ShouldDiscardByAlpha(color)) {
diff --git a/pxr/imaging/hdSt/shaders/compute.glslfx b/pxr/imaging/hdSt/shaders/compute.glslfx
index 06ba932a53..e562ecd819 100644
--- a/pxr/imaging/hdSt/shaders/compute.glslfx
+++ b/pxr/imaging/hdSt/shaders/compute.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/domeLight.glslfx b/pxr/imaging/hdSt/shaders/domeLight.glslfx
index 486b03d88e..922d37fa82 100644
--- a/pxr/imaging/hdSt/shaders/domeLight.glslfx
+++ b/pxr/imaging/hdSt/shaders/domeLight.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
@@ -64,7 +47,9 @@ vec2 GetTexCoords(ivec2 outCoords)
 vec3 SampleEnvMapLod(vec3 sampleVec, float sampleLod) {
     vec2 coord = vec2((atan(sampleVec.z, sampleVec.x) + PI) / (2.0 * PI),
                       acos(sampleVec.y) / PI);
-    return HgiTextureLod_inTexture(coord, sampleLod).rgb;
+    vec3 value = HgiTextureLod_inTexture(coord, sampleLod).rgb;
+
+    return mix(value, vec3(0.0, 0.0, 0.0), vec3(isnan(value)));
 }
 
 // compute world position from texture coords
diff --git a/pxr/imaging/hdSt/shaders/edgeId.glslfx b/pxr/imaging/hdSt/shaders/edgeId.glslfx
index 58eb91cc1d..11e24eb825 100644
--- a/pxr/imaging/hdSt/shaders/edgeId.glslfx
+++ b/pxr/imaging/hdSt/shaders/edgeId.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/fallbackLighting.glslfx b/pxr/imaging/hdSt/shaders/fallbackLighting.glslfx
index b34a3ef824..504ab8f1f1 100644
--- a/pxr/imaging/hdSt/shaders/fallbackLighting.glslfx
+++ b/pxr/imaging/hdSt/shaders/fallbackLighting.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/fallbackLightingShader.glslfx b/pxr/imaging/hdSt/shaders/fallbackLightingShader.glslfx
index b0f95e8d5f..82d8dd5d13 100644
--- a/pxr/imaging/hdSt/shaders/fallbackLightingShader.glslfx
+++ b/pxr/imaging/hdSt/shaders/fallbackLightingShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/fallbackMaterialNetwork.glslfx b/pxr/imaging/hdSt/shaders/fallbackMaterialNetwork.glslfx
index fe45962c23..66fc80bd97 100644
--- a/pxr/imaging/hdSt/shaders/fallbackMaterialNetwork.glslfx
+++ b/pxr/imaging/hdSt/shaders/fallbackMaterialNetwork.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/fallbackVolume.glslfx b/pxr/imaging/hdSt/shaders/fallbackVolume.glslfx
index 4aa63f4c9b..8a112173fe 100644
--- a/pxr/imaging/hdSt/shaders/fallbackVolume.glslfx
+++ b/pxr/imaging/hdSt/shaders/fallbackVolume.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/frustumCull.glslfx b/pxr/imaging/hdSt/shaders/frustumCull.glslfx
index 1fd40b78aa..b08dcce129 100644
--- a/pxr/imaging/hdSt/shaders/frustumCull.glslfx
+++ b/pxr/imaging/hdSt/shaders/frustumCull.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/imageShader.glslfx b/pxr/imaging/hdSt/shaders/imageShader.glslfx
index cbef26160b..c74e544557 100644
--- a/pxr/imaging/hdSt/shaders/imageShader.glslfx
+++ b/pxr/imaging/hdSt/shaders/imageShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/instancing.glslfx b/pxr/imaging/hdSt/shaders/instancing.glslfx
index a05c114c6e..d6fae68d88 100644
--- a/pxr/imaging/hdSt/shaders/instancing.glslfx
+++ b/pxr/imaging/hdSt/shaders/instancing.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/invalidMaterialNetwork.glslfx b/pxr/imaging/hdSt/shaders/invalidMaterialNetwork.glslfx
index fdcdced93e..7a98a7c5ec 100644
--- a/pxr/imaging/hdSt/shaders/invalidMaterialNetwork.glslfx
+++ b/pxr/imaging/hdSt/shaders/invalidMaterialNetwork.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/mesh.glslfx b/pxr/imaging/hdSt/shaders/mesh.glslfx
index 1873205b28..9c26e43bef 100644
--- a/pxr/imaging/hdSt/shaders/mesh.glslfx
+++ b/pxr/imaging/hdSt/shaders/mesh.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
@@ -120,9 +103,9 @@ void main(void)
 
     // Get the indata Neye if provided.
     bool isFlipped = IsFlipped();
-    vec3 Neye0 = isFlipped ? -GetNormal(vec3(0),0) : GetNormal(vec3(0),0);
-    vec3 Neye1 = isFlipped ? -GetNormal(vec3(0),1) : GetNormal(vec3(0),1);
-    vec3 Neye2 = isFlipped ? -GetNormal(vec3(0),2) : GetNormal(vec3(0),2);
+    vec3 Neye0 = GetNormal(vec3(0),0);
+    vec3 Neye1 = GetNormal(vec3(0),1);
+    vec3 Neye2 = GetNormal(vec3(0),2);
 
     Neye0 = GetTriGeometryNormal(Neye0, point0, point1, point2, isFlipped);
     Neye1 = GetTriGeometryNormal(Neye1, point0, point1, point2, isFlipped);
@@ -194,10 +177,10 @@ void main(void)
 
     // Get the indata Neye if provided.
     bool isFlipped = IsFlipped();
-    vec3 Neye0 = isFlipped ? -GetNormal(vec3(0),0) : GetNormal(vec3(0),0);
-    vec3 Neye1 = isFlipped ? -GetNormal(vec3(0),1) : GetNormal(vec3(0),1);
-    vec3 Neye2 = isFlipped ? -GetNormal(vec3(0),2) : GetNormal(vec3(0),2);
-    vec3 Neye3 = isFlipped ? -GetNormal(vec3(0),3) : GetNormal(vec3(0),3);
+    vec3 Neye0 = GetNormal(vec3(0),0);
+    vec3 Neye1 = GetNormal(vec3(0),1);
+    vec3 Neye2 = GetNormal(vec3(0),2);
+    vec3 Neye3 = GetNormal(vec3(0),3);
 
     Neye0 = GetQuadGeometryNormal(
                 Neye0, point0, point1, point2, point3, isFlipped);
@@ -276,10 +259,10 @@ void main(void)
 
     //Get the indata Neye if provided.
     bool isFlipped = IsFlipped();
-    vec3 Neye0 = isFlipped ? -GetNormal(vec3(0),0) : GetNormal(vec3(0),0);
-    vec3 Neye1 = isFlipped ? -GetNormal(vec3(0),1) : GetNormal(vec3(0),1);
-    vec3 Neye2 = isFlipped ? -GetNormal(vec3(0),2) : GetNormal(vec3(0),2);
-    vec3 Neye3 = isFlipped ? -GetNormal(vec3(0),4) : GetNormal(vec3(0),4);
+    vec3 Neye0 = GetNormal(vec3(0),0);
+    vec3 Neye1 = GetNormal(vec3(0),1);
+    vec3 Neye2 = GetNormal(vec3(0),2);
+    vec3 Neye3 = GetNormal(vec3(0),4);
 
     Neye0 = GetQuadGeometryNormal(Neye0,
                 point0, point1, point2, point3, isFlipped);
@@ -308,6 +291,23 @@ void main(void)
     ProcessPrimvarsOut(basis, 0, 1, 2, 4);
 }
 
+--- --------------------------------------------------------------------------
+-- glsl Mesh.TessControl.PatchCommon
+
+void
+ClampTessLevels(inout vec4 tessOuterLo, inout vec4 tessOuterHi)
+{
+    // Clamp outer tess levels to a minimum of 2 so that we always
+    // sample along each edge and in the middle of transition patches.
+    const vec4 minOuterTessLevel = vec4(2.0);
+
+    // Values in the tessOuterHi segments which are zero should remain zero.
+    const bvec4 maskOuterHi = notEqual(tessOuterHi, vec4(0.0));
+
+    tessOuterLo = max(minOuterTessLevel, tessOuterLo);
+    tessOuterHi = max(minOuterTessLevel * vec4(maskOuterHi), tessOuterHi);
+}
+
 --- --------------------------------------------------------------------------
 -- layout Mesh.TessControl.BSplineQuad
 
@@ -352,8 +352,11 @@ void main(void)
             cpBezier[i] = outpt[i].v;
         }
         OsdEvalPatchBezierTessLevels(cpBezier, patchParam,
-                                     tessLevelOuter, tessLevelInner,
                                      tessOuterLo, tessOuterHi);
+        ClampTessLevels(tessOuterLo, tessOuterHi);
+
+        OsdComputeTessLevels(tessOuterLo, tessOuterHi,
+                             tessLevelOuter, tessLevelInner);
 
         gl_TessLevelOuter[0] = tessLevelOuter[0];
         gl_TessLevelOuter[1] = tessLevelOuter[1];
@@ -464,8 +467,11 @@ void main(void)
             cpBezier[i] = outpt[i].v.P;
         }
         OsdEvalPatchBezierTriangleTessLevels(cpBezier, patchParam,
-                                            tessLevelOuter, tessLevelInner,
                                             tessOuterLo, tessOuterHi);
+        ClampTessLevels(tessOuterLo, tessOuterHi);
+
+        OsdComputeTessLevelsTriangle(tessOuterLo, tessOuterHi,
+                                     tessLevelOuter, tessLevelInner);
 
         gl_TessLevelOuter[0] = tessLevelOuter[0];
         gl_TessLevelOuter[1] = tessLevelOuter[1];
@@ -529,6 +535,23 @@ void main(void)
     ProcessPrimvarsOut(basis, 4, 5, 8, 0, UV);
 }
 
+--- --------------------------------------------------------------------------
+-- glsl Mesh.PostTessControl.PatchCommon
+
+void
+ClampTessLevels(thread vec4 &tessOuterLo, thread vec4 &tessOuterHi)
+{
+    // Clamp outer tess levels to a minimum of 2 so that we always
+    // sample along each edge and in the middle of transition patches.
+    const vec4 minOuterTessLevel = vec4(2.0);
+
+    // Values in the tessOuterHi segments which are zero should remain zero.
+    const bvec4 maskOuterHi = notEqual(tessOuterHi, vec4(0.0));
+
+    tessOuterLo = max(minOuterTessLevel, tessOuterLo);
+    tessOuterHi = max(minOuterTessLevel * vec4(maskOuterHi), tessOuterHi);
+}
+
 --- --------------------------------------------------------------------------
 -- glsl Mesh.PostTessControl.BSplineQuad
 
@@ -606,6 +629,7 @@ void main(void)
     Osd_GetTessLevelsFromPatchBoundaries4(
         GetTessLevel(), GetProjectionMatrix(), transform,
         corners, midPoints, patchParam, tessOuterLo, tessOuterHi);
+    ClampTessLevels(tessOuterLo, tessOuterHi);
 
     OsdComputeTessLevels(tessOuterLo, tessOuterHi,
                          tessLevelOuter, tessLevelInner);
@@ -790,6 +814,7 @@ void main(void)
     Osd_GetTessLevelsFromPatchBoundaries3(
         GetTessLevel(), GetProjectionMatrix(), transform,
         corners, midPoints, patchParam, tessOuterLo, tessOuterHi);
+    ClampTessLevels(tessOuterLo, tessOuterHi);
 
     OsdComputeTessLevelsTriangle(tessOuterLo, tessOuterHi,
                          tessLevelOuter, tessLevelInner);
diff --git a/pxr/imaging/hdSt/shaders/meshFaceCull.glslfx b/pxr/imaging/hdSt/shaders/meshFaceCull.glslfx
index 9f0443d2de..d9afbb8708 100644
--- a/pxr/imaging/hdSt/shaders/meshFaceCull.glslfx
+++ b/pxr/imaging/hdSt/shaders/meshFaceCull.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/meshNormal.glslfx b/pxr/imaging/hdSt/shaders/meshNormal.glslfx
index c6d02de716..38fea44cc6 100644
--- a/pxr/imaging/hdSt/shaders/meshNormal.glslfx
+++ b/pxr/imaging/hdSt/shaders/meshNormal.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/meshWire.glslfx b/pxr/imaging/hdSt/shaders/meshWire.glslfx
index 2ed5b705ee..6969bea248 100644
--- a/pxr/imaging/hdSt/shaders/meshWire.glslfx
+++ b/pxr/imaging/hdSt/shaders/meshWire.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/pointId.glslfx b/pxr/imaging/hdSt/shaders/pointId.glslfx
index aa9d7815f4..d39b170d4f 100644
--- a/pxr/imaging/hdSt/shaders/pointId.glslfx
+++ b/pxr/imaging/hdSt/shaders/pointId.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/points.glslfx b/pxr/imaging/hdSt/shaders/points.glslfx
index ff31ebdf99..1e8ad2d623 100644
--- a/pxr/imaging/hdSt/shaders/points.glslfx
+++ b/pxr/imaging/hdSt/shaders/points.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/ptexTexture.glslfx b/pxr/imaging/hdSt/shaders/ptexTexture.glslfx
index ca3e4bdf77..339228f845 100644
--- a/pxr/imaging/hdSt/shaders/ptexTexture.glslfx
+++ b/pxr/imaging/hdSt/shaders/ptexTexture.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdSt/shaders/renderPass.glslfx b/pxr/imaging/hdSt/shaders/renderPass.glslfx
index eedc925439..95433df404 100644
--- a/pxr/imaging/hdSt/shaders/renderPass.glslfx
+++ b/pxr/imaging/hdSt/shaders/renderPass.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/renderPassShader.glslfx b/pxr/imaging/hdSt/shaders/renderPassShader.glslfx
index 5dd0c3f1a0..cae3277529 100644
--- a/pxr/imaging/hdSt/shaders/renderPassShader.glslfx
+++ b/pxr/imaging/hdSt/shaders/renderPassShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/simpleLightingShader.glslfx b/pxr/imaging/hdSt/shaders/simpleLightingShader.glslfx
index bcce457960..205fade32f 100644
--- a/pxr/imaging/hdSt/shaders/simpleLightingShader.glslfx
+++ b/pxr/imaging/hdSt/shaders/simpleLightingShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/surfaceHelpers.glslfx b/pxr/imaging/hdSt/shaders/surfaceHelpers.glslfx
index 5063afc2e3..930c22fd3c 100644
--- a/pxr/imaging/hdSt/shaders/surfaceHelpers.glslfx
+++ b/pxr/imaging/hdSt/shaders/surfaceHelpers.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 
diff --git a/pxr/imaging/hdSt/shaders/terminals.glslfx b/pxr/imaging/hdSt/shaders/terminals.glslfx
index 27b33ff22f..8ceea5acea 100644
--- a/pxr/imaging/hdSt/shaders/terminals.glslfx
+++ b/pxr/imaging/hdSt/shaders/terminals.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/visibility.glslfx b/pxr/imaging/hdSt/shaders/visibility.glslfx
index 9f10d08b8c..cc532107c2 100644
--- a/pxr/imaging/hdSt/shaders/visibility.glslfx
+++ b/pxr/imaging/hdSt/shaders/visibility.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/shaders/volume.glslfx b/pxr/imaging/hdSt/shaders/volume.glslfx
index c9d8888fe2..0823438619 100644
--- a/pxr/imaging/hdSt/shaders/volume.glslfx
+++ b/pxr/imaging/hdSt/shaders/volume.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
@@ -555,7 +538,8 @@ computeRayLength(vec3 rayStartEye, vec3 rayDirectionEye, vec3 rayEndEye,
     return (rayEndZ - rayStartEye.z) / rayDirectionEye.z;
 }
 
-float max3(float a, float b, float c)
+float
+computeMax3(float a, float b, float c)
 {
     return max(a, max(b, c));
 }
@@ -575,9 +559,9 @@ scaleOfMatrix(MAT4 m)
     const mat3 affinePart = mat3(m[0][0], m[0][1], m[0][2], 
                                  m[1][0], m[1][1], m[1][2],
                                  m[2][0], m[2][1], m[2][2]);
-    return max3(length(affinePart[0]),
-                length(affinePart[1]),
-                length(affinePart[2]));
+    return computeMax3(length(affinePart[0]),
+                       length(affinePart[1]),
+                       length(affinePart[2]));
 }
 
 #ifdef HD_HAS_integrateLights
diff --git a/pxr/imaging/hdSt/shaders/widgetShader.glslfx b/pxr/imaging/hdSt/shaders/widgetShader.glslfx
index 70c2e43983..7c9871acc5 100644
--- a/pxr/imaging/hdSt/shaders/widgetShader.glslfx
+++ b/pxr/imaging/hdSt/shaders/widgetShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdSt/simpleLightingShader.cpp b/pxr/imaging/hdSt/simpleLightingShader.cpp
index 8a777cfd3c..58693c43b1 100644
--- a/pxr/imaging/hdSt/simpleLightingShader.cpp
+++ b/pxr/imaging/hdSt/simpleLightingShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/simpleLightingShader.h"
 #include "pxr/imaging/hdSt/binding.h"
@@ -228,7 +211,7 @@ HdStSimpleLightingShader::AddBindings(HdStBindingRequestVector *customBindings)
                 _tokens->domeLightIrradiance,
                 VtValue(GfVec4f(0.0)),
                 TfTokenVector(),
-                HdTextureType::Uv));
+                HdStTextureType::Uv));
         // prefilter map
         _lightTextureParams.push_back(
             HdSt_MaterialParam(
@@ -236,7 +219,7 @@ HdStSimpleLightingShader::AddBindings(HdStBindingRequestVector *customBindings)
                 _tokens->domeLightPrefilter,
                 VtValue(GfVec4f(0.0)),
                 TfTokenVector(),
-                HdTextureType::Uv));
+                HdStTextureType::Uv));
         // BRDF texture
         _lightTextureParams.push_back(
             HdSt_MaterialParam(
@@ -244,7 +227,7 @@ HdStSimpleLightingShader::AddBindings(HdStBindingRequestVector *customBindings)
                 _tokens->domeLightBRDF,
                 VtValue(GfVec4f(0.0)),
                 TfTokenVector(),
-                HdTextureType::Uv));
+                HdStTextureType::Uv));
     }
 
     const bool useShadows =
@@ -261,7 +244,7 @@ HdStSimpleLightingShader::AddBindings(HdStBindingRequestVector *customBindings)
                 HdStTokens->shadowCompareTextures,
                 VtValue(GfVec4f(0.0)),
                 TfTokenVector(),
-                HdTextureType::Uv,
+                HdStTextureType::Uv,
                 /*swizzle*/std::string(),
                 /*isPremultiplied*/false,
                 /*arrayOfTexturesSize*/numShadowPasses));
@@ -343,13 +326,13 @@ _MakeNamedTextureHandle(
     HdStTextureHandleSharedPtr const textureHandle =
         resourceRegistry->AllocateTextureHandle(
             textureId,
-            HdTextureType::Uv,
+            HdStTextureType::Uv,
             samplerParameters,
             /* memoryRequest = */ 0,
             shader);
 
     return { name,
-             HdTextureType::Uv,
+             HdStTextureType::Uv,
              textureHandle,
              name.Hash() };
 }
@@ -473,7 +456,7 @@ HdStSimpleLightingShader::AllocateTextureHandles(HdRenderIndex const &renderInde
         _domeLightEnvironmentTextureHandle =
             resourceRegistry->AllocateTextureHandle(
                 textureId,
-                HdTextureType::Uv,
+                HdStTextureType::Uv,
                 envSamplerParameters,
                 /* targetMemory = */ 0,
                 shared_from_this());
@@ -564,7 +547,7 @@ HdStSimpleLightingShader::AllocateTextureHandles(HdRenderIndex const &renderInde
                 HdStTextureHandleSharedPtr const textureHandle =
                     resourceRegistry->AllocateTextureHandle(
                         _shadowAovBuffers[i]->GetTextureIdentifier(false),
-                        HdTextureType::Uv,
+                        HdStTextureType::Uv,
                         shadowSamplerParameters,
                         /* memoryRequest = */ 0,
                         shared_from_this());
@@ -575,7 +558,7 @@ HdStSimpleLightingShader::AllocateTextureHandles(HdRenderIndex const &renderInde
                 _shadowTextureHandles.push_back(
                     NamedTextureHandle{ 
                         shadowTextureName,
-                        HdTextureType::Uv,
+                        HdStTextureType::Uv,
                         textureHandle,
                         shadowTextureName.Hash()});
             }
diff --git a/pxr/imaging/hdSt/simpleLightingShader.h b/pxr/imaging/hdSt/simpleLightingShader.h
index 10d9805296..18bbfc7415 100644
--- a/pxr/imaging/hdSt/simpleLightingShader.h
+++ b/pxr/imaging/hdSt/simpleLightingShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDST_SIMPLE_LIGHTING_SHADER_H
 #define PXR_IMAGING_HDST_SIMPLE_LIGHTING_SHADER_H
diff --git a/pxr/imaging/hdSt/smoothNormals.cpp b/pxr/imaging/hdSt/smoothNormals.cpp
index ee2a4b0492..93c91df5a9 100644
--- a/pxr/imaging/hdSt/smoothNormals.cpp
+++ b/pxr/imaging/hdSt/smoothNormals.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/smoothNormals.h"
 
@@ -406,9 +389,9 @@ HdSt_SmoothNormalsComputationGPU::Execute(
     // Generate hash for resource bindings and pipeline.
     // XXX Needs fingerprint hash to avoid collisions
     uint64_t rbHash = (uint64_t) TfHash::Combine(
-        points->GetHandle().Get(),
-        normals->GetHandle().Get(),
-        adjacency->GetHandle().Get());
+        points->GetHandle().GetId(),
+        normals->GetHandle().GetId(),
+        adjacency->GetHandle().GetId());
 
     uint64_t pHash = (uint64_t) TfHash::Combine(
         computeProgram->GetProgram().Get(),
diff --git a/pxr/imaging/hdSt/smoothNormals.h b/pxr/imaging/hdSt/smoothNormals.h
index 785625d8c9..8b57bce327 100644
--- a/pxr/imaging/hdSt/smoothNormals.h
+++ b/pxr/imaging/hdSt/smoothNormals.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_SMOOTH_NORMALS_H
 #define PXR_IMAGING_HD_ST_SMOOTH_NORMALS_H
diff --git a/pxr/imaging/hdSt/stagingBuffer.cpp b/pxr/imaging/hdSt/stagingBuffer.cpp
index 7d1e6e3492..15383fa6ec 100644
--- a/pxr/imaging/hdSt/stagingBuffer.cpp
+++ b/pxr/imaging/hdSt/stagingBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/resourceRegistry.h"
 #include "pxr/imaging/hdSt/stagingBuffer.h"
diff --git a/pxr/imaging/hdSt/stagingBuffer.h b/pxr/imaging/hdSt/stagingBuffer.h
index ef1ee11410..750c4919d6 100644
--- a/pxr/imaging/hdSt/stagingBuffer.h
+++ b/pxr/imaging/hdSt/stagingBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_STAGING_BUFFER_H
 #define PXR_IMAGING_HD_ST_STAGING_BUFFER_H
diff --git a/pxr/imaging/hdSt/strategyBase.cpp b/pxr/imaging/hdSt/strategyBase.cpp
index 32f19bde79..321de01076 100644
--- a/pxr/imaging/hdSt/strategyBase.cpp
+++ b/pxr/imaging/hdSt/strategyBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/strategyBase.h"
 
diff --git a/pxr/imaging/hdSt/strategyBase.h b/pxr/imaging/hdSt/strategyBase.h
index 6a565c62f2..dd7d3843a4 100644
--- a/pxr/imaging/hdSt/strategyBase.h
+++ b/pxr/imaging/hdSt/strategyBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_STRATEGY_BASE_H
 #define PXR_IMAGING_HD_ST_STRATEGY_BASE_H
diff --git a/pxr/imaging/hdSt/subdivision.cpp b/pxr/imaging/hdSt/subdivision.cpp
index b9b02b3cb3..082f9f4fab 100644
--- a/pxr/imaging/hdSt/subdivision.cpp
+++ b/pxr/imaging/hdSt/subdivision.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
@@ -1203,7 +1186,7 @@ HdSt_OsdIndexComputation::Resolve()
         _topology->RefinesToBoxSplineTrianglePatches()) {
 
         // Bundle groups of 12 or 16 patch control vertices.
-        int const arraySize = patchTable
+        int const arraySize = (ptableSize > 0)
             ? patchTable->GetPatchArrayDescriptor(0).GetNumControlVertices()
             : 0;
 
@@ -1453,15 +1436,12 @@ HdSt_OsdFvarIndexComputation::Resolve()
         return true;
     }
 
-    VtIntArray fvarIndices = subdivision->GetRefinedFvarIndices(_channel);
-    if (!TF_VERIFY(!fvarIndices.empty())) {
-        _SetResolved();
-        return true;
-    }
-
-    Far::Index const * firstIndex = fvarIndices.cdata();
     Far::PatchTable const * patchTable = subdivision->GetPatchTable();
-    size_t numPatches = patchTable ? patchTable->GetNumPatchesTotal() : 0;
+    size_t const numPatches = patchTable ? patchTable->GetNumPatchesTotal() : 0;
+
+    VtIntArray fvarIndices = subdivision->GetRefinedFvarIndices(_channel);
+    Far::Index const * firstIndex =
+        !fvarIndices.empty() ? fvarIndices.cdata() : nullptr;
 
     TfToken const & scheme = _topology->GetScheme();
 
@@ -1469,7 +1449,7 @@ HdSt_OsdFvarIndexComputation::Resolve()
         _topology->RefinesToBoxSplineTrianglePatches()) {
 
         // Bundle groups of 12 or 16 patch control vertices
-        int const arraySize = patchTable ?
+        int const arraySize = (numPatches > 0) ?
             patchTable->GetFVarPatchDescriptor(_channel).GetNumControlVertices()
             : 0;
 
@@ -1928,11 +1908,11 @@ _EvalStencilsGPU(
     // Generate hash for resource bindings and pipeline.
     // XXX Needs fingerprint hash to avoid collisions
     uint64_t const rbHash = (uint64_t) TfHash::Combine(
-        sizes->GetHandle().Get(),
-        offsets->GetHandle().Get(),
-        indices->GetHandle().Get(),
-        weights->GetHandle().Get(),
-        primvar->GetHandle().Get());
+        sizes->GetHandle().GetId(),
+        offsets->GetHandle().GetId(),
+        indices->GetHandle().GetId(),
+        weights->GetHandle().GetId(),
+        primvar->GetHandle().GetId());
 
     uint64_t const pHash = (uint64_t) TfHash::Combine(
         computeProgram->GetProgram().Get(),
diff --git a/pxr/imaging/hdSt/subdivision.h b/pxr/imaging/hdSt/subdivision.h
index 37476b1949..c29ad2e7f8 100644
--- a/pxr/imaging/hdSt/subdivision.h
+++ b/pxr/imaging/hdSt/subdivision.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_SUBDIVISION_H
 #define PXR_IMAGING_HD_ST_SUBDIVISION_H
diff --git a/pxr/imaging/hdSt/subtextureIdentifier.cpp b/pxr/imaging/hdSt/subtextureIdentifier.cpp
index ff6586c8d9..19dd3d42d3 100644
--- a/pxr/imaging/hdSt/subtextureIdentifier.cpp
+++ b/pxr/imaging/hdSt/subtextureIdentifier.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/subtextureIdentifier.h"
 
diff --git a/pxr/imaging/hdSt/subtextureIdentifier.h b/pxr/imaging/hdSt/subtextureIdentifier.h
index 7e1cde2063..93f32c5c8a 100644
--- a/pxr/imaging/hdSt/subtextureIdentifier.h
+++ b/pxr/imaging/hdSt/subtextureIdentifier.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_SUBTEXTURE_IDENTIFIER_H
 #define PXR_IMAGING_HD_ST_SUBTEXTURE_IDENTIFIER_H
diff --git a/pxr/imaging/hdSt/testenv/testHdStBarAllocationLimit.cpp b/pxr/imaging/hdSt/testenv/testHdStBarAllocationLimit.cpp
index 26429baf8b..4626f0b932 100644
--- a/pxr/imaging/hdSt/testenv/testHdStBarAllocationLimit.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStBarAllocationLimit.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing.cpp b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing.cpp
index dd96034470..eabcb6d394 100644
--- a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refined.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refined.png
index 5b137e3d8c..e06597e6e5 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refined.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refined.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refinedWire.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refinedWire.png
index 79b8de6fbd..7a2049cb42 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refinedWire.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refinedWire.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refinedWireOnSurf.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refinedWireOnSurf.png
index fe08bfe593..e1f2a15f73 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refinedWireOnSurf.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv1_refinedWireOnSurf.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_hull.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_hull.png
index 3d215862c5..622c440ceb 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_hull.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_hull.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refined.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refined.png
index ac83b21402..e621d32626 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refined.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refined.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refinedWire.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refinedWire.png
index 0161f7ce80..3ee00c615d 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refinedWire.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refinedWire.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refinedWireOnSurf.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refinedWireOnSurf.png
index 531d5faf5e..b842e96e7d 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refinedWireOnSurf.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_refinedWireOnSurf.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_smoothHull.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_smoothHull.png
index 60a0385460..56848c3910 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_smoothHull.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_smoothHull.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_wire.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_wire.png
index 78551bfdbb..5f55e86f87 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_wire.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_wire.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_wireOnSurf.png b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_wireOnSurf.png
index 12a5979c29..5f4ae1ba5f 100644
Binary files a/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_wireOnSurf.png and b/pxr/imaging/hdSt/testenv/testHdStBasicDrawing_Adaptive/baseline/testHdStBasicDrawing_adaptive_lighting_lv2_wireOnSurf.png differ
diff --git a/pxr/imaging/hdSt/testenv/testHdStBufferAggregation.cpp b/pxr/imaging/hdSt/testenv/testHdStBufferAggregation.cpp
index b1bb800114..a54842a164 100644
--- a/pxr/imaging/hdSt/testenv/testHdStBufferAggregation.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStBufferAggregation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/bufferResource.h"
@@ -504,23 +487,37 @@ UniformAggregationTest(bool aggregation, bool ssbo,
     // color vec3      : 12 byte
     // total           : 140 byte
     //                 : 160 byte, round up to 32 byte align (due to dmat4)
-    //                   or, 256 byte (GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT)
-
+    //
+    // For an uniform buffer offset alignment of 256 (the value of
+    // GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT on Pixar workstations), this would 
+    // align to 256 bytes.
+    // For an uniform buffer offset alignment of 64 (the value of
+    // VkPhysicalDeviceLimit's minUniformBufferOffsetAlignment on Pixar 
+    // workstations), this would align to 192 bytes.
     {
         HdStBufferArrayRangeSharedPtr range1GL = 
             std::static_pointer_cast<HdStBufferArrayRange>(range1);
 
         if (aggregation) {
+            constexpr int alignedStride = 160;
+
             if (ssbo) {
                 TF_VERIFY(range1GL->GetResource(HdTokens->transform)->GetOffset() == 0);
                 TF_VERIFY(range1GL->GetResource(HdTokens->displayColor)->GetOffset() == 128);
-                TF_VERIFY(range1GL->GetResource(HdTokens->transform)->GetStride() == 160);
-                TF_VERIFY(range1GL->GetResource(HdTokens->displayColor)->GetStride() == 160);
+                TF_VERIFY(range1GL->GetResource(HdTokens->transform)->GetStride() == alignedStride);
+                TF_VERIFY(range1GL->GetResource(HdTokens->displayColor)->GetStride() == alignedStride);
             } else {
+                const int uniformBufferOffsetAlignment = 
+                    registry->GetHgi()->GetCapabilities()->
+                        GetUniformBufferOffsetAlignment();
+                const int uniformAlignedStride = uniformBufferOffsetAlignment *
+                    ((alignedStride + uniformBufferOffsetAlignment - 1) / 
+                        uniformBufferOffsetAlignment);
+
                 TF_VERIFY(range1GL->GetResource(HdTokens->transform)->GetOffset() == 0);
                 TF_VERIFY(range1GL->GetResource(HdTokens->displayColor)->GetOffset() == 128);
-                TF_VERIFY(range1GL->GetResource(HdTokens->transform)->GetStride() == 256);
-                TF_VERIFY(range1GL->GetResource(HdTokens->displayColor)->GetStride() == 256);
+                TF_VERIFY(range1GL->GetResource(HdTokens->transform)->GetStride() == uniformAlignedStride);
+                TF_VERIFY(range1GL->GetResource(HdTokens->displayColor)->GetStride() == uniformAlignedStride);
             }
         } else {
             TF_VERIFY(range1GL->GetResource(HdTokens->transform)->GetOffset() == 0);
@@ -986,12 +983,6 @@ int main(int argc, char *argv[])
 
     std::unique_ptr<Hgi> hgi = Hgi::CreatePlatformDefaultHgi();
 
-    const int uniformBufferOffsetAlignment = 
-        hgi->GetCapabilities()->GetUniformBufferOffsetAlignment();
-
-    // Test verification relies on known GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT
-    TF_VERIFY(uniformBufferOffsetAlignment == 256);
-
     HdStResourceRegistry resourceRegistry(hgi.get());
 
     std::cout << "*Basic Test" << std::endl;
diff --git a/pxr/imaging/hdSt/testenv/testHdStBufferArray.cpp b/pxr/imaging/hdSt/testenv/testHdStBufferArray.cpp
index 271b910f77..91eb5bbae5 100644
--- a/pxr/imaging/hdSt/testenv/testHdStBufferArray.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStBufferArray.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/unitTestHelper.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStBufferSource.cpp b/pxr/imaging/hdSt/testenv/testHdStBufferSource.cpp
index 88926089ff..4b987d9d4c 100644
--- a/pxr/imaging/hdSt/testenv/testHdStBufferSource.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStBufferSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/bufferSource.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStBufferSourceDependency.cpp b/pxr/imaging/hdSt/testenv/testHdStBufferSourceDependency.cpp
index 543142dde5..c719d95ab0 100644
--- a/pxr/imaging/hdSt/testenv/testHdStBufferSourceDependency.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStBufferSourceDependency.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/glf/testGLContext.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen.cpp b/pxr/imaging/hdSt/testenv/testHdStCodeGen.cpp
index cfc89ac2cb..1d41c30db2 100644
--- a/pxr/imaging/hdSt/testenv/testHdStCodeGen.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 //
 
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_bindless.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_curves_bindless.out
similarity index 99%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_bindless.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_curves_bindless.out
index c2d201b399..56a37b46bf 100644
--- a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_bindless.out
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_curves_bindless.out
@@ -2664,8 +2664,6 @@ void main(void)
 #ifdef HD_HAS_displayOpacity
     color.a = HdGet_displayOpacity();
 #endif
-    color.rgb = ApplyColorOverrides(color).rgb;
-
     vec3 Peye = inData.Peye.xyz / inData.Peye.w;
 
     // We would like to have a better oriented normal here, however to keep the
@@ -2674,9 +2672,7 @@ void main(void)
 
     vec4 patchCoord = vec4(0);
 
-    color.rgb = mix(color.rgb,
-                    ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord).rgb,
-                    GetLightingBlendAmount());
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
 
 #ifdef HD_MATERIAL_TAG_MASKED
     if (ShouldDiscardByAlpha(color)) {
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_indirect.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_curves_indirect.out
similarity index 99%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_indirect.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_curves_indirect.out
index c2d201b399..56a37b46bf 100644
--- a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_curves_indirect.out
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_curves_indirect.out
@@ -2664,8 +2664,6 @@ void main(void)
 #ifdef HD_HAS_displayOpacity
     color.a = HdGet_displayOpacity();
 #endif
-    color.rgb = ApplyColorOverrides(color).rgb;
-
     vec3 Peye = inData.Peye.xyz / inData.Peye.w;
 
     // We would like to have a better oriented normal here, however to keep the
@@ -2674,9 +2672,7 @@ void main(void)
 
     vec4 patchCoord = vec4(0);
 
-    color.rgb = mix(color.rgb,
-                    ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord).rgb,
-                    GetLightingBlendAmount());
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
 
 #ifdef HD_MATERIAL_TAG_MASKED
     if (ShouldDiscardByAlpha(color)) {
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_doubleSided.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_doubleSided.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_doubleSided.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_doubleSided.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_faceVarying.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_faceVarying.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_faceVarying.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_faceVarying.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_instance.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_instance.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_instance.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_instance.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_smoothNormals.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_smoothNormals.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_bindless_indirect_smoothNormals.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_bindless_indirect_smoothNormals.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_edgeonly.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_edgeonly.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_edgeonly.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_edgeonly.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_edgeonly_blendwireframe.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_edgeonly_blendwireframe.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_edgeonly_blendwireframe.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_edgeonly_blendwireframe.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_indirect.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_indirect.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_indirect.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_indirect.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_indirect_instance.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_indirect_instance.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_mesh_indirect_instance.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_mesh_indirect_instance.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_points_bindless.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_points_bindless.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_points_bindless.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_points_bindless.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_points_indirect.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_points_indirect.out
similarity index 100%
rename from pxr/imaging/hdSt/testenv/testHdStCodeGen/baseline/codegen_points_indirect.out
rename to pxr/imaging/hdSt/testenv/testHdStCodeGen_GL/baseline/codegen_points_indirect.out
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_curves_indirect.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_curves_indirect.out
new file mode 100644
index 0000000000..634ba6ca53
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_curves_indirect.out
@@ -0,0 +1,2668 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/basisCurves.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "Curves.Vertex.Wire", "Curves.Vertex.Normal.Implicit", "PointId.Vertex.None"] }
+, "tessControlShader" : { "source" : ["Curves.CommonData", "Curves.TessFactorsGLSL", "Curves.CommonControl", "Curves.Tess.CurveData.Wire", "Curves.TessControl.Cubic.Wire"] }
+, "tessEvalShader" : { "source" : ["Curves.CommonData", "Instancing.Transform", "Curves.Tess.CurveData.Wire", "Curves.TessEval.Cubic.Wire", "Curves.BezierBasis", "Curves.Cubic.VaryingInterpolation"] }
+, "fragmentShader" : { "source" : ["Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Curves.Fragment.Wire"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PATCH_VERTS 4
+#define HD_NUM_PATCH_EVAL_VERTS 4
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out CurveVertexData {
+  vec4 Peye;
+} outData;
+layout(location = 12) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    MAT4 transform  = ApplyInstanceTransform(HdGet_transform());
+
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform *
+                        vec4(HdGet_points(), 1));
+
+    ProcessPrimvarsIn();
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    int pointId = GetPointId();
+#if defined(HD_HAS_pointSizeScale)
+    float scale = HdGet_pointSizeScale();
+#else
+    float scale = 1;
+#endif
+    gl_PointSize = GetPointRasterSize(pointId) * scale;
+    ProcessPointId(pointId);}
+
+
+
+vec3 getNormal(MAT4 transform)
+{
+    // Generate a camera-facing normal in camera/eye space, designed to match
+    // RenderMan.
+    return vec3(0, 0, 1);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PATCH_VERTS 4
+#define HD_NUM_PATCH_EVAL_VERTS 4
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+layout (vertices = HD_NUM_PATCH_EVAL_VERTS) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[gl_MaxPatchVertices];
+flat layout(location = 1) in int vs_dc_constantCoord[gl_MaxPatchVertices];
+flat layout(location = 2) in int vs_dc_elementCoord[gl_MaxPatchVertices];
+flat layout(location = 3) in int vs_dc_primitiveCoord[gl_MaxPatchVertices];
+flat layout(location = 4) in int vs_dc_fvarCoord[gl_MaxPatchVertices];
+flat layout(location = 5) in int vs_dc_shaderCoord[gl_MaxPatchVertices];
+flat layout(location = 6) in int vs_dc_vertexCoord[gl_MaxPatchVertices];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[gl_MaxPatchVertices];
+flat layout(location = 8) in int vs_dc_varyingCoord[gl_MaxPatchVertices];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[gl_MaxPatchVertices];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[gl_MaxPatchVertices];
+layout(location = 11) in CurveVertexData {
+  vec4 Peye;
+} inData[gl_MaxPatchVertices];
+layout(location = 12) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[gl_MaxPatchVertices];
+flat layout(location = 3) out int tcs_dc_modelCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 4) out int tcs_dc_constantCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 5) out int tcs_dc_elementCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 6) out int tcs_dc_primitiveCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 7) out int tcs_dc_fvarCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 8) out int tcs_dc_shaderCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 9) out int tcs_dc_vertexCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 10) out int tcs_dc_topologyVisibilityCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 11) out int tcs_dc_varyingCoord[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 12) out int tcs_dc_instanceIndexI0[HD_NUM_PATCH_EVAL_VERTS];
+flat layout(location = 13) out int tcs_dc_instanceCoordsI0[HD_NUM_PATCH_EVAL_VERTS];
+layout(location = 0) out CurveVertexData {
+  vec4 Peye;
+} outData[HD_NUM_PATCH_EVAL_VERTS];
+layout(location = 1) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars[HD_NUM_PATCH_EVAL_VERTS];
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen TCS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int GetElementID() {
+  return 0;
+}
+int GetAggregatedElementID() {
+  return GetElementID();
+}
+int GetEdgeFlag() {
+  return 0;
+}
+ivec3 GetPatchParam() {
+  return ivec3(0, 0, 0);
+}
+int GetFVarIndex(int localIndex) {
+  return 0;
+}
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return -1;
+}
+int GetPrimitiveEdgeId() {
+  return -1;
+}
+float GetSelectedEdgeOpacity() {
+  return 0.0;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = gl_InvocationID;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = gl_InvocationID;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc TCS //////// 
+void ProcessPrimvarsOut() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  tcs_dc_modelCoord[gl_InvocationID] = dc.modelCoord;
+  tcs_dc_constantCoord[gl_InvocationID] = dc.constantCoord;
+  tcs_dc_elementCoord[gl_InvocationID] = dc.elementCoord;
+  tcs_dc_primitiveCoord[gl_InvocationID] = dc.primitiveCoord;
+  tcs_dc_fvarCoord[gl_InvocationID] = dc.fvarCoord;
+  tcs_dc_shaderCoord[gl_InvocationID] = dc.shaderCoord;
+  tcs_dc_vertexCoord[gl_InvocationID] = dc.vertexCoord;
+  tcs_dc_topologyVisibilityCoord[gl_InvocationID] = dc.topologyVisibilityCoord;
+  tcs_dc_varyingCoord[gl_InvocationID] = dc.varyingCoord;
+  tcs_dc_instanceIndexI0[gl_InvocationID] = dc.instanceIndex[0];
+  outPrimvars[gl_InvocationID].points = inPrimvars[gl_InvocationID].points;
+  outPrimvars[gl_InvocationID].normals = inPrimvars[gl_InvocationID].normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+struct Coeffs
+{
+    vec4 basis;
+    vec4 tangent_basis;
+};
+
+struct CurveData
+{
+    vec4 Peye[4];
+    vec3 Neye[4];
+};
+
+
+
+void SetTessFactors(float out0, float out1, float out2, float out3,
+                    float in0, float in1)
+{
+    gl_TessLevelOuter[0] = out0;
+    gl_TessLevelOuter[1] = out1;
+    gl_TessLevelOuter[2] = out2;
+    gl_TessLevelOuter[3] = out3;
+
+    gl_TessLevelInner[0] = in0;
+    gl_TessLevelInner[1] = in1;
+}
+
+
+
+float GetMaxTess()
+{
+    // Should be replaced with a uniform
+    return 40;
+}
+
+float GetPixelToTessRatio()
+{
+    // Should be replaced with a uniform
+    return 20.0;
+}
+
+vec2 projectToScreen(MAT4 projMat, vec4 P, vec2 screen_size)
+{
+    vec4 res = vec4(projMat * P);
+    res /= res.w;
+    return (clamp(res.xy, -1.3f, 1.3f) + 1.0f) * (screen_size * 0.5f);
+}
+
+
+
+CurveData PopulatePeye()
+{
+    CurveData vertexData;
+    for (int i = 0; i < gl_MaxPatchVertices; i++) {
+        vertexData.Peye[i] = inData[i].Peye;
+    }
+    return vertexData;
+}
+
+
+
+void determineLODSettings(CurveData vertexData);
+void main(void)
+{
+    if (gl_InvocationID == 0) {
+        CurveData vertexData = PopulatePeye();
+        determineLODSettings(vertexData);
+    }
+
+    outData[gl_InvocationID].Peye = inData[gl_InvocationID].Peye;
+
+    ProcessPrimvarsOut();
+}
+
+// Use the length of the control points in screen space to determine how many
+// times to subdivide the curve.
+void determineLODSettings(CurveData vertexData)
+{
+    MAT4 projMat = GetProjectionMatrix();
+    vec4 viewport = GetViewport();
+    vec2 screen_size = vec2(viewport.z, viewport.w);
+    vec2 v0 = projectToScreen(projMat, vertexData.Peye[0], screen_size);
+    vec2 v1 = projectToScreen(projMat, vertexData.Peye[1], screen_size);
+    vec2 v2 = projectToScreen(projMat, vertexData.Peye[2], screen_size);
+    vec2 v3 = projectToScreen(projMat, vertexData.Peye[3], screen_size);
+
+    float maxTess = GetMaxTess();
+
+    // Need to handle off screen
+    float dist = distance(v0, v1) + distance(v1, v2) + distance(v2, v3);
+    float level = clamp(dist / GetPixelToTessRatio(), 0.0f, maxTess);
+
+    SetTessFactors(1.0f, level, 0.0f, 0.0f, 0.0f, 0.0f);
+}
+
+
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PATCH_VERTS 4
+#define HD_NUM_PATCH_EVAL_VERTS 4
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+layout (isolines) in;
+layout (fractional_odd_spacing) in;
+layout (cw) in;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+flat layout(location = 3) in int tcs_dc_modelCoord[gl_MaxPatchVertices];
+flat layout(location = 4) in int tcs_dc_constantCoord[gl_MaxPatchVertices];
+flat layout(location = 5) in int tcs_dc_elementCoord[gl_MaxPatchVertices];
+flat layout(location = 6) in int tcs_dc_primitiveCoord[gl_MaxPatchVertices];
+flat layout(location = 7) in int tcs_dc_fvarCoord[gl_MaxPatchVertices];
+flat layout(location = 8) in int tcs_dc_shaderCoord[gl_MaxPatchVertices];
+flat layout(location = 9) in int tcs_dc_vertexCoord[gl_MaxPatchVertices];
+flat layout(location = 10) in int tcs_dc_topologyVisibilityCoord[gl_MaxPatchVertices];
+flat layout(location = 11) in int tcs_dc_varyingCoord[gl_MaxPatchVertices];
+flat layout(location = 12) in int tcs_dc_instanceIndexI0[gl_MaxPatchVertices];
+flat layout(location = 13) in int tcs_dc_instanceCoordsI0[gl_MaxPatchVertices];
+layout(location = 0) in CurveVertexData {
+  vec4 Peye;
+} inData[gl_MaxPatchVertices];
+layout(location = 1) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[gl_MaxPatchVertices];
+flat layout(location = 3) out int tes_dc_modelCoord;
+flat layout(location = 4) out int tes_dc_constantCoord;
+flat layout(location = 5) out int tes_dc_elementCoord;
+flat layout(location = 6) out int tes_dc_primitiveCoord;
+flat layout(location = 7) out int tes_dc_fvarCoord;
+flat layout(location = 8) out int tes_dc_shaderCoord;
+flat layout(location = 9) out int tes_dc_vertexCoord;
+flat layout(location = 10) out int tes_dc_topologyVisibilityCoord;
+flat layout(location = 11) out int tes_dc_varyingCoord;
+flat layout(location = 12) out int tes_dc_instanceIndexI0;
+flat layout(location = 13) out int tes_dc_instanceCoordsI0;
+layout(location = 0) out CurveVertexData {
+  vec4 Peye;
+} outData;
+layout(location = 1) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen TES Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = tcs_dc_modelCoord[0];
+  dc.constantCoord = tcs_dc_constantCoord[0];
+  dc.elementCoord = tcs_dc_elementCoord[0];
+  dc.primitiveCoord = tcs_dc_primitiveCoord[0];
+  dc.fvarCoord = tcs_dc_fvarCoord[0];
+  dc.shaderCoord = tcs_dc_shaderCoord[0];
+  dc.vertexCoord = tcs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = tcs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = tcs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = tcs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int GetElementID() {
+  return 0;
+}
+int GetAggregatedElementID() {
+  return GetElementID();
+}
+int GetEdgeFlag() {
+  return 0;
+}
+ivec3 GetPatchParam() {
+  return ivec3(0, 0, 0);
+}
+int GetFVarIndex(int localIndex) {
+  return 0;
+}
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return -1;
+}
+int GetPrimitiveEdgeId() {
+  return -1;
+}
+float GetSelectedEdgeOpacity() {
+  return 0.0;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc TES //////// 
+float InterpolatePrimvar(float inPv0, float inPv1, float inPv2, float inPv3, vec4 basis, vec2 uv);
+vec2 InterpolatePrimvar(vec2 inPv0, vec2 inPv1, vec2 inPv2, vec2 inPv3, vec4 basis, vec2 uv);
+vec3 InterpolatePrimvar(vec3 inPv0, vec3 inPv1, vec3 inPv2, vec3 inPv3, vec4 basis, vec2 uv);
+vec4 InterpolatePrimvar(vec4 inPv0, vec4 inPv1, vec4 inPv3, vec4 inPv3, vec4 basis, vec2 uv);
+void ProcessPrimvarsOut(vec4 basis, int i0, int i1, int i2, int i3, vec2 uv) {
+  hd_drawingCoord dc = GetDrawingCoord();
+  tes_dc_modelCoord = dc.modelCoord;
+  tes_dc_constantCoord = dc.constantCoord;
+  tes_dc_elementCoord = dc.elementCoord;
+  tes_dc_primitiveCoord = dc.primitiveCoord;
+  tes_dc_fvarCoord = dc.fvarCoord;
+  tes_dc_shaderCoord = dc.shaderCoord;
+  tes_dc_vertexCoord = dc.vertexCoord;
+  tes_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  tes_dc_varyingCoord = dc.varyingCoord;
+  tes_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = basis[0] * inPrimvars[i0].points + basis[1] * inPrimvars[i1].points + basis[2] * inPrimvars[i2].points + basis[3] * inPrimvars[i3].points;
+  outPrimvars.normals = basis[0] * inPrimvars[i0].normals + basis[1] * inPrimvars[i1].normals + basis[2] * inPrimvars[i2].normals + basis[3] * inPrimvars[i3].normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+struct Coeffs
+{
+    vec4 basis;
+    vec4 tangent_basis;
+};
+
+struct CurveData
+{
+    vec4 Peye[4];
+    vec3 Neye[4];
+};
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+CurveData PopulatePeye()
+{
+    CurveData vertexData;
+    for (int i = 0; i < gl_MaxPatchVertices; i++) {
+        vertexData.Peye[i] = inData[i].Peye;
+    }
+    return vertexData;
+}
+
+
+
+FORWARD_DECL(Coeffs evaluateBasis(float u, const vec4 cv[4]));
+
+void main()
+{
+    float u = gl_TessCoord.x;
+    float v = .5;
+
+    const vec4 cv[4] = {
+        inData[0].Peye,
+        inData[1].Peye,
+        inData[2].Peye,
+        inData[3].Peye,
+    };
+
+    Coeffs coeffs = evaluateBasis(u, cv);
+    vec4 basis = coeffs.basis;
+    vec4 pos =
+        basis[0] * cv[0] +
+        basis[1] * cv[1] +
+        basis[2] * cv[2] +
+        basis[3] * cv[3];
+
+    outData.Peye = pos;
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(basis, 0, 1, 2, 3, vec2(u, v)); // interpolate varying primvars
+}
+
+
+
+Coeffs evaluateBasis(float u, const vec4 cv[4])
+{
+  const float u2 = u*u;
+  const float u3 = u2*u;
+
+  vec4 basis; vec4 tangent_basis;
+  basis[0] = u3;
+  basis[1] = -3.0*u3 + 3.0*u2;
+  basis[2] = 3.0*u3 - 6.0*u2 + 3.0*u;
+  basis[3] = -1.0*u3 + 3.0*u2 - 3.0*u + 1.0;
+
+  tangent_basis[0] = 3.0*u2;
+  tangent_basis[1] = -9.0*u2 + 6.0*u;
+  tangent_basis[2] = 9.0*u2 - 12.0*u + 3.0;
+  tangent_basis[3] = -3.0*u2 + 6.0*u - 3.0;
+
+  Coeffs coeffs = { basis, tangent_basis };
+  return coeffs;
+}
+
+
+
+float InterpolatePrimvar(float inPv0, float inPv1, float inPv2, float inPv3,
+                         vec4 basis, vec2 uv)
+{
+    return mix(inPv2, inPv1, uv.x);
+}
+
+vec2 InterpolatePrimvar(vec2 inPv0, vec2 inPv1, vec2 inPv2, vec2 inPv3,
+                        vec4 basis, vec2 uv)
+{
+    return mix(inPv2, inPv1, uv.x);
+}
+
+vec3 InterpolatePrimvar(vec3 inPv0, vec3 inPv1, vec3 inPv2, vec3 inPv3,
+                        vec4 basis, vec2 uv)
+{
+    return mix(inPv2, inPv1, uv.x);
+}
+
+vec4 InterpolatePrimvar(vec4 inPv0, vec4 inPv1, vec4 inPv2, vec4 inPv3,
+                        vec4 basis, vec2 uv)
+{
+    return mix(inPv2, inPv1, uv.x);
+}
+
+
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PATCH_VERTS 4
+#define HD_NUM_PATCH_EVAL_VERTS 4
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+flat layout(location = 3) in int tes_dc_modelCoord;
+flat layout(location = 4) in int tes_dc_constantCoord;
+flat layout(location = 5) in int tes_dc_elementCoord;
+flat layout(location = 6) in int tes_dc_primitiveCoord;
+flat layout(location = 7) in int tes_dc_fvarCoord;
+flat layout(location = 8) in int tes_dc_shaderCoord;
+flat layout(location = 9) in int tes_dc_vertexCoord;
+flat layout(location = 10) in int tes_dc_topologyVisibilityCoord;
+flat layout(location = 11) in int tes_dc_varyingCoord;
+flat layout(location = 12) in int tes_dc_instanceIndexI0;
+flat layout(location = 13) in int tes_dc_instanceCoordsI0;
+layout(location = 0) in CurveVertexData {
+  vec4 Peye;
+} inData;
+layout(location = 1) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return vec3(0);
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = tes_dc_modelCoord;
+  dc.constantCoord = tes_dc_constantCoord;
+  dc.elementCoord = tes_dc_elementCoord;
+  dc.primitiveCoord = tes_dc_primitiveCoord;
+  dc.fvarCoord = tes_dc_fvarCoord;
+  dc.shaderCoord = tes_dc_shaderCoord;
+  dc.vertexCoord = tes_dc_vertexCoord;
+  dc.topologyVisibilityCoord = tes_dc_topologyVisibilityCoord;
+  dc.varyingCoord = tes_dc_varyingCoord;
+  dc.instanceIndex[0] = tes_dc_instanceIndexI0;
+  return dc; 
+}
+int GetElementID() {
+  return 0;
+}
+int GetAggregatedElementID() {
+  return GetElementID();
+}
+int GetEdgeFlag() {
+  return 0;
+}
+ivec3 GetPatchParam() {
+  return ivec3(0, 0, 0);
+}
+int GetFVarIndex(int localIndex) {
+  return 0;
+}
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return -1;
+}
+int GetPrimitiveEdgeId() {
+  return -1;
+}
+float GetSelectedEdgeOpacity() {
+  return 0.0;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+void main(void)
+{
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+    vec3 Peye = inData.Peye.xyz / inData.Peye.w;
+
+    // We would like to have a better oriented normal here, however to keep the
+    // shader fast, we use this camera-facing approximation.
+    vec3 Neye = vec3(0,0,1);
+
+    vec4 patchCoord = vec4(0);
+
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_edgeonly.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_edgeonly.out
new file mode 100644
index 0000000000..311ffb39bc
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_edgeonly.out
@@ -0,0 +1,6238 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.DecodeUtils", "Selection.Geometry.ElementSel", "Selection.Geometry.WireSelOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Triangle"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.EdgeCoord.Barycentric", "MeshWire.Fragment.EdgeMaskTriangle", "MeshWire.Fragment.EdgeCommon", "MeshWire.Fragment.EdgeParam", "MeshWire.Fragment.FinalEdgeOpacityForce", "MeshWire.Fragment.EdgeOnlyNoBlend", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.TriangleLines", "EdgeId.Fragment.TriangleParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[3];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return (HdGet_dispTextureCoord_Coarse(0) * (1-st.x-st.y) + HdGet_dispTextureCoord_Coarse(1) * st.x + HdGet_dispTextureCoord_Coarse(2) * st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[3] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+/// Decoding utilities for selection highlighting.
+/// This mixin may be safely included by any shader stage. Its lone dependency
+/// on code generation is the hdxSelectionBuffer SSBO that holds the encoded
+/// selection state.
+
+// This should match the HdSelection enum.
+int GetMaxNumSelectionHighlightModes()
+{
+    return 2;
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// helper methods to decode hdxSelectionBuffer
+// ------ selection highlight mode specifics -------
+bool HighlightModeHasSelection(int offset)
+{
+    return (offset != 0);
+}
+
+int GetIndexOffsetForHighlightMode(int mode)
+{
+    return HdGet_hdxSelectionBuffer(mode + 1/*[0] holds #modes*/);
+}
+
+int GetNumSelectionHighlightModes()
+{
+    return HdGet_hdxSelectionBuffer(0);
+}
+
+// ------  selection offset specifics -------
+// Note: This should match the selection offset encoding in
+// hdx/SelectionTracker.cpp
+void DecodeSelOffset(int selOffset, REF(thread, bool) isSelected,
+                     REF(thread, int) nextOffset)
+{
+    isSelected = bool(selOffset & 0x1); // bit 0
+    nextOffset = selOffset >> 1;        // bits 31:1
+}
+
+// --------- subprim decoding ----------
+// Each subprims offsets' buffer encoding is:
+// [subprim-type][min][max][     selOffsets     ]
+// <----------3 ----------><--- max - min + 1 -->
+struct SubprimHeader {
+    int type;
+    int min;
+    int max;
+};
+SubprimHeader DecodeSubprimHeader(int offset)
+{
+    SubprimHeader header;
+    header.type = HdGet_hdxSelectionBuffer(offset    );
+    header.min  = HdGet_hdxSelectionBuffer(offset + 1);
+    header.max  = HdGet_hdxSelectionBuffer(offset + 2);
+    return header;
+}
+
+bool IsSubprimSelected(int id, int min, int max, int headerStart,
+                       REF(thread, int) nextSubprimOffset)
+{
+    const int SUBPRIM_SELOFFSETS_HEADER_SIZE  = 3;
+
+    nextSubprimOffset = 0; // initialize
+    bool isSelected = false;
+
+    if (id >= min && id < max) {
+        int netSubprimIndex =
+            headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE + id - min;
+        int selOffset = HdGet_hdxSelectionBuffer(netSubprimIndex);
+
+        DecodeSelOffset(selOffset, /*out*/isSelected, /*out*/nextSubprimOffset);
+    } else {
+        // The subprim id does not fall in the selected id range, so the subprim
+        // in question isn't selected. However, we can still have other
+        // subprim(s) selected. To get the offset to jump to, we mimic decoding
+        // the "min" subprim id.
+        int minSubprimIndex = headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(minSubprimIndex),
+                        /*out*/isSelected, /*out*/nextSubprimOffset);
+        isSelected = false;
+    }
+
+    return isSelected;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// Keep the result struct definition outside guards.
+struct SubprimSelectionResult {
+    bool elementSelected;
+    bool edgeSelected;
+    bool pointSelected;
+    int  pointColorId;
+};
+
+SubprimSelectionResult InitSubprimSelectionResult(
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SubprimSelectionResult res;
+
+    res.elementSelected = _elementSelected;
+    res.edgeSelected = _edgeSelected;
+    res.pointSelected = _pointSelected;
+    res.pointColorId = _pointColorId;
+
+    return res;
+}
+
+bool IsAnySubprimSelected(SubprimSelectionResult s)
+{
+    return (s.elementSelected || s.edgeSelected || s.pointSelected);
+}
+bool HasCustomizedPointColor(SubprimSelectionResult s)
+{
+    // Use -1 to encode selected points that don't have a custom point color.
+    return (s.pointColorId != -1);
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// Note: These should match the SubprimType enum in hdx/SelectionTracker.cpp
+#define SUBPRIM_TYPE_ELEMENT 0
+#define SUBPRIM_TYPE_EDGE    1
+#define SUBPRIM_TYPE_POINT   2
+#define SUBPRIM_TYPE_INSTANCE 3
+
+SubprimSelectionResult GetSubprimSel(int offset,
+                                     int elementId, int edgeId, int pointId)
+{
+    SubprimSelectionResult s = InitSubprimSelectionResult(false, false, false, 0);
+
+    int nextSubprimOffset = 0;
+    SubprimHeader header = DecodeSubprimHeader(offset);
+
+    if (header.type == SUBPRIM_TYPE_ELEMENT) {
+        s.elementSelected =
+            IsSubprimSelected(elementId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has additional subprim(s) selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_EDGE) {
+        s.edgeSelected =
+            IsSubprimSelected(edgeId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has points selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_POINT) {
+        s.pointSelected =
+            IsSubprimSelected(pointId, header.min, header.max,
+                              offset, /*unused*/nextSubprimOffset);
+        // For points alone, since there isn't any subprim to follow it, the
+        // offset field is overriden to represent the index into the
+        // selectedPointColors buffer to support customized coloring of a set of
+        // selected points.
+        s.pointColorId = nextSubprimOffset;
+    }
+
+    return s;
+}
+
+// --------- instance decoding ----------
+bool IsInstanceSelected(int offset, REF(thread, int) nextOffset)
+{
+    // If we don't find an instance subprim block, pass the same offset to
+    // GetSubprimSel.
+    nextOffset = offset;
+    bool sel = false;
+
+    int instanceId = GetDrawingCoord().instanceIndex[0];
+
+    SubprimHeader header = DecodeSubprimHeader(offset);
+    if (header.type == SUBPRIM_TYPE_INSTANCE) {
+        sel =
+            IsSubprimSelected(instanceId, header.min, header.max,
+                              offset, /*out*/nextOffset);
+    }
+
+    return sel;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// --------- selection buffer decoding entry point ----------
+struct SelectionResult {
+    bool primOrInstanceSel;
+    SubprimSelectionResult subprimSel;
+};
+
+SelectionResult InitSelectionResult(
+    bool _primOrInstanceSel,
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SelectionResult res;
+
+    res.primOrInstanceSel = _primOrInstanceSel;
+    res.subprimSel = InitSubprimSelectionResult(
+                        _elementSelected, _edgeSelected,
+                        _pointSelected, _pointColorId);
+
+    return res;
+}
+
+
+// Decodes the selection buffer encoding scheme for a given mode, and returns
+// the selection result.
+SelectionResult GetSelectionResult(int mode,
+                                   int elementId, int edgeId, int pointId)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    // The hdxSelectionBuffer layout is:
+    // [#modes] [per-mode offset] [data mode0] ... [data modeM]
+    // [---------header---------]
+    // Each mode's data is laid out as:
+    // [ prims | points | edges | elements | instance level-N | ... | level 0 ]
+    //          <-------- subprims ------->  <----------- instances --------->
+    //          <---------------------- per prim ---------------------------->
+    // See hdx/SelectionTracker.cpp for details on the encoding scheme.
+    int modeOffset = GetIndexOffsetForHighlightMode(mode);
+    if (!HighlightModeHasSelection(modeOffset)) {
+        // highlight mode has no selected objects (prims/instances/elements)
+        return res;
+    }
+
+    const int PRIM_SELOFFSETS_HEADER_SIZE = 2;
+    const int primId = HdGet_primID();
+    int smin = HdGet_hdxSelectionBuffer(modeOffset);
+    int smax = HdGet_hdxSelectionBuffer(modeOffset + 1);
+
+    if (primId >= smin && primId < smax) {
+        int offset = modeOffset + PRIM_SELOFFSETS_HEADER_SIZE + primId - smin;
+        int nextOffset = 0;
+        bool sel = false;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(offset),
+                        /*out*/sel, /*out*/nextOffset);
+
+        // At this point, sel indicates whether the fragment corresponds to
+        // a prim that needs to be fully highlighted, while a non-zero
+        // nextOffset indicates whether additional decoding may be done.
+
+        // We don't currently differentiate between prim, instance and
+        // subprim selection highlighting (i.e., visually, they look the
+        // same), and thus can skip additional decoding if sel is true.
+        // We choose not to, for ease of future customization.
+        if (nextOffset != 0) {
+            // check if instance (or) subprim(s) are selected
+            offset = nextOffset;
+            sel = sel || IsInstanceSelected(offset, /*out*/nextOffset);
+
+            if (nextOffset != 0) {
+                res.subprimSel =
+                    GetSubprimSel(nextOffset, elementId, edgeId, pointId);
+            }
+        }
+        res.primOrInstanceSel = sel;
+    }
+#endif // HD_HAS_hdxSelectionBuffer
+
+    return res;
+}
+
+// Returns the logical OR of the inputs
+SelectionResult
+_CombineWithOr(SelectionResult a, SelectionResult b)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+    res.primOrInstanceSel = a.primOrInstanceSel || b.primOrInstanceSel;
+    res.subprimSel.elementSelected = a.subprimSel.elementSelected ||
+                                   b.subprimSel.elementSelected;
+    res.subprimSel.edgeSelected = a.subprimSel.edgeSelected ||
+                                b.subprimSel.edgeSelected;
+    res.subprimSel.pointSelected = a.subprimSel.pointSelected ||
+                                 b.subprimSel.pointSelected;
+    // pointColorIndex is ignored.
+    return res;
+}
+
+// Returns the net selection result aggregating the result of each selection
+// mode.
+SelectionResult GetNetSelectionResult(int elementId, int edgeId, int pointId)
+{
+    SelectionResult netResult = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    for (int mode = 0; mode < numSelectionModes; mode++) {
+        SelectionResult modeResult =
+            GetSelectionResult(mode, elementId, edgeId, pointId);
+        netResult = _CombineWithOr(modeResult, netResult);
+    }
+#endif
+    return netResult;
+}
+
+
+// Mixin for use in the geometry shader stage.
+// Helper functions to determine if the element (face) is selected for either
+// a given selection mode, or any of the modes.
+
+FORWARD_DECL(int GetElementID()); // code gen
+
+bool IsElementSelected(int mode)
+{
+    bool sel = false;
+    #if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    if (mode < numSelectionModes) {
+        SelectionResult res =
+            GetSelectionResult(mode, GetElementID(),
+                               /*edgeId*/-1, /*pointId*/-1);
+        if (res.subprimSel.elementSelected) {
+            sel = true;
+        }
+    }
+    #endif
+    return sel;
+}
+
+bool IsSelected()
+{
+    // Edge and point selection aren't relevant at the GS stage.
+    SelectionResult res = GetNetSelectionResult(
+        GetElementID(), /*edgeId*/-1, /*pointId*/-1);
+
+   return res.primOrInstanceSel || res.subprimSel.elementSelected;
+}
+
+
+// Mixin for use in the geometry shader stage for wireframe rendering.
+// See comment below.
+
+FORWARD_DECL(int GetMaxNumSelectionHighlightModes());
+FORWARD_DECL(bool IsElementSelected(int mode));
+FORWARD_DECL(int GetElementID()); // code gen
+
+vec4 ComputeSelectionOffset()
+{
+    // For wireframe, we only render the edges of faces.  Because we don't have
+    // a way to control which face gets rasterized first, if face A is selected
+    // and face B is unselected, it's possible for face B to draw over face A
+    // and for the highlight to be dropped.
+
+    // To compensate for this, since we're running the geometry shader anyway,
+    // add a small polygon offset for selected faces, to push them in front of
+    // unselected faces.
+
+    // For doubly-selected faces (e.g. rollover & selection), apply a double
+    // offset.  The code below chooses a unique offset for each combination
+    // of selection modes by constructing a bitmask of selection modes for
+    // this face, and reinterpreting it as an integer.
+
+    int offset = 0;
+
+    int numModes = GetMaxNumSelectionHighlightModes();
+    for (int mode = 0; mode < numModes; ++mode) {
+        if (IsElementSelected(mode)) {
+            offset += (1 << mode);
+        }
+    }
+
+    // Note: for our base epsilon, we're choosing this somewhat arbitrarily.
+    // This is an eye space epsilon, so it's not dependent on distance-from-
+    // camera.  Rather, it's dependent on scene scale.  1e-3 works well for
+    // our scenes, but if this causes trouble we could use an epsilon based on
+    // the eye-space distance of a z-buffer bit flip, which would match the
+    // behavior of glPolygonOffset better, at the cost of more math and some
+    // extra shader uniforms.
+    float eps = 1e-3;
+
+    return vec4(0, 0, offset * eps, 0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[3];
+    uv[0] = vec2(0, 0); // (0, 0, 1);
+    uv[1] = vec2(1, 0); // (1, 0, 0);
+    uv[2] = vec2(0, 1); // (0, 1, 0);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoordTriangle(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetTriGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetTriGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetTriGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec3 GetEdgeCoord()
+{
+    return GetBarycentricCoord();
+}
+
+
+
+vec3 GetPrimitiveEdgeMask()
+{
+    // A value of one in this mask hides the corresponding edge.
+    // (See hd/meshUtil.cpp)
+    return vec3(0, GetEdgeFlag() & 1, GetEdgeFlag() & 2);
+}
+
+
+
+// Returns the distance of the current fragment (in viewport pixel units) from
+// the nearest edge.
+float GetMinEdgeDistance()
+{
+    // Hide triangle edges by adding edge mask.
+    vec3 param = GetEdgeCoord() + GetPrimitiveEdgeMask();
+    vec3 edgeDistance = max(vec3(0.0), param / fwidth(param));
+    return min(edgeDistance.x,
+               min(edgeDistance.y,
+                   edgeDistance.z));
+}
+
+// Use edge distance to compute a smooth opacity falloff for good looking edges.
+float GetEdgeFalloff(float d) {
+    return exp2(-4 * d * d);
+}
+
+float GetEdgeOpacity() {
+    return GetEdgeFalloff(GetMinEdgeDistance());
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+vec4 ApplyFinalEdgeOpacity(vec4 Cfill)
+{
+    Cfill.a = 1.0;
+    return Cfill;
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    float p = GetEdgeOpacity();
+    if (p < 0.5) discard;
+
+    return ApplyFinalEdgeOpacity(Cfill);
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec3 ComputeBaseFaceEdgeDistanceTriangle()
+{
+    // Use parametric distance since we can't use surface derivatives for lines
+    vec3 param = GetEdgeParamTriangle();
+    bvec3 nearEdge = lessThan(param, vec3(edgePickParametricRadius));
+    return vec3(edgePickRadius) * vec3(not(nearEdge));
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //              2 (0,1,0)
+    //              ^
+    //         e2 /   \ e1
+    //           /     \'
+    // (0,0,1)  0 ----- 1 (1,0,0)
+    //              e0
+
+    int edgeId = -1;
+
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const int meshEdgeIndex = HdGetScalar_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndex + edgeId; // regular triangle face.
+    } else if ((bool(edgeFlag & 1) && edgeId == 2) ||
+               (bool(edgeFlag & 2) && edgeId == 0)) {
+        edgeId = -1; // Not an authored mesh edge
+    } else {
+        edgeId = meshEdgeIndex + edgeId - 1;
+    }
+    return edgeId;
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.DecodeUtils", "Selection.Geometry.ElementSel", "Selection.Geometry.WireSelOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Quad"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.EdgeCoord.Barycentric", "MeshWire.Fragment.EdgeMaskQuad", "MeshWire.Fragment.EdgeCommon", "MeshWire.Fragment.EdgeParam", "MeshWire.Fragment.FinalEdgeOpacityForce", "MeshWire.Fragment.EdgeOnlyNoBlend", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.QuadLines", "EdgeId.Fragment.QuadParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (lines_adjacency) in;
+layout (triangle_strip, max_vertices = 6) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[4];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return mix(mix(HdGet_dispTextureCoord_Coarse(0),HdGet_dispTextureCoord_Coarse(1), st.x),mix(HdGet_dispTextureCoord_Coarse(3),HdGet_dispTextureCoord_Coarse(2), st.x), st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[4] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1), vec3(0,1,0)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+/// Decoding utilities for selection highlighting.
+/// This mixin may be safely included by any shader stage. Its lone dependency
+/// on code generation is the hdxSelectionBuffer SSBO that holds the encoded
+/// selection state.
+
+// This should match the HdSelection enum.
+int GetMaxNumSelectionHighlightModes()
+{
+    return 2;
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// helper methods to decode hdxSelectionBuffer
+// ------ selection highlight mode specifics -------
+bool HighlightModeHasSelection(int offset)
+{
+    return (offset != 0);
+}
+
+int GetIndexOffsetForHighlightMode(int mode)
+{
+    return HdGet_hdxSelectionBuffer(mode + 1/*[0] holds #modes*/);
+}
+
+int GetNumSelectionHighlightModes()
+{
+    return HdGet_hdxSelectionBuffer(0);
+}
+
+// ------  selection offset specifics -------
+// Note: This should match the selection offset encoding in
+// hdx/SelectionTracker.cpp
+void DecodeSelOffset(int selOffset, REF(thread, bool) isSelected,
+                     REF(thread, int) nextOffset)
+{
+    isSelected = bool(selOffset & 0x1); // bit 0
+    nextOffset = selOffset >> 1;        // bits 31:1
+}
+
+// --------- subprim decoding ----------
+// Each subprims offsets' buffer encoding is:
+// [subprim-type][min][max][     selOffsets     ]
+// <----------3 ----------><--- max - min + 1 -->
+struct SubprimHeader {
+    int type;
+    int min;
+    int max;
+};
+SubprimHeader DecodeSubprimHeader(int offset)
+{
+    SubprimHeader header;
+    header.type = HdGet_hdxSelectionBuffer(offset    );
+    header.min  = HdGet_hdxSelectionBuffer(offset + 1);
+    header.max  = HdGet_hdxSelectionBuffer(offset + 2);
+    return header;
+}
+
+bool IsSubprimSelected(int id, int min, int max, int headerStart,
+                       REF(thread, int) nextSubprimOffset)
+{
+    const int SUBPRIM_SELOFFSETS_HEADER_SIZE  = 3;
+
+    nextSubprimOffset = 0; // initialize
+    bool isSelected = false;
+
+    if (id >= min && id < max) {
+        int netSubprimIndex =
+            headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE + id - min;
+        int selOffset = HdGet_hdxSelectionBuffer(netSubprimIndex);
+
+        DecodeSelOffset(selOffset, /*out*/isSelected, /*out*/nextSubprimOffset);
+    } else {
+        // The subprim id does not fall in the selected id range, so the subprim
+        // in question isn't selected. However, we can still have other
+        // subprim(s) selected. To get the offset to jump to, we mimic decoding
+        // the "min" subprim id.
+        int minSubprimIndex = headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(minSubprimIndex),
+                        /*out*/isSelected, /*out*/nextSubprimOffset);
+        isSelected = false;
+    }
+
+    return isSelected;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// Keep the result struct definition outside guards.
+struct SubprimSelectionResult {
+    bool elementSelected;
+    bool edgeSelected;
+    bool pointSelected;
+    int  pointColorId;
+};
+
+SubprimSelectionResult InitSubprimSelectionResult(
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SubprimSelectionResult res;
+
+    res.elementSelected = _elementSelected;
+    res.edgeSelected = _edgeSelected;
+    res.pointSelected = _pointSelected;
+    res.pointColorId = _pointColorId;
+
+    return res;
+}
+
+bool IsAnySubprimSelected(SubprimSelectionResult s)
+{
+    return (s.elementSelected || s.edgeSelected || s.pointSelected);
+}
+bool HasCustomizedPointColor(SubprimSelectionResult s)
+{
+    // Use -1 to encode selected points that don't have a custom point color.
+    return (s.pointColorId != -1);
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// Note: These should match the SubprimType enum in hdx/SelectionTracker.cpp
+#define SUBPRIM_TYPE_ELEMENT 0
+#define SUBPRIM_TYPE_EDGE    1
+#define SUBPRIM_TYPE_POINT   2
+#define SUBPRIM_TYPE_INSTANCE 3
+
+SubprimSelectionResult GetSubprimSel(int offset,
+                                     int elementId, int edgeId, int pointId)
+{
+    SubprimSelectionResult s = InitSubprimSelectionResult(false, false, false, 0);
+
+    int nextSubprimOffset = 0;
+    SubprimHeader header = DecodeSubprimHeader(offset);
+
+    if (header.type == SUBPRIM_TYPE_ELEMENT) {
+        s.elementSelected =
+            IsSubprimSelected(elementId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has additional subprim(s) selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_EDGE) {
+        s.edgeSelected =
+            IsSubprimSelected(edgeId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has points selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_POINT) {
+        s.pointSelected =
+            IsSubprimSelected(pointId, header.min, header.max,
+                              offset, /*unused*/nextSubprimOffset);
+        // For points alone, since there isn't any subprim to follow it, the
+        // offset field is overriden to represent the index into the
+        // selectedPointColors buffer to support customized coloring of a set of
+        // selected points.
+        s.pointColorId = nextSubprimOffset;
+    }
+
+    return s;
+}
+
+// --------- instance decoding ----------
+bool IsInstanceSelected(int offset, REF(thread, int) nextOffset)
+{
+    // If we don't find an instance subprim block, pass the same offset to
+    // GetSubprimSel.
+    nextOffset = offset;
+    bool sel = false;
+
+    int instanceId = GetDrawingCoord().instanceIndex[0];
+
+    SubprimHeader header = DecodeSubprimHeader(offset);
+    if (header.type == SUBPRIM_TYPE_INSTANCE) {
+        sel =
+            IsSubprimSelected(instanceId, header.min, header.max,
+                              offset, /*out*/nextOffset);
+    }
+
+    return sel;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// --------- selection buffer decoding entry point ----------
+struct SelectionResult {
+    bool primOrInstanceSel;
+    SubprimSelectionResult subprimSel;
+};
+
+SelectionResult InitSelectionResult(
+    bool _primOrInstanceSel,
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SelectionResult res;
+
+    res.primOrInstanceSel = _primOrInstanceSel;
+    res.subprimSel = InitSubprimSelectionResult(
+                        _elementSelected, _edgeSelected,
+                        _pointSelected, _pointColorId);
+
+    return res;
+}
+
+
+// Decodes the selection buffer encoding scheme for a given mode, and returns
+// the selection result.
+SelectionResult GetSelectionResult(int mode,
+                                   int elementId, int edgeId, int pointId)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    // The hdxSelectionBuffer layout is:
+    // [#modes] [per-mode offset] [data mode0] ... [data modeM]
+    // [---------header---------]
+    // Each mode's data is laid out as:
+    // [ prims | points | edges | elements | instance level-N | ... | level 0 ]
+    //          <-------- subprims ------->  <----------- instances --------->
+    //          <---------------------- per prim ---------------------------->
+    // See hdx/SelectionTracker.cpp for details on the encoding scheme.
+    int modeOffset = GetIndexOffsetForHighlightMode(mode);
+    if (!HighlightModeHasSelection(modeOffset)) {
+        // highlight mode has no selected objects (prims/instances/elements)
+        return res;
+    }
+
+    const int PRIM_SELOFFSETS_HEADER_SIZE = 2;
+    const int primId = HdGet_primID();
+    int smin = HdGet_hdxSelectionBuffer(modeOffset);
+    int smax = HdGet_hdxSelectionBuffer(modeOffset + 1);
+
+    if (primId >= smin && primId < smax) {
+        int offset = modeOffset + PRIM_SELOFFSETS_HEADER_SIZE + primId - smin;
+        int nextOffset = 0;
+        bool sel = false;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(offset),
+                        /*out*/sel, /*out*/nextOffset);
+
+        // At this point, sel indicates whether the fragment corresponds to
+        // a prim that needs to be fully highlighted, while a non-zero
+        // nextOffset indicates whether additional decoding may be done.
+
+        // We don't currently differentiate between prim, instance and
+        // subprim selection highlighting (i.e., visually, they look the
+        // same), and thus can skip additional decoding if sel is true.
+        // We choose not to, for ease of future customization.
+        if (nextOffset != 0) {
+            // check if instance (or) subprim(s) are selected
+            offset = nextOffset;
+            sel = sel || IsInstanceSelected(offset, /*out*/nextOffset);
+
+            if (nextOffset != 0) {
+                res.subprimSel =
+                    GetSubprimSel(nextOffset, elementId, edgeId, pointId);
+            }
+        }
+        res.primOrInstanceSel = sel;
+    }
+#endif // HD_HAS_hdxSelectionBuffer
+
+    return res;
+}
+
+// Returns the logical OR of the inputs
+SelectionResult
+_CombineWithOr(SelectionResult a, SelectionResult b)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+    res.primOrInstanceSel = a.primOrInstanceSel || b.primOrInstanceSel;
+    res.subprimSel.elementSelected = a.subprimSel.elementSelected ||
+                                   b.subprimSel.elementSelected;
+    res.subprimSel.edgeSelected = a.subprimSel.edgeSelected ||
+                                b.subprimSel.edgeSelected;
+    res.subprimSel.pointSelected = a.subprimSel.pointSelected ||
+                                 b.subprimSel.pointSelected;
+    // pointColorIndex is ignored.
+    return res;
+}
+
+// Returns the net selection result aggregating the result of each selection
+// mode.
+SelectionResult GetNetSelectionResult(int elementId, int edgeId, int pointId)
+{
+    SelectionResult netResult = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    for (int mode = 0; mode < numSelectionModes; mode++) {
+        SelectionResult modeResult =
+            GetSelectionResult(mode, elementId, edgeId, pointId);
+        netResult = _CombineWithOr(modeResult, netResult);
+    }
+#endif
+    return netResult;
+}
+
+
+// Mixin for use in the geometry shader stage.
+// Helper functions to determine if the element (face) is selected for either
+// a given selection mode, or any of the modes.
+
+FORWARD_DECL(int GetElementID()); // code gen
+
+bool IsElementSelected(int mode)
+{
+    bool sel = false;
+    #if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    if (mode < numSelectionModes) {
+        SelectionResult res =
+            GetSelectionResult(mode, GetElementID(),
+                               /*edgeId*/-1, /*pointId*/-1);
+        if (res.subprimSel.elementSelected) {
+            sel = true;
+        }
+    }
+    #endif
+    return sel;
+}
+
+bool IsSelected()
+{
+    // Edge and point selection aren't relevant at the GS stage.
+    SelectionResult res = GetNetSelectionResult(
+        GetElementID(), /*edgeId*/-1, /*pointId*/-1);
+
+   return res.primOrInstanceSel || res.subprimSel.elementSelected;
+}
+
+
+// Mixin for use in the geometry shader stage for wireframe rendering.
+// See comment below.
+
+FORWARD_DECL(int GetMaxNumSelectionHighlightModes());
+FORWARD_DECL(bool IsElementSelected(int mode));
+FORWARD_DECL(int GetElementID()); // code gen
+
+vec4 ComputeSelectionOffset()
+{
+    // For wireframe, we only render the edges of faces.  Because we don't have
+    // a way to control which face gets rasterized first, if face A is selected
+    // and face B is unselected, it's possible for face B to draw over face A
+    // and for the highlight to be dropped.
+
+    // To compensate for this, since we're running the geometry shader anyway,
+    // add a small polygon offset for selected faces, to push them in front of
+    // unselected faces.
+
+    // For doubly-selected faces (e.g. rollover & selection), apply a double
+    // offset.  The code below chooses a unique offset for each combination
+    // of selection modes by constructing a bitmask of selection modes for
+    // this face, and reinterpreting it as an integer.
+
+    int offset = 0;
+
+    int numModes = GetMaxNumSelectionHighlightModes();
+    for (int mode = 0; mode < numModes; ++mode) {
+        if (IsElementSelected(mode)) {
+            offset += (1 << mode);
+        }
+    }
+
+    // Note: for our base epsilon, we're choosing this somewhat arbitrarily.
+    // This is an eye space epsilon, so it's not dependent on distance-from-
+    // camera.  Rather, it's dependent on scene scale.  1e-3 works well for
+    // our scenes, but if this causes trouble we could use an epsilon based on
+    // the eye-space distance of a z-buffer bit flip, which would match the
+    // behavior of glPolygonOffset better, at the cost of more math and some
+    // extra shader uniforms.
+    float eps = 1e-3;
+
+    return vec4(0, 0, offset * eps, 0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[4];
+    uv[0] = vec2(0, 0);
+    uv[1] = vec2(1, 0);
+    uv[2] = vec2(1, 1);
+    uv[3] = vec2(0, 1);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoord(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetQuadGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetQuadGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetQuadGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye3 = GetNormal(inData[3].Neye, 3);
+    Neye3 = GetQuadGeometryNormal(Neye3, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+    vec4 Peye3 = DisplacementTerminal(
+        3, inData[3].Peye, Neye3, GetPatchCoord(3));
+
+    // Generate triangles (0,1,2) and (2,3,0)
+    //  3---2
+    //  |  .|
+    //  | . |
+    //  |.  |
+    //  0---1
+    // The indices post-quadrangulation/subdivision follow the convention:
+    // 0   -> original (hull) vertex
+    // 1,3 -> edge vertices
+    // 2   -> center vertex
+    //
+    // By having index 2 in both the triangles, we ensure the pre-quadrangulated
+    // face's normal (at the center) is part of the rasterizer interpolation,
+    // which matters when we use smooth/limit normals.
+    // In the case of flat normals, we use the vertex positions, so it doesn't
+    // matter.
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+    Peye3 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+    EndPrimitive();
+
+    // triangle 1: vertices (2,3,0)
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+    emit(2, Peye2, Neye2);
+    emit(3, Peye3, Neye3);
+    emit(0, Peye0, Neye0);
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec3 GetEdgeCoord()
+{
+    return GetBarycentricCoord();
+}
+
+
+
+vec3 GetPrimitiveEdgeMask()
+{
+    // A value of one in this mask hides the corresponding edge.
+    // (See hd/meshUtil.cpp)
+    return vec3(GetEdgeFlag() != 0, 1, 0);
+}
+
+
+
+// Returns the distance of the current fragment (in viewport pixel units) from
+// the nearest edge.
+float GetMinEdgeDistance()
+{
+    // Hide triangle edges by adding edge mask.
+    vec3 param = GetEdgeCoord() + GetPrimitiveEdgeMask();
+    vec3 edgeDistance = max(vec3(0.0), param / fwidth(param));
+    return min(edgeDistance.x,
+               min(edgeDistance.y,
+                   edgeDistance.z));
+}
+
+// Use edge distance to compute a smooth opacity falloff for good looking edges.
+float GetEdgeFalloff(float d) {
+    return exp2(-4 * d * d);
+}
+
+float GetEdgeOpacity() {
+    return GetEdgeFalloff(GetMinEdgeDistance());
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+vec4 ApplyFinalEdgeOpacity(vec4 Cfill)
+{
+    Cfill.a = 1.0;
+    return Cfill;
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    float p = GetEdgeOpacity();
+    if (p < 0.5) discard;
+
+    return ApplyFinalEdgeOpacity(Cfill);
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec4 ComputeBaseFaceEdgeDistanceQuad()
+{
+    // Use parametric distance since we can't use surface derivatives for lines
+    vec4 param = GetEdgeParamQuad();
+    bvec4 nearEdge = lessThan(param, vec4(edgePickParametricRadius));
+    return vec4(edgePickRadius) * vec4(not(nearEdge));
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else if (dist.w < edgePickRadius) {
+        closestEdgeDistance = dist.w;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //               e2
+    //     (0,1) 3 ------ 2 (1,1)
+    //           |        |
+    //       e3  |        |  e1
+    //           |        |
+    //     (0,0) 0 ------ 1 (1,0)
+    //               e0
+
+    int edgeId = -1;
+
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else if (dist.w < edgePickRadius) {
+        edgeId = 3;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const ivec2 meshEdgeIndices = HdGet_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndices[0] + edgeId; // regular quad face
+    } else if (edgeId == 0) {
+        edgeId = meshEdgeIndices[0];
+    } else if (edgeId == 3) {
+        edgeId = meshEdgeIndices[1];
+    } else {
+        edgeId = -1; // Not an authored mesh edge
+    }
+    return edgeId;
+}
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_edgeonly_blendwireframe.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_edgeonly_blendwireframe.out
new file mode 100644
index 0000000000..064c43cf3c
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_edgeonly_blendwireframe.out
@@ -0,0 +1,6250 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.DecodeUtils", "Selection.Geometry.ElementSel", "Selection.Geometry.WireSelOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Triangle"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.EdgeCoord.Barycentric", "MeshWire.Fragment.EdgeMaskTriangle", "MeshWire.Fragment.EdgeCommon", "MeshWire.Fragment.EdgeParam", "MeshWire.Fragment.FinalEdgeOpacityForce", "MeshWire.Fragment.EdgeOnlyBlendColor", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.TriangleLines", "EdgeId.Fragment.TriangleParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[3];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return (HdGet_dispTextureCoord_Coarse(0) * (1-st.x-st.y) + HdGet_dispTextureCoord_Coarse(1) * st.x + HdGet_dispTextureCoord_Coarse(2) * st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[3] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+/// Decoding utilities for selection highlighting.
+/// This mixin may be safely included by any shader stage. Its lone dependency
+/// on code generation is the hdxSelectionBuffer SSBO that holds the encoded
+/// selection state.
+
+// This should match the HdSelection enum.
+int GetMaxNumSelectionHighlightModes()
+{
+    return 2;
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// helper methods to decode hdxSelectionBuffer
+// ------ selection highlight mode specifics -------
+bool HighlightModeHasSelection(int offset)
+{
+    return (offset != 0);
+}
+
+int GetIndexOffsetForHighlightMode(int mode)
+{
+    return HdGet_hdxSelectionBuffer(mode + 1/*[0] holds #modes*/);
+}
+
+int GetNumSelectionHighlightModes()
+{
+    return HdGet_hdxSelectionBuffer(0);
+}
+
+// ------  selection offset specifics -------
+// Note: This should match the selection offset encoding in
+// hdx/SelectionTracker.cpp
+void DecodeSelOffset(int selOffset, REF(thread, bool) isSelected,
+                     REF(thread, int) nextOffset)
+{
+    isSelected = bool(selOffset & 0x1); // bit 0
+    nextOffset = selOffset >> 1;        // bits 31:1
+}
+
+// --------- subprim decoding ----------
+// Each subprims offsets' buffer encoding is:
+// [subprim-type][min][max][     selOffsets     ]
+// <----------3 ----------><--- max - min + 1 -->
+struct SubprimHeader {
+    int type;
+    int min;
+    int max;
+};
+SubprimHeader DecodeSubprimHeader(int offset)
+{
+    SubprimHeader header;
+    header.type = HdGet_hdxSelectionBuffer(offset    );
+    header.min  = HdGet_hdxSelectionBuffer(offset + 1);
+    header.max  = HdGet_hdxSelectionBuffer(offset + 2);
+    return header;
+}
+
+bool IsSubprimSelected(int id, int min, int max, int headerStart,
+                       REF(thread, int) nextSubprimOffset)
+{
+    const int SUBPRIM_SELOFFSETS_HEADER_SIZE  = 3;
+
+    nextSubprimOffset = 0; // initialize
+    bool isSelected = false;
+
+    if (id >= min && id < max) {
+        int netSubprimIndex =
+            headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE + id - min;
+        int selOffset = HdGet_hdxSelectionBuffer(netSubprimIndex);
+
+        DecodeSelOffset(selOffset, /*out*/isSelected, /*out*/nextSubprimOffset);
+    } else {
+        // The subprim id does not fall in the selected id range, so the subprim
+        // in question isn't selected. However, we can still have other
+        // subprim(s) selected. To get the offset to jump to, we mimic decoding
+        // the "min" subprim id.
+        int minSubprimIndex = headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(minSubprimIndex),
+                        /*out*/isSelected, /*out*/nextSubprimOffset);
+        isSelected = false;
+    }
+
+    return isSelected;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// Keep the result struct definition outside guards.
+struct SubprimSelectionResult {
+    bool elementSelected;
+    bool edgeSelected;
+    bool pointSelected;
+    int  pointColorId;
+};
+
+SubprimSelectionResult InitSubprimSelectionResult(
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SubprimSelectionResult res;
+
+    res.elementSelected = _elementSelected;
+    res.edgeSelected = _edgeSelected;
+    res.pointSelected = _pointSelected;
+    res.pointColorId = _pointColorId;
+
+    return res;
+}
+
+bool IsAnySubprimSelected(SubprimSelectionResult s)
+{
+    return (s.elementSelected || s.edgeSelected || s.pointSelected);
+}
+bool HasCustomizedPointColor(SubprimSelectionResult s)
+{
+    // Use -1 to encode selected points that don't have a custom point color.
+    return (s.pointColorId != -1);
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// Note: These should match the SubprimType enum in hdx/SelectionTracker.cpp
+#define SUBPRIM_TYPE_ELEMENT 0
+#define SUBPRIM_TYPE_EDGE    1
+#define SUBPRIM_TYPE_POINT   2
+#define SUBPRIM_TYPE_INSTANCE 3
+
+SubprimSelectionResult GetSubprimSel(int offset,
+                                     int elementId, int edgeId, int pointId)
+{
+    SubprimSelectionResult s = InitSubprimSelectionResult(false, false, false, 0);
+
+    int nextSubprimOffset = 0;
+    SubprimHeader header = DecodeSubprimHeader(offset);
+
+    if (header.type == SUBPRIM_TYPE_ELEMENT) {
+        s.elementSelected =
+            IsSubprimSelected(elementId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has additional subprim(s) selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_EDGE) {
+        s.edgeSelected =
+            IsSubprimSelected(edgeId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has points selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_POINT) {
+        s.pointSelected =
+            IsSubprimSelected(pointId, header.min, header.max,
+                              offset, /*unused*/nextSubprimOffset);
+        // For points alone, since there isn't any subprim to follow it, the
+        // offset field is overriden to represent the index into the
+        // selectedPointColors buffer to support customized coloring of a set of
+        // selected points.
+        s.pointColorId = nextSubprimOffset;
+    }
+
+    return s;
+}
+
+// --------- instance decoding ----------
+bool IsInstanceSelected(int offset, REF(thread, int) nextOffset)
+{
+    // If we don't find an instance subprim block, pass the same offset to
+    // GetSubprimSel.
+    nextOffset = offset;
+    bool sel = false;
+
+    int instanceId = GetDrawingCoord().instanceIndex[0];
+
+    SubprimHeader header = DecodeSubprimHeader(offset);
+    if (header.type == SUBPRIM_TYPE_INSTANCE) {
+        sel =
+            IsSubprimSelected(instanceId, header.min, header.max,
+                              offset, /*out*/nextOffset);
+    }
+
+    return sel;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// --------- selection buffer decoding entry point ----------
+struct SelectionResult {
+    bool primOrInstanceSel;
+    SubprimSelectionResult subprimSel;
+};
+
+SelectionResult InitSelectionResult(
+    bool _primOrInstanceSel,
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SelectionResult res;
+
+    res.primOrInstanceSel = _primOrInstanceSel;
+    res.subprimSel = InitSubprimSelectionResult(
+                        _elementSelected, _edgeSelected,
+                        _pointSelected, _pointColorId);
+
+    return res;
+}
+
+
+// Decodes the selection buffer encoding scheme for a given mode, and returns
+// the selection result.
+SelectionResult GetSelectionResult(int mode,
+                                   int elementId, int edgeId, int pointId)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    // The hdxSelectionBuffer layout is:
+    // [#modes] [per-mode offset] [data mode0] ... [data modeM]
+    // [---------header---------]
+    // Each mode's data is laid out as:
+    // [ prims | points | edges | elements | instance level-N | ... | level 0 ]
+    //          <-------- subprims ------->  <----------- instances --------->
+    //          <---------------------- per prim ---------------------------->
+    // See hdx/SelectionTracker.cpp for details on the encoding scheme.
+    int modeOffset = GetIndexOffsetForHighlightMode(mode);
+    if (!HighlightModeHasSelection(modeOffset)) {
+        // highlight mode has no selected objects (prims/instances/elements)
+        return res;
+    }
+
+    const int PRIM_SELOFFSETS_HEADER_SIZE = 2;
+    const int primId = HdGet_primID();
+    int smin = HdGet_hdxSelectionBuffer(modeOffset);
+    int smax = HdGet_hdxSelectionBuffer(modeOffset + 1);
+
+    if (primId >= smin && primId < smax) {
+        int offset = modeOffset + PRIM_SELOFFSETS_HEADER_SIZE + primId - smin;
+        int nextOffset = 0;
+        bool sel = false;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(offset),
+                        /*out*/sel, /*out*/nextOffset);
+
+        // At this point, sel indicates whether the fragment corresponds to
+        // a prim that needs to be fully highlighted, while a non-zero
+        // nextOffset indicates whether additional decoding may be done.
+
+        // We don't currently differentiate between prim, instance and
+        // subprim selection highlighting (i.e., visually, they look the
+        // same), and thus can skip additional decoding if sel is true.
+        // We choose not to, for ease of future customization.
+        if (nextOffset != 0) {
+            // check if instance (or) subprim(s) are selected
+            offset = nextOffset;
+            sel = sel || IsInstanceSelected(offset, /*out*/nextOffset);
+
+            if (nextOffset != 0) {
+                res.subprimSel =
+                    GetSubprimSel(nextOffset, elementId, edgeId, pointId);
+            }
+        }
+        res.primOrInstanceSel = sel;
+    }
+#endif // HD_HAS_hdxSelectionBuffer
+
+    return res;
+}
+
+// Returns the logical OR of the inputs
+SelectionResult
+_CombineWithOr(SelectionResult a, SelectionResult b)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+    res.primOrInstanceSel = a.primOrInstanceSel || b.primOrInstanceSel;
+    res.subprimSel.elementSelected = a.subprimSel.elementSelected ||
+                                   b.subprimSel.elementSelected;
+    res.subprimSel.edgeSelected = a.subprimSel.edgeSelected ||
+                                b.subprimSel.edgeSelected;
+    res.subprimSel.pointSelected = a.subprimSel.pointSelected ||
+                                 b.subprimSel.pointSelected;
+    // pointColorIndex is ignored.
+    return res;
+}
+
+// Returns the net selection result aggregating the result of each selection
+// mode.
+SelectionResult GetNetSelectionResult(int elementId, int edgeId, int pointId)
+{
+    SelectionResult netResult = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    for (int mode = 0; mode < numSelectionModes; mode++) {
+        SelectionResult modeResult =
+            GetSelectionResult(mode, elementId, edgeId, pointId);
+        netResult = _CombineWithOr(modeResult, netResult);
+    }
+#endif
+    return netResult;
+}
+
+
+// Mixin for use in the geometry shader stage.
+// Helper functions to determine if the element (face) is selected for either
+// a given selection mode, or any of the modes.
+
+FORWARD_DECL(int GetElementID()); // code gen
+
+bool IsElementSelected(int mode)
+{
+    bool sel = false;
+    #if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    if (mode < numSelectionModes) {
+        SelectionResult res =
+            GetSelectionResult(mode, GetElementID(),
+                               /*edgeId*/-1, /*pointId*/-1);
+        if (res.subprimSel.elementSelected) {
+            sel = true;
+        }
+    }
+    #endif
+    return sel;
+}
+
+bool IsSelected()
+{
+    // Edge and point selection aren't relevant at the GS stage.
+    SelectionResult res = GetNetSelectionResult(
+        GetElementID(), /*edgeId*/-1, /*pointId*/-1);
+
+   return res.primOrInstanceSel || res.subprimSel.elementSelected;
+}
+
+
+// Mixin for use in the geometry shader stage for wireframe rendering.
+// See comment below.
+
+FORWARD_DECL(int GetMaxNumSelectionHighlightModes());
+FORWARD_DECL(bool IsElementSelected(int mode));
+FORWARD_DECL(int GetElementID()); // code gen
+
+vec4 ComputeSelectionOffset()
+{
+    // For wireframe, we only render the edges of faces.  Because we don't have
+    // a way to control which face gets rasterized first, if face A is selected
+    // and face B is unselected, it's possible for face B to draw over face A
+    // and for the highlight to be dropped.
+
+    // To compensate for this, since we're running the geometry shader anyway,
+    // add a small polygon offset for selected faces, to push them in front of
+    // unselected faces.
+
+    // For doubly-selected faces (e.g. rollover & selection), apply a double
+    // offset.  The code below chooses a unique offset for each combination
+    // of selection modes by constructing a bitmask of selection modes for
+    // this face, and reinterpreting it as an integer.
+
+    int offset = 0;
+
+    int numModes = GetMaxNumSelectionHighlightModes();
+    for (int mode = 0; mode < numModes; ++mode) {
+        if (IsElementSelected(mode)) {
+            offset += (1 << mode);
+        }
+    }
+
+    // Note: for our base epsilon, we're choosing this somewhat arbitrarily.
+    // This is an eye space epsilon, so it's not dependent on distance-from-
+    // camera.  Rather, it's dependent on scene scale.  1e-3 works well for
+    // our scenes, but if this causes trouble we could use an epsilon based on
+    // the eye-space distance of a z-buffer bit flip, which would match the
+    // behavior of glPolygonOffset better, at the cost of more math and some
+    // extra shader uniforms.
+    float eps = 1e-3;
+
+    return vec4(0, 0, offset * eps, 0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[3];
+    uv[0] = vec2(0, 0); // (0, 0, 1);
+    uv[1] = vec2(1, 0); // (1, 0, 0);
+    uv[2] = vec2(0, 1); // (0, 1, 0);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoordTriangle(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetTriGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetTriGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetTriGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec3 GetEdgeCoord()
+{
+    return GetBarycentricCoord();
+}
+
+
+
+vec3 GetPrimitiveEdgeMask()
+{
+    // A value of one in this mask hides the corresponding edge.
+    // (See hd/meshUtil.cpp)
+    return vec3(0, GetEdgeFlag() & 1, GetEdgeFlag() & 2);
+}
+
+
+
+// Returns the distance of the current fragment (in viewport pixel units) from
+// the nearest edge.
+float GetMinEdgeDistance()
+{
+    // Hide triangle edges by adding edge mask.
+    vec3 param = GetEdgeCoord() + GetPrimitiveEdgeMask();
+    vec3 edgeDistance = max(vec3(0.0), param / fwidth(param));
+    return min(edgeDistance.x,
+               min(edgeDistance.y,
+                   edgeDistance.z));
+}
+
+// Use edge distance to compute a smooth opacity falloff for good looking edges.
+float GetEdgeFalloff(float d) {
+    return exp2(-4 * d * d);
+}
+
+float GetEdgeOpacity() {
+    return GetEdgeFalloff(GetMinEdgeDistance());
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+vec4 ApplyFinalEdgeOpacity(vec4 Cfill)
+{
+    Cfill.a = 1.0;
+    return Cfill;
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    float p = GetEdgeOpacity();
+    if (p < 0.5) discard;
+
+    vec4 wireColor = GetWireframeColor();
+
+    // If wireColor is unset (zero), ignore it altogether
+
+    Cfill.rgb = mix(Cfill.rgb, wireColor.rgb, wireColor.a);
+
+    return ApplyFinalEdgeOpacity(Cfill);
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec3 ComputeBaseFaceEdgeDistanceTriangle()
+{
+    // Use parametric distance since we can't use surface derivatives for lines
+    vec3 param = GetEdgeParamTriangle();
+    bvec3 nearEdge = lessThan(param, vec3(edgePickParametricRadius));
+    return vec3(edgePickRadius) * vec3(not(nearEdge));
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //              2 (0,1,0)
+    //              ^
+    //         e2 /   \ e1
+    //           /     \'
+    // (0,0,1)  0 ----- 1 (1,0,0)
+    //              e0
+
+    int edgeId = -1;
+
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const int meshEdgeIndex = HdGetScalar_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndex + edgeId; // regular triangle face.
+    } else if ((bool(edgeFlag & 1) && edgeId == 2) ||
+               (bool(edgeFlag & 2) && edgeId == 0)) {
+        edgeId = -1; // Not an authored mesh edge
+    } else {
+        edgeId = meshEdgeIndex + edgeId - 1;
+    }
+    return edgeId;
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.DecodeUtils", "Selection.Geometry.ElementSel", "Selection.Geometry.WireSelOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Quad"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.EdgeCoord.Barycentric", "MeshWire.Fragment.EdgeMaskQuad", "MeshWire.Fragment.EdgeCommon", "MeshWire.Fragment.EdgeParam", "MeshWire.Fragment.FinalEdgeOpacityForce", "MeshWire.Fragment.EdgeOnlyBlendColor", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.QuadLines", "EdgeId.Fragment.QuadParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (lines_adjacency) in;
+layout (triangle_strip, max_vertices = 6) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[4];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return mix(mix(HdGet_dispTextureCoord_Coarse(0),HdGet_dispTextureCoord_Coarse(1), st.x),mix(HdGet_dispTextureCoord_Coarse(3),HdGet_dispTextureCoord_Coarse(2), st.x), st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[4] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1), vec3(0,1,0)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+/// Decoding utilities for selection highlighting.
+/// This mixin may be safely included by any shader stage. Its lone dependency
+/// on code generation is the hdxSelectionBuffer SSBO that holds the encoded
+/// selection state.
+
+// This should match the HdSelection enum.
+int GetMaxNumSelectionHighlightModes()
+{
+    return 2;
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// helper methods to decode hdxSelectionBuffer
+// ------ selection highlight mode specifics -------
+bool HighlightModeHasSelection(int offset)
+{
+    return (offset != 0);
+}
+
+int GetIndexOffsetForHighlightMode(int mode)
+{
+    return HdGet_hdxSelectionBuffer(mode + 1/*[0] holds #modes*/);
+}
+
+int GetNumSelectionHighlightModes()
+{
+    return HdGet_hdxSelectionBuffer(0);
+}
+
+// ------  selection offset specifics -------
+// Note: This should match the selection offset encoding in
+// hdx/SelectionTracker.cpp
+void DecodeSelOffset(int selOffset, REF(thread, bool) isSelected,
+                     REF(thread, int) nextOffset)
+{
+    isSelected = bool(selOffset & 0x1); // bit 0
+    nextOffset = selOffset >> 1;        // bits 31:1
+}
+
+// --------- subprim decoding ----------
+// Each subprims offsets' buffer encoding is:
+// [subprim-type][min][max][     selOffsets     ]
+// <----------3 ----------><--- max - min + 1 -->
+struct SubprimHeader {
+    int type;
+    int min;
+    int max;
+};
+SubprimHeader DecodeSubprimHeader(int offset)
+{
+    SubprimHeader header;
+    header.type = HdGet_hdxSelectionBuffer(offset    );
+    header.min  = HdGet_hdxSelectionBuffer(offset + 1);
+    header.max  = HdGet_hdxSelectionBuffer(offset + 2);
+    return header;
+}
+
+bool IsSubprimSelected(int id, int min, int max, int headerStart,
+                       REF(thread, int) nextSubprimOffset)
+{
+    const int SUBPRIM_SELOFFSETS_HEADER_SIZE  = 3;
+
+    nextSubprimOffset = 0; // initialize
+    bool isSelected = false;
+
+    if (id >= min && id < max) {
+        int netSubprimIndex =
+            headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE + id - min;
+        int selOffset = HdGet_hdxSelectionBuffer(netSubprimIndex);
+
+        DecodeSelOffset(selOffset, /*out*/isSelected, /*out*/nextSubprimOffset);
+    } else {
+        // The subprim id does not fall in the selected id range, so the subprim
+        // in question isn't selected. However, we can still have other
+        // subprim(s) selected. To get the offset to jump to, we mimic decoding
+        // the "min" subprim id.
+        int minSubprimIndex = headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(minSubprimIndex),
+                        /*out*/isSelected, /*out*/nextSubprimOffset);
+        isSelected = false;
+    }
+
+    return isSelected;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// Keep the result struct definition outside guards.
+struct SubprimSelectionResult {
+    bool elementSelected;
+    bool edgeSelected;
+    bool pointSelected;
+    int  pointColorId;
+};
+
+SubprimSelectionResult InitSubprimSelectionResult(
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SubprimSelectionResult res;
+
+    res.elementSelected = _elementSelected;
+    res.edgeSelected = _edgeSelected;
+    res.pointSelected = _pointSelected;
+    res.pointColorId = _pointColorId;
+
+    return res;
+}
+
+bool IsAnySubprimSelected(SubprimSelectionResult s)
+{
+    return (s.elementSelected || s.edgeSelected || s.pointSelected);
+}
+bool HasCustomizedPointColor(SubprimSelectionResult s)
+{
+    // Use -1 to encode selected points that don't have a custom point color.
+    return (s.pointColorId != -1);
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// Note: These should match the SubprimType enum in hdx/SelectionTracker.cpp
+#define SUBPRIM_TYPE_ELEMENT 0
+#define SUBPRIM_TYPE_EDGE    1
+#define SUBPRIM_TYPE_POINT   2
+#define SUBPRIM_TYPE_INSTANCE 3
+
+SubprimSelectionResult GetSubprimSel(int offset,
+                                     int elementId, int edgeId, int pointId)
+{
+    SubprimSelectionResult s = InitSubprimSelectionResult(false, false, false, 0);
+
+    int nextSubprimOffset = 0;
+    SubprimHeader header = DecodeSubprimHeader(offset);
+
+    if (header.type == SUBPRIM_TYPE_ELEMENT) {
+        s.elementSelected =
+            IsSubprimSelected(elementId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has additional subprim(s) selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_EDGE) {
+        s.edgeSelected =
+            IsSubprimSelected(edgeId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has points selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_POINT) {
+        s.pointSelected =
+            IsSubprimSelected(pointId, header.min, header.max,
+                              offset, /*unused*/nextSubprimOffset);
+        // For points alone, since there isn't any subprim to follow it, the
+        // offset field is overriden to represent the index into the
+        // selectedPointColors buffer to support customized coloring of a set of
+        // selected points.
+        s.pointColorId = nextSubprimOffset;
+    }
+
+    return s;
+}
+
+// --------- instance decoding ----------
+bool IsInstanceSelected(int offset, REF(thread, int) nextOffset)
+{
+    // If we don't find an instance subprim block, pass the same offset to
+    // GetSubprimSel.
+    nextOffset = offset;
+    bool sel = false;
+
+    int instanceId = GetDrawingCoord().instanceIndex[0];
+
+    SubprimHeader header = DecodeSubprimHeader(offset);
+    if (header.type == SUBPRIM_TYPE_INSTANCE) {
+        sel =
+            IsSubprimSelected(instanceId, header.min, header.max,
+                              offset, /*out*/nextOffset);
+    }
+
+    return sel;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// --------- selection buffer decoding entry point ----------
+struct SelectionResult {
+    bool primOrInstanceSel;
+    SubprimSelectionResult subprimSel;
+};
+
+SelectionResult InitSelectionResult(
+    bool _primOrInstanceSel,
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SelectionResult res;
+
+    res.primOrInstanceSel = _primOrInstanceSel;
+    res.subprimSel = InitSubprimSelectionResult(
+                        _elementSelected, _edgeSelected,
+                        _pointSelected, _pointColorId);
+
+    return res;
+}
+
+
+// Decodes the selection buffer encoding scheme for a given mode, and returns
+// the selection result.
+SelectionResult GetSelectionResult(int mode,
+                                   int elementId, int edgeId, int pointId)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    // The hdxSelectionBuffer layout is:
+    // [#modes] [per-mode offset] [data mode0] ... [data modeM]
+    // [---------header---------]
+    // Each mode's data is laid out as:
+    // [ prims | points | edges | elements | instance level-N | ... | level 0 ]
+    //          <-------- subprims ------->  <----------- instances --------->
+    //          <---------------------- per prim ---------------------------->
+    // See hdx/SelectionTracker.cpp for details on the encoding scheme.
+    int modeOffset = GetIndexOffsetForHighlightMode(mode);
+    if (!HighlightModeHasSelection(modeOffset)) {
+        // highlight mode has no selected objects (prims/instances/elements)
+        return res;
+    }
+
+    const int PRIM_SELOFFSETS_HEADER_SIZE = 2;
+    const int primId = HdGet_primID();
+    int smin = HdGet_hdxSelectionBuffer(modeOffset);
+    int smax = HdGet_hdxSelectionBuffer(modeOffset + 1);
+
+    if (primId >= smin && primId < smax) {
+        int offset = modeOffset + PRIM_SELOFFSETS_HEADER_SIZE + primId - smin;
+        int nextOffset = 0;
+        bool sel = false;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(offset),
+                        /*out*/sel, /*out*/nextOffset);
+
+        // At this point, sel indicates whether the fragment corresponds to
+        // a prim that needs to be fully highlighted, while a non-zero
+        // nextOffset indicates whether additional decoding may be done.
+
+        // We don't currently differentiate between prim, instance and
+        // subprim selection highlighting (i.e., visually, they look the
+        // same), and thus can skip additional decoding if sel is true.
+        // We choose not to, for ease of future customization.
+        if (nextOffset != 0) {
+            // check if instance (or) subprim(s) are selected
+            offset = nextOffset;
+            sel = sel || IsInstanceSelected(offset, /*out*/nextOffset);
+
+            if (nextOffset != 0) {
+                res.subprimSel =
+                    GetSubprimSel(nextOffset, elementId, edgeId, pointId);
+            }
+        }
+        res.primOrInstanceSel = sel;
+    }
+#endif // HD_HAS_hdxSelectionBuffer
+
+    return res;
+}
+
+// Returns the logical OR of the inputs
+SelectionResult
+_CombineWithOr(SelectionResult a, SelectionResult b)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+    res.primOrInstanceSel = a.primOrInstanceSel || b.primOrInstanceSel;
+    res.subprimSel.elementSelected = a.subprimSel.elementSelected ||
+                                   b.subprimSel.elementSelected;
+    res.subprimSel.edgeSelected = a.subprimSel.edgeSelected ||
+                                b.subprimSel.edgeSelected;
+    res.subprimSel.pointSelected = a.subprimSel.pointSelected ||
+                                 b.subprimSel.pointSelected;
+    // pointColorIndex is ignored.
+    return res;
+}
+
+// Returns the net selection result aggregating the result of each selection
+// mode.
+SelectionResult GetNetSelectionResult(int elementId, int edgeId, int pointId)
+{
+    SelectionResult netResult = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    for (int mode = 0; mode < numSelectionModes; mode++) {
+        SelectionResult modeResult =
+            GetSelectionResult(mode, elementId, edgeId, pointId);
+        netResult = _CombineWithOr(modeResult, netResult);
+    }
+#endif
+    return netResult;
+}
+
+
+// Mixin for use in the geometry shader stage.
+// Helper functions to determine if the element (face) is selected for either
+// a given selection mode, or any of the modes.
+
+FORWARD_DECL(int GetElementID()); // code gen
+
+bool IsElementSelected(int mode)
+{
+    bool sel = false;
+    #if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    if (mode < numSelectionModes) {
+        SelectionResult res =
+            GetSelectionResult(mode, GetElementID(),
+                               /*edgeId*/-1, /*pointId*/-1);
+        if (res.subprimSel.elementSelected) {
+            sel = true;
+        }
+    }
+    #endif
+    return sel;
+}
+
+bool IsSelected()
+{
+    // Edge and point selection aren't relevant at the GS stage.
+    SelectionResult res = GetNetSelectionResult(
+        GetElementID(), /*edgeId*/-1, /*pointId*/-1);
+
+   return res.primOrInstanceSel || res.subprimSel.elementSelected;
+}
+
+
+// Mixin for use in the geometry shader stage for wireframe rendering.
+// See comment below.
+
+FORWARD_DECL(int GetMaxNumSelectionHighlightModes());
+FORWARD_DECL(bool IsElementSelected(int mode));
+FORWARD_DECL(int GetElementID()); // code gen
+
+vec4 ComputeSelectionOffset()
+{
+    // For wireframe, we only render the edges of faces.  Because we don't have
+    // a way to control which face gets rasterized first, if face A is selected
+    // and face B is unselected, it's possible for face B to draw over face A
+    // and for the highlight to be dropped.
+
+    // To compensate for this, since we're running the geometry shader anyway,
+    // add a small polygon offset for selected faces, to push them in front of
+    // unselected faces.
+
+    // For doubly-selected faces (e.g. rollover & selection), apply a double
+    // offset.  The code below chooses a unique offset for each combination
+    // of selection modes by constructing a bitmask of selection modes for
+    // this face, and reinterpreting it as an integer.
+
+    int offset = 0;
+
+    int numModes = GetMaxNumSelectionHighlightModes();
+    for (int mode = 0; mode < numModes; ++mode) {
+        if (IsElementSelected(mode)) {
+            offset += (1 << mode);
+        }
+    }
+
+    // Note: for our base epsilon, we're choosing this somewhat arbitrarily.
+    // This is an eye space epsilon, so it's not dependent on distance-from-
+    // camera.  Rather, it's dependent on scene scale.  1e-3 works well for
+    // our scenes, but if this causes trouble we could use an epsilon based on
+    // the eye-space distance of a z-buffer bit flip, which would match the
+    // behavior of glPolygonOffset better, at the cost of more math and some
+    // extra shader uniforms.
+    float eps = 1e-3;
+
+    return vec4(0, 0, offset * eps, 0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[4];
+    uv[0] = vec2(0, 0);
+    uv[1] = vec2(1, 0);
+    uv[2] = vec2(1, 1);
+    uv[3] = vec2(0, 1);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoord(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetQuadGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetQuadGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetQuadGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye3 = GetNormal(inData[3].Neye, 3);
+    Neye3 = GetQuadGeometryNormal(Neye3, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+    vec4 Peye3 = DisplacementTerminal(
+        3, inData[3].Peye, Neye3, GetPatchCoord(3));
+
+    // Generate triangles (0,1,2) and (2,3,0)
+    //  3---2
+    //  |  .|
+    //  | . |
+    //  |.  |
+    //  0---1
+    // The indices post-quadrangulation/subdivision follow the convention:
+    // 0   -> original (hull) vertex
+    // 1,3 -> edge vertices
+    // 2   -> center vertex
+    //
+    // By having index 2 in both the triangles, we ensure the pre-quadrangulated
+    // face's normal (at the center) is part of the rasterizer interpolation,
+    // which matters when we use smooth/limit normals.
+    // In the case of flat normals, we use the vertex positions, so it doesn't
+    // matter.
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+    Peye3 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+    EndPrimitive();
+
+    // triangle 1: vertices (2,3,0)
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+    emit(2, Peye2, Neye2);
+    emit(3, Peye3, Neye3);
+    emit(0, Peye0, Neye0);
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec3 GetEdgeCoord()
+{
+    return GetBarycentricCoord();
+}
+
+
+
+vec3 GetPrimitiveEdgeMask()
+{
+    // A value of one in this mask hides the corresponding edge.
+    // (See hd/meshUtil.cpp)
+    return vec3(GetEdgeFlag() != 0, 1, 0);
+}
+
+
+
+// Returns the distance of the current fragment (in viewport pixel units) from
+// the nearest edge.
+float GetMinEdgeDistance()
+{
+    // Hide triangle edges by adding edge mask.
+    vec3 param = GetEdgeCoord() + GetPrimitiveEdgeMask();
+    vec3 edgeDistance = max(vec3(0.0), param / fwidth(param));
+    return min(edgeDistance.x,
+               min(edgeDistance.y,
+                   edgeDistance.z));
+}
+
+// Use edge distance to compute a smooth opacity falloff for good looking edges.
+float GetEdgeFalloff(float d) {
+    return exp2(-4 * d * d);
+}
+
+float GetEdgeOpacity() {
+    return GetEdgeFalloff(GetMinEdgeDistance());
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+vec4 ApplyFinalEdgeOpacity(vec4 Cfill)
+{
+    Cfill.a = 1.0;
+    return Cfill;
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    float p = GetEdgeOpacity();
+    if (p < 0.5) discard;
+
+    vec4 wireColor = GetWireframeColor();
+
+    // If wireColor is unset (zero), ignore it altogether
+
+    Cfill.rgb = mix(Cfill.rgb, wireColor.rgb, wireColor.a);
+
+    return ApplyFinalEdgeOpacity(Cfill);
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec4 ComputeBaseFaceEdgeDistanceQuad()
+{
+    // Use parametric distance since we can't use surface derivatives for lines
+    vec4 param = GetEdgeParamQuad();
+    bvec4 nearEdge = lessThan(param, vec4(edgePickParametricRadius));
+    return vec4(edgePickRadius) * vec4(not(nearEdge));
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else if (dist.w < edgePickRadius) {
+        closestEdgeDistance = dist.w;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //               e2
+    //     (0,1) 3 ------ 2 (1,1)
+    //           |        |
+    //       e3  |        |  e1
+    //           |        |
+    //     (0,0) 0 ------ 1 (1,0)
+    //               e0
+
+    int edgeId = -1;
+
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else if (dist.w < edgePickRadius) {
+        edgeId = 3;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const ivec2 meshEdgeIndices = HdGet_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndices[0] + edgeId; // regular quad face
+    } else if (edgeId == 0) {
+        edgeId = meshEdgeIndices[0];
+    } else if (edgeId == 3) {
+        edgeId = meshEdgeIndices[1];
+    } else {
+        edgeId = -1; // Not an authored mesh edge
+    }
+    return edgeId;
+}
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect.out
new file mode 100644
index 0000000000..fa6326a6da
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect.out
@@ -0,0 +1,5380 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Triangle"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.TriangleSurface", "EdgeId.Fragment.TriangleParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[3];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return (HdGet_dispTextureCoord_Coarse(0) * (1-st.x-st.y) + HdGet_dispTextureCoord_Coarse(1) * st.x + HdGet_dispTextureCoord_Coarse(2) * st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[3] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[3];
+    uv[0] = vec2(0, 0); // (0, 0, 1);
+    uv[1] = vec2(1, 0); // (1, 0, 0);
+    uv[2] = vec2(0, 1); // (0, 1, 0);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoordTriangle(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetTriGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetTriGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetTriGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+FORWARD_DECL(vec3 GetEdgeDistanceTriangle());
+
+vec3 ComputeBaseFaceEdgeDistanceTriangle()
+{
+    return GetEdgeDistanceTriangle();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //              2 (0,1,0)
+    //              ^
+    //         e2 /   \ e1
+    //           /     \'
+    // (0,0,1)  0 ----- 1 (1,0,0)
+    //              e0
+
+    int edgeId = -1;
+
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const int meshEdgeIndex = HdGetScalar_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndex + edgeId; // regular triangle face.
+    } else if ((bool(edgeFlag & 1) && edgeId == 2) ||
+               (bool(edgeFlag & 2) && edgeId == 0)) {
+        edgeId = -1; // Not an authored mesh edge
+    } else {
+        edgeId = meshEdgeIndex + edgeId - 1;
+    }
+    return edgeId;
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Quad"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.QuadSurface", "EdgeId.Fragment.QuadParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (lines_adjacency) in;
+layout (triangle_strip, max_vertices = 6) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[4];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return mix(mix(HdGet_dispTextureCoord_Coarse(0),HdGet_dispTextureCoord_Coarse(1), st.x),mix(HdGet_dispTextureCoord_Coarse(3),HdGet_dispTextureCoord_Coarse(2), st.x), st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[4] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1), vec3(0,1,0)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[4];
+    uv[0] = vec2(0, 0);
+    uv[1] = vec2(1, 0);
+    uv[2] = vec2(1, 1);
+    uv[3] = vec2(0, 1);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoord(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetQuadGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetQuadGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetQuadGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye3 = GetNormal(inData[3].Neye, 3);
+    Neye3 = GetQuadGeometryNormal(Neye3, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+    vec4 Peye3 = DisplacementTerminal(
+        3, inData[3].Peye, Neye3, GetPatchCoord(3));
+
+    // Generate triangles (0,1,2) and (2,3,0)
+    //  3---2
+    //  |  .|
+    //  | . |
+    //  |.  |
+    //  0---1
+    // The indices post-quadrangulation/subdivision follow the convention:
+    // 0   -> original (hull) vertex
+    // 1,3 -> edge vertices
+    // 2   -> center vertex
+    //
+    // By having index 2 in both the triangles, we ensure the pre-quadrangulated
+    // face's normal (at the center) is part of the rasterizer interpolation,
+    // which matters when we use smooth/limit normals.
+    // In the case of flat normals, we use the vertex positions, so it doesn't
+    // matter.
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+    Peye3 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+    EndPrimitive();
+
+    // triangle 1: vertices (2,3,0)
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+    emit(2, Peye2, Neye2);
+    emit(3, Peye3, Neye3);
+    emit(0, Peye0, Neye0);
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec4 ComputeBaseFaceEdgeDistanceQuad()
+{
+    return GetEdgeDistanceQuad();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else if (dist.w < edgePickRadius) {
+        closestEdgeDistance = dist.w;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //               e2
+    //     (0,1) 3 ------ 2 (1,1)
+    //           |        |
+    //       e3  |        |  e1
+    //           |        |
+    //     (0,0) 0 ------ 1 (1,0)
+    //               e0
+
+    int edgeId = -1;
+
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else if (dist.w < edgePickRadius) {
+        edgeId = 3;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const ivec2 meshEdgeIndices = HdGet_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndices[0] + edgeId; // regular quad face
+    } else if (edgeId == 0) {
+        edgeId = meshEdgeIndices[0];
+    } else if (edgeId == 3) {
+        edgeId = meshEdgeIndices[1];
+    } else {
+        edgeId = -1; // Not an authored mesh edge
+    }
+    return edgeId;
+}
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_doubleSided.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_doubleSided.out
new file mode 100644
index 0000000000..56c6a555cd
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_doubleSided.out
@@ -0,0 +1,5378 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Triangle"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.DoubleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.TriangleSurface", "EdgeId.Fragment.TriangleParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[3];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return (HdGet_dispTextureCoord_Coarse(0) * (1-st.x-st.y) + HdGet_dispTextureCoord_Coarse(1) * st.x + HdGet_dispTextureCoord_Coarse(2) * st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[3] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[3];
+    uv[0] = vec2(0, 0); // (0, 0, 1);
+    uv[1] = vec2(1, 0); // (1, 0, 0);
+    uv[2] = vec2(0, 1); // (0, 1, 0);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoordTriangle(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetTriGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetTriGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetTriGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // note that negative scaling isn't taken into account in gl_FrontFacing
+    // so we have to consider isFlipped here too.
+    return (isFlipped != gl_FrontFacing) ? N : -N;
+}
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+FORWARD_DECL(vec3 GetEdgeDistanceTriangle());
+
+vec3 ComputeBaseFaceEdgeDistanceTriangle()
+{
+    return GetEdgeDistanceTriangle();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //              2 (0,1,0)
+    //              ^
+    //         e2 /   \ e1
+    //           /     \'
+    // (0,0,1)  0 ----- 1 (1,0,0)
+    //              e0
+
+    int edgeId = -1;
+
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const int meshEdgeIndex = HdGetScalar_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndex + edgeId; // regular triangle face.
+    } else if ((bool(edgeFlag & 1) && edgeId == 2) ||
+               (bool(edgeFlag & 2) && edgeId == 0)) {
+        edgeId = -1; // Not an authored mesh edge
+    } else {
+        edgeId = meshEdgeIndex + edgeId - 1;
+    }
+    return edgeId;
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Quad"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.DoubleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.QuadSurface", "EdgeId.Fragment.QuadParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (lines_adjacency) in;
+layout (triangle_strip, max_vertices = 6) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[4];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return mix(mix(HdGet_dispTextureCoord_Coarse(0),HdGet_dispTextureCoord_Coarse(1), st.x),mix(HdGet_dispTextureCoord_Coarse(3),HdGet_dispTextureCoord_Coarse(2), st.x), st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[4] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1), vec3(0,1,0)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[4];
+    uv[0] = vec2(0, 0);
+    uv[1] = vec2(1, 0);
+    uv[2] = vec2(1, 1);
+    uv[3] = vec2(0, 1);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoord(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetQuadGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetQuadGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetQuadGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye3 = GetNormal(inData[3].Neye, 3);
+    Neye3 = GetQuadGeometryNormal(Neye3, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+    vec4 Peye3 = DisplacementTerminal(
+        3, inData[3].Peye, Neye3, GetPatchCoord(3));
+
+    // Generate triangles (0,1,2) and (2,3,0)
+    //  3---2
+    //  |  .|
+    //  | . |
+    //  |.  |
+    //  0---1
+    // The indices post-quadrangulation/subdivision follow the convention:
+    // 0   -> original (hull) vertex
+    // 1,3 -> edge vertices
+    // 2   -> center vertex
+    //
+    // By having index 2 in both the triangles, we ensure the pre-quadrangulated
+    // face's normal (at the center) is part of the rasterizer interpolation,
+    // which matters when we use smooth/limit normals.
+    // In the case of flat normals, we use the vertex positions, so it doesn't
+    // matter.
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+    Peye3 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+    EndPrimitive();
+
+    // triangle 1: vertices (2,3,0)
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+    emit(2, Peye2, Neye2);
+    emit(3, Peye3, Neye3);
+    emit(0, Peye0, Neye0);
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // note that negative scaling isn't taken into account in gl_FrontFacing
+    // so we have to consider isFlipped here too.
+    return (isFlipped != gl_FrontFacing) ? N : -N;
+}
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec4 ComputeBaseFaceEdgeDistanceQuad()
+{
+    return GetEdgeDistanceQuad();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else if (dist.w < edgePickRadius) {
+        closestEdgeDistance = dist.w;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //               e2
+    //     (0,1) 3 ------ 2 (1,1)
+    //           |        |
+    //       e3  |        |  e1
+    //           |        |
+    //     (0,0) 0 ------ 1 (1,0)
+    //               e0
+
+    int edgeId = -1;
+
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else if (dist.w < edgePickRadius) {
+        edgeId = 3;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const ivec2 meshEdgeIndices = HdGet_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndices[0] + edgeId; // regular quad face
+    } else if (edgeId == 0) {
+        edgeId = meshEdgeIndices[0];
+    } else if (edgeId == 3) {
+        edgeId = meshEdgeIndices[1];
+    } else {
+        edgeId = -1; // Not an authored mesh edge
+    }
+    return edgeId;
+}
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_faceVarying.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_faceVarying.out
new file mode 100644
index 0000000000..fa6326a6da
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_faceVarying.out
@@ -0,0 +1,5380 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Triangle"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.TriangleSurface", "EdgeId.Fragment.TriangleParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[3];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return (HdGet_dispTextureCoord_Coarse(0) * (1-st.x-st.y) + HdGet_dispTextureCoord_Coarse(1) * st.x + HdGet_dispTextureCoord_Coarse(2) * st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[3] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[3];
+    uv[0] = vec2(0, 0); // (0, 0, 1);
+    uv[1] = vec2(1, 0); // (1, 0, 0);
+    uv[2] = vec2(0, 1); // (0, 1, 0);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoordTriangle(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetTriGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetTriGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetTriGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+FORWARD_DECL(vec3 GetEdgeDistanceTriangle());
+
+vec3 ComputeBaseFaceEdgeDistanceTriangle()
+{
+    return GetEdgeDistanceTriangle();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //              2 (0,1,0)
+    //              ^
+    //         e2 /   \ e1
+    //           /     \'
+    // (0,0,1)  0 ----- 1 (1,0,0)
+    //              e0
+
+    int edgeId = -1;
+
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const int meshEdgeIndex = HdGetScalar_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndex + edgeId; // regular triangle face.
+    } else if ((bool(edgeFlag & 1) && edgeId == 2) ||
+               (bool(edgeFlag & 2) && edgeId == 0)) {
+        edgeId = -1; // Not an authored mesh edge
+    } else {
+        edgeId = meshEdgeIndex + edgeId - 1;
+    }
+    return edgeId;
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Quad"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.QuadSurface", "EdgeId.Fragment.QuadParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (lines_adjacency) in;
+layout (triangle_strip, max_vertices = 6) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[4];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return mix(mix(HdGet_dispTextureCoord_Coarse(0),HdGet_dispTextureCoord_Coarse(1), st.x),mix(HdGet_dispTextureCoord_Coarse(3),HdGet_dispTextureCoord_Coarse(2), st.x), st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[4] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1), vec3(0,1,0)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[4];
+    uv[0] = vec2(0, 0);
+    uv[1] = vec2(1, 0);
+    uv[2] = vec2(1, 1);
+    uv[3] = vec2(0, 1);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoord(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetQuadGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetQuadGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetQuadGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye3 = GetNormal(inData[3].Neye, 3);
+    Neye3 = GetQuadGeometryNormal(Neye3, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+    vec4 Peye3 = DisplacementTerminal(
+        3, inData[3].Peye, Neye3, GetPatchCoord(3));
+
+    // Generate triangles (0,1,2) and (2,3,0)
+    //  3---2
+    //  |  .|
+    //  | . |
+    //  |.  |
+    //  0---1
+    // The indices post-quadrangulation/subdivision follow the convention:
+    // 0   -> original (hull) vertex
+    // 1,3 -> edge vertices
+    // 2   -> center vertex
+    //
+    // By having index 2 in both the triangles, we ensure the pre-quadrangulated
+    // face's normal (at the center) is part of the rasterizer interpolation,
+    // which matters when we use smooth/limit normals.
+    // In the case of flat normals, we use the vertex positions, so it doesn't
+    // matter.
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+    Peye3 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+    EndPrimitive();
+
+    // triangle 1: vertices (2,3,0)
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+    emit(2, Peye2, Neye2);
+    emit(3, Peye3, Neye3);
+    emit(0, Peye0, Neye0);
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec4 ComputeBaseFaceEdgeDistanceQuad()
+{
+    return GetEdgeDistanceQuad();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else if (dist.w < edgePickRadius) {
+        closestEdgeDistance = dist.w;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //               e2
+    //     (0,1) 3 ------ 2 (1,1)
+    //           |        |
+    //       e3  |        |  e1
+    //           |        |
+    //     (0,0) 0 ------ 1 (1,0)
+    //               e0
+
+    int edgeId = -1;
+
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else if (dist.w < edgePickRadius) {
+        edgeId = 3;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const ivec2 meshEdgeIndices = HdGet_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndices[0] + edgeId; // regular quad face
+    } else if (edgeId == 0) {
+        edgeId = meshEdgeIndices[0];
+    } else if (edgeId == 3) {
+        edgeId = meshEdgeIndices[1];
+    } else {
+        edgeId = -1; // Not an authored mesh edge
+    }
+    return edgeId;
+}
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_instance.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_instance.out
new file mode 100644
index 0000000000..670ef81e9a
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_instance.out
@@ -0,0 +1,5598 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Triangle"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.TriangleSurface", "EdgeId.Fragment.TriangleParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_HAS_INSTANCE_hydra_instanceTranslations 1
+#define HD_HAS_hydra_instanceTranslations_0 1
+#define HD_INSTANCER_NUM_LEVELS 1
+#define HD_INSTANCE_INDEX_WIDTH 2
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 6) readonly buffer ssbo_instanceIndices { int instanceIndices[]; };
+layout(std430, binding = 7) buffer ssbo_culledInstanceIndices { int culledInstanceIndices[]; };
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_hydra_instanceTranslations_0 { hd_vec3 hydra_instanceTranslations_0[]; };
+layout(std430, binding = 2) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 3) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 4) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 5) in int drawingCoordI0;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceIndexI1;
+flat layout(location = 11) out int vs_dc_instanceCoordsI0;
+flat layout(location = 12) out int vs_dc_instanceCoordsI1;
+layout(location = 13) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 15) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+vec3 HdGet_hydra_instanceTranslations_0(int localIndex) {
+  int index = GetDrawingCoord().instanceCoords[0];
+  return hd_vec3_get(hydra_instanceTranslations_0[index]);
+}
+vec3 HdGet_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0); }
+float HdGetScalar_hydra_instanceTranslations_0(int localIndex) { return HdGet_hydra_instanceTranslations_0(localIndex).x; }
+float HdGetScalar_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0).x; }
+vec3 HdGetInstance_hydra_instanceTranslations(int level, vec3 defaultValue) {
+  if (level == 0) return HdGet_hydra_instanceTranslations_0();
+  return defaultValue;
+}
+#if !defined(HD_HAS_hydra_instanceTranslations)
+#define HD_HAS_hydra_instanceTranslations 1
+vec3 HdGet_hydra_instanceTranslations(int localIndex) {
+  return HdGet_hydra_instanceTranslations_0();
+}
+vec3 HdGet_hydra_instanceTranslations() { return HdGet_hydra_instanceTranslations(0); }
+#endif
+
+// //////// Codegen VS Source //////// 
+int GetBaseInstanceIndexCoord() {
+  return drawingCoord1.y;
+}
+int GetCurrentInstance() {
+  return int(hd_InstanceID - hd_BaseInstance);
+}
+int GetInstanceIndexCoord() {
+  return GetBaseInstanceIndexCoord() + GetCurrentInstance() * HD_INSTANCE_INDEX_WIDTH;
+}
+int HdGet_culledInstanceIndices(int localIndex) {
+  int index = GetInstanceIndexCoord()+localIndex + 1;
+  return int(culledInstanceIndices[index]);
+}
+int HdGet_culledInstanceIndices() { return HdGet_culledInstanceIndices(0); }
+int HdGetScalar_culledInstanceIndices(int localIndex) { return HdGet_culledInstanceIndices(localIndex); }
+int HdGetScalar_culledInstanceIndices() { return HdGet_culledInstanceIndices(0); }
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {
+  hd_instanceIndex r;
+  for (int i = 0; i < HD_INSTANCE_INDEX_WIDTH; ++i)
+    r.indices[i] = HdGet_culledInstanceIndices(/*localIndex=*/i);
+  return r;
+}
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  dc.instanceIndex[1] = r.indices[1];
+  dc.instanceCoords[0] = drawingCoordI0 + dc.instanceIndex[1];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  vs_dc_instanceIndexI1 = dc.instanceIndex[1];
+  vs_dc_instanceCoordsI0 = dc.instanceCoords[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_HAS_INSTANCE_hydra_instanceTranslations 1
+#define HD_HAS_hydra_instanceTranslations_0 1
+#define HD_INSTANCER_NUM_LEVELS 1
+#define HD_INSTANCE_INDEX_WIDTH 2
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 6) readonly buffer ssbo_instanceIndices { int instanceIndices[]; };
+layout(std430, binding = 7) buffer ssbo_culledInstanceIndices { int culledInstanceIndices[]; };
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_hydra_instanceTranslations_0 { hd_vec3 hydra_instanceTranslations_0[]; };
+layout(std430, binding = 2) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 3) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 4) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 5) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceIndexI1[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 11) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 12) in int vs_dc_instanceCoordsI1[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 13) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[3];
+layout(location = 15) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceIndexI1;
+flat layout(location = 18) out int gs_dc_instanceCoordsI0;
+flat layout(location = 19) out int gs_dc_instanceCoordsI1;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+vec3 HdGet_hydra_instanceTranslations_0(int localIndex) {
+  int index = GetDrawingCoord().instanceCoords[0];
+  return hd_vec3_get(hydra_instanceTranslations_0[index]);
+}
+vec3 HdGet_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0); }
+float HdGetScalar_hydra_instanceTranslations_0(int localIndex) { return HdGet_hydra_instanceTranslations_0(localIndex).x; }
+float HdGetScalar_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0).x; }
+vec3 HdGetInstance_hydra_instanceTranslations(int level, vec3 defaultValue) {
+  if (level == 0) return HdGet_hydra_instanceTranslations_0();
+  return defaultValue;
+}
+#if !defined(HD_HAS_hydra_instanceTranslations)
+#define HD_HAS_hydra_instanceTranslations 1
+vec3 HdGet_hydra_instanceTranslations(int localIndex) {
+  return HdGet_hydra_instanceTranslations_0();
+}
+vec3 HdGet_hydra_instanceTranslations() { return HdGet_hydra_instanceTranslations(0); }
+#endif
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  dc.instanceIndex[1] = vs_dc_instanceIndexI1[0];
+  dc.instanceCoords[0] = vs_dc_instanceCoordsI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return (HdGet_dispTextureCoord_Coarse(0) * (1-st.x-st.y) + HdGet_dispTextureCoord_Coarse(1) * st.x + HdGet_dispTextureCoord_Coarse(2) * st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[3] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  gs_dc_instanceIndexI1 = dc.instanceIndex[1];
+  gs_dc_instanceCoordsI0 = dc.instanceCoords[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[3];
+    uv[0] = vec2(0, 0); // (0, 0, 1);
+    uv[1] = vec2(1, 0); // (1, 0, 0);
+    uv[2] = vec2(0, 1); // (0, 1, 0);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoordTriangle(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetTriGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetTriGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetTriGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_HAS_INSTANCE_hydra_instanceTranslations 1
+#define HD_HAS_hydra_instanceTranslations_0 1
+#define HD_INSTANCER_NUM_LEVELS 1
+#define HD_INSTANCE_INDEX_WIDTH 2
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 6) readonly buffer ssbo_instanceIndices { int instanceIndices[]; };
+layout(std430, binding = 7) buffer ssbo_culledInstanceIndices { int culledInstanceIndices[]; };
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_hydra_instanceTranslations_0 { hd_vec3 hydra_instanceTranslations_0[]; };
+layout(std430, binding = 2) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 3) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 4) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 5) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceIndexI1;
+flat layout(location = 18) in int gs_dc_instanceCoordsI0;
+flat layout(location = 19) in int gs_dc_instanceCoordsI1;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+vec3 HdGet_hydra_instanceTranslations_0(int localIndex) {
+  int index = GetDrawingCoord().instanceCoords[0];
+  return hd_vec3_get(hydra_instanceTranslations_0[index]);
+}
+vec3 HdGet_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0); }
+float HdGetScalar_hydra_instanceTranslations_0(int localIndex) { return HdGet_hydra_instanceTranslations_0(localIndex).x; }
+float HdGetScalar_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0).x; }
+vec3 HdGetInstance_hydra_instanceTranslations(int level, vec3 defaultValue) {
+  if (level == 0) return HdGet_hydra_instanceTranslations_0();
+  return defaultValue;
+}
+#if !defined(HD_HAS_hydra_instanceTranslations)
+#define HD_HAS_hydra_instanceTranslations 1
+vec3 HdGet_hydra_instanceTranslations(int localIndex) {
+  return HdGet_hydra_instanceTranslations_0();
+}
+vec3 HdGet_hydra_instanceTranslations() { return HdGet_hydra_instanceTranslations(0); }
+#endif
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  dc.instanceIndex[1] = gs_dc_instanceIndexI1;
+  dc.instanceCoords[0] = gs_dc_instanceCoordsI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+FORWARD_DECL(vec3 GetEdgeDistanceTriangle());
+
+vec3 ComputeBaseFaceEdgeDistanceTriangle()
+{
+    return GetEdgeDistanceTriangle();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //              2 (0,1,0)
+    //              ^
+    //         e2 /   \ e1
+    //           /     \'
+    // (0,0,1)  0 ----- 1 (1,0,0)
+    //              e0
+
+    int edgeId = -1;
+
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const int meshEdgeIndex = HdGetScalar_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndex + edgeId; // regular triangle face.
+    } else if ((bool(edgeFlag & 1) && edgeId == 2) ||
+               (bool(edgeFlag & 2) && edgeId == 0)) {
+        edgeId = -1; // Not an authored mesh edge
+    } else {
+        edgeId = meshEdgeIndex + edgeId - 1;
+    }
+    return edgeId;
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Flat", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Quad"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.QuadSurface", "EdgeId.Fragment.QuadParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_HAS_INSTANCE_hydra_instanceTranslations 1
+#define HD_HAS_hydra_instanceTranslations_0 1
+#define HD_INSTANCER_NUM_LEVELS 1
+#define HD_INSTANCE_INDEX_WIDTH 2
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 6) readonly buffer ssbo_instanceIndices { int instanceIndices[]; };
+layout(std430, binding = 7) buffer ssbo_culledInstanceIndices { int culledInstanceIndices[]; };
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_hydra_instanceTranslations_0 { hd_vec3 hydra_instanceTranslations_0[]; };
+layout(std430, binding = 2) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 3) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 4) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 5) in int drawingCoordI0;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceIndexI1;
+flat layout(location = 11) out int vs_dc_instanceCoordsI0;
+flat layout(location = 12) out int vs_dc_instanceCoordsI1;
+layout(location = 13) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 15) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+vec3 HdGet_hydra_instanceTranslations_0(int localIndex) {
+  int index = GetDrawingCoord().instanceCoords[0];
+  return hd_vec3_get(hydra_instanceTranslations_0[index]);
+}
+vec3 HdGet_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0); }
+float HdGetScalar_hydra_instanceTranslations_0(int localIndex) { return HdGet_hydra_instanceTranslations_0(localIndex).x; }
+float HdGetScalar_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0).x; }
+vec3 HdGetInstance_hydra_instanceTranslations(int level, vec3 defaultValue) {
+  if (level == 0) return HdGet_hydra_instanceTranslations_0();
+  return defaultValue;
+}
+#if !defined(HD_HAS_hydra_instanceTranslations)
+#define HD_HAS_hydra_instanceTranslations 1
+vec3 HdGet_hydra_instanceTranslations(int localIndex) {
+  return HdGet_hydra_instanceTranslations_0();
+}
+vec3 HdGet_hydra_instanceTranslations() { return HdGet_hydra_instanceTranslations(0); }
+#endif
+
+// //////// Codegen VS Source //////// 
+int GetBaseInstanceIndexCoord() {
+  return drawingCoord1.y;
+}
+int GetCurrentInstance() {
+  return int(hd_InstanceID - hd_BaseInstance);
+}
+int GetInstanceIndexCoord() {
+  return GetBaseInstanceIndexCoord() + GetCurrentInstance() * HD_INSTANCE_INDEX_WIDTH;
+}
+int HdGet_culledInstanceIndices(int localIndex) {
+  int index = GetInstanceIndexCoord()+localIndex + 1;
+  return int(culledInstanceIndices[index]);
+}
+int HdGet_culledInstanceIndices() { return HdGet_culledInstanceIndices(0); }
+int HdGetScalar_culledInstanceIndices(int localIndex) { return HdGet_culledInstanceIndices(localIndex); }
+int HdGetScalar_culledInstanceIndices() { return HdGet_culledInstanceIndices(0); }
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {
+  hd_instanceIndex r;
+  for (int i = 0; i < HD_INSTANCE_INDEX_WIDTH; ++i)
+    r.indices[i] = HdGet_culledInstanceIndices(/*localIndex=*/i);
+  return r;
+}
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  dc.instanceIndex[1] = r.indices[1];
+  dc.instanceCoords[0] = drawingCoordI0 + dc.instanceIndex[1];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  vs_dc_instanceIndexI1 = dc.instanceIndex[1];
+  vs_dc_instanceCoordsI0 = dc.instanceCoords[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_HAS_INSTANCE_hydra_instanceTranslations 1
+#define HD_HAS_hydra_instanceTranslations_0 1
+#define HD_INSTANCER_NUM_LEVELS 1
+#define HD_INSTANCE_INDEX_WIDTH 2
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (lines_adjacency) in;
+layout (triangle_strip, max_vertices = 6) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 6) readonly buffer ssbo_instanceIndices { int instanceIndices[]; };
+layout(std430, binding = 7) buffer ssbo_culledInstanceIndices { int culledInstanceIndices[]; };
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_hydra_instanceTranslations_0 { hd_vec3 hydra_instanceTranslations_0[]; };
+layout(std430, binding = 2) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 3) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 4) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 5) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceIndexI1[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 11) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 12) in int vs_dc_instanceCoordsI1[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 13) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[4];
+layout(location = 15) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceIndexI1;
+flat layout(location = 18) out int gs_dc_instanceCoordsI0;
+flat layout(location = 19) out int gs_dc_instanceCoordsI1;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+vec3 HdGet_hydra_instanceTranslations_0(int localIndex) {
+  int index = GetDrawingCoord().instanceCoords[0];
+  return hd_vec3_get(hydra_instanceTranslations_0[index]);
+}
+vec3 HdGet_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0); }
+float HdGetScalar_hydra_instanceTranslations_0(int localIndex) { return HdGet_hydra_instanceTranslations_0(localIndex).x; }
+float HdGetScalar_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0).x; }
+vec3 HdGetInstance_hydra_instanceTranslations(int level, vec3 defaultValue) {
+  if (level == 0) return HdGet_hydra_instanceTranslations_0();
+  return defaultValue;
+}
+#if !defined(HD_HAS_hydra_instanceTranslations)
+#define HD_HAS_hydra_instanceTranslations 1
+vec3 HdGet_hydra_instanceTranslations(int localIndex) {
+  return HdGet_hydra_instanceTranslations_0();
+}
+vec3 HdGet_hydra_instanceTranslations() { return HdGet_hydra_instanceTranslations(0); }
+#endif
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  dc.instanceIndex[1] = vs_dc_instanceIndexI1[0];
+  dc.instanceCoords[0] = vs_dc_instanceCoordsI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].normals);
+}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return mix(mix(HdGet_dispTextureCoord_Coarse(0),HdGet_dispTextureCoord_Coarse(1), st.x),mix(HdGet_dispTextureCoord_Coarse(3),HdGet_dispTextureCoord_Coarse(2), st.x), st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[4] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1), vec3(0,1,0)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  gs_dc_instanceIndexI1 = dc.instanceIndex[1];
+  gs_dc_instanceCoordsI0 = dc.instanceCoords[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.normals = inPrimvars[index].normals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_flatNormals)
+    normal = vec3(HdGet_flatNormals(index).xyz);
+#elif defined(HD_HAS_packedFlatNormals)
+    normal = vec3(HdGet_packedFlatNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[4];
+    uv[0] = vec2(0, 0);
+    uv[1] = vec2(1, 0);
+    uv[2] = vec2(1, 1);
+    uv[3] = vec2(0, 1);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoord(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetQuadGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetQuadGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetQuadGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye3 = GetNormal(inData[3].Neye, 3);
+    Neye3 = GetQuadGeometryNormal(Neye3, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+    vec4 Peye3 = DisplacementTerminal(
+        3, inData[3].Peye, Neye3, GetPatchCoord(3));
+
+    // Generate triangles (0,1,2) and (2,3,0)
+    //  3---2
+    //  |  .|
+    //  | . |
+    //  |.  |
+    //  0---1
+    // The indices post-quadrangulation/subdivision follow the convention:
+    // 0   -> original (hull) vertex
+    // 1,3 -> edge vertices
+    // 2   -> center vertex
+    //
+    // By having index 2 in both the triangles, we ensure the pre-quadrangulated
+    // face's normal (at the center) is part of the rasterizer interpolation,
+    // which matters when we use smooth/limit normals.
+    // In the case of flat normals, we use the vertex positions, so it doesn't
+    // matter.
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+    Peye3 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+    EndPrimitive();
+
+    // triangle 1: vertices (2,3,0)
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+    emit(2, Peye2, Neye2);
+    emit(3, Peye3, Neye3);
+    emit(0, Peye0, Neye0);
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_HAS_INSTANCE_hydra_instanceTranslations 1
+#define HD_HAS_hydra_instanceTranslations_0 1
+#define HD_INSTANCER_NUM_LEVELS 1
+#define HD_INSTANCE_INDEX_WIDTH 2
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 6) readonly buffer ssbo_instanceIndices { int instanceIndices[]; };
+layout(std430, binding = 7) buffer ssbo_culledInstanceIndices { int culledInstanceIndices[]; };
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_hydra_instanceTranslations_0 { hd_vec3 hydra_instanceTranslations_0[]; };
+layout(std430, binding = 2) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 3) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 4) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 5) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceIndexI1;
+flat layout(location = 18) in int gs_dc_instanceCoordsI0;
+flat layout(location = 19) in int gs_dc_instanceCoordsI1;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+vec3 HdGet_hydra_instanceTranslations_0(int localIndex) {
+  int index = GetDrawingCoord().instanceCoords[0];
+  return hd_vec3_get(hydra_instanceTranslations_0[index]);
+}
+vec3 HdGet_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0); }
+float HdGetScalar_hydra_instanceTranslations_0(int localIndex) { return HdGet_hydra_instanceTranslations_0(localIndex).x; }
+float HdGetScalar_hydra_instanceTranslations_0() { return HdGet_hydra_instanceTranslations_0(0).x; }
+vec3 HdGetInstance_hydra_instanceTranslations(int level, vec3 defaultValue) {
+  if (level == 0) return HdGet_hydra_instanceTranslations_0();
+  return defaultValue;
+}
+#if !defined(HD_HAS_hydra_instanceTranslations)
+#define HD_HAS_hydra_instanceTranslations 1
+vec3 HdGet_hydra_instanceTranslations(int localIndex) {
+  return HdGet_hydra_instanceTranslations_0();
+}
+vec3 HdGet_hydra_instanceTranslations() { return HdGet_hydra_instanceTranslations(0); }
+#endif
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  dc.instanceIndex[1] = gs_dc_instanceIndexI1;
+  dc.instanceCoords[0] = gs_dc_instanceCoordsI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec4 ComputeBaseFaceEdgeDistanceQuad()
+{
+    return GetEdgeDistanceQuad();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else if (dist.w < edgePickRadius) {
+        closestEdgeDistance = dist.w;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //               e2
+    //     (0,1) 3 ------ 2 (1,1)
+    //           |        |
+    //       e3  |        |  e1
+    //           |        |
+    //     (0,0) 0 ------ 1 (1,0)
+    //               e0
+
+    int edgeId = -1;
+
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else if (dist.w < edgePickRadius) {
+        edgeId = 3;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const ivec2 meshEdgeIndices = HdGet_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndices[0] + edgeId; // regular quad face
+    } else if (edgeId == 0) {
+        edgeId = meshEdgeIndices[0];
+    } else if (edgeId == 3) {
+        edgeId = meshEdgeIndices[1];
+    } else {
+        edgeId = -1; // Not an authored mesh edge
+    }
+    return edgeId;
+}
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_smoothNormals.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_smoothNormals.out
new file mode 100644
index 0000000000..8c8116cfdc
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_mesh_indirect_smoothNormals.out
@@ -0,0 +1,5380 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Smooth", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Triangle"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.TriangleSurface", "EdgeId.Fragment.TriangleParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_smoothNormals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 smoothNormals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 smoothNormals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_smoothNormals(int localIndex) { return hd_vec3_get(smoothNormals);}
+vec3 HdGet_smoothNormals() { return HdGet_smoothNormals(0); }
+float HdGetScalar_smoothNormals(int localIndex) { return HdGet_smoothNormals(localIndex).x; }
+float HdGetScalar_smoothNormals() { return HdGet_smoothNormals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.smoothNormals = smoothNormals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_smoothNormals)
+    normal = vec3(HdGet_smoothNormals(index).xyz);
+#elif defined(HD_HAS_packedSmoothNormals)
+    normal = vec3(HdGet_packedSmoothNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_smoothNormals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (triangles) in;
+layout (triangle_strip, max_vertices = 3) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[3];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 smoothNormals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 smoothNormals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_smoothNormals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].smoothNormals);
+}
+vec3 HdGet_smoothNormals() { return HdGet_smoothNormals(0); }
+float HdGetScalar_smoothNormals(int localIndex) { return HdGet_smoothNormals(localIndex).x; }
+float HdGetScalar_smoothNormals() { return HdGet_smoothNormals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return (HdGet_dispTextureCoord_Coarse(0) * (1-st.x-st.y) + HdGet_dispTextureCoord_Coarse(1) * st.x + HdGet_dispTextureCoord_Coarse(2) * st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[3] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.smoothNormals = inPrimvars[index].smoothNormals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[3];
+    uv[0] = vec2(0, 0); // (0, 0, 1);
+    uv[1] = vec2(1, 0); // (1, 0, 0);
+    uv[2] = vec2(0, 1); // (0, 1, 0);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoordTriangle(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetTriGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetTriGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetTriGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 3
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_smoothNormals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { int edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 smoothNormals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 3 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+int HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(edgeIndices[index]);
+}
+int HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex); }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0); }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_smoothNormals(int localIndex) { return vec3(inPrimvars.smoothNormals);}
+vec3 HdGet_smoothNormals() { return HdGet_smoothNormals(0); }
+float HdGetScalar_smoothNormals(int localIndex) { return HdGet_smoothNormals(localIndex).x; }
+float HdGetScalar_smoothNormals() { return HdGet_smoothNormals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+FORWARD_DECL(vec3 GetEdgeDistanceTriangle());
+
+vec3 ComputeBaseFaceEdgeDistanceTriangle()
+{
+    return GetEdgeDistanceTriangle();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //              2 (0,1,0)
+    //              ^
+    //         e2 /   \ e1
+    //           /     \'
+    // (0,0,1)  0 ----- 1 (1,0,0)
+    //              e0
+
+    int edgeId = -1;
+
+    vec3 dist = ComputeBaseFaceEdgeDistanceTriangle();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const int meshEdgeIndex = HdGetScalar_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndex + edgeId; // regular triangle face.
+    } else if ((bool(edgeFlag & 1) && edgeId == 2) ||
+               (bool(edgeFlag & 2) && edgeId == 0)) {
+        edgeId = -1; // Not an authored mesh edge
+    } else {
+        edgeId = meshEdgeIndex + edgeId - 1;
+    }
+    return edgeId;
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/mesh.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "MeshNormal.Smooth", "PointId.Vertex.None", "Mesh.Vertex"] }
+, "geometryShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Geometry.NoFlat", "Selection.Geometry.WireSelNoOffset", "Geometry.NoCustomDisplacement", "Mesh.Geometry.Quad"] }
+, "fragmentShader" : { "source" : ["Instancing.Transform", "MeshNormal.Pass", "MeshNormal.Fragment.SingleSided", "MeshFaceCull.Fragment.None", "MeshWire.Fragment.NoEdge", "MeshWire.Fragment.EdgeParam", "Fragment.CommonTerminals", "Fragment.Surface", "Fragment.ScalarOverride", "EdgeId.Fragment.Common", "EdgeId.Fragment.QuadSurface", "EdgeId.Fragment.QuadParam", "PointId.Fragment.Fallback", "Visibility.Fragment.Fallback", "Mesh.Fragment.PatchCoord", "Mesh.Fragment"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_smoothNormals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 smoothNormals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 smoothNormals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_smoothNormals(int localIndex) { return hd_vec3_get(smoothNormals);}
+vec3 HdGet_smoothNormals() { return HdGet_smoothNormals(0); }
+float HdGetScalar_smoothNormals(int localIndex) { return HdGet_smoothNormals(localIndex).x; }
+float HdGetScalar_smoothNormals() { return HdGet_smoothNormals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.smoothNormals = smoothNormals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    vec3 normal = vec3(0);
+#if defined(HD_HAS_smoothNormals)
+    normal = vec3(HdGet_smoothNormals(index).xyz);
+#elif defined(HD_HAS_packedSmoothNormals)
+    normal = vec3(HdGet_packedSmoothNormals(index).xyz);
+#endif
+
+    MAT4 transformInv = ApplyInstanceTransformInverse(HdGet_transformInverse());
+    normal = vec4(transpose(transformInv * GetWorldToViewInverseMatrix()) *
+                  vec4(normal,0)).xyz;
+
+    if (length(normal) > 0.0)
+        normal = normalize(normal);
+    return normal;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+float GetPointRasterSize(int pointId)
+{
+    return GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    // do nothing
+}
+
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(float GetPointRasterSize(int));
+FORWARD_DECL(void ProcessPointId(int));
+
+void main(void)
+{
+    ProcessPrimvarsIn();
+
+    MAT4 transform    = ApplyInstanceTransform(HdGet_transform());
+    vec4 point        = vec4(HdGet_points().xyz, 1);
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    outData.Neye = GetNormal(vec3(0), 0); // normalized
+
+    int pointId = GetPointId();
+    gl_PointSize = GetPointRasterSize(pointId);
+    ProcessPointId(pointId);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_smoothNormals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+layout (lines_adjacency) in;
+layout (triangle_strip, max_vertices = 6) out;
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+flat layout(location = 0) in int vs_dc_modelCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 1) in int vs_dc_constantCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 2) in int vs_dc_elementCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 3) in int vs_dc_primitiveCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 4) in int vs_dc_fvarCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 5) in int vs_dc_shaderCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 6) in int vs_dc_vertexCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 8) in int vs_dc_varyingCoord[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 9) in int vs_dc_instanceIndexI0[HD_NUM_PRIMITIVE_VERTS];
+flat layout(location = 10) in int vs_dc_instanceCoordsI0[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 11) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData[4];
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 smoothNormals;
+} inPrimvars[HD_NUM_PRIMITIVE_VERTS];
+layout(location = 2) out vec4 gsPatchCoord;
+noperspective layout(location = 3) out vec3 hd_barycentricCoord;
+flat layout(location = 7) out int gs_dc_modelCoord;
+flat layout(location = 8) out int gs_dc_constantCoord;
+flat layout(location = 9) out int gs_dc_elementCoord;
+flat layout(location = 10) out int gs_dc_primitiveCoord;
+flat layout(location = 11) out int gs_dc_fvarCoord;
+flat layout(location = 12) out int gs_dc_shaderCoord;
+flat layout(location = 13) out int gs_dc_vertexCoord;
+flat layout(location = 14) out int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) out int gs_dc_varyingCoord;
+flat layout(location = 16) out int gs_dc_instanceIndexI0;
+flat layout(location = 17) out int gs_dc_instanceCoordsI0;
+layout(location = 0) out VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} outData;
+layout(location = 4) out PrimvarData {
+  vec3 points;
+  vec3 smoothNormals;
+  vec2 dispTextureCoord;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen GS Source //////// 
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord[0];
+  dc.constantCoord = vs_dc_constantCoord[0];
+  dc.elementCoord = vs_dc_elementCoord[0];
+  dc.primitiveCoord = vs_dc_primitiveCoord[0];
+  dc.fvarCoord = vs_dc_fvarCoord[0];
+  dc.shaderCoord = vs_dc_shaderCoord[0];
+  dc.vertexCoord = vs_dc_vertexCoord[0];
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord[0];
+  dc.varyingCoord = vs_dc_varyingCoord[0];
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0[0];
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].points);
+}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_smoothNormals(int localIndex) {
+  int index = localIndex;
+  return vec3(inPrimvars[index].smoothNormals);
+}
+vec3 HdGet_smoothNormals() { return HdGet_smoothNormals(0); }
+float HdGetScalar_smoothNormals(int localIndex) { return HdGet_smoothNormals(localIndex).x; }
+float HdGetScalar_smoothNormals() { return HdGet_smoothNormals(0).x; }
+vec2 HdGet_dispTextureCoord_Coarse(int localIndex) {
+  int fvarIndex = GetFVarIndex(localIndex);
+  return vec2(dispTextureCoord[fvarIndex]);
+}
+vec2 HdGet_dispTextureCoord(int localIndex, vec2 st) {
+  return mix(mix(HdGet_dispTextureCoord_Coarse(0),HdGet_dispTextureCoord_Coarse(1), st.x),mix(HdGet_dispTextureCoord_Coarse(3),HdGet_dispTextureCoord_Coarse(2), st.x), st.y);
+}
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+FORWARD_DECL(vec2 GetPatchCoordLocalST());
+vec2 HdGet_dispTextureCoord(int localIndex) {
+  vec2 localST = GetPatchCoord(localIndex).xy;
+  return HdGet_dispTextureCoord(localIndex, localST);
+}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+FORWARD_DECL(vec4 GetPatchCoord(int localIndex));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// //////// Codegen Proc GS //////// 
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessPrimvarsOut(int index) {
+  vec2 localST = GetPatchCoord(index).xy;
+  const vec3 coords[4] = vec3[](
+   vec3(1,0,0), vec3(0,1,0), vec3(0,0,1), vec3(0,1,0)
+  );
+  hd_barycentricCoord = coords[index];
+  hd_drawingCoord dc = GetDrawingCoord();
+  gs_dc_modelCoord = dc.modelCoord;
+  gs_dc_constantCoord = dc.constantCoord;
+  gs_dc_elementCoord = dc.elementCoord;
+  gs_dc_primitiveCoord = dc.primitiveCoord;
+  gs_dc_fvarCoord = dc.fvarCoord;
+  gs_dc_shaderCoord = dc.shaderCoord;
+  gs_dc_vertexCoord = dc.vertexCoord;
+  gs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  gs_dc_varyingCoord = dc.varyingCoord;
+  gs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = inPrimvars[index].points;
+  outPrimvars.smoothNormals = inPrimvars[index].smoothNormals;
+  outPrimvars.dispTextureCoord = HdGet_dispTextureCoord(index);
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+vec4 displacementShader(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetTriGeometryNormal(vec3 Neye, vec4 Peye0, vec4 Peye1, vec4 Peye2,
+                          bool isFlipped)
+{
+    return Neye;
+}
+
+vec3 GetQuadGeometryNormal(vec3 Neye,
+                           vec4 Peye0, vec4 Peye1, vec4 Peye2, vec4 Peye3,
+                           bool isFlipped)
+{
+    return Neye;
+}
+
+
+
+vec4 ComputeSelectionOffset()
+{
+    return vec4(0);
+}
+
+
+
+vec4 DisplacementTerminal(int index, vec4 Peye, vec3 Neye, vec4 patchCoord)
+{
+    return Peye;
+}
+
+
+
+vec4 GetPatchCoord(int index)
+{
+    vec2 uv[4];
+    uv[0] = vec2(0, 0);
+    uv[1] = vec2(1, 0);
+    uv[2] = vec2(1, 1);
+    uv[3] = vec2(0, 1);
+
+    ivec3 patchParam = GetPatchParam();
+    return InterpolatePatchCoord(uv[index], patchParam);
+}
+
+void emit(int index, vec4 Peye, vec3 Neye)
+{
+    outData.Peye = Peye;
+    outData.Neye = Neye;
+
+    gsPatchCoord = GetPatchCoord(index);
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    ProcessPrimvarsOut(index);
+
+    EmitVertex();
+}
+
+FORWARD_DECL(vec4 ComputeSelectionOffset()); // selection.glslfx
+
+void main(void)
+{
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+
+    bool isFlipped = IsFlipped(); // consider handedness AND negative-scale
+
+    vec3 Neye0 = GetNormal(inData[0].Neye, 0);
+    Neye0 = GetQuadGeometryNormal(Neye0, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye1 = GetNormal(inData[1].Neye, 1);
+    Neye1 = GetQuadGeometryNormal(Neye1, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye2 = GetNormal(inData[2].Neye, 2);
+    Neye2 = GetQuadGeometryNormal(Neye2, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+    vec3 Neye3 = GetNormal(inData[3].Neye, 3);
+    Neye3 = GetQuadGeometryNormal(Neye3, inData[0].Peye, inData[1].Peye,
+        inData[2].Peye, inData[3].Peye, isFlipped);
+
+    vec4 Peye0 = DisplacementTerminal(
+        0, inData[0].Peye, Neye0, GetPatchCoord(0));
+    vec4 Peye1 = DisplacementTerminal(
+        1, inData[1].Peye, Neye1, GetPatchCoord(1));
+    vec4 Peye2 = DisplacementTerminal(
+        2, inData[2].Peye, Neye2, GetPatchCoord(2));
+    vec4 Peye3 = DisplacementTerminal(
+        3, inData[3].Peye, Neye3, GetPatchCoord(3));
+
+    // Generate triangles (0,1,2) and (2,3,0)
+    //  3---2
+    //  |  .|
+    //  | . |
+    //  |.  |
+    //  0---1
+    // The indices post-quadrangulation/subdivision follow the convention:
+    // 0   -> original (hull) vertex
+    // 1,3 -> edge vertices
+    // 2   -> center vertex
+    //
+    // By having index 2 in both the triangles, we ensure the pre-quadrangulated
+    // face's normal (at the center) is part of the rasterizer interpolation,
+    // which matters when we use smooth/limit normals.
+    // In the case of flat normals, we use the vertex positions, so it doesn't
+    // matter.
+
+    // For wireframe, add a polygon offset to selected faces to ensure they
+    // rasterize over unselected faces.
+    vec4 selOffset = ComputeSelectionOffset();
+    Peye0 += selOffset;
+    Peye1 += selOffset;
+    Peye2 += selOffset;
+    Peye3 += selOffset;
+
+    // triangle 0: vertices (0,1,2)
+    emit(0, Peye0, Neye0);
+    emit(1, Peye1, Neye1);
+    emit(2, Peye2, Neye2);
+    EndPrimitive();
+
+    // triangle 1: vertices (2,3,0)
+    gl_PrimitiveID = gl_PrimitiveIDIn;
+    emit(2, Peye2, Neye2);
+    emit(3, Peye3, Neye3);
+    emit(0, Peye0, Neye0);
+    EndPrimitive();
+}
+
+
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 4
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_faceVisibility 1
+#define HD_HAS_dispTextureCoord 1
+#define HD_HAS_points 1
+#define HD_HAS_smoothNormals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+vec4 InterpolatePatchCoord(vec2 uv, ivec3 patchParam)
+{
+    // add 0.5 to integer values for more robust interpolation
+    return vec4(uv.x, uv.y, 0, patchParam.x+0.5f);
+}
+vec4 InterpolatePatchCoordTriangle(vec2 uv, ivec3 patchParam)
+{
+    return InterpolatePatchCoord(uv, patchParam);
+}
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(std430, binding = 1) readonly buffer ssbo_primitiveParam { int primitiveParam[]; };
+layout(std430, binding = 2) readonly buffer ssbo_edgeIndices { ivec2 edgeIndices[]; };
+layout(std430, binding = 3) readonly buffer ssbo_faceVisibility { float faceVisibility[]; };
+layout(std430, binding = 4) readonly buffer ssbo_dispTextureCoord { vec2 dispTextureCoord[]; };
+layout(location = 2) in vec4 gsPatchCoord;
+noperspective layout(location = 3) in vec3 hd_barycentricCoord;
+flat layout(location = 7) in int gs_dc_modelCoord;
+flat layout(location = 8) in int gs_dc_constantCoord;
+flat layout(location = 9) in int gs_dc_elementCoord;
+flat layout(location = 10) in int gs_dc_primitiveCoord;
+flat layout(location = 11) in int gs_dc_fvarCoord;
+flat layout(location = 12) in int gs_dc_shaderCoord;
+flat layout(location = 13) in int gs_dc_vertexCoord;
+flat layout(location = 14) in int gs_dc_topologyVisibilityCoord;
+flat layout(location = 15) in int gs_dc_varyingCoord;
+flat layout(location = 16) in int gs_dc_instanceIndexI0;
+flat layout(location = 17) in int gs_dc_instanceCoordsI0;
+layout(location = 0) in VertexData {
+  vec4 Peye;
+  vec3 Neye;
+} inData;
+layout(location = 4) in PrimvarData {
+  vec3 points;
+  vec3 smoothNormals;
+  vec2 dispTextureCoord;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return hd_barycentricCoord;
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = gs_dc_modelCoord;
+  dc.constantCoord = gs_dc_constantCoord;
+  dc.elementCoord = gs_dc_elementCoord;
+  dc.primitiveCoord = gs_dc_primitiveCoord;
+  dc.fvarCoord = gs_dc_fvarCoord;
+  dc.shaderCoord = gs_dc_shaderCoord;
+  dc.vertexCoord = gs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = gs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = gs_dc_varyingCoord;
+  dc.instanceIndex[0] = gs_dc_instanceIndexI0;
+  return dc; 
+}
+int HdGet_primitiveParam(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return int(primitiveParam[index]);
+}
+int HdGet_primitiveParam() { return HdGet_primitiveParam(0); }
+int HdGetScalar_primitiveParam(int localIndex) { return HdGet_primitiveParam(localIndex); }
+int HdGetScalar_primitiveParam() { return HdGet_primitiveParam(0); }
+#if defined(HD_HAS_coarseFaceIndex)
+FORWARD_DECL(int HdGetScalar_coarseFaceIndex());
+#endif
+ivec3 GetPatchParam() {
+#if defined(HD_HAS_coarseFaceIndex)
+   return ivec3(HdGetScalar_coarseFaceIndex(), 0, 0);
+#else
+   return ivec3(GetPrimitiveID(), 0, 0);
+#endif
+}
+int GetEdgeFlag() {
+  return (HdGet_primitiveParam() & 3);
+}
+int GetFVarIndex(int localIndex) {
+  int fvarCoord = GetDrawingCoord().fvarCoord;
+  int ptexIndex = GetPatchParam().x & 0xfffffff;
+  return fvarCoord + ptexIndex * 4 + localIndex;
+}
+int GetElementID() {
+  return (hd_int_get(HdGet_primitiveParam()) >> 2);
+}
+int GetAggregatedElementID() {
+  return GetElementID()
+  + GetDrawingCoord().elementCoord;
+}
+ivec2 HdGet_edgeIndices(int localIndex) {
+  int index = GetPrimitiveIndex();
+  return ivec2(edgeIndices[index]);
+}
+ivec2 HdGet_edgeIndices() { return HdGet_edgeIndices(0); }
+int HdGetScalar_edgeIndices(int localIndex) { return HdGet_edgeIndices(localIndex).x; }
+int HdGetScalar_edgeIndices() { return HdGet_edgeIndices(0).x; }
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return primitiveEdgeId;
+}
+float HdGet_faceVisibility(int localIndex) {
+  int index = GetAggregatedElementID();
+  return float(faceVisibility[index]);
+}
+float HdGet_faceVisibility() { return HdGet_faceVisibility(0); }
+float HdGetScalar_faceVisibility(int localIndex) { return HdGet_faceVisibility(localIndex); }
+float HdGetScalar_faceVisibility() { return HdGet_faceVisibility(0); }
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_smoothNormals(int localIndex) { return vec3(inPrimvars.smoothNormals);}
+vec3 HdGet_smoothNormals() { return HdGet_smoothNormals(0); }
+float HdGetScalar_smoothNormals(int localIndex) { return HdGet_smoothNormals(localIndex).x; }
+float HdGetScalar_smoothNormals() { return HdGet_smoothNormals(0).x; }
+vec2 HdGet_dispTextureCoord(int localIndex) { return vec2(inPrimvars.dispTextureCoord);}
+vec2 HdGet_dispTextureCoord() { return HdGet_dispTextureCoord(0); }
+float HdGetScalar_dispTextureCoord(int localIndex) { return HdGet_dispTextureCoord(localIndex).x; }
+float HdGetScalar_dispTextureCoord() { return HdGet_dispTextureCoord(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+vec3 GetNormal(vec3 Neye, int index)
+{
+    return Neye;
+}
+
+vec3 GetNormal(vec3 Neye, int index, vec2 localST)
+{
+    return GetNormal(Neye, index);
+}
+
+
+
+vec3 GetShadingNormal(vec3 N, bool isFlipped)
+{
+    // the fragment shader takes already-flipped-normals.
+    // no need to flip here.
+    return N;
+}
+
+
+
+void DiscardBasedOnShading(bool frontFacing, bool isFlipped)
+{
+    // Nothing to do since h/w face culling is used.
+}
+
+
+
+vec4 ApplyEdgeColor(vec4 Cfill, vec4 patchCoord)
+{
+    return Cfill;
+}
+
+// Return a large value, signifying that the fragment isn't near an edge.
+float GetMinEdgeDistance()
+{
+    return 1000.0;
+}
+
+
+
+vec3 GetEdgeParamTriangle()
+{
+    // Expand barycentric coordinates
+    vec2 param = GetPatchCoord(0).xy;
+    vec3 barycentric = vec3(param.x, param.y, 1 - param.x - param.y);
+
+    // Match triangle edge order
+    return barycentric.yzx;
+}
+
+vec3 GetEdgeDistanceTriangle()
+{
+    vec3 param = GetEdgeParamTriangle();
+    return max(vec3(0.0), param / fwidth(param));
+}
+
+vec4 GetEdgeParamQuad()
+{
+    // Expand coordinates to opposite corners of quad
+    vec2 leftBottom = GetPatchCoord(0).xy;
+    vec2 rightTop = vec2(1.0) - leftBottom;
+
+    // Match quad edge order
+    return vec4(leftBottom.y, rightTop.x, rightTop.y, leftBottom.x);
+}
+
+vec4 GetEdgeDistanceQuad()
+{
+    vec4 param = GetEdgeParamQuad();
+    return max(vec4(0.0), param / fwidth(param));
+}
+
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+#if defined(HD_HAS_scalarOverride)
+    result.enabled = true;
+
+    // Allow a scalar value to override the color from the surface
+    // for previewing heatmaps. This is useful for editing workflows.
+#if defined(HD_HAS_scalarOverrideColorRamp)
+    int rampCount = constantPrimvars[GetDrawingCoord().constantCoord].
+                scalarOverrideColorRamp.length();
+    float scalar = HdGet_scalarOverride() * float(rampCount - 1);
+    float baseIndex = floor(scalar);
+    float nextIndex = min(float(rampCount - 1), baseIndex + 1.0);
+    float interp = scalar - baseIndex;
+    result.color = mix(HdGet_scalarOverrideColorRamp(int(baseIndex)).rgb,
+                       HdGet_scalarOverrideColorRamp(int(nextIndex)).rgb,
+                       interp);
+#else
+    // If no ramp is given just gamma correct the scalar as greyscale.
+    result.color = vec3(pow(HdGet_scalarOverride(), 2.2));
+#endif // HD_HAS_scalarOverrideColorRamp
+
+#else // HD_HAS_scalarOverride
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+#endif
+
+    return result;
+}
+
+
+
+// Determines whether a fragment is on or close to an unhidden triangle edge.
+const float edgePickRadius = 2; // in viewport pixels
+const float edgePickParametricRadius = 0.02; // in parametric space
+
+// For smooth looking edges, use an exponential falloff for the opacity.
+// Note: We use a slower falloff fn than in meshWire.glslfx to make the
+// selected edges stand out.
+float SelectedEdgeFalloff(float d) {
+    return exp2(-1 * d * d);
+}
+
+
+
+vec4 ComputeBaseFaceEdgeDistanceQuad()
+{
+    return GetEdgeDistanceQuad();
+}
+
+
+
+float GetSelectedEdgeOpacity()
+{
+    float closestEdgeDistance = 0.0;
+
+    // The sequence of comparisons should match GetPrimitiveEdgeId()
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        closestEdgeDistance = dist.x;
+    } else if (dist.y < edgePickRadius) {
+        closestEdgeDistance = dist.y;
+    } else if (dist.z < edgePickRadius) {
+        closestEdgeDistance = dist.z;
+    } else if (dist.w < edgePickRadius) {
+        closestEdgeDistance = dist.w;
+    } else {
+        return 0;
+    }
+
+    return SelectedEdgeFalloff(closestEdgeDistance);
+}
+
+// called from hdx/renderPass.glslfx and selection.glslfx
+int GetPrimitiveEdgeId()
+{
+    //               e2
+    //     (0,1) 3 ------ 2 (1,1)
+    //           |        |
+    //       e3  |        |  e1
+    //           |        |
+    //     (0,0) 0 ------ 1 (1,0)
+    //               e0
+
+    int edgeId = -1;
+
+    vec4 dist = ComputeBaseFaceEdgeDistanceQuad();
+    if (dist.x < edgePickRadius) {
+        edgeId = 0;
+    } else if (dist.y < edgePickRadius) {
+        edgeId = 1;
+    } else if (dist.z < edgePickRadius) {
+        edgeId = 2;
+    } else if (dist.w < edgePickRadius) {
+        edgeId = 3;
+    } else {
+        return -1; // Not on a mesh edge
+    }
+
+    const int edgeFlag = GetEdgeFlag();
+    const ivec2 meshEdgeIndices = HdGet_edgeIndices();
+
+    // Translate face-edge to authored mesh-edge
+    if (edgeFlag == 0) {
+        edgeId = meshEdgeIndices[0] + edgeId; // regular quad face
+    } else if (edgeId == 0) {
+        edgeId = meshEdgeIndices[0];
+    } else if (edgeId == 3) {
+        edgeId = meshEdgeIndices[1];
+    } else {
+        edgeId = -1; // Not an authored mesh edge
+    }
+    return edgeId;
+}
+
+
+int GetPointId()
+{
+    return -1;
+}
+
+
+void DiscardBasedOnTopologicalVisibility()
+{
+    // Nothing to do, since there's no authored opinion.
+}
+
+
+
+vec4 GetInterpolatedPatchCoord()
+{
+    return gsPatchCoord;
+}
+
+
+
+#ifndef HD_HAS_ptexFaceOffset
+#define HD_HAS_ptexFaceOffset
+int HdGet_ptexFaceOffset()
+{
+    return 0;
+}
+#endif
+
+vec4 GetPatchCoord(int localIndex)
+{
+    vec4 patchCoord = GetInterpolatedPatchCoord();
+    return vec4(patchCoord.xyz, patchCoord.w + HdGet_ptexFaceOffset());
+}
+
+vec4 GetPatchCoord()
+{
+    return GetPatchCoord(0);
+}
+
+vec3 ComputeScreenSpacePeye()
+{
+    return inData.Peye.xyz / inData.Peye.w;
+}
+
+vec3 ComputeScreenSpaceNeye()
+{
+    vec3 Peye = ComputeScreenSpacePeye();
+    vec3 Neye = normalize(cross(dFdx(Peye), dFdy(Peye)));
+    return (gl_FrontFacing ? Neye : -Neye);
+}
+
+void main(void)
+{
+    bool isFlipped = IsFlipped();
+
+    DiscardBasedOnShading(gl_FrontFacing, isFlipped);
+
+    DiscardBasedOnTopologicalVisibility();
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec3 Peye = ComputeScreenSpacePeye();
+
+    vec3 Neye = inData.Neye;
+    // Normalize Neye after rasterizer interpolation.
+    if (length(Neye) > 0.0) {
+        Neye = normalize(Neye);
+    }
+    // Give the shader key a chance to override the normal.
+    Neye = GetNormal(Neye, 0);
+    // Orient the normal for shading.
+    Neye = GetShadingNormal(Neye, isFlipped);
+
+    vec4 patchCoord = GetPatchCoord();
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+    color = ApplyEdgeColor(color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+        return;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_points_indirect.out b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_points_indirect.out
new file mode 100644
index 0000000000..60f3c01447
--- /dev/null
+++ b/pxr/imaging/hdSt/testenv/testHdStCodeGen_Vulkan/baseline/codegen_points_indirect.out
@@ -0,0 +1,1735 @@
+-------------------------------------------------------
+-- glslfx version 0.1
+#import $TOOLS/hdSt/shaders/points.glslfx
+-- configuration
+{"techniques": {"default": {
+"vertexShader" : { "source" : ["Instancing.Transform", "Point.Vertex", "PointId.Vertex.PointParam", "Selection.DecodeUtils", "Selection.Vertex.PointSel"] }
+, "fragmentShader" : { "source" : ["Fragment.CommonTerminals", "Fragment.Surface", "Fragment.NoScalarOverride", "Point.Fragment", "PointId.Fragment.PointParam"] }
+}}}
+-------------------------------------------------------
+=======================================================
+  VERTEX SHADER                                        
+=======================================================
+#version 450
+#extension GL_ARB_shader_draw_parameters : require
+int HgiGetBaseVertex() {
+  return gl_BaseVertexARB;
+}
+int HgiGetBaseInstance() {
+  return gl_BaseInstanceARB;
+}
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 1
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+layout(location = 2) in ivec4 drawingCoord0;
+layout(location = 3) in ivec4 drawingCoord1;
+layout(location = 4) in ivec2 drawingCoord2;
+layout(location = 0) in vec3 points;
+layout(location = 1) in vec3 normals;
+uint hd_VertexID = gl_VertexIndex;
+uint hd_InstanceID = gl_InstanceIndex;
+uint hd_BaseInstance = HgiGetBaseInstance();
+flat layout(location = 0) out int vs_dc_modelCoord;
+flat layout(location = 1) out int vs_dc_constantCoord;
+flat layout(location = 2) out int vs_dc_elementCoord;
+flat layout(location = 3) out int vs_dc_primitiveCoord;
+flat layout(location = 4) out int vs_dc_fvarCoord;
+flat layout(location = 5) out int vs_dc_shaderCoord;
+flat layout(location = 6) out int vs_dc_vertexCoord;
+flat layout(location = 7) out int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) out int vs_dc_varyingCoord;
+flat layout(location = 9) out int vs_dc_instanceIndexI0;
+flat layout(location = 10) out int vs_dc_instanceCoordsI0;
+flat layout(location = 12) out int vsPointId;
+layout(location = 11) out VertexData {
+  vec4 Peye;
+} outData;
+layout(location = 13) out PrimvarData {
+  vec3 points;
+  vec3 normals;
+} outPrimvars;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen VS Source //////// 
+int GetBaseVertexOffset() {
+  return HgiGetBaseVertex();
+}
+hd_instanceIndex GetInstanceIndex() {  hd_instanceIndex r; r.indices[0] = 0; return r; }
+hd_drawingCoord GetDrawingCoord() { hd_drawingCoord dc;
+  dc.modelCoord              = drawingCoord0.x;
+  dc.constantCoord           = drawingCoord0.y;
+  dc.elementCoord            = drawingCoord0.z;
+  dc.primitiveCoord          = drawingCoord0.w;
+  dc.fvarCoord               = drawingCoord1.x;
+  dc.shaderCoord             = drawingCoord1.z;
+  dc.vertexCoord             = drawingCoord1.w;
+  dc.topologyVisibilityCoord = drawingCoord2.x;
+  dc.varyingCoord            = drawingCoord2.y;
+  hd_instanceIndex r = GetInstanceIndex();
+  dc.instanceIndex[0] = r.indices[0];
+  return dc;
+}
+vec3 HdGet_points(int localIndex) { return hd_vec3_get(points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return hd_vec3_get(normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+
+// //////// Codegen Proc VS //////// 
+void ProcessPrimvarsIn() {
+  hd_drawingCoord dc = GetDrawingCoord();
+  vs_dc_modelCoord = dc.modelCoord;
+  vs_dc_constantCoord = dc.constantCoord;
+  vs_dc_elementCoord = dc.elementCoord;
+  vs_dc_primitiveCoord = dc.primitiveCoord;
+  vs_dc_fvarCoord = dc.fvarCoord;
+  vs_dc_shaderCoord = dc.shaderCoord;
+  vs_dc_vertexCoord = dc.vertexCoord;
+  vs_dc_topologyVisibilityCoord = dc.topologyVisibilityCoord;
+  vs_dc_varyingCoord = dc.varyingCoord;
+  vs_dc_instanceIndexI0 = dc.instanceIndex[0];
+  outPrimvars.points = points;
+  outPrimvars.normals = normals;
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+void ApplyClipPlanes(vec4 Peye)
+{
+#if defined(HD_HAS_numClipPlanes)
+#if defined(HD_HAS_clipPlanes)
+    for (int i=0; i<HD_NUM_clipPlanes; ++i) {
+        // For Hgi backends like Metal, we declare a shader stage output of
+        // gl_ClipDistance[HD_NUM_clipPlanes], since we need to know the array
+        // size at compile time. To avoid having any uninitialized values in
+        // that array, we initialize them all to zero first.
+        gl_ClipDistance[i] = 0;
+        if (i < HdGet_numClipPlanes()) {
+            gl_ClipDistance[i] = dot(HdGet_clipPlanes(i), Peye);
+        }
+    }
+#endif
+#endif
+}
+
+
+
+// quaternion to matrix. xyz = imaginary, w = real
+MAT4 GetRotationMatrix(vec4 q)
+{
+    MAT4 r;
+    r[0].xyzw = vec4(1 - 2 * (q.y * q.y + q.z * q.z),
+                         2 * (q.x * q.y + q.z * q.w),
+                         2 * (q.x * q.z - q.y * q.w),
+                     0);
+    r[1].xyzw = vec4(    2 * (q.x * q.y - q.z * q.w),
+                     1 - 2 * (q.x * q.x + q.z * q.z),
+                         2 * (q.y * q.z + q.x * q.w),
+                     0);
+    r[2].xyzw = vec4(    2 * (q.x * q.z + q.y * q.w),
+                         2 * (q.y * q.z - q.x * q.w),
+                     1 - 2 * (q.x * q.x + q.y * q.y),
+                     0);
+    r[3] = vec4(0, 0, 0, 1);
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform(int level)
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = HdGetInstance_hydra_instanceTransforms(level, MAT4(1)) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = HdGetInstance_instanceTransform(level, MAT4(1)) * m;
+#endif
+
+    // instance transform elements are applied:
+    //   scale then rotate then translate
+    //   i.e. (T * R * S) * position
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 s = HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#elif defined(HD_HAS_INSTANCE_instanceScale)
+    vec3 s = HdGetInstance_scale(level, /*default=*/vec3(1));
+    m = MAT4(s.x,   0,   0, 0,
+               0, s.y,   0, 0,
+               0,   0, s.z, 0,
+               0,   0,   0, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations // GfQuat(ix, iy, iz, real)
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 t = HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 t = HdGetInstance_translate(level, /*default=*/vec3(0));
+    m = MAT4(  1,   0,   0,  0,
+               0,   1,   0,  0,
+               0,   0,   1,  0,
+             t.x, t.y, t.z,  1) * m;
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse(int level)
+{
+    MAT4 m = MAT4(1);
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    m = inverse(HdGetInstance_hydra_instanceTransforms(level, MAT4(1))) * m;
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    m = inverse(HdGetInstance_instanceTransform(level, MAT4(1))) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTranslations
+    vec3 it = -HdGetInstance_hydra_instanceTranslations(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#elif defined(HD_HAS_INSTANCE_translate)
+    vec3 it = -HdGetInstance_translate(level, /*default=*/vec3(0)); // negate
+    m = MAT4(   1,    0,    0, 0,
+                0,    1,    0, 0,
+                0,    0,    1, 0,
+             it.x, it.y, it.z, 1) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceRotations
+    vec4 q = HdGetInstance_hydra_instanceRotations(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#elif defined(HD_HAS_INSTANCE_rotate)
+    vec4 q = HdGetInstance_rotate(level, /*default=*/vec4(0));
+    q.xyz = -q.xyz; // inverse rotataion axis
+    m = GetRotationMatrix(q) * m;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    vec3 is = 1.0/HdGetInstance_hydra_instanceScales(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#elif defined(HD_HAS_INSTANCE_scale)
+    vec3 is = 1.0/HdGetInstance_scale(level, /*default=*/vec3(1)); // inverse scale
+    m = MAT4(is.x,    0,    0,  0,
+                0, is.y,    0,  0,
+                0,    0, is.z,  0,
+                0,    0,    0,  1) * m;
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 GetInstanceTransform()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = GetInstanceTransform(i) * m;
+#ifdef HD_HAS_instancerTransform
+        m = HdGet_instancerTransform(i) * m;
+#endif
+    }
+#endif
+    return m;
+}
+
+MAT4 GetInstanceTransformInverse()
+{
+    MAT4 m = MAT4(1);
+#ifdef HD_INSTANCER_NUM_LEVELS
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        m = m * GetInstanceTransformInverse(i);
+#ifdef HD_HAS_instancerTransformInverse
+        m = m * HdGet_instancerTransformInverse(i);
+#endif
+    }
+#endif
+    return m;
+}
+
+// ---------------------------------------------------------------------------
+
+MAT4 ApplyInstanceTransform(MAT4 m)
+{
+    return GetInstanceTransform() * m;
+}
+
+MAT4 ApplyInstanceTransformInverse(MAT4 m)
+{
+    return m * GetInstanceTransformInverse();
+}
+
+bool IsFlipped()
+{
+#if defined(HD_HAS_isFlipped)
+    bool flip = (HdGet_isFlipped() != 0);
+#elif defined(HD_HAS_transform)
+    // The sign of the determinant indicates whether m flips handedness
+    bool flip = (determinant(HdGet_transform()) < 0.0);
+#else
+    bool flip = false;
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceScales
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_hydra_instanceScales(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#elif defined(HD_HAS_INSTANCE_scale)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        vec3 scale = HdGetInstance_scale(i, /*default=*/vec3(1));
+        flip = flip != ((sign(scale.x) * sign(scale.y) * sign(scale.z)) < 0);
+    }
+#endif
+
+#ifdef HD_HAS_INSTANCE_hydra_instanceTransforms
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_hydra_instanceTransforms(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#elif defined(HD_HAS_INSTANCE_instanceTransform)
+    for (int i = 0; i < HD_INSTANCER_NUM_LEVELS; ++i) {
+        MAT4 m = HdGetInstance_instanceTransform(i, MAT4(1));
+        flip = flip != (determinant(m) < 0.0);
+    }
+#endif
+
+    return flip;
+}
+
+
+// Fwd declare methods defined in pointId.glslfx, that are used below.
+FORWARD_DECL(int GetPointId());
+FORWARD_DECL(void ProcessPointId(int));
+
+// The approach used below transforms a unit diagonal vector by the provided
+// matrix and returns its length.
+// This works when the provided transform is computed from a chain of
+// transformations wherein the scale operation doesn't follow a rotation.
+// This is typically true with scene-graph hierachies wherein the parent nodes
+// are rigid-body transformations.
+//
+// When that isn't the case, this approach would result in scaling that is
+// coordinate-system dependent.
+// The accurate way to calculate the scale would be to compute the determinant.
+//
+float ExtractAverageScaleFromMatrix(
+    MAT4 transform)
+{
+    const vec4 eyeScale = vec4(transform * normalize(vec4(1,1,1,0)));
+    return length(eyeScale.xyz);
+}
+
+
+// Compute the point size in pixels based on the authored width.
+float ComputeRasterPointSize(
+    MAT4 modelToWorldTransform, float eyeZ)
+{
+    // Check for primvar 'widths'. This is in model space.
+#if defined(HD_HAS_widths)
+    float modelWidth = HdGet_widths();
+#else
+    float modelWidth = 1.0;
+#endif
+
+    // Compute scaling from the modelToWorld and worldToView transforms.
+    const float modelToEyeScale =
+        ExtractAverageScaleFromMatrix(
+            GetWorldToViewMatrix() * modelToWorldTransform);
+
+    // Compute the scaling factor in X when transforming from eye space to NDC
+    // space. We want to know how much the x-value of the result of the
+    // perspective division varies as the x-value of the position (x,y,z,1) in
+    // eye space varies.
+    //
+    // With 'p' being the projection matrix and using row-major order, the
+    // x-value in NDC space is:
+    //
+    // (x * p[0][0] + y * p[1][0] + z * p[2][0] + 1 * p[3][0]) /
+    // (x * p[0][3] + y * p[1][3] + z * p[2][3] + 1 * p[3][3])
+    //
+    // The derivative with respect to x under the assumption that p[0][3] and
+    // p[1][3] is zero (which is the case for perspective and orthographic
+    // projection) then simply is p[0][0] / (z * p[2][3] + p[3][3]).
+    //
+    const MAT4 projMat = GetProjectionMatrix();
+    const float eyeToClipXScale = float(projMat[0][0]);
+    const float clipW = float(eyeZ * projMat[2][3] + projMat[3][3]);
+    const float eyeToNDCScale = eyeToClipXScale / clipW;
+
+    // Our final scaling factor is from the viewport transform, transforming
+    // from [-1,1] NDC space to image (pixel) space.
+    const float viewportSizeX = GetViewport().z;
+    const float NDCToImageScale = viewportSizeX * 0.5;
+
+    return modelWidth * modelToEyeScale * eyeToNDCScale * NDCToImageScale;
+}
+
+void main(void)
+{
+    MAT4 transform  = ApplyInstanceTransform(HdGet_transform());
+    vec4 point     = vec4(HdGet_points().xyz, 1);
+
+    outData.Peye = vec4(GetWorldToViewMatrix() * transform * point);
+
+    ProcessPrimvarsIn();
+
+    gl_Position = vec4(GetProjectionMatrix() * outData.Peye);
+    ApplyClipPlanes(outData.Peye);
+
+    float screenSpaceWidth = ComputeRasterPointSize(transform, outData.Peye.z);
+    gl_PointSize = clamp(screenSpaceWidth,
+                         HD_GL_POINT_SIZE_MIN, HD_GL_POINT_SIZE_MAX);
+
+    ProcessPointId(GetPointId());
+}
+
+
+
+// Fwd declare accessor method defined via code gen
+FORWARD_DECL(int GetBaseVertexOffset());
+int GetPointId()
+{
+    return int(hd_VertexID) - GetBaseVertexOffset();
+}
+
+// Fwd declare selection decoder method defined in hdx/shaders/selection.glslfx
+FORWARD_DECL(bool IsPointSelected(int));
+float GetPointRasterSize(int pointId)
+{
+    return IsPointSelected(pointId)?
+                        GetPointSelectedSize() : GetPointSize();
+}
+
+void ProcessPointId(int pointId)
+{
+    vsPointId = pointId;
+}
+
+
+/// Decoding utilities for selection highlighting.
+/// This mixin may be safely included by any shader stage. Its lone dependency
+/// on code generation is the hdxSelectionBuffer SSBO that holds the encoded
+/// selection state.
+
+// This should match the HdSelection enum.
+int GetMaxNumSelectionHighlightModes()
+{
+    return 2;
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// helper methods to decode hdxSelectionBuffer
+// ------ selection highlight mode specifics -------
+bool HighlightModeHasSelection(int offset)
+{
+    return (offset != 0);
+}
+
+int GetIndexOffsetForHighlightMode(int mode)
+{
+    return HdGet_hdxSelectionBuffer(mode + 1/*[0] holds #modes*/);
+}
+
+int GetNumSelectionHighlightModes()
+{
+    return HdGet_hdxSelectionBuffer(0);
+}
+
+// ------  selection offset specifics -------
+// Note: This should match the selection offset encoding in
+// hdx/SelectionTracker.cpp
+void DecodeSelOffset(int selOffset, REF(thread, bool) isSelected,
+                     REF(thread, int) nextOffset)
+{
+    isSelected = bool(selOffset & 0x1); // bit 0
+    nextOffset = selOffset >> 1;        // bits 31:1
+}
+
+// --------- subprim decoding ----------
+// Each subprims offsets' buffer encoding is:
+// [subprim-type][min][max][     selOffsets     ]
+// <----------3 ----------><--- max - min + 1 -->
+struct SubprimHeader {
+    int type;
+    int min;
+    int max;
+};
+SubprimHeader DecodeSubprimHeader(int offset)
+{
+    SubprimHeader header;
+    header.type = HdGet_hdxSelectionBuffer(offset    );
+    header.min  = HdGet_hdxSelectionBuffer(offset + 1);
+    header.max  = HdGet_hdxSelectionBuffer(offset + 2);
+    return header;
+}
+
+bool IsSubprimSelected(int id, int min, int max, int headerStart,
+                       REF(thread, int) nextSubprimOffset)
+{
+    const int SUBPRIM_SELOFFSETS_HEADER_SIZE  = 3;
+
+    nextSubprimOffset = 0; // initialize
+    bool isSelected = false;
+
+    if (id >= min && id < max) {
+        int netSubprimIndex =
+            headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE + id - min;
+        int selOffset = HdGet_hdxSelectionBuffer(netSubprimIndex);
+
+        DecodeSelOffset(selOffset, /*out*/isSelected, /*out*/nextSubprimOffset);
+    } else {
+        // The subprim id does not fall in the selected id range, so the subprim
+        // in question isn't selected. However, we can still have other
+        // subprim(s) selected. To get the offset to jump to, we mimic decoding
+        // the "min" subprim id.
+        int minSubprimIndex = headerStart + SUBPRIM_SELOFFSETS_HEADER_SIZE;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(minSubprimIndex),
+                        /*out*/isSelected, /*out*/nextSubprimOffset);
+        isSelected = false;
+    }
+
+    return isSelected;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// Keep the result struct definition outside guards.
+struct SubprimSelectionResult {
+    bool elementSelected;
+    bool edgeSelected;
+    bool pointSelected;
+    int  pointColorId;
+};
+
+SubprimSelectionResult InitSubprimSelectionResult(
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SubprimSelectionResult res;
+
+    res.elementSelected = _elementSelected;
+    res.edgeSelected = _edgeSelected;
+    res.pointSelected = _pointSelected;
+    res.pointColorId = _pointColorId;
+
+    return res;
+}
+
+bool IsAnySubprimSelected(SubprimSelectionResult s)
+{
+    return (s.elementSelected || s.edgeSelected || s.pointSelected);
+}
+bool HasCustomizedPointColor(SubprimSelectionResult s)
+{
+    // Use -1 to encode selected points that don't have a custom point color.
+    return (s.pointColorId != -1);
+}
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+// Note: These should match the SubprimType enum in hdx/SelectionTracker.cpp
+#define SUBPRIM_TYPE_ELEMENT 0
+#define SUBPRIM_TYPE_EDGE    1
+#define SUBPRIM_TYPE_POINT   2
+#define SUBPRIM_TYPE_INSTANCE 3
+
+SubprimSelectionResult GetSubprimSel(int offset,
+                                     int elementId, int edgeId, int pointId)
+{
+    SubprimSelectionResult s = InitSubprimSelectionResult(false, false, false, 0);
+
+    int nextSubprimOffset = 0;
+    SubprimHeader header = DecodeSubprimHeader(offset);
+
+    if (header.type == SUBPRIM_TYPE_ELEMENT) {
+        s.elementSelected =
+            IsSubprimSelected(elementId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has additional subprim(s) selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_EDGE) {
+        s.edgeSelected =
+            IsSubprimSelected(edgeId, header.min, header.max,
+                              offset, /*out*/nextSubprimOffset);
+
+        if (nextSubprimOffset != 0) {
+            // fragment has points selected. update header.
+            header = DecodeSubprimHeader(nextSubprimOffset);
+            offset = nextSubprimOffset;
+        }
+    }
+
+    if (header.type == SUBPRIM_TYPE_POINT) {
+        s.pointSelected =
+            IsSubprimSelected(pointId, header.min, header.max,
+                              offset, /*unused*/nextSubprimOffset);
+        // For points alone, since there isn't any subprim to follow it, the
+        // offset field is overriden to represent the index into the
+        // selectedPointColors buffer to support customized coloring of a set of
+        // selected points.
+        s.pointColorId = nextSubprimOffset;
+    }
+
+    return s;
+}
+
+// --------- instance decoding ----------
+bool IsInstanceSelected(int offset, REF(thread, int) nextOffset)
+{
+    // If we don't find an instance subprim block, pass the same offset to
+    // GetSubprimSel.
+    nextOffset = offset;
+    bool sel = false;
+
+    int instanceId = GetDrawingCoord().instanceIndex[0];
+
+    SubprimHeader header = DecodeSubprimHeader(offset);
+    if (header.type == SUBPRIM_TYPE_INSTANCE) {
+        sel =
+            IsSubprimSelected(instanceId, header.min, header.max,
+                              offset, /*out*/nextOffset);
+    }
+
+    return sel;
+}
+#endif // HD_HAS_hdxSelectionBuffer
+
+// --------- selection buffer decoding entry point ----------
+struct SelectionResult {
+    bool primOrInstanceSel;
+    SubprimSelectionResult subprimSel;
+};
+
+SelectionResult InitSelectionResult(
+    bool _primOrInstanceSel,
+    bool _elementSelected,
+    bool _edgeSelected,
+    bool _pointSelected,
+    int _pointColorId)
+{
+    SelectionResult res;
+
+    res.primOrInstanceSel = _primOrInstanceSel;
+    res.subprimSel = InitSubprimSelectionResult(
+                        _elementSelected, _edgeSelected,
+                        _pointSelected, _pointColorId);
+
+    return res;
+}
+
+
+// Decodes the selection buffer encoding scheme for a given mode, and returns
+// the selection result.
+SelectionResult GetSelectionResult(int mode,
+                                   int elementId, int edgeId, int pointId)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    // The hdxSelectionBuffer layout is:
+    // [#modes] [per-mode offset] [data mode0] ... [data modeM]
+    // [---------header---------]
+    // Each mode's data is laid out as:
+    // [ prims | points | edges | elements | instance level-N | ... | level 0 ]
+    //          <-------- subprims ------->  <----------- instances --------->
+    //          <---------------------- per prim ---------------------------->
+    // See hdx/SelectionTracker.cpp for details on the encoding scheme.
+    int modeOffset = GetIndexOffsetForHighlightMode(mode);
+    if (!HighlightModeHasSelection(modeOffset)) {
+        // highlight mode has no selected objects (prims/instances/elements)
+        return res;
+    }
+
+    const int PRIM_SELOFFSETS_HEADER_SIZE = 2;
+    const int primId = HdGet_primID();
+    int smin = HdGet_hdxSelectionBuffer(modeOffset);
+    int smax = HdGet_hdxSelectionBuffer(modeOffset + 1);
+
+    if (primId >= smin && primId < smax) {
+        int offset = modeOffset + PRIM_SELOFFSETS_HEADER_SIZE + primId - smin;
+        int nextOffset = 0;
+        bool sel = false;
+        DecodeSelOffset(HdGet_hdxSelectionBuffer(offset),
+                        /*out*/sel, /*out*/nextOffset);
+
+        // At this point, sel indicates whether the fragment corresponds to
+        // a prim that needs to be fully highlighted, while a non-zero
+        // nextOffset indicates whether additional decoding may be done.
+
+        // We don't currently differentiate between prim, instance and
+        // subprim selection highlighting (i.e., visually, they look the
+        // same), and thus can skip additional decoding if sel is true.
+        // We choose not to, for ease of future customization.
+        if (nextOffset != 0) {
+            // check if instance (or) subprim(s) are selected
+            offset = nextOffset;
+            sel = sel || IsInstanceSelected(offset, /*out*/nextOffset);
+
+            if (nextOffset != 0) {
+                res.subprimSel =
+                    GetSubprimSel(nextOffset, elementId, edgeId, pointId);
+            }
+        }
+        res.primOrInstanceSel = sel;
+    }
+#endif // HD_HAS_hdxSelectionBuffer
+
+    return res;
+}
+
+// Returns the logical OR of the inputs
+SelectionResult
+_CombineWithOr(SelectionResult a, SelectionResult b)
+{
+    SelectionResult res = InitSelectionResult(false, false, false, false, 0);
+
+    res.primOrInstanceSel = a.primOrInstanceSel || b.primOrInstanceSel;
+    res.subprimSel.elementSelected = a.subprimSel.elementSelected ||
+                                   b.subprimSel.elementSelected;
+    res.subprimSel.edgeSelected = a.subprimSel.edgeSelected ||
+                                b.subprimSel.edgeSelected;
+    res.subprimSel.pointSelected = a.subprimSel.pointSelected ||
+                                 b.subprimSel.pointSelected;
+    // pointColorIndex is ignored.
+    return res;
+}
+
+// Returns the net selection result aggregating the result of each selection
+// mode.
+SelectionResult GetNetSelectionResult(int elementId, int edgeId, int pointId)
+{
+    SelectionResult netResult = InitSelectionResult(false, false, false, false, 0);
+
+#if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    for (int mode = 0; mode < numSelectionModes; mode++) {
+        SelectionResult modeResult =
+            GetSelectionResult(mode, elementId, edgeId, pointId);
+        netResult = _CombineWithOr(modeResult, netResult);
+    }
+#endif
+    return netResult;
+}
+
+
+// Mixin for use in the vertex shader stage.
+// Decodes the selection buffer to find out if the current vertex (point) is
+// selected. This is called from hdSt/shaders/pointId.glslfx
+bool IsPointSelected(int pointId)
+{
+    bool sel = false;
+    #if defined(HD_HAS_hdxSelectionBuffer)
+    const int numSelectionModes = GetNumSelectionHighlightModes();
+    for (int mode = 0; mode < numSelectionModes; mode++) {
+        // At the VS stage, we don't carry enough state to determine the
+        // elementId and edgeId. So, use fallback values instead.
+        SelectionResult res =
+            GetSelectionResult(mode, /*elementId*/-1, /*edgeId*/-1, pointId);
+        if (res.subprimSel.pointSelected &&
+            !HasCustomizedPointColor(res.subprimSel)) {
+            sel = true;
+            break;
+        }
+    } // for each highlight mode
+    #endif
+    return sel;
+}
+
+
+=======================================================
+  TESS CONTROL SHADER                                  
+=======================================================
+=======================================================
+  TESS EVAL SHADER                                     
+=======================================================
+=======================================================
+  GEOMETRY SHADER                                      
+=======================================================
+=======================================================
+  FRAGMENT SHADER                                      
+=======================================================
+#version 450
+#define REF(space,type) inout type
+#define FORWARD_DECL(func_decl) func_decl
+#define ATOMIC_LOAD(a) (a)
+#define ATOMIC_STORE(a, v) (a) = (v)
+#define ATOMIC_ADD(a, v) atomicAdd(a, v)
+#define ATOMIC_EXCHANGE(a, v) atomicExchange(a, v)
+#define ATOMIC_COMP_SWAP(a, expected, desired) atomicCompSwap(a, expected, desired)
+#define atomic_int int
+#define atomic_uint uint
+
+#define HGI_HAS_DOUBLE_TYPE 1
+
+
+struct hgi_ivec3 { int    x, y, z; };
+struct hgi_vec3  { float  x, y, z; };
+struct hgi_dvec3 { double x, y, z; };
+struct hgi_mat3  { float  m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+struct hgi_dmat3 { double m00, m01, m02,
+                          m10, m11, m12,
+                          m20, m21, m22; };
+
+// //////// Codegen Defines //////// 
+#define HD_SHADER_API 2
+#define MAT4 mat4
+// Alias hgi vec and matrix types to hd.
+#define hd_ivec3 hgi_ivec3
+#define hd_vec3 hgi_vec3
+#define hd_dvec3 hgi_dvec3
+#define hd_mat3 hgi_mat3
+#define hd_dmat3 hgi_dmat3
+
+ivec3 hd_ivec3_get(hd_ivec3 v) { return ivec3(v.x, v.y, v.z); }
+ivec3 hd_ivec3_get(ivec3 v)    { return v; }
+vec3  hd_vec3_get(hd_vec3 v)   { return vec3(v.x, v.y, v.z); }
+vec3  hd_vec3_get(vec3 v)      { return v; }
+dvec3 hd_dvec3_get(hd_dvec3 v) { return dvec3(v.x, v.y, v.z); }
+dvec3 hd_dvec3_get(dvec3 v)    { return v; }
+mat3  hd_mat3_get(hd_mat3 v)   { return mat3(v.m00, v.m01, v.m02,
+                                             v.m10, v.m11, v.m12,
+                                             v.m20, v.m21, v.m22); }
+mat3  hd_mat3_get(mat3 v)      { return v; }
+dmat3 hd_dmat3_get(hd_dmat3 v) { return dmat3(v.m00, v.m01, v.m02,
+                                              v.m10, v.m11, v.m12,
+                                              v.m20, v.m21, v.m22); }
+dmat3 hd_dmat3_get(dmat3 v)    { return v; }
+hd_ivec3 hd_ivec3_set(hd_ivec3 v) { return v; }
+hd_ivec3 hd_ivec3_set(ivec3 v)    { return hd_ivec3(v.x, v.y, v.z); }
+hd_vec3 hd_vec3_set(hd_vec3 v)    { return v; }
+hd_vec3 hd_vec3_set(vec3 v)       { return hd_vec3(v.x, v.y, v.z); }
+hd_dvec3 hd_dvec3_set(hd_dvec3 v) { return v; }
+hd_dvec3 hd_dvec3_set(dvec3 v)    { return hd_dvec3(v.x, v.y, v.z); }
+hd_mat3  hd_mat3_set(hd_mat3 v)   { return v; }
+hd_mat3  hd_mat3_set(mat3 v)      { return hd_mat3(v[0][0], v[0][1], v[0][2],
+                                                   v[1][0], v[1][1], v[1][2],
+                                                   v[2][0], v[2][1], v[2][2]); }
+hd_dmat3 hd_dmat3_set(hd_dmat3 v) { return v; }
+hd_dmat3 hd_dmat3_set(dmat3 v)    { return hd_dmat3(v[0][0], v[0][1], v[0][2],
+                                                    v[1][0], v[1][1], v[1][2],
+                                                    v[2][0], v[2][1], v[2][2]); }
+int hd_int_get(int v)          { return v; }
+int hd_int_get(ivec2 v)        { return v.x; }
+int hd_int_get(ivec3 v)        { return v.x; }
+int hd_int_get(ivec4 v)        { return v.x; }
+vec3 hd_sample_udim(vec2 v) {
+vec2 vf = floor(v);
+return vec3(v.x - vf.x, v.y - vf.y, clamp(vf.x, 0.0, 10.0) + 10.0 * vf.y);
+}
+vec4 hd_vec4_2_10_10_10_get(int v) {
+    ivec4 unpacked = ivec4((v & 0x3ff) << 22, (v & 0xffc00) << 12,
+                           (v & 0x3ff00000) << 2, (v & 0xc0000000));
+    return vec4(unpacked) / 2147483647.0; }
+int hd_vec4_2_10_10_10_set(vec4 v) {
+    return ( (int(v.x * 511.0) & 0x3ff) |
+            ((int(v.y * 511.0) & 0x3ff) << 10) |
+            ((int(v.z * 511.0) & 0x3ff) << 20) |
+            ((int(v.w) & 0x1) << 30)); }
+vec2 hd_half2_get(uint v) {
+    return unpackHalf2x16(v); }
+uint hd_half2_set(vec2 v) {
+    return packHalf2x16(v); }
+vec4 hd_half4_get(uvec2 v) {
+    return vec4(unpackHalf2x16(v.x), unpackHalf2x16(v.y)); }
+uvec2 hd_half4_set(vec4 v) {
+    return uvec2(packHalf2x16(v.xy), packHalf2x16(v.zw)); }
+#define HD_NUM_PRIMITIVE_VERTS 1
+#define HD_HAS_transform 1
+#define HD_HAS_transformInverse 1
+#define HD_HAS_color 1
+#define HD_HAS_primID 1
+#define HD_HAS_widths 1
+#define HD_INSTANCER_NUM_LEVELS 0
+#define HD_INSTANCE_INDEX_WIDTH 1
+#define HD_HAS_points 1
+#define HD_HAS_normals 1
+
+// //////// Codegen Decl //////// 
+struct hd_drawingCoord {                       
+  int modelCoord;
+  int constantCoord;
+  int elementCoord;
+  int primitiveCoord;
+  int fvarCoord;
+  int shaderCoord;
+  int vertexCoord;
+  int topologyVisibilityCoord;
+  int varyingCoord;
+  int instanceIndex[HD_INSTANCE_INDEX_WIDTH];
+  int instanceCoords[HD_INSTANCE_INDEX_WIDTH];
+};
+FORWARD_DECL(hd_drawingCoord GetDrawingCoord());
+FORWARD_DECL(int HgiGetBaseVertex());
+struct hd_instanceIndex { int indices[HD_INSTANCE_INDEX_WIDTH]; };
+struct ConstantData7 {
+  mat4 transform;
+  mat4 transformInverse;
+  vec4 color;
+  vec4 primID;
+  float widths;
+};
+FORWARD_DECL(int GetElementID());
+FORWARD_DECL(int GetAggregatedElementID());
+FORWARD_DECL(int GetPrimitiveEdgeId());
+FORWARD_DECL(float GetSelectedEdgeOpacity());
+
+// //////// Global Includes ////////
+
+// //////// Global Macros ////////
+
+// //////// Global Structs ////////
+
+// //////// Global Member Declarations ////////
+layout(std430, binding = 0) readonly buffer ssbo_constantPrimvars { ConstantData7 constantPrimvars[]; };
+flat layout(location = 12) in int vsPointId;
+flat layout(location = 0) in int vs_dc_modelCoord;
+flat layout(location = 1) in int vs_dc_constantCoord;
+flat layout(location = 2) in int vs_dc_elementCoord;
+flat layout(location = 3) in int vs_dc_primitiveCoord;
+flat layout(location = 4) in int vs_dc_fvarCoord;
+flat layout(location = 5) in int vs_dc_shaderCoord;
+flat layout(location = 6) in int vs_dc_vertexCoord;
+flat layout(location = 7) in int vs_dc_topologyVisibilityCoord;
+flat layout(location = 8) in int vs_dc_varyingCoord;
+flat layout(location = 9) in int vs_dc_instanceIndexI0;
+flat layout(location = 10) in int vs_dc_instanceCoordsI0;
+layout(location = 11) in VertexData {
+  vec4 Peye;
+} inData;
+layout(location = 13) in PrimvarData {
+  vec3 points;
+  vec3 normals;
+} inPrimvars;
+layout(location = 0) out vec4 colorOut;
+
+// //////// Global Function Definitions ////////
+
+
+// //////// Codegen Accessors //////// 
+mat4 HdGet_transform(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transform);
+}
+mat4 HdGet_transform() { return HdGet_transform(0); }
+mat4 HdGet_transformInverse(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return mat4(constantPrimvars[index].transformInverse);
+}
+mat4 HdGet_transformInverse() { return HdGet_transformInverse(0); }
+vec4 HdGet_color(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].color);
+}
+vec4 HdGet_color() { return HdGet_color(0); }
+float HdGetScalar_color(int localIndex) { return HdGet_color(localIndex).x; }
+float HdGetScalar_color() { return HdGet_color(0).x; }
+vec4 HdGet_primID(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return vec4(constantPrimvars[index].primID);
+}
+vec4 HdGet_primID() { return HdGet_primID(0); }
+float HdGetScalar_primID(int localIndex) { return HdGet_primID(localIndex).x; }
+float HdGetScalar_primID() { return HdGet_primID(0).x; }
+float HdGet_widths(int localIndex) {
+  int index = GetDrawingCoord().constantCoord;
+  return float(constantPrimvars[index].widths);
+}
+float HdGet_widths() { return HdGet_widths(0); }
+float HdGetScalar_widths(int localIndex) { return HdGet_widths(localIndex); }
+float HdGetScalar_widths() { return HdGet_widths(0); }
+
+// //////// Codegen FS Source //////// 
+#define HD_SHADER_SUPPORTS_DOUBLE_PRECISION
+vec3 GetBarycentricCoord() {
+  return vec3(0);
+}
+int GetPrimitiveID() {
+  return gl_PrimitiveID;
+}
+int GetPrimitiveIndex() {
+  return GetDrawingCoord().primitiveCoord + GetPrimitiveID();
+}
+hd_drawingCoord GetDrawingCoord() { 
+  hd_drawingCoord dc; 
+  dc.modelCoord = vs_dc_modelCoord;
+  dc.constantCoord = vs_dc_constantCoord;
+  dc.elementCoord = vs_dc_elementCoord;
+  dc.primitiveCoord = vs_dc_primitiveCoord;
+  dc.fvarCoord = vs_dc_fvarCoord;
+  dc.shaderCoord = vs_dc_shaderCoord;
+  dc.vertexCoord = vs_dc_vertexCoord;
+  dc.topologyVisibilityCoord = vs_dc_topologyVisibilityCoord;
+  dc.varyingCoord = vs_dc_varyingCoord;
+  dc.instanceIndex[0] = vs_dc_instanceIndexI0;
+  return dc; 
+}
+int GetElementID() {
+  return -1;
+}
+int GetAggregatedElementID() {
+  return GetElementID();
+}
+int GetEdgeFlag() {
+  return 0;
+}
+ivec3 GetPatchParam() {
+  return ivec3(0, 0, 0);
+}
+int GetFVarIndex(int localIndex) {
+  return 0;
+}
+int GetAuthoredEdgeId(int primitiveEdgeId) {
+  return -1;
+}
+int GetPrimitiveEdgeId() {
+  return -1;
+}
+float GetSelectedEdgeOpacity() {
+  return 0.0;
+}
+vec3 HdGet_points(int localIndex) { return vec3(inPrimvars.points);}
+vec3 HdGet_points() { return HdGet_points(0); }
+float HdGetScalar_points(int localIndex) { return HdGet_points(localIndex).x; }
+float HdGetScalar_points() { return HdGet_points(0).x; }
+vec3 HdGet_normals(int localIndex) { return vec3(inPrimvars.normals);}
+vec3 HdGet_normals() { return HdGet_normals(0); }
+float HdGetScalar_normals(int localIndex) { return HdGet_normals(localIndex).x; }
+float HdGetScalar_normals() { return HdGet_normals(0).x; }
+FORWARD_DECL(vec4 GetPatchCoord(int index));
+void ProcessSamplingTransforms(MAT4 instanceModelViewInverse) {
+}
+
+// ---------------------------------------------------------------------------
+// global defines
+// ---------------------------------------------------------------------------
+// codeGen can override this range (currently not).
+// quadro 4000's max is 189.
+#ifndef HD_GL_POINT_SIZE_MAX
+#define HD_GL_POINT_SIZE_MAX  100.0
+#endif
+#ifndef HD_GL_POINT_SIZE_MIN
+#define HD_GL_POINT_SIZE_MIN  .45
+#endif
+
+// ---------------------------------------------------------------------------
+// render pass states
+// ---------------------------------------------------------------------------
+
+MAT4  GetWorldToViewMatrix() {
+#if defined(HD_HAS_worldToViewMatrix)
+    return MAT4(HdGet_worldToViewMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetWorldToViewInverseMatrix() {
+#if defined(HD_HAS_worldToViewInverseMatrix)
+    return MAT4(HdGet_worldToViewInverseMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+MAT4  GetProjectionMatrix() {
+#if defined(HD_HAS_projectionMatrix)
+    return MAT4(HdGet_projectionMatrix());
+#else
+    return MAT4(1);
+#endif
+}
+vec3 GetPositionInWorldSpace(vec3 windowRelativeCoord)
+{
+#if defined(HD_HAS_imageToWorldMatrix)
+    vec4 pImage = vec4(windowRelativeCoord, 1.0);
+    vec4 pWorld = vec4(HdGet_imageToWorldMatrix() * pImage);
+    return (pWorld / pWorld.w).xyz;
+#else
+    return windowRelativeCoord;
+#endif
+}
+float GetLightingBlendAmount() {
+#if defined(HD_HAS_lightingBlendAmount)
+    return HdGet_lightingBlendAmount();
+#else
+    return 1;
+#endif
+}
+vec4  GetViewport() {
+#if defined(HD_HAS_viewport)
+    return HdGet_viewport();
+#else
+    return vec4(0,0,1,1);
+#endif
+}
+float GetTessLevel() {
+#if defined(HD_HAS_tessLevel)
+    return HdGet_tessLevel();
+#else
+    return 1;
+#endif
+}
+float GetPointSize() {
+#if defined(HD_HAS_pointSize)
+    return HdGet_pointSize();
+#else
+    return 3.0;
+#endif
+}
+float GetPointSelectedSize() {
+#if defined(HD_HAS_pointSelectedSize)
+    return HdGet_pointSelectedSize();
+#else
+    return 5.0;
+#endif
+}
+vec4  GetWireframeColor() {
+// Individual prims can specify an alternative wireframe color
+// to one specified in the render pass.  This is used in cases were
+// there is not enough contrast with the normal one.
+#if defined(HD_HAS_overrideWireframeColor)
+    return HdGet_overrideWireframeColor();
+#elif defined(HD_HAS_wireframeColor)
+    return HdGet_wireframeColor();
+#else
+    return vec4(0,0,0,0);
+#endif
+}
+vec4  GetMaskColor() {
+#if defined(HD_HAS_maskColor)
+    return HdGet_maskColor();
+#else
+    return vec4(0.5,0,0,1);
+#endif
+}
+vec4  GetIndicatorColor() {
+#if defined(HD_HAS_indicatorColor)
+    return HdGet_indicatorColor();
+#else
+    return vec4(0,0.5,0,1);
+#endif
+}
+
+bool ShouldDiscardByAlpha(vec4 color)
+{
+#if defined(HD_HAS_alphaThreshold)
+    float alphaThreshold = HdGet_alphaThreshold();
+#else
+    float alphaThreshold = 0;
+#endif
+    return (color.a < alphaThreshold);
+}
+
+vec2 ApplyAxisAlignedAffineTransform(vec4 t, vec2 pt)
+{
+    return t.xy * pt + t.zw;
+}
+
+
+
+vec2 HorizontallyNormalizedFilmbackCoordinates()
+{
+    const vec4 transform =
+#ifdef HD_HAS_imageToHorizontallyNormalizedFilmback
+        HdGet_imageToHorizontallyNormalizedFilmback();
+#else
+        vec4(vec2(1.0), vec2(0.0));
+#endif
+    return ApplyAxisAlignedAffineTransform(transform, gl_FragCoord.xy);
+}
+
+
+
+vec4 ApplySelectionColor(vec4 color)
+{
+    return color;
+}
+
+
+
+// Forward declare selection functionality.
+// XXX: Currently, the non-empty implementation of this is in hdx.
+FORWARD_DECL(vec4 ApplySelectionColor(vec4 color));
+
+// XXX: Make sure to update hdx/shaders/renderPass.glslfx when editing these
+// color override methods, since they're currently duplicated. This is because
+// we don't have a mixin token for color overrides in a render pass yet.
+vec4 ApplyColorOverrides(vec4 color)
+{
+#if defined(HD_HAS_overrideColor)
+    // Mix in override color
+    vec4 overrideColor = HdGet_overrideColor();
+    color.rgb = mix(color.rgb, overrideColor.rgb, overrideColor.a);
+#endif
+    return ApplySelectionColor(color);
+}
+
+vec3 ApplyMaskColor(vec3 color, float weight, vec4 maskColor)
+{
+    float strength = maskColor.a * clamp(weight, 0.0, 1.0);
+    return mix(color, maskColor.rgb, strength);
+}
+
+vec4 ApplyColorOverridesPostLighting(vec4 color)
+{
+    #if defined(HD_HAS_maskWeight)
+        float maskWeight = HdGet_maskWeight();
+        vec4 maskColor = GetMaskColor();
+        color.rgb = ApplyMaskColor(color.rgb, maskWeight, maskColor);
+    #endif
+    #if defined(HD_HAS_indicatorWeight)
+        float indicatorWeight = HdGet_indicatorWeight();
+        vec4 indicatorColor = GetIndicatorColor();
+        color.rgb = ApplyMaskColor(color.rgb, indicatorWeight, indicatorColor);
+    #endif
+    return color;
+}
+
+
+
+void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    colorOut = color;
+}
+
+
+#ifndef HD_HAS_integrateLights
+#define HD_HAS_integrateLights
+#endif
+
+struct LightingContribution {
+    vec3 diffuse;
+};
+
+struct LightingInterfaceProperties {
+    float unused;
+};
+
+LightingContribution
+integrateLightsDefault(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    vec3 n = normalize(Neye);
+
+    LightingContribution result;
+    result.diffuse = vec3(dot(n, vec3(0,0,1)));
+
+    return result;
+}
+
+LightingContribution
+integrateLightsConstant(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    LightingContribution result;
+    //pefectly diffuse white hemisphere contribution
+    result.diffuse = vec3(1);
+
+    return result;
+}
+
+
+
+FORWARD_DECL(
+    LightingContribution integrateLights(vec4 Peye, vec3 Neye,
+        LightingInterfaceProperties props));
+
+vec3 FallbackLighting(in vec3 Peye, in vec3 Neye, in vec3 color)
+{
+    LightingInterfaceProperties props;
+    LightingContribution light = integrateLights(vec4(Peye, 1), Neye, props);
+    return color * light.diffuse;
+}
+
+
+vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    // lighting
+    color.rgb = FallbackLighting(Peye.xyz, Neye, color.rgb);
+    return color;
+}
+
+
+struct ReprStyle
+{
+    vec4  color;
+    bool  usePrimvarColor;
+    bool  usePrimvarAlpha;
+    bool  applyColorOverride;
+    bool  useSurfaceShaderColor;
+    bool  useSurfaceShaderAlpha;
+};
+
+struct ScalarOverride
+{
+    bool enabled;
+    vec3 color;
+};
+
+FORWARD_DECL(ReprStyle GetReprStyle());
+FORWARD_DECL(ScalarOverride GetScalarOverride());
+FORWARD_DECL(
+    vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord));
+FORWARD_DECL(vec4 postSurfaceShader(vec4 Peye, vec3 Neye, vec4 color));
+
+vec4 ShadingTerminal(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
+{
+    ReprStyle reprStyle = GetReprStyle();
+
+    // Apply scalar override.
+    ScalarOverride scalarOverride = GetScalarOverride();
+    if (scalarOverride.enabled) {
+        vec4 result;
+
+        result.rgb = scalarOverride.color;
+        result.a   = reprStyle.usePrimvarAlpha ? color.a: reprStyle.color.a;
+
+        vec4 colorOverride = ApplyColorOverrides(result);
+        result = reprStyle.applyColorOverride ? colorOverride : result;
+
+        return result;
+    }
+
+    // Draw mode can override face color
+    vec4 reprColor;
+
+    reprColor.rgb = reprStyle.usePrimvarColor ? color.rgb : reprStyle.color.rgb;
+    reprColor.a   = reprStyle.usePrimvarAlpha ? color.a   : reprStyle.color.a;
+
+    // Compute color overrides
+    vec4 colorOverride = ApplyColorOverrides(reprColor);
+    reprColor = reprStyle.applyColorOverride ? colorOverride : reprColor;
+
+
+    // Surface shading can be expensive and also can contain undesirable
+    // side effects (like discards).  So only run it for reprs that require it.
+
+    if (reprStyle.useSurfaceShaderColor ||
+        reprStyle.useSurfaceShaderAlpha) {
+        vec4 shadingColor;
+
+        shadingColor = surfaceShader(Peye,
+                                     Neye,
+                                     reprColor,
+                                     patchCoord);
+
+#ifdef HD_HAS_postSurfaceShader
+        shadingColor = postSurfaceShader(Peye,
+                                         Neye,
+                                         shadingColor);
+#endif
+
+        reprColor.rgb = reprStyle.useSurfaceShaderColor ?
+                        shadingColor.rgb :
+                        reprColor.rgb;
+
+        reprColor.a   = reprStyle.useSurfaceShaderAlpha ?
+                        shadingColor.a :
+                        reprColor.a;
+    }
+
+    vec4 baseColor = color;
+    baseColor = ApplyColorOverrides(baseColor);
+
+    vec4 litColor = mix(baseColor,
+                        reprColor,
+                        GetLightingBlendAmount());
+
+    // Final overrides.
+
+    return ApplyColorOverridesPostLighting(litColor);
+}
+
+
+
+#ifdef HD_HAS_integrateLights
+#ifndef HD_HAS_definedIntegrateLights
+#define HD_HAS_definedIntegrateLights
+
+LightingContribution
+integrateLights(vec4 Peye, vec3 Neye, LightingInterfaceProperties props)
+{
+    return integrateLightsDefault(Peye, Neye, props);
+}
+
+#endif // HD_HAS_definedIntegrateLights
+#endif
+
+ReprStyle GetReprStyle()
+{
+    ReprStyle reprStyle;
+
+    reprStyle.color                    = vec4(0.0, 0.0, 0.0, 1.0);
+    reprStyle.usePrimvarColor          = true;
+    reprStyle.usePrimvarAlpha          = true;
+    reprStyle.applyColorOverride       = true;
+    reprStyle.useSurfaceShaderColor    = true;
+    reprStyle.useSurfaceShaderAlpha    = true;
+
+    return reprStyle;
+}
+
+
+
+ScalarOverride GetScalarOverride()
+{
+    ScalarOverride result;
+
+    result.enabled = false;
+    result.color   = vec3(0.0, 0.0, 0.0);
+
+    return result;
+}
+
+
+void main(void)
+{
+    vec3 Peye = inData.Peye.xyz / inData.Peye.w;
+    // camera facing.
+    vec3 Neye = vec3(0, 0, 1);
+
+    vec4 color = vec4(0.5, 0.5, 0.5, 1);
+#ifdef HD_HAS_displayColor
+    color.rgb = HdGet_displayColor().rgb;
+#endif
+#ifdef HD_HAS_displayOpacity
+    color.a = HdGet_displayOpacity();
+#endif
+
+    vec4 patchCoord = vec4(0);
+    color = ShadingTerminal(vec4(Peye, 1), Neye, color, patchCoord);
+
+#ifdef HD_MATERIAL_TAG_MASKED
+    if (ShouldDiscardByAlpha(color)) {
+        discard;
+    }
+#endif
+
+    RenderOutput(vec4(Peye, 1), Neye, color, patchCoord);
+}
+
+
+int GetPointId()
+{
+    return vsPointId;
+}
+
+OK
diff --git a/pxr/imaging/hdSt/testenv/testHdStCurveDrawing.cpp b/pxr/imaging/hdSt/testenv/testHdStCurveDrawing.cpp
index 877f8d5d61..7ec6d776f5 100644
--- a/pxr/imaging/hdSt/testenv/testHdStCurveDrawing.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStCurveDrawing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStCurvePrimvarInterpolation.cpp b/pxr/imaging/hdSt/testenv/testHdStCurvePrimvarInterpolation.cpp
index 25b1b131b1..0c3293f79b 100644
--- a/pxr/imaging/hdSt/testenv/testHdStCurvePrimvarInterpolation.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStCurvePrimvarInterpolation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStCurvesPrimvars.cpp b/pxr/imaging/hdSt/testenv/testHdStCurvesPrimvars.cpp
index d5b8f2a2b4..04c9bd3c6b 100644
--- a/pxr/imaging/hdSt/testenv/testHdStCurvesPrimvars.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStCurvesPrimvars.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/basisCurvesComputations.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStDisplayStyle.cpp b/pxr/imaging/hdSt/testenv/testHdStDisplayStyle.cpp
index 3dfd93d359..9ae57399ab 100644
--- a/pxr/imaging/hdSt/testenv/testHdStDisplayStyle.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStDisplayStyle.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStDrawBatching.cpp b/pxr/imaging/hdSt/testenv/testHdStDrawBatching.cpp
index 1d288227e8..848ddb7848 100644
--- a/pxr/imaging/hdSt/testenv/testHdStDrawBatching.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStDrawBatching.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/drawItemInstance.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStDrawItemIntegrity.cpp b/pxr/imaging/hdSt/testenv/testHdStDrawItemIntegrity.cpp
index 13d8a70634..d3cdeb38af 100644
--- a/pxr/imaging/hdSt/testenv/testHdStDrawItemIntegrity.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStDrawItemIntegrity.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdSt/testenv/testHdStDrawItemsCache.cpp b/pxr/imaging/hdSt/testenv/testHdStDrawItemsCache.cpp
index 5d8e12bd4d..ac647f271f 100644
--- a/pxr/imaging/hdSt/testenv/testHdStDrawItemsCache.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStDrawItemsCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdSt/testenv/testHdStDynamicUvTexture.cpp b/pxr/imaging/hdSt/testenv/testHdStDynamicUvTexture.cpp
index 78d4b28a4d..a899def894 100644
--- a/pxr/imaging/hdSt/testenv/testHdStDynamicUvTexture.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStDynamicUvTexture.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
@@ -262,7 +245,7 @@ My_TestGLDrawing::OffscreenTest()
             HdStTextureIdentifier(
                 TfToken(),
                 std::make_unique<My_SubtextureIdentifier>(90)),
-            HdTextureType::Uv,
+            HdStTextureType::Uv,
             HdSamplerParameters(
                 HdWrapRepeat,
                 HdWrapRepeat,
@@ -278,7 +261,7 @@ My_TestGLDrawing::OffscreenTest()
             HdStTextureIdentifier(
                 TfToken(),
                 std::make_unique<My_SubtextureIdentifier>(230)),
-            HdTextureType::Uv,
+            HdStTextureType::Uv,
             HdSamplerParameters(
                 HdWrapRepeat,
                 HdWrapRepeat,
diff --git a/pxr/imaging/hdSt/testenv/testHdStFaceCulling.cpp b/pxr/imaging/hdSt/testenv/testHdStFaceCulling.cpp
index 0cf48bb101..10eefcb409 100644
--- a/pxr/imaging/hdSt/testenv/testHdStFaceCulling.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStFaceCulling.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 // This test harness is mostly a clone of testHdStBasicDrawing.cpp with fewer
diff --git a/pxr/imaging/hdSt/testenv/testHdStFrustumCulling.cpp b/pxr/imaging/hdSt/testenv/testHdStFrustumCulling.cpp
index 9b12a28754..61f2f49cf2 100644
--- a/pxr/imaging/hdSt/testenv/testHdStFrustumCulling.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStFrustumCulling.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/unitTestGLDrawing.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStGL.cpp b/pxr/imaging/hdSt/testenv/testHdStGL.cpp
index 447d0e0452..84f3a1bc12 100644
--- a/pxr/imaging/hdSt/testenv/testHdStGL.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStGL.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glApi.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStGLSL.cpp b/pxr/imaging/hdSt/testenv/testHdStGLSL.cpp
index e1d936c9bb..fe6ba6eddc 100644
--- a/pxr/imaging/hdSt/testenv/testHdStGLSL.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStGLSL.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hdSt/testenv/testHdStGLSL/testHarness.glslfx b/pxr/imaging/hdSt/testenv/testHdStGLSL/testHarness.glslfx
index ede9524695..ba049e396c 100644
--- a/pxr/imaging/hdSt/testenv/testHdStGLSL/testHarness.glslfx
+++ b/pxr/imaging/hdSt/testenv/testHdStGLSL/testHarness.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #import $TOOLS/hdSt/shaders/instancing.glslfx
diff --git a/pxr/imaging/hdSt/testenv/testHdStHWFaceCulling.cpp b/pxr/imaging/hdSt/testenv/testHdStHWFaceCulling.cpp
index ffc09eae3b..6beef1b058 100644
--- a/pxr/imaging/hdSt/testenv/testHdStHWFaceCulling.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStHWFaceCulling.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/renderPass.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStIndirectDrawBatchCodeGen.cpp b/pxr/imaging/hdSt/testenv/testHdStIndirectDrawBatchCodeGen.cpp
index 6ee98c039a..ac9fc68260 100644
--- a/pxr/imaging/hdSt/testenv/testHdStIndirectDrawBatchCodeGen.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStIndirectDrawBatchCodeGen.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/drawItemInstance.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStIndirectDrawBatchCulling.cpp b/pxr/imaging/hdSt/testenv/testHdStIndirectDrawBatchCulling.cpp
index 931ec6ebfb..6ed9f32297 100644
--- a/pxr/imaging/hdSt/testenv/testHdStIndirectDrawBatchCulling.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStIndirectDrawBatchCulling.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/drawItemInstance.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStInitRepr.cpp b/pxr/imaging/hdSt/testenv/testHdStInitRepr.cpp
index bacbd16c3f..3455eb8cce 100644
--- a/pxr/imaging/hdSt/testenv/testHdStInitRepr.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStInitRepr.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStInstancing.cpp b/pxr/imaging/hdSt/testenv/testHdStInstancing.cpp
index 0f7347117e..ab13a60c3f 100644
--- a/pxr/imaging/hdSt/testenv/testHdStInstancing.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStInstancing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/unitTestGLDrawing.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStInstancingUnbalanced.cpp b/pxr/imaging/hdSt/testenv/testHdStInstancingUnbalanced.cpp
index fd0c041fdb..178d038b91 100644
--- a/pxr/imaging/hdSt/testenv/testHdStInstancingUnbalanced.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStInstancingUnbalanced.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/unitTestGLDrawing.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen.cpp b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen.cpp
index c415841343..a48698b919 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen.cpp
@@ -1,43 +1,111 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/materialXFilter.h"
 #include "pxr/imaging/hdSt/materialXShaderGen.h"
+#include "pxr/imaging/hdSt/tokens.h"
 #include "pxr/imaging/hdMtlx/hdMtlx.h"
 #include "pxr/imaging/hgi/tokens.h"
 
 #include "pxr/base/tf/diagnostic.h"
 
+#include <MaterialXGenShader/Util.h>
+
 #include <iostream>
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace mx = MaterialX;
 
+// Helpers to determine the Material Tag
+// Note that similar helpers live in HdStMaterialXFilter
+
+static bool 
+_IsDifferentFrom(mx::InputPtr const& mxInput, float value)
+{
+    if (!mxInput) {
+        return false;
+    }
+
+    if (mxInput->hasValue()) {
+        const mx::ValuePtr val = mxInput->getValue();
+        if (val->isA<float>()) {
+            return val->asA<float>() != value;
+        }
+        return true;
+    }
+
+    return mxInput->hasNodeName() || mxInput->hasNodeGraphString() ||
+           mxInput->hasOutputString() || mxInput->hasInterfaceName();
+}
+
+static TfToken const&
+_GetUsdPreviewSurfaceMaterialTag(mx::NodePtr const &terminalNode)
+{
+    // See https://openusd.org/release/spec_usdpreviewsurface.html
+    // and implementation in MaterialX libraries/bxdf/usd_preview_surface.mtlx
+
+    // Non-zero opacityThreshold (or connected) triggers masked mode:
+    if (_IsDifferentFrom(terminalNode->getInput("opacityThreshold"), 0.0f)) {
+        return HdStMaterialTagTokens->masked;
+    }
+
+    // Opacity less than 1.0 (or connected) triggers transparent mode:
+    if (_IsDifferentFrom(terminalNode->getInput("opacity"), 1.0f)) {
+        return HdStMaterialTagTokens->translucent;
+    }
+
+    return HdStMaterialTagTokens->defaultMaterialTag;
+}
+
+static TfToken
+_GetMaterialTag(mx::DocumentPtr const& mxDoc)
+{
+    // Find renderable elements in the Mtlx Document.
+    // Note this code also lives in HdSt_GenMaterialXShader()
+    std::vector<mx::TypedElementPtr> renderableElements;
+    mx::findRenderableElements(mxDoc, renderableElements);
+
+    // Should have exactly one renderable element (material).
+    if (renderableElements.size() != 1) {
+        TF_CODING_ERROR("Generated MaterialX Document does not "
+                        "have 1 material");
+        return HdStMaterialTagTokens->defaultMaterialTag;
+    }
+
+    // Extract out the Surface Shader Node for the Material Node
+    mx::TypedElementPtr renderableElem = renderableElements.at(0);
+    mx::NodePtr node = renderableElem->asA<mx::Node>();
+    if (node && node->getType() == mx::MATERIAL_TYPE_STRING) {
+        // Use auto so can compile against MaterialX 1.38.0 or 1.38.1
+        auto mxShaderNodes =
+            mx::getShaderNodes(node, mx::SURFACE_SHADER_TYPE_STRING);
+        if (!mxShaderNodes.empty()) {
+            renderableElem = *mxShaderNodes.begin();
+        }
+    }
+
+    // The custom code to handle masked mode prevents MaterialX from 
+    // correctly deducing transparency with mx::isTransparentSurface()
+    node = renderableElem->asA<mx::Node>();
+    if (node && node->getCategory() == "UsdPreviewSurface") {
+        return _GetUsdPreviewSurfaceMaterialTag(node);
+    }
+
+    // XXX: Once other material tests are added (eg. glTf) similar helper 
+    // helper functions will need to be added to get the correct MaterialTag
+    if (mx::isTransparentSurface(renderableElem)) {
+        return HdStMaterialTagTokens->translucent;
+    }
+    return HdStMaterialTagTokens->defaultMaterialTag;
+}
 
 void TestShaderGen(
     const mx::FilePath& mtlxFilename, 
-    const HdSt_MxShaderGenInfo& mxHdInfo)
+    HdSt_MxShaderGenInfo* mxHdInfo)
 {
     // Get Standard Libraries and SearchPaths (for mxDoc and mxShaderGen)
     const mx::DocumentPtr& stdLibraries = HdMtlxStdLibraries();
@@ -64,9 +132,11 @@ void TestShaderGen(
         std::cerr << message;
     }
 
+    mxHdInfo->materialTag = _GetMaterialTag(mxDoc);
+
     // Generate the HdSt MaterialX Shader
     mx::ShaderPtr glslfx = HdSt_GenMaterialXShader(
-        mxDoc, stdLibraries, searchPaths, mxHdInfo, HgiTokens->OpenGL);
+        mxDoc, stdLibraries, searchPaths, *mxHdInfo, HgiTokens->OpenGL);
     std::cout << glslfx->getSourceCode(mx::Stage::PIXEL);
 }
 
@@ -109,12 +179,9 @@ int main(int argc, char *argv[])
                 return EXIT_FAILURE;
             }
         }
-        if (arg == "--materialTag") {
-            mxHdInfo.materialTag = argv[++i];
-        }
         if (arg == "--bindless") {
             mxHdInfo.bindlessTexturesEnabled = true;
         }
     }
-    TestShaderGen(mtlxFile, mxHdInfo);
+    TestShaderGen(mtlxFile, &mxHdInfo);
 }
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SScopper.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SScopper.out
index 8ecc39ab27..d3d2f80bb4 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SScopper.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SScopper.out
@@ -38,13 +38,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -53,6 +46,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 float base;
 vec3 base_color;
@@ -96,6 +96,7 @@ bool thin_walled;
 
 // Uniform block: PrivateUniforms
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 bool u_refractionTwoSided = false;
@@ -207,6 +208,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -936,11 +940,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
+{
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -955,13 +970,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -1232,15 +1248,6 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
 }
 
 
-void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
-{
-    N = mx_forward_facing_normal(N, V);
-    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
-    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
-    result = base * f;
-}
-
-
 void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
 {
     if (weight < M_FLOAT_EPS)
@@ -1263,6 +1270,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1281,7 +1289,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1295,6 +1303,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1315,7 +1324,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1331,6 +1340,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1350,7 +1360,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -1606,6 +1616,15 @@ void mx_oren_nayar_diffuse_bsdf_indirect(vec3 V, float weight, vec3 color, float
     bsdf.response = Li * color * weight;
 }
 
+
+void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
+{
+    N = mx_forward_facing_normal(N, V);
+    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
+    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
+    result = base * f;
+}
+
 void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float diffuse_roughness, float metalness, float specular, vec3 specular_color, float specular_roughness, float specular_IOR, float specular_anisotropy, float specular_rotation, float transmission, vec3 transmission_color, float transmission_depth, vec3 transmission_scatter, float transmission_scatter_anisotropy, float transmission_dispersion, float transmission_extra_roughness, float subsurface, vec3 subsurface_color, vec3 subsurface_radius, float subsurface_scale, float subsurface_anisotropy, float sheen, vec3 sheen_color, float sheen_roughness, float coat, vec3 coat_color, float coat_roughness, float coat_anisotropy, float coat_rotation, float coat_IOR, vec3 coat_normal, float coat_affect_color, float coat_affect_roughness, float thin_film_thickness, float thin_film_IOR, float emission, vec3 emission_color, vec3 opacity, bool thin_walled, vec3 normal, vec3 tangent, out surfaceshader out1)
 {
     vec2 coat_roughness_vector_out = vec2(0.0);
@@ -1669,6 +1688,8 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
     mx_roughness_anisotropy(coat_affected_transmission_roughness_out, specular_anisotropy, transmission_roughness_out);
     vec3 coat_affected_subsurface_color_out = pow(subsurface_color_nonnegative_out, vec3(coat_gamma_out));
     vec3 coat_affected_diffuse_color_out = pow(base_color_nonnegative_out, vec3(coat_gamma_out));
+    const float one_minus_coat_ior_to_F0_in1_tmp = 1.000000;
+    float one_minus_coat_ior_to_F0_out = one_minus_coat_ior_to_F0_in1_tmp - coat_ior_to_F0_out;
     surfaceshader shader_constructor_out = surfaceshader(vec3(0.0),vec3(0.0));
     {
         vec3 N = normalize(vd.normalWorld);
@@ -1798,7 +1819,7 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
             mx_uniform_edf(N, V, emission_weight_out, emission_edf_out);
             EDF coat_tinted_emission_edf_out = emission_edf_out * coat_color;
             EDF coat_emission_edf_out = EDF(0.0);
-            mx_generalized_schlick_edf(N, V, vec3(1.000000, 1.000000, 1.000000), vec3(coat_ior_to_F0_out, coat_ior_to_F0_out, coat_ior_to_F0_out), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
+            mx_generalized_schlick_edf(N, V, vec3(one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out), vec3(0.000000, 0.000000, 0.000000), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
             // Omitted node 'emission_edf'. Function already called in this scope.
             EDF blended_coat_emission_edf_out = mix(emission_edf_out, coat_emission_edf_out, coat);
             shader_constructor_out.color += blended_coat_emission_edf_out;
@@ -1861,14 +1882,14 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
 {
     // Initialize MaterialX Variables
     mxInit(Peye, Neye);
-    vec3 geomprop_Nworld_out1 = normalize(vd.normalWorld);
-    vec3 geomprop_Tworld_out1 = normalize(vd.tangentWorld);
     vec3 SR_copper_coat_color_cm_out = vec3(0.0);
     NG_srgb_texture_to_lin_rec709_color3(coat_color, SR_copper_coat_color_cm_out);
     vec3 SR_copper_base_color_cm_out = vec3(0.0);
     NG_srgb_texture_to_lin_rec709_color3(base_color, SR_copper_base_color_cm_out);
+    vec3 geomprop_Nworld_out = normalize(vd.normalWorld);
+    vec3 geomprop_Tworld_out = normalize(vd.tangentWorld);
     surfaceshader SR_copper_out = surfaceshader(vec3(0.0),vec3(0.0));
-    NG_standard_surface_surfaceshader_100(base, SR_copper_base_color_cm_out, diffuse_roughness, metalness, specular, specular_color, specular_roughness, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, SR_copper_coat_color_cm_out, coat_roughness, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out1, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out1, geomprop_Tworld_out1, SR_copper_out);
+    NG_standard_surface_surfaceshader_100(base, SR_copper_base_color_cm_out, diffuse_roughness, metalness, specular, specular_color, specular_roughness, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, SR_copper_coat_color_cm_out, coat_roughness, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out, geomprop_Tworld_out, SR_copper_out);
     vec4 mxOut = vec4(SR_copper_out.color, 1.0);
     mxOut = ApplyColorOverrides(mxOut);
     return mxOut;
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SSdefault.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SSdefault.out
index 9022d52267..4e1ca7551e 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SSdefault.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SSdefault.out
@@ -38,13 +38,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -53,6 +46,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 float base;
 vec3 base_color;
@@ -96,6 +96,7 @@ bool thin_walled;
 
 // Uniform block: PrivateUniforms
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 bool u_refractionTwoSided = false;
@@ -207,6 +208,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -936,11 +940,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
+{
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -955,13 +970,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -1203,15 +1219,6 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
 }
 
 
-void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
-{
-    N = mx_forward_facing_normal(N, V);
-    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
-    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
-    result = base * f;
-}
-
-
 void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
 {
     if (weight < M_FLOAT_EPS)
@@ -1234,6 +1241,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1252,7 +1260,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1266,6 +1274,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1286,7 +1295,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1302,6 +1311,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1321,7 +1331,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -1577,6 +1587,15 @@ void mx_oren_nayar_diffuse_bsdf_indirect(vec3 V, float weight, vec3 color, float
     bsdf.response = Li * color * weight;
 }
 
+
+void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
+{
+    N = mx_forward_facing_normal(N, V);
+    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
+    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
+    result = base * f;
+}
+
 void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float diffuse_roughness, float metalness, float specular, vec3 specular_color, float specular_roughness, float specular_IOR, float specular_anisotropy, float specular_rotation, float transmission, vec3 transmission_color, float transmission_depth, vec3 transmission_scatter, float transmission_scatter_anisotropy, float transmission_dispersion, float transmission_extra_roughness, float subsurface, vec3 subsurface_color, vec3 subsurface_radius, float subsurface_scale, float subsurface_anisotropy, float sheen, vec3 sheen_color, float sheen_roughness, float coat, vec3 coat_color, float coat_roughness, float coat_anisotropy, float coat_rotation, float coat_IOR, vec3 coat_normal, float coat_affect_color, float coat_affect_roughness, float thin_film_thickness, float thin_film_IOR, float emission, vec3 emission_color, vec3 opacity, bool thin_walled, vec3 normal, vec3 tangent, out surfaceshader out1)
 {
     vec2 coat_roughness_vector_out = vec2(0.0);
@@ -1640,6 +1659,8 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
     mx_roughness_anisotropy(coat_affected_transmission_roughness_out, specular_anisotropy, transmission_roughness_out);
     vec3 coat_affected_subsurface_color_out = pow(subsurface_color_nonnegative_out, vec3(coat_gamma_out));
     vec3 coat_affected_diffuse_color_out = pow(base_color_nonnegative_out, vec3(coat_gamma_out));
+    const float one_minus_coat_ior_to_F0_in1_tmp = 1.000000;
+    float one_minus_coat_ior_to_F0_out = one_minus_coat_ior_to_F0_in1_tmp - coat_ior_to_F0_out;
     surfaceshader shader_constructor_out = surfaceshader(vec3(0.0),vec3(0.0));
     {
         vec3 N = normalize(vd.normalWorld);
@@ -1769,7 +1790,7 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
             mx_uniform_edf(N, V, emission_weight_out, emission_edf_out);
             EDF coat_tinted_emission_edf_out = emission_edf_out * coat_color;
             EDF coat_emission_edf_out = EDF(0.0);
-            mx_generalized_schlick_edf(N, V, vec3(1.000000, 1.000000, 1.000000), vec3(coat_ior_to_F0_out, coat_ior_to_F0_out, coat_ior_to_F0_out), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
+            mx_generalized_schlick_edf(N, V, vec3(one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out), vec3(0.000000, 0.000000, 0.000000), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
             // Omitted node 'emission_edf'. Function already called in this scope.
             EDF blended_coat_emission_edf_out = mix(emission_edf_out, coat_emission_edf_out, coat);
             shader_constructor_out.color += blended_coat_emission_edf_out;
@@ -1832,10 +1853,10 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
 {
     // Initialize MaterialX Variables
     mxInit(Peye, Neye);
-    vec3 geomprop_Nworld_out1 = normalize(vd.normalWorld);
-    vec3 geomprop_Tworld_out1 = normalize(vd.tangentWorld);
+    vec3 geomprop_Nworld_out = normalize(vd.normalWorld);
+    vec3 geomprop_Tworld_out = normalize(vd.tangentWorld);
     surfaceshader SR_default_out = surfaceshader(vec3(0.0),vec3(0.0));
-    NG_standard_surface_surfaceshader_100(base, base_color, diffuse_roughness, metalness, specular, specular_color, specular_roughness, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, coat_color, coat_roughness, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out1, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out1, geomprop_Tworld_out1, SR_default_out);
+    NG_standard_surface_surfaceshader_100(base, base_color, diffuse_roughness, metalness, specular, specular_color, specular_roughness, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, coat_color, coat_roughness, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out, geomprop_Tworld_out, SR_default_out);
     vec4 mxOut = vec4(SR_default_out.color, 1.0);
     mxOut = ApplyColorOverrides(mxOut);
     return mxOut;
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SSmarble.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SSmarble.out
index e2a4a3cc6d..835ce4f9ca 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SSmarble.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SSmarble.out
@@ -38,13 +38,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -53,6 +46,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 float base;
 float diffuse_roughness;
@@ -108,6 +108,7 @@ vec3 mix1_bg;
 
 // Uniform block: PrivateUniforms
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 bool u_refractionTwoSided = false;
@@ -232,6 +233,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -961,11 +965,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
+{
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -980,13 +995,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -1871,15 +1887,6 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
 }
 
 
-void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
-{
-    N = mx_forward_facing_normal(N, V);
-    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
-    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
-    result = base * f;
-}
-
-
 void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
 {
     if (weight < M_FLOAT_EPS)
@@ -1902,6 +1909,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1920,7 +1928,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1934,6 +1942,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1954,7 +1963,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1970,6 +1979,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1989,7 +1999,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -2245,6 +2255,15 @@ void mx_oren_nayar_diffuse_bsdf_indirect(vec3 V, float weight, vec3 color, float
     bsdf.response = Li * color * weight;
 }
 
+
+void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
+{
+    N = mx_forward_facing_normal(N, V);
+    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
+    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
+    result = base * f;
+}
+
 void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float diffuse_roughness, float metalness, float specular, vec3 specular_color, float specular_roughness, float specular_IOR, float specular_anisotropy, float specular_rotation, float transmission, vec3 transmission_color, float transmission_depth, vec3 transmission_scatter, float transmission_scatter_anisotropy, float transmission_dispersion, float transmission_extra_roughness, float subsurface, vec3 subsurface_color, vec3 subsurface_radius, float subsurface_scale, float subsurface_anisotropy, float sheen, vec3 sheen_color, float sheen_roughness, float coat, vec3 coat_color, float coat_roughness, float coat_anisotropy, float coat_rotation, float coat_IOR, vec3 coat_normal, float coat_affect_color, float coat_affect_roughness, float thin_film_thickness, float thin_film_IOR, float emission, vec3 emission_color, vec3 opacity, bool thin_walled, vec3 normal, vec3 tangent, out surfaceshader out1)
 {
     vec2 coat_roughness_vector_out = vec2(0.0);
@@ -2308,6 +2327,8 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
     mx_roughness_anisotropy(coat_affected_transmission_roughness_out, specular_anisotropy, transmission_roughness_out);
     vec3 coat_affected_subsurface_color_out = pow(subsurface_color_nonnegative_out, vec3(coat_gamma_out));
     vec3 coat_affected_diffuse_color_out = pow(base_color_nonnegative_out, vec3(coat_gamma_out));
+    const float one_minus_coat_ior_to_F0_in1_tmp = 1.000000;
+    float one_minus_coat_ior_to_F0_out = one_minus_coat_ior_to_F0_in1_tmp - coat_ior_to_F0_out;
     surfaceshader shader_constructor_out = surfaceshader(vec3(0.0),vec3(0.0));
     {
         vec3 N = normalize(vd.normalWorld);
@@ -2437,7 +2458,7 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
             mx_uniform_edf(N, V, emission_weight_out, emission_edf_out);
             EDF coat_tinted_emission_edf_out = emission_edf_out * coat_color;
             EDF coat_emission_edf_out = EDF(0.0);
-            mx_generalized_schlick_edf(N, V, vec3(1.000000, 1.000000, 1.000000), vec3(coat_ior_to_F0_out, coat_ior_to_F0_out, coat_ior_to_F0_out), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
+            mx_generalized_schlick_edf(N, V, vec3(one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out), vec3(0.000000, 0.000000, 0.000000), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
             // Omitted node 'emission_edf'. Function already called in this scope.
             EDF blended_coat_emission_edf_out = mix(emission_edf_out, coat_emission_edf_out, coat);
             shader_constructor_out.color += blended_coat_emission_edf_out;
@@ -2501,8 +2522,8 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
     // Initialize MaterialX Variables
     mxInit(Peye, Neye);
     vec3 objpos_out = vd.positionObject;
-    vec3 geomprop_Nworld_out1 = normalize(vd.normalWorld);
-    vec3 geomprop_Tworld_out1 = normalize(vd.tangentWorld);
+    vec3 geomprop_Nworld_out = normalize(vd.normalWorld);
+    vec3 geomprop_Tworld_out = normalize(vd.tangentWorld);
     float addxyz_out = dot(objpos_out, addxyz_in2);
     vec3 scalepos_out = objpos_out * scalepos_in2;
     float scalexyz_out = addxyz_out * scalexyz_in2;
@@ -2516,7 +2537,7 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
     float power_out = pow(bias_out, power_in2);
     vec3 mix1_out = mix(mix1_bg, mix1_fg, power_out);
     surfaceshader SR_marble1_out = surfaceshader(vec3(0.0),vec3(0.0));
-    NG_standard_surface_surfaceshader_100(base, mix1_out, diffuse_roughness, metalness, specular, specular_color, specular_roughness, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, coat_color, coat_roughness, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out1, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out1, geomprop_Tworld_out1, SR_marble1_out);
+    NG_standard_surface_surfaceshader_100(base, mix1_out, diffuse_roughness, metalness, specular, specular_color, specular_roughness, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, coat_color, coat_roughness, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out, geomprop_Tworld_out, SR_marble1_out);
     vec4 mxOut = vec4(SR_marble1_out.color, 1.0);
     mxOut = ApplyColorOverrides(mxOut);
     return mxOut;
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SStextured.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SStextured.out
index decbe70d70..c9dc647158 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SStextured.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SStextured.out
@@ -49,13 +49,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -64,6 +57,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 float base;
 vec3 base_color;
@@ -122,6 +122,7 @@ int image_color_frameendaction;
 
 // Uniform block: PrivateUniforms
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 bool u_refractionTwoSided = false;
@@ -157,9 +158,9 @@ LightData u_lightData[MAX_LIGHT_SOURCES];
 // MaterialX's VertexData
 struct mxVertexData
 {
+    vec2 i_geomprop_uv;
     vec3 normalWorld;
     vec3 tangentWorld;
-    vec2 i_geomprop_uv;
     vec3 positionWorld;
 };
 mxVertexData vd;
@@ -184,13 +185,13 @@ void mxInit(vec4 Peye, vec3 Neye)
     }
 #endif
 
-    vd = mxVertexData(normalWorld,tangentWorld,
+    vd = mxVertexData(
     #ifdef HD_HAS_uv
         HdGet_uv(),
     #else
         vec2(0.0),
     #endif
-        positionWorld);
+        normalWorld,tangentWorld,positionWorld);
 
     // Initialize Material Parameters
     base = HdGet_base();
@@ -257,6 +258,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -986,11 +990,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
+{
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -1005,13 +1020,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -1323,15 +1339,6 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
 }
 
 
-void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
-{
-    N = mx_forward_facing_normal(N, V);
-    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
-    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
-    result = base * f;
-}
-
-
 void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
 {
     if (weight < M_FLOAT_EPS)
@@ -1354,6 +1361,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1372,7 +1380,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1386,6 +1394,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1406,7 +1415,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1422,6 +1431,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1441,7 +1451,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -1697,6 +1707,15 @@ void mx_oren_nayar_diffuse_bsdf_indirect(vec3 V, float weight, vec3 color, float
     bsdf.response = Li * color * weight;
 }
 
+
+void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
+{
+    N = mx_forward_facing_normal(N, V);
+    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
+    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
+    result = base * f;
+}
+
 void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float diffuse_roughness, float metalness, float specular, vec3 specular_color, float specular_roughness, float specular_IOR, float specular_anisotropy, float specular_rotation, float transmission, vec3 transmission_color, float transmission_depth, vec3 transmission_scatter, float transmission_scatter_anisotropy, float transmission_dispersion, float transmission_extra_roughness, float subsurface, vec3 subsurface_color, vec3 subsurface_radius, float subsurface_scale, float subsurface_anisotropy, float sheen, vec3 sheen_color, float sheen_roughness, float coat, vec3 coat_color, float coat_roughness, float coat_anisotropy, float coat_rotation, float coat_IOR, vec3 coat_normal, float coat_affect_color, float coat_affect_roughness, float thin_film_thickness, float thin_film_IOR, float emission, vec3 emission_color, vec3 opacity, bool thin_walled, vec3 normal, vec3 tangent, out surfaceshader out1)
 {
     vec2 coat_roughness_vector_out = vec2(0.0);
@@ -1760,6 +1779,8 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
     mx_roughness_anisotropy(coat_affected_transmission_roughness_out, specular_anisotropy, transmission_roughness_out);
     vec3 coat_affected_subsurface_color_out = pow(subsurface_color_nonnegative_out, vec3(coat_gamma_out));
     vec3 coat_affected_diffuse_color_out = pow(base_color_nonnegative_out, vec3(coat_gamma_out));
+    const float one_minus_coat_ior_to_F0_in1_tmp = 1.000000;
+    float one_minus_coat_ior_to_F0_out = one_minus_coat_ior_to_F0_in1_tmp - coat_ior_to_F0_out;
     surfaceshader shader_constructor_out = surfaceshader(vec3(0.0),vec3(0.0));
     {
         vec3 N = normalize(vd.normalWorld);
@@ -1889,7 +1910,7 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
             mx_uniform_edf(N, V, emission_weight_out, emission_edf_out);
             EDF coat_tinted_emission_edf_out = emission_edf_out * coat_color;
             EDF coat_emission_edf_out = EDF(0.0);
-            mx_generalized_schlick_edf(N, V, vec3(1.000000, 1.000000, 1.000000), vec3(coat_ior_to_F0_out, coat_ior_to_F0_out, coat_ior_to_F0_out), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
+            mx_generalized_schlick_edf(N, V, vec3(one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out), vec3(0.000000, 0.000000, 0.000000), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
             // Omitted node 'emission_edf'. Function already called in this scope.
             EDF blended_coat_emission_edf_out = mix(emission_edf_out, coat_emission_edf_out, coat);
             shader_constructor_out.color += blended_coat_emission_edf_out;
@@ -1952,9 +1973,9 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
 {
     // Initialize MaterialX Variables
     mxInit(Peye, Neye);
-    vec3 geomprop_Nworld_out1 = normalize(vd.normalWorld);
-    vec3 geomprop_Tworld_out1 = normalize(vd.tangentWorld);
     vec2 stcoords_out = vd.i_geomprop_uv;
+    vec3 geomprop_Nworld_out = normalize(vd.normalWorld);
+    vec3 geomprop_Tworld_out = normalize(vd.tangentWorld);
     float image_roughness_out = 0.0;
     NG_tiledimage_float(image_roughness_file, image_roughness_default, stcoords_out, image_roughness_uvtiling, image_roughness_uvoffset, image_roughness_realworldimagesize, image_roughness_realworldtilesize, image_roughness_filtertype, image_roughness_framerange, image_roughness_frameoffset, image_roughness_frameendaction, image_roughness_out);
     vec3 image_color_out = vec3(0.0);
@@ -1962,7 +1983,7 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
     vec3 image_color_out_cm_out = vec3(0.0);
     NG_srgb_texture_to_lin_rec709_color3(image_color_out, image_color_out_cm_out);
     surfaceshader SR_brass1_out = surfaceshader(vec3(0.0),vec3(0.0));
-    NG_standard_surface_surfaceshader_100(base, base_color, diffuse_roughness, metalness, specular, specular_color, image_roughness_out, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, image_color_out_cm_out, image_roughness_out, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out1, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out1, geomprop_Tworld_out1, SR_brass1_out);
+    NG_standard_surface_surfaceshader_100(base, base_color, diffuse_roughness, metalness, specular, specular_color, image_roughness_out, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, image_color_out_cm_out, image_roughness_out, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out, geomprop_Tworld_out, SR_brass1_out);
     vec4 mxOut = vec4(SR_brass1_out.color, 1.0);
     mxOut = ApplyColorOverrides(mxOut);
     return mxOut;
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SStextured_bindless.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SStextured_bindless.out
index dddd552d24..f551319bbb 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SStextured_bindless.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_SStextured_bindless.out
@@ -49,13 +49,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -64,6 +57,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 float base;
 vec3 base_color;
@@ -125,6 +125,7 @@ int image_color_frameendaction;
 // Uniform block: PrivateUniforms
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
 sampler2D u_envRadiance;
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 sampler2D u_envIrradiance;
@@ -149,9 +150,9 @@ LightData u_lightData[MAX_LIGHT_SOURCES];
 // MaterialX's VertexData
 struct mxVertexData
 {
+    vec2 i_geomprop_uv;
     vec3 normalWorld;
     vec3 tangentWorld;
-    vec2 i_geomprop_uv;
     vec3 positionWorld;
 };
 mxVertexData vd;
@@ -176,13 +177,13 @@ void mxInit(vec4 Peye, vec3 Neye)
     }
 #endif
 
-    vd = mxVertexData(normalWorld,tangentWorld,
+    vd = mxVertexData(
     #ifdef HD_HAS_uv
         HdGet_uv(),
     #else
         vec2(0.0),
     #endif
-        positionWorld);
+        normalWorld,tangentWorld,positionWorld);
 
     // Initialize Material Parameters
     base = HdGet_base();
@@ -260,6 +261,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -989,11 +993,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
+{
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -1008,13 +1023,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -1326,15 +1342,6 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
 }
 
 
-void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
-{
-    N = mx_forward_facing_normal(N, V);
-    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
-    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
-    result = base * f;
-}
-
-
 void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
 {
     if (weight < M_FLOAT_EPS)
@@ -1357,6 +1364,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1375,7 +1383,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1389,6 +1397,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1409,7 +1418,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1425,6 +1434,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1444,7 +1454,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -1700,6 +1710,15 @@ void mx_oren_nayar_diffuse_bsdf_indirect(vec3 V, float weight, vec3 color, float
     bsdf.response = Li * color * weight;
 }
 
+
+void mx_generalized_schlick_edf(vec3 N, vec3 V, vec3 color0, vec3 color90, float exponent, EDF base, out EDF result)
+{
+    N = mx_forward_facing_normal(N, V);
+    float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
+    vec3 f = mx_fresnel_schlick(NdotV, color0, color90, exponent);
+    result = base * f;
+}
+
 void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float diffuse_roughness, float metalness, float specular, vec3 specular_color, float specular_roughness, float specular_IOR, float specular_anisotropy, float specular_rotation, float transmission, vec3 transmission_color, float transmission_depth, vec3 transmission_scatter, float transmission_scatter_anisotropy, float transmission_dispersion, float transmission_extra_roughness, float subsurface, vec3 subsurface_color, vec3 subsurface_radius, float subsurface_scale, float subsurface_anisotropy, float sheen, vec3 sheen_color, float sheen_roughness, float coat, vec3 coat_color, float coat_roughness, float coat_anisotropy, float coat_rotation, float coat_IOR, vec3 coat_normal, float coat_affect_color, float coat_affect_roughness, float thin_film_thickness, float thin_film_IOR, float emission, vec3 emission_color, vec3 opacity, bool thin_walled, vec3 normal, vec3 tangent, out surfaceshader out1)
 {
     vec2 coat_roughness_vector_out = vec2(0.0);
@@ -1763,6 +1782,8 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
     mx_roughness_anisotropy(coat_affected_transmission_roughness_out, specular_anisotropy, transmission_roughness_out);
     vec3 coat_affected_subsurface_color_out = pow(subsurface_color_nonnegative_out, vec3(coat_gamma_out));
     vec3 coat_affected_diffuse_color_out = pow(base_color_nonnegative_out, vec3(coat_gamma_out));
+    const float one_minus_coat_ior_to_F0_in1_tmp = 1.000000;
+    float one_minus_coat_ior_to_F0_out = one_minus_coat_ior_to_F0_in1_tmp - coat_ior_to_F0_out;
     surfaceshader shader_constructor_out = surfaceshader(vec3(0.0),vec3(0.0));
     {
         vec3 N = normalize(vd.normalWorld);
@@ -1892,7 +1913,7 @@ void NG_standard_surface_surfaceshader_100(float base, vec3 base_color, float di
             mx_uniform_edf(N, V, emission_weight_out, emission_edf_out);
             EDF coat_tinted_emission_edf_out = emission_edf_out * coat_color;
             EDF coat_emission_edf_out = EDF(0.0);
-            mx_generalized_schlick_edf(N, V, vec3(1.000000, 1.000000, 1.000000), vec3(coat_ior_to_F0_out, coat_ior_to_F0_out, coat_ior_to_F0_out), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
+            mx_generalized_schlick_edf(N, V, vec3(one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out, one_minus_coat_ior_to_F0_out), vec3(0.000000, 0.000000, 0.000000), 5.000000, coat_tinted_emission_edf_out, coat_emission_edf_out);
             // Omitted node 'emission_edf'. Function already called in this scope.
             EDF blended_coat_emission_edf_out = mix(emission_edf_out, coat_emission_edf_out, coat);
             shader_constructor_out.color += blended_coat_emission_edf_out;
@@ -1955,9 +1976,9 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
 {
     // Initialize MaterialX Variables
     mxInit(Peye, Neye);
-    vec3 geomprop_Nworld_out1 = normalize(vd.normalWorld);
-    vec3 geomprop_Tworld_out1 = normalize(vd.tangentWorld);
     vec2 stcoords_out = vd.i_geomprop_uv;
+    vec3 geomprop_Nworld_out = normalize(vd.normalWorld);
+    vec3 geomprop_Tworld_out = normalize(vd.tangentWorld);
     float image_roughness_out = 0.0;
     NG_tiledimage_float(image_roughness_file, image_roughness_default, stcoords_out, image_roughness_uvtiling, image_roughness_uvoffset, image_roughness_realworldimagesize, image_roughness_realworldtilesize, image_roughness_filtertype, image_roughness_framerange, image_roughness_frameoffset, image_roughness_frameendaction, image_roughness_out);
     vec3 image_color_out = vec3(0.0);
@@ -1965,7 +1986,7 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
     vec3 image_color_out_cm_out = vec3(0.0);
     NG_srgb_texture_to_lin_rec709_color3(image_color_out, image_color_out_cm_out);
     surfaceshader SR_brass1_out = surfaceshader(vec3(0.0),vec3(0.0));
-    NG_standard_surface_surfaceshader_100(base, base_color, diffuse_roughness, metalness, specular, specular_color, image_roughness_out, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, image_color_out_cm_out, image_roughness_out, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out1, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out1, geomprop_Tworld_out1, SR_brass1_out);
+    NG_standard_surface_surfaceshader_100(base, base_color, diffuse_roughness, metalness, specular, specular_color, image_roughness_out, specular_IOR, specular_anisotropy, specular_rotation, transmission, transmission_color, transmission_depth, transmission_scatter, transmission_scatter_anisotropy, transmission_dispersion, transmission_extra_roughness, subsurface, subsurface_color, subsurface_radius, subsurface_scale, subsurface_anisotropy, sheen, sheen_color, sheen_roughness, coat, image_color_out_cm_out, image_roughness_out, coat_anisotropy, coat_rotation, coat_IOR, geomprop_Nworld_out, coat_affect_color, coat_affect_roughness, thin_film_thickness, thin_film_IOR, emission, emission_color, opacity, thin_walled, geomprop_Nworld_out, geomprop_Tworld_out, SR_brass1_out);
     vec4 mxOut = vec4(SR_brass1_out.color, 1.0);
     mxOut = ApplyColorOverrides(mxOut);
     return mxOut;
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSdefault.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSdefault.out
index 0926882568..c40288f4a4 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSdefault.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSdefault.out
@@ -38,13 +38,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -53,6 +46,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 vec3 diffuseColor;
 vec3 emissiveColor;
@@ -70,8 +70,8 @@ float displacement;
 float occlusion;
 
 // Uniform block: PrivateUniforms
-float u_alphaThreshold = 0.001000;
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 bool u_refractionTwoSided = false;
@@ -158,6 +158,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -887,11 +890,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
+{
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -906,13 +920,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -994,7 +1009,7 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
     result = color;
 }
 
-void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,  out vec3 result)
+void mx_normalmap_vector2(vec3 value, int map_space, vec2 normal_scale, vec3 N, vec3 T,  out vec3 result)
 {
     // Decode the normal map.
     value = (value == vec3(0.0f)) ? vec3(0.0, 0.0, 1.0) : value * 2.0 - 1.0;
@@ -1010,6 +1025,11 @@ void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,
     // Normalize the result.
     result = normalize(value);
 }
+
+void mx_normalmap_float(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,  out vec3 result)
+{
+    mx_normalmap_vector2(value, map_space, vec2(normal_scale), N, T, result);
+}
 
 
 void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color0, vec3 color90, float exponent, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1034,20 +1054,22 @@ void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlus
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3  F = mx_compute_fresnel(VdotH, fd);
     float D = mx_ggx_NDF(Ht, safeAlpha);
     float G = mx_ggx_smith_G2(NdotL, NdotV, avgAlpha);
 
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
@@ -1066,13 +1088,15 @@ void mx_generalized_schlick_bsdf_transmission(vec3 V, float weight, vec3 color0,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3 F = mx_compute_fresnel(NdotV, fd);
 
@@ -1080,15 +1104,15 @@ void mx_generalized_schlick_bsdf_transmission(vec3 V, float weight, vec3 color0,
     float avgAlpha = mx_average_alpha(safeAlpha);
 
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
     if (scatter_mode != 0)
     {
-        float avgF0 = dot(color0, vec3(1.0 / 3.0));
+        float avgF0 = dot(safeColor0, vec3(1.0 / 3.0));
         fd.ior = vec3(mx_f0_to_ior(avgF0));
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, color0) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeColor0) * weight;
     }
 }
 
@@ -1103,20 +1127,22 @@ void mx_generalized_schlick_bsdf_indirect(vec3 V, float weight, vec3 color0, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3 F = mx_compute_fresnel(NdotV, fd);
 
     vec2 safeAlpha = clamp(roughness, M_FLOAT_EPS, 1.0);
     float avgAlpha = mx_average_alpha(safeAlpha);
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
@@ -1266,6 +1292,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1284,7 +1311,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1298,6 +1325,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1318,7 +1346,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1334,6 +1362,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1353,7 +1382,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -1458,7 +1487,7 @@ void IMP_UsdPreviewSurface_surfaceshader(vec3 diffuseColor, vec3 emissiveColor,
     float diffuse_bsdf_weight_out = mix(inverse_metalness_out, diffuse_bsdf_weight_fg_tmp, use_specular_workflow_float_out);
     float R_sq_out = R_out * R_out;
     vec3 surface_normal_out = vec3(0.0);
-    mx_normalmap(bias_normal_out, 0, 1.000000, geomprop_Nworld_out1, geomprop_Tworld_out1, surface_normal_out);
+    mx_normalmap_float(bias_normal_out, 0, 1.000000, geomprop_Nworld_out1, geomprop_Tworld_out1, surface_normal_out);
     vec3 coat_F0_out = vec3(R_sq_out, R_sq_out, R_sq_out);
     vec3 specular_color_metallic_R_sq_out = specular_color_metallic_out * R_sq_out;
     vec3 F0_out = mix(specular_color_metallic_R_sq_out, specular_color_metallic_out, metallic);
@@ -1614,12 +1643,7 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
     mxInit(Peye, Neye);
     surfaceshader SR_default_out = surfaceshader(vec3(0.0),vec3(0.0));
     IMP_UsdPreviewSurface_surfaceshader(diffuseColor, emissiveColor, useSpecularWorkflow, specularColor, metallic, roughness, clearcoat, clearcoatRoughness, opacity, opacityThreshold, ior, normal, displacement, occlusion, SR_default_out);
-    float outAlpha = clamp(1.0 - dot(SR_default_out.transparency, vec3(0.3333)), 0.0, 1.0);
-    vec4 mxOut = vec4(SR_default_out.color, outAlpha);
-    if (outAlpha < u_alphaThreshold)
-    {
-        discard;
-    }
+    vec4 mxOut = vec4(SR_default_out.color, 1.0);
     mxOut = ApplyColorOverrides(mxOut);
     return mxOut;
 }
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSglass.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSglass.out
index 5c57fdd2b5..027325ce18 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSglass.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPSglass.out
@@ -38,13 +38,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -53,6 +46,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 vec3 diffuseColor;
 vec3 emissiveColor;
@@ -72,6 +72,7 @@ float occlusion;
 // Uniform block: PrivateUniforms
 float u_alphaThreshold = 0.001000;
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 bool u_refractionTwoSided = false;
@@ -158,6 +159,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -887,11 +891,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
+{
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -906,13 +921,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -994,7 +1010,7 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
     result = color;
 }
 
-void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,  out vec3 result)
+void mx_normalmap_vector2(vec3 value, int map_space, vec2 normal_scale, vec3 N, vec3 T,  out vec3 result)
 {
     // Decode the normal map.
     value = (value == vec3(0.0f)) ? vec3(0.0, 0.0, 1.0) : value * 2.0 - 1.0;
@@ -1010,6 +1026,11 @@ void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,
     // Normalize the result.
     result = normalize(value);
 }
+
+void mx_normalmap_float(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,  out vec3 result)
+{
+    mx_normalmap_vector2(value, map_space, vec2(normal_scale), N, T, result);
+}
 
 
 void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color0, vec3 color90, float exponent, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1034,20 +1055,22 @@ void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlus
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3  F = mx_compute_fresnel(VdotH, fd);
     float D = mx_ggx_NDF(Ht, safeAlpha);
     float G = mx_ggx_smith_G2(NdotL, NdotV, avgAlpha);
 
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
@@ -1066,13 +1089,15 @@ void mx_generalized_schlick_bsdf_transmission(vec3 V, float weight, vec3 color0,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3 F = mx_compute_fresnel(NdotV, fd);
 
@@ -1080,15 +1105,15 @@ void mx_generalized_schlick_bsdf_transmission(vec3 V, float weight, vec3 color0,
     float avgAlpha = mx_average_alpha(safeAlpha);
 
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
     if (scatter_mode != 0)
     {
-        float avgF0 = dot(color0, vec3(1.0 / 3.0));
+        float avgF0 = dot(safeColor0, vec3(1.0 / 3.0));
         fd.ior = vec3(mx_f0_to_ior(avgF0));
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, color0) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeColor0) * weight;
     }
 }
 
@@ -1103,20 +1128,22 @@ void mx_generalized_schlick_bsdf_indirect(vec3 V, float weight, vec3 color0, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3 F = mx_compute_fresnel(NdotV, fd);
 
     vec2 safeAlpha = clamp(roughness, M_FLOAT_EPS, 1.0);
     float avgAlpha = mx_average_alpha(safeAlpha);
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
@@ -1266,6 +1293,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1284,7 +1312,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1298,6 +1326,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1318,7 +1347,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1334,6 +1363,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1353,7 +1383,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -1458,7 +1488,7 @@ void IMP_UsdPreviewSurface_surfaceshader(vec3 diffuseColor, vec3 emissiveColor,
     float diffuse_bsdf_weight_out = mix(inverse_metalness_out, diffuse_bsdf_weight_fg_tmp, use_specular_workflow_float_out);
     float R_sq_out = R_out * R_out;
     vec3 surface_normal_out = vec3(0.0);
-    mx_normalmap(bias_normal_out, 0, 1.000000, geomprop_Nworld_out1, geomprop_Tworld_out1, surface_normal_out);
+    mx_normalmap_float(bias_normal_out, 0, 1.000000, geomprop_Nworld_out1, geomprop_Tworld_out1, surface_normal_out);
     vec3 coat_F0_out = vec3(R_sq_out, R_sq_out, R_sq_out);
     vec3 specular_color_metallic_R_sq_out = specular_color_metallic_out * R_sq_out;
     vec3 F0_out = mix(specular_color_metallic_R_sq_out, specular_color_metallic_out, metallic);
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPStextured.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPStextured.out
index 289309eeeb..4b6b2c580a 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPStextured.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_UsdPStextured.out
@@ -44,13 +44,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -59,6 +52,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 vec3 emissiveColor;
 int useSpecularWorkflow;
@@ -72,6 +72,7 @@ float ior;
 vec3 normal;
 float displacement;
 float occlusion;
+int geomprop_UV0_index;
 vec3 image_color_default;
 vec2 image_color_uvtiling;
 vec2 image_color_uvoffset;
@@ -92,8 +93,8 @@ int image_roughness_frameoffset;
 int image_roughness_frameendaction;
 
 // Uniform block: PrivateUniforms
-float u_alphaThreshold = 0.001000;
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 bool u_refractionTwoSided = false;
@@ -177,6 +178,7 @@ void mxInit(vec4 Peye, vec3 Neye)
     normal = HdGet_normal();
     displacement = HdGet_displacement();
     occlusion = HdGet_occlusion();
+    geomprop_UV0_index = HdGet_geomprop_UV0_index();
     image_color_default = HdGet_image_color_default();
     image_color_uvtiling = HdGet_image_color_uvtiling();
     image_color_uvoffset = HdGet_image_color_uvoffset();
@@ -205,6 +207,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -934,11 +939,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
+{
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -953,13 +969,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -1082,7 +1099,7 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
     result = color;
 }
 
-void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,  out vec3 result)
+void mx_normalmap_vector2(vec3 value, int map_space, vec2 normal_scale, vec3 N, vec3 T,  out vec3 result)
 {
     // Decode the normal map.
     value = (value == vec3(0.0f)) ? vec3(0.0, 0.0, 1.0) : value * 2.0 - 1.0;
@@ -1098,6 +1115,11 @@ void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,
     // Normalize the result.
     result = normalize(value);
 }
+
+void mx_normalmap_float(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,  out vec3 result)
+{
+    mx_normalmap_vector2(value, map_space, vec2(normal_scale), N, T, result);
+}
 
 
 void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color0, vec3 color90, float exponent, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1122,20 +1144,22 @@ void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlus
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3  F = mx_compute_fresnel(VdotH, fd);
     float D = mx_ggx_NDF(Ht, safeAlpha);
     float G = mx_ggx_smith_G2(NdotL, NdotV, avgAlpha);
 
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
@@ -1154,13 +1178,15 @@ void mx_generalized_schlick_bsdf_transmission(vec3 V, float weight, vec3 color0,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3 F = mx_compute_fresnel(NdotV, fd);
 
@@ -1168,15 +1194,15 @@ void mx_generalized_schlick_bsdf_transmission(vec3 V, float weight, vec3 color0,
     float avgAlpha = mx_average_alpha(safeAlpha);
 
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
     if (scatter_mode != 0)
     {
-        float avgF0 = dot(color0, vec3(1.0 / 3.0));
+        float avgF0 = dot(safeColor0, vec3(1.0 / 3.0));
         fd.ior = vec3(mx_f0_to_ior(avgF0));
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, color0) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeColor0) * weight;
     }
 }
 
@@ -1191,20 +1217,22 @@ void mx_generalized_schlick_bsdf_indirect(vec3 V, float weight, vec3 color0, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3 F = mx_compute_fresnel(NdotV, fd);
 
     vec2 safeAlpha = clamp(roughness, M_FLOAT_EPS, 1.0);
     float avgAlpha = mx_average_alpha(safeAlpha);
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
@@ -1354,6 +1382,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1372,7 +1401,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1386,6 +1415,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1406,7 +1436,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1422,6 +1452,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1441,7 +1472,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -1546,7 +1577,7 @@ void IMP_UsdPreviewSurface_surfaceshader(vec3 diffuseColor, vec3 emissiveColor,
     float diffuse_bsdf_weight_out = mix(inverse_metalness_out, diffuse_bsdf_weight_fg_tmp, use_specular_workflow_float_out);
     float R_sq_out = R_out * R_out;
     vec3 surface_normal_out = vec3(0.0);
-    mx_normalmap(bias_normal_out, 0, 1.000000, geomprop_Nworld_out1, geomprop_Tworld_out1, surface_normal_out);
+    mx_normalmap_float(bias_normal_out, 0, 1.000000, geomprop_Nworld_out1, geomprop_Tworld_out1, surface_normal_out);
     vec3 coat_F0_out = vec3(R_sq_out, R_sq_out, R_sq_out);
     vec3 specular_color_metallic_R_sq_out = specular_color_metallic_out * R_sq_out;
     vec3 F0_out = mix(specular_color_metallic_R_sq_out, specular_color_metallic_out, metallic);
@@ -1700,19 +1731,14 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
 {
     // Initialize MaterialX Variables
     mxInit(Peye, Neye);
-    vec2 geomprop_UV0_out1 = vd.texcoord_0;
+    vec2 geomprop_UV0_out1 = vd.texcoord_0.xy;
     vec3 image_color_out = vec3(0.0);
     NG_tiledimage_color3(image_color_file, image_color_default, geomprop_UV0_out1, image_color_uvtiling, image_color_uvoffset, image_color_realworldimagesize, image_color_realworldtilesize, image_color_filtertype, image_color_framerange, image_color_frameoffset, image_color_frameendaction, image_color_out);
     float image_roughness_out = 0.0;
     NG_tiledimage_float(image_roughness_file, image_roughness_default, geomprop_UV0_out1, image_roughness_uvtiling, image_roughness_uvoffset, image_roughness_realworldimagesize, image_roughness_realworldtilesize, image_roughness_filtertype, image_roughness_framerange, image_roughness_frameoffset, image_roughness_frameendaction, image_roughness_out);
     surfaceshader SR_brass1_out = surfaceshader(vec3(0.0),vec3(0.0));
     IMP_UsdPreviewSurface_surfaceshader(image_color_out, emissiveColor, useSpecularWorkflow, specularColor, metallic, image_roughness_out, clearcoat, clearcoatRoughness, opacity, opacityThreshold, ior, normal, displacement, occlusion, SR_brass1_out);
-    float outAlpha = clamp(1.0 - dot(SR_brass1_out.transparency, vec3(0.3333)), 0.0, 1.0);
-    vec4 mxOut = vec4(SR_brass1_out.color, outAlpha);
-    if (outAlpha < u_alphaThreshold)
-    {
-        discard;
-    }
+    vec4 mxOut = vec4(SR_brass1_out.color, 1.0);
     mxOut = ApplyColorOverrides(mxOut);
     return mxOut;
 }
diff --git a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_texcoord.out b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_texcoord.out
index d7fa47aea5..db5084e54a 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_texcoord.out
+++ b/pxr/imaging/hdSt/testenv/testHdStMaterialXShaderGen/baseline/shadergen_texcoord.out
@@ -43,13 +43,6 @@ vec3 mx_square(vec3 x)
 {
     return x*x;
 }
-#if NUM_LIGHTS > 0
-#define MAX_LIGHT_SOURCES NUM_LIGHTS
-#else
-#define MAX_LIGHT_SOURCES 1
-#endif
-#define DIRECTIONAL_ALBEDO_METHOD 0
-
 struct BSDF { vec3 response; vec3 throughput; float thickness; float ior; };
 #define EDF vec3
 struct surfaceshader { vec3 color; vec3 transparency; };
@@ -58,6 +51,13 @@ struct displacementshader { vec3 offset; float scale; };
 struct lightshader { vec3 intensity; vec3 direction; };
 #define material surfaceshader
 
+#if NUM_LIGHTS > 0
+#define MAX_LIGHT_SOURCES NUM_LIGHTS
+#else
+#define MAX_LIGHT_SOURCES 1
+#endif
+#define DIRECTIONAL_ALBEDO_METHOD 0
+
 // Uniform block: PublicUniforms
 vec3 emissiveColor;
 int useSpecularWorkflow;
@@ -72,12 +72,13 @@ float ior;
 vec3 normal;
 float displacement;
 float occlusion;
+int texcoord1_index;
 vec2 mult1_in2;
 float mod1_in2;
 
 // Uniform block: PrivateUniforms
-float u_alphaThreshold = 0.001000;
 mat4 u_envMatrix = mat4(-1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000);
+float u_envLightIntensity = 1.000000;
 int u_envRadianceMips;
 int u_envRadianceSamples;
 bool u_refractionTwoSided = false;
@@ -158,6 +159,7 @@ void mxInit(vec4 Peye, vec3 Neye)
     normal = HdGet_normal();
     displacement = HdGet_displacement();
     occlusion = HdGet_occlusion();
+    texcoord1_index = HdGet_texcoord1_index();
     mult1_in2 = HdGet_mult1_in2();
     mod1_in2 = HdGet_mod1_in2();
 
@@ -172,6 +174,9 @@ void mxInit(vec4 Peye, vec3 Neye)
         // Save the indirect light transformation
         if (light.isIndirectLight) {
             hdTransformationMatrix = light.worldToLightTransform;
+            // Note: in Storm, diffuse = lightColor * intensity;
+            u_envLightIntensity = max( max(light.diffuse.r, light.diffuse.g), 
+                                   light.diffuse.b);
         }
         // Save the direct light data
         else {
@@ -901,11 +906,22 @@ vec3 mx_latlong_map_lookup(vec3 dir, mat4 transform, float lod, sampler2D envSam
     return textureLod(envSampler, uv, lod).rgb;
 }
 
-float mx_latlong_compute_lod(float alpha)
+// Return the mip level with the appropriate coverage for a filtered importance sample.
+// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
+// Section 20.4 Equation 13
+float mx_latlong_compute_lod(vec3 dir, float pdf, float maxMipLevel, int envSamples)
+{
+    const float MIP_LEVEL_OFFSET = 1.5;
+    float effectiveMaxMipLevel = maxMipLevel - MIP_LEVEL_OFFSET;
+    float distortion = sqrt(1.0 - mx_square(dir.y));
+    return max(effectiveMaxMipLevel - 0.5 * log2(float(envSamples) * pdf * distortion), 0.0);
+}
+
+// Return the mip level associated with the given alpha in a prefiltered environment.
+float mx_latlong_alpha_to_lod(float alpha)
 {
-    // Select a mip level based on input alpha.
-    float lodBias = alpha < 0.25 ? sqrt(alpha) : 0.5*alpha + 0.375;
-    return lodBias * float(u_envRadianceMips);
+    float lodBias = (alpha < 0.25) ? sqrt(alpha) : 0.5 * alpha + 0.375;
+    return lodBias * float(u_envRadianceMips - 1);
 }
 
 vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distribution, FresnelData fd)
@@ -920,13 +936,14 @@ vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 alpha, int distributio
     float G = mx_ggx_smith_G2(NdotV, NdotV, avgAlpha);
     vec3 FG = fd.refraction ? vec3(1.0) - (F * G) : F * G;
 
-    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_compute_lod(avgAlpha), u_envRadiance);
-    return Li * FG;
+    vec3 Li = mx_latlong_map_lookup(L, u_envMatrix, mx_latlong_alpha_to_lod(avgAlpha), u_envRadiance);
+    return Li * FG * u_envLightIntensity;
 }
 
 vec3 mx_environment_irradiance(vec3 N)
 {
-    return mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    vec3 Li = mx_latlong_map_lookup(N, u_envMatrix, 0.0, u_envIrradiance);
+    return Li * u_envLightIntensity;
 }
 
 
@@ -1008,7 +1025,7 @@ void mx_uniform_edf(vec3 N, vec3 L, vec3 color, out EDF result)
     result = color;
 }
 
-void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,  out vec3 result)
+void mx_normalmap_vector2(vec3 value, int map_space, vec2 normal_scale, vec3 N, vec3 T,  out vec3 result)
 {
     // Decode the normal map.
     value = (value == vec3(0.0f)) ? vec3(0.0, 0.0, 1.0) : value * 2.0 - 1.0;
@@ -1024,6 +1041,11 @@ void mx_normalmap(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,
     // Normalize the result.
     result = normalize(value);
 }
+
+void mx_normalmap_float(vec3 value, int map_space, float normal_scale, vec3 N, vec3 T,  out vec3 result)
+{
+    mx_normalmap_vector2(value, map_space, vec2(normal_scale), N, T, result);
+}
 
 
 void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color0, vec3 color90, float exponent, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1048,20 +1070,22 @@ void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlus
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3  F = mx_compute_fresnel(VdotH, fd);
     float D = mx_ggx_NDF(Ht, safeAlpha);
     float G = mx_ggx_smith_G2(NdotL, NdotV, avgAlpha);
 
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
@@ -1080,13 +1104,15 @@ void mx_generalized_schlick_bsdf_transmission(vec3 V, float weight, vec3 color0,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3 F = mx_compute_fresnel(NdotV, fd);
 
@@ -1094,15 +1120,15 @@ void mx_generalized_schlick_bsdf_transmission(vec3 V, float weight, vec3 color0,
     float avgAlpha = mx_average_alpha(safeAlpha);
 
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
     if (scatter_mode != 0)
     {
-        float avgF0 = dot(color0, vec3(1.0 / 3.0));
+        float avgF0 = dot(safeColor0, vec3(1.0 / 3.0));
         fd.ior = vec3(mx_f0_to_ior(avgF0));
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, color0) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeColor0) * weight;
     }
 }
 
@@ -1117,20 +1143,22 @@ void mx_generalized_schlick_bsdf_indirect(vec3 V, float weight, vec3 color0, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeColor0 = max(color0, 0.0);
+    vec3 safeColor90 = max(color90, 0.0);
     if (bsdf.thickness > 0.0)
     { 
-        fd = mx_init_fresnel_schlick_airy(color0, color90, exponent, bsdf.thickness, bsdf.ior);
+        fd = mx_init_fresnel_schlick_airy(safeColor0, safeColor90, exponent, bsdf.thickness, bsdf.ior);
     }
     else
     {
-        fd = mx_init_fresnel_schlick(color0, color90, exponent);
+        fd = mx_init_fresnel_schlick(safeColor0, safeColor90, exponent);
     }
     vec3 F = mx_compute_fresnel(NdotV, fd);
 
     vec2 safeAlpha = clamp(roughness, M_FLOAT_EPS, 1.0);
     float avgAlpha = mx_average_alpha(safeAlpha);
     vec3 comp = mx_ggx_energy_compensation(NdotV, avgAlpha, F);
-    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, color0, color90) * comp;
+    vec3 dirAlbedo = mx_ggx_dir_albedo(NdotV, avgAlpha, safeColor0, safeColor90) * comp;
     float avgDirAlbedo = dot(dirAlbedo, vec3(1.0 / 3.0));
     bsdf.throughput = vec3(1.0 - avgDirAlbedo * weight);
 
@@ -1280,6 +1308,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     vec3 Ht = vec3(dot(H, X), dot(H, Y), dot(H, N));
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1298,7 +1327,7 @@ void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, floa
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     // Note: NdotL is cancelled out
-    bsdf.response = D * F * G * comp * tint * occlusion * weight / (4.0 * NdotV);
+    bsdf.response = D * F * G * comp * safeTint * occlusion * weight / (4.0 * NdotV);
 }
 
 void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
@@ -1312,6 +1341,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1332,7 +1362,7 @@ void mx_dielectric_bsdf_transmission(vec3 V, float weight, vec3 tint, float ior,
 
     if (scatter_mode != 0)
     {
-        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, tint) * weight;
+        bsdf.response = mx_surface_transmission(N, V, X, safeAlpha, distribution, fd, safeTint) * weight;
     }
 }
 
@@ -1348,6 +1378,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     float NdotV = clamp(dot(N, V), M_FLOAT_EPS, 1.0);
 
     FresnelData fd;
+    vec3 safeTint = max(tint, 0.0);
     if (bsdf.thickness > 0.0)
     { 
         fd = mx_init_fresnel_dielectric_airy(ior, bsdf.thickness, bsdf.ior);
@@ -1367,7 +1398,7 @@ void mx_dielectric_bsdf_indirect(vec3 V, float weight, vec3 tint, float ior, vec
     bsdf.throughput = 1.0 - dirAlbedo * weight;
 
     vec3 Li = mx_environment_radiance(N, V, X, safeAlpha, distribution, fd);
-    bsdf.response = Li * tint * comp * weight;
+    bsdf.response = Li * safeTint * comp * weight;
 }
 
 
@@ -1472,7 +1503,7 @@ void IMP_UsdPreviewSurface_surfaceshader(vec3 diffuseColor, vec3 emissiveColor,
     float diffuse_bsdf_weight_out = mix(inverse_metalness_out, diffuse_bsdf_weight_fg_tmp, use_specular_workflow_float_out);
     float R_sq_out = R_out * R_out;
     vec3 surface_normal_out = vec3(0.0);
-    mx_normalmap(bias_normal_out, 0, 1.000000, geomprop_Nworld_out1, geomprop_Tworld_out1, surface_normal_out);
+    mx_normalmap_float(bias_normal_out, 0, 1.000000, geomprop_Nworld_out1, geomprop_Tworld_out1, surface_normal_out);
     vec3 coat_F0_out = vec3(R_sq_out, R_sq_out, R_sq_out);
     vec3 specular_color_metallic_R_sq_out = specular_color_metallic_out * R_sq_out;
     vec3 F0_out = mix(specular_color_metallic_R_sq_out, specular_color_metallic_out, metallic);
@@ -1626,7 +1657,7 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
 {
     // Initialize MaterialX Variables
     mxInit(Peye, Neye);
-    vec2 texcoord1_out = vd.texcoord_0;
+    vec2 texcoord1_out = vd.texcoord_0.xy;
     vec2 mult1_out = texcoord1_out * mult1_in2;
     float swizz_x_out = mult1_out.x;
     float swizz_y_out = mult1_out.y;
@@ -1637,12 +1668,7 @@ vec4 surfaceShader(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
     vec3 swizz_xxx_out = vec3(mod1_out, mod1_out, mod1_out);
     surfaceshader surface_shader_node_out = surfaceshader(vec3(0.0),vec3(0.0));
     IMP_UsdPreviewSurface_surfaceshader(swizz_xxx_out, emissiveColor, useSpecularWorkflow, specularColor, metallic, roughness, clearcoat, clearcoatRoughness, opacity, opacityThreshold, ior, normal, displacement, occlusion, surface_shader_node_out);
-    float outAlpha = clamp(1.0 - dot(surface_shader_node_out.transparency, vec3(0.3333)), 0.0, 1.0);
-    vec4 mxOut = vec4(surface_shader_node_out.color, outAlpha);
-    if (outAlpha < u_alphaThreshold)
-    {
-        discard;
-    }
+    vec4 mxOut = vec4(surface_shader_node_out.color, 1.0);
     mxOut = ApplyColorOverrides(mxOut);
     return mxOut;
 }
diff --git a/pxr/imaging/hdSt/testenv/testHdStMeshTopology.cpp b/pxr/imaging/hdSt/testenv/testHdStMeshTopology.cpp
index 15ffa9101f..145488da61 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMeshTopology.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStMeshTopology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/flatNormals.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStMultipleFvarTopologies.cpp b/pxr/imaging/hdSt/testenv/testHdStMultipleFvarTopologies.cpp
index 39f48c285c..e4a35be471 100644
--- a/pxr/imaging/hdSt/testenv/testHdStMultipleFvarTopologies.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStMultipleFvarTopologies.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/unitTestGLDrawing.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStPrimGather.cpp b/pxr/imaging/hdSt/testenv/testHdStPrimGather.cpp
index 588729455c..07f19c85d2 100644
--- a/pxr/imaging/hdSt/testenv/testHdStPrimGather.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStPrimGather.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStPrimitiveParam.cpp b/pxr/imaging/hdSt/testenv/testHdStPrimitiveParam.cpp
index 6989e63624..8534141911 100644
--- a/pxr/imaging/hdSt/testenv/testHdStPrimitiveParam.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStPrimitiveParam.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/meshTopology.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStPrimvars.cpp b/pxr/imaging/hdSt/testenv/testHdStPrimvars.cpp
index 3d12f494e8..9e3fb4c75e 100644
--- a/pxr/imaging/hdSt/testenv/testHdStPrimvars.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStPrimvars.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/renderPass.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStPtex.cpp b/pxr/imaging/hdSt/testenv/testHdStPtex.cpp
index 7b774e7abc..3a7d56c6bb 100644
--- a/pxr/imaging/hdSt/testenv/testHdStPtex.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStPtex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStQuadrangulation.cpp b/pxr/imaging/hdSt/testenv/testHdStQuadrangulation.cpp
index c5ffe66f70..569d7ad69c 100644
--- a/pxr/imaging/hdSt/testenv/testHdStQuadrangulation.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStQuadrangulation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/quadrangulate.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStQualifiers.cpp b/pxr/imaging/hdSt/testenv/testHdStQualifiers.cpp
index 75d83b75bb..088122ec1a 100644
--- a/pxr/imaging/hdSt/testenv/testHdStQualifiers.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStQualifiers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/codeGen.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStQualifiers/testQualifiers.glslfx b/pxr/imaging/hdSt/testenv/testHdStQualifiers/testQualifiers.glslfx
index 30eefcf64f..bbdf0c2901 100644
--- a/pxr/imaging/hdSt/testenv/testHdStQualifiers/testQualifiers.glslfx
+++ b/pxr/imaging/hdSt/testenv/testHdStQualifiers/testQualifiers.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdSt/testenv/testHdStRenderPass.cpp b/pxr/imaging/hdSt/testenv/testHdStRenderPass.cpp
index 67aa766167..b5fe4863a4 100644
--- a/pxr/imaging/hdSt/testenv/testHdStRenderPass.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStRenderPass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/dirtyList.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStSamplerObjectRegistry.cpp b/pxr/imaging/hdSt/testenv/testHdStSamplerObjectRegistry.cpp
index 7d1c386178..4386fe78d5 100644
--- a/pxr/imaging/hdSt/testenv/testHdStSamplerObjectRegistry.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStSamplerObjectRegistry.cpp
@@ -1,25 +1,8 @@
 //
-// Copyrighty 2020 Pixar
+// Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
@@ -123,7 +106,7 @@ My_TestGLDrawing::OffscreenTest()
     HdStTextureObjectSharedPtr const texture =
         _textureRegistry->AllocateTextureObject(
             HdStTextureIdentifier(TfToken("texture.png")),
-            HdTextureType::Uv);
+            HdStTextureType::Uv);
 
     // Call Commit on both registries to ensure that the shared HgiBlitCmds
     // is submitted in the resource registry.
@@ -200,7 +183,7 @@ My_TestGLDrawing::OffscreenTest()
     HdStTextureObjectSharedPtr const hiResTexture =
         _textureRegistry->AllocateTextureObject(
             HdStTextureIdentifier(TfToken("hiResTexture.png")),
-            HdTextureType::Uv);
+            HdStTextureType::Uv);
 
     // Call Commit on both registries to ensure that the shared HgiBlitCmds
     // is submitted in the resource registry.
diff --git a/pxr/imaging/hdSt/testenv/testHdStShaders.cpp b/pxr/imaging/hdSt/testenv/testHdStShaders.cpp
index 75ee5720e6..7245947d55 100644
--- a/pxr/imaging/hdSt/testenv/testHdStShaders.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStShaders.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/material.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStSubResourceRegistry.cpp b/pxr/imaging/hdSt/testenv/testHdStSubResourceRegistry.cpp
index da5b2a4299..6f745b3579 100644
--- a/pxr/imaging/hdSt/testenv/testHdStSubResourceRegistry.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStSubResourceRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glDebugWindow.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStSubdivision.cpp b/pxr/imaging/hdSt/testenv/testHdStSubdivision.cpp
index bb789ae450..52c3b2c0e3 100644
--- a/pxr/imaging/hdSt/testenv/testHdStSubdivision.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStSubdivision.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/subdivision.h"
diff --git a/pxr/imaging/hdSt/testenv/testHdStTextureHandleRegistry.cpp b/pxr/imaging/hdSt/testenv/testHdStTextureHandleRegistry.cpp
index 6b855daf32..1cf09a6c4e 100644
--- a/pxr/imaging/hdSt/testenv/testHdStTextureHandleRegistry.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStTextureHandleRegistry.cpp
@@ -1,25 +1,8 @@
 //
-// Copyrighty 2020 Pixar
+// Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
@@ -129,7 +112,7 @@ My_TestGLDrawing::OffscreenTest()
         HdStTextureHandleSharedPtr const textureHandle =
             _textureHandleRegistry->AllocateTextureHandle(
                 HdStTextureIdentifier(TfToken("texture.png")),
-                HdTextureType::Uv,
+                HdStTextureType::Uv,
                 HdSamplerParameters(
                     HdWrapRepeat,
                     HdWrapMirror,
@@ -185,7 +168,7 @@ My_TestGLDrawing::OffscreenTest()
         HdStTextureHandleSharedPtr const textureHandle1 =
             _textureHandleRegistry->AllocateTextureHandle(
                 HdStTextureIdentifier(TfToken("texture.png")),
-                HdTextureType::Uv,
+                HdStTextureType::Uv,
                 HdSamplerParameters(
                     HdWrapRepeat,
                     HdWrapMirror,
@@ -235,7 +218,7 @@ My_TestGLDrawing::OffscreenTest()
             HdStTextureHandleSharedPtr const textureHandle2 =
                 _textureHandleRegistry->AllocateTextureHandle(
                     HdStTextureIdentifier(TfToken("texture.png")),
-                    HdTextureType::Uv,
+                    HdStTextureType::Uv,
                     HdSamplerParameters(
                         HdWrapRepeat,
                         HdWrapRepeat,
@@ -331,7 +314,7 @@ My_TestGLDrawing::OffscreenTest()
         HdStTextureHandleSharedPtr const textureHandle =
             _textureHandleRegistry->AllocateTextureHandle(
                 HdStTextureIdentifier(TfToken("reloadingTexture.png")),
-                HdTextureType::Uv,
+                HdStTextureType::Uv,
                 HdSamplerParameters(
                     HdWrapRepeat,
                     HdWrapMirror,
@@ -438,7 +421,7 @@ My_TestGLDrawing::OffscreenTest()
         HdStTextureHandleSharedPtr const textureHandle =
             _textureHandleRegistry->AllocateTextureHandle(
                 HdStTextureIdentifier(TfToken("texture.png")),
-                HdTextureType::Uv,
+                HdStTextureType::Uv,
                 HdSamplerParameters(
                     HdWrapRepeat,
                     HdWrapMirror,
@@ -449,7 +432,7 @@ My_TestGLDrawing::OffscreenTest()
                 shader);
 
         _textureHandleRegistry->SetMemoryRequestForTextureType(
-            HdTextureType::Uv, 3000);
+            HdStTextureType::Uv, 3000);
 
         _CheckEqual(_textureHandleRegistry->Commit(), {shader},
                     "Exepected shader from commit with low global "
@@ -478,7 +461,7 @@ My_TestGLDrawing::OffscreenTest()
         }
         
         _textureHandleRegistry->SetMemoryRequestForTextureType(
-            HdTextureType::Uv, 15000);
+            HdStTextureType::Uv, 15000);
 
         _CheckEqual(_textureHandleRegistry->Commit(), {shader},
                     "Exepected shader from commit with high global "
diff --git a/pxr/imaging/hdSt/testenv/testHdStTextureObjectRegistry.cpp b/pxr/imaging/hdSt/testenv/testHdStTextureObjectRegistry.cpp
index 631e5374f4..0913ebe992 100644
--- a/pxr/imaging/hdSt/testenv/testHdStTextureObjectRegistry.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStTextureObjectRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
@@ -134,7 +117,7 @@ My_TestGLDrawing::OffscreenTest()
         HdStTextureObjectSharedPtr const texture1 =
             _registry->AllocateTextureObject(
                 HdStTextureIdentifier(TfToken("texture1.png")),
-                HdTextureType::Uv);
+                HdStTextureType::Uv);
 
         // Check that texture gets committed
         _CheckEqual(
@@ -188,7 +171,7 @@ My_TestGLDrawing::OffscreenTest()
         _CheckEqual(
             _registry->AllocateTextureObject(
                 HdStTextureIdentifier(TfToken("texture1.png")),
-                HdTextureType::Uv),
+                HdStTextureType::Uv),
             texture1,
             "Texture was not de-duplicated");
 
@@ -213,7 +196,7 @@ My_TestGLDrawing::OffscreenTest()
         HdStTextureObjectSharedPtr const texture1 =
             _registry->AllocateTextureObject(
                 HdStTextureIdentifier(TfToken("texture1.png")),
-                HdTextureType::Uv);
+                HdStTextureType::Uv);
 
         // Texture 1 has to be committed again since it was garbage
         // collected. Target memory should be reset.
@@ -237,7 +220,7 @@ My_TestGLDrawing::OffscreenTest()
         HdStTextureObjectSharedPtr const texture2 =
             _registry->AllocateTextureObject(
                 HdStTextureIdentifier(TfToken("texture2.png")),
-                HdTextureType::Uv);
+                HdStTextureType::Uv);
         
         _CheckEqual(
             _registry->Commit(), { texture2 },
@@ -265,7 +248,7 @@ My_TestGLDrawing::OffscreenTest()
         HdStTextureObjectSharedPtr const texture =
             _registry->AllocateTextureObject(
                 HdStTextureIdentifier(TfToken("grayscaleTexture.png")),
-                HdTextureType::Uv);
+                HdStTextureType::Uv);
         
         _CheckEqual(
             _registry->Commit(), { texture },
diff --git a/pxr/imaging/hdSt/testenv/testHdStTransition.cpp b/pxr/imaging/hdSt/testenv/testHdStTransition.cpp
index b71c9d47da..6ef42546d4 100644
--- a/pxr/imaging/hdSt/testenv/testHdStTransition.cpp
+++ b/pxr/imaging/hdSt/testenv/testHdStTransition.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/tokens.h"
diff --git a/pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.cpp b/pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.cpp
index 66f58c2671..d72939fb52 100644
--- a/pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.cpp
+++ b/pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.h"
 
diff --git a/pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.h b/pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.h
index 24611f9f29..cb5530bd61 100644
--- a/pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.h
+++ b/pxr/imaging/hdSt/tetMeshConversionSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_HD_ST_TET_MESH_CONVERSION_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HD_ST_TET_MESH_CONVERSION_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/hdSt/textureBinder.cpp b/pxr/imaging/hdSt/textureBinder.cpp
index 8fea97ce36..4093841dda 100644
--- a/pxr/imaging/hdSt/textureBinder.cpp
+++ b/pxr/imaging/hdSt/textureBinder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/textureBinder.h"
 #include "pxr/imaging/hdSt/ptexTextureObject.h"
@@ -53,7 +36,7 @@ HdSt_TextureBinder::GetBufferSpecs(
 
     for (const NamedTextureHandle & texture : textures) {
         switch (texture.type) {
-        case HdTextureType::Uv:
+        case HdStTextureType::Uv:
             if (useBindlessHandles) {
                 specs->emplace_back(
                     texture.name,
@@ -65,7 +48,7 @@ HdSt_TextureBinder::GetBufferSpecs(
                     HdSt_ResourceBindingSuffixTokens->valid),
                 HdTupleType{HdTypeBool, 1});
             break;
-        case HdTextureType::Field:
+        case HdStTextureType::Field:
             if (useBindlessHandles) {
                 specs->emplace_back(
                     texture.name,
@@ -83,7 +66,7 @@ HdSt_TextureBinder::GetBufferSpecs(
                 HdTupleType{ (doublesSupported ?
                     HdTypeDoubleMat4 : HdTypeFloatMat4), 1});
             break;
-        case HdTextureType::Ptex:
+        case HdStTextureType::Ptex:
             if (useBindlessHandles) {
                 specs->emplace_back(
                     texture.name,
@@ -100,7 +83,7 @@ HdSt_TextureBinder::GetBufferSpecs(
                     HdSt_ResourceBindingSuffixTokens->valid),
                 HdTupleType{HdTypeBool, 1});
             break;
-        case HdTextureType::Udim:
+        case HdStTextureType::Udim:
             if (useBindlessHandles) {
                 specs->emplace_back(
                     texture.name,
@@ -330,6 +313,7 @@ class _BindFunctor {
             name,
             sampler.GetTexelsSampler(),
             texture.GetTexelTexture(),
+            sampler.GetLayoutSampler(),
             texture.GetLayoutTexture(),
             bind);
     }
@@ -345,6 +329,7 @@ class _BindFunctor {
             name,
             sampler.GetTexelsSampler(),
             texture.GetTexelTexture(),
+            sampler.GetLayoutSampler(),
             texture.GetLayoutTexture(),
             bind);
     }
@@ -413,7 +398,7 @@ class _BindingDescsFunctor {
     }
 };
 
-template<HdTextureType textureType, class Functor, typename ...Args>
+template<HdStTextureType textureType, class Functor, typename ...Args>
 void _CastAndCompute(
     HdStShaderCode::NamedTextureHandle const &namedTextureHandle,
     Args&& ...args)
@@ -454,20 +439,20 @@ void _Dispatch(
     Args&& ...args)
 {
     switch (namedTextureHandle.type) {
-    case HdTextureType::Uv:
-        _CastAndCompute<HdTextureType::Uv, Functor>(
+    case HdStTextureType::Uv:
+        _CastAndCompute<HdStTextureType::Uv, Functor>(
             namedTextureHandle, std::forward<Args>(args)...);
         break;
-    case HdTextureType::Field:
-        _CastAndCompute<HdTextureType::Field, Functor>(
+    case HdStTextureType::Field:
+        _CastAndCompute<HdStTextureType::Field, Functor>(
             namedTextureHandle, std::forward<Args>(args)...);
         break;
-    case HdTextureType::Ptex:
-        _CastAndCompute<HdTextureType::Ptex, Functor>(
+    case HdStTextureType::Ptex:
+        _CastAndCompute<HdStTextureType::Ptex, Functor>(
             namedTextureHandle, std::forward<Args>(args)...);
         break;
-    case HdTextureType::Udim:
-        _CastAndCompute<HdTextureType::Udim, Functor>(
+    case HdStTextureType::Udim:
+        _CastAndCompute<HdStTextureType::Udim, Functor>(
             namedTextureHandle, std::forward<Args>(args)...);
         break;
     }
diff --git a/pxr/imaging/hdSt/textureBinder.h b/pxr/imaging/hdSt/textureBinder.h
index 00a8d06468..62e8755e26 100644
--- a/pxr/imaging/hdSt/textureBinder.h
+++ b/pxr/imaging/hdSt/textureBinder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TEXTURE_BINDER_H
 #define PXR_IMAGING_HD_ST_TEXTURE_BINDER_H
diff --git a/pxr/imaging/hdSt/textureCpuData.cpp b/pxr/imaging/hdSt/textureCpuData.cpp
index 3fb7504b3c..a38ba3f409 100644
--- a/pxr/imaging/hdSt/textureCpuData.cpp
+++ b/pxr/imaging/hdSt/textureCpuData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/imaging/hdSt/textureCpuData.h b/pxr/imaging/hdSt/textureCpuData.h
index 0ec82717a4..e470a26d88 100644
--- a/pxr/imaging/hdSt/textureCpuData.h
+++ b/pxr/imaging/hdSt/textureCpuData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TEXTURE_CPU_DATA_H
 #define PXR_IMAGING_HD_ST_TEXTURE_CPU_DATA_H
diff --git a/pxr/imaging/hdSt/textureHandle.cpp b/pxr/imaging/hdSt/textureHandle.cpp
index 481fe5696a..103942dd66 100644
--- a/pxr/imaging/hdSt/textureHandle.cpp
+++ b/pxr/imaging/hdSt/textureHandle.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/textureHandle.h"
 
diff --git a/pxr/imaging/hdSt/textureHandle.h b/pxr/imaging/hdSt/textureHandle.h
index 8338a5d820..3dede39a79 100644
--- a/pxr/imaging/hdSt/textureHandle.h
+++ b/pxr/imaging/hdSt/textureHandle.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HD_ST_TEXTURE_HANDLE_H
 #define HD_ST_TEXTURE_HANDLE_H
diff --git a/pxr/imaging/hdSt/textureHandleRegistry.cpp b/pxr/imaging/hdSt/textureHandleRegistry.cpp
index bf72186058..4cdabb56b2 100644
--- a/pxr/imaging/hdSt/textureHandleRegistry.cpp
+++ b/pxr/imaging/hdSt/textureHandleRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/textureHandleRegistry.h"
@@ -161,7 +144,7 @@ HdSt_TextureHandleRegistry::~HdSt_TextureHandleRegistry() = default;
 HdStTextureHandleSharedPtr
 HdSt_TextureHandleRegistry::AllocateTextureHandle(
         HdStTextureIdentifier const &textureId,
-        HdTextureType textureType,
+        HdStTextureType textureType,
         HdSamplerParameters const &samplerParams,
         size_t memoryRequest,
         HdStShaderCodePtr const &shaderCode)
@@ -424,7 +407,7 @@ HdSt_TextureHandleRegistry::Commit()
 
 void
 HdSt_TextureHandleRegistry::SetMemoryRequestForTextureType(
-    const HdTextureType textureType, const size_t memoryRequest)
+    const HdStTextureType textureType, const size_t memoryRequest)
 {
     size_t &val = _textureTypeToMemoryRequest[textureType];
     if (val != memoryRequest) {
diff --git a/pxr/imaging/hdSt/textureHandleRegistry.h b/pxr/imaging/hdSt/textureHandleRegistry.h
index 134785207e..8c2bb3f87f 100644
--- a/pxr/imaging/hdSt/textureHandleRegistry.h
+++ b/pxr/imaging/hdSt/textureHandleRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TEXTURE_HANDLE_REGISTRY_H
 #define PXR_IMAGING_HD_ST_TEXTURE_HANDLE_REGISTRY_H
@@ -85,7 +68,7 @@ class HdSt_TextureHandleRegistry final
     HDST_API
     HdStTextureHandleSharedPtr AllocateTextureHandle(
         const HdStTextureIdentifier &textureId,
-        HdTextureType textureType,
+        HdStTextureType textureType,
         const HdSamplerParameters &samplerParams,
         /// memoryRequest in bytes.
         size_t memoryRequest,
@@ -144,7 +127,7 @@ class HdSt_TextureHandleRegistry final
     /// request.
     ///
     HDST_API
-    void SetMemoryRequestForTextureType(HdTextureType textureType, size_t memoryRequest);
+    void SetMemoryRequestForTextureType(HdStTextureType textureType, size_t memoryRequest);
 
     HDST_API
     size_t GetNumberOfTextureHandles() const;
@@ -164,7 +147,7 @@ class HdSt_TextureHandleRegistry final
     // (in bytes).
     // Will be taken into account when computing the maximum of all the
     // memory requests of the texture handles.
-    std::map<HdTextureType, size_t> _textureTypeToMemoryRequest;
+    std::map<HdStTextureType, size_t> _textureTypeToMemoryRequest;
     // Has _textureTypeToMemoryRequest changed since the last commit.
     bool _textureTypeToMemoryRequestChanged;
 
diff --git a/pxr/imaging/hdSt/textureIdentifier.cpp b/pxr/imaging/hdSt/textureIdentifier.cpp
index f179be4eff..7e962ba3fb 100644
--- a/pxr/imaging/hdSt/textureIdentifier.cpp
+++ b/pxr/imaging/hdSt/textureIdentifier.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/textureIdentifier.h"
 
diff --git a/pxr/imaging/hdSt/textureIdentifier.h b/pxr/imaging/hdSt/textureIdentifier.h
index 2e3be1acf0..c3e7065e6e 100644
--- a/pxr/imaging/hdSt/textureIdentifier.h
+++ b/pxr/imaging/hdSt/textureIdentifier.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TEXTURE_IDENTIFIER_H
 #define PXR_IMAGING_HD_ST_TEXTURE_IDENTIFIER_H
diff --git a/pxr/imaging/hdSt/textureObject.cpp b/pxr/imaging/hdSt/textureObject.cpp
index 2f0f360774..4a29c2c88c 100644
--- a/pxr/imaging/hdSt/textureObject.cpp
+++ b/pxr/imaging/hdSt/textureObject.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/textureObject.h"
@@ -199,19 +182,19 @@ HdStTextureObject::_GetPremultiplyAlpha(
         const HdStSubtextureIdentifier * const subId) const
 {
     switch(GetTextureType()) {
-    case HdTextureType::Uv:
+    case HdStTextureType::Uv:
         if (const HdStAssetUvSubtextureIdentifier* const uvSubId =
             dynamic_cast<const HdStAssetUvSubtextureIdentifier *>(subId)) {
             return uvSubId->GetPremultiplyAlpha();
         }
         return false;
-    case HdTextureType::Ptex:
+    case HdStTextureType::Ptex:
         if (const HdStPtexSubtextureIdentifier* const ptexSubId =
             dynamic_cast<const HdStPtexSubtextureIdentifier *>(subId)) {
         return ptexSubId->GetPremultiplyAlpha();
         }
         return false;
-    case HdTextureType::Udim:
+    case HdStTextureType::Udim:
         if (const HdStUdimSubtextureIdentifier* const udimSubId =
                 dynamic_cast<const HdStUdimSubtextureIdentifier *>(subId)) {
             return udimSubId->GetPremultiplyAlpha();
@@ -230,13 +213,13 @@ HdStTextureObject::_GetSourceColorSpace(
 {
     TfToken sourceColorSpace;
     switch(GetTextureType()) {
-    case HdTextureType::Uv:
+    case HdStTextureType::Uv:
         if (const HdStAssetUvSubtextureIdentifier* const uvSubId =
             dynamic_cast<const HdStAssetUvSubtextureIdentifier *>(subId)) {
             sourceColorSpace = uvSubId->GetSourceColorSpace();
         }
         break;
-    case HdTextureType::Udim:
+    case HdStTextureType::Udim:
         if (const HdStUdimSubtextureIdentifier* const udimSubId =
                 dynamic_cast<const HdStUdimSubtextureIdentifier *>(subId)) {
             sourceColorSpace = udimSubId->GetSourceColorSpace();
@@ -267,10 +250,10 @@ HdStUvTextureObject::HdStUvTextureObject(
 }
 
 
-HdTextureType
+HdStTextureType
 HdStUvTextureObject::GetTextureType() const
 {
-    return HdTextureType::Uv;
+    return HdStTextureType::Uv;
 }
 
 HdStUvTextureObject::~HdStUvTextureObject()
@@ -605,10 +588,10 @@ HdStFieldTextureObject::IsValid() const
     return _valid;
 }
 
-HdTextureType
+HdStTextureType
 HdStFieldTextureObject::GetTextureType() const
 {
-    return HdTextureType::Field;
+    return HdStTextureType::Field;
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdSt/textureObject.h b/pxr/imaging/hdSt/textureObject.h
index 9bf2d7c0be..f6a6e1ed37 100644
--- a/pxr/imaging/hdSt/textureObject.h
+++ b/pxr/imaging/hdSt/textureObject.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TEXTURE_OBJECT_H
 #define PXR_IMAGING_HD_ST_TEXTURE_OBJECT_H
@@ -28,7 +11,7 @@
 #include "pxr/imaging/hdSt/api.h"
 
 #include "pxr/imaging/hdSt/textureIdentifier.h"
-#include "pxr/imaging/hd/enums.h"
+#include "pxr/imaging/hdSt/enums.h"
 #include "pxr/imaging/hd/types.h"
 
 #include "pxr/imaging/hgi/handle.h"
@@ -87,7 +70,7 @@ class HdStTextureObject :
     /// Get texture type
     ///
     HDST_API
-    virtual HdTextureType GetTextureType() const = 0;
+    virtual HdStTextureType GetTextureType() const = 0;
 
     HDST_API
     virtual ~HdStTextureObject();
@@ -173,7 +156,7 @@ class HdStUvTextureObject : public HdStTextureObject
     }
 
     HDST_API
-    HdTextureType GetTextureType() const override final;
+    HdStTextureType GetTextureType() const override final;
 
 protected:
     HdStUvTextureObject(
@@ -266,7 +249,7 @@ class HdStFieldTextureObject final : public HdStTextureObject
     bool IsValid() const override;
 
     HDST_API
-    HdTextureType GetTextureType() const override;
+    HdStTextureType GetTextureType() const override;
 
 protected:
     HDST_API
@@ -283,25 +266,25 @@ class HdStFieldTextureObject final : public HdStTextureObject
     bool _valid;
 };
 
-template<HdTextureType textureType>
+template<HdStTextureType textureType>
 struct HdSt_TypedTextureObjectHelper;
 
 /// \class HdStTypedTextureObject
 ///
 /// A template alias such that, e.g., HdStUvTextureObject can be
-/// accessed as HdStTypedTextureObject<HdTextureType::Uv>.
+/// accessed as HdStTypedTextureObject<HdStTextureType::Uv>.
 ///
-template<HdTextureType textureType>
+template<HdStTextureType textureType>
 using HdStTypedTextureObject =
     typename HdSt_TypedTextureObjectHelper<textureType>::type;
 
 template<>
-struct HdSt_TypedTextureObjectHelper<HdTextureType::Uv> {
+struct HdSt_TypedTextureObjectHelper<HdStTextureType::Uv> {
     using type = HdStUvTextureObject;
 };
 
 template<>
-struct HdSt_TypedTextureObjectHelper<HdTextureType::Field> {
+struct HdSt_TypedTextureObjectHelper<HdStTextureType::Field> {
     using type = HdStFieldTextureObject;
 };
 
diff --git a/pxr/imaging/hdSt/textureObjectRegistry.cpp b/pxr/imaging/hdSt/textureObjectRegistry.cpp
index 9530054878..a157f2370f 100644
--- a/pxr/imaging/hdSt/textureObjectRegistry.cpp
+++ b/pxr/imaging/hdSt/textureObjectRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/textureObjectRegistry.h"
@@ -59,10 +42,10 @@ _IsDynamic(const HdStTextureIdentifier &textureId)
 HdStTextureObjectSharedPtr
 HdSt_TextureObjectRegistry::_MakeTextureObject(
     const HdStTextureIdentifier &textureId,
-    const HdTextureType textureType)
+    const HdStTextureType textureType)
 {
     switch(textureType) {
-    case HdTextureType::Uv:
+    case HdStTextureType::Uv:
         if (_IsDynamic(textureId)) {
             return
                 std::make_shared<HdStDynamicUvTextureObject>(textureId, this);
@@ -70,11 +53,11 @@ HdSt_TextureObjectRegistry::_MakeTextureObject(
             return
                 std::make_shared<HdStAssetUvTextureObject>(textureId, this);
         }
-    case HdTextureType::Field:
+    case HdStTextureType::Field:
         return std::make_shared<HdStFieldTextureObject>(textureId, this);
-    case HdTextureType::Ptex:
+    case HdStTextureType::Ptex:
         return std::make_shared<HdStPtexTextureObject>(textureId, this);
-    case HdTextureType::Udim:
+    case HdStTextureType::Udim:
         return std::make_shared<HdStUdimTextureObject>(textureId, this);
     }
 
@@ -86,7 +69,7 @@ HdSt_TextureObjectRegistry::_MakeTextureObject(
 HdStTextureObjectSharedPtr
 HdSt_TextureObjectRegistry::AllocateTextureObject(
     const HdStTextureIdentifier &textureId,
-    const HdTextureType textureType)
+    const HdStTextureType textureType)
 {
     // Check with instance registry and allocate texture and sampler object
     // if first object.
diff --git a/pxr/imaging/hdSt/textureObjectRegistry.h b/pxr/imaging/hdSt/textureObjectRegistry.h
index 1901e3543a..e51949f3a8 100644
--- a/pxr/imaging/hdSt/textureObjectRegistry.h
+++ b/pxr/imaging/hdSt/textureObjectRegistry.h
@@ -1,32 +1,15 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TEXTURE_OBJECT_REGISTRY_H
 #define PXR_IMAGING_HD_ST_TEXTURE_OBJECT_REGISTRY_H
 
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/api.h"
-#include "pxr/imaging/hd/enums.h"
+#include "pxr/imaging/hdSt/enums.h"
 #include "pxr/imaging/hd/instanceRegistry.h"
 
 #include <tbb/concurrent_vector.h>
@@ -63,7 +46,7 @@ class HdSt_TextureObjectRegistry final
     HDST_API
     HdStTextureObjectSharedPtr AllocateTextureObject(
         const HdStTextureIdentifier &textureId,
-        HdTextureType textureType);
+        HdStTextureType textureType);
 
     /// Create GPU texture objects, load textures from files and
     /// upload to GPU.
@@ -116,7 +99,7 @@ class HdSt_TextureObjectRegistry final
 private:
     HdStTextureObjectSharedPtr _MakeTextureObject(
         const HdStTextureIdentifier &textureId,
-        HdTextureType textureType);
+        HdStTextureType textureType);
 
     std::atomic<int64_t> _totalTextureMemory;
 
diff --git a/pxr/imaging/hdSt/textureUtils.cpp b/pxr/imaging/hdSt/textureUtils.cpp
index fc8c5ea875..2eafcdb180 100644
--- a/pxr/imaging/hdSt/textureUtils.cpp
+++ b/pxr/imaging/hdSt/textureUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdSt/textureUtils.h"
@@ -45,6 +28,26 @@ _OpaqueAlpha() {
         std::numeric_limits<T>::max() : T(1);
 }
 
+template<typename T>
+void
+_ConvertRToRGBA(
+    const void * const src,
+    const size_t numTexels,
+    void * const dst)
+{
+    TRACE_FUNCTION();
+
+    const T * const typedSrc = reinterpret_cast<const T*>(src);
+    T * const typedDst = reinterpret_cast<T*>(dst);
+
+    for (size_t i = 0; i < numTexels; i++) {
+        typedDst[4 * i + 0] = typedSrc[1 * i + 0];
+        typedDst[4 * i + 1] = typedSrc[1 * i + 0];
+        typedDst[4 * i + 2] = typedSrc[1 * i + 0];
+        typedDst[4 * i + 3] = _OpaqueAlpha<T>();
+    }
+}
+
 template<typename T>
 void
 _ConvertRGToRGBA(
@@ -212,7 +215,7 @@ _GetHgiFormatAndConversion(
         case HioFormatSNorm8:
             return { HgiFormatSNorm8, nullptr };
         case HioFormatSNorm8Vec2:
-            return { HgiFormatSNorm8Vec2, nullptr };
+            return { HgiFormatSNorm8Vec4, _ConvertRGToRGBA<signed char> };
         case HioFormatSNorm8Vec3:
             return { HgiFormatSNorm8Vec4, _ConvertRGBToRGBA<signed char> };
         case HioFormatSNorm8Vec4:
@@ -339,10 +342,11 @@ _GetHgiFormatAndConversion(
                     
         // UNorm8 SRGB
         case HioFormatUNorm8srgb:
+            // 1-channel gamma-encoded is not supported, so we need to convert.
+            return { HgiFormatUNorm8Vec4srgb, _ConvertRToRGBA<unsigned char> };
         case HioFormatUNorm8Vec2srgb:
-            TF_WARN("One and two channel srgb texture formats "
-                    "not supported by Storm");
-            return { HgiFormatInvalid, nullptr };
+            // 2-channel gamma-encoded is not supported, so we need to convert.
+            return { HgiFormatUNorm8Vec4srgb, _ConvertRGToRGBA<unsigned char> };
         case HioFormatUNorm8Vec3srgb:
             // RGB (24bit) is not supported on MTL, so we need to convert it.
             return { HgiFormatUNorm8Vec4srgb, _ConvertRGBToRGBA<unsigned char> };
diff --git a/pxr/imaging/hdSt/textureUtils.h b/pxr/imaging/hdSt/textureUtils.h
index 78f0f8d33e..07c6ad2ea2 100644
--- a/pxr/imaging/hdSt/textureUtils.h
+++ b/pxr/imaging/hdSt/textureUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TEXTURE_UTILS_H
 #define PXR_IMAGING_HD_ST_TEXTURE_UTILS_H
diff --git a/pxr/imaging/hdSt/tokens.cpp b/pxr/imaging/hdSt/tokens.cpp
index ddf5623d62..b324bfe429 100644
--- a/pxr/imaging/hdSt/tokens.cpp
+++ b/pxr/imaging/hdSt/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/tokens.h"
 
diff --git a/pxr/imaging/hdSt/tokens.h b/pxr/imaging/hdSt/tokens.h
index b5323a6f5a..8ac07a6e79 100644
--- a/pxr/imaging/hdSt/tokens.h
+++ b/pxr/imaging/hdSt/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TOKENS_H
 #define PXR_IMAGING_HD_ST_TOKENS_H
diff --git a/pxr/imaging/hdSt/triangulate.cpp b/pxr/imaging/hdSt/triangulate.cpp
index e5390ce0d4..6b851f1ee4 100644
--- a/pxr/imaging/hdSt/triangulate.cpp
+++ b/pxr/imaging/hdSt/triangulate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdSt/triangulate.h b/pxr/imaging/hdSt/triangulate.h
index d92699191f..f7e9944aa2 100644
--- a/pxr/imaging/hdSt/triangulate.h
+++ b/pxr/imaging/hdSt/triangulate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_TRIANGULATE_H
 #define PXR_IMAGING_HD_ST_TRIANGULATE_H
diff --git a/pxr/imaging/hdSt/udimTextureObject.cpp b/pxr/imaging/hdSt/udimTextureObject.cpp
index c7aafe463d..59506a7526 100644
--- a/pxr/imaging/hdSt/udimTextureObject.cpp
+++ b/pxr/imaging/hdSt/udimTextureObject.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/udimTextureObject.h"
 
@@ -327,10 +310,10 @@ HdStUdimTextureObject::IsValid() const
     return _hgiFormat != HgiFormatInvalid;
 }
 
-HdTextureType
+HdStTextureType
 HdStUdimTextureObject::GetTextureType() const
 {
-    return HdTextureType::Udim;
+    return HdStTextureType::Udim;
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdSt/udimTextureObject.h b/pxr/imaging/hdSt/udimTextureObject.h
index e3928b97f1..c9d1f561e3 100644
--- a/pxr/imaging/hdSt/udimTextureObject.h
+++ b/pxr/imaging/hdSt/udimTextureObject.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_UDIM_TEXTURE_OBJECT_H
 #define PXR_IMAGING_HD_ST_UDIM_TEXTURE_OBJECT_H
@@ -78,7 +61,7 @@ class HdStUdimTextureObject final : public HdStTextureObject
     bool IsValid() const override;
 
     HDST_API
-    HdTextureType GetTextureType() const override;
+    HdStTextureType GetTextureType() const override;
 
 protected:
     HDST_API
@@ -103,7 +86,7 @@ class HdStUdimTextureObject final : public HdStTextureObject
 };
 
 template<>
-struct HdSt_TypedTextureObjectHelper<HdTextureType::Udim> {
+struct HdSt_TypedTextureObjectHelper<HdStTextureType::Udim> {
     using type = HdStUdimTextureObject;
 };
 
diff --git a/pxr/imaging/hdSt/unitTestGLDrawing.cpp b/pxr/imaging/hdSt/unitTestGLDrawing.cpp
index 087599c55a..e885a5d36d 100644
--- a/pxr/imaging/hdSt/unitTestGLDrawing.cpp
+++ b/pxr/imaging/hdSt/unitTestGLDrawing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glApi.h"
diff --git a/pxr/imaging/hdSt/unitTestGLDrawing.h b/pxr/imaging/hdSt/unitTestGLDrawing.h
index d3a9600343..ead5650c3a 100644
--- a/pxr/imaging/hdSt/unitTestGLDrawing.h
+++ b/pxr/imaging/hdSt/unitTestGLDrawing.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_UNIT_TEST_GLDRAWING_H
 #define PXR_IMAGING_HD_ST_UNIT_TEST_GLDRAWING_H
diff --git a/pxr/imaging/hdSt/unitTestHelper.cpp b/pxr/imaging/hdSt/unitTestHelper.cpp
index b498507003..82dc239fd3 100644
--- a/pxr/imaging/hdSt/unitTestHelper.cpp
+++ b/pxr/imaging/hdSt/unitTestHelper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/unitTestHelper.h"
 #include "pxr/imaging/hdSt/resourceBinder.h"
diff --git a/pxr/imaging/hdSt/unitTestHelper.h b/pxr/imaging/hdSt/unitTestHelper.h
index 69003462b9..5b8d44c6cb 100644
--- a/pxr/imaging/hdSt/unitTestHelper.h
+++ b/pxr/imaging/hdSt/unitTestHelper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_UNIT_TEST_HELPER_H
 #define PXR_IMAGING_HD_ST_UNIT_TEST_HELPER_H
diff --git a/pxr/imaging/hdSt/vboMemoryManager.cpp b/pxr/imaging/hdSt/vboMemoryManager.cpp
index 7a5e09923f..41a2f0fa62 100644
--- a/pxr/imaging/hdSt/vboMemoryManager.cpp
+++ b/pxr/imaging/hdSt/vboMemoryManager.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/vboMemoryManager.h"
 
diff --git a/pxr/imaging/hdSt/vboMemoryManager.h b/pxr/imaging/hdSt/vboMemoryManager.h
index 0b9a8aad9f..b8fcda15de 100644
--- a/pxr/imaging/hdSt/vboMemoryManager.h
+++ b/pxr/imaging/hdSt/vboMemoryManager.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_VBO_MEMORY_MANAGER_H
 #define PXR_IMAGING_HD_ST_VBO_MEMORY_MANAGER_H
diff --git a/pxr/imaging/hdSt/vboSimpleMemoryManager.cpp b/pxr/imaging/hdSt/vboSimpleMemoryManager.cpp
index 472df50ff8..40a2f1fe8a 100644
--- a/pxr/imaging/hdSt/vboSimpleMemoryManager.cpp
+++ b/pxr/imaging/hdSt/vboSimpleMemoryManager.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/envSetting.h"
diff --git a/pxr/imaging/hdSt/vboSimpleMemoryManager.h b/pxr/imaging/hdSt/vboSimpleMemoryManager.h
index 62e6df28a9..1e306424f1 100644
--- a/pxr/imaging/hdSt/vboSimpleMemoryManager.h
+++ b/pxr/imaging/hdSt/vboSimpleMemoryManager.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_VBO_SIMPLE_MEMORY_MANAGER_H
 #define PXR_IMAGING_HD_ST_VBO_SIMPLE_MEMORY_MANAGER_H
diff --git a/pxr/imaging/hdSt/velocityMotionResolvingSceneIndexPlugin.cpp b/pxr/imaging/hdSt/velocityMotionResolvingSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..d14d70ab7b
--- /dev/null
+++ b/pxr/imaging/hdSt/velocityMotionResolvingSceneIndexPlugin.cpp
@@ -0,0 +1,81 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the Apache License, Version 2.0 (the "Apache License")
+// with the following modification; you may not use this file except in
+// compliance with the Apache License and the following modification to it:
+// Section 6. Trademarks. is deleted and replaced with:
+//
+// 6. Trademarks. This License does not grant permission to use the trade
+//    names, trademarks, service marks, or product names of the Licensor
+//    and its affiliates, except as required to comply with Section 4(c) of
+//    the License and to reproduce the content of the NOTICE file.
+//
+// You may obtain a copy of the Apache License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Apache License with the above modification is
+// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the Apache License for the specific
+// language governing permissions and limitations under the Apache License.
+//
+#include "pxr/imaging/hdSt/velocityMotionResolvingSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexObserver.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hdsi/velocityMotionResolvingSceneIndex.h"
+
+#include "pxr/base/tf/registryManager.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/tf/type.h"
+
+#include "pxr/pxr.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (fps)
+    ((sceneIndexPluginName, "HdSt_VelocityMotionResolvingSceneIndexPlugin")));
+
+static const char* const _pluginDisplayName = "GL";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<HdSt_VelocityMotionResolvingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // This one should go after implicit surface conversion
+    static const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 0;
+    const HdContainerDataSourceHandle inputArgs = 
+        HdRetainedContainerDataSource::New(
+            _tokens->fps,
+            // TODO: Get real framerate!
+            HdRetainedTypedSampledDataSource<float>::New(24.0));
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        inputArgs,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtEnd);
+}
+
+HdSt_VelocityMotionResolvingSceneIndexPlugin::
+HdSt_VelocityMotionResolvingSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdSt_VelocityMotionResolvingSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr& inputScene,
+    const HdContainerDataSourceHandle& inputArgs)
+{
+    return HdsiVelocityMotionResolvingSceneIndex::New(inputScene, inputArgs);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdSt/velocityMotionResolvingSceneIndexPlugin.h b/pxr/imaging/hdSt/velocityMotionResolvingSceneIndexPlugin.h
new file mode 100644
index 0000000000..ed5788418d
--- /dev/null
+++ b/pxr/imaging/hdSt/velocityMotionResolvingSceneIndexPlugin.h
@@ -0,0 +1,48 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the Apache License, Version 2.0 (the "Apache License")
+// with the following modification; you may not use this file except in
+// compliance with the Apache License and the following modification to it:
+// Section 6. Trademarks. is deleted and replaced with:
+//
+// 6. Trademarks. This License does not grant permission to use the trade
+//    names, trademarks, service marks, or product names of the Licensor
+//    and its affiliates, except as required to comply with Section 4(c) of
+//    the License and to reproduce the content of the NOTICE file.
+//
+// You may obtain a copy of the Apache License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Apache License with the above modification is
+// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the Apache License for the specific
+// language governing permissions and limitations under the Apache License.
+//
+#ifndef PXR_IMAGING_HD_ST_VELOCITY_MOTION_RESOLVING_SCENE_INDEX_PLUGIN_H
+#define PXR_IMAGING_HD_ST_VELOCITY_MOTION_RESOLVING_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/sceneIndexObserver.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+
+#include "pxr/pxr.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdSt_VelocityMotionResolvingSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdSt_VelocityMotionResolvingSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HD_ST_VELOCITY_MOTION_RESOLVING_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/hdSt/vertexAdjacency.cpp b/pxr/imaging/hdSt/vertexAdjacency.cpp
index 0a9379814f..1f083bfca4 100644
--- a/pxr/imaging/hdSt/vertexAdjacency.cpp
+++ b/pxr/imaging/hdSt/vertexAdjacency.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/vertexAdjacency.h"
 
diff --git a/pxr/imaging/hdSt/vertexAdjacency.h b/pxr/imaging/hdSt/vertexAdjacency.h
index 37dd3abf10..9636367305 100644
--- a/pxr/imaging/hdSt/vertexAdjacency.h
+++ b/pxr/imaging/hdSt/vertexAdjacency.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_VERTEX_ADJACENCY_H
 #define PXR_IMAGING_HD_ST_VERTEX_ADJACENCY_H
diff --git a/pxr/imaging/hdSt/volume.cpp b/pxr/imaging/hdSt/volume.cpp
index c95a0d10a5..01999b9f07 100644
--- a/pxr/imaging/hdSt/volume.cpp
+++ b/pxr/imaging/hdSt/volume.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/volume.h"
 
@@ -392,7 +375,7 @@ _ComputeMaterialNetworkShader(
         const TfToken textureName(
             fieldName.GetString() +
             HdSt_ResourceBindingSuffixTokens->texture.GetString());
-        static const HdTextureType textureType = HdTextureType::Field;
+        static const HdStTextureType textureType = HdStTextureType::Field;
 
         // Produce HdGet_FIELDNAME_texture(vec3 p) to sample
         // the texture.
diff --git a/pxr/imaging/hdSt/volume.h b/pxr/imaging/hdSt/volume.h
index 7a1c622036..5e0ab5e538 100644
--- a/pxr/imaging/hdSt/volume.h
+++ b/pxr/imaging/hdSt/volume.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_VOLUME_H
 #define PXR_IMAGING_HD_ST_VOLUME_H
diff --git a/pxr/imaging/hdSt/volumeShader.cpp b/pxr/imaging/hdSt/volumeShader.cpp
index 03e5823965..5a62407cb8 100644
--- a/pxr/imaging/hdSt/volumeShader.cpp
+++ b/pxr/imaging/hdSt/volumeShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdSt/volumeShader.h"
 
@@ -413,7 +396,7 @@ HdSt_VolumeShader::UpdateTextureHandles(
         const HdStTextureIdentifier &textureId =
             TF_VERIFY(fieldPrim) ?
             fieldPrim->GetTextureIdentifier() : HdStTextureIdentifier();
-        const HdTextureType textureType = textureHandles[i].type;
+        const HdStTextureType textureType = textureHandles[i].type;
         const size_t textureMemory =
             TF_VERIFY(fieldPrim) ?
             fieldPrim->GetTextureMemory() : 0;
diff --git a/pxr/imaging/hdSt/volumeShader.h b/pxr/imaging/hdSt/volumeShader.h
index c49add967a..a8cbc0e5a6 100644
--- a/pxr/imaging/hdSt/volumeShader.h
+++ b/pxr/imaging/hdSt/volumeShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_VOLUME_SHADER_H
 #define PXR_IMAGING_HD_ST_VOLUME_SHADER_H
diff --git a/pxr/imaging/hdSt/volumeShaderKey.cpp b/pxr/imaging/hdSt/volumeShaderKey.cpp
index 8cc581abd4..f296c83e91 100644
--- a/pxr/imaging/hdSt/volumeShaderKey.cpp
+++ b/pxr/imaging/hdSt/volumeShaderKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hdSt/volumeShaderKey.h"
diff --git a/pxr/imaging/hdSt/volumeShaderKey.h b/pxr/imaging/hdSt/volumeShaderKey.h
index 5410cbe7f2..2bb01eed8d 100644
--- a/pxr/imaging/hdSt/volumeShaderKey.h
+++ b/pxr/imaging/hdSt/volumeShaderKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HD_ST_VOLUME_SHADER_KEY_H
 #define PXR_IMAGING_HD_ST_VOLUME_SHADER_KEY_H
diff --git a/pxr/imaging/hdar/api.h b/pxr/imaging/hdar/api.h
index 5260993f25..a38e488eac 100644
--- a/pxr/imaging/hdar/api.h
+++ b/pxr/imaging/hdar/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2012 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDAR_API_H
 #define PXR_IMAGING_HDAR_API_H
diff --git a/pxr/imaging/hdar/hdSchemaDefs.py b/pxr/imaging/hdar/hdSchemaDefs.py
index 6f217dc056..c7b06dd05f 100644
--- a/pxr/imaging/hdar/hdSchemaDefs.py
+++ b/pxr/imaging/hdar/hdSchemaDefs.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 [
     dict(
diff --git a/pxr/imaging/hdar/pch.h b/pxr/imaging/hdar/pch.h
index 56d867c1ce..d621b55083 100644
--- a/pxr/imaging/hdar/pch.h
+++ b/pxr/imaging/hdar/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,9 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-
+#include <Windows.h>
+#include <intrin.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -52,7 +38,6 @@
 #include <deque>
 #include <functional>
 #include <initializer_list>
-#include <intrin.h>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -70,6 +55,7 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -77,42 +63,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -121,17 +71,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/spin_mutex.h>
diff --git a/pxr/imaging/hdar/systemSchema.cpp b/pxr/imaging/hdar/systemSchema.cpp
index 39862426fe..979f4ee8b9 100644
--- a/pxr/imaging/hdar/systemSchema.cpp
+++ b/pxr/imaging/hdar/systemSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hdar/systemSchema.h b/pxr/imaging/hdar/systemSchema.h
index 6a7acc8536..59fbc3b0fb 100644
--- a/pxr/imaging/hdar/systemSchema.h
+++ b/pxr/imaging/hdar/systemSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/hdsi/CMakeLists.txt b/pxr/imaging/hdsi/CMakeLists.txt
index 1f6e23b11d..030c6c6209 100644
--- a/pxr/imaging/hdsi/CMakeLists.txt
+++ b/pxr/imaging/hdsi/CMakeLists.txt
@@ -14,13 +14,13 @@ pxr_library(hdsi
         hf
         hd
         pxOsd
-        usdGeom
 
     PUBLIC_CLASSES
         coordSysPrimSceneIndex
         extComputationPrimvarPruningSceneIndex
         implicitSurfaceSceneIndex
         legacyDisplayStyleOverrideSceneIndex
+        lightLinkingSceneIndex
         materialBindingResolvingSceneIndex
         materialPrimvarTransferSceneIndex
         nurbsApproximatingSceneIndex
@@ -31,6 +31,8 @@ pxr_library(hdsi
         renderSettingsFilteringSceneIndex
         sceneGlobalsSceneIndex
         tetMeshConversionSceneIndex
+        utils
+        velocityMotionResolvingSceneIndex
 
     PUBLIC_HEADERS
         api.h
diff --git a/pxr/imaging/hdsi/api.h b/pxr/imaging/hdsi/api.h
index e19b38da7a..a6575e365f 100644
--- a/pxr/imaging/hdsi/api.h
+++ b/pxr/imaging/hdsi/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_API_H
 #define PXR_IMAGING_HDSI_API_H
diff --git a/pxr/imaging/hdsi/coordSysPrimSceneIndex.cpp b/pxr/imaging/hdsi/coordSysPrimSceneIndex.cpp
index 7e25987603..7e2de3751b 100644
--- a/pxr/imaging/hdsi/coordSysPrimSceneIndex.cpp
+++ b/pxr/imaging/hdsi/coordSysPrimSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdsi/coordSysPrimSceneIndex.h"
 
diff --git a/pxr/imaging/hdsi/coordSysPrimSceneIndex.h b/pxr/imaging/hdsi/coordSysPrimSceneIndex.h
index f1247ce26d..df254cc818 100644
--- a/pxr/imaging/hdsi/coordSysPrimSceneIndex.h
+++ b/pxr/imaging/hdsi/coordSysPrimSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_COORD_SYS_PRIM_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_COORD_SYS_PRIM_SCENE_INDEX_H
diff --git a/pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.cpp b/pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.cpp
index 21f1b2f030..87c0c94f88 100644
--- a/pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.cpp
+++ b/pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.h"
 
diff --git a/pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.h b/pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.h
index 8857d542a8..7238b757a0 100644
--- a/pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.h
+++ b/pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.h
@@ -2,25 +2,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICEN SE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // XXX change directive
 #ifndef PXR_IMAGING_HDSI_EXT_COMPUTATION_PRIMVAR_PRUNING_SCENE_INDEX_H
diff --git a/pxr/imaging/hdsi/implicitSurfaceSceneIndex.cpp b/pxr/imaging/hdsi/implicitSurfaceSceneIndex.cpp
index 25abb13412..18a29a4444 100644
--- a/pxr/imaging/hdsi/implicitSurfaceSceneIndex.cpp
+++ b/pxr/imaging/hdsi/implicitSurfaceSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdsi/implicitSurfaceSceneIndex.h"
 
diff --git a/pxr/imaging/hdsi/implicitSurfaceSceneIndex.h b/pxr/imaging/hdsi/implicitSurfaceSceneIndex.h
index ac5eca7b6b..21012a213f 100644
--- a/pxr/imaging/hdsi/implicitSurfaceSceneIndex.h
+++ b/pxr/imaging/hdsi/implicitSurfaceSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HDSI_IMPLICIT_SURFACE_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_IMPLICIT_SURFACE_SCENE_INDEX_H
 
diff --git a/pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.cpp b/pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.cpp
index 8e7530b103..563286401b 100644
--- a/pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.cpp
+++ b/pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.h"
 
diff --git a/pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.h b/pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.h
index ff2267bfd7..3ad13e6256 100644
--- a/pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.h
+++ b/pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_LEGACY_DISPLAY_STYLE_OVERRIDE_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_LEGACY_DISPLAY_STYLE_OVERRIDE_SCENE_INDEX_H
diff --git a/pxr/imaging/hdsi/lightLinkingSceneIndex.cpp b/pxr/imaging/hdsi/lightLinkingSceneIndex.cpp
new file mode 100644
index 0000000000..663d9ef046
--- /dev/null
+++ b/pxr/imaging/hdsi/lightLinkingSceneIndex.cpp
@@ -0,0 +1,1143 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/imaging/hdsi/lightLinkingSceneIndex.h"
+
+#include "pxr/imaging/hd/collectionExpressionEvaluator.h"
+#include "pxr/imaging/hd/collectionPredicateLibrary.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/tokens.h"
+
+// Schemata
+#include "pxr/imaging/hd/categoriesSchema.h"
+#include "pxr/imaging/hd/collectionSchema.h"
+#include "pxr/imaging/hd/collectionsSchema.h"
+#include "pxr/imaging/hd/instanceCategoriesSchema.h"
+#include "pxr/imaging/hd/lightSchema.h"
+
+#include "pxr/base/tf/debug.h"
+#include "pxr/base/trace/trace.h"
+
+#include <unordered_map>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEBUG_CODES(
+    HDSI_LIGHT_LINK_COLLECTION_CACHE,
+    HDSI_LIGHT_LINK_VERBOSE
+);
+
+TF_REGISTRY_FUNCTION(TfDebug)
+{
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDSI_LIGHT_LINK_COLLECTION_CACHE,
+        "Log cache update operations and invalidations.");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDSI_LIGHT_LINK_VERBOSE,
+        "Log notice processing for lights and light filters.");
+}
+
+TF_DEFINE_PUBLIC_TOKENS(HdsiLightLinkingSceneIndexTokens,
+    HDSI_LIGHT_LINKING_SCENE_INDEX_TOKENS);
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((groupPrefix, "group_"))
+);
+
+static bool
+_LogDebugMsg()
+{
+    return TfDebug::IsEnabled(HDSI_LIGHT_LINK_COLLECTION_CACHE) ||
+           TfDebug::IsEnabled(HDSI_LIGHT_LINK_VERBOSE);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//                HdsiLightLinkingSceneIndex_Impl
+//
+///////////////////////////////////////////////////////////////////////////////
+
+namespace HdsiLightLinkingSceneIndex_Impl
+{
+
+// Cache of light linking collections discovered on light and light filter
+// prims that tracks the correspondence of collection paths, their membership
+// expressions and the category ID assigned to each unique expression.
+//
+// Collections that have the same membership expression are assigned the same
+// category ID. For efficiency, trivial expressions that include
+// all prims in the scene are not tracked by the cache.
+//
+struct _Cache
+{
+public:
+    using _Expr = SdfPathExpression;
+    using _CategoryId = TfToken;
+    using _Eval = HdCollectionExpressionEvaluator;
+
+    _Cache(const HdSceneIndexBaseRefPtr &inputSceneIndex)
+    : _si(inputSceneIndex)
+    {}
+
+    // Updates tables and adds invalidation notices when processing a new
+    // collection or when its expression has changed.
+    // 
+    void UpdateCollection(
+        const SdfPath &primPath,
+        const TfToken &collectionName,
+        const SdfPathExpression &expr,
+        HdSceneIndexObserver::DirtiedPrimEntries *dirtiedEntries)
+    {
+        TRACE_FUNCTION();
+
+        const SdfPath collectionPath =
+            _MakeCollectionPath(primPath, collectionName);
+
+        // Have we seen this collection before?
+        const auto pathIdEntry = _collectionPathToId.find(collectionPath);
+        const bool collectionExists =
+            (pathIdEntry != _collectionPathToId.end());
+        
+        if (collectionExists) {
+            // Yes, we have. Has the expression changed?
+            const auto &id = pathIdEntry->second;
+            if (!TF_VERIFY(!id.IsEmpty())) {
+                return;
+            }
+
+            const auto idExprEntry = _idToExpr.find(id);
+            if (!TF_VERIFY(idExprEntry != _idToExpr.end())) {
+                return;
+            }
+            const auto &curExpr = idExprEntry->second;
+
+            if (curExpr == expr) {
+                TF_DEBUG(HDSI_LIGHT_LINK_VERBOSE).Msg(
+                    "* UpdateCollection -- Membership expression for %s has "
+                    "not changed (%s).\n",
+                    collectionPath.GetText(), expr.GetText().c_str());
+
+                return;
+            }
+        }
+
+        // Two possibilities here:
+        // 1. Collection exists and expression has changed. The new expression
+        //    may be trivial.
+        //
+        // 2. We're processing the collection for the first time. It may be
+        //    trivial. While _PrimsAdded short circuits trivial expressions,
+        //    _PrimsDirtied doesn't.
+        //
+        if (collectionExists) {
+            // Remove the collection from all tables. This in turn adds
+            // invalidation notices for affected targets.
+            _RemoveCollection(collectionPath, dirtiedEntries);
+
+            // Notify the light to re-query its category ID.
+            _InvalidateLight(primPath, collectionName, dirtiedEntries);
+        }
+
+        if (IsTrivial(expr)) {
+            // Nothing more to do. Trivial collection's are not tracked.
+            TF_DEBUG(HDSI_LIGHT_LINK_VERBOSE).Msg(
+                "* UpdateCollection -- Expression for %s is trivial.\n",
+                collectionPath.GetText());
+
+            return;
+        }
+
+        // Have we seen this expression before?
+        auto & [id, eval] = _exprToIdAndEval[expr];
+        const bool isNewExpr = id.IsEmpty();
+        if (isNewExpr) {
+            // Nope. Assign a category ID and ...
+            id = _GetNewCategoryId();
+            _idToExpr[id] = expr;
+
+            if (_LogDebugMsg()) {
+                TfDebug::Helper().Msg(
+                "* UpdateCollection -- Assigned ID %s for collection %s "
+                "(expression = %s).\n",
+                id.GetText(), collectionPath.GetText(), expr.GetText().c_str());
+            }
+
+            // ... create evaluator.
+            eval = _MakePathExpressionEvaluator(expr);
+
+        } else {
+            if (_LogDebugMsg()) {
+                TfDebug::Helper().Msg(
+                "* UpdateCollection -- Using shared ID %s for collection %s.\n",
+                id.GetText(), collectionPath.GetText());
+            }
+        }
+
+        _collectionPathToId[collectionPath] = id;
+        _idToCollectionPaths[id].insert(collectionPath);
+        
+        // The categories on the targets don't change when using a shared ID.
+        // We still conservatively invalidate the targets to give them a chance
+        // to process any changes to internal lighting state.
+        // This is necessary for e.g. in hdPrman to update the
+        // lighting_subset & lightfilter_subset attributes on geometry.
+        // We do a similar conservative invalidation in _RemoveCollection.
+        const SdfPathVector targets = _ComputeAllMatches(eval);
+        _InvalidateCategoriesOnTargets(targets, dirtiedEntries);
+
+        // If the collection existed, we pushed a dirty notice for the light
+        // above.
+        if (!collectionExists) {
+            _InvalidateLight(primPath, collectionName, dirtiedEntries);
+        }
+    }
+
+    // See _RemoveCollection.
+    void RemoveCollection(
+        const SdfPath &primPath,
+        const TfToken &collectionName,
+        HdSceneIndexObserver::DirtiedPrimEntries *dirtiedEntries)
+    {
+        const SdfPath collectionPath =
+            _MakeCollectionPath(primPath, collectionName);
+
+        _RemoveCollection(collectionPath, dirtiedEntries);
+    }
+
+    // Returns the categories that `primPath` belongs to.
+    // XXX Support is currently limited to non-instanced geometry prims.
+    //
+    TfTokenVector
+    ComputeCategoriesForPrimPath(
+        const SdfPath &primPath) const
+    {
+        TRACE_FUNCTION();
+
+        // Evaluate all expressions against `primPath`. We expect the number
+        // of unique expressions to be small. If this is a hotspot, we may
+        // need to cache results, or modify the matching behavior (e.g.
+        // compute shallow matches and use a flattening scene index to
+        // waterfall results).
+        //
+        TfTokenVector categories;
+        for (const auto & [expr, idAndEval] : _exprToIdAndEval) {
+            if (idAndEval.eval.Match(primPath)) {
+                categories.push_back(idAndEval.id);
+            }
+        }
+
+        return categories;
+    }
+
+    // Returns true and updates `id` if the cache has an entry for the given
+    // collection on the light or light filter prim.
+    // Returns false otherwise (trivial collections).
+    //
+    bool
+    GetCategoryIdForLightLinkingCollection(
+        const SdfPath &primPath,
+        const TfToken &collectionName,
+        TfToken *id)
+    {
+        const SdfPath colPath = _MakeCollectionPath(primPath, collectionName);
+        const auto pathIdEntry = _collectionPathToId.find(colPath);
+        if (pathIdEntry != _collectionPathToId.end()) {
+            *id = pathIdEntry->second;
+            return true;
+        }
+
+        // Collection entry doesn't exist. This is likely because the collection
+        // is trivial, but also the case when the collection doesn't exist.
+        return false;
+    }
+
+    static bool
+    IsTrivial(const SdfPathExpression &expr)
+    {
+        // When using explicit path-based rules with includeRoot = 1, the
+        // computed path expression matches all prim paths but not properties.
+        //
+        static const SdfPathExpression everythingButProperties("~//*.*");
+
+        return expr == SdfPathExpression::Everything() ||
+               expr == everythingButProperties;
+    }
+
+private:
+    // Updates the various tables to remove any reference to `collectionPath`.
+    // Adds notices to `dirtiedEntries` to invalidate the categories on
+    // prims targeted by the collection.
+    //
+    // Note: The light/light filter isn't invalidated here. We do this
+    //       only in UpdateCollection if necessary.
+    //       For prim removals, we don't need to invalidate the prim since it
+    //       is being removed.
+    //
+    void _RemoveCollection(
+        const SdfPath &collectionPath,
+        HdSceneIndexObserver::DirtiedPrimEntries *dirtiedEntries)
+    {
+        const auto pathIdEntry = _collectionPathToId.find(collectionPath);
+        if (pathIdEntry == _collectionPathToId.end()) {
+            // Nothing to do. The collection was never added, either because
+            // it didn't exist, or because it was trivial.
+            return;
+        }
+
+        TRACE_FUNCTION();
+
+        if (_LogDebugMsg()) {
+            TfDebug::Helper().Msg(
+            "* RemoveCollection %s -- \n"
+            "   * Removing cache entries referencing the collection.\n",
+            collectionPath.GetText());
+        }
+
+        TfToken id = pathIdEntry->second;
+        if (!TF_VERIFY(!id.IsEmpty())) {
+            return;
+        }
+        _collectionPathToId.erase(pathIdEntry);
+
+        auto idPathsEntry = _idToCollectionPaths.find(id);
+        if (!TF_VERIFY(idPathsEntry != _idToCollectionPaths.end())) {
+            return;
+        }
+        auto &collectionsUsingId = idPathsEntry->second;
+        collectionsUsingId.erase(collectionPath);
+
+        // Check if the category ID is being shared by other collections.
+        const bool sharingId = !collectionsUsingId.empty();
+
+        // XXX If the ID is being shared, the categories on targeted prims
+        //     don't change, but we invalidate them nonetheless.
+        //     See note in _UpdateCollection.
+        const auto idExprEntry = _idToExpr.find(id);
+        if (!TF_VERIFY(idExprEntry != _idToExpr.end())) {
+            return;
+        }
+        const auto expr = idExprEntry->second;
+
+        const auto exprIdEvalEntry = _exprToIdAndEval.find(expr);
+        if (!TF_VERIFY(exprIdEvalEntry != _exprToIdAndEval.end())) {
+            return;
+        }
+
+        auto &eval = exprIdEvalEntry->second.eval;
+        const SdfPathVector targets = _ComputeAllMatches(eval);
+        _InvalidateCategoriesOnTargets(targets, dirtiedEntries);
+
+        if (sharingId) {
+            TF_DEBUG(HDSI_LIGHT_LINK_VERBOSE).Msg(
+                "   * Id (%s) for collection %s is still being used by %zu "
+                "other collections.\n", id.GetText(), collectionPath.GetText(), 
+                collectionsUsingId.size());
+
+        } else {
+            // Remove reference to `id` from tables.
+            //
+            if (_LogDebugMsg()) {
+                TfDebug::Helper().Msg(
+                "   * Removing cache entries referencing Id (%s).\n",
+                id.GetText());
+            }
+
+            _idToCollectionPaths.erase(idPathsEntry);
+            _idToExpr.erase(idExprEntry);
+            _exprToIdAndEval.erase(exprIdEvalEntry);
+        }
+    }
+
+    TfToken
+    _GetNewCategoryId()
+    {
+        std::string strId =
+            _tokens->groupPrefix.GetString() + std::to_string(_groupIdx++);
+        
+        // We expect the number of unique expressions to be in the 100s,
+        // not 2^64.
+        if (_groupIdx == 0) {
+            TF_CODING_ERROR(
+                "Overflow detected when computing the category ID.\n");
+        }
+        return TfToken(strId);
+    }
+
+    void
+    _InvalidateCategoriesOnTargets(
+        const SdfPathVector &targets,
+        HdSceneIndexObserver::DirtiedPrimEntries *dirtiedEntries)
+    {
+        if (_LogDebugMsg()) {
+            TfDebug::Helper().Msg(
+            "   * Invalidating categories on %zu targets ....\n",
+            targets.size());
+        }
+
+        for (const auto targetPath : targets) {
+            dirtiedEntries->push_back(
+                HdSceneIndexObserver::DirtiedPrimEntry(
+                    targetPath, HdCategoriesSchema::GetDefaultLocator()));
+        }
+    }
+
+    void
+    _InvalidateLight(
+        const SdfPath &primPath,
+        const TfToken &collectionName,
+        HdSceneIndexObserver::DirtiedPrimEntries *dirtiedEntries)
+    {
+        if (_LogDebugMsg()) {
+            TfDebug::Helper().Msg(
+            "   * Invalidating category ID for %s:%s....\n",
+            primPath.GetText(), collectionName.GetText());
+        }
+
+        dirtiedEntries->push_back(
+            HdSceneIndexObserver::DirtiedPrimEntry(
+                primPath,
+                HdLightSchema::GetDefaultLocator().Append(collectionName)));
+    }
+
+    SdfPathVector
+    _ComputeAllMatches(const _Eval &eval)
+    {
+        constexpr auto matchKind =
+            HdCollectionExpressionEvaluator::MatchAll;
+
+        SdfPathVector resultVec;
+        // XXX This doesn't support instancing.
+        eval.PopulateMatches(
+            SdfPath::AbsoluteRootPath(), matchKind, &resultVec);
+        
+        return resultVec;
+    }
+
+    HdCollectionExpressionEvaluator
+    _MakePathExpressionEvaluator(
+        const SdfPathExpression &expr) const
+    {
+        // XXX For now, use the base set of predicates that Hydra ships with.
+        //     If this needs to be configured for an application, then the
+        //     light linking scene index would need to be registered using the
+        //     callback registration mechanism rather than the plugin registry.
+        //
+        return HdCollectionExpressionEvaluator(
+            _si, expr, HdGetCollectionPredicateLibrary());
+    }
+
+    static SdfPath
+    _MakeCollectionPath(
+        const SdfPath &primPath,
+        const TfToken &collectionName)
+    {
+        return primPath.AppendProperty(collectionName);
+    }
+
+private:
+    const HdSceneIndexBaseRefPtr _si;
+
+    struct _CategoryIdAndEval
+    {
+        _CategoryId id;
+        _Eval eval;
+    };
+
+    // Lookup the category ID and evaluator for a given expression.
+    //
+    using _ExprToCategoryIdAndEvalMap =
+        std::unordered_map<_Expr, _CategoryIdAndEval, TfHash>;
+
+    // Reverse lookup to get the expression given the category ID.
+    // This may seem redundant, but is useful when processing collection
+    // invalidation to check if the expression has changed for a collection
+    // tracked by the cache.
+    //
+    using _CategoryIdToExprMap = std::unordered_map<_CategoryId, _Expr, TfHash>;
+
+    // For each collection path (of the form primPath.collectionName), lookup
+    // the assigned category ID.
+    //
+    using _CollectionPathToCategoryIdMap =
+        std::unordered_map<SdfPath, _CategoryId, TfHash>;
+
+    // If several collections have the same membership expression, we share
+    // the assigned category ID amongst them. This map tracks that association.
+    //
+    using _CategoryIdToCollectionPathsMap
+        = std::unordered_map<_CategoryId, SdfPathSet, TfHash>;
+
+    _ExprToCategoryIdAndEvalMap _exprToIdAndEval;
+    _CategoryIdToExprMap _idToExpr;
+    _CollectionPathToCategoryIdMap _collectionPathToId;
+    _CategoryIdToCollectionPathsMap _idToCollectionPaths;
+
+    // Suffix used when computing the next group (category) ID.
+    size_t _groupIdx = 0;
+};
+
+} // namespace HdsiLightLinkingSceneIndex_Impl
+
+using namespace HdsiLightLinkingSceneIndex_Impl;
+
+namespace {
+
+// Instance names of the collection's applied in UsdLux.
+const TfTokenVector&
+_GetAllLinkingCollectionNames()
+{
+    static const TfTokenVector names = {
+        HdTokens->lightLink,
+        HdTokens->shadowLink,
+        HdTokens->filterLink 
+    };
+
+    return names;
+}
+
+// HdLightSchema is barebones at the moment, but that's where the linking
+// tokens are housed under.
+const TfTokenVector&
+_GetLightLinkingSchemaTokens()
+{
+    static const TfTokenVector names = {
+        HdTokens->lightLink,
+        HdTokens->shadowLink,
+        HdTokens->lightFilterLink // not filterLink!
+    };
+
+    return names;
+}
+
+// Returns the value of the token array data source from the container if
+// available. Otherwise, returns `fallback`.
+//
+VtArray<TfToken>
+_GetPrimTypes(
+    const HdContainerDataSourceHandle &inputArgs,
+    const TfToken &argName,
+    const VtArray<TfToken> &fallback)
+{
+    if (!inputArgs) {
+        return fallback;
+    }
+
+    if (HdTokenArrayDataSourceHandle tokenArrayHandle =
+            HdTokenArrayDataSource::Cast(inputArgs->Get(argName))) {
+
+        return tokenArrayHandle->GetTypedValue(0);
+    }
+
+    return fallback;
+}
+
+// Returns whether `tokens` contains `key`. 
+bool
+_Contains(
+    const VtArray<TfToken> &tokens,
+    const TfToken &key)
+{
+    return std::find(tokens.cbegin(), tokens.cend(), key) != tokens.cend();
+}
+
+bool
+_Contains(
+    const TfTokenVector &tokens,
+    const TfToken &key)
+{
+    return std::find(tokens.cbegin(), tokens.cend(), key) != tokens.cend();
+}
+
+void
+_AddIfNecessary(
+    const TfToken &token,
+    TfTokenVector *tokens)
+{
+    if (!_Contains(*tokens, token)) {
+        tokens->push_back(token);
+    }
+}
+
+// Queries the cache to compute the (light linking) categories that include
+// `primPath` and returns a container data source with the result.
+//
+HdContainerDataSourceHandle
+_BuildCategoriesDataSource(
+    const _CacheSharedPtr &cache,
+    const SdfPath &primPath)
+{
+    const TfTokenVector categories =
+        cache->ComputeCategoriesForPrimPath(primPath);
+
+    if (categories.empty()) {
+        return nullptr;
+    }
+    
+    return HdCategoriesSchema::BuildRetained(
+        categories.size(), categories.data(),
+        /*excludedNameCount = */ 0,
+        /*excludedNames = */nullptr);
+}
+
+// -----------------------------------------------------------------------------
+// Data source overrides.
+// -----------------------------------------------------------------------------
+
+// Prim data source wrapper for geometry prims that provides a container
+// overlay for the 'categories' locator.
+// 
+class _GprimDataSource : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_GprimDataSource);
+
+    TfTokenVector GetNames() override
+    {
+        TfTokenVector names = _inputPrimDs->GetNames();
+        _AddIfNecessary(HdCategoriesSchemaTokens->categories, &names);
+        return names;
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        HdDataSourceBaseHandle result = _inputPrimDs->Get(name);
+
+        if (name == HdCategoriesSchemaTokens->categories) {
+            // XXX This can result in categories computed upstream showing up
+            //     with scene delegates that implement light linking _and_
+            //     transport the linking collections. Note that this is not
+            //     the case with UsdImagingDelegate.
+            //     Compare with lights and light filters, where we always
+            //     provide a category ID when the collection is transported.
+            //     See _LightDataSource below.
+            //
+            return HdOverlayContainerDataSource::OverlayedContainerDataSources(
+                _BuildCategoriesDataSource(_cache, _primPath),
+                HdContainerDataSource::Cast(result));
+        }
+
+        return result;
+    }
+
+private:
+    _GprimDataSource(
+        const HdContainerDataSourceHandle &primContainer,
+        const SdfPath &primPath,
+        const _CacheSharedPtr &cache)
+      : _inputPrimDs(primContainer)
+      , _primPath(primPath)
+      , _cache(cache)
+    {
+    }
+
+    const HdContainerDataSourceHandle _inputPrimDs;
+    const SdfPath _primPath;
+    const _CacheSharedPtr &_cache;
+};
+
+// Prim data source wrapper for instancer prims.
+// Currently does nothing, but will be updated to provide an overlay for
+// the 'instanceCategories' locator.
+//
+class _InstancerPrimDataSource : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_InstancerPrimDataSource);
+
+    TfTokenVector GetNames() override
+    {
+        TfTokenVector names = _inputPrimDs->GetNames();
+        _AddIfNecessary(
+            HdInstanceCategoriesSchemaTokens->instanceCategories, &names);
+        return names;
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        HdDataSourceBaseHandle result = _inputPrimDs->Get(name);
+
+        // XXX No support for instancing (instanceCategories) yet.
+        // if (name == HdInstanceCategoriesSchemaTokens->instanceCategories) {
+        //     return result;
+        // }
+
+        return result;
+    }
+
+private:
+    _InstancerPrimDataSource(
+        const HdContainerDataSourceHandle &primContainer,
+        const SdfPath &primPath,
+        const _CacheSharedPtr &cache)
+      : _inputPrimDs(primContainer)
+      , _primPath(primPath)
+      , _cache(cache)
+    {
+    }
+
+    const HdContainerDataSourceHandle _inputPrimDs;
+    const SdfPath _primPath;
+    const _CacheSharedPtr &_cache;
+};
+
+class _LightDataSource : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_LightDataSource);
+
+    TfTokenVector GetNames() override
+    {
+        if (_lightDs) {
+            TfTokenVector names = _lightDs->GetNames();
+            for (const TfToken &name : _GetLightLinkingSchemaTokens()) {
+                _AddIfNecessary(name, &names);
+            }
+            return names;
+        }
+        return _GetLightLinkingSchemaTokens();
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        const TfTokenVector &schemaTokens = _GetLightLinkingSchemaTokens();
+        if (_Contains(schemaTokens, name)) {
+            
+            const TfToken &collectionName =
+                name == HdTokens->lightFilterLink
+                ? HdTokens->filterLink
+                : name;
+            
+            // Note: Since this scene index relies on linking collections to
+            //       be transported, use an overlay only when we have a
+            //       collections data source on the prim to provide the category
+            //       ID for the collections, including an empty token for the
+            //       trivial case.
+            //       For legacy scene delegates that implement light linking
+            //       and don't transport collections, we leave the light
+            //       data source as-is (e.g. UsdImagingDelegate).
+            //
+            const auto collectionsSchema =
+                HdCollectionsSchema::GetFromParent(_primDs);
+            
+            if (collectionsSchema.GetCollection(collectionName)) {
+                TfToken id;
+                if (_cache->GetCategoryIdForLightLinkingCollection(
+                    _primPath, collectionName, &id)) {
+                    
+                    return HdRetainedTypedSampledDataSource<TfToken>::New(id);
+                }
+
+                static const auto trivialIdDs =
+                    HdRetainedTypedSampledDataSource<TfToken>::New(TfToken());
+                return trivialIdDs;
+            }
+        }
+
+        return _lightDs? _lightDs->Get(name) : nullptr;
+    }
+
+private:
+    _LightDataSource(
+        const HdContainerDataSourceHandle &primContainer,
+        const HdContainerDataSourceHandle &lightContainer,
+        const SdfPath &primPath,
+        const _CacheSharedPtr &cache)
+      : _primDs(primContainer)
+      , _lightDs(lightContainer)
+      , _primPath(primPath)
+      , _cache(cache)
+    {
+        TF_VERIFY(primContainer);
+        // Note: lightContainer may be null.
+    }
+
+    const HdContainerDataSourceHandle _primDs;
+    const HdContainerDataSourceHandle _lightDs;
+    const SdfPath _primPath;
+    const _CacheSharedPtr &_cache;
+};
+
+
+// Prim data source wrapper for light and light filter prims that provides a
+// container override for the 'light' locator with the category IDs for the
+// linking collections when the prim has a collections data source.
+//
+class _LightPrimDataSource : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_LightPrimDataSource);
+
+    TfTokenVector GetNames() override
+    {
+        return _inputPrimDs->GetNames();
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        HdDataSourceBaseHandle result = _inputPrimDs->Get(name);
+
+        if (name == HdLightSchemaTokens->light) {
+            return _LightDataSource::New(
+                _inputPrimDs,
+                HdContainerDataSource::Cast(result), _primPath, _cache);
+        }
+
+        return result;
+    }
+
+private:
+    _LightPrimDataSource(
+        const HdContainerDataSourceHandle &primContainer,
+        const SdfPath &primPath,
+        const _CacheSharedPtr &cache)
+      : _inputPrimDs(primContainer)
+      , _primPath(primPath)
+      , _cache(cache)
+    {
+        TF_VERIFY(primContainer);
+    }
+
+    const HdContainerDataSourceHandle _inputPrimDs;
+    const SdfPath _primPath;
+    const _CacheSharedPtr &_cache;
+};
+
+
+} // anon
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Scene index implementation
+//
+///////////////////////////////////////////////////////////////////////////////
+
+// This includes implicit primitive types.
+static const VtArray<TfToken> GEOMETRY_PRIM_TYPES = {
+    HdRprimTypeTokens->allTokens.begin(),
+    HdRprimTypeTokens->allTokens.end()
+};
+
+// XXX hd/tokens.h doesn't have a separate list of light types.
+//     Perhaps, we should add one and reference that here?
+//
+static const VtArray<TfToken> LIGHT_PRIM_TYPES = {
+    HdLightTypeTokens->allTokens.begin(),
+    HdLightTypeTokens->allTokens.end(),
+};
+
+static const VtArray<TfToken> LIGHT_FILTER_PRIM_TYPES = {
+    HdLightFilterTypeTokens->allTokens.begin(),
+    HdLightFilterTypeTokens->allTokens.end()
+};
+
+HdSceneIndexBaseRefPtr
+HdsiLightLinkingSceneIndex::New(
+    const HdSceneIndexBaseRefPtr &inputSceneIndex,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    HdSceneIndexBaseRefPtr sceneIndex = 
+        TfCreateRefPtr(
+            new HdsiLightLinkingSceneIndex(inputSceneIndex, inputArgs));
+
+    sceneIndex->SetDisplayName("Light Linking Scene Index");
+    
+    return sceneIndex;
+}
+
+HdsiLightLinkingSceneIndex::HdsiLightLinkingSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputSceneIndex,
+    const HdContainerDataSourceHandle &inputArgs)
+  : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+  , _cache(std::make_shared<_Cache>(inputSceneIndex))
+  , _lightPrimTypes(_GetPrimTypes(
+        inputArgs,
+        HdsiLightLinkingSceneIndexTokens->lightPrimTypes,
+        LIGHT_PRIM_TYPES))
+  , _lightFilterPrimTypes(_GetPrimTypes(
+        inputArgs,
+        HdsiLightLinkingSceneIndexTokens->lightFilterPrimTypes,
+        LIGHT_FILTER_PRIM_TYPES))
+  , _geometryPrimTypes(_GetPrimTypes(
+        inputArgs,
+        HdsiLightLinkingSceneIndexTokens->geometryPrimTypes,
+        GEOMETRY_PRIM_TYPES))
+{
+}
+
+HdSceneIndexPrim
+HdsiLightLinkingSceneIndex::GetPrim(const SdfPath &primPath) const
+{
+    TRACE_FUNCTION();
+
+    HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+
+    // Since we are not using a flattening scene index approach to waterfall
+    // categories to descendants, we can safely use a prim type check and
+    // require a valid data source to limit the data source wrapping.
+    //
+    if (prim.dataSource) {
+        if (_IsGeometry(prim.primType)) {
+            prim.dataSource = _GprimDataSource::New(
+                prim.dataSource, primPath, _cache);
+
+        } else if (prim.primType == HdPrimTypeTokens->instancer) {
+            prim.dataSource = _InstancerPrimDataSource::New(
+                prim.dataSource, primPath, _cache);
+
+        } else if (_IsLight(prim.primType) || _IsLightFilter(prim.primType)) {
+            
+            prim.dataSource = _LightPrimDataSource::New(
+                prim.dataSource, primPath, _cache);
+        }
+    }
+
+    return prim;
+}
+
+SdfPathVector
+HdsiLightLinkingSceneIndex::GetChildPrimPaths(const SdfPath &primPath) const
+{
+    // This scene index doesn't change the topology.
+    return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+}
+
+void
+HdsiLightLinkingSceneIndex::_PrimsAdded(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::AddedPrimEntries &entries)
+{
+    if (!_IsObserved()) {
+        return;
+    }
+    
+    TRACE_FUNCTION();
+
+    // Notices for prims that need to refetch their categories.
+    HdSceneIndexObserver::DirtiedPrimEntries dirtiedEntries;
+
+    for (const auto &entry : entries) {
+        if (_IsLight(entry.primType)) {
+            // Update internal tracking.
+            _lightAndFilterPrimPaths.insert(entry.primPath);
+
+             _ProcessAddedLightOrFilter(
+                entry,
+                {HdTokens->lightLink, HdTokens->shadowLink},
+                &dirtiedEntries);
+
+        } else if (_IsLightFilter(entry.primType)) {
+            // Update internal tracking.
+            _lightAndFilterPrimPaths.insert(entry.primPath);
+
+            _ProcessAddedLightOrFilter(
+                entry, {HdTokens->filterLink}, &dirtiedEntries);
+        }
+    }
+
+    _SendPrimsAdded(entries);
+    _SendPrimsDirtied(dirtiedEntries);
+}
+
+void
+HdsiLightLinkingSceneIndex::_ProcessAddedLightOrFilter(
+    const HdSceneIndexObserver::AddedPrimEntry &entry,
+    const TfTokenVector &collectionNames,
+    HdSceneIndexObserver::DirtiedPrimEntries *dirtiedEntries)
+{
+    TF_DEBUG(HDSI_LIGHT_LINK_VERBOSE).Msg(
+        "Processing added notice for %s.\n", entry.primPath.GetText());
+
+    const HdSceneIndexPrim prim = 
+            _GetInputSceneIndex()->GetPrim(entry.primPath);
+
+    HdCollectionsSchema collectionsSchema =
+        HdCollectionsSchema::GetFromParent(prim.dataSource);
+
+    for (const TfToken &colName : collectionNames) {
+
+        HdCollectionSchema colSchema =
+            collectionsSchema.GetCollection(colName);
+
+        if (const auto exprDs = colSchema.GetMembershipExpression()) {
+            SdfPathExpression expr = exprDs->GetTypedValue(0.0);
+
+            if (HdsiLightLinkingSceneIndex_Impl::_Cache::IsTrivial(expr)) {
+                // If the expression is trivial, we do nothing!
+                // NOTE: Compare with _PrimsDirtied.
+                TF_DEBUG(HDSI_LIGHT_LINK_VERBOSE).Msg(
+                    "   ... %s:%s is trivial. Nothing to do.\n",
+                    entry.primPath.GetText(), colName.GetText());
+                
+                continue;
+            }
+
+            _cache->UpdateCollection(
+                entry.primPath,
+                colName,
+                expr,
+                dirtiedEntries);
+        }
+    }
+}
+
+void 
+HdsiLightLinkingSceneIndex::_PrimsRemoved(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::RemovedPrimEntries &entries)
+{
+    if (!_IsObserved()) {
+        return;
+    }
+
+    HdSceneIndexObserver::DirtiedPrimEntries dirtiedEntries;
+
+    for (const auto &entry : entries) {
+        // Recall that all descendants of the prim are also removed...
+        const auto itRange = SdfPathFindPrefixedRange(
+            _lightAndFilterPrimPaths.begin(),
+            _lightAndFilterPrimPaths.end(),
+            entry.primPath);
+
+        const auto &begin = itRange.first;
+        if (begin == _lightAndFilterPrimPaths.end()) {
+            continue;
+        }
+
+        TF_DEBUG(HDSI_LIGHT_LINK_VERBOSE).Msg(
+            "Processing removed notice for %s.\n", entry.primPath.GetText());
+
+        const auto &end = itRange.second;
+        for (auto it = begin; it != end; ++it) {
+            const SdfPath &trackedPrimPath = *it;
+
+            // XXX We could track lights and light filters separately to 
+            // loop over only the relevant collections.
+            //
+            for (const TfToken &colName : _GetAllLinkingCollectionNames()) {
+                _cache->RemoveCollection(
+                    trackedPrimPath, colName, &dirtiedEntries);
+            }
+        }
+
+        _lightAndFilterPrimPaths.erase(begin, end);
+    }
+
+    _SendPrimsRemoved(entries);
+    _SendPrimsDirtied(dirtiedEntries);
+}
+
+void
+HdsiLightLinkingSceneIndex::_PrimsDirtied(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::DirtiedPrimEntries &entries)
+{
+    if (!_IsObserved()) {
+        return;
+    }
+
+    static const HdDataSourceLocatorSet collectionLocators =
+    {
+        HdCollectionsSchema::GetDefaultLocator().Append(
+            HdTokens->lightLink),
+        HdCollectionsSchema::GetDefaultLocator().Append(
+            HdTokens->shadowLink),
+        HdCollectionsSchema::GetDefaultLocator().Append(
+            HdTokens->filterLink),
+    };
+
+    HdSceneIndexObserver::DirtiedPrimEntries newEntries;
+
+    for (const auto &entry : entries) {
+        const SdfPath &primPath = entry.primPath;
+
+        if (_lightAndFilterPrimPaths.find(primPath)
+                == _lightAndFilterPrimPaths.end()) {
+            continue;
+        }
+
+        if (!entry.dirtyLocators.Intersects(collectionLocators)) {
+            continue;
+        }
+        
+        const HdSceneIndexPrim prim = 
+            _GetInputSceneIndex()->GetPrim(primPath);
+
+        HdCollectionsSchema collectionsSchema =
+            HdCollectionsSchema::GetFromParent(prim.dataSource);
+        
+        if (!collectionsSchema) {
+            continue;
+        }
+
+        // XXX We could track lights and light filters separately to loop 
+        // over only the relevant collection locators.
+        //
+        for (const auto &locator : collectionLocators) {
+            const TfToken &collectionName = locator.GetLastElement();
+
+            HdCollectionSchema colSchema =
+                collectionsSchema.GetCollection(collectionName);
+            if (!colSchema) {
+                continue;
+            }
+            if (!entry.dirtyLocators.Intersects(locator)) {
+                continue;
+            }
+
+            if (const auto exprDs = colSchema.GetMembershipExpression()) {
+
+                TF_DEBUG(HDSI_LIGHT_LINK_VERBOSE).Msg(
+                    "Processing dirtied notice for prim %s for "
+                    " collection %s...\n",
+                    primPath.GetText(), collectionName.GetText());
+
+                // NOTE: We need to process the expression even if it
+                //       is trivial because it might not have been
+                //       earlier. Compare with _PrimsAdded.
+                const SdfPathExpression expr =
+                    exprDs->GetTypedValue(0.0);
+
+                _cache->UpdateCollection(
+                    primPath,
+                    collectionName,
+                    expr,
+                    &newEntries);
+                
+            } else {
+                // XXX Issue warning? We do always expect a value
+                //     for the locator. Invoke RemoveCollections to clean
+                //     up?
+            }
+        }
+    }
+
+    _SendPrimsDirtied(entries);
+    _SendPrimsDirtied(newEntries);
+}
+
+bool
+HdsiLightLinkingSceneIndex::_IsLight(
+    const TfToken &primType) const
+{
+    return _Contains(_lightPrimTypes, primType);
+}
+
+bool
+HdsiLightLinkingSceneIndex::_IsLightFilter(
+    const TfToken &primType) const
+{
+    return _Contains(_lightFilterPrimTypes, primType);
+}
+
+bool
+HdsiLightLinkingSceneIndex::_IsGeometry(
+    const TfToken &primType) const
+{
+    return _Contains(_geometryPrimTypes, primType);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/pxr/imaging/hdsi/lightLinkingSceneIndex.h b/pxr/imaging/hdsi/lightLinkingSceneIndex.h
new file mode 100644
index 0000000000..c5051fe4c3
--- /dev/null
+++ b/pxr/imaging/hdsi/lightLinkingSceneIndex.h
@@ -0,0 +1,136 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_IMAGING_HDSI_LIGHT_LINKING_SCENE_INDEX_H
+#define PXR_IMAGING_HDSI_LIGHT_LINKING_SCENE_INDEX_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hdsi/api.h"
+
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/usd/sdf/path.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/vt/array.h"
+
+#include <memory>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// See documentation below for the use of these tokens.
+///
+#define HDSI_LIGHT_LINKING_SCENE_INDEX_TOKENS   \
+    (lightPrimTypes)                            \
+    (lightFilterPrimTypes)                      \
+    (geometryPrimTypes)
+
+TF_DECLARE_PUBLIC_TOKENS(HdsiLightLinkingSceneIndexTokens, HDSI_API,
+    HDSI_LIGHT_LINKING_SCENE_INDEX_TOKENS);
+
+namespace HdsiLightLinkingSceneIndex_Impl
+{
+    struct _Cache;
+    using _CacheSharedPtr = std::shared_ptr<_Cache>;
+}
+
+TF_DECLARE_REF_PTRS(HdsiLightLinkingSceneIndex);
+
+///
+/// \class HdsiLightLinkingSceneIndex
+///
+/// Scene index that implements light linking semantics by:
+/// - discovering light linking collections on lights and light filters; this
+///   may be configured using the \p inputArgs c'tor argument by providing a
+///   HdTokenArrayDataSourceHandle for \p lightPrimTypes and
+///   \p lightFilterPrimTypes.
+///
+/// - assigning a category ID token to each unique collection based on
+///   its membership expression; in PRMan parlance, this is the value fed to
+///   the "grouping:membership" attribute on the light/light filter.
+///   Trivial collections that include all prims in the scene use the empty
+///   token.
+///
+/// - invalidating the categories locator on prims targeted (i.e. matched) by
+///   the expression,
+///
+/// - invalidating the light/light filter prim when the category ID for its
+///   linking collection has changed, and
+///
+/// - computing the categories that a (geometry) prim belong to; the list of
+///   prim types affected by linking may be configured using the \p inputArgs
+///   c'tor argument by providing a HdTokenArrayDataSourceHandle for
+///   \p geometryPrimTypes.
+///
+/// \note Current support does *not* handle instanced prims (be it natively
+///       instanced, or prototype prims under point instancers) due to
+///       limitations in the HdCollectionExpressionEvaluator.
+///       This will be addressed in a future change.
+///
+/// \note For legacy scene delegates that implement light linking (e.g.
+///       UsdImagingDelegate) and don't transport the light linking collections,
+///       this scene index should leave the category(ies) unaffected on the
+///       light, geometry prims and instancers.
+///
+class HdsiLightLinkingSceneIndex : public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    HDSI_API
+    static HdSceneIndexBaseRefPtr
+    New(const HdSceneIndexBaseRefPtr &inputSceneIndex,
+        const HdContainerDataSourceHandle &inputArgs);
+
+    HDSI_API
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override;
+
+    HDSI_API
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override;
+
+protected:
+
+    HDSI_API
+    HdsiLightLinkingSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputSceneIndex,
+        const HdContainerDataSourceHandle &inputArgs);
+
+    HDSI_API
+    void _PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::AddedPrimEntries &entries) override;
+
+    HDSI_API
+    void _PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::RemovedPrimEntries &entries) override;
+
+    HDSI_API
+    void _PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries &entries) override;
+
+private:
+    void _ProcessAddedLightOrFilter(
+        const HdSceneIndexObserver::AddedPrimEntry &entry,
+        const TfTokenVector &collectionNames,
+        HdSceneIndexObserver::DirtiedPrimEntries *dirtiedEntries);
+
+    bool _IsLight(const TfToken &primType) const;
+    bool _IsLightFilter(const TfToken &primType) const;
+    bool _IsGeometry(const TfToken &primType) const;
+
+private:
+    HdsiLightLinkingSceneIndex_Impl::_CacheSharedPtr const _cache;
+
+    // Track prims with light linking collections.
+    SdfPathSet _lightAndFilterPrimPaths;
+
+    const VtArray<TfToken> _lightPrimTypes;
+    const VtArray<TfToken> _lightFilterPrimTypes;
+    const VtArray<TfToken> _geometryPrimTypes;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/pxr/imaging/hdsi/materialBindingResolvingSceneIndex.cpp b/pxr/imaging/hdsi/materialBindingResolvingSceneIndex.cpp
index 2c277eaddf..27f19ad300 100644
--- a/pxr/imaging/hdsi/materialBindingResolvingSceneIndex.cpp
+++ b/pxr/imaging/hdsi/materialBindingResolvingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #include "pxr/imaging/hdsi/materialBindingResolvingSceneIndex.h"
 
 #include "pxr/imaging/hd/materialBindingsSchema.h"
diff --git a/pxr/imaging/hdsi/materialBindingResolvingSceneIndex.h b/pxr/imaging/hdsi/materialBindingResolvingSceneIndex.h
index 1e4ec4eac3..c7cb77903f 100644
--- a/pxr/imaging/hdsi/materialBindingResolvingSceneIndex.h
+++ b/pxr/imaging/hdsi/materialBindingResolvingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HDSI_MATERIAL_BINDING_RESOLVING_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_MATERIAL_BINDING_RESOLVING_SCENE_INDEX_H
 
diff --git a/pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.cpp b/pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.cpp
index 1cbc3e7886..e5c4351fe4 100644
--- a/pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.cpp
+++ b/pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #include "pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.h"
 
 #include "pxr/imaging/hd/dependenciesSchema.h"
diff --git a/pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.h b/pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.h
index d7ba806b5b..b17c7ebb14 100644
--- a/pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.h
+++ b/pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HDSI_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_H
 
diff --git a/pxr/imaging/hdsi/nurbsApproximatingSceneIndex.cpp b/pxr/imaging/hdsi/nurbsApproximatingSceneIndex.cpp
index 51008b3a8c..66128b8c15 100644
--- a/pxr/imaging/hdsi/nurbsApproximatingSceneIndex.cpp
+++ b/pxr/imaging/hdsi/nurbsApproximatingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdsi/nurbsApproximatingSceneIndex.h"
 
diff --git a/pxr/imaging/hdsi/nurbsApproximatingSceneIndex.h b/pxr/imaging/hdsi/nurbsApproximatingSceneIndex.h
index cdb8c52c7f..412143b74e 100644
--- a/pxr/imaging/hdsi/nurbsApproximatingSceneIndex.h
+++ b/pxr/imaging/hdsi/nurbsApproximatingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HDSI_NURBS_APPROXIMATING_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_NURBS_APPROXIMATING_SCENE_INDEX_H
 
diff --git a/pxr/imaging/hdsi/pch.h b/pxr/imaging/hdsi/pch.h
index 1662d7e8b3..b4a7823640 100644
--- a/pxr/imaging/hdsi/pch.h
+++ b/pxr/imaging/hdsi/pch.h
@@ -1,43 +1,47 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
 
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
+#include "pxr/base/arch/defines.h"
+#if defined(ARCH_OS_DARWIN)
+#include <mach/mach_time.h>
+#endif
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
+#include <x86intrin.h>
+#endif
+#if defined(ARCH_OS_WINDOWS)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <Windows.h>
+#include <intrin.h>
+#endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
+#include <cfloat>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
 #include <cstddef>
 #include <cstdint>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <deque>
+#include <float.h>
 #include <functional>
 #include <initializer_list>
-#include <intrin.h>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -46,60 +50,24 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -108,19 +76,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
+#include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_queue.h>
+#include <tbb/spin_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.cpp b/pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.cpp
index d735c572df..d64979ae77 100644
--- a/pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.cpp
+++ b/pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.cpp
@@ -1,38 +1,31 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.h"
 
 #include "pxr/imaging/hd/basisCurvesSchema.h"
 #include "pxr/imaging/hd/basisCurvesTopologySchema.h"
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+#include "pxr/imaging/hd/geomSubsetSchema.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
 #include "pxr/imaging/hd/primvarsSchema.h"
 #include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndex.h"
 #include "pxr/imaging/hd/tokens.h"
 
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/base/tf/token.h"
 #include "pxr/base/vt/array.h"
 #include "pxr/base/vt/typeHeaders.h"
+#include "pxr/base/vt/types.h"
+#include "pxr/base/vt/value.h"
 #include "pxr/base/vt/visitValue.h"
-#include "pxr/base/work/loops.h"
+
+#include <vector>
 
 #define USE_PARALLEL_EXPANSION 0
 
@@ -694,11 +687,6 @@ class _BasisCurvesDataSource : public HdContainerDataSource
                     tc, _curveVertexCounts, _numExtraEnds);
             }
         }
-
-        if (name == HdBasisCurvesSchemaTokens->geomSubsets) {
-            // XXX Remap geomsubset indices accounting for the additional curve
-            //     points.
-        }
         return result;
     }
 
@@ -719,7 +707,6 @@ class _BasisCurvesDataSource : public HdContainerDataSource
 //             curveIndices
 //             wrap
 //             ...
-//         geomsubsets
 //     primvarsSchema
 //         primvarSchema[]
 //             primvarValue
@@ -750,62 +737,65 @@ class _PrimDataSource : public HdContainerDataSource
     Get(const TfToken &name) override
     {
         HdDataSourceBaseHandle result = _input->Get(name);
-        if (result) {
-            HdBasisCurvesSchema bcs =
-                HdBasisCurvesSchema::GetFromParent(_input);
-
-            if (!bcs) {
-                return result;
-            }
-
-            HdBasisCurvesTopologySchema ts = bcs.GetTopology();
-            if (!ts) {
-                return result;
-            }
-
-            const TfToken wrap =
-                _SafeGetTypedValue<TfToken>(ts.GetWrap());
-            const TfToken basis =
-                _SafeGetTypedValue<TfToken>(ts.GetBasis());
-
-            if (wrap == HdTokens->pinned &&
-                (basis == HdTokens->bspline ||
-                 basis == HdTokens->catmullRom ||
-                 basis == HdTokens->centripetalCatmullRom)) {
+        if (!result) {
+            return HdDataSourceBaseHandle();
+        }
+        if (name != HdBasisCurvesSchemaTokens->basisCurves &&
+            name != HdPrimvarsSchemaTokens->primvars) {
+            return result;
+        }
+        HdBasisCurvesSchema bcs = HdBasisCurvesSchema::GetFromParent(_input);
+        if (!bcs) {
+            return result;
+        }
+        HdBasisCurvesTopologySchema ts = bcs.GetTopology();
+        if (!ts) {
+            return result;
+        }
 
-                // Add 2 additional end points for bspline and
-                // 1 for catmullRom|centripetalCatmullRom.
-                const size_t numExtraEnds =
-                    (basis == HdTokens->bspline)? 2 : 1;
-                
-                // Need to cache the per-curve vertex counts since the
-                // expansion is per-curve.
-                const VtIntArray curveVertexCounts =
-                    _SafeGetTypedValue<VtIntArray>(
-                        ts.GetCurveVertexCounts());
-
-                if (name == HdBasisCurvesSchemaTokens->basisCurves) {
-                    if (HdContainerDataSourceHandle bcc =
-                            HdContainerDataSource::Cast(result)) {
-                        return _BasisCurvesDataSource::New(
-                            bcc, curveVertexCounts, numExtraEnds);
-                    }
+        // TODO: Avoid sampling sampled sources here!
+        const TfToken wrap =
+            _SafeGetTypedValue<TfToken>(ts.GetWrap());
+        const TfToken basis =
+            _SafeGetTypedValue<TfToken>(ts.GetBasis());
+
+        if (wrap == HdTokens->pinned &&
+            (basis == HdTokens->bspline ||
+             basis == HdTokens->catmullRom ||
+             basis == HdTokens->centripetalCatmullRom)) {
+
+            // Add 2 additional end points for bspline and
+            // 1 for catmullRom|centripetalCatmullRom.
+            const size_t numExtraEnds =
+                (basis == HdTokens->bspline)? 2 : 1;
+            
+            // Need to cache the per-curve vertex counts since the
+            // expansion is per-curve.
+            const VtIntArray curveVertexCounts =
+                _SafeGetTypedValue<VtIntArray>(
+                    ts.GetCurveVertexCounts());
+
+            if (name == HdBasisCurvesSchemaTokens->basisCurves) {
+                if (HdContainerDataSourceHandle bcc =
+                        HdContainerDataSource::Cast(result)) {
+                    return _BasisCurvesDataSource::New(
+                        bcc, curveVertexCounts, numExtraEnds);
                 }
+            }
 
-                if (name == HdPrimvarsSchemaTokens->primvars) {
-                    // If we have authored curve indices, we can avoid expanding
-                    // vertex primvars by expanding the curve indices instead.
-                    // Note that varying primvars would still need to be 
-                    // expanded due to the additional curve segments.
-                    VtIntArray curveIndices =
-                        _SafeGetTypedValue<VtIntArray>(ts.GetCurveIndices());
-                
-                    if (HdContainerDataSourceHandle pc =
-                            HdContainerDataSource::Cast(result)) {
-                        return _PrimvarsDataSource::New(
-                            pc, curveVertexCounts, numExtraEnds,
-                            !curveIndices.empty());
-                    }
+            if (name == HdPrimvarsSchemaTokens->primvars) {
+                // If we have authored curve indices, we can avoid expanding
+                // vertex primvars by expanding the curve indices instead.
+                // Note that varying primvars would still need to be 
+                // expanded due to the additional curve segments.
+                VtIntArray curveIndices =
+                    _SafeGetTypedValue<VtIntArray>(ts.GetCurveIndices());
+            
+                if (HdContainerDataSourceHandle pc =
+                        HdContainerDataSource::Cast(result)) {
+                    return _PrimvarsDataSource::New(
+                        pc, curveVertexCounts, numExtraEnds,
+                        !curveIndices.empty());
                 }
             }
         }
@@ -816,6 +806,66 @@ class _PrimDataSource : public HdContainerDataSource
     HdContainerDataSourceHandle _input;
 };
 
+class _SubsetIndicesDataSource : public HdIntArrayDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_SubsetIndicesDataSource);
+    
+    VtValue
+    GetValue(Time shutterOffset) override
+    {
+        return VtValue(GetTypedValue(shutterOffset));
+    }
+    
+    VtIntArray
+    GetTypedValue(Time shutterOffset) override
+    {
+        if (_typeSource->GetTypedValue(shutterOffset) ==
+            HdGeomSubsetSchemaTokens->typePointSet) {
+            // TODO: Remap geomsubset indices accounting for the additional
+            //       curve points.
+        }
+        return _dataSource->GetTypedValue(shutterOffset);
+    }
+    
+    bool
+    GetContributingSampleTimesForInterval(
+        Time startTime, Time endTime,
+        std::vector<HdSampledDataSource::Time> *outSampleTimes) override
+    {
+        std::vector<HdSampledDataSourceHandle> sources { 
+            _dataSource, _typeSource };
+        const auto& topoSchema = HdBasisCurvesTopologySchema::GetFromParent(
+            _parentSource);
+        if (topoSchema) {
+            sources.push_back(topoSchema.GetWrap());
+            sources.push_back(topoSchema.GetBasis());
+            sources.push_back(topoSchema.GetCurveVertexCounts());
+        }
+        return HdGetMergedContributingSampleTimesForInterval(
+            sources.size(), sources.data(), startTime, endTime, outSampleTimes);
+    }
+
+private:
+    _SubsetIndicesDataSource(
+        const HdIntArrayDataSourceHandle& dataSource,
+        const HdTokenDataSourceHandle& typeSource,
+        const HdContainerDataSourceHandle& parentSource)
+      : _dataSource(dataSource)
+      , _typeSource(typeSource)
+      , _parentSource(parentSource)
+    {
+        TF_VERIFY(dataSource);
+        TF_VERIFY(typeSource);
+        TF_VERIFY(parentSource);
+    }
+    
+    HdIntArrayDataSourceHandle _dataSource;
+    HdTokenDataSourceHandle _typeSource;
+    HdContainerDataSourceHandle _parentSource;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_SubsetIndicesDataSource);
 
 } // namespace anonymous
 
@@ -841,11 +891,37 @@ HdSceneIndexPrim
 HdsiPinnedCurveExpandingSceneIndex::GetPrim(const SdfPath &primPath) const
 {
     HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+    if (!prim.dataSource) {
+        return prim;
+    }
 
     // Override the prim data source for basis curves.
-    if (prim.primType == HdPrimTypeTokens->basisCurves && prim.dataSource) {
+    if (prim.primType == HdPrimTypeTokens->basisCurves) {
         prim.dataSource = _PrimDataSource::New(prim.dataSource);
     }
+    
+    // Override the prim data source for geom subsets if parent is basis curves
+    if (prim.primType == HdPrimTypeTokens->geomSubset) {
+        const HdSceneIndexPrim parentPrim = _GetInputSceneIndex()->GetPrim(
+            primPath.GetParentPath());
+        if (parentPrim.primType == HdPrimTypeTokens->basisCurves &&
+            parentPrim.dataSource) {
+                
+            // overlay indices
+            // XXX: When basis curves support visible subsets,
+            //      add support for subset primvars.
+            prim.dataSource = HdOverlayContainerDataSource::New(
+                HdRetainedContainerDataSource::New(
+                    HdGeomSubsetSchemaTokens->indices,
+                    _SubsetIndicesDataSource::New(
+                        HdIntArrayDataSource::Cast(prim.dataSource->Get(
+                            HdGeomSubsetSchemaTokens->indices)),
+                        HdTokenDataSource::Cast(prim.dataSource->Get(
+                            HdGeomSubsetSchemaTokens->type)),
+                        parentPrim.dataSource)),
+                prim.dataSource);
+        }
+    }
 
     return prim;
 }
diff --git a/pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.h b/pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.h
index 12e4f832cb..ff8a22417e 100644
--- a/pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.h
+++ b/pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICEN SE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_PINNED_CURVE_EXPANDING_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_PINNED_CURVE_EXPANDING_SCENE_INDEX_H
diff --git a/pxr/imaging/hdsi/primManagingSceneIndexObserver.cpp b/pxr/imaging/hdsi/primManagingSceneIndexObserver.cpp
index 80af073d57..29a7909299 100644
--- a/pxr/imaging/hdsi/primManagingSceneIndexObserver.cpp
+++ b/pxr/imaging/hdsi/primManagingSceneIndexObserver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdsi/primManagingSceneIndexObserver.h"
diff --git a/pxr/imaging/hdsi/primManagingSceneIndexObserver.h b/pxr/imaging/hdsi/primManagingSceneIndexObserver.h
index 2f059b9138..f7a46c2a74 100644
--- a/pxr/imaging/hdsi/primManagingSceneIndexObserver.h
+++ b/pxr/imaging/hdsi/primManagingSceneIndexObserver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_PRIM_MANAGING_SCENE_INDEX_OBSERVER_H
 #define PXR_IMAGING_HDSI_PRIM_MANAGING_SCENE_INDEX_OBSERVER_H
diff --git a/pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.cpp b/pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.cpp
index 7b5ef86c55..8ddc890422 100644
--- a/pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.cpp
+++ b/pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.h"
diff --git a/pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.h b/pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.h
index aceade7784..3ed1653ff9 100644
--- a/pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.h
+++ b/pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_PRIMTYPE_NOTICE_BATCHING_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_PRIMTYPE_NOTICE_BATCHING_SCENE_INDEX_H
diff --git a/pxr/imaging/hdsi/primTypePruningSceneIndex.cpp b/pxr/imaging/hdsi/primTypePruningSceneIndex.cpp
index ae278432ff..54aae5a6a9 100644
--- a/pxr/imaging/hdsi/primTypePruningSceneIndex.cpp
+++ b/pxr/imaging/hdsi/primTypePruningSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #include "pxr/imaging/hdsi/primTypePruningSceneIndex.h"
 
 #include "pxr/imaging/hd/sceneIndexPrimView.h"
@@ -153,6 +136,7 @@ HdsiPrimTypePruningSceneIndex::SetEnabled(const bool enabled)
     _enabled = enabled;
 
     HdSceneIndexObserver::DirtiedPrimEntries dirtiedEntries;
+    HdSceneIndexObserver::AddedPrimEntries addedEntries;
 
     // Invalidate all data source locators.  Even though the prim
     // data source we use here will double-check whether the scene index
@@ -177,11 +161,14 @@ HdsiPrimTypePruningSceneIndex::SetEnabled(const bool enabled)
                 // Prune this primType.
                 _pruneMap[primPath] = true;
                 dirtiedEntries.emplace_back(primPath, locators);
+                // Add prim with an empty prim type to trigger the 
+                // prim to be removed.
+                addedEntries.emplace_back(primPath, TfToken());
             } else {
                 const _PruneMap::iterator i = _pruneMap.find(primPath);
                 if (i != _pruneMap.end() && i->second) {
                     // Add back this previously-pruned prim.
-                    //addedEntries.emplace_back(primPath, prim.primType);
+                    addedEntries.emplace_back(primPath, prim.primType);
                     // Don't bother erasing the _pruneMap entry;
                     // will clear below.
                     dirtiedEntries.emplace_back(primPath, locators);
@@ -204,6 +191,9 @@ HdsiPrimTypePruningSceneIndex::SetEnabled(const bool enabled)
     if (!dirtiedEntries.empty()) {
         _SendPrimsDirtied(dirtiedEntries);
     }
+    if (!addedEntries.empty()) {
+        _SendPrimsAdded(addedEntries);
+    }
 }
 
 HdSceneIndexPrim
diff --git a/pxr/imaging/hdsi/primTypePruningSceneIndex.h b/pxr/imaging/hdsi/primTypePruningSceneIndex.h
index 1498052d98..1a2dde6554 100644
--- a/pxr/imaging/hdsi/primTypePruningSceneIndex.h
+++ b/pxr/imaging/hdsi/primTypePruningSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_IMAGING_HDSI_PRIM_TYPE_PRUNING_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_PRIM_TYPE_PRUNING_SCENE_INDEX_H
 
diff --git a/pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.cpp b/pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.cpp
index bfdd9e8a11..27beec5d5d 100644
--- a/pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.cpp
+++ b/pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.h"
 
@@ -41,6 +24,7 @@ TF_DEFINE_PUBLIC_TOKENS(HdsiRenderSettingsFilteringSceneIndexTokens,
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
     (active_depOn_sceneGlobals_arsp)
+    (active_depOn_sceneGlobals_frame)
 );
 
 namespace
@@ -75,9 +59,33 @@ _BuildDependencyForActiveLocator()
     return renderSettingsDepDS;
 }
 
+// Builds and returns a data source to invalidate the renderSettings.frame
+// locator when the sceneGlobals.currentFrame locator is dirtied.
+//
+HdContainerDataSourceHandle
+_BuildDependencyForFrameLocator()
+{
+    static const HdRetainedContainerDataSourceHandle rsFrameDepDS =
+        HdRetainedContainerDataSource::New(
+            _tokens->active_depOn_sceneGlobals_frame,
+            HdDependencySchema::Builder()
+            .SetDependedOnPrimPath(
+                HdRetainedTypedSampledDataSource<SdfPath>::New(
+                    HdSceneGlobalsSchema::GetDefaultPrimPath()))
+            .SetDependedOnDataSourceLocator(
+                HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+                    HdSceneGlobalsSchema::GetCurrentFrameLocator()))
+            .SetAffectedDataSourceLocator(
+                HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+                    HdRenderSettingsSchema::GetFrameLocator()))
+            .Build()
+        );
+    return rsFrameDepDS;
+}
+
 // Builds and returns a data source to:
 // (a) invalidate the renderSettings.shutterInterval locator when a targeted 
-// camera's shutterOpen or shutterClose locator is dirtied.
+//     camera's shutterOpen or shutterClose locator is dirtied.
 // (b) invalidate the renderSettings.shutterInterval locator when the
 //     renderProducts locator is dirtied. Due to flattening, we can't limit
 //     this to just the cameraPrim
@@ -350,17 +358,20 @@ HdContainerDataSourceHandle
 _BuildOverlayContainerDataSource(
     const HdContainerDataSourceHandle &src1,
     const HdContainerDataSourceHandle &src2,
-    const HdContainerDataSourceHandle &src3)
+    const HdContainerDataSourceHandle &src3,
+    const HdContainerDataSourceHandle &src4)
 {
     return
         HdOverlayContainerDataSource::OverlayedContainerDataSources(
             src1,
             HdOverlayContainerDataSource::OverlayedContainerDataSources(
-                src2, src3));
+                src2, 
+                HdOverlayContainerDataSource::OverlayedContainerDataSources(
+                    src3, src4)));
 }
 
 // Data source override for the 'renderSettings' locator.
-// Adds support for the 'active' and 'shutterInterval' fields and filters
+// Adds support for the 'active' and 'shutterInterval' fields and filtered
 // entries in the 'namespacedSettings' container.
 //
 class _RenderSettingsDataSource final : public HdContainerDataSource
@@ -395,8 +406,7 @@ class _RenderSettingsDataSource final : public HdContainerDataSource
         if (name == HdRenderSettingsSchemaTokens->active) {
             bool isActive = false;
             SdfPath activePath;
-            if (HdUtils::HasActiveRenderSettingsPrim(
-                    _si, &activePath)) {
+            if (HdUtils::HasActiveRenderSettingsPrim(_si, &activePath)) {
                 isActive = (activePath == _primPath);
             }
             return HdRetainedTypedSampledDataSource<bool>::New(isActive);
@@ -480,6 +490,7 @@ class _RenderSettingsPrimDataSource : public HdContainerDataSource
                 _BuildOverlayContainerDataSource(
                     _BuildDependencyForActiveLocator(),
                     _BuildDependenciesForShutterInterval(cameraPaths),
+                    _BuildDependencyForFrameLocator(),
                     HdContainerDataSource::Cast(result));
         }
 
diff --git a/pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.h b/pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.h
index 8a2e05c474..3396aa729d 100644
--- a/pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.h
+++ b/pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICEN SE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_RENDER_SETTINGS_FILTERING_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_RENDER_SETTINGS_FILTERING_SCENE_INDEX_H
diff --git a/pxr/imaging/hdsi/sceneGlobalsSceneIndex.cpp b/pxr/imaging/hdsi/sceneGlobalsSceneIndex.cpp
index 864fd7207b..e14f577f1e 100644
--- a/pxr/imaging/hdsi/sceneGlobalsSceneIndex.cpp
+++ b/pxr/imaging/hdsi/sceneGlobalsSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdsi/sceneGlobalsSceneIndex.h"
@@ -28,6 +11,7 @@
 #include "pxr/imaging/hd/retainedDataSource.h"
 #include "pxr/imaging/hd/renderSettingsSchema.h"
 #include "pxr/imaging/hd/sceneGlobalsSchema.h"
+#include "pxr/imaging/hd/tokens.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -56,7 +40,10 @@ TfTokenVector
 _SceneGlobalsDataSource::GetNames()
 {
     static const TfTokenVector names = {
-        HdSceneGlobalsSchemaTokens->activeRenderSettingsPrim };
+        HdSceneGlobalsSchemaTokens->activeRenderPassPrim,
+        HdSceneGlobalsSchemaTokens->activeRenderSettingsPrim,
+        HdSceneGlobalsSchemaTokens->currentFrame
+    };
 
     return names;
 }
@@ -64,22 +51,19 @@ _SceneGlobalsDataSource::GetNames()
 HdDataSourceBaseHandle
 _SceneGlobalsDataSource::Get(const TfToken &name)
 {
+    if (name == HdSceneGlobalsSchemaTokens->activeRenderPassPrim) {
+        SdfPath const &path = _si->_activeRenderPassPrimPath;
+        return HdRetainedTypedSampledDataSource<SdfPath>::New(path);
+    }
     if (name == HdSceneGlobalsSchemaTokens->activeRenderSettingsPrim) {
-
         SdfPath const &path = _si->_activeRenderSettingsPrimPath;
-
-        if (!path.IsEmpty()) {
-            // Validate that a render settings prim exists at the given path.
-            HdSceneIndexPrim prim = _si->GetPrim(path);
-            if (prim.primType == HdRenderSettingsSchemaTokens->renderSettings &&
-                prim.dataSource) {
-
-                return HdRetainedTypedSampledDataSource<SdfPath>::New(path);
-            }
-        }
+        return HdRetainedTypedSampledDataSource<SdfPath>::New(path);
+    }
+    if (name == HdSceneGlobalsSchemaTokens->currentFrame) {
+        const double timeCode = _si->_time;
+        return HdRetainedTypedSampledDataSource<double>::New(timeCode);
     }
 
-    // If a valid render settings prim was never set, return nullptr.
     return nullptr;
 }
 
@@ -94,6 +78,27 @@ HdsiSceneGlobalsSceneIndex::New(const HdSceneIndexBaseRefPtr &inputSceneIndex)
     return TfCreateRefPtr(new HdsiSceneGlobalsSceneIndex(inputSceneIndex));
 }
 
+void
+HdsiSceneGlobalsSceneIndex::SetActiveRenderPassPrimPath(
+    const SdfPath &path)
+{
+    if (_activeRenderPassPrimPath == path) {
+        return;
+    }
+
+    // A scene index downstream will invalidate and update the
+    // sceneGlobals.activeRenderSettingsPrim locator (if the render pass points
+    // to a valid render settings prim).
+    // We keep things simple in this scene index.
+    _activeRenderPassPrimPath = path;
+
+    if (_IsObserved()) {
+        _SendPrimsDirtied({{
+            HdSceneGlobalsSchema::GetDefaultPrimPath(),
+            HdSceneGlobalsSchema::GetActiveRenderPassPrimLocator()}});
+    }
+}
+
 void
 HdsiSceneGlobalsSceneIndex::SetActiveRenderSettingsPrimPath(
     const SdfPath &path)
@@ -102,8 +107,6 @@ HdsiSceneGlobalsSceneIndex::SetActiveRenderSettingsPrimPath(
         return;
     }
 
-    // Note: Don't validate here since this could be called before scene indices
-    //       are populated.
     _activeRenderSettingsPrimPath = path;
 
     if (_IsObserved()) {
@@ -113,6 +116,24 @@ HdsiSceneGlobalsSceneIndex::SetActiveRenderSettingsPrimPath(
     }
 }
 
+void
+HdsiSceneGlobalsSceneIndex::SetCurrentFrame(const double &time)
+{
+    // XXX We might need to add a flag to force dirtying of the Frame locator 
+    // even if the time has not changed 
+    if (_time == time) {
+        return;
+    }
+
+    _time = time;
+
+    if (_IsObserved()) {
+        _SendPrimsDirtied({{
+            HdSceneGlobalsSchema::GetDefaultPrimPath(),
+            HdSceneGlobalsSchema::GetCurrentFrameLocator()}});
+    }
+}
+
 
 HdSceneIndexPrim
 HdsiSceneGlobalsSceneIndex::GetPrim(const SdfPath &primPath) const
diff --git a/pxr/imaging/hdsi/sceneGlobalsSceneIndex.h b/pxr/imaging/hdsi/sceneGlobalsSceneIndex.h
index 76966e0b5f..1f055cc69e 100644
--- a/pxr/imaging/hdsi/sceneGlobalsSceneIndex.h
+++ b/pxr/imaging/hdsi/sceneGlobalsSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICEN SE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_SCENE_GLOBALS_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_SCENE_GLOBALS_SCENE_INDEX_H
@@ -52,12 +35,22 @@ class HdsiSceneGlobalsSceneIndex : public HdSingleInputFilteringSceneIndexBase
     // Public (non-virtual) API
     // ------------------------------------------------------------------------
     
+    /// Caches the provided path and notifies any observers when the active 
+    /// render pass prim path is modified.
+    ///
+    HDSI_API
+    void SetActiveRenderPassPrimPath(const SdfPath &);
+    
     /// Caches the provided path and notifies any observers when the active 
     /// render settings prim path is modified.
     ///
     HDSI_API
     void SetActiveRenderSettingsPrimPath(const SdfPath &);
 
+    ///
+    HDSI_API
+    void SetCurrentFrame(const double &);
+
     // ------------------------------------------------------------------------
     // Satisfying HdSceneIndexBase
     // ------------------------------------------------------------------------
@@ -94,7 +87,9 @@ class HdsiSceneGlobalsSceneIndex : public HdSingleInputFilteringSceneIndexBase
 private:
     friend class _SceneGlobalsDataSource;
 
+    SdfPath _activeRenderPassPrimPath;
     SdfPath _activeRenderSettingsPrimPath;
+    double _time = std::numeric_limits<double>::quiet_NaN();
 };
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdsi/testenv/testHdsiPinnedCurveExpandingSceneIndex.cpp b/pxr/imaging/hdsi/testenv/testHdsiPinnedCurveExpandingSceneIndex.cpp
index 74977a9423..b2f8fc34d6 100644
--- a/pxr/imaging/hdsi/testenv/testHdsiPinnedCurveExpandingSceneIndex.cpp
+++ b/pxr/imaging/hdsi/testenv/testHdsiPinnedCurveExpandingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hd/basisCurvesSchema.h"
diff --git a/pxr/imaging/hdsi/tetMeshConversionSceneIndex.cpp b/pxr/imaging/hdsi/tetMeshConversionSceneIndex.cpp
index a60891f559..bb6492bf5a 100644
--- a/pxr/imaging/hdsi/tetMeshConversionSceneIndex.cpp
+++ b/pxr/imaging/hdsi/tetMeshConversionSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/hdsi/tetMeshConversionSceneIndex.h"
 
@@ -33,9 +16,6 @@
 #include "pxr/imaging/hd/tokens.h"
 #include "pxr/imaging/pxOsd/tokens.h"
 
-#include "pxr/usd/usdGeom/tetMesh.h"
-
-#include <iostream>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -49,19 +29,18 @@ _ComputeMeshTopologyDataSource(
     HdTetMeshTopologySchema meshTopoSchema = 
         HdTetMeshSchema::GetFromParent(primDataSource).GetTopology();
     // Get the TetVertexIndices
-    const HdVec4iArrayDataSourceHandle tetVertexIndicesDS =
-        meshTopoSchema.GetTetVertexIndices();
+    const HdVec3iArrayDataSourceHandle surfaceFaceIndicesDS =
+        meshTopoSchema.GetSurfaceFaceVertexIndices();
 
-    if (!tetVertexIndicesDS) {
+    if (!surfaceFaceIndicesDS) {
         return HdMeshTopologySchema::Builder()
             .SetOrientation(meshTopoSchema.GetOrientation())
             .Build();
     }
 
     // Compute the FaceVertexIndices and FaceVertexIndicesCounts
-    const VtVec3iArray surfaceFaceIndices =
-        UsdGeomTetMesh::ComputeSurfaceFaces(
-            tetVertexIndicesDS->GetTypedValue(0.0f));
+    const VtVec3iArray surfaceFaceIndices = 
+            surfaceFaceIndicesDS->GetTypedValue(0.0f);
 
     const size_t n = surfaceFaceIndices.size();
     VtIntArray faceVertexCounts(n, 3);
diff --git a/pxr/imaging/hdsi/tetMeshConversionSceneIndex.h b/pxr/imaging/hdsi/tetMeshConversionSceneIndex.h
index bdadd142c4..cb077a550c 100644
--- a/pxr/imaging/hdsi/tetMeshConversionSceneIndex.h
+++ b/pxr/imaging/hdsi/tetMeshConversionSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_TET_MESH_CONVERSION_SCENE_INDEX_H
 #define PXR_IMAGING_HDSI_TET_MESH_CONVERSION_SCENE_INDEX_H
diff --git a/pxr/imaging/hdsi/utils.cpp b/pxr/imaging/hdsi/utils.cpp
new file mode 100644
index 0000000000..482093e6af
--- /dev/null
+++ b/pxr/imaging/hdsi/utils.cpp
@@ -0,0 +1,106 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "pxr/imaging/hdsi/utils.h"
+
+#include "pxr/imaging/hd/collectionExpressionEvaluator.h"
+#include "pxr/usd/sdf/predicateLibrary.h"
+#include "pxr/base/trace/trace.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+namespace {
+
+// For pruning collections that use a path expression without a trailing '//',
+// an ancestral match counts.
+// e.g. The path /World/Foo/Bar should be matched by the expression
+//      /World/Foo (or //Foo) because pruning /World/Foo also prunes all of its
+//      descendants.
+//
+SdfPredicateFunctionResult
+_GetPruneMatchResult(
+    const SdfPath &primPath,
+    const HdCollectionExpressionEvaluator &eval)
+{
+    TRACE_FUNCTION();
+
+    // For pruning collections, an ancestral match counts.
+    //
+    const SdfPathVector prefixes = primPath.GetPrefixes();
+    for (const SdfPath &path : prefixes) {
+        const auto result = eval.Match(path);
+
+        // Short circuit when possible:
+        // 1. Path matches.
+        if (result) {
+            return result;
+        }
+
+        // 2. Path doesn't match, nor does any of its descendants.
+        if (result.IsConstant()) {
+            return result;
+        }
+    }
+    
+    return SdfPredicateFunctionResult(false);
+}
+
+} // anon
+
+bool
+HdsiUtilsIsPruned(
+    const SdfPath &primPath,
+    const HdCollectionExpressionEvaluator &eval)
+{
+    return _GetPruneMatchResult(primPath, eval);
+}
+
+void
+HdsiUtilsRemovePrunedChildren(
+    const SdfPath &parentPath,
+    const HdCollectionExpressionEvaluator &eval,
+    SdfPathVector *children)
+{
+    if (!children) {
+        TF_CODING_ERROR("Received null vector.");
+        return;
+    }
+    if (children->empty()) {
+        return;
+    }
+
+    const auto result = _GetPruneMatchResult(parentPath, eval);
+    if (result) {
+        // If the parent is pruned, all its children are also pruned.
+        children->clear();
+        return;
+    }
+
+    // Parent isn't pruned. We have two possibilities:
+    // 1. Result is constant over descendants, meaning that none of the children
+    //    are pruned.
+    // 2. Result varies over descendants. We need to evaluate the expression at
+    //    each child.
+
+    // #1.
+    if (result.IsConstant()) {
+        return;
+    }
+
+    // #2.
+    // We only care about the result at the child path and do not need to 
+    // evaluate its descendants.
+    //
+    children->erase(
+        std::remove_if(
+            children->begin(), children->end(),
+            [&eval, &parentPath](const SdfPath &childPath) {
+                return eval.Match(childPath);
+            }),
+        children->end());
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdsi/utils.h b/pxr/imaging/hdsi/utils.h
new file mode 100644
index 0000000000..d542227a29
--- /dev/null
+++ b/pxr/imaging/hdsi/utils.h
@@ -0,0 +1,44 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_IMAGING_HDSI_UTILS_H
+#define PXR_IMAGING_HDSI_UTILS_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hdsi/api.h"
+#include "pxr/usd/sdf/path.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdCollectionExpressionEvaluator;
+
+/// --------------------------------------------------------------------------
+/// Utilities to evaluate membership expressions for collections with pruning
+/// semantics.
+/// --------------------------------------------------------------------------
+
+/// Returns whether the prim at \p primPath is pruned by the suppied
+/// evaluator.
+///
+HDSI_API
+bool 
+HdsiUtilsIsPruned(
+    const SdfPath &primPath,
+    const HdCollectionExpressionEvaluator &eval);
+
+/// Prunes the given list of children using the supplied evaluator.
+HDSI_API
+void
+HdsiUtilsRemovePrunedChildren(
+    const SdfPath &parentPath,
+    const HdCollectionExpressionEvaluator &eval,
+    SdfPathVector *children);
+
+/// ------------------------------------------------------------------------
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //PXR_IMAGING_HDSI_UTILS_H
diff --git a/pxr/imaging/hdsi/velocityMotionResolvingSceneIndex.cpp b/pxr/imaging/hdsi/velocityMotionResolvingSceneIndex.cpp
new file mode 100644
index 0000000000..1882bdf506
--- /dev/null
+++ b/pxr/imaging/hdsi/velocityMotionResolvingSceneIndex.cpp
@@ -0,0 +1,770 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the Apache License, Version 2.0 (the "Apache License")
+// with the following modification; you may not use this file except in
+// compliance with the Apache License and the following modification to it:
+// Section 6. Trademarks. is deleted and replaced with:
+//
+// 6. Trademarks. This License does not grant permission to use the trade
+//    names, trademarks, service marks, or product names of the Licensor
+//    and its affiliates, except as required to comply with Section 4(c) of
+//    the License and to reproduce the content of the NOTICE file.
+//
+// You may obtain a copy of the Apache License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Apache License with the above modification is
+// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the Apache License for the specific
+// language governing permissions and limitations under the Apache License.
+//
+#include "pxr/imaging/hdsi/velocityMotionResolvingSceneIndex.h"
+
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/primvarSchema.h"
+#include "pxr/imaging/hd/primvarsSchema.h"
+#include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexObserver.h"
+#include "pxr/imaging/hd/tokens.h"
+
+#include "pxr/usd/sdf/path.h"
+
+#include "pxr/base/gf/rotation.h"
+#include "pxr/base/tf/refPtr.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/vt/typeHeaders.h"
+#include "pxr/base/vt/types.h"
+#include "pxr/base/vt/value.h"
+#include "pxr/base/vt/visitValue.h"
+
+#include "pxr/pxr.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (fps));
+    
+namespace {
+    
+// XXX: We need to encode the fps in the scene index (in a standard
+// place). Note that fps is called timeCodesPerSecond in USD.
+const float _fps = 24.0f;
+    
+float _GetFps(const HdContainerDataSourceHandle& inputArgs)
+{
+    if (!inputArgs) {
+        return _fps;
+    }
+    const auto source = HdSampledDataSource::Cast(inputArgs->Get(_tokens->fps));
+    if (!source) {
+        return _fps;
+    }
+    const VtValue &value = source->GetValue(0.0f);
+    if (!value.IsHolding<float>()) {
+        return _fps;
+    }
+    return value.UncheckedGet<float>();
+}
+
+bool
+_PrimTypeUsesVelocity(const TfToken& primType)
+{
+    static const TfToken::Set types {
+        HdPrimTypeTokens->points,
+        HdPrimTypeTokens->basisCurves,
+        HdPrimTypeTokens->nurbsCurves,
+        HdPrimTypeTokens->nurbsPatch,
+        HdPrimTypeTokens->tetMesh,
+        HdPrimTypeTokens->mesh,
+        HdPrimTypeTokens->instancer };
+    return types.count(primType) > 0;
+}
+
+bool
+_PrimvarAffectedByVelocity(const TfToken& primvar)
+{
+    static const TfToken::Set primvars {
+        HdPrimvarsSchemaTokens->points,
+        HdInstancerTokens->instanceTranslations,
+        HdInstancerTokens->instanceRotations };
+    return primvars.count(primvar) > 0;
+}
+
+// -----------------------------------------------------------------------------
+
+// Since we can have rotations as VtQuathArray or VtQuatfArray, these helpers
+// make applying angular velocities to them less ugly.
+
+template <typename T>
+VtValue
+_ApplyAngularVelocities(
+    const VtArray<T>& rotations,
+    const VtVec3fArray& velocities,
+    const HdSampledDataSource::Time scaledTime)
+{
+    VtArray<T> result(rotations.size());
+    for (size_t i = 0; i < rotations.size(); ++i) {
+        GfRotation rotation = GfRotation(rotations[i]);
+        rotation *= GfRotation(velocities[i],
+            scaledTime * velocities[i].GetLength());
+        result[i] = T(rotation.GetQuat());
+    }
+    return VtValue(result);
+}
+
+VtValue
+_ApplyAngularVelocities(
+    const VtValue& rotations,
+    const VtVec3fArray& velocities,
+    const HdSampledDataSource::Time scaledTime)
+{
+    if (rotations.IsHolding<VtQuathArray>()) {
+        return _ApplyAngularVelocities(
+            rotations.UncheckedGet<VtQuathArray>(), velocities, scaledTime);
+    }
+    if (rotations.IsHolding<VtQuatfArray>()) {
+        return _ApplyAngularVelocities(
+            rotations.UncheckedGet<VtQuatfArray>(), velocities, scaledTime);
+    }
+    TF_CODING_ERROR("Unexpected rotations type");
+    return VtValue();
+}
+
+// -----------------------------------------------------------------------------
+
+class _VelocityHelper
+{
+public:
+    using Time = HdSampledDataSource::Time;
+    
+    _VelocityHelper(
+        const TfToken& name,
+        const HdSampledDataSourceHandle& source,
+        const SdfPath& primPath,
+        const HdContainerDataSourceHandle& primSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _name(name)
+      , _source(source)
+      , _primPath(primPath)
+      , _primSource(primSource)
+      , _inputArgs(inputArgs)
+    { }
+    
+protected:
+    bool
+    _GetContributingSampleTimesForInterval(
+        Time startTime,
+        Time endTime,
+        std::vector<Time>* const outSampleTimes)
+    {
+        // If the source reports no motion over the interval defer to source.
+        const bool sourceRes = _source->GetContributingSampleTimesForInterval(
+            startTime, endTime, outSampleTimes);
+        VtValue sourceValue;
+        Time sampleTime;
+        if (!_VelocityMotionValidForCurrentFrame(&sourceValue, nullptr, &sampleTime)) {
+            return sourceRes;
+        }
+        
+        // Velocity motion is valid; check for non-linear motion and
+        // insert any additional required sample times according to
+        // nonlinearSampleCount.
+        *outSampleTimes = { startTime, endTime };
+        if (_name == HdInstancerTokens->instanceRotations ||
+            _GetAccelerations(sampleTime).size() >= sourceValue.GetArraySize()) {
+            const int n = std::max(3, _GetNonlinearSampleCount()) - 1;
+            for (int k = 1; k < n; ++k) {
+                outSampleTimes->insert(outSampleTimes->end() - 1, 
+                    startTime + float(k) / float(n) * (endTime - startTime));
+            }
+        }
+        return true;
+    }
+    
+    VtValue
+    _GetValue(Time shutterOffset)
+    {
+        VtVec3fArray velocities;
+        VtValue sourceVal;
+        Time sampleTime;
+        if (!_VelocityMotionValidForCurrentFrame(
+            &sourceVal, &velocities, &sampleTime)) {
+            return _source->GetValue(shutterOffset);
+        }
+        const float fps = _GetFps(_inputArgs);
+        const Time scaledTime = (shutterOffset - sampleTime) / fps;
+        
+        // rotations
+        if (_name == HdInstancerTokens->instanceRotations) {
+            return _ApplyAngularVelocities(sourceVal, velocities, scaledTime);
+        }
+        
+        // positions
+        const auto positions = sourceVal.UncheckedGet<VtVec3fArray>();
+        
+        // check for accelerations
+        const auto accelerations = _GetAccelerations(sampleTime);
+        const bool useAccelerations = accelerations.size() >= positions.size();
+        
+        // perform velocity motion on positions
+        VtVec3fArray result(positions.size());
+        if (useAccelerations) {
+            const float timeSqrHalf = 0.5f * scaledTime * scaledTime;
+            for (size_t i = 0; i < positions.size(); ++i) {
+                result[i] = positions[i]
+                  + scaledTime * velocities[i]
+                  + timeSqrHalf * accelerations[i];
+            }
+        } else {
+            for (size_t i = 0; i < positions.size(); ++i) {
+                result[i] = positions[i]
+                  + scaledTime * velocities[i];
+            }
+        }
+        return VtValue(result);
+    }
+
+private:    
+    // Retrieves the value of the accelerations primvar for the current frame,
+    // if present. If not present, or incorrect type, or the contributing sample
+    // time doesn't match the given one, returns an empty VtVec3fArray.
+    // Caller still needs to check that there are enough accelerations
+    // values to cover all the positions needing transformation.
+    VtVec3fArray
+    _GetAccelerations(
+        const Time sampleTime) const
+    {
+        static const VtVec3fArray empty { };
+        static const HdDataSourceLocator accelerationsLocator {
+            HdPrimvarsSchema::GetSchemaToken(),
+            HdTokens->accelerations,
+            HdPrimvarSchemaTokens->primvarValue };
+        const auto accelerationsDs = HdSampledDataSource::Cast(
+            HdContainerDataSource::Get(_primSource, accelerationsLocator));
+        if (!accelerationsDs) {
+            // accelerations not present
+            return empty;
+        }
+        std::vector<Time> times;
+        if (!accelerationsDs->GetContributingSampleTimesForInterval(
+            0.0, 0.0, &times)) {
+            // accelerations has constant value across all time; sample timing
+            // does not matter
+            times.resize(1);
+            times.front() = sampleTime;
+        }
+        if (times.front() != sampleTime) {
+            // accelerations not authored at same starting time as source
+            return empty;
+        }
+        const VtValue accelerationsVal = accelerationsDs->GetValue(times.front());
+        if (!accelerationsVal.IsHolding<VtVec3fArray>()) {
+            // accelerations are wrong type
+            return empty;
+        }
+        return accelerationsVal.UncheckedGet<VtVec3fArray>();
+    }
+    
+    /// \brief Determines whether the conditions are met for performing velocity-
+    /// based motion on the underlying source primvar at the current frame.
+    /// Populates \p srcVal, \p velocities, and \p outSampleTime, if provided,
+    /// with their respective values so they do not need to be fetched again by
+    /// the caller.
+    /// \param srcValue (optional) will be filled with the sampled value of the
+    /// underlying source for the current frame. This will be 0-order points,
+    /// positions, or orientations at the first authored sample time at or
+    /// before shutterOffset 0
+    /// \param velocities (optional) will be filled with the sampled velocities
+    /// value at for the current frame. This will be the 1-order velocities or
+    /// angular velocities t the first authored sample time at or before
+    /// shutterOffset 0
+    /// \param outSampleTime (optional) will be filled with the shutterOffset
+    /// value at which \p srcValue and \p velocities were actually sampled. This
+    /// is the offset to the most recent authored time sample, and will always
+    /// be <= 0
+    /// \returns true if conditions are met for velocity motion, false
+    /// otherwise. The optional parameters will not be populated if the return
+    /// value is false.
+    bool
+    _VelocityMotionValidForCurrentFrame(
+        VtValue* srcValue = nullptr,
+        VtVec3fArray* velocities = nullptr,
+        Time* outSampleTime = nullptr) const
+    {
+        const HdDataSourceLocator velocitiesLocator {
+            HdPrimvarsSchema::GetSchemaToken(),
+            _name == HdInstancerTokens->instanceRotations
+              ? HdTokens->angularVelocities
+              : HdTokens->velocities,
+            HdPrimvarSchemaTokens->primvarValue };
+        const HdSampledDataSourceHandle velocitiesDs =
+            HdSampledDataSource::Cast(HdContainerDataSource::Get(
+                _primSource, velocitiesLocator));
+        if (!velocitiesDs) {
+            // velocities not present
+            return false;
+        }
+        std::vector<std::vector<Time>> times(2);
+        if (!_source->GetContributingSampleTimesForInterval(
+            0.0, 0.0, &times[0])) {
+            // source has constant value across all time; no velocity motion
+            return false;
+        }
+        if (!velocitiesDs->GetContributingSampleTimesForInterval(
+            0.0, 0.0, &times[1])) {
+            // velocities has constant value across all time; sample timing
+            // does not matter
+            times[1].resize(1);
+            times[1].front() = times[0].front();
+        };
+        if (times[1].front() != times[0].front()) {
+            // velocities not authored at same starting time as source
+            return false;
+        }
+        const Time sampleTime = times[0].front();
+        const VtValue velocitiesVal = velocitiesDs->GetValue(sampleTime);
+        if (!velocitiesVal.IsHolding<VtVec3fArray>()) {
+            // velocities are wrong type
+            return false;
+        }
+        const VtValue sourceVal = _source->GetValue(sampleTime);
+        if (sourceVal.GetArraySize() > velocitiesVal.GetArraySize()) {
+            // not enough velocities
+            return false;
+        }
+        if (_name == HdInstancerTokens->instanceRotations) {
+            if (!(sourceVal.IsHolding<VtQuathArray>() ||
+                sourceVal.IsHolding<VtQuatfArray>())) {
+                // source rotations are wrong type
+                return false;
+            }
+        } else if (!sourceVal.IsHolding<VtVec3fArray>()) {
+            // source points/positions are wrong type
+            return false;
+        }
+        if (srcValue != nullptr) {
+            *srcValue = sourceVal;
+        }
+        if (velocities != nullptr) {
+            *velocities = velocitiesVal.UncheckedGet<VtVec3fArray>();
+        }
+        if (outSampleTime != nullptr) {
+            *outSampleTime = sampleTime;
+        }
+        return true;
+    }
+    
+    int
+    _GetNonlinearSampleCount()
+    {
+        static const int defaultValue = 3; // From UsdGeomMotionAPI
+        static const HdDataSourceLocator locator = {
+            HdPrimvarsSchema::GetSchemaToken(),
+            HdTokens->nonlinearSampleCount,
+            HdPrimvarSchemaTokens->primvarValue };
+        const auto ds = HdSampledDataSource::Cast(HdContainerDataSource::Get(
+            _primSource, locator));
+        if (!ds) {
+            return defaultValue;
+        }
+        return ds->GetValue(0.0).GetWithDefault(defaultValue);
+    }
+    
+    // name of the 0-order parameter this data source wraps
+    // (positions, points, or orientations)
+    TfToken _name;
+    // the incoming data source for the 0-order parameter to be wrapped
+    HdSampledDataSourceHandle _source;
+    SdfPath _primPath;
+    HdContainerDataSourceHandle _primSource;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+// -----------------------------------------------------------------------------
+
+class _UntypedValueDataSource final
+  : public HdSampledDataSource
+  , private _VelocityHelper
+{
+public:
+    using Time = HdSampledDataSource::Time;
+    
+    HD_DECLARE_DATASOURCE(_UntypedValueDataSource);
+    
+    _UntypedValueDataSource(
+        const TfToken& name,
+        const HdSampledDataSourceHandle& source,
+        const SdfPath& primPath,
+        const HdContainerDataSourceHandle& primSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _VelocityHelper(name, source, primPath, primSource, inputArgs)
+    { }
+    
+    VtValue
+    GetValue(Time shutterOffset) override
+    {
+        return _GetValue(shutterOffset);
+    }
+    
+    bool GetContributingSampleTimesForInterval(
+        Time startTime, Time endTime,
+        std::vector<Time>* outSampleTimes) override
+    {
+        return _GetContributingSampleTimesForInterval(
+            startTime, endTime, outSampleTimes);
+    }
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_UntypedValueDataSource);
+
+// -----------------------------------------------------------------------------
+
+template <typename T>
+class _TypedValueDataSource final
+  : public HdTypedSampledDataSource<T>
+  , private _VelocityHelper
+{
+public:
+    using Time = HdSampledDataSource::Time;
+    
+    HD_DECLARE_DATASOURCE_ABSTRACT(_TypedValueDataSource<T>);
+    
+    _TypedValueDataSource(
+        const TfToken& name,
+        const HdSampledDataSourceHandle& source,
+        const SdfPath& primPath,
+        const HdContainerDataSourceHandle& primSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _VelocityHelper(name, source, primPath, primSource, inputArgs)
+    { }
+    
+    VtValue
+    GetValue(Time shutterOffset) override
+    {
+        return _GetValue(shutterOffset);
+    }
+    
+    bool
+    GetContributingSampleTimesForInterval(
+        Time startTime, Time endTime,
+        std::vector<Time>* outSampleTimes) override
+    {
+        return _GetContributingSampleTimesForInterval(
+            startTime, endTime, outSampleTimes);
+    }
+    
+    T
+    GetTypedValue(Time shutterOffset) override
+    {
+        const VtValue& v = GetValue(shutterOffset);
+        if (v.IsHolding<T>()) {
+            return v.UncheckedGet<T>();
+        }
+        return T();
+    }
+    
+    static typename
+    _TypedValueDataSource<T>::Handle New(
+        const TfToken& name,
+        const HdSampledDataSourceHandle& source,
+        const SdfPath& primPath,
+        const HdContainerDataSourceHandle& primSource,
+        const HdContainerDataSourceHandle& inputArgs)
+    {
+        return _TypedValueDataSource<T>::Handle(
+            new _TypedValueDataSource<T>(
+                name, source, primPath, primSource, inputArgs));
+    }
+};
+
+// -----------------------------------------------------------------------------
+
+struct _PrimvarSourceTypeVisitor
+{
+    const TfToken name;
+    const HdSampledDataSourceHandle source;
+    const SdfPath& primPath;
+    const HdContainerDataSourceHandle primSource;
+    const HdContainerDataSourceHandle inputArgs;
+    
+    template <typename T>
+    HdDataSourceBaseHandle
+    operator()(const T&)
+    {
+        return _TypedValueDataSource<T>::New(
+            name, source, primPath, primSource, inputArgs);
+    }
+    
+    HdDataSourceBaseHandle
+    operator()(const VtValue&)
+    {
+        return _UntypedValueDataSource::New(
+            name, source, primPath, primSource, inputArgs);
+    }
+};
+
+// -----------------------------------------------------------------------------
+
+class _PrimvarDataSource final
+  : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_PrimvarDataSource);
+    
+    _PrimvarDataSource(
+        const TfToken& name,
+        const HdContainerDataSourceHandle& source,
+        const SdfPath& primPath,
+        const HdContainerDataSourceHandle& primSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _name(name)
+      , _source(source)
+      , _primPath(primPath)
+      , _primSource(primSource)
+      , _inputArgs(inputArgs)
+    { }
+    
+    TfTokenVector
+    GetNames() override
+    {
+        if (!_source) {
+            return { };
+        }
+
+        return _source->GetNames();
+    }
+    
+    HdDataSourceBaseHandle
+    Get(const TfToken& name) override
+    {
+        if (!_source) {
+            return nullptr;
+        }
+        HdDataSourceBaseHandle ds = _source->Get(name);
+        if (ds && name == HdPrimvarSchemaTokens->primvarValue) {
+            if (const auto source = HdSampledDataSource::Cast(ds)) {
+                // XXX: source is sampled at time 0 only to determine its type
+                return VtVisitValue(
+                    source->GetValue(0.0f),
+                    _PrimvarSourceTypeVisitor {
+                        _name, source, _primPath, _primSource, _inputArgs });
+            }
+        }
+        return ds;
+    }
+    
+private:
+    TfToken _name;
+    HdContainerDataSourceHandle _source;
+    SdfPath _primPath;
+    HdContainerDataSourceHandle _primSource;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_PrimvarDataSource);
+
+// -----------------------------------------------------------------------------
+
+class _PrimvarsDataSource final
+  : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_PrimvarsDataSource);
+    
+    _PrimvarsDataSource(
+        const HdContainerDataSourceHandle& source,
+        const SdfPath& primPath,
+        const HdContainerDataSourceHandle& primSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _source(source)
+      , _primPath(primPath)
+      , _primSource(primSource)
+      , _inputArgs(inputArgs)
+    { }
+    
+    TfTokenVector
+    GetNames() override
+    {
+        if (!_source) {
+            return { };
+        }
+        return _source->GetNames();
+    }
+    
+    HdDataSourceBaseHandle
+    Get(const TfToken& name) override
+    {
+        if (!_source) {
+            return nullptr;
+        }
+        HdDataSourceBaseHandle ds = _source->Get(name);
+        if (ds && _PrimvarAffectedByVelocity(name)) {
+            return _PrimvarDataSource::New(
+                name, HdContainerDataSource::Cast(ds),
+                _primPath, _primSource, _inputArgs);
+        }
+        return ds;
+    }
+private:
+    HdContainerDataSourceHandle _source;
+    SdfPath _primPath;
+    HdContainerDataSourceHandle _primSource;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_PrimvarsDataSource);
+
+// -----------------------------------------------------------------------------
+
+class _PrimDataSource final
+  : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_PrimDataSource);
+    
+    _PrimDataSource(
+        const SdfPath& primPath,
+        const HdContainerDataSourceHandle& primSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _primPath(primPath)
+      , _primSource(primSource)
+      , _inputArgs(inputArgs)
+    { }
+    
+    TfTokenVector
+    GetNames() override
+    {
+        if (!_primSource) {
+            return { };
+        }
+        return _primSource->GetNames();
+    }
+    
+    HdDataSourceBaseHandle
+    Get(const TfToken& name) override
+    {
+        if (!_primSource) {
+            return nullptr;
+        }
+        HdDataSourceBaseHandle ds = _primSource->Get(name);
+        if (ds && name == HdPrimvarsSchema::GetSchemaToken()) {
+            return _PrimvarsDataSource::New(
+                HdContainerDataSource::Cast(ds),
+                _primPath, _primSource, _inputArgs);
+        }
+        return ds;
+    }
+private:
+    SdfPath _primPath;
+    HdContainerDataSourceHandle _primSource;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_PrimDataSource);
+
+} // anonymous namespace
+
+HdsiVelocityMotionResolvingSceneIndexRefPtr
+HdsiVelocityMotionResolvingSceneIndex::New(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex,
+    const HdContainerDataSourceHandle& inputArgs)
+{
+    return TfCreateRefPtr(
+        new HdsiVelocityMotionResolvingSceneIndex(inputSceneIndex, inputArgs));
+}
+
+HdsiVelocityMotionResolvingSceneIndex::HdsiVelocityMotionResolvingSceneIndex(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex,
+    const HdContainerDataSourceHandle& inputArgs)
+ : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+ , _inputArgs(inputArgs)
+{ }
+
+HdSceneIndexPrim
+HdsiVelocityMotionResolvingSceneIndex::GetPrim(
+    const SdfPath& primPath) const
+{
+    HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+    if (_PrimTypeUsesVelocity(prim.primType)) {
+        prim.dataSource = _PrimDataSource::New(
+            primPath, prim.dataSource, _inputArgs);
+    }
+    return prim;
+}
+
+SdfPathVector
+HdsiVelocityMotionResolvingSceneIndex::GetChildPrimPaths(
+    const SdfPath& primPath) const
+{
+    return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+}
+
+void
+HdsiVelocityMotionResolvingSceneIndex::_PrimsAdded(
+    const HdSceneIndexBase&  /*sender*/,
+    const HdSceneIndexObserver::AddedPrimEntries& entries)
+{
+    return _SendPrimsAdded(entries);
+}
+
+void
+HdsiVelocityMotionResolvingSceneIndex::_PrimsRemoved(
+    const HdSceneIndexBase&  /*sender*/,
+    const HdSceneIndexObserver::RemovedPrimEntries& entries)
+{
+    return _SendPrimsRemoved(entries);
+}
+
+void
+HdsiVelocityMotionResolvingSceneIndex::_PrimsDirtied(
+    const HdSceneIndexBase&  /*sender*/,
+    const HdSceneIndexObserver::DirtiedPrimEntries& entries)
+{
+    static const HdDataSourceLocatorSet positionsLocators {
+        HdPrimvarsSchema::GetPointsLocator(),
+        HdPrimvarsSchema::GetDefaultLocator()
+            .Append(HdInstancerTokens->instanceTranslations) };
+    static const HdDataSourceLocatorSet positionsAffectingLocators {
+        HdPrimvarsSchema::GetDefaultLocator()
+            .Append(HdTokens->velocities),
+        HdPrimvarsSchema::GetDefaultLocator()
+            .Append(HdTokens->accelerations),
+        HdPrimvarsSchema::GetDefaultLocator()
+            .Append(HdTokens->nonlinearSampleCount) };
+    static const HdDataSourceLocatorSet rotationsLocators {
+        HdPrimvarsSchema::GetDefaultLocator()
+            .Append(HdInstancerTokens->instanceRotations) };
+    static const HdDataSourceLocatorSet rotationsAffectingLocators {
+        HdPrimvarsSchema::GetDefaultLocator()
+            .Append(HdTokens->angularVelocities),
+        HdPrimvarsSchema::GetDefaultLocator()
+            .Append(HdTokens->nonlinearSampleCount) };
+    HdSceneIndexObserver::DirtiedPrimEntries newEntries;
+    for (const auto& entry : entries) {
+        HdSceneIndexObserver::DirtiedPrimEntry newEntry(entry);
+        if (entry.dirtyLocators.Intersects(positionsAffectingLocators) &&
+            !entry.dirtyLocators.Intersects(positionsLocators)) {
+            newEntry.dirtyLocators.insert(positionsLocators);
+        }
+        if (entry.dirtyLocators.Intersects(rotationsAffectingLocators) &&
+            !entry.dirtyLocators.Intersects(rotationsLocators)) {
+            newEntry.dirtyLocators.insert(rotationsLocators);
+        }
+        newEntries.push_back(newEntry);
+    }
+    return _SendPrimsDirtied(newEntries);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdsi/velocityMotionResolvingSceneIndex.h b/pxr/imaging/hdsi/velocityMotionResolvingSceneIndex.h
new file mode 100644
index 0000000000..5cc320a62a
--- /dev/null
+++ b/pxr/imaging/hdsi/velocityMotionResolvingSceneIndex.h
@@ -0,0 +1,87 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the Apache License, Version 2.0 (the "Apache License")
+// with the following modification; you may not use this file except in
+// compliance with the Apache License and the following modification to it:
+// Section 6. Trademarks. is deleted and replaced with:
+//
+// 6. Trademarks. This License does not grant permission to use the trade
+//    names, trademarks, service marks, or product names of the Licensor
+//    and its affiliates, except as required to comply with Section 4(c) of
+//    the License and to reproduce the content of the NOTICE file.
+//
+// You may obtain a copy of the Apache License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Apache License with the above modification is
+// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the Apache License for the specific
+// language governing permissions and limitations under the Apache License.
+//
+#ifndef PXR_IMAGING_HDSI_VELOCITY_MOTION_RESOLVING_SCENE_INDEX_H
+#define PXR_IMAGING_HDSI_VELOCITY_MOTION_RESOLVING_SCENE_INDEX_H
+
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexObserver.h"
+#include "pxr/imaging/hdsi/api.h"
+
+#include "pxr/usd/sdf/path.h"
+
+#include "pxr/base/tf/declarePtrs.h"
+
+#include "pxr/pxr.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DECLARE_REF_PTRS(HdsiVelocityMotionResolvingSceneIndex);
+
+class HdsiVelocityMotionResolvingSceneIndex
+  : public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    HDSI_API
+    static HdsiVelocityMotionResolvingSceneIndexRefPtr
+    New(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex,
+        const HdContainerDataSourceHandle& inputArgs);
+    
+    HDSI_API
+    HdSceneIndexPrim
+    GetPrim(const SdfPath& primPath) const override;
+    
+    HDSI_API
+    SdfPathVector
+    GetChildPrimPaths(const SdfPath& primPath) const override;
+
+protected:
+    HdsiVelocityMotionResolvingSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex,
+        const HdContainerDataSourceHandle& inputArgs);
+    
+    void
+    _PrimsAdded(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::AddedPrimEntries& entries) override;
+    
+    void
+    _PrimsRemoved(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::RemovedPrimEntries& entries) override;
+    
+    void
+    _PrimsDirtied(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries& entries) override;
+
+private:
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HDSI_VELOCITY_MOTION_RESOLVING_SCENE_INDEX_H
diff --git a/pxr/imaging/hdsi/version.h b/pxr/imaging/hdsi/version.h
index 1a634ffd73..3adf017fd1 100644
--- a/pxr/imaging/hdsi/version.h
+++ b/pxr/imaging/hdsi/version.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDSI_VERSION_H
 #define PXR_IMAGING_HDSI_VERSION_H
@@ -27,7 +10,9 @@
 // 10 -> 11: Adding HdsiPrimManagingSceneIndexObserver and
 //           HdsiPrimTypeNoticeBatchingSceneIndex
 // 11 -> 12: Adding HdsiPrimManagingSceneIndexObserver::GetTypedPrim.
+// 12 -> 13: Adding HdsiLightLinkingSceneIndex.
+// 13 -> 14: Add utilities for evaluating expressions on pruning collections.
 
-#define HDSI_API_VERSION 12
+#define HDSI_API_VERSION 14
 
 #endif // PXR_IMAGING_HDSI_VERSION_H
diff --git a/pxr/imaging/hdx/aovInputTask.cpp b/pxr/imaging/hdx/aovInputTask.cpp
index 7f6375f73a..b6de469b3a 100644
--- a/pxr/imaging/hdx/aovInputTask.cpp
+++ b/pxr/imaging/hdx/aovInputTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/aovInputTask.h"
 #include "pxr/imaging/hdx/hgiConversions.h"
diff --git a/pxr/imaging/hdx/aovInputTask.h b/pxr/imaging/hdx/aovInputTask.h
index 78745faaf2..784e783bca 100644
--- a/pxr/imaging/hdx/aovInputTask.h
+++ b/pxr/imaging/hdx/aovInputTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_AOV_INPUT_TASK_H
 #define PXR_IMAGING_HDX_AOV_INPUT_TASK_H
diff --git a/pxr/imaging/hdx/api.h b/pxr/imaging/hdx/api.h
index c3c4ab0bdc..0e45ca817b 100644
--- a/pxr/imaging/hdx/api.h
+++ b/pxr/imaging/hdx/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_API_H
 #define PXR_IMAGING_HDX_API_H
diff --git a/pxr/imaging/hdx/boundingBoxTask.cpp b/pxr/imaging/hdx/boundingBoxTask.cpp
index 822798964d..9cc76ace86 100644
--- a/pxr/imaging/hdx/boundingBoxTask.cpp
+++ b/pxr/imaging/hdx/boundingBoxTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/boundingBoxTask.h"
 
diff --git a/pxr/imaging/hdx/boundingBoxTask.h b/pxr/imaging/hdx/boundingBoxTask.h
index c5e2ee15a3..b597089b3a 100644
--- a/pxr/imaging/hdx/boundingBoxTask.h
+++ b/pxr/imaging/hdx/boundingBoxTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HDX_BOUNDINGBOX_TASK_H
 #define HDX_BOUNDINGBOX_TASK_H
diff --git a/pxr/imaging/hdx/colorChannelTask.cpp b/pxr/imaging/hdx/colorChannelTask.cpp
index a06a9239fa..e222fe92a2 100644
--- a/pxr/imaging/hdx/colorChannelTask.cpp
+++ b/pxr/imaging/hdx/colorChannelTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/colorChannelTask.h"
 #include "pxr/imaging/hdx/fullscreenShader.h"
diff --git a/pxr/imaging/hdx/colorChannelTask.h b/pxr/imaging/hdx/colorChannelTask.h
index ec9565394d..7de9e9e807 100644
--- a/pxr/imaging/hdx/colorChannelTask.h
+++ b/pxr/imaging/hdx/colorChannelTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HDX_COLORCHANNEL_TASK_H
 #define HDX_COLORCHANNEL_TASK_H
diff --git a/pxr/imaging/hdx/colorCorrectionTask.cpp b/pxr/imaging/hdx/colorCorrectionTask.cpp
index 9940047f87..01aef4535f 100644
--- a/pxr/imaging/hdx/colorCorrectionTask.cpp
+++ b/pxr/imaging/hdx/colorCorrectionTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/colorCorrectionTask.h"
 #include "pxr/imaging/hdx/package.h"
@@ -349,9 +332,9 @@ HdxColorCorrectionTask::_CreateOpenColorIOResourcesImpl(
     shaderDesc->setFunctionName("OCIODisplay");
     const float *lutValues = nullptr;
     shaderDesc->setLanguage(
-        hgi->GetAPIName() == HgiTokens->OpenGL ?
-                    OCIO::GPU_LANGUAGE_GLSL_4_0 :
-                    OCIO::GPU_LANGUAGE_MSL_2_0);
+        hgi->GetAPIName() == HgiTokens->Metal ?
+                    OCIO::GPU_LANGUAGE_MSL_2_0 :
+                    OCIO::GPU_LANGUAGE_GLSL_4_0);
     gpuProcessor->extractGpuShaderInfo(shaderDesc);
 
     //
@@ -570,7 +553,7 @@ HdxColorCorrectionTask::_CreateOpenColorIOShaderCode(
         }
         else
         {
-            // For OpenGL case:
+            // For OpenGL and Vulkan case:
             // Since OCIO textures don't have a binding index, we use
             // the declaration provided by Hgi that has a proper
             // binding and layout. Therefore we subsitute sampler
@@ -584,10 +567,23 @@ HdxColorCorrectionTask::_CreateOpenColorIOShaderCode(
                 size_t offset = ocioGpuShaderText.find(texInfo.samplerName);
                 if (offset != std::string::npos)
                 {
-                    offset += samplerNameLength;
-                        // ignore first occurance that is variable definition
-                    offset = ocioGpuShaderText.find(
-                                    texInfo.samplerName, offset);
+                    // Remove entire line containing first occurrence
+                    // (the variable declaration).
+                    size_t prevNewLineOffset = ocioGpuShaderText.rfind(
+                        "\n", offset);
+                    size_t nextNewLineOffset = ocioGpuShaderText.find(
+                        "\n", offset);
+                    if (prevNewLineOffset == std::string::npos) {
+                        prevNewLineOffset = 0;
+                    }
+                    if (nextNewLineOffset == std::string::npos) {
+                        nextNewLineOffset = ocioGpuShaderText.length();
+                    }
+                    ocioGpuShaderText.erase(prevNewLineOffset,
+                        nextNewLineOffset - prevNewLineOffset);
+
+                    // Now find and replace second occurrence.
+                    offset = ocioGpuShaderText.find(texInfo.samplerName);
                     while (offset != std::string::npos)
                     {
                         ocioGpuShaderText.replace(
@@ -1243,4 +1239,4 @@ bool operator!=(const HdxColorCorrectionTaskParams& lhs,
     return !(lhs == rhs);
 }
 
-PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hdx/colorCorrectionTask.h b/pxr/imaging/hdx/colorCorrectionTask.h
index 4ec8e3579a..0bd8183af4 100644
--- a/pxr/imaging/hdx/colorCorrectionTask.h
+++ b/pxr/imaging/hdx/colorCorrectionTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HDX_COLORCORRECTION_TASK_H
 #define HDX_COLORCORRECTION_TASK_H
diff --git a/pxr/imaging/hdx/colorizeSelectionTask.cpp b/pxr/imaging/hdx/colorizeSelectionTask.cpp
index 5ab768473f..3441b2fbbf 100644
--- a/pxr/imaging/hdx/colorizeSelectionTask.cpp
+++ b/pxr/imaging/hdx/colorizeSelectionTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/colorizeSelectionTask.h"
 
diff --git a/pxr/imaging/hdx/colorizeSelectionTask.h b/pxr/imaging/hdx/colorizeSelectionTask.h
index 98c141b3e9..0e2b16ae45 100644
--- a/pxr/imaging/hdx/colorizeSelectionTask.h
+++ b/pxr/imaging/hdx/colorizeSelectionTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_COLORIZE_SELECTION_TASK_H
 #define PXR_IMAGING_HDX_COLORIZE_SELECTION_TASK_H
diff --git a/pxr/imaging/hdx/debugCodes.cpp b/pxr/imaging/hdx/debugCodes.cpp
index b3297270f3..1d25d642e9 100644
--- a/pxr/imaging/hdx/debugCodes.cpp
+++ b/pxr/imaging/hdx/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/debugCodes.h"
 
diff --git a/pxr/imaging/hdx/debugCodes.h b/pxr/imaging/hdx/debugCodes.h
index fcebf42253..f3a9cb2003 100644
--- a/pxr/imaging/hdx/debugCodes.h
+++ b/pxr/imaging/hdx/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_DEBUG_CODES_H
 #define PXR_IMAGING_HDX_DEBUG_CODES_H
diff --git a/pxr/imaging/hdx/drawTargetTask.cpp b/pxr/imaging/hdx/drawTargetTask.cpp
index f80c6b5184..4545404be7 100644
--- a/pxr/imaging/hdx/drawTargetTask.cpp
+++ b/pxr/imaging/hdx/drawTargetTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hdx/drawTargetTask.h b/pxr/imaging/hdx/drawTargetTask.h
index d10c7825bc..370d289b25 100644
--- a/pxr/imaging/hdx/drawTargetTask.h
+++ b/pxr/imaging/hdx/drawTargetTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_DRAW_TARGET_TASK_H
 #define PXR_IMAGING_HDX_DRAW_TARGET_TASK_H
diff --git a/pxr/imaging/hdx/effectsShader.cpp b/pxr/imaging/hdx/effectsShader.cpp
index 8045fb5ff1..ace3ae3c7a 100644
--- a/pxr/imaging/hdx/effectsShader.cpp
+++ b/pxr/imaging/hdx/effectsShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/effectsShader.h"
 #include "pxr/imaging/hdx/hgiConversions.h"
diff --git a/pxr/imaging/hdx/effectsShader.h b/pxr/imaging/hdx/effectsShader.h
index b8cb2cb929..cece356498 100644
--- a/pxr/imaging/hdx/effectsShader.h
+++ b/pxr/imaging/hdx/effectsShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_EFFECTS_SHADER_H
 #define PXR_IMAGING_HDX_EFFECTS_SHADER_H
diff --git a/pxr/imaging/hdx/freeCameraSceneDelegate.cpp b/pxr/imaging/hdx/freeCameraSceneDelegate.cpp
index 362e1b3a88..81c5374e17 100644
--- a/pxr/imaging/hdx/freeCameraSceneDelegate.cpp
+++ b/pxr/imaging/hdx/freeCameraSceneDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hdx/freeCameraSceneDelegate.h"
diff --git a/pxr/imaging/hdx/freeCameraSceneDelegate.h b/pxr/imaging/hdx/freeCameraSceneDelegate.h
index 9e0ef90402..625fd0c539 100644
--- a/pxr/imaging/hdx/freeCameraSceneDelegate.h
+++ b/pxr/imaging/hdx/freeCameraSceneDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_FREE_CAMERA_SCENE_DELEGATE_H
 #define PXR_IMAGING_HDX_FREE_CAMERA_SCENE_DELEGATE_H
diff --git a/pxr/imaging/hdx/fullscreenShader.cpp b/pxr/imaging/hdx/fullscreenShader.cpp
index d4a168c3d4..e05595d347 100644
--- a/pxr/imaging/hdx/fullscreenShader.cpp
+++ b/pxr/imaging/hdx/fullscreenShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/fullscreenShader.h"
 #include "pxr/imaging/hdx/hgiConversions.h"
@@ -104,8 +87,8 @@ HdxFullscreenShader::~HdxFullscreenShader()
         _DestroyShaderProgram(&_shaderProgram);
     }
 
-    if (_sampler) {
-        hgi->DestroySampler(&_sampler);
+    if (_defaultSampler) {
+        hgi->DestroySampler(&_defaultSampler);
     }
 }
 
@@ -302,9 +285,26 @@ HdxFullscreenShader::_CreateBufferResources()
 
 void
 HdxFullscreenShader::BindTextures(
-    HgiTextureHandleVector const& textures)
+    HgiTextureHandleVector const& textures,
+    HgiSamplerHandleVector const& samplers)
 {
+    if (!samplers.empty() && textures.size() != samplers.size()) {
+        TF_CODING_ERROR("Samplers vector must be empty, or match the size of "
+                        "the provided textures vector.");
+        _textures.clear();
+        _samplers.clear();
+        return;
+    }
+
     _textures = textures;
+    if (samplers.empty()) {
+        _samplers.assign(_textures.size(), _GetDefaultSampler());
+    } else {
+        _samplers.resize(samplers.size());
+        for (size_t i = 0; i < samplers.size(); ++i) {
+            _samplers[i] = samplers[i] ? samplers[i] : _GetDefaultSampler();
+        }
+    }
 }
 
 void
@@ -312,30 +312,30 @@ HdxFullscreenShader::_SetResourceBindings()
 {
     HgiTextureBindDescVector textureBindings;
     textureBindings.reserve(_textures.size());
-    size_t bindSlots = 0;
-    for (auto const& texture : _textures) {
+    for (uint32_t index = 0; index < _textures.size(); ++index) {
+        const HgiTextureHandle& texture = _textures[index];
         if (!texture) {
             continue;
         }
         HgiTextureBindDesc texBind;
-        texBind.bindingIndex = bindSlots++;
+        texBind.bindingIndex = index;
         texBind.stageUsage = HgiShaderStageFragment;
         texBind.writable = false;
         texBind.textures.push_back(texture);
-        texBind.samplers.push_back(_sampler);
+        texBind.samplers.push_back(_samplers[index]);
         textureBindings.push_back(std::move(texBind));
     }
     _SetTextureBindings(textureBindings);
 
     HgiBufferBindDescVector bufferBindings;
     bufferBindings.reserve(_buffers.size());
-    bindSlots = 0;
-    for (auto const& buffer : _buffers) {
+    for (uint32_t index = 0; index < _buffers.size(); ++index) {
+        const HgiBufferHandle& buffer = _buffers[index];
         if (!buffer) {
             continue;
         }
         HgiBufferBindDesc bufBind;
-        bufBind.bindingIndex = bindSlots++;
+        bufBind.bindingIndex = index;
         bufBind.resourceType = HgiBindResourceTypeStorageBuffer;
         bufBind.stageUsage = HgiShaderStageFragment;
         bufBind.writable = false;
@@ -368,24 +368,19 @@ HdxFullscreenShader::_SetVertexBufferDescriptor()
     _SetVertexBufferDescs(vboDescs);
 }
 
-bool
-HdxFullscreenShader::_CreateSampler()
+HgiSamplerHandle
+HdxFullscreenShader::_GetDefaultSampler()
 {
-    if (_sampler) {
-        return true;
+    if (!_defaultSampler) {
+        HgiSamplerDesc sampDesc;
+        sampDesc.magFilter = HgiSamplerFilterLinear;
+        sampDesc.minFilter = HgiSamplerFilterLinear;
+        sampDesc.addressModeU = HgiSamplerAddressModeClampToEdge;
+        sampDesc.addressModeV = HgiSamplerAddressModeClampToEdge;
+        _defaultSampler = _GetHgi()->CreateSampler(sampDesc);
     }
 
-    HgiSamplerDesc sampDesc;
-    
-    sampDesc.magFilter = HgiSamplerFilterLinear;
-    sampDesc.minFilter = HgiSamplerFilterLinear;
-
-    sampDesc.addressModeU = HgiSamplerAddressModeClampToEdge;
-    sampDesc.addressModeV = HgiSamplerAddressModeClampToEdge;
-    
-    _sampler = _GetHgi()->CreateSampler(sampDesc);
-
-    return true;
+    return _defaultSampler;
 }
 
 void
@@ -462,9 +457,6 @@ HdxFullscreenShader::_Draw(
         _CreateBufferResources();
     }
 
-    // Create a default texture sampler (first time)
-    _CreateSampler();
-
     // Set or update the resource bindings (textures may have changed)
     _SetResourceBindings();
 
diff --git a/pxr/imaging/hdx/fullscreenShader.h b/pxr/imaging/hdx/fullscreenShader.h
index 347af8a01d..3ef76f527d 100644
--- a/pxr/imaging/hdx/fullscreenShader.h
+++ b/pxr/imaging/hdx/fullscreenShader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_FULLSCREENSHADER_H
 #define PXR_IMAGING_HDX_FULLSCREENSHADER_H
@@ -99,15 +82,19 @@ class HdxFullscreenShader : public HdxEffectsShader
     HDX_API
     void BindBuffers(HgiBufferHandleVector const& buffers);
 
-    /// Bind (externally managed) textures to the shader program.
+    /// Bind (externally managed) textures to the shader program and use the
+    /// optionally provided samplers for each one.
     /// This function can be used to bind textures to a custom shader program.
-    /// The lifetime of textures is managed by the caller. HdxFullscreenShader
-    /// does not take ownership.
+    /// The lifetime of textures is managed by the caller as are the samplers.
+    /// HdxFullscreenShader does not take ownership of them.
     /// Textures will be bound at the indices corresponding to their position in
-    /// the provided vector.
+    /// the provided vector.  Each texture will use the corresponding sampler
+    /// that is provided.  If no samplers are provided, or an invalid sampler
+    /// is provided for a texture, a default sampler will be used.
     HDX_API
     void BindTextures(
-        HgiTextureHandleVector const& textures);
+        HgiTextureHandleVector const& textures,
+        HgiSamplerHandleVector const& samplers = HgiSamplerHandleVector());
 
     /// By default HdxFullscreenShader creates a pipeline object that enables
     /// depth testing and enables depth write if there is a depth texture.
@@ -169,8 +156,8 @@ class HdxFullscreenShader : public HdxEffectsShader
     // Utility to create default vertex buffer descriptor.
     void _SetVertexBufferDescriptor();
 
-    // Utility to create a texture sampler.
-    bool _CreateSampler();
+    // Utility to create and get the default texture sampler.
+    HgiSamplerHandle _GetDefaultSampler();
 
     // Utility to set the default program.
     void _SetDefaultProgram(bool writeDepth);
@@ -189,6 +176,7 @@ class HdxFullscreenShader : public HdxEffectsShader
     void _PrintCompileErrors();
 
     HgiTextureHandleVector _textures;
+    HgiSamplerHandleVector _samplers;
     HgiBufferHandleVector _buffers;
 
     TfToken _glslfxPath;
@@ -197,7 +185,7 @@ class HdxFullscreenShader : public HdxEffectsShader
     HgiBufferHandle _indexBuffer;
     HgiBufferHandle _vertexBuffer;
     HgiShaderProgramHandle _shaderProgram;
-    HgiSamplerHandle _sampler;
+    HgiSamplerHandle _defaultSampler;
 
     HgiDepthStencilState _depthStencilState;
 
diff --git a/pxr/imaging/hdx/hgiConversions.cpp b/pxr/imaging/hdx/hgiConversions.cpp
index 8cff9290c8..581dcffd51 100644
--- a/pxr/imaging/hdx/hgiConversions.cpp
+++ b/pxr/imaging/hdx/hgiConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/hgiConversions.h"
 #include "pxr/base/tf/iterator.h"
diff --git a/pxr/imaging/hdx/hgiConversions.h b/pxr/imaging/hdx/hgiConversions.h
index ebfdf809a8..c907c2dcd2 100644
--- a/pxr/imaging/hdx/hgiConversions.h
+++ b/pxr/imaging/hdx/hgiConversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_HGI_CONVERSIONS_H
 #define PXR_IMAGING_HDX_HGI_CONVERSIONS_H
diff --git a/pxr/imaging/hdx/oitBufferAccessor.cpp b/pxr/imaging/hdx/oitBufferAccessor.cpp
index 72b6549884..b454e4ea03 100644
--- a/pxr/imaging/hdx/oitBufferAccessor.cpp
+++ b/pxr/imaging/hdx/oitBufferAccessor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/oitBufferAccessor.h"
 
diff --git a/pxr/imaging/hdx/oitBufferAccessor.h b/pxr/imaging/hdx/oitBufferAccessor.h
index 12822edc61..964f62ff8a 100644
--- a/pxr/imaging/hdx/oitBufferAccessor.h
+++ b/pxr/imaging/hdx/oitBufferAccessor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_OIT_BUFFER_ACCESSOR_H
 #define PXR_IMAGING_HDX_OIT_BUFFER_ACCESSOR_H
diff --git a/pxr/imaging/hdx/oitRenderTask.cpp b/pxr/imaging/hdx/oitRenderTask.cpp
index 4eefc25bec..95a61a7049 100644
--- a/pxr/imaging/hdx/oitRenderTask.cpp
+++ b/pxr/imaging/hdx/oitRenderTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/oitRenderTask.h"
 #include "pxr/imaging/hdx/package.h"
@@ -36,14 +19,30 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+static const HioGlslfxSharedPtr &
+_GetRenderPassOitGlslfx()
+{
+    static const HioGlslfxSharedPtr glslfx =
+        std::make_shared<HioGlslfx>(HdxPackageRenderPassOitShader());
+    return glslfx;
+}
+
+static const HioGlslfxSharedPtr &
+_GetRenderPassOitOpaqueGlslfx()
+{
+    static const HioGlslfxSharedPtr glslfx =
+        std::make_shared<HioGlslfx>(HdxPackageRenderPassOitOpaqueShader());
+    return glslfx;
+}
+
 HdxOitRenderTask::HdxOitRenderTask(HdSceneDelegate* delegate, SdfPath const& id)
     : HdxRenderTask(delegate, id)
     , _oitTranslucentRenderPassShader(
         std::make_shared<HdStRenderPassShader>(
-            HdxPackageRenderPassOitShader()))
+            _GetRenderPassOitGlslfx()))
     , _oitOpaqueRenderPassShader(
         std::make_shared<HdStRenderPassShader>(
-            HdxPackageRenderPassOitOpaqueShader()))
+            _GetRenderPassOitOpaqueGlslfx()))
     , _isOitEnabled(HdxOitBufferAccessor::IsOitEnabled())
 {
 }
diff --git a/pxr/imaging/hdx/oitRenderTask.h b/pxr/imaging/hdx/oitRenderTask.h
index 7aa16171b6..81a935fb5b 100644
--- a/pxr/imaging/hdx/oitRenderTask.h
+++ b/pxr/imaging/hdx/oitRenderTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_OIT_RENDER_TASK_H
 #define PXR_IMAGING_HDX_OIT_RENDER_TASK_H
diff --git a/pxr/imaging/hdx/oitResolveTask.cpp b/pxr/imaging/hdx/oitResolveTask.cpp
index 5262acbdbf..6ce9c73195 100644
--- a/pxr/imaging/hdx/oitResolveTask.cpp
+++ b/pxr/imaging/hdx/oitResolveTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hdx/oitResolveTask.h b/pxr/imaging/hdx/oitResolveTask.h
index 9349a65f59..b641dff57d 100644
--- a/pxr/imaging/hdx/oitResolveTask.h
+++ b/pxr/imaging/hdx/oitResolveTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_OIT_RESOLVE_TASK_H
 #define PXR_IMAGING_HDX_OIT_RESOLVE_TASK_H
diff --git a/pxr/imaging/hdx/oitVolumeRenderTask.cpp b/pxr/imaging/hdx/oitVolumeRenderTask.cpp
index 4884246acb..3414e5ebbc 100644
--- a/pxr/imaging/hdx/oitVolumeRenderTask.cpp
+++ b/pxr/imaging/hdx/oitVolumeRenderTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/oitVolumeRenderTask.h"
 #include "pxr/imaging/hdx/package.h"
@@ -39,12 +22,20 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+static const HioGlslfxSharedPtr &
+_GetRenderPassOitVolumeGlslfx()
+{
+    static const HioGlslfxSharedPtr glslfx =
+        std::make_shared<HioGlslfx>(HdxPackageRenderPassOitVolumeShader());
+    return glslfx;
+}
+
 HdxOitVolumeRenderTask::HdxOitVolumeRenderTask(
                 HdSceneDelegate* delegate, SdfPath const& id)
     : HdxRenderTask(delegate, id)
     , _oitVolumeRenderPassShader(
         std::make_shared<HdStRenderPassShader>(
-            HdxPackageRenderPassOitVolumeShader()))
+            _GetRenderPassOitVolumeGlslfx()))
     , _isOitEnabled(HdxOitBufferAccessor::IsOitEnabled())
 {
 }
diff --git a/pxr/imaging/hdx/oitVolumeRenderTask.h b/pxr/imaging/hdx/oitVolumeRenderTask.h
index 3aa41853c5..332c8269ef 100644
--- a/pxr/imaging/hdx/oitVolumeRenderTask.h
+++ b/pxr/imaging/hdx/oitVolumeRenderTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_OIT_VOLUME_RENDER_TASK_H
 #define PXR_IMAGING_HDX_OIT_VOLUME_RENDER_TASK_H
diff --git a/pxr/imaging/hdx/package.cpp b/pxr/imaging/hdx/package.cpp
index 136f891dcd..ea5c1f8f14 100644
--- a/pxr/imaging/hdx/package.cpp
+++ b/pxr/imaging/hdx/package.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/package.h"
 
diff --git a/pxr/imaging/hdx/package.h b/pxr/imaging/hdx/package.h
index 6f1c406174..cf65d649d4 100644
--- a/pxr/imaging/hdx/package.h
+++ b/pxr/imaging/hdx/package.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_PACKAGE_H
 #define PXR_IMAGING_HDX_PACKAGE_H
diff --git a/pxr/imaging/hdx/pch.h b/pxr/imaging/hdx/pch.h
index 33ddb1b5da..76f08638ed 100644
--- a/pxr/imaging/hdx/pch.h
+++ b/pxr/imaging/hdx/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -28,9 +11,19 @@
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
 #if defined(ARCH_OS_DARWIN)
+#include <glob.h>
+#include <limits.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <unistd.h>
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <glob.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/statfs.h>
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -40,11 +33,12 @@
 
 #include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <io.h>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <cfloat>
 #include <cinttypes>
@@ -57,9 +51,11 @@
 #include <cstdlib>
 #include <cstring>
 #include <deque>
+#include <fcntl.h>
 #include <float.h>
 #include <functional>
 #include <initializer_list>
+#include <inttypes.h>
 #include <iomanip>
 #include <iosfwd>
 #include <iostream>
@@ -72,14 +68,20 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -87,46 +89,12 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/bind.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
+#include <MaterialXCore/Library.h>
+#endif // PXR_MATERIALX_SUPPORT_ENABLED
+#ifdef PXR_OCIO_PLUGIN_ENABLED
+#include <OpenColorIO/OpenColorIO.h>
+#endif // PXR_OCIO_PLUGIN_ENABLED
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -135,26 +103,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_vector.h>
@@ -162,7 +113,9 @@
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_for_each.h>
 #include <tbb/spin_mutex.h>
+#include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hdx/pickFromRenderBufferTask.cpp b/pxr/imaging/hdx/pickFromRenderBufferTask.cpp
index 63fa0f54cd..224bc9ea32 100644
--- a/pxr/imaging/hdx/pickFromRenderBufferTask.cpp
+++ b/pxr/imaging/hdx/pickFromRenderBufferTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/pickFromRenderBufferTask.h"
 
diff --git a/pxr/imaging/hdx/pickFromRenderBufferTask.h b/pxr/imaging/hdx/pickFromRenderBufferTask.h
index 3907318f7b..32cd6c6ed7 100644
--- a/pxr/imaging/hdx/pickFromRenderBufferTask.h
+++ b/pxr/imaging/hdx/pickFromRenderBufferTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_PICK_FROM_RENDER_BUFFER_TASK_H
 #define PXR_IMAGING_HDX_PICK_FROM_RENDER_BUFFER_TASK_H
diff --git a/pxr/imaging/hdx/pickTask.cpp b/pxr/imaging/hdx/pickTask.cpp
index 901a87bce4..411047c7bc 100644
--- a/pxr/imaging/hdx/pickTask.cpp
+++ b/pxr/imaging/hdx/pickTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
@@ -37,6 +20,7 @@
 #include "pxr/imaging/hd/renderPass.h"
 #include "pxr/imaging/hd/primOriginSchema.h"
 #include "pxr/imaging/hd/types.h"
+#include "pxr/imaging/hd/vtBufferSource.h"
 
 #include "pxr/imaging/hdSt/renderBuffer.h"
 #include "pxr/imaging/hdSt/renderDelegate.h"
@@ -59,6 +43,20 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEFINE_PUBLIC_TOKENS(HdxPickTokens, HDX_PICK_TOKENS);
 
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+
+    (PickBuffer)
+    (PickBufferBinding)
+    (Picking)
+
+    (widgetDepthStencil)
+);
+
+static const int PICK_BUFFER_HEADER_SIZE = 8;
+static const int PICK_BUFFER_SUBBUFFER_CAPACITY = 32;
+static const int PICK_BUFFER_ENTRY_SIZE = 3;
+
 static HdRenderPassStateSharedPtr
 _InitIdRenderPassState(HdRenderIndex *index)
 {
@@ -86,10 +84,6 @@ _IsStormRenderer(HdRenderDelegate *renderDelegate)
     return true;
 }
 
-TF_DEFINE_PRIVATE_TOKENS(_tokens,
-    (widgetDepthStencil)
-);
-
 static SdfPath 
 _GetAovPath(TfToken const& aovName)
 {
@@ -120,6 +114,24 @@ HdxPickTask::~HdxPickTask()
 void
 HdxPickTask::_InitIfNeeded()
 {
+    // Init pick buffer
+    if (!_pickBuffer) {
+        HdStResourceRegistrySharedPtr const& hdStResourceRegistry =
+            std::dynamic_pointer_cast<HdStResourceRegistry>(
+                _index->GetResourceRegistry());
+
+        if (hdStResourceRegistry) {
+
+            HdBufferSpecVector bufferSpecs {
+                { _tokens->PickBuffer, HdTupleType{ HdTypeInt32, 1 } }       
+            };
+
+            _pickBuffer = hdStResourceRegistry->AllocateSingleBufferArrayRange(
+                        _tokens->Picking, 
+                        bufferSpecs, HdBufferArrayUsageHintBitsStorage);
+        }
+    }
+
     if (_pickableAovBuffers.empty()) {
         _CreateAovBindings();
     }
@@ -499,14 +511,19 @@ HdxPickTask::Sync(HdSceneDelegate* delegate,
             state->SetStencilEnabled(false);
         }
 
+        // disable depth write for the main pass when resolving 'deep'
+        bool enableDepthWrite =
+            (state == _occluderRenderPassState) ||
+            (_contextParams.resolveMode != HdxPickTokens->resolveDeep);
+
         state->SetEnableDepthTest(true);
-        state->SetEnableDepthMask(true);
+        state->SetEnableDepthMask(enableDepthWrite);
         state->SetDepthFunc(HdCmpFuncLEqual);
 
-        // Allow semi-transparent pixels to be picked, but discard fully
-        // transparent ones.
-        state->SetAlphaThreshold(0.0001f);
-
+        // Set alpha threshold, to potentially discard translucent pixels.
+        // The default value of 0.0001 allow semi-transparent pixels to be picked, 
+        // but discards fully transparent ones.
+        state->SetAlphaThreshold(_contextParams.alphaThreshold);
         state->SetAlphaToCoverageEnabled(false);
         state->SetBlendEnabled(false);
         state->SetCullStyle(_params.cullStyle);
@@ -584,13 +601,111 @@ void
 HdxPickTask::Prepare(HdTaskContext* ctx,
                      HdRenderIndex* renderIndex)
 {
+    HdStResourceRegistrySharedPtr const& hdStResourceRegistry =
+        std::dynamic_pointer_cast<HdStResourceRegistry>(
+            _index->GetResourceRegistry());
+
+    if (!hdStResourceRegistry) {
+        return;
+    }
+
     if (_UseOcclusionPass()) {
         _occluderRenderPassState->Prepare(renderIndex->GetResourceRegistry());
     }
     _pickableRenderPassState->Prepare(renderIndex->GetResourceRegistry());
     if (_UseWidgetPass()) {
         _widgetRenderPassState->Prepare(renderIndex->GetResourceRegistry());
+    }  
+
+    _ClearPickBuffer();
+
+    // Prepare pick buffer binding
+    HdStRenderPassState* extendedState =
+        dynamic_cast<HdStRenderPassState*>(_pickableRenderPassState.get());
+
+    HdStRenderPassShaderSharedPtr renderPassShader = 
+        extendedState ? extendedState->GetRenderPassShader() : nullptr;
+
+    if (renderPassShader) {
+        if (_pickBuffer) {
+            renderPassShader->AddBufferBinding(
+                HdStBindingRequest(
+                    HdStBinding::SSBO,
+                    _tokens->PickBufferBinding, 
+                    _pickBuffer, 
+                    /*interleaved*/ false,
+                    /*writable*/ true));
+        }
+        else {
+            renderPassShader->RemoveBufferBinding(
+                _tokens->PickBufferBinding);
+        }
+    }
+}
+
+void
+HdxPickTask::_ClearPickBuffer()
+{
+    if (!_pickBuffer) {
+        return;
     }
+
+    HdStResourceRegistrySharedPtr const& hdStResourceRegistry =
+        std::dynamic_pointer_cast<HdStResourceRegistry>(
+            _index->GetResourceRegistry());
+
+    if (!hdStResourceRegistry) {
+        return;
+    }
+
+    // populate pick buffer source array
+    VtIntArray pickBufferInit;
+    if (_contextParams.resolveMode == HdxPickTokens->resolveDeep)
+    {
+        const int numSubBuffers =
+            _contextParams.maxNumDeepEntries / PICK_BUFFER_SUBBUFFER_CAPACITY;
+        const int entryStorageOffset =
+            PICK_BUFFER_HEADER_SIZE + numSubBuffers;
+        const int entryStorageSize =
+            numSubBuffers * PICK_BUFFER_SUBBUFFER_CAPACITY * PICK_BUFFER_ENTRY_SIZE;
+
+        pickBufferInit.reserve(entryStorageOffset + entryStorageSize);
+
+        // populate pick buffer header
+        pickBufferInit.push_back(numSubBuffers);
+        pickBufferInit.push_back(PICK_BUFFER_SUBBUFFER_CAPACITY);
+        pickBufferInit.push_back(PICK_BUFFER_HEADER_SIZE);
+        pickBufferInit.push_back(entryStorageOffset);
+
+        pickBufferInit.push_back(
+            _contextParams.pickTarget == HdxPickTokens->pickFaces ? 1 : 0);
+        pickBufferInit.push_back(
+            _contextParams.pickTarget == HdxPickTokens->pickEdges ? 1 : 0);
+        pickBufferInit.push_back(
+            _contextParams.pickTarget == HdxPickTokens->pickPoints ? 1 : 0);
+        pickBufferInit.push_back(0);
+
+        // populate pick buffer's sub-buffer size table with zeros
+        pickBufferInit.resize(pickBufferInit.size() + numSubBuffers, 
+            [](int* b, int* e) { std::uninitialized_fill(b, e, 0); });
+
+        // populate pick buffer's entry storage with -9s, meaning uninitialized
+        pickBufferInit.resize(pickBufferInit.size() + entryStorageSize,
+            [](int* b, int* e) { std::uninitialized_fill(b, e, -9); });
+    }
+    else
+    {
+        // set pick buffer to invalid state
+        pickBufferInit.push_back(0);
+    }
+
+    // set the source to the pick buffer
+    HdBufferSourceSharedPtr bufferSource =
+        std::make_shared<HdVtBufferSource>(
+            _tokens->PickBuffer,
+            VtValue(pickBufferInit));
+
+    hdStResourceRegistry->AddSource(_pickBuffer, bufferSource);
 }
 
 void
@@ -650,6 +765,13 @@ HdxPickTask::Execute(HdTaskContext* ctx)
             {HdxRenderTagTokens->widget});
     }
 
+    // For 'resolveDeep' mode, read hits from the pick buffer.
+    if (_contextParams.resolveMode == HdxPickTokens->resolveDeep) {
+        _ResolveDeep();
+        _hgi->EndFrame();
+        return;
+    }
+
     // Capture the result buffers and cast to the appropriate types.
     HdStTextureUtils::AlignedBuffer<int> primIds =
         _ReadAovBuffer<int>(HdAovTokens->primId);
@@ -702,6 +824,78 @@ HdxPickTask::Execute(HdTaskContext* ctx)
     _hgi->EndFrame();
 }
 
+void HdxPickTask::_ResolveDeep()
+{
+    if (!_pickBuffer) {
+        return;
+    }
+
+    VtValue pickData = _pickBuffer->ReadData(_tokens->PickBuffer);
+    if (pickData.IsEmpty()) {
+        return;
+    }
+
+    const auto& data = pickData.Get<VtIntArray>();
+
+    const int numSubBuffers =
+        _contextParams.maxNumDeepEntries / PICK_BUFFER_SUBBUFFER_CAPACITY;
+    const int entryStorageOffset =
+        PICK_BUFFER_HEADER_SIZE + numSubBuffers;
+
+    // loop through all the sub-buffers, populating outHits
+    for (int subBuffer = 0; subBuffer < numSubBuffers; ++subBuffer)
+    {
+        const int sizeOffset = PICK_BUFFER_HEADER_SIZE + subBuffer;
+        const int numEntries = data[sizeOffset];
+        const int subBufferOffset =
+            entryStorageOffset + 
+            subBuffer * PICK_BUFFER_SUBBUFFER_CAPACITY * PICK_BUFFER_ENTRY_SIZE;
+
+        // loop through sub-buffer entries
+        for (int j = 0; j < numEntries; ++j)
+        {
+            int entryOffset = subBufferOffset + (j * PICK_BUFFER_ENTRY_SIZE);
+
+            HdxPickHit hit;
+
+            int primId = data[entryOffset];
+            hit.objectId = _index->GetRprimPathFromPrimId(primId);
+
+            if (!hit.IsValid()) {
+                continue;
+            }
+
+            bool rprimValid = _index->GetSceneDelegateAndInstancerIds(
+                                hit.objectId,
+                                &(hit.delegateId),
+                                &(hit.instancerId));
+
+            if (!TF_VERIFY(rprimValid, "%s\n", hit.objectId.GetText())) {
+                continue;
+            }
+
+            int partIndex = data[entryOffset + 2];
+            hit.instanceIndex = data[entryOffset + 1];
+            hit.elementIndex = 
+                _contextParams.pickTarget == HdxPickTokens->pickFaces ? 
+                partIndex : -1;
+            hit.edgeIndex =
+                _contextParams.pickTarget == HdxPickTokens->pickEdges ?
+                partIndex : -1;
+            hit.pointIndex = 
+                _contextParams.pickTarget == HdxPickTokens->pickPoints ?
+                partIndex : -1;
+
+            // the following data is skipped in deep selection
+            hit.worldSpaceHitPoint = GfVec3f(0.f, 0.f, 0.f);
+            hit.worldSpaceHitNormal = GfVec3f(0.f, 0.f, 0.f);
+            hit.normalizedDepth = 0.f;
+
+            _contextParams.outHits->push_back(hit);
+        }
+    }
+}
+
 const TfTokenVector &
 HdxPickTask::GetRenderTags() const
 {
@@ -808,7 +1002,7 @@ HdxPickResult::_ResolveHit(
         ((double)x / _bufferSize[0]) * 2.0 - 1.0,
         ((double)y / _bufferSize[1]) * 2.0 - 1.0,
         ((z - _depthRange[0]) / (_depthRange[1] - _depthRange[0])) * 2.0 - 1.0);
-    hit->worldSpaceHitPoint = GfVec3f(_ndcToWorld.Transform(ndcHit));
+    hit->worldSpaceHitPoint = _ndcToWorld.Transform(ndcHit);
     hit->worldSpaceHitNormal = _GetNormal(index);
     hit->normalizedDepth =
         (z - _depthRange[0]) / (_depthRange[1] - _depthRange[0]);
@@ -968,26 +1162,27 @@ HdxPrimOriginInfo::FromPickHit(HdRenderIndex * const renderIndex,
 // Consults given prim source for origin path to either replace
 // the given path (if origin path is absolute) or append to given
 // path (if origin path is relative). If no prim origin data source,
-// leave path unchanged.
+// leave path unchanged. Return whether the path was appended-to.
 static
-void
+bool
 _AppendPrimOriginToPath(HdContainerDataSourceHandle const &primOriginDs,
                         const TfToken &nameInPrimOrigin,
                         SdfPath * const path)
 {
     HdPrimOriginSchema schema = HdPrimOriginSchema(primOriginDs);
     if (!schema) {
-        return;
+        return false;
     }
     const SdfPath scenePath = schema.GetOriginPath(nameInPrimOrigin);
     if (scenePath.IsEmpty()) {
-        return;
+        return false;
     }
     if (scenePath.IsAbsolutePath()) {
         *path = scenePath;
     } else {
         *path = path->AppendPath(scenePath);
     }
+    return true;
 }
 
 SdfPath
@@ -1012,6 +1207,38 @@ HdxPrimOriginInfo::GetFullPath(const TfToken &nameInPrimOrigin) const
     return path;
 }
 
+HdInstancerContext
+HdxPrimOriginInfo::ComputeInstancerContext(
+        const TfToken &nameInPrimOrigin) const
+{
+    HdInstancerContext outCtx;
+
+    // Loop through the instancer contexts from outermost to innermost, building
+    // up a path.
+
+    SdfPath prefix;
+    for (const HdxInstancerContext &ctx : instancerContexts) {
+        // First, check if instancerPrimOrigin has anything (via _Append
+        // return value); if so, this instancer is in the scene and needs to be
+        // added to outCtx.  We prepend the current prefix, since if the prefix
+        // is non-empty it indicates this instancer participated in instance
+        // aggregation.
+        SdfPath instancer = prefix;
+        if (_AppendPrimOriginToPath(ctx.instancerPrimOrigin,
+                nameInPrimOrigin, &instancer)) {
+            outCtx.push_back(std::make_pair(instancer, ctx.instanceId));
+        }
+
+        // If instancePrimOrigin has anything in it, that indicates this
+        // instancer participated in instance aggregation, and its contribution
+        // to the path of any later instancers needs to be added to the prefix.
+        _AppendPrimOriginToPath(
+            ctx.instancePrimOrigin, nameInPrimOrigin, &prefix);
+    }
+
+    return outCtx;
+}
+
 size_t
 HdxPickResult::_GetHash(int index) const
 {
diff --git a/pxr/imaging/hdx/pickTask.h b/pxr/imaging/hdx/pickTask.h
index fd771e6e33..92c78c4126 100644
--- a/pxr/imaging/hdx/pickTask.h
+++ b/pxr/imaging/hdx/pickTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_PICK_TASK_H
 #define PXR_IMAGING_HDX_PICK_TASK_H
@@ -65,7 +48,8 @@ PXR_NAMESPACE_OPEN_SCOPE
     (resolveNearestToCamera)         \
     (resolveNearestToCenter)         \
     (resolveUnique)                  \
-    (resolveAll)
+    (resolveAll)                     \
+    (resolveDeep)
 
 TF_DECLARE_PUBLIC_TOKENS(HdxPickTokens, HDX_API, HDX_PICK_TOKENS);
 
@@ -107,7 +91,7 @@ struct HdxPickHit
     int elementIndex;
     int edgeIndex;
     int pointIndex;
-    GfVec3f worldSpaceHitPoint;
+    GfVec3d worldSpaceHitPoint;
     GfVec3f worldSpaceHitNormal;
     /// normalizedDepth is in the range [0,1].  Nb: the pick depth buffer won't
     /// contain items drawn with renderTag "widget" for simplicity.
@@ -195,6 +179,17 @@ struct HdxPrimOriginInfo
         const TfToken &nameInPrimOrigin =
                     HdPrimOriginSchemaTokens->scenePath) const;
 
+    /// Computes an HdInstancerContext object (equivalent to the one computed
+    /// by GetScenePrimPath) from the vector of HdxInstancerContext objects.
+    /// Note that while HdxInstancerContext has a wealth of data about both
+    /// scene instancers and hydra-created instancers, HdInstancerContext
+    /// is meant to be just a list of (scene instancer, local instance id)
+    /// tuples, used by some clients (e.g. usdview) for selection processing.
+    HDX_API
+    HdInstancerContext ComputeInstancerContext(
+        const TfToken &nameInPrimOrigin =
+                    HdPrimOriginSchemaTokens->scenePath) const;
+
     /// Information about the instancers instancing the picked object.
     /// The outer most instancer will be first.
     std::vector<HdxInstancerContext> instancerContexts;
@@ -230,6 +225,10 @@ struct HdxPrimOriginInfo
 ///     4. HdxPickTokens->resolveAll: Returns all the hits for the pick location
 ///         or region. The number of hits returned depends on the resolution
 ///         used and may have duplicates.
+///     5. HdxPickTokens->resolveDeep: Returns the unique hits not only of visible 
+///         geometry but also of all the geometry hiding behind. The 'pickTarget'
+///         influences this operation. For e.g., the subprim indices are ignored
+///         when the pickTarget is pickPrimsAndInstances.
 ///
 struct HdxPickTaskContextParams
 {
@@ -237,6 +236,7 @@ struct HdxPickTaskContextParams
 
     HdxPickTaskContextParams()
         : resolution(128, 128)
+        , maxNumDeepEntries(32000)
         , pickTarget(HdxPickTokens->pickPrimsAndInstances)
         , resolveMode(HdxPickTokens->resolveNearestToCamera)
         , doUnpickablesOcclude(false)
@@ -245,10 +245,12 @@ struct HdxPickTaskContextParams
         , clipPlanes()
         , depthMaskCallback(nullptr)
         , collection()
+        , alphaThreshold(0.0001f)
         , outHits(nullptr)
     {}
 
     GfVec2i resolution;
+    int maxNumDeepEntries;
     TfToken pickTarget;
     TfToken resolveMode;
     bool doUnpickablesOcclude;
@@ -257,6 +259,7 @@ struct HdxPickTaskContextParams
     std::vector<GfVec4d> clipPlanes;
     DepthMaskCallback depthMaskCallback;
     HdRprimCollection collection;
+    float alphaThreshold;
     HdxPickHitVector *outHits;
 };
 
@@ -330,6 +333,9 @@ class HdxPickTask : public HdTask
     bool _UseOcclusionPass() const;
     bool _UseWidgetPass() const;
 
+    void _ClearPickBuffer();
+    void _ResolveDeep();
+
     template<typename T>
     HdStTextureUtils::AlignedBuffer<T>
     _ReadAovBuffer(TfToken const & aovName) const;
@@ -358,6 +364,9 @@ class HdxPickTask : public HdTask
     std::unique_ptr<HdStRenderBuffer> _widgetDepthStencilBuffer;
     HdRenderPassAovBindingVector _widgetAovBindings;
 
+    // pick buffer used for deep selection
+    HdBufferArrayRangeSharedPtr _pickBuffer;
+
     HdxPickTask() = delete;
     HdxPickTask(const HdxPickTask &) = delete;
     HdxPickTask &operator =(const HdxPickTask &) = delete;
diff --git a/pxr/imaging/hdx/presentTask.cpp b/pxr/imaging/hdx/presentTask.cpp
index f84b9d4bcd..5cd225831a 100644
--- a/pxr/imaging/hdx/presentTask.cpp
+++ b/pxr/imaging/hdx/presentTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/presentTask.h"
 
diff --git a/pxr/imaging/hdx/presentTask.h b/pxr/imaging/hdx/presentTask.h
index 2ac7899909..793a48bf79 100644
--- a/pxr/imaging/hdx/presentTask.h
+++ b/pxr/imaging/hdx/presentTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_PRESENT_TASK_H
 #define PXR_IMAGING_HDX_PRESENT_TASK_H
diff --git a/pxr/imaging/hdx/renderSetupTask.cpp b/pxr/imaging/hdx/renderSetupTask.cpp
index 0841671ed0..726319f532 100644
--- a/pxr/imaging/hdx/renderSetupTask.cpp
+++ b/pxr/imaging/hdx/renderSetupTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/renderSetupTask.h"
 #include "pxr/imaging/hdx/package.h"
@@ -44,14 +27,28 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+static const HioGlslfxSharedPtr &
+_GetRenderPassColorGlslfx()
+{
+    static const HioGlslfxSharedPtr glslfx =
+        std::make_shared<HioGlslfx>(HdxPackageRenderPassColorShader());
+    return glslfx;
+}
+
+static const HioGlslfxSharedPtr &
+_GetRenderPassIdGlslfx()
+{
+    static const HioGlslfxSharedPtr glslfx =
+        std::make_shared<HioGlslfx>(HdxPackageRenderPassIdShader());
+    return glslfx;
+}
+
 HdxRenderSetupTask::HdxRenderSetupTask(HdSceneDelegate* delegate, SdfPath const& id)
     : HdTask(id)
     , _colorRenderPassShader(
-        std::make_shared<HdStRenderPassShader>(
-            HdxPackageRenderPassColorShader()))
+        std::make_shared<HdStRenderPassShader>(_GetRenderPassColorGlslfx()))
     , _idRenderPassShader(
-        std::make_shared<HdStRenderPassShader>(
-            HdxPackageRenderPassIdShader()))
+        std::make_shared<HdStRenderPassShader>(_GetRenderPassIdGlslfx()))
     , _viewport(0)
 {
 }
diff --git a/pxr/imaging/hdx/renderSetupTask.h b/pxr/imaging/hdx/renderSetupTask.h
index 2de416cb7f..396b57bfb1 100644
--- a/pxr/imaging/hdx/renderSetupTask.h
+++ b/pxr/imaging/hdx/renderSetupTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_RENDER_SETUP_TASK_H
 #define PXR_IMAGING_HDX_RENDER_SETUP_TASK_H
diff --git a/pxr/imaging/hdx/renderTask.cpp b/pxr/imaging/hdx/renderTask.cpp
index f7aae43aa4..cc6ec38b5f 100644
--- a/pxr/imaging/hdx/renderTask.cpp
+++ b/pxr/imaging/hdx/renderTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/renderTask.h"
 #include "pxr/imaging/hdx/renderSetupTask.h"
diff --git a/pxr/imaging/hdx/renderTask.h b/pxr/imaging/hdx/renderTask.h
index ea45c61412..b01a57f5aa 100644
--- a/pxr/imaging/hdx/renderTask.h
+++ b/pxr/imaging/hdx/renderTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_RENDER_TASK_H
 #define PXR_IMAGING_HDX_RENDER_TASK_H
diff --git a/pxr/imaging/hdx/selectionSceneIndexObserver.cpp b/pxr/imaging/hdx/selectionSceneIndexObserver.cpp
index 557798d625..67401b2d14 100644
--- a/pxr/imaging/hdx/selectionSceneIndexObserver.cpp
+++ b/pxr/imaging/hdx/selectionSceneIndexObserver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/selectionSceneIndexObserver.h"
 
@@ -29,28 +12,39 @@
 #include "pxr/imaging/hd/sceneIndex.h"
 #include "pxr/imaging/hd/selectionSchema.h"
 #include "pxr/imaging/hd/selectionsSchema.h"
+#include "pxr/base/work/loops.h"
 
 #include "pxr/base/trace/trace.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+static void
+_AddToSelection(
+    HdSceneIndexBaseRefPtr const &sceneIndex,
+    const SdfPath &primPath,
+    HdSelectionSharedPtr const &result);
+
 HdxSelectionSceneIndexObserver::HdxSelectionSceneIndexObserver()
  : _version(0)
  , _selection(std::make_shared<HdSelection>())
 {
 }
 
-// TODO: Move UsdImaging_SceneIndexPrimView to hd and use it here.
 static
 void
 _PopulateFromSceneIndex(
     HdSceneIndexBaseRefPtr const &sceneIndex,
     const SdfPath &path,
-    SdfPathSet * const paths)
+    HdSelectionSharedPtr const &result)
 {
-    paths->insert(path);
-    for (const SdfPath &child : sceneIndex->GetChildPrimPaths(path)) {
-        _PopulateFromSceneIndex(sceneIndex, child, paths);
+    _AddToSelection(sceneIndex, path, result);
+    const SdfPathVector childPaths = sceneIndex->GetChildPrimPaths(path);
+    if (!childPaths.empty()) {
+        WorkParallelForEach(
+            childPaths.begin(), childPaths.end(),
+            [&](SdfPath const& childPath) {
+                _PopulateFromSceneIndex(sceneIndex, childPath, result);
+            });
     }
 }
 
@@ -68,14 +62,16 @@ HdxSelectionSceneIndexObserver::SetSceneIndex(
         _sceneIndex->RemoveObserver(self);
     }
 
-    if (sceneIndex) {
+    _sceneIndex = sceneIndex;
+    _selection = std::make_shared<HdSelection>();
+    _dirtiedPrims.clear();
+
+    if (_sceneIndex) {
         sceneIndex->AddObserver(self);
         _PopulateFromSceneIndex(
-            sceneIndex, SdfPath::AbsoluteRootPath(), &_dirtiedPrims);
+            sceneIndex, SdfPath::AbsoluteRootPath(), _selection);
     }
     
-    _sceneIndex = sceneIndex;
-
     _version++;
 }
 
diff --git a/pxr/imaging/hdx/selectionSceneIndexObserver.h b/pxr/imaging/hdx/selectionSceneIndexObserver.h
index 9a4c655643..78fc4820fd 100644
--- a/pxr/imaging/hdx/selectionSceneIndexObserver.h
+++ b/pxr/imaging/hdx/selectionSceneIndexObserver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_SELECTION_SCENE_INDEX_OBSERVER_H
 #define PXR_IMAGING_HDX_SELECTION_SCENE_INDEX_OBSERVER_H
diff --git a/pxr/imaging/hdx/selectionTask.cpp b/pxr/imaging/hdx/selectionTask.cpp
index 76faba573e..34c7c94d1c 100644
--- a/pxr/imaging/hdx/selectionTask.cpp
+++ b/pxr/imaging/hdx/selectionTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/selectionTask.h"
 
diff --git a/pxr/imaging/hdx/selectionTask.h b/pxr/imaging/hdx/selectionTask.h
index 98cf726a8d..c934e04450 100644
--- a/pxr/imaging/hdx/selectionTask.h
+++ b/pxr/imaging/hdx/selectionTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_SELECTION_TASK_H
 #define PXR_IMAGING_HDX_SELECTION_TASK_H
diff --git a/pxr/imaging/hdx/selectionTracker.cpp b/pxr/imaging/hdx/selectionTracker.cpp
index 5575e9ba12..8f11aa2536 100644
--- a/pxr/imaging/hdx/selectionTracker.cpp
+++ b/pxr/imaging/hdx/selectionTracker.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/selectionTracker.h"
 
diff --git a/pxr/imaging/hdx/selectionTracker.h b/pxr/imaging/hdx/selectionTracker.h
index e3c5164355..c8fcb865b3 100644
--- a/pxr/imaging/hdx/selectionTracker.h
+++ b/pxr/imaging/hdx/selectionTracker.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_SELECTION_TRACKER_H
 #define PXR_IMAGING_HDX_SELECTION_TRACKER_H
diff --git a/pxr/imaging/hdx/shaders/boundingBox.glslfx b/pxr/imaging/hdx/shaders/boundingBox.glslfx
index 88ec13584c..417300155d 100644
--- a/pxr/imaging/hdx/shaders/boundingBox.glslfx
+++ b/pxr/imaging/hdx/shaders/boundingBox.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdx/shaders/colorChannel.glslfx b/pxr/imaging/hdx/shaders/colorChannel.glslfx
index 7c22fbb966..43c28b393b 100644
--- a/pxr/imaging/hdx/shaders/colorChannel.glslfx
+++ b/pxr/imaging/hdx/shaders/colorChannel.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdx/shaders/colorCorrection.glslfx b/pxr/imaging/hdx/shaders/colorCorrection.glslfx
index 0c1fc64daa..0a3314edc1 100644
--- a/pxr/imaging/hdx/shaders/colorCorrection.glslfx
+++ b/pxr/imaging/hdx/shaders/colorCorrection.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdx/shaders/fullscreen.glslfx b/pxr/imaging/hdx/shaders/fullscreen.glslfx
index 962fb181ec..06a9bbaf43 100644
--- a/pxr/imaging/hdx/shaders/fullscreen.glslfx
+++ b/pxr/imaging/hdx/shaders/fullscreen.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdx/shaders/oitResolveImageShader.glslfx b/pxr/imaging/hdx/shaders/oitResolveImageShader.glslfx
index fd77e09ef1..90e07ee976 100644
--- a/pxr/imaging/hdx/shaders/oitResolveImageShader.glslfx
+++ b/pxr/imaging/hdx/shaders/oitResolveImageShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdx/shaders/outline.glslfx b/pxr/imaging/hdx/shaders/outline.glslfx
index 613ee8c4ba..6dd686b012 100644
--- a/pxr/imaging/hdx/shaders/outline.glslfx
+++ b/pxr/imaging/hdx/shaders/outline.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdx/shaders/renderPass.glslfx b/pxr/imaging/hdx/shaders/renderPass.glslfx
index 2cbd2dab11..9b9e515f79 100644
--- a/pxr/imaging/hdx/shaders/renderPass.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPass.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
@@ -147,7 +130,8 @@ void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
     ["out", "vec4", "elementIdOut"],
     ["out", "vec4", "edgeIdOut"],
     ["out", "vec4", "pointIdOut"],
-    ["out", "vec4", "neyeOut"]
+    ["out", "vec4", "neyeOut"],
+    ["buffer readWrite", "CounterBuffer", "PickBuffer", ["atomic_int", "PickBuffer"]]
 ]
 
 -- glsl HdxRenderPass.RenderPick
@@ -165,6 +149,11 @@ FORWARD_DECL(int GetElementID()); // generated via codeGen
 FORWARD_DECL(int GetPrimitiveEdgeId()); // defined in edgeId.glslfx, or generated via codeGen
 FORWARD_DECL(int GetPointId()); // defined in pointId.glslfx
 
+// Declared below.
+#if defined(HD_HAS_PickBuffer)
+FORWARD_DECL(void RenderDeepPicks(int primId, int instanceId, int elementId, int edgeId, int pointId));
+#endif
+
 void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
 {
     int primId = HdGet_primID();
@@ -176,12 +165,163 @@ void RenderOutput(vec4 Peye, vec3 Neye, vec4 color, vec4 patchCoord)
     int instanceId = GetDrawingCoord().instanceIndex[0];
     instanceIdOut = IntToVec4(instanceId);
 
-    elementIdOut = IntToVec4(GetElementID());
-    edgeIdOut = IntToVec4(GetPrimitiveEdgeId());
-    pointIdOut = IntToVec4(GetPointId());
+    int elementId = GetElementID();
+    int edgeId = GetPrimitiveEdgeId();
+    int pointId = GetPointId();
+
+    elementIdOut = IntToVec4(elementId);
+    edgeIdOut = IntToVec4(edgeId);
+    pointIdOut = IntToVec4(pointId);
     
     neyeOut = IntToVec4(hd_vec4_2_10_10_10_set(vec4(Neye,0)));
+
+#if defined(HD_HAS_PickBuffer)
+    RenderDeepPicks(primId, instanceId, elementId, edgeId, pointId);
+#endif
+}
+
+#if defined(HD_HAS_PickBuffer)
+int cantor(int a, int b) {
+   return (a + b + 1) * (a + b) / 2 + b;
+}
+
+// Uses cantor pairing to compute a hash value for a-b-c.
+int hash3(int a, int b, int c) {
+   return cantor(a, cantor(b, c));
+}
+
+bool 
+compareOrSet(
+    const int valueOffset, 
+    const int primId, 
+    const int instanceId, 
+    const int partId)
+{
+    int primIdOffset = valueOffset;
+    int instanceIdOffset = valueOffset + 1;
+    int partIdOffset = valueOffset + 2;
+
+    int primIdValue = ATOMIC_LOAD(PickBuffer[primIdOffset]);
+    int instanceIdValue = ATOMIC_LOAD(PickBuffer[instanceIdOffset]);
+    int partIdValue = ATOMIC_LOAD(PickBuffer[partIdOffset]);
+
+    // Check if the slot is in use.
+    // if all the values are initialized, just compare 
+    if ((primIdValue != -9) && 
+        (instanceIdValue != -9) && 
+        (partIdValue != -9)) {
+        return  (primId == primIdValue) && 
+                (instanceId == instanceIdValue) && 
+                (partId == partIdValue);
+    } else {
+
+        // Potentially available slot, store the values and return true if successful.
+        int expected = -9;
+        primIdValue = ATOMIC_COMP_SWAP(PickBuffer[primIdOffset], expected, primId);
+
+        // Exit if the slot was unavailable.
+        if (primIdValue != -9 && primIdValue != primId)
+            return false;
+
+        expected = -9;
+        instanceIdValue = ATOMIC_COMP_SWAP(PickBuffer[instanceIdOffset], expected, instanceId);
+
+        // Exit if the slot was unavailable.
+        if (instanceIdValue != -9 && instanceIdValue != instanceId)
+            return false;
+
+        expected = -9;
+        partIdValue = ATOMIC_COMP_SWAP(PickBuffer[partIdOffset], expected, partId);
+
+        // Exit if the slot was unavailable.
+        if (partIdValue != -9 && partIdValue != partId)
+            return false;
+    }
+    
+    return true;
+}
+
+void RenderDeepPicks(int primId, int instanceId, int elementId,
+                     int edgeId, int pointId)
+{
+    // add the item to the pick buffer, but only unique
+
+    // if the pick buffer is not initialized, we are done 
+    if (ATOMIC_LOAD(PickBuffer[0]) == 0)
+        return;
+	
+    // Get some constants from the Pick Buffer
+    // These are initialized in: HdxPickTask::_ClearPickBuffer()
+    //
+    // The first 8 entries in the PickBuffer describe the buffer layout
+    // [0] == The number of sub-buffers (total max hits allowed / sub-buffer size)
+    //        The total max hits allowed is configurable on the pickContext (default = 32,000)
+    // [1] == The max number of hits hashed and stored per sub-buffer (value = 32)
+    // [2] == The TableOffset which is the first entry after this header block.  (value = 8)
+    //        The Table is a collection of fields the length of the number of sub-buffers.
+    //        It holds the number of current hits stored per sub-buffer. 
+    //        These fields are initialized to zero and populated by this shader to track hit storage.
+    // [3] == The StorageOffset which is the starting point where hits are stored.
+    //        Hit results are stored in sub-buffers.
+    //        Each sub-buffer holds up to 32 entries each with 3 entries per hit (primId, instanceId, partId).
+    // [4] == Indicates if faces should be picked (value == 1 or 0)
+    // [5] == Indicates if edges should be picked (value == 1 or 0)
+    // [6] == Indicates if points should be picked (value == 1 or 0)
+    // [7] == Padding
+    // 
+    // [TableOffset -> StorageOffset]
+    //        The table of current entry counts in each sub-buffer (values initialized to 0)
+    // [StorageOffset -> End of Buffer]
+    //        The collection of hits as a (primId, instanceId, partId) tuple. (values initialized to -9)
+
+    const int entrySize = 3;
+    const int numSubBuffers = ATOMIC_LOAD(PickBuffer[0]);
+    const int subBufferCapacity = ATOMIC_LOAD(PickBuffer[1]);
+    const int tableOffset = ATOMIC_LOAD(PickBuffer[2]);
+    const int storageOffset = ATOMIC_LOAD(PickBuffer[3]);
+    const int partId =  ATOMIC_LOAD(PickBuffer[4]) * elementId + 
+                        ATOMIC_LOAD(PickBuffer[5]) * edgeId +
+                        ATOMIC_LOAD(PickBuffer[6]) * pointId;
+
+    // compute the hash for an instance/element and assign it to a sub-buffer
+    const int hashValue = hash3(primId, instanceId, partId);
+    const int subBufferNumber = hashValue % numSubBuffers;
+    int bufferNumber = subBufferNumber;
+
+    // Loop through all sub buffers to find space if we fail to find any in the designated one.
+    do
+    {
+        const int sizeOffset = tableOffset + bufferNumber;
+        const int subBufferOffset = storageOffset + bufferNumber * subBufferCapacity * entrySize;
+
+        // loop through the item's sub-buffer to see if the item is already there
+        // if not, add it in atomic fashion
+        int entryNumber = 0;
+        do
+        {
+            // see if we need to add a new entry
+            if (entryNumber == ATOMIC_LOAD(PickBuffer[sizeOffset])) {
+                ATOMIC_COMP_SWAP(PickBuffer[sizeOffset], entryNumber, entryNumber + 1);
+            }
+
+            // if either the item equals to the current entry or we managed to 
+            // initialize the entry with the item's data, we are done
+            if (compareOrSet(
+                    subBufferOffset + entryNumber * entrySize, 
+                    primId, instanceId, partId)) {
+
+                // We are done.
+                return;
+            }
+        } // we exit out if we reach the capacity of the sub-buffer
+        while(++entryNumber != subBufferCapacity);
+
+        // Get the next buffer.
+        bufferNumber = (bufferNumber + 1) % numSubBuffers;
+    }
+    while (bufferNumber != subBufferNumber);
 }
+#endif // HD_HAS_PickBuffer
 
 -- layout HdxRenderPass.RenderColorAndSelection
 
diff --git a/pxr/imaging/hdx/shaders/renderPassColorAndSelectionShader.glslfx b/pxr/imaging/hdx/shaders/renderPassColorAndSelectionShader.glslfx
index b9255c0af5..c56f7ece06 100644
--- a/pxr/imaging/hdx/shaders/renderPassColorAndSelectionShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassColorAndSelectionShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/renderPassColorShader.glslfx b/pxr/imaging/hdx/shaders/renderPassColorShader.glslfx
index 652a0a0cf8..bb05ce38ff 100644
--- a/pxr/imaging/hdx/shaders/renderPassColorShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassColorShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/renderPassColorWithOccludedSelectionShader.glslfx b/pxr/imaging/hdx/shaders/renderPassColorWithOccludedSelectionShader.glslfx
index 70c368ecf9..b667c7383c 100644
--- a/pxr/imaging/hdx/shaders/renderPassColorWithOccludedSelectionShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassColorWithOccludedSelectionShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/renderPassIdShader.glslfx b/pxr/imaging/hdx/shaders/renderPassIdShader.glslfx
index 33f4363f65..67495226ea 100644
--- a/pxr/imaging/hdx/shaders/renderPassIdShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassIdShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/renderPassOitOpaqueShader.glslfx b/pxr/imaging/hdx/shaders/renderPassOitOpaqueShader.glslfx
index c99063700a..c688346164 100644
--- a/pxr/imaging/hdx/shaders/renderPassOitOpaqueShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassOitOpaqueShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/renderPassOitShader.glslfx b/pxr/imaging/hdx/shaders/renderPassOitShader.glslfx
index 0b0d655f00..f4f67abf57 100644
--- a/pxr/imaging/hdx/shaders/renderPassOitShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassOitShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/renderPassOitVolumeShader.glslfx b/pxr/imaging/hdx/shaders/renderPassOitVolumeShader.glslfx
index 3e492fa02d..37162e8ca1 100644
--- a/pxr/imaging/hdx/shaders/renderPassOitVolumeShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassOitVolumeShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/renderPassPickingShader.glslfx b/pxr/imaging/hdx/shaders/renderPassPickingShader.glslfx
index 281c2bb7c0..f02d97dcfc 100644
--- a/pxr/imaging/hdx/shaders/renderPassPickingShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassPickingShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/renderPassShadowShader.glslfx b/pxr/imaging/hdx/shaders/renderPassShadowShader.glslfx
index 80bb31a531..967a419f3e 100644
--- a/pxr/imaging/hdx/shaders/renderPassShadowShader.glslfx
+++ b/pxr/imaging/hdx/shaders/renderPassShadowShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/selection.glslfx b/pxr/imaging/hdx/shaders/selection.glslfx
index a0d80d8577..22977eabf0 100644
--- a/pxr/imaging/hdx/shaders/selection.glslfx
+++ b/pxr/imaging/hdx/shaders/selection.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0 
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.
diff --git a/pxr/imaging/hdx/shaders/skydome.glslfx b/pxr/imaging/hdx/shaders/skydome.glslfx
index b258ac922a..b61707c6ac 100644
--- a/pxr/imaging/hdx/shaders/skydome.glslfx
+++ b/pxr/imaging/hdx/shaders/skydome.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #import $TOOLS/hdSt/shaders/surfaceHelpers.glslfx
diff --git a/pxr/imaging/hdx/shaders/visualize.glslfx b/pxr/imaging/hdx/shaders/visualize.glslfx
index 7b3c62e056..d8bba7ef21 100644
--- a/pxr/imaging/hdx/shaders/visualize.glslfx
+++ b/pxr/imaging/hdx/shaders/visualize.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/imaging/hdx/shadowMatrixComputation.h b/pxr/imaging/hdx/shadowMatrixComputation.h
index ac1c23e9d8..817655a677 100644
--- a/pxr/imaging/hdx/shadowMatrixComputation.h
+++ b/pxr/imaging/hdx/shadowMatrixComputation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_SHADOW_MATRIX_COMPUTATION_H
 #define PXR_IMAGING_HDX_SHADOW_MATRIX_COMPUTATION_H
diff --git a/pxr/imaging/hdx/shadowTask.cpp b/pxr/imaging/hdx/shadowTask.cpp
index ed27fe6245..935666c53e 100644
--- a/pxr/imaging/hdx/shadowTask.cpp
+++ b/pxr/imaging/hdx/shadowTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/shadowTask.h"
 #include "pxr/imaging/hdx/debugCodes.h"
diff --git a/pxr/imaging/hdx/shadowTask.h b/pxr/imaging/hdx/shadowTask.h
index c06cd0ad91..0eb884c641 100644
--- a/pxr/imaging/hdx/shadowTask.h
+++ b/pxr/imaging/hdx/shadowTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_SHADOW_TASK_H
 #define PXR_IMAGING_HDX_SHADOW_TASK_H
diff --git a/pxr/imaging/hdx/simpleLightTask.cpp b/pxr/imaging/hdx/simpleLightTask.cpp
index dc1fc63cd4..aaa1963863 100644
--- a/pxr/imaging/hdx/simpleLightTask.cpp
+++ b/pxr/imaging/hdx/simpleLightTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/simpleLightTask.h"
 
diff --git a/pxr/imaging/hdx/simpleLightTask.h b/pxr/imaging/hdx/simpleLightTask.h
index 5ee3b38e3f..b6de58478b 100644
--- a/pxr/imaging/hdx/simpleLightTask.h
+++ b/pxr/imaging/hdx/simpleLightTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_SIMPLE_LIGHT_TASK_H
 #define PXR_IMAGING_HDX_SIMPLE_LIGHT_TASK_H
diff --git a/pxr/imaging/hdx/skydomeTask.cpp b/pxr/imaging/hdx/skydomeTask.cpp
index 28933ab0bb..f3fcced1de 100644
--- a/pxr/imaging/hdx/skydomeTask.cpp
+++ b/pxr/imaging/hdx/skydomeTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/skydomeTask.h"
 
diff --git a/pxr/imaging/hdx/skydomeTask.h b/pxr/imaging/hdx/skydomeTask.h
index d3b67b6195..3a5a081d1d 100644
--- a/pxr/imaging/hdx/skydomeTask.h
+++ b/pxr/imaging/hdx/skydomeTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HDX_SKYDOME_TASK_H
 #define HDX_SKYDOME_TASK_H
diff --git a/pxr/imaging/hdx/task.cpp b/pxr/imaging/hdx/task.cpp
index 77164186ac..503b9894a5 100644
--- a/pxr/imaging/hdx/task.cpp
+++ b/pxr/imaging/hdx/task.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/task.h"
 #include "pxr/imaging/hgi/hgi.h"
diff --git a/pxr/imaging/hdx/task.h b/pxr/imaging/hdx/task.h
index 13564596aa..bc114ad5be 100644
--- a/pxr/imaging/hdx/task.h
+++ b/pxr/imaging/hdx/task.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_TASK_H
 #define PXR_IMAGING_HDX_TASK_H
diff --git a/pxr/imaging/hdx/taskController.cpp b/pxr/imaging/hdx/taskController.cpp
index 0297f2b550..4b9b33480e 100644
--- a/pxr/imaging/hdx/taskController.cpp
+++ b/pxr/imaging/hdx/taskController.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/taskController.h"
 
@@ -868,11 +851,6 @@ HdxTaskController::_SetParameters(SdfPath const& pathName,
     // When not using storm, initialize the camera light transform based on
     // the SimpleLight position
     else if (_simpleLightTaskId.IsEmpty()) {
-        GfMatrix4d trans(1.0);
-        const GfVec4d& pos = light.GetPosition();
-        trans.SetTranslateOnly(GfVec3d(pos[0], pos[1], pos[2]));
-        _delegate.SetParameter(pathName, HdTokens->transform, VtValue(trans));
-
         // Initialize distant light specific parameters
         _delegate.SetParameter(pathName, HdLightTokens->angle, 
             VtValue(DISTANT_LIGHT_ANGLE));
@@ -1801,20 +1779,6 @@ HdxTaskController::_SetBuiltInLightingState(
             GetRenderIndex()->GetChangeTracker().MarkSprimDirty(
                 _lightIds[i], HdLight::DirtyParams | HdLight::DirtyTransform);
         }
-
-        // Update the camera light transform if needed
-        if (_simpleLightTaskId.IsEmpty() && !activeLight.IsDomeLight()) {
-            GfMatrix4d const& viewInvMatrix = 
-                _freeCameraSceneDelegate->GetTransform(
-                    _freeCameraSceneDelegate->GetCameraId());
-            VtValue trans = VtValue(viewInvMatrix * activeLight.GetTransform());
-            VtValue prevTrans = _delegate.Get(_lightIds[i], HdTokens->transform);
-            if (viewInvMatrix != GfMatrix4d(1.0) && trans != prevTrans) {
-                _delegate.SetParameter(_lightIds[i], HdTokens->transform, trans);
-                GetRenderIndex()->GetChangeTracker().MarkSprimDirty(
-                    _lightIds[i], HdLight::DirtyTransform);
-            }
-        }
     }
 }
 
diff --git a/pxr/imaging/hdx/taskController.h b/pxr/imaging/hdx/taskController.h
index 5549f36691..839916d3c2 100644
--- a/pxr/imaging/hdx/taskController.h
+++ b/pxr/imaging/hdx/taskController.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_TASK_CONTROLLER_H
 #define PXR_IMAGING_HDX_TASK_CONTROLLER_H
diff --git a/pxr/imaging/hdx/testenv/testHdxCameraAndLight.cpp b/pxr/imaging/hdx/testenv/testHdxCameraAndLight.cpp
index 979bc734ed..717114efbf 100644
--- a/pxr/imaging/hdx/testenv/testHdxCameraAndLight.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxCameraAndLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/glf/glContext.h"
diff --git a/pxr/imaging/hdx/testenv/testHdxDrawTarget.cpp b/pxr/imaging/hdx/testenv/testHdxDrawTarget.cpp
index ba3aab8cc9..be743fc929 100644
--- a/pxr/imaging/hdx/testenv/testHdxDrawTarget.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxDrawTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/glf/diagnostic.h"
diff --git a/pxr/imaging/hdx/testenv/testHdxIdRender.cpp b/pxr/imaging/hdx/testenv/testHdxIdRender.cpp
index 7e66ea5aaf..f92b86e503 100644
--- a/pxr/imaging/hdx/testenv/testHdxIdRender.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxIdRender.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdx/testenv/testHdxLightAndShadow.cpp b/pxr/imaging/hdx/testenv/testHdxLightAndShadow.cpp
index b683f4d091..21cc5fef6b 100644
--- a/pxr/imaging/hdx/testenv/testHdxLightAndShadow.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxLightAndShadow.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glDebugWindow.h"
 #include "pxr/base/gf/frustum.h"
diff --git a/pxr/imaging/hdx/testenv/testHdxPickAndHighlight.cpp b/pxr/imaging/hdx/testenv/testHdxPickAndHighlight.cpp
index cf654fb2b6..01ec8d0122 100644
--- a/pxr/imaging/hdx/testenv/testHdxPickAndHighlight.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxPickAndHighlight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdx/testenv/testHdxPickResolveMode.cpp b/pxr/imaging/hdx/testenv/testHdxPickResolveMode.cpp
index 01b748ae8e..00f1b1bda9 100644
--- a/pxr/imaging/hdx/testenv/testHdxPickResolveMode.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxPickResolveMode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdx/testenv/testHdxPickTarget.cpp b/pxr/imaging/hdx/testenv/testHdxPickTarget.cpp
index ca75e29551..53ca77dd72 100644
--- a/pxr/imaging/hdx/testenv/testHdxPickTarget.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxPickTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdx/testenv/testHdxPickingWithReprAndRefineChanges.cpp b/pxr/imaging/hdx/testenv/testHdxPickingWithReprAndRefineChanges.cpp
index 403c826bad..a492faa64e 100644
--- a/pxr/imaging/hdx/testenv/testHdxPickingWithReprAndRefineChanges.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxPickingWithReprAndRefineChanges.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdx/testenv/testHdxRenderTask.cpp b/pxr/imaging/hdx/testenv/testHdxRenderTask.cpp
index 4cbf544717..f40dcb91e4 100644
--- a/pxr/imaging/hdx/testenv/testHdxRenderTask.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxRenderTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glDebugWindow.h"
 
diff --git a/pxr/imaging/hdx/testenv/testHdxUnpickablesAsOccluders.cpp b/pxr/imaging/hdx/testenv/testHdxUnpickablesAsOccluders.cpp
index b46e601a12..0887c9781c 100644
--- a/pxr/imaging/hdx/testenv/testHdxUnpickablesAsOccluders.cpp
+++ b/pxr/imaging/hdx/testenv/testHdxUnpickablesAsOccluders.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/hdx/tokens.cpp b/pxr/imaging/hdx/tokens.cpp
index ab72a9ca3a..f30851d3cf 100644
--- a/pxr/imaging/hdx/tokens.cpp
+++ b/pxr/imaging/hdx/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/tokens.h"
 
diff --git a/pxr/imaging/hdx/tokens.h b/pxr/imaging/hdx/tokens.h
index b389e65695..9fd7ff347e 100644
--- a/pxr/imaging/hdx/tokens.h
+++ b/pxr/imaging/hdx/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_TOKENS_H
 #define PXR_IMAGING_HDX_TOKENS_H
diff --git a/pxr/imaging/hdx/types.cpp b/pxr/imaging/hdx/types.cpp
index 342abbe1eb..a966eb6a13 100644
--- a/pxr/imaging/hdx/types.cpp
+++ b/pxr/imaging/hdx/types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/types.h"
 
diff --git a/pxr/imaging/hdx/types.h b/pxr/imaging/hdx/types.h
index 49f3c851be..334919868d 100644
--- a/pxr/imaging/hdx/types.h
+++ b/pxr/imaging/hdx/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_TYPES_H
 #define PXR_IMAGING_HDX_TYPES_H
diff --git a/pxr/imaging/hdx/unitTestDelegate.cpp b/pxr/imaging/hdx/unitTestDelegate.cpp
index 56b5280bcf..67d965decd 100644
--- a/pxr/imaging/hdx/unitTestDelegate.cpp
+++ b/pxr/imaging/hdx/unitTestDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/unitTestDelegate.h"
 
@@ -58,7 +41,8 @@ TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
 
     (renderBufferDescriptor)
-);    
+);
+
 
 static void
 _CreateGrid(int nx, int ny, VtVec3fArray *points,
diff --git a/pxr/imaging/hdx/unitTestDelegate.h b/pxr/imaging/hdx/unitTestDelegate.h
index 1901e5acf1..8c3d8ec430 100644
--- a/pxr/imaging/hdx/unitTestDelegate.h
+++ b/pxr/imaging/hdx/unitTestDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_UNIT_TEST_DELEGATE_H
 #define PXR_IMAGING_HDX_UNIT_TEST_DELEGATE_H
diff --git a/pxr/imaging/hdx/unitTestUtils.cpp b/pxr/imaging/hdx/unitTestUtils.cpp
index f10747bdec..d6759e2bfd 100644
--- a/pxr/imaging/hdx/unitTestUtils.cpp
+++ b/pxr/imaging/hdx/unitTestUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 //
 #include "pxr/pxr.h"
diff --git a/pxr/imaging/hdx/unitTestUtils.h b/pxr/imaging/hdx/unitTestUtils.h
index d4900d0e0b..440cf88e19 100644
--- a/pxr/imaging/hdx/unitTestUtils.h
+++ b/pxr/imaging/hdx/unitTestUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 //
 #ifndef PXR_IMAGING_HDX_UNIT_TEST_UTILS_H
diff --git a/pxr/imaging/hdx/version.h b/pxr/imaging/hdx/version.h
index 8826f0a417..3b52319933 100644
--- a/pxr/imaging/hdx/version.h
+++ b/pxr/imaging/hdx/version.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HDX_VERSION_H
 #define PXR_IMAGING_HDX_VERSION_H
@@ -35,6 +18,9 @@
 // 9  -> 10 : replaced enableSelection with enableSelectionHighlight and 
 //            enableLocateHighlight on HdxSelectionTask and HdxColorizeSelectionTask params.
 // 10 -> 11 : New signature for HdxFullscreenShader::BindTextures.
-#define HDX_API_VERSION 11
+// 11 -> 12 : change HdxPickHit::worldSpaceHitPoint from GfVec3f to GfVec3d.
+// 12 -> 13 : Add HdxPickTask "resolveDeep" mode.
+//
+#define HDX_API_VERSION 13
 
 #endif // PXR_IMAGING_HDX_VERSION_H
diff --git a/pxr/imaging/hdx/visualizeAovTask.cpp b/pxr/imaging/hdx/visualizeAovTask.cpp
index a6b7efe7cb..63aa3fdb64 100644
--- a/pxr/imaging/hdx/visualizeAovTask.cpp
+++ b/pxr/imaging/hdx/visualizeAovTask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdx/visualizeAovTask.h"
 #include "pxr/imaging/hdx/package.h"
diff --git a/pxr/imaging/hdx/visualizeAovTask.h b/pxr/imaging/hdx/visualizeAovTask.h
index ceb12926b9..a5982cb46f 100644
--- a/pxr/imaging/hdx/visualizeAovTask.h
+++ b/pxr/imaging/hdx/visualizeAovTask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HDX_VISUALIZE_AOV_TASK_H
 #define HDX_VISUALIZE_AOV_TASK_H
diff --git a/pxr/imaging/hf/api.h b/pxr/imaging/hf/api.h
index cbff5ecd81..1d1b8c010f 100644
--- a/pxr/imaging/hf/api.h
+++ b/pxr/imaging/hf/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HF_API_H
 #define PXR_IMAGING_HF_API_H
diff --git a/pxr/imaging/hf/diagnostic.h b/pxr/imaging/hf/diagnostic.h
index 6f0638a475..865d924d45 100644
--- a/pxr/imaging/hf/diagnostic.h
+++ b/pxr/imaging/hf/diagnostic.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HF_DIAGNOSTIC_H
 #define PXR_IMAGING_HF_DIAGNOSTIC_H
diff --git a/pxr/imaging/hf/pch.h b/pxr/imaging/hf/pch.h
index 5aec07423f..e25c12af87 100644
--- a/pxr/imaging/hf/pch.h
+++ b/pxr/imaging/hf/pch.h
@@ -1,40 +1,28 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
 
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
+#include "pxr/base/arch/defines.h"
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
+#endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
 #include <cstdlib>
+#include <cstring>
 #include <functional>
-#include <initializer_list>
 #include <iosfwd>
 #include <locale>
 #include <map>
@@ -44,7 +32,6 @@
 #include <set>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
 #include <type_traits>
@@ -53,16 +40,3 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
diff --git a/pxr/imaging/hf/perfLog.h b/pxr/imaging/hf/perfLog.h
index e45ee944ac..bb03155d27 100644
--- a/pxr/imaging/hf/perfLog.h
+++ b/pxr/imaging/hf/perfLog.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HF_PERF_LOG_H
 #define PXR_IMAGING_HF_PERF_LOG_H
diff --git a/pxr/imaging/hf/pluginBase.cpp b/pxr/imaging/hf/pluginBase.cpp
index 1460b6537f..8f973faa32 100644
--- a/pxr/imaging/hf/pluginBase.cpp
+++ b/pxr/imaging/hf/pluginBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hf/pluginBase.h"
 
diff --git a/pxr/imaging/hf/pluginBase.h b/pxr/imaging/hf/pluginBase.h
index 5ad790c03d..b69b67e4ed 100644
--- a/pxr/imaging/hf/pluginBase.h
+++ b/pxr/imaging/hf/pluginBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HF_PLUGIN_BASE_H
 #define PXR_IMAGING_HF_PLUGIN_BASE_H
diff --git a/pxr/imaging/hf/pluginDesc.h b/pxr/imaging/hf/pluginDesc.h
index a31f47399b..76577cae54 100644
--- a/pxr/imaging/hf/pluginDesc.h
+++ b/pxr/imaging/hf/pluginDesc.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HF_PLUGIN_DESC_H
 #define PXR_IMAGING_HF_PLUGIN_DESC_H
diff --git a/pxr/imaging/hf/pluginEntry.cpp b/pxr/imaging/hf/pluginEntry.cpp
index 1f8cd05122..218b7631c6 100644
--- a/pxr/imaging/hf/pluginEntry.cpp
+++ b/pxr/imaging/hf/pluginEntry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hf/pluginEntry.h"
 #include "pxr/imaging/hf/pluginBase.h"
diff --git a/pxr/imaging/hf/pluginEntry.h b/pxr/imaging/hf/pluginEntry.h
index 88605efa2d..71973339a8 100644
--- a/pxr/imaging/hf/pluginEntry.h
+++ b/pxr/imaging/hf/pluginEntry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HF_PLUGIN_ENTRY_H
 #define PXR_IMAGING_HF_PLUGIN_ENTRY_H
diff --git a/pxr/imaging/hf/pluginRegistry.cpp b/pxr/imaging/hf/pluginRegistry.cpp
index 852d5e2480..e3711ede0b 100644
--- a/pxr/imaging/hf/pluginRegistry.cpp
+++ b/pxr/imaging/hf/pluginRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hf/pluginRegistry.h"
 #include "pxr/imaging/hf/pluginBase.h"
diff --git a/pxr/imaging/hf/pluginRegistry.h b/pxr/imaging/hf/pluginRegistry.h
index bbc5447d81..8459d628db 100644
--- a/pxr/imaging/hf/pluginRegistry.h
+++ b/pxr/imaging/hf/pluginRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HF_PLUGIN_REGISTRY_H
 #define PXR_IMAGING_HF_PLUGIN_REGISTRY_H
diff --git a/pxr/imaging/hgi/api.h b/pxr/imaging/hgi/api.h
index 7527bbb21f..77110454b7 100644
--- a/pxr/imaging/hgi/api.h
+++ b/pxr/imaging/hgi/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_API_H
 #define PXR_IMAGING_HGI_API_H
diff --git a/pxr/imaging/hgi/attachmentDesc.cpp b/pxr/imaging/hgi/attachmentDesc.cpp
index 9832d19c5b..53e71a6b6e 100644
--- a/pxr/imaging/hgi/attachmentDesc.cpp
+++ b/pxr/imaging/hgi/attachmentDesc.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/attachmentDesc.h"
 
diff --git a/pxr/imaging/hgi/attachmentDesc.h b/pxr/imaging/hgi/attachmentDesc.h
index c4effa2c27..443b0f787c 100644
--- a/pxr/imaging/hgi/attachmentDesc.h
+++ b/pxr/imaging/hgi/attachmentDesc.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_ATTACHMENT_DESC_H
 #define PXR_IMAGING_HGI_ATTACHMENT_DESC_H
diff --git a/pxr/imaging/hgi/blitCmds.cpp b/pxr/imaging/hgi/blitCmds.cpp
index 2bdba27091..c54b8508e8 100644
--- a/pxr/imaging/hgi/blitCmds.cpp
+++ b/pxr/imaging/hgi/blitCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/blitCmds.h"
 #include "pxr/imaging/hgi/blitCmdsOps.h"
diff --git a/pxr/imaging/hgi/blitCmds.h b/pxr/imaging/hgi/blitCmds.h
index 3e74417070..36c816c439 100644
--- a/pxr/imaging/hgi/blitCmds.h
+++ b/pxr/imaging/hgi/blitCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_BLIT_CMDS_H
 #define PXR_IMAGING_HGI_BLIT_CMDS_H
diff --git a/pxr/imaging/hgi/blitCmdsOps.h b/pxr/imaging/hgi/blitCmdsOps.h
index 874e304dc6..8ada58bfd7 100644
--- a/pxr/imaging/hgi/blitCmdsOps.h
+++ b/pxr/imaging/hgi/blitCmdsOps.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_BLIT_CMDS_OPS_H
 #define PXR_IMAGING_HGI_BLIT_CMDS_OPS_H
diff --git a/pxr/imaging/hgi/buffer.cpp b/pxr/imaging/hgi/buffer.cpp
index 166a59b848..77aefe4d66 100644
--- a/pxr/imaging/hgi/buffer.cpp
+++ b/pxr/imaging/hgi/buffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/buffer.h"
 
diff --git a/pxr/imaging/hgi/buffer.h b/pxr/imaging/hgi/buffer.h
index aec6a7a04a..c7c59cf02a 100644
--- a/pxr/imaging/hgi/buffer.h
+++ b/pxr/imaging/hgi/buffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_BUFFER_H
 #define PXR_IMAGING_HGI_BUFFER_H
diff --git a/pxr/imaging/hgi/capabilities.cpp b/pxr/imaging/hgi/capabilities.cpp
index cfd372159a..b0f2624b60 100644
--- a/pxr/imaging/hgi/capabilities.cpp
+++ b/pxr/imaging/hgi/capabilities.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/capabilities.h"
 
diff --git a/pxr/imaging/hgi/capabilities.h b/pxr/imaging/hgi/capabilities.h
index ae2ecb4e5b..b53197566c 100644
--- a/pxr/imaging/hgi/capabilities.h
+++ b/pxr/imaging/hgi/capabilities.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_CAPABILITIES_H
 #define PXR_IMAGING_HGI_CAPABILITIES_H
diff --git a/pxr/imaging/hgi/cmds.cpp b/pxr/imaging/hgi/cmds.cpp
index e818c47efe..a37be8dce0 100644
--- a/pxr/imaging/hgi/cmds.cpp
+++ b/pxr/imaging/hgi/cmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/cmds.h"
 
diff --git a/pxr/imaging/hgi/cmds.h b/pxr/imaging/hgi/cmds.h
index c326056c69..53539c22f8 100644
--- a/pxr/imaging/hgi/cmds.h
+++ b/pxr/imaging/hgi/cmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_CMDS_H
 #define PXR_IMAGING_HGI_CMDS_H
diff --git a/pxr/imaging/hgi/computeCmds.cpp b/pxr/imaging/hgi/computeCmds.cpp
index 1771681d6b..f52732a2c5 100644
--- a/pxr/imaging/hgi/computeCmds.cpp
+++ b/pxr/imaging/hgi/computeCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/computeCmds.h"
 
diff --git a/pxr/imaging/hgi/computeCmds.h b/pxr/imaging/hgi/computeCmds.h
index 5aab66ce7e..7a77519971 100644
--- a/pxr/imaging/hgi/computeCmds.h
+++ b/pxr/imaging/hgi/computeCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_COMPUTE_CMDS_H
 #define PXR_IMAGING_HGI_COMPUTE_CMDS_H
diff --git a/pxr/imaging/hgi/computeCmdsDesc.cpp b/pxr/imaging/hgi/computeCmdsDesc.cpp
index 177de06f7f..b16f0c8f3f 100644
--- a/pxr/imaging/hgi/computeCmdsDesc.cpp
+++ b/pxr/imaging/hgi/computeCmdsDesc.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/computeCmdsDesc.h"
 
diff --git a/pxr/imaging/hgi/computeCmdsDesc.h b/pxr/imaging/hgi/computeCmdsDesc.h
index b20dd7cafd..4c1b48ccbd 100644
--- a/pxr/imaging/hgi/computeCmdsDesc.h
+++ b/pxr/imaging/hgi/computeCmdsDesc.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_COMPUTE_CMDS_DESC_H
 #define PXR_IMAGING_HGI_COMPUTE_CMDS_DESC_H
diff --git a/pxr/imaging/hgi/computePipeline.cpp b/pxr/imaging/hgi/computePipeline.cpp
index 3ca03a9695..e0c31eb63e 100644
--- a/pxr/imaging/hgi/computePipeline.cpp
+++ b/pxr/imaging/hgi/computePipeline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/computePipeline.h"
 
diff --git a/pxr/imaging/hgi/computePipeline.h b/pxr/imaging/hgi/computePipeline.h
index bad5ee8ad6..7becee6f4c 100644
--- a/pxr/imaging/hgi/computePipeline.h
+++ b/pxr/imaging/hgi/computePipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_COMPUTE_PIPELINE_H
 #define PXR_IMAGING_HGI_COMPUTE_PIPELINE_H
diff --git a/pxr/imaging/hgi/debugCodes.cpp b/pxr/imaging/hgi/debugCodes.cpp
index 53f7ff908c..8e80bc55c3 100644
--- a/pxr/imaging/hgi/debugCodes.cpp
+++ b/pxr/imaging/hgi/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file debugCodes.cpp
 
@@ -36,6 +19,10 @@ TF_REGISTRY_FUNCTION(TfDebug)
     TF_DEBUG_ENVIRONMENT_SYMBOL(HGI_DEBUG_DEVICE_CAPABILITIES,
         "Hgi report when device capabilities are initialized and dump "
         "contents");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HGI_DEBUG_INSTANCE_CREATION,
+        "Hgi report when attempting to create an Hgi instance");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HGI_DEBUG_IS_SUPPORTED,
+        "Hgi debug info when IsBackendSupported() is false");
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hgi/debugCodes.h b/pxr/imaging/hgi/debugCodes.h
index 637362516e..1e89aa0207 100644
--- a/pxr/imaging/hgi/debugCodes.h
+++ b/pxr/imaging/hgi/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_DEBUG_CODES_H
 #define PXR_IMAGING_HGI_DEBUG_CODES_H
@@ -34,8 +17,9 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 TF_DEBUG_CODES(
 
-    HGI_DEBUG_DEVICE_CAPABILITIES
-
+    HGI_DEBUG_DEVICE_CAPABILITIES,
+    HGI_DEBUG_INSTANCE_CREATION,
+    HGI_DEBUG_IS_SUPPORTED
 );
 
 
diff --git a/pxr/imaging/hgi/enums.h b/pxr/imaging/hgi/enums.h
index 4dc4032b3e..5811b2c598 100644
--- a/pxr/imaging/hgi/enums.h
+++ b/pxr/imaging/hgi/enums.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_ENUMS_H
 #define PXR_IMAGING_HGI_ENUMS_H
diff --git a/pxr/imaging/hgi/graphicsCmds.cpp b/pxr/imaging/hgi/graphicsCmds.cpp
index 2292939cf9..d3e9417080 100644
--- a/pxr/imaging/hgi/graphicsCmds.cpp
+++ b/pxr/imaging/hgi/graphicsCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/graphicsCmds.h"
 
diff --git a/pxr/imaging/hgi/graphicsCmds.h b/pxr/imaging/hgi/graphicsCmds.h
index 680070be2d..cd0fec14c6 100644
--- a/pxr/imaging/hgi/graphicsCmds.h
+++ b/pxr/imaging/hgi/graphicsCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GRAPHICS_CMDS_H
 #define PXR_IMAGING_HGI_GRAPHICS_CMDS_H
diff --git a/pxr/imaging/hgi/graphicsCmdsDesc.cpp b/pxr/imaging/hgi/graphicsCmdsDesc.cpp
index 20965781a3..93a6713f68 100644
--- a/pxr/imaging/hgi/graphicsCmdsDesc.cpp
+++ b/pxr/imaging/hgi/graphicsCmdsDesc.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/graphicsCmdsDesc.h"
 
diff --git a/pxr/imaging/hgi/graphicsCmdsDesc.h b/pxr/imaging/hgi/graphicsCmdsDesc.h
index 3b4edfa8a0..697ab7cff8 100644
--- a/pxr/imaging/hgi/graphicsCmdsDesc.h
+++ b/pxr/imaging/hgi/graphicsCmdsDesc.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GRAPHICS_CMDS_DESC_H
 #define PXR_IMAGING_HGI_GRAPHICS_CMDS_DESC_H
diff --git a/pxr/imaging/hgi/graphicsPipeline.cpp b/pxr/imaging/hgi/graphicsPipeline.cpp
index 35f0fab7da..ff82c3d6a7 100644
--- a/pxr/imaging/hgi/graphicsPipeline.cpp
+++ b/pxr/imaging/hgi/graphicsPipeline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/graphicsPipeline.h"
 
diff --git a/pxr/imaging/hgi/graphicsPipeline.h b/pxr/imaging/hgi/graphicsPipeline.h
index 9a8ba8c976..4ba7f8b19c 100644
--- a/pxr/imaging/hgi/graphicsPipeline.h
+++ b/pxr/imaging/hgi/graphicsPipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GRAPHICS_PIPELINE_H
 #define PXR_IMAGING_HGI_GRAPHICS_PIPELINE_H
diff --git a/pxr/imaging/hgi/handle.h b/pxr/imaging/hgi/handle.h
index afb60fa781..a005014d50 100644
--- a/pxr/imaging/hgi/handle.h
+++ b/pxr/imaging/hgi/handle.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_HANDLE_H
 #define PXR_IMAGING_HGI_HANDLE_H
@@ -57,6 +40,10 @@ class HgiHandle
         return _ptr;
     }
 
+    uint64_t GetId() const {
+        return _id;
+    }
+
     // Note this only checks if a ptr is set, it does not offer weak_ptr safety.
     explicit operator bool() const {return _ptr!=nullptr;}
 
diff --git a/pxr/imaging/hgi/hgi.cpp b/pxr/imaging/hgi/hgi.cpp
index 5cd70d8c25..14f7c63b6d 100644
--- a/pxr/imaging/hgi/hgi.cpp
+++ b/pxr/imaging/hgi/hgi.cpp
@@ -1,27 +1,13 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/hgi.h"
+#include "pxr/imaging/hgi/debugCodes.h"
+#include "pxr/imaging/hgi/tokens.h"
+
 #include "pxr/base/arch/defines.h"
 #include "pxr/base/plug/plugin.h"
 #include "pxr/base/plug/registry.h"
@@ -59,6 +45,9 @@ Hgi::SubmitCmds(HgiCmds* cmds, HgiSubmitWaitType wait)
 static Hgi*
 _MakeNewPlatformDefaultHgi()
 {
+    TF_DEBUG(HGI_DEBUG_INSTANCE_CREATION).Msg("Attempting to create platform "
+        "default Hgi\n");
+    
     // We use the plugin system to construct derived Hgi classes to avoid any
     // linker complications.
 
@@ -86,6 +75,9 @@ _MakeNewPlatformDefaultHgi()
         #endif
     }
 
+    TF_DEBUG(HGI_DEBUG_INSTANCE_CREATION).Msg("Platform default Hgi: "
+        "%s\n", hgiType);
+
     const TfType plugType = plugReg.FindDerivedTypeByName<Hgi>(hgiType);
 
     PlugPluginPtr plugin = plugReg.GetPluginForType(plugType);
@@ -110,6 +102,78 @@ _MakeNewPlatformDefaultHgi()
         return nullptr;
     }
 
+    TF_DEBUG(HGI_DEBUG_INSTANCE_CREATION).Msg("Successfully created platform "
+        "default Hgi %s\n", hgiType);
+
+    return instance;
+}
+
+static Hgi*
+_MakeNamedHgi(const TfToken& hgiToken)
+{
+    TF_DEBUG(HGI_DEBUG_INSTANCE_CREATION).Msg("Attempting to create named Hgi "
+        "%s\n", hgiToken.GetText());
+    
+    std::string hgiType;
+
+    if (hgiToken == HgiTokens->OpenGL) {
+#if defined(PXR_GL_SUPPORT_ENABLED)
+        hgiType = "HgiGL";
+#endif
+    } else if (hgiToken == HgiTokens->Vulkan) {
+#if defined(PXR_VULKAN_SUPPORT_ENABLED)
+        hgiType = "HgiVulkan";
+#endif
+    } else if (hgiToken == HgiTokens->Metal) {
+#if defined(PXR_METAL_SUPPORT_ENABLED)
+        hgiType = "HgiMetal";
+#endif
+    } else if (hgiToken.IsEmpty()) {
+        return _MakeNewPlatformDefaultHgi();
+    } else {
+        // If an invalid token is provided, return nullptr.
+        TF_CODING_ERROR("Unsupported token %s was provided.",
+                        hgiToken.GetText());
+        return nullptr;
+    }
+
+    // If a valid, non-empty token was provided but that Hgi type is 
+    // unsupported by the build, return nullptr.
+    if (hgiType.empty()) {
+        TF_CODING_ERROR("Build does not support proposed Hgi type %s on "
+                        "this platform.", hgiType.c_str());
+        return nullptr;
+    }
+
+    PlugRegistry& plugReg = PlugRegistry::GetInstance();
+
+    const TfType plugType = plugReg.FindDerivedTypeByName<Hgi>(hgiType);
+
+    PlugPluginPtr plugin = plugReg.GetPluginForType(plugType);
+    if (!plugin || !plugin->Load()) {
+        TF_CODING_ERROR(
+            "[PluginLoad] PlugPlugin could not be loaded for TfType '%s'\n",
+            plugType.GetTypeName().c_str());
+        return nullptr;
+    }
+
+    HgiFactoryBase* factory = plugType.GetFactory<HgiFactoryBase>();
+    if (!factory) {
+        TF_CODING_ERROR("[PluginLoad] Cannot manufacture type '%s' \n",
+            plugType.GetTypeName().c_str());
+        return nullptr;
+    }
+
+    Hgi* instance = factory->New();
+    if (!instance) {
+        TF_CODING_ERROR("[PluginLoad] Cannot construct instance of type '%s'\n",
+            plugType.GetTypeName().c_str());
+        return nullptr;
+    }
+
+    TF_DEBUG(HGI_DEBUG_INSTANCE_CREATION).Msg("Successfully created named Hgi "
+        "%s\n", hgiType.c_str());
+
     return instance;
 }
 
@@ -128,10 +192,29 @@ Hgi::CreatePlatformDefaultHgi()
     return HgiUniquePtr(_MakeNewPlatformDefaultHgi());
 }
 
+HgiUniquePtr 
+Hgi::CreateNamedHgi(const TfToken& hgiToken)
+{
+    return HgiUniquePtr(_MakeNamedHgi(hgiToken));
+}
+
 bool
-Hgi::IsSupported()
+Hgi::IsSupported(const TfToken& hgiToken)
 {
-    if (HgiUniquePtr const instance = CreatePlatformDefaultHgi()) {
+    // TODO: By current design, a Hgi instance is created and initialized as a 
+    // method of confirming support on a platform. Once this is done, the 
+    // instance is destroyed along with the created API contexts. This is not 
+    // the best way to check for support on a platform and we'd like to change 
+    // this approach in the future.
+
+    HgiUniquePtr instance = nullptr;
+    if (hgiToken.IsEmpty()) {
+        instance = CreatePlatformDefaultHgi();
+    } else {
+        instance = CreateNamedHgi(hgiToken);
+    }
+
+    if (instance) {
         return instance->IsBackendSupported();
     }
 
diff --git a/pxr/imaging/hgi/hgi.h b/pxr/imaging/hgi/hgi.h
index 0dbd94e9e1..e75e18aad7 100644
--- a/pxr/imaging/hgi/hgi.h
+++ b/pxr/imaging/hgi/hgi.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_HGI_H
 #define PXR_IMAGING_HGI_HGI_H
@@ -141,16 +124,38 @@ class Hgi
     HGI_API
     static HgiUniquePtr CreatePlatformDefaultHgi();
 
+    /// Helper function to return a Hgi object of choice supported by current 
+    /// platform and build configuration.
+    /// For example, on macOS, this may allow HgiMetal only.
+    /// If the Hgi device specified is not available on the current platform,
+    /// this function will fail and return nullptr. 
+    /// If an empty token is provided, the default Hgi type (see
+    /// CreatePlatformDefaultHgi) will be created.
+    /// Supported TfToken values are OpenGL, Metal, Vulkan, or an empty token;
+    /// if not using an empty token, the caller is expected to use a token from 
+    /// HgiTokens.
+    /// Caller, usually the application, owns the lifetime of the Hgi object and
+    /// the object is destroyed when the caller drops the unique ptr.
+    /// Thread safety: Not thread safe.
+    HGI_API
+    static HgiUniquePtr CreateNamedHgi(const TfToken& hgiToken);
+
     /// Determine if Hgi instance can run on current hardware.
     /// Thread safety: This call is thread safe.
     HGI_API
     virtual bool IsBackendSupported() const = 0;
 
-    /// Constructs a temporary Hgi object for the current platform and calls
-    /// the object's IsBackendSupported() function.
+    /// Constructs a temporary Hgi object and calls the object's 
+    /// IsBackendSupported() function.
+    /// A token can optionally be provided to specify a specific Hgi backend to 
+    /// create. Supported TfToken values are OpenGL, Metal, Vulkan, or an empty 
+    /// token; if not using an empty token, the caller is expected to use a 
+    /// token from HgiTokens. 
+    /// An empty token will check support for creating the platform default Hgi.
+    /// An invalid token will result in this function returning false.
     /// Thread safety: Not thread safe.
     HGI_API
-    static bool IsSupported();
+    static bool IsSupported(const TfToken& hgiToken = TfToken());
 
     /// Returns a GraphicsCmds object (for temporary use) that is ready to
     /// record draw commands. GraphicsCmds is a lightweight object that
diff --git a/pxr/imaging/hgi/indirectCommandEncoder.cpp b/pxr/imaging/hgi/indirectCommandEncoder.cpp
index f11bd88d26..49033ad44e 100644
--- a/pxr/imaging/hgi/indirectCommandEncoder.cpp
+++ b/pxr/imaging/hgi/indirectCommandEncoder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgi/indirectCommandEncoder.h"
diff --git a/pxr/imaging/hgi/indirectCommandEncoder.h b/pxr/imaging/hgi/indirectCommandEncoder.h
index c0695dd979..3fbbe24959 100644
--- a/pxr/imaging/hgi/indirectCommandEncoder.h
+++ b/pxr/imaging/hgi/indirectCommandEncoder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_INDIRECT_COMMAND_ENCODER_H
 #define PXR_IMAGING_HGI_INDIRECT_COMMAND_ENCODER_H
diff --git a/pxr/imaging/hgi/pch.h b/pxr/imaging/hgi/pch.h
index 41514c2909..ef3dc0f90b 100644
--- a/pxr/imaging/hgi/pch.h
+++ b/pxr/imaging/hgi/pch.h
@@ -1,43 +1,83 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
 
+#define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
+#include "pxr/base/arch/defines.h"
+#if defined(ARCH_OS_DARWIN)
+#include <mach/mach_time.h>
+#endif
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
+#include <x86intrin.h>
+#endif
+#if defined(ARCH_OS_WINDOWS)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <Windows.h>
+#include <intrin.h>
+#endif
+#include <algorithm>
+#include <any>
+#include <atomic>
 #include <cinttypes>
 #include <cmath>
+#include <cstdarg>
 #include <cstddef>
 #include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <deque>
+#include <functional>
+#include <initializer_list>
 #include <iosfwd>
+#include <iostream>
+#include <iterator>
 #include <limits>
+#include <list>
 #include <locale>
+#include <map>
+#include <math.h>
 #include <memory>
+#include <mutex>
+#include <new>
+#include <numeric>
+#include <ostream>
+#include <set>
+#include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <string>
 #include <sys/types.h>
+#include <tuple>
 #include <type_traits>
+#include <typeindex>
+#include <typeinfo>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/python/object_fwd.hpp>
+#include <boost/python/object_operators.hpp>
+#if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
+#undef tolower
+#undef toupper
+#endif
+#endif // PXR_PYTHON_SUPPORT_ENABLED
+#include <tbb/cache_aligned_allocator.h>
+#include <tbb/spin_mutex.h>
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include "pxr/base/tf/pySafePython.h"
+#endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hgi/resourceBindings.cpp b/pxr/imaging/hgi/resourceBindings.cpp
index 7ea6da590d..eb5cebd474 100644
--- a/pxr/imaging/hgi/resourceBindings.cpp
+++ b/pxr/imaging/hgi/resourceBindings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/resourceBindings.h"
 
diff --git a/pxr/imaging/hgi/resourceBindings.h b/pxr/imaging/hgi/resourceBindings.h
index fd07cdb433..7f349f1cdb 100644
--- a/pxr/imaging/hgi/resourceBindings.h
+++ b/pxr/imaging/hgi/resourceBindings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_RESOURCEBINDINGS_H
 #define PXR_IMAGING_HGI_RESOURCEBINDINGS_H
diff --git a/pxr/imaging/hgi/sampler.cpp b/pxr/imaging/hgi/sampler.cpp
index 1dd1e705f7..993383929e 100644
--- a/pxr/imaging/hgi/sampler.cpp
+++ b/pxr/imaging/hgi/sampler.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/sampler.h"
 
diff --git a/pxr/imaging/hgi/sampler.h b/pxr/imaging/hgi/sampler.h
index 69f3f0dfb3..a6dfb5537d 100644
--- a/pxr/imaging/hgi/sampler.h
+++ b/pxr/imaging/hgi/sampler.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_SAMPLER_H
 #define PXR_IMAGING_HGI_SAMPLER_H
diff --git a/pxr/imaging/hgi/shaderFunction.cpp b/pxr/imaging/hgi/shaderFunction.cpp
index e435793eec..c8e4d00308 100644
--- a/pxr/imaging/hgi/shaderFunction.cpp
+++ b/pxr/imaging/hgi/shaderFunction.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/shaderFunction.h"
 
diff --git a/pxr/imaging/hgi/shaderFunction.h b/pxr/imaging/hgi/shaderFunction.h
index 7f43b3418e..2ced608a15 100644
--- a/pxr/imaging/hgi/shaderFunction.h
+++ b/pxr/imaging/hgi/shaderFunction.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_SHADERFUNCTION_H
 #define PXR_IMAGING_HGI_SHADERFUNCTION_H
diff --git a/pxr/imaging/hgi/shaderFunctionDesc.cpp b/pxr/imaging/hgi/shaderFunctionDesc.cpp
index aa128cc71d..1ceca27e76 100644
--- a/pxr/imaging/hgi/shaderFunctionDesc.cpp
+++ b/pxr/imaging/hgi/shaderFunctionDesc.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/shaderFunctionDesc.h"
 
diff --git a/pxr/imaging/hgi/shaderFunctionDesc.h b/pxr/imaging/hgi/shaderFunctionDesc.h
index b2155489b6..5c87434287 100644
--- a/pxr/imaging/hgi/shaderFunctionDesc.h
+++ b/pxr/imaging/hgi/shaderFunctionDesc.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGI_SHADERFUNCTIONDESC_H
diff --git a/pxr/imaging/hgi/shaderGenerator.cpp b/pxr/imaging/hgi/shaderGenerator.cpp
index cb4fd09431..43746d2d43 100644
--- a/pxr/imaging/hgi/shaderGenerator.cpp
+++ b/pxr/imaging/hgi/shaderGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgi/shaderGenerator.h"
diff --git a/pxr/imaging/hgi/shaderGenerator.h b/pxr/imaging/hgi/shaderGenerator.h
index 1636847d81..70b2101534 100644
--- a/pxr/imaging/hgi/shaderGenerator.h
+++ b/pxr/imaging/hgi/shaderGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGI_SHADERGENERATOR_H
diff --git a/pxr/imaging/hgi/shaderProgram.cpp b/pxr/imaging/hgi/shaderProgram.cpp
index 7bc651d706..57f9207072 100644
--- a/pxr/imaging/hgi/shaderProgram.cpp
+++ b/pxr/imaging/hgi/shaderProgram.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/shaderProgram.h"
 
diff --git a/pxr/imaging/hgi/shaderProgram.h b/pxr/imaging/hgi/shaderProgram.h
index 8b9e50a3e0..4722424d13 100644
--- a/pxr/imaging/hgi/shaderProgram.h
+++ b/pxr/imaging/hgi/shaderProgram.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_SHADERPROGRAM_H
 #define PXR_IMAGING_HGI_SHADERPROGRAM_H
diff --git a/pxr/imaging/hgi/shaderSection.cpp b/pxr/imaging/hgi/shaderSection.cpp
index a58b08660b..db237d83c8 100644
--- a/pxr/imaging/hgi/shaderSection.cpp
+++ b/pxr/imaging/hgi/shaderSection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "shaderSection.h"
diff --git a/pxr/imaging/hgi/shaderSection.h b/pxr/imaging/hgi/shaderSection.h
index 39b73773f0..9f0849b3a7 100644
--- a/pxr/imaging/hgi/shaderSection.h
+++ b/pxr/imaging/hgi/shaderSection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGI_SHADERSECTION_H
diff --git a/pxr/imaging/hgi/testenv/testHgiCommand.cpp b/pxr/imaging/hgi/testenv/testHgiCommand.cpp
index b786ceec60..2d250d44be 100644
--- a/pxr/imaging/hgi/testenv/testHgiCommand.cpp
+++ b/pxr/imaging/hgi/testenv/testHgiCommand.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgi/unitTestHelper.h"
diff --git a/pxr/imaging/hgi/texture.cpp b/pxr/imaging/hgi/texture.cpp
index 25fd331bd7..353098a4d7 100644
--- a/pxr/imaging/hgi/texture.cpp
+++ b/pxr/imaging/hgi/texture.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/texture.h"
 
diff --git a/pxr/imaging/hgi/texture.h b/pxr/imaging/hgi/texture.h
index 883b16b18a..2f89be72fb 100644
--- a/pxr/imaging/hgi/texture.h
+++ b/pxr/imaging/hgi/texture.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_TEXTURE_H
 #define PXR_IMAGING_HGI_TEXTURE_H
diff --git a/pxr/imaging/hgi/tokens.cpp b/pxr/imaging/hgi/tokens.cpp
index a720863b27..2ddabb60d2 100644
--- a/pxr/imaging/hgi/tokens.cpp
+++ b/pxr/imaging/hgi/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/tokens.h"
 
diff --git a/pxr/imaging/hgi/tokens.h b/pxr/imaging/hgi/tokens.h
index 7ad5cf0e70..ce1c4ad4ae 100644
--- a/pxr/imaging/hgi/tokens.h
+++ b/pxr/imaging/hgi/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_TOKENS_H
 #define PXR_IMAGING_HGI_TOKENS_H
diff --git a/pxr/imaging/hgi/types.cpp b/pxr/imaging/hgi/types.cpp
index 3a461fe92f..e081f016c9 100644
--- a/pxr/imaging/hgi/types.cpp
+++ b/pxr/imaging/hgi/types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hgi/types.h"
diff --git a/pxr/imaging/hgi/types.h b/pxr/imaging/hgi/types.h
index be229d81e5..2074c0ef0e 100644
--- a/pxr/imaging/hgi/types.h
+++ b/pxr/imaging/hgi/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_TYPES_H
 #define PXR_IMAGING_HGI_TYPES_H
diff --git a/pxr/imaging/hgi/unitTestHelper.cpp b/pxr/imaging/hgi/unitTestHelper.cpp
index 95019d884b..fb4c08c264 100644
--- a/pxr/imaging/hgi/unitTestHelper.cpp
+++ b/pxr/imaging/hgi/unitTestHelper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/unitTestHelper.h"
 #include "pxr/imaging/hgi/blitCmds.h"
diff --git a/pxr/imaging/hgi/unitTestHelper.h b/pxr/imaging/hgi/unitTestHelper.h
index 487094a84c..b5563097fe 100644
--- a/pxr/imaging/hgi/unitTestHelper.h
+++ b/pxr/imaging/hgi/unitTestHelper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_UNIT_TEST_HELPER_H
 #define PXR_IMAGING_HGI_UNIT_TEST_HELPER_H
diff --git a/pxr/imaging/hgiGL/CMakeLists.txt b/pxr/imaging/hgiGL/CMakeLists.txt
index 9794a6aeb1..2a06b7a949 100644
--- a/pxr/imaging/hgiGL/CMakeLists.txt
+++ b/pxr/imaging/hgiGL/CMakeLists.txt
@@ -64,6 +64,36 @@ if (WIN32)
     return()
 endif()
 
+pxr_build_test(testHgiGL
+    LIBRARIES
+        hgiGL
+        hgi
+        hio
+        tf
+        gf
+        garch
+    CPPFILES
+        testenv/testHgiGL.cpp
+)
+pxr_install_test_dir(
+    SRC testenv/testHgiGL
+    DEST testHgiGL
+)
+pxr_register_test(testHgiGL
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHgiGL"
+    DIFF_COMPARE
+        graphicsCmdsDescCache.txt
+    IMAGE_DIFF_COMPARE
+        graphicsCmdsClear.png
+        srgba.png
+        copyTextureToBuffer.png
+        copyBufferToTexture.png
+    FAIL 1
+    FAIL_PERCENT 0.001
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+)
+
 # This test is not currently supported on static builds as it relies on 
 # testHgiCommand, which is not linked in the static hgiGL library. 
 if (BUILD_SHARED_LIBS)
diff --git a/pxr/imaging/hgiGL/api.h b/pxr/imaging/hgiGL/api.h
index e7363021cc..c317c8ab2a 100644
--- a/pxr/imaging/hgiGL/api.h
+++ b/pxr/imaging/hgiGL/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_API_H
 #define PXR_IMAGING_HGI_GL_API_H
diff --git a/pxr/imaging/hgiGL/blitCmds.cpp b/pxr/imaging/hgiGL/blitCmds.cpp
index ce62f41a51..46b2aa0fd1 100644
--- a/pxr/imaging/hgiGL/blitCmds.cpp
+++ b/pxr/imaging/hgiGL/blitCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/blitCmds.h b/pxr/imaging/hgiGL/blitCmds.h
index 16ab4cef2a..da1dd7ca1d 100644
--- a/pxr/imaging/hgiGL/blitCmds.h
+++ b/pxr/imaging/hgiGL/blitCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_BLIT_CMDS_H
 #define PXR_IMAGING_HGI_GL_BLIT_CMDS_H
diff --git a/pxr/imaging/hgiGL/buffer.cpp b/pxr/imaging/hgiGL/buffer.cpp
index 23228a488d..cfd0d0ebbd 100644
--- a/pxr/imaging/hgiGL/buffer.cpp
+++ b/pxr/imaging/hgiGL/buffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/buffer.h b/pxr/imaging/hgiGL/buffer.h
index 2b3532366c..3e7d669d63 100644
--- a/pxr/imaging/hgiGL/buffer.h
+++ b/pxr/imaging/hgiGL/buffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_BUFFER_H
 #define PXR_IMAGING_HGI_GL_BUFFER_H
diff --git a/pxr/imaging/hgiGL/capabilities.cpp b/pxr/imaging/hgiGL/capabilities.cpp
index 920f9cdff4..4dc54436f6 100644
--- a/pxr/imaging/hgiGL/capabilities.cpp
+++ b/pxr/imaging/hgiGL/capabilities.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under thApache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiGL/capabilities.h"
 
diff --git a/pxr/imaging/hgiGL/capabilities.h b/pxr/imaging/hgiGL/capabilities.h
index 3c8f026426..2ba137e95d 100644
--- a/pxr/imaging/hgiGL/capabilities.h
+++ b/pxr/imaging/hgiGL/capabilities.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_CAPABILITIES_H
 #define PXR_IMAGING_HGI_GL_CAPABILITIES_H
diff --git a/pxr/imaging/hgiGL/computeCmds.cpp b/pxr/imaging/hgiGL/computeCmds.cpp
index 910a27a2db..7a40e6e667 100644
--- a/pxr/imaging/hgiGL/computeCmds.cpp
+++ b/pxr/imaging/hgiGL/computeCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/computeCmds.h b/pxr/imaging/hgiGL/computeCmds.h
index 4147621010..4fa4bf834c 100644
--- a/pxr/imaging/hgiGL/computeCmds.h
+++ b/pxr/imaging/hgiGL/computeCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_COMPUTE_CMDS_H
 #define PXR_IMAGING_HGI_GL_COMPUTE_CMDS_H
diff --git a/pxr/imaging/hgiGL/computePipeline.cpp b/pxr/imaging/hgiGL/computePipeline.cpp
index b91f12b770..9eccc44f0b 100644
--- a/pxr/imaging/hgiGL/computePipeline.cpp
+++ b/pxr/imaging/hgiGL/computePipeline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 
diff --git a/pxr/imaging/hgiGL/computePipeline.h b/pxr/imaging/hgiGL/computePipeline.h
index d7c4e9eddb..1618cbe1ef 100644
--- a/pxr/imaging/hgiGL/computePipeline.h
+++ b/pxr/imaging/hgiGL/computePipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_COMPUTE_PIPELINE_H
 #define PXR_IMAGING_HGIGL_COMPUTE_PIPELINE_H
diff --git a/pxr/imaging/hgiGL/contextArena.cpp b/pxr/imaging/hgiGL/contextArena.cpp
index 8def8eacf6..da033a9aaf 100644
--- a/pxr/imaging/hgiGL/contextArena.cpp
+++ b/pxr/imaging/hgiGL/contextArena.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/contextArena.h b/pxr/imaging/hgiGL/contextArena.h
index 9d00745ad2..b847189718 100644
--- a/pxr/imaging/hgiGL/contextArena.h
+++ b/pxr/imaging/hgiGL/contextArena.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_CONTEXT_ARENA_H
 #define PXR_IMAGING_HGIGL_CONTEXT_ARENA_H
diff --git a/pxr/imaging/hgiGL/conversions.cpp b/pxr/imaging/hgiGL/conversions.cpp
index eff624a663..0df5c32447 100644
--- a/pxr/imaging/hgiGL/conversions.cpp
+++ b/pxr/imaging/hgiGL/conversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/conversions.h b/pxr/imaging/hgiGL/conversions.h
index 2c794d2c6c..406bcc7b40 100644
--- a/pxr/imaging/hgiGL/conversions.h
+++ b/pxr/imaging/hgiGL/conversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_CONVERSIONS_H
 #define PXR_IMAGING_HGI_GL_CONVERSIONS_H
diff --git a/pxr/imaging/hgiGL/debugCodes.cpp b/pxr/imaging/hgiGL/debugCodes.cpp
index c01a131d24..b6174b1d7d 100644
--- a/pxr/imaging/hgiGL/debugCodes.cpp
+++ b/pxr/imaging/hgiGL/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file debugCodes.cpp
 
diff --git a/pxr/imaging/hgiGL/debugCodes.h b/pxr/imaging/hgiGL/debugCodes.h
index f1e5b74fbf..b33d13f31f 100644
--- a/pxr/imaging/hgiGL/debugCodes.h
+++ b/pxr/imaging/hgiGL/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_DEBUG_CODES_H
 #define PXR_IMAGING_HGI_GL_DEBUG_CODES_H
diff --git a/pxr/imaging/hgiGL/device.cpp b/pxr/imaging/hgiGL/device.cpp
index 639953f86f..b1c9f7f3a8 100644
--- a/pxr/imaging/hgiGL/device.cpp
+++ b/pxr/imaging/hgiGL/device.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/envSetting.h"
diff --git a/pxr/imaging/hgiGL/device.h b/pxr/imaging/hgiGL/device.h
index a9429c8047..7cc9306427 100644
--- a/pxr/imaging/hgiGL/device.h
+++ b/pxr/imaging/hgiGL/device.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_DEVICE_H
 #define PXR_IMAGING_HGIGL_DEVICE_H
diff --git a/pxr/imaging/hgiGL/diagnostic.cpp b/pxr/imaging/hgiGL/diagnostic.cpp
index caab8d6a9e..c6200e38ee 100644
--- a/pxr/imaging/hgiGL/diagnostic.cpp
+++ b/pxr/imaging/hgiGL/diagnostic.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Diagnostic.cpp
 //
diff --git a/pxr/imaging/hgiGL/diagnostic.h b/pxr/imaging/hgiGL/diagnostic.h
index 23ab1c568d..746a9006b6 100644
--- a/pxr/imaging/hgiGL/diagnostic.h
+++ b/pxr/imaging/hgiGL/diagnostic.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_DIAGNOSTIC_H
 #define PXR_IMAGING_HGI_GL_DIAGNOSTIC_H
diff --git a/pxr/imaging/hgiGL/garbageCollector.cpp b/pxr/imaging/hgiGL/garbageCollector.cpp
index b90fd23f36..5451e887fc 100644
--- a/pxr/imaging/hgiGL/garbageCollector.cpp
+++ b/pxr/imaging/hgiGL/garbageCollector.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiGL/garbageCollector.h"
 #include "pxr/imaging/hgiGL/hgi.h"
diff --git a/pxr/imaging/hgiGL/garbageCollector.h b/pxr/imaging/hgiGL/garbageCollector.h
index 8bda104fae..2afecc142d 100644
--- a/pxr/imaging/hgiGL/garbageCollector.h
+++ b/pxr/imaging/hgiGL/garbageCollector.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_GARBAGE_COLLECTOR_H
 #define PXR_IMAGING_HGI_GL_GARBAGE_COLLECTOR_H
diff --git a/pxr/imaging/hgiGL/graphicsCmds.cpp b/pxr/imaging/hgiGL/graphicsCmds.cpp
index 5e174165d7..c22f2d75e7 100644
--- a/pxr/imaging/hgiGL/graphicsCmds.cpp
+++ b/pxr/imaging/hgiGL/graphicsCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/graphicsCmds.h b/pxr/imaging/hgiGL/graphicsCmds.h
index 395e3347de..b929617702 100644
--- a/pxr/imaging/hgiGL/graphicsCmds.h
+++ b/pxr/imaging/hgiGL/graphicsCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_GRAPHICS_CMDS_H
 #define PXR_IMAGING_HGI_GL_GRAPHICS_CMDS_H
diff --git a/pxr/imaging/hgiGL/graphicsPipeline.cpp b/pxr/imaging/hgiGL/graphicsPipeline.cpp
index 6983dd11e9..9b0f928c18 100644
--- a/pxr/imaging/hgiGL/graphicsPipeline.cpp
+++ b/pxr/imaging/hgiGL/graphicsPipeline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 
diff --git a/pxr/imaging/hgiGL/graphicsPipeline.h b/pxr/imaging/hgiGL/graphicsPipeline.h
index 8e2fe1c27d..a8b9de87b1 100644
--- a/pxr/imaging/hgiGL/graphicsPipeline.h
+++ b/pxr/imaging/hgiGL/graphicsPipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_PIPELINE_H
 #define PXR_IMAGING_HGIGL_PIPELINE_H
diff --git a/pxr/imaging/hgiGL/hgi.cpp b/pxr/imaging/hgiGL/hgi.cpp
index b948ca7a96..f36e3c0253 100644
--- a/pxr/imaging/hgiGL/hgi.cpp
+++ b/pxr/imaging/hgiGL/hgi.cpp
@@ -1,28 +1,12 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
+#include "pxr/imaging/hgi/debugCodes.h"
 #include "pxr/imaging/hgi/handle.h"
 #include "pxr/imaging/hgiGL/hgi.h"
 #include "pxr/imaging/hgiGL/blitCmds.h"
@@ -91,7 +75,13 @@ bool
 HgiGL::IsBackendSupported() const
 {
     // Want OpenGL 4.5 or higher.
-    return GetCapabilities()->GetAPIVersion() >= 450;
+    bool support = GetCapabilities()->GetAPIVersion() >= 450;
+    if (!support) {
+        TF_DEBUG(HGI_DEBUG_IS_SUPPORTED).Msg(
+            "HgiGL unsupported due to GL API version: %d (must be >= 450)\n",
+            GetCapabilities()->GetAPIVersion());
+    }
+    return support;
 }
 
 HgiGLDevice*
diff --git a/pxr/imaging/hgiGL/hgi.h b/pxr/imaging/hgiGL/hgi.h
index 145339c263..14da753e50 100644
--- a/pxr/imaging/hgiGL/hgi.h
+++ b/pxr/imaging/hgiGL/hgi.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_HGI_H
 #define PXR_IMAGING_HGI_GL_HGI_H
diff --git a/pxr/imaging/hgiGL/ops.cpp b/pxr/imaging/hgiGL/ops.cpp
index c48240050e..a0473c4797 100644
--- a/pxr/imaging/hgiGL/ops.cpp
+++ b/pxr/imaging/hgiGL/ops.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/ops.h b/pxr/imaging/hgiGL/ops.h
index 0aec68acee..029951fc0d 100644
--- a/pxr/imaging/hgiGL/ops.h
+++ b/pxr/imaging/hgiGL/ops.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_OPS_H
 #define PXR_IMAGING_HGIGL_OPS_H
diff --git a/pxr/imaging/hgiGL/pch.h b/pxr/imaging/hgiGL/pch.h
index 46881e229b..11e502a3cd 100644
--- a/pxr/imaging/hgiGL/pch.h
+++ b/pxr/imaging/hgiGL/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,11 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
+#include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -52,9 +36,13 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <deque>
+#include <fstream>
 #include <functional>
+#include <inttypes.h>
 #include <iosfwd>
+#include <iostream>
 #include <iterator>
 #include <limits>
 #include <list>
@@ -64,11 +52,15 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string>
 #include <sys/types.h>
 #include <type_traits>
@@ -78,43 +70,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/spin_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hgiGL/resourceBindings.cpp b/pxr/imaging/hgiGL/resourceBindings.cpp
index d008b9c054..9dc7f42d45 100644
--- a/pxr/imaging/hgiGL/resourceBindings.cpp
+++ b/pxr/imaging/hgiGL/resourceBindings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiGL/buffer.h"
 #include "pxr/imaging/hgiGL/conversions.h"
diff --git a/pxr/imaging/hgiGL/resourceBindings.h b/pxr/imaging/hgiGL/resourceBindings.h
index 429b143c9b..33ea0b9f7b 100644
--- a/pxr/imaging/hgiGL/resourceBindings.h
+++ b/pxr/imaging/hgiGL/resourceBindings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_RESOURCEBINDINGS_H
 #define PXR_IMAGING_HGIGL_RESOURCEBINDINGS_H
diff --git a/pxr/imaging/hgiGL/sampler.cpp b/pxr/imaging/hgiGL/sampler.cpp
index 53569109c6..555cf800bc 100644
--- a/pxr/imaging/hgiGL/sampler.cpp
+++ b/pxr/imaging/hgiGL/sampler.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/sampler.h b/pxr/imaging/hgiGL/sampler.h
index fd0abaa515..725fe3ae88 100644
--- a/pxr/imaging/hgiGL/sampler.h
+++ b/pxr/imaging/hgiGL/sampler.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_SAMPLER_H
 #define PXR_IMAGING_HGIGL_SAMPLER_H
diff --git a/pxr/imaging/hgiGL/scopedStateHolder.cpp b/pxr/imaging/hgiGL/scopedStateHolder.cpp
index 89cd0ac224..46a9521102 100644
--- a/pxr/imaging/hgiGL/scopedStateHolder.cpp
+++ b/pxr/imaging/hgiGL/scopedStateHolder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/scopedStateHolder.h b/pxr/imaging/hgiGL/scopedStateHolder.h
index d006480b9b..e97fa6d54e 100644
--- a/pxr/imaging/hgiGL/scopedStateHolder.h
+++ b/pxr/imaging/hgiGL/scopedStateHolder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_STATE_H
 #define PXR_IMAGING_HGIGL_STATE_H
diff --git a/pxr/imaging/hgiGL/shaderFunction.cpp b/pxr/imaging/hgiGL/shaderFunction.cpp
index f0797acdf3..9914b63bb4 100644
--- a/pxr/imaging/hgiGL/shaderFunction.cpp
+++ b/pxr/imaging/hgiGL/shaderFunction.cpp
@@ -1,28 +1,11 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
-#include <pxr/base/tf/stringUtils.h>
+#include "pxr/base/tf/stringUtils.h"
 
 #include "pxr/imaging/hgiGL/conversions.h"
 #include "pxr/imaging/hgiGL/diagnostic.h"
diff --git a/pxr/imaging/hgiGL/shaderFunction.h b/pxr/imaging/hgiGL/shaderFunction.h
index 8f904acdab..85f0800174 100644
--- a/pxr/imaging/hgiGL/shaderFunction.h
+++ b/pxr/imaging/hgiGL/shaderFunction.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_SHADERFUNCTION_H
 #define PXR_IMAGING_HGIGL_SHADERFUNCTION_H
diff --git a/pxr/imaging/hgiGL/shaderGenerator.cpp b/pxr/imaging/hgiGL/shaderGenerator.cpp
index 0afa73deb4..6d9e10b4c2 100644
--- a/pxr/imaging/hgiGL/shaderGenerator.cpp
+++ b/pxr/imaging/hgiGL/shaderGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/shaderGenerator.h b/pxr/imaging/hgiGL/shaderGenerator.h
index 4e48736dbf..328d4b3fae 100644
--- a/pxr/imaging/hgiGL/shaderGenerator.h
+++ b/pxr/imaging/hgiGL/shaderGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGIGL_SHADERGENERATOR_H
diff --git a/pxr/imaging/hgiGL/shaderProgram.cpp b/pxr/imaging/hgiGL/shaderProgram.cpp
index 098215092c..5e37dcb8ec 100644
--- a/pxr/imaging/hgiGL/shaderProgram.cpp
+++ b/pxr/imaging/hgiGL/shaderProgram.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiGL/shaderProgram.h b/pxr/imaging/hgiGL/shaderProgram.h
index cd279292da..bc182b4f1f 100644
--- a/pxr/imaging/hgiGL/shaderProgram.h
+++ b/pxr/imaging/hgiGL/shaderProgram.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIGL_SHADERPROGRAM_H
 #define PXR_IMAGING_HGIGL_SHADERPROGRAM_H
diff --git a/pxr/imaging/hgiGL/shaderSection.cpp b/pxr/imaging/hgiGL/shaderSection.cpp
index e51f685762..b72e19e021 100644
--- a/pxr/imaging/hgiGL/shaderSection.cpp
+++ b/pxr/imaging/hgiGL/shaderSection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgiGL/shaderSection.h"
diff --git a/pxr/imaging/hgiGL/shaderSection.h b/pxr/imaging/hgiGL/shaderSection.h
index 261b441b1e..cf326f55a2 100644
--- a/pxr/imaging/hgiGL/shaderSection.h
+++ b/pxr/imaging/hgiGL/shaderSection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGIGL_SHADERSECTION_H
diff --git a/pxr/imaging/hgiGL/testenv/testHgiGL.cpp b/pxr/imaging/hgiGL/testenv/testHgiGL.cpp
new file mode 100644
index 0000000000..ed59ecbb36
--- /dev/null
+++ b/pxr/imaging/hgiGL/testenv/testHgiGL.cpp
@@ -0,0 +1,625 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/imaging/garch/glApi.h"
+#include "pxr/imaging/garch/glDebugWindow.h"
+#include "pxr/imaging/hgi/blitCmds.h"
+#include "pxr/imaging/hgi/blitCmdsOps.h"
+#include "pxr/imaging/hgi/graphicsCmds.h"
+#include "pxr/imaging/hgi/graphicsCmdsDesc.h"
+#include "pxr/imaging/hgiGL/hgi.h"
+#include "pxr/imaging/hgiGL/conversions.h"
+#include "pxr/imaging/hgiGL/device.h"
+#include "pxr/imaging/hio/image.h"
+#include "pxr/base/tf/errorMark.h"
+#include <cstdlib>
+#include <iostream>
+#include <fstream>
+#include <string>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+static const int _imgSize = 512;
+static const HgiFormat _imgFormat = HgiFormatUNorm8Vec4;
+static const HioFormat _imgHioFormat = HioFormatUNorm8Vec4;
+
+static void
+_SaveToPNG(
+    int width,
+    int height,
+    const char* pixels,
+    const std::string& filePath)
+{
+    HioImage::StorageSpec storage;
+    storage.width = width;
+    storage.height = height;
+    storage.format = _imgHioFormat;
+    storage.flipped = false;
+    storage.data = (void*)pixels;
+
+    HioImageSharedPtr image = HioImage::OpenForWriting(filePath);
+    TF_VERIFY(image && image->Write(storage));
+}
+
+static void
+_SaveGpuTextureToFile(
+    HgiGL& hgiGL,
+    HgiTextureHandle const& texHandle,
+    int width,
+    int height,
+    HgiFormat format,
+    std::string const& filePath)
+{
+    // Copy the pixels from gpu into a cpu buffer so we can save it to disk.
+    const size_t bufferByteSize =
+        width * height * HgiGetDataSizeOfFormat(format);
+    std::vector<char> buffer(bufferByteSize);
+
+    HgiTextureGpuToCpuOp copyOp;
+    copyOp.gpuSourceTexture = texHandle;
+    copyOp.sourceTexelOffset = GfVec3i(0);
+    copyOp.mipLevel = 0;
+    copyOp.cpuDestinationBuffer = buffer.data();
+    copyOp.destinationByteOffset = 0;
+    copyOp.destinationBufferByteSize = bufferByteSize;
+
+    HgiBlitCmdsUniquePtr blitCmds = hgiGL.CreateBlitCmds();
+    blitCmds->CopyTextureGpuToCpu(copyOp);
+    hgiGL.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    _SaveToPNG(width, height, buffer.data(), filePath);
+}
+
+static void
+_SaveGpuBufferToFile(
+    HgiGL& hgiGL,
+    HgiBufferHandle const& bufHandle,
+    int width,
+    int height,
+    HgiFormat format,
+    std::string const& filePath)
+{
+    // Copy the pixels from gpu into a cpu buffer so we can save it to disk.
+    const size_t bufferByteSize =
+        width * height * HgiGetDataSizeOfFormat(format);
+    std::vector<char> buffer(bufferByteSize);
+
+    HgiBufferGpuToCpuOp copyOp;
+    copyOp.gpuSourceBuffer = bufHandle;
+    copyOp.sourceByteOffset = 0;
+    copyOp.byteSize = bufferByteSize;
+    copyOp.cpuDestinationBuffer = buffer.data();
+    copyOp.destinationByteOffset = 0;    
+
+    HgiBlitCmdsUniquePtr blitCmds = hgiGL.CreateBlitCmds();
+    blitCmds->CopyBufferGpuToCpu(copyOp);
+    hgiGL.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    _SaveToPNG(width, height, buffer.data(), filePath);
+}
+
+static HgiTextureHandle
+_CreateTexture(
+    HgiGL& hgiGL,
+    int width, 
+    int height,
+    HgiFormat format,
+    void *data)
+{
+    const size_t textureByteSize =
+        width * height * HgiGetDataSizeOfFormat(format);
+
+    HgiTextureDesc texDesc;
+    texDesc.debugName = "Debug texture";
+    texDesc.dimensions = GfVec3i(width, height, 1);
+    texDesc.format = format;
+    texDesc.initialData = data;
+    texDesc.layerCount = 1;
+    texDesc.mipLevels = 1;
+    texDesc.pixelsByteSize = textureByteSize;
+    texDesc.sampleCount = HgiSampleCount1;
+    texDesc.usage = HgiTextureUsageBitsShaderRead;
+
+    return hgiGL.CreateTexture(texDesc);
+}
+
+static HgiBufferHandle
+_CreateBuffer(
+    HgiGL& hgiGL,
+    size_t byteSize,
+    void *data)
+{
+    HgiBufferDesc bufDesc;
+    bufDesc.usage = HgiBufferUsageUniform;
+    bufDesc.byteSize = byteSize;
+    bufDesc.initialData = data;   
+
+    return hgiGL.CreateBuffer(bufDesc);
+}
+
+static HgiGraphicsCmdsDesc
+_CreateGraphicsCmdsColor0Color1Depth(
+    HgiGL& hgiGL,
+    GfVec3i const& size,
+    HgiFormat colorFormat)
+{
+    // Create two color attachments
+    HgiTextureDesc texDesc;
+    texDesc.dimensions = size;
+    texDesc.type = HgiTextureType2D;
+    texDesc.format = colorFormat;
+    texDesc.sampleCount = HgiSampleCount1;
+    texDesc.usage = HgiTextureUsageBitsColorTarget;
+    HgiTextureHandle colorTex0 = hgiGL.CreateTexture(texDesc);
+    HgiTextureHandle colorTex1 = hgiGL.CreateTexture(texDesc);
+
+    // Create a depth attachment
+    texDesc.usage = HgiTextureUsageBitsDepthTarget;
+    texDesc.format = HgiFormatFloat32;
+    HgiTextureHandle depthTex = hgiGL.CreateTexture(texDesc);
+
+    // Setup color and depth attachments
+    HgiAttachmentDesc colorAttachment0;
+    colorAttachment0.loadOp = HgiAttachmentLoadOpClear;
+    colorAttachment0.storeOp = HgiAttachmentStoreOpStore;
+    colorAttachment0.format = colorFormat;
+    colorAttachment0.usage = HgiTextureUsageBitsColorTarget;
+
+    HgiAttachmentDesc colorAttachment1;
+    colorAttachment1.loadOp = HgiAttachmentLoadOpClear;
+    colorAttachment1.storeOp = HgiAttachmentStoreOpStore;
+    colorAttachment1.format = colorFormat;
+    colorAttachment1.usage = HgiTextureUsageBitsColorTarget;
+
+    HgiAttachmentDesc depthAttachment;
+    depthAttachment.format = HgiFormatFloat32;
+    depthAttachment.usage = HgiTextureUsageBitsDepthTarget;
+
+    // Configure graphics cmds
+    HgiGraphicsCmdsDesc desc;
+    desc.colorAttachmentDescs.push_back(colorAttachment0);
+    desc.colorAttachmentDescs.push_back(colorAttachment1);
+    desc.depthAttachmentDesc = depthAttachment;
+    desc.colorTextures.push_back(colorTex0);
+    desc.colorTextures.push_back(colorTex1);
+    desc.depthTexture = depthTex;
+
+    return desc;
+}
+
+static void
+_LogCaseHeader(std::ofstream &out, std::string const &msg)
+{
+    out << msg << std::endl;
+    out << std::string(msg.length(), '-') << std::endl;
+}
+
+static void
+_LogCaseFooter(std::ofstream &out)
+{
+    out << std::endl << std::endl;
+}
+
+static bool
+TestContextArenaAndFramebufferCache()
+{
+    HgiGL hgiGL;
+    const std::string path = "graphicsCmdsDescCache.txt";
+    std::ofstream out(path);
+
+    // The framebuffer descriptor cache caches framebuffers with their 
+    // attachments based on the graphics cmds descriptor.
+    // This is a perf optimization because creating framebuffer objects or
+    // setting attachments on an existing framebuffer can be expensive when
+    // done frequently.
+    //
+    // The cache is tied to the active context arena.
+    // The expected behavior of the cache is that is keeps a small list of
+    // cached framebuffers by garbage collecting invalid framebuffers
+    // frequently. This is done either in HgiGL::EndFrame (when paired with
+    // StartFrame) or after graphics command submission.
+    //
+    HgiGLDevice const& device = *hgiGL.GetPrimaryDevice();
+
+    // 1. By creating 42 "active" framebuffers of different sizes, we will
+    // end up with 42 entries at the end of the below loop.
+    // Note that each entry isn't immediately garbage collected because the
+    // underlying texture attachments aren't destroyed.
+    const size_t count = 42;
+    const size_t numTextureAttachments = 3;
+    HgiTextureHandleVector textures;
+    textures.reserve(count * numTextureAttachments);
+    {
+        for (size_t i = 0; i<count; i++) {
+            GfVec3i size = GfVec3i(i+1, i+1, 1);
+            HgiGraphicsCmdsDesc desc = 
+                _CreateGraphicsCmdsColor0Color1Depth(hgiGL, size, _imgFormat);
+            HgiGraphicsCmdsUniquePtr cmds= hgiGL.CreateGraphicsCmds(desc);
+
+            // Track the texture handles so we can delete some later.
+            std::copy(desc.colorTextures.begin(), desc.colorTextures.end(),
+                      std::back_inserter(textures));
+            textures.push_back(desc.depthTexture);
+
+            hgiGL.SubmitCmds(cmds.get());
+        }
+        _LogCaseHeader(out, "Case 1: Add 42 framebuffer entries");
+        out << device;
+        _LogCaseFooter(out);
+    }
+
+    // 2. The second feature of the cache is that it should only maintain valid
+    // entries after garbage collection is triggered. Any framebuffers with
+    // texture attachment(s) that have been deleted must be GC'd.
+    {
+        TF_VERIFY(textures.size() == count * 3); // 2 color, 1 depth
+        hgiGL.StartFrame();
+        for (size_t i = 0; i < count; i+=2) {
+            // Delete (some) attachments for every other framebuffer.
+            const size_t numTexturesToDelete = size_t(rand() % 2) + 1;
+            for (size_t j = 0; j < numTexturesToDelete; j++) {
+                hgiGL.DestroyTexture(&textures[i*3 + j]);
+            }
+        }
+        hgiGL.EndFrame();
+
+        _LogCaseHeader(out, "Case 2: Delete every other framebuffer's textures");
+        out << device;
+        _LogCaseFooter(out);
+    }
+
+    // 3. Setting a custom context arena 
+    // This should cause any framebuffer allocations to happen in the arena that
+    // was set (and not the defaul arena).
+    HgiGLContextArenaHandle arena = hgiGL.CreateContextArena();
+    {
+        hgiGL.SetContextArena(arena);
+        
+        const size_t count = 10;
+        HgiTextureHandleVector arenaTextures;
+        arenaTextures.reserve(count * numTextureAttachments);
+        for (size_t i = 0; i < count; i++) {
+            GfVec3i size = GfVec3i(i+1, i+1, 1);
+            HgiGraphicsCmdsDesc desc = 
+                _CreateGraphicsCmdsColor0Color1Depth(hgiGL, size, _imgFormat);
+            HgiGraphicsCmdsUniquePtr cmds= hgiGL.CreateGraphicsCmds(desc);
+
+            std::copy(desc.colorTextures.begin(), desc.colorTextures.end(),
+                      std::back_inserter(arenaTextures));
+            arenaTextures.push_back(desc.depthTexture);
+
+            hgiGL.SubmitCmds(cmds.get());
+        }
+        
+        _LogCaseHeader(out,
+            "Case 3: Set custom context arena and add 10 framebuffer entries");
+        out << device;
+        _LogCaseFooter(out);
+    }
+
+    // 4. Switch to default arena
+    // We should see the same output as in case 2.
+    {
+        hgiGL.SetContextArena(HgiGLContextArenaHandle());
+        _LogCaseHeader(out, "Case 4: Switch back to default arena");
+        out << device;
+        _LogCaseFooter(out);
+    }
+
+    // 5. Destroy custom arena
+    // Framebuffers created in step 3 will be deleted during the
+    // context arena d'tor. We won't be able to log the arena once it is
+    // destroyed, and use an error mark to ensure framebuffer objects are
+    // successfully deleted. Note that the texture resources haven't been
+    // destroyed at this point.
+    // Note that the env var HGIGL_CONTEXT_ARENA_REPORT_ERRORS is enabled.
+    {
+        TfErrorMark mark;
+        hgiGL.DestroyContextArena(&arena);
+        _LogCaseHeader(out, "Case 5: Destroy custom context arena");
+        if (mark.IsClean()) {
+            out << "SUCCESS" << std::endl;
+        } else {
+            out << "FAILURE" << std::endl;
+        }
+        _LogCaseFooter(out);
+    }
+
+    // 6. Similar to 5; On destruction of the HgiGL instance once it goes out of
+    // scope, the default arena's framebuffers will be deleted.
+    // Again, this happens regardless of whether the texture attachments
+    // were destroyed.
+    // If this wasn't successful, the error mark in main() would flag it.
+
+    out.close();
+
+    return true;
+}
+
+static bool
+TestGraphicsCmdsClear()
+{
+    HgiGL hgiGL;
+
+    const size_t width = _imgSize;
+    const size_t height = _imgSize;
+    const HgiFormat format = _imgFormat;
+
+    // Create a default cmds description and set the clearValue for the
+    // first attachment to something other than black.
+    // Setting 'loadOp' tp 'Clear' is important for this test since we expect
+    // the attachment to be cleared when the graphics cmds is created.
+    HgiGraphicsCmdsDesc desc =_CreateGraphicsCmdsColor0Color1Depth(
+        hgiGL, GfVec3i(width, height, 1), format);
+    desc.colorAttachmentDescs[0].loadOp = HgiAttachmentLoadOpClear;
+    desc.colorAttachmentDescs[0].storeOp = HgiAttachmentStoreOpStore;
+    desc.colorAttachmentDescs[0].clearValue = GfVec4f(1, 0, 0.5, 1);
+
+    // We expect attachment0 to be cleared when the cmds is created via
+    // the loadOp property in desc.
+    HgiGraphicsCmdsUniquePtr gfxCmds = hgiGL.CreateGraphicsCmds(desc);
+    hgiGL.SubmitCmds(gfxCmds.get());
+
+    // Save attachment0 to disk
+    _SaveGpuTextureToFile(
+        hgiGL, 
+        desc.colorTextures[0], 
+        width, 
+        height, 
+        format, 
+        "graphicsCmdsClear.png");
+
+    // Cleanup
+    for (HgiTextureHandle& tex : desc.colorTextures) {
+        hgiGL.DestroyTexture(&tex);
+    }
+    if (desc.depthTexture) {
+        hgiGL.DestroyTexture(&desc.depthTexture);
+    }
+
+    return true;
+}
+
+bool
+TestCreateSrgbaTexture()
+{
+    HgiGL hgiGL;
+
+    const size_t width = 128;
+    const size_t height = 128;
+    const HgiFormat format = HgiFormatUNorm8Vec4srgb;
+
+    const size_t dataByteSize = width * height * HgiGetDataSizeOfFormat(format);
+
+    // Create the texture
+    std::vector<uint8_t> textureData(dataByteSize, 64);
+    HgiTextureHandle tex = _CreateTexture(
+        hgiGL, width, height, format, textureData.data());
+    
+    // Write texture to file
+    static std::string const filePath = "srgba.png";
+    _SaveGpuTextureToFile(hgiGL, tex, width, height, format, filePath); 
+    
+    hgiGL.DestroyTexture(&tex);
+
+    return true;
+}
+
+bool
+TestHgiGetMipInitialData()
+{
+    // Test helper function that is used during mipmap data upload.
+    // (This does not actually upload any data)
+    const HgiFormat format = HgiFormatUNorm8Vec4;
+    const GfVec3i size0(37,53,1);
+    const size_t layerCount = 1;
+
+    const size_t texelByteSize = HgiGetDataSizeOfFormat(format);
+    const size_t firstMipSize = size0[0] * size0[1] * size0[2] * texelByteSize;
+
+    // We expect the second mip to be 1/4 of the bytesize of the first etc.
+    GfVec3i size1 = size0 / 2;
+    size1[2] = 1;
+
+    const size_t secondMipSize = size1[0] * size1[1] * size1[2] * texelByteSize;
+    
+    GfVec3i size2 = size1 / 2;
+    size2[2] = 1;
+
+    const size_t thirdMipSize = size2[0] * size2[1] * size2[2] * texelByteSize;
+
+    // Create some fake mipmap data for all three mips
+    const size_t totalSize = firstMipSize + secondMipSize + thirdMipSize;
+
+    const std::vector<HgiMipInfo> mipInfos = HgiGetMipInfos(
+        format, size0, layerCount, totalSize);
+
+    if (mipInfos.size() != 3) {
+        TF_CODING_ERROR("TestHgiGetMipInfos returned wrong number of infos");
+        return false;
+    }
+
+    // We expect the returned ptr to be at the start of the third mip's data
+    // in the 'mipData' vector. And the returned dimensions and bytesize to
+    // match the third mip.
+    const size_t startOfThirdMip = firstMipSize + secondMipSize;
+
+    if (mipInfos[2].dimensions != size2 ||
+        mipInfos[2].byteSizePerLayer != thirdMipSize ||
+        mipInfos[2].byteOffset != startOfThirdMip) {
+        TF_CODING_ERROR("TestHgiGetMipInitialData incorrect return values");
+        return false;
+    }
+
+    return true;
+}
+
+bool
+TestHgiTextureToBufferCopy()
+{
+    HgiGL hgiGL;
+
+    const int width = 128;
+    const int height = 128;
+    const HgiFormat format = HgiFormatUNorm8Vec4srgb;
+    
+    const size_t dataByteSize = width * height * HgiGetDataSizeOfFormat(format);
+
+    // Create the texture
+    std::vector<uint8_t> textureData(dataByteSize, 16);
+    HgiTextureHandle tex = _CreateTexture(
+        hgiGL, width, height, format, textureData.data());
+
+    // Create the buffer
+    HgiBufferHandle buf = _CreateBuffer(hgiGL, dataByteSize, nullptr);
+    
+    // Copy texture to buffer
+    HgiTextureToBufferOp copyOp;
+    copyOp.gpuSourceTexture = tex;
+    copyOp.gpuDestinationBuffer = buf;
+    copyOp.byteSize = dataByteSize;
+    HgiBlitCmdsUniquePtr blitCmds = hgiGL.CreateBlitCmds();
+    blitCmds->CopyTextureToBuffer(copyOp);
+    hgiGL.SubmitCmds(blitCmds.get());
+
+    static std::string const filePath = "copyTextureToBuffer.png";
+    _SaveGpuBufferToFile(hgiGL, buf, width, height, format, filePath);
+
+    hgiGL.DestroyBuffer(&buf);
+    hgiGL.DestroyTexture(&tex);
+
+    return true;
+}
+
+bool
+TestHgiBufferToTextureCopy()
+{
+    HgiGL hgiGL;
+
+    const int width = 128;
+    const int height = 128;
+    const HgiFormat format = HgiFormatUNorm8Vec4srgb;
+    
+    const size_t dataByteSize = width * height * HgiGetDataSizeOfFormat(format);
+
+    // Create the buffer
+    std::vector<uint8_t> bufferData(dataByteSize, 32);
+    HgiBufferHandle buf = _CreateBuffer(
+        hgiGL, dataByteSize, bufferData.data());
+
+    // Create the texture
+    HgiTextureHandle tex =
+        _CreateTexture(hgiGL, width, height, format, nullptr);
+    
+    // Copy buffer to texture
+    HgiBufferToTextureOp copyOp;
+    copyOp.gpuSourceBuffer = buf;
+    copyOp.gpuDestinationTexture = tex;
+    copyOp.byteSize = dataByteSize;
+    HgiBlitCmdsUniquePtr blitCmds = hgiGL.CreateBlitCmds();
+    blitCmds->CopyBufferToTexture(copyOp);
+    hgiGL.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    static std::string const filePath = "copyBufferToTexture.png";
+    _SaveGpuTextureToFile(hgiGL, tex, width, height, format, filePath);
+
+    hgiGL.DestroyTexture(&tex);
+    hgiGL.DestroyBuffer(&buf);
+
+    return true;
+}
+
+class HgiGLUnitTestWindow : public GarchGLDebugWindow {
+public:
+    HgiGLUnitTestWindow(const char *title, int width, int height)
+    : GarchGLDebugWindow(title, width, height)
+    {}
+
+    ~HgiGLUnitTestWindow() {}
+
+    void OnInitializeGL() override {
+        GarchGLApiLoad();
+    }
+
+    void OnUninitializeGL() override {}
+};
+
+static bool
+TestHgiGL()
+{
+    // Setup OpenGL context
+    HgiGLUnitTestWindow unitTestWindow("hgiGL", _imgSize, _imgSize);
+    unitTestWindow.Init();
+
+    // Run tests
+
+    bool ret = true;
+    std::cout <<  "*** Running test: HgiGL" << std::endl << std::endl;
+
+    // Test descriptor cache
+    ret &= TestContextArenaAndFramebufferCache();
+    if (!ret) {
+        TF_CODING_ERROR("TestContextArenaAndFramebufferCache failed");
+        return false;
+    }
+
+    // Test clearing attachment0 in graphics cmds
+    ret &= TestGraphicsCmdsClear();
+    if (!ret) {
+        TF_CODING_ERROR("TestGraphicsCmdsClear failed");
+        return false;
+    }
+
+    // Test saving a SRGBA texture
+    ret &= TestCreateSrgbaTexture();
+    if (!ret) {
+        TF_CODING_ERROR("TestCreateTexture failed");
+        return false;
+    }
+
+    // Test getting texel data for mips
+    ret &= TestHgiGetMipInitialData();
+    if (!ret) {
+        TF_CODING_ERROR("TestHgiGetMipInitialData failed");
+        return false;
+    }
+
+    // Test copying a GPU texture to a GPU buffer via HgiTextureToBufferOp
+    ret &= TestHgiTextureToBufferCopy();
+    if (!ret) {
+        TF_CODING_ERROR("TestHgiTextureToBufferCopy failed");
+        return false;
+    }
+
+    // Test copying a GPU buffer to a GPU texture via HgiBufferToTextureOp
+    ret &= TestHgiBufferToTextureCopy();
+    if (!ret) {
+        TF_CODING_ERROR("TestHgiBufferToTextureCopy failed");
+        return false;
+    }
+
+    return ret;
+}
+
+int
+main(int argc, char **argv)
+{
+    TfErrorMark mark;
+    bool passed = TestHgiGL();
+
+    if (passed && mark.IsClean()) {
+        std::cout << "HgiGL: Passed" << std::endl;
+        exit(0);
+    } else {
+        for (auto it = mark.begin(); it != mark.end(); it++) {
+            std::cout << it->GetCommentary() << std::endl;
+        }
+        std::cout << "HgiGL: Failed" << std::endl;
+        exit(1);
+    }
+
+}
diff --git a/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/copyBufferToTexture.png b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/copyBufferToTexture.png
new file mode 100644
index 0000000000..97fd6bc884
Binary files /dev/null and b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/copyBufferToTexture.png differ
diff --git a/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/copyTextureToBuffer.png b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/copyTextureToBuffer.png
new file mode 100644
index 0000000000..156ec279d7
Binary files /dev/null and b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/copyTextureToBuffer.png differ
diff --git a/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/graphicsCmdsClear.png b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/graphicsCmdsClear.png
new file mode 100644
index 0000000000..9be97157e6
Binary files /dev/null and b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/graphicsCmdsClear.png differ
diff --git a/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/graphicsCmdsDescCache.txt b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/graphicsCmdsDescCache.txt
new file mode 100644
index 0000000000..8ad43036c9
--- /dev/null
+++ b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/graphicsCmdsDescCache.txt
@@ -0,0 +1,123 @@
+Case 1: Add 42 framebuffer entries
+----------------------------------
+_FramebufferCache: {
+    _FramebufferDesc: {colorTexture0 dimensions:(1, 1, 1), colorTexture1 dimensions:(1, 1, 1), depthFormat 10depthTexture dimensions:(1, 1, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(2, 2, 1), colorTexture1 dimensions:(2, 2, 1), depthFormat 10depthTexture dimensions:(2, 2, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(3, 3, 1), colorTexture1 dimensions:(3, 3, 1), depthFormat 10depthTexture dimensions:(3, 3, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(4, 4, 1), colorTexture1 dimensions:(4, 4, 1), depthFormat 10depthTexture dimensions:(4, 4, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(5, 5, 1), colorTexture1 dimensions:(5, 5, 1), depthFormat 10depthTexture dimensions:(5, 5, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(6, 6, 1), colorTexture1 dimensions:(6, 6, 1), depthFormat 10depthTexture dimensions:(6, 6, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(7, 7, 1), colorTexture1 dimensions:(7, 7, 1), depthFormat 10depthTexture dimensions:(7, 7, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(8, 8, 1), colorTexture1 dimensions:(8, 8, 1), depthFormat 10depthTexture dimensions:(8, 8, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(9, 9, 1), colorTexture1 dimensions:(9, 9, 1), depthFormat 10depthTexture dimensions:(9, 9, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(10, 10, 1), colorTexture1 dimensions:(10, 10, 1), depthFormat 10depthTexture dimensions:(10, 10, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(11, 11, 1), colorTexture1 dimensions:(11, 11, 1), depthFormat 10depthTexture dimensions:(11, 11, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(12, 12, 1), colorTexture1 dimensions:(12, 12, 1), depthFormat 10depthTexture dimensions:(12, 12, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(13, 13, 1), colorTexture1 dimensions:(13, 13, 1), depthFormat 10depthTexture dimensions:(13, 13, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(14, 14, 1), colorTexture1 dimensions:(14, 14, 1), depthFormat 10depthTexture dimensions:(14, 14, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(15, 15, 1), colorTexture1 dimensions:(15, 15, 1), depthFormat 10depthTexture dimensions:(15, 15, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(16, 16, 1), colorTexture1 dimensions:(16, 16, 1), depthFormat 10depthTexture dimensions:(16, 16, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(17, 17, 1), colorTexture1 dimensions:(17, 17, 1), depthFormat 10depthTexture dimensions:(17, 17, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(18, 18, 1), colorTexture1 dimensions:(18, 18, 1), depthFormat 10depthTexture dimensions:(18, 18, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(19, 19, 1), colorTexture1 dimensions:(19, 19, 1), depthFormat 10depthTexture dimensions:(19, 19, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(20, 20, 1), colorTexture1 dimensions:(20, 20, 1), depthFormat 10depthTexture dimensions:(20, 20, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(21, 21, 1), colorTexture1 dimensions:(21, 21, 1), depthFormat 10depthTexture dimensions:(21, 21, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(22, 22, 1), colorTexture1 dimensions:(22, 22, 1), depthFormat 10depthTexture dimensions:(22, 22, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(23, 23, 1), colorTexture1 dimensions:(23, 23, 1), depthFormat 10depthTexture dimensions:(23, 23, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(24, 24, 1), colorTexture1 dimensions:(24, 24, 1), depthFormat 10depthTexture dimensions:(24, 24, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(25, 25, 1), colorTexture1 dimensions:(25, 25, 1), depthFormat 10depthTexture dimensions:(25, 25, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(26, 26, 1), colorTexture1 dimensions:(26, 26, 1), depthFormat 10depthTexture dimensions:(26, 26, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(27, 27, 1), colorTexture1 dimensions:(27, 27, 1), depthFormat 10depthTexture dimensions:(27, 27, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(28, 28, 1), colorTexture1 dimensions:(28, 28, 1), depthFormat 10depthTexture dimensions:(28, 28, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(29, 29, 1), colorTexture1 dimensions:(29, 29, 1), depthFormat 10depthTexture dimensions:(29, 29, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(30, 30, 1), colorTexture1 dimensions:(30, 30, 1), depthFormat 10depthTexture dimensions:(30, 30, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(31, 31, 1), colorTexture1 dimensions:(31, 31, 1), depthFormat 10depthTexture dimensions:(31, 31, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(32, 32, 1), colorTexture1 dimensions:(32, 32, 1), depthFormat 10depthTexture dimensions:(32, 32, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(33, 33, 1), colorTexture1 dimensions:(33, 33, 1), depthFormat 10depthTexture dimensions:(33, 33, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(34, 34, 1), colorTexture1 dimensions:(34, 34, 1), depthFormat 10depthTexture dimensions:(34, 34, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(35, 35, 1), colorTexture1 dimensions:(35, 35, 1), depthFormat 10depthTexture dimensions:(35, 35, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(36, 36, 1), colorTexture1 dimensions:(36, 36, 1), depthFormat 10depthTexture dimensions:(36, 36, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(37, 37, 1), colorTexture1 dimensions:(37, 37, 1), depthFormat 10depthTexture dimensions:(37, 37, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(38, 38, 1), colorTexture1 dimensions:(38, 38, 1), depthFormat 10depthTexture dimensions:(38, 38, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(39, 39, 1), colorTexture1 dimensions:(39, 39, 1), depthFormat 10depthTexture dimensions:(39, 39, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(40, 40, 1), colorTexture1 dimensions:(40, 40, 1), depthFormat 10depthTexture dimensions:(40, 40, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(41, 41, 1), colorTexture1 dimensions:(41, 41, 1), depthFormat 10depthTexture dimensions:(41, 41, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(42, 42, 1), colorTexture1 dimensions:(42, 42, 1), depthFormat 10depthTexture dimensions:(42, 42, 1)}
+}
+
+
+Case 2: Delete every other framebuffer's textures
+-------------------------------------------------
+_FramebufferCache: {
+    _FramebufferDesc: {colorTexture0 dimensions:(2, 2, 1), colorTexture1 dimensions:(2, 2, 1), depthFormat 10depthTexture dimensions:(2, 2, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(4, 4, 1), colorTexture1 dimensions:(4, 4, 1), depthFormat 10depthTexture dimensions:(4, 4, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(6, 6, 1), colorTexture1 dimensions:(6, 6, 1), depthFormat 10depthTexture dimensions:(6, 6, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(8, 8, 1), colorTexture1 dimensions:(8, 8, 1), depthFormat 10depthTexture dimensions:(8, 8, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(10, 10, 1), colorTexture1 dimensions:(10, 10, 1), depthFormat 10depthTexture dimensions:(10, 10, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(12, 12, 1), colorTexture1 dimensions:(12, 12, 1), depthFormat 10depthTexture dimensions:(12, 12, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(14, 14, 1), colorTexture1 dimensions:(14, 14, 1), depthFormat 10depthTexture dimensions:(14, 14, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(16, 16, 1), colorTexture1 dimensions:(16, 16, 1), depthFormat 10depthTexture dimensions:(16, 16, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(18, 18, 1), colorTexture1 dimensions:(18, 18, 1), depthFormat 10depthTexture dimensions:(18, 18, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(20, 20, 1), colorTexture1 dimensions:(20, 20, 1), depthFormat 10depthTexture dimensions:(20, 20, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(22, 22, 1), colorTexture1 dimensions:(22, 22, 1), depthFormat 10depthTexture dimensions:(22, 22, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(24, 24, 1), colorTexture1 dimensions:(24, 24, 1), depthFormat 10depthTexture dimensions:(24, 24, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(26, 26, 1), colorTexture1 dimensions:(26, 26, 1), depthFormat 10depthTexture dimensions:(26, 26, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(28, 28, 1), colorTexture1 dimensions:(28, 28, 1), depthFormat 10depthTexture dimensions:(28, 28, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(30, 30, 1), colorTexture1 dimensions:(30, 30, 1), depthFormat 10depthTexture dimensions:(30, 30, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(32, 32, 1), colorTexture1 dimensions:(32, 32, 1), depthFormat 10depthTexture dimensions:(32, 32, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(34, 34, 1), colorTexture1 dimensions:(34, 34, 1), depthFormat 10depthTexture dimensions:(34, 34, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(36, 36, 1), colorTexture1 dimensions:(36, 36, 1), depthFormat 10depthTexture dimensions:(36, 36, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(38, 38, 1), colorTexture1 dimensions:(38, 38, 1), depthFormat 10depthTexture dimensions:(38, 38, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(40, 40, 1), colorTexture1 dimensions:(40, 40, 1), depthFormat 10depthTexture dimensions:(40, 40, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(42, 42, 1), colorTexture1 dimensions:(42, 42, 1), depthFormat 10depthTexture dimensions:(42, 42, 1)}
+}
+
+
+Case 3: Set custom context arena and add 10 framebuffer entries
+---------------------------------------------------------------
+_FramebufferCache: {
+    _FramebufferDesc: {colorTexture0 dimensions:(1, 1, 1), colorTexture1 dimensions:(1, 1, 1), depthFormat 10depthTexture dimensions:(1, 1, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(2, 2, 1), colorTexture1 dimensions:(2, 2, 1), depthFormat 10depthTexture dimensions:(2, 2, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(3, 3, 1), colorTexture1 dimensions:(3, 3, 1), depthFormat 10depthTexture dimensions:(3, 3, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(4, 4, 1), colorTexture1 dimensions:(4, 4, 1), depthFormat 10depthTexture dimensions:(4, 4, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(5, 5, 1), colorTexture1 dimensions:(5, 5, 1), depthFormat 10depthTexture dimensions:(5, 5, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(6, 6, 1), colorTexture1 dimensions:(6, 6, 1), depthFormat 10depthTexture dimensions:(6, 6, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(7, 7, 1), colorTexture1 dimensions:(7, 7, 1), depthFormat 10depthTexture dimensions:(7, 7, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(8, 8, 1), colorTexture1 dimensions:(8, 8, 1), depthFormat 10depthTexture dimensions:(8, 8, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(9, 9, 1), colorTexture1 dimensions:(9, 9, 1), depthFormat 10depthTexture dimensions:(9, 9, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(10, 10, 1), colorTexture1 dimensions:(10, 10, 1), depthFormat 10depthTexture dimensions:(10, 10, 1)}
+}
+
+
+Case 4: Switch back to default arena
+------------------------------------
+_FramebufferCache: {
+    _FramebufferDesc: {colorTexture0 dimensions:(2, 2, 1), colorTexture1 dimensions:(2, 2, 1), depthFormat 10depthTexture dimensions:(2, 2, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(4, 4, 1), colorTexture1 dimensions:(4, 4, 1), depthFormat 10depthTexture dimensions:(4, 4, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(6, 6, 1), colorTexture1 dimensions:(6, 6, 1), depthFormat 10depthTexture dimensions:(6, 6, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(8, 8, 1), colorTexture1 dimensions:(8, 8, 1), depthFormat 10depthTexture dimensions:(8, 8, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(10, 10, 1), colorTexture1 dimensions:(10, 10, 1), depthFormat 10depthTexture dimensions:(10, 10, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(12, 12, 1), colorTexture1 dimensions:(12, 12, 1), depthFormat 10depthTexture dimensions:(12, 12, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(14, 14, 1), colorTexture1 dimensions:(14, 14, 1), depthFormat 10depthTexture dimensions:(14, 14, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(16, 16, 1), colorTexture1 dimensions:(16, 16, 1), depthFormat 10depthTexture dimensions:(16, 16, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(18, 18, 1), colorTexture1 dimensions:(18, 18, 1), depthFormat 10depthTexture dimensions:(18, 18, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(20, 20, 1), colorTexture1 dimensions:(20, 20, 1), depthFormat 10depthTexture dimensions:(20, 20, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(22, 22, 1), colorTexture1 dimensions:(22, 22, 1), depthFormat 10depthTexture dimensions:(22, 22, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(24, 24, 1), colorTexture1 dimensions:(24, 24, 1), depthFormat 10depthTexture dimensions:(24, 24, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(26, 26, 1), colorTexture1 dimensions:(26, 26, 1), depthFormat 10depthTexture dimensions:(26, 26, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(28, 28, 1), colorTexture1 dimensions:(28, 28, 1), depthFormat 10depthTexture dimensions:(28, 28, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(30, 30, 1), colorTexture1 dimensions:(30, 30, 1), depthFormat 10depthTexture dimensions:(30, 30, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(32, 32, 1), colorTexture1 dimensions:(32, 32, 1), depthFormat 10depthTexture dimensions:(32, 32, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(34, 34, 1), colorTexture1 dimensions:(34, 34, 1), depthFormat 10depthTexture dimensions:(34, 34, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(36, 36, 1), colorTexture1 dimensions:(36, 36, 1), depthFormat 10depthTexture dimensions:(36, 36, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(38, 38, 1), colorTexture1 dimensions:(38, 38, 1), depthFormat 10depthTexture dimensions:(38, 38, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(40, 40, 1), colorTexture1 dimensions:(40, 40, 1), depthFormat 10depthTexture dimensions:(40, 40, 1)}
+    _FramebufferDesc: {colorTexture0 dimensions:(42, 42, 1), colorTexture1 dimensions:(42, 42, 1), depthFormat 10depthTexture dimensions:(42, 42, 1)}
+}
+
+
+Case 5: Destroy custom context arena
+------------------------------------
+SUCCESS
+
+
diff --git a/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/srgba.png b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/srgba.png
new file mode 100644
index 0000000000..80fc52f63f
Binary files /dev/null and b/pxr/imaging/hgiGL/testenv/testHgiGL/baseline/srgba.png differ
diff --git a/pxr/imaging/hgiGL/texture.cpp b/pxr/imaging/hgiGL/texture.cpp
index 297a7e5e3e..25db1d25d7 100644
--- a/pxr/imaging/hgiGL/texture.cpp
+++ b/pxr/imaging/hgiGL/texture.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
@@ -251,14 +234,30 @@ HgiGLTexture::HgiGLTexture(HgiTextureDesc const & desc)
         glTextureParameteri(_textureId, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
         glTextureParameteri(_textureId, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
 
-        const uint16_t mips = desc.mipLevels;
-        GLint minFilter = mips > 1 ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;
-        glTextureParameteri(_textureId, GL_TEXTURE_MIN_FILTER, minFilter);
-        glTextureParameteri(_textureId, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        if (desc.usage &
+            (HgiTextureUsageBitsDepthTarget |
+             HgiTextureUsageBitsStencilTarget)) {
+            glTextureParameteri(_textureId, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+            glTextureParameteri(_textureId, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        } else {
+            glTextureParameteri(
+                _textureId,
+                GL_TEXTURE_MIN_FILTER,
+                GL_LINEAR_MIPMAP_LINEAR);
+            glTextureParameteri(
+                _textureId,
+                GL_TEXTURE_MAG_FILTER,
+                GL_LINEAR);
+
+            float aniso = 2.0f;
+            glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &aniso);
+            glTextureParameterf(
+                _textureId,
+                GL_TEXTURE_MAX_ANISOTROPY_EXT,
+                aniso);
+        }
 
-        float aniso = 2.0f;
-        glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &aniso);
-        glTextureParameterf(_textureId, GL_TEXTURE_MAX_ANISOTROPY_EXT,aniso);
+        const uint16_t mips = desc.mipLevels;
         glTextureParameteri(_textureId, GL_TEXTURE_BASE_LEVEL, /*low-mip*/0);
         glTextureParameteri(_textureId, GL_TEXTURE_MAX_LEVEL, /*hi-mip*/mips-1);
 
diff --git a/pxr/imaging/hgiGL/texture.h b/pxr/imaging/hgiGL/texture.h
index cdf36f0797..7972cb5c03 100644
--- a/pxr/imaging/hgiGL/texture.h
+++ b/pxr/imaging/hgiGL/texture.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_GL_TEXTURE_H
 #define PXR_IMAGING_HGI_GL_TEXTURE_H
diff --git a/pxr/imaging/hgiInterop/api.h b/pxr/imaging/hgiInterop/api.h
index 63129decc8..45af9e8c49 100644
--- a/pxr/imaging/hgiInterop/api.h
+++ b/pxr/imaging/hgiInterop/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIINTEROP_API_H
 #define PXR_IMAGING_HGIINTEROP_API_H
diff --git a/pxr/imaging/hgiInterop/hgiInterop.cpp b/pxr/imaging/hgiInterop/hgiInterop.cpp
index d1437edccc..490944a177 100644
--- a/pxr/imaging/hgiInterop/hgiInterop.cpp
+++ b/pxr/imaging/hgiInterop/hgiInterop.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiInterop/hgiInterop.h"
 #include "pxr/imaging/hgi/hgi.h"
diff --git a/pxr/imaging/hgiInterop/hgiInterop.h b/pxr/imaging/hgiInterop/hgiInterop.h
index 0c233bb9f9..a41fb4896c 100644
--- a/pxr/imaging/hgiInterop/hgiInterop.h
+++ b/pxr/imaging/hgiInterop/hgiInterop.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIINTEROP_HGIINTEROP_H
 #define PXR_IMAGING_HGIINTEROP_HGIINTEROP_H
diff --git a/pxr/imaging/hgiInterop/metal.h b/pxr/imaging/hgiInterop/metal.h
index 94fe36a212..ead9d5ced9 100644
--- a/pxr/imaging/hgiInterop/metal.h
+++ b/pxr/imaging/hgiInterop/metal.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIINTEROP_HGIINTEROPMETAL_H
 #define PXR_IMAGING_HGIINTEROP_HGIINTEROPMETAL_H
diff --git a/pxr/imaging/hgiInterop/metal.mm b/pxr/imaging/hgiInterop/metal.mm
index 37075abb2c..97ae0adeba 100644
--- a/pxr/imaging/hgiInterop/metal.mm
+++ b/pxr/imaging/hgiInterop/metal.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glApi.h"
diff --git a/pxr/imaging/hgiInterop/opengl.cpp b/pxr/imaging/hgiInterop/opengl.cpp
index 95736721f1..98b29972f7 100644
--- a/pxr/imaging/hgiInterop/opengl.cpp
+++ b/pxr/imaging/hgiInterop/opengl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiInterop/opengl.h b/pxr/imaging/hgiInterop/opengl.h
index 18840a92bd..b0dd64a71b 100644
--- a/pxr/imaging/hgiInterop/opengl.h
+++ b/pxr/imaging/hgiInterop/opengl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIINTEROP_HGIINTEROPOPENGL_H
 #define PXR_IMAGING_HGIINTEROP_HGIINTEROPOPENGL_H
diff --git a/pxr/imaging/hgiInterop/pch.h b/pxr/imaging/hgiInterop/pch.h
index 690aeaee9d..3998bf0fa6 100644
--- a/pxr/imaging/hgiInterop/pch.h
+++ b/pxr/imaging/hgiInterop/pch.h
@@ -1,43 +1,61 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
 
+#define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
+#include "pxr/base/arch/defines.h"
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
+#endif
+#include <any>
+#include <atomic>
 #include <cinttypes>
 #include <cmath>
+#include <cstdarg>
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <functional>
+#include <inttypes.h>
 #include <iosfwd>
 #include <limits>
+#include <list>
 #include <locale>
+#include <map>
+#include <math.h>
 #include <memory>
+#include <mutex>
+#include <set>
+#include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <string>
 #include <sys/types.h>
+#include <thread>
+#include <tuple>
 #include <type_traits>
+#include <typeindex>
+#include <typeinfo>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/python/object_fwd.hpp>
+#include <boost/python/object_operators.hpp>
+#if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
+#undef tolower
+#undef toupper
+#endif
+#endif // PXR_PYTHON_SUPPORT_ENABLED
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include "pxr/base/tf/pySafePython.h"
+#endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hgiInterop/vulkan.cpp b/pxr/imaging/hgiInterop/vulkan.cpp
index add7c27f50..c615dacfab 100644
--- a/pxr/imaging/hgiInterop/vulkan.cpp
+++ b/pxr/imaging/hgiInterop/vulkan.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/garch/glApi.h"
 
diff --git a/pxr/imaging/hgiInterop/vulkan.h b/pxr/imaging/hgiInterop/vulkan.h
index 7649bff48b..b418f7e6ec 100644
--- a/pxr/imaging/hgiInterop/vulkan.h
+++ b/pxr/imaging/hgiInterop/vulkan.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIINTEROP_HGIINTEROPVULKAN_H
 #define PXR_IMAGING_HGIINTEROP_HGIINTEROPVULKAN_H
diff --git a/pxr/imaging/hgiMetal/CMakeLists.txt b/pxr/imaging/hgiMetal/CMakeLists.txt
index a63fd72639..a8987a3ca7 100644
--- a/pxr/imaging/hgiMetal/CMakeLists.txt
+++ b/pxr/imaging/hgiMetal/CMakeLists.txt
@@ -63,4 +63,6 @@ pxr_library(hgiMetal
 
     RESOURCE_FILES
         plugInfo.json
+
+    DISABLE_PRECOMPILED_HEADERS
 )
diff --git a/pxr/imaging/hgiMetal/api.h b/pxr/imaging/hgiMetal/api.h
index 39a3f13c2f..fcd94fc33d 100644
--- a/pxr/imaging/hgiMetal/api.h
+++ b/pxr/imaging/hgiMetal/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_API_H
 #define PXR_IMAGING_HGI_METAL_API_H
diff --git a/pxr/imaging/hgiMetal/blitCmds.h b/pxr/imaging/hgiMetal/blitCmds.h
index 8c58b4a30b..7b26fb0831 100644
--- a/pxr/imaging/hgiMetal/blitCmds.h
+++ b/pxr/imaging/hgiMetal/blitCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_BLIT_CMDS_H
 #define PXR_IMAGING_HGI_METAL_BLIT_CMDS_H
diff --git a/pxr/imaging/hgiMetal/blitCmds.mm b/pxr/imaging/hgiMetal/blitCmds.mm
index 48486bbc86..04cb0347dd 100644
--- a/pxr/imaging/hgiMetal/blitCmds.mm
+++ b/pxr/imaging/hgiMetal/blitCmds.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <Metal/Metal.h>
 
@@ -72,6 +55,9 @@
             [_label release];
             _label = nil;
         }
+        if (!_secondaryCommandBuffer) {
+            _hgi->SetHasWork();
+        }
     }
 }
 
diff --git a/pxr/imaging/hgiMetal/buffer.h b/pxr/imaging/hgiMetal/buffer.h
index e105c2fb72..65668acc2e 100644
--- a/pxr/imaging/hgiMetal/buffer.h
+++ b/pxr/imaging/hgiMetal/buffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_BUFFER_H
 #define PXR_IMAGING_HGI_METAL_BUFFER_H
diff --git a/pxr/imaging/hgiMetal/buffer.mm b/pxr/imaging/hgiMetal/buffer.mm
index 62055d17dc..cf15ea4886 100644
--- a/pxr/imaging/hgiMetal/buffer.mm
+++ b/pxr/imaging/hgiMetal/buffer.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <Metal/Metal.h>
 
diff --git a/pxr/imaging/hgiMetal/capabilities.h b/pxr/imaging/hgiMetal/capabilities.h
index 0437b37eee..093328ffd7 100644
--- a/pxr/imaging/hgiMetal/capabilities.h
+++ b/pxr/imaging/hgiMetal/capabilities.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_CAPABILITIES_H
 #define PXR_IMAGING_HGI_METAL_CAPABILITIES_H
diff --git a/pxr/imaging/hgiMetal/capabilities.mm b/pxr/imaging/hgiMetal/capabilities.mm
index 20aedef37a..d6306a3f8d 100644
--- a/pxr/imaging/hgiMetal/capabilities.mm
+++ b/pxr/imaging/hgiMetal/capabilities.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiMetal/capabilities.h"
 #include "pxr/imaging/hgiMetal/hgi.h"
diff --git a/pxr/imaging/hgiMetal/computeCmds.h b/pxr/imaging/hgiMetal/computeCmds.h
index 41a5cdad1d..01fe4ef216 100644
--- a/pxr/imaging/hgiMetal/computeCmds.h
+++ b/pxr/imaging/hgiMetal/computeCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_COMPUTE_CMDS_H
 #define PXR_IMAGING_HGI_METAL_COMPUTE_CMDS_H
@@ -101,7 +84,6 @@ class HgiMetalComputeCmds final : public HgiComputeCmds
     id<MTLBuffer> _argumentBuffer;
     id<MTLComputeCommandEncoder> _encoder;
     bool _secondaryCommandBuffer;
-    bool _hasWork;
     HgiComputeDispatch _dispatchMethod;
 };
 
diff --git a/pxr/imaging/hgiMetal/computeCmds.mm b/pxr/imaging/hgiMetal/computeCmds.mm
index c7713ff494..d55c05cdc1 100644
--- a/pxr/imaging/hgiMetal/computeCmds.mm
+++ b/pxr/imaging/hgiMetal/computeCmds.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiMetal/buffer.h"
 #include "pxr/imaging/hgiMetal/computeCmds.h"
@@ -44,7 +27,6 @@
     , _argumentBuffer(nil)
     , _encoder(nil)
     , _secondaryCommandBuffer(false)
-    , _hasWork(false)
     , _dispatchMethod(desc.dispatchMethod)
 {
     _CreateEncoder();
@@ -152,7 +134,10 @@
         threadsPerThreadgroup:MTLSizeMake(MIN(thread_width, dimX),
                                           MIN(thread_height, dimY), 1)];
 
-    _hasWork = true;
+    if (!_secondaryCommandBuffer) {
+        _hgi->SetHasWork();
+    }
+
     _argumentBuffer = nil;
 }
 
@@ -191,11 +176,9 @@
 bool
 HgiMetalComputeCmds::_Submit(Hgi* hgi, HgiSubmitWaitType wait)
 {
-    bool submittedWork = false;
     if (_encoder) {
         [_encoder endEncoding];
         _encoder = nil;
-        submittedWork = true;
 
         HgiMetal::CommitCommandBufferWaitType waitType;
         switch(wait) {
@@ -221,7 +204,7 @@
     _commandBuffer = nil;
     _argumentBuffer = nil;
 
-    return submittedWork;
+    return true;
 }
 
 HGIMETAL_API
diff --git a/pxr/imaging/hgiMetal/computePipeline.h b/pxr/imaging/hgiMetal/computePipeline.h
index 08870d8b32..9b3998048f 100644
--- a/pxr/imaging/hgiMetal/computePipeline.h
+++ b/pxr/imaging/hgiMetal/computePipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_COMPUTE_PIPELINE_H
 #define PXR_IMAGING_HGI_METAL_COMPUTE_PIPELINE_H
diff --git a/pxr/imaging/hgiMetal/computePipeline.mm b/pxr/imaging/hgiMetal/computePipeline.mm
index defe62b62d..b46523bcdf 100644
--- a/pxr/imaging/hgiMetal/computePipeline.mm
+++ b/pxr/imaging/hgiMetal/computePipeline.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/diagnostic.h"
diff --git a/pxr/imaging/hgiMetal/conversions.h b/pxr/imaging/hgiMetal/conversions.h
index 8ccf71f9aa..fba73af6af 100644
--- a/pxr/imaging/hgiMetal/conversions.h
+++ b/pxr/imaging/hgiMetal/conversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_CONVERSIONS_H
 #define PXR_IMAGING_HGI_METAL_CONVERSIONS_H
diff --git a/pxr/imaging/hgiMetal/conversions.mm b/pxr/imaging/hgiMetal/conversions.mm
index edfd6167ef..490d9dc990 100644
--- a/pxr/imaging/hgiMetal/conversions.mm
+++ b/pxr/imaging/hgiMetal/conversions.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiMetal/conversions.h"
 
diff --git a/pxr/imaging/hgiMetal/diagnostic.h b/pxr/imaging/hgiMetal/diagnostic.h
index 5c80cb2d69..70bac434f2 100644
--- a/pxr/imaging/hgiMetal/diagnostic.h
+++ b/pxr/imaging/hgiMetal/diagnostic.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_DIAGNOSTIC_H
 #define PXR_IMAGING_HGI_METAL_DIAGNOSTIC_H
diff --git a/pxr/imaging/hgiMetal/diagnostic.mm b/pxr/imaging/hgiMetal/diagnostic.mm
index 68f9fb63eb..89428f9ca9 100644
--- a/pxr/imaging/hgiMetal/diagnostic.mm
+++ b/pxr/imaging/hgiMetal/diagnostic.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Diagnostic.cpp
 //
diff --git a/pxr/imaging/hgiMetal/graphicsCmds.h b/pxr/imaging/hgiMetal/graphicsCmds.h
index 8694387c07..4c195bfbe3 100644
--- a/pxr/imaging/hgiMetal/graphicsCmds.h
+++ b/pxr/imaging/hgiMetal/graphicsCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_GRAPHICS_CMDS_H
 #define PXR_IMAGING_HGI_METAL_GRAPHICS_CMDS_H
@@ -170,7 +153,6 @@ class HgiMetalGraphicsCmds final : public HgiGraphicsCmds
     uint32_t _primitiveIndexSize;
     uint32_t _drawBufferBindingIndex;
     NSString* _debugLabel;
-    bool _hasWork;
     bool _viewportSet;
     bool _scissorRectSet;
     bool _enableParallelEncoder;
diff --git a/pxr/imaging/hgiMetal/graphicsCmds.mm b/pxr/imaging/hgiMetal/graphicsCmds.mm
index ce64a298f5..653c172667 100644
--- a/pxr/imaging/hgiMetal/graphicsCmds.mm
+++ b/pxr/imaging/hgiMetal/graphicsCmds.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/graphicsCmdsDesc.h"
 #include "pxr/imaging/hgiMetal/buffer.h"
@@ -85,7 +68,6 @@
     , _primitiveIndexSize(0)
     , _drawBufferBindingIndex(0)
     , _debugLabel(nil)
-    , _hasWork(false)
     , _viewportSet(false)
     , _scissorRectSet(false)
     , _enableParallelEncoder(false)
@@ -566,7 +548,7 @@
         }
     }
 
-    _hasWork = true;
+    _hgi->SetHasWork();
 }
 
 void
@@ -636,6 +618,8 @@
             });
         }
     });
+
+    _hgi->SetHasWork();
 }
 
 void
@@ -685,7 +669,7 @@
                           baseInstance:baseInstance];
     }
 
-    _hasWork = true;
+    _hgi->SetHasWork();
 }
 
 void
@@ -778,6 +762,8 @@
             });
         }
     });
+
+    _hgi->SetHasWork();
 }
 
 void
@@ -875,7 +861,7 @@
     _encoders.clear();
     _CachedEncState.ResetCachedEncoderState();
     
-    return _hasWork;
+    return true;
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/hgiMetal/graphicsPipeline.h b/pxr/imaging/hgiMetal/graphicsPipeline.h
index cb968312d4..6996f18cf7 100644
--- a/pxr/imaging/hgiMetal/graphicsPipeline.h
+++ b/pxr/imaging/hgiMetal/graphicsPipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_PIPELINE_H
 #define PXR_IMAGING_HGI_METAL_PIPELINE_H
diff --git a/pxr/imaging/hgiMetal/graphicsPipeline.mm b/pxr/imaging/hgiMetal/graphicsPipeline.mm
index 97ec3a92c1..b390dfb9f1 100644
--- a/pxr/imaging/hgiMetal/graphicsPipeline.mm
+++ b/pxr/imaging/hgiMetal/graphicsPipeline.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgiMetal/hgi.h"
diff --git a/pxr/imaging/hgiMetal/hgi.h b/pxr/imaging/hgiMetal/hgi.h
index f8ead2d683..3a15f0f704 100644
--- a/pxr/imaging/hgiMetal/hgi.h
+++ b/pxr/imaging/hgiMetal/hgi.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_HGIMETAL_H
 #define PXR_IMAGING_HGI_METAL_HGIMETAL_H
@@ -171,7 +154,9 @@ class HgiMetal final : public Hgi
     // So for the sake of efficiency, we try to create only one cmd buf and
     // only use the secondary command buffer when the client code requires it.
     // For example, the client code may record in a HgiBlitCmds and a
-    // HgiComputeCmds at the same time.
+    // HgiComputeCmds at the same time. It is the responsibility of the
+    // command buffer implementation to call SetHasWork() if there is
+    // work to be submitted from the primary command buffer.
     HGIMETAL_API
     id<MTLCommandBuffer> GetPrimaryCommandBuffer(HgiCmds *requester = nullptr,
                                                  bool flush = true);
@@ -179,6 +164,9 @@ class HgiMetal final : public Hgi
     HGIMETAL_API
     id<MTLCommandBuffer> GetSecondaryCommandBuffer();
 
+    HGIMETAL_API
+    void SetHasWork();
+
     HGIMETAL_API
     int GetAPIVersion() const;
     
diff --git a/pxr/imaging/hgiMetal/hgi.mm b/pxr/imaging/hgiMetal/hgi.mm
index fcc5bdb43e..4ad346f4d1 100644
--- a/pxr/imaging/hgiMetal/hgi.mm
+++ b/pxr/imaging/hgiMetal/hgi.mm
@@ -1,28 +1,12 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/arch/defines.h"
 
+#include "pxr/imaging/hgi/debugCodes.h"
 #include "pxr/imaging/hgiMetal/hgi.h"
 #include "pxr/imaging/hgiMetal/buffer.h"
 #include "pxr/imaging/hgiMetal/blitCmds.h"
@@ -171,6 +155,9 @@ void Drain() {}
         return true;
     }
 
+    TF_DEBUG(HGI_DEBUG_IS_SUPPORTED).Msg(
+        "HgiMetal unsupported due to OS version\n");
+
     return false;
 }
 
@@ -417,6 +404,12 @@ void Drain() {}
     return commandBuffer;
 }
 
+void
+HgiMetal::SetHasWork()
+{
+    _workToFlush = true;
+}
+
 int
 HgiMetal::GetAPIVersion() const
 {
@@ -529,7 +522,7 @@ void Drain() {}
     TRACE_FUNCTION();
 
     if (cmds) {
-        _workToFlush = Hgi::_SubmitCmds(cmds, wait);
+        Hgi::_SubmitCmds(cmds, wait);
         if (cmds == _currentCmds) {
             _currentCmds = nullptr;
         }
diff --git a/pxr/imaging/hgiMetal/indirectCommandEncoder.h b/pxr/imaging/hgiMetal/indirectCommandEncoder.h
index 736e2d6a39..8a84915c06 100644
--- a/pxr/imaging/hgiMetal/indirectCommandEncoder.h
+++ b/pxr/imaging/hgiMetal/indirectCommandEncoder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_INDIRECT_COMMAND_ENCODER_H
 #define PXR_IMAGING_HGI_METAL_INDIRECT_COMMAND_ENCODER_H
diff --git a/pxr/imaging/hgiMetal/indirectCommandEncoder.mm b/pxr/imaging/hgiMetal/indirectCommandEncoder.mm
index 760cd9c8a7..44abcb9707 100644
--- a/pxr/imaging/hgiMetal/indirectCommandEncoder.mm
+++ b/pxr/imaging/hgiMetal/indirectCommandEncoder.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/arch/defines.h"
 
diff --git a/pxr/imaging/hgiMetal/resourceBindings.h b/pxr/imaging/hgiMetal/resourceBindings.h
index 8111121354..b03138b031 100644
--- a/pxr/imaging/hgiMetal/resourceBindings.h
+++ b/pxr/imaging/hgiMetal/resourceBindings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_RESOURCEBINDINGS_H
 #define PXR_IMAGING_HGI_METAL_RESOURCEBINDINGS_H
diff --git a/pxr/imaging/hgiMetal/resourceBindings.mm b/pxr/imaging/hgiMetal/resourceBindings.mm
index 2203624a06..0d84295303 100644
--- a/pxr/imaging/hgiMetal/resourceBindings.mm
+++ b/pxr/imaging/hgiMetal/resourceBindings.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiMetal/buffer.h"
 #include "pxr/imaging/hgiMetal/conversions.h"
diff --git a/pxr/imaging/hgiMetal/sampler.h b/pxr/imaging/hgiMetal/sampler.h
index 28bf9f4684..3d25c4c22e 100644
--- a/pxr/imaging/hgiMetal/sampler.h
+++ b/pxr/imaging/hgiMetal/sampler.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_SAMPLER_H
 #define PXR_IMAGING_HGI_METAL_SAMPLER_H
diff --git a/pxr/imaging/hgiMetal/sampler.mm b/pxr/imaging/hgiMetal/sampler.mm
index 16fbee629b..cf5ff71884 100644
--- a/pxr/imaging/hgiMetal/sampler.mm
+++ b/pxr/imaging/hgiMetal/sampler.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <Metal/Metal.h>
 
diff --git a/pxr/imaging/hgiMetal/shaderFunction.h b/pxr/imaging/hgiMetal/shaderFunction.h
index c3de0d94ef..e7678613d2 100644
--- a/pxr/imaging/hgiMetal/shaderFunction.h
+++ b/pxr/imaging/hgiMetal/shaderFunction.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_SHADERFUNCTION_H
 #define PXR_IMAGING_HGI_METAL_SHADERFUNCTION_H
diff --git a/pxr/imaging/hgiMetal/shaderFunction.mm b/pxr/imaging/hgiMetal/shaderFunction.mm
index 45d36d6bef..b472224ee6 100644
--- a/pxr/imaging/hgiMetal/shaderFunction.mm
+++ b/pxr/imaging/hgiMetal/shaderFunction.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiMetal/hgi.h"
 #include "pxr/imaging/hgiMetal/conversions.h"
diff --git a/pxr/imaging/hgiMetal/shaderGenerator.h b/pxr/imaging/hgiMetal/shaderGenerator.h
index 0cd5f55655..24a063a52b 100644
--- a/pxr/imaging/hgiMetal/shaderGenerator.h
+++ b/pxr/imaging/hgiMetal/shaderGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGIMETAL_SHADERGENERATOR_H
diff --git a/pxr/imaging/hgiMetal/shaderGenerator.mm b/pxr/imaging/hgiMetal/shaderGenerator.mm
index 69e32684a2..f076b3c09c 100644
--- a/pxr/imaging/hgiMetal/shaderGenerator.mm
+++ b/pxr/imaging/hgiMetal/shaderGenerator.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgiMetal/shaderGenerator.h"
@@ -303,9 +286,22 @@ void _Init(
         " atomic_fetch_add_explicit(&a, v, memory_order_relaxed)\n"
         "#define ATOMIC_EXCHANGE(a, desired)"
         " atomic_exchange_explicit(&a, desired, memory_order_relaxed)\n"
-        "#define ATOMIC_COMP_SWAP(a, expected, desired) \\"
-        "  atomic_compare_exchange_strong_explicit(&a, &expected, desired, "
-        "memory_order_relaxed, memory_order_relaxed)\n"
+        "int atomicCompSwap(device atomic_int *a, int expected, int desired) {\n"
+        "    int found = expected;\n"
+        "    while(!atomic_compare_exchange_weak_explicit(a, &found, desired,\n"
+        "        memory_order_relaxed, memory_order_relaxed)) {\n"
+        "        if (found != expected) { return found; }\n"
+        "        else { found = expected; }\n"
+        "    } return expected; }\n"
+        "uint atomicCompSwap(device atomic_uint *a, uint expected, uint desired) {\n"
+        "    uint found = expected;\n"
+        "    while(!atomic_compare_exchange_weak_explicit(a, &found, desired,\n"
+        "        memory_order_relaxed, memory_order_relaxed)) {\n"
+        "        if (found != expected) { return found; }\n"
+        "        else { found = expected; }\n"
+        "    } return expected; }\n"
+        "#define ATOMIC_COMP_SWAP(a, expected, desired)"
+        " atomicCompSwap(&a, expected, desired)\n"
         "\n";
 }
 
diff --git a/pxr/imaging/hgiMetal/shaderProgram.h b/pxr/imaging/hgiMetal/shaderProgram.h
index 53790f73d7..8483e67583 100644
--- a/pxr/imaging/hgiMetal/shaderProgram.h
+++ b/pxr/imaging/hgiMetal/shaderProgram.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_SHADERPROGRAM_H
 #define PXR_IMAGING_HGI_METAL_SHADERPROGRAM_H
diff --git a/pxr/imaging/hgiMetal/shaderProgram.mm b/pxr/imaging/hgiMetal/shaderProgram.mm
index bf2594cb9d..fec3b36660 100644
--- a/pxr/imaging/hgiMetal/shaderProgram.mm
+++ b/pxr/imaging/hgiMetal/shaderProgram.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiMetal/shaderProgram.h"
 #include "pxr/imaging/hgiMetal/shaderFunction.h"
diff --git a/pxr/imaging/hgiMetal/shaderSection.h b/pxr/imaging/hgiMetal/shaderSection.h
index 59e6dff74d..abfbd7a62f 100644
--- a/pxr/imaging/hgiMetal/shaderSection.h
+++ b/pxr/imaging/hgiMetal/shaderSection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGIMETAL_SHADERSECTION_H
diff --git a/pxr/imaging/hgiMetal/shaderSection.mm b/pxr/imaging/hgiMetal/shaderSection.mm
index bfedccaff3..9939935cdb 100644
--- a/pxr/imaging/hgiMetal/shaderSection.mm
+++ b/pxr/imaging/hgiMetal/shaderSection.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgiMetal/shaderSection.h"
diff --git a/pxr/imaging/hgiMetal/stepFunctions.h b/pxr/imaging/hgiMetal/stepFunctions.h
index af59d0c03e..9969abf5df 100644
--- a/pxr/imaging/hgiMetal/stepFunctions.h
+++ b/pxr/imaging/hgiMetal/stepFunctions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_STEP_FUNCTIONS_H
 #define PXR_IMAGING_HGI_METAL_STEP_FUNCTIONS_H
diff --git a/pxr/imaging/hgiMetal/stepFunctions.mm b/pxr/imaging/hgiMetal/stepFunctions.mm
index e719c0d3bf..dbcad0ef89 100644
--- a/pxr/imaging/hgiMetal/stepFunctions.mm
+++ b/pxr/imaging/hgiMetal/stepFunctions.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgiMetal/stepFunctions.h"
diff --git a/pxr/imaging/hgiMetal/texture.h b/pxr/imaging/hgiMetal/texture.h
index 623fdf3cf1..52cdb35345 100644
--- a/pxr/imaging/hgiMetal/texture.h
+++ b/pxr/imaging/hgiMetal/texture.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_METAL_TEXTURE_H
 #define PXR_IMAGING_HGI_METAL_TEXTURE_H
diff --git a/pxr/imaging/hgiMetal/texture.mm b/pxr/imaging/hgiMetal/texture.mm
index 41dbc993f4..342367661d 100644
--- a/pxr/imaging/hgiMetal/texture.mm
+++ b/pxr/imaging/hgiMetal/texture.mm
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <Metal/Metal.h>
 
diff --git a/pxr/imaging/hgiVulkan/CMakeLists.txt b/pxr/imaging/hgiVulkan/CMakeLists.txt
index 960a03beea..97e4228944 100644
--- a/pxr/imaging/hgiVulkan/CMakeLists.txt
+++ b/pxr/imaging/hgiVulkan/CMakeLists.txt
@@ -68,6 +68,32 @@ if (WIN32)
     return()
 endif()
 
+pxr_build_test(testHgiVulkan
+    LIBRARIES
+        hgiVulkan
+        hgi
+        hio
+        tf
+    CPPFILES
+        testenv/testHgiVulkan.cpp
+)
+pxr_install_test_dir(
+    SRC testenv/testHgiVulkan
+    DEST testHgiVulkan
+)
+pxr_register_test(testHgiVulkan
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHgiVulkan"
+    IMAGE_DIFF_COMPARE
+        graphicsCmdsClear.png
+        srgba.png
+        copyTextureToBuffer.png
+        copyBufferToTexture.png
+    FAIL 1
+    FAIL_PERCENT 0.001
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+)
+
 # This test is not currently supported on static builds as it relies on 
 # testHgiCommand, which is not linked in the static hgiVulkan library. 
 if (BUILD_SHARED_LIBS)
@@ -78,11 +104,11 @@ pxr_install_test_dir(
 )
 pxr_register_test(testHgiVulkanCommand
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHgiCommand --write testHgiVulkanCommand_triangle.png"
-    # IMAGE_DIFF_COMPARE
-    #     testHgiVulkanCommand_triangle.png
-    # FAIL 1
-    # FAIL_PERCENT 0.001
-    # PERCEPTUAL
+    IMAGE_DIFF_COMPARE
+        testHgiVulkanCommand_triangle.png
+    FAIL 1
+    FAIL_PERCENT 0.001
+    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     ENV
         HGI_ENABLE_VULKAN=1
diff --git a/pxr/imaging/hgiVulkan/api.h b/pxr/imaging/hgiVulkan/api.h
index db09b45b92..9272da2cdf 100644
--- a/pxr/imaging/hgiVulkan/api.h
+++ b/pxr/imaging/hgiVulkan/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_API_H
 #define PXR_IMAGING_HGIVULKAN_API_H
diff --git a/pxr/imaging/hgiVulkan/blitCmds.cpp b/pxr/imaging/hgiVulkan/blitCmds.cpp
index 061ece815c..583d80249a 100644
--- a/pxr/imaging/hgiVulkan/blitCmds.cpp
+++ b/pxr/imaging/hgiVulkan/blitCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgiVulkan/blitCmds.h"
@@ -62,6 +45,25 @@ HgiVulkanBlitCmds::PopDebugGroup()
     HgiVulkanEndLabel(_hgi->GetPrimaryDevice(), _commandBuffer);
 }
 
+static
+VkImageAspectFlags
+_GetImageAspectMaskForCopy(HgiTextureUsage textureUsage)
+{
+    // XXX: Vulkan validation demands that only one flag at a time be used 
+    // during the copy operation. Both depth and stencil flags cannot be 
+    // simultaneously passed as aspects to copy.
+    // So, we assume that the user wants to copy depth when the texture is a 
+    // depthStencil texture. If need arises, this part of the implementation 
+    // needs to be re-written such that an aspect flag is passed to this copy 
+    // operation to resolve the discrepancy.
+    VkImageAspectFlags aspectFlags =
+        HgiVulkanConversions::GetImageAspectFlag(textureUsage);
+    if (aspectFlags & VK_IMAGE_ASPECT_DEPTH_BIT) {
+        aspectFlags = VK_IMAGE_ASPECT_DEPTH_BIT;
+    }
+    return aspectFlags;
+}
+
 void
 HgiVulkanBlitCmds::CopyTextureGpuToCpu(
     HgiTextureGpuToCpuOp const& copyOp)
@@ -100,19 +102,7 @@ HgiVulkanBlitCmds::CopyTextureGpuToCpu(
     imageSub.baseArrayLayer = isTexArray ? copyOp.sourceTexelOffset[2] : 0;
     imageSub.layerCount = 1;
     imageSub.mipLevel = copyOp.mipLevel;
-
-    // XXX: Vulkan validation demands that only one flag at a time be used 
-    // during the copy operation. Both depth and stencil flags cannot be 
-    // simultaneously passed as aspects to copy.
-    // So, we assume that the user wants to copy depth when the texture is a 
-    // depthStencil texture. If need arises, this part of the implementation 
-    // needs to be re-written such that an aspect flag is passed to this copy 
-    // operation to resolve the discrepancy.
-    imageSub.aspectMask =
-        HgiVulkanConversions::GetImageAspectFlag(texDesc.usage);
-    if (imageSub.aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) {
-        imageSub.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
-    }
+    imageSub.aspectMask = _GetImageAspectMaskForCopy(texDesc.usage);
 
     // See vulkan docs: Copying Data Between Buffers and Images
     VkBufferImageCopy region;
@@ -347,7 +337,9 @@ HgiVulkanBlitCmds::CopyBufferGpuToCpu(HgiBufferGpuToCpuOp const& copyOp)
     // Copy from device-local GPU buffer into GPU staging buffer
     VkBufferCopy copyRegion = {};
     copyRegion.srcOffset = copyOp.sourceByteOffset;
-    copyRegion.dstOffset = copyOp.destinationByteOffset;
+    // No need to use dst offset during intermediate step of copying into 
+    // staging buffer.
+    copyRegion.dstOffset = 0;
     copyRegion.size = copyOp.byteSize;
     vkCmdCopyBuffer(
         _commandBuffer->GetVulkanCommandBuffer(), 
@@ -361,9 +353,10 @@ HgiVulkanBlitCmds::CopyBufferGpuToCpu(HgiBufferGpuToCpuOp const& copyOp)
     // Offset into the dst buffer
     char* dst = ((char*) copyOp.cpuDestinationBuffer) +
         copyOp.destinationByteOffset;
-    
-    // Offset into the src buffer
-    const char* src = ((const char*) cpuAddress) + copyOp.sourceByteOffset;
+
+    // No need to offset into src buffer since we copied into staging buffer
+    // without dst offset.
+    const char* src = ((const char*) cpuAddress);
 
     // bytes to copy
     size_t size = copyOp.byteSize;
@@ -377,13 +370,168 @@ HgiVulkanBlitCmds::CopyBufferGpuToCpu(HgiBufferGpuToCpuOp const& copyOp)
 void
 HgiVulkanBlitCmds::CopyTextureToBuffer(HgiTextureToBufferOp const& copyOp)
 {
-    TF_CODING_ERROR("Missing Implementation");
+    if (copyOp.byteSize == 0) {
+        TF_WARN("The size of the data to copy was zero, aborting copy.");
+        return;
+    }
+
+    _CreateCommandBuffer();
+
+    HgiVulkanTexture* srcTexture =
+        static_cast<HgiVulkanTexture*>(copyOp.gpuSourceTexture.Get());
+    if (!TF_VERIFY(srcTexture && srcTexture->GetImage(), "Invalid texture")) {
+        return;
+    }
+    HgiTextureDesc const& texDesc = srcTexture->GetDescriptor();
+
+    HgiVulkanBuffer* dstBuffer =
+        static_cast<HgiVulkanBuffer*>(copyOp.gpuDestinationBuffer.Get());
+    if (!TF_VERIFY(dstBuffer && dstBuffer->GetVulkanBuffer(),
+        "Invalid buffer")) {
+        return;
+    }
+
+    // Transition image layout to VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL.
+    VkImageLayout oldLayout = srcTexture->GetImageLayout();
+    HgiVulkanTexture::TransitionImageBarrier(
+        _commandBuffer,
+        srcTexture,
+        /*oldLayout*/oldLayout,
+        /*newLayout*/VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+        /*producerAccess*/HgiVulkanTexture::GetDefaultAccessFlags(texDesc.usage),
+        /*consumerAccess*/VK_ACCESS_TRANSFER_READ_BIT,
+        /*producerStage*/VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
+        /*consumerStage*/VK_PIPELINE_STAGE_TRANSFER_BIT,
+        copyOp.mipLevel);
+
+    VkOffset3D origin;
+    origin.x = copyOp.sourceTexelOffset[0];
+    origin.y = copyOp.sourceTexelOffset[1];
+    origin.z = copyOp.sourceTexelOffset[2];
+
+    VkExtent3D size;
+    size.width = texDesc.dimensions[0];
+    size.height = texDesc.dimensions[1];
+    size.depth = texDesc.dimensions[2];
+
+    VkImageSubresourceLayers imageSub;
+    imageSub.baseArrayLayer = 0;
+    imageSub.layerCount = texDesc.layerCount;
+    imageSub.mipLevel = copyOp.mipLevel;
+    imageSub.aspectMask = _GetImageAspectMaskForCopy(texDesc.usage);
+
+    VkBufferImageCopy region;
+    region.bufferImageHeight = 0; // Buffer is tightly packed, like image
+    region.bufferRowLength = 0;   // Buffer is tightly packed, like image
+    region.bufferOffset = copyOp.destinationByteOffset;
+    region.imageExtent = size;
+    region.imageOffset = origin;
+    region.imageSubresource = imageSub;
+
+    vkCmdCopyImageToBuffer(
+        _commandBuffer->GetVulkanCommandBuffer(),
+        srcTexture->GetImage(),
+        srcTexture->GetImageLayout(),
+        dstBuffer->GetVulkanBuffer(),
+        /*regionCount*/1,
+        &region
+    );
+
+    // Transition image layout back to original layout.
+    HgiVulkanTexture::TransitionImageBarrier(
+        _commandBuffer,
+        srcTexture,
+        /*oldLayout*/VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+        /*newLayout*/oldLayout,
+        /*producerAccess*/VK_ACCESS_TRANSFER_WRITE_BIT,
+        /*consumerAccess*/HgiVulkanTexture::GetDefaultAccessFlags(texDesc.usage),
+        /*producerStage*/VK_PIPELINE_STAGE_TRANSFER_BIT,
+        /*consumerStage*/VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
+        copyOp.mipLevel);
 }
 
 void
 HgiVulkanBlitCmds::CopyBufferToTexture(HgiBufferToTextureOp const& copyOp)
 {
-    TF_CODING_ERROR("Missing Implementation");
+    if (copyOp.byteSize == 0) {
+        TF_WARN("The size of the data to copy was zero, aborting copy.");
+        return;
+    }
+
+    _CreateCommandBuffer();
+
+    HgiBufferHandle const& srcBufHandle = copyOp.gpuSourceBuffer;
+    HgiVulkanBuffer* srcBuffer =
+        static_cast<HgiVulkanBuffer*>(srcBufHandle.Get());
+    if (!TF_VERIFY(srcBuffer && srcBuffer->GetVulkanBuffer(),
+        "Invalid buffer")) {
+        return;
+    }
+
+    HgiVulkanTexture* dstTexture =
+        static_cast<HgiVulkanTexture*>(copyOp.gpuDestinationTexture.Get());
+    if (!TF_VERIFY(dstTexture && dstTexture->GetImage(),
+        "Invalid texture handle")) {
+        return;
+    }
+    HgiTextureDesc const& texDesc = dstTexture->GetDescriptor();
+
+    // Transition image layout to VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL.
+    VkImageLayout oldLayout = dstTexture->GetImageLayout();
+    HgiVulkanTexture::TransitionImageBarrier(
+        _commandBuffer,
+        dstTexture,
+        /*oldLayout*/oldLayout,
+        /*newLayout*/VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+        /*producerAccess*/HgiVulkanTexture::GetDefaultAccessFlags(texDesc.usage),
+        /*consumerAccess*/VK_ACCESS_TRANSFER_WRITE_BIT,
+        /*producerStage*/VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
+        /*consumerStage*/VK_PIPELINE_STAGE_TRANSFER_BIT,
+        copyOp.mipLevel);
+
+    VkOffset3D origin;
+    origin.x = copyOp.destinationTexelOffset[0];
+    origin.y = copyOp.destinationTexelOffset[1];
+    origin.z = copyOp.destinationTexelOffset[2];
+
+    VkExtent3D size;
+    size.width = texDesc.dimensions[0] - copyOp.destinationTexelOffset[0];
+    size.height = texDesc.dimensions[1] - copyOp.destinationTexelOffset[1];
+    size.depth = texDesc.dimensions[2] - copyOp.destinationTexelOffset[2];
+
+    VkImageSubresourceLayers imageSub;
+    imageSub.baseArrayLayer = 0;
+    imageSub.layerCount = texDesc.layerCount;
+    imageSub.mipLevel = copyOp.mipLevel;
+    imageSub.aspectMask = _GetImageAspectMaskForCopy(texDesc.usage);
+
+    VkBufferImageCopy region;
+    region.bufferImageHeight = 0; // Buffer is tightly packed, like image
+    region.bufferRowLength = 0;   // Buffer is tightly packed, like image
+    region.bufferOffset = copyOp.sourceByteOffset;
+    region.imageExtent = size;
+    region.imageOffset = origin;
+    region.imageSubresource = imageSub;
+
+    vkCmdCopyBufferToImage(
+        _commandBuffer->GetVulkanCommandBuffer(),
+        srcBuffer->GetVulkanBuffer(),
+        dstTexture->GetImage(),
+        dstTexture->GetImageLayout(),
+        /*regionCount*/1,
+        &region);
+
+    // Transition image layout back to original layout.
+    HgiVulkanTexture::TransitionImageBarrier(
+        _commandBuffer,
+        dstTexture,
+        /*oldLayout*/VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+        /*newLayout*/oldLayout,
+        /*producerAccess*/VK_ACCESS_TRANSFER_WRITE_BIT,
+        /*consumerAccess*/HgiVulkanTexture::GetDefaultAccessFlags(texDesc.usage),
+        /*producerStage*/VK_PIPELINE_STAGE_TRANSFER_BIT,
+        /*consumerStage*/VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
+        copyOp.mipLevel);
 }
 
 void
diff --git a/pxr/imaging/hgiVulkan/blitCmds.h b/pxr/imaging/hgiVulkan/blitCmds.h
index 28ca009bf4..84c9029ae9 100644
--- a/pxr/imaging/hgiVulkan/blitCmds.h
+++ b/pxr/imaging/hgiVulkan/blitCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_BLIT_CMDS_H
 #define PXR_IMAGING_HGIVULKAN_BLIT_CMDS_H
diff --git a/pxr/imaging/hgiVulkan/buffer.cpp b/pxr/imaging/hgiVulkan/buffer.cpp
old mode 100755
new mode 100644
index 4ffda17f3d..2d3c0618b6
--- a/pxr/imaging/hgiVulkan/buffer.cpp
+++ b/pxr/imaging/hgiVulkan/buffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 
diff --git a/pxr/imaging/hgiVulkan/buffer.h b/pxr/imaging/hgiVulkan/buffer.h
old mode 100755
new mode 100644
index 1ed1d129e6..acc56041fa
--- a/pxr/imaging/hgiVulkan/buffer.h
+++ b/pxr/imaging/hgiVulkan/buffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_BUFFER_H
 #define PXR_IMAGING_HGIVULKAN_BUFFER_H
diff --git a/pxr/imaging/hgiVulkan/capabilities.cpp b/pxr/imaging/hgiVulkan/capabilities.cpp
old mode 100755
new mode 100644
index 05e15de4d9..09d4cc7496
--- a/pxr/imaging/hgiVulkan/capabilities.cpp
+++ b/pxr/imaging/hgiVulkan/capabilities.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 
diff --git a/pxr/imaging/hgiVulkan/capabilities.h b/pxr/imaging/hgiVulkan/capabilities.h
old mode 100755
new mode 100644
index 8bf4c7fb81..74fc30c49c
--- a/pxr/imaging/hgiVulkan/capabilities.h
+++ b/pxr/imaging/hgiVulkan/capabilities.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_CAPABILITIES_H
 #define PXR_IMAGING_HGIVULKAN_CAPABILITIES_H
diff --git a/pxr/imaging/hgiVulkan/commandBuffer.cpp b/pxr/imaging/hgiVulkan/commandBuffer.cpp
old mode 100755
new mode 100644
index 6cdff02d7d..024b6a2918
--- a/pxr/imaging/hgiVulkan/commandBuffer.cpp
+++ b/pxr/imaging/hgiVulkan/commandBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/commandBuffer.h"
 #include "pxr/imaging/hgiVulkan/device.h"
diff --git a/pxr/imaging/hgiVulkan/commandBuffer.h b/pxr/imaging/hgiVulkan/commandBuffer.h
old mode 100755
new mode 100644
index f141083a18..a87e1d25f1
--- a/pxr/imaging/hgiVulkan/commandBuffer.h
+++ b/pxr/imaging/hgiVulkan/commandBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_COMMAND_BUFFER_H
 #define PXR_IMAGING_HGIVULKAN_COMMAND_BUFFER_H
diff --git a/pxr/imaging/hgiVulkan/commandQueue.cpp b/pxr/imaging/hgiVulkan/commandQueue.cpp
old mode 100755
new mode 100644
index 8bb99ac2c8..764b4a7db3
--- a/pxr/imaging/hgiVulkan/commandQueue.cpp
+++ b/pxr/imaging/hgiVulkan/commandQueue.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/commandBuffer.h"
 #include "pxr/imaging/hgiVulkan/commandQueue.h"
diff --git a/pxr/imaging/hgiVulkan/commandQueue.h b/pxr/imaging/hgiVulkan/commandQueue.h
old mode 100755
new mode 100644
index b8b332d011..f1d6fe1363
--- a/pxr/imaging/hgiVulkan/commandQueue.h
+++ b/pxr/imaging/hgiVulkan/commandQueue.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_COMMAND_QUEUE_H
 #define PXR_IMAGING_HGIVULKAN_COMMAND_QUEUE_H
diff --git a/pxr/imaging/hgiVulkan/computeCmds.cpp b/pxr/imaging/hgiVulkan/computeCmds.cpp
old mode 100755
new mode 100644
index 983fd3313e..cbf9704fd7
--- a/pxr/imaging/hgiVulkan/computeCmds.cpp
+++ b/pxr/imaging/hgiVulkan/computeCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/computeCmds.h"
 #include "pxr/imaging/hgiVulkan/commandBuffer.h"
diff --git a/pxr/imaging/hgiVulkan/computeCmds.h b/pxr/imaging/hgiVulkan/computeCmds.h
index ad73c35abb..6162d23f41 100644
--- a/pxr/imaging/hgiVulkan/computeCmds.h
+++ b/pxr/imaging/hgiVulkan/computeCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_COMPUTE_CMDS_H
 #define PXR_IMAGING_HGIVULKAN_COMPUTE_CMDS_H
diff --git a/pxr/imaging/hgiVulkan/computePipeline.cpp b/pxr/imaging/hgiVulkan/computePipeline.cpp
old mode 100755
new mode 100644
index 708a05a25e..20129e0966
--- a/pxr/imaging/hgiVulkan/computePipeline.cpp
+++ b/pxr/imaging/hgiVulkan/computePipeline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 
diff --git a/pxr/imaging/hgiVulkan/computePipeline.h b/pxr/imaging/hgiVulkan/computePipeline.h
old mode 100755
new mode 100644
index 78429d8fcf..a28e62a7d5
--- a/pxr/imaging/hgiVulkan/computePipeline.h
+++ b/pxr/imaging/hgiVulkan/computePipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_VULKAN_COMPUTE_PIPELINE_H
 #define PXR_IMAGING_HGI_VULKAN_COMPUTE_PIPELINE_H
diff --git a/pxr/imaging/hgiVulkan/conversions.cpp b/pxr/imaging/hgiVulkan/conversions.cpp
index ed188b95da..329fa0110b 100644
--- a/pxr/imaging/hgiVulkan/conversions.cpp
+++ b/pxr/imaging/hgiVulkan/conversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/vulkan.h"
 #include "pxr/imaging/hgiVulkan/conversions.h"
@@ -187,8 +170,10 @@ static_assert(HgiPolygonModeCount==3, "");
 static const uint32_t
 _WindingTable[HgiWindingCount][2] =
 {
-    {HgiWindingClockwise,        VK_FRONT_FACE_CLOCKWISE},
-    {HgiWindingCounterClockwise, VK_FRONT_FACE_COUNTER_CLOCKWISE}
+    // We flip the winding order in HgiVulkan. See
+    // HgiVulkanGraphicsCmds::SetViewport for details.
+    {HgiWindingClockwise,        VK_FRONT_FACE_COUNTER_CLOCKWISE},
+    {HgiWindingCounterClockwise, VK_FRONT_FACE_CLOCKWISE}
 };
 static_assert(HgiWindingCount==2, "");
 
diff --git a/pxr/imaging/hgiVulkan/conversions.h b/pxr/imaging/hgiVulkan/conversions.h
index 88a67832db..2f330b83dc 100644
--- a/pxr/imaging/hgiVulkan/conversions.h
+++ b/pxr/imaging/hgiVulkan/conversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_CONVERSIONS_H
 #define PXR_IMAGING_HGIVULKAN_CONVERSIONS_H
diff --git a/pxr/imaging/hgiVulkan/device.cpp b/pxr/imaging/hgiVulkan/device.cpp
old mode 100755
new mode 100644
index 9cd361b226..4990769b6f
--- a/pxr/imaging/hgiVulkan/device.cpp
+++ b/pxr/imaging/hgiVulkan/device.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/capabilities.h"
 #include "pxr/imaging/hgiVulkan/commandQueue.h"
diff --git a/pxr/imaging/hgiVulkan/device.h b/pxr/imaging/hgiVulkan/device.h
old mode 100755
new mode 100644
index dd50f8e14f..231cea2f82
--- a/pxr/imaging/hgiVulkan/device.h
+++ b/pxr/imaging/hgiVulkan/device.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_DEVICE_H
 #define PXR_IMAGING_HGIVULKAN_DEVICE_H
diff --git a/pxr/imaging/hgiVulkan/diagnostic.cpp b/pxr/imaging/hgiVulkan/diagnostic.cpp
index 3d209d1044..64ba485380 100644
--- a/pxr/imaging/hgiVulkan/diagnostic.cpp
+++ b/pxr/imaging/hgiVulkan/diagnostic.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/commandBuffer.h"
 #include "pxr/imaging/hgiVulkan/commandQueue.h"
diff --git a/pxr/imaging/hgiVulkan/diagnostic.h b/pxr/imaging/hgiVulkan/diagnostic.h
index f9ee7cd313..84adc09cf7 100644
--- a/pxr/imaging/hgiVulkan/diagnostic.h
+++ b/pxr/imaging/hgiVulkan/diagnostic.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_DIAGNOSTIC_H
 #define PXR_IMAGING_HGIVULKAN_DIAGNOSTIC_H
diff --git a/pxr/imaging/hgiVulkan/garbageCollector.cpp b/pxr/imaging/hgiVulkan/garbageCollector.cpp
index d1a623476e..bfe02e700f 100755
--- a/pxr/imaging/hgiVulkan/garbageCollector.cpp
+++ b/pxr/imaging/hgiVulkan/garbageCollector.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #include "pxr/imaging/hgiVulkan/buffer.h"
 #include "pxr/imaging/hgiVulkan/commandQueue.h"
 #include "pxr/imaging/hgiVulkan/computePipeline.h"
@@ -36,6 +19,7 @@
 #include "pxr/base/arch/hints.h"
 #include "pxr/base/tf/diagnostic.h"
 
+#include <algorithm>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
diff --git a/pxr/imaging/hgiVulkan/garbageCollector.h b/pxr/imaging/hgiVulkan/garbageCollector.h
old mode 100755
new mode 100644
index 73e54ee90d..a51bf3f853
--- a/pxr/imaging/hgiVulkan/garbageCollector.h
+++ b/pxr/imaging/hgiVulkan/garbageCollector.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_GARBAGE_COLLECTOR_H
 #define PXR_IMAGING_HGIVULKAN_GARBAGE_COLLECTOR_H
diff --git a/pxr/imaging/hgiVulkan/graphicsCmds.cpp b/pxr/imaging/hgiVulkan/graphicsCmds.cpp
old mode 100755
new mode 100644
index cadd089cb6..6e76681e5e
--- a/pxr/imaging/hgiVulkan/graphicsCmds.cpp
+++ b/pxr/imaging/hgiVulkan/graphicsCmds.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgi/graphicsCmdsDesc.h"
 #include "pxr/imaging/hgiVulkan/buffer.h"
@@ -101,32 +84,41 @@ HgiVulkanGraphicsCmds::SetViewport(GfVec4i const& vp)
     // Delay until the pipeline is set and the render pass has begun.
     _pendingUpdates.push_back(
         [this, vp] {
-            float offsetX = (float) vp[0];
-            float offsetY = (float) vp[1];
-            float width = (float) vp[2];
-            float height = (float) vp[3];
-
-            // Flip viewport in Y-axis, because the vertex.y position is flipped
-            // between opengl and vulkan. This also moves origin to bottom-left.
-            // Requires VK_KHR_maintenance1 extension.
-
-            // Alternatives are:
-            // 1. Multiply projection by 'inverted Y and half Z' matrix:
-            //    const GfMatrix4d clip(
-            //        1.0,  0.0, 0.0, 0.0,
-            //        0.0, -1.0, 0.0, 0.0,
-            //        0.0,  0.0, 0.5, 0.0,
-            //        0.0,  0.0, 0.5, 1.0);
-            //    projection = clip * projection;
+            const float offsetX = (float) vp[0];
+            const float offsetY = (float) vp[1];
+            const float width = (float) vp[2];
+            const float height = (float) vp[3];
+
+            // Though we continue to use an OpenGL-style projection matrix in 
+            // Storm, we choose not to flip the viewport here.
+            // We instead WANT to render an upside down image, as this makes 
+            // the handling of clip-space and downstream coordinate system 
+            // differences betwen Vulkan and OpenGL easier.
+            //
+            // For example, since framebuffers in Vulkan are y-down (versus y-up
+            // for OpenGL by default), sampling (0,0) from an AOV texture in 
+            // the shader will grab from the top left of the texture in Vulkan
+            // (versus bottom left in GL). But since we rendered the Vulkan 
+            // image upside down, this ends up being the same texel value as it 
+            // would've been for GL.
+            // Vulkan-GL differences between the value of gl_FragCoord.y and 
+            // the sign of screenspace derivatives w.r.t. to y are resolved 
+            // similarly.
+            // Rendering Vulkan upside down also means we can also flip AOVs
+            // when writing them to file as we currently do for OpenGL and get 
+            // the correct result for Vulkan, too.
+            //
+            // We do however flip the winding order for Vulkan, as otherwise
+            // the rendered geometry would be both upside down AND facing 
+            // the wrong way, as Vulkan clip-space is right-handed while
+            // OpenGL's is left-handed. This happens in 
+            // hgiVulkan/conversions.cpp and hgiVulkan/shaderGenerator.cpp.
             //
-            // 2. Adjust vertex position:
-            //    gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0;
-
             VkViewport viewport;
             viewport.x = offsetX;
-            viewport.y = offsetY + height;
+            viewport.y = offsetY;
             viewport.width = width;
-            viewport.height = -height;
+            viewport.height = height;
             viewport.minDepth = 0.0f;
             viewport.maxDepth = 1.0f;
 
@@ -600,6 +592,9 @@ HgiVulkanGraphicsCmds::_Submit(Hgi* hgi, HgiSubmitWaitType wait)
     // End render pass
     _EndRenderPass();
 
+    _viewportSet = false;
+    _scissorSet = false;
+
     HgiVulkanDevice* device = _commandBuffer->GetDevice();
     HgiVulkanCommandQueue* queue = device->GetCommandQueue();
 
@@ -652,8 +647,8 @@ HgiVulkanGraphicsCmds::_ApplyPendingUpdates()
             &beginInfo,
             contents);
 
-        // Make sure viewport and scissor are set since our HgiVulkanPipeline
-        // hardcodes one dynamic viewport and scissor.
+        // Make sure viewport and scissor are set since our
+        // HgiVulkanGraphicsPipeline hardcodes one dynamic viewport and scissor.
         if (!_viewportSet) {
             SetViewport(GfVec4i(0, 0, size[0], size[1]));
         }
@@ -676,8 +671,6 @@ HgiVulkanGraphicsCmds::_EndRenderPass()
     if (_renderPassStarted) {
         vkCmdEndRenderPass(_commandBuffer->GetVulkanCommandBuffer());
         _renderPassStarted = false;
-        _viewportSet = false;
-        _scissorSet = false;
     }
 }
 
diff --git a/pxr/imaging/hgiVulkan/graphicsCmds.h b/pxr/imaging/hgiVulkan/graphicsCmds.h
index c563c1cca5..0f6bc0b090 100644
--- a/pxr/imaging/hgiVulkan/graphicsCmds.h
+++ b/pxr/imaging/hgiVulkan/graphicsCmds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_GRAPHICS_CMDS_H
 #define PXR_IMAGING_HGIVULKAN_GRAPHICS_CMDS_H
diff --git a/pxr/imaging/hgiVulkan/graphicsPipeline.cpp b/pxr/imaging/hgiVulkan/graphicsPipeline.cpp
index 64e9d82baa..053d8d4e7d 100755
--- a/pxr/imaging/hgiVulkan/graphicsPipeline.cpp
+++ b/pxr/imaging/hgiVulkan/graphicsPipeline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/iterator.h"
@@ -139,9 +122,9 @@ HgiVulkanGraphicsPipeline::HgiVulkanGraphicsPipeline(
     vertexInput.pVertexBindingDescriptions = vertBufs.data();
     vertexInput.vertexBindingDescriptionCount = (uint32_t) vertBufs.size();
 
+    VkPipelineVertexInputDivisorStateCreateInfoEXT vertexInputDivisor =
+        {VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT};
     if (!vertBindingDivisors.empty()) {
-        VkPipelineVertexInputDivisorStateCreateInfoEXT vertexInputDivisor =
-            {VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT};
         vertexInputDivisor.pVertexBindingDivisors = vertBindingDivisors.data();
         vertexInputDivisor.vertexBindingDivisorCount =
             (uint32_t) vertBindingDivisors.size();
@@ -228,7 +211,8 @@ HgiVulkanGraphicsPipeline::HgiVulkanGraphicsPipeline(
     multisampleState.sampleShadingEnable = VK_FALSE;
     multisampleState.minSampleShading = 0.5f;
     multisampleState.alphaToCoverageEnable = ms.alphaToCoverageEnable;
-    multisampleState.alphaToOneEnable = ms.alphaToOneEnable;
+    multisampleState.alphaToOneEnable = ms.alphaToOneEnable &&
+        _device->GetDeviceCapabilities().vkDeviceFeatures.alphaToOne;
     pipeCreateInfo.pMultisampleState = &multisampleState;
 
     //
diff --git a/pxr/imaging/hgiVulkan/graphicsPipeline.h b/pxr/imaging/hgiVulkan/graphicsPipeline.h
old mode 100755
new mode 100644
index 67062cbcbf..ec4b58e05e
--- a/pxr/imaging/hgiVulkan/graphicsPipeline.h
+++ b/pxr/imaging/hgiVulkan/graphicsPipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_VULKAN_PIPELINE_H
 #define PXR_IMAGING_HGI_VULKAN_PIPELINE_H
diff --git a/pxr/imaging/hgiVulkan/hgi.cpp b/pxr/imaging/hgiVulkan/hgi.cpp
index 0b8047db1a..405c0b3b99 100755
--- a/pxr/imaging/hgiVulkan/hgi.cpp
+++ b/pxr/imaging/hgiVulkan/hgi.cpp
@@ -1,26 +1,10 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
+#include "pxr/imaging/hgi/debugCodes.h"
 #include "pxr/imaging/hgiVulkan/blitCmds.h"
 #include "pxr/imaging/hgiVulkan/buffer.h"
 #include "pxr/imaging/hgiVulkan/capabilities.h"
@@ -88,7 +72,15 @@ HgiVulkan::IsBackendSupported() const
     const uint32_t majorVersion = VK_VERSION_MAJOR(apiVersion);
     const uint32_t minorVersion = VK_VERSION_MINOR(apiVersion);
 
-    return (majorVersion >= 1) && (minorVersion >= 2);
+    bool support = (majorVersion > 1) ||
+        ((majorVersion == 1) && (minorVersion >= 2));
+    if (!support) {
+        TF_DEBUG(HGI_DEBUG_IS_SUPPORTED).Msg(
+            "HgiVulkan unsupported due to Vulkan API version: %d.%d "
+            "(must be >= 1.2)\n",
+            majorVersion, minorVersion);
+    }
+    return support;
 }
 
 /* Multi threaded */
diff --git a/pxr/imaging/hgiVulkan/hgi.h b/pxr/imaging/hgiVulkan/hgi.h
old mode 100755
new mode 100644
index 3073249c0d..d760b2e27b
--- a/pxr/imaging/hgiVulkan/hgi.h
+++ b/pxr/imaging/hgiVulkan/hgi.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_HGI_H
 #define PXR_IMAGING_HGIVULKAN_HGI_H
diff --git a/pxr/imaging/hgiVulkan/instance.cpp b/pxr/imaging/hgiVulkan/instance.cpp
index 9a40230e8e..c913669d23 100755
--- a/pxr/imaging/hgiVulkan/instance.cpp
+++ b/pxr/imaging/hgiVulkan/instance.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/instance.h"
 #include "pxr/imaging/hgiVulkan/diagnostic.h"
@@ -32,6 +15,24 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+static
+bool
+_CheckInstanceValidationLayerSupport(const char * layerName)
+{  
+    uint32_t layerCount;  
+    vkEnumerateInstanceLayerProperties(&layerCount, nullptr);  
+    std::vector<VkLayerProperties> availableLayers(layerCount);
+  
+    vkEnumerateInstanceLayerProperties(&layerCount, availableLayers.data());
+
+    for (const auto& layerProperties : availableLayers) {  
+        if (strcmp(layerName, layerProperties.layerName) == 0) {  
+            return true;
+        }  
+    }  
+
+    return false;  
+}
 
 HgiVulkanInstance::HgiVulkanInstance()
     : vkDebugMessenger(nullptr)
@@ -69,13 +70,19 @@ HgiVulkanInstance::HgiVulkanInstance()
 
     // Enable validation layers extension.
     // Requires VK_LAYER_PATH to be set.
+    const std::vector<const char*> debugLayers = {
+        "VK_LAYER_KHRONOS_validation"
+    };
     if (HgiVulkanIsDebugEnabled()) {
+        for (const auto& debugLayer : debugLayers) {
+            if (!_CheckInstanceValidationLayerSupport(debugLayer)) {
+                TF_WARN("Instance layer %s is not present, instance "
+                    "creation will fail", debugLayer);
+            }
+        }
         extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-        const char* debugLayers[] = {
-            "VK_LAYER_KHRONOS_validation"
-        };
-        createInfo.ppEnabledLayerNames = debugLayers;
-        createInfo.enabledLayerCount = (uint32_t)  TfArraySize(debugLayers);
+        createInfo.ppEnabledLayerNames = debugLayers.data();
+        createInfo.enabledLayerCount = (uint32_t)debugLayers.size();
     }
 
     createInfo.ppEnabledExtensionNames = extensions.data();
diff --git a/pxr/imaging/hgiVulkan/instance.h b/pxr/imaging/hgiVulkan/instance.h
index 39617a7809..935374ed55 100644
--- a/pxr/imaging/hgiVulkan/instance.h
+++ b/pxr/imaging/hgiVulkan/instance.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_INSTANCE_H
 #define PXR_IMAGING_HGIVULKAN_INSTANCE_H
diff --git a/pxr/imaging/hgiVulkan/pch.h b/pxr/imaging/hgiVulkan/pch.h
index c6d867fae4..eb0d1eb884 100644
--- a/pxr/imaging/hgiVulkan/pch.h
+++ b/pxr/imaging/hgiVulkan/pch.h
@@ -1,25 +1,8 @@
 //
-// Copyright 2021 Pixar
+// Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,16 +22,14 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #endif
 #include <algorithm>
-#include <assert.h>
+#include <any>
 #include <atomic>
-#include <cassert>
-#include <chrono>
 #include <cinttypes>
 #include <cmath>
-#include <crtdbg.h>
 #include <cstddef>
 #include <cstdint>
 #include <cstdlib>
@@ -55,7 +37,6 @@
 #include <deque>
 #include <float.h>
 #include <functional>
-#include <initializer_list>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -66,16 +47,13 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
 #include <ostream>
 #include <set>
-#include <shared_mutex>
-#include <sstream>
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <string>
 #include <sys/types.h>
 #include <thread>
@@ -86,42 +64,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <windows.h>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #include <shaderc/shaderc.hpp>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/spin_mutex.h>
diff --git a/pxr/imaging/hgiVulkan/pipelineCache.cpp b/pxr/imaging/hgiVulkan/pipelineCache.cpp
old mode 100755
new mode 100644
index e4acdcd3b9..537359d063
--- a/pxr/imaging/hgiVulkan/pipelineCache.cpp
+++ b/pxr/imaging/hgiVulkan/pipelineCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//_vkPipelineLayout
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 
diff --git a/pxr/imaging/hgiVulkan/pipelineCache.h b/pxr/imaging/hgiVulkan/pipelineCache.h
old mode 100755
new mode 100644
index a2384fa209..125293299d
--- a/pxr/imaging/hgiVulkan/pipelineCache.h
+++ b/pxr/imaging/hgiVulkan/pipelineCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_VULKAN_PIPELINE_CACHE_H
 #define PXR_IMAGING_HGI_VULKAN_PIPELINE_CACHE_H
diff --git a/pxr/imaging/hgiVulkan/resourceBindings.cpp b/pxr/imaging/hgiVulkan/resourceBindings.cpp
index 40f770de32..24e1cdd194 100644
--- a/pxr/imaging/hgiVulkan/resourceBindings.cpp
+++ b/pxr/imaging/hgiVulkan/resourceBindings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 
diff --git a/pxr/imaging/hgiVulkan/resourceBindings.h b/pxr/imaging/hgiVulkan/resourceBindings.h
index 869b41bc58..482d2b61d7 100644
--- a/pxr/imaging/hgiVulkan/resourceBindings.h
+++ b/pxr/imaging/hgiVulkan/resourceBindings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_VULKAN_RESOURCEBINDINGS_H
 #define PXR_IMAGING_HGI_VULKAN_RESOURCEBINDINGS_H
diff --git a/pxr/imaging/hgiVulkan/sampler.cpp b/pxr/imaging/hgiVulkan/sampler.cpp
index 9db61fcc9c..2ae2ce1cb5 100644
--- a/pxr/imaging/hgiVulkan/sampler.cpp
+++ b/pxr/imaging/hgiVulkan/sampler.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 
diff --git a/pxr/imaging/hgiVulkan/sampler.h b/pxr/imaging/hgiVulkan/sampler.h
index e7386c9826..fc3787fa1f 100644
--- a/pxr/imaging/hgiVulkan/sampler.h
+++ b/pxr/imaging/hgiVulkan/sampler.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_VULKAN_SAMPLER_H
 #define PXR_IMAGING_HGI_VULKAN_SAMPLER_H
diff --git a/pxr/imaging/hgiVulkan/shaderCompiler.cpp b/pxr/imaging/hgiVulkan/shaderCompiler.cpp
old mode 100755
new mode 100644
index 35a2fe85ff..7f285e7a6c
--- a/pxr/imaging/hgiVulkan/shaderCompiler.cpp
+++ b/pxr/imaging/hgiVulkan/shaderCompiler.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/imaging/hgiVulkan/api.h"
diff --git a/pxr/imaging/hgiVulkan/shaderCompiler.h b/pxr/imaging/hgiVulkan/shaderCompiler.h
old mode 100755
new mode 100644
index 1fa8df2dc6..6ef37c2fe9
--- a/pxr/imaging/hgiVulkan/shaderCompiler.h
+++ b/pxr/imaging/hgiVulkan/shaderCompiler.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_SHADERCOMPILER_H
 #define PXR_IMAGING_HGIVULKAN_SHADERCOMPILER_H
diff --git a/pxr/imaging/hgiVulkan/shaderFunction.cpp b/pxr/imaging/hgiVulkan/shaderFunction.cpp
old mode 100755
new mode 100644
index 60ec50da9e..9c2bffd8c7
--- a/pxr/imaging/hgiVulkan/shaderFunction.cpp
+++ b/pxr/imaging/hgiVulkan/shaderFunction.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/conversions.h"
 #include "pxr/imaging/hgiVulkan/device.h"
diff --git a/pxr/imaging/hgiVulkan/shaderFunction.h b/pxr/imaging/hgiVulkan/shaderFunction.h
old mode 100755
new mode 100644
index 4096410222..463108de65
--- a/pxr/imaging/hgiVulkan/shaderFunction.h
+++ b/pxr/imaging/hgiVulkan/shaderFunction.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_SHADERFUNCTION_H
 #define PXR_IMAGING_HGIVULKAN_SHADERFUNCTION_H
diff --git a/pxr/imaging/hgiVulkan/shaderGenerator.cpp b/pxr/imaging/hgiVulkan/shaderGenerator.cpp
index d98a38506c..dd5509e164 100644
--- a/pxr/imaging/hgiVulkan/shaderGenerator.cpp
+++ b/pxr/imaging/hgiVulkan/shaderGenerator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgiVulkan/shaderGenerator.h"
@@ -116,14 +99,16 @@ HgiVulkanShaderGenerator::HgiVulkanShaderGenerator(
             _shaderLayoutAttributes.emplace_back(
                 "layout (fractional_odd_spacing) in;\n");
         }
+        // We flip the winding order in HgiVulkan. See
+        // HgiVulkanGraphicsCmds::SetViewport for details.
         if (descriptor.tessellationDescriptor.ordering ==
                 HgiShaderFunctionTessellationDesc::Ordering::CW) {
             _shaderLayoutAttributes.emplace_back(
-                "layout (cw) in;\n");
+                "layout (ccw) in;\n");
         } else if (descriptor.tessellationDescriptor.ordering ==
                 HgiShaderFunctionTessellationDesc::Ordering::CCW) {
             _shaderLayoutAttributes.emplace_back(
-                "layout (ccw) in;\n");
+                "layout (cw) in;\n");
         }
     } else if (descriptor.shaderStage == HgiShaderStageGeometry) {
         if (descriptor.geometryDescriptor.inPrimitiveType ==
@@ -431,16 +416,21 @@ HgiVulkanShaderGenerator::_WriteInOuts(
             }
         }
 
-        // If a location has been specified then add it to the attributes.
-        const int32_t locationIndex =
-            param.location >= 0
-            ? param.location
-            : (in_qualifier ? _inLocationIndex++ : _outLocationIndex++);
-
-        const HgiShaderSectionAttributeVector attrs {
-            HgiShaderSectionAttribute{
-                "location", std::to_string(locationIndex) }
-        };
+        // If a location or interstage slot has been specified then add it to 
+        // the attributes.
+        HgiShaderSectionAttributeVector attrs;
+        if (param.location != -1) {
+            // If a location has been specified then add it to the attributes.
+            attrs.push_back({"location", std::to_string(param.location)});
+        } else if (param.interstageSlot != -1) {
+            // For interstage parameters use the interstageSlot for location.
+            attrs.push_back({"location", std::to_string(param.interstageSlot)});
+        } else {
+            // Otherwise use shader generator's counter sytem.
+            const int32_t locationIndex =
+                in_qualifier ? _inLocationIndex++ : _outLocationIndex++;
+            attrs.push_back({"location", std::to_string(locationIndex)});
+        }
 
         CreateShaderSection<HgiVulkanMemberShaderSection>(
             paramName,
@@ -491,10 +481,15 @@ HgiVulkanShaderGenerator::_WriteInOutBlocks(
             }
         }
 
-        const HgiShaderSectionAttributeVector attrs {
-            HgiShaderSectionAttribute{
-                "location", std::to_string(locationIndex) }
-        };
+        // If interstage slot has been specified then add it to the attributes.
+        HgiShaderSectionAttributeVector attrs;
+        if (p.interstageSlot != -1) {
+            // For interstage parameters use the interstageSlot for location.
+            attrs.push_back({"location", std::to_string(p.interstageSlot)});
+        } else {
+            // Otherwise use shader generator's counter sytem.
+            attrs.push_back({"location", std::to_string(locationIndex)});
+        }
 
         CreateShaderSection<HgiVulkanInterstageBlockShaderSection>(
             p.blockName,
diff --git a/pxr/imaging/hgiVulkan/shaderGenerator.h b/pxr/imaging/hgiVulkan/shaderGenerator.h
index 028a55e187..6d16286811 100644
--- a/pxr/imaging/hgiVulkan/shaderGenerator.h
+++ b/pxr/imaging/hgiVulkan/shaderGenerator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGIVULKAN_SHADERGENERATOR_H
diff --git a/pxr/imaging/hgiVulkan/shaderProgram.cpp b/pxr/imaging/hgiVulkan/shaderProgram.cpp
old mode 100755
new mode 100644
index 509d82c1e6..00fc9ebec6
--- a/pxr/imaging/hgiVulkan/shaderProgram.cpp
+++ b/pxr/imaging/hgiVulkan/shaderProgram.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/shaderProgram.h"
 #include "pxr/imaging/hgiVulkan/shaderFunction.h"
diff --git a/pxr/imaging/hgiVulkan/shaderProgram.h b/pxr/imaging/hgiVulkan/shaderProgram.h
old mode 100755
new mode 100644
index 768bbb0481..0303ce9531
--- a/pxr/imaging/hgiVulkan/shaderProgram.h
+++ b/pxr/imaging/hgiVulkan/shaderProgram.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_SHADERPROGRAM_H
 #define PXR_IMAGING_HGIVULKAN_SHADERPROGRAM_H
diff --git a/pxr/imaging/hgiVulkan/shaderSection.cpp b/pxr/imaging/hgiVulkan/shaderSection.cpp
index 068fc207c3..437d2c8bcc 100644
--- a/pxr/imaging/hgiVulkan/shaderSection.cpp
+++ b/pxr/imaging/hgiVulkan/shaderSection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hgiVulkan/shaderSection.h"
diff --git a/pxr/imaging/hgiVulkan/shaderSection.h b/pxr/imaging/hgiVulkan/shaderSection.h
index f80c394f48..1c14a4152b 100644
--- a/pxr/imaging/hgiVulkan/shaderSection.h
+++ b/pxr/imaging/hgiVulkan/shaderSection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HGIVULKAN_SHADERSECTION_H
diff --git a/pxr/imaging/hgiVulkan/spirv_reflect.cpp b/pxr/imaging/hgiVulkan/spirv_reflect.cpp
index 5a25b5bc68..b2862df17d 100644
--- a/pxr/imaging/hgiVulkan/spirv_reflect.cpp
+++ b/pxr/imaging/hgiVulkan/spirv_reflect.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/spirv_reflect.h"
 
diff --git a/pxr/imaging/hgiVulkan/spirv_reflect.h b/pxr/imaging/hgiVulkan/spirv_reflect.h
index 31302e51ea..b2779079a5 100644
--- a/pxr/imaging/hgiVulkan/spirv_reflect.h
+++ b/pxr/imaging/hgiVulkan/spirv_reflect.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_SPIRV_REFLECT_H
 #define PXR_IMAGING_HGIVULKAN_SPIRV_REFLECT_H
diff --git a/pxr/imaging/hgiVulkan/testenv/testHgiVulkan.cpp b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan.cpp
new file mode 100644
index 0000000000..555f652815
--- /dev/null
+++ b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan.cpp
@@ -0,0 +1,1665 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/imaging/hgi/blitCmdsOps.h"
+#include "pxr/imaging/hgi/computeCmdsDesc.h"
+#include "pxr/imaging/hgiVulkan/blitCmds.h"
+#include "pxr/imaging/hgiVulkan/commandBuffer.h"
+#include "pxr/imaging/hgiVulkan/commandQueue.h"
+#include "pxr/imaging/hgiVulkan/device.h"
+#include "pxr/imaging/hgiVulkan/garbageCollector.h"
+#include "pxr/imaging/hgiVulkan/hgi.h"
+#include "pxr/imaging/hgiVulkan/instance.h"
+#include "pxr/imaging/hgiVulkan/graphicsCmds.h"
+#include "pxr/imaging/hgiVulkan/graphicsPipeline.h"
+#include "pxr/imaging/hgiVulkan/shaderCompiler.h"
+#include "pxr/imaging/hgiVulkan/shaderFunction.h"
+#include "pxr/imaging/hio/image.h"
+
+#include "pxr/base/tf/errorMark.h"
+#include <iostream>
+#include <string>
+#include <fstream>
+#include <string>
+#include <thread>
+#include <vector>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+static const int _imgSize = 512;
+static const HgiFormat _imgFormat = HgiFormatUNorm8Vec4;
+static const HioFormat _imgHioFormat = HioFormatUNorm8Vec4;
+
+static bool
+TestVulkanInstance(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanInstance* instance = hgiVulkan.GetVulkanInstance();
+    if (!instance) {
+        return false;
+    }
+
+    // Make sure debug fn ptr were found
+    if (!instance->vkDebugMessenger || 
+        !instance->vkCreateDebugUtilsMessengerEXT ||
+        !instance->vkDestroyDebugUtilsMessengerEXT)
+    {
+        TF_CODING_ERROR("Instance function ptrs failed");
+        return false;
+    }
+
+    // Make sure vulkan instance could be created
+    if (!instance->GetVulkanInstance()) {
+        TF_CODING_ERROR("vkInstance failed");
+        return false;
+    }
+    return true;
+}
+
+static bool
+TestVulkanDevice(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    // Make sure fn ptr were found
+    if (!device->vkCreateRenderPass2KHR ||
+        !device->vkCmdBeginDebugUtilsLabelEXT ||
+        !device->vkCmdEndDebugUtilsLabelEXT ||
+        !device->vkCmdInsertDebugUtilsLabelEXT ||
+        !device->vkSetDebugUtilsObjectNameEXT) {
+        TF_CODING_ERROR("Device function ptrs failed");
+        return false;
+    }
+
+    // Make sure vulkan device could be created
+    if (!device->GetVulkanDevice() || !device->GetVulkanMemoryAllocator()) {
+        TF_CODING_ERROR("vkDevice failed");
+        return false;
+    }
+
+    return true;
+}
+
+static bool
+TestVulkanShaderCompiler(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    // Test push constants, scalar buffer layout, storage buffer, sampler arrays
+    static const char* frag = 
+        "#version 450 \n"
+        "#extension GL_EXT_nonuniform_qualifier : require \n"
+        "#extension GL_EXT_scalar_block_layout : require \n"
+        "#extension GL_EXT_shader_explicit_arithmetic_types_int64 : require \n"
+        ""
+        "layout(push_constant) uniform PushConstantBuffer { \n"
+        "    layout(offset = 0) int textureIndex; \n"
+        "} pushConstants; \n"
+        ""
+        "layout (scalar, set=0, binding=0) buffer StorageBuffer { \n"
+        "    vec3 value[]; \n"
+        "} storageBuffer; \n"
+        ""
+        "layout(set=0, binding=1) uniform sampler2DArray samplers2D[]; \n"
+        ""
+        "layout(location = 0) in vec2 texcoordIn; \n"
+        "layout(location = 0) out vec4 outputColor; \n"
+        ""
+        "layout(early_fragment_tests) in; \n"
+        ""
+        "void main() { \n"
+        "    int idx = pushConstants.textureIndex;\n"
+        "    outputColor = texture( \n"
+        "        samplers2D[nonuniformEXT(idx)], vec3(texcoordIn, 0)); \n"
+        "    outputColor.a = storageBuffer.value[0].x;"
+        "} \n";
+
+    std::vector<unsigned int> spirv;
+    std::string errors;
+    bool result = HgiVulkanCompileGLSL(
+        "TestFrag",
+        &frag, 1, 
+        HgiShaderStageFragment, 
+        &spirv, 
+        &errors);
+
+    if (!result || !errors.empty() || spirv.empty()) {
+        TF_CODING_ERROR("Vulkan shader compiler error(s):\n%s", errors.c_str());
+        return false;
+    }
+
+    return true;
+}
+
+static bool
+TestVulkanCommandQueue(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    // Make sure we have a valid graphics device queue
+    HgiVulkanCommandQueue* queue = device->GetCommandQueue();
+    if (!queue || !queue->GetVulkanGraphicsQueue()) {
+        TF_CODING_ERROR("vkQueue failed");
+        return false;
+    }
+
+    bool result = true;
+    hgiVulkan.StartFrame();
+
+    // The goal of the below test is validate that when Cmds objects are created
+    // on the main thread, they can be safely used in a secondary thread.
+    // We expect that the command buffer that the Cmds object acquires will not
+    // be acquired until the first command is recorded so we can be sure the
+    // command buffer is grabbed from the secondary threads command pool.
+    // Hgi states that each backend must support recording commands on threads.
+    // We also test various internal state of command queue and its ability
+    // to reuse command buffers when they have been consumed by the gpu.
+
+    HgiBlitCmdsUniquePtr blitCmdsA = hgiVulkan.CreateBlitCmds();
+    HgiBlitCmdsUniquePtr blitCmdsB = hgiVulkan.CreateBlitCmds();
+    HgiBlitCmdsUniquePtr blitCmdsY = hgiVulkan.CreateBlitCmds();
+    HgiBlitCmdsUniquePtr blitCmdsZ = hgiVulkan.CreateBlitCmds();
+
+    // We perform two jobs on each thread. The atomic keeps track of progress
+    enum class Job {FirstJob, SecondJob, Wait, Quit};
+    std::atomic<Job> status0{Job::Wait};
+    std::atomic<Job> status1{Job::Wait};
+
+    auto work = [](
+        HgiBlitCmds* cmds0,
+        HgiBlitCmds* cmds1, 
+        std::atomic<Job>* status) 
+    {
+        Job job = Job::Wait;
+        while(job != Job::Quit) {
+            job = status->load();
+            // Perform first job on thread and wait (spin) until next job
+            if (job==Job::FirstJob) {
+                cmds0->PushDebugGroup("First Job");
+                cmds0->PopDebugGroup();
+                status->store(Job::Wait);
+            }
+            // Perform second job and quit thread.
+            if (job==Job::SecondJob) {
+                cmds1->PushDebugGroup("Second Job");
+                cmds1->PopDebugGroup();
+                status->store(Job::Quit);
+            }
+        }
+    };
+
+    // Start job threads
+    std::thread thread0(work, blitCmdsA.get(), blitCmdsB.get(), &status0);
+    std::thread thread1(work, blitCmdsY.get(), blitCmdsZ.get(), &status1);
+
+    // Begin first job on both threads
+    status0.store(Job::FirstJob);
+    status1.store(Job::FirstJob);
+
+    // Wait for first job to finish recording.
+    while(status0.load() != Job::Wait || status1.load() != Job::Wait);
+
+    // After recoding we expect the cmd buffers to be in 'IsRecording' mode.
+    // It will remain in this mode until we have used SubmitCmds and the
+    // command buffer has been consumed by the GPU.
+    HgiVulkanBlitCmds* vkBlitCmdsA = 
+        static_cast<HgiVulkanBlitCmds*>(blitCmdsA.get());
+    HgiVulkanCommandBuffer* cbA = vkBlitCmdsA->GetCommandBuffer();
+
+    HgiVulkanBlitCmds* vkBlitCmdsY = 
+        static_cast<HgiVulkanBlitCmds*>(blitCmdsY.get());
+    HgiVulkanCommandBuffer* cbY = vkBlitCmdsY->GetCommandBuffer();
+
+    if (!cbA->IsInFlight() || !cbY->IsInFlight()) {
+        TF_CODING_ERROR("Command buffer is not in-flight");
+        result = false;
+    }
+
+    // After having finished the first job on two threads we expect that
+    // two commands buffers have been used. We expect the first in-flight bits
+    // to have been switched on, indidcating that two commands buffers are
+    // in-flight. This is important for garbage collection.
+    uint64_t inflightBits1 = queue->GetInflightCommandBuffersBits();
+    uint64_t expectedBits1 = (1 << 0) | (1 << 1);
+    if (inflightBits1 != expectedBits1) {
+        TF_CODING_ERROR("Inflight bits invalid (1)");
+        result = false;
+    }
+
+    // Similarly we expect the command buffers 'inflightId` to be set.
+    // We can't be sure if the command buffer A received the first inflight id
+    // or the second. It depends on what job thread got to the atomic first.
+    // One of them will be id 0 and one will be id 1.
+    if (cbA->GetInflightId() == cbY->GetInflightId()) {
+        TF_CODING_ERROR("Inflight id invalid (1)");
+        result = false;
+    }
+
+    // Submit the first job commands of both threads.
+    // After submitting, we cannot reuse those Hgi***Cmds.
+    hgiVulkan.SubmitCmds(blitCmdsA.get());
+    hgiVulkan.SubmitCmds(blitCmdsY.get());
+
+    // Wait for all command buffers to have been consumed before starting
+    // the second job. Normally we would not do this as it stalls the CPU and
+    // starves the GPU. But we do it here to test if the command buffers of
+    // the first job get reused for the second. They should be because by
+    // waiting for the device to finish, they should be available again.
+    device->WaitForIdle();
+
+    // EndFrame resets consumed command buffer so they can be reused.
+    hgiVulkan.EndFrame();
+
+    // Begin second job on both threads.
+    status0.store(Job::SecondJob);
+    status1.store(Job::SecondJob);
+
+    // Wait for second job to finish.
+    while(status0.load() != Job::Quit || status1.load() != Job::Quit);
+
+    // Job threads are done.
+    thread0.join();
+    thread1.join();
+
+    // We submit the second job's commands buffer directly to the queue.
+    // Normally they are submitted via Hgi::SubmitCmds, but here we want to
+    // test the 'WAIT' feature to block until all command buffers have been
+    // consumed.
+    HgiVulkanBlitCmds* vkBlitCmdsB = 
+        static_cast<HgiVulkanBlitCmds*>(blitCmdsB.get());
+    HgiVulkanBlitCmds* vkBlitCmdsZ = 
+        static_cast<HgiVulkanBlitCmds*>(blitCmdsZ.get());
+
+    queue->SubmitToQueue(vkBlitCmdsB->GetCommandBuffer(), 
+        HgiSubmitWaitTypeWaitUntilCompleted);
+    queue->SubmitToQueue(vkBlitCmdsZ->GetCommandBuffer(), 
+        HgiSubmitWaitTypeWaitUntilCompleted);
+
+    // Since we used WaitForIdle after the first job, we expect the vulkan
+    // command buffer of the first and second jobs to be the same.
+    // However, we don't know for sure which thread started its second job
+    // first, so we account for that.
+    VkCommandBuffer a=vkBlitCmdsA->GetCommandBuffer()->GetVulkanCommandBuffer();
+    VkCommandBuffer y=vkBlitCmdsY->GetCommandBuffer()->GetVulkanCommandBuffer();
+    VkCommandBuffer b=vkBlitCmdsB->GetCommandBuffer()->GetVulkanCommandBuffer();
+    VkCommandBuffer z=vkBlitCmdsZ->GetCommandBuffer()->GetVulkanCommandBuffer();
+
+    bool reused = (a==b || a==z) && (y==b || y==z);
+    if (!reused) {
+        TF_CODING_ERROR("Command buffers were not reused");
+        result = false;
+    }
+
+    // Since we used WaitForIdle after the first job, we expect that the
+    // in-flight bits of the first job have been reset. We also expect that
+    // two new bits have been flagged as in-flight.
+    // So every time a command buffer is reused for recording, it will receive
+    // a new inflight id. This makes sense for garbage collection, because we
+    // only want to delay object destruction for the command buffers that were
+    // in-flight at the time of the DestroyObject request. If the command buffer
+    // is later reused, it will not have the same objects in-use and so a new
+    // bit is issued for the new round of recording.
+    uint64_t inflightBits2 = queue->GetInflightCommandBuffersBits();
+    uint64_t expectedBits2 = (1 << 2) | (1 << 3);
+    if (inflightBits2 != expectedBits2) {
+        TF_CODING_ERROR("Inflight bits invalid (2)");
+        result = false;
+    }
+
+    HgiVulkanCommandBuffer* cbB = vkBlitCmdsB->GetCommandBuffer();
+    HgiVulkanCommandBuffer* cbZ = vkBlitCmdsZ->GetCommandBuffer();
+    if (cbB->GetInflightId() == cbZ->GetInflightId() && 
+        cbB->GetInflightId() > 1 && cbZ->GetInflightId() > 1) {
+        TF_CODING_ERROR("Inflight id invalid (2)");
+        result = false;
+    }
+
+    // The commands buffers of all jobs should be consumed by now and we expect
+    // the gpu device to be idle. But for good measure, make absolutely sure.
+    device->WaitForIdle();
+    return result;
+}
+
+static bool
+TestVulkanGarbageCollection(HgiVulkan& hgiVulkan)
+{
+    // The goal of the below test is to verify that garbage collection works
+    // correctly. Destruction of objects is delayed until the in-flight command
+    // buffers have been consumed by the GPU.
+
+    // Create a second Hgi to test that the thread_local setup in the
+    // garbage collector works correctly when multiple Hgi are in play.
+    // The garbage collector uses statics / thread_local storage.
+    HgiVulkan hgiVulkan2;
+
+    // Create two shaders for us to delete via garbage collection
+    HgiShaderFunctionDesc desc;
+    desc.shaderStage = HgiShaderStageCompute;
+    desc.shaderCode = 
+        "void main() { \n"
+        "   bool empty = true; \n"
+        "} \n";
+
+    desc.debugName = "Shader0";
+    HgiShaderFunctionHandle shader0 = hgiVulkan2.CreateShaderFunction(desc);
+    if (!shader0 || !shader0->IsValid()) {
+        std::string const& error = shader0->GetCompileErrors();
+        TF_CODING_ERROR("TestVulkanGarbageCollection failed %s", error.c_str());
+        return false;
+    }
+
+    desc.debugName = "Shader1";
+    HgiShaderFunctionHandle shader1 = hgiVulkan2.CreateShaderFunction(desc);
+    if (!shader1 || !shader1->IsValid()) {
+        std::string const& error = shader1->GetCompileErrors();
+        TF_CODING_ERROR("TestVulkanGarbageCollection failed %s", error.c_str());
+        return false;
+    }
+
+    // Store the vulkan handle of shader1 for later comparison
+    HgiVulkanShaderFunction* vkShader1 = 
+        static_cast<HgiVulkanShaderFunction*>(shader1.Get());
+    VkShaderModule shader1VkModule = vkShader1->GetShaderModule();
+
+    // Create two BlitCmds.
+    HgiBlitCmdsUniquePtr blitCmds0 = hgiVulkan2.CreateBlitCmds();
+    HgiBlitCmdsUniquePtr blitCmds1 = hgiVulkan2.CreateBlitCmds();
+
+    // Start recording commands in BlitCmds0.
+    // This means the command buffer inside the Cmds is now 'in-flight'.
+    blitCmds0->PushDebugGroup("BlitCmds0");
+    blitCmds0->PopDebugGroup();
+
+    // Schedule destruction of the first shader.
+    // This obj now has a 'dependency' on the BlitCmds0, because it's in-flight.
+    // It will only be destroyed once blitCmds0 has been consumed by GPU.
+    hgiVulkan2.DestroyShaderFunction(&shader0);
+
+    // Start recording commands in BlitCmds1.
+    // This means the command buffer inside the Cmds is now 'in-flight'.
+    blitCmds1->PushDebugGroup("BlitCmds1");
+    blitCmds1->PopDebugGroup();
+
+    // Schedule destruction of the second shader.
+    // This obj now has a 'dependency' on the in-flight BlitCmds0 AND BlitCmds1,
+    // because both Cmds are still in-flight (none of have consumed yet).
+    hgiVulkan2.DestroyShaderFunction(&shader1);
+
+    // shader0 and shader1 should now we waiting for destruction in collector.
+    HgiVulkanGarbageCollector* gc = hgiVulkan2.GetGarbageCollector();
+    HgiVulkanShaderFunctionVector* shaderGarbage0 = gc->GetShaderFunctionList();
+    if (shaderGarbage0->size() != 2) {
+        TF_CODING_ERROR("We expected two objects in garbage collector");
+        return false;
+    }
+
+    // Submit BlitCmds0 to queue for GPU consumption and wait for completion.
+    hgiVulkan2.SubmitCmds(blitCmds0.get());
+    HgiVulkanDevice* device = hgiVulkan2.GetPrimaryDevice();
+    device->WaitForIdle();
+
+    // If there are no calls to Hgi::StartFrame then the garbage collector runs
+    // after SubmitCmds. So we submit another BlitCmds to trigger the garbage
+    // collector to run. Which should then cause shader0 to be destroyed since
+    // it was waiting on BlitCmds0 to no longer be  in-flight.
+    HgiBlitCmdsUniquePtr blitCmdsX = hgiVulkan2.CreateBlitCmds();
+    blitCmdsX->PushDebugGroup("BlitCmdsX");
+    blitCmdsX->PopDebugGroup();
+    hgiVulkan2.SubmitCmds(blitCmdsX.get());
+
+    // We now expect the garbage collector to have run and shader0 to be have
+    // been destroyed. Shader1 should still be in the garbage collector since
+    // BlitCmds1 has not been consumed yet.
+    HgiVulkanShaderFunctionVector* shaderGarbage1 = gc->GetShaderFunctionList();
+    if (shaderGarbage1->size() != 1) {
+        TF_CODING_ERROR("We expected one object in garbage collector");
+        return false;
+    }
+
+    if (shader1VkModule != shaderGarbage1->front()->GetShaderModule()) {
+        TF_CODING_ERROR("We expected shader1 in garbage collector");
+        return false;
+    }
+
+    // Create and destroy another object but in the original Hgi this time.
+    desc.debugName = "ShaderOriginalHgi";
+    HgiShaderFunctionHandle shaderOrg = hgiVulkan.CreateShaderFunction(desc);
+    if (!shaderOrg || !shaderOrg->IsValid()) {
+        std::string const& error = shaderOrg->GetCompileErrors();
+        TF_CODING_ERROR("TestVulkanGarbageCollection failed %s", error.c_str());
+        return false;
+    }
+    hgiVulkan.DestroyShaderFunction(&shaderOrg);
+
+    // We expected two objects in the garbage collector (one for each Hgi)
+    HgiVulkanShaderFunctionVector* shaderGcOrg = gc->GetShaderFunctionList();
+    if (shaderGcOrg->size() != 2) {
+        TF_CODING_ERROR("We expected two objects in garbage collector");
+        return false;
+    }
+
+    // Submit BlitCmds1 to queue for GPU consumption and wait for completion.
+    hgiVulkan2.SubmitCmds(blitCmds1.get());
+    device->WaitForIdle();
+
+    // All command buffers are expected to have been consumed since we
+    // WaitForIdle above. Resetting them should allow the garbage collector
+    // below to destroy all remaining objects.
+    device->GetCommandQueue()->ResetConsumedCommandBuffers();
+    if (device->GetCommandQueue()->GetInflightCommandBuffersBits() != 0) {
+        TF_CODING_ERROR("Not all command buffers were reset");
+        return false;
+    }
+
+    // Call EndFrame to trigger garbage collection (alternate to SubmitCmds).
+    // This only clears the garbage of the devices of hgiVulkan2.
+    hgiVulkan2.StartFrame();
+    hgiVulkan2.EndFrame();
+
+    HgiVulkanShaderFunctionVector* shaderGarbageEnd =
+        gc->GetShaderFunctionList();
+    if (shaderGarbageEnd->size() != 1) {
+        TF_CODING_ERROR("We expected the object of the original Hgi to "
+                        "remain in the garbage collector.");
+        return false;
+    }
+
+    // Call EndFrame to trigger garbage collection of the original Hgi.
+    // This should now remove the 'shaderOrg' object from garbage collector.
+    hgiVulkan.StartFrame();
+    hgiVulkan.EndFrame();
+
+    HgiVulkanShaderFunctionVector* shaderGarbageEndOrg =
+        gc->GetShaderFunctionList();
+    if (!shaderGarbageEndOrg->empty()) {
+        TF_CODING_ERROR("We expected the garbage collector to be empty");
+        return false;
+    }
+
+    return true;
+}
+
+static bool
+TestVulkanBuffer(HgiVulkan& hgiVulkan)
+{
+    // The goal of this test is to validate vulkan buffer creation and verify
+    // data is uploaded correctly.
+
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    hgiVulkan.StartFrame();
+
+    // Create test data and buffer descriptor
+    std::vector<uint32_t> blob(16, 123);
+    HgiBufferDesc desc;
+    desc.debugName = "TestBuffer";
+    desc.byteSize = blob.size() * sizeof(blob[0]);
+    desc.initialData = blob.data();
+    desc.usage = HgiBufferUsageStorage;
+
+    // Create the buffer
+    HgiBufferHandle buffer = hgiVulkan.CreateBuffer(desc);
+    if (!buffer) {
+        TF_CODING_ERROR("Invalid buffer");
+        return false;
+    }
+
+    if (buffer->GetByteSizeOfResource() != desc.byteSize) {
+        TF_CODING_ERROR("Incorrect GetByteSizeOfResource");
+        return false;
+    }
+
+    // Buffer data is uploaded via 'staging buffers'.
+    // A staging buffer then transfers the data to the device-local gpu buffer.
+    // This transfer happens via (internal) resource command buffers.
+    // The resource command buffers are submitted before Hgi*Cmds are submitted.
+    // So we need to submit at least one Hgi*Cmds before the transfer completes.
+    // We want a GpuToCpu read-back anyway, so that works out ok.
+    std::vector<uint32_t> readbackBlob(blob.size(), 0);
+
+    HgiBufferGpuToCpuOp copyOp;
+    copyOp.byteSize = desc.byteSize;
+    copyOp.cpuDestinationBuffer = &readbackBlob[0];
+    copyOp.destinationByteOffset = 0;
+    copyOp.gpuSourceBuffer = buffer;
+    copyOp.sourceByteOffset = 0;
+
+    HgiBlitCmdsUniquePtr blitCmds = hgiVulkan.CreateBlitCmds();
+    blitCmds->CopyBufferGpuToCpu(copyOp);
+
+    // Submit BlitCmds, this should automatically trigger the submission of
+    // the internal resource command buffer(s) that has recorded the transfer
+    // of the staging buffer data to the device-local gpu buffer.
+    hgiVulkan.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    if (readbackBlob != blob) {
+        TF_CODING_ERROR("Read back of initialData failed");
+        return false;
+    }
+
+    // Write new data into CPU staging area
+    std::vector<uint32_t> stagingBlob(blob.size(), 456);
+    void* cpuAddress = buffer->GetCPUStagingAddress();
+    memcpy(cpuAddress, stagingBlob.data(), desc.byteSize);
+
+    // Schedule copy from staging area to GPU device-local buffer.
+    HgiBufferCpuToGpuOp transferOp;
+    transferOp.byteSize = desc.byteSize;
+    transferOp.cpuSourceBuffer = cpuAddress;
+    transferOp.sourceByteOffset = 0;
+    transferOp.destinationByteOffset = 0;
+    transferOp.gpuDestinationBuffer = buffer;
+
+    HgiBlitCmdsUniquePtr blitCmds2 = hgiVulkan.CreateBlitCmds();
+    blitCmds2->CopyBufferCpuToGpu(transferOp);
+    hgiVulkan.SubmitCmds(blitCmds2.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    std::vector<uint32_t> transferBackBlob(blob.size(), 0);
+
+    // Read back the transfer to confirm it worked
+    HgiBufferGpuToCpuOp copyOp2;
+    copyOp2.byteSize = desc.byteSize;
+    copyOp2.cpuDestinationBuffer = &transferBackBlob[0];
+    copyOp2.destinationByteOffset = 0;
+    copyOp2.gpuSourceBuffer = buffer;
+    copyOp2.sourceByteOffset = 0;
+
+    HgiBlitCmdsUniquePtr blitCmds3 = hgiVulkan.CreateBlitCmds();
+    blitCmds3->CopyBufferGpuToCpu(copyOp2);
+    hgiVulkan.SubmitCmds(blitCmds3.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    if (transferBackBlob != stagingBlob) {
+        TF_CODING_ERROR("Transfer readback failed");
+        return false;
+    }
+
+    // Put buffer in garbage collector
+    device->WaitForIdle();
+    hgiVulkan.DestroyBuffer(&buffer);
+
+    // End frame garbage collection of buffer.
+    // This should cleanup the buffer itself AND any internal staging buffers.
+    hgiVulkan.EndFrame();
+
+    return true;
+}
+
+static bool
+TestVulkanTexture(HgiVulkan& hgiVulkan)
+{
+    // The goal of this test is to validate vulkan texture creation and verify
+    // data is uploaded correctly.
+
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    hgiVulkan.StartFrame();
+
+    // Create the texture
+    HgiTextureDesc desc;
+    desc.debugName = "Debug Texture";
+    desc.dimensions = GfVec3i(32, 32, 1);
+    desc.format = HgiFormatFloat32Vec4;
+    desc.type = HgiTextureType2D;
+    desc.usage = HgiTextureUsageBitsColorTarget | HgiTextureUsageBitsShaderRead;
+
+    size_t numTexels = 
+        desc.dimensions[0] * desc.dimensions[1] * desc.dimensions[2];
+    desc.pixelsByteSize = HgiGetDataSizeOfFormat(desc.format) * numTexels;
+
+    std::vector<float> pixels(numTexels, 0.123f);
+    desc.initialData = pixels.data();
+
+    HgiTextureHandle texture = hgiVulkan.CreateTexture(desc);
+    if (!texture) {
+        TF_CODING_ERROR("Invalid texture");
+        return false;
+    }
+
+    // Create a second texture VIEW of the first texture's data
+    HgiTextureViewDesc viewDesc;
+    viewDesc.debugName = "Debug TextureView";
+    viewDesc.format = desc.format;
+    viewDesc.sourceTexture = texture;
+
+    HgiTextureViewHandle textureView = hgiVulkan.CreateTextureView(viewDesc);
+    if (!textureView) {
+        TF_CODING_ERROR("Invalid texture view");
+        return false;
+    }
+
+    // Read back the initial pixels by using the TextureView
+    std::vector<float> readBack(numTexels, 0);
+    HgiTextureGpuToCpuOp readBackOp;
+    readBackOp.cpuDestinationBuffer = &readBack[0];
+    readBackOp.destinationBufferByteSize= readBack.size() * sizeof(readBack[0]);
+    readBackOp.destinationByteOffset = 0;
+    readBackOp.gpuSourceTexture = textureView->GetViewTexture();
+    readBackOp.mipLevel = 0;
+    readBackOp.sourceTexelOffset = GfVec3i(0);
+
+    HgiBlitCmdsUniquePtr blitCmds = hgiVulkan.CreateBlitCmds();
+    blitCmds->CopyTextureGpuToCpu(readBackOp);
+    hgiVulkan.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    if (pixels != readBack) {
+        TF_CODING_ERROR("initialData readback failed");
+        return false;
+    }
+
+    // Upload some new pixels to the texture using the TextureView followed
+    // by reading back the results.
+    std::vector<float> upload(numTexels, 0.456f);
+    HgiTextureCpuToGpuOp uploadOp;
+    uploadOp.bufferByteSize = upload.size() * sizeof(upload[0]);
+    uploadOp.cpuSourceBuffer = upload.data();
+    uploadOp.destinationTexelOffset = GfVec3i(0);
+    uploadOp.gpuDestinationTexture = textureView->GetViewTexture();
+    uploadOp.mipLevel = 0;
+
+    HgiBlitCmdsUniquePtr blitCmds2 = hgiVulkan.CreateBlitCmds();
+    blitCmds2->CopyTextureCpuToGpu(uploadOp);
+
+    HgiTextureGpuToCpuOp readBackOp2;
+    readBackOp2.cpuDestinationBuffer = &readBack[0];
+    readBackOp2.destinationBufferByteSize=readBack.size() * sizeof(readBack[0]);
+    readBackOp2.destinationByteOffset = 0;
+    readBackOp2.gpuSourceTexture = textureView->GetViewTexture();
+    readBackOp2.mipLevel = 0;
+    readBackOp2.sourceTexelOffset = GfVec3i(0);
+
+    blitCmds2->CopyTextureGpuToCpu(readBackOp2);
+
+    hgiVulkan.SubmitCmds(blitCmds2.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    if (upload != readBack) {
+        TF_CODING_ERROR("upload readback failed");
+        return false;
+    }
+
+    // Generate mips
+    HgiBlitCmdsUniquePtr blitCmds3 = hgiVulkan.CreateBlitCmds();
+    blitCmds3->GenerateMipMaps(texture);
+    hgiVulkan.SubmitCmds(blitCmds3.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    // Cleanup
+    hgiVulkan.DestroyTextureView(&textureView);
+    hgiVulkan.DestroyTexture(&texture);
+
+    // End frame garbage collection of texture.
+    // This should cleanup the texture itself AND any internal staging buffers.
+    hgiVulkan.EndFrame();
+
+    return true;
+}
+
+static bool
+TestVulkanPipeline(HgiVulkan& hgiVulkan)
+{
+    hgiVulkan.StartFrame();
+
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    // Create a vertex program
+    HgiShaderFunctionDesc shaderDesc;
+    shaderDesc.shaderStage = HgiShaderStageVertex;
+    shaderDesc.shaderCode = 
+        "layout(location = 0) in vec3 positionIn; \n"
+        ""
+        "void main() { \n"
+        "    gl_PointSize = 1.0; \n"
+        "    gl_Position = vec4(positionIn, 1.0); \n"
+        "} \n";
+
+    shaderDesc.debugName = "debugShader";
+    HgiShaderFunctionHandle vs = hgiVulkan.CreateShaderFunction(shaderDesc);
+    if (!vs || !vs->IsValid()) {
+        std::string const& error = vs->GetCompileErrors();
+        TF_CODING_ERROR("TestVulkanPipeline failed %s", error.c_str());
+        return false;
+    }
+
+    HgiShaderProgramDesc prgDesc;
+    prgDesc.debugName = "debugProgram";
+    prgDesc.shaderFunctions.push_back(vs);
+    HgiShaderProgramHandle prg = hgiVulkan.CreateShaderProgram(prgDesc);
+    TF_VERIFY(prg->IsValid());
+
+    // Describe VBO of the vertex shader that has a 'positionIn' attribute
+    HgiVertexAttributeDesc attrDesc;
+    attrDesc.format = HgiFormatFloat32Vec3;
+    attrDesc.offset = 0;
+    attrDesc.shaderBindLocation = 0;
+
+    HgiVertexBufferDesc vboDesc;
+    vboDesc.bindingIndex = 0;
+    vboDesc.vertexAttributes.push_back(attrDesc);
+    vboDesc.vertexStride = HgiGetDataSizeOfFormat(attrDesc.format);
+
+    // Try creating a pipeline without rasterizer.
+    HgiGraphicsPipelineDesc psoDesc;
+    psoDesc.debugName = "debugPipeline";
+    psoDesc.depthState.depthTestEnabled = false;
+    psoDesc.depthState.depthWriteEnabled = false;
+    psoDesc.depthState.stencilTestEnabled = false;
+    psoDesc.primitiveType = HgiPrimitiveTypePointList;
+    psoDesc.rasterizationState.rasterizerEnabled = false;
+    psoDesc.shaderConstantsDesc.byteSize = 64;
+    psoDesc.shaderConstantsDesc.stageUsage = HgiShaderStageVertex;
+    psoDesc.shaderProgram = prg;
+    psoDesc.vertexBuffers.push_back(vboDesc);
+
+    HgiGraphicsPipelineHandle pso = hgiVulkan.CreateGraphicsPipeline(psoDesc);
+    if (!pso) {
+        TF_CODING_ERROR("TestVulkanPipeline pipeline failed");
+        return false;
+    }
+
+    // Try to bind the pipeline to a graphics cmds
+    // No attachments since this is a vertex only shader.
+    HgiGraphicsCmdsDesc gfxDesc;
+    HgiGraphicsCmdsUniquePtr gfxCmds = hgiVulkan.CreateGraphicsCmds(gfxDesc);
+    TF_VERIFY(gfxCmds);
+    gfxCmds->PushDebugGroup("TestVulkanPipeline");
+    gfxCmds->BindPipeline(pso);
+    gfxCmds->PopDebugGroup();
+
+    hgiVulkan.SubmitCmds(gfxCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    hgiVulkan.DestroyGraphicsPipeline(&pso);
+    hgiVulkan.DestroyShaderProgram(&prg);
+    hgiVulkan.DestroyShaderFunction(&vs);
+
+    hgiVulkan.EndFrame();
+    return true;
+}
+
+static bool
+TestVulkanGraphicsCmds(HgiVulkan& hgiVulkan)
+{
+    hgiVulkan.StartFrame();
+
+    HgiVulkanGarbageCollector* gc = hgiVulkan.GetGarbageCollector();
+    HgiVulkanBufferVector* gcBuffer = gc->GetBufferList();
+    if (!gcBuffer->empty()) {
+        TF_CODING_ERROR("We expected the garbage collector to be empty");
+        return false;
+    }
+
+    const uint32_t size = 64;
+
+    HgiTextureHandle textures[2];
+    HgiTextureHandle resolves[2];
+    HgiAttachmentDesc attachments[2];
+
+    // Describe / create texture attachments
+    for (size_t i=0; i<2; i++) {
+        HgiTextureDesc texDesc;
+        texDesc.dimensions = GfVec3i(size, size, 1);
+        texDesc.format = i==0 ? 
+            HgiFormatFloat16Vec4 :
+            HgiFormatFloat32UInt8;
+        texDesc.sampleCount = HgiSampleCount4;
+        texDesc.type = HgiTextureType2D;
+        texDesc.usage = i==0 ? 
+            HgiTextureUsageBitsColorTarget :
+            HgiTextureUsageBitsDepthTarget | HgiTextureUsageBitsStencilTarget;
+        textures[i] = hgiVulkan.CreateTexture(texDesc);
+
+        attachments[i].usage = texDesc.usage;
+        attachments[i].format = texDesc.format;
+        attachments[i].loadOp = HgiAttachmentLoadOpClear;
+        attachments[i].storeOp = HgiAttachmentStoreOpDontCare;
+
+        HgiTextureDesc resolveDesc;
+        resolveDesc.dimensions = texDesc.dimensions;
+        resolveDesc.format = texDesc.format;
+        resolveDesc.sampleCount = HgiSampleCount1;
+        resolveDesc.type = texDesc.type;
+        resolveDesc.usage = texDesc.usage;
+        resolves[i] = hgiVulkan.CreateTexture(resolveDesc);
+    }
+
+    // Create fullscreen triangle buffers
+    const std::vector<float> position = {
+        -1.0f, -1.0f, 0.0f,
+         3.0f, -1.0f, 0.0f,
+        -1.0f,  3.0f, 0.0f};
+
+    const std::vector<uint32_t> indices = {0,1,2};
+
+    // Create the index buffer
+    HgiBufferDesc indicesDesc;
+    indicesDesc.debugName = "Indices Fullscreen";
+    indicesDesc.byteSize = indices.size() * sizeof(uint32_t);
+    indicesDesc.initialData = indices.data();
+    indicesDesc.usage = HgiBufferUsageIndex32;
+    HgiBufferHandle ibo = hgiVulkan.CreateBuffer(indicesDesc);
+
+    // Create the position vertex buffer
+    HgiBufferDesc verticesDesc;
+    verticesDesc.debugName = "Position Fullscreen";
+    verticesDesc.byteSize = position.size() * sizeof(float);
+    verticesDesc.initialData = position.data();
+    verticesDesc.usage = HgiBufferUsageVertex;
+    HgiBufferHandle vbo = hgiVulkan.CreateBuffer(verticesDesc);
+
+    // Describe VBO of the vertex shader that has a 'positionIn' attribute
+    HgiVertexAttributeDesc attrDesc;
+    attrDesc.format = HgiFormatFloat32Vec3;
+    attrDesc.offset = 0;
+    attrDesc.shaderBindLocation = 0;
+
+    HgiVertexBufferDesc vboDesc;
+    vboDesc.bindingIndex = 0;
+    vboDesc.vertexAttributes.push_back(attrDesc);
+    vboDesc.vertexStride = HgiGetDataSizeOfFormat(attrDesc.format);
+
+    // Create a vertex program
+    HgiShaderFunctionDesc vsDesc;
+    vsDesc.shaderStage = HgiShaderStageVertex;
+    vsDesc.shaderCode = 
+        "layout(location = 0) in vec3 positionIn; \n"
+        ""
+        "void main() { \n"
+        "    gl_Position = vec4(positionIn, 1.0); \n"
+        "} \n";
+
+    vsDesc.debugName = "debug vs shader";
+    HgiShaderFunctionHandle vs = hgiVulkan.CreateShaderFunction(vsDesc);
+    if (!vs || !vs->IsValid()) {
+        std::string const& error = vs->GetCompileErrors();
+        TF_CODING_ERROR("TestVulkanGraphicsCmds failed %s", error.c_str());
+        return false;
+    }
+
+    // Create a fragment program
+    HgiShaderFunctionDesc fsDesc;
+    fsDesc.shaderStage = HgiShaderStageFragment;
+    fsDesc.shaderCode = 
+        "layout(location = 0) out vec4 outputColor; \n"
+        ""
+        "void main() { \n"
+        "    outputColor = vec4(1,0,1,1); \n"
+        "} \n";
+
+    fsDesc.debugName = "debug fs shader";
+    HgiShaderFunctionHandle fs = hgiVulkan.CreateShaderFunction(fsDesc);
+    if (!fs || !fs->IsValid()) {
+        std::string const& error = fs->GetCompileErrors();
+        TF_CODING_ERROR("TestVulkanGraphicsCmds failed %s", error.c_str());
+        return false;
+    }
+
+    // shader program
+    HgiShaderProgramDesc prgDesc;
+    prgDesc.debugName = "debug shader program";
+    prgDesc.shaderFunctions.push_back(vs);
+    prgDesc.shaderFunctions.push_back(fs);
+    HgiShaderProgramHandle prg = hgiVulkan.CreateShaderProgram(prgDesc);
+    TF_VERIFY(prg->IsValid());
+
+    // Try creating a pipeline without rasterizer.
+    HgiGraphicsPipelineDesc psoDesc;
+    psoDesc.debugName = "debugPipeline";
+    psoDesc.depthState.depthTestEnabled = false;
+    psoDesc.depthState.depthWriteEnabled = false;
+    psoDesc.depthState.stencilTestEnabled = false;
+    psoDesc.multiSampleState.sampleCount = HgiSampleCount4;
+    psoDesc.primitiveType = HgiPrimitiveTypeTriangleList;
+    psoDesc.shaderProgram = prg;
+    psoDesc.vertexBuffers.push_back(vboDesc);
+    psoDesc.colorAttachmentDescs.push_back(attachments[0]);
+    psoDesc.depthAttachmentDesc = attachments[1];
+    psoDesc.resolveAttachments = true;
+
+    HgiGraphicsPipelineHandle pso = hgiVulkan.CreateGraphicsPipeline(psoDesc);
+    if (!pso) {
+        TF_CODING_ERROR("TestVulkanGraphicsCmds pipeline failed");
+        return false;
+    }
+
+    // Render
+    HgiGraphicsCmdsDesc gfxDesc;
+    gfxDesc.colorAttachmentDescs.push_back(attachments[0]);
+    gfxDesc.colorTextures.push_back(textures[0]);
+    gfxDesc.colorResolveTextures.push_back(resolves[0]);
+    gfxDesc.depthAttachmentDesc = attachments[1];
+    gfxDesc.depthTexture = textures[1];
+    gfxDesc.depthResolveTexture = resolves[1];
+
+    HgiGraphicsCmdsUniquePtr gfxCmds = hgiVulkan.CreateGraphicsCmds(gfxDesc);
+    gfxCmds->PushDebugGroup("TestVulkanGraphicsCmds");
+    gfxCmds->BindPipeline(pso);
+    gfxCmds->BindVertexBuffers({{vbo, 0, 0}});
+    GfVec4i vp = GfVec4i(0, 0, size, size);
+    gfxCmds->SetViewport(vp);
+    gfxCmds->DrawIndexed(ibo, 3, 0, 0, 1, 0);
+    gfxCmds->PopDebugGroup();
+
+    hgiVulkan.SubmitCmds(gfxCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    // Cleanup
+    hgiVulkan.DestroyTexture(&textures[0]);
+    hgiVulkan.DestroyTexture(&textures[1]);
+    hgiVulkan.DestroyTexture(&resolves[0]);
+    hgiVulkan.DestroyTexture(&resolves[1]);
+    hgiVulkan.DestroyGraphicsPipeline(&pso);
+    hgiVulkan.DestroyShaderProgram(&prg);
+    hgiVulkan.DestroyShaderFunction(&fs);
+    hgiVulkan.DestroyShaderFunction(&vs);
+    hgiVulkan.DestroyBuffer(&vbo);
+    hgiVulkan.DestroyBuffer(&ibo);
+
+    hgiVulkan.EndFrame();
+
+    HgiVulkanCommandQueue* queue = 
+        hgiVulkan.GetPrimaryDevice()->GetCommandQueue();
+    uint64_t inflightBits = queue->GetInflightCommandBuffersBits();
+    if (inflightBits != 0) {
+        TF_CODING_ERROR("Not all command buffers fully consumed");
+        return false;
+    }
+
+    if (!gcBuffer->empty()) {
+        TF_CODING_ERROR("We expected the garbage collector to be empty");
+        return false;
+    }
+
+    return true;
+}
+
+static bool
+TestVulkanComputeCmds(HgiVulkan& hgiVulkan)
+{
+    hgiVulkan.StartFrame();
+
+    // Create a compute program
+    HgiShaderFunctionDesc csDesc;
+    csDesc.shaderStage = HgiShaderStageCompute;
+    csDesc.shaderCode = 
+        "#extension GL_EXT_nonuniform_qualifier : require \n"
+        "#extension GL_EXT_scalar_block_layout : require \n"
+        ""
+        "layout(push_constant) uniform PushConstantBuffer { \n"
+        "    layout(offset = 0) int index; \n"
+        "} pushConstants; \n"
+        ""
+        "layout (scalar, set=0, binding=0) uniform ParamsIn { \n"
+        "    float offset; \n"
+        "} paramsIn; \n"
+        ""
+        "layout (scalar, set=0, binding=1) buffer StorageBufferIn { \n"
+        "    vec4 value[]; \n"
+        "} storageBufferIn; \n"
+        ""
+        "layout (scalar, set=0, binding=2) buffer StorageBufferOut { \n"
+        "    vec4 value[]; \n"
+        "} storageBufferOut; \n"
+        ""
+        "layout (rgba32f, set=0, binding=3) uniform image2D ImageIn; \n"
+        ""
+        "void main() { \n"
+        "    vec4 v = storageBufferIn.value[pushConstants.index]; \n"
+        "    v *= paramsIn.offset; \n"
+        "    storageBufferOut.value[pushConstants.index] = v; \n"
+        "} \n";
+
+    csDesc.debugName = "debug cs shader";
+    HgiShaderFunctionHandle cs = hgiVulkan.CreateShaderFunction(csDesc);
+    if (!cs || !cs->IsValid()) {
+        std::string const& error = cs->GetCompileErrors();
+        TF_CODING_ERROR("TestVulkanComputeCmds failed %s", error.c_str());
+        return false;
+    }
+
+    HgiShaderProgramDesc prgDesc;
+    prgDesc.shaderFunctions.push_back(cs);
+    HgiShaderProgramHandle prg = hgiVulkan.CreateShaderProgram(prgDesc);
+
+    // Create the pipeline
+    HgiComputePipelineDesc psoDesc;
+    psoDesc.shaderConstantsDesc.byteSize = 16;
+    psoDesc.shaderProgram = prg;
+    HgiComputePipelineHandle pso = hgiVulkan.CreateComputePipeline(psoDesc);
+
+    std::vector<uint8_t> pushConstants(psoDesc.shaderConstantsDesc.byteSize, 0);
+
+    // Create resource buffers
+    std::vector<uint8_t> blob(64, 0);
+
+    HgiBufferDesc uboDesc;
+    uboDesc.debugName = "Ubo";
+    uboDesc.byteSize = 64;
+    uboDesc.initialData = blob.data();
+    uboDesc.usage = HgiBufferUsageUniform;
+    HgiBufferHandle ubo = hgiVulkan.CreateBuffer(uboDesc);
+
+    HgiBufferBindDesc uboBindDesc;
+    uboBindDesc.bindingIndex = 0;
+    uboBindDesc.buffers.push_back(ubo);
+    uboBindDesc.offsets.push_back(0);
+    uboBindDesc.resourceType = HgiBindResourceTypeUniformBuffer;
+    uboBindDesc.stageUsage = HgiShaderStageCompute;
+
+    HgiBufferDesc ssbo0Desc;
+    ssbo0Desc.debugName = "Sbbo 0";
+    ssbo0Desc.byteSize = 64;
+    ssbo0Desc.initialData = blob.data();
+    ssbo0Desc.usage = HgiBufferUsageStorage;
+    HgiBufferHandle ssbo0 = hgiVulkan.CreateBuffer(ssbo0Desc);
+
+    HgiBufferBindDesc ssbo0BindDesc;
+    ssbo0BindDesc.bindingIndex = 1;
+    ssbo0BindDesc.buffers.push_back(ssbo0);
+    ssbo0BindDesc.offsets.push_back(0);
+    ssbo0BindDesc.resourceType = HgiBindResourceTypeStorageBuffer;
+    ssbo0BindDesc.stageUsage = HgiShaderStageCompute;
+
+    HgiBufferDesc ssbo1Desc;
+    ssbo1Desc.debugName = "Sbbo 1";
+    ssbo1Desc.byteSize = 64;
+    ssbo1Desc.initialData = blob.data();
+    ssbo1Desc.usage = HgiBufferUsageStorage;
+    HgiBufferHandle ssbo1 = hgiVulkan.CreateBuffer(ssbo1Desc);
+
+    HgiBufferBindDesc ssbo1BindDesc;
+    ssbo1BindDesc.bindingIndex = 2;
+    ssbo1BindDesc.buffers.push_back(ssbo1);
+    ssbo1BindDesc.offsets.push_back(0);
+    ssbo1BindDesc.resourceType = HgiBindResourceTypeStorageBuffer;
+    ssbo1BindDesc.stageUsage = HgiShaderStageCompute;
+
+    // Create resource image
+    HgiTextureDesc imageDesc;
+    imageDesc.dimensions = GfVec3i(64,64,1);
+    imageDesc.format = HgiFormatFloat32Vec4;
+    size_t imageBytes = HgiGetDataSize(imageDesc.format, imageDesc.dimensions);
+    std::vector<uint8_t> imageBlob(imageBytes, 0);
+    imageDesc.initialData = imageBlob.data();
+    imageDesc.pixelsByteSize = imageBlob.size();
+    imageDesc.usage = 
+        HgiTextureUsageBitsShaderRead | 
+        HgiTextureUsageBitsShaderWrite;
+    HgiTextureHandle image = hgiVulkan.CreateTexture(imageDesc);
+
+    HgiTextureBindDesc imageBindDesc;
+    imageBindDesc.bindingIndex = 0;
+    imageBindDesc.resourceType = HgiBindResourceTypeStorageImage;
+    imageBindDesc.samplers.push_back(HgiSamplerHandle()); // no sampler for img
+    imageBindDesc.stageUsage = HgiShaderStageCompute;
+    imageBindDesc.textures.push_back(image);
+
+    // Make resource bindings
+    HgiResourceBindingsDesc rbDesc;
+    rbDesc.buffers.push_back(uboBindDesc);
+    rbDesc.buffers.push_back(ssbo0BindDesc);
+    rbDesc.buffers.push_back(ssbo1BindDesc);
+    rbDesc.textures.push_back(imageBindDesc);
+
+    HgiResourceBindingsHandle resourceBindings =
+        hgiVulkan.CreateResourceBindings(rbDesc);
+
+    // Dispatch compute work
+    HgiComputeCmdsDesc compDesc;
+    HgiComputeCmdsUniquePtr computeCmds = hgiVulkan.CreateComputeCmds(compDesc);
+    computeCmds->PushDebugGroup("TestVulkanComputeCmds");
+    computeCmds->BindPipeline(pso);
+    computeCmds->BindResources(resourceBindings);
+    computeCmds->SetConstantValues(
+        pso, 0, (uint32_t) pushConstants.size(), pushConstants.data());
+    computeCmds->Dispatch(64, 64);
+    computeCmds->PopDebugGroup();
+    hgiVulkan.SubmitCmds(computeCmds.get(),HgiSubmitWaitTypeWaitUntilCompleted);
+
+    // Cleanup
+    hgiVulkan.DestroyResourceBindings(&resourceBindings);
+    hgiVulkan.DestroyTexture(&image);
+    hgiVulkan.DestroyBuffer(&ubo);
+    hgiVulkan.DestroyBuffer(&ssbo0);
+    hgiVulkan.DestroyBuffer(&ssbo1);
+    hgiVulkan.DestroyComputePipeline(&pso);
+    hgiVulkan.DestroyShaderProgram(&prg);
+    hgiVulkan.DestroyShaderFunction(&cs);
+
+    hgiVulkan.EndFrame();
+
+    HgiVulkanCommandQueue* queue = 
+        hgiVulkan.GetPrimaryDevice()->GetCommandQueue();
+    uint64_t inflightBits = queue->GetInflightCommandBuffersBits();
+    if (inflightBits != 0) {
+        TF_CODING_ERROR("Not all command buffers fully consumed");
+        return false;
+    }
+
+    return true;
+}
+
+static void
+_SaveToPNG(
+    int width,
+    int height,
+    const char* pixels,
+    const std::string& filePath)
+{
+    HioImage::StorageSpec storage;
+    storage.width = width;
+    storage.height = height;
+    storage.format = _imgHioFormat;
+    storage.flipped = false;
+    storage.data = (void*)pixels;
+
+    HioImageSharedPtr image = HioImage::OpenForWriting(filePath);
+    TF_VERIFY(image && image->Write(storage));
+}
+
+static void
+_SaveGpuTextureToFile(
+    HgiVulkan& hgiVulkan,
+    HgiTextureHandle const& texHandle,
+    int width,
+    int height,
+    HgiFormat format,
+    std::string const& filePath)
+{
+    // Copy the pixels from gpu into a cpu buffer so we can save it to disk.
+    const size_t bufferByteSize =
+        width * height * HgiGetDataSizeOfFormat(format);
+    std::vector<char> buffer(bufferByteSize);
+
+    HgiTextureGpuToCpuOp copyOp;
+    copyOp.gpuSourceTexture = texHandle;
+    copyOp.sourceTexelOffset = GfVec3i(0);
+    copyOp.mipLevel = 0;
+    copyOp.cpuDestinationBuffer = buffer.data();
+    copyOp.destinationByteOffset = 0;
+    copyOp.destinationBufferByteSize = bufferByteSize;
+
+    HgiBlitCmdsUniquePtr blitCmds = hgiVulkan.CreateBlitCmds();
+    blitCmds->CopyTextureGpuToCpu(copyOp);
+    hgiVulkan.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    _SaveToPNG(width, height, buffer.data(), filePath);
+}
+
+static void
+_SaveGpuBufferToFile(
+    HgiVulkan& hgiVulkan,
+    HgiBufferHandle const& bufHandle,
+    int width,
+    int height,
+    HgiFormat format,
+    std::string const& filePath)
+{
+    // Copy the pixels from gpu into a cpu buffer so we can save it to disk.
+    const size_t bufferByteSize =
+        width * height * HgiGetDataSizeOfFormat(format);
+    std::vector<char> buffer(bufferByteSize);
+
+    HgiBufferGpuToCpuOp copyOp;
+    copyOp.gpuSourceBuffer = bufHandle;
+    copyOp.sourceByteOffset = 0;
+    copyOp.byteSize = bufferByteSize;
+    copyOp.cpuDestinationBuffer = buffer.data();
+    copyOp.destinationByteOffset = 0;    
+
+    HgiBlitCmdsUniquePtr blitCmds = hgiVulkan.CreateBlitCmds();
+    blitCmds->CopyBufferGpuToCpu(copyOp);
+    hgiVulkan.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    _SaveToPNG(width, height, buffer.data(), filePath);
+}
+
+static HgiTextureHandle
+_CreateTexture(
+    HgiVulkan& hgiVulkan,
+    int width, 
+    int height,
+    HgiFormat format,
+    void *data)
+{
+    const size_t textureByteSize =
+        width * height * HgiGetDataSizeOfFormat(format);
+
+    HgiTextureDesc texDesc;
+    texDesc.debugName = "Debug texture";
+    texDesc.dimensions = GfVec3i(width, height, 1);
+    texDesc.format = format;
+    texDesc.initialData = data;
+    texDesc.layerCount = 1;
+    texDesc.mipLevels = 1;
+    texDesc.pixelsByteSize = textureByteSize;
+    texDesc.sampleCount = HgiSampleCount1;
+    texDesc.usage = HgiTextureUsageBitsShaderRead;
+
+    return hgiVulkan.CreateTexture(texDesc);
+}
+
+static HgiBufferHandle
+_CreateBuffer(
+    HgiVulkan& hgiVulkan,
+    size_t byteSize,
+    void *data)
+{
+    HgiBufferDesc bufDesc;
+    bufDesc.usage = HgiBufferUsageUniform;
+    bufDesc.byteSize = byteSize;
+    bufDesc.initialData = data;   
+
+    return hgiVulkan.CreateBuffer(bufDesc);
+}
+
+static HgiGraphicsCmdsDesc
+_CreateGraphicsCmdsColor0Color1Depth(
+    HgiVulkan& hgiVulkan,
+    GfVec3i const& size,
+    HgiFormat colorFormat)
+{
+    // Create two color attachments
+    HgiTextureDesc texDesc;
+    texDesc.dimensions = size;
+    texDesc.type = HgiTextureType2D;
+    texDesc.format = colorFormat;
+    texDesc.sampleCount = HgiSampleCount1;
+    texDesc.usage = HgiTextureUsageBitsColorTarget;
+    HgiTextureHandle colorTex0 = hgiVulkan.CreateTexture(texDesc);
+    HgiTextureHandle colorTex1 = hgiVulkan.CreateTexture(texDesc);
+
+    // Create a depth attachment
+    texDesc.usage = HgiTextureUsageBitsDepthTarget;
+    texDesc.format = HgiFormatFloat32;
+    HgiTextureHandle depthTex = hgiVulkan.CreateTexture(texDesc);
+
+    // Setup color and depth attachments
+    HgiAttachmentDesc colorAttachment0;
+    colorAttachment0.loadOp = HgiAttachmentLoadOpClear;
+    colorAttachment0.storeOp = HgiAttachmentStoreOpStore;
+    colorAttachment0.format = colorFormat;
+    colorAttachment0.usage = HgiTextureUsageBitsColorTarget;
+
+    HgiAttachmentDesc colorAttachment1;
+    colorAttachment1.loadOp = HgiAttachmentLoadOpClear;
+    colorAttachment1.storeOp = HgiAttachmentStoreOpStore;
+    colorAttachment1.format = colorFormat;
+    colorAttachment1.usage = HgiTextureUsageBitsColorTarget;
+
+    HgiAttachmentDesc depthAttachment;
+    depthAttachment.format = HgiFormatFloat32;
+    depthAttachment.usage = HgiTextureUsageBitsDepthTarget;
+
+    // Configure graphics cmds
+    HgiGraphicsCmdsDesc desc;
+    desc.colorAttachmentDescs.push_back(colorAttachment0);
+    desc.colorAttachmentDescs.push_back(colorAttachment1);
+    desc.depthAttachmentDesc = depthAttachment;
+    desc.colorTextures.push_back(colorTex0);
+    desc.colorTextures.push_back(colorTex1);
+    desc.depthTexture = depthTex;
+
+    return desc;
+}
+
+static bool
+TestGraphicsCmdsClear(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+    
+    const size_t width = _imgSize;
+    const size_t height = _imgSize;
+    const HgiFormat format = _imgFormat;
+    
+    // Create a default cmds description and set the clearValue for the
+    // first attachment to something other than black.
+    // Setting 'loadOp' tp 'Clear' is important for this test since we expect
+    // the attachment to be cleared when the graphics cmds is submitted
+    HgiGraphicsCmdsDesc desc = _CreateGraphicsCmdsColor0Color1Depth(
+        hgiVulkan, GfVec3i(width, height, 1), format);
+    desc.colorAttachmentDescs[0].loadOp = HgiAttachmentLoadOpClear;
+    desc.colorAttachmentDescs[0].storeOp = HgiAttachmentStoreOpStore;
+    desc.colorAttachmentDescs[0].clearValue = GfVec4f(1, 0, 0.5, 1);
+
+    // For Vulkan, we expect attachment0 to be cleared when the cmds is 
+    // submitted.
+    HgiGraphicsCmdsUniquePtr gfxCmds = hgiVulkan.CreateGraphicsCmds(desc);
+    hgiVulkan.SubmitCmds(gfxCmds.get());
+
+    // Save attachment0 to disk
+    _SaveGpuTextureToFile(
+        hgiVulkan, 
+        desc.colorTextures[0], 
+        width, 
+        height, 
+        format, 
+        "graphicsCmdsClear.png");
+
+    // Cleanup
+    for (HgiTextureHandle& tex : desc.colorTextures) {
+        hgiVulkan.DestroyTexture(&tex);
+    }
+    if (desc.depthTexture) {
+        hgiVulkan.DestroyTexture(&desc.depthTexture);
+    }
+
+    return true;
+}
+
+static bool
+TestCreateSrgbaTexture(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    const size_t width = 128;
+    const size_t height = 128;
+    const HgiFormat format = HgiFormatUNorm8Vec4srgb;
+
+    const size_t dataByteSize = width * height * HgiGetDataSizeOfFormat(format);
+    
+    // Create the texture
+    std::vector<uint8_t> textureData(dataByteSize, 64);
+    HgiTextureHandle tex = _CreateTexture(
+        hgiVulkan, width, height, format, textureData.data());
+
+    // Write texture to file
+    static std::string const filePath = "srgba.png";
+    _SaveGpuTextureToFile(hgiVulkan, tex, width, height, format, filePath);
+
+    hgiVulkan.DestroyTexture(&tex);
+
+    return true;
+}
+
+static bool
+TestHgiGetMipInitialData(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    // Test helper function that is used during mipmap data upload.
+    // (This does not actually upload any data)
+    const HgiFormat format = _imgFormat;
+    const GfVec3i size0(37,53,1);
+    const size_t layerCount = 1;
+
+    const size_t texelByteSize = HgiGetDataSizeOfFormat(format);
+    const size_t firstMipSize = size0[0] * size0[1] * size0[2] * texelByteSize;
+
+    // We expect the second mip to be 1/4 of the bytesize of the first etc.
+    GfVec3i size1 = size0 / 2;
+    size1[2] = 1;
+
+    const size_t secondMipSize = size1[0] * size1[1] * size1[2] * texelByteSize;
+    
+    GfVec3i size2 = size1 / 2;
+    size2[2] = 1;
+
+    const size_t thirdMipSize = size2[0] * size2[1] * size2[2] * texelByteSize;
+
+    // Create some fake mipmap data for all three mips
+    const size_t totalSize = firstMipSize + secondMipSize + thirdMipSize;
+
+    const std::vector<HgiMipInfo> mipInfos = HgiGetMipInfos(
+        format, size0, layerCount, totalSize);
+
+    if (mipInfos.size() != 3) {
+        TF_CODING_ERROR("TestHgiGetMipInfos returned wrong number of infos");
+        return false;
+    }
+
+    // We expect the returned ptr to be at the start of the third mip's data
+    // in the 'mipData' vector. And the returned dimensions and bytesize to
+    // match the third mip.
+    const size_t startOfThirdMip = firstMipSize + secondMipSize;
+
+    if (mipInfos[2].dimensions != size2 ||
+        mipInfos[2].byteSizePerLayer != thirdMipSize ||
+        mipInfos[2].byteOffset != startOfThirdMip) {
+        TF_CODING_ERROR("TestHgiGetMipInitialData incorrect return values");
+        return false;
+    }
+
+    return true;
+}
+
+static bool
+TestHgiTextureToBufferCopy(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    const int width = 128;
+    const int height = 128;
+    const HgiFormat format = HgiFormatUNorm8Vec4srgb;
+    
+    const size_t dataByteSize = width * height * HgiGetDataSizeOfFormat(format);
+
+    // Create the texture
+    std::vector<uint8_t> textureData(dataByteSize, 16);
+    HgiTextureHandle tex = _CreateTexture(
+        hgiVulkan, width, height, format, textureData.data());
+
+    // Create the buffer
+    HgiBufferHandle buf = _CreateBuffer(hgiVulkan, dataByteSize, nullptr);
+    
+    // Copy texture to buffer
+    HgiTextureToBufferOp copyOp;
+    copyOp.gpuSourceTexture = tex;
+    copyOp.gpuDestinationBuffer = buf;
+    copyOp.byteSize = dataByteSize;
+    HgiBlitCmdsUniquePtr blitCmds = hgiVulkan.CreateBlitCmds();
+    blitCmds->CopyTextureToBuffer(copyOp);
+    hgiVulkan.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    static std::string const filePath = "copyTextureToBuffer.png";
+    _SaveGpuBufferToFile(hgiVulkan, buf, width, height, format, filePath);
+    
+    hgiVulkan.DestroyBuffer(&buf);
+    hgiVulkan.DestroyTexture(&tex);
+
+    return true;
+}
+
+static bool
+TestHgiBufferToTextureCopy(HgiVulkan& hgiVulkan)
+{
+    HgiVulkanDevice* device = hgiVulkan.GetPrimaryDevice();
+    if (!device) {
+        return false;
+    }
+
+    const int width = 128;
+    const int height = 128;
+    const HgiFormat format = HgiFormatUNorm8Vec4srgb;
+    
+    const size_t dataByteSize = width * height * HgiGetDataSizeOfFormat(format);
+    
+    // Create the buffer
+    std::vector<uint8_t> bufferData(dataByteSize, 32);
+    HgiBufferHandle buf = _CreateBuffer(
+        hgiVulkan, dataByteSize, bufferData.data());
+
+    // Create the texture
+    HgiTextureHandle tex = _CreateTexture(
+        hgiVulkan, width, height, format, nullptr);
+    
+    // Copy buffer to texture
+    HgiBufferToTextureOp copyOp;
+    copyOp.gpuSourceBuffer = buf;
+    copyOp.gpuDestinationTexture = tex;
+    copyOp.byteSize = dataByteSize;
+    HgiBlitCmdsUniquePtr blitCmds = hgiVulkan.CreateBlitCmds();
+    blitCmds->CopyBufferToTexture(copyOp);
+    hgiVulkan.SubmitCmds(blitCmds.get(), HgiSubmitWaitTypeWaitUntilCompleted);
+
+    static std::string const filePath = "copyBufferToTexture.png";
+    _SaveGpuTextureToFile(hgiVulkan, tex, width, height, format, filePath);
+    
+    hgiVulkan.DestroyTexture(&tex);
+    hgiVulkan.DestroyBuffer(&buf);
+
+    return true;
+}
+
+static bool
+TestHgiVulkan()
+{
+    // Run tests
+    HgiVulkan hgiVulkan;
+
+    bool ret = true;
+    std::cout <<  "*** Running test: HgiVulkan" << std::endl << std::endl;
+
+    // Test vulkan instance creation
+    ret &= TestVulkanInstance(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanInstance failed");
+        return false;
+    }
+
+    // Test vulkan device creation
+    ret &= TestVulkanDevice(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanDevice failed");
+        return false;
+    }
+
+    // Test vulkan shader compiler
+    ret &= TestVulkanShaderCompiler(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanShaderCompiler failed");
+        return false;
+    }
+
+    // Test vulkan command queue
+    ret &= TestVulkanCommandQueue(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanCommandQueue failed");
+        return false;
+    }
+
+    // Test vulkan garbage collection
+    ret &= TestVulkanGarbageCollection(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanGarbageCollection failed");
+        return false;
+    }
+
+    // Test vulkan buffer
+    ret &= TestVulkanBuffer(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanBuffer failed");
+        return false;
+    }
+
+    // Test vulkan texture
+    ret &= TestVulkanTexture(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanTexture failed");
+        return false;
+    }
+
+    // Test vulkan pipeline
+    ret &= TestVulkanPipeline(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanPipeline failed");
+        return false;
+    }
+
+    // Test vulkan graphicsCmds
+    ret &= TestVulkanGraphicsCmds(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanGraphicsCmds failed");
+        return false;
+    }
+
+    // Test vulkan computeCmds
+    ret &= TestVulkanComputeCmds(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestVulkanComputeCmds failed");
+        return false;
+    }
+
+    // Test clearing attachment0 in graphics cmds
+    ret &= TestGraphicsCmdsClear(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestGraphicsCmdsClear failed");
+        return false;
+    }
+
+    // Test saving a SRGBA texture
+    ret &= TestCreateSrgbaTexture(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestCreateSrgbaTexture failed");
+        return false;
+    }
+
+    // Test getting texel data for mips
+    ret &= TestHgiGetMipInitialData(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestHgiGetMipInitialData failed");
+        return false;
+    }
+
+    // Test copying a GPU texture to a GPU buffer via HgiTextureToBufferOp
+    ret &= TestHgiTextureToBufferCopy(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestHgiTextureToBufferCopy failed");
+        return false;
+    }
+
+    // Test copying a GPU buffer to a GPU texture via HgiBufferToTextureOp
+    ret &= TestHgiBufferToTextureCopy(hgiVulkan);
+    if (!ret) {
+        TF_CODING_ERROR("TestHgiBufferToTextureCopy failed");
+        return false;
+    }
+
+    return ret;
+}
+
+int
+main(int argc, char **argv)
+{
+    TfErrorMark mark;
+    bool passed = TestHgiVulkan();
+
+    if (passed && mark.IsClean()) {
+        std::cout << "HgiVulkan: Passed" << std::endl;
+        exit(0);
+    } else {
+        for (auto it = mark.begin(); it != mark.end(); it++) {
+            std::cout << it->GetCommentary() << std::endl;
+        }
+        std::cout << "HgiVulkan: Failed" << std::endl;
+        exit(1);
+    }
+}
diff --git a/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/copyBufferToTexture.png b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/copyBufferToTexture.png
new file mode 100644
index 0000000000..97fd6bc884
Binary files /dev/null and b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/copyBufferToTexture.png differ
diff --git a/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/copyTextureToBuffer.png b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/copyTextureToBuffer.png
new file mode 100644
index 0000000000..156ec279d7
Binary files /dev/null and b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/copyTextureToBuffer.png differ
diff --git a/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/graphicsCmdsClear.png b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/graphicsCmdsClear.png
new file mode 100644
index 0000000000..e1b25fe7ef
Binary files /dev/null and b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/graphicsCmdsClear.png differ
diff --git a/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/srgba.png b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/srgba.png
new file mode 100644
index 0000000000..80fc52f63f
Binary files /dev/null and b/pxr/imaging/hgiVulkan/testenv/testHgiVulkan/baseline/srgba.png differ
diff --git a/pxr/imaging/hgiVulkan/texture.cpp b/pxr/imaging/hgiVulkan/texture.cpp
old mode 100755
new mode 100644
index bba17f87e1..6a9cff0186
--- a/pxr/imaging/hgiVulkan/texture.cpp
+++ b/pxr/imaging/hgiVulkan/texture.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/imaging/hgiVulkan/buffer.h"
@@ -636,18 +619,15 @@ HgiVulkanTexture::GetDefaultImageLayout(HgiTextureUsage usage)
     if (usage & HgiTextureUsageBitsShaderWrite) {
         // Assume the ShaderWrite means its a storage image.
         return VK_IMAGE_LAYOUT_GENERAL;
-    } else if (usage & HgiTextureUsageBitsShaderRead) {
-        // Also check if image is going to be used as a color attachment as 
-        // well. If yes, then explicitly give it a color attachment layout.
-        if (usage & HgiTextureUsageBitsColorTarget) {
-            return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-        } else {
-            return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-        }
-    } else if (usage & HgiTextureUsageBitsDepthTarget) {
-        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+    // Prioritize attachment layouts over shader read layout. Some textures 
+    // might have both usages.
     } else if (usage & HgiTextureUsageBitsColorTarget) {
         return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+    } else if (usage & HgiTextureUsageBitsDepthTarget ||
+               usage & HgiTextureUsageBitsStencilTarget) {
+        return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+    } else if (usage & HgiTextureUsageBitsShaderRead) {
+        return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
     }
 
     return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
diff --git a/pxr/imaging/hgiVulkan/texture.h b/pxr/imaging/hgiVulkan/texture.h
index 587b7669d5..b027c7b426 100644
--- a/pxr/imaging/hgiVulkan/texture.h
+++ b/pxr/imaging/hgiVulkan/texture.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGI_VULKAN_TEXTURE_H
 #define PXR_IMAGING_HGI_VULKAN_TEXTURE_H
diff --git a/pxr/imaging/hgiVulkan/vk_mem_alloc.cpp b/pxr/imaging/hgiVulkan/vk_mem_alloc.cpp
index 4592eb4c0f..8f47ddc85f 100644
--- a/pxr/imaging/hgiVulkan/vk_mem_alloc.cpp
+++ b/pxr/imaging/hgiVulkan/vk_mem_alloc.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hgiVulkan/vk_mem_alloc.h"
 
diff --git a/pxr/imaging/hgiVulkan/vk_mem_alloc.h b/pxr/imaging/hgiVulkan/vk_mem_alloc.h
index c92b0296ea..48f5fceff2 100644
--- a/pxr/imaging/hgiVulkan/vk_mem_alloc.h
+++ b/pxr/imaging/hgiVulkan/vk_mem_alloc.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_VK_MEM_ALLOC_H
 #define PXR_IMAGING_HGIVULKAN_VK_MEM_ALLOC_H
diff --git a/pxr/imaging/hgiVulkan/vulkan.h b/pxr/imaging/hgiVulkan/vulkan.h
index 08d968f278..72233238f6 100644
--- a/pxr/imaging/hgiVulkan/vulkan.h
+++ b/pxr/imaging/hgiVulkan/vulkan.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HGIVULKAN_VULKAN_H
 #define PXR_IMAGING_HGIVULKAN_VULKAN_H
diff --git a/pxr/imaging/hio/CMakeLists.txt b/pxr/imaging/hio/CMakeLists.txt
index 2fac78c1d2..92d1e4fe98 100644
--- a/pxr/imaging/hio/CMakeLists.txt
+++ b/pxr/imaging/hio/CMakeLists.txt
@@ -35,13 +35,13 @@ pxr_library(hio
         OpenEXR/openexr-c.h
         rankedTypeMap.h
         stb/stb_image.h
-        stb/stb_image_resize.h
+        stb/stb_image_resize2.h
         stb/stb_image_write.h
 
     CPPFILES
         OpenEXRImage.cpp
-        stbImage.cpp
         OpenEXR/openexr-c.c
+        stbImage.cpp
 
     RESOURCE_FILES
         plugInfo.json
@@ -50,3 +50,17 @@ pxr_library(hio
         overview.dox
 )
 
+pxr_build_test(testHioImage
+    LIBRARIES
+        ar
+        hio
+        plug
+        tf
+
+   CPPFILES
+        testenv/testHioImage.cpp
+)
+
+pxr_register_test(testHioImage
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHioImage"
+)
diff --git a/pxr/imaging/hio/OpenEXR/OpenEXRCore/chunk.c b/pxr/imaging/hio/OpenEXR/OpenEXRCore/chunk.c
index 304a402ccc..cfe80b4cd6 100644
--- a/pxr/imaging/hio/OpenEXR/OpenEXRCore/chunk.c
+++ b/pxr/imaging/hio/OpenEXR/OpenEXRCore/chunk.c
@@ -681,7 +681,7 @@ compute_chunk_unpack_size (
             chansz *= (uint64_t) width;
             if (curc->x_sampling > 1) chansz /= ((uint64_t) curc->x_sampling);
             chansz *=
-                (uint64_t) compute_sampled_lines (height, curc->y_sampling, y);
+                (uint64_t) compute_sampled_height (height, curc->y_sampling, y);
             unpacksize += chansz;
         }
     }
@@ -1723,7 +1723,7 @@ exr_write_scanline_chunk_info (
     cinfo->data_offset              = 0;
     cinfo->packed_size              = 0;
     cinfo->unpacked_size =
-        compute_chunk_unpack_size (y, cinfo->width, cinfo->height, lpc, part);
+        compute_chunk_unpack_size (dw.min.y, cinfo->width, cinfo->height, lpc, part);
 
     return EXR_UNLOCK_AND_RETURN_PCTXT (EXR_ERR_SUCCESS);
 }
diff --git a/pxr/imaging/hio/OpenEXR/OpenEXRCore/coding.c b/pxr/imaging/hio/OpenEXR/OpenEXRCore/coding.c
index cf7cdb502b..b7e486b206 100644
--- a/pxr/imaging/hio/OpenEXR/OpenEXRCore/coding.c
+++ b/pxr/imaging/hio/OpenEXR/OpenEXRCore/coding.c
@@ -41,13 +41,10 @@ internal_coding_fill_channel_info (
 
         decc->channel_name = curc->name.str;
 
-        decc->height = compute_sampled_lines (
+        decc->height = compute_sampled_height (
             cinfo->height, curc->y_sampling, cinfo->start_y);
-
-        if (curc->x_sampling > 1)
-            decc->width = cinfo->width / curc->x_sampling;
-        else
-            decc->width = cinfo->width;
+        decc->width = compute_sampled_width (
+            cinfo->width, curc->x_sampling, cinfo->start_x);
 
         decc->x_samples         = curc->x_sampling;
         decc->y_samples         = curc->y_sampling;
@@ -99,13 +96,11 @@ internal_coding_update_channel_info (
 
         ccic->channel_name = curc->name.str;
 
-        ccic->height = compute_sampled_lines (
+        ccic->height = compute_sampled_height (
             cinfo->height, curc->y_sampling, cinfo->start_y);
+        ccic->width = compute_sampled_width (
+            cinfo->width, curc->x_sampling, cinfo->start_x);
 
-        if (curc->x_sampling > 1)
-            ccic->width = cinfo->width / curc->x_sampling;
-        else
-            ccic->width = cinfo->width;
         ccic->x_samples = curc->x_sampling;
         ccic->y_samples = curc->y_sampling;
 
diff --git a/pxr/imaging/hio/OpenEXR/OpenEXRCore/internal_util.h b/pxr/imaging/hio/OpenEXR/OpenEXRCore/internal_util.h
index 4dfc360fbe..3c6f02786c 100644
--- a/pxr/imaging/hio/OpenEXR/OpenEXRCore/internal_util.h
+++ b/pxr/imaging/hio/OpenEXR/OpenEXRCore/internal_util.h
@@ -9,7 +9,7 @@
 #include <stdint.h>
 
 static inline int
-compute_sampled_lines (int height, int y_sampling, int start_y)
+compute_sampled_height (int height, int y_sampling, int start_y)
 {
     int nlines;
 
@@ -31,7 +31,7 @@ compute_sampled_lines (int height, int y_sampling, int start_y)
         else
             start = start_y;
         end = start_y + height - 1;
-        end -= (end % y_sampling);
+        end -= (end < 0) ? (-end % y_sampling) : (end % y_sampling);
 
         if (start > end)
             nlines = 0;
@@ -42,4 +42,19 @@ compute_sampled_lines (int height, int y_sampling, int start_y)
     return nlines;
 }
 
+static inline int
+compute_sampled_width (int width, int x_sampling, int start_x)
+{
+    /*
+     * we require that the start_x % x_sampling == 0 and for tiled images (and for deep),
+     * x_sampling must be 1, so this can simplify the math compared to the y case
+     * where when we are reading scanline images, we always are reading the entire
+     * width. If this changes, can look like the above call for the lines, but
+     * for now can be simpler math
+     */
+    if (x_sampling <= 1) return width;
+
+    return (width == 1) ? 1 : (width / x_sampling);
+}
+
 #endif /* OPENEXR_PRIVATE_UTIL_H */
diff --git a/pxr/imaging/hio/OpenEXR/OpenEXRCore/parse_header.c b/pxr/imaging/hio/OpenEXR/OpenEXRCore/parse_header.c
index b85273a378..d723039269 100644
--- a/pxr/imaging/hio/OpenEXR/OpenEXRCore/parse_header.c
+++ b/pxr/imaging/hio/OpenEXR/OpenEXRCore/parse_header.c
@@ -2552,9 +2552,9 @@ internal_exr_parse_header (struct _internal_exr_context* ctxt)
 {
     struct _internal_exr_seq_scratch scratch;
     struct _internal_exr_part*       curpart;
-    uint32_t                         flags;
+    uint32_t                         flags = 0;
     uint64_t                         initpos;
-    uint8_t                          next_byte;
+    uint8_t                          next_byte = 0;
     exr_result_t                     rv = EXR_ERR_UNKNOWN;
 
     if (ctxt->silent_header)
diff --git a/pxr/imaging/hio/OpenEXR/OpenEXRCore/part_attr.c b/pxr/imaging/hio/OpenEXR/OpenEXRCore/part_attr.c
index f635d6c393..fbfa76364a 100644
--- a/pxr/imaging/hio/OpenEXR/OpenEXRCore/part_attr.c
+++ b/pxr/imaging/hio/OpenEXR/OpenEXRCore/part_attr.c
@@ -71,7 +71,7 @@ exr_get_attribute_by_name (
     const char*             name,
     const exr_attribute_t** outattr)
 {
-    exr_attribute_t* tmpptr;
+    exr_attribute_t* tmpptr = NULL;
     exr_result_t     rv;
     EXR_PROMOTE_CONST_CONTEXT_AND_PART_OR_ERROR (ctxt, part_index);
 
diff --git a/pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h b/pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h
index f96b02f3af..7481a346ea 100644
--- a/pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h
+++ b/pxr/imaging/hio/OpenEXR/OpenEXRCoreUnity.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file OpenEXRCoreUnity.h
 
diff --git a/pxr/imaging/hio/OpenEXR/openexr-c.c b/pxr/imaging/hio/OpenEXR/openexr-c.c
index 777b339ec6..5c39b5adb4 100644
--- a/pxr/imaging/hio/OpenEXR/openexr-c.c
+++ b/pxr/imaging/hio/OpenEXR/openexr-c.c
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/arch/pragmas.h"
@@ -153,9 +136,11 @@ bool nanoexr_Gaussian_resample(const nanoexr_ImageData_t* src,
     // again for height
     radius = ceilf(sqrtf(-2.0f * sigma_h * sigma_h * logf(1.0f - support)));
     int filterSize_h = (int)radius;
-    if (!filterSize_h)
+    if (!filterSize_h) {
+        free(filter_w);
         return false;
-    
+    }
+
     float* filter_h = (float*) malloc(sizeof(float) * (1 + filterSize_h) * 2);
     sum = 0.0f;
     for (int i = 0; i <= filterSize_h; i++) {
@@ -515,7 +500,7 @@ exr_result_t nanoexr_write_exr(
             encoder.channels[c].user_pixel_stride = alphaPixelStride;
             encoder.channels[c].user_line_stride  = alphaLineStride;
             encoder.channels[c].height            = scansperchunk; // chunk height
-            encoder.channels[c].width             = dataw.max.x - dataw.min.y + 1;
+            encoder.channels[c].width             = dataw.max.x - dataw.min.x + 1;
             encoder.channels[c].encode_from_ptr   = pAlpha;
             ++c;
         }
@@ -523,7 +508,7 @@ exr_result_t nanoexr_write_exr(
             encoder.channels[c].user_pixel_stride = bluePixelStride;
             encoder.channels[c].user_line_stride  = blueLineStride;
             encoder.channels[c].height            = scansperchunk; // chunk height
-            encoder.channels[c].width             = dataw.max.x - dataw.min.y + 1;
+            encoder.channels[c].width             = dataw.max.x - dataw.min.x + 1;
             encoder.channels[c].encode_from_ptr   = pBlue;
             ++c;
         }
@@ -531,7 +516,7 @@ exr_result_t nanoexr_write_exr(
             encoder.channels[c].user_pixel_stride = greenPixelStride;
             encoder.channels[c].user_line_stride  = greenLineStride;
             encoder.channels[c].height            = scansperchunk; // chunk height
-            encoder.channels[c].width             = dataw.max.x - dataw.min.y + 1;
+            encoder.channels[c].width             = dataw.max.x - dataw.min.x + 1;
             encoder.channels[c].encode_from_ptr   = pGreen;
             ++c;
         }
@@ -539,7 +524,7 @@ exr_result_t nanoexr_write_exr(
             encoder.channels[c].user_pixel_stride = redPixelStride;
             encoder.channels[c].user_line_stride  = redLineStride;
             encoder.channels[c].height            = scansperchunk; // chunk height
-            encoder.channels[c].width             = dataw.max.x - dataw.min.y + 1;
+            encoder.channels[c].width             = dataw.max.x - dataw.min.x + 1;
             encoder.channels[c].encode_from_ptr   = pRed;
             ++c;
         }
@@ -591,81 +576,42 @@ int nanoexr_getPixelTypeSize(exr_pixel_type_t t)
     }
 }
 
-static bool strIsRed(const char* layerName, const char* str) {
-    if (layerName && (strncmp(layerName, str, strlen(layerName)) != 0))
-        return false;
-
-    // check if the case folded string is R or RED, or ends in .R or .RED
-    char* folded = strdup(str);
-    for (int i = 0; folded[i]; ++i) {
-        folded[i] = tolower(folded[i]);
-    }
-    if (strcmp(folded, "y") == 0 || strcmp(folded, "r") == 0 ||
-        strcmp(folded, "red") == 0)
-        return true;
-    size_t l = strlen(folded);
-    if ((l > 2) && (folded[l - 2] == '.') && (folded[l - 1] == 'r'))
-        return true;
-    if (l < 4)
-        return false;
-    return strcmp(folded + l - 4, ".red");
-}
+// strcasecmp is not available in the MSVC stdlib.
+#ifdef _MSC_VER
+#define strcasecmp _stricmp
+#endif
 
-static bool strIsGreen(const char* layerName, const char* str) {
-    if (layerName && (strncmp(layerName, str, strlen(layerName)) != 0))
+static bool strIsComponent(const char* layerName, 
+                           const char* str, 
+                           const char* component)
+{
+    if (!str || !component)
         return false;
 
-    // check if the case folded string is G or GREEN, or ends in .G or .GREEN
-    char* folded = strdup(str);
-    for (int i = 0; folded[i]; ++i) {
-        folded[i] = tolower(folded[i]);
+    // if the layername is specified, it must match the beginning of the string.
+    // if layername was specified, move the string pointer past it
+    if (layerName) {
+        if (strncmp(layerName, str, strlen(layerName)) != 0)
+            return false;
+        str += strlen(layerName);
     }
-    if (strcmp(folded, "g") == 0 || strcmp(folded, "green") == 0)
-        return true;
-    size_t l = strlen(folded);
-    if ((l > 2) && (folded[l - 2] == '.') && (folded[l - 1] == 'g'))
-        return true;
-    if (l < 6)
-        return false;
-    return strcmp(folded + l - 6, ".green");
-}
-
-static bool strIsBlue(const char* layerName, const char* str) {
-    if (layerName && (strncmp(layerName, str, strlen(layerName)) != 0))
-        return false;
 
-    // check if the case folded string is B or BLUE, or ends in .B or .BLUE
-    char* folded = strdup(str);
-    for (int i = 0; folded[i]; ++i) {
-        folded[i] = tolower(folded[i]);
+    // search backwards in str for a dot. If found, move the string pointer
+    // past it
+    const char* dot = strrchr(str, '.');
+    if (dot) {
+        str = dot + 1;
     }
-    if (strcmp(folded, "b") == 0 || strcmp(folded, "blue") == 0)
-        return true;
-    size_t l = strlen(folded);
-    if ((l > 2) && (folded[l - 2] == '.') && (folded[l - 1] == 'b'))
-        return true;
-    if (l < 5)
-        return false;
-    return strcmp(folded + l - 5, ".blue");
-}
-
-static bool strIsAlpha(const char* layerName, const char* str) {
-    if (layerName && (strncmp(layerName, str, strlen(layerName)) != 0))
-        return false;
 
-    // check if the case folded string is A or ALPHA, or ends in .A or .ALPHA
-    char* folded = strdup(str);
-    for (int i = 0; folded[i]; ++i) {
-        folded[i] = tolower(folded[i]);
+    // if one character is left, then do a case insensitive comparison with the
+    // first character of the component.
+    if (strlen(str) == 1) {
+        return tolower(str[0]) == tolower(component[0]);
     }
-    if (strcmp(folded, "a") == 0 || strcmp(folded, "alpha") == 0)
-        return true;
-    size_t l = strlen(folded);
-    if ((l > 2) && (folded[l - 2] == '.') && (folded[l - 1] == 'a'))
-        return true;
-    if (l < 6)
-        return false;
-    return strcmp(folded + l - 6, ".alpha");
+
+    // The final check is to return true if a case insensitive comparison of
+    // the string with the component is true.
+    return strcasecmp(str, component) == 0;
 }
 
 void nanoexr_release_image_data(nanoexr_ImageData_t* imageData)
@@ -711,19 +657,19 @@ static exr_result_t _nanoexr_rgba_decoding_initialize(
     for (int c = 0; c < decoder->channel_count; ++c) {
         int channelIndex = -1;
         decoder->channels[c].decode_to_ptr = NULL;
-        if (strIsRed(layerName, decoder->channels[c].channel_name)) {
+        if (strIsComponent(layerName, decoder->channels[c].channel_name, "red")) {
             rgba[0] = c;
             channelIndex = 0;
         }
-        else if (strIsGreen(layerName, decoder->channels[c].channel_name)) {
+        else if (strIsComponent(layerName, decoder->channels[c].channel_name, "green")) {
             rgba[1] = c;
             channelIndex = 1;
         }
-        else if (strIsBlue(layerName, decoder->channels[c].channel_name)) {
+        else if (strIsComponent(layerName, decoder->channels[c].channel_name, "blue")) {
             rgba[2] = c;
             channelIndex = 2;
         }
-        else if (strIsAlpha(layerName, decoder->channels[c].channel_name)) {
+        else if (strIsComponent(layerName, decoder->channels[c].channel_name, "alpha")) {
             rgba[3] = c;
             channelIndex = 3;
         }
@@ -1035,7 +981,7 @@ exr_result_t nanoexr_read_exr(const char* filename,
     exr_compression_t compression;
     rv = exr_get_compression(exr, partIndex, &compression);
     if (rv != EXR_ERR_SUCCESS) {
-        fprintf(stderr, "nanoexr compression error: %s\n", 
+        fprintf(stderr, "nanoexr compression error: %s\n",
                 exr_get_default_error_message(rv));
         exr_finish(&exr);
         return rv;
@@ -1085,8 +1031,8 @@ exr_result_t nanoexr_read_exr(const char* filename,
     img->height = height;
     img->dataSize = width * height * img->channelCount * bytesPerChannel;
     img->pixelType = pixelType;
-    img->dataWindowMinY = (datawin.min.y + 1) >> mipLevel;
-    img->dataWindowMaxY = (datawin.max.y + 1) >> mipLevel;
+    img->dataWindowMinY = datawin.min.y >> mipLevel;
+    img->dataWindowMaxY = (datawin.max.y+1) >> mipLevel;
     img->data = (unsigned char*) malloc(img->dataSize);
     if (img->data == NULL) {
         fprintf(stderr, "nanoexr error: could not allocate memory for image data\n");
diff --git a/pxr/imaging/hio/OpenEXR/openexr-c.h b/pxr/imaging/hio/OpenEXR/openexr-c.h
index 749537511f..be4709d402 100644
--- a/pxr/imaging/hio/OpenEXR/openexr-c.h
+++ b/pxr/imaging/hio/OpenEXR/openexr-c.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 // openexr_c.h and openexr_c.c
diff --git a/pxr/imaging/hio/OpenEXRImage.cpp b/pxr/imaging/hio/OpenEXRImage.cpp
index b8f58a44b0..443bc0b0c8 100644
--- a/pxr/imaging/hio/OpenEXRImage.cpp
+++ b/pxr/imaging/hio/OpenEXRImage.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/arch/pragmas.h"
@@ -93,9 +76,10 @@ class Hio_OpenEXRImage final : public HioImage
     bool Write(StorageSpec const &storage,
                VtDictionary const &metadata) override;
 
-    // IsColorSpaceSRGB asks if the color space is SRGB, but
-    // what Hydra really wants to know is whether the pixels are gamma pixels.
-    // OpenEXR images are always linear, so just return false.
+    // IsColorSpaceSRGB asks if the color values are SRGB encoded against the
+    // SRGB curve, although what Hydra really wants to know is whether the 
+    // pixels are gamma pixels. OpenEXR images are always linear, so always 
+    // return false.
     bool IsColorSpaceSRGB() const override { return false; }
     HioFormat GetFormat() const override;
     int  GetWidth() const override { return _exrReader.width; }
@@ -188,9 +172,10 @@ namespace {
     {
         Hio_OpenEXRImage* self = (Hio_OpenEXRImage*) userdata;
         if (!self || !self->Asset() || !buffer || !sz) {
-            if (error_cb)
+            if (error_cb) {
                 error_cb(ctxt, EXR_ERR_INVALID_ARGUMENT,
                          "%s", "Invalid arguments to read callback");
+	    }
             return -1;
         }
         return self->Asset()->Read(buffer, sz, offset);
@@ -222,8 +207,9 @@ namespace {
             int newHeight = height - cropTop - cropBottom;
             
             if (newWidth <= 0 || newHeight <= 0
-                || (newWidth == width && newHeight == height))
+                || (newWidth == width && newHeight == height)) {
                 return;
+            }
             
             for (int y = 0; y < newHeight; ++y) {
                 for (int x = 0; x < newWidth; ++x) {
@@ -239,8 +225,9 @@ namespace {
         static void HalfToFloat(GfHalf* buffer, float* outBuffer,
                                 int width, int height, int channelCount)
         {
-            if (!buffer || !outBuffer)
+            if (!buffer || !outBuffer) {
                 return;
+            }
             
             for (int i = 0; i < width * height * channelCount; ++i) {
                 outBuffer[i] = buffer[i];
@@ -250,8 +237,9 @@ namespace {
         static void FloatToHalf(float* buffer, GfHalf* outBuffer,
                                 int width, int height, int channelCount)
         {
-            if (!buffer || !outBuffer)
+            if (!buffer || !outBuffer) {
                 return;
+            }
             
             for (int i = 0; i < width * height * channelCount; ++i) {
                 outBuffer[i] = buffer[i];
@@ -267,11 +255,13 @@ bool Hio_OpenEXRImage::ReadCropped(
                 StorageSpec const& storage)
 {
 	// not opened for read prior to calling ReadCropped.
-    if (!_asset)
+    if (!_asset) {
         return false;
+    }
 
-    if (cropTop < 0 || cropBottom < 0 || cropLeft < 0 || cropRight < 0)
+    if (cropTop < 0 || cropBottom < 0 || cropLeft < 0 || cropRight < 0) {
         return false;
+    }
 
     // cache values for the read/crop/resize pipeline
 
@@ -291,13 +281,23 @@ bool Hio_OpenEXRImage::ReadCropped(
     bool outputIsHalf =  HioGetHioType(storage.format) == HioTypeHalfFloat;
     bool outputIsUInt =  HioGetHioType(storage.format) == HioTypeUnsignedInt;
 
-    // no conversion between uint and a float type is provided.
-    if (outputIsUInt && !inputIsUInt)
+    // no conversion to anything except these formats
+    if (!(outputIsHalf || outputIsFloat || outputIsUInt)) {
         return false;
-    if (outputIsFloat && !(inputIsFloat || inputIsHalf))
+    }
+
+    // no conversion to uint from non uint
+    if (outputIsUInt && !inputIsUInt) {
         return false;
+    }
+
+    // no coversion of non float to float
+    if (outputIsFloat && !(inputIsFloat || inputIsHalf)) {
+        return false;
+    }
 
-    int outputBytesPerPixel = (int) HioGetDataSizeOfType(storage.format) * outChannelCount;
+    int outputBytesPerPixel = 
+	    (int) HioGetDataSizeOfType(storage.format) * outChannelCount;
 
     int readWidth = fileWidth - cropLeft - cropRight;
     int readHeight = fileHeight - cropTop - cropBottom;
@@ -409,11 +409,11 @@ bool Hio_OpenEXRImage::ReadCropped(
         uint32_t outCount = outWidth * outHeight * outChannelCount;
         if (inputIsHalf && outputIsHalf) {
             memcpy(reinterpret_cast<void*>(storage.data),
-               &halfInputBuffer[0], outSize);
+               halfInputBuffer.data(), outSize);
         }
         else if (inputIsFloat && outputIsFloat) {
             memcpy(reinterpret_cast<void*>(storage.data),
-               &floatInputBuffer[0], outSize);
+               floatInputBuffer.data(), outSize);
         }
         else if (outputIsFloat) {
             GfHalf* src = halfInputBuffer.data();
@@ -569,16 +569,18 @@ bool Hio_OpenEXRImage::GetSamplerMetadata(HioAddressDimension dim,
 //static
 void Hio_OpenEXRImage::_AttributeReadCallback(void* self_, exr_context_t exr) {
     Hio_OpenEXRImage* self = reinterpret_cast<Hio_OpenEXRImage*>(self_);
-    if (!self->_metadata.empty())
+    if (!self->_metadata.empty()) {
         return;
+    }
     
     const int partIndex = self->_subimage;
     int attrCount = nanoexr_get_attribute_count(exr, partIndex);
     for (int i = 0; i < attrCount; ++i) {
         const exr_attribute_t* attr;
         nanoexr_get_attribute_by_index(exr, partIndex, i, &attr);
-        if (!attr)
+        if (!attr) {
             continue;
+        }
 
         // this switch is an exhaustive alphabetical treatment of all the
         // possible attribute types.
@@ -910,7 +912,7 @@ bool Hio_OpenEXRImage::Write(StorageSpec const &storage,
         ++pixMul;
     }
 
-    if (type == HioTypeFloat)
+    if (type == HioTypeFloat) {
         rv = nanoexr_write_exr(
                 _filename.c_str(),
                 _AttributeWriteCallback, this,
@@ -920,7 +922,8 @@ bool Hio_OpenEXRImage::Write(StorageSpec const &storage,
                 green, pixelStride, lineStride,
                 blue,  pixelStride, lineStride,
                 alpha, pixelStride, lineStride);
-    else
+    }
+    else {
         rv = nanoexr_write_exr(
                 _filename.c_str(),
                 _AttributeWriteCallback, this,
@@ -930,6 +933,7 @@ bool Hio_OpenEXRImage::Write(StorageSpec const &storage,
                 green, pixelStride, lineStride,
                 blue,  pixelStride, lineStride,
                 alpha, pixelStride, lineStride);
+    }
 
     _callbackDict = nullptr;
     return rv == EXR_ERR_SUCCESS;
diff --git a/pxr/imaging/hio/api.h b/pxr/imaging/hio/api.h
index 5c819f3dc9..50a6ed8186 100644
--- a/pxr/imaging/hio/api.h
+++ b/pxr/imaging/hio/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_API_H
 #define PXR_IMAGING_HIO_API_H
diff --git a/pxr/imaging/hio/debugCodes.cpp b/pxr/imaging/hio/debugCodes.cpp
index cc15c03fa5..54b52d9896 100644
--- a/pxr/imaging/hio/debugCodes.cpp
+++ b/pxr/imaging/hio/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file debugCodes.cpp
 
diff --git a/pxr/imaging/hio/debugCodes.h b/pxr/imaging/hio/debugCodes.h
index ad5fad4430..6ac7b57bf8 100644
--- a/pxr/imaging/hio/debugCodes.h
+++ b/pxr/imaging/hio/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_DEBUG_CODES_H
 #define PXR_IMAGING_HIO_DEBUG_CODES_H
diff --git a/pxr/imaging/hio/dictionary.cpp b/pxr/imaging/hio/dictionary.cpp
index 807e3fecf8..dc75e8d687 100644
--- a/pxr/imaging/hio/dictionary.cpp
+++ b/pxr/imaging/hio/dictionary.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hio/dictionary.h"
diff --git a/pxr/imaging/hio/dictionary.h b/pxr/imaging/hio/dictionary.h
index 7a9706e188..fab019be41 100644
--- a/pxr/imaging/hio/dictionary.h
+++ b/pxr/imaging/hio/dictionary.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_DICTIONARY_H
 #define PXR_IMAGING_HIO_DICTIONARY_H
diff --git a/pxr/imaging/hio/fieldTextureData.cpp b/pxr/imaging/hio/fieldTextureData.cpp
index 73d802cb2e..e7ded1accc 100644
--- a/pxr/imaging/hio/fieldTextureData.cpp
+++ b/pxr/imaging/hio/fieldTextureData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hio/fieldTextureData.h"
 
diff --git a/pxr/imaging/hio/fieldTextureData.h b/pxr/imaging/hio/fieldTextureData.h
index 8c426e12a2..c072c05102 100644
--- a/pxr/imaging/hio/fieldTextureData.h
+++ b/pxr/imaging/hio/fieldTextureData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_FIELD_TEXTURE_DATA_H
 #define PXR_IMAGING_HIO_FIELD_TEXTURE_DATA_H
diff --git a/pxr/imaging/hio/glslfx.cpp b/pxr/imaging/hio/glslfx.cpp
index 85c2973cdb..754a78ce8f 100644
--- a/pxr/imaging/hio/glslfx.cpp
+++ b/pxr/imaging/hio/glslfx.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hio/glslfx.h"
 #include "pxr/imaging/hio/glslfxConfig.h"
diff --git a/pxr/imaging/hio/glslfx.h b/pxr/imaging/hio/glslfx.h
index 6df5231e19..81ee91b8cb 100644
--- a/pxr/imaging/hio/glslfx.h
+++ b/pxr/imaging/hio/glslfx.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_GLSLFX_H
 #define PXR_IMAGING_HIO_GLSLFX_H
diff --git a/pxr/imaging/hio/glslfxConfig.cpp b/pxr/imaging/hio/glslfxConfig.cpp
index efb7f35f35..e78274fdee 100644
--- a/pxr/imaging/hio/glslfxConfig.cpp
+++ b/pxr/imaging/hio/glslfxConfig.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hio/glslfxConfig.h"
 #include "pxr/imaging/hio/debugCodes.h"
diff --git a/pxr/imaging/hio/glslfxConfig.h b/pxr/imaging/hio/glslfxConfig.h
index 1dbae16bcb..ba30c49873 100644
--- a/pxr/imaging/hio/glslfxConfig.h
+++ b/pxr/imaging/hio/glslfxConfig.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_GLSLFX_CONFIG_H
 #define PXR_IMAGING_HIO_GLSLFX_CONFIG_H
diff --git a/pxr/imaging/hio/glslfxResourceLayout.cpp b/pxr/imaging/hio/glslfxResourceLayout.cpp
index 4e8b464edf..eb1f1e4cfe 100644
--- a/pxr/imaging/hio/glslfxResourceLayout.cpp
+++ b/pxr/imaging/hio/glslfxResourceLayout.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hio/glslfxResourceLayout.h"
 
diff --git a/pxr/imaging/hio/glslfxResourceLayout.h b/pxr/imaging/hio/glslfxResourceLayout.h
index 5d0997a99f..021cd5ed46 100644
--- a/pxr/imaging/hio/glslfxResourceLayout.h
+++ b/pxr/imaging/hio/glslfxResourceLayout.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_GLSLFX_RESOURCE_LAYOUT_H
 #define PXR_IMAGING_HIO_GLSLFX_RESOURCE_LAYOUT_H
diff --git a/pxr/imaging/hio/image.cpp b/pxr/imaging/hio/image.cpp
index 2bb32afb34..4a064a3e0c 100644
--- a/pxr/imaging/hio/image.cpp
+++ b/pxr/imaging/hio/image.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hio/image.h"
 #include "pxr/imaging/hio/imageRegistry.h"
diff --git a/pxr/imaging/hio/image.h b/pxr/imaging/hio/image.h
index 1b3a60d52b..351c385858 100644
--- a/pxr/imaging/hio/image.h
+++ b/pxr/imaging/hio/image.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_IMAGE_H
 #define PXR_IMAGING_HIO_IMAGE_H
diff --git a/pxr/imaging/hio/imageRegistry.cpp b/pxr/imaging/hio/imageRegistry.cpp
index 32dc0d4fb3..bab81b56c9 100644
--- a/pxr/imaging/hio/imageRegistry.cpp
+++ b/pxr/imaging/hio/imageRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hio/imageRegistry.h"
 #include "pxr/imaging/hio/image.h"
diff --git a/pxr/imaging/hio/imageRegistry.h b/pxr/imaging/hio/imageRegistry.h
index 75712a8571..e33e97b589 100644
--- a/pxr/imaging/hio/imageRegistry.h
+++ b/pxr/imaging/hio/imageRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_IMAGE_REGISTRY_H
 #define PXR_IMAGING_HIO_IMAGE_REGISTRY_H
diff --git a/pxr/imaging/hio/pch.h b/pxr/imaging/hio/pch.h
index f42afdc5fb..2a5e9b0c16 100644
--- a/pxr/imaging/hio/pch.h
+++ b/pxr/imaging/hio/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,14 +31,15 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
+#include <cfloat>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -64,6 +48,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <deque>
 #include <fcntl.h>
 #include <fstream>
 #include <functional>
@@ -79,14 +64,18 @@
 #include <math.h>
 #include <memory>
 #include <mutex>
+#include <new>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
+#include <stdlib.h>
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -94,42 +83,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -138,19 +91,8 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/scoped_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <tbb/cache_aligned_allocator.h>
+#include <tbb/spin_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hio/rankedTypeMap.h b/pxr/imaging/hio/rankedTypeMap.h
index fd8e610e96..5a19969ab7 100644
--- a/pxr/imaging/hio/rankedTypeMap.h
+++ b/pxr/imaging/hio/rankedTypeMap.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_RANKED_TYPE_MAP_H
 #define PXR_IMAGING_HIO_RANKED_TYPE_MAP_H
diff --git a/pxr/imaging/hio/stb/stb_image.h b/pxr/imaging/hio/stb/stb_image.h
index 03ccd13da5..ff3b47c7a5 100644
--- a/pxr/imaging/hio/stb/stb_image.h
+++ b/pxr/imaging/hio/stb/stb_image.h
@@ -1,4 +1,4 @@
-/* stb_image - v2.27 - public domain image loader - http://nothings.org/stb
+/* stb_image - v2.29 - public domain image loader - http://nothings.org/stb
                                   no warranty implied; use at your own risk
 
    Do this:
@@ -48,6 +48,8 @@ LICENSE
 
 RECENT REVISION HISTORY:
 
+      2.29  (2023-05-xx) optimizations
+      2.28  (2023-01-29) many error fixes, security errors, just tons of stuff
       2.27  (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes
       2.26  (2020-07-13) many minor fixes
       2.25  (2020-02-02) fix warnings
@@ -108,7 +110,7 @@ RECENT REVISION HISTORY:
     Cass Everitt            Ryamond Barbiero                        github:grim210
     Paul Du Bois            Engin Manap        Aldo Culquicondor    github:sammyhw
     Philipp Wiesemann       Dale Weiler        Oriol Ferrer Mesia   github:phprus
-    Josh Tobin                                 Matthew Gregan       github:poppolopoppo
+    Josh Tobin              Neil Bickford      Matthew Gregan       github:poppolopoppo
     Julian Raschke          Gregory Mullen     Christian Floisand   github:darealshinji
     Baldur Karlsson         Kevin Schmidt      JR Smith             github:Michaelangel007
                             Brad Weinberger    Matvey Cherevko      github:mosra
@@ -140,7 +142,7 @@ RECENT REVISION HISTORY:
 //    // ... x = width, y = height, n = # 8-bit components per pixel ...
 //    // ... replace '0' with '1'..'4' to force that many components per pixel
 //    // ... but 'n' will always be the number that it would have been if you said 0
-//    stbi_image_free(data)
+//    stbi_image_free(data);
 //
 // Standard parameters:
 //    int *x                 -- outputs image width in pixels
@@ -635,7 +637,7 @@ STBIDEF int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch
    #endif
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__SYMBIAN32__)
 typedef unsigned short stbi__uint16;
 typedef   signed short stbi__int16;
 typedef unsigned int   stbi__uint32;
@@ -1063,6 +1065,23 @@ static void *stbi__malloc_mad4(int a, int b, int c, int d, int add)
 }
 #endif
 
+// returns 1 if the sum of two signed ints is valid (between -2^31 and 2^31-1 inclusive), 0 on overflow.
+static int stbi__addints_valid(int a, int b)
+{
+   if ((a >= 0) != (b >= 0)) return 1; // a and b have different signs, so no overflow
+   if (a < 0 && b < 0) return a >= INT_MIN - b; // same as a + b >= INT_MIN; INT_MIN - b cannot overflow since b < 0.
+   return a <= INT_MAX - b;
+}
+
+// returns 1 if the product of two ints fits in a signed short, 0 on overflow.
+static int stbi__mul2shorts_valid(int a, int b)
+{
+   if (b == 0 || b == -1) return 1; // multiplication by 0 is always 0; check for -1 so SHRT_MIN/b doesn't overflow
+   if ((a >= 0) == (b >= 0)) return a <= SHRT_MAX/b; // product is positive, so similar to mul2sizes_valid
+   if (b < 0) return a <= SHRT_MIN / b; // same as a * b >= SHRT_MIN
+   return a >= SHRT_MIN / b;
+}
+
 // stbi__err - error
 // stbi__errpf - error returning pointer to float
 // stbi__errpuc - error returning pointer to unsigned char
@@ -1985,9 +2004,12 @@ static int stbi__build_huffman(stbi__huffman *h, int *count)
    int i,j,k=0;
    unsigned int code;
    // build size list for each symbol (from JPEG spec)
-   for (i=0; i < 16; ++i)
-      for (j=0; j < count[i]; ++j)
+   for (i=0; i < 16; ++i) {
+      for (j=0; j < count[i]; ++j) {
          h->size[k++] = (stbi_uc) (i+1);
+         if(k >= 257) return stbi__err("bad size list","Corrupt JPEG");
+      }
+   }
    h->size[k] = 0;
 
    // compute actual symbols (from jpeg spec)
@@ -2112,6 +2134,8 @@ stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
 
    // convert the huffman code to the symbol id
    c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k];
+   if(c < 0 || c >= 256) // symbol id out of bounds!
+       return -1;
    STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]);
 
    // convert the id to a symbol
@@ -2130,6 +2154,7 @@ stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n)
    unsigned int k;
    int sgn;
    if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+   if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing
 
    sgn = j->code_buffer >> 31; // sign bit always in MSB; 0 if MSB clear (positive), 1 if MSB set (negative)
    k = stbi_lrot(j->code_buffer, n);
@@ -2144,6 +2169,7 @@ stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n)
 {
    unsigned int k;
    if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+   if (j->code_bits < n) return 0; // ran out of bits from stream, return 0s intead of continuing
    k = stbi_lrot(j->code_buffer, n);
    j->code_buffer = k & ~stbi__bmask[n];
    k &= stbi__bmask[n];
@@ -2155,6 +2181,7 @@ stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j)
 {
    unsigned int k;
    if (j->code_bits < 1) stbi__grow_buffer_unsafe(j);
+   if (j->code_bits < 1) return 0; // ran out of bits from stream, return 0s intead of continuing
    k = j->code_buffer;
    j->code_buffer <<= 1;
    --j->code_bits;
@@ -2192,8 +2219,10 @@ static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman
    memset(data,0,64*sizeof(data[0]));
 
    diff = t ? stbi__extend_receive(j, t) : 0;
+   if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta","Corrupt JPEG");
    dc = j->img_comp[b].dc_pred + diff;
    j->img_comp[b].dc_pred = dc;
+   if (!stbi__mul2shorts_valid(dc, dequant[0])) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
    data[0] = (short) (dc * dequant[0]);
 
    // decode AC components, see JPEG spec
@@ -2207,6 +2236,7 @@ static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman
       if (r) { // fast-AC path
          k += (r >> 4) & 15; // run
          s = r & 15; // combined length
+         if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available");
          j->code_buffer <<= s;
          j->code_bits -= s;
          // decode into unzigzag'd location
@@ -2246,8 +2276,10 @@ static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__
       if (t < 0 || t > 15) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
       diff = t ? stbi__extend_receive(j, t) : 0;
 
+      if (!stbi__addints_valid(j->img_comp[b].dc_pred, diff)) return stbi__err("bad delta", "Corrupt JPEG");
       dc = j->img_comp[b].dc_pred + diff;
       j->img_comp[b].dc_pred = dc;
+      if (!stbi__mul2shorts_valid(dc, 1 << j->succ_low)) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
       data[0] = (short) (dc * (1 << j->succ_low));
    } else {
       // refinement scan for DC coefficient
@@ -2282,6 +2314,7 @@ static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__
          if (r) { // fast-AC path
             k += (r >> 4) & 15; // run
             s = r & 15; // combined length
+            if (s > j->code_bits) return stbi__err("bad huffman code", "Combined length longer than code bits available");
             j->code_buffer <<= s;
             j->code_bits -= s;
             zig = stbi__jpeg_dezigzag[k++];
@@ -3102,6 +3135,7 @@ static int stbi__process_marker(stbi__jpeg *z, int m)
                sizes[i] = stbi__get8(z->s);
                n += sizes[i];
             }
+            if(n > 256) return stbi__err("bad DHT header","Corrupt JPEG"); // Loop over i < n would write past end of values!
             L -= 17;
             if (tc == 0) {
                if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0;
@@ -3351,6 +3385,28 @@ static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
    return 1;
 }
 
+static stbi_uc stbi__skip_jpeg_junk_at_end(stbi__jpeg *j)
+{
+   // some JPEGs have junk at end, skip over it but if we find what looks
+   // like a valid marker, resume there
+   while (!stbi__at_eof(j->s)) {
+      stbi_uc x = stbi__get8(j->s);
+      while (x == 0xff) { // might be a marker
+         if (stbi__at_eof(j->s)) return STBI__MARKER_none;
+         x = stbi__get8(j->s);
+         if (x != 0x00 && x != 0xff) {
+            // not a stuffed zero or lead-in to another marker, looks
+            // like an actual marker, return it
+            return x;
+         }
+         // stuffed zero has x=0 now which ends the loop, meaning we go
+         // back to regular scan loop.
+         // repeated 0xff keeps trying to read the next byte of the marker.
+      }
+   }
+   return STBI__MARKER_none;
+}
+
 // decode image to YCbCr format
 static int stbi__decode_jpeg_image(stbi__jpeg *j)
 {
@@ -3367,25 +3423,22 @@ static int stbi__decode_jpeg_image(stbi__jpeg *j)
          if (!stbi__process_scan_header(j)) return 0;
          if (!stbi__parse_entropy_coded_data(j)) return 0;
          if (j->marker == STBI__MARKER_none ) {
-            // handle 0s at the end of image data from IP Kamera 9060
-            while (!stbi__at_eof(j->s)) {
-               int x = stbi__get8(j->s);
-               if (x == 255) {
-                  j->marker = stbi__get8(j->s);
-                  break;
-               }
-            }
+         j->marker = stbi__skip_jpeg_junk_at_end(j);
             // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0
          }
+         m = stbi__get_marker(j);
+         if (STBI__RESTART(m))
+            m = stbi__get_marker(j);
       } else if (stbi__DNL(m)) {
          int Ld = stbi__get16be(j->s);
          stbi__uint32 NL = stbi__get16be(j->s);
          if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG");
          if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG");
+         m = stbi__get_marker(j);
       } else {
-         if (!stbi__process_marker(j, m)) return 0;
+         if (!stbi__process_marker(j, m)) return 1;
+         m = stbi__get_marker(j);
       }
-      m = stbi__get_marker(j);
    }
    if (j->progressive)
       stbi__jpeg_finish(j);
@@ -3976,6 +4029,7 @@ static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int re
    unsigned char* result;
    stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg));
    if (!j) return stbi__errpuc("outofmem", "Out of memory");
+   memset(j, 0, sizeof(stbi__jpeg));
    STBI_NOTUSED(ri);
    j->s = s;
    stbi__setup_jpeg(j);
@@ -3989,6 +4043,7 @@ static int stbi__jpeg_test(stbi__context *s)
    int r;
    stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg));
    if (!j) return stbi__err("outofmem", "Out of memory");
+   memset(j, 0, sizeof(stbi__jpeg));
    j->s = s;
    stbi__setup_jpeg(j);
    r = stbi__decode_jpeg_header(j, STBI__SCAN_type);
@@ -4014,6 +4069,7 @@ static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp)
    int result;
    stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg)));
    if (!j) return stbi__err("outofmem", "Out of memory");
+   memset(j, 0, sizeof(stbi__jpeg));
    j->s = s;
    result = stbi__jpeg_info_raw(j, x, y, comp);
    STBI_FREE(j);
@@ -4121,6 +4177,7 @@ typedef struct
 {
    stbi_uc *zbuffer, *zbuffer_end;
    int num_bits;
+   int hit_zeof_once;
    stbi__uint32 code_buffer;
 
    char *zout;
@@ -4187,9 +4244,20 @@ stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
    int b,s;
    if (a->num_bits < 16) {
       if (stbi__zeof(a)) {
-         return -1;   /* report error for unexpected end of data. */
+         if (!a->hit_zeof_once) {
+            // This is the first time we hit eof, insert 16 extra padding btis
+            // to allow us to keep going; if we actually consume any of them
+            // though, that is invalid data. This is caught later.
+            a->hit_zeof_once = 1;
+            a->num_bits += 16; // add 16 implicit zero bits
+         } else {
+            // We already inserted our extra 16 padding bits and are again
+            // out, this stream is actually prematurely terminated.
+            return -1;
+         }
+      } else {
+         stbi__fill_bits(a);
       }
-      stbi__fill_bits(a);
    }
    b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
    if (b) {
@@ -4254,17 +4322,25 @@ static int stbi__parse_huffman_block(stbi__zbuf *a)
          int len,dist;
          if (z == 256) {
             a->zout = zout;
+            if (a->hit_zeof_once && a->num_bits < 16) {
+               // The first time we hit zeof, we inserted 16 extra zero bits into our bit
+               // buffer so the decoder can just do its speculative decoding. But if we
+               // actually consumed any of those bits (which is the case when num_bits < 16),
+               // the stream actually read past the end so it is malformed.
+               return stbi__err("unexpected end","Corrupt PNG");
+            }
             return 1;
          }
+         if (z >= 286) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, length codes 286 and 287 must not appear in compressed data
          z -= 257;
          len = stbi__zlength_base[z];
          if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]);
          z = stbi__zhuffman_decode(a, &a->z_distance);
-         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG");
+         if (z < 0 || z >= 30) return stbi__err("bad huffman code","Corrupt PNG"); // per DEFLATE, distance codes 30 and 31 must not appear in compressed data
          dist = stbi__zdist_base[z];
          if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]);
          if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG");
-         if (zout + len > a->zout_end) {
+         if (len > a->zout_end - zout) {
             if (!stbi__zexpand(a, zout, len)) return 0;
             zout = a->zout;
          }
@@ -4408,6 +4484,7 @@ static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
       if (!stbi__parse_zlib_header(a)) return 0;
    a->num_bits = 0;
    a->code_buffer = 0;
+   a->hit_zeof_once = 0;
    do {
       final = stbi__zreceive(a,1);
       type = stbi__zreceive(a,2);
@@ -4554,7 +4631,7 @@ typedef struct
    stbi__context *s;
    stbi_uc *idata, *expanded, *out;
    int depth;
-   float gamma = 0;
+   float gamma;
 } stbi__png;
 
 
@@ -4564,9 +4641,8 @@ enum {
    STBI__F_up=2,
    STBI__F_avg=3,
    STBI__F_paeth=4,
-   // synthetic filters used for first scanline to avoid needing a dummy row of 0s
-   STBI__F_avg_first,
-   STBI__F_paeth_first
+   // synthetic filter used for first scanline to avoid needing a dummy row of 0s
+   STBI__F_avg_first
 };
 
 static stbi_uc first_row_filter[5] =
@@ -4575,29 +4651,56 @@ static stbi_uc first_row_filter[5] =
    STBI__F_sub,
    STBI__F_none,
    STBI__F_avg_first,
-   STBI__F_paeth_first
+   STBI__F_sub // Paeth with b=c=0 turns out to be equivalent to sub
 };
 
 static int stbi__paeth(int a, int b, int c)
 {
-   int p = a + b - c;
-   int pa = abs(p-a);
-   int pb = abs(p-b);
-   int pc = abs(p-c);
-   if (pa <= pb && pa <= pc) return a;
-   if (pb <= pc) return b;
-   return c;
+   // This formulation looks very different from the reference in the PNG spec, but is
+   // actually equivalent and has favorable data dependencies and admits straightforward
+   // generation of branch-free code, which helps performance significantly.
+   int thresh = c*3 - (a + b);
+   int lo = a < b ? a : b;
+   int hi = a < b ? b : a;
+   int t0 = (hi <= thresh) ? lo : c;
+   int t1 = (thresh <= lo) ? hi : t0;
+   return t1;
 }
 
 static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
 
+// adds an extra all-255 alpha channel
+// dest == src is legal
+// img_n must be 1 or 3
+static void stbi__create_png_alpha_expand8(stbi_uc *dest, stbi_uc *src, stbi__uint32 x, int img_n)
+{
+   int i;
+   // must process data backwards since we allow dest==src
+   if (img_n == 1) {
+      for (i=x-1; i >= 0; --i) {
+         dest[i*2+1] = 255;
+         dest[i*2+0] = src[i];
+      }
+   } else {
+      STBI_ASSERT(img_n == 3);
+      for (i=x-1; i >= 0; --i) {
+         dest[i*4+3] = 255;
+         dest[i*4+2] = src[i*3+2];
+         dest[i*4+1] = src[i*3+1];
+         dest[i*4+0] = src[i*3+0];
+      }
+   }
+}
+
 // create the png data from post-deflated data
 static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color)
 {
-   int bytes = (depth == 16? 2 : 1);
+   int bytes = (depth == 16 ? 2 : 1);
    stbi__context *s = a->s;
    stbi__uint32 i,j,stride = x*out_n*bytes;
    stbi__uint32 img_len, img_width_bytes;
+   stbi_uc *filter_buf;
+   int all_ok = 1;
    int k;
    int img_n = s->img_n; // copy it into a local for later
 
@@ -4609,8 +4712,11 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
    a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into
    if (!a->out) return stbi__err("outofmem", "Out of memory");
 
+   // note: error exits here don't need to clean up a->out individually,
+   // stbi__do_png always does on error.
    if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG");
    img_width_bytes = (((img_n * x * depth) + 7) >> 3);
+   if (!stbi__mad2sizes_valid(img_width_bytes, y, img_width_bytes)) return stbi__err("too large", "Corrupt PNG");
    img_len = (img_width_bytes + 1) * y;
 
    // we used to check for exact match between raw_len and img_len on non-interlaced PNGs,
@@ -4618,189 +4724,137 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
    // so just check for raw_len < img_len always.
    if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
 
+   // Allocate two scan lines worth of filter workspace buffer.
+   filter_buf = (stbi_uc *) stbi__malloc_mad2(img_width_bytes, 2, 0);
+   if (!filter_buf) return stbi__err("outofmem", "Out of memory");
+
+   // Filtering for low-bit-depth images
+   if (depth < 8) {
+      filter_bytes = 1;
+      width = img_width_bytes;
+   }
+
    for (j=0; j < y; ++j) {
-      stbi_uc *cur = a->out + stride*j;
-      stbi_uc *prior;
+      // cur/prior filter buffers alternate
+      stbi_uc *cur = filter_buf + (j & 1)*img_width_bytes;
+      stbi_uc *prior = filter_buf + (~j & 1)*img_width_bytes;
+      stbi_uc *dest = a->out + stride*j;
+      int nk = width * filter_bytes;
       int filter = *raw++;
 
-      if (filter > 4)
-         return stbi__err("invalid filter","Corrupt PNG");
-
-      if (depth < 8) {
-         if (img_width_bytes > x) return stbi__err("invalid width","Corrupt PNG");
-         cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
-         filter_bytes = 1;
-         width = img_width_bytes;
+      // check filter type
+      if (filter > 4) {
+         all_ok = stbi__err("invalid filter","Corrupt PNG");
+         break;
       }
-      prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above
 
       // if first row, use special filter that doesn't sample previous row
       if (j == 0) filter = first_row_filter[filter];
 
-      // handle first byte explicitly
-      for (k=0; k < filter_bytes; ++k) {
-         switch (filter) {
-            case STBI__F_none       : cur[k] = raw[k]; break;
-            case STBI__F_sub        : cur[k] = raw[k]; break;
-            case STBI__F_up         : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
-            case STBI__F_avg        : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break;
-            case STBI__F_paeth      : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break;
-            case STBI__F_avg_first  : cur[k] = raw[k]; break;
-            case STBI__F_paeth_first: cur[k] = raw[k]; break;
-         }
-      }
-
-      if (depth == 8) {
-         if (img_n != out_n)
-            cur[img_n] = 255; // first pixel
-         raw += img_n;
-         cur += out_n;
-         prior += out_n;
-      } else if (depth == 16) {
-         if (img_n != out_n) {
-            cur[filter_bytes]   = 255; // first pixel top byte
-            cur[filter_bytes+1] = 255; // first pixel bottom byte
-         }
-         raw += filter_bytes;
-         cur += output_bytes;
-         prior += output_bytes;
-      } else {
-         raw += 1;
-         cur += 1;
-         prior += 1;
+      // perform actual filtering
+      switch (filter) {
+      case STBI__F_none:
+         memcpy(cur, raw, nk);
+         break;
+      case STBI__F_sub:
+         memcpy(cur, raw, filter_bytes);
+         for (k = filter_bytes; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]);
+         break;
+      case STBI__F_up:
+         for (k = 0; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + prior[k]);
+         break;
+      case STBI__F_avg:
+         for (k = 0; k < filter_bytes; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1));
+         for (k = filter_bytes; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1));
+         break;
+      case STBI__F_paeth:
+         for (k = 0; k < filter_bytes; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + prior[k]); // prior[k] == stbi__paeth(0,prior[k],0)
+         for (k = filter_bytes; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes], prior[k], prior[k-filter_bytes]));
+         break;
+      case STBI__F_avg_first:
+         memcpy(cur, raw, filter_bytes);
+         for (k = filter_bytes; k < nk; ++k)
+            cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1));
+         break;
       }
 
-      // this is a little gross, so that we don't switch per-pixel or per-component
-      if (depth < 8 || img_n == out_n) {
-         int nk = (width - 1)*filter_bytes;
-         #define STBI__CASE(f) \
-             case f:     \
-                for (k=0; k < nk; ++k)
-         switch (filter) {
-            // "none" filter turns into a memcpy here; make that explicit.
-            case STBI__F_none:         memcpy(cur, raw, nk); break;
-            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break;
-            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
-            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break;
-            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break;
-            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break;
-            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break;
-         }
-         #undef STBI__CASE
-         raw += nk;
-      } else {
-         STBI_ASSERT(img_n+1 == out_n);
-         #define STBI__CASE(f) \
-             case f:     \
-                for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \
-                   for (k=0; k < filter_bytes; ++k)
-         switch (filter) {
-            STBI__CASE(STBI__F_none)         { cur[k] = raw[k]; } break;
-            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break;
-            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
-            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break;
-            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break;
-            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break;
-            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break;
-         }
-         #undef STBI__CASE
-
-         // the loop above sets the high byte of the pixels' alpha, but for
-         // 16 bit png files we also need the low byte set. we'll do that here.
-         if (depth == 16) {
-            cur = a->out + stride*j; // start at the beginning of the row again
-            for (i=0; i < x; ++i,cur+=output_bytes) {
-               cur[filter_bytes+1] = 255;
-            }
-         }
-      }
-   }
+      raw += nk;
 
-   // we make a separate pass to expand bits to pixels; for performance,
-   // this could run two scanlines behind the above code, so it won't
-   // intefere with filtering but will still be in the cache.
-   if (depth < 8) {
-      for (j=0; j < y; ++j) {
-         stbi_uc *cur = a->out + stride*j;
-         stbi_uc *in  = a->out + stride*j + x*out_n - img_width_bytes;
-         // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit
-         // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop
+      // expand decoded bits in cur to dest, also adding an extra alpha channel if desired
+      if (depth < 8) {
          stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range
+         stbi_uc *in = cur;
+         stbi_uc *out = dest;
+         stbi_uc inb = 0;
+         stbi__uint32 nsmp = x*img_n;
 
-         // note that the final byte might overshoot and write more data than desired.
-         // we can allocate enough data that this never writes out of memory, but it
-         // could also overwrite the next scanline. can it overwrite non-empty data
-         // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel.
-         // so we need to explicitly clamp the final ones
-
+         // expand bits to bytes first
          if (depth == 4) {
-            for (k=x*img_n; k >= 2; k-=2, ++in) {
-               *cur++ = scale * ((*in >> 4)       );
-               *cur++ = scale * ((*in     ) & 0x0f);
+            for (i=0; i < nsmp; ++i) {
+               if ((i & 1) == 0) inb = *in++;
+               *out++ = scale * (inb >> 4);
+               inb <<= 4;
             }
-            if (k > 0) *cur++ = scale * ((*in >> 4)       );
          } else if (depth == 2) {
-            for (k=x*img_n; k >= 4; k-=4, ++in) {
-               *cur++ = scale * ((*in >> 6)       );
-               *cur++ = scale * ((*in >> 4) & 0x03);
-               *cur++ = scale * ((*in >> 2) & 0x03);
-               *cur++ = scale * ((*in     ) & 0x03);
+            for (i=0; i < nsmp; ++i) {
+               if ((i & 3) == 0) inb = *in++;
+               *out++ = scale * (inb >> 6);
+               inb <<= 2;
             }
-            if (k > 0) *cur++ = scale * ((*in >> 6)       );
-            if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03);
-            if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03);
-         } else if (depth == 1) {
-            for (k=x*img_n; k >= 8; k-=8, ++in) {
-               *cur++ = scale * ((*in >> 7)       );
-               *cur++ = scale * ((*in >> 6) & 0x01);
-               *cur++ = scale * ((*in >> 5) & 0x01);
-               *cur++ = scale * ((*in >> 4) & 0x01);
-               *cur++ = scale * ((*in >> 3) & 0x01);
-               *cur++ = scale * ((*in >> 2) & 0x01);
-               *cur++ = scale * ((*in >> 1) & 0x01);
-               *cur++ = scale * ((*in     ) & 0x01);
+         } else {
+            STBI_ASSERT(depth == 1);
+            for (i=0; i < nsmp; ++i) {
+               if ((i & 7) == 0) inb = *in++;
+               *out++ = scale * (inb >> 7);
+               inb <<= 1;
             }
-            if (k > 0) *cur++ = scale * ((*in >> 7)       );
-            if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01);
-            if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01);
-            if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01);
-            if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01);
-            if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01);
-            if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01);
          }
-         if (img_n != out_n) {
-            int q;
-            // insert alpha = 255
-            cur = a->out + stride*j;
+
+         // insert alpha=255 values if desired
+         if (img_n != out_n)
+            stbi__create_png_alpha_expand8(dest, dest, x, img_n);
+      } else if (depth == 8) {
+         if (img_n == out_n)
+            memcpy(dest, cur, x*img_n);
+         else
+            stbi__create_png_alpha_expand8(dest, cur, x, img_n);
+      } else if (depth == 16) {
+         // convert the image data from big-endian to platform-native
+         stbi__uint16 *dest16 = (stbi__uint16*)dest;
+         stbi__uint32 nsmp = x*img_n;
+
+         if (img_n == out_n) {
+            for (i = 0; i < nsmp; ++i, ++dest16, cur += 2)
+               *dest16 = (cur[0] << 8) | cur[1];
+         } else {
+            STBI_ASSERT(img_n+1 == out_n);
             if (img_n == 1) {
-               for (q=x-1; q >= 0; --q) {
-                  cur[q*2+1] = 255;
-                  cur[q*2+0] = cur[q];
+               for (i = 0; i < x; ++i, dest16 += 2, cur += 2) {
+                  dest16[0] = (cur[0] << 8) | cur[1];
+                  dest16[1] = 0xffff;
                }
             } else {
                STBI_ASSERT(img_n == 3);
-               for (q=x-1; q >= 0; --q) {
-                  cur[q*4+3] = 255;
-                  cur[q*4+2] = cur[q*3+2];
-                  cur[q*4+1] = cur[q*3+1];
-                  cur[q*4+0] = cur[q*3+0];
+               for (i = 0; i < x; ++i, dest16 += 4, cur += 6) {
+                  dest16[0] = (cur[0] << 8) | cur[1];
+                  dest16[1] = (cur[2] << 8) | cur[3];
+                  dest16[2] = (cur[4] << 8) | cur[5];
+                  dest16[3] = 0xffff;
                }
             }
          }
       }
-   } else if (depth == 16) {
-      // force the image data from big-endian to platform-native.
-      // this is done in a separate pass due to the decoding relying
-      // on the data being untouched, but could probably be done
-      // per-line during decode if care is taken.
-      stbi_uc *cur = a->out;
-      stbi__uint16 *cur16 = (stbi__uint16*)cur;
-
-      for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) {
-         *cur16 = (cur[0] << 8) | cur[1];
-      }
    }
 
+   STBI_FREE(filter_buf);
+   if (!all_ok) return 0;
+
    return 1;
 }
 
@@ -5033,6 +5087,7 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
    z->expanded = NULL;
    z->idata = NULL;
    z->out = NULL;
+   z->gamma = 0;
 
    if (!stbi__check_png_header(s)) return 0;
 
@@ -5065,14 +5120,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
             if (!pal_img_n) {
                s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
                if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
-               if (scan == STBI__SCAN_header) return 1;
             } else {
                // if paletted, then pal_n is our final components, and
                // img_n is # components to decompress/filter.
                s->img_n = 1;
                if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG");
-               // if SCAN_header, have to scan to see if we have a tRNS
             }
+            // even with SCAN_header, have to scan to see if we have a tRNS
             break;
          }
 
@@ -5104,6 +5158,8 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
                if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG");
                if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG");
                has_trans = 1;
+               // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now.
+               if (scan == STBI__SCAN_header) { ++s->img_n; return 1; }
                if (z->depth == 16) {
                   for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
                } else {
@@ -5123,7 +5179,13 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
          case STBI__PNG_TYPE('I','D','A','T'): {
             if (first) return stbi__err("first not IHDR", "Corrupt PNG");
             if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG");
-            if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; }
+            if (scan == STBI__SCAN_header) {
+               // header scan definitely stops at first IDAT
+               if (pal_img_n)
+                  s->img_n = pal_img_n;
+               return 1;
+            }
+            if (c.length > (1u << 30)) return stbi__err("IDAT size limit", "IDAT section larger than 2^30 bytes");
             if ((int)(ioff + c.length) < (int)ioff) return 0;
             if (ioff + c.length > idata_limit) {
                stbi__uint32 idata_limit_old = idata_limit;
@@ -5240,6 +5302,7 @@ static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req
 {
    stbi__png p;
    p.s = s;
+   p.gamma = 0;
    return stbi__do_png(&p, x,y,comp,req_comp, ri);
 }
 
@@ -5268,6 +5331,7 @@ static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp, float *ga
 {
    stbi__png p;
    p.s = s;
+   p.gamma = 0;
    return stbi__png_info_raw(&p, x, y, comp, gamma);
 }
 
@@ -5275,6 +5339,7 @@ static int stbi__png_is16(stbi__context *s)
 {
    stbi__png p;
    p.s = s;
+   p.gamma = 0;
    if (!stbi__png_info_raw(&p, NULL, NULL, NULL, NULL))
 	   return 0;
    if (p.depth != 16) {
@@ -5507,8 +5572,22 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req
          psize = (info.offset - info.extra_read - info.hsz) >> 2;
    }
    if (psize == 0) {
-      if (info.offset != s->callback_already_read + (s->img_buffer - s->img_buffer_original)) {
-        return stbi__errpuc("bad offset", "Corrupt BMP");
+      // accept some number of extra bytes after the header, but if the offset points either to before
+      // the header ends or implies a large amount of extra data, reject the file as malformed
+      int bytes_read_so_far = s->callback_already_read + (int)(s->img_buffer - s->img_buffer_original);
+      int header_limit = 1024; // max we actually read is below 256 bytes currently.
+      int extra_data_limit = 256*4; // what ordinarily goes here is a palette; 256 entries*4 bytes is its max size.
+      if (bytes_read_so_far <= 0 || bytes_read_so_far > header_limit) {
+         return stbi__errpuc("bad header", "Corrupt BMP");
+      }
+      // we established that bytes_read_so_far is positive and sensible.
+      // the first half of this test rejects offsets that are either too small positives, or
+      // negative, and guarantees that info.offset >= bytes_read_so_far > 0. this in turn
+      // ensures the number computed in the second half of the test can't overflow.
+      if (info.offset < bytes_read_so_far || info.offset - bytes_read_so_far > extra_data_limit) {
+         return stbi__errpuc("bad offset", "Corrupt BMP");
+      } else {
+         stbi__skip(s, info.offset - bytes_read_so_far);
       }
    }
 
@@ -7196,12 +7275,12 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re
                   // Run
                   value = stbi__get8(s);
                   count -= 128;
-                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
+                  if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
                   for (z = 0; z < count; ++z)
                      scanline[i++ * 4 + k] = value;
                } else {
                   // Dump
-                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
+                  if ((count == 0) || (count > nleft)) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
                   for (z = 0; z < count; ++z)
                      scanline[i++ * 4 + k] = stbi__get8(s);
                }
@@ -7455,10 +7534,17 @@ static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req
 
    out = (stbi_uc *) stbi__malloc_mad4(s->img_n, s->img_x, s->img_y, ri->bits_per_channel / 8, 0);
    if (!out) return stbi__errpuc("outofmem", "Out of memory");
-   stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8));
+   if (!stbi__getn(s, out, s->img_n * s->img_x * s->img_y * (ri->bits_per_channel / 8))) {
+      STBI_FREE(out);
+      return stbi__errpuc("bad PNM", "PNM file truncated");
+   }
 
    if (req_comp && req_comp != s->img_n) {
-      out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
+      if (ri->bits_per_channel == 16) {
+         out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, s->img_n, req_comp, s->img_x, s->img_y);
+      } else {
+         out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
+      }
       if (out == NULL) return out; // stbi__convert_format frees input on failure
    }
    return out;
@@ -7495,6 +7581,8 @@ static int      stbi__pnm_getinteger(stbi__context *s, char *c)
    while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) {
       value = value*10 + (*c - '0');
       *c = (char) stbi__get8(s);
+      if((value > 214748364) || (value == 214748364 && *c > '7'))
+          return stbi__err("integer parse overflow", "Parsing an integer in the PPM header overflowed a 32-bit int");
    }
 
    return value;
@@ -7525,9 +7613,13 @@ static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp)
    stbi__pnm_skip_whitespace(s, &c);
 
    *x = stbi__pnm_getinteger(s, &c); // read width
+   if(*x == 0)
+       return stbi__err("invalid width", "PPM image header had zero or overflowing width");
    stbi__pnm_skip_whitespace(s, &c);
 
    *y = stbi__pnm_getinteger(s, &c); // read height
+   if (*y == 0)
+       return stbi__err("invalid width", "PPM image header had zero or overflowing width");
    stbi__pnm_skip_whitespace(s, &c);
 
    maxv = stbi__pnm_getinteger(s, &c);  // read max value
diff --git a/pxr/imaging/hio/stb/stb_image.patch b/pxr/imaging/hio/stb/stb_image.patch
index 22fc041cba..6bf059d6ae 100644
--- a/pxr/imaging/hio/stb/stb_image.patch
+++ b/pxr/imaging/hio/stb/stb_image.patch
@@ -1,6 +1,6 @@
---- stb/stb_image.h	2021-09-16 11:52:38.284782000 -0700k
-+++ stb_image.h	2021-09-16 13:45:48.159770000 -0700
-@@ -488,14 +488,14 @@
+--- original/stb_image.h	2024-05-21 15:30:18.887733957 -0700
++++ stb_image.h	2024-05-21 15:17:49.371401403 -0700
+@@ -490,14 +490,14 @@
  STBIDEF void     stbi_image_free      (void *retval_from_stbi_load);
  
  // get image dimensions & components without fully decoding
@@ -19,7 +19,7 @@
  STBIDEF int      stbi_is_16_bit          (char const *filename);
  STBIDEF int      stbi_is_16_bit_from_file(FILE *f);
  #endif
-@@ -911,7 +911,7 @@
+@@ -913,7 +913,7 @@
  #ifndef STBI_NO_PNG
  static int      stbi__png_test(stbi__context *s);
  static void    *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
@@ -28,24 +28,23 @@
  static int      stbi__png_is16(stbi__context *s);
  #endif
  
-@@ -4554,6 +4554,7 @@
+@@ -4631,6 +4631,7 @@
     stbi__context *s;
     stbi_uc *idata, *expanded, *out;
     int depth;
-+   float gamma = 0;
++   float gamma;
  } stbi__png;
  
  
-@@ -4955,7 +4956,7 @@
- static STBI_THREAD_LOCAL int stbi__unpremultiply_on_load_local, stbi__unpremultiply_on_load_set;
- static STBI_THREAD_LOCAL int stbi__de_iphone_flag_local, stbi__de_iphone_flag_set;
+@@ -5086,6 +5087,7 @@
+    z->expanded = NULL;
+    z->idata = NULL;
+    z->out = NULL;
++   z->gamma = 0;
  
--STBIDEF void stbi__unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply)
-+STBIDEF void stbi_set_unpremultiply_on_load_thread(int flag_true_if_should_unpremultiply)
- {
-    stbi__unpremultiply_on_load_local = flag_true_if_should_unpremultiply;
-    stbi__unpremultiply_on_load_set = 1;
-@@ -5112,6 +5113,13 @@
+    if (!stbi__check_png_header(s)) return 0;
+ 
+@@ -5167,6 +5169,13 @@
              break;
           }
  
@@ -59,7 +58,15 @@
           case STBI__PNG_TYPE('I','D','A','T'): {
              if (first) return stbi__err("first not IHDR", "Corrupt PNG");
              if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG");
-@@ -5243,7 +5251,7 @@
+@@ -5293,6 +5302,7 @@
+ {
+    stbi__png p;
+    p.s = s;
++   p.gamma = 0;
+    return stbi__do_png(&p, x,y,comp,req_comp, ri);
+ }
+ 
+@@ -5304,7 +5314,7 @@
     return r;
  }
  
@@ -68,7 +75,7 @@
  {
     if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) {
        stbi__rewind( p->s );
-@@ -5252,21 +5260,22 @@
+@@ -5313,21 +5323,24 @@
     if (x) *x = p->s->img_x;
     if (y) *y = p->s->img_y;
     if (comp) *comp = p->s->img_n;
@@ -82,6 +89,7 @@
     stbi__png p;
     p.s = s;
 -   return stbi__png_info_raw(&p, x, y, comp);
++   p.gamma = 0;
 +   return stbi__png_info_raw(&p, x, y, comp, gamma);
  }
  
@@ -90,11 +98,12 @@
     stbi__png p;
     p.s = s;
 -   if (!stbi__png_info_raw(&p, NULL, NULL, NULL))
++   p.gamma = 0;
 +   if (!stbi__png_info_raw(&p, NULL, NULL, NULL, NULL))
  	   return 0;
     if (p.depth != 16) {
        stbi__rewind(p.s);
-@@ -7538,14 +7547,14 @@
+@@ -7626,14 +7639,14 @@
  }
  #endif
  
@@ -111,7 +120,7 @@
     #endif
  
     #ifndef STBI_NO_GIF
-@@ -7597,23 +7606,23 @@
+@@ -7685,23 +7698,23 @@
  }
  
  #ifndef STBI_NO_STDIO
@@ -139,7 +148,7 @@
     fseek(f,pos,SEEK_SET);
     return r;
  }
-@@ -7640,18 +7649,18 @@
+@@ -7728,18 +7741,18 @@
  }
  #endif // !STBI_NO_STDIO
  
diff --git a/pxr/imaging/hio/stb/stb_image_resize.h b/pxr/imaging/hio/stb/stb_image_resize.h
deleted file mode 100644
index ef9e6fe870..0000000000
--- a/pxr/imaging/hio/stb/stb_image_resize.h
+++ /dev/null
@@ -1,2634 +0,0 @@
-/* stb_image_resize - v0.97 - public domain image resizing
-   by Jorge L Rodriguez (@VinoBS) - 2014
-   http://github.com/nothings/stb
-
-   Written with emphasis on usability, portability, and efficiency. (No
-   SIMD or threads, so it be easily outperformed by libs that use those.)
-   Only scaling and translation is supported, no rotations or shears.
-   Easy API downsamples w/Mitchell filter, upsamples w/cubic interpolation.
-
-   COMPILING & LINKING
-      In one C/C++ file that #includes this file, do this:
-         #define STB_IMAGE_RESIZE_IMPLEMENTATION
-      before the #include. That will create the implementation in that file.
-
-   QUICKSTART
-      stbir_resize_uint8(      input_pixels , in_w , in_h , 0,
-                               output_pixels, out_w, out_h, 0, num_channels)
-      stbir_resize_float(...)
-      stbir_resize_uint8_srgb( input_pixels , in_w , in_h , 0,
-                               output_pixels, out_w, out_h, 0,
-                               num_channels , alpha_chan  , 0)
-      stbir_resize_uint8_srgb_edgemode(
-                               input_pixels , in_w , in_h , 0,
-                               output_pixels, out_w, out_h, 0,
-                               num_channels , alpha_chan  , 0, STBIR_EDGE_CLAMP)
-                                                            // WRAP/REFLECT/ZERO
-
-   FULL API
-      See the "header file" section of the source for API documentation.
-
-   ADDITIONAL DOCUMENTATION
-
-      SRGB & FLOATING POINT REPRESENTATION
-         The sRGB functions presume IEEE floating point. If you do not have
-         IEEE floating point, define STBIR_NON_IEEE_FLOAT. This will use
-         a slower implementation.
-
-      MEMORY ALLOCATION
-         The resize functions here perform a single memory allocation using
-         malloc. To control the memory allocation, before the #include that
-         triggers the implementation, do:
-
-            #define STBIR_MALLOC(size,context) ...
-            #define STBIR_FREE(ptr,context)   ...
-
-         Each resize function makes exactly one call to malloc/free, so to use
-         temp memory, store the temp memory in the context and return that.
-
-      ASSERT
-         Define STBIR_ASSERT(boolval) to override assert() and not use assert.h
-
-      OPTIMIZATION
-         Define STBIR_SATURATE_INT to compute clamp values in-range using
-         integer operations instead of float operations. This may be faster
-         on some platforms.
-
-      DEFAULT FILTERS
-         For functions which don't provide explicit control over what filters
-         to use, you can change the compile-time defaults with
-
-            #define STBIR_DEFAULT_FILTER_UPSAMPLE     STBIR_FILTER_something
-            #define STBIR_DEFAULT_FILTER_DOWNSAMPLE   STBIR_FILTER_something
-
-         See stbir_filter in the header-file section for the list of filters.
-
-      NEW FILTERS
-         A number of 1D filter kernels are used. For a list of
-         supported filters see the stbir_filter enum. To add a new filter,
-         write a filter function and add it to stbir__filter_info_table.
-
-      PROGRESS
-         For interactive use with slow resize operations, you can install
-         a progress-report callback:
-
-            #define STBIR_PROGRESS_REPORT(val)   some_func(val)
-
-         The parameter val is a float which goes from 0 to 1 as progress is made.
-
-         For example:
-
-            static void my_progress_report(float progress);
-            #define STBIR_PROGRESS_REPORT(val) my_progress_report(val)
-
-            #define STB_IMAGE_RESIZE_IMPLEMENTATION
-            #include "stb_image_resize.h"
-
-            static void my_progress_report(float progress)
-            {
-               printf("Progress: %f%%\n", progress*100);
-            }
-
-      MAX CHANNELS
-         If your image has more than 64 channels, define STBIR_MAX_CHANNELS
-         to the max you'll have.
-
-      ALPHA CHANNEL
-         Most of the resizing functions provide the ability to control how
-         the alpha channel of an image is processed. The important things
-         to know about this:
-
-         1. The best mathematically-behaved version of alpha to use is
-         called "premultiplied alpha", in which the other color channels
-         have had the alpha value multiplied in. If you use premultiplied
-         alpha, linear filtering (such as image resampling done by this
-         library, or performed in texture units on GPUs) does the "right
-         thing". While premultiplied alpha is standard in the movie CGI
-         industry, it is still uncommon in the videogame/real-time world.
-
-         If you linearly filter non-premultiplied alpha, strange effects
-         occur. (For example, the 50/50 average of 99% transparent bright green
-         and 1% transparent black produces 50% transparent dark green when
-         non-premultiplied, whereas premultiplied it produces 50%
-         transparent near-black. The former introduces green energy
-         that doesn't exist in the source image.)
-
-         2. Artists should not edit premultiplied-alpha images; artists
-         want non-premultiplied alpha images. Thus, art tools generally output
-         non-premultiplied alpha images.
-
-         3. You will get best results in most cases by converting images
-         to premultiplied alpha before processing them mathematically.
-
-         4. If you pass the flag STBIR_FLAG_ALPHA_PREMULTIPLIED, the
-         resizer does not do anything special for the alpha channel;
-         it is resampled identically to other channels. This produces
-         the correct results for premultiplied-alpha images, but produces
-         less-than-ideal results for non-premultiplied-alpha images.
-
-         5. If you do not pass the flag STBIR_FLAG_ALPHA_PREMULTIPLIED,
-         then the resizer weights the contribution of input pixels
-         based on their alpha values, or, equivalently, it multiplies
-         the alpha value into the color channels, resamples, then divides
-         by the resultant alpha value. Input pixels which have alpha=0 do
-         not contribute at all to output pixels unless _all_ of the input
-         pixels affecting that output pixel have alpha=0, in which case
-         the result for that pixel is the same as it would be without
-         STBIR_FLAG_ALPHA_PREMULTIPLIED. However, this is only true for
-         input images in integer formats. For input images in float format,
-         input pixels with alpha=0 have no effect, and output pixels
-         which have alpha=0 will be 0 in all channels. (For float images,
-         you can manually achieve the same result by adding a tiny epsilon
-         value to the alpha channel of every image, and then subtracting
-         or clamping it at the end.)
-
-         6. You can suppress the behavior described in #5 and make
-         all-0-alpha pixels have 0 in all channels by #defining
-         STBIR_NO_ALPHA_EPSILON.
-
-         7. You can separately control whether the alpha channel is
-         interpreted as linear or affected by the colorspace. By default
-         it is linear; you almost never want to apply the colorspace.
-         (For example, graphics hardware does not apply sRGB conversion
-         to the alpha channel.)
-
-   CONTRIBUTORS
-      Jorge L Rodriguez: Implementation
-      Sean Barrett: API design, optimizations
-      Aras Pranckevicius: bugfix
-      Nathan Reed: warning fixes
-
-   REVISIONS
-      0.97 (2020-02-02) fixed warning
-      0.96 (2019-03-04) fixed warnings
-      0.95 (2017-07-23) fixed warnings
-      0.94 (2017-03-18) fixed warnings
-      0.93 (2017-03-03) fixed bug with certain combinations of heights
-      0.92 (2017-01-02) fix integer overflow on large (>2GB) images
-      0.91 (2016-04-02) fix warnings; fix handling of subpixel regions
-      0.90 (2014-09-17) first released version
-
-   LICENSE
-     See end of file for license information.
-
-   TODO
-      Don't decode all of the image data when only processing a partial tile
-      Don't use full-width decode buffers when only processing a partial tile
-      When processing wide images, break processing into tiles so data fits in L1 cache
-      Installable filters?
-      Resize that respects alpha test coverage
-         (Reference code: FloatImage::alphaTestCoverage and FloatImage::scaleAlphaToCoverage:
-         https://code.google.com/p/nvidia-texture-tools/source/browse/trunk/src/nvimage/FloatImage.cpp )
-*/
-
-#ifndef STBIR_INCLUDE_STB_IMAGE_RESIZE_H
-#define STBIR_INCLUDE_STB_IMAGE_RESIZE_H
-
-#ifdef _MSC_VER
-typedef unsigned char  stbir_uint8;
-typedef unsigned short stbir_uint16;
-typedef unsigned int   stbir_uint32;
-#else
-#include <stdint.h>
-typedef uint8_t  stbir_uint8;
-typedef uint16_t stbir_uint16;
-typedef uint32_t stbir_uint32;
-#endif
-
-#ifndef STBIRDEF
-#ifdef STB_IMAGE_RESIZE_STATIC
-#define STBIRDEF static
-#else
-#ifdef __cplusplus
-#define STBIRDEF extern "C"
-#else
-#define STBIRDEF extern
-#endif
-#endif
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Easy-to-use API:
-//
-//     * "input pixels" points to an array of image data with 'num_channels' channels (e.g. RGB=3, RGBA=4)
-//     * input_w is input image width (x-axis), input_h is input image height (y-axis)
-//     * stride is the offset between successive rows of image data in memory, in bytes. you can
-//       specify 0 to mean packed continuously in memory
-//     * alpha channel is treated identically to other channels.
-//     * colorspace is linear or sRGB as specified by function name
-//     * returned result is 1 for success or 0 in case of an error.
-//       #define STBIR_ASSERT() to trigger an assert on parameter validation errors.
-//     * Memory required grows approximately linearly with input and output size, but with
-//       discontinuities at input_w == output_w and input_h == output_h.
-//     * These functions use a "default" resampling filter defined at compile time. To change the filter,
-//       you can change the compile-time defaults by #defining STBIR_DEFAULT_FILTER_UPSAMPLE
-//       and STBIR_DEFAULT_FILTER_DOWNSAMPLE, or you can use the medium-complexity API.
-
-STBIRDEF int stbir_resize_uint8(     const unsigned char *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                           unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                     int num_channels);
-
-STBIRDEF int stbir_resize_float(     const float *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                           float *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                     int num_channels);
-
-
-// The following functions interpret image data as gamma-corrected sRGB.
-// Specify STBIR_ALPHA_CHANNEL_NONE if you have no alpha channel,
-// or otherwise provide the index of the alpha channel. Flags value
-// of 0 will probably do the right thing if you're not sure what
-// the flags mean.
-
-#define STBIR_ALPHA_CHANNEL_NONE       -1
-
-// Set this flag if your texture has premultiplied alpha. Otherwise, stbir will
-// use alpha-weighted resampling (effectively premultiplying, resampling,
-// then unpremultiplying).
-#define STBIR_FLAG_ALPHA_PREMULTIPLIED    (1 << 0)
-// The specified alpha channel should be handled as gamma-corrected value even
-// when doing sRGB operations.
-#define STBIR_FLAG_ALPHA_USES_COLORSPACE  (1 << 1)
-
-STBIRDEF int stbir_resize_uint8_srgb(const unsigned char *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                           unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                     int num_channels, int alpha_channel, int flags);
-
-
-typedef enum
-{
-    STBIR_EDGE_CLAMP   = 1,
-    STBIR_EDGE_REFLECT = 2,
-    STBIR_EDGE_WRAP    = 3,
-    STBIR_EDGE_ZERO    = 4,
-} stbir_edge;
-
-// This function adds the ability to specify how requests to sample off the edge of the image are handled.
-STBIRDEF int stbir_resize_uint8_srgb_edgemode(const unsigned char *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                                    unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                              int num_channels, int alpha_channel, int flags,
-                                              stbir_edge edge_wrap_mode);
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Medium-complexity API
-//
-// This extends the easy-to-use API as follows:
-//
-//     * Alpha-channel can be processed separately
-//       * If alpha_channel is not STBIR_ALPHA_CHANNEL_NONE
-//         * Alpha channel will not be gamma corrected (unless flags&STBIR_FLAG_GAMMA_CORRECT)
-//         * Filters will be weighted by alpha channel (unless flags&STBIR_FLAG_ALPHA_PREMULTIPLIED)
-//     * Filter can be selected explicitly
-//     * uint16 image type
-//     * sRGB colorspace available for all types
-//     * context parameter for passing to STBIR_MALLOC
-
-typedef enum
-{
-    STBIR_FILTER_DEFAULT      = 0,  // use same filter type that easy-to-use API chooses
-    STBIR_FILTER_BOX          = 1,  // A trapezoid w/1-pixel wide ramps, same result as box for integer scale ratios
-    STBIR_FILTER_TRIANGLE     = 2,  // On upsampling, produces same results as bilinear texture filtering
-    STBIR_FILTER_CUBICBSPLINE = 3,  // The cubic b-spline (aka Mitchell-Netrevalli with B=1,C=0), gaussian-esque
-    STBIR_FILTER_CATMULLROM   = 4,  // An interpolating cubic spline
-    STBIR_FILTER_MITCHELL     = 5,  // Mitchell-Netrevalli filter with B=1/3, C=1/3
-} stbir_filter;
-
-typedef enum
-{
-    STBIR_COLORSPACE_LINEAR,
-    STBIR_COLORSPACE_SRGB,
-
-    STBIR_MAX_COLORSPACES,
-} stbir_colorspace;
-
-// The following functions are all identical except for the type of the image data
-
-STBIRDEF int stbir_resize_uint8_generic( const unsigned char *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                               unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                         int num_channels, int alpha_channel, int flags,
-                                         stbir_edge edge_wrap_mode, stbir_filter filter, stbir_colorspace space,
-                                         void *alloc_context);
-
-STBIRDEF int stbir_resize_uint16_generic(const stbir_uint16 *input_pixels  , int input_w , int input_h , int input_stride_in_bytes,
-                                               stbir_uint16 *output_pixels , int output_w, int output_h, int output_stride_in_bytes,
-                                         int num_channels, int alpha_channel, int flags,
-                                         stbir_edge edge_wrap_mode, stbir_filter filter, stbir_colorspace space,
-                                         void *alloc_context);
-
-STBIRDEF int stbir_resize_float_generic( const float *input_pixels         , int input_w , int input_h , int input_stride_in_bytes,
-                                               float *output_pixels        , int output_w, int output_h, int output_stride_in_bytes,
-                                         int num_channels, int alpha_channel, int flags,
-                                         stbir_edge edge_wrap_mode, stbir_filter filter, stbir_colorspace space,
-                                         void *alloc_context);
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Full-complexity API
-//
-// This extends the medium API as follows:
-//
-//       * uint32 image type
-//     * not typesafe
-//     * separate filter types for each axis
-//     * separate edge modes for each axis
-//     * can specify scale explicitly for subpixel correctness
-//     * can specify image source tile using texture coordinates
-
-typedef enum
-{
-    STBIR_TYPE_UINT8 ,
-    STBIR_TYPE_UINT16,
-    STBIR_TYPE_UINT32,
-    STBIR_TYPE_FLOAT ,
-
-    STBIR_MAX_TYPES
-} stbir_datatype;
-
-STBIRDEF int stbir_resize(         const void *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                         void *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                   stbir_datatype datatype,
-                                   int num_channels, int alpha_channel, int flags,
-                                   stbir_edge edge_mode_horizontal, stbir_edge edge_mode_vertical,
-                                   stbir_filter filter_horizontal,  stbir_filter filter_vertical,
-                                   stbir_colorspace space, void *alloc_context);
-
-STBIRDEF int stbir_resize_subpixel(const void *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                         void *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                   stbir_datatype datatype,
-                                   int num_channels, int alpha_channel, int flags,
-                                   stbir_edge edge_mode_horizontal, stbir_edge edge_mode_vertical,
-                                   stbir_filter filter_horizontal,  stbir_filter filter_vertical,
-                                   stbir_colorspace space, void *alloc_context,
-                                   float x_scale, float y_scale,
-                                   float x_offset, float y_offset);
-
-STBIRDEF int stbir_resize_region(  const void *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                         void *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                   stbir_datatype datatype,
-                                   int num_channels, int alpha_channel, int flags,
-                                   stbir_edge edge_mode_horizontal, stbir_edge edge_mode_vertical,
-                                   stbir_filter filter_horizontal,  stbir_filter filter_vertical,
-                                   stbir_colorspace space, void *alloc_context,
-                                   float s0, float t0, float s1, float t1);
-// (s0, t0) & (s1, t1) are the top-left and bottom right corner (uv addressing style: [0, 1]x[0, 1]) of a region of the input image to use.
-
-//
-//
-////   end header file   /////////////////////////////////////////////////////
-#endif // STBIR_INCLUDE_STB_IMAGE_RESIZE_H
-
-
-
-
-
-#ifdef STB_IMAGE_RESIZE_IMPLEMENTATION
-
-#ifndef STBIR_ASSERT
-#include <assert.h>
-#define STBIR_ASSERT(x) assert(x)
-#endif
-
-// For memset
-#include <string.h>
-
-#include <math.h>
-
-#ifndef STBIR_MALLOC
-#include <stdlib.h>
-// use comma operator to evaluate c, to avoid "unused parameter" warnings
-#define STBIR_MALLOC(size,c) ((void)(c), malloc(size))
-#define STBIR_FREE(ptr,c)    ((void)(c), free(ptr))
-#endif
-
-#ifndef _MSC_VER
-#ifdef __cplusplus
-#define stbir__inline inline
-#else
-#define stbir__inline
-#endif
-#else
-#define stbir__inline __forceinline
-#endif
-
-
-// should produce compiler error if size is wrong
-typedef unsigned char stbir__validate_uint32[sizeof(stbir_uint32) == 4 ? 1 : -1];
-
-#ifdef _MSC_VER
-#define STBIR__NOTUSED(v)  (void)(v)
-#else
-#define STBIR__NOTUSED(v)  (void)sizeof(v)
-#endif
-
-#define STBIR__ARRAY_SIZE(a) (sizeof((a))/sizeof((a)[0]))
-
-#ifndef STBIR_DEFAULT_FILTER_UPSAMPLE
-#define STBIR_DEFAULT_FILTER_UPSAMPLE    STBIR_FILTER_CATMULLROM
-#endif
-
-#ifndef STBIR_DEFAULT_FILTER_DOWNSAMPLE
-#define STBIR_DEFAULT_FILTER_DOWNSAMPLE  STBIR_FILTER_MITCHELL
-#endif
-
-#ifndef STBIR_PROGRESS_REPORT
-#define STBIR_PROGRESS_REPORT(float_0_to_1)
-#endif
-
-#ifndef STBIR_MAX_CHANNELS
-#define STBIR_MAX_CHANNELS 64
-#endif
-
-#if STBIR_MAX_CHANNELS > 65536
-#error "Too many channels; STBIR_MAX_CHANNELS must be no more than 65536."
-// because we store the indices in 16-bit variables
-#endif
-
-// This value is added to alpha just before premultiplication to avoid
-// zeroing out color values. It is equivalent to 2^-80. If you don't want
-// that behavior (it may interfere if you have floating point images with
-// very small alpha values) then you can define STBIR_NO_ALPHA_EPSILON to
-// disable it.
-#ifndef STBIR_ALPHA_EPSILON
-#define STBIR_ALPHA_EPSILON ((float)1 / (1 << 20) / (1 << 20) / (1 << 20) / (1 << 20))
-#endif
-
-
-
-#ifdef _MSC_VER
-#define STBIR__UNUSED_PARAM(v)  (void)(v)
-#else
-#define STBIR__UNUSED_PARAM(v)  (void)sizeof(v)
-#endif
-
-// must match stbir_datatype
-static unsigned char stbir__type_size[] = {
-    1, // STBIR_TYPE_UINT8
-    2, // STBIR_TYPE_UINT16
-    4, // STBIR_TYPE_UINT32
-    4, // STBIR_TYPE_FLOAT
-};
-
-// Kernel function centered at 0
-typedef float (stbir__kernel_fn)(float x, float scale);
-typedef float (stbir__support_fn)(float scale);
-
-typedef struct
-{
-    stbir__kernel_fn* kernel;
-    stbir__support_fn* support;
-} stbir__filter_info;
-
-// When upsampling, the contributors are which source pixels contribute.
-// When downsampling, the contributors are which destination pixels are contributed to.
-typedef struct
-{
-    int n0; // First contributing pixel
-    int n1; // Last contributing pixel
-} stbir__contributors;
-
-typedef struct
-{
-    const void* input_data;
-    int input_w;
-    int input_h;
-    int input_stride_bytes;
-
-    void* output_data;
-    int output_w;
-    int output_h;
-    int output_stride_bytes;
-
-    float s0, t0, s1, t1;
-
-    float horizontal_shift; // Units: output pixels
-    float vertical_shift;   // Units: output pixels
-    float horizontal_scale;
-    float vertical_scale;
-
-    int channels;
-    int alpha_channel;
-    stbir_uint32 flags;
-    stbir_datatype type;
-    stbir_filter horizontal_filter;
-    stbir_filter vertical_filter;
-    stbir_edge edge_horizontal;
-    stbir_edge edge_vertical;
-    stbir_colorspace colorspace;
-
-    stbir__contributors* horizontal_contributors;
-    float* horizontal_coefficients;
-
-    stbir__contributors* vertical_contributors;
-    float* vertical_coefficients;
-
-    int decode_buffer_pixels;
-    float* decode_buffer;
-
-    float* horizontal_buffer;
-
-    // cache these because ceil/floor are inexplicably showing up in profile
-    int horizontal_coefficient_width;
-    int vertical_coefficient_width;
-    int horizontal_filter_pixel_width;
-    int vertical_filter_pixel_width;
-    int horizontal_filter_pixel_margin;
-    int vertical_filter_pixel_margin;
-    int horizontal_num_contributors;
-    int vertical_num_contributors;
-
-    int ring_buffer_length_bytes;   // The length of an individual entry in the ring buffer. The total number of ring buffers is stbir__get_filter_pixel_width(filter)
-    int ring_buffer_num_entries;    // Total number of entries in the ring buffer.
-    int ring_buffer_first_scanline;
-    int ring_buffer_last_scanline;
-    int ring_buffer_begin_index;    // first_scanline is at this index in the ring buffer
-    float* ring_buffer;
-
-    float* encode_buffer; // A temporary buffer to store floats so we don't lose precision while we do multiply-adds.
-
-    int horizontal_contributors_size;
-    int horizontal_coefficients_size;
-    int vertical_contributors_size;
-    int vertical_coefficients_size;
-    int decode_buffer_size;
-    int horizontal_buffer_size;
-    int ring_buffer_size;
-    int encode_buffer_size;
-} stbir__info;
-
-
-static const float stbir__max_uint8_as_float  = 255.0f;
-static const float stbir__max_uint16_as_float = 65535.0f;
-static const double stbir__max_uint32_as_float = 4294967295.0;
-
-
-static stbir__inline int stbir__min(int a, int b)
-{
-    return a < b ? a : b;
-}
-
-static stbir__inline float stbir__saturate(float x)
-{
-    if (x < 0)
-        return 0;
-
-    if (x > 1)
-        return 1;
-
-    return x;
-}
-
-#ifdef STBIR_SATURATE_INT
-static stbir__inline stbir_uint8 stbir__saturate8(int x)
-{
-    if ((unsigned int) x <= 255)
-        return x;
-
-    if (x < 0)
-        return 0;
-
-    return 255;
-}
-
-static stbir__inline stbir_uint16 stbir__saturate16(int x)
-{
-    if ((unsigned int) x <= 65535)
-        return x;
-
-    if (x < 0)
-        return 0;
-
-    return 65535;
-}
-#endif
-
-static float stbir__srgb_uchar_to_linear_float[256] = {
-    0.000000f, 0.000304f, 0.000607f, 0.000911f, 0.001214f, 0.001518f, 0.001821f, 0.002125f, 0.002428f, 0.002732f, 0.003035f,
-    0.003347f, 0.003677f, 0.004025f, 0.004391f, 0.004777f, 0.005182f, 0.005605f, 0.006049f, 0.006512f, 0.006995f, 0.007499f,
-    0.008023f, 0.008568f, 0.009134f, 0.009721f, 0.010330f, 0.010960f, 0.011612f, 0.012286f, 0.012983f, 0.013702f, 0.014444f,
-    0.015209f, 0.015996f, 0.016807f, 0.017642f, 0.018500f, 0.019382f, 0.020289f, 0.021219f, 0.022174f, 0.023153f, 0.024158f,
-    0.025187f, 0.026241f, 0.027321f, 0.028426f, 0.029557f, 0.030713f, 0.031896f, 0.033105f, 0.034340f, 0.035601f, 0.036889f,
-    0.038204f, 0.039546f, 0.040915f, 0.042311f, 0.043735f, 0.045186f, 0.046665f, 0.048172f, 0.049707f, 0.051269f, 0.052861f,
-    0.054480f, 0.056128f, 0.057805f, 0.059511f, 0.061246f, 0.063010f, 0.064803f, 0.066626f, 0.068478f, 0.070360f, 0.072272f,
-    0.074214f, 0.076185f, 0.078187f, 0.080220f, 0.082283f, 0.084376f, 0.086500f, 0.088656f, 0.090842f, 0.093059f, 0.095307f,
-    0.097587f, 0.099899f, 0.102242f, 0.104616f, 0.107023f, 0.109462f, 0.111932f, 0.114435f, 0.116971f, 0.119538f, 0.122139f,
-    0.124772f, 0.127438f, 0.130136f, 0.132868f, 0.135633f, 0.138432f, 0.141263f, 0.144128f, 0.147027f, 0.149960f, 0.152926f,
-    0.155926f, 0.158961f, 0.162029f, 0.165132f, 0.168269f, 0.171441f, 0.174647f, 0.177888f, 0.181164f, 0.184475f, 0.187821f,
-    0.191202f, 0.194618f, 0.198069f, 0.201556f, 0.205079f, 0.208637f, 0.212231f, 0.215861f, 0.219526f, 0.223228f, 0.226966f,
-    0.230740f, 0.234551f, 0.238398f, 0.242281f, 0.246201f, 0.250158f, 0.254152f, 0.258183f, 0.262251f, 0.266356f, 0.270498f,
-    0.274677f, 0.278894f, 0.283149f, 0.287441f, 0.291771f, 0.296138f, 0.300544f, 0.304987f, 0.309469f, 0.313989f, 0.318547f,
-    0.323143f, 0.327778f, 0.332452f, 0.337164f, 0.341914f, 0.346704f, 0.351533f, 0.356400f, 0.361307f, 0.366253f, 0.371238f,
-    0.376262f, 0.381326f, 0.386430f, 0.391573f, 0.396755f, 0.401978f, 0.407240f, 0.412543f, 0.417885f, 0.423268f, 0.428691f,
-    0.434154f, 0.439657f, 0.445201f, 0.450786f, 0.456411f, 0.462077f, 0.467784f, 0.473532f, 0.479320f, 0.485150f, 0.491021f,
-    0.496933f, 0.502887f, 0.508881f, 0.514918f, 0.520996f, 0.527115f, 0.533276f, 0.539480f, 0.545725f, 0.552011f, 0.558340f,
-    0.564712f, 0.571125f, 0.577581f, 0.584078f, 0.590619f, 0.597202f, 0.603827f, 0.610496f, 0.617207f, 0.623960f, 0.630757f,
-    0.637597f, 0.644480f, 0.651406f, 0.658375f, 0.665387f, 0.672443f, 0.679543f, 0.686685f, 0.693872f, 0.701102f, 0.708376f,
-    0.715694f, 0.723055f, 0.730461f, 0.737911f, 0.745404f, 0.752942f, 0.760525f, 0.768151f, 0.775822f, 0.783538f, 0.791298f,
-    0.799103f, 0.806952f, 0.814847f, 0.822786f, 0.830770f, 0.838799f, 0.846873f, 0.854993f, 0.863157f, 0.871367f, 0.879622f,
-    0.887923f, 0.896269f, 0.904661f, 0.913099f, 0.921582f, 0.930111f, 0.938686f, 0.947307f, 0.955974f, 0.964686f, 0.973445f,
-    0.982251f, 0.991102f, 1.0f
-};
-
-static float stbir__srgb_to_linear(float f)
-{
-    if (f <= 0.04045f)
-        return f / 12.92f;
-    else
-        return (float)pow((f + 0.055f) / 1.055f, 2.4f);
-}
-
-static float stbir__linear_to_srgb(float f)
-{
-    if (f <= 0.0031308f)
-        return f * 12.92f;
-    else
-        return 1.055f * (float)pow(f, 1 / 2.4f) - 0.055f;
-}
-
-#ifndef STBIR_NON_IEEE_FLOAT
-// From https://gist.github.com/rygorous/2203834
-
-typedef union
-{
-    stbir_uint32 u;
-    float f;
-} stbir__FP32;
-
-static const stbir_uint32 fp32_to_srgb8_tab4[104] = {
-    0x0073000d, 0x007a000d, 0x0080000d, 0x0087000d, 0x008d000d, 0x0094000d, 0x009a000d, 0x00a1000d,
-    0x00a7001a, 0x00b4001a, 0x00c1001a, 0x00ce001a, 0x00da001a, 0x00e7001a, 0x00f4001a, 0x0101001a,
-    0x010e0033, 0x01280033, 0x01410033, 0x015b0033, 0x01750033, 0x018f0033, 0x01a80033, 0x01c20033,
-    0x01dc0067, 0x020f0067, 0x02430067, 0x02760067, 0x02aa0067, 0x02dd0067, 0x03110067, 0x03440067,
-    0x037800ce, 0x03df00ce, 0x044600ce, 0x04ad00ce, 0x051400ce, 0x057b00c5, 0x05dd00bc, 0x063b00b5,
-    0x06970158, 0x07420142, 0x07e30130, 0x087b0120, 0x090b0112, 0x09940106, 0x0a1700fc, 0x0a9500f2,
-    0x0b0f01cb, 0x0bf401ae, 0x0ccb0195, 0x0d950180, 0x0e56016e, 0x0f0d015e, 0x0fbc0150, 0x10630143,
-    0x11070264, 0x1238023e, 0x1357021d, 0x14660201, 0x156601e9, 0x165a01d3, 0x174401c0, 0x182401af,
-    0x18fe0331, 0x1a9602fe, 0x1c1502d2, 0x1d7e02ad, 0x1ed4028d, 0x201a0270, 0x21520256, 0x227d0240,
-    0x239f0443, 0x25c003fe, 0x27bf03c4, 0x29a10392, 0x2b6a0367, 0x2d1d0341, 0x2ebe031f, 0x304d0300,
-    0x31d105b0, 0x34a80555, 0x37520507, 0x39d504c5, 0x3c37048b, 0x3e7c0458, 0x40a8042a, 0x42bd0401,
-    0x44c20798, 0x488e071e, 0x4c1c06b6, 0x4f76065d, 0x52a50610, 0x55ac05cc, 0x5892058f, 0x5b590559,
-    0x5e0c0a23, 0x631c0980, 0x67db08f6, 0x6c55087f, 0x70940818, 0x74a007bd, 0x787d076c, 0x7c330723,
-};
-
-static stbir_uint8 stbir__linear_to_srgb_uchar(float in)
-{
-    static const stbir__FP32 almostone = { 0x3f7fffff }; // 1-eps
-    static const stbir__FP32 minval = { (127-13) << 23 };
-    stbir_uint32 tab,bias,scale,t;
-    stbir__FP32 f;
-
-    // Clamp to [2^(-13), 1-eps]; these two values map to 0 and 1, respectively.
-    // The tests are carefully written so that NaNs map to 0, same as in the reference
-    // implementation.
-    if (!(in > minval.f)) // written this way to catch NaNs
-        in = minval.f;
-    if (in > almostone.f)
-        in = almostone.f;
-
-    // Do the table lookup and unpack bias, scale
-    f.f = in;
-    tab = fp32_to_srgb8_tab4[(f.u - minval.u) >> 20];
-    bias = (tab >> 16) << 9;
-    scale = tab & 0xffff;
-
-    // Grab next-highest mantissa bits and perform linear interpolation
-    t = (f.u >> 12) & 0xff;
-    return (unsigned char) ((bias + scale*t) >> 16);
-}
-
-#else
-// sRGB transition values, scaled by 1<<28
-static int stbir__srgb_offset_to_linear_scaled[256] =
-{
-            0,     40738,    122216,    203693,    285170,    366648,    448125,    529603,
-       611080,    692557,    774035,    855852,    942009,   1033024,   1128971,   1229926,
-      1335959,   1447142,   1563542,   1685229,   1812268,   1944725,   2082664,   2226148,
-      2375238,   2529996,   2690481,   2856753,   3028870,   3206888,   3390865,   3580856,
-      3776916,   3979100,   4187460,   4402049,   4622919,   4850123,   5083710,   5323731,
-      5570236,   5823273,   6082892,   6349140,   6622065,   6901714,   7188133,   7481369,
-      7781466,   8088471,   8402427,   8723380,   9051372,   9386448,   9728650,  10078021,
-     10434603,  10798439,  11169569,  11548036,  11933879,  12327139,  12727857,  13136073,
-     13551826,  13975156,  14406100,  14844697,  15290987,  15745007,  16206795,  16676389,
-     17153826,  17639142,  18132374,  18633560,  19142734,  19659934,  20185196,  20718552,
-     21260042,  21809696,  22367554,  22933648,  23508010,  24090680,  24681686,  25281066,
-     25888850,  26505076,  27129772,  27762974,  28404716,  29055026,  29713942,  30381490,
-     31057708,  31742624,  32436272,  33138682,  33849884,  34569912,  35298800,  36036568,
-     36783260,  37538896,  38303512,  39077136,  39859796,  40651528,  41452360,  42262316,
-     43081432,  43909732,  44747252,  45594016,  46450052,  47315392,  48190064,  49074096,
-     49967516,  50870356,  51782636,  52704392,  53635648,  54576432,  55526772,  56486700,
-     57456236,  58435408,  59424248,  60422780,  61431036,  62449032,  63476804,  64514376,
-     65561776,  66619028,  67686160,  68763192,  69850160,  70947088,  72053992,  73170912,
-     74297864,  75434880,  76581976,  77739184,  78906536,  80084040,  81271736,  82469648,
-     83677792,  84896192,  86124888,  87363888,  88613232,  89872928,  91143016,  92423512,
-     93714432,  95015816,  96327688,  97650056,  98982952, 100326408, 101680440, 103045072,
-    104420320, 105806224, 107202800, 108610064, 110028048, 111456776, 112896264, 114346544,
-    115807632, 117279552, 118762328, 120255976, 121760536, 123276016, 124802440, 126339832,
-    127888216, 129447616, 131018048, 132599544, 134192112, 135795792, 137410592, 139036528,
-    140673648, 142321952, 143981456, 145652208, 147334208, 149027488, 150732064, 152447968,
-    154175200, 155913792, 157663776, 159425168, 161197984, 162982240, 164777968, 166585184,
-    168403904, 170234160, 172075968, 173929344, 175794320, 177670896, 179559120, 181458992,
-    183370528, 185293776, 187228736, 189175424, 191133888, 193104112, 195086128, 197079968,
-    199085648, 201103184, 203132592, 205173888, 207227120, 209292272, 211369392, 213458480,
-    215559568, 217672656, 219797792, 221934976, 224084240, 226245600, 228419056, 230604656,
-    232802400, 235012320, 237234432, 239468736, 241715280, 243974080, 246245120, 248528464,
-    250824112, 253132064, 255452368, 257785040, 260130080, 262487520, 264857376, 267239664,
-};
-
-static stbir_uint8 stbir__linear_to_srgb_uchar(float f)
-{
-    int x = (int) (f * (1 << 28)); // has headroom so you don't need to clamp
-    int v = 0;
-    int i;
-
-    // Refine the guess with a short binary search.
-    i = v + 128; if (x >= stbir__srgb_offset_to_linear_scaled[i]) v = i;
-    i = v +  64; if (x >= stbir__srgb_offset_to_linear_scaled[i]) v = i;
-    i = v +  32; if (x >= stbir__srgb_offset_to_linear_scaled[i]) v = i;
-    i = v +  16; if (x >= stbir__srgb_offset_to_linear_scaled[i]) v = i;
-    i = v +   8; if (x >= stbir__srgb_offset_to_linear_scaled[i]) v = i;
-    i = v +   4; if (x >= stbir__srgb_offset_to_linear_scaled[i]) v = i;
-    i = v +   2; if (x >= stbir__srgb_offset_to_linear_scaled[i]) v = i;
-    i = v +   1; if (x >= stbir__srgb_offset_to_linear_scaled[i]) v = i;
-
-    return (stbir_uint8) v;
-}
-#endif
-
-static float stbir__filter_trapezoid(float x, float scale)
-{
-    float halfscale = scale / 2;
-    float t = 0.5f + halfscale;
-    STBIR_ASSERT(scale <= 1);
-
-    x = (float)fabs(x);
-
-    if (x >= t)
-        return 0;
-    else
-    {
-        float r = 0.5f - halfscale;
-        if (x <= r)
-            return 1;
-        else
-            return (t - x) / scale;
-    }
-}
-
-static float stbir__support_trapezoid(float scale)
-{
-    STBIR_ASSERT(scale <= 1);
-    return 0.5f + scale / 2;
-}
-
-static float stbir__filter_triangle(float x, float s)
-{
-    STBIR__UNUSED_PARAM(s);
-
-    x = (float)fabs(x);
-
-    if (x <= 1.0f)
-        return 1 - x;
-    else
-        return 0;
-}
-
-static float stbir__filter_cubic(float x, float s)
-{
-    STBIR__UNUSED_PARAM(s);
-
-    x = (float)fabs(x);
-
-    if (x < 1.0f)
-        return (4 + x*x*(3*x - 6))/6;
-    else if (x < 2.0f)
-        return (8 + x*(-12 + x*(6 - x)))/6;
-
-    return (0.0f);
-}
-
-static float stbir__filter_catmullrom(float x, float s)
-{
-    STBIR__UNUSED_PARAM(s);
-
-    x = (float)fabs(x);
-
-    if (x < 1.0f)
-        return 1 - x*x*(2.5f - 1.5f*x);
-    else if (x < 2.0f)
-        return 2 - x*(4 + x*(0.5f*x - 2.5f));
-
-    return (0.0f);
-}
-
-static float stbir__filter_mitchell(float x, float s)
-{
-    STBIR__UNUSED_PARAM(s);
-
-    x = (float)fabs(x);
-
-    if (x < 1.0f)
-        return (16 + x*x*(21 * x - 36))/18;
-    else if (x < 2.0f)
-        return (32 + x*(-60 + x*(36 - 7*x)))/18;
-
-    return (0.0f);
-}
-
-static float stbir__support_zero(float s)
-{
-    STBIR__UNUSED_PARAM(s);
-    return 0;
-}
-
-static float stbir__support_one(float s)
-{
-    STBIR__UNUSED_PARAM(s);
-    return 1;
-}
-
-static float stbir__support_two(float s)
-{
-    STBIR__UNUSED_PARAM(s);
-    return 2;
-}
-
-static stbir__filter_info stbir__filter_info_table[] = {
-        { NULL,                     stbir__support_zero },
-        { stbir__filter_trapezoid,  stbir__support_trapezoid },
-        { stbir__filter_triangle,   stbir__support_one },
-        { stbir__filter_cubic,      stbir__support_two },
-        { stbir__filter_catmullrom, stbir__support_two },
-        { stbir__filter_mitchell,   stbir__support_two },
-};
-
-stbir__inline static int stbir__use_upsampling(float ratio)
-{
-    return ratio > 1;
-}
-
-stbir__inline static int stbir__use_width_upsampling(stbir__info* stbir_info)
-{
-    return stbir__use_upsampling(stbir_info->horizontal_scale);
-}
-
-stbir__inline static int stbir__use_height_upsampling(stbir__info* stbir_info)
-{
-    return stbir__use_upsampling(stbir_info->vertical_scale);
-}
-
-// This is the maximum number of input samples that can affect an output sample
-// with the given filter
-static int stbir__get_filter_pixel_width(stbir_filter filter, float scale)
-{
-    STBIR_ASSERT(filter != 0);
-    STBIR_ASSERT(filter < STBIR__ARRAY_SIZE(stbir__filter_info_table));
-
-    if (stbir__use_upsampling(scale))
-        return (int)ceil(stbir__filter_info_table[filter].support(1/scale) * 2);
-    else
-        return (int)ceil(stbir__filter_info_table[filter].support(scale) * 2 / scale);
-}
-
-// This is how much to expand buffers to account for filters seeking outside
-// the image boundaries.
-static int stbir__get_filter_pixel_margin(stbir_filter filter, float scale)
-{
-    return stbir__get_filter_pixel_width(filter, scale) / 2;
-}
-
-static int stbir__get_coefficient_width(stbir_filter filter, float scale)
-{
-    if (stbir__use_upsampling(scale))
-        return (int)ceil(stbir__filter_info_table[filter].support(1 / scale) * 2);
-    else
-        return (int)ceil(stbir__filter_info_table[filter].support(scale) * 2);
-}
-
-static int stbir__get_contributors(float scale, stbir_filter filter, int input_size, int output_size)
-{
-    if (stbir__use_upsampling(scale))
-        return output_size;
-    else
-        return (input_size + stbir__get_filter_pixel_margin(filter, scale) * 2);
-}
-
-static int stbir__get_total_horizontal_coefficients(stbir__info* info)
-{
-    return info->horizontal_num_contributors
-         * stbir__get_coefficient_width      (info->horizontal_filter, info->horizontal_scale);
-}
-
-static int stbir__get_total_vertical_coefficients(stbir__info* info)
-{
-    return info->vertical_num_contributors
-         * stbir__get_coefficient_width      (info->vertical_filter, info->vertical_scale);
-}
-
-static stbir__contributors* stbir__get_contributor(stbir__contributors* contributors, int n)
-{
-    return &contributors[n];
-}
-
-// For perf reasons this code is duplicated in stbir__resample_horizontal_upsample/downsample,
-// if you change it here change it there too.
-static float* stbir__get_coefficient(float* coefficients, stbir_filter filter, float scale, int n, int c)
-{
-    int width = stbir__get_coefficient_width(filter, scale);
-    return &coefficients[width*n + c];
-}
-
-static int stbir__edge_wrap_slow(stbir_edge edge, int n, int max)
-{
-    switch (edge)
-    {
-    case STBIR_EDGE_ZERO:
-        return 0; // we'll decode the wrong pixel here, and then overwrite with 0s later
-
-    case STBIR_EDGE_CLAMP:
-        if (n < 0)
-            return 0;
-
-        if (n >= max)
-            return max - 1;
-
-        return n; // NOTREACHED
-
-    case STBIR_EDGE_REFLECT:
-    {
-        if (n < 0)
-        {
-            if (n < max)
-                return -n;
-            else
-                return max - 1;
-        }
-
-        if (n >= max)
-        {
-            int max2 = max * 2;
-            if (n >= max2)
-                return 0;
-            else
-                return max2 - n - 1;
-        }
-
-        return n; // NOTREACHED
-    }
-
-    case STBIR_EDGE_WRAP:
-        if (n >= 0)
-            return (n % max);
-        else
-        {
-            int m = (-n) % max;
-
-            if (m != 0)
-                m = max - m;
-
-            return (m);
-        }
-        // NOTREACHED
-
-    default:
-        STBIR_ASSERT(!"Unimplemented edge type");
-        return 0;
-    }
-}
-
-stbir__inline static int stbir__edge_wrap(stbir_edge edge, int n, int max)
-{
-    // avoid per-pixel switch
-    if (n >= 0 && n < max)
-        return n;
-    return stbir__edge_wrap_slow(edge, n, max);
-}
-
-// What input pixels contribute to this output pixel?
-static void stbir__calculate_sample_range_upsample(int n, float out_filter_radius, float scale_ratio, float out_shift, int* in_first_pixel, int* in_last_pixel, float* in_center_of_out)
-{
-    float out_pixel_center = (float)n + 0.5f;
-    float out_pixel_influence_lowerbound = out_pixel_center - out_filter_radius;
-    float out_pixel_influence_upperbound = out_pixel_center + out_filter_radius;
-
-    float in_pixel_influence_lowerbound = (out_pixel_influence_lowerbound + out_shift) / scale_ratio;
-    float in_pixel_influence_upperbound = (out_pixel_influence_upperbound + out_shift) / scale_ratio;
-
-    *in_center_of_out = (out_pixel_center + out_shift) / scale_ratio;
-    *in_first_pixel = (int)(floor(in_pixel_influence_lowerbound + 0.5));
-    *in_last_pixel = (int)(floor(in_pixel_influence_upperbound - 0.5));
-}
-
-// What output pixels does this input pixel contribute to?
-static void stbir__calculate_sample_range_downsample(int n, float in_pixels_radius, float scale_ratio, float out_shift, int* out_first_pixel, int* out_last_pixel, float* out_center_of_in)
-{
-    float in_pixel_center = (float)n + 0.5f;
-    float in_pixel_influence_lowerbound = in_pixel_center - in_pixels_radius;
-    float in_pixel_influence_upperbound = in_pixel_center + in_pixels_radius;
-
-    float out_pixel_influence_lowerbound = in_pixel_influence_lowerbound * scale_ratio - out_shift;
-    float out_pixel_influence_upperbound = in_pixel_influence_upperbound * scale_ratio - out_shift;
-
-    *out_center_of_in = in_pixel_center * scale_ratio - out_shift;
-    *out_first_pixel = (int)(floor(out_pixel_influence_lowerbound + 0.5));
-    *out_last_pixel = (int)(floor(out_pixel_influence_upperbound - 0.5));
-}
-
-static void stbir__calculate_coefficients_upsample(stbir_filter filter, float scale, int in_first_pixel, int in_last_pixel, float in_center_of_out, stbir__contributors* contributor, float* coefficient_group)
-{
-    int i;
-    float total_filter = 0;
-    float filter_scale;
-
-    STBIR_ASSERT(in_last_pixel - in_first_pixel <= (int)ceil(stbir__filter_info_table[filter].support(1/scale) * 2)); // Taken directly from stbir__get_coefficient_width() which we can't call because we don't know if we're horizontal or vertical.
-
-    contributor->n0 = in_first_pixel;
-    contributor->n1 = in_last_pixel;
-
-    STBIR_ASSERT(contributor->n1 >= contributor->n0);
-
-    for (i = 0; i <= in_last_pixel - in_first_pixel; i++)
-    {
-        float in_pixel_center = (float)(i + in_first_pixel) + 0.5f;
-        coefficient_group[i] = stbir__filter_info_table[filter].kernel(in_center_of_out - in_pixel_center, 1 / scale);
-
-        // If the coefficient is zero, skip it. (Don't do the <0 check here, we want the influence of those outside pixels.)
-        if (i == 0 && !coefficient_group[i])
-        {
-            contributor->n0 = ++in_first_pixel;
-            i--;
-            continue;
-        }
-
-        total_filter += coefficient_group[i];
-    }
-
-    // NOTE(fg): Not actually true in general, nor is there any reason to expect it should be.
-    // It would be true in exact math but is at best approximately true in floating-point math,
-    // and it would not make sense to try and put actual bounds on this here because it depends
-    // on the image aspect ratio which can get pretty extreme.
-    //STBIR_ASSERT(stbir__filter_info_table[filter].kernel((float)(in_last_pixel + 1) + 0.5f - in_center_of_out, 1/scale) == 0);
-
-    STBIR_ASSERT(total_filter > 0.9);
-    STBIR_ASSERT(total_filter < 1.1f); // Make sure it's not way off.
-
-    // Make sure the sum of all coefficients is 1.
-    filter_scale = 1 / total_filter;
-
-    for (i = 0; i <= in_last_pixel - in_first_pixel; i++)
-        coefficient_group[i] *= filter_scale;
-
-    for (i = in_last_pixel - in_first_pixel; i >= 0; i--)
-    {
-        if (coefficient_group[i])
-            break;
-
-        // This line has no weight. We can skip it.
-        contributor->n1 = contributor->n0 + i - 1;
-    }
-}
-
-static void stbir__calculate_coefficients_downsample(stbir_filter filter, float scale_ratio, int out_first_pixel, int out_last_pixel, float out_center_of_in, stbir__contributors* contributor, float* coefficient_group)
-{
-    int i;
-
-    STBIR_ASSERT(out_last_pixel - out_first_pixel <= (int)ceil(stbir__filter_info_table[filter].support(scale_ratio) * 2)); // Taken directly from stbir__get_coefficient_width() which we can't call because we don't know if we're horizontal or vertical.
-
-    contributor->n0 = out_first_pixel;
-    contributor->n1 = out_last_pixel;
-
-    STBIR_ASSERT(contributor->n1 >= contributor->n0);
-
-    for (i = 0; i <= out_last_pixel - out_first_pixel; i++)
-    {
-        float out_pixel_center = (float)(i + out_first_pixel) + 0.5f;
-        float x = out_pixel_center - out_center_of_in;
-        coefficient_group[i] = stbir__filter_info_table[filter].kernel(x, scale_ratio) * scale_ratio;
-    }
-
-    // NOTE(fg): Not actually true in general, nor is there any reason to expect it should be.
-    // It would be true in exact math but is at best approximately true in floating-point math,
-    // and it would not make sense to try and put actual bounds on this here because it depends
-    // on the image aspect ratio which can get pretty extreme.
-    //STBIR_ASSERT(stbir__filter_info_table[filter].kernel((float)(out_last_pixel + 1) + 0.5f - out_center_of_in, scale_ratio) == 0);
-
-    for (i = out_last_pixel - out_first_pixel; i >= 0; i--)
-    {
-        if (coefficient_group[i])
-            break;
-
-        // This line has no weight. We can skip it.
-        contributor->n1 = contributor->n0 + i - 1;
-    }
-}
-
-static void stbir__normalize_downsample_coefficients(stbir__contributors* contributors, float* coefficients, stbir_filter filter, float scale_ratio, int input_size, int output_size)
-{
-    int num_contributors = stbir__get_contributors(scale_ratio, filter, input_size, output_size);
-    int num_coefficients = stbir__get_coefficient_width(filter, scale_ratio);
-    int i, j;
-    int skip;
-
-    for (i = 0; i < output_size; i++)
-    {
-        float scale;
-        float total = 0;
-
-        for (j = 0; j < num_contributors; j++)
-        {
-            if (i >= contributors[j].n0 && i <= contributors[j].n1)
-            {
-                float coefficient = *stbir__get_coefficient(coefficients, filter, scale_ratio, j, i - contributors[j].n0);
-                total += coefficient;
-            }
-            else if (i < contributors[j].n0)
-                break;
-        }
-
-        STBIR_ASSERT(total > 0.9f);
-        STBIR_ASSERT(total < 1.1f);
-
-        scale = 1 / total;
-
-        for (j = 0; j < num_contributors; j++)
-        {
-            if (i >= contributors[j].n0 && i <= contributors[j].n1)
-                *stbir__get_coefficient(coefficients, filter, scale_ratio, j, i - contributors[j].n0) *= scale;
-            else if (i < contributors[j].n0)
-                break;
-        }
-    }
-
-    // Optimize: Skip zero coefficients and contributions outside of image bounds.
-    // Do this after normalizing because normalization depends on the n0/n1 values.
-    for (j = 0; j < num_contributors; j++)
-    {
-        int range, max, width;
-
-        skip = 0;
-        while (*stbir__get_coefficient(coefficients, filter, scale_ratio, j, skip) == 0)
-            skip++;
-
-        contributors[j].n0 += skip;
-
-        while (contributors[j].n0 < 0)
-        {
-            contributors[j].n0++;
-            skip++;
-        }
-
-        range = contributors[j].n1 - contributors[j].n0 + 1;
-        max = stbir__min(num_coefficients, range);
-
-        width = stbir__get_coefficient_width(filter, scale_ratio);
-        for (i = 0; i < max; i++)
-        {
-            if (i + skip >= width)
-                break;
-
-            *stbir__get_coefficient(coefficients, filter, scale_ratio, j, i) = *stbir__get_coefficient(coefficients, filter, scale_ratio, j, i + skip);
-        }
-
-        continue;
-    }
-
-    // Using min to avoid writing into invalid pixels.
-    for (i = 0; i < num_contributors; i++)
-        contributors[i].n1 = stbir__min(contributors[i].n1, output_size - 1);
-}
-
-// Each scan line uses the same kernel values so we should calculate the kernel
-// values once and then we can use them for every scan line.
-static void stbir__calculate_filters(stbir__contributors* contributors, float* coefficients, stbir_filter filter, float scale_ratio, float shift, int input_size, int output_size)
-{
-    int n;
-    int total_contributors = stbir__get_contributors(scale_ratio, filter, input_size, output_size);
-
-    if (stbir__use_upsampling(scale_ratio))
-    {
-        float out_pixels_radius = stbir__filter_info_table[filter].support(1 / scale_ratio) * scale_ratio;
-
-        // Looping through out pixels
-        for (n = 0; n < total_contributors; n++)
-        {
-            float in_center_of_out; // Center of the current out pixel in the in pixel space
-            int in_first_pixel, in_last_pixel;
-
-            stbir__calculate_sample_range_upsample(n, out_pixels_radius, scale_ratio, shift, &in_first_pixel, &in_last_pixel, &in_center_of_out);
-
-            stbir__calculate_coefficients_upsample(filter, scale_ratio, in_first_pixel, in_last_pixel, in_center_of_out, stbir__get_contributor(contributors, n), stbir__get_coefficient(coefficients, filter, scale_ratio, n, 0));
-        }
-    }
-    else
-    {
-        float in_pixels_radius = stbir__filter_info_table[filter].support(scale_ratio) / scale_ratio;
-
-        // Looping through in pixels
-        for (n = 0; n < total_contributors; n++)
-        {
-            float out_center_of_in; // Center of the current out pixel in the in pixel space
-            int out_first_pixel, out_last_pixel;
-            int n_adjusted = n - stbir__get_filter_pixel_margin(filter, scale_ratio);
-
-            stbir__calculate_sample_range_downsample(n_adjusted, in_pixels_radius, scale_ratio, shift, &out_first_pixel, &out_last_pixel, &out_center_of_in);
-
-            stbir__calculate_coefficients_downsample(filter, scale_ratio, out_first_pixel, out_last_pixel, out_center_of_in, stbir__get_contributor(contributors, n), stbir__get_coefficient(coefficients, filter, scale_ratio, n, 0));
-        }
-
-        stbir__normalize_downsample_coefficients(contributors, coefficients, filter, scale_ratio, input_size, output_size);
-    }
-}
-
-static float* stbir__get_decode_buffer(stbir__info* stbir_info)
-{
-    // The 0 index of the decode buffer starts after the margin. This makes
-    // it okay to use negative indexes on the decode buffer.
-    return &stbir_info->decode_buffer[stbir_info->horizontal_filter_pixel_margin * stbir_info->channels];
-}
-
-#define STBIR__DECODE(type, colorspace) ((int)(type) * (STBIR_MAX_COLORSPACES) + (int)(colorspace))
-
-static void stbir__decode_scanline(stbir__info* stbir_info, int n)
-{
-    int c;
-    int channels = stbir_info->channels;
-    int alpha_channel = stbir_info->alpha_channel;
-    int type = stbir_info->type;
-    int colorspace = stbir_info->colorspace;
-    int input_w = stbir_info->input_w;
-    size_t input_stride_bytes = stbir_info->input_stride_bytes;
-    float* decode_buffer = stbir__get_decode_buffer(stbir_info);
-    stbir_edge edge_horizontal = stbir_info->edge_horizontal;
-    stbir_edge edge_vertical = stbir_info->edge_vertical;
-    size_t in_buffer_row_offset = stbir__edge_wrap(edge_vertical, n, stbir_info->input_h) * input_stride_bytes;
-    const void* input_data = (char *) stbir_info->input_data + in_buffer_row_offset;
-    int max_x = input_w + stbir_info->horizontal_filter_pixel_margin;
-    int decode = STBIR__DECODE(type, colorspace);
-
-    int x = -stbir_info->horizontal_filter_pixel_margin;
-
-    // special handling for STBIR_EDGE_ZERO because it needs to return an item that doesn't appear in the input,
-    // and we want to avoid paying overhead on every pixel if not STBIR_EDGE_ZERO
-    if (edge_vertical == STBIR_EDGE_ZERO && (n < 0 || n >= stbir_info->input_h))
-    {
-        for (; x < max_x; x++)
-            for (c = 0; c < channels; c++)
-                decode_buffer[x*channels + c] = 0;
-        return;
-    }
-
-    switch (decode)
-    {
-    case STBIR__DECODE(STBIR_TYPE_UINT8, STBIR_COLORSPACE_LINEAR):
-        for (; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-            int input_pixel_index = stbir__edge_wrap(edge_horizontal, x, input_w) * channels;
-            for (c = 0; c < channels; c++)
-                decode_buffer[decode_pixel_index + c] = ((float)((const unsigned char*)input_data)[input_pixel_index + c]) / stbir__max_uint8_as_float;
-        }
-        break;
-
-    case STBIR__DECODE(STBIR_TYPE_UINT8, STBIR_COLORSPACE_SRGB):
-        for (; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-            int input_pixel_index = stbir__edge_wrap(edge_horizontal, x, input_w) * channels;
-            for (c = 0; c < channels; c++)
-                decode_buffer[decode_pixel_index + c] = stbir__srgb_uchar_to_linear_float[((const unsigned char*)input_data)[input_pixel_index + c]];
-
-            if (!(stbir_info->flags&STBIR_FLAG_ALPHA_USES_COLORSPACE))
-                decode_buffer[decode_pixel_index + alpha_channel] = ((float)((const unsigned char*)input_data)[input_pixel_index + alpha_channel]) / stbir__max_uint8_as_float;
-        }
-        break;
-
-    case STBIR__DECODE(STBIR_TYPE_UINT16, STBIR_COLORSPACE_LINEAR):
-        for (; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-            int input_pixel_index = stbir__edge_wrap(edge_horizontal, x, input_w) * channels;
-            for (c = 0; c < channels; c++)
-                decode_buffer[decode_pixel_index + c] = ((float)((const unsigned short*)input_data)[input_pixel_index + c]) / stbir__max_uint16_as_float;
-        }
-        break;
-
-    case STBIR__DECODE(STBIR_TYPE_UINT16, STBIR_COLORSPACE_SRGB):
-        for (; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-            int input_pixel_index = stbir__edge_wrap(edge_horizontal, x, input_w) * channels;
-            for (c = 0; c < channels; c++)
-                decode_buffer[decode_pixel_index + c] = stbir__srgb_to_linear(((float)((const unsigned short*)input_data)[input_pixel_index + c]) / stbir__max_uint16_as_float);
-
-            if (!(stbir_info->flags&STBIR_FLAG_ALPHA_USES_COLORSPACE))
-                decode_buffer[decode_pixel_index + alpha_channel] = ((float)((const unsigned short*)input_data)[input_pixel_index + alpha_channel]) / stbir__max_uint16_as_float;
-        }
-        break;
-
-    case STBIR__DECODE(STBIR_TYPE_UINT32, STBIR_COLORSPACE_LINEAR):
-        for (; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-            int input_pixel_index = stbir__edge_wrap(edge_horizontal, x, input_w) * channels;
-            for (c = 0; c < channels; c++)
-                decode_buffer[decode_pixel_index + c] = (float)(((double)((const unsigned int*)input_data)[input_pixel_index + c]) / stbir__max_uint32_as_float);
-        }
-        break;
-
-    case STBIR__DECODE(STBIR_TYPE_UINT32, STBIR_COLORSPACE_SRGB):
-        for (; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-            int input_pixel_index = stbir__edge_wrap(edge_horizontal, x, input_w) * channels;
-            for (c = 0; c < channels; c++)
-                decode_buffer[decode_pixel_index + c] = stbir__srgb_to_linear((float)(((double)((const unsigned int*)input_data)[input_pixel_index + c]) / stbir__max_uint32_as_float));
-
-            if (!(stbir_info->flags&STBIR_FLAG_ALPHA_USES_COLORSPACE))
-                decode_buffer[decode_pixel_index + alpha_channel] = (float)(((double)((const unsigned int*)input_data)[input_pixel_index + alpha_channel]) / stbir__max_uint32_as_float);
-        }
-        break;
-
-    case STBIR__DECODE(STBIR_TYPE_FLOAT, STBIR_COLORSPACE_LINEAR):
-        for (; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-            int input_pixel_index = stbir__edge_wrap(edge_horizontal, x, input_w) * channels;
-            for (c = 0; c < channels; c++)
-                decode_buffer[decode_pixel_index + c] = ((const float*)input_data)[input_pixel_index + c];
-        }
-        break;
-
-    case STBIR__DECODE(STBIR_TYPE_FLOAT, STBIR_COLORSPACE_SRGB):
-        for (; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-            int input_pixel_index = stbir__edge_wrap(edge_horizontal, x, input_w) * channels;
-            for (c = 0; c < channels; c++)
-                decode_buffer[decode_pixel_index + c] = stbir__srgb_to_linear(((const float*)input_data)[input_pixel_index + c]);
-
-            if (!(stbir_info->flags&STBIR_FLAG_ALPHA_USES_COLORSPACE))
-                decode_buffer[decode_pixel_index + alpha_channel] = ((const float*)input_data)[input_pixel_index + alpha_channel];
-        }
-
-        break;
-
-    default:
-        STBIR_ASSERT(!"Unknown type/colorspace/channels combination.");
-        break;
-    }
-
-    if (!(stbir_info->flags & STBIR_FLAG_ALPHA_PREMULTIPLIED))
-    {
-        for (x = -stbir_info->horizontal_filter_pixel_margin; x < max_x; x++)
-        {
-            int decode_pixel_index = x * channels;
-
-            // If the alpha value is 0 it will clobber the color values. Make sure it's not.
-            float alpha = decode_buffer[decode_pixel_index + alpha_channel];
-#ifndef STBIR_NO_ALPHA_EPSILON
-            if (stbir_info->type != STBIR_TYPE_FLOAT) {
-                alpha += STBIR_ALPHA_EPSILON;
-                decode_buffer[decode_pixel_index + alpha_channel] = alpha;
-            }
-#endif
-            for (c = 0; c < channels; c++)
-            {
-                if (c == alpha_channel)
-                    continue;
-
-                decode_buffer[decode_pixel_index + c] *= alpha;
-            }
-        }
-    }
-
-    if (edge_horizontal == STBIR_EDGE_ZERO)
-    {
-        for (x = -stbir_info->horizontal_filter_pixel_margin; x < 0; x++)
-        {
-            for (c = 0; c < channels; c++)
-                decode_buffer[x*channels + c] = 0;
-        }
-        for (x = input_w; x < max_x; x++)
-        {
-            for (c = 0; c < channels; c++)
-                decode_buffer[x*channels + c] = 0;
-        }
-    }
-}
-
-static float* stbir__get_ring_buffer_entry(float* ring_buffer, int index, int ring_buffer_length)
-{
-    return &ring_buffer[index * ring_buffer_length];
-}
-
-static float* stbir__add_empty_ring_buffer_entry(stbir__info* stbir_info, int n)
-{
-    int ring_buffer_index;
-    float* ring_buffer;
-
-    stbir_info->ring_buffer_last_scanline = n;
-
-    if (stbir_info->ring_buffer_begin_index < 0)
-    {
-        ring_buffer_index = stbir_info->ring_buffer_begin_index = 0;
-        stbir_info->ring_buffer_first_scanline = n;
-    }
-    else
-    {
-        ring_buffer_index = (stbir_info->ring_buffer_begin_index + (stbir_info->ring_buffer_last_scanline - stbir_info->ring_buffer_first_scanline)) % stbir_info->ring_buffer_num_entries;
-        STBIR_ASSERT(ring_buffer_index != stbir_info->ring_buffer_begin_index);
-    }
-
-    ring_buffer = stbir__get_ring_buffer_entry(stbir_info->ring_buffer, ring_buffer_index, stbir_info->ring_buffer_length_bytes / sizeof(float));
-    memset(ring_buffer, 0, stbir_info->ring_buffer_length_bytes);
-
-    return ring_buffer;
-}
-
-
-static void stbir__resample_horizontal_upsample(stbir__info* stbir_info, float* output_buffer)
-{
-    int x, k;
-    int output_w = stbir_info->output_w;
-    int channels = stbir_info->channels;
-    float* decode_buffer = stbir__get_decode_buffer(stbir_info);
-    stbir__contributors* horizontal_contributors = stbir_info->horizontal_contributors;
-    float* horizontal_coefficients = stbir_info->horizontal_coefficients;
-    int coefficient_width = stbir_info->horizontal_coefficient_width;
-
-    for (x = 0; x < output_w; x++)
-    {
-        int n0 = horizontal_contributors[x].n0;
-        int n1 = horizontal_contributors[x].n1;
-
-        int out_pixel_index = x * channels;
-        int coefficient_group = coefficient_width * x;
-        int coefficient_counter = 0;
-
-        STBIR_ASSERT(n1 >= n0);
-        STBIR_ASSERT(n0 >= -stbir_info->horizontal_filter_pixel_margin);
-        STBIR_ASSERT(n1 >= -stbir_info->horizontal_filter_pixel_margin);
-        STBIR_ASSERT(n0 < stbir_info->input_w + stbir_info->horizontal_filter_pixel_margin);
-        STBIR_ASSERT(n1 < stbir_info->input_w + stbir_info->horizontal_filter_pixel_margin);
-
-        switch (channels) {
-            case 1:
-                for (k = n0; k <= n1; k++)
-                {
-                    int in_pixel_index = k * 1;
-                    float coefficient = horizontal_coefficients[coefficient_group + coefficient_counter++];
-                    STBIR_ASSERT(coefficient != 0);
-                    output_buffer[out_pixel_index + 0] += decode_buffer[in_pixel_index + 0] * coefficient;
-                }
-                break;
-            case 2:
-                for (k = n0; k <= n1; k++)
-                {
-                    int in_pixel_index = k * 2;
-                    float coefficient = horizontal_coefficients[coefficient_group + coefficient_counter++];
-                    STBIR_ASSERT(coefficient != 0);
-                    output_buffer[out_pixel_index + 0] += decode_buffer[in_pixel_index + 0] * coefficient;
-                    output_buffer[out_pixel_index + 1] += decode_buffer[in_pixel_index + 1] * coefficient;
-                }
-                break;
-            case 3:
-                for (k = n0; k <= n1; k++)
-                {
-                    int in_pixel_index = k * 3;
-                    float coefficient = horizontal_coefficients[coefficient_group + coefficient_counter++];
-                    STBIR_ASSERT(coefficient != 0);
-                    output_buffer[out_pixel_index + 0] += decode_buffer[in_pixel_index + 0] * coefficient;
-                    output_buffer[out_pixel_index + 1] += decode_buffer[in_pixel_index + 1] * coefficient;
-                    output_buffer[out_pixel_index + 2] += decode_buffer[in_pixel_index + 2] * coefficient;
-                }
-                break;
-            case 4:
-                for (k = n0; k <= n1; k++)
-                {
-                    int in_pixel_index = k * 4;
-                    float coefficient = horizontal_coefficients[coefficient_group + coefficient_counter++];
-                    STBIR_ASSERT(coefficient != 0);
-                    output_buffer[out_pixel_index + 0] += decode_buffer[in_pixel_index + 0] * coefficient;
-                    output_buffer[out_pixel_index + 1] += decode_buffer[in_pixel_index + 1] * coefficient;
-                    output_buffer[out_pixel_index + 2] += decode_buffer[in_pixel_index + 2] * coefficient;
-                    output_buffer[out_pixel_index + 3] += decode_buffer[in_pixel_index + 3] * coefficient;
-                }
-                break;
-            default:
-                for (k = n0; k <= n1; k++)
-                {
-                    int in_pixel_index = k * channels;
-                    float coefficient = horizontal_coefficients[coefficient_group + coefficient_counter++];
-                    int c;
-                    STBIR_ASSERT(coefficient != 0);
-                    for (c = 0; c < channels; c++)
-                        output_buffer[out_pixel_index + c] += decode_buffer[in_pixel_index + c] * coefficient;
-                }
-                break;
-        }
-    }
-}
-
-static void stbir__resample_horizontal_downsample(stbir__info* stbir_info, float* output_buffer)
-{
-    int x, k;
-    int input_w = stbir_info->input_w;
-    int channels = stbir_info->channels;
-    float* decode_buffer = stbir__get_decode_buffer(stbir_info);
-    stbir__contributors* horizontal_contributors = stbir_info->horizontal_contributors;
-    float* horizontal_coefficients = stbir_info->horizontal_coefficients;
-    int coefficient_width = stbir_info->horizontal_coefficient_width;
-    int filter_pixel_margin = stbir_info->horizontal_filter_pixel_margin;
-    int max_x = input_w + filter_pixel_margin * 2;
-
-    STBIR_ASSERT(!stbir__use_width_upsampling(stbir_info));
-
-    switch (channels) {
-        case 1:
-            for (x = 0; x < max_x; x++)
-            {
-                int n0 = horizontal_contributors[x].n0;
-                int n1 = horizontal_contributors[x].n1;
-
-                int in_x = x - filter_pixel_margin;
-                int in_pixel_index = in_x * 1;
-                int max_n = n1;
-                int coefficient_group = coefficient_width * x;
-
-                for (k = n0; k <= max_n; k++)
-                {
-                    int out_pixel_index = k * 1;
-                    float coefficient = horizontal_coefficients[coefficient_group + k - n0];
-                    output_buffer[out_pixel_index + 0] += decode_buffer[in_pixel_index + 0] * coefficient;
-                }
-            }
-            break;
-
-        case 2:
-            for (x = 0; x < max_x; x++)
-            {
-                int n0 = horizontal_contributors[x].n0;
-                int n1 = horizontal_contributors[x].n1;
-
-                int in_x = x - filter_pixel_margin;
-                int in_pixel_index = in_x * 2;
-                int max_n = n1;
-                int coefficient_group = coefficient_width * x;
-
-                for (k = n0; k <= max_n; k++)
-                {
-                    int out_pixel_index = k * 2;
-                    float coefficient = horizontal_coefficients[coefficient_group + k - n0];
-                    output_buffer[out_pixel_index + 0] += decode_buffer[in_pixel_index + 0] * coefficient;
-                    output_buffer[out_pixel_index + 1] += decode_buffer[in_pixel_index + 1] * coefficient;
-                }
-            }
-            break;
-
-        case 3:
-            for (x = 0; x < max_x; x++)
-            {
-                int n0 = horizontal_contributors[x].n0;
-                int n1 = horizontal_contributors[x].n1;
-
-                int in_x = x - filter_pixel_margin;
-                int in_pixel_index = in_x * 3;
-                int max_n = n1;
-                int coefficient_group = coefficient_width * x;
-
-                for (k = n0; k <= max_n; k++)
-                {
-                    int out_pixel_index = k * 3;
-                    float coefficient = horizontal_coefficients[coefficient_group + k - n0];
-                    output_buffer[out_pixel_index + 0] += decode_buffer[in_pixel_index + 0] * coefficient;
-                    output_buffer[out_pixel_index + 1] += decode_buffer[in_pixel_index + 1] * coefficient;
-                    output_buffer[out_pixel_index + 2] += decode_buffer[in_pixel_index + 2] * coefficient;
-                }
-            }
-            break;
-
-        case 4:
-            for (x = 0; x < max_x; x++)
-            {
-                int n0 = horizontal_contributors[x].n0;
-                int n1 = horizontal_contributors[x].n1;
-
-                int in_x = x - filter_pixel_margin;
-                int in_pixel_index = in_x * 4;
-                int max_n = n1;
-                int coefficient_group = coefficient_width * x;
-
-                for (k = n0; k <= max_n; k++)
-                {
-                    int out_pixel_index = k * 4;
-                    float coefficient = horizontal_coefficients[coefficient_group + k - n0];
-                    output_buffer[out_pixel_index + 0] += decode_buffer[in_pixel_index + 0] * coefficient;
-                    output_buffer[out_pixel_index + 1] += decode_buffer[in_pixel_index + 1] * coefficient;
-                    output_buffer[out_pixel_index + 2] += decode_buffer[in_pixel_index + 2] * coefficient;
-                    output_buffer[out_pixel_index + 3] += decode_buffer[in_pixel_index + 3] * coefficient;
-                }
-            }
-            break;
-
-        default:
-            for (x = 0; x < max_x; x++)
-            {
-                int n0 = horizontal_contributors[x].n0;
-                int n1 = horizontal_contributors[x].n1;
-
-                int in_x = x - filter_pixel_margin;
-                int in_pixel_index = in_x * channels;
-                int max_n = n1;
-                int coefficient_group = coefficient_width * x;
-
-                for (k = n0; k <= max_n; k++)
-                {
-                    int c;
-                    int out_pixel_index = k * channels;
-                    float coefficient = horizontal_coefficients[coefficient_group + k - n0];
-                    for (c = 0; c < channels; c++)
-                        output_buffer[out_pixel_index + c] += decode_buffer[in_pixel_index + c] * coefficient;
-                }
-            }
-            break;
-    }
-}
-
-static void stbir__decode_and_resample_upsample(stbir__info* stbir_info, int n)
-{
-    // Decode the nth scanline from the source image into the decode buffer.
-    stbir__decode_scanline(stbir_info, n);
-
-    // Now resample it into the ring buffer.
-    if (stbir__use_width_upsampling(stbir_info))
-        stbir__resample_horizontal_upsample(stbir_info, stbir__add_empty_ring_buffer_entry(stbir_info, n));
-    else
-        stbir__resample_horizontal_downsample(stbir_info, stbir__add_empty_ring_buffer_entry(stbir_info, n));
-
-    // Now it's sitting in the ring buffer ready to be used as source for the vertical sampling.
-}
-
-static void stbir__decode_and_resample_downsample(stbir__info* stbir_info, int n)
-{
-    // Decode the nth scanline from the source image into the decode buffer.
-    stbir__decode_scanline(stbir_info, n);
-
-    memset(stbir_info->horizontal_buffer, 0, stbir_info->output_w * stbir_info->channels * sizeof(float));
-
-    // Now resample it into the horizontal buffer.
-    if (stbir__use_width_upsampling(stbir_info))
-        stbir__resample_horizontal_upsample(stbir_info, stbir_info->horizontal_buffer);
-    else
-        stbir__resample_horizontal_downsample(stbir_info, stbir_info->horizontal_buffer);
-
-    // Now it's sitting in the horizontal buffer ready to be distributed into the ring buffers.
-}
-
-// Get the specified scan line from the ring buffer.
-static float* stbir__get_ring_buffer_scanline(int get_scanline, float* ring_buffer, int begin_index, int first_scanline, int ring_buffer_num_entries, int ring_buffer_length)
-{
-    int ring_buffer_index = (begin_index + (get_scanline - first_scanline)) % ring_buffer_num_entries;
-    return stbir__get_ring_buffer_entry(ring_buffer, ring_buffer_index, ring_buffer_length);
-}
-
-
-static void stbir__encode_scanline(stbir__info* stbir_info, int num_pixels, void *output_buffer, float *encode_buffer, int channels, int alpha_channel, int decode)
-{
-    int x;
-    int n;
-    int num_nonalpha;
-    stbir_uint16 nonalpha[STBIR_MAX_CHANNELS];
-
-    if (!(stbir_info->flags&STBIR_FLAG_ALPHA_PREMULTIPLIED))
-    {
-        for (x=0; x < num_pixels; ++x)
-        {
-            int pixel_index = x*channels;
-
-            float alpha = encode_buffer[pixel_index + alpha_channel];
-            float reciprocal_alpha = alpha ? 1.0f / alpha : 0;
-
-            // unrolling this produced a 1% slowdown upscaling a large RGBA linear-space image on my machine - stb
-            for (n = 0; n < channels; n++)
-                if (n != alpha_channel)
-                    encode_buffer[pixel_index + n] *= reciprocal_alpha;
-
-            // We added in a small epsilon to prevent the color channel from being deleted with zero alpha.
-            // Because we only add it for integer types, it will automatically be discarded on integer
-            // conversion, so we don't need to subtract it back out (which would be problematic for
-            // numeric precision reasons).
-        }
-    }
-
-    // build a table of all channels that need colorspace correction, so
-    // we don't perform colorspace correction on channels that don't need it.
-    for (x = 0, num_nonalpha = 0; x < channels; ++x)
-    {
-        if (x != alpha_channel || (stbir_info->flags & STBIR_FLAG_ALPHA_USES_COLORSPACE))
-        {
-            nonalpha[num_nonalpha++] = (stbir_uint16)x;
-        }
-    }
-
-    #define STBIR__ROUND_INT(f)    ((int)          ((f)+0.5))
-    #define STBIR__ROUND_UINT(f)   ((stbir_uint32) ((f)+0.5))
-
-    #ifdef STBIR__SATURATE_INT
-    #define STBIR__ENCODE_LINEAR8(f)   stbir__saturate8 (STBIR__ROUND_INT((f) * stbir__max_uint8_as_float ))
-    #define STBIR__ENCODE_LINEAR16(f)  stbir__saturate16(STBIR__ROUND_INT((f) * stbir__max_uint16_as_float))
-    #else
-    #define STBIR__ENCODE_LINEAR8(f)   (unsigned char ) STBIR__ROUND_INT(stbir__saturate(f) * stbir__max_uint8_as_float )
-    #define STBIR__ENCODE_LINEAR16(f)  (unsigned short) STBIR__ROUND_INT(stbir__saturate(f) * stbir__max_uint16_as_float)
-    #endif
-
-    switch (decode)
-    {
-        case STBIR__DECODE(STBIR_TYPE_UINT8, STBIR_COLORSPACE_LINEAR):
-            for (x=0; x < num_pixels; ++x)
-            {
-                int pixel_index = x*channels;
-
-                for (n = 0; n < channels; n++)
-                {
-                    int index = pixel_index + n;
-                    ((unsigned char*)output_buffer)[index] = STBIR__ENCODE_LINEAR8(encode_buffer[index]);
-                }
-            }
-            break;
-
-        case STBIR__DECODE(STBIR_TYPE_UINT8, STBIR_COLORSPACE_SRGB):
-            for (x=0; x < num_pixels; ++x)
-            {
-                int pixel_index = x*channels;
-
-                for (n = 0; n < num_nonalpha; n++)
-                {
-                    int index = pixel_index + nonalpha[n];
-                    ((unsigned char*)output_buffer)[index] = stbir__linear_to_srgb_uchar(encode_buffer[index]);
-                }
-
-                if (!(stbir_info->flags & STBIR_FLAG_ALPHA_USES_COLORSPACE))
-                    ((unsigned char *)output_buffer)[pixel_index + alpha_channel] = STBIR__ENCODE_LINEAR8(encode_buffer[pixel_index+alpha_channel]);
-            }
-            break;
-
-        case STBIR__DECODE(STBIR_TYPE_UINT16, STBIR_COLORSPACE_LINEAR):
-            for (x=0; x < num_pixels; ++x)
-            {
-                int pixel_index = x*channels;
-
-                for (n = 0; n < channels; n++)
-                {
-                    int index = pixel_index + n;
-                    ((unsigned short*)output_buffer)[index] = STBIR__ENCODE_LINEAR16(encode_buffer[index]);
-                }
-            }
-            break;
-
-        case STBIR__DECODE(STBIR_TYPE_UINT16, STBIR_COLORSPACE_SRGB):
-            for (x=0; x < num_pixels; ++x)
-            {
-                int pixel_index = x*channels;
-
-                for (n = 0; n < num_nonalpha; n++)
-                {
-                    int index = pixel_index + nonalpha[n];
-                    ((unsigned short*)output_buffer)[index] = (unsigned short)STBIR__ROUND_INT(stbir__linear_to_srgb(stbir__saturate(encode_buffer[index])) * stbir__max_uint16_as_float);
-                }
-
-                if (!(stbir_info->flags&STBIR_FLAG_ALPHA_USES_COLORSPACE))
-                    ((unsigned short*)output_buffer)[pixel_index + alpha_channel] = STBIR__ENCODE_LINEAR16(encode_buffer[pixel_index + alpha_channel]);
-            }
-
-            break;
-
-        case STBIR__DECODE(STBIR_TYPE_UINT32, STBIR_COLORSPACE_LINEAR):
-            for (x=0; x < num_pixels; ++x)
-            {
-                int pixel_index = x*channels;
-
-                for (n = 0; n < channels; n++)
-                {
-                    int index = pixel_index + n;
-                    ((unsigned int*)output_buffer)[index] = (unsigned int)STBIR__ROUND_UINT(((double)stbir__saturate(encode_buffer[index])) * stbir__max_uint32_as_float);
-                }
-            }
-            break;
-
-        case STBIR__DECODE(STBIR_TYPE_UINT32, STBIR_COLORSPACE_SRGB):
-            for (x=0; x < num_pixels; ++x)
-            {
-                int pixel_index = x*channels;
-
-                for (n = 0; n < num_nonalpha; n++)
-                {
-                    int index = pixel_index + nonalpha[n];
-                    ((unsigned int*)output_buffer)[index] = (unsigned int)STBIR__ROUND_UINT(((double)stbir__linear_to_srgb(stbir__saturate(encode_buffer[index]))) * stbir__max_uint32_as_float);
-                }
-
-                if (!(stbir_info->flags&STBIR_FLAG_ALPHA_USES_COLORSPACE))
-                    ((unsigned int*)output_buffer)[pixel_index + alpha_channel] = (unsigned int)STBIR__ROUND_INT(((double)stbir__saturate(encode_buffer[pixel_index + alpha_channel])) * stbir__max_uint32_as_float);
-            }
-            break;
-
-        case STBIR__DECODE(STBIR_TYPE_FLOAT, STBIR_COLORSPACE_LINEAR):
-            for (x=0; x < num_pixels; ++x)
-            {
-                int pixel_index = x*channels;
-
-                for (n = 0; n < channels; n++)
-                {
-                    int index = pixel_index + n;
-                    ((float*)output_buffer)[index] = encode_buffer[index];
-                }
-            }
-            break;
-
-        case STBIR__DECODE(STBIR_TYPE_FLOAT, STBIR_COLORSPACE_SRGB):
-            for (x=0; x < num_pixels; ++x)
-            {
-                int pixel_index = x*channels;
-
-                for (n = 0; n < num_nonalpha; n++)
-                {
-                    int index = pixel_index + nonalpha[n];
-                    ((float*)output_buffer)[index] = stbir__linear_to_srgb(encode_buffer[index]);
-                }
-
-                if (!(stbir_info->flags&STBIR_FLAG_ALPHA_USES_COLORSPACE))
-                    ((float*)output_buffer)[pixel_index + alpha_channel] = encode_buffer[pixel_index + alpha_channel];
-            }
-            break;
-
-        default:
-            STBIR_ASSERT(!"Unknown type/colorspace/channels combination.");
-            break;
-    }
-}
-
-static void stbir__resample_vertical_upsample(stbir__info* stbir_info, int n)
-{
-    int x, k;
-    int output_w = stbir_info->output_w;
-    stbir__contributors* vertical_contributors = stbir_info->vertical_contributors;
-    float* vertical_coefficients = stbir_info->vertical_coefficients;
-    int channels = stbir_info->channels;
-    int alpha_channel = stbir_info->alpha_channel;
-    int type = stbir_info->type;
-    int colorspace = stbir_info->colorspace;
-    int ring_buffer_entries = stbir_info->ring_buffer_num_entries;
-    void* output_data = stbir_info->output_data;
-    float* encode_buffer = stbir_info->encode_buffer;
-    int decode = STBIR__DECODE(type, colorspace);
-    int coefficient_width = stbir_info->vertical_coefficient_width;
-    int coefficient_counter;
-    int contributor = n;
-
-    float* ring_buffer = stbir_info->ring_buffer;
-    int ring_buffer_begin_index = stbir_info->ring_buffer_begin_index;
-    int ring_buffer_first_scanline = stbir_info->ring_buffer_first_scanline;
-    int ring_buffer_length = stbir_info->ring_buffer_length_bytes/sizeof(float);
-
-    int n0,n1, output_row_start;
-    int coefficient_group = coefficient_width * contributor;
-
-    n0 = vertical_contributors[contributor].n0;
-    n1 = vertical_contributors[contributor].n1;
-
-    output_row_start = n * stbir_info->output_stride_bytes;
-
-    STBIR_ASSERT(stbir__use_height_upsampling(stbir_info));
-
-    memset(encode_buffer, 0, output_w * sizeof(float) * channels);
-
-    // I tried reblocking this for better cache usage of encode_buffer
-    // (using x_outer, k, x_inner), but it lost speed. -- stb
-
-    coefficient_counter = 0;
-    switch (channels) {
-        case 1:
-            for (k = n0; k <= n1; k++)
-            {
-                int coefficient_index = coefficient_counter++;
-                float* ring_buffer_entry = stbir__get_ring_buffer_scanline(k, ring_buffer, ring_buffer_begin_index, ring_buffer_first_scanline, ring_buffer_entries, ring_buffer_length);
-                float coefficient = vertical_coefficients[coefficient_group + coefficient_index];
-                for (x = 0; x < output_w; ++x)
-                {
-                    int in_pixel_index = x * 1;
-                    encode_buffer[in_pixel_index + 0] += ring_buffer_entry[in_pixel_index + 0] * coefficient;
-                }
-            }
-            break;
-        case 2:
-            for (k = n0; k <= n1; k++)
-            {
-                int coefficient_index = coefficient_counter++;
-                float* ring_buffer_entry = stbir__get_ring_buffer_scanline(k, ring_buffer, ring_buffer_begin_index, ring_buffer_first_scanline, ring_buffer_entries, ring_buffer_length);
-                float coefficient = vertical_coefficients[coefficient_group + coefficient_index];
-                for (x = 0; x < output_w; ++x)
-                {
-                    int in_pixel_index = x * 2;
-                    encode_buffer[in_pixel_index + 0] += ring_buffer_entry[in_pixel_index + 0] * coefficient;
-                    encode_buffer[in_pixel_index + 1] += ring_buffer_entry[in_pixel_index + 1] * coefficient;
-                }
-            }
-            break;
-        case 3:
-            for (k = n0; k <= n1; k++)
-            {
-                int coefficient_index = coefficient_counter++;
-                float* ring_buffer_entry = stbir__get_ring_buffer_scanline(k, ring_buffer, ring_buffer_begin_index, ring_buffer_first_scanline, ring_buffer_entries, ring_buffer_length);
-                float coefficient = vertical_coefficients[coefficient_group + coefficient_index];
-                for (x = 0; x < output_w; ++x)
-                {
-                    int in_pixel_index = x * 3;
-                    encode_buffer[in_pixel_index + 0] += ring_buffer_entry[in_pixel_index + 0] * coefficient;
-                    encode_buffer[in_pixel_index + 1] += ring_buffer_entry[in_pixel_index + 1] * coefficient;
-                    encode_buffer[in_pixel_index + 2] += ring_buffer_entry[in_pixel_index + 2] * coefficient;
-                }
-            }
-            break;
-        case 4:
-            for (k = n0; k <= n1; k++)
-            {
-                int coefficient_index = coefficient_counter++;
-                float* ring_buffer_entry = stbir__get_ring_buffer_scanline(k, ring_buffer, ring_buffer_begin_index, ring_buffer_first_scanline, ring_buffer_entries, ring_buffer_length);
-                float coefficient = vertical_coefficients[coefficient_group + coefficient_index];
-                for (x = 0; x < output_w; ++x)
-                {
-                    int in_pixel_index = x * 4;
-                    encode_buffer[in_pixel_index + 0] += ring_buffer_entry[in_pixel_index + 0] * coefficient;
-                    encode_buffer[in_pixel_index + 1] += ring_buffer_entry[in_pixel_index + 1] * coefficient;
-                    encode_buffer[in_pixel_index + 2] += ring_buffer_entry[in_pixel_index + 2] * coefficient;
-                    encode_buffer[in_pixel_index + 3] += ring_buffer_entry[in_pixel_index + 3] * coefficient;
-                }
-            }
-            break;
-        default:
-            for (k = n0; k <= n1; k++)
-            {
-                int coefficient_index = coefficient_counter++;
-                float* ring_buffer_entry = stbir__get_ring_buffer_scanline(k, ring_buffer, ring_buffer_begin_index, ring_buffer_first_scanline, ring_buffer_entries, ring_buffer_length);
-                float coefficient = vertical_coefficients[coefficient_group + coefficient_index];
-                for (x = 0; x < output_w; ++x)
-                {
-                    int in_pixel_index = x * channels;
-                    int c;
-                    for (c = 0; c < channels; c++)
-                        encode_buffer[in_pixel_index + c] += ring_buffer_entry[in_pixel_index + c] * coefficient;
-                }
-            }
-            break;
-    }
-    stbir__encode_scanline(stbir_info, output_w, (char *) output_data + output_row_start, encode_buffer, channels, alpha_channel, decode);
-}
-
-static void stbir__resample_vertical_downsample(stbir__info* stbir_info, int n)
-{
-    int x, k;
-    int output_w = stbir_info->output_w;
-    stbir__contributors* vertical_contributors = stbir_info->vertical_contributors;
-    float* vertical_coefficients = stbir_info->vertical_coefficients;
-    int channels = stbir_info->channels;
-    int ring_buffer_entries = stbir_info->ring_buffer_num_entries;
-    float* horizontal_buffer = stbir_info->horizontal_buffer;
-    int coefficient_width = stbir_info->vertical_coefficient_width;
-    int contributor = n + stbir_info->vertical_filter_pixel_margin;
-
-    float* ring_buffer = stbir_info->ring_buffer;
-    int ring_buffer_begin_index = stbir_info->ring_buffer_begin_index;
-    int ring_buffer_first_scanline = stbir_info->ring_buffer_first_scanline;
-    int ring_buffer_length = stbir_info->ring_buffer_length_bytes/sizeof(float);
-    int n0,n1;
-
-    n0 = vertical_contributors[contributor].n0;
-    n1 = vertical_contributors[contributor].n1;
-
-    STBIR_ASSERT(!stbir__use_height_upsampling(stbir_info));
-
-    for (k = n0; k <= n1; k++)
-    {
-        int coefficient_index = k - n0;
-        int coefficient_group = coefficient_width * contributor;
-        float coefficient = vertical_coefficients[coefficient_group + coefficient_index];
-
-        float* ring_buffer_entry = stbir__get_ring_buffer_scanline(k, ring_buffer, ring_buffer_begin_index, ring_buffer_first_scanline, ring_buffer_entries, ring_buffer_length);
-
-        switch (channels) {
-            case 1:
-                for (x = 0; x < output_w; x++)
-                {
-                    int in_pixel_index = x * 1;
-                    ring_buffer_entry[in_pixel_index + 0] += horizontal_buffer[in_pixel_index + 0] * coefficient;
-                }
-                break;
-            case 2:
-                for (x = 0; x < output_w; x++)
-                {
-                    int in_pixel_index = x * 2;
-                    ring_buffer_entry[in_pixel_index + 0] += horizontal_buffer[in_pixel_index + 0] * coefficient;
-                    ring_buffer_entry[in_pixel_index + 1] += horizontal_buffer[in_pixel_index + 1] * coefficient;
-                }
-                break;
-            case 3:
-                for (x = 0; x < output_w; x++)
-                {
-                    int in_pixel_index = x * 3;
-                    ring_buffer_entry[in_pixel_index + 0] += horizontal_buffer[in_pixel_index + 0] * coefficient;
-                    ring_buffer_entry[in_pixel_index + 1] += horizontal_buffer[in_pixel_index + 1] * coefficient;
-                    ring_buffer_entry[in_pixel_index + 2] += horizontal_buffer[in_pixel_index + 2] * coefficient;
-                }
-                break;
-            case 4:
-                for (x = 0; x < output_w; x++)
-                {
-                    int in_pixel_index = x * 4;
-                    ring_buffer_entry[in_pixel_index + 0] += horizontal_buffer[in_pixel_index + 0] * coefficient;
-                    ring_buffer_entry[in_pixel_index + 1] += horizontal_buffer[in_pixel_index + 1] * coefficient;
-                    ring_buffer_entry[in_pixel_index + 2] += horizontal_buffer[in_pixel_index + 2] * coefficient;
-                    ring_buffer_entry[in_pixel_index + 3] += horizontal_buffer[in_pixel_index + 3] * coefficient;
-                }
-                break;
-            default:
-                for (x = 0; x < output_w; x++)
-                {
-                    int in_pixel_index = x * channels;
-
-                    int c;
-                    for (c = 0; c < channels; c++)
-                        ring_buffer_entry[in_pixel_index + c] += horizontal_buffer[in_pixel_index + c] * coefficient;
-                }
-                break;
-        }
-    }
-}
-
-static void stbir__buffer_loop_upsample(stbir__info* stbir_info)
-{
-    int y;
-    float scale_ratio = stbir_info->vertical_scale;
-    float out_scanlines_radius = stbir__filter_info_table[stbir_info->vertical_filter].support(1/scale_ratio) * scale_ratio;
-
-    STBIR_ASSERT(stbir__use_height_upsampling(stbir_info));
-
-    for (y = 0; y < stbir_info->output_h; y++)
-    {
-        float in_center_of_out = 0; // Center of the current out scanline in the in scanline space
-        int in_first_scanline = 0, in_last_scanline = 0;
-
-        stbir__calculate_sample_range_upsample(y, out_scanlines_radius, scale_ratio, stbir_info->vertical_shift, &in_first_scanline, &in_last_scanline, &in_center_of_out);
-
-        STBIR_ASSERT(in_last_scanline - in_first_scanline + 1 <= stbir_info->ring_buffer_num_entries);
-
-        if (stbir_info->ring_buffer_begin_index >= 0)
-        {
-            // Get rid of whatever we don't need anymore.
-            while (in_first_scanline > stbir_info->ring_buffer_first_scanline)
-            {
-                if (stbir_info->ring_buffer_first_scanline == stbir_info->ring_buffer_last_scanline)
-                {
-                    // We just popped the last scanline off the ring buffer.
-                    // Reset it to the empty state.
-                    stbir_info->ring_buffer_begin_index = -1;
-                    stbir_info->ring_buffer_first_scanline = 0;
-                    stbir_info->ring_buffer_last_scanline = 0;
-                    break;
-                }
-                else
-                {
-                    stbir_info->ring_buffer_first_scanline++;
-                    stbir_info->ring_buffer_begin_index = (stbir_info->ring_buffer_begin_index + 1) % stbir_info->ring_buffer_num_entries;
-                }
-            }
-        }
-
-        // Load in new ones.
-        if (stbir_info->ring_buffer_begin_index < 0)
-            stbir__decode_and_resample_upsample(stbir_info, in_first_scanline);
-
-        while (in_last_scanline > stbir_info->ring_buffer_last_scanline)
-            stbir__decode_and_resample_upsample(stbir_info, stbir_info->ring_buffer_last_scanline + 1);
-
-        // Now all buffers should be ready to write a row of vertical sampling.
-        stbir__resample_vertical_upsample(stbir_info, y);
-
-        STBIR_PROGRESS_REPORT((float)y / stbir_info->output_h);
-    }
-}
-
-static void stbir__empty_ring_buffer(stbir__info* stbir_info, int first_necessary_scanline)
-{
-    int output_stride_bytes = stbir_info->output_stride_bytes;
-    int channels = stbir_info->channels;
-    int alpha_channel = stbir_info->alpha_channel;
-    int type = stbir_info->type;
-    int colorspace = stbir_info->colorspace;
-    int output_w = stbir_info->output_w;
-    void* output_data = stbir_info->output_data;
-    int decode = STBIR__DECODE(type, colorspace);
-
-    float* ring_buffer = stbir_info->ring_buffer;
-    int ring_buffer_length = stbir_info->ring_buffer_length_bytes/sizeof(float);
-
-    if (stbir_info->ring_buffer_begin_index >= 0)
-    {
-        // Get rid of whatever we don't need anymore.
-        while (first_necessary_scanline > stbir_info->ring_buffer_first_scanline)
-        {
-            if (stbir_info->ring_buffer_first_scanline >= 0 && stbir_info->ring_buffer_first_scanline < stbir_info->output_h)
-            {
-                int output_row_start = stbir_info->ring_buffer_first_scanline * output_stride_bytes;
-                float* ring_buffer_entry = stbir__get_ring_buffer_entry(ring_buffer, stbir_info->ring_buffer_begin_index, ring_buffer_length);
-                stbir__encode_scanline(stbir_info, output_w, (char *) output_data + output_row_start, ring_buffer_entry, channels, alpha_channel, decode);
-                STBIR_PROGRESS_REPORT((float)stbir_info->ring_buffer_first_scanline / stbir_info->output_h);
-            }
-
-            if (stbir_info->ring_buffer_first_scanline == stbir_info->ring_buffer_last_scanline)
-            {
-                // We just popped the last scanline off the ring buffer.
-                // Reset it to the empty state.
-                stbir_info->ring_buffer_begin_index = -1;
-                stbir_info->ring_buffer_first_scanline = 0;
-                stbir_info->ring_buffer_last_scanline = 0;
-                break;
-            }
-            else
-            {
-                stbir_info->ring_buffer_first_scanline++;
-                stbir_info->ring_buffer_begin_index = (stbir_info->ring_buffer_begin_index + 1) % stbir_info->ring_buffer_num_entries;
-            }
-        }
-    }
-}
-
-static void stbir__buffer_loop_downsample(stbir__info* stbir_info)
-{
-    int y;
-    float scale_ratio = stbir_info->vertical_scale;
-    int output_h = stbir_info->output_h;
-    float in_pixels_radius = stbir__filter_info_table[stbir_info->vertical_filter].support(scale_ratio) / scale_ratio;
-    int pixel_margin = stbir_info->vertical_filter_pixel_margin;
-    int max_y = stbir_info->input_h + pixel_margin;
-
-    STBIR_ASSERT(!stbir__use_height_upsampling(stbir_info));
-
-    for (y = -pixel_margin; y < max_y; y++)
-    {
-        float out_center_of_in; // Center of the current out scanline in the in scanline space
-        int out_first_scanline, out_last_scanline;
-
-        stbir__calculate_sample_range_downsample(y, in_pixels_radius, scale_ratio, stbir_info->vertical_shift, &out_first_scanline, &out_last_scanline, &out_center_of_in);
-
-        STBIR_ASSERT(out_last_scanline - out_first_scanline + 1 <= stbir_info->ring_buffer_num_entries);
-
-        if (out_last_scanline < 0 || out_first_scanline >= output_h)
-            continue;
-
-        stbir__empty_ring_buffer(stbir_info, out_first_scanline);
-
-        stbir__decode_and_resample_downsample(stbir_info, y);
-
-        // Load in new ones.
-        if (stbir_info->ring_buffer_begin_index < 0)
-            stbir__add_empty_ring_buffer_entry(stbir_info, out_first_scanline);
-
-        while (out_last_scanline > stbir_info->ring_buffer_last_scanline)
-            stbir__add_empty_ring_buffer_entry(stbir_info, stbir_info->ring_buffer_last_scanline + 1);
-
-        // Now the horizontal buffer is ready to write to all ring buffer rows.
-        stbir__resample_vertical_downsample(stbir_info, y);
-    }
-
-    stbir__empty_ring_buffer(stbir_info, stbir_info->output_h);
-}
-
-static void stbir__setup(stbir__info *info, int input_w, int input_h, int output_w, int output_h, int channels)
-{
-    info->input_w = input_w;
-    info->input_h = input_h;
-    info->output_w = output_w;
-    info->output_h = output_h;
-    info->channels = channels;
-}
-
-static void stbir__calculate_transform(stbir__info *info, float s0, float t0, float s1, float t1, float *transform)
-{
-    info->s0 = s0;
-    info->t0 = t0;
-    info->s1 = s1;
-    info->t1 = t1;
-
-    if (transform)
-    {
-        info->horizontal_scale = transform[0];
-        info->vertical_scale   = transform[1];
-        info->horizontal_shift = transform[2];
-        info->vertical_shift   = transform[3];
-    }
-    else
-    {
-        info->horizontal_scale = ((float)info->output_w / info->input_w) / (s1 - s0);
-        info->vertical_scale = ((float)info->output_h / info->input_h) / (t1 - t0);
-
-        info->horizontal_shift = s0 * info->output_w / (s1 - s0);
-        info->vertical_shift = t0 * info->output_h / (t1 - t0);
-    }
-}
-
-static void stbir__choose_filter(stbir__info *info, stbir_filter h_filter, stbir_filter v_filter)
-{
-    if (h_filter == 0)
-        h_filter = stbir__use_upsampling(info->horizontal_scale) ? STBIR_DEFAULT_FILTER_UPSAMPLE : STBIR_DEFAULT_FILTER_DOWNSAMPLE;
-    if (v_filter == 0)
-        v_filter = stbir__use_upsampling(info->vertical_scale)   ? STBIR_DEFAULT_FILTER_UPSAMPLE : STBIR_DEFAULT_FILTER_DOWNSAMPLE;
-    info->horizontal_filter = h_filter;
-    info->vertical_filter = v_filter;
-}
-
-static stbir_uint32 stbir__calculate_memory(stbir__info *info)
-{
-    int pixel_margin = stbir__get_filter_pixel_margin(info->horizontal_filter, info->horizontal_scale);
-    int filter_height = stbir__get_filter_pixel_width(info->vertical_filter, info->vertical_scale);
-
-    info->horizontal_num_contributors = stbir__get_contributors(info->horizontal_scale, info->horizontal_filter, info->input_w, info->output_w);
-    info->vertical_num_contributors   = stbir__get_contributors(info->vertical_scale  , info->vertical_filter  , info->input_h, info->output_h);
-
-    // One extra entry because floating point precision problems sometimes cause an extra to be necessary.
-    info->ring_buffer_num_entries = filter_height + 1;
-
-    info->horizontal_contributors_size = info->horizontal_num_contributors * sizeof(stbir__contributors);
-    info->horizontal_coefficients_size = stbir__get_total_horizontal_coefficients(info) * sizeof(float);
-    info->vertical_contributors_size = info->vertical_num_contributors * sizeof(stbir__contributors);
-    info->vertical_coefficients_size = stbir__get_total_vertical_coefficients(info) * sizeof(float);
-    info->decode_buffer_size = (info->input_w + pixel_margin * 2) * info->channels * sizeof(float);
-    info->horizontal_buffer_size = info->output_w * info->channels * sizeof(float);
-    info->ring_buffer_size = info->output_w * info->channels * info->ring_buffer_num_entries * sizeof(float);
-    info->encode_buffer_size = info->output_w * info->channels * sizeof(float);
-
-    STBIR_ASSERT(info->horizontal_filter != 0);
-    STBIR_ASSERT(info->horizontal_filter < STBIR__ARRAY_SIZE(stbir__filter_info_table)); // this now happens too late
-    STBIR_ASSERT(info->vertical_filter != 0);
-    STBIR_ASSERT(info->vertical_filter < STBIR__ARRAY_SIZE(stbir__filter_info_table)); // this now happens too late
-
-    if (stbir__use_height_upsampling(info))
-        // The horizontal buffer is for when we're downsampling the height and we
-        // can't output the result of sampling the decode buffer directly into the
-        // ring buffers.
-        info->horizontal_buffer_size = 0;
-    else
-        // The encode buffer is to retain precision in the height upsampling method
-        // and isn't used when height downsampling.
-        info->encode_buffer_size = 0;
-
-    return info->horizontal_contributors_size + info->horizontal_coefficients_size
-        + info->vertical_contributors_size + info->vertical_coefficients_size
-        + info->decode_buffer_size + info->horizontal_buffer_size
-        + info->ring_buffer_size + info->encode_buffer_size;
-}
-
-static int stbir__resize_allocated(stbir__info *info,
-    const void* input_data, int input_stride_in_bytes,
-    void* output_data, int output_stride_in_bytes,
-    int alpha_channel, stbir_uint32 flags, stbir_datatype type,
-    stbir_edge edge_horizontal, stbir_edge edge_vertical, stbir_colorspace colorspace,
-    void* tempmem, size_t tempmem_size_in_bytes)
-{
-    size_t memory_required = stbir__calculate_memory(info);
-
-    int width_stride_input = input_stride_in_bytes ? input_stride_in_bytes : info->channels * info->input_w * stbir__type_size[type];
-    int width_stride_output = output_stride_in_bytes ? output_stride_in_bytes : info->channels * info->output_w * stbir__type_size[type];
-
-#ifdef STBIR_DEBUG_OVERWRITE_TEST
-#define OVERWRITE_ARRAY_SIZE 8
-    unsigned char overwrite_output_before_pre[OVERWRITE_ARRAY_SIZE];
-    unsigned char overwrite_tempmem_before_pre[OVERWRITE_ARRAY_SIZE];
-    unsigned char overwrite_output_after_pre[OVERWRITE_ARRAY_SIZE];
-    unsigned char overwrite_tempmem_after_pre[OVERWRITE_ARRAY_SIZE];
-
-    size_t begin_forbidden = width_stride_output * (info->output_h - 1) + info->output_w * info->channels * stbir__type_size[type];
-    memcpy(overwrite_output_before_pre, &((unsigned char*)output_data)[-OVERWRITE_ARRAY_SIZE], OVERWRITE_ARRAY_SIZE);
-    memcpy(overwrite_output_after_pre, &((unsigned char*)output_data)[begin_forbidden], OVERWRITE_ARRAY_SIZE);
-    memcpy(overwrite_tempmem_before_pre, &((unsigned char*)tempmem)[-OVERWRITE_ARRAY_SIZE], OVERWRITE_ARRAY_SIZE);
-    memcpy(overwrite_tempmem_after_pre, &((unsigned char*)tempmem)[tempmem_size_in_bytes], OVERWRITE_ARRAY_SIZE);
-#endif
-
-    STBIR_ASSERT(info->channels >= 0);
-    STBIR_ASSERT(info->channels <= STBIR_MAX_CHANNELS);
-
-    if (info->channels < 0 || info->channels > STBIR_MAX_CHANNELS)
-        return 0;
-
-    STBIR_ASSERT(info->horizontal_filter < STBIR__ARRAY_SIZE(stbir__filter_info_table));
-    STBIR_ASSERT(info->vertical_filter < STBIR__ARRAY_SIZE(stbir__filter_info_table));
-
-    if (info->horizontal_filter >= STBIR__ARRAY_SIZE(stbir__filter_info_table))
-        return 0;
-    if (info->vertical_filter >= STBIR__ARRAY_SIZE(stbir__filter_info_table))
-        return 0;
-
-    if (alpha_channel < 0)
-        flags |= STBIR_FLAG_ALPHA_USES_COLORSPACE | STBIR_FLAG_ALPHA_PREMULTIPLIED;
-
-    if (!(flags&STBIR_FLAG_ALPHA_USES_COLORSPACE) || !(flags&STBIR_FLAG_ALPHA_PREMULTIPLIED)) {
-        STBIR_ASSERT(alpha_channel >= 0 && alpha_channel < info->channels);
-    }
-
-    if (alpha_channel >= info->channels)
-        return 0;
-
-    STBIR_ASSERT(tempmem);
-
-    if (!tempmem)
-        return 0;
-
-    STBIR_ASSERT(tempmem_size_in_bytes >= memory_required);
-
-    if (tempmem_size_in_bytes < memory_required)
-        return 0;
-
-    memset(tempmem, 0, tempmem_size_in_bytes);
-
-    info->input_data = input_data;
-    info->input_stride_bytes = width_stride_input;
-
-    info->output_data = output_data;
-    info->output_stride_bytes = width_stride_output;
-
-    info->alpha_channel = alpha_channel;
-    info->flags = flags;
-    info->type = type;
-    info->edge_horizontal = edge_horizontal;
-    info->edge_vertical = edge_vertical;
-    info->colorspace = colorspace;
-
-    info->horizontal_coefficient_width   = stbir__get_coefficient_width  (info->horizontal_filter, info->horizontal_scale);
-    info->vertical_coefficient_width     = stbir__get_coefficient_width  (info->vertical_filter  , info->vertical_scale  );
-    info->horizontal_filter_pixel_width  = stbir__get_filter_pixel_width (info->horizontal_filter, info->horizontal_scale);
-    info->vertical_filter_pixel_width    = stbir__get_filter_pixel_width (info->vertical_filter  , info->vertical_scale  );
-    info->horizontal_filter_pixel_margin = stbir__get_filter_pixel_margin(info->horizontal_filter, info->horizontal_scale);
-    info->vertical_filter_pixel_margin   = stbir__get_filter_pixel_margin(info->vertical_filter  , info->vertical_scale  );
-
-    info->ring_buffer_length_bytes = info->output_w * info->channels * sizeof(float);
-    info->decode_buffer_pixels = info->input_w + info->horizontal_filter_pixel_margin * 2;
-
-#define STBIR__NEXT_MEMPTR(current, newtype) (newtype*)(((unsigned char*)current) + current##_size)
-
-    info->horizontal_contributors = (stbir__contributors *) tempmem;
-    info->horizontal_coefficients = STBIR__NEXT_MEMPTR(info->horizontal_contributors, float);
-    info->vertical_contributors = STBIR__NEXT_MEMPTR(info->horizontal_coefficients, stbir__contributors);
-    info->vertical_coefficients = STBIR__NEXT_MEMPTR(info->vertical_contributors, float);
-    info->decode_buffer = STBIR__NEXT_MEMPTR(info->vertical_coefficients, float);
-
-    if (stbir__use_height_upsampling(info))
-    {
-        info->horizontal_buffer = NULL;
-        info->ring_buffer = STBIR__NEXT_MEMPTR(info->decode_buffer, float);
-        info->encode_buffer = STBIR__NEXT_MEMPTR(info->ring_buffer, float);
-
-        STBIR_ASSERT((size_t)STBIR__NEXT_MEMPTR(info->encode_buffer, unsigned char) == (size_t)tempmem + tempmem_size_in_bytes);
-    }
-    else
-    {
-        info->horizontal_buffer = STBIR__NEXT_MEMPTR(info->decode_buffer, float);
-        info->ring_buffer = STBIR__NEXT_MEMPTR(info->horizontal_buffer, float);
-        info->encode_buffer = NULL;
-
-        STBIR_ASSERT((size_t)STBIR__NEXT_MEMPTR(info->ring_buffer, unsigned char) == (size_t)tempmem + tempmem_size_in_bytes);
-    }
-
-#undef STBIR__NEXT_MEMPTR
-
-    // This signals that the ring buffer is empty
-    info->ring_buffer_begin_index = -1;
-
-    stbir__calculate_filters(info->horizontal_contributors, info->horizontal_coefficients, info->horizontal_filter, info->horizontal_scale, info->horizontal_shift, info->input_w, info->output_w);
-    stbir__calculate_filters(info->vertical_contributors, info->vertical_coefficients, info->vertical_filter, info->vertical_scale, info->vertical_shift, info->input_h, info->output_h);
-
-    STBIR_PROGRESS_REPORT(0);
-
-    if (stbir__use_height_upsampling(info))
-        stbir__buffer_loop_upsample(info);
-    else
-        stbir__buffer_loop_downsample(info);
-
-    STBIR_PROGRESS_REPORT(1);
-
-#ifdef STBIR_DEBUG_OVERWRITE_TEST
-    STBIR_ASSERT(memcmp(overwrite_output_before_pre, &((unsigned char*)output_data)[-OVERWRITE_ARRAY_SIZE], OVERWRITE_ARRAY_SIZE) == 0);
-    STBIR_ASSERT(memcmp(overwrite_output_after_pre, &((unsigned char*)output_data)[begin_forbidden], OVERWRITE_ARRAY_SIZE) == 0);
-    STBIR_ASSERT(memcmp(overwrite_tempmem_before_pre, &((unsigned char*)tempmem)[-OVERWRITE_ARRAY_SIZE], OVERWRITE_ARRAY_SIZE) == 0);
-    STBIR_ASSERT(memcmp(overwrite_tempmem_after_pre, &((unsigned char*)tempmem)[tempmem_size_in_bytes], OVERWRITE_ARRAY_SIZE) == 0);
-#endif
-
-    return 1;
-}
-
-
-static int stbir__resize_arbitrary(
-    void *alloc_context,
-    const void* input_data, int input_w, int input_h, int input_stride_in_bytes,
-    void* output_data, int output_w, int output_h, int output_stride_in_bytes,
-    float s0, float t0, float s1, float t1, float *transform,
-    int channels, int alpha_channel, stbir_uint32 flags, stbir_datatype type,
-    stbir_filter h_filter, stbir_filter v_filter,
-    stbir_edge edge_horizontal, stbir_edge edge_vertical, stbir_colorspace colorspace)
-{
-    stbir__info info;
-    int result;
-    size_t memory_required;
-    void* extra_memory;
-
-    stbir__setup(&info, input_w, input_h, output_w, output_h, channels);
-    stbir__calculate_transform(&info, s0,t0,s1,t1,transform);
-    stbir__choose_filter(&info, h_filter, v_filter);
-    memory_required = stbir__calculate_memory(&info);
-    extra_memory = STBIR_MALLOC(memory_required, alloc_context);
-
-    if (!extra_memory)
-        return 0;
-
-    result = stbir__resize_allocated(&info, input_data, input_stride_in_bytes,
-                                            output_data, output_stride_in_bytes,
-                                            alpha_channel, flags, type,
-                                            edge_horizontal, edge_vertical,
-                                            colorspace, extra_memory, memory_required);
-
-    STBIR_FREE(extra_memory, alloc_context);
-
-    return result;
-}
-
-STBIRDEF int stbir_resize_uint8(     const unsigned char *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                           unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                     int num_channels)
-{
-    return stbir__resize_arbitrary(NULL, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,NULL,num_channels,-1,0, STBIR_TYPE_UINT8, STBIR_FILTER_DEFAULT, STBIR_FILTER_DEFAULT,
-        STBIR_EDGE_CLAMP, STBIR_EDGE_CLAMP, STBIR_COLORSPACE_LINEAR);
-}
-
-STBIRDEF int stbir_resize_float(     const float *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                           float *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                     int num_channels)
-{
-    return stbir__resize_arbitrary(NULL, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,NULL,num_channels,-1,0, STBIR_TYPE_FLOAT, STBIR_FILTER_DEFAULT, STBIR_FILTER_DEFAULT,
-        STBIR_EDGE_CLAMP, STBIR_EDGE_CLAMP, STBIR_COLORSPACE_LINEAR);
-}
-
-STBIRDEF int stbir_resize_uint8_srgb(const unsigned char *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                           unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                     int num_channels, int alpha_channel, int flags)
-{
-    return stbir__resize_arbitrary(NULL, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,NULL,num_channels,alpha_channel,flags, STBIR_TYPE_UINT8, STBIR_FILTER_DEFAULT, STBIR_FILTER_DEFAULT,
-        STBIR_EDGE_CLAMP, STBIR_EDGE_CLAMP, STBIR_COLORSPACE_SRGB);
-}
-
-STBIRDEF int stbir_resize_uint8_srgb_edgemode(const unsigned char *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                                    unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                              int num_channels, int alpha_channel, int flags,
-                                              stbir_edge edge_wrap_mode)
-{
-    return stbir__resize_arbitrary(NULL, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,NULL,num_channels,alpha_channel,flags, STBIR_TYPE_UINT8, STBIR_FILTER_DEFAULT, STBIR_FILTER_DEFAULT,
-        edge_wrap_mode, edge_wrap_mode, STBIR_COLORSPACE_SRGB);
-}
-
-STBIRDEF int stbir_resize_uint8_generic( const unsigned char *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                               unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                         int num_channels, int alpha_channel, int flags,
-                                         stbir_edge edge_wrap_mode, stbir_filter filter, stbir_colorspace space,
-                                         void *alloc_context)
-{
-    return stbir__resize_arbitrary(alloc_context, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,NULL,num_channels,alpha_channel,flags, STBIR_TYPE_UINT8, filter, filter,
-        edge_wrap_mode, edge_wrap_mode, space);
-}
-
-STBIRDEF int stbir_resize_uint16_generic(const stbir_uint16 *input_pixels  , int input_w , int input_h , int input_stride_in_bytes,
-                                               stbir_uint16 *output_pixels , int output_w, int output_h, int output_stride_in_bytes,
-                                         int num_channels, int alpha_channel, int flags,
-                                         stbir_edge edge_wrap_mode, stbir_filter filter, stbir_colorspace space,
-                                         void *alloc_context)
-{
-    return stbir__resize_arbitrary(alloc_context, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,NULL,num_channels,alpha_channel,flags, STBIR_TYPE_UINT16, filter, filter,
-        edge_wrap_mode, edge_wrap_mode, space);
-}
-
-
-STBIRDEF int stbir_resize_float_generic( const float *input_pixels         , int input_w , int input_h , int input_stride_in_bytes,
-                                               float *output_pixels        , int output_w, int output_h, int output_stride_in_bytes,
-                                         int num_channels, int alpha_channel, int flags,
-                                         stbir_edge edge_wrap_mode, stbir_filter filter, stbir_colorspace space,
-                                         void *alloc_context)
-{
-    return stbir__resize_arbitrary(alloc_context, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,NULL,num_channels,alpha_channel,flags, STBIR_TYPE_FLOAT, filter, filter,
-        edge_wrap_mode, edge_wrap_mode, space);
-}
-
-
-STBIRDEF int stbir_resize(         const void *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                         void *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                   stbir_datatype datatype,
-                                   int num_channels, int alpha_channel, int flags,
-                                   stbir_edge edge_mode_horizontal, stbir_edge edge_mode_vertical,
-                                   stbir_filter filter_horizontal,  stbir_filter filter_vertical,
-                                   stbir_colorspace space, void *alloc_context)
-{
-    return stbir__resize_arbitrary(alloc_context, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,NULL,num_channels,alpha_channel,flags, datatype, filter_horizontal, filter_vertical,
-        edge_mode_horizontal, edge_mode_vertical, space);
-}
-
-
-STBIRDEF int stbir_resize_subpixel(const void *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                         void *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                   stbir_datatype datatype,
-                                   int num_channels, int alpha_channel, int flags,
-                                   stbir_edge edge_mode_horizontal, stbir_edge edge_mode_vertical,
-                                   stbir_filter filter_horizontal,  stbir_filter filter_vertical,
-                                   stbir_colorspace space, void *alloc_context,
-                                   float x_scale, float y_scale,
-                                   float x_offset, float y_offset)
-{
-    float transform[4];
-    transform[0] = x_scale;
-    transform[1] = y_scale;
-    transform[2] = x_offset;
-    transform[3] = y_offset;
-    return stbir__resize_arbitrary(alloc_context, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        0,0,1,1,transform,num_channels,alpha_channel,flags, datatype, filter_horizontal, filter_vertical,
-        edge_mode_horizontal, edge_mode_vertical, space);
-}
-
-STBIRDEF int stbir_resize_region(  const void *input_pixels , int input_w , int input_h , int input_stride_in_bytes,
-                                         void *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
-                                   stbir_datatype datatype,
-                                   int num_channels, int alpha_channel, int flags,
-                                   stbir_edge edge_mode_horizontal, stbir_edge edge_mode_vertical,
-                                   stbir_filter filter_horizontal,  stbir_filter filter_vertical,
-                                   stbir_colorspace space, void *alloc_context,
-                                   float s0, float t0, float s1, float t1)
-{
-    return stbir__resize_arbitrary(alloc_context, input_pixels, input_w, input_h, input_stride_in_bytes,
-        output_pixels, output_w, output_h, output_stride_in_bytes,
-        s0,t0,s1,t1,NULL,num_channels,alpha_channel,flags, datatype, filter_horizontal, filter_vertical,
-        edge_mode_horizontal, edge_mode_vertical, space);
-}
-
-#endif // STB_IMAGE_RESIZE_IMPLEMENTATION
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses -- choose whichever you prefer.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2017 Sean Barrett
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------
-*/
diff --git a/pxr/imaging/hio/stb/stb_image_resize2.h b/pxr/imaging/hio/stb/stb_image_resize2.h
new file mode 100644
index 0000000000..53bc9a81e6
--- /dev/null
+++ b/pxr/imaging/hio/stb/stb_image_resize2.h
@@ -0,0 +1,10372 @@
+/* stb_image_resize2 - v2.07 - public domain image resizing
+
+   by Jeff Roberts (v2) and Jorge L Rodriguez
+   http://github.com/nothings/stb
+
+   Can be threaded with the extended API. SSE2, AVX, Neon and WASM SIMD support. Only
+   scaling and translation is supported, no rotations or shears.
+
+   COMPILING & LINKING
+      In one C/C++ file that #includes this file, do this:
+         #define STB_IMAGE_RESIZE_IMPLEMENTATION
+      before the #include. That will create the implementation in that file.
+
+   PORTING FROM VERSION 1
+
+      The API has changed. You can continue to use the old version of stb_image_resize.h,
+      which is available in the "deprecated/" directory.
+
+      If you're using the old simple-to-use API, porting is straightforward.
+      (For more advanced APIs, read the documentation.)
+
+        stbir_resize_uint8():
+          - call `stbir_resize_uint8_linear`, cast channel count to `stbir_pixel_layout`
+
+        stbir_resize_float():
+          - call `stbir_resize_float_linear`, cast channel count to `stbir_pixel_layout`
+
+        stbir_resize_uint8_srgb():
+          - function name is unchanged
+          - cast channel count to `stbir_pixel_layout`
+          - above is sufficient unless your image has alpha and it's not RGBA/BGRA
+            - in that case, follow the below instructions for stbir_resize_uint8_srgb_edgemode
+
+        stbir_resize_uint8_srgb_edgemode()
+          - switch to the "medium complexity" API
+          - stbir_resize(), very similar API but a few more parameters:
+            - pixel_layout: cast channel count to `stbir_pixel_layout`
+            - data_type:    STBIR_TYPE_UINT8_SRGB
+            - edge:         unchanged (STBIR_EDGE_WRAP, etc.)
+            - filter:       STBIR_FILTER_DEFAULT
+          - which channel is alpha is specified in stbir_pixel_layout, see enum for details
+
+   EASY API CALLS:
+     Easy API downsamples w/Mitchell filter, upsamples w/cubic interpolation, clamps to edge.
+
+     stbir_resize_uint8_srgb( input_pixels,  input_w,  input_h,  input_stride_in_bytes,
+                              output_pixels, output_w, output_h, output_stride_in_bytes,
+                              pixel_layout_enum )
+
+     stbir_resize_uint8_linear( input_pixels,  input_w,  input_h,  input_stride_in_bytes,
+                                output_pixels, output_w, output_h, output_stride_in_bytes,
+                                pixel_layout_enum )
+
+     stbir_resize_float_linear( input_pixels,  input_w,  input_h,  input_stride_in_bytes,
+                                output_pixels, output_w, output_h, output_stride_in_bytes,
+                                pixel_layout_enum )
+
+     If you pass NULL or zero for the output_pixels, we will allocate the output buffer
+     for you and return it from the function (free with free() or STBIR_FREE).
+     As a special case, XX_stride_in_bytes of 0 means packed continuously in memory.
+
+   API LEVELS
+      There are three levels of API - easy-to-use, medium-complexity and extended-complexity.
+
+      See the "header file" section of the source for API documentation.
+
+   ADDITIONAL DOCUMENTATION
+
+      MEMORY ALLOCATION
+         By default, we use malloc and free for memory allocation.  To override the
+         memory allocation, before the implementation #include, add a:
+
+            #define STBIR_MALLOC(size,user_data) ...
+            #define STBIR_FREE(ptr,user_data)   ...
+
+         Each resize makes exactly one call to malloc/free (unless you use the
+         extended API where you can do one allocation for many resizes). Under
+         address sanitizer, we do separate allocations to find overread/writes.
+
+      PERFORMANCE
+         This library was written with an emphasis on performance. When testing
+         stb_image_resize with RGBA, the fastest mode is STBIR_4CHANNEL with
+         STBIR_TYPE_UINT8 pixels and CLAMPed edges (which is what many other resize
+         libs do by default). Also, make sure SIMD is turned on of course (default
+         for 64-bit targets). Avoid WRAP edge mode if you want the fastest speed.
+
+         This library also comes with profiling built-in. If you define STBIR_PROFILE,
+         you can use the advanced API and get low-level profiling information by
+         calling stbir_resize_extended_profile_info() or stbir_resize_split_profile_info()
+         after a resize.
+
+      SIMD
+         Most of the routines have optimized SSE2, AVX, NEON and WASM versions.
+
+         On Microsoft compilers, we automatically turn on SIMD for 64-bit x64 and
+         ARM; for 32-bit x86 and ARM, you select SIMD mode by defining STBIR_SSE2 or
+         STBIR_NEON. For AVX and AVX2, we auto-select it by detecting the /arch:AVX
+         or /arch:AVX2 switches. You can also always manually turn SSE2, AVX or AVX2
+         support on by defining STBIR_SSE2, STBIR_AVX or STBIR_AVX2.
+
+         On Linux, SSE2 and Neon is on by default for 64-bit x64 or ARM64. For 32-bit,
+         we select x86 SIMD mode by whether you have -msse2, -mavx or -mavx2 enabled
+         on the command line. For 32-bit ARM, you must pass -mfpu=neon-vfpv4 for both
+         clang and GCC, but GCC also requires an additional -mfp16-format=ieee to
+         automatically enable NEON.
+
+         On x86 platforms, you can also define STBIR_FP16C to turn on FP16C instructions
+         for converting back and forth to half-floats. This is autoselected when we
+         are using AVX2. Clang and GCC also require the -mf16c switch. ARM always uses
+         the built-in half float hardware NEON instructions.
+
+         You can also tell us to use multiply-add instructions with STBIR_USE_FMA.
+         Because x86 doesn't always have fma, we turn it off by default to maintain
+         determinism across all platforms. If you don't care about non-FMA determinism
+         and are willing to restrict yourself to more recent x86 CPUs (around the AVX
+         timeframe), then fma will give you around a 15% speedup.
+
+         You can force off SIMD in all cases by defining STBIR_NO_SIMD. You can turn
+         off AVX or AVX2 specifically with STBIR_NO_AVX or STBIR_NO_AVX2. AVX is 10%
+         to 40% faster, and AVX2 is generally another 12%.
+
+      ALPHA CHANNEL
+         Most of the resizing functions provide the ability to control how the alpha
+         channel of an image is processed.
+
+         When alpha represents transparency, it is important that when combining
+         colors with filtering, the pixels should not be treated equally; they
+         should use a weighted average based on their alpha values. For example,
+         if a pixel is 1% opaque bright green and another pixel is 99% opaque
+         black and you average them, the average will be 50% opaque, but the
+         unweighted average and will be a middling green color, while the weighted
+         average will be nearly black. This means the unweighted version introduced
+         green energy that didn't exist in the source image.
+
+         (If you want to know why this makes sense, you can work out the math for
+         the following: consider what happens if you alpha composite a source image
+         over a fixed color and then average the output, vs. if you average the
+         source image pixels and then composite that over the same fixed color.
+         Only the weighted average produces the same result as the ground truth
+         composite-then-average result.)
+
+         Therefore, it is in general best to "alpha weight" the pixels when applying
+         filters to them. This essentially means multiplying the colors by the alpha
+         values before combining them, and then dividing by the alpha value at the
+         end.
+
+         The computer graphics industry introduced a technique called "premultiplied
+         alpha" or "associated alpha" in which image colors are stored in image files
+         already multiplied by their alpha. This saves some math when compositing,
+         and also avoids the need to divide by the alpha at the end (which is quite
+         inefficient). However, while premultiplied alpha is common in the movie CGI
+         industry, it is not commonplace in other industries like videogames, and most
+         consumer file formats are generally expected to contain not-premultiplied
+         colors. For example, Photoshop saves PNG files "unpremultiplied", and web
+         browsers like Chrome and Firefox expect PNG images to be unpremultiplied.
+
+         Note that there are three possibilities that might describe your image
+         and resize expectation:
+
+             1. images are not premultiplied, alpha weighting is desired
+             2. images are not premultiplied, alpha weighting is not desired
+             3. images are premultiplied
+
+         Both case #2 and case #3 require the exact same math: no alpha weighting
+         should be applied or removed. Only case 1 requires extra math operations;
+         the other two cases can be handled identically.
+
+         stb_image_resize expects case #1 by default, applying alpha weighting to
+         images, expecting the input images to be unpremultiplied. This is what the
+         COLOR+ALPHA buffer types tell the resizer to do.
+
+         When you use the pixel layouts STBIR_RGBA, STBIR_BGRA, STBIR_ARGB,
+         STBIR_ABGR, STBIR_RX, or STBIR_XR you are telling us that the pixels are
+         non-premultiplied. In these cases, the resizer will alpha weight the colors
+         (effectively creating the premultiplied image), do the filtering, and then
+         convert back to non-premult on exit.
+
+         When you use the pixel layouts STBIR_RGBA_PM, STBIR_RGBA_PM, STBIR_RGBA_PM,
+         STBIR_RGBA_PM, STBIR_RX_PM or STBIR_XR_PM, you are telling that the pixels
+         ARE premultiplied. In this case, the resizer doesn't have to do the
+         premultipling - it can filter directly on the input. This about twice as
+         fast as the non-premultiplied case, so it's the right option if your data is
+         already setup correctly.
+
+         When you use the pixel layout STBIR_4CHANNEL or STBIR_2CHANNEL, you are
+         telling us that there is no channel that represents transparency; it may be
+         RGB and some unrelated fourth channel that has been stored in the alpha
+         channel, but it is actually not alpha. No special processing will be
+         performed.
+
+         The difference between the generic 4 or 2 channel layouts, and the
+         specialized _PM versions is with the _PM versions you are telling us that
+         the data *is* alpha, just don't premultiply it. That's important when
+         using SRGB pixel formats, we need to know where the alpha is, because
+         it is converted linearly (rather than with the SRGB converters).
+
+         Because alpha weighting produces the same effect as premultiplying, you
+         even have the option with non-premultiplied inputs to let the resizer
+         produce a premultiplied output. Because the intially computed alpha-weighted
+         output image is effectively premultiplied, this is actually more performant
+         than the normal path which un-premultiplies the output image as a final step.
+
+         Finally, when converting both in and out of non-premulitplied space (for
+         example, when using STBIR_RGBA), we go to somewhat heroic measures to
+         ensure that areas with zero alpha value pixels get something reasonable
+         in the RGB values. If you don't care about the RGB values of zero alpha
+         pixels, you can call the stbir_set_non_pm_alpha_speed_over_quality()
+         function - this runs a premultiplied resize about 25% faster. That said,
+         when you really care about speed, using premultiplied pixels for both in
+         and out (STBIR_RGBA_PM, etc) much faster than both of these premultiplied
+         options.
+
+      PIXEL LAYOUT CONVERSION
+         The resizer can convert from some pixel layouts to others. When using the
+         stbir_set_pixel_layouts(), you can, for example, specify STBIR_RGBA
+         on input, and STBIR_ARGB on output, and it will re-organize the channels
+         during the resize. Currently, you can only convert between two pixel
+         layouts with the same number of channels.
+
+      DETERMINISM
+         We commit to being deterministic (from x64 to ARM to scalar to SIMD, etc).
+         This requires compiling with fast-math off (using at least /fp:precise).
+         Also, you must turn off fp-contracting (which turns mult+adds into fmas)!
+         We attempt to do this with pragmas, but with Clang, you usually want to add
+         -ffp-contract=off to the command line as well.
+
+         For 32-bit x86, you must use SSE and SSE2 codegen for determinism. That is,
+         if the scalar x87 unit gets used at all, we immediately lose determinism.
+         On Microsoft Visual Studio 2008 and earlier, from what we can tell there is
+         no way to be deterministic in 32-bit x86 (some x87 always leaks in, even
+         with fp:strict). On 32-bit x86 GCC, determinism requires both -msse2 and
+         -fpmath=sse.
+
+         Note that we will not be deterministic with float data containing NaNs -
+         the NaNs will propagate differently on different SIMD and platforms.
+
+         If you turn on STBIR_USE_FMA, then we will be deterministic with other
+         fma targets, but we will differ from non-fma targets (this is unavoidable,
+         because a fma isn't simply an add with a mult - it also introduces a
+         rounding difference compared to non-fma instruction sequences.
+
+      FLOAT PIXEL FORMAT RANGE
+         Any range of values can be used for the non-alpha float data that you pass
+         in (0 to 1, -1 to 1, whatever). However, if you are inputting float values
+         but *outputting* bytes or shorts, you must use a range of 0 to 1 so that we
+         scale back properly. The alpha channel must also be 0 to 1 for any format
+         that does premultiplication prior to resizing.
+
+         Note also that with float output, using filters with negative lobes, the
+         output filtered values might go slightly out of range. You can define
+         STBIR_FLOAT_LOW_CLAMP and/or STBIR_FLOAT_HIGH_CLAMP to specify the range
+         to clamp to on output, if that's important.
+
+      MAX/MIN SCALE FACTORS
+         The input pixel resolutions are in integers, and we do the internal pointer
+         resolution in size_t sized integers. However, the scale ratio from input
+         resolution to output resolution is calculated in float form. This means
+         the effective possible scale ratio is limited to 24 bits (or 16 million
+         to 1). As you get close to the size of the float resolution (again, 16
+         million pixels wide or high), you might start seeing float inaccuracy
+         issues in general in the pipeline. If you have to do extreme resizes,
+         you can usually do this is multiple stages (using float intermediate
+         buffers).
+
+      FLIPPED IMAGES
+         Stride is just the delta from one scanline to the next. This means you can
+         use a negative stride to handle inverted images (point to the final
+         scanline and use a negative stride). You can invert the input or output,
+         using negative strides.
+
+      DEFAULT FILTERS
+         For functions which don't provide explicit control over what filters to
+         use, you can change the compile-time defaults with:
+
+            #define STBIR_DEFAULT_FILTER_UPSAMPLE     STBIR_FILTER_something
+            #define STBIR_DEFAULT_FILTER_DOWNSAMPLE   STBIR_FILTER_something
+
+         See stbir_filter in the header-file section for the list of filters.
+
+      NEW FILTERS
+         A number of 1D filter kernels are supplied. For a list of supported
+         filters, see the stbir_filter enum. You can install your own filters by
+         using the stbir_set_filter_callbacks function.
+
+      PROGRESS
+         For interactive use with slow resize operations, you can use the the
+         scanline callbacks in the extended API. It would have to be a *very* large
+         image resample to need progress though - we're very fast.
+
+      CEIL and FLOOR
+         In scalar mode, the only functions we use from math.h are ceilf and floorf,
+         but if you have your own versions, you can define the STBIR_CEILF(v) and
+         STBIR_FLOORF(v) macros and we'll use them instead. In SIMD, we just use
+         our own versions.
+
+      ASSERT
+         Define STBIR_ASSERT(boolval) to override assert() and not use assert.h
+
+      FUTURE TODOS
+        *  For polyphase integral filters, we just memcpy the coeffs to dupe
+           them, but we should indirect and use the same coeff memory.
+        *  Add pixel layout conversions for sensible different channel counts
+           (maybe, 1->3/4, 3->4, 4->1, 3->1).
+         * For SIMD encode and decode scanline routines, do any pre-aligning
+           for bad input/output buffer alignments and pitch?
+         * For very wide scanlines, we should we do vertical strips to stay within
+           L2 cache. Maybe do chunks of 1K pixels at a time. There would be
+           some pixel reconversion, but probably dwarfed by things falling out
+           of cache. Probably also something possible with alternating between
+           scattering and gathering at high resize scales?
+         * Rewrite the coefficient generator to do many at once.
+         * AVX-512 vertical kernels - worried about downclocking here.
+         * Convert the reincludes to macros when we know they aren't changing.
+         * Experiment with pivoting the horizontal and always using the
+           vertical filters (which are faster, but perhaps not enough to overcome
+           the pivot cost and the extra memory touches). Need to buffer the whole
+           image so have to balance memory use.
+         * Most of our code is internally function pointers, should we compile
+           all the SIMD stuff always and dynamically dispatch?
+
+   CONTRIBUTORS
+      Jeff Roberts: 2.0 implementation, optimizations, SIMD
+      Martins Mozeiko: NEON simd, WASM simd, clang and GCC whisperer.
+      Fabian Giesen: half float and srgb converters
+      Sean Barrett: API design, optimizations
+      Jorge L Rodriguez: Original 1.0 implementation
+      Aras Pranckevicius: bugfixes
+      Nathan Reed: warning fixes for 1.0
+
+   REVISIONS
+      2.07 (2024-05-24) fix for slow final split during threaded conversions of very 
+                          wide scanlines when downsampling (caused by extra input 
+                          converting), fix for wide scanline resamples with many 
+                          splits (int overflow), fix GCC warning.
+      2.06 (2024-02-10) fix for identical width/height 3x or more down-scaling 
+                          undersampling a single row on rare resize ratios (about 1%)
+      2.05 (2024-02-07) fix for 2 pixel to 1 pixel resizes with wrap (thanks Aras)
+                        fix for output callback (thanks Julien Koenen)
+      2.04 (2023-11-17) fix for rare AVX bug, shadowed symbol (thanks Nikola Smiljanic).
+      2.03 (2023-11-01) ASAN and TSAN warnings fixed, minor tweaks.
+      2.00 (2023-10-10) mostly new source: new api, optimizations, simd, vertical-first, etc
+                          (2x-5x faster without simd, 4x-12x faster with simd)
+                          (in some cases, 20x to 40x faster - resizing to very small for example)
+      0.96 (2019-03-04) fixed warnings
+      0.95 (2017-07-23) fixed warnings
+      0.94 (2017-03-18) fixed warnings
+      0.93 (2017-03-03) fixed bug with certain combinations of heights
+      0.92 (2017-01-02) fix integer overflow on large (>2GB) images
+      0.91 (2016-04-02) fix warnings; fix handling of subpixel regions
+      0.90 (2014-09-17) first released version
+
+   LICENSE
+     See end of file for license information.
+*/
+
+#if !defined(STB_IMAGE_RESIZE_DO_HORIZONTALS) && !defined(STB_IMAGE_RESIZE_DO_VERTICALS) && !defined(STB_IMAGE_RESIZE_DO_CODERS)   // for internal re-includes
+
+#ifndef STBIR_INCLUDE_STB_IMAGE_RESIZE2_H
+#define STBIR_INCLUDE_STB_IMAGE_RESIZE2_H
+
+#include <stddef.h>
+#ifdef _MSC_VER
+typedef unsigned char    stbir_uint8;
+typedef unsigned short   stbir_uint16;
+typedef unsigned int     stbir_uint32;
+typedef unsigned __int64 stbir_uint64;
+#else
+#include <stdint.h>
+typedef uint8_t  stbir_uint8;
+typedef uint16_t stbir_uint16;
+typedef uint32_t stbir_uint32;
+typedef uint64_t stbir_uint64;
+#endif
+
+#ifdef _M_IX86_FP
+#if ( _M_IX86_FP >= 1 )
+#ifndef STBIR_SSE
+#define STBIR_SSE
+#endif
+#endif
+#endif
+
+#if defined(_x86_64) || defined( __x86_64__ ) || defined( _M_X64 ) || defined(__x86_64) || defined(_M_AMD64) || defined(__SSE2__) || defined(STBIR_SSE) || defined(STBIR_SSE2)
+  #ifndef STBIR_SSE2
+    #define STBIR_SSE2
+  #endif
+  #if defined(__AVX__) || defined(STBIR_AVX2)
+    #ifndef STBIR_AVX
+      #ifndef STBIR_NO_AVX
+        #define STBIR_AVX
+      #endif
+    #endif
+  #endif
+  #if defined(__AVX2__) || defined(STBIR_AVX2)
+    #ifndef STBIR_NO_AVX2
+      #ifndef STBIR_AVX2
+        #define STBIR_AVX2
+      #endif
+      #if defined( _MSC_VER ) && !defined(__clang__)
+        #ifndef STBIR_FP16C  // FP16C instructions are on all AVX2 cpus, so we can autoselect it here on microsoft - clang needs -m16c
+          #define STBIR_FP16C
+        #endif
+      #endif
+    #endif
+  #endif
+  #ifdef __F16C__
+    #ifndef STBIR_FP16C  // turn on FP16C instructions if the define is set (for clang and gcc)
+      #define STBIR_FP16C
+    #endif
+  #endif
+#endif
+
+#if defined( _M_ARM64 ) || defined( __aarch64__ ) || defined( __arm64__ ) || defined(_M_ARM) || (__ARM_NEON_FP & 4) != 0 &&  __ARM_FP16_FORMAT_IEEE != 0
+#ifndef STBIR_NEON
+#define STBIR_NEON
+#endif
+#endif
+
+#if defined(_M_ARM)
+#ifdef STBIR_USE_FMA
+#undef STBIR_USE_FMA // no FMA for 32-bit arm on MSVC
+#endif
+#endif
+
+#if defined(__wasm__) && defined(__wasm_simd128__)
+#ifndef STBIR_WASM
+#define STBIR_WASM
+#endif
+#endif
+
+#ifndef STBIRDEF
+#ifdef STB_IMAGE_RESIZE_STATIC
+#define STBIRDEF static
+#else
+#ifdef __cplusplus
+#define STBIRDEF extern "C"
+#else
+#define STBIRDEF extern
+#endif
+#endif
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+////   start "header file" ///////////////////////////////////////////////////
+//
+// Easy-to-use API:
+//
+//     * stride is the offset between successive rows of image data
+//        in memory, in bytes. specify 0 for packed continuously in memory
+//     * colorspace is linear or sRGB as specified by function name
+//     * Uses the default filters
+//     * Uses edge mode clamped
+//     * returned result is 1 for success or 0 in case of an error.
+
+
+// stbir_pixel_layout specifies:
+//   number of channels
+//   order of channels
+//   whether color is premultiplied by alpha
+// for back compatibility, you can cast the old channel count to an stbir_pixel_layout
+typedef enum
+{
+  STBIR_1CHANNEL = 1,
+  STBIR_2CHANNEL = 2,
+  STBIR_RGB      = 3,               // 3-chan, with order specified (for channel flipping)
+  STBIR_BGR      = 0,               // 3-chan, with order specified (for channel flipping)
+  STBIR_4CHANNEL = 5,
+
+  STBIR_RGBA = 4,                   // alpha formats, where alpha is NOT premultiplied into color channels
+  STBIR_BGRA = 6,
+  STBIR_ARGB = 7,
+  STBIR_ABGR = 8,
+  STBIR_RA   = 9,
+  STBIR_AR   = 10,
+
+  STBIR_RGBA_PM = 11,               // alpha formats, where alpha is premultiplied into color channels
+  STBIR_BGRA_PM = 12,
+  STBIR_ARGB_PM = 13,
+  STBIR_ABGR_PM = 14,
+  STBIR_RA_PM   = 15,
+  STBIR_AR_PM   = 16,
+
+  STBIR_RGBA_NO_AW = 11,            // alpha formats, where NO alpha weighting is applied at all!
+  STBIR_BGRA_NO_AW = 12,            //   these are just synonyms for the _PM flags (which also do
+  STBIR_ARGB_NO_AW = 13,            //   no alpha weighting). These names just make it more clear
+  STBIR_ABGR_NO_AW = 14,            //   for some folks).
+  STBIR_RA_NO_AW   = 15,
+  STBIR_AR_NO_AW   = 16,
+
+} stbir_pixel_layout;
+
+//===============================================================
+//  Simple-complexity API
+//
+//    If output_pixels is NULL (0), then we will allocate the buffer and return it to you.
+//--------------------------------
+
+STBIRDEF unsigned char * stbir_resize_uint8_srgb( const unsigned char *input_pixels , int input_w , int input_h, int input_stride_in_bytes,
+                                                        unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
+                                                        stbir_pixel_layout pixel_type );
+
+STBIRDEF unsigned char * stbir_resize_uint8_linear( const unsigned char *input_pixels , int input_w , int input_h, int input_stride_in_bytes,
+                                                          unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
+                                                          stbir_pixel_layout pixel_type );
+
+STBIRDEF float * stbir_resize_float_linear( const float *input_pixels , int input_w , int input_h, int input_stride_in_bytes,
+                                                  float *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
+                                                  stbir_pixel_layout pixel_type );
+//===============================================================
+
+//===============================================================
+// Medium-complexity API
+//
+// This extends the easy-to-use API as follows:
+//
+//     * Can specify the datatype - U8, U8_SRGB, U16, FLOAT, HALF_FLOAT
+//     * Edge wrap can selected explicitly
+//     * Filter can be selected explicitly
+//--------------------------------
+
+typedef enum
+{
+  STBIR_EDGE_CLAMP   = 0,
+  STBIR_EDGE_REFLECT = 1,
+  STBIR_EDGE_WRAP    = 2,  // this edge mode is slower and uses more memory
+  STBIR_EDGE_ZERO    = 3,
+} stbir_edge;
+
+typedef enum
+{
+  STBIR_FILTER_DEFAULT      = 0,  // use same filter type that easy-to-use API chooses
+  STBIR_FILTER_BOX          = 1,  // A trapezoid w/1-pixel wide ramps, same result as box for integer scale ratios
+  STBIR_FILTER_TRIANGLE     = 2,  // On upsampling, produces same results as bilinear texture filtering
+  STBIR_FILTER_CUBICBSPLINE = 3,  // The cubic b-spline (aka Mitchell-Netrevalli with B=1,C=0), gaussian-esque
+  STBIR_FILTER_CATMULLROM   = 4,  // An interpolating cubic spline
+  STBIR_FILTER_MITCHELL     = 5,  // Mitchell-Netrevalli filter with B=1/3, C=1/3
+  STBIR_FILTER_POINT_SAMPLE = 6,  // Simple point sampling
+  STBIR_FILTER_OTHER        = 7,  // User callback specified
+} stbir_filter;
+
+typedef enum
+{
+  STBIR_TYPE_UINT8            = 0,
+  STBIR_TYPE_UINT8_SRGB       = 1,
+  STBIR_TYPE_UINT8_SRGB_ALPHA = 2,  // alpha channel, when present, should also be SRGB (this is very unusual)
+  STBIR_TYPE_UINT16           = 3,
+  STBIR_TYPE_FLOAT            = 4,
+  STBIR_TYPE_HALF_FLOAT       = 5
+} stbir_datatype;
+
+// medium api
+STBIRDEF void *  stbir_resize( const void *input_pixels , int input_w , int input_h, int input_stride_in_bytes,
+                                     void *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
+                               stbir_pixel_layout pixel_layout, stbir_datatype data_type,
+                               stbir_edge edge, stbir_filter filter );
+//===============================================================
+
+
+
+//===============================================================
+// Extended-complexity API
+//
+// This API exposes all resize functionality.
+//
+//     * Separate filter types for each axis
+//     * Separate edge modes for each axis
+//     * Separate input and output data types
+//     * Can specify regions with subpixel correctness
+//     * Can specify alpha flags
+//     * Can specify a memory callback
+//     * Can specify a callback data type for pixel input and output
+//     * Can be threaded for a single resize
+//     * Can be used to resize many frames without recalculating the sampler info
+//
+//  Use this API as follows:
+//     1) Call the stbir_resize_init function on a local STBIR_RESIZE structure
+//     2) Call any of the stbir_set functions
+//     3) Optionally call stbir_build_samplers() if you are going to resample multiple times
+//        with the same input and output dimensions (like resizing video frames)
+//     4) Resample by calling stbir_resize_extended().
+//     5) Call stbir_free_samplers() if you called stbir_build_samplers()
+//--------------------------------
+
+
+// Types:
+
+// INPUT CALLBACK: this callback is used for input scanlines
+typedef void const * stbir_input_callback( void * optional_output, void const * input_ptr, int num_pixels, int x, int y, void * context );
+
+// OUTPUT CALLBACK: this callback is used for output scanlines
+typedef void stbir_output_callback( void const * output_ptr, int num_pixels, int y, void * context );
+
+// callbacks for user installed filters
+typedef float stbir__kernel_callback( float x, float scale, void * user_data ); // centered at zero
+typedef float stbir__support_callback( float scale, void * user_data );
+
+// internal structure with precomputed scaling
+typedef struct stbir__info stbir__info;
+
+typedef struct STBIR_RESIZE  // use the stbir_resize_init and stbir_override functions to set these values for future compatibility
+{
+  void * user_data;
+  void const * input_pixels;
+  int input_w, input_h;
+  double input_s0, input_t0, input_s1, input_t1;
+  stbir_input_callback * input_cb;
+  void * output_pixels;
+  int output_w, output_h;
+  int output_subx, output_suby, output_subw, output_subh;
+  stbir_output_callback * output_cb;
+  int input_stride_in_bytes;
+  int output_stride_in_bytes;
+  int splits;
+  int fast_alpha;
+  int needs_rebuild;
+  int called_alloc;
+  stbir_pixel_layout input_pixel_layout_public;
+  stbir_pixel_layout output_pixel_layout_public;
+  stbir_datatype input_data_type;
+  stbir_datatype output_data_type;
+  stbir_filter horizontal_filter, vertical_filter;
+  stbir_edge horizontal_edge, vertical_edge;
+  stbir__kernel_callback * horizontal_filter_kernel; stbir__support_callback * horizontal_filter_support;
+  stbir__kernel_callback * vertical_filter_kernel; stbir__support_callback * vertical_filter_support;
+  stbir__info * samplers;
+} STBIR_RESIZE;
+
+// extended complexity api
+
+
+// First off, you must ALWAYS call stbir_resize_init on your resize structure before any of the other calls!
+STBIRDEF void stbir_resize_init( STBIR_RESIZE * resize,
+                                 const void *input_pixels,  int input_w,  int input_h, int input_stride_in_bytes, // stride can be zero
+                                       void *output_pixels, int output_w, int output_h, int output_stride_in_bytes, // stride can be zero
+                                 stbir_pixel_layout pixel_layout, stbir_datatype data_type );
+
+//===============================================================
+// You can update these parameters any time after resize_init and there is no cost
+//--------------------------------
+
+STBIRDEF void stbir_set_datatypes( STBIR_RESIZE * resize, stbir_datatype input_type, stbir_datatype output_type );
+STBIRDEF void stbir_set_pixel_callbacks( STBIR_RESIZE * resize, stbir_input_callback * input_cb, stbir_output_callback * output_cb );   // no callbacks by default
+STBIRDEF void stbir_set_user_data( STBIR_RESIZE * resize, void * user_data );                                               // pass back STBIR_RESIZE* by default
+STBIRDEF void stbir_set_buffer_ptrs( STBIR_RESIZE * resize, const void * input_pixels, int input_stride_in_bytes, void * output_pixels, int output_stride_in_bytes );
+
+//===============================================================
+
+
+//===============================================================
+// If you call any of these functions, you will trigger a sampler rebuild!
+//--------------------------------
+
+STBIRDEF int stbir_set_pixel_layouts( STBIR_RESIZE * resize, stbir_pixel_layout input_pixel_layout, stbir_pixel_layout output_pixel_layout );  // sets new buffer layouts
+STBIRDEF int stbir_set_edgemodes( STBIR_RESIZE * resize, stbir_edge horizontal_edge, stbir_edge vertical_edge );       // CLAMP by default
+
+STBIRDEF int stbir_set_filters( STBIR_RESIZE * resize, stbir_filter horizontal_filter, stbir_filter vertical_filter ); // STBIR_DEFAULT_FILTER_UPSAMPLE/DOWNSAMPLE by default
+STBIRDEF int stbir_set_filter_callbacks( STBIR_RESIZE * resize, stbir__kernel_callback * horizontal_filter, stbir__support_callback * horizontal_support, stbir__kernel_callback * vertical_filter, stbir__support_callback * vertical_support );
+
+STBIRDEF int stbir_set_pixel_subrect( STBIR_RESIZE * resize, int subx, int suby, int subw, int subh );        // sets both sub-regions (full regions by default)
+STBIRDEF int stbir_set_input_subrect( STBIR_RESIZE * resize, double s0, double t0, double s1, double t1 );    // sets input sub-region (full region by default)
+STBIRDEF int stbir_set_output_pixel_subrect( STBIR_RESIZE * resize, int subx, int suby, int subw, int subh ); // sets output sub-region (full region by default)
+
+// when inputting AND outputting non-premultiplied alpha pixels, we use a slower but higher quality technique
+//   that fills the zero alpha pixel's RGB values with something plausible.  If you don't care about areas of
+//   zero alpha, you can call this function to get about a 25% speed improvement for STBIR_RGBA to STBIR_RGBA
+//   types of resizes.
+STBIRDEF int stbir_set_non_pm_alpha_speed_over_quality( STBIR_RESIZE * resize, int non_pma_alpha_speed_over_quality );
+//===============================================================
+
+
+//===============================================================
+// You can call build_samplers to prebuild all the internal data we need to resample.
+//   Then, if you call resize_extended many times with the same resize, you only pay the
+//   cost once.
+// If you do call build_samplers, you MUST call free_samplers eventually.
+//--------------------------------
+
+// This builds the samplers and does one allocation
+STBIRDEF int stbir_build_samplers( STBIR_RESIZE * resize );
+
+// You MUST call this, if you call stbir_build_samplers or stbir_build_samplers_with_splits
+STBIRDEF void stbir_free_samplers( STBIR_RESIZE * resize );
+//===============================================================
+
+
+// And this is the main function to perform the resize synchronously on one thread.
+STBIRDEF int stbir_resize_extended( STBIR_RESIZE * resize );
+
+
+//===============================================================
+// Use these functions for multithreading.
+//   1) You call stbir_build_samplers_with_splits first on the main thread
+//   2) Then stbir_resize_with_split on each thread
+//   3) stbir_free_samplers when done on the main thread
+//--------------------------------
+
+// This will build samplers for threading.
+//   You can pass in the number of threads you'd like to use (try_splits).
+//   It returns the number of splits (threads) that you can call it with.
+///  It might be less if the image resize can't be split up that many ways.
+
+STBIRDEF int stbir_build_samplers_with_splits( STBIR_RESIZE * resize, int try_splits );
+
+// This function does a split of the resizing (you call this fuction for each
+// split, on multiple threads). A split is a piece of the output resize pixel space.
+
+// Note that you MUST call stbir_build_samplers_with_splits before stbir_resize_extended_split!
+
+// Usually, you will always call stbir_resize_split with split_start as the thread_index
+//   and "1" for the split_count.
+// But, if you have a weird situation where you MIGHT want 8 threads, but sometimes
+//   only 4 threads, you can use 0,2,4,6 for the split_start's and use "2" for the
+//   split_count each time to turn in into a 4 thread resize. (This is unusual).
+
+STBIRDEF int stbir_resize_extended_split( STBIR_RESIZE * resize, int split_start, int split_count );
+//===============================================================
+
+
+//===============================================================
+// Pixel Callbacks info:
+//--------------------------------
+
+//   The input callback is super flexible - it calls you with the input address
+//   (based on the stride and base pointer), it gives you an optional_output
+//   pointer that you can fill, or you can just return your own pointer into
+//   your own data.
+//
+//   You can also do conversion from non-supported data types if necessary - in
+//   this case, you ignore the input_ptr and just use the x and y parameters to
+//   calculate your own input_ptr based on the size of each non-supported pixel.
+//   (Something like the third example below.)
+//
+//   You can also install just an input or just an output callback by setting the
+//   callback that you don't want to zero.
+//
+//     First example, progress: (getting a callback that you can monitor the progress):
+//        void const * my_callback( void * optional_output, void const * input_ptr, int num_pixels, int x, int y, void * context )
+//        {
+//           percentage_done = y / input_height;
+//           return input_ptr;  // use buffer from call
+//        }
+//
+//     Next example, copying: (copy from some other buffer or stream):
+//        void const * my_callback( void * optional_output, void const * input_ptr, int num_pixels, int x, int y, void * context )
+//        {
+//           CopyOrStreamData( optional_output, other_data_src, num_pixels * pixel_width_in_bytes );
+//           return optional_output;  // return the optional buffer that we filled
+//        }
+//
+//     Third example, input another buffer without copying: (zero-copy from other buffer):
+//        void const * my_callback( void * optional_output, void const * input_ptr, int num_pixels, int x, int y, void * context )
+//        {
+//           void * pixels = ( (char*) other_image_base ) + ( y * other_image_stride ) + ( x * other_pixel_width_in_bytes );
+//           return pixels;       // return pointer to your data without copying
+//        }
+//
+//
+//   The output callback is considerably simpler - it just calls you so that you can dump
+//   out each scanline. You could even directly copy out to disk if you have a simple format
+//   like TGA or BMP. You can also convert to other output types here if you want.
+//
+//   Simple example:
+//        void const * my_output( void * output_ptr, int num_pixels, int y, void * context )
+//        {
+//           percentage_done = y / output_height;
+//           fwrite( output_ptr, pixel_width_in_bytes, num_pixels, output_file );
+//        }
+//===============================================================
+
+
+
+
+//===============================================================
+// optional built-in profiling API
+//--------------------------------
+
+#ifdef STBIR_PROFILE
+
+typedef struct STBIR_PROFILE_INFO
+{
+  stbir_uint64 total_clocks;
+
+  // how many clocks spent (of total_clocks) in the various resize routines, along with a string description
+  //    there are "resize_count" number of zones
+  stbir_uint64 clocks[ 8 ];
+  char const ** descriptions;
+
+  // count of clocks and descriptions
+  stbir_uint32 count;
+} STBIR_PROFILE_INFO;
+
+// use after calling stbir_resize_extended (or stbir_build_samplers or stbir_build_samplers_with_splits)
+STBIRDEF void stbir_resize_build_profile_info( STBIR_PROFILE_INFO * out_info, STBIR_RESIZE const * resize );
+
+// use after calling stbir_resize_extended
+STBIRDEF void stbir_resize_extended_profile_info( STBIR_PROFILE_INFO * out_info, STBIR_RESIZE const * resize );
+
+// use after calling stbir_resize_extended_split
+STBIRDEF void stbir_resize_split_profile_info( STBIR_PROFILE_INFO * out_info, STBIR_RESIZE const * resize, int split_start, int split_num );
+
+//===============================================================
+
+#endif
+
+
+////   end header file   /////////////////////////////////////////////////////
+#endif // STBIR_INCLUDE_STB_IMAGE_RESIZE2_H
+
+#if defined(STB_IMAGE_RESIZE_IMPLEMENTATION) || defined(STB_IMAGE_RESIZE2_IMPLEMENTATION)
+
+#ifndef STBIR_ASSERT
+#include <assert.h>
+#define STBIR_ASSERT(x) assert(x)
+#endif
+
+#ifndef STBIR_MALLOC
+#include <stdlib.h>
+#define STBIR_MALLOC(size,user_data) ((void)(user_data), malloc(size))
+#define STBIR_FREE(ptr,user_data)    ((void)(user_data), free(ptr))
+// (we used the comma operator to evaluate user_data, to avoid "unused parameter" warnings)
+#endif
+
+#ifdef _MSC_VER
+
+#define stbir__inline __forceinline
+
+#else
+
+#define stbir__inline __inline__
+
+// Clang address sanitizer
+#if defined(__has_feature)
+  #if __has_feature(address_sanitizer) || __has_feature(memory_sanitizer)
+    #ifndef STBIR__SEPARATE_ALLOCATIONS
+      #define STBIR__SEPARATE_ALLOCATIONS
+    #endif
+  #endif
+#endif
+
+#endif
+
+// GCC and MSVC
+#if defined(__SANITIZE_ADDRESS__)
+  #ifndef STBIR__SEPARATE_ALLOCATIONS
+    #define STBIR__SEPARATE_ALLOCATIONS
+  #endif
+#endif
+
+// Always turn off automatic FMA use - use STBIR_USE_FMA if you want.
+// Otherwise, this is a determinism disaster.
+#ifndef STBIR_DONT_CHANGE_FP_CONTRACT  // override in case you don't want this behavior
+#if defined(_MSC_VER) && !defined(__clang__)
+#if _MSC_VER > 1200
+#pragma fp_contract(off)
+#endif
+#elif defined(__GNUC__) &&  !defined(__clang__)
+#pragma GCC optimize("fp-contract=off")
+#else
+#pragma STDC FP_CONTRACT OFF
+#endif
+#endif
+
+#ifdef _MSC_VER
+#define STBIR__UNUSED(v)  (void)(v)
+#else
+#define STBIR__UNUSED(v)  (void)sizeof(v)
+#endif
+
+#define STBIR__ARRAY_SIZE(a) (sizeof((a))/sizeof((a)[0]))
+
+
+#ifndef STBIR_DEFAULT_FILTER_UPSAMPLE
+#define STBIR_DEFAULT_FILTER_UPSAMPLE    STBIR_FILTER_CATMULLROM
+#endif
+
+#ifndef STBIR_DEFAULT_FILTER_DOWNSAMPLE
+#define STBIR_DEFAULT_FILTER_DOWNSAMPLE  STBIR_FILTER_MITCHELL
+#endif
+
+
+#ifndef STBIR__HEADER_FILENAME
+#define STBIR__HEADER_FILENAME "stb_image_resize2.h"
+#endif
+
+// the internal pixel layout enums are in a different order, so we can easily do range comparisons of types
+//   the public pixel layout is ordered in a way that if you cast num_channels (1-4) to the enum, you get something sensible
+typedef enum
+{
+  STBIRI_1CHANNEL = 0,
+  STBIRI_2CHANNEL = 1,
+  STBIRI_RGB      = 2,
+  STBIRI_BGR      = 3,
+  STBIRI_4CHANNEL = 4,
+
+  STBIRI_RGBA = 5,
+  STBIRI_BGRA = 6,
+  STBIRI_ARGB = 7,
+  STBIRI_ABGR = 8,
+  STBIRI_RA   = 9,
+  STBIRI_AR   = 10,
+
+  STBIRI_RGBA_PM = 11,
+  STBIRI_BGRA_PM = 12,
+  STBIRI_ARGB_PM = 13,
+  STBIRI_ABGR_PM = 14,
+  STBIRI_RA_PM   = 15,
+  STBIRI_AR_PM   = 16,
+} stbir_internal_pixel_layout;
+
+// define the public pixel layouts to not compile inside the implementation (to avoid accidental use)
+#define STBIR_BGR bad_dont_use_in_implementation
+#define STBIR_1CHANNEL STBIR_BGR
+#define STBIR_2CHANNEL STBIR_BGR
+#define STBIR_RGB STBIR_BGR
+#define STBIR_RGBA STBIR_BGR
+#define STBIR_4CHANNEL STBIR_BGR
+#define STBIR_BGRA STBIR_BGR
+#define STBIR_ARGB STBIR_BGR
+#define STBIR_ABGR STBIR_BGR
+#define STBIR_RA STBIR_BGR
+#define STBIR_AR STBIR_BGR
+#define STBIR_RGBA_PM STBIR_BGR
+#define STBIR_BGRA_PM STBIR_BGR
+#define STBIR_ARGB_PM STBIR_BGR
+#define STBIR_ABGR_PM STBIR_BGR
+#define STBIR_RA_PM STBIR_BGR
+#define STBIR_AR_PM STBIR_BGR
+
+// must match stbir_datatype
+static unsigned char stbir__type_size[] = {
+  1,1,1,2,4,2 // STBIR_TYPE_UINT8,STBIR_TYPE_UINT8_SRGB,STBIR_TYPE_UINT8_SRGB_ALPHA,STBIR_TYPE_UINT16,STBIR_TYPE_FLOAT,STBIR_TYPE_HALF_FLOAT
+};
+
+// When gathering, the contributors are which source pixels contribute.
+// When scattering, the contributors are which destination pixels are contributed to.
+typedef struct
+{
+  int n0; // First contributing pixel
+  int n1; // Last contributing pixel
+} stbir__contributors;
+
+typedef struct
+{
+  int lowest;    // First sample index for whole filter
+  int highest;   // Last sample index for whole filter
+  int widest;    // widest single set of samples for an output
+} stbir__filter_extent_info;
+
+typedef struct
+{
+  int n0; // First pixel of decode buffer to write to
+  int n1; // Last pixel of decode that will be written to
+  int pixel_offset_for_input;  // Pixel offset into input_scanline
+} stbir__span;
+
+typedef struct stbir__scale_info
+{
+  int input_full_size;
+  int output_sub_size;
+  float scale;
+  float inv_scale;
+  float pixel_shift; // starting shift in output pixel space (in pixels)
+  int scale_is_rational;
+  stbir_uint32 scale_numerator, scale_denominator;
+} stbir__scale_info;
+
+typedef struct
+{
+  stbir__contributors * contributors;
+  float* coefficients;
+  stbir__contributors * gather_prescatter_contributors;
+  float * gather_prescatter_coefficients;
+  stbir__scale_info scale_info;
+  float support;
+  stbir_filter filter_enum;
+  stbir__kernel_callback * filter_kernel;
+  stbir__support_callback * filter_support;
+  stbir_edge edge;
+  int coefficient_width;
+  int filter_pixel_width;
+  int filter_pixel_margin;
+  int num_contributors;
+  int contributors_size;
+  int coefficients_size;
+  stbir__filter_extent_info extent_info;
+  int is_gather;  // 0 = scatter, 1 = gather with scale >= 1, 2 = gather with scale < 1
+  int gather_prescatter_num_contributors;
+  int gather_prescatter_coefficient_width;
+  int gather_prescatter_contributors_size;
+  int gather_prescatter_coefficients_size;
+} stbir__sampler;
+
+typedef struct
+{
+  stbir__contributors conservative;
+  int edge_sizes[2];    // this can be less than filter_pixel_margin, if the filter and scaling falls off
+  stbir__span spans[2]; // can be two spans, if doing input subrect with clamp mode WRAP
+} stbir__extents;
+
+typedef struct
+{
+#ifdef STBIR_PROFILE
+  union
+  {
+    struct { stbir_uint64 total, looping, vertical, horizontal, decode, encode, alpha, unalpha; } named;
+    stbir_uint64 array[8];
+  } profile;
+  stbir_uint64 * current_zone_excluded_ptr;
+#endif
+  float* decode_buffer;
+
+  int ring_buffer_first_scanline;
+  int ring_buffer_last_scanline;
+  int ring_buffer_begin_index;    // first_scanline is at this index in the ring buffer
+  int start_output_y, end_output_y;
+  int start_input_y, end_input_y;  // used in scatter only
+
+  #ifdef STBIR__SEPARATE_ALLOCATIONS
+    float** ring_buffers; // one pointer for each ring buffer
+  #else
+    float* ring_buffer;  // one big buffer that we index into
+  #endif
+
+  float* vertical_buffer;
+
+  char no_cache_straddle[64];
+} stbir__per_split_info;
+
+typedef void stbir__decode_pixels_func( float * decode, int width_times_channels, void const * input );
+typedef void stbir__alpha_weight_func( float * decode_buffer, int width_times_channels );
+typedef void stbir__horizontal_gather_channels_func( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer,
+  stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width );
+typedef void stbir__alpha_unweight_func(float * encode_buffer, int width_times_channels );
+typedef void stbir__encode_pixels_func( void * output, int width_times_channels, float const * encode );
+
+struct stbir__info
+{
+#ifdef STBIR_PROFILE
+  union
+  {
+    struct { stbir_uint64 total, build, alloc, horizontal, vertical, cleanup, pivot; } named;
+    stbir_uint64 array[7];
+  } profile;
+  stbir_uint64 * current_zone_excluded_ptr;
+#endif
+  stbir__sampler horizontal;
+  stbir__sampler vertical;
+
+  void const * input_data;
+  void * output_data;
+
+  int input_stride_bytes;
+  int output_stride_bytes;
+  int ring_buffer_length_bytes;   // The length of an individual entry in the ring buffer. The total number of ring buffers is stbir__get_filter_pixel_width(filter)
+  int ring_buffer_num_entries;    // Total number of entries in the ring buffer.
+
+  stbir_datatype input_type;
+  stbir_datatype output_type;
+
+  stbir_input_callback * in_pixels_cb;
+  void * user_data;
+  stbir_output_callback * out_pixels_cb;
+
+  stbir__extents scanline_extents;
+
+  void * alloced_mem;
+  stbir__per_split_info * split_info;  // by default 1, but there will be N of these allocated based on the thread init you did
+
+  stbir__decode_pixels_func * decode_pixels;
+  stbir__alpha_weight_func * alpha_weight;
+  stbir__horizontal_gather_channels_func * horizontal_gather_channels;
+  stbir__alpha_unweight_func * alpha_unweight;
+  stbir__encode_pixels_func * encode_pixels;
+
+  int alloc_ring_buffer_num_entries;    // Number of entries in the ring buffer that will be allocated
+  int splits; // count of splits
+
+  stbir_internal_pixel_layout input_pixel_layout_internal;
+  stbir_internal_pixel_layout output_pixel_layout_internal;
+
+  int input_color_and_type;
+  int offset_x, offset_y; // offset within output_data
+  int vertical_first;
+  int channels;
+  int effective_channels; // same as channels, except on RGBA/ARGB (7), or XA/AX (3)
+  size_t alloced_total;
+};
+
+
+#define stbir__max_uint8_as_float             255.0f
+#define stbir__max_uint16_as_float            65535.0f
+#define stbir__max_uint8_as_float_inverted    (1.0f/255.0f)
+#define stbir__max_uint16_as_float_inverted   (1.0f/65535.0f)
+#define stbir__small_float ((float)1 / (1 << 20) / (1 << 20) / (1 << 20) / (1 << 20) / (1 << 20) / (1 << 20))
+
+// min/max friendly
+#define STBIR_CLAMP(x, xmin, xmax) do { \
+  if ( (x) < (xmin) ) (x) = (xmin);     \
+  if ( (x) > (xmax) ) (x) = (xmax);     \
+} while (0)
+
+static stbir__inline int stbir__min(int a, int b)
+{
+  return a < b ? a : b;
+}
+
+static stbir__inline int stbir__max(int a, int b)
+{
+  return a > b ? a : b;
+}
+
+static float stbir__srgb_uchar_to_linear_float[256] = {
+  0.000000f, 0.000304f, 0.000607f, 0.000911f, 0.001214f, 0.001518f, 0.001821f, 0.002125f, 0.002428f, 0.002732f, 0.003035f,
+  0.003347f, 0.003677f, 0.004025f, 0.004391f, 0.004777f, 0.005182f, 0.005605f, 0.006049f, 0.006512f, 0.006995f, 0.007499f,
+  0.008023f, 0.008568f, 0.009134f, 0.009721f, 0.010330f, 0.010960f, 0.011612f, 0.012286f, 0.012983f, 0.013702f, 0.014444f,
+  0.015209f, 0.015996f, 0.016807f, 0.017642f, 0.018500f, 0.019382f, 0.020289f, 0.021219f, 0.022174f, 0.023153f, 0.024158f,
+  0.025187f, 0.026241f, 0.027321f, 0.028426f, 0.029557f, 0.030713f, 0.031896f, 0.033105f, 0.034340f, 0.035601f, 0.036889f,
+  0.038204f, 0.039546f, 0.040915f, 0.042311f, 0.043735f, 0.045186f, 0.046665f, 0.048172f, 0.049707f, 0.051269f, 0.052861f,
+  0.054480f, 0.056128f, 0.057805f, 0.059511f, 0.061246f, 0.063010f, 0.064803f, 0.066626f, 0.068478f, 0.070360f, 0.072272f,
+  0.074214f, 0.076185f, 0.078187f, 0.080220f, 0.082283f, 0.084376f, 0.086500f, 0.088656f, 0.090842f, 0.093059f, 0.095307f,
+  0.097587f, 0.099899f, 0.102242f, 0.104616f, 0.107023f, 0.109462f, 0.111932f, 0.114435f, 0.116971f, 0.119538f, 0.122139f,
+  0.124772f, 0.127438f, 0.130136f, 0.132868f, 0.135633f, 0.138432f, 0.141263f, 0.144128f, 0.147027f, 0.149960f, 0.152926f,
+  0.155926f, 0.158961f, 0.162029f, 0.165132f, 0.168269f, 0.171441f, 0.174647f, 0.177888f, 0.181164f, 0.184475f, 0.187821f,
+  0.191202f, 0.194618f, 0.198069f, 0.201556f, 0.205079f, 0.208637f, 0.212231f, 0.215861f, 0.219526f, 0.223228f, 0.226966f,
+  0.230740f, 0.234551f, 0.238398f, 0.242281f, 0.246201f, 0.250158f, 0.254152f, 0.258183f, 0.262251f, 0.266356f, 0.270498f,
+  0.274677f, 0.278894f, 0.283149f, 0.287441f, 0.291771f, 0.296138f, 0.300544f, 0.304987f, 0.309469f, 0.313989f, 0.318547f,
+  0.323143f, 0.327778f, 0.332452f, 0.337164f, 0.341914f, 0.346704f, 0.351533f, 0.356400f, 0.361307f, 0.366253f, 0.371238f,
+  0.376262f, 0.381326f, 0.386430f, 0.391573f, 0.396755f, 0.401978f, 0.407240f, 0.412543f, 0.417885f, 0.423268f, 0.428691f,
+  0.434154f, 0.439657f, 0.445201f, 0.450786f, 0.456411f, 0.462077f, 0.467784f, 0.473532f, 0.479320f, 0.485150f, 0.491021f,
+  0.496933f, 0.502887f, 0.508881f, 0.514918f, 0.520996f, 0.527115f, 0.533276f, 0.539480f, 0.545725f, 0.552011f, 0.558340f,
+  0.564712f, 0.571125f, 0.577581f, 0.584078f, 0.590619f, 0.597202f, 0.603827f, 0.610496f, 0.617207f, 0.623960f, 0.630757f,
+  0.637597f, 0.644480f, 0.651406f, 0.658375f, 0.665387f, 0.672443f, 0.679543f, 0.686685f, 0.693872f, 0.701102f, 0.708376f,
+  0.715694f, 0.723055f, 0.730461f, 0.737911f, 0.745404f, 0.752942f, 0.760525f, 0.768151f, 0.775822f, 0.783538f, 0.791298f,
+  0.799103f, 0.806952f, 0.814847f, 0.822786f, 0.830770f, 0.838799f, 0.846873f, 0.854993f, 0.863157f, 0.871367f, 0.879622f,
+  0.887923f, 0.896269f, 0.904661f, 0.913099f, 0.921582f, 0.930111f, 0.938686f, 0.947307f, 0.955974f, 0.964686f, 0.973445f,
+  0.982251f, 0.991102f, 1.0f
+};
+
+typedef union
+{
+  unsigned int u;
+  float f;
+} stbir__FP32;
+
+// From https://gist.github.com/rygorous/2203834
+
+static const stbir_uint32 fp32_to_srgb8_tab4[104] = {
+  0x0073000d, 0x007a000d, 0x0080000d, 0x0087000d, 0x008d000d, 0x0094000d, 0x009a000d, 0x00a1000d,
+  0x00a7001a, 0x00b4001a, 0x00c1001a, 0x00ce001a, 0x00da001a, 0x00e7001a, 0x00f4001a, 0x0101001a,
+  0x010e0033, 0x01280033, 0x01410033, 0x015b0033, 0x01750033, 0x018f0033, 0x01a80033, 0x01c20033,
+  0x01dc0067, 0x020f0067, 0x02430067, 0x02760067, 0x02aa0067, 0x02dd0067, 0x03110067, 0x03440067,
+  0x037800ce, 0x03df00ce, 0x044600ce, 0x04ad00ce, 0x051400ce, 0x057b00c5, 0x05dd00bc, 0x063b00b5,
+  0x06970158, 0x07420142, 0x07e30130, 0x087b0120, 0x090b0112, 0x09940106, 0x0a1700fc, 0x0a9500f2,
+  0x0b0f01cb, 0x0bf401ae, 0x0ccb0195, 0x0d950180, 0x0e56016e, 0x0f0d015e, 0x0fbc0150, 0x10630143,
+  0x11070264, 0x1238023e, 0x1357021d, 0x14660201, 0x156601e9, 0x165a01d3, 0x174401c0, 0x182401af,
+  0x18fe0331, 0x1a9602fe, 0x1c1502d2, 0x1d7e02ad, 0x1ed4028d, 0x201a0270, 0x21520256, 0x227d0240,
+  0x239f0443, 0x25c003fe, 0x27bf03c4, 0x29a10392, 0x2b6a0367, 0x2d1d0341, 0x2ebe031f, 0x304d0300,
+  0x31d105b0, 0x34a80555, 0x37520507, 0x39d504c5, 0x3c37048b, 0x3e7c0458, 0x40a8042a, 0x42bd0401,
+  0x44c20798, 0x488e071e, 0x4c1c06b6, 0x4f76065d, 0x52a50610, 0x55ac05cc, 0x5892058f, 0x5b590559,
+  0x5e0c0a23, 0x631c0980, 0x67db08f6, 0x6c55087f, 0x70940818, 0x74a007bd, 0x787d076c, 0x7c330723,
+};
+
+static stbir__inline stbir_uint8 stbir__linear_to_srgb_uchar(float in)
+{
+  static const stbir__FP32 almostone = { 0x3f7fffff }; // 1-eps
+  static const stbir__FP32 minval = { (127-13) << 23 };
+  stbir_uint32 tab,bias,scale,t;
+  stbir__FP32 f;
+
+  // Clamp to [2^(-13), 1-eps]; these two values map to 0 and 1, respectively.
+  // The tests are carefully written so that NaNs map to 0, same as in the reference
+  // implementation.
+  if (!(in > minval.f)) // written this way to catch NaNs
+      return 0;
+  if (in > almostone.f)
+      return 255;
+
+  // Do the table lookup and unpack bias, scale
+  f.f = in;
+  tab = fp32_to_srgb8_tab4[(f.u - minval.u) >> 20];
+  bias = (tab >> 16) << 9;
+  scale = tab & 0xffff;
+
+  // Grab next-highest mantissa bits and perform linear interpolation
+  t = (f.u >> 12) & 0xff;
+  return (unsigned char) ((bias + scale*t) >> 16);
+}
+
+#ifndef STBIR_FORCE_GATHER_FILTER_SCANLINES_AMOUNT
+#define STBIR_FORCE_GATHER_FILTER_SCANLINES_AMOUNT 32 // when downsampling and <= 32 scanlines of buffering, use gather. gather used down to 1/8th scaling for 25% win.
+#endif
+
+#ifndef STBIR_FORCE_MINIMUM_SCANLINES_FOR_SPLITS
+#define STBIR_FORCE_MINIMUM_SCANLINES_FOR_SPLITS 4 // when threading, what is the minimum number of scanlines for a split?
+#endif
+
+// restrict pointers for the output pointers
+#if defined( _MSC_VER ) && !defined(__clang__)
+  #define STBIR_STREAMOUT_PTR( star ) star __restrict
+  #define STBIR_NO_UNROLL( ptr ) __assume(ptr) // this oddly keeps msvc from unrolling a loop
+#elif defined(  __clang__ )
+  #define STBIR_STREAMOUT_PTR( star ) star __restrict__
+  #define STBIR_NO_UNROLL( ptr ) __asm__ (""::"r"(ptr))
+#elif defined(  __GNUC__ )
+  #define STBIR_STREAMOUT_PTR( star ) star __restrict__
+  #define STBIR_NO_UNROLL( ptr ) __asm__ (""::"r"(ptr))
+#else
+  #define STBIR_STREAMOUT_PTR( star ) star
+  #define STBIR_NO_UNROLL( ptr )
+#endif
+
+#ifdef STBIR_NO_SIMD // force simd off for whatever reason
+
+// force simd off overrides everything else, so clear it all
+
+#ifdef STBIR_SSE2
+#undef STBIR_SSE2
+#endif
+
+#ifdef STBIR_AVX
+#undef STBIR_AVX
+#endif
+
+#ifdef STBIR_NEON
+#undef STBIR_NEON
+#endif
+
+#ifdef STBIR_AVX2
+#undef STBIR_AVX2
+#endif
+
+#ifdef STBIR_FP16C
+#undef STBIR_FP16C
+#endif
+
+#ifdef STBIR_WASM
+#undef STBIR_WASM
+#endif
+
+#ifdef STBIR_SIMD
+#undef STBIR_SIMD
+#endif
+
+#else // STBIR_SIMD
+
+#ifdef STBIR_SSE2
+  #include <emmintrin.h>
+
+  #define stbir__simdf __m128
+  #define stbir__simdi __m128i
+
+  #define stbir_simdi_castf( reg ) _mm_castps_si128(reg)
+  #define stbir_simdf_casti( reg ) _mm_castsi128_ps(reg)
+
+  #define stbir__simdf_load( reg, ptr ) (reg) = _mm_loadu_ps( (float const*)(ptr) )
+  #define stbir__simdi_load( reg, ptr ) (reg) = _mm_loadu_si128 ( (stbir__simdi const*)(ptr) )
+  #define stbir__simdf_load1( out, ptr ) (out) = _mm_load_ss( (float const*)(ptr) )  // top values can be random (not denormal or nan for perf)
+  #define stbir__simdi_load1( out, ptr ) (out) = _mm_castps_si128( _mm_load_ss( (float const*)(ptr) ))
+  #define stbir__simdf_load1z( out, ptr ) (out) = _mm_load_ss( (float const*)(ptr) )  // top values must be zero
+  #define stbir__simdf_frep4( fvar ) _mm_set_ps1( fvar )
+  #define stbir__simdf_load1frep4( out, fvar ) (out) = _mm_set_ps1( fvar )
+  #define stbir__simdf_load2( out, ptr ) (out) = _mm_castsi128_ps( _mm_loadl_epi64( (__m128i*)(ptr)) ) // top values can be random (not denormal or nan for perf)
+  #define stbir__simdf_load2z( out, ptr ) (out) = _mm_castsi128_ps( _mm_loadl_epi64( (__m128i*)(ptr)) ) // top values must be zero
+  #define stbir__simdf_load2hmerge( out, reg, ptr ) (out) = _mm_castpd_ps(_mm_loadh_pd( _mm_castps_pd(reg), (double*)(ptr) ))
+
+  #define stbir__simdf_zeroP() _mm_setzero_ps()
+  #define stbir__simdf_zero( reg ) (reg) = _mm_setzero_ps()
+
+  #define stbir__simdf_store( ptr, reg )  _mm_storeu_ps( (float*)(ptr), reg )
+  #define stbir__simdf_store1( ptr, reg ) _mm_store_ss( (float*)(ptr), reg )
+  #define stbir__simdf_store2( ptr, reg ) _mm_storel_epi64( (__m128i*)(ptr), _mm_castps_si128(reg) )
+  #define stbir__simdf_store2h( ptr, reg ) _mm_storeh_pd( (double*)(ptr), _mm_castps_pd(reg) )
+
+  #define stbir__simdi_store( ptr, reg )  _mm_storeu_si128( (__m128i*)(ptr), reg )
+  #define stbir__simdi_store1( ptr, reg ) _mm_store_ss( (float*)(ptr), _mm_castsi128_ps(reg) )
+  #define stbir__simdi_store2( ptr, reg ) _mm_storel_epi64( (__m128i*)(ptr), (reg) )
+
+  #define stbir__prefetch( ptr ) _mm_prefetch((char*)(ptr), _MM_HINT_T0 )
+
+  #define stbir__simdi_expand_u8_to_u32(out0,out1,out2,out3,ireg) \
+  { \
+    stbir__simdi zero = _mm_setzero_si128(); \
+    out2 = _mm_unpacklo_epi8( ireg, zero ); \
+    out3 = _mm_unpackhi_epi8( ireg, zero ); \
+    out0 = _mm_unpacklo_epi16( out2, zero ); \
+    out1 = _mm_unpackhi_epi16( out2, zero ); \
+    out2 = _mm_unpacklo_epi16( out3, zero ); \
+    out3 = _mm_unpackhi_epi16( out3, zero ); \
+  }
+
+#define stbir__simdi_expand_u8_to_1u32(out,ireg) \
+  { \
+    stbir__simdi zero = _mm_setzero_si128(); \
+    out = _mm_unpacklo_epi8( ireg, zero ); \
+    out = _mm_unpacklo_epi16( out, zero ); \
+  }
+
+  #define stbir__simdi_expand_u16_to_u32(out0,out1,ireg) \
+  { \
+    stbir__simdi zero = _mm_setzero_si128(); \
+    out0 = _mm_unpacklo_epi16( ireg, zero ); \
+    out1 = _mm_unpackhi_epi16( ireg, zero ); \
+  }
+
+  #define stbir__simdf_convert_float_to_i32( i, f ) (i) = _mm_cvttps_epi32(f)
+  #define stbir__simdf_convert_float_to_int( f ) _mm_cvtt_ss2si(f)
+  #define stbir__simdf_convert_float_to_uint8( f ) ((unsigned char)_mm_cvtsi128_si32(_mm_cvttps_epi32(_mm_max_ps(_mm_min_ps(f,STBIR__CONSTF(STBIR_max_uint8_as_float)),_mm_setzero_ps()))))
+  #define stbir__simdf_convert_float_to_short( f ) ((unsigned short)_mm_cvtsi128_si32(_mm_cvttps_epi32(_mm_max_ps(_mm_min_ps(f,STBIR__CONSTF(STBIR_max_uint16_as_float)),_mm_setzero_ps()))))
+
+  #define stbir__simdi_to_int( i ) _mm_cvtsi128_si32(i)
+  #define stbir__simdi_convert_i32_to_float(out, ireg) (out) = _mm_cvtepi32_ps( ireg )
+  #define stbir__simdf_add( out, reg0, reg1 ) (out) = _mm_add_ps( reg0, reg1 )
+  #define stbir__simdf_mult( out, reg0, reg1 ) (out) = _mm_mul_ps( reg0, reg1 )
+  #define stbir__simdf_mult_mem( out, reg, ptr ) (out) = _mm_mul_ps( reg, _mm_loadu_ps( (float const*)(ptr) ) )
+  #define stbir__simdf_mult1_mem( out, reg, ptr ) (out) = _mm_mul_ss( reg, _mm_load_ss( (float const*)(ptr) ) )
+  #define stbir__simdf_add_mem( out, reg, ptr ) (out) = _mm_add_ps( reg, _mm_loadu_ps( (float const*)(ptr) ) )
+  #define stbir__simdf_add1_mem( out, reg, ptr ) (out) = _mm_add_ss( reg, _mm_load_ss( (float const*)(ptr) ) )
+
+  #ifdef STBIR_USE_FMA           // not on by default to maintain bit identical simd to non-simd
+  #include <immintrin.h>
+  #define stbir__simdf_madd( out, add, mul1, mul2 ) (out) = _mm_fmadd_ps( mul1, mul2, add )
+  #define stbir__simdf_madd1( out, add, mul1, mul2 ) (out) = _mm_fmadd_ss( mul1, mul2, add )
+  #define stbir__simdf_madd_mem( out, add, mul, ptr ) (out) = _mm_fmadd_ps( mul, _mm_loadu_ps( (float const*)(ptr) ), add )
+  #define stbir__simdf_madd1_mem( out, add, mul, ptr ) (out) = _mm_fmadd_ss( mul, _mm_load_ss( (float const*)(ptr) ), add )
+  #else
+  #define stbir__simdf_madd( out, add, mul1, mul2 ) (out) = _mm_add_ps( add, _mm_mul_ps( mul1, mul2 ) )
+  #define stbir__simdf_madd1( out, add, mul1, mul2 ) (out) = _mm_add_ss( add, _mm_mul_ss( mul1, mul2 ) )
+  #define stbir__simdf_madd_mem( out, add, mul, ptr ) (out) = _mm_add_ps( add, _mm_mul_ps( mul, _mm_loadu_ps( (float const*)(ptr) ) ) )
+  #define stbir__simdf_madd1_mem( out, add, mul, ptr ) (out) = _mm_add_ss( add, _mm_mul_ss( mul, _mm_load_ss( (float const*)(ptr) ) ) )
+  #endif
+
+  #define stbir__simdf_add1( out, reg0, reg1 ) (out) = _mm_add_ss( reg0, reg1 )
+  #define stbir__simdf_mult1( out, reg0, reg1 ) (out) = _mm_mul_ss( reg0, reg1 )
+
+  #define stbir__simdf_and( out, reg0, reg1 ) (out) = _mm_and_ps( reg0, reg1 )
+  #define stbir__simdf_or( out, reg0, reg1 ) (out) = _mm_or_ps( reg0, reg1 )
+
+  #define stbir__simdf_min( out, reg0, reg1 ) (out) = _mm_min_ps( reg0, reg1 )
+  #define stbir__simdf_max( out, reg0, reg1 ) (out) = _mm_max_ps( reg0, reg1 )
+  #define stbir__simdf_min1( out, reg0, reg1 ) (out) = _mm_min_ss( reg0, reg1 )
+  #define stbir__simdf_max1( out, reg0, reg1 ) (out) = _mm_max_ss( reg0, reg1 )
+
+  #define stbir__simdf_0123ABCDto3ABx( out, reg0, reg1 ) (out)=_mm_castsi128_ps( _mm_shuffle_epi32( _mm_castps_si128( _mm_shuffle_ps( reg1,reg0, (0<<0) + (1<<2) + (2<<4) + (3<<6) )), (3<<0) + (0<<2) + (1<<4) + (2<<6) ) )
+  #define stbir__simdf_0123ABCDto23Ax( out, reg0, reg1 ) (out)=_mm_castsi128_ps( _mm_shuffle_epi32( _mm_castps_si128( _mm_shuffle_ps( reg1,reg0, (0<<0) + (1<<2) + (2<<4) + (3<<6) )), (2<<0) + (3<<2) + (0<<4) + (1<<6) ) )
+
+  static const stbir__simdf STBIR_zeroones = { 0.0f,1.0f,0.0f,1.0f };
+  static const stbir__simdf STBIR_onezeros = { 1.0f,0.0f,1.0f,0.0f };
+  #define stbir__simdf_aaa1( out, alp, ones ) (out)=_mm_castsi128_ps( _mm_shuffle_epi32( _mm_castps_si128( _mm_movehl_ps( ones, alp ) ), (1<<0) + (1<<2) + (1<<4) + (2<<6) ) )
+  #define stbir__simdf_1aaa( out, alp, ones ) (out)=_mm_castsi128_ps( _mm_shuffle_epi32( _mm_castps_si128( _mm_movelh_ps( ones, alp ) ), (0<<0) + (2<<2) + (2<<4) + (2<<6) ) )
+  #define stbir__simdf_a1a1( out, alp, ones) (out) = _mm_or_ps( _mm_castsi128_ps( _mm_srli_epi64( _mm_castps_si128(alp), 32 ) ), STBIR_zeroones )
+  #define stbir__simdf_1a1a( out, alp, ones) (out) = _mm_or_ps( _mm_castsi128_ps( _mm_slli_epi64( _mm_castps_si128(alp), 32 ) ), STBIR_onezeros )
+
+  #define stbir__simdf_swiz( reg, one, two, three, four ) _mm_castsi128_ps( _mm_shuffle_epi32( _mm_castps_si128( reg ), (one<<0) + (two<<2) + (three<<4) + (four<<6) ) )
+
+  #define stbir__simdi_and( out, reg0, reg1 ) (out) = _mm_and_si128( reg0, reg1 )
+  #define stbir__simdi_or( out, reg0, reg1 ) (out) = _mm_or_si128( reg0, reg1 )
+  #define stbir__simdi_16madd( out, reg0, reg1 ) (out) = _mm_madd_epi16( reg0, reg1 )
+
+  #define stbir__simdf_pack_to_8bytes(out,aa,bb) \
+  { \
+    stbir__simdf af,bf; \
+    stbir__simdi a,b; \
+    af = _mm_min_ps( aa, STBIR_max_uint8_as_float ); \
+    bf = _mm_min_ps( bb, STBIR_max_uint8_as_float ); \
+    af = _mm_max_ps( af, _mm_setzero_ps() ); \
+    bf = _mm_max_ps( bf, _mm_setzero_ps() ); \
+    a = _mm_cvttps_epi32( af ); \
+    b = _mm_cvttps_epi32( bf ); \
+    a = _mm_packs_epi32( a, b ); \
+    out = _mm_packus_epi16( a, a ); \
+  }
+
+  #define stbir__simdf_load4_transposed( o0, o1, o2, o3, ptr ) \
+      stbir__simdf_load( o0, (ptr) );    \
+      stbir__simdf_load( o1, (ptr)+4 );  \
+      stbir__simdf_load( o2, (ptr)+8 );  \
+      stbir__simdf_load( o3, (ptr)+12 ); \
+      {                                  \
+        __m128 tmp0, tmp1, tmp2, tmp3;   \
+        tmp0 = _mm_unpacklo_ps(o0, o1);  \
+        tmp2 = _mm_unpacklo_ps(o2, o3);  \
+        tmp1 = _mm_unpackhi_ps(o0, o1);  \
+        tmp3 = _mm_unpackhi_ps(o2, o3);  \
+        o0 = _mm_movelh_ps(tmp0, tmp2);  \
+        o1 = _mm_movehl_ps(tmp2, tmp0);  \
+        o2 = _mm_movelh_ps(tmp1, tmp3);  \
+        o3 = _mm_movehl_ps(tmp3, tmp1);  \
+      }
+
+  #define stbir__interleave_pack_and_store_16_u8( ptr, r0, r1, r2, r3 ) \
+      r0 = _mm_packs_epi32( r0, r1 ); \
+      r2 = _mm_packs_epi32( r2, r3 ); \
+      r1 = _mm_unpacklo_epi16( r0, r2 ); \
+      r3 = _mm_unpackhi_epi16( r0, r2 ); \
+      r0 = _mm_unpacklo_epi16( r1, r3 ); \
+      r2 = _mm_unpackhi_epi16( r1, r3 ); \
+      r0 = _mm_packus_epi16( r0, r2 ); \
+      stbir__simdi_store( ptr, r0 ); \
+
+  #define stbir__simdi_32shr( out, reg, imm ) out = _mm_srli_epi32( reg, imm )
+
+  #if defined(_MSC_VER) && !defined(__clang__)
+    // msvc inits with 8 bytes
+    #define STBIR__CONST_32_TO_8( v ) (char)(unsigned char)((v)&255),(char)(unsigned char)(((v)>>8)&255),(char)(unsigned char)(((v)>>16)&255),(char)(unsigned char)(((v)>>24)&255)
+    #define STBIR__CONST_4_32i( v ) STBIR__CONST_32_TO_8( v ), STBIR__CONST_32_TO_8( v ), STBIR__CONST_32_TO_8( v ), STBIR__CONST_32_TO_8( v )
+    #define STBIR__CONST_4d_32i( v0, v1, v2, v3 ) STBIR__CONST_32_TO_8( v0 ), STBIR__CONST_32_TO_8( v1 ), STBIR__CONST_32_TO_8( v2 ), STBIR__CONST_32_TO_8( v3 )
+  #else
+    // everything else inits with long long's
+    #define STBIR__CONST_4_32i( v ) (long long)((((stbir_uint64)(stbir_uint32)(v))<<32)|((stbir_uint64)(stbir_uint32)(v))),(long long)((((stbir_uint64)(stbir_uint32)(v))<<32)|((stbir_uint64)(stbir_uint32)(v)))
+    #define STBIR__CONST_4d_32i( v0, v1, v2, v3 ) (long long)((((stbir_uint64)(stbir_uint32)(v1))<<32)|((stbir_uint64)(stbir_uint32)(v0))),(long long)((((stbir_uint64)(stbir_uint32)(v3))<<32)|((stbir_uint64)(stbir_uint32)(v2)))
+  #endif
+
+  #define STBIR__SIMDF_CONST(var, x) stbir__simdf var = { x, x, x, x }
+  #define STBIR__SIMDI_CONST(var, x) stbir__simdi var = { STBIR__CONST_4_32i(x) }
+  #define STBIR__CONSTF(var) (var)
+  #define STBIR__CONSTI(var) (var)
+
+  #if defined(STBIR_AVX) || defined(__SSE4_1__)
+    #include <smmintrin.h>
+    #define stbir__simdf_pack_to_8words(out,reg0,reg1) out = _mm_packus_epi32(_mm_cvttps_epi32(_mm_max_ps(_mm_min_ps(reg0,STBIR__CONSTF(STBIR_max_uint16_as_float)),_mm_setzero_ps())), _mm_cvttps_epi32(_mm_max_ps(_mm_min_ps(reg1,STBIR__CONSTF(STBIR_max_uint16_as_float)),_mm_setzero_ps())))
+  #else
+    STBIR__SIMDI_CONST(stbir__s32_32768, 32768);
+    STBIR__SIMDI_CONST(stbir__s16_32768, ((32768<<16)|32768));
+
+    #define stbir__simdf_pack_to_8words(out,reg0,reg1) \
+      { \
+        stbir__simdi tmp0,tmp1; \
+        tmp0 = _mm_cvttps_epi32(_mm_max_ps(_mm_min_ps(reg0,STBIR__CONSTF(STBIR_max_uint16_as_float)),_mm_setzero_ps())); \
+        tmp1 = _mm_cvttps_epi32(_mm_max_ps(_mm_min_ps(reg1,STBIR__CONSTF(STBIR_max_uint16_as_float)),_mm_setzero_ps())); \
+        tmp0 = _mm_sub_epi32( tmp0, stbir__s32_32768 ); \
+        tmp1 = _mm_sub_epi32( tmp1, stbir__s32_32768 ); \
+        out = _mm_packs_epi32( tmp0, tmp1 ); \
+        out = _mm_sub_epi16( out, stbir__s16_32768 ); \
+      }
+
+  #endif
+
+  #define STBIR_SIMD
+
+  // if we detect AVX, set the simd8 defines
+  #ifdef STBIR_AVX
+    #include <immintrin.h>
+    #define STBIR_SIMD8
+    #define stbir__simdf8 __m256
+    #define stbir__simdi8 __m256i
+    #define stbir__simdf8_load( out, ptr ) (out) = _mm256_loadu_ps( (float const *)(ptr) )
+    #define stbir__simdi8_load( out, ptr ) (out) = _mm256_loadu_si256( (__m256i const *)(ptr) )
+    #define stbir__simdf8_mult( out, a, b ) (out) = _mm256_mul_ps( (a), (b) )
+    #define stbir__simdf8_store( ptr, out ) _mm256_storeu_ps( (float*)(ptr), out )
+    #define stbir__simdi8_store( ptr, reg )  _mm256_storeu_si256( (__m256i*)(ptr), reg )
+    #define stbir__simdf8_frep8( fval ) _mm256_set1_ps( fval )
+
+    #define stbir__simdf8_min( out, reg0, reg1 ) (out) = _mm256_min_ps( reg0, reg1 )
+    #define stbir__simdf8_max( out, reg0, reg1 ) (out) = _mm256_max_ps( reg0, reg1 )
+
+    #define stbir__simdf8_add4halves( out, bot4, top8 ) (out) = _mm_add_ps( bot4, _mm256_extractf128_ps( top8, 1 ) )
+    #define stbir__simdf8_mult_mem( out, reg, ptr ) (out) = _mm256_mul_ps( reg, _mm256_loadu_ps( (float const*)(ptr) ) )
+    #define stbir__simdf8_add_mem( out, reg, ptr ) (out) = _mm256_add_ps( reg, _mm256_loadu_ps( (float const*)(ptr) ) )
+    #define stbir__simdf8_add( out, a, b ) (out) = _mm256_add_ps( a, b )
+    #define stbir__simdf8_load1b( out, ptr ) (out) = _mm256_broadcast_ss( ptr )
+    #define stbir__simdf_load1rep4( out, ptr ) (out) = _mm_broadcast_ss( ptr )  // avx load instruction
+
+    #define stbir__simdi8_convert_i32_to_float(out, ireg) (out) = _mm256_cvtepi32_ps( ireg )
+    #define stbir__simdf8_convert_float_to_i32( i, f ) (i) = _mm256_cvttps_epi32(f)
+
+    #define stbir__simdf8_bot4s( out, a, b ) (out) = _mm256_permute2f128_ps(a,b, (0<<0)+(2<<4) )
+    #define stbir__simdf8_top4s( out, a, b ) (out) = _mm256_permute2f128_ps(a,b, (1<<0)+(3<<4) )
+
+    #define stbir__simdf8_gettop4( reg ) _mm256_extractf128_ps(reg,1)
+
+    #ifdef STBIR_AVX2
+
+    #define stbir__simdi8_expand_u8_to_u32(out0,out1,ireg) \
+    { \
+      stbir__simdi8 a, zero  =_mm256_setzero_si256();\
+      a = _mm256_permute4x64_epi64( _mm256_unpacklo_epi8( _mm256_permute4x64_epi64(_mm256_castsi128_si256(ireg),(0<<0)+(2<<2)+(1<<4)+(3<<6)), zero ),(0<<0)+(2<<2)+(1<<4)+(3<<6)); \
+      out0 = _mm256_unpacklo_epi16( a, zero ); \
+      out1 = _mm256_unpackhi_epi16( a, zero ); \
+    }
+
+    #define stbir__simdf8_pack_to_16bytes(out,aa,bb) \
+    { \
+      stbir__simdi8 t; \
+      stbir__simdf8 af,bf; \
+      stbir__simdi8 a,b; \
+      af = _mm256_min_ps( aa, STBIR_max_uint8_as_floatX ); \
+      bf = _mm256_min_ps( bb, STBIR_max_uint8_as_floatX ); \
+      af = _mm256_max_ps( af, _mm256_setzero_ps() ); \
+      bf = _mm256_max_ps( bf, _mm256_setzero_ps() ); \
+      a = _mm256_cvttps_epi32( af ); \
+      b = _mm256_cvttps_epi32( bf ); \
+      t = _mm256_permute4x64_epi64( _mm256_packs_epi32( a, b ), (0<<0)+(2<<2)+(1<<4)+(3<<6) ); \
+      out = _mm256_castsi256_si128( _mm256_permute4x64_epi64( _mm256_packus_epi16( t, t ), (0<<0)+(2<<2)+(1<<4)+(3<<6) ) ); \
+    }
+
+    #define stbir__simdi8_expand_u16_to_u32(out,ireg) out = _mm256_unpacklo_epi16( _mm256_permute4x64_epi64(_mm256_castsi128_si256(ireg),(0<<0)+(2<<2)+(1<<4)+(3<<6)), _mm256_setzero_si256() );
+
+    #define stbir__simdf8_pack_to_16words(out,aa,bb) \
+      { \
+        stbir__simdf8 af,bf; \
+        stbir__simdi8 a,b; \
+        af = _mm256_min_ps( aa, STBIR_max_uint16_as_floatX ); \
+        bf = _mm256_min_ps( bb, STBIR_max_uint16_as_floatX ); \
+        af = _mm256_max_ps( af, _mm256_setzero_ps() ); \
+        bf = _mm256_max_ps( bf, _mm256_setzero_ps() ); \
+        a = _mm256_cvttps_epi32( af ); \
+        b = _mm256_cvttps_epi32( bf ); \
+        (out) = _mm256_permute4x64_epi64( _mm256_packus_epi32(a, b), (0<<0)+(2<<2)+(1<<4)+(3<<6) ); \
+      }
+
+    #else
+
+    #define stbir__simdi8_expand_u8_to_u32(out0,out1,ireg) \
+    { \
+      stbir__simdi a,zero = _mm_setzero_si128(); \
+      a = _mm_unpacklo_epi8( ireg, zero ); \
+      out0 = _mm256_setr_m128i( _mm_unpacklo_epi16( a, zero ), _mm_unpackhi_epi16( a, zero ) ); \
+      a = _mm_unpackhi_epi8( ireg, zero ); \
+      out1 = _mm256_setr_m128i( _mm_unpacklo_epi16( a, zero ), _mm_unpackhi_epi16( a, zero ) ); \
+    }
+
+    #define stbir__simdf8_pack_to_16bytes(out,aa,bb) \
+    { \
+      stbir__simdi t; \
+      stbir__simdf8 af,bf; \
+      stbir__simdi8 a,b; \
+      af = _mm256_min_ps( aa, STBIR_max_uint8_as_floatX ); \
+      bf = _mm256_min_ps( bb, STBIR_max_uint8_as_floatX ); \
+      af = _mm256_max_ps( af, _mm256_setzero_ps() ); \
+      bf = _mm256_max_ps( bf, _mm256_setzero_ps() ); \
+      a = _mm256_cvttps_epi32( af ); \
+      b = _mm256_cvttps_epi32( bf ); \
+      out = _mm_packs_epi32( _mm256_castsi256_si128(a), _mm256_extractf128_si256( a, 1 ) ); \
+      out = _mm_packus_epi16( out, out ); \
+      t = _mm_packs_epi32( _mm256_castsi256_si128(b), _mm256_extractf128_si256( b, 1 ) ); \
+      t = _mm_packus_epi16( t, t ); \
+      out = _mm_castps_si128( _mm_shuffle_ps( _mm_castsi128_ps(out), _mm_castsi128_ps(t), (0<<0)+(1<<2)+(0<<4)+(1<<6) ) ); \
+    }
+
+    #define stbir__simdi8_expand_u16_to_u32(out,ireg) \
+    { \
+      stbir__simdi a,b,zero = _mm_setzero_si128(); \
+      a = _mm_unpacklo_epi16( ireg, zero ); \
+      b = _mm_unpackhi_epi16( ireg, zero ); \
+      out = _mm256_insertf128_si256( _mm256_castsi128_si256( a ), b, 1 ); \
+    }
+
+    #define stbir__simdf8_pack_to_16words(out,aa,bb) \
+      { \
+        stbir__simdi t0,t1; \
+        stbir__simdf8 af,bf; \
+        stbir__simdi8 a,b; \
+        af = _mm256_min_ps( aa, STBIR_max_uint16_as_floatX ); \
+        bf = _mm256_min_ps( bb, STBIR_max_uint16_as_floatX ); \
+        af = _mm256_max_ps( af, _mm256_setzero_ps() ); \
+        bf = _mm256_max_ps( bf, _mm256_setzero_ps() ); \
+        a = _mm256_cvttps_epi32( af ); \
+        b = _mm256_cvttps_epi32( bf ); \
+        t0 = _mm_packus_epi32( _mm256_castsi256_si128(a), _mm256_extractf128_si256( a, 1 ) ); \
+        t1 = _mm_packus_epi32( _mm256_castsi256_si128(b), _mm256_extractf128_si256( b, 1 ) ); \
+        out = _mm256_setr_m128i( t0, t1 ); \
+      }
+
+    #endif
+
+    static __m256i stbir_00001111 = { STBIR__CONST_4d_32i( 0, 0, 0, 0 ), STBIR__CONST_4d_32i( 1, 1, 1, 1 ) };
+    #define stbir__simdf8_0123to00001111( out, in ) (out) = _mm256_permutevar_ps ( in, stbir_00001111 )
+
+    static __m256i stbir_22223333 = { STBIR__CONST_4d_32i( 2, 2, 2, 2 ), STBIR__CONST_4d_32i( 3, 3, 3, 3 ) };
+    #define stbir__simdf8_0123to22223333( out, in ) (out) = _mm256_permutevar_ps ( in, stbir_22223333 )
+
+    #define stbir__simdf8_0123to2222( out, in ) (out) = stbir__simdf_swiz(_mm256_castps256_ps128(in), 2,2,2,2 )
+
+    #define stbir__simdf8_load4b( out, ptr ) (out) = _mm256_broadcast_ps( (__m128 const *)(ptr) )
+
+    static __m256i stbir_00112233 = { STBIR__CONST_4d_32i( 0, 0, 1, 1 ), STBIR__CONST_4d_32i( 2, 2, 3, 3 ) };
+    #define stbir__simdf8_0123to00112233( out, in ) (out) = _mm256_permutevar_ps ( in, stbir_00112233 )
+    #define stbir__simdf8_add4( out, a8, b ) (out) = _mm256_add_ps( a8,  _mm256_castps128_ps256( b ) )
+
+    static __m256i stbir_load6 = { STBIR__CONST_4_32i( 0x80000000 ), STBIR__CONST_4d_32i(  0x80000000,  0x80000000, 0, 0 ) };
+    #define stbir__simdf8_load6z( out, ptr ) (out) = _mm256_maskload_ps( ptr, stbir_load6 )
+
+    #define stbir__simdf8_0123to00000000( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (0<<0)+(0<<2)+(0<<4)+(0<<6) )
+    #define stbir__simdf8_0123to11111111( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (1<<0)+(1<<2)+(1<<4)+(1<<6) )
+    #define stbir__simdf8_0123to22222222( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (2<<0)+(2<<2)+(2<<4)+(2<<6) )
+    #define stbir__simdf8_0123to33333333( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (3<<0)+(3<<2)+(3<<4)+(3<<6) )
+    #define stbir__simdf8_0123to21032103( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (2<<0)+(1<<2)+(0<<4)+(3<<6) )
+    #define stbir__simdf8_0123to32103210( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (3<<0)+(2<<2)+(1<<4)+(0<<6) )
+    #define stbir__simdf8_0123to12301230( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (1<<0)+(2<<2)+(3<<4)+(0<<6) )
+    #define stbir__simdf8_0123to10321032( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (1<<0)+(0<<2)+(3<<4)+(2<<6) )
+    #define stbir__simdf8_0123to30123012( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (3<<0)+(0<<2)+(1<<4)+(2<<6) )
+
+    #define stbir__simdf8_0123to11331133( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (1<<0)+(1<<2)+(3<<4)+(3<<6) )
+    #define stbir__simdf8_0123to00220022( out, in ) (out) =  _mm256_shuffle_ps ( in, in, (0<<0)+(0<<2)+(2<<4)+(2<<6) )
+
+    #define stbir__simdf8_aaa1( out, alp, ones ) (out) = _mm256_blend_ps( alp, ones, (1<<0)+(1<<1)+(1<<2)+(0<<3)+(1<<4)+(1<<5)+(1<<6)+(0<<7)); (out)=_mm256_shuffle_ps( out,out, (3<<0) + (3<<2) + (3<<4) + (0<<6) )
+    #define stbir__simdf8_1aaa( out, alp, ones ) (out) = _mm256_blend_ps( alp, ones, (0<<0)+(1<<1)+(1<<2)+(1<<3)+(0<<4)+(1<<5)+(1<<6)+(1<<7)); (out)=_mm256_shuffle_ps( out,out, (1<<0) + (0<<2) + (0<<4) + (0<<6) )
+    #define stbir__simdf8_a1a1( out, alp, ones) (out) = _mm256_blend_ps( alp, ones, (1<<0)+(0<<1)+(1<<2)+(0<<3)+(1<<4)+(0<<5)+(1<<6)+(0<<7)); (out)=_mm256_shuffle_ps( out,out, (1<<0) + (0<<2) + (3<<4) + (2<<6) )
+    #define stbir__simdf8_1a1a( out, alp, ones) (out) = _mm256_blend_ps( alp, ones, (0<<0)+(1<<1)+(0<<2)+(1<<3)+(0<<4)+(1<<5)+(0<<6)+(1<<7)); (out)=_mm256_shuffle_ps( out,out, (1<<0) + (0<<2) + (3<<4) + (2<<6) )
+
+    #define stbir__simdf8_zero( reg ) (reg) = _mm256_setzero_ps()
+
+    #ifdef STBIR_USE_FMA           // not on by default to maintain bit identical simd to non-simd
+    #define stbir__simdf8_madd( out, add, mul1, mul2 ) (out) = _mm256_fmadd_ps( mul1, mul2, add )
+    #define stbir__simdf8_madd_mem( out, add, mul, ptr ) (out) = _mm256_fmadd_ps( mul, _mm256_loadu_ps( (float const*)(ptr) ), add )
+    #define stbir__simdf8_madd_mem4( out, add, mul, ptr )(out) = _mm256_fmadd_ps( _mm256_setr_m128( mul, _mm_setzero_ps() ), _mm256_setr_m128( _mm_loadu_ps( (float const*)(ptr) ), _mm_setzero_ps() ), add )
+    #else
+    #define stbir__simdf8_madd( out, add, mul1, mul2 ) (out) = _mm256_add_ps( add, _mm256_mul_ps( mul1, mul2 ) )
+    #define stbir__simdf8_madd_mem( out, add, mul, ptr ) (out) = _mm256_add_ps( add, _mm256_mul_ps( mul, _mm256_loadu_ps( (float const*)(ptr) ) ) )
+    #define stbir__simdf8_madd_mem4( out, add, mul, ptr )  (out) = _mm256_add_ps( add, _mm256_setr_m128( _mm_mul_ps( mul, _mm_loadu_ps( (float const*)(ptr) ) ), _mm_setzero_ps() ) )
+    #endif
+    #define stbir__if_simdf8_cast_to_simdf4( val ) _mm256_castps256_ps128( val )
+
+  #endif
+
+  #ifdef STBIR_FLOORF
+  #undef STBIR_FLOORF
+  #endif
+  #define STBIR_FLOORF stbir_simd_floorf
+  static stbir__inline float stbir_simd_floorf(float x)  // martins floorf
+  {
+    #if defined(STBIR_AVX) || defined(__SSE4_1__) || defined(STBIR_SSE41)
+    __m128 t = _mm_set_ss(x);
+    return _mm_cvtss_f32( _mm_floor_ss(t, t) );
+    #else
+    __m128 f = _mm_set_ss(x);
+    __m128 t = _mm_cvtepi32_ps(_mm_cvttps_epi32(f));
+    __m128 r = _mm_add_ss(t, _mm_and_ps(_mm_cmplt_ss(f, t), _mm_set_ss(-1.0f)));
+    return _mm_cvtss_f32(r);
+    #endif
+  }
+
+  #ifdef STBIR_CEILF
+  #undef STBIR_CEILF
+  #endif
+  #define STBIR_CEILF stbir_simd_ceilf
+  static stbir__inline float stbir_simd_ceilf(float x)  // martins ceilf
+  {
+    #if defined(STBIR_AVX) || defined(__SSE4_1__) || defined(STBIR_SSE41)
+    __m128 t = _mm_set_ss(x);
+    return _mm_cvtss_f32( _mm_ceil_ss(t, t) );
+    #else
+    __m128 f = _mm_set_ss(x);
+    __m128 t = _mm_cvtepi32_ps(_mm_cvttps_epi32(f));
+    __m128 r = _mm_add_ss(t, _mm_and_ps(_mm_cmplt_ss(t, f), _mm_set_ss(1.0f)));
+    return _mm_cvtss_f32(r);
+    #endif
+  }
+
+#elif defined(STBIR_NEON)
+
+  #include <arm_neon.h>
+
+  #define stbir__simdf float32x4_t
+  #define stbir__simdi uint32x4_t
+
+  #define stbir_simdi_castf( reg ) vreinterpretq_u32_f32(reg)
+  #define stbir_simdf_casti( reg ) vreinterpretq_f32_u32(reg)
+
+  #define stbir__simdf_load( reg, ptr ) (reg) = vld1q_f32( (float const*)(ptr) )
+  #define stbir__simdi_load( reg, ptr ) (reg) = vld1q_u32( (uint32_t const*)(ptr) )
+  #define stbir__simdf_load1( out, ptr ) (out) = vld1q_dup_f32( (float const*)(ptr) ) // top values can be random (not denormal or nan for perf)
+  #define stbir__simdi_load1( out, ptr ) (out) = vld1q_dup_u32( (uint32_t const*)(ptr) )
+  #define stbir__simdf_load1z( out, ptr ) (out) = vld1q_lane_f32( (float const*)(ptr), vdupq_n_f32(0), 0 ) // top values must be zero
+  #define stbir__simdf_frep4( fvar ) vdupq_n_f32( fvar )
+  #define stbir__simdf_load1frep4( out, fvar ) (out) = vdupq_n_f32( fvar )
+  #define stbir__simdf_load2( out, ptr ) (out) = vcombine_f32( vld1_f32( (float const*)(ptr) ), vcreate_f32(0) ) // top values can be random (not denormal or nan for perf)
+  #define stbir__simdf_load2z( out, ptr ) (out) = vcombine_f32( vld1_f32( (float const*)(ptr) ), vcreate_f32(0) )  // top values must be zero
+  #define stbir__simdf_load2hmerge( out, reg, ptr ) (out) = vcombine_f32( vget_low_f32(reg), vld1_f32( (float const*)(ptr) ) )
+
+  #define stbir__simdf_zeroP() vdupq_n_f32(0)
+  #define stbir__simdf_zero( reg ) (reg) = vdupq_n_f32(0)
+
+  #define stbir__simdf_store( ptr, reg )  vst1q_f32( (float*)(ptr), reg )
+  #define stbir__simdf_store1( ptr, reg ) vst1q_lane_f32( (float*)(ptr), reg, 0)
+  #define stbir__simdf_store2( ptr, reg ) vst1_f32( (float*)(ptr), vget_low_f32(reg) )
+  #define stbir__simdf_store2h( ptr, reg ) vst1_f32( (float*)(ptr), vget_high_f32(reg) )
+
+  #define stbir__simdi_store( ptr, reg )  vst1q_u32( (uint32_t*)(ptr), reg )
+  #define stbir__simdi_store1( ptr, reg ) vst1q_lane_u32( (uint32_t*)(ptr), reg, 0 )
+  #define stbir__simdi_store2( ptr, reg ) vst1_u32( (uint32_t*)(ptr), vget_low_u32(reg) )
+
+  #define stbir__prefetch( ptr )
+
+  #define stbir__simdi_expand_u8_to_u32(out0,out1,out2,out3,ireg) \
+  { \
+    uint16x8_t l = vmovl_u8( vget_low_u8 ( vreinterpretq_u8_u32(ireg) ) ); \
+    uint16x8_t h = vmovl_u8( vget_high_u8( vreinterpretq_u8_u32(ireg) ) ); \
+    out0 = vmovl_u16( vget_low_u16 ( l ) ); \
+    out1 = vmovl_u16( vget_high_u16( l ) ); \
+    out2 = vmovl_u16( vget_low_u16 ( h ) ); \
+    out3 = vmovl_u16( vget_high_u16( h ) ); \
+  }
+
+  #define stbir__simdi_expand_u8_to_1u32(out,ireg) \
+  { \
+    uint16x8_t tmp = vmovl_u8( vget_low_u8( vreinterpretq_u8_u32(ireg) ) ); \
+    out = vmovl_u16( vget_low_u16( tmp ) ); \
+  }
+
+  #define stbir__simdi_expand_u16_to_u32(out0,out1,ireg) \
+  { \
+    uint16x8_t tmp = vreinterpretq_u16_u32(ireg); \
+    out0 = vmovl_u16( vget_low_u16 ( tmp ) ); \
+    out1 = vmovl_u16( vget_high_u16( tmp ) ); \
+  }
+
+  #define stbir__simdf_convert_float_to_i32( i, f ) (i) = vreinterpretq_u32_s32( vcvtq_s32_f32(f) )
+  #define stbir__simdf_convert_float_to_int( f ) vgetq_lane_s32(vcvtq_s32_f32(f), 0)
+  #define stbir__simdi_to_int( i ) (int)vgetq_lane_u32(i, 0)
+  #define stbir__simdf_convert_float_to_uint8( f ) ((unsigned char)vgetq_lane_s32(vcvtq_s32_f32(vmaxq_f32(vminq_f32(f,STBIR__CONSTF(STBIR_max_uint8_as_float)),vdupq_n_f32(0))), 0))
+  #define stbir__simdf_convert_float_to_short( f ) ((unsigned short)vgetq_lane_s32(vcvtq_s32_f32(vmaxq_f32(vminq_f32(f,STBIR__CONSTF(STBIR_max_uint16_as_float)),vdupq_n_f32(0))), 0))
+  #define stbir__simdi_convert_i32_to_float(out, ireg) (out) = vcvtq_f32_s32( vreinterpretq_s32_u32(ireg) )
+  #define stbir__simdf_add( out, reg0, reg1 ) (out) = vaddq_f32( reg0, reg1 )
+  #define stbir__simdf_mult( out, reg0, reg1 ) (out) = vmulq_f32( reg0, reg1 )
+  #define stbir__simdf_mult_mem( out, reg, ptr ) (out) = vmulq_f32( reg, vld1q_f32( (float const*)(ptr) ) )
+  #define stbir__simdf_mult1_mem( out, reg, ptr ) (out) = vmulq_f32( reg, vld1q_dup_f32( (float const*)(ptr) ) )
+  #define stbir__simdf_add_mem( out, reg, ptr ) (out) = vaddq_f32( reg, vld1q_f32( (float const*)(ptr) ) )
+  #define stbir__simdf_add1_mem( out, reg, ptr ) (out) = vaddq_f32( reg, vld1q_dup_f32( (float const*)(ptr) ) )
+
+  #ifdef STBIR_USE_FMA           // not on by default to maintain bit identical simd to non-simd (and also x64 no madd to arm madd)
+  #define stbir__simdf_madd( out, add, mul1, mul2 ) (out) = vfmaq_f32( add, mul1, mul2 )
+  #define stbir__simdf_madd1( out, add, mul1, mul2 ) (out) = vfmaq_f32( add, mul1, mul2 )
+  #define stbir__simdf_madd_mem( out, add, mul, ptr ) (out) = vfmaq_f32( add, mul, vld1q_f32( (float const*)(ptr) ) )
+  #define stbir__simdf_madd1_mem( out, add, mul, ptr ) (out) = vfmaq_f32( add, mul, vld1q_dup_f32( (float const*)(ptr) ) )
+  #else
+  #define stbir__simdf_madd( out, add, mul1, mul2 ) (out) = vaddq_f32( add, vmulq_f32( mul1, mul2 ) )
+  #define stbir__simdf_madd1( out, add, mul1, mul2 ) (out) = vaddq_f32( add, vmulq_f32( mul1, mul2 ) )
+  #define stbir__simdf_madd_mem( out, add, mul, ptr ) (out) = vaddq_f32( add, vmulq_f32( mul, vld1q_f32( (float const*)(ptr) ) ) )
+  #define stbir__simdf_madd1_mem( out, add, mul, ptr ) (out) = vaddq_f32( add, vmulq_f32( mul, vld1q_dup_f32( (float const*)(ptr) ) ) )
+  #endif
+
+  #define stbir__simdf_add1( out, reg0, reg1 ) (out) = vaddq_f32( reg0, reg1 )
+  #define stbir__simdf_mult1( out, reg0, reg1 ) (out) = vmulq_f32( reg0, reg1 )
+
+  #define stbir__simdf_and( out, reg0, reg1 ) (out) = vreinterpretq_f32_u32( vandq_u32( vreinterpretq_u32_f32(reg0), vreinterpretq_u32_f32(reg1) ) )
+  #define stbir__simdf_or( out, reg0, reg1 ) (out) = vreinterpretq_f32_u32( vorrq_u32( vreinterpretq_u32_f32(reg0), vreinterpretq_u32_f32(reg1) ) )
+
+  #define stbir__simdf_min( out, reg0, reg1 ) (out) = vminq_f32( reg0, reg1 )
+  #define stbir__simdf_max( out, reg0, reg1 ) (out) = vmaxq_f32( reg0, reg1 )
+  #define stbir__simdf_min1( out, reg0, reg1 ) (out) = vminq_f32( reg0, reg1 )
+  #define stbir__simdf_max1( out, reg0, reg1 ) (out) = vmaxq_f32( reg0, reg1 )
+
+  #define stbir__simdf_0123ABCDto3ABx( out, reg0, reg1 ) (out) = vextq_f32( reg0, reg1, 3 )
+  #define stbir__simdf_0123ABCDto23Ax( out, reg0, reg1 ) (out) = vextq_f32( reg0, reg1, 2 )
+
+  #define stbir__simdf_a1a1( out, alp, ones ) (out) = vzipq_f32(vuzpq_f32(alp, alp).val[1], ones).val[0]
+  #define stbir__simdf_1a1a( out, alp, ones ) (out) = vzipq_f32(ones, vuzpq_f32(alp, alp).val[0]).val[0]
+
+  #if defined( _M_ARM64 ) || defined( __aarch64__ ) || defined( __arm64__ )
+
+    #define stbir__simdf_aaa1( out, alp, ones ) (out) = vcopyq_laneq_f32(vdupq_n_f32(vgetq_lane_f32(alp, 3)), 3, ones, 3)
+    #define stbir__simdf_1aaa( out, alp, ones ) (out) = vcopyq_laneq_f32(vdupq_n_f32(vgetq_lane_f32(alp, 0)), 0, ones, 0)
+
+    #if defined( _MSC_VER ) && !defined(__clang__)
+      #define stbir_make16(a,b,c,d) vcombine_u8( \
+        vcreate_u8( (4*a+0) | ((4*a+1)<<8) | ((4*a+2)<<16) | ((4*a+3)<<24) | \
+          ((stbir_uint64)(4*b+0)<<32) | ((stbir_uint64)(4*b+1)<<40) | ((stbir_uint64)(4*b+2)<<48) | ((stbir_uint64)(4*b+3)<<56)), \
+        vcreate_u8( (4*c+0) | ((4*c+1)<<8) | ((4*c+2)<<16) | ((4*c+3)<<24) | \
+          ((stbir_uint64)(4*d+0)<<32) | ((stbir_uint64)(4*d+1)<<40) | ((stbir_uint64)(4*d+2)<<48) | ((stbir_uint64)(4*d+3)<<56) ) )
+    #else
+      #define stbir_make16(a,b,c,d) (uint8x16_t){4*a+0,4*a+1,4*a+2,4*a+3,4*b+0,4*b+1,4*b+2,4*b+3,4*c+0,4*c+1,4*c+2,4*c+3,4*d+0,4*d+1,4*d+2,4*d+3}
+    #endif
+
+    #define stbir__simdf_swiz( reg, one, two, three, four ) vreinterpretq_f32_u8( vqtbl1q_u8( vreinterpretq_u8_f32(reg), stbir_make16(one, two, three, four) ) )
+
+    #define stbir__simdi_16madd( out, reg0, reg1 ) \
+    { \
+      int16x8_t r0 = vreinterpretq_s16_u32(reg0); \
+      int16x8_t r1 = vreinterpretq_s16_u32(reg1); \
+      int32x4_t tmp0 = vmull_s16( vget_low_s16(r0), vget_low_s16(r1) ); \
+      int32x4_t tmp1 = vmull_s16( vget_high_s16(r0), vget_high_s16(r1) ); \
+      (out) = vreinterpretq_u32_s32( vpaddq_s32(tmp0, tmp1) ); \
+    }
+
+  #else
+
+    #define stbir__simdf_aaa1( out, alp, ones ) (out) = vsetq_lane_f32(1.0f, vdupq_n_f32(vgetq_lane_f32(alp, 3)), 3)
+    #define stbir__simdf_1aaa( out, alp, ones ) (out) = vsetq_lane_f32(1.0f, vdupq_n_f32(vgetq_lane_f32(alp, 0)), 0)
+
+    #if defined( _MSC_VER ) && !defined(__clang__)
+      static stbir__inline uint8x8x2_t stbir_make8x2(float32x4_t reg)
+      {
+        uint8x8x2_t r = { { vget_low_u8(vreinterpretq_u8_f32(reg)), vget_high_u8(vreinterpretq_u8_f32(reg)) } };
+        return r;
+      }
+      #define stbir_make8(a,b) vcreate_u8( \
+        (4*a+0) | ((4*a+1)<<8) | ((4*a+2)<<16) | ((4*a+3)<<24) | \
+        ((stbir_uint64)(4*b+0)<<32) | ((stbir_uint64)(4*b+1)<<40) | ((stbir_uint64)(4*b+2)<<48) | ((stbir_uint64)(4*b+3)<<56) )
+    #else
+      #define stbir_make8x2(reg) (uint8x8x2_t){ { vget_low_u8(vreinterpretq_u8_f32(reg)), vget_high_u8(vreinterpretq_u8_f32(reg)) } }
+      #define stbir_make8(a,b) (uint8x8_t){4*a+0,4*a+1,4*a+2,4*a+3,4*b+0,4*b+1,4*b+2,4*b+3}
+    #endif
+
+    #define stbir__simdf_swiz( reg, one, two, three, four ) vreinterpretq_f32_u8( vcombine_u8( \
+        vtbl2_u8( stbir_make8x2( reg ), stbir_make8( one, two ) ), \
+        vtbl2_u8( stbir_make8x2( reg ), stbir_make8( three, four ) ) ) )
+
+    #define stbir__simdi_16madd( out, reg0, reg1 ) \
+    { \
+      int16x8_t r0 = vreinterpretq_s16_u32(reg0); \
+      int16x8_t r1 = vreinterpretq_s16_u32(reg1); \
+      int32x4_t tmp0 = vmull_s16( vget_low_s16(r0), vget_low_s16(r1) ); \
+      int32x4_t tmp1 = vmull_s16( vget_high_s16(r0), vget_high_s16(r1) ); \
+      int32x2_t out0 = vpadd_s32( vget_low_s32(tmp0), vget_high_s32(tmp0) ); \
+      int32x2_t out1 = vpadd_s32( vget_low_s32(tmp1), vget_high_s32(tmp1) ); \
+      (out) = vreinterpretq_u32_s32( vcombine_s32(out0, out1) ); \
+    }
+
+  #endif
+
+  #define stbir__simdi_and( out, reg0, reg1 ) (out) = vandq_u32( reg0, reg1 )
+  #define stbir__simdi_or( out, reg0, reg1 ) (out) = vorrq_u32( reg0, reg1 )
+
+  #define stbir__simdf_pack_to_8bytes(out,aa,bb) \
+  { \
+    float32x4_t af = vmaxq_f32( vminq_f32(aa,STBIR__CONSTF(STBIR_max_uint8_as_float) ), vdupq_n_f32(0) ); \
+    float32x4_t bf = vmaxq_f32( vminq_f32(bb,STBIR__CONSTF(STBIR_max_uint8_as_float) ), vdupq_n_f32(0) ); \
+    int16x4_t ai = vqmovn_s32( vcvtq_s32_f32( af ) ); \
+    int16x4_t bi = vqmovn_s32( vcvtq_s32_f32( bf ) ); \
+    uint8x8_t out8 = vqmovun_s16( vcombine_s16(ai, bi) ); \
+    out = vreinterpretq_u32_u8( vcombine_u8(out8, out8) ); \
+  }
+
+  #define stbir__simdf_pack_to_8words(out,aa,bb) \
+  { \
+    float32x4_t af = vmaxq_f32( vminq_f32(aa,STBIR__CONSTF(STBIR_max_uint16_as_float) ), vdupq_n_f32(0) ); \
+    float32x4_t bf = vmaxq_f32( vminq_f32(bb,STBIR__CONSTF(STBIR_max_uint16_as_float) ), vdupq_n_f32(0) ); \
+    int32x4_t ai = vcvtq_s32_f32( af ); \
+    int32x4_t bi = vcvtq_s32_f32( bf ); \
+    out = vreinterpretq_u32_u16( vcombine_u16(vqmovun_s32(ai), vqmovun_s32(bi)) ); \
+  }
+
+  #define stbir__interleave_pack_and_store_16_u8( ptr, r0, r1, r2, r3 ) \
+  { \
+    int16x4x2_t tmp0 = vzip_s16( vqmovn_s32(vreinterpretq_s32_u32(r0)), vqmovn_s32(vreinterpretq_s32_u32(r2)) ); \
+    int16x4x2_t tmp1 = vzip_s16( vqmovn_s32(vreinterpretq_s32_u32(r1)), vqmovn_s32(vreinterpretq_s32_u32(r3)) ); \
+    uint8x8x2_t out = \
+    { { \
+      vqmovun_s16( vcombine_s16(tmp0.val[0], tmp0.val[1]) ), \
+      vqmovun_s16( vcombine_s16(tmp1.val[0], tmp1.val[1]) ), \
+    } }; \
+    vst2_u8(ptr, out); \
+  }
+
+  #define stbir__simdf_load4_transposed( o0, o1, o2, o3, ptr ) \
+  { \
+    float32x4x4_t tmp = vld4q_f32(ptr); \
+    o0 = tmp.val[0]; \
+    o1 = tmp.val[1]; \
+    o2 = tmp.val[2]; \
+    o3 = tmp.val[3]; \
+  }
+
+  #define stbir__simdi_32shr( out, reg, imm ) out = vshrq_n_u32( reg, imm )
+
+  #if defined( _MSC_VER ) && !defined(__clang__)
+    #define STBIR__SIMDF_CONST(var, x) __declspec(align(8)) float var[] = { x, x, x, x }
+    #define STBIR__SIMDI_CONST(var, x) __declspec(align(8)) uint32_t var[] = { x, x, x, x }
+    #define STBIR__CONSTF(var) (*(const float32x4_t*)var)
+    #define STBIR__CONSTI(var) (*(const uint32x4_t*)var)
+  #else
+    #define STBIR__SIMDF_CONST(var, x) stbir__simdf var = { x, x, x, x }
+    #define STBIR__SIMDI_CONST(var, x) stbir__simdi var = { x, x, x, x }
+    #define STBIR__CONSTF(var) (var)
+    #define STBIR__CONSTI(var) (var)
+  #endif
+
+  #ifdef STBIR_FLOORF
+  #undef STBIR_FLOORF
+  #endif
+  #define STBIR_FLOORF stbir_simd_floorf
+  static stbir__inline float stbir_simd_floorf(float x)
+  {
+    #if defined( _M_ARM64 ) || defined( __aarch64__ ) || defined( __arm64__ )
+    return vget_lane_f32( vrndm_f32( vdup_n_f32(x) ), 0);
+    #else
+    float32x2_t f = vdup_n_f32(x);
+    float32x2_t t = vcvt_f32_s32(vcvt_s32_f32(f));
+    uint32x2_t a = vclt_f32(f, t);
+    uint32x2_t b = vreinterpret_u32_f32(vdup_n_f32(-1.0f));
+    float32x2_t r = vadd_f32(t, vreinterpret_f32_u32(vand_u32(a, b)));
+    return vget_lane_f32(r, 0);
+    #endif
+  }
+
+  #ifdef STBIR_CEILF
+  #undef STBIR_CEILF
+  #endif
+  #define STBIR_CEILF stbir_simd_ceilf
+  static stbir__inline float stbir_simd_ceilf(float x)
+  {
+    #if defined( _M_ARM64 ) || defined( __aarch64__ ) || defined( __arm64__ )
+    return vget_lane_f32( vrndp_f32( vdup_n_f32(x) ), 0);
+    #else
+    float32x2_t f = vdup_n_f32(x);
+    float32x2_t t = vcvt_f32_s32(vcvt_s32_f32(f));
+    uint32x2_t a = vclt_f32(t, f);
+    uint32x2_t b = vreinterpret_u32_f32(vdup_n_f32(1.0f));
+    float32x2_t r = vadd_f32(t, vreinterpret_f32_u32(vand_u32(a, b)));
+    return vget_lane_f32(r, 0);
+    #endif
+  }
+
+  #define STBIR_SIMD
+
+#elif defined(STBIR_WASM)
+
+  #include <wasm_simd128.h>
+
+  #define stbir__simdf v128_t
+  #define stbir__simdi v128_t
+
+  #define stbir_simdi_castf( reg ) (reg)
+  #define stbir_simdf_casti( reg ) (reg)
+
+  #define stbir__simdf_load( reg, ptr )             (reg) = wasm_v128_load( (void const*)(ptr) )
+  #define stbir__simdi_load( reg, ptr )             (reg) = wasm_v128_load( (void const*)(ptr) )
+  #define stbir__simdf_load1( out, ptr )            (out) = wasm_v128_load32_splat( (void const*)(ptr) ) // top values can be random (not denormal or nan for perf)
+  #define stbir__simdi_load1( out, ptr )            (out) = wasm_v128_load32_splat( (void const*)(ptr) )
+  #define stbir__simdf_load1z( out, ptr )           (out) = wasm_v128_load32_zero( (void const*)(ptr) ) // top values must be zero
+  #define stbir__simdf_frep4( fvar )                wasm_f32x4_splat( fvar )
+  #define stbir__simdf_load1frep4( out, fvar )      (out) = wasm_f32x4_splat( fvar )
+  #define stbir__simdf_load2( out, ptr )            (out) = wasm_v128_load64_splat( (void const*)(ptr) ) // top values can be random (not denormal or nan for perf)
+  #define stbir__simdf_load2z( out, ptr )           (out) = wasm_v128_load64_zero( (void const*)(ptr) ) // top values must be zero
+  #define stbir__simdf_load2hmerge( out, reg, ptr ) (out) = wasm_v128_load64_lane( (void const*)(ptr), reg, 1 )
+
+  #define stbir__simdf_zeroP() wasm_f32x4_const_splat(0)
+  #define stbir__simdf_zero( reg ) (reg) = wasm_f32x4_const_splat(0)
+
+  #define stbir__simdf_store( ptr, reg )   wasm_v128_store( (void*)(ptr), reg )
+  #define stbir__simdf_store1( ptr, reg )  wasm_v128_store32_lane( (void*)(ptr), reg, 0 )
+  #define stbir__simdf_store2( ptr, reg )  wasm_v128_store64_lane( (void*)(ptr), reg, 0 )
+  #define stbir__simdf_store2h( ptr, reg ) wasm_v128_store64_lane( (void*)(ptr), reg, 1 )
+
+  #define stbir__simdi_store( ptr, reg )  wasm_v128_store( (void*)(ptr), reg )
+  #define stbir__simdi_store1( ptr, reg ) wasm_v128_store32_lane( (void*)(ptr), reg, 0 )
+  #define stbir__simdi_store2( ptr, reg ) wasm_v128_store64_lane( (void*)(ptr), reg, 0 )
+
+  #define stbir__prefetch( ptr )
+
+  #define stbir__simdi_expand_u8_to_u32(out0,out1,out2,out3,ireg) \
+  { \
+    v128_t l = wasm_u16x8_extend_low_u8x16 ( ireg ); \
+    v128_t h = wasm_u16x8_extend_high_u8x16( ireg ); \
+    out0 = wasm_u32x4_extend_low_u16x8 ( l ); \
+    out1 = wasm_u32x4_extend_high_u16x8( l ); \
+    out2 = wasm_u32x4_extend_low_u16x8 ( h ); \
+    out3 = wasm_u32x4_extend_high_u16x8( h ); \
+  }
+
+  #define stbir__simdi_expand_u8_to_1u32(out,ireg) \
+  { \
+    v128_t tmp = wasm_u16x8_extend_low_u8x16(ireg); \
+    out = wasm_u32x4_extend_low_u16x8(tmp); \
+  }
+
+  #define stbir__simdi_expand_u16_to_u32(out0,out1,ireg) \
+  { \
+    out0 = wasm_u32x4_extend_low_u16x8 ( ireg ); \
+    out1 = wasm_u32x4_extend_high_u16x8( ireg ); \
+  }
+
+  #define stbir__simdf_convert_float_to_i32( i, f )    (i) = wasm_i32x4_trunc_sat_f32x4(f)
+  #define stbir__simdf_convert_float_to_int( f )       wasm_i32x4_extract_lane(wasm_i32x4_trunc_sat_f32x4(f), 0)
+  #define stbir__simdi_to_int( i )                     wasm_i32x4_extract_lane(i, 0)
+  #define stbir__simdf_convert_float_to_uint8( f )     ((unsigned char)wasm_i32x4_extract_lane(wasm_i32x4_trunc_sat_f32x4(wasm_f32x4_max(wasm_f32x4_min(f,STBIR_max_uint8_as_float),wasm_f32x4_const_splat(0))), 0))
+  #define stbir__simdf_convert_float_to_short( f )     ((unsigned short)wasm_i32x4_extract_lane(wasm_i32x4_trunc_sat_f32x4(wasm_f32x4_max(wasm_f32x4_min(f,STBIR_max_uint16_as_float),wasm_f32x4_const_splat(0))), 0))
+  #define stbir__simdi_convert_i32_to_float(out, ireg) (out) = wasm_f32x4_convert_i32x4(ireg)
+  #define stbir__simdf_add( out, reg0, reg1 )          (out) = wasm_f32x4_add( reg0, reg1 )
+  #define stbir__simdf_mult( out, reg0, reg1 )         (out) = wasm_f32x4_mul( reg0, reg1 )
+  #define stbir__simdf_mult_mem( out, reg, ptr )       (out) = wasm_f32x4_mul( reg, wasm_v128_load( (void const*)(ptr) ) )
+  #define stbir__simdf_mult1_mem( out, reg, ptr )      (out) = wasm_f32x4_mul( reg, wasm_v128_load32_splat( (void const*)(ptr) ) )
+  #define stbir__simdf_add_mem( out, reg, ptr )        (out) = wasm_f32x4_add( reg, wasm_v128_load( (void const*)(ptr) ) )
+  #define stbir__simdf_add1_mem( out, reg, ptr )       (out) = wasm_f32x4_add( reg, wasm_v128_load32_splat( (void const*)(ptr) ) )
+
+  #define stbir__simdf_madd( out, add, mul1, mul2 )    (out) = wasm_f32x4_add( add, wasm_f32x4_mul( mul1, mul2 ) )
+  #define stbir__simdf_madd1( out, add, mul1, mul2 )   (out) = wasm_f32x4_add( add, wasm_f32x4_mul( mul1, mul2 ) )
+  #define stbir__simdf_madd_mem( out, add, mul, ptr )  (out) = wasm_f32x4_add( add, wasm_f32x4_mul( mul, wasm_v128_load( (void const*)(ptr) ) ) )
+  #define stbir__simdf_madd1_mem( out, add, mul, ptr ) (out) = wasm_f32x4_add( add, wasm_f32x4_mul( mul, wasm_v128_load32_splat( (void const*)(ptr) ) ) )
+
+  #define stbir__simdf_add1( out, reg0, reg1 )  (out) = wasm_f32x4_add( reg0, reg1 )
+  #define stbir__simdf_mult1( out, reg0, reg1 ) (out) = wasm_f32x4_mul( reg0, reg1 )
+
+  #define stbir__simdf_and( out, reg0, reg1 ) (out) = wasm_v128_and( reg0, reg1 )
+  #define stbir__simdf_or( out, reg0, reg1 )  (out) = wasm_v128_or( reg0, reg1 )
+
+  #define stbir__simdf_min( out, reg0, reg1 ) (out) = wasm_f32x4_min( reg0, reg1 )
+  #define stbir__simdf_max( out, reg0, reg1 ) (out) = wasm_f32x4_max( reg0, reg1 )
+  #define stbir__simdf_min1( out, reg0, reg1 ) (out) = wasm_f32x4_min( reg0, reg1 )
+  #define stbir__simdf_max1( out, reg0, reg1 ) (out) = wasm_f32x4_max( reg0, reg1 )
+
+  #define stbir__simdf_0123ABCDto3ABx( out, reg0, reg1 ) (out) = wasm_i32x4_shuffle( reg0, reg1, 3, 4, 5, -1 )
+  #define stbir__simdf_0123ABCDto23Ax( out, reg0, reg1 ) (out) = wasm_i32x4_shuffle( reg0, reg1, 2, 3, 4, -1 )
+
+  #define stbir__simdf_aaa1(out,alp,ones) (out) = wasm_i32x4_shuffle(alp, ones, 3, 3, 3, 4)
+  #define stbir__simdf_1aaa(out,alp,ones) (out) = wasm_i32x4_shuffle(alp, ones, 4, 0, 0, 0)
+  #define stbir__simdf_a1a1(out,alp,ones) (out) = wasm_i32x4_shuffle(alp, ones, 1, 4, 3, 4)
+  #define stbir__simdf_1a1a(out,alp,ones) (out) = wasm_i32x4_shuffle(alp, ones, 4, 0, 4, 2)
+
+  #define stbir__simdf_swiz( reg, one, two, three, four ) wasm_i32x4_shuffle(reg, reg, one, two, three, four)
+
+  #define stbir__simdi_and( out, reg0, reg1 )    (out) = wasm_v128_and( reg0, reg1 )
+  #define stbir__simdi_or( out, reg0, reg1 )     (out) = wasm_v128_or( reg0, reg1 )
+  #define stbir__simdi_16madd( out, reg0, reg1 ) (out) = wasm_i32x4_dot_i16x8( reg0, reg1 )
+
+  #define stbir__simdf_pack_to_8bytes(out,aa,bb) \
+  { \
+    v128_t af = wasm_f32x4_max( wasm_f32x4_min(aa, STBIR_max_uint8_as_float), wasm_f32x4_const_splat(0) ); \
+    v128_t bf = wasm_f32x4_max( wasm_f32x4_min(bb, STBIR_max_uint8_as_float), wasm_f32x4_const_splat(0) ); \
+    v128_t ai = wasm_i32x4_trunc_sat_f32x4( af ); \
+    v128_t bi = wasm_i32x4_trunc_sat_f32x4( bf ); \
+    v128_t out16 = wasm_i16x8_narrow_i32x4( ai, bi ); \
+    out = wasm_u8x16_narrow_i16x8( out16, out16 ); \
+  }
+
+  #define stbir__simdf_pack_to_8words(out,aa,bb) \
+  { \
+    v128_t af = wasm_f32x4_max( wasm_f32x4_min(aa, STBIR_max_uint16_as_float), wasm_f32x4_const_splat(0)); \
+    v128_t bf = wasm_f32x4_max( wasm_f32x4_min(bb, STBIR_max_uint16_as_float), wasm_f32x4_const_splat(0)); \
+    v128_t ai = wasm_i32x4_trunc_sat_f32x4( af ); \
+    v128_t bi = wasm_i32x4_trunc_sat_f32x4( bf ); \
+    out = wasm_u16x8_narrow_i32x4( ai, bi ); \
+  }
+
+  #define stbir__interleave_pack_and_store_16_u8( ptr, r0, r1, r2, r3 ) \
+  { \
+    v128_t tmp0 = wasm_i16x8_narrow_i32x4(r0, r1); \
+    v128_t tmp1 = wasm_i16x8_narrow_i32x4(r2, r3); \
+    v128_t tmp = wasm_u8x16_narrow_i16x8(tmp0, tmp1); \
+    tmp = wasm_i8x16_shuffle(tmp, tmp, 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15); \
+    wasm_v128_store( (void*)(ptr), tmp); \
+  }
+
+  #define stbir__simdf_load4_transposed( o0, o1, o2, o3, ptr ) \
+  { \
+    v128_t t0 = wasm_v128_load( ptr    ); \
+    v128_t t1 = wasm_v128_load( ptr+4  ); \
+    v128_t t2 = wasm_v128_load( ptr+8  ); \
+    v128_t t3 = wasm_v128_load( ptr+12 ); \
+    v128_t s0 = wasm_i32x4_shuffle(t0, t1, 0, 4, 2, 6); \
+    v128_t s1 = wasm_i32x4_shuffle(t0, t1, 1, 5, 3, 7); \
+    v128_t s2 = wasm_i32x4_shuffle(t2, t3, 0, 4, 2, 6); \
+    v128_t s3 = wasm_i32x4_shuffle(t2, t3, 1, 5, 3, 7); \
+    o0 = wasm_i32x4_shuffle(s0, s2, 0, 1, 4, 5); \
+    o1 = wasm_i32x4_shuffle(s1, s3, 0, 1, 4, 5); \
+    o2 = wasm_i32x4_shuffle(s0, s2, 2, 3, 6, 7); \
+    o3 = wasm_i32x4_shuffle(s1, s3, 2, 3, 6, 7); \
+  }
+
+  #define stbir__simdi_32shr( out, reg, imm ) out = wasm_u32x4_shr( reg, imm )
+
+  typedef float stbir__f32x4 __attribute__((__vector_size__(16), __aligned__(16)));
+  #define STBIR__SIMDF_CONST(var, x) stbir__simdf var = (v128_t)(stbir__f32x4){ x, x, x, x }
+  #define STBIR__SIMDI_CONST(var, x) stbir__simdi var = { x, x, x, x }
+  #define STBIR__CONSTF(var) (var)
+  #define STBIR__CONSTI(var) (var)
+
+  #ifdef STBIR_FLOORF
+  #undef STBIR_FLOORF
+  #endif
+  #define STBIR_FLOORF stbir_simd_floorf
+  static stbir__inline float stbir_simd_floorf(float x)
+  {
+    return wasm_f32x4_extract_lane( wasm_f32x4_floor( wasm_f32x4_splat(x) ), 0);
+  }
+
+  #ifdef STBIR_CEILF
+  #undef STBIR_CEILF
+  #endif
+  #define STBIR_CEILF stbir_simd_ceilf
+  static stbir__inline float stbir_simd_ceilf(float x)
+  {
+    return wasm_f32x4_extract_lane( wasm_f32x4_ceil( wasm_f32x4_splat(x) ), 0);
+  }
+
+  #define STBIR_SIMD
+
+#endif  // SSE2/NEON/WASM
+
+#endif // NO SIMD
+
+#ifdef STBIR_SIMD8
+  #define stbir__simdfX stbir__simdf8
+  #define stbir__simdiX stbir__simdi8
+  #define stbir__simdfX_load stbir__simdf8_load
+  #define stbir__simdiX_load stbir__simdi8_load
+  #define stbir__simdfX_mult stbir__simdf8_mult
+  #define stbir__simdfX_add_mem stbir__simdf8_add_mem
+  #define stbir__simdfX_madd_mem stbir__simdf8_madd_mem
+  #define stbir__simdfX_store stbir__simdf8_store
+  #define stbir__simdiX_store stbir__simdi8_store
+  #define stbir__simdf_frepX  stbir__simdf8_frep8
+  #define stbir__simdfX_madd stbir__simdf8_madd
+  #define stbir__simdfX_min stbir__simdf8_min
+  #define stbir__simdfX_max stbir__simdf8_max
+  #define stbir__simdfX_aaa1 stbir__simdf8_aaa1
+  #define stbir__simdfX_1aaa stbir__simdf8_1aaa
+  #define stbir__simdfX_a1a1 stbir__simdf8_a1a1
+  #define stbir__simdfX_1a1a stbir__simdf8_1a1a
+  #define stbir__simdfX_convert_float_to_i32 stbir__simdf8_convert_float_to_i32
+  #define stbir__simdfX_pack_to_words stbir__simdf8_pack_to_16words
+  #define stbir__simdfX_zero stbir__simdf8_zero
+  #define STBIR_onesX STBIR_ones8
+  #define STBIR_max_uint8_as_floatX STBIR_max_uint8_as_float8
+  #define STBIR_max_uint16_as_floatX STBIR_max_uint16_as_float8
+  #define STBIR_simd_point5X STBIR_simd_point58
+  #define stbir__simdfX_float_count 8
+  #define stbir__simdfX_0123to1230 stbir__simdf8_0123to12301230
+  #define stbir__simdfX_0123to2103 stbir__simdf8_0123to21032103
+  static const stbir__simdf8 STBIR_max_uint16_as_float_inverted8 = { stbir__max_uint16_as_float_inverted,stbir__max_uint16_as_float_inverted,stbir__max_uint16_as_float_inverted,stbir__max_uint16_as_float_inverted,stbir__max_uint16_as_float_inverted,stbir__max_uint16_as_float_inverted,stbir__max_uint16_as_float_inverted,stbir__max_uint16_as_float_inverted };
+  static const stbir__simdf8 STBIR_max_uint8_as_float_inverted8 = { stbir__max_uint8_as_float_inverted,stbir__max_uint8_as_float_inverted,stbir__max_uint8_as_float_inverted,stbir__max_uint8_as_float_inverted,stbir__max_uint8_as_float_inverted,stbir__max_uint8_as_float_inverted,stbir__max_uint8_as_float_inverted,stbir__max_uint8_as_float_inverted };
+  static const stbir__simdf8 STBIR_ones8 = { 1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 };
+  static const stbir__simdf8 STBIR_simd_point58 = { 0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5 };
+  static const stbir__simdf8 STBIR_max_uint8_as_float8 = { stbir__max_uint8_as_float,stbir__max_uint8_as_float,stbir__max_uint8_as_float,stbir__max_uint8_as_float, stbir__max_uint8_as_float,stbir__max_uint8_as_float,stbir__max_uint8_as_float,stbir__max_uint8_as_float };
+  static const stbir__simdf8 STBIR_max_uint16_as_float8 = { stbir__max_uint16_as_float,stbir__max_uint16_as_float,stbir__max_uint16_as_float,stbir__max_uint16_as_float, stbir__max_uint16_as_float,stbir__max_uint16_as_float,stbir__max_uint16_as_float,stbir__max_uint16_as_float };
+#else
+  #define stbir__simdfX stbir__simdf
+  #define stbir__simdiX stbir__simdi
+  #define stbir__simdfX_load stbir__simdf_load
+  #define stbir__simdiX_load stbir__simdi_load
+  #define stbir__simdfX_mult stbir__simdf_mult
+  #define stbir__simdfX_add_mem stbir__simdf_add_mem
+  #define stbir__simdfX_madd_mem stbir__simdf_madd_mem
+  #define stbir__simdfX_store stbir__simdf_store
+  #define stbir__simdiX_store stbir__simdi_store
+  #define stbir__simdf_frepX  stbir__simdf_frep4
+  #define stbir__simdfX_madd stbir__simdf_madd
+  #define stbir__simdfX_min stbir__simdf_min
+  #define stbir__simdfX_max stbir__simdf_max
+  #define stbir__simdfX_aaa1 stbir__simdf_aaa1
+  #define stbir__simdfX_1aaa stbir__simdf_1aaa
+  #define stbir__simdfX_a1a1 stbir__simdf_a1a1
+  #define stbir__simdfX_1a1a stbir__simdf_1a1a
+  #define stbir__simdfX_convert_float_to_i32 stbir__simdf_convert_float_to_i32
+  #define stbir__simdfX_pack_to_words stbir__simdf_pack_to_8words
+  #define stbir__simdfX_zero stbir__simdf_zero
+  #define STBIR_onesX STBIR__CONSTF(STBIR_ones)
+  #define STBIR_simd_point5X STBIR__CONSTF(STBIR_simd_point5)
+  #define STBIR_max_uint8_as_floatX STBIR__CONSTF(STBIR_max_uint8_as_float)
+  #define STBIR_max_uint16_as_floatX STBIR__CONSTF(STBIR_max_uint16_as_float)
+  #define stbir__simdfX_float_count 4
+  #define stbir__if_simdf8_cast_to_simdf4( val ) ( val )
+  #define stbir__simdfX_0123to1230 stbir__simdf_0123to1230
+  #define stbir__simdfX_0123to2103 stbir__simdf_0123to2103
+#endif
+
+
+#if defined(STBIR_NEON) && !defined(_M_ARM)
+
+  #if defined( _MSC_VER ) && !defined(__clang__)
+  typedef __int16 stbir__FP16;
+  #else
+  typedef float16_t stbir__FP16;
+  #endif
+
+#else // no NEON, or 32-bit ARM for MSVC
+
+  typedef union stbir__FP16
+  {
+    unsigned short u;
+  } stbir__FP16;
+
+#endif
+
+#if !defined(STBIR_NEON) && !defined(STBIR_FP16C) || defined(STBIR_NEON) && defined(_M_ARM)
+
+  // Fabian's half float routines, see: https://gist.github.com/rygorous/2156668
+
+  static stbir__inline float stbir__half_to_float( stbir__FP16 h )
+  {
+    static const stbir__FP32 magic = { (254 - 15) << 23 };
+    static const stbir__FP32 was_infnan = { (127 + 16) << 23 };
+    stbir__FP32 o;
+
+    o.u = (h.u & 0x7fff) << 13;     // exponent/mantissa bits
+    o.f *= magic.f;                 // exponent adjust
+    if (o.f >= was_infnan.f)        // make sure Inf/NaN survive
+      o.u |= 255 << 23;
+    o.u |= (h.u & 0x8000) << 16;    // sign bit
+    return o.f;
+  }
+
+  static stbir__inline stbir__FP16 stbir__float_to_half(float val)
+  {
+    stbir__FP32 f32infty = { 255 << 23 };
+    stbir__FP32 f16max   = { (127 + 16) << 23 };
+    stbir__FP32 denorm_magic = { ((127 - 15) + (23 - 10) + 1) << 23 };
+    unsigned int sign_mask = 0x80000000u;
+    stbir__FP16 o = { 0 };
+    stbir__FP32 f;
+    unsigned int sign;
+
+    f.f = val;
+    sign = f.u & sign_mask;
+    f.u ^= sign;
+
+    if (f.u >= f16max.u) // result is Inf or NaN (all exponent bits set)
+      o.u = (f.u > f32infty.u) ? 0x7e00 : 0x7c00; // NaN->qNaN and Inf->Inf
+    else // (De)normalized number or zero
+    {
+      if (f.u < (113 << 23)) // resulting FP16 is subnormal or zero
+      {
+        // use a magic value to align our 10 mantissa bits at the bottom of
+        // the float. as long as FP addition is round-to-nearest-even this
+        // just works.
+        f.f += denorm_magic.f;
+        // and one integer subtract of the bias later, we have our final float!
+        o.u = (unsigned short) ( f.u - denorm_magic.u );
+      }
+      else
+      {
+        unsigned int mant_odd = (f.u >> 13) & 1; // resulting mantissa is odd
+        // update exponent, rounding bias part 1
+        f.u = f.u + ((15u - 127) << 23) + 0xfff;
+        // rounding bias part 2
+        f.u += mant_odd;
+        // take the bits!
+        o.u = (unsigned short) ( f.u >> 13 );
+      }
+    }
+
+    o.u |= sign >> 16;
+    return o;
+  }
+
+#endif
+
+
+#if defined(STBIR_FP16C)
+
+  #include <immintrin.h>
+
+  static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input)
+  {
+    _mm256_storeu_ps( (float*)output, _mm256_cvtph_ps( _mm_loadu_si128( (__m128i const* )input ) ) );
+  }
+
+  static stbir__inline void stbir__float_to_half_SIMD(stbir__FP16 * output, float const * input)
+  {
+    _mm_storeu_si128( (__m128i*)output, _mm256_cvtps_ph( _mm256_loadu_ps( input ), 0 ) );
+  }
+
+  static stbir__inline float stbir__half_to_float( stbir__FP16 h )
+  {
+    return _mm_cvtss_f32( _mm_cvtph_ps( _mm_cvtsi32_si128( (int)h.u ) ) );
+  }
+
+  static stbir__inline stbir__FP16 stbir__float_to_half( float f )
+  {
+    stbir__FP16 h;
+    h.u = (unsigned short) _mm_cvtsi128_si32( _mm_cvtps_ph( _mm_set_ss( f ), 0 ) );
+    return h;
+  }
+
+#elif defined(STBIR_SSE2)
+
+  // Fabian's half float routines, see: https://gist.github.com/rygorous/2156668
+  stbir__inline static void stbir__half_to_float_SIMD(float * output, void const * input)
+  {
+    static const STBIR__SIMDI_CONST(mask_nosign,      0x7fff);
+    static const STBIR__SIMDI_CONST(smallest_normal,  0x0400);
+    static const STBIR__SIMDI_CONST(infinity,         0x7c00);
+    static const STBIR__SIMDI_CONST(expadjust_normal, (127 - 15) << 23);
+    static const STBIR__SIMDI_CONST(magic_denorm,     113 << 23);
+
+    __m128i i = _mm_loadu_si128 ( (__m128i const*)(input) );
+    __m128i h = _mm_unpacklo_epi16 ( i, _mm_setzero_si128() );
+    __m128i mnosign     = STBIR__CONSTI(mask_nosign);
+    __m128i eadjust     = STBIR__CONSTI(expadjust_normal);
+    __m128i smallest    = STBIR__CONSTI(smallest_normal);
+    __m128i infty       = STBIR__CONSTI(infinity);
+    __m128i expmant     = _mm_and_si128(mnosign, h);
+    __m128i justsign    = _mm_xor_si128(h, expmant);
+    __m128i b_notinfnan = _mm_cmpgt_epi32(infty, expmant);
+    __m128i b_isdenorm  = _mm_cmpgt_epi32(smallest, expmant);
+    __m128i shifted     = _mm_slli_epi32(expmant, 13);
+    __m128i adj_infnan  = _mm_andnot_si128(b_notinfnan, eadjust);
+    __m128i adjusted    = _mm_add_epi32(eadjust, shifted);
+    __m128i den1        = _mm_add_epi32(shifted, STBIR__CONSTI(magic_denorm));
+    __m128i adjusted2   = _mm_add_epi32(adjusted, adj_infnan);
+    __m128  den2        = _mm_sub_ps(_mm_castsi128_ps(den1), *(const __m128 *)&magic_denorm);
+    __m128  adjusted3   = _mm_and_ps(den2, _mm_castsi128_ps(b_isdenorm));
+    __m128  adjusted4   = _mm_andnot_ps(_mm_castsi128_ps(b_isdenorm), _mm_castsi128_ps(adjusted2));
+    __m128  adjusted5   = _mm_or_ps(adjusted3, adjusted4);
+    __m128i sign        = _mm_slli_epi32(justsign, 16);
+    __m128  final       = _mm_or_ps(adjusted5, _mm_castsi128_ps(sign));
+    stbir__simdf_store( output + 0,  final );
+
+    h = _mm_unpackhi_epi16 ( i, _mm_setzero_si128() );
+    expmant     = _mm_and_si128(mnosign, h);
+    justsign    = _mm_xor_si128(h, expmant);
+    b_notinfnan = _mm_cmpgt_epi32(infty, expmant);
+    b_isdenorm  = _mm_cmpgt_epi32(smallest, expmant);
+    shifted     = _mm_slli_epi32(expmant, 13);
+    adj_infnan  = _mm_andnot_si128(b_notinfnan, eadjust);
+    adjusted    = _mm_add_epi32(eadjust, shifted);
+    den1        = _mm_add_epi32(shifted, STBIR__CONSTI(magic_denorm));
+    adjusted2   = _mm_add_epi32(adjusted, adj_infnan);
+    den2        = _mm_sub_ps(_mm_castsi128_ps(den1), *(const __m128 *)&magic_denorm);
+    adjusted3   = _mm_and_ps(den2, _mm_castsi128_ps(b_isdenorm));
+    adjusted4   = _mm_andnot_ps(_mm_castsi128_ps(b_isdenorm), _mm_castsi128_ps(adjusted2));
+    adjusted5   = _mm_or_ps(adjusted3, adjusted4);
+    sign        = _mm_slli_epi32(justsign, 16);
+    final       = _mm_or_ps(adjusted5, _mm_castsi128_ps(sign));
+    stbir__simdf_store( output + 4,  final );
+
+    // ~38 SSE2 ops for 8 values
+  }
+
+  // Fabian's round-to-nearest-even float to half
+  // ~48 SSE2 ops for 8 output
+  stbir__inline static void stbir__float_to_half_SIMD(void * output, float const * input)
+  {
+    static const STBIR__SIMDI_CONST(mask_sign,      0x80000000u);
+    static const STBIR__SIMDI_CONST(c_f16max,       (127 + 16) << 23); // all FP32 values >=this round to +inf
+    static const STBIR__SIMDI_CONST(c_nanbit,        0x200);
+    static const STBIR__SIMDI_CONST(c_infty_as_fp16, 0x7c00);
+    static const STBIR__SIMDI_CONST(c_min_normal,    (127 - 14) << 23); // smallest FP32 that yields a normalized FP16
+    static const STBIR__SIMDI_CONST(c_subnorm_magic, ((127 - 15) + (23 - 10) + 1) << 23);
+    static const STBIR__SIMDI_CONST(c_normal_bias,    0xfff - ((127 - 15) << 23)); // adjust exponent and add mantissa rounding
+
+    __m128  f           =  _mm_loadu_ps(input);
+    __m128  msign       = _mm_castsi128_ps(STBIR__CONSTI(mask_sign));
+    __m128  justsign    = _mm_and_ps(msign, f);
+    __m128  absf        = _mm_xor_ps(f, justsign);
+    __m128i absf_int    = _mm_castps_si128(absf); // the cast is "free" (extra bypass latency, but no thruput hit)
+    __m128i f16max      = STBIR__CONSTI(c_f16max);
+    __m128  b_isnan     = _mm_cmpunord_ps(absf, absf); // is this a NaN?
+    __m128i b_isregular = _mm_cmpgt_epi32(f16max, absf_int); // (sub)normalized or special?
+    __m128i nanbit      = _mm_and_si128(_mm_castps_si128(b_isnan), STBIR__CONSTI(c_nanbit));
+    __m128i inf_or_nan  = _mm_or_si128(nanbit, STBIR__CONSTI(c_infty_as_fp16)); // output for specials
+
+    __m128i min_normal  = STBIR__CONSTI(c_min_normal);
+    __m128i b_issub     = _mm_cmpgt_epi32(min_normal, absf_int);
+
+    // "result is subnormal" path
+    __m128  subnorm1    = _mm_add_ps(absf, _mm_castsi128_ps(STBIR__CONSTI(c_subnorm_magic))); // magic value to round output mantissa
+    __m128i subnorm2    = _mm_sub_epi32(_mm_castps_si128(subnorm1), STBIR__CONSTI(c_subnorm_magic)); // subtract out bias
+
+    // "result is normal" path
+    __m128i mantoddbit  = _mm_slli_epi32(absf_int, 31 - 13); // shift bit 13 (mantissa LSB) to sign
+    __m128i mantodd     = _mm_srai_epi32(mantoddbit, 31); // -1 if FP16 mantissa odd, else 0
+
+    __m128i round1      = _mm_add_epi32(absf_int, STBIR__CONSTI(c_normal_bias));
+    __m128i round2      = _mm_sub_epi32(round1, mantodd); // if mantissa LSB odd, bias towards rounding up (RTNE)
+    __m128i normal      = _mm_srli_epi32(round2, 13); // rounded result
+
+    // combine the two non-specials
+    __m128i nonspecial  = _mm_or_si128(_mm_and_si128(subnorm2, b_issub), _mm_andnot_si128(b_issub, normal));
+
+    // merge in specials as well
+    __m128i joined      = _mm_or_si128(_mm_and_si128(nonspecial, b_isregular), _mm_andnot_si128(b_isregular, inf_or_nan));
+
+    __m128i sign_shift  = _mm_srai_epi32(_mm_castps_si128(justsign), 16);
+    __m128i final2, final= _mm_or_si128(joined, sign_shift);
+
+    f           =  _mm_loadu_ps(input+4);
+    justsign    = _mm_and_ps(msign, f);
+    absf        = _mm_xor_ps(f, justsign);
+    absf_int    = _mm_castps_si128(absf); // the cast is "free" (extra bypass latency, but no thruput hit)
+    b_isnan     = _mm_cmpunord_ps(absf, absf); // is this a NaN?
+    b_isregular = _mm_cmpgt_epi32(f16max, absf_int); // (sub)normalized or special?
+    nanbit      = _mm_and_si128(_mm_castps_si128(b_isnan), c_nanbit);
+    inf_or_nan  = _mm_or_si128(nanbit, STBIR__CONSTI(c_infty_as_fp16)); // output for specials
+
+    b_issub     = _mm_cmpgt_epi32(min_normal, absf_int);
+
+    // "result is subnormal" path
+    subnorm1    = _mm_add_ps(absf, _mm_castsi128_ps(STBIR__CONSTI(c_subnorm_magic))); // magic value to round output mantissa
+    subnorm2    = _mm_sub_epi32(_mm_castps_si128(subnorm1), STBIR__CONSTI(c_subnorm_magic)); // subtract out bias
+
+    // "result is normal" path
+    mantoddbit  = _mm_slli_epi32(absf_int, 31 - 13); // shift bit 13 (mantissa LSB) to sign
+    mantodd     = _mm_srai_epi32(mantoddbit, 31); // -1 if FP16 mantissa odd, else 0
+
+    round1      = _mm_add_epi32(absf_int, STBIR__CONSTI(c_normal_bias));
+    round2      = _mm_sub_epi32(round1, mantodd); // if mantissa LSB odd, bias towards rounding up (RTNE)
+    normal      = _mm_srli_epi32(round2, 13); // rounded result
+
+    // combine the two non-specials
+    nonspecial  = _mm_or_si128(_mm_and_si128(subnorm2, b_issub), _mm_andnot_si128(b_issub, normal));
+
+    // merge in specials as well
+    joined      = _mm_or_si128(_mm_and_si128(nonspecial, b_isregular), _mm_andnot_si128(b_isregular, inf_or_nan));
+
+    sign_shift  = _mm_srai_epi32(_mm_castps_si128(justsign), 16);
+    final2      = _mm_or_si128(joined, sign_shift);
+    final       = _mm_packs_epi32(final, final2);
+    stbir__simdi_store( output,final );
+  }
+
+#elif defined(STBIR_WASM) || (defined(STBIR_NEON) && defined(_MSC_VER) && defined(_M_ARM)) // WASM or 32-bit ARM on MSVC/clang
+
+  static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input)
+  {
+    for (int i=0; i<8; i++)
+    {
+      output[i] = stbir__half_to_float(input[i]);
+    }
+  }
+
+  static stbir__inline void stbir__float_to_half_SIMD(stbir__FP16 * output, float const * input)
+  {
+    for (int i=0; i<8; i++)
+    {
+      output[i] = stbir__float_to_half(input[i]);
+    }
+  }
+
+#elif defined(STBIR_NEON) && defined(_MSC_VER) && defined(_M_ARM64) && !defined(__clang__) // 64-bit ARM on MSVC (not clang)
+
+  static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input)
+  {
+    float16x4_t in0 = vld1_f16(input + 0);
+    float16x4_t in1 = vld1_f16(input + 4);
+    vst1q_f32(output + 0, vcvt_f32_f16(in0));
+    vst1q_f32(output + 4, vcvt_f32_f16(in1));
+  }
+
+  static stbir__inline void stbir__float_to_half_SIMD(stbir__FP16 * output, float const * input)
+  {
+    float16x4_t out0 = vcvt_f16_f32(vld1q_f32(input + 0));
+    float16x4_t out1 = vcvt_f16_f32(vld1q_f32(input + 4));
+    vst1_f16(output+0, out0);
+    vst1_f16(output+4, out1);
+  }
+
+  static stbir__inline float stbir__half_to_float( stbir__FP16 h )
+  {
+    return vgetq_lane_f32(vcvt_f32_f16(vld1_dup_f16(&h)), 0);
+  }
+
+  static stbir__inline stbir__FP16 stbir__float_to_half( float f )
+  {
+    return vget_lane_f16(vcvt_f16_f32(vdupq_n_f32(f)), 0).n16_u16[0];
+  }
+
+#elif defined(STBIR_NEON) // 64-bit ARM
+
+  static stbir__inline void stbir__half_to_float_SIMD(float * output, stbir__FP16 const * input)
+  {
+    float16x8_t in = vld1q_f16(input);
+    vst1q_f32(output + 0, vcvt_f32_f16(vget_low_f16(in)));
+    vst1q_f32(output + 4, vcvt_f32_f16(vget_high_f16(in)));
+  }
+
+  static stbir__inline void stbir__float_to_half_SIMD(stbir__FP16 * output, float const * input)
+  {
+    float16x4_t out0 = vcvt_f16_f32(vld1q_f32(input + 0));
+    float16x4_t out1 = vcvt_f16_f32(vld1q_f32(input + 4));
+    vst1q_f16(output, vcombine_f16(out0, out1));
+  }
+
+  static stbir__inline float stbir__half_to_float( stbir__FP16 h )
+  {
+    return vgetq_lane_f32(vcvt_f32_f16(vdup_n_f16(h)), 0);
+  }
+
+  static stbir__inline stbir__FP16 stbir__float_to_half( float f )
+  {
+    return vget_lane_f16(vcvt_f16_f32(vdupq_n_f32(f)), 0);
+  }
+
+#endif
+
+
+#ifdef STBIR_SIMD
+
+#define stbir__simdf_0123to3333( out, reg ) (out) = stbir__simdf_swiz( reg, 3,3,3,3 )
+#define stbir__simdf_0123to2222( out, reg ) (out) = stbir__simdf_swiz( reg, 2,2,2,2 )
+#define stbir__simdf_0123to1111( out, reg ) (out) = stbir__simdf_swiz( reg, 1,1,1,1 )
+#define stbir__simdf_0123to0000( out, reg ) (out) = stbir__simdf_swiz( reg, 0,0,0,0 )
+#define stbir__simdf_0123to0003( out, reg ) (out) = stbir__simdf_swiz( reg, 0,0,0,3 )
+#define stbir__simdf_0123to0001( out, reg ) (out) = stbir__simdf_swiz( reg, 0,0,0,1 )
+#define stbir__simdf_0123to1122( out, reg ) (out) = stbir__simdf_swiz( reg, 1,1,2,2 )
+#define stbir__simdf_0123to2333( out, reg ) (out) = stbir__simdf_swiz( reg, 2,3,3,3 )
+#define stbir__simdf_0123to0023( out, reg ) (out) = stbir__simdf_swiz( reg, 0,0,2,3 )
+#define stbir__simdf_0123to1230( out, reg ) (out) = stbir__simdf_swiz( reg, 1,2,3,0 )
+#define stbir__simdf_0123to2103( out, reg ) (out) = stbir__simdf_swiz( reg, 2,1,0,3 )
+#define stbir__simdf_0123to3210( out, reg ) (out) = stbir__simdf_swiz( reg, 3,2,1,0 )
+#define stbir__simdf_0123to2301( out, reg ) (out) = stbir__simdf_swiz( reg, 2,3,0,1 )
+#define stbir__simdf_0123to3012( out, reg ) (out) = stbir__simdf_swiz( reg, 3,0,1,2 )
+#define stbir__simdf_0123to0011( out, reg ) (out) = stbir__simdf_swiz( reg, 0,0,1,1 )
+#define stbir__simdf_0123to1100( out, reg ) (out) = stbir__simdf_swiz( reg, 1,1,0,0 )
+#define stbir__simdf_0123to2233( out, reg ) (out) = stbir__simdf_swiz( reg, 2,2,3,3 )
+#define stbir__simdf_0123to1133( out, reg ) (out) = stbir__simdf_swiz( reg, 1,1,3,3 )
+#define stbir__simdf_0123to0022( out, reg ) (out) = stbir__simdf_swiz( reg, 0,0,2,2 )
+#define stbir__simdf_0123to1032( out, reg ) (out) = stbir__simdf_swiz( reg, 1,0,3,2 )
+
+typedef union stbir__simdi_u32
+{
+  stbir_uint32 m128i_u32[4];
+  int m128i_i32[4];
+  stbir__simdi m128i_i128;
+} stbir__simdi_u32;
+
+static const int STBIR_mask[9] = { 0,0,0,-1,-1,-1,0,0,0 };
+
+static const STBIR__SIMDF_CONST(STBIR_max_uint8_as_float,           stbir__max_uint8_as_float);
+static const STBIR__SIMDF_CONST(STBIR_max_uint16_as_float,          stbir__max_uint16_as_float);
+static const STBIR__SIMDF_CONST(STBIR_max_uint8_as_float_inverted,  stbir__max_uint8_as_float_inverted);
+static const STBIR__SIMDF_CONST(STBIR_max_uint16_as_float_inverted, stbir__max_uint16_as_float_inverted);
+
+static const STBIR__SIMDF_CONST(STBIR_simd_point5,   0.5f);
+static const STBIR__SIMDF_CONST(STBIR_ones,          1.0f);
+static const STBIR__SIMDI_CONST(STBIR_almost_zero,   (127 - 13) << 23);
+static const STBIR__SIMDI_CONST(STBIR_almost_one,    0x3f7fffff);
+static const STBIR__SIMDI_CONST(STBIR_mastissa_mask, 0xff);
+static const STBIR__SIMDI_CONST(STBIR_topscale,      0x02000000);
+
+//   Basically, in simd mode, we unroll the proper amount, and we don't want
+//   the non-simd remnant loops to be unroll because they only run a few times
+//   Adding this switch saves about 5K on clang which is Captain Unroll the 3rd.
+#define STBIR_SIMD_STREAMOUT_PTR( star )  STBIR_STREAMOUT_PTR( star )
+#define STBIR_SIMD_NO_UNROLL(ptr) STBIR_NO_UNROLL(ptr)
+
+#ifdef STBIR_MEMCPY
+#undef STBIR_MEMCPY
+#endif
+#define STBIR_MEMCPY stbir_simd_memcpy
+
+// override normal use of memcpy with much simpler copy (faster and smaller with our sized copies)
+static void stbir_simd_memcpy( void * dest, void const * src, size_t bytes )
+{
+  char STBIR_SIMD_STREAMOUT_PTR (*) d = (char*) dest;
+  char STBIR_SIMD_STREAMOUT_PTR( * ) d_end = ((char*) dest) + bytes;
+  ptrdiff_t ofs_to_src = (char*)src - (char*)dest;
+
+  // check overlaps
+  STBIR_ASSERT( ( ( d >= ( (char*)src) + bytes ) ) || ( ( d + bytes ) <= (char*)src ) );
+
+  if ( bytes < (16*stbir__simdfX_float_count) )
+  {
+    if ( bytes < 16 )
+    {
+      if ( bytes )
+      {
+        do
+        {
+          STBIR_SIMD_NO_UNROLL(d);
+          d[ 0 ] = d[ ofs_to_src ];
+          ++d;
+        } while ( d < d_end );
+      }
+    }
+    else
+    {
+      stbir__simdf x;
+      // do one unaligned to get us aligned for the stream out below
+      stbir__simdf_load( x, ( d + ofs_to_src ) );
+      stbir__simdf_store( d, x );
+      d = (char*)( ( ( (size_t)d ) + 16 ) & ~15 );
+
+      for(;;)
+      {
+        STBIR_SIMD_NO_UNROLL(d);
+
+        if ( d > ( d_end - 16 ) )
+        {
+          if ( d == d_end )
+            return;
+          d = d_end - 16;
+        }
+
+        stbir__simdf_load( x, ( d + ofs_to_src ) );
+        stbir__simdf_store( d, x );
+        d += 16;
+      }
+    }
+  }
+  else
+  {
+    stbir__simdfX x0,x1,x2,x3;
+
+    // do one unaligned to get us aligned for the stream out below
+    stbir__simdfX_load( x0, ( d + ofs_to_src ) +  0*stbir__simdfX_float_count );
+    stbir__simdfX_load( x1, ( d + ofs_to_src ) +  4*stbir__simdfX_float_count );
+    stbir__simdfX_load( x2, ( d + ofs_to_src ) +  8*stbir__simdfX_float_count );
+    stbir__simdfX_load( x3, ( d + ofs_to_src ) + 12*stbir__simdfX_float_count );
+    stbir__simdfX_store( d +  0*stbir__simdfX_float_count, x0 );
+    stbir__simdfX_store( d +  4*stbir__simdfX_float_count, x1 );
+    stbir__simdfX_store( d +  8*stbir__simdfX_float_count, x2 );
+    stbir__simdfX_store( d + 12*stbir__simdfX_float_count, x3 );
+    d = (char*)( ( ( (size_t)d ) + (16*stbir__simdfX_float_count) ) & ~((16*stbir__simdfX_float_count)-1) );
+
+    for(;;)
+    {
+      STBIR_SIMD_NO_UNROLL(d);
+
+      if ( d > ( d_end - (16*stbir__simdfX_float_count) ) )
+      {
+        if ( d == d_end )
+          return;
+        d = d_end - (16*stbir__simdfX_float_count);
+      }
+
+      stbir__simdfX_load( x0, ( d + ofs_to_src ) +  0*stbir__simdfX_float_count );
+      stbir__simdfX_load( x1, ( d + ofs_to_src ) +  4*stbir__simdfX_float_count );
+      stbir__simdfX_load( x2, ( d + ofs_to_src ) +  8*stbir__simdfX_float_count );
+      stbir__simdfX_load( x3, ( d + ofs_to_src ) + 12*stbir__simdfX_float_count );
+      stbir__simdfX_store( d +  0*stbir__simdfX_float_count, x0 );
+      stbir__simdfX_store( d +  4*stbir__simdfX_float_count, x1 );
+      stbir__simdfX_store( d +  8*stbir__simdfX_float_count, x2 );
+      stbir__simdfX_store( d + 12*stbir__simdfX_float_count, x3 );
+      d += (16*stbir__simdfX_float_count);
+    }
+  }
+}
+
+// memcpy that is specically intentionally overlapping (src is smaller then dest, so can be
+//   a normal forward copy, bytes is divisible by 4 and bytes is greater than or equal to
+//   the diff between dest and src)
+static void stbir_overlapping_memcpy( void * dest, void const * src, size_t bytes )
+{
+  char STBIR_SIMD_STREAMOUT_PTR (*) sd = (char*) src;
+  char STBIR_SIMD_STREAMOUT_PTR( * ) s_end = ((char*) src) + bytes;
+  ptrdiff_t ofs_to_dest = (char*)dest - (char*)src;
+
+  if ( ofs_to_dest >= 16 ) // is the overlap more than 16 away?
+  {
+    char STBIR_SIMD_STREAMOUT_PTR( * ) s_end16 = ((char*) src) + (bytes&~15);
+    do
+    {
+      stbir__simdf x;
+      STBIR_SIMD_NO_UNROLL(sd);
+      stbir__simdf_load( x, sd );
+      stbir__simdf_store(  ( sd + ofs_to_dest ), x );
+      sd += 16;
+    } while ( sd < s_end16 );
+
+    if ( sd == s_end )
+      return;
+  }
+
+  do
+  {
+    STBIR_SIMD_NO_UNROLL(sd);
+    *(int*)( sd + ofs_to_dest ) = *(int*) sd;
+    sd += 4;
+  } while ( sd < s_end );
+}
+
+#else // no SSE2
+
+// when in scalar mode, we let unrolling happen, so this macro just does the __restrict
+#define STBIR_SIMD_STREAMOUT_PTR( star ) STBIR_STREAMOUT_PTR( star )
+#define STBIR_SIMD_NO_UNROLL(ptr)
+
+#endif // SSE2
+
+
+#ifdef STBIR_PROFILE
+
+#if defined(_x86_64) || defined( __x86_64__ ) || defined( _M_X64 ) || defined(__x86_64) || defined(__SSE2__) || defined(STBIR_SSE) || defined( _M_IX86_FP ) || defined(__i386) || defined( __i386__ ) || defined( _M_IX86 ) || defined( _X86_ )
+
+#ifdef _MSC_VER
+
+  STBIRDEF stbir_uint64 __rdtsc();
+  #define STBIR_PROFILE_FUNC() __rdtsc()
+
+#else // non msvc
+
+  static stbir__inline stbir_uint64 STBIR_PROFILE_FUNC()
+  {
+    stbir_uint32 lo, hi;
+    asm volatile ("rdtsc" : "=a" (lo), "=d" (hi) );
+    return ( ( (stbir_uint64) hi ) << 32 ) | ( (stbir_uint64) lo );
+  }
+
+#endif  // msvc
+
+#elif defined( _M_ARM64 ) || defined( __aarch64__ ) || defined( __arm64__ ) || defined(__ARM_NEON__)
+
+#if defined( _MSC_VER ) && !defined(__clang__)
+
+  #define STBIR_PROFILE_FUNC() _ReadStatusReg(ARM64_CNTVCT)
+
+#else
+
+  static stbir__inline stbir_uint64 STBIR_PROFILE_FUNC()
+  {
+    stbir_uint64 tsc;
+    asm volatile("mrs %0, cntvct_el0" : "=r" (tsc));
+    return tsc;
+  }
+
+#endif
+
+#else // x64, arm
+
+#error Unknown platform for profiling.
+
+#endif  //x64 and
+
+
+#define STBIR_ONLY_PROFILE_GET_SPLIT_INFO ,stbir__per_split_info * split_info
+#define STBIR_ONLY_PROFILE_SET_SPLIT_INFO ,split_info
+
+#define STBIR_ONLY_PROFILE_BUILD_GET_INFO ,stbir__info * profile_info
+#define STBIR_ONLY_PROFILE_BUILD_SET_INFO ,profile_info
+
+// super light-weight micro profiler
+#define STBIR_PROFILE_START_ll( info, wh ) { stbir_uint64 wh##thiszonetime = STBIR_PROFILE_FUNC(); stbir_uint64 * wh##save_parent_excluded_ptr = info->current_zone_excluded_ptr; stbir_uint64 wh##current_zone_excluded = 0; info->current_zone_excluded_ptr = &wh##current_zone_excluded;
+#define STBIR_PROFILE_END_ll( info, wh ) wh##thiszonetime = STBIR_PROFILE_FUNC() - wh##thiszonetime; info->profile.named.wh += wh##thiszonetime - wh##current_zone_excluded; *wh##save_parent_excluded_ptr += wh##thiszonetime; info->current_zone_excluded_ptr = wh##save_parent_excluded_ptr; }
+#define STBIR_PROFILE_FIRST_START_ll( info, wh ) { int i; info->current_zone_excluded_ptr = &info->profile.named.total; for(i=0;i<STBIR__ARRAY_SIZE(info->profile.array);i++) info->profile.array[i]=0; } STBIR_PROFILE_START_ll( info, wh );
+#define STBIR_PROFILE_CLEAR_EXTRAS_ll( info, num ) { int extra; for(extra=1;extra<(num);extra++) { int i; for(i=0;i<STBIR__ARRAY_SIZE((info)->profile.array);i++) (info)[extra].profile.array[i]=0; } }
+
+// for thread data
+#define STBIR_PROFILE_START( wh ) STBIR_PROFILE_START_ll( split_info, wh )
+#define STBIR_PROFILE_END( wh ) STBIR_PROFILE_END_ll( split_info, wh )
+#define STBIR_PROFILE_FIRST_START( wh ) STBIR_PROFILE_FIRST_START_ll( split_info, wh )
+#define STBIR_PROFILE_CLEAR_EXTRAS() STBIR_PROFILE_CLEAR_EXTRAS_ll( split_info, split_count )
+
+// for build data
+#define STBIR_PROFILE_BUILD_START( wh ) STBIR_PROFILE_START_ll( profile_info, wh )
+#define STBIR_PROFILE_BUILD_END( wh ) STBIR_PROFILE_END_ll( profile_info, wh )
+#define STBIR_PROFILE_BUILD_FIRST_START( wh ) STBIR_PROFILE_FIRST_START_ll( profile_info, wh )
+#define STBIR_PROFILE_BUILD_CLEAR( info ) { int i; for(i=0;i<STBIR__ARRAY_SIZE(info->profile.array);i++) info->profile.array[i]=0; }
+
+#else  // no profile
+
+#define STBIR_ONLY_PROFILE_GET_SPLIT_INFO
+#define STBIR_ONLY_PROFILE_SET_SPLIT_INFO
+
+#define STBIR_ONLY_PROFILE_BUILD_GET_INFO
+#define STBIR_ONLY_PROFILE_BUILD_SET_INFO
+
+#define STBIR_PROFILE_START( wh )
+#define STBIR_PROFILE_END( wh )
+#define STBIR_PROFILE_FIRST_START( wh )
+#define STBIR_PROFILE_CLEAR_EXTRAS( )
+
+#define STBIR_PROFILE_BUILD_START( wh )
+#define STBIR_PROFILE_BUILD_END( wh )
+#define STBIR_PROFILE_BUILD_FIRST_START( wh )
+#define STBIR_PROFILE_BUILD_CLEAR( info )
+
+#endif  // stbir_profile
+
+#ifndef STBIR_CEILF
+#include <math.h>
+#if _MSC_VER <= 1200 // support VC6 for Sean
+#define STBIR_CEILF(x) ((float)ceil((float)(x)))
+#define STBIR_FLOORF(x) ((float)floor((float)(x)))
+#else
+#define STBIR_CEILF(x) ceilf(x)
+#define STBIR_FLOORF(x) floorf(x)
+#endif
+#endif
+
+#ifndef STBIR_MEMCPY
+// For memcpy
+#include <string.h>
+#define STBIR_MEMCPY( dest, src, len ) memcpy( dest, src, len )
+#endif
+
+#ifndef STBIR_SIMD
+
+// memcpy that is specically intentionally overlapping (src is smaller then dest, so can be
+//   a normal forward copy, bytes is divisible by 4 and bytes is greater than or equal to
+//   the diff between dest and src)
+static void stbir_overlapping_memcpy( void * dest, void const * src, size_t bytes )
+{
+  char STBIR_SIMD_STREAMOUT_PTR (*) sd = (char*) src;
+  char STBIR_SIMD_STREAMOUT_PTR( * ) s_end = ((char*) src) + bytes;
+  ptrdiff_t ofs_to_dest = (char*)dest - (char*)src;
+
+  if ( ofs_to_dest >= 8 ) // is the overlap more than 8 away?
+  {
+    char STBIR_SIMD_STREAMOUT_PTR( * ) s_end8 = ((char*) src) + (bytes&~7);
+    do
+    {
+      STBIR_NO_UNROLL(sd);
+      *(stbir_uint64*)( sd + ofs_to_dest ) = *(stbir_uint64*) sd;
+      sd += 8;
+    } while ( sd < s_end8 );
+
+    if ( sd == s_end )
+      return;
+  }
+
+  do
+  {
+    STBIR_NO_UNROLL(sd);
+    *(int*)( sd + ofs_to_dest ) = *(int*) sd;
+    sd += 4;
+  } while ( sd < s_end );
+}
+
+#endif
+
+static float stbir__filter_trapezoid(float x, float scale, void * user_data)
+{
+  float halfscale = scale / 2;
+  float t = 0.5f + halfscale;
+  STBIR_ASSERT(scale <= 1);
+  STBIR__UNUSED(user_data);
+
+  if ( x < 0.0f ) x = -x;
+
+  if (x >= t)
+    return 0.0f;
+  else
+  {
+    float r = 0.5f - halfscale;
+    if (x <= r)
+      return 1.0f;
+    else
+      return (t - x) / scale;
+  }
+}
+
+static float stbir__support_trapezoid(float scale, void * user_data)
+{
+  STBIR__UNUSED(user_data);
+  return 0.5f + scale / 2.0f;
+}
+
+static float stbir__filter_triangle(float x, float s, void * user_data)
+{
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+
+  if ( x < 0.0f ) x = -x;
+
+  if (x <= 1.0f)
+    return 1.0f - x;
+  else
+    return 0.0f;
+}
+
+static float stbir__filter_point(float x, float s, void * user_data)
+{
+  STBIR__UNUSED(x);
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+
+  return 1.0f;
+}
+
+static float stbir__filter_cubic(float x, float s, void * user_data)
+{
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+
+  if ( x < 0.0f ) x = -x;
+
+  if (x < 1.0f)
+    return (4.0f + x*x*(3.0f*x - 6.0f))/6.0f;
+  else if (x < 2.0f)
+    return (8.0f + x*(-12.0f + x*(6.0f - x)))/6.0f;
+
+  return (0.0f);
+}
+
+static float stbir__filter_catmullrom(float x, float s, void * user_data)
+{
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+
+  if ( x < 0.0f ) x = -x;
+
+  if (x < 1.0f)
+    return 1.0f - x*x*(2.5f - 1.5f*x);
+  else if (x < 2.0f)
+    return 2.0f - x*(4.0f + x*(0.5f*x - 2.5f));
+
+  return (0.0f);
+}
+
+static float stbir__filter_mitchell(float x, float s, void * user_data)
+{
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+
+  if ( x < 0.0f ) x = -x;
+
+  if (x < 1.0f)
+    return (16.0f + x*x*(21.0f * x - 36.0f))/18.0f;
+  else if (x < 2.0f)
+    return (32.0f + x*(-60.0f + x*(36.0f - 7.0f*x)))/18.0f;
+
+  return (0.0f);
+}
+
+static float stbir__support_zero(float s, void * user_data)
+{
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+  return 0;
+}
+
+static float stbir__support_zeropoint5(float s, void * user_data)
+{
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+  return 0.5f;
+}
+
+static float stbir__support_one(float s, void * user_data)
+{
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+  return 1;
+}
+
+static float stbir__support_two(float s, void * user_data)
+{
+  STBIR__UNUSED(s);
+  STBIR__UNUSED(user_data);
+  return 2;
+}
+
+// This is the maximum number of input samples that can affect an output sample
+// with the given filter from the output pixel's perspective
+static int stbir__get_filter_pixel_width(stbir__support_callback * support, float scale, void * user_data)
+{
+  STBIR_ASSERT(support != 0);
+
+  if ( scale >= ( 1.0f-stbir__small_float ) ) // upscale
+    return (int)STBIR_CEILF(support(1.0f/scale,user_data) * 2.0f);
+  else
+    return (int)STBIR_CEILF(support(scale,user_data) * 2.0f / scale);
+}
+
+// this is how many coefficents per run of the filter (which is different
+//   from the filter_pixel_width depending on if we are scattering or gathering)
+static int stbir__get_coefficient_width(stbir__sampler * samp, int is_gather, void * user_data)
+{
+  float scale = samp->scale_info.scale;
+  stbir__support_callback * support = samp->filter_support;
+
+  switch( is_gather )
+  {
+    case 1:
+      return (int)STBIR_CEILF(support(1.0f / scale, user_data) * 2.0f);
+    case 2:
+      return (int)STBIR_CEILF(support(scale, user_data) * 2.0f / scale);
+    case 0:
+      return (int)STBIR_CEILF(support(scale, user_data) * 2.0f);
+    default:
+      STBIR_ASSERT( (is_gather >= 0 ) && (is_gather <= 2 ) );
+      return 0;
+  }
+}
+
+static int stbir__get_contributors(stbir__sampler * samp, int is_gather)
+{
+  if (is_gather)
+      return samp->scale_info.output_sub_size;
+  else
+      return (samp->scale_info.input_full_size + samp->filter_pixel_margin * 2);
+}
+
+static int stbir__edge_zero_full( int n, int max )
+{
+  STBIR__UNUSED(n);
+  STBIR__UNUSED(max);
+  return 0; // NOTREACHED
+}
+
+static int stbir__edge_clamp_full( int n, int max )
+{
+  if (n < 0)
+    return 0;
+
+  if (n >= max)
+    return max - 1;
+
+  return n; // NOTREACHED
+}
+
+static int stbir__edge_reflect_full( int n, int max )
+{
+  if (n < 0)
+  {
+    if (n > -max)
+      return -n;
+    else
+      return max - 1;
+  }
+
+  if (n >= max)
+  {
+    int max2 = max * 2;
+    if (n >= max2)
+      return 0;
+    else
+      return max2 - n - 1;
+  }
+
+  return n; // NOTREACHED
+}
+
+static int stbir__edge_wrap_full( int n, int max )
+{
+  if (n >= 0)
+    return (n % max);
+  else
+  {
+    int m = (-n) % max;
+
+    if (m != 0)
+      m = max - m;
+
+    return (m);
+  }
+}
+
+typedef int stbir__edge_wrap_func( int n, int max );
+static stbir__edge_wrap_func * stbir__edge_wrap_slow[] =
+{
+  stbir__edge_clamp_full,    // STBIR_EDGE_CLAMP
+  stbir__edge_reflect_full,  // STBIR_EDGE_REFLECT
+  stbir__edge_wrap_full,     // STBIR_EDGE_WRAP
+  stbir__edge_zero_full,     // STBIR_EDGE_ZERO
+};
+
+stbir__inline static int stbir__edge_wrap(stbir_edge edge, int n, int max)
+{
+  // avoid per-pixel switch
+  if (n >= 0 && n < max)
+      return n;
+  return stbir__edge_wrap_slow[edge]( n, max );
+}
+
+#define STBIR__MERGE_RUNS_PIXEL_THRESHOLD 16
+
+// get information on the extents of a sampler
+static void stbir__get_extents( stbir__sampler * samp, stbir__extents * scanline_extents )
+{
+  int j, stop;
+  int left_margin, right_margin;
+  int min_n = 0x7fffffff, max_n = -0x7fffffff;
+  int min_left = 0x7fffffff, max_left = -0x7fffffff;
+  int min_right = 0x7fffffff, max_right = -0x7fffffff;
+  stbir_edge edge = samp->edge;
+  stbir__contributors* contributors = samp->contributors;
+  int output_sub_size = samp->scale_info.output_sub_size;
+  int input_full_size = samp->scale_info.input_full_size;
+  int filter_pixel_margin = samp->filter_pixel_margin;
+
+  STBIR_ASSERT( samp->is_gather );
+
+  stop = output_sub_size;
+  for (j = 0; j < stop; j++ )
+  {
+    STBIR_ASSERT( contributors[j].n1 >= contributors[j].n0 );
+    if ( contributors[j].n0 < min_n )
+    {
+      min_n = contributors[j].n0;
+      stop = j + filter_pixel_margin;  // if we find a new min, only scan another filter width
+      if ( stop > output_sub_size ) stop = output_sub_size;
+    }
+  }
+
+  stop = 0;
+  for (j = output_sub_size - 1; j >= stop; j-- )
+  {
+    STBIR_ASSERT( contributors[j].n1 >= contributors[j].n0 );
+    if ( contributors[j].n1 > max_n )
+    {
+      max_n = contributors[j].n1;
+      stop = j - filter_pixel_margin;  // if we find a new max, only scan another filter width
+      if (stop<0) stop = 0;
+    }
+  }
+
+  STBIR_ASSERT( scanline_extents->conservative.n0 <= min_n );
+  STBIR_ASSERT( scanline_extents->conservative.n1 >= max_n );
+
+  // now calculate how much into the margins we really read
+  left_margin = 0;
+  if ( min_n < 0 )
+  {
+    left_margin = -min_n;
+    min_n = 0;
+  }
+
+  right_margin = 0;
+  if ( max_n >= input_full_size )
+  {
+    right_margin = max_n - input_full_size + 1;
+    max_n = input_full_size - 1;
+  }
+
+  // index 1 is margin pixel extents (how many pixels we hang over the edge)
+  scanline_extents->edge_sizes[0] = left_margin;
+  scanline_extents->edge_sizes[1] = right_margin;
+
+  // index 2 is pixels read from the input
+  scanline_extents->spans[0].n0 = min_n;
+  scanline_extents->spans[0].n1 = max_n;
+  scanline_extents->spans[0].pixel_offset_for_input = min_n;
+
+  // default to no other input range
+  scanline_extents->spans[1].n0 = 0;
+  scanline_extents->spans[1].n1 = -1;
+  scanline_extents->spans[1].pixel_offset_for_input = 0;
+
+  // don't have to do edge calc for zero clamp
+  if ( edge == STBIR_EDGE_ZERO )
+    return;
+
+  // convert margin pixels to the pixels within the input (min and max)
+  for( j = -left_margin ; j < 0 ; j++ )
+  {
+      int p = stbir__edge_wrap( edge, j, input_full_size );
+      if ( p < min_left )
+        min_left = p;
+      if ( p > max_left )
+        max_left = p;
+  }
+
+  for( j = input_full_size ; j < (input_full_size + right_margin) ; j++ )
+  {
+      int p = stbir__edge_wrap( edge, j, input_full_size );
+      if ( p < min_right )
+        min_right = p;
+      if ( p > max_right )
+        max_right = p;
+  }
+
+  // merge the left margin pixel region if it connects within 4 pixels of main pixel region
+  if ( min_left != 0x7fffffff )
+  {
+    if ( ( ( min_left <= min_n ) && ( ( max_left  + STBIR__MERGE_RUNS_PIXEL_THRESHOLD ) >= min_n ) ) ||
+         ( ( min_n <= min_left ) && ( ( max_n  + STBIR__MERGE_RUNS_PIXEL_THRESHOLD ) >= max_left ) ) )
+    {
+      scanline_extents->spans[0].n0 = min_n = stbir__min( min_n, min_left );
+      scanline_extents->spans[0].n1 = max_n = stbir__max( max_n, max_left );
+      scanline_extents->spans[0].pixel_offset_for_input = min_n;
+      left_margin = 0;
+    }
+  }
+
+  // merge the right margin pixel region if it connects within 4 pixels of main pixel region
+  if ( min_right != 0x7fffffff )
+  {
+    if ( ( ( min_right <= min_n ) && ( ( max_right  + STBIR__MERGE_RUNS_PIXEL_THRESHOLD ) >= min_n ) ) ||
+         ( ( min_n <= min_right ) && ( ( max_n  + STBIR__MERGE_RUNS_PIXEL_THRESHOLD ) >= max_right ) ) )
+    {
+      scanline_extents->spans[0].n0 = min_n = stbir__min( min_n, min_right );
+      scanline_extents->spans[0].n1 = max_n = stbir__max( max_n, max_right );
+      scanline_extents->spans[0].pixel_offset_for_input = min_n;
+      right_margin = 0;
+    }
+  }
+
+  STBIR_ASSERT( scanline_extents->conservative.n0 <= min_n );
+  STBIR_ASSERT( scanline_extents->conservative.n1 >= max_n );
+
+  // you get two ranges when you have the WRAP edge mode and you are doing just the a piece of the resize
+  //   so you need to get a second run of pixels from the opposite side of the scanline (which you
+  //   wouldn't need except for WRAP)
+
+
+  // if we can't merge the min_left range, add it as a second range
+  if ( ( left_margin ) && ( min_left != 0x7fffffff ) )
+  {
+    stbir__span * newspan = scanline_extents->spans + 1;
+    STBIR_ASSERT( right_margin == 0 );
+    if ( min_left < scanline_extents->spans[0].n0 )
+    {
+      scanline_extents->spans[1].pixel_offset_for_input = scanline_extents->spans[0].n0;
+      scanline_extents->spans[1].n0 = scanline_extents->spans[0].n0;
+      scanline_extents->spans[1].n1 = scanline_extents->spans[0].n1;
+      --newspan;
+    }
+    newspan->pixel_offset_for_input = min_left;
+    newspan->n0 = -left_margin;
+    newspan->n1 = ( max_left - min_left ) - left_margin;
+    scanline_extents->edge_sizes[0] = 0;  // don't need to copy the left margin, since we are directly decoding into the margin
+    return;
+  }
+
+  // if we can't merge the min_left range, add it as a second range
+  if ( ( right_margin ) && ( min_right != 0x7fffffff ) )
+  {
+    stbir__span * newspan = scanline_extents->spans + 1;
+    if ( min_right < scanline_extents->spans[0].n0 )
+    {
+      scanline_extents->spans[1].pixel_offset_for_input = scanline_extents->spans[0].n0;
+      scanline_extents->spans[1].n0 = scanline_extents->spans[0].n0;
+      scanline_extents->spans[1].n1 = scanline_extents->spans[0].n1;
+      --newspan;
+    }
+    newspan->pixel_offset_for_input = min_right;
+    newspan->n0 = scanline_extents->spans[1].n1 + 1;
+    newspan->n1 = scanline_extents->spans[1].n1 + 1 + ( max_right - min_right );
+    scanline_extents->edge_sizes[1] = 0;  // don't need to copy the right margin, since we are directly decoding into the margin
+    return;
+  }
+}
+
+static void stbir__calculate_in_pixel_range( int * first_pixel, int * last_pixel, float out_pixel_center, float out_filter_radius, float inv_scale, float out_shift, int input_size, stbir_edge edge )
+{
+  int first, last;
+  float out_pixel_influence_lowerbound = out_pixel_center - out_filter_radius;
+  float out_pixel_influence_upperbound = out_pixel_center + out_filter_radius;
+
+  float in_pixel_influence_lowerbound = (out_pixel_influence_lowerbound + out_shift) * inv_scale;
+  float in_pixel_influence_upperbound = (out_pixel_influence_upperbound + out_shift) * inv_scale;
+
+  first = (int)(STBIR_FLOORF(in_pixel_influence_lowerbound + 0.5f));
+  last = (int)(STBIR_FLOORF(in_pixel_influence_upperbound - 0.5f));
+
+  if ( edge == STBIR_EDGE_WRAP )
+  {
+    if ( first < -input_size )
+      first = -input_size;
+    if ( last >= (input_size*2))
+      last = (input_size*2) - 1;
+  }
+
+  *first_pixel = first;
+  *last_pixel = last;
+}
+
+static void stbir__calculate_coefficients_for_gather_upsample( float out_filter_radius, stbir__kernel_callback * kernel, stbir__scale_info * scale_info, int num_contributors, stbir__contributors* contributors, float* coefficient_group, int coefficient_width, stbir_edge edge, void * user_data )
+{
+  int n, end;
+  float inv_scale = scale_info->inv_scale;
+  float out_shift = scale_info->pixel_shift;
+  int input_size  = scale_info->input_full_size;
+  int numerator = scale_info->scale_numerator;
+  int polyphase = ( ( scale_info->scale_is_rational ) && ( numerator < num_contributors ) );
+
+  // Looping through out pixels
+  end = num_contributors; if ( polyphase ) end = numerator;
+  for (n = 0; n < end; n++)
+  {
+    int i;
+    int last_non_zero;
+    float out_pixel_center = (float)n + 0.5f;
+    float in_center_of_out = (out_pixel_center + out_shift) * inv_scale;
+
+    int in_first_pixel, in_last_pixel;
+
+    stbir__calculate_in_pixel_range( &in_first_pixel, &in_last_pixel, out_pixel_center, out_filter_radius, inv_scale, out_shift, input_size, edge );
+
+    last_non_zero = -1;
+    for (i = 0; i <= in_last_pixel - in_first_pixel; i++)
+    {
+      float in_pixel_center = (float)(i + in_first_pixel) + 0.5f;
+      float coeff = kernel(in_center_of_out - in_pixel_center, inv_scale, user_data);
+
+      // kill denormals
+      if ( ( ( coeff < stbir__small_float ) && ( coeff > -stbir__small_float ) ) )
+      {
+        if ( i == 0 )  // if we're at the front, just eat zero contributors
+        {
+          STBIR_ASSERT ( ( in_last_pixel - in_first_pixel ) != 0 ); // there should be at least one contrib
+          ++in_first_pixel;
+          i--;
+          continue;
+        }
+        coeff = 0;  // make sure is fully zero (should keep denormals away)
+      }
+      else
+        last_non_zero = i;
+
+      coefficient_group[i] = coeff;
+    }
+
+    in_last_pixel = last_non_zero+in_first_pixel; // kills trailing zeros
+    contributors->n0 = in_first_pixel;
+    contributors->n1 = in_last_pixel;
+
+    STBIR_ASSERT(contributors->n1 >= contributors->n0);
+
+    ++contributors;
+    coefficient_group += coefficient_width;
+  }
+}
+
+static void stbir__insert_coeff( stbir__contributors * contribs, float * coeffs, int new_pixel, float new_coeff )
+{
+  if ( new_pixel <= contribs->n1 )  // before the end
+  {
+    if ( new_pixel < contribs->n0 ) // before the front?
+    {
+      int j, o = contribs->n0 - new_pixel;
+      for ( j = contribs->n1 - contribs->n0 ; j <= 0 ; j-- )
+        coeffs[ j + o ] = coeffs[ j ];
+      for ( j = 1 ; j < o ; j-- )
+        coeffs[ j ] = coeffs[ 0 ];
+      coeffs[ 0 ] = new_coeff;
+      contribs->n0 = new_pixel;
+    }
+    else
+    {
+      coeffs[ new_pixel - contribs->n0 ] += new_coeff;
+    }
+  }
+  else
+  {
+    int j, e = new_pixel - contribs->n0;
+    for( j = ( contribs->n1 - contribs->n0 ) + 1 ; j < e ; j++ ) // clear in-betweens coeffs if there are any
+      coeffs[j] = 0;
+
+    coeffs[ e ] = new_coeff;
+    contribs->n1 = new_pixel;
+  }
+}
+
+static void stbir__calculate_out_pixel_range( int * first_pixel, int * last_pixel, float in_pixel_center, float in_pixels_radius, float scale, float out_shift, int out_size )
+{
+  float in_pixel_influence_lowerbound = in_pixel_center - in_pixels_radius;
+  float in_pixel_influence_upperbound = in_pixel_center + in_pixels_radius;
+  float out_pixel_influence_lowerbound = in_pixel_influence_lowerbound * scale - out_shift;
+  float out_pixel_influence_upperbound = in_pixel_influence_upperbound * scale - out_shift;
+  int out_first_pixel = (int)(STBIR_FLOORF(out_pixel_influence_lowerbound + 0.5f));
+  int out_last_pixel = (int)(STBIR_FLOORF(out_pixel_influence_upperbound - 0.5f));
+
+  if ( out_first_pixel < 0 )
+    out_first_pixel = 0;
+  if ( out_last_pixel >= out_size )
+    out_last_pixel = out_size - 1;
+  *first_pixel = out_first_pixel;
+  *last_pixel = out_last_pixel;
+}
+
+static void stbir__calculate_coefficients_for_gather_downsample( int start, int end, float in_pixels_radius, stbir__kernel_callback * kernel, stbir__scale_info * scale_info, int coefficient_width, int num_contributors, stbir__contributors * contributors, float * coefficient_group, void * user_data )
+{
+  int in_pixel;
+  int i;
+  int first_out_inited = -1;
+  float scale = scale_info->scale;
+  float out_shift = scale_info->pixel_shift;
+  int out_size = scale_info->output_sub_size;
+  int numerator = scale_info->scale_numerator;
+  int polyphase = ( ( scale_info->scale_is_rational ) && ( numerator < out_size ) );
+
+  STBIR__UNUSED(num_contributors);
+
+  // Loop through the input pixels
+  for (in_pixel = start; in_pixel < end; in_pixel++)
+  {
+    float in_pixel_center = (float)in_pixel + 0.5f;
+    float out_center_of_in = in_pixel_center * scale - out_shift;
+    int out_first_pixel, out_last_pixel;
+
+    stbir__calculate_out_pixel_range( &out_first_pixel, &out_last_pixel, in_pixel_center, in_pixels_radius, scale, out_shift, out_size );
+
+    if ( out_first_pixel > out_last_pixel )
+      continue;
+
+    // clamp or exit if we are using polyphase filtering, and the limit is up
+    if ( polyphase )
+    {
+      // when polyphase, you only have to do coeffs up to the numerator count
+      if ( out_first_pixel == numerator )
+        break;
+
+      // don't do any extra work, clamp last pixel at numerator too
+      if ( out_last_pixel >= numerator )
+        out_last_pixel = numerator - 1;
+    }
+
+    for (i = 0; i <= out_last_pixel - out_first_pixel; i++)
+    {
+      float out_pixel_center = (float)(i + out_first_pixel) + 0.5f;
+      float x = out_pixel_center - out_center_of_in;
+      float coeff = kernel(x, scale, user_data) * scale;
+
+      // kill the coeff if it's too small (avoid denormals)
+      if ( ( ( coeff < stbir__small_float ) && ( coeff > -stbir__small_float ) ) )
+        coeff = 0.0f;
+
+      {
+        int out = i + out_first_pixel;
+        float * coeffs = coefficient_group + out * coefficient_width;
+        stbir__contributors * contribs = contributors + out;
+
+        // is this the first time this output pixel has been seen?  Init it.
+        if ( out > first_out_inited )
+        {
+          STBIR_ASSERT( out == ( first_out_inited + 1 ) ); // ensure we have only advanced one at time
+          first_out_inited = out;
+          contribs->n0 = in_pixel;
+          contribs->n1 = in_pixel;
+          coeffs[0]  = coeff;
+        }
+        else
+        {
+          // insert on end (always in order)
+          if ( coeffs[0] == 0.0f )  // if the first coefficent is zero, then zap it for this coeffs
+          {
+            STBIR_ASSERT( ( in_pixel - contribs->n0 ) == 1 ); // ensure that when we zap, we're at the 2nd pos
+            contribs->n0 = in_pixel;
+          }
+          contribs->n1 = in_pixel;
+          STBIR_ASSERT( ( in_pixel - contribs->n0 ) < coefficient_width );
+          coeffs[in_pixel - contribs->n0]  = coeff;
+        }
+      }
+    }
+  }
+}
+
+#ifdef STBIR_RENORMALIZE_IN_FLOAT
+#define STBIR_RENORM_TYPE float
+#else
+#define STBIR_RENORM_TYPE double
+#endif
+
+static void stbir__cleanup_gathered_coefficients( stbir_edge edge, stbir__filter_extent_info* filter_info, stbir__scale_info * scale_info, int num_contributors, stbir__contributors* contributors, float * coefficient_group, int coefficient_width )
+{
+  int input_size = scale_info->input_full_size;
+  int input_last_n1 = input_size - 1;
+  int n, end;
+  int lowest = 0x7fffffff;
+  int highest = -0x7fffffff;
+  int widest = -1;
+  int numerator = scale_info->scale_numerator;
+  int denominator = scale_info->scale_denominator;
+  int polyphase = ( ( scale_info->scale_is_rational ) && ( numerator < num_contributors ) );
+  float * coeffs;
+  stbir__contributors * contribs;
+
+  // weight all the coeffs for each sample
+  coeffs = coefficient_group;
+  contribs = contributors;
+  end = num_contributors; if ( polyphase ) end = numerator;
+  for (n = 0; n < end; n++)
+  {
+    int i;
+    STBIR_RENORM_TYPE filter_scale, total_filter = 0;
+    int e;
+
+    // add all contribs
+    e = contribs->n1 - contribs->n0;
+    for( i = 0 ; i <= e ; i++ )
+    {
+      total_filter += (STBIR_RENORM_TYPE) coeffs[i];
+      STBIR_ASSERT( ( coeffs[i] >= -2.0f ) && ( coeffs[i] <= 2.0f )  ); // check for wonky weights
+    }
+
+    // rescale
+    if ( ( total_filter < stbir__small_float ) && ( total_filter > -stbir__small_float ) )
+    {
+      // all coeffs are extremely small, just zero it
+      contribs->n1 = contribs->n0;
+      coeffs[0] = 0.0f;
+    }
+    else
+    {
+      // if the total isn't 1.0, rescale everything
+      if ( ( total_filter < (1.0f-stbir__small_float) ) || ( total_filter > (1.0f+stbir__small_float) ) )
+      {
+        filter_scale = ((STBIR_RENORM_TYPE)1.0) / total_filter;
+
+        // scale them all
+        for (i = 0; i <= e; i++)
+          coeffs[i] = (float) ( coeffs[i] * filter_scale );
+      }
+    }
+    ++contribs;
+    coeffs += coefficient_width;
+  }
+
+  // if we have a rational for the scale, we can exploit the polyphaseness to not calculate
+  //   most of the coefficients, so we copy them here
+  if ( polyphase )
+  {
+    stbir__contributors * prev_contribs = contributors;
+    stbir__contributors * cur_contribs = contributors + numerator;
+
+    for( n = numerator ; n < num_contributors ; n++ )
+    {
+      cur_contribs->n0 = prev_contribs->n0 + denominator;
+      cur_contribs->n1 = prev_contribs->n1 + denominator;
+      ++cur_contribs;
+      ++prev_contribs;
+    }
+    stbir_overlapping_memcpy( coefficient_group + numerator * coefficient_width, coefficient_group, ( num_contributors - numerator ) * coefficient_width * sizeof( coeffs[ 0 ] ) );
+  }
+
+  coeffs = coefficient_group;
+  contribs = contributors;
+  for (n = 0; n < num_contributors; n++)
+  {
+    int i;
+
+    // in zero edge mode, just remove out of bounds contribs completely (since their weights are accounted for now)
+    if ( edge == STBIR_EDGE_ZERO )
+    {
+      // shrink the right side if necessary
+      if ( contribs->n1 > input_last_n1 )
+        contribs->n1 = input_last_n1;
+
+      // shrink the left side
+      if ( contribs->n0 < 0 )
+      {
+        int j, left, skips = 0;
+
+        skips = -contribs->n0;
+        contribs->n0 = 0;
+
+        // now move down the weights
+        left = contribs->n1 - contribs->n0 + 1;
+        if ( left > 0 )
+        {
+          for( j = 0 ; j < left ; j++ )
+            coeffs[ j ] = coeffs[ j + skips ];
+        }
+      }
+    }
+    else if ( ( edge == STBIR_EDGE_CLAMP ) || ( edge == STBIR_EDGE_REFLECT ) )
+    {
+      // for clamp and reflect, calculate the true inbounds position (based on edge type) and just add that to the existing weight
+
+      // right hand side first
+      if ( contribs->n1 > input_last_n1 )
+      {
+        int start = contribs->n0;
+        int endi = contribs->n1;
+        contribs->n1 = input_last_n1;
+        for( i = input_size; i <= endi; i++ )
+          stbir__insert_coeff( contribs, coeffs, stbir__edge_wrap_slow[edge]( i, input_size ), coeffs[i-start] );
+      }
+
+      // now check left hand edge
+      if ( contribs->n0 < 0 )
+      {
+        int save_n0;
+        float save_n0_coeff;
+        float * c = coeffs - ( contribs->n0 + 1 );
+
+        // reinsert the coeffs with it reflected or clamped (insert accumulates, if the coeffs exist)
+        for( i = -1 ; i > contribs->n0 ; i-- )
+          stbir__insert_coeff( contribs, coeffs, stbir__edge_wrap_slow[edge]( i, input_size ), *c-- );
+        save_n0 = contribs->n0;
+        save_n0_coeff = c[0]; // save it, since we didn't do the final one (i==n0), because there might be too many coeffs to hold (before we resize)!
+
+        // now slide all the coeffs down (since we have accumulated them in the positive contribs) and reset the first contrib
+        contribs->n0 = 0;
+        for(i = 0 ; i <= contribs->n1 ; i++ )
+          coeffs[i] = coeffs[i-save_n0];
+
+        // now that we have shrunk down the contribs, we insert the first one safely
+        stbir__insert_coeff( contribs, coeffs, stbir__edge_wrap_slow[edge]( save_n0, input_size ), save_n0_coeff );
+      }
+    }
+
+    if ( contribs->n0 <= contribs->n1 )
+    {
+      int diff = contribs->n1 - contribs->n0 + 1;
+      while ( diff && ( coeffs[ diff-1 ] == 0.0f ) )
+        --diff;
+      contribs->n1 = contribs->n0 + diff - 1;
+
+      if ( contribs->n0 <= contribs->n1 )
+      {
+        if ( contribs->n0 < lowest )
+          lowest = contribs->n0;
+        if ( contribs->n1 > highest )
+          highest = contribs->n1;
+        if ( diff > widest )
+          widest = diff;
+      }
+
+      // re-zero out unused coefficients (if any)
+      for( i = diff ; i < coefficient_width ; i++ )
+        coeffs[i] = 0.0f;
+    }
+
+    ++contribs;
+    coeffs += coefficient_width;
+  }
+  filter_info->lowest = lowest;
+  filter_info->highest = highest;
+  filter_info->widest = widest;
+}
+
+#undef STBIR_RENORM_TYPE 
+
+static int stbir__pack_coefficients( int num_contributors, stbir__contributors* contributors, float * coefficents, int coefficient_width, int widest, int row0, int row1 ) 
+{
+  #define STBIR_MOVE_1( dest, src ) { STBIR_NO_UNROLL(dest); ((stbir_uint32*)(dest))[0] = ((stbir_uint32*)(src))[0]; }
+  #define STBIR_MOVE_2( dest, src ) { STBIR_NO_UNROLL(dest); ((stbir_uint64*)(dest))[0] = ((stbir_uint64*)(src))[0]; }
+  #ifdef STBIR_SIMD
+  #define STBIR_MOVE_4( dest, src ) { stbir__simdf t; STBIR_NO_UNROLL(dest); stbir__simdf_load( t, src ); stbir__simdf_store( dest, t ); }
+  #else
+  #define STBIR_MOVE_4( dest, src ) { STBIR_NO_UNROLL(dest); ((stbir_uint64*)(dest))[0] = ((stbir_uint64*)(src))[0]; ((stbir_uint64*)(dest))[1] = ((stbir_uint64*)(src))[1]; }
+  #endif
+
+  int row_end = row1 + 1;
+  STBIR__UNUSED( row0 ); // only used in an assert
+
+  if ( coefficient_width != widest )
+  {
+    float * pc = coefficents;
+    float * coeffs = coefficents;
+    float * pc_end = coefficents + num_contributors * widest;
+    switch( widest )
+    {
+      case 1:
+        do {
+          STBIR_MOVE_1( pc, coeffs );
+          ++pc;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 2:
+        do {
+          STBIR_MOVE_2( pc, coeffs );
+          pc += 2;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 3:
+        do {
+          STBIR_MOVE_2( pc, coeffs );
+          STBIR_MOVE_1( pc+2, coeffs+2 );
+          pc += 3;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 4:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          pc += 4;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 5:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          STBIR_MOVE_1( pc+4, coeffs+4 );
+          pc += 5;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 6:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          STBIR_MOVE_2( pc+4, coeffs+4 );
+          pc += 6;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 7:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          STBIR_MOVE_2( pc+4, coeffs+4 );
+          STBIR_MOVE_1( pc+6, coeffs+6 );
+          pc += 7;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 8:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          STBIR_MOVE_4( pc+4, coeffs+4 );
+          pc += 8;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 9:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          STBIR_MOVE_4( pc+4, coeffs+4 );
+          STBIR_MOVE_1( pc+8, coeffs+8 );
+          pc += 9;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 10:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          STBIR_MOVE_4( pc+4, coeffs+4 );
+          STBIR_MOVE_2( pc+8, coeffs+8 );
+          pc += 10;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 11:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          STBIR_MOVE_4( pc+4, coeffs+4 );
+          STBIR_MOVE_2( pc+8, coeffs+8 );
+          STBIR_MOVE_1( pc+10, coeffs+10 );
+          pc += 11;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      case 12:
+        do {
+          STBIR_MOVE_4( pc, coeffs );
+          STBIR_MOVE_4( pc+4, coeffs+4 );
+          STBIR_MOVE_4( pc+8, coeffs+8 );
+          pc += 12;
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+      default:
+        do {
+          float * copy_end = pc + widest - 4;
+          float * c = coeffs;
+          do {
+            STBIR_NO_UNROLL( pc );
+            STBIR_MOVE_4( pc, c );
+            pc += 4;
+            c += 4;
+          } while ( pc <= copy_end );
+          copy_end += 4;
+          while ( pc < copy_end )
+          {
+            STBIR_MOVE_1( pc, c );
+            ++pc; ++c;
+          }
+          coeffs += coefficient_width;
+        } while ( pc < pc_end );
+        break;
+    }
+  }
+
+  // some horizontal routines read one float off the end (which is then masked off), so put in a sentinal so we don't read an snan or denormal
+  coefficents[ widest * num_contributors ] = 8888.0f;
+
+  // the minimum we might read for unrolled filters widths is 12. So, we need to
+  //   make sure we never read outside the decode buffer, by possibly moving
+  //   the sample area back into the scanline, and putting zeros weights first.
+  // we start on the right edge and check until we're well past the possible
+  //   clip area (2*widest).
+  {
+    stbir__contributors * contribs = contributors + num_contributors - 1;
+    float * coeffs = coefficents + widest * ( num_contributors - 1 );
+
+    // go until no chance of clipping (this is usually less than 8 lops)
+    while ( ( contribs >= contributors ) && ( ( contribs->n0 + widest*2 ) >= row_end ) )
+    {
+      // might we clip??
+      if ( ( contribs->n0 + widest ) > row_end )
+      {
+        int stop_range = widest;
+
+        // if range is larger than 12, it will be handled by generic loops that can terminate on the exact length
+        //   of this contrib n1, instead of a fixed widest amount - so calculate this
+        if ( widest > 12 )
+        {
+          int mod;
+
+          // how far will be read in the n_coeff loop (which depends on the widest count mod4);
+          mod = widest & 3;
+          stop_range = ( ( ( contribs->n1 - contribs->n0 + 1 ) - mod + 3 ) & ~3 ) + mod;
+
+          // the n_coeff loops do a minimum amount of coeffs, so factor that in!
+          if ( stop_range < ( 8 + mod ) ) stop_range = 8 + mod;
+        }
+
+        // now see if we still clip with the refined range
+        if ( ( contribs->n0 + stop_range ) > row_end )
+        {
+          int new_n0 = row_end - stop_range;
+          int num = contribs->n1 - contribs->n0 + 1;
+          int backup = contribs->n0 - new_n0;
+          float * from_co = coeffs + num - 1;
+          float * to_co = from_co + backup;
+
+          STBIR_ASSERT( ( new_n0 >= row0 ) && ( new_n0 < contribs->n0 ) );
+
+          // move the coeffs over
+          while( num )
+          {
+            *to_co-- = *from_co--;
+            --num;
+          }
+          // zero new positions
+          while ( to_co >= coeffs )
+            *to_co-- = 0;
+          // set new start point
+          contribs->n0 = new_n0;
+          if ( widest > 12 )
+          {
+            int mod;
+
+            // how far will be read in the n_coeff loop (which depends on the widest count mod4);
+            mod = widest & 3;
+            stop_range = ( ( ( contribs->n1 - contribs->n0 + 1 ) - mod + 3 ) & ~3 ) + mod;
+
+            // the n_coeff loops do a minimum amount of coeffs, so factor that in!
+            if ( stop_range < ( 8 + mod ) ) stop_range = 8 + mod;
+          }
+        }
+      }
+      --contribs;
+      coeffs -= widest;
+    }
+  }
+
+  return widest;
+  #undef STBIR_MOVE_1
+  #undef STBIR_MOVE_2
+  #undef STBIR_MOVE_4
+}
+
+static void stbir__calculate_filters( stbir__sampler * samp, stbir__sampler * other_axis_for_pivot, void * user_data STBIR_ONLY_PROFILE_BUILD_GET_INFO )
+{
+  int n;
+  float scale = samp->scale_info.scale;
+  stbir__kernel_callback * kernel = samp->filter_kernel;
+  stbir__support_callback * support = samp->filter_support;
+  float inv_scale = samp->scale_info.inv_scale;
+  int input_full_size = samp->scale_info.input_full_size;
+  int gather_num_contributors = samp->num_contributors;
+  stbir__contributors* gather_contributors = samp->contributors;
+  float * gather_coeffs = samp->coefficients;
+  int gather_coefficient_width = samp->coefficient_width;
+
+  switch ( samp->is_gather )
+  {
+    case 1: // gather upsample
+    {
+      float out_pixels_radius = support(inv_scale,user_data) * scale;
+
+      stbir__calculate_coefficients_for_gather_upsample( out_pixels_radius, kernel, &samp->scale_info, gather_num_contributors, gather_contributors, gather_coeffs, gather_coefficient_width, samp->edge, user_data );
+
+      STBIR_PROFILE_BUILD_START( cleanup );
+      stbir__cleanup_gathered_coefficients( samp->edge, &samp->extent_info, &samp->scale_info, gather_num_contributors, gather_contributors, gather_coeffs, gather_coefficient_width );
+      STBIR_PROFILE_BUILD_END( cleanup );
+    }
+    break;
+
+    case 0: // scatter downsample (only on vertical)
+    case 2: // gather downsample
+    {
+      float in_pixels_radius = support(scale,user_data) * inv_scale;
+      int filter_pixel_margin = samp->filter_pixel_margin;
+      int input_end = input_full_size + filter_pixel_margin;
+
+      // if this is a scatter, we do a downsample gather to get the coeffs, and then pivot after
+      if ( !samp->is_gather )
+      {
+        // check if we are using the same gather downsample on the horizontal as this vertical,
+        //   if so, then we don't have to generate them, we can just pivot from the horizontal.
+        if ( other_axis_for_pivot )
+        {
+          gather_contributors = other_axis_for_pivot->contributors;
+          gather_coeffs = other_axis_for_pivot->coefficients;
+          gather_coefficient_width = other_axis_for_pivot->coefficient_width;
+          gather_num_contributors = other_axis_for_pivot->num_contributors;
+          samp->extent_info.lowest = other_axis_for_pivot->extent_info.lowest;
+          samp->extent_info.highest = other_axis_for_pivot->extent_info.highest;
+          samp->extent_info.widest = other_axis_for_pivot->extent_info.widest;
+          goto jump_right_to_pivot;
+        }
+
+        gather_contributors = samp->gather_prescatter_contributors;
+        gather_coeffs = samp->gather_prescatter_coefficients;
+        gather_coefficient_width = samp->gather_prescatter_coefficient_width;
+        gather_num_contributors = samp->gather_prescatter_num_contributors;
+      }
+
+      stbir__calculate_coefficients_for_gather_downsample( -filter_pixel_margin, input_end, in_pixels_radius, kernel, &samp->scale_info, gather_coefficient_width, gather_num_contributors, gather_contributors, gather_coeffs, user_data );
+
+      STBIR_PROFILE_BUILD_START( cleanup );
+      stbir__cleanup_gathered_coefficients( samp->edge, &samp->extent_info, &samp->scale_info, gather_num_contributors, gather_contributors, gather_coeffs, gather_coefficient_width );
+      STBIR_PROFILE_BUILD_END( cleanup );
+
+      if ( !samp->is_gather )
+      {
+        // if this is a scatter (vertical only), then we need to pivot the coeffs
+        stbir__contributors * scatter_contributors;
+        int highest_set;
+
+        jump_right_to_pivot:
+
+        STBIR_PROFILE_BUILD_START( pivot );
+
+        highest_set = (-filter_pixel_margin) - 1;
+        for (n = 0; n < gather_num_contributors; n++)
+        {
+          int k;
+          int gn0 = gather_contributors->n0, gn1 = gather_contributors->n1;
+          int scatter_coefficient_width = samp->coefficient_width;
+          float * scatter_coeffs = samp->coefficients + ( gn0 + filter_pixel_margin ) * scatter_coefficient_width;
+          float * g_coeffs = gather_coeffs;
+          scatter_contributors = samp->contributors + ( gn0 + filter_pixel_margin );
+
+          for (k = gn0 ; k <= gn1 ; k++ )
+          {
+            float gc = *g_coeffs++;
+            
+            // skip zero and denormals - must skip zeros to avoid adding coeffs beyond scatter_coefficient_width
+            //   (which happens when pivoting from horizontal, which might have dummy zeros)
+            if ( ( ( gc >= stbir__small_float ) || ( gc <= -stbir__small_float ) ) )
+            {
+              if ( ( k > highest_set ) || ( scatter_contributors->n0 > scatter_contributors->n1 ) )
+              {
+                {
+                  // if we are skipping over several contributors, we need to clear the skipped ones
+                  stbir__contributors * clear_contributors = samp->contributors + ( highest_set + filter_pixel_margin + 1);
+                  while ( clear_contributors < scatter_contributors )
+                  {
+                    clear_contributors->n0 = 0;
+                    clear_contributors->n1 = -1;
+                    ++clear_contributors;
+                  }
+                }
+                scatter_contributors->n0 = n;
+                scatter_contributors->n1 = n;
+                scatter_coeffs[0]  = gc;
+                highest_set = k;
+              }
+              else
+              {
+                stbir__insert_coeff( scatter_contributors, scatter_coeffs, n, gc );
+              }
+              STBIR_ASSERT( ( scatter_contributors->n1 - scatter_contributors->n0 + 1 ) <= scatter_coefficient_width );
+            }
+            ++scatter_contributors;
+            scatter_coeffs += scatter_coefficient_width;
+          }
+
+          ++gather_contributors;
+          gather_coeffs += gather_coefficient_width;
+        }
+
+        // now clear any unset contribs
+        {
+          stbir__contributors * clear_contributors = samp->contributors + ( highest_set + filter_pixel_margin + 1);
+          stbir__contributors * end_contributors = samp->contributors + samp->num_contributors;
+          while ( clear_contributors < end_contributors )
+          {
+            clear_contributors->n0 = 0;
+            clear_contributors->n1 = -1;
+            ++clear_contributors;
+          }
+        }
+
+        STBIR_PROFILE_BUILD_END( pivot );
+      }
+    }
+    break;
+  }
+}
+
+
+//========================================================================================================
+// scanline decoders and encoders
+
+#define stbir__coder_min_num 1
+#define STB_IMAGE_RESIZE_DO_CODERS
+#include STBIR__HEADER_FILENAME
+
+#define stbir__decode_suffix BGRA
+#define stbir__decode_swizzle
+#define stbir__decode_order0  2
+#define stbir__decode_order1  1
+#define stbir__decode_order2  0
+#define stbir__decode_order3  3
+#define stbir__encode_order0  2
+#define stbir__encode_order1  1
+#define stbir__encode_order2  0
+#define stbir__encode_order3  3
+#define stbir__coder_min_num 4
+#define STB_IMAGE_RESIZE_DO_CODERS
+#include STBIR__HEADER_FILENAME
+
+#define stbir__decode_suffix ARGB
+#define stbir__decode_swizzle
+#define stbir__decode_order0  1
+#define stbir__decode_order1  2
+#define stbir__decode_order2  3
+#define stbir__decode_order3  0
+#define stbir__encode_order0  3
+#define stbir__encode_order1  0
+#define stbir__encode_order2  1
+#define stbir__encode_order3  2
+#define stbir__coder_min_num 4
+#define STB_IMAGE_RESIZE_DO_CODERS
+#include STBIR__HEADER_FILENAME
+
+#define stbir__decode_suffix ABGR
+#define stbir__decode_swizzle
+#define stbir__decode_order0  3
+#define stbir__decode_order1  2
+#define stbir__decode_order2  1
+#define stbir__decode_order3  0
+#define stbir__encode_order0  3
+#define stbir__encode_order1  2
+#define stbir__encode_order2  1
+#define stbir__encode_order3  0
+#define stbir__coder_min_num 4
+#define STB_IMAGE_RESIZE_DO_CODERS
+#include STBIR__HEADER_FILENAME
+
+#define stbir__decode_suffix AR
+#define stbir__decode_swizzle
+#define stbir__decode_order0  1
+#define stbir__decode_order1  0
+#define stbir__decode_order2  3
+#define stbir__decode_order3  2
+#define stbir__encode_order0  1
+#define stbir__encode_order1  0
+#define stbir__encode_order2  3
+#define stbir__encode_order3  2
+#define stbir__coder_min_num 2
+#define STB_IMAGE_RESIZE_DO_CODERS
+#include STBIR__HEADER_FILENAME
+
+
+// fancy alpha means we expand to keep both premultipied and non-premultiplied color channels
+static void stbir__fancy_alpha_weight_4ch( float * out_buffer, int width_times_channels )
+{
+  float STBIR_STREAMOUT_PTR(*) out = out_buffer;
+  float const * end_decode = out_buffer + ( width_times_channels / 4 ) * 7;  // decode buffer aligned to end of out_buffer
+  float STBIR_STREAMOUT_PTR(*) decode = (float*)end_decode - width_times_channels;
+
+  // fancy alpha is stored internally as R G B A Rpm Gpm Bpm
+
+  #ifdef STBIR_SIMD
+
+  #ifdef STBIR_SIMD8
+  decode += 16;
+  while ( decode <= end_decode )
+  {
+    stbir__simdf8 d0,d1,a0,a1,p0,p1;
+    STBIR_NO_UNROLL(decode);
+    stbir__simdf8_load( d0, decode-16 );
+    stbir__simdf8_load( d1, decode-16+8 );
+    stbir__simdf8_0123to33333333( a0, d0 );
+    stbir__simdf8_0123to33333333( a1, d1 );
+    stbir__simdf8_mult( p0, a0, d0 );
+    stbir__simdf8_mult( p1, a1, d1 );
+    stbir__simdf8_bot4s( a0, d0, p0 );
+    stbir__simdf8_bot4s( a1, d1, p1 );
+    stbir__simdf8_top4s( d0, d0, p0 );
+    stbir__simdf8_top4s( d1, d1, p1 );
+    stbir__simdf8_store ( out, a0 );
+    stbir__simdf8_store ( out+7, d0 );
+    stbir__simdf8_store ( out+14, a1 );
+    stbir__simdf8_store ( out+21, d1 );
+    decode += 16;
+    out += 28;
+  }
+  decode -= 16;
+  #else
+  decode += 8;
+  while ( decode <= end_decode )
+  {
+    stbir__simdf d0,a0,d1,a1,p0,p1;
+    STBIR_NO_UNROLL(decode);
+    stbir__simdf_load( d0, decode-8 );
+    stbir__simdf_load( d1, decode-8+4 );
+    stbir__simdf_0123to3333( a0, d0 );
+    stbir__simdf_0123to3333( a1, d1 );
+    stbir__simdf_mult( p0, a0, d0 );
+    stbir__simdf_mult( p1, a1, d1 );
+    stbir__simdf_store ( out, d0 );
+    stbir__simdf_store ( out+4, p0 );
+    stbir__simdf_store ( out+7, d1 );
+    stbir__simdf_store ( out+7+4, p1 );
+    decode += 8;
+    out += 14;
+  }
+  decode -= 8;
+  #endif
+
+  // might be one last odd pixel
+  #ifdef STBIR_SIMD8
+  while ( decode < end_decode )
+  #else
+  if ( decode < end_decode )
+  #endif
+  {
+    stbir__simdf d,a,p;
+    stbir__simdf_load( d, decode );
+    stbir__simdf_0123to3333( a, d );
+    stbir__simdf_mult( p, a, d );
+    stbir__simdf_store ( out, d );
+    stbir__simdf_store ( out+4, p );
+    decode += 4;
+    out += 7;
+  }
+
+  #else
+
+  while( decode < end_decode )
+  {
+    float r = decode[0], g = decode[1], b = decode[2], alpha = decode[3];
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+    out[3] = alpha;
+    out[4] = r * alpha;
+    out[5] = g * alpha;
+    out[6] = b * alpha;
+    out += 7;
+    decode += 4;
+  }
+
+  #endif
+}
+
+static void stbir__fancy_alpha_weight_2ch( float * out_buffer, int width_times_channels )
+{
+  float STBIR_STREAMOUT_PTR(*) out = out_buffer;
+  float const * end_decode = out_buffer + ( width_times_channels / 2 ) * 3;
+  float STBIR_STREAMOUT_PTR(*) decode = (float*)end_decode - width_times_channels;
+
+  //  for fancy alpha, turns into: [X A Xpm][X A Xpm],etc
+
+  #ifdef STBIR_SIMD
+
+  decode += 8;
+  if ( decode <= end_decode )
+  {
+    do {
+      #ifdef STBIR_SIMD8
+      stbir__simdf8 d0,a0,p0;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdf8_load( d0, decode-8 );
+      stbir__simdf8_0123to11331133( p0, d0 );
+      stbir__simdf8_0123to00220022( a0, d0 );
+      stbir__simdf8_mult( p0, p0, a0 );
+
+      stbir__simdf_store2( out, stbir__if_simdf8_cast_to_simdf4( d0 ) );
+      stbir__simdf_store( out+2, stbir__if_simdf8_cast_to_simdf4( p0 ) );
+      stbir__simdf_store2h( out+3, stbir__if_simdf8_cast_to_simdf4( d0 ) );
+
+      stbir__simdf_store2( out+6, stbir__simdf8_gettop4( d0 ) );
+      stbir__simdf_store( out+8, stbir__simdf8_gettop4( p0 ) );
+      stbir__simdf_store2h( out+9, stbir__simdf8_gettop4( d0 ) );
+      #else
+      stbir__simdf d0,a0,d1,a1,p0,p1;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdf_load( d0, decode-8 );
+      stbir__simdf_load( d1, decode-8+4 );
+      stbir__simdf_0123to1133( p0, d0 );
+      stbir__simdf_0123to1133( p1, d1 );
+      stbir__simdf_0123to0022( a0, d0 );
+      stbir__simdf_0123to0022( a1, d1 );
+      stbir__simdf_mult( p0, p0, a0 );
+      stbir__simdf_mult( p1, p1, a1 );
+
+      stbir__simdf_store2( out, d0 );
+      stbir__simdf_store( out+2, p0 );
+      stbir__simdf_store2h( out+3, d0 );
+
+      stbir__simdf_store2( out+6, d1 );
+      stbir__simdf_store( out+8, p1 );
+      stbir__simdf_store2h( out+9, d1 );
+      #endif
+      decode += 8;
+      out += 12;
+    } while ( decode <= end_decode );
+  }
+  decode -= 8;
+  #endif
+
+  while( decode < end_decode )
+  {
+    float x = decode[0], y = decode[1];
+    STBIR_SIMD_NO_UNROLL(decode);
+    out[0] = x;
+    out[1] = y;
+    out[2] = x * y;
+    out += 3;
+    decode += 2;
+  }
+}
+
+static void stbir__fancy_alpha_unweight_4ch( float * encode_buffer, int width_times_channels )
+{
+  float STBIR_SIMD_STREAMOUT_PTR(*) encode = encode_buffer;
+  float STBIR_SIMD_STREAMOUT_PTR(*) input = encode_buffer;
+  float const * end_output = encode_buffer + width_times_channels;
+
+  // fancy RGBA is stored internally as R G B A Rpm Gpm Bpm
+
+  do {
+    float alpha = input[3];
+#ifdef STBIR_SIMD
+    stbir__simdf i,ia;
+    STBIR_SIMD_NO_UNROLL(encode);
+    if ( alpha < stbir__small_float )
+    {
+      stbir__simdf_load( i, input );
+      stbir__simdf_store( encode, i );
+    }
+    else
+    {
+      stbir__simdf_load1frep4( ia, 1.0f / alpha );
+      stbir__simdf_load( i, input+4 );
+      stbir__simdf_mult( i, i, ia );
+      stbir__simdf_store( encode, i );
+      encode[3] = alpha;
+    }
+#else
+    if ( alpha < stbir__small_float )
+    {
+      encode[0] = input[0];
+      encode[1] = input[1];
+      encode[2] = input[2];
+    }
+    else
+    {
+      float ialpha = 1.0f / alpha;
+      encode[0] = input[4] * ialpha;
+      encode[1] = input[5] * ialpha;
+      encode[2] = input[6] * ialpha;
+    }
+    encode[3] = alpha;
+#endif
+
+    input += 7;
+    encode += 4;
+  } while ( encode < end_output );
+}
+
+//  format: [X A Xpm][X A Xpm] etc
+static void stbir__fancy_alpha_unweight_2ch( float * encode_buffer, int width_times_channels )
+{
+  float STBIR_SIMD_STREAMOUT_PTR(*) encode = encode_buffer;
+  float STBIR_SIMD_STREAMOUT_PTR(*) input = encode_buffer;
+  float const * end_output = encode_buffer + width_times_channels;
+
+  do {
+    float alpha = input[1];
+    encode[0] = input[0];
+    if ( alpha >= stbir__small_float )
+      encode[0] = input[2] / alpha;
+    encode[1] = alpha;
+
+    input += 3;
+    encode += 2;
+  } while ( encode < end_output );
+}
+
+static void stbir__simple_alpha_weight_4ch( float * decode_buffer, int width_times_channels )
+{
+  float STBIR_STREAMOUT_PTR(*) decode = decode_buffer;
+  float const * end_decode = decode_buffer + width_times_channels;
+
+  #ifdef STBIR_SIMD
+  {
+    decode += 2 * stbir__simdfX_float_count;
+    while ( decode <= end_decode )
+    {
+      stbir__simdfX d0,a0,d1,a1;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdfX_load( d0, decode-2*stbir__simdfX_float_count );
+      stbir__simdfX_load( d1, decode-2*stbir__simdfX_float_count+stbir__simdfX_float_count );
+      stbir__simdfX_aaa1( a0, d0, STBIR_onesX );
+      stbir__simdfX_aaa1( a1, d1, STBIR_onesX );
+      stbir__simdfX_mult( d0, d0, a0 );
+      stbir__simdfX_mult( d1, d1, a1 );
+      stbir__simdfX_store ( decode-2*stbir__simdfX_float_count, d0 );
+      stbir__simdfX_store ( decode-2*stbir__simdfX_float_count+stbir__simdfX_float_count, d1 );
+      decode += 2 * stbir__simdfX_float_count;
+    }
+    decode -= 2 * stbir__simdfX_float_count;
+
+    // few last pixels remnants
+    #ifdef STBIR_SIMD8
+    while ( decode < end_decode )
+    #else
+    if ( decode < end_decode )
+    #endif
+    {
+      stbir__simdf d,a;
+      stbir__simdf_load( d, decode );
+      stbir__simdf_aaa1( a, d, STBIR__CONSTF(STBIR_ones) );
+      stbir__simdf_mult( d, d, a );
+      stbir__simdf_store ( decode, d );
+      decode += 4;
+    }
+  }
+
+  #else
+
+  while( decode < end_decode )
+  {
+    float alpha = decode[3];
+    decode[0] *= alpha;
+    decode[1] *= alpha;
+    decode[2] *= alpha;
+    decode += 4;
+  }
+
+  #endif
+}
+
+static void stbir__simple_alpha_weight_2ch( float * decode_buffer, int width_times_channels )
+{
+  float STBIR_STREAMOUT_PTR(*) decode = decode_buffer;
+  float const * end_decode = decode_buffer + width_times_channels;
+
+  #ifdef STBIR_SIMD
+  decode += 2 * stbir__simdfX_float_count;
+  while ( decode <= end_decode )
+  {
+    stbir__simdfX d0,a0,d1,a1;
+    STBIR_NO_UNROLL(decode);
+    stbir__simdfX_load( d0, decode-2*stbir__simdfX_float_count );
+    stbir__simdfX_load( d1, decode-2*stbir__simdfX_float_count+stbir__simdfX_float_count );
+    stbir__simdfX_a1a1( a0, d0, STBIR_onesX );
+    stbir__simdfX_a1a1( a1, d1, STBIR_onesX );
+    stbir__simdfX_mult( d0, d0, a0 );
+    stbir__simdfX_mult( d1, d1, a1 );
+    stbir__simdfX_store ( decode-2*stbir__simdfX_float_count, d0 );
+    stbir__simdfX_store ( decode-2*stbir__simdfX_float_count+stbir__simdfX_float_count, d1 );
+    decode += 2 * stbir__simdfX_float_count;
+  }
+  decode -= 2 * stbir__simdfX_float_count;
+  #endif
+
+  while( decode < end_decode )
+  {
+    float alpha = decode[1];
+    STBIR_SIMD_NO_UNROLL(decode);
+    decode[0] *= alpha;
+    decode += 2;
+  }
+}
+
+static void stbir__simple_alpha_unweight_4ch( float * encode_buffer, int width_times_channels )
+{
+  float STBIR_SIMD_STREAMOUT_PTR(*) encode = encode_buffer;
+  float const * end_output = encode_buffer + width_times_channels;
+
+  do {
+    float alpha = encode[3];
+
+#ifdef STBIR_SIMD
+    stbir__simdf i,ia;
+    STBIR_SIMD_NO_UNROLL(encode);
+    if ( alpha >= stbir__small_float )
+    {
+      stbir__simdf_load1frep4( ia, 1.0f / alpha );
+      stbir__simdf_load( i, encode );
+      stbir__simdf_mult( i, i, ia );
+      stbir__simdf_store( encode, i );
+      encode[3] = alpha;
+    }
+#else
+    if ( alpha >= stbir__small_float )
+    {
+      float ialpha = 1.0f / alpha;
+      encode[0] *= ialpha;
+      encode[1] *= ialpha;
+      encode[2] *= ialpha;
+    }
+#endif
+    encode += 4;
+  } while ( encode < end_output );
+}
+
+static void stbir__simple_alpha_unweight_2ch( float * encode_buffer, int width_times_channels )
+{
+  float STBIR_SIMD_STREAMOUT_PTR(*) encode = encode_buffer;
+  float const * end_output = encode_buffer + width_times_channels;
+
+  do {
+    float alpha = encode[1];
+    if ( alpha >= stbir__small_float )
+      encode[0] /= alpha;
+    encode += 2;
+  } while ( encode < end_output );
+}
+
+
+// only used in RGB->BGR or BGR->RGB
+static void stbir__simple_flip_3ch( float * decode_buffer, int width_times_channels )
+{
+  float STBIR_STREAMOUT_PTR(*) decode = decode_buffer;
+  float const * end_decode = decode_buffer + width_times_channels;
+
+  decode += 12;
+  while( decode <= end_decode )
+  {
+    float t0,t1,t2,t3;
+    STBIR_NO_UNROLL(decode);
+    t0 = decode[0]; t1 = decode[3]; t2 = decode[6]; t3 = decode[9];
+    decode[0] = decode[2]; decode[3] = decode[5]; decode[6] = decode[8]; decode[9] = decode[11];
+    decode[2] = t0; decode[5] = t1; decode[8] = t2; decode[11] = t3;
+    decode += 12;
+  }
+  decode -= 12;
+
+  while( decode < end_decode )
+  {
+    float t = decode[0];
+    STBIR_NO_UNROLL(decode);
+    decode[0] = decode[2];
+    decode[2] = t;
+    decode += 3;
+  }
+}
+
+
+
+static void stbir__decode_scanline(stbir__info const * stbir_info, int n, float * output_buffer STBIR_ONLY_PROFILE_GET_SPLIT_INFO )
+{
+  int channels = stbir_info->channels;
+  int effective_channels = stbir_info->effective_channels;
+  int input_sample_in_bytes = stbir__type_size[stbir_info->input_type] * channels;
+  stbir_edge edge_horizontal = stbir_info->horizontal.edge;
+  stbir_edge edge_vertical = stbir_info->vertical.edge;
+  int row = stbir__edge_wrap(edge_vertical, n, stbir_info->vertical.scale_info.input_full_size);
+  const void* input_plane_data = ( (char *) stbir_info->input_data ) + (size_t)row * (size_t) stbir_info->input_stride_bytes;
+  stbir__span const * spans = stbir_info->scanline_extents.spans;
+  float* full_decode_buffer = output_buffer - stbir_info->scanline_extents.conservative.n0 * effective_channels;
+
+  // if we are on edge_zero, and we get in here with an out of bounds n, then the calculate filters has failed
+  STBIR_ASSERT( !(edge_vertical == STBIR_EDGE_ZERO && (n < 0 || n >= stbir_info->vertical.scale_info.input_full_size)) );
+
+  do
+  {
+    float * decode_buffer;
+    void const * input_data;
+    float * end_decode;
+    int width_times_channels;
+    int width;
+
+    if ( spans->n1 < spans->n0 )
+      break;
+
+    width = spans->n1 + 1 - spans->n0;
+    decode_buffer = full_decode_buffer + spans->n0 * effective_channels;
+    end_decode = full_decode_buffer + ( spans->n1 + 1 ) * effective_channels;
+    width_times_channels = width * channels;
+
+    // read directly out of input plane by default
+    input_data = ( (char*)input_plane_data ) + spans->pixel_offset_for_input * input_sample_in_bytes;
+
+    // if we have an input callback, call it to get the input data
+    if ( stbir_info->in_pixels_cb )
+    {
+      // call the callback with a temp buffer (that they can choose to use or not).  the temp is just right aligned memory in the decode_buffer itself
+      input_data = stbir_info->in_pixels_cb( ( (char*) end_decode ) - ( width * input_sample_in_bytes ), input_plane_data, width, spans->pixel_offset_for_input, row, stbir_info->user_data );
+    }
+
+    STBIR_PROFILE_START( decode );
+    // convert the pixels info the float decode_buffer, (we index from end_decode, so that when channels<effective_channels, we are right justified in the buffer)
+    stbir_info->decode_pixels( (float*)end_decode - width_times_channels, width_times_channels, input_data );
+    STBIR_PROFILE_END( decode );
+
+    if (stbir_info->alpha_weight)
+    {
+      STBIR_PROFILE_START( alpha );
+      stbir_info->alpha_weight( decode_buffer, width_times_channels );
+      STBIR_PROFILE_END( alpha );
+    }
+
+    ++spans;
+  } while ( spans <= ( &stbir_info->scanline_extents.spans[1] ) );
+
+  // handle the edge_wrap filter (all other types are handled back out at the calculate_filter stage)
+  // basically the idea here is that if we have the whole scanline in memory, we don't redecode the
+  //   wrapped edge pixels, and instead just memcpy them from the scanline into the edge positions
+  if ( ( edge_horizontal == STBIR_EDGE_WRAP ) && ( stbir_info->scanline_extents.edge_sizes[0] | stbir_info->scanline_extents.edge_sizes[1] ) )
+  {
+    // this code only runs if we're in edge_wrap, and we're doing the entire scanline
+    int e, start_x[2];
+    int input_full_size = stbir_info->horizontal.scale_info.input_full_size;
+
+    start_x[0] = -stbir_info->scanline_extents.edge_sizes[0];  // left edge start x
+    start_x[1] =  input_full_size;                             // right edge
+
+    for( e = 0; e < 2 ; e++ )
+    {
+      // do each margin
+      int margin = stbir_info->scanline_extents.edge_sizes[e];
+      if ( margin )
+      {
+        int x = start_x[e];
+        float * marg = full_decode_buffer + x * effective_channels;
+        float const * src = full_decode_buffer + stbir__edge_wrap(edge_horizontal, x, input_full_size) * effective_channels;
+        STBIR_MEMCPY( marg, src, margin * effective_channels * sizeof(float) );
+      }
+    }
+  }
+}
+
+
+//=================
+// Do 1 channel horizontal routines
+
+#ifdef STBIR_SIMD
+
+#define stbir__1_coeff_only()          \
+    stbir__simdf tot,c;                \
+    STBIR_SIMD_NO_UNROLL(decode);      \
+    stbir__simdf_load1( c, hc );       \
+    stbir__simdf_mult1_mem( tot, c, decode );
+
+#define stbir__2_coeff_only()          \
+    stbir__simdf tot,c,d;              \
+    STBIR_SIMD_NO_UNROLL(decode);      \
+    stbir__simdf_load2z( c, hc );      \
+    stbir__simdf_load2( d, decode );   \
+    stbir__simdf_mult( tot, c, d );    \
+    stbir__simdf_0123to1230( c, tot ); \
+    stbir__simdf_add1( tot, tot, c );
+
+#define stbir__3_coeff_only()                  \
+    stbir__simdf tot,c,t;                      \
+    STBIR_SIMD_NO_UNROLL(decode);              \
+    stbir__simdf_load( c, hc );                \
+    stbir__simdf_mult_mem( tot, c, decode );   \
+    stbir__simdf_0123to1230( c, tot );         \
+    stbir__simdf_0123to2301( t, tot );         \
+    stbir__simdf_add1( tot, tot, c );          \
+    stbir__simdf_add1( tot, tot, t );
+
+#define stbir__store_output_tiny()                \
+    stbir__simdf_store1( output, tot );           \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 1;
+
+#define stbir__4_coeff_start()                 \
+    stbir__simdf tot,c;                        \
+    STBIR_SIMD_NO_UNROLL(decode);              \
+    stbir__simdf_load( c, hc );                \
+    stbir__simdf_mult_mem( tot, c, decode );   \
+
+#define stbir__4_coeff_continue_from_4( ofs )  \
+    STBIR_SIMD_NO_UNROLL(decode);              \
+    stbir__simdf_load( c, hc + (ofs) );        \
+    stbir__simdf_madd_mem( tot, tot, c, decode+(ofs) );
+
+#define stbir__1_coeff_remnant( ofs )          \
+    { stbir__simdf d;                          \
+    stbir__simdf_load1z( c, hc + (ofs) );      \
+    stbir__simdf_load1( d, decode + (ofs) );   \
+    stbir__simdf_madd( tot, tot, d, c ); }
+
+#define stbir__2_coeff_remnant( ofs )          \
+    { stbir__simdf d;                          \
+    stbir__simdf_load2z( c, hc+(ofs) );        \
+    stbir__simdf_load2( d, decode+(ofs) );     \
+    stbir__simdf_madd( tot, tot, d, c ); }
+
+#define stbir__3_coeff_setup()                 \
+    stbir__simdf mask;                         \
+    stbir__simdf_load( mask, STBIR_mask + 3 );
+
+#define stbir__3_coeff_remnant( ofs )                  \
+    stbir__simdf_load( c, hc+(ofs) );                  \
+    stbir__simdf_and( c, c, mask );                    \
+    stbir__simdf_madd_mem( tot, tot, c, decode+(ofs) );
+
+#define stbir__store_output()                     \
+    stbir__simdf_0123to2301( c, tot );            \
+    stbir__simdf_add( tot, tot, c );              \
+    stbir__simdf_0123to1230( c, tot );            \
+    stbir__simdf_add1( tot, tot, c );             \
+    stbir__simdf_store1( output, tot );           \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 1;
+
+#else
+
+#define stbir__1_coeff_only()  \
+    float tot;                 \
+    tot = decode[0]*hc[0];
+
+#define stbir__2_coeff_only()  \
+    float tot;                 \
+    tot = decode[0] * hc[0];   \
+    tot += decode[1] * hc[1];
+
+#define stbir__3_coeff_only()  \
+    float tot;                 \
+    tot = decode[0] * hc[0];   \
+    tot += decode[1] * hc[1];  \
+    tot += decode[2] * hc[2];
+
+#define stbir__store_output_tiny()                \
+    output[0] = tot;                              \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 1;
+
+#define stbir__4_coeff_start()  \
+    float tot0,tot1,tot2,tot3;  \
+    tot0 = decode[0] * hc[0];   \
+    tot1 = decode[1] * hc[1];   \
+    tot2 = decode[2] * hc[2];   \
+    tot3 = decode[3] * hc[3];
+
+#define stbir__4_coeff_continue_from_4( ofs )  \
+    tot0 += decode[0+(ofs)] * hc[0+(ofs)];     \
+    tot1 += decode[1+(ofs)] * hc[1+(ofs)];     \
+    tot2 += decode[2+(ofs)] * hc[2+(ofs)];     \
+    tot3 += decode[3+(ofs)] * hc[3+(ofs)];
+
+#define stbir__1_coeff_remnant( ofs )        \
+    tot0 += decode[0+(ofs)] * hc[0+(ofs)];
+
+#define stbir__2_coeff_remnant( ofs )        \
+    tot0 += decode[0+(ofs)] * hc[0+(ofs)];   \
+    tot1 += decode[1+(ofs)] * hc[1+(ofs)];   \
+
+#define stbir__3_coeff_remnant( ofs )        \
+    tot0 += decode[0+(ofs)] * hc[0+(ofs)];   \
+    tot1 += decode[1+(ofs)] * hc[1+(ofs)];   \
+    tot2 += decode[2+(ofs)] * hc[2+(ofs)];
+
+#define stbir__store_output()                     \
+    output[0] = (tot0+tot2)+(tot1+tot3);          \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 1;
+
+#endif
+
+#define STBIR__horizontal_channels 1
+#define STB_IMAGE_RESIZE_DO_HORIZONTALS
+#include STBIR__HEADER_FILENAME
+
+
+//=================
+// Do 2 channel horizontal routines
+
+#ifdef STBIR_SIMD
+
+#define stbir__1_coeff_only()         \
+    stbir__simdf tot,c,d;             \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    stbir__simdf_load1z( c, hc );     \
+    stbir__simdf_0123to0011( c, c );  \
+    stbir__simdf_load2( d, decode );  \
+    stbir__simdf_mult( tot, d, c );
+
+#define stbir__2_coeff_only()         \
+    stbir__simdf tot,c;               \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    stbir__simdf_load2( c, hc );      \
+    stbir__simdf_0123to0011( c, c );  \
+    stbir__simdf_mult_mem( tot, c, decode );
+
+#define stbir__3_coeff_only()                \
+    stbir__simdf tot,c,cs,d;                 \
+    STBIR_SIMD_NO_UNROLL(decode);            \
+    stbir__simdf_load( cs, hc );             \
+    stbir__simdf_0123to0011( c, cs );        \
+    stbir__simdf_mult_mem( tot, c, decode ); \
+    stbir__simdf_0123to2222( c, cs );        \
+    stbir__simdf_load2z( d, decode+4 );      \
+    stbir__simdf_madd( tot, tot, d, c );
+
+#define stbir__store_output_tiny()                \
+    stbir__simdf_0123to2301( c, tot );            \
+    stbir__simdf_add( tot, tot, c );              \
+    stbir__simdf_store2( output, tot );           \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 2;
+
+#ifdef STBIR_SIMD8
+
+#define stbir__4_coeff_start()                    \
+    stbir__simdf8 tot0,c,cs;                      \
+    STBIR_SIMD_NO_UNROLL(decode);                 \
+    stbir__simdf8_load4b( cs, hc );               \
+    stbir__simdf8_0123to00112233( c, cs );        \
+    stbir__simdf8_mult_mem( tot0, c, decode );
+
+#define stbir__4_coeff_continue_from_4( ofs )        \
+    STBIR_SIMD_NO_UNROLL(decode);                    \
+    stbir__simdf8_load4b( cs, hc + (ofs) );          \
+    stbir__simdf8_0123to00112233( c, cs );           \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*2 );
+
+#define stbir__1_coeff_remnant( ofs )                \
+    { stbir__simdf t;                                \
+    stbir__simdf_load1z( t, hc + (ofs) );            \
+    stbir__simdf_0123to0011( t, t );                 \
+    stbir__simdf_mult_mem( t, t, decode+(ofs)*2 );   \
+    stbir__simdf8_add4( tot0, tot0, t ); }
+
+#define stbir__2_coeff_remnant( ofs )                \
+    { stbir__simdf t;                                \
+    stbir__simdf_load2( t, hc + (ofs) );             \
+    stbir__simdf_0123to0011( t, t );                 \
+    stbir__simdf_mult_mem( t, t, decode+(ofs)*2 );   \
+    stbir__simdf8_add4( tot0, tot0, t ); }
+
+#define stbir__3_coeff_remnant( ofs )                \
+    { stbir__simdf8 d;                               \
+    stbir__simdf8_load4b( cs, hc + (ofs) );          \
+    stbir__simdf8_0123to00112233( c, cs );           \
+    stbir__simdf8_load6z( d, decode+(ofs)*2 );       \
+    stbir__simdf8_madd( tot0, tot0, c, d ); }
+
+#define stbir__store_output()                     \
+    { stbir__simdf t,d;                           \
+    stbir__simdf8_add4halves( t, stbir__if_simdf8_cast_to_simdf4(tot0), tot0 );    \
+    stbir__simdf_0123to2301( d, t );              \
+    stbir__simdf_add( t, t, d );                  \
+    stbir__simdf_store2( output, t );             \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 2; }
+
+#else
+
+#define stbir__4_coeff_start()                   \
+    stbir__simdf tot0,tot1,c,cs;                 \
+    STBIR_SIMD_NO_UNROLL(decode);                \
+    stbir__simdf_load( cs, hc );                 \
+    stbir__simdf_0123to0011( c, cs );            \
+    stbir__simdf_mult_mem( tot0, c, decode );    \
+    stbir__simdf_0123to2233( c, cs );            \
+    stbir__simdf_mult_mem( tot1, c, decode+4 );
+
+#define stbir__4_coeff_continue_from_4( ofs )                \
+    STBIR_SIMD_NO_UNROLL(decode);                            \
+    stbir__simdf_load( cs, hc + (ofs) );                     \
+    stbir__simdf_0123to0011( c, cs );                        \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*2 );  \
+    stbir__simdf_0123to2233( c, cs );                        \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*2+4 );
+
+#define stbir__1_coeff_remnant( ofs )            \
+    { stbir__simdf d;                            \
+    stbir__simdf_load1z( cs, hc + (ofs) );       \
+    stbir__simdf_0123to0011( c, cs );            \
+    stbir__simdf_load2( d, decode + (ofs) * 2 ); \
+    stbir__simdf_madd( tot0, tot0, d, c ); }
+
+#define stbir__2_coeff_remnant( ofs )                      \
+    stbir__simdf_load2( cs, hc + (ofs) );                  \
+    stbir__simdf_0123to0011( c, cs );                      \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*2 );
+
+#define stbir__3_coeff_remnant( ofs )                       \
+    { stbir__simdf d;                                       \
+    stbir__simdf_load( cs, hc + (ofs) );                    \
+    stbir__simdf_0123to0011( c, cs );                       \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*2 ); \
+    stbir__simdf_0123to2222( c, cs );                       \
+    stbir__simdf_load2z( d, decode + (ofs) * 2 + 4 );       \
+    stbir__simdf_madd( tot1, tot1, d, c ); }
+
+#define stbir__store_output()                     \
+    stbir__simdf_add( tot0, tot0, tot1 );         \
+    stbir__simdf_0123to2301( c, tot0 );           \
+    stbir__simdf_add( tot0, tot0, c );            \
+    stbir__simdf_store2( output, tot0 );          \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 2;
+
+#endif
+
+#else
+
+#define stbir__1_coeff_only()  \
+    float tota,totb,c;         \
+    c = hc[0];                 \
+    tota = decode[0]*c;        \
+    totb = decode[1]*c;
+
+#define stbir__2_coeff_only()  \
+    float tota,totb,c;         \
+    c = hc[0];                 \
+    tota = decode[0]*c;        \
+    totb = decode[1]*c;        \
+    c = hc[1];                 \
+    tota += decode[2]*c;       \
+    totb += decode[3]*c;
+
+// this weird order of add matches the simd
+#define stbir__3_coeff_only()  \
+    float tota,totb,c;         \
+    c = hc[0];                 \
+    tota = decode[0]*c;        \
+    totb = decode[1]*c;        \
+    c = hc[2];                 \
+    tota += decode[4]*c;       \
+    totb += decode[5]*c;       \
+    c = hc[1];                 \
+    tota += decode[2]*c;       \
+    totb += decode[3]*c;
+
+#define stbir__store_output_tiny()                \
+    output[0] = tota;                             \
+    output[1] = totb;                             \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 2;
+
+#define stbir__4_coeff_start()      \
+    float tota0,tota1,tota2,tota3,totb0,totb1,totb2,totb3,c;  \
+    c = hc[0];                      \
+    tota0 = decode[0]*c;            \
+    totb0 = decode[1]*c;            \
+    c = hc[1];                      \
+    tota1 = decode[2]*c;            \
+    totb1 = decode[3]*c;            \
+    c = hc[2];                      \
+    tota2 = decode[4]*c;            \
+    totb2 = decode[5]*c;            \
+    c = hc[3];                      \
+    tota3 = decode[6]*c;            \
+    totb3 = decode[7]*c;
+
+#define stbir__4_coeff_continue_from_4( ofs )  \
+    c = hc[0+(ofs)];                           \
+    tota0 += decode[0+(ofs)*2]*c;              \
+    totb0 += decode[1+(ofs)*2]*c;              \
+    c = hc[1+(ofs)];                           \
+    tota1 += decode[2+(ofs)*2]*c;              \
+    totb1 += decode[3+(ofs)*2]*c;              \
+    c = hc[2+(ofs)];                           \
+    tota2 += decode[4+(ofs)*2]*c;              \
+    totb2 += decode[5+(ofs)*2]*c;              \
+    c = hc[3+(ofs)];                           \
+    tota3 += decode[6+(ofs)*2]*c;              \
+    totb3 += decode[7+(ofs)*2]*c;
+
+#define stbir__1_coeff_remnant( ofs )  \
+    c = hc[0+(ofs)];                   \
+    tota0 += decode[0+(ofs)*2] * c;    \
+    totb0 += decode[1+(ofs)*2] * c;
+
+#define stbir__2_coeff_remnant( ofs )  \
+    c = hc[0+(ofs)];                   \
+    tota0 += decode[0+(ofs)*2] * c;    \
+    totb0 += decode[1+(ofs)*2] * c;    \
+    c = hc[1+(ofs)];                   \
+    tota1 += decode[2+(ofs)*2] * c;    \
+    totb1 += decode[3+(ofs)*2] * c;
+
+#define stbir__3_coeff_remnant( ofs )  \
+    c = hc[0+(ofs)];                   \
+    tota0 += decode[0+(ofs)*2] * c;    \
+    totb0 += decode[1+(ofs)*2] * c;    \
+    c = hc[1+(ofs)];                   \
+    tota1 += decode[2+(ofs)*2] * c;    \
+    totb1 += decode[3+(ofs)*2] * c;    \
+    c = hc[2+(ofs)];                   \
+    tota2 += decode[4+(ofs)*2] * c;    \
+    totb2 += decode[5+(ofs)*2] * c;
+
+#define stbir__store_output()                     \
+    output[0] = (tota0+tota2)+(tota1+tota3);      \
+    output[1] = (totb0+totb2)+(totb1+totb3);      \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 2;
+
+#endif
+
+#define STBIR__horizontal_channels 2
+#define STB_IMAGE_RESIZE_DO_HORIZONTALS
+#include STBIR__HEADER_FILENAME
+
+
+//=================
+// Do 3 channel horizontal routines
+
+#ifdef STBIR_SIMD
+
+#define stbir__1_coeff_only()         \
+    stbir__simdf tot,c,d;             \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    stbir__simdf_load1z( c, hc );     \
+    stbir__simdf_0123to0001( c, c );  \
+    stbir__simdf_load( d, decode );   \
+    stbir__simdf_mult( tot, d, c );
+
+#define stbir__2_coeff_only()         \
+    stbir__simdf tot,c,cs,d;          \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    stbir__simdf_load2( cs, hc );     \
+    stbir__simdf_0123to0000( c, cs ); \
+    stbir__simdf_load( d, decode );   \
+    stbir__simdf_mult( tot, d, c );   \
+    stbir__simdf_0123to1111( c, cs ); \
+    stbir__simdf_load( d, decode+3 ); \
+    stbir__simdf_madd( tot, tot, d, c );
+
+#define stbir__3_coeff_only()            \
+    stbir__simdf tot,c,d,cs;             \
+    STBIR_SIMD_NO_UNROLL(decode);        \
+    stbir__simdf_load( cs, hc );         \
+    stbir__simdf_0123to0000( c, cs );    \
+    stbir__simdf_load( d, decode );      \
+    stbir__simdf_mult( tot, d, c );      \
+    stbir__simdf_0123to1111( c, cs );    \
+    stbir__simdf_load( d, decode+3 );    \
+    stbir__simdf_madd( tot, tot, d, c ); \
+    stbir__simdf_0123to2222( c, cs );    \
+    stbir__simdf_load( d, decode+6 );    \
+    stbir__simdf_madd( tot, tot, d, c );
+
+#define stbir__store_output_tiny()                \
+    stbir__simdf_store2( output, tot );           \
+    stbir__simdf_0123to2301( tot, tot );          \
+    stbir__simdf_store1( output+2, tot );         \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 3;
+
+#ifdef STBIR_SIMD8
+
+// we're loading from the XXXYYY decode by -1 to get the XXXYYY into different halves of the AVX reg fyi
+#define stbir__4_coeff_start()                     \
+    stbir__simdf8 tot0,tot1,c,cs; stbir__simdf t;  \
+    STBIR_SIMD_NO_UNROLL(decode);                  \
+    stbir__simdf8_load4b( cs, hc );                \
+    stbir__simdf8_0123to00001111( c, cs );         \
+    stbir__simdf8_mult_mem( tot0, c, decode - 1 ); \
+    stbir__simdf8_0123to22223333( c, cs );         \
+    stbir__simdf8_mult_mem( tot1, c, decode+6 - 1 );
+
+#define stbir__4_coeff_continue_from_4( ofs )      \
+    STBIR_SIMD_NO_UNROLL(decode);                  \
+    stbir__simdf8_load4b( cs, hc + (ofs) );        \
+    stbir__simdf8_0123to00001111( c, cs );         \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*3 - 1 ); \
+    stbir__simdf8_0123to22223333( c, cs );         \
+    stbir__simdf8_madd_mem( tot1, tot1, c, decode+(ofs)*3 + 6 - 1 );
+
+#define stbir__1_coeff_remnant( ofs )                          \
+    STBIR_SIMD_NO_UNROLL(decode);                              \
+    stbir__simdf_load1rep4( t, hc + (ofs) );                   \
+    stbir__simdf8_madd_mem4( tot0, tot0, t, decode+(ofs)*3 - 1 );
+
+#define stbir__2_coeff_remnant( ofs )                          \
+    STBIR_SIMD_NO_UNROLL(decode);                              \
+    stbir__simdf8_load4b( cs, hc + (ofs) - 2 );                \
+    stbir__simdf8_0123to22223333( c, cs );                     \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*3 - 1 );
+
+ #define stbir__3_coeff_remnant( ofs )                           \
+    STBIR_SIMD_NO_UNROLL(decode);                                \
+    stbir__simdf8_load4b( cs, hc + (ofs) );                      \
+    stbir__simdf8_0123to00001111( c, cs );                       \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*3 - 1 ); \
+    stbir__simdf8_0123to2222( t, cs );                           \
+    stbir__simdf8_madd_mem4( tot1, tot1, t, decode+(ofs)*3 + 6 - 1 );
+
+#define stbir__store_output()                       \
+    stbir__simdf8_add( tot0, tot0, tot1 );          \
+    stbir__simdf_0123to1230( t, stbir__if_simdf8_cast_to_simdf4( tot0 ) ); \
+    stbir__simdf8_add4halves( t, t, tot0 );         \
+    horizontal_coefficients += coefficient_width;   \
+    ++horizontal_contributors;                      \
+    output += 3;                                    \
+    if ( output < output_end )                      \
+    {                                               \
+      stbir__simdf_store( output-3, t );            \
+      continue;                                     \
+    }                                               \
+    { stbir__simdf tt; stbir__simdf_0123to2301( tt, t ); \
+    stbir__simdf_store2( output-3, t );             \
+    stbir__simdf_store1( output+2-3, tt ); }        \
+    break;
+
+
+#else
+
+#define stbir__4_coeff_start()                  \
+    stbir__simdf tot0,tot1,tot2,c,cs;           \
+    STBIR_SIMD_NO_UNROLL(decode);               \
+    stbir__simdf_load( cs, hc );                \
+    stbir__simdf_0123to0001( c, cs );           \
+    stbir__simdf_mult_mem( tot0, c, decode );   \
+    stbir__simdf_0123to1122( c, cs );           \
+    stbir__simdf_mult_mem( tot1, c, decode+4 ); \
+    stbir__simdf_0123to2333( c, cs );           \
+    stbir__simdf_mult_mem( tot2, c, decode+8 );
+
+#define stbir__4_coeff_continue_from_4( ofs )                 \
+    STBIR_SIMD_NO_UNROLL(decode);                             \
+    stbir__simdf_load( cs, hc + (ofs) );                      \
+    stbir__simdf_0123to0001( c, cs );                         \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*3 );   \
+    stbir__simdf_0123to1122( c, cs );                         \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*3+4 ); \
+    stbir__simdf_0123to2333( c, cs );                         \
+    stbir__simdf_madd_mem( tot2, tot2, c, decode+(ofs)*3+8 );
+
+#define stbir__1_coeff_remnant( ofs )         \
+    STBIR_SIMD_NO_UNROLL(decode);             \
+    stbir__simdf_load1z( c, hc + (ofs) );     \
+    stbir__simdf_0123to0001( c, c );          \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*3 );
+
+#define stbir__2_coeff_remnant( ofs )                       \
+    { stbir__simdf d;                                       \
+    STBIR_SIMD_NO_UNROLL(decode);                           \
+    stbir__simdf_load2z( cs, hc + (ofs) );                  \
+    stbir__simdf_0123to0001( c, cs );                       \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*3 ); \
+    stbir__simdf_0123to1122( c, cs );                       \
+    stbir__simdf_load2z( d, decode+(ofs)*3+4 );             \
+    stbir__simdf_madd( tot1, tot1, c, d ); }
+
+#define stbir__3_coeff_remnant( ofs )                         \
+    { stbir__simdf d;                                         \
+    STBIR_SIMD_NO_UNROLL(decode);                             \
+    stbir__simdf_load( cs, hc + (ofs) );                      \
+    stbir__simdf_0123to0001( c, cs );                         \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*3 );   \
+    stbir__simdf_0123to1122( c, cs );                         \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*3+4 ); \
+    stbir__simdf_0123to2222( c, cs );                         \
+    stbir__simdf_load1z( d, decode+(ofs)*3+8 );               \
+    stbir__simdf_madd( tot2, tot2, c, d );  }
+
+#define stbir__store_output()                       \
+    stbir__simdf_0123ABCDto3ABx( c, tot0, tot1 );   \
+    stbir__simdf_0123ABCDto23Ax( cs, tot1, tot2 );  \
+    stbir__simdf_0123to1230( tot2, tot2 );          \
+    stbir__simdf_add( tot0, tot0, cs );             \
+    stbir__simdf_add( c, c, tot2 );                 \
+    stbir__simdf_add( tot0, tot0, c );              \
+    horizontal_coefficients += coefficient_width;   \
+    ++horizontal_contributors;                      \
+    output += 3;                                    \
+    if ( output < output_end )                      \
+    {                                               \
+      stbir__simdf_store( output-3, tot0 );         \
+      continue;                                     \
+    }                                               \
+    stbir__simdf_0123to2301( tot1, tot0 );          \
+    stbir__simdf_store2( output-3, tot0 );          \
+    stbir__simdf_store1( output+2-3, tot1 );        \
+    break;
+
+#endif
+
+#else
+
+#define stbir__1_coeff_only()  \
+    float tot0, tot1, tot2, c; \
+    c = hc[0];                 \
+    tot0 = decode[0]*c;        \
+    tot1 = decode[1]*c;        \
+    tot2 = decode[2]*c;
+
+#define stbir__2_coeff_only()  \
+    float tot0, tot1, tot2, c; \
+    c = hc[0];                 \
+    tot0 = decode[0]*c;        \
+    tot1 = decode[1]*c;        \
+    tot2 = decode[2]*c;        \
+    c = hc[1];                 \
+    tot0 += decode[3]*c;       \
+    tot1 += decode[4]*c;       \
+    tot2 += decode[5]*c;
+
+#define stbir__3_coeff_only()  \
+    float tot0, tot1, tot2, c; \
+    c = hc[0];                 \
+    tot0 = decode[0]*c;        \
+    tot1 = decode[1]*c;        \
+    tot2 = decode[2]*c;        \
+    c = hc[1];                 \
+    tot0 += decode[3]*c;       \
+    tot1 += decode[4]*c;       \
+    tot2 += decode[5]*c;       \
+    c = hc[2];                 \
+    tot0 += decode[6]*c;       \
+    tot1 += decode[7]*c;       \
+    tot2 += decode[8]*c;
+
+#define stbir__store_output_tiny()                \
+    output[0] = tot0;                             \
+    output[1] = tot1;                             \
+    output[2] = tot2;                             \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 3;
+
+#define stbir__4_coeff_start()      \
+    float tota0,tota1,tota2,totb0,totb1,totb2,totc0,totc1,totc2,totd0,totd1,totd2,c;  \
+    c = hc[0];                      \
+    tota0 = decode[0]*c;            \
+    tota1 = decode[1]*c;            \
+    tota2 = decode[2]*c;            \
+    c = hc[1];                      \
+    totb0 = decode[3]*c;            \
+    totb1 = decode[4]*c;            \
+    totb2 = decode[5]*c;            \
+    c = hc[2];                      \
+    totc0 = decode[6]*c;            \
+    totc1 = decode[7]*c;            \
+    totc2 = decode[8]*c;            \
+    c = hc[3];                      \
+    totd0 = decode[9]*c;            \
+    totd1 = decode[10]*c;           \
+    totd2 = decode[11]*c;
+
+#define stbir__4_coeff_continue_from_4( ofs )  \
+    c = hc[0+(ofs)];                           \
+    tota0 += decode[0+(ofs)*3]*c;              \
+    tota1 += decode[1+(ofs)*3]*c;              \
+    tota2 += decode[2+(ofs)*3]*c;              \
+    c = hc[1+(ofs)];                           \
+    totb0 += decode[3+(ofs)*3]*c;              \
+    totb1 += decode[4+(ofs)*3]*c;              \
+    totb2 += decode[5+(ofs)*3]*c;              \
+    c = hc[2+(ofs)];                           \
+    totc0 += decode[6+(ofs)*3]*c;              \
+    totc1 += decode[7+(ofs)*3]*c;              \
+    totc2 += decode[8+(ofs)*3]*c;              \
+    c = hc[3+(ofs)];                           \
+    totd0 += decode[9+(ofs)*3]*c;              \
+    totd1 += decode[10+(ofs)*3]*c;             \
+    totd2 += decode[11+(ofs)*3]*c;
+
+#define stbir__1_coeff_remnant( ofs )  \
+    c = hc[0+(ofs)];                   \
+    tota0 += decode[0+(ofs)*3]*c;      \
+    tota1 += decode[1+(ofs)*3]*c;      \
+    tota2 += decode[2+(ofs)*3]*c;
+
+#define stbir__2_coeff_remnant( ofs )  \
+    c = hc[0+(ofs)];                   \
+    tota0 += decode[0+(ofs)*3]*c;      \
+    tota1 += decode[1+(ofs)*3]*c;      \
+    tota2 += decode[2+(ofs)*3]*c;      \
+    c = hc[1+(ofs)];                   \
+    totb0 += decode[3+(ofs)*3]*c;      \
+    totb1 += decode[4+(ofs)*3]*c;      \
+    totb2 += decode[5+(ofs)*3]*c;      \
+
+#define stbir__3_coeff_remnant( ofs )  \
+    c = hc[0+(ofs)];                   \
+    tota0 += decode[0+(ofs)*3]*c;      \
+    tota1 += decode[1+(ofs)*3]*c;      \
+    tota2 += decode[2+(ofs)*3]*c;      \
+    c = hc[1+(ofs)];                   \
+    totb0 += decode[3+(ofs)*3]*c;      \
+    totb1 += decode[4+(ofs)*3]*c;      \
+    totb2 += decode[5+(ofs)*3]*c;      \
+    c = hc[2+(ofs)];                   \
+    totc0 += decode[6+(ofs)*3]*c;      \
+    totc1 += decode[7+(ofs)*3]*c;      \
+    totc2 += decode[8+(ofs)*3]*c;
+
+#define stbir__store_output()                     \
+    output[0] = (tota0+totc0)+(totb0+totd0);      \
+    output[1] = (tota1+totc1)+(totb1+totd1);      \
+    output[2] = (tota2+totc2)+(totb2+totd2);      \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 3;
+
+#endif
+
+#define STBIR__horizontal_channels 3
+#define STB_IMAGE_RESIZE_DO_HORIZONTALS
+#include STBIR__HEADER_FILENAME
+
+//=================
+// Do 4 channel horizontal routines
+
+#ifdef STBIR_SIMD
+
+#define stbir__1_coeff_only()             \
+    stbir__simdf tot,c;                   \
+    STBIR_SIMD_NO_UNROLL(decode);         \
+    stbir__simdf_load1( c, hc );          \
+    stbir__simdf_0123to0000( c, c );      \
+    stbir__simdf_mult_mem( tot, c, decode );
+
+#define stbir__2_coeff_only()                       \
+    stbir__simdf tot,c,cs;                          \
+    STBIR_SIMD_NO_UNROLL(decode);                   \
+    stbir__simdf_load2( cs, hc );                   \
+    stbir__simdf_0123to0000( c, cs );               \
+    stbir__simdf_mult_mem( tot, c, decode );        \
+    stbir__simdf_0123to1111( c, cs );               \
+    stbir__simdf_madd_mem( tot, tot, c, decode+4 );
+
+#define stbir__3_coeff_only()                       \
+    stbir__simdf tot,c,cs;                          \
+    STBIR_SIMD_NO_UNROLL(decode);                   \
+    stbir__simdf_load( cs, hc );                    \
+    stbir__simdf_0123to0000( c, cs );               \
+    stbir__simdf_mult_mem( tot, c, decode );        \
+    stbir__simdf_0123to1111( c, cs );               \
+    stbir__simdf_madd_mem( tot, tot, c, decode+4 ); \
+    stbir__simdf_0123to2222( c, cs );               \
+    stbir__simdf_madd_mem( tot, tot, c, decode+8 );
+
+#define stbir__store_output_tiny()                \
+    stbir__simdf_store( output, tot );            \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 4;
+
+#ifdef STBIR_SIMD8
+
+#define stbir__4_coeff_start()                     \
+    stbir__simdf8 tot0,c,cs; stbir__simdf t;  \
+    STBIR_SIMD_NO_UNROLL(decode);                  \
+    stbir__simdf8_load4b( cs, hc );                \
+    stbir__simdf8_0123to00001111( c, cs );         \
+    stbir__simdf8_mult_mem( tot0, c, decode );     \
+    stbir__simdf8_0123to22223333( c, cs );         \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+8 );
+
+#define stbir__4_coeff_continue_from_4( ofs )                  \
+    STBIR_SIMD_NO_UNROLL(decode);                              \
+    stbir__simdf8_load4b( cs, hc + (ofs) );                    \
+    stbir__simdf8_0123to00001111( c, cs );                     \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*4 );   \
+    stbir__simdf8_0123to22223333( c, cs );                     \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*4+8 );
+
+#define stbir__1_coeff_remnant( ofs )                          \
+    STBIR_SIMD_NO_UNROLL(decode);                              \
+    stbir__simdf_load1rep4( t, hc + (ofs) );                   \
+    stbir__simdf8_madd_mem4( tot0, tot0, t, decode+(ofs)*4 );
+
+#define stbir__2_coeff_remnant( ofs )                          \
+    STBIR_SIMD_NO_UNROLL(decode);                              \
+    stbir__simdf8_load4b( cs, hc + (ofs) - 2 );                \
+    stbir__simdf8_0123to22223333( c, cs );                     \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*4 );
+
+ #define stbir__3_coeff_remnant( ofs )                         \
+    STBIR_SIMD_NO_UNROLL(decode);                              \
+    stbir__simdf8_load4b( cs, hc + (ofs) );                    \
+    stbir__simdf8_0123to00001111( c, cs );                     \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*4 );   \
+    stbir__simdf8_0123to2222( t, cs );                         \
+    stbir__simdf8_madd_mem4( tot0, tot0, t, decode+(ofs)*4+8 );
+
+#define stbir__store_output()                      \
+    stbir__simdf8_add4halves( t, stbir__if_simdf8_cast_to_simdf4(tot0), tot0 );     \
+    stbir__simdf_store( output, t );               \
+    horizontal_coefficients += coefficient_width;  \
+    ++horizontal_contributors;                     \
+    output += 4;
+
+#else
+
+#define stbir__4_coeff_start()                        \
+    stbir__simdf tot0,tot1,c,cs;                      \
+    STBIR_SIMD_NO_UNROLL(decode);                     \
+    stbir__simdf_load( cs, hc );                      \
+    stbir__simdf_0123to0000( c, cs );                 \
+    stbir__simdf_mult_mem( tot0, c, decode );         \
+    stbir__simdf_0123to1111( c, cs );                 \
+    stbir__simdf_mult_mem( tot1, c, decode+4 );       \
+    stbir__simdf_0123to2222( c, cs );                 \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+8 ); \
+    stbir__simdf_0123to3333( c, cs );                 \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+12 );
+
+#define stbir__4_coeff_continue_from_4( ofs )                  \
+    STBIR_SIMD_NO_UNROLL(decode);                              \
+    stbir__simdf_load( cs, hc + (ofs) );                       \
+    stbir__simdf_0123to0000( c, cs );                          \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*4 );    \
+    stbir__simdf_0123to1111( c, cs );                          \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*4+4 );  \
+    stbir__simdf_0123to2222( c, cs );                          \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*4+8 );  \
+    stbir__simdf_0123to3333( c, cs );                          \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*4+12 );
+
+#define stbir__1_coeff_remnant( ofs )                       \
+    STBIR_SIMD_NO_UNROLL(decode);                           \
+    stbir__simdf_load1( c, hc + (ofs) );                    \
+    stbir__simdf_0123to0000( c, c );                        \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*4 );
+
+#define stbir__2_coeff_remnant( ofs )                         \
+    STBIR_SIMD_NO_UNROLL(decode);                             \
+    stbir__simdf_load2( cs, hc + (ofs) );                     \
+    stbir__simdf_0123to0000( c, cs );                         \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*4 );   \
+    stbir__simdf_0123to1111( c, cs );                         \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*4+4 );
+
+#define stbir__3_coeff_remnant( ofs )                          \
+    STBIR_SIMD_NO_UNROLL(decode);                              \
+    stbir__simdf_load( cs, hc + (ofs) );                       \
+    stbir__simdf_0123to0000( c, cs );                          \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*4 );    \
+    stbir__simdf_0123to1111( c, cs );                          \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*4+4 );  \
+    stbir__simdf_0123to2222( c, cs );                          \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*4+8 );
+
+#define stbir__store_output()                     \
+    stbir__simdf_add( tot0, tot0, tot1 );         \
+    stbir__simdf_store( output, tot0 );           \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 4;
+
+#endif
+
+#else
+
+#define stbir__1_coeff_only()         \
+    float p0,p1,p2,p3,c;              \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    c = hc[0];                        \
+    p0 = decode[0] * c;               \
+    p1 = decode[1] * c;               \
+    p2 = decode[2] * c;               \
+    p3 = decode[3] * c;
+
+#define stbir__2_coeff_only()         \
+    float p0,p1,p2,p3,c;              \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    c = hc[0];                        \
+    p0 = decode[0] * c;               \
+    p1 = decode[1] * c;               \
+    p2 = decode[2] * c;               \
+    p3 = decode[3] * c;               \
+    c = hc[1];                        \
+    p0 += decode[4] * c;              \
+    p1 += decode[5] * c;              \
+    p2 += decode[6] * c;              \
+    p3 += decode[7] * c;
+
+#define stbir__3_coeff_only()         \
+    float p0,p1,p2,p3,c;              \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    c = hc[0];                        \
+    p0 = decode[0] * c;               \
+    p1 = decode[1] * c;               \
+    p2 = decode[2] * c;               \
+    p3 = decode[3] * c;               \
+    c = hc[1];                        \
+    p0 += decode[4] * c;              \
+    p1 += decode[5] * c;              \
+    p2 += decode[6] * c;              \
+    p3 += decode[7] * c;              \
+    c = hc[2];                        \
+    p0 += decode[8] * c;              \
+    p1 += decode[9] * c;              \
+    p2 += decode[10] * c;             \
+    p3 += decode[11] * c;
+
+#define stbir__store_output_tiny()                \
+    output[0] = p0;                               \
+    output[1] = p1;                               \
+    output[2] = p2;                               \
+    output[3] = p3;                               \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 4;
+
+#define stbir__4_coeff_start()        \
+    float x0,x1,x2,x3,y0,y1,y2,y3,c;  \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    c = hc[0];                        \
+    x0 = decode[0] * c;               \
+    x1 = decode[1] * c;               \
+    x2 = decode[2] * c;               \
+    x3 = decode[3] * c;               \
+    c = hc[1];                        \
+    y0 = decode[4] * c;               \
+    y1 = decode[5] * c;               \
+    y2 = decode[6] * c;               \
+    y3 = decode[7] * c;               \
+    c = hc[2];                        \
+    x0 += decode[8] * c;              \
+    x1 += decode[9] * c;              \
+    x2 += decode[10] * c;             \
+    x3 += decode[11] * c;             \
+    c = hc[3];                        \
+    y0 += decode[12] * c;             \
+    y1 += decode[13] * c;             \
+    y2 += decode[14] * c;             \
+    y3 += decode[15] * c;
+
+#define stbir__4_coeff_continue_from_4( ofs ) \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    c = hc[0+(ofs)];                  \
+    x0 += decode[0+(ofs)*4] * c;      \
+    x1 += decode[1+(ofs)*4] * c;      \
+    x2 += decode[2+(ofs)*4] * c;      \
+    x3 += decode[3+(ofs)*4] * c;      \
+    c = hc[1+(ofs)];                  \
+    y0 += decode[4+(ofs)*4] * c;      \
+    y1 += decode[5+(ofs)*4] * c;      \
+    y2 += decode[6+(ofs)*4] * c;      \
+    y3 += decode[7+(ofs)*4] * c;      \
+    c = hc[2+(ofs)];                  \
+    x0 += decode[8+(ofs)*4] * c;      \
+    x1 += decode[9+(ofs)*4] * c;      \
+    x2 += decode[10+(ofs)*4] * c;     \
+    x3 += decode[11+(ofs)*4] * c;     \
+    c = hc[3+(ofs)];                  \
+    y0 += decode[12+(ofs)*4] * c;     \
+    y1 += decode[13+(ofs)*4] * c;     \
+    y2 += decode[14+(ofs)*4] * c;     \
+    y3 += decode[15+(ofs)*4] * c;
+
+#define stbir__1_coeff_remnant( ofs ) \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    c = hc[0+(ofs)];                  \
+    x0 += decode[0+(ofs)*4] * c;      \
+    x1 += decode[1+(ofs)*4] * c;      \
+    x2 += decode[2+(ofs)*4] * c;      \
+    x3 += decode[3+(ofs)*4] * c;
+
+#define stbir__2_coeff_remnant( ofs ) \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    c = hc[0+(ofs)];                  \
+    x0 += decode[0+(ofs)*4] * c;      \
+    x1 += decode[1+(ofs)*4] * c;      \
+    x2 += decode[2+(ofs)*4] * c;      \
+    x3 += decode[3+(ofs)*4] * c;      \
+    c = hc[1+(ofs)];                  \
+    y0 += decode[4+(ofs)*4] * c;      \
+    y1 += decode[5+(ofs)*4] * c;      \
+    y2 += decode[6+(ofs)*4] * c;      \
+    y3 += decode[7+(ofs)*4] * c;
+
+#define stbir__3_coeff_remnant( ofs ) \
+    STBIR_SIMD_NO_UNROLL(decode);     \
+    c = hc[0+(ofs)];                  \
+    x0 += decode[0+(ofs)*4] * c;      \
+    x1 += decode[1+(ofs)*4] * c;      \
+    x2 += decode[2+(ofs)*4] * c;      \
+    x3 += decode[3+(ofs)*4] * c;      \
+    c = hc[1+(ofs)];                  \
+    y0 += decode[4+(ofs)*4] * c;      \
+    y1 += decode[5+(ofs)*4] * c;      \
+    y2 += decode[6+(ofs)*4] * c;      \
+    y3 += decode[7+(ofs)*4] * c;      \
+    c = hc[2+(ofs)];                  \
+    x0 += decode[8+(ofs)*4] * c;      \
+    x1 += decode[9+(ofs)*4] * c;      \
+    x2 += decode[10+(ofs)*4] * c;     \
+    x3 += decode[11+(ofs)*4] * c;
+
+#define stbir__store_output()                     \
+    output[0] = x0 + y0;                          \
+    output[1] = x1 + y1;                          \
+    output[2] = x2 + y2;                          \
+    output[3] = x3 + y3;                          \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 4;
+
+#endif
+
+#define STBIR__horizontal_channels 4
+#define STB_IMAGE_RESIZE_DO_HORIZONTALS
+#include STBIR__HEADER_FILENAME
+
+
+
+//=================
+// Do 7 channel horizontal routines
+
+#ifdef STBIR_SIMD
+
+#define stbir__1_coeff_only()                   \
+    stbir__simdf tot0,tot1,c;                   \
+    STBIR_SIMD_NO_UNROLL(decode);               \
+    stbir__simdf_load1( c, hc );                \
+    stbir__simdf_0123to0000( c, c );            \
+    stbir__simdf_mult_mem( tot0, c, decode );   \
+    stbir__simdf_mult_mem( tot1, c, decode+3 );
+
+#define stbir__2_coeff_only()                         \
+    stbir__simdf tot0,tot1,c,cs;                      \
+    STBIR_SIMD_NO_UNROLL(decode);                     \
+    stbir__simdf_load2( cs, hc );                     \
+    stbir__simdf_0123to0000( c, cs );                 \
+    stbir__simdf_mult_mem( tot0, c, decode );         \
+    stbir__simdf_mult_mem( tot1, c, decode+3 );       \
+    stbir__simdf_0123to1111( c, cs );                 \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+7 ); \
+    stbir__simdf_madd_mem( tot1, tot1, c,decode+10 );
+
+#define stbir__3_coeff_only()                           \
+    stbir__simdf tot0,tot1,c,cs;                        \
+    STBIR_SIMD_NO_UNROLL(decode);                       \
+    stbir__simdf_load( cs, hc );                        \
+    stbir__simdf_0123to0000( c, cs );                   \
+    stbir__simdf_mult_mem( tot0, c, decode );           \
+    stbir__simdf_mult_mem( tot1, c, decode+3 );         \
+    stbir__simdf_0123to1111( c, cs );                   \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+7 );   \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+10 );  \
+    stbir__simdf_0123to2222( c, cs );                   \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+14 );  \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+17 );
+
+#define stbir__store_output_tiny()                \
+    stbir__simdf_store( output+3, tot1 );         \
+    stbir__simdf_store( output, tot0 );           \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 7;
+
+#ifdef STBIR_SIMD8
+
+#define stbir__4_coeff_start()                     \
+    stbir__simdf8 tot0,tot1,c,cs;                  \
+    STBIR_SIMD_NO_UNROLL(decode);                  \
+    stbir__simdf8_load4b( cs, hc );                \
+    stbir__simdf8_0123to00000000( c, cs );         \
+    stbir__simdf8_mult_mem( tot0, c, decode );     \
+    stbir__simdf8_0123to11111111( c, cs );         \
+    stbir__simdf8_mult_mem( tot1, c, decode+7 );   \
+    stbir__simdf8_0123to22222222( c, cs );         \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+14 );  \
+    stbir__simdf8_0123to33333333( c, cs );         \
+    stbir__simdf8_madd_mem( tot1, tot1, c, decode+21 );
+
+#define stbir__4_coeff_continue_from_4( ofs )                   \
+    STBIR_SIMD_NO_UNROLL(decode);                               \
+    stbir__simdf8_load4b( cs, hc + (ofs) );                     \
+    stbir__simdf8_0123to00000000( c, cs );                      \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*7 );    \
+    stbir__simdf8_0123to11111111( c, cs );                      \
+    stbir__simdf8_madd_mem( tot1, tot1, c, decode+(ofs)*7+7 );  \
+    stbir__simdf8_0123to22222222( c, cs );                      \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*7+14 ); \
+    stbir__simdf8_0123to33333333( c, cs );                      \
+    stbir__simdf8_madd_mem( tot1, tot1, c, decode+(ofs)*7+21 );
+
+#define stbir__1_coeff_remnant( ofs )                           \
+    STBIR_SIMD_NO_UNROLL(decode);                               \
+    stbir__simdf8_load1b( c, hc + (ofs) );                      \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*7 );
+
+#define stbir__2_coeff_remnant( ofs )                           \
+    STBIR_SIMD_NO_UNROLL(decode);                               \
+    stbir__simdf8_load1b( c, hc + (ofs) );                      \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*7 );    \
+    stbir__simdf8_load1b( c, hc + (ofs)+1 );                    \
+    stbir__simdf8_madd_mem( tot1, tot1, c, decode+(ofs)*7+7 );
+
+#define stbir__3_coeff_remnant( ofs )                           \
+    STBIR_SIMD_NO_UNROLL(decode);                               \
+    stbir__simdf8_load4b( cs, hc + (ofs) );                     \
+    stbir__simdf8_0123to00000000( c, cs );                      \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*7 );    \
+    stbir__simdf8_0123to11111111( c, cs );                      \
+    stbir__simdf8_madd_mem( tot1, tot1, c, decode+(ofs)*7+7 );  \
+    stbir__simdf8_0123to22222222( c, cs );                      \
+    stbir__simdf8_madd_mem( tot0, tot0, c, decode+(ofs)*7+14 );
+
+#define stbir__store_output()                     \
+    stbir__simdf8_add( tot0, tot0, tot1 );        \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 7;                                  \
+    if ( output < output_end )                    \
+    {                                             \
+      stbir__simdf8_store( output-7, tot0 );      \
+      continue;                                   \
+    }                                             \
+    stbir__simdf_store( output-7+3, stbir__simdf_swiz(stbir__simdf8_gettop4(tot0),0,0,1,2) ); \
+    stbir__simdf_store( output-7, stbir__if_simdf8_cast_to_simdf4(tot0) );           \
+    break;
+
+#else
+
+#define stbir__4_coeff_start()                    \
+    stbir__simdf tot0,tot1,tot2,tot3,c,cs;        \
+    STBIR_SIMD_NO_UNROLL(decode);                 \
+    stbir__simdf_load( cs, hc );                  \
+    stbir__simdf_0123to0000( c, cs );             \
+    stbir__simdf_mult_mem( tot0, c, decode );     \
+    stbir__simdf_mult_mem( tot1, c, decode+3 );   \
+    stbir__simdf_0123to1111( c, cs );             \
+    stbir__simdf_mult_mem( tot2, c, decode+7 );   \
+    stbir__simdf_mult_mem( tot3, c, decode+10 );  \
+    stbir__simdf_0123to2222( c, cs );             \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+14 );  \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+17 );  \
+    stbir__simdf_0123to3333( c, cs );                   \
+    stbir__simdf_madd_mem( tot2, tot2, c, decode+21 );  \
+    stbir__simdf_madd_mem( tot3, tot3, c, decode+24 );
+
+#define stbir__4_coeff_continue_from_4( ofs )                   \
+    STBIR_SIMD_NO_UNROLL(decode);                               \
+    stbir__simdf_load( cs, hc + (ofs) );                        \
+    stbir__simdf_0123to0000( c, cs );                           \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*7 );     \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*7+3 );   \
+    stbir__simdf_0123to1111( c, cs );                           \
+    stbir__simdf_madd_mem( tot2, tot2, c, decode+(ofs)*7+7 );   \
+    stbir__simdf_madd_mem( tot3, tot3, c, decode+(ofs)*7+10 );  \
+    stbir__simdf_0123to2222( c, cs );                           \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*7+14 );  \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*7+17 );  \
+    stbir__simdf_0123to3333( c, cs );                           \
+    stbir__simdf_madd_mem( tot2, tot2, c, decode+(ofs)*7+21 );  \
+    stbir__simdf_madd_mem( tot3, tot3, c, decode+(ofs)*7+24 );
+
+#define stbir__1_coeff_remnant( ofs )                           \
+    STBIR_SIMD_NO_UNROLL(decode);                               \
+    stbir__simdf_load1( c, hc + (ofs) );                        \
+    stbir__simdf_0123to0000( c, c );                            \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*7 );     \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*7+3 );   \
+
+#define stbir__2_coeff_remnant( ofs )                           \
+    STBIR_SIMD_NO_UNROLL(decode);                               \
+    stbir__simdf_load2( cs, hc + (ofs) );                       \
+    stbir__simdf_0123to0000( c, cs );                           \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*7 );     \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*7+3 );   \
+    stbir__simdf_0123to1111( c, cs );                           \
+    stbir__simdf_madd_mem( tot2, tot2, c, decode+(ofs)*7+7 );   \
+    stbir__simdf_madd_mem( tot3, tot3, c, decode+(ofs)*7+10 );
+
+#define stbir__3_coeff_remnant( ofs )                           \
+    STBIR_SIMD_NO_UNROLL(decode);                               \
+    stbir__simdf_load( cs, hc + (ofs) );                        \
+    stbir__simdf_0123to0000( c, cs );                           \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*7 );     \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*7+3 );   \
+    stbir__simdf_0123to1111( c, cs );                           \
+    stbir__simdf_madd_mem( tot2, tot2, c, decode+(ofs)*7+7 );   \
+    stbir__simdf_madd_mem( tot3, tot3, c, decode+(ofs)*7+10 );  \
+    stbir__simdf_0123to2222( c, cs );                           \
+    stbir__simdf_madd_mem( tot0, tot0, c, decode+(ofs)*7+14 );  \
+    stbir__simdf_madd_mem( tot1, tot1, c, decode+(ofs)*7+17 );
+
+#define stbir__store_output()                     \
+    stbir__simdf_add( tot0, tot0, tot2 );         \
+    stbir__simdf_add( tot1, tot1, tot3 );         \
+    stbir__simdf_store( output+3, tot1 );         \
+    stbir__simdf_store( output, tot0 );           \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 7;
+
+#endif
+
+#else
+
+#define stbir__1_coeff_only()        \
+    float tot0, tot1, tot2, tot3, tot4, tot5, tot6, c; \
+    c = hc[0];                       \
+    tot0 = decode[0]*c;              \
+    tot1 = decode[1]*c;              \
+    tot2 = decode[2]*c;              \
+    tot3 = decode[3]*c;              \
+    tot4 = decode[4]*c;              \
+    tot5 = decode[5]*c;              \
+    tot6 = decode[6]*c;
+
+#define stbir__2_coeff_only()        \
+    float tot0, tot1, tot2, tot3, tot4, tot5, tot6, c; \
+    c = hc[0];                       \
+    tot0 = decode[0]*c;              \
+    tot1 = decode[1]*c;              \
+    tot2 = decode[2]*c;              \
+    tot3 = decode[3]*c;              \
+    tot4 = decode[4]*c;              \
+    tot5 = decode[5]*c;              \
+    tot6 = decode[6]*c;              \
+    c = hc[1];                       \
+    tot0 += decode[7]*c;             \
+    tot1 += decode[8]*c;             \
+    tot2 += decode[9]*c;             \
+    tot3 += decode[10]*c;            \
+    tot4 += decode[11]*c;            \
+    tot5 += decode[12]*c;            \
+    tot6 += decode[13]*c;            \
+
+#define stbir__3_coeff_only()        \
+    float tot0, tot1, tot2, tot3, tot4, tot5, tot6, c; \
+    c = hc[0];                       \
+    tot0 = decode[0]*c;              \
+    tot1 = decode[1]*c;              \
+    tot2 = decode[2]*c;              \
+    tot3 = decode[3]*c;              \
+    tot4 = decode[4]*c;              \
+    tot5 = decode[5]*c;              \
+    tot6 = decode[6]*c;              \
+    c = hc[1];                       \
+    tot0 += decode[7]*c;             \
+    tot1 += decode[8]*c;             \
+    tot2 += decode[9]*c;             \
+    tot3 += decode[10]*c;            \
+    tot4 += decode[11]*c;            \
+    tot5 += decode[12]*c;            \
+    tot6 += decode[13]*c;            \
+    c = hc[2];                       \
+    tot0 += decode[14]*c;            \
+    tot1 += decode[15]*c;            \
+    tot2 += decode[16]*c;            \
+    tot3 += decode[17]*c;            \
+    tot4 += decode[18]*c;            \
+    tot5 += decode[19]*c;            \
+    tot6 += decode[20]*c;            \
+
+#define stbir__store_output_tiny()                \
+    output[0] = tot0;                             \
+    output[1] = tot1;                             \
+    output[2] = tot2;                             \
+    output[3] = tot3;                             \
+    output[4] = tot4;                             \
+    output[5] = tot5;                             \
+    output[6] = tot6;                             \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 7;
+
+#define stbir__4_coeff_start()    \
+    float x0,x1,x2,x3,x4,x5,x6,y0,y1,y2,y3,y4,y5,y6,c; \
+    STBIR_SIMD_NO_UNROLL(decode); \
+    c = hc[0];                    \
+    x0 = decode[0] * c;           \
+    x1 = decode[1] * c;           \
+    x2 = decode[2] * c;           \
+    x3 = decode[3] * c;           \
+    x4 = decode[4] * c;           \
+    x5 = decode[5] * c;           \
+    x6 = decode[6] * c;           \
+    c = hc[1];                    \
+    y0 = decode[7] * c;           \
+    y1 = decode[8] * c;           \
+    y2 = decode[9] * c;           \
+    y3 = decode[10] * c;          \
+    y4 = decode[11] * c;          \
+    y5 = decode[12] * c;          \
+    y6 = decode[13] * c;          \
+    c = hc[2];                    \
+    x0 += decode[14] * c;         \
+    x1 += decode[15] * c;         \
+    x2 += decode[16] * c;         \
+    x3 += decode[17] * c;         \
+    x4 += decode[18] * c;         \
+    x5 += decode[19] * c;         \
+    x6 += decode[20] * c;         \
+    c = hc[3];                    \
+    y0 += decode[21] * c;         \
+    y1 += decode[22] * c;         \
+    y2 += decode[23] * c;         \
+    y3 += decode[24] * c;         \
+    y4 += decode[25] * c;         \
+    y5 += decode[26] * c;         \
+    y6 += decode[27] * c;
+
+#define stbir__4_coeff_continue_from_4( ofs ) \
+    STBIR_SIMD_NO_UNROLL(decode);  \
+    c = hc[0+(ofs)];               \
+    x0 += decode[0+(ofs)*7] * c;   \
+    x1 += decode[1+(ofs)*7] * c;   \
+    x2 += decode[2+(ofs)*7] * c;   \
+    x3 += decode[3+(ofs)*7] * c;   \
+    x4 += decode[4+(ofs)*7] * c;   \
+    x5 += decode[5+(ofs)*7] * c;   \
+    x6 += decode[6+(ofs)*7] * c;   \
+    c = hc[1+(ofs)];               \
+    y0 += decode[7+(ofs)*7] * c;   \
+    y1 += decode[8+(ofs)*7] * c;   \
+    y2 += decode[9+(ofs)*7] * c;   \
+    y3 += decode[10+(ofs)*7] * c;  \
+    y4 += decode[11+(ofs)*7] * c;  \
+    y5 += decode[12+(ofs)*7] * c;  \
+    y6 += decode[13+(ofs)*7] * c;  \
+    c = hc[2+(ofs)];               \
+    x0 += decode[14+(ofs)*7] * c;  \
+    x1 += decode[15+(ofs)*7] * c;  \
+    x2 += decode[16+(ofs)*7] * c;  \
+    x3 += decode[17+(ofs)*7] * c;  \
+    x4 += decode[18+(ofs)*7] * c;  \
+    x5 += decode[19+(ofs)*7] * c;  \
+    x6 += decode[20+(ofs)*7] * c;  \
+    c = hc[3+(ofs)];               \
+    y0 += decode[21+(ofs)*7] * c;  \
+    y1 += decode[22+(ofs)*7] * c;  \
+    y2 += decode[23+(ofs)*7] * c;  \
+    y3 += decode[24+(ofs)*7] * c;  \
+    y4 += decode[25+(ofs)*7] * c;  \
+    y5 += decode[26+(ofs)*7] * c;  \
+    y6 += decode[27+(ofs)*7] * c;
+
+#define stbir__1_coeff_remnant( ofs ) \
+    STBIR_SIMD_NO_UNROLL(decode);  \
+    c = hc[0+(ofs)];               \
+    x0 += decode[0+(ofs)*7] * c;   \
+    x1 += decode[1+(ofs)*7] * c;   \
+    x2 += decode[2+(ofs)*7] * c;   \
+    x3 += decode[3+(ofs)*7] * c;   \
+    x4 += decode[4+(ofs)*7] * c;   \
+    x5 += decode[5+(ofs)*7] * c;   \
+    x6 += decode[6+(ofs)*7] * c;   \
+
+#define stbir__2_coeff_remnant( ofs ) \
+    STBIR_SIMD_NO_UNROLL(decode);  \
+    c = hc[0+(ofs)];               \
+    x0 += decode[0+(ofs)*7] * c;   \
+    x1 += decode[1+(ofs)*7] * c;   \
+    x2 += decode[2+(ofs)*7] * c;   \
+    x3 += decode[3+(ofs)*7] * c;   \
+    x4 += decode[4+(ofs)*7] * c;   \
+    x5 += decode[5+(ofs)*7] * c;   \
+    x6 += decode[6+(ofs)*7] * c;   \
+    c = hc[1+(ofs)];               \
+    y0 += decode[7+(ofs)*7] * c;   \
+    y1 += decode[8+(ofs)*7] * c;   \
+    y2 += decode[9+(ofs)*7] * c;   \
+    y3 += decode[10+(ofs)*7] * c;  \
+    y4 += decode[11+(ofs)*7] * c;  \
+    y5 += decode[12+(ofs)*7] * c;  \
+    y6 += decode[13+(ofs)*7] * c;  \
+
+#define stbir__3_coeff_remnant( ofs ) \
+    STBIR_SIMD_NO_UNROLL(decode);  \
+    c = hc[0+(ofs)];               \
+    x0 += decode[0+(ofs)*7] * c;   \
+    x1 += decode[1+(ofs)*7] * c;   \
+    x2 += decode[2+(ofs)*7] * c;   \
+    x3 += decode[3+(ofs)*7] * c;   \
+    x4 += decode[4+(ofs)*7] * c;   \
+    x5 += decode[5+(ofs)*7] * c;   \
+    x6 += decode[6+(ofs)*7] * c;   \
+    c = hc[1+(ofs)];               \
+    y0 += decode[7+(ofs)*7] * c;   \
+    y1 += decode[8+(ofs)*7] * c;   \
+    y2 += decode[9+(ofs)*7] * c;   \
+    y3 += decode[10+(ofs)*7] * c;  \
+    y4 += decode[11+(ofs)*7] * c;  \
+    y5 += decode[12+(ofs)*7] * c;  \
+    y6 += decode[13+(ofs)*7] * c;  \
+    c = hc[2+(ofs)];               \
+    x0 += decode[14+(ofs)*7] * c;  \
+    x1 += decode[15+(ofs)*7] * c;  \
+    x2 += decode[16+(ofs)*7] * c;  \
+    x3 += decode[17+(ofs)*7] * c;  \
+    x4 += decode[18+(ofs)*7] * c;  \
+    x5 += decode[19+(ofs)*7] * c;  \
+    x6 += decode[20+(ofs)*7] * c;  \
+
+#define stbir__store_output()                     \
+    output[0] = x0 + y0;                          \
+    output[1] = x1 + y1;                          \
+    output[2] = x2 + y2;                          \
+    output[3] = x3 + y3;                          \
+    output[4] = x4 + y4;                          \
+    output[5] = x5 + y5;                          \
+    output[6] = x6 + y6;                          \
+    horizontal_coefficients += coefficient_width; \
+    ++horizontal_contributors;                    \
+    output += 7;
+
+#endif
+
+#define STBIR__horizontal_channels 7
+#define STB_IMAGE_RESIZE_DO_HORIZONTALS
+#include STBIR__HEADER_FILENAME
+
+
+// include all of the vertical resamplers (both scatter and gather versions)
+
+#define STBIR__vertical_channels 1
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 1
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#define STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 2
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 2
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#define STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 3
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 3
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#define STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 4
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 4
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#define STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 5
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 5
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#define STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 6
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 6
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#define STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 7
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 7
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#define STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 8
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#include STBIR__HEADER_FILENAME
+
+#define STBIR__vertical_channels 8
+#define STB_IMAGE_RESIZE_DO_VERTICALS
+#define STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#include STBIR__HEADER_FILENAME
+
+typedef void STBIR_VERTICAL_GATHERFUNC( float * output, float const * coeffs, float const ** inputs, float const * input0_end );
+
+static STBIR_VERTICAL_GATHERFUNC * stbir__vertical_gathers[ 8 ] =
+{
+  stbir__vertical_gather_with_1_coeffs,stbir__vertical_gather_with_2_coeffs,stbir__vertical_gather_with_3_coeffs,stbir__vertical_gather_with_4_coeffs,stbir__vertical_gather_with_5_coeffs,stbir__vertical_gather_with_6_coeffs,stbir__vertical_gather_with_7_coeffs,stbir__vertical_gather_with_8_coeffs
+};
+
+static STBIR_VERTICAL_GATHERFUNC * stbir__vertical_gathers_continues[ 8 ] =
+{
+  stbir__vertical_gather_with_1_coeffs_cont,stbir__vertical_gather_with_2_coeffs_cont,stbir__vertical_gather_with_3_coeffs_cont,stbir__vertical_gather_with_4_coeffs_cont,stbir__vertical_gather_with_5_coeffs_cont,stbir__vertical_gather_with_6_coeffs_cont,stbir__vertical_gather_with_7_coeffs_cont,stbir__vertical_gather_with_8_coeffs_cont
+};
+
+typedef void STBIR_VERTICAL_SCATTERFUNC( float ** outputs, float const * coeffs, float const * input, float const * input_end );
+
+static STBIR_VERTICAL_SCATTERFUNC * stbir__vertical_scatter_sets[ 8 ] =
+{
+  stbir__vertical_scatter_with_1_coeffs,stbir__vertical_scatter_with_2_coeffs,stbir__vertical_scatter_with_3_coeffs,stbir__vertical_scatter_with_4_coeffs,stbir__vertical_scatter_with_5_coeffs,stbir__vertical_scatter_with_6_coeffs,stbir__vertical_scatter_with_7_coeffs,stbir__vertical_scatter_with_8_coeffs
+};
+
+static STBIR_VERTICAL_SCATTERFUNC * stbir__vertical_scatter_blends[ 8 ] =
+{
+  stbir__vertical_scatter_with_1_coeffs_cont,stbir__vertical_scatter_with_2_coeffs_cont,stbir__vertical_scatter_with_3_coeffs_cont,stbir__vertical_scatter_with_4_coeffs_cont,stbir__vertical_scatter_with_5_coeffs_cont,stbir__vertical_scatter_with_6_coeffs_cont,stbir__vertical_scatter_with_7_coeffs_cont,stbir__vertical_scatter_with_8_coeffs_cont
+};
+
+
+static void stbir__encode_scanline( stbir__info const * stbir_info, void *output_buffer_data, float * encode_buffer, int row  STBIR_ONLY_PROFILE_GET_SPLIT_INFO )
+{
+  int num_pixels = stbir_info->horizontal.scale_info.output_sub_size;
+  int channels = stbir_info->channels;
+  int width_times_channels = num_pixels * channels;
+  void * output_buffer;
+
+  // un-alpha weight if we need to
+  if ( stbir_info->alpha_unweight )
+  {
+    STBIR_PROFILE_START( unalpha );
+    stbir_info->alpha_unweight( encode_buffer, width_times_channels );
+    STBIR_PROFILE_END( unalpha );
+  }
+
+  // write directly into output by default
+  output_buffer = output_buffer_data;
+
+  // if we have an output callback, we first convert the decode buffer in place (and then hand that to the callback)
+  if ( stbir_info->out_pixels_cb )
+    output_buffer = encode_buffer;
+
+  STBIR_PROFILE_START( encode );
+  // convert into the output buffer
+  stbir_info->encode_pixels( output_buffer, width_times_channels, encode_buffer );
+  STBIR_PROFILE_END( encode );
+
+  // if we have an output callback, call it to send the data
+  if ( stbir_info->out_pixels_cb )
+    stbir_info->out_pixels_cb( output_buffer, num_pixels, row, stbir_info->user_data );
+}
+
+
+// Get the ring buffer pointer for an index
+static float* stbir__get_ring_buffer_entry(stbir__info const * stbir_info, stbir__per_split_info const * split_info, int index )
+{
+  STBIR_ASSERT( index < stbir_info->ring_buffer_num_entries );
+
+  #ifdef STBIR__SEPARATE_ALLOCATIONS
+    return split_info->ring_buffers[ index ];
+  #else
+    return (float*) ( ( (char*) split_info->ring_buffer ) + ( index * stbir_info->ring_buffer_length_bytes ) );
+  #endif
+}
+
+// Get the specified scan line from the ring buffer
+static float* stbir__get_ring_buffer_scanline(stbir__info const * stbir_info, stbir__per_split_info const * split_info, int get_scanline)
+{
+  int ring_buffer_index = (split_info->ring_buffer_begin_index + (get_scanline - split_info->ring_buffer_first_scanline)) % stbir_info->ring_buffer_num_entries;
+  return stbir__get_ring_buffer_entry( stbir_info, split_info, ring_buffer_index );
+}
+
+static void stbir__resample_horizontal_gather(stbir__info const * stbir_info, float* output_buffer, float const * input_buffer STBIR_ONLY_PROFILE_GET_SPLIT_INFO )
+{
+  float const * decode_buffer = input_buffer - ( stbir_info->scanline_extents.conservative.n0 * stbir_info->effective_channels );
+
+  STBIR_PROFILE_START( horizontal );
+  if ( ( stbir_info->horizontal.filter_enum == STBIR_FILTER_POINT_SAMPLE ) && ( stbir_info->horizontal.scale_info.scale == 1.0f ) )
+    STBIR_MEMCPY( output_buffer, input_buffer, stbir_info->horizontal.scale_info.output_sub_size * sizeof( float ) * stbir_info->effective_channels );
+  else
+    stbir_info->horizontal_gather_channels( output_buffer, stbir_info->horizontal.scale_info.output_sub_size, decode_buffer, stbir_info->horizontal.contributors, stbir_info->horizontal.coefficients, stbir_info->horizontal.coefficient_width );
+  STBIR_PROFILE_END( horizontal );
+}
+
+static void stbir__resample_vertical_gather(stbir__info const * stbir_info, stbir__per_split_info* split_info, int n, int contrib_n0, int contrib_n1, float const * vertical_coefficients )
+{
+  float* encode_buffer = split_info->vertical_buffer;
+  float* decode_buffer = split_info->decode_buffer;
+  int vertical_first = stbir_info->vertical_first;
+  int width = (vertical_first) ? ( stbir_info->scanline_extents.conservative.n1-stbir_info->scanline_extents.conservative.n0+1 ) : stbir_info->horizontal.scale_info.output_sub_size;
+  int width_times_channels = stbir_info->effective_channels * width;
+
+  STBIR_ASSERT( stbir_info->vertical.is_gather );
+
+  // loop over the contributing scanlines and scale into the buffer
+  STBIR_PROFILE_START( vertical );
+  {
+    int k = 0, total = contrib_n1 - contrib_n0 + 1;
+    STBIR_ASSERT( total > 0 );
+    do {
+      float const * inputs[8];
+      int i, cnt = total; if ( cnt > 8 ) cnt = 8;
+      for( i = 0 ; i < cnt ; i++ )
+        inputs[ i ] = stbir__get_ring_buffer_scanline(stbir_info, split_info, k+i+contrib_n0 );
+
+      // call the N scanlines at a time function (up to 8 scanlines of blending at once)
+      ((k==0)?stbir__vertical_gathers:stbir__vertical_gathers_continues)[cnt-1]( (vertical_first) ? decode_buffer : encode_buffer, vertical_coefficients + k, inputs, inputs[0] + width_times_channels );
+      k += cnt;
+      total -= cnt;
+    } while ( total );
+  }
+  STBIR_PROFILE_END( vertical );
+
+  if ( vertical_first )
+  {
+    // Now resample the gathered vertical data in the horizontal axis into the encode buffer
+    stbir__resample_horizontal_gather(stbir_info, encode_buffer, decode_buffer  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+  }
+
+  stbir__encode_scanline( stbir_info, ( (char *) stbir_info->output_data ) + ((size_t)n * (size_t)stbir_info->output_stride_bytes),
+                          encode_buffer, n  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+}
+
+static void stbir__decode_and_resample_for_vertical_gather_loop(stbir__info const * stbir_info, stbir__per_split_info* split_info, int n)
+{
+  int ring_buffer_index;
+  float* ring_buffer;
+
+  // Decode the nth scanline from the source image into the decode buffer.
+  stbir__decode_scanline( stbir_info, n, split_info->decode_buffer  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+
+  // update new end scanline
+  split_info->ring_buffer_last_scanline = n;
+
+  // get ring buffer
+  ring_buffer_index = (split_info->ring_buffer_begin_index + (split_info->ring_buffer_last_scanline - split_info->ring_buffer_first_scanline)) % stbir_info->ring_buffer_num_entries;
+  ring_buffer = stbir__get_ring_buffer_entry(stbir_info, split_info, ring_buffer_index);
+
+  // Now resample it into the ring buffer.
+  stbir__resample_horizontal_gather( stbir_info, ring_buffer, split_info->decode_buffer  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+
+  // Now it's sitting in the ring buffer ready to be used as source for the vertical sampling.
+}
+
+static void stbir__vertical_gather_loop( stbir__info const * stbir_info, stbir__per_split_info* split_info, int split_count )
+{
+  int y, start_output_y, end_output_y;
+  stbir__contributors* vertical_contributors = stbir_info->vertical.contributors;
+  float const * vertical_coefficients = stbir_info->vertical.coefficients;
+
+  STBIR_ASSERT( stbir_info->vertical.is_gather );
+
+  start_output_y = split_info->start_output_y;
+  end_output_y = split_info[split_count-1].end_output_y;
+
+  vertical_contributors += start_output_y;
+  vertical_coefficients += start_output_y * stbir_info->vertical.coefficient_width;
+
+  // initialize the ring buffer for gathering
+  split_info->ring_buffer_begin_index = 0;
+  split_info->ring_buffer_first_scanline = vertical_contributors->n0;
+  split_info->ring_buffer_last_scanline = split_info->ring_buffer_first_scanline - 1; // means "empty"
+
+  for (y = start_output_y; y < end_output_y; y++)
+  {
+    int in_first_scanline, in_last_scanline;
+
+    in_first_scanline = vertical_contributors->n0;
+    in_last_scanline = vertical_contributors->n1;
+
+    // make sure the indexing hasn't broken
+    STBIR_ASSERT( in_first_scanline >= split_info->ring_buffer_first_scanline );
+
+    // Load in new scanlines
+    while (in_last_scanline > split_info->ring_buffer_last_scanline)
+    {
+      STBIR_ASSERT( ( split_info->ring_buffer_last_scanline - split_info->ring_buffer_first_scanline + 1 ) <= stbir_info->ring_buffer_num_entries );
+
+      // make sure there was room in the ring buffer when we add new scanlines
+      if ( ( split_info->ring_buffer_last_scanline - split_info->ring_buffer_first_scanline + 1 ) == stbir_info->ring_buffer_num_entries )
+      {
+        split_info->ring_buffer_first_scanline++;
+        split_info->ring_buffer_begin_index++;
+      }
+
+      if ( stbir_info->vertical_first )
+      {
+        float * ring_buffer = stbir__get_ring_buffer_scanline( stbir_info, split_info, ++split_info->ring_buffer_last_scanline );
+        // Decode the nth scanline from the source image into the decode buffer.
+        stbir__decode_scanline( stbir_info, split_info->ring_buffer_last_scanline, ring_buffer  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+      }
+      else
+      {
+        stbir__decode_and_resample_for_vertical_gather_loop(stbir_info, split_info, split_info->ring_buffer_last_scanline + 1);
+      }
+    }
+
+    // Now all buffers should be ready to write a row of vertical sampling, so do it.
+    stbir__resample_vertical_gather(stbir_info, split_info, y, in_first_scanline, in_last_scanline, vertical_coefficients );
+
+    ++vertical_contributors;
+    vertical_coefficients += stbir_info->vertical.coefficient_width;
+  }
+}
+
+#define STBIR__FLOAT_EMPTY_MARKER 3.0e+38F
+#define STBIR__FLOAT_BUFFER_IS_EMPTY(ptr) ((ptr)[0]==STBIR__FLOAT_EMPTY_MARKER)
+
+static void stbir__encode_first_scanline_from_scatter(stbir__info const * stbir_info, stbir__per_split_info* split_info)
+{
+  // evict a scanline out into the output buffer
+  float* ring_buffer_entry = stbir__get_ring_buffer_entry(stbir_info, split_info, split_info->ring_buffer_begin_index );
+
+  // dump the scanline out
+  stbir__encode_scanline( stbir_info, ( (char *)stbir_info->output_data ) + ( (size_t)split_info->ring_buffer_first_scanline * (size_t)stbir_info->output_stride_bytes ), ring_buffer_entry, split_info->ring_buffer_first_scanline  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+
+  // mark it as empty
+  ring_buffer_entry[ 0 ] = STBIR__FLOAT_EMPTY_MARKER;
+
+  // advance the first scanline
+  split_info->ring_buffer_first_scanline++;
+  if ( ++split_info->ring_buffer_begin_index == stbir_info->ring_buffer_num_entries )
+    split_info->ring_buffer_begin_index = 0;
+}
+
+static void stbir__horizontal_resample_and_encode_first_scanline_from_scatter(stbir__info const * stbir_info, stbir__per_split_info* split_info)
+{
+  // evict a scanline out into the output buffer
+
+  float* ring_buffer_entry = stbir__get_ring_buffer_entry(stbir_info, split_info, split_info->ring_buffer_begin_index );
+
+  // Now resample it into the buffer.
+  stbir__resample_horizontal_gather( stbir_info, split_info->vertical_buffer, ring_buffer_entry  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+
+  // dump the scanline out
+  stbir__encode_scanline( stbir_info, ( (char *)stbir_info->output_data ) + ( (size_t)split_info->ring_buffer_first_scanline * (size_t)stbir_info->output_stride_bytes ), split_info->vertical_buffer, split_info->ring_buffer_first_scanline  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+
+  // mark it as empty
+  ring_buffer_entry[ 0 ] = STBIR__FLOAT_EMPTY_MARKER;
+
+  // advance the first scanline
+  split_info->ring_buffer_first_scanline++;
+  if ( ++split_info->ring_buffer_begin_index == stbir_info->ring_buffer_num_entries )
+    split_info->ring_buffer_begin_index = 0;
+}
+
+static void stbir__resample_vertical_scatter(stbir__info const * stbir_info, stbir__per_split_info* split_info, int n0, int n1, float const * vertical_coefficients, float const * vertical_buffer, float const * vertical_buffer_end )
+{
+  STBIR_ASSERT( !stbir_info->vertical.is_gather );
+
+  STBIR_PROFILE_START( vertical );
+  {
+    int k = 0, total = n1 - n0 + 1;
+    STBIR_ASSERT( total > 0 );
+    do {
+      float * outputs[8];
+      int i, n = total; if ( n > 8 ) n = 8;
+      for( i = 0 ; i < n ; i++ )
+      {
+        outputs[ i ] = stbir__get_ring_buffer_scanline(stbir_info, split_info, k+i+n0 );
+        if ( ( i ) && ( STBIR__FLOAT_BUFFER_IS_EMPTY( outputs[i] ) != STBIR__FLOAT_BUFFER_IS_EMPTY( outputs[0] ) ) ) // make sure runs are of the same type
+        {
+          n = i;
+          break;
+        }
+      }
+      // call the scatter to N scanlines at a time function (up to 8 scanlines of scattering at once)
+      ((STBIR__FLOAT_BUFFER_IS_EMPTY( outputs[0] ))?stbir__vertical_scatter_sets:stbir__vertical_scatter_blends)[n-1]( outputs, vertical_coefficients + k, vertical_buffer, vertical_buffer_end );
+      k += n;
+      total -= n;
+    } while ( total );
+  }
+
+  STBIR_PROFILE_END( vertical );
+}
+
+typedef void stbir__handle_scanline_for_scatter_func(stbir__info const * stbir_info, stbir__per_split_info* split_info);
+
+static void stbir__vertical_scatter_loop( stbir__info const * stbir_info, stbir__per_split_info* split_info, int split_count )
+{
+  int y, start_output_y, end_output_y, start_input_y, end_input_y;
+  stbir__contributors* vertical_contributors = stbir_info->vertical.contributors;
+  float const * vertical_coefficients = stbir_info->vertical.coefficients;
+  stbir__handle_scanline_for_scatter_func * handle_scanline_for_scatter;
+  void * scanline_scatter_buffer;
+  void * scanline_scatter_buffer_end;
+  int on_first_input_y, last_input_y;
+
+  STBIR_ASSERT( !stbir_info->vertical.is_gather );
+
+  start_output_y = split_info->start_output_y;
+  end_output_y = split_info[split_count-1].end_output_y;  // may do multiple split counts
+
+  start_input_y = split_info->start_input_y;
+  end_input_y = split_info[split_count-1].end_input_y;
+
+  // adjust for starting offset start_input_y
+  y = start_input_y + stbir_info->vertical.filter_pixel_margin;
+  vertical_contributors += y ;
+  vertical_coefficients += stbir_info->vertical.coefficient_width * y;
+
+  if ( stbir_info->vertical_first )
+  {
+    handle_scanline_for_scatter = stbir__horizontal_resample_and_encode_first_scanline_from_scatter;
+    scanline_scatter_buffer = split_info->decode_buffer;
+    scanline_scatter_buffer_end = ( (char*) scanline_scatter_buffer ) + sizeof( float ) * stbir_info->effective_channels * (stbir_info->scanline_extents.conservative.n1-stbir_info->scanline_extents.conservative.n0+1);
+  }
+  else
+  {
+    handle_scanline_for_scatter = stbir__encode_first_scanline_from_scatter;
+    scanline_scatter_buffer = split_info->vertical_buffer;
+    scanline_scatter_buffer_end = ( (char*) scanline_scatter_buffer ) + sizeof( float ) * stbir_info->effective_channels * stbir_info->horizontal.scale_info.output_sub_size;
+  }
+
+  // initialize the ring buffer for scattering
+  split_info->ring_buffer_first_scanline = start_output_y;
+  split_info->ring_buffer_last_scanline = -1;
+  split_info->ring_buffer_begin_index = -1;
+
+  // mark all the buffers as empty to start
+  for( y = 0 ; y < stbir_info->ring_buffer_num_entries ; y++ )
+    stbir__get_ring_buffer_entry( stbir_info, split_info, y )[0] = STBIR__FLOAT_EMPTY_MARKER; // only used on scatter
+
+  // do the loop in input space
+  on_first_input_y = 1; last_input_y = start_input_y;
+  for (y = start_input_y ; y < end_input_y; y++)
+  {
+    int out_first_scanline, out_last_scanline;
+
+    out_first_scanline = vertical_contributors->n0;
+    out_last_scanline = vertical_contributors->n1;
+
+    STBIR_ASSERT(out_last_scanline - out_first_scanline + 1 <= stbir_info->ring_buffer_num_entries);
+
+    if ( ( out_last_scanline >= out_first_scanline ) && ( ( ( out_first_scanline >= start_output_y ) && ( out_first_scanline < end_output_y ) ) || ( ( out_last_scanline >= start_output_y ) && ( out_last_scanline < end_output_y ) ) ) )
+    {
+      float const * vc = vertical_coefficients;
+
+      // keep track of the range actually seen for the next resize
+      last_input_y = y;
+      if ( ( on_first_input_y ) && ( y > start_input_y ) )
+        split_info->start_input_y = y;
+      on_first_input_y = 0;
+
+      // clip the region
+      if ( out_first_scanline < start_output_y )
+      {
+        vc += start_output_y - out_first_scanline;
+        out_first_scanline = start_output_y;
+      }
+
+      if ( out_last_scanline >= end_output_y )
+        out_last_scanline = end_output_y - 1;
+
+      // if very first scanline, init the index
+      if (split_info->ring_buffer_begin_index < 0)
+        split_info->ring_buffer_begin_index = out_first_scanline - start_output_y;
+
+      STBIR_ASSERT( split_info->ring_buffer_begin_index <= out_first_scanline );
+
+      // Decode the nth scanline from the source image into the decode buffer.
+      stbir__decode_scanline( stbir_info, y, split_info->decode_buffer  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+
+      // When horizontal first, we resample horizontally into the vertical buffer before we scatter it out
+      if ( !stbir_info->vertical_first )
+        stbir__resample_horizontal_gather( stbir_info, split_info->vertical_buffer, split_info->decode_buffer  STBIR_ONLY_PROFILE_SET_SPLIT_INFO );
+
+      // Now it's sitting in the buffer ready to be distributed into the ring buffers.
+
+      // evict from the ringbuffer, if we need are full
+      if ( ( ( split_info->ring_buffer_last_scanline - split_info->ring_buffer_first_scanline + 1 ) == stbir_info->ring_buffer_num_entries ) &&
+           ( out_last_scanline > split_info->ring_buffer_last_scanline ) )
+        handle_scanline_for_scatter( stbir_info, split_info );
+
+      // Now the horizontal buffer is ready to write to all ring buffer rows, so do it.
+      stbir__resample_vertical_scatter(stbir_info, split_info, out_first_scanline, out_last_scanline, vc, (float*)scanline_scatter_buffer, (float*)scanline_scatter_buffer_end );
+
+      // update the end of the buffer
+      if ( out_last_scanline > split_info->ring_buffer_last_scanline )
+        split_info->ring_buffer_last_scanline = out_last_scanline;
+    }
+    ++vertical_contributors;
+    vertical_coefficients += stbir_info->vertical.coefficient_width;
+  }
+
+  // now evict the scanlines that are left over in the ring buffer
+  while ( split_info->ring_buffer_first_scanline < end_output_y )
+    handle_scanline_for_scatter(stbir_info, split_info);
+
+  // update the end_input_y if we do multiple resizes with the same data
+  ++last_input_y;
+  for( y = 0 ; y < split_count; y++ )
+    if ( split_info[y].end_input_y > last_input_y )
+      split_info[y].end_input_y = last_input_y;
+}
+
+
+static stbir__kernel_callback * stbir__builtin_kernels[] =   { 0, stbir__filter_trapezoid,  stbir__filter_triangle, stbir__filter_cubic, stbir__filter_catmullrom, stbir__filter_mitchell, stbir__filter_point };
+static stbir__support_callback * stbir__builtin_supports[] = { 0, stbir__support_trapezoid, stbir__support_one,     stbir__support_two,  stbir__support_two,       stbir__support_two,     stbir__support_zeropoint5 };
+
+static void stbir__set_sampler(stbir__sampler * samp, stbir_filter filter, stbir__kernel_callback * kernel, stbir__support_callback * support, stbir_edge edge, stbir__scale_info * scale_info, int always_gather, void * user_data )
+{
+  // set filter
+  if (filter == 0)
+  {
+    filter = STBIR_DEFAULT_FILTER_DOWNSAMPLE; // default to downsample
+    if (scale_info->scale >= ( 1.0f - stbir__small_float ) )
+    {
+      if ( (scale_info->scale <= ( 1.0f + stbir__small_float ) ) && ( STBIR_CEILF(scale_info->pixel_shift) == scale_info->pixel_shift ) )
+        filter = STBIR_FILTER_POINT_SAMPLE;
+      else
+        filter = STBIR_DEFAULT_FILTER_UPSAMPLE;
+    }
+  }
+  samp->filter_enum = filter;
+
+  STBIR_ASSERT(samp->filter_enum != 0);
+  STBIR_ASSERT((unsigned)samp->filter_enum < STBIR_FILTER_OTHER);
+  samp->filter_kernel = stbir__builtin_kernels[ filter ];
+  samp->filter_support = stbir__builtin_supports[ filter ];
+
+  if ( kernel && support )
+  {
+    samp->filter_kernel = kernel;
+    samp->filter_support = support;
+    samp->filter_enum = STBIR_FILTER_OTHER;
+  }
+
+  samp->edge = edge;
+  samp->filter_pixel_width  = stbir__get_filter_pixel_width (samp->filter_support, scale_info->scale, user_data );
+  // Gather is always better, but in extreme downsamples, you have to most or all of the data in memory
+  //    For horizontal, we always have all the pixels, so we always use gather here (always_gather==1).
+  //    For vertical, we use gather if scaling up (which means we will have samp->filter_pixel_width
+  //    scanlines in memory at once).
+  samp->is_gather = 0;
+  if ( scale_info->scale >= ( 1.0f - stbir__small_float ) )
+    samp->is_gather = 1;
+  else if ( ( always_gather ) || ( samp->filter_pixel_width <= STBIR_FORCE_GATHER_FILTER_SCANLINES_AMOUNT ) )
+    samp->is_gather = 2;
+
+  // pre calculate stuff based on the above
+  samp->coefficient_width = stbir__get_coefficient_width(samp, samp->is_gather, user_data);
+
+  // filter_pixel_width is the conservative size in pixels of input that affect an output pixel.
+  //   In rare cases (only with 2 pix to 1 pix with the default filters), it's possible that the 
+  //   filter will extend before or after the scanline beyond just one extra entire copy of the 
+  //   scanline (we would hit the edge twice). We don't let you do that, so we clamp the total 
+  //   width to 3x the total of input pixel (once for the scanline, once for the left side 
+  //   overhang, and once for the right side). We only do this for edge mode, since the other 
+  //   modes can just re-edge clamp back in again.
+  if ( edge == STBIR_EDGE_WRAP )
+    if ( samp->filter_pixel_width > ( scale_info->input_full_size * 3 ) )
+      samp->filter_pixel_width = scale_info->input_full_size * 3;
+
+  // This is how much to expand buffers to account for filters seeking outside
+  // the image boundaries.
+  samp->filter_pixel_margin = samp->filter_pixel_width / 2;
+  
+  // filter_pixel_margin is the amount that this filter can overhang on just one side of either 
+  //   end of the scanline (left or the right). Since we only allow you to overhang 1 scanline's 
+  //   worth of pixels, we clamp this one side of overhang to the input scanline size. Again, 
+  //   this clamping only happens in rare cases with the default filters (2 pix to 1 pix). 
+  if ( edge == STBIR_EDGE_WRAP )
+    if ( samp->filter_pixel_margin > scale_info->input_full_size )
+      samp->filter_pixel_margin = scale_info->input_full_size;
+
+  samp->num_contributors = stbir__get_contributors(samp, samp->is_gather);
+
+  samp->contributors_size = samp->num_contributors * sizeof(stbir__contributors);
+  samp->coefficients_size = samp->num_contributors * samp->coefficient_width * sizeof(float) + sizeof(float); // extra sizeof(float) is padding
+
+  samp->gather_prescatter_contributors = 0;
+  samp->gather_prescatter_coefficients = 0;
+  if ( samp->is_gather == 0 )
+  {
+    samp->gather_prescatter_coefficient_width = samp->filter_pixel_width;
+    samp->gather_prescatter_num_contributors  = stbir__get_contributors(samp, 2);
+    samp->gather_prescatter_contributors_size = samp->gather_prescatter_num_contributors * sizeof(stbir__contributors);
+    samp->gather_prescatter_coefficients_size = samp->gather_prescatter_num_contributors * samp->gather_prescatter_coefficient_width * sizeof(float);
+  }
+}
+
+static void stbir__get_conservative_extents( stbir__sampler * samp, stbir__contributors * range, void * user_data )
+{
+  float scale = samp->scale_info.scale;
+  float out_shift = samp->scale_info.pixel_shift;
+  stbir__support_callback * support = samp->filter_support;
+  int input_full_size = samp->scale_info.input_full_size;
+  stbir_edge edge = samp->edge;
+  float inv_scale = samp->scale_info.inv_scale;
+
+  STBIR_ASSERT( samp->is_gather != 0 );
+
+  if ( samp->is_gather == 1 )
+  {
+    int in_first_pixel, in_last_pixel;
+    float out_filter_radius = support(inv_scale, user_data) * scale;
+
+    stbir__calculate_in_pixel_range( &in_first_pixel, &in_last_pixel, 0.5, out_filter_radius, inv_scale, out_shift, input_full_size, edge );
+    range->n0 = in_first_pixel;
+    stbir__calculate_in_pixel_range( &in_first_pixel, &in_last_pixel, ( (float)(samp->scale_info.output_sub_size-1) ) + 0.5f, out_filter_radius, inv_scale, out_shift, input_full_size, edge );
+    range->n1 = in_last_pixel;
+  }
+  else if ( samp->is_gather == 2 ) // downsample gather, refine
+  {
+    float in_pixels_radius = support(scale, user_data) * inv_scale;
+    int filter_pixel_margin = samp->filter_pixel_margin;
+    int output_sub_size = samp->scale_info.output_sub_size;
+    int input_end;
+    int n;
+    int in_first_pixel, in_last_pixel;
+
+    // get a conservative area of the input range
+    stbir__calculate_in_pixel_range( &in_first_pixel, &in_last_pixel, 0, 0, inv_scale, out_shift, input_full_size, edge );
+    range->n0 = in_first_pixel;
+    stbir__calculate_in_pixel_range( &in_first_pixel, &in_last_pixel, (float)output_sub_size, 0, inv_scale, out_shift, input_full_size, edge );
+    range->n1 = in_last_pixel;
+
+    // now go through the margin to the start of area to find bottom
+    n = range->n0 + 1;
+    input_end = -filter_pixel_margin;
+    while( n >= input_end )
+    {
+      int out_first_pixel, out_last_pixel;
+      stbir__calculate_out_pixel_range( &out_first_pixel, &out_last_pixel, ((float)n)+0.5f, in_pixels_radius, scale, out_shift, output_sub_size );
+      if ( out_first_pixel > out_last_pixel )
+        break;
+
+      if ( ( out_first_pixel < output_sub_size ) || ( out_last_pixel >= 0 ) )
+        range->n0 = n;
+      --n;
+    }
+
+    // now go through the end of the area through the margin to find top
+    n = range->n1 - 1;
+    input_end = n + 1 + filter_pixel_margin;
+    while( n <= input_end )
+    {
+      int out_first_pixel, out_last_pixel;
+      stbir__calculate_out_pixel_range( &out_first_pixel, &out_last_pixel, ((float)n)+0.5f, in_pixels_radius, scale, out_shift, output_sub_size );
+      if ( out_first_pixel > out_last_pixel )
+        break;
+      if ( ( out_first_pixel < output_sub_size ) || ( out_last_pixel >= 0 ) )
+        range->n1 = n;
+      ++n;
+    }
+  }
+
+  if ( samp->edge == STBIR_EDGE_WRAP )
+  {
+    // if we are wrapping, and we are very close to the image size (so the edges might merge), just use the scanline up to the edge
+    if ( ( range->n0 > 0 ) && ( range->n1 >= input_full_size ) )
+    {
+      int marg = range->n1 - input_full_size + 1;
+      if ( ( marg + STBIR__MERGE_RUNS_PIXEL_THRESHOLD ) >= range->n0 )
+        range->n0 = 0;
+    }
+    if ( ( range->n0 < 0 ) && ( range->n1 < (input_full_size-1) ) )
+    {
+      int marg = -range->n0;
+      if ( ( input_full_size - marg - STBIR__MERGE_RUNS_PIXEL_THRESHOLD - 1 ) <= range->n1 )
+        range->n1 = input_full_size - 1;
+    }
+  }
+  else
+  {
+    // for non-edge-wrap modes, we never read over the edge, so clamp
+    if ( range->n0 < 0 )
+      range->n0 = 0;
+    if ( range->n1 >= input_full_size )
+      range->n1 = input_full_size - 1;
+  }
+}
+
+static void stbir__get_split_info( stbir__per_split_info* split_info, int splits, int output_height, int vertical_pixel_margin, int input_full_height )
+{
+  int i, cur;
+  int left = output_height;
+
+  cur = 0;
+  for( i = 0 ; i < splits ; i++ )
+  {
+    int each;
+    split_info[i].start_output_y = cur;
+    each = left / ( splits - i );
+    split_info[i].end_output_y = cur + each;
+    cur += each;
+    left -= each;
+
+    // scatter range (updated to minimum as you run it)
+    split_info[i].start_input_y = -vertical_pixel_margin;
+    split_info[i].end_input_y = input_full_height + vertical_pixel_margin;
+  }
+}
+
+static void stbir__free_internal_mem( stbir__info *info )
+{
+  #define STBIR__FREE_AND_CLEAR( ptr ) { if ( ptr ) { void * p = (ptr); (ptr) = 0; STBIR_FREE( p, info->user_data); } }
+
+  if ( info )
+  {
+  #ifndef STBIR__SEPARATE_ALLOCATIONS
+    STBIR__FREE_AND_CLEAR( info->alloced_mem );
+  #else
+    int i,j;
+
+    if ( ( info->vertical.gather_prescatter_contributors ) && ( (void*)info->vertical.gather_prescatter_contributors != (void*)info->split_info[0].decode_buffer ) )
+    {
+      STBIR__FREE_AND_CLEAR( info->vertical.gather_prescatter_coefficients );
+      STBIR__FREE_AND_CLEAR( info->vertical.gather_prescatter_contributors );
+    }
+    for( i = 0 ; i < info->splits ; i++ )
+    {
+      for( j = 0 ; j < info->alloc_ring_buffer_num_entries ; j++ )
+      {
+        #ifdef STBIR_SIMD8
+        if ( info->effective_channels == 3 )
+          --info->split_info[i].ring_buffers[j]; // avx in 3 channel mode needs one float at the start of the buffer
+        #endif
+        STBIR__FREE_AND_CLEAR( info->split_info[i].ring_buffers[j] );
+      }
+
+      #ifdef STBIR_SIMD8
+      if ( info->effective_channels == 3 )
+        --info->split_info[i].decode_buffer; // avx in 3 channel mode needs one float at the start of the buffer
+      #endif
+      STBIR__FREE_AND_CLEAR( info->split_info[i].decode_buffer );
+      STBIR__FREE_AND_CLEAR( info->split_info[i].ring_buffers );
+      STBIR__FREE_AND_CLEAR( info->split_info[i].vertical_buffer );
+    }
+    STBIR__FREE_AND_CLEAR( info->split_info );
+    if ( info->vertical.coefficients != info->horizontal.coefficients )
+    {
+      STBIR__FREE_AND_CLEAR( info->vertical.coefficients );
+      STBIR__FREE_AND_CLEAR( info->vertical.contributors );
+    }
+    STBIR__FREE_AND_CLEAR( info->horizontal.coefficients );
+    STBIR__FREE_AND_CLEAR( info->horizontal.contributors );
+    STBIR__FREE_AND_CLEAR( info->alloced_mem );
+    STBIR__FREE_AND_CLEAR( info );
+  #endif
+  }
+
+  #undef STBIR__FREE_AND_CLEAR
+}
+
+static int stbir__get_max_split( int splits, int height )
+{
+  int i;
+  int max = 0;
+
+  for( i = 0 ; i < splits ; i++ )
+  {
+    int each = height / ( splits - i );
+    if ( each > max )
+      max = each;
+    height -= each;
+  }
+  return max;
+}
+
+static stbir__horizontal_gather_channels_func ** stbir__horizontal_gather_n_coeffs_funcs[8] =
+{
+  0, stbir__horizontal_gather_1_channels_with_n_coeffs_funcs, stbir__horizontal_gather_2_channels_with_n_coeffs_funcs, stbir__horizontal_gather_3_channels_with_n_coeffs_funcs, stbir__horizontal_gather_4_channels_with_n_coeffs_funcs, 0,0, stbir__horizontal_gather_7_channels_with_n_coeffs_funcs
+};
+
+static stbir__horizontal_gather_channels_func ** stbir__horizontal_gather_channels_funcs[8] =
+{
+  0, stbir__horizontal_gather_1_channels_funcs, stbir__horizontal_gather_2_channels_funcs, stbir__horizontal_gather_3_channels_funcs, stbir__horizontal_gather_4_channels_funcs, 0,0, stbir__horizontal_gather_7_channels_funcs
+};
+
+// there are six resize classifications: 0 == vertical scatter, 1 == vertical gather < 1x scale, 2 == vertical gather 1x-2x scale, 4 == vertical gather < 3x scale, 4 == vertical gather > 3x scale, 5 == <=4 pixel height, 6 == <=4 pixel wide column
+#define STBIR_RESIZE_CLASSIFICATIONS 8
+
+static float stbir__compute_weights[5][STBIR_RESIZE_CLASSIFICATIONS][4]=  // 5 = 0=1chan, 1=2chan, 2=3chan, 3=4chan, 4=7chan
+{
+  {
+    { 1.00000f, 1.00000f, 0.31250f, 1.00000f },
+    { 0.56250f, 0.59375f, 0.00000f, 0.96875f },
+    { 1.00000f, 0.06250f, 0.00000f, 1.00000f },
+    { 0.00000f, 0.09375f, 1.00000f, 1.00000f },
+    { 1.00000f, 1.00000f, 1.00000f, 1.00000f },
+    { 0.03125f, 0.12500f, 1.00000f, 1.00000f },
+    { 0.06250f, 0.12500f, 0.00000f, 1.00000f },
+    { 0.00000f, 1.00000f, 0.00000f, 0.03125f },
+  }, {
+    { 0.00000f, 0.84375f, 0.00000f, 0.03125f },
+    { 0.09375f, 0.93750f, 0.00000f, 0.78125f },
+    { 0.87500f, 0.21875f, 0.00000f, 0.96875f },
+    { 0.09375f, 0.09375f, 1.00000f, 1.00000f },
+    { 1.00000f, 1.00000f, 1.00000f, 1.00000f },
+    { 0.03125f, 0.12500f, 1.00000f, 1.00000f },
+    { 0.06250f, 0.12500f, 0.00000f, 1.00000f },
+    { 0.00000f, 1.00000f, 0.00000f, 0.53125f },
+  }, {
+    { 0.00000f, 0.53125f, 0.00000f, 0.03125f },
+    { 0.06250f, 0.96875f, 0.00000f, 0.53125f },
+    { 0.87500f, 0.18750f, 0.00000f, 0.93750f },
+    { 0.00000f, 0.09375f, 1.00000f, 1.00000f },
+    { 1.00000f, 1.00000f, 1.00000f, 1.00000f },
+    { 0.03125f, 0.12500f, 1.00000f, 1.00000f },
+    { 0.06250f, 0.12500f, 0.00000f, 1.00000f },
+    { 0.00000f, 1.00000f, 0.00000f, 0.56250f },
+  }, {
+    { 0.00000f, 0.50000f, 0.00000f, 0.71875f },
+    { 0.06250f, 0.84375f, 0.00000f, 0.87500f },
+    { 1.00000f, 0.50000f, 0.50000f, 0.96875f },
+    { 1.00000f, 0.09375f, 0.31250f, 0.50000f },
+    { 1.00000f, 1.00000f, 1.00000f, 1.00000f },
+    { 1.00000f, 0.03125f, 0.03125f, 0.53125f },
+    { 0.18750f, 0.12500f, 0.00000f, 1.00000f },
+    { 0.00000f, 1.00000f, 0.03125f, 0.18750f },
+  }, {
+    { 0.00000f, 0.59375f, 0.00000f, 0.96875f },
+    { 0.06250f, 0.81250f, 0.06250f, 0.59375f },
+    { 0.75000f, 0.43750f, 0.12500f, 0.96875f },
+    { 0.87500f, 0.06250f, 0.18750f, 0.43750f },
+    { 1.00000f, 1.00000f, 1.00000f, 1.00000f },
+    { 0.15625f, 0.12500f, 1.00000f, 1.00000f },
+    { 0.06250f, 0.12500f, 0.00000f, 1.00000f },
+    { 0.00000f, 1.00000f, 0.03125f, 0.34375f },
+  }
+};
+
+// structure that allow us to query and override info for training the costs
+typedef struct STBIR__V_FIRST_INFO
+{
+  double v_cost, h_cost;
+  int control_v_first; // 0 = no control, 1 = force hori, 2 = force vert
+  int v_first;
+  int v_resize_classification;
+  int is_gather;
+} STBIR__V_FIRST_INFO;
+
+#ifdef STBIR__V_FIRST_INFO_BUFFER
+static STBIR__V_FIRST_INFO STBIR__V_FIRST_INFO_BUFFER = {0};
+#define STBIR__V_FIRST_INFO_POINTER &STBIR__V_FIRST_INFO_BUFFER
+#else
+#define STBIR__V_FIRST_INFO_POINTER 0
+#endif
+
+// Figure out whether to scale along the horizontal or vertical first.
+//   This only *super* important when you are scaling by a massively
+//   different amount in the vertical vs the horizontal (for example, if
+//   you are scaling by 2x in the width, and 0.5x in the height, then you
+//   want to do the vertical scale first, because it's around 3x faster
+//   in that order.
+//
+//   In more normal circumstances, this makes a 20-40% differences, so
+//     it's good to get right, but not critical. The normal way that you
+//     decide which direction goes first is just figuring out which
+//     direction does more multiplies. But with modern CPUs with their
+//     fancy caches and SIMD and high IPC abilities, so there's just a lot
+//     more that goes into it.
+//
+//   My handwavy sort of solution is to have an app that does a whole
+//     bunch of timing for both vertical and horizontal first modes,
+//     and then another app that can read lots of these timing files
+//     and try to search for the best weights to use. Dotimings.c
+//     is the app that does a bunch of timings, and vf_train.c is the
+//     app that solves for the best weights (and shows how well it
+//     does currently).
+
+static int stbir__should_do_vertical_first( float weights_table[STBIR_RESIZE_CLASSIFICATIONS][4], int horizontal_filter_pixel_width, float horizontal_scale, int horizontal_output_size, int vertical_filter_pixel_width, float vertical_scale, int vertical_output_size, int is_gather, STBIR__V_FIRST_INFO * info )
+{
+  double v_cost, h_cost;
+  float * weights;
+  int vertical_first;
+  int v_classification;
+
+  // categorize the resize into buckets
+  if ( ( vertical_output_size <= 4 ) || ( horizontal_output_size <= 4 ) )
+    v_classification = ( vertical_output_size < horizontal_output_size ) ? 6 : 7;
+  else if ( vertical_scale <= 1.0f )
+    v_classification = ( is_gather ) ? 1 : 0;
+  else if ( vertical_scale <= 2.0f)
+    v_classification = 2;
+  else if ( vertical_scale <= 3.0f)
+    v_classification = 3;
+  else if ( vertical_scale <= 4.0f)
+    v_classification = 5;
+  else
+    v_classification = 6;
+
+  // use the right weights
+  weights = weights_table[ v_classification ];
+
+  // this is the costs when you don't take into account modern CPUs with high ipc and simd and caches - wish we had a better estimate
+  h_cost = (float)horizontal_filter_pixel_width * weights[0] + horizontal_scale * (float)vertical_filter_pixel_width * weights[1];
+  v_cost = (float)vertical_filter_pixel_width  * weights[2] + vertical_scale * (float)horizontal_filter_pixel_width * weights[3];
+
+  // use computation estimate to decide vertical first or not
+  vertical_first = ( v_cost <= h_cost ) ? 1 : 0;
+
+  // save these, if requested
+  if ( info )
+  {
+    info->h_cost = h_cost;
+    info->v_cost = v_cost;
+    info->v_resize_classification = v_classification;
+    info->v_first = vertical_first;
+    info->is_gather = is_gather;
+  }
+
+  // and this allows us to override everything for testing (see dotiming.c)
+  if ( ( info ) && ( info->control_v_first ) )
+    vertical_first = ( info->control_v_first == 2 ) ? 1 : 0;
+
+  return vertical_first;
+}
+
+// layout lookups - must match stbir_internal_pixel_layout
+static unsigned char stbir__pixel_channels[] = {
+  1,2,3,3,4,   // 1ch, 2ch, rgb, bgr, 4ch
+  4,4,4,4,2,2, // RGBA,BGRA,ARGB,ABGR,RA,AR
+  4,4,4,4,2,2, // RGBA_PM,BGRA_PM,ARGB_PM,ABGR_PM,RA_PM,AR_PM
+};
+
+// the internal pixel layout enums are in a different order, so we can easily do range comparisons of types
+//   the public pixel layout is ordered in a way that if you cast num_channels (1-4) to the enum, you get something sensible
+static stbir_internal_pixel_layout stbir__pixel_layout_convert_public_to_internal[] = {
+  STBIRI_BGR, STBIRI_1CHANNEL, STBIRI_2CHANNEL, STBIRI_RGB, STBIRI_RGBA,
+  STBIRI_4CHANNEL, STBIRI_BGRA, STBIRI_ARGB, STBIRI_ABGR, STBIRI_RA, STBIRI_AR,
+  STBIRI_RGBA_PM, STBIRI_BGRA_PM, STBIRI_ARGB_PM, STBIRI_ABGR_PM, STBIRI_RA_PM, STBIRI_AR_PM,
+};
+
+static stbir__info * stbir__alloc_internal_mem_and_build_samplers( stbir__sampler * horizontal, stbir__sampler * vertical, stbir__contributors * conservative, stbir_pixel_layout input_pixel_layout_public, stbir_pixel_layout output_pixel_layout_public, int splits, int new_x, int new_y, int fast_alpha, void * user_data STBIR_ONLY_PROFILE_BUILD_GET_INFO )
+{
+  static char stbir_channel_count_index[8]={ 9,0,1,2, 3,9,9,4 };
+
+  stbir__info * info = 0;
+  void * alloced = 0;
+  size_t alloced_total = 0;
+  int vertical_first;
+  int decode_buffer_size, ring_buffer_length_bytes, vertical_buffer_size, alloc_ring_buffer_num_entries;
+
+#ifndef STBIR__SEPARATE_ALLOCATIONS
+  int ring_buffer_size;
+#endif
+
+  int alpha_weighting_type = 0; // 0=none, 1=simple, 2=fancy
+  int conservative_split_output_size = stbir__get_max_split( splits, vertical->scale_info.output_sub_size );
+  stbir_internal_pixel_layout input_pixel_layout = stbir__pixel_layout_convert_public_to_internal[ input_pixel_layout_public ];
+  stbir_internal_pixel_layout output_pixel_layout = stbir__pixel_layout_convert_public_to_internal[ output_pixel_layout_public ];
+  int channels = stbir__pixel_channels[ input_pixel_layout ];
+  int effective_channels = channels;
+
+  // first figure out what type of alpha weighting to use (if any)
+  if ( ( horizontal->filter_enum != STBIR_FILTER_POINT_SAMPLE ) || ( vertical->filter_enum != STBIR_FILTER_POINT_SAMPLE ) ) // no alpha weighting on point sampling
+  {
+    if ( ( input_pixel_layout >= STBIRI_RGBA ) && ( input_pixel_layout <= STBIRI_AR ) && ( output_pixel_layout >= STBIRI_RGBA ) && ( output_pixel_layout <= STBIRI_AR ) )
+    {
+      if ( fast_alpha )
+      {
+        alpha_weighting_type = 4;
+      }
+      else
+      {
+        static int fancy_alpha_effective_cnts[6] = { 7, 7, 7, 7, 3, 3 };
+        alpha_weighting_type = 2;
+        effective_channels = fancy_alpha_effective_cnts[ input_pixel_layout - STBIRI_RGBA ];
+      }
+    }
+    else if ( ( input_pixel_layout >= STBIRI_RGBA_PM ) && ( input_pixel_layout <= STBIRI_AR_PM ) && ( output_pixel_layout >= STBIRI_RGBA ) && ( output_pixel_layout <= STBIRI_AR ) )
+    {
+      // input premult, output non-premult
+      alpha_weighting_type = 3;
+    }
+    else if ( ( input_pixel_layout >= STBIRI_RGBA ) && ( input_pixel_layout <= STBIRI_AR ) && ( output_pixel_layout >= STBIRI_RGBA_PM ) && ( output_pixel_layout <= STBIRI_AR_PM ) )
+    {
+      // input non-premult, output premult
+      alpha_weighting_type = 1;
+    }
+  }
+
+  // channel in and out count must match currently
+  if ( channels != stbir__pixel_channels[ output_pixel_layout ] )
+    return 0;
+
+  // get vertical first
+  vertical_first = stbir__should_do_vertical_first( stbir__compute_weights[ (int)stbir_channel_count_index[ effective_channels ] ], horizontal->filter_pixel_width, horizontal->scale_info.scale, horizontal->scale_info.output_sub_size, vertical->filter_pixel_width, vertical->scale_info.scale, vertical->scale_info.output_sub_size, vertical->is_gather, STBIR__V_FIRST_INFO_POINTER );
+
+  // sometimes read one float off in some of the unrolled loops (with a weight of zero coeff, so it doesn't have an effect)
+  decode_buffer_size = ( conservative->n1 - conservative->n0 + 1 ) * effective_channels * sizeof(float) + sizeof(float); // extra float for padding
+
+#if defined( STBIR__SEPARATE_ALLOCATIONS ) && defined(STBIR_SIMD8)
+  if ( effective_channels == 3 )
+    decode_buffer_size += sizeof(float); // avx in 3 channel mode needs one float at the start of the buffer (only with separate allocations)
+#endif
+
+  ring_buffer_length_bytes = horizontal->scale_info.output_sub_size * effective_channels * sizeof(float) + sizeof(float); // extra float for padding
+
+  // if we do vertical first, the ring buffer holds a whole decoded line
+  if ( vertical_first )
+    ring_buffer_length_bytes = ( decode_buffer_size + 15 ) & ~15;
+
+  if ( ( ring_buffer_length_bytes & 4095 ) == 0 ) ring_buffer_length_bytes += 64*3; // avoid 4k alias
+
+  // One extra entry because floating point precision problems sometimes cause an extra to be necessary.
+  alloc_ring_buffer_num_entries = vertical->filter_pixel_width + 1;
+
+  // we never need more ring buffer entries than the scanlines we're outputting when in scatter mode
+  if ( ( !vertical->is_gather ) && ( alloc_ring_buffer_num_entries > conservative_split_output_size ) )
+    alloc_ring_buffer_num_entries = conservative_split_output_size;
+
+#ifndef STBIR__SEPARATE_ALLOCATIONS
+  ring_buffer_size = alloc_ring_buffer_num_entries * ring_buffer_length_bytes;
+#endif
+
+  // The vertical buffer is used differently, depending on whether we are scattering
+  //   the vertical scanlines, or gathering them.
+  //   If scattering, it's used at the temp buffer to accumulate each output.
+  //   If gathering, it's just the output buffer.
+  vertical_buffer_size = horizontal->scale_info.output_sub_size * effective_channels * sizeof(float) + sizeof(float);  // extra float for padding
+
+  // we make two passes through this loop, 1st to add everything up, 2nd to allocate and init
+  for(;;)
+  {
+    int i;
+    void * advance_mem = alloced;
+    int copy_horizontal = 0;
+    stbir__sampler * possibly_use_horizontal_for_pivot = 0;
+
+#ifdef STBIR__SEPARATE_ALLOCATIONS
+    #define STBIR__NEXT_PTR( ptr, size, ntype ) if ( alloced ) { void * p = STBIR_MALLOC( size, user_data); if ( p == 0 ) { stbir__free_internal_mem( info ); return 0; } (ptr) = (ntype*)p; }
+#else
+    #define STBIR__NEXT_PTR( ptr, size, ntype ) advance_mem = (void*) ( ( ((size_t)advance_mem) + 15 ) & ~15 ); if ( alloced ) ptr = (ntype*)advance_mem; advance_mem = ((char*)advance_mem) + (size);
+#endif
+
+    STBIR__NEXT_PTR( info, sizeof( stbir__info ), stbir__info );
+
+    STBIR__NEXT_PTR( info->split_info, sizeof( stbir__per_split_info ) * splits, stbir__per_split_info );
+
+    if ( info )
+    {
+      static stbir__alpha_weight_func * fancy_alpha_weights[6]  =    { stbir__fancy_alpha_weight_4ch,   stbir__fancy_alpha_weight_4ch,   stbir__fancy_alpha_weight_4ch,   stbir__fancy_alpha_weight_4ch,   stbir__fancy_alpha_weight_2ch,   stbir__fancy_alpha_weight_2ch };
+      static stbir__alpha_unweight_func * fancy_alpha_unweights[6] = { stbir__fancy_alpha_unweight_4ch, stbir__fancy_alpha_unweight_4ch, stbir__fancy_alpha_unweight_4ch, stbir__fancy_alpha_unweight_4ch, stbir__fancy_alpha_unweight_2ch, stbir__fancy_alpha_unweight_2ch };
+      static stbir__alpha_weight_func * simple_alpha_weights[6] = { stbir__simple_alpha_weight_4ch, stbir__simple_alpha_weight_4ch, stbir__simple_alpha_weight_4ch, stbir__simple_alpha_weight_4ch, stbir__simple_alpha_weight_2ch, stbir__simple_alpha_weight_2ch };
+      static stbir__alpha_unweight_func * simple_alpha_unweights[6] = { stbir__simple_alpha_unweight_4ch, stbir__simple_alpha_unweight_4ch, stbir__simple_alpha_unweight_4ch, stbir__simple_alpha_unweight_4ch, stbir__simple_alpha_unweight_2ch, stbir__simple_alpha_unweight_2ch };
+
+      // initialize info fields
+      info->alloced_mem = alloced;
+      info->alloced_total = alloced_total;
+
+      info->channels = channels;
+      info->effective_channels = effective_channels;
+
+      info->offset_x = new_x;
+      info->offset_y = new_y;
+      info->alloc_ring_buffer_num_entries = alloc_ring_buffer_num_entries;
+      info->ring_buffer_num_entries = 0;
+      info->ring_buffer_length_bytes = ring_buffer_length_bytes;
+      info->splits = splits;
+      info->vertical_first = vertical_first;
+
+      info->input_pixel_layout_internal = input_pixel_layout;
+      info->output_pixel_layout_internal = output_pixel_layout;
+
+      // setup alpha weight functions
+      info->alpha_weight = 0;
+      info->alpha_unweight = 0;
+
+      // handle alpha weighting functions and overrides
+      if ( alpha_weighting_type == 2 )
+      {
+        // high quality alpha multiplying on the way in, dividing on the way out
+        info->alpha_weight = fancy_alpha_weights[ input_pixel_layout - STBIRI_RGBA ];
+        info->alpha_unweight = fancy_alpha_unweights[ output_pixel_layout - STBIRI_RGBA ];
+      }
+      else if ( alpha_weighting_type == 4 )
+      {
+        // fast alpha multiplying on the way in, dividing on the way out
+        info->alpha_weight = simple_alpha_weights[ input_pixel_layout - STBIRI_RGBA ];
+        info->alpha_unweight = simple_alpha_unweights[ output_pixel_layout - STBIRI_RGBA ];
+      }
+      else if ( alpha_weighting_type == 1 )
+      {
+        // fast alpha on the way in, leave in premultiplied form on way out
+        info->alpha_weight = simple_alpha_weights[ input_pixel_layout - STBIRI_RGBA ];
+      }
+      else if ( alpha_weighting_type == 3 )
+      {
+        // incoming is premultiplied, fast alpha dividing on the way out - non-premultiplied output
+        info->alpha_unweight = simple_alpha_unweights[ output_pixel_layout - STBIRI_RGBA ];
+      }
+
+      // handle 3-chan color flipping, using the alpha weight path
+      if ( ( ( input_pixel_layout == STBIRI_RGB ) && ( output_pixel_layout == STBIRI_BGR ) ) ||
+           ( ( input_pixel_layout == STBIRI_BGR ) && ( output_pixel_layout == STBIRI_RGB ) ) )
+      {
+        // do the flipping on the smaller of the two ends
+        if ( horizontal->scale_info.scale < 1.0f )
+          info->alpha_unweight = stbir__simple_flip_3ch;
+        else
+          info->alpha_weight = stbir__simple_flip_3ch;
+      }
+
+    }
+
+    // get all the per-split buffers
+    for( i = 0 ; i < splits ; i++ )
+    {
+      STBIR__NEXT_PTR( info->split_info[i].decode_buffer, decode_buffer_size, float );
+
+#ifdef STBIR__SEPARATE_ALLOCATIONS
+
+      #ifdef STBIR_SIMD8
+      if ( ( info ) && ( effective_channels == 3 ) )
+        ++info->split_info[i].decode_buffer; // avx in 3 channel mode needs one float at the start of the buffer
+      #endif
+
+      STBIR__NEXT_PTR( info->split_info[i].ring_buffers, alloc_ring_buffer_num_entries * sizeof(float*), float* );
+      {
+        int j;
+        for( j = 0 ; j < alloc_ring_buffer_num_entries ; j++ )
+        {
+          STBIR__NEXT_PTR( info->split_info[i].ring_buffers[j], ring_buffer_length_bytes, float );
+          #ifdef STBIR_SIMD8
+          if ( ( info ) && ( effective_channels == 3 ) )
+            ++info->split_info[i].ring_buffers[j]; // avx in 3 channel mode needs one float at the start of the buffer
+          #endif
+        }
+      }
+#else
+      STBIR__NEXT_PTR( info->split_info[i].ring_buffer, ring_buffer_size, float );
+#endif
+      STBIR__NEXT_PTR( info->split_info[i].vertical_buffer, vertical_buffer_size, float );
+    }
+
+    // alloc memory for to-be-pivoted coeffs (if necessary)
+    if ( vertical->is_gather == 0 )
+    {
+      int both;
+      int temp_mem_amt;
+
+      // when in vertical scatter mode, we first build the coefficients in gather mode, and then pivot after,
+      //   that means we need two buffers, so we try to use the decode buffer and ring buffer for this. if that
+      //   is too small, we just allocate extra memory to use as this temp.
+
+      both = vertical->gather_prescatter_contributors_size + vertical->gather_prescatter_coefficients_size;
+
+#ifdef STBIR__SEPARATE_ALLOCATIONS
+      temp_mem_amt = decode_buffer_size;
+#else
+      temp_mem_amt = ( decode_buffer_size + ring_buffer_size + vertical_buffer_size ) * splits;
+#endif
+      if ( temp_mem_amt >= both )
+      {
+        if ( info )
+        {
+          vertical->gather_prescatter_contributors = (stbir__contributors*)info->split_info[0].decode_buffer;
+          vertical->gather_prescatter_coefficients = (float*) ( ( (char*)info->split_info[0].decode_buffer ) + vertical->gather_prescatter_contributors_size );
+        }
+      }
+      else
+      {
+        // ring+decode memory is too small, so allocate temp memory
+        STBIR__NEXT_PTR( vertical->gather_prescatter_contributors, vertical->gather_prescatter_contributors_size, stbir__contributors );
+        STBIR__NEXT_PTR( vertical->gather_prescatter_coefficients, vertical->gather_prescatter_coefficients_size, float );
+      }
+    }
+
+    STBIR__NEXT_PTR( horizontal->contributors, horizontal->contributors_size, stbir__contributors );
+    STBIR__NEXT_PTR( horizontal->coefficients, horizontal->coefficients_size, float );
+
+    // are the two filters identical?? (happens a lot with mipmap generation)
+    if ( ( horizontal->filter_kernel == vertical->filter_kernel ) && ( horizontal->filter_support == vertical->filter_support ) && ( horizontal->edge == vertical->edge ) && ( horizontal->scale_info.output_sub_size == vertical->scale_info.output_sub_size ) )
+    {
+      float diff_scale = horizontal->scale_info.scale - vertical->scale_info.scale;
+      float diff_shift = horizontal->scale_info.pixel_shift - vertical->scale_info.pixel_shift;
+      if ( diff_scale < 0.0f ) diff_scale = -diff_scale;
+      if ( diff_shift < 0.0f ) diff_shift = -diff_shift;
+      if ( ( diff_scale <= stbir__small_float ) && ( diff_shift <= stbir__small_float ) )
+      {
+        if ( horizontal->is_gather == vertical->is_gather )
+        {
+          copy_horizontal = 1;
+          goto no_vert_alloc;
+        }
+        // everything matches, but vertical is scatter, horizontal is gather, use horizontal coeffs for vertical pivot coeffs
+        possibly_use_horizontal_for_pivot = horizontal;
+      }
+    }
+
+    STBIR__NEXT_PTR( vertical->contributors, vertical->contributors_size, stbir__contributors );
+    STBIR__NEXT_PTR( vertical->coefficients, vertical->coefficients_size, float );
+
+   no_vert_alloc:
+
+    if ( info )
+    {
+      STBIR_PROFILE_BUILD_START( horizontal );
+
+      stbir__calculate_filters( horizontal, 0, user_data STBIR_ONLY_PROFILE_BUILD_SET_INFO );
+
+      // setup the horizontal gather functions
+      // start with defaulting to the n_coeffs functions (specialized on channels and remnant leftover)
+      info->horizontal_gather_channels = stbir__horizontal_gather_n_coeffs_funcs[ effective_channels ][ horizontal->extent_info.widest & 3 ];
+      // but if the number of coeffs <= 12, use another set of special cases. <=12 coeffs is any enlarging resize, or shrinking resize down to about 1/3 size
+      if ( horizontal->extent_info.widest <= 12 )
+        info->horizontal_gather_channels = stbir__horizontal_gather_channels_funcs[ effective_channels ][ horizontal->extent_info.widest - 1 ];
+
+      info->scanline_extents.conservative.n0 = conservative->n0;
+      info->scanline_extents.conservative.n1 = conservative->n1;
+
+      // get exact extents
+      stbir__get_extents( horizontal, &info->scanline_extents );
+
+      // pack the horizontal coeffs
+      horizontal->coefficient_width = stbir__pack_coefficients(horizontal->num_contributors, horizontal->contributors, horizontal->coefficients, horizontal->coefficient_width, horizontal->extent_info.widest, info->scanline_extents.conservative.n0, info->scanline_extents.conservative.n1 );
+
+      STBIR_MEMCPY( &info->horizontal, horizontal, sizeof( stbir__sampler ) );
+
+      STBIR_PROFILE_BUILD_END( horizontal );
+
+      if ( copy_horizontal )
+      {
+        STBIR_MEMCPY( &info->vertical, horizontal, sizeof( stbir__sampler ) );
+      }
+      else
+      {
+        STBIR_PROFILE_BUILD_START( vertical );
+
+        stbir__calculate_filters( vertical, possibly_use_horizontal_for_pivot, user_data STBIR_ONLY_PROFILE_BUILD_SET_INFO );
+        STBIR_MEMCPY( &info->vertical, vertical, sizeof( stbir__sampler ) );
+
+        STBIR_PROFILE_BUILD_END( vertical );
+      }
+
+      // setup the vertical split ranges
+      stbir__get_split_info( info->split_info, info->splits, info->vertical.scale_info.output_sub_size, info->vertical.filter_pixel_margin, info->vertical.scale_info.input_full_size );
+
+      // now we know precisely how many entries we need
+      info->ring_buffer_num_entries = info->vertical.extent_info.widest;
+
+      // we never need more ring buffer entries than the scanlines we're outputting
+      if ( ( !info->vertical.is_gather ) && ( info->ring_buffer_num_entries > conservative_split_output_size ) )
+        info->ring_buffer_num_entries = conservative_split_output_size;
+      STBIR_ASSERT( info->ring_buffer_num_entries <= info->alloc_ring_buffer_num_entries );
+
+      // a few of the horizontal gather functions read one dword past the end (but mask it out), so put in a normal value so no snans or denormals accidentally sneak in
+      for( i = 0 ; i < splits ; i++ )
+      {
+        int width, ofs;
+
+        // find the right most span
+        if ( info->scanline_extents.spans[0].n1 > info->scanline_extents.spans[1].n1 )
+          width = info->scanline_extents.spans[0].n1 - info->scanline_extents.spans[0].n0;
+        else
+          width = info->scanline_extents.spans[1].n1 - info->scanline_extents.spans[1].n0;
+
+        // this calc finds the exact end of the decoded scanline for all filter modes.
+        //   usually this is just the width * effective channels.  But we have to account
+        //   for the area to the left of the scanline for wrap filtering and alignment, this
+        //   is stored as a negative value in info->scanline_extents.conservative.n0. Next,
+        //   we need to skip the exact size of the right hand size filter area (again for
+        //   wrap mode), this is in info->scanline_extents.edge_sizes[1]).
+        ofs = ( width + 1 - info->scanline_extents.conservative.n0 + info->scanline_extents.edge_sizes[1] ) * effective_channels;
+
+        // place a known, but numerically valid value in the decode buffer
+        info->split_info[i].decode_buffer[ ofs ] = 9999.0f;
+
+        // if vertical filtering first, place a known, but numerically valid value in the all
+        //   of the ring buffer accumulators
+        if ( vertical_first )
+        {
+          int j;
+          for( j = 0; j < info->ring_buffer_num_entries ; j++ )
+          {
+            stbir__get_ring_buffer_entry( info, info->split_info + i, j )[ ofs ] = 9999.0f;
+          }
+        }
+      }
+    }
+
+    #undef STBIR__NEXT_PTR
+
+
+    // is this the first time through loop?
+    if ( info == 0 )
+    {
+      alloced_total = ( 15 + (size_t)advance_mem );
+      alloced = STBIR_MALLOC( alloced_total, user_data );
+      if ( alloced == 0 )
+        return 0;
+    }
+    else
+      return info;  // success
+  }
+}
+
+static int stbir__perform_resize( stbir__info const * info, int split_start, int split_count )
+{
+  stbir__per_split_info * split_info = info->split_info + split_start;
+
+  STBIR_PROFILE_CLEAR_EXTRAS();
+
+  STBIR_PROFILE_FIRST_START( looping );
+  if (info->vertical.is_gather)
+    stbir__vertical_gather_loop( info, split_info, split_count );
+  else
+    stbir__vertical_scatter_loop( info, split_info, split_count );
+  STBIR_PROFILE_END( looping );
+
+  return 1;
+}
+
+static void stbir__update_info_from_resize( stbir__info * info, STBIR_RESIZE * resize )
+{
+  static stbir__decode_pixels_func * decode_simple[STBIR_TYPE_HALF_FLOAT-STBIR_TYPE_UINT8_SRGB+1]=
+  {
+    /* 1ch-4ch */ stbir__decode_uint8_srgb, stbir__decode_uint8_srgb, 0, stbir__decode_float_linear, stbir__decode_half_float_linear,
+  };
+
+  static stbir__decode_pixels_func * decode_alphas[STBIRI_AR-STBIRI_RGBA+1][STBIR_TYPE_HALF_FLOAT-STBIR_TYPE_UINT8_SRGB+1]=
+  {
+    { /* RGBA */ stbir__decode_uint8_srgb4_linearalpha,      stbir__decode_uint8_srgb,      0, stbir__decode_float_linear,      stbir__decode_half_float_linear },
+    { /* BGRA */ stbir__decode_uint8_srgb4_linearalpha_BGRA, stbir__decode_uint8_srgb_BGRA, 0, stbir__decode_float_linear_BGRA, stbir__decode_half_float_linear_BGRA },
+    { /* ARGB */ stbir__decode_uint8_srgb4_linearalpha_ARGB, stbir__decode_uint8_srgb_ARGB, 0, stbir__decode_float_linear_ARGB, stbir__decode_half_float_linear_ARGB },
+    { /* ABGR */ stbir__decode_uint8_srgb4_linearalpha_ABGR, stbir__decode_uint8_srgb_ABGR, 0, stbir__decode_float_linear_ABGR, stbir__decode_half_float_linear_ABGR },
+    { /* RA   */ stbir__decode_uint8_srgb2_linearalpha,      stbir__decode_uint8_srgb,      0, stbir__decode_float_linear,      stbir__decode_half_float_linear },
+    { /* AR   */ stbir__decode_uint8_srgb2_linearalpha_AR,   stbir__decode_uint8_srgb_AR,   0, stbir__decode_float_linear_AR,   stbir__decode_half_float_linear_AR },
+  };
+
+  static stbir__decode_pixels_func * decode_simple_scaled_or_not[2][2]=
+  {
+    { stbir__decode_uint8_linear_scaled,  stbir__decode_uint8_linear }, { stbir__decode_uint16_linear_scaled, stbir__decode_uint16_linear },
+  };
+
+  static stbir__decode_pixels_func * decode_alphas_scaled_or_not[STBIRI_AR-STBIRI_RGBA+1][2][2]=
+  {
+    { /* RGBA */ { stbir__decode_uint8_linear_scaled,       stbir__decode_uint8_linear },      { stbir__decode_uint16_linear_scaled,      stbir__decode_uint16_linear } },
+    { /* BGRA */ { stbir__decode_uint8_linear_scaled_BGRA,  stbir__decode_uint8_linear_BGRA }, { stbir__decode_uint16_linear_scaled_BGRA, stbir__decode_uint16_linear_BGRA } },
+    { /* ARGB */ { stbir__decode_uint8_linear_scaled_ARGB,  stbir__decode_uint8_linear_ARGB }, { stbir__decode_uint16_linear_scaled_ARGB, stbir__decode_uint16_linear_ARGB } },
+    { /* ABGR */ { stbir__decode_uint8_linear_scaled_ABGR,  stbir__decode_uint8_linear_ABGR }, { stbir__decode_uint16_linear_scaled_ABGR, stbir__decode_uint16_linear_ABGR } },
+    { /* RA   */ { stbir__decode_uint8_linear_scaled,       stbir__decode_uint8_linear },      { stbir__decode_uint16_linear_scaled,      stbir__decode_uint16_linear } },
+    { /* AR   */ { stbir__decode_uint8_linear_scaled_AR,    stbir__decode_uint8_linear_AR },   { stbir__decode_uint16_linear_scaled_AR,   stbir__decode_uint16_linear_AR } }
+  };
+
+  static stbir__encode_pixels_func * encode_simple[STBIR_TYPE_HALF_FLOAT-STBIR_TYPE_UINT8_SRGB+1]=
+  {
+    /* 1ch-4ch */ stbir__encode_uint8_srgb, stbir__encode_uint8_srgb, 0, stbir__encode_float_linear, stbir__encode_half_float_linear,
+  };
+
+  static stbir__encode_pixels_func * encode_alphas[STBIRI_AR-STBIRI_RGBA+1][STBIR_TYPE_HALF_FLOAT-STBIR_TYPE_UINT8_SRGB+1]=
+  {
+    { /* RGBA */ stbir__encode_uint8_srgb4_linearalpha,      stbir__encode_uint8_srgb,      0, stbir__encode_float_linear,      stbir__encode_half_float_linear },
+    { /* BGRA */ stbir__encode_uint8_srgb4_linearalpha_BGRA, stbir__encode_uint8_srgb_BGRA, 0, stbir__encode_float_linear_BGRA, stbir__encode_half_float_linear_BGRA },
+    { /* ARGB */ stbir__encode_uint8_srgb4_linearalpha_ARGB, stbir__encode_uint8_srgb_ARGB, 0, stbir__encode_float_linear_ARGB, stbir__encode_half_float_linear_ARGB },
+    { /* ABGR */ stbir__encode_uint8_srgb4_linearalpha_ABGR, stbir__encode_uint8_srgb_ABGR, 0, stbir__encode_float_linear_ABGR, stbir__encode_half_float_linear_ABGR },
+    { /* RA   */ stbir__encode_uint8_srgb2_linearalpha,      stbir__encode_uint8_srgb,      0, stbir__encode_float_linear,      stbir__encode_half_float_linear },
+    { /* AR   */ stbir__encode_uint8_srgb2_linearalpha_AR,   stbir__encode_uint8_srgb_AR,   0, stbir__encode_float_linear_AR,   stbir__encode_half_float_linear_AR }
+  };
+
+  static stbir__encode_pixels_func * encode_simple_scaled_or_not[2][2]=
+  {
+    { stbir__encode_uint8_linear_scaled,  stbir__encode_uint8_linear }, { stbir__encode_uint16_linear_scaled, stbir__encode_uint16_linear },
+  };
+
+  static stbir__encode_pixels_func * encode_alphas_scaled_or_not[STBIRI_AR-STBIRI_RGBA+1][2][2]=
+  {
+    { /* RGBA */ { stbir__encode_uint8_linear_scaled,       stbir__encode_uint8_linear },       { stbir__encode_uint16_linear_scaled,      stbir__encode_uint16_linear } },
+    { /* BGRA */ { stbir__encode_uint8_linear_scaled_BGRA,  stbir__encode_uint8_linear_BGRA },  { stbir__encode_uint16_linear_scaled_BGRA, stbir__encode_uint16_linear_BGRA } },
+    { /* ARGB */ { stbir__encode_uint8_linear_scaled_ARGB,  stbir__encode_uint8_linear_ARGB },  { stbir__encode_uint16_linear_scaled_ARGB, stbir__encode_uint16_linear_ARGB } },
+    { /* ABGR */ { stbir__encode_uint8_linear_scaled_ABGR,  stbir__encode_uint8_linear_ABGR },  { stbir__encode_uint16_linear_scaled_ABGR, stbir__encode_uint16_linear_ABGR } },
+    { /* RA   */ { stbir__encode_uint8_linear_scaled,       stbir__encode_uint8_linear },       { stbir__encode_uint16_linear_scaled,      stbir__encode_uint16_linear } },
+    { /* AR   */ { stbir__encode_uint8_linear_scaled_AR,    stbir__encode_uint8_linear_AR },    { stbir__encode_uint16_linear_scaled_AR,   stbir__encode_uint16_linear_AR } }
+  };
+
+  stbir__decode_pixels_func * decode_pixels = 0;
+  stbir__encode_pixels_func * encode_pixels = 0;
+  stbir_datatype input_type, output_type;
+
+  input_type = resize->input_data_type;
+  output_type = resize->output_data_type;
+  info->input_data = resize->input_pixels;
+  info->input_stride_bytes = resize->input_stride_in_bytes;
+  info->output_stride_bytes = resize->output_stride_in_bytes;
+
+  // if we're completely point sampling, then we can turn off SRGB
+  if ( ( info->horizontal.filter_enum == STBIR_FILTER_POINT_SAMPLE ) && ( info->vertical.filter_enum == STBIR_FILTER_POINT_SAMPLE ) )
+  {
+    if ( ( ( input_type  == STBIR_TYPE_UINT8_SRGB ) || ( input_type  == STBIR_TYPE_UINT8_SRGB_ALPHA ) ) &&
+         ( ( output_type == STBIR_TYPE_UINT8_SRGB ) || ( output_type == STBIR_TYPE_UINT8_SRGB_ALPHA ) ) )
+    {
+      input_type = STBIR_TYPE_UINT8;
+      output_type = STBIR_TYPE_UINT8;
+    }
+  }
+
+  // recalc the output and input strides
+  if ( info->input_stride_bytes == 0 )
+    info->input_stride_bytes = info->channels * info->horizontal.scale_info.input_full_size * stbir__type_size[input_type];
+
+  if ( info->output_stride_bytes == 0 )
+    info->output_stride_bytes = info->channels * info->horizontal.scale_info.output_sub_size * stbir__type_size[output_type];
+
+  // calc offset
+  info->output_data = ( (char*) resize->output_pixels ) + ( (size_t) info->offset_y * (size_t) resize->output_stride_in_bytes ) + ( info->offset_x * info->channels * stbir__type_size[output_type] );
+
+  info->in_pixels_cb = resize->input_cb;
+  info->user_data = resize->user_data;
+  info->out_pixels_cb = resize->output_cb;
+
+  // setup the input format converters
+  if ( ( input_type == STBIR_TYPE_UINT8 ) || ( input_type == STBIR_TYPE_UINT16 ) )
+  {
+    int non_scaled = 0;
+
+    // check if we can run unscaled - 0-255.0/0-65535.0 instead of 0-1.0 (which is a tiny bit faster when doing linear 8->8 or 16->16)
+    if ( ( !info->alpha_weight ) && ( !info->alpha_unweight )  ) // don't short circuit when alpha weighting (get everything to 0-1.0 as usual)
+      if ( ( ( input_type == STBIR_TYPE_UINT8 ) && ( output_type == STBIR_TYPE_UINT8 ) ) || ( ( input_type == STBIR_TYPE_UINT16 ) && ( output_type == STBIR_TYPE_UINT16 ) ) )
+        non_scaled = 1;
+
+    if ( info->input_pixel_layout_internal <= STBIRI_4CHANNEL )
+      decode_pixels = decode_simple_scaled_or_not[ input_type == STBIR_TYPE_UINT16 ][ non_scaled ];
+    else
+      decode_pixels = decode_alphas_scaled_or_not[ ( info->input_pixel_layout_internal - STBIRI_RGBA ) % ( STBIRI_AR-STBIRI_RGBA+1 ) ][ input_type == STBIR_TYPE_UINT16 ][ non_scaled ];
+  }
+  else
+  {
+    if ( info->input_pixel_layout_internal <= STBIRI_4CHANNEL )
+      decode_pixels = decode_simple[ input_type - STBIR_TYPE_UINT8_SRGB ];
+    else
+      decode_pixels = decode_alphas[ ( info->input_pixel_layout_internal - STBIRI_RGBA ) % ( STBIRI_AR-STBIRI_RGBA+1 ) ][ input_type - STBIR_TYPE_UINT8_SRGB ];
+  }
+
+  // setup the output format converters
+  if ( ( output_type == STBIR_TYPE_UINT8 ) || ( output_type == STBIR_TYPE_UINT16 ) )
+  {
+    int non_scaled = 0;
+
+    // check if we can run unscaled - 0-255.0/0-65535.0 instead of 0-1.0 (which is a tiny bit faster when doing linear 8->8 or 16->16)
+    if ( ( !info->alpha_weight ) && ( !info->alpha_unweight ) ) // don't short circuit when alpha weighting (get everything to 0-1.0 as usual)
+      if ( ( ( input_type == STBIR_TYPE_UINT8 ) && ( output_type == STBIR_TYPE_UINT8 ) ) || ( ( input_type == STBIR_TYPE_UINT16 ) && ( output_type == STBIR_TYPE_UINT16 ) ) )
+        non_scaled = 1;
+
+    if ( info->output_pixel_layout_internal <= STBIRI_4CHANNEL )
+      encode_pixels = encode_simple_scaled_or_not[ output_type == STBIR_TYPE_UINT16 ][ non_scaled ];
+    else
+      encode_pixels = encode_alphas_scaled_or_not[ ( info->output_pixel_layout_internal - STBIRI_RGBA ) % ( STBIRI_AR-STBIRI_RGBA+1 ) ][ output_type == STBIR_TYPE_UINT16 ][ non_scaled ];
+  }
+  else
+  {
+    if ( info->output_pixel_layout_internal <= STBIRI_4CHANNEL )
+      encode_pixels = encode_simple[ output_type - STBIR_TYPE_UINT8_SRGB ];
+    else
+      encode_pixels = encode_alphas[ ( info->output_pixel_layout_internal - STBIRI_RGBA ) % ( STBIRI_AR-STBIRI_RGBA+1 ) ][ output_type - STBIR_TYPE_UINT8_SRGB ];
+  }
+
+  info->input_type = input_type;
+  info->output_type = output_type;
+  info->decode_pixels = decode_pixels;
+  info->encode_pixels = encode_pixels;
+}
+
+static void stbir__clip( int * outx, int * outsubw, int outw, double * u0, double * u1 )
+{
+  double per, adj;
+  int over;
+
+  // do left/top edge
+  if ( *outx < 0 )
+  {
+    per = ( (double)*outx ) / ( (double)*outsubw ); // is negative
+    adj = per * ( *u1 - *u0 );
+    *u0 -= adj; // increases u0
+    *outx = 0;
+  }
+
+  // do right/bot edge
+  over = outw - ( *outx + *outsubw );
+  if ( over < 0 )
+  {
+    per = ( (double)over ) / ( (double)*outsubw ); // is negative
+    adj = per * ( *u1 - *u0 );
+    *u1 += adj; // decrease u1
+    *outsubw = outw - *outx;
+  }
+}
+
+// converts a double to a rational that has less than one float bit of error (returns 0 if unable to do so)
+static int stbir__double_to_rational(double f, stbir_uint32 limit, stbir_uint32 *numer, stbir_uint32 *denom, int limit_denom ) // limit_denom (1) or limit numer (0)
+{
+  double err;
+  stbir_uint64 top, bot;
+  stbir_uint64 numer_last = 0;
+  stbir_uint64 denom_last = 1;
+  stbir_uint64 numer_estimate = 1;
+  stbir_uint64 denom_estimate = 0;
+
+  // scale to past float error range
+  top = (stbir_uint64)( f * (double)(1 << 25) );
+  bot = 1 << 25;
+
+  // keep refining, but usually stops in a few loops - usually 5 for bad cases
+  for(;;)
+  {
+    stbir_uint64 est, temp;
+
+    // hit limit, break out and do best full range estimate
+    if ( ( ( limit_denom ) ? denom_estimate : numer_estimate ) >= limit )
+      break;
+
+    // is the current error less than 1 bit of a float? if so, we're done
+    if ( denom_estimate )
+    {
+      err = ( (double)numer_estimate / (double)denom_estimate ) - f;
+      if ( err < 0.0 ) err = -err;
+      if ( err < ( 1.0 / (double)(1<<24) ) )
+      {
+        // yup, found it
+        *numer = (stbir_uint32) numer_estimate;
+        *denom = (stbir_uint32) denom_estimate;
+        return 1;
+      }
+    }
+
+    // no more refinement bits left? break out and do full range estimate
+    if ( bot == 0 )
+      break;
+
+    // gcd the estimate bits
+    est = top / bot;
+    temp = top % bot;
+    top = bot;
+    bot = temp;
+
+    // move remainders
+    temp = est * denom_estimate + denom_last;
+    denom_last = denom_estimate;
+    denom_estimate = temp;
+
+    // move remainders
+    temp = est * numer_estimate + numer_last;
+    numer_last = numer_estimate;
+    numer_estimate = temp;
+  }
+
+  // we didn't fine anything good enough for float, use a full range estimate
+  if ( limit_denom )
+  {
+    numer_estimate= (stbir_uint64)( f * (double)limit + 0.5 );
+    denom_estimate = limit;
+  }
+  else
+  {
+    numer_estimate = limit;
+    denom_estimate = (stbir_uint64)( ( (double)limit / f ) + 0.5 );
+  }
+
+  *numer = (stbir_uint32) numer_estimate;
+  *denom = (stbir_uint32) denom_estimate;
+
+  err = ( denom_estimate ) ? ( ( (double)(stbir_uint32)numer_estimate / (double)(stbir_uint32)denom_estimate ) - f ) : 1.0;
+  if ( err < 0.0 ) err = -err;
+  return ( err < ( 1.0 / (double)(1<<24) ) ) ? 1 : 0;
+}
+
+static int stbir__calculate_region_transform( stbir__scale_info * scale_info, int output_full_range, int * output_offset, int output_sub_range, int input_full_range, double input_s0, double input_s1 )
+{
+  double output_range, input_range, output_s, input_s, ratio, scale;
+
+  input_s = input_s1 - input_s0;
+
+  // null area
+  if ( ( output_full_range == 0 ) || ( input_full_range == 0 ) ||
+       ( output_sub_range == 0 ) || ( input_s <= stbir__small_float ) )
+    return 0;
+
+  // are either of the ranges completely out of bounds?
+  if ( ( *output_offset >= output_full_range ) || ( ( *output_offset + output_sub_range ) <= 0 ) || ( input_s0 >= (1.0f-stbir__small_float) ) || ( input_s1 <= stbir__small_float ) )
+    return 0;
+
+  output_range = (double)output_full_range;
+  input_range = (double)input_full_range;
+
+  output_s = ( (double)output_sub_range) / output_range;
+
+  // figure out the scaling to use
+  ratio = output_s / input_s;
+
+  // save scale before clipping
+  scale = ( output_range / input_range ) * ratio;
+  scale_info->scale = (float)scale;
+  scale_info->inv_scale = (float)( 1.0 / scale );
+
+  // clip output area to left/right output edges (and adjust input area)
+  stbir__clip( output_offset, &output_sub_range, output_full_range, &input_s0, &input_s1 );
+
+  // recalc input area
+  input_s = input_s1 - input_s0;
+
+  // after clipping do we have zero input area?
+  if ( input_s <= stbir__small_float )
+    return 0;
+
+  // calculate and store the starting source offsets in output pixel space
+  scale_info->pixel_shift = (float) ( input_s0 * ratio * output_range );
+
+  scale_info->scale_is_rational = stbir__double_to_rational( scale, ( scale <= 1.0 ) ? output_full_range : input_full_range, &scale_info->scale_numerator, &scale_info->scale_denominator, ( scale >= 1.0 ) );
+
+  scale_info->input_full_size = input_full_range;
+  scale_info->output_sub_size = output_sub_range;
+
+  return 1;
+}
+
+
+static void stbir__init_and_set_layout( STBIR_RESIZE * resize, stbir_pixel_layout pixel_layout, stbir_datatype data_type )
+{
+  resize->input_cb = 0;
+  resize->output_cb = 0;
+  resize->user_data = resize;
+  resize->samplers = 0;
+  resize->called_alloc = 0;
+  resize->horizontal_filter = STBIR_FILTER_DEFAULT;
+  resize->horizontal_filter_kernel = 0; resize->horizontal_filter_support = 0;
+  resize->vertical_filter = STBIR_FILTER_DEFAULT;
+  resize->vertical_filter_kernel = 0; resize->vertical_filter_support = 0;
+  resize->horizontal_edge = STBIR_EDGE_CLAMP;
+  resize->vertical_edge = STBIR_EDGE_CLAMP;
+  resize->input_s0 = 0; resize->input_t0 = 0; resize->input_s1 = 1; resize->input_t1 = 1;
+  resize->output_subx = 0; resize->output_suby = 0; resize->output_subw = resize->output_w; resize->output_subh = resize->output_h;
+  resize->input_data_type = data_type;
+  resize->output_data_type = data_type;
+  resize->input_pixel_layout_public = pixel_layout;
+  resize->output_pixel_layout_public = pixel_layout;
+  resize->needs_rebuild = 1;
+}
+
+STBIRDEF void stbir_resize_init( STBIR_RESIZE * resize,
+                                 const void *input_pixels,  int input_w,  int input_h, int input_stride_in_bytes, // stride can be zero
+                                       void *output_pixels, int output_w, int output_h, int output_stride_in_bytes, // stride can be zero
+                                 stbir_pixel_layout pixel_layout, stbir_datatype data_type )
+{
+  resize->input_pixels = input_pixels;
+  resize->input_w = input_w;
+  resize->input_h = input_h;
+  resize->input_stride_in_bytes = input_stride_in_bytes;
+  resize->output_pixels = output_pixels;
+  resize->output_w = output_w;
+  resize->output_h = output_h;
+  resize->output_stride_in_bytes = output_stride_in_bytes;
+  resize->fast_alpha = 0;
+
+  stbir__init_and_set_layout( resize, pixel_layout, data_type );
+}
+
+// You can update parameters any time after resize_init
+STBIRDEF void stbir_set_datatypes( STBIR_RESIZE * resize, stbir_datatype input_type, stbir_datatype output_type )  // by default, datatype from resize_init
+{
+  resize->input_data_type = input_type;
+  resize->output_data_type = output_type;
+  if ( ( resize->samplers ) && ( !resize->needs_rebuild ) )
+    stbir__update_info_from_resize( resize->samplers, resize );
+}
+
+STBIRDEF void stbir_set_pixel_callbacks( STBIR_RESIZE * resize, stbir_input_callback * input_cb, stbir_output_callback * output_cb )   // no callbacks by default
+{
+  resize->input_cb = input_cb;
+  resize->output_cb = output_cb;
+
+  if ( ( resize->samplers ) && ( !resize->needs_rebuild ) )
+  {
+    resize->samplers->in_pixels_cb = input_cb;
+    resize->samplers->out_pixels_cb = output_cb;
+  }
+}
+
+STBIRDEF void stbir_set_user_data( STBIR_RESIZE * resize, void * user_data )                                     // pass back STBIR_RESIZE* by default
+{
+  resize->user_data = user_data;
+  if ( ( resize->samplers ) && ( !resize->needs_rebuild ) )
+    resize->samplers->user_data = user_data;
+}
+
+STBIRDEF void stbir_set_buffer_ptrs( STBIR_RESIZE * resize, const void * input_pixels, int input_stride_in_bytes, void * output_pixels, int output_stride_in_bytes )
+{
+  resize->input_pixels = input_pixels;
+  resize->input_stride_in_bytes = input_stride_in_bytes;
+  resize->output_pixels = output_pixels;
+  resize->output_stride_in_bytes = output_stride_in_bytes;
+  if ( ( resize->samplers ) && ( !resize->needs_rebuild ) )
+    stbir__update_info_from_resize( resize->samplers, resize );
+}
+
+
+STBIRDEF int stbir_set_edgemodes( STBIR_RESIZE * resize, stbir_edge horizontal_edge, stbir_edge vertical_edge )       // CLAMP by default
+{
+  resize->horizontal_edge = horizontal_edge;
+  resize->vertical_edge = vertical_edge;
+  resize->needs_rebuild = 1;
+  return 1;
+}
+
+STBIRDEF int stbir_set_filters( STBIR_RESIZE * resize, stbir_filter horizontal_filter, stbir_filter vertical_filter ) // STBIR_DEFAULT_FILTER_UPSAMPLE/DOWNSAMPLE by default
+{
+  resize->horizontal_filter = horizontal_filter;
+  resize->vertical_filter = vertical_filter;
+  resize->needs_rebuild = 1;
+  return 1;
+}
+
+STBIRDEF int stbir_set_filter_callbacks( STBIR_RESIZE * resize, stbir__kernel_callback * horizontal_filter, stbir__support_callback * horizontal_support, stbir__kernel_callback * vertical_filter, stbir__support_callback * vertical_support )
+{
+  resize->horizontal_filter_kernel = horizontal_filter; resize->horizontal_filter_support = horizontal_support;
+  resize->vertical_filter_kernel = vertical_filter; resize->vertical_filter_support = vertical_support;
+  resize->needs_rebuild = 1;
+  return 1;
+}
+
+STBIRDEF int stbir_set_pixel_layouts( STBIR_RESIZE * resize, stbir_pixel_layout input_pixel_layout, stbir_pixel_layout output_pixel_layout )   // sets new pixel layouts
+{
+  resize->input_pixel_layout_public = input_pixel_layout;
+  resize->output_pixel_layout_public = output_pixel_layout;
+  resize->needs_rebuild = 1;
+  return 1;
+}
+
+
+STBIRDEF int stbir_set_non_pm_alpha_speed_over_quality( STBIR_RESIZE * resize, int non_pma_alpha_speed_over_quality )   // sets alpha speed
+{
+  resize->fast_alpha = non_pma_alpha_speed_over_quality;
+  resize->needs_rebuild = 1;
+  return 1;
+}
+
+STBIRDEF int stbir_set_input_subrect( STBIR_RESIZE * resize, double s0, double t0, double s1, double t1 )                 // sets input region (full region by default)
+{
+  resize->input_s0 = s0;
+  resize->input_t0 = t0;
+  resize->input_s1 = s1;
+  resize->input_t1 = t1;
+  resize->needs_rebuild = 1;
+
+  // are we inbounds?
+  if ( ( s1 < stbir__small_float ) || ( (s1-s0) < stbir__small_float ) ||
+       ( t1 < stbir__small_float ) || ( (t1-t0) < stbir__small_float ) ||
+       ( s0 > (1.0f-stbir__small_float) ) ||
+       ( t0 > (1.0f-stbir__small_float) ) )
+    return 0;
+
+  return 1;
+}
+
+STBIRDEF int stbir_set_output_pixel_subrect( STBIR_RESIZE * resize, int subx, int suby, int subw, int subh )          // sets input region (full region by default)
+{
+  resize->output_subx = subx;
+  resize->output_suby = suby;
+  resize->output_subw = subw;
+  resize->output_subh = subh;
+  resize->needs_rebuild = 1;
+
+  // are we inbounds?
+  if ( ( subx >= resize->output_w ) || ( ( subx + subw ) <= 0 ) || ( suby >= resize->output_h ) || ( ( suby + subh ) <= 0 ) || ( subw == 0 ) || ( subh == 0 ) )
+    return 0;
+
+  return 1;
+}
+
+STBIRDEF int stbir_set_pixel_subrect( STBIR_RESIZE * resize, int subx, int suby, int subw, int subh )                 // sets both regions (full regions by default)
+{
+  double s0, t0, s1, t1;
+
+  s0 = ( (double)subx ) / ( (double)resize->output_w );
+  t0 = ( (double)suby ) / ( (double)resize->output_h );
+  s1 = ( (double)(subx+subw) ) / ( (double)resize->output_w );
+  t1 = ( (double)(suby+subh) ) / ( (double)resize->output_h );
+
+  resize->input_s0 = s0;
+  resize->input_t0 = t0;
+  resize->input_s1 = s1;
+  resize->input_t1 = t1;
+  resize->output_subx = subx;
+  resize->output_suby = suby;
+  resize->output_subw = subw;
+  resize->output_subh = subh;
+  resize->needs_rebuild = 1;
+
+  // are we inbounds?
+  if ( ( subx >= resize->output_w ) || ( ( subx + subw ) <= 0 ) || ( suby >= resize->output_h ) || ( ( suby + subh ) <= 0 ) || ( subw == 0 ) || ( subh == 0 ) )
+    return 0;
+
+  return 1;
+}
+
+static int stbir__perform_build( STBIR_RESIZE * resize, int splits )
+{
+  stbir__contributors conservative = { 0, 0 };
+  stbir__sampler horizontal, vertical;
+  int new_output_subx, new_output_suby;
+  stbir__info * out_info;
+  #ifdef STBIR_PROFILE
+  stbir__info profile_infod;  // used to contain building profile info before everything is allocated
+  stbir__info * profile_info = &profile_infod;
+  #endif
+
+  // have we already built the samplers?
+  if ( resize->samplers )
+    return 0;
+
+  #define STBIR_RETURN_ERROR_AND_ASSERT( exp )  STBIR_ASSERT( !(exp) ); if (exp) return 0;
+  STBIR_RETURN_ERROR_AND_ASSERT( (unsigned)resize->horizontal_filter >= STBIR_FILTER_OTHER)
+  STBIR_RETURN_ERROR_AND_ASSERT( (unsigned)resize->vertical_filter >= STBIR_FILTER_OTHER)
+  #undef STBIR_RETURN_ERROR_AND_ASSERT
+
+  if ( splits <= 0 )
+    return 0;
+
+  STBIR_PROFILE_BUILD_FIRST_START( build );
+
+  new_output_subx = resize->output_subx;
+  new_output_suby = resize->output_suby;
+
+  // do horizontal clip and scale calcs
+  if ( !stbir__calculate_region_transform( &horizontal.scale_info, resize->output_w, &new_output_subx, resize->output_subw, resize->input_w, resize->input_s0, resize->input_s1 ) )
+    return 0;
+
+  // do vertical clip and scale calcs
+  if ( !stbir__calculate_region_transform( &vertical.scale_info, resize->output_h, &new_output_suby, resize->output_subh, resize->input_h, resize->input_t0, resize->input_t1 ) )
+    return 0;
+
+  // if nothing to do, just return
+  if ( ( horizontal.scale_info.output_sub_size == 0 ) || ( vertical.scale_info.output_sub_size == 0 ) )
+    return 0;
+
+  stbir__set_sampler(&horizontal, resize->horizontal_filter, resize->horizontal_filter_kernel, resize->horizontal_filter_support, resize->horizontal_edge, &horizontal.scale_info, 1, resize->user_data );
+  stbir__get_conservative_extents( &horizontal, &conservative, resize->user_data );
+  stbir__set_sampler(&vertical, resize->vertical_filter, resize->horizontal_filter_kernel, resize->vertical_filter_support, resize->vertical_edge, &vertical.scale_info, 0, resize->user_data );
+
+  if ( ( vertical.scale_info.output_sub_size / splits ) < STBIR_FORCE_MINIMUM_SCANLINES_FOR_SPLITS ) // each split should be a minimum of 4 scanlines (handwavey choice)
+  {
+    splits = vertical.scale_info.output_sub_size / STBIR_FORCE_MINIMUM_SCANLINES_FOR_SPLITS;
+    if ( splits == 0 ) splits = 1;
+  }
+
+  STBIR_PROFILE_BUILD_START( alloc );
+  out_info = stbir__alloc_internal_mem_and_build_samplers( &horizontal, &vertical, &conservative, resize->input_pixel_layout_public, resize->output_pixel_layout_public, splits, new_output_subx, new_output_suby, resize->fast_alpha, resize->user_data STBIR_ONLY_PROFILE_BUILD_SET_INFO );
+  STBIR_PROFILE_BUILD_END( alloc );
+  STBIR_PROFILE_BUILD_END( build );
+
+  if ( out_info )
+  {
+    resize->splits = splits;
+    resize->samplers = out_info;
+    resize->needs_rebuild = 0;
+    #ifdef STBIR_PROFILE
+      STBIR_MEMCPY( &out_info->profile, &profile_infod.profile, sizeof( out_info->profile ) );
+    #endif
+
+    // update anything that can be changed without recalcing samplers
+    stbir__update_info_from_resize( out_info, resize );
+
+    return splits;
+  }
+
+  return 0;
+}
+
+void stbir_free_samplers( STBIR_RESIZE * resize )
+{
+  if ( resize->samplers )
+  {
+    stbir__free_internal_mem( resize->samplers );
+    resize->samplers = 0;
+    resize->called_alloc = 0;
+  }
+}
+
+STBIRDEF int stbir_build_samplers_with_splits( STBIR_RESIZE * resize, int splits )
+{
+  if ( ( resize->samplers == 0 ) || ( resize->needs_rebuild ) )
+  {
+    if ( resize->samplers )
+      stbir_free_samplers( resize );
+
+    resize->called_alloc = 1;
+    return stbir__perform_build( resize, splits );
+  }
+
+  STBIR_PROFILE_BUILD_CLEAR( resize->samplers );
+
+  return 1;
+}
+
+STBIRDEF int stbir_build_samplers( STBIR_RESIZE * resize )
+{
+  return stbir_build_samplers_with_splits( resize, 1 );
+}
+
+STBIRDEF int stbir_resize_extended( STBIR_RESIZE * resize )
+{
+  int result;
+
+  if ( ( resize->samplers == 0 ) || ( resize->needs_rebuild ) )
+  {
+    int alloc_state = resize->called_alloc;  // remember allocated state
+
+    if ( resize->samplers )
+    {
+      stbir__free_internal_mem( resize->samplers );
+      resize->samplers = 0;
+    }
+
+    if ( !stbir_build_samplers( resize ) )
+      return 0;
+
+    resize->called_alloc = alloc_state;
+
+    // if build_samplers succeeded (above), but there are no samplers set, then
+    //   the area to stretch into was zero pixels, so don't do anything and return
+    //   success
+    if ( resize->samplers == 0 )
+      return 1;
+  }
+  else
+  {
+    // didn't build anything - clear it
+    STBIR_PROFILE_BUILD_CLEAR( resize->samplers );
+  }
+
+  // do resize
+  result = stbir__perform_resize( resize->samplers, 0, resize->splits );
+
+  // if we alloced, then free
+  if ( !resize->called_alloc )
+  {
+    stbir_free_samplers( resize );
+    resize->samplers = 0;
+  }
+
+  return result;
+}
+
+STBIRDEF int stbir_resize_extended_split( STBIR_RESIZE * resize, int split_start, int split_count )
+{
+  STBIR_ASSERT( resize->samplers );
+
+  // if we're just doing the whole thing, call full
+  if ( ( split_start == -1 ) || ( ( split_start == 0 ) && ( split_count == resize->splits ) ) )
+    return stbir_resize_extended( resize );
+
+  // you **must** build samplers first when using split resize
+  if ( ( resize->samplers == 0 ) || ( resize->needs_rebuild ) )
+    return 0;
+
+  if ( ( split_start >= resize->splits ) || ( split_start < 0 ) || ( ( split_start + split_count ) > resize->splits ) || ( split_count <= 0 ) )
+    return 0;
+
+  // do resize
+  return stbir__perform_resize( resize->samplers, split_start, split_count );
+}
+
+static int stbir__check_output_stuff( void ** ret_ptr, int * ret_pitch, void * output_pixels, int type_size, int output_w, int output_h, int output_stride_in_bytes, stbir_internal_pixel_layout pixel_layout )
+{
+  size_t size;
+  int pitch;
+  void * ptr;
+
+  pitch = output_w * type_size * stbir__pixel_channels[ pixel_layout ];
+  if ( pitch == 0 )
+    return 0;
+
+  if ( output_stride_in_bytes == 0 )
+    output_stride_in_bytes = pitch;
+
+  if ( output_stride_in_bytes < pitch )
+    return 0;
+
+  size = (size_t)output_stride_in_bytes * (size_t)output_h;
+  if ( size == 0 )
+    return 0;
+
+  *ret_ptr = 0;
+  *ret_pitch = output_stride_in_bytes;
+
+  if ( output_pixels == 0 )
+  {
+    ptr = STBIR_MALLOC( size, 0 );
+    if ( ptr == 0 )
+      return 0;
+
+    *ret_ptr = ptr;
+    *ret_pitch = pitch;
+  }
+
+  return 1;
+}
+
+
+STBIRDEF unsigned char * stbir_resize_uint8_linear( const unsigned char *input_pixels , int input_w , int input_h, int input_stride_in_bytes,
+                                                          unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
+                                                          stbir_pixel_layout pixel_layout )
+{
+  STBIR_RESIZE resize;
+  unsigned char * optr;
+  int opitch;
+
+  if ( !stbir__check_output_stuff( (void**)&optr, &opitch, output_pixels, sizeof( unsigned char ), output_w, output_h, output_stride_in_bytes, stbir__pixel_layout_convert_public_to_internal[ pixel_layout ] ) )
+    return 0;
+
+  stbir_resize_init( &resize,
+                     input_pixels,  input_w,  input_h,  input_stride_in_bytes,
+                     (optr) ? optr : output_pixels, output_w, output_h, opitch,
+                     pixel_layout, STBIR_TYPE_UINT8 );
+
+  if ( !stbir_resize_extended( &resize ) )
+  {
+    if ( optr )
+      STBIR_FREE( optr, 0 );
+    return 0;
+  }
+
+  return (optr) ? optr : output_pixels;
+}
+
+STBIRDEF unsigned char * stbir_resize_uint8_srgb( const unsigned char *input_pixels , int input_w , int input_h, int input_stride_in_bytes,
+                                                        unsigned char *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
+                                                        stbir_pixel_layout pixel_layout )
+{
+  STBIR_RESIZE resize;
+  unsigned char * optr;
+  int opitch;
+
+  if ( !stbir__check_output_stuff( (void**)&optr, &opitch, output_pixels, sizeof( unsigned char ), output_w, output_h, output_stride_in_bytes, stbir__pixel_layout_convert_public_to_internal[ pixel_layout ] ) )
+    return 0;
+
+  stbir_resize_init( &resize,
+                     input_pixels,  input_w,  input_h,  input_stride_in_bytes,
+                     (optr) ? optr : output_pixels, output_w, output_h, opitch,
+                     pixel_layout, STBIR_TYPE_UINT8_SRGB );
+
+  if ( !stbir_resize_extended( &resize ) )
+  {
+    if ( optr )
+      STBIR_FREE( optr, 0 );
+    return 0;
+  }
+
+  return (optr) ? optr : output_pixels;
+}
+
+
+STBIRDEF float * stbir_resize_float_linear( const float *input_pixels , int input_w , int input_h, int input_stride_in_bytes,
+                                                  float *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
+                                                  stbir_pixel_layout pixel_layout )
+{
+  STBIR_RESIZE resize;
+  float * optr;
+  int opitch;
+
+  if ( !stbir__check_output_stuff( (void**)&optr, &opitch, output_pixels, sizeof( float ), output_w, output_h, output_stride_in_bytes, stbir__pixel_layout_convert_public_to_internal[ pixel_layout ] ) )
+    return 0;
+
+  stbir_resize_init( &resize,
+                     input_pixels,  input_w,  input_h,  input_stride_in_bytes,
+                     (optr) ? optr : output_pixels, output_w, output_h, opitch,
+                     pixel_layout, STBIR_TYPE_FLOAT );
+
+  if ( !stbir_resize_extended( &resize ) )
+  {
+    if ( optr )
+      STBIR_FREE( optr, 0 );
+    return 0;
+  }
+
+  return (optr) ? optr : output_pixels;
+}
+
+
+STBIRDEF void * stbir_resize( const void *input_pixels , int input_w , int input_h, int input_stride_in_bytes,
+                                    void *output_pixels, int output_w, int output_h, int output_stride_in_bytes,
+                              stbir_pixel_layout pixel_layout, stbir_datatype data_type,
+                              stbir_edge edge, stbir_filter filter )
+{
+  STBIR_RESIZE resize;
+  float * optr;
+  int opitch;
+
+  if ( !stbir__check_output_stuff( (void**)&optr, &opitch, output_pixels, stbir__type_size[data_type], output_w, output_h, output_stride_in_bytes, stbir__pixel_layout_convert_public_to_internal[ pixel_layout ] ) )
+    return 0;
+
+  stbir_resize_init( &resize,
+                     input_pixels,  input_w,  input_h,  input_stride_in_bytes,
+                     (optr) ? optr : output_pixels, output_w, output_h, output_stride_in_bytes,
+                     pixel_layout, data_type );
+
+  resize.horizontal_edge = edge;
+  resize.vertical_edge = edge;
+  resize.horizontal_filter = filter;
+  resize.vertical_filter = filter;
+
+  if ( !stbir_resize_extended( &resize ) )
+  {
+    if ( optr )
+      STBIR_FREE( optr, 0 );
+    return 0;
+  }
+
+  return (optr) ? optr : output_pixels;
+}
+
+#ifdef STBIR_PROFILE
+
+STBIRDEF void stbir_resize_build_profile_info( STBIR_PROFILE_INFO * info, STBIR_RESIZE const * resize )
+{
+  static char const * bdescriptions[6] = { "Building", "Allocating", "Horizontal sampler", "Vertical sampler", "Coefficient cleanup", "Coefficient piovot" } ;
+  stbir__info* samp = resize->samplers;
+  int i;
+
+  typedef int testa[ (STBIR__ARRAY_SIZE( bdescriptions ) == (STBIR__ARRAY_SIZE( samp->profile.array )-1) )?1:-1];
+  typedef int testb[ (sizeof( samp->profile.array ) == (sizeof(samp->profile.named)) )?1:-1];
+  typedef int testc[ (sizeof( info->clocks ) >= (sizeof(samp->profile.named)) )?1:-1];
+
+  for( i = 0 ; i < STBIR__ARRAY_SIZE( bdescriptions ) ; i++)
+    info->clocks[i] = samp->profile.array[i+1];
+
+  info->total_clocks = samp->profile.named.total;
+  info->descriptions = bdescriptions;
+  info->count = STBIR__ARRAY_SIZE( bdescriptions );
+}
+
+STBIRDEF void stbir_resize_split_profile_info( STBIR_PROFILE_INFO * info, STBIR_RESIZE const * resize, int split_start, int split_count )
+{
+  static char const * descriptions[7] = { "Looping", "Vertical sampling", "Horizontal sampling", "Scanline input", "Scanline output", "Alpha weighting", "Alpha unweighting" };
+  stbir__per_split_info * split_info;
+  int s, i;
+
+  typedef int testa[ (STBIR__ARRAY_SIZE( descriptions ) == (STBIR__ARRAY_SIZE( split_info->profile.array )-1) )?1:-1];
+  typedef int testb[ (sizeof( split_info->profile.array ) == (sizeof(split_info->profile.named)) )?1:-1];
+  typedef int testc[ (sizeof( info->clocks ) >= (sizeof(split_info->profile.named)) )?1:-1];
+
+  if ( split_start == -1 )
+  {
+    split_start = 0;
+    split_count = resize->samplers->splits;
+  }
+
+  if ( ( split_start >= resize->splits ) || ( split_start < 0 ) || ( ( split_start + split_count ) > resize->splits ) || ( split_count <= 0 ) )
+  {
+    info->total_clocks = 0;
+    info->descriptions = 0;
+    info->count = 0;
+    return;
+  }
+
+  split_info = resize->samplers->split_info + split_start;
+
+  // sum up the profile from all the splits
+  for( i = 0 ; i < STBIR__ARRAY_SIZE( descriptions ) ; i++ )
+  {
+    stbir_uint64 sum = 0;
+    for( s = 0 ; s < split_count ; s++ )
+      sum += split_info[s].profile.array[i+1];
+    info->clocks[i] = sum;
+  }
+
+  info->total_clocks = split_info->profile.named.total;
+  info->descriptions = descriptions;
+  info->count = STBIR__ARRAY_SIZE( descriptions );
+}
+
+STBIRDEF void stbir_resize_extended_profile_info( STBIR_PROFILE_INFO * info, STBIR_RESIZE const * resize )
+{
+  stbir_resize_split_profile_info( info, resize, -1, 0 );
+}
+
+#endif // STBIR_PROFILE
+
+#undef STBIR_BGR
+#undef STBIR_1CHANNEL
+#undef STBIR_2CHANNEL
+#undef STBIR_RGB
+#undef STBIR_RGBA
+#undef STBIR_4CHANNEL
+#undef STBIR_BGRA
+#undef STBIR_ARGB
+#undef STBIR_ABGR
+#undef STBIR_RA
+#undef STBIR_AR
+#undef STBIR_RGBA_PM
+#undef STBIR_BGRA_PM
+#undef STBIR_ARGB_PM
+#undef STBIR_ABGR_PM
+#undef STBIR_RA_PM
+#undef STBIR_AR_PM
+
+#endif // STB_IMAGE_RESIZE_IMPLEMENTATION
+
+#else  // STB_IMAGE_RESIZE_HORIZONTALS&STB_IMAGE_RESIZE_DO_VERTICALS
+
+// we reinclude the header file to define all the horizontal functions
+//   specializing each function for the number of coeffs is 20-40% faster *OVERALL*
+
+// by including the header file again this way, we can still debug the functions
+
+#define STBIR_strs_join2( start, mid, end ) start##mid##end
+#define STBIR_strs_join1( start, mid, end ) STBIR_strs_join2( start, mid, end )
+
+#define STBIR_strs_join24( start, mid1, mid2, end ) start##mid1##mid2##end
+#define STBIR_strs_join14( start, mid1, mid2, end ) STBIR_strs_join24( start, mid1, mid2, end )
+
+#ifdef STB_IMAGE_RESIZE_DO_CODERS
+
+#ifdef stbir__decode_suffix
+#define STBIR__CODER_NAME( name ) STBIR_strs_join1( name, _, stbir__decode_suffix )
+#else
+#define STBIR__CODER_NAME( name ) name
+#endif
+
+#ifdef stbir__decode_swizzle
+#define stbir__decode_simdf8_flip(reg) STBIR_strs_join1( STBIR_strs_join1( STBIR_strs_join1( STBIR_strs_join1( stbir__simdf8_0123to,stbir__decode_order0,stbir__decode_order1),stbir__decode_order2,stbir__decode_order3),stbir__decode_order0,stbir__decode_order1),stbir__decode_order2,stbir__decode_order3)(reg, reg)
+#define stbir__decode_simdf4_flip(reg) STBIR_strs_join1( STBIR_strs_join1( stbir__simdf_0123to,stbir__decode_order0,stbir__decode_order1),stbir__decode_order2,stbir__decode_order3)(reg, reg)
+#define stbir__encode_simdf8_unflip(reg) STBIR_strs_join1( STBIR_strs_join1( STBIR_strs_join1( STBIR_strs_join1( stbir__simdf8_0123to,stbir__encode_order0,stbir__encode_order1),stbir__encode_order2,stbir__encode_order3),stbir__encode_order0,stbir__encode_order1),stbir__encode_order2,stbir__encode_order3)(reg, reg)
+#define stbir__encode_simdf4_unflip(reg) STBIR_strs_join1( STBIR_strs_join1( stbir__simdf_0123to,stbir__encode_order0,stbir__encode_order1),stbir__encode_order2,stbir__encode_order3)(reg, reg)
+#else
+#define stbir__decode_order0 0
+#define stbir__decode_order1 1
+#define stbir__decode_order2 2
+#define stbir__decode_order3 3
+#define stbir__encode_order0 0
+#define stbir__encode_order1 1
+#define stbir__encode_order2 2
+#define stbir__encode_order3 3
+#define stbir__decode_simdf8_flip(reg)
+#define stbir__decode_simdf4_flip(reg)
+#define stbir__encode_simdf8_unflip(reg)
+#define stbir__encode_simdf4_unflip(reg)
+#endif
+
+#ifdef STBIR_SIMD8
+#define stbir__encode_simdfX_unflip  stbir__encode_simdf8_unflip
+#else
+#define stbir__encode_simdfX_unflip  stbir__encode_simdf4_unflip
+#endif
+
+static void STBIR__CODER_NAME( stbir__decode_uint8_linear_scaled )( float * decodep, int width_times_channels, void const * inputp )
+{
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float * decode_end = (float*) decode + width_times_channels;
+  unsigned char const * input = (unsigned char const*)inputp;
+
+  #ifdef STBIR_SIMD
+  unsigned char const * end_input_m16 = input + width_times_channels - 16;
+  if ( width_times_channels >= 16 )
+  {
+    decode_end -= 16;
+    for(;;)
+    {
+      #ifdef STBIR_SIMD8
+      stbir__simdi i; stbir__simdi8 o0,o1;
+      stbir__simdf8 of0, of1;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdi_load( i, input );
+      stbir__simdi8_expand_u8_to_u32( o0, o1, i );
+      stbir__simdi8_convert_i32_to_float( of0, o0 );
+      stbir__simdi8_convert_i32_to_float( of1, o1 );
+      stbir__simdf8_mult( of0, of0, STBIR_max_uint8_as_float_inverted8);
+      stbir__simdf8_mult( of1, of1, STBIR_max_uint8_as_float_inverted8);
+      stbir__decode_simdf8_flip( of0 );
+      stbir__decode_simdf8_flip( of1 );
+      stbir__simdf8_store( decode + 0, of0 );
+      stbir__simdf8_store( decode + 8, of1 );
+      #else
+      stbir__simdi i, o0, o1, o2, o3;
+      stbir__simdf of0, of1, of2, of3;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdi_load( i, input );
+      stbir__simdi_expand_u8_to_u32( o0,o1,o2,o3,i);
+      stbir__simdi_convert_i32_to_float( of0, o0 );
+      stbir__simdi_convert_i32_to_float( of1, o1 );
+      stbir__simdi_convert_i32_to_float( of2, o2 );
+      stbir__simdi_convert_i32_to_float( of3, o3 );
+      stbir__simdf_mult( of0, of0, STBIR__CONSTF(STBIR_max_uint8_as_float_inverted) );
+      stbir__simdf_mult( of1, of1, STBIR__CONSTF(STBIR_max_uint8_as_float_inverted) );
+      stbir__simdf_mult( of2, of2, STBIR__CONSTF(STBIR_max_uint8_as_float_inverted) );
+      stbir__simdf_mult( of3, of3, STBIR__CONSTF(STBIR_max_uint8_as_float_inverted) );
+      stbir__decode_simdf4_flip( of0 );
+      stbir__decode_simdf4_flip( of1 );
+      stbir__decode_simdf4_flip( of2 );
+      stbir__decode_simdf4_flip( of3 );
+      stbir__simdf_store( decode + 0,  of0 );
+      stbir__simdf_store( decode + 4,  of1 );
+      stbir__simdf_store( decode + 8,  of2 );
+      stbir__simdf_store( decode + 12, of3 );
+      #endif
+      decode += 16;
+      input += 16;
+      if ( decode <= decode_end )
+        continue;
+      if ( decode == ( decode_end + 16 ) )
+        break;
+      decode = decode_end; // backup and do last couple
+      input = end_input_m16;
+    }
+    return;
+  }
+  #endif
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  decode += 4;
+  while( decode <= decode_end )
+  {
+    STBIR_SIMD_NO_UNROLL(decode);
+    decode[0-4] = ((float)(input[stbir__decode_order0])) * stbir__max_uint8_as_float_inverted;
+    decode[1-4] = ((float)(input[stbir__decode_order1])) * stbir__max_uint8_as_float_inverted;
+    decode[2-4] = ((float)(input[stbir__decode_order2])) * stbir__max_uint8_as_float_inverted;
+    decode[3-4] = ((float)(input[stbir__decode_order3])) * stbir__max_uint8_as_float_inverted;
+    decode += 4;
+    input += 4;
+  }
+  decode -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( decode < decode_end )
+  {
+    STBIR_NO_UNROLL(decode);
+    decode[0] = ((float)(input[stbir__decode_order0])) * stbir__max_uint8_as_float_inverted;
+    #if stbir__coder_min_num >= 2
+    decode[1] = ((float)(input[stbir__decode_order1])) * stbir__max_uint8_as_float_inverted;
+    #endif
+    #if stbir__coder_min_num >= 3
+    decode[2] = ((float)(input[stbir__decode_order2])) * stbir__max_uint8_as_float_inverted;
+    #endif
+    decode += stbir__coder_min_num;
+    input += stbir__coder_min_num;
+  }
+  #endif
+}
+
+static void STBIR__CODER_NAME( stbir__encode_uint8_linear_scaled )( void * outputp, int width_times_channels, float const * encode )
+{
+  unsigned char STBIR_SIMD_STREAMOUT_PTR( * ) output = (unsigned char *) outputp;
+  unsigned char * end_output = ( (unsigned char *) output ) + width_times_channels;
+
+  #ifdef STBIR_SIMD
+  if ( width_times_channels >= stbir__simdfX_float_count*2 )
+  {
+    float const * end_encode_m8 = encode + width_times_channels - stbir__simdfX_float_count*2;
+    end_output -= stbir__simdfX_float_count*2;
+    for(;;)
+    {
+      stbir__simdfX e0, e1;
+      stbir__simdi i;
+      STBIR_SIMD_NO_UNROLL(encode);
+      stbir__simdfX_madd_mem( e0, STBIR_simd_point5X, STBIR_max_uint8_as_floatX, encode );
+      stbir__simdfX_madd_mem( e1, STBIR_simd_point5X, STBIR_max_uint8_as_floatX, encode+stbir__simdfX_float_count );
+      stbir__encode_simdfX_unflip( e0 );
+      stbir__encode_simdfX_unflip( e1 );
+      #ifdef STBIR_SIMD8
+      stbir__simdf8_pack_to_16bytes( i, e0, e1 );
+      stbir__simdi_store( output, i );
+      #else
+      stbir__simdf_pack_to_8bytes( i, e0, e1 );
+      stbir__simdi_store2( output, i );
+      #endif
+      encode += stbir__simdfX_float_count*2;
+      output += stbir__simdfX_float_count*2;
+      if ( output <= end_output )
+        continue;
+      if ( output == ( end_output + stbir__simdfX_float_count*2 ) )
+        break;
+      output = end_output; // backup and do last couple
+      encode = end_encode_m8;
+    }
+    return;
+  }
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    stbir__simdf e0;
+    stbir__simdi i0;
+    STBIR_NO_UNROLL(encode);
+    stbir__simdf_load( e0, encode );
+    stbir__simdf_madd( e0, STBIR__CONSTF(STBIR_simd_point5), STBIR__CONSTF(STBIR_max_uint8_as_float), e0 );
+    stbir__encode_simdf4_unflip( e0 );
+    stbir__simdf_pack_to_8bytes( i0, e0, e0 );  // only use first 4
+    *(int*)(output-4) = stbir__simdi_to_int( i0 );
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    stbir__simdf e0;
+    STBIR_NO_UNROLL(encode);
+    stbir__simdf_madd1_mem( e0, STBIR__CONSTF(STBIR_simd_point5), STBIR__CONSTF(STBIR_max_uint8_as_float), encode+stbir__encode_order0 ); output[0] = stbir__simdf_convert_float_to_uint8( e0 );
+    #if stbir__coder_min_num >= 2
+    stbir__simdf_madd1_mem( e0, STBIR__CONSTF(STBIR_simd_point5), STBIR__CONSTF(STBIR_max_uint8_as_float), encode+stbir__encode_order1 ); output[1] = stbir__simdf_convert_float_to_uint8( e0 );
+    #endif
+    #if stbir__coder_min_num >= 3
+    stbir__simdf_madd1_mem( e0, STBIR__CONSTF(STBIR_simd_point5), STBIR__CONSTF(STBIR_max_uint8_as_float), encode+stbir__encode_order2 ); output[2] = stbir__simdf_convert_float_to_uint8( e0 );
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+
+  #else
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    float f;
+    f = encode[stbir__encode_order0] * stbir__max_uint8_as_float + 0.5f; STBIR_CLAMP(f, 0, 255); output[0-4] = (unsigned char)f;
+    f = encode[stbir__encode_order1] * stbir__max_uint8_as_float + 0.5f; STBIR_CLAMP(f, 0, 255); output[1-4] = (unsigned char)f;
+    f = encode[stbir__encode_order2] * stbir__max_uint8_as_float + 0.5f; STBIR_CLAMP(f, 0, 255); output[2-4] = (unsigned char)f;
+    f = encode[stbir__encode_order3] * stbir__max_uint8_as_float + 0.5f; STBIR_CLAMP(f, 0, 255); output[3-4] = (unsigned char)f;
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    float f;
+    STBIR_NO_UNROLL(encode);
+    f = encode[stbir__encode_order0] * stbir__max_uint8_as_float + 0.5f; STBIR_CLAMP(f, 0, 255); output[0] = (unsigned char)f;
+    #if stbir__coder_min_num >= 2
+    f = encode[stbir__encode_order1] * stbir__max_uint8_as_float + 0.5f; STBIR_CLAMP(f, 0, 255); output[1] = (unsigned char)f;
+    #endif
+    #if stbir__coder_min_num >= 3
+    f = encode[stbir__encode_order2] * stbir__max_uint8_as_float + 0.5f; STBIR_CLAMP(f, 0, 255); output[2] = (unsigned char)f;
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+  #endif
+}
+
+static void STBIR__CODER_NAME(stbir__decode_uint8_linear)( float * decodep, int width_times_channels, void const * inputp )
+{
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float * decode_end = (float*) decode + width_times_channels;
+  unsigned char const * input = (unsigned char const*)inputp;
+
+  #ifdef STBIR_SIMD
+  unsigned char const * end_input_m16 = input + width_times_channels - 16;
+  if ( width_times_channels >= 16 )
+  {
+    decode_end -= 16;
+    for(;;)
+    {
+      #ifdef STBIR_SIMD8
+      stbir__simdi i; stbir__simdi8 o0,o1;
+      stbir__simdf8 of0, of1;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdi_load( i, input );
+      stbir__simdi8_expand_u8_to_u32( o0, o1, i );
+      stbir__simdi8_convert_i32_to_float( of0, o0 );
+      stbir__simdi8_convert_i32_to_float( of1, o1 );
+      stbir__decode_simdf8_flip( of0 );
+      stbir__decode_simdf8_flip( of1 );
+      stbir__simdf8_store( decode + 0, of0 );
+      stbir__simdf8_store( decode + 8, of1 );
+      #else
+      stbir__simdi i, o0, o1, o2, o3;
+      stbir__simdf of0, of1, of2, of3;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdi_load( i, input );
+      stbir__simdi_expand_u8_to_u32( o0,o1,o2,o3,i);
+      stbir__simdi_convert_i32_to_float( of0, o0 );
+      stbir__simdi_convert_i32_to_float( of1, o1 );
+      stbir__simdi_convert_i32_to_float( of2, o2 );
+      stbir__simdi_convert_i32_to_float( of3, o3 );
+      stbir__decode_simdf4_flip( of0 );
+      stbir__decode_simdf4_flip( of1 );
+      stbir__decode_simdf4_flip( of2 );
+      stbir__decode_simdf4_flip( of3 );
+      stbir__simdf_store( decode + 0,  of0 );
+      stbir__simdf_store( decode + 4,  of1 );
+      stbir__simdf_store( decode + 8,  of2 );
+      stbir__simdf_store( decode + 12, of3 );
+#endif
+      decode += 16;
+      input += 16;
+      if ( decode <= decode_end )
+        continue;
+      if ( decode == ( decode_end + 16 ) )
+        break;
+      decode = decode_end; // backup and do last couple
+      input = end_input_m16;
+    }
+    return;
+  }
+  #endif
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  decode += 4;
+  while( decode <= decode_end )
+  {
+    STBIR_SIMD_NO_UNROLL(decode);
+    decode[0-4] = ((float)(input[stbir__decode_order0]));
+    decode[1-4] = ((float)(input[stbir__decode_order1]));
+    decode[2-4] = ((float)(input[stbir__decode_order2]));
+    decode[3-4] = ((float)(input[stbir__decode_order3]));
+    decode += 4;
+    input += 4;
+  }
+  decode -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( decode < decode_end )
+  {
+    STBIR_NO_UNROLL(decode);
+    decode[0] = ((float)(input[stbir__decode_order0]));
+    #if stbir__coder_min_num >= 2
+    decode[1] = ((float)(input[stbir__decode_order1]));
+    #endif
+    #if stbir__coder_min_num >= 3
+    decode[2] = ((float)(input[stbir__decode_order2]));
+    #endif
+    decode += stbir__coder_min_num;
+    input += stbir__coder_min_num;
+  }
+  #endif
+}
+
+static void STBIR__CODER_NAME( stbir__encode_uint8_linear )( void * outputp, int width_times_channels, float const * encode )
+{
+  unsigned char STBIR_SIMD_STREAMOUT_PTR( * ) output = (unsigned char *) outputp;
+  unsigned char * end_output = ( (unsigned char *) output ) + width_times_channels;
+
+  #ifdef STBIR_SIMD
+  if ( width_times_channels >= stbir__simdfX_float_count*2 )
+  {
+    float const * end_encode_m8 = encode + width_times_channels - stbir__simdfX_float_count*2;
+    end_output -= stbir__simdfX_float_count*2;
+    for(;;)
+    {
+      stbir__simdfX e0, e1;
+      stbir__simdi i;
+      STBIR_SIMD_NO_UNROLL(encode);
+      stbir__simdfX_add_mem( e0, STBIR_simd_point5X, encode );
+      stbir__simdfX_add_mem( e1, STBIR_simd_point5X, encode+stbir__simdfX_float_count );
+      stbir__encode_simdfX_unflip( e0 );
+      stbir__encode_simdfX_unflip( e1 );
+      #ifdef STBIR_SIMD8
+      stbir__simdf8_pack_to_16bytes( i, e0, e1 );
+      stbir__simdi_store( output, i );
+      #else
+      stbir__simdf_pack_to_8bytes( i, e0, e1 );
+      stbir__simdi_store2( output, i );
+      #endif
+      encode += stbir__simdfX_float_count*2;
+      output += stbir__simdfX_float_count*2;
+      if ( output <= end_output )
+        continue;
+      if ( output == ( end_output + stbir__simdfX_float_count*2 ) )
+        break;
+      output = end_output; // backup and do last couple
+      encode = end_encode_m8;
+    }
+    return;
+  }
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    stbir__simdf e0;
+    stbir__simdi i0;
+    STBIR_NO_UNROLL(encode);
+    stbir__simdf_load( e0, encode );
+    stbir__simdf_add( e0, STBIR__CONSTF(STBIR_simd_point5), e0 );
+    stbir__encode_simdf4_unflip( e0 );
+    stbir__simdf_pack_to_8bytes( i0, e0, e0 );  // only use first 4
+    *(int*)(output-4) = stbir__simdi_to_int( i0 );
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  #else
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    float f;
+    f = encode[stbir__encode_order0] + 0.5f; STBIR_CLAMP(f, 0, 255); output[0-4] = (unsigned char)f;
+    f = encode[stbir__encode_order1] + 0.5f; STBIR_CLAMP(f, 0, 255); output[1-4] = (unsigned char)f;
+    f = encode[stbir__encode_order2] + 0.5f; STBIR_CLAMP(f, 0, 255); output[2-4] = (unsigned char)f;
+    f = encode[stbir__encode_order3] + 0.5f; STBIR_CLAMP(f, 0, 255); output[3-4] = (unsigned char)f;
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    float f;
+    STBIR_NO_UNROLL(encode);
+    f = encode[stbir__encode_order0] + 0.5f; STBIR_CLAMP(f, 0, 255); output[0] = (unsigned char)f;
+    #if stbir__coder_min_num >= 2
+    f = encode[stbir__encode_order1] + 0.5f; STBIR_CLAMP(f, 0, 255); output[1] = (unsigned char)f;
+    #endif
+    #if stbir__coder_min_num >= 3
+    f = encode[stbir__encode_order2] + 0.5f; STBIR_CLAMP(f, 0, 255); output[2] = (unsigned char)f;
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+}
+
+static void STBIR__CODER_NAME(stbir__decode_uint8_srgb)( float * decodep, int width_times_channels, void const * inputp )
+{
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float const * decode_end = (float*) decode + width_times_channels;
+  unsigned char const * input = (unsigned char const *)inputp;
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  decode += 4;
+  while( decode <= decode_end )
+  {
+    decode[0-4] = stbir__srgb_uchar_to_linear_float[ input[ stbir__decode_order0 ] ];
+    decode[1-4] = stbir__srgb_uchar_to_linear_float[ input[ stbir__decode_order1 ] ];
+    decode[2-4] = stbir__srgb_uchar_to_linear_float[ input[ stbir__decode_order2 ] ];
+    decode[3-4] = stbir__srgb_uchar_to_linear_float[ input[ stbir__decode_order3 ] ];
+    decode += 4;
+    input += 4;
+  }
+  decode -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( decode < decode_end )
+  {
+    STBIR_NO_UNROLL(decode);
+    decode[0] = stbir__srgb_uchar_to_linear_float[ input[ stbir__decode_order0 ] ];
+    #if stbir__coder_min_num >= 2
+    decode[1] = stbir__srgb_uchar_to_linear_float[ input[ stbir__decode_order1 ] ];
+    #endif
+    #if stbir__coder_min_num >= 3
+    decode[2] = stbir__srgb_uchar_to_linear_float[ input[ stbir__decode_order2 ] ];
+    #endif
+    decode += stbir__coder_min_num;
+    input += stbir__coder_min_num;
+  }
+  #endif
+}
+
+#define stbir__min_max_shift20( i, f ) \
+    stbir__simdf_max( f, f, stbir_simdf_casti(STBIR__CONSTI( STBIR_almost_zero )) ); \
+    stbir__simdf_min( f, f, stbir_simdf_casti(STBIR__CONSTI( STBIR_almost_one  )) ); \
+    stbir__simdi_32shr( i, stbir_simdi_castf( f ), 20 );
+
+#define stbir__scale_and_convert( i, f ) \
+    stbir__simdf_madd( f, STBIR__CONSTF( STBIR_simd_point5 ), STBIR__CONSTF( STBIR_max_uint8_as_float ), f ); \
+    stbir__simdf_max( f, f, stbir__simdf_zeroP() ); \
+    stbir__simdf_min( f, f, STBIR__CONSTF( STBIR_max_uint8_as_float ) ); \
+    stbir__simdf_convert_float_to_i32( i, f );
+
+#define stbir__linear_to_srgb_finish( i, f ) \
+{ \
+    stbir__simdi temp;  \
+    stbir__simdi_32shr( temp, stbir_simdi_castf( f ), 12 ) ; \
+    stbir__simdi_and( temp, temp, STBIR__CONSTI(STBIR_mastissa_mask) ); \
+    stbir__simdi_or( temp, temp, STBIR__CONSTI(STBIR_topscale) ); \
+    stbir__simdi_16madd( i, i, temp ); \
+    stbir__simdi_32shr( i, i, 16 ); \
+}
+
+#define stbir__simdi_table_lookup2( v0,v1, table ) \
+{ \
+  stbir__simdi_u32 temp0,temp1; \
+  temp0.m128i_i128 = v0; \
+  temp1.m128i_i128 = v1; \
+  temp0.m128i_u32[0] = table[temp0.m128i_i32[0]]; temp0.m128i_u32[1] = table[temp0.m128i_i32[1]]; temp0.m128i_u32[2] = table[temp0.m128i_i32[2]]; temp0.m128i_u32[3] = table[temp0.m128i_i32[3]]; \
+  temp1.m128i_u32[0] = table[temp1.m128i_i32[0]]; temp1.m128i_u32[1] = table[temp1.m128i_i32[1]]; temp1.m128i_u32[2] = table[temp1.m128i_i32[2]]; temp1.m128i_u32[3] = table[temp1.m128i_i32[3]]; \
+  v0 = temp0.m128i_i128; \
+  v1 = temp1.m128i_i128; \
+}
+
+#define stbir__simdi_table_lookup3( v0,v1,v2, table ) \
+{ \
+  stbir__simdi_u32 temp0,temp1,temp2; \
+  temp0.m128i_i128 = v0; \
+  temp1.m128i_i128 = v1; \
+  temp2.m128i_i128 = v2; \
+  temp0.m128i_u32[0] = table[temp0.m128i_i32[0]]; temp0.m128i_u32[1] = table[temp0.m128i_i32[1]]; temp0.m128i_u32[2] = table[temp0.m128i_i32[2]]; temp0.m128i_u32[3] = table[temp0.m128i_i32[3]]; \
+  temp1.m128i_u32[0] = table[temp1.m128i_i32[0]]; temp1.m128i_u32[1] = table[temp1.m128i_i32[1]]; temp1.m128i_u32[2] = table[temp1.m128i_i32[2]]; temp1.m128i_u32[3] = table[temp1.m128i_i32[3]]; \
+  temp2.m128i_u32[0] = table[temp2.m128i_i32[0]]; temp2.m128i_u32[1] = table[temp2.m128i_i32[1]]; temp2.m128i_u32[2] = table[temp2.m128i_i32[2]]; temp2.m128i_u32[3] = table[temp2.m128i_i32[3]]; \
+  v0 = temp0.m128i_i128; \
+  v1 = temp1.m128i_i128; \
+  v2 = temp2.m128i_i128; \
+}
+
+#define stbir__simdi_table_lookup4( v0,v1,v2,v3, table ) \
+{ \
+  stbir__simdi_u32 temp0,temp1,temp2,temp3; \
+  temp0.m128i_i128 = v0; \
+  temp1.m128i_i128 = v1; \
+  temp2.m128i_i128 = v2; \
+  temp3.m128i_i128 = v3; \
+  temp0.m128i_u32[0] = table[temp0.m128i_i32[0]]; temp0.m128i_u32[1] = table[temp0.m128i_i32[1]]; temp0.m128i_u32[2] = table[temp0.m128i_i32[2]]; temp0.m128i_u32[3] = table[temp0.m128i_i32[3]]; \
+  temp1.m128i_u32[0] = table[temp1.m128i_i32[0]]; temp1.m128i_u32[1] = table[temp1.m128i_i32[1]]; temp1.m128i_u32[2] = table[temp1.m128i_i32[2]]; temp1.m128i_u32[3] = table[temp1.m128i_i32[3]]; \
+  temp2.m128i_u32[0] = table[temp2.m128i_i32[0]]; temp2.m128i_u32[1] = table[temp2.m128i_i32[1]]; temp2.m128i_u32[2] = table[temp2.m128i_i32[2]]; temp2.m128i_u32[3] = table[temp2.m128i_i32[3]]; \
+  temp3.m128i_u32[0] = table[temp3.m128i_i32[0]]; temp3.m128i_u32[1] = table[temp3.m128i_i32[1]]; temp3.m128i_u32[2] = table[temp3.m128i_i32[2]]; temp3.m128i_u32[3] = table[temp3.m128i_i32[3]]; \
+  v0 = temp0.m128i_i128; \
+  v1 = temp1.m128i_i128; \
+  v2 = temp2.m128i_i128; \
+  v3 = temp3.m128i_i128; \
+}
+
+static void STBIR__CODER_NAME( stbir__encode_uint8_srgb )( void * outputp, int width_times_channels, float const * encode )
+{
+  unsigned char STBIR_SIMD_STREAMOUT_PTR( * ) output = (unsigned char*) outputp;
+  unsigned char * end_output = ( (unsigned char*) output ) + width_times_channels;
+
+  #ifdef STBIR_SIMD
+
+  if ( width_times_channels >= 16 )
+  {
+    float const * end_encode_m16 = encode + width_times_channels - 16;
+    end_output -= 16;
+    for(;;)
+    {
+      stbir__simdf f0, f1, f2, f3;
+      stbir__simdi i0, i1, i2, i3;
+      STBIR_SIMD_NO_UNROLL(encode);
+
+      stbir__simdf_load4_transposed( f0, f1, f2, f3, encode );
+
+      stbir__min_max_shift20( i0, f0 );
+      stbir__min_max_shift20( i1, f1 );
+      stbir__min_max_shift20( i2, f2 );
+      stbir__min_max_shift20( i3, f3 );
+
+      stbir__simdi_table_lookup4( i0, i1, i2, i3, ( fp32_to_srgb8_tab4 - (127-13)*8 ) );
+
+      stbir__linear_to_srgb_finish( i0, f0 );
+      stbir__linear_to_srgb_finish( i1, f1 );
+      stbir__linear_to_srgb_finish( i2, f2 );
+      stbir__linear_to_srgb_finish( i3, f3 );
+
+      stbir__interleave_pack_and_store_16_u8( output,  STBIR_strs_join1(i, ,stbir__encode_order0), STBIR_strs_join1(i, ,stbir__encode_order1), STBIR_strs_join1(i, ,stbir__encode_order2), STBIR_strs_join1(i, ,stbir__encode_order3) );
+
+      encode += 16;
+      output += 16;
+      if ( output <= end_output )
+        continue;
+      if ( output == ( end_output + 16 ) )
+        break;
+      output = end_output; // backup and do last couple
+      encode = end_encode_m16;
+    }
+    return;
+  }
+  #endif
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while ( output <= end_output )
+  {
+    STBIR_SIMD_NO_UNROLL(encode);
+
+    output[0-4] = stbir__linear_to_srgb_uchar( encode[stbir__encode_order0] );
+    output[1-4] = stbir__linear_to_srgb_uchar( encode[stbir__encode_order1] );
+    output[2-4] = stbir__linear_to_srgb_uchar( encode[stbir__encode_order2] );
+    output[3-4] = stbir__linear_to_srgb_uchar( encode[stbir__encode_order3] );
+
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    STBIR_NO_UNROLL(encode);
+    output[0] = stbir__linear_to_srgb_uchar( encode[stbir__encode_order0] );
+    #if stbir__coder_min_num >= 2
+    output[1] = stbir__linear_to_srgb_uchar( encode[stbir__encode_order1] );
+    #endif
+    #if stbir__coder_min_num >= 3
+    output[2] = stbir__linear_to_srgb_uchar( encode[stbir__encode_order2] );
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+}
+
+#if ( stbir__coder_min_num == 4 ) || ( ( stbir__coder_min_num == 1 ) && ( !defined(stbir__decode_swizzle) ) )
+
+static void STBIR__CODER_NAME(stbir__decode_uint8_srgb4_linearalpha)( float * decodep, int width_times_channels, void const * inputp )
+{
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float const * decode_end = (float*) decode + width_times_channels;
+  unsigned char const * input = (unsigned char const *)inputp;
+  do {
+    decode[0] = stbir__srgb_uchar_to_linear_float[ input[stbir__decode_order0] ];
+    decode[1] = stbir__srgb_uchar_to_linear_float[ input[stbir__decode_order1] ];
+    decode[2] = stbir__srgb_uchar_to_linear_float[ input[stbir__decode_order2] ];
+    decode[3] = ( (float) input[stbir__decode_order3] ) * stbir__max_uint8_as_float_inverted;
+    input += 4;
+    decode += 4;
+  } while( decode < decode_end );
+}
+
+
+static void STBIR__CODER_NAME( stbir__encode_uint8_srgb4_linearalpha )( void * outputp, int width_times_channels, float const * encode )
+{
+  unsigned char STBIR_SIMD_STREAMOUT_PTR( * ) output = (unsigned char*) outputp;
+  unsigned char * end_output = ( (unsigned char*) output ) + width_times_channels;
+
+  #ifdef STBIR_SIMD
+
+  if ( width_times_channels >= 16 )
+  {
+    float const * end_encode_m16 = encode + width_times_channels - 16;
+    end_output -= 16;
+    for(;;)
+    {
+      stbir__simdf f0, f1, f2, f3;
+      stbir__simdi i0, i1, i2, i3;
+
+      STBIR_SIMD_NO_UNROLL(encode);
+      stbir__simdf_load4_transposed( f0, f1, f2, f3, encode );
+
+      stbir__min_max_shift20( i0, f0 );
+      stbir__min_max_shift20( i1, f1 );
+      stbir__min_max_shift20( i2, f2 );
+      stbir__scale_and_convert( i3, f3 );
+
+      stbir__simdi_table_lookup3( i0, i1, i2, ( fp32_to_srgb8_tab4 - (127-13)*8 ) );
+
+      stbir__linear_to_srgb_finish( i0, f0 );
+      stbir__linear_to_srgb_finish( i1, f1 );
+      stbir__linear_to_srgb_finish( i2, f2 );
+
+      stbir__interleave_pack_and_store_16_u8( output,  STBIR_strs_join1(i, ,stbir__encode_order0), STBIR_strs_join1(i, ,stbir__encode_order1), STBIR_strs_join1(i, ,stbir__encode_order2), STBIR_strs_join1(i, ,stbir__encode_order3) );
+
+      output += 16;
+      encode += 16;
+
+      if ( output <= end_output )
+        continue;
+      if ( output == ( end_output + 16 ) )
+        break;
+      output = end_output; // backup and do last couple
+      encode = end_encode_m16;
+    }
+    return;
+  }
+  #endif
+
+  do {
+    float f;
+    STBIR_SIMD_NO_UNROLL(encode);
+
+    output[stbir__decode_order0] = stbir__linear_to_srgb_uchar( encode[0] );
+    output[stbir__decode_order1] = stbir__linear_to_srgb_uchar( encode[1] );
+    output[stbir__decode_order2] = stbir__linear_to_srgb_uchar( encode[2] );
+
+    f = encode[3] * stbir__max_uint8_as_float + 0.5f;
+    STBIR_CLAMP(f, 0, 255);
+    output[stbir__decode_order3] = (unsigned char) f;
+
+    output += 4;
+    encode += 4;
+  } while( output < end_output );
+}
+
+#endif
+
+#if ( stbir__coder_min_num == 2 ) || ( ( stbir__coder_min_num == 1 ) && ( !defined(stbir__decode_swizzle) ) )
+
+static void STBIR__CODER_NAME(stbir__decode_uint8_srgb2_linearalpha)( float * decodep, int width_times_channels, void const * inputp )
+{
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float const * decode_end = (float*) decode + width_times_channels;
+  unsigned char const * input = (unsigned char const *)inputp;
+  decode += 4;
+  while( decode <= decode_end )
+  {
+    decode[0-4] = stbir__srgb_uchar_to_linear_float[ input[stbir__decode_order0] ];
+    decode[1-4] = ( (float) input[stbir__decode_order1] ) * stbir__max_uint8_as_float_inverted;
+    decode[2-4] = stbir__srgb_uchar_to_linear_float[ input[stbir__decode_order0+2] ];
+    decode[3-4] = ( (float) input[stbir__decode_order1+2] ) * stbir__max_uint8_as_float_inverted;
+    input += 4;
+    decode += 4;
+  }
+  decode -= 4;
+  if( decode < decode_end )
+  {
+    decode[0] = stbir__srgb_uchar_to_linear_float[ stbir__decode_order0 ];
+    decode[1] = ( (float) input[stbir__decode_order1] ) * stbir__max_uint8_as_float_inverted;
+  }
+}
+
+static void STBIR__CODER_NAME( stbir__encode_uint8_srgb2_linearalpha )( void * outputp, int width_times_channels, float const * encode )
+{
+  unsigned char STBIR_SIMD_STREAMOUT_PTR( * ) output = (unsigned char*) outputp;
+  unsigned char * end_output = ( (unsigned char*) output ) + width_times_channels;
+
+  #ifdef STBIR_SIMD
+
+  if ( width_times_channels >= 16 )
+  {
+    float const * end_encode_m16 = encode + width_times_channels - 16;
+    end_output -= 16;
+    for(;;)
+    {
+      stbir__simdf f0, f1, f2, f3;
+      stbir__simdi i0, i1, i2, i3;
+
+      STBIR_SIMD_NO_UNROLL(encode);
+      stbir__simdf_load4_transposed( f0, f1, f2, f3, encode );
+
+      stbir__min_max_shift20( i0, f0 );
+      stbir__scale_and_convert( i1, f1 );
+      stbir__min_max_shift20( i2, f2 );
+      stbir__scale_and_convert( i3, f3 );
+
+      stbir__simdi_table_lookup2( i0, i2, ( fp32_to_srgb8_tab4 - (127-13)*8 ) );
+
+      stbir__linear_to_srgb_finish( i0, f0 );
+      stbir__linear_to_srgb_finish( i2, f2 );
+
+      stbir__interleave_pack_and_store_16_u8( output,  STBIR_strs_join1(i, ,stbir__encode_order0), STBIR_strs_join1(i, ,stbir__encode_order1), STBIR_strs_join1(i, ,stbir__encode_order2), STBIR_strs_join1(i, ,stbir__encode_order3) );
+
+      output += 16;
+      encode += 16;
+      if ( output <= end_output )
+        continue;
+      if ( output == ( end_output + 16 ) )
+        break;
+      output = end_output; // backup and do last couple
+      encode = end_encode_m16;
+    }
+    return;
+  }
+  #endif
+
+  do {
+    float f;
+    STBIR_SIMD_NO_UNROLL(encode);
+
+    output[stbir__decode_order0] = stbir__linear_to_srgb_uchar( encode[0] );
+
+    f = encode[1] * stbir__max_uint8_as_float + 0.5f;
+    STBIR_CLAMP(f, 0, 255);
+    output[stbir__decode_order1] = (unsigned char) f;
+
+    output += 2;
+    encode += 2;
+  } while( output < end_output );
+}
+
+#endif
+
+static void STBIR__CODER_NAME(stbir__decode_uint16_linear_scaled)( float * decodep, int width_times_channels, void const * inputp )
+{
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float * decode_end = (float*) decode + width_times_channels;
+  unsigned short const * input = (unsigned short const *)inputp;
+
+  #ifdef STBIR_SIMD
+  unsigned short const * end_input_m8 = input + width_times_channels - 8;
+  if ( width_times_channels >= 8 )
+  {
+    decode_end -= 8;
+    for(;;)
+    {
+      #ifdef STBIR_SIMD8
+      stbir__simdi i; stbir__simdi8 o;
+      stbir__simdf8 of;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdi_load( i, input );
+      stbir__simdi8_expand_u16_to_u32( o, i );
+      stbir__simdi8_convert_i32_to_float( of, o );
+      stbir__simdf8_mult( of, of, STBIR_max_uint16_as_float_inverted8);
+      stbir__decode_simdf8_flip( of );
+      stbir__simdf8_store( decode + 0, of );
+      #else
+      stbir__simdi i, o0, o1;
+      stbir__simdf of0, of1;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdi_load( i, input );
+      stbir__simdi_expand_u16_to_u32( o0,o1,i );
+      stbir__simdi_convert_i32_to_float( of0, o0 );
+      stbir__simdi_convert_i32_to_float( of1, o1 );
+      stbir__simdf_mult( of0, of0, STBIR__CONSTF(STBIR_max_uint16_as_float_inverted) );
+      stbir__simdf_mult( of1, of1, STBIR__CONSTF(STBIR_max_uint16_as_float_inverted));
+      stbir__decode_simdf4_flip( of0 );
+      stbir__decode_simdf4_flip( of1 );
+      stbir__simdf_store( decode + 0,  of0 );
+      stbir__simdf_store( decode + 4,  of1 );
+      #endif
+      decode += 8;
+      input += 8;
+      if ( decode <= decode_end )
+        continue;
+      if ( decode == ( decode_end + 8 ) )
+        break;
+      decode = decode_end; // backup and do last couple
+      input = end_input_m8;
+    }
+    return;
+  }
+  #endif
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  decode += 4;
+  while( decode <= decode_end )
+  {
+    STBIR_SIMD_NO_UNROLL(decode);
+    decode[0-4] = ((float)(input[stbir__decode_order0])) * stbir__max_uint16_as_float_inverted;
+    decode[1-4] = ((float)(input[stbir__decode_order1])) * stbir__max_uint16_as_float_inverted;
+    decode[2-4] = ((float)(input[stbir__decode_order2])) * stbir__max_uint16_as_float_inverted;
+    decode[3-4] = ((float)(input[stbir__decode_order3])) * stbir__max_uint16_as_float_inverted;
+    decode += 4;
+    input += 4;
+  }
+  decode -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( decode < decode_end )
+  {
+    STBIR_NO_UNROLL(decode);
+    decode[0] = ((float)(input[stbir__decode_order0])) * stbir__max_uint16_as_float_inverted;
+    #if stbir__coder_min_num >= 2
+    decode[1] = ((float)(input[stbir__decode_order1])) * stbir__max_uint16_as_float_inverted;
+    #endif
+    #if stbir__coder_min_num >= 3
+    decode[2] = ((float)(input[stbir__decode_order2])) * stbir__max_uint16_as_float_inverted;
+    #endif
+    decode += stbir__coder_min_num;
+    input += stbir__coder_min_num;
+  }
+  #endif
+}
+
+
+static void STBIR__CODER_NAME(stbir__encode_uint16_linear_scaled)( void * outputp, int width_times_channels, float const * encode )
+{
+  unsigned short STBIR_SIMD_STREAMOUT_PTR( * ) output = (unsigned short*) outputp;
+  unsigned short * end_output = ( (unsigned short*) output ) + width_times_channels;
+
+  #ifdef STBIR_SIMD
+  {
+    if ( width_times_channels >= stbir__simdfX_float_count*2 )
+    {
+      float const * end_encode_m8 = encode + width_times_channels - stbir__simdfX_float_count*2;
+      end_output -= stbir__simdfX_float_count*2;
+      for(;;)
+      {
+        stbir__simdfX e0, e1;
+        stbir__simdiX i;
+        STBIR_SIMD_NO_UNROLL(encode);
+        stbir__simdfX_madd_mem( e0, STBIR_simd_point5X, STBIR_max_uint16_as_floatX, encode );
+        stbir__simdfX_madd_mem( e1, STBIR_simd_point5X, STBIR_max_uint16_as_floatX, encode+stbir__simdfX_float_count );
+        stbir__encode_simdfX_unflip( e0 );
+        stbir__encode_simdfX_unflip( e1 );
+        stbir__simdfX_pack_to_words( i, e0, e1 );
+        stbir__simdiX_store( output, i );
+        encode += stbir__simdfX_float_count*2;
+        output += stbir__simdfX_float_count*2;
+        if ( output <= end_output )
+          continue;
+        if ( output == ( end_output + stbir__simdfX_float_count*2 ) )
+          break;
+        output = end_output;     // backup and do last couple
+        encode = end_encode_m8;
+      }
+      return;
+    }
+  }
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    stbir__simdf e;
+    stbir__simdi i;
+    STBIR_NO_UNROLL(encode);
+    stbir__simdf_load( e, encode );
+    stbir__simdf_madd( e, STBIR__CONSTF(STBIR_simd_point5), STBIR__CONSTF(STBIR_max_uint16_as_float), e );
+    stbir__encode_simdf4_unflip( e );
+    stbir__simdf_pack_to_8words( i, e, e );  // only use first 4
+    stbir__simdi_store2( output-4, i );
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    stbir__simdf e;
+    STBIR_NO_UNROLL(encode);
+    stbir__simdf_madd1_mem( e, STBIR__CONSTF(STBIR_simd_point5), STBIR__CONSTF(STBIR_max_uint16_as_float), encode+stbir__encode_order0 ); output[0] = stbir__simdf_convert_float_to_short( e );
+    #if stbir__coder_min_num >= 2
+    stbir__simdf_madd1_mem( e, STBIR__CONSTF(STBIR_simd_point5), STBIR__CONSTF(STBIR_max_uint16_as_float), encode+stbir__encode_order1 ); output[1] = stbir__simdf_convert_float_to_short( e );
+    #endif
+    #if stbir__coder_min_num >= 3
+    stbir__simdf_madd1_mem( e, STBIR__CONSTF(STBIR_simd_point5), STBIR__CONSTF(STBIR_max_uint16_as_float), encode+stbir__encode_order2 ); output[2] = stbir__simdf_convert_float_to_short( e );
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+
+  #else
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    float f;
+    STBIR_SIMD_NO_UNROLL(encode);
+    f = encode[stbir__encode_order0] * stbir__max_uint16_as_float + 0.5f; STBIR_CLAMP(f, 0, 65535); output[0-4] = (unsigned short)f;
+    f = encode[stbir__encode_order1] * stbir__max_uint16_as_float + 0.5f; STBIR_CLAMP(f, 0, 65535); output[1-4] = (unsigned short)f;
+    f = encode[stbir__encode_order2] * stbir__max_uint16_as_float + 0.5f; STBIR_CLAMP(f, 0, 65535); output[2-4] = (unsigned short)f;
+    f = encode[stbir__encode_order3] * stbir__max_uint16_as_float + 0.5f; STBIR_CLAMP(f, 0, 65535); output[3-4] = (unsigned short)f;
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    float f;
+    STBIR_NO_UNROLL(encode);
+    f = encode[stbir__encode_order0] * stbir__max_uint16_as_float + 0.5f; STBIR_CLAMP(f, 0, 65535); output[0] = (unsigned short)f;
+    #if stbir__coder_min_num >= 2
+    f = encode[stbir__encode_order1] * stbir__max_uint16_as_float + 0.5f; STBIR_CLAMP(f, 0, 65535); output[1] = (unsigned short)f;
+    #endif
+    #if stbir__coder_min_num >= 3
+    f = encode[stbir__encode_order2] * stbir__max_uint16_as_float + 0.5f; STBIR_CLAMP(f, 0, 65535); output[2] = (unsigned short)f;
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+  #endif
+}
+
+static void STBIR__CODER_NAME(stbir__decode_uint16_linear)( float * decodep, int width_times_channels, void const * inputp )
+{
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float * decode_end = (float*) decode + width_times_channels;
+  unsigned short const * input = (unsigned short const *)inputp;
+
+  #ifdef STBIR_SIMD
+  unsigned short const * end_input_m8 = input + width_times_channels - 8;
+  if ( width_times_channels >= 8 )
+  {
+    decode_end -= 8;
+    for(;;)
+    {
+      #ifdef STBIR_SIMD8
+      stbir__simdi i; stbir__simdi8 o;
+      stbir__simdf8 of;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdi_load( i, input );
+      stbir__simdi8_expand_u16_to_u32( o, i );
+      stbir__simdi8_convert_i32_to_float( of, o );
+      stbir__decode_simdf8_flip( of );
+      stbir__simdf8_store( decode + 0, of );
+      #else
+      stbir__simdi i, o0, o1;
+      stbir__simdf of0, of1;
+      STBIR_NO_UNROLL(decode);
+      stbir__simdi_load( i, input );
+      stbir__simdi_expand_u16_to_u32( o0, o1, i );
+      stbir__simdi_convert_i32_to_float( of0, o0 );
+      stbir__simdi_convert_i32_to_float( of1, o1 );
+      stbir__decode_simdf4_flip( of0 );
+      stbir__decode_simdf4_flip( of1 );
+      stbir__simdf_store( decode + 0,  of0 );
+      stbir__simdf_store( decode + 4,  of1 );
+      #endif
+      decode += 8;
+      input += 8;
+      if ( decode <= decode_end )
+        continue;
+      if ( decode == ( decode_end + 8 ) )
+        break;
+      decode = decode_end; // backup and do last couple
+      input = end_input_m8;
+    }
+    return;
+  }
+  #endif
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  decode += 4;
+  while( decode <= decode_end )
+  {
+    STBIR_SIMD_NO_UNROLL(decode);
+    decode[0-4] = ((float)(input[stbir__decode_order0]));
+    decode[1-4] = ((float)(input[stbir__decode_order1]));
+    decode[2-4] = ((float)(input[stbir__decode_order2]));
+    decode[3-4] = ((float)(input[stbir__decode_order3]));
+    decode += 4;
+    input += 4;
+  }
+  decode -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( decode < decode_end )
+  {
+    STBIR_NO_UNROLL(decode);
+    decode[0] = ((float)(input[stbir__decode_order0]));
+    #if stbir__coder_min_num >= 2
+    decode[1] = ((float)(input[stbir__decode_order1]));
+    #endif
+    #if stbir__coder_min_num >= 3
+    decode[2] = ((float)(input[stbir__decode_order2]));
+    #endif
+    decode += stbir__coder_min_num;
+    input += stbir__coder_min_num;
+  }
+  #endif
+}
+
+static void STBIR__CODER_NAME(stbir__encode_uint16_linear)( void * outputp, int width_times_channels, float const * encode )
+{
+  unsigned short STBIR_SIMD_STREAMOUT_PTR( * ) output = (unsigned short*) outputp;
+  unsigned short * end_output = ( (unsigned short*) output ) + width_times_channels;
+
+  #ifdef STBIR_SIMD
+  {
+    if ( width_times_channels >= stbir__simdfX_float_count*2 )
+    {
+      float const * end_encode_m8 = encode + width_times_channels - stbir__simdfX_float_count*2;
+      end_output -= stbir__simdfX_float_count*2;
+      for(;;)
+      {
+        stbir__simdfX e0, e1;
+        stbir__simdiX i;
+        STBIR_SIMD_NO_UNROLL(encode);
+        stbir__simdfX_add_mem( e0, STBIR_simd_point5X, encode );
+        stbir__simdfX_add_mem( e1, STBIR_simd_point5X, encode+stbir__simdfX_float_count );
+        stbir__encode_simdfX_unflip( e0 );
+        stbir__encode_simdfX_unflip( e1 );
+        stbir__simdfX_pack_to_words( i, e0, e1 );
+        stbir__simdiX_store( output, i );
+        encode += stbir__simdfX_float_count*2;
+        output += stbir__simdfX_float_count*2;
+        if ( output <= end_output )
+          continue;
+        if ( output == ( end_output + stbir__simdfX_float_count*2 ) )
+          break;
+        output = end_output; // backup and do last couple
+        encode = end_encode_m8;
+      }
+      return;
+    }
+  }
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    stbir__simdf e;
+    stbir__simdi i;
+    STBIR_NO_UNROLL(encode);
+    stbir__simdf_load( e, encode );
+    stbir__simdf_add( e, STBIR__CONSTF(STBIR_simd_point5), e );
+    stbir__encode_simdf4_unflip( e );
+    stbir__simdf_pack_to_8words( i, e, e );  // only use first 4
+    stbir__simdi_store2( output-4, i );
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  #else
+
+  // try to do blocks of 4 when you can
+  #if  stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    float f;
+    STBIR_SIMD_NO_UNROLL(encode);
+    f = encode[stbir__encode_order0] + 0.5f; STBIR_CLAMP(f, 0, 65535); output[0-4] = (unsigned short)f;
+    f = encode[stbir__encode_order1] + 0.5f; STBIR_CLAMP(f, 0, 65535); output[1-4] = (unsigned short)f;
+    f = encode[stbir__encode_order2] + 0.5f; STBIR_CLAMP(f, 0, 65535); output[2-4] = (unsigned short)f;
+    f = encode[stbir__encode_order3] + 0.5f; STBIR_CLAMP(f, 0, 65535); output[3-4] = (unsigned short)f;
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    float f;
+    STBIR_NO_UNROLL(encode);
+    f = encode[stbir__encode_order0] + 0.5f; STBIR_CLAMP(f, 0, 65535); output[0] = (unsigned short)f;
+    #if stbir__coder_min_num >= 2
+    f = encode[stbir__encode_order1] + 0.5f; STBIR_CLAMP(f, 0, 65535); output[1] = (unsigned short)f;
+    #endif
+    #if stbir__coder_min_num >= 3
+    f = encode[stbir__encode_order2] + 0.5f; STBIR_CLAMP(f, 0, 65535); output[2] = (unsigned short)f;
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+}
+
+static void STBIR__CODER_NAME(stbir__decode_half_float_linear)( float * decodep, int width_times_channels, void const * inputp )
+{
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float * decode_end = (float*) decode + width_times_channels;
+  stbir__FP16 const * input = (stbir__FP16 const *)inputp;
+
+  #ifdef STBIR_SIMD
+  if ( width_times_channels >= 8 )
+  {
+    stbir__FP16 const * end_input_m8 = input + width_times_channels - 8;
+    decode_end -= 8;
+    for(;;)
+    {
+      STBIR_NO_UNROLL(decode);
+
+      stbir__half_to_float_SIMD( decode, input );
+      #ifdef stbir__decode_swizzle
+      #ifdef STBIR_SIMD8
+      {
+        stbir__simdf8 of;
+        stbir__simdf8_load( of, decode );
+        stbir__decode_simdf8_flip( of );
+        stbir__simdf8_store( decode, of );
+      }
+      #else
+      {
+        stbir__simdf of0,of1;
+        stbir__simdf_load( of0, decode );
+        stbir__simdf_load( of1, decode+4 );
+        stbir__decode_simdf4_flip( of0 );
+        stbir__decode_simdf4_flip( of1 );
+        stbir__simdf_store( decode, of0 );
+        stbir__simdf_store( decode+4, of1 );
+      }
+      #endif
+      #endif
+      decode += 8;
+      input += 8;
+      if ( decode <= decode_end )
+        continue;
+      if ( decode == ( decode_end + 8 ) )
+        break;
+      decode = decode_end; // backup and do last couple
+      input = end_input_m8;
+    }
+    return;
+  }
+  #endif
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  decode += 4;
+  while( decode <= decode_end )
+  {
+    STBIR_SIMD_NO_UNROLL(decode);
+    decode[0-4] = stbir__half_to_float(input[stbir__decode_order0]);
+    decode[1-4] = stbir__half_to_float(input[stbir__decode_order1]);
+    decode[2-4] = stbir__half_to_float(input[stbir__decode_order2]);
+    decode[3-4] = stbir__half_to_float(input[stbir__decode_order3]);
+    decode += 4;
+    input += 4;
+  }
+  decode -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( decode < decode_end )
+  {
+    STBIR_NO_UNROLL(decode);
+    decode[0] = stbir__half_to_float(input[stbir__decode_order0]);
+    #if stbir__coder_min_num >= 2
+    decode[1] = stbir__half_to_float(input[stbir__decode_order1]);
+    #endif
+    #if stbir__coder_min_num >= 3
+    decode[2] = stbir__half_to_float(input[stbir__decode_order2]);
+    #endif
+    decode += stbir__coder_min_num;
+    input += stbir__coder_min_num;
+  }
+  #endif
+}
+
+static void STBIR__CODER_NAME( stbir__encode_half_float_linear )( void * outputp, int width_times_channels, float const * encode )
+{
+  stbir__FP16 STBIR_SIMD_STREAMOUT_PTR( * ) output = (stbir__FP16*) outputp;
+  stbir__FP16 * end_output = ( (stbir__FP16*) output ) + width_times_channels;
+
+  #ifdef STBIR_SIMD
+  if ( width_times_channels >= 8 )
+  {
+    float const * end_encode_m8 = encode + width_times_channels - 8;
+    end_output -= 8;
+    for(;;)
+    {
+      STBIR_SIMD_NO_UNROLL(encode);
+      #ifdef stbir__decode_swizzle
+      #ifdef STBIR_SIMD8
+      {
+        stbir__simdf8 of;
+        stbir__simdf8_load( of, encode );
+        stbir__encode_simdf8_unflip( of );
+        stbir__float_to_half_SIMD( output, (float*)&of );
+      }
+      #else
+      {
+        stbir__simdf of[2];
+        stbir__simdf_load( of[0], encode );
+        stbir__simdf_load( of[1], encode+4 );
+        stbir__encode_simdf4_unflip( of[0] );
+        stbir__encode_simdf4_unflip( of[1] );
+        stbir__float_to_half_SIMD( output, (float*)of );
+      }
+      #endif
+      #else
+      stbir__float_to_half_SIMD( output, encode );
+      #endif
+      encode += 8;
+      output += 8;
+      if ( output <= end_output )
+        continue;
+      if ( output == ( end_output + 8 ) )
+        break;
+      output = end_output; // backup and do last couple
+      encode = end_encode_m8;
+    }
+    return;
+  }
+  #endif
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    STBIR_SIMD_NO_UNROLL(output);
+    output[0-4] = stbir__float_to_half(encode[stbir__encode_order0]);
+    output[1-4] = stbir__float_to_half(encode[stbir__encode_order1]);
+    output[2-4] = stbir__float_to_half(encode[stbir__encode_order2]);
+    output[3-4] = stbir__float_to_half(encode[stbir__encode_order3]);
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    STBIR_NO_UNROLL(output);
+    output[0] = stbir__float_to_half(encode[stbir__encode_order0]);
+    #if stbir__coder_min_num >= 2
+    output[1] = stbir__float_to_half(encode[stbir__encode_order1]);
+    #endif
+    #if stbir__coder_min_num >= 3
+    output[2] = stbir__float_to_half(encode[stbir__encode_order2]);
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+}
+
+static void STBIR__CODER_NAME(stbir__decode_float_linear)( float * decodep, int width_times_channels, void const * inputp )
+{
+  #ifdef stbir__decode_swizzle
+  float STBIR_STREAMOUT_PTR( * ) decode = decodep;
+  float * decode_end = (float*) decode + width_times_channels;
+  float const * input = (float const *)inputp;
+
+  #ifdef STBIR_SIMD
+  if ( width_times_channels >= 16 )
+  {
+    float const * end_input_m16 = input + width_times_channels - 16;
+    decode_end -= 16;
+    for(;;)
+    {
+      STBIR_NO_UNROLL(decode);
+      #ifdef stbir__decode_swizzle
+      #ifdef STBIR_SIMD8
+      {
+        stbir__simdf8 of0,of1;
+        stbir__simdf8_load( of0, input );
+        stbir__simdf8_load( of1, input+8 );
+        stbir__decode_simdf8_flip( of0 );
+        stbir__decode_simdf8_flip( of1 );
+        stbir__simdf8_store( decode, of0 );
+        stbir__simdf8_store( decode+8, of1 );
+      }
+      #else
+      {
+        stbir__simdf of0,of1,of2,of3;
+        stbir__simdf_load( of0, input );
+        stbir__simdf_load( of1, input+4 );
+        stbir__simdf_load( of2, input+8 );
+        stbir__simdf_load( of3, input+12 );
+        stbir__decode_simdf4_flip( of0 );
+        stbir__decode_simdf4_flip( of1 );
+        stbir__decode_simdf4_flip( of2 );
+        stbir__decode_simdf4_flip( of3 );
+        stbir__simdf_store( decode, of0 );
+        stbir__simdf_store( decode+4, of1 );
+        stbir__simdf_store( decode+8, of2 );
+        stbir__simdf_store( decode+12, of3 );
+      }
+      #endif
+      #endif
+      decode += 16;
+      input += 16;
+      if ( decode <= decode_end )
+        continue;
+      if ( decode == ( decode_end + 16 ) )
+        break;
+      decode = decode_end; // backup and do last couple
+      input = end_input_m16;
+    }
+    return;
+  }
+  #endif
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  decode += 4;
+  while( decode <= decode_end )
+  {
+    STBIR_SIMD_NO_UNROLL(decode);
+    decode[0-4] = input[stbir__decode_order0];
+    decode[1-4] = input[stbir__decode_order1];
+    decode[2-4] = input[stbir__decode_order2];
+    decode[3-4] = input[stbir__decode_order3];
+    decode += 4;
+    input += 4;
+  }
+  decode -= 4;
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( decode < decode_end )
+  {
+    STBIR_NO_UNROLL(decode);
+    decode[0] = input[stbir__decode_order0];
+    #if stbir__coder_min_num >= 2
+    decode[1] = input[stbir__decode_order1];
+    #endif
+    #if stbir__coder_min_num >= 3
+    decode[2] = input[stbir__decode_order2];
+    #endif
+    decode += stbir__coder_min_num;
+    input += stbir__coder_min_num;
+  }
+  #endif
+
+  #else
+
+  if ( (void*)decodep != inputp )
+    STBIR_MEMCPY( decodep, inputp, width_times_channels * sizeof( float ) );
+
+  #endif
+}
+
+static void STBIR__CODER_NAME( stbir__encode_float_linear )( void * outputp, int width_times_channels, float const * encode )
+{
+  #if !defined( STBIR_FLOAT_HIGH_CLAMP ) && !defined(STBIR_FLOAT_LO_CLAMP) && !defined(stbir__decode_swizzle)
+
+  if ( (void*)outputp != (void*) encode )
+    STBIR_MEMCPY( outputp, encode, width_times_channels * sizeof( float ) );
+
+  #else
+
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = (float*) outputp;
+  float * end_output = ( (float*) output ) + width_times_channels;
+
+  #ifdef STBIR_FLOAT_HIGH_CLAMP
+  #define stbir_scalar_hi_clamp( v ) if ( v > STBIR_FLOAT_HIGH_CLAMP ) v = STBIR_FLOAT_HIGH_CLAMP;
+  #else
+  #define stbir_scalar_hi_clamp( v )
+  #endif
+  #ifdef STBIR_FLOAT_LOW_CLAMP
+  #define stbir_scalar_lo_clamp( v ) if ( v < STBIR_FLOAT_LOW_CLAMP ) v = STBIR_FLOAT_LOW_CLAMP;
+  #else
+  #define stbir_scalar_lo_clamp( v )
+  #endif
+
+  #ifdef STBIR_SIMD
+
+  #ifdef STBIR_FLOAT_HIGH_CLAMP
+  const stbir__simdfX high_clamp = stbir__simdf_frepX(STBIR_FLOAT_HIGH_CLAMP);
+  #endif
+  #ifdef STBIR_FLOAT_LOW_CLAMP
+  const stbir__simdfX low_clamp = stbir__simdf_frepX(STBIR_FLOAT_LOW_CLAMP);
+  #endif
+
+  if ( width_times_channels >= ( stbir__simdfX_float_count * 2 ) )
+  {
+    float const * end_encode_m8 = encode + width_times_channels - ( stbir__simdfX_float_count * 2 );
+    end_output -= ( stbir__simdfX_float_count * 2 );
+    for(;;)
+    {
+      stbir__simdfX e0, e1;
+      STBIR_SIMD_NO_UNROLL(encode);
+      stbir__simdfX_load( e0, encode );
+      stbir__simdfX_load( e1, encode+stbir__simdfX_float_count );
+#ifdef STBIR_FLOAT_HIGH_CLAMP
+      stbir__simdfX_min( e0, e0, high_clamp );
+      stbir__simdfX_min( e1, e1, high_clamp );
+#endif
+#ifdef STBIR_FLOAT_LOW_CLAMP
+      stbir__simdfX_max( e0, e0, low_clamp );
+      stbir__simdfX_max( e1, e1, low_clamp );
+#endif
+      stbir__encode_simdfX_unflip( e0 );
+      stbir__encode_simdfX_unflip( e1 );
+      stbir__simdfX_store( output, e0 );
+      stbir__simdfX_store( output+stbir__simdfX_float_count, e1 );
+      encode += stbir__simdfX_float_count * 2;
+      output += stbir__simdfX_float_count * 2;
+      if ( output < end_output )
+        continue;
+      if ( output == ( end_output + ( stbir__simdfX_float_count * 2 ) ) )
+        break;
+      output = end_output; // backup and do last couple
+      encode = end_encode_m8;
+    }
+    return;
+  }
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    stbir__simdf e0;
+    STBIR_NO_UNROLL(encode);
+    stbir__simdf_load( e0, encode );
+#ifdef STBIR_FLOAT_HIGH_CLAMP
+    stbir__simdf_min( e0, e0, high_clamp );
+#endif
+#ifdef STBIR_FLOAT_LOW_CLAMP
+    stbir__simdf_max( e0, e0, low_clamp );
+#endif
+    stbir__encode_simdf4_unflip( e0 );
+    stbir__simdf_store( output-4, e0 );
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+  #endif
+
+  #else
+
+  // try to do blocks of 4 when you can
+  #if stbir__coder_min_num != 3 // doesn't divide cleanly by four
+  output += 4;
+  while( output <= end_output )
+  {
+    float e;
+    STBIR_SIMD_NO_UNROLL(encode);
+    e = encode[ stbir__encode_order0 ]; stbir_scalar_hi_clamp( e ); stbir_scalar_lo_clamp( e ); output[0-4] = e;
+    e = encode[ stbir__encode_order1 ]; stbir_scalar_hi_clamp( e ); stbir_scalar_lo_clamp( e ); output[1-4] = e;
+    e = encode[ stbir__encode_order2 ]; stbir_scalar_hi_clamp( e ); stbir_scalar_lo_clamp( e ); output[2-4] = e;
+    e = encode[ stbir__encode_order3 ]; stbir_scalar_hi_clamp( e ); stbir_scalar_lo_clamp( e ); output[3-4] = e;
+    output += 4;
+    encode += 4;
+  }
+  output -= 4;
+
+  #endif
+
+  #endif
+
+  // do the remnants
+  #if stbir__coder_min_num < 4
+  while( output < end_output )
+  {
+    float e;
+    STBIR_NO_UNROLL(encode);
+    e = encode[ stbir__encode_order0 ]; stbir_scalar_hi_clamp( e ); stbir_scalar_lo_clamp( e ); output[0] = e;
+    #if stbir__coder_min_num >= 2
+    e = encode[ stbir__encode_order1 ]; stbir_scalar_hi_clamp( e ); stbir_scalar_lo_clamp( e ); output[1] = e;
+    #endif
+    #if stbir__coder_min_num >= 3
+    e = encode[ stbir__encode_order2 ]; stbir_scalar_hi_clamp( e ); stbir_scalar_lo_clamp( e ); output[2] = e;
+    #endif
+    output += stbir__coder_min_num;
+    encode += stbir__coder_min_num;
+  }
+  #endif
+
+  #endif
+}
+
+#undef stbir__decode_suffix
+#undef stbir__decode_simdf8_flip
+#undef stbir__decode_simdf4_flip
+#undef stbir__decode_order0
+#undef stbir__decode_order1
+#undef stbir__decode_order2
+#undef stbir__decode_order3
+#undef stbir__encode_order0
+#undef stbir__encode_order1
+#undef stbir__encode_order2
+#undef stbir__encode_order3
+#undef stbir__encode_simdf8_unflip
+#undef stbir__encode_simdf4_unflip
+#undef stbir__encode_simdfX_unflip
+#undef STBIR__CODER_NAME
+#undef stbir__coder_min_num
+#undef stbir__decode_swizzle
+#undef stbir_scalar_hi_clamp
+#undef stbir_scalar_lo_clamp
+#undef STB_IMAGE_RESIZE_DO_CODERS
+
+#elif defined( STB_IMAGE_RESIZE_DO_VERTICALS)
+
+#ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#define STBIR_chans( start, end ) STBIR_strs_join14(start,STBIR__vertical_channels,end,_cont)
+#else
+#define STBIR_chans( start, end ) STBIR_strs_join1(start,STBIR__vertical_channels,end)
+#endif
+
+#if STBIR__vertical_channels >= 1
+#define stbIF0( code ) code
+#else
+#define stbIF0( code )
+#endif
+#if STBIR__vertical_channels >= 2
+#define stbIF1( code ) code
+#else
+#define stbIF1( code )
+#endif
+#if STBIR__vertical_channels >= 3
+#define stbIF2( code ) code
+#else
+#define stbIF2( code )
+#endif
+#if STBIR__vertical_channels >= 4
+#define stbIF3( code ) code
+#else
+#define stbIF3( code )
+#endif
+#if STBIR__vertical_channels >= 5
+#define stbIF4( code ) code
+#else
+#define stbIF4( code )
+#endif
+#if STBIR__vertical_channels >= 6
+#define stbIF5( code ) code
+#else
+#define stbIF5( code )
+#endif
+#if STBIR__vertical_channels >= 7
+#define stbIF6( code ) code
+#else
+#define stbIF6( code )
+#endif
+#if STBIR__vertical_channels >= 8
+#define stbIF7( code ) code
+#else
+#define stbIF7( code )
+#endif
+
+static void STBIR_chans( stbir__vertical_scatter_with_,_coeffs)( float ** outputs, float const * vertical_coefficients, float const * input, float const * input_end )
+{
+  stbIF0( float STBIR_SIMD_STREAMOUT_PTR( * ) output0 = outputs[0]; float c0s = vertical_coefficients[0]; )
+  stbIF1( float STBIR_SIMD_STREAMOUT_PTR( * ) output1 = outputs[1]; float c1s = vertical_coefficients[1]; )
+  stbIF2( float STBIR_SIMD_STREAMOUT_PTR( * ) output2 = outputs[2]; float c2s = vertical_coefficients[2]; )
+  stbIF3( float STBIR_SIMD_STREAMOUT_PTR( * ) output3 = outputs[3]; float c3s = vertical_coefficients[3]; )
+  stbIF4( float STBIR_SIMD_STREAMOUT_PTR( * ) output4 = outputs[4]; float c4s = vertical_coefficients[4]; )
+  stbIF5( float STBIR_SIMD_STREAMOUT_PTR( * ) output5 = outputs[5]; float c5s = vertical_coefficients[5]; )
+  stbIF6( float STBIR_SIMD_STREAMOUT_PTR( * ) output6 = outputs[6]; float c6s = vertical_coefficients[6]; )
+  stbIF7( float STBIR_SIMD_STREAMOUT_PTR( * ) output7 = outputs[7]; float c7s = vertical_coefficients[7]; )
+
+  #ifdef STBIR_SIMD
+  {
+    stbIF0(stbir__simdfX c0 = stbir__simdf_frepX( c0s ); )
+    stbIF1(stbir__simdfX c1 = stbir__simdf_frepX( c1s ); )
+    stbIF2(stbir__simdfX c2 = stbir__simdf_frepX( c2s ); )
+    stbIF3(stbir__simdfX c3 = stbir__simdf_frepX( c3s ); )
+    stbIF4(stbir__simdfX c4 = stbir__simdf_frepX( c4s ); )
+    stbIF5(stbir__simdfX c5 = stbir__simdf_frepX( c5s ); )
+    stbIF6(stbir__simdfX c6 = stbir__simdf_frepX( c6s ); )
+    stbIF7(stbir__simdfX c7 = stbir__simdf_frepX( c7s ); )
+    while ( ( (char*)input_end - (char*) input ) >= (16*stbir__simdfX_float_count) )
+    {
+      stbir__simdfX o0, o1, o2, o3, r0, r1, r2, r3;
+      STBIR_SIMD_NO_UNROLL(output0);
+
+      stbir__simdfX_load( r0, input );               stbir__simdfX_load( r1, input+stbir__simdfX_float_count );     stbir__simdfX_load( r2, input+(2*stbir__simdfX_float_count) );      stbir__simdfX_load( r3, input+(3*stbir__simdfX_float_count) );
+
+      #ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+      stbIF0( stbir__simdfX_load( o0, output0 );     stbir__simdfX_load( o1, output0+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output0+(2*stbir__simdfX_float_count) );    stbir__simdfX_load( o3, output0+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c0 );  stbir__simdfX_madd( o1, o1, r1, c0 );  stbir__simdfX_madd( o2, o2, r2, c0 );   stbir__simdfX_madd( o3, o3, r3, c0 );
+              stbir__simdfX_store( output0, o0 );    stbir__simdfX_store( output0+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output0+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output0+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF1( stbir__simdfX_load( o0, output1 );     stbir__simdfX_load( o1, output1+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output1+(2*stbir__simdfX_float_count) );    stbir__simdfX_load( o3, output1+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c1 );  stbir__simdfX_madd( o1, o1, r1, c1 );  stbir__simdfX_madd( o2, o2, r2, c1 );   stbir__simdfX_madd( o3, o3, r3, c1 );
+              stbir__simdfX_store( output1, o0 );    stbir__simdfX_store( output1+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output1+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output1+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF2( stbir__simdfX_load( o0, output2 );     stbir__simdfX_load( o1, output2+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output2+(2*stbir__simdfX_float_count) );    stbir__simdfX_load( o3, output2+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c2 );  stbir__simdfX_madd( o1, o1, r1, c2 );  stbir__simdfX_madd( o2, o2, r2, c2 );   stbir__simdfX_madd( o3, o3, r3, c2 );
+              stbir__simdfX_store( output2, o0 );    stbir__simdfX_store( output2+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output2+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output2+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF3( stbir__simdfX_load( o0, output3 );     stbir__simdfX_load( o1, output3+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output3+(2*stbir__simdfX_float_count) );    stbir__simdfX_load( o3, output3+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c3 );  stbir__simdfX_madd( o1, o1, r1, c3 );  stbir__simdfX_madd( o2, o2, r2, c3 );   stbir__simdfX_madd( o3, o3, r3, c3 );
+              stbir__simdfX_store( output3, o0 );    stbir__simdfX_store( output3+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output3+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output3+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF4( stbir__simdfX_load( o0, output4 );     stbir__simdfX_load( o1, output4+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output4+(2*stbir__simdfX_float_count) );    stbir__simdfX_load( o3, output4+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c4 );  stbir__simdfX_madd( o1, o1, r1, c4 );  stbir__simdfX_madd( o2, o2, r2, c4 );   stbir__simdfX_madd( o3, o3, r3, c4 );
+              stbir__simdfX_store( output4, o0 );    stbir__simdfX_store( output4+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output4+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output4+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF5( stbir__simdfX_load( o0, output5 );     stbir__simdfX_load( o1, output5+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output5+(2*stbir__simdfX_float_count));    stbir__simdfX_load( o3, output5+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c5 );  stbir__simdfX_madd( o1, o1, r1, c5 );  stbir__simdfX_madd( o2, o2, r2, c5 );   stbir__simdfX_madd( o3, o3, r3, c5 );
+              stbir__simdfX_store( output5, o0 );    stbir__simdfX_store( output5+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output5+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output5+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF6( stbir__simdfX_load( o0, output6 );     stbir__simdfX_load( o1, output6+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output6+(2*stbir__simdfX_float_count) );    stbir__simdfX_load( o3, output6+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c6 );  stbir__simdfX_madd( o1, o1, r1, c6 );  stbir__simdfX_madd( o2, o2, r2, c6 );   stbir__simdfX_madd( o3, o3, r3, c6 );
+              stbir__simdfX_store( output6, o0 );    stbir__simdfX_store( output6+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output6+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output6+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF7( stbir__simdfX_load( o0, output7 );     stbir__simdfX_load( o1, output7+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output7+(2*stbir__simdfX_float_count) );    stbir__simdfX_load( o3, output7+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c7 );  stbir__simdfX_madd( o1, o1, r1, c7 );  stbir__simdfX_madd( o2, o2, r2, c7 );   stbir__simdfX_madd( o3, o3, r3, c7 );
+              stbir__simdfX_store( output7, o0 );    stbir__simdfX_store( output7+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output7+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output7+(3*stbir__simdfX_float_count), o3 ); )
+      #else
+      stbIF0( stbir__simdfX_mult( o0, r0, c0 );      stbir__simdfX_mult( o1, r1, c0 );      stbir__simdfX_mult( o2, r2, c0 );       stbir__simdfX_mult( o3, r3, c0 );
+              stbir__simdfX_store( output0, o0 );    stbir__simdfX_store( output0+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output0+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output0+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF1( stbir__simdfX_mult( o0, r0, c1 );      stbir__simdfX_mult( o1, r1, c1 );      stbir__simdfX_mult( o2, r2, c1 );       stbir__simdfX_mult( o3, r3, c1 );
+              stbir__simdfX_store( output1, o0 );    stbir__simdfX_store( output1+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output1+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output1+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF2( stbir__simdfX_mult( o0, r0, c2 );      stbir__simdfX_mult( o1, r1, c2 );      stbir__simdfX_mult( o2, r2, c2 );       stbir__simdfX_mult( o3, r3, c2 );
+              stbir__simdfX_store( output2, o0 );    stbir__simdfX_store( output2+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output2+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output2+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF3( stbir__simdfX_mult( o0, r0, c3 );      stbir__simdfX_mult( o1, r1, c3 );      stbir__simdfX_mult( o2, r2, c3 );       stbir__simdfX_mult( o3, r3, c3 );
+              stbir__simdfX_store( output3, o0 );    stbir__simdfX_store( output3+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output3+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output3+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF4( stbir__simdfX_mult( o0, r0, c4 );      stbir__simdfX_mult( o1, r1, c4 );      stbir__simdfX_mult( o2, r2, c4 );       stbir__simdfX_mult( o3, r3, c4 );
+              stbir__simdfX_store( output4, o0 );    stbir__simdfX_store( output4+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output4+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output4+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF5( stbir__simdfX_mult( o0, r0, c5 );      stbir__simdfX_mult( o1, r1, c5 );      stbir__simdfX_mult( o2, r2, c5 );       stbir__simdfX_mult( o3, r3, c5 );
+              stbir__simdfX_store( output5, o0 );    stbir__simdfX_store( output5+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output5+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output5+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF6( stbir__simdfX_mult( o0, r0, c6 );      stbir__simdfX_mult( o1, r1, c6 );      stbir__simdfX_mult( o2, r2, c6 );       stbir__simdfX_mult( o3, r3, c6 );
+              stbir__simdfX_store( output6, o0 );    stbir__simdfX_store( output6+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output6+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output6+(3*stbir__simdfX_float_count), o3 ); )
+      stbIF7( stbir__simdfX_mult( o0, r0, c7 );      stbir__simdfX_mult( o1, r1, c7 );      stbir__simdfX_mult( o2, r2, c7 );       stbir__simdfX_mult( o3, r3, c7 );
+              stbir__simdfX_store( output7, o0 );    stbir__simdfX_store( output7+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output7+(2*stbir__simdfX_float_count), o2 );   stbir__simdfX_store( output7+(3*stbir__simdfX_float_count), o3 ); )
+      #endif
+
+      input += (4*stbir__simdfX_float_count);
+      stbIF0( output0 += (4*stbir__simdfX_float_count); ) stbIF1( output1 += (4*stbir__simdfX_float_count); ) stbIF2( output2 += (4*stbir__simdfX_float_count); ) stbIF3( output3 += (4*stbir__simdfX_float_count); ) stbIF4( output4 += (4*stbir__simdfX_float_count); ) stbIF5( output5 += (4*stbir__simdfX_float_count); ) stbIF6( output6 += (4*stbir__simdfX_float_count); ) stbIF7( output7 += (4*stbir__simdfX_float_count); )
+    }
+    while ( ( (char*)input_end - (char*) input ) >= 16 )
+    {
+      stbir__simdf o0, r0;
+      STBIR_SIMD_NO_UNROLL(output0);
+
+      stbir__simdf_load( r0, input );
+
+      #ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+      stbIF0( stbir__simdf_load( o0, output0 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c0 ) );  stbir__simdf_store( output0, o0 ); )
+      stbIF1( stbir__simdf_load( o0, output1 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c1 ) );  stbir__simdf_store( output1, o0 ); )
+      stbIF2( stbir__simdf_load( o0, output2 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c2 ) );  stbir__simdf_store( output2, o0 ); )
+      stbIF3( stbir__simdf_load( o0, output3 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c3 ) );  stbir__simdf_store( output3, o0 ); )
+      stbIF4( stbir__simdf_load( o0, output4 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c4 ) );  stbir__simdf_store( output4, o0 ); )
+      stbIF5( stbir__simdf_load( o0, output5 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c5 ) );  stbir__simdf_store( output5, o0 ); )
+      stbIF6( stbir__simdf_load( o0, output6 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c6 ) );  stbir__simdf_store( output6, o0 ); )
+      stbIF7( stbir__simdf_load( o0, output7 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c7 ) );  stbir__simdf_store( output7, o0 ); )
+      #else
+      stbIF0( stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c0 ) );   stbir__simdf_store( output0, o0 ); )
+      stbIF1( stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c1 ) );   stbir__simdf_store( output1, o0 ); )
+      stbIF2( stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c2 ) );   stbir__simdf_store( output2, o0 ); )
+      stbIF3( stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c3 ) );   stbir__simdf_store( output3, o0 ); )
+      stbIF4( stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c4 ) );   stbir__simdf_store( output4, o0 ); )
+      stbIF5( stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c5 ) );   stbir__simdf_store( output5, o0 ); )
+      stbIF6( stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c6 ) );   stbir__simdf_store( output6, o0 ); )
+      stbIF7( stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c7 ) );   stbir__simdf_store( output7, o0 ); )
+      #endif
+
+      input += 4;
+      stbIF0( output0 += 4; ) stbIF1( output1 += 4; ) stbIF2( output2 += 4; ) stbIF3( output3 += 4; ) stbIF4( output4 += 4; ) stbIF5( output5 += 4; ) stbIF6( output6 += 4; ) stbIF7( output7 += 4; )
+    }
+  }
+  #else
+  while ( ( (char*)input_end - (char*) input ) >= 16 )
+  {
+    float r0, r1, r2, r3;
+    STBIR_NO_UNROLL(input);
+
+    r0 = input[0], r1 = input[1], r2 = input[2], r3 = input[3];
+
+    #ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+    stbIF0( output0[0] += ( r0 * c0s ); output0[1] += ( r1 * c0s ); output0[2] += ( r2 * c0s ); output0[3] += ( r3 * c0s ); )
+    stbIF1( output1[0] += ( r0 * c1s ); output1[1] += ( r1 * c1s ); output1[2] += ( r2 * c1s ); output1[3] += ( r3 * c1s ); )
+    stbIF2( output2[0] += ( r0 * c2s ); output2[1] += ( r1 * c2s ); output2[2] += ( r2 * c2s ); output2[3] += ( r3 * c2s ); )
+    stbIF3( output3[0] += ( r0 * c3s ); output3[1] += ( r1 * c3s ); output3[2] += ( r2 * c3s ); output3[3] += ( r3 * c3s ); )
+    stbIF4( output4[0] += ( r0 * c4s ); output4[1] += ( r1 * c4s ); output4[2] += ( r2 * c4s ); output4[3] += ( r3 * c4s ); )
+    stbIF5( output5[0] += ( r0 * c5s ); output5[1] += ( r1 * c5s ); output5[2] += ( r2 * c5s ); output5[3] += ( r3 * c5s ); )
+    stbIF6( output6[0] += ( r0 * c6s ); output6[1] += ( r1 * c6s ); output6[2] += ( r2 * c6s ); output6[3] += ( r3 * c6s ); )
+    stbIF7( output7[0] += ( r0 * c7s ); output7[1] += ( r1 * c7s ); output7[2] += ( r2 * c7s ); output7[3] += ( r3 * c7s ); )
+    #else
+    stbIF0( output0[0]  = ( r0 * c0s ); output0[1]  = ( r1 * c0s ); output0[2]  = ( r2 * c0s ); output0[3]  = ( r3 * c0s ); )
+    stbIF1( output1[0]  = ( r0 * c1s ); output1[1]  = ( r1 * c1s ); output1[2]  = ( r2 * c1s ); output1[3]  = ( r3 * c1s ); )
+    stbIF2( output2[0]  = ( r0 * c2s ); output2[1]  = ( r1 * c2s ); output2[2]  = ( r2 * c2s ); output2[3]  = ( r3 * c2s ); )
+    stbIF3( output3[0]  = ( r0 * c3s ); output3[1]  = ( r1 * c3s ); output3[2]  = ( r2 * c3s ); output3[3]  = ( r3 * c3s ); )
+    stbIF4( output4[0]  = ( r0 * c4s ); output4[1]  = ( r1 * c4s ); output4[2]  = ( r2 * c4s ); output4[3]  = ( r3 * c4s ); )
+    stbIF5( output5[0]  = ( r0 * c5s ); output5[1]  = ( r1 * c5s ); output5[2]  = ( r2 * c5s ); output5[3]  = ( r3 * c5s ); )
+    stbIF6( output6[0]  = ( r0 * c6s ); output6[1]  = ( r1 * c6s ); output6[2]  = ( r2 * c6s ); output6[3]  = ( r3 * c6s ); )
+    stbIF7( output7[0]  = ( r0 * c7s ); output7[1]  = ( r1 * c7s ); output7[2]  = ( r2 * c7s ); output7[3]  = ( r3 * c7s ); )
+    #endif
+
+    input += 4;
+    stbIF0( output0 += 4; ) stbIF1( output1 += 4; ) stbIF2( output2 += 4; ) stbIF3( output3 += 4; ) stbIF4( output4 += 4; ) stbIF5( output5 += 4; ) stbIF6( output6 += 4; ) stbIF7( output7 += 4; )
+  }
+  #endif
+  while ( input < input_end )
+  {
+    float r = input[0];
+    STBIR_NO_UNROLL(output0);
+
+    #ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+    stbIF0( output0[0] += ( r * c0s ); )
+    stbIF1( output1[0] += ( r * c1s ); )
+    stbIF2( output2[0] += ( r * c2s ); )
+    stbIF3( output3[0] += ( r * c3s ); )
+    stbIF4( output4[0] += ( r * c4s ); )
+    stbIF5( output5[0] += ( r * c5s ); )
+    stbIF6( output6[0] += ( r * c6s ); )
+    stbIF7( output7[0] += ( r * c7s ); )
+    #else
+    stbIF0( output0[0]  = ( r * c0s ); )
+    stbIF1( output1[0]  = ( r * c1s ); )
+    stbIF2( output2[0]  = ( r * c2s ); )
+    stbIF3( output3[0]  = ( r * c3s ); )
+    stbIF4( output4[0]  = ( r * c4s ); )
+    stbIF5( output5[0]  = ( r * c5s ); )
+    stbIF6( output6[0]  = ( r * c6s ); )
+    stbIF7( output7[0]  = ( r * c7s ); )
+    #endif
+
+    ++input;
+    stbIF0( ++output0; ) stbIF1( ++output1; ) stbIF2( ++output2; ) stbIF3( ++output3; ) stbIF4( ++output4; ) stbIF5( ++output5; ) stbIF6( ++output6; ) stbIF7( ++output7; )
+  }
+}
+
+static void STBIR_chans( stbir__vertical_gather_with_,_coeffs)( float * outputp, float const * vertical_coefficients, float const ** inputs, float const * input0_end )
+{
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = outputp;
+
+  stbIF0( float const * input0 = inputs[0]; float c0s = vertical_coefficients[0]; )
+  stbIF1( float const * input1 = inputs[1]; float c1s = vertical_coefficients[1]; )
+  stbIF2( float const * input2 = inputs[2]; float c2s = vertical_coefficients[2]; )
+  stbIF3( float const * input3 = inputs[3]; float c3s = vertical_coefficients[3]; )
+  stbIF4( float const * input4 = inputs[4]; float c4s = vertical_coefficients[4]; )
+  stbIF5( float const * input5 = inputs[5]; float c5s = vertical_coefficients[5]; )
+  stbIF6( float const * input6 = inputs[6]; float c6s = vertical_coefficients[6]; )
+  stbIF7( float const * input7 = inputs[7]; float c7s = vertical_coefficients[7]; )
+
+#if ( STBIR__vertical_channels == 1 ) && !defined(STB_IMAGE_RESIZE_VERTICAL_CONTINUE)
+  // check single channel one weight
+  if ( ( c0s >= (1.0f-0.000001f) ) && ( c0s <= (1.0f+0.000001f) ) )
+  {
+    STBIR_MEMCPY( output, input0, (char*)input0_end - (char*)input0 );
+    return;
+  }
+#endif
+
+  #ifdef STBIR_SIMD
+  {
+    stbIF0(stbir__simdfX c0 = stbir__simdf_frepX( c0s ); )
+    stbIF1(stbir__simdfX c1 = stbir__simdf_frepX( c1s ); )
+    stbIF2(stbir__simdfX c2 = stbir__simdf_frepX( c2s ); )
+    stbIF3(stbir__simdfX c3 = stbir__simdf_frepX( c3s ); )
+    stbIF4(stbir__simdfX c4 = stbir__simdf_frepX( c4s ); )
+    stbIF5(stbir__simdfX c5 = stbir__simdf_frepX( c5s ); )
+    stbIF6(stbir__simdfX c6 = stbir__simdf_frepX( c6s ); )
+    stbIF7(stbir__simdfX c7 = stbir__simdf_frepX( c7s ); )
+
+    while ( ( (char*)input0_end - (char*) input0 ) >= (16*stbir__simdfX_float_count) )
+    {
+      stbir__simdfX o0, o1, o2, o3, r0, r1, r2, r3;
+      STBIR_SIMD_NO_UNROLL(output);
+
+      // prefetch four loop iterations ahead (doesn't affect much for small resizes, but helps with big ones)
+      stbIF0( stbir__prefetch( input0 + (16*stbir__simdfX_float_count) ); )
+      stbIF1( stbir__prefetch( input1 + (16*stbir__simdfX_float_count) ); )
+      stbIF2( stbir__prefetch( input2 + (16*stbir__simdfX_float_count) ); )
+      stbIF3( stbir__prefetch( input3 + (16*stbir__simdfX_float_count) ); )
+      stbIF4( stbir__prefetch( input4 + (16*stbir__simdfX_float_count) ); )
+      stbIF5( stbir__prefetch( input5 + (16*stbir__simdfX_float_count) ); )
+      stbIF6( stbir__prefetch( input6 + (16*stbir__simdfX_float_count) ); )
+      stbIF7( stbir__prefetch( input7 + (16*stbir__simdfX_float_count) ); )
+
+      #ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+      stbIF0( stbir__simdfX_load( o0, output );      stbir__simdfX_load( o1, output+stbir__simdfX_float_count );   stbir__simdfX_load( o2, output+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( o3, output+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_load( r0, input0 );      stbir__simdfX_load( r1, input0+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input0+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input0+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c0 );  stbir__simdfX_madd( o1, o1, r1, c0 );                         stbir__simdfX_madd( o2, o2, r2, c0 );                             stbir__simdfX_madd( o3, o3, r3, c0 ); )
+      #else
+      stbIF0( stbir__simdfX_load( r0, input0 );      stbir__simdfX_load( r1, input0+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input0+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input0+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_mult( o0, r0, c0 );      stbir__simdfX_mult( o1, r1, c0 );                             stbir__simdfX_mult( o2, r2, c0 );                                 stbir__simdfX_mult( o3, r3, c0 );  )
+      #endif
+
+      stbIF1( stbir__simdfX_load( r0, input1 );      stbir__simdfX_load( r1, input1+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input1+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input1+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c1 );  stbir__simdfX_madd( o1, o1, r1, c1 );                         stbir__simdfX_madd( o2, o2, r2, c1 );                             stbir__simdfX_madd( o3, o3, r3, c1 ); )
+      stbIF2( stbir__simdfX_load( r0, input2 );      stbir__simdfX_load( r1, input2+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input2+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input2+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c2 );  stbir__simdfX_madd( o1, o1, r1, c2 );                         stbir__simdfX_madd( o2, o2, r2, c2 );                             stbir__simdfX_madd( o3, o3, r3, c2 ); )
+      stbIF3( stbir__simdfX_load( r0, input3 );      stbir__simdfX_load( r1, input3+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input3+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input3+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c3 );  stbir__simdfX_madd( o1, o1, r1, c3 );                         stbir__simdfX_madd( o2, o2, r2, c3 );                             stbir__simdfX_madd( o3, o3, r3, c3 ); )
+      stbIF4( stbir__simdfX_load( r0, input4 );      stbir__simdfX_load( r1, input4+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input4+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input4+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c4 );  stbir__simdfX_madd( o1, o1, r1, c4 );                         stbir__simdfX_madd( o2, o2, r2, c4 );                             stbir__simdfX_madd( o3, o3, r3, c4 ); )
+      stbIF5( stbir__simdfX_load( r0, input5 );      stbir__simdfX_load( r1, input5+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input5+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input5+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c5 );  stbir__simdfX_madd( o1, o1, r1, c5 );                         stbir__simdfX_madd( o2, o2, r2, c5 );                             stbir__simdfX_madd( o3, o3, r3, c5 ); )
+      stbIF6( stbir__simdfX_load( r0, input6 );      stbir__simdfX_load( r1, input6+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input6+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input6+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c6 );  stbir__simdfX_madd( o1, o1, r1, c6 );                         stbir__simdfX_madd( o2, o2, r2, c6 );                             stbir__simdfX_madd( o3, o3, r3, c6 ); )
+      stbIF7( stbir__simdfX_load( r0, input7 );      stbir__simdfX_load( r1, input7+stbir__simdfX_float_count );   stbir__simdfX_load( r2, input7+(2*stbir__simdfX_float_count) );   stbir__simdfX_load( r3, input7+(3*stbir__simdfX_float_count) );
+              stbir__simdfX_madd( o0, o0, r0, c7 );  stbir__simdfX_madd( o1, o1, r1, c7 );                         stbir__simdfX_madd( o2, o2, r2, c7 );                             stbir__simdfX_madd( o3, o3, r3, c7 ); )
+
+      stbir__simdfX_store( output, o0 );             stbir__simdfX_store( output+stbir__simdfX_float_count, o1 );  stbir__simdfX_store( output+(2*stbir__simdfX_float_count), o2 );  stbir__simdfX_store( output+(3*stbir__simdfX_float_count), o3 );
+      output += (4*stbir__simdfX_float_count);
+      stbIF0( input0 += (4*stbir__simdfX_float_count); ) stbIF1( input1 += (4*stbir__simdfX_float_count); ) stbIF2( input2 += (4*stbir__simdfX_float_count); ) stbIF3( input3 += (4*stbir__simdfX_float_count); ) stbIF4( input4 += (4*stbir__simdfX_float_count); ) stbIF5( input5 += (4*stbir__simdfX_float_count); ) stbIF6( input6 += (4*stbir__simdfX_float_count); ) stbIF7( input7 += (4*stbir__simdfX_float_count); )
+    }
+
+    while ( ( (char*)input0_end - (char*) input0 ) >= 16 )
+    {
+      stbir__simdf o0, r0;
+      STBIR_SIMD_NO_UNROLL(output);
+
+      #ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+      stbIF0( stbir__simdf_load( o0, output );   stbir__simdf_load( r0, input0 ); stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c0 ) ); )
+      #else
+      stbIF0( stbir__simdf_load( r0, input0 );  stbir__simdf_mult( o0, r0, stbir__if_simdf8_cast_to_simdf4( c0 ) ); )
+      #endif
+      stbIF1( stbir__simdf_load( r0, input1 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c1 ) ); )
+      stbIF2( stbir__simdf_load( r0, input2 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c2 ) ); )
+      stbIF3( stbir__simdf_load( r0, input3 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c3 ) ); )
+      stbIF4( stbir__simdf_load( r0, input4 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c4 ) ); )
+      stbIF5( stbir__simdf_load( r0, input5 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c5 ) ); )
+      stbIF6( stbir__simdf_load( r0, input6 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c6 ) ); )
+      stbIF7( stbir__simdf_load( r0, input7 );  stbir__simdf_madd( o0, o0, r0, stbir__if_simdf8_cast_to_simdf4( c7 ) ); )
+
+      stbir__simdf_store( output, o0 );
+      output += 4;
+      stbIF0( input0 += 4; ) stbIF1( input1 += 4; ) stbIF2( input2 += 4; ) stbIF3( input3 += 4; ) stbIF4( input4 += 4; ) stbIF5( input5 += 4; ) stbIF6( input6 += 4; ) stbIF7( input7 += 4; )
+    }
+  }
+  #else
+  while ( ( (char*)input0_end - (char*) input0 ) >= 16 )
+  {
+    float o0, o1, o2, o3;
+    STBIR_NO_UNROLL(output);
+    #ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+    stbIF0( o0 = output[0] + input0[0] * c0s; o1 = output[1] + input0[1] * c0s; o2 = output[2] + input0[2] * c0s; o3 = output[3] + input0[3] * c0s; )
+    #else
+    stbIF0( o0  = input0[0] * c0s; o1  = input0[1] * c0s; o2  = input0[2] * c0s; o3  = input0[3] * c0s; )
+    #endif
+    stbIF1( o0 += input1[0] * c1s; o1 += input1[1] * c1s; o2 += input1[2] * c1s; o3 += input1[3] * c1s; )
+    stbIF2( o0 += input2[0] * c2s; o1 += input2[1] * c2s; o2 += input2[2] * c2s; o3 += input2[3] * c2s; )
+    stbIF3( o0 += input3[0] * c3s; o1 += input3[1] * c3s; o2 += input3[2] * c3s; o3 += input3[3] * c3s; )
+    stbIF4( o0 += input4[0] * c4s; o1 += input4[1] * c4s; o2 += input4[2] * c4s; o3 += input4[3] * c4s; )
+    stbIF5( o0 += input5[0] * c5s; o1 += input5[1] * c5s; o2 += input5[2] * c5s; o3 += input5[3] * c5s; )
+    stbIF6( o0 += input6[0] * c6s; o1 += input6[1] * c6s; o2 += input6[2] * c6s; o3 += input6[3] * c6s; )
+    stbIF7( o0 += input7[0] * c7s; o1 += input7[1] * c7s; o2 += input7[2] * c7s; o3 += input7[3] * c7s; )
+    output[0] = o0; output[1] = o1; output[2] = o2; output[3] = o3;
+    output += 4;
+    stbIF0( input0 += 4; ) stbIF1( input1 += 4; ) stbIF2( input2 += 4; ) stbIF3( input3 += 4; ) stbIF4( input4 += 4; ) stbIF5( input5 += 4; ) stbIF6( input6 += 4; ) stbIF7( input7 += 4; )
+  }
+  #endif
+  while ( input0 < input0_end )
+  {
+    float o0;
+    STBIR_NO_UNROLL(output);
+    #ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+    stbIF0( o0 = output[0] + input0[0] * c0s; )
+    #else
+    stbIF0( o0  = input0[0] * c0s; )
+    #endif
+    stbIF1( o0 += input1[0] * c1s; )
+    stbIF2( o0 += input2[0] * c2s; )
+    stbIF3( o0 += input3[0] * c3s; )
+    stbIF4( o0 += input4[0] * c4s; )
+    stbIF5( o0 += input5[0] * c5s; )
+    stbIF6( o0 += input6[0] * c6s; )
+    stbIF7( o0 += input7[0] * c7s; )
+    output[0] = o0;
+    ++output;
+    stbIF0( ++input0; ) stbIF1( ++input1; ) stbIF2( ++input2; ) stbIF3( ++input3; ) stbIF4( ++input4; ) stbIF5( ++input5; ) stbIF6( ++input6; ) stbIF7( ++input7; )
+  }
+}
+
+#undef stbIF0
+#undef stbIF1
+#undef stbIF2
+#undef stbIF3
+#undef stbIF4
+#undef stbIF5
+#undef stbIF6
+#undef stbIF7
+#undef STB_IMAGE_RESIZE_DO_VERTICALS
+#undef STBIR__vertical_channels
+#undef STB_IMAGE_RESIZE_DO_HORIZONTALS
+#undef STBIR_strs_join24
+#undef STBIR_strs_join14
+#undef STBIR_chans
+#ifdef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#undef STB_IMAGE_RESIZE_VERTICAL_CONTINUE
+#endif
+
+#else // !STB_IMAGE_RESIZE_DO_VERTICALS
+
+#define STBIR_chans( start, end ) STBIR_strs_join1(start,STBIR__horizontal_channels,end)
+
+#ifndef stbir__2_coeff_only
+#define stbir__2_coeff_only()             \
+    stbir__1_coeff_only();                \
+    stbir__1_coeff_remnant(1);
+#endif
+
+#ifndef stbir__2_coeff_remnant
+#define stbir__2_coeff_remnant( ofs )     \
+    stbir__1_coeff_remnant(ofs);          \
+    stbir__1_coeff_remnant((ofs)+1);
+#endif
+
+#ifndef stbir__3_coeff_only
+#define stbir__3_coeff_only()             \
+    stbir__2_coeff_only();                \
+    stbir__1_coeff_remnant(2);
+#endif
+
+#ifndef stbir__3_coeff_remnant
+#define stbir__3_coeff_remnant( ofs )     \
+    stbir__2_coeff_remnant(ofs);          \
+    stbir__1_coeff_remnant((ofs)+2);
+#endif
+
+#ifndef stbir__3_coeff_setup
+#define stbir__3_coeff_setup()
+#endif
+
+#ifndef stbir__4_coeff_start
+#define stbir__4_coeff_start()            \
+    stbir__2_coeff_only();                \
+    stbir__2_coeff_remnant(2);
+#endif
+
+#ifndef stbir__4_coeff_continue_from_4
+#define stbir__4_coeff_continue_from_4( ofs )     \
+    stbir__2_coeff_remnant(ofs);                  \
+    stbir__2_coeff_remnant((ofs)+2);
+#endif
+
+#ifndef stbir__store_output_tiny
+#define stbir__store_output_tiny stbir__store_output
+#endif
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_1_coeff)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__1_coeff_only();
+    stbir__store_output_tiny();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_2_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__2_coeff_only();
+    stbir__store_output_tiny();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_3_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__3_coeff_only();
+    stbir__store_output_tiny();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_4_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__4_coeff_start();
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_5_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__4_coeff_start();
+    stbir__1_coeff_remnant(4);
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_6_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__4_coeff_start();
+    stbir__2_coeff_remnant(4);
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_7_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  stbir__3_coeff_setup();
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+
+    stbir__4_coeff_start();
+    stbir__3_coeff_remnant(4);
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_8_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__4_coeff_start();
+    stbir__4_coeff_continue_from_4(4);
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_9_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__4_coeff_start();
+    stbir__4_coeff_continue_from_4(4);
+    stbir__1_coeff_remnant(8);
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_10_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__4_coeff_start();
+    stbir__4_coeff_continue_from_4(4);
+    stbir__2_coeff_remnant(8);
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_11_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  stbir__3_coeff_setup();
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__4_coeff_start();
+    stbir__4_coeff_continue_from_4(4);
+    stbir__3_coeff_remnant(8);
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_12_coeffs)( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    float const * hc = horizontal_coefficients;
+    stbir__4_coeff_start();
+    stbir__4_coeff_continue_from_4(4);
+    stbir__4_coeff_continue_from_4(8);
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_n_coeffs_mod0 )( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    int n = ( ( horizontal_contributors->n1 - horizontal_contributors->n0 + 1 ) - 4 + 3 ) >> 2;
+    float const * hc = horizontal_coefficients;
+
+    stbir__4_coeff_start();
+    do {
+      hc += 4;
+      decode += STBIR__horizontal_channels * 4;
+      stbir__4_coeff_continue_from_4( 0 );
+      --n;
+    } while ( n > 0 );
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_n_coeffs_mod1 )( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    int n = ( ( horizontal_contributors->n1 - horizontal_contributors->n0 + 1 ) - 5 + 3 ) >> 2;
+    float const * hc = horizontal_coefficients;
+
+    stbir__4_coeff_start();
+    do {
+      hc += 4;
+      decode += STBIR__horizontal_channels * 4;
+      stbir__4_coeff_continue_from_4( 0 );
+      --n;
+    } while ( n > 0 );
+    stbir__1_coeff_remnant( 4 );
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_n_coeffs_mod2 )( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    int n = ( ( horizontal_contributors->n1 - horizontal_contributors->n0 + 1 ) - 6 + 3 ) >> 2;
+    float const * hc = horizontal_coefficients;
+
+    stbir__4_coeff_start();
+    do {
+      hc += 4;
+      decode += STBIR__horizontal_channels * 4;
+      stbir__4_coeff_continue_from_4( 0 );
+      --n;
+    } while ( n > 0 );
+    stbir__2_coeff_remnant( 4 );
+
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static void STBIR_chans( stbir__horizontal_gather_,_channels_with_n_coeffs_mod3 )( float * output_buffer, unsigned int output_sub_size, float const * decode_buffer, stbir__contributors const * horizontal_contributors, float const * horizontal_coefficients, int coefficient_width )
+{
+  float const * output_end = output_buffer + output_sub_size * STBIR__horizontal_channels;
+  float STBIR_SIMD_STREAMOUT_PTR( * ) output = output_buffer;
+  stbir__3_coeff_setup();
+  do {
+    float const * decode = decode_buffer + horizontal_contributors->n0 * STBIR__horizontal_channels;
+    int n = ( ( horizontal_contributors->n1 - horizontal_contributors->n0 + 1 ) - 7 + 3 ) >> 2;
+    float const * hc = horizontal_coefficients;
+
+    stbir__4_coeff_start();
+    do {
+      hc += 4;
+      decode += STBIR__horizontal_channels * 4;
+      stbir__4_coeff_continue_from_4( 0 );
+      --n;
+    } while ( n > 0 );
+    stbir__3_coeff_remnant( 4 );
+
+    stbir__store_output();
+  } while ( output < output_end );
+}
+
+static stbir__horizontal_gather_channels_func * STBIR_chans(stbir__horizontal_gather_,_channels_with_n_coeffs_funcs)[4]=
+{
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_n_coeffs_mod0),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_n_coeffs_mod1),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_n_coeffs_mod2),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_n_coeffs_mod3),
+};
+
+static stbir__horizontal_gather_channels_func * STBIR_chans(stbir__horizontal_gather_,_channels_funcs)[12]=
+{
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_1_coeff),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_2_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_3_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_4_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_5_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_6_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_7_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_8_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_9_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_10_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_11_coeffs),
+  STBIR_chans(stbir__horizontal_gather_,_channels_with_12_coeffs),
+};
+
+#undef STBIR__horizontal_channels
+#undef STB_IMAGE_RESIZE_DO_HORIZONTALS
+#undef stbir__1_coeff_only
+#undef stbir__1_coeff_remnant
+#undef stbir__2_coeff_only
+#undef stbir__2_coeff_remnant
+#undef stbir__3_coeff_only
+#undef stbir__3_coeff_remnant
+#undef stbir__3_coeff_setup
+#undef stbir__4_coeff_start
+#undef stbir__4_coeff_continue_from_4
+#undef stbir__store_output
+#undef stbir__store_output_tiny
+#undef STBIR_chans
+
+#endif  // HORIZONALS
+
+#undef STBIR_strs_join2
+#undef STBIR_strs_join1
+
+#endif // STB_IMAGE_RESIZE_DO_HORIZONTALS/VERTICALS/CODERS
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------
+*/
diff --git a/pxr/imaging/hio/stb/stb_image_resize2.patch b/pxr/imaging/hio/stb/stb_image_resize2.patch
new file mode 100644
index 0000000000..6a7cbd9414
--- /dev/null
+++ b/pxr/imaging/hio/stb/stb_image_resize2.patch
@@ -0,0 +1,25 @@
+--- original/stb_image_resize2.h	2024-06-17 15:21:31.710216172 -0700
++++ stb_image_resize2.h	2024-06-17 15:22:47.283085817 -0700
+@@ -6771,7 +6771,11 @@
+   void * alloced = 0;
+   size_t alloced_total = 0;
+   int vertical_first;
+-  int decode_buffer_size, ring_buffer_length_bytes, ring_buffer_size, vertical_buffer_size, alloc_ring_buffer_num_entries;
++  int decode_buffer_size, ring_buffer_length_bytes, vertical_buffer_size, alloc_ring_buffer_num_entries;
++
++#ifndef STBIR__SEPARATE_ALLOCATIONS
++  int ring_buffer_size;
++#endif
+ 
+   int alpha_weighting_type = 0; // 0=none, 1=simple, 2=fancy
+   int conservative_split_output_size = stbir__get_max_split( splits, vertical->scale_info.output_sub_size );
+@@ -6838,7 +6842,9 @@
+   if ( ( !vertical->is_gather ) && ( alloc_ring_buffer_num_entries > conservative_split_output_size ) )
+     alloc_ring_buffer_num_entries = conservative_split_output_size;
+ 
++#ifndef STBIR__SEPARATE_ALLOCATIONS
+   ring_buffer_size = alloc_ring_buffer_num_entries * ring_buffer_length_bytes;
++#endif
+ 
+   // The vertical buffer is used differently, depending on whether we are scattering
+   //   the vertical scanlines, or gathering them.
diff --git a/pxr/imaging/hio/stbImage.cpp b/pxr/imaging/hio/stbImage.cpp
index 9ff197868d..3666e8c00f 100644
--- a/pxr/imaging/hio/stbImage.cpp
+++ b/pxr/imaging/hio/stbImage.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hio/image.h"
@@ -59,7 +42,7 @@ ARCH_PRAGMA_MAYBE_UNINITIALIZED
 
 #define STB_IMAGE_RESIZE_STATIC
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
-#include "pxr/imaging/hio/stb/stb_image_resize.h"
+#include "pxr/imaging/hio/stb/stb_image_resize2.h"
 
 #define STB_IMAGE_WRITE_STATIC
 #ifdef ARCH_OS_WINDOWS
@@ -241,8 +224,6 @@ Hio_StbImage::_CropAndResize(void const *sourceData, int const cropTop,
     if (resizeNeeded) {
         //resize and copy data into storage
         if (IsColorSpaceSRGB()) {
-            int alphaIndex = (_nchannels == 3)?
-                                 STBIR_ALPHA_CHANNEL_NONE : 3;
             stbir_resize_uint8_srgb((unsigned char *) croppedData, 
                                     cropWidth, cropHeight, 
                                     croppedStrideLength,
@@ -250,26 +231,26 @@ Hio_StbImage::_CropAndResize(void const *sourceData, int const cropTop,
                                     storage.width,
                                     storage.height,
                                     storage.width * bpp,
-                                    _nchannels, alphaIndex, 0);
+                                    (stbir_pixel_layout)_nchannels);
         } else {
             if (_outputType == HioTypeFloat) {
-                    stbir_resize_float((float *) croppedData, 
+                    stbir_resize_float_linear((float *) croppedData,
                                        cropWidth, cropHeight, 
                                        croppedStrideLength,
                                        (float *)storage.data, 
                                        storage.width,
                                        storage.height,
                                        storage.width * bpp,
-                                       _nchannels);
+                                              (stbir_pixel_layout)_nchannels);
             } else {
-                stbir_resize_uint8((unsigned char *) croppedData, 
+                stbir_resize_uint8_linear((unsigned char *) croppedData,
                                    cropWidth, cropHeight,
                                    croppedStrideLength,
                                    (unsigned char *)storage.data,
                                    storage.width,
                                    storage.height,
                                    storage.width * bpp,
-                                   _nchannels);
+                                          (stbir_pixel_layout)_nchannels);
             }
         }
     }
@@ -427,6 +408,12 @@ Hio_StbImage::ReadCropped(int const cropTop,
                           int const cropRight,
                           StorageSpec const & storage)
 {
+    // check if the image is already in the desired format
+    if (storage.format != _format) {
+        TF_RUNTIME_ERROR("Image format mismatch");
+        return false;
+    }
+
     // read from file
     // NOTE: stbi_load will always return image data as a contiguous block 
     //       of memory for every image format (i.e. image data is packed 
@@ -447,7 +434,7 @@ Hio_StbImage::ReadCropped(int const cropTop,
         ArResolvedPath(_filename));
     if (!asset) 
     {
-        TF_CODING_ERROR("Cannot open image %s for reading", _filename.c_str());
+        TF_RUNTIME_ERROR("Cannot open image %s for reading", _filename.c_str());
         return false;
     }
 
@@ -478,7 +465,7 @@ Hio_StbImage::ReadCropped(int const cropTop,
     //// Read pixel data
     if (!imageData)
     {
-        TF_CODING_ERROR("unable to get_pixels");
+        TF_RUNTIME_ERROR("unable to get_pixels");
         return false;
     }
    
@@ -495,7 +482,7 @@ Hio_StbImage::ReadCropped(int const cropTop,
         if (!_CropAndResize(imageData, cropTop, cropBottom, cropLeft, cropRight, 
               resizeNeeded, storage))
         {
-            TF_CODING_ERROR("Unable to crop and resize");
+            TF_RUNTIME_ERROR("Unable to crop and resize");
             stbi_image_free(imageData);
             return false;
         }
@@ -511,8 +498,6 @@ Hio_StbImage::ReadCropped(int const cropTop,
         if (resizeNeeded) {
             // XXX STB only has a sRGB resize for 8bit
             if (IsColorSpaceSRGB() && _outputType == HioTypeUnsignedByte) {
-                const int alphaIndex = (_nchannels != 4)?
-                                       STBIR_ALPHA_CHANNEL_NONE : 3;
                 stbir_resize_uint8_srgb((unsigned char*)imageData, 
                                         _width, 
                                         _height, 
@@ -521,10 +506,10 @@ Hio_StbImage::ReadCropped(int const cropTop,
                                         storage.width,
                                         storage.height,
                                         storage.width * bpp,
-                                        _nchannels, alphaIndex, 0);
+                                        (stbir_pixel_layout)_nchannels);
             } else {
                 if (_outputType == HioTypeFloat) {
-                    stbir_resize_float((float *)imageData, 
+                    stbir_resize_float_linear((float *)imageData,
                                        _width, 
                                        _height,
                                        inputStrideInBytes,
@@ -532,9 +517,9 @@ Hio_StbImage::ReadCropped(int const cropTop,
                                        storage.width,
                                        storage.height,
                                        storage.width * bpp,
-                                       _nchannels);
+                                              (stbir_pixel_layout)_nchannels);
                 } else {
-                    stbir_resize_uint8((unsigned char *)imageData, 
+                    stbir_resize_uint8_linear((unsigned char *)imageData,
                                        _width, 
                                        _height,
                                        inputStrideInBytes,
@@ -542,7 +527,7 @@ Hio_StbImage::ReadCropped(int const cropTop,
                                        storage.width,
                                        storage.height,
                                        storage.width * bpp,
-                                       _nchannels);
+                                              (stbir_pixel_layout)_nchannels);
                 }
             }
 
@@ -559,7 +544,7 @@ Hio_StbImage::ReadCropped(int const cropTop,
 
     if (!storage.data)
     {
-        TF_CODING_ERROR("Failed to copy data to storage.data");
+        TF_RUNTIME_ERROR("Failed to copy data to storage.data");
     }
 
     stbi_image_free(imageData);
@@ -644,13 +629,13 @@ Hio_StbImage::Write(StorageSpec const & storageIn,
         quantizedSpec = _Quantize<GfHalf>(storageIn, quantizedData, isSRGB);
     }
     else if (type != HioTypeUnsignedByte && fileExtension != "hdr") {
-        TF_CODING_ERROR("stb expects unsigned byte data to write filetype %s",
+        TF_RUNTIME_ERROR("stb expects unsigned byte data to write filetype %s",
                         fileExtension.c_str());
         return false;
     }
     else if (type != HioTypeFloat && fileExtension == "hdr")
     {
-        TF_CODING_ERROR("stb expects linear float data to write filetype hdr");
+        TF_RUNTIME_ERROR("stb expects linear float data to write filetype hdr");
         return false;
     }
 
@@ -718,4 +703,3 @@ Hio_StbImage::Write(StorageSpec const & storageIn,
 
 
 PXR_NAMESPACE_CLOSE_SCOPE
-
diff --git a/pxr/imaging/hio/testenv/testHioImage.cpp b/pxr/imaging/hio/testenv/testHioImage.cpp
new file mode 100644
index 0000000000..0ff3b40094
--- /dev/null
+++ b/pxr/imaging/hio/testenv/testHioImage.cpp
@@ -0,0 +1,403 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the Apache License, Version 2.0 (the "Apache License")
+// with the following modification; you may not use this file except in
+// compliance with the Apache License and the following modification to it:
+// Section 6. Trademarks. is deleted and replaced with:
+//
+// 6. Trademarks. This License does not grant permission to use the trade
+//    names, trademarks, service marks, or product names of the Licensor
+//    and its affiliates, except as required to comply with Section 4(c) of
+//    the License and to reproduce the content of the NOTICE file.
+//
+// You may obtain a copy of the Apache License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Apache License with the above modification is
+// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the Apache License for the specific
+// language governing permissions and limitations under the Apache License.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/base/arch/defines.h"
+#include "pxr/base/plug/plugin.h"
+#include "pxr/base/plug/registry.h"
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/imaging/hio/image.h"
+#include "pxr/usd/ar/resolver.h"
+#include <array>
+#include <mutex>
+#include <iostream>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+const int w = 256;
+const int h = 256;
+
+const std::vector<uint8_t>& GetGrey8Values()
+{
+    // create a checkerboard pattern, with a stride of 32 pixels.
+    static std::once_flag _once;
+    static std::vector<uint8_t> _grey8Values(w * h);
+    std::call_once(_once, []() {
+        for (int y = 0; y < h; y++) {
+            for (int x = 0; x < w; x++) {
+                int xsnap = x & 0xE0; // mask off bottom 5 bits
+                int ysnap = y & 0xE0;
+                uint8_t value = (xsnap + ysnap) & 0xff;
+                int index = y * w + x;
+                int checkIndex = (y/32 * w + x/32);
+                if (checkIndex & 1) {
+                    _grey8Values[index] = value;
+                }
+                else {
+                    _grey8Values[index] = 255 - value;
+                }
+            }
+        }
+    });
+    return _grey8Values;
+}
+
+const std::vector<uint8_t>& GetRgb8Values()
+{
+    static std::once_flag _once;
+    static std::vector<uint8_t> _rgb8Values(w * h * 3);
+    std::call_once(_once, []() {
+        for (int y = 0; y < h; y++) {
+            for (int x = 0; x < w; x++) {
+                int index = 3 * (y * w + x);
+                _rgb8Values[index + 0] = x & 0xff;
+                _rgb8Values[index + 1] = y & 0xff;
+                _rgb8Values[index + 2] = (x + y) & 0xff;
+            }
+        }
+    });
+    return _rgb8Values;
+}
+
+const std::vector<float>& GetRgbFloatValues()
+{
+    static std::once_flag _once;
+    static std::vector<float> _rgbFloatValues(w * h * 3);
+    std::call_once(_once, []() {
+        for (int y = 0; y < h; y++) {
+            for (int x = 0; x < w; x++) {
+                int index = 3 * (y * w + x);
+                _rgbFloatValues[index + 0] = (x & 0xff) / 255.0f;
+                _rgbFloatValues[index + 1] = (y & 0xff) / 255.0f;
+                _rgbFloatValues[index + 2] = ((x + y) & 0xff) / 255.0f;
+            }
+        }
+    });
+    return _rgbFloatValues;
+}
+
+int
+main(int argc, char *argv[])
+{
+    {
+        // verify that the hio plugin exists
+        bool found = false;
+        for (PlugPluginPtr plug : PlugRegistry::GetInstance().GetAllPlugins()) {
+            if (plug->GetName() == "hio") {
+                found = true;
+                break;
+            }
+        }
+        TF_AXIOM(found);
+    }
+    {
+        // validate that the Ar plugin loaded by asking the default resolver to
+        // tell the filename extension; Ar is going to be used by Hio to load
+        // images via the Asset API.
+        const TfToken fileExtension(
+                TfStringToLowerAscii(ArGetResolver().GetExtension("test.exr")));
+        TF_AXIOM(fileExtension.GetString() == "exr");
+    }
+    {
+        // get the TfType for HioImage
+        TfType hioImageType = TfType::Find<HioImage>();
+        int stockPlugins = 0;
+        // validate that the HioImage subclass types are registered
+        std::vector<TfType> hioImageTypes =
+            PlugRegistry::GetInstance().GetDirectlyDerivedTypes(hioImageType);
+        for (auto t : hioImageTypes) {
+            auto tn = t.GetTypeName();
+            if (tn == "Hio_OpenEXRImage" || tn == "Hio_StbImage")
+                ++stockPlugins;
+        }
+        // at least exr and stb are always available.
+        TF_AXIOM(stockPlugins == 2);
+    }
+
+    // check existence of built-in formats that should always be available,
+    // as part of the OpenEXR and Stb plugins tested above.
+    {
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.exr"));
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.bmp"));
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.jpg"));
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.jpeg"));
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.png"));
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.tga"));
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.hdr"));
+        TF_AXIOM(!HioImage::IsSupportedImageFile("dummy.xml"));
+    }
+
+    // write out the greyscale values as png, then read it back in and compare
+    {
+        const std::vector<uint8_t>& grey8Values = GetGrey8Values();
+        std::string filename = "testGrey.png";
+        HioImageSharedPtr image = HioImage::OpenForWriting(filename);
+        TF_AXIOM(image);
+
+        // create storage spec
+        HioImage::StorageSpec storageSpec;
+        storageSpec.width = w;
+        storageSpec.height = h;
+        storageSpec.format = HioFormatUNorm8;
+        storageSpec.flipped = false;
+        storageSpec.data = (void*) grey8Values.data();
+        
+        TF_AXIOM(image->Write(storageSpec));
+        image.reset();
+
+        image = HioImage::OpenForReading(filename);
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatUNorm8);
+        TF_AXIOM(image->GetBytesPerPixel() == 1);
+        std::vector<uint8_t> readback(w * h);
+        auto readSpec = storageSpec;
+        readSpec.data = readback.data();
+        TF_AXIOM(image->Read(readSpec));
+        TF_AXIOM(grey8Values == readback);
+    }
+
+    // write out rgb8values as png, then read it back in and compare
+    {
+        const std::vector<uint8_t>& rgb8Values = GetRgb8Values();
+        std::string filename = "test.png";
+        HioImageSharedPtr image = HioImage::OpenForWriting(filename);
+        TF_AXIOM(image);
+
+        // create storage spec
+        HioImage::StorageSpec storageSpec;
+        storageSpec.width = w;
+        storageSpec.height = h;
+        storageSpec.format = HioFormatUNorm8Vec3srgb;
+        storageSpec.flipped = false;
+        storageSpec.data = (void*) rgb8Values.data();
+        
+        TF_AXIOM(image->Write(storageSpec));
+        image.reset();
+
+        image = HioImage::OpenForReading(filename);
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatUNorm8Vec3srgb);
+        TF_AXIOM(image->GetBytesPerPixel() == 3);
+        std::vector<uint8_t> readback(w * h * 3);
+        auto readSpec = storageSpec;
+        readSpec.data = readback.data();
+        TF_AXIOM(image->Read(readSpec));
+        TF_AXIOM(rgb8Values == readback);
+    }
+
+    // repeat for jpeg
+    {
+        const std::vector<uint8_t>& rgb8Values = GetRgb8Values();
+        std::string filename = "test.jpg";
+        HioImageSharedPtr image = HioImage::OpenForWriting(filename);
+        TF_AXIOM(image);
+
+        // create storage spec
+        HioImage::StorageSpec storageSpec;
+        storageSpec.width = w;
+        storageSpec.height = h;
+        storageSpec.format = HioFormatUNorm8Vec3srgb;
+        storageSpec.flipped = false;
+        storageSpec.data = (void*) rgb8Values.data();
+
+        TF_AXIOM(image->Write(storageSpec));
+        image.reset();
+
+        image = HioImage::OpenForReading(filename);
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatUNorm8Vec3srgb);
+        TF_AXIOM(image->GetBytesPerPixel() == 3);
+        std::vector<uint8_t> readback(w * h * 3);
+        auto readSpec = storageSpec;
+        readSpec.data = readback.data();
+        TF_AXIOM(image->Read(readSpec));
+
+        // jpeg is lossy so compare the pixels with a tolerance of +/- 1
+        for (int i = 0; i < w * h * 3; i++) {
+            TF_AXIOM(rgb8Values[i] - 2 <= readback[i] && readback[i] <= rgb8Values[i] + 2);
+        }
+    }
+
+#ifndef ARCH_OS_WINDOWS
+    // do a lossless comparison for exr and float32
+    {
+        const std::vector<float>& rgbFloatValues = GetRgbFloatValues();
+        std::string filename = "test.exr";
+        HioImageSharedPtr image = HioImage::OpenForWriting(filename);
+        TF_AXIOM(image);
+
+        // create storage spec
+        HioImage::StorageSpec storageSpec;
+        storageSpec.width = w;
+        storageSpec.height = h;
+        storageSpec.format = HioFormatFloat32Vec3;
+        storageSpec.flipped = false;
+        storageSpec.data = (void*) rgbFloatValues.data();
+
+        TF_AXIOM(image->Write(storageSpec));
+        image.reset();
+
+        image = HioImage::OpenForReading(filename);
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatFloat32Vec3);
+        TF_AXIOM(image->GetBytesPerPixel() == sizeof(float) * 3);
+        std::vector<float> readback(w * h * 3);
+        auto readSpec = storageSpec;
+        readSpec.data = readback.data();
+        TF_AXIOM(image->Read(readSpec));
+        TF_AXIOM(rgbFloatValues == readback);
+    }
+    
+    // test.exr now exists; read it requesting a half scale resize
+    {
+        const std::vector<float>& rgbFloatValues = GetRgbFloatValues();
+        HioImageSharedPtr image = HioImage::OpenForReading("test.exr");
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatFloat32Vec3);
+        TF_AXIOM(image->GetBytesPerPixel() == sizeof(float) * 3);
+
+        int w2 = w/2;
+        int h2 = h/2;
+        std::vector<float> readback(w2 * h2 * 3);
+
+        HioImage::StorageSpec readSpec;
+        readSpec.width = w2;
+        readSpec.height = h2;
+        readSpec.format = HioFormatFloat32Vec3;
+        readSpec.data = readback.data();
+        TF_AXIOM(image->Read(readSpec));
+        // verify that the pixel values are approximately the same
+        for (int y = 0; y < h2; y++) {
+            for (int x = 0; x < w2; x++) {
+                int index = 3 * (y * w2 + x);
+                int index2 = 3 * (y * 2 * w + x * 2);
+                // a loose comparison is fine for this test
+                TF_AXIOM(fabsf(readback[index + 0] - rgbFloatValues[index2 + 0]) < 16.f/255.f);
+                TF_AXIOM(fabsf(readback[index + 1] - rgbFloatValues[index2 + 1]) < 16.f/255.f);
+                TF_AXIOM(fabsf(readback[index + 2] - rgbFloatValues[index2 + 2]) < 16.f/255.f);
+            }
+        }
+    }
+#endif
+
+    // read the test.png as float32, which is expected to fail
+    {
+        HioImageSharedPtr image = HioImage::OpenForReading("test.png");
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatUNorm8Vec3srgb);
+        TF_AXIOM(image->GetBytesPerPixel() == 3);
+
+        std::cout << "Expecting an image format mismatch." << std::endl;
+        std::vector<float> readback(w * h * 3);
+        HioImage::StorageSpec readSpec;
+        readSpec.width = w;
+        readSpec.height = h;
+        readSpec.format = HioFormatFloat32Vec3;
+        readSpec.data = readback.data();
+        TF_AXIOM(!image->Read(readSpec));
+    }
+
+    // read the test.jpg as rgba, which is expected to fail
+    {
+        HioImageSharedPtr image = HioImage::OpenForReading("test.jpg");
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatUNorm8Vec3srgb);
+        TF_AXIOM(image->GetBytesPerPixel() == 3);
+
+        std::cout << "Expecting an image format mismatch." << std::endl;
+        std::vector<uint8_t> readback(w * h * 3);
+        HioImage::StorageSpec readSpec;
+        readSpec.width = w;
+        readSpec.height = h;
+        readSpec.format = HioFormatUNorm8Vec4srgb;
+        readSpec.data = readback.data();
+        TF_AXIOM(!image->Read(readSpec));
+    }
+
+#ifndef ARCH_OS_WINDOWS
+    // read the exr file as float32 rgba, and verify that the pixels are the
+    // same and that the alpha channel is full of ones.
+    {
+        HioImageSharedPtr image = HioImage::OpenForReading("test.exr");
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatFloat32Vec3);
+        TF_AXIOM(image->GetBytesPerPixel() == sizeof(float) * 3);
+        std::vector<float> readback(w * h * 4);
+        HioImage::StorageSpec readSpec;
+        readSpec.width = w;
+        readSpec.height = h;
+        readSpec.format = HioFormatFloat32Vec4;
+        readSpec.data = readback.data();
+        TF_AXIOM(image->Read(readSpec));
+        // verify that the pixel values are the same
+        const std::vector<float>& rgbFloatValues = GetRgbFloatValues();
+        for (int y = 0; y < h; y++) {
+            for (int x = 0; x < w; x++) {
+                int index = 4 * (y * w + x);
+                int index3 = 3 * (y * w + x);
+                TF_AXIOM(readback[index + 0] == rgbFloatValues[index3 + 0]);
+                TF_AXIOM(readback[index + 1] == rgbFloatValues[index3 + 1]);
+                TF_AXIOM(readback[index + 2] == rgbFloatValues[index3 + 2]);
+                TF_AXIOM(readback[index + 3] == 1.0f);
+            }
+        }
+    }
+
+    // read the exr file as uint8_t rgba, verify this is not be supported.
+    {
+        HioImageSharedPtr image = HioImage::OpenForReading("test.exr");
+        TF_AXIOM(image);
+        TF_AXIOM(image->GetWidth() == w);
+        TF_AXIOM(image->GetHeight() == h);
+        TF_AXIOM(image->GetFormat() == HioFormatFloat32Vec3);
+        TF_AXIOM(image->GetBytesPerPixel() == sizeof(float) * 3);
+        std::vector<uint8_t> readback(w * h * 4);
+        HioImage::StorageSpec readSpec;
+        readSpec.width = w;
+        readSpec.height = h;
+        readSpec.format = HioFormatUNorm8Vec4srgb;
+        readSpec.data = readback.data();
+        TF_AXIOM(!image->Read(readSpec));
+    }
+#endif
+
+    printf("OK\n");
+    return 0;
+}
diff --git a/pxr/imaging/hio/types.cpp b/pxr/imaging/hio/types.cpp
index 4eea4303fd..80470efc9b 100644
--- a/pxr/imaging/hio/types.cpp
+++ b/pxr/imaging/hio/types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/hio/types.h"
diff --git a/pxr/imaging/hio/types.h b/pxr/imaging/hio/types.h
index df540562cd..87f0de0fae 100644
--- a/pxr/imaging/hio/types.h
+++ b/pxr/imaging/hio/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_TYPES_H
 #define PXR_IMAGING_HIO_TYPES_H
diff --git a/pxr/imaging/hioOpenVDB/api.h b/pxr/imaging/hioOpenVDB/api.h
index 5358e18599..d289e345ea 100644
--- a/pxr/imaging/hioOpenVDB/api.h
+++ b/pxr/imaging/hioOpenVDB/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIOOPENVDB_API_H
 #define PXR_IMAGING_HIOOPENVDB_API_H
diff --git a/pxr/imaging/hioOpenVDB/debugCodes.cpp b/pxr/imaging/hioOpenVDB/debugCodes.cpp
index b125598d1a..f306a90abb 100644
--- a/pxr/imaging/hioOpenVDB/debugCodes.cpp
+++ b/pxr/imaging/hioOpenVDB/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file debugCodes.cpp
 
diff --git a/pxr/imaging/hioOpenVDB/debugCodes.h b/pxr/imaging/hioOpenVDB/debugCodes.h
index f1d91164e9..fc508b6a7d 100644
--- a/pxr/imaging/hioOpenVDB/debugCodes.h
+++ b/pxr/imaging/hioOpenVDB/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_OPENVDB_DEBUG_CODES_H
 #define PXR_IMAGING_HIO_OPENVDB_DEBUG_CODES_H
diff --git a/pxr/imaging/hioOpenVDB/pch.h b/pxr/imaging/hioOpenVDB/pch.h
index 2b950ebb47..a0fa6bde81 100644
--- a/pxr/imaging/hioOpenVDB/pch.h
+++ b/pxr/imaging/hioOpenVDB/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,8 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #endif
+#include <algorithm>
+#include <any>
 #include <atomic>
 #include <cfloat>
 #include <cinttypes>
@@ -54,6 +41,7 @@
 #include <functional>
 #include <initializer_list>
 #include <iosfwd>
+#include <istream>
 #include <iterator>
 #include <limits>
 #include <list>
@@ -61,16 +49,17 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <stdlib.h>
+#include <streambuf>
 #include <string>
 #include <sys/types.h>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -78,31 +67,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -111,16 +75,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/spin_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/hioOpenVDB/utils.cpp b/pxr/imaging/hioOpenVDB/utils.cpp
index cfa80b7554..fa8f39b6ab 100644
--- a/pxr/imaging/hioOpenVDB/utils.cpp
+++ b/pxr/imaging/hioOpenVDB/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hioOpenVDB/utils.h"
diff --git a/pxr/imaging/hioOpenVDB/utils.h b/pxr/imaging/hioOpenVDB/utils.h
index 6ee1a92252..91dc15c81d 100644
--- a/pxr/imaging/hioOpenVDB/utils.h
+++ b/pxr/imaging/hioOpenVDB/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_IMAGING_HIO_OPENVDB_UTILS_H
diff --git a/pxr/imaging/hioOpenVDB/vdbAssetInterface.cpp b/pxr/imaging/hioOpenVDB/vdbAssetInterface.cpp
index 39093a3ffe..a1320417d0 100644
--- a/pxr/imaging/hioOpenVDB/vdbAssetInterface.cpp
+++ b/pxr/imaging/hioOpenVDB/vdbAssetInterface.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hioOpenVDB/vdbAssetInterface.h"
diff --git a/pxr/imaging/hioOpenVDB/vdbAssetInterface.h b/pxr/imaging/hioOpenVDB/vdbAssetInterface.h
index cc2f5943a9..99d2f9423e 100644
--- a/pxr/imaging/hioOpenVDB/vdbAssetInterface.h
+++ b/pxr/imaging/hioOpenVDB/vdbAssetInterface.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_OPENVDB_ASSET_INTERFACE_H
 #define PXR_IMAGING_HIO_OPENVDB_ASSET_INTERFACE_H
diff --git a/pxr/imaging/hioOpenVDB/vdbTextureData.cpp b/pxr/imaging/hioOpenVDB/vdbTextureData.cpp
index 5802feb6a5..a687e3afbf 100644
--- a/pxr/imaging/hioOpenVDB/vdbTextureData.cpp
+++ b/pxr/imaging/hioOpenVDB/vdbTextureData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/hioOpenVDB/vdbTextureData.h"
diff --git a/pxr/imaging/hioOpenVDB/vdbTextureData.h b/pxr/imaging/hioOpenVDB/vdbTextureData.h
index e96a56d3f5..686520f3b8 100644
--- a/pxr/imaging/hioOpenVDB/vdbTextureData.h
+++ b/pxr/imaging/hioOpenVDB/vdbTextureData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_HIO_OPENVDB_TEXTURE_DATA_H
 #define PXR_IMAGING_HIO_OPENVDB_TEXTURE_DATA_H
diff --git a/pxr/imaging/plugin/CMakeLists.txt b/pxr/imaging/plugin/CMakeLists.txt
index 657c3b4261..aca60cd8ec 100644
--- a/pxr/imaging/plugin/CMakeLists.txt
+++ b/pxr/imaging/plugin/CMakeLists.txt
@@ -8,3 +8,4 @@ endif()
 if (PXR_BUILD_OPENIMAGEIO_PLUGIN)
     add_subdirectory(hioOiio)
 endif()
+add_subdirectory(hioAvif)
diff --git a/pxr/imaging/plugin/hdEmbree/config.cpp b/pxr/imaging/plugin/hdEmbree/config.cpp
index 5aadd92c26..2501a99d04 100644
--- a/pxr/imaging/plugin/hdEmbree/config.cpp
+++ b/pxr/imaging/plugin/hdEmbree/config.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/config.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/config.h b/pxr/imaging/plugin/hdEmbree/config.h
index 3c56fd7805..708c2cd43a 100644
--- a/pxr/imaging/plugin/hdEmbree/config.h
+++ b/pxr/imaging/plugin/hdEmbree/config.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_CONFIG_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_CONFIG_H
diff --git a/pxr/imaging/plugin/hdEmbree/context.h b/pxr/imaging/plugin/hdEmbree/context.h
index 7af4ab0d27..4165adb1e6 100644
--- a/pxr/imaging/plugin/hdEmbree/context.h
+++ b/pxr/imaging/plugin/hdEmbree/context.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_CONTEXT_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_CONTEXT_H
diff --git a/pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.cpp b/pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.cpp
index aa7684ce6b..2489057bf8 100644
--- a/pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.cpp
+++ b/pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.h b/pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.h
index 2d0785273a..33797801a4 100644
--- a/pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.h
+++ b/pxr/imaging/plugin/hdEmbree/implicitSurfaceSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
diff --git a/pxr/imaging/plugin/hdEmbree/instancer.cpp b/pxr/imaging/plugin/hdEmbree/instancer.cpp
index 1484c771e2..5d484360ce 100644
--- a/pxr/imaging/plugin/hdEmbree/instancer.cpp
+++ b/pxr/imaging/plugin/hdEmbree/instancer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/instancer.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/instancer.h b/pxr/imaging/plugin/hdEmbree/instancer.h
index 358a7b3d2d..72fe40559b 100644
--- a/pxr/imaging/plugin/hdEmbree/instancer.h
+++ b/pxr/imaging/plugin/hdEmbree/instancer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_INSTANCER_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_INSTANCER_H
diff --git a/pxr/imaging/plugin/hdEmbree/mesh.cpp b/pxr/imaging/plugin/hdEmbree/mesh.cpp
index e8e001e1cc..195f83a633 100644
--- a/pxr/imaging/plugin/hdEmbree/mesh.cpp
+++ b/pxr/imaging/plugin/hdEmbree/mesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/mesh.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/mesh.h b/pxr/imaging/plugin/hdEmbree/mesh.h
index 4574454368..29b0d55029 100644
--- a/pxr/imaging/plugin/hdEmbree/mesh.h
+++ b/pxr/imaging/plugin/hdEmbree/mesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_MESH_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_MESH_H
diff --git a/pxr/imaging/plugin/hdEmbree/meshSamplers.cpp b/pxr/imaging/plugin/hdEmbree/meshSamplers.cpp
index 2bc54612bd..87bde49ee4 100644
--- a/pxr/imaging/plugin/hdEmbree/meshSamplers.cpp
+++ b/pxr/imaging/plugin/hdEmbree/meshSamplers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/meshSamplers.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/meshSamplers.h b/pxr/imaging/plugin/hdEmbree/meshSamplers.h
index bef6f65959..c32c35fffa 100644
--- a/pxr/imaging/plugin/hdEmbree/meshSamplers.h
+++ b/pxr/imaging/plugin/hdEmbree/meshSamplers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_MESH_SAMPLERS_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_MESH_SAMPLERS_H
diff --git a/pxr/imaging/plugin/hdEmbree/pch.h b/pxr/imaging/plugin/hdEmbree/pch.h
index 7710229804..200633939c 100644
--- a/pxr/imaging/plugin/hdEmbree/pch.h
+++ b/pxr/imaging/plugin/hdEmbree/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -40,11 +24,10 @@
 
 #include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -72,6 +55,9 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <random>
 #include <set>
 #include <sstream>
@@ -81,6 +67,7 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -88,45 +75,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -135,34 +83,18 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
 #include <embree3/rtcore.h>
 #include <embree3/rtcore_geometry.h>
 #include <embree3/rtcore_ray.h>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_for_each.h>
 #include <tbb/spin_mutex.h>
-#include <tbb/task.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/plugin/hdEmbree/renderBuffer.cpp b/pxr/imaging/plugin/hdEmbree/renderBuffer.cpp
index 75cb7ca239..00788e3248 100644
--- a/pxr/imaging/plugin/hdEmbree/renderBuffer.cpp
+++ b/pxr/imaging/plugin/hdEmbree/renderBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/renderBuffer.h"
 #include "pxr/imaging/plugin/hdEmbree/renderParam.h"
diff --git a/pxr/imaging/plugin/hdEmbree/renderBuffer.h b/pxr/imaging/plugin/hdEmbree/renderBuffer.h
index de868cd5db..10c9813c8d 100644
--- a/pxr/imaging/plugin/hdEmbree/renderBuffer.h
+++ b/pxr/imaging/plugin/hdEmbree/renderBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_RENDER_BUFFER_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_RENDER_BUFFER_H
diff --git a/pxr/imaging/plugin/hdEmbree/renderDelegate.cpp b/pxr/imaging/plugin/hdEmbree/renderDelegate.cpp
index fd4959e288..fb77050b40 100644
--- a/pxr/imaging/plugin/hdEmbree/renderDelegate.cpp
+++ b/pxr/imaging/plugin/hdEmbree/renderDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/renderDelegate.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/renderDelegate.h b/pxr/imaging/plugin/hdEmbree/renderDelegate.h
index 20a80487a9..d4f8f78d54 100644
--- a/pxr/imaging/plugin/hdEmbree/renderDelegate.h
+++ b/pxr/imaging/plugin/hdEmbree/renderDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_RENDER_DELEGATE_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_RENDER_DELEGATE_H
diff --git a/pxr/imaging/plugin/hdEmbree/renderParam.h b/pxr/imaging/plugin/hdEmbree/renderParam.h
index ff61000ab5..206a7458bc 100644
--- a/pxr/imaging/plugin/hdEmbree/renderParam.h
+++ b/pxr/imaging/plugin/hdEmbree/renderParam.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_RENDER_PARAM_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_RENDER_PARAM_H
diff --git a/pxr/imaging/plugin/hdEmbree/renderPass.cpp b/pxr/imaging/plugin/hdEmbree/renderPass.cpp
index 62cfb35c98..9583d8c757 100644
--- a/pxr/imaging/plugin/hdEmbree/renderPass.cpp
+++ b/pxr/imaging/plugin/hdEmbree/renderPass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hd/renderPassState.h"
 #include "pxr/imaging/plugin/hdEmbree/renderDelegate.h"
diff --git a/pxr/imaging/plugin/hdEmbree/renderPass.h b/pxr/imaging/plugin/hdEmbree/renderPass.h
index b2513bb4f4..6aaa77b378 100644
--- a/pxr/imaging/plugin/hdEmbree/renderPass.h
+++ b/pxr/imaging/plugin/hdEmbree/renderPass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_RENDER_PASS_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_RENDER_PASS_H
diff --git a/pxr/imaging/plugin/hdEmbree/renderer.cpp b/pxr/imaging/plugin/hdEmbree/renderer.cpp
index a0e233bd35..2a5930ed5f 100644
--- a/pxr/imaging/plugin/hdEmbree/renderer.cpp
+++ b/pxr/imaging/plugin/hdEmbree/renderer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/renderer.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/renderer.h b/pxr/imaging/plugin/hdEmbree/renderer.h
index 6af8081678..8e727ecba0 100644
--- a/pxr/imaging/plugin/hdEmbree/renderer.h
+++ b/pxr/imaging/plugin/hdEmbree/renderer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_RENDERER_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_RENDERER_H
diff --git a/pxr/imaging/plugin/hdEmbree/rendererPlugin.cpp b/pxr/imaging/plugin/hdEmbree/rendererPlugin.cpp
index fde545d90f..47d4cc4c8e 100644
--- a/pxr/imaging/plugin/hdEmbree/rendererPlugin.cpp
+++ b/pxr/imaging/plugin/hdEmbree/rendererPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/rendererPlugin.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/rendererPlugin.h b/pxr/imaging/plugin/hdEmbree/rendererPlugin.h
index ae1881dfe9..1c03f47992 100644
--- a/pxr/imaging/plugin/hdEmbree/rendererPlugin.h
+++ b/pxr/imaging/plugin/hdEmbree/rendererPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_RENDERER_PLUGIN_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_RENDERER_PLUGIN_H
diff --git a/pxr/imaging/plugin/hdEmbree/sampler.cpp b/pxr/imaging/plugin/hdEmbree/sampler.cpp
index df526ef375..0a550ca3c9 100644
--- a/pxr/imaging/plugin/hdEmbree/sampler.cpp
+++ b/pxr/imaging/plugin/hdEmbree/sampler.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdEmbree/sampler.h"
 
diff --git a/pxr/imaging/plugin/hdEmbree/sampler.h b/pxr/imaging/plugin/hdEmbree/sampler.h
index ff5221fa67..dd91ae8c5d 100644
--- a/pxr/imaging/plugin/hdEmbree/sampler.h
+++ b/pxr/imaging/plugin/hdEmbree/sampler.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_EMBREE_SAMPLER_H
 #define PXR_IMAGING_PLUGIN_HD_EMBREE_SAMPLER_H
diff --git a/pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp b/pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp
index c361c678bc..02c2ca69f8 100644
--- a/pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp
+++ b/pxr/imaging/plugin/hdEmbree/testenv/testHdEmbree.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.cpp b/pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.cpp
index 5c8d4ee3f7..0f1612e0bc 100644
--- a/pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.cpp
+++ b/pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.h"
 
@@ -28,6 +11,7 @@
 #include "pxr/base/plug/registry.h"
 #include "pxr/base/tf/getenv.h"
 #include "pxr/base/tf/setenv.h"
+#include "pxr/base/tf/stringUtils.h"
 #include "pxr/imaging/hd/rendererPluginRegistry.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -54,6 +38,7 @@ static struct HdPrmanLoader
     CreateDelegateFunc createFunc = nullptr;
     DeleteDelegateFunc deleteFunc = nullptr;
     bool valid = false;
+    std::string errorMsg;
 } _hdPrman;
 
 void 
@@ -67,7 +52,7 @@ HdPrmanLoader::Load()
 
     const std::string rmantree = TfGetenv(k_RMANTREE);
     if (rmantree.empty()) {
-        TF_WARN("The hdPrmanLoader backend requires $RMANTREE to be set.");
+        _hdPrman.errorMsg = "The hdPrmanLoader backend requires $RMANTREE to be set.";
         return;
     }
 
@@ -79,7 +64,8 @@ HdPrmanLoader::Load()
         libprmanPath,
         ARCH_LIBRARY_NOW | ARCH_LIBRARY_GLOBAL);
     if (!_hdPrman.libprman) {
-        TF_WARN("Could not load libprman.");
+        _hdPrman.errorMsg = TfStringPrintf("Could not load libprman: %s",
+            ArchLibraryError().c_str());
         return;
     }
 
@@ -95,20 +81,19 @@ HdPrmanLoader::Load()
     PlugPluginPtr plugin =
         PlugRegistry::GetInstance().GetPluginWithName("hdPrman");
 
-    // Backwards compatibility for hdxPrman.
-    // hdxPrman is deprecated, since it's been merged into hdPrman now.
     if (!plugin) {
-        plugin = PlugRegistry::GetInstance().GetPluginWithName("hdxPrman");
+        _hdPrman.errorMsg =
+            TfStringPrintf("Could not find hdPrman plugin registration.");
+        return;
     }
 
-    if (plugin) {
-        _hdPrman.hdPrman = ArchLibraryOpen(
-            plugin->GetPath(),
-            ARCH_LIBRARY_NOW | ARCH_LIBRARY_LOCAL);
-    }
+    _hdPrman.hdPrman = ArchLibraryOpen(
+        plugin->GetPath(),
+        ARCH_LIBRARY_NOW | ARCH_LIBRARY_LOCAL);
 
     if (!_hdPrman.hdPrman) {
-        TF_WARN("Could not load versioned hdPrman backend: %s",
+        _hdPrman.errorMsg =
+            TfStringPrintf("Could not load versioned hdPrman backend: %s",
                 ArchLibraryError().c_str());
         return;
     }
@@ -121,7 +106,8 @@ HdPrmanLoader::Load()
                                     "HdPrmanLoaderDeleteDelegate"));
 
     if (!_hdPrman.createFunc || !_hdPrman.deleteFunc) {
-        TF_WARN("hdPrmanLoader factory methods could not be found.");
+        _hdPrman.errorMsg = "hdPrmanLoader factory methods could not be found "
+            "in hdPrman plugin.";
         return;
     }
 
@@ -164,8 +150,11 @@ HdPrmanLoaderRendererPlugin::CreateRenderDelegate()
     if (_hdPrman.valid) {
         HdRenderSettingsMap settingsMap;
         return _hdPrman.createFunc(settingsMap);
+    } else {
+        TF_WARN("Could not create hdPrman instance: %s",
+                _hdPrman.errorMsg.c_str());
+        return nullptr;
     }
-    return nullptr;
 }
 
 HdRenderDelegate*
@@ -174,8 +163,11 @@ HdPrmanLoaderRendererPlugin::CreateRenderDelegate(
 {
     if (_hdPrman.valid) {
         return _hdPrman.createFunc(settingsMap);
+    } else {
+        TF_WARN("Could not create hdPrman instance: %s",
+                _hdPrman.errorMsg.c_str());
+        return nullptr;
     }
-    return nullptr;
 }
 
 void
@@ -190,6 +182,12 @@ HdPrmanLoaderRendererPlugin::DeleteRenderDelegate(
 bool
 HdPrmanLoaderRendererPlugin::IsSupported(bool /* gpuEnabled */) const
 {
+    if (!_hdPrman.valid) {
+        TF_DEBUG(HD_RENDERER_PLUGIN).Msg(
+            "hdPrman renderer plugin unsupported: %s\n",
+            _hdPrman.errorMsg.c_str());
+    }
+
     // Eventually will need to make this deal with whether RIS or XPU is used.
     return _hdPrman.valid;
 }
diff --git a/pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.h b/pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.h
index ebaca9913a..2a57fb87fa 100644
--- a/pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.h
+++ b/pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_PRMAN_LOADER_RENDERER_PLUGIN_H
 #define PXR_IMAGING_PLUGIN_HD_PRMAN_LOADER_RENDERER_PLUGIN_H
diff --git a/pxr/imaging/plugin/hdStorm/pch.h b/pxr/imaging/plugin/hdStorm/pch.h
index 33c5124a97..cca539da80 100644
--- a/pxr/imaging/plugin/hdStorm/pch.h
+++ b/pxr/imaging/plugin/hdStorm/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cfloat>
 #include <cinttypes>
@@ -67,6 +50,7 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -75,6 +59,7 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -82,43 +67,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
@@ -127,22 +75,8 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/spin_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/plugin/hdStorm/rendererPlugin.cpp b/pxr/imaging/plugin/hdStorm/rendererPlugin.cpp
index 281dc87977..d680ed6928 100644
--- a/pxr/imaging/plugin/hdStorm/rendererPlugin.cpp
+++ b/pxr/imaging/plugin/hdStorm/rendererPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/plugin/hdStorm/rendererPlugin.h"
@@ -57,7 +40,13 @@ HdStormRendererPlugin::DeleteRenderDelegate(HdRenderDelegate *renderDelegate)
 bool
 HdStormRendererPlugin::IsSupported(bool gpuEnabled) const
 {
-    return gpuEnabled ? HdStRenderDelegate::IsSupported() : false;
+    const bool support = gpuEnabled && HdStRenderDelegate::IsSupported();
+    if (!support) {
+        TF_DEBUG(HD_RENDERER_PLUGIN).Msg(
+            "hdStorm renderer plugin unsupported: %s\n",
+            gpuEnabled ? "hgi unsupported" : "no gpu");
+    }
+    return support;
 }
 
 
diff --git a/pxr/imaging/plugin/hdStorm/rendererPlugin.h b/pxr/imaging/plugin/hdStorm/rendererPlugin.h
index 96d4561e46..808e74ee64 100644
--- a/pxr/imaging/plugin/hdStorm/rendererPlugin.h
+++ b/pxr/imaging/plugin/hdStorm/rendererPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PLUGIN_HD_STORM_RENDERER_PLUGIN_H
 #define PXR_IMAGING_PLUGIN_HD_STORM_RENDERER_PLUGIN_H
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/alpha.c b/pxr/imaging/plugin/hioAvif/AVIF/src/alpha.c
new file mode 100644
index 0000000000..d6d5d42957
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/alpha.c
@@ -0,0 +1,347 @@
+// Copyright 2020 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <assert.h>
+#include <string.h>
+
+void avifFillAlpha(const avifAlphaParams * params)
+{
+    if (params->dstDepth > 8) {
+        const uint16_t maxChannel = (uint16_t)((1 << params->dstDepth) - 1);
+        for (uint32_t j = 0; j < params->height; ++j) {
+            uint8_t * dstRow = &params->dstPlane[params->dstOffsetBytes + (j * params->dstRowBytes)];
+            for (uint32_t i = 0; i < params->width; ++i) {
+                *((uint16_t *)dstRow) = maxChannel;
+                dstRow += params->dstPixelBytes;
+            }
+        }
+    } else {
+        // In this case, (1 << params->dstDepth) - 1 is always equal to 255.
+        const uint8_t maxChannel = 255;
+        for (uint32_t j = 0; j < params->height; ++j) {
+            uint8_t * dstRow = &params->dstPlane[params->dstOffsetBytes + (j * params->dstRowBytes)];
+            for (uint32_t i = 0; i < params->width; ++i) {
+                *dstRow = maxChannel;
+                dstRow += params->dstPixelBytes;
+            }
+        }
+    }
+}
+
+void avifReformatAlpha(const avifAlphaParams * params)
+{
+    const int srcMaxChannel = (1 << params->srcDepth) - 1;
+    const int dstMaxChannel = (1 << params->dstDepth) - 1;
+    const float srcMaxChannelF = (float)srcMaxChannel;
+    const float dstMaxChannelF = (float)dstMaxChannel;
+
+    if (params->srcDepth == params->dstDepth) {
+        // no depth rescale
+
+        if (params->srcDepth > 8) {
+            // no depth rescale, uint16_t -> uint16_t
+
+            for (uint32_t j = 0; j < params->height; ++j) {
+                const uint8_t * srcRow = &params->srcPlane[params->srcOffsetBytes + (j * params->srcRowBytes)];
+                uint8_t * dstRow = &params->dstPlane[params->dstOffsetBytes + (j * params->dstRowBytes)];
+                for (uint32_t i = 0; i < params->width; ++i) {
+                    *((uint16_t *)&dstRow[i * params->dstPixelBytes]) = *((const uint16_t *)&srcRow[i * params->srcPixelBytes]);
+                }
+            }
+        } else {
+            // no depth rescale, uint8_t -> uint8_t
+
+            for (uint32_t j = 0; j < params->height; ++j) {
+                const uint8_t * srcRow = &params->srcPlane[params->srcOffsetBytes + (j * params->srcRowBytes)];
+                uint8_t * dstRow = &params->dstPlane[params->dstOffsetBytes + (j * params->dstRowBytes)];
+                for (uint32_t i = 0; i < params->width; ++i) {
+                    dstRow[i * params->dstPixelBytes] = srcRow[i * params->srcPixelBytes];
+                }
+            }
+        }
+    } else {
+        // depth rescale
+
+        if (params->srcDepth > 8) {
+            if (params->dstDepth > 8) {
+                // depth rescale, uint16_t -> uint16_t
+
+                for (uint32_t j = 0; j < params->height; ++j) {
+                    const uint8_t * srcRow = &params->srcPlane[params->srcOffsetBytes + (j * params->srcRowBytes)];
+                    uint8_t * dstRow = &params->dstPlane[params->dstOffsetBytes + (j * params->dstRowBytes)];
+                    for (uint32_t i = 0; i < params->width; ++i) {
+                        int srcAlpha = *((const uint16_t *)&srcRow[i * params->srcPixelBytes]);
+                        float alphaF = (float)srcAlpha / srcMaxChannelF;
+                        int dstAlpha = (int)(0.5f + (alphaF * dstMaxChannelF));
+                        dstAlpha = AVIF_CLAMP(dstAlpha, 0, dstMaxChannel);
+                        *((uint16_t *)&dstRow[i * params->dstPixelBytes]) = (uint16_t)dstAlpha;
+                    }
+                }
+            } else {
+                // depth rescale, uint16_t -> uint8_t
+
+                for (uint32_t j = 0; j < params->height; ++j) {
+                    const uint8_t * srcRow = &params->srcPlane[params->srcOffsetBytes + (j * params->srcRowBytes)];
+                    uint8_t * dstRow = &params->dstPlane[params->dstOffsetBytes + (j * params->dstRowBytes)];
+                    for (uint32_t i = 0; i < params->width; ++i) {
+                        int srcAlpha = *((const uint16_t *)&srcRow[i * params->srcPixelBytes]);
+                        float alphaF = (float)srcAlpha / srcMaxChannelF;
+                        int dstAlpha = (int)(0.5f + (alphaF * dstMaxChannelF));
+                        dstAlpha = AVIF_CLAMP(dstAlpha, 0, dstMaxChannel);
+                        dstRow[i * params->dstPixelBytes] = (uint8_t)dstAlpha;
+                    }
+                }
+            }
+        } else {
+            // If (srcDepth == 8), dstDepth must be >8 otherwise we'd be in the (params->srcDepth == params->dstDepth) block above.
+            assert(params->dstDepth > 8);
+
+            // depth rescale, uint8_t -> uint16_t
+            for (uint32_t j = 0; j < params->height; ++j) {
+                const uint8_t * srcRow = &params->srcPlane[params->srcOffsetBytes + (j * params->srcRowBytes)];
+                uint8_t * dstRow = &params->dstPlane[params->dstOffsetBytes + (j * params->dstRowBytes)];
+                for (uint32_t i = 0; i < params->width; ++i) {
+                    int srcAlpha = srcRow[i * params->srcPixelBytes];
+                    float alphaF = (float)srcAlpha / srcMaxChannelF;
+                    int dstAlpha = (int)(0.5f + (alphaF * dstMaxChannelF));
+                    dstAlpha = AVIF_CLAMP(dstAlpha, 0, dstMaxChannel);
+                    *((uint16_t *)&dstRow[i * params->dstPixelBytes]) = (uint16_t)dstAlpha;
+                }
+            }
+        }
+    }
+}
+
+avifResult avifRGBImagePremultiplyAlpha(avifRGBImage * rgb)
+{
+    // no data
+    if (!rgb->pixels || !rgb->rowBytes) {
+        return AVIF_RESULT_REFORMAT_FAILED;
+    }
+
+    // no alpha.
+    if (!avifRGBFormatHasAlpha(rgb->format)) {
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+
+    avifResult libyuvResult = avifRGBImagePremultiplyAlphaLibYUV(rgb);
+    if (libyuvResult != AVIF_RESULT_NOT_IMPLEMENTED) {
+        return libyuvResult;
+    }
+
+    assert(rgb->depth >= 8 && rgb->depth <= 16);
+
+    uint32_t max = (1 << rgb->depth) - 1;
+    float maxF = (float)max;
+
+    if (rgb->depth > 8) {
+        if (rgb->format == AVIF_RGB_FORMAT_RGBA || rgb->format == AVIF_RGB_FORMAT_BGRA) {
+            for (uint32_t j = 0; j < rgb->height; ++j) {
+                uint8_t * row = &rgb->pixels[j * rgb->rowBytes];
+                for (uint32_t i = 0; i < rgb->width; ++i) {
+                    uint16_t * pixel = (uint16_t *)&row[i * 8];
+                    uint16_t a = pixel[3];
+                    if (a >= max) {
+                        // opaque is no-op
+                        continue;
+                    } else if (a == 0) {
+                        // result must be zero
+                        pixel[0] = 0;
+                        pixel[1] = 0;
+                        pixel[2] = 0;
+                    } else {
+                        // a < maxF is always true now, so we don't need clamp here
+                        pixel[0] = (uint16_t)avifRoundf((float)pixel[0] * (float)a / maxF);
+                        pixel[1] = (uint16_t)avifRoundf((float)pixel[1] * (float)a / maxF);
+                        pixel[2] = (uint16_t)avifRoundf((float)pixel[2] * (float)a / maxF);
+                    }
+                }
+            }
+        } else {
+            for (uint32_t j = 0; j < rgb->height; ++j) {
+                uint8_t * row = &rgb->pixels[j * rgb->rowBytes];
+                for (uint32_t i = 0; i < rgb->width; ++i) {
+                    uint16_t * pixel = (uint16_t *)&row[i * 8];
+                    uint16_t a = pixel[0];
+                    if (a >= max) {
+                        continue;
+                    } else if (a == 0) {
+                        pixel[1] = 0;
+                        pixel[2] = 0;
+                        pixel[3] = 0;
+                    } else {
+                        pixel[1] = (uint16_t)avifRoundf((float)pixel[1] * (float)a / maxF);
+                        pixel[2] = (uint16_t)avifRoundf((float)pixel[2] * (float)a / maxF);
+                        pixel[3] = (uint16_t)avifRoundf((float)pixel[3] * (float)a / maxF);
+                    }
+                }
+            }
+        }
+    } else {
+        if (rgb->format == AVIF_RGB_FORMAT_RGBA || rgb->format == AVIF_RGB_FORMAT_BGRA) {
+            for (uint32_t j = 0; j < rgb->height; ++j) {
+                uint8_t * row = &rgb->pixels[j * rgb->rowBytes];
+                for (uint32_t i = 0; i < rgb->width; ++i) {
+                    uint8_t * pixel = &row[i * 4];
+                    uint8_t a = pixel[3];
+                    // uint8_t can't exceed 255
+                    if (a == max) {
+                        continue;
+                    } else if (a == 0) {
+                        pixel[0] = 0;
+                        pixel[1] = 0;
+                        pixel[2] = 0;
+                    } else {
+                        pixel[0] = (uint8_t)avifRoundf((float)pixel[0] * (float)a / maxF);
+                        pixel[1] = (uint8_t)avifRoundf((float)pixel[1] * (float)a / maxF);
+                        pixel[2] = (uint8_t)avifRoundf((float)pixel[2] * (float)a / maxF);
+                    }
+                }
+            }
+        } else {
+            for (uint32_t j = 0; j < rgb->height; ++j) {
+                uint8_t * row = &rgb->pixels[j * rgb->rowBytes];
+                for (uint32_t i = 0; i < rgb->width; ++i) {
+                    uint8_t * pixel = &row[i * 4];
+                    uint8_t a = pixel[0];
+                    if (a == max) {
+                        continue;
+                    } else if (a == 0) {
+                        pixel[1] = 0;
+                        pixel[2] = 0;
+                        pixel[3] = 0;
+                    } else {
+                        pixel[1] = (uint8_t)avifRoundf((float)pixel[1] * (float)a / maxF);
+                        pixel[2] = (uint8_t)avifRoundf((float)pixel[2] * (float)a / maxF);
+                        pixel[3] = (uint8_t)avifRoundf((float)pixel[3] * (float)a / maxF);
+                    }
+                }
+            }
+        }
+    }
+
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRGBImageUnpremultiplyAlpha(avifRGBImage * rgb)
+{
+    // no data
+    if (!rgb->pixels || !rgb->rowBytes) {
+        return AVIF_RESULT_REFORMAT_FAILED;
+    }
+
+    // no alpha.
+    if (!avifRGBFormatHasAlpha(rgb->format)) {
+        return AVIF_RESULT_REFORMAT_FAILED;
+    }
+
+    avifResult libyuvResult = avifRGBImageUnpremultiplyAlphaLibYUV(rgb);
+    if (libyuvResult != AVIF_RESULT_NOT_IMPLEMENTED) {
+        return libyuvResult;
+    }
+
+    assert(rgb->depth >= 8 && rgb->depth <= 16);
+
+    uint32_t max = (1 << rgb->depth) - 1;
+    float maxF = (float)max;
+
+    if (rgb->depth > 8) {
+        if (rgb->format == AVIF_RGB_FORMAT_RGBA || rgb->format == AVIF_RGB_FORMAT_BGRA) {
+            for (uint32_t j = 0; j < rgb->height; ++j) {
+                uint8_t * row = &rgb->pixels[j * rgb->rowBytes];
+                for (uint32_t i = 0; i < rgb->width; ++i) {
+                    uint16_t * pixel = (uint16_t *)&row[i * 8];
+                    uint16_t a = pixel[3];
+                    if (a >= max) {
+                        // opaque is no-op
+                        continue;
+                    } else if (a == 0) {
+                        // prevent division by zero
+                        pixel[0] = 0;
+                        pixel[1] = 0;
+                        pixel[2] = 0;
+                    } else {
+                        float c1 = avifRoundf((float)pixel[0] * maxF / (float)a);
+                        float c2 = avifRoundf((float)pixel[1] * maxF / (float)a);
+                        float c3 = avifRoundf((float)pixel[2] * maxF / (float)a);
+                        pixel[0] = (uint16_t)AVIF_MIN(c1, maxF);
+                        pixel[1] = (uint16_t)AVIF_MIN(c2, maxF);
+                        pixel[2] = (uint16_t)AVIF_MIN(c3, maxF);
+                    }
+                }
+            }
+        } else {
+            for (uint32_t j = 0; j < rgb->height; ++j) {
+                uint8_t * row = &rgb->pixels[j * rgb->rowBytes];
+                for (uint32_t i = 0; i < rgb->width; ++i) {
+                    uint16_t * pixel = (uint16_t *)&row[i * 8];
+                    uint16_t a = pixel[0];
+                    if (a >= max) {
+                        continue;
+                    } else if (a == 0) {
+                        pixel[1] = 0;
+                        pixel[2] = 0;
+                        pixel[3] = 0;
+                    } else {
+                        float c1 = avifRoundf((float)pixel[1] * maxF / (float)a);
+                        float c2 = avifRoundf((float)pixel[2] * maxF / (float)a);
+                        float c3 = avifRoundf((float)pixel[3] * maxF / (float)a);
+                        pixel[1] = (uint16_t)AVIF_MIN(c1, maxF);
+                        pixel[2] = (uint16_t)AVIF_MIN(c2, maxF);
+                        pixel[3] = (uint16_t)AVIF_MIN(c3, maxF);
+                    }
+                }
+            }
+        }
+    } else {
+        if (rgb->format == AVIF_RGB_FORMAT_RGBA || rgb->format == AVIF_RGB_FORMAT_BGRA) {
+            for (uint32_t j = 0; j < rgb->height; ++j) {
+                uint8_t * row = &rgb->pixels[j * rgb->rowBytes];
+                for (uint32_t i = 0; i < rgb->width; ++i) {
+                    uint8_t * pixel = &row[i * 4];
+                    uint8_t a = pixel[3];
+                    if (a == max) {
+                        continue;
+                    } else if (a == 0) {
+                        pixel[0] = 0;
+                        pixel[1] = 0;
+                        pixel[2] = 0;
+                    } else {
+                        float c1 = avifRoundf((float)pixel[0] * maxF / (float)a);
+                        float c2 = avifRoundf((float)pixel[1] * maxF / (float)a);
+                        float c3 = avifRoundf((float)pixel[2] * maxF / (float)a);
+                        pixel[0] = (uint8_t)AVIF_MIN(c1, maxF);
+                        pixel[1] = (uint8_t)AVIF_MIN(c2, maxF);
+                        pixel[2] = (uint8_t)AVIF_MIN(c3, maxF);
+                    }
+                }
+            }
+        } else {
+            for (uint32_t j = 0; j < rgb->height; ++j) {
+                uint8_t * row = &rgb->pixels[j * rgb->rowBytes];
+                for (uint32_t i = 0; i < rgb->width; ++i) {
+                    uint8_t * pixel = &row[i * 4];
+                    uint8_t a = pixel[0];
+                    if (a == max) {
+                        continue;
+                    } else if (a == 0) {
+                        pixel[1] = 0;
+                        pixel[2] = 0;
+                        pixel[3] = 0;
+                    } else {
+                        float c1 = avifRoundf((float)pixel[1] * maxF / (float)a);
+                        float c2 = avifRoundf((float)pixel[2] * maxF / (float)a);
+                        float c3 = avifRoundf((float)pixel[3] * maxF / (float)a);
+                        pixel[1] = (uint8_t)AVIF_MIN(c1, maxF);
+                        pixel[2] = (uint8_t)AVIF_MIN(c2, maxF);
+                        pixel[3] = (uint8_t)AVIF_MIN(c3, maxF);
+                    }
+                }
+            }
+        }
+    }
+
+    return AVIF_RESULT_OK;
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/avif-scale.c b/pxr/imaging/plugin/hioAvif/AVIF/src/avif-scale.c
new file mode 100644
index 0000000000..f45fe74264
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/avif-scale.c
@@ -0,0 +1,200 @@
+// Copyright 2021 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+#include <limits.h>
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes" // "this function declaration is not a prototype"
+// The newline at the end of libyuv/version.h was accidentally deleted in version 1792 and restored
+// in version 1813:
+// https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3183182
+// https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3527834
+#pragma clang diagnostic ignored "-Wnewline-eof" // "no newline at end of file"
+#endif
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv.h"
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+// This should be configurable and/or smarter. kFilterBox has the highest quality but is the slowest.
+#define AVIF_LIBYUV_FILTER_MODE kFilterBox
+
+avifResult avifImageScaleWithLimit(avifImage * image,
+                                   uint32_t dstWidth,
+                                   uint32_t dstHeight,
+                                   uint32_t imageSizeLimit,
+                                   uint32_t imageDimensionLimit,
+                                   avifDiagnostics * diag)
+{
+    if ((image->width == dstWidth) && (image->height == dstHeight)) {
+        // Nothing to do
+        return AVIF_RESULT_OK;
+    }
+
+    if ((dstWidth == 0) || (dstHeight == 0)) {
+        avifDiagnosticsPrintf(diag, "avifImageScaleWithLimit requested invalid dst dimensions [%ux%u]", dstWidth, dstHeight);
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+    if (avifDimensionsTooLarge(dstWidth, dstHeight, imageSizeLimit, imageDimensionLimit)) {
+        avifDiagnosticsPrintf(diag, "avifImageScaleWithLimit requested dst dimensions that are too large [%ux%u]", dstWidth, dstHeight);
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+
+    uint8_t * srcYUVPlanes[AVIF_PLANE_COUNT_YUV];
+    uint32_t srcYUVRowBytes[AVIF_PLANE_COUNT_YUV];
+    for (int i = 0; i < AVIF_PLANE_COUNT_YUV; ++i) {
+        srcYUVPlanes[i] = image->yuvPlanes[i];
+        image->yuvPlanes[i] = NULL;
+        srcYUVRowBytes[i] = image->yuvRowBytes[i];
+        image->yuvRowBytes[i] = 0;
+    }
+    const avifBool srcImageOwnsYUVPlanes = image->imageOwnsYUVPlanes;
+    image->imageOwnsYUVPlanes = AVIF_FALSE;
+
+    uint8_t * srcAlphaPlane = image->alphaPlane;
+    image->alphaPlane = NULL;
+    uint32_t srcAlphaRowBytes = image->alphaRowBytes;
+    image->alphaRowBytes = 0;
+    const avifBool srcImageOwnsAlphaPlane = image->imageOwnsAlphaPlane;
+    image->imageOwnsAlphaPlane = AVIF_FALSE;
+
+    const uint32_t srcWidth = image->width;
+    const uint32_t srcHeight = image->height;
+    const uint32_t srcUVWidth = avifImagePlaneWidth(image, AVIF_CHAN_U);
+    const uint32_t srcUVHeight = avifImagePlaneHeight(image, AVIF_CHAN_U);
+    image->width = dstWidth;
+    image->height = dstHeight;
+
+    avifResult result = AVIF_RESULT_OK;
+    if (srcYUVPlanes[0] || srcAlphaPlane) {
+        // A simple conservative check to avoid integer overflows in libyuv's ScalePlane() and
+        // ScalePlane_12() functions.
+        if (srcWidth > 16384) {
+            avifDiagnosticsPrintf(diag, "avifImageScaleWithLimit requested invalid width scale for libyuv [%u -> %u]", srcWidth, dstWidth);
+            result = AVIF_RESULT_NOT_IMPLEMENTED;
+            goto cleanup;
+        }
+        if (srcHeight > 16384) {
+            avifDiagnosticsPrintf(diag, "avifImageScaleWithLimit requested invalid height scale for libyuv [%u -> %u]", srcHeight, dstHeight);
+            result = AVIF_RESULT_NOT_IMPLEMENTED;
+            goto cleanup;
+        }
+    }
+
+    if (srcYUVPlanes[0]) {
+        const avifResult allocationResult = avifImageAllocatePlanes(image, AVIF_PLANES_YUV);
+        if (allocationResult != AVIF_RESULT_OK) {
+            avifDiagnosticsPrintf(diag, "Allocation of YUV planes failed: %s", avifResultToString(allocationResult));
+            result = AVIF_RESULT_OUT_OF_MEMORY;
+            goto cleanup;
+        }
+
+        for (int i = 0; i < AVIF_PLANE_COUNT_YUV; ++i) {
+            if (!srcYUVPlanes[i]) {
+                continue;
+            }
+
+            const uint32_t srcW = (i == AVIF_CHAN_Y) ? srcWidth : srcUVWidth;
+            const uint32_t srcH = (i == AVIF_CHAN_Y) ? srcHeight : srcUVHeight;
+            const uint32_t dstW = avifImagePlaneWidth(image, i);
+            const uint32_t dstH = avifImagePlaneHeight(image, i);
+            if (image->depth > 8) {
+                uint16_t * const srcPlane = (uint16_t *)srcYUVPlanes[i];
+                const uint32_t srcStride = srcYUVRowBytes[i] / 2;
+                uint16_t * const dstPlane = (uint16_t *)image->yuvPlanes[i];
+                const uint32_t dstStride = image->yuvRowBytes[i] / 2;
+#if LIBYUV_VERSION >= 1880
+                const int failure =
+                    ScalePlane_12(srcPlane, srcStride, srcW, srcH, dstPlane, dstStride, dstW, dstH, AVIF_LIBYUV_FILTER_MODE);
+                if (failure) {
+                    avifDiagnosticsPrintf(diag, "ScalePlane_12() failed (%d)", failure);
+                    result = (failure == 1) ? AVIF_RESULT_OUT_OF_MEMORY : AVIF_RESULT_UNKNOWN_ERROR;
+                    goto cleanup;
+                }
+#elif LIBYUV_VERSION >= 1774
+                ScalePlane_12(srcPlane, srcStride, srcW, srcH, dstPlane, dstStride, dstW, dstH, AVIF_LIBYUV_FILTER_MODE);
+#else
+                ScalePlane_16(srcPlane, srcStride, srcW, srcH, dstPlane, dstStride, dstW, dstH, AVIF_LIBYUV_FILTER_MODE);
+#endif
+            } else {
+                uint8_t * const srcPlane = srcYUVPlanes[i];
+                const uint32_t srcStride = srcYUVRowBytes[i];
+                uint8_t * const dstPlane = image->yuvPlanes[i];
+                const uint32_t dstStride = image->yuvRowBytes[i];
+#if LIBYUV_VERSION >= 1880
+                const int failure = ScalePlane(srcPlane, srcStride, srcW, srcH, dstPlane, dstStride, dstW, dstH, AVIF_LIBYUV_FILTER_MODE);
+                if (failure) {
+                    avifDiagnosticsPrintf(diag, "ScalePlane() failed (%d)", failure);
+                    result = (failure == 1) ? AVIF_RESULT_OUT_OF_MEMORY : AVIF_RESULT_UNKNOWN_ERROR;
+                    goto cleanup;
+                }
+#else
+                ScalePlane(srcPlane, srcStride, srcW, srcH, dstPlane, dstStride, dstW, dstH, AVIF_LIBYUV_FILTER_MODE);
+#endif
+            }
+        }
+    }
+
+    if (srcAlphaPlane) {
+        const avifResult allocationResult = avifImageAllocatePlanes(image, AVIF_PLANES_A);
+        if (allocationResult != AVIF_RESULT_OK) {
+            avifDiagnosticsPrintf(diag, "Allocation of alpha plane failed: %s", avifResultToString(allocationResult));
+            return AVIF_RESULT_OUT_OF_MEMORY;
+        }
+
+        if (image->depth > 8) {
+            uint16_t * const srcPlane = (uint16_t *)srcAlphaPlane;
+            const uint32_t srcStride = srcAlphaRowBytes / 2;
+            uint16_t * const dstPlane = (uint16_t *)image->alphaPlane;
+            const uint32_t dstStride = image->alphaRowBytes / 2;
+#if LIBYUV_VERSION >= 1880
+            const int failure =
+                ScalePlane_12(srcPlane, srcStride, srcWidth, srcHeight, dstPlane, dstStride, dstWidth, dstHeight, AVIF_LIBYUV_FILTER_MODE);
+            if (failure) {
+                avifDiagnosticsPrintf(diag, "ScalePlane_12() failed (%d)", failure);
+                result = (failure == 1) ? AVIF_RESULT_OUT_OF_MEMORY : AVIF_RESULT_UNKNOWN_ERROR;
+                goto cleanup;
+            }
+#elif LIBYUV_VERSION >= 1774
+            ScalePlane_12(srcPlane, srcStride, srcWidth, srcHeight, dstPlane, dstStride, dstWidth, dstHeight, AVIF_LIBYUV_FILTER_MODE);
+#else
+            ScalePlane_16(srcPlane, srcStride, srcWidth, srcHeight, dstPlane, dstStride, dstWidth, dstHeight, AVIF_LIBYUV_FILTER_MODE);
+#endif
+        } else {
+            uint8_t * const srcPlane = srcAlphaPlane;
+            const uint32_t srcStride = srcAlphaRowBytes;
+            uint8_t * const dstPlane = image->alphaPlane;
+            const uint32_t dstStride = image->alphaRowBytes;
+#if LIBYUV_VERSION >= 1880
+            const int failure =
+                ScalePlane(srcPlane, srcStride, srcWidth, srcHeight, dstPlane, dstStride, dstWidth, dstHeight, AVIF_LIBYUV_FILTER_MODE);
+            if (failure) {
+                avifDiagnosticsPrintf(diag, "ScalePlane() failed (%d)", failure);
+                result = (failure == 1) ? AVIF_RESULT_OUT_OF_MEMORY : AVIF_RESULT_UNKNOWN_ERROR;
+                goto cleanup;
+            }
+#else
+            ScalePlane(srcPlane, srcStride, srcWidth, srcHeight, dstPlane, dstStride, dstWidth, dstHeight, AVIF_LIBYUV_FILTER_MODE);
+#endif
+        }
+    }
+
+cleanup:
+    if (srcYUVPlanes[0] && srcImageOwnsYUVPlanes) {
+        for (int i = 0; i < AVIF_PLANE_COUNT_YUV; ++i) {
+            avifFree(srcYUVPlanes[i]);
+        }
+    }
+    if (srcAlphaPlane && srcImageOwnsAlphaPlane) {
+        avifFree(srcAlphaPlane);
+    }
+    return result;
+}
+
+avifResult avifImageScale(avifImage * image, uint32_t dstWidth, uint32_t dstHeight, avifDiagnostics * diag)
+{
+    avifDiagnosticsClearError(diag);
+    return avifImageScaleWithLimit(image, dstWidth, dstHeight, AVIF_DEFAULT_IMAGE_SIZE_LIMIT, AVIF_DEFAULT_IMAGE_DIMENSION_LIMIT, diag);
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/avif.c b/pxr/imaging/plugin/hioAvif/AVIF/src/avif.c
new file mode 100644
index 0000000000..9b9328da0c
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/avif.c
@@ -0,0 +1,1137 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <stdint.h>
+#include <string.h>
+
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+#define AVIF_VERSION_STRING (STR(AVIF_VERSION_MAJOR) "." STR(AVIF_VERSION_MINOR) "." STR(AVIF_VERSION_PATCH))
+
+const char * avifVersion(void)
+{
+    return AVIF_VERSION_STRING;
+}
+
+const char * avifPixelFormatToString(avifPixelFormat format)
+{
+    switch (format) {
+        case AVIF_PIXEL_FORMAT_YUV444:
+            return "YUV444";
+        case AVIF_PIXEL_FORMAT_YUV420:
+            return "YUV420";
+        case AVIF_PIXEL_FORMAT_YUV422:
+            return "YUV422";
+        case AVIF_PIXEL_FORMAT_YUV400:
+            return "YUV400";
+        case AVIF_PIXEL_FORMAT_NONE:
+        case AVIF_PIXEL_FORMAT_COUNT:
+        default:
+            break;
+    }
+    return "Unknown";
+}
+
+void avifGetPixelFormatInfo(avifPixelFormat format, avifPixelFormatInfo * info)
+{
+    memset(info, 0, sizeof(avifPixelFormatInfo));
+
+    switch (format) {
+        case AVIF_PIXEL_FORMAT_YUV444:
+            info->chromaShiftX = 0;
+            info->chromaShiftY = 0;
+            break;
+
+        case AVIF_PIXEL_FORMAT_YUV422:
+            info->chromaShiftX = 1;
+            info->chromaShiftY = 0;
+            break;
+
+        case AVIF_PIXEL_FORMAT_YUV420:
+            info->chromaShiftX = 1;
+            info->chromaShiftY = 1;
+            break;
+
+        case AVIF_PIXEL_FORMAT_YUV400:
+            info->monochrome = AVIF_TRUE;
+            // The nonexistent chroma is considered as subsampled in each dimension
+            // according to the AV1 specification. See sections 5.5.2 and 6.4.2.
+            info->chromaShiftX = 1;
+            info->chromaShiftY = 1;
+            break;
+
+        case AVIF_PIXEL_FORMAT_NONE:
+        case AVIF_PIXEL_FORMAT_COUNT:
+        default:
+            break;
+    }
+}
+
+const char * avifResultToString(avifResult result)
+{
+    // clang-format off
+    switch (result) {
+        case AVIF_RESULT_OK:                            return "OK";
+        case AVIF_RESULT_INVALID_FTYP:                  return "Invalid ftyp";
+        case AVIF_RESULT_NO_CONTENT:                    return "No content";
+        case AVIF_RESULT_NO_YUV_FORMAT_SELECTED:        return "No YUV format selected";
+        case AVIF_RESULT_REFORMAT_FAILED:               return "Reformat failed";
+        case AVIF_RESULT_UNSUPPORTED_DEPTH:             return "Unsupported depth";
+        case AVIF_RESULT_ENCODE_COLOR_FAILED:           return "Encoding of color planes failed";
+        case AVIF_RESULT_ENCODE_ALPHA_FAILED:           return "Encoding of alpha plane failed";
+        case AVIF_RESULT_BMFF_PARSE_FAILED:             return "BMFF parsing failed";
+        case AVIF_RESULT_MISSING_IMAGE_ITEM:            return "Missing or empty image item";
+        case AVIF_RESULT_DECODE_COLOR_FAILED:           return "Decoding of color planes failed";
+        case AVIF_RESULT_DECODE_ALPHA_FAILED:           return "Decoding of alpha plane failed";
+        case AVIF_RESULT_COLOR_ALPHA_SIZE_MISMATCH:     return "Color and alpha planes size mismatch";
+        case AVIF_RESULT_ISPE_SIZE_MISMATCH:            return "Plane sizes don't match ispe values";
+        case AVIF_RESULT_NO_CODEC_AVAILABLE:            return "No codec available";
+        case AVIF_RESULT_NO_IMAGES_REMAINING:           return "No images remaining";
+        case AVIF_RESULT_INVALID_EXIF_PAYLOAD:          return "Invalid Exif payload";
+        case AVIF_RESULT_INVALID_IMAGE_GRID:            return "Invalid image grid";
+        case AVIF_RESULT_INVALID_CODEC_SPECIFIC_OPTION: return "Invalid codec-specific option";
+        case AVIF_RESULT_TRUNCATED_DATA:                return "Truncated data";
+        case AVIF_RESULT_IO_NOT_SET:                    return "IO not set";
+        case AVIF_RESULT_IO_ERROR:                      return "IO Error";
+        case AVIF_RESULT_WAITING_ON_IO:                 return "Waiting on IO";
+        case AVIF_RESULT_INVALID_ARGUMENT:              return "Invalid argument";
+        case AVIF_RESULT_NOT_IMPLEMENTED:               return "Not implemented";
+        case AVIF_RESULT_OUT_OF_MEMORY:                 return "Out of memory";
+        case AVIF_RESULT_CANNOT_CHANGE_SETTING:         return "Cannot change some setting during encoding";
+        case AVIF_RESULT_INCOMPATIBLE_IMAGE:            return "The image is incompatible with already encoded images";
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        case AVIF_RESULT_ENCODE_GAIN_MAP_FAILED:        return "Encoding of gain map planes failed";
+        case AVIF_RESULT_DECODE_GAIN_MAP_FAILED:        return "Decoding of gain map planes failed";
+        case AVIF_RESULT_INVALID_TONE_MAPPED_IMAGE:     return "Invalid tone mapped image item";
+#endif
+        case AVIF_RESULT_UNKNOWN_ERROR:
+        default:
+            break;
+    }
+    // clang-format on
+    return "Unknown Error";
+}
+
+const char * avifProgressiveStateToString(avifProgressiveState progressiveState)
+{
+    // clang-format off
+    switch (progressiveState) {
+        case AVIF_PROGRESSIVE_STATE_UNAVAILABLE: return "Unavailable";
+        case AVIF_PROGRESSIVE_STATE_AVAILABLE:   return "Available";
+        case AVIF_PROGRESSIVE_STATE_ACTIVE:      return "Active";
+        default:
+            break;
+    }
+    // clang-format on
+    return "Unknown";
+}
+
+void avifImageSetDefaults(avifImage * image)
+{
+    memset(image, 0, sizeof(avifImage));
+    image->yuvRange = AVIF_RANGE_FULL;
+    image->colorPrimaries = AVIF_COLOR_PRIMARIES_UNSPECIFIED;
+    image->transferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED;
+    image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED;
+}
+
+avifImage * avifImageCreate(uint32_t width, uint32_t height, uint32_t depth, avifPixelFormat yuvFormat)
+{
+    // width and height are checked when actually used, for example by avifImageAllocatePlanes().
+    if (depth > 16) {
+        // avifImage only supports up to 16 bits per sample. See avifImageUsesU16().
+        return NULL;
+    }
+    if ((yuvFormat < AVIF_PIXEL_FORMAT_NONE) || (yuvFormat > AVIF_PIXEL_FORMAT_YUV400)) {
+        return NULL;
+    }
+
+    avifImage * image = (avifImage *)avifAlloc(sizeof(avifImage));
+    if (!image) {
+        return NULL;
+    }
+    avifImageSetDefaults(image);
+    image->width = width;
+    image->height = height;
+    image->depth = depth;
+    image->yuvFormat = yuvFormat;
+    return image;
+}
+
+avifImage * avifImageCreateEmpty(void)
+{
+    return avifImageCreate(0, 0, 0, AVIF_PIXEL_FORMAT_NONE);
+}
+
+void avifImageCopyNoAlloc(avifImage * dstImage, const avifImage * srcImage)
+{
+    dstImage->width = srcImage->width;
+    dstImage->height = srcImage->height;
+    dstImage->depth = srcImage->depth;
+    dstImage->yuvFormat = srcImage->yuvFormat;
+    dstImage->yuvRange = srcImage->yuvRange;
+    dstImage->yuvChromaSamplePosition = srcImage->yuvChromaSamplePosition;
+    dstImage->alphaPremultiplied = srcImage->alphaPremultiplied;
+
+    dstImage->colorPrimaries = srcImage->colorPrimaries;
+    dstImage->transferCharacteristics = srcImage->transferCharacteristics;
+    dstImage->matrixCoefficients = srcImage->matrixCoefficients;
+    dstImage->clli = srcImage->clli;
+
+    dstImage->transformFlags = srcImage->transformFlags;
+    dstImage->pasp = srcImage->pasp;
+    dstImage->clap = srcImage->clap;
+    dstImage->irot = srcImage->irot;
+    dstImage->imir = srcImage->imir;
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    dstImage->gainMap.metadata = srcImage->gainMap.metadata;
+#endif
+}
+
+void avifImageCopySamples(avifImage * dstImage, const avifImage * srcImage, avifPlanesFlags planes)
+{
+    assert(srcImage->depth == dstImage->depth);
+    if (planes & AVIF_PLANES_YUV) {
+        assert(srcImage->yuvFormat == dstImage->yuvFormat);
+        // Note that there may be a mismatch between srcImage->yuvRange and dstImage->yuvRange
+        // because libavif allows for 'colr' and AV1 OBU video range values to differ.
+    }
+    const size_t bytesPerPixel = avifImageUsesU16(srcImage) ? 2 : 1;
+
+    const avifBool skipColor = !(planes & AVIF_PLANES_YUV);
+    const avifBool skipAlpha = !(planes & AVIF_PLANES_A);
+    for (int c = AVIF_CHAN_Y; c <= AVIF_CHAN_A; ++c) {
+        const avifBool alpha = c == AVIF_CHAN_A;
+        if ((skipColor && !alpha) || (skipAlpha && alpha)) {
+            continue;
+        }
+
+        const uint32_t planeWidth = avifImagePlaneWidth(srcImage, c);
+        const uint32_t planeHeight = avifImagePlaneHeight(srcImage, c);
+        const uint8_t * srcRow = avifImagePlane(srcImage, c);
+        uint8_t * dstRow = avifImagePlane(dstImage, c);
+        const uint32_t srcRowBytes = avifImagePlaneRowBytes(srcImage, c);
+        const uint32_t dstRowBytes = avifImagePlaneRowBytes(dstImage, c);
+        assert(!srcRow == !dstRow);
+        if (!srcRow) {
+            continue;
+        }
+        assert(planeWidth == avifImagePlaneWidth(dstImage, c));
+        assert(planeHeight == avifImagePlaneHeight(dstImage, c));
+
+        const size_t planeWidthBytes = planeWidth * bytesPerPixel;
+        for (uint32_t y = 0; y < planeHeight; ++y) {
+            memcpy(dstRow, srcRow, planeWidthBytes);
+            srcRow += srcRowBytes;
+            dstRow += dstRowBytes;
+        }
+    }
+}
+
+avifResult avifImageCopy(avifImage * dstImage, const avifImage * srcImage, avifPlanesFlags planes)
+{
+    avifImageFreePlanes(dstImage, AVIF_PLANES_ALL);
+    avifImageCopyNoAlloc(dstImage, srcImage);
+
+    AVIF_CHECKRES(avifImageSetProfileICC(dstImage, srcImage->icc.data, srcImage->icc.size));
+
+    AVIF_CHECKRES(avifRWDataSet(&dstImage->exif, srcImage->exif.data, srcImage->exif.size));
+    AVIF_CHECKRES(avifImageSetMetadataXMP(dstImage, srcImage->xmp.data, srcImage->xmp.size));
+
+    if ((planes & AVIF_PLANES_YUV) && srcImage->yuvPlanes[AVIF_CHAN_Y]) {
+        if ((srcImage->yuvFormat != AVIF_PIXEL_FORMAT_YUV400) &&
+            (!srcImage->yuvPlanes[AVIF_CHAN_U] || !srcImage->yuvPlanes[AVIF_CHAN_V])) {
+            return AVIF_RESULT_INVALID_ARGUMENT;
+        }
+        const avifResult allocationResult = avifImageAllocatePlanes(dstImage, AVIF_PLANES_YUV);
+        if (allocationResult != AVIF_RESULT_OK) {
+            return allocationResult;
+        }
+    }
+    if ((planes & AVIF_PLANES_A) && srcImage->alphaPlane) {
+        const avifResult allocationResult = avifImageAllocatePlanes(dstImage, AVIF_PLANES_A);
+        if (allocationResult != AVIF_RESULT_OK) {
+            return allocationResult;
+        }
+    }
+    avifImageCopySamples(dstImage, srcImage, planes);
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    if (srcImage->gainMap.image) {
+        if (!dstImage->gainMap.image) {
+            dstImage->gainMap.image = avifImageCreateEmpty();
+        }
+        AVIF_CHECKRES(avifImageCopy(dstImage->gainMap.image, srcImage->gainMap.image, planes));
+    } else if (dstImage->gainMap.image) {
+        avifImageDestroy(dstImage->gainMap.image);
+        dstImage->gainMap.image = NULL;
+    }
+#endif // defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifImageSetViewRect(avifImage * dstImage, const avifImage * srcImage, const avifCropRect * rect)
+{
+    avifPixelFormatInfo formatInfo;
+    avifGetPixelFormatInfo(srcImage->yuvFormat, &formatInfo);
+    if ((rect->width > srcImage->width) || (rect->height > srcImage->height) || (rect->x > (srcImage->width - rect->width)) ||
+        (rect->y > (srcImage->height - rect->height))) {
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+    if (!formatInfo.monochrome && ((rect->x & formatInfo.chromaShiftX) || (rect->y & formatInfo.chromaShiftY))) {
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+    avifImageFreePlanes(dstImage, AVIF_PLANES_ALL); // dstImage->imageOwnsYUVPlanes and dstImage->imageOwnsAlphaPlane set to AVIF_FALSE.
+    avifImageCopyNoAlloc(dstImage, srcImage);
+    dstImage->width = rect->width;
+    dstImage->height = rect->height;
+    const uint32_t pixelBytes = (srcImage->depth > 8) ? 2 : 1;
+    if (srcImage->yuvPlanes[AVIF_CHAN_Y]) {
+        for (int yuvPlane = AVIF_CHAN_Y; yuvPlane <= AVIF_CHAN_V; ++yuvPlane) {
+            if (srcImage->yuvRowBytes[yuvPlane]) {
+                const size_t planeX = (yuvPlane == AVIF_CHAN_Y) ? rect->x : (rect->x >> formatInfo.chromaShiftX);
+                const size_t planeY = (yuvPlane == AVIF_CHAN_Y) ? rect->y : (rect->y >> formatInfo.chromaShiftY);
+                dstImage->yuvPlanes[yuvPlane] =
+                    srcImage->yuvPlanes[yuvPlane] + planeY * srcImage->yuvRowBytes[yuvPlane] + planeX * pixelBytes;
+                dstImage->yuvRowBytes[yuvPlane] = srcImage->yuvRowBytes[yuvPlane];
+            }
+        }
+    }
+    if (srcImage->alphaPlane) {
+        dstImage->alphaPlane = srcImage->alphaPlane + (size_t)rect->y * srcImage->alphaRowBytes + (size_t)rect->x * pixelBytes;
+        dstImage->alphaRowBytes = srcImage->alphaRowBytes;
+    }
+    return AVIF_RESULT_OK;
+}
+
+void avifImageDestroy(avifImage * image)
+{
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    if (image->gainMap.image) {
+        avifImageDestroy(image->gainMap.image);
+    }
+#endif
+    avifImageFreePlanes(image, AVIF_PLANES_ALL);
+    avifRWDataFree(&image->icc);
+    avifRWDataFree(&image->exif);
+    avifRWDataFree(&image->xmp);
+    avifFree(image);
+}
+
+avifResult avifImageSetProfileICC(avifImage * image, const uint8_t * icc, size_t iccSize)
+{
+    return avifRWDataSet(&image->icc, icc, iccSize);
+}
+
+avifResult avifImageSetMetadataXMP(avifImage * image, const uint8_t * xmp, size_t xmpSize)
+{
+    return avifRWDataSet(&image->xmp, xmp, xmpSize);
+}
+
+avifResult avifImageAllocatePlanes(avifImage * image, avifPlanesFlags planes)
+{
+    if (image->width == 0 || image->height == 0) {
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+    const size_t channelSize = avifImageUsesU16(image) ? 2 : 1;
+    if (image->width > SIZE_MAX / channelSize) {
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+    const size_t fullRowBytes = channelSize * image->width;
+    if ((fullRowBytes > UINT32_MAX) || (image->height > SIZE_MAX / fullRowBytes)) {
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+    const size_t fullSize = fullRowBytes * image->height;
+
+    if ((planes & AVIF_PLANES_YUV) && (image->yuvFormat != AVIF_PIXEL_FORMAT_NONE)) {
+        avifPixelFormatInfo info;
+        avifGetPixelFormatInfo(image->yuvFormat, &info);
+
+        image->imageOwnsYUVPlanes = AVIF_TRUE;
+        if (!image->yuvPlanes[AVIF_CHAN_Y]) {
+            image->yuvRowBytes[AVIF_CHAN_Y] = (uint32_t)fullRowBytes;
+            image->yuvPlanes[AVIF_CHAN_Y] = avifAlloc(fullSize);
+            if (!image->yuvPlanes[AVIF_CHAN_Y]) {
+                return AVIF_RESULT_OUT_OF_MEMORY;
+            }
+        }
+
+        if (!info.monochrome) {
+            // Intermediary computation as 64 bits in case width or height is exactly UINT32_MAX.
+            const uint32_t shiftedW = (uint32_t)(((uint64_t)image->width + info.chromaShiftX) >> info.chromaShiftX);
+            const uint32_t shiftedH = (uint32_t)(((uint64_t)image->height + info.chromaShiftY) >> info.chromaShiftY);
+
+            // These are less than or equal to fullRowBytes/fullSize. No need to check overflows.
+            const size_t uvRowBytes = channelSize * shiftedW;
+            const size_t uvSize = uvRowBytes * shiftedH;
+
+            for (int uvPlane = AVIF_CHAN_U; uvPlane <= AVIF_CHAN_V; ++uvPlane) {
+                if (!image->yuvPlanes[uvPlane]) {
+                    image->yuvRowBytes[uvPlane] = (uint32_t)uvRowBytes;
+                    image->yuvPlanes[uvPlane] = avifAlloc(uvSize);
+                    if (!image->yuvPlanes[uvPlane]) {
+                        return AVIF_RESULT_OUT_OF_MEMORY;
+                    }
+                }
+            }
+        }
+    }
+    if (planes & AVIF_PLANES_A) {
+        image->imageOwnsAlphaPlane = AVIF_TRUE;
+        if (!image->alphaPlane) {
+            image->alphaRowBytes = (uint32_t)fullRowBytes;
+            image->alphaPlane = avifAlloc(fullSize);
+            if (!image->alphaPlane) {
+                return AVIF_RESULT_OUT_OF_MEMORY;
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+void avifImageFreePlanes(avifImage * image, avifPlanesFlags planes)
+{
+    if ((planes & AVIF_PLANES_YUV) && (image->yuvFormat != AVIF_PIXEL_FORMAT_NONE)) {
+        if (image->imageOwnsYUVPlanes) {
+            avifFree(image->yuvPlanes[AVIF_CHAN_Y]);
+            avifFree(image->yuvPlanes[AVIF_CHAN_U]);
+            avifFree(image->yuvPlanes[AVIF_CHAN_V]);
+        }
+        image->yuvPlanes[AVIF_CHAN_Y] = NULL;
+        image->yuvRowBytes[AVIF_CHAN_Y] = 0;
+        image->yuvPlanes[AVIF_CHAN_U] = NULL;
+        image->yuvRowBytes[AVIF_CHAN_U] = 0;
+        image->yuvPlanes[AVIF_CHAN_V] = NULL;
+        image->yuvRowBytes[AVIF_CHAN_V] = 0;
+        image->imageOwnsYUVPlanes = AVIF_FALSE;
+    }
+    if (planes & AVIF_PLANES_A) {
+        if (image->imageOwnsAlphaPlane) {
+            avifFree(image->alphaPlane);
+        }
+        image->alphaPlane = NULL;
+        image->alphaRowBytes = 0;
+        image->imageOwnsAlphaPlane = AVIF_FALSE;
+    }
+}
+
+void avifImageStealPlanes(avifImage * dstImage, avifImage * srcImage, avifPlanesFlags planes)
+{
+    avifImageFreePlanes(dstImage, planes);
+
+    if (planes & AVIF_PLANES_YUV) {
+        dstImage->yuvPlanes[AVIF_CHAN_Y] = srcImage->yuvPlanes[AVIF_CHAN_Y];
+        dstImage->yuvRowBytes[AVIF_CHAN_Y] = srcImage->yuvRowBytes[AVIF_CHAN_Y];
+        dstImage->yuvPlanes[AVIF_CHAN_U] = srcImage->yuvPlanes[AVIF_CHAN_U];
+        dstImage->yuvRowBytes[AVIF_CHAN_U] = srcImage->yuvRowBytes[AVIF_CHAN_U];
+        dstImage->yuvPlanes[AVIF_CHAN_V] = srcImage->yuvPlanes[AVIF_CHAN_V];
+        dstImage->yuvRowBytes[AVIF_CHAN_V] = srcImage->yuvRowBytes[AVIF_CHAN_V];
+
+        srcImage->yuvPlanes[AVIF_CHAN_Y] = NULL;
+        srcImage->yuvRowBytes[AVIF_CHAN_Y] = 0;
+        srcImage->yuvPlanes[AVIF_CHAN_U] = NULL;
+        srcImage->yuvRowBytes[AVIF_CHAN_U] = 0;
+        srcImage->yuvPlanes[AVIF_CHAN_V] = NULL;
+        srcImage->yuvRowBytes[AVIF_CHAN_V] = 0;
+
+        dstImage->yuvFormat = srcImage->yuvFormat;
+        dstImage->imageOwnsYUVPlanes = srcImage->imageOwnsYUVPlanes;
+        srcImage->imageOwnsYUVPlanes = AVIF_FALSE;
+    }
+    if (planes & AVIF_PLANES_A) {
+        dstImage->alphaPlane = srcImage->alphaPlane;
+        dstImage->alphaRowBytes = srcImage->alphaRowBytes;
+
+        srcImage->alphaPlane = NULL;
+        srcImage->alphaRowBytes = 0;
+
+        dstImage->imageOwnsAlphaPlane = srcImage->imageOwnsAlphaPlane;
+        srcImage->imageOwnsAlphaPlane = AVIF_FALSE;
+    }
+}
+
+avifBool avifImageUsesU16(const avifImage * image)
+{
+    return (image->depth > 8);
+}
+
+avifBool avifImageIsOpaque(const avifImage * image)
+{
+    if (!image->alphaPlane) {
+        return AVIF_TRUE;
+    }
+
+    const uint32_t opaqueValue = (1u << image->depth) - 1u;
+    const uint8_t * row = image->alphaPlane;
+    for (uint32_t y = 0; y < image->height; ++y) {
+        if (avifImageUsesU16(image)) {
+            const uint16_t * row16 = (const uint16_t *)row;
+            for (uint32_t x = 0; x < image->width; ++x) {
+                if (row16[x] != opaqueValue) {
+                    return AVIF_FALSE;
+                }
+            }
+        } else {
+            for (uint32_t x = 0; x < image->width; ++x) {
+                if (row[x] != opaqueValue) {
+                    return AVIF_FALSE;
+                }
+            }
+        }
+        row += image->alphaRowBytes;
+    }
+    return AVIF_TRUE;
+}
+
+uint8_t * avifImagePlane(const avifImage * image, int channel)
+{
+    if ((channel == AVIF_CHAN_Y) || (channel == AVIF_CHAN_U) || (channel == AVIF_CHAN_V)) {
+        return image->yuvPlanes[channel];
+    }
+    if (channel == AVIF_CHAN_A) {
+        return image->alphaPlane;
+    }
+    return NULL;
+}
+
+uint32_t avifImagePlaneRowBytes(const avifImage * image, int channel)
+{
+    if ((channel == AVIF_CHAN_Y) || (channel == AVIF_CHAN_U) || (channel == AVIF_CHAN_V)) {
+        return image->yuvRowBytes[channel];
+    }
+    if (channel == AVIF_CHAN_A) {
+        return image->alphaRowBytes;
+    }
+    return 0;
+}
+
+uint32_t avifImagePlaneWidth(const avifImage * image, int channel)
+{
+    if (channel == AVIF_CHAN_Y) {
+        return image->width;
+    }
+    if ((channel == AVIF_CHAN_U) || (channel == AVIF_CHAN_V)) {
+        avifPixelFormatInfo formatInfo;
+        avifGetPixelFormatInfo(image->yuvFormat, &formatInfo);
+        if (formatInfo.monochrome) {
+            return 0;
+        }
+        return (image->width + formatInfo.chromaShiftX) >> formatInfo.chromaShiftX;
+    }
+    if ((channel == AVIF_CHAN_A) && image->alphaPlane) {
+        return image->width;
+    }
+    return 0;
+}
+
+uint32_t avifImagePlaneHeight(const avifImage * image, int channel)
+{
+    if (channel == AVIF_CHAN_Y) {
+        return image->height;
+    }
+    if ((channel == AVIF_CHAN_U) || (channel == AVIF_CHAN_V)) {
+        avifPixelFormatInfo formatInfo;
+        avifGetPixelFormatInfo(image->yuvFormat, &formatInfo);
+        if (formatInfo.monochrome) {
+            return 0;
+        }
+        return (image->height + formatInfo.chromaShiftY) >> formatInfo.chromaShiftY;
+    }
+    if ((channel == AVIF_CHAN_A) && image->alphaPlane) {
+        return image->height;
+    }
+    return 0;
+}
+
+avifBool avifDimensionsTooLarge(uint32_t width, uint32_t height, uint32_t imageSizeLimit, uint32_t imageDimensionLimit)
+{
+    if (width > (imageSizeLimit / height)) {
+        return AVIF_TRUE;
+    }
+    if ((imageDimensionLimit != 0) && ((width > imageDimensionLimit) || (height > imageDimensionLimit))) {
+        return AVIF_TRUE;
+    }
+    return AVIF_FALSE;
+}
+
+// avifCodecCreate*() functions are in their respective codec_*.c files
+
+void avifCodecDestroy(avifCodec * codec)
+{
+    if (codec && codec->destroyInternal) {
+        codec->destroyInternal(codec);
+    }
+    avifFree(codec);
+}
+
+// ---------------------------------------------------------------------------
+// avifRGBImage
+
+avifBool avifRGBFormatHasAlpha(avifRGBFormat format)
+{
+    return (format != AVIF_RGB_FORMAT_RGB) && (format != AVIF_RGB_FORMAT_BGR) && (format != AVIF_RGB_FORMAT_RGB_565);
+}
+
+uint32_t avifRGBFormatChannelCount(avifRGBFormat format)
+{
+    return avifRGBFormatHasAlpha(format) ? 4 : 3;
+}
+
+uint32_t avifRGBImagePixelSize(const avifRGBImage * rgb)
+{
+    if (rgb->format == AVIF_RGB_FORMAT_RGB_565) {
+        return 2;
+    }
+    return avifRGBFormatChannelCount(rgb->format) * ((rgb->depth > 8) ? 2 : 1);
+}
+
+void avifRGBImageSetDefaults(avifRGBImage * rgb, const avifImage * image)
+{
+    rgb->width = image->width;
+    rgb->height = image->height;
+    rgb->depth = image->depth;
+    rgb->format = AVIF_RGB_FORMAT_RGBA;
+    rgb->chromaUpsampling = AVIF_CHROMA_UPSAMPLING_AUTOMATIC;
+    rgb->chromaDownsampling = AVIF_CHROMA_DOWNSAMPLING_AUTOMATIC;
+    rgb->avoidLibYUV = AVIF_FALSE;
+    rgb->ignoreAlpha = AVIF_FALSE;
+    rgb->pixels = NULL;
+    rgb->rowBytes = 0;
+    rgb->alphaPremultiplied = AVIF_FALSE; // Most expect RGBA output to *not* be premultiplied. Those that do can opt-in by
+                                          // setting this to match image->alphaPremultiplied or forcing this to true
+                                          // after calling avifRGBImageSetDefaults(),
+    rgb->isFloat = AVIF_FALSE;
+    rgb->maxThreads = 1;
+}
+
+avifResult avifRGBImageAllocatePixels(avifRGBImage * rgb)
+{
+    avifRGBImageFreePixels(rgb);
+    const uint32_t rowBytes = rgb->width * avifRGBImagePixelSize(rgb);
+    rgb->pixels = avifAlloc((size_t)rowBytes * rgb->height);
+    AVIF_CHECKERR(rgb->pixels, AVIF_RESULT_OUT_OF_MEMORY);
+    rgb->rowBytes = rowBytes;
+    return AVIF_RESULT_OK;
+}
+
+void avifRGBImageFreePixels(avifRGBImage * rgb)
+{
+    if (rgb->pixels) {
+        avifFree(rgb->pixels);
+    }
+
+    rgb->pixels = NULL;
+    rgb->rowBytes = 0;
+}
+
+// ---------------------------------------------------------------------------
+// avifCropRect
+
+static avifFraction calcCenter(int32_t dim)
+{
+    avifFraction f;
+    f.n = dim >> 1;
+    f.d = 1;
+    if ((dim % 2) != 0) {
+        f.n = dim;
+        f.d = 2;
+    }
+    return f;
+}
+
+static avifBool overflowsInt32(int64_t x)
+{
+    return (x < INT32_MIN) || (x > INT32_MAX);
+}
+
+static avifBool avifCropRectIsValid(const avifCropRect * cropRect, uint32_t imageW, uint32_t imageH, avifPixelFormat yuvFormat, avifDiagnostics * diag)
+
+{
+    // ISO/IEC 23000-22:2019/DAM 2:2021, Section 7.3.6.7:
+    //   The clean aperture property is restricted according to the chroma
+    //   sampling format of the input image (4:4:4, 4:2:2:, 4:2:0, or 4:0:0) as
+    //   follows:
+    //   - when the image is 4:0:0 (monochrome) or 4:4:4, the horizontal and
+    //     vertical cropped offsets and widths shall be integers;
+    //   - when the image is 4:2:2 the horizontal cropped offset and width
+    //     shall be even numbers and the vertical values shall be integers;
+    //   - when the image is 4:2:0 both the horizontal and vertical cropped
+    //     offsets and widths shall be even numbers.
+
+    if ((cropRect->width == 0) || (cropRect->height == 0)) {
+        avifDiagnosticsPrintf(diag, "[Strict] crop rect width and height must be nonzero");
+        return AVIF_FALSE;
+    }
+    if ((cropRect->x > (UINT32_MAX - cropRect->width)) || ((cropRect->x + cropRect->width) > imageW) ||
+        (cropRect->y > (UINT32_MAX - cropRect->height)) || ((cropRect->y + cropRect->height) > imageH)) {
+        avifDiagnosticsPrintf(diag, "[Strict] crop rect is out of the image's bounds");
+        return AVIF_FALSE;
+    }
+
+    if ((yuvFormat == AVIF_PIXEL_FORMAT_YUV420) || (yuvFormat == AVIF_PIXEL_FORMAT_YUV422)) {
+        if (((cropRect->x % 2) != 0) || ((cropRect->width % 2) != 0)) {
+            avifDiagnosticsPrintf(diag, "[Strict] crop rect X offset and width must both be even due to this image's YUV subsampling");
+            return AVIF_FALSE;
+        }
+    }
+    if (yuvFormat == AVIF_PIXEL_FORMAT_YUV420) {
+        if (((cropRect->y % 2) != 0) || ((cropRect->height % 2) != 0)) {
+            avifDiagnosticsPrintf(diag, "[Strict] crop rect Y offset and height must both be even due to this image's YUV subsampling");
+            return AVIF_FALSE;
+        }
+    }
+    return AVIF_TRUE;
+}
+
+avifBool avifCropRectConvertCleanApertureBox(avifCropRect * cropRect,
+                                             const avifCleanApertureBox * clap,
+                                             uint32_t imageW,
+                                             uint32_t imageH,
+                                             avifPixelFormat yuvFormat,
+                                             avifDiagnostics * diag)
+{
+    avifDiagnosticsClearError(diag);
+
+    // ISO/IEC 14496-12:2020, Section 12.1.4.1:
+    //   For horizOff and vertOff, D shall be strictly positive and N may be
+    //   positive or negative. For cleanApertureWidth and cleanApertureHeight,
+    //   N shall be positive and D shall be strictly positive.
+
+    const int32_t widthN = (int32_t)clap->widthN;
+    const int32_t widthD = (int32_t)clap->widthD;
+    const int32_t heightN = (int32_t)clap->heightN;
+    const int32_t heightD = (int32_t)clap->heightD;
+    const int32_t horizOffN = (int32_t)clap->horizOffN;
+    const int32_t horizOffD = (int32_t)clap->horizOffD;
+    const int32_t vertOffN = (int32_t)clap->vertOffN;
+    const int32_t vertOffD = (int32_t)clap->vertOffD;
+    if ((widthD <= 0) || (heightD <= 0) || (horizOffD <= 0) || (vertOffD <= 0)) {
+        avifDiagnosticsPrintf(diag, "[Strict] clap contains a denominator that is not strictly positive");
+        return AVIF_FALSE;
+    }
+    if ((widthN < 0) || (heightN < 0)) {
+        avifDiagnosticsPrintf(diag, "[Strict] clap width or height is negative");
+        return AVIF_FALSE;
+    }
+
+    if ((widthN % widthD) != 0) {
+        avifDiagnosticsPrintf(diag, "[Strict] clap width %d/%d is not an integer", widthN, widthD);
+        return AVIF_FALSE;
+    }
+    if ((heightN % heightD) != 0) {
+        avifDiagnosticsPrintf(diag, "[Strict] clap height %d/%d is not an integer", heightN, heightD);
+        return AVIF_FALSE;
+    }
+    const int32_t clapW = widthN / widthD;
+    const int32_t clapH = heightN / heightD;
+
+    if ((imageW > INT32_MAX) || (imageH > INT32_MAX)) {
+        avifDiagnosticsPrintf(diag, "[Strict] image width %u or height %u is greater than INT32_MAX", imageW, imageH);
+        return AVIF_FALSE;
+    }
+    avifFraction uncroppedCenterX = calcCenter((int32_t)imageW);
+    avifFraction uncroppedCenterY = calcCenter((int32_t)imageH);
+
+    avifFraction horizOff;
+    horizOff.n = horizOffN;
+    horizOff.d = horizOffD;
+    avifFraction croppedCenterX;
+    if (!avifFractionAdd(uncroppedCenterX, horizOff, &croppedCenterX)) {
+        avifDiagnosticsPrintf(diag, "[Strict] croppedCenterX overflowed");
+        return AVIF_FALSE;
+    }
+
+    avifFraction vertOff;
+    vertOff.n = vertOffN;
+    vertOff.d = vertOffD;
+    avifFraction croppedCenterY;
+    if (!avifFractionAdd(uncroppedCenterY, vertOff, &croppedCenterY)) {
+        avifDiagnosticsPrintf(diag, "[Strict] croppedCenterY overflowed");
+        return AVIF_FALSE;
+    }
+
+    avifFraction halfW;
+    halfW.n = clapW;
+    halfW.d = 2;
+    avifFraction cropX;
+    if (!avifFractionSub(croppedCenterX, halfW, &cropX)) {
+        avifDiagnosticsPrintf(diag, "[Strict] cropX overflowed");
+        return AVIF_FALSE;
+    }
+    if ((cropX.n % cropX.d) != 0) {
+        avifDiagnosticsPrintf(diag, "[Strict] calculated crop X offset %d/%d is not an integer", cropX.n, cropX.d);
+        return AVIF_FALSE;
+    }
+
+    avifFraction halfH;
+    halfH.n = clapH;
+    halfH.d = 2;
+    avifFraction cropY;
+    if (!avifFractionSub(croppedCenterY, halfH, &cropY)) {
+        avifDiagnosticsPrintf(diag, "[Strict] cropY overflowed");
+        return AVIF_FALSE;
+    }
+    if ((cropY.n % cropY.d) != 0) {
+        avifDiagnosticsPrintf(diag, "[Strict] calculated crop Y offset %d/%d is not an integer", cropY.n, cropY.d);
+        return AVIF_FALSE;
+    }
+
+    if ((cropX.n < 0) || (cropY.n < 0)) {
+        avifDiagnosticsPrintf(diag, "[Strict] at least one crop offset is not positive");
+        return AVIF_FALSE;
+    }
+
+    cropRect->x = (uint32_t)(cropX.n / cropX.d);
+    cropRect->y = (uint32_t)(cropY.n / cropY.d);
+    cropRect->width = (uint32_t)clapW;
+    cropRect->height = (uint32_t)clapH;
+    return avifCropRectIsValid(cropRect, imageW, imageH, yuvFormat, diag);
+}
+
+avifBool avifCleanApertureBoxConvertCropRect(avifCleanApertureBox * clap,
+                                             const avifCropRect * cropRect,
+                                             uint32_t imageW,
+                                             uint32_t imageH,
+                                             avifPixelFormat yuvFormat,
+                                             avifDiagnostics * diag)
+{
+    avifDiagnosticsClearError(diag);
+
+    if (!avifCropRectIsValid(cropRect, imageW, imageH, yuvFormat, diag)) {
+        return AVIF_FALSE;
+    }
+
+    if ((imageW > INT32_MAX) || (imageH > INT32_MAX)) {
+        avifDiagnosticsPrintf(diag, "[Strict] image width %u or height %u is greater than INT32_MAX", imageW, imageH);
+        return AVIF_FALSE;
+    }
+    avifFraction uncroppedCenterX = calcCenter((int32_t)imageW);
+    avifFraction uncroppedCenterY = calcCenter((int32_t)imageH);
+
+    if ((cropRect->width > INT32_MAX) || (cropRect->height > INT32_MAX)) {
+        avifDiagnosticsPrintf(diag,
+                              "[Strict] crop rect width %u or height %u is greater than INT32_MAX",
+                              cropRect->width,
+                              cropRect->height);
+        return AVIF_FALSE;
+    }
+    avifFraction croppedCenterX = calcCenter((int32_t)cropRect->width);
+    const int64_t croppedCenterXN = croppedCenterX.n + (int64_t)cropRect->x * croppedCenterX.d;
+    if (overflowsInt32(croppedCenterXN)) {
+        avifDiagnosticsPrintf(diag, "[Strict] croppedCenterX overflowed");
+        return AVIF_FALSE;
+    }
+    croppedCenterX.n = (int32_t)croppedCenterXN;
+    avifFraction croppedCenterY = calcCenter((int32_t)cropRect->height);
+    const int64_t croppedCenterYN = croppedCenterY.n + (int64_t)cropRect->y * croppedCenterY.d;
+    if (overflowsInt32(croppedCenterYN)) {
+        avifDiagnosticsPrintf(diag, "[Strict] croppedCenterY overflowed");
+        return AVIF_FALSE;
+    }
+    croppedCenterY.n = (int32_t)croppedCenterYN;
+
+    avifFraction horizOff;
+    if (!avifFractionSub(croppedCenterX, uncroppedCenterX, &horizOff)) {
+        avifDiagnosticsPrintf(diag, "[Strict] horizOff overflowed");
+        return AVIF_FALSE;
+    }
+    avifFraction vertOff;
+    if (!avifFractionSub(croppedCenterY, uncroppedCenterY, &vertOff)) {
+        avifDiagnosticsPrintf(diag, "[Strict] vertOff overflowed");
+        return AVIF_FALSE;
+    }
+
+    clap->widthN = cropRect->width;
+    clap->widthD = 1;
+    clap->heightN = cropRect->height;
+    clap->heightD = 1;
+    clap->horizOffN = horizOff.n;
+    clap->horizOffD = horizOff.d;
+    clap->vertOffN = vertOff.n;
+    clap->vertOffD = vertOff.d;
+    return AVIF_TRUE;
+}
+
+// ---------------------------------------------------------------------------
+
+avifBool avifAreGridDimensionsValid(avifPixelFormat yuvFormat, uint32_t imageW, uint32_t imageH, uint32_t tileW, uint32_t tileH, avifDiagnostics * diag)
+{
+    // ISO/IEC 23000-22:2019, Section 7.3.11.4.2:
+    //   - the tile_width shall be greater than or equal to 64, and should be a multiple of 64
+    //   - the tile_height shall be greater than or equal to 64, and should be a multiple of 64
+    // The "should" part is ignored here.
+    if ((tileW < 64) || (tileH < 64)) {
+        avifDiagnosticsPrintf(diag,
+                              "Grid image tile width (%u) or height (%u) cannot be smaller than 64. "
+                              "See MIAF (ISO/IEC 23000-22:2019), Section 7.3.11.4.2",
+                              tileW,
+                              tileH);
+        return AVIF_FALSE;
+    }
+
+    // ISO/IEC 23000-22:2019, Section 7.3.11.4.2:
+    //   - when the images are in the 4:2:2 chroma sampling format the horizontal tile offsets and widths,
+    //     and the output width, shall be even numbers;
+    //   - when the images are in the 4:2:0 chroma sampling format both the horizontal and vertical tile
+    //     offsets and widths, and the output width and height, shall be even numbers.
+    // If the rules above were not respected, the following problematic situation may happen:
+    //   Some 4:2:0 image is 650 pixels wide and has 10 cell columns, each being 65 pixels wide.
+    //   The chroma plane of the whole image is 325 pixels wide. The chroma plane of each cell is 33 pixels wide.
+    //   33*10 - 325 gives 5 extra pixels with no specified destination in the reconstructed image.
+
+    // Tile offsets are not enforced since they depend on tile size (ISO/IEC 23008-12:2017, Section 6.6.2.3.1):
+    //   The reconstructed image is formed by tiling the input images into a grid [...] without gap or overlap
+    if ((((yuvFormat == AVIF_PIXEL_FORMAT_YUV420) || (yuvFormat == AVIF_PIXEL_FORMAT_YUV422)) &&
+         (((imageW % 2) != 0) || ((tileW % 2) != 0))) ||
+        ((yuvFormat == AVIF_PIXEL_FORMAT_YUV420) && (((imageH % 2) != 0) || ((tileH % 2) != 0)))) {
+        avifDiagnosticsPrintf(diag,
+                              "Grid image width (%u) or height (%u) or tile width (%u) or height (%u) "
+                              "shall be even if chroma is subsampled in that dimension. "
+                              "See MIAF (ISO/IEC 23000-22:2019), Section 7.3.11.4.2",
+                              imageW,
+                              imageH,
+                              tileW,
+                              tileH);
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+// ---------------------------------------------------------------------------
+// avifCodecSpecificOption
+
+// Returns NULL if a memory allocation failed.
+static char * avifStrdup(const char * str)
+{
+    size_t len = strlen(str);
+    char * dup = avifAlloc(len + 1);
+    if (!dup) {
+        return NULL;
+    }
+    memcpy(dup, str, len + 1);
+    return dup;
+}
+
+avifCodecSpecificOptions * avifCodecSpecificOptionsCreate(void)
+{
+    avifCodecSpecificOptions * ava = avifAlloc(sizeof(avifCodecSpecificOptions));
+    if (!ava || !avifArrayCreate(ava, sizeof(avifCodecSpecificOption), 4)) {
+        goto error;
+    }
+    return ava;
+
+error:
+    avifFree(ava);
+    return NULL;
+}
+
+void avifCodecSpecificOptionsClear(avifCodecSpecificOptions * csOptions)
+{
+    for (uint32_t i = 0; i < csOptions->count; ++i) {
+        avifCodecSpecificOption * entry = &csOptions->entries[i];
+        avifFree(entry->key);
+        avifFree(entry->value);
+    }
+
+    csOptions->count = 0;
+}
+
+void avifCodecSpecificOptionsDestroy(avifCodecSpecificOptions * csOptions)
+{
+    avifCodecSpecificOptionsClear(csOptions);
+    avifArrayDestroy(csOptions);
+    avifFree(csOptions);
+}
+
+avifResult avifCodecSpecificOptionsSet(avifCodecSpecificOptions * csOptions, const char * key, const char * value)
+{
+    // Check to see if a key must be replaced
+    for (uint32_t i = 0; i < csOptions->count; ++i) {
+        avifCodecSpecificOption * entry = &csOptions->entries[i];
+        if (!strcmp(entry->key, key)) {
+            if (value) {
+                // Update the value
+                avifFree(entry->value);
+                entry->value = avifStrdup(value);
+                AVIF_CHECKERR(entry->value, AVIF_RESULT_OUT_OF_MEMORY);
+            } else {
+                // Delete the value
+                avifFree(entry->key);
+                avifFree(entry->value);
+                --csOptions->count;
+                if (csOptions->count > 0) {
+                    memmove(&csOptions->entries[i], &csOptions->entries[i + 1], (csOptions->count - i) * (size_t)csOptions->elementSize);
+                }
+            }
+            return AVIF_RESULT_OK;
+        }
+    }
+
+    if (value) {
+        // Add a new key
+        avifCodecSpecificOption * entry = (avifCodecSpecificOption *)avifArrayPush(csOptions);
+        AVIF_CHECKERR(entry, AVIF_RESULT_OUT_OF_MEMORY);
+        entry->key = avifStrdup(key);
+        AVIF_CHECKERR(entry->key, AVIF_RESULT_OUT_OF_MEMORY);
+        entry->value = avifStrdup(value);
+        AVIF_CHECKERR(entry->value, AVIF_RESULT_OUT_OF_MEMORY);
+    }
+    return AVIF_RESULT_OK;
+}
+
+// ---------------------------------------------------------------------------
+// Codec availability and versions
+
+typedef const char * (*versionFunc)(void);
+typedef avifCodec * (*avifCodecCreateFunc)(void);
+
+struct AvailableCodec
+{
+    avifCodecChoice choice;
+    avifCodecType type;
+    const char * name;
+    versionFunc version;
+    avifCodecCreateFunc create;
+    uint32_t flags;
+};
+
+// This is the main codec table; it determines all usage/availability in libavif.
+
+static struct AvailableCodec availableCodecs[] = {
+// Ordered by preference (for AUTO)
+
+#if defined(AVIF_CODEC_DAV1D)
+    { AVIF_CODEC_CHOICE_DAV1D, AVIF_CODEC_TYPE_AV1, "dav1d", avifCodecVersionDav1d, avifCodecCreateDav1d, AVIF_CODEC_FLAG_CAN_DECODE },
+#endif
+#if defined(AVIF_CODEC_LIBGAV1)
+    { AVIF_CODEC_CHOICE_LIBGAV1, AVIF_CODEC_TYPE_AV1, "libgav1", avifCodecVersionGav1, avifCodecCreateGav1, AVIF_CODEC_FLAG_CAN_DECODE },
+#endif
+#if defined(AVIF_CODEC_AOM)
+    { AVIF_CODEC_CHOICE_AOM,
+      AVIF_CODEC_TYPE_AV1,
+      "aom",
+      avifCodecVersionAOM,
+      avifCodecCreateAOM,
+#if defined(AVIF_CODEC_AOM_DECODE) && defined(AVIF_CODEC_AOM_ENCODE)
+      AVIF_CODEC_FLAG_CAN_DECODE | AVIF_CODEC_FLAG_CAN_ENCODE
+#elif defined(AVIF_CODEC_AOM_DECODE)
+      AVIF_CODEC_FLAG_CAN_DECODE
+#elif defined(AVIF_CODEC_AOM_ENCODE)
+      AVIF_CODEC_FLAG_CAN_ENCODE
+#else
+#error AVIF_CODEC_AOM_DECODE or AVIF_CODEC_AOM_ENCODE must be defined
+#endif
+    },
+#endif
+#if defined(AVIF_CODEC_RAV1E)
+    { AVIF_CODEC_CHOICE_RAV1E, AVIF_CODEC_TYPE_AV1, "rav1e", avifCodecVersionRav1e, avifCodecCreateRav1e, AVIF_CODEC_FLAG_CAN_ENCODE },
+#endif
+#if defined(AVIF_CODEC_SVT)
+    { AVIF_CODEC_CHOICE_SVT, AVIF_CODEC_TYPE_AV1, "svt", avifCodecVersionSvt, avifCodecCreateSvt, AVIF_CODEC_FLAG_CAN_ENCODE },
+#endif
+#if defined(AVIF_CODEC_AVM)
+    { AVIF_CODEC_CHOICE_AVM, AVIF_CODEC_TYPE_AV2, "avm", avifCodecVersionAVM, avifCodecCreateAVM, AVIF_CODEC_FLAG_CAN_DECODE | AVIF_CODEC_FLAG_CAN_ENCODE },
+#endif
+    { AVIF_CODEC_CHOICE_AUTO, AVIF_CODEC_TYPE_UNKNOWN, NULL, NULL, NULL, 0 }
+};
+
+static const int availableCodecsCount = (sizeof(availableCodecs) / sizeof(availableCodecs[0])) - 1;
+
+static struct AvailableCodec * findAvailableCodec(avifCodecChoice choice, avifCodecFlags requiredFlags)
+{
+    for (int i = 0; i < availableCodecsCount; ++i) {
+        if ((choice != AVIF_CODEC_CHOICE_AUTO) && (availableCodecs[i].choice != choice)) {
+            continue;
+        }
+        if (requiredFlags && ((availableCodecs[i].flags & requiredFlags) != requiredFlags)) {
+            continue;
+        }
+        if ((choice == AVIF_CODEC_CHOICE_AUTO) && (availableCodecs[i].choice == AVIF_CODEC_CHOICE_AVM)) {
+            // AV2 is experimental and cannot be the default, it must be explicitly selected.
+            continue;
+        }
+        return &availableCodecs[i];
+    }
+    return NULL;
+}
+
+const char * avifCodecName(avifCodecChoice choice, avifCodecFlags requiredFlags)
+{
+    struct AvailableCodec * availableCodec = findAvailableCodec(choice, requiredFlags);
+    if (availableCodec) {
+        return availableCodec->name;
+    }
+    return NULL;
+}
+
+avifCodecType avifCodecTypeFromChoice(avifCodecChoice choice, avifCodecFlags requiredFlags)
+{
+    struct AvailableCodec * availableCodec = findAvailableCodec(choice, requiredFlags);
+    if (availableCodec) {
+        return availableCodec->type;
+    }
+    return AVIF_CODEC_TYPE_UNKNOWN;
+}
+
+avifCodecChoice avifCodecChoiceFromName(const char * name)
+{
+    for (int i = 0; i < availableCodecsCount; ++i) {
+        if (!strcmp(availableCodecs[i].name, name)) {
+            return availableCodecs[i].choice;
+        }
+    }
+    return AVIF_CODEC_CHOICE_AUTO;
+}
+
+avifResult avifCodecCreate(avifCodecChoice choice, avifCodecFlags requiredFlags, avifCodec ** codec)
+{
+    *codec = NULL;
+    struct AvailableCodec * availableCodec = findAvailableCodec(choice, requiredFlags);
+    AVIF_CHECKERR(availableCodec != NULL, AVIF_RESULT_NO_CODEC_AVAILABLE);
+    *codec = availableCodec->create();
+    AVIF_CHECKERR(*codec != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+    return AVIF_RESULT_OK;
+}
+
+static void append(char ** writePos, size_t * remainingLen, const char * appendStr)
+{
+    size_t appendLen = strlen(appendStr);
+    if (appendLen > *remainingLen) {
+        appendLen = *remainingLen;
+    }
+
+    memcpy(*writePos, appendStr, appendLen);
+    *remainingLen -= appendLen;
+    *writePos += appendLen;
+    *(*writePos) = 0;
+}
+
+void avifCodecVersions(char outBuffer[256])
+{
+    size_t remainingLen = 255;
+    char * writePos = outBuffer;
+    *writePos = 0;
+
+    for (int i = 0; i < availableCodecsCount; ++i) {
+        if (i > 0) {
+            append(&writePos, &remainingLen, ", ");
+        }
+        append(&writePos, &remainingLen, availableCodecs[i].name);
+        if ((availableCodecs[i].flags & (AVIF_CODEC_FLAG_CAN_ENCODE | AVIF_CODEC_FLAG_CAN_DECODE)) ==
+            (AVIF_CODEC_FLAG_CAN_ENCODE | AVIF_CODEC_FLAG_CAN_DECODE)) {
+            append(&writePos, &remainingLen, " [enc/dec]");
+        } else if (availableCodecs[i].flags & AVIF_CODEC_FLAG_CAN_ENCODE) {
+            append(&writePos, &remainingLen, " [enc]");
+        } else if (availableCodecs[i].flags & AVIF_CODEC_FLAG_CAN_DECODE) {
+            append(&writePos, &remainingLen, " [dec]");
+        }
+        append(&writePos, &remainingLen, ":");
+        append(&writePos, &remainingLen, availableCodecs[i].version());
+    }
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h b/pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h
new file mode 100644
index 0000000000..e3e0a65bb2
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h
@@ -0,0 +1,1507 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#ifndef AVIF_AVIF_H
+#define AVIF_AVIF_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+// Pixar:
+#define AVIF_CODEC_AOM_DECODE
+#define AVIF_CODEC_AOM
+// Pixar.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ---------------------------------------------------------------------------
+// Export macros
+
+// AVIF_BUILDING_SHARED_LIBS should only be defined when libavif is being built
+// as a shared library.
+// AVIF_DLL should be defined if libavif is a shared library. If you are using
+// libavif as a CMake dependency, through a CMake package config file or through
+// pkg-config, this is defined automatically.
+//
+// Here's what AVIF_API will be defined as in shared build:
+// |       |        Windows        |                  Unix                  |
+// | Build | __declspec(dllexport) | __attribute__((visibility("default"))) |
+// |  Use  | __declspec(dllimport) |                                        |
+//
+// For static build, AVIF_API is always defined as nothing.
+
+#if defined(_WIN32)
+#define AVIF_HELPER_EXPORT __declspec(dllexport)
+#define AVIF_HELPER_IMPORT __declspec(dllimport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#define AVIF_HELPER_EXPORT __attribute__((visibility("default")))
+#define AVIF_HELPER_IMPORT
+#else
+#define AVIF_HELPER_EXPORT
+#define AVIF_HELPER_IMPORT
+#endif
+
+#if defined(AVIF_DLL)
+#if defined(AVIF_BUILDING_SHARED_LIBS)
+#define AVIF_API AVIF_HELPER_EXPORT
+#else
+#define AVIF_API AVIF_HELPER_IMPORT
+#endif // defined(AVIF_BUILDING_SHARED_LIBS)
+#else
+#define AVIF_API
+#endif // defined(AVIF_DLL)
+
+#if defined(AVIF_ENABLE_NODISCARD) || (defined(__cplusplus) && __cplusplus >= 201700L) || \
+    (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L)
+#define AVIF_NODISCARD [[nodiscard]]
+#else
+#if defined(__clang__) && defined(__has_attribute)
+#if __has_attribute(warn_unused_result)
+#define AVIF_NODISCARD __attribute__((warn_unused_result))
+#else
+#define AVIF_NODISCARD
+#endif
+#else
+#define AVIF_NODISCARD
+#endif
+#endif
+
+// ---------------------------------------------------------------------------
+// Constants
+
+// AVIF_VERSION_DEVEL should always be 0 for official releases / version tags,
+// and non-zero during development of the next release. This should allow for
+// downstream projects to do greater-than preprocessor checks on AVIF_VERSION
+// to leverage in-development code without breaking their stable builds.
+#define AVIF_VERSION_MAJOR 1
+#define AVIF_VERSION_MINOR 0
+#define AVIF_VERSION_PATCH 1
+#define AVIF_VERSION_DEVEL 1
+#define AVIF_VERSION \
+    ((AVIF_VERSION_MAJOR * 1000000) + (AVIF_VERSION_MINOR * 10000) + (AVIF_VERSION_PATCH * 100) + AVIF_VERSION_DEVEL)
+
+typedef int avifBool;
+#define AVIF_TRUE 1
+#define AVIF_FALSE 0
+
+#define AVIF_DIAGNOSTICS_ERROR_BUFFER_SIZE 256
+
+// A reasonable default for maximum image size (in pixel count) to avoid out-of-memory errors or
+// integer overflow in (32-bit) int or unsigned int arithmetic operations.
+#define AVIF_DEFAULT_IMAGE_SIZE_LIMIT (16384 * 16384)
+
+// A reasonable default for maximum image dimension (width or height).
+#define AVIF_DEFAULT_IMAGE_DIMENSION_LIMIT 32768
+
+// a 12 hour AVIF image sequence, running at 60 fps (a basic sanity check as this is quite ridiculous)
+#define AVIF_DEFAULT_IMAGE_COUNT_LIMIT (12 * 3600 * 60)
+
+#define AVIF_QUALITY_DEFAULT -1
+#define AVIF_QUALITY_LOSSLESS 100
+#define AVIF_QUALITY_WORST 0
+#define AVIF_QUALITY_BEST 100
+
+#define AVIF_QUANTIZER_LOSSLESS 0
+#define AVIF_QUANTIZER_BEST_QUALITY 0
+#define AVIF_QUANTIZER_WORST_QUALITY 63
+
+#define AVIF_PLANE_COUNT_YUV 3
+
+#define AVIF_SPEED_DEFAULT -1
+#define AVIF_SPEED_SLOWEST 0
+#define AVIF_SPEED_FASTEST 10
+
+// This value is used to indicate that an animated AVIF file has to be repeated infinitely.
+#define AVIF_REPETITION_COUNT_INFINITE -1
+// This value is used if an animated AVIF file does not have repetitions specified using an EditList box. Applications can choose
+// to handle this case however they want.
+#define AVIF_REPETITION_COUNT_UNKNOWN -2
+
+// The number of spatial layers in AV1, with spatial_id = 0..3.
+#define AVIF_MAX_AV1_LAYER_COUNT 4
+
+typedef enum avifPlanesFlag
+{
+    AVIF_PLANES_YUV = (1 << 0),
+    AVIF_PLANES_A = (1 << 1),
+
+    AVIF_PLANES_ALL = 0xff
+} avifPlanesFlag;
+typedef uint32_t avifPlanesFlags;
+
+typedef enum avifChannelIndex
+{
+    // These can be used as the index for the yuvPlanes and yuvRowBytes arrays in avifImage.
+    AVIF_CHAN_Y = 0,
+    AVIF_CHAN_U = 1,
+    AVIF_CHAN_V = 2,
+
+    // This may not be used in yuvPlanes and yuvRowBytes, but is available for use with avifImagePlane().
+    AVIF_CHAN_A = 3
+} avifChannelIndex;
+
+// ---------------------------------------------------------------------------
+// Version
+
+AVIF_API const char * avifVersion(void);
+AVIF_API void avifCodecVersions(char outBuffer[256]);
+AVIF_API unsigned int avifLibYUVVersion(void); // returns 0 if libavif wasn't compiled with libyuv support
+
+// ---------------------------------------------------------------------------
+// Memory management
+
+// Returns NULL on memory allocation failure.
+AVIF_API void * avifAlloc(size_t size);
+AVIF_API void avifFree(void * p);
+
+// ---------------------------------------------------------------------------
+// avifResult
+
+typedef enum AVIF_NODISCARD avifResult
+{
+    AVIF_RESULT_OK = 0,
+    AVIF_RESULT_UNKNOWN_ERROR = 1,
+    AVIF_RESULT_INVALID_FTYP = 2,
+    AVIF_RESULT_NO_CONTENT = 3,
+    AVIF_RESULT_NO_YUV_FORMAT_SELECTED = 4,
+    AVIF_RESULT_REFORMAT_FAILED = 5,
+    AVIF_RESULT_UNSUPPORTED_DEPTH = 6,
+    AVIF_RESULT_ENCODE_COLOR_FAILED = 7,
+    AVIF_RESULT_ENCODE_ALPHA_FAILED = 8,
+    AVIF_RESULT_BMFF_PARSE_FAILED = 9,
+    AVIF_RESULT_MISSING_IMAGE_ITEM = 10,
+    AVIF_RESULT_DECODE_COLOR_FAILED = 11,
+    AVIF_RESULT_DECODE_ALPHA_FAILED = 12,
+    AVIF_RESULT_COLOR_ALPHA_SIZE_MISMATCH = 13,
+    AVIF_RESULT_ISPE_SIZE_MISMATCH = 14,
+    AVIF_RESULT_NO_CODEC_AVAILABLE = 15,
+    AVIF_RESULT_NO_IMAGES_REMAINING = 16,
+    AVIF_RESULT_INVALID_EXIF_PAYLOAD = 17,
+    AVIF_RESULT_INVALID_IMAGE_GRID = 18,
+    AVIF_RESULT_INVALID_CODEC_SPECIFIC_OPTION = 19,
+    AVIF_RESULT_TRUNCATED_DATA = 20,
+    AVIF_RESULT_IO_NOT_SET = 21, // the avifIO field of avifDecoder is not set
+    AVIF_RESULT_IO_ERROR = 22,
+    AVIF_RESULT_WAITING_ON_IO = 23, // similar to EAGAIN/EWOULDBLOCK, this means the avifIO doesn't have necessary data available yet
+    AVIF_RESULT_INVALID_ARGUMENT = 24, // an argument passed into this function is invalid
+    AVIF_RESULT_NOT_IMPLEMENTED = 25,  // a requested code path is not (yet) implemented
+    AVIF_RESULT_OUT_OF_MEMORY = 26,
+    AVIF_RESULT_CANNOT_CHANGE_SETTING = 27, // a setting that can't change is changed during encoding
+    AVIF_RESULT_INCOMPATIBLE_IMAGE = 28,    // the image is incompatible with already encoded images
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    AVIF_RESULT_ENCODE_GAIN_MAP_FAILED = 29,
+    AVIF_RESULT_DECODE_GAIN_MAP_FAILED = 30,
+    AVIF_RESULT_INVALID_TONE_MAPPED_IMAGE = 31,
+#endif
+
+    // Kept for backward compatibility; please use the symbols above instead.
+    AVIF_RESULT_NO_AV1_ITEMS_FOUND = AVIF_RESULT_MISSING_IMAGE_ITEM
+} avifResult;
+
+AVIF_API const char * avifResultToString(avifResult result);
+
+// ---------------------------------------------------------------------------
+// avifHeaderFormat
+
+typedef enum avifHeaderFormat
+{
+    // AVIF file with an "avif" brand, a MetaBox and all its required boxes for maximum compatibility.
+    AVIF_HEADER_FULL,
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    // AVIF file with an "avir" brand and a CondensedImageBox to reduce the encoded file size.
+    // This is based on the m64572 "Condensed image item" MPEG proposal for HEIF.
+    // WARNING: Experimental feature. Produces files that are incompatible with older decoders.
+    AVIF_HEADER_REDUCED,
+#endif
+} avifHeaderFormat;
+
+// ---------------------------------------------------------------------------
+// avifROData/avifRWData: Generic raw memory storage
+
+typedef struct avifROData
+{
+    const uint8_t * data;
+    size_t size;
+} avifROData;
+
+// Note: Use avifRWDataFree() if any avif*() function populates one of these.
+
+typedef struct avifRWData
+{
+    uint8_t * data;
+    size_t size;
+} avifRWData;
+
+// clang-format off
+// Initialize avifROData/avifRWData on the stack with this
+#define AVIF_DATA_EMPTY { NULL, 0 }
+// clang-format on
+
+// The avifRWData input must be zero-initialized before being manipulated with these functions.
+// If AVIF_RESULT_OUT_OF_MEMORY is returned, raw is left unchanged.
+AVIF_API avifResult avifRWDataRealloc(avifRWData * raw, size_t newSize);
+AVIF_API avifResult avifRWDataSet(avifRWData * raw, const uint8_t * data, size_t len);
+AVIF_API void avifRWDataFree(avifRWData * raw);
+
+// ---------------------------------------------------------------------------
+// Metadata
+
+// Validates the first bytes of the Exif payload and finds the TIFF header offset (up to UINT32_MAX).
+AVIF_API avifResult avifGetExifTiffHeaderOffset(const uint8_t * exif, size_t exifSize, size_t * offset);
+// Returns the offset to the Exif 8-bit orientation value and AVIF_RESULT_OK, or an error.
+// If the offset is set to exifSize, there was no parsing error but no orientation tag was found.
+AVIF_API avifResult avifGetExifOrientationOffset(const uint8_t * exif, size_t exifSize, size_t * offset);
+
+// ---------------------------------------------------------------------------
+// avifPixelFormat
+//
+// Note to libavif maintainers: The lookup tables in avifImageYUVToRGBLibYUV
+// rely on the ordering of this enum values for their correctness. So changing
+// the values in this enum will require auditing avifImageYUVToRGBLibYUV for
+// correctness.
+typedef enum avifPixelFormat
+{
+    // No YUV pixels are present. Alpha plane can still be present.
+    AVIF_PIXEL_FORMAT_NONE = 0,
+
+    AVIF_PIXEL_FORMAT_YUV444,
+    AVIF_PIXEL_FORMAT_YUV422,
+    AVIF_PIXEL_FORMAT_YUV420,
+    AVIF_PIXEL_FORMAT_YUV400,
+    AVIF_PIXEL_FORMAT_COUNT
+} avifPixelFormat;
+AVIF_API const char * avifPixelFormatToString(avifPixelFormat format);
+
+typedef struct avifPixelFormatInfo
+{
+    avifBool monochrome;
+    int chromaShiftX;
+    int chromaShiftY;
+} avifPixelFormatInfo;
+
+// Returns the avifPixelFormatInfo depending on the avifPixelFormat.
+// When monochrome is AVIF_TRUE, chromaShiftX and chromaShiftY are set to 1 according to the AV1 specification but they should be ignored.
+//
+// Note: This function implements the second table on page 119 of the AV1 specification version 1.0.0 with Errata 1.
+// For monochrome 4:0:0, subsampling_x and subsampling are specified as 1 to allow
+// an AV1 implementation that only supports profile 0 to hardcode subsampling_x and subsampling_y to 1.
+AVIF_API void avifGetPixelFormatInfo(avifPixelFormat format, avifPixelFormatInfo * info);
+
+// ---------------------------------------------------------------------------
+// avifChromaSamplePosition
+
+typedef enum avifChromaSamplePosition
+{
+    AVIF_CHROMA_SAMPLE_POSITION_UNKNOWN = 0,
+    AVIF_CHROMA_SAMPLE_POSITION_VERTICAL = 1,
+    AVIF_CHROMA_SAMPLE_POSITION_COLOCATED = 2
+} avifChromaSamplePosition;
+
+// ---------------------------------------------------------------------------
+// avifRange
+
+typedef enum avifRange
+{
+    AVIF_RANGE_LIMITED = 0,
+    AVIF_RANGE_FULL = 1
+} avifRange;
+
+// ---------------------------------------------------------------------------
+// CICP enums - https://www.itu.int/rec/T-REC-H.273-201612-S/en
+
+enum
+{
+    // This is actually reserved, but libavif uses it as a sentinel value.
+    AVIF_COLOR_PRIMARIES_UNKNOWN = 0,
+
+    AVIF_COLOR_PRIMARIES_BT709 = 1,
+    AVIF_COLOR_PRIMARIES_IEC61966_2_4 = 1,
+    AVIF_COLOR_PRIMARIES_UNSPECIFIED = 2,
+    AVIF_COLOR_PRIMARIES_BT470M = 4,
+    AVIF_COLOR_PRIMARIES_BT470BG = 5,
+    AVIF_COLOR_PRIMARIES_BT601 = 6,
+    AVIF_COLOR_PRIMARIES_SMPTE240 = 7,
+    AVIF_COLOR_PRIMARIES_GENERIC_FILM = 8,
+    AVIF_COLOR_PRIMARIES_BT2020 = 9,
+    AVIF_COLOR_PRIMARIES_XYZ = 10,
+    AVIF_COLOR_PRIMARIES_SMPTE431 = 11,
+    AVIF_COLOR_PRIMARIES_SMPTE432 = 12, // DCI P3
+    AVIF_COLOR_PRIMARIES_EBU3213 = 22
+};
+typedef uint16_t avifColorPrimaries; // AVIF_COLOR_PRIMARIES_*
+
+// outPrimaries: rX, rY, gX, gY, bX, bY, wX, wY
+AVIF_API void avifColorPrimariesGetValues(avifColorPrimaries acp, float outPrimaries[8]);
+AVIF_API avifColorPrimaries avifColorPrimariesFind(const float inPrimaries[8], const char ** outName);
+
+enum
+{
+    // This is actually reserved, but libavif uses it as a sentinel value.
+    AVIF_TRANSFER_CHARACTERISTICS_UNKNOWN = 0,
+
+    AVIF_TRANSFER_CHARACTERISTICS_BT709 = 1,
+    AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED = 2,
+    AVIF_TRANSFER_CHARACTERISTICS_BT470M = 4,  // 2.2 gamma
+    AVIF_TRANSFER_CHARACTERISTICS_BT470BG = 5, // 2.8 gamma
+    AVIF_TRANSFER_CHARACTERISTICS_BT601 = 6,
+    AVIF_TRANSFER_CHARACTERISTICS_SMPTE240 = 7,
+    AVIF_TRANSFER_CHARACTERISTICS_LINEAR = 8,
+    AVIF_TRANSFER_CHARACTERISTICS_LOG100 = 9,
+    AVIF_TRANSFER_CHARACTERISTICS_LOG100_SQRT10 = 10,
+    AVIF_TRANSFER_CHARACTERISTICS_IEC61966 = 11,
+    AVIF_TRANSFER_CHARACTERISTICS_BT1361 = 12,
+    AVIF_TRANSFER_CHARACTERISTICS_SRGB = 13,
+    AVIF_TRANSFER_CHARACTERISTICS_BT2020_10BIT = 14,
+    AVIF_TRANSFER_CHARACTERISTICS_BT2020_12BIT = 15,
+    AVIF_TRANSFER_CHARACTERISTICS_SMPTE2084 = 16, // PQ
+    AVIF_TRANSFER_CHARACTERISTICS_SMPTE428 = 17,
+    AVIF_TRANSFER_CHARACTERISTICS_HLG = 18
+};
+typedef uint16_t avifTransferCharacteristics; // AVIF_TRANSFER_CHARACTERISTICS_*
+
+// If the given transfer characteristics can be expressed with a simple gamma value, sets 'gamma'
+// to that value and returns AVIF_RESULT_OK. Returns an error otherwise.
+AVIF_API avifResult avifTransferCharacteristicsGetGamma(avifTransferCharacteristics atc, float * gamma);
+AVIF_API avifTransferCharacteristics avifTransferCharacteristicsFindByGamma(float gamma);
+
+enum
+{
+    AVIF_MATRIX_COEFFICIENTS_IDENTITY = 0,
+    AVIF_MATRIX_COEFFICIENTS_BT709 = 1,
+    AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED = 2,
+    AVIF_MATRIX_COEFFICIENTS_FCC = 4,
+    AVIF_MATRIX_COEFFICIENTS_BT470BG = 5,
+    AVIF_MATRIX_COEFFICIENTS_BT601 = 6,
+    AVIF_MATRIX_COEFFICIENTS_SMPTE240 = 7,
+    AVIF_MATRIX_COEFFICIENTS_YCGCO = 8,
+    AVIF_MATRIX_COEFFICIENTS_BT2020_NCL = 9,
+    AVIF_MATRIX_COEFFICIENTS_BT2020_CL = 10,
+    AVIF_MATRIX_COEFFICIENTS_SMPTE2085 = 11,
+    AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_NCL = 12,
+    AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_CL = 13,
+    AVIF_MATRIX_COEFFICIENTS_ICTCP = 14,
+#if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
+    AVIF_MATRIX_COEFFICIENTS_YCGCO_RE = 15,
+    AVIF_MATRIX_COEFFICIENTS_YCGCO_RO = 16,
+#endif
+    AVIF_MATRIX_COEFFICIENTS_LAST
+};
+typedef uint16_t avifMatrixCoefficients; // AVIF_MATRIX_COEFFICIENTS_*
+
+// ---------------------------------------------------------------------------
+// avifDiagnostics
+
+typedef struct avifDiagnostics
+{
+    // Upon receiving an error from any non-const libavif API call, if the toplevel structure used
+    // in the API call (avifDecoder, avifEncoder) contains a diag member, this buffer may be
+    // populated with a NULL-terminated, freeform error string explaining the most recent error in
+    // more detail. It will be cleared at the beginning of every non-const API call.
+    //
+    // Note: If an error string contains the "[Strict]" prefix, it means that you encountered an
+    // error that only occurs during strict decoding. If you disable strict mode, you will no
+    // longer encounter this error.
+    char error[AVIF_DIAGNOSTICS_ERROR_BUFFER_SIZE];
+} avifDiagnostics;
+
+AVIF_API void avifDiagnosticsClearError(avifDiagnostics * diag);
+
+// ---------------------------------------------------------------------------
+// Fraction utility
+
+typedef struct avifFraction
+{
+    int32_t n;
+    int32_t d;
+} avifFraction;
+
+// ---------------------------------------------------------------------------
+// Optional transformation structs
+
+typedef enum avifTransformFlag
+{
+    AVIF_TRANSFORM_NONE = 0,
+
+    AVIF_TRANSFORM_PASP = (1 << 0),
+    AVIF_TRANSFORM_CLAP = (1 << 1),
+    AVIF_TRANSFORM_IROT = (1 << 2),
+    AVIF_TRANSFORM_IMIR = (1 << 3)
+} avifTransformFlag;
+typedef uint32_t avifTransformFlags;
+
+typedef struct avifPixelAspectRatioBox
+{
+    // 'pasp' from ISO/IEC 14496-12:2015 12.1.4.3
+
+    // define the relative width and height of a pixel
+    uint32_t hSpacing;
+    uint32_t vSpacing;
+} avifPixelAspectRatioBox;
+
+typedef struct avifCleanApertureBox
+{
+    // 'clap' from ISO/IEC 14496-12:2015 12.1.4.3
+
+    // a fractional number which defines the exact clean aperture width, in counted pixels, of the video image
+    uint32_t widthN;
+    uint32_t widthD;
+
+    // a fractional number which defines the exact clean aperture height, in counted pixels, of the video image
+    uint32_t heightN;
+    uint32_t heightD;
+
+    // a fractional number which defines the horizontal offset of clean aperture centre minus (width-1)/2. Typically 0.
+    uint32_t horizOffN;
+    uint32_t horizOffD;
+
+    // a fractional number which defines the vertical offset of clean aperture centre minus (height-1)/2. Typically 0.
+    uint32_t vertOffN;
+    uint32_t vertOffD;
+} avifCleanApertureBox;
+
+typedef struct avifImageRotation
+{
+    // 'irot' from ISO/IEC 23008-12:2017 6.5.10
+
+    // angle * 90 specifies the angle (in anti-clockwise direction) in units of degrees.
+    uint8_t angle; // legal values: [0-3]
+} avifImageRotation;
+
+typedef struct avifImageMirror
+{
+    // 'imir' from ISO/IEC 23008-12:2022 6.5.12:
+    //
+    //     'axis' specifies how the mirroring is performed:
+    //
+    //     0 indicates that the top and bottom parts of the image are exchanged;
+    //     1 specifies that the left and right parts are exchanged.
+    //
+    //     NOTE In Exif, orientation tag can be used to signal mirroring operations. Exif
+    //     orientation tag 4 corresponds to axis = 0 of ImageMirror, and Exif orientation tag 2
+    //     corresponds to axis = 1 accordingly.
+    //
+    // Legal values: [0, 1]
+    uint8_t axis;
+} avifImageMirror;
+
+// ---------------------------------------------------------------------------
+// avifCropRect - Helper struct/functions to work with avifCleanApertureBox
+
+typedef struct avifCropRect
+{
+    uint32_t x;
+    uint32_t y;
+    uint32_t width;
+    uint32_t height;
+} avifCropRect;
+
+// These will return AVIF_FALSE if the resultant values violate any standards, and if so, the output
+// values are not guaranteed to be complete or correct and should not be used.
+AVIF_NODISCARD AVIF_API avifBool avifCropRectConvertCleanApertureBox(avifCropRect * cropRect,
+                                                                     const avifCleanApertureBox * clap,
+                                                                     uint32_t imageW,
+                                                                     uint32_t imageH,
+                                                                     avifPixelFormat yuvFormat,
+                                                                     avifDiagnostics * diag);
+AVIF_NODISCARD AVIF_API avifBool avifCleanApertureBoxConvertCropRect(avifCleanApertureBox * clap,
+                                                                     const avifCropRect * cropRect,
+                                                                     uint32_t imageW,
+                                                                     uint32_t imageH,
+                                                                     avifPixelFormat yuvFormat,
+                                                                     avifDiagnostics * diag);
+
+// ---------------------------------------------------------------------------
+// avifContentLightLevelInformationBox
+
+typedef struct avifContentLightLevelInformationBox
+{
+    // 'clli' from ISO/IEC 23000-22:2019 (MIAF) 7.4.4.2.2. The SEI message semantics written above
+    // each entry were originally described in ISO/IEC 23008-2:2020 (HEVC) section D.3.35,
+    // available at https://standards.iso.org/ittf/PubliclyAvailableStandards/
+
+    // Given the red, green, and blue colour primary intensities in the linear light domain for the
+    // location of a luma sample in a corresponding 4:4:4 representation, denoted as E_R, E_G, and E_B,
+    // the maximum component intensity is defined as E_Max = Max(E_R, Max(E_G, E_B)).
+    // The light level corresponding to the stimulus is then defined as the CIE 1931 luminance
+    // corresponding to equal amplitudes of E_Max for all three colour primary intensities for red,
+    // green, and blue (with appropriate scaling to reflect the nominal luminance level associated
+    // with peak white, e.g. ordinarily scaling to associate peak white with 10 000 candelas per
+    // square metre when transfer_characteristics is equal to 16).
+
+    // max_content_light_level, when not equal to 0, indicates an upper bound on the maximum light
+    // level among all individual samples in a 4:4:4 representation of red, green, and blue colour
+    // primary intensities (in the linear light domain) for the pictures of the CLVS, in units of
+    // candelas per square metre. When equal to 0, no such upper bound is indicated by
+    // max_content_light_level.
+    uint16_t maxCLL;
+
+    // max_pic_average_light_level, when not equal to 0, indicates an upper bound on the maximum
+    // average light level among the samples in a 4:4:4 representation of red, green, and blue
+    // colour primary intensities (in the linear light domain) for any individual picture of the
+    // CLVS, in units of candelas per square metre. When equal to 0, no such upper bound is
+    // indicated by max_pic_average_light_level.
+    uint16_t maxPALL;
+} avifContentLightLevelInformationBox;
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+// ---------------------------------------------------------------------------
+// avifGainMap
+// Gain Maps are a HIGHLY EXPERIMENTAL FEATURE. The format might still change and
+// images containing a gain map encoded with the current version of libavif might
+// not decode with a future version of libavif. The API is not guaranteed
+// to be stable, and might even be removed in the future. Use are your own risk.
+// This is based on ISO/IEC JTC 1/SC 29/WG 3 m64379
+// This product includes Gain Map technology under license by Adobe.
+
+struct avifImage;
+
+// Gain map metadata, to apply the gain map. Fully applying the gain map to the "base"
+// image results in the "alternate" image.
+// All field pairs ending with 'N' and 'D' are fractional values (numerator and denominator).
+typedef struct avifGainMapMetadata
+{
+    // Parameters for converting the gain map from its image encoding to log2 space.
+    // gainMapLog2 = lerp(gainMapMin, gainMapMax, pow(gainMapEncoded, gainMapGamma));
+    // where 'lerp' is a linear interpolation function.
+
+    // Minimum value in the gain map, log2-encoded, per RGB channel.
+    int32_t gainMapMinN[3];
+    uint32_t gainMapMinD[3];
+    // Maximum value in the gain map, log2-encoded, per RGB channel.
+    int32_t gainMapMaxN[3];
+    uint32_t gainMapMaxD[3];
+    // Gain map gamma value with which the gain map was encoded, per RGB channel.
+    // For decoding, the inverse value (1/gamma) should be used.
+    uint32_t gainMapGammaN[3];
+    uint32_t gainMapGammaD[3];
+
+    // Parameters used in gain map computation/tone mapping to avoid numerical
+    // instability.
+    // toneMappedLinear = ((baseImageLinear + baseOffset) * exp(gainMapLog * w)) - alternateOffset;
+    // Where 'w' is a weight parameter based on the display's HDR capacity
+    // (see below).
+
+    // Offset constants for the base image, per RGB channel.
+    int32_t baseOffsetN[3];
+    uint32_t baseOffsetD[3];
+    // Offset constants for the alternate image, per RGB channel.
+    int32_t alternateOffsetN[3];
+    uint32_t alternateOffsetD[3];
+
+    // -----------------------------------------------------------------------
+
+    // Parameters below can be manually tuned after the gain map has been
+    // created.
+
+    // Log2-encoded HDR headroom of the base and alternate images respectively.
+    // If baseHdrHeadroom is < alternateHdrHeadroom, the result of tone mapping
+    // for a display with an HDR headroom that is <= baseHdrHeadroom is the base
+    // image, and the result of tone mapping for a display with an HDR headroom >=
+    // alternateHdrHeadroom is the alternate image.
+    // Conversely, if baseHdrHeadroom is > alternateHdrHeadroom, the result of
+    // tone mapping for a display with an HDR headroom that is >= baseHdrHeadroom
+    // is the base image, and the result of tone mapping for a display with an HDR
+    // headroom <= alternateHdrHeadroom is the alternate image.
+    // For a display with a capacity between baseHdrHeadroom and alternateHdrHeadroom,
+    // tone mapping results in an interpolation between the base and alternate
+    // versions. baseHdrHeadroom and alternateHdrHeadroom can be tuned to change how
+    // the gain map should be applied.
+    //
+    // If 'H' is the display's current log2-encoded HDR capacity (HDR to SDR ratio),
+    // then the weight 'w' to apply the gain map is computed as follows:
+    // f = clamp((H - hdrCapacityMin) /
+    //           (hdrCapacityMax - hdrCapacityMin), 0, 1);
+    // w = backwardDirection ? f * -1 : f;
+    uint32_t baseHdrHeadroomN;
+    uint32_t baseHdrHeadroomD;
+    uint32_t alternateHdrHeadroomN;
+    uint32_t alternateHdrHeadroomD;
+
+    // True if the gain map should be applied in reverse, see weight formula above.
+    avifBool backwardDirection;
+
+    // True if tone mapping should be performed in the color space of the
+    // base image. If false, the color space of the alternate image should
+    // be used.
+    // TODO(maryla): implement.
+    avifBool useBaseColorSpace;
+} avifGainMapMetadata;
+
+// Gain map image and associated metadata.
+typedef struct avifGainMap
+{
+    // Gain map pixels.
+    // Used fields: width, height, depth, yufFormat, yuvRange,
+    // yuvChromaSamplePosition, yuvPlanes, yuvRowBytes, imageOwnsYUVPlanes,
+    // matrixCoefficients, transferCharacteristics. Other fields are ignored.
+    struct avifImage * image;
+
+    // Gain map metadata.
+    // For an image grid, the metadata shall be identical for all cells.
+    avifGainMapMetadata metadata;
+} avifGainMap;
+
+// Same as avifGainMapMetadata, but with fields of type double instead of uint32_t fractions.
+// Use avifGainMapMetadataDoubleToFractions() to convert this to a avifGainMapMetadata.
+// See avifGainMapMetadata for detailed descriptions of fields.
+typedef struct avifGainMapMetadataDouble
+{
+    double gainMapMin[3];
+    double gainMapMax[3];
+    double gainMapGamma[3];
+    double baseOffset[3];
+    double alternateOffset[3];
+    double baseHdrHeadroom;
+    double alternateHdrHeadroom;
+    avifBool backwardDirection;
+    avifBool useBaseColorSpace;
+} avifGainMapMetadataDouble;
+
+// Converts a avifGainMapMetadataDouble to avifGainMapMetadata by converting double values
+// to the closest uint32_t fractions.
+// Returns AVIF_FALSE if some field values are < 0 or > UINT32_MAX.
+AVIF_NODISCARD AVIF_API avifBool avifGainMapMetadataDoubleToFractions(avifGainMapMetadata * dst, const avifGainMapMetadataDouble * src);
+// Converts a avifGainMapMetadata to avifGainMapMetadataDouble by converting fractions to double values.
+// Returns AVIF_FALSE if some denominators are zero.
+AVIF_NODISCARD AVIF_API avifBool avifGainMapMetadataFractionsToDouble(avifGainMapMetadataDouble * dst, const avifGainMapMetadata * src);
+
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
+
+// ---------------------------------------------------------------------------
+// avifImage
+
+// NOTE: The avifImage struct may be extended in a future release. Code outside the libavif library
+// must allocate avifImage by calling the avifImageCreate() or avifImageCreateEmpty() function.
+typedef struct avifImage
+{
+    // Image information
+    uint32_t width;
+    uint32_t height;
+    uint32_t depth; // all planes must share this depth; if depth>8, all planes are uint16_t internally
+
+    avifPixelFormat yuvFormat;
+    avifRange yuvRange;
+    avifChromaSamplePosition yuvChromaSamplePosition;
+    uint8_t * yuvPlanes[AVIF_PLANE_COUNT_YUV];
+    uint32_t yuvRowBytes[AVIF_PLANE_COUNT_YUV];
+    avifBool imageOwnsYUVPlanes;
+
+    uint8_t * alphaPlane;
+    uint32_t alphaRowBytes;
+    avifBool imageOwnsAlphaPlane;
+    avifBool alphaPremultiplied;
+
+    // ICC Profile
+    avifRWData icc;
+
+    // CICP information:
+    // These are stored in the AV1 payload and used to signal YUV conversion. Additionally, if an
+    // ICC profile is not specified, these will be stored in the AVIF container's `colr` box with
+    // a type of `nclx`. If your system supports ICC profiles, be sure to check for the existence
+    // of one (avifImage.icc) before relying on the values listed here!
+    avifColorPrimaries colorPrimaries;
+    avifTransferCharacteristics transferCharacteristics;
+    avifMatrixCoefficients matrixCoefficients;
+
+    // CLLI information:
+    // Content Light Level Information. Used to represent maximum and average light level of an
+    // image. Useful for tone mapping HDR images, especially when using transfer characteristics
+    // SMPTE2084 (PQ). The default value of (0, 0) means the content light level information is
+    // unknown or unavailable, and will cause libavif to avoid writing a clli box for it.
+    avifContentLightLevelInformationBox clli;
+
+    // Transformations - These metadata values are encoded/decoded when transformFlags are set
+    // appropriately, but do not impact/adjust the actual pixel buffers used (images won't be
+    // pre-cropped or mirrored upon decode). Basic explanations from the standards are offered in
+    // comments above, but for detailed explanations, please refer to the HEIF standard (ISO/IEC
+    // 23008-12:2017) and the BMFF standard (ISO/IEC 14496-12:2015).
+    //
+    // To encode any of these boxes, set the values in the associated box, then enable the flag in
+    // transformFlags. On decode, only honor the values in boxes with the associated transform flag set.
+    avifTransformFlags transformFlags;
+    avifPixelAspectRatioBox pasp;
+    avifCleanApertureBox clap;
+    avifImageRotation irot;
+    avifImageMirror imir;
+
+    // Metadata - set with avifImageSetMetadata*() before write, check .size>0 for existence after read
+    avifRWData exif;
+    avifRWData xmp;
+
+    // Version 1.0.0 ends here. Add any new members after this line.
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    // Gain map image and metadata. If no gain map is present, gainMap.image is NULL.
+    // When calling avifImageDestroy on the containing image, the gain map image is also destroyed
+    // (the containing image "owns" the gain map).
+    avifGainMap gainMap;
+#endif
+} avifImage;
+
+// avifImageCreate() and avifImageCreateEmpty() return NULL if arguments are invalid or if a memory allocation failed.
+AVIF_NODISCARD AVIF_API avifImage * avifImageCreate(uint32_t width, uint32_t height, uint32_t depth, avifPixelFormat yuvFormat);
+AVIF_NODISCARD AVIF_API avifImage * avifImageCreateEmpty(void); // helper for making an image to decode into
+// Performs a deep copy of an image, including all metadata and planes, and the gain map metadata/planes if present
+// and if AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP is defined.
+AVIF_API avifResult avifImageCopy(avifImage * dstImage, const avifImage * srcImage, avifPlanesFlags planes);
+// Performs a shallow copy of a rectangular area of an image. 'dstImage' does not own the planes.
+// Ignores the gainMap field (which exists only if AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP is defined).
+AVIF_API avifResult avifImageSetViewRect(avifImage * dstImage, const avifImage * srcImage, const avifCropRect * rect);
+AVIF_API void avifImageDestroy(avifImage * image);
+
+AVIF_API avifResult avifImageSetProfileICC(avifImage * image, const uint8_t * icc, size_t iccSize);
+// Sets Exif metadata. Attempts to parse the Exif metadata for Exif orientation. Sets
+// image->transformFlags, image->irot and image->imir if the Exif metadata is parsed successfully,
+// otherwise leaves image->transformFlags, image->irot and image->imir unchanged.
+// Warning: If the Exif payload is set and invalid, avifEncoderWrite() may return AVIF_RESULT_INVALID_EXIF_PAYLOAD.
+AVIF_API avifResult avifImageSetMetadataExif(avifImage * image, const uint8_t * exif, size_t exifSize);
+// Sets XMP metadata.
+AVIF_API avifResult avifImageSetMetadataXMP(avifImage * image, const uint8_t * xmp, size_t xmpSize);
+
+// Allocate/free/steal planes. These functions ignore the gainMap field (which exists only if
+// AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP is defined).
+AVIF_API avifResult avifImageAllocatePlanes(avifImage * image, avifPlanesFlags planes); // Ignores any pre-existing planes
+AVIF_API void avifImageFreePlanes(avifImage * image, avifPlanesFlags planes);           // Ignores already-freed planes
+AVIF_API void avifImageStealPlanes(avifImage * dstImage, avifImage * srcImage, avifPlanesFlags planes);
+
+// ---------------------------------------------------------------------------
+// Understanding maxThreads
+//
+// libavif's structures and API use the setting 'maxThreads' in a few places. The intent of this
+// setting is to limit concurrent thread activity/usage, not necessarily to put a hard ceiling on
+// how many sleeping threads happen to exist behind the scenes. The goal of this setting is to
+// ensure that at any given point during libavif's encoding or decoding, no more than *maxThreads*
+// threads are simultaneously **active and taking CPU time**.
+//
+// As an important example, when encoding an image sequence that has an alpha channel, two
+// long-lived underlying AV1 encoders must simultaneously exist (one for color, one for alpha). For
+// each additional frame fed into libavif, its YUV planes are fed into one instance of the AV1
+// encoder, and its alpha plane is fed into another. These operations happen serially, so only one
+// of these AV1 encoders is ever active at a time. However, the AV1 encoders might pre-create a
+// pool of worker threads upon initialization, so during this process, twice the amount of worker
+// threads actually simultaneously exist on the machine, but half of them are guaranteed to be
+// sleeping.
+//
+// This design ensures that AV1 implementations are given as many threads as possible to ensure a
+// speedy encode or decode, despite the complexities of occasionally needing two AV1 codec instances
+// (due to alpha payloads being separate from color payloads). If your system has a hard ceiling on
+// the number of threads that can ever be in flight at a given time, please account for this
+// accordingly.
+
+// ---------------------------------------------------------------------------
+// Scaling
+
+// Scales the YUV/A planes in-place. dstWidth and dstHeight must both be <= AVIF_DEFAULT_IMAGE_DIMENSION_LIMIT and
+// dstWidth*dstHeight should be <= AVIF_DEFAULT_IMAGE_SIZE_LIMIT.
+AVIF_API avifResult avifImageScale(avifImage * image, uint32_t dstWidth, uint32_t dstHeight, avifDiagnostics * diag);
+
+// ---------------------------------------------------------------------------
+// Optional YUV<->RGB support
+
+// To convert to/from RGB, create an avifRGBImage on the stack, call avifRGBImageSetDefaults() on
+// it, and then tweak the values inside of it accordingly. At a minimum, you should populate
+// ->pixels and ->rowBytes with an appropriately sized pixel buffer, which should be at least
+// (->rowBytes * ->height) bytes, where ->rowBytes is at least (->width * avifRGBImagePixelSize()).
+// If you don't want to supply your own pixel buffer, you can use the
+// avifRGBImageAllocatePixels()/avifRGBImageFreePixels() convenience functions.
+
+// avifImageRGBToYUV() and avifImageYUVToRGB() will perform depth rescaling and limited<->full range
+// conversion, if necessary. Pixels in an avifRGBImage buffer are always full range, and conversion
+// routines will fail if the width and height don't match the associated avifImage.
+
+// If libavif is built with a version of libyuv offering a fast conversion between RGB and YUV for
+// the given inputs, libavif will use it. See reformat_libyuv.c for the details.
+// libyuv is faster but may have slightly less precision than built-in conversion, so avoidLibYUV
+// can be set to AVIF_TRUE when AVIF_CHROMA_UPSAMPLING_BEST_QUALITY or
+// AVIF_CHROMA_DOWNSAMPLING_BEST_QUALITY is used, to get the most precise but slowest results.
+
+// Note to libavif maintainers: The lookup tables in avifImageYUVToRGBLibYUV
+// rely on the ordering of this enum values for their correctness. So changing
+// the values in this enum will require auditing avifImageYUVToRGBLibYUV for
+// correctness.
+typedef enum avifRGBFormat
+{
+    AVIF_RGB_FORMAT_RGB = 0,
+    AVIF_RGB_FORMAT_RGBA, // This is the default format set in avifRGBImageSetDefaults().
+    AVIF_RGB_FORMAT_ARGB,
+    AVIF_RGB_FORMAT_BGR,
+    AVIF_RGB_FORMAT_BGRA,
+    AVIF_RGB_FORMAT_ABGR,
+    // RGB_565 format uses five bits for the red and blue components and six
+    // bits for the green component. Each RGB pixel is 16 bits (2 bytes), which
+    // is packed as follows:
+    //   uint16_t: [r4 r3 r2 r1 r0 g5 g4 g3 g2 g1 g0 b4 b3 b2 b1 b0]
+    //   r4 and r0 are the MSB and LSB of the red component respectively.
+    //   g5 and g0 are the MSB and LSB of the green component respectively.
+    //   b4 and b0 are the MSB and LSB of the blue component respectively.
+    // This format is only supported for YUV -> RGB conversion and when
+    // avifRGBImage.depth is set to 8.
+    AVIF_RGB_FORMAT_RGB_565,
+    AVIF_RGB_FORMAT_COUNT
+} avifRGBFormat;
+AVIF_API uint32_t avifRGBFormatChannelCount(avifRGBFormat format);
+AVIF_API avifBool avifRGBFormatHasAlpha(avifRGBFormat format);
+
+typedef enum avifChromaUpsampling
+{
+    AVIF_CHROMA_UPSAMPLING_AUTOMATIC = 0,    // Chooses best trade off of speed/quality (uses BILINEAR libyuv if available,
+                                             // or falls back to NEAREST libyuv if available, or falls back to BILINEAR built-in)
+    AVIF_CHROMA_UPSAMPLING_FASTEST = 1,      // Chooses speed over quality (same as NEAREST)
+    AVIF_CHROMA_UPSAMPLING_BEST_QUALITY = 2, // Chooses the best quality upsampling, given settings (same as BILINEAR)
+    AVIF_CHROMA_UPSAMPLING_NEAREST = 3,      // Uses nearest-neighbor filter
+    AVIF_CHROMA_UPSAMPLING_BILINEAR = 4      // Uses bilinear filter
+} avifChromaUpsampling;
+
+typedef enum avifChromaDownsampling
+{
+    AVIF_CHROMA_DOWNSAMPLING_AUTOMATIC = 0,    // Chooses best trade off of speed/quality (same as AVERAGE)
+    AVIF_CHROMA_DOWNSAMPLING_FASTEST = 1,      // Chooses speed over quality (same as AVERAGE)
+    AVIF_CHROMA_DOWNSAMPLING_BEST_QUALITY = 2, // Chooses the best quality upsampling (same as AVERAGE)
+    AVIF_CHROMA_DOWNSAMPLING_AVERAGE = 3,      // Uses averaging filter
+    AVIF_CHROMA_DOWNSAMPLING_SHARP_YUV = 4     // Uses sharp yuv filter (libsharpyuv), available for 4:2:0 only, ignored for 4:2:2
+} avifChromaDownsampling;
+
+// NOTE: avifRGBImage must be initialized with avifRGBImageSetDefaults() (preferred) or memset()
+// before use.
+typedef struct avifRGBImage
+{
+    uint32_t width;                        // must match associated avifImage
+    uint32_t height;                       // must match associated avifImage
+    uint32_t depth;                        // legal depths [8, 10, 12, 16]. if depth>8, pixels must be uint16_t internally
+    avifRGBFormat format;                  // all channels are always full range
+    avifChromaUpsampling chromaUpsampling; // How to upsample from 4:2:0 or 4:2:2 UV when converting to RGB (ignored for 4:4:4 and 4:0:0).
+                                           // Ignored when converting to YUV. Defaults to AVIF_CHROMA_UPSAMPLING_AUTOMATIC.
+    avifChromaDownsampling chromaDownsampling; // How to downsample to 4:2:0 or 4:2:2 UV when converting from RGB (ignored for 4:4:4 and 4:0:0).
+                                               // Ignored when converting to RGB. Defaults to AVIF_CHROMA_DOWNSAMPLING_AUTOMATIC.
+    avifBool avoidLibYUV; // If AVIF_FALSE and libyuv conversion between RGB and YUV (including upsampling or downsampling if any)
+                          // is available for the avifImage/avifRGBImage combination, then libyuv is used. Default is AVIF_FALSE.
+    avifBool ignoreAlpha; // Used for XRGB formats, treats formats containing alpha (such as ARGB) as if they were RGB, treating
+                          // the alpha bits as if they were all 1.
+    avifBool alphaPremultiplied; // indicates if RGB value is pre-multiplied by alpha. Default: false
+    avifBool isFloat; // indicates if RGBA values are in half float (f16) format. Valid only when depth == 16. Default: false
+    int maxThreads; // Number of threads to be used for the YUV to RGB conversion. Note that this value is ignored for RGB to YUV
+                    // conversion. Setting this to zero has the same effect as setting it to one. Negative values are invalid.
+                    // Default: 1.
+
+    uint8_t * pixels;
+    uint32_t rowBytes;
+} avifRGBImage;
+
+// Sets rgb->width, rgb->height, and rgb->depth to image->width, image->height, and image->depth.
+// Sets rgb->pixels to NULL and rgb->rowBytes to 0. Sets the other fields of 'rgb' to default
+// values.
+AVIF_API void avifRGBImageSetDefaults(avifRGBImage * rgb, const avifImage * image);
+AVIF_API uint32_t avifRGBImagePixelSize(const avifRGBImage * rgb);
+
+// Convenience functions. If you supply your own pixels/rowBytes, you do not need to use these.
+AVIF_API avifResult avifRGBImageAllocatePixels(avifRGBImage * rgb);
+AVIF_API void avifRGBImageFreePixels(avifRGBImage * rgb);
+
+// The main conversion functions
+AVIF_API avifResult avifImageRGBToYUV(avifImage * image, const avifRGBImage * rgb);
+AVIF_API avifResult avifImageYUVToRGB(const avifImage * image, avifRGBImage * rgb);
+
+// Premultiply handling functions.
+// (Un)premultiply is automatically done by the main conversion functions above,
+// so usually you don't need to call these. They are there for convenience.
+AVIF_API avifResult avifRGBImagePremultiplyAlpha(avifRGBImage * rgb);
+AVIF_API avifResult avifRGBImageUnpremultiplyAlpha(avifRGBImage * rgb);
+
+// ---------------------------------------------------------------------------
+// YUV Utils
+
+AVIF_API int avifFullToLimitedY(uint32_t depth, int v);
+AVIF_API int avifFullToLimitedUV(uint32_t depth, int v);
+AVIF_API int avifLimitedToFullY(uint32_t depth, int v);
+AVIF_API int avifLimitedToFullUV(uint32_t depth, int v);
+
+// ---------------------------------------------------------------------------
+// Codec selection
+
+typedef enum avifCodecChoice
+{
+    AVIF_CODEC_CHOICE_AUTO = 0,
+    AVIF_CODEC_CHOICE_AOM,
+    AVIF_CODEC_CHOICE_DAV1D,   // Decode only
+    AVIF_CODEC_CHOICE_LIBGAV1, // Decode only
+    AVIF_CODEC_CHOICE_RAV1E,   // Encode only
+    AVIF_CODEC_CHOICE_SVT,     // Encode only
+    AVIF_CODEC_CHOICE_AVM      // Experimental (AV2)
+} avifCodecChoice;
+
+typedef enum avifCodecFlag
+{
+    AVIF_CODEC_FLAG_CAN_DECODE = (1 << 0),
+    AVIF_CODEC_FLAG_CAN_ENCODE = (1 << 1)
+} avifCodecFlag;
+typedef uint32_t avifCodecFlags;
+
+// If this returns NULL, the codec choice/flag combination is unavailable
+AVIF_API const char * avifCodecName(avifCodecChoice choice, avifCodecFlags requiredFlags);
+AVIF_API avifCodecChoice avifCodecChoiceFromName(const char * name);
+
+// ---------------------------------------------------------------------------
+// avifIO
+
+struct avifIO;
+
+// Destroy must completely destroy all child structures *and* free the avifIO object itself.
+// This function pointer is optional, however, if the avifIO object isn't intended to be owned by
+// a libavif encoder/decoder.
+typedef void (*avifIODestroyFunc)(struct avifIO * io);
+
+// This function should return a block of memory that *must* remain valid until another read call to
+// this avifIO struct is made (reusing a read buffer is acceptable/expected).
+//
+// * If offset exceeds the size of the content (past EOF), return AVIF_RESULT_IO_ERROR.
+// * If offset is *exactly* at EOF, provide a 0-byte buffer and return AVIF_RESULT_OK.
+// * If (offset+size) exceeds the contents' size, it must truncate the range to provide all
+//   bytes from the offset to EOF.
+// * If the range is unavailable yet (due to network conditions or any other reason),
+//   return AVIF_RESULT_WAITING_ON_IO.
+// * Otherwise, provide the range and return AVIF_RESULT_OK.
+typedef avifResult (*avifIOReadFunc)(struct avifIO * io, uint32_t readFlags, uint64_t offset, size_t size, avifROData * out);
+
+typedef avifResult (*avifIOWriteFunc)(struct avifIO * io, uint32_t writeFlags, uint64_t offset, const uint8_t * data, size_t size);
+
+typedef struct avifIO
+{
+    avifIODestroyFunc destroy;
+    avifIOReadFunc read;
+
+    // This is reserved for future use - but currently ignored. Set it to a null pointer.
+    avifIOWriteFunc write;
+
+    // If non-zero, this is a hint to internal structures of the max size offered by the content
+    // this avifIO structure is reading. If it is a static memory source, it should be the size of
+    // the memory buffer; if it is a file, it should be the file's size. If this information cannot
+    // be known (as it is streamed-in), set a reasonable upper boundary here (larger than the file
+    // can possibly be for your environment, but within your environment's memory constraints). This
+    // is used for sanity checks when allocating internal buffers to protect against
+    // malformed/malicious files.
+    uint64_t sizeHint;
+
+    // If true, *all* memory regions returned from *all* calls to read are guaranteed to be
+    // persistent and exist for the lifetime of the avifIO object. If false, libavif will make
+    // in-memory copies of samples and metadata content, and a memory region returned from read must
+    // only persist until the next call to read.
+    avifBool persistent;
+
+    // The contents of this are defined by the avifIO implementation, and should be fully destroyed
+    // by the implementation of the associated destroy function, unless it isn't owned by the avifIO
+    // struct. It is not necessary to use this pointer in your implementation.
+    void * data;
+} avifIO;
+
+// Returns NULL if the reader cannot be allocated.
+AVIF_API avifIO * avifIOCreateMemoryReader(const uint8_t * data, size_t size);
+// Returns NULL if the file cannot be opened or if the reader cannot be allocated.
+AVIF_API avifIO * avifIOCreateFileReader(const char * filename);
+AVIF_API void avifIODestroy(avifIO * io);
+
+// ---------------------------------------------------------------------------
+// avifDecoder
+
+// Some encoders (including very old versions of avifenc) do not implement the AVIF standard
+// perfectly, and thus create invalid files. However, these files are likely still recoverable /
+// decodable, if it wasn't for the strict requirements imposed by libavif's decoder. These flags
+// allow a user of avifDecoder to decide what level of strictness they want in their project.
+typedef enum avifStrictFlag
+{
+    // Disables all strict checks.
+    AVIF_STRICT_DISABLED = 0,
+
+    // Requires the PixelInformationProperty ('pixi') be present in AV1 image items. libheif v1.11.0
+    // or older does not add the 'pixi' item property to AV1 image items. If you need to decode AVIF
+    // images encoded by libheif v1.11.0 or older, be sure to disable this bit. (This issue has been
+    // corrected in libheif v1.12.0.)
+    AVIF_STRICT_PIXI_REQUIRED = (1 << 0),
+
+    // This demands that the values surfaced in the clap box are valid, determined by attempting to
+    // convert the clap box to a crop rect using avifCropRectConvertCleanApertureBox(). If this
+    // function returns AVIF_FALSE and this strict flag is set, the decode will fail.
+    AVIF_STRICT_CLAP_VALID = (1 << 1),
+
+    // Requires the ImageSpatialExtentsProperty ('ispe') be present in alpha auxiliary image items.
+    // avif-serialize 0.7.3 or older does not add the 'ispe' item property to alpha auxiliary image
+    // items. If you need to decode AVIF images encoded by the cavif encoder with avif-serialize
+    // 0.7.3 or older, be sure to disable this bit. (This issue has been corrected in avif-serialize
+    // 0.7.4.) See https://github.com/kornelski/avif-serialize/issues/3 and
+    // https://crbug.com/1246678.
+    AVIF_STRICT_ALPHA_ISPE_REQUIRED = (1 << 2),
+
+    // Maximum strictness; enables all bits above. This is avifDecoder's default.
+    AVIF_STRICT_ENABLED = AVIF_STRICT_PIXI_REQUIRED | AVIF_STRICT_CLAP_VALID | AVIF_STRICT_ALPHA_ISPE_REQUIRED
+} avifStrictFlag;
+typedef uint32_t avifStrictFlags;
+
+// Useful stats related to a read/write
+typedef struct avifIOStats
+{
+    // Size in bytes of the AV1 image item or track data containing color samples.
+    size_t colorOBUSize;
+    // Size in bytes of the AV1 image item or track data containing alpha samples.
+    size_t alphaOBUSize;
+} avifIOStats;
+
+struct avifDecoderData;
+
+typedef enum avifDecoderSource
+{
+    // Honor the major brand signaled in the beginning of the file to pick between an AVIF sequence
+    // ('avis', tracks-based) or a single image ('avif', item-based). If the major brand is neither
+    // of these, prefer the AVIF sequence ('avis', tracks-based), if present.
+    AVIF_DECODER_SOURCE_AUTO = 0,
+
+    // Use the primary item and the aux (alpha) item in the avif(s).
+    // This is where single-image avifs store their image.
+    AVIF_DECODER_SOURCE_PRIMARY_ITEM,
+
+    // Use the chunks inside primary/aux tracks in the moov block.
+    // This is where avifs image sequences store their images.
+    AVIF_DECODER_SOURCE_TRACKS
+
+    // Decode the thumbnail item. Currently unimplemented.
+    // AVIF_DECODER_SOURCE_THUMBNAIL_ITEM
+} avifDecoderSource;
+
+// Information about the timing of a single image in an image sequence
+typedef struct avifImageTiming
+{
+    uint64_t timescale;            // timescale of the media (Hz)
+    double pts;                    // presentation timestamp in seconds (ptsInTimescales / timescale)
+    uint64_t ptsInTimescales;      // presentation timestamp in "timescales"
+    double duration;               // in seconds (durationInTimescales / timescale)
+    uint64_t durationInTimescales; // duration in "timescales"
+} avifImageTiming;
+
+typedef enum avifProgressiveState
+{
+    // The current AVIF/Source does not offer a progressive image. This will always be the state
+    // for an image sequence.
+    AVIF_PROGRESSIVE_STATE_UNAVAILABLE = 0,
+
+    // The current AVIF/Source offers a progressive image, but avifDecoder.allowProgressive is not
+    // enabled, so it will behave as if the image was not progressive and will simply decode the
+    // best version of this item.
+    AVIF_PROGRESSIVE_STATE_AVAILABLE,
+
+    // The current AVIF/Source offers a progressive image, and avifDecoder.allowProgressive is true.
+    // In this state, avifDecoder.imageCount will be the count of all of the available progressive
+    // layers, and any specific layer can be decoded using avifDecoderNthImage() as if it was an
+    // image sequence, or simply using repeated calls to avifDecoderNextImage() to decode better and
+    // better versions of this image.
+    AVIF_PROGRESSIVE_STATE_ACTIVE
+} avifProgressiveState;
+AVIF_API const char * avifProgressiveStateToString(avifProgressiveState progressiveState);
+
+// NOTE: The avifDecoder struct may be extended in a future release. Code outside the libavif
+// library must allocate avifDecoder by calling the avifDecoderCreate() function.
+typedef struct avifDecoder
+{
+    // --------------------------------------------------------------------------------------------
+    // Inputs
+
+    // Defaults to AVIF_CODEC_CHOICE_AUTO: Preference determined by order in availableCodecs table (avif.c)
+    avifCodecChoice codecChoice;
+
+    // Defaults to 1. -- NOTE: Please see the "Understanding maxThreads" comment block above
+    int maxThreads;
+
+    // avifs can have multiple sets of images in them. This specifies which to decode.
+    // Set this via avifDecoderSetSource().
+    avifDecoderSource requestedSource;
+
+    // If this is true and a progressive AVIF is decoded, avifDecoder will behave as if the AVIF is
+    // an image sequence, in that it will set imageCount to the number of progressive frames
+    // available, and avifDecoderNextImage()/avifDecoderNthImage() will allow for specific layers
+    // of a progressive image to be decoded. To distinguish between a progressive AVIF and an AVIF
+    // image sequence, inspect avifDecoder.progressiveState.
+    avifBool allowProgressive;
+
+    // If this is false, avifDecoderNextImage() will start decoding a frame only after there are
+    // enough input bytes to decode all of that frame. If this is true, avifDecoder will decode each
+    // subimage or grid cell as soon as possible. The benefits are: grid images may be partially
+    // displayed before being entirely available, and the overall decoding may finish earlier.
+    // Must be set before calling avifDecoderNextImage() or avifDecoderNthImage().
+    // WARNING: Experimental feature.
+    avifBool allowIncremental;
+
+    // Enable any of these to avoid reading and surfacing specific data to the decoded avifImage.
+    // These can be useful if your avifIO implementation heavily uses AVIF_RESULT_WAITING_ON_IO for
+    // streaming data, as some of these payloads are (unfortunately) packed at the end of the file,
+    // which will cause avifDecoderParse() to return AVIF_RESULT_WAITING_ON_IO until it finds them.
+    // If you don't actually leverage this data, it is best to ignore it here.
+    avifBool ignoreExif;
+    avifBool ignoreXMP;
+
+    // This represents the maximum size of an image (in pixel count) that libavif and the underlying
+    // AV1 decoder should attempt to decode. It defaults to AVIF_DEFAULT_IMAGE_SIZE_LIMIT, and can
+    // be set to a smaller value. The value 0 is reserved.
+    // Note: Only some underlying AV1 codecs support a configurable size limit (such as dav1d).
+    uint32_t imageSizeLimit;
+
+    // This represents the maximum dimension of an image (width or height) that libavif should
+    // attempt to decode. It defaults to AVIF_DEFAULT_IMAGE_DIMENSION_LIMIT. Set it to 0 to ignore
+    // the limit.
+    uint32_t imageDimensionLimit;
+
+    // This provides an upper bound on how many images the decoder is willing to attempt to decode,
+    // to provide a bit of protection from malicious or malformed AVIFs citing millions upon
+    // millions of frames, only to be invalid later. The default is AVIF_DEFAULT_IMAGE_COUNT_LIMIT
+    // (see comment above), and setting this to 0 disables the limit.
+    uint32_t imageCountLimit;
+
+    // Strict flags. Defaults to AVIF_STRICT_ENABLED. See avifStrictFlag definitions above.
+    avifStrictFlags strictFlags;
+
+    // --------------------------------------------------------------------------------------------
+    // Outputs
+
+    // All decoded image data; owned by the decoder. All information in this image is incrementally
+    // added and updated as avifDecoder*() functions are called. After a successful call to
+    // avifDecoderParse(), all values in decoder->image (other than the planes/rowBytes themselves)
+    // will be pre-populated with all information found in the outer AVIF container, prior to any
+    // AV1 decoding. If the contents of the inner AV1 payload disagree with the outer container,
+    // these values may change after calls to avifDecoderRead*(),avifDecoderNextImage(), or
+    // avifDecoderNthImage().
+    //
+    // The YUV and A contents of this image are likely owned by the decoder, so be sure to copy any
+    // data inside of this image before advancing to the next image or reusing the decoder. It is
+    // legal to call avifImageYUVToRGB() on this in between calls to avifDecoderNextImage(), but use
+    // avifImageCopy() if you want to make a complete, permanent copy of this image's YUV content or
+    // metadata.
+    avifImage * image;
+
+    // Counts and timing for the current image in an image sequence. Uninteresting for single image files.
+    int imageIndex;                        // 0-based
+    int imageCount;                        // Always 1 for non-progressive, non-sequence AVIFs.
+    avifProgressiveState progressiveState; // See avifProgressiveState declaration
+    avifImageTiming imageTiming;           //
+    uint64_t timescale;                    // timescale of the media (Hz)
+    double duration;                       // duration of a single playback of the image sequence in seconds
+                                           // (durationInTimescales / timescale)
+    uint64_t durationInTimescales;         // duration of a single playback of the image sequence in "timescales"
+    int repetitionCount;                   // number of times the sequence has to be repeated. This can also be one of
+                                           // AVIF_REPETITION_COUNT_INFINITE or AVIF_REPETITION_COUNT_UNKNOWN. Essentially, if
+                                           // repetitionCount is a non-negative integer `n`, then the image sequence should be
+                                           // played back `n + 1` times.
+
+    // This is true when avifDecoderParse() detects an alpha plane. Use this to find out if alpha is
+    // present after a successful call to avifDecoderParse(), but prior to any call to
+    // avifDecoderNextImage() or avifDecoderNthImage(), as decoder->image->alphaPlane won't exist yet.
+    avifBool alphaPresent;
+
+    // stats from the most recent read, possibly 0s if reading an image sequence
+    avifIOStats ioStats;
+
+    // Additional diagnostics (such as detailed error state)
+    avifDiagnostics diag;
+
+    // --------------------------------------------------------------------------------------------
+    // Internals
+
+    // Use one of the avifDecoderSetIO*() functions to set this
+    avifIO * io;
+
+    // Internals used by the decoder
+    struct avifDecoderData * data;
+
+    // Version 1.0.0 ends here. Add any new members after this line.
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    // This is true when avifDecoderParse() detects a gain map.
+    avifBool gainMapPresent;
+    // Enable decoding the gain map image if present (defaults to AVIF_FALSE).
+    // (see also enableParsingGainMapMetadata below).
+    // gainMapPresent is still set if the presence of a gain map is detected, regardless
+    // of this setting.
+    avifBool enableDecodingGainMap;
+    // Enable parsing the gain map metadata if present (defaults to AVIF_FALSE).
+    // gainMapPresent is still set if the presence of a gain map is detected, regardless
+    // of this setting.
+    // Gain map metadata is read during avifDecoderParse(). Like Exif and XMP, this data
+    // can be (unfortunately) packed at the end of the file, which will cause
+    // avifDecoderParse() to return AVIF_RESULT_WAITING_ON_IO until it finds it.
+    // If you don't actually use this data, it's best to leave this to AVIF_FALSE (default).
+    avifBool enableParsingGainMapMetadata;
+    // Do not decode the color/alpha planes of the main image.
+    // Can be useful to decode the gain map image only.
+    avifBool ignoreColorAndAlpha;
+#endif
+
+    // This is true when avifDecoderParse() detects an image sequence track in the image. If this is true, the image can be
+    // decoded either as an animated image sequence or as a still image (the primary image item) by setting avifDecoderSetSource
+    // to the appropriate source.
+    avifBool imageSequenceTrackPresent;
+} avifDecoder;
+
+// Returns NULL in case of memory allocation failure.
+AVIF_API avifDecoder * avifDecoderCreate(void);
+AVIF_API void avifDecoderDestroy(avifDecoder * decoder);
+
+// Simple interfaces to decode a single image, independent of the decoder afterwards (decoder may be destroyed).
+AVIF_API avifResult avifDecoderRead(avifDecoder * decoder, avifImage * image); // call avifDecoderSetIO*() first
+AVIF_API avifResult avifDecoderReadMemory(avifDecoder * decoder, avifImage * image, const uint8_t * data, size_t size);
+AVIF_API avifResult avifDecoderReadFile(avifDecoder * decoder, avifImage * image, const char * filename);
+
+// Multi-function alternative to avifDecoderRead() for image sequences and gaining direct access
+// to the decoder's YUV buffers (for performance's sake). Data passed into avifDecoderParse() is NOT
+// copied, so it must continue to exist until the decoder is destroyed.
+//
+// Usage / function call order is:
+// * avifDecoderCreate()
+// * avifDecoderSetSource() - optional, the default (AVIF_DECODER_SOURCE_AUTO) is usually sufficient
+// * avifDecoderSetIO*()
+// * avifDecoderParse()
+// * avifDecoderNextImage() - in a loop, using decoder->image after each successful call
+// * avifDecoderDestroy()
+//
+// NOTE: Until avifDecoderParse() returns AVIF_RESULT_OK, no data in avifDecoder should
+//       be considered valid, and no queries (such as Keyframe/Timing/MaxExtent) should be made.
+//
+// You can use avifDecoderReset() any time after a successful call to avifDecoderParse()
+// to reset the internal decoder back to before the first frame. Calling either
+// avifDecoderSetSource() or avifDecoderParse() will automatically Reset the decoder.
+//
+// avifDecoderSetSource() allows you not only to choose whether to parse tracks or
+// items in a file containing both, but switch between sources without having to
+// Parse again. Normally AVIF_DECODER_SOURCE_AUTO is enough for the common path.
+AVIF_API avifResult avifDecoderSetSource(avifDecoder * decoder, avifDecoderSource source);
+// Note: When avifDecoderSetIO() is called, whether 'decoder' takes ownership of 'io' depends on
+// whether io->destroy is set. avifDecoderDestroy(decoder) calls avifIODestroy(io), which calls
+// io->destroy(io) if io->destroy is set. Therefore, if io->destroy is not set, then
+// avifDecoderDestroy(decoder) has no effects on 'io'.
+AVIF_API void avifDecoderSetIO(avifDecoder * decoder, avifIO * io);
+AVIF_API avifResult avifDecoderSetIOMemory(avifDecoder * decoder, const uint8_t * data, size_t size);
+AVIF_API avifResult avifDecoderSetIOFile(avifDecoder * decoder, const char * filename);
+AVIF_API avifResult avifDecoderParse(avifDecoder * decoder);
+AVIF_API avifResult avifDecoderNextImage(avifDecoder * decoder);
+AVIF_API avifResult avifDecoderNthImage(avifDecoder * decoder, uint32_t frameIndex);
+AVIF_API avifResult avifDecoderReset(avifDecoder * decoder);
+
+// Keyframe information
+// frameIndex - 0-based, matching avifDecoder->imageIndex, bound by avifDecoder->imageCount
+// "nearest" keyframe means the keyframe prior to this frame index (returns frameIndex if it is a keyframe)
+// These functions may be used after a successful call (AVIF_RESULT_OK) to avifDecoderParse().
+AVIF_NODISCARD AVIF_API avifBool avifDecoderIsKeyframe(const avifDecoder * decoder, uint32_t frameIndex);
+AVIF_API uint32_t avifDecoderNearestKeyframe(const avifDecoder * decoder, uint32_t frameIndex);
+
+// Timing helper - This does not change the current image or invoke the codec (safe to call repeatedly)
+// This function may be used after a successful call (AVIF_RESULT_OK) to avifDecoderParse().
+AVIF_API avifResult avifDecoderNthImageTiming(const avifDecoder * decoder, uint32_t frameIndex, avifImageTiming * outTiming);
+
+// When avifDecoderNextImage() or avifDecoderNthImage() returns AVIF_RESULT_WAITING_ON_IO, this
+// function can be called next to retrieve the number of top rows that can be immediately accessed
+// from the luma plane of decoder->image, and alpha if any. The corresponding rows from the chroma planes,
+// if any, can also be accessed (half rounded up if subsampled, same number of rows otherwise).
+// If a gain map is present and AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP is on and enableDecodingGainMap is also on,
+// the gain map's planes can also be accessed in the same way. If the gain map's height is different from
+// the main image, then the number of available gain map rows is at least:
+// roundf((float)decoded_row_count / decoder->image->height * decoder->image->gainMap.image->height)
+// When gain map scaling is needed, callers might choose to use a few less rows depending on how many rows
+// are needed by the scaling algorithm, to avoid the last row(s) changing when more data becomes available.
+// decoder->allowIncremental must be set to true before calling avifDecoderNextImage() or
+// avifDecoderNthImage(). Returns decoder->image->height when the last call to avifDecoderNextImage() or
+// avifDecoderNthImage() returned AVIF_RESULT_OK. Returns 0 in all other cases.
+// WARNING: Experimental feature.
+AVIF_API uint32_t avifDecoderDecodedRowCount(const avifDecoder * decoder);
+
+// ---------------------------------------------------------------------------
+// avifExtent
+
+typedef struct avifExtent
+{
+    uint64_t offset;
+    size_t size;
+} avifExtent;
+
+// Streaming data helper - Use this to calculate the maximal AVIF data extent encompassing all AV1
+// sample data needed to decode the Nth image. The offset will be the earliest offset of all
+// required AV1 extents for this frame, and the size will create a range including the last byte of
+// the last AV1 sample needed. Note that this extent may include non-sample data, as a frame's
+// sample data may be broken into multiple extents and interleaved with other data, or in
+// non-sequential order. This extent will also encompass all AV1 samples that this frame's sample
+// depends on to decode (such as samples for reference frames), from the nearest keyframe up to this
+// Nth frame.
+//
+// If avifDecoderNthImageMaxExtent() returns AVIF_RESULT_OK and the extent's size is 0 bytes, this
+// signals that libavif doesn't expect to call avifIO's Read for this frame's decode. This happens if
+// data for this frame was read as a part of avifDecoderParse() (typically in an idat box inside of
+// a meta box).
+//
+// This function may be used after a successful call (AVIF_RESULT_OK) to avifDecoderParse().
+AVIF_API avifResult avifDecoderNthImageMaxExtent(const avifDecoder * decoder, uint32_t frameIndex, avifExtent * outExtent);
+
+// ---------------------------------------------------------------------------
+// avifEncoder
+
+struct avifEncoderData;
+struct avifCodecSpecificOptions;
+
+typedef struct avifScalingMode
+{
+    avifFraction horizontal;
+    avifFraction vertical;
+} avifScalingMode;
+
+// Notes:
+// * The avifEncoder struct may be extended in a future release. Code outside the libavif library
+//   must allocate avifEncoder by calling the avifEncoderCreate() function.
+// * If avifEncoderWrite() returns AVIF_RESULT_OK, output must be freed with avifRWDataFree()
+// * If (maxThreads < 2), multithreading is disabled
+//   * NOTE: Please see the "Understanding maxThreads" comment block above
+// * Quality range: [AVIF_QUALITY_WORST - AVIF_QUALITY_BEST]
+// * Quantizer range: [AVIF_QUANTIZER_BEST_QUALITY - AVIF_QUANTIZER_WORST_QUALITY]
+// * In older versions of libavif, the avifEncoder struct doesn't have the quality and qualityAlpha
+//   fields. For backward compatibility, if the quality field is not set, the default value of
+//   quality is based on the average of minQuantizer and maxQuantizer. Similarly the default value
+//   of qualityAlpha is based on the average of minQuantizerAlpha and maxQuantizerAlpha. New code
+//   should set quality and qualityAlpha and leave minQuantizer, maxQuantizer, minQuantizerAlpha,
+//   and maxQuantizerAlpha initialized to their default values.
+// * To enable tiling, set tileRowsLog2 > 0 and/or tileColsLog2 > 0.
+//   Tiling values range [0-6], where the value indicates a request for 2^n tiles in that dimension.
+//   If autoTiling is set to AVIF_TRUE, libavif ignores tileRowsLog2 and tileColsLog2 and
+//   automatically chooses suitable tiling values.
+// * Speed range: [AVIF_SPEED_SLOWEST - AVIF_SPEED_FASTEST]. Slower should make for a better quality
+//   image in less bytes. AVIF_SPEED_DEFAULT means "Leave the AV1 codec to its default speed settings"./
+//   If avifEncoder uses rav1e, the speed value is directly passed through (0-10). If libaom is used,
+//   a combination of settings are tweaked to simulate this speed range.
+// * Extra layer count: [0 - (AVIF_MAX_AV1_LAYER_COUNT-1)]. Non-zero value indicates a layered
+//   (progressive) image.
+// * Some encoder settings can be changed after encoding starts. Changes will take effect in the next
+//   call to avifEncoderAddImage().
+typedef struct avifEncoder
+{
+    // Defaults to AVIF_CODEC_CHOICE_AUTO: Preference determined by order in availableCodecs table (avif.c)
+    avifCodecChoice codecChoice;
+
+    // settings (see Notes above)
+    int maxThreads;
+    int speed;
+    int keyframeInterval;     // Any set of |keyframeInterval| consecutive frames will have at least one keyframe. When it is 0,
+                              // there is no such restriction.
+    uint64_t timescale;       // timescale of the media (Hz)
+    int repetitionCount;      // Number of times the image sequence should be repeated. This can also be set to
+                              // AVIF_REPETITION_COUNT_INFINITE for infinite repetitions.  Only applicable for image sequences.
+                              // Essentially, if repetitionCount is a non-negative integer `n`, then the image sequence should be
+                              // played back `n + 1` times. Defaults to AVIF_REPETITION_COUNT_INFINITE.
+    uint32_t extraLayerCount; // EXPERIMENTAL: Non-zero value encodes layered image.
+
+    // changeable encoder settings
+    int quality;
+    int qualityAlpha;
+    int minQuantizer;
+    int maxQuantizer;
+    int minQuantizerAlpha;
+    int maxQuantizerAlpha;
+    int tileRowsLog2;
+    int tileColsLog2;
+    avifBool autoTiling;
+    avifScalingMode scalingMode;
+
+    // stats from the most recent write
+    avifIOStats ioStats;
+
+    // Additional diagnostics (such as detailed error state)
+    avifDiagnostics diag;
+
+    // Internals used by the encoder
+    struct avifEncoderData * data;
+    struct avifCodecSpecificOptions * csOptions;
+
+    // Version 1.0.0 ends here. Add any new members after this line.
+
+    // Defaults to AVIF_HEADER_FULL
+    avifHeaderFormat headerFormat;
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    int qualityGainMap; // changeable encoder setting
+#endif
+} avifEncoder;
+
+// avifEncoderCreate() returns NULL if a memory allocation failed.
+AVIF_NODISCARD AVIF_API avifEncoder * avifEncoderCreate(void);
+AVIF_API avifResult avifEncoderWrite(avifEncoder * encoder, const avifImage * image, avifRWData * output);
+AVIF_API void avifEncoderDestroy(avifEncoder * encoder);
+
+typedef enum avifAddImageFlag
+{
+    AVIF_ADD_IMAGE_FLAG_NONE = 0,
+
+    // Force this frame to be a keyframe (sync frame).
+    AVIF_ADD_IMAGE_FLAG_FORCE_KEYFRAME = (1 << 0),
+
+    // Use this flag when encoding a single frame, single layer image.
+    // Signals "still_picture" to AV1 encoders, which tweaks various compression rules.
+    // This is enabled automatically when using the avifEncoderWrite() single-image encode path.
+    AVIF_ADD_IMAGE_FLAG_SINGLE = (1 << 1)
+} avifAddImageFlag;
+typedef uint32_t avifAddImageFlags;
+
+// Multi-function alternative to avifEncoderWrite() for advanced features.
+//
+// Usage / function call order is:
+// * avifEncoderCreate()
+// - Still image:
+//   * avifEncoderAddImage() [exactly once]
+// - Still image grid:
+//   * avifEncoderAddImageGrid() [exactly once, AVIF_ADD_IMAGE_FLAG_SINGLE is assumed]
+// - Image sequence:
+//   * Set encoder->timescale (Hz) correctly
+//   * avifEncoderAddImage() ... [repeatedly; at least once]
+// - Still layered image:
+//   * Set encoder->extraLayerCount correctly
+//   * avifEncoderAddImage() ... [exactly encoder->extraLayerCount+1 times]
+// - Still layered grid:
+//   * Set encoder->extraLayerCount correctly
+//   * avifEncoderAddImageGrid() ... [exactly encoder->extraLayerCount+1 times]
+// * avifEncoderFinish()
+// * avifEncoderDestroy()
+//
+// The image passed to avifEncoderAddImage() or avifEncoderAddImageGrid() is encoded during the
+// call (which may be slow) and can be freed after the function returns.
+
+// durationInTimescales is ignored if AVIF_ADD_IMAGE_FLAG_SINGLE is set in addImageFlags,
+// or if we are encoding a layered image.
+AVIF_API avifResult avifEncoderAddImage(avifEncoder * encoder, const avifImage * image, uint64_t durationInTimescales, avifAddImageFlags addImageFlags);
+AVIF_API avifResult avifEncoderAddImageGrid(avifEncoder * encoder,
+                                            uint32_t gridCols,
+                                            uint32_t gridRows,
+                                            const avifImage * const * cellImages,
+                                            avifAddImageFlags addImageFlags);
+AVIF_API avifResult avifEncoderFinish(avifEncoder * encoder, avifRWData * output);
+
+// Codec-specific, optional "advanced" tuning settings, in the form of string key/value pairs,
+// to be consumed by the codec in the next avifEncoderAddImage() call.
+// See the codec documentation to know if a setting is persistent or applied only to the next frame.
+// key must be non-NULL, but passing a NULL value will delete the pending key, if it exists.
+// Setting an incorrect or unknown option for the current codec will cause errors of type
+// AVIF_RESULT_INVALID_CODEC_SPECIFIC_OPTION from avifEncoderWrite() or avifEncoderAddImage().
+AVIF_API avifResult avifEncoderSetCodecSpecificOption(avifEncoder * encoder, const char * key, const char * value);
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+// Returns the size in bytes of the AV1 image item containing gain map samples, or 0 if no gain map was encoded.
+AVIF_API size_t avifEncoderGetGainMapSizeBytes(avifEncoder * encoder);
+#endif
+
+// Helpers
+AVIF_NODISCARD AVIF_API avifBool avifImageUsesU16(const avifImage * image);
+AVIF_NODISCARD AVIF_API avifBool avifImageIsOpaque(const avifImage * image);
+// channel can be an avifChannelIndex.
+AVIF_API uint8_t * avifImagePlane(const avifImage * image, int channel);
+AVIF_API uint32_t avifImagePlaneRowBytes(const avifImage * image, int channel);
+AVIF_API uint32_t avifImagePlaneWidth(const avifImage * image, int channel);
+AVIF_API uint32_t avifImagePlaneHeight(const avifImage * image, int channel);
+
+// Returns AVIF_TRUE if input begins with a valid FileTypeBox (ftyp) that supports
+// either the brand 'avif' or 'avis' (or both), without performing any allocations.
+AVIF_NODISCARD AVIF_API avifBool avifPeekCompatibleFileType(const avifROData * input);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // ifndef AVIF_AVIF_H
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif_cxx.h b/pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif_cxx.h
new file mode 100644
index 0000000000..fdb19d2f0c
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif_cxx.h
@@ -0,0 +1,33 @@
+// Copyright 2023 Google LLC
+// SPDX-License-Identifier: BSD-2-Clause
+
+#ifndef AVIF_AVIF_CXX_H
+#define AVIF_AVIF_CXX_H
+
+#if !defined(__cplusplus)
+#error "This a C++ only header. Use avif/avif.h for C."
+#endif
+
+#include <memory>
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h"
+
+namespace avif
+{
+
+// Struct to call the destroy functions in a unique_ptr.
+struct UniquePtrDeleter
+{
+    void operator()(avifEncoder * encoder) const { avifEncoderDestroy(encoder); }
+    void operator()(avifDecoder * decoder) const { avifDecoderDestroy(decoder); }
+    void operator()(avifImage * image) const { avifImageDestroy(image); }
+};
+
+// Use these unique_ptr to ensure the structs are automatically destroyed.
+using EncoderPtr = std::unique_ptr<avifEncoder, UniquePtrDeleter>;
+using DecoderPtr = std::unique_ptr<avifDecoder, UniquePtrDeleter>;
+using ImagePtr = std::unique_ptr<avifImage, UniquePtrDeleter>;
+
+} // namespace avif
+
+#endif // AVIF_AVIF_CXX_H
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h b/pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h
new file mode 100644
index 0000000000..cccd95821d
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h
@@ -0,0 +1,710 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#ifndef AVIF_INTERNAL_H
+#define AVIF_INTERNAL_H
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h" // IWYU pragma: export
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Yes, clamp macros are nasty. Do not use them.
+#define AVIF_CLAMP(x, low, high) (((x) < (low)) ? (low) : (((high) < (x)) ? (high) : (x)))
+#define AVIF_MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define AVIF_MAX(a, b) (((a) > (b)) ? (a) : (b))
+
+// Used for debugging. Define AVIF_BREAK_ON_ERROR to catch the earliest failure during encoding or decoding.
+#if defined(AVIF_BREAK_ON_ERROR)
+static inline void avifBreakOnError()
+{
+    // Same mechanism as OpenCV's error() function, or replace by a breakpoint.
+    int * p = NULL;
+    *p = 0;
+}
+#else
+#define avifBreakOnError()
+#endif
+
+// Used by stream related things.
+#define AVIF_CHECK(A)           \
+    do {                        \
+        if (!(A)) {             \
+            avifBreakOnError(); \
+            return AVIF_FALSE;  \
+        }                       \
+    } while (0)
+
+// Used instead of CHECK if needing to return a specific error on failure, instead of AVIF_FALSE
+#define AVIF_CHECKERR(A, ERR)   \
+    do {                        \
+        if (!(A)) {             \
+            avifBreakOnError(); \
+            return ERR;         \
+        }                       \
+    } while (0)
+
+// Forward any error to the caller now or continue execution.
+#define AVIF_CHECKRES(A)                  \
+    do {                                  \
+        const avifResult result__ = (A);  \
+        if (result__ != AVIF_RESULT_OK) { \
+            avifBreakOnError();           \
+            return result__;              \
+        }                                 \
+    } while (0)
+
+// ---------------------------------------------------------------------------
+// URNs and Content-Types
+
+#define AVIF_URN_ALPHA0 "urn:mpeg:mpegB:cicp:systems:auxiliary:alpha"
+#define AVIF_URN_ALPHA1 "urn:mpeg:hevc:2015:auxid:1"
+
+#define AVIF_CONTENT_TYPE_XMP "application/rdf+xml"
+
+// ---------------------------------------------------------------------------
+// Utils
+
+float avifRoundf(float v);
+
+// H (host) is platform-dependent. Could be little- or big-endian.
+// N (network) is big-endian: most- to least-significant bytes.
+// C (custom) is little-endian: least- to most-significant bytes.
+// Never read N or C values; only access after casting to uint8_t*.
+uint16_t avifHTONS(uint16_t s);
+uint16_t avifNTOHS(uint16_t s);
+uint16_t avifCTOHS(uint16_t s);
+uint32_t avifHTONL(uint32_t l);
+uint32_t avifNTOHL(uint32_t l);
+uint32_t avifCTOHL(uint32_t l);
+uint64_t avifHTON64(uint64_t l);
+uint64_t avifNTOH64(uint64_t l);
+
+void avifCalcYUVCoefficients(const avifImage * image, float * outR, float * outG, float * outB);
+
+typedef float (*avifTransferFunction)(float);
+// Returns a function to map from gamma-encoded values in the [0.0, 1.0] range to linear extended SDR values.
+// Extended SDR values are in [0.0, 1.0] for SDR transfer chracteristics (all transfer characteristics except PQ and HLG)
+// and can go beyond 1.0 for HDR transfer characteristics:
+// - For AVIF_TRANSFER_CHARACTERISTICS_SMPTE2084 (PQ), the linear range is [0.0, 10000/203]
+// - For AVIF_TRANSFER_CHARACTERISTICS_HLG, the linear range is [0.0, 1000/203]
+avifTransferFunction avifTransferCharacteristicsGetGammaToLinearFunction(avifTransferCharacteristics atc);
+// Same as above in the opposite direction. toGamma(toLinear(v)) ~= v.
+avifTransferFunction avifTransferCharacteristicsGetLinearToGammaFunction(avifTransferCharacteristics atc);
+
+// Computes the RGB->YUV conversion coefficients kr, kg, kb, such that Y=kr*R+kg*G+kb*B.
+void avifColorPrimariesComputeYCoeffs(avifColorPrimaries colorPrimaries, float coeffs[3]);
+
+#define AVIF_ARRAY_DECLARE(TYPENAME, ITEMSTYPE, ITEMSNAME) \
+    typedef struct TYPENAME                                \
+    {                                                      \
+        ITEMSTYPE * ITEMSNAME;                             \
+        uint32_t elementSize;                              \
+        uint32_t count;                                    \
+        uint32_t capacity;                                 \
+    } TYPENAME
+AVIF_NODISCARD avifBool avifArrayCreate(void * arrayStruct, uint32_t elementSize, uint32_t initialCapacity);
+AVIF_NODISCARD void * avifArrayPush(void * arrayStruct);
+void avifArrayPop(void * arrayStruct);
+void avifArrayDestroy(void * arrayStruct);
+
+void avifFractionSimplify(avifFraction * f);
+// Makes the fractions have a common denominator.
+AVIF_NODISCARD avifBool avifFractionCD(avifFraction * a, avifFraction * b);
+AVIF_NODISCARD avifBool avifFractionAdd(avifFraction a, avifFraction b, avifFraction * result);
+AVIF_NODISCARD avifBool avifFractionSub(avifFraction a, avifFraction b, avifFraction * result);
+
+// Creates an int32 fraction that is approximately equal to 'v'.
+// Returns AVIF_FALSE if 'v' is NaN or abs(v) is > INT32_MAX.
+AVIF_NODISCARD avifBool avifDoubleToSignedFraction(double v, int32_t * numerator, uint32_t * denominator);
+// Creates a uint32 fraction that is approximately equal to 'v'.
+// Returns AVIF_FALSE if 'v' is < 0 or > UINT32_MAX or NaN.
+AVIF_NODISCARD avifBool avifDoubleToUnsignedFraction(double v, uint32_t * numerator, uint32_t * denominator);
+
+void avifImageSetDefaults(avifImage * image);
+// Copies all fields that do not need to be freed/allocated from srcImage to dstImage.
+void avifImageCopyNoAlloc(avifImage * dstImage, const avifImage * srcImage);
+
+// Copies the samples from srcImage to dstImage. dstImage must be allocated.
+// srcImage and dstImage must have the same width, height, and depth.
+// If the AVIF_PLANES_YUV bit is set in planes, then srcImage and dstImage must have the same yuvFormat and yuvRange.
+// Ignores the gainMap field (which exists only if AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP is defined).
+void avifImageCopySamples(avifImage * dstImage, const avifImage * srcImage, avifPlanesFlags planes);
+
+typedef struct avifAlphaParams
+{
+    uint32_t width;
+    uint32_t height;
+
+    uint32_t srcDepth;
+    const uint8_t * srcPlane;
+    uint32_t srcRowBytes;
+    uint32_t srcOffsetBytes;
+    uint32_t srcPixelBytes;
+
+    uint32_t dstDepth;
+    uint8_t * dstPlane;
+    uint32_t dstRowBytes;
+    uint32_t dstOffsetBytes;
+    uint32_t dstPixelBytes;
+
+} avifAlphaParams;
+
+void avifFillAlpha(const avifAlphaParams * params);
+void avifReformatAlpha(const avifAlphaParams * params);
+
+typedef enum avifReformatMode
+{
+    AVIF_REFORMAT_MODE_YUV_COEFFICIENTS = 0, // Normal YUV conversion using coefficients
+    AVIF_REFORMAT_MODE_IDENTITY,             // Pack GBR directly into YUV planes (AVIF_MATRIX_COEFFICIENTS_IDENTITY)
+    AVIF_REFORMAT_MODE_YCGCO,                // YUV conversion using AVIF_MATRIX_COEFFICIENTS_YCGCO
+#if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
+    AVIF_REFORMAT_MODE_YCGCO_RE, // YUV conversion using AVIF_MATRIX_COEFFICIENTS_YCGCO_RE
+    AVIF_REFORMAT_MODE_YCGCO_RO, // YUV conversion using AVIF_MATRIX_COEFFICIENTS_YCGCO_RO
+#endif
+} avifReformatMode;
+
+typedef enum avifAlphaMultiplyMode
+{
+    AVIF_ALPHA_MULTIPLY_MODE_NO_OP = 0,
+    AVIF_ALPHA_MULTIPLY_MODE_MULTIPLY,
+    AVIF_ALPHA_MULTIPLY_MODE_UNMULTIPLY
+} avifAlphaMultiplyMode;
+
+// Information about an RGB color space.
+typedef struct avifRGBColorSpaceInfo
+{
+    uint32_t channelBytes; // Number of bytes per channel.
+    uint32_t pixelBytes;   // Number of bytes per pixel (= channelBytes * num channels).
+    uint32_t offsetBytesR; // Offset in bytes of the red channel in a pixel.
+    uint32_t offsetBytesG; // Offset in bytes of the green channel in a pixel.
+    uint32_t offsetBytesB; // Offset in bytes of the blue channel in a pixel.
+    uint32_t offsetBytesA; // Offset in bytes of the alpha channel in a pixel.
+
+    int maxChannel;    // Maximum value for a channel (e.g. 255 for 8 bit).
+    float maxChannelF; // Same as maxChannel but as a float.
+} avifRGBColorSpaceInfo;
+
+avifBool avifGetRGBColorSpaceInfo(const avifRGBImage * rgb, avifRGBColorSpaceInfo * info);
+
+// Information about a YUV color space.
+typedef struct avifYUVColorSpaceInfo
+{
+    // YUV coefficients. Y = kr*R + kg*G + kb*B.
+    float kr;
+    float kg;
+    float kb;
+
+    uint32_t channelBytes; // Number of bytes per channel.
+    uint32_t depth;        // Bit depth.
+    avifRange range;       // Full or limited range.
+    int maxChannel;        // Maximum value for a channel (e.g. 255 for 8 bit).
+    float biasY;           // Minimum Y value.
+    float biasUV;          // The value of 0.5 for the appropriate bit depth (128 for 8 bit, 512 for 10 bit, 2048 for 12 bit).
+    float rangeY;          // Difference between max and min Y.
+    float rangeUV;         // Difference between max and min UV.
+
+    avifPixelFormatInfo formatInfo; // Chroma subsampling information.
+    avifReformatMode mode;          // Appropriate RGB<->YUV conversion mode.
+} avifYUVColorSpaceInfo;
+
+avifBool avifGetYUVColorSpaceInfo(const avifImage * image, avifYUVColorSpaceInfo * info);
+
+typedef struct avifReformatState
+{
+    avifRGBColorSpaceInfo rgb;
+    avifYUVColorSpaceInfo yuv;
+} avifReformatState;
+
+// Retrieves the pixel value at position (x, y) expressed as floats in [0, 1]. If the image's format doesn't have alpha,
+// rgbaPixel[3] is set to 1.0f.
+void avifGetRGBAPixel(const avifRGBImage * src, uint32_t x, uint32_t y, const avifRGBColorSpaceInfo * info, float rgbaPixel[4]);
+// Sets the pixel value at position (i, j) from RGBA values expressed as floats in [0, 1]. If the image's format doesn't
+// support alpha, rgbaPixel[3] is ignored.
+void avifSetRGBAPixel(const avifRGBImage * dst, uint32_t x, uint32_t y, const avifRGBColorSpaceInfo * info, const float rgbaPixel[4]);
+
+// Returns:
+// * AVIF_RESULT_OK              - Converted successfully with libyuv
+// * AVIF_RESULT_NOT_IMPLEMENTED - The fast path for this combination is not implemented with libyuv, use built-in RGB conversion
+// * [any other error]           - Return error to caller
+avifResult avifImageRGBToYUVLibYUV(avifImage * image, const avifRGBImage * rgb);
+
+// Parameters:
+// * image - input YUV image
+// * rgb - output RGB image
+// * reformatAlpha - if set to AVIF_TRUE, the function will attempt to copy the alpha channel to the output RGB image using
+// libyuv.
+// * alphaReformattedWithLibYUV - Output parameter. If reformatAlpha is set to true and libyuv was able to copy over the alpha
+// channel, then this will be set to AVIF_TRUE. Otherwise, this will be set to AVIF_FALSE. The value in this parameter is valid
+// only if the return value of the function is AVIF_RESULT_OK or AVIF_RESULT_NOT_IMPLEMENTED.
+// Returns:
+// * AVIF_RESULT_OK              - Converted successfully with libyuv
+// * AVIF_RESULT_NOT_IMPLEMENTED - The fast path for this combination is not implemented with libyuv, use built-in YUV conversion
+// * [any other error]           - Return error to caller
+avifResult avifImageYUVToRGBLibYUV(const avifImage * image, avifRGBImage * rgb, avifBool reformatAlpha, avifBool * alphaReformattedWithLibYUV);
+
+// Returns:
+// * AVIF_RESULT_OK              - Converted successfully with libsharpyuv
+// * AVIF_RESULT_NOT_IMPLEMENTED - libsharpyuv is not compiled in, or doesn't support this type of input
+// * [any other error]           - Return error to caller
+avifResult avifImageRGBToYUVLibSharpYUV(avifImage * image, const avifRGBImage * rgb, const avifReformatState * state);
+
+// Returns:
+// * AVIF_RESULT_OK               - Converted successfully with libyuv.
+// * AVIF_RESULT_NOT_IMPLEMENTED  - The fast path for this conversion is not implemented with libyuv, use built-in conversion.
+// * AVIF_RESULT_INVALID_ARGUMENT - Return error to caller.
+avifResult avifRGBImageToF16LibYUV(avifRGBImage * rgb);
+
+// Returns:
+// * AVIF_RESULT_OK              - (Un)Premultiply successfully with libyuv
+// * AVIF_RESULT_NOT_IMPLEMENTED - The fast path for this combination is not implemented with libyuv, use built-in (Un)Premultiply
+// * [any other error]           - Return error to caller
+avifResult avifRGBImagePremultiplyAlphaLibYUV(avifRGBImage * rgb);
+avifResult avifRGBImageUnpremultiplyAlphaLibYUV(avifRGBImage * rgb);
+
+AVIF_NODISCARD avifBool avifDimensionsTooLarge(uint32_t width, uint32_t height, uint32_t imageSizeLimit, uint32_t imageDimensionLimit);
+
+// Given the number of encoding threads or decoding threads available and the image dimensions,
+// chooses suitable values of *tileRowsLog2 and *tileColsLog2.
+//
+// Note: Although avifSetTileConfiguration() is only used in src/write.c and could be a static
+// function in that file, it is defined as an internal global function so that it can be tested by
+// unit tests.
+void avifSetTileConfiguration(int threads, uint32_t width, uint32_t height, int * tileRowsLog2, int * tileColsLog2);
+
+// ---------------------------------------------------------------------------
+// Scaling
+
+// Scales the YUV/A planes in-place.
+AVIF_NODISCARD avifResult avifImageScaleWithLimit(avifImage * image,
+                                                  uint32_t dstWidth,
+                                                  uint32_t dstHeight,
+                                                  uint32_t imageSizeLimit,
+                                                  uint32_t imageDimensionLimit,
+                                                  avifDiagnostics * diag);
+
+// ---------------------------------------------------------------------------
+// AVIF item category
+
+typedef enum avifItemCategory
+{
+    AVIF_ITEM_COLOR,
+    AVIF_ITEM_ALPHA,
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    AVIF_ITEM_GAIN_MAP,
+#endif
+    AVIF_ITEM_CATEGORY_COUNT
+} avifItemCategory;
+
+// ---------------------------------------------------------------------------
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+// AVIF color_type field meaning in CondensedImageBox
+typedef enum avifConiColorType
+{
+    AVIF_CONI_COLOR_TYPE_SRGB = 0,
+    AVIF_CONI_COLOR_TYPE_NCLX_5BIT = 1,
+    AVIF_CONI_COLOR_TYPE_NCLX_8BIT = 2,
+    AVIF_CONI_COLOR_TYPE_ICC = 3
+} avifConiColorType;
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+
+// ---------------------------------------------------------------------------
+// Grid AVIF images
+
+// Returns false if the tiles in a grid image violate any standards.
+// The image contains imageW*imageH pixels. The tiles are of tileW*tileH pixels each.
+AVIF_NODISCARD avifBool avifAreGridDimensionsValid(avifPixelFormat yuvFormat,
+                                                   uint32_t imageW,
+                                                   uint32_t imageH,
+                                                   uint32_t tileW,
+                                                   uint32_t tileH,
+                                                   avifDiagnostics * diag);
+
+// ---------------------------------------------------------------------------
+// Metadata
+
+// Attempts to parse the image->exif payload for Exif orientation and sets image->transformFlags, image->irot and
+// image->imir on success. Returns AVIF_RESULT_INVALID_EXIF_PAYLOAD on failure.
+avifResult avifImageExtractExifOrientationToIrotImir(avifImage * image);
+
+// ---------------------------------------------------------------------------
+// avifCodecDecodeInput
+
+// Legal spatial_id values are [0,1,2,3], so this serves as a sentinel value for "do not filter by spatial_id"
+#define AVIF_SPATIAL_ID_UNSET 0xff
+
+typedef struct avifDecodeSample
+{
+    avifROData data;
+    avifBool ownsData;
+    avifBool partialData; // if true, data exists but doesn't have all of the sample in it
+
+    uint32_t itemID;   // if non-zero, data comes from a mergedExtents buffer in an avifDecoderItem, not a file offset
+    uint64_t offset;   // additional offset into data. Can be used to offset into an itemID's payload as well.
+    size_t size;       //
+    uint8_t spatialID; // If set to a value other than AVIF_SPATIAL_ID_UNSET, output frames from this sample should be
+                       // skipped until the output frame's spatial_id matches this ID.
+    avifBool sync;     // is sync sample (keyframe)
+} avifDecodeSample;
+AVIF_ARRAY_DECLARE(avifDecodeSampleArray, avifDecodeSample, sample);
+
+typedef struct avifCodecDecodeInput
+{
+    avifDecodeSampleArray samples;
+    avifBool allLayers;            // if true, the underlying codec must decode all layers, not just the best layer
+    avifItemCategory itemCategory; // category of item being decoded
+} avifCodecDecodeInput;
+
+AVIF_NODISCARD avifCodecDecodeInput * avifCodecDecodeInputCreate(void);
+void avifCodecDecodeInputDestroy(avifCodecDecodeInput * decodeInput);
+
+// ---------------------------------------------------------------------------
+// avifCodecEncodeOutput
+
+typedef struct avifEncodeSample
+{
+    avifRWData data;
+    avifBool sync; // is sync sample (keyframe)
+} avifEncodeSample;
+AVIF_ARRAY_DECLARE(avifEncodeSampleArray, avifEncodeSample, sample);
+
+typedef struct avifCodecEncodeOutput
+{
+    avifEncodeSampleArray samples;
+} avifCodecEncodeOutput;
+
+AVIF_NODISCARD avifCodecEncodeOutput * avifCodecEncodeOutputCreate(void);
+avifResult avifCodecEncodeOutputAddSample(avifCodecEncodeOutput * encodeOutput, const uint8_t * data, size_t len, avifBool sync);
+void avifCodecEncodeOutputDestroy(avifCodecEncodeOutput * encodeOutput);
+
+// ---------------------------------------------------------------------------
+// avifCodecSpecificOptions (key/value string pairs for advanced tuning)
+
+typedef struct avifCodecSpecificOption
+{
+    char * key;   // Must be a simple lowercase alphanumeric string
+    char * value; // Free-form string to be interpreted by the codec
+} avifCodecSpecificOption;
+AVIF_ARRAY_DECLARE(avifCodecSpecificOptions, avifCodecSpecificOption, entries);
+
+// Returns NULL if a memory allocation failed.
+AVIF_NODISCARD avifCodecSpecificOptions * avifCodecSpecificOptionsCreate(void);
+void avifCodecSpecificOptionsClear(avifCodecSpecificOptions * csOptions);
+void avifCodecSpecificOptionsDestroy(avifCodecSpecificOptions * csOptions);
+avifResult avifCodecSpecificOptionsSet(avifCodecSpecificOptions * csOptions, const char * key, const char * value); // if(value==NULL), key is deleted
+
+// ---------------------------------------------------------------------------
+// avifCodecType (underlying video format)
+
+// Alliance for Open Media video formats that can be used in the AVIF image format.
+typedef enum avifCodecType
+{
+    AVIF_CODEC_TYPE_UNKNOWN,
+    AVIF_CODEC_TYPE_AV1,
+#if defined(AVIF_CODEC_AVM)
+    AVIF_CODEC_TYPE_AV2, // Experimental.
+#endif
+} avifCodecType;
+
+// Returns AVIF_CODEC_TYPE_UNKNOWN unless the chosen codec is available with the requiredFlags.
+avifCodecType avifCodecTypeFromChoice(avifCodecChoice choice, avifCodecFlags requiredFlags);
+
+// ---------------------------------------------------------------------------
+// avifCodec (abstraction layer to use different codec implementations)
+
+struct avifCodec;
+struct avifCodecInternal;
+
+typedef enum avifEncoderChange
+{
+    AVIF_ENCODER_CHANGE_MIN_QUANTIZER = (1u << 0),
+    AVIF_ENCODER_CHANGE_MAX_QUANTIZER = (1u << 1),
+    AVIF_ENCODER_CHANGE_MIN_QUANTIZER_ALPHA = (1u << 2),
+    AVIF_ENCODER_CHANGE_MAX_QUANTIZER_ALPHA = (1u << 3),
+    AVIF_ENCODER_CHANGE_TILE_ROWS_LOG2 = (1u << 4),
+    AVIF_ENCODER_CHANGE_TILE_COLS_LOG2 = (1u << 5),
+    AVIF_ENCODER_CHANGE_QUANTIZER = (1u << 6),
+    AVIF_ENCODER_CHANGE_QUANTIZER_ALPHA = (1u << 7),
+    AVIF_ENCODER_CHANGE_SCALING_MODE = (1u << 8),
+
+    AVIF_ENCODER_CHANGE_CODEC_SPECIFIC = (1u << 31)
+} avifEncoderChange;
+typedef uint32_t avifEncoderChanges;
+
+typedef avifBool (*avifCodecGetNextImageFunc)(struct avifCodec * codec,
+                                              struct avifDecoder * decoder,
+                                              const avifDecodeSample * sample,
+                                              avifBool alpha,
+                                              avifBool * isLimitedRangeAlpha,
+                                              avifImage * image);
+// EncodeImage and EncodeFinish are not required to always emit a sample, but when all images are
+// encoded and EncodeFinish is called, the number of samples emitted must match the number of submitted frames.
+// avifCodecEncodeImageFunc may return AVIF_RESULT_UNKNOWN_ERROR to automatically emit the appropriate
+// AVIF_RESULT_ENCODE_COLOR_FAILED or AVIF_RESULT_ENCODE_ALPHA_FAILED depending on the alpha argument.
+// avifCodecEncodeImageFunc should use tileRowsLog2 and tileColsLog2 instead of
+// encoder->tileRowsLog2, encoder->tileColsLog2, and encoder->autoTiling. The caller of
+// avifCodecEncodeImageFunc is responsible for automatic tiling if encoder->autoTiling is set to
+// AVIF_TRUE. The actual tiling values are passed to avifCodecEncodeImageFunc as parameters.
+// Similarly, avifCodecEncodeImageFunc should use the quantizer parameter instead of
+// encoder->quality and encoder->qualityAlpha. If disableLaggedOutput is AVIF_TRUE, then the encoder will emit the output frame
+// without any lag (if supported). Note that disableLaggedOutput is only used by the first call to this function (which
+// initializes the encoder) and is ignored by the subsequent calls.
+//
+// Note: The caller of avifCodecEncodeImageFunc always passes encoder->data->tileRowsLog2 and
+// encoder->data->tileColsLog2 as the tileRowsLog2 and tileColsLog2 arguments. Because
+// encoder->data is of a struct type defined in src/write.c, avifCodecEncodeImageFunc cannot
+// dereference encoder->data and has to receive encoder->data->tileRowsLog2 and
+// encoder->data->tileColsLog2 via function parameters.
+typedef avifResult (*avifCodecEncodeImageFunc)(struct avifCodec * codec,
+                                               avifEncoder * encoder,
+                                               const avifImage * image,
+                                               avifBool alpha,
+                                               int tileRowsLog2,
+                                               int tileColsLog2,
+                                               int quantizer,
+                                               avifEncoderChanges encoderChanges,
+                                               avifBool disableLaggedOutput,
+                                               avifAddImageFlags addImageFlags,
+                                               avifCodecEncodeOutput * output);
+typedef avifBool (*avifCodecEncodeFinishFunc)(struct avifCodec * codec, avifCodecEncodeOutput * output);
+typedef void (*avifCodecDestroyInternalFunc)(struct avifCodec * codec);
+
+typedef struct avifCodec
+{
+    avifCodecSpecificOptions * csOptions; // Contains codec-specific key/value pairs for advanced tuning.
+                                          // If a codec uses a value, it must mark it as used.
+                                          // This array is NOT owned by avifCodec.
+    struct avifCodecInternal * internal;  // up to each codec to use how it wants
+                                          //
+    avifDiagnostics * diag;               // Shallow copy; owned by avifEncoder or avifDecoder
+                                          //
+    uint8_t operatingPoint;               // Operating point, defaults to 0.
+    avifBool allLayers;                   // if true, the underlying codec must decode all layers, not just the best layer
+
+    avifCodecGetNextImageFunc getNextImage;
+    avifCodecEncodeImageFunc encodeImage;
+    avifCodecEncodeFinishFunc encodeFinish;
+    avifCodecDestroyInternalFunc destroyInternal;
+} avifCodec;
+
+avifResult avifCodecCreate(avifCodecChoice choice, avifCodecFlags requiredFlags, avifCodec ** codec);
+void avifCodecDestroy(avifCodec * codec);
+
+AVIF_NODISCARD avifCodec * avifCodecCreateAOM(void);   // requires AVIF_CODEC_AOM (codec_aom.c)
+const char * avifCodecVersionAOM(void);                // requires AVIF_CODEC_AOM (codec_aom.c)
+AVIF_NODISCARD avifCodec * avifCodecCreateDav1d(void); // requires AVIF_CODEC_DAV1D (codec_dav1d.c)
+const char * avifCodecVersionDav1d(void);              // requires AVIF_CODEC_DAV1D (codec_dav1d.c)
+AVIF_NODISCARD avifCodec * avifCodecCreateGav1(void);  // requires AVIF_CODEC_LIBGAV1 (codec_libgav1.c)
+const char * avifCodecVersionGav1(void);               // requires AVIF_CODEC_LIBGAV1 (codec_libgav1.c)
+AVIF_NODISCARD avifCodec * avifCodecCreateRav1e(void); // requires AVIF_CODEC_RAV1E (codec_rav1e.c)
+const char * avifCodecVersionRav1e(void);              // requires AVIF_CODEC_RAV1E (codec_rav1e.c)
+AVIF_NODISCARD avifCodec * avifCodecCreateSvt(void);   // requires AVIF_CODEC_SVT (codec_svt.c)
+const char * avifCodecVersionSvt(void);                // requires AVIF_CODEC_SVT (codec_svt.c)
+AVIF_NODISCARD avifCodec * avifCodecCreateAVM(void);   // requires AVIF_CODEC_AVM (codec_avm.c)
+const char * avifCodecVersionAVM(void);                // requires AVIF_CODEC_AVM (codec_avm.c)
+
+// ---------------------------------------------------------------------------
+// avifDiagnostics
+
+#ifdef __clang__
+__attribute__((__format__(__printf__, 2, 3)))
+#endif
+void avifDiagnosticsPrintf(avifDiagnostics * diag, const char * format, ...);
+
+#if defined(AVIF_ENABLE_COMPLIANCE_WARDEN)
+avifResult avifIsCompliant(const uint8_t * data, size_t size);
+#endif
+
+// ---------------------------------------------------------------------------
+// avifStream
+//
+// In network byte order (big-endian) unless otherwise specified.
+
+typedef size_t avifBoxMarker;
+
+typedef struct avifBoxHeader
+{
+    // Size of the box in bytes, excluding the box header.
+    size_t size;
+
+    uint8_t type[4];
+} avifBoxHeader;
+
+typedef struct avifROStream
+{
+    avifROData * raw;
+
+    // Index of the next byte in the raw stream.
+    size_t offset;
+
+    // If 0, byte-aligned functions can be used (avifROStreamRead() etc.).
+    // Otherwise, it represents the number of bits already used in the last byte
+    // (located at offset-1).
+    size_t numUsedBitsInPartialByte;
+
+    // Error information, if any.
+    avifDiagnostics * diag;
+    const char * diagContext;
+} avifROStream;
+
+const uint8_t * avifROStreamCurrent(avifROStream * stream);
+void avifROStreamStart(avifROStream * stream, avifROData * raw, avifDiagnostics * diag, const char * diagContext);
+size_t avifROStreamOffset(const avifROStream * stream);
+void avifROStreamSetOffset(avifROStream * stream, size_t offset);
+
+AVIF_NODISCARD avifBool avifROStreamHasBytesLeft(const avifROStream * stream, size_t byteCount);
+size_t avifROStreamRemainingBytes(const avifROStream * stream);
+// The following functions require byte alignment.
+AVIF_NODISCARD avifBool avifROStreamSkip(avifROStream * stream, size_t byteCount);
+AVIF_NODISCARD avifBool avifROStreamRead(avifROStream * stream, uint8_t * data, size_t size);
+AVIF_NODISCARD avifBool avifROStreamReadU16(avifROStream * stream, uint16_t * v);
+AVIF_NODISCARD avifBool avifROStreamReadU16Endianness(avifROStream * stream, uint16_t * v, avifBool littleEndian);
+AVIF_NODISCARD avifBool avifROStreamReadU32(avifROStream * stream, uint32_t * v);
+AVIF_NODISCARD avifBool avifROStreamReadU32Endianness(avifROStream * stream, uint32_t * v, avifBool littleEndian);
+AVIF_NODISCARD avifBool avifROStreamReadUX8(avifROStream * stream, uint64_t * v, uint64_t factor); // Reads a factor*8 sized uint, saves in v
+AVIF_NODISCARD avifBool avifROStreamReadU64(avifROStream * stream, uint64_t * v);
+AVIF_NODISCARD avifBool avifROStreamReadString(avifROStream * stream, char * output, size_t outputSize);
+AVIF_NODISCARD avifBool avifROStreamReadBoxHeader(avifROStream * stream, avifBoxHeader * header); // This fails if the size reported by the header cannot fit in the stream
+AVIF_NODISCARD avifBool avifROStreamReadBoxHeaderPartial(avifROStream * stream, avifBoxHeader * header); // This doesn't require that the full box can fit in the stream
+AVIF_NODISCARD avifBool avifROStreamReadVersionAndFlags(avifROStream * stream, uint8_t * version, uint32_t * flags); // version and flags ptrs are both optional
+AVIF_NODISCARD avifBool avifROStreamReadAndEnforceVersion(avifROStream * stream, uint8_t enforcedVersion); // currently discards flags
+// The following functions can write non-aligned bits.
+AVIF_NODISCARD avifBool avifROStreamReadBits8(avifROStream * stream, uint8_t * v, size_t bitCount);
+AVIF_NODISCARD avifBool avifROStreamReadBits(avifROStream * stream, uint32_t * v, size_t bitCount);
+AVIF_NODISCARD avifBool avifROStreamReadVarInt(avifROStream * stream, uint32_t * v);
+
+typedef struct avifRWStream
+{
+    avifRWData * raw;
+
+    // Index of the next byte in the raw stream.
+    size_t offset;
+
+    // If 0, byte-aligned functions can be used (avifRWStreamWrite() etc.).
+    // Otherwise, it represents the number of bits already used in the last byte
+    // (located at offset-1).
+    size_t numUsedBitsInPartialByte;
+} avifRWStream;
+
+void avifRWStreamStart(avifRWStream * stream, avifRWData * raw);
+size_t avifRWStreamOffset(const avifRWStream * stream);
+void avifRWStreamSetOffset(avifRWStream * stream, size_t offset);
+
+void avifRWStreamFinishWrite(avifRWStream * stream);
+// The following functions require byte alignment.
+avifResult avifRWStreamWrite(avifRWStream * stream, const void * data, size_t size);
+avifResult avifRWStreamWriteChars(avifRWStream * stream, const char * chars, size_t size);
+avifResult avifRWStreamWriteBox(avifRWStream * stream, const char * type, size_t contentSize, avifBoxMarker * marker);
+avifResult avifRWStreamWriteFullBox(avifRWStream * stream, const char * type, size_t contentSize, int version, uint32_t flags, avifBoxMarker * marker);
+void avifRWStreamFinishBox(avifRWStream * stream, avifBoxMarker marker);
+avifResult avifRWStreamWriteU8(avifRWStream * stream, uint8_t v);
+avifResult avifRWStreamWriteU16(avifRWStream * stream, uint16_t v);
+avifResult avifRWStreamWriteU32(avifRWStream * stream, uint32_t v);
+avifResult avifRWStreamWriteU64(avifRWStream * stream, uint64_t v);
+avifResult avifRWStreamWriteZeros(avifRWStream * stream, size_t byteCount);
+// The following functions can write non-aligned bits.
+avifResult avifRWStreamWriteBits(avifRWStream * stream, uint32_t v, size_t bitCount);
+avifResult avifRWStreamWriteVarInt(avifRWStream * stream, uint32_t v);
+
+// This is to make it clear that the box size is currently unknown, and will be determined later (with a call to avifRWStreamFinishBox)
+#define AVIF_BOX_SIZE_TBD 0
+
+// Used for both av1C and av2C.
+typedef struct avifCodecConfigurationBox
+{
+    // [skipped; is constant] unsigned int (1)marker = 1;
+    // [skipped; is constant] unsigned int (7)version = 1;
+
+    uint8_t seqProfile;           // unsigned int (3) seq_profile;
+    uint8_t seqLevelIdx0;         // unsigned int (5) seq_level_idx_0;
+    uint8_t seqTier0;             // unsigned int (1) seq_tier_0;
+    uint8_t highBitdepth;         // unsigned int (1) high_bitdepth;
+    uint8_t twelveBit;            // unsigned int (1) twelve_bit;
+    uint8_t monochrome;           // unsigned int (1) monochrome;
+    uint8_t chromaSubsamplingX;   // unsigned int (1) chroma_subsampling_x;
+    uint8_t chromaSubsamplingY;   // unsigned int (1) chroma_subsampling_y;
+    uint8_t chromaSamplePosition; // unsigned int (2) chroma_sample_position;
+
+    // unsigned int (3)reserved = 0;
+    // unsigned int (1)initial_presentation_delay_present;
+    // if (initial_presentation_delay_present) {
+    //     unsigned int (4)initial_presentation_delay_minus_one;
+    // } else {
+    //     unsigned int (4)reserved = 0;
+    // }
+} avifCodecConfigurationBox;
+
+typedef struct avifSequenceHeader
+{
+    uint8_t reduced_still_picture_header;
+    uint32_t maxWidth;
+    uint32_t maxHeight;
+    uint32_t bitDepth;
+    avifPixelFormat yuvFormat;
+    avifChromaSamplePosition chromaSamplePosition;
+    avifColorPrimaries colorPrimaries;
+    avifTransferCharacteristics transferCharacteristics;
+    avifMatrixCoefficients matrixCoefficients;
+    avifRange range;
+    avifCodecConfigurationBox av1C; // TODO(yguyon): Rename or add av2C
+} avifSequenceHeader;
+
+AVIF_NODISCARD avifBool avifSequenceHeaderParse(avifSequenceHeader * header, const avifROData * sample, avifCodecType codecType);
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+// Performs tone mapping on a base image using the provided gain map.
+// The HDR headroom is log2 of the ratio of HDR to SDR white brightness of the display to tone map for.
+// 'toneMappedImage' should have the 'format', 'depth', and 'isFloat' fields set to the desired values.
+// If non NULL, 'clli' will be filled with the light level information of the tone mapped image.
+// NOTE: only used in tests for now, might be added to the public API at some point.
+struct avifRGBImage;
+avifResult avifImageApplyGainMap(const avifImage * baseImage,
+                                 const avifGainMap * gainMap,
+                                 float hdrHeadroom,
+                                 avifTransferCharacteristics outputTransferCharacteristics,
+                                 avifRGBImage * toneMappedImage,
+                                 avifContentLightLevelInformationBox * clli,
+                                 avifDiagnostics * diag);
+// Same as above but takes an avifRGBImage as input instead of avifImage.
+avifResult avifRGBImageApplyGainMap(const avifRGBImage * baseImage,
+                                    avifTransferCharacteristics transferCharacteristics,
+                                    const avifGainMap * gainMap,
+                                    float hdrHeadroom,
+                                    avifTransferCharacteristics outputTransferCharacteristics,
+                                    avifRGBImage * toneMappedImage,
+                                    avifContentLightLevelInformationBox * clli,
+                                    avifDiagnostics * diag);
+
+// Computes a gain map between two images: a base image and an alternate image.
+// Both images should have the same width and height, and use the same color
+// primaries. TODO(maryla): allow different primaries.
+// gainMap->image should be initialized with avifImageCreate(), with the width,
+// height, depth and yuvFormat fields set to the desired output values for the
+// gain map. All of these fields may differ from the source images.
+AVIF_API avifResult avifComputeGainMapRGB(const struct avifRGBImage * baseRgbImage,
+                                          avifTransferCharacteristics baseTransferCharacteristics,
+                                          const struct avifRGBImage * altRgbImage,
+                                          avifTransferCharacteristics altTransferCharacteristics,
+                                          avifColorPrimaries colorPrimaries,
+                                          avifGainMap * gainMap,
+                                          avifDiagnostics * diag);
+// Convenience function. Same as above but takes avifImage images as input
+// instead of avifRGBImage. Gain map computation is performed in RGB space so
+// the images are converted to RGB first.
+AVIF_API avifResult avifComputeGainMap(const struct avifImage * baseImage,
+                                       const struct avifImage * altImage,
+                                       avifGainMap * gainMap,
+                                       avifDiagnostics * diag);
+
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
+
+#define AVIF_INDEFINITE_DURATION64 UINT64_MAX
+#define AVIF_INDEFINITE_DURATION32 UINT32_MAX
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // ifndef AVIF_INTERNAL_H
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/avif_obu.c b/pxr/imaging/plugin/hioAvif/AVIF/src/avif_obu.c
new file mode 100644
index 0000000000..e6400022d0
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/avif_obu.c
@@ -0,0 +1,458 @@
+/*
+ * Copyright © 2018, VideoLAN and dav1d authors
+ * Copyright © 2018, Two Orioles, LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// OBU parsing and bit magic all originally from dav1d's obu.c and getbits.c,
+// but heavily modified/reduced down to simply find the Sequence Header OBU
+// and pull a few interesting pieces from it.
+//
+// Any other code in here is under this license:
+//
+// Copyright 2020 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <stdint.h>
+#include <string.h>
+
+#if defined(AVIF_CODEC_AVM)
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#endif
+
+// ---------------------------------------------------------------------------
+// avifBits - Originally dav1d's GetBits struct (see dav1d's getbits.c)
+
+typedef struct avifBits
+{
+    int error, eof;
+    uint64_t state;
+    uint32_t bitsLeft;
+    const uint8_t *ptr, *start, *end;
+} avifBits;
+
+static inline uint32_t avifBitsReadPos(const avifBits * bits)
+{
+    return (uint32_t)(bits->ptr - bits->start) * 8 - bits->bitsLeft;
+}
+
+static void avifBitsInit(avifBits * const bits, const uint8_t * const data, const size_t size)
+{
+    bits->ptr = bits->start = data;
+    bits->end = &bits->start[size];
+    bits->bitsLeft = 0;
+    bits->state = 0;
+    bits->error = 0;
+    bits->eof = 0;
+}
+
+static void avifBitsRefill(avifBits * const bits, const uint32_t n)
+{
+    uint64_t state = 0;
+    do {
+        state <<= 8;
+        bits->bitsLeft += 8;
+        if (!bits->eof)
+            state |= *bits->ptr++;
+        if (bits->ptr >= bits->end) {
+            bits->error = bits->eof;
+            bits->eof = 1;
+        }
+    } while (n > bits->bitsLeft);
+    bits->state |= state << (64 - bits->bitsLeft);
+}
+
+static uint32_t avifBitsRead(avifBits * const bits, const uint32_t n)
+{
+    if (n > bits->bitsLeft)
+        avifBitsRefill(bits, n);
+
+    const uint64_t state = bits->state;
+    bits->bitsLeft -= n;
+    bits->state <<= n;
+
+    return (uint32_t)(state >> (64 - n));
+}
+
+static uint32_t avifBitsReadUleb128(avifBits * bits)
+{
+    uint64_t val = 0;
+    uint32_t more;
+    uint32_t i = 0;
+
+    do {
+        const uint32_t v = avifBitsRead(bits, 8);
+        more = v & 0x80;
+        val |= ((uint64_t)(v & 0x7F)) << i;
+        i += 7;
+    } while (more && i < 56);
+
+    if (val > UINT32_MAX || more) {
+        bits->error = 1;
+        return 0;
+    }
+
+    return (uint32_t)val;
+}
+
+static uint32_t avifBitsReadVLC(avifBits * const bits)
+{
+    int numBits = 0;
+    while (!avifBitsRead(bits, 1))
+        if (++numBits == 32)
+            return 0xFFFFFFFFU;
+    return numBits ? ((1U << numBits) - 1) + avifBitsRead(bits, numBits) : 0;
+}
+
+// ---------------------------------------------------------------------------
+// Variables in here use snake_case to self-document from the AV1 spec and the draft AV2 spec:
+//
+// https://aomediacodec.github.io/av1-spec/av1-spec.pdf
+//
+// Originally dav1d's parse_seq_hdr() function (heavily modified and split)
+
+static avifBool parseSequenceHeaderProfile(avifBits * bits, avifSequenceHeader * header)
+{
+    uint32_t seq_profile = avifBitsRead(bits, 3);
+    if (seq_profile > 2) {
+        return AVIF_FALSE;
+    }
+    header->av1C.seqProfile = (uint8_t)seq_profile;
+
+    uint32_t still_picture = avifBitsRead(bits, 1);
+    header->reduced_still_picture_header = (uint8_t)avifBitsRead(bits, 1);
+    if (header->reduced_still_picture_header && !still_picture) {
+        return AVIF_FALSE;
+    }
+
+    if (header->reduced_still_picture_header) {
+        header->av1C.seqLevelIdx0 = (uint8_t)avifBitsRead(bits, 5);
+        header->av1C.seqTier0 = 0;
+    } else {
+        uint32_t timing_info_present_flag = avifBitsRead(bits, 1);
+        uint32_t decoder_model_info_present_flag = 0;
+        uint32_t buffer_delay_length = 0;
+        if (timing_info_present_flag) { // timing_info()
+            avifBitsRead(bits, 32);     // num_units_in_display_tick
+            avifBitsRead(bits, 32);     // time_scale
+            uint32_t equal_picture_interval = avifBitsRead(bits, 1);
+            if (equal_picture_interval) {
+                uint32_t num_ticks_per_picture_minus_1 = avifBitsReadVLC(bits);
+                if (num_ticks_per_picture_minus_1 == 0xFFFFFFFFU)
+                    return AVIF_FALSE;
+            }
+
+            decoder_model_info_present_flag = avifBitsRead(bits, 1);
+            if (decoder_model_info_present_flag) { // decoder_model_info()
+                buffer_delay_length = avifBitsRead(bits, 5) + 1;
+                avifBitsRead(bits, 32); // num_units_in_decoding_tick
+                avifBitsRead(bits, 10); // buffer_removal_time_length_minus_1, frame_presentation_time_length_minus_1
+            }
+        }
+
+        uint32_t initial_display_delay_present_flag = avifBitsRead(bits, 1);
+        uint32_t operating_points_cnt = avifBitsRead(bits, 5) + 1;
+        for (uint32_t i = 0; i < operating_points_cnt; i++) {
+            avifBitsRead(bits, 12); // operating_point_idc
+            uint32_t seq_level_idx = avifBitsRead(bits, 5);
+            if (i == 0) {
+                header->av1C.seqLevelIdx0 = (uint8_t)seq_level_idx;
+                header->av1C.seqTier0 = 0;
+            }
+            if (seq_level_idx > 7) {
+                uint32_t seq_tier = avifBitsRead(bits, 1);
+                if (i == 0) {
+                    header->av1C.seqTier0 = (uint8_t)seq_tier;
+                }
+            }
+            if (decoder_model_info_present_flag) {
+                uint32_t decoder_model_present_for_this_op = avifBitsRead(bits, 1);
+                if (decoder_model_present_for_this_op) {     // operating_parameters_info()
+                    avifBitsRead(bits, buffer_delay_length); // decoder_buffer_delay
+                    avifBitsRead(bits, buffer_delay_length); // encoder_buffer_delay
+                    avifBitsRead(bits, 1);                   // low_delay_mode_flag
+                }
+            }
+            if (initial_display_delay_present_flag) {
+                uint32_t initial_display_delay_present_for_this_op = avifBitsRead(bits, 1);
+                if (initial_display_delay_present_for_this_op) {
+                    avifBitsRead(bits, 4); // initial_display_delay_minus_1
+                }
+            }
+        }
+    }
+    return !bits->error;
+}
+
+static avifBool parseSequenceHeaderFrameMaxDimensions(avifBits * bits, avifSequenceHeader * header)
+{
+    uint32_t frame_width_bits = avifBitsRead(bits, 4) + 1;
+    uint32_t frame_height_bits = avifBitsRead(bits, 4) + 1;
+    header->maxWidth = avifBitsRead(bits, frame_width_bits) + 1;   // max_frame_width
+    header->maxHeight = avifBitsRead(bits, frame_height_bits) + 1; // max_frame_height
+    uint32_t frame_id_numbers_present_flag = 0;
+    if (!header->reduced_still_picture_header) {
+        frame_id_numbers_present_flag = avifBitsRead(bits, 1);
+    }
+    if (frame_id_numbers_present_flag) {
+        avifBitsRead(bits, 7); // delta_frame_id_length_minus_2, additional_frame_id_length_minus_1
+    }
+    return !bits->error;
+}
+
+static avifBool parseSequenceHeaderEnabledFeatures(avifBits * bits, avifSequenceHeader * header)
+{
+    avifBitsRead(bits, 2); // enable_filter_intra, enable_intra_edge_filter
+
+    if (!header->reduced_still_picture_header) {
+        avifBitsRead(bits, 4); // enable_interintra_compound, enable_masked_compound, enable_warped_motion, enable_dual_filter
+        uint32_t enable_order_hint = avifBitsRead(bits, 1);
+        if (enable_order_hint) {
+            avifBitsRead(bits, 2); // enable_jnt_comp, enable_ref_frame_mvs
+        }
+
+        uint32_t seq_force_screen_content_tools = 0;
+        uint32_t seq_choose_screen_content_tools = avifBitsRead(bits, 1);
+        if (seq_choose_screen_content_tools) {
+            seq_force_screen_content_tools = 2;
+        } else {
+            seq_force_screen_content_tools = avifBitsRead(bits, 1);
+        }
+        if (seq_force_screen_content_tools > 0) {
+            uint32_t seq_choose_integer_mv = avifBitsRead(bits, 1);
+            if (!seq_choose_integer_mv) {
+                avifBitsRead(bits, 1); // seq_force_integer_mv
+            }
+        }
+        if (enable_order_hint) {
+            avifBitsRead(bits, 3); // order_hint_bits_minus_1
+        }
+    }
+
+    return !bits->error;
+}
+
+static avifBool parseSequenceHeaderColorConfig(avifBits * bits, avifSequenceHeader * header)
+{
+    header->bitDepth = 8;
+    header->chromaSamplePosition = AVIF_CHROMA_SAMPLE_POSITION_UNKNOWN;
+    header->av1C.chromaSamplePosition = (uint8_t)header->chromaSamplePosition;
+    uint32_t high_bitdepth = avifBitsRead(bits, 1);
+    header->av1C.highBitdepth = (uint8_t)high_bitdepth;
+    if ((header->av1C.seqProfile == 2) && high_bitdepth) {
+        uint32_t twelve_bit = avifBitsRead(bits, 1);
+        header->bitDepth = twelve_bit ? 12 : 10;
+        header->av1C.twelveBit = (uint8_t)twelve_bit;
+    } else /* if (seq_profile <= 2) */ {
+        header->bitDepth = high_bitdepth ? 10 : 8;
+        header->av1C.twelveBit = 0;
+    }
+    uint32_t mono_chrome = 0;
+    if (header->av1C.seqProfile != 1) {
+        mono_chrome = avifBitsRead(bits, 1);
+    }
+    header->av1C.monochrome = (uint8_t)mono_chrome;
+    uint32_t color_description_present_flag = avifBitsRead(bits, 1);
+    if (color_description_present_flag) {
+        header->colorPrimaries = (avifColorPrimaries)avifBitsRead(bits, 8);                   // color_primaries
+        header->transferCharacteristics = (avifTransferCharacteristics)avifBitsRead(bits, 8); // transfer_characteristics
+        header->matrixCoefficients = (avifMatrixCoefficients)avifBitsRead(bits, 8);           // matrix_coefficients
+    } else {
+        header->colorPrimaries = AVIF_COLOR_PRIMARIES_UNSPECIFIED;
+        header->transferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED;
+        header->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED;
+    }
+    if (mono_chrome) {
+        header->range = avifBitsRead(bits, 1) ? AVIF_RANGE_FULL : AVIF_RANGE_LIMITED; // color_range
+        header->av1C.chromaSubsamplingX = 1;
+        header->av1C.chromaSubsamplingY = 1;
+        header->yuvFormat = AVIF_PIXEL_FORMAT_YUV400;
+    } else if (header->colorPrimaries == AVIF_COLOR_PRIMARIES_BT709 &&
+               header->transferCharacteristics == AVIF_TRANSFER_CHARACTERISTICS_SRGB &&
+               header->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_IDENTITY) {
+        header->range = AVIF_RANGE_FULL;
+        header->av1C.chromaSubsamplingX = 0;
+        header->av1C.chromaSubsamplingY = 0;
+        header->yuvFormat = AVIF_PIXEL_FORMAT_YUV444;
+    } else {
+        uint32_t subsampling_x = 0;
+        uint32_t subsampling_y = 0;
+        header->range = avifBitsRead(bits, 1) ? AVIF_RANGE_FULL : AVIF_RANGE_LIMITED; // color_range
+        switch (header->av1C.seqProfile) {
+            case 0:
+                subsampling_x = 1;
+                subsampling_y = 1;
+                header->yuvFormat = AVIF_PIXEL_FORMAT_YUV420;
+                break;
+            case 1:
+                subsampling_x = 0;
+                subsampling_y = 0;
+                header->yuvFormat = AVIF_PIXEL_FORMAT_YUV444;
+                break;
+            case 2:
+                if (header->bitDepth == 12) {
+                    subsampling_x = avifBitsRead(bits, 1);
+                    if (subsampling_x) {
+                        subsampling_y = avifBitsRead(bits, 1);
+                    }
+                } else {
+                    subsampling_x = 1;
+                    subsampling_y = 0;
+                }
+                if (subsampling_x) {
+                    header->yuvFormat = subsampling_y ? AVIF_PIXEL_FORMAT_YUV420 : AVIF_PIXEL_FORMAT_YUV422;
+                } else {
+                    header->yuvFormat = AVIF_PIXEL_FORMAT_YUV444;
+                }
+                break;
+        }
+
+        if (subsampling_x && subsampling_y) {
+            header->chromaSamplePosition = (avifChromaSamplePosition)avifBitsRead(bits, 2); // chroma_sample_position
+            header->av1C.chromaSamplePosition = (uint8_t)header->chromaSamplePosition;
+        }
+        header->av1C.chromaSubsamplingX = (uint8_t)subsampling_x;
+        header->av1C.chromaSubsamplingY = (uint8_t)subsampling_y;
+    }
+
+    if (!mono_chrome) {
+        avifBitsRead(bits, 1); // separate_uv_delta_q
+    }
+
+    return !bits->error;
+}
+
+static avifBool parseAV1SequenceHeader(avifBits * bits, avifSequenceHeader * header)
+{
+    AVIF_CHECK(parseSequenceHeaderProfile(bits, header));
+
+    AVIF_CHECK(parseSequenceHeaderFrameMaxDimensions(bits, header));
+    avifBitsRead(bits, 1); // use_128x128_superblock
+    AVIF_CHECK(parseSequenceHeaderEnabledFeatures(bits, header));
+
+    avifBitsRead(bits, 3); // enable_superres, enable_cdef, enable_restoration
+
+    AVIF_CHECK(parseSequenceHeaderColorConfig(bits, header));
+
+    avifBitsRead(bits, 1); // film_grain_params_present
+    return !bits->error;
+}
+
+#if defined(AVIF_CODEC_AVM)
+// See https://gitlab.com/AOMediaCodec/avm/-/blob/main/av1/decoder/decodeframe.c
+static avifBool parseAV2SequenceHeader(avifBits * bits, avifSequenceHeader * header)
+{
+    // See read_sequence_header_obu() in avm.
+    AVIF_CHECK(parseSequenceHeaderProfile(bits, header));
+
+    // See av1_read_sequence_header() in avm.
+    AVIF_CHECK(parseSequenceHeaderFrameMaxDimensions(bits, header));
+#if CONFIG_BLOCK_256
+    if (!avifBitsRead(bits, 1)) // BLOCK_256X256
+#endif
+        avifBitsRead(bits, 1); // BLOCK_128X128
+    AVIF_CHECK(parseSequenceHeaderEnabledFeatures(bits, header));
+
+    avifBitsRead(bits, 2);       // enable_superres, enable_cdef
+    if (avifBitsRead(bits, 1)) { // enable_restoration
+#if CONFIG_LR_FLEX_SYNTAX
+        avifBitsRead(bits, 2 + CONFIG_PC_WIENER + CONFIG_WIENER_NONSEP); // lr_tools_disable_mask[0]
+        if (avifBitsRead(bits, 1)) {                                     // uv_neq_y
+            avifBitsRead(bits, 2 + CONFIG_WIENER_NONSEP);                // lr_tools_disable_mask[1]
+        }
+#endif
+    }
+
+    // See av1_read_color_config() in avm.
+    AVIF_CHECK(parseSequenceHeaderColorConfig(bits, header));
+    // Ignored fields.
+    //   base_y_dc_delta_q
+    //   base_uv_dc_delta_q
+
+    // See read_sequence_header_obu() in avm.
+    // Ignored field.
+    //   film_grain_params_present
+
+    // See av1_read_sequence_header_beyond_av1() in avm.
+    // Other ignored fields.
+    return !bits->error;
+}
+#endif
+
+avifBool avifSequenceHeaderParse(avifSequenceHeader * header, const avifROData * sample, avifCodecType codecType)
+{
+    avifROData obus = *sample;
+
+    // Find the sequence header OBU
+    while (obus.size > 0) {
+        avifBits bits;
+        avifBitsInit(&bits, obus.data, obus.size);
+
+        // obu_header()
+        avifBitsRead(&bits, 1); // obu_forbidden_bit
+        const uint32_t obu_type = avifBitsRead(&bits, 4);
+        const uint32_t obu_extension_flag = avifBitsRead(&bits, 1);
+        const uint32_t obu_has_size_field = avifBitsRead(&bits, 1);
+        avifBitsRead(&bits, 1); // obu_reserved_1bit
+
+        if (obu_extension_flag) {   // obu_extension_header()
+            avifBitsRead(&bits, 8); // temporal_id, spatial_id, extension_header_reserved_3bits
+        }
+
+        uint32_t obu_size = 0;
+        if (obu_has_size_field)
+            obu_size = avifBitsReadUleb128(&bits);
+        else
+            obu_size = (int)obus.size - 1 - obu_extension_flag;
+
+        if (bits.error) {
+            return AVIF_FALSE;
+        }
+
+        const uint32_t init_bit_pos = avifBitsReadPos(&bits);
+        const uint32_t init_byte_pos = init_bit_pos >> 3;
+        if (obu_size > obus.size - init_byte_pos)
+            return AVIF_FALSE;
+
+        if (obu_type == 1) { // Sequence Header
+            switch (codecType) {
+                case AVIF_CODEC_TYPE_AV1:
+                    return parseAV1SequenceHeader(&bits, header);
+#if defined(AVIF_CODEC_AVM)
+                case AVIF_CODEC_TYPE_AV2:
+                    return parseAV2SequenceHeader(&bits, header);
+#endif
+                default:
+                    return AVIF_FALSE;
+            }
+        }
+
+        // Skip this OBU
+        obus.data += (size_t)obu_size + init_byte_pos;
+        obus.size -= (size_t)obu_size + init_byte_pos;
+    }
+    return AVIF_FALSE;
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/codec_aom.c b/pxr/imaging/plugin/hioAvif/AVIF/src/codec_aom.c
new file mode 100644
index 0000000000..d538bdca7c
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/codec_aom.c
@@ -0,0 +1,1246 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+// These are for libaom to deal with
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wduplicate-enum"
+#pragma clang diagnostic ignored "-Wextra-semi"
+#pragma clang diagnostic ignored "-Wused-but-marked-unused"
+#endif
+
+#if defined(AVIF_CODEC_AOM_ENCODE)
+#include "pxr/imaging/plugin/hioAvif/aom/aom_encoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aomcx.h"
+#endif
+
+#if defined(AVIF_CODEC_AOM_DECODE)
+#include "pxr/imaging/plugin/hioAvif/aom/aom_decoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aomdx.h"
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+
+// This fixes complaints with aom_codec_control() and aom_img_fmt that are from libaom
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wused-but-marked-unused"
+#pragma clang diagnostic ignored "-Wassign-enum"
+#endif
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(AVIF_CODEC_AOM_ENCODE)
+// Detect whether the aom_codec_set_option() function is available. See aom/aom_codec.h
+// in https://aomedia-review.googlesource.com/c/aom/+/126302.
+#if AOM_CODEC_ABI_VERSION >= (6 + AOM_IMAGE_ABI_VERSION)
+#define HAVE_AOM_CODEC_SET_OPTION 1
+#endif
+
+// Speeds 7-9 were added to all intra mode in https://aomedia-review.googlesource.com/c/aom/+/140624.
+#if AOM_ENCODER_ABI_VERSION >= (10 + AOM_CODEC_ABI_VERSION + /*AOM_EXT_PART_ABI_VERSION=*/1)
+#define ALL_INTRA_HAS_SPEEDS_7_TO_9 1
+#endif
+#endif
+
+struct avifCodecInternal
+{
+#if defined(AVIF_CODEC_AOM_DECODE)
+    avifBool decoderInitialized;
+    aom_codec_ctx_t decoder;
+    aom_codec_iter_t iter;
+    aom_image_t * image;
+#endif
+
+#if defined(AVIF_CODEC_AOM_ENCODE)
+    avifBool encoderInitialized;
+    aom_codec_ctx_t encoder;
+    struct aom_codec_enc_cfg cfg;
+    avifPixelFormatInfo formatInfo;
+    aom_img_fmt_t aomFormat;
+    avifBool monochromeEnabled;
+    // Whether 'tuning' (of the specified distortion metric) was set with an
+    // avifEncoderSetCodecSpecificOption(encoder, "tune", value) call.
+    avifBool tuningSet;
+    uint32_t currentLayer;
+#endif
+};
+
+static void aomCodecDestroyInternal(avifCodec * codec)
+{
+#if defined(AVIF_CODEC_AOM_DECODE)
+    if (codec->internal->decoderInitialized) {
+        aom_codec_destroy(&codec->internal->decoder);
+    }
+#endif
+
+#if defined(AVIF_CODEC_AOM_ENCODE)
+    if (codec->internal->encoderInitialized) {
+        aom_codec_destroy(&codec->internal->encoder);
+    }
+#endif
+
+    avifFree(codec->internal);
+}
+
+#if defined(AVIF_CODEC_AOM_DECODE)
+
+static avifBool aomCodecGetNextImage(struct avifCodec * codec,
+                                     struct avifDecoder * decoder,
+                                     const avifDecodeSample * sample,
+                                     avifBool alpha,
+                                     avifBool * isLimitedRangeAlpha,
+                                     avifImage * image)
+{
+    if (!codec->internal->decoderInitialized) {
+        aom_codec_dec_cfg_t cfg;
+        memset(&cfg, 0, sizeof(aom_codec_dec_cfg_t));
+        cfg.threads = decoder->maxThreads;
+        cfg.allow_lowbitdepth = 1;
+
+        aom_codec_iface_t * decoder_interface = aom_codec_av1_dx();
+        if (aom_codec_dec_init(&codec->internal->decoder, decoder_interface, &cfg, 0)) {
+            return AVIF_FALSE;
+        }
+        codec->internal->decoderInitialized = AVIF_TRUE;
+
+        if (aom_codec_control(&codec->internal->decoder, AV1D_SET_OUTPUT_ALL_LAYERS, codec->allLayers)) {
+            return AVIF_FALSE;
+        }
+        if (aom_codec_control(&codec->internal->decoder, AV1D_SET_OPERATING_POINT, codec->operatingPoint)) {
+            return AVIF_FALSE;
+        }
+
+        codec->internal->iter = NULL;
+    }
+
+    aom_image_t * nextFrame = NULL;
+    uint8_t spatialID = AVIF_SPATIAL_ID_UNSET;
+    for (;;) {
+        nextFrame = aom_codec_get_frame(&codec->internal->decoder, &codec->internal->iter);
+        if (nextFrame) {
+            if (spatialID != AVIF_SPATIAL_ID_UNSET) {
+                // This requires libaom v3.1.2 or later, which has the fix for
+                // https://crbug.com/aomedia/2993.
+                if (spatialID == nextFrame->spatial_id) {
+                    // Found the correct spatial_id.
+                    break;
+                }
+            } else {
+                // Got an image!
+                break;
+            }
+        } else if (sample) {
+            codec->internal->iter = NULL;
+            if (aom_codec_decode(&codec->internal->decoder, sample->data.data, sample->data.size, NULL)) {
+                return AVIF_FALSE;
+            }
+            spatialID = sample->spatialID;
+            sample = NULL;
+        } else {
+            break;
+        }
+    }
+
+    if (nextFrame) {
+        codec->internal->image = nextFrame;
+    } else {
+        if (alpha && codec->internal->image) {
+            // Special case: reuse last alpha frame
+        } else {
+            return AVIF_FALSE;
+        }
+    }
+
+    avifBool isColor = !alpha;
+    if (isColor) {
+        // Color (YUV) planes - set image to correct size / format, fill color
+
+        avifPixelFormat yuvFormat = AVIF_PIXEL_FORMAT_NONE;
+        switch (codec->internal->image->fmt) {
+            case AOM_IMG_FMT_I420:
+            case AOM_IMG_FMT_AOMI420:
+            case AOM_IMG_FMT_I42016:
+                yuvFormat = AVIF_PIXEL_FORMAT_YUV420;
+                break;
+            case AOM_IMG_FMT_I422:
+            case AOM_IMG_FMT_I42216:
+                yuvFormat = AVIF_PIXEL_FORMAT_YUV422;
+                break;
+            case AOM_IMG_FMT_I444:
+            case AOM_IMG_FMT_I44416:
+                yuvFormat = AVIF_PIXEL_FORMAT_YUV444;
+                break;
+            case AOM_IMG_FMT_NONE:
+#if defined(AOM_HAVE_IMG_FMT_NV12)
+            // Although the libaom encoder supports the NV12 image format as an input format, the
+            // libaom decoder does not support NV12 as an output format.
+            case AOM_IMG_FMT_NV12:
+#endif
+            case AOM_IMG_FMT_YV12:
+            case AOM_IMG_FMT_AOMYV12:
+            case AOM_IMG_FMT_YV1216:
+            default:
+                return AVIF_FALSE;
+        }
+        if (codec->internal->image->monochrome) {
+            yuvFormat = AVIF_PIXEL_FORMAT_YUV400;
+        }
+
+        if (image->width && image->height) {
+            if ((image->width != codec->internal->image->d_w) || (image->height != codec->internal->image->d_h) ||
+                (image->depth != codec->internal->image->bit_depth) || (image->yuvFormat != yuvFormat)) {
+                // Throw it all out
+                avifImageFreePlanes(image, AVIF_PLANES_ALL);
+            }
+        }
+        image->width = codec->internal->image->d_w;
+        image->height = codec->internal->image->d_h;
+        image->depth = codec->internal->image->bit_depth;
+
+        image->yuvFormat = yuvFormat;
+        image->yuvRange = (codec->internal->image->range == AOM_CR_STUDIO_RANGE) ? AVIF_RANGE_LIMITED : AVIF_RANGE_FULL;
+        image->yuvChromaSamplePosition = (avifChromaSamplePosition)codec->internal->image->csp;
+
+        image->colorPrimaries = (avifColorPrimaries)codec->internal->image->cp;
+        image->transferCharacteristics = (avifTransferCharacteristics)codec->internal->image->tc;
+        image->matrixCoefficients = (avifMatrixCoefficients)codec->internal->image->mc;
+
+        // Steal the pointers from the decoder's image directly
+        avifImageFreePlanes(image, AVIF_PLANES_YUV);
+        int yuvPlaneCount = (yuvFormat == AVIF_PIXEL_FORMAT_YUV400) ? 1 : 3;
+        for (int yuvPlane = 0; yuvPlane < yuvPlaneCount; ++yuvPlane) {
+            image->yuvPlanes[yuvPlane] = codec->internal->image->planes[yuvPlane];
+            image->yuvRowBytes[yuvPlane] = codec->internal->image->stride[yuvPlane];
+        }
+        image->imageOwnsYUVPlanes = AVIF_FALSE;
+    } else {
+        // Alpha plane - ensure image is correct size, fill color
+
+        if (image->width && image->height) {
+            if ((image->width != codec->internal->image->d_w) || (image->height != codec->internal->image->d_h) ||
+                (image->depth != codec->internal->image->bit_depth)) {
+                // Alpha plane doesn't match previous alpha plane decode, bail out
+                return AVIF_FALSE;
+            }
+        }
+        image->width = codec->internal->image->d_w;
+        image->height = codec->internal->image->d_h;
+        image->depth = codec->internal->image->bit_depth;
+
+        avifImageFreePlanes(image, AVIF_PLANES_A);
+        image->alphaPlane = codec->internal->image->planes[0];
+        image->alphaRowBytes = codec->internal->image->stride[0];
+        *isLimitedRangeAlpha = (codec->internal->image->range == AOM_CR_STUDIO_RANGE);
+        image->imageOwnsAlphaPlane = AVIF_FALSE;
+    }
+
+    return AVIF_TRUE;
+}
+#endif // defined(AVIF_CODEC_AOM_DECODE)
+
+#if defined(AVIF_CODEC_AOM_ENCODE)
+
+static aom_img_fmt_t avifImageCalcAOMFmt(const avifImage * image, avifBool alpha)
+{
+    aom_img_fmt_t fmt;
+    if (alpha) {
+        // We're going monochrome, who cares about chroma quality
+        fmt = AOM_IMG_FMT_I420;
+    } else {
+        switch (image->yuvFormat) {
+            case AVIF_PIXEL_FORMAT_YUV444:
+                fmt = AOM_IMG_FMT_I444;
+                break;
+            case AVIF_PIXEL_FORMAT_YUV422:
+                fmt = AOM_IMG_FMT_I422;
+                break;
+            case AVIF_PIXEL_FORMAT_YUV420:
+            case AVIF_PIXEL_FORMAT_YUV400:
+                fmt = AOM_IMG_FMT_I420;
+                break;
+            case AVIF_PIXEL_FORMAT_NONE:
+            case AVIF_PIXEL_FORMAT_COUNT:
+            default:
+                return AOM_IMG_FMT_NONE;
+        }
+    }
+
+    if (image->depth > 8) {
+        fmt |= AOM_IMG_FMT_HIGHBITDEPTH;
+    }
+
+    return fmt;
+}
+
+#if !defined(HAVE_AOM_CODEC_SET_OPTION)
+static avifBool aomOptionParseInt(const char * str, int * val)
+{
+    char * endptr;
+    const long rawval = strtol(str, &endptr, 10);
+
+    if (str[0] != '\0' && endptr[0] == '\0' && rawval >= INT_MIN && rawval <= INT_MAX) {
+        *val = (int)rawval;
+        return AVIF_TRUE;
+    }
+
+    return AVIF_FALSE;
+}
+
+static avifBool aomOptionParseUInt(const char * str, unsigned int * val)
+{
+    char * endptr;
+    const unsigned long rawval = strtoul(str, &endptr, 10);
+
+    if (str[0] != '\0' && endptr[0] == '\0' && rawval <= UINT_MAX) {
+        *val = (unsigned int)rawval;
+        return AVIF_TRUE;
+    }
+
+    return AVIF_FALSE;
+}
+#endif // !defined(HAVE_AOM_CODEC_SET_OPTION)
+
+struct aomOptionEnumList
+{
+    const char * name;
+    int val;
+};
+
+static avifBool aomOptionParseEnum(const char * str, const struct aomOptionEnumList * enums, int * val)
+{
+    const struct aomOptionEnumList * listptr;
+    long int rawval;
+    char * endptr;
+
+    // First see if the value can be parsed as a raw value.
+    rawval = strtol(str, &endptr, 10);
+    if (str[0] != '\0' && endptr[0] == '\0') {
+        // Got a raw value, make sure it's valid.
+        for (listptr = enums; listptr->name; listptr++)
+            if (listptr->val == rawval) {
+                *val = (int)rawval;
+                return AVIF_TRUE;
+            }
+    }
+
+    // Next see if it can be parsed as a string.
+    for (listptr = enums; listptr->name; listptr++) {
+        if (!strcmp(str, listptr->name)) {
+            *val = listptr->val;
+            return AVIF_TRUE;
+        }
+    }
+
+    return AVIF_FALSE;
+}
+
+static const struct aomOptionEnumList endUsageEnum[] = { //
+    { "vbr", AOM_VBR },                                  // Variable Bit Rate (VBR) mode
+    { "cbr", AOM_CBR },                                  // Constant Bit Rate (CBR) mode
+    { "cq", AOM_CQ },                                    // Constrained Quality (CQ) mode
+    { "q", AOM_Q },                                      // Constant Quality (Q) mode
+    { NULL, 0 }
+};
+
+// Returns true if <key> equals <name> or <prefix><name>, where <prefix> is "color:" or "alpha:"
+// or the abbreviated form "c:" or "a:".
+static avifBool avifKeyEqualsName(const char * key, const char * name, avifBool alpha)
+{
+    const char * prefix = alpha ? "alpha:" : "color:";
+    size_t prefixLen = 6;
+    const char * shortPrefix = alpha ? "a:" : "c:";
+    size_t shortPrefixLen = 2;
+    return !strcmp(key, name) || (!strncmp(key, prefix, prefixLen) && !strcmp(key + prefixLen, name)) ||
+           (!strncmp(key, shortPrefix, shortPrefixLen) && !strcmp(key + shortPrefixLen, name));
+}
+
+static avifBool avifProcessAOMOptionsPreInit(avifCodec * codec, avifBool alpha, struct aom_codec_enc_cfg * cfg)
+{
+    for (uint32_t i = 0; i < codec->csOptions->count; ++i) {
+        avifCodecSpecificOption * entry = &codec->csOptions->entries[i];
+        int val;
+        if (avifKeyEqualsName(entry->key, "end-usage", alpha)) { // Rate control mode
+            if (!aomOptionParseEnum(entry->value, endUsageEnum, &val)) {
+                avifDiagnosticsPrintf(codec->diag, "Invalid value for end-usage: %s", entry->value);
+                return AVIF_FALSE;
+            }
+            cfg->rc_end_usage = val;
+        }
+    }
+    return AVIF_TRUE;
+}
+
+#if !defined(HAVE_AOM_CODEC_SET_OPTION)
+typedef enum
+{
+    AVIF_AOM_OPTION_NUL = 0,
+    AVIF_AOM_OPTION_STR,
+    AVIF_AOM_OPTION_INT,
+    AVIF_AOM_OPTION_UINT,
+    AVIF_AOM_OPTION_ENUM,
+} aomOptionType;
+
+struct aomOptionDef
+{
+    const char * name;
+    int controlId;
+    aomOptionType type;
+    // If type is AVIF_AOM_OPTION_ENUM, this must be set. Otherwise should be NULL.
+    const struct aomOptionEnumList * enums;
+};
+
+static const struct aomOptionEnumList tuningEnum[] = { //
+    { "psnr", AOM_TUNE_PSNR },                         //
+    { "ssim", AOM_TUNE_SSIM },                         //
+    { NULL, 0 }
+};
+
+static const struct aomOptionDef aomOptionDefs[] = {
+    // Adaptive quantization mode
+    { "aq-mode", AV1E_SET_AQ_MODE, AVIF_AOM_OPTION_UINT, NULL },
+    // Constant/Constrained Quality level
+    { "cq-level", AOME_SET_CQ_LEVEL, AVIF_AOM_OPTION_UINT, NULL },
+    // Enable delta quantization in chroma planes
+    { "enable-chroma-deltaq", AV1E_SET_ENABLE_CHROMA_DELTAQ, AVIF_AOM_OPTION_INT, NULL },
+    // Bias towards block sharpness in rate-distortion optimization of transform coefficients
+    { "sharpness", AOME_SET_SHARPNESS, AVIF_AOM_OPTION_UINT, NULL },
+    // Tune distortion metric
+    { "tune", AOME_SET_TUNING, AVIF_AOM_OPTION_ENUM, tuningEnum },
+    // Film grain test vector
+    { "film-grain-test", AV1E_SET_FILM_GRAIN_TEST_VECTOR, AVIF_AOM_OPTION_INT, NULL },
+    // Film grain table file
+    { "film-grain-table", AV1E_SET_FILM_GRAIN_TABLE, AVIF_AOM_OPTION_STR, NULL },
+
+    // Sentinel
+    { NULL, 0, AVIF_AOM_OPTION_NUL, NULL }
+};
+#endif // !defined(HAVE_AOM_CODEC_SET_OPTION)
+
+static avifBool avifProcessAOMOptionsPostInit(avifCodec * codec, avifBool alpha)
+{
+    for (uint32_t i = 0; i < codec->csOptions->count; ++i) {
+        avifCodecSpecificOption * entry = &codec->csOptions->entries[i];
+        // Skip options for the other kind of plane.
+        const char * otherPrefix = alpha ? "color:" : "alpha:";
+        size_t otherPrefixLen = 6;
+        const char * otherShortPrefix = alpha ? "c:" : "a:";
+        size_t otherShortPrefixLen = 2;
+        if (!strncmp(entry->key, otherPrefix, otherPrefixLen) || !strncmp(entry->key, otherShortPrefix, otherShortPrefixLen)) {
+            continue;
+        }
+
+        // Skip options processed by avifProcessAOMOptionsPreInit.
+        if (avifKeyEqualsName(entry->key, "end-usage", alpha)) {
+            continue;
+        }
+
+#if defined(HAVE_AOM_CODEC_SET_OPTION)
+        const char * prefix = alpha ? "alpha:" : "color:";
+        size_t prefixLen = 6;
+        const char * shortPrefix = alpha ? "a:" : "c:";
+        size_t shortPrefixLen = 2;
+        const char * key = entry->key;
+        if (!strncmp(key, prefix, prefixLen)) {
+            key += prefixLen;
+        } else if (!strncmp(key, shortPrefix, shortPrefixLen)) {
+            key += shortPrefixLen;
+        }
+        if (aom_codec_set_option(&codec->internal->encoder, key, entry->value) != AOM_CODEC_OK) {
+            avifDiagnosticsPrintf(codec->diag,
+                                  "aom_codec_set_option(\"%s\", \"%s\") failed: %s: %s",
+                                  key,
+                                  entry->value,
+                                  aom_codec_error(&codec->internal->encoder),
+                                  aom_codec_error_detail(&codec->internal->encoder));
+            return AVIF_FALSE;
+        }
+        if (!strcmp(key, "tune")) {
+            codec->internal->tuningSet = AVIF_TRUE;
+        }
+#else  // !defined(HAVE_AOM_CODEC_SET_OPTION)
+        avifBool match = AVIF_FALSE;
+        for (int j = 0; aomOptionDefs[j].name; ++j) {
+            if (avifKeyEqualsName(entry->key, aomOptionDefs[j].name, alpha)) {
+                match = AVIF_TRUE;
+                avifBool success = AVIF_FALSE;
+                int valInt;
+                unsigned int valUInt;
+                switch (aomOptionDefs[j].type) {
+                    case AVIF_AOM_OPTION_NUL:
+                        success = AVIF_FALSE;
+                        break;
+                    case AVIF_AOM_OPTION_STR:
+                        success = aom_codec_control(&codec->internal->encoder, aomOptionDefs[j].controlId, entry->value) == AOM_CODEC_OK;
+                        break;
+                    case AVIF_AOM_OPTION_INT:
+                        success = aomOptionParseInt(entry->value, &valInt) &&
+                                  aom_codec_control(&codec->internal->encoder, aomOptionDefs[j].controlId, valInt) == AOM_CODEC_OK;
+                        break;
+                    case AVIF_AOM_OPTION_UINT:
+                        success = aomOptionParseUInt(entry->value, &valUInt) &&
+                                  aom_codec_control(&codec->internal->encoder, aomOptionDefs[j].controlId, valUInt) == AOM_CODEC_OK;
+                        break;
+                    case AVIF_AOM_OPTION_ENUM:
+                        success = aomOptionParseEnum(entry->value, aomOptionDefs[j].enums, &valInt) &&
+                                  aom_codec_control(&codec->internal->encoder, aomOptionDefs[j].controlId, valInt) == AOM_CODEC_OK;
+                        break;
+                }
+                if (!success) {
+                    return AVIF_FALSE;
+                }
+                if (aomOptionDefs[j].controlId == AOME_SET_TUNING) {
+                    codec->internal->tuningSet = AVIF_TRUE;
+                }
+                break;
+            }
+        }
+        if (!match) {
+            return AVIF_FALSE;
+        }
+#endif // defined(HAVE_AOM_CODEC_SET_OPTION)
+    }
+    return AVIF_TRUE;
+}
+
+struct aomScalingModeMapList
+{
+    avifFraction avifMode;
+    AOM_SCALING_MODE aomMode;
+};
+
+static const struct aomScalingModeMapList scalingModeMap[] = {
+    { { 1, 1 }, AOME_NORMAL },    { { 1, 2 }, AOME_ONETWO },    { { 1, 4 }, AOME_ONEFOUR },  { { 1, 8 }, AOME_ONEEIGHT },
+    { { 3, 4 }, AOME_THREEFOUR }, { { 3, 5 }, AOME_THREEFIVE }, { { 4, 5 }, AOME_FOURFIVE },
+};
+
+static const int scalingModeMapSize = sizeof(scalingModeMap) / sizeof(scalingModeMap[0]);
+
+static avifBool avifFindAOMScalingMode(const avifFraction * avifMode, AOM_SCALING_MODE * aomMode)
+{
+    avifFraction simplifiedFraction = *avifMode;
+    avifFractionSimplify(&simplifiedFraction);
+    for (int i = 0; i < scalingModeMapSize; ++i) {
+        if (scalingModeMap[i].avifMode.n == simplifiedFraction.n && scalingModeMap[i].avifMode.d == simplifiedFraction.d) {
+            *aomMode = scalingModeMap[i].aomMode;
+            return AVIF_TRUE;
+        }
+    }
+
+    return AVIF_FALSE;
+}
+
+static avifBool doesLevelMatch(int width, int height, int levelWidth, int levelHeight, int levelDimMult)
+{
+    const int64_t levelLumaPels = (int64_t)levelWidth * levelHeight;
+    const int64_t lumaPels = (int64_t)width * height;
+    return lumaPels <= levelLumaPels && width <= levelWidth * levelDimMult && height <= levelHeight * levelDimMult;
+}
+
+static avifBool aomCodecEncodeFinish(avifCodec * codec, avifCodecEncodeOutput * output);
+
+static avifResult aomCodecEncodeImage(avifCodec * codec,
+                                      avifEncoder * encoder,
+                                      const avifImage * image,
+                                      avifBool alpha,
+                                      int tileRowsLog2,
+                                      int tileColsLog2,
+                                      int quantizer,
+                                      avifEncoderChanges encoderChanges,
+                                      avifBool disableLaggedOutput,
+                                      avifAddImageFlags addImageFlags,
+                                      avifCodecEncodeOutput * output)
+{
+    struct aom_codec_enc_cfg * cfg = &codec->internal->cfg;
+    avifBool quantizerUpdated = AVIF_FALSE;
+
+    // For encoder->scalingMode.horizontal and encoder->scalingMode.vertical to take effect in AOM
+    // encoder, config should be applied for each frame, so we don't care about changes on these
+    // two fields.
+    encoderChanges &= ~AVIF_ENCODER_CHANGE_SCALING_MODE;
+
+    if (!codec->internal->encoderInitialized) {
+        // Map encoder speed to AOM usage + CpuUsed:
+        // Speed  0: GoodQuality CpuUsed 0
+        // Speed  1: GoodQuality CpuUsed 1
+        // Speed  2: GoodQuality CpuUsed 2
+        // Speed  3: GoodQuality CpuUsed 3
+        // Speed  4: GoodQuality CpuUsed 4
+        // Speed  5: GoodQuality CpuUsed 5
+        // Speed  6: GoodQuality CpuUsed 6
+        // Speed  7: RealTime    CpuUsed 7
+        // Speed  8: RealTime    CpuUsed 8
+        // Speed  9: RealTime    CpuUsed 9
+        // Speed 10: RealTime    CpuUsed 9
+        unsigned int aomUsage = AOM_USAGE_GOOD_QUALITY;
+        // Use the new AOM_USAGE_ALL_INTRA (added in https://crbug.com/aomedia/2959) for still
+        // image encoding if it is available.
+#if defined(AOM_USAGE_ALL_INTRA)
+        if (addImageFlags & AVIF_ADD_IMAGE_FLAG_SINGLE) {
+            aomUsage = AOM_USAGE_ALL_INTRA;
+        }
+#endif
+        int aomCpuUsed = -1;
+        if (encoder->speed != AVIF_SPEED_DEFAULT) {
+            aomCpuUsed = AVIF_CLAMP(encoder->speed, 0, 9);
+            if (aomCpuUsed >= 7) {
+#if defined(AOM_USAGE_ALL_INTRA) && defined(ALL_INTRA_HAS_SPEEDS_7_TO_9)
+                if (!(addImageFlags & AVIF_ADD_IMAGE_FLAG_SINGLE)) {
+                    aomUsage = AOM_USAGE_REALTIME;
+                }
+#else
+                aomUsage = AOM_USAGE_REALTIME;
+#endif
+            }
+        }
+
+        // aom_codec.h says: aom_codec_version() == (major<<16 | minor<<8 | patch)
+        static const int aomVersion_2_0_0 = (2 << 16);
+        const int aomVersion = aom_codec_version();
+        if ((aomVersion < aomVersion_2_0_0) && (image->depth > 8)) {
+            // Due to a known issue with libaom v1.0.0-errata1-avif, 10bpc and
+            // 12bpc image encodes will call the wrong variant of
+            // aom_subtract_block when cpu-used is 7 or 8, and crash. Until we get
+            // a new tagged release from libaom with the fix and can verify we're
+            // running with that version of libaom, we must avoid using
+            // cpu-used=7/8 on any >8bpc image encodes.
+            //
+            // Context:
+            //   * https://github.com/AOMediaCodec/libavif/issues/49
+            //   * https://bugs.chromium.org/p/aomedia/issues/detail?id=2587
+            //
+            // Continued bug tracking here:
+            //   * https://github.com/AOMediaCodec/libavif/issues/56
+
+            if (aomCpuUsed > 6) {
+                aomCpuUsed = 6;
+            }
+        }
+
+        codec->internal->aomFormat = avifImageCalcAOMFmt(image, alpha);
+        if (codec->internal->aomFormat == AOM_IMG_FMT_NONE) {
+            return AVIF_RESULT_UNKNOWN_ERROR;
+        }
+
+        avifGetPixelFormatInfo(image->yuvFormat, &codec->internal->formatInfo);
+
+        aom_codec_iface_t * encoderInterface = aom_codec_av1_cx();
+        aom_codec_err_t err = aom_codec_enc_config_default(encoderInterface, cfg, aomUsage);
+        if (err != AOM_CODEC_OK) {
+            avifDiagnosticsPrintf(codec->diag, "aom_codec_enc_config_default() failed: %s", aom_codec_err_to_string(err));
+            return AVIF_RESULT_UNKNOWN_ERROR;
+        }
+
+        // Set our own default cfg->rc_end_usage value, which may differ from libaom's default.
+        switch (aomUsage) {
+            case AOM_USAGE_GOOD_QUALITY:
+                // libaom's default is AOM_VBR. Change the default to AOM_Q since we don't need to
+                // hit a certain target bit rate. It's easier to control the worst quality in Q
+                // mode.
+                cfg->rc_end_usage = AOM_Q;
+                break;
+            case AOM_USAGE_REALTIME:
+                // For real-time mode we need to use CBR rate control mode. AOM_Q doesn't fit the
+                // rate control requirements for real-time mode. CBR does.
+                cfg->rc_end_usage = AOM_CBR;
+                break;
+#if defined(AOM_USAGE_ALL_INTRA)
+            case AOM_USAGE_ALL_INTRA:
+                cfg->rc_end_usage = AOM_Q;
+                break;
+#endif
+        }
+
+        // Profile 0.  8-bit and 10-bit 4:2:0 and 4:0:0 only.
+        // Profile 1.  8-bit and 10-bit 4:4:4
+        // Profile 2.  8-bit and 10-bit 4:2:2
+        //            12-bit 4:0:0, 4:2:0, 4:2:2 and 4:4:4
+        uint8_t seqProfile = 0;
+        if (image->depth == 12) {
+            // Only seqProfile 2 can handle 12 bit
+            seqProfile = 2;
+        } else {
+            // 8-bit or 10-bit
+
+            if (alpha) {
+                seqProfile = 0;
+            } else {
+                switch (image->yuvFormat) {
+                    case AVIF_PIXEL_FORMAT_YUV444:
+                        seqProfile = 1;
+                        break;
+                    case AVIF_PIXEL_FORMAT_YUV422:
+                        seqProfile = 2;
+                        break;
+                    case AVIF_PIXEL_FORMAT_YUV420:
+                        seqProfile = 0;
+                        break;
+                    case AVIF_PIXEL_FORMAT_YUV400:
+                        seqProfile = 0;
+                        break;
+                    case AVIF_PIXEL_FORMAT_NONE:
+                    case AVIF_PIXEL_FORMAT_COUNT:
+                    default:
+                        break;
+                }
+            }
+        }
+
+        cfg->g_profile = seqProfile;
+        cfg->g_bit_depth = image->depth;
+        cfg->g_input_bit_depth = image->depth;
+        cfg->g_w = image->width;
+        cfg->g_h = image->height;
+
+        // Detect the libaom v3.6.0 bug described in
+        // https://crbug.com/aomedia/2871#c12. See the changes to
+        // av1/encoder/encoder.c in
+        // https://aomedia-review.googlesource.com/c/aom/+/174421.
+        static const int aomVersion_3_6_0 = (3 << 16) | (6 << 8);
+        if (aomVersion == aomVersion_3_6_0) {
+            // Detect the use of levels 7.x and 8.x, which use a larger max
+            // tile area (4096 * 4608) than MAX_TILE_AREA (4096 * 2304). The
+            // larger max tile area may not result in a different bitstream
+            // (see the tile_info() function in the AV1 spec, Section 5.9.15),
+            // so this is just a necessary condition for the bug.
+            if (!doesLevelMatch(image->width, image->height, 8192, 4352, 2) &&
+                (doesLevelMatch(image->width, image->height, 16384, 8704, 2) ||
+                 doesLevelMatch(image->width, image->height, 32768, 17408, 2))) {
+                avifDiagnosticsPrintf(codec->diag, "Detected libaom v3.6.0 bug with large images. Upgrade to libaom v3.6.1 or later.");
+                return AVIF_RESULT_UNKNOWN_ERROR;
+            }
+        }
+
+        if (addImageFlags & AVIF_ADD_IMAGE_FLAG_SINGLE) {
+            // Set the maximum number of frames to encode to 1. This instructs
+            // libaom to set still_picture and reduced_still_picture_header to
+            // 1 in AV1 sequence headers.
+            cfg->g_limit = 1;
+
+            // Use the default settings of the new AOM_USAGE_ALL_INTRA (added in
+            // https://crbug.com/aomedia/2959).
+            //
+            // Set g_lag_in_frames to 0 to reduce the number of frame buffers
+            // (from 20 to 2) in libaom's lookahead structure. This reduces
+            // memory consumption when encoding a single image.
+            cfg->g_lag_in_frames = 0;
+            // Disable automatic placement of key frames by the encoder.
+            cfg->kf_mode = AOM_KF_DISABLED;
+            // Tell libaom that all frames will be key frames.
+            cfg->kf_max_dist = 0;
+        } else {
+            if (encoder->keyframeInterval > 0) {
+                cfg->kf_max_dist = encoder->keyframeInterval;
+            }
+        }
+        if (encoder->extraLayerCount > 0) {
+            cfg->g_limit = encoder->extraLayerCount + 1;
+            // For layered image, disable lagged encoding to always get output
+            // frame for each input frame.
+            cfg->g_lag_in_frames = 0;
+        }
+        if (disableLaggedOutput) {
+            cfg->g_lag_in_frames = 0;
+        }
+        if (encoder->maxThreads > 1) {
+            cfg->g_threads = encoder->maxThreads;
+        }
+
+        codec->internal->monochromeEnabled = AVIF_FALSE;
+        if (aomVersion > aomVersion_2_0_0) {
+            // There exists a bug in libaom's chroma_check() function where it will attempt to
+            // access nonexistent UV planes when encoding monochrome at faster libavif "speeds". It
+            // was fixed shortly after the 2.0.0 libaom release, and the fix exists in both the
+            // master and applejack branches. This ensures that the next version *after* 2.0.0 will
+            // have the fix, and we must avoid cfg->monochrome until then.
+            //
+            // Bugfix Change-Id: https://aomedia-review.googlesource.com/q/I26a39791f820b4d4e1d63ff7141f594c3c7181f5
+
+            if (alpha || (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400)) {
+                codec->internal->monochromeEnabled = AVIF_TRUE;
+                cfg->monochrome = 1;
+            }
+        }
+
+        if (!avifProcessAOMOptionsPreInit(codec, alpha, cfg)) {
+            return AVIF_RESULT_INVALID_CODEC_SPECIFIC_OPTION;
+        }
+
+        int minQuantizer;
+        int maxQuantizer;
+        if (alpha) {
+            minQuantizer = encoder->minQuantizerAlpha;
+            maxQuantizer = encoder->maxQuantizerAlpha;
+        } else {
+            minQuantizer = encoder->minQuantizer;
+            maxQuantizer = encoder->maxQuantizer;
+        }
+        minQuantizer = AVIF_CLAMP(minQuantizer, 0, 63);
+        maxQuantizer = AVIF_CLAMP(maxQuantizer, 0, 63);
+        if ((cfg->rc_end_usage == AOM_VBR) || (cfg->rc_end_usage == AOM_CBR)) {
+            // cq-level is ignored in these two end-usage modes, so adjust minQuantizer and
+            // maxQuantizer to the target quantizer.
+            if (quantizer == AVIF_QUANTIZER_LOSSLESS) {
+                minQuantizer = AVIF_QUANTIZER_LOSSLESS;
+                maxQuantizer = AVIF_QUANTIZER_LOSSLESS;
+            } else {
+                minQuantizer = AVIF_MAX(quantizer - 4, minQuantizer);
+                maxQuantizer = AVIF_MIN(quantizer + 4, maxQuantizer);
+            }
+        }
+        cfg->rc_min_quantizer = minQuantizer;
+        cfg->rc_max_quantizer = maxQuantizer;
+        quantizerUpdated = AVIF_TRUE;
+
+        aom_codec_flags_t encoderFlags = 0;
+        if (image->depth > 8) {
+            encoderFlags |= AOM_CODEC_USE_HIGHBITDEPTH;
+        }
+        if (aom_codec_enc_init(&codec->internal->encoder, encoderInterface, cfg, encoderFlags) != AOM_CODEC_OK) {
+            avifDiagnosticsPrintf(codec->diag,
+                                  "aom_codec_enc_init() failed: %s: %s",
+                                  aom_codec_error(&codec->internal->encoder),
+                                  aom_codec_error_detail(&codec->internal->encoder));
+            return AVIF_RESULT_UNKNOWN_ERROR;
+        }
+        codec->internal->encoderInitialized = AVIF_TRUE;
+
+        if ((cfg->rc_end_usage == AOM_CQ) || (cfg->rc_end_usage == AOM_Q)) {
+            aom_codec_control(&codec->internal->encoder, AOME_SET_CQ_LEVEL, quantizer);
+        }
+        avifBool lossless = (quantizer == AVIF_QUANTIZER_LOSSLESS);
+        if (lossless) {
+            aom_codec_control(&codec->internal->encoder, AV1E_SET_LOSSLESS, 1);
+        }
+        if (tileRowsLog2 != 0) {
+            aom_codec_control(&codec->internal->encoder, AV1E_SET_TILE_ROWS, tileRowsLog2);
+        }
+        if (tileColsLog2 != 0) {
+            aom_codec_control(&codec->internal->encoder, AV1E_SET_TILE_COLUMNS, tileColsLog2);
+        }
+        if (encoder->extraLayerCount > 0) {
+            int layerCount = encoder->extraLayerCount + 1;
+            if (aom_codec_control(&codec->internal->encoder, AOME_SET_NUMBER_SPATIAL_LAYERS, layerCount) != AOM_CODEC_OK) {
+                return AVIF_RESULT_UNKNOWN_ERROR;
+            };
+        }
+        if (aomCpuUsed != -1) {
+            if (aom_codec_control(&codec->internal->encoder, AOME_SET_CPUUSED, aomCpuUsed) != AOM_CODEC_OK) {
+                return AVIF_RESULT_UNKNOWN_ERROR;
+            }
+        }
+
+        // Set color_config() in the sequence header OBU.
+        if (alpha) {
+            aom_codec_control(&codec->internal->encoder, AV1E_SET_COLOR_RANGE, AOM_CR_FULL_RANGE);
+        } else {
+            // libaom's defaults are AOM_CICP_CP_UNSPECIFIED, AOM_CICP_TC_UNSPECIFIED,
+            // AOM_CICP_MC_UNSPECIFIED, AOM_CSP_UNKNOWN, and 0 (studio/limited range). Call
+            // aom_codec_control() only if the values are not the defaults.
+            if (image->colorPrimaries != AVIF_COLOR_PRIMARIES_UNSPECIFIED) {
+                aom_codec_control(&codec->internal->encoder, AV1E_SET_COLOR_PRIMARIES, (int)image->colorPrimaries);
+            }
+            if (image->transferCharacteristics != AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED) {
+                aom_codec_control(&codec->internal->encoder, AV1E_SET_TRANSFER_CHARACTERISTICS, (int)image->transferCharacteristics);
+            }
+            if (image->matrixCoefficients != AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED) {
+                aom_codec_control(&codec->internal->encoder, AV1E_SET_MATRIX_COEFFICIENTS, (int)image->matrixCoefficients);
+            }
+            if (image->yuvChromaSamplePosition != AVIF_CHROMA_SAMPLE_POSITION_UNKNOWN) {
+                aom_codec_control(&codec->internal->encoder, AV1E_SET_CHROMA_SAMPLE_POSITION, (int)image->yuvChromaSamplePosition);
+            }
+            if (image->yuvRange != AVIF_RANGE_LIMITED) {
+                aom_codec_control(&codec->internal->encoder, AV1E_SET_COLOR_RANGE, (int)image->yuvRange);
+            }
+        }
+
+#if defined(AOM_CTRL_AV1E_SET_SKIP_POSTPROC_FILTERING)
+        if (cfg->g_usage == AOM_USAGE_ALL_INTRA) {
+            // Enable AV1E_SET_SKIP_POSTPROC_FILTERING for still-picture encoding, which is
+            // disabled by default.
+            aom_codec_control(&codec->internal->encoder, AV1E_SET_SKIP_POSTPROC_FILTERING, 1);
+        }
+#endif
+
+        if (!avifProcessAOMOptionsPostInit(codec, alpha)) {
+            return AVIF_RESULT_INVALID_CODEC_SPECIFIC_OPTION;
+        }
+        if (!codec->internal->tuningSet) {
+            if (aom_codec_control(&codec->internal->encoder, AOME_SET_TUNING, AOM_TUNE_SSIM) != AOM_CODEC_OK) {
+                return AVIF_RESULT_UNKNOWN_ERROR;
+            }
+        }
+    } else {
+        avifBool dimensionsChanged = AVIF_FALSE;
+        if ((cfg->g_w != image->width) || (cfg->g_h != image->height)) {
+            // We are not ready for dimension change for now.
+            return AVIF_RESULT_NOT_IMPLEMENTED;
+        }
+        if (alpha) {
+            if (encoderChanges & (AVIF_ENCODER_CHANGE_MIN_QUANTIZER_ALPHA | AVIF_ENCODER_CHANGE_MAX_QUANTIZER_ALPHA)) {
+                cfg->rc_min_quantizer = AVIF_CLAMP(encoder->minQuantizerAlpha, 0, 63);
+                cfg->rc_max_quantizer = AVIF_CLAMP(encoder->maxQuantizerAlpha, 0, 63);
+                quantizerUpdated = AVIF_TRUE;
+            }
+        } else {
+            if (encoderChanges & (AVIF_ENCODER_CHANGE_MIN_QUANTIZER | AVIF_ENCODER_CHANGE_MAX_QUANTIZER)) {
+                cfg->rc_min_quantizer = AVIF_CLAMP(encoder->minQuantizer, 0, 63);
+                cfg->rc_max_quantizer = AVIF_CLAMP(encoder->maxQuantizer, 0, 63);
+                quantizerUpdated = AVIF_TRUE;
+            }
+        }
+        const int quantizerChangedBit = alpha ? AVIF_ENCODER_CHANGE_QUANTIZER_ALPHA : AVIF_ENCODER_CHANGE_QUANTIZER;
+        if (encoderChanges & quantizerChangedBit) {
+            if ((cfg->rc_end_usage == AOM_VBR) || (cfg->rc_end_usage == AOM_CBR)) {
+                // cq-level is ignored in these two end-usage modes, so adjust minQuantizer and
+                // maxQuantizer to the target quantizer.
+                if (quantizer == AVIF_QUANTIZER_LOSSLESS) {
+                    cfg->rc_min_quantizer = AVIF_QUANTIZER_LOSSLESS;
+                    cfg->rc_max_quantizer = AVIF_QUANTIZER_LOSSLESS;
+                } else {
+                    int minQuantizer;
+                    int maxQuantizer;
+                    if (alpha) {
+                        minQuantizer = encoder->minQuantizerAlpha;
+                        maxQuantizer = encoder->maxQuantizerAlpha;
+                    } else {
+                        minQuantizer = encoder->minQuantizer;
+                        maxQuantizer = encoder->maxQuantizer;
+                    }
+                    minQuantizer = AVIF_CLAMP(minQuantizer, 0, 63);
+                    maxQuantizer = AVIF_CLAMP(maxQuantizer, 0, 63);
+                    cfg->rc_min_quantizer = AVIF_MAX(quantizer - 4, minQuantizer);
+                    cfg->rc_max_quantizer = AVIF_MIN(quantizer + 4, maxQuantizer);
+                }
+                quantizerUpdated = AVIF_TRUE;
+            }
+        }
+        if (quantizerUpdated || dimensionsChanged) {
+            aom_codec_err_t err = aom_codec_enc_config_set(&codec->internal->encoder, cfg);
+            if (err != AOM_CODEC_OK) {
+                avifDiagnosticsPrintf(codec->diag,
+                                      "aom_codec_enc_config_set() failed: %s: %s",
+                                      aom_codec_error(&codec->internal->encoder),
+                                      aom_codec_error_detail(&codec->internal->encoder));
+                return AVIF_RESULT_UNKNOWN_ERROR;
+            }
+        }
+        if (encoderChanges & AVIF_ENCODER_CHANGE_TILE_ROWS_LOG2) {
+            aom_codec_control(&codec->internal->encoder, AV1E_SET_TILE_ROWS, tileRowsLog2);
+        }
+        if (encoderChanges & AVIF_ENCODER_CHANGE_TILE_COLS_LOG2) {
+            aom_codec_control(&codec->internal->encoder, AV1E_SET_TILE_COLUMNS, tileColsLog2);
+        }
+        if (encoderChanges & quantizerChangedBit) {
+            if ((cfg->rc_end_usage == AOM_CQ) || (cfg->rc_end_usage == AOM_Q)) {
+                aom_codec_control(&codec->internal->encoder, AOME_SET_CQ_LEVEL, quantizer);
+            }
+            avifBool lossless = (quantizer == AVIF_QUANTIZER_LOSSLESS);
+            aom_codec_control(&codec->internal->encoder, AV1E_SET_LOSSLESS, lossless);
+        }
+        if (encoderChanges & AVIF_ENCODER_CHANGE_CODEC_SPECIFIC) {
+            if (!avifProcessAOMOptionsPostInit(codec, alpha)) {
+                return AVIF_RESULT_INVALID_CODEC_SPECIFIC_OPTION;
+            }
+        }
+    }
+
+    if (codec->internal->currentLayer > encoder->extraLayerCount) {
+        avifDiagnosticsPrintf(codec->diag,
+                              "Too many layers sent. Expected %u layers, but got %u layers.",
+                              encoder->extraLayerCount + 1,
+                              codec->internal->currentLayer + 1);
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+    if (encoder->extraLayerCount > 0) {
+        aom_codec_control(&codec->internal->encoder, AOME_SET_SPATIAL_LAYER_ID, codec->internal->currentLayer);
+    }
+
+    aom_scaling_mode_t aomScalingMode;
+    if (!avifFindAOMScalingMode(&encoder->scalingMode.horizontal, &aomScalingMode.h_scaling_mode)) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+    if (!avifFindAOMScalingMode(&encoder->scalingMode.vertical, &aomScalingMode.v_scaling_mode)) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+    if ((aomScalingMode.h_scaling_mode != AOME_NORMAL) || (aomScalingMode.v_scaling_mode != AOME_NORMAL)) {
+        // AOME_SET_SCALEMODE only applies to next frame (layer), so we have to set it every time.
+        aom_codec_control(&codec->internal->encoder, AOME_SET_SCALEMODE, &aomScalingMode);
+    }
+
+    aom_image_t aomImage;
+    // We prefer to simply set the aomImage.planes[] pointers to the plane buffers in 'image'. When
+    // doing this, we set aomImage.w equal to aomImage.d_w and aomImage.h equal to aomImage.d_h and
+    // do not "align" aomImage.w and aomImage.h. Unfortunately this exposes a bug in libaom
+    // (https://crbug.com/aomedia/3113) if chroma is subsampled and image->width or image->height is
+    // equal to 1. To work around this libaom bug, we allocate the aomImage.planes[] buffers and
+    // copy the image YUV data if image->width or image->height is equal to 1. This bug has been
+    // fixed in libaom v3.1.3.
+    //
+    // Note: The exact condition for the bug is
+    //   ((image->width == 1) && (chroma is subsampled horizontally)) ||
+    //   ((image->height == 1) && (chroma is subsampled vertically))
+    // Since an image width or height of 1 is uncommon in practice, we test an inexact but simpler
+    // condition.
+    avifBool aomImageAllocated = (image->width == 1) || (image->height == 1);
+    if (aomImageAllocated) {
+        aom_img_alloc(&aomImage, codec->internal->aomFormat, image->width, image->height, 16);
+    } else {
+        memset(&aomImage, 0, sizeof(aomImage));
+        aomImage.fmt = codec->internal->aomFormat;
+        aomImage.bit_depth = (image->depth > 8) ? 16 : 8;
+        aomImage.w = image->width;
+        aomImage.h = image->height;
+        aomImage.d_w = image->width;
+        aomImage.d_h = image->height;
+        // Get sample size for this format.
+        unsigned int bps;
+        if (codec->internal->aomFormat == AOM_IMG_FMT_I420) {
+            bps = 12;
+        } else if (codec->internal->aomFormat == AOM_IMG_FMT_I422) {
+            bps = 16;
+        } else if (codec->internal->aomFormat == AOM_IMG_FMT_I444) {
+            bps = 24;
+        } else if (codec->internal->aomFormat == AOM_IMG_FMT_I42016) {
+            bps = 24;
+        } else if (codec->internal->aomFormat == AOM_IMG_FMT_I42216) {
+            bps = 32;
+        } else if (codec->internal->aomFormat == AOM_IMG_FMT_I44416) {
+            bps = 48;
+        } else {
+            bps = 16;
+        }
+        aomImage.bps = bps;
+        // See avifImageCalcAOMFmt(). libaom doesn't have AOM_IMG_FMT_I400, so we use AOM_IMG_FMT_I420 as a substitute for monochrome.
+        aomImage.x_chroma_shift = (alpha || codec->internal->formatInfo.monochrome) ? 1 : codec->internal->formatInfo.chromaShiftX;
+        aomImage.y_chroma_shift = (alpha || codec->internal->formatInfo.monochrome) ? 1 : codec->internal->formatInfo.chromaShiftY;
+    }
+
+    avifBool monochromeRequested = AVIF_FALSE;
+
+    if (alpha) {
+        aomImage.range = AOM_CR_FULL_RANGE;
+        monochromeRequested = AVIF_TRUE;
+        if (aomImageAllocated) {
+            const uint32_t bytesPerRow = ((image->depth > 8) ? 2 : 1) * image->width;
+            for (uint32_t j = 0; j < image->height; ++j) {
+                const uint8_t * srcAlphaRow = &image->alphaPlane[j * image->alphaRowBytes];
+                uint8_t * dstAlphaRow = &aomImage.planes[0][j * aomImage.stride[0]];
+                memcpy(dstAlphaRow, srcAlphaRow, bytesPerRow);
+            }
+        } else {
+            aomImage.planes[0] = image->alphaPlane;
+            aomImage.stride[0] = image->alphaRowBytes;
+        }
+
+        // Ignore UV planes when monochrome
+    } else {
+        int yuvPlaneCount = 3;
+        if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400) {
+            yuvPlaneCount = 1; // Ignore UV planes when monochrome
+            monochromeRequested = AVIF_TRUE;
+        }
+        if (aomImageAllocated) {
+            uint32_t bytesPerPixel = (image->depth > 8) ? 2 : 1;
+            for (int yuvPlane = 0; yuvPlane < yuvPlaneCount; ++yuvPlane) {
+                uint32_t planeWidth = avifImagePlaneWidth(image, yuvPlane);
+                uint32_t planeHeight = avifImagePlaneHeight(image, yuvPlane);
+                uint32_t bytesPerRow = bytesPerPixel * planeWidth;
+
+                for (uint32_t j = 0; j < planeHeight; ++j) {
+                    const uint8_t * srcRow = &image->yuvPlanes[yuvPlane][j * image->yuvRowBytes[yuvPlane]];
+                    uint8_t * dstRow = &aomImage.planes[yuvPlane][j * aomImage.stride[yuvPlane]];
+                    memcpy(dstRow, srcRow, bytesPerRow);
+                }
+            }
+        } else {
+            for (int yuvPlane = 0; yuvPlane < yuvPlaneCount; ++yuvPlane) {
+                aomImage.planes[yuvPlane] = image->yuvPlanes[yuvPlane];
+                aomImage.stride[yuvPlane] = image->yuvRowBytes[yuvPlane];
+            }
+        }
+
+        aomImage.cp = (aom_color_primaries_t)image->colorPrimaries;
+        aomImage.tc = (aom_transfer_characteristics_t)image->transferCharacteristics;
+        aomImage.mc = (aom_matrix_coefficients_t)image->matrixCoefficients;
+        aomImage.csp = (aom_chroma_sample_position_t)image->yuvChromaSamplePosition;
+        aomImage.range = (aom_color_range_t)image->yuvRange;
+    }
+
+    unsigned char * monoUVPlane = NULL;
+    if (monochromeRequested) {
+        if (codec->internal->monochromeEnabled) {
+            aomImage.monochrome = 1;
+        } else {
+            // The user requested monochrome (via alpha or YUV400) but libaom cannot currently support
+            // monochrome (see chroma_check comment above). Manually set UV planes to 0.5.
+
+            // aomImage is always 420 when we're monochrome
+            uint32_t monoUVWidth = (image->width + 1) >> 1;
+            uint32_t monoUVHeight = (image->height + 1) >> 1;
+
+            // Allocate the U plane if necessary.
+            if (!aomImageAllocated) {
+                uint32_t channelSize = avifImageUsesU16(image) ? 2 : 1;
+                uint32_t monoUVRowBytes = channelSize * monoUVWidth;
+                size_t monoUVSize = (size_t)monoUVHeight * monoUVRowBytes;
+
+                monoUVPlane = avifAlloc(monoUVSize);
+                AVIF_CHECKERR(monoUVPlane != NULL, AVIF_RESULT_OUT_OF_MEMORY); // No need for aom_img_free() because !aomImageAllocated
+                aomImage.planes[1] = monoUVPlane;
+                aomImage.stride[1] = monoUVRowBytes;
+            }
+            // Set the U plane to 0.5.
+            if (image->depth > 8) {
+                const uint16_t half = 1 << (image->depth - 1);
+                for (uint32_t j = 0; j < monoUVHeight; ++j) {
+                    uint16_t * dstRow = (uint16_t *)&aomImage.planes[1][(size_t)j * aomImage.stride[1]];
+                    for (uint32_t i = 0; i < monoUVWidth; ++i) {
+                        dstRow[i] = half;
+                    }
+                }
+            } else {
+                const uint8_t half = 128;
+                size_t planeSize = (size_t)monoUVHeight * aomImage.stride[1];
+                memset(aomImage.planes[1], half, planeSize);
+            }
+            // Make the V plane the same as the U plane.
+            aomImage.planes[2] = aomImage.planes[1];
+            aomImage.stride[2] = aomImage.stride[1];
+        }
+    }
+
+    aom_enc_frame_flags_t encodeFlags = 0;
+    if (addImageFlags & AVIF_ADD_IMAGE_FLAG_FORCE_KEYFRAME) {
+        encodeFlags |= AOM_EFLAG_FORCE_KF;
+    }
+    if (codec->internal->currentLayer > 0) {
+        encodeFlags |= AOM_EFLAG_NO_REF_GF | AOM_EFLAG_NO_REF_ARF | AOM_EFLAG_NO_REF_BWD | AOM_EFLAG_NO_REF_ARF2 |
+                       AOM_EFLAG_NO_UPD_GF | AOM_EFLAG_NO_UPD_ARF;
+    }
+    aom_codec_err_t encodeErr = aom_codec_encode(&codec->internal->encoder, &aomImage, 0, 1, encodeFlags);
+    avifFree(monoUVPlane);
+    if (aomImageAllocated) {
+        aom_img_free(&aomImage);
+    }
+    if (encodeErr != AOM_CODEC_OK) {
+        avifDiagnosticsPrintf(codec->diag,
+                              "aom_codec_encode() failed: %s: %s",
+                              aom_codec_error(&codec->internal->encoder),
+                              aom_codec_error_detail(&codec->internal->encoder));
+        return AVIF_RESULT_UNKNOWN_ERROR;
+    }
+
+    aom_codec_iter_t iter = NULL;
+    for (;;) {
+        const aom_codec_cx_pkt_t * pkt = aom_codec_get_cx_data(&codec->internal->encoder, &iter);
+        if (pkt == NULL) {
+            break;
+        }
+        if (pkt->kind == AOM_CODEC_CX_FRAME_PKT) {
+            AVIF_CHECKRES(
+                avifCodecEncodeOutputAddSample(output, pkt->data.frame.buf, pkt->data.frame.sz, (pkt->data.frame.flags & AOM_FRAME_IS_KEY)));
+        }
+    }
+
+    if ((addImageFlags & AVIF_ADD_IMAGE_FLAG_SINGLE) ||
+        ((encoder->extraLayerCount > 0) && (encoder->extraLayerCount == codec->internal->currentLayer))) {
+        // Flush and clean up encoder resources early to save on overhead when encoding alpha or grid images,
+        // as encoding is finished now. For layered image, encoding finishes when the last layer is encoded.
+
+        if (!aomCodecEncodeFinish(codec, output)) {
+            return AVIF_RESULT_UNKNOWN_ERROR;
+        }
+        aom_codec_destroy(&codec->internal->encoder);
+        codec->internal->encoderInitialized = AVIF_FALSE;
+    }
+    if (encoder->extraLayerCount > 0) {
+        ++codec->internal->currentLayer;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifBool aomCodecEncodeFinish(avifCodec * codec, avifCodecEncodeOutput * output)
+{
+    if (!codec->internal->encoderInitialized) {
+        return AVIF_TRUE;
+    }
+    for (;;) {
+        // flush encoder
+        if (aom_codec_encode(&codec->internal->encoder, NULL, 0, 1, 0) != AOM_CODEC_OK) {
+            avifDiagnosticsPrintf(codec->diag,
+                                  "aom_codec_encode() with img=NULL failed: %s: %s",
+                                  aom_codec_error(&codec->internal->encoder),
+                                  aom_codec_error_detail(&codec->internal->encoder));
+            return AVIF_FALSE;
+        }
+
+        avifBool gotPacket = AVIF_FALSE;
+        aom_codec_iter_t iter = NULL;
+        for (;;) {
+            const aom_codec_cx_pkt_t * pkt = aom_codec_get_cx_data(&codec->internal->encoder, &iter);
+            if (pkt == NULL) {
+                break;
+            }
+            if (pkt->kind == AOM_CODEC_CX_FRAME_PKT) {
+                gotPacket = AVIF_TRUE;
+                const avifResult result = avifCodecEncodeOutputAddSample(output,
+                                                                         pkt->data.frame.buf,
+                                                                         pkt->data.frame.sz,
+                                                                         (pkt->data.frame.flags & AOM_FRAME_IS_KEY));
+                if (result != AVIF_RESULT_OK) {
+                    avifDiagnosticsPrintf(codec->diag, "avifCodecEncodeOutputAddSample() failed: %s", avifResultToString(result));
+                    return AVIF_FALSE;
+                }
+            }
+        }
+
+        if (!gotPacket) {
+            break;
+        }
+    }
+    return AVIF_TRUE;
+}
+
+#endif // defined(AVIF_CODEC_AOM_ENCODE)
+
+const char * avifCodecVersionAOM(void)
+{
+    return aom_codec_version_str();
+}
+
+avifCodec * avifCodecCreateAOM(void)
+{
+    avifCodec * codec = (avifCodec *)avifAlloc(sizeof(avifCodec));
+    if (codec == NULL) {
+        return NULL;
+    }
+    memset(codec, 0, sizeof(struct avifCodec));
+
+#if defined(AVIF_CODEC_AOM_DECODE)
+    codec->getNextImage = aomCodecGetNextImage;
+#endif
+
+#if defined(AVIF_CODEC_AOM_ENCODE)
+    codec->encodeImage = aomCodecEncodeImage;
+    codec->encodeFinish = aomCodecEncodeFinish;
+#endif
+
+    codec->destroyInternal = aomCodecDestroyInternal;
+    codec->internal = (struct avifCodecInternal *)avifAlloc(sizeof(struct avifCodecInternal));
+    if (codec->internal == NULL) {
+        avifFree(codec);
+        return NULL;
+    }
+    memset(codec->internal, 0, sizeof(struct avifCodecInternal));
+    return codec;
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/colr.c b/pxr/imaging/plugin/hioAvif/AVIF/src/colr.c
new file mode 100644
index 0000000000..4c2ad38a3e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/colr.c
@@ -0,0 +1,534 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <float.h>
+#include <math.h>
+#include <string.h>
+
+struct avifColorPrimariesTable
+{
+    avifColorPrimaries colorPrimariesEnum;
+    const char * name;
+    float primaries[8]; // rX, rY, gX, gY, bX, bY, wX, wY
+};
+static const struct avifColorPrimariesTable avifColorPrimariesTables[] = {
+    { AVIF_COLOR_PRIMARIES_BT709, "BT.709", { 0.64f, 0.33f, 0.3f, 0.6f, 0.15f, 0.06f, 0.3127f, 0.329f } },
+    { AVIF_COLOR_PRIMARIES_BT470M, "BT.470-6 System M", { 0.67f, 0.33f, 0.21f, 0.71f, 0.14f, 0.08f, 0.310f, 0.316f } },
+    { AVIF_COLOR_PRIMARIES_BT470BG, "BT.470-6 System BG", { 0.64f, 0.33f, 0.29f, 0.60f, 0.15f, 0.06f, 0.3127f, 0.3290f } },
+    { AVIF_COLOR_PRIMARIES_BT601, "BT.601", { 0.630f, 0.340f, 0.310f, 0.595f, 0.155f, 0.070f, 0.3127f, 0.3290f } },
+    { AVIF_COLOR_PRIMARIES_SMPTE240, "SMPTE 240M", { 0.630f, 0.340f, 0.310f, 0.595f, 0.155f, 0.070f, 0.3127f, 0.3290f } },
+    { AVIF_COLOR_PRIMARIES_GENERIC_FILM, "Generic film", { 0.681f, 0.319f, 0.243f, 0.692f, 0.145f, 0.049f, 0.310f, 0.316f } },
+    { AVIF_COLOR_PRIMARIES_BT2020, "BT.2020", { 0.708f, 0.292f, 0.170f, 0.797f, 0.131f, 0.046f, 0.3127f, 0.3290f } },
+    { AVIF_COLOR_PRIMARIES_XYZ, "XYZ", { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.3333f, 0.3333f } },
+    { AVIF_COLOR_PRIMARIES_SMPTE431, "SMPTE RP 431-2", { 0.680f, 0.320f, 0.265f, 0.690f, 0.150f, 0.060f, 0.314f, 0.351f } },
+    { AVIF_COLOR_PRIMARIES_SMPTE432, "SMPTE EG 432-1 (DCI P3)", { 0.680f, 0.320f, 0.265f, 0.690f, 0.150f, 0.060f, 0.3127f, 0.3290f } },
+    { AVIF_COLOR_PRIMARIES_EBU3213, "EBU Tech. 3213-E", { 0.630f, 0.340f, 0.295f, 0.605f, 0.155f, 0.077f, 0.3127f, 0.3290f } }
+};
+static const int avifColorPrimariesTableSize = sizeof(avifColorPrimariesTables) / sizeof(avifColorPrimariesTables[0]);
+
+void avifColorPrimariesGetValues(avifColorPrimaries acp, float outPrimaries[8])
+{
+    for (int i = 0; i < avifColorPrimariesTableSize; ++i) {
+        if (avifColorPrimariesTables[i].colorPrimariesEnum == acp) {
+            memcpy(outPrimaries, avifColorPrimariesTables[i].primaries, sizeof(avifColorPrimariesTables[i].primaries));
+            return;
+        }
+    }
+
+    // if we get here, the color primaries are unknown. Just return a reasonable default.
+    memcpy(outPrimaries, avifColorPrimariesTables[0].primaries, sizeof(avifColorPrimariesTables[0].primaries));
+}
+
+static avifBool matchesTo3RoundedPlaces(float a, float b)
+{
+    return (fabsf(a - b) < 0.001f);
+}
+
+static avifBool primariesMatch(const float p1[8], const float p2[8])
+{
+    return matchesTo3RoundedPlaces(p1[0], p2[0]) && matchesTo3RoundedPlaces(p1[1], p2[1]) &&
+           matchesTo3RoundedPlaces(p1[2], p2[2]) && matchesTo3RoundedPlaces(p1[3], p2[3]) && matchesTo3RoundedPlaces(p1[4], p2[4]) &&
+           matchesTo3RoundedPlaces(p1[5], p2[5]) && matchesTo3RoundedPlaces(p1[6], p2[6]) && matchesTo3RoundedPlaces(p1[7], p2[7]);
+}
+
+avifColorPrimaries avifColorPrimariesFind(const float inPrimaries[8], const char ** outName)
+{
+    if (outName) {
+        *outName = NULL;
+    }
+
+    for (int i = 0; i < avifColorPrimariesTableSize; ++i) {
+        if (primariesMatch(inPrimaries, avifColorPrimariesTables[i].primaries)) {
+            if (outName) {
+                *outName = avifColorPrimariesTables[i].name;
+            }
+            return avifColorPrimariesTables[i].colorPrimariesEnum;
+        }
+    }
+    return AVIF_COLOR_PRIMARIES_UNKNOWN;
+}
+
+avifResult avifTransferCharacteristicsGetGamma(avifTransferCharacteristics atc, float * gamma)
+{
+    switch (atc) {
+        case AVIF_TRANSFER_CHARACTERISTICS_BT470M:
+            *gamma = 2.2f;
+            return AVIF_RESULT_OK;
+        case AVIF_TRANSFER_CHARACTERISTICS_BT470BG:
+            *gamma = 2.8f;
+            return AVIF_RESULT_OK;
+        case AVIF_TRANSFER_CHARACTERISTICS_LINEAR:
+            *gamma = 1.0f;
+            return AVIF_RESULT_OK;
+        default:
+            return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+}
+
+avifTransferCharacteristics avifTransferCharacteristicsFindByGamma(float gamma)
+{
+    if (matchesTo3RoundedPlaces(gamma, 2.2f)) {
+        return AVIF_TRANSFER_CHARACTERISTICS_BT470M;
+    } else if (matchesTo3RoundedPlaces(gamma, 1.0f)) {
+        return AVIF_TRANSFER_CHARACTERISTICS_LINEAR;
+    } else if (matchesTo3RoundedPlaces(gamma, 2.8f)) {
+        return AVIF_TRANSFER_CHARACTERISTICS_BT470BG;
+    }
+
+    return AVIF_TRANSFER_CHARACTERISTICS_UNKNOWN;
+}
+
+struct avifMatrixCoefficientsTable
+{
+    avifMatrixCoefficients matrixCoefficientsEnum;
+    const char * name;
+    const float kr;
+    const float kb;
+};
+
+// https://www.itu.int/rec/T-REC-H.273-201612-I/en
+static const struct avifMatrixCoefficientsTable matrixCoefficientsTables[] = {
+    //{ AVIF_MATRIX_COEFFICIENTS_IDENTITY, "Identity", 0.0f, 0.0f, }, // Handled elsewhere
+    { AVIF_MATRIX_COEFFICIENTS_BT709, "BT.709", 0.2126f, 0.0722f },
+    { AVIF_MATRIX_COEFFICIENTS_FCC, "FCC USFC 73.682", 0.30f, 0.11f },
+    { AVIF_MATRIX_COEFFICIENTS_BT470BG, "BT.470-6 System BG", 0.299f, 0.114f },
+    { AVIF_MATRIX_COEFFICIENTS_BT601, "BT.601", 0.299f, 0.114f },
+    { AVIF_MATRIX_COEFFICIENTS_SMPTE240, "SMPTE ST 240", 0.212f, 0.087f },
+    //{ AVIF_MATRIX_COEFFICIENTS_YCGCO, "YCgCo", 0.0f, 0.0f, }, // Handled elsewhere
+    { AVIF_MATRIX_COEFFICIENTS_BT2020_NCL, "BT.2020 (non-constant luminance)", 0.2627f, 0.0593f },
+    //{ AVIF_MATRIX_COEFFICIENTS_BT2020_CL, "BT.2020 (constant luminance)", 0.2627f, 0.0593f }, // FIXME: It is not an linear transformation.
+    //{ AVIF_MATRIX_COEFFICIENTS_SMPTE2085, "ST 2085", 0.0f, 0.0f }, // FIXME: ST2085 can't represent using Kr and Kb.
+    //{ AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_CL, "Chromaticity-derived constant luminance system", 0.0f, 0.0f } // FIXME: It is not an linear transformation.
+    //{ AVIF_MATRIX_COEFFICIENTS_ICTCP, "BT.2100-0 ICtCp", 0.0f, 0.0f }, // FIXME: This can't represent using Kr and Kb.
+};
+
+static const int avifMatrixCoefficientsTableSize = sizeof(matrixCoefficientsTables) / sizeof(matrixCoefficientsTables[0]);
+
+static avifBool calcYUVInfoFromCICP(const avifImage * image, float coeffs[3])
+{
+    if (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_NCL) {
+        avifColorPrimariesComputeYCoeffs(image->colorPrimaries, coeffs);
+        return AVIF_TRUE;
+    } else {
+        for (int i = 0; i < avifMatrixCoefficientsTableSize; ++i) {
+            const struct avifMatrixCoefficientsTable * const table = &matrixCoefficientsTables[i];
+            if (table->matrixCoefficientsEnum == image->matrixCoefficients) {
+                coeffs[0] = table->kr;
+                coeffs[2] = table->kb;
+                coeffs[1] = 1.0f - coeffs[0] - coeffs[2];
+                return AVIF_TRUE;
+            }
+        }
+    }
+    return AVIF_FALSE;
+}
+
+void avifCalcYUVCoefficients(const avifImage * image, float * outR, float * outG, float * outB)
+{
+    // (As of ISO/IEC 23000-22:2019 Amendment 2)
+    // MIAF Section 7.3.6.4 "Colour information property":
+    //
+    // If a coded image has no associated colour property, the default property is defined as having
+    // colour_type equal to 'nclx' with properties as follows:
+    // -   colour_primaries equal to 1,
+    // -   transfer_characteristics equal to 13,
+    // -   matrix_coefficients equal to 5 or 6 (which are functionally identical), and
+    // -   full_range_flag equal to 1.
+    // Only if the colour information property of the image matches these default values, the colour
+    // property may be omitted; all other images shall have an explicitly declared colour space via
+    // association with a property of this type.
+    //
+    // See here for the discussion: https://github.com/AOMediaCodec/av1-avif/issues/77#issuecomment-676526097
+
+    // matrix_coefficients of [5,6] == BT.601:
+    float kr = 0.299f;
+    float kb = 0.114f;
+    float kg = 1.0f - kr - kb;
+
+    float coeffs[3];
+    if (calcYUVInfoFromCICP(image, coeffs)) {
+        kr = coeffs[0];
+        kg = coeffs[1];
+        kb = coeffs[2];
+    }
+
+    *outR = kr;
+    *outG = kg;
+    *outB = kb;
+}
+
+// ---------------------------------------------------------------------------
+// Transfer characteristics
+//
+// Transfer characteristics are defined in ITU-T H.273 https://www.itu.int/rec/T-REC-H.273-201612-S/en
+// with formulas for linear to gamma conversion in Table 3.
+// This is based on tongyuantongyu's implementation in https://github.com/AOMediaCodec/libavif/pull/444
+// with some fixes/changes in the first commit:
+// - Fixed 5 transfer curves where toLinear and toGamma functions were swapped (470M, 470BG, Log100,
+//   Log100Sqrt10 and SMPTE428)
+// - 'avifToLinearLog100' and 'avifToLinearLog100Sqrt10' were modified to return the middle of the
+//   range of linear values that are gamma-encoded to 0.0 in order to reduce the max round trip error,
+//   based on vrabaud's change in
+//   https://chromium.googlesource.com/webm/libwebp/+/25d94f473b10882b8bee9288d00539001b692042
+// - In this file, PQ and HLG return "extended SDR" linear values in [0.0, 10000/203] and
+//   [0.0, 1000/203] respectively, where a value of 1.0 means SDR white brightness (203 nits), and any
+//   value above 1.0 is brigther.
+// See git history for further changes.
+
+struct avifTransferCharacteristicsTable
+{
+    avifTransferCharacteristics transferCharacteristicsEnum;
+    const char * name;
+    avifTransferFunction toLinear;
+    avifTransferFunction toGamma;
+};
+
+static float avifToLinear709(float gamma)
+{
+    if (gamma < 0.0f) {
+        return 0.0f;
+    } else if (gamma < 4.5f * 0.018053968510807f) {
+        return gamma / 4.5f;
+    } else if (gamma < 1.0f) {
+        return powf((gamma + 0.09929682680944f) / 1.09929682680944f, 1.0f / 0.45f);
+    } else {
+        return 1.0f;
+    }
+}
+
+static float avifToGamma709(float linear)
+{
+    if (linear < 0.0f) {
+        return 0.0f;
+    } else if (linear < 0.018053968510807f) {
+        return linear * 4.5f;
+    } else if (linear < 1.0f) {
+        return 1.09929682680944f * powf(linear, 0.45f) - 0.09929682680944f;
+    } else {
+        return 1.0f;
+    }
+}
+
+static float avifToLinear470M(float gamma)
+{
+    return powf(AVIF_CLAMP(gamma, 0.0f, 1.0f), 2.2f);
+}
+
+static float avifToGamma470M(float linear)
+{
+    return powf(AVIF_CLAMP(linear, 0.0f, 1.0f), 1.0f / 2.2f);
+}
+
+static float avifToLinear470BG(float gamma)
+{
+    return powf(AVIF_CLAMP(gamma, 0.0f, 1.0f), 2.8f);
+}
+
+static float avifToGamma470BG(float linear)
+{
+    return powf(AVIF_CLAMP(linear, 0.0f, 1.0f), 1.0f / 2.8f);
+}
+
+static float avifToLinearSMPTE240(float gamma)
+{
+    if (gamma < 0.0f) {
+        return 0.0f;
+    } else if (gamma < 4.0f * 0.022821585529445f) {
+        return gamma / 4.0f;
+    } else if (gamma < 1.0f) {
+        return powf((gamma + 0.111572195921731f) / 1.111572195921731f, 1.0f / 0.45f);
+    } else {
+        return 1.0f;
+    }
+}
+
+static float avifToGammaSMPTE240(float linear)
+{
+    if (linear < 0.0f) {
+        return 0.0f;
+    } else if (linear < 0.022821585529445f) {
+        return linear * 4.0f;
+    } else if (linear < 1.0f) {
+        return 1.111572195921731f * powf(linear, 0.45f) - 0.111572195921731f;
+    } else {
+        return 1.0f;
+    }
+}
+
+static float avifToGammaLinear(float gamma)
+{
+    return AVIF_CLAMP(gamma, 0.0f, 1.0f);
+}
+
+static float avifToLinearLog100(float gamma)
+{
+    // The function is non-bijective so choose the middle of [0, 0.01].
+    const float mid_interval = 0.01f / 2.f;
+    return (gamma <= 0.0f) ? mid_interval : powf(10.0f, 2.f * (AVIF_MIN(gamma, 1.f) - 1.0f));
+}
+
+static float avifToGammaLog100(float linear)
+{
+    return linear <= 0.01f ? 0.0f : 1.0f + log10f(AVIF_MIN(linear, 1.0f)) / 2.0f;
+}
+
+static float avifToLinearLog100Sqrt10(float gamma)
+{
+    // The function is non-bijective so choose the middle of [0, 0.00316227766f].
+    const float mid_interval = 0.00316227766f / 2.f;
+    return (gamma <= 0.0f) ? mid_interval : powf(10.0f, 2.5f * (AVIF_MIN(gamma, 1.f) - 1.0f));
+}
+
+static float avifToGammaLog100Sqrt10(float linear)
+{
+    return linear <= 0.00316227766f ? 0.0f : 1.0f + log10f(AVIF_MIN(linear, 1.0f)) / 2.5f;
+}
+
+static float avifToLinearIEC61966(float gamma)
+{
+    if (gamma < -4.5f * 0.018053968510807f) {
+        return powf((-gamma + 0.09929682680944f) / -1.09929682680944f, 1.0f / 0.45f);
+    } else if (gamma < 4.5f * 0.018053968510807f) {
+        return gamma / 4.5f;
+    } else {
+        return powf((gamma + 0.09929682680944f) / 1.09929682680944f, 1.0f / 0.45f);
+    }
+}
+
+static float avifToGammaIEC61966(float linear)
+{
+    if (linear < -0.018053968510807f) {
+        return -1.09929682680944f * powf(-linear, 0.45f) + 0.09929682680944f;
+    } else if (linear < 0.018053968510807f) {
+        return linear * 4.5f;
+    } else {
+        return 1.09929682680944f * powf(linear, 0.45f) - 0.09929682680944f;
+    }
+}
+
+static float avifToLinearBT1361(float gamma)
+{
+    if (gamma < -0.25f) {
+        return -0.25f;
+    } else if (gamma < 0.0f) {
+        return powf((gamma - 0.02482420670236f) / -0.27482420670236f, 1.0f / 0.45f) / -4.0f;
+    } else if (gamma < 4.5f * 0.018053968510807f) {
+        return gamma / 4.5f;
+    } else if (gamma < 1.0f) {
+        return powf((gamma + 0.09929682680944f) / 1.09929682680944f, 1.0f / 0.45f);
+    } else {
+        return 1.0f;
+    }
+}
+
+static float avifToGammaBT1361(float linear)
+{
+    if (linear < -0.25f) {
+        return -0.25f;
+    } else if (linear < 0.0f) {
+        return -0.27482420670236f * powf(-4.0f * linear, 0.45f) + 0.02482420670236f;
+    } else if (linear < 0.018053968510807f) {
+        return linear * 4.5f;
+    } else if (linear < 1.0f) {
+        return 1.09929682680944f * powf(linear, 0.45f) - 0.09929682680944f;
+    } else {
+        return 1.0f;
+    }
+}
+
+static float avifToLinearSRGB(float gamma)
+{
+    if (gamma < 0.0f) {
+        return 0.0f;
+    } else if (gamma < 12.92f * 0.0030412825601275209f) {
+        return gamma / 12.92f;
+    } else if (gamma < 1.0f) {
+        return powf((gamma + 0.0550107189475866f) / 1.0550107189475866f, 2.4f);
+    } else {
+        return 1.0f;
+    }
+}
+
+static float avifToGammaSRGB(float linear)
+{
+    if (linear < 0.0f) {
+        return 0.0f;
+    } else if (linear < 0.0030412825601275209f) {
+        return linear * 12.92f;
+    } else if (linear < 1.0f) {
+        return 1.0550107189475866f * powf(linear, 1.0f / 2.4f) - 0.0550107189475866f;
+    } else {
+        return 1.0f;
+    }
+}
+
+#define PQ_MAX_NITS 10000.0f
+#define HLG_PEAK_LUMINANCE_NITS 1000.0f
+#define SDR_WHITE_NITS 203.0f
+
+static float avifToLinearPQ(float gamma)
+{
+    if (gamma > 0.0f) {
+        const float powGamma = powf(gamma, 1.0f / 78.84375f);
+        const float num = AVIF_MAX(powGamma - 0.8359375f, 0.0f);
+        const float den = AVIF_MAX(18.8515625f - 18.6875f * powGamma, FLT_MIN);
+        const float linear = powf(num / den, 1.0f / 0.1593017578125f);
+        // Scale so that SDR white is 1.0 (extended SDR).
+        return linear * PQ_MAX_NITS / SDR_WHITE_NITS;
+    } else {
+        return 0.0f;
+    }
+}
+
+static float avifToGammaPQ(float linear)
+{
+    if (linear > 0.0f) {
+        // Scale from extended SDR range to [0.0, 1.0].
+        linear = AVIF_CLAMP(linear * SDR_WHITE_NITS / PQ_MAX_NITS, 0.0f, 1.0f);
+        const float powLinear = powf(linear, 0.1593017578125f);
+        const float num = 0.1640625f * powLinear - 0.1640625f;
+        const float den = 1.0f + 18.6875f * powLinear;
+        return powf(1.0f + num / den, 78.84375f);
+    } else {
+        return 0.0f;
+    }
+}
+
+static float avifToLinearSMPTE428(float gamma)
+{
+    return powf(AVIF_MAX(gamma, 0.0f), 2.6f) / 0.91655527974030934f;
+}
+
+static float avifToGammaSMPTE428(float linear)
+{
+    return powf(0.91655527974030934f * AVIF_MAX(linear, 0.0f), 1.0f / 2.6f);
+}
+
+// Formula from ITU-R BT.2100-2
+// Assumes Lw=1000 (max display luminance in nits).
+// For simplicity, approximates Ys (which should be 0.2627*r+0.6780*g+0.0593*b)
+// to the input value (r, g, or b depending on the current channel).
+static float avifToLinearHLG(float gamma)
+{
+    // Inverse OETF followed by the OOTF, see Table 5 in ITU-R BT.2100-2 page 7.
+    // Note that this differs slightly from  ITU-T H.273 which doesn't use the OOTF.
+    if (gamma < 0.0f) {
+        return 0.0f;
+    }
+    float linear = 0.0f;
+    if (gamma <= 0.5f) {
+        linear = powf((gamma * gamma) * (1.0f / 3.0f), 1.2f);
+    } else {
+        linear = powf((expf((gamma - 0.55991073f) / 0.17883277f) + 0.28466892f) / 12.0f, 1.2f);
+    }
+    // Scale so that SDR white is 1.0 (extended SDR).
+    return linear * HLG_PEAK_LUMINANCE_NITS / SDR_WHITE_NITS;
+}
+
+static float avifToGammaHLG(float linear)
+{
+    // Scale from extended SDR range to [0.0, 1.0].
+    linear = AVIF_CLAMP(linear * SDR_WHITE_NITS / HLG_PEAK_LUMINANCE_NITS, 0.0f, 1.0f);
+    // Inverse OOTF followed by OETF see Table 5 and Note 5i in ITU-R BT.2100-2 page 7-8.
+    linear = powf(linear, 1.0f / 1.2f);
+    if (linear < 0.0f) {
+        return 0.0f;
+    } else if (linear <= (1.0f / 12.0f)) {
+        return sqrtf(3.0f * linear);
+    } else {
+        return 0.17883277f * logf(12.0f * linear - 0.28466892f) + 0.55991073f;
+    }
+}
+
+static const struct avifTransferCharacteristicsTable transferCharacteristicsTables[] = {
+    { AVIF_TRANSFER_CHARACTERISTICS_BT709, "BT.709", avifToLinear709, avifToGamma709 },
+    { AVIF_TRANSFER_CHARACTERISTICS_BT470M, "BT.470-6 System M", avifToLinear470M, avifToGamma470M },
+    { AVIF_TRANSFER_CHARACTERISTICS_BT470BG, "BT.470-6 System BG", avifToLinear470BG, avifToGamma470BG },
+    { AVIF_TRANSFER_CHARACTERISTICS_BT601, "BT.601", avifToLinear709, avifToGamma709 },
+    { AVIF_TRANSFER_CHARACTERISTICS_SMPTE240, "SMPTE 240M", avifToLinearSMPTE240, avifToGammaSMPTE240 },
+    { AVIF_TRANSFER_CHARACTERISTICS_LINEAR, "Linear", avifToGammaLinear, avifToGammaLinear },
+    { AVIF_TRANSFER_CHARACTERISTICS_LOG100, "100:1 Log", avifToLinearLog100, avifToGammaLog100 },
+    { AVIF_TRANSFER_CHARACTERISTICS_LOG100_SQRT10, "100sqrt(10):1 Log", avifToLinearLog100Sqrt10, avifToGammaLog100Sqrt10 },
+    { AVIF_TRANSFER_CHARACTERISTICS_IEC61966, "IEC 61966-2-4", avifToLinearIEC61966, avifToGammaIEC61966 },
+    { AVIF_TRANSFER_CHARACTERISTICS_BT1361, "BT.1361", avifToLinearBT1361, avifToGammaBT1361 },
+    { AVIF_TRANSFER_CHARACTERISTICS_SRGB, "sRGB", avifToLinearSRGB, avifToGammaSRGB },
+    { AVIF_TRANSFER_CHARACTERISTICS_BT2020_10BIT, "10bit BT.2020", avifToLinear709, avifToGamma709 },
+    { AVIF_TRANSFER_CHARACTERISTICS_BT2020_12BIT, "12bit BT.2020", avifToLinear709, avifToGamma709 },
+    { AVIF_TRANSFER_CHARACTERISTICS_SMPTE2084, "SMPTE ST 2084 (PQ)", avifToLinearPQ, avifToGammaPQ },
+    { AVIF_TRANSFER_CHARACTERISTICS_SMPTE428, "SMPTE ST 428-1", avifToLinearSMPTE428, avifToGammaSMPTE428 },
+    { AVIF_TRANSFER_CHARACTERISTICS_HLG, "ARIB STD-B67 (HLG)", avifToLinearHLG, avifToGammaHLG }
+};
+
+static const int avifTransferCharacteristicsTableSize =
+    sizeof(transferCharacteristicsTables) / sizeof(transferCharacteristicsTables[0]);
+
+avifTransferFunction avifTransferCharacteristicsGetGammaToLinearFunction(avifTransferCharacteristics atc)
+{
+    for (int i = 0; i < avifTransferCharacteristicsTableSize; ++i) {
+        const struct avifTransferCharacteristicsTable * const table = &transferCharacteristicsTables[i];
+        if (table->transferCharacteristicsEnum == atc) {
+            return table->toLinear;
+        }
+    }
+    return avifToLinear709; // Provide a reasonable default.
+}
+
+avifTransferFunction avifTransferCharacteristicsGetLinearToGammaFunction(avifTransferCharacteristics atc)
+{
+    for (int i = 0; i < avifTransferCharacteristicsTableSize; ++i) {
+        const struct avifTransferCharacteristicsTable * const table = &transferCharacteristicsTables[i];
+        if (table->transferCharacteristicsEnum == atc) {
+            return table->toGamma;
+        }
+    }
+    return avifToGamma709; // Provide a reasonable default.
+}
+
+void avifColorPrimariesComputeYCoeffs(avifColorPrimaries colorPrimaries, float coeffs[3])
+{
+    float primaries[8];
+    avifColorPrimariesGetValues(colorPrimaries, primaries);
+    float const rX = primaries[0];
+    float const rY = primaries[1];
+    float const gX = primaries[2];
+    float const gY = primaries[3];
+    float const bX = primaries[4];
+    float const bY = primaries[5];
+    float const wX = primaries[6];
+    float const wY = primaries[7];
+    float const rZ = 1.0f - (rX + rY); // (Eq. 34)
+    float const gZ = 1.0f - (gX + gY); // (Eq. 35)
+    float const bZ = 1.0f - (bX + bY); // (Eq. 36)
+    float const wZ = 1.0f - (wX + wY); // (Eq. 37)
+    float const kr = (rY * (wX * (gY * bZ - bY * gZ) + wY * (bX * gZ - gX * bZ) + wZ * (gX * bY - bX * gY))) /
+                     (wY * (rX * (gY * bZ - bY * gZ) + gX * (bY * rZ - rY * bZ) + bX * (rY * gZ - gY * rZ)));
+    // (Eq. 32)
+    float const kb = (bY * (wX * (rY * gZ - gY * rZ) + wY * (gX * rZ - rX * gZ) + wZ * (rX * gY - gX * rY))) /
+                     (wY * (rX * (gY * bZ - bY * gZ) + gX * (bY * rZ - rY * bZ) + bX * (rY * gZ - gY * rZ)));
+    // (Eq. 33)
+    coeffs[0] = kr;
+    coeffs[2] = kb;
+    coeffs[1] = 1.0f - coeffs[0] - coeffs[2];
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/compliance.cc b/pxr/imaging/plugin/hioAvif/AVIF/src/compliance.cc
new file mode 100644
index 0000000000..c069d807fe
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/compliance.cc
@@ -0,0 +1,54 @@
+// Copyright 2023 Google LLC
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+// From ../ext/ComplianceWarden/src/utils/
+#include "box_reader_impl.h"
+#include "spec.h"
+
+bool checkComplianceStd(Box const & file, SpecDesc const * spec);
+
+SpecDesc const * specFind(const char * name);
+std::vector<SpecDesc const *> & g_allSpecs();
+extern const SpecDesc * const globalSpecAvif;
+extern const SpecDesc * const globalSpecAv1Hdr10plus;
+extern const SpecDesc * const globalSpecHeif;
+extern const SpecDesc * const globalSpecIsobmff;
+extern const SpecDesc * const globalSpecMiaf;
+
+extern "C" avifResult avifIsCompliant(const uint8_t * data, size_t size)
+{
+    // See compliance_warden.sh.
+    if (g_allSpecs().empty()) {
+        registerSpec(globalSpecAvif);
+        registerSpec(globalSpecAv1Hdr10plus);
+        registerSpec(globalSpecHeif);
+        registerSpec(globalSpecIsobmff);
+        registerSpec(globalSpecMiaf);
+    }
+
+    // Inspired from ext/ComplianceWarden/src/app/cw.cpp
+    BoxReader topReader;
+    for (char sym : { 'f', 'i', 'l', 'e', '.', 'a', 'v', 'i', 'f' }) {
+        // Setting made-up file name (letter by letter).
+        topReader.myBox.syms.push_back({ "filename", static_cast<int64_t>(sym), 8 });
+    }
+    AVIF_CHECKERR(size <= std::numeric_limits<int>::max(), AVIF_RESULT_INVALID_ARGUMENT);
+    topReader.br = { const_cast<uint8_t *>(data), static_cast<int>(size) };
+    topReader.myBox.original = const_cast<uint8_t *>(data);
+    topReader.myBox.position = 0;
+    topReader.myBox.size = size;
+    topReader.myBox.fourcc = FOURCC("root");
+    topReader.specs = { specFind("avif") };
+    AVIF_CHECKERR(topReader.specs[0] != nullptr, AVIF_RESULT_UNKNOWN_ERROR);
+    auto parseFunc = getParseFunction(topReader.myBox.fourcc);
+    parseFunc(&topReader);
+    // gpac/ComplianceWarden will print the formatted result page to stdout, warnings and errors inclusive.
+    AVIF_CHECKERR(!checkComplianceStd(topReader.myBox, topReader.specs[0]), AVIF_RESULT_BMFF_PARSE_FAILED);
+    return AVIF_RESULT_OK;
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/diag.c b/pxr/imaging/plugin/hioAvif/AVIF/src/diag.c
new file mode 100644
index 0000000000..ae67db081e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/diag.c
@@ -0,0 +1,34 @@
+// Copyright 2021 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+void avifDiagnosticsClearError(avifDiagnostics * diag)
+{
+    *diag->error = '\0';
+}
+
+#ifdef __clang__
+__attribute__((__format__(__printf__, 2, 3)))
+#endif
+void avifDiagnosticsPrintf(avifDiagnostics * diag, const char * format, ...)
+{
+    if (!diag) {
+        // It is possible this is NULL (e.g. calls to avifPeekCompatibleFileType())
+        return;
+    }
+    if (*diag->error) {
+        // There is already a detailed error set.
+        return;
+    }
+
+    va_list args;
+    va_start(args, format);
+    vsnprintf(diag->error, AVIF_DIAGNOSTICS_ERROR_BUFFER_SIZE, format, args);
+    diag->error[AVIF_DIAGNOSTICS_ERROR_BUFFER_SIZE - 1] = '\0';
+    va_end(args);
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/exif.c b/pxr/imaging/plugin/hioAvif/AVIF/src/exif.c
new file mode 100644
index 0000000000..2f4c96c69c
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/exif.c
@@ -0,0 +1,152 @@
+// Copyright 2022 Google LLC
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <stdint.h>
+#include <string.h>
+
+avifResult avifGetExifTiffHeaderOffset(const uint8_t * exif, size_t exifSize, size_t * offset)
+{
+    const uint8_t tiffHeaderBE[4] = { 'M', 'M', 0, 42 };
+    const uint8_t tiffHeaderLE[4] = { 'I', 'I', 42, 0 };
+    exifSize = AVIF_MIN(exifSize, UINT32_MAX);
+    for (*offset = 0; *offset + 4 < exifSize; ++*offset) {
+        if (!memcmp(&exif[*offset], tiffHeaderBE, 4) || !memcmp(&exif[*offset], tiffHeaderLE, 4)) {
+            return AVIF_RESULT_OK;
+        }
+    }
+    // Couldn't find the TIFF header
+    return AVIF_RESULT_INVALID_EXIF_PAYLOAD;
+}
+
+// Returns the offset to the Exif 8-bit orientation value and AVIF_RESULT_OK, or an error.
+// If the offset is set to exifSize, there was no parsing error but no orientation tag was found.
+avifResult avifGetExifOrientationOffset(const uint8_t * exif, size_t exifSize, size_t * offset)
+{
+    const avifResult result = avifGetExifTiffHeaderOffset(exif, exifSize, offset);
+    if (result != AVIF_RESULT_OK) {
+        // Couldn't find the TIFF header
+        return result;
+    }
+
+    avifROData raw = { exif + *offset, exifSize - *offset };
+    const avifBool littleEndian = (raw.data[0] == 'I');
+    avifROStream stream;
+    avifROStreamStart(&stream, &raw, NULL, NULL);
+
+    // TIFF Header
+    uint32_t offsetTo0thIfd;
+    if (!avifROStreamSkip(&stream, 4) || // Skip tiffHeaderBE or tiffHeaderLE.
+        !avifROStreamReadU32Endianness(&stream, &offsetTo0thIfd, littleEndian)) {
+        return AVIF_RESULT_INVALID_EXIF_PAYLOAD;
+    }
+
+    avifROStreamSetOffset(&stream, offsetTo0thIfd);
+    uint16_t fieldCount;
+    if (!avifROStreamReadU16Endianness(&stream, &fieldCount, littleEndian)) {
+        return AVIF_RESULT_INVALID_EXIF_PAYLOAD;
+    }
+    for (uint16_t field = 0; field < fieldCount; ++field) { // for each field interoperability array
+        uint16_t tag;
+        uint16_t type;
+        uint32_t count;
+        uint16_t firstHalfOfValueOffset;
+        if (!avifROStreamReadU16Endianness(&stream, &tag, littleEndian) || !avifROStreamReadU16Endianness(&stream, &type, littleEndian) ||
+            !avifROStreamReadU32Endianness(&stream, &count, littleEndian) ||
+            !avifROStreamReadU16Endianness(&stream, &firstHalfOfValueOffset, littleEndian) || !avifROStreamSkip(&stream, 2)) {
+            return AVIF_RESULT_INVALID_EXIF_PAYLOAD;
+        }
+        // Orientation attribute according to JEITA CP-3451C section 4.6.4 (TIFF Rev. 6.0 Attribute Information):
+        const uint16_t shortType = 0x03;
+        if (tag == 0x0112 && type == shortType && count == 0x01) {
+            // Only consider non-reserved orientation values, so that it is known that
+            // the most meaningful byte of firstHalfOfValueOffset is 0.
+            if (firstHalfOfValueOffset >= 1 && firstHalfOfValueOffset <= 8) {
+                // Offset to the least meaningful byte of firstHalfOfValueOffset.
+                *offset += avifROStreamOffset(&stream) - (littleEndian ? 4 : 3);
+                return AVIF_RESULT_OK;
+            }
+        }
+    }
+    // Orientation is in the 0th IFD, so no need to parse the following ones.
+
+    *offset = exifSize; // Signal missing orientation tag in valid Exif payload.
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifImageExtractExifOrientationToIrotImir(avifImage * image)
+{
+    const avifTransformFlags otherFlags = image->transformFlags & ~(AVIF_TRANSFORM_IROT | AVIF_TRANSFORM_IMIR);
+    size_t offset;
+    const avifResult result = avifGetExifOrientationOffset(image->exif.data, image->exif.size, &offset);
+    if (result != AVIF_RESULT_OK) {
+        return result;
+    }
+    if (offset < image->exif.size) {
+        const uint8_t orientation = image->exif.data[offset];
+        // Mapping from Exif orientation as defined in JEITA CP-3451C section 4.6.4.A Orientation
+        // to irot and imir boxes as defined in HEIF ISO/IEC 28002-12:2021 sections 6.5.10 and 6.5.12.
+        switch (orientation) {
+            case 1: // The 0th row is at the visual top of the image, and the 0th column is the visual left-hand side.
+                image->transformFlags = otherFlags;
+                image->irot.angle = 0; // ignored
+                image->imir.axis = 0;  // ignored
+                return AVIF_RESULT_OK;
+            case 2: // The 0th row is at the visual top of the image, and the 0th column is the visual right-hand side.
+                image->transformFlags = otherFlags | AVIF_TRANSFORM_IMIR;
+                image->irot.angle = 0; // ignored
+                image->imir.axis = 1;
+                return AVIF_RESULT_OK;
+            case 3: // The 0th row is at the visual bottom of the image, and the 0th column is the visual right-hand side.
+                image->transformFlags = otherFlags | AVIF_TRANSFORM_IROT;
+                image->irot.angle = 2;
+                image->imir.axis = 0; // ignored
+                return AVIF_RESULT_OK;
+            case 4: // The 0th row is at the visual bottom of the image, and the 0th column is the visual left-hand side.
+                image->transformFlags = otherFlags | AVIF_TRANSFORM_IMIR;
+                image->irot.angle = 0; // ignored
+                image->imir.axis = 0;
+                return AVIF_RESULT_OK;
+            case 5: // The 0th row is the visual left-hand side of the image, and the 0th column is the visual top.
+                image->transformFlags = otherFlags | AVIF_TRANSFORM_IROT | AVIF_TRANSFORM_IMIR;
+                image->irot.angle = 1; // applied before imir according to MIAF spec ISO/IEC 28002-12:2021 - section 7.3.6.7
+                image->imir.axis = 0;
+                return AVIF_RESULT_OK;
+            case 6: // The 0th row is the visual right-hand side of the image, and the 0th column is the visual top.
+                image->transformFlags = otherFlags | AVIF_TRANSFORM_IROT;
+                image->irot.angle = 3;
+                image->imir.axis = 0; // ignored
+                return AVIF_RESULT_OK;
+            case 7: // The 0th row is the visual right-hand side of the image, and the 0th column is the visual bottom.
+                image->transformFlags = otherFlags | AVIF_TRANSFORM_IROT | AVIF_TRANSFORM_IMIR;
+                image->irot.angle = 3; // applied before imir according to MIAF spec ISO/IEC 28002-12:2021 - section 7.3.6.7
+                image->imir.axis = 0;
+                return AVIF_RESULT_OK;
+            case 8: // The 0th row is the visual left-hand side of the image, and the 0th column is the visual bottom.
+                image->transformFlags = otherFlags | AVIF_TRANSFORM_IROT;
+                image->irot.angle = 1;
+                image->imir.axis = 0; // ignored
+                return AVIF_RESULT_OK;
+            default: // reserved
+                break;
+        }
+    }
+
+    // The orientation tag is not mandatory (only recommended) according to JEITA CP-3451C section 4.6.8.A.
+    // The default value is 1 if the orientation tag is missing, meaning:
+    //   The 0th row is at the visual top of the image, and the 0th column is the visual left-hand side.
+    image->transformFlags = otherFlags;
+    image->irot.angle = 0; // ignored
+    image->imir.axis = 0;  // ignored
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifImageSetMetadataExif(avifImage * image, const uint8_t * exif, size_t exifSize)
+{
+    AVIF_CHECKRES(avifRWDataSet(&image->exif, exif, exifSize));
+    // Ignore any Exif parsing failure.
+    // TODO(wtc): Decide whether to ignore or return Exif parsing failures.
+    (void)avifImageExtractExifOrientationToIrotImir(image);
+    return AVIF_RESULT_OK;
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/io.c b/pxr/imaging/plugin/hioAvif/AVIF/src/io.c
new file mode 100644
index 0000000000..4f40fb79f3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/io.c
@@ -0,0 +1,168 @@
+// Copyright 2020 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+
+void avifIODestroy(avifIO * io)
+{
+    if (io && io->destroy) {
+        io->destroy(io);
+    }
+}
+
+// --------------------------------------------------------------------------------------
+// avifIOMemoryReader
+
+typedef struct avifIOMemoryReader
+{
+    avifIO io; // this must be the first member for easy casting to avifIO*
+    avifROData rodata;
+} avifIOMemoryReader;
+
+static avifResult avifIOMemoryReaderRead(struct avifIO * io, uint32_t readFlags, uint64_t offset, size_t size, avifROData * out)
+{
+    // printf("avifIOMemoryReaderRead offset %" PRIu64 " size %zu\n", offset, size);
+
+    if (readFlags != 0) {
+        // Unsupported readFlags
+        return AVIF_RESULT_IO_ERROR;
+    }
+
+    avifIOMemoryReader * reader = (avifIOMemoryReader *)io;
+
+    // Sanitize/clamp incoming request
+    if (offset > reader->rodata.size) {
+        // The offset is past the end of the buffer.
+        return AVIF_RESULT_IO_ERROR;
+    }
+    uint64_t availableSize = reader->rodata.size - offset;
+    if (size > availableSize) {
+        size = (size_t)availableSize;
+    }
+
+    out->data = reader->rodata.data + offset;
+    out->size = size;
+    return AVIF_RESULT_OK;
+}
+
+static void avifIOMemoryReaderDestroy(struct avifIO * io)
+{
+    avifFree(io);
+}
+
+avifIO * avifIOCreateMemoryReader(const uint8_t * data, size_t size)
+{
+    avifIOMemoryReader * reader = avifAlloc(sizeof(avifIOMemoryReader));
+    if (reader == NULL) {
+        return NULL;
+    }
+    memset(reader, 0, sizeof(avifIOMemoryReader));
+    reader->io.destroy = avifIOMemoryReaderDestroy;
+    reader->io.read = avifIOMemoryReaderRead;
+    reader->io.sizeHint = size;
+    reader->io.persistent = AVIF_TRUE;
+    reader->rodata.data = data;
+    reader->rodata.size = size;
+    return (avifIO *)reader;
+}
+
+// --------------------------------------------------------------------------------------
+// avifIOFileReader
+
+typedef struct avifIOFileReader
+{
+    avifIO io; // this must be the first member for easy casting to avifIO*
+    avifRWData buffer;
+    FILE * f;
+} avifIOFileReader;
+
+static avifResult avifIOFileReaderRead(struct avifIO * io, uint32_t readFlags, uint64_t offset, size_t size, avifROData * out)
+{
+    // printf("avifIOFileReaderRead offset %" PRIu64 " size %zu\n", offset, size);
+
+    if (readFlags != 0) {
+        // Unsupported readFlags
+        return AVIF_RESULT_IO_ERROR;
+    }
+
+    avifIOFileReader * reader = (avifIOFileReader *)io;
+
+    // Sanitize/clamp incoming request
+    if (offset > reader->io.sizeHint) {
+        // The offset is past the EOF.
+        return AVIF_RESULT_IO_ERROR;
+    }
+    uint64_t availableSize = reader->io.sizeHint - offset;
+    if (size > availableSize) {
+        size = (size_t)availableSize;
+    }
+
+    if (size > 0) {
+        if (offset > LONG_MAX) {
+            return AVIF_RESULT_IO_ERROR;
+        }
+        if (reader->buffer.size < size) {
+            AVIF_CHECKRES(avifRWDataRealloc(&reader->buffer, size));
+        }
+        if (fseek(reader->f, (long)offset, SEEK_SET) != 0) {
+            return AVIF_RESULT_IO_ERROR;
+        }
+        size_t bytesRead = fread(reader->buffer.data, 1, size, reader->f);
+        if (size != bytesRead) {
+            if (ferror(reader->f)) {
+                return AVIF_RESULT_IO_ERROR;
+            }
+            size = bytesRead;
+        }
+    }
+
+    out->data = reader->buffer.data;
+    out->size = size;
+    return AVIF_RESULT_OK;
+}
+
+static void avifIOFileReaderDestroy(struct avifIO * io)
+{
+    avifIOFileReader * reader = (avifIOFileReader *)io;
+    fclose(reader->f);
+    avifRWDataFree(&reader->buffer);
+    avifFree(io);
+}
+
+avifIO * avifIOCreateFileReader(const char * filename)
+{
+    FILE * f = fopen(filename, "rb");
+    if (!f) {
+        return NULL;
+    }
+
+    fseek(f, 0, SEEK_END);
+    long fileSize = ftell(f);
+    if (fileSize < 0) {
+        fclose(f);
+        return NULL;
+    }
+    fseek(f, 0, SEEK_SET);
+
+    avifIOFileReader * reader = avifAlloc(sizeof(avifIOFileReader));
+    if (!reader) {
+        fclose(f);
+        return NULL;
+    }
+    memset(reader, 0, sizeof(avifIOFileReader));
+    reader->f = f;
+    reader->io.destroy = avifIOFileReaderDestroy;
+    reader->io.read = avifIOFileReaderRead;
+    reader->io.sizeHint = (uint64_t)fileSize;
+    reader->io.persistent = AVIF_FALSE;
+    if (avifRWDataRealloc(&reader->buffer, 1024) != AVIF_RESULT_OK) {
+        avifFree(reader);
+        fclose(f);
+        return NULL;
+    }
+    return (avifIO *)reader;
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/mem.c b/pxr/imaging/plugin/hioAvif/AVIF/src/mem.c
new file mode 100644
index 0000000000..2a9b346410
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/mem.c
@@ -0,0 +1,18 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h"
+
+#include <assert.h>
+#include <stdlib.h>
+
+void * avifAlloc(size_t size)
+{
+    assert(size != 0); // Implementation-defined. See https://en.cppreference.com/w/cpp/memory/c/malloc
+    return malloc(size);
+}
+
+void avifFree(void * p)
+{
+    free(p);
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/rawdata.c b/pxr/imaging/plugin/hioAvif/AVIF/src/rawdata.c
new file mode 100644
index 0000000000..7525909605
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/rawdata.c
@@ -0,0 +1,39 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <string.h>
+
+avifResult avifRWDataRealloc(avifRWData * raw, size_t newSize)
+{
+    if (raw->size != newSize) {
+        uint8_t * newData = avifAlloc(newSize);
+        AVIF_CHECKERR(newData, AVIF_RESULT_OUT_OF_MEMORY);
+        if (raw->size && newSize) {
+            memcpy(newData, raw->data, AVIF_MIN(raw->size, newSize));
+        }
+        avifFree(raw->data);
+        raw->data = newData;
+        raw->size = newSize;
+    }
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRWDataSet(avifRWData * raw, const uint8_t * data, size_t len)
+{
+    if (len) {
+        AVIF_CHECKRES(avifRWDataRealloc(raw, len));
+        memcpy(raw->data, data, len);
+    } else {
+        avifRWDataFree(raw);
+    }
+    return AVIF_RESULT_OK;
+}
+
+void avifRWDataFree(avifRWData * raw)
+{
+    avifFree(raw->data);
+    raw->data = NULL;
+    raw->size = 0;
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/read.c b/pxr/imaging/plugin/hioAvif/AVIF/src/read.c
new file mode 100644
index 0000000000..bf4ecc8070
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/read.c
@@ -0,0 +1,5425 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <assert.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#define AUXTYPE_SIZE 64
+#define CONTENTTYPE_SIZE 64
+
+// class VisualSampleEntry(codingname) extends SampleEntry(codingname) {
+//     unsigned int(16) pre_defined = 0;
+//     const unsigned int(16) reserved = 0;
+//     unsigned int(32)[3] pre_defined = 0;
+//     unsigned int(16) width;
+//     unsigned int(16) height;
+//     template unsigned int(32) horizresolution = 0x00480000; // 72 dpi
+//     template unsigned int(32) vertresolution = 0x00480000;  // 72 dpi
+//     const unsigned int(32) reserved = 0;
+//     template unsigned int(16) frame_count = 1;
+//     string[32] compressorname;
+//     template unsigned int(16) depth = 0x0018;
+//     int(16) pre_defined = -1;
+//     // other boxes from derived specifications
+//     CleanApertureBox clap;    // optional
+//     PixelAspectRatioBox pasp; // optional
+// }
+static const size_t VISUALSAMPLEENTRY_SIZE = 78;
+
+static const char xmpContentType[] = AVIF_CONTENT_TYPE_XMP;
+static const size_t xmpContentTypeSize = sizeof(xmpContentType);
+
+// The only supported ipma box values for both version and flags are [0,1], so there technically
+// can't be more than 4 unique tuples right now.
+#define MAX_IPMA_VERSION_AND_FLAGS_SEEN 4
+
+// ---------------------------------------------------------------------------
+// AVIF codec type (AV1 or AV2)
+
+static avifCodecType avifGetCodecType(const uint8_t * fourcc)
+{
+    if (!memcmp(fourcc, "av01", 4)) {
+        return AVIF_CODEC_TYPE_AV1;
+    }
+#if defined(AVIF_CODEC_AVM)
+    if (!memcmp(fourcc, "av02", 4)) {
+        return AVIF_CODEC_TYPE_AV2;
+    }
+#endif
+    return AVIF_CODEC_TYPE_UNKNOWN;
+}
+
+static const char * avifGetConfigurationPropertyName(avifCodecType codecType)
+{
+    switch (codecType) {
+        case AVIF_CODEC_TYPE_AV1:
+            return "av1C";
+#if defined(AVIF_CODEC_AVM)
+        case AVIF_CODEC_TYPE_AV2:
+            return "av2C";
+#endif
+        default:
+            assert(AVIF_FALSE);
+            return NULL;
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Box data structures
+
+// ftyp
+typedef struct avifFileType
+{
+    uint8_t majorBrand[4];
+    uint32_t minorVersion;
+    // If not null, points to a memory block of 4 * compatibleBrandsCount bytes.
+    const uint8_t * compatibleBrands;
+    int compatibleBrandsCount;
+} avifFileType;
+
+// ispe
+typedef struct avifImageSpatialExtents
+{
+    uint32_t width;
+    uint32_t height;
+} avifImageSpatialExtents;
+
+// auxC
+typedef struct avifAuxiliaryType
+{
+    char auxType[AUXTYPE_SIZE];
+} avifAuxiliaryType;
+
+// infe mime content_type
+typedef struct avifContentType
+{
+    char contentType[CONTENTTYPE_SIZE];
+} avifContentType;
+
+// colr
+typedef struct avifColourInformationBox
+{
+    avifBool hasICC;
+    uint64_t iccOffset;
+    size_t iccSize;
+
+    avifBool hasNCLX;
+    avifColorPrimaries colorPrimaries;
+    avifTransferCharacteristics transferCharacteristics;
+    avifMatrixCoefficients matrixCoefficients;
+    avifRange range;
+} avifColourInformationBox;
+
+#define MAX_PIXI_PLANE_DEPTHS 4
+typedef struct avifPixelInformationProperty
+{
+    uint8_t planeDepths[MAX_PIXI_PLANE_DEPTHS];
+    uint8_t planeCount;
+} avifPixelInformationProperty;
+
+typedef struct avifOperatingPointSelectorProperty
+{
+    uint8_t opIndex;
+} avifOperatingPointSelectorProperty;
+
+typedef struct avifLayerSelectorProperty
+{
+    uint16_t layerID;
+} avifLayerSelectorProperty;
+
+typedef struct avifAV1LayeredImageIndexingProperty
+{
+    uint32_t layerSize[3];
+} avifAV1LayeredImageIndexingProperty;
+
+// ---------------------------------------------------------------------------
+// Top-level structures
+
+struct avifMeta;
+
+// Temporary storage for ipco/stsd contents until they can be associated and memcpy'd to an avifDecoderItem
+typedef struct avifProperty
+{
+    uint8_t type[4];
+    union
+    {
+        avifImageSpatialExtents ispe;
+        avifAuxiliaryType auxC;
+        avifColourInformationBox colr;
+        avifCodecConfigurationBox av1C; // TODO(yguyon): Rename or add av2C
+        avifPixelAspectRatioBox pasp;
+        avifCleanApertureBox clap;
+        avifImageRotation irot;
+        avifImageMirror imir;
+        avifPixelInformationProperty pixi;
+        avifOperatingPointSelectorProperty a1op;
+        avifLayerSelectorProperty lsel;
+        avifAV1LayeredImageIndexingProperty a1lx;
+        avifContentLightLevelInformationBox clli;
+    } u;
+} avifProperty;
+AVIF_ARRAY_DECLARE(avifPropertyArray, avifProperty, prop);
+
+// Finds the first property of a given type.
+static const avifProperty * avifPropertyArrayFind(const avifPropertyArray * properties, const char * type)
+{
+    for (uint32_t propertyIndex = 0; propertyIndex < properties->count; ++propertyIndex) {
+        avifProperty * prop = &properties->prop[propertyIndex];
+        if (!memcmp(prop->type, type, 4)) {
+            return prop;
+        }
+    }
+    return NULL;
+}
+
+AVIF_ARRAY_DECLARE(avifExtentArray, avifExtent, extent);
+
+// one "item" worth for decoding (all iref, iloc, iprp, etc refer to one of these)
+typedef struct avifDecoderItem
+{
+    uint32_t id;
+    struct avifMeta * meta; // Unowned; A back-pointer for convenience
+    uint8_t type[4];
+    size_t size;
+    avifBool idatStored; // If true, offset is relative to the associated meta box's idat box (iloc construction_method==1)
+    uint32_t width;      // Set from this item's ispe property, if present
+    uint32_t height;     // Set from this item's ispe property, if present
+    avifContentType contentType;
+    avifPropertyArray properties;
+    avifExtentArray extents;       // All extent offsets/sizes
+    avifRWData mergedExtents;      // if set, is a single contiguous block of this item's extents (unused when extents.count == 1)
+    avifBool ownsMergedExtents;    // if true, mergedExtents must be freed when this item is destroyed
+    avifBool partialMergedExtents; // If true, mergedExtents doesn't have all of the item data yet
+    uint32_t thumbnailForID;       // if non-zero, this item is a thumbnail for Item #{thumbnailForID}
+    uint32_t auxForID;             // if non-zero, this item is an auxC plane for Item #{auxForID}
+    uint32_t descForID;            // if non-zero, this item is a content description for Item #{descForID}
+    uint32_t dimgForID;            // if non-zero, this item is a derived image for Item #{dimgForID}
+    uint32_t dimgIdx; // if dimgForId is non-zero, this is the zero-based index of this item in the list of Item #{dimgForID}'s dimg
+    uint32_t premByID; // if non-zero, this item is premultiplied by Item #{premByID}
+    avifBool hasUnsupportedEssentialProperty; // If true, this item cites a property flagged as 'essential' that libavif doesn't support (yet). Ignore the item, if so.
+    avifBool ipmaSeen;    // if true, this item already received a property association
+    avifBool progressive; // if true, this item has progressive layers (a1lx), but does not select a specific layer (the layer_id value in lsel is set to 0xFFFF)
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    avifPixelFormat coniPixelFormat; // Set from the CondensedImageBox, if present (AVIF_PIXEL_FORMAT_NONE otherwise)
+#endif
+} avifDecoderItem;
+AVIF_ARRAY_DECLARE(avifDecoderItemArray, avifDecoderItem, item);
+
+// grid storage
+typedef struct avifImageGrid
+{
+    uint32_t rows;    // Legal range: [1-256]
+    uint32_t columns; // Legal range: [1-256]
+    uint32_t outputWidth;
+    uint32_t outputHeight;
+} avifImageGrid;
+
+// ---------------------------------------------------------------------------
+// avifTrack
+
+typedef struct avifSampleTableChunk
+{
+    uint64_t offset;
+} avifSampleTableChunk;
+AVIF_ARRAY_DECLARE(avifSampleTableChunkArray, avifSampleTableChunk, chunk);
+
+typedef struct avifSampleTableSampleToChunk
+{
+    uint32_t firstChunk;
+    uint32_t samplesPerChunk;
+    uint32_t sampleDescriptionIndex;
+} avifSampleTableSampleToChunk;
+AVIF_ARRAY_DECLARE(avifSampleTableSampleToChunkArray, avifSampleTableSampleToChunk, sampleToChunk);
+
+typedef struct avifSampleTableSampleSize
+{
+    uint32_t size;
+} avifSampleTableSampleSize;
+AVIF_ARRAY_DECLARE(avifSampleTableSampleSizeArray, avifSampleTableSampleSize, sampleSize);
+
+typedef struct avifSampleTableTimeToSample
+{
+    uint32_t sampleCount;
+    uint32_t sampleDelta;
+} avifSampleTableTimeToSample;
+AVIF_ARRAY_DECLARE(avifSampleTableTimeToSampleArray, avifSampleTableTimeToSample, timeToSample);
+
+typedef struct avifSyncSample
+{
+    uint32_t sampleNumber;
+} avifSyncSample;
+AVIF_ARRAY_DECLARE(avifSyncSampleArray, avifSyncSample, syncSample);
+
+typedef struct avifSampleDescription
+{
+    uint8_t format[4];
+    avifPropertyArray properties;
+} avifSampleDescription;
+AVIF_ARRAY_DECLARE(avifSampleDescriptionArray, avifSampleDescription, description);
+
+typedef struct avifSampleTable
+{
+    avifSampleTableChunkArray chunks;
+    avifSampleDescriptionArray sampleDescriptions;
+    avifSampleTableSampleToChunkArray sampleToChunks;
+    avifSampleTableSampleSizeArray sampleSizes;
+    avifSampleTableTimeToSampleArray timeToSamples;
+    avifSyncSampleArray syncSamples;
+    uint32_t allSamplesSize; // If this is non-zero, sampleSizes will be empty and all samples will be this size
+} avifSampleTable;
+
+static void avifSampleTableDestroy(avifSampleTable * sampleTable);
+
+static avifSampleTable * avifSampleTableCreate()
+{
+    avifSampleTable * sampleTable = (avifSampleTable *)avifAlloc(sizeof(avifSampleTable));
+    if (sampleTable == NULL) {
+        return NULL;
+    }
+    memset(sampleTable, 0, sizeof(avifSampleTable));
+    if (!avifArrayCreate(&sampleTable->chunks, sizeof(avifSampleTableChunk), 16) ||
+        !avifArrayCreate(&sampleTable->sampleDescriptions, sizeof(avifSampleDescription), 2) ||
+        !avifArrayCreate(&sampleTable->sampleToChunks, sizeof(avifSampleTableSampleToChunk), 16) ||
+        !avifArrayCreate(&sampleTable->sampleSizes, sizeof(avifSampleTableSampleSize), 16) ||
+        !avifArrayCreate(&sampleTable->timeToSamples, sizeof(avifSampleTableTimeToSample), 16) ||
+        !avifArrayCreate(&sampleTable->syncSamples, sizeof(avifSyncSample), 16)) {
+        avifSampleTableDestroy(sampleTable);
+        return NULL;
+    }
+    return sampleTable;
+}
+
+static void avifSampleTableDestroy(avifSampleTable * sampleTable)
+{
+    avifArrayDestroy(&sampleTable->chunks);
+    for (uint32_t i = 0; i < sampleTable->sampleDescriptions.count; ++i) {
+        avifSampleDescription * description = &sampleTable->sampleDescriptions.description[i];
+        avifArrayDestroy(&description->properties);
+    }
+    avifArrayDestroy(&sampleTable->sampleDescriptions);
+    avifArrayDestroy(&sampleTable->sampleToChunks);
+    avifArrayDestroy(&sampleTable->sampleSizes);
+    avifArrayDestroy(&sampleTable->timeToSamples);
+    avifArrayDestroy(&sampleTable->syncSamples);
+    avifFree(sampleTable);
+}
+
+static uint32_t avifSampleTableGetImageDelta(const avifSampleTable * sampleTable, int imageIndex)
+{
+    int maxSampleIndex = 0;
+    for (uint32_t i = 0; i < sampleTable->timeToSamples.count; ++i) {
+        const avifSampleTableTimeToSample * timeToSample = &sampleTable->timeToSamples.timeToSample[i];
+        maxSampleIndex += timeToSample->sampleCount;
+        if ((imageIndex < maxSampleIndex) || (i == (sampleTable->timeToSamples.count - 1))) {
+            return timeToSample->sampleDelta;
+        }
+    }
+
+    // TODO: fail here?
+    return 1;
+}
+
+static avifCodecType avifSampleTableGetCodecType(const avifSampleTable * sampleTable)
+{
+    for (uint32_t i = 0; i < sampleTable->sampleDescriptions.count; ++i) {
+        const avifCodecType codecType = avifGetCodecType(sampleTable->sampleDescriptions.description[i].format);
+        if (codecType != AVIF_CODEC_TYPE_UNKNOWN) {
+            return codecType;
+        }
+    }
+    return AVIF_CODEC_TYPE_UNKNOWN;
+}
+
+static uint32_t avifCodecConfigurationBoxGetDepth(const avifCodecConfigurationBox * av1C)
+{
+    if (av1C->twelveBit) {
+        return 12;
+    } else if (av1C->highBitdepth) {
+        return 10;
+    }
+    return 8;
+}
+
+// This is used as a hint to validating the clap box in avifDecoderItemValidateProperties.
+static avifPixelFormat avifCodecConfigurationBoxGetFormat(const avifCodecConfigurationBox * av1C)
+{
+    if (av1C->monochrome) {
+        return AVIF_PIXEL_FORMAT_YUV400;
+    } else if (av1C->chromaSubsamplingY == 1) {
+        return AVIF_PIXEL_FORMAT_YUV420;
+    } else if (av1C->chromaSubsamplingX == 1) {
+        return AVIF_PIXEL_FORMAT_YUV422;
+    }
+    return AVIF_PIXEL_FORMAT_YUV444;
+}
+
+static const avifPropertyArray * avifSampleTableGetProperties(const avifSampleTable * sampleTable, avifCodecType codecType)
+{
+    for (uint32_t i = 0; i < sampleTable->sampleDescriptions.count; ++i) {
+        const avifSampleDescription * description = &sampleTable->sampleDescriptions.description[i];
+        if (avifGetCodecType(description->format) == codecType) {
+            return &description->properties;
+        }
+    }
+    return NULL;
+}
+
+// one video track ("trak" contents)
+typedef struct avifTrack
+{
+    uint32_t id;
+    uint32_t auxForID; // if non-zero, this track is an auxC plane for Track #{auxForID}
+    uint32_t premByID; // if non-zero, this track is premultiplied by Track #{premByID}
+    uint32_t mediaTimescale;
+    uint64_t mediaDuration;
+    uint64_t trackDuration;
+    uint64_t segmentDuration;
+    avifBool isRepeating;
+    int repetitionCount;
+    uint32_t width;
+    uint32_t height;
+    avifSampleTable * sampleTable;
+    struct avifMeta * meta;
+} avifTrack;
+AVIF_ARRAY_DECLARE(avifTrackArray, avifTrack, track);
+
+// ---------------------------------------------------------------------------
+// avifCodecDecodeInput
+
+avifCodecDecodeInput * avifCodecDecodeInputCreate(void)
+{
+    avifCodecDecodeInput * decodeInput = (avifCodecDecodeInput *)avifAlloc(sizeof(avifCodecDecodeInput));
+    if (decodeInput == NULL) {
+        return NULL;
+    }
+    memset(decodeInput, 0, sizeof(avifCodecDecodeInput));
+    if (!avifArrayCreate(&decodeInput->samples, sizeof(avifDecodeSample), 1)) {
+        avifFree(decodeInput);
+        return NULL;
+    }
+    return decodeInput;
+}
+
+void avifCodecDecodeInputDestroy(avifCodecDecodeInput * decodeInput)
+{
+    for (uint32_t sampleIndex = 0; sampleIndex < decodeInput->samples.count; ++sampleIndex) {
+        avifDecodeSample * sample = &decodeInput->samples.sample[sampleIndex];
+        if (sample->ownsData) {
+            avifRWDataFree((avifRWData *)&sample->data);
+        }
+    }
+    avifArrayDestroy(&decodeInput->samples);
+    avifFree(decodeInput);
+}
+
+// Returns how many samples are in the chunk.
+static uint32_t avifGetSampleCountOfChunk(const avifSampleTableSampleToChunkArray * sampleToChunks, uint32_t chunkIndex)
+{
+    uint32_t sampleCount = 0;
+    for (int sampleToChunkIndex = sampleToChunks->count - 1; sampleToChunkIndex >= 0; --sampleToChunkIndex) {
+        const avifSampleTableSampleToChunk * sampleToChunk = &sampleToChunks->sampleToChunk[sampleToChunkIndex];
+        if (sampleToChunk->firstChunk <= (chunkIndex + 1)) {
+            sampleCount = sampleToChunk->samplesPerChunk;
+            break;
+        }
+    }
+    return sampleCount;
+}
+
+static avifResult avifCodecDecodeInputFillFromSampleTable(avifCodecDecodeInput * decodeInput,
+                                                          avifSampleTable * sampleTable,
+                                                          const uint32_t imageCountLimit,
+                                                          const uint64_t sizeHint,
+                                                          avifDiagnostics * diag)
+{
+    if (imageCountLimit) {
+        // Verify that the we're not about to exceed the frame count limit.
+
+        uint32_t imageCountLeft = imageCountLimit;
+        for (uint32_t chunkIndex = 0; chunkIndex < sampleTable->chunks.count; ++chunkIndex) {
+            // First, figure out how many samples are in this chunk
+            uint32_t sampleCount = avifGetSampleCountOfChunk(&sampleTable->sampleToChunks, chunkIndex);
+            if (sampleCount == 0) {
+                // chunks with 0 samples are invalid
+                avifDiagnosticsPrintf(diag, "Sample table contains a chunk with 0 samples");
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+
+            if (sampleCount > imageCountLeft) {
+                // This file exceeds the imageCountLimit, bail out
+                avifDiagnosticsPrintf(diag, "Exceeded avifDecoder's imageCountLimit");
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            imageCountLeft -= sampleCount;
+        }
+    }
+
+    uint32_t sampleSizeIndex = 0;
+    for (uint32_t chunkIndex = 0; chunkIndex < sampleTable->chunks.count; ++chunkIndex) {
+        avifSampleTableChunk * chunk = &sampleTable->chunks.chunk[chunkIndex];
+
+        // First, figure out how many samples are in this chunk
+        uint32_t sampleCount = avifGetSampleCountOfChunk(&sampleTable->sampleToChunks, chunkIndex);
+        if (sampleCount == 0) {
+            // chunks with 0 samples are invalid
+            avifDiagnosticsPrintf(diag, "Sample table contains a chunk with 0 samples");
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+
+        uint64_t sampleOffset = chunk->offset;
+        for (uint32_t sampleIndex = 0; sampleIndex < sampleCount; ++sampleIndex) {
+            uint32_t sampleSize = sampleTable->allSamplesSize;
+            if (sampleSize == 0) {
+                if (sampleSizeIndex >= sampleTable->sampleSizes.count) {
+                    // We've run out of samples to sum
+                    avifDiagnosticsPrintf(diag, "Truncated sample table");
+                    return AVIF_RESULT_BMFF_PARSE_FAILED;
+                }
+                avifSampleTableSampleSize * sampleSizePtr = &sampleTable->sampleSizes.sampleSize[sampleSizeIndex];
+                sampleSize = sampleSizePtr->size;
+            }
+
+            avifDecodeSample * sample = (avifDecodeSample *)avifArrayPush(&decodeInput->samples);
+            AVIF_CHECKERR(sample != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+            sample->offset = sampleOffset;
+            sample->size = sampleSize;
+            sample->spatialID = AVIF_SPATIAL_ID_UNSET; // Not filtering by spatial_id
+            sample->sync = AVIF_FALSE;                 // to potentially be set to true following the outer loop
+
+            if (sampleSize > UINT64_MAX - sampleOffset) {
+                avifDiagnosticsPrintf(diag,
+                                      "Sample table contains an offset/size pair which overflows: [%" PRIu64 " / %u]",
+                                      sampleOffset,
+                                      sampleSize);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            if (sizeHint && ((sampleOffset + sampleSize) > sizeHint)) {
+                avifDiagnosticsPrintf(diag, "Exceeded avifIO's sizeHint, possibly truncated data");
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+
+            sampleOffset += sampleSize;
+            ++sampleSizeIndex;
+        }
+    }
+
+    // Mark appropriate samples as sync
+    for (uint32_t syncSampleIndex = 0; syncSampleIndex < sampleTable->syncSamples.count; ++syncSampleIndex) {
+        uint32_t frameIndex = sampleTable->syncSamples.syncSample[syncSampleIndex].sampleNumber - 1; // sampleNumber is 1-based
+        if (frameIndex < decodeInput->samples.count) {
+            decodeInput->samples.sample[frameIndex].sync = AVIF_TRUE;
+        }
+    }
+
+    // Assume frame 0 is sync, just in case the stss box is absent in the BMFF. (Unnecessary?)
+    if (decodeInput->samples.count > 0) {
+        decodeInput->samples.sample[0].sync = AVIF_TRUE;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifCodecDecodeInputFillFromDecoderItem(avifCodecDecodeInput * decodeInput,
+                                                          avifDecoderItem * item,
+                                                          avifBool allowProgressive,
+                                                          const uint32_t imageCountLimit,
+                                                          const uint64_t sizeHint,
+                                                          avifDiagnostics * diag)
+{
+    if (sizeHint && (item->size > sizeHint)) {
+        avifDiagnosticsPrintf(diag, "Exceeded avifIO's sizeHint, possibly truncated data");
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+
+    uint8_t layerCount = 0;
+    size_t layerSizes[4] = { 0 };
+    const avifProperty * a1lxProp = avifPropertyArrayFind(&item->properties, "a1lx");
+    if (a1lxProp) {
+        // Calculate layer count and all layer sizes from the a1lx box, and then validate
+
+        size_t remainingSize = item->size;
+        for (int i = 0; i < 3; ++i) {
+            ++layerCount;
+
+            const size_t layerSize = (size_t)a1lxProp->u.a1lx.layerSize[i];
+            if (layerSize) {
+                if (layerSize >= remainingSize) { // >= instead of > because there must be room for the last layer
+                    avifDiagnosticsPrintf(diag, "a1lx layer index [%d] does not fit in item size", i);
+                    return AVIF_RESULT_BMFF_PARSE_FAILED;
+                }
+                layerSizes[i] = layerSize;
+                remainingSize -= layerSize;
+            } else {
+                layerSizes[i] = remainingSize;
+                remainingSize = 0;
+                break;
+            }
+        }
+        if (remainingSize > 0) {
+            assert(layerCount == 3);
+            ++layerCount;
+            layerSizes[3] = remainingSize;
+        }
+    }
+
+    const avifProperty * lselProp = avifPropertyArrayFind(&item->properties, "lsel");
+    // Progressive images offer layers via the a1lxProp, but don't specify a layer selection with lsel.
+    //
+    // For backward compatibility with earlier drafts of AVIF spec v1.1.0, treat an absent lsel as
+    // equivalent to layer_id == 0xFFFF during the transitional period. Remove !lselProp when the test
+    // images have been updated to the v1.1.0 spec.
+    item->progressive = (a1lxProp && (!lselProp || (lselProp->u.lsel.layerID == 0xFFFF)));
+    if (lselProp && (lselProp->u.lsel.layerID != 0xFFFF)) {
+        // Layer selection. This requires that the underlying AV1 codec decodes all layers,
+        // and then only returns the requested layer as a single frame. To the user of libavif,
+        // this appears to be a single frame.
+
+        decodeInput->allLayers = AVIF_TRUE;
+
+        size_t sampleSize = 0;
+        if (layerCount > 0) {
+            // Optimization: If we're selecting a layer that doesn't require the entire image's payload (hinted via the a1lx box)
+
+            if (lselProp->u.lsel.layerID >= layerCount) {
+                avifDiagnosticsPrintf(diag,
+                                      "lsel property requests layer index [%u] which isn't present in a1lx property ([%u] layers)",
+                                      lselProp->u.lsel.layerID,
+                                      layerCount);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+
+            for (uint8_t i = 0; i <= lselProp->u.lsel.layerID; ++i) {
+                sampleSize += layerSizes[i];
+            }
+        } else {
+            // This layer's payload subsection is unknown, just use the whole payload
+            sampleSize = item->size;
+        }
+
+        avifDecodeSample * sample = (avifDecodeSample *)avifArrayPush(&decodeInput->samples);
+        AVIF_CHECKERR(sample != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        sample->itemID = item->id;
+        sample->offset = 0;
+        sample->size = sampleSize;
+        assert(lselProp->u.lsel.layerID < AVIF_MAX_AV1_LAYER_COUNT);
+        sample->spatialID = (uint8_t)lselProp->u.lsel.layerID;
+        sample->sync = AVIF_TRUE;
+    } else if (allowProgressive && item->progressive) {
+        // Progressive image. Decode all layers and expose them all to the user.
+
+        if (imageCountLimit && (layerCount > imageCountLimit)) {
+            avifDiagnosticsPrintf(diag, "Exceeded avifDecoder's imageCountLimit (progressive)");
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+
+        decodeInput->allLayers = AVIF_TRUE;
+
+        size_t offset = 0;
+        for (int i = 0; i < layerCount; ++i) {
+            avifDecodeSample * sample = (avifDecodeSample *)avifArrayPush(&decodeInput->samples);
+            AVIF_CHECKERR(sample != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+            sample->itemID = item->id;
+            sample->offset = offset;
+            sample->size = layerSizes[i];
+            sample->spatialID = AVIF_SPATIAL_ID_UNSET;
+            sample->sync = (i == 0); // Assume all layers depend on the first layer
+
+            offset += layerSizes[i];
+        }
+    } else {
+        // Typical case: Use the entire item's payload for a single frame output
+
+        avifDecodeSample * sample = (avifDecodeSample *)avifArrayPush(&decodeInput->samples);
+        AVIF_CHECKERR(sample != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        sample->itemID = item->id;
+        sample->offset = 0;
+        sample->size = item->size;
+        sample->spatialID = AVIF_SPATIAL_ID_UNSET;
+        sample->sync = AVIF_TRUE;
+    }
+    return AVIF_RESULT_OK;
+}
+
+// ---------------------------------------------------------------------------
+// Helper macros / functions
+
+#define BEGIN_STREAM(VARNAME, PTR, SIZE, DIAG, CONTEXT) \
+    avifROStream VARNAME;                               \
+    avifROData VARNAME##_roData;                        \
+    VARNAME##_roData.data = PTR;                        \
+    VARNAME##_roData.size = SIZE;                       \
+    avifROStreamStart(&VARNAME, &VARNAME##_roData, DIAG, CONTEXT)
+
+// Use this to keep track of whether or not a child box that must be unique (0 or 1 present) has
+// been seen yet, when parsing a parent box. If the "seen" bit is already set for a given box when
+// it is encountered during parse, an error is thrown. Which bit corresponds to which box is
+// dictated entirely by the calling function.
+static avifBool uniqueBoxSeen(uint32_t * uniqueBoxFlags, uint32_t whichFlag, const char * parentBoxType, const char * boxType, avifDiagnostics * diagnostics)
+{
+    const uint32_t flag = 1 << whichFlag;
+    if (*uniqueBoxFlags & flag) {
+        // This box has already been seen. Error!
+        avifDiagnosticsPrintf(diagnostics, "Box[%s] contains a duplicate unique box of type '%s'", parentBoxType, boxType);
+        return AVIF_FALSE;
+    }
+
+    // Mark this box as seen.
+    *uniqueBoxFlags |= flag;
+    return AVIF_TRUE;
+}
+
+// ---------------------------------------------------------------------------
+// avifDecoderData
+
+typedef struct avifTile
+{
+    avifCodecDecodeInput * input;
+    avifCodecType codecType;
+    // This may point to a codec that it owns or point to a shared codec that it does not own. In the shared case, this will
+    // point to one of the avifCodec instances in avifDecoderData.
+    struct avifCodec * codec;
+    avifImage * image;
+    uint32_t width;  // Either avifTrack.width or avifDecoderItem.width
+    uint32_t height; // Either avifTrack.height or avifDecoderItem.height
+    uint8_t operatingPoint;
+} avifTile;
+AVIF_ARRAY_DECLARE(avifTileArray, avifTile, tile);
+
+// This holds one "meta" box (from the BMFF and HEIF standards) worth of relevant-to-AVIF information.
+// * If a meta box is parsed from the root level of the BMFF, it can contain the information about
+//   "items" which might be color planes, alpha planes, or EXIF or XMP metadata.
+// * If a meta box is parsed from inside of a track ("trak") box, any metadata (EXIF/XMP) items inside
+//   of that box are implicitly associated with that track.
+typedef struct avifMeta
+{
+    // Items (from HEIF) are the generic storage for any data that does not require timed processing
+    // (single image color planes, alpha planes, EXIF, XMP, etc). Each item has a unique integer ID >1,
+    // and is defined by a series of child boxes in a meta box:
+    //  * iloc - location:     byte offset to item data, item size in bytes
+    //  * iinf - information:  type of item (color planes, alpha plane, EXIF, XMP)
+    //  * ipco - properties:   dimensions, aspect ratio, image transformations, references to other items
+    //  * ipma - associations: Attaches an item in the properties list to a given item
+    //
+    // Items are lazily created in this array when any of the above boxes refer to one by a new (unseen) ID,
+    // and are then further modified/updated as new information for an item's ID is parsed.
+    avifDecoderItemArray items;
+
+    // Any ipco boxes explained above are populated into this array as a staging area, which are
+    // then duplicated into the appropriate items upon encountering an item property association
+    // (ipma) box.
+    avifPropertyArray properties;
+
+    // Filled with the contents of this meta box's "idat" box, which is raw data that an item can
+    // directly refer to in its item location box (iloc) instead of just giving an offset into the
+    // overall file. If all items' iloc boxes simply point at an offset/length in the file itself,
+    // this buffer will likely be empty.
+    avifRWData idat;
+
+    // Ever-incrementing ID for uniquely identifying which 'meta' box contains an idat (when
+    // multiple meta boxes exist as BMFF siblings). Each time avifParseMetaBox() is called on an
+    // avifMeta struct, this value is incremented. Any time an additional meta box is detected at
+    // the same "level" (root level, trak level, etc), this ID helps distinguish which meta box's
+    // "idat" is which, as items implicitly reference idat boxes that exist in the same meta
+    // box.
+    uint32_t idatID;
+
+    // Contents of a pitm box, which signal which of the items in this file is the main image. For
+    // AVIF, this should point at an image item containing color planes, and all other items
+    // are ignored unless they refer to this item in some way (alpha plane, EXIF/XMP metadata).
+    uint32_t primaryItemID;
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    // If true, the fields above were extracted from a CondensedImageBox. It imposes some
+    // constraints on its optional extendedMeta field, such as forbidden item IDs, properties etc.
+    avifBool fromConi;
+#endif
+} avifMeta;
+
+static void avifMetaDestroy(avifMeta * meta);
+
+static avifMeta * avifMetaCreate()
+{
+    avifMeta * meta = (avifMeta *)avifAlloc(sizeof(avifMeta));
+    if (meta == NULL) {
+        return NULL;
+    }
+    memset(meta, 0, sizeof(avifMeta));
+    if (!avifArrayCreate(&meta->items, sizeof(avifDecoderItem), 8) || !avifArrayCreate(&meta->properties, sizeof(avifProperty), 16)) {
+        avifMetaDestroy(meta);
+        return NULL;
+    }
+    return meta;
+}
+
+static void avifMetaDestroy(avifMeta * meta)
+{
+    for (uint32_t i = 0; i < meta->items.count; ++i) {
+        avifDecoderItem * item = &meta->items.item[i];
+        avifArrayDestroy(&item->properties);
+        avifArrayDestroy(&item->extents);
+        if (item->ownsMergedExtents) {
+            avifRWDataFree(&item->mergedExtents);
+        }
+    }
+    avifArrayDestroy(&meta->items);
+    avifArrayDestroy(&meta->properties);
+    avifRWDataFree(&meta->idat);
+    avifFree(meta);
+}
+
+static avifResult avifCheckItemID(const char * boxFourcc, uint32_t itemID, avifDiagnostics * diag)
+{
+    if (itemID == 0) {
+        avifDiagnosticsPrintf(diag, "Box[%4s] has an invalid item ID [%u]", boxFourcc, itemID);
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifMetaFindOrCreateItem(avifMeta * meta, uint32_t itemID, avifDecoderItem ** item)
+{
+    *item = NULL;
+    assert(itemID != 0);
+
+    for (uint32_t i = 0; i < meta->items.count; ++i) {
+        if (meta->items.item[i].id == itemID) {
+            *item = &meta->items.item[i];
+            return AVIF_RESULT_OK;
+        }
+    }
+
+    *item = (avifDecoderItem *)avifArrayPush(&meta->items);
+    AVIF_CHECKERR(*item != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+    if (!avifArrayCreate(&(*item)->properties, sizeof(avifProperty), 16)) {
+        avifArrayPop(&meta->items);
+        return AVIF_RESULT_OUT_OF_MEMORY;
+    }
+    if (!avifArrayCreate(&(*item)->extents, sizeof(avifExtent), 1)) {
+        avifArrayDestroy(&(*item)->properties);
+        avifArrayPop(&meta->items);
+        return AVIF_RESULT_OUT_OF_MEMORY;
+    }
+    (*item)->id = itemID;
+    (*item)->meta = meta;
+    return AVIF_RESULT_OK;
+}
+
+// A group of AVIF tiles in an image item, such as a single tile or a grid of multiple tiles.
+typedef struct avifTileInfo
+{
+    unsigned int tileCount;
+    unsigned int decodedTileCount;
+    unsigned int firstTileIndex; // Within avifDecoderData.tiles.
+    avifImageGrid grid;
+} avifTileInfo;
+
+typedef struct avifDecoderData
+{
+    avifMeta * meta; // The root-level meta box
+    avifTrackArray tracks;
+    avifTileArray tiles;
+    avifTileInfo tileInfos[AVIF_ITEM_CATEGORY_COUNT];
+    avifDecoderSource source;
+    // When decoding AVIF images with grid, use a single decoder instance for all the tiles instead of creating a decoder instance
+    // for each tile. If that is the case, |codec| will be used by all the tiles.
+    //
+    // There are some edge cases where we will still need multiple decoder instances:
+    // * For animated AVIF with alpha, we will need two instances (one for the color planes and one for the alpha plane since they are both
+    //   encoded as separate video sequences). In this case, |codec| will be used for the color planes and |codecAlpha| will be
+    //   used for the alpha plane.
+    // * For grid images with multiple layers. In this case, each tile will need its own decoder instance since there would be
+    //   multiple layers in each tile. In this case, |codec| and |codecAlpha| are not used and each tile will have its own
+    //   decoder instance.
+    // * For grid images where the operating points of all the tiles are not the same. In this case, each tile needs its own
+    //   decoder instance (same as above).
+    avifCodec * codec;
+    avifCodec * codecAlpha;
+    uint8_t majorBrand[4];                     // From the file's ftyp, used by AVIF_DECODER_SOURCE_AUTO
+    avifDiagnostics * diag;                    // Shallow copy; owned by avifDecoder
+    const avifSampleTable * sourceSampleTable; // NULL unless (source == AVIF_DECODER_SOURCE_TRACKS), owned by an avifTrack
+    avifBool cicpSet;                          // True if avifDecoder's image has had its CICP set correctly yet.
+                                               // This allows nclx colr boxes to override AV1 CICP, as specified in the MIAF
+                                               // standard (ISO/IEC 23000-22:2019), section 7.3.6.4:
+                                               //   The colour information property takes precedence over any colour information
+                                               //   in the image bitstream, i.e. if the property is present, colour information in
+                                               //   the bitstream shall be ignored.
+} avifDecoderData;
+
+static void avifDecoderDataDestroy(avifDecoderData * data);
+
+static avifDecoderData * avifDecoderDataCreate()
+{
+    avifDecoderData * data = (avifDecoderData *)avifAlloc(sizeof(avifDecoderData));
+    if (data == NULL) {
+        return NULL;
+    }
+    memset(data, 0, sizeof(avifDecoderData));
+    data->meta = avifMetaCreate();
+    if (data->meta == NULL || !avifArrayCreate(&data->tracks, sizeof(avifTrack), 2) ||
+        !avifArrayCreate(&data->tiles, sizeof(avifTile), 8)) {
+        avifDecoderDataDestroy(data);
+        return NULL;
+    }
+    return data;
+}
+
+static void avifDecoderDataResetCodec(avifDecoderData * data)
+{
+    for (unsigned int i = 0; i < data->tiles.count; ++i) {
+        avifTile * tile = &data->tiles.tile[i];
+        if (tile->image) {
+            avifImageFreePlanes(tile->image, AVIF_PLANES_ALL); // forget any pointers into codec image buffers
+        }
+        if (tile->codec) {
+            // Check if tile->codec was created separately and destroy it in that case.
+            if (tile->codec != data->codec && tile->codec != data->codecAlpha) {
+                avifCodecDestroy(tile->codec);
+            }
+            tile->codec = NULL;
+        }
+    }
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        data->tileInfos[c].decodedTileCount = 0;
+    }
+    if (data->codec) {
+        avifCodecDestroy(data->codec);
+        data->codec = NULL;
+    }
+    if (data->codecAlpha) {
+        avifCodecDestroy(data->codecAlpha);
+        data->codecAlpha = NULL;
+    }
+}
+
+static avifTile * avifDecoderDataCreateTile(avifDecoderData * data, avifCodecType codecType, uint32_t width, uint32_t height, uint8_t operatingPoint)
+{
+    avifTile * tile = (avifTile *)avifArrayPush(&data->tiles);
+    if (tile == NULL) {
+        return NULL;
+    }
+    tile->codecType = codecType;
+    tile->image = avifImageCreateEmpty();
+    if (!tile->image) {
+        goto error;
+    }
+    tile->input = avifCodecDecodeInputCreate();
+    if (!tile->input) {
+        goto error;
+    }
+    tile->width = width;
+    tile->height = height;
+    tile->operatingPoint = operatingPoint;
+    return tile;
+
+error:
+    if (tile->input) {
+        avifCodecDecodeInputDestroy(tile->input);
+    }
+    if (tile->image) {
+        avifImageDestroy(tile->image);
+    }
+    avifArrayPop(&data->tiles);
+    return NULL;
+}
+
+static avifTrack * avifDecoderDataCreateTrack(avifDecoderData * data)
+{
+    avifTrack * track = (avifTrack *)avifArrayPush(&data->tracks);
+    if (track == NULL) {
+        return NULL;
+    }
+    track->meta = avifMetaCreate();
+    if (track->meta == NULL) {
+        avifArrayPop(&data->tracks);
+        return NULL;
+    }
+    return track;
+}
+
+static void avifDecoderDataClearTiles(avifDecoderData * data)
+{
+    for (unsigned int i = 0; i < data->tiles.count; ++i) {
+        avifTile * tile = &data->tiles.tile[i];
+        if (tile->input) {
+            avifCodecDecodeInputDestroy(tile->input);
+            tile->input = NULL;
+        }
+        if (tile->codec) {
+            // Check if tile->codec was created separately and destroy it in that case.
+            if (tile->codec != data->codec && tile->codec != data->codecAlpha) {
+                avifCodecDestroy(tile->codec);
+            }
+            tile->codec = NULL;
+        }
+        if (tile->image) {
+            avifImageDestroy(tile->image);
+            tile->image = NULL;
+        }
+    }
+    data->tiles.count = 0;
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        data->tileInfos[c].tileCount = 0;
+        data->tileInfos[c].decodedTileCount = 0;
+    }
+    if (data->codec) {
+        avifCodecDestroy(data->codec);
+        data->codec = NULL;
+    }
+    if (data->codecAlpha) {
+        avifCodecDestroy(data->codecAlpha);
+        data->codecAlpha = NULL;
+    }
+}
+
+static void avifDecoderDataDestroy(avifDecoderData * data)
+{
+    avifMetaDestroy(data->meta);
+    for (uint32_t i = 0; i < data->tracks.count; ++i) {
+        avifTrack * track = &data->tracks.track[i];
+        if (track->sampleTable) {
+            avifSampleTableDestroy(track->sampleTable);
+        }
+        if (track->meta) {
+            avifMetaDestroy(track->meta);
+        }
+    }
+    avifArrayDestroy(&data->tracks);
+    avifDecoderDataClearTiles(data);
+    avifArrayDestroy(&data->tiles);
+    avifFree(data);
+}
+
+// This returns the max extent that has to be read in order to decode this item. If
+// the item is stored in an idat, the data has already been read during Parse() and
+// this function will return AVIF_RESULT_OK with a 0-byte extent.
+static avifResult avifDecoderItemMaxExtent(const avifDecoderItem * item, const avifDecodeSample * sample, avifExtent * outExtent)
+{
+    if (item->extents.count == 0) {
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+
+    if (item->idatStored) {
+        // construction_method: idat(1)
+
+        if (item->meta->idat.size > 0) {
+            // Already read from a meta box during Parse()
+            memset(outExtent, 0, sizeof(avifExtent));
+            return AVIF_RESULT_OK;
+        }
+
+        // no associated idat box was found in the meta box, bail out
+        return AVIF_RESULT_NO_CONTENT;
+    }
+
+    // construction_method: file(0)
+
+    if (sample->size == 0) {
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+    uint64_t remainingOffset = sample->offset;
+    size_t remainingBytes = sample->size; // This may be smaller than item->size if the item is progressive
+
+    // Assert that the for loop below will execute at least one iteration.
+    assert(item->extents.count != 0);
+    uint64_t minOffset = UINT64_MAX;
+    uint64_t maxOffset = 0;
+    for (uint32_t extentIter = 0; extentIter < item->extents.count; ++extentIter) {
+        avifExtent * extent = &item->extents.extent[extentIter];
+
+        // Make local copies of extent->offset and extent->size as they might need to be adjusted
+        // due to the sample's offset.
+        uint64_t startOffset = extent->offset;
+        size_t extentSize = extent->size;
+        if (remainingOffset) {
+            if (remainingOffset >= extentSize) {
+                remainingOffset -= extentSize;
+                continue;
+            } else {
+                if (remainingOffset > UINT64_MAX - startOffset) {
+                    return AVIF_RESULT_BMFF_PARSE_FAILED;
+                }
+                startOffset += remainingOffset;
+                extentSize -= (size_t)remainingOffset;
+                remainingOffset = 0;
+            }
+        }
+
+        const size_t usedExtentSize = (extentSize < remainingBytes) ? extentSize : remainingBytes;
+
+        if (usedExtentSize > UINT64_MAX - startOffset) {
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+        const uint64_t endOffset = startOffset + usedExtentSize;
+
+        if (minOffset > startOffset) {
+            minOffset = startOffset;
+        }
+        if (maxOffset < endOffset) {
+            maxOffset = endOffset;
+        }
+
+        remainingBytes -= usedExtentSize;
+        if (remainingBytes == 0) {
+            // We've got enough bytes for this sample.
+            break;
+        }
+    }
+
+    if (remainingBytes != 0) {
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+
+    outExtent->offset = minOffset;
+    const uint64_t extentLength = maxOffset - minOffset;
+    if (extentLength > SIZE_MAX) {
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+    outExtent->size = (size_t)extentLength;
+    return AVIF_RESULT_OK;
+}
+
+static uint8_t avifDecoderItemOperatingPoint(const avifDecoderItem * item)
+{
+    const avifProperty * a1opProp = avifPropertyArrayFind(&item->properties, "a1op");
+    if (a1opProp) {
+        return a1opProp->u.a1op.opIndex;
+    }
+    return 0; // default
+}
+
+static avifResult avifDecoderItemValidateProperties(const avifDecoderItem * item,
+                                                    const char * configPropName,
+                                                    avifDiagnostics * diag,
+                                                    const avifStrictFlags strictFlags)
+{
+    const avifProperty * const configProp = avifPropertyArrayFind(&item->properties, configPropName);
+    if (!configProp) {
+        // An item configuration property box is mandatory in all valid AVIF configurations. Bail out.
+        avifDiagnosticsPrintf(diag, "Item ID %u of type '%.4s' is missing mandatory %s property", item->id, (const char *)item->type, configPropName);
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+
+    if (!memcmp(item->type, "grid", 4)) {
+        for (uint32_t i = 0; i < item->meta->items.count; ++i) {
+            avifDecoderItem * tile = &item->meta->items.item[i];
+            if (tile->dimgForID != item->id) {
+                continue;
+            }
+            // Tile item types were checked in avifDecoderGenerateImageTiles(), no need to do it here.
+
+            // MIAF (ISO 23000-22:2019), Section 7.3.11.4.1:
+            //   All input images of a grid image item shall use the same [...] chroma sampling format,
+            //   and the same decoder configuration (see 7.3.6.2).
+
+            // The chroma sampling format is part of the decoder configuration.
+            const avifProperty * tileConfigProp = avifPropertyArrayFind(&tile->properties, configPropName);
+            if (!tileConfigProp) {
+                avifDiagnosticsPrintf(diag,
+                                      "Tile item ID %u of type '%.4s' is missing mandatory %s property",
+                                      tile->id,
+                                      (const char *)tile->type,
+                                      configPropName);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            // configProp was copied from a tile item to the grid item. Comparing tileConfigProp with it
+            // is equivalent to comparing tileConfigProp with the configPropName from the first tile.
+            if ((tileConfigProp->u.av1C.seqProfile != configProp->u.av1C.seqProfile) ||
+                (tileConfigProp->u.av1C.seqLevelIdx0 != configProp->u.av1C.seqLevelIdx0) ||
+                (tileConfigProp->u.av1C.seqTier0 != configProp->u.av1C.seqTier0) ||
+                (tileConfigProp->u.av1C.highBitdepth != configProp->u.av1C.highBitdepth) ||
+                (tileConfigProp->u.av1C.twelveBit != configProp->u.av1C.twelveBit) ||
+                (tileConfigProp->u.av1C.monochrome != configProp->u.av1C.monochrome) ||
+                (tileConfigProp->u.av1C.chromaSubsamplingX != configProp->u.av1C.chromaSubsamplingX) ||
+                (tileConfigProp->u.av1C.chromaSubsamplingY != configProp->u.av1C.chromaSubsamplingY) ||
+                (tileConfigProp->u.av1C.chromaSamplePosition != configProp->u.av1C.chromaSamplePosition)) {
+                avifDiagnosticsPrintf(diag,
+                                      "The fields of the %s property of tile item ID %u of type '%.4s' differs from other tiles",
+                                      configPropName,
+                                      tile->id,
+                                      (const char *)tile->type);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+        }
+    }
+
+    const avifProperty * pixiProp = avifPropertyArrayFind(&item->properties, "pixi");
+    if (!pixiProp && (strictFlags & AVIF_STRICT_PIXI_REQUIRED)) {
+        // A pixi box is mandatory in all valid AVIF configurations. Bail out.
+        avifDiagnosticsPrintf(diag,
+                              "[Strict] Item ID %u of type '%.4s' is missing mandatory pixi property",
+                              item->id,
+                              (const char *)item->type);
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+
+    if (pixiProp) {
+        const uint32_t configDepth = avifCodecConfigurationBoxGetDepth(&configProp->u.av1C);
+        for (uint8_t i = 0; i < pixiProp->u.pixi.planeCount; ++i) {
+            if (pixiProp->u.pixi.planeDepths[i] != configDepth) {
+                // pixi depth must match configuration property depth
+                avifDiagnosticsPrintf(diag,
+                                      "Item ID %u depth specified by pixi property [%u] does not match %s property depth [%u]",
+                                      item->id,
+                                      pixiProp->u.pixi.planeDepths[i],
+                                      configPropName,
+                                      configDepth);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+        }
+    }
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    if ((item->coniPixelFormat != AVIF_PIXEL_FORMAT_NONE) &&
+        (item->coniPixelFormat != avifCodecConfigurationBoxGetFormat(&configProp->u.av1C))) {
+        avifDiagnosticsPrintf(diag,
+                              "Item ID %u format [%s] specified by coni box does not match %s property format [%s]",
+                              item->id,
+                              avifPixelFormatToString(item->coniPixelFormat),
+                              configPropName,
+                              avifPixelFormatToString(avifCodecConfigurationBoxGetFormat(&configProp->u.av1C)));
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+
+    if (strictFlags & AVIF_STRICT_CLAP_VALID) {
+        const avifProperty * clapProp = avifPropertyArrayFind(&item->properties, "clap");
+        if (clapProp) {
+            const avifProperty * ispeProp = avifPropertyArrayFind(&item->properties, "ispe");
+            if (!ispeProp) {
+                avifDiagnosticsPrintf(diag,
+                                      "[Strict] Item ID %u is missing an ispe property, so its clap property cannot be validated",
+                                      item->id);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+
+            avifCropRect cropRect;
+            const uint32_t imageW = ispeProp->u.ispe.width;
+            const uint32_t imageH = ispeProp->u.ispe.height;
+            const avifPixelFormat configFormat = avifCodecConfigurationBoxGetFormat(&configProp->u.av1C);
+            avifBool validClap = avifCropRectConvertCleanApertureBox(&cropRect, &clapProp->u.clap, imageW, imageH, configFormat, diag);
+            if (!validClap) {
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifDecoderItemRead(avifDecoderItem * item,
+                                      avifIO * io,
+                                      avifROData * outData,
+                                      size_t offset,
+                                      size_t partialByteCount,
+                                      avifDiagnostics * diag)
+{
+    if (item->mergedExtents.data && !item->partialMergedExtents) {
+        // Multiple extents have already been concatenated for this item, just return it
+        if (offset >= item->mergedExtents.size) {
+            avifDiagnosticsPrintf(diag, "Item ID %u read has overflowing offset", item->id);
+            return AVIF_RESULT_TRUNCATED_DATA;
+        }
+        outData->data = item->mergedExtents.data + offset;
+        outData->size = item->mergedExtents.size - offset;
+        return AVIF_RESULT_OK;
+    }
+
+    if (item->extents.count == 0) {
+        avifDiagnosticsPrintf(diag, "Item ID %u has zero extents", item->id);
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+
+    // Find this item's source of all extents' data, based on the construction method
+    const avifRWData * idatBuffer = NULL;
+    if (item->idatStored) {
+        // construction_method: idat(1)
+
+        if (item->meta->idat.size > 0) {
+            idatBuffer = &item->meta->idat;
+        } else {
+            // no associated idat box was found in the meta box, bail out
+            avifDiagnosticsPrintf(diag, "Item ID %u is stored in an idat, but no associated idat box was found", item->id);
+            return AVIF_RESULT_NO_CONTENT;
+        }
+    }
+
+    // Merge extents into a single contiguous buffer
+    if ((io->sizeHint > 0) && (item->size > io->sizeHint)) {
+        // Sanity check: somehow the sum of extents exceeds the entire file or idat size!
+        avifDiagnosticsPrintf(diag, "Item ID %u reported size failed size hint sanity check. Truncated data?", item->id);
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+
+    if (offset >= item->size) {
+        avifDiagnosticsPrintf(diag, "Item ID %u read has overflowing offset", item->id);
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+    const size_t maxOutputSize = item->size - offset;
+    const size_t readOutputSize = (partialByteCount && (partialByteCount < maxOutputSize)) ? partialByteCount : maxOutputSize;
+    const size_t totalBytesToRead = offset + readOutputSize;
+
+    // If there is a single extent for this item and the source of the read buffer is going to be
+    // persistent for the lifetime of the avifDecoder (whether it comes from its own internal
+    // idatBuffer or from a known-persistent IO), we can avoid buffer duplication and just use the
+    // preexisting buffer.
+    avifBool singlePersistentBuffer = ((item->extents.count == 1) && (idatBuffer || io->persistent));
+    if (!singlePersistentBuffer) {
+        // Always allocate the item's full size here, as progressive image decodes will do partial
+        // reads into this buffer and begin feeding the buffer to the underlying AV1 decoder, but
+        // will then write more into this buffer without flushing the AV1 decoder (which is still
+        // holding the address of the previous allocation of this buffer). This strategy avoids
+        // use-after-free issues in the AV1 decoder and unnecessary reallocs as a typical
+        // progressive decode use case will eventually decode the final layer anyway.
+        AVIF_CHECKRES(avifRWDataRealloc(&item->mergedExtents, item->size));
+        item->ownsMergedExtents = AVIF_TRUE;
+    }
+
+    // Set this until we manage to fill the entire mergedExtents buffer
+    item->partialMergedExtents = AVIF_TRUE;
+
+    uint8_t * front = item->mergedExtents.data;
+    size_t remainingBytes = totalBytesToRead;
+    for (uint32_t extentIter = 0; extentIter < item->extents.count; ++extentIter) {
+        avifExtent * extent = &item->extents.extent[extentIter];
+
+        size_t bytesToRead = extent->size;
+        if (bytesToRead > remainingBytes) {
+            bytesToRead = remainingBytes;
+        }
+
+        avifROData offsetBuffer;
+        if (idatBuffer) {
+            if (extent->offset > idatBuffer->size) {
+                avifDiagnosticsPrintf(diag, "Item ID %u has impossible extent offset in idat buffer", item->id);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            // Since extent->offset (a uint64_t) is not bigger than idatBuffer->size (a size_t),
+            // it is safe to cast extent->offset to size_t.
+            const size_t extentOffset = (size_t)extent->offset;
+            if (extent->size > idatBuffer->size - extentOffset) {
+                avifDiagnosticsPrintf(diag, "Item ID %u has impossible extent size in idat buffer", item->id);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            offsetBuffer.data = idatBuffer->data + extentOffset;
+            offsetBuffer.size = idatBuffer->size - extentOffset;
+        } else {
+            // construction_method: file(0)
+
+            if ((io->sizeHint > 0) && (extent->offset > io->sizeHint)) {
+                avifDiagnosticsPrintf(diag, "Item ID %u extent offset failed size hint sanity check. Truncated data?", item->id);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            avifResult readResult = io->read(io, 0, extent->offset, bytesToRead, &offsetBuffer);
+            if (readResult != AVIF_RESULT_OK) {
+                return readResult;
+            }
+            if (bytesToRead != offsetBuffer.size) {
+                avifDiagnosticsPrintf(diag,
+                                      "Item ID %u tried to read %zu bytes, but only received %zu bytes",
+                                      item->id,
+                                      bytesToRead,
+                                      offsetBuffer.size);
+                return AVIF_RESULT_TRUNCATED_DATA;
+            }
+        }
+
+        if (singlePersistentBuffer) {
+            memcpy(&item->mergedExtents, &offsetBuffer, sizeof(avifRWData));
+            item->mergedExtents.size = bytesToRead;
+        } else {
+            assert(item->ownsMergedExtents);
+            assert(front);
+            memcpy(front, offsetBuffer.data, bytesToRead);
+            front += bytesToRead;
+        }
+
+        remainingBytes -= bytesToRead;
+        if (remainingBytes == 0) {
+            // This happens when partialByteCount is set
+            break;
+        }
+    }
+    if (remainingBytes != 0) {
+        // This should be impossible?
+        avifDiagnosticsPrintf(diag, "Item ID %u has %zu unexpected trailing bytes", item->id, remainingBytes);
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+
+    outData->data = item->mergedExtents.data + offset;
+    outData->size = readOutputSize;
+    item->partialMergedExtents = (item->size != totalBytesToRead);
+    return AVIF_RESULT_OK;
+}
+
+// Returns the avifCodecType of the first tile of the gridItem.
+static avifCodecType avifDecoderItemGetGridCodecType(const avifDecoderItem * gridItem)
+{
+    for (uint32_t i = 0; i < gridItem->meta->items.count; ++i) {
+        avifDecoderItem * item = &gridItem->meta->items.item[i];
+        const avifCodecType tileCodecType = avifGetCodecType(item->type);
+        if ((item->dimgForID == gridItem->id) && (tileCodecType != AVIF_CODEC_TYPE_UNKNOWN)) {
+            return tileCodecType;
+        }
+    }
+    return AVIF_CODEC_TYPE_UNKNOWN;
+}
+
+static avifResult avifDecoderGenerateImageGridTiles(avifDecoder * decoder, avifImageGrid * grid, avifDecoderItem * gridItem, avifItemCategory itemCategory)
+{
+    // Count number of dimg for this item, bail out if it doesn't match perfectly
+    unsigned int tilesAvailable = 0;
+    avifDecoderItem * firstTileItem = NULL;
+    for (uint32_t i = 0; i < gridItem->meta->items.count; ++i) {
+        avifDecoderItem * item = &gridItem->meta->items.item[i];
+        if (item->dimgForID != gridItem->id) {
+            continue;
+        }
+
+        // According to HEIF (ISO 14496-12), Section 6.6.2.3.1, the SingleItemTypeReferenceBox of type 'dimg'
+        // identifies the input images of the derived image item of type 'grid'. Since the reference_count
+        // shall be equal to rows*columns, unknown tile item types cannot be skipped but must be considered
+        // as errors.
+        const avifCodecType tileCodecType = avifGetCodecType(item->type);
+        if (tileCodecType == AVIF_CODEC_TYPE_UNKNOWN) {
+            avifDiagnosticsPrintf(&decoder->diag, "Tile item ID %u has an unknown item type '%.4s'", item->id, (const char *)item->type);
+            return AVIF_RESULT_INVALID_IMAGE_GRID;
+        }
+
+        if (item->hasUnsupportedEssentialProperty) {
+            // An essential property isn't supported by libavif; can't
+            // decode a grid image if any tile in the grid isn't supported.
+            avifDiagnosticsPrintf(&decoder->diag, "Grid image contains tile with an unsupported property marked as essential");
+            return AVIF_RESULT_INVALID_IMAGE_GRID;
+        }
+
+        const avifTile * tile =
+            avifDecoderDataCreateTile(decoder->data, tileCodecType, item->width, item->height, avifDecoderItemOperatingPoint(item));
+        AVIF_CHECKERR(tile != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        AVIF_CHECKRES(avifCodecDecodeInputFillFromDecoderItem(tile->input,
+                                                              item,
+                                                              decoder->allowProgressive,
+                                                              decoder->imageCountLimit,
+                                                              decoder->io->sizeHint,
+                                                              &decoder->diag));
+        tile->input->itemCategory = itemCategory;
+
+        if (firstTileItem == NULL) {
+            firstTileItem = item;
+
+            // Adopt the configuration property of the first image item tile, so that it can be queried from
+            // the top-level color/alpha item during avifDecoderReset().
+            const char * configPropName = memcmp(item->type, "av02", 4) ? "av1C" : "av2C";
+            const avifProperty * srcProp = avifPropertyArrayFind(&item->properties, configPropName);
+            if (!srcProp) {
+                avifDiagnosticsPrintf(&decoder->diag, "Grid image's first tile is missing an %s property", configPropName);
+                return AVIF_RESULT_INVALID_IMAGE_GRID;
+            }
+            avifProperty * dstProp = (avifProperty *)avifArrayPush(&gridItem->properties);
+            AVIF_CHECKERR(dstProp != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+            *dstProp = *srcProp;
+
+            if (itemCategory == AVIF_ITEM_COLOR && item->progressive) {
+                gridItem->progressive = AVIF_TRUE; // Propagate the progressive status to the top-level grid item.
+            }
+        } else if (memcmp(item->type, firstTileItem->type, 4)) {
+            // MIAF (ISO 23000-22:2019), Section 7.3.11.4.1:
+            //   All input images of a grid image item shall use the same coding format [...]
+            // The coding format is defined by the item type.
+            avifDiagnosticsPrintf(&decoder->diag,
+                                  "Tile item ID %u of type '%.4s' differs from other tile type '%.4s'",
+                                  item->id,
+                                  (const char *)item->type,
+                                  (const char *)firstTileItem->type);
+            return AVIF_RESULT_INVALID_IMAGE_GRID;
+        }
+        ++tilesAvailable;
+    }
+
+    if (tilesAvailable != grid->rows * grid->columns) {
+        avifDiagnosticsPrintf(&decoder->diag,
+                              "Grid image of dimensions %ux%u requires %u tiles, and only %u were found",
+                              grid->columns,
+                              grid->rows,
+                              grid->rows * grid->columns,
+                              tilesAvailable);
+        return AVIF_RESULT_INVALID_IMAGE_GRID;
+    }
+    return AVIF_RESULT_OK;
+}
+
+// Allocates the dstImage based on the grid image requirements. Also verifies some spec compliance rules for grids.
+static avifResult avifDecoderDataAllocateGridImagePlanes(avifDecoderData * data, const avifTileInfo * info, avifImage * dstImage)
+{
+    const avifImageGrid * grid = &info->grid;
+    const avifTile * tile = &data->tiles.tile[info->firstTileIndex];
+
+    // Validate grid image size and tile size.
+    //
+    // HEIF (ISO/IEC 23008-12:2017), Section 6.6.2.3.1:
+    //   The tiled input images shall completely "cover" the reconstructed image grid canvas, ...
+    if (((tile->image->width * grid->columns) < grid->outputWidth) || ((tile->image->height * grid->rows) < grid->outputHeight)) {
+        avifDiagnosticsPrintf(data->diag,
+                              "Grid image tiles do not completely cover the image (HEIF (ISO/IEC 23008-12:2017), Section 6.6.2.3.1)");
+        return AVIF_RESULT_INVALID_IMAGE_GRID;
+    }
+    // Tiles in the rightmost column and bottommost row must overlap the reconstructed image grid canvas. See MIAF (ISO/IEC 23000-22:2019), Section 7.3.11.4.2, Figure 2.
+    if (((tile->image->width * (grid->columns - 1)) >= grid->outputWidth) ||
+        ((tile->image->height * (grid->rows - 1)) >= grid->outputHeight)) {
+        avifDiagnosticsPrintf(data->diag,
+                              "Grid image tiles in the rightmost column and bottommost row do not overlap the reconstructed image grid canvas. See MIAF (ISO/IEC 23000-22:2019), Section 7.3.11.4.2, Figure 2");
+        return AVIF_RESULT_INVALID_IMAGE_GRID;
+    }
+
+    avifBool alpha = (tile->input->itemCategory == AVIF_ITEM_ALPHA);
+    if (alpha) {
+        // An alpha tile does not contain any YUV pixels.
+        assert(tile->image->yuvFormat == AVIF_PIXEL_FORMAT_NONE);
+    }
+    if (!avifAreGridDimensionsValid(tile->image->yuvFormat, grid->outputWidth, grid->outputHeight, tile->image->width, tile->image->height, data->diag)) {
+        return AVIF_RESULT_INVALID_IMAGE_GRID;
+    }
+
+    // Lazily populate dstImage with the new frame's properties.
+    if ((dstImage->width != grid->outputWidth) || (dstImage->height != grid->outputHeight) ||
+        (dstImage->depth != tile->image->depth) || (!alpha && (dstImage->yuvFormat != tile->image->yuvFormat))) {
+        if (alpha) {
+            // Alpha doesn't match size, just bail out
+            avifDiagnosticsPrintf(data->diag, "Alpha plane dimensions do not match color plane dimensions");
+            return AVIF_RESULT_INVALID_IMAGE_GRID;
+        }
+
+        avifImageFreePlanes(dstImage, AVIF_PLANES_ALL);
+        dstImage->width = grid->outputWidth;
+        dstImage->height = grid->outputHeight;
+        dstImage->depth = tile->image->depth;
+        dstImage->yuvFormat = tile->image->yuvFormat;
+        // Keep dstImage->yuvRange which is already set to its correct value
+        // (extracted from the 'colr' box if parsed or from a Sequence Header OBU otherwise).
+
+        if (!data->cicpSet) {
+            data->cicpSet = AVIF_TRUE;
+            dstImage->colorPrimaries = tile->image->colorPrimaries;
+            dstImage->transferCharacteristics = tile->image->transferCharacteristics;
+            dstImage->matrixCoefficients = tile->image->matrixCoefficients;
+        }
+    }
+
+    if (avifImageAllocatePlanes(dstImage, alpha ? AVIF_PLANES_A : AVIF_PLANES_YUV) != AVIF_RESULT_OK) {
+        avifDiagnosticsPrintf(data->diag, "Image allocation failure");
+        return AVIF_RESULT_OUT_OF_MEMORY;
+    }
+    return AVIF_RESULT_OK;
+}
+
+// After verifying that the relevant properties of the tile match those of the first tile, copies over the pixels from the tile
+// into dstImage.
+static avifBool avifDecoderDataCopyTileToImage(avifDecoderData * data,
+                                               const avifTileInfo * info,
+                                               avifImage * dstImage,
+                                               const avifTile * tile,
+                                               unsigned int tileIndex)
+{
+    const avifImageGrid * grid = &info->grid;
+    const avifTile * firstTile = &data->tiles.tile[info->firstTileIndex];
+    if (tile != firstTile) {
+        // Check for tile consistency. All tiles in a grid image should match the first tile in the properties checked below.
+        if ((tile->image->width != firstTile->image->width) || (tile->image->height != firstTile->image->height) ||
+            (tile->image->depth != firstTile->image->depth) || (tile->image->yuvFormat != firstTile->image->yuvFormat) ||
+            (tile->image->yuvRange != firstTile->image->yuvRange) || (tile->image->colorPrimaries != firstTile->image->colorPrimaries) ||
+            (tile->image->transferCharacteristics != firstTile->image->transferCharacteristics) ||
+            (tile->image->matrixCoefficients != firstTile->image->matrixCoefficients)) {
+            avifDiagnosticsPrintf(data->diag, "Grid image contains mismatched tiles");
+            return AVIF_FALSE;
+        }
+    }
+
+    unsigned int rowIndex = tileIndex / info->grid.columns;
+    unsigned int colIndex = tileIndex % info->grid.columns;
+    avifImage srcView;
+    avifImageSetDefaults(&srcView);
+    avifImage dstView;
+    avifImageSetDefaults(&dstView);
+    avifCropRect dstViewRect = {
+        firstTile->image->width * colIndex, firstTile->image->height * rowIndex, firstTile->image->width, firstTile->image->height
+    };
+    if (dstViewRect.x + dstViewRect.width > grid->outputWidth) {
+        dstViewRect.width = grid->outputWidth - dstViewRect.x;
+    }
+    if (dstViewRect.y + dstViewRect.height > grid->outputHeight) {
+        dstViewRect.height = grid->outputHeight - dstViewRect.y;
+    }
+    const avifCropRect srcViewRect = { 0, 0, dstViewRect.width, dstViewRect.height };
+    avifImage * dst = dstImage;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    if (tile->input->itemCategory == AVIF_ITEM_GAIN_MAP) {
+        dst = dst->gainMap.image;
+        assert(dst);
+    }
+#endif
+    if ((avifImageSetViewRect(&dstView, dst, &dstViewRect) != AVIF_RESULT_OK) ||
+        (avifImageSetViewRect(&srcView, tile->image, &srcViewRect) != AVIF_RESULT_OK)) {
+        assert(AVIF_FALSE);
+        return AVIF_FALSE;
+    }
+    avifImageCopySamples(&dstView, &srcView, (tile->input->itemCategory == AVIF_ITEM_ALPHA) ? AVIF_PLANES_A : AVIF_PLANES_YUV);
+
+    return AVIF_TRUE;
+}
+
+// If colorId == 0 (a sentinel value as item IDs must be nonzero), accept any found EXIF/XMP metadata. Passing in 0
+// is used when finding metadata in a meta box embedded in a trak box, as any items inside of a meta box that is
+// inside of a trak box are implicitly associated to the track.
+static avifResult avifDecoderFindMetadata(avifDecoder * decoder, avifMeta * meta, avifImage * image, uint32_t colorId)
+{
+    if (decoder->ignoreExif && decoder->ignoreXMP) {
+        // Nothing to do!
+        return AVIF_RESULT_OK;
+    }
+
+    for (uint32_t itemIndex = 0; itemIndex < meta->items.count; ++itemIndex) {
+        avifDecoderItem * item = &meta->items.item[itemIndex];
+        if (!item->size) {
+            continue;
+        }
+        if (item->hasUnsupportedEssentialProperty) {
+            // An essential property isn't supported by libavif; ignore the item.
+            continue;
+        }
+
+        if ((colorId > 0) && (item->descForID != colorId)) {
+            // Not a content description (metadata) for the colorOBU, skip it
+            continue;
+        }
+
+        if (!decoder->ignoreExif && !memcmp(item->type, "Exif", 4)) {
+            avifROData exifContents;
+            avifResult readResult = avifDecoderItemRead(item, decoder->io, &exifContents, 0, 0, &decoder->diag);
+            if (readResult != AVIF_RESULT_OK) {
+                return readResult;
+            }
+
+            // Advance past Annex A.2.1's header
+            BEGIN_STREAM(exifBoxStream, exifContents.data, exifContents.size, &decoder->diag, "Exif header");
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+            // The CondensedImageBox does not signal the exifTiffHeaderOffset.
+            if (!meta->fromConi)
+#endif
+            {
+                uint32_t exifTiffHeaderOffset;
+                AVIF_CHECKERR(avifROStreamReadU32(&exifBoxStream, &exifTiffHeaderOffset),
+                              AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) exif_tiff_header_offset;
+            }
+
+            AVIF_CHECKRES(avifRWDataSet(&image->exif, avifROStreamCurrent(&exifBoxStream), avifROStreamRemainingBytes(&exifBoxStream)));
+        } else if (!decoder->ignoreXMP && !memcmp(item->type, "mime", 4) &&
+                   !memcmp(item->contentType.contentType, xmpContentType, xmpContentTypeSize)) {
+            avifROData xmpContents;
+            avifResult readResult = avifDecoderItemRead(item, decoder->io, &xmpContents, 0, 0, &decoder->diag);
+            if (readResult != AVIF_RESULT_OK) {
+                return readResult;
+            }
+
+            AVIF_CHECKRES(avifImageSetMetadataXMP(image, xmpContents.data, xmpContents.size));
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+// ---------------------------------------------------------------------------
+// URN
+
+static avifBool isAlphaURN(const char * urn)
+{
+    return !strcmp(urn, AVIF_URN_ALPHA0) || !strcmp(urn, AVIF_URN_ALPHA1);
+}
+
+// ---------------------------------------------------------------------------
+// BMFF Parsing
+
+static avifBool avifParseHandlerBox(const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[hdlr]");
+
+    AVIF_CHECK(avifROStreamReadAndEnforceVersion(&s, 0));
+
+    uint32_t predefined;
+    AVIF_CHECK(avifROStreamReadU32(&s, &predefined)); // unsigned int(32) pre_defined = 0;
+    if (predefined != 0) {
+        avifDiagnosticsPrintf(diag, "Box[hdlr] contains a pre_defined value that is nonzero");
+        return AVIF_FALSE;
+    }
+
+    uint8_t handlerType[4];
+    AVIF_CHECK(avifROStreamRead(&s, handlerType, 4)); // unsigned int(32) handler_type;
+    if (memcmp(handlerType, "pict", 4) != 0) {
+        avifDiagnosticsPrintf(diag, "Box[hdlr] handler_type is not 'pict'");
+        return AVIF_FALSE;
+    }
+
+    for (int i = 0; i < 3; ++i) {
+        uint32_t reserved;
+        AVIF_CHECK(avifROStreamReadU32(&s, &reserved)); // const unsigned int(32)[3] reserved = 0;
+    }
+
+    // Verify that a valid string is here, but don't bother to store it
+    AVIF_CHECK(avifROStreamReadString(&s, NULL, 0)); // string name;
+    return AVIF_TRUE;
+}
+
+static avifResult avifParseItemLocationBox(avifMeta * meta, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[iloc]");
+
+    uint8_t version;
+    AVIF_CHECKERR(avifROStreamReadVersionAndFlags(&s, &version, NULL), AVIF_RESULT_BMFF_PARSE_FAILED);
+    if (version > 2) {
+        avifDiagnosticsPrintf(diag, "Box[iloc] has an unsupported version [%u]", version);
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+
+    uint8_t offsetSize, lengthSize, baseOffsetSize;
+    AVIF_CHECKERR(avifROStreamReadBits8(&s, &offsetSize, /*bitCount=*/4), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(4) offset_size;
+    AVIF_CHECKERR(avifROStreamReadBits8(&s, &lengthSize, /*bitCount=*/4), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(4) length_size;
+    AVIF_CHECKERR(avifROStreamReadBits8(&s, &baseOffsetSize, /*bitCount=*/4), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(4) base_offset_size;
+    if (((version == 1) || (version == 2)) && (baseOffsetSize != 0)) {
+        avifDiagnosticsPrintf(diag, "Box[iloc] has an unsupported base_offset_size [%u]", baseOffsetSize);
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+    uint32_t reserved;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &reserved, /*bitCount=*/4), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(4) reserved;
+
+    uint16_t tmp16;
+    uint32_t itemCount;
+    if (version < 2) {
+        AVIF_CHECKERR(avifROStreamReadU16(&s, &tmp16), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(16) item_count;
+        itemCount = tmp16;
+    } else {
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &itemCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) item_count;
+    }
+    for (uint32_t i = 0; i < itemCount; ++i) {
+        uint32_t itemID;
+        if (version < 2) {
+            AVIF_CHECKERR(avifROStreamReadU16(&s, &tmp16), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(16) item_ID;
+            itemID = tmp16;
+        } else {
+            AVIF_CHECKERR(avifROStreamReadU32(&s, &itemID), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) item_ID;
+        }
+        AVIF_CHECKRES(avifCheckItemID("iloc", itemID, diag));
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+        if (meta->fromConi && itemID < 5) {
+            // This is the extendedMeta field of an enclosing CondensedImageBox.
+            // Item IDs 1 to 4 are reserved and already defined, including their locations.
+            avifDiagnosticsPrintf(diag, "%s: Box[iloc] has a forbidden item ID [%u]", s.diagContext, itemID);
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+
+        avifDecoderItem * item;
+        AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, itemID, &item));
+        if (item->extents.count > 0) {
+            // This item has already been given extents via this iloc box. This is invalid.
+            avifDiagnosticsPrintf(diag, "Item ID [%u] contains duplicate sets of extents", itemID);
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+
+        if ((version == 1) || (version == 2)) {
+            AVIF_CHECKERR(avifROStreamReadBits(&s, &reserved, /*bitCount=*/12), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(12) reserved = 0;
+            if (reserved) {
+                avifDiagnosticsPrintf(diag, "Box[iloc] has a non null reserved field [%u]", reserved);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            uint8_t constructionMethod;
+            AVIF_CHECKERR(avifROStreamReadBits8(&s, &constructionMethod, /*bitCount=*/4),
+                          AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(4) construction_method;
+            if ((constructionMethod != 0 /* file */) && (constructionMethod != 1 /* idat */)) {
+                // construction method item(2) unsupported
+                avifDiagnosticsPrintf(diag, "Box[iloc] has an unsupported construction method [%u]", constructionMethod);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            if (constructionMethod == 1) {
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+                if (meta->fromConi) {
+                    // This is the extendedMeta field of an enclosing CondensedImageBox.
+                    // It may not contain an ItemDataBox.
+                    avifDiagnosticsPrintf(diag, "%s: Box[iloc] has a forbidden construction method [%u]", s.diagContext, constructionMethod);
+                    return AVIF_RESULT_BMFF_PARSE_FAILED;
+                }
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+                item->idatStored = AVIF_TRUE;
+            }
+        }
+
+        uint16_t dataReferenceIndex; // unsigned int(16) data_reference_index;
+        AVIF_CHECKERR(avifROStreamReadU16(&s, &dataReferenceIndex), AVIF_RESULT_BMFF_PARSE_FAILED); //
+        uint64_t baseOffset; // unsigned int(base_offset_size*8) base_offset;
+        AVIF_CHECKERR(avifROStreamReadUX8(&s, &baseOffset, baseOffsetSize), AVIF_RESULT_BMFF_PARSE_FAILED); //
+        uint16_t extentCount;                                                                // unsigned int(16) extent_count;
+        AVIF_CHECKERR(avifROStreamReadU16(&s, &extentCount), AVIF_RESULT_BMFF_PARSE_FAILED); //
+        for (int extentIter = 0; extentIter < extentCount; ++extentIter) {
+            // If extent_index is ever supported, this spec must be implemented here:
+            // ::  if (((version == 1) || (version == 2)) && (index_size > 0)) {
+            // ::      unsigned int(index_size*8) extent_index;
+            // ::  }
+
+            uint64_t extentOffset; // unsigned int(offset_size*8) extent_offset;
+            AVIF_CHECKERR(avifROStreamReadUX8(&s, &extentOffset, offsetSize), AVIF_RESULT_BMFF_PARSE_FAILED);
+            uint64_t extentLength; // unsigned int(offset_size*8) extent_length;
+            AVIF_CHECKERR(avifROStreamReadUX8(&s, &extentLength, lengthSize), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+            avifExtent * extent = (avifExtent *)avifArrayPush(&item->extents);
+            AVIF_CHECKERR(extent != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+            if (extentOffset > UINT64_MAX - baseOffset) {
+                avifDiagnosticsPrintf(diag,
+                                      "Item ID [%u] contains an extent offset which overflows: [base: %" PRIu64 " offset:%" PRIu64 "]",
+                                      itemID,
+                                      baseOffset,
+                                      extentOffset);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            uint64_t offset = baseOffset + extentOffset;
+            extent->offset = offset;
+            if (extentLength > SIZE_MAX) {
+                avifDiagnosticsPrintf(diag, "Item ID [%u] contains an extent length which overflows: [%" PRIu64 "]", itemID, extentLength);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            extent->size = (size_t)extentLength;
+            if (extent->size > SIZE_MAX - item->size) {
+                avifDiagnosticsPrintf(diag,
+                                      "Item ID [%u] contains an extent length which overflows the item size: [%zu, %zu]",
+                                      itemID,
+                                      extent->size,
+                                      item->size);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            item->size += extent->size;
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifBool avifParseImageGridBox(avifImageGrid * grid,
+                                      const uint8_t * raw,
+                                      size_t rawLen,
+                                      uint32_t imageSizeLimit,
+                                      uint32_t imageDimensionLimit,
+                                      avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[grid]");
+
+    uint8_t version, flags;
+    AVIF_CHECK(avifROStreamRead(&s, &version, 1)); // unsigned int(8) version = 0;
+    if (version != 0) {
+        avifDiagnosticsPrintf(diag, "Box[grid] has unsupported version [%u]", version);
+        return AVIF_FALSE;
+    }
+    uint8_t rowsMinusOne, columnsMinusOne;
+    AVIF_CHECK(avifROStreamRead(&s, &flags, 1));           // unsigned int(8) flags;
+    AVIF_CHECK(avifROStreamRead(&s, &rowsMinusOne, 1));    // unsigned int(8) rows_minus_one;
+    AVIF_CHECK(avifROStreamRead(&s, &columnsMinusOne, 1)); // unsigned int(8) columns_minus_one;
+    grid->rows = (uint32_t)rowsMinusOne + 1;
+    grid->columns = (uint32_t)columnsMinusOne + 1;
+
+    uint32_t fieldLength = ((flags & 1) + 1) * 16;
+    if (fieldLength == 16) {
+        uint16_t outputWidth16, outputHeight16;
+        AVIF_CHECK(avifROStreamReadU16(&s, &outputWidth16));  // unsigned int(FieldLength) output_width;
+        AVIF_CHECK(avifROStreamReadU16(&s, &outputHeight16)); // unsigned int(FieldLength) output_height;
+        grid->outputWidth = outputWidth16;
+        grid->outputHeight = outputHeight16;
+    } else {
+        if (fieldLength != 32) {
+            // This should be impossible
+            avifDiagnosticsPrintf(diag, "Grid box contains illegal field length: [%u]", fieldLength);
+            return AVIF_FALSE;
+        }
+        AVIF_CHECK(avifROStreamReadU32(&s, &grid->outputWidth));  // unsigned int(FieldLength) output_width;
+        AVIF_CHECK(avifROStreamReadU32(&s, &grid->outputHeight)); // unsigned int(FieldLength) output_height;
+    }
+    if ((grid->outputWidth == 0) || (grid->outputHeight == 0)) {
+        avifDiagnosticsPrintf(diag, "Grid box contains illegal dimensions: [%u x %u]", grid->outputWidth, grid->outputHeight);
+        return AVIF_FALSE;
+    }
+    if (avifDimensionsTooLarge(grid->outputWidth, grid->outputHeight, imageSizeLimit, imageDimensionLimit)) {
+        avifDiagnosticsPrintf(diag, "Grid box dimensions are too large: [%u x %u]", grid->outputWidth, grid->outputHeight);
+        return AVIF_FALSE;
+    }
+    return avifROStreamRemainingBytes(&s) == 0;
+}
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+
+static avifBool avifParseToneMappedImageBox(avifGainMapMetadata * metadata, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[tmap]");
+
+    uint8_t version;
+    AVIF_CHECK(avifROStreamRead(&s, &version, 1)); // unsigned int(8) version = 0;
+    if (version != 0) {
+        avifDiagnosticsPrintf(diag, "Box[tmap] has unsupported version [%u]", version);
+        return AVIF_FALSE;
+    }
+
+    uint8_t flags;
+    AVIF_CHECK(avifROStreamRead(&s, &flags, 1)); // unsigned int(8) flags;
+    uint8_t channelCount = (flags & 1) * 2 + 1;
+    assert(channelCount == 1 || channelCount == 3);
+    metadata->useBaseColorSpace = (flags & 2) != 0;
+    metadata->backwardDirection = (flags & 4) != 0;
+    const avifBool useCommonDenominator = (flags & 8) != 0;
+
+    if (useCommonDenominator) {
+        uint32_t commonDenominator;
+        AVIF_CHECK(avifROStreamReadU32(&s, &commonDenominator));
+
+        AVIF_CHECK(avifROStreamReadU32(&s, &metadata->baseHdrHeadroomN));
+        metadata->baseHdrHeadroomD = commonDenominator;
+        AVIF_CHECK(avifROStreamReadU32(&s, &metadata->alternateHdrHeadroomN));
+        metadata->alternateHdrHeadroomD = commonDenominator;
+
+        for (int c = 0; c < channelCount; ++c) {
+            AVIF_CHECK(avifROStreamReadU32(&s, (uint32_t *)&metadata->gainMapMinN[c]));
+            metadata->gainMapMinD[c] = commonDenominator;
+            AVIF_CHECK(avifROStreamReadU32(&s, (uint32_t *)&metadata->gainMapMaxN[c]));
+            metadata->gainMapMaxD[c] = commonDenominator;
+            AVIF_CHECK(avifROStreamReadU32(&s, &metadata->gainMapGammaN[c]));
+            metadata->gainMapGammaD[c] = commonDenominator;
+            AVIF_CHECK(avifROStreamReadU32(&s, (uint32_t *)&metadata->baseOffsetN[c]));
+            metadata->baseOffsetD[c] = commonDenominator;
+            AVIF_CHECK(avifROStreamReadU32(&s, (uint32_t *)&metadata->alternateOffsetN[c]));
+            metadata->alternateOffsetD[c] = commonDenominator;
+        }
+    } else {
+        AVIF_CHECK(avifROStreamReadU32(&s, &metadata->baseHdrHeadroomN));
+        AVIF_CHECK(avifROStreamReadU32(&s, &metadata->baseHdrHeadroomD));
+        AVIF_CHECK(avifROStreamReadU32(&s, &metadata->alternateHdrHeadroomN));
+        AVIF_CHECK(avifROStreamReadU32(&s, &metadata->alternateHdrHeadroomD));
+
+        for (int c = 0; c < channelCount; ++c) {
+            AVIF_CHECK(avifROStreamReadU32(&s, (uint32_t *)&metadata->gainMapMinN[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, &metadata->gainMapMinD[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, (uint32_t *)&metadata->gainMapMaxN[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, &metadata->gainMapMaxD[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, &metadata->gainMapGammaN[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, &metadata->gainMapGammaD[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, (uint32_t *)&metadata->baseOffsetN[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, &metadata->baseOffsetD[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, (uint32_t *)&metadata->alternateOffsetN[c]));
+            AVIF_CHECK(avifROStreamReadU32(&s, &metadata->alternateOffsetD[c]));
+        }
+    }
+
+    // Fill the remaining values by copying those from the first channel.
+    for (int c = channelCount; c < 3; ++c) {
+        metadata->gainMapMinN[c] = metadata->gainMapMinN[0];
+        metadata->gainMapMinD[c] = metadata->gainMapMinD[0];
+        metadata->gainMapMaxN[c] = metadata->gainMapMaxN[0];
+        metadata->gainMapMaxD[c] = metadata->gainMapMaxD[0];
+        metadata->gainMapGammaN[c] = metadata->gainMapGammaN[0];
+        metadata->gainMapGammaD[c] = metadata->gainMapGammaD[0];
+        metadata->baseOffsetN[c] = metadata->baseOffsetN[0];
+        metadata->baseOffsetD[c] = metadata->baseOffsetD[0];
+        metadata->alternateOffsetN[c] = metadata->alternateOffsetN[0];
+        metadata->alternateOffsetD[c] = metadata->alternateOffsetD[0];
+    }
+
+    return avifROStreamRemainingBytes(&s) == 0;
+}
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
+
+// Extracts the codecType from the item type or from its children.
+// Also parses and outputs grid information if the item is a grid.
+// isItemInInput must be false if the item is a made-up structure
+// (and thus not part of the parseable input bitstream).
+static avifResult avifDecoderItemReadAndParse(const avifDecoder * decoder,
+                                              avifDecoderItem * item,
+                                              avifBool isItemInInput,
+                                              avifImageGrid * grid,
+                                              avifCodecType * codecType)
+{
+    if (!memcmp(item->type, "grid", 4)) {
+        if (isItemInInput) {
+            avifROData readData;
+            AVIF_CHECKRES(avifDecoderItemRead(item, decoder->io, &readData, 0, 0, decoder->data->diag));
+            AVIF_CHECKERR(avifParseImageGridBox(grid,
+                                                readData.data,
+                                                readData.size,
+                                                decoder->imageSizeLimit,
+                                                decoder->imageDimensionLimit,
+                                                decoder->data->diag),
+                          AVIF_RESULT_INVALID_IMAGE_GRID);
+        } else {
+            // item was generated for convenience and is not part of the bitstream.
+            // grid information should already be set.
+            assert(grid->rows > 0 && grid->columns > 0);
+        }
+        *codecType = avifDecoderItemGetGridCodecType(item);
+        AVIF_CHECKERR(*codecType != AVIF_CODEC_TYPE_UNKNOWN, AVIF_RESULT_INVALID_IMAGE_GRID);
+    } else {
+        *codecType = avifGetCodecType(item->type);
+        assert(*codecType != AVIF_CODEC_TYPE_UNKNOWN);
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifBool avifParseImageSpatialExtentsProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[ispe]");
+    AVIF_CHECK(avifROStreamReadAndEnforceVersion(&s, 0));
+
+    avifImageSpatialExtents * ispe = &prop->u.ispe;
+    AVIF_CHECK(avifROStreamReadU32(&s, &ispe->width));
+    AVIF_CHECK(avifROStreamReadU32(&s, &ispe->height));
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseAuxiliaryTypeProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[auxC]");
+    AVIF_CHECK(avifROStreamReadAndEnforceVersion(&s, 0));
+
+    AVIF_CHECK(avifROStreamReadString(&s, prop->u.auxC.auxType, AUXTYPE_SIZE));
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseColourInformationBox(avifProperty * prop, uint64_t rawOffset, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[colr]");
+
+    avifColourInformationBox * colr = &prop->u.colr;
+    colr->hasICC = AVIF_FALSE;
+    colr->hasNCLX = AVIF_FALSE;
+
+    uint8_t colorType[4]; // unsigned int(32) colour_type;
+    AVIF_CHECK(avifROStreamRead(&s, colorType, 4));
+    if (!memcmp(colorType, "rICC", 4) || !memcmp(colorType, "prof", 4)) {
+        colr->hasICC = AVIF_TRUE;
+        // Remember the offset of the ICC payload relative to the beginning of the stream. A direct pointer cannot be stored
+        // because decoder->io->persistent could have been AVIF_FALSE when obtaining raw through decoder->io->read().
+        // The bytes could be copied now instead of remembering the offset, but it is as invasive as passing rawOffset everywhere.
+        colr->iccOffset = rawOffset + avifROStreamOffset(&s);
+        colr->iccSize = avifROStreamRemainingBytes(&s);
+    } else if (!memcmp(colorType, "nclx", 4)) {
+        AVIF_CHECK(avifROStreamReadU16(&s, &colr->colorPrimaries));          // unsigned int(16) colour_primaries;
+        AVIF_CHECK(avifROStreamReadU16(&s, &colr->transferCharacteristics)); // unsigned int(16) transfer_characteristics;
+        AVIF_CHECK(avifROStreamReadU16(&s, &colr->matrixCoefficients));      // unsigned int(16) matrix_coefficients;
+        uint8_t full_range_flag;
+        AVIF_CHECK(avifROStreamReadBits8(&s, &full_range_flag, /*bitCount=*/1)); // unsigned int(1) full_range_flag;
+        colr->range = full_range_flag ? AVIF_RANGE_FULL : AVIF_RANGE_LIMITED;
+        uint8_t reserved;
+        AVIF_CHECK(avifROStreamReadBits8(&s, &reserved, /*bitCount=*/7)); // unsigned int(7) reserved = 0;
+        if (reserved) {
+            avifDiagnosticsPrintf(diag, "Box[colr] contains nonzero reserved bits [%u]", reserved);
+            return AVIF_FALSE;
+        }
+        colr->hasNCLX = AVIF_TRUE;
+    }
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseContentLightLevelInformationBox(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[clli]");
+
+    avifContentLightLevelInformationBox * clli = &prop->u.clli;
+
+    AVIF_CHECK(avifROStreamReadU16(&s, &clli->maxCLL));  // unsigned int(16) max_content_light_level
+    AVIF_CHECK(avifROStreamReadU16(&s, &clli->maxPALL)); // unsigned int(16) max_pic_average_light_level
+    return AVIF_TRUE;
+}
+
+// Implementation of section 2.3.3 of AV1 Codec ISO Media File Format Binding specification v1.2.0.
+// See https://aomediacodec.github.io/av1-isobmff/v1.2.0.html#av1codecconfigurationbox-syntax.
+static avifBool avifParseCodecConfiguration(avifROStream * s, avifCodecConfigurationBox * config, const char * configPropName, avifDiagnostics * diag)
+{
+    uint32_t marker, version;
+    AVIF_CHECK(avifROStreamReadBits(s, &marker, /*bitCount=*/1)); // unsigned int (1) marker = 1;
+    if (!marker) {
+        avifDiagnosticsPrintf(diag, "%s contains illegal marker: [%u]", configPropName, marker);
+        return AVIF_FALSE;
+    }
+    AVIF_CHECK(avifROStreamReadBits(s, &version, /*bitCount=*/7)); // unsigned int (7) version = 1;
+    if (version != 1) {
+        avifDiagnosticsPrintf(diag, "%s contains illegal version: [%u]", configPropName, version);
+        return AVIF_FALSE;
+    }
+
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->seqProfile, /*bitCount=*/3));           // unsigned int (3) seq_profile;
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->seqLevelIdx0, /*bitCount=*/5));         // unsigned int (5) seq_level_idx_0;
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->seqTier0, /*bitCount=*/1));             // unsigned int (1) seq_tier_0;
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->highBitdepth, /*bitCount=*/1));         // unsigned int (1) high_bitdepth;
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->twelveBit, /*bitCount=*/1));            // unsigned int (1) twelve_bit;
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->monochrome, /*bitCount=*/1));           // unsigned int (1) monochrome;
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->chromaSubsamplingX, /*bitCount=*/1));   // unsigned int (1) chroma_subsampling_x;
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->chromaSubsamplingY, /*bitCount=*/1));   // unsigned int (1) chroma_subsampling_y;
+    AVIF_CHECK(avifROStreamReadBits8(s, &config->chromaSamplePosition, /*bitCount=*/2)); // unsigned int (2) chroma_sample_position;
+
+    // unsigned int (3) reserved = 0;
+    // unsigned int (1) initial_presentation_delay_present;
+    // if (initial_presentation_delay_present) {
+    //   unsigned int (4) initial_presentation_delay_minus_one;
+    // } else {
+    //   unsigned int (4) reserved = 0;
+    // }
+    AVIF_CHECK(avifROStreamSkip(s, /*byteCount=*/1));
+
+    // According to section 2.2.1 of AV1 Image File Format specification v1.1.0:
+    //   - Sequence Header OBUs should not be present in the AV1CodecConfigurationBox.
+    //   - If a Sequence Header OBU is present in the AV1CodecConfigurationBox,
+    //     it shall match the Sequence Header OBU in the AV1 Image Item Data.
+    //   - Metadata OBUs, if present, shall match the values given in other item properties,
+    //     such as the PixelInformationProperty or ColourInformationBox.
+    // See https://aomediacodec.github.io/av1-avif/v1.1.0.html#av1-configuration-item-property.
+    // For simplicity, the constraints above are not enforced.
+    // The following is skipped by avifParseItemPropertyContainerBox().
+    // unsigned int (8) configOBUs[];
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseCodecConfigurationBoxProperty(avifProperty * prop,
+                                                       const uint8_t * raw,
+                                                       size_t rawLen,
+                                                       const char * configPropName,
+                                                       avifDiagnostics * diag)
+{
+    char diagContext[10];
+    snprintf(diagContext, sizeof(diagContext), "Box[%.4s]", configPropName); // "Box[av1C]" or "Box[av2C]"
+    BEGIN_STREAM(s, raw, rawLen, diag, diagContext);
+    return avifParseCodecConfiguration(&s, &prop->u.av1C, configPropName, diag);
+}
+
+static avifBool avifParsePixelAspectRatioBoxProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[pasp]");
+
+    avifPixelAspectRatioBox * pasp = &prop->u.pasp;
+    AVIF_CHECK(avifROStreamReadU32(&s, &pasp->hSpacing)); // unsigned int(32) hSpacing;
+    AVIF_CHECK(avifROStreamReadU32(&s, &pasp->vSpacing)); // unsigned int(32) vSpacing;
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseCleanApertureBoxProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[clap]");
+
+    avifCleanApertureBox * clap = &prop->u.clap;
+    AVIF_CHECK(avifROStreamReadU32(&s, &clap->widthN));    // unsigned int(32) cleanApertureWidthN;
+    AVIF_CHECK(avifROStreamReadU32(&s, &clap->widthD));    // unsigned int(32) cleanApertureWidthD;
+    AVIF_CHECK(avifROStreamReadU32(&s, &clap->heightN));   // unsigned int(32) cleanApertureHeightN;
+    AVIF_CHECK(avifROStreamReadU32(&s, &clap->heightD));   // unsigned int(32) cleanApertureHeightD;
+    AVIF_CHECK(avifROStreamReadU32(&s, &clap->horizOffN)); // unsigned int(32) horizOffN;
+    AVIF_CHECK(avifROStreamReadU32(&s, &clap->horizOffD)); // unsigned int(32) horizOffD;
+    AVIF_CHECK(avifROStreamReadU32(&s, &clap->vertOffN));  // unsigned int(32) vertOffN;
+    AVIF_CHECK(avifROStreamReadU32(&s, &clap->vertOffD));  // unsigned int(32) vertOffD;
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseImageRotationProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[irot]");
+
+    avifImageRotation * irot = &prop->u.irot;
+    uint8_t reserved;
+    AVIF_CHECK(avifROStreamReadBits8(&s, &reserved, /*bitCount=*/6)); // unsigned int (6) reserved = 0;
+    if (reserved) {
+        avifDiagnosticsPrintf(diag, "Box[irot] contains nonzero reserved bits [%u]", reserved);
+        return AVIF_FALSE;
+    }
+    AVIF_CHECK(avifROStreamReadBits8(&s, &irot->angle, /*bitCount=*/2)); // unsigned int (2) angle;
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseImageMirrorProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[imir]");
+
+    avifImageMirror * imir = &prop->u.imir;
+    uint8_t reserved;
+    AVIF_CHECK(avifROStreamReadBits8(&s, &reserved, /*bitCount=*/7)); // unsigned int(7) reserved = 0;
+    if (reserved) {
+        avifDiagnosticsPrintf(diag, "Box[imir] contains nonzero reserved bits [%u]", reserved);
+        return AVIF_FALSE;
+    }
+    AVIF_CHECK(avifROStreamReadBits8(&s, &imir->axis, /*bitCount=*/1)); // unsigned int(1) axis;
+    return AVIF_TRUE;
+}
+
+static avifBool avifParsePixelInformationProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[pixi]");
+    AVIF_CHECK(avifROStreamReadAndEnforceVersion(&s, 0));
+
+    avifPixelInformationProperty * pixi = &prop->u.pixi;
+    AVIF_CHECK(avifROStreamRead(&s, &pixi->planeCount, 1)); // unsigned int (8) num_channels;
+    if (pixi->planeCount > MAX_PIXI_PLANE_DEPTHS) {
+        avifDiagnosticsPrintf(diag, "Box[pixi] contains unsupported plane count [%u]", pixi->planeCount);
+        return AVIF_FALSE;
+    }
+    for (uint8_t i = 0; i < pixi->planeCount; ++i) {
+        AVIF_CHECK(avifROStreamRead(&s, &pixi->planeDepths[i], 1)); // unsigned int (8) bits_per_channel;
+    }
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseOperatingPointSelectorProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[a1op]");
+
+    avifOperatingPointSelectorProperty * a1op = &prop->u.a1op;
+    AVIF_CHECK(avifROStreamRead(&s, &a1op->opIndex, 1));
+    if (a1op->opIndex > 31) { // 31 is AV1's max operating point value
+        avifDiagnosticsPrintf(diag, "Box[a1op] contains an unsupported operating point [%u]", a1op->opIndex);
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseLayerSelectorProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[lsel]");
+
+    avifLayerSelectorProperty * lsel = &prop->u.lsel;
+    AVIF_CHECK(avifROStreamReadU16(&s, &lsel->layerID));
+    if ((lsel->layerID != 0xFFFF) && (lsel->layerID >= AVIF_MAX_AV1_LAYER_COUNT)) {
+        avifDiagnosticsPrintf(diag, "Box[lsel] contains an unsupported layer [%u]", lsel->layerID);
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseAV1LayeredImageIndexingProperty(avifProperty * prop, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[a1lx]");
+
+    avifAV1LayeredImageIndexingProperty * a1lx = &prop->u.a1lx;
+
+    uint8_t largeSize = 0;
+    AVIF_CHECK(avifROStreamRead(&s, &largeSize, 1));
+    if (largeSize & 0xFE) {
+        avifDiagnosticsPrintf(diag, "Box[a1lx] has bits set in the reserved section [%u]", largeSize);
+        return AVIF_FALSE;
+    }
+
+    for (int i = 0; i < 3; ++i) {
+        if (largeSize) {
+            AVIF_CHECK(avifROStreamReadU32(&s, &a1lx->layerSize[i]));
+        } else {
+            uint16_t layerSize16;
+            AVIF_CHECK(avifROStreamReadU16(&s, &layerSize16));
+            a1lx->layerSize[i] = (uint32_t)layerSize16;
+        }
+    }
+
+    // Layer sizes will be validated later (when the item's size is known)
+    return AVIF_TRUE;
+}
+
+static avifResult avifParseItemPropertyContainerBox(avifPropertyArray * properties,
+                                                    uint64_t rawOffset,
+                                                    const uint8_t * raw,
+                                                    size_t rawLen,
+                                                    avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[ipco]");
+
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        avifProperty * prop = avifArrayPush(properties);
+        AVIF_CHECKERR(prop != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        memcpy(prop->type, header.type, 4);
+        if (!memcmp(header.type, "ispe", 4)) {
+            AVIF_CHECKERR(avifParseImageSpatialExtentsProperty(prop, avifROStreamCurrent(&s), header.size, diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "auxC", 4)) {
+            AVIF_CHECKERR(avifParseAuxiliaryTypeProperty(prop, avifROStreamCurrent(&s), header.size, diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "colr", 4)) {
+            AVIF_CHECKERR(avifParseColourInformationBox(prop, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), header.size, diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "av1C", 4)) {
+            AVIF_CHECKERR(avifParseCodecConfigurationBoxProperty(prop, avifROStreamCurrent(&s), header.size, "av1C", diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+#if defined(AVIF_CODEC_AVM)
+        } else if (!memcmp(header.type, "av2C", 4)) {
+            AVIF_CHECKERR(avifParseCodecConfigurationBoxProperty(prop, avifROStreamCurrent(&s), header.size, "av2C", diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+#endif
+        } else if (!memcmp(header.type, "pasp", 4)) {
+            AVIF_CHECKERR(avifParsePixelAspectRatioBoxProperty(prop, avifROStreamCurrent(&s), header.size, diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "clap", 4)) {
+            AVIF_CHECKERR(avifParseCleanApertureBoxProperty(prop, avifROStreamCurrent(&s), header.size, diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "irot", 4)) {
+            AVIF_CHECKERR(avifParseImageRotationProperty(prop, avifROStreamCurrent(&s), header.size, diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "imir", 4)) {
+            AVIF_CHECKERR(avifParseImageMirrorProperty(prop, avifROStreamCurrent(&s), header.size, diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "pixi", 4)) {
+            AVIF_CHECKERR(avifParsePixelInformationProperty(prop, avifROStreamCurrent(&s), header.size, diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "a1op", 4)) {
+            AVIF_CHECKERR(avifParseOperatingPointSelectorProperty(prop, avifROStreamCurrent(&s), header.size, diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "lsel", 4)) {
+            AVIF_CHECKERR(avifParseLayerSelectorProperty(prop, avifROStreamCurrent(&s), header.size, diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "a1lx", 4)) {
+            AVIF_CHECKERR(avifParseAV1LayeredImageIndexingProperty(prop, avifROStreamCurrent(&s), header.size, diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "clli", 4)) {
+            AVIF_CHECKERR(avifParseContentLightLevelInformationBox(prop, avifROStreamCurrent(&s), header.size, diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, header.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseItemPropertyAssociation(avifMeta * meta, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag, uint32_t * outVersionAndFlags)
+{
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    if (meta->fromConi) {
+        // The CondensedImageBox will always create 8 item properties, so to refer to the
+        // first property in the ItemPropertyContainerBox of its extendedMeta field, use index 9.
+        assert(meta->properties.count >= 8);
+    }
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+
+    // NOTE: If this function ever adds support for versions other than [0,1] or flags other than
+    //       [0,1], please increase the value of MAX_IPMA_VERSION_AND_FLAGS_SEEN accordingly.
+
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[ipma]");
+
+    uint8_t version;
+    uint32_t flags;
+    AVIF_CHECKERR(avifROStreamReadVersionAndFlags(&s, &version, &flags), AVIF_RESULT_BMFF_PARSE_FAILED);
+    avifBool propertyIndexIsU15 = ((flags & 0x1) != 0);
+    *outVersionAndFlags = ((uint32_t)version << 24) | flags;
+
+    uint32_t entryCount;
+    AVIF_CHECKERR(avifROStreamReadU32(&s, &entryCount), AVIF_RESULT_BMFF_PARSE_FAILED);
+    unsigned int prevItemID = 0;
+    for (uint32_t entryIndex = 0; entryIndex < entryCount; ++entryIndex) {
+        // ISO/IEC 23008-12, First edition, 2017-12, Section 9.3.1:
+        //   Each ItemPropertyAssociation box shall be ordered by increasing item_ID, and there shall
+        //   be at most one association box for each item_ID, in any ItemPropertyAssociation box.
+        unsigned int itemID;
+        if (version < 1) {
+            uint16_t tmp;
+            AVIF_CHECKERR(avifROStreamReadU16(&s, &tmp), AVIF_RESULT_BMFF_PARSE_FAILED);
+            itemID = tmp;
+        } else {
+            AVIF_CHECKERR(avifROStreamReadU32(&s, &itemID), AVIF_RESULT_BMFF_PARSE_FAILED);
+        }
+        AVIF_CHECKRES(avifCheckItemID("ipma", itemID, diag));
+        if (itemID <= prevItemID) {
+            avifDiagnosticsPrintf(diag, "Box[ipma] item IDs are not ordered by increasing ID");
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+        prevItemID = itemID;
+
+        avifDecoderItem * item;
+        AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, itemID, &item));
+        if (item->ipmaSeen) {
+            avifDiagnosticsPrintf(diag, "Duplicate Box[ipma] for item ID [%u]", itemID);
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+        item->ipmaSeen = AVIF_TRUE;
+
+        uint8_t associationCount;
+        AVIF_CHECKERR(avifROStreamRead(&s, &associationCount, 1), AVIF_RESULT_BMFF_PARSE_FAILED);
+        for (uint8_t associationIndex = 0; associationIndex < associationCount; ++associationIndex) {
+            uint8_t essential;
+            AVIF_CHECKERR(avifROStreamReadBits8(&s, &essential, /*bitCount=*/1), AVIF_RESULT_BMFF_PARSE_FAILED); // bit(1) essential;
+            uint32_t propertyIndex;
+            AVIF_CHECKERR(avifROStreamReadBits(&s, &propertyIndex, /*bitCount=*/propertyIndexIsU15 ? 15 : 7),
+                          AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(7/15) property_index;
+
+            if (propertyIndex == 0) {
+                // Not associated with any item
+                continue;
+            }
+            --propertyIndex; // 1-indexed
+
+            if (propertyIndex >= meta->properties.count) {
+                avifDiagnosticsPrintf(diag,
+                                      "Box[ipma] for item ID [%u] contains an illegal property index [%u] (out of [%u] properties)",
+                                      itemID,
+                                      propertyIndex,
+                                      meta->properties.count);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+
+            // Copy property to item
+            const avifProperty * srcProp = &meta->properties.prop[propertyIndex];
+
+            static const char * supportedTypes[] = {
+                "ispe",
+                "auxC",
+                "colr",
+                "av1C",
+#if defined(AVIF_CODEC_AVM)
+                "av2C",
+#endif
+                "pasp",
+                "clap",
+                "irot",
+                "imir",
+                "pixi",
+                "a1op",
+                "lsel",
+                "a1lx",
+                "clli"
+            };
+            size_t supportedTypesCount = sizeof(supportedTypes) / sizeof(supportedTypes[0]);
+            avifBool supportedType = AVIF_FALSE;
+            for (size_t i = 0; i < supportedTypesCount; ++i) {
+                if (!memcmp(srcProp->type, supportedTypes[i], 4)) {
+                    supportedType = AVIF_TRUE;
+                    break;
+                }
+            }
+            if (supportedType) {
+                if (essential) {
+                    // Verify that it is legal for this property to be flagged as essential. Any
+                    // types in this list are *required* in the spec to not be flagged as essential
+                    // when associated with an item.
+                    static const char * const nonessentialTypes[] = {
+
+                        // AVIF: Section 2.3.2.3.2: "If associated, it shall not be marked as essential."
+                        "a1lx"
+
+                    };
+                    size_t nonessentialTypesCount = sizeof(nonessentialTypes) / sizeof(nonessentialTypes[0]);
+                    for (size_t i = 0; i < nonessentialTypesCount; ++i) {
+                        if (!memcmp(srcProp->type, nonessentialTypes[i], 4)) {
+                            avifDiagnosticsPrintf(diag,
+                                                  "Item ID [%u] has a %s property association which must not be marked essential, but is",
+                                                  itemID,
+                                                  nonessentialTypes[i]);
+                            return AVIF_RESULT_BMFF_PARSE_FAILED;
+                        }
+                    }
+                } else {
+                    // Verify that it is legal for this property to not be flagged as essential. Any
+                    // types in this list are *required* in the spec to be flagged as essential when
+                    // associated with an item.
+                    static const char * const essentialTypes[] = {
+
+                        // AVIF: Section 2.3.2.1.1: "If associated, it shall be marked as essential."
+                        "a1op",
+
+                        // HEIF: Section 6.5.11.1: "essential shall be equal to 1 for an 'lsel' item property."
+                        "lsel"
+
+                    };
+                    size_t essentialTypesCount = sizeof(essentialTypes) / sizeof(essentialTypes[0]);
+                    for (size_t i = 0; i < essentialTypesCount; ++i) {
+                        if (!memcmp(srcProp->type, essentialTypes[i], 4)) {
+                            avifDiagnosticsPrintf(diag,
+                                                  "Item ID [%u] has a %s property association which must be marked essential, but is not",
+                                                  itemID,
+                                                  essentialTypes[i]);
+                            return AVIF_RESULT_BMFF_PARSE_FAILED;
+                        }
+                    }
+                }
+
+                // Supported and valid; associate it with this item.
+                avifProperty * dstProp = (avifProperty *)avifArrayPush(&item->properties);
+                AVIF_CHECKERR(dstProp != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+                *dstProp = *srcProp;
+            } else {
+                if (essential) {
+                    // Discovered an essential item property that libavif doesn't support!
+                    // Make a note to ignore this item later.
+                    item->hasUnsupportedEssentialProperty = AVIF_TRUE;
+                }
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifBool avifParsePrimaryItemBox(avifMeta * meta, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    if (meta->primaryItemID > 0) {
+        // Illegal to have multiple pitm boxes, bail out
+        avifDiagnosticsPrintf(diag, "Multiple boxes of unique Box[pitm] found");
+        return AVIF_FALSE;
+    }
+
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[pitm]");
+
+    uint8_t version;
+    AVIF_CHECK(avifROStreamReadVersionAndFlags(&s, &version, NULL));
+
+    if (version == 0) {
+        uint16_t tmp16;
+        AVIF_CHECK(avifROStreamReadU16(&s, &tmp16)); // unsigned int(16) item_ID;
+        meta->primaryItemID = tmp16;
+    } else {
+        AVIF_CHECK(avifROStreamReadU32(&s, &meta->primaryItemID)); // unsigned int(32) item_ID;
+    }
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseItemDataBox(avifMeta * meta, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    // Check to see if we've already seen an idat box for this meta box. If so, bail out
+    if (meta->idat.size > 0) {
+        avifDiagnosticsPrintf(diag, "Meta box contains multiple idat boxes");
+        return AVIF_FALSE;
+    }
+    if (rawLen == 0) {
+        avifDiagnosticsPrintf(diag, "idat box has a length of 0");
+        return AVIF_FALSE;
+    }
+
+    if (avifRWDataSet(&meta->idat, raw, rawLen) != AVIF_RESULT_OK) {
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+static avifResult avifParseItemPropertiesBox(avifMeta * meta, uint64_t rawOffset, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[iprp]");
+
+    avifBoxHeader ipcoHeader;
+    AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &ipcoHeader), AVIF_RESULT_BMFF_PARSE_FAILED);
+    if (memcmp(ipcoHeader.type, "ipco", 4)) {
+        avifDiagnosticsPrintf(diag, "Failed to find Box[ipco] as the first box in Box[iprp]");
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+
+    // Read all item properties inside of ItemPropertyContainerBox
+    AVIF_CHECKRES(avifParseItemPropertyContainerBox(&meta->properties,
+                                                    rawOffset + avifROStreamOffset(&s),
+                                                    avifROStreamCurrent(&s),
+                                                    ipcoHeader.size,
+                                                    diag));
+    AVIF_CHECKERR(avifROStreamSkip(&s, ipcoHeader.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    uint32_t versionAndFlagsSeen[MAX_IPMA_VERSION_AND_FLAGS_SEEN];
+    uint32_t versionAndFlagsSeenCount = 0;
+
+    // Now read all ItemPropertyAssociation until the end of the box, and make associations
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader ipmaHeader;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &ipmaHeader), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (!memcmp(ipmaHeader.type, "ipma", 4)) {
+            uint32_t versionAndFlags;
+            AVIF_CHECKRES(avifParseItemPropertyAssociation(meta, avifROStreamCurrent(&s), ipmaHeader.size, diag, &versionAndFlags));
+            for (uint32_t i = 0; i < versionAndFlagsSeenCount; ++i) {
+                if (versionAndFlagsSeen[i] == versionAndFlags) {
+                    // HEIF (ISO 23008-12:2017) 9.3.1 - There shall be at most one
+                    // ItemPropertyAssociation box with a given pair of values of version and
+                    // flags.
+                    avifDiagnosticsPrintf(diag, "Multiple Box[ipma] with a given pair of values of version and flags. See HEIF (ISO 23008-12:2017) 9.3.1");
+                    return AVIF_RESULT_BMFF_PARSE_FAILED;
+                }
+            }
+            if (versionAndFlagsSeenCount == MAX_IPMA_VERSION_AND_FLAGS_SEEN) {
+                avifDiagnosticsPrintf(diag, "Exceeded possible count of unique ipma version and flags tuples");
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            versionAndFlagsSeen[versionAndFlagsSeenCount] = versionAndFlags;
+            ++versionAndFlagsSeenCount;
+        } else {
+            // These must all be type ipma
+            avifDiagnosticsPrintf(diag, "Box[iprp] contains a box that isn't type 'ipma'");
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, ipmaHeader.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseItemInfoEntry(avifMeta * meta, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[infe]");
+
+    uint8_t version;
+    uint32_t flags;
+    AVIF_CHECKERR(avifROStreamReadVersionAndFlags(&s, &version, &flags), AVIF_RESULT_BMFF_PARSE_FAILED);
+    // Version 2+ is required for item_type
+    if (version != 2 && version != 3) {
+        avifDiagnosticsPrintf(s.diag, "%s: Expecting box version 2 or 3, got version %u", s.diagContext, version);
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+    // TODO: check flags. ISO/IEC 23008-12:2017, Section 9.2 says:
+    //   The flags field of ItemInfoEntry with version greater than or equal to 2 is specified as
+    //   follows:
+    //
+    //   (flags & 1) equal to 1 indicates that the item is not intended to be a part of the
+    //   presentation. For example, when (flags & 1) is equal to 1 for an image item, the image
+    //   item should not be displayed.
+    //   (flags & 1) equal to 0 indicates that the item is intended to be a part of the
+    //   presentation.
+    //
+    // See also Section 6.4.2.
+
+    uint32_t itemID;
+    if (version == 2) {
+        uint16_t tmp;
+        AVIF_CHECKERR(avifROStreamReadU16(&s, &tmp), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(16) item_ID;
+        itemID = tmp;
+    } else {
+        assert(version == 3);
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &itemID), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) item_ID;
+    }
+    AVIF_CHECKRES(avifCheckItemID("infe", itemID, diag));
+    uint16_t itemProtectionIndex; // unsigned int(16) item_protection_index;
+    AVIF_CHECKERR(avifROStreamReadU16(&s, &itemProtectionIndex), AVIF_RESULT_BMFF_PARSE_FAILED); //
+    uint8_t itemType[4];                                                                         // unsigned int(32) item_type;
+    AVIF_CHECKERR(avifROStreamRead(&s, itemType, 4), AVIF_RESULT_BMFF_PARSE_FAILED);             //
+
+    avifContentType contentType;
+    if (!memcmp(itemType, "mime", 4)) {
+        AVIF_CHECKERR(avifROStreamReadString(&s, NULL, 0), AVIF_RESULT_BMFF_PARSE_FAILED); // string item_name; (skipped)
+        AVIF_CHECKERR(avifROStreamReadString(&s, contentType.contentType, CONTENTTYPE_SIZE), AVIF_RESULT_BMFF_PARSE_FAILED); // string content_type;
+    } else {
+        memset(&contentType, 0, sizeof(contentType));
+    }
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    if (meta->fromConi && itemID < 5) {
+        // This is the extendedMeta field of an enclosing CondensedImageBox.
+        // itemID 1 is reserved for the primary color item, 2 for the alpha auxiliary item,
+        // 3 for the Exif metadata item and 4 for the XMP metadata item.
+        avifDiagnosticsPrintf(diag, "%s: Box[infe] of type %.4s has a forbidden item ID [%u]", s.diagContext, itemType, itemID);
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+    avifDecoderItem * item;
+    AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, itemID, &item));
+
+    memcpy(item->type, itemType, sizeof(itemType));
+    item->contentType = contentType;
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseItemInfoBox(avifMeta * meta, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[iinf]");
+
+    uint8_t version;
+    AVIF_CHECKERR(avifROStreamReadVersionAndFlags(&s, &version, NULL), AVIF_RESULT_BMFF_PARSE_FAILED);
+    uint32_t entryCount;
+    if (version == 0) {
+        uint16_t tmp;
+        AVIF_CHECKERR(avifROStreamReadU16(&s, &tmp), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(16) entry_count;
+        entryCount = tmp;
+    } else if (version == 1) {
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &entryCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) entry_count;
+    } else {
+        avifDiagnosticsPrintf(diag, "Box[iinf] has an unsupported version %u", version);
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+
+    for (uint32_t entryIndex = 0; entryIndex < entryCount; ++entryIndex) {
+        avifBoxHeader infeHeader;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &infeHeader), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (!memcmp(infeHeader.type, "infe", 4)) {
+            AVIF_CHECKRES(avifParseItemInfoEntry(meta, avifROStreamCurrent(&s), infeHeader.size, diag));
+        } else {
+            // These must all be type infe
+            avifDiagnosticsPrintf(diag, "Box[iinf] contains a box that isn't type 'infe'");
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, infeHeader.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseItemReferenceBox(avifMeta * meta, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[iref]");
+
+    uint8_t version;
+    AVIF_CHECKERR(avifROStreamReadVersionAndFlags(&s, &version, NULL), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader irefHeader;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &irefHeader), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        uint32_t fromID = 0;
+        if (version == 0) {
+            uint16_t tmp;
+            AVIF_CHECKERR(avifROStreamReadU16(&s, &tmp), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(16) from_item_ID;
+            fromID = tmp;
+            AVIF_CHECKRES(avifCheckItemID("iref", fromID, diag)); // ISO 14496-12 section 8.11.12.1: "index values start at 1"
+        } else if (version == 1) {
+            AVIF_CHECKERR(avifROStreamReadU32(&s, &fromID), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) from_item_ID;
+            AVIF_CHECKRES(avifCheckItemID("iref", fromID, diag));
+        } else {
+            // unsupported iref version, skip it
+            break;
+        }
+
+        uint16_t referenceCount = 0;
+        AVIF_CHECKERR(avifROStreamReadU16(&s, &referenceCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(16) reference_count;
+
+        for (uint16_t refIndex = 0; refIndex < referenceCount; ++refIndex) {
+            uint32_t toID = 0;
+            if (version == 0) {
+                uint16_t tmp;
+                AVIF_CHECKERR(avifROStreamReadU16(&s, &tmp), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(16) to_item_ID;
+                toID = tmp;
+                AVIF_CHECKRES(avifCheckItemID("iref", toID, diag));
+            } else if (version == 1) {
+                AVIF_CHECKERR(avifROStreamReadU32(&s, &toID), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) to_item_ID;
+                AVIF_CHECKRES(avifCheckItemID("iref", toID, diag));
+            } else {
+                // unsupported iref version, skip it
+                break;
+            }
+
+            // Read this reference as "{fromID} is a {irefType} for {toID}"
+            if (fromID && toID) {
+                avifDecoderItem * item;
+                AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, fromID, &item));
+
+                if (!memcmp(irefHeader.type, "thmb", 4)) {
+                    item->thumbnailForID = toID;
+                } else if (!memcmp(irefHeader.type, "auxl", 4)) {
+                    item->auxForID = toID;
+                } else if (!memcmp(irefHeader.type, "cdsc", 4)) {
+                    item->descForID = toID;
+                } else if (!memcmp(irefHeader.type, "dimg", 4)) {
+                    // derived images refer in the opposite direction
+                    avifDecoderItem * dimg;
+                    AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, toID, &dimg));
+
+                    dimg->dimgForID = fromID;
+                    dimg->dimgIdx = refIndex;
+                } else if (!memcmp(irefHeader.type, "prem", 4)) {
+                    item->premByID = toID;
+                }
+            }
+        }
+    }
+
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseMetaBox(avifMeta * meta, uint64_t rawOffset, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[meta]");
+
+    AVIF_CHECKERR(avifROStreamReadAndEnforceVersion(&s, 0), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    ++meta->idatID; // for tracking idat
+
+    avifBool firstBox = AVIF_TRUE;
+    uint32_t uniqueBoxFlags = 0;
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (firstBox) {
+            if (!memcmp(header.type, "hdlr", 4)) {
+                AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 0, "meta", "hdlr", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+                AVIF_CHECKERR(avifParseHandlerBox(avifROStreamCurrent(&s), header.size, diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+                firstBox = AVIF_FALSE;
+            } else {
+                // hdlr must be the first box!
+                avifDiagnosticsPrintf(diag, "Box[meta] does not have a Box[hdlr] as its first child box");
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+        } else if (!memcmp(header.type, "iloc", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 1, "meta", "iloc", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseItemLocationBox(meta, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "pitm", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 2, "meta", "pitm", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKERR(avifParsePrimaryItemBox(meta, avifROStreamCurrent(&s), header.size, diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "idat", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 3, "meta", "idat", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKERR(avifParseItemDataBox(meta, avifROStreamCurrent(&s), header.size, diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "iprp", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 4, "meta", "iprp", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseItemPropertiesBox(meta, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "iinf", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 5, "meta", "iinf", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseItemInfoBox(meta, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "iref", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 6, "meta", "iref", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseItemReferenceBox(meta, avifROStreamCurrent(&s), header.size, diag));
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, header.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    if (firstBox) {
+        // The meta box must not be empty (it must contain at least a hdlr box)
+        avifDiagnosticsPrintf(diag, "Box[meta] has no child boxes");
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifBool avifParseTrackHeaderBox(avifTrack * track,
+                                        const uint8_t * raw,
+                                        size_t rawLen,
+                                        uint32_t imageSizeLimit,
+                                        uint32_t imageDimensionLimit,
+                                        avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[tkhd]");
+
+    uint8_t version;
+    AVIF_CHECK(avifROStreamReadVersionAndFlags(&s, &version, NULL));
+
+    uint32_t ignored32, trackID;
+    uint64_t ignored64;
+    if (version == 1) {
+        AVIF_CHECK(avifROStreamReadU64(&s, &ignored64));            // unsigned int(64) creation_time;
+        AVIF_CHECK(avifROStreamReadU64(&s, &ignored64));            // unsigned int(64) modification_time;
+        AVIF_CHECK(avifROStreamReadU32(&s, &trackID));              // unsigned int(32) track_ID;
+        AVIF_CHECK(avifROStreamReadU32(&s, &ignored32));            // const unsigned int(32) reserved = 0;
+        AVIF_CHECK(avifROStreamReadU64(&s, &track->trackDuration)); // unsigned int(64) duration;
+    } else if (version == 0) {
+        uint32_t trackDuration;
+        AVIF_CHECK(avifROStreamReadU32(&s, &ignored32));     // unsigned int(32) creation_time;
+        AVIF_CHECK(avifROStreamReadU32(&s, &ignored32));     // unsigned int(32) modification_time;
+        AVIF_CHECK(avifROStreamReadU32(&s, &trackID));       // unsigned int(32) track_ID;
+        AVIF_CHECK(avifROStreamReadU32(&s, &ignored32));     // const unsigned int(32) reserved = 0;
+        AVIF_CHECK(avifROStreamReadU32(&s, &trackDuration)); // unsigned int(32) duration;
+        track->trackDuration = (trackDuration == AVIF_INDEFINITE_DURATION32) ? AVIF_INDEFINITE_DURATION64 : trackDuration;
+    } else {
+        // Unsupported version
+        avifDiagnosticsPrintf(diag, "Box[tkhd] has an unsupported version [%u]", version);
+        return AVIF_FALSE;
+    }
+
+    // Skipping the following 52 bytes here:
+    // ------------------------------------
+    // const unsigned int(32)[2] reserved = 0;
+    // template int(16) layer = 0;
+    // template int(16) alternate_group = 0;
+    // template int(16) volume = {if track_is_audio 0x0100 else 0};
+    // const unsigned int(16) reserved = 0;
+    // template int(32)[9] matrix= { 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 }; // unity matrix
+    AVIF_CHECK(avifROStreamSkip(&s, 52));
+
+    uint32_t width, height;
+    AVIF_CHECK(avifROStreamReadU32(&s, &width));  // unsigned int(32) width;
+    AVIF_CHECK(avifROStreamReadU32(&s, &height)); // unsigned int(32) height;
+    track->width = width >> 16;
+    track->height = height >> 16;
+
+    if ((track->width == 0) || (track->height == 0)) {
+        avifDiagnosticsPrintf(diag, "Track ID [%u] has an invalid size [%ux%u]", track->id, track->width, track->height);
+        return AVIF_FALSE;
+    }
+    if (avifDimensionsTooLarge(track->width, track->height, imageSizeLimit, imageDimensionLimit)) {
+        avifDiagnosticsPrintf(diag, "Track ID [%u] dimensions are too large [%ux%u]", track->id, track->width, track->height);
+        return AVIF_FALSE;
+    }
+
+    // TODO: support scaling based on width/height track header info?
+
+    track->id = trackID;
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseMediaHeaderBox(avifTrack * track, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[mdhd]");
+
+    uint8_t version;
+    AVIF_CHECK(avifROStreamReadVersionAndFlags(&s, &version, NULL));
+
+    uint32_t ignored32, mediaTimescale, mediaDuration32;
+    uint64_t ignored64, mediaDuration64;
+    if (version == 1) {
+        AVIF_CHECK(avifROStreamReadU64(&s, &ignored64));       // unsigned int(64) creation_time;
+        AVIF_CHECK(avifROStreamReadU64(&s, &ignored64));       // unsigned int(64) modification_time;
+        AVIF_CHECK(avifROStreamReadU32(&s, &mediaTimescale));  // unsigned int(32) timescale;
+        AVIF_CHECK(avifROStreamReadU64(&s, &mediaDuration64)); // unsigned int(64) duration;
+        track->mediaDuration = mediaDuration64;
+    } else if (version == 0) {
+        AVIF_CHECK(avifROStreamReadU32(&s, &ignored32));       // unsigned int(32) creation_time;
+        AVIF_CHECK(avifROStreamReadU32(&s, &ignored32));       // unsigned int(32) modification_time;
+        AVIF_CHECK(avifROStreamReadU32(&s, &mediaTimescale));  // unsigned int(32) timescale;
+        AVIF_CHECK(avifROStreamReadU32(&s, &mediaDuration32)); // unsigned int(32) duration;
+        track->mediaDuration = (uint64_t)mediaDuration32;
+    } else {
+        // Unsupported version
+        avifDiagnosticsPrintf(diag, "Box[mdhd] has an unsupported version [%u]", version);
+        return AVIF_FALSE;
+    }
+
+    track->mediaTimescale = mediaTimescale;
+    return AVIF_TRUE;
+}
+
+static avifResult avifParseChunkOffsetBox(avifSampleTable * sampleTable, avifBool largeOffsets, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, largeOffsets ? "Box[co64]" : "Box[stco]");
+
+    AVIF_CHECKERR(avifROStreamReadAndEnforceVersion(&s, 0), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    uint32_t entryCount;
+    AVIF_CHECKERR(avifROStreamReadU32(&s, &entryCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) entry_count;
+    for (uint32_t i = 0; i < entryCount; ++i) {
+        uint64_t offset;
+        if (largeOffsets) {
+            AVIF_CHECKERR(avifROStreamReadU64(&s, &offset), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) chunk_offset;
+        } else {
+            uint32_t offset32;
+            AVIF_CHECKERR(avifROStreamReadU32(&s, &offset32), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) chunk_offset;
+            offset = (uint64_t)offset32;
+        }
+
+        avifSampleTableChunk * chunk = (avifSampleTableChunk *)avifArrayPush(&sampleTable->chunks);
+        AVIF_CHECKERR(chunk != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        chunk->offset = offset;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseSampleToChunkBox(avifSampleTable * sampleTable, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[stsc]");
+
+    AVIF_CHECKERR(avifROStreamReadAndEnforceVersion(&s, 0), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    uint32_t entryCount;
+    AVIF_CHECKERR(avifROStreamReadU32(&s, &entryCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) entry_count;
+    uint32_t prevFirstChunk = 0;
+    for (uint32_t i = 0; i < entryCount; ++i) {
+        avifSampleTableSampleToChunk * sampleToChunk = (avifSampleTableSampleToChunk *)avifArrayPush(&sampleTable->sampleToChunks);
+        AVIF_CHECKERR(sampleToChunk != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &sampleToChunk->firstChunk), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) first_chunk;
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &sampleToChunk->samplesPerChunk), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) samples_per_chunk;
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &sampleToChunk->sampleDescriptionIndex),
+                      AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) sample_description_index;
+        // The first_chunk fields should start with 1 and be strictly increasing.
+        if (i == 0) {
+            if (sampleToChunk->firstChunk != 1) {
+                avifDiagnosticsPrintf(diag, "Box[stsc] does not begin with chunk 1 [%u]", sampleToChunk->firstChunk);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+        } else {
+            if (sampleToChunk->firstChunk <= prevFirstChunk) {
+                avifDiagnosticsPrintf(diag, "Box[stsc] chunks are not strictly increasing");
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+        }
+        prevFirstChunk = sampleToChunk->firstChunk;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseSampleSizeBox(avifSampleTable * sampleTable, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[stsz]");
+
+    AVIF_CHECKERR(avifROStreamReadAndEnforceVersion(&s, 0), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    uint32_t allSamplesSize, sampleCount;
+    AVIF_CHECKERR(avifROStreamReadU32(&s, &allSamplesSize), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) sample_size;
+    AVIF_CHECKERR(avifROStreamReadU32(&s, &sampleCount), AVIF_RESULT_BMFF_PARSE_FAILED);    // unsigned int(32) sample_count;
+
+    if (allSamplesSize > 0) {
+        sampleTable->allSamplesSize = allSamplesSize;
+    } else {
+        for (uint32_t i = 0; i < sampleCount; ++i) {
+            avifSampleTableSampleSize * sampleSize = (avifSampleTableSampleSize *)avifArrayPush(&sampleTable->sampleSizes);
+            AVIF_CHECKERR(sampleSize != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+            AVIF_CHECKERR(avifROStreamReadU32(&s, &sampleSize->size), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) entry_size;
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseSyncSampleBox(avifSampleTable * sampleTable, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[stss]");
+
+    AVIF_CHECKERR(avifROStreamReadAndEnforceVersion(&s, 0), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    uint32_t entryCount;
+    AVIF_CHECKERR(avifROStreamReadU32(&s, &entryCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) entry_count;
+
+    for (uint32_t i = 0; i < entryCount; ++i) {
+        uint32_t sampleNumber = 0;
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &sampleNumber), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) sample_number;
+        avifSyncSample * syncSample = (avifSyncSample *)avifArrayPush(&sampleTable->syncSamples);
+        AVIF_CHECKERR(syncSample != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        syncSample->sampleNumber = sampleNumber;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseTimeToSampleBox(avifSampleTable * sampleTable, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[stts]");
+
+    AVIF_CHECKERR(avifROStreamReadAndEnforceVersion(&s, 0), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    uint32_t entryCount;
+    AVIF_CHECKERR(avifROStreamReadU32(&s, &entryCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) entry_count;
+
+    for (uint32_t i = 0; i < entryCount; ++i) {
+        avifSampleTableTimeToSample * timeToSample = (avifSampleTableTimeToSample *)avifArrayPush(&sampleTable->timeToSamples);
+        AVIF_CHECKERR(timeToSample != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &timeToSample->sampleCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) sample_count;
+        AVIF_CHECKERR(avifROStreamReadU32(&s, &timeToSample->sampleDelta), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) sample_delta;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseSampleDescriptionBox(avifSampleTable * sampleTable,
+                                                uint64_t rawOffset,
+                                                const uint8_t * raw,
+                                                size_t rawLen,
+                                                avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[stsd]");
+
+    AVIF_CHECKERR(avifROStreamReadAndEnforceVersion(&s, 0), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    uint32_t entryCount;
+    AVIF_CHECKERR(avifROStreamReadU32(&s, &entryCount), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(32) entry_count;
+
+    for (uint32_t i = 0; i < entryCount; ++i) {
+        avifBoxHeader sampleEntryHeader;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &sampleEntryHeader), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        avifSampleDescription * description = (avifSampleDescription *)avifArrayPush(&sampleTable->sampleDescriptions);
+        AVIF_CHECKERR(description != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        if (!avifArrayCreate(&description->properties, sizeof(avifProperty), 16)) {
+            avifArrayPop(&sampleTable->sampleDescriptions);
+            return AVIF_RESULT_OUT_OF_MEMORY;
+        }
+        memcpy(description->format, sampleEntryHeader.type, sizeof(description->format));
+        size_t remainingBytes = avifROStreamRemainingBytes(&s);
+        if ((avifGetCodecType(description->format) != AVIF_CODEC_TYPE_UNKNOWN) && (remainingBytes > VISUALSAMPLEENTRY_SIZE)) {
+            AVIF_CHECKRES(avifParseItemPropertyContainerBox(&description->properties,
+                                                            rawOffset + avifROStreamOffset(&s) + VISUALSAMPLEENTRY_SIZE,
+                                                            avifROStreamCurrent(&s) + VISUALSAMPLEENTRY_SIZE,
+                                                            remainingBytes - VISUALSAMPLEENTRY_SIZE,
+                                                            diag));
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, sampleEntryHeader.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseSampleTableBox(avifTrack * track, uint64_t rawOffset, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    if (track->sampleTable) {
+        // A TrackBox may only have one SampleTable
+        avifDiagnosticsPrintf(diag, "Duplicate Box[stbl] for a single track detected");
+        return AVIF_FALSE;
+    }
+    track->sampleTable = avifSampleTableCreate();
+    AVIF_CHECKERR(track->sampleTable != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[stbl]");
+
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (!memcmp(header.type, "stco", 4)) {
+            AVIF_CHECKRES(avifParseChunkOffsetBox(track->sampleTable, AVIF_FALSE, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "co64", 4)) {
+            AVIF_CHECKRES(avifParseChunkOffsetBox(track->sampleTable, AVIF_TRUE, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "stsc", 4)) {
+            AVIF_CHECKRES(avifParseSampleToChunkBox(track->sampleTable, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "stsz", 4)) {
+            AVIF_CHECKRES(avifParseSampleSizeBox(track->sampleTable, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "stss", 4)) {
+            AVIF_CHECKRES(avifParseSyncSampleBox(track->sampleTable, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "stts", 4)) {
+            AVIF_CHECKRES(avifParseTimeToSampleBox(track->sampleTable, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "stsd", 4)) {
+            AVIF_CHECKRES(avifParseSampleDescriptionBox(track->sampleTable,
+                                                        rawOffset + avifROStreamOffset(&s),
+                                                        avifROStreamCurrent(&s),
+                                                        header.size,
+                                                        diag));
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, header.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseMediaInformationBox(avifTrack * track, uint64_t rawOffset, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[minf]");
+
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (!memcmp(header.type, "stbl", 4)) {
+            AVIF_CHECKRES(avifParseSampleTableBox(track, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), header.size, diag));
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, header.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseMediaBox(avifTrack * track, uint64_t rawOffset, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[mdia]");
+
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (!memcmp(header.type, "mdhd", 4)) {
+            AVIF_CHECKERR(avifParseMediaHeaderBox(track, avifROStreamCurrent(&s), header.size, diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "minf", 4)) {
+            AVIF_CHECKRES(
+                avifParseMediaInformationBox(track, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), header.size, diag));
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, header.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifBool avifTrackReferenceBox(avifTrack * track, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[tref]");
+
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECK(avifROStreamReadBoxHeader(&s, &header));
+
+        if (!memcmp(header.type, "auxl", 4)) {
+            uint32_t toID;
+            AVIF_CHECK(avifROStreamReadU32(&s, &toID));                       // unsigned int(32) track_IDs[];
+            AVIF_CHECK(avifROStreamSkip(&s, header.size - sizeof(uint32_t))); // just take the first one
+            track->auxForID = toID;
+        } else if (!memcmp(header.type, "prem", 4)) {
+            uint32_t byID;
+            AVIF_CHECK(avifROStreamReadU32(&s, &byID));                       // unsigned int(32) track_IDs[];
+            AVIF_CHECK(avifROStreamSkip(&s, header.size - sizeof(uint32_t))); // just take the first one
+            track->premByID = byID;
+        } else {
+            AVIF_CHECK(avifROStreamSkip(&s, header.size));
+        }
+    }
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseEditListBox(avifTrack * track, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[elst]");
+
+    uint8_t version;
+    uint32_t flags;
+    AVIF_CHECK(avifROStreamReadVersionAndFlags(&s, &version, &flags));
+
+    if ((flags & 1) == 0) {
+        track->isRepeating = AVIF_FALSE;
+        return AVIF_TRUE;
+    }
+
+    track->isRepeating = AVIF_TRUE;
+    uint32_t entryCount;
+    AVIF_CHECK(avifROStreamReadU32(&s, &entryCount)); // unsigned int(32) entry_count;
+    if (entryCount != 1) {
+        avifDiagnosticsPrintf(diag, "Box[elst] contains an entry_count != 1 [%d]", entryCount);
+        return AVIF_FALSE;
+    }
+
+    if (version == 1) {
+        AVIF_CHECK(avifROStreamReadU64(&s, &track->segmentDuration)); // unsigned int(64) segment_duration;
+    } else if (version == 0) {
+        uint32_t segmentDuration;
+        AVIF_CHECK(avifROStreamReadU32(&s, &segmentDuration)); // unsigned int(32) segment_duration;
+        track->segmentDuration = segmentDuration;
+    } else {
+        // Unsupported version
+        avifDiagnosticsPrintf(diag, "Box[elst] has an unsupported version [%u]", version);
+        return AVIF_FALSE;
+    }
+    if (track->segmentDuration == 0) {
+        avifDiagnosticsPrintf(diag, "Box[elst] Invalid value for segment_duration (0).");
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+static avifBool avifParseEditBox(avifTrack * track, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[edts]");
+
+    avifBool elstBoxSeen = AVIF_FALSE;
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECK(avifROStreamReadBoxHeader(&s, &header));
+
+        if (!memcmp(header.type, "elst", 4)) {
+            if (elstBoxSeen) {
+                avifDiagnosticsPrintf(diag, "More than one [elst] Box was found.");
+                return AVIF_FALSE;
+            }
+            AVIF_CHECK(avifParseEditListBox(track, avifROStreamCurrent(&s), header.size, diag));
+            elstBoxSeen = AVIF_TRUE;
+        }
+        AVIF_CHECK(avifROStreamSkip(&s, header.size));
+    }
+    if (!elstBoxSeen) {
+        avifDiagnosticsPrintf(diag, "Box[edts] contains no [elst] Box.");
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+static avifResult avifParseTrackBox(avifDecoderData * data,
+                                    uint64_t rawOffset,
+                                    const uint8_t * raw,
+                                    size_t rawLen,
+                                    uint32_t imageSizeLimit,
+                                    uint32_t imageDimensionLimit)
+{
+    BEGIN_STREAM(s, raw, rawLen, data->diag, "Box[trak]");
+
+    avifTrack * track = avifDecoderDataCreateTrack(data);
+    AVIF_CHECKERR(track != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+
+    avifBool edtsBoxSeen = AVIF_FALSE;
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (!memcmp(header.type, "tkhd", 4)) {
+            AVIF_CHECKERR(avifParseTrackHeaderBox(track, avifROStreamCurrent(&s), header.size, imageSizeLimit, imageDimensionLimit, data->diag),
+                          AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "meta", 4)) {
+            AVIF_CHECKRES(
+                avifParseMetaBox(track->meta, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), header.size, data->diag));
+        } else if (!memcmp(header.type, "mdia", 4)) {
+            AVIF_CHECKRES(avifParseMediaBox(track, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), header.size, data->diag));
+        } else if (!memcmp(header.type, "tref", 4)) {
+            AVIF_CHECKERR(avifTrackReferenceBox(track, avifROStreamCurrent(&s), header.size, data->diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+        } else if (!memcmp(header.type, "edts", 4)) {
+            if (edtsBoxSeen) {
+                avifDiagnosticsPrintf(data->diag, "More than one [edts] Box was found.");
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            AVIF_CHECKERR(avifParseEditBox(track, avifROStreamCurrent(&s), header.size, data->diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            edtsBoxSeen = AVIF_TRUE;
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, header.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    if (!edtsBoxSeen) {
+        track->repetitionCount = AVIF_REPETITION_COUNT_UNKNOWN;
+    } else if (track->isRepeating) {
+        if (track->trackDuration == AVIF_INDEFINITE_DURATION64) {
+            // If isRepeating is true and the track duration is unknown/indefinite, then set the repetition count to infinite
+            // (Section 9.6.1 of ISO/IEC 23008-12 Part 12).
+            track->repetitionCount = AVIF_REPETITION_COUNT_INFINITE;
+        } else {
+            // Section 9.6.1. of ISO/IEC 23008-12 Part 12: 1, the entire edit list is repeated a sufficient number of times to
+            // equal the track duration.
+            //
+            // Since libavif uses repetitionCount (which is 0-based), we subtract the value by 1 to derive the number of
+            // repetitions.
+            assert(track->segmentDuration != 0);
+            // We specifically check for trackDuration == 0 here and not when it is actually read in order to accept files which
+            // inadvertently has a trackDuration of 0 without any edit lists.
+            if (track->trackDuration == 0) {
+                avifDiagnosticsPrintf(data->diag, "Invalid track duration 0.");
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            const uint64_t repetitionCount =
+                (track->trackDuration / track->segmentDuration) + (track->trackDuration % track->segmentDuration != 0) - 1;
+            if (repetitionCount > INT_MAX) {
+                // repetitionCount does not fit in an integer and hence it is
+                // likely to be a very large value. So, we just set it to
+                // infinite.
+                track->repetitionCount = AVIF_REPETITION_COUNT_INFINITE;
+            } else {
+                track->repetitionCount = (int)repetitionCount;
+            }
+        }
+    } else {
+        track->repetitionCount = 0;
+    }
+
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifParseMovieBox(avifDecoderData * data,
+                                    uint64_t rawOffset,
+                                    const uint8_t * raw,
+                                    size_t rawLen,
+                                    uint32_t imageSizeLimit,
+                                    uint32_t imageDimensionLimit)
+{
+    BEGIN_STREAM(s, raw, rawLen, data->diag, "Box[moov]");
+
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (!memcmp(header.type, "trak", 4)) {
+            AVIF_CHECKRES(
+                avifParseTrackBox(data, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), header.size, imageSizeLimit, imageDimensionLimit));
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, header.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    return AVIF_RESULT_OK;
+}
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+static avifResult avifParseExtendedMeta(avifMeta * meta, uint64_t rawOffset, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "extendedMeta");
+    // The extendedMeta field has no size and box type because these are already set by the CondensedImageBox.
+
+    uint32_t uniqueBoxFlags = 0;
+    while (avifROStreamHasBytesLeft(&s, 1)) {
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeader(&s, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+
+        if (!memcmp(header.type, "hdlr", 4) || !memcmp(header.type, "dinf", 4) || !memcmp(header.type, "idat", 4) ||
+            !memcmp(header.type, "pitm", 4)) {
+            avifDiagnosticsPrintf(diag, "Box[coni] shall have no Box[%.4s] in its extendedMeta field", (const char *)header.type);
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        } else if (!memcmp(header.type, "iinf", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 5, "coni", "iinf", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseItemInfoBox(meta, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "iloc", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 1, "coni", "iloc", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseItemLocationBox(meta, avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "iprp", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 4, "coni", "iprp", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseItemPropertiesBox(meta, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), header.size, diag));
+        } else if (!memcmp(header.type, "iref", 4)) {
+            AVIF_CHECKERR(uniqueBoxSeen(&uniqueBoxFlags, 6, "coni", "iref", diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseItemReferenceBox(meta, avifROStreamCurrent(&s), header.size, diag));
+        }
+
+        AVIF_CHECKERR(avifROStreamSkip(&s, header.size), AVIF_RESULT_BMFF_PARSE_FAILED);
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifProperty * avifMetaCreateProperty(avifMeta * meta, const char * propertyType)
+{
+    avifProperty * metaProperty = avifArrayPush(&meta->properties);
+    AVIF_CHECK(metaProperty);
+    memcpy(metaProperty->type, propertyType, 4);
+    return metaProperty;
+}
+
+static avifProperty * avifDecoderItemAddProperty(avifDecoderItem * item, const avifProperty * metaProperty)
+{
+    avifProperty * itemProperty = avifArrayPush(&item->properties);
+    AVIF_CHECK(itemProperty);
+    *itemProperty = *metaProperty;
+    return itemProperty;
+}
+
+static avifResult avifParseCondensedImageBox(avifMeta * meta, uint64_t rawOffset, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    // Experimental box.
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[coni]");
+
+    meta->fromConi = AVIF_TRUE;
+
+    // Read the bit fields.
+    // TODO(yguyon): Implement or return an appropriate error in cases where AVIF_RESULT_NOT_IMPLEMENTED is returned.
+
+    uint32_t version;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &version, 2), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(2) version;
+    AVIF_CHECKERR(version == 0, AVIF_RESULT_NOT_IMPLEMENTED);
+
+    uint32_t width, height;
+    AVIF_CHECKERR(avifROStreamReadVarInt(&s, &width), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) width_minus_one;
+    AVIF_CHECKERR(width != UINT32_MAX, AVIF_RESULT_BMFF_PARSE_FAILED);
+    ++width;
+    AVIF_CHECKERR(avifROStreamReadVarInt(&s, &height), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) height_minus_one;
+    AVIF_CHECKERR(height != UINT32_MAX, AVIF_RESULT_BMFF_PARSE_FAILED);
+    ++height;
+
+    uint32_t isFloat;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &isFloat, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) is_float;
+    AVIF_CHECKERR(!isFloat, AVIF_RESULT_NOT_IMPLEMENTED);
+    uint32_t bitDepth;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &bitDepth, 4), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) bit_depth_minus_one;
+    ++bitDepth;
+    AVIF_CHECKERR((bitDepth == 8) || (bitDepth == 10) || (bitDepth == 12), AVIF_RESULT_UNSUPPORTED_DEPTH);
+    uint32_t isMonochrome;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &isMonochrome, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) is_monochrome;
+    uint32_t isSubsampled = AVIF_FALSE;
+    if (!isMonochrome) {
+        AVIF_CHECKERR(avifROStreamReadBits(&s, &isSubsampled, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) is_subsampled;
+    }
+    uint32_t fullRange;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &fullRange, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) full_range;
+    uint32_t colorType;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &colorType, 2), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(2) color_type;
+    uint32_t colorPrimaries;
+    uint32_t transferCharacteristics;
+    uint32_t matrixCoefficients;
+    uint32_t iccDataSize;
+    if (colorType == AVIF_CONI_COLOR_TYPE_ICC) {
+        colorPrimaries = AVIF_COLOR_PRIMARIES_UNSPECIFIED;
+        transferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED;
+        AVIF_CHECKERR(avifROStreamReadBits(&s, &matrixCoefficients, 8), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(8) matrix_coefficients;
+        AVIF_CHECKERR(avifROStreamReadVarInt(&s, &iccDataSize), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) icc_data_size_minus_one;
+        AVIF_CHECKERR(iccDataSize != UINT32_MAX, AVIF_RESULT_BMFF_PARSE_FAILED);
+        ++iccDataSize;
+    } else if (colorType == AVIF_CONI_COLOR_TYPE_SRGB) {
+        // sRGB
+        colorPrimaries = AVIF_COLOR_PRIMARIES_BT709;
+        transferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_SRGB;
+        matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT601;
+        iccDataSize = 0;
+    } else {
+        const uint32_t numBitsPerComponent = (colorType == AVIF_CONI_COLOR_TYPE_NCLX_5BIT) ? 5 : 8;
+        AVIF_CHECKERR(avifROStreamReadBits(&s, &colorPrimaries, numBitsPerComponent),
+                      AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(5/8) color_primaries;
+        AVIF_CHECKERR(avifROStreamReadBits(&s, &transferCharacteristics, numBitsPerComponent),
+                      AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(5/8) transfer_characteristics;
+        AVIF_CHECKERR(avifROStreamReadBits(&s, &matrixCoefficients, numBitsPerComponent),
+                      AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(5/8) matrix_coefficients;
+        iccDataSize = 0;
+    }
+
+    uint32_t hasExplicitCodecTypes;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &hasExplicitCodecTypes, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) has_explicit_codec_types;
+    AVIF_CHECKERR(!hasExplicitCodecTypes, AVIF_RESULT_NOT_IMPLEMENTED);
+    uint32_t colorItemCodecConfigSize, colorItemDataSize;
+    AVIF_CHECKERR(avifROStreamReadVarInt(&s, &colorItemCodecConfigSize), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) main_item_codec_config_size;
+    AVIF_CHECKERR(colorItemCodecConfigSize == 4, AVIF_RESULT_NOT_IMPLEMENTED);
+    AVIF_CHECKERR(avifROStreamReadVarInt(&s, &colorItemDataSize), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) main_item_data_size_minus_one;
+    AVIF_CHECKERR(colorItemDataSize != UINT32_MAX, AVIF_RESULT_BMFF_PARSE_FAILED);
+    ++colorItemDataSize;
+
+    uint32_t hasAlpha;
+    uint32_t alphaIsPremultiplied = AVIF_FALSE;
+    uint32_t alphaItemDataSize = 0;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &hasAlpha, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) has_alpha;
+    if (hasAlpha) {
+        AVIF_CHECKERR(avifROStreamReadBits(&s, &alphaIsPremultiplied, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) alpha_is_premultiplied;
+        uint32_t alphaItemCodecConfigSize;
+        AVIF_CHECKERR(avifROStreamReadVarInt(&s, &alphaItemCodecConfigSize), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) alpha_item_codec_config_size;
+        AVIF_CHECKERR(alphaItemCodecConfigSize == 4, AVIF_RESULT_NOT_IMPLEMENTED);
+        AVIF_CHECKERR(avifROStreamReadVarInt(&s, &alphaItemDataSize), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) alpha_item_data_size;
+    }
+
+    uint32_t hasExtendedMeta, hasExif, hasXMP;
+    uint32_t extendedMetaSize = 0, exifSize = 0, xmpSize = 0;
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &hasExtendedMeta, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) has_extended_meta;
+    if (hasExtendedMeta) {
+        AVIF_CHECKERR(avifROStreamReadVarInt(&s, &extendedMetaSize), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) extended_meta_size_minus_one;
+        AVIF_CHECKERR(extendedMetaSize != UINT32_MAX, AVIF_RESULT_BMFF_PARSE_FAILED);
+        ++extendedMetaSize;
+    }
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &hasExif, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) has_exif;
+    if (hasExif) {
+        AVIF_CHECKERR(avifROStreamReadVarInt(&s, &exifSize), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) exif_data_size_minus_one;
+        AVIF_CHECKERR(exifSize != UINT32_MAX, AVIF_RESULT_BMFF_PARSE_FAILED);
+        ++exifSize;
+    }
+    AVIF_CHECKERR(avifROStreamReadBits(&s, &hasXMP, 1), AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(1) has_xmp;
+    if (hasXMP) {
+        AVIF_CHECKERR(avifROStreamReadVarInt(&s, &xmpSize), AVIF_RESULT_BMFF_PARSE_FAILED); // varint(32) xmp_data_size_minus_one;
+        AVIF_CHECKERR(xmpSize != UINT32_MAX, AVIF_RESULT_BMFF_PARSE_FAILED);
+        ++xmpSize;
+    }
+
+    // Padding to align with whole bytes if necessary.
+    if (s.numUsedBitsInPartialByte) {
+        uint32_t padding;
+        AVIF_CHECKERR(avifROStreamReadBits(&s, &padding, 8 - s.numUsedBitsInPartialByte), AVIF_RESULT_BMFF_PARSE_FAILED);
+        AVIF_CHECKERR(!padding, AVIF_RESULT_BMFF_PARSE_FAILED); // Only accept zeros as padding.
+    }
+
+    avifCodecConfigurationBox alphaCodecConfig = { 0 };
+    if (hasAlpha) {
+        AVIF_CHECKERR(avifParseCodecConfiguration(&s, &alphaCodecConfig, "coni", diag),
+                      AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(8) alpha_item_codec_config[];
+    }
+    avifCodecConfigurationBox colorCodecConfig;
+    AVIF_CHECKERR(avifParseCodecConfiguration(&s, &colorCodecConfig, "coni", diag),
+                  AVIF_RESULT_BMFF_PARSE_FAILED); // unsigned int(8) main_item_codec_config[];
+
+    // Make sure all extended_meta, metadata and coded chunks fit into the 'coni' box whose size is rawLen.
+    // There should be no missing nor unused byte.
+    AVIF_CHECKERR(avifROStreamRemainingBytes(&s) ==
+                      (uint64_t)extendedMetaSize + iccDataSize + alphaItemDataSize + colorItemDataSize + exifSize + xmpSize,
+                  AVIF_RESULT_BMFF_PARSE_FAILED);
+
+    // Store and update the offset for the following item extents and properties.
+    // The extendedMeta field is parsed after creating the items defined by the CondensedImageBox
+    // so the stream s cannot be used for keeping track of the position.
+    uint64_t offset = rawOffset + avifROStreamOffset(&s) + extendedMetaSize;
+
+    // Create the items and properties generated by the CondensedImageBox.
+    // The CondensedImageBox always creates 8 properties for specification easiness.
+    // Use FreeSpaceBoxes as no-op placeholder properties when necessary.
+    // There is no need to use placeholder items because item IDs do not have to
+    // be contiguous, whereas property indices shall be 1, 2, 3, 4, 5 etc.
+
+    meta->primaryItemID = 1;
+    avifDecoderItem * colorItem;
+    AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, meta->primaryItemID, &colorItem));
+    memcpy(colorItem->type, "av01", 4);
+    colorItem->width = width;
+    colorItem->height = height;
+    colorItem->coniPixelFormat = isMonochrome   ? AVIF_PIXEL_FORMAT_YUV400
+                                 : isSubsampled ? AVIF_PIXEL_FORMAT_YUV420
+                                                : AVIF_PIXEL_FORMAT_YUV444;
+
+    avifDecoderItem * alphaItem = NULL;
+    if (hasAlpha) {
+        AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, /*itemID=*/2, &alphaItem));
+        memcpy(alphaItem->type, "av01", 4);
+        alphaItem->width = width;
+        alphaItem->height = height;
+        alphaItem->coniPixelFormat = AVIF_PIXEL_FORMAT_YUV400;
+    }
+
+    // Property with fixed index 1.
+    avifProperty * colorCodecConfigProp = avifMetaCreateProperty(meta, "av1C");
+    AVIF_CHECKERR(colorCodecConfigProp, AVIF_RESULT_OUT_OF_MEMORY);
+    colorCodecConfigProp->u.av1C = colorCodecConfig;
+    AVIF_CHECKERR(avifDecoderItemAddProperty(colorItem, colorCodecConfigProp), AVIF_RESULT_OUT_OF_MEMORY);
+
+    // Property with fixed index 2.
+    avifProperty * ispeProp = avifMetaCreateProperty(meta, "ispe");
+    AVIF_CHECKERR(ispeProp, AVIF_RESULT_OUT_OF_MEMORY);
+    ispeProp->u.ispe.width = width;
+    ispeProp->u.ispe.height = height;
+    AVIF_CHECKERR(avifDecoderItemAddProperty(colorItem, ispeProp), AVIF_RESULT_OUT_OF_MEMORY);
+
+    // Property with fixed index 3.
+    avifProperty * pixiProp = avifMetaCreateProperty(meta, "pixi");
+    AVIF_CHECKERR(pixiProp, AVIF_RESULT_OUT_OF_MEMORY);
+    pixiProp->u.pixi.planeCount = isMonochrome ? 1 : 3;
+    for (uint8_t plane = 0; plane < pixiProp->u.pixi.planeCount; ++plane) {
+        pixiProp->u.pixi.planeDepths[plane] = (uint8_t)bitDepth;
+    }
+    AVIF_CHECKERR(avifDecoderItemAddProperty(colorItem, pixiProp), AVIF_RESULT_OUT_OF_MEMORY);
+
+    // Property with fixed index 4.
+    avifProperty * colrPropNCLX = avifMetaCreateProperty(meta, "colr");
+    AVIF_CHECKERR(colrPropNCLX, AVIF_RESULT_OUT_OF_MEMORY);
+    colrPropNCLX->u.colr.hasNCLX = AVIF_TRUE; // colour_type "nclx"
+    colrPropNCLX->u.colr.colorPrimaries = (avifColorPrimaries)colorPrimaries;
+    colrPropNCLX->u.colr.transferCharacteristics = (avifTransferCharacteristics)transferCharacteristics;
+    colrPropNCLX->u.colr.matrixCoefficients = (avifMatrixCoefficients)matrixCoefficients;
+    colrPropNCLX->u.colr.range = fullRange ? AVIF_RANGE_FULL : AVIF_RANGE_LIMITED;
+    AVIF_CHECKERR(avifDecoderItemAddProperty(colorItem, colrPropNCLX), AVIF_RESULT_OUT_OF_MEMORY);
+
+    // Property with fixed index 5.
+    if (iccDataSize) {
+        avifProperty * colrPropICC = avifMetaCreateProperty(meta, "colr");
+        AVIF_CHECKERR(colrPropICC, AVIF_RESULT_OUT_OF_MEMORY);
+        colrPropICC->u.colr.hasICC = AVIF_TRUE; // colour_type "rICC" or "prof"
+        colrPropICC->u.colr.iccOffset = offset;
+        colrPropICC->u.colr.iccSize = iccDataSize;
+        offset += iccDataSize;
+        AVIF_CHECKERR(avifDecoderItemAddProperty(colorItem, colrPropICC), AVIF_RESULT_OUT_OF_MEMORY);
+    } else {
+        AVIF_CHECKERR(avifMetaCreateProperty(meta, "skip"), AVIF_RESULT_OUT_OF_MEMORY); // Placeholder.
+    }
+
+    if (hasAlpha) {
+        // Property with fixed index 6.
+        avifProperty * alphaCodecConfigProp = avifMetaCreateProperty(meta, "av1C");
+        AVIF_CHECKERR(alphaCodecConfigProp, AVIF_RESULT_OUT_OF_MEMORY);
+        alphaCodecConfigProp->u.av1C = alphaCodecConfig;
+        AVIF_CHECKERR(avifDecoderItemAddProperty(alphaItem, alphaCodecConfigProp), AVIF_RESULT_OUT_OF_MEMORY);
+
+        // Property with fixed index 7.
+        alphaItem->auxForID = colorItem->id;
+        colorItem->premByID = alphaIsPremultiplied;
+        avifProperty * alphaAuxProp = avifMetaCreateProperty(meta, "auxC");
+        AVIF_CHECKERR(alphaAuxProp, AVIF_RESULT_OUT_OF_MEMORY);
+        strcpy(alphaAuxProp->u.auxC.auxType, AVIF_URN_ALPHA0);
+        AVIF_CHECKERR(avifDecoderItemAddProperty(alphaItem, alphaAuxProp), AVIF_RESULT_OUT_OF_MEMORY);
+
+        // Property with fixed index 2 (reused).
+        AVIF_CHECKERR(avifDecoderItemAddProperty(alphaItem, ispeProp), AVIF_RESULT_OUT_OF_MEMORY);
+
+        // Property with fixed index 8.
+        avifProperty * alphaPixiProp = avifMetaCreateProperty(meta, "pixi");
+        AVIF_CHECKERR(alphaPixiProp, AVIF_RESULT_OUT_OF_MEMORY);
+        memcpy(alphaPixiProp->type, "pixi", 4);
+        alphaPixiProp->u.pixi.planeCount = 1;
+        alphaPixiProp->u.pixi.planeDepths[0] = (uint8_t)bitDepth;
+        AVIF_CHECKERR(avifDecoderItemAddProperty(alphaItem, alphaPixiProp), AVIF_RESULT_OUT_OF_MEMORY);
+    } else {
+        // Placeholders 6, 7 and 8.
+        AVIF_CHECKERR(avifMetaCreateProperty(meta, "skip"), AVIF_RESULT_OUT_OF_MEMORY);
+        AVIF_CHECKERR(avifMetaCreateProperty(meta, "skip"), AVIF_RESULT_OUT_OF_MEMORY);
+        AVIF_CHECKERR(avifMetaCreateProperty(meta, "skip"), AVIF_RESULT_OUT_OF_MEMORY);
+    }
+
+    // Extents.
+
+    if (hasAlpha) {
+        avifExtent * alphaExtent = (avifExtent *)avifArrayPush(&alphaItem->extents);
+        AVIF_CHECKERR(alphaExtent, AVIF_RESULT_OUT_OF_MEMORY);
+        alphaExtent->offset = offset;
+        alphaExtent->size = alphaItemDataSize;
+        offset += alphaItemDataSize;
+        alphaItem->size = alphaItemDataSize;
+    }
+
+    avifExtent * colorExtent = (avifExtent *)avifArrayPush(&colorItem->extents);
+    AVIF_CHECKERR(colorExtent, AVIF_RESULT_OUT_OF_MEMORY);
+    colorExtent->offset = offset;
+    colorExtent->size = colorItemDataSize;
+    offset += colorItemDataSize;
+    colorItem->size = colorItemDataSize;
+
+    if (hasExif) {
+        avifDecoderItem * exifItem;
+        AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, /*itemID=*/3, &exifItem));
+        memcpy(exifItem->type, "Exif", 4);
+        exifItem->descForID = colorItem->id;
+        colorItem->premByID = alphaIsPremultiplied;
+
+        avifExtent * exifExtent = (avifExtent *)avifArrayPush(&exifItem->extents);
+        AVIF_CHECKERR(exifExtent, AVIF_RESULT_OUT_OF_MEMORY);
+        exifExtent->offset = offset;
+        exifExtent->size = exifSize; // Does not include unsigned int(32) exif_tiff_header_offset;
+        offset += exifSize;
+        exifItem->size = exifExtent->size;
+    }
+
+    if (hasXMP) {
+        avifDecoderItem * xmpItem;
+        AVIF_CHECKRES(avifMetaFindOrCreateItem(meta, /*itemID=*/4, &xmpItem));
+        memcpy(xmpItem->type, "mime", 4);
+        memcpy(xmpItem->contentType.contentType, xmpContentType, xmpContentTypeSize);
+        xmpItem->descForID = colorItem->id;
+        colorItem->premByID = alphaIsPremultiplied;
+
+        avifExtent * xmpExtent = (avifExtent *)avifArrayPush(&xmpItem->extents);
+        AVIF_CHECKERR(xmpExtent, AVIF_RESULT_OUT_OF_MEMORY);
+        xmpExtent->offset = offset;
+        xmpExtent->size = xmpSize;
+        offset += xmpSize;
+        xmpItem->size = xmpSize;
+    }
+
+    // Complete the generated virtual MetaBox with the ExtendedMetaBox items and properties.
+    // The ExtendedMetaBox may reuse items and properties created above so it must be parsed last.
+
+    if (hasExtendedMeta) {
+        assert(avifROStreamHasBytesLeft(&s, extendedMetaSize));
+        AVIF_CHECKRES(avifParseExtendedMeta(meta, rawOffset + avifROStreamOffset(&s), avifROStreamCurrent(&s), extendedMetaSize, diag));
+    }
+    return AVIF_RESULT_OK;
+}
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+
+static avifBool avifParseFileTypeBox(avifFileType * ftyp, const uint8_t * raw, size_t rawLen, avifDiagnostics * diag)
+{
+    BEGIN_STREAM(s, raw, rawLen, diag, "Box[ftyp]");
+
+    AVIF_CHECK(avifROStreamRead(&s, ftyp->majorBrand, 4));
+    AVIF_CHECK(avifROStreamReadU32(&s, &ftyp->minorVersion));
+
+    size_t compatibleBrandsBytes = avifROStreamRemainingBytes(&s);
+    if ((compatibleBrandsBytes % 4) != 0) {
+        avifDiagnosticsPrintf(diag, "Box[ftyp] contains a compatible brands section that isn't divisible by 4 [%zu]", compatibleBrandsBytes);
+        return AVIF_FALSE;
+    }
+    ftyp->compatibleBrands = avifROStreamCurrent(&s);
+    AVIF_CHECK(avifROStreamSkip(&s, compatibleBrandsBytes));
+    ftyp->compatibleBrandsCount = (int)compatibleBrandsBytes / 4;
+
+    return AVIF_TRUE;
+}
+
+static avifBool avifFileTypeHasBrand(avifFileType * ftyp, const char * brand);
+static avifBool avifFileTypeIsCompatible(avifFileType * ftyp);
+
+static avifResult avifParse(avifDecoder * decoder)
+{
+    // Note: this top-level function is the only avifParse*() function that returns avifResult instead of avifBool.
+    // Be sure to use AVIF_CHECKERR() in this function with an explicit error result instead of simply using AVIF_CHECK().
+
+    avifResult readResult;
+    uint64_t parseOffset = 0;
+    avifDecoderData * data = decoder->data;
+    avifBool ftypSeen = AVIF_FALSE;
+    avifBool metaSeen = AVIF_FALSE;
+    avifBool moovSeen = AVIF_FALSE;
+    avifBool needsMeta = AVIF_FALSE;
+    avifBool needsMoov = AVIF_FALSE;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    avifBool coniSeen = AVIF_FALSE;
+    avifBool needsConi = AVIF_FALSE;
+#endif
+
+    for (;;) {
+        // Read just enough to get the next box header (a max of 32 bytes)
+        avifROData headerContents;
+        if ((decoder->io->sizeHint > 0) && (parseOffset > decoder->io->sizeHint)) {
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+        readResult = decoder->io->read(decoder->io, 0, parseOffset, 32, &headerContents);
+        if (readResult != AVIF_RESULT_OK) {
+            return readResult;
+        }
+        if (!headerContents.size) {
+            // If we got AVIF_RESULT_OK from the reader but received 0 bytes,
+            // we've reached the end of the file with no errors. Hooray!
+            break;
+        }
+
+        // Parse the header, and find out how many bytes it actually was
+        BEGIN_STREAM(headerStream, headerContents.data, headerContents.size, &decoder->diag, "File-level box header");
+        avifBoxHeader header;
+        AVIF_CHECKERR(avifROStreamReadBoxHeaderPartial(&headerStream, &header), AVIF_RESULT_BMFF_PARSE_FAILED);
+        parseOffset += headerStream.offset;
+        assert((decoder->io->sizeHint == 0) || (parseOffset <= decoder->io->sizeHint));
+
+        // Try to get the remainder of the box, if necessary
+        uint64_t boxOffset = 0;
+        avifROData boxContents = AVIF_DATA_EMPTY;
+
+        // TODO: reorg this code to only do these memcmps once each
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+        if (!memcmp(header.type, "ftyp", 4) || !memcmp(header.type, "meta", 4) || !memcmp(header.type, "moov", 4) ||
+            !memcmp(header.type, "coni", 4)) {
+#else
+        if (!memcmp(header.type, "ftyp", 4) || !memcmp(header.type, "meta", 4) || !memcmp(header.type, "moov", 4)) {
+#endif
+            boxOffset = parseOffset;
+            readResult = decoder->io->read(decoder->io, 0, parseOffset, header.size, &boxContents);
+            if (readResult != AVIF_RESULT_OK) {
+                return readResult;
+            }
+            if (boxContents.size != header.size) {
+                // A truncated box, bail out
+                return AVIF_RESULT_TRUNCATED_DATA;
+            }
+        } else if (header.size > (UINT64_MAX - parseOffset)) {
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+        parseOffset += header.size;
+
+        if (!memcmp(header.type, "ftyp", 4)) {
+            AVIF_CHECKERR(!ftypSeen, AVIF_RESULT_BMFF_PARSE_FAILED);
+            avifFileType ftyp;
+            AVIF_CHECKERR(avifParseFileTypeBox(&ftyp, boxContents.data, boxContents.size, data->diag), AVIF_RESULT_BMFF_PARSE_FAILED);
+            if (!avifFileTypeIsCompatible(&ftyp)) {
+                return AVIF_RESULT_INVALID_FTYP;
+            }
+            ftypSeen = AVIF_TRUE;
+            memcpy(data->majorBrand, ftyp.majorBrand, 4); // Remember the major brand for future AVIF_DECODER_SOURCE_AUTO decisions
+            needsMeta = avifFileTypeHasBrand(&ftyp, "avif");
+            needsMoov = avifFileTypeHasBrand(&ftyp, "avis");
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+            needsConi = avifFileTypeHasBrand(&ftyp, "avir");
+            if (needsConi && (needsMeta || needsMoov)) {
+                return AVIF_RESULT_INVALID_FTYP;
+            }
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+        } else if (!memcmp(header.type, "meta", 4)) {
+            AVIF_CHECKERR(!metaSeen, AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseMetaBox(data->meta, boxOffset, boxContents.data, boxContents.size, data->diag));
+            metaSeen = AVIF_TRUE;
+        } else if (!memcmp(header.type, "moov", 4)) {
+            AVIF_CHECKERR(!moovSeen, AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(
+                avifParseMovieBox(data, boxOffset, boxContents.data, boxContents.size, decoder->imageSizeLimit, decoder->imageDimensionLimit));
+            moovSeen = AVIF_TRUE;
+            decoder->imageSequenceTrackPresent = AVIF_TRUE;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+        } else if (!memcmp(header.type, "coni", 4)) {
+            AVIF_CHECKERR(!metaSeen && !moovSeen, AVIF_RESULT_BMFF_PARSE_FAILED);
+            AVIF_CHECKRES(avifParseCondensedImageBox(data->meta, boxOffset, boxContents.data, boxContents.size, data->diag));
+            coniSeen = AVIF_TRUE;
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+        }
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+        if (ftypSeen && !needsConi && coniSeen) {
+            // The 'coni' box should be ignored if there is no 'avir' brand, but libavif allows reading them in any order.
+            return AVIF_RESULT_NOT_IMPLEMENTED; // TODO(yguyon): Implement
+        }
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+
+        // See if there is enough information to consider Parse() a success and early-out:
+        // * If the brand 'avif' is present, require a meta box
+        // * If the brand 'avis' is present, require a moov box
+        // * If AVIF_ENABLE_EXPERIMENTAL_AVIR is defined and the brand 'avir' is present, require a coni box
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+        if (ftypSeen && (!needsMeta || metaSeen) && (!needsMoov || moovSeen) && (!needsConi || coniSeen)) {
+#else
+        if (ftypSeen && (!needsMeta || metaSeen) && (!needsMoov || moovSeen)) {
+#endif
+            return AVIF_RESULT_OK;
+        }
+    }
+    if (!ftypSeen) {
+        return AVIF_RESULT_INVALID_FTYP;
+    }
+    if ((needsMeta && !metaSeen) || (needsMoov && !moovSeen)) {
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    if (needsConi && !coniSeen) {
+        return AVIF_RESULT_TRUNCATED_DATA;
+    }
+#endif
+    return AVIF_RESULT_OK;
+}
+
+// ---------------------------------------------------------------------------
+
+static avifBool avifFileTypeHasBrand(avifFileType * ftyp, const char * brand)
+{
+    if (!memcmp(ftyp->majorBrand, brand, 4)) {
+        return AVIF_TRUE;
+    }
+
+    for (int compatibleBrandIndex = 0; compatibleBrandIndex < ftyp->compatibleBrandsCount; ++compatibleBrandIndex) {
+        const uint8_t * compatibleBrand = &ftyp->compatibleBrands[4 * compatibleBrandIndex];
+        if (!memcmp(compatibleBrand, brand, 4)) {
+            return AVIF_TRUE;
+        }
+    }
+    return AVIF_FALSE;
+}
+
+static avifBool avifFileTypeIsCompatible(avifFileType * ftyp)
+{
+    return avifFileTypeHasBrand(ftyp, "avif") || avifFileTypeHasBrand(ftyp, "avis")
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+           || avifFileTypeHasBrand(ftyp, "avir")
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+        ;
+}
+
+avifBool avifPeekCompatibleFileType(const avifROData * input)
+{
+    BEGIN_STREAM(s, input->data, input->size, NULL, NULL);
+
+    avifBoxHeader header;
+    if (!avifROStreamReadBoxHeader(&s, &header) || memcmp(header.type, "ftyp", 4)) {
+        return AVIF_FALSE;
+    }
+
+    avifFileType ftyp;
+    memset(&ftyp, 0, sizeof(avifFileType));
+    avifBool parsed = avifParseFileTypeBox(&ftyp, avifROStreamCurrent(&s), header.size, NULL);
+    if (!parsed) {
+        return AVIF_FALSE;
+    }
+    return avifFileTypeIsCompatible(&ftyp);
+}
+
+// ---------------------------------------------------------------------------
+
+avifDecoder * avifDecoderCreate(void)
+{
+    avifDecoder * decoder = (avifDecoder *)avifAlloc(sizeof(avifDecoder));
+    if (decoder == NULL) {
+        return NULL;
+    }
+    memset(decoder, 0, sizeof(avifDecoder));
+    decoder->maxThreads = 1;
+    decoder->imageSizeLimit = AVIF_DEFAULT_IMAGE_SIZE_LIMIT;
+    decoder->imageDimensionLimit = AVIF_DEFAULT_IMAGE_DIMENSION_LIMIT;
+    decoder->imageCountLimit = AVIF_DEFAULT_IMAGE_COUNT_LIMIT;
+    decoder->strictFlags = AVIF_STRICT_ENABLED;
+    return decoder;
+}
+
+static void avifDecoderCleanup(avifDecoder * decoder)
+{
+    if (decoder->data) {
+        avifDecoderDataDestroy(decoder->data);
+        decoder->data = NULL;
+    }
+
+    if (decoder->image) {
+        avifImageDestroy(decoder->image);
+        decoder->image = NULL;
+    }
+    avifDiagnosticsClearError(&decoder->diag);
+}
+
+void avifDecoderDestroy(avifDecoder * decoder)
+{
+    avifDecoderCleanup(decoder);
+    avifIODestroy(decoder->io);
+    avifFree(decoder);
+}
+
+avifResult avifDecoderSetSource(avifDecoder * decoder, avifDecoderSource source)
+{
+    decoder->requestedSource = source;
+    return avifDecoderReset(decoder);
+}
+
+void avifDecoderSetIO(avifDecoder * decoder, avifIO * io)
+{
+    avifIODestroy(decoder->io);
+    decoder->io = io;
+}
+
+avifResult avifDecoderSetIOMemory(avifDecoder * decoder, const uint8_t * data, size_t size)
+{
+    avifIO * io = avifIOCreateMemoryReader(data, size);
+    AVIF_CHECKERR(io != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+    avifDecoderSetIO(decoder, io);
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifDecoderSetIOFile(avifDecoder * decoder, const char * filename)
+{
+    avifIO * io = avifIOCreateFileReader(filename);
+    if (!io) {
+        return AVIF_RESULT_IO_ERROR;
+    }
+    avifDecoderSetIO(decoder, io);
+    return AVIF_RESULT_OK;
+}
+
+// 0-byte extents are ignored/overwritten during the merge, as they are the signal from helper
+// functions that no extent was necessary for this given sample. If both provided extents are
+// >0 bytes, this will set dst to be an extent that bounds both supplied extents.
+static avifResult avifExtentMerge(avifExtent * dst, const avifExtent * src)
+{
+    if (!dst->size) {
+        *dst = *src;
+        return AVIF_RESULT_OK;
+    }
+    if (!src->size) {
+        return AVIF_RESULT_OK;
+    }
+
+    const uint64_t minExtent1 = dst->offset;
+    const uint64_t maxExtent1 = dst->offset + dst->size;
+    const uint64_t minExtent2 = src->offset;
+    const uint64_t maxExtent2 = src->offset + src->size;
+    dst->offset = AVIF_MIN(minExtent1, minExtent2);
+    const uint64_t extentLength = AVIF_MAX(maxExtent1, maxExtent2) - dst->offset;
+    if (extentLength > SIZE_MAX) {
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+    dst->size = (size_t)extentLength;
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifDecoderNthImageMaxExtent(const avifDecoder * decoder, uint32_t frameIndex, avifExtent * outExtent)
+{
+    if (!decoder->data) {
+        // Nothing has been parsed yet
+        return AVIF_RESULT_NO_CONTENT;
+    }
+
+    memset(outExtent, 0, sizeof(avifExtent));
+
+    uint32_t startFrameIndex = avifDecoderNearestKeyframe(decoder, frameIndex);
+    uint32_t endFrameIndex = frameIndex;
+    for (uint32_t currentFrameIndex = startFrameIndex; currentFrameIndex <= endFrameIndex; ++currentFrameIndex) {
+        for (unsigned int tileIndex = 0; tileIndex < decoder->data->tiles.count; ++tileIndex) {
+            avifTile * tile = &decoder->data->tiles.tile[tileIndex];
+            if (currentFrameIndex >= tile->input->samples.count) {
+                return AVIF_RESULT_NO_IMAGES_REMAINING;
+            }
+
+            avifDecodeSample * sample = &tile->input->samples.sample[currentFrameIndex];
+            avifExtent sampleExtent;
+            if (sample->itemID) {
+                // The data comes from an item. Let avifDecoderItemMaxExtent() do the heavy lifting.
+
+                avifDecoderItem * item;
+                AVIF_CHECKRES(avifMetaFindOrCreateItem(decoder->data->meta, sample->itemID, &item));
+                avifResult maxExtentResult = avifDecoderItemMaxExtent(item, sample, &sampleExtent);
+                if (maxExtentResult != AVIF_RESULT_OK) {
+                    return maxExtentResult;
+                }
+            } else {
+                // The data likely comes from a sample table. Use the sample position directly.
+
+                sampleExtent.offset = sample->offset;
+                sampleExtent.size = sample->size;
+            }
+
+            if (sampleExtent.size > UINT64_MAX - sampleExtent.offset) {
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+
+            avifResult extentMergeResult = avifExtentMerge(outExtent, &sampleExtent);
+            if (extentMergeResult != AVIF_RESULT_OK) {
+                return extentMergeResult;
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifDecoderPrepareSample(avifDecoder * decoder, avifDecodeSample * sample, size_t partialByteCount)
+{
+    if (!sample->data.size || sample->partialData) {
+        // This sample hasn't been read from IO or had its extents fully merged yet.
+
+        size_t bytesToRead = sample->size;
+        if (partialByteCount && (bytesToRead > partialByteCount)) {
+            bytesToRead = partialByteCount;
+        }
+
+        if (sample->itemID) {
+            // The data comes from an item. Let avifDecoderItemRead() do the heavy lifting.
+
+            avifDecoderItem * item;
+            AVIF_CHECKRES(avifMetaFindOrCreateItem(decoder->data->meta, sample->itemID, &item));
+            avifROData itemContents;
+            if (sample->offset > SIZE_MAX) {
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            size_t offset = (size_t)sample->offset;
+            avifResult readResult = avifDecoderItemRead(item, decoder->io, &itemContents, offset, bytesToRead, &decoder->diag);
+            if (readResult != AVIF_RESULT_OK) {
+                return readResult;
+            }
+
+            // avifDecoderItemRead is guaranteed to already be persisted by either the underlying IO
+            // or by mergedExtents; just reuse the buffer here.
+            sample->data = itemContents;
+            sample->ownsData = AVIF_FALSE;
+            sample->partialData = item->partialMergedExtents;
+        } else {
+            // The data likely comes from a sample table. Pull the sample and make a copy if necessary.
+
+            avifROData sampleContents;
+            if ((decoder->io->sizeHint > 0) && (sample->offset > decoder->io->sizeHint)) {
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            avifResult readResult = decoder->io->read(decoder->io, 0, sample->offset, bytesToRead, &sampleContents);
+            if (readResult != AVIF_RESULT_OK) {
+                return readResult;
+            }
+            if (sampleContents.size != bytesToRead) {
+                return AVIF_RESULT_TRUNCATED_DATA;
+            }
+
+            sample->ownsData = !decoder->io->persistent;
+            sample->partialData = (bytesToRead != sample->size);
+            if (decoder->io->persistent) {
+                sample->data = sampleContents;
+            } else {
+                AVIF_CHECKRES(avifRWDataSet((avifRWData *)&sample->data, sampleContents.data, sampleContents.size));
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifDecoderParse(avifDecoder * decoder)
+{
+    avifDiagnosticsClearError(&decoder->diag);
+
+    // An imageSizeLimit greater than AVIF_DEFAULT_IMAGE_SIZE_LIMIT and the special value of 0 to
+    // disable the limit are not yet implemented.
+    if ((decoder->imageSizeLimit > AVIF_DEFAULT_IMAGE_SIZE_LIMIT) || (decoder->imageSizeLimit == 0)) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+    if (!decoder->io || !decoder->io->read) {
+        return AVIF_RESULT_IO_NOT_SET;
+    }
+
+    // Cleanup anything lingering in the decoder
+    avifDecoderCleanup(decoder);
+
+    // -----------------------------------------------------------------------
+    // Parse BMFF boxes
+
+    decoder->data = avifDecoderDataCreate();
+    AVIF_CHECKERR(decoder->data != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+    decoder->data->diag = &decoder->diag;
+
+    AVIF_CHECKRES(avifParse(decoder));
+
+    // Walk the decoded items (if any) and harvest ispe
+    avifDecoderData * data = decoder->data;
+    for (uint32_t itemIndex = 0; itemIndex < data->meta->items.count; ++itemIndex) {
+        avifDecoderItem * item = &data->meta->items.item[itemIndex];
+        if (!item->size) {
+            continue;
+        }
+        if (item->hasUnsupportedEssentialProperty) {
+            // An essential property isn't supported by libavif; ignore the item.
+            continue;
+        }
+        avifBool isGrid = (memcmp(item->type, "grid", 4) == 0);
+        if ((avifGetCodecType(item->type) == AVIF_CODEC_TYPE_UNKNOWN) && !isGrid) {
+            // probably exif or some other data
+            continue;
+        }
+
+        const avifProperty * ispeProp = avifPropertyArrayFind(&item->properties, "ispe");
+        if (ispeProp) {
+            item->width = ispeProp->u.ispe.width;
+            item->height = ispeProp->u.ispe.height;
+
+            if ((item->width == 0) || (item->height == 0)) {
+                avifDiagnosticsPrintf(data->diag, "Item ID [%u] has an invalid size [%ux%u]", item->id, item->width, item->height);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            if (avifDimensionsTooLarge(item->width, item->height, decoder->imageSizeLimit, decoder->imageDimensionLimit)) {
+                avifDiagnosticsPrintf(data->diag, "Item ID [%u] dimensions are too large [%ux%u]", item->id, item->width, item->height);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+        } else {
+            const avifProperty * auxCProp = avifPropertyArrayFind(&item->properties, "auxC");
+            if (auxCProp && isAlphaURN(auxCProp->u.auxC.auxType)) {
+                if (decoder->strictFlags & AVIF_STRICT_ALPHA_ISPE_REQUIRED) {
+                    avifDiagnosticsPrintf(data->diag,
+                                          "[Strict] Alpha auxiliary image item ID [%u] is missing a mandatory ispe property",
+                                          item->id);
+                    return AVIF_RESULT_BMFF_PARSE_FAILED;
+                }
+            } else {
+                avifDiagnosticsPrintf(data->diag, "Item ID [%u] is missing a mandatory ispe property", item->id);
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+        }
+    }
+    return avifDecoderReset(decoder);
+}
+
+static avifResult avifCodecCreateInternal(avifCodecChoice choice, const avifTile * tile, avifDiagnostics * diag, avifCodec ** codec)
+{
+#if defined(AVIF_CODEC_AVM)
+    // AVIF_CODEC_CHOICE_AUTO leads to AVIF_CODEC_TYPE_AV1 by default. Reroute correctly.
+    if (choice == AVIF_CODEC_CHOICE_AUTO && tile->codecType == AVIF_CODEC_TYPE_AV2) {
+        choice = AVIF_CODEC_CHOICE_AVM;
+    }
+#endif
+    AVIF_CHECKRES(avifCodecCreate(choice, AVIF_CODEC_FLAG_CAN_DECODE, codec));
+    AVIF_CHECKERR(*codec, AVIF_RESULT_OUT_OF_MEMORY);
+    (*codec)->diag = diag;
+    (*codec)->operatingPoint = tile->operatingPoint;
+    (*codec)->allLayers = tile->input->allLayers;
+    return AVIF_RESULT_OK;
+}
+
+static avifBool avifTilesCanBeDecodedWithSameCodecInstance(avifDecoderData * data)
+{
+    int32_t numImageBuffers = 0, numStolenImageBuffers = 0;
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        if (data->tileInfos[c].tileCount > 0) {
+            ++numImageBuffers;
+        }
+        if (data->tileInfos[c].tileCount == 1) {
+            ++numStolenImageBuffers;
+        }
+    }
+    if (numStolenImageBuffers > 0 && numImageBuffers > 1) {
+        // Single tile image with single tile alpha plane or gain map. In this case each tile needs its own decoder since the planes will be
+        // "stolen". Stealing either the color or the alpha plane (or gain map) will invalidate the other ones when decode is called the second
+        // (or third) time.
+        return AVIF_FALSE;
+    }
+    const uint8_t firstTileOperatingPoint = data->tiles.tile[0].operatingPoint;
+    const avifBool firstTileAllLayers = data->tiles.tile[0].input->allLayers;
+    for (unsigned int i = 1; i < data->tiles.count; ++i) {
+        const avifTile * tile = &data->tiles.tile[i];
+        if (tile->operatingPoint != firstTileOperatingPoint || tile->input->allLayers != firstTileAllLayers) {
+            return AVIF_FALSE;
+        }
+        // avifDecoderItemValidateProperties() verified during avifDecoderParse() that all tiles
+        // share the same coding format so no need to check for codecType equality here.
+    }
+    return AVIF_TRUE;
+}
+
+static avifResult avifDecoderCreateCodecs(avifDecoder * decoder)
+{
+    avifDecoderData * data = decoder->data;
+    avifDecoderDataResetCodec(data);
+
+    if (data->source == AVIF_DECODER_SOURCE_TRACKS) {
+        // In this case, we will use at most two codec instances (one for the color planes and one for the alpha plane).
+        // Gain maps are not supported.
+        AVIF_CHECKRES(avifCodecCreateInternal(decoder->codecChoice, &decoder->data->tiles.tile[0], &decoder->diag, &data->codec));
+        data->tiles.tile[0].codec = data->codec;
+        if (data->tiles.count > 1) {
+            AVIF_CHECKRES(avifCodecCreateInternal(decoder->codecChoice, &decoder->data->tiles.tile[1], &decoder->diag, &data->codecAlpha));
+            data->tiles.tile[1].codec = data->codecAlpha;
+        }
+    } else {
+        // In this case, we will use one codec instance when there is only one tile or when all of the following conditions are
+        // met:
+        //   - The image must have exactly one layer (i.e.) decoder->imageCount == 1.
+        //   - All the tiles must have the same operating point (because the codecs take operating point once at initialization
+        //     and do not allow it to be changed later).
+        //   - All the tiles must have the same value for allLayers (because the codecs take allLayers once at initialization
+        //     and do not allow it to be changed later).
+        //   - If the image has a single tile, it must not have a single tile alpha plane (in this case we will steal the planes
+        //     from the decoder, so we cannot use the same decoder for both the color and the alpha planes).
+        //   - All tiles have the same type (AV1 or AV2).
+        // Otherwise, we will use |tiles.count| decoder instances (one instance for each tile).
+        avifBool canUseSingleCodecInstance = (data->tiles.count == 1) ||
+                                             (decoder->imageCount == 1 && avifTilesCanBeDecodedWithSameCodecInstance(data));
+        if (canUseSingleCodecInstance) {
+            AVIF_CHECKRES(avifCodecCreateInternal(decoder->codecChoice, &decoder->data->tiles.tile[0], &decoder->diag, &data->codec));
+            for (unsigned int i = 0; i < decoder->data->tiles.count; ++i) {
+                decoder->data->tiles.tile[i].codec = data->codec;
+            }
+        } else {
+            for (unsigned int i = 0; i < decoder->data->tiles.count; ++i) {
+                avifTile * tile = &decoder->data->tiles.tile[i];
+                AVIF_CHECKRES(avifCodecCreateInternal(decoder->codecChoice, tile, &decoder->diag, &tile->codec));
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+// Returns AVIF_TRUE if the item should be skipped. Items should be skipped for one of the following reasons:
+//  * Size is 0.
+//  * Has an essential property that isn't supported by libavif.
+//  * Item is not a single image or a grid.
+//  * Item is a thumbnail.
+static avifBool avifDecoderItemShouldBeSkipped(const avifDecoderItem * item)
+{
+    return !item->size || item->hasUnsupportedEssentialProperty ||
+           (avifGetCodecType(item->type) == AVIF_CODEC_TYPE_UNKNOWN && memcmp(item->type, "grid", 4)) || item->thumbnailForID != 0;
+}
+
+// Returns the primary color item if found, or NULL.
+static avifDecoderItem * avifMetaFindColorItem(avifMeta * meta)
+{
+    for (uint32_t itemIndex = 0; itemIndex < meta->items.count; ++itemIndex) {
+        avifDecoderItem * item = &meta->items.item[itemIndex];
+        if (avifDecoderItemShouldBeSkipped(item)) {
+            continue;
+        }
+        if (item->id == meta->primaryItemID) {
+            return item;
+        }
+    }
+    return NULL;
+}
+
+// Returns AVIF_TRUE if item is an alpha auxiliary item of the parent color
+// item.
+static avifBool avifDecoderItemIsAlphaAux(avifDecoderItem * item, uint32_t colorItemId)
+{
+    if (item->auxForID != colorItemId)
+        return AVIF_FALSE;
+    const avifProperty * auxCProp = avifPropertyArrayFind(&item->properties, "auxC");
+    return auxCProp && isAlphaURN(auxCProp->u.auxC.auxType);
+}
+
+// Finds the alpha item whose parent item is colorItem and sets it in the alphaItem output parameter. Returns AVIF_RESULT_OK on
+// success. Note that *alphaItem can be NULL even if the return value is AVIF_RESULT_OK. If the colorItem is a grid and the alpha
+// item is represented as a set of auxl items to each color tile, then a fake item will be created and *isAlphaItemInInput will be
+// set to AVIF_FALSE. In this case, the alpha item merely exists to hold the locations of the alpha tile items. The data of this
+// item need not be read and the pixi property cannot be validated. Otherwise, *isAlphaItemInInput will be set to AVIF_TRUE when
+// *alphaItem is not NULL.
+static avifResult avifMetaFindAlphaItem(avifMeta * meta,
+                                        const avifDecoderItem * colorItem,
+                                        const avifTileInfo * colorInfo,
+                                        avifDecoderItem ** alphaItem,
+                                        avifTileInfo * alphaInfo,
+                                        avifBool * isAlphaItemInInput)
+{
+    for (uint32_t itemIndex = 0; itemIndex < meta->items.count; ++itemIndex) {
+        avifDecoderItem * item = &meta->items.item[itemIndex];
+        if (avifDecoderItemShouldBeSkipped(item)) {
+            continue;
+        }
+        if (avifDecoderItemIsAlphaAux(item, colorItem->id)) {
+            *alphaItem = item;
+            *isAlphaItemInInput = AVIF_TRUE;
+            return AVIF_RESULT_OK;
+        }
+    }
+    if (memcmp(colorItem->type, "grid", 4)) {
+        *alphaItem = NULL;
+        *isAlphaItemInInput = AVIF_FALSE;
+        return AVIF_RESULT_OK;
+    }
+    // If color item is a grid, check if there is an alpha channel which is represented as an auxl item to each color tile item.
+    uint32_t colorItemCount = colorInfo->grid.rows * colorInfo->grid.columns;
+    if (colorItemCount == 0) {
+        *alphaItem = NULL;
+        *isAlphaItemInInput = AVIF_FALSE;
+        return AVIF_RESULT_OK;
+    }
+    uint32_t * alphaItemIndices = avifAlloc(colorItemCount * sizeof(uint32_t));
+    AVIF_CHECKERR(alphaItemIndices, AVIF_RESULT_OUT_OF_MEMORY);
+    uint32_t alphaItemCount = 0;
+    uint32_t maxItemID = 0;
+    for (uint32_t i = 0; i < meta->items.count; ++i) {
+        avifDecoderItem * item = &meta->items.item[i];
+        if (item->id > maxItemID) {
+            maxItemID = item->id;
+        }
+        if (item->dimgForID == colorItem->id) {
+            for (uint32_t j = 0; j < meta->items.count; ++j) {
+                avifDecoderItem * auxlItem = &meta->items.item[j];
+                if (avifDecoderItemIsAlphaAux(auxlItem, item->id)) {
+                    alphaItemIndices[alphaItemCount++] = j;
+                }
+            }
+        }
+    }
+    if (alphaItemCount != colorItemCount) {
+        // Not all the color items had an alpha auxiliary attached to it. Report this case as an image without alpha channel.
+        avifFree(alphaItemIndices);
+        *alphaItem = NULL;
+        *isAlphaItemInInput = AVIF_FALSE;
+        return AVIF_RESULT_OK;
+    }
+    const avifResult result = avifMetaFindOrCreateItem(meta, maxItemID + 1, alphaItem); // Create new empty item.
+    if (result != AVIF_RESULT_OK) {
+        avifFree(alphaItemIndices);
+        *isAlphaItemInInput = AVIF_FALSE;
+        return result;
+    }
+    memcpy((*alphaItem)->type, "grid", 4); // Make it a grid and register alpha items as its tiles.
+    (*alphaItem)->width = colorItem->width;
+    (*alphaItem)->height = colorItem->height;
+    for (uint32_t i = 0; i < alphaItemCount; ++i) {
+        avifDecoderItem * item = &meta->items.item[alphaItemIndices[i]];
+        item->dimgForID = (*alphaItem)->id;
+    }
+    avifFree(alphaItemIndices);
+    *isAlphaItemInInput = AVIF_FALSE;
+    alphaInfo->grid = colorInfo->grid;
+    return AVIF_RESULT_OK;
+}
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+// Finds a 'tmap' (tone mapped image item) box associated with the given 'colorItem'.
+// If found, fills 'toneMappedImageItem' and  sets 'gainMapItemID' to the id of the gain map
+// item associated with the box. Otherwise, sets 'toneMappedImageItem' to NULL.
+// Returns AVIF_RESULT_OK if no errors were encountered (whether or not a tmap box was found).
+// Assumes that there is a single tmap item, and not, e.g., a grid of tmap items.
+// TODO(maryla): add support for files with multiple tmap items if it gets allowed by the spec.
+static avifResult avifDecoderDataFindToneMappedImageItem(const avifDecoderData * data,
+                                                         const avifDecoderItem * colorItem,
+                                                         avifDecoderItem ** toneMappedImageItem,
+                                                         uint32_t * gainMapItemID)
+{
+    for (uint32_t itemIndex = 0; itemIndex < data->meta->items.count; ++itemIndex) {
+        avifDecoderItem * item = &data->meta->items.item[itemIndex];
+        if (!item->size || item->hasUnsupportedEssentialProperty || item->thumbnailForID != 0) {
+            continue;
+        }
+        if (!memcmp(item->type, "tmap", 4)) {
+            // The tmap box should be associated (via 'iref'->'dimg') to two items:
+            // the first one is the base image, the second one is the gain map.
+            uint32_t dimgItemIDs[2] = { 0, 0 };
+            uint32_t numDimgItemIDs = 0;
+            for (uint32_t otherItemIndex = 0; otherItemIndex < data->meta->items.count; ++otherItemIndex) {
+                avifDecoderItem * otherItem = &data->meta->items.item[otherItemIndex];
+                if (otherItem->dimgForID != item->id) {
+                    continue;
+                }
+                if (otherItem->dimgIdx < 2) {
+                    assert(dimgItemIDs[otherItem->dimgIdx] == 0);
+                    dimgItemIDs[otherItem->dimgIdx] = otherItem->id;
+                }
+                numDimgItemIDs++;
+            }
+            if (numDimgItemIDs != 2) {
+                avifDiagnosticsPrintf(data->diag, "Expected box[tmap] to have 2 items associated with 'dimg': found [%d] instead", numDimgItemIDs);
+                return AVIF_RESULT_INVALID_TONE_MAPPED_IMAGE;
+            }
+            if (dimgItemIDs[0] != colorItem->id) {
+                continue;
+            }
+
+            *toneMappedImageItem = item;
+            *gainMapItemID = dimgItemIDs[1];
+            return AVIF_RESULT_OK;
+        }
+    }
+    *toneMappedImageItem = NULL;
+    *gainMapItemID = 0;
+    return AVIF_RESULT_OK;
+}
+
+// Finds a 'tmap' (tone mapped image item) box associated with the given 'colorItem',
+// then finds the associated gain map image.
+// If found, fills 'toneMappedImageItem', 'gainMapItem' and  'gainMapCodecType'.
+// Otherwise, sets 'toneMappedImageItem' and 'gainMapItem' to NULL.
+// Returns AVIF_RESULT_OK if no errors were encountered (whether or not a gain map was found).
+// Assumes that there is a single tmap item, and not, e.g., a grid of tmap items.
+static avifResult avifDecoderFindGainMapItem(const avifDecoder * decoder,
+                                             const avifDecoderItem * colorItem,
+                                             avifDecoderItem ** toneMappedImageItem,
+                                             avifDecoderItem ** gainMapItem,
+                                             avifCodecType * gainMapCodecType)
+{
+    *toneMappedImageItem = NULL;
+    *gainMapItem = NULL;
+    *gainMapCodecType = AVIF_CODEC_TYPE_UNKNOWN;
+
+    avifDecoderData * data = decoder->data;
+
+    uint32_t gainMapItemID;
+    avifDecoderItem * toneMappedImageItemTmp;
+    AVIF_CHECKRES(avifDecoderDataFindToneMappedImageItem(data, colorItem, &toneMappedImageItemTmp, &gainMapItemID));
+    if (!toneMappedImageItemTmp) {
+        return AVIF_RESULT_OK;
+    }
+
+    assert(gainMapItemID != 0);
+    avifDecoderItem * gainMapItemTmp;
+    AVIF_CHECKRES(avifMetaFindOrCreateItem(data->meta, gainMapItemID, &gainMapItemTmp));
+    if (avifDecoderItemShouldBeSkipped(gainMapItemTmp)) {
+        avifDiagnosticsPrintf(data->diag, "Box[tmap] gain map item %d is not a supported image type", gainMapItemID);
+        return AVIF_RESULT_INVALID_TONE_MAPPED_IMAGE;
+    }
+
+    AVIF_CHECKRES(avifDecoderItemReadAndParse(decoder,
+                                              gainMapItemTmp,
+                                              /*isItemInInput=*/AVIF_TRUE,
+                                              &data->tileInfos[AVIF_ITEM_GAIN_MAP].grid,
+                                              gainMapCodecType));
+
+    if (decoder->enableDecodingGainMap) {
+        decoder->image->gainMap.image = avifImageCreateEmpty();
+
+        // Look for a colr nclx box. Other colr box types (e.g. ICC) are not supported.
+        for (uint32_t propertyIndex = 0; propertyIndex < gainMapItemTmp->properties.count; ++propertyIndex) {
+            avifProperty * prop = &gainMapItemTmp->properties.prop[propertyIndex];
+            if (!memcmp(prop->type, "colr", 4) && prop->u.colr.hasNCLX) {
+                decoder->image->gainMap.image->colorPrimaries = prop->u.colr.colorPrimaries;
+                decoder->image->gainMap.image->transferCharacteristics = prop->u.colr.transferCharacteristics;
+                decoder->image->gainMap.image->matrixCoefficients = prop->u.colr.matrixCoefficients;
+                decoder->image->gainMap.image->yuvRange = prop->u.colr.range;
+                break;
+            }
+        }
+
+        // Copy HDR properties associated with the tmap box to the gain map image.
+        // Technically, the gain map is not an HDR image, but in the API, this is the most convenient
+        // place to put this data.
+        // TODO(maryla): add other HDR boxes: mdcv, cclv, etc.
+        const avifProperty * clliProp = avifPropertyArrayFind(&toneMappedImageItemTmp->properties, "clli");
+        if (clliProp) {
+            decoder->image->gainMap.image->clli = clliProp->u.clli;
+        }
+    }
+
+    // Only set the output parameters after everything has been validated.
+    *toneMappedImageItem = toneMappedImageItemTmp;
+    *gainMapItem = gainMapItemTmp;
+    return AVIF_RESULT_OK;
+}
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
+
+static avifResult avifDecoderGenerateImageTiles(avifDecoder * decoder, avifTileInfo * info, avifDecoderItem * item, avifItemCategory itemCategory)
+{
+    const uint32_t previousTileCount = decoder->data->tiles.count;
+    if ((info->grid.rows > 0) && (info->grid.columns > 0)) {
+        AVIF_CHECKRES(avifDecoderGenerateImageGridTiles(decoder, &info->grid, item, itemCategory));
+    } else {
+        AVIF_CHECKERR(item->size != 0, AVIF_RESULT_MISSING_IMAGE_ITEM);
+
+        const avifCodecType codecType = avifGetCodecType(item->type);
+        assert(codecType != AVIF_CODEC_TYPE_UNKNOWN);
+        avifTile * tile =
+            avifDecoderDataCreateTile(decoder->data, codecType, item->width, item->height, avifDecoderItemOperatingPoint(item));
+        AVIF_CHECKERR(tile, AVIF_RESULT_OUT_OF_MEMORY);
+        AVIF_CHECKRES(avifCodecDecodeInputFillFromDecoderItem(tile->input,
+                                                              item,
+                                                              decoder->allowProgressive,
+                                                              decoder->imageCountLimit,
+                                                              decoder->io->sizeHint,
+                                                              &decoder->diag));
+        tile->input->itemCategory = itemCategory;
+    }
+    info->tileCount = decoder->data->tiles.count - previousTileCount;
+    return AVIF_RESULT_OK;
+}
+
+// Populates depth, yuvFormat and yuvChromaSamplePosition fields on 'image' based on data from the codec config property (e.g. "av1C").
+static avifResult avifReadCodecConfigProperty(avifImage * image, const avifPropertyArray * properties, avifCodecType codecType)
+{
+    const avifProperty * configProp = avifPropertyArrayFind(properties, avifGetConfigurationPropertyName(codecType));
+    if (configProp) {
+        image->depth = avifCodecConfigurationBoxGetDepth(&configProp->u.av1C);
+        if (configProp->u.av1C.monochrome) {
+            image->yuvFormat = AVIF_PIXEL_FORMAT_YUV400;
+        } else {
+            if (configProp->u.av1C.chromaSubsamplingX && configProp->u.av1C.chromaSubsamplingY) {
+                image->yuvFormat = AVIF_PIXEL_FORMAT_YUV420;
+            } else if (configProp->u.av1C.chromaSubsamplingX) {
+                image->yuvFormat = AVIF_PIXEL_FORMAT_YUV422;
+            } else {
+                image->yuvFormat = AVIF_PIXEL_FORMAT_YUV444;
+            }
+        }
+        image->yuvChromaSamplePosition = (avifChromaSamplePosition)configProp->u.av1C.chromaSamplePosition;
+    } else {
+        // A configuration property box is mandatory in all valid AVIF configurations. Bail out.
+        return AVIF_RESULT_BMFF_PARSE_FAILED;
+    }
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifDecoderReset(avifDecoder * decoder)
+{
+    avifDiagnosticsClearError(&decoder->diag);
+
+    avifDecoderData * data = decoder->data;
+    if (!data) {
+        // Nothing to reset.
+        return AVIF_RESULT_OK;
+    }
+
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        memset(&data->tileInfos[c].grid, 0, sizeof(data->tileInfos[c].grid));
+    }
+    avifDecoderDataClearTiles(data);
+
+    // Prepare / cleanup decoded image state
+    if (decoder->image) {
+        avifImageDestroy(decoder->image);
+    }
+    decoder->image = avifImageCreateEmpty();
+    AVIF_CHECKERR(decoder->image, AVIF_RESULT_OUT_OF_MEMORY);
+    decoder->progressiveState = AVIF_PROGRESSIVE_STATE_UNAVAILABLE;
+    data->cicpSet = AVIF_FALSE;
+
+    memset(&decoder->ioStats, 0, sizeof(decoder->ioStats));
+
+    // -----------------------------------------------------------------------
+    // Build decode input
+
+    data->sourceSampleTable = NULL; // Reset
+    if (decoder->requestedSource == AVIF_DECODER_SOURCE_AUTO) {
+        // Honor the major brand (avif or avis) if present, otherwise prefer avis (tracks) if possible.
+        if (!memcmp(data->majorBrand, "avis", 4)) {
+            data->source = AVIF_DECODER_SOURCE_TRACKS;
+        } else if (!memcmp(data->majorBrand, "avif", 4)) {
+            data->source = AVIF_DECODER_SOURCE_PRIMARY_ITEM;
+        } else if (data->tracks.count > 0) {
+            data->source = AVIF_DECODER_SOURCE_TRACKS;
+        } else {
+            data->source = AVIF_DECODER_SOURCE_PRIMARY_ITEM;
+        }
+    } else {
+        data->source = decoder->requestedSource;
+    }
+
+    avifCodecType colorCodecType = AVIF_CODEC_TYPE_UNKNOWN;
+    const avifPropertyArray * colorProperties = NULL;
+    if (data->source == AVIF_DECODER_SOURCE_TRACKS) {
+        avifTrack * colorTrack = NULL;
+        avifTrack * alphaTrack = NULL;
+
+        // Find primary track - this probably needs some better detection
+        uint32_t colorTrackIndex = 0;
+        for (; colorTrackIndex < data->tracks.count; ++colorTrackIndex) {
+            avifTrack * track = &data->tracks.track[colorTrackIndex];
+            if (!track->sampleTable) {
+                continue;
+            }
+            if (!track->id) { // trak box might be missing a tkhd box inside, skip it
+                continue;
+            }
+            if (!track->sampleTable->chunks.count) {
+                continue;
+            }
+            colorCodecType = avifSampleTableGetCodecType(track->sampleTable);
+            if (colorCodecType == AVIF_CODEC_TYPE_UNKNOWN) {
+                continue;
+            }
+            if (track->auxForID != 0) {
+                continue;
+            }
+
+            // Found one!
+            break;
+        }
+        if (colorTrackIndex == data->tracks.count) {
+            avifDiagnosticsPrintf(&decoder->diag, "Failed to find AV1 color track");
+            return AVIF_RESULT_NO_CONTENT;
+        }
+        colorTrack = &data->tracks.track[colorTrackIndex];
+
+        colorProperties = avifSampleTableGetProperties(colorTrack->sampleTable, colorCodecType);
+        if (!colorProperties) {
+            avifDiagnosticsPrintf(&decoder->diag, "Failed to find AV1 color track's color properties");
+            return AVIF_RESULT_BMFF_PARSE_FAILED;
+        }
+
+        // Find Exif and/or XMP metadata, if any
+        if (colorTrack->meta) {
+            // See the comment above avifDecoderFindMetadata() for the explanation of using 0 here
+            avifResult findResult = avifDecoderFindMetadata(decoder, colorTrack->meta, decoder->image, 0);
+            if (findResult != AVIF_RESULT_OK) {
+                return findResult;
+            }
+        }
+
+        uint32_t alphaTrackIndex = 0;
+        avifCodecType alphaCodecType = AVIF_CODEC_TYPE_UNKNOWN;
+        for (; alphaTrackIndex < data->tracks.count; ++alphaTrackIndex) {
+            avifTrack * track = &data->tracks.track[alphaTrackIndex];
+            if (!track->sampleTable) {
+                continue;
+            }
+            if (!track->id) {
+                continue;
+            }
+            if (!track->sampleTable->chunks.count) {
+                continue;
+            }
+            alphaCodecType = avifSampleTableGetCodecType(track->sampleTable);
+            if (alphaCodecType == AVIF_CODEC_TYPE_UNKNOWN) {
+                continue;
+            }
+            if (track->auxForID == colorTrack->id) {
+                // Found it!
+                break;
+            }
+        }
+        if (alphaTrackIndex != data->tracks.count) {
+            alphaTrack = &data->tracks.track[alphaTrackIndex];
+        }
+
+        const uint8_t operatingPoint = 0; // No way to set operating point via tracks
+        avifTile * colorTile = avifDecoderDataCreateTile(data, colorCodecType, colorTrack->width, colorTrack->height, operatingPoint);
+        AVIF_CHECKERR(colorTile != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        AVIF_CHECKRES(avifCodecDecodeInputFillFromSampleTable(colorTile->input,
+                                                              colorTrack->sampleTable,
+                                                              decoder->imageCountLimit,
+                                                              decoder->io->sizeHint,
+                                                              data->diag));
+        data->tileInfos[AVIF_ITEM_COLOR].tileCount = 1;
+
+        if (alphaTrack) {
+            avifTile * alphaTile = avifDecoderDataCreateTile(data, alphaCodecType, alphaTrack->width, alphaTrack->height, operatingPoint);
+            AVIF_CHECKERR(alphaTile != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+            AVIF_CHECKRES(avifCodecDecodeInputFillFromSampleTable(alphaTile->input,
+                                                                  alphaTrack->sampleTable,
+                                                                  decoder->imageCountLimit,
+                                                                  decoder->io->sizeHint,
+                                                                  data->diag));
+            alphaTile->input->itemCategory = AVIF_ITEM_ALPHA;
+            data->tileInfos[AVIF_ITEM_ALPHA].tileCount = 1;
+        }
+
+        // Stash off sample table for future timing information
+        data->sourceSampleTable = colorTrack->sampleTable;
+
+        // Image sequence timing
+        decoder->imageIndex = -1;
+        decoder->imageCount = (int)colorTile->input->samples.count;
+        decoder->timescale = colorTrack->mediaTimescale;
+        decoder->durationInTimescales = colorTrack->mediaDuration;
+        if (colorTrack->mediaTimescale) {
+            decoder->duration = (double)decoder->durationInTimescales / (double)colorTrack->mediaTimescale;
+        } else {
+            decoder->duration = 0;
+        }
+        // If the alphaTrack->repetitionCount and colorTrack->repetitionCount are different, we will simply use the
+        // colorTrack's repetitionCount.
+        decoder->repetitionCount = colorTrack->repetitionCount;
+
+        memset(&decoder->imageTiming, 0, sizeof(decoder->imageTiming)); // to be set in avifDecoderNextImage()
+
+        decoder->image->width = colorTrack->width;
+        decoder->image->height = colorTrack->height;
+        decoder->alphaPresent = (alphaTrack != NULL);
+        decoder->image->alphaPremultiplied = decoder->alphaPresent && (colorTrack->premByID == alphaTrack->id);
+    } else {
+        // Create from items
+
+        if (data->meta->primaryItemID == 0) {
+            // A primary item is required
+            avifDiagnosticsPrintf(&decoder->diag, "Primary item not specified");
+            return AVIF_RESULT_MISSING_IMAGE_ITEM;
+        }
+
+        // Main item of each group category (top-level item such as grid or single tile), if any.
+        avifDecoderItem * mainItems[AVIF_ITEM_CATEGORY_COUNT];
+        avifCodecType codecType[AVIF_ITEM_CATEGORY_COUNT];
+        for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+            mainItems[c] = NULL;
+            codecType[c] = AVIF_CODEC_TYPE_UNKNOWN;
+        }
+
+        // Mandatory primary color item
+        mainItems[AVIF_ITEM_COLOR] = avifMetaFindColorItem(data->meta);
+        if (!mainItems[AVIF_ITEM_COLOR]) {
+            avifDiagnosticsPrintf(&decoder->diag, "Primary item not found");
+            return AVIF_RESULT_MISSING_IMAGE_ITEM;
+        }
+        AVIF_CHECKRES(avifDecoderItemReadAndParse(decoder,
+                                                  mainItems[AVIF_ITEM_COLOR],
+                                                  /*isItemInInput=*/AVIF_TRUE,
+                                                  &data->tileInfos[AVIF_ITEM_COLOR].grid,
+                                                  &codecType[AVIF_ITEM_COLOR]));
+        colorProperties = &mainItems[AVIF_ITEM_COLOR]->properties;
+        colorCodecType = codecType[AVIF_ITEM_COLOR];
+
+        // Optional alpha auxiliary item
+        avifBool isAlphaItemInInput;
+        AVIF_CHECKRES(avifMetaFindAlphaItem(data->meta,
+                                            mainItems[AVIF_ITEM_COLOR],
+                                            &data->tileInfos[AVIF_ITEM_COLOR],
+                                            &mainItems[AVIF_ITEM_ALPHA],
+                                            &data->tileInfos[AVIF_ITEM_ALPHA],
+                                            &isAlphaItemInInput));
+        if (mainItems[AVIF_ITEM_ALPHA]) {
+            AVIF_CHECKRES(avifDecoderItemReadAndParse(decoder,
+                                                      mainItems[AVIF_ITEM_ALPHA],
+                                                      isAlphaItemInInput,
+                                                      &data->tileInfos[AVIF_ITEM_ALPHA].grid,
+                                                      &codecType[AVIF_ITEM_ALPHA]));
+        }
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        avifDecoderItem * toneMappedImageItem;
+        const avifResult findGainMapResult = avifDecoderFindGainMapItem(decoder,
+                                                                        mainItems[AVIF_ITEM_COLOR],
+                                                                        &toneMappedImageItem,
+                                                                        &mainItems[AVIF_ITEM_GAIN_MAP],
+                                                                        &codecType[AVIF_ITEM_GAIN_MAP]);
+        if (!decoder->enableDecodingGainMap) {
+            // When ignoring the gain map, we still report whether one is present or not,
+            // but do not fail if there was any error with the gain map.
+            if (findGainMapResult != AVIF_RESULT_OK) {
+                // Only ignore reproducible errors (caused by the bitstream and not by the environment).
+                AVIF_CHECKERR(findGainMapResult != AVIF_RESULT_OUT_OF_MEMORY, findGainMapResult);
+                // Clear diagnostic message.
+                avifDiagnosticsClearError(data->diag);
+            }
+            decoder->gainMapPresent = (mainItems[AVIF_ITEM_GAIN_MAP] != NULL);
+            // We also ignore the actual item and don't decode it.
+            mainItems[AVIF_ITEM_GAIN_MAP] = NULL;
+        } else {
+            AVIF_CHECKRES(findGainMapResult);
+        }
+        if (toneMappedImageItem != NULL && decoder->enableParsingGainMapMetadata) {
+            // Read the gain map's metadata.
+            avifROData tmapData;
+            AVIF_CHECKRES(avifDecoderItemRead(toneMappedImageItem, decoder->io, &tmapData, 0, 0, data->diag));
+
+            AVIF_CHECKERR(avifParseToneMappedImageBox(&decoder->image->gainMap.metadata, tmapData.data, tmapData.size, data->diag),
+                          AVIF_RESULT_INVALID_TONE_MAPPED_IMAGE);
+        }
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
+
+        // Find Exif and/or XMP metadata, if any
+        AVIF_CHECKRES(avifDecoderFindMetadata(decoder, data->meta, decoder->image, mainItems[AVIF_ITEM_COLOR]->id));
+
+        // Set all counts and timing to safe-but-uninteresting values
+        decoder->imageIndex = -1;
+        decoder->imageCount = 1;
+        decoder->imageTiming.timescale = 1;
+        decoder->imageTiming.pts = 0;
+        decoder->imageTiming.ptsInTimescales = 0;
+        decoder->imageTiming.duration = 1;
+        decoder->imageTiming.durationInTimescales = 1;
+        decoder->timescale = 1;
+        decoder->duration = 1;
+        decoder->durationInTimescales = 1;
+
+        for (int c = AVIF_ITEM_COLOR; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+            if (!mainItems[c]) {
+                continue;
+            }
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+            if (decoder->ignoreColorAndAlpha && (c == AVIF_ITEM_COLOR || c == AVIF_ITEM_ALPHA)) {
+                continue;
+            }
+#endif
+            if (c == AVIF_ITEM_ALPHA && !mainItems[c]->width && !mainItems[c]->height) {
+                // NON-STANDARD: Alpha subimage does not have an ispe property; adopt width/height from color item
+                assert(!(decoder->strictFlags & AVIF_STRICT_ALPHA_ISPE_REQUIRED));
+                mainItems[c]->width = mainItems[AVIF_ITEM_COLOR]->width;
+                mainItems[c]->height = mainItems[AVIF_ITEM_COLOR]->height;
+            }
+
+            AVIF_CHECKRES(avifDecoderGenerateImageTiles(decoder, &data->tileInfos[c], mainItems[c], c));
+
+            avifStrictFlags strictFlags = decoder->strictFlags;
+            if (c == AVIF_ITEM_ALPHA && !isAlphaItemInInput) {
+                // In this case, the made up grid item will not have an associated pixi property. So validate everything else
+                // but the pixi property.
+                strictFlags &= ~AVIF_STRICT_PIXI_REQUIRED;
+            }
+            AVIF_CHECKRES(
+                avifDecoderItemValidateProperties(mainItems[c], avifGetConfigurationPropertyName(codecType[c]), &decoder->diag, strictFlags));
+        }
+
+        if (mainItems[AVIF_ITEM_COLOR]->progressive) {
+            decoder->progressiveState = AVIF_PROGRESSIVE_STATE_AVAILABLE;
+            // data->color.firstTileIndex is not yet defined but will be set to 0 a few lines below.
+            const avifTile * colorTile = &data->tiles.tile[0];
+            if (colorTile->input->samples.count > 1) {
+                decoder->progressiveState = AVIF_PROGRESSIVE_STATE_ACTIVE;
+                decoder->imageCount = (int)colorTile->input->samples.count;
+            }
+        }
+
+        decoder->image->width = mainItems[AVIF_ITEM_COLOR]->width;
+        decoder->image->height = mainItems[AVIF_ITEM_COLOR]->height;
+        decoder->alphaPresent = (mainItems[AVIF_ITEM_ALPHA] != NULL);
+        decoder->image->alphaPremultiplied = decoder->alphaPresent &&
+                                             (mainItems[AVIF_ITEM_COLOR]->premByID == mainItems[AVIF_ITEM_ALPHA]->id);
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        if (mainItems[AVIF_ITEM_GAIN_MAP]) {
+            assert(decoder->image->gainMap.image);
+            decoder->image->gainMap.image->width = mainItems[AVIF_ITEM_GAIN_MAP]->width;
+            decoder->image->gainMap.image->height = mainItems[AVIF_ITEM_GAIN_MAP]->height;
+            decoder->gainMapPresent = AVIF_TRUE;
+            // Must be called after avifDecoderGenerateImageTiles() which among other things copies the
+            // codec config property from the first tile of a grid to the grid item (when grids are used).
+            AVIF_CHECKRES(avifReadCodecConfigProperty(decoder->image->gainMap.image,
+                                                      &mainItems[AVIF_ITEM_GAIN_MAP]->properties,
+                                                      codecType[AVIF_ITEM_GAIN_MAP]));
+        }
+#endif
+    }
+
+    uint32_t firstTileIndex = 0;
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        data->tileInfos[c].firstTileIndex = firstTileIndex;
+        firstTileIndex += data->tileInfos[c].tileCount;
+    }
+
+    // Sanity check tiles
+    for (uint32_t tileIndex = 0; tileIndex < data->tiles.count; ++tileIndex) {
+        avifTile * tile = &data->tiles.tile[tileIndex];
+        for (uint32_t sampleIndex = 0; sampleIndex < tile->input->samples.count; ++sampleIndex) {
+            avifDecodeSample * sample = &tile->input->samples.sample[sampleIndex];
+            if (!sample->size) {
+                // Every sample must have some data
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+
+            if (tile->input->itemCategory == AVIF_ITEM_COLOR) {
+                decoder->ioStats.colorOBUSize += sample->size;
+            } else if (tile->input->itemCategory == AVIF_ITEM_ALPHA) {
+                decoder->ioStats.alphaOBUSize += sample->size;
+            }
+        }
+    }
+
+    // Find and adopt all colr boxes "at most one for a given value of colour type" (HEIF 6.5.5.1, from Amendment 3)
+    // Accept one of each type, and bail out if more than one of a given type is provided.
+    avifBool colrICCSeen = AVIF_FALSE;
+    avifBool colrNCLXSeen = AVIF_FALSE;
+    for (uint32_t propertyIndex = 0; propertyIndex < colorProperties->count; ++propertyIndex) {
+        avifProperty * prop = &colorProperties->prop[propertyIndex];
+
+        if (!memcmp(prop->type, "colr", 4)) {
+            if (prop->u.colr.hasICC) {
+                if (colrICCSeen) {
+                    return AVIF_RESULT_BMFF_PARSE_FAILED;
+                }
+                avifROData icc;
+                const avifResult readResult = decoder->io->read(decoder->io, 0, prop->u.colr.iccOffset, prop->u.colr.iccSize, &icc);
+                if (readResult != AVIF_RESULT_OK) {
+                    return readResult;
+                }
+                colrICCSeen = AVIF_TRUE;
+                AVIF_CHECKRES(avifImageSetProfileICC(decoder->image, icc.data, icc.size));
+            }
+            if (prop->u.colr.hasNCLX) {
+                if (colrNCLXSeen) {
+                    return AVIF_RESULT_BMFF_PARSE_FAILED;
+                }
+                colrNCLXSeen = AVIF_TRUE;
+                data->cicpSet = AVIF_TRUE;
+                decoder->image->colorPrimaries = prop->u.colr.colorPrimaries;
+                decoder->image->transferCharacteristics = prop->u.colr.transferCharacteristics;
+                decoder->image->matrixCoefficients = prop->u.colr.matrixCoefficients;
+                decoder->image->yuvRange = prop->u.colr.range;
+            }
+        }
+    }
+
+    const avifProperty * clliProp = avifPropertyArrayFind(colorProperties, "clli");
+    if (clliProp) {
+        decoder->image->clli = clliProp->u.clli;
+    }
+
+    // Transformations
+    const avifProperty * paspProp = avifPropertyArrayFind(colorProperties, "pasp");
+    if (paspProp) {
+        decoder->image->transformFlags |= AVIF_TRANSFORM_PASP;
+        decoder->image->pasp = paspProp->u.pasp;
+    }
+    const avifProperty * clapProp = avifPropertyArrayFind(colorProperties, "clap");
+    if (clapProp) {
+        decoder->image->transformFlags |= AVIF_TRANSFORM_CLAP;
+        decoder->image->clap = clapProp->u.clap;
+    }
+    const avifProperty * irotProp = avifPropertyArrayFind(colorProperties, "irot");
+    if (irotProp) {
+        decoder->image->transformFlags |= AVIF_TRANSFORM_IROT;
+        decoder->image->irot = irotProp->u.irot;
+    }
+    const avifProperty * imirProp = avifPropertyArrayFind(colorProperties, "imir");
+    if (imirProp) {
+        decoder->image->transformFlags |= AVIF_TRANSFORM_IMIR;
+        decoder->image->imir = imirProp->u.imir;
+    }
+
+    if (!data->cicpSet && (data->tiles.count > 0)) {
+        avifTile * firstTile = &data->tiles.tile[0];
+        if (firstTile->input->samples.count > 0) {
+            avifDecodeSample * sample = &firstTile->input->samples.sample[0];
+
+            // Harvest CICP from the AV1's sequence header, which should be very close to the front
+            // of the first sample. Read in successively larger chunks until we successfully parse the sequence.
+            static const size_t searchSampleChunkIncrement = 64;
+            static const size_t searchSampleSizeMax = 4096;
+            size_t searchSampleSize = 0;
+            do {
+                searchSampleSize += searchSampleChunkIncrement;
+                if (searchSampleSize > sample->size) {
+                    searchSampleSize = sample->size;
+                }
+
+                avifResult prepareResult = avifDecoderPrepareSample(decoder, sample, searchSampleSize);
+                if (prepareResult != AVIF_RESULT_OK) {
+                    return prepareResult;
+                }
+
+                avifSequenceHeader sequenceHeader;
+                if (avifSequenceHeaderParse(&sequenceHeader, &sample->data, firstTile->codecType)) {
+                    data->cicpSet = AVIF_TRUE;
+                    decoder->image->colorPrimaries = sequenceHeader.colorPrimaries;
+                    decoder->image->transferCharacteristics = sequenceHeader.transferCharacteristics;
+                    decoder->image->matrixCoefficients = sequenceHeader.matrixCoefficients;
+                    decoder->image->yuvRange = sequenceHeader.range;
+                    break;
+                }
+            } while (searchSampleSize != sample->size && searchSampleSize < searchSampleSizeMax);
+        }
+    }
+
+    AVIF_CHECKRES(avifReadCodecConfigProperty(decoder->image, colorProperties, colorCodecType));
+
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifDecoderPrepareTiles(avifDecoder * decoder, uint32_t nextImageIndex, const avifTileInfo * info)
+{
+    for (unsigned int tileIndex = info->decodedTileCount; tileIndex < info->tileCount; ++tileIndex) {
+        avifTile * tile = &decoder->data->tiles.tile[info->firstTileIndex + tileIndex];
+
+        if (nextImageIndex >= tile->input->samples.count) {
+            return AVIF_RESULT_NO_IMAGES_REMAINING;
+        }
+
+        avifDecodeSample * sample = &tile->input->samples.sample[nextImageIndex];
+        avifResult prepareResult = avifDecoderPrepareSample(decoder, sample, 0);
+        if (prepareResult != AVIF_RESULT_OK) {
+            return prepareResult;
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageLimitedToFullAlpha(avifImage * image)
+{
+    if (image->imageOwnsAlphaPlane) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+
+    const uint8_t * alphaPlane = image->alphaPlane;
+    const uint32_t alphaRowBytes = image->alphaRowBytes;
+
+    // We cannot do the range conversion in place since it will modify the
+    // codec's internal frame buffers. Allocate memory for the conversion.
+    image->alphaPlane = NULL;
+    image->alphaRowBytes = 0;
+    const avifResult allocationResult = avifImageAllocatePlanes(image, AVIF_PLANES_A);
+    if (allocationResult != AVIF_RESULT_OK) {
+        return allocationResult;
+    }
+
+    if (image->depth > 8) {
+        for (uint32_t j = 0; j < image->height; ++j) {
+            const uint8_t * srcRow = &alphaPlane[j * alphaRowBytes];
+            uint8_t * dstRow = &image->alphaPlane[j * image->alphaRowBytes];
+            for (uint32_t i = 0; i < image->width; ++i) {
+                int srcAlpha = *((const uint16_t *)&srcRow[i * 2]);
+                int dstAlpha = avifLimitedToFullY(image->depth, srcAlpha);
+                *((uint16_t *)&dstRow[i * 2]) = (uint16_t)dstAlpha;
+            }
+        }
+    } else {
+        for (uint32_t j = 0; j < image->height; ++j) {
+            const uint8_t * srcRow = &alphaPlane[j * alphaRowBytes];
+            uint8_t * dstRow = &image->alphaPlane[j * image->alphaRowBytes];
+            for (uint32_t i = 0; i < image->width; ++i) {
+                int srcAlpha = srcRow[i];
+                int dstAlpha = avifLimitedToFullY(image->depth, srcAlpha);
+                dstRow[i] = (uint8_t)dstAlpha;
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifGetErrorForItemCategory(avifItemCategory itemCategory)
+{
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    if (itemCategory == AVIF_ITEM_GAIN_MAP) {
+        return AVIF_RESULT_DECODE_GAIN_MAP_FAILED;
+    }
+#endif
+    return (itemCategory == AVIF_ITEM_ALPHA) ? AVIF_RESULT_DECODE_ALPHA_FAILED : AVIF_RESULT_DECODE_COLOR_FAILED;
+}
+
+static avifResult avifDecoderDecodeTiles(avifDecoder * decoder, uint32_t nextImageIndex, avifTileInfo * info)
+{
+    const unsigned int oldDecodedTileCount = info->decodedTileCount;
+    for (unsigned int tileIndex = oldDecodedTileCount; tileIndex < info->tileCount; ++tileIndex) {
+        avifTile * tile = &decoder->data->tiles.tile[info->firstTileIndex + tileIndex];
+
+        const avifDecodeSample * sample = &tile->input->samples.sample[nextImageIndex];
+        if (sample->data.size < sample->size) {
+            assert(decoder->allowIncremental);
+            // Data is missing but there is no error yet. Output available pixel rows.
+            return AVIF_RESULT_OK;
+        }
+
+        avifBool isLimitedRangeAlpha = AVIF_FALSE;
+        if (!tile->codec->getNextImage(tile->codec, decoder, sample, tile->input->itemCategory == AVIF_ITEM_ALPHA, &isLimitedRangeAlpha, tile->image)) {
+            avifDiagnosticsPrintf(&decoder->diag, "tile->codec->getNextImage() failed");
+            return avifGetErrorForItemCategory(tile->input->itemCategory);
+        }
+
+        // Section 2.3.4 of AV1 Codec ISO Media File Format Binding v1.2.0 says:
+        //   the full_range_flag in the colr box shall match the color_range
+        //   flag in the Sequence Header OBU.
+        // See https://aomediacodec.github.io/av1-isobmff/v1.2.0.html#av1codecconfigurationbox-semantics.
+        // If a 'colr' box of colour_type 'nclx' was parsed, a mismatch between
+        // the 'colr' decoder->image->yuvRange and the AV1 OBU
+        // tile->image->yuvRange should be treated as an error.
+        // However codec_svt.c was not encoding the color_range field for
+        // multiple years, so there probably are files in the wild that will
+        // fail decoding if this is enforced. Thus this pattern is allowed.
+        // Section 12.1.5.1 of ISO 14496-12 (ISOBMFF) says:
+        //   If colour information is supplied in both this [colr] box, and also
+        //   in the video bitstream, this box takes precedence, and over-rides
+        //   the information in the bitstream.
+        // So decoder->image->yuvRange is kept because it was either the 'colr'
+        // value set when the 'colr' box was parsed, or it was the AV1 OBU value
+        // extracted from the sequence header OBU of the first tile of the first
+        // frame (if no 'colr' box of colour_type 'nclx' was found).
+
+        // Alpha plane with limited range is not allowed by the latest revision
+        // of the specification. However, it was allowed in version 1.0.0 of the
+        // specification. To allow such files, simply convert the alpha plane to
+        // full range.
+        if ((tile->input->itemCategory == AVIF_ITEM_ALPHA) && isLimitedRangeAlpha) {
+            avifResult result = avifImageLimitedToFullAlpha(tile->image);
+            if (result != AVIF_RESULT_OK) {
+                avifDiagnosticsPrintf(&decoder->diag, "avifImageLimitedToFullAlpha failed");
+                return result;
+            }
+        }
+
+        // Scale the decoded image so that it corresponds to this tile's output dimensions
+        if ((tile->width != tile->image->width) || (tile->height != tile->image->height)) {
+            if (avifImageScaleWithLimit(tile->image,
+                                        tile->width,
+                                        tile->height,
+                                        decoder->imageSizeLimit,
+                                        decoder->imageDimensionLimit,
+                                        &decoder->diag) != AVIF_RESULT_OK) {
+                return avifGetErrorForItemCategory(tile->input->itemCategory);
+            }
+        }
+
+        ++info->decodedTileCount;
+
+        if ((info->grid.rows > 0) && (info->grid.columns > 0)) {
+            if (tileIndex == 0) {
+                avifImage * dstImage = decoder->image;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+                if (tile->input->itemCategory == AVIF_ITEM_GAIN_MAP) {
+                    dstImage = dstImage->gainMap.image;
+                    assert(dstImage);
+                }
+#endif
+                AVIF_CHECKRES(avifDecoderDataAllocateGridImagePlanes(decoder->data, info, dstImage));
+            }
+            if (!avifDecoderDataCopyTileToImage(decoder->data, info, decoder->image, tile, tileIndex)) {
+                return AVIF_RESULT_INVALID_IMAGE_GRID;
+            }
+        } else {
+            // Non-grid path. Just steal the planes from the only "tile".
+            assert(info->tileCount == 1);
+            assert(tileIndex == 0);
+            avifImage * src = tile->image;
+
+            switch (tile->input->itemCategory) {
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+                case AVIF_ITEM_GAIN_MAP:
+                    decoder->image->gainMap.image->width = src->width;
+                    decoder->image->gainMap.image->height = src->height;
+                    decoder->image->gainMap.image->depth = src->depth;
+                    break;
+#endif
+                default:
+                    if ((decoder->image->width != src->width) || (decoder->image->height != src->height) ||
+                        (decoder->image->depth != src->depth)) {
+                        if (tile->input->itemCategory == AVIF_ITEM_ALPHA) {
+                            avifDiagnosticsPrintf(&decoder->diag,
+                                                  "The color image item does not match the alpha image item in width, height, or bit depth");
+                            return AVIF_RESULT_DECODE_ALPHA_FAILED;
+                        }
+                        avifImageFreePlanes(decoder->image, AVIF_PLANES_ALL);
+
+                        decoder->image->width = src->width;
+                        decoder->image->height = src->height;
+                        decoder->image->depth = src->depth;
+                    }
+                    break;
+            }
+
+            if (tile->input->itemCategory == AVIF_ITEM_ALPHA) {
+                avifImageStealPlanes(decoder->image, src, AVIF_PLANES_A);
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+            } else if (tile->input->itemCategory == AVIF_ITEM_GAIN_MAP) {
+                assert(decoder->image->gainMap.image);
+                avifImageStealPlanes(decoder->image->gainMap.image, src, AVIF_PLANES_YUV);
+#endif
+            } else { // AVIF_ITEM_COLOR
+                avifImageStealPlanes(decoder->image, src, AVIF_PLANES_YUV);
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+// Returns AVIF_FALSE if there is currently a partially decoded frame.
+static avifBool avifDecoderDataFrameFullyDecoded(const avifDecoderData * data)
+{
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        if (data->tileInfos[c].decodedTileCount != data->tileInfos[c].tileCount) {
+            return AVIF_FALSE;
+        }
+    }
+    return AVIF_TRUE;
+}
+
+avifResult avifDecoderNextImage(avifDecoder * decoder)
+{
+    avifDiagnosticsClearError(&decoder->diag);
+
+    if (!decoder->data || decoder->data->tiles.count == 0) {
+        // Nothing has been parsed yet
+        return AVIF_RESULT_NO_CONTENT;
+    }
+
+    if (!decoder->io || !decoder->io->read) {
+        return AVIF_RESULT_IO_NOT_SET;
+    }
+
+    if (avifDecoderDataFrameFullyDecoded(decoder->data)) {
+        // A frame was decoded during the last avifDecoderNextImage() call.
+        for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+            decoder->data->tileInfos[c].decodedTileCount = 0;
+        }
+    }
+
+    assert(decoder->data->tiles.count == (decoder->data->tileInfos[AVIF_ITEM_CATEGORY_COUNT - 1].firstTileIndex +
+                                          decoder->data->tileInfos[AVIF_ITEM_CATEGORY_COUNT - 1].tileCount));
+
+    const uint32_t nextImageIndex = (uint32_t)(decoder->imageIndex + 1);
+
+    // Ensure that we have created the codecs before proceeding with the decoding.
+    if (!decoder->data->tiles.tile[0].codec) {
+        AVIF_CHECKRES(avifDecoderCreateCodecs(decoder));
+    }
+
+    // Acquire all sample data for the current image first, allowing for any read call to bail out
+    // with AVIF_RESULT_WAITING_ON_IO harmlessly / idempotently, unless decoder->allowIncremental.
+    avifResult prepareTileResult[AVIF_ITEM_CATEGORY_COUNT];
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        prepareTileResult[c] = avifDecoderPrepareTiles(decoder, nextImageIndex, &decoder->data->tileInfos[c]);
+        if (!decoder->allowIncremental || (prepareTileResult[c] != AVIF_RESULT_WAITING_ON_IO)) {
+            AVIF_CHECKRES(prepareTileResult[c]);
+        }
+    }
+
+    // Decode all available color tiles now, then all available alpha tiles, then all available bit
+    // depth extension tiles. The order of appearance of the tiles in the bitstream is left to the
+    // encoder's choice, and decoding as many as possible of each category in parallel is beneficial
+    // for incremental decoding, as pixel rows need all channels to be decoded before being
+    // accessible to the user.
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        AVIF_CHECKRES(avifDecoderDecodeTiles(decoder, nextImageIndex, &decoder->data->tileInfos[c]));
+    }
+
+    if (!avifDecoderDataFrameFullyDecoded(decoder->data)) {
+        assert(decoder->allowIncremental);
+        // The image is not completely decoded. There should be no error unrelated to missing bytes,
+        // and at least some missing bytes.
+        avifResult firstNonOkResult = AVIF_RESULT_OK;
+        for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+            assert((prepareTileResult[c] == AVIF_RESULT_OK) || (prepareTileResult[c] == AVIF_RESULT_WAITING_ON_IO));
+            if (firstNonOkResult == AVIF_RESULT_OK) {
+                firstNonOkResult = prepareTileResult[c];
+            }
+        }
+        assert(firstNonOkResult != AVIF_RESULT_OK);
+        // Return the "not enough bytes" status now instead of moving on to the next frame.
+        return AVIF_RESULT_WAITING_ON_IO;
+    }
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+        assert(prepareTileResult[c] == AVIF_RESULT_OK);
+    }
+
+    // Only advance decoder->imageIndex once the image is completely decoded, so that
+    // avifDecoderNthImage(decoder, decoder->imageIndex + 1) is equivalent to avifDecoderNextImage(decoder)
+    // if the previous call to avifDecoderNextImage() returned AVIF_RESULT_WAITING_ON_IO.
+    decoder->imageIndex = (int)nextImageIndex;
+    // The decoded tile counts will be reset to 0 the next time avifDecoderNextImage() is called,
+    // for avifDecoderDecodedRowCount() to work until then.
+    if (decoder->data->sourceSampleTable) {
+        // Decoding from a track! Provide timing information.
+
+        avifResult timingResult = avifDecoderNthImageTiming(decoder, decoder->imageIndex, &decoder->imageTiming);
+        if (timingResult != AVIF_RESULT_OK) {
+            return timingResult;
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifDecoderNthImageTiming(const avifDecoder * decoder, uint32_t frameIndex, avifImageTiming * outTiming)
+{
+    if (!decoder->data) {
+        // Nothing has been parsed yet
+        return AVIF_RESULT_NO_CONTENT;
+    }
+
+    if ((frameIndex > INT_MAX) || ((int)frameIndex >= decoder->imageCount)) {
+        // Impossible index
+        return AVIF_RESULT_NO_IMAGES_REMAINING;
+    }
+
+    if (!decoder->data->sourceSampleTable) {
+        // There isn't any real timing associated with this decode, so
+        // just hand back the defaults chosen in avifDecoderReset().
+        *outTiming = decoder->imageTiming;
+        return AVIF_RESULT_OK;
+    }
+
+    outTiming->timescale = decoder->timescale;
+    outTiming->ptsInTimescales = 0;
+    for (int imageIndex = 0; imageIndex < (int)frameIndex; ++imageIndex) {
+        outTiming->ptsInTimescales += avifSampleTableGetImageDelta(decoder->data->sourceSampleTable, imageIndex);
+    }
+    outTiming->durationInTimescales = avifSampleTableGetImageDelta(decoder->data->sourceSampleTable, frameIndex);
+
+    if (outTiming->timescale > 0) {
+        outTiming->pts = (double)outTiming->ptsInTimescales / (double)outTiming->timescale;
+        outTiming->duration = (double)outTiming->durationInTimescales / (double)outTiming->timescale;
+    } else {
+        outTiming->pts = 0.0;
+        outTiming->duration = 0.0;
+    }
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifDecoderNthImage(avifDecoder * decoder, uint32_t frameIndex)
+{
+    avifDiagnosticsClearError(&decoder->diag);
+
+    if (!decoder->data) {
+        // Nothing has been parsed yet
+        return AVIF_RESULT_NO_CONTENT;
+    }
+
+    if ((frameIndex > INT_MAX) || ((int)frameIndex >= decoder->imageCount)) {
+        // Impossible index
+        return AVIF_RESULT_NO_IMAGES_REMAINING;
+    }
+
+    int requestedIndex = (int)frameIndex;
+    if (requestedIndex == (decoder->imageIndex + 1)) {
+        // It's just the next image (already partially decoded or not at all), nothing special here
+        return avifDecoderNextImage(decoder);
+    }
+
+    if (requestedIndex == decoder->imageIndex) {
+        if (avifDecoderDataFrameFullyDecoded(decoder->data)) {
+            // The current fully decoded image (decoder->imageIndex) is requested, nothing to do
+            return AVIF_RESULT_OK;
+        }
+        // The next image (decoder->imageIndex + 1) is partially decoded but
+        // the previous image (decoder->imageIndex) is requested.
+        // Fall through to resetting the decoder data and start decoding from
+        // the nearest key frame.
+    }
+
+    int nearestKeyFrame = (int)avifDecoderNearestKeyframe(decoder, frameIndex);
+    if ((nearestKeyFrame > (decoder->imageIndex + 1)) || (requestedIndex <= decoder->imageIndex)) {
+        // If we get here, we need to start decoding from the nearest key frame.
+        // So discard the unused decoder state and its previous frames. This
+        // will force the setup of new AV1 decoder (avifCodec) instances in
+        // avifDecoderNextImage().
+        decoder->imageIndex = nearestKeyFrame - 1; // prepare to read nearest keyframe
+        avifDecoderDataResetCodec(decoder->data);
+    }
+    for (;;) {
+        avifResult result = avifDecoderNextImage(decoder);
+        if (result != AVIF_RESULT_OK) {
+            return result;
+        }
+
+        if (requestedIndex == decoder->imageIndex) {
+            break;
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+avifBool avifDecoderIsKeyframe(const avifDecoder * decoder, uint32_t frameIndex)
+{
+    if (!decoder->data || (decoder->data->tiles.count == 0)) {
+        // Nothing has been parsed yet
+        return AVIF_FALSE;
+    }
+
+    // *All* tiles for the requested frameIndex must be keyframes in order for
+    //  avifDecoderIsKeyframe() to return true, otherwise we may seek to a frame in which the color
+    //  planes are a keyframe but the alpha plane isn't a keyframe, which will cause an alpha plane
+    //  decode failure.
+    for (unsigned int i = 0; i < decoder->data->tiles.count; ++i) {
+        const avifTile * tile = &decoder->data->tiles.tile[i];
+        if ((frameIndex >= tile->input->samples.count) || !tile->input->samples.sample[frameIndex].sync) {
+            return AVIF_FALSE;
+        }
+    }
+    return AVIF_TRUE;
+}
+
+uint32_t avifDecoderNearestKeyframe(const avifDecoder * decoder, uint32_t frameIndex)
+{
+    if (!decoder->data) {
+        // Nothing has been parsed yet
+        return 0;
+    }
+
+    for (; frameIndex != 0; --frameIndex) {
+        if (avifDecoderIsKeyframe(decoder, frameIndex)) {
+            break;
+        }
+    }
+    return frameIndex;
+}
+
+// Returns the number of available rows in decoder->image given a color or alpha subimage.
+static uint32_t avifGetDecodedRowCount(const avifDecoder * decoder, const avifTileInfo * info, const avifImage * image)
+{
+    if (info->decodedTileCount == info->tileCount) {
+        return image->height;
+    }
+    if (info->decodedTileCount == 0) {
+        return 0;
+    }
+
+    if ((info->grid.rows > 0) && (info->grid.columns > 0)) {
+        // Grid of AVIF tiles (not to be confused with AV1 tiles).
+        const uint32_t tileHeight = decoder->data->tiles.tile[info->firstTileIndex].height;
+        return AVIF_MIN((info->decodedTileCount / info->grid.columns) * tileHeight, image->height);
+    } else {
+        // Non-grid image.
+        return image->height;
+    }
+}
+
+uint32_t avifDecoderDecodedRowCount(const avifDecoder * decoder)
+{
+    uint32_t minRowCount = decoder->image->height;
+    for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        if (c == AVIF_ITEM_GAIN_MAP) {
+            const avifImage * const gainMap = decoder->image->gainMap.image;
+            if (decoder->gainMapPresent && decoder->enableDecodingGainMap && gainMap != NULL && gainMap->height != 0) {
+                uint32_t gainMapRowCount = avifGetDecodedRowCount(decoder, &decoder->data->tileInfos[AVIF_ITEM_GAIN_MAP], gainMap);
+                if (gainMap->height != decoder->image->height) {
+                    const uint32_t scaledGainMapRowCount =
+                        (uint32_t)floorf((float)gainMapRowCount / gainMap->height * decoder->image->height);
+                    // Make sure it matches the formula described in the comment of avifDecoderDecodedRowCount() in avif.h.
+                    assert((uint32_t)lround((double)scaledGainMapRowCount / decoder->image->height *
+                                            decoder->image->gainMap.image->height) <= gainMapRowCount);
+                    gainMapRowCount = scaledGainMapRowCount;
+                }
+                minRowCount = AVIF_MIN(minRowCount, gainMapRowCount);
+            }
+            continue;
+        }
+#endif
+        const uint32_t rowCount = avifGetDecodedRowCount(decoder, &decoder->data->tileInfos[c], decoder->image);
+        minRowCount = AVIF_MIN(minRowCount, rowCount);
+    }
+    return minRowCount;
+}
+
+avifResult avifDecoderRead(avifDecoder * decoder, avifImage * image)
+{
+    avifResult result = avifDecoderParse(decoder);
+    if (result != AVIF_RESULT_OK) {
+        return result;
+    }
+    result = avifDecoderNextImage(decoder);
+    if (result != AVIF_RESULT_OK) {
+        return result;
+    }
+    return avifImageCopy(image, decoder->image, AVIF_PLANES_ALL);
+}
+
+avifResult avifDecoderReadMemory(avifDecoder * decoder, avifImage * image, const uint8_t * data, size_t size)
+{
+    avifDiagnosticsClearError(&decoder->diag);
+    avifResult result = avifDecoderSetIOMemory(decoder, data, size);
+    if (result != AVIF_RESULT_OK) {
+        return result;
+    }
+    return avifDecoderRead(decoder, image);
+}
+
+avifResult avifDecoderReadFile(avifDecoder * decoder, avifImage * image, const char * filename)
+{
+    avifDiagnosticsClearError(&decoder->diag);
+    avifResult result = avifDecoderSetIOFile(decoder, filename);
+    if (result != AVIF_RESULT_OK) {
+        return result;
+    }
+    return avifDecoderRead(decoder, image);
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/reformat.c b/pxr/imaging/plugin/hioAvif/AVIF/src/reformat.c
new file mode 100644
index 0000000000..4c633a1cfd
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/reformat.c
@@ -0,0 +1,1830 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <assert.h>
+#include <math.h>
+#include <string.h>
+
+#if defined(_WIN32)
+#include <process.h>
+#include <windows.h>
+#else
+#include <pthread.h>
+#endif
+
+struct YUVBlock
+{
+    float y;
+    float u;
+    float v;
+};
+
+avifBool avifGetRGBColorSpaceInfo(const avifRGBImage * rgb, avifRGBColorSpaceInfo * info)
+{
+    if ((rgb->depth != 8) && (rgb->depth != 10) && (rgb->depth != 12) && (rgb->depth != 16)) {
+        return AVIF_FALSE;
+    }
+    if (rgb->isFloat && rgb->depth != 16) {
+        return AVIF_FALSE;
+    }
+    if (rgb->format == AVIF_RGB_FORMAT_RGB_565 && rgb->depth != 8) {
+        return AVIF_FALSE;
+    }
+    if (rgb->format < AVIF_RGB_FORMAT_RGB || rgb->format >= AVIF_RGB_FORMAT_COUNT) {
+        return AVIF_FALSE;
+    }
+
+    info->channelBytes = (rgb->depth > 8) ? 2 : 1;
+    info->pixelBytes = avifRGBImagePixelSize(rgb);
+
+    switch (rgb->format) {
+        case AVIF_RGB_FORMAT_RGB:
+            info->offsetBytesR = info->channelBytes * 0;
+            info->offsetBytesG = info->channelBytes * 1;
+            info->offsetBytesB = info->channelBytes * 2;
+            info->offsetBytesA = 0;
+            break;
+        case AVIF_RGB_FORMAT_RGBA:
+            info->offsetBytesR = info->channelBytes * 0;
+            info->offsetBytesG = info->channelBytes * 1;
+            info->offsetBytesB = info->channelBytes * 2;
+            info->offsetBytesA = info->channelBytes * 3;
+            break;
+        case AVIF_RGB_FORMAT_ARGB:
+            info->offsetBytesA = info->channelBytes * 0;
+            info->offsetBytesR = info->channelBytes * 1;
+            info->offsetBytesG = info->channelBytes * 2;
+            info->offsetBytesB = info->channelBytes * 3;
+            break;
+        case AVIF_RGB_FORMAT_BGR:
+            info->offsetBytesB = info->channelBytes * 0;
+            info->offsetBytesG = info->channelBytes * 1;
+            info->offsetBytesR = info->channelBytes * 2;
+            info->offsetBytesA = 0;
+            break;
+        case AVIF_RGB_FORMAT_BGRA:
+            info->offsetBytesB = info->channelBytes * 0;
+            info->offsetBytesG = info->channelBytes * 1;
+            info->offsetBytesR = info->channelBytes * 2;
+            info->offsetBytesA = info->channelBytes * 3;
+            break;
+        case AVIF_RGB_FORMAT_ABGR:
+            info->offsetBytesA = info->channelBytes * 0;
+            info->offsetBytesB = info->channelBytes * 1;
+            info->offsetBytesG = info->channelBytes * 2;
+            info->offsetBytesR = info->channelBytes * 3;
+            break;
+        case AVIF_RGB_FORMAT_RGB_565:
+            // Since RGB_565 consists of two bytes per RGB pixel, we simply use
+            // the pointer to the red channel to populate the entire pixel value
+            // as a uint16_t. As a result only offsetBytesR is used and the
+            // other offsets are unused.
+            info->offsetBytesR = 0;
+            info->offsetBytesG = 0;
+            info->offsetBytesB = 0;
+            info->offsetBytesA = 0;
+            break;
+
+        case AVIF_RGB_FORMAT_COUNT:
+            return AVIF_FALSE;
+    }
+
+    info->maxChannel = (1 << rgb->depth) - 1;
+    info->maxChannelF = (float)info->maxChannel;
+
+    return AVIF_TRUE;
+}
+
+avifBool avifGetYUVColorSpaceInfo(const avifImage * image, avifYUVColorSpaceInfo * info)
+{
+#if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
+    const avifBool useYCgCo = (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RE) ||
+                              (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RO);
+#else
+    const avifBool useYCgCo = AVIF_FALSE;
+#endif
+
+    if ((image->depth != 8) && (image->depth != 10) && (image->depth != 12) && (image->depth != 16)) {
+        return AVIF_FALSE;
+    }
+
+    if (image->yuvFormat <= AVIF_PIXEL_FORMAT_NONE || image->yuvFormat >= AVIF_PIXEL_FORMAT_COUNT) {
+        return AVIF_FALSE;
+    }
+    if (image->yuvRange != AVIF_RANGE_LIMITED && image->yuvRange != AVIF_RANGE_FULL) {
+        return AVIF_FALSE;
+    }
+
+    // These matrix coefficients values are currently unsupported. Revise this list as more support is added.
+    //
+    // YCgCo performs limited-full range adjustment on R,G,B but the current implementation performs range adjustment
+    // on Y,U,V. So YCgCo with limited range is unsupported.
+    if ((image->matrixCoefficients == 3 /* CICP reserved */) ||
+        ((image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO || useYCgCo) && (image->yuvRange == AVIF_RANGE_LIMITED)) ||
+        (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_BT2020_CL) ||
+        (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_SMPTE2085) ||
+        (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_CL) ||
+        (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_ICTCP) || (image->matrixCoefficients >= AVIF_MATRIX_COEFFICIENTS_LAST)) {
+        return AVIF_FALSE;
+    }
+
+    if ((image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_IDENTITY) && (image->yuvFormat != AVIF_PIXEL_FORMAT_YUV444) &&
+        (image->yuvFormat != AVIF_PIXEL_FORMAT_YUV400)) {
+        return AVIF_FALSE;
+    }
+
+    avifGetPixelFormatInfo(image->yuvFormat, &info->formatInfo);
+    avifCalcYUVCoefficients(image, &info->kr, &info->kg, &info->kb);
+
+    info->channelBytes = (image->depth > 8) ? 2 : 1;
+
+    info->depth = image->depth;
+    info->range = image->yuvRange;
+    info->maxChannel = (1 << image->depth) - 1;
+    info->biasY = (info->range == AVIF_RANGE_LIMITED) ? (float)(16 << (info->depth - 8)) : 0.0f;
+    info->biasUV = (float)(1 << (info->depth - 1));
+    info->rangeY = (float)((info->range == AVIF_RANGE_LIMITED) ? (219 << (info->depth - 8)) : info->maxChannel);
+    info->rangeUV = (float)((info->range == AVIF_RANGE_LIMITED) ? (224 << (info->depth - 8)) : info->maxChannel);
+
+    return AVIF_TRUE;
+}
+
+static avifBool avifPrepareReformatState(const avifImage * image, const avifRGBImage * rgb, avifReformatState * state)
+{
+#if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
+    const avifBool useYCgCoRe = (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RE);
+    const avifBool useYCgCoRo = (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO_RO);
+#else
+    const avifBool useYCgCoRe = AVIF_FALSE;
+    const avifBool useYCgCoRo = AVIF_FALSE;
+#endif
+    if (useYCgCoRe || useYCgCoRo) {
+        const int bitOffset = (useYCgCoRe) ? 2 : 1;
+        if (image->depth - bitOffset != rgb->depth) {
+            return AVIF_FALSE;
+        }
+    }
+
+    AVIF_CHECK(avifGetRGBColorSpaceInfo(rgb, &state->rgb));
+    AVIF_CHECK(avifGetYUVColorSpaceInfo(image, &state->yuv));
+
+    state->yuv.mode = AVIF_REFORMAT_MODE_YUV_COEFFICIENTS;
+
+    if (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_IDENTITY) {
+        state->yuv.mode = AVIF_REFORMAT_MODE_IDENTITY;
+    } else if (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_YCGCO) {
+        state->yuv.mode = AVIF_REFORMAT_MODE_YCGCO;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
+    } else if (useYCgCoRe) {
+        state->yuv.mode = AVIF_REFORMAT_MODE_YCGCO_RE;
+    } else if (useYCgCoRo) {
+        state->yuv.mode = AVIF_REFORMAT_MODE_YCGCO_RO;
+#endif
+    }
+
+    if (state->yuv.mode != AVIF_REFORMAT_MODE_YUV_COEFFICIENTS) {
+        state->yuv.kr = 0.0f;
+        state->yuv.kg = 0.0f;
+        state->yuv.kb = 0.0f;
+    }
+
+    return AVIF_TRUE;
+}
+
+// Formulas 20-31 from https://www.itu.int/rec/T-REC-H.273-201612-I/en
+static int avifYUVColorSpaceInfoYToUNorm(avifYUVColorSpaceInfo * info, float v)
+{
+    int unorm = (int)avifRoundf(v * info->rangeY + info->biasY);
+    return AVIF_CLAMP(unorm, 0, info->maxChannel);
+}
+
+static int avifYUVColorSpaceInfoUVToUNorm(avifYUVColorSpaceInfo * info, float v)
+{
+    int unorm;
+
+    // YCgCo performs limited-full range adjustment on R,G,B but the current implementation performs range adjustment
+    // on Y,U,V. So YCgCo with limited range is unsupported.
+#if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
+    assert((info->mode != AVIF_REFORMAT_MODE_YCGCO && info->mode != AVIF_REFORMAT_MODE_YCGCO_RE && info->mode != AVIF_REFORMAT_MODE_YCGCO_RO) ||
+           (info->range == AVIF_RANGE_FULL));
+#else
+    assert((info->mode != AVIF_REFORMAT_MODE_YCGCO) || (info->range == AVIF_RANGE_FULL));
+#endif
+
+    if (info->mode == AVIF_REFORMAT_MODE_IDENTITY) {
+        unorm = (int)avifRoundf(v * info->rangeY + info->biasY);
+    } else {
+        unorm = (int)avifRoundf(v * info->rangeUV + info->biasUV);
+    }
+
+    return AVIF_CLAMP(unorm, 0, info->maxChannel);
+}
+
+avifResult avifImageRGBToYUV(avifImage * image, const avifRGBImage * rgb)
+{
+    if (!rgb->pixels || rgb->format == AVIF_RGB_FORMAT_RGB_565) {
+        return AVIF_RESULT_REFORMAT_FAILED;
+    }
+
+    avifReformatState state;
+    if (!avifPrepareReformatState(image, rgb, &state)) {
+        return AVIF_RESULT_REFORMAT_FAILED;
+    }
+
+    if (rgb->isFloat) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+
+    const avifBool hasAlpha = avifRGBFormatHasAlpha(rgb->format) && !rgb->ignoreAlpha;
+    avifResult allocationResult = avifImageAllocatePlanes(image, hasAlpha ? AVIF_PLANES_ALL : AVIF_PLANES_YUV);
+    if (allocationResult != AVIF_RESULT_OK) {
+        return allocationResult;
+    }
+
+    avifAlphaMultiplyMode alphaMode = AVIF_ALPHA_MULTIPLY_MODE_NO_OP;
+    if (hasAlpha) {
+        if (!rgb->alphaPremultiplied && image->alphaPremultiplied) {
+            alphaMode = AVIF_ALPHA_MULTIPLY_MODE_MULTIPLY;
+        } else if (rgb->alphaPremultiplied && !image->alphaPremultiplied) {
+            alphaMode = AVIF_ALPHA_MULTIPLY_MODE_UNMULTIPLY;
+        }
+    }
+
+    avifBool converted = AVIF_FALSE;
+
+    // Try converting with libsharpyuv.
+    if ((rgb->chromaDownsampling == AVIF_CHROMA_DOWNSAMPLING_SHARP_YUV) && (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV420)) {
+        const avifResult libSharpYUVResult = avifImageRGBToYUVLibSharpYUV(image, rgb, &state);
+        if (libSharpYUVResult != AVIF_RESULT_OK) {
+            // Return the error if sharpyuv was requested but failed for any reason, including libsharpyuv not being available.
+            return libSharpYUVResult;
+        }
+        converted = AVIF_TRUE;
+    }
+
+    if (!converted && !rgb->avoidLibYUV && (alphaMode == AVIF_ALPHA_MULTIPLY_MODE_NO_OP)) {
+        avifResult libyuvResult = avifImageRGBToYUVLibYUV(image, rgb);
+        if (libyuvResult == AVIF_RESULT_OK) {
+            converted = AVIF_TRUE;
+        } else if (libyuvResult != AVIF_RESULT_NOT_IMPLEMENTED) {
+            return libyuvResult;
+        }
+    }
+
+    if (!converted) {
+        const float kr = state.yuv.kr;
+        const float kg = state.yuv.kg;
+        const float kb = state.yuv.kb;
+
+        struct YUVBlock yuvBlock[2][2];
+        float rgbPixel[3];
+        const float rgbMaxChannelF = state.rgb.maxChannelF;
+        uint8_t ** yuvPlanes = image->yuvPlanes;
+        uint32_t * yuvRowBytes = image->yuvRowBytes;
+        for (uint32_t outerJ = 0; outerJ < image->height; outerJ += 2) {
+            for (uint32_t outerI = 0; outerI < image->width; outerI += 2) {
+                int blockW = 2, blockH = 2;
+                if ((outerI + 1) >= image->width) {
+                    blockW = 1;
+                }
+                if ((outerJ + 1) >= image->height) {
+                    blockH = 1;
+                }
+
+                // Convert an entire 2x2 block to YUV, and populate any fully sampled channels as we go
+                for (int bJ = 0; bJ < blockH; ++bJ) {
+                    for (int bI = 0; bI < blockW; ++bI) {
+                        int i = outerI + bI;
+                        int j = outerJ + bJ;
+
+                        // Unpack RGB into normalized float
+                        if (state.rgb.channelBytes > 1) {
+                            rgbPixel[0] =
+                                *((uint16_t *)(&rgb->pixels[state.rgb.offsetBytesR + (i * state.rgb.pixelBytes) + (j * rgb->rowBytes)])) /
+                                rgbMaxChannelF;
+                            rgbPixel[1] =
+                                *((uint16_t *)(&rgb->pixels[state.rgb.offsetBytesG + (i * state.rgb.pixelBytes) + (j * rgb->rowBytes)])) /
+                                rgbMaxChannelF;
+                            rgbPixel[2] =
+                                *((uint16_t *)(&rgb->pixels[state.rgb.offsetBytesB + (i * state.rgb.pixelBytes) + (j * rgb->rowBytes)])) /
+                                rgbMaxChannelF;
+                        } else {
+                            rgbPixel[0] = rgb->pixels[state.rgb.offsetBytesR + (i * state.rgb.pixelBytes) + (j * rgb->rowBytes)] /
+                                          rgbMaxChannelF;
+                            rgbPixel[1] = rgb->pixels[state.rgb.offsetBytesG + (i * state.rgb.pixelBytes) + (j * rgb->rowBytes)] /
+                                          rgbMaxChannelF;
+                            rgbPixel[2] = rgb->pixels[state.rgb.offsetBytesB + (i * state.rgb.pixelBytes) + (j * rgb->rowBytes)] /
+                                          rgbMaxChannelF;
+                        }
+
+                        if (alphaMode != AVIF_ALPHA_MULTIPLY_MODE_NO_OP) {
+                            float a;
+                            if (state.rgb.channelBytes > 1) {
+                                a = *((uint16_t *)(&rgb->pixels[state.rgb.offsetBytesA + (i * state.rgb.pixelBytes) + (j * rgb->rowBytes)])) /
+                                    rgbMaxChannelF;
+                            } else {
+                                a = rgb->pixels[state.rgb.offsetBytesA + (i * state.rgb.pixelBytes) + (j * rgb->rowBytes)] / rgbMaxChannelF;
+                            }
+
+                            if (alphaMode == AVIF_ALPHA_MULTIPLY_MODE_MULTIPLY) {
+                                if (a == 0) {
+                                    rgbPixel[0] = 0;
+                                    rgbPixel[1] = 0;
+                                    rgbPixel[2] = 0;
+                                } else if (a < 1.0f) {
+                                    rgbPixel[0] *= a;
+                                    rgbPixel[1] *= a;
+                                    rgbPixel[2] *= a;
+                                }
+                            } else {
+                                // alphaMode == AVIF_ALPHA_MULTIPLY_MODE_UNMULTIPLY
+                                if (a == 0) {
+                                    rgbPixel[0] = 0;
+                                    rgbPixel[1] = 0;
+                                    rgbPixel[2] = 0;
+                                } else if (a < 1.0f) {
+                                    rgbPixel[0] /= a;
+                                    rgbPixel[1] /= a;
+                                    rgbPixel[2] /= a;
+                                    rgbPixel[0] = AVIF_MIN(rgbPixel[0], 1.0f);
+                                    rgbPixel[1] = AVIF_MIN(rgbPixel[1], 1.0f);
+                                    rgbPixel[2] = AVIF_MIN(rgbPixel[2], 1.0f);
+                                }
+                            }
+                        }
+
+                        // RGB -> YUV conversion
+                        if (state.yuv.mode == AVIF_REFORMAT_MODE_IDENTITY) {
+                            // Formulas 41,42,43 from https://www.itu.int/rec/T-REC-H.273-201612-I/en
+                            yuvBlock[bI][bJ].y = rgbPixel[1]; // G
+                            yuvBlock[bI][bJ].u = rgbPixel[2]; // B
+                            yuvBlock[bI][bJ].v = rgbPixel[0]; // R
+                        } else if (state.yuv.mode == AVIF_REFORMAT_MODE_YCGCO) {
+                            // Formulas 44,45,46 from https://www.itu.int/rec/T-REC-H.273-201612-I/en
+                            yuvBlock[bI][bJ].y = 0.5f * rgbPixel[1] + 0.25f * (rgbPixel[0] + rgbPixel[2]);
+                            yuvBlock[bI][bJ].u = 0.5f * rgbPixel[1] - 0.25f * (rgbPixel[0] + rgbPixel[2]);
+                            yuvBlock[bI][bJ].v = 0.5f * (rgbPixel[0] - rgbPixel[2]);
+#if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
+                        } else if (state.yuv.mode == AVIF_REFORMAT_MODE_YCGCO_RE || state.yuv.mode == AVIF_REFORMAT_MODE_YCGCO_RO) {
+                            // Formulas from JVET-U0093.
+                            const int R = (int)avifRoundf(AVIF_CLAMP(rgbPixel[0] * rgbMaxChannelF, 0.0f, rgbMaxChannelF));
+                            const int G = (int)avifRoundf(AVIF_CLAMP(rgbPixel[1] * rgbMaxChannelF, 0.0f, rgbMaxChannelF));
+                            const int B = (int)avifRoundf(AVIF_CLAMP(rgbPixel[2] * rgbMaxChannelF, 0.0f, rgbMaxChannelF));
+                            const int Co = R - B;
+                            const int t = B + (Co >> 1);
+                            const int Cg = G - t;
+                            yuvBlock[bI][bJ].y = (t + (Cg >> 1)) / state.yuv.rangeY;
+                            yuvBlock[bI][bJ].u = Cg / state.yuv.rangeUV;
+                            yuvBlock[bI][bJ].v = Co / state.yuv.rangeUV;
+#endif
+                        } else {
+                            float Y = (kr * rgbPixel[0]) + (kg * rgbPixel[1]) + (kb * rgbPixel[2]);
+                            yuvBlock[bI][bJ].y = Y;
+                            yuvBlock[bI][bJ].u = (rgbPixel[2] - Y) / (2 * (1 - kb));
+                            yuvBlock[bI][bJ].v = (rgbPixel[0] - Y) / (2 * (1 - kr));
+                        }
+
+                        if (state.yuv.channelBytes > 1) {
+                            uint16_t * pY = (uint16_t *)&yuvPlanes[AVIF_CHAN_Y][(i * 2) + (j * yuvRowBytes[AVIF_CHAN_Y])];
+                            *pY = (uint16_t)avifYUVColorSpaceInfoYToUNorm(&state.yuv, yuvBlock[bI][bJ].y);
+                            if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV444) {
+                                // YUV444, full chroma
+                                uint16_t * pU = (uint16_t *)&yuvPlanes[AVIF_CHAN_U][(i * 2) + (j * yuvRowBytes[AVIF_CHAN_U])];
+                                *pU = (uint16_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, yuvBlock[bI][bJ].u);
+                                uint16_t * pV = (uint16_t *)&yuvPlanes[AVIF_CHAN_V][(i * 2) + (j * yuvRowBytes[AVIF_CHAN_V])];
+                                *pV = (uint16_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, yuvBlock[bI][bJ].v);
+                            }
+                        } else {
+                            yuvPlanes[AVIF_CHAN_Y][i + (j * yuvRowBytes[AVIF_CHAN_Y])] =
+                                (uint8_t)avifYUVColorSpaceInfoYToUNorm(&state.yuv, yuvBlock[bI][bJ].y);
+                            if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV444) {
+                                // YUV444, full chroma
+                                yuvPlanes[AVIF_CHAN_U][i + (j * yuvRowBytes[AVIF_CHAN_U])] =
+                                    (uint8_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, yuvBlock[bI][bJ].u);
+                                yuvPlanes[AVIF_CHAN_V][i + (j * yuvRowBytes[AVIF_CHAN_V])] =
+                                    (uint8_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, yuvBlock[bI][bJ].v);
+                            }
+                        }
+                    }
+                }
+
+                // Populate any subsampled channels with averages from the 2x2 block
+                if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400) {
+                    // Do nothing on chroma planes.
+                } else if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV420) {
+                    // YUV420, average 4 samples (2x2)
+
+                    float sumU = 0.0f;
+                    float sumV = 0.0f;
+                    for (int bJ = 0; bJ < blockH; ++bJ) {
+                        for (int bI = 0; bI < blockW; ++bI) {
+                            sumU += yuvBlock[bI][bJ].u;
+                            sumV += yuvBlock[bI][bJ].v;
+                        }
+                    }
+                    float totalSamples = (float)(blockW * blockH);
+                    float avgU = sumU / totalSamples;
+                    float avgV = sumV / totalSamples;
+
+                    const int chromaShiftX = 1;
+                    const int chromaShiftY = 1;
+                    int uvI = outerI >> chromaShiftX;
+                    int uvJ = outerJ >> chromaShiftY;
+                    if (state.yuv.channelBytes > 1) {
+                        uint16_t * pU = (uint16_t *)&yuvPlanes[AVIF_CHAN_U][(uvI * 2) + (uvJ * yuvRowBytes[AVIF_CHAN_U])];
+                        *pU = (uint16_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, avgU);
+                        uint16_t * pV = (uint16_t *)&yuvPlanes[AVIF_CHAN_V][(uvI * 2) + (uvJ * yuvRowBytes[AVIF_CHAN_V])];
+                        *pV = (uint16_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, avgV);
+                    } else {
+                        yuvPlanes[AVIF_CHAN_U][uvI + (uvJ * yuvRowBytes[AVIF_CHAN_U])] =
+                            (uint8_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, avgU);
+                        yuvPlanes[AVIF_CHAN_V][uvI + (uvJ * yuvRowBytes[AVIF_CHAN_V])] =
+                            (uint8_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, avgV);
+                    }
+                } else if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV422) {
+                    // YUV422, average 2 samples (1x2), twice
+
+                    for (int bJ = 0; bJ < blockH; ++bJ) {
+                        float sumU = 0.0f;
+                        float sumV = 0.0f;
+                        for (int bI = 0; bI < blockW; ++bI) {
+                            sumU += yuvBlock[bI][bJ].u;
+                            sumV += yuvBlock[bI][bJ].v;
+                        }
+                        float totalSamples = (float)blockW;
+                        float avgU = sumU / totalSamples;
+                        float avgV = sumV / totalSamples;
+
+                        const int chromaShiftX = 1;
+                        int uvI = outerI >> chromaShiftX;
+                        int uvJ = outerJ + bJ;
+                        if (state.yuv.channelBytes > 1) {
+                            uint16_t * pU = (uint16_t *)&yuvPlanes[AVIF_CHAN_U][(uvI * 2) + (uvJ * yuvRowBytes[AVIF_CHAN_U])];
+                            *pU = (uint16_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, avgU);
+                            uint16_t * pV = (uint16_t *)&yuvPlanes[AVIF_CHAN_V][(uvI * 2) + (uvJ * yuvRowBytes[AVIF_CHAN_V])];
+                            *pV = (uint16_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, avgV);
+                        } else {
+                            yuvPlanes[AVIF_CHAN_U][uvI + (uvJ * yuvRowBytes[AVIF_CHAN_U])] =
+                                (uint8_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, avgU);
+                            yuvPlanes[AVIF_CHAN_V][uvI + (uvJ * yuvRowBytes[AVIF_CHAN_V])] =
+                                (uint8_t)avifYUVColorSpaceInfoUVToUNorm(&state.yuv, avgV);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (image->alphaPlane && image->alphaRowBytes) {
+        avifAlphaParams params;
+
+        params.width = image->width;
+        params.height = image->height;
+        params.dstDepth = image->depth;
+        params.dstPlane = image->alphaPlane;
+        params.dstRowBytes = image->alphaRowBytes;
+        params.dstOffsetBytes = 0;
+        params.dstPixelBytes = state.yuv.channelBytes;
+
+        if (avifRGBFormatHasAlpha(rgb->format) && !rgb->ignoreAlpha) {
+            params.srcDepth = rgb->depth;
+            params.srcPlane = rgb->pixels;
+            params.srcRowBytes = rgb->rowBytes;
+            params.srcOffsetBytes = state.rgb.offsetBytesA;
+            params.srcPixelBytes = state.rgb.pixelBytes;
+
+            avifReformatAlpha(&params);
+        } else {
+            // libyuv does not fill alpha when converting from RGB to YUV so
+            // fill it regardless of the value of convertedWithLibYUV.
+            avifFillAlpha(&params);
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+// Allocates and fills look-up tables for going from YUV limited/full unorm -> full range RGB FP32.
+// Review this when implementing YCgCo limited range support.
+static avifBool avifCreateYUVToRGBLookUpTables(float ** unormFloatTableY, float ** unormFloatTableUV, uint32_t depth, const avifReformatState * state)
+{
+    const size_t cpCount = (size_t)1 << depth;
+
+    assert(unormFloatTableY);
+    *unormFloatTableY = avifAlloc(cpCount * sizeof(**unormFloatTableY));
+    AVIF_CHECK(*unormFloatTableY);
+    for (uint32_t cp = 0; cp < cpCount; ++cp) {
+        (*unormFloatTableY)[cp] = ((float)cp - state->yuv.biasY) / state->yuv.rangeY;
+    }
+
+    if (unormFloatTableUV) {
+        if (state->yuv.mode == AVIF_REFORMAT_MODE_IDENTITY) {
+            // Just reuse the luma table since the chroma values are the same.
+            *unormFloatTableUV = *unormFloatTableY;
+        } else {
+            *unormFloatTableUV = avifAlloc(cpCount * sizeof(**unormFloatTableUV));
+            if (!*unormFloatTableUV) {
+                avifFree(*unormFloatTableY);
+                *unormFloatTableY = NULL;
+                return AVIF_FALSE;
+            }
+            for (uint32_t cp = 0; cp < cpCount; ++cp) {
+                (*unormFloatTableUV)[cp] = ((float)cp - state->yuv.biasUV) / state->yuv.rangeUV;
+            }
+        }
+    }
+    return AVIF_TRUE;
+}
+
+// Frees look-up tables allocated with avifCreateYUVToRGBLookUpTables().
+static void avifFreeYUVToRGBLookUpTables(float ** unormFloatTableY, float ** unormFloatTableUV)
+{
+    if (unormFloatTableUV) {
+        if (*unormFloatTableUV != *unormFloatTableY) {
+            avifFree(*unormFloatTableUV);
+        }
+        *unormFloatTableUV = NULL;
+    }
+
+    avifFree(*unormFloatTableY);
+    *unormFloatTableY = NULL;
+}
+
+#define RGB565(R, G, B) ((uint16_t)(((B) >> 3) | (((G) >> 2) << 5) | (((R) >> 3) << 11)))
+
+static void avifStoreRGB8Pixel(avifRGBFormat format, uint8_t R, uint8_t G, uint8_t B, uint8_t * ptrR, uint8_t * ptrG, uint8_t * ptrB)
+{
+    if (format == AVIF_RGB_FORMAT_RGB_565) {
+        // References for RGB565 color conversion:
+        // * https://docs.microsoft.com/en-us/windows/win32/directshow/working-with-16-bit-rgb
+        // * https://chromium.googlesource.com/libyuv/libyuv/+/9892d70c965678381d2a70a1c9002d1cf136ee78/source/row_common.cc#2362
+        *(uint16_t *)ptrR = RGB565(R, G, B);
+        return;
+    }
+    *ptrR = R;
+    *ptrG = G;
+    *ptrB = B;
+}
+
+static void avifGetRGB565(const uint8_t * ptrR, uint8_t * R, uint8_t * G, uint8_t * B)
+{
+    // References for RGB565 color conversion:
+    // * https://docs.microsoft.com/en-us/windows/win32/directshow/working-with-16-bit-rgb
+    // * https://chromium.googlesource.com/libyuv/libyuv/+/331c361581896292fb46c8c6905e41262b7ca95f/source/row_common.cc#185
+    const uint16_t rgb656 = ((const uint16_t *)ptrR)[0];
+    const uint16_t r5 = (rgb656 & 0xF800) >> 11;
+    const uint16_t g6 = (rgb656 & 0x07E0) >> 5;
+    const uint16_t b5 = (rgb656 & 0x001F);
+    *R = (uint8_t)((r5 << 3) | (r5 >> 2));
+    *G = (uint8_t)((g6 << 2) | (g6 >> 4));
+    *B = (uint8_t)((b5 << 3) | (b5 >> 2));
+}
+
+// Note: This function handles alpha (un)multiply.
+static avifResult avifImageYUVAnyToRGBAnySlow(const avifImage * image,
+                                              avifRGBImage * rgb,
+                                              const avifReformatState * state,
+                                              avifAlphaMultiplyMode alphaMultiplyMode)
+{
+    // Aliases for some state
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    float * unormFloatTableY = NULL;
+    float * unormFloatTableUV = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+    const uint32_t yuvChannelBytes = state->yuv.channelBytes;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+
+    // Aliases for plane data
+    const uint8_t * yPlane = image->yuvPlanes[AVIF_CHAN_Y];
+    const uint8_t * uPlane = image->yuvPlanes[AVIF_CHAN_U];
+    const uint8_t * vPlane = image->yuvPlanes[AVIF_CHAN_V];
+    const uint8_t * aPlane = image->alphaPlane;
+    const uint32_t yRowBytes = image->yuvRowBytes[AVIF_CHAN_Y];
+    const uint32_t uRowBytes = image->yuvRowBytes[AVIF_CHAN_U];
+    const uint32_t vRowBytes = image->yuvRowBytes[AVIF_CHAN_V];
+    const uint32_t aRowBytes = image->alphaRowBytes;
+
+    // Various observations and limits
+    const avifBool hasColor = (uPlane && vPlane && (image->yuvFormat != AVIF_PIXEL_FORMAT_YUV400));
+    const uint16_t yuvMaxChannel = (uint16_t)state->yuv.maxChannel;
+    const float rgbMaxChannelF = state->rgb.maxChannelF;
+
+    // If toRGBAlphaMode is active (not no-op), assert that the alpha plane is present. The end of
+    // the avifPrepareReformatState() function should ensure this, but this assert makes it clear
+    // to clang's analyzer.
+    assert((alphaMultiplyMode == AVIF_ALPHA_MULTIPLY_MODE_NO_OP) || aPlane);
+
+    for (uint32_t j = 0; j < image->height; ++j) {
+        // uvJ is used only when hasColor is true.
+        const uint32_t uvJ = hasColor ? (j >> state->yuv.formatInfo.chromaShiftY) : 0;
+        const uint8_t * ptrY8 = &yPlane[j * yRowBytes];
+        const uint8_t * ptrU8 = uPlane ? &uPlane[(uvJ * uRowBytes)] : NULL;
+        const uint8_t * ptrV8 = vPlane ? &vPlane[(uvJ * vRowBytes)] : NULL;
+        const uint8_t * ptrA8 = aPlane ? &aPlane[j * aRowBytes] : NULL;
+        const uint16_t * ptrY16 = (const uint16_t *)ptrY8;
+        const uint16_t * ptrU16 = (const uint16_t *)ptrU8;
+        const uint16_t * ptrV16 = (const uint16_t *)ptrV8;
+        const uint16_t * ptrA16 = (const uint16_t *)ptrA8;
+
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            float Y, Cb = 0.5f, Cr = 0.5f;
+
+            // Calculate Y
+            uint16_t unormY;
+            if (image->depth == 8) {
+                unormY = ptrY8[i];
+            } else {
+                // clamp incoming data to protect against bad LUT lookups
+                unormY = AVIF_MIN(ptrY16[i], yuvMaxChannel);
+            }
+            Y = unormFloatTableY[unormY];
+
+            // Calculate Cb and Cr
+            if (hasColor) {
+                const uint32_t uvI = i >> state->yuv.formatInfo.chromaShiftX;
+                if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV444) {
+                    uint16_t unormU, unormV;
+
+                    if (image->depth == 8) {
+                        unormU = ptrU8[uvI];
+                        unormV = ptrV8[uvI];
+                    } else {
+                        // clamp incoming data to protect against bad LUT lookups
+                        unormU = AVIF_MIN(ptrU16[uvI], yuvMaxChannel);
+                        unormV = AVIF_MIN(ptrV16[uvI], yuvMaxChannel);
+                    }
+
+                    Cb = unormFloatTableUV[unormU];
+                    Cr = unormFloatTableUV[unormV];
+                } else {
+                    // Upsample to 444:
+                    //
+                    // *   *   *   *
+                    //   A       B
+                    // *   1   2   *
+                    //
+                    // *   3   4   *
+                    //   C       D
+                    // *   *   *   *
+                    //
+                    // When converting from YUV420 to RGB, for any given "high-resolution" RGB
+                    // coordinate (1,2,3,4,*), there are up to four "low-resolution" UV samples
+                    // (A,B,C,D) that are "nearest" to the pixel. For RGB pixel #1, A is the closest
+                    // UV sample, B and C are "adjacent" to it on the same row and column, and D is
+                    // the diagonal. For RGB pixel 3, C is the closest UV sample, A and D are
+                    // adjacent, and B is the diagonal. Sometimes the adjacent pixel on the same row
+                    // is to the left or right, and sometimes the adjacent pixel on the same column
+                    // is up or down. For any edge or corner, there might only be only one or two
+                    // samples nearby, so they'll be duplicated.
+                    //
+                    // The following code attempts to find all four nearest UV samples and put them
+                    // in the following unormU and unormV grid as follows:
+                    //
+                    // unorm[0][0] = closest         ( weights: bilinear: 9/16, nearest: 1 )
+                    // unorm[1][0] = adjacent col    ( weights: bilinear: 3/16, nearest: 0 )
+                    // unorm[0][1] = adjacent row    ( weights: bilinear: 3/16, nearest: 0 )
+                    // unorm[1][1] = diagonal        ( weights: bilinear: 1/16, nearest: 0 )
+                    //
+                    // It then weights them according to the requested upsampling set in avifRGBImage.
+
+                    uint16_t unormU[2][2], unormV[2][2];
+
+                    // How many bytes to add to a uint8_t pointer index to get to the adjacent (lesser) sample in a given direction
+                    int uAdjCol, vAdjCol, uAdjRow, vAdjRow;
+                    if ((i == 0) || ((i == (image->width - 1)) && ((i % 2) != 0))) {
+                        uAdjCol = 0;
+                        vAdjCol = 0;
+                    } else {
+                        if ((i % 2) != 0) {
+                            uAdjCol = yuvChannelBytes;
+                            vAdjCol = yuvChannelBytes;
+                        } else {
+                            uAdjCol = -1 * yuvChannelBytes;
+                            vAdjCol = -1 * yuvChannelBytes;
+                        }
+                    }
+
+                    // For YUV422, uvJ will always be a fresh value (always corresponds to j), so
+                    // we'll simply duplicate the sample as if we were on the top or bottom row and
+                    // it'll behave as plain old linear (1D) upsampling, which is all we want.
+                    if ((j == 0) || ((j == (image->height - 1)) && ((j % 2) != 0)) || (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV422)) {
+                        uAdjRow = 0;
+                        vAdjRow = 0;
+                    } else {
+                        if ((j % 2) != 0) {
+                            uAdjRow = (int)uRowBytes;
+                            vAdjRow = (int)vRowBytes;
+                        } else {
+                            uAdjRow = -1 * (int)uRowBytes;
+                            vAdjRow = -1 * (int)vRowBytes;
+                        }
+                    }
+
+                    if (image->depth == 8) {
+                        unormU[0][0] = uPlane[(uvJ * uRowBytes) + (uvI * yuvChannelBytes)];
+                        unormV[0][0] = vPlane[(uvJ * vRowBytes) + (uvI * yuvChannelBytes)];
+                        unormU[1][0] = uPlane[(uvJ * uRowBytes) + (uvI * yuvChannelBytes) + uAdjCol];
+                        unormV[1][0] = vPlane[(uvJ * vRowBytes) + (uvI * yuvChannelBytes) + vAdjCol];
+                        unormU[0][1] = uPlane[(uvJ * uRowBytes) + (uvI * yuvChannelBytes) + uAdjRow];
+                        unormV[0][1] = vPlane[(uvJ * vRowBytes) + (uvI * yuvChannelBytes) + vAdjRow];
+                        unormU[1][1] = uPlane[(uvJ * uRowBytes) + (uvI * yuvChannelBytes) + uAdjCol + uAdjRow];
+                        unormV[1][1] = vPlane[(uvJ * vRowBytes) + (uvI * yuvChannelBytes) + vAdjCol + vAdjRow];
+                    } else {
+                        unormU[0][0] = *((const uint16_t *)&uPlane[(uvJ * uRowBytes) + (uvI * yuvChannelBytes)]);
+                        unormV[0][0] = *((const uint16_t *)&vPlane[(uvJ * vRowBytes) + (uvI * yuvChannelBytes)]);
+                        unormU[1][0] = *((const uint16_t *)&uPlane[(uvJ * uRowBytes) + (uvI * yuvChannelBytes) + uAdjCol]);
+                        unormV[1][0] = *((const uint16_t *)&vPlane[(uvJ * vRowBytes) + (uvI * yuvChannelBytes) + vAdjCol]);
+                        unormU[0][1] = *((const uint16_t *)&uPlane[(uvJ * uRowBytes) + (uvI * yuvChannelBytes) + uAdjRow]);
+                        unormV[0][1] = *((const uint16_t *)&vPlane[(uvJ * vRowBytes) + (uvI * yuvChannelBytes) + vAdjRow]);
+                        unormU[1][1] = *((const uint16_t *)&uPlane[(uvJ * uRowBytes) + (uvI * yuvChannelBytes) + uAdjCol + uAdjRow]);
+                        unormV[1][1] = *((const uint16_t *)&vPlane[(uvJ * vRowBytes) + (uvI * yuvChannelBytes) + vAdjCol + vAdjRow]);
+
+                        // clamp incoming data to protect against bad LUT lookups
+                        for (int bJ = 0; bJ < 2; ++bJ) {
+                            for (int bI = 0; bI < 2; ++bI) {
+                                unormU[bI][bJ] = AVIF_MIN(unormU[bI][bJ], yuvMaxChannel);
+                                unormV[bI][bJ] = AVIF_MIN(unormV[bI][bJ], yuvMaxChannel);
+                            }
+                        }
+                    }
+
+                    if ((rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_FASTEST) ||
+                        (rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_NEAREST)) {
+                        // Nearest neighbor; ignore all UVs but the closest one
+                        Cb = unormFloatTableUV[unormU[0][0]];
+                        Cr = unormFloatTableUV[unormV[0][0]];
+                    } else {
+                        // Bilinear filtering with weights
+                        Cb = (unormFloatTableUV[unormU[0][0]] * (9.0f / 16.0f)) + (unormFloatTableUV[unormU[1][0]] * (3.0f / 16.0f)) +
+                             (unormFloatTableUV[unormU[0][1]] * (3.0f / 16.0f)) + (unormFloatTableUV[unormU[1][1]] * (1.0f / 16.0f));
+                        Cr = (unormFloatTableUV[unormV[0][0]] * (9.0f / 16.0f)) + (unormFloatTableUV[unormV[1][0]] * (3.0f / 16.0f)) +
+                             (unormFloatTableUV[unormV[0][1]] * (3.0f / 16.0f)) + (unormFloatTableUV[unormV[1][1]] * (1.0f / 16.0f));
+                    }
+                }
+            }
+
+            float R, G, B;
+            if (hasColor) {
+                if (state->yuv.mode == AVIF_REFORMAT_MODE_IDENTITY) {
+                    // Identity (GBR): Formulas 41,42,43 from https://www.itu.int/rec/T-REC-H.273-201612-I/en
+                    G = Y;
+                    B = Cb;
+                    R = Cr;
+                } else if (state->yuv.mode == AVIF_REFORMAT_MODE_YCGCO) {
+                    // YCgCo: Formulas 47,48,49,50 from https://www.itu.int/rec/T-REC-H.273-201612-I/en
+                    const float t = Y - Cb;
+                    G = Y + Cb;
+                    B = t - Cr;
+                    R = t + Cr;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_YCGCO_R)
+                } else if (state->yuv.mode == AVIF_REFORMAT_MODE_YCGCO_RE || state->yuv.mode == AVIF_REFORMAT_MODE_YCGCO_RO) {
+                    const int YY = unormY;
+                    const int Cg = (int)avifRoundf(Cb * yuvMaxChannel);
+                    const int Co = (int)avifRoundf(Cr * yuvMaxChannel);
+                    const int t = YY - (Cg >> 1);
+                    G = (float)AVIF_CLAMP(t + Cg, 0, state->rgb.maxChannel);
+                    B = (float)AVIF_CLAMP(t - (Co >> 1), 0, state->rgb.maxChannel);
+                    R = (float)AVIF_CLAMP(B + Co, 0, state->rgb.maxChannel);
+                    G /= rgbMaxChannelF;
+                    B /= rgbMaxChannelF;
+                    R /= rgbMaxChannelF;
+#endif
+                } else {
+                    // Normal YUV
+                    R = Y + (2 * (1 - kr)) * Cr;
+                    B = Y + (2 * (1 - kb)) * Cb;
+                    G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+                }
+            } else {
+                // Monochrome: just populate all channels with luma (state->yuv.mode is irrelevant)
+                R = Y;
+                G = Y;
+                B = Y;
+            }
+
+            float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            if (alphaMultiplyMode != AVIF_ALPHA_MULTIPLY_MODE_NO_OP) {
+                // Calculate A
+                uint16_t unormA;
+                if (image->depth == 8) {
+                    unormA = ptrA8[i];
+                } else {
+                    unormA = AVIF_MIN(ptrA16[i], yuvMaxChannel);
+                }
+                const float A = unormA / ((float)state->yuv.maxChannel);
+                const float Ac = AVIF_CLAMP(A, 0.0f, 1.0f);
+
+                if (alphaMultiplyMode == AVIF_ALPHA_MULTIPLY_MODE_MULTIPLY) {
+                    if (Ac == 0.0f) {
+                        Rc = 0.0f;
+                        Gc = 0.0f;
+                        Bc = 0.0f;
+                    } else if (Ac < 1.0f) {
+                        Rc *= Ac;
+                        Gc *= Ac;
+                        Bc *= Ac;
+                    }
+                } else {
+                    // alphaMultiplyMode == AVIF_ALPHA_MULTIPLY_MODE_UNMULTIPLY
+                    if (Ac == 0.0f) {
+                        Rc = 0.0f;
+                        Gc = 0.0f;
+                        Bc = 0.0f;
+                    } else if (Ac < 1.0f) {
+                        Rc /= Ac;
+                        Gc /= Ac;
+                        Bc /= Ac;
+                        Rc = AVIF_MIN(Rc, 1.0f);
+                        Gc = AVIF_MIN(Gc, 1.0f);
+                        Bc = AVIF_MIN(Bc, 1.0f);
+                    }
+                }
+            }
+
+            if (rgb->depth == 8) {
+                avifStoreRGB8Pixel(rgb->format,
+                                   (uint8_t)(0.5f + (Rc * rgbMaxChannelF)),
+                                   (uint8_t)(0.5f + (Gc * rgbMaxChannelF)),
+                                   (uint8_t)(0.5f + (Bc * rgbMaxChannelF)),
+                                   ptrR,
+                                   ptrG,
+                                   ptrB);
+            } else {
+                *((uint16_t *)ptrR) = (uint16_t)(0.5f + (Rc * rgbMaxChannelF));
+                *((uint16_t *)ptrG) = (uint16_t)(0.5f + (Gc * rgbMaxChannelF));
+                *((uint16_t *)ptrB) = (uint16_t)(0.5f + (Bc * rgbMaxChannelF));
+            }
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUV16ToRGB16Color(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    float * unormFloatTableY = NULL;
+    float * unormFloatTableUV = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+
+    const uint16_t yuvMaxChannel = (uint16_t)state->yuv.maxChannel;
+    const float rgbMaxChannelF = state->rgb.maxChannelF;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint32_t uvJ = j >> state->yuv.formatInfo.chromaShiftY;
+        const uint16_t * const ptrY = (uint16_t *)&image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        const uint16_t * const ptrU = (uint16_t *)&image->yuvPlanes[AVIF_CHAN_U][(uvJ * image->yuvRowBytes[AVIF_CHAN_U])];
+        const uint16_t * const ptrV = (uint16_t *)&image->yuvPlanes[AVIF_CHAN_V][(uvJ * image->yuvRowBytes[AVIF_CHAN_V])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            uint32_t uvI = i >> state->yuv.formatInfo.chromaShiftX;
+
+            // clamp incoming data to protect against bad LUT lookups
+            const uint16_t unormY = AVIF_MIN(ptrY[i], yuvMaxChannel);
+            const uint16_t unormU = AVIF_MIN(ptrU[uvI], yuvMaxChannel);
+            const uint16_t unormV = AVIF_MIN(ptrV[uvI], yuvMaxChannel);
+
+            // Convert unorm to float
+            const float Y = unormFloatTableY[unormY];
+            const float Cb = unormFloatTableUV[unormU];
+            const float Cr = unormFloatTableUV[unormV];
+
+            const float R = Y + (2 * (1 - kr)) * Cr;
+            const float B = Y + (2 * (1 - kb)) * Cb;
+            const float G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+            const float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            const float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            const float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            *((uint16_t *)ptrR) = (uint16_t)(0.5f + (Rc * rgbMaxChannelF));
+            *((uint16_t *)ptrG) = (uint16_t)(0.5f + (Gc * rgbMaxChannelF));
+            *((uint16_t *)ptrB) = (uint16_t)(0.5f + (Bc * rgbMaxChannelF));
+
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUV16ToRGB16Mono(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    float * unormFloatTableY = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, NULL, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+
+    const uint16_t maxChannel = (uint16_t)state->yuv.maxChannel;
+    const float maxChannelF = state->rgb.maxChannelF;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint16_t * const ptrY = (uint16_t *)&image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            // clamp incoming data to protect against bad LUT lookups
+            const uint16_t unormY = AVIF_MIN(ptrY[i], maxChannel);
+
+            // Convert unorm to float
+            const float Y = unormFloatTableY[unormY];
+            const float Cb = 0.0f;
+            const float Cr = 0.0f;
+
+            const float R = Y + (2 * (1 - kr)) * Cr;
+            const float B = Y + (2 * (1 - kb)) * Cb;
+            const float G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+            const float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            const float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            const float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            *((uint16_t *)ptrR) = (uint16_t)(0.5f + (Rc * maxChannelF));
+            *((uint16_t *)ptrG) = (uint16_t)(0.5f + (Gc * maxChannelF));
+            *((uint16_t *)ptrB) = (uint16_t)(0.5f + (Bc * maxChannelF));
+
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, NULL);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUV16ToRGB8Color(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    float * unormFloatTableY = NULL;
+    float * unormFloatTableUV = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+
+    const uint16_t yuvMaxChannel = (uint16_t)state->yuv.maxChannel;
+    const float rgbMaxChannelF = state->rgb.maxChannelF;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint32_t uvJ = j >> state->yuv.formatInfo.chromaShiftY;
+        const uint16_t * const ptrY = (uint16_t *)&image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        const uint16_t * const ptrU = (uint16_t *)&image->yuvPlanes[AVIF_CHAN_U][(uvJ * image->yuvRowBytes[AVIF_CHAN_U])];
+        const uint16_t * const ptrV = (uint16_t *)&image->yuvPlanes[AVIF_CHAN_V][(uvJ * image->yuvRowBytes[AVIF_CHAN_V])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            uint32_t uvI = i >> state->yuv.formatInfo.chromaShiftX;
+
+            // clamp incoming data to protect against bad LUT lookups
+            const uint16_t unormY = AVIF_MIN(ptrY[i], yuvMaxChannel);
+            const uint16_t unormU = AVIF_MIN(ptrU[uvI], yuvMaxChannel);
+            const uint16_t unormV = AVIF_MIN(ptrV[uvI], yuvMaxChannel);
+
+            // Convert unorm to float
+            const float Y = unormFloatTableY[unormY];
+            const float Cb = unormFloatTableUV[unormU];
+            const float Cr = unormFloatTableUV[unormV];
+
+            const float R = Y + (2 * (1 - kr)) * Cr;
+            const float B = Y + (2 * (1 - kb)) * Cb;
+            const float G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+            const float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            const float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            const float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            avifStoreRGB8Pixel(rgb->format,
+                               (uint8_t)(0.5f + (Rc * rgbMaxChannelF)),
+                               (uint8_t)(0.5f + (Gc * rgbMaxChannelF)),
+                               (uint8_t)(0.5f + (Bc * rgbMaxChannelF)),
+                               ptrR,
+                               ptrG,
+                               ptrB);
+
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUV16ToRGB8Mono(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    float * unormFloatTableY = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, NULL, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+
+    const uint16_t yuvMaxChannel = (uint16_t)state->yuv.maxChannel;
+    const float rgbMaxChannelF = state->rgb.maxChannelF;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint16_t * const ptrY = (uint16_t *)&image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            // clamp incoming data to protect against bad LUT lookups
+            const uint16_t unormY = AVIF_MIN(ptrY[i], yuvMaxChannel);
+
+            // Convert unorm to float
+            const float Y = unormFloatTableY[unormY];
+            const float Cb = 0.0f;
+            const float Cr = 0.0f;
+
+            const float R = Y + (2 * (1 - kr)) * Cr;
+            const float B = Y + (2 * (1 - kb)) * Cb;
+            const float G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+            const float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            const float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            const float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            avifStoreRGB8Pixel(rgb->format,
+                               (uint8_t)(0.5f + (Rc * rgbMaxChannelF)),
+                               (uint8_t)(0.5f + (Gc * rgbMaxChannelF)),
+                               (uint8_t)(0.5f + (Bc * rgbMaxChannelF)),
+                               ptrR,
+                               ptrG,
+                               ptrB);
+
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, NULL);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUV8ToRGB16Color(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    float * unormFloatTableY = NULL;
+    float * unormFloatTableUV = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+
+    const float rgbMaxChannelF = state->rgb.maxChannelF;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint32_t uvJ = j >> state->yuv.formatInfo.chromaShiftY;
+        const uint8_t * const ptrY = &image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        const uint8_t * const ptrU = &image->yuvPlanes[AVIF_CHAN_U][(uvJ * image->yuvRowBytes[AVIF_CHAN_U])];
+        const uint8_t * const ptrV = &image->yuvPlanes[AVIF_CHAN_V][(uvJ * image->yuvRowBytes[AVIF_CHAN_V])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            uint32_t uvI = i >> state->yuv.formatInfo.chromaShiftX;
+
+            // Convert unorm to float (no clamp necessary, the full uint8_t range is a legal lookup)
+            const float Y = unormFloatTableY[ptrY[i]];
+            const float Cb = unormFloatTableUV[ptrU[uvI]];
+            const float Cr = unormFloatTableUV[ptrV[uvI]];
+
+            const float R = Y + (2 * (1 - kr)) * Cr;
+            const float B = Y + (2 * (1 - kb)) * Cb;
+            const float G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+            const float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            const float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            const float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            *((uint16_t *)ptrR) = (uint16_t)(0.5f + (Rc * rgbMaxChannelF));
+            *((uint16_t *)ptrG) = (uint16_t)(0.5f + (Gc * rgbMaxChannelF));
+            *((uint16_t *)ptrB) = (uint16_t)(0.5f + (Bc * rgbMaxChannelF));
+
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUV8ToRGB16Mono(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    float * unormFloatTableY = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, NULL, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+
+    const float rgbMaxChannelF = state->rgb.maxChannelF;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint8_t * const ptrY = &image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            // Convert unorm to float (no clamp necessary, the full uint8_t range is a legal lookup)
+            const float Y = unormFloatTableY[ptrY[i]];
+            const float Cb = 0.0f;
+            const float Cr = 0.0f;
+
+            const float R = Y + (2 * (1 - kr)) * Cr;
+            const float B = Y + (2 * (1 - kb)) * Cb;
+            const float G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+            const float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            const float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            const float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            *((uint16_t *)ptrR) = (uint16_t)(0.5f + (Rc * rgbMaxChannelF));
+            *((uint16_t *)ptrG) = (uint16_t)(0.5f + (Gc * rgbMaxChannelF));
+            *((uint16_t *)ptrB) = (uint16_t)(0.5f + (Bc * rgbMaxChannelF));
+
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, NULL);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageIdentity8ToRGB8ColorFullRange(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint8_t * const ptrY = &image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        const uint8_t * const ptrU = &image->yuvPlanes[AVIF_CHAN_U][(j * image->yuvRowBytes[AVIF_CHAN_U])];
+        const uint8_t * const ptrV = &image->yuvPlanes[AVIF_CHAN_V][(j * image->yuvRowBytes[AVIF_CHAN_V])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        // This is intentionally a per-row conditional instead of a per-pixel
+        // conditional. This makes the "else" path (much more common than the
+        // "if" path) much faster than having a per-pixel branch.
+        if (rgb->format == AVIF_RGB_FORMAT_RGB_565) {
+            for (uint32_t i = 0; i < image->width; ++i) {
+                *(uint16_t *)ptrR = RGB565(ptrV[i], ptrY[i], ptrU[i]);
+                ptrR += rgbPixelBytes;
+            }
+        } else {
+            for (uint32_t i = 0; i < image->width; ++i) {
+                *ptrR = ptrV[i];
+                *ptrG = ptrY[i];
+                *ptrB = ptrU[i];
+                ptrR += rgbPixelBytes;
+                ptrG += rgbPixelBytes;
+                ptrB += rgbPixelBytes;
+            }
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUV8ToRGB8Color(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    float * unormFloatTableY = NULL;
+    float * unormFloatTableUV = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+
+    const float rgbMaxChannelF = state->rgb.maxChannelF;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint32_t uvJ = j >> state->yuv.formatInfo.chromaShiftY;
+        const uint8_t * const ptrY = &image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        const uint8_t * const ptrU = &image->yuvPlanes[AVIF_CHAN_U][(uvJ * image->yuvRowBytes[AVIF_CHAN_U])];
+        const uint8_t * const ptrV = &image->yuvPlanes[AVIF_CHAN_V][(uvJ * image->yuvRowBytes[AVIF_CHAN_V])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            uint32_t uvI = i >> state->yuv.formatInfo.chromaShiftX;
+
+            // Convert unorm to float (no clamp necessary, the full uint8_t range is a legal lookup)
+            const float Y = unormFloatTableY[ptrY[i]];
+            const float Cb = unormFloatTableUV[ptrU[uvI]];
+            const float Cr = unormFloatTableUV[ptrV[uvI]];
+
+            const float R = Y + (2 * (1 - kr)) * Cr;
+            const float B = Y + (2 * (1 - kb)) * Cb;
+            const float G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+            const float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            const float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            const float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            avifStoreRGB8Pixel(rgb->format,
+                               (uint8_t)(0.5f + (Rc * rgbMaxChannelF)),
+                               (uint8_t)(0.5f + (Gc * rgbMaxChannelF)),
+                               (uint8_t)(0.5f + (Bc * rgbMaxChannelF)),
+                               ptrR,
+                               ptrG,
+                               ptrB);
+
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, &unormFloatTableUV);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUV8ToRGB8Mono(const avifImage * image, avifRGBImage * rgb, avifReformatState * state)
+{
+    const float kr = state->yuv.kr;
+    const float kg = state->yuv.kg;
+    const float kb = state->yuv.kb;
+    const uint32_t rgbPixelBytes = state->rgb.pixelBytes;
+    float * unormFloatTableY = NULL;
+    AVIF_CHECKERR(avifCreateYUVToRGBLookUpTables(&unormFloatTableY, NULL, image->depth, state), AVIF_RESULT_OUT_OF_MEMORY);
+
+    const float rgbMaxChannelF = state->rgb.maxChannelF;
+    for (uint32_t j = 0; j < image->height; ++j) {
+        const uint8_t * const ptrY = &image->yuvPlanes[AVIF_CHAN_Y][(j * image->yuvRowBytes[AVIF_CHAN_Y])];
+        uint8_t * ptrR = &rgb->pixels[state->rgb.offsetBytesR + (j * rgb->rowBytes)];
+        uint8_t * ptrG = &rgb->pixels[state->rgb.offsetBytesG + (j * rgb->rowBytes)];
+        uint8_t * ptrB = &rgb->pixels[state->rgb.offsetBytesB + (j * rgb->rowBytes)];
+
+        for (uint32_t i = 0; i < image->width; ++i) {
+            // Convert unorm to float (no clamp necessary, the full uint8_t range is a legal lookup)
+            const float Y = unormFloatTableY[ptrY[i]];
+            const float Cb = 0.0f;
+            const float Cr = 0.0f;
+
+            const float R = Y + (2 * (1 - kr)) * Cr;
+            const float B = Y + (2 * (1 - kb)) * Cb;
+            const float G = Y - ((2 * ((kr * (1 - kr) * Cr) + (kb * (1 - kb) * Cb))) / kg);
+            const float Rc = AVIF_CLAMP(R, 0.0f, 1.0f);
+            const float Gc = AVIF_CLAMP(G, 0.0f, 1.0f);
+            const float Bc = AVIF_CLAMP(B, 0.0f, 1.0f);
+
+            avifStoreRGB8Pixel(rgb->format,
+                               (uint8_t)(0.5f + (Rc * rgbMaxChannelF)),
+                               (uint8_t)(0.5f + (Gc * rgbMaxChannelF)),
+                               (uint8_t)(0.5f + (Bc * rgbMaxChannelF)),
+                               ptrR,
+                               ptrG,
+                               ptrB);
+
+            ptrR += rgbPixelBytes;
+            ptrG += rgbPixelBytes;
+            ptrB += rgbPixelBytes;
+        }
+    }
+    avifFreeYUVToRGBLookUpTables(&unormFloatTableY, NULL);
+    return AVIF_RESULT_OK;
+}
+
+// This constant comes from libyuv. For details, see here:
+// https://chromium.googlesource.com/libyuv/libyuv/+/2f87e9a7/source/row_common.cc#3537
+#define F16_MULTIPLIER 1.9259299444e-34f
+
+typedef union avifF16
+{
+    float f;
+    uint32_t u32;
+} avifF16;
+
+static avifResult avifRGBImageToF16(avifRGBImage * rgb)
+{
+    avifResult libyuvResult = AVIF_RESULT_NOT_IMPLEMENTED;
+    if (!rgb->avoidLibYUV) {
+        libyuvResult = avifRGBImageToF16LibYUV(rgb);
+    }
+    if (libyuvResult != AVIF_RESULT_NOT_IMPLEMENTED) {
+        return libyuvResult;
+    }
+    const uint32_t channelCount = avifRGBFormatChannelCount(rgb->format);
+    const float scale = 1.0f / ((1 << rgb->depth) - 1);
+    const float multiplier = F16_MULTIPLIER * scale;
+    uint16_t * pixelRowBase = (uint16_t *)rgb->pixels;
+    const uint32_t stride = rgb->rowBytes >> 1;
+    for (uint32_t j = 0; j < rgb->height; ++j) {
+        uint16_t * pixel = pixelRowBase;
+        for (uint32_t i = 0; i < rgb->width * channelCount; ++i, ++pixel) {
+            avifF16 f16;
+            f16.f = *pixel * multiplier;
+            *pixel = (uint16_t)(f16.u32 >> 13);
+        }
+        pixelRowBase += stride;
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifImageYUVToRGBImpl(const avifImage * image, avifRGBImage * rgb, avifReformatState * state, avifAlphaMultiplyMode alphaMultiplyMode)
+{
+    avifBool convertedWithLibYUV = AVIF_FALSE;
+    // Reformat alpha, if user asks for it, or (un)multiply processing needs it.
+    avifBool reformatAlpha = avifRGBFormatHasAlpha(rgb->format) &&
+                             (!rgb->ignoreAlpha || (alphaMultiplyMode != AVIF_ALPHA_MULTIPLY_MODE_NO_OP));
+    // This value is used only when reformatAlpha is true.
+    avifBool alphaReformattedWithLibYUV = AVIF_FALSE;
+    if (!rgb->avoidLibYUV && ((alphaMultiplyMode == AVIF_ALPHA_MULTIPLY_MODE_NO_OP) || avifRGBFormatHasAlpha(rgb->format))) {
+        avifResult libyuvResult = avifImageYUVToRGBLibYUV(image, rgb, reformatAlpha, &alphaReformattedWithLibYUV);
+        if (libyuvResult == AVIF_RESULT_OK) {
+            convertedWithLibYUV = AVIF_TRUE;
+        } else {
+            if (libyuvResult != AVIF_RESULT_NOT_IMPLEMENTED) {
+                return libyuvResult;
+            }
+        }
+    }
+
+    if (reformatAlpha && !alphaReformattedWithLibYUV) {
+        avifAlphaParams params;
+
+        params.width = rgb->width;
+        params.height = rgb->height;
+        params.dstDepth = rgb->depth;
+        params.dstPlane = rgb->pixels;
+        params.dstRowBytes = rgb->rowBytes;
+        params.dstOffsetBytes = state->rgb.offsetBytesA;
+        params.dstPixelBytes = state->rgb.pixelBytes;
+
+        if (image->alphaPlane && image->alphaRowBytes) {
+            params.srcDepth = image->depth;
+            params.srcPlane = image->alphaPlane;
+            params.srcRowBytes = image->alphaRowBytes;
+            params.srcOffsetBytes = 0;
+            params.srcPixelBytes = state->yuv.channelBytes;
+
+            avifReformatAlpha(&params);
+        } else {
+            avifFillAlpha(&params);
+        }
+    }
+
+    if (!convertedWithLibYUV) {
+        // libyuv is either unavailable or unable to perform the specific conversion required here.
+        // Look over the available built-in "fast" routines for YUV->RGB conversion and see if one
+        // fits the current combination, or as a last resort, call avifImageYUVAnyToRGBAnySlow(),
+        // which handles every possibly YUV->RGB combination, but very slowly (in comparison).
+
+        avifResult convertResult = AVIF_RESULT_NOT_IMPLEMENTED;
+
+        const avifBool hasColor =
+            (image->yuvRowBytes[AVIF_CHAN_U] && image->yuvRowBytes[AVIF_CHAN_V] && (image->yuvFormat != AVIF_PIXEL_FORMAT_YUV400));
+
+        if ((!hasColor || (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV444) ||
+             ((rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_FASTEST) || (rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_NEAREST))) &&
+            (alphaMultiplyMode == AVIF_ALPHA_MULTIPLY_MODE_NO_OP || avifRGBFormatHasAlpha(rgb->format))) {
+            // Explanations on the above conditional:
+            // * None of these fast paths currently support bilinear upsampling, so avoid all of them
+            //   unless the YUV data isn't subsampled or they explicitly requested AVIF_CHROMA_UPSAMPLING_NEAREST.
+            // * None of these fast paths currently handle alpha (un)multiply, so avoid all of them
+            //   if we can't do alpha (un)multiply as a separated post step (destination format doesn't have alpha).
+
+            if (state->yuv.mode == AVIF_REFORMAT_MODE_IDENTITY) {
+                if ((image->depth == 8) && (rgb->depth == 8) && (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV444) &&
+                    (image->yuvRange == AVIF_RANGE_FULL)) {
+                    convertResult = avifImageIdentity8ToRGB8ColorFullRange(image, rgb, state);
+                }
+
+                // TODO: Add more fast paths for identity
+            } else if (state->yuv.mode == AVIF_REFORMAT_MODE_YUV_COEFFICIENTS) {
+                if (image->depth > 8) {
+                    // yuv:u16
+
+                    if (rgb->depth > 8) {
+                        // yuv:u16, rgb:u16
+
+                        if (hasColor) {
+                            convertResult = avifImageYUV16ToRGB16Color(image, rgb, state);
+                        } else {
+                            convertResult = avifImageYUV16ToRGB16Mono(image, rgb, state);
+                        }
+                    } else {
+                        // yuv:u16, rgb:u8
+
+                        if (hasColor) {
+                            convertResult = avifImageYUV16ToRGB8Color(image, rgb, state);
+                        } else {
+                            convertResult = avifImageYUV16ToRGB8Mono(image, rgb, state);
+                        }
+                    }
+                } else {
+                    // yuv:u8
+
+                    if (rgb->depth > 8) {
+                        // yuv:u8, rgb:u16
+
+                        if (hasColor) {
+                            convertResult = avifImageYUV8ToRGB16Color(image, rgb, state);
+                        } else {
+                            convertResult = avifImageYUV8ToRGB16Mono(image, rgb, state);
+                        }
+                    } else {
+                        // yuv:u8, rgb:u8
+
+                        if (hasColor) {
+                            convertResult = avifImageYUV8ToRGB8Color(image, rgb, state);
+                        } else {
+                            convertResult = avifImageYUV8ToRGB8Mono(image, rgb, state);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (convertResult == AVIF_RESULT_NOT_IMPLEMENTED) {
+            // If we get here, there is no fast path for this combination. Time to be slow!
+            convertResult = avifImageYUVAnyToRGBAnySlow(image, rgb, state, alphaMultiplyMode);
+
+            // The slow path also handles alpha (un)multiply, so forget the operation here.
+            alphaMultiplyMode = AVIF_ALPHA_MULTIPLY_MODE_NO_OP;
+        }
+
+        if (convertResult != AVIF_RESULT_OK) {
+            return convertResult;
+        }
+    }
+
+    // Process alpha premultiplication, if necessary
+    if (alphaMultiplyMode == AVIF_ALPHA_MULTIPLY_MODE_MULTIPLY) {
+        avifResult result = avifRGBImagePremultiplyAlpha(rgb);
+        if (result != AVIF_RESULT_OK) {
+            return result;
+        }
+    } else if (alphaMultiplyMode == AVIF_ALPHA_MULTIPLY_MODE_UNMULTIPLY) {
+        avifResult result = avifRGBImageUnpremultiplyAlpha(rgb);
+        if (result != AVIF_RESULT_OK) {
+            return result;
+        }
+    }
+
+    // Convert pixels to half floats (F16), if necessary.
+    if (rgb->isFloat) {
+        return avifRGBImageToF16(rgb);
+    }
+
+    return AVIF_RESULT_OK;
+}
+
+typedef struct
+{
+#if defined(_WIN32)
+    HANDLE thread;
+#else
+    pthread_t thread;
+#endif
+    avifImage image;
+    avifRGBImage rgb;
+    avifReformatState * state;
+    avifAlphaMultiplyMode alphaMultiplyMode;
+    avifResult result;
+    avifBool threadCreated;
+} YUVToRGBThreadData;
+
+#if defined(_WIN32)
+static unsigned int __stdcall avifImageYUVToRGBThreadWorker(void * arg)
+#else
+static void * avifImageYUVToRGBThreadWorker(void * arg)
+#endif
+{
+    YUVToRGBThreadData * data = (YUVToRGBThreadData *)arg;
+    data->result = avifImageYUVToRGBImpl(&data->image, &data->rgb, data->state, data->alphaMultiplyMode);
+#if defined(_WIN32)
+    return 0;
+#else
+    return NULL;
+#endif
+}
+
+static avifBool avifCreateYUVToRGBThread(YUVToRGBThreadData * tdata)
+{
+#if defined(_WIN32)
+    tdata->thread = (HANDLE)_beginthreadex(/*security=*/NULL,
+                                           /*stack_size=*/0,
+                                           &avifImageYUVToRGBThreadWorker,
+                                           tdata,
+                                           /*initflag=*/0,
+                                           /*thrdaddr=*/NULL);
+    return tdata->thread != NULL;
+#else
+    // TODO: Set the thread name for ease of debugging.
+    return pthread_create(&tdata->thread, NULL, &avifImageYUVToRGBThreadWorker, tdata) == 0;
+#endif
+}
+
+static avifBool avifJoinYUVToRGBThread(YUVToRGBThreadData * tdata)
+{
+#if defined(_WIN32)
+    return WaitForSingleObject(tdata->thread, INFINITE) == WAIT_OBJECT_0 && CloseHandle(tdata->thread) != 0;
+#else
+    return pthread_join(tdata->thread, NULL) == 0;
+#endif
+}
+
+avifResult avifImageYUVToRGB(const avifImage * image, avifRGBImage * rgb)
+{
+    // It is okay for rgb->maxThreads to be equal to zero in order to allow clients to zero initialize the avifRGBImage struct
+    // with memset.
+    if (!image->yuvPlanes[AVIF_CHAN_Y] || rgb->maxThreads < 0) {
+        return AVIF_RESULT_REFORMAT_FAILED;
+    }
+
+    avifReformatState state;
+    if (!avifPrepareReformatState(image, rgb, &state)) {
+        return AVIF_RESULT_REFORMAT_FAILED;
+    }
+
+    avifAlphaMultiplyMode alphaMultiplyMode = AVIF_ALPHA_MULTIPLY_MODE_NO_OP;
+    if (image->alphaPlane) {
+        if (!avifRGBFormatHasAlpha(rgb->format) || rgb->ignoreAlpha) {
+            // if we are converting some image with alpha into a format without alpha, we should do 'premultiply alpha' before
+            // discarding alpha plane. This has the same effect of rendering this image on a black background, which makes sense.
+            if (!image->alphaPremultiplied) {
+                alphaMultiplyMode = AVIF_ALPHA_MULTIPLY_MODE_MULTIPLY;
+            }
+        } else {
+            if (!image->alphaPremultiplied && rgb->alphaPremultiplied) {
+                alphaMultiplyMode = AVIF_ALPHA_MULTIPLY_MODE_MULTIPLY;
+            } else if (image->alphaPremultiplied && !rgb->alphaPremultiplied) {
+                alphaMultiplyMode = AVIF_ALPHA_MULTIPLY_MODE_UNMULTIPLY;
+            }
+        }
+    }
+
+    // In practice, we rarely need more than 8 threads for YUV to RGB conversion.
+    uint32_t jobs = AVIF_CLAMP(rgb->maxThreads, 1, 8);
+
+    // When yuv format is 420 and chromaUpsampling could be BILINEAR, there is a dependency across the horizontal borders of each
+    // job. So we disallow multithreading in that case.
+    if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV420 && (rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_AUTOMATIC ||
+                                                         rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_BEST_QUALITY ||
+                                                         rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_BILINEAR)) {
+        jobs = 1;
+    }
+
+    // Each thread worker needs at least 2 Y rows (to account for potential U/V subsampling).
+    if (jobs == 1 || (image->height / 2) < jobs) {
+        return avifImageYUVToRGBImpl(image, rgb, &state, alphaMultiplyMode);
+    }
+
+    AVIF_ARRAY_DECLARE(YUVToRGBThreadDataArray, YUVToRGBThreadData, threadData);
+    YUVToRGBThreadDataArray tdArray;
+    if (!avifArrayCreate(&tdArray, sizeof(YUVToRGBThreadData), jobs)) {
+        return AVIF_RESULT_OUT_OF_MEMORY;
+    }
+    int rowsPerJob = image->height / jobs;
+    if (rowsPerJob % 2) {
+        ++rowsPerJob;
+    }
+    const int rowsForLastJob = image->height - rowsPerJob * (jobs - 1);
+    int startRow = 0;
+    uint32_t i;
+    for (i = 0; i < jobs; ++i, startRow += rowsPerJob) {
+        YUVToRGBThreadData * tdata = &tdArray.threadData[i];
+        const avifCropRect rect = { .x = 0, .y = startRow, .width = image->width, .height = (i == jobs - 1) ? rowsForLastJob : rowsPerJob };
+        if (avifImageSetViewRect(&tdata->image, image, &rect) != AVIF_RESULT_OK) {
+            tdata->result = AVIF_RESULT_REFORMAT_FAILED;
+            break;
+        }
+
+        tdata->rgb = *rgb;
+        tdata->rgb.pixels += startRow * (size_t)rgb->rowBytes;
+        tdata->rgb.height = tdata->image.height;
+
+        tdata->state = &state;
+        tdata->alphaMultiplyMode = alphaMultiplyMode;
+
+        if (i > 0) {
+            tdata->threadCreated = avifCreateYUVToRGBThread(tdata);
+            if (!tdata->threadCreated) {
+                tdata->result = AVIF_RESULT_REFORMAT_FAILED;
+                break;
+            }
+        }
+    }
+    // If above loop ran successfully, Run the first job in the current thread.
+    if (i == jobs) {
+        avifImageYUVToRGBThreadWorker(&tdArray.threadData[0]);
+    }
+    avifResult result = AVIF_RESULT_OK;
+    for (i = 0; i < jobs; ++i) {
+        YUVToRGBThreadData * tdata = &tdArray.threadData[i];
+        if (tdata->threadCreated && !avifJoinYUVToRGBThread(tdata)) {
+            result = AVIF_RESULT_REFORMAT_FAILED;
+        }
+        if (tdata->result != AVIF_RESULT_OK) {
+            result = tdata->result;
+        }
+    }
+    avifArrayDestroy(&tdArray);
+    return result;
+}
+
+// Limited -> Full
+// Plan: subtract limited offset, then multiply by ratio of FULLSIZE/LIMITEDSIZE (rounding), then clamp.
+// RATIO = (FULLY - 0) / (MAXLIMITEDY - MINLIMITEDY)
+// -----------------------------------------
+// ( ( (v - MINLIMITEDY)                    | subtract limited offset
+//     * FULLY                              | multiply numerator of ratio
+//   ) + ((MAXLIMITEDY - MINLIMITEDY) / 2)  | add 0.5 (half of denominator) to round
+// ) / (MAXLIMITEDY - MINLIMITEDY)          | divide by denominator of ratio
+// AVIF_CLAMP(v, 0, FULLY)                  | clamp to full range
+// -----------------------------------------
+#define LIMITED_TO_FULL(MINLIMITEDY, MAXLIMITEDY, FULLY)                                                 \
+    v = (((v - MINLIMITEDY) * FULLY) + ((MAXLIMITEDY - MINLIMITEDY) / 2)) / (MAXLIMITEDY - MINLIMITEDY); \
+    v = AVIF_CLAMP(v, 0, FULLY)
+
+// Full -> Limited
+// Plan: multiply by ratio of LIMITEDSIZE/FULLSIZE (rounding), then add limited offset, then clamp.
+// RATIO = (MAXLIMITEDY - MINLIMITEDY) / (FULLY - 0)
+// -----------------------------------------
+// ( ( (v * (MAXLIMITEDY - MINLIMITEDY))    | multiply numerator of ratio
+//     + (FULLY / 2)                        | add 0.5 (half of denominator) to round
+//   ) / FULLY                              | divide by denominator of ratio
+// ) + MINLIMITEDY                          | add limited offset
+//  AVIF_CLAMP(v, MINLIMITEDY, MAXLIMITEDY) | clamp to limited range
+// -----------------------------------------
+#define FULL_TO_LIMITED(MINLIMITEDY, MAXLIMITEDY, FULLY)                           \
+    v = (((v * (MAXLIMITEDY - MINLIMITEDY)) + (FULLY / 2)) / FULLY) + MINLIMITEDY; \
+    v = AVIF_CLAMP(v, MINLIMITEDY, MAXLIMITEDY)
+
+int avifLimitedToFullY(uint32_t depth, int v)
+{
+    switch (depth) {
+        case 8:
+            LIMITED_TO_FULL(16, 235, 255);
+            break;
+        case 10:
+            LIMITED_TO_FULL(64, 940, 1023);
+            break;
+        case 12:
+            LIMITED_TO_FULL(256, 3760, 4095);
+            break;
+    }
+    return v;
+}
+
+int avifLimitedToFullUV(uint32_t depth, int v)
+{
+    switch (depth) {
+        case 8:
+            LIMITED_TO_FULL(16, 240, 255);
+            break;
+        case 10:
+            LIMITED_TO_FULL(64, 960, 1023);
+            break;
+        case 12:
+            LIMITED_TO_FULL(256, 3840, 4095);
+            break;
+    }
+    return v;
+}
+
+int avifFullToLimitedY(uint32_t depth, int v)
+{
+    switch (depth) {
+        case 8:
+            FULL_TO_LIMITED(16, 235, 255);
+            break;
+        case 10:
+            FULL_TO_LIMITED(64, 940, 1023);
+            break;
+        case 12:
+            FULL_TO_LIMITED(256, 3760, 4095);
+            break;
+    }
+    return v;
+}
+
+int avifFullToLimitedUV(uint32_t depth, int v)
+{
+    switch (depth) {
+        case 8:
+            FULL_TO_LIMITED(16, 240, 255);
+            break;
+        case 10:
+            FULL_TO_LIMITED(64, 960, 1023);
+            break;
+        case 12:
+            FULL_TO_LIMITED(256, 3840, 4095);
+            break;
+    }
+    return v;
+}
+
+static inline uint16_t avifFloatToF16(float v)
+{
+    avifF16 f16;
+    f16.f = v * F16_MULTIPLIER;
+    return (uint16_t)(f16.u32 >> 13);
+}
+
+static inline float avifF16ToFloat(uint16_t v)
+{
+    avifF16 f16;
+    f16.u32 = v << 13;
+    return f16.f / F16_MULTIPLIER;
+}
+
+void avifGetRGBAPixel(const avifRGBImage * src, uint32_t x, uint32_t y, const avifRGBColorSpaceInfo * info, float rgbaPixel[4])
+{
+    assert(src != NULL);
+    assert(!src->isFloat || src->depth == 16);
+    assert(src->format != AVIF_RGB_FORMAT_RGB_565 || src->depth == 8);
+
+    const uint8_t * const srcPixel = &src->pixels[y * src->rowBytes + x * info->pixelBytes];
+    if (info->channelBytes > 1) {
+        uint16_t r = *((uint16_t *)(&srcPixel[info->offsetBytesR]));
+        uint16_t g = *((uint16_t *)(&srcPixel[info->offsetBytesG]));
+        uint16_t b = *((uint16_t *)(&srcPixel[info->offsetBytesB]));
+        uint16_t a = avifRGBFormatHasAlpha(src->format) ? *((uint16_t *)(&srcPixel[info->offsetBytesA])) : (uint16_t)info->maxChannel;
+        if (src->isFloat) {
+            rgbaPixel[0] = avifF16ToFloat(r);
+            rgbaPixel[1] = avifF16ToFloat(g);
+            rgbaPixel[2] = avifF16ToFloat(b);
+            rgbaPixel[3] = avifRGBFormatHasAlpha(src->format) ? avifF16ToFloat(a) : 1.0f;
+        } else {
+            rgbaPixel[0] = r / info->maxChannelF;
+            rgbaPixel[1] = g / info->maxChannelF;
+            rgbaPixel[2] = b / info->maxChannelF;
+            rgbaPixel[3] = a / info->maxChannelF;
+        }
+    } else {
+        if (src->format == AVIF_RGB_FORMAT_RGB_565) {
+            uint8_t r, g, b;
+            avifGetRGB565(&srcPixel[info->offsetBytesR], &r, &g, &b);
+            rgbaPixel[0] = r / info->maxChannelF;
+            rgbaPixel[1] = g / info->maxChannelF;
+            rgbaPixel[2] = b / info->maxChannelF;
+            rgbaPixel[3] = 1.0f;
+        } else {
+            rgbaPixel[0] = srcPixel[info->offsetBytesR] / info->maxChannelF;
+            rgbaPixel[1] = srcPixel[info->offsetBytesG] / info->maxChannelF;
+            rgbaPixel[2] = srcPixel[info->offsetBytesB] / info->maxChannelF;
+            rgbaPixel[3] = avifRGBFormatHasAlpha(src->format) ? (srcPixel[info->offsetBytesA] / info->maxChannelF) : 1.0f;
+        }
+    }
+}
+
+void avifSetRGBAPixel(const avifRGBImage * dst, uint32_t x, uint32_t y, const avifRGBColorSpaceInfo * info, const float rgbaPixel[4])
+{
+    assert(dst != NULL);
+    assert(!dst->isFloat || dst->depth == 16);
+    assert(dst->format != AVIF_RGB_FORMAT_RGB_565 || dst->depth == 8);
+
+    uint8_t * const dstPixel = &dst->pixels[y * dst->rowBytes + x * info->pixelBytes];
+
+    uint8_t * const ptrR = &dstPixel[info->offsetBytesR];
+    uint8_t * const ptrG = &dstPixel[info->offsetBytesG];
+    uint8_t * const ptrB = &dstPixel[info->offsetBytesB];
+    uint8_t * const ptrA = avifRGBFormatHasAlpha(dst->format) ? &dstPixel[info->offsetBytesA] : NULL;
+    if (dst->depth > 8) {
+        if (dst->isFloat) {
+            *((uint16_t *)ptrR) = avifFloatToF16(rgbaPixel[0]);
+            *((uint16_t *)ptrG) = avifFloatToF16(rgbaPixel[1]);
+            *((uint16_t *)ptrB) = avifFloatToF16(rgbaPixel[2]);
+            if (ptrA) {
+                *((uint16_t *)ptrA) = avifFloatToF16(rgbaPixel[3]);
+            }
+        } else {
+            *((uint16_t *)ptrR) = (uint16_t)(0.5f + (rgbaPixel[0] * info->maxChannelF));
+            *((uint16_t *)ptrG) = (uint16_t)(0.5f + (rgbaPixel[1] * info->maxChannelF));
+            *((uint16_t *)ptrB) = (uint16_t)(0.5f + (rgbaPixel[2] * info->maxChannelF));
+            if (ptrA) {
+                *((uint16_t *)ptrA) = (uint16_t)(0.5f + (rgbaPixel[3] * info->maxChannelF));
+            }
+        }
+    } else {
+        avifStoreRGB8Pixel(dst->format,
+                           (uint8_t)(0.5f + (rgbaPixel[0] * info->maxChannelF)),
+                           (uint8_t)(0.5f + (rgbaPixel[1] * info->maxChannelF)),
+                           (uint8_t)(0.5f + (rgbaPixel[2] * info->maxChannelF)),
+                           ptrR,
+                           ptrG,
+                           ptrB);
+        if (ptrA) {
+            *ptrA = (uint8_t)(0.5f + (rgbaPixel[3] * info->maxChannelF));
+        }
+    }
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/reformat_libsharpyuv.c b/pxr/imaging/plugin/hioAvif/AVIF/src/reformat_libsharpyuv.c
new file mode 100644
index 0000000000..8fcb436263
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/reformat_libsharpyuv.c
@@ -0,0 +1,78 @@
+// Copyright 2022 Google LLC
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#if defined(AVIF_LIBSHARPYUV_ENABLED)
+#include <sharpyuv/sharpyuv.h>
+#include <sharpyuv/sharpyuv_csp.h>
+
+avifResult avifImageRGBToYUVLibSharpYUV(avifImage * image, const avifRGBImage * rgb, const avifReformatState * state)
+{
+    const SharpYuvColorSpace colorSpace = {
+        state->yuv.kr, state->yuv.kb, image->depth, (state->yuv.range == AVIF_RANGE_LIMITED) ? kSharpYuvRangeLimited : kSharpYuvRangeFull
+    };
+
+    SharpYuvConversionMatrix matrix;
+    // Fills in 'matrix' for the given YUVColorSpace.
+    SharpYuvComputeConversionMatrix(&colorSpace, &matrix);
+#if SHARPYUV_VERSION >= SHARPYUV_MAKE_VERSION(0, 4, 0)
+    SharpYuvOptions options;
+    SharpYuvOptionsInit(&matrix, &options);
+    if (image->transferCharacteristics == AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED) {
+        // Set to sRGB for backward compatibility.
+        options.transfer_type = kSharpYuvTransferFunctionSrgb;
+    } else {
+        options.transfer_type = (SharpYuvTransferFunctionType)image->transferCharacteristics;
+    }
+    const int sharpyuvRes = SharpYuvConvertWithOptions(&rgb->pixels[state->rgb.offsetBytesR],
+                                                       &rgb->pixels[state->rgb.offsetBytesG],
+                                                       &rgb->pixels[state->rgb.offsetBytesB],
+                                                       state->rgb.pixelBytes,
+                                                       rgb->rowBytes,
+                                                       rgb->depth,
+                                                       image->yuvPlanes[AVIF_CHAN_Y],
+                                                       image->yuvRowBytes[AVIF_CHAN_Y],
+                                                       image->yuvPlanes[AVIF_CHAN_U],
+                                                       image->yuvRowBytes[AVIF_CHAN_U],
+                                                       image->yuvPlanes[AVIF_CHAN_V],
+                                                       image->yuvRowBytes[AVIF_CHAN_V],
+                                                       image->depth,
+                                                       rgb->width,
+                                                       rgb->height,
+                                                       &options);
+#else
+    const int sharpyuvRes = SharpYuvConvert(&rgb->pixels[state->rgb.offsetBytesR],
+                                            &rgb->pixels[state->rgb.offsetBytesG],
+                                            &rgb->pixels[state->rgb.offsetBytesB],
+                                            state->rgb.pixelBytes,
+                                            rgb->rowBytes,
+                                            rgb->depth,
+                                            image->yuvPlanes[AVIF_CHAN_Y],
+                                            image->yuvRowBytes[AVIF_CHAN_Y],
+                                            image->yuvPlanes[AVIF_CHAN_U],
+                                            image->yuvRowBytes[AVIF_CHAN_U],
+                                            image->yuvPlanes[AVIF_CHAN_V],
+                                            image->yuvRowBytes[AVIF_CHAN_V],
+                                            image->depth,
+                                            rgb->width,
+                                            rgb->height,
+                                            &matrix);
+#endif // SHARPYUV_VERSION >= SHARPYUV_MAKE_VERSION(0, 4, 0)
+    if (!sharpyuvRes) {
+        return AVIF_RESULT_REFORMAT_FAILED;
+    }
+
+    return AVIF_RESULT_OK;
+}
+
+#else
+
+avifResult avifImageRGBToYUVLibSharpYUV(avifImage * image, const avifRGBImage * rgb, const avifReformatState * state)
+{
+    (void)image;
+    (void)rgb;
+    (void)state;
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+#endif // defined(AVIF_LIBSHARPYUV_ENABLED)
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/reformat_libyuv.c b/pxr/imaging/plugin/hioAvif/AVIF/src/reformat_libyuv.c
new file mode 100644
index 0000000000..285d1ef57f
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/reformat_libyuv.c
@@ -0,0 +1,1147 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#if !defined(AVIF_LIBYUV_ENABLED)
+
+// No libyuv!
+avifResult avifImageRGBToYUVLibYUV(avifImage * image, const avifRGBImage * rgb)
+{
+    (void)image;
+    (void)rgb;
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+avifResult avifImageYUVToRGBLibYUV(const avifImage * image, avifRGBImage * rgb, avifBool reformatAlpha, avifBool * alphaReformattedWithLibYUV)
+{
+    (void)image;
+    (void)rgb;
+    (void)reformatAlpha;
+    *alphaReformattedWithLibYUV = AVIF_FALSE;
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+avifResult avifRGBImagePremultiplyAlphaLibYUV(avifRGBImage * rgb)
+{
+    (void)rgb;
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+avifResult avifRGBImageUnpremultiplyAlphaLibYUV(avifRGBImage * rgb)
+{
+    (void)rgb;
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+avifResult avifRGBImageToF16LibYUV(avifRGBImage * rgb)
+{
+    (void)rgb;
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+unsigned int avifLibYUVVersion(void)
+{
+    return 0;
+}
+
+#else
+
+#include <assert.h>
+#include <limits.h>
+#include <string.h>
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes" // "this function declaration is not a prototype"
+// The newline at the end of libyuv/version.h was accidentally deleted in version 1792 and restored
+// in version 1813:
+// https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3183182
+// https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3527834
+#pragma clang diagnostic ignored "-Wnewline-eof"       // "no newline at end of file"
+#endif
+#include <libyuv.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+// libyuv is a C++ library and defines custom types (struct, enum, etc) in the libyuv namespace when the libyuv header files are
+// included by C++ code. When accessed from a C library like libavif, via a function pointer, this leads to signature mismatches
+// in the CFI sanitizers since libyuv itself, compiled as C++ code, has the types within the namespace and the C code has the
+// types without the namespace. In order to avoid this CFI error, we tag some functions as an exception when being compiled with
+// CFI enabled.  For more details on clang's CFI see: https://clang.llvm.org/docs/ControlFlowIntegrity.html. For a simpler example
+// of this bug, please see: https://github.com/vigneshvg/cpp_c_potential_cfi_bug
+#if defined(__clang__)
+#define IGNORE_CFI_ICALL __attribute__((no_sanitize("cfi-icall")))
+#else
+#define IGNORE_CFI_ICALL
+#endif
+
+//--------------------------------------------------------------------------------------------------
+// libyuv API availability management
+
+// These defines are used to create a NULL reference to libyuv functions that
+// did not exist prior to a particular version of libyuv.
+// Versions prior to 1755 are considered too old and not used (see CMakeLists.txt).
+#if LIBYUV_VERSION < 1844
+// I444ToRGB24Matrix() and I422ToRGB24MatrixFilter() were added in libyuv version 1844.
+//
+// Note: Between the following two commits, libyuv version jumped from 1841 to 1844, down to 1843,
+// and back to 1844. See https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3906082 and
+// https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3906091.
+#define I444ToRGB24Matrix NULL
+#define I422ToRGB24MatrixFilter NULL
+#endif
+#if LIBYUV_VERSION < 1841
+// I420ToRGB24MatrixFilter() was added in libyuv version 1841.
+// See https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3900298.
+#define I420ToRGB24MatrixFilter NULL
+#endif
+#if LIBYUV_VERSION < 1840
+#define ABGRToJ400 NULL
+#endif
+#if LIBYUV_VERSION < 1838
+#define I422ToRGB565Matrix NULL
+#endif
+#if LIBYUV_VERSION < 1813
+#define I422ToARGBMatrixFilter NULL
+#define I420ToARGBMatrixFilter NULL
+#define I210ToARGBMatrixFilter NULL
+#define I010ToARGBMatrixFilter NULL
+#define I420AlphaToARGBMatrixFilter NULL
+#define I422AlphaToARGBMatrixFilter NULL
+#define I010AlphaToARGBMatrixFilter NULL
+#define I210AlphaToARGBMatrixFilter NULL
+#endif
+#if LIBYUV_VERSION < 1782
+#define RAWToJ420 NULL
+#endif
+#if LIBYUV_VERSION < 1781
+#define I012ToARGBMatrix NULL
+#endif
+#if LIBYUV_VERSION < 1780
+#define I410ToARGBMatrix NULL
+#define I410AlphaToARGBMatrix NULL
+#define I210AlphaToARGBMatrix NULL
+#define I010AlphaToARGBMatrix NULL
+#endif
+#if LIBYUV_VERSION < 1771
+#define I422AlphaToARGBMatrix NULL
+#define I444AlphaToARGBMatrix NULL
+#endif
+#if LIBYUV_VERSION < 1756
+#define I400ToARGBMatrix NULL
+#endif
+
+// Two-step replacement for the conversions to 8-bit BT.601 YUV which are missing from libyuv.
+static int avifReorderARGBThenConvertToYUV(int (*ReorderARGB)(const uint8_t *, int, uint8_t *, int, int, int),
+                                           int (*ConvertToYUV)(const uint8_t *, int, uint8_t *, int, uint8_t *, int, uint8_t *, int, int, int),
+                                           const uint8_t * src_abgr,
+                                           int src_stride_abgr,
+                                           uint8_t * dst_y,
+                                           int dst_stride_y,
+                                           uint8_t * dst_u,
+                                           int dst_stride_u,
+                                           uint8_t * dst_v,
+                                           int dst_stride_v,
+                                           avifPixelFormat dst_format,
+                                           int width,
+                                           int height)
+{
+    // Only the vertically subsampled formats need to be processed by luma row pairs.
+    avifPixelFormatInfo format_info;
+    avifGetPixelFormatInfo(dst_format, &format_info);
+    const int min_num_rows = (format_info.chromaShiftY == 1) ? 2 : 1;
+
+    // A temporary buffer is needed to call ReorderARGB().
+    uint8_t * src_argb;
+    const int src_stride_argb = width * 4;
+    const int soft_allocation_limit = 16384; // Arbitrarily chosen trade-off between CPU and memory footprints.
+    int num_allocated_rows;
+    if ((height == 1) || ((int64_t)src_stride_argb * height <= soft_allocation_limit)) {
+        // Process the whole buffer in one go.
+        num_allocated_rows = height;
+    } else {
+        if ((int64_t)src_stride_argb * min_num_rows > INT_MAX) {
+            return -1;
+        }
+        // The last row of an odd number of RGB rows to be converted to vertically subsampled YUV is treated
+        // differently by libyuv, so make sure all steps but the last one process a multiple of min_num_rows rows.
+        // Try to process the highest multiple of min_num_rows rows possible in a single step without
+        // allocating more than soft_allocation_limit, unless min_num_rows rows need more than that.
+        num_allocated_rows = AVIF_MAX(1, soft_allocation_limit / (src_stride_argb * min_num_rows)) * min_num_rows;
+    }
+    src_argb = avifAlloc(num_allocated_rows * src_stride_argb);
+    if (!src_argb) {
+        return -1;
+    }
+
+    for (int y = 0; y < height; y += num_allocated_rows) {
+        const int num_rows = AVIF_MIN(num_allocated_rows, height - y);
+        if (ReorderARGB(src_abgr, src_stride_abgr, src_argb, src_stride_argb, width, num_rows) ||
+            ConvertToYUV(src_argb, src_stride_argb, dst_y, dst_stride_y, dst_u, dst_stride_u, dst_v, dst_stride_v, width, num_rows)) {
+            avifFree(src_argb);
+            return -1;
+        }
+        src_abgr += (size_t)num_rows * src_stride_abgr;
+        dst_y += (size_t)num_rows * dst_stride_y;
+        // Either chroma is not vertically subsampled, num_rows is even, or this is the last iteration.
+        dst_u += (size_t)(num_rows >> format_info.chromaShiftY) * dst_stride_u;
+        dst_v += (size_t)(num_rows >> format_info.chromaShiftY) * dst_stride_v;
+    }
+    avifFree(src_argb);
+    return 0;
+}
+
+#define AVIF_DEFINE_CONVERSION(NAME, REORDER_ARGB, CONVERT_TO_YUV, YUV_FORMAT) \
+    static int NAME(const uint8_t * src_abgr,                                  \
+                    int src_stride_abgr,                                       \
+                    uint8_t * dst_y,                                           \
+                    int dst_stride_y,                                          \
+                    uint8_t * dst_u,                                           \
+                    int dst_stride_u,                                          \
+                    uint8_t * dst_v,                                           \
+                    int dst_stride_v,                                          \
+                    int width,                                                 \
+                    int height)                                                \
+    {                                                                          \
+        return avifReorderARGBThenConvertToYUV(REORDER_ARGB,                   \
+                                               CONVERT_TO_YUV,                 \
+                                               src_abgr,                       \
+                                               src_stride_abgr,                \
+                                               dst_y,                          \
+                                               dst_stride_y,                   \
+                                               dst_u,                          \
+                                               dst_stride_u,                   \
+                                               dst_v,                          \
+                                               dst_stride_v,                   \
+                                               YUV_FORMAT,                     \
+                                               width,                          \
+                                               height);                        \
+    }
+
+#if LIBYUV_VERSION < 1840
+// AVIF_RGB_FORMAT_RGBA
+AVIF_DEFINE_CONVERSION(ABGRToJ422, ABGRToARGB, ARGBToJ422, AVIF_PIXEL_FORMAT_YUV422)
+AVIF_DEFINE_CONVERSION(ABGRToJ420, ABGRToARGB, ARGBToJ420, AVIF_PIXEL_FORMAT_YUV420)
+#endif
+
+// These are not yet implemented in libyuv so they cannot be guarded by a version check.
+// The "avif" prefix avoids any redefinition if they are available in libyuv one day.
+// AVIF_RGB_FORMAT_RGB
+AVIF_DEFINE_CONVERSION(avifRAWToI444, RAWToARGB, ARGBToI444, AVIF_PIXEL_FORMAT_YUV444)
+AVIF_DEFINE_CONVERSION(avifRAWToI422, RAWToARGB, ARGBToI422, AVIF_PIXEL_FORMAT_YUV422)
+AVIF_DEFINE_CONVERSION(avifRAWToJ422, RAWToARGB, ARGBToJ422, AVIF_PIXEL_FORMAT_YUV422)
+// AVIF_RGB_FORMAT_RGBA
+AVIF_DEFINE_CONVERSION(avifABGRToI444, ABGRToARGB, ARGBToI444, AVIF_PIXEL_FORMAT_YUV444)
+AVIF_DEFINE_CONVERSION(avifABGRToI422, ABGRToARGB, ARGBToI422, AVIF_PIXEL_FORMAT_YUV422)
+// AVIF_RGB_FORMAT_ARGB
+AVIF_DEFINE_CONVERSION(avifBGRAToI444, BGRAToARGB, ARGBToI444, AVIF_PIXEL_FORMAT_YUV444)
+AVIF_DEFINE_CONVERSION(avifBGRAToI422, BGRAToARGB, ARGBToI422, AVIF_PIXEL_FORMAT_YUV422)
+AVIF_DEFINE_CONVERSION(avifBGRAToJ422, BGRAToARGB, ARGBToJ422, AVIF_PIXEL_FORMAT_YUV422)
+AVIF_DEFINE_CONVERSION(avifBGRAToJ420, BGRAToARGB, ARGBToJ420, AVIF_PIXEL_FORMAT_YUV420)
+// AVIF_RGB_FORMAT_BGR
+AVIF_DEFINE_CONVERSION(avifRGB24ToI444, RGB24ToARGB, ARGBToI444, AVIF_PIXEL_FORMAT_YUV444)
+AVIF_DEFINE_CONVERSION(avifRGB24ToI422, RGB24ToARGB, ARGBToI422, AVIF_PIXEL_FORMAT_YUV422)
+AVIF_DEFINE_CONVERSION(avifRGB24ToJ422, RGB24ToARGB, ARGBToJ422, AVIF_PIXEL_FORMAT_YUV422)
+// AVIF_RGB_FORMAT_ABGR
+AVIF_DEFINE_CONVERSION(avifRGBAToI444, RGBAToARGB, ARGBToI444, AVIF_PIXEL_FORMAT_YUV444)
+AVIF_DEFINE_CONVERSION(avifRGBAToI422, RGBAToARGB, ARGBToI422, AVIF_PIXEL_FORMAT_YUV422)
+AVIF_DEFINE_CONVERSION(avifRGBAToJ422, RGBAToARGB, ARGBToJ422, AVIF_PIXEL_FORMAT_YUV422)
+AVIF_DEFINE_CONVERSION(avifRGBAToJ420, RGBAToARGB, ARGBToJ420, AVIF_PIXEL_FORMAT_YUV420)
+
+//--------------------------------------------------------------------------------------------------
+// RGB to YUV
+
+static avifResult avifImageRGBToYUVLibYUV8bpc(avifImage * image, const avifRGBImage * rgb);
+
+avifResult avifImageRGBToYUVLibYUV(avifImage * image, const avifRGBImage * rgb)
+{
+    if ((image->depth == 8) && (rgb->depth == 8)) {
+        return avifImageRGBToYUVLibYUV8bpc(image, rgb);
+    }
+
+    // This function didn't do anything; use the built-in conversion.
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+
+avifResult avifImageRGBToYUVLibYUV8bpc(avifImage * image, const avifRGBImage * rgb)
+{
+    assert((image->depth == 8) && (rgb->depth == 8));
+    // libavif uses byte-order when describing pixel formats, such that the R in RGBA is the lowest address,
+    // similar to PNG. libyuv orders in word-order, so libavif's RGBA would be referred to in libyuv as ABGR.
+
+    // libyuv only handles BT.601 for RGB to YUV, and not all range/order/subsampling combinations.
+    // BT.470BG has the same coefficients as BT.601.
+    if ((image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_BT470BG) || (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_BT601)) {
+        if (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400) {
+            // Lookup table for RGB To Y (monochrome).
+            typedef int (*RGBtoY)(const uint8_t *, int, uint8_t *, int, int, int);
+            // First dimension is for avifRange.
+            RGBtoY lutRgbToY[2][AVIF_RGB_FORMAT_COUNT] = { // AVIF_RANGE_LIMITED
+                                                           {
+                                                               //          // AVIF_RGB_FORMAT_
+                                                               NULL,       // RGB
+                                                               NULL,       // RGBA
+                                                               NULL,       // ARGB
+                                                               NULL,       // BGR
+                                                               ARGBToI400, // BGRA
+                                                               NULL,       // ABGR
+                                                               NULL,       // RGB_565
+                                                           },
+                                                           // AVIF_RANGE_FULL
+                                                           {
+                                                               //           // AVIF_RGB_FORMAT_
+                                                               RAWToJ400,   // RGB
+                                                               ABGRToJ400,  // RGBA
+                                                               NULL,        // ARGB
+                                                               RGB24ToJ400, // BGR
+                                                               ARGBToJ400,  // BGRA
+                                                               RGBAToJ400,  // ABGR
+                                                               NULL         // RGB_565
+                                                           }
+            };
+            RGBtoY rgbToY = lutRgbToY[image->yuvRange][rgb->format];
+            if (rgbToY != NULL) {
+                if (rgbToY(rgb->pixels,
+                           rgb->rowBytes,
+                           image->yuvPlanes[AVIF_CHAN_Y],
+                           image->yuvRowBytes[AVIF_CHAN_Y],
+                           image->width,
+                           image->height) != 0) {
+                    return AVIF_RESULT_REFORMAT_FAILED;
+                }
+                return AVIF_RESULT_OK;
+            }
+        } else {
+            // Lookup table for RGB To YUV Matrix (average filter).
+            typedef int (*RGBtoYUV)(const uint8_t *, int, uint8_t *, int, uint8_t *, int, uint8_t *, int, int, int);
+            // First dimension is for avifRange.
+            RGBtoYUV lutRgbToYuv[2][AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+                // AVIF_RANGE_LIMITED
+                {
+                    // { NONE,    YUV444,    YUV422,    YUV420,    YUV400 }        // AVIF_RGB_FORMAT_
+                    { NULL, avifRAWToI444, avifRAWToI422, RAWToI420, NULL },       // RGB
+                    { NULL, avifABGRToI444, avifABGRToI422, ABGRToI420, NULL },    // RGBA
+                    { NULL, avifBGRAToI444, avifBGRAToI422, BGRAToI420, NULL },    // ARGB
+                    { NULL, avifRGB24ToI444, avifRGB24ToI422, RGB24ToI420, NULL }, // BGR
+                    { NULL, ARGBToI444, ARGBToI422, ARGBToI420, NULL },            // BGRA
+                    { NULL, avifRGBAToI444, avifRGBAToI422, RGBAToI420, NULL },    // ABGR
+                    { NULL, NULL, NULL, NULL, NULL }                               // RGB_565
+                },
+                // AVIF_RANGE_FULL
+                {
+                    // { NONE, YUV444, YUV422,   YUV420,   YUV400 }       // AVIF_RGB_FORMAT_
+                    { NULL, NULL, avifRAWToJ422, RAWToJ420, NULL },       // RGB
+                    { NULL, NULL, ABGRToJ422, ABGRToJ420, NULL },         // RGBA
+                    { NULL, NULL, avifBGRAToJ422, avifBGRAToJ420, NULL }, // ARGB
+                    { NULL, NULL, avifRGB24ToJ422, RGB24ToJ420, NULL },   // BGR
+                    { NULL, NULL, ARGBToJ422, ARGBToJ420, NULL },         // BGRA
+                    { NULL, NULL, avifRGBAToJ422, avifRGBAToJ420, NULL }, // ABGR
+                    { NULL, NULL, NULL, NULL, NULL }                      // RGB_565
+                }
+            };
+            RGBtoYUV rgbToYuv = lutRgbToYuv[image->yuvRange][rgb->format][image->yuvFormat];
+            if (rgbToYuv != NULL) {
+                if (rgbToYuv(rgb->pixels,
+                             rgb->rowBytes,
+                             image->yuvPlanes[AVIF_CHAN_Y],
+                             image->yuvRowBytes[AVIF_CHAN_Y],
+                             image->yuvPlanes[AVIF_CHAN_U],
+                             image->yuvRowBytes[AVIF_CHAN_U],
+                             image->yuvPlanes[AVIF_CHAN_V],
+                             image->yuvRowBytes[AVIF_CHAN_V],
+                             image->width,
+                             image->height) != 0) {
+                    return AVIF_RESULT_REFORMAT_FAILED;
+                }
+                return AVIF_RESULT_OK;
+            }
+        }
+    }
+    // TODO: Use SplitRGBPlane() for AVIF_MATRIX_COEFFICIENTS_IDENTITY if faster than the built-in implementation
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+
+//--------------------------------------------------------------------------------------------------
+// YUV to RGB
+
+// Note about the libyuv look up tables used for YUV-to-RGB conversion:
+// libavif uses byte-order when describing pixel formats, such that the R in RGBA is the lowest address, similar to PNG. libyuv
+// orders in word-order, so libavif's RGBA would be referred to in libyuv as ABGR.  In addition, swapping U and V in any of the
+// calls, along with using the Yvu matrix instead of Yuv matrix, swaps B and R in these orderings as well.
+//
+// libavif format            libyuv Func      UV matrix (and UV argument ordering)
+// --------------------      -------------    ------------------------------------
+// For 8-bit YUV:
+// AVIF_RGB_FORMAT_RGB       *ToRGB24Matrix   matrixYVU
+// AVIF_RGB_FORMAT_RGBA      *ToARGBMatrix    matrixYVU
+// AVIF_RGB_FORMAT_ARGB      *ToRGBAMatrix    matrixYVU
+// AVIF_RGB_FORMAT_BGR       *ToRGB24Matrix   matrixYUV
+// AVIF_RGB_FORMAT_BGRA      *ToARGBMatrix    matrixYUV
+// AVIF_RGB_FORMAT_ABGR      *ToRGBAMatrix    matrixYUV
+// AVIF_RGB_FORMAT_RGB_565   *ToRGB565Matrix  matrixYUV
+//
+// For 10-bit and 12-bit YUV:
+// AVIF_RGB_FORMAT_RGB       n/a              n/a
+// AVIF_RGB_FORMAT_RGBA      *ToARGBMatrix    matrixYVU
+// AVIF_RGB_FORMAT_ARGB      n/a              n/a
+// AVIF_RGB_FORMAT_BGR       n/a              n/a
+// AVIF_RGB_FORMAT_BGRA      *ToARGBMatrix    matrixYUV
+// AVIF_RGB_FORMAT_ABGR      n/a              n/a
+// AVIF_RGB_FORMAT_RGB_565   n/a              n/a
+
+// Lookup table for isYVU. If the entry in this table is AVIF_TRUE, then it
+// means that we are using a libyuv function with R and B channels swapped,
+// which requires U and V planes also be swapped.
+static const avifBool lutIsYVU[AVIF_RGB_FORMAT_COUNT] = {
+    //          // AVIF_RGB_FORMAT_
+    AVIF_TRUE,  // RGB
+    AVIF_TRUE,  // RGBA
+    AVIF_TRUE,  // ARGB
+    AVIF_FALSE, // BGR
+    AVIF_FALSE, // BGRA
+    AVIF_FALSE, // ABGR
+    AVIF_FALSE, // RGB_565
+};
+
+typedef int (*YUV400ToRGBMatrix)(const uint8_t *, int, uint8_t *, int, const struct YuvConstants *, int, int);
+typedef int (*YUVToRGBMatrixFilter)(const uint8_t *,
+                                    int,
+                                    const uint8_t *,
+                                    int,
+                                    const uint8_t *,
+                                    int,
+                                    uint8_t *,
+                                    int,
+                                    const struct YuvConstants *,
+                                    int,
+                                    int,
+                                    enum FilterMode);
+typedef int (*YUVAToRGBMatrixFilter)(const uint8_t *,
+                                     int,
+                                     const uint8_t *,
+                                     int,
+                                     const uint8_t *,
+                                     int,
+                                     const uint8_t *,
+                                     int,
+                                     uint8_t *,
+                                     int,
+                                     const struct YuvConstants *,
+                                     int,
+                                     int,
+                                     int,
+                                     enum FilterMode);
+typedef int (*YUVToRGBMatrix)(const uint8_t *, int, const uint8_t *, int, const uint8_t *, int, uint8_t *, int, const struct YuvConstants *, int, int);
+typedef int (*YUVAToRGBMatrix)(const uint8_t *,
+                               int,
+                               const uint8_t *,
+                               int,
+                               const uint8_t *,
+                               int,
+                               const uint8_t *,
+                               int,
+                               uint8_t *,
+                               int,
+                               const struct YuvConstants *,
+                               int,
+                               int,
+                               int);
+typedef int (*YUVToRGBMatrixFilterHighBitDepth)(const uint16_t *,
+                                                int,
+                                                const uint16_t *,
+                                                int,
+                                                const uint16_t *,
+                                                int,
+                                                uint8_t *,
+                                                int,
+                                                const struct YuvConstants *,
+                                                int,
+                                                int,
+                                                enum FilterMode);
+typedef int (*YUVAToRGBMatrixFilterHighBitDepth)(const uint16_t *,
+                                                 int,
+                                                 const uint16_t *,
+                                                 int,
+                                                 const uint16_t *,
+                                                 int,
+                                                 const uint16_t *,
+                                                 int,
+                                                 uint8_t *,
+                                                 int,
+                                                 const struct YuvConstants *,
+                                                 int,
+                                                 int,
+                                                 int,
+                                                 enum FilterMode);
+typedef int (*YUVToRGBMatrixHighBitDepth)(const uint16_t *,
+                                          int,
+                                          const uint16_t *,
+                                          int,
+                                          const uint16_t *,
+                                          int,
+                                          uint8_t *,
+                                          int,
+                                          const struct YuvConstants *,
+                                          int,
+                                          int);
+typedef int (*YUVAToRGBMatrixHighBitDepth)(const uint16_t *,
+                                           int,
+                                           const uint16_t *,
+                                           int,
+                                           const uint16_t *,
+                                           int,
+                                           const uint16_t *,
+                                           int,
+                                           uint8_t *,
+                                           int,
+                                           const struct YuvConstants *,
+                                           int,
+                                           int,
+                                           int);
+
+// At most one pointer in this struct will be not-NULL.
+typedef struct
+{
+    YUV400ToRGBMatrix yuv400ToRgbMatrix;
+    YUVToRGBMatrixFilter yuvToRgbMatrixFilter;
+    YUVAToRGBMatrixFilter yuvaToRgbMatrixFilter;
+    YUVToRGBMatrix yuvToRgbMatrix;
+    YUVAToRGBMatrix yuvaToRgbMatrix;
+    YUVToRGBMatrixFilterHighBitDepth yuvToRgbMatrixFilterHighBitDepth;
+    YUVAToRGBMatrixFilterHighBitDepth yuvaToRgbMatrixFilterHighBitDepth;
+    YUVToRGBMatrixHighBitDepth yuvToRgbMatrixHighBitDepth;
+    YUVAToRGBMatrixHighBitDepth yuvaToRgbMatrixHighBitDepth;
+} LibyuvConversionFunction;
+
+// Only allow nearest-neighbor filter if explicitly specified or left as default.
+static avifBool nearestNeighborFilterAllowed(int chromaUpsampling)
+{
+    return chromaUpsampling != AVIF_CHROMA_UPSAMPLING_BILINEAR && chromaUpsampling != AVIF_CHROMA_UPSAMPLING_BEST_QUALITY;
+}
+
+// Returns AVIF_TRUE if the given yuvFormat and yuvDepth can be converted to 8-bit RGB using libyuv, AVIF_FALSE otherwise. When
+// AVIF_TRUE is returned, exactly one function pointers will be populated with the appropriate conversion function. If
+// alphaPreferred is set to AVIF_TRUE, then a function that can also copy the alpha channel will be preferred if available.
+static avifBool getLibYUVConversionFunction(avifPixelFormat yuvFormat,
+                                            int yuvDepth,
+                                            avifRGBImage * rgb,
+                                            avifBool alphaPreferred,
+                                            LibyuvConversionFunction * lcf)
+{
+    // Lookup table for 8-bit YUV400 to 8-bit RGB Matrix.
+    static const YUV400ToRGBMatrix lutYuv400ToRgbMatrix[AVIF_RGB_FORMAT_COUNT] = {
+        //                // AVIF_RGB_FORMAT_
+        NULL,             // RGB
+        I400ToARGBMatrix, // RGBA
+        NULL,             // ARGB
+        NULL,             // BGR
+        I400ToARGBMatrix, // BGRA
+        NULL,             // ABGR
+        NULL,             // RGB_565
+    };
+
+    // Lookup table for 8-bit YUV To 8-bit RGB Matrix (with filter).
+    static const YUVToRGBMatrixFilter lutYuvToRgbMatrixFilter[AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+        // { NONE, YUV444, YUV422, YUV420, YUV400 }                           // AVIF_RGB_FORMAT_
+        { NULL, NULL, I422ToRGB24MatrixFilter, I420ToRGB24MatrixFilter, NULL }, // RGB
+        { NULL, NULL, I422ToARGBMatrixFilter, I420ToARGBMatrixFilter, NULL },   // RGBA
+        { NULL, NULL, NULL, NULL, NULL },                                       // ARGB
+        { NULL, NULL, I422ToRGB24MatrixFilter, I420ToRGB24MatrixFilter, NULL }, // BGR
+        { NULL, NULL, I422ToARGBMatrixFilter, I420ToARGBMatrixFilter, NULL },   // BGRA
+        { NULL, NULL, NULL, NULL, NULL },                                       // ABGR
+        { NULL, NULL, NULL, NULL, NULL },                                       // RGB_565
+    };
+
+    // Lookup table for 8-bit YUVA To 8-bit RGB Matrix (with filter).
+    static const YUVAToRGBMatrixFilter lutYuvaToRgbMatrixFilter[AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+        // { NONE, YUV444, YUV422, YUV420, YUV400 }                           // AVIF_RGB_FORMAT_
+        { NULL, NULL, NULL, NULL, NULL },                                               // RGB
+        { NULL, NULL, I422AlphaToARGBMatrixFilter, I420AlphaToARGBMatrixFilter, NULL }, // RGBA
+        { NULL, NULL, NULL, NULL, NULL },                                               // ARGB
+        { NULL, NULL, NULL, NULL, NULL },                                               // BGR
+        { NULL, NULL, I422AlphaToARGBMatrixFilter, I420AlphaToARGBMatrixFilter, NULL }, // BGRA
+        { NULL, NULL, NULL, NULL, NULL },                                               // ABGR
+        { NULL, NULL, NULL, NULL, NULL },                                               // RGB_565
+    };
+
+    // Lookup table for 8-bit YUV To 8-bit RGB Matrix (4:4:4 or nearest-neighbor filter).
+    static const YUVToRGBMatrix lutYuvToRgbMatrix[AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+        // { NONE, YUV444, YUV422, YUV420, YUV400 }                           // AVIF_RGB_FORMAT_
+        { NULL, I444ToRGB24Matrix, NULL, I420ToRGB24Matrix, NULL },           // RGB
+        { NULL, I444ToARGBMatrix, I422ToARGBMatrix, I420ToARGBMatrix, NULL }, // RGBA
+        { NULL, NULL, I422ToRGBAMatrix, I420ToRGBAMatrix, NULL },             // ARGB
+        { NULL, I444ToRGB24Matrix, NULL, I420ToRGB24Matrix, NULL },           // BGR
+        { NULL, I444ToARGBMatrix, I422ToARGBMatrix, I420ToARGBMatrix, NULL }, // BGRA
+        { NULL, NULL, I422ToRGBAMatrix, I420ToRGBAMatrix, NULL },             // ABGR
+        { NULL, NULL, I422ToRGB565Matrix, I420ToRGB565Matrix, NULL },         // RGB_565
+    };
+
+    // Lookup table for 8-bit YUVA To 8-bit RGB Matrix (4:4:4 or nearest-neighbor filter).
+    static const YUVAToRGBMatrix lutYuvaToRgbMatrix[AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+        // { NONE, YUV444, YUV422, YUV420, YUV400 }                           // AVIF_RGB_FORMAT_
+        { NULL, NULL, NULL, NULL, NULL },                                                    // RGB
+        { NULL, I444AlphaToARGBMatrix, I422AlphaToARGBMatrix, I420AlphaToARGBMatrix, NULL }, // RGBA
+        { NULL, NULL, NULL, NULL, NULL },                                                    // ARGB
+        { NULL, NULL, NULL, NULL, NULL },                                                    // BGR
+        { NULL, I444AlphaToARGBMatrix, I422AlphaToARGBMatrix, I420AlphaToARGBMatrix, NULL }, // BGRA
+        { NULL, NULL, NULL, NULL, NULL },                                                    // ABGR
+        { NULL, NULL, NULL, NULL, NULL },                                                    // RGB_565
+    };
+
+    // Lookup table for YUV To RGB Matrix (with filter).  First dimension is for the YUV bit depth.
+    static const YUVToRGBMatrixFilterHighBitDepth lutYuvToRgbMatrixFilterHighBitDepth[2][AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+        // 10bpc
+        {
+            // { NONE, YUV444, YUV422, YUV420, YUV400 }                           // AVIF_RGB_FORMAT_
+            { NULL, NULL, NULL, NULL, NULL },                                     // RGB
+            { NULL, NULL, I210ToARGBMatrixFilter, I010ToARGBMatrixFilter, NULL }, // RGBA
+            { NULL, NULL, NULL, NULL, NULL },                                     // ARGB
+            { NULL, NULL, NULL, NULL, NULL },                                     // BGR
+            { NULL, NULL, I210ToARGBMatrixFilter, I010ToARGBMatrixFilter, NULL }, // BGRA
+            { NULL, NULL, NULL, NULL, NULL },                                     // ABGR
+            { NULL, NULL, NULL, NULL, NULL },                                     // RGB_565
+        },
+        // 12bpc
+        {
+            // { NONE, YUV444, YUV422, YUV420, YUV400 } // AVIF_RGB_FORMAT_
+            { NULL, NULL, NULL, NULL, NULL }, // RGB
+            { NULL, NULL, NULL, NULL, NULL }, // RGBA
+            { NULL, NULL, NULL, NULL, NULL }, // ARGB
+            { NULL, NULL, NULL, NULL, NULL }, // BGR
+            { NULL, NULL, NULL, NULL, NULL }, // BGRA
+            { NULL, NULL, NULL, NULL, NULL }, // ABGR
+            { NULL, NULL, NULL, NULL, NULL }, // RGB_565
+        },
+    };
+
+    // Lookup table for YUVA To RGB Matrix (with filter).  First dimension is for the YUV bit depth.
+    static const YUVAToRGBMatrixFilterHighBitDepth lutYuvaToRgbMatrixFilterHighBitDepth[2][AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+        // 10bpc
+        {
+            // { NONE, YUV444, YUV422, YUV420, YUV400 }                           // AVIF_RGB_FORMAT_
+            { NULL, NULL, NULL, NULL, NULL },                                               // RGB
+            { NULL, NULL, I210AlphaToARGBMatrixFilter, I010AlphaToARGBMatrixFilter, NULL }, // RGBA
+            { NULL, NULL, NULL, NULL, NULL },                                               // ARGB
+            { NULL, NULL, NULL, NULL, NULL },                                               // BGR
+            { NULL, NULL, I210AlphaToARGBMatrixFilter, I010AlphaToARGBMatrixFilter, NULL }, // BGRA
+            { NULL, NULL, NULL, NULL, NULL },                                               // ABGR
+            { NULL, NULL, NULL, NULL, NULL },                                               // RGB_565
+        },
+        // 12bpc
+        {
+            // { NONE, YUV444, YUV422, YUV420, YUV400 } // AVIF_RGB_FORMAT_
+            { NULL, NULL, NULL, NULL, NULL }, // RGB
+            { NULL, NULL, NULL, NULL, NULL }, // RGBA
+            { NULL, NULL, NULL, NULL, NULL }, // ARGB
+            { NULL, NULL, NULL, NULL, NULL }, // BGR
+            { NULL, NULL, NULL, NULL, NULL }, // BGRA
+            { NULL, NULL, NULL, NULL, NULL }, // ABGR
+            { NULL, NULL, NULL, NULL, NULL }, // RGB_565
+        },
+    };
+
+    // Lookup table for YUV To RGB Matrix (4:4:4 or nearest-neighbor filter).  First dimension is for the YUV bit depth.
+    static const YUVToRGBMatrixHighBitDepth lutYuvToRgbMatrixHighBitDepth[2][AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+        // 10bpc
+        {
+            // { NONE, YUV444, YUV422, YUV420, YUV400 }                           // AVIF_RGB_FORMAT_
+            { NULL, NULL, NULL, NULL, NULL },                                     // RGB
+            { NULL, I410ToARGBMatrix, I210ToARGBMatrix, I010ToARGBMatrix, NULL }, // RGBA
+            { NULL, NULL, NULL, NULL, NULL },                                     // ARGB
+            { NULL, NULL, NULL, NULL, NULL },                                     // BGR
+            { NULL, I410ToARGBMatrix, I210ToARGBMatrix, I010ToARGBMatrix, NULL }, // BGRA
+            { NULL, NULL, NULL, NULL, NULL },                                     // ABGR
+            { NULL, NULL, NULL, NULL, NULL },                                     // RGB_565
+        },
+        // 12bpc
+        {
+            // { NONE, YUV444, YUV422, YUV420, YUV400 }   // AVIF_RGB_FORMAT_
+            { NULL, NULL, NULL, NULL, NULL },             // RGB
+            { NULL, NULL, NULL, I012ToARGBMatrix, NULL }, // RGBA
+            { NULL, NULL, NULL, NULL, NULL },             // ARGB
+            { NULL, NULL, NULL, NULL, NULL },             // BGR
+            { NULL, NULL, NULL, I012ToARGBMatrix, NULL }, // BGRA
+            { NULL, NULL, NULL, NULL, NULL },             // ABGR
+            { NULL, NULL, NULL, NULL, NULL },             // RGB_565
+        },
+    };
+
+    // Lookup table for YUVA To RGB Matrix (4:4:4 or nearest-neighbor filter).  First dimension is for the YUV bit depth.
+    static const YUVAToRGBMatrixHighBitDepth lutYuvaToRgbMatrixHighBitDepth[2][AVIF_RGB_FORMAT_COUNT][AVIF_PIXEL_FORMAT_COUNT] = {
+        // 10bpc
+        {
+            // { NONE, YUV444, YUV422, YUV420, YUV400 }                           // AVIF_RGB_FORMAT_
+            { NULL, NULL, NULL, NULL, NULL },                                                    // RGB
+            { NULL, I410AlphaToARGBMatrix, I210AlphaToARGBMatrix, I010AlphaToARGBMatrix, NULL }, // RGBA
+            { NULL, NULL, NULL, NULL, NULL },                                                    // ARGB
+            { NULL, NULL, NULL, NULL, NULL },                                                    // BGR
+            { NULL, I410AlphaToARGBMatrix, I210AlphaToARGBMatrix, I010AlphaToARGBMatrix, NULL }, // BGRA
+            { NULL, NULL, NULL, NULL, NULL },                                                    // ABGR
+            { NULL, NULL, NULL, NULL, NULL },                                                    // RGB_565
+        },
+        // 12bpc
+        {
+            // { NONE, YUV444, YUV422, YUV420, YUV400 }   // AVIF_RGB_FORMAT_
+            { NULL, NULL, NULL, NULL, NULL }, // RGB
+            { NULL, NULL, NULL, NULL, NULL }, // RGBA
+            { NULL, NULL, NULL, NULL, NULL }, // ARGB
+            { NULL, NULL, NULL, NULL, NULL }, // BGR
+            { NULL, NULL, NULL, NULL, NULL }, // BGRA
+            { NULL, NULL, NULL, NULL, NULL }, // ABGR
+            { NULL, NULL, NULL, NULL, NULL }, // RGB_565
+        },
+    };
+
+    memset(lcf, 0, sizeof(*lcf));
+    assert(rgb->depth == 8);
+    if (yuvDepth > 8) {
+        assert(yuvDepth == 10 || yuvDepth == 12);
+        int depthIndex = (yuvDepth == 10) ? 0 : 1;
+        if (yuvFormat != AVIF_PIXEL_FORMAT_YUV444) {
+            if (alphaPreferred) {
+                lcf->yuvaToRgbMatrixFilterHighBitDepth = lutYuvaToRgbMatrixFilterHighBitDepth[depthIndex][rgb->format][yuvFormat];
+                if (lcf->yuvaToRgbMatrixFilterHighBitDepth != NULL) {
+                    return AVIF_TRUE;
+                }
+            }
+            lcf->yuvToRgbMatrixFilterHighBitDepth = lutYuvToRgbMatrixFilterHighBitDepth[depthIndex][rgb->format][yuvFormat];
+            if (lcf->yuvToRgbMatrixFilterHighBitDepth != NULL) {
+                return AVIF_TRUE;
+            }
+        }
+        if (yuvFormat == AVIF_PIXEL_FORMAT_YUV444 || nearestNeighborFilterAllowed(rgb->chromaUpsampling)) {
+            if (alphaPreferred) {
+                lcf->yuvaToRgbMatrixHighBitDepth = lutYuvaToRgbMatrixHighBitDepth[depthIndex][rgb->format][yuvFormat];
+                if (lcf->yuvaToRgbMatrixHighBitDepth != NULL) {
+                    return AVIF_TRUE;
+                }
+            }
+            lcf->yuvToRgbMatrixHighBitDepth = lutYuvToRgbMatrixHighBitDepth[depthIndex][rgb->format][yuvFormat];
+            if (lcf->yuvToRgbMatrixHighBitDepth != NULL) {
+                return AVIF_TRUE;
+            }
+        }
+        // Fallthrough is intentional. No high bitdepth libyuv function was found. Check if there is an 8-bit libyuv function which
+        // can used with a downshift.
+    }
+    if (yuvFormat == AVIF_PIXEL_FORMAT_YUV400) {
+        lcf->yuv400ToRgbMatrix = lutYuv400ToRgbMatrix[rgb->format];
+        return lcf->yuv400ToRgbMatrix != NULL;
+    }
+    if (yuvFormat != AVIF_PIXEL_FORMAT_YUV444) {
+        if (alphaPreferred) {
+            lcf->yuvaToRgbMatrixFilter = lutYuvaToRgbMatrixFilter[rgb->format][yuvFormat];
+            if (lcf->yuvaToRgbMatrixFilter != NULL) {
+                return AVIF_TRUE;
+            }
+        }
+        lcf->yuvToRgbMatrixFilter = lutYuvToRgbMatrixFilter[rgb->format][yuvFormat];
+        if (lcf->yuvToRgbMatrixFilter != NULL) {
+            return AVIF_TRUE;
+        }
+        if (!nearestNeighborFilterAllowed(rgb->chromaUpsampling)) {
+            return AVIF_FALSE;
+        }
+    }
+    if (alphaPreferred) {
+        lcf->yuvaToRgbMatrix = lutYuvaToRgbMatrix[rgb->format][yuvFormat];
+        if (lcf->yuvaToRgbMatrix != NULL) {
+            return AVIF_TRUE;
+        }
+    }
+    lcf->yuvToRgbMatrix = lutYuvToRgbMatrix[rgb->format][yuvFormat];
+    return lcf->yuvToRgbMatrix != NULL;
+}
+
+static void getLibYUVConstants(const avifImage * image, const struct YuvConstants ** matrixYUV, const struct YuvConstants ** matrixYVU)
+{
+    // Allow the identity matrix to be used with YUV 4:0:0. Replace the identity matrix with
+    // MatrixCoefficients 6 (BT.601).
+    const avifBool yuv400WithIdentityMatrix = (image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400) &&
+                                              (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_IDENTITY);
+    const avifMatrixCoefficients matrixCoefficients = yuv400WithIdentityMatrix ? AVIF_MATRIX_COEFFICIENTS_BT601 : image->matrixCoefficients;
+    if (image->yuvRange == AVIF_RANGE_FULL) {
+        switch (matrixCoefficients) {
+            // BT.709 full range YuvConstants were added in libyuv version 1772.
+            // See https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2646472.
+            case AVIF_MATRIX_COEFFICIENTS_BT709:
+#if LIBYUV_VERSION >= 1772
+                *matrixYUV = &kYuvF709Constants;
+                *matrixYVU = &kYvuF709Constants;
+#endif
+                break;
+            case AVIF_MATRIX_COEFFICIENTS_BT470BG:
+            case AVIF_MATRIX_COEFFICIENTS_BT601:
+            case AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED:
+                *matrixYUV = &kYuvJPEGConstants;
+                *matrixYVU = &kYvuJPEGConstants;
+                break;
+            // BT.2020 full range YuvConstants were added in libyuv version 1775.
+            // See https://chromium-review.googlesource.com/c/libyuv/libyuv/+/2678859.
+            case AVIF_MATRIX_COEFFICIENTS_BT2020_NCL:
+#if LIBYUV_VERSION >= 1775
+                *matrixYUV = &kYuvV2020Constants;
+                *matrixYVU = &kYvuV2020Constants;
+#endif
+                break;
+            case AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_NCL:
+                switch (image->colorPrimaries) {
+                    case AVIF_COLOR_PRIMARIES_BT709:
+                    case AVIF_COLOR_PRIMARIES_UNSPECIFIED:
+#if LIBYUV_VERSION >= 1772
+                        *matrixYUV = &kYuvF709Constants;
+                        *matrixYVU = &kYvuF709Constants;
+#endif
+                        break;
+                    case AVIF_COLOR_PRIMARIES_BT470BG:
+                    case AVIF_COLOR_PRIMARIES_BT601:
+                        *matrixYUV = &kYuvJPEGConstants;
+                        *matrixYVU = &kYvuJPEGConstants;
+                        break;
+                    case AVIF_COLOR_PRIMARIES_BT2020:
+#if LIBYUV_VERSION >= 1775
+                        *matrixYUV = &kYuvV2020Constants;
+                        *matrixYVU = &kYvuV2020Constants;
+#endif
+                        break;
+
+                    case AVIF_COLOR_PRIMARIES_UNKNOWN:
+                    case AVIF_COLOR_PRIMARIES_BT470M:
+                    case AVIF_COLOR_PRIMARIES_SMPTE240:
+                    case AVIF_COLOR_PRIMARIES_GENERIC_FILM:
+                    case AVIF_COLOR_PRIMARIES_XYZ:
+                    case AVIF_COLOR_PRIMARIES_SMPTE431:
+                    case AVIF_COLOR_PRIMARIES_SMPTE432:
+                    case AVIF_COLOR_PRIMARIES_EBU3213:
+                        break;
+                }
+                break;
+
+            case AVIF_MATRIX_COEFFICIENTS_IDENTITY:
+            case AVIF_MATRIX_COEFFICIENTS_FCC:
+            case AVIF_MATRIX_COEFFICIENTS_SMPTE240:
+            case AVIF_MATRIX_COEFFICIENTS_YCGCO:
+            case AVIF_MATRIX_COEFFICIENTS_BT2020_CL:
+            case AVIF_MATRIX_COEFFICIENTS_SMPTE2085:
+            case AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_CL:
+            case AVIF_MATRIX_COEFFICIENTS_ICTCP:
+                break;
+        }
+    } else { // image->yuvRange == AVIF_RANGE_LIMITED
+        switch (matrixCoefficients) {
+            case AVIF_MATRIX_COEFFICIENTS_BT709:
+                *matrixYUV = &kYuvH709Constants;
+                *matrixYVU = &kYvuH709Constants;
+                break;
+            case AVIF_MATRIX_COEFFICIENTS_BT470BG:
+            case AVIF_MATRIX_COEFFICIENTS_BT601:
+            case AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED:
+                *matrixYUV = &kYuvI601Constants;
+                *matrixYVU = &kYvuI601Constants;
+                break;
+            case AVIF_MATRIX_COEFFICIENTS_BT2020_NCL:
+                *matrixYUV = &kYuv2020Constants;
+                *matrixYVU = &kYvu2020Constants;
+                break;
+            case AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_NCL:
+                switch (image->colorPrimaries) {
+                    case AVIF_COLOR_PRIMARIES_BT709:
+                    case AVIF_COLOR_PRIMARIES_UNSPECIFIED:
+                        *matrixYUV = &kYuvH709Constants;
+                        *matrixYVU = &kYvuH709Constants;
+                        break;
+                    case AVIF_COLOR_PRIMARIES_BT470BG:
+                    case AVIF_COLOR_PRIMARIES_BT601:
+                        *matrixYUV = &kYuvI601Constants;
+                        *matrixYVU = &kYvuI601Constants;
+                        break;
+                    case AVIF_COLOR_PRIMARIES_BT2020:
+                        *matrixYUV = &kYuv2020Constants;
+                        *matrixYVU = &kYvu2020Constants;
+                        break;
+
+                    case AVIF_COLOR_PRIMARIES_UNKNOWN:
+                    case AVIF_COLOR_PRIMARIES_BT470M:
+                    case AVIF_COLOR_PRIMARIES_SMPTE240:
+                    case AVIF_COLOR_PRIMARIES_GENERIC_FILM:
+                    case AVIF_COLOR_PRIMARIES_XYZ:
+                    case AVIF_COLOR_PRIMARIES_SMPTE431:
+                    case AVIF_COLOR_PRIMARIES_SMPTE432:
+                    case AVIF_COLOR_PRIMARIES_EBU3213:
+                        break;
+                }
+                break;
+            case AVIF_MATRIX_COEFFICIENTS_IDENTITY:
+            case AVIF_MATRIX_COEFFICIENTS_FCC:
+            case AVIF_MATRIX_COEFFICIENTS_SMPTE240:
+            case AVIF_MATRIX_COEFFICIENTS_YCGCO:
+            case AVIF_MATRIX_COEFFICIENTS_BT2020_CL:
+            case AVIF_MATRIX_COEFFICIENTS_SMPTE2085:
+            case AVIF_MATRIX_COEFFICIENTS_CHROMA_DERIVED_CL:
+            case AVIF_MATRIX_COEFFICIENTS_ICTCP:
+                break;
+        }
+    }
+}
+
+static avifResult avifImageDownshiftTo8bpc(const avifImage * image, avifImage * image8, avifBool downshiftAlpha)
+{
+    avifImageSetDefaults(image8);
+    avifImageCopyNoAlloc(image8, image);
+    image8->depth = 8;
+    // downshiftAlpha will be true only if the image has an alpha plane. So it is safe to pass AVIF_PLANES_ALL here in that case.
+    assert(!downshiftAlpha || image->alphaPlane);
+    AVIF_CHECKRES(avifImageAllocatePlanes(image8, downshiftAlpha ? AVIF_PLANES_ALL : AVIF_PLANES_YUV));
+    // 16384 for 10-bit and 4096 for 12-bit.
+    const int scale = 1 << (24 - image->depth);
+    for (int plane = AVIF_CHAN_Y; plane <= (downshiftAlpha ? AVIF_CHAN_A : AVIF_CHAN_V); ++plane) {
+        const uint32_t planeWidth = avifImagePlaneWidth(image, plane);
+        if (planeWidth == 0) {
+            continue;
+        }
+        Convert16To8Plane((const uint16_t *)avifImagePlane(image, plane),
+                          avifImagePlaneRowBytes(image, plane) / 2,
+                          avifImagePlane(image8, plane),
+                          avifImagePlaneRowBytes(image8, plane),
+                          scale,
+                          planeWidth,
+                          avifImagePlaneHeight(image, plane));
+    }
+    return AVIF_RESULT_OK;
+}
+
+IGNORE_CFI_ICALL avifResult avifImageYUVToRGBLibYUV(const avifImage * image, avifRGBImage * rgb, avifBool reformatAlpha, avifBool * alphaReformattedWithLibYUV)
+{
+    *alphaReformattedWithLibYUV = AVIF_FALSE;
+    if (rgb->depth != 8 || (image->depth != 8 && image->depth != 10 && image->depth != 12)) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+    // Find the correct libyuv YuvConstants, based on range and CP/MC
+    const struct YuvConstants * matrixYUV = NULL;
+    const struct YuvConstants * matrixYVU = NULL;
+    getLibYUVConstants(image, &matrixYUV, &matrixYVU);
+    if (!matrixYVU) {
+        // No YuvConstants exist for the current image; use the built-in YUV conversion
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+
+    LibyuvConversionFunction lcf;
+    const avifBool alphaPreferred = reformatAlpha && image->alphaPlane && image->alphaRowBytes;
+    if (!getLibYUVConversionFunction(image->yuvFormat, image->depth, rgb, alphaPreferred, &lcf)) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+    if (!image->alphaPlane || !image->alphaRowBytes) {
+        // If the image does not have an alpha plane, then libyuv always prefills the output RGB image with opaque alpha values.
+        *alphaReformattedWithLibYUV = AVIF_TRUE;
+    }
+    avifBool isYVU = lutIsYVU[rgb->format];
+    const struct YuvConstants * matrix = isYVU ? matrixYVU : matrixYUV;
+    int libyuvResult = -1;
+    int uPlaneIndex = isYVU ? AVIF_CHAN_V : AVIF_CHAN_U;
+    int vPlaneIndex = isYVU ? AVIF_CHAN_U : AVIF_CHAN_V;
+    const enum FilterMode filter =
+        ((rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_FASTEST) || (rgb->chromaUpsampling == AVIF_CHROMA_UPSAMPLING_NEAREST))
+            ? kFilterNone
+            : kFilterBilinear;
+    if (lcf.yuvToRgbMatrixFilterHighBitDepth != NULL) {
+        libyuvResult = lcf.yuvToRgbMatrixFilterHighBitDepth((const uint16_t *)image->yuvPlanes[AVIF_CHAN_Y],
+                                                            image->yuvRowBytes[AVIF_CHAN_Y] / 2,
+                                                            (const uint16_t *)image->yuvPlanes[uPlaneIndex],
+                                                            image->yuvRowBytes[uPlaneIndex] / 2,
+                                                            (const uint16_t *)image->yuvPlanes[vPlaneIndex],
+                                                            image->yuvRowBytes[vPlaneIndex] / 2,
+                                                            rgb->pixels,
+                                                            rgb->rowBytes,
+                                                            matrix,
+                                                            image->width,
+                                                            image->height,
+                                                            filter);
+    } else if (lcf.yuvaToRgbMatrixFilterHighBitDepth != NULL) {
+        libyuvResult = lcf.yuvaToRgbMatrixFilterHighBitDepth((const uint16_t *)image->yuvPlanes[AVIF_CHAN_Y],
+                                                             image->yuvRowBytes[AVIF_CHAN_Y] / 2,
+                                                             (const uint16_t *)image->yuvPlanes[uPlaneIndex],
+                                                             image->yuvRowBytes[uPlaneIndex] / 2,
+                                                             (const uint16_t *)image->yuvPlanes[vPlaneIndex],
+                                                             image->yuvRowBytes[vPlaneIndex] / 2,
+                                                             (const uint16_t *)image->alphaPlane,
+                                                             image->alphaRowBytes / 2,
+                                                             rgb->pixels,
+                                                             rgb->rowBytes,
+                                                             matrix,
+                                                             image->width,
+                                                             image->height,
+                                                             /*attenuate=*/0,
+                                                             filter);
+        *alphaReformattedWithLibYUV = AVIF_TRUE;
+    } else if (lcf.yuvToRgbMatrixHighBitDepth != NULL) {
+        libyuvResult = lcf.yuvToRgbMatrixHighBitDepth((const uint16_t *)image->yuvPlanes[AVIF_CHAN_Y],
+                                                      image->yuvRowBytes[AVIF_CHAN_Y] / 2,
+                                                      (const uint16_t *)image->yuvPlanes[uPlaneIndex],
+                                                      image->yuvRowBytes[uPlaneIndex] / 2,
+                                                      (const uint16_t *)image->yuvPlanes[vPlaneIndex],
+                                                      image->yuvRowBytes[vPlaneIndex] / 2,
+                                                      rgb->pixels,
+                                                      rgb->rowBytes,
+                                                      matrix,
+                                                      image->width,
+                                                      image->height);
+    } else if (lcf.yuvaToRgbMatrixHighBitDepth != NULL) {
+        libyuvResult = lcf.yuvaToRgbMatrixHighBitDepth((const uint16_t *)image->yuvPlanes[AVIF_CHAN_Y],
+                                                       image->yuvRowBytes[AVIF_CHAN_Y] / 2,
+                                                       (const uint16_t *)image->yuvPlanes[uPlaneIndex],
+                                                       image->yuvRowBytes[uPlaneIndex] / 2,
+                                                       (const uint16_t *)image->yuvPlanes[vPlaneIndex],
+                                                       image->yuvRowBytes[vPlaneIndex] / 2,
+                                                       (const uint16_t *)image->alphaPlane,
+                                                       image->alphaRowBytes / 2,
+                                                       rgb->pixels,
+                                                       rgb->rowBytes,
+                                                       matrix,
+                                                       image->width,
+                                                       image->height,
+                                                       /*attentuate=*/0);
+        *alphaReformattedWithLibYUV = AVIF_TRUE;
+    } else {
+        avifImage image8;
+        avifBool inputIsHighBitDepth = image->depth > 8;
+        if (inputIsHighBitDepth) {
+            const avifBool downshiftAlpha = (lcf.yuvaToRgbMatrixFilter != NULL || lcf.yuvaToRgbMatrix != NULL);
+            AVIF_CHECKRES(avifImageDownshiftTo8bpc(image, &image8, downshiftAlpha));
+            image = &image8;
+        }
+        if (lcf.yuv400ToRgbMatrix != NULL) {
+            libyuvResult = lcf.yuv400ToRgbMatrix(image->yuvPlanes[AVIF_CHAN_Y],
+                                                 image->yuvRowBytes[AVIF_CHAN_Y],
+                                                 rgb->pixels,
+                                                 rgb->rowBytes,
+                                                 matrix,
+                                                 image->width,
+                                                 image->height);
+        } else if (lcf.yuvToRgbMatrixFilter != NULL) {
+            libyuvResult = lcf.yuvToRgbMatrixFilter(image->yuvPlanes[AVIF_CHAN_Y],
+                                                    image->yuvRowBytes[AVIF_CHAN_Y],
+                                                    image->yuvPlanes[uPlaneIndex],
+                                                    image->yuvRowBytes[uPlaneIndex],
+                                                    image->yuvPlanes[vPlaneIndex],
+                                                    image->yuvRowBytes[vPlaneIndex],
+                                                    rgb->pixels,
+                                                    rgb->rowBytes,
+                                                    matrix,
+                                                    image->width,
+                                                    image->height,
+                                                    filter);
+        } else if (lcf.yuvaToRgbMatrixFilter != NULL) {
+            libyuvResult = lcf.yuvaToRgbMatrixFilter(image->yuvPlanes[AVIF_CHAN_Y],
+                                                     image->yuvRowBytes[AVIF_CHAN_Y],
+                                                     image->yuvPlanes[uPlaneIndex],
+                                                     image->yuvRowBytes[uPlaneIndex],
+                                                     image->yuvPlanes[vPlaneIndex],
+                                                     image->yuvRowBytes[vPlaneIndex],
+                                                     image->alphaPlane,
+                                                     image->alphaRowBytes,
+                                                     rgb->pixels,
+                                                     rgb->rowBytes,
+                                                     matrix,
+                                                     image->width,
+                                                     image->height,
+                                                     /*attenuate=*/0,
+                                                     filter);
+            *alphaReformattedWithLibYUV = AVIF_TRUE;
+        } else if (lcf.yuvToRgbMatrix != NULL) {
+            libyuvResult = lcf.yuvToRgbMatrix(image->yuvPlanes[AVIF_CHAN_Y],
+                                              image->yuvRowBytes[AVIF_CHAN_Y],
+                                              image->yuvPlanes[uPlaneIndex],
+                                              image->yuvRowBytes[uPlaneIndex],
+                                              image->yuvPlanes[vPlaneIndex],
+                                              image->yuvRowBytes[vPlaneIndex],
+                                              rgb->pixels,
+                                              rgb->rowBytes,
+                                              matrix,
+                                              image->width,
+                                              image->height);
+        } else if (lcf.yuvaToRgbMatrix != NULL) {
+            libyuvResult = lcf.yuvaToRgbMatrix(image->yuvPlanes[AVIF_CHAN_Y],
+                                               image->yuvRowBytes[AVIF_CHAN_Y],
+                                               image->yuvPlanes[uPlaneIndex],
+                                               image->yuvRowBytes[uPlaneIndex],
+                                               image->yuvPlanes[vPlaneIndex],
+                                               image->yuvRowBytes[vPlaneIndex],
+                                               image->alphaPlane,
+                                               image->alphaRowBytes,
+                                               rgb->pixels,
+                                               rgb->rowBytes,
+                                               matrix,
+                                               image->width,
+                                               image->height,
+                                               /*attenuate=*/0);
+            *alphaReformattedWithLibYUV = AVIF_TRUE;
+        }
+        if (inputIsHighBitDepth) {
+            avifImageFreePlanes(&image8, AVIF_PLANES_ALL);
+            image = NULL;
+        }
+    }
+    return (libyuvResult != 0) ? AVIF_RESULT_REFORMAT_FAILED : AVIF_RESULT_OK;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+avifResult avifRGBImagePremultiplyAlphaLibYUV(avifRGBImage * rgb)
+{
+    // See if the current settings can be accomplished with libyuv, and use it (if possible).
+
+    if (rgb->depth != 8) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+
+    // libavif uses byte-order when describing pixel formats, such that the R in RGBA is the lowest address,
+    // similar to PNG. libyuv orders in word-order, so libavif's RGBA would be referred to in libyuv as ABGR.
+
+    // Order of RGB doesn't matter here.
+    if (rgb->format == AVIF_RGB_FORMAT_RGBA || rgb->format == AVIF_RGB_FORMAT_BGRA) {
+        if (ARGBAttenuate(rgb->pixels, rgb->rowBytes, rgb->pixels, rgb->rowBytes, rgb->width, rgb->height) != 0) {
+            return AVIF_RESULT_REFORMAT_FAILED;
+        }
+        return AVIF_RESULT_OK;
+    }
+
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+
+avifResult avifRGBImageUnpremultiplyAlphaLibYUV(avifRGBImage * rgb)
+{
+    // See if the current settings can be accomplished with libyuv, and use it (if possible).
+
+    if (rgb->depth != 8) {
+        return AVIF_RESULT_NOT_IMPLEMENTED;
+    }
+
+    // libavif uses byte-order when describing pixel formats, such that the R in RGBA is the lowest address,
+    // similar to PNG. libyuv orders in word-order, so libavif's RGBA would be referred to in libyuv as ABGR.
+
+    if (rgb->format == AVIF_RGB_FORMAT_RGBA || rgb->format == AVIF_RGB_FORMAT_BGRA) {
+        if (ARGBUnattenuate(rgb->pixels, rgb->rowBytes, rgb->pixels, rgb->rowBytes, rgb->width, rgb->height) != 0) {
+            return AVIF_RESULT_REFORMAT_FAILED;
+        }
+        return AVIF_RESULT_OK;
+    }
+
+    return AVIF_RESULT_NOT_IMPLEMENTED;
+}
+
+avifResult avifRGBImageToF16LibYUV(avifRGBImage * rgb)
+{
+    const float scale = 1.0f / ((1 << rgb->depth) - 1);
+    const int result = HalfFloatPlane((const uint16_t *)rgb->pixels,
+                                      rgb->rowBytes,
+                                      (uint16_t *)rgb->pixels,
+                                      rgb->rowBytes,
+                                      scale,
+                                      rgb->width * avifRGBFormatChannelCount(rgb->format),
+                                      rgb->height);
+    return (result == 0) ? AVIF_RESULT_OK : AVIF_RESULT_INVALID_ARGUMENT;
+}
+
+unsigned int avifLibYUVVersion(void)
+{
+    return (unsigned int)LIBYUV_VERSION;
+}
+
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv.h b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv.h
new file mode 100644
index 0000000000..93f239696a
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv.h
@@ -0,0 +1,21 @@
+/*
+ *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef INCLUDE_LIBYUV_H_
+#define INCLUDE_LIBYUV_H_
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/planar_functions.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/row.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale_row.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/version.h"
+
+#endif  // INCLUDE_LIBYUV_H_
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h
new file mode 100644
index 0000000000..1bea67f2f2
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h
@@ -0,0 +1,68 @@
+/*
+ *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef INCLUDE_LIBYUV_BASIC_TYPES_H_
+#define INCLUDE_LIBYUV_BASIC_TYPES_H_
+
+#include <stddef.h>  // For size_t and NULL
+
+#if !defined(INT_TYPES_DEFINED) && !defined(GG_LONGLONG)
+#define INT_TYPES_DEFINED
+
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+#include <sys/types.h>  // for uintptr_t on x86
+typedef unsigned __int64 uint64_t;
+typedef __int64 int64_t;
+typedef unsigned int uint32_t;
+typedef int int32_t;
+typedef unsigned short uint16_t;
+typedef short int16_t;
+typedef unsigned char uint8_t;
+typedef signed char int8_t;
+#else
+#include <stdint.h>  // for uintptr_t and C99 types
+#endif               // defined(_MSC_VER) && (_MSC_VER < 1600)
+// Types are deprecated.  Enable this macro for legacy types.
+#ifdef LIBYUV_LEGACY_TYPES
+typedef uint64_t uint64;
+typedef int64_t int64;
+typedef uint32_t uint32;
+typedef int32_t int32;
+typedef uint16_t uint16;
+typedef int16_t int16;
+typedef uint8_t uint8;
+typedef int8_t int8;
+#endif  // LIBYUV_LEGACY_TYPES
+#endif  // INT_TYPES_DEFINED
+
+#if !defined(LIBYUV_API)
+#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(LIBYUV_BUILDING_SHARED_LIBRARY)
+#define LIBYUV_API __declspec(dllexport)
+#elif defined(LIBYUV_USING_SHARED_LIBRARY)
+#define LIBYUV_API __declspec(dllimport)
+#else
+#define LIBYUV_API
+#endif  // LIBYUV_BUILDING_SHARED_LIBRARY
+#elif defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__APPLE__) && \
+    (defined(LIBYUV_BUILDING_SHARED_LIBRARY) ||                      \
+     defined(LIBYUV_USING_SHARED_LIBRARY))
+#define LIBYUV_API __attribute__((visibility("default")))
+#else
+#define LIBYUV_API
+#endif  // __GNUC__
+#endif  // LIBYUV_API
+
+// TODO(fbarchard): Remove bool macros.
+#define LIBYUV_BOOL int
+#define LIBYUV_FALSE 0
+#define LIBYUV_TRUE 1
+
+#endif  // INCLUDE_LIBYUV_BASIC_TYPES_H_
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/planar_functions.h b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/planar_functions.h
new file mode 100644
index 0000000000..2fdb5fcc4c
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/planar_functions.h
@@ -0,0 +1,30 @@
+/*
+ *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
+#define INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h"
+
+void CopyPlane(const uint8_t* src_y,
+               int src_stride_y,
+               uint8_t* dst_y,
+               int dst_stride_y,
+               int width,
+               int height);
+
+void CopyPlane_16(const uint16_t* src_y,
+                  int src_stride_y,
+                  uint16_t* dst_y,
+                  int dst_stride_y,
+                  int width,
+                  int height);
+
+#endif  // INCLUDE_LIBYUV_PLANAR_FUNCTIONS_H_
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/row.h b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/row.h
new file mode 100644
index 0000000000..5d2f36a442
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/row.h
@@ -0,0 +1,41 @@
+/*
+ *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef INCLUDE_LIBYUV_ROW_H_
+#define INCLUDE_LIBYUV_ROW_H_
+
+#include <stddef.h>  // For NULL
+#include <stdlib.h>  // For malloc
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h"
+
+#define align_buffer_64(var, size)                                         \
+  void* var##_mem = malloc((size) + 63);                      /* NOLINT */ \
+  uint8_t* var = (uint8_t*)(((intptr_t)var##_mem + 63) & ~63) /* NOLINT */
+
+#define free_aligned_buffer_64(var) \
+  free(var##_mem);                  \
+  var = NULL
+
+void CopyRow_C(const uint8_t* src, uint8_t* dst, int count);
+
+void InterpolateRow_C(uint8_t* dst_ptr,
+                      const uint8_t* src_ptr,
+                      ptrdiff_t src_stride,
+                      int width,
+                      int source_y_fraction);
+
+void InterpolateRow_16_C(uint16_t* dst_ptr,
+                         const uint16_t* src_ptr,
+                         ptrdiff_t src_stride,
+                         int width,
+                         int source_y_fraction);
+
+#endif  // INCLUDE_LIBYUV_ROW_H_
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale.h b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale.h
new file mode 100644
index 0000000000..ccf9cd22ff
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale.h
@@ -0,0 +1,44 @@
+/*
+ *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef INCLUDE_LIBYUV_SCALE_H_
+#define INCLUDE_LIBYUV_SCALE_H_
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h"
+
+// Supported filtering.
+typedef enum FilterMode {
+  kFilterNone = 0,      // Point sample; Fastest.
+  kFilterLinear = 1,    // Filter horizontally only.
+  kFilterBilinear = 2,  // Faster than box, but lower quality scaling down.
+  kFilterBox = 3        // Highest quality.
+} FilterModeEnum;
+
+int ScalePlane(const uint8_t* src,
+               int src_stride,
+               int src_width,
+               int src_height,
+               uint8_t* dst,
+               int dst_stride,
+               int dst_width,
+               int dst_height,
+               enum FilterMode filtering);
+
+int ScalePlane_12(const uint16_t* src,
+                  int src_stride,
+                  int src_width,
+                  int src_height,
+                  uint16_t* dst,
+                  int dst_stride,
+                  int dst_width,
+                  int dst_height,
+                  enum FilterMode filtering);
+
+#endif  // INCLUDE_LIBYUV_SCALE_H_
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale_row.h b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale_row.h
new file mode 100644
index 0000000000..9c396c6eb5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale_row.h
@@ -0,0 +1,147 @@
+/*
+ *  Copyright 2013 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef INCLUDE_LIBYUV_SCALE_ROW_H_
+#define INCLUDE_LIBYUV_SCALE_ROW_H_
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale.h"
+
+// Scale ARGB vertically with bilinear interpolation.
+void ScalePlaneVertical(int src_height,
+                        int dst_width,
+                        int dst_height,
+                        int src_stride,
+                        int dst_stride,
+                        const uint8_t* src_argb,
+                        uint8_t* dst_argb,
+                        int x,
+                        int y,
+                        int dy,
+                        int bpp,
+                        enum FilterMode filtering);
+
+void ScalePlaneVertical_16(int src_height,
+                           int dst_width,
+                           int dst_height,
+                           int src_stride,
+                           int dst_stride,
+                           const uint16_t* src_argb,
+                           uint16_t* dst_argb,
+                           int x,
+                           int y,
+                           int dy,
+                           int wpp,
+                           enum FilterMode filtering);
+
+// Simplify the filtering based on scale factors.
+enum FilterMode ScaleFilterReduce(int src_width,
+                                  int src_height,
+                                  int dst_width,
+                                  int dst_height,
+                                  enum FilterMode filtering);
+
+// Divide num by div and return as 16.16 fixed point result.
+int FixedDiv_C(int num, int div);
+// Divide num - 1 by div - 1 and return as 16.16 fixed point result.
+int FixedDiv1_C(int num, int div);
+#define FixedDiv FixedDiv_C
+#define FixedDiv1 FixedDiv1_C
+
+// Compute slope values for stepping.
+void ScaleSlope(int src_width,
+                int src_height,
+                int dst_width,
+                int dst_height,
+                enum FilterMode filtering,
+                int* x,
+                int* y,
+                int* dx,
+                int* dy);
+
+void ScaleRowUp2_Linear_C(const uint8_t* src_ptr,
+                          uint8_t* dst_ptr,
+                          int dst_width);
+void ScaleRowUp2_Bilinear_C(const uint8_t* src_ptr,
+                            ptrdiff_t src_stride,
+                            uint8_t* dst_ptr,
+                            ptrdiff_t dst_stride,
+                            int dst_width);
+void ScaleRowUp2_Linear_16_C(const uint16_t* src_ptr,
+                             uint16_t* dst_ptr,
+                             int dst_width);
+void ScaleRowUp2_Bilinear_16_C(const uint16_t* src_ptr,
+                               ptrdiff_t src_stride,
+                               uint16_t* dst_ptr,
+                               ptrdiff_t dst_stride,
+                               int dst_width);
+void ScaleRowUp2_Linear_Any_C(const uint8_t* src_ptr,
+                              uint8_t* dst_ptr,
+                              int dst_width);
+void ScaleRowUp2_Bilinear_Any_C(const uint8_t* src_ptr,
+                                ptrdiff_t src_stride,
+                                uint8_t* dst_ptr,
+                                ptrdiff_t dst_stride,
+                                int dst_width);
+void ScaleRowUp2_Linear_16_Any_C(const uint16_t* src_ptr,
+                                 uint16_t* dst_ptr,
+                                 int dst_width);
+void ScaleRowUp2_Bilinear_16_Any_C(const uint16_t* src_ptr,
+                                   ptrdiff_t src_stride,
+                                   uint16_t* dst_ptr,
+                                   ptrdiff_t dst_stride,
+                                   int dst_width);
+
+void ScaleCols_C(uint8_t* dst_ptr,
+                 const uint8_t* src_ptr,
+                 int dst_width,
+                 int x,
+                 int dx);
+void ScaleCols_16_C(uint16_t* dst_ptr,
+                    const uint16_t* src_ptr,
+                    int dst_width,
+                    int x,
+                    int dx);
+void ScaleColsUp2_C(uint8_t* dst_ptr,
+                    const uint8_t* src_ptr,
+                    int dst_width,
+                    int,
+                    int);
+void ScaleColsUp2_16_C(uint16_t* dst_ptr,
+                       const uint16_t* src_ptr,
+                       int dst_width,
+                       int,
+                       int);
+void ScaleFilterCols_C(uint8_t* dst_ptr,
+                       const uint8_t* src_ptr,
+                       int dst_width,
+                       int x,
+                       int dx);
+void ScaleFilterCols_16_C(uint16_t* dst_ptr,
+                          const uint16_t* src_ptr,
+                          int dst_width,
+                          int x,
+                          int dx);
+void ScaleFilterCols64_C(uint8_t* dst_ptr,
+                         const uint8_t* src_ptr,
+                         int dst_width,
+                         int x32,
+                         int dx);
+void ScaleFilterCols64_16_C(uint16_t* dst_ptr,
+                            const uint16_t* src_ptr,
+                            int dst_width,
+                            int x32,
+                            int dx);
+void ScaleAddRow_C(const uint8_t* src_ptr, uint16_t* dst_ptr, int src_width);
+void ScaleAddRow_16_C(const uint16_t* src_ptr,
+                      uint32_t* dst_ptr,
+                      int src_width);
+
+#endif  // INCLUDE_LIBYUV_SCALE_ROW_H_
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/version.h b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/version.h
new file mode 100644
index 0000000000..bcea000dc2
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/version.h
@@ -0,0 +1,16 @@
+/*
+ *  Copyright 2012 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef INCLUDE_LIBYUV_VERSION_H_
+#define INCLUDE_LIBYUV_VERSION_H_
+
+#define LIBYUV_VERSION 1880
+
+#endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/planar_functions.c b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/planar_functions.c
new file mode 100644
index 0000000000..24f7aa4146
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/planar_functions.c
@@ -0,0 +1,64 @@
+/*
+ *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/planar_functions.h"
+
+#include <assert.h>
+#include <string.h>  // for memset()
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/row.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale_row.h"  // for ScaleRowDown2
+
+// Copy a plane of data
+void CopyPlane(const uint8_t* src_y,
+               int src_stride_y,
+               uint8_t* dst_y,
+               int dst_stride_y,
+               int width,
+               int height) {
+  int y;
+  void (*CopyRow)(const uint8_t* src, uint8_t* dst, int width) = CopyRow_C;
+  if (width <= 0 || height == 0) {
+    return;
+  }
+  // Negative height means invert the image.
+  if (height < 0) {
+    height = -height;
+    dst_y = dst_y + (height - 1) * dst_stride_y;
+    dst_stride_y = -dst_stride_y;
+  }
+  // Coalesce rows.
+  if (src_stride_y == width && dst_stride_y == width) {
+    width *= height;
+    height = 1;
+    src_stride_y = dst_stride_y = 0;
+  }
+  // Nothing to do.
+  if (src_y == dst_y && src_stride_y == dst_stride_y) {
+    return;
+  }
+
+  // Copy plane
+  for (y = 0; y < height; ++y) {
+    CopyRow(src_y, dst_y, width);
+    src_y += src_stride_y;
+    dst_y += dst_stride_y;
+  }
+}
+
+void CopyPlane_16(const uint16_t* src_y,
+                  int src_stride_y,
+                  uint16_t* dst_y,
+                  int dst_stride_y,
+                  int width,
+                  int height) {
+  CopyPlane((const uint8_t*)src_y, src_stride_y * 2, (uint8_t*)dst_y,
+            dst_stride_y * 2, width * 2, height);
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/row_common.c b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/row_common.c
new file mode 100644
index 0000000000..45f135ec9e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/row_common.c
@@ -0,0 +1,105 @@
+/*
+ *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/row.h"
+
+#include <assert.h>
+#include <string.h>  // For memcpy and memset.
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h"
+
+#define STATIC_CAST(type, expr) (type)(expr)
+
+void CopyRow_C(const uint8_t* src, uint8_t* dst, int count) {
+  memcpy(dst, src, count);
+}
+
+// Blend 2 rows into 1.
+static void HalfRow_C(const uint8_t* src_uv,
+                      ptrdiff_t src_uv_stride,
+                      uint8_t* dst_uv,
+                      int width) {
+  int x;
+  for (x = 0; x < width; ++x) {
+    dst_uv[x] = (src_uv[x] + src_uv[src_uv_stride + x] + 1) >> 1;
+  }
+}
+
+static void HalfRow_16_C(const uint16_t* src_uv,
+                         ptrdiff_t src_uv_stride,
+                         uint16_t* dst_uv,
+                         int width) {
+  int x;
+  for (x = 0; x < width; ++x) {
+    dst_uv[x] = (src_uv[x] + src_uv[src_uv_stride + x] + 1) >> 1;
+  }
+}
+
+// C version 2x2 -> 2x1.
+void InterpolateRow_C(uint8_t* dst_ptr,
+                      const uint8_t* src_ptr,
+                      ptrdiff_t src_stride,
+                      int width,
+                      int source_y_fraction) {
+  int y1_fraction = source_y_fraction;
+  int y0_fraction = 256 - y1_fraction;
+  const uint8_t* src_ptr1 = src_ptr + src_stride;
+  int x;
+  assert(source_y_fraction >= 0);
+  assert(source_y_fraction < 256);
+
+  if (y1_fraction == 0) {
+    memcpy(dst_ptr, src_ptr, width);
+    return;
+  }
+  if (y1_fraction == 128) {
+    HalfRow_C(src_ptr, src_stride, dst_ptr, width);
+    return;
+  }
+  for (x = 0; x < width; ++x) {
+    dst_ptr[0] = STATIC_CAST(
+        uint8_t,
+        (src_ptr[0] * y0_fraction + src_ptr1[0] * y1_fraction + 128) >> 8);
+    ++src_ptr;
+    ++src_ptr1;
+    ++dst_ptr;
+  }
+}
+
+// C version 2x2 -> 2x1.
+void InterpolateRow_16_C(uint16_t* dst_ptr,
+                         const uint16_t* src_ptr,
+                         ptrdiff_t src_stride,
+                         int width,
+                         int source_y_fraction) {
+  int y1_fraction = source_y_fraction;
+  int y0_fraction = 256 - y1_fraction;
+  const uint16_t* src_ptr1 = src_ptr + src_stride;
+  int x;
+  assert(source_y_fraction >= 0);
+  assert(source_y_fraction < 256);
+
+  if (y1_fraction == 0) {
+    memcpy(dst_ptr, src_ptr, width * 2);
+    return;
+  }
+  if (y1_fraction == 128) {
+    HalfRow_16_C(src_ptr, src_stride, dst_ptr, width);
+    return;
+  }
+  for (x = 0; x < width; ++x) {
+    dst_ptr[0] = STATIC_CAST(
+        uint16_t,
+        (src_ptr[0] * y0_fraction + src_ptr1[0] * y1_fraction + 128) >> 8);
+    ++src_ptr;
+    ++src_ptr1;
+    ++dst_ptr;
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/scale_any.c b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/scale_any.c
new file mode 100644
index 0000000000..3721f9e38f
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/scale_any.c
@@ -0,0 +1,85 @@
+/*
+ *  Copyright 2015 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <string.h>  // For memset/memcpy
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale_row.h"
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/basic_types.h"
+
+// Scale up horizontally 2 times using linear filter.
+#define SUH2LANY(NAME, SIMD, C, MASK, PTYPE)                       \
+  void NAME(const PTYPE* src_ptr, PTYPE* dst_ptr, int dst_width) { \
+    int work_width = (dst_width - 1) & ~1;                         \
+    int r = work_width & MASK;                                     \
+    int n = work_width & ~MASK;                                    \
+    dst_ptr[0] = src_ptr[0];                                       \
+    if (work_width > 0) {                                          \
+      if (n != 0) {                                                \
+        SIMD(src_ptr, dst_ptr + 1, n);                             \
+      }                                                            \
+      C(src_ptr + (n / 2), dst_ptr + n + 1, r);                    \
+    }                                                              \
+    dst_ptr[dst_width - 1] = src_ptr[(dst_width - 1) / 2];         \
+  }
+
+// Even the C versions need to be wrapped, because boundary pixels have to
+// be handled differently
+
+SUH2LANY(ScaleRowUp2_Linear_Any_C,
+         ScaleRowUp2_Linear_C,
+         ScaleRowUp2_Linear_C,
+         0,
+         uint8_t)
+
+SUH2LANY(ScaleRowUp2_Linear_16_Any_C,
+         ScaleRowUp2_Linear_16_C,
+         ScaleRowUp2_Linear_16_C,
+         0,
+         uint16_t)
+
+// Scale up 2 times using bilinear filter.
+// This function produces 2 rows at a time.
+#define SU2BLANY(NAME, SIMD, C, MASK, PTYPE)                              \
+  void NAME(const PTYPE* src_ptr, ptrdiff_t src_stride, PTYPE* dst_ptr,   \
+            ptrdiff_t dst_stride, int dst_width) {                        \
+    int work_width = (dst_width - 1) & ~1;                                \
+    int r = work_width & MASK;                                            \
+    int n = work_width & ~MASK;                                           \
+    const PTYPE* sa = src_ptr;                                            \
+    const PTYPE* sb = src_ptr + src_stride;                               \
+    PTYPE* da = dst_ptr;                                                  \
+    PTYPE* db = dst_ptr + dst_stride;                                     \
+    da[0] = (3 * sa[0] + sb[0] + 2) >> 2;                                 \
+    db[0] = (sa[0] + 3 * sb[0] + 2) >> 2;                                 \
+    if (work_width > 0) {                                                 \
+      if (n != 0) {                                                       \
+        SIMD(sa, sb - sa, da + 1, db - da, n);                            \
+      }                                                                   \
+      C(sa + (n / 2), sb - sa, da + n + 1, db - da, r);                   \
+    }                                                                     \
+    da[dst_width - 1] =                                                   \
+        (3 * sa[(dst_width - 1) / 2] + sb[(dst_width - 1) / 2] + 2) >> 2; \
+    db[dst_width - 1] =                                                   \
+        (sa[(dst_width - 1) / 2] + 3 * sb[(dst_width - 1) / 2] + 2) >> 2; \
+  }
+
+SU2BLANY(ScaleRowUp2_Bilinear_Any_C,
+         ScaleRowUp2_Bilinear_C,
+         ScaleRowUp2_Bilinear_C,
+         0,
+         uint8_t)
+
+SU2BLANY(ScaleRowUp2_Bilinear_16_Any_C,
+         ScaleRowUp2_Bilinear_16_C,
+         ScaleRowUp2_Bilinear_16_C,
+         0,
+         uint16_t)
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/scale_common.c b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/scale_common.c
new file mode 100644
index 0000000000..a140cd8947
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/scale_common.c
@@ -0,0 +1,555 @@
+/*
+ *  Copyright 2013 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale.h"
+
+#include <assert.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/planar_functions.h"  // For CopyARGB
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/row.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale_row.h"
+
+static __inline int Abs(int v) {
+  return v >= 0 ? v : -v;
+}
+
+// Sample position: (O is src sample position, X is dst sample position)
+//
+//      v dst_ptr at here           v stop at here
+//  X O X   X O X   X O X   X O X   X O X
+//    ^ src_ptr at here
+void ScaleRowUp2_Linear_C(const uint8_t* src_ptr,
+                          uint8_t* dst_ptr,
+                          int dst_width) {
+  int src_width = dst_width >> 1;
+  int x;
+  assert((dst_width % 2 == 0) && (dst_width >= 0));
+  for (x = 0; x < src_width; ++x) {
+    dst_ptr[2 * x + 0] = (src_ptr[x + 0] * 3 + src_ptr[x + 1] * 1 + 2) >> 2;
+    dst_ptr[2 * x + 1] = (src_ptr[x + 0] * 1 + src_ptr[x + 1] * 3 + 2) >> 2;
+  }
+}
+
+// Sample position: (O is src sample position, X is dst sample position)
+//
+//    src_ptr at here
+//  X v X   X   X   X   X   X   X   X   X
+//    O       O       O       O       O
+//  X   X   X   X   X   X   X   X   X   X
+//      ^ dst_ptr at here           ^ stop at here
+//  X   X   X   X   X   X   X   X   X   X
+//    O       O       O       O       O
+//  X   X   X   X   X   X   X   X   X   X
+void ScaleRowUp2_Bilinear_C(const uint8_t* src_ptr,
+                            ptrdiff_t src_stride,
+                            uint8_t* dst_ptr,
+                            ptrdiff_t dst_stride,
+                            int dst_width) {
+  const uint8_t* s = src_ptr;
+  const uint8_t* t = src_ptr + src_stride;
+  uint8_t* d = dst_ptr;
+  uint8_t* e = dst_ptr + dst_stride;
+  int src_width = dst_width >> 1;
+  int x;
+  assert((dst_width % 2 == 0) && (dst_width >= 0));
+  for (x = 0; x < src_width; ++x) {
+    d[2 * x + 0] =
+        (s[x + 0] * 9 + s[x + 1] * 3 + t[x + 0] * 3 + t[x + 1] * 1 + 8) >> 4;
+    d[2 * x + 1] =
+        (s[x + 0] * 3 + s[x + 1] * 9 + t[x + 0] * 1 + t[x + 1] * 3 + 8) >> 4;
+    e[2 * x + 0] =
+        (s[x + 0] * 3 + s[x + 1] * 1 + t[x + 0] * 9 + t[x + 1] * 3 + 8) >> 4;
+    e[2 * x + 1] =
+        (s[x + 0] * 1 + s[x + 1] * 3 + t[x + 0] * 3 + t[x + 1] * 9 + 8) >> 4;
+  }
+}
+
+// Only suitable for at most 14 bit range.
+void ScaleRowUp2_Linear_16_C(const uint16_t* src_ptr,
+                             uint16_t* dst_ptr,
+                             int dst_width) {
+  int src_width = dst_width >> 1;
+  int x;
+  assert((dst_width % 2 == 0) && (dst_width >= 0));
+  for (x = 0; x < src_width; ++x) {
+    dst_ptr[2 * x + 0] = (src_ptr[x + 0] * 3 + src_ptr[x + 1] * 1 + 2) >> 2;
+    dst_ptr[2 * x + 1] = (src_ptr[x + 0] * 1 + src_ptr[x + 1] * 3 + 2) >> 2;
+  }
+}
+
+// Only suitable for at most 12bit range.
+void ScaleRowUp2_Bilinear_16_C(const uint16_t* src_ptr,
+                               ptrdiff_t src_stride,
+                               uint16_t* dst_ptr,
+                               ptrdiff_t dst_stride,
+                               int dst_width) {
+  const uint16_t* s = src_ptr;
+  const uint16_t* t = src_ptr + src_stride;
+  uint16_t* d = dst_ptr;
+  uint16_t* e = dst_ptr + dst_stride;
+  int src_width = dst_width >> 1;
+  int x;
+  assert((dst_width % 2 == 0) && (dst_width >= 0));
+  for (x = 0; x < src_width; ++x) {
+    d[2 * x + 0] =
+        (s[x + 0] * 9 + s[x + 1] * 3 + t[x + 0] * 3 + t[x + 1] * 1 + 8) >> 4;
+    d[2 * x + 1] =
+        (s[x + 0] * 3 + s[x + 1] * 9 + t[x + 0] * 1 + t[x + 1] * 3 + 8) >> 4;
+    e[2 * x + 0] =
+        (s[x + 0] * 3 + s[x + 1] * 1 + t[x + 0] * 9 + t[x + 1] * 3 + 8) >> 4;
+    e[2 * x + 1] =
+        (s[x + 0] * 1 + s[x + 1] * 3 + t[x + 0] * 3 + t[x + 1] * 9 + 8) >> 4;
+  }
+}
+
+// Scales a single row of pixels using point sampling.
+void ScaleCols_C(uint8_t* dst_ptr,
+                 const uint8_t* src_ptr,
+                 int dst_width,
+                 int x,
+                 int dx) {
+  int j;
+  for (j = 0; j < dst_width - 1; j += 2) {
+    dst_ptr[0] = src_ptr[x >> 16];
+    x += dx;
+    dst_ptr[1] = src_ptr[x >> 16];
+    x += dx;
+    dst_ptr += 2;
+  }
+  if (dst_width & 1) {
+    dst_ptr[0] = src_ptr[x >> 16];
+  }
+}
+
+void ScaleCols_16_C(uint16_t* dst_ptr,
+                    const uint16_t* src_ptr,
+                    int dst_width,
+                    int x,
+                    int dx) {
+  int j;
+  for (j = 0; j < dst_width - 1; j += 2) {
+    dst_ptr[0] = src_ptr[x >> 16];
+    x += dx;
+    dst_ptr[1] = src_ptr[x >> 16];
+    x += dx;
+    dst_ptr += 2;
+  }
+  if (dst_width & 1) {
+    dst_ptr[0] = src_ptr[x >> 16];
+  }
+}
+
+// Scales a single row of pixels up by 2x using point sampling.
+void ScaleColsUp2_C(uint8_t* dst_ptr,
+                    const uint8_t* src_ptr,
+                    int dst_width,
+                    int x,
+                    int dx) {
+  int j;
+  (void)x;
+  (void)dx;
+  for (j = 0; j < dst_width - 1; j += 2) {
+    dst_ptr[1] = dst_ptr[0] = src_ptr[0];
+    src_ptr += 1;
+    dst_ptr += 2;
+  }
+  if (dst_width & 1) {
+    dst_ptr[0] = src_ptr[0];
+  }
+}
+
+void ScaleColsUp2_16_C(uint16_t* dst_ptr,
+                       const uint16_t* src_ptr,
+                       int dst_width,
+                       int x,
+                       int dx) {
+  int j;
+  (void)x;
+  (void)dx;
+  for (j = 0; j < dst_width - 1; j += 2) {
+    dst_ptr[1] = dst_ptr[0] = src_ptr[0];
+    src_ptr += 1;
+    dst_ptr += 2;
+  }
+  if (dst_width & 1) {
+    dst_ptr[0] = src_ptr[0];
+  }
+}
+
+// (1-f)a + fb can be replaced with a + f(b-a)
+#if defined(__arm__) || defined(__aarch64__)
+#define BLENDER(a, b, f) \
+  (uint8_t)((int)(a) + ((((int)((f)) * ((int)(b) - (int)(a))) + 0x8000) >> 16))
+#else
+// Intel uses 7 bit math with rounding.
+#define BLENDER(a, b, f) \
+  (uint8_t)((int)(a) + (((int)((f) >> 9) * ((int)(b) - (int)(a)) + 0x40) >> 7))
+#endif
+
+void ScaleFilterCols_C(uint8_t* dst_ptr,
+                       const uint8_t* src_ptr,
+                       int dst_width,
+                       int x,
+                       int dx) {
+  int j;
+  for (j = 0; j < dst_width - 1; j += 2) {
+    int xi = x >> 16;
+    int a = src_ptr[xi];
+    int b = src_ptr[xi + 1];
+    dst_ptr[0] = BLENDER(a, b, x & 0xffff);
+    x += dx;
+    xi = x >> 16;
+    a = src_ptr[xi];
+    b = src_ptr[xi + 1];
+    dst_ptr[1] = BLENDER(a, b, x & 0xffff);
+    x += dx;
+    dst_ptr += 2;
+  }
+  if (dst_width & 1) {
+    int xi = x >> 16;
+    int a = src_ptr[xi];
+    int b = src_ptr[xi + 1];
+    dst_ptr[0] = BLENDER(a, b, x & 0xffff);
+  }
+}
+
+void ScaleFilterCols64_C(uint8_t* dst_ptr,
+                         const uint8_t* src_ptr,
+                         int dst_width,
+                         int x32,
+                         int dx) {
+  int64_t x = (int64_t)(x32);
+  int j;
+  for (j = 0; j < dst_width - 1; j += 2) {
+    int64_t xi = x >> 16;
+    int a = src_ptr[xi];
+    int b = src_ptr[xi + 1];
+    dst_ptr[0] = BLENDER(a, b, x & 0xffff);
+    x += dx;
+    xi = x >> 16;
+    a = src_ptr[xi];
+    b = src_ptr[xi + 1];
+    dst_ptr[1] = BLENDER(a, b, x & 0xffff);
+    x += dx;
+    dst_ptr += 2;
+  }
+  if (dst_width & 1) {
+    int64_t xi = x >> 16;
+    int a = src_ptr[xi];
+    int b = src_ptr[xi + 1];
+    dst_ptr[0] = BLENDER(a, b, x & 0xffff);
+  }
+}
+#undef BLENDER
+
+// Same as 8 bit arm blender but return is cast to uint16_t
+#define BLENDER(a, b, f) \
+  (uint16_t)(            \
+      (int)(a) +         \
+      (int)((((int64_t)((f)) * ((int64_t)(b) - (int)(a))) + 0x8000) >> 16))
+
+void ScaleFilterCols_16_C(uint16_t* dst_ptr,
+                          const uint16_t* src_ptr,
+                          int dst_width,
+                          int x,
+                          int dx) {
+  int j;
+  for (j = 0; j < dst_width - 1; j += 2) {
+    int xi = x >> 16;
+    int a = src_ptr[xi];
+    int b = src_ptr[xi + 1];
+    dst_ptr[0] = BLENDER(a, b, x & 0xffff);
+    x += dx;
+    xi = x >> 16;
+    a = src_ptr[xi];
+    b = src_ptr[xi + 1];
+    dst_ptr[1] = BLENDER(a, b, x & 0xffff);
+    x += dx;
+    dst_ptr += 2;
+  }
+  if (dst_width & 1) {
+    int xi = x >> 16;
+    int a = src_ptr[xi];
+    int b = src_ptr[xi + 1];
+    dst_ptr[0] = BLENDER(a, b, x & 0xffff);
+  }
+}
+
+void ScaleFilterCols64_16_C(uint16_t* dst_ptr,
+                            const uint16_t* src_ptr,
+                            int dst_width,
+                            int x32,
+                            int dx) {
+  int64_t x = (int64_t)(x32);
+  int j;
+  for (j = 0; j < dst_width - 1; j += 2) {
+    int64_t xi = x >> 16;
+    int a = src_ptr[xi];
+    int b = src_ptr[xi + 1];
+    dst_ptr[0] = BLENDER(a, b, x & 0xffff);
+    x += dx;
+    xi = x >> 16;
+    a = src_ptr[xi];
+    b = src_ptr[xi + 1];
+    dst_ptr[1] = BLENDER(a, b, x & 0xffff);
+    x += dx;
+    dst_ptr += 2;
+  }
+  if (dst_width & 1) {
+    int64_t xi = x >> 16;
+    int a = src_ptr[xi];
+    int b = src_ptr[xi + 1];
+    dst_ptr[0] = BLENDER(a, b, x & 0xffff);
+  }
+}
+#undef BLENDER
+
+
+void ScaleAddRow_C(const uint8_t* src_ptr, uint16_t* dst_ptr, int src_width) {
+  int x;
+  assert(src_width > 0);
+  for (x = 0; x < src_width - 1; x += 2) {
+    dst_ptr[0] += src_ptr[0];
+    dst_ptr[1] += src_ptr[1];
+    src_ptr += 2;
+    dst_ptr += 2;
+  }
+  if (src_width & 1) {
+    dst_ptr[0] += src_ptr[0];
+  }
+}
+
+void ScaleAddRow_16_C(const uint16_t* src_ptr,
+                      uint32_t* dst_ptr,
+                      int src_width) {
+  int x;
+  assert(src_width > 0);
+  for (x = 0; x < src_width - 1; x += 2) {
+    dst_ptr[0] += src_ptr[0];
+    dst_ptr[1] += src_ptr[1];
+    src_ptr += 2;
+    dst_ptr += 2;
+  }
+  if (src_width & 1) {
+    dst_ptr[0] += src_ptr[0];
+  }
+}
+
+
+// Scale plane vertically with bilinear interpolation.
+void ScalePlaneVertical(int src_height,
+                        int dst_width,
+                        int dst_height,
+                        int src_stride,
+                        int dst_stride,
+                        const uint8_t* src_argb,
+                        uint8_t* dst_argb,
+                        int x,
+                        int y,
+                        int dy,
+                        int bpp,  // bytes per pixel. 4 for ARGB.
+                        enum FilterMode filtering) {
+  // TODO(fbarchard): Allow higher bpp.
+  int dst_width_bytes = dst_width * bpp;
+  void (*InterpolateRow)(uint8_t* dst_argb, const uint8_t* src_argb,
+                         ptrdiff_t src_stride, int dst_width,
+                         int source_y_fraction) = InterpolateRow_C;
+  const int max_y = (src_height > 1) ? ((src_height - 1) << 16) - 1 : 0;
+  int j;
+  assert(bpp >= 1 && bpp <= 4);
+  assert(src_height != 0);
+  assert(dst_width > 0);
+  assert(dst_height > 0);
+  src_argb += (x >> 16) * bpp;
+
+  for (j = 0; j < dst_height; ++j) {
+    int yi;
+    int yf;
+    if (y > max_y) {
+      y = max_y;
+    }
+    yi = y >> 16;
+    yf = filtering ? ((y >> 8) & 255) : 0;
+    InterpolateRow(dst_argb, src_argb + yi * src_stride, src_stride,
+                   dst_width_bytes, yf);
+    dst_argb += dst_stride;
+    y += dy;
+  }
+}
+
+void ScalePlaneVertical_16(int src_height,
+                           int dst_width,
+                           int dst_height,
+                           int src_stride,
+                           int dst_stride,
+                           const uint16_t* src_argb,
+                           uint16_t* dst_argb,
+                           int x,
+                           int y,
+                           int dy,
+                           int wpp, /* words per pixel. normally 1 */
+                           enum FilterMode filtering) {
+  // TODO(fbarchard): Allow higher wpp.
+  int dst_width_words = dst_width * wpp;
+  void (*InterpolateRow)(uint16_t* dst_argb, const uint16_t* src_argb,
+                         ptrdiff_t src_stride, int dst_width,
+                         int source_y_fraction) = InterpolateRow_16_C;
+  const int max_y = (src_height > 1) ? ((src_height - 1) << 16) - 1 : 0;
+  int j;
+  assert(wpp >= 1 && wpp <= 2);
+  assert(src_height != 0);
+  assert(dst_width > 0);
+  assert(dst_height > 0);
+  src_argb += (x >> 16) * wpp;
+  for (j = 0; j < dst_height; ++j) {
+    int yi;
+    int yf;
+    if (y > max_y) {
+      y = max_y;
+    }
+    yi = y >> 16;
+    yf = filtering ? ((y >> 8) & 255) : 0;
+    InterpolateRow(dst_argb, src_argb + yi * src_stride, src_stride,
+                   dst_width_words, yf);
+    dst_argb += dst_stride;
+    y += dy;
+  }
+}
+
+// Simplify the filtering based on scale factors.
+enum FilterMode ScaleFilterReduce(int src_width,
+                                  int src_height,
+                                  int dst_width,
+                                  int dst_height,
+                                  enum FilterMode filtering) {
+  if (src_width < 0) {
+    src_width = -src_width;
+  }
+  if (src_height < 0) {
+    src_height = -src_height;
+  }
+  if (filtering == kFilterBox) {
+    // If scaling either axis to 0.5 or larger, switch from Box to Bilinear.
+    if (dst_width * 2 >= src_width || dst_height * 2 >= src_height) {
+      filtering = kFilterBilinear;
+    }
+  }
+  if (filtering == kFilterBilinear) {
+    if (src_height == 1) {
+      filtering = kFilterLinear;
+    }
+    // TODO(fbarchard): Detect any odd scale factor and reduce to Linear.
+    if (dst_height == src_height || dst_height * 3 == src_height) {
+      filtering = kFilterLinear;
+    }
+    // TODO(fbarchard): Remove 1 pixel wide filter restriction, which is to
+    // avoid reading 2 pixels horizontally that causes memory exception.
+    if (src_width == 1) {
+      filtering = kFilterNone;
+    }
+  }
+  if (filtering == kFilterLinear) {
+    if (src_width == 1) {
+      filtering = kFilterNone;
+    }
+    // TODO(fbarchard): Detect any odd scale factor and reduce to None.
+    if (dst_width == src_width || dst_width * 3 == src_width) {
+      filtering = kFilterNone;
+    }
+  }
+  return filtering;
+}
+
+// Divide num by div and return as 16.16 fixed point result.
+int FixedDiv_C(int num, int div) {
+  return (int)(((int64_t)(num) << 16) / div);
+}
+
+// Divide num - 1 by div - 1 and return as 16.16 fixed point result.
+int FixedDiv1_C(int num, int div) {
+  return (int)((((int64_t)(num) << 16) - 0x00010001) / (div - 1));
+}
+
+#define CENTERSTART(dx, s) (dx < 0) ? -((-dx >> 1) + s) : ((dx >> 1) + s)
+
+// Compute slope values for stepping.
+void ScaleSlope(int src_width,
+                int src_height,
+                int dst_width,
+                int dst_height,
+                enum FilterMode filtering,
+                int* x,
+                int* y,
+                int* dx,
+                int* dy) {
+  assert(x != NULL);
+  assert(y != NULL);
+  assert(dx != NULL);
+  assert(dy != NULL);
+  assert(src_width != 0);
+  assert(src_height != 0);
+  assert(dst_width > 0);
+  assert(dst_height > 0);
+  // Check for 1 pixel and avoid FixedDiv overflow.
+  if (dst_width == 1 && src_width >= 32768) {
+    dst_width = src_width;
+  }
+  if (dst_height == 1 && src_height >= 32768) {
+    dst_height = src_height;
+  }
+  if (filtering == kFilterBox) {
+    // Scale step for point sampling duplicates all pixels equally.
+    *dx = FixedDiv(Abs(src_width), dst_width);
+    *dy = FixedDiv(src_height, dst_height);
+    *x = 0;
+    *y = 0;
+  } else if (filtering == kFilterBilinear) {
+    // Scale step for bilinear sampling renders last pixel once for upsample.
+    if (dst_width <= Abs(src_width)) {
+      *dx = FixedDiv(Abs(src_width), dst_width);
+      *x = CENTERSTART(*dx, -32768);  // Subtract 0.5 (32768) to center filter.
+    } else if (src_width > 1 && dst_width > 1) {
+      *dx = FixedDiv1(Abs(src_width), dst_width);
+      *x = 0;
+    }
+    if (dst_height <= src_height) {
+      *dy = FixedDiv(src_height, dst_height);
+      *y = CENTERSTART(*dy, -32768);  // Subtract 0.5 (32768) to center filter.
+    } else if (src_height > 1 && dst_height > 1) {
+      *dy = FixedDiv1(src_height, dst_height);
+      *y = 0;
+    }
+  } else if (filtering == kFilterLinear) {
+    // Scale step for bilinear sampling renders last pixel once for upsample.
+    if (dst_width <= Abs(src_width)) {
+      *dx = FixedDiv(Abs(src_width), dst_width);
+      *x = CENTERSTART(*dx, -32768);  // Subtract 0.5 (32768) to center filter.
+    } else if (src_width > 1 && dst_width > 1) {
+      *dx = FixedDiv1(Abs(src_width), dst_width);
+      *x = 0;
+    }
+    *dy = FixedDiv(src_height, dst_height);
+    *y = *dy >> 1;
+  } else {
+    // Scale step for point sampling duplicates all pixels equally.
+    *dx = FixedDiv(Abs(src_width), dst_width);
+    *dy = FixedDiv(src_height, dst_height);
+    *x = CENTERSTART(*dx, 0);
+    *y = CENTERSTART(*dy, 0);
+  }
+  // Negative src_width means horizontally mirror.
+  if (src_width < 0) {
+    *x += (dst_width - 1) * *dx;
+    *dx = -*dx;
+    // src_width = -src_width;   // Caller must do this.
+  }
+}
+#undef CENTERSTART
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/yuv_scale.c b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/yuv_scale.c
new file mode 100644
index 0000000000..58505067ea
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/yuv_scale.c
@@ -0,0 +1,1003 @@
+/*
+ *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale.h"
+
+#include <assert.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/planar_functions.h"  // For CopyPlane
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/row.h"
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/src-libyuv/libyuv/scale_row.h"
+
+static __inline int Abs(int v) {
+  return v >= 0 ? v : -v;
+}
+
+#define SUBSAMPLE(v, a, s) (v < 0) ? (-((-v + a) >> s)) : ((v + a) >> s)
+#define CENTERSTART(dx, s) (dx < 0) ? -((-dx >> 1) + s) : ((dx >> 1) + s)
+
+#define MIN1(x) ((x) < 1 ? 1 : (x))
+
+static __inline uint32_t SumPixels(int iboxwidth, const uint16_t* src_ptr) {
+  uint32_t sum = 0u;
+  int x;
+  assert(iboxwidth > 0);
+  for (x = 0; x < iboxwidth; ++x) {
+    sum += src_ptr[x];
+  }
+  return sum;
+}
+
+static __inline uint32_t SumPixels_16(int iboxwidth, const uint32_t* src_ptr) {
+  uint32_t sum = 0u;
+  int x;
+  assert(iboxwidth > 0);
+  for (x = 0; x < iboxwidth; ++x) {
+    sum += src_ptr[x];
+  }
+  return sum;
+}
+
+static void ScaleAddCols2_C(int dst_width,
+                            int boxheight,
+                            int x,
+                            int dx,
+                            const uint16_t* src_ptr,
+                            uint8_t* dst_ptr) {
+  int i;
+  int scaletbl[2];
+  int minboxwidth = dx >> 16;
+  int boxwidth;
+  scaletbl[0] = 65536 / (MIN1(minboxwidth) * boxheight);
+  scaletbl[1] = 65536 / (MIN1(minboxwidth + 1) * boxheight);
+  for (i = 0; i < dst_width; ++i) {
+    int ix = x >> 16;
+    x += dx;
+    boxwidth = MIN1((x >> 16) - ix);
+    int scaletbl_index = boxwidth - minboxwidth;
+    assert((scaletbl_index == 0) || (scaletbl_index == 1));
+    *dst_ptr++ = (uint8_t)(SumPixels(boxwidth, src_ptr + ix) *
+                               scaletbl[scaletbl_index] >>
+                           16);
+  }
+}
+
+static void ScaleAddCols2_16_C(int dst_width,
+                               int boxheight,
+                               int x,
+                               int dx,
+                               const uint32_t* src_ptr,
+                               uint16_t* dst_ptr) {
+  int i;
+  int scaletbl[2];
+  int minboxwidth = dx >> 16;
+  int boxwidth;
+  scaletbl[0] = 65536 / (MIN1(minboxwidth) * boxheight);
+  scaletbl[1] = 65536 / (MIN1(minboxwidth + 1) * boxheight);
+  for (i = 0; i < dst_width; ++i) {
+    int ix = x >> 16;
+    x += dx;
+    boxwidth = MIN1((x >> 16) - ix);
+    int scaletbl_index = boxwidth - minboxwidth;
+    assert((scaletbl_index == 0) || (scaletbl_index == 1));
+    *dst_ptr++ =
+        SumPixels_16(boxwidth, src_ptr + ix) * scaletbl[scaletbl_index] >> 16;
+  }
+}
+
+static void ScaleAddCols0_C(int dst_width,
+                            int boxheight,
+                            int x,
+                            int dx,
+                            const uint16_t* src_ptr,
+                            uint8_t* dst_ptr) {
+  int scaleval = 65536 / boxheight;
+  int i;
+  (void)dx;
+  src_ptr += (x >> 16);
+  for (i = 0; i < dst_width; ++i) {
+    *dst_ptr++ = (uint8_t)(src_ptr[i] * scaleval >> 16);
+  }
+}
+
+static void ScaleAddCols1_C(int dst_width,
+                            int boxheight,
+                            int x,
+                            int dx,
+                            const uint16_t* src_ptr,
+                            uint8_t* dst_ptr) {
+  int boxwidth = MIN1(dx >> 16);
+  int scaleval = 65536 / (boxwidth * boxheight);
+  int i;
+  x >>= 16;
+  for (i = 0; i < dst_width; ++i) {
+    *dst_ptr++ = (uint8_t)(SumPixels(boxwidth, src_ptr + x) * scaleval >> 16);
+    x += boxwidth;
+  }
+}
+
+static void ScaleAddCols1_16_C(int dst_width,
+                               int boxheight,
+                               int x,
+                               int dx,
+                               const uint32_t* src_ptr,
+                               uint16_t* dst_ptr) {
+  int boxwidth = MIN1(dx >> 16);
+  int scaleval = 65536 / (boxwidth * boxheight);
+  int i;
+  for (i = 0; i < dst_width; ++i) {
+    *dst_ptr++ = SumPixels_16(boxwidth, src_ptr + x) * scaleval >> 16;
+    x += boxwidth;
+  }
+}
+
+// Scale plane down to any dimensions, with interpolation.
+// (boxfilter).
+//
+// Same method as SimpleScale, which is fixed point, outputting
+// one pixel of destination using fixed point (16.16) to step
+// through source, sampling a box of pixel with simple
+// averaging.
+static int ScalePlaneBox(int src_width,
+                         int src_height,
+                         int dst_width,
+                         int dst_height,
+                         int src_stride,
+                         int dst_stride,
+                         const uint8_t* src_ptr,
+                         uint8_t* dst_ptr) {
+  int j, k;
+  // Initial source x/y coordinate and step values as 16.16 fixed point.
+  int x = 0;
+  int y = 0;
+  int dx = 0;
+  int dy = 0;
+  const int max_y = (src_height << 16);
+  ScaleSlope(src_width, src_height, dst_width, dst_height, kFilterBox, &x, &y,
+             &dx, &dy);
+  src_width = Abs(src_width);
+  {
+    // Allocate a row buffer of uint16_t.
+    align_buffer_64(row16, src_width * 2);
+    if (!row16) return 1;
+    void (*ScaleAddCols)(int dst_width, int boxheight, int x, int dx,
+                         const uint16_t* src_ptr, uint8_t* dst_ptr) =
+        (dx & 0xffff) ? ScaleAddCols2_C
+                      : ((dx != 0x10000) ? ScaleAddCols1_C : ScaleAddCols0_C);
+    void (*ScaleAddRow)(const uint8_t* src_ptr, uint16_t* dst_ptr,
+                        int src_width) = ScaleAddRow_C;
+
+    for (j = 0; j < dst_height; ++j) {
+      int boxheight;
+      int iy = y >> 16;
+      const uint8_t* src = src_ptr + iy * (int64_t)src_stride;
+      y += dy;
+      if (y > max_y) {
+        y = max_y;
+      }
+      boxheight = MIN1((y >> 16) - iy);
+      memset(row16, 0, src_width * 2);
+      for (k = 0; k < boxheight; ++k) {
+        ScaleAddRow(src, (uint16_t*)(row16), src_width);
+        src += src_stride;
+      }
+      ScaleAddCols(dst_width, boxheight, x, dx, (uint16_t*)(row16), dst_ptr);
+      dst_ptr += dst_stride;
+    }
+    free_aligned_buffer_64(row16);
+  }
+  return 0;
+}
+
+static int ScalePlaneBox_16(int src_width,
+                            int src_height,
+                            int dst_width,
+                            int dst_height,
+                            int src_stride,
+                            int dst_stride,
+                            const uint16_t* src_ptr,
+                            uint16_t* dst_ptr) {
+  int j, k;
+  // Initial source x/y coordinate and step values as 16.16 fixed point.
+  int x = 0;
+  int y = 0;
+  int dx = 0;
+  int dy = 0;
+  const int max_y = (src_height << 16);
+  ScaleSlope(src_width, src_height, dst_width, dst_height, kFilterBox, &x, &y,
+             &dx, &dy);
+  src_width = Abs(src_width);
+  {
+    // Allocate a row buffer of uint32_t.
+    align_buffer_64(row32, src_width * 4);
+    if (!row32) return 1;
+    void (*ScaleAddCols)(int dst_width, int boxheight, int x, int dx,
+                         const uint32_t* src_ptr, uint16_t* dst_ptr) =
+        (dx & 0xffff) ? ScaleAddCols2_16_C : ScaleAddCols1_16_C;
+    void (*ScaleAddRow)(const uint16_t* src_ptr, uint32_t* dst_ptr,
+                        int src_width) = ScaleAddRow_16_C;
+
+#if defined(HAS_SCALEADDROW_16_SSE2)
+    if (TestCpuFlag(kCpuHasSSE2) && IS_ALIGNED(src_width, 16)) {
+      ScaleAddRow = ScaleAddRow_16_SSE2;
+    }
+#endif
+
+    for (j = 0; j < dst_height; ++j) {
+      int boxheight;
+      int iy = y >> 16;
+      const uint16_t* src = src_ptr + iy * (int64_t)src_stride;
+      y += dy;
+      if (y > max_y) {
+        y = max_y;
+      }
+      boxheight = MIN1((y >> 16) - iy);
+      memset(row32, 0, src_width * 4);
+      for (k = 0; k < boxheight; ++k) {
+        ScaleAddRow(src, (uint32_t*)(row32), src_width);
+        src += src_stride;
+      }
+      ScaleAddCols(dst_width, boxheight, x, dx, (uint32_t*)(row32), dst_ptr);
+      dst_ptr += dst_stride;
+    }
+    free_aligned_buffer_64(row32);
+  }
+  return 0;
+}
+
+// Scale plane down with bilinear interpolation.
+static int ScalePlaneBilinearDown(int src_width,
+                                  int src_height,
+                                  int dst_width,
+                                  int dst_height,
+                                  int src_stride,
+                                  int dst_stride,
+                                  const uint8_t* src_ptr,
+                                  uint8_t* dst_ptr,
+                                  enum FilterMode filtering) {
+  // Initial source x/y coordinate and step values as 16.16 fixed point.
+  int x = 0;
+  int y = 0;
+  int dx = 0;
+  int dy = 0;
+  // TODO(fbarchard): Consider not allocating row buffer for kFilterLinear.
+  // Allocate a row buffer.
+  align_buffer_64(row, src_width);
+  if (!row) return 1;
+
+  const int max_y = (src_height - 1) << 16;
+  int j;
+  void (*ScaleFilterCols)(uint8_t* dst_ptr, const uint8_t* src_ptr,
+                          int dst_width, int x, int dx) =
+      (src_width >= 32768) ? ScaleFilterCols64_C : ScaleFilterCols_C;
+  void (*InterpolateRow)(uint8_t* dst_ptr, const uint8_t* src_ptr,
+                         ptrdiff_t src_stride, int dst_width,
+                         int source_y_fraction) = InterpolateRow_C;
+  ScaleSlope(src_width, src_height, dst_width, dst_height, filtering, &x, &y,
+             &dx, &dy);
+  src_width = Abs(src_width);
+
+  if (y > max_y) {
+    y = max_y;
+  }
+
+  for (j = 0; j < dst_height; ++j) {
+    int yi = y >> 16;
+    const uint8_t* src = src_ptr + yi * (int64_t)src_stride;
+    if (filtering == kFilterLinear) {
+      ScaleFilterCols(dst_ptr, src, dst_width, x, dx);
+    } else {
+      int yf = (y >> 8) & 255;
+      InterpolateRow(row, src, src_stride, src_width, yf);
+      ScaleFilterCols(dst_ptr, row, dst_width, x, dx);
+    }
+    dst_ptr += dst_stride;
+    y += dy;
+    if (y > max_y) {
+      y = max_y;
+    }
+  }
+  free_aligned_buffer_64(row);
+  return 0;
+}
+
+static int ScalePlaneBilinearDown_16(int src_width,
+                                     int src_height,
+                                     int dst_width,
+                                     int dst_height,
+                                     int src_stride,
+                                     int dst_stride,
+                                     const uint16_t* src_ptr,
+                                     uint16_t* dst_ptr,
+                                     enum FilterMode filtering) {
+  // Initial source x/y coordinate and step values as 16.16 fixed point.
+  int x = 0;
+  int y = 0;
+  int dx = 0;
+  int dy = 0;
+  // TODO(fbarchard): Consider not allocating row buffer for kFilterLinear.
+  // Allocate a row buffer.
+  align_buffer_64(row, src_width * 2);
+  if (!row) return 1;
+
+  const int max_y = (src_height - 1) << 16;
+  int j;
+  void (*ScaleFilterCols)(uint16_t* dst_ptr, const uint16_t* src_ptr,
+                          int dst_width, int x, int dx) =
+      (src_width >= 32768) ? ScaleFilterCols64_16_C : ScaleFilterCols_16_C;
+  void (*InterpolateRow)(uint16_t* dst_ptr, const uint16_t* src_ptr,
+                         ptrdiff_t src_stride, int dst_width,
+                         int source_y_fraction) = InterpolateRow_16_C;
+  ScaleSlope(src_width, src_height, dst_width, dst_height, filtering, &x, &y,
+             &dx, &dy);
+  src_width = Abs(src_width);
+
+  if (y > max_y) {
+    y = max_y;
+  }
+
+  for (j = 0; j < dst_height; ++j) {
+    int yi = y >> 16;
+    const uint16_t* src = src_ptr + yi * (int64_t)src_stride;
+    if (filtering == kFilterLinear) {
+      ScaleFilterCols(dst_ptr, src, dst_width, x, dx);
+    } else {
+      int yf = (y >> 8) & 255;
+      InterpolateRow((uint16_t*)row, src, src_stride, src_width, yf);
+      ScaleFilterCols(dst_ptr, (uint16_t*)row, dst_width, x, dx);
+    }
+    dst_ptr += dst_stride;
+    y += dy;
+    if (y > max_y) {
+      y = max_y;
+    }
+  }
+  free_aligned_buffer_64(row);
+  return 0;
+}
+
+// Scale up down with bilinear interpolation.
+static int ScalePlaneBilinearUp(int src_width,
+                                int src_height,
+                                int dst_width,
+                                int dst_height,
+                                int src_stride,
+                                int dst_stride,
+                                const uint8_t* src_ptr,
+                                uint8_t* dst_ptr,
+                                enum FilterMode filtering) {
+  int j;
+  // Initial source x/y coordinate and step values as 16.16 fixed point.
+  int x = 0;
+  int y = 0;
+  int dx = 0;
+  int dy = 0;
+  const int max_y = (src_height - 1) << 16;
+  void (*InterpolateRow)(uint8_t* dst_ptr, const uint8_t* src_ptr,
+                         ptrdiff_t src_stride, int dst_width,
+                         int source_y_fraction) = InterpolateRow_C;
+  void (*ScaleFilterCols)(uint8_t* dst_ptr, const uint8_t* src_ptr,
+                          int dst_width, int x, int dx) =
+      filtering ? ScaleFilterCols_C : ScaleCols_C;
+  ScaleSlope(src_width, src_height, dst_width, dst_height, filtering, &x, &y,
+             &dx, &dy);
+  src_width = Abs(src_width);
+
+  if (filtering && src_width >= 32768) {
+    ScaleFilterCols = ScaleFilterCols64_C;
+  }
+  if (!filtering && src_width * 2 == dst_width && x < 0x8000) {
+    ScaleFilterCols = ScaleColsUp2_C;
+  }
+
+  if (y > max_y) {
+    y = max_y;
+  }
+  {
+    int yi = y >> 16;
+    const uint8_t* src = src_ptr + yi * (int64_t)src_stride;
+
+    // Allocate 2 row buffers.
+    const int row_size = (dst_width + 31) & ~31;
+    align_buffer_64(row, row_size * 2);
+    if (!row) return 1;
+
+    uint8_t* rowptr = row;
+    int rowstride = row_size;
+    int lasty = yi;
+
+    ScaleFilterCols(rowptr, src, dst_width, x, dx);
+    if (src_height > 1) {
+      src += src_stride;
+    }
+    ScaleFilterCols(rowptr + rowstride, src, dst_width, x, dx);
+    if (src_height > 2) {
+      src += src_stride;
+    }
+
+    for (j = 0; j < dst_height; ++j) {
+      yi = y >> 16;
+      if (yi != lasty) {
+        if (y > max_y) {
+          y = max_y;
+          yi = y >> 16;
+          src = src_ptr + yi * (int64_t)src_stride;
+        }
+        if (yi != lasty) {
+          ScaleFilterCols(rowptr, src, dst_width, x, dx);
+          rowptr += rowstride;
+          rowstride = -rowstride;
+          lasty = yi;
+          if ((y + 65536) < max_y) {
+            src += src_stride;
+          }
+        }
+      }
+      if (filtering == kFilterLinear) {
+        InterpolateRow(dst_ptr, rowptr, 0, dst_width, 0);
+      } else {
+        int yf = (y >> 8) & 255;
+        InterpolateRow(dst_ptr, rowptr, rowstride, dst_width, yf);
+      }
+      dst_ptr += dst_stride;
+      y += dy;
+    }
+    free_aligned_buffer_64(row);
+  }
+  return 0;
+}
+
+// Scale plane, horizontally up by 2 times.
+// Uses linear filter horizontally, nearest vertically.
+// This is an optimized version for scaling up a plane to 2 times of
+// its original width, using linear interpolation.
+// This is used to scale U and V planes of I422 to I444.
+static void ScalePlaneUp2_Linear(int src_width,
+                                 int src_height,
+                                 int dst_width,
+                                 int dst_height,
+                                 int src_stride,
+                                 int dst_stride,
+                                 const uint8_t* src_ptr,
+                                 uint8_t* dst_ptr) {
+  void (*ScaleRowUp)(const uint8_t* src_ptr, uint8_t* dst_ptr, int dst_width) =
+      ScaleRowUp2_Linear_Any_C;
+  int i;
+  int y;
+  int dy;
+
+  (void)src_width;
+  // This function can only scale up by 2 times horizontally.
+  assert(src_width == ((dst_width + 1) / 2));
+
+  if (dst_height == 1) {
+    ScaleRowUp(src_ptr + ((src_height - 1) / 2) * (int64_t)src_stride, dst_ptr,
+               dst_width);
+  } else {
+    dy = FixedDiv(src_height - 1, dst_height - 1);
+    y = (1 << 15) - 1;
+    for (i = 0; i < dst_height; ++i) {
+      ScaleRowUp(src_ptr + (y >> 16) * (int64_t)src_stride, dst_ptr, dst_width);
+      dst_ptr += dst_stride;
+      y += dy;
+    }
+  }
+}
+
+// Scale plane, up by 2 times.
+// This is an optimized version for scaling up a plane to 2 times of
+// its original size, using bilinear interpolation.
+// This is used to scale U and V planes of I420 to I444.
+static void ScalePlaneUp2_Bilinear(int src_width,
+                                   int src_height,
+                                   int dst_width,
+                                   int dst_height,
+                                   int src_stride,
+                                   int dst_stride,
+                                   const uint8_t* src_ptr,
+                                   uint8_t* dst_ptr) {
+  void (*Scale2RowUp)(const uint8_t* src_ptr, ptrdiff_t src_stride,
+                      uint8_t* dst_ptr, ptrdiff_t dst_stride, int dst_width) =
+      ScaleRowUp2_Bilinear_Any_C;
+  int x;
+
+  (void)src_width;
+  // This function can only scale up by 2 times.
+  assert(src_width == ((dst_width + 1) / 2));
+  assert(src_height == ((dst_height + 1) / 2));
+
+  Scale2RowUp(src_ptr, 0, dst_ptr, 0, dst_width);
+  dst_ptr += dst_stride;
+  for (x = 0; x < src_height - 1; ++x) {
+    Scale2RowUp(src_ptr, src_stride, dst_ptr, dst_stride, dst_width);
+    src_ptr += src_stride;
+    // TODO(fbarchard): Test performance of writing one row of destination at a
+    // time.
+    dst_ptr += 2 * dst_stride;
+  }
+  if (!(dst_height & 1)) {
+    Scale2RowUp(src_ptr, 0, dst_ptr, 0, dst_width);
+  }
+}
+
+// Scale at most 14 bit plane, horizontally up by 2 times.
+// This is an optimized version for scaling up a plane to 2 times of
+// its original width, using linear interpolation.
+// stride is in count of uint16_t.
+// This is used to scale U and V planes of I210 to I410 and I212 to I412.
+static void ScalePlaneUp2_12_Linear(int src_width,
+                                    int src_height,
+                                    int dst_width,
+                                    int dst_height,
+                                    int src_stride,
+                                    int dst_stride,
+                                    const uint16_t* src_ptr,
+                                    uint16_t* dst_ptr) {
+  void (*ScaleRowUp)(const uint16_t* src_ptr, uint16_t* dst_ptr,
+                     int dst_width) = ScaleRowUp2_Linear_16_Any_C;
+  int i;
+  int y;
+  int dy;
+
+  (void)src_width;
+  // This function can only scale up by 2 times horizontally.
+  assert(src_width == ((dst_width + 1) / 2));
+
+  if (dst_height == 1) {
+    ScaleRowUp(src_ptr + ((src_height - 1) / 2) * (int64_t)src_stride, dst_ptr,
+               dst_width);
+  } else {
+    dy = FixedDiv(src_height - 1, dst_height - 1);
+    y = (1 << 15) - 1;
+    for (i = 0; i < dst_height; ++i) {
+      ScaleRowUp(src_ptr + (y >> 16) * (int64_t)src_stride, dst_ptr, dst_width);
+      dst_ptr += dst_stride;
+      y += dy;
+    }
+  }
+}
+
+// Scale at most 12 bit plane, up by 2 times.
+// This is an optimized version for scaling up a plane to 2 times of
+// its original size, using bilinear interpolation.
+// stride is in count of uint16_t.
+// This is used to scale U and V planes of I010 to I410 and I012 to I412.
+static void ScalePlaneUp2_12_Bilinear(int src_width,
+                                      int src_height,
+                                      int dst_width,
+                                      int dst_height,
+                                      int src_stride,
+                                      int dst_stride,
+                                      const uint16_t* src_ptr,
+                                      uint16_t* dst_ptr) {
+  void (*Scale2RowUp)(const uint16_t* src_ptr, ptrdiff_t src_stride,
+                      uint16_t* dst_ptr, ptrdiff_t dst_stride, int dst_width) =
+      ScaleRowUp2_Bilinear_16_Any_C;
+  int x;
+
+  (void)src_width;
+  // This function can only scale up by 2 times.
+  assert(src_width == ((dst_width + 1) / 2));
+  assert(src_height == ((dst_height + 1) / 2));
+
+  Scale2RowUp(src_ptr, 0, dst_ptr, 0, dst_width);
+  dst_ptr += dst_stride;
+  for (x = 0; x < src_height - 1; ++x) {
+    Scale2RowUp(src_ptr, src_stride, dst_ptr, dst_stride, dst_width);
+    src_ptr += src_stride;
+    dst_ptr += 2 * dst_stride;
+  }
+  if (!(dst_height & 1)) {
+    Scale2RowUp(src_ptr, 0, dst_ptr, 0, dst_width);
+  }
+}
+
+static void ScalePlaneUp2_16_Linear(int src_width,
+                                    int src_height,
+                                    int dst_width,
+                                    int dst_height,
+                                    int src_stride,
+                                    int dst_stride,
+                                    const uint16_t* src_ptr,
+                                    uint16_t* dst_ptr) {
+  void (*ScaleRowUp)(const uint16_t* src_ptr, uint16_t* dst_ptr,
+                     int dst_width) = ScaleRowUp2_Linear_16_Any_C;
+  int i;
+  int y;
+  int dy;
+
+  (void)src_width;
+  // This function can only scale up by 2 times horizontally.
+  assert(src_width == ((dst_width + 1) / 2));
+
+  if (dst_height == 1) {
+    ScaleRowUp(src_ptr + ((src_height - 1) / 2) * (int64_t)src_stride, dst_ptr,
+               dst_width);
+  } else {
+    dy = FixedDiv(src_height - 1, dst_height - 1);
+    y = (1 << 15) - 1;
+    for (i = 0; i < dst_height; ++i) {
+      ScaleRowUp(src_ptr + (y >> 16) * (int64_t)src_stride, dst_ptr, dst_width);
+      dst_ptr += dst_stride;
+      y += dy;
+    }
+  }
+}
+
+static void ScalePlaneUp2_16_Bilinear(int src_width,
+                                      int src_height,
+                                      int dst_width,
+                                      int dst_height,
+                                      int src_stride,
+                                      int dst_stride,
+                                      const uint16_t* src_ptr,
+                                      uint16_t* dst_ptr) {
+  void (*Scale2RowUp)(const uint16_t* src_ptr, ptrdiff_t src_stride,
+                      uint16_t* dst_ptr, ptrdiff_t dst_stride, int dst_width) =
+      ScaleRowUp2_Bilinear_16_Any_C;
+  int x;
+
+  (void)src_width;
+  // This function can only scale up by 2 times.
+  assert(src_width == ((dst_width + 1) / 2));
+  assert(src_height == ((dst_height + 1) / 2));
+
+  Scale2RowUp(src_ptr, 0, dst_ptr, 0, dst_width);
+  dst_ptr += dst_stride;
+  for (x = 0; x < src_height - 1; ++x) {
+    Scale2RowUp(src_ptr, src_stride, dst_ptr, dst_stride, dst_width);
+    src_ptr += src_stride;
+    dst_ptr += 2 * dst_stride;
+  }
+  if (!(dst_height & 1)) {
+    Scale2RowUp(src_ptr, 0, dst_ptr, 0, dst_width);
+  }
+}
+
+static int ScalePlaneBilinearUp_16(int src_width,
+                                   int src_height,
+                                   int dst_width,
+                                   int dst_height,
+                                   int src_stride,
+                                   int dst_stride,
+                                   const uint16_t* src_ptr,
+                                   uint16_t* dst_ptr,
+                                   enum FilterMode filtering) {
+  int j;
+  // Initial source x/y coordinate and step values as 16.16 fixed point.
+  int x = 0;
+  int y = 0;
+  int dx = 0;
+  int dy = 0;
+  const int max_y = (src_height - 1) << 16;
+  void (*InterpolateRow)(uint16_t* dst_ptr, const uint16_t* src_ptr,
+                         ptrdiff_t src_stride, int dst_width,
+                         int source_y_fraction) = InterpolateRow_16_C;
+  void (*ScaleFilterCols)(uint16_t* dst_ptr, const uint16_t* src_ptr,
+                          int dst_width, int x, int dx) =
+      filtering ? ScaleFilterCols_16_C : ScaleCols_16_C;
+  ScaleSlope(src_width, src_height, dst_width, dst_height, filtering, &x, &y,
+             &dx, &dy);
+  src_width = Abs(src_width);
+
+  if (filtering && src_width >= 32768) {
+    ScaleFilterCols = ScaleFilterCols64_16_C;
+  }
+  if (!filtering && src_width * 2 == dst_width && x < 0x8000) {
+    ScaleFilterCols = ScaleColsUp2_16_C;
+  }
+  if (y > max_y) {
+    y = max_y;
+  }
+  {
+    int yi = y >> 16;
+    const uint16_t* src = src_ptr + yi * (int64_t)src_stride;
+
+    // Allocate 2 row buffers.
+    const int row_size = (dst_width + 31) & ~31;
+    align_buffer_64(row, row_size * 4);
+    if (!row) return 1;
+
+    uint16_t* rowptr = (uint16_t*)row;
+    int rowstride = row_size;
+    int lasty = yi;
+
+    ScaleFilterCols(rowptr, src, dst_width, x, dx);
+    if (src_height > 1) {
+      src += src_stride;
+    }
+    ScaleFilterCols(rowptr + rowstride, src, dst_width, x, dx);
+    if (src_height > 2) {
+      src += src_stride;
+    }
+
+    for (j = 0; j < dst_height; ++j) {
+      yi = y >> 16;
+      if (yi != lasty) {
+        if (y > max_y) {
+          y = max_y;
+          yi = y >> 16;
+          src = src_ptr + yi * (int64_t)src_stride;
+        }
+        if (yi != lasty) {
+          ScaleFilterCols(rowptr, src, dst_width, x, dx);
+          rowptr += rowstride;
+          rowstride = -rowstride;
+          lasty = yi;
+          if ((y + 65536) < max_y) {
+            src += src_stride;
+          }
+        }
+      }
+      if (filtering == kFilterLinear) {
+        InterpolateRow(dst_ptr, rowptr, 0, dst_width, 0);
+      } else {
+        int yf = (y >> 8) & 255;
+        InterpolateRow(dst_ptr, rowptr, rowstride, dst_width, yf);
+      }
+      dst_ptr += dst_stride;
+      y += dy;
+    }
+    free_aligned_buffer_64(row);
+  }
+  return 0;
+}
+
+// Scale Plane to/from any dimensions, without interpolation.
+// Fixed point math is used for performance: The upper 16 bits
+// of x and dx is the integer part of the source position and
+// the lower 16 bits are the fixed decimal part.
+
+static void ScalePlaneSimple(int src_width,
+                             int src_height,
+                             int dst_width,
+                             int dst_height,
+                             int src_stride,
+                             int dst_stride,
+                             const uint8_t* src_ptr,
+                             uint8_t* dst_ptr) {
+  int i;
+  void (*ScaleCols)(uint8_t* dst_ptr, const uint8_t* src_ptr, int dst_width,
+                    int x, int dx) = ScaleCols_C;
+  // Initial source x/y coordinate and step values as 16.16 fixed point.
+  int x = 0;
+  int y = 0;
+  int dx = 0;
+  int dy = 0;
+  ScaleSlope(src_width, src_height, dst_width, dst_height, kFilterNone, &x, &y,
+             &dx, &dy);
+  src_width = Abs(src_width);
+
+  if (src_width * 2 == dst_width && x < 0x8000) {
+    ScaleCols = ScaleColsUp2_C;
+  }
+
+  for (i = 0; i < dst_height; ++i) {
+    ScaleCols(dst_ptr, src_ptr + (y >> 16) * (int64_t)src_stride, dst_width, x,
+              dx);
+    dst_ptr += dst_stride;
+    y += dy;
+  }
+}
+
+static void ScalePlaneSimple_16(int src_width,
+                                int src_height,
+                                int dst_width,
+                                int dst_height,
+                                int src_stride,
+                                int dst_stride,
+                                const uint16_t* src_ptr,
+                                uint16_t* dst_ptr) {
+  int i;
+  void (*ScaleCols)(uint16_t* dst_ptr, const uint16_t* src_ptr, int dst_width,
+                    int x, int dx) = ScaleCols_16_C;
+  // Initial source x/y coordinate and step values as 16.16 fixed point.
+  int x = 0;
+  int y = 0;
+  int dx = 0;
+  int dy = 0;
+  ScaleSlope(src_width, src_height, dst_width, dst_height, kFilterNone, &x, &y,
+             &dx, &dy);
+  src_width = Abs(src_width);
+
+  if (src_width * 2 == dst_width && x < 0x8000) {
+    ScaleCols = ScaleColsUp2_16_C;
+  }
+
+  for (i = 0; i < dst_height; ++i) {
+    ScaleCols(dst_ptr, src_ptr + (y >> 16) * (int64_t)src_stride, dst_width, x,
+              dx);
+    dst_ptr += dst_stride;
+    y += dy;
+  }
+}
+
+// Scale a plane.
+// This function dispatches to a specialized scaler based on scale factor.
+int ScalePlane(const uint8_t* src,
+               int src_stride,
+               int src_width,
+               int src_height,
+               uint8_t* dst,
+               int dst_stride,
+               int dst_width,
+               int dst_height,
+               enum FilterMode filtering) {
+  // Simplify filtering when possible.
+  filtering = ScaleFilterReduce(src_width, src_height, dst_width, dst_height,
+                                filtering);
+
+  // Negative height means invert the image.
+  if (src_height < 0) {
+    src_height = -src_height;
+    src = src + (src_height - 1) * (int64_t)src_stride;
+    src_stride = -src_stride;
+  }
+  // Use specialized scales to improve performance for common resolutions.
+  // For example, all the 1/2 scalings will use ScalePlaneDown2()
+  if (dst_width == src_width && dst_height == src_height) {
+    // Straight copy.
+    CopyPlane(src, src_stride, dst, dst_stride, dst_width, dst_height);
+    return 0;
+  }
+  if (dst_width == src_width && filtering != kFilterBox) {
+    int dy = 0;
+    int y = 0;
+    // When scaling down, use the center 2 rows to filter.
+    // When scaling up, last row of destination uses the last 2 source rows.
+    if (dst_height <= src_height) {
+      dy = FixedDiv(src_height, dst_height);
+      y = CENTERSTART(dy, -32768);  // Subtract 0.5 (32768) to center filter.
+    } else if (src_height > 1 && dst_height > 1) {
+      dy = FixedDiv1(src_height, dst_height);
+    }
+    // Arbitrary scale vertically, but unscaled horizontally.
+    ScalePlaneVertical(src_height, dst_width, dst_height, src_stride,
+                       dst_stride, src, dst, 0, y, dy, /*bpp=*/1, filtering);
+    return 0;
+  }
+  if (filtering == kFilterBox && dst_height * 2 < src_height) {
+    return ScalePlaneBox(src_width, src_height, dst_width, dst_height,
+                         src_stride, dst_stride, src, dst);
+  }
+  if ((dst_width + 1) / 2 == src_width && filtering == kFilterLinear) {
+    ScalePlaneUp2_Linear(src_width, src_height, dst_width, dst_height,
+                         src_stride, dst_stride, src, dst);
+    return 0;
+  }
+  if ((dst_height + 1) / 2 == src_height && (dst_width + 1) / 2 == src_width &&
+      (filtering == kFilterBilinear || filtering == kFilterBox)) {
+    ScalePlaneUp2_Bilinear(src_width, src_height, dst_width, dst_height,
+                           src_stride, dst_stride, src, dst);
+    return 0;
+  }
+  if (filtering && dst_height > src_height) {
+    return ScalePlaneBilinearUp(src_width, src_height, dst_width, dst_height,
+                                src_stride, dst_stride, src, dst, filtering);
+  }
+  if (filtering) {
+    return ScalePlaneBilinearDown(src_width, src_height, dst_width, dst_height,
+                                  src_stride, dst_stride, src, dst, filtering);
+  }
+  ScalePlaneSimple(src_width, src_height, dst_width, dst_height, src_stride,
+                   dst_stride, src, dst);
+  return 0;
+}
+
+int ScalePlane_16(const uint16_t* src,
+                  int src_stride,
+                  int src_width,
+                  int src_height,
+                  uint16_t* dst,
+                  int dst_stride,
+                  int dst_width,
+                  int dst_height,
+                  enum FilterMode filtering) {
+  // Simplify filtering when possible.
+  filtering = ScaleFilterReduce(src_width, src_height, dst_width, dst_height,
+                                filtering);
+
+  // Negative height means invert the image.
+  if (src_height < 0) {
+    src_height = -src_height;
+    src = src + (src_height - 1) * (int64_t)src_stride;
+    src_stride = -src_stride;
+  }
+  // Use specialized scales to improve performance for common resolutions.
+  // For example, all the 1/2 scalings will use ScalePlaneDown2()
+  if (dst_width == src_width && dst_height == src_height) {
+    // Straight copy.
+    CopyPlane_16(src, src_stride, dst, dst_stride, dst_width, dst_height);
+    return 0;
+  }
+  if (dst_width == src_width && filtering != kFilterBox) {
+    int dy = 0;
+    int y = 0;
+    // When scaling down, use the center 2 rows to filter.
+    // When scaling up, last row of destination uses the last 2 source rows.
+    if (dst_height <= src_height) {
+      dy = FixedDiv(src_height, dst_height);
+      y = CENTERSTART(dy, -32768);  // Subtract 0.5 (32768) to center filter.
+      // When scaling up, ensure the last row of destination uses the last
+      // source. Avoid divide by zero for dst_height but will do no scaling
+      // later.
+    } else if (src_height > 1 && dst_height > 1) {
+      dy = FixedDiv1(src_height, dst_height);
+    }
+    // Arbitrary scale vertically, but unscaled horizontally.
+    ScalePlaneVertical_16(src_height, dst_width, dst_height, src_stride,
+                          dst_stride, src, dst, 0, y, dy, /*bpp=*/1, filtering);
+    return 0;
+  }
+  if (filtering == kFilterBox && dst_height * 2 < src_height) {
+    return ScalePlaneBox_16(src_width, src_height, dst_width, dst_height,
+                            src_stride, dst_stride, src, dst);
+  }
+  if ((dst_width + 1) / 2 == src_width && filtering == kFilterLinear) {
+    ScalePlaneUp2_16_Linear(src_width, src_height, dst_width, dst_height,
+                            src_stride, dst_stride, src, dst);
+    return 0;
+  }
+  if ((dst_height + 1) / 2 == src_height && (dst_width + 1) / 2 == src_width &&
+      (filtering == kFilterBilinear || filtering == kFilterBox)) {
+    ScalePlaneUp2_16_Bilinear(src_width, src_height, dst_width, dst_height,
+                              src_stride, dst_stride, src, dst);
+    return 0;
+  }
+  if (filtering && dst_height > src_height) {
+    return ScalePlaneBilinearUp_16(src_width, src_height, dst_width, dst_height,
+                                   src_stride, dst_stride, src, dst, filtering);
+  }
+  if (filtering) {
+    return ScalePlaneBilinearDown_16(src_width, src_height, dst_width,
+                                     dst_height, src_stride, dst_stride, src,
+                                     dst, filtering);
+  }
+  ScalePlaneSimple_16(src_width, src_height, dst_width, dst_height, src_stride,
+                      dst_stride, src, dst);
+  return 0;
+}
+
+int ScalePlane_12(const uint16_t* src,
+                  int src_stride,
+                  int src_width,
+                  int src_height,
+                  uint16_t* dst,
+                  int dst_stride,
+                  int dst_width,
+                  int dst_height,
+                  enum FilterMode filtering) {
+  // Simplify filtering when possible.
+  filtering = ScaleFilterReduce(src_width, src_height, dst_width, dst_height,
+                                filtering);
+
+  // Negative height means invert the image.
+  if (src_height < 0) {
+    src_height = -src_height;
+    src = src + (src_height - 1) * (int64_t)src_stride;
+    src_stride = -src_stride;
+  }
+
+  if ((dst_width + 1) / 2 == src_width && filtering == kFilterLinear) {
+    ScalePlaneUp2_12_Linear(src_width, src_height, dst_width, dst_height,
+                            src_stride, dst_stride, src, dst);
+    return 0;
+  }
+  if ((dst_height + 1) / 2 == src_height && (dst_width + 1) / 2 == src_width &&
+      (filtering == kFilterBilinear || filtering == kFilterBox)) {
+    ScalePlaneUp2_12_Bilinear(src_width, src_height, dst_width, dst_height,
+                              src_stride, dst_stride, src, dst);
+    return 0;
+  }
+
+  return ScalePlane_16(src, src_stride, src_width, src_height, dst, dst_stride,
+                       dst_width, dst_height, filtering);
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/stream.c b/pxr/imaging/plugin/hioAvif/AVIF/src/stream.c
new file mode 100644
index 0000000000..5518c68500
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/stream.c
@@ -0,0 +1,523 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <assert.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+// ---------------------------------------------------------------------------
+// avifROStream
+
+const uint8_t * avifROStreamCurrent(avifROStream * stream)
+{
+    return stream->raw->data + stream->offset;
+}
+
+void avifROStreamStart(avifROStream * stream, avifROData * raw, avifDiagnostics * diag, const char * diagContext)
+{
+    stream->raw = raw;
+    stream->offset = 0;
+    stream->numUsedBitsInPartialByte = 0;
+    stream->diag = diag;
+    stream->diagContext = diagContext;
+
+    // If diag is non-NULL, diagContext must also be non-NULL
+    assert(!stream->diag || stream->diagContext);
+}
+
+avifBool avifROStreamHasBytesLeft(const avifROStream * stream, size_t byteCount)
+{
+    return byteCount <= (stream->raw->size - stream->offset);
+}
+
+size_t avifROStreamRemainingBytes(const avifROStream * stream)
+{
+    return stream->raw->size - stream->offset;
+}
+
+size_t avifROStreamOffset(const avifROStream * stream)
+{
+    return stream->offset;
+}
+
+void avifROStreamSetOffset(avifROStream * stream, size_t offset)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    stream->offset = offset;
+    if (stream->offset > stream->raw->size) {
+        stream->offset = stream->raw->size;
+    }
+}
+
+avifBool avifROStreamSkip(avifROStream * stream, size_t byteCount)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    if (!avifROStreamHasBytesLeft(stream, byteCount)) {
+        avifDiagnosticsPrintf(stream->diag, "%s: Failed to skip %zu bytes, truncated data?", stream->diagContext, byteCount);
+        return AVIF_FALSE;
+    }
+    stream->offset += byteCount;
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamRead(avifROStream * stream, uint8_t * data, size_t size)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    if (!avifROStreamHasBytesLeft(stream, size)) {
+        avifDiagnosticsPrintf(stream->diag, "%s: Failed to read %zu bytes, truncated data?", stream->diagContext, size);
+        return AVIF_FALSE;
+    }
+
+    memcpy(data, stream->raw->data + stream->offset, size);
+    stream->offset += size;
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadUX8(avifROStream * stream, uint64_t * v, uint64_t factor)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    if (factor == 0) {
+        // Don't read anything, just set to 0
+        *v = 0;
+    } else if (factor == 1) {
+        uint8_t tmp;
+        AVIF_CHECK(avifROStreamRead(stream, &tmp, 1));
+        *v = tmp;
+    } else if (factor == 2) {
+        uint16_t tmp;
+        AVIF_CHECK(avifROStreamReadU16(stream, &tmp));
+        *v = tmp;
+    } else if (factor == 4) {
+        uint32_t tmp;
+        AVIF_CHECK(avifROStreamReadU32(stream, &tmp));
+        *v = tmp;
+    } else if (factor == 8) {
+        uint64_t tmp;
+        AVIF_CHECK(avifROStreamReadU64(stream, &tmp));
+        *v = tmp;
+    } else {
+        // Unsupported factor
+        avifDiagnosticsPrintf(stream->diag, "%s: Failed to read UX8 value; Unsupported UX8 factor [%" PRIu64 "]", stream->diagContext, factor);
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadU16(avifROStream * stream, uint16_t * v)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    AVIF_CHECK(avifROStreamRead(stream, (uint8_t *)v, sizeof(uint16_t)));
+    *v = avifNTOHS(*v);
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadU16Endianness(avifROStream * stream, uint16_t * v, avifBool littleEndian)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    AVIF_CHECK(avifROStreamRead(stream, (uint8_t *)v, sizeof(uint16_t)));
+    *v = littleEndian ? avifCTOHS(*v) : avifNTOHS(*v);
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadU32(avifROStream * stream, uint32_t * v)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    AVIF_CHECK(avifROStreamRead(stream, (uint8_t *)v, sizeof(uint32_t)));
+    *v = avifNTOHL(*v);
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadU32Endianness(avifROStream * stream, uint32_t * v, avifBool littleEndian)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    AVIF_CHECK(avifROStreamRead(stream, (uint8_t *)v, sizeof(uint32_t)));
+    *v = littleEndian ? avifCTOHL(*v) : avifNTOHL(*v);
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadU64(avifROStream * stream, uint64_t * v)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    AVIF_CHECK(avifROStreamRead(stream, (uint8_t *)v, sizeof(uint64_t)));
+    *v = avifNTOH64(*v);
+    return AVIF_TRUE;
+}
+
+// Override of avifROStreamReadBits() for convenient uint8_t output.
+avifBool avifROStreamReadBits8(avifROStream * stream, uint8_t * v, size_t bitCount)
+{
+    assert(bitCount <= sizeof(*v) * 8);
+    uint32_t v32;
+    if (!avifROStreamReadBits(stream, &v32, bitCount)) {
+        return AVIF_FALSE;
+    }
+    *v = (uint8_t)v32;
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadBits(avifROStream * stream, uint32_t * v, size_t bitCount)
+{
+    assert(bitCount <= sizeof(*v) * 8);
+    *v = 0;
+    while (bitCount) {
+        if (stream->numUsedBitsInPartialByte == 0) {
+            AVIF_CHECK(avifROStreamSkip(stream, sizeof(uint8_t))); // Book a new partial byte in the stream.
+        }
+        assert(stream->offset > 0);
+        const uint8_t * packedBits = stream->raw->data + stream->offset - 1;
+
+        const size_t numBits = AVIF_MIN(bitCount, 8 - stream->numUsedBitsInPartialByte);
+        stream->numUsedBitsInPartialByte += numBits;
+        bitCount -= numBits;
+        // The stream bits are packed starting with the most significant bit of the first input byte.
+        // This way, packed bits can be found in the same order in the bit stream.
+        const uint32_t bits = (*packedBits >> (8 - stream->numUsedBitsInPartialByte)) & ((1 << numBits) - 1);
+        // The value bits are ordered from the most significant bit to the least significant bit.
+        // In the case where avifROStreamReadBits() is used to parse the unsigned integer value *v
+        // over multiple aligned bytes, this order corresponds to big endianness.
+        *v |= bits << bitCount;
+
+        if (stream->numUsedBitsInPartialByte == 8) {
+            // Start a new partial byte the next time a bit is needed.
+            stream->numUsedBitsInPartialByte = 0;
+        }
+    }
+    return AVIF_TRUE;
+}
+
+// Based on https://sqlite.org/src4/doc/trunk/www/varint.wiki.
+avifBool avifROStreamReadVarInt(avifROStream * stream, uint32_t * v)
+{
+    uint32_t a[5];
+    AVIF_CHECK(avifROStreamReadBits(stream, &a[0], 8));
+    if (a[0] <= 240) {
+        *v = a[0];
+    } else {
+        AVIF_CHECK(avifROStreamReadBits(stream, &a[1], 8));
+        if (a[0] <= 248) {
+            *v = 240 + 256 * (a[0] - 241) + a[1];
+        } else {
+            AVIF_CHECK(avifROStreamReadBits(stream, &a[2], 8));
+            if (a[0] == 249) {
+                *v = 2288 + 256 * a[1] + a[2];
+            } else {
+                AVIF_CHECK(avifROStreamReadBits(stream, &a[3], 8));
+                if (a[0] == 250) {
+                    *v = (a[3] << 16) | (a[2] << 8) | a[1];
+                } else {
+                    // TODO(yguyon): Use values of a[0] in range [252-255] (avoid pessimization).
+                    AVIF_CHECK(avifROStreamReadBits(stream, &a[4], 8));
+                    *v = (a[4] << 24) | (a[3] << 16) | (a[2] << 8) | a[1];
+                }
+            }
+        }
+    }
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadString(avifROStream * stream, char * output, size_t outputSize)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+
+    // Check for the presence of a null terminator in the stream.
+    size_t remainingBytes = avifROStreamRemainingBytes(stream);
+    const uint8_t * p = avifROStreamCurrent(stream);
+    avifBool foundNullTerminator = AVIF_FALSE;
+    for (size_t i = 0; i < remainingBytes; ++i) {
+        if (p[i] == 0) {
+            foundNullTerminator = AVIF_TRUE;
+            break;
+        }
+    }
+    if (!foundNullTerminator) {
+        avifDiagnosticsPrintf(stream->diag, "%s: Failed to find a NULL terminator when reading a string", stream->diagContext);
+        return AVIF_FALSE;
+    }
+
+    const char * streamString = (const char *)p;
+    size_t stringLen = strlen(streamString);
+    stream->offset += stringLen + 1; // update the stream to have read the "whole string" in
+
+    if (output && outputSize) {
+        // clamp to our output buffer
+        if (stringLen >= outputSize) {
+            stringLen = outputSize - 1;
+        }
+        memcpy(output, streamString, stringLen);
+        output[stringLen] = 0;
+    }
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadBoxHeaderPartial(avifROStream * stream, avifBoxHeader * header)
+{
+    size_t startOffset = stream->offset;
+
+    uint32_t smallSize;
+    AVIF_CHECK(avifROStreamReadU32(stream, &smallSize));
+    AVIF_CHECK(avifROStreamRead(stream, header->type, 4));
+
+    uint64_t size = smallSize;
+    if (size == 1) {
+        AVIF_CHECK(avifROStreamReadU64(stream, &size));
+    }
+
+    if (!memcmp(header->type, "uuid", 4)) {
+        AVIF_CHECK(avifROStreamSkip(stream, 16));
+    }
+
+    size_t bytesRead = stream->offset - startOffset;
+    if ((size < bytesRead) || ((size - bytesRead) > SIZE_MAX)) {
+        avifDiagnosticsPrintf(stream->diag, "%s: Header size overflow check failure", stream->diagContext);
+        return AVIF_FALSE;
+    }
+    header->size = (size_t)(size - bytesRead);
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadBoxHeader(avifROStream * stream, avifBoxHeader * header)
+{
+    AVIF_CHECK(avifROStreamReadBoxHeaderPartial(stream, header));
+    if (header->size > avifROStreamRemainingBytes(stream)) {
+        avifDiagnosticsPrintf(stream->diag, "%s: Child box too large, possibly truncated data", stream->diagContext);
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadVersionAndFlags(avifROStream * stream, uint8_t * version, uint32_t * flags)
+{
+    uint8_t versionAndFlags[4];
+    AVIF_CHECK(avifROStreamRead(stream, versionAndFlags, 4));
+    if (version) {
+        *version = versionAndFlags[0];
+    }
+    if (flags) {
+        *flags = (versionAndFlags[1] << 16) + (versionAndFlags[2] << 8) + (versionAndFlags[3] << 0);
+    }
+    return AVIF_TRUE;
+}
+
+avifBool avifROStreamReadAndEnforceVersion(avifROStream * stream, uint8_t enforcedVersion)
+{
+    uint8_t version;
+    AVIF_CHECK(avifROStreamReadVersionAndFlags(stream, &version, NULL));
+    if (version != enforcedVersion) {
+        avifDiagnosticsPrintf(stream->diag, "%s: Expecting box version %u, got version %u", stream->diagContext, enforcedVersion, version);
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+// ---------------------------------------------------------------------------
+// avifRWStream
+
+#define AVIF_STREAM_BUFFER_INCREMENT (1024 * 1024)
+static avifResult makeRoom(avifRWStream * stream, size_t size)
+{
+    size_t neededSize = stream->offset + size;
+    size_t newSize = stream->raw->size;
+    while (newSize < neededSize) {
+        newSize += AVIF_STREAM_BUFFER_INCREMENT;
+    }
+    return avifRWDataRealloc(stream->raw, newSize);
+}
+
+void avifRWStreamStart(avifRWStream * stream, avifRWData * raw)
+{
+    stream->raw = raw;
+    stream->offset = 0;
+    stream->numUsedBitsInPartialByte = 0;
+}
+
+size_t avifRWStreamOffset(const avifRWStream * stream)
+{
+    return stream->offset;
+}
+
+void avifRWStreamSetOffset(avifRWStream * stream, size_t offset)
+{
+    stream->offset = offset;
+    if (stream->offset > stream->raw->size) {
+        stream->offset = stream->raw->size;
+    }
+}
+
+void avifRWStreamFinishWrite(avifRWStream * stream)
+{
+    if (stream->raw->size != stream->offset) {
+        if (stream->offset) {
+            stream->raw->size = stream->offset;
+        } else {
+            avifRWDataFree(stream->raw);
+        }
+    }
+}
+
+avifResult avifRWStreamWrite(avifRWStream * stream, const void * data, size_t size)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    if (size) {
+        AVIF_CHECKRES(makeRoom(stream, size));
+        memcpy(stream->raw->data + stream->offset, data, size);
+        stream->offset += size;
+    }
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRWStreamWriteChars(avifRWStream * stream, const char * chars, size_t size)
+{
+    return avifRWStreamWrite(stream, chars, size);
+}
+
+avifResult avifRWStreamWriteFullBox(avifRWStream * stream, const char * type, size_t contentSize, int version, uint32_t flags, avifBoxMarker * marker)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    if (marker) {
+        *marker = stream->offset;
+    }
+    size_t headerSize = sizeof(uint32_t) + 4 /* size of type */;
+    if (version != -1) {
+        headerSize += 4;
+    }
+
+    AVIF_CHECKRES(makeRoom(stream, headerSize));
+    memset(stream->raw->data + stream->offset, 0, headerSize);
+    uint32_t noSize = avifHTONL((uint32_t)(headerSize + contentSize));
+    memcpy(stream->raw->data + stream->offset, &noSize, sizeof(uint32_t));
+    memcpy(stream->raw->data + stream->offset + 4, type, 4);
+    if (version != -1) {
+        stream->raw->data[stream->offset + 8] = (uint8_t)version;
+        stream->raw->data[stream->offset + 9] = (uint8_t)((flags >> 16) & 0xff);
+        stream->raw->data[stream->offset + 10] = (uint8_t)((flags >> 8) & 0xff);
+        stream->raw->data[stream->offset + 11] = (uint8_t)((flags >> 0) & 0xff);
+    }
+    stream->offset += headerSize;
+
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRWStreamWriteBox(avifRWStream * stream, const char * type, size_t contentSize, avifBoxMarker * marker)
+{
+    return avifRWStreamWriteFullBox(stream, type, contentSize, -1, 0, marker);
+}
+
+void avifRWStreamFinishBox(avifRWStream * stream, avifBoxMarker marker)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    uint32_t noSize = avifHTONL((uint32_t)(stream->offset - marker));
+    memcpy(stream->raw->data + marker, &noSize, sizeof(uint32_t));
+}
+
+avifResult avifRWStreamWriteU8(avifRWStream * stream, uint8_t v)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    AVIF_CHECKRES(makeRoom(stream, 1));
+    stream->raw->data[stream->offset] = v;
+    stream->offset += 1;
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRWStreamWriteU16(avifRWStream * stream, uint16_t v)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    const size_t size = sizeof(uint16_t);
+    AVIF_CHECKRES(makeRoom(stream, size));
+    v = avifHTONS(v);
+    memcpy(stream->raw->data + stream->offset, &v, size);
+    stream->offset += size;
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRWStreamWriteU32(avifRWStream * stream, uint32_t v)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    const size_t size = sizeof(uint32_t);
+    AVIF_CHECKRES(makeRoom(stream, size));
+    v = avifHTONL(v);
+    memcpy(stream->raw->data + stream->offset, &v, size);
+    stream->offset += size;
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRWStreamWriteU64(avifRWStream * stream, uint64_t v)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    const size_t size = sizeof(uint64_t);
+    AVIF_CHECKRES(makeRoom(stream, size));
+    v = avifHTON64(v);
+    memcpy(stream->raw->data + stream->offset, &v, size);
+    stream->offset += size;
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRWStreamWriteZeros(avifRWStream * stream, size_t byteCount)
+{
+    assert(stream->numUsedBitsInPartialByte == 0); // Byte alignment is required.
+    AVIF_CHECKRES(makeRoom(stream, byteCount));
+    memset(stream->raw->data + stream->offset, 0, byteCount);
+    stream->offset += byteCount;
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifRWStreamWriteBits(avifRWStream * stream, uint32_t v, size_t bitCount)
+{
+    assert(((uint64_t)v >> bitCount) == 0); // (uint32_t >> 32 is undefined behavior)
+    while (bitCount) {
+        if (stream->numUsedBitsInPartialByte == 0) {
+            AVIF_CHECKRES(makeRoom(stream, 1)); // Book a new partial byte in the stream.
+            stream->raw->data[stream->offset] = 0;
+            stream->offset += 1;
+        }
+        assert(stream->offset > 0);
+        uint8_t * packedBits = stream->raw->data + stream->offset - 1;
+
+        const size_t numBits = AVIF_MIN(bitCount, 8 - stream->numUsedBitsInPartialByte);
+        stream->numUsedBitsInPartialByte += numBits;
+        bitCount -= numBits;
+        // Order the input bits from the most significant bit to the least significant bit.
+        // In the case where avifRWStreamWriteBits() is used to write the unsigned integer value v
+        // over multiple aligned bytes, this order corresponds to big endianness.
+        const uint32_t bits = (v >> bitCount) & ((1 << numBits) - 1);
+        // Pack bits starting with the most significant bit of the first output byte.
+        // This way, packed bits can be found in the same order in the bit stream.
+        *packedBits |= bits << (8 - stream->numUsedBitsInPartialByte);
+
+        if (stream->numUsedBitsInPartialByte == 8) {
+            // Start a new partial byte the next time a bit is needed.
+            stream->numUsedBitsInPartialByte = 0;
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+// Based on https://sqlite.org/src4/doc/trunk/www/varint.wiki.
+avifResult avifRWStreamWriteVarInt(avifRWStream * stream, uint32_t v)
+{
+    if (v <= 240) {
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, v, 8));
+    } else if (v <= 2287) {
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v - 240) / 256 + 241, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v - 240) % 256, 8));
+    } else if (v <= 67823) {
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, 249, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v - 2288) / 256, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v - 2288) % 256, 8));
+    } else if (v <= 16777215) {
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, 250, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v >> 0) & 0xff, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v >> 8) & 0xff, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v >> 16) & 0xff, 8));
+    } else {
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, 251, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v >> 0) & 0xff, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v >> 8) & 0xff, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v >> 16) & 0xff, 8));
+        AVIF_CHECKRES(avifRWStreamWriteBits(stream, (v >> 24) & 0xff, 8));
+    }
+    return AVIF_RESULT_OK;
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/utils.c b/pxr/imaging/plugin/hioAvif/AVIF/src/utils.c
new file mode 100644
index 0000000000..c279d84aca
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/utils.c
@@ -0,0 +1,288 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <assert.h>
+#include <math.h>
+#include <string.h>
+
+float avifRoundf(float v)
+{
+    return floorf(v + 0.5f);
+}
+
+// Thanks, Rob Pike! https://commandcenter.blogspot.nl/2012/04/byte-order-fallacy.html
+
+uint16_t avifHTONS(uint16_t s)
+{
+    uint16_t result;
+    uint8_t * data = (uint8_t *)&result;
+    data[0] = (s >> 8) & 0xff;
+    data[1] = (s >> 0) & 0xff;
+    return result;
+}
+
+uint16_t avifNTOHS(uint16_t s)
+{
+    const uint8_t * data = (const uint8_t *)&s;
+    return (uint16_t)((data[1] << 0) | (data[0] << 8));
+}
+
+uint16_t avifCTOHS(uint16_t s)
+{
+    const uint8_t * data = (const uint8_t *)&s;
+    return (uint16_t)((data[0] << 0) | (data[1] << 8));
+}
+
+uint32_t avifHTONL(uint32_t l)
+{
+    uint32_t result;
+    uint8_t * data = (uint8_t *)&result;
+    data[0] = (l >> 24) & 0xff;
+    data[1] = (l >> 16) & 0xff;
+    data[2] = (l >> 8) & 0xff;
+    data[3] = (l >> 0) & 0xff;
+    return result;
+}
+
+uint32_t avifNTOHL(uint32_t l)
+{
+    const uint8_t * data = (const uint8_t *)&l;
+    return ((uint32_t)data[3] << 0) | ((uint32_t)data[2] << 8) | ((uint32_t)data[1] << 16) | ((uint32_t)data[0] << 24);
+}
+
+uint32_t avifCTOHL(uint32_t l)
+{
+    const uint8_t * data = (const uint8_t *)&l;
+    return ((uint32_t)data[0] << 0) | ((uint32_t)data[1] << 8) | ((uint32_t)data[2] << 16) | ((uint32_t)data[3] << 24);
+}
+
+uint64_t avifHTON64(uint64_t l)
+{
+    uint64_t result;
+    uint8_t * data = (uint8_t *)&result;
+    data[0] = (l >> 56) & 0xff;
+    data[1] = (l >> 48) & 0xff;
+    data[2] = (l >> 40) & 0xff;
+    data[3] = (l >> 32) & 0xff;
+    data[4] = (l >> 24) & 0xff;
+    data[5] = (l >> 16) & 0xff;
+    data[6] = (l >> 8) & 0xff;
+    data[7] = (l >> 0) & 0xff;
+    return result;
+}
+
+uint64_t avifNTOH64(uint64_t l)
+{
+    const uint8_t * data = (const uint8_t *)&l;
+    return ((uint64_t)data[7] << 0) | ((uint64_t)data[6] << 8) | ((uint64_t)data[5] << 16) | ((uint64_t)data[4] << 24) |
+           ((uint64_t)data[3] << 32) | ((uint64_t)data[2] << 40) | ((uint64_t)data[1] << 48) | ((uint64_t)data[0] << 56);
+}
+
+AVIF_ARRAY_DECLARE(avifArrayInternal, uint8_t, ptr);
+
+// On error, this function must set arr->ptr to NULL and both arr->count and arr->capacity to 0.
+avifBool avifArrayCreate(void * arrayStruct, uint32_t elementSize, uint32_t initialCapacity)
+{
+    avifArrayInternal * arr = (avifArrayInternal *)arrayStruct;
+    arr->elementSize = elementSize ? elementSize : 1;
+    arr->count = 0;
+    arr->capacity = initialCapacity;
+    size_t byteCount = (size_t)arr->elementSize * arr->capacity;
+    arr->ptr = (uint8_t *)avifAlloc(byteCount);
+    if (!arr->ptr) {
+        arr->capacity = 0;
+        return AVIF_FALSE;
+    }
+    memset(arr->ptr, 0, byteCount);
+    return AVIF_TRUE;
+}
+
+void * avifArrayPush(void * arrayStruct)
+{
+    avifArrayInternal * arr = (avifArrayInternal *)arrayStruct;
+    if (arr->count == arr->capacity) {
+        uint8_t * oldPtr = arr->ptr;
+        size_t oldByteCount = (size_t)arr->elementSize * arr->capacity;
+        arr->ptr = (uint8_t *)avifAlloc(oldByteCount * 2);
+        if (arr->ptr == NULL) {
+            return NULL;
+        }
+        memset(arr->ptr + oldByteCount, 0, oldByteCount);
+        memcpy(arr->ptr, oldPtr, oldByteCount);
+        arr->capacity *= 2;
+        avifFree(oldPtr);
+    }
+    ++arr->count;
+    return &arr->ptr[(arr->count - 1) * (size_t)arr->elementSize];
+}
+
+void avifArrayPop(void * arrayStruct)
+{
+    avifArrayInternal * arr = (avifArrayInternal *)arrayStruct;
+    assert(arr->count > 0);
+    --arr->count;
+    memset(&arr->ptr[arr->count * (size_t)arr->elementSize], 0, arr->elementSize);
+}
+
+void avifArrayDestroy(void * arrayStruct)
+{
+    avifArrayInternal * arr = (avifArrayInternal *)arrayStruct;
+    if (arr->ptr) {
+        avifFree(arr->ptr);
+        arr->ptr = NULL;
+    }
+    memset(arr, 0, sizeof(avifArrayInternal));
+}
+
+// |a| and |b| hold int32_t values. The int64_t type is used so that we can negate INT32_MIN without
+// overflowing int32_t.
+static int64_t calcGCD(int64_t a, int64_t b)
+{
+    if (a < 0) {
+        a *= -1;
+    }
+    if (b < 0) {
+        b *= -1;
+    }
+    while (b != 0) {
+        int64_t r = a % b;
+        a = b;
+        b = r;
+    }
+    return a;
+}
+
+void avifFractionSimplify(avifFraction * f)
+{
+    int64_t gcd = calcGCD(f->n, f->d);
+    if (gcd > 1) {
+        f->n = (int32_t)(f->n / gcd);
+        f->d = (int32_t)(f->d / gcd);
+    }
+}
+
+static avifBool overflowsInt32(int64_t x)
+{
+    return (x < INT32_MIN) || (x > INT32_MAX);
+}
+
+avifBool avifFractionCD(avifFraction * a, avifFraction * b)
+{
+    avifFractionSimplify(a);
+    avifFractionSimplify(b);
+    if (a->d != b->d) {
+        const int64_t ad = a->d;
+        const int64_t bd = b->d;
+        const int64_t anNew = a->n * bd;
+        const int64_t adNew = a->d * bd;
+        const int64_t bnNew = b->n * ad;
+        const int64_t bdNew = b->d * ad;
+        if (overflowsInt32(anNew) || overflowsInt32(adNew) || overflowsInt32(bnNew) || overflowsInt32(bdNew)) {
+            return AVIF_FALSE;
+        }
+        a->n = (int32_t)anNew;
+        a->d = (int32_t)adNew;
+        b->n = (int32_t)bnNew;
+        b->d = (int32_t)bdNew;
+    }
+    return AVIF_TRUE;
+}
+
+avifBool avifFractionAdd(avifFraction a, avifFraction b, avifFraction * result)
+{
+    if (!avifFractionCD(&a, &b)) {
+        return AVIF_FALSE;
+    }
+
+    const int64_t resultN = (int64_t)a.n + b.n;
+    if (overflowsInt32(resultN)) {
+        return AVIF_FALSE;
+    }
+    result->n = (int32_t)resultN;
+    result->d = a.d;
+
+    avifFractionSimplify(result);
+    return AVIF_TRUE;
+}
+
+avifBool avifFractionSub(avifFraction a, avifFraction b, avifFraction * result)
+{
+    if (!avifFractionCD(&a, &b)) {
+        return AVIF_FALSE;
+    }
+
+    const int64_t resultN = (int64_t)a.n - b.n;
+    if (overflowsInt32(resultN)) {
+        return AVIF_FALSE;
+    }
+    result->n = (int32_t)resultN;
+    result->d = a.d;
+
+    avifFractionSimplify(result);
+    return AVIF_TRUE;
+}
+
+static avifBool avifDoubleToUnsignedFractionImpl(double v, uint32_t maxNumerator, uint32_t * numerator, uint32_t * denominator)
+{
+    if (isnan(v) || v < 0 || v > maxNumerator) {
+        return AVIF_FALSE;
+    }
+
+    // Maximum denominator: makes sure that the numerator is <= maxNumerator and the denominator is <= UINT32_MAX.
+    const uint64_t maxD = (v <= 1) ? UINT32_MAX : (uint64_t)floor(maxNumerator / v);
+
+    // Find the best approximation of v as a fraction using continued fractions, see
+    // https://en.wikipedia.org/wiki/Continued_fraction
+    *denominator = 1;
+    uint32_t previousD = 0;
+    double currentV = v - floor(v);
+    int iter = 0;
+    // Set a maximum number of iterations to be safe. Most numbers should
+    // converge in less than ~20 iterations.
+    // The golden ratio is the worst case and takes 39 iterations.
+    const int maxIter = 39;
+    while (iter < maxIter) {
+        const double numeratorDouble = (double)(*denominator) * v;
+        assert(numeratorDouble <= maxNumerator);
+        *numerator = (uint32_t)round(numeratorDouble);
+        if (fabs(numeratorDouble - (*numerator)) == 0.0) {
+            return AVIF_TRUE;
+        }
+        currentV = 1.0 / currentV;
+        const double newD = previousD + floor(currentV) * (*denominator);
+        if (newD > maxD) {
+            // This is the best we can do with a denominator <= max_d.
+            return AVIF_TRUE;
+        }
+        previousD = *denominator;
+        assert(newD <= UINT32_MAX);
+        *denominator = (uint32_t)newD;
+        currentV -= floor(currentV);
+        ++iter;
+    }
+    // Maximum number of iterations reached, return what we've found.
+    // For max_iter >= 39 we shouldn't get here. max_iter can be set
+    // to a lower value to speed up the algorithm if needed.
+    *numerator = (uint32_t)round((double)(*denominator) * v);
+    return AVIF_TRUE;
+}
+
+avifBool avifDoubleToSignedFraction(double v, int32_t * numerator, uint32_t * denominator)
+{
+    uint32_t positive_numerator;
+    if (!avifDoubleToUnsignedFractionImpl(fabs(v), INT32_MAX, &positive_numerator, denominator)) {
+        return AVIF_FALSE;
+    }
+    *numerator = (int32_t)positive_numerator;
+    if (v < 0) {
+        *numerator *= -1;
+    }
+    return AVIF_TRUE;
+}
+
+avifBool avifDoubleToUnsignedFraction(double v, uint32_t * numerator, uint32_t * denominator)
+{
+    return avifDoubleToUnsignedFractionImpl(v, UINT32_MAX, numerator, denominator);
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIF/src/write.c b/pxr/imaging/plugin/hioAvif/AVIF/src/write.c
new file mode 100644
index 0000000000..316520eb23
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIF/src/write.c
@@ -0,0 +1,3026 @@
+// Copyright 2019 Joe Drago. All rights reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/internal.h"
+
+#include <assert.h>
+#include <string.h>
+#include <time.h>
+
+#define MAX_ASSOCIATIONS 16
+struct ipmaArray
+{
+    uint8_t associations[MAX_ASSOCIATIONS];
+    avifBool essential[MAX_ASSOCIATIONS];
+    uint8_t count;
+};
+
+// Used to store offsets in meta boxes which need to point at mdat offsets that
+// aren't known yet. When an item's mdat payload is written, all registered fixups
+// will have this now-known offset "fixed up".
+typedef struct avifOffsetFixup
+{
+    size_t offset;
+} avifOffsetFixup;
+AVIF_ARRAY_DECLARE(avifOffsetFixupArray, avifOffsetFixup, fixup);
+
+static const char alphaURN[] = AVIF_URN_ALPHA0;
+static const size_t alphaURNSize = sizeof(alphaURN);
+
+static const char xmpContentType[] = AVIF_CONTENT_TYPE_XMP;
+static const size_t xmpContentTypeSize = sizeof(xmpContentType);
+
+static avifResult writeCodecConfig(avifRWStream * s, const avifCodecConfigurationBox * cfg);
+static avifResult writeConfigBox(avifRWStream * s, const avifCodecConfigurationBox * cfg, const char * configPropName);
+
+// ---------------------------------------------------------------------------
+// avifSetTileConfiguration
+
+static int floorLog2(uint32_t n)
+{
+    assert(n > 0);
+    int count = 0;
+    while (n != 0) {
+        ++count;
+        n >>= 1;
+    }
+    return count - 1;
+}
+
+// Splits tilesLog2 into *tileDim1Log2 and *tileDim2Log2, considering the ratio of dim1 to dim2.
+//
+// Precondition:
+//     dim1 >= dim2
+// Postcondition:
+//     tilesLog2 == *tileDim1Log2 + *tileDim2Log2
+//     *tileDim1Log2 >= *tileDim2Log2
+static void splitTilesLog2(uint32_t dim1, uint32_t dim2, int tilesLog2, int * tileDim1Log2, int * tileDim2Log2)
+{
+    assert(dim1 >= dim2);
+    uint32_t ratio = dim1 / dim2;
+    int diffLog2 = floorLog2(ratio);
+    int subtract = tilesLog2 - diffLog2;
+    if (subtract < 0) {
+        subtract = 0;
+    }
+    *tileDim2Log2 = subtract / 2;
+    *tileDim1Log2 = tilesLog2 - *tileDim2Log2;
+    assert(*tileDim1Log2 >= *tileDim2Log2);
+}
+
+// Set the tile configuration: the number of tiles and the tile size.
+//
+// Tiles improve encoding and decoding speeds when multiple threads are available. However, for
+// image coding, the total tile boundary length affects the compression efficiency because intra
+// prediction can't go across tile boundaries. So the more tiles there are in an image, the worse
+// the compression ratio is. For a given number of tiles, making the tile size close to a square
+// tends to reduce the total tile boundary length inside the image. Use more tiles along the longer
+// dimension of the image to make the tile size closer to a square.
+void avifSetTileConfiguration(int threads, uint32_t width, uint32_t height, int * tileRowsLog2, int * tileColsLog2)
+{
+    *tileRowsLog2 = 0;
+    *tileColsLog2 = 0;
+    if (threads > 1) {
+        // Avoid small tiles because they are particularly bad for image coding.
+        //
+        // Use no more tiles than the number of threads. Aim for one tile per thread. Using more
+        // than one thread inside one tile could be less efficient. Using more tiles than the
+        // number of threads would result in a compression penalty without much benefit.
+        const uint32_t kMinTileArea = 512 * 512;
+        const uint32_t kMaxTiles = 32;
+        uint32_t imageArea = width * height;
+        uint32_t tiles = (imageArea + kMinTileArea - 1) / kMinTileArea;
+        if (tiles > kMaxTiles) {
+            tiles = kMaxTiles;
+        }
+        if (tiles > (uint32_t)threads) {
+            tiles = threads;
+        }
+        int tilesLog2 = floorLog2(tiles);
+        // If the image's width is greater than the height, use more tile columns than tile rows.
+        if (width >= height) {
+            splitTilesLog2(width, height, tilesLog2, tileColsLog2, tileRowsLog2);
+        } else {
+            splitTilesLog2(height, width, tilesLog2, tileRowsLog2, tileColsLog2);
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// avifCodecEncodeOutput
+
+avifCodecEncodeOutput * avifCodecEncodeOutputCreate(void)
+{
+    avifCodecEncodeOutput * encodeOutput = (avifCodecEncodeOutput *)avifAlloc(sizeof(avifCodecEncodeOutput));
+    if (encodeOutput == NULL) {
+        return NULL;
+    }
+    memset(encodeOutput, 0, sizeof(avifCodecEncodeOutput));
+    if (!avifArrayCreate(&encodeOutput->samples, sizeof(avifEncodeSample), 1)) {
+        avifCodecEncodeOutputDestroy(encodeOutput);
+        return NULL;
+    }
+    return encodeOutput;
+}
+
+avifResult avifCodecEncodeOutputAddSample(avifCodecEncodeOutput * encodeOutput, const uint8_t * data, size_t len, avifBool sync)
+{
+    avifEncodeSample * sample = (avifEncodeSample *)avifArrayPush(&encodeOutput->samples);
+    AVIF_CHECKERR(sample, AVIF_RESULT_OUT_OF_MEMORY);
+    const avifResult result = avifRWDataSet(&sample->data, data, len);
+    if (result != AVIF_RESULT_OK) {
+        avifArrayPop(&encodeOutput->samples);
+        return result;
+    }
+    sample->sync = sync;
+    return AVIF_RESULT_OK;
+}
+
+void avifCodecEncodeOutputDestroy(avifCodecEncodeOutput * encodeOutput)
+{
+    for (uint32_t sampleIndex = 0; sampleIndex < encodeOutput->samples.count; ++sampleIndex) {
+        avifRWDataFree(&encodeOutput->samples.sample[sampleIndex].data);
+    }
+    avifArrayDestroy(&encodeOutput->samples);
+    avifFree(encodeOutput);
+}
+
+// ---------------------------------------------------------------------------
+// avifEncoderItem
+
+// one "item" worth for encoder
+typedef struct avifEncoderItem
+{
+    uint16_t id;
+    uint8_t type[4];                      // 4-character 'item_type' field in the 'infe' (item info entry) box
+    avifCodec * codec;                    // only present on image items
+    avifCodecEncodeOutput * encodeOutput; // AV1 sample data
+    avifRWData metadataPayload;           // Exif/XMP data
+    avifCodecConfigurationBox av1C;       // Harvested in avifEncoderFinish(), if encodeOutput has samples
+                                          // TODO(yguyon): Rename or add av2C
+    uint32_t cellIndex;                   // Which row-major cell index corresponds to this item. only present on image items
+    avifItemCategory itemCategory;        // Category of item being encoded
+    avifBool hiddenImage;                 // A hidden image item has (flags & 1) equal to 1 in its ItemInfoEntry.
+
+    const char * infeName;
+    size_t infeNameSize;
+    const char * infeContentType;
+    size_t infeContentTypeSize;
+    avifOffsetFixupArray mdatFixups;
+
+    uint16_t irefToID; // if non-zero, make an iref from this id -> irefToID
+    const char * irefType;
+
+    uint32_t gridCols; // if non-zero (legal range [1-256]), this is a grid item
+    uint32_t gridRows; // if non-zero (legal range [1-256]), this is a grid item
+
+    // the reconstructed image of a grid item will be trimmed to these dimensions (only present on grid items)
+    uint32_t gridWidth;
+    uint32_t gridHeight;
+
+    uint32_t extraLayerCount; // if non-zero (legal range [1-(AVIF_MAX_AV1_LAYER_COUNT-1)]), this is a layered AV1 image
+
+    uint16_t dimgFromID; // if non-zero, make an iref from dimgFromID -> this id
+
+    struct ipmaArray ipma;
+} avifEncoderItem;
+AVIF_ARRAY_DECLARE(avifEncoderItemArray, avifEncoderItem, item);
+
+// ---------------------------------------------------------------------------
+// avifEncoderItemReference
+
+// pointer to one "item" interested in
+typedef avifEncoderItem * avifEncoderItemReference;
+AVIF_ARRAY_DECLARE(avifEncoderItemReferenceArray, avifEncoderItemReference, ref);
+
+// ---------------------------------------------------------------------------
+// avifEncoderFrame
+
+typedef struct avifEncoderFrame
+{
+    uint64_t durationInTimescales;
+} avifEncoderFrame;
+AVIF_ARRAY_DECLARE(avifEncoderFrameArray, avifEncoderFrame, frame);
+
+// ---------------------------------------------------------------------------
+// avifEncoderData
+
+AVIF_ARRAY_DECLARE(avifEncoderItemIdArray, uint16_t, item_id);
+
+typedef struct avifEncoderData
+{
+    avifEncoderItemArray items;
+    avifEncoderFrameArray frames;
+    // Map the encoder settings quality and qualityAlpha to quantizer and quantizerAlpha
+    int quantizer;
+    int quantizerAlpha;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    int quantizerGainMap;
+#endif
+    // tileRowsLog2 and tileColsLog2 are the actual tiling values after automatic tiling is handled
+    int tileRowsLog2;
+    int tileColsLog2;
+    avifEncoder lastEncoder;
+    // lastQuantizer and lastQuantizerAlpha are the quantizer and quantizerAlpha values used last
+    // time
+    int lastQuantizer;
+    int lastQuantizerAlpha;
+    // lastTileRowsLog2 and lastTileColsLog2 are the actual tiling values used last time
+    int lastTileRowsLog2;
+    int lastTileColsLog2;
+    avifImage * imageMetadata;
+    uint16_t lastItemID;
+    uint16_t primaryItemID;
+    avifEncoderItemIdArray alternativeItemIDs; // list of item ids for an 'altr' box (group of alternatives to each other)
+    avifBool singleImage; // if true, the AVIF_ADD_IMAGE_FLAG_SINGLE flag was set on the first call to avifEncoderAddImage()
+    avifBool alphaPresent;
+    size_t gainMapSizeBytes;
+    // Fields specific to AV1/AV2
+    const char * imageItemType;  // "av01" for AV1 ("av02" for AV2 if AVIF_CODEC_AVM)
+    const char * configPropName; // "av1C" for AV1 ("av2C" for AV2 if AVIF_CODEC_AVM)
+} avifEncoderData;
+
+static void avifEncoderDataDestroy(avifEncoderData * data);
+
+// Returns NULL if a memory allocation failed.
+static avifEncoderData * avifEncoderDataCreate()
+{
+    avifEncoderData * data = (avifEncoderData *)avifAlloc(sizeof(avifEncoderData));
+    if (!data) {
+        return NULL;
+    }
+    memset(data, 0, sizeof(avifEncoderData));
+    data->imageMetadata = avifImageCreateEmpty();
+    if (!data->imageMetadata) {
+        goto error;
+    }
+    if (!avifArrayCreate(&data->items, sizeof(avifEncoderItem), 8)) {
+        goto error;
+    }
+    if (!avifArrayCreate(&data->frames, sizeof(avifEncoderFrame), 1)) {
+        goto error;
+    }
+    if (!avifArrayCreate(&data->alternativeItemIDs, sizeof(uint16_t), 1)) {
+        goto error;
+    }
+    return data;
+
+error:
+    avifEncoderDataDestroy(data);
+    return NULL;
+}
+
+static avifEncoderItem * avifEncoderDataCreateItem(avifEncoderData * data, const char * type, const char * infeName, size_t infeNameSize, uint32_t cellIndex)
+{
+    avifEncoderItem * item = (avifEncoderItem *)avifArrayPush(&data->items);
+    if (item == NULL) {
+        return NULL;
+    }
+    ++data->lastItemID;
+    item->id = data->lastItemID;
+    memcpy(item->type, type, sizeof(item->type));
+    item->infeName = infeName;
+    item->infeNameSize = infeNameSize;
+    item->encodeOutput = avifCodecEncodeOutputCreate();
+    if (item->encodeOutput == NULL) {
+        goto error;
+    }
+    item->cellIndex = cellIndex;
+    if (!avifArrayCreate(&item->mdatFixups, sizeof(avifOffsetFixup), 4)) {
+        goto error;
+    }
+    return item;
+
+error:
+    if (item->encodeOutput != NULL) {
+        avifCodecEncodeOutputDestroy(item->encodeOutput);
+    }
+    --data->lastItemID;
+    avifArrayPop(&data->items);
+    return NULL;
+}
+
+static avifEncoderItem * avifEncoderDataFindItemByID(avifEncoderData * data, uint16_t id)
+{
+    for (uint32_t itemIndex = 0; itemIndex < data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &data->items.item[itemIndex];
+        if (item->id == id) {
+            return item;
+        }
+    }
+    return NULL;
+}
+
+static void avifEncoderDataDestroy(avifEncoderData * data)
+{
+    for (uint32_t i = 0; i < data->items.count; ++i) {
+        avifEncoderItem * item = &data->items.item[i];
+        if (item->codec) {
+            avifCodecDestroy(item->codec);
+        }
+        avifCodecEncodeOutputDestroy(item->encodeOutput);
+        avifRWDataFree(&item->metadataPayload);
+        avifArrayDestroy(&item->mdatFixups);
+    }
+    if (data->imageMetadata) {
+        avifImageDestroy(data->imageMetadata);
+    }
+    avifArrayDestroy(&data->items);
+    avifArrayDestroy(&data->frames);
+    avifArrayDestroy(&data->alternativeItemIDs);
+    avifFree(data);
+}
+
+static avifResult avifEncoderItemAddMdatFixup(avifEncoderItem * item, const avifRWStream * s)
+{
+    avifOffsetFixup * fixup = (avifOffsetFixup *)avifArrayPush(&item->mdatFixups);
+    AVIF_CHECKERR(fixup != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+    fixup->offset = avifRWStreamOffset(s);
+    return AVIF_RESULT_OK;
+}
+
+// ---------------------------------------------------------------------------
+// avifItemPropertyDedup - Provides ipco deduplication
+
+typedef struct avifItemProperty
+{
+    uint8_t index;
+    size_t offset;
+    size_t size;
+} avifItemProperty;
+AVIF_ARRAY_DECLARE(avifItemPropertyArray, avifItemProperty, property);
+
+typedef struct avifItemPropertyDedup
+{
+    avifItemPropertyArray properties;
+    avifRWStream s;    // Temporary stream for each new property, checked against already-written boxes for deduplications
+    avifRWData buffer; // Temporary storage for 's'
+    uint8_t nextIndex; // 1-indexed, incremented every time another unique property is finished
+} avifItemPropertyDedup;
+
+static avifItemPropertyDedup * avifItemPropertyDedupCreate(void)
+{
+    avifItemPropertyDedup * dedup = (avifItemPropertyDedup *)avifAlloc(sizeof(avifItemPropertyDedup));
+    if (dedup == NULL) {
+        return NULL;
+    }
+    memset(dedup, 0, sizeof(avifItemPropertyDedup));
+    if (!avifArrayCreate(&dedup->properties, sizeof(avifItemProperty), 8)) {
+        avifFree(dedup);
+        return NULL;
+    }
+    if (avifRWDataRealloc(&dedup->buffer, 2048) != AVIF_RESULT_OK) {
+        avifArrayDestroy(&dedup->properties);
+        avifFree(dedup);
+        return NULL;
+    }
+    return dedup;
+}
+
+static void avifItemPropertyDedupDestroy(avifItemPropertyDedup * dedup)
+{
+    avifArrayDestroy(&dedup->properties);
+    avifRWDataFree(&dedup->buffer);
+    avifFree(dedup);
+}
+
+// Resets the dedup's temporary write stream in preparation for a single item property's worth of writing
+static void avifItemPropertyDedupStart(avifItemPropertyDedup * dedup)
+{
+    avifRWStreamStart(&dedup->s, &dedup->buffer);
+}
+
+// This compares the newly written item property (in the dedup's temporary storage buffer) to
+// already-written properties (whose offsets/sizes in outputStream are recorded in the dedup). If a
+// match is found, the previous property's index is used. If this new property is unique, it is
+// assigned the next available property index, written to the output stream, and its offset/size in
+// the output stream is recorded in the dedup for future comparisons.
+//
+// On success, this function adds to the given ipma box a property association linking the reused
+// or newly created property with the item.
+static avifResult avifItemPropertyDedupFinish(avifItemPropertyDedup * dedup, avifRWStream * outputStream, struct ipmaArray * ipma, avifBool essential)
+{
+    uint8_t propertyIndex = 0;
+    const size_t newPropertySize = avifRWStreamOffset(&dedup->s);
+
+    for (size_t i = 0; i < dedup->properties.count; ++i) {
+        avifItemProperty * property = &dedup->properties.property[i];
+        if ((property->size == newPropertySize) &&
+            !memcmp(&outputStream->raw->data[property->offset], dedup->buffer.data, newPropertySize)) {
+            // We've already written this exact property, reuse it
+            propertyIndex = property->index;
+            assert(propertyIndex != 0);
+            break;
+        }
+    }
+
+    if (propertyIndex == 0) {
+        // Write a new property, and remember its location in the output stream for future deduplication
+        avifItemProperty * property = (avifItemProperty *)avifArrayPush(&dedup->properties);
+        AVIF_CHECKERR(property != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+        property->index = ++dedup->nextIndex; // preincrement so the first new index is 1 (as ipma is 1-indexed)
+        property->size = newPropertySize;
+        property->offset = avifRWStreamOffset(outputStream);
+        AVIF_CHECKRES(avifRWStreamWrite(outputStream, dedup->buffer.data, newPropertySize));
+        propertyIndex = property->index;
+    }
+
+    AVIF_CHECKERR(ipma->count < MAX_ASSOCIATIONS, AVIF_RESULT_UNKNOWN_ERROR);
+    ipma->associations[ipma->count] = propertyIndex;
+    ipma->essential[ipma->count] = essential;
+    ++ipma->count;
+    return AVIF_RESULT_OK;
+}
+
+// ---------------------------------------------------------------------------
+
+static const avifScalingMode noScaling = { { 1, 1 }, { 1, 1 } };
+
+avifEncoder * avifEncoderCreate(void)
+{
+    avifEncoder * encoder = (avifEncoder *)avifAlloc(sizeof(avifEncoder));
+    if (!encoder) {
+        return NULL;
+    }
+    memset(encoder, 0, sizeof(avifEncoder));
+    encoder->codecChoice = AVIF_CODEC_CHOICE_AUTO;
+    encoder->maxThreads = 1;
+    encoder->speed = AVIF_SPEED_DEFAULT;
+    encoder->keyframeInterval = 0;
+    encoder->timescale = 1;
+    encoder->repetitionCount = AVIF_REPETITION_COUNT_INFINITE;
+    encoder->quality = AVIF_QUALITY_DEFAULT;
+    encoder->qualityAlpha = AVIF_QUALITY_DEFAULT;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    encoder->qualityGainMap = AVIF_QUALITY_DEFAULT;
+#endif
+    encoder->minQuantizer = AVIF_QUANTIZER_BEST_QUALITY;
+    encoder->maxQuantizer = AVIF_QUANTIZER_WORST_QUALITY;
+    encoder->minQuantizerAlpha = AVIF_QUANTIZER_BEST_QUALITY;
+    encoder->maxQuantizerAlpha = AVIF_QUANTIZER_WORST_QUALITY;
+    encoder->tileRowsLog2 = 0;
+    encoder->tileColsLog2 = 0;
+    encoder->autoTiling = AVIF_FALSE;
+    encoder->scalingMode = noScaling;
+    encoder->data = avifEncoderDataCreate();
+    encoder->csOptions = avifCodecSpecificOptionsCreate();
+    if (!encoder->data || !encoder->csOptions) {
+        avifEncoderDestroy(encoder);
+        return NULL;
+    }
+    encoder->headerFormat = AVIF_HEADER_FULL;
+    return encoder;
+}
+
+void avifEncoderDestroy(avifEncoder * encoder)
+{
+    if (encoder->csOptions) {
+        avifCodecSpecificOptionsDestroy(encoder->csOptions);
+    }
+    if (encoder->data) {
+        avifEncoderDataDestroy(encoder->data);
+    }
+    avifFree(encoder);
+}
+
+avifResult avifEncoderSetCodecSpecificOption(avifEncoder * encoder, const char * key, const char * value)
+{
+    return avifCodecSpecificOptionsSet(encoder->csOptions, key, value);
+}
+
+static void avifEncoderBackupSettings(avifEncoder * encoder)
+{
+    avifEncoder * lastEncoder = &encoder->data->lastEncoder;
+
+    // lastEncoder->data is only used to mark that lastEncoder is initialized. lastEncoder->data
+    // must not be dereferenced.
+    lastEncoder->data = encoder->data;
+    lastEncoder->codecChoice = encoder->codecChoice;
+    lastEncoder->maxThreads = encoder->maxThreads;
+    lastEncoder->speed = encoder->speed;
+    lastEncoder->keyframeInterval = encoder->keyframeInterval;
+    lastEncoder->timescale = encoder->timescale;
+    lastEncoder->repetitionCount = encoder->repetitionCount;
+    lastEncoder->extraLayerCount = encoder->extraLayerCount;
+    lastEncoder->minQuantizer = encoder->minQuantizer;
+    lastEncoder->maxQuantizer = encoder->maxQuantizer;
+    lastEncoder->minQuantizerAlpha = encoder->minQuantizerAlpha;
+    lastEncoder->maxQuantizerAlpha = encoder->maxQuantizerAlpha;
+    encoder->data->lastQuantizer = encoder->data->quantizer;
+    encoder->data->lastQuantizerAlpha = encoder->data->quantizerAlpha;
+    encoder->data->lastTileRowsLog2 = encoder->data->tileRowsLog2;
+    encoder->data->lastTileColsLog2 = encoder->data->tileColsLog2;
+    lastEncoder->scalingMode = encoder->scalingMode;
+}
+
+// This function detects changes made on avifEncoder. It returns true on success (i.e., if every
+// change is valid), or false on failure (i.e., if any setting that can't change was changed). It
+// reports a bitwise-OR of detected changes in encoderChanges.
+static avifBool avifEncoderDetectChanges(const avifEncoder * encoder, avifEncoderChanges * encoderChanges)
+{
+    const avifEncoder * lastEncoder = &encoder->data->lastEncoder;
+    *encoderChanges = 0;
+
+    if (!lastEncoder->data) {
+        // lastEncoder is not initialized.
+        return AVIF_TRUE;
+    }
+
+    if ((lastEncoder->codecChoice != encoder->codecChoice) || (lastEncoder->maxThreads != encoder->maxThreads) ||
+        (lastEncoder->speed != encoder->speed) || (lastEncoder->keyframeInterval != encoder->keyframeInterval) ||
+        (lastEncoder->timescale != encoder->timescale) || (lastEncoder->repetitionCount != encoder->repetitionCount) ||
+        (lastEncoder->extraLayerCount != encoder->extraLayerCount)) {
+        return AVIF_FALSE;
+    }
+
+    if (encoder->data->lastQuantizer != encoder->data->quantizer) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_QUANTIZER;
+    }
+    if (encoder->data->lastQuantizerAlpha != encoder->data->quantizerAlpha) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_QUANTIZER_ALPHA;
+    }
+    if (lastEncoder->minQuantizer != encoder->minQuantizer) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_MIN_QUANTIZER;
+    }
+    if (lastEncoder->maxQuantizer != encoder->maxQuantizer) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_MAX_QUANTIZER;
+    }
+    if (lastEncoder->minQuantizerAlpha != encoder->minQuantizerAlpha) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_MIN_QUANTIZER_ALPHA;
+    }
+    if (lastEncoder->maxQuantizerAlpha != encoder->maxQuantizerAlpha) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_MAX_QUANTIZER_ALPHA;
+    }
+    if (encoder->data->lastTileRowsLog2 != encoder->data->tileRowsLog2) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_TILE_ROWS_LOG2;
+    }
+    if (encoder->data->lastTileColsLog2 != encoder->data->tileColsLog2) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_TILE_COLS_LOG2;
+    }
+    if (memcmp(&lastEncoder->scalingMode, &encoder->scalingMode, sizeof(avifScalingMode)) != 0) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_SCALING_MODE;
+    }
+    if (encoder->csOptions->count > 0) {
+        *encoderChanges |= AVIF_ENCODER_CHANGE_CODEC_SPECIFIC;
+    }
+
+    return AVIF_TRUE;
+}
+
+// Same as 'avifEncoderWriteColorProperties' but for the colr nclx box only.
+static avifResult avifEncoderWriteNclxProperty(avifRWStream * dedupStream,
+                                               avifRWStream * outputStream,
+                                               const avifImage * imageMetadata,
+                                               struct ipmaArray * ipma,
+                                               avifItemPropertyDedup * dedup)
+{
+    if (dedup) {
+        avifItemPropertyDedupStart(dedup);
+    }
+    avifBoxMarker colr;
+    AVIF_CHECKRES(avifRWStreamWriteBox(dedupStream, "colr", AVIF_BOX_SIZE_TBD, &colr));
+    AVIF_CHECKRES(avifRWStreamWriteChars(dedupStream, "nclx", 4));                   // unsigned int(32) colour_type;
+    AVIF_CHECKRES(avifRWStreamWriteU16(dedupStream, imageMetadata->colorPrimaries)); // unsigned int(16) colour_primaries;
+    AVIF_CHECKRES(avifRWStreamWriteU16(dedupStream, imageMetadata->transferCharacteristics)); // unsigned int(16) transfer_characteristics;
+    AVIF_CHECKRES(avifRWStreamWriteU16(dedupStream, imageMetadata->matrixCoefficients)); // unsigned int(16) matrix_coefficients;
+    AVIF_CHECKRES(avifRWStreamWriteBits(dedupStream, (imageMetadata->yuvRange == AVIF_RANGE_FULL) ? 1 : 0, /*bitCount=*/1)); // unsigned int(1) full_range_flag;
+    AVIF_CHECKRES(avifRWStreamWriteBits(dedupStream, 0, /*bitCount=*/7)); // unsigned int(7) reserved = 0;
+    avifRWStreamFinishBox(dedupStream, colr);
+    if (dedup) {
+        AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, outputStream, ipma, AVIF_FALSE));
+    }
+    return AVIF_RESULT_OK;
+}
+
+// Subset of avifEncoderWriteColorProperties() for the properties clli, pasp, clap, irot, imir.
+// Also used by the extendedMeta field of the CondensedImageBox if AVIF_ENABLE_EXPERIMENTAL_AVIR is
+// defined.
+static avifResult avifEncoderWriteExtendedColorProperties(avifRWStream * dedupStream,
+                                                          avifRWStream * outputStream,
+                                                          const avifImage * imageMetadata,
+                                                          struct ipmaArray * ipma,
+                                                          avifItemPropertyDedup * dedup);
+
+// This function is used in two codepaths:
+// * writing color *item* properties
+// * writing color *track* properties
+//
+// Item properties must have property associations with them and can be deduplicated (by reusing
+// these associations), so this function leverages the ipma and dedup arguments to do this.
+//
+// Track properties, however, are implicitly associated by the track in which they are contained, so
+// there is no need to build a property association box (ipma), and no way to deduplicate/reuse a
+// property. In this case, the ipma and dedup properties should/will be set to NULL, and this
+// function will avoid using them.
+static avifResult avifEncoderWriteColorProperties(avifRWStream * outputStream,
+                                                  const avifImage * imageMetadata,
+                                                  struct ipmaArray * ipma,
+                                                  avifItemPropertyDedup * dedup)
+{
+    // outputStream is the final bitstream that will be output by the libavif encoder API.
+    // dedupStream is either equal to outputStream or to &dedup->s which is a temporary stream used
+    // to store parts of the final bitstream; these parts may be discarded if they are a duplicate
+    // of an already stored property.
+    avifRWStream * dedupStream = outputStream;
+    if (dedup) {
+        assert(ipma);
+
+        // Use the dedup's temporary stream for box writes.
+        dedupStream = &dedup->s;
+    }
+
+    if (imageMetadata->icc.size > 0) {
+        if (dedup) {
+            avifItemPropertyDedupStart(dedup);
+        }
+        avifBoxMarker colr;
+        AVIF_CHECKRES(avifRWStreamWriteBox(dedupStream, "colr", AVIF_BOX_SIZE_TBD, &colr));
+        AVIF_CHECKRES(avifRWStreamWriteChars(dedupStream, "prof", 4)); // unsigned int(32) colour_type;
+        AVIF_CHECKRES(avifRWStreamWrite(dedupStream, imageMetadata->icc.data, imageMetadata->icc.size));
+        avifRWStreamFinishBox(dedupStream, colr);
+        if (dedup) {
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, outputStream, ipma, AVIF_FALSE));
+        }
+    }
+
+    // HEIF 6.5.5.1, from Amendment 3 allows multiple colr boxes: "at most one for a given value of colour type"
+    // Therefore, *always* writing an nclx box, even if an a prof box was already written above.
+    AVIF_CHECKRES(avifEncoderWriteNclxProperty(dedupStream, outputStream, imageMetadata, ipma, dedup));
+
+    return avifEncoderWriteExtendedColorProperties(dedupStream, outputStream, imageMetadata, ipma, dedup);
+}
+
+// Same as 'avifEncoderWriteColorProperties' but for properties related to High Dynamic Range only.
+static avifResult avifEncoderWriteHDRProperties(avifRWStream * dedupStream,
+                                                avifRWStream * outputStream,
+                                                const avifImage * imageMetadata,
+                                                struct ipmaArray * ipma,
+                                                avifItemPropertyDedup * dedup)
+{
+    // Write Content Light Level Information, if present
+    if (imageMetadata->clli.maxCLL || imageMetadata->clli.maxPALL) {
+        if (dedup) {
+            avifItemPropertyDedupStart(dedup);
+        }
+        avifBoxMarker clli;
+        AVIF_CHECKRES(avifRWStreamWriteBox(dedupStream, "clli", AVIF_BOX_SIZE_TBD, &clli));
+        AVIF_CHECKRES(avifRWStreamWriteU16(dedupStream, imageMetadata->clli.maxCLL)); // unsigned int(16) max_content_light_level;
+        AVIF_CHECKRES(avifRWStreamWriteU16(dedupStream, imageMetadata->clli.maxPALL)); // unsigned int(16) max_pic_average_light_level;
+        avifRWStreamFinishBox(dedupStream, clli);
+        if (dedup) {
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, outputStream, ipma, AVIF_FALSE));
+        }
+    }
+
+    // TODO(maryla): add other HDR boxes: mdcv, cclv, etc.
+
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifEncoderWriteExtendedColorProperties(avifRWStream * dedupStream,
+                                                          avifRWStream * outputStream,
+                                                          const avifImage * imageMetadata,
+                                                          struct ipmaArray * ipma,
+                                                          avifItemPropertyDedup * dedup)
+{
+    // Write (Optional) Transformations
+    if (imageMetadata->transformFlags & AVIF_TRANSFORM_PASP) {
+        if (dedup) {
+            avifItemPropertyDedupStart(dedup);
+        }
+        avifBoxMarker pasp;
+        AVIF_CHECKRES(avifRWStreamWriteBox(dedupStream, "pasp", AVIF_BOX_SIZE_TBD, &pasp));
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->pasp.hSpacing)); // unsigned int(32) hSpacing;
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->pasp.vSpacing)); // unsigned int(32) vSpacing;
+        avifRWStreamFinishBox(dedupStream, pasp);
+        if (dedup) {
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, outputStream, ipma, AVIF_FALSE));
+        }
+    }
+    if (imageMetadata->transformFlags & AVIF_TRANSFORM_CLAP) {
+        if (dedup) {
+            avifItemPropertyDedupStart(dedup);
+        }
+        avifBoxMarker clap;
+        AVIF_CHECKRES(avifRWStreamWriteBox(dedupStream, "clap", AVIF_BOX_SIZE_TBD, &clap));
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->clap.widthN));    // unsigned int(32) cleanApertureWidthN;
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->clap.widthD));    // unsigned int(32) cleanApertureWidthD;
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->clap.heightN));   // unsigned int(32) cleanApertureHeightN;
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->clap.heightD));   // unsigned int(32) cleanApertureHeightD;
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->clap.horizOffN)); // unsigned int(32) horizOffN;
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->clap.horizOffD)); // unsigned int(32) horizOffD;
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->clap.vertOffN));  // unsigned int(32) vertOffN;
+        AVIF_CHECKRES(avifRWStreamWriteU32(dedupStream, imageMetadata->clap.vertOffD));  // unsigned int(32) vertOffD;
+        avifRWStreamFinishBox(dedupStream, clap);
+        if (dedup) {
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, outputStream, ipma, AVIF_TRUE));
+        }
+    }
+    if (imageMetadata->transformFlags & AVIF_TRANSFORM_IROT) {
+        if (dedup) {
+            avifItemPropertyDedupStart(dedup);
+        }
+        avifBoxMarker irot;
+        AVIF_CHECKRES(avifRWStreamWriteBox(dedupStream, "irot", AVIF_BOX_SIZE_TBD, &irot));
+        AVIF_CHECKRES(avifRWStreamWriteBits(dedupStream, 0, /*bitCount=*/6)); // unsigned int (6) reserved = 0;
+        AVIF_CHECKRES(avifRWStreamWriteBits(dedupStream, imageMetadata->irot.angle & 0x3, /*bitCount=*/2)); // unsigned int (2) angle;
+        avifRWStreamFinishBox(dedupStream, irot);
+        if (dedup) {
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, outputStream, ipma, AVIF_TRUE));
+        }
+    }
+    if (imageMetadata->transformFlags & AVIF_TRANSFORM_IMIR) {
+        if (dedup) {
+            avifItemPropertyDedupStart(dedup);
+        }
+        avifBoxMarker imir;
+        AVIF_CHECKRES(avifRWStreamWriteBox(dedupStream, "imir", AVIF_BOX_SIZE_TBD, &imir));
+        AVIF_CHECKRES(avifRWStreamWriteBits(dedupStream, 0, /*bitCount=*/7)); // unsigned int(7) reserved = 0;
+        AVIF_CHECKRES(avifRWStreamWriteBits(dedupStream, imageMetadata->imir.axis ? 1 : 0, /*bitCount=*/1)); // unsigned int(1) axis;
+        avifRWStreamFinishBox(dedupStream, imir);
+        if (dedup) {
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, outputStream, ipma, AVIF_TRUE));
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+// Write unassociated metadata items (EXIF, XMP) to a small meta box inside of a trak box.
+// These items are implicitly associated with the track they are contained within.
+static avifResult avifEncoderWriteTrackMetaBox(avifEncoder * encoder, avifRWStream * s)
+{
+    // Count how many non-image items (such as EXIF/XMP) are being written
+    uint32_t metadataItemCount = 0;
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+        if (memcmp(item->type, encoder->data->imageItemType, 4) != 0) {
+            ++metadataItemCount;
+        }
+    }
+    if (metadataItemCount == 0) {
+        // Don't even bother writing the trak meta box
+        return AVIF_RESULT_OK;
+    }
+
+    avifBoxMarker meta;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(s, "meta", AVIF_BOX_SIZE_TBD, 0, 0, &meta));
+
+    avifBoxMarker hdlr;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(s, "hdlr", AVIF_BOX_SIZE_TBD, 0, 0, &hdlr));
+    AVIF_CHECKRES(avifRWStreamWriteU32(s, 0));              // unsigned int(32) pre_defined = 0;
+    AVIF_CHECKRES(avifRWStreamWriteChars(s, "pict", 4));    // unsigned int(32) handler_type;
+    AVIF_CHECKRES(avifRWStreamWriteZeros(s, 12));           // const unsigned int(32)[3] reserved = 0;
+    AVIF_CHECKRES(avifRWStreamWriteChars(s, "libavif", 8)); // string name; (writing null terminator)
+    avifRWStreamFinishBox(s, hdlr);
+
+    avifBoxMarker iloc;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(s, "iloc", AVIF_BOX_SIZE_TBD, 0, 0, &iloc));
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 4, /*bitCount=*/4));          // unsigned int(4) offset_size;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 4, /*bitCount=*/4));          // unsigned int(4) length_size;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, /*bitCount=*/4));          // unsigned int(4) base_offset_size;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, /*bitCount=*/4));          // unsigned int(4) reserved;
+    AVIF_CHECKRES(avifRWStreamWriteU16(s, (uint16_t)metadataItemCount)); // unsigned int(16) item_count;
+    for (uint32_t trakItemIndex = 0; trakItemIndex < encoder->data->items.count; ++trakItemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[trakItemIndex];
+        if (memcmp(item->type, encoder->data->imageItemType, 4) == 0) {
+            // Skip over all non-metadata items
+            continue;
+        }
+
+        AVIF_CHECKRES(avifRWStreamWriteU16(s, item->id));          // unsigned int(16) item_ID;
+        AVIF_CHECKRES(avifRWStreamWriteU16(s, 0));                 // unsigned int(16) data_reference_index;
+        AVIF_CHECKRES(avifRWStreamWriteU16(s, 1));                 // unsigned int(16) extent_count;
+        AVIF_CHECKRES(avifEncoderItemAddMdatFixup(item, s));       //
+        AVIF_CHECKRES(avifRWStreamWriteU32(s, 0 /* set later */)); // unsigned int(offset_size*8) extent_offset;
+        AVIF_CHECKRES(avifRWStreamWriteU32(s, (uint32_t)item->metadataPayload.size)); // unsigned int(length_size*8) extent_length;
+    }
+    avifRWStreamFinishBox(s, iloc);
+
+    avifBoxMarker iinf;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(s, "iinf", AVIF_BOX_SIZE_TBD, 0, 0, &iinf));
+    AVIF_CHECKRES(avifRWStreamWriteU16(s, (uint16_t)metadataItemCount)); //  unsigned int(16) entry_count;
+    for (uint32_t trakItemIndex = 0; trakItemIndex < encoder->data->items.count; ++trakItemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[trakItemIndex];
+        if (memcmp(item->type, encoder->data->imageItemType, 4) == 0) {
+            continue;
+        }
+
+        assert(!item->hiddenImage);
+        avifBoxMarker infe;
+        AVIF_CHECKRES(avifRWStreamWriteFullBox(s, "infe", AVIF_BOX_SIZE_TBD, 2, 0, &infe));
+        AVIF_CHECKRES(avifRWStreamWriteU16(s, item->id));                             // unsigned int(16) item_ID;
+        AVIF_CHECKRES(avifRWStreamWriteU16(s, 0));                                    // unsigned int(16) item_protection_index;
+        AVIF_CHECKRES(avifRWStreamWrite(s, item->type, 4));                           // unsigned int(32) item_type;
+        AVIF_CHECKRES(avifRWStreamWriteChars(s, item->infeName, item->infeNameSize)); // string item_name; (writing null terminator)
+        if (item->infeContentType && item->infeContentTypeSize) { // string content_type; (writing null terminator)
+            AVIF_CHECKRES(avifRWStreamWriteChars(s, item->infeContentType, item->infeContentTypeSize));
+        }
+        avifRWStreamFinishBox(s, infe);
+    }
+    avifRWStreamFinishBox(s, iinf);
+
+    avifRWStreamFinishBox(s, meta);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifWriteGridPayload(avifRWData * data, uint32_t gridCols, uint32_t gridRows, uint32_t gridWidth, uint32_t gridHeight)
+{
+    // ISO/IEC 23008-12 6.6.2.3.2
+    // aligned(8) class ImageGrid {
+    //     unsigned int(8) version = 0;
+    //     unsigned int(8) flags;
+    //     FieldLength = ((flags & 1) + 1) * 16;
+    //     unsigned int(8) rows_minus_one;
+    //     unsigned int(8) columns_minus_one;
+    //     unsigned int(FieldLength) output_width;
+    //     unsigned int(FieldLength) output_height;
+    // }
+
+    uint8_t gridFlags = ((gridWidth > 65535) || (gridHeight > 65535)) ? 1 : 0;
+
+    avifRWStream s;
+    avifRWStreamStart(&s, data);
+    AVIF_CHECKRES(avifRWStreamWriteU8(&s, 0));                       // unsigned int(8) version = 0;
+    AVIF_CHECKRES(avifRWStreamWriteU8(&s, gridFlags));               // unsigned int(8) flags;
+    AVIF_CHECKRES(avifRWStreamWriteU8(&s, (uint8_t)(gridRows - 1))); // unsigned int(8) rows_minus_one;
+    AVIF_CHECKRES(avifRWStreamWriteU8(&s, (uint8_t)(gridCols - 1))); // unsigned int(8) columns_minus_one;
+    if (gridFlags & 1) {
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, gridWidth));  // unsigned int(FieldLength) output_width;
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, gridHeight)); // unsigned int(FieldLength) output_height;
+    } else {
+        uint16_t tmpWidth = (uint16_t)gridWidth;
+        uint16_t tmpHeight = (uint16_t)gridHeight;
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, tmpWidth));  // unsigned int(FieldLength) output_width;
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, tmpHeight)); // unsigned int(FieldLength) output_height;
+    }
+    avifRWStreamFinishWrite(&s);
+    return AVIF_RESULT_OK;
+}
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+
+static avifBool avifWriteToneMappedImagePayload(avifRWData * data, const avifGainMapMetadata * metadata)
+{
+    avifRWStream s;
+    avifRWStreamStart(&s, data);
+    const uint8_t version = 0;
+    AVIF_CHECKRES(avifRWStreamWriteU8(&s, version));
+
+    uint8_t flags = 0u;
+    // Always write three channels for now for simplicity.
+    // TODO(maryla): the draft says that this specifies the count of channels of the
+    // gain map. But tone mapping is done in RGB space so there are always three
+    // channels, even if the gain map is grayscale. Should this be revised?
+    const avifBool allChannelsIdentical =
+        metadata->gainMapMinN[0] == metadata->gainMapMinN[1] && metadata->gainMapMinN[0] == metadata->gainMapMinN[2] &&
+        metadata->gainMapMinD[0] == metadata->gainMapMinD[1] && metadata->gainMapMinD[0] == metadata->gainMapMinD[2] &&
+        metadata->gainMapMaxN[0] == metadata->gainMapMaxN[1] && metadata->gainMapMaxN[0] == metadata->gainMapMaxN[2] &&
+        metadata->gainMapMaxD[0] == metadata->gainMapMaxD[1] && metadata->gainMapMaxD[0] == metadata->gainMapMaxD[2] &&
+        metadata->gainMapGammaN[0] == metadata->gainMapGammaN[1] && metadata->gainMapGammaN[0] == metadata->gainMapGammaN[2] &&
+        metadata->gainMapGammaD[0] == metadata->gainMapGammaD[1] && metadata->gainMapGammaD[0] == metadata->gainMapGammaD[2] &&
+        metadata->baseOffsetN[0] == metadata->baseOffsetN[1] && metadata->baseOffsetN[0] == metadata->baseOffsetN[2] &&
+        metadata->baseOffsetD[0] == metadata->baseOffsetD[1] && metadata->baseOffsetD[0] == metadata->baseOffsetD[2] &&
+        metadata->alternateOffsetN[0] == metadata->alternateOffsetN[1] &&
+        metadata->alternateOffsetN[0] == metadata->alternateOffsetN[2] &&
+        metadata->alternateOffsetD[0] == metadata->alternateOffsetD[1] &&
+        metadata->alternateOffsetD[0] == metadata->alternateOffsetD[2];
+    const uint8_t channelCount = allChannelsIdentical ? 1u : 3u;
+    if (channelCount == 3) {
+        flags |= 1;
+    }
+    if (metadata->useBaseColorSpace) {
+        flags |= 2;
+    }
+    if (metadata->backwardDirection) {
+        flags |= 4;
+    }
+    const uint32_t denom = metadata->baseHdrHeadroomD;
+    avifBool useCommonDenominator = metadata->baseHdrHeadroomD == denom && metadata->alternateHdrHeadroomD == denom;
+    for (int c = 0; c < channelCount; ++c) {
+        useCommonDenominator = useCommonDenominator && metadata->gainMapMinD[c] == denom && metadata->gainMapMaxD[c] == denom &&
+                               metadata->gainMapGammaD[c] == denom && metadata->baseOffsetD[c] == denom &&
+                               metadata->alternateOffsetD[c] == denom;
+    }
+    if (useCommonDenominator) {
+        flags |= 8;
+    }
+    AVIF_CHECKRES(avifRWStreamWriteU8(&s, flags));
+
+    if (useCommonDenominator) {
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, denom));
+
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->baseHdrHeadroomN));
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->alternateHdrHeadroomN));
+
+        for (int c = 0; c < channelCount; ++c) {
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)metadata->gainMapMinN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)metadata->gainMapMaxN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->gainMapGammaN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)metadata->baseOffsetN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)metadata->alternateOffsetN[c]));
+        }
+    } else {
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->baseHdrHeadroomN));
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->baseHdrHeadroomD));
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->alternateHdrHeadroomN));
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->alternateHdrHeadroomD));
+
+        for (int c = 0; c < channelCount; ++c) {
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)metadata->gainMapMinN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->gainMapMinD[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)metadata->gainMapMaxN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->gainMapMaxD[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->gainMapGammaN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->gainMapGammaD[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)metadata->baseOffsetN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->baseOffsetD[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)metadata->alternateOffsetN[c]));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, metadata->alternateOffsetD[c]));
+        }
+    }
+
+    avifRWStreamFinishWrite(&s);
+    return AVIF_TRUE;
+}
+
+size_t avifEncoderGetGainMapSizeBytes(avifEncoder * encoder)
+{
+    return encoder->data->gainMapSizeBytes;
+}
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
+
+static avifResult avifEncoderDataCreateExifItem(avifEncoderData * data, const avifRWData * exif)
+{
+    size_t exifTiffHeaderOffset;
+    const avifResult result = avifGetExifTiffHeaderOffset(exif->data, exif->size, &exifTiffHeaderOffset);
+    if (result != AVIF_RESULT_OK) {
+        // Couldn't find the TIFF header
+        return result;
+    }
+
+    avifEncoderItem * exifItem = avifEncoderDataCreateItem(data, "Exif", "Exif", 5, 0);
+    if (!exifItem) {
+        return AVIF_RESULT_OUT_OF_MEMORY;
+    }
+    exifItem->irefToID = data->primaryItemID;
+    exifItem->irefType = "cdsc";
+
+    const uint32_t offset32bit = avifHTONL((uint32_t)exifTiffHeaderOffset);
+    AVIF_CHECKRES(avifRWDataRealloc(&exifItem->metadataPayload, sizeof(offset32bit) + exif->size));
+    memcpy(exifItem->metadataPayload.data, &offset32bit, sizeof(offset32bit));
+    memcpy(exifItem->metadataPayload.data + sizeof(offset32bit), exif->data, exif->size);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifEncoderDataCreateXMPItem(avifEncoderData * data, const avifRWData * xmp)
+{
+    avifEncoderItem * xmpItem = avifEncoderDataCreateItem(data, "mime", "XMP", 4, 0);
+    if (!xmpItem) {
+        return AVIF_RESULT_OUT_OF_MEMORY;
+    }
+    xmpItem->irefToID = data->primaryItemID;
+    xmpItem->irefType = "cdsc";
+
+    xmpItem->infeContentType = xmpContentType;
+    xmpItem->infeContentTypeSize = xmpContentTypeSize;
+    AVIF_CHECKRES(avifRWDataSet(&xmpItem->metadataPayload, xmp->data, xmp->size));
+    return AVIF_RESULT_OK;
+}
+
+// Same as avifImageCopy() but pads the dstImage with border pixel values to reach dstWidth and dstHeight.
+// Returns NULL if a memory allocation failed.
+static avifImage * avifImageCopyAndPad(const avifImage * srcImage, uint32_t dstWidth, uint32_t dstHeight)
+{
+    avifImage * dstImage = avifImageCreateEmpty();
+    if (!dstImage) {
+        return NULL;
+    }
+    // Copy all fields but do not allocate.
+    if (avifImageCopy(dstImage, srcImage, (avifPlanesFlag)0) != AVIF_RESULT_OK) {
+        avifImageDestroy(dstImage);
+        return NULL;
+    }
+    assert(dstWidth >= srcImage->width);
+    assert(dstHeight >= srcImage->height);
+    dstImage->width = dstWidth;
+    dstImage->height = dstHeight;
+
+    if (srcImage->yuvPlanes[AVIF_CHAN_Y]) {
+        const avifResult allocationResult = avifImageAllocatePlanes(dstImage, AVIF_PLANES_YUV);
+        if (allocationResult != AVIF_RESULT_OK) {
+            avifImageDestroy(dstImage);
+            return NULL;
+        }
+    }
+    if (srcImage->alphaPlane) {
+        const avifResult allocationResult = avifImageAllocatePlanes(dstImage, AVIF_PLANES_A);
+        if (allocationResult != AVIF_RESULT_OK) {
+            avifImageDestroy(dstImage);
+            return NULL;
+        }
+    }
+    const avifBool usesU16 = avifImageUsesU16(srcImage);
+    for (int plane = AVIF_CHAN_Y; plane <= AVIF_CHAN_A; ++plane) {
+        const uint8_t * srcRow = avifImagePlane(srcImage, plane);
+        const uint32_t srcRowBytes = avifImagePlaneRowBytes(srcImage, plane);
+        const uint32_t srcPlaneWidth = avifImagePlaneWidth(srcImage, plane);
+        const uint32_t srcPlaneHeight = avifImagePlaneHeight(srcImage, plane); // 0 for A if no alpha and 0 for UV if 4:0:0.
+        const size_t srcPlaneWidthBytes = (size_t)srcPlaneWidth << usesU16;
+
+        uint8_t * dstRow = avifImagePlane(dstImage, plane);
+        const uint32_t dstRowBytes = avifImagePlaneRowBytes(dstImage, plane);
+        const uint32_t dstPlaneWidth = avifImagePlaneWidth(dstImage, plane);
+        const uint32_t dstPlaneHeight = avifImagePlaneHeight(dstImage, plane); // 0 for A if no alpha and 0 for UV if 4:0:0.
+        const size_t dstPlaneWidthBytes = (size_t)dstPlaneWidth << usesU16;
+
+        for (uint32_t j = 0; j < srcPlaneHeight; ++j) {
+            memcpy(dstRow, srcRow, srcPlaneWidthBytes);
+
+            // Pad columns.
+            if (dstPlaneWidth > srcPlaneWidth) {
+                if (usesU16) {
+                    uint16_t * dstRow16 = (uint16_t *)dstRow;
+                    for (uint32_t x = srcPlaneWidth; x < dstPlaneWidth; ++x) {
+                        dstRow16[x] = dstRow16[srcPlaneWidth - 1];
+                    }
+                } else {
+                    memset(&dstRow[srcPlaneWidth], dstRow[srcPlaneWidth - 1], dstPlaneWidth - srcPlaneWidth);
+                }
+            }
+            srcRow += srcRowBytes;
+            dstRow += dstRowBytes;
+        }
+
+        // Pad rows.
+        for (uint32_t j = srcPlaneHeight; j < dstPlaneHeight; ++j) {
+            memcpy(dstRow, dstRow - dstRowBytes, dstPlaneWidthBytes);
+            dstRow += dstRowBytes;
+        }
+    }
+    return dstImage;
+}
+
+static int avifQualityToQuantizer(int quality, int minQuantizer, int maxQuantizer)
+{
+    int quantizer;
+    if (quality == AVIF_QUALITY_DEFAULT) {
+        // In older libavif releases, avifEncoder didn't have the quality and qualityAlpha fields.
+        // Supply a default value for quantizer.
+        quantizer = (minQuantizer + maxQuantizer) / 2;
+        quantizer = AVIF_CLAMP(quantizer, 0, 63);
+    } else {
+        quality = AVIF_CLAMP(quality, 0, 100);
+        quantizer = ((100 - quality) * 63 + 50) / 100;
+    }
+    return quantizer;
+}
+
+static const char infeNameColor[] = "Color";
+static const char infeNameAlpha[] = "Alpha";
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+static const char infeNameGainMap[] = "GMap";
+#endif
+
+// Adds the items for a single cell or a grid of cells. Outputs the topLevelItemID which is
+// the only item if there is exactly one cell, or the grid item for multiple cells.
+// Note: The topLevelItemID output argument has the type uint16_t* instead of avifEncoderItem** because
+//       the avifEncoderItem pointer may be invalidated by a call to avifEncoderDataCreateItem().
+static avifResult avifEncoderAddImageItems(avifEncoder * encoder,
+                                           uint32_t gridCols,
+                                           uint32_t gridRows,
+                                           uint32_t gridWidth,
+                                           uint32_t gridHeight,
+                                           avifItemCategory itemCategory,
+                                           uint16_t * topLevelItemID)
+{
+    const uint32_t cellCount = gridCols * gridRows;
+    const char * infeName = (itemCategory == AVIF_ITEM_ALPHA) ? infeNameAlpha
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+                            : (itemCategory == AVIF_ITEM_GAIN_MAP) ? infeNameGainMap
+#endif
+                                                                   : infeNameColor;
+    const size_t infeNameSize = strlen(infeName) + 1;
+
+    if (cellCount > 1) {
+        avifEncoderItem * gridItem = avifEncoderDataCreateItem(encoder->data, "grid", infeName, infeNameSize, 0);
+        AVIF_CHECKRES(avifWriteGridPayload(&gridItem->metadataPayload, gridCols, gridRows, gridWidth, gridHeight));
+        gridItem->itemCategory = itemCategory;
+        gridItem->gridCols = gridCols;
+        gridItem->gridRows = gridRows;
+        gridItem->gridWidth = gridWidth;
+        gridItem->gridHeight = gridHeight;
+        *topLevelItemID = gridItem->id;
+    }
+
+    for (uint32_t cellIndex = 0; cellIndex < cellCount; ++cellIndex) {
+        avifEncoderItem * item =
+            avifEncoderDataCreateItem(encoder->data, encoder->data->imageItemType, infeName, infeNameSize, cellIndex);
+        AVIF_CHECKERR(item, AVIF_RESULT_OUT_OF_MEMORY);
+        AVIF_CHECKRES(avifCodecCreate(encoder->codecChoice, AVIF_CODEC_FLAG_CAN_ENCODE, &item->codec));
+        item->codec->csOptions = encoder->csOptions;
+        item->codec->diag = &encoder->diag;
+        item->itemCategory = itemCategory;
+        item->extraLayerCount = encoder->extraLayerCount;
+
+        if (cellCount > 1) {
+            item->dimgFromID = *topLevelItemID;
+            item->hiddenImage = AVIF_TRUE;
+        } else {
+            *topLevelItemID = item->id;
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+static avifCodecType avifEncoderGetCodecType(const avifEncoder * encoder)
+{
+    // TODO(yguyon): Rework when AVIF_CODEC_CHOICE_AUTO can be AVM
+    assert((encoder->codecChoice != AVIF_CODEC_CHOICE_AUTO) ||
+           (strcmp(avifCodecName(encoder->codecChoice, AVIF_CODEC_FLAG_CAN_ENCODE), "avm") != 0));
+    return avifCodecTypeFromChoice(encoder->codecChoice, AVIF_CODEC_FLAG_CAN_ENCODE);
+}
+
+// This function is called after every color frame is encoded. It returns AVIF_TRUE if a keyframe needs to be forced for the next
+// alpha frame to be encoded, AVIF_FALSE otherwise.
+static avifBool avifEncoderDataShouldForceKeyframeForAlpha(const avifEncoderData * data,
+                                                           const avifEncoderItem * colorItem,
+                                                           avifAddImageFlags addImageFlags)
+{
+    if (!data->alphaPresent) {
+        // There is no alpha plane.
+        return AVIF_FALSE;
+    }
+    if (addImageFlags & AVIF_ADD_IMAGE_FLAG_SINGLE) {
+        // Not an animated image.
+        return AVIF_FALSE;
+    }
+    if (data->frames.count == 0) {
+        // data->frames.count is the number of frames that have been encoded so far by previous calls to avifEncoderAddImage. If
+        // this is the first frame, there is no need to force keyframe.
+        return AVIF_FALSE;
+    }
+    const uint32_t colorFramesOutputSoFar = colorItem->encodeOutput->samples.count;
+    const avifBool isLaggedOutput = (data->frames.count + 1) != colorFramesOutputSoFar;
+    if (isLaggedOutput) {
+        // If the encoder is operating with lag, then there is no way to determine if the last encoded frame was a keyframe until
+        // the encoder outputs it (after the lag). So do not force keyframe for alpha channel in this case.
+        return AVIF_FALSE;
+    }
+    return colorItem->encodeOutput->samples.sample[colorFramesOutputSoFar - 1].sync;
+}
+
+static avifResult avifGetErrorForItemCategory(avifItemCategory itemCategory)
+{
+    return (itemCategory == AVIF_ITEM_ALPHA) ? AVIF_RESULT_ENCODE_ALPHA_FAILED : AVIF_RESULT_ENCODE_COLOR_FAILED;
+}
+
+static avifResult avifValidateImageBasicProperties(const avifImage * avifImage)
+{
+    if ((avifImage->depth != 8) && (avifImage->depth != 10) && (avifImage->depth != 12)) {
+        return AVIF_RESULT_UNSUPPORTED_DEPTH;
+    }
+
+    if (avifImage->yuvFormat == AVIF_PIXEL_FORMAT_NONE) {
+        return AVIF_RESULT_NO_YUV_FORMAT_SELECTED;
+    }
+
+    return AVIF_RESULT_OK;
+}
+
+static uint32_t avifGridWidth(uint32_t gridCols, const avifImage * firstCell, const avifImage * bottomRightCell)
+{
+    return (gridCols - 1) * firstCell->width + bottomRightCell->width;
+}
+
+static uint32_t avifGridHeight(uint32_t gridRows, const avifImage * firstCell, const avifImage * bottomRightCell)
+{
+    return (gridRows - 1) * firstCell->height + bottomRightCell->height;
+}
+
+static avifResult avifValidateGrid(uint32_t gridCols,
+                                   uint32_t gridRows,
+                                   const avifImage * const * cellImages,
+                                   avifBool validateGainMap,
+                                   avifDiagnostics * diag)
+{
+    const uint32_t cellCount = gridCols * gridRows;
+    const avifImage * firstCell = cellImages[0];
+    const avifImage * bottomRightCell = cellImages[cellCount - 1];
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    if (validateGainMap) {
+        firstCell = firstCell->gainMap.image;
+        bottomRightCell = bottomRightCell->gainMap.image;
+    }
+#endif
+    const uint32_t tileWidth = firstCell->width;
+    const uint32_t tileHeight = firstCell->height;
+    const uint32_t gridWidth = avifGridWidth(gridCols, firstCell, bottomRightCell);
+    const uint32_t gridHeight = avifGridHeight(gridRows, firstCell, bottomRightCell);
+    for (uint32_t cellIndex = 0; cellIndex < cellCount; ++cellIndex) {
+        const avifImage * cellImage = cellImages[cellIndex];
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        if (validateGainMap) {
+            cellImage = cellImage->gainMap.image;
+        }
+#endif
+        const uint32_t expectedCellWidth = ((cellIndex + 1) % gridCols) ? tileWidth : bottomRightCell->width;
+        const uint32_t expectedCellHeight = (cellIndex < (cellCount - gridCols)) ? tileHeight : bottomRightCell->height;
+        if ((cellImage->width != expectedCellWidth) || (cellImage->height != expectedCellHeight)) {
+            avifDiagnosticsPrintf(diag,
+                                  "%s cell %d has invalid dimensions: expected %dx%d found %dx%d",
+                                  validateGainMap ? "gain map" : "image",
+                                  cellIndex,
+                                  expectedCellWidth,
+                                  expectedCellHeight,
+                                  cellImage->width,
+                                  cellImage->height);
+            return AVIF_RESULT_INVALID_IMAGE_GRID;
+        }
+
+        // MIAF (ISO 23000-22:2019), Section 7.3.11.4.1:
+        //   All input images of a grid image item shall use the same coding format, chroma sampling format, and the
+        //   same decoder configuration (see 7.3.6.2).
+        if ((cellImage->depth != firstCell->depth) || (cellImage->yuvFormat != firstCell->yuvFormat) ||
+            (cellImage->yuvRange != firstCell->yuvRange) || (cellImage->colorPrimaries != firstCell->colorPrimaries) ||
+            (cellImage->transferCharacteristics != firstCell->transferCharacteristics) ||
+            (cellImage->matrixCoefficients != firstCell->matrixCoefficients) || (!!cellImage->alphaPlane != !!firstCell->alphaPlane) ||
+            (cellImage->alphaPremultiplied != firstCell->alphaPremultiplied)) {
+            avifDiagnosticsPrintf(diag,
+                                  "all grid cells should have the same value for: depth, yuvFormat, yuvRange, colorPrimaries, "
+                                  "transferCharacteristics, matrixCoefficients, alphaPlane presence, alphaPremultiplied");
+            return AVIF_RESULT_INVALID_IMAGE_GRID;
+        }
+
+        if (!cellImage->yuvPlanes[AVIF_CHAN_Y]) {
+            return AVIF_RESULT_NO_CONTENT;
+        }
+    }
+
+    if ((bottomRightCell->width > tileWidth) || (bottomRightCell->height > tileHeight)) {
+        avifDiagnosticsPrintf(diag,
+                              "the last %s cell can be smaller but not larger than the other cells which are %dx%d, found %dx%d",
+                              validateGainMap ? "gain map" : "image",
+                              tileWidth,
+                              tileHeight,
+                              bottomRightCell->width,
+                              bottomRightCell->height);
+        return AVIF_RESULT_INVALID_IMAGE_GRID;
+    }
+    if ((cellCount > 1) && !avifAreGridDimensionsValid(firstCell->yuvFormat, gridWidth, gridHeight, tileWidth, tileHeight, diag)) {
+        return AVIF_RESULT_INVALID_IMAGE_GRID;
+    }
+
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifEncoderAddImageInternal(avifEncoder * encoder,
+                                              uint32_t gridCols,
+                                              uint32_t gridRows,
+                                              const avifImage * const * cellImages,
+                                              uint64_t durationInTimescales,
+                                              avifAddImageFlags addImageFlags)
+{
+    // -----------------------------------------------------------------------
+    // Verify encoding is possible
+
+    if (!avifCodecName(encoder->codecChoice, AVIF_CODEC_FLAG_CAN_ENCODE)) {
+        return AVIF_RESULT_NO_CODEC_AVAILABLE;
+    }
+
+    if (encoder->extraLayerCount >= AVIF_MAX_AV1_LAYER_COUNT) {
+        avifDiagnosticsPrintf(&encoder->diag, "extraLayerCount [%u] must be less than %d", encoder->extraLayerCount, AVIF_MAX_AV1_LAYER_COUNT);
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+
+    // -----------------------------------------------------------------------
+    // Validate images
+
+    const uint32_t cellCount = gridCols * gridRows;
+    if (cellCount == 0) {
+        return AVIF_RESULT_INVALID_ARGUMENT;
+    }
+
+    const avifImage * firstCell = cellImages[0];
+    const avifImage * bottomRightCell = cellImages[cellCount - 1];
+    AVIF_CHECKRES(avifValidateImageBasicProperties(firstCell));
+    if (!firstCell->width || !firstCell->height || !bottomRightCell->width || !bottomRightCell->height) {
+        return AVIF_RESULT_NO_CONTENT;
+    }
+
+    AVIF_CHECKRES(avifValidateGrid(gridCols, gridRows, cellImages, /*validateGainMap=*/AVIF_FALSE, &encoder->diag));
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    const avifBool hasGainMap = (firstCell->gainMap.image != NULL);
+
+    // Check that either all cells have a gain map, or none of them do.
+    // If a gain map is present, check that they all have the same gain map metadata.
+    for (uint32_t cellIndex = 0; cellIndex < cellCount; ++cellIndex) {
+        const avifImage * cellImage = cellImages[cellIndex];
+        const avifBool cellHasGainMap = (cellImage->gainMap.image != NULL);
+        if (cellHasGainMap != hasGainMap) {
+            avifDiagnosticsPrintf(&encoder->diag, "cells should either all have a gain map image, or none of them should, found a mix");
+            return AVIF_RESULT_INVALID_IMAGE_GRID;
+        }
+        if (hasGainMap) {
+            const avifGainMapMetadata * firstMetadata = &firstCell->gainMap.metadata;
+            const avifGainMapMetadata * cellMetadata = &cellImage->gainMap.metadata;
+            if (cellMetadata->backwardDirection != firstMetadata->backwardDirection ||
+                cellMetadata->baseHdrHeadroomN != firstMetadata->baseHdrHeadroomN ||
+                cellMetadata->baseHdrHeadroomD != firstMetadata->baseHdrHeadroomD ||
+                cellMetadata->alternateHdrHeadroomN != firstMetadata->alternateHdrHeadroomN ||
+                cellMetadata->alternateHdrHeadroomD != firstMetadata->alternateHdrHeadroomD) {
+                avifDiagnosticsPrintf(&encoder->diag, "all cells should have the same gain map metadata");
+                return AVIF_RESULT_INVALID_IMAGE_GRID;
+            }
+            for (int c = 0; c < 3; ++c) {
+                if (cellMetadata->gainMapMinN[c] != firstMetadata->gainMapMinN[c] ||
+                    cellMetadata->gainMapMinD[c] != firstMetadata->gainMapMinD[c] ||
+                    cellMetadata->gainMapMaxN[c] != firstMetadata->gainMapMaxN[c] ||
+                    cellMetadata->gainMapMaxD[c] != firstMetadata->gainMapMaxD[c] ||
+                    cellMetadata->gainMapGammaN[c] != firstMetadata->gainMapGammaN[c] ||
+                    cellMetadata->gainMapGammaD[c] != firstMetadata->gainMapGammaD[c] ||
+                    cellMetadata->baseOffsetN[c] != firstMetadata->baseOffsetN[c] ||
+                    cellMetadata->baseOffsetD[c] != firstMetadata->baseOffsetD[c] ||
+                    cellMetadata->alternateOffsetN[c] != firstMetadata->alternateOffsetN[c] ||
+                    cellMetadata->alternateOffsetD[c] != firstMetadata->alternateOffsetD[c]) {
+                    avifDiagnosticsPrintf(&encoder->diag, "all cells should have the same gain map metadata");
+                    return AVIF_RESULT_INVALID_IMAGE_GRID;
+                }
+            }
+        }
+    }
+
+    if (hasGainMap) {
+        AVIF_CHECKRES(avifValidateImageBasicProperties(firstCell->gainMap.image));
+        AVIF_CHECKRES(avifValidateGrid(gridCols, gridRows, cellImages, /*validateGainMap=*/AVIF_TRUE, &encoder->diag));
+    }
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
+
+    // -----------------------------------------------------------------------
+    // Validate flags
+
+    if (encoder->data->singleImage) {
+        // The previous call to avifEncoderAddImage() set AVIF_ADD_IMAGE_FLAG_SINGLE.
+        // avifEncoderAddImage() cannot be called again for this encode.
+        return AVIF_RESULT_ENCODE_COLOR_FAILED;
+    }
+
+    if (addImageFlags & AVIF_ADD_IMAGE_FLAG_SINGLE) {
+        encoder->data->singleImage = AVIF_TRUE;
+
+        if (encoder->extraLayerCount > 0) {
+            // AVIF_ADD_IMAGE_FLAG_SINGLE may not be set for layered image.
+            return AVIF_RESULT_INVALID_ARGUMENT;
+        }
+
+        if (encoder->data->items.count > 0) {
+            // AVIF_ADD_IMAGE_FLAG_SINGLE may only be set on the first and only image.
+            return AVIF_RESULT_INVALID_ARGUMENT;
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // Choose AV1 or AV2
+
+    const avifCodecType codecType = avifEncoderGetCodecType(encoder);
+    switch (codecType) {
+        case AVIF_CODEC_TYPE_AV1:
+            encoder->data->imageItemType = "av01";
+            encoder->data->configPropName = "av1C";
+            break;
+#if defined(AVIF_CODEC_AVM)
+        case AVIF_CODEC_TYPE_AV2:
+            encoder->data->imageItemType = "av02";
+            encoder->data->configPropName = "av2C";
+            break;
+#endif
+        default:
+            return AVIF_RESULT_NO_CODEC_AVAILABLE;
+    }
+
+    // -----------------------------------------------------------------------
+    // Map quality and qualityAlpha to quantizer and quantizerAlpha
+    encoder->data->quantizer = avifQualityToQuantizer(encoder->quality, encoder->minQuantizer, encoder->maxQuantizer);
+    encoder->data->quantizerAlpha = avifQualityToQuantizer(encoder->qualityAlpha, encoder->minQuantizerAlpha, encoder->maxQuantizerAlpha);
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+    encoder->data->quantizerGainMap =
+        avifQualityToQuantizer(encoder->qualityGainMap, AVIF_QUANTIZER_BEST_QUALITY, AVIF_QUANTIZER_WORST_QUALITY);
+#endif
+
+    // -----------------------------------------------------------------------
+    // Handle automatic tiling
+
+    encoder->data->tileRowsLog2 = AVIF_CLAMP(encoder->tileRowsLog2, 0, 6);
+    encoder->data->tileColsLog2 = AVIF_CLAMP(encoder->tileColsLog2, 0, 6);
+    if (encoder->autoTiling) {
+        // Use as many tiles as allowed by the minimum tile area requirement and impose a maximum
+        // of 8 tiles.
+        const int threads = 8;
+        avifSetTileConfiguration(threads, firstCell->width, firstCell->height, &encoder->data->tileRowsLog2, &encoder->data->tileColsLog2);
+    }
+
+    // -----------------------------------------------------------------------
+    // All encoder settings are known now. Detect changes.
+
+    avifEncoderChanges encoderChanges;
+    if (!avifEncoderDetectChanges(encoder, &encoderChanges)) {
+        return AVIF_RESULT_CANNOT_CHANGE_SETTING;
+    }
+    avifEncoderBackupSettings(encoder);
+
+    // -----------------------------------------------------------------------
+
+    if (durationInTimescales == 0) {
+        durationInTimescales = 1;
+    }
+
+    if (encoder->data->items.count == 0) {
+        // Make a copy of the first image's metadata (sans pixels) for future writing/validation
+        const avifResult copyResult = avifImageCopy(encoder->data->imageMetadata, firstCell, 0);
+        if (copyResult != AVIF_RESULT_OK) {
+            return copyResult;
+        }
+
+        // Prepare all AV1 items
+        uint16_t colorItemID;
+        const uint32_t gridWidth = avifGridWidth(gridCols, firstCell, bottomRightCell);
+        const uint32_t gridHeight = avifGridHeight(gridRows, firstCell, bottomRightCell);
+        AVIF_CHECKRES(avifEncoderAddImageItems(encoder, gridCols, gridRows, gridWidth, gridHeight, AVIF_ITEM_COLOR, &colorItemID));
+        encoder->data->primaryItemID = colorItemID;
+
+        encoder->data->alphaPresent = (firstCell->alphaPlane != NULL);
+        if (encoder->data->alphaPresent && (addImageFlags & AVIF_ADD_IMAGE_FLAG_SINGLE)) {
+            // If encoding a single image in which the alpha plane exists but is entirely opaque,
+            // simply skip writing an alpha AV1 payload entirely, as it'll be interpreted as opaque
+            // and is less bytes.
+            //
+            // However, if encoding an image sequence, the first frame's alpha plane being entirely
+            // opaque could be a false positive for removing the alpha AV1 payload, as it might simply
+            // be a fade out later in the sequence. This is why avifImageIsOpaque() is only called
+            // when encoding a single image.
+
+            encoder->data->alphaPresent = AVIF_FALSE;
+            for (uint32_t cellIndex = 0; cellIndex < cellCount; ++cellIndex) {
+                const avifImage * cellImage = cellImages[cellIndex];
+                if (!avifImageIsOpaque(cellImage)) {
+                    encoder->data->alphaPresent = AVIF_TRUE;
+                    break;
+                }
+            }
+        }
+
+        if (encoder->data->alphaPresent) {
+            uint16_t alphaItemID;
+            AVIF_CHECKRES(avifEncoderAddImageItems(encoder, gridCols, gridRows, gridWidth, gridHeight, AVIF_ITEM_ALPHA, &alphaItemID));
+            avifEncoderItem * alphaItem = avifEncoderDataFindItemByID(encoder->data, alphaItemID);
+            assert(alphaItem);
+            alphaItem->irefType = "auxl";
+            alphaItem->irefToID = colorItemID;
+            if (encoder->data->imageMetadata->alphaPremultiplied) {
+                avifEncoderItem * colorItem = avifEncoderDataFindItemByID(encoder->data, colorItemID);
+                assert(colorItem);
+                colorItem->irefType = "prem";
+                colorItem->irefToID = alphaItemID;
+            }
+        }
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        if (firstCell->gainMap.image) {
+            avifEncoderItem * toneMappedItem = avifEncoderDataCreateItem(encoder->data,
+                                                                         "tmap",
+                                                                         infeNameGainMap,
+                                                                         /*infeNameSize=*/strlen(infeNameGainMap) + 1,
+                                                                         /*cellIndex=*/0);
+            if (!avifWriteToneMappedImagePayload(&toneMappedItem->metadataPayload, &firstCell->gainMap.metadata)) {
+                avifDiagnosticsPrintf(&encoder->diag, "failed to write gain map metadata, some values may be negative or too large");
+                return AVIF_RESULT_ENCODE_GAIN_MAP_FAILED;
+            }
+            // Even though the 'tmap' item is related to the gain map, it shares most of its properties (width/height, depth etc.) with the color item.
+            toneMappedItem->itemCategory = AVIF_ITEM_COLOR;
+            uint16_t toneMappedItemID = toneMappedItem->id;
+
+            uint16_t * alternativeItemID = (uint16_t *)avifArrayPush(&encoder->data->alternativeItemIDs);
+            AVIF_CHECKERR(alternativeItemID != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+            *alternativeItemID = toneMappedItemID;
+
+            alternativeItemID = (uint16_t *)avifArrayPush(&encoder->data->alternativeItemIDs);
+            AVIF_CHECKERR(alternativeItemID != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+            *alternativeItemID = colorItemID;
+
+            const uint32_t gainMapGridWidth =
+                avifGridWidth(gridCols, cellImages[0]->gainMap.image, cellImages[gridCols * gridRows - 1]->gainMap.image);
+            const uint32_t gainMapGridHeight =
+                avifGridHeight(gridRows, cellImages[0]->gainMap.image, cellImages[gridCols * gridRows - 1]->gainMap.image);
+
+            uint16_t gainMapItemID;
+            AVIF_CHECKRES(
+                avifEncoderAddImageItems(encoder, gridCols, gridRows, gainMapGridWidth, gainMapGridHeight, AVIF_ITEM_GAIN_MAP, &gainMapItemID));
+            avifEncoderItem * gainMapItem = avifEncoderDataFindItemByID(encoder->data, gainMapItemID);
+            assert(gainMapItem);
+            gainMapItem->hiddenImage = AVIF_TRUE;
+
+            // Set the color item and gain map item's dimgFromID value to point to the tone mapped item.
+            // The color item shall be first, and the gain map second. avifEncoderFinish() writes the
+            // dimg item references in item id order, so as long as colorItemID < gainMapItemID, the order
+            // will be correct.
+            assert(colorItemID < gainMapItemID);
+            avifEncoderItem * colorItem = avifEncoderDataFindItemByID(encoder->data, colorItemID);
+            assert(colorItem);
+            assert(colorItem->dimgFromID == 0); // Our internal API only allows one dimg value per item.
+            colorItem->dimgFromID = toneMappedItemID;
+            gainMapItem->dimgFromID = toneMappedItemID;
+        }
+#endif // AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
+
+        // -----------------------------------------------------------------------
+        // Create metadata items (Exif, XMP)
+
+        if (firstCell->exif.size > 0) {
+            const avifResult result = avifEncoderDataCreateExifItem(encoder->data, &firstCell->exif);
+            if (result != AVIF_RESULT_OK) {
+                return result;
+            }
+        }
+
+        if (firstCell->xmp.size > 0) {
+            const avifResult result = avifEncoderDataCreateXMPItem(encoder->data, &firstCell->xmp);
+            if (result != AVIF_RESULT_OK) {
+                return result;
+            }
+        }
+    } else {
+        // Another frame in an image sequence, or layer in a layered image
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        if (hasGainMap) {
+            avifDiagnosticsPrintf(&encoder->diag, "gain maps are not supported for image sequences or layered images");
+            return AVIF_RESULT_NOT_IMPLEMENTED;
+        }
+#endif
+
+        const avifImage * imageMetadata = encoder->data->imageMetadata;
+        // Image metadata that are copied to the configuration property and nclx boxes are not allowed to change.
+        // If the first image in the sequence had an alpha plane (even if fully opaque), all
+        // subsequent images must have alpha as well.
+        if ((imageMetadata->depth != firstCell->depth) || (imageMetadata->yuvFormat != firstCell->yuvFormat) ||
+            (imageMetadata->yuvRange != firstCell->yuvRange) ||
+            (imageMetadata->yuvChromaSamplePosition != firstCell->yuvChromaSamplePosition) ||
+            (imageMetadata->colorPrimaries != firstCell->colorPrimaries) ||
+            (imageMetadata->transferCharacteristics != firstCell->transferCharacteristics) ||
+            (imageMetadata->matrixCoefficients != firstCell->matrixCoefficients) ||
+            (imageMetadata->alphaPremultiplied != firstCell->alphaPremultiplied) ||
+            (encoder->data->alphaPresent && !firstCell->alphaPlane)) {
+            return AVIF_RESULT_INCOMPATIBLE_IMAGE;
+        }
+    }
+
+    if (encoder->data->frames.count == 1) {
+        // We will be writing an image sequence. When writing the AV1SampleEntry (derived from
+        // VisualSampleEntry) in the stsd box, we need to cast imageMetadata->width and
+        // imageMetadata->height to uint16_t:
+        //     class VisualSampleEntry(codingname) extends SampleEntry (codingname){
+        //        ...
+        //        unsigned int(16) width;
+        //        unsigned int(16) height;
+        //        ...
+        //     }
+        // Check whether it is safe to cast width and height to uint16_t. The maximum width and
+        // height of an AV1 frame are 65536, which just exceeds uint16_t.
+        assert(encoder->data->items.count > 0);
+        const avifImage * imageMetadata = encoder->data->imageMetadata;
+        if ((imageMetadata->width > 65535) || (imageMetadata->height > 65535)) {
+            return AVIF_RESULT_INVALID_ARGUMENT;
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // Encode AV1 OBUs
+
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+        if (item->codec) {
+            const avifImage * cellImage = cellImages[item->cellIndex];
+            const avifImage * firstCellImage = firstCell;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+            if (item->itemCategory == AVIF_ITEM_GAIN_MAP) {
+                cellImage = cellImage->gainMap.image;
+                assert(cellImage);
+                firstCellImage = firstCell->gainMap.image;
+                assert(firstCellImage);
+            }
+#endif
+            avifImage * paddedCellImage = NULL;
+            if ((cellImage->width != firstCellImage->width) || (cellImage->height != firstCellImage->height)) {
+                paddedCellImage = avifImageCopyAndPad(cellImage, firstCellImage->width, firstCellImage->height);
+                if (!paddedCellImage) {
+                    return AVIF_RESULT_OUT_OF_MEMORY;
+                }
+                cellImage = paddedCellImage;
+            }
+            const int quantizer = (item->itemCategory == AVIF_ITEM_ALPHA) ? encoder->data->quantizerAlpha
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+                                  : (item->itemCategory == AVIF_ITEM_GAIN_MAP) ? encoder->data->quantizerGainMap
+#endif
+                                                                               : encoder->data->quantizer;
+            // If alpha channel is present, set disableLaggedOutput to AVIF_TRUE. If the encoder supports it, this enables
+            // avifEncoderDataShouldForceKeyframeForAlpha to force a keyframe in the alpha channel whenever a keyframe has been
+            // encoded in the color channel for animated images.
+            avifResult encodeResult = item->codec->encodeImage(item->codec,
+                                                               encoder,
+                                                               cellImage,
+                                                               item->itemCategory == AVIF_ITEM_ALPHA,
+                                                               encoder->data->tileRowsLog2,
+                                                               encoder->data->tileColsLog2,
+                                                               quantizer,
+                                                               encoderChanges,
+                                                               /*disableLaggedOutput=*/encoder->data->alphaPresent,
+                                                               addImageFlags,
+                                                               item->encodeOutput);
+            if (paddedCellImage) {
+                avifImageDestroy(paddedCellImage);
+            }
+            if (encodeResult == AVIF_RESULT_UNKNOWN_ERROR) {
+                encodeResult = avifGetErrorForItemCategory(item->itemCategory);
+            }
+            if (encodeResult != AVIF_RESULT_OK) {
+                return encodeResult;
+            }
+            if (itemIndex == 0 && avifEncoderDataShouldForceKeyframeForAlpha(encoder->data, item, addImageFlags)) {
+                addImageFlags |= AVIF_ADD_IMAGE_FLAG_FORCE_KEYFRAME;
+            }
+        }
+    }
+
+    avifCodecSpecificOptionsClear(encoder->csOptions);
+    avifEncoderFrame * frame = (avifEncoderFrame *)avifArrayPush(&encoder->data->frames);
+    AVIF_CHECKERR(frame != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+    frame->durationInTimescales = durationInTimescales;
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifEncoderAddImage(avifEncoder * encoder, const avifImage * image, uint64_t durationInTimescales, avifAddImageFlags addImageFlags)
+{
+    avifDiagnosticsClearError(&encoder->diag);
+    return avifEncoderAddImageInternal(encoder, 1, 1, &image, durationInTimescales, addImageFlags);
+}
+
+avifResult avifEncoderAddImageGrid(avifEncoder * encoder,
+                                   uint32_t gridCols,
+                                   uint32_t gridRows,
+                                   const avifImage * const * cellImages,
+                                   avifAddImageFlags addImageFlags)
+{
+    avifDiagnosticsClearError(&encoder->diag);
+    if ((gridCols == 0) || (gridCols > 256) || (gridRows == 0) || (gridRows > 256)) {
+        return AVIF_RESULT_INVALID_IMAGE_GRID;
+    }
+    if (encoder->extraLayerCount == 0) {
+        addImageFlags |= AVIF_ADD_IMAGE_FLAG_SINGLE; // image grids cannot be image sequences
+    }
+    return avifEncoderAddImageInternal(encoder, gridCols, gridRows, cellImages, 1, addImageFlags);
+}
+
+static size_t avifEncoderFindExistingChunk(avifRWStream * s, size_t mdatStartOffset, const uint8_t * data, size_t size)
+{
+    const size_t mdatCurrentOffset = avifRWStreamOffset(s);
+    const size_t mdatSearchSize = mdatCurrentOffset - mdatStartOffset;
+    if (mdatSearchSize < size) {
+        return 0;
+    }
+    const size_t mdatEndSearchOffset = mdatCurrentOffset - size;
+    for (size_t searchOffset = mdatStartOffset; searchOffset <= mdatEndSearchOffset; ++searchOffset) {
+        if (!memcmp(data, &s->raw->data[searchOffset], size)) {
+            return searchOffset;
+        }
+    }
+    return 0;
+}
+
+static avifResult avifEncoderWriteMediaDataBox(avifEncoder * encoder,
+                                               avifRWStream * s,
+                                               avifEncoderItemReferenceArray * layeredColorItems,
+                                               avifEncoderItemReferenceArray * layeredAlphaItems)
+{
+    encoder->ioStats.colorOBUSize = 0;
+    encoder->ioStats.alphaOBUSize = 0;
+    encoder->data->gainMapSizeBytes = 0;
+
+    avifBoxMarker mdat;
+    AVIF_CHECKRES(avifRWStreamWriteBox(s, "mdat", AVIF_BOX_SIZE_TBD, &mdat));
+    const size_t mdatStartOffset = avifRWStreamOffset(s);
+    for (uint32_t itemPasses = 0; itemPasses < 3; ++itemPasses) {
+        // Use multiple passes to pack in the following order:
+        //   * Pass 0: metadata (Exif/XMP)
+        //   * Pass 1: alpha, gain map (AV1)
+        //   * Pass 2: all other item data (AV1 color)
+        //
+        // See here for the discussion on alpha coming before color:
+        // https://github.com/AOMediaCodec/libavif/issues/287
+        //
+        // Exif and XMP are packed first as they're required to be fully available
+        // by avifDecoderParse() before it returns AVIF_RESULT_OK, unless ignoreXMP
+        // and ignoreExif are enabled.
+        //
+        const avifBool metadataPass = (itemPasses == 0);
+        const avifBool alphaAndGainMapPass = (itemPasses == 1);
+
+        for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+            avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+            if ((item->metadataPayload.size == 0) && (item->encodeOutput->samples.count == 0)) {
+                // this item has nothing for the mdat box
+                continue;
+            }
+            const avifBool isMetadata = !memcmp(item->type, "mime", 4) || !memcmp(item->type, "Exif", 4);
+            if (metadataPass != isMetadata) {
+                // only process metadata (XMP/Exif) payloads when metadataPass is true
+                continue;
+            }
+            avifBool isAlphaOrGainMap = item->itemCategory == AVIF_ITEM_ALPHA;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+            isAlphaOrGainMap = isAlphaOrGainMap || item->itemCategory == AVIF_ITEM_GAIN_MAP;
+#endif
+            if (alphaAndGainMapPass != isAlphaOrGainMap) {
+                // only process alpha payloads when alphaPass is true
+                continue;
+            }
+
+            if ((encoder->extraLayerCount > 0) && (item->encodeOutput->samples.count > 0)) {
+                // Interleave - Pick out AV1 items and interleave them later.
+                // We always interleave all AV1 items for layered images.
+                assert(item->encodeOutput->samples.count == item->mdatFixups.count);
+
+                avifEncoderItemReference * ref = (item->itemCategory == AVIF_ITEM_ALPHA) ? avifArrayPush(layeredAlphaItems)
+                                                                                         : avifArrayPush(layeredColorItems);
+                AVIF_CHECKERR(ref != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+                *ref = item;
+                continue;
+            }
+
+            size_t chunkOffset = 0;
+
+            // Deduplication - See if an identical chunk to this has already been written
+            if (item->encodeOutput->samples.count > 0) {
+                avifEncodeSample * sample = &item->encodeOutput->samples.sample[0];
+                chunkOffset = avifEncoderFindExistingChunk(s, mdatStartOffset, sample->data.data, sample->data.size);
+            } else {
+                chunkOffset = avifEncoderFindExistingChunk(s, mdatStartOffset, item->metadataPayload.data, item->metadataPayload.size);
+            }
+
+            if (!chunkOffset) {
+                // We've never seen this chunk before; write it out
+                chunkOffset = avifRWStreamOffset(s);
+                if (item->encodeOutput->samples.count > 0) {
+                    for (uint32_t sampleIndex = 0; sampleIndex < item->encodeOutput->samples.count; ++sampleIndex) {
+                        avifEncodeSample * sample = &item->encodeOutput->samples.sample[sampleIndex];
+                        AVIF_CHECKRES(avifRWStreamWrite(s, sample->data.data, sample->data.size));
+
+                        if (item->itemCategory == AVIF_ITEM_ALPHA) {
+                            encoder->ioStats.alphaOBUSize += sample->data.size;
+                        } else if (item->itemCategory == AVIF_ITEM_COLOR) {
+                            encoder->ioStats.colorOBUSize += sample->data.size;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+                        } else if (item->itemCategory == AVIF_ITEM_GAIN_MAP) {
+                            encoder->data->gainMapSizeBytes += sample->data.size;
+#endif
+                        }
+                    }
+                } else {
+                    AVIF_CHECKRES(avifRWStreamWrite(s, item->metadataPayload.data, item->metadataPayload.size));
+                }
+            }
+
+            for (uint32_t fixupIndex = 0; fixupIndex < item->mdatFixups.count; ++fixupIndex) {
+                avifOffsetFixup * fixup = &item->mdatFixups.fixup[fixupIndex];
+                size_t prevOffset = avifRWStreamOffset(s);
+                avifRWStreamSetOffset(s, fixup->offset);
+                AVIF_CHECKRES(avifRWStreamWriteU32(s, (uint32_t)chunkOffset));
+                avifRWStreamSetOffset(s, prevOffset);
+            }
+        }
+    }
+
+    uint32_t layeredItemCount = AVIF_MAX(layeredColorItems->count, layeredAlphaItems->count);
+    if (layeredItemCount > 0) {
+        // Interleave samples of all AV1 items.
+        // We first write the first layer of all items,
+        // in which we write first layer of each cell,
+        // in which we write alpha first and then color.
+        avifBool hasMoreSample;
+        uint32_t layerIndex = 0;
+        do {
+            hasMoreSample = AVIF_FALSE;
+            for (uint32_t itemIndex = 0; itemIndex < layeredItemCount; ++itemIndex) {
+                for (int samplePass = 0; samplePass < 2; ++samplePass) {
+                    // Alpha coming before color
+                    avifEncoderItemReferenceArray * currentItems = (samplePass == 0) ? layeredAlphaItems : layeredColorItems;
+                    if (itemIndex >= currentItems->count) {
+                        continue;
+                    }
+
+                    // TODO: Offer the ability for a user to specify which grid cell should be written first.
+                    avifEncoderItem * item = currentItems->ref[itemIndex];
+                    if (item->encodeOutput->samples.count <= layerIndex) {
+                        // We've already written all samples of this item
+                        continue;
+                    } else if (item->encodeOutput->samples.count > layerIndex + 1) {
+                        hasMoreSample = AVIF_TRUE;
+                    }
+                    avifRWData * data = &item->encodeOutput->samples.sample[layerIndex].data;
+                    size_t chunkOffset = avifEncoderFindExistingChunk(s, mdatStartOffset, data->data, data->size);
+                    if (!chunkOffset) {
+                        // We've never seen this chunk before; write it out
+                        chunkOffset = avifRWStreamOffset(s);
+                        AVIF_CHECKRES(avifRWStreamWrite(s, data->data, data->size));
+                        if (samplePass == 0) {
+                            encoder->ioStats.alphaOBUSize += data->size;
+                        } else {
+                            encoder->ioStats.colorOBUSize += data->size;
+                        }
+                    }
+
+                    size_t prevOffset = avifRWStreamOffset(s);
+                    avifRWStreamSetOffset(s, item->mdatFixups.fixup[layerIndex].offset);
+                    AVIF_CHECKRES(avifRWStreamWriteU32(s, (uint32_t)chunkOffset));
+                    avifRWStreamSetOffset(s, prevOffset);
+                }
+            }
+            ++layerIndex;
+        } while (hasMoreSample);
+
+        assert(layerIndex <= AVIF_MAX_AV1_LAYER_COUNT);
+    }
+    avifRWStreamFinishBox(s, mdat);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifWriteAltrGroup(avifRWStream * s, const avifEncoderItemIdArray * itemIDs)
+{
+    avifBoxMarker grpl;
+    AVIF_CHECKRES(avifRWStreamWriteBox(s, "grpl", AVIF_BOX_SIZE_TBD, &grpl));
+
+    avifBoxMarker altr;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(s, "altr", AVIF_BOX_SIZE_TBD, 0, 0, &altr));
+
+    AVIF_CHECKRES(avifRWStreamWriteU32(s, 1));                        // unsigned int(32) group_id;
+    AVIF_CHECKRES(avifRWStreamWriteU32(s, (uint32_t)itemIDs->count)); // unsigned int(32) num_entities_in_group;
+    for (uint32_t i = 0; i < itemIDs->count; ++i) {
+        AVIF_CHECKRES(avifRWStreamWriteU32(s, (uint32_t)itemIDs->item_id[i])); // unsigned int(32) entity_id;
+    }
+
+    avifRWStreamFinishBox(s, altr);
+
+    avifRWStreamFinishBox(s, grpl);
+
+    return AVIF_RESULT_OK;
+}
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+// Writes the extendedMeta field of the CondensedImageBox.
+static avifResult avifImageWriteExtendedMeta(const avifImage * imageMetadata, avifRWStream * stream)
+{
+    // The ExtendedMetaBox has no size and box type because these are already set by the CondensedImageBox.
+
+    avifBoxMarker iprp;
+    AVIF_CHECKRES(avifRWStreamWriteBox(stream, "iprp", AVIF_BOX_SIZE_TBD, &iprp));
+    {
+        // ItemPropertyContainerBox
+
+        avifBoxMarker ipco;
+        AVIF_CHECKRES(avifRWStreamWriteBox(stream, "ipco", AVIF_BOX_SIZE_TBD, &ipco));
+        {
+            // No need for dedup because there is only one property of each type and for a single item.
+            AVIF_CHECKRES(avifEncoderWriteHDRProperties(stream, stream, imageMetadata, /*ipma=*/NULL, /*dedup=*/NULL));
+            AVIF_CHECKRES(avifEncoderWriteExtendedColorProperties(stream, stream, imageMetadata, /*ipma=*/NULL, /*dedup=*/NULL));
+        }
+        avifRWStreamFinishBox(stream, ipco);
+
+        // ItemPropertyAssociationBox
+
+        avifBoxMarker ipma;
+        AVIF_CHECKRES(avifRWStreamWriteFullBox(stream, "ipma", AVIF_BOX_SIZE_TBD, 0, 0, &ipma));
+        {
+            // Same order as in avifEncoderWriteExtendedColorProperties().
+            const uint8_t numNonEssentialProperties = ((imageMetadata->clli.maxCLL || imageMetadata->clli.maxPALL) ? 1 : 0) +
+                                                      ((imageMetadata->transformFlags & AVIF_TRANSFORM_PASP) ? 1 : 0);
+            const uint8_t numEssentialProperties = ((imageMetadata->transformFlags & AVIF_TRANSFORM_CLAP) ? 1 : 0) +
+                                                   ((imageMetadata->transformFlags & AVIF_TRANSFORM_IROT) ? 1 : 0) +
+                                                   ((imageMetadata->transformFlags & AVIF_TRANSFORM_IMIR) ? 1 : 0);
+            const uint8_t ipmaCount = numNonEssentialProperties + numEssentialProperties;
+            assert(ipmaCount >= 1);
+
+            // Only add properties to the primary item.
+            AVIF_CHECKRES(avifRWStreamWriteU32(stream, 1)); // unsigned int(32) entry_count;
+            {
+                // Primary item ID is defined as 1 by the CondensedImageBox.
+                AVIF_CHECKRES(avifRWStreamWriteU16(stream, 1));        // unsigned int(16) item_ID;
+                AVIF_CHECKRES(avifRWStreamWriteU8(stream, ipmaCount)); // unsigned int(8) association_count;
+                for (uint8_t i = 0; i < ipmaCount; ++i) {
+                    AVIF_CHECKRES(avifRWStreamWriteBits(stream, (i >= numNonEssentialProperties) ? 1 : 0, /*bitCount=*/1)); // bit(1) essential;
+                    // The CondensedImageBox will always create 8 item properties, so to refer to the
+                    // first property in the ItemPropertyContainerBox above, use index 9.
+                    AVIF_CHECKRES(avifRWStreamWriteBits(stream, 9 + i, /*bitCount=*/7)); // unsigned int(7) property_index;
+                }
+            }
+        }
+        avifRWStreamFinishBox(stream, ipma);
+    }
+    avifRWStreamFinishBox(stream, iprp);
+    return AVIF_RESULT_OK;
+}
+
+// Returns true if the image can be encoded with a CondensedImageBox instead of a full regular MetaBox.
+static avifBool avifEncoderIsCondensedImageBoxCompatible(const avifEncoder * encoder)
+{
+    // The CondensedImageBox ("avir" brand) only supports non-layered, still images.
+    if (encoder->extraLayerCount || (encoder->data->frames.count != 1)) {
+        return AVIF_FALSE;
+    }
+
+    // Only 4:4:4, 4:2:0 and 4:0:0 are supported by a CondensedImageBox.
+    if ((encoder->data->imageMetadata->yuvFormat != AVIF_PIXEL_FORMAT_YUV444) &&
+        (encoder->data->imageMetadata->yuvFormat != AVIF_PIXEL_FORMAT_YUV420) &&
+        (encoder->data->imageMetadata->yuvFormat != AVIF_PIXEL_FORMAT_YUV400)) {
+        return AVIF_FALSE;
+    }
+
+    const avifEncoderItem * colorItem = NULL;
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+
+        // Grids are not supported by a CondensedImageBox.
+        if (item->gridCols || item->gridRows) {
+            return AVIF_FALSE;
+        }
+
+        if (item->id == encoder->data->primaryItemID) {
+            assert(!colorItem);
+            colorItem = item;
+            continue; // The primary item can be stored in the CondensedImageBox.
+        }
+        if (item->itemCategory == AVIF_ITEM_ALPHA && item->irefToID == encoder->data->primaryItemID) {
+            continue; // The alpha auxiliary item can be stored in the CondensedImageBox.
+        }
+        if (!memcmp(item->type, "mime", 4) && !memcmp(item->infeName, "XMP", item->infeNameSize)) {
+            assert(item->metadataPayload.size == encoder->data->imageMetadata->xmp.size);
+            continue; // XMP metadata can be stored in the CondensedImageBox.
+        }
+        if (!memcmp(item->type, "Exif", 4) && !memcmp(item->infeName, "Exif", item->infeNameSize)) {
+            assert(item->metadataPayload.size == encoder->data->imageMetadata->exif.size + 4);
+            const uint32_t exif_tiff_header_offset = *(uint32_t *)item->metadataPayload.data;
+            if (exif_tiff_header_offset != 0) {
+                return AVIF_FALSE;
+            }
+            continue; // Exif metadata can be stored in the CondensedImageBox if exif_tiff_header_offset is 0.
+        }
+
+        // Items besides the colorItem, the alphaItem and Exif/XMP/ICC
+        // metadata are not directly supported by the CondensedImageBox.
+        // Store them in its inner extendedMeta field instead.
+        // TODO(yguyon): Implement comment above instead of falling back to regular AVIF
+        //               (or drop the comment above if there is no other item type).
+        return AVIF_FALSE;
+    }
+    // A primary item is necessary.
+    if (!colorItem) {
+        return AVIF_FALSE;
+    }
+    return AVIF_TRUE;
+}
+
+static avifResult avifEncoderWriteCondensedImageBox(avifEncoder * encoder, avifRWStream * s, avifRWData * extendedMeta);
+
+static avifResult avifEncoderWriteFileTypeBoxAndCondensedImageBox(avifEncoder * encoder, avifRWData * output)
+{
+    avifRWStream s;
+    avifRWStreamStart(&s, output);
+
+    avifBoxMarker ftyp;
+    AVIF_CHECKRES(avifRWStreamWriteBox(&s, "ftyp", AVIF_BOX_SIZE_TBD, &ftyp));
+    AVIF_CHECKRES(avifRWStreamWriteChars(&s, "avir", 4)); // unsigned int(32) major_brand;
+    AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0));           // unsigned int(32) minor_version;
+    AVIF_CHECKRES(avifRWStreamWriteChars(&s, "avir", 4)); // unsigned int(32) compatible_brands[];
+    avifRWStreamFinishBox(&s, ftyp);
+
+    avifRWData extendedMeta = AVIF_DATA_EMPTY;
+    const avifResult result = avifEncoderWriteCondensedImageBox(encoder, &s, &extendedMeta);
+    avifRWDataFree(&extendedMeta);
+    AVIF_CHECKRES(result);
+
+    avifRWStreamFinishWrite(&s);
+    return AVIF_RESULT_OK;
+}
+
+static avifResult avifEncoderWriteCondensedImageBox(avifEncoder * encoder, avifRWStream * s, avifRWData * extendedMeta)
+{
+    const avifEncoderItem * colorItem = NULL;
+    const avifEncoderItem * alphaItem = NULL;
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+        if (item->id == encoder->data->primaryItemID) {
+            colorItem = item;
+            assert(colorItem->encodeOutput->samples.count == 1);
+        } else if (item->itemCategory == AVIF_ITEM_ALPHA && item->irefToID == encoder->data->primaryItemID) {
+            assert(!alphaItem);
+            alphaItem = item;
+            assert(alphaItem->encodeOutput->samples.count == 1);
+        }
+    }
+
+    assert(colorItem);
+    const avifRWData * colorData = &colorItem->encodeOutput->samples.sample[0].data;
+    const avifRWData * alphaData = alphaItem ? &alphaItem->encodeOutput->samples.sample[0].data : NULL;
+
+    const avifImage * const image = encoder->data->imageMetadata;
+
+    const avifBool isMonochrome = image->yuvFormat == AVIF_PIXEL_FORMAT_YUV400;
+    const avifBool isSubsampled = image->yuvFormat == AVIF_PIXEL_FORMAT_YUV420;
+    const avifBool fullRange = image->yuvRange == AVIF_RANGE_FULL;
+
+    avifBoxMarker coni;
+    AVIF_CHECKRES(avifRWStreamWriteBox(s, "coni", AVIF_BOX_SIZE_TBD, &coni));
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, 2)); // unsigned int(2) version;
+
+    AVIF_CHECKRES(avifRWStreamWriteVarInt(s, image->width - 1));  // varint(32) width_minus_one;
+    AVIF_CHECKRES(avifRWStreamWriteVarInt(s, image->height - 1)); // varint(32) height_minus_one;
+
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, 1));                // unsigned int(1) is_float;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, image->depth - 1, 4)); // unsigned int(4) bit_depth_minus_one;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, isMonochrome, 1));     // unsigned int(1) is_monochrome;
+    if (!isMonochrome) {
+        AVIF_CHECKRES(avifRWStreamWriteBits(s, isSubsampled, 1)); // unsigned int(1) is_subsampled;
+    }
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, fullRange, 1)); // unsigned int(1) full_range;
+    if (image->icc.size) {
+        AVIF_CHECKRES(avifRWStreamWriteBits(s, AVIF_CONI_COLOR_TYPE_ICC, 2));     // unsigned int(2) color_type;
+        AVIF_CHECKRES(avifRWStreamWriteBits(s, image->matrixCoefficients, 8));    // unsigned int(8) matrix_coefficients;
+        AVIF_CHECKRES(avifRWStreamWriteVarInt(s, (uint32_t)image->icc.size - 1)); // varint(32) icc_data_size;
+    } else {
+        if (((image->colorPrimaries == AVIF_COLOR_PRIMARIES_BT709) && (image->transferCharacteristics == AVIF_TRANSFER_CHARACTERISTICS_SRGB) &&
+             (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_BT601)) ||
+            ((image->colorPrimaries == AVIF_COLOR_PRIMARIES_UNSPECIFIED) &&
+             (image->transferCharacteristics == AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED) &&
+             (image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_UNSPECIFIED))) {
+            AVIF_CHECKRES(avifRWStreamWriteBits(s, AVIF_CONI_COLOR_TYPE_SRGB, 2)); // unsigned int(2) color_type;
+        } else {
+            const avifConiColorType colorType = ((image->colorPrimaries >> 5 == 0) && (image->transferCharacteristics >> 5 == 0) &&
+                                                 (image->matrixCoefficients >> 5 == 0))
+                                                    ? AVIF_CONI_COLOR_TYPE_NCLX_5BIT
+                                                    : AVIF_CONI_COLOR_TYPE_NCLX_8BIT;
+            const uint32_t numBitsPerComponent = (colorType == AVIF_CONI_COLOR_TYPE_NCLX_5BIT) ? 5 : 8;
+            AVIF_CHECKRES(avifRWStreamWriteBits(s, colorType, 2));                               // unsigned int(2) color_type;
+            AVIF_CHECKRES(avifRWStreamWriteBits(s, image->colorPrimaries, numBitsPerComponent)); // unsigned int(5) color_primaries;
+            AVIF_CHECKRES(avifRWStreamWriteBits(s, image->transferCharacteristics, numBitsPerComponent)); // unsigned int(5) transfer_characteristics;
+            AVIF_CHECKRES(avifRWStreamWriteBits(s, image->matrixCoefficients, numBitsPerComponent)); // unsigned int(5) matrix_coefficients;
+        }
+    }
+
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, 1)); // unsigned int(1) has_explicit_codec_types;
+    AVIF_CHECKRES(avifRWStreamWriteVarInt(s, 4));  // varint(32) main_item_codec_config_size;
+    assert(colorData->size >= 1);
+    AVIF_CHECKRES(avifRWStreamWriteVarInt(s, (uint32_t)colorData->size - 1)); // varint(32) main_item_data_size;
+
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, alphaItem ? 1 : 0, 1)); // unsigned int(1) has_alpha;
+    if (alphaItem) {
+        AVIF_CHECKRES(avifRWStreamWriteBits(s, image->alphaPremultiplied, 1)); // unsigned int(1) alpha_is_premultiplied;
+        AVIF_CHECKRES(avifRWStreamWriteVarInt(s, 4));                          // varint(32) alpha_item_codec_config_size;
+        AVIF_CHECKRES(avifRWStreamWriteVarInt(s, (uint32_t)alphaData->size));  // varint(32) alpha_item_data_size;
+    }
+
+    if (image->clli.maxCLL || image->clli.maxPALL || (image->transformFlags != AVIF_TRANSFORM_NONE)) {
+        avifRWStream extendedMetaStream;
+        avifRWStreamStart(&extendedMetaStream, extendedMeta);
+        AVIF_CHECKRES(avifImageWriteExtendedMeta(image, &extendedMetaStream));
+        avifRWStreamFinishWrite(&extendedMetaStream);
+    }
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, extendedMeta->size ? 1 : 0, 1)); // unsigned int(1) has_extended_meta;
+    if (extendedMeta->size) {
+        AVIF_CHECKRES(avifRWStreamWriteVarInt(s, (uint32_t)extendedMeta->size - 1)); // varint(32) extended_meta_size;
+    }
+
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, image->exif.size ? 1 : 0, 1)); // unsigned int(1) has_exif;
+    if (image->exif.size) {
+        AVIF_CHECKRES(avifRWStreamWriteVarInt(s, (uint32_t)image->exif.size - 1)); // varint(32) exif_data_size;
+    }
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, image->xmp.size ? 1 : 0, 1)); // unsigned int(1) has_xmp;
+    if (image->xmp.size) {
+        AVIF_CHECKRES(avifRWStreamWriteVarInt(s, (uint32_t)image->xmp.size - 1)); // varint(32) xmp_data_size;
+    }
+
+    // Padding to align with whole bytes if necessary.
+    if (s->numUsedBitsInPartialByte) {
+        AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, 8 - s->numUsedBitsInPartialByte));
+    }
+
+    if (alphaItem) {
+        AVIF_CHECKRES(writeCodecConfig(s,
+                                       &alphaItem->av1C)); // unsigned int(8) alpha_item_codec_config[];
+    }
+    AVIF_CHECKRES(writeCodecConfig(s, &colorItem->av1C)); // unsigned int(8) main_item_codec_config[];
+
+    if (extendedMeta->size) {
+        AVIF_CHECKRES(avifRWStreamWrite(s, extendedMeta->data, extendedMeta->size));
+    }
+
+    if (image->icc.size) {
+        AVIF_CHECKRES(avifRWStreamWrite(s, image->icc.data, image->icc.size)); // unsigned int(8) icc_data[];
+    }
+    if (alphaItem) {
+        AVIF_CHECKRES(avifRWStreamWrite(s, alphaData->data, alphaData->size)); // unsigned int(8) alpha_data[];
+    }
+    AVIF_CHECKRES(avifRWStreamWrite(s, colorData->data, colorData->size)); // unsigned int(8) main_data[];
+    if (image->exif.size) {
+        AVIF_CHECKRES(avifRWStreamWrite(s, image->exif.data, image->exif.size)); // unsigned int(8) exif_data[];
+    }
+    if (image->xmp.size) {
+        AVIF_CHECKRES(avifRWStreamWrite(s, image->xmp.data, image->xmp.size)); // unsigned int(8) xmp_data[];
+    }
+    avifRWStreamFinishBox(s, coni);
+    return AVIF_RESULT_OK;
+}
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+
+static avifResult avifRWStreamWriteProperties(avifItemPropertyDedup * const dedup,
+                                              avifRWStream * const s,
+                                              const avifEncoder * const encoder,
+                                              const avifImage * const imageMetadata)
+{
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+        const avifBool isGrid = (item->gridCols > 0);
+        const avifBool isToneMappedImage = !memcmp(item->type, "tmap", 4);
+        memset(&item->ipma, 0, sizeof(item->ipma));
+        if (!item->codec && !isGrid && !isToneMappedImage) {
+            // No ipma to write for this item
+            continue;
+        }
+
+        if (item->dimgFromID && (item->extraLayerCount == 0)) {
+            avifEncoderItem * parentItem = avifEncoderDataFindItemByID(encoder->data, item->dimgFromID);
+            if (parentItem && !memcmp(parentItem->type, "grid", 4)) {
+                // All image cells from a grid should share the exact same properties unless they are
+                // layered image which have different al1x, so see if we've already written properties
+                // out for another cell in this grid, and if so, just steal their ipma and move on.
+                // This is a sneaky way to provide iprp deduplication.
+
+                avifBool foundPreviousCell = AVIF_FALSE;
+                for (uint32_t dedupIndex = 0; dedupIndex < itemIndex; ++dedupIndex) {
+                    avifEncoderItem * dedupItem = &encoder->data->items.item[dedupIndex];
+                    if ((item->dimgFromID == dedupItem->dimgFromID) && (dedupItem->extraLayerCount == 0)) {
+                        // We've already written dedup's items out. Steal their ipma indices and move on!
+                        item->ipma = dedupItem->ipma;
+                        foundPreviousCell = AVIF_TRUE;
+                        break;
+                    }
+                }
+                if (foundPreviousCell) {
+                    continue;
+                }
+            }
+        }
+
+        const avifImage * itemMetadata = imageMetadata;
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        if (item->itemCategory == AVIF_ITEM_GAIN_MAP) {
+            itemMetadata = itemMetadata->gainMap.image;
+            assert(itemMetadata);
+        }
+#endif
+        uint32_t imageWidth = itemMetadata->width;
+        uint32_t imageHeight = itemMetadata->height;
+        if (isGrid) {
+            imageWidth = item->gridWidth;
+            imageHeight = item->gridHeight;
+        }
+
+        // Properties all image items need
+        avifItemPropertyDedupStart(dedup);
+        avifBoxMarker ispe;
+        AVIF_CHECKRES(avifRWStreamWriteFullBox(&dedup->s, "ispe", AVIF_BOX_SIZE_TBD, 0, 0, &ispe));
+        AVIF_CHECKRES(avifRWStreamWriteU32(&dedup->s, imageWidth));  // unsigned int(32) image_width;
+        AVIF_CHECKRES(avifRWStreamWriteU32(&dedup->s, imageHeight)); // unsigned int(32) image_height;
+        avifRWStreamFinishBox(&dedup->s, ispe);
+        AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, s, &item->ipma, AVIF_FALSE));
+
+        avifItemPropertyDedupStart(dedup);
+        uint8_t channelCount = (item->itemCategory == AVIF_ITEM_ALPHA || (itemMetadata->yuvFormat == AVIF_PIXEL_FORMAT_YUV400)) ? 1 : 3;
+        avifBoxMarker pixi;
+        AVIF_CHECKRES(avifRWStreamWriteFullBox(&dedup->s, "pixi", AVIF_BOX_SIZE_TBD, 0, 0, &pixi));
+        AVIF_CHECKRES(avifRWStreamWriteU8(&dedup->s, channelCount)); // unsigned int (8) num_channels;
+        for (uint8_t chan = 0; chan < channelCount; ++chan) {
+            AVIF_CHECKRES(avifRWStreamWriteU8(&dedup->s, (uint8_t)itemMetadata->depth)); // unsigned int (8) bits_per_channel;
+        }
+        avifRWStreamFinishBox(&dedup->s, pixi);
+        AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, s, &item->ipma, AVIF_FALSE));
+
+        if (item->codec) {
+            avifItemPropertyDedupStart(dedup);
+            AVIF_CHECKRES(writeConfigBox(&dedup->s, &item->av1C, encoder->data->configPropName));
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, s, &item->ipma, AVIF_TRUE));
+        }
+
+        if (item->itemCategory == AVIF_ITEM_ALPHA) {
+            // Alpha specific properties
+
+            avifItemPropertyDedupStart(dedup);
+            avifBoxMarker auxC;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&dedup->s, "auxC", AVIF_BOX_SIZE_TBD, 0, 0, &auxC));
+            AVIF_CHECKRES(avifRWStreamWriteChars(&dedup->s, alphaURN, alphaURNSize)); //  string aux_type;
+            avifRWStreamFinishBox(&dedup->s, auxC);
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, s, &item->ipma, AVIF_FALSE));
+        } else if (item->itemCategory == AVIF_ITEM_COLOR) {
+            // Color specific properties
+
+            AVIF_CHECKRES(avifEncoderWriteColorProperties(s, itemMetadata, &item->ipma, dedup));
+            if (isToneMappedImage) {
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+                // HDR properties for the tone mapped image ('tmap' box) are taken from the gain map image.
+                // Technically, the gain map is not an HDR image, but in the API, this is the most convenient
+                // place to put this data.
+
+                AVIF_CHECKRES(avifEncoderWriteHDRProperties(&dedup->s, s, imageMetadata->gainMap.image, &item->ipma, dedup));
+#endif
+            } else {
+                AVIF_CHECKRES(avifEncoderWriteHDRProperties(&dedup->s, s, itemMetadata, &item->ipma, dedup));
+            }
+#if defined(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP)
+        } else if (item->itemCategory == AVIF_ITEM_GAIN_MAP) {
+            // Gain map specific properties
+
+            // Write just the colr nclx box
+            AVIF_CHECKRES(avifEncoderWriteNclxProperty(&dedup->s, s, itemMetadata, &item->ipma, dedup));
+#endif
+        }
+
+        if (item->extraLayerCount > 0) {
+            // Layered Image Indexing Property
+
+            avifItemPropertyDedupStart(dedup);
+            avifBoxMarker a1lx;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&dedup->s, "a1lx", AVIF_BOX_SIZE_TBD, &a1lx));
+            uint32_t layerSize[AVIF_MAX_AV1_LAYER_COUNT - 1] = { 0 };
+            avifBool largeSize = AVIF_FALSE;
+
+            for (uint32_t validLayer = 0; validLayer < item->extraLayerCount; ++validLayer) {
+                uint32_t size = (uint32_t)item->encodeOutput->samples.sample[validLayer].data.size;
+                layerSize[validLayer] = size;
+                if (size > 0xffff) {
+                    largeSize = AVIF_TRUE;
+                }
+            }
+
+            AVIF_CHECKRES(avifRWStreamWriteBits(&dedup->s, 0, /*bitCount=*/7));                 // unsigned int(7) reserved = 0;
+            AVIF_CHECKRES(avifRWStreamWriteBits(&dedup->s, largeSize ? 1 : 0, /*bitCount=*/1)); // unsigned int(1) large_size;
+
+            // FieldLength = (large_size + 1) * 16;
+            // unsigned int(FieldLength) layer_size[3];
+            for (uint32_t layer = 0; layer < AVIF_MAX_AV1_LAYER_COUNT - 1; ++layer) {
+                if (largeSize) {
+                    AVIF_CHECKRES(avifRWStreamWriteU32(&dedup->s, layerSize[layer]));
+                } else {
+                    AVIF_CHECKRES(avifRWStreamWriteU16(&dedup->s, (uint16_t)layerSize[layer]));
+                }
+            }
+            avifRWStreamFinishBox(&dedup->s, a1lx);
+            AVIF_CHECKRES(avifItemPropertyDedupFinish(dedup, s, &item->ipma, AVIF_FALSE));
+        }
+    }
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifEncoderFinish(avifEncoder * encoder, avifRWData * output)
+{
+    avifDiagnosticsClearError(&encoder->diag);
+    if (encoder->data->items.count == 0) {
+        return AVIF_RESULT_NO_CONTENT;
+    }
+
+    const avifCodecType codecType = avifEncoderGetCodecType(encoder);
+    if (codecType == AVIF_CODEC_TYPE_UNKNOWN) {
+        return AVIF_RESULT_NO_CODEC_AVAILABLE;
+    }
+
+    // -----------------------------------------------------------------------
+    // Finish up encoding
+
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+        if (item->codec) {
+            if (!item->codec->encodeFinish(item->codec, item->encodeOutput)) {
+                return avifGetErrorForItemCategory(item->itemCategory);
+            }
+
+            if (item->encodeOutput->samples.count != encoder->data->frames.count) {
+                return avifGetErrorForItemCategory(item->itemCategory);
+            }
+
+            if ((item->extraLayerCount > 0) && (item->encodeOutput->samples.count != item->extraLayerCount + 1)) {
+                // Check whether user has sent enough frames to encoder.
+                avifDiagnosticsPrintf(&encoder->diag,
+                                      "Expected %u frames given to avifEncoderAddImage() to encode this layered image according to extraLayerCount, but got %u frames.",
+                                      item->extraLayerCount + 1,
+                                      item->encodeOutput->samples.count);
+                return AVIF_RESULT_INVALID_ARGUMENT;
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // Harvest configuration properties from sequence headers
+
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+        if (item->encodeOutput->samples.count > 0) {
+            const avifEncodeSample * firstSample = &item->encodeOutput->samples.sample[0];
+            avifSequenceHeader sequenceHeader;
+            AVIF_CHECKERR(avifSequenceHeaderParse(&sequenceHeader, (const avifROData *)&firstSample->data, codecType),
+                          avifGetErrorForItemCategory(item->itemCategory));
+            item->av1C = sequenceHeader.av1C;
+        }
+    }
+
+    // -----------------------------------------------------------------------
+    // Begin write stream
+
+#if defined(AVIF_ENABLE_EXPERIMENTAL_AVIR)
+    // Decide whether to go for a CondensedImageBox or a full regular MetaBox.
+    if ((encoder->headerFormat == AVIF_HEADER_REDUCED) && avifEncoderIsCondensedImageBoxCompatible(encoder)) {
+        AVIF_CHECKRES(avifEncoderWriteFileTypeBoxAndCondensedImageBox(encoder, output));
+        return AVIF_RESULT_OK;
+    }
+#endif // AVIF_ENABLE_EXPERIMENTAL_AVIR
+
+    const avifImage * imageMetadata = encoder->data->imageMetadata;
+    // The epoch for creation_time and modification_time is midnight, Jan. 1,
+    // 1904, in UTC time. Add the number of seconds between that epoch and the
+    // Unix epoch.
+    uint64_t now = (uint64_t)time(NULL) + 2082844800;
+
+    avifRWStream s;
+    avifRWStreamStart(&s, output);
+
+    // -----------------------------------------------------------------------
+    // Write ftyp
+
+    // Layered sequence is not supported for now.
+    const avifBool isSequence = (encoder->extraLayerCount == 0) && (encoder->data->frames.count > 1);
+
+    const char * majorBrand = "avif";
+    if (isSequence) {
+        majorBrand = "avis";
+    }
+
+    uint32_t minorVersion = 0;
+#if defined(AVIF_CODEC_AVM)
+    if (codecType == AVIF_CODEC_TYPE_AV2) {
+        // TODO(yguyon): Experimental AV2-AVIF is AVIF version 2 for now (change once it is ratified).
+        minorVersion = 2;
+    }
+#endif
+
+    // According to section 5.2 of AV1 Image File Format specification v1.1.0:
+    //   If the primary item or all the items referenced by the primary item are AV1 image items made only
+    //   of Intra Frames, the brand "avio" should be used in the compatible_brands field of the FileTypeBox.
+    // See https://aomediacodec.github.io/av1-avif/v1.1.0.html#image-and-image-collection-brand.
+    // This rule corresponds to using the "avio" brand in all cases except for layered images, because:
+    //  - Non-layered still images are always Intra Frames, even with grids;
+    //  - Sequences cannot be combined with layers or grids, and the first frame of the sequence
+    //    (referred to by the primary image item) is always an Intra Frame.
+    avifBool useAvioBrand;
+    if (isSequence) {
+        // According to section 5.3 of AV1 Image File Format specification v1.1.0:
+        //   Additionally, if a file contains AV1 image sequences and the brand avio is used in the
+        //   compatible_brands field of the FileTypeBox, the item constraints for this brand shall be met
+        //   and at least one of the AV1 image sequences shall be made only of AV1 Samples marked as sync.
+        // See https://aomediacodec.github.io/av1-avif/v1.1.0.html#image-sequence-brand.
+        useAvioBrand = AVIF_FALSE;
+        for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+            avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+            if (item->encodeOutput->samples.count == 0) {
+                continue; // Not a track.
+            }
+            avifBool onlySyncSamples = AVIF_TRUE;
+            for (uint32_t sampleIndex = 0; sampleIndex < item->encodeOutput->samples.count; ++sampleIndex) {
+                if (!item->encodeOutput->samples.sample[sampleIndex].sync) {
+                    onlySyncSamples = AVIF_FALSE;
+                    break;
+                }
+            }
+            if (onlySyncSamples) {
+                useAvioBrand = AVIF_TRUE; // at least one of the AV1 image sequences is made only of sync samples
+                break;
+            }
+        }
+    } else {
+        // The gpac/ComplianceWarden tool only warns about the lack of the "avio" brand for sequences,
+        // and the specification says the brand "should" be used, not "shall". Leverage that opportunity
+        // to save four bytes for still images.
+        useAvioBrand = AVIF_FALSE; // Should be (encoder->extraLayerCount == 0) to be fully compliant.
+    }
+
+    avifBoxMarker ftyp;
+    AVIF_CHECKRES(avifRWStreamWriteBox(&s, "ftyp", AVIF_BOX_SIZE_TBD, &ftyp));
+    AVIF_CHECKRES(avifRWStreamWriteChars(&s, majorBrand, 4));              // unsigned int(32) major_brand;
+    AVIF_CHECKRES(avifRWStreamWriteU32(&s, minorVersion));                 // unsigned int(32) minor_version;
+    AVIF_CHECKRES(avifRWStreamWriteChars(&s, "avif", 4));                  // unsigned int(32) compatible_brands[];
+    if (useAvioBrand) {                                                    //
+        AVIF_CHECKRES(avifRWStreamWriteChars(&s, "avio", 4));              // ... compatible_brands[]
+    }                                                                      //
+    if (isSequence) {                                                      //
+        AVIF_CHECKRES(avifRWStreamWriteChars(&s, "avis", 4));              // ... compatible_brands[]
+        AVIF_CHECKRES(avifRWStreamWriteChars(&s, "msf1", 4));              // ... compatible_brands[]
+        AVIF_CHECKRES(avifRWStreamWriteChars(&s, "iso8", 4));              // ... compatible_brands[]
+    }                                                                      //
+    AVIF_CHECKRES(avifRWStreamWriteChars(&s, "mif1", 4));                  // ... compatible_brands[]
+    AVIF_CHECKRES(avifRWStreamWriteChars(&s, "miaf", 4));                  // ... compatible_brands[]
+    if ((imageMetadata->depth == 8) || (imageMetadata->depth == 10)) {     //
+        if (imageMetadata->yuvFormat == AVIF_PIXEL_FORMAT_YUV420) {        //
+            AVIF_CHECKRES(avifRWStreamWriteChars(&s, "MA1B", 4));          // ... compatible_brands[]
+        } else if (imageMetadata->yuvFormat == AVIF_PIXEL_FORMAT_YUV444) { //
+            AVIF_CHECKRES(avifRWStreamWriteChars(&s, "MA1A", 4));          // ... compatible_brands[]
+        }
+    }
+    avifRWStreamFinishBox(&s, ftyp);
+
+    // -----------------------------------------------------------------------
+    // Start meta
+
+    avifBoxMarker meta;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "meta", AVIF_BOX_SIZE_TBD, 0, 0, &meta));
+
+    // -----------------------------------------------------------------------
+    // Write hdlr
+
+    avifBoxMarker hdlr;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "hdlr", AVIF_BOX_SIZE_TBD, 0, 0, &hdlr));
+    AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0));              // unsigned int(32) pre_defined = 0;
+    AVIF_CHECKRES(avifRWStreamWriteChars(&s, "pict", 4));    // unsigned int(32) handler_type;
+    AVIF_CHECKRES(avifRWStreamWriteZeros(&s, 12));           // const unsigned int(32)[3] reserved = 0;
+    AVIF_CHECKRES(avifRWStreamWriteChars(&s, "libavif", 8)); // string name; (writing null terminator)
+    avifRWStreamFinishBox(&s, hdlr);
+
+    // -----------------------------------------------------------------------
+    // Write pitm
+
+    if (encoder->data->primaryItemID != 0) {
+        AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "pitm", sizeof(uint16_t), 0, 0, /*marker=*/NULL));
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, encoder->data->primaryItemID)); //  unsigned int(16) item_ID;
+    }
+
+    // -----------------------------------------------------------------------
+    // Write iloc
+
+    avifBoxMarker iloc;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "iloc", AVIF_BOX_SIZE_TBD, 0, 0, &iloc));
+    AVIF_CHECKRES(avifRWStreamWriteBits(&s, 4, /*bitCount=*/4));                   // unsigned int(4) offset_size;
+    AVIF_CHECKRES(avifRWStreamWriteBits(&s, 4, /*bitCount=*/4));                   // unsigned int(4) length_size;
+    AVIF_CHECKRES(avifRWStreamWriteBits(&s, 0, /*bitCount=*/4));                   // unsigned int(4) base_offset_size;
+    AVIF_CHECKRES(avifRWStreamWriteBits(&s, 0, /*bitCount=*/4));                   // unsigned int(4) reserved;
+    AVIF_CHECKRES(avifRWStreamWriteU16(&s, (uint16_t)encoder->data->items.count)); // unsigned int(16) item_count;
+
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, item->id)); // unsigned int(16) item_ID;
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));        // unsigned int(16) data_reference_index;
+
+        // Layered Image, write location for all samples
+        if (item->extraLayerCount > 0) {
+            uint32_t layerCount = item->extraLayerCount + 1;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, (uint16_t)layerCount)); // unsigned int(16) extent_count;
+            for (uint32_t i = 0; i < layerCount; ++i) {
+                AVIF_CHECKRES(avifEncoderItemAddMdatFixup(item, &s));
+                AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0 /* set later */)); // unsigned int(offset_size*8) extent_offset;
+                AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)item->encodeOutput->samples.sample[i].data.size)); // unsigned int(length_size*8) extent_length;
+            }
+            continue;
+        }
+
+        uint32_t contentSize = (uint32_t)item->metadataPayload.size;
+        if (item->encodeOutput->samples.count > 0) {
+            // This is choosing sample 0's size as there are two cases here:
+            // * This is a single image, in which case this is correct
+            // * This is an image sequence, but this file should still be a valid single-image avif,
+            //   so there must still be a primary item pointing at a sync sample. Since the first
+            //   frame of the image sequence is guaranteed to be a sync sample, it is chosen here.
+            //
+            // TODO: Offer the ability for a user to specify which frame in the sequence should
+            //       become the primary item's image, and force that frame to be a keyframe.
+            contentSize = (uint32_t)item->encodeOutput->samples.sample[0].data.size;
+        }
+
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, 1));                     // unsigned int(16) extent_count;
+        AVIF_CHECKRES(avifEncoderItemAddMdatFixup(item, &s));           //
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0 /* set later */));     // unsigned int(offset_size*8) extent_offset;
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)contentSize)); // unsigned int(length_size*8) extent_length;
+    }
+
+    avifRWStreamFinishBox(&s, iloc);
+
+    // -----------------------------------------------------------------------
+    // Write iinf
+
+    avifBoxMarker iinf;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "iinf", AVIF_BOX_SIZE_TBD, 0, 0, &iinf));
+    AVIF_CHECKRES(avifRWStreamWriteU16(&s, (uint16_t)encoder->data->items.count)); //  unsigned int(16) entry_count;
+
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+
+        uint32_t flags = item->hiddenImage ? 1 : 0;
+        avifBoxMarker infe;
+        AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "infe", AVIF_BOX_SIZE_TBD, 2, flags, &infe));
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, item->id));                             // unsigned int(16) item_ID;
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));                                    // unsigned int(16) item_protection_index;
+        AVIF_CHECKRES(avifRWStreamWrite(&s, item->type, 4));                           // unsigned int(32) item_type;
+        AVIF_CHECKRES(avifRWStreamWriteChars(&s, item->infeName, item->infeNameSize)); // string item_name; (writing null terminator)
+        if (item->infeContentType && item->infeContentTypeSize) { // string content_type; (writing null terminator)
+            AVIF_CHECKRES(avifRWStreamWriteChars(&s, item->infeContentType, item->infeContentTypeSize));
+        }
+        avifRWStreamFinishBox(&s, infe);
+    }
+
+    avifRWStreamFinishBox(&s, iinf);
+
+    // -----------------------------------------------------------------------
+    // Write iref boxes
+
+    avifBoxMarker iref = 0;
+    for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+        avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+
+        // Count how many other items refer to this item with dimgFromID
+        uint16_t dimgCount = 0;
+        for (uint32_t dimgIndex = 0; dimgIndex < encoder->data->items.count; ++dimgIndex) {
+            avifEncoderItem * dimgItem = &encoder->data->items.item[dimgIndex];
+            if (dimgItem->dimgFromID == item->id) {
+                ++dimgCount;
+            }
+        }
+
+        if (dimgCount > 0) {
+            if (!iref) {
+                AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "iref", AVIF_BOX_SIZE_TBD, 0, 0, &iref));
+            }
+            avifBoxMarker refType;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, "dimg", AVIF_BOX_SIZE_TBD, &refType));
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, item->id));  // unsigned int(16) from_item_ID;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, dimgCount)); // unsigned int(16) reference_count;
+            for (uint32_t dimgIndex = 0; dimgIndex < encoder->data->items.count; ++dimgIndex) {
+                avifEncoderItem * dimgItem = &encoder->data->items.item[dimgIndex];
+                if (dimgItem->dimgFromID == item->id) {
+                    AVIF_CHECKRES(avifRWStreamWriteU16(&s, dimgItem->id)); // unsigned int(16) to_item_ID;
+                }
+            }
+            avifRWStreamFinishBox(&s, refType);
+        }
+
+        if (item->irefToID != 0) {
+            if (!iref) {
+                AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "iref", AVIF_BOX_SIZE_TBD, 0, 0, &iref));
+            }
+            avifBoxMarker refType;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, item->irefType, AVIF_BOX_SIZE_TBD, &refType));
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, item->id));       // unsigned int(16) from_item_ID;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 1));              // unsigned int(16) reference_count;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, item->irefToID)); // unsigned int(16) to_item_ID;
+            avifRWStreamFinishBox(&s, refType);
+        }
+    }
+    if (iref) {
+        avifRWStreamFinishBox(&s, iref);
+    }
+
+    // -----------------------------------------------------------------------
+    // Write iprp -> ipco/ipma
+
+    avifBoxMarker iprp;
+    AVIF_CHECKRES(avifRWStreamWriteBox(&s, "iprp", AVIF_BOX_SIZE_TBD, &iprp));
+
+    avifItemPropertyDedup * dedup = avifItemPropertyDedupCreate();
+    AVIF_CHECKERR(dedup != NULL, AVIF_RESULT_OUT_OF_MEMORY);
+    avifBoxMarker ipco;
+    AVIF_CHECKRES(avifRWStreamWriteBox(&s, "ipco", AVIF_BOX_SIZE_TBD, &ipco));
+    avifResult result = avifRWStreamWriteProperties(dedup, &s, encoder, imageMetadata);
+    avifItemPropertyDedupDestroy(dedup);
+    AVIF_CHECKRES(result);
+    avifRWStreamFinishBox(&s, ipco);
+    dedup = NULL;
+
+    avifBoxMarker ipma;
+    AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "ipma", AVIF_BOX_SIZE_TBD, 0, 0, &ipma));
+    {
+        int ipmaCount = 0;
+        for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+            avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+            if (item->ipma.count > 0) {
+                ++ipmaCount;
+            }
+        }
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, ipmaCount)); // unsigned int(32) entry_count;
+
+        for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+            avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+            if (item->ipma.count == 0) {
+                continue;
+            }
+
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, item->id));        // unsigned int(16) item_ID;
+            AVIF_CHECKRES(avifRWStreamWriteU8(&s, item->ipma.count)); // unsigned int(8) association_count;
+            for (int i = 0; i < item->ipma.count; ++i) {
+                AVIF_CHECKRES(avifRWStreamWriteBits(&s, item->ipma.essential[i] ? 1 : 0, /*bitCount=*/1)); // bit(1) essential;
+                AVIF_CHECKRES(avifRWStreamWriteBits(&s, item->ipma.associations[i], /*bitCount=*/7)); // unsigned int(7) property_index;
+            }
+        }
+    }
+    avifRWStreamFinishBox(&s, ipma);
+
+    avifRWStreamFinishBox(&s, iprp);
+
+    // -----------------------------------------------------------------------
+    // Write grpl/altr box
+
+    if (encoder->data->alternativeItemIDs.count) {
+        AVIF_CHECKRES(avifWriteAltrGroup(&s, &encoder->data->alternativeItemIDs));
+    }
+
+    // -----------------------------------------------------------------------
+    // Finish meta box
+
+    avifRWStreamFinishBox(&s, meta);
+
+    // -----------------------------------------------------------------------
+    // Write tracks (if an image sequence)
+
+    if (isSequence) {
+        static const uint8_t unityMatrix[9][4] = {
+            /* clang-format off */
+            { 0x00, 0x01, 0x00, 0x00 },
+            { 0 },
+            { 0 },
+            { 0 },
+            { 0x00, 0x01, 0x00, 0x00 },
+            { 0 },
+            { 0 },
+            { 0 },
+            { 0x40, 0x00, 0x00, 0x00 }
+            /* clang-format on */
+        };
+
+        if (encoder->repetitionCount < 0 && encoder->repetitionCount != AVIF_REPETITION_COUNT_INFINITE) {
+            return AVIF_RESULT_INVALID_ARGUMENT;
+        }
+
+        uint64_t framesDurationInTimescales = 0;
+        for (uint32_t frameIndex = 0; frameIndex < encoder->data->frames.count; ++frameIndex) {
+            const avifEncoderFrame * frame = &encoder->data->frames.frame[frameIndex];
+            framesDurationInTimescales += frame->durationInTimescales;
+        }
+        uint64_t durationInTimescales;
+        if (encoder->repetitionCount == AVIF_REPETITION_COUNT_INFINITE) {
+            durationInTimescales = AVIF_INDEFINITE_DURATION64;
+        } else {
+            uint64_t loopCount = encoder->repetitionCount + 1;
+            assert(framesDurationInTimescales != 0);
+            if (loopCount > UINT64_MAX / framesDurationInTimescales) {
+                // The multiplication will overflow uint64_t.
+                return AVIF_RESULT_INVALID_ARGUMENT;
+            }
+            durationInTimescales = framesDurationInTimescales * loopCount;
+        }
+
+        // -------------------------------------------------------------------
+        // Start moov
+
+        avifBoxMarker moov;
+        AVIF_CHECKRES(avifRWStreamWriteBox(&s, "moov", AVIF_BOX_SIZE_TBD, &moov));
+
+        avifBoxMarker mvhd;
+        AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "mvhd", AVIF_BOX_SIZE_TBD, 1, 0, &mvhd));
+        AVIF_CHECKRES(avifRWStreamWriteU64(&s, now));                          // unsigned int(64) creation_time;
+        AVIF_CHECKRES(avifRWStreamWriteU64(&s, now));                          // unsigned int(64) modification_time;
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)encoder->timescale)); // unsigned int(32) timescale;
+        AVIF_CHECKRES(avifRWStreamWriteU64(&s, durationInTimescales));         // unsigned int(64) duration;
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0x00010000)); // template int(32) rate = 0x00010000; // typically 1.0
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0x0100));     // template int(16) volume = 0x0100; // typically, full volume
+        AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));          // const bit(16) reserved = 0;
+        AVIF_CHECKRES(avifRWStreamWriteZeros(&s, 8));        // const unsigned int(32)[2] reserved = 0;
+        AVIF_CHECKRES(avifRWStreamWrite(&s, unityMatrix, sizeof(unityMatrix)));
+        AVIF_CHECKRES(avifRWStreamWriteZeros(&s, 24));                       // bit(32)[6] pre_defined = 0;
+        AVIF_CHECKRES(avifRWStreamWriteU32(&s, encoder->data->items.count)); // unsigned int(32) next_track_ID;
+        avifRWStreamFinishBox(&s, mvhd);
+
+        // -------------------------------------------------------------------
+        // Write tracks
+
+        for (uint32_t itemIndex = 0; itemIndex < encoder->data->items.count; ++itemIndex) {
+            avifEncoderItem * item = &encoder->data->items.item[itemIndex];
+            if (item->encodeOutput->samples.count == 0) {
+                continue;
+            }
+
+            uint32_t syncSamplesCount = 0;
+            for (uint32_t sampleIndex = 0; sampleIndex < item->encodeOutput->samples.count; ++sampleIndex) {
+                avifEncodeSample * sample = &item->encodeOutput->samples.sample[sampleIndex];
+                if (sample->sync) {
+                    ++syncSamplesCount;
+                }
+            }
+
+            avifBoxMarker trak;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, "trak", AVIF_BOX_SIZE_TBD, &trak));
+
+            avifBoxMarker tkhd;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "tkhd", AVIF_BOX_SIZE_TBD, 1, 1, &tkhd));
+            AVIF_CHECKRES(avifRWStreamWriteU64(&s, now));                    // unsigned int(64) creation_time;
+            AVIF_CHECKRES(avifRWStreamWriteU64(&s, now));                    // unsigned int(64) modification_time;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, itemIndex + 1));          // unsigned int(32) track_ID;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0));                      // const unsigned int(32) reserved = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU64(&s, durationInTimescales));   // unsigned int(64) duration;
+            AVIF_CHECKRES(avifRWStreamWriteZeros(&s, sizeof(uint32_t) * 2)); // const unsigned int(32)[2] reserved = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));                      // template int(16) layer = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));                      // template int(16) alternate_group = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0)); // template int(16) volume = {if track_is_audio 0x0100 else 0};
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0)); // const unsigned int(16) reserved = 0;
+            AVIF_CHECKRES(avifRWStreamWrite(&s, unityMatrix, sizeof(unityMatrix))); // template int(32)[9] matrix= // { 0x00010000,0,0,0,0x00010000,0,0,0,0x40000000 };
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, imageMetadata->width << 16));  // unsigned int(32) width;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, imageMetadata->height << 16)); // unsigned int(32) height;
+            avifRWStreamFinishBox(&s, tkhd);
+
+            if (item->irefToID != 0) {
+                avifBoxMarker tref;
+                AVIF_CHECKRES(avifRWStreamWriteBox(&s, "tref", AVIF_BOX_SIZE_TBD, &tref));
+                avifBoxMarker refType;
+                AVIF_CHECKRES(avifRWStreamWriteBox(&s, item->irefType, AVIF_BOX_SIZE_TBD, &refType));
+                AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)item->irefToID));
+                avifRWStreamFinishBox(&s, refType);
+                avifRWStreamFinishBox(&s, tref);
+            }
+
+            avifBoxMarker edts;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, "edts", AVIF_BOX_SIZE_TBD, &edts));
+            uint32_t elstFlags = (encoder->repetitionCount != 0);
+            avifBoxMarker elst;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "elst", AVIF_BOX_SIZE_TBD, 1, elstFlags, &elst));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 1));                          // unsigned int(32) entry_count;
+            AVIF_CHECKRES(avifRWStreamWriteU64(&s, framesDurationInTimescales)); // unsigned int(64) segment_duration;
+            AVIF_CHECKRES(avifRWStreamWriteU64(&s, 0));                          // int(64) media_time;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 1));                          // int(16) media_rate_integer;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));                          // int(16) media_rate_fraction = 0;
+            avifRWStreamFinishBox(&s, elst);
+            avifRWStreamFinishBox(&s, edts);
+
+            if (item->itemCategory != AVIF_ITEM_ALPHA) {
+                AVIF_CHECKRES(avifEncoderWriteTrackMetaBox(encoder, &s));
+            }
+
+            avifBoxMarker mdia;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, "mdia", AVIF_BOX_SIZE_TBD, &mdia));
+
+            avifBoxMarker mdhd;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "mdhd", AVIF_BOX_SIZE_TBD, 1, 0, &mdhd));
+            AVIF_CHECKRES(avifRWStreamWriteU64(&s, now));                          // unsigned int(64) creation_time;
+            AVIF_CHECKRES(avifRWStreamWriteU64(&s, now));                          // unsigned int(64) modification_time;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)encoder->timescale)); // unsigned int(32) timescale;
+            AVIF_CHECKRES(avifRWStreamWriteU64(&s, framesDurationInTimescales));   // unsigned int(64) duration;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 21956)); // bit(1) pad = 0; unsigned int(5)[3] language; ("und")
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));     // unsigned int(16) pre_defined = 0;
+            avifRWStreamFinishBox(&s, mdhd);
+
+            avifBoxMarker hdlrTrak;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "hdlr", AVIF_BOX_SIZE_TBD, 0, 0, &hdlrTrak));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0)); // unsigned int(32) pre_defined = 0;
+            AVIF_CHECKRES(avifRWStreamWriteChars(&s, (item->itemCategory == AVIF_ITEM_ALPHA) ? "auxv" : "pict", 4)); // unsigned int(32) handler_type;
+            AVIF_CHECKRES(avifRWStreamWriteZeros(&s, 12));           // const unsigned int(32)[3] reserved = 0;
+            AVIF_CHECKRES(avifRWStreamWriteChars(&s, "libavif", 8)); // string name; (writing null terminator)
+            avifRWStreamFinishBox(&s, hdlrTrak);
+
+            avifBoxMarker minf;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, "minf", AVIF_BOX_SIZE_TBD, &minf));
+
+            avifBoxMarker vmhd;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "vmhd", AVIF_BOX_SIZE_TBD, 0, 1, &vmhd));
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0)); // template unsigned int(16) graphicsmode = 0; (copy over the existing image)
+            AVIF_CHECKRES(avifRWStreamWriteZeros(&s, 6)); // template unsigned int(16)[3] opcolor = {0, 0, 0};
+            avifRWStreamFinishBox(&s, vmhd);
+
+            avifBoxMarker dinf;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, "dinf", AVIF_BOX_SIZE_TBD, &dinf));
+            avifBoxMarker dref;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "dref", AVIF_BOX_SIZE_TBD, 0, 0, &dref));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 1)); // unsigned int(32) entry_count;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "url ", /*contentSize=*/0, 0, 1, /*marker=*/NULL)); // flags:1 means data is in this file
+            avifRWStreamFinishBox(&s, dref);
+            avifRWStreamFinishBox(&s, dinf);
+
+            // The boxes within the "stbl" box are ordered using the following recommendation in ISO/IEC 14496-12, Section 6.2.3:
+            // 4) It is recommended that the boxes within the Sample Table Box be in the following order: Sample Description
+            // (stsd), Time to Sample (stts), Sample to Chunk (stsc), Sample Size (stsz), Chunk Offset (stco).
+            //
+            // Any boxes not listed in the above line are placed in the end (after the "stco" box).
+            avifBoxMarker stbl;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, "stbl", AVIF_BOX_SIZE_TBD, &stbl));
+
+            avifBoxMarker stsd;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "stsd", AVIF_BOX_SIZE_TBD, 0, 0, &stsd));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 1)); // unsigned int(32) entry_count;
+            avifBoxMarker imageItem;
+            AVIF_CHECKRES(avifRWStreamWriteBox(&s, encoder->data->imageItemType, AVIF_BOX_SIZE_TBD, &imageItem));
+            AVIF_CHECKRES(avifRWStreamWriteZeros(&s, 6));                             // const unsigned int(8)[6] reserved = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 1));                               // unsigned int(16) data_reference_index;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));                               // unsigned int(16) pre_defined = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0));                               // const unsigned int(16) reserved = 0;
+            AVIF_CHECKRES(avifRWStreamWriteZeros(&s, sizeof(uint32_t) * 3));          // unsigned int(32)[3] pre_defined = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, (uint16_t)imageMetadata->width));  // unsigned int(16) width;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, (uint16_t)imageMetadata->height)); // unsigned int(16) height;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0x00480000));                      // template unsigned int(32) horizresolution
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0x00480000));                      // template unsigned int(32) vertresolution
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0));                               // const unsigned int(32) reserved = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 1));                      // template unsigned int(16) frame_count = 1;
+            AVIF_CHECKRES(avifRWStreamWriteChars(&s, "\012AOM Coding", 11)); // string[32] compressorname;
+            AVIF_CHECKRES(avifRWStreamWriteZeros(&s, 32 - 11));              //
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, 0x0018));                 // template unsigned int(16) depth = 0x0018;
+            AVIF_CHECKRES(avifRWStreamWriteU16(&s, (uint16_t)0xffff));       // int(16) pre_defined = -1;
+            AVIF_CHECKRES(writeConfigBox(&s, &item->av1C, encoder->data->configPropName));
+            if (item->itemCategory == AVIF_ITEM_COLOR) {
+                AVIF_CHECKRES(avifEncoderWriteColorProperties(&s, imageMetadata, NULL, NULL));
+                AVIF_CHECKRES(avifEncoderWriteHDRProperties(NULL, &s, imageMetadata, NULL, NULL));
+            }
+
+            avifBoxMarker ccst;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "ccst", AVIF_BOX_SIZE_TBD, 0, 0, &ccst));
+            AVIF_CHECKRES(avifRWStreamWriteBits(&s, 0, /*bitCount=*/1));  // unsigned int(1) all_ref_pics_intra;
+            AVIF_CHECKRES(avifRWStreamWriteBits(&s, 1, /*bitCount=*/1));  // unsigned int(1) intra_pred_used;
+            AVIF_CHECKRES(avifRWStreamWriteBits(&s, 15, /*bitCount=*/4)); // unsigned int(4) max_ref_per_pic;
+            AVIF_CHECKRES(avifRWStreamWriteBits(&s, 0, /*bitCount=*/26)); // unsigned int(26) reserved;
+            avifRWStreamFinishBox(&s, ccst);
+
+            if (item->itemCategory == AVIF_ITEM_ALPHA) {
+                avifBoxMarker auxi;
+                AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "auxi", AVIF_BOX_SIZE_TBD, 0, 0, &auxi));
+                AVIF_CHECKRES(avifRWStreamWriteChars(&s, alphaURN, alphaURNSize)); //  string aux_track_type;
+                avifRWStreamFinishBox(&s, auxi);
+            }
+
+            avifRWStreamFinishBox(&s, imageItem);
+            avifRWStreamFinishBox(&s, stsd);
+
+            avifBoxMarker stts;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "stts", AVIF_BOX_SIZE_TBD, 0, 0, &stts));
+            size_t sttsEntryCountOffset = avifRWStreamOffset(&s);
+            uint32_t sttsEntryCount = 0;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0)); // unsigned int(32) entry_count;
+            for (uint32_t sampleCount = 0, frameIndex = 0; frameIndex < encoder->data->frames.count; ++frameIndex) {
+                avifEncoderFrame * frame = &encoder->data->frames.frame[frameIndex];
+                ++sampleCount;
+                if (frameIndex < (encoder->data->frames.count - 1)) {
+                    avifEncoderFrame * nextFrame = &encoder->data->frames.frame[frameIndex + 1];
+                    if (frame->durationInTimescales == nextFrame->durationInTimescales) {
+                        continue;
+                    }
+                }
+                AVIF_CHECKRES(avifRWStreamWriteU32(&s, sampleCount));                           // unsigned int(32) sample_count;
+                AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)frame->durationInTimescales)); // unsigned int(32) sample_delta;
+                sampleCount = 0;
+                ++sttsEntryCount;
+            }
+            size_t prevOffset = avifRWStreamOffset(&s);
+            avifRWStreamSetOffset(&s, sttsEntryCountOffset);
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, sttsEntryCount));
+            avifRWStreamSetOffset(&s, prevOffset);
+            avifRWStreamFinishBox(&s, stts);
+
+            avifBoxMarker stsc;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "stsc", AVIF_BOX_SIZE_TBD, 0, 0, &stsc));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 1));                                 // unsigned int(32) entry_count;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 1));                                 // unsigned int(32) first_chunk;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, item->encodeOutput->samples.count)); // unsigned int(32) samples_per_chunk;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 1)); // unsigned int(32) sample_description_index;
+            avifRWStreamFinishBox(&s, stsc);
+
+            avifBoxMarker stsz;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "stsz", AVIF_BOX_SIZE_TBD, 0, 0, &stsz));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 0));                                 // unsigned int(32) sample_size;
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, item->encodeOutput->samples.count)); // unsigned int(32) sample_count;
+            for (uint32_t sampleIndex = 0; sampleIndex < item->encodeOutput->samples.count; ++sampleIndex) {
+                avifEncodeSample * sample = &item->encodeOutput->samples.sample[sampleIndex];
+                AVIF_CHECKRES(avifRWStreamWriteU32(&s, (uint32_t)sample->data.size)); // unsigned int(32) entry_size;
+            }
+            avifRWStreamFinishBox(&s, stsz);
+
+            avifBoxMarker stco;
+            AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "stco", AVIF_BOX_SIZE_TBD, 0, 0, &stco));
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 1));           // unsigned int(32) entry_count;
+            AVIF_CHECKRES(avifEncoderItemAddMdatFixup(item, &s)); //
+            AVIF_CHECKRES(avifRWStreamWriteU32(&s, 1));           // unsigned int(32) chunk_offset; (set later)
+            avifRWStreamFinishBox(&s, stco);
+
+            avifBool hasNonSyncSample = AVIF_FALSE;
+            for (uint32_t sampleIndex = 0; sampleIndex < item->encodeOutput->samples.count; ++sampleIndex) {
+                if (!item->encodeOutput->samples.sample[sampleIndex].sync) {
+                    hasNonSyncSample = AVIF_TRUE;
+                    break;
+                }
+            }
+            // ISO/IEC 14496-12, Section 8.6.2.1:
+            //   If the SyncSampleBox is not present, every sample is a sync sample.
+            if (hasNonSyncSample) {
+                avifBoxMarker stss;
+                AVIF_CHECKRES(avifRWStreamWriteFullBox(&s, "stss", AVIF_BOX_SIZE_TBD, 0, 0, &stss));
+                AVIF_CHECKRES(avifRWStreamWriteU32(&s, syncSamplesCount)); // unsigned int(32) entry_count;
+                for (uint32_t sampleIndex = 0; sampleIndex < item->encodeOutput->samples.count; ++sampleIndex) {
+                    avifEncodeSample * sample = &item->encodeOutput->samples.sample[sampleIndex];
+                    if (sample->sync) {
+                        AVIF_CHECKRES(avifRWStreamWriteU32(&s, sampleIndex + 1)); // unsigned int(32) sample_number;
+                    }
+                }
+                avifRWStreamFinishBox(&s, stss);
+            }
+
+            avifRWStreamFinishBox(&s, stbl);
+
+            avifRWStreamFinishBox(&s, minf);
+            avifRWStreamFinishBox(&s, mdia);
+            avifRWStreamFinishBox(&s, trak);
+        }
+
+        // -------------------------------------------------------------------
+        // Finish moov box
+
+        avifRWStreamFinishBox(&s, moov);
+    }
+
+    // -----------------------------------------------------------------------
+    // Write mdat
+
+    avifEncoderItemReferenceArray layeredColorItems;
+    avifEncoderItemReferenceArray layeredAlphaItems;
+    if (!avifArrayCreate(&layeredColorItems, sizeof(avifEncoderItemReference), 1)) {
+        result = AVIF_RESULT_OUT_OF_MEMORY;
+    }
+    if (!avifArrayCreate(&layeredAlphaItems, sizeof(avifEncoderItemReference), 1)) {
+        result = AVIF_RESULT_OUT_OF_MEMORY;
+    }
+    if (result == AVIF_RESULT_OK) {
+        result = avifEncoderWriteMediaDataBox(encoder, &s, &layeredColorItems, &layeredAlphaItems);
+    }
+    avifArrayDestroy(&layeredColorItems);
+    avifArrayDestroy(&layeredAlphaItems);
+    AVIF_CHECKRES(result);
+
+    // -----------------------------------------------------------------------
+    // Finish up stream
+
+    avifRWStreamFinishWrite(&s);
+
+#if defined(AVIF_ENABLE_COMPLIANCE_WARDEN)
+    AVIF_CHECKRES(avifIsCompliant(output->data, output->size));
+#endif
+
+    return AVIF_RESULT_OK;
+}
+
+avifResult avifEncoderWrite(avifEncoder * encoder, const avifImage * image, avifRWData * output)
+{
+    avifResult addImageResult = avifEncoderAddImage(encoder, image, 1, AVIF_ADD_IMAGE_FLAG_SINGLE);
+    if (addImageResult != AVIF_RESULT_OK) {
+        return addImageResult;
+    }
+    return avifEncoderFinish(encoder, output);
+}
+
+// Implementation of section 2.3.3 of AV1 Codec ISO Media File Format Binding specification v1.2.0.
+// See https://aomediacodec.github.io/av1-isobmff/v1.2.0.html#av1codecconfigurationbox-syntax.
+static avifResult writeCodecConfig(avifRWStream * s, const avifCodecConfigurationBox * cfg)
+{
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 1, /*bitCount=*/1)); // unsigned int (1) marker = 1;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 1, /*bitCount=*/7)); // unsigned int (7) version = 1;
+
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->seqProfile, /*bitCount=*/3));   // unsigned int (3) seq_profile;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->seqLevelIdx0, /*bitCount=*/5)); // unsigned int (5) seq_level_idx_0;
+
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->seqTier0, /*bitCount=*/1));             // unsigned int (1) seq_tier_0;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->highBitdepth, /*bitCount=*/1));         // unsigned int (1) high_bitdepth;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->twelveBit, /*bitCount=*/1));            // unsigned int (1) twelve_bit;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->monochrome, /*bitCount=*/1));           // unsigned int (1) monochrome;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->chromaSubsamplingX, /*bitCount=*/1));   // unsigned int (1) chroma_subsampling_x;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->chromaSubsamplingY, /*bitCount=*/1));   // unsigned int (1) chroma_subsampling_y;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, cfg->chromaSamplePosition, /*bitCount=*/2)); // unsigned int (2) chroma_sample_position;
+
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, /*bitCount=*/3)); // unsigned int (3) reserved = 0;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, /*bitCount=*/1)); // unsigned int (1) initial_presentation_delay_present;
+    AVIF_CHECKRES(avifRWStreamWriteBits(s, 0, /*bitCount=*/4)); // unsigned int (4) reserved = 0;
+
+    // According to section 2.2.1 of AV1 Image File Format specification v1.1.0,
+    // there is no need to write any OBU here.
+    // See https://aomediacodec.github.io/av1-avif/v1.1.0.html#av1-configuration-item-property.
+    // unsigned int (8) configOBUs[];
+    return AVIF_RESULT_OK;
+}
+
+static avifResult writeConfigBox(avifRWStream * s, const avifCodecConfigurationBox * cfg, const char * configPropName)
+{
+    avifBoxMarker configBox;
+    AVIF_CHECKRES(avifRWStreamWriteBox(s, configPropName, AVIF_BOX_SIZE_TBD, &configBox));
+    AVIF_CHECKRES(writeCodecConfig(s, cfg));
+    avifRWStreamFinishBox(s, configBox);
+    return AVIF_RESULT_OK;
+}
diff --git a/pxr/imaging/plugin/hioAvif/AVIFImage.cpp b/pxr/imaging/plugin/hioAvif/AVIFImage.cpp
new file mode 100644
index 0000000000..6f625e0858
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/AVIFImage.cpp
@@ -0,0 +1,610 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/base/arch/pragmas.h"
+
+// Not all functions in the AVIF and aom libraries are used by Hio. 
+// Therefore, the unused function warning is suppressed as the messages are
+// not useful for development, as it is expected that many functions are
+// defined but not referenced or exported.
+ARCH_PRAGMA_UNUSED_FUNCTION
+
+#include "pxr/imaging/hio/image.h"
+#include "pxr/imaging/hio/types.h"
+
+#include "pxr/usd/ar/asset.h"
+#include "pxr/usd/ar/resolvedPath.h"
+#include "pxr/usd/ar/resolver.h"
+#include "pxr/usd/ar/writableAsset.h"
+
+#include "pxr/base/arch/defines.h"
+#include "pxr/base/arch/pragmas.h"
+#include "pxr/base/gf/colorSpace.h"
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/base/tf/stringUtils.h"
+#include "pxr/base/tf/type.h"
+
+#include "pxr/imaging/plugin/hioAvif/AVIF/src/avif/avif.h"
+
+
+#include "pxr/base/arch/export.h"
+
+#if defined(PXR_STATIC)
+#   define HIOAVIF_API
+#   define HIOAVIF_API_TEMPLATE_CLASS(...)
+#   define HIOAVIF_API_TEMPLATE_STRUCT(...)
+#   define HIOAVIF_LOCAL
+#else
+#   define HIOAVIF_API ARCH_EXPORT
+#   define HIOAVIF_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__)
+#   define HIOAVIF_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__)
+#   define HIOAVIF_LOCAL ARCH_HIDDEN
+#endif
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// It's necessary to export the class so it's typeinfo is visible for registration
+class HIOAVIF_API Hio_AVIFImage final : public HioImage
+{
+    std::shared_ptr<ArAsset> _asset;
+    std::string              _filename;
+    int _width = 0;
+    int _height = 0;
+
+    avifImage *_avifImage = nullptr;
+    bool _imposeSRGBTransfer = false;
+
+    // mutable because GetMetadata is const, yet it doesn't make sense
+    // to cache the dictionary unless metadata is requested.
+    mutable VtDictionary     _metadata;
+
+public:
+    Hio_AVIFImage() = default;
+    ~Hio_AVIFImage() override {
+        Cleanup();
+    }
+
+    void Cleanup() {
+        if (_avifImage) {
+            avifImageDestroy(_avifImage);
+            _avifImage = nullptr;
+        }
+    }
+
+    const std::shared_ptr<ArAsset> Asset() const { return _asset; }
+
+    bool Read(StorageSpec const &storage) override {
+        return ReadCropped(0, 0, 0, 0, storage); 
+    }
+    bool ReadCropped(int const cropTop,  int const cropBottom,
+                     int const cropLeft, int const cropRight,
+                     StorageSpec const &storage) override;
+    bool Write(StorageSpec const &storage,
+               VtDictionary const &metadata) override;
+
+    // We're decoding AVIF to linear float16.
+    bool IsColorSpaceSRGB() const override {
+        if (_imposeSRGBTransfer)
+            return true;
+
+        if (_avifImage) {
+            // special case for BT709 with unspecified transfer function to match
+            // behavior observed in Apple's Finder and web browsers.
+            if (_avifImage->colorPrimaries == AVIF_COLOR_PRIMARIES_BT709 &&
+                _avifImage->transferCharacteristics == AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED)
+                return true;
+            
+            // if the transfer function is SRGB-like, assume SRGB
+            switch (_avifImage->transferCharacteristics) {
+                case AVIF_TRANSFER_CHARACTERISTICS_BT709:
+                case AVIF_TRANSFER_CHARACTERISTICS_BT470M:
+                case AVIF_TRANSFER_CHARACTERISTICS_SRGB:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        return false;
+    }
+
+    // hardcoded to f16v4, although in the future, f16v3 could be a future option
+    // if our supported hardware enables support for that as a texture format.
+    HioFormat GetFormat() const override { return HioFormatFloat16Vec4; }
+    int  GetWidth() const override { return _height; }
+    int  GetHeight() const override { return _width; }
+    int  GetBytesPerPixel() const override { return 16; } // 4 * sizeof(float16)
+    int  GetNumMipLevels() const override { return 0; }
+    bool GetMetadata(TfToken const &key, VtValue *value) const override { return false; }
+    bool GetSamplerMetadata(HioAddressDimension dim,
+                            HioAddressMode *param) const override { return false; }
+    std::string const& GetFilename() const override { return _filename; }
+
+    const VtDictionary& GetMetadata() const { return _metadata; }
+
+protected:
+    bool _OpenForReading(std::string const &filename, int subimage, int mip,
+                         SourceColorSpace sourceColorSpace,
+                         bool suppressErrors) override;
+    bool _OpenForWriting(std::string const &filename) override;
+};
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    using Image = Hio_AVIFImage;
+    TfType t = TfType::Define<Image, TfType::Bases<Image::HioImage>>();
+    t.SetFactory<HioImageFactory<Image>>();
+}
+
+namespace {
+
+    // XXX These image processing utility functions duplicate those
+    // in the OpenEXR plugin. In the future, they may be deduplicated
+    // into Hio utility functions.
+    static float integrate_gaussian(float x, float sigma)
+    {
+        float p1 = erf((x - 0.5f) / sigma * sqrtf(0.5f));
+        float p2 = erf((x + 0.5f) / sigma * sqrtf(0.5f));
+        return (p2-p1) * 0.5f;
+    }
+
+    // Enum capturing the underlying data type on a channel.
+    typedef enum
+    {
+        EXR_PIXEL_UINT  = 0,
+        EXR_PIXEL_HALF  = 1,
+        EXR_PIXEL_FLOAT = 2,
+        EXR_PIXEL_LAST_TYPE
+    } exr_pixel_type_t;
+
+    // structure to hold image data that is read from an AVIF file
+    typedef struct {
+        uint8_t* data;
+        size_t dataSize;
+        exr_pixel_type_t pixelType;
+        int channelCount; // 1 for luminance, 3 for RGB, 4 for RGBA
+        int width, height;
+        int dataWindowMinY, dataWindowMaxY;
+    } nanoexr_ImageData_t;
+
+    bool nanoexr_Gaussian_resample(const nanoexr_ImageData_t* src,
+                                nanoexr_ImageData_t* dst)
+    {
+        if (src->pixelType != EXR_PIXEL_FLOAT && dst->pixelType != EXR_PIXEL_FLOAT)
+            return false;
+        if (src->channelCount != dst->channelCount)
+            return false;
+        
+        const int srcWidth  = src->width;
+        const int dstWidth  = dst->width;
+        const int srcHeight = src->height;
+        const int dstHeight = dst->height;
+        if (srcWidth == dstWidth && srcHeight == dstHeight) {
+            memcpy(dst->data, src->data, 
+                src->channelCount * srcWidth * srcHeight * sizeof(float));
+            return true;
+        }
+        
+        float* srcData = (float*)src->data;
+        float* dstData = (float*)dst->data;
+
+        // two pass image resize using a Gaussian filter per:
+        // https://bartwronski.com/2021/10/31/practical-gaussian-filter-binomial-filter-and-small-sigma-gaussians
+        // chose sigma to suppress high frequencies that can't be represented 
+        // in the downsampled image
+        const float ratio_w = (float)dstWidth / (float)srcWidth;
+        const float ratio_h = (float)dstHeight / (float)srcHeight;
+        const float sigma_w = 1.f / 2.f * ratio_w;
+        const float sigma_h = 1.f / 2.f * ratio_h;
+        const float support = 0.995f;
+        float radius = ceilf(sqrtf(-2.0f * sigma_w * sigma_w * logf(1.0f - support)));
+        int filterSize_w = (int)radius;
+        if (!filterSize_w)
+            return false;
+        
+        float* filter_w = (float*) malloc(sizeof(float) * (filterSize_w + 1) * 2);
+        float sum = 0.0f;
+        for (int i = 0; i <= filterSize_w; i++) {
+            int idx = i + filterSize_w;
+            filter_w[idx] = integrate_gaussian((float) i, sigma_w);
+            if (i > 0)
+                sum += 2 * filter_w[idx];
+            else
+                sum = filter_w[idx];
+        }
+        for (int i = 0; i <= filterSize_w; ++i) {
+            filter_w[i + filterSize_w] /= sum;
+        }
+        for (int i = 0; i < filterSize_w; ++i) {
+            filter_w[filterSize_w - i - 1] = filter_w[i + filterSize_w + 1];
+        }
+        int fullFilterSize_w = filterSize_w * 2 + 1;
+
+        // again for height
+        radius = ceilf(sqrtf(-2.0f * sigma_h * sigma_h * logf(1.0f - support)));
+        int filterSize_h = (int)radius;
+        if (!filterSize_h)
+            return false;
+        
+        float* filter_h = (float*) malloc(sizeof(float) * (1 + filterSize_h) * 2);
+        sum = 0.0f;
+        for (int i = 0; i <= filterSize_h; i++) {
+            int idx = i + filterSize_h;
+            filter_h[idx] = integrate_gaussian((float) i, sigma_h);
+            if (i > 0)
+                sum += 2 * filter_h[idx];
+            else
+                sum = filter_h[idx];
+        }
+        for (int i = 0; i <= filterSize_h; ++i) {
+            filter_h[i + filterSize_h] /= sum;
+        }
+        for (int i = 0; i < filterSize_h; ++i) {
+            filter_h[filterSize_h - i - 1] = filter_h[i + filterSize_h + 1];
+        }
+        int fullFilterSize_h = filterSize_h * 2 + 1;
+        
+        // first pass: resize horizontally
+        int srcFloatsPerLine = src->channelCount * srcWidth;
+        int dstFloatsPerLine = src->channelCount * dstWidth;
+        float* firstPass = (float*)malloc(dstWidth * src->channelCount * srcHeight * sizeof(float));
+        for (int y = 0; y < srcHeight; ++y) {
+            for (int x = 0; x < dstWidth; ++x) {
+                for (int c = 0; c < src->channelCount; ++c) {
+                    float sum = 0.0f;
+                    for (int i = 0; i < fullFilterSize_w; ++i) {
+                        int srcX = (int)((x + 0.5f) / ratio_w - 0.5f) + i - filterSize_w;
+                        if (srcX < 0 || srcX >= srcWidth)
+                            continue;
+                        int idx = y * srcFloatsPerLine + (srcX * src->channelCount) + c;
+                        sum += srcData[idx] * filter_w[i];
+                    }
+                    firstPass[y * dstFloatsPerLine + (x * src->channelCount) + c] = sum;
+                }
+            }
+        }
+
+        // second pass: resize vertically
+        float* secondPass = dstData;
+        for (int y = 0; y < dstHeight; ++y) {
+            for (int x = 0; x < dstWidth; ++x) {
+                for (int c = 0; c < src->channelCount; ++c) {
+                    float sum = 0.0f;
+                    for (int i = 0; i < fullFilterSize_h; ++i) {
+                        int srcY = (int)((y + 0.5f) / ratio_h - 0.5f) + i - filterSize_h;
+                        if (srcY < 0 || srcY >= srcHeight)
+                            continue;
+                        int idx = src->channelCount * srcY * dstWidth + (x * src->channelCount) + c;
+                        sum += firstPass[idx] * filter_h[i];
+                    }
+                    secondPass[dst->channelCount * y * dstWidth + (x * dst->channelCount) + c] = sum;
+                }
+            }
+        }
+        free(filter_h);
+        free(filter_w);
+        free(firstPass);
+        return true;
+    }
+
+    
+    template<typename T>
+    class ImageProcessor
+    {
+    public:
+        // Flip the image in-place.
+        static void FlipImage(T* buffer, int width, int height, int channelCount)
+        {
+            // use std::swap_ranges to flip the image in-place
+            for (int y = 0; y < height / 2; ++y) {
+                std::swap_ranges(
+                                 buffer + y * width * channelCount,
+                                 buffer + (y + 1) * width * channelCount,
+                                 buffer + (height - y - 1) * width * channelCount);
+            }
+        }
+        
+        // Crop the image in-place.
+        static void CropImage(T* buffer, 
+                              int width, int height, int channelCount,
+                              int cropTop, int cropBottom,
+                              int cropLeft, int cropRight)
+        {
+            int newWidth = width - cropLeft - cropRight;
+            int newHeight = height - cropTop - cropBottom;
+            
+            if (newWidth <= 0 || newHeight <= 0
+                || (newWidth == width && newHeight == height))
+                return;
+            
+            for (int y = 0; y < newHeight; ++y) {
+                for (int x = 0; x < newWidth; ++x) {
+                    for (int c = 0; c < channelCount; ++c) {
+                        buffer[(y * newWidth + x) * channelCount + c] =
+                        buffer[((y + cropTop) * width + x + cropLeft)
+                               * channelCount + c];
+                    }
+                }
+            }
+        }
+        
+        static void HalfToFloat(GfHalf* buffer, float* outBuffer,
+                                int width, int height, int channelCount)
+        {
+            if (!buffer || !outBuffer)
+                return;
+            
+            for (int i = 0; i < width * height * channelCount; ++i) {
+                outBuffer[i] = buffer[i];
+            }
+        }
+        
+        static void FloatToHalf(float* buffer, GfHalf* outBuffer,
+                                int width, int height, int channelCount)
+        {
+            if (!buffer || !outBuffer)
+                return;
+            
+            for (int i = 0; i < width * height * channelCount; ++i) {
+                outBuffer[i] = buffer[i];
+            }
+        }
+
+        // return true for a successful resample
+        static bool ResizeImage(const float* src, float* dst,
+                                int width, int height, int channelCount)
+        {
+            nanoexr_ImageData_t srcImg = {
+                (uint8_t*) src,
+                channelCount * sizeof(float) * width * height,
+                EXR_PIXEL_FLOAT,
+                channelCount, width, height, 0, height - 1
+            };
+            nanoexr_ImageData_t dstImg = srcImg;
+            dstImg.data = (uint8_t*) dst;
+            return nanoexr_Gaussian_resample(&srcImg, &dstImg);
+        }
+    };
+   
+} // anon
+
+bool Hio_AVIFImage::ReadCropped(
+                int const cropTop,  int const cropBottom,
+                int const cropLeft, int const cropRight, 
+                StorageSpec const& storage)
+{
+    if (!_avifImage)
+        return false;
+    if (cropTop < 0 || cropBottom < 0 || cropLeft < 0 || cropRight < 0)
+        return false;
+
+    // Convert to RGB
+    avifRGBImage rgb;
+    const int bytesPerChannel = 2;
+    const int channelCount = HioGetComponentCount(storage.format);
+    if (channelCount < 3)
+        return false;
+
+    bool outputIsFloat = HioGetHioType(storage.format) == HioTypeFloat;
+    bool outputIsHalf =  HioGetHioType(storage.format) == HioTypeHalfFloat;
+    if (!(outputIsFloat || outputIsHalf))
+        return false;
+
+    bool flip = storage.flipped;
+
+    memset(&rgb, 0, sizeof(rgb));
+    avifRGBImageSetDefaults(&rgb, _avifImage);
+    rgb.width = _avifImage->width;  // avifRGBImage and avifImage must agree
+    rgb.height = _avifImage->height;
+    rgb.depth = 8 * bytesPerChannel;
+    rgb.format = channelCount == 3? AVIF_RGB_FORMAT_RGB : AVIF_RGB_FORMAT_RGBA;
+    rgb.chromaUpsampling = AVIF_CHROMA_UPSAMPLING_AUTOMATIC;
+    rgb.chromaDownsampling = AVIF_CHROMA_DOWNSAMPLING_AUTOMATIC;
+    rgb.ignoreAlpha = false;
+    rgb.alphaPremultiplied = false;
+    rgb.isFloat = true;
+    rgb.pixels = (uint8_t*)
+            calloc(channelCount * bytesPerChannel * rgb.width * rgb.height, 1);
+    rgb.rowBytes = rgb.width * channelCount * bytesPerChannel;
+    if (rgb.depth != 16 && rgb.isFloat) {
+        TF_CODING_ERROR("Only half floats are supported for AVIF decoding");
+    }
+
+    avifResult result = avifImageYUVToRGB(_avifImage, &rgb);
+    if (result != AVIF_RESULT_OK) {
+        TF_RUNTIME_ERROR("Error parsing AVIF file: %s\n", avifResultToString(result));
+        free(rgb.pixels);
+        Cleanup();
+        return false;
+    }
+
+    // these input pointers will be used to track the data source
+    // for the final copy to storage.data.
+    GfHalf* inputHalf = (GfHalf*) rgb.pixels;
+    float* inputFloat = nullptr;
+
+    nanoexr_ImageData_t img;
+    memset(&img, 0, sizeof(img));
+
+    img.data = (uint8_t*) rgb.pixels;
+    img.pixelType = EXR_PIXEL_HALF;
+    img.channelCount = channelCount;
+    img.width = rgb.width;
+    img.height = rgb.height;
+    img.dataWindowMinY = 0;
+    img.dataWindowMaxY = rgb.height - 1;
+
+    // crop in place
+    ImageProcessor<GfHalf>::CropImage((GfHalf*) img.data,
+                                      img.width, img.height,
+                                      img.channelCount,
+                                      cropTop, cropBottom,
+                                      cropLeft, cropRight);
+
+    // adjust dimensions as needed
+    img.width = img.width - cropLeft - cropRight;
+    img.width = img.height - cropTop - cropBottom;
+    img.dataWindowMinY = img.height - 1;
+
+    if (flip) {
+        ImageProcessor<GfHalf>::FlipImage((GfHalf*) img.data,
+                                          img.width,
+                                          img.height,
+                                          img.channelCount);
+    }
+
+    // resize
+    bool resizing = (img.width != storage.width) ||
+                    (img.width != storage.height);
+
+    std::vector<float> outF32;
+    if (resizing) {
+        // resize in float
+        std::vector<float> f32(img.width * img.height * channelCount);
+        ImageProcessor<uint16_t>::HalfToFloat(
+                                      inputHalf,
+                                      f32.data(),
+                                      img.width, img.height,
+                                      channelCount);
+
+        nanoexr_ImageData_t src = { 0 };
+        src.data = reinterpret_cast<uint8_t*>(f32.data());
+        src.channelCount = channelCount;
+        src.dataSize = img.width * img.height * channelCount * sizeof(float);
+        src.pixelType = EXR_PIXEL_FLOAT;
+        src.width = img.width;
+        src.height = img.height;
+
+        outF32.resize(img.width * img.height * channelCount);
+        inputFloat = outF32.data();
+
+        nanoexr_ImageData_t dst = { 0 };
+        dst.channelCount = channelCount;
+        dst.dataSize = storage.width * storage.height * channelCount * sizeof(float);
+        dst.pixelType = EXR_PIXEL_FLOAT;
+        dst.width = storage.width;
+        dst.height = storage.height;
+        dst.data = (uint8_t*) inputFloat;
+
+        nanoexr_Gaussian_resample(&src, &dst);
+
+        inputHalf = nullptr;
+    }
+
+    if (_imposeSRGBTransfer) {
+        // if the image was resized, the input data is now in inputFloat
+        // otherwise, it is in inputHalf
+        if (inputFloat == nullptr) {
+            // resize outF32 to the correct size
+            outF32.resize(img.width * img.height * channelCount);
+            ImageProcessor<uint16_t>::HalfToFloat(
+                                      inputHalf,
+                                      outF32.data(),
+                                      img.width, img.height,
+                                      channelCount);
+            inputFloat = outF32.data();
+            inputHalf = nullptr;
+        }
+        GfColorSpace dst(GfColorSpaceNames->SRGB);
+        GfColorSpace src(GfColorSpaceNames->LinearRec709);
+        if (channelCount == 3)
+            dst.ConvertRGBSpan(src, TfSpan<float>(inputFloat, img.width * img.height * channelCount));
+        else
+            dst.ConvertRGBASpan(src, TfSpan<float>(inputFloat, img.width * img.height * channelCount));
+    }
+
+    // Finally, copy the data to storage.data
+    if (outputIsHalf) {
+        if (inputHalf != nullptr) {
+            // copy rgb.pixels to storage.data
+            memcpy(storage.data, inputHalf,
+                   rgb.width * rgb.height * channelCount * sizeof(GfHalf));
+        }
+        else {
+            // convert float to half
+            ImageProcessor<float>::FloatToHalf(
+                                    inputFloat, (GfHalf*) storage.data,
+                                    rgb.width, rgb.height, channelCount);
+        }
+    }
+    else {
+        // output float case
+        if (inputHalf != nullptr) {
+            // convert half to float
+            ImageProcessor<GfHalf>::HalfToFloat(
+                                    inputHalf, (float*) storage.data,
+                                    rgb.width, rgb.height, channelCount);
+        }
+        else {
+            // copy rgb.pixels to storage.data
+            memcpy(storage.data, inputFloat,
+                   rgb.width * rgb.height * channelCount * sizeof(float));
+        }
+    }
+
+    free(rgb.pixels);
+    return true;
+}
+
+bool Hio_AVIFImage::_OpenForReading(std::string const &filename,
+                                    int subimage, int mip,
+                                    SourceColorSpace sourceColorSpace,
+                                    bool /*suppressErrors*/)
+{
+    Cleanup();
+    _width = 0;
+    _height = 0;
+    _filename = filename;
+    _asset = ArGetResolver().OpenAsset(ArResolvedPath(filename));
+    if (!_asset) {
+        return false;
+    }
+
+    size_t sz = _asset->GetSize();
+    uint8_t* data = (uint8_t*) malloc(sz);
+    size_t offset = 0;
+    size_t readSize = _asset->Read(data, sz, offset);
+    if (!readSize)
+        return false;
+
+    // Initialize libavif
+    _avifImage = avifImageCreateEmpty();
+    avifDecoder *decoder = avifDecoderCreate();
+    avifResult result = avifDecoderReadMemory(decoder, _avifImage, data, readSize);
+    avifDecoderDestroy(decoder);
+    if (result != AVIF_RESULT_OK) {
+        TF_RUNTIME_ERROR("Error parsing AVIF file: %s\n", avifResultToString(result));
+        Cleanup();
+        return false;
+    }
+    _width = _avifImage->width;
+    _height = _avifImage->height;
+
+    // if the transfer function is unspecified, and the colorspace is Rec709
+    // set the transfer function to sRGB. This is to match behavior observed
+    // in Apple's Finder, and web browsers.
+    _imposeSRGBTransfer =
+        (sourceColorSpace == HioImage::SourceColorSpace::Auto ||
+         sourceColorSpace == HioImage::SourceColorSpace::SRGB) &&
+        (_avifImage->transferCharacteristics == AVIF_TRANSFER_CHARACTERISTICS_UNSPECIFIED) &&
+        (_avifImage->colorPrimaries == AVIF_COLOR_PRIMARIES_UNSPECIFIED);
+    return true;
+}
+
+// Writing is not supported.
+bool Hio_AVIFImage::Write(StorageSpec const&, VtDictionary const &metadata)
+{
+    return false;
+}
+
+bool Hio_AVIFImage::_OpenForWriting(std::string const &filename)
+{
+    return false;
+}
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/imaging/plugin/hioAvif/CMakeLists.txt b/pxr/imaging/plugin/hioAvif/CMakeLists.txt
new file mode 100644
index 0000000000..29ffe0fdf3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/CMakeLists.txt
@@ -0,0 +1,230 @@
+set(PXR_PREFIX pxr/imaging)
+set(PXR_PACKAGE hioAvif)
+
+pxr_plugin(hioAvif
+    LIBRARIES
+        ar
+        arch
+        gf
+        hio
+        tf
+
+    PRIVATE_HEADERS
+        aom/aom.h
+        aom/aom_codec.h
+        aom/aom_decoder.h
+        aom/aom_encoder.h
+        aom/aom_frame_buffer.h
+        aom/aom_image.h
+        aom/aom_integer.h
+        aom/aomdx.h
+        aom/aom_dsp/binary_codes_reader.h
+        aom/aom_dsp/bitreader.h
+        aom/aom_dsp/aom_dsp_common.h
+        aom/aom_dsp/bitreader_buffer.h
+        aom/aom_dsp/blend.h
+        aom/aom_dsp/entcode.h
+        aom/aom_dsp/entdec.h
+        aom/aom_dsp/grain_table.h
+        aom/aom_dsp/aom_filter.h
+        aom/aom_dsp/grain_synthesis.h
+        aom/aom_dsp/intrapred_common.h
+        aom/aom_dsp/prob.h
+        aom/aom_dsp/recenter.h
+        aom/aom_dsp/txfm_common.h
+        aom/aom_mem/aom_mem.h
+        aom/aom_mem/include/aom_mem_intrnl.h
+        aom/aom_ports/bitops.h
+        aom/aom_ports/aom_once.h
+        aom/aom_ports/mem.h
+        aom/aom_ports/mem_ops.h
+        aom/aom_ports/mem_ops_aligned.h
+        aom/aom_ports/msvc.h
+        aom/aom_ports/system_state.h
+        aom/aom_ports/aom_timer.h
+        aom/aom_scale/aom_scale.h
+        aom/aom_scale/yv12config.h
+        aom/aom_util/aom_thread.h
+        aom/av1/av1_iface_common.h
+        aom/av1/common/av1_common_int.h
+        aom/av1/common/alloccommon.h
+        aom/av1/common/av1_inv_txfm1d.h
+        aom/av1/common/av1_inv_txfm1d_cfg.h
+        aom/av1/common/av1_loopfilter.h
+        aom/av1/common/av1_txfm.h
+        aom/av1/common/blockd.h
+        aom/av1/common/cdef.h
+        aom/av1/common/cdef_block.h
+        aom/av1/common/cfl.h
+        aom/av1/common/common.h
+        aom/av1/common/common_data.h
+        aom/av1/common/convolve.h
+        aom/av1/common/entropy.h
+        aom/av1/common/entropymode.h
+        aom/av1/common/entropymv.h
+        aom/av1/common/enums.h
+        aom/av1/common/filter.h
+        aom/av1/common/frame_buffers.h
+        aom/av1/common/mv.h
+        aom/av1/common/mvref_common.h
+        aom/av1/common/idct.h
+        aom/av1/common/obmc.h
+        aom/av1/common/obu_util.h
+        aom/av1/common/odintrin.h
+        aom/av1/common/pred_common.h
+        aom/av1/common/quant_common.h
+        aom/av1/common/reconinter.h
+        aom/av1/common/reconintra.h
+        aom/av1/common/resize.h
+        aom/av1/common/restoration.h
+        aom/av1/common/scale.h
+        aom/av1/common/scan.h
+        aom/av1/common/seg_common.h
+        aom/av1/common/thread_common.h
+        aom/av1/common/tile_common.h
+        aom/av1/common/timing.h
+        aom/av1/common/token_cdfs.h
+        aom/av1/common/txb_common.h
+        aom/av1/common/warped_motion.h
+        aom/av1/decoder/decodeframe.h
+        aom/av1/decoder/decoder.h
+        aom/av1/decoder/decodemv.h
+        aom/av1/decoder/decodetxb.h
+        aom/av1/decoder/detokenize.h
+        aom/av1/decoder/dthread.h
+        aom/av1/decoder/obu.h
+        aom/config/aom_config.h
+        aom/config/aom_dsp_rtcd.h
+        aom/config/aom_scale_rtcd.h
+        aom/config/aom_version.h
+        aom/config/av1_rtcd.h
+        aom/internal/aom_codec_internal.h
+        aom/internal/aom_image_internal.h
+        aom/internal/common/args_helper.h
+        AVIF/src/avif/avif.h
+        AVIF/src/avif/internal.h
+        AVIF/src/src-libyuv/libyuv/basic_types.h
+        AVIF/src/src-libyuv/libyuv.h
+        AVIF/src/src-libyuv/libyuv/planar_functions.h
+        AVIF/src/src-libyuv/libyuv/row.h
+        AVIF/src/src-libyuv/libyuv/scale.h
+        AVIF/src/src-libyuv/libyuv/scale_row.h
+        AVIF/src/src-libyuv/libyuv/version.h
+        
+    CPPFILES
+        aom/aom_codec.c
+        aom/aom_decoder.c
+        aom/aom_image.c
+        aom/aom_integer.c
+        aom/aom_dsp/aom_convolve.c
+        aom/aom_dsp/aom_dsp_rtcd.c
+        aom/aom_dsp/binary_codes_reader.c
+        aom/aom_dsp/bitreader.c
+        aom/aom_dsp/bitreader_buffer.c
+        aom/aom_dsp/blend_a64_hmask.c
+        aom/aom_dsp/blend_a64_vmask.c
+        aom/aom_dsp/blend_a64_mask.c
+        aom/aom_dsp/entcode.c
+        aom/aom_dsp/entdec.c
+        aom/aom_dsp/grain_synthesis.c
+        aom/aom_dsp/intrapred.c
+        aom/aom_dsp/loopfilter.c
+        aom/aom_mem/aom_mem.c
+        aom/aom_scale/aom_scale_rtcd.c
+        aom/aom_scale/generic/aom_scale.c
+        aom/aom_scale/generic/gen_scalers.c
+        aom/aom_scale/generic/yv12config.c
+        aom/aom_scale/generic/yv12extend.c
+        aom/aom_util/aom_thread.c
+        aom/av1/av1_dx_iface.c
+        aom/av1/common/alloccommon.c
+        aom/av1/common/av1_inv_txfm1d.c
+        aom/av1/common/av1_inv_txfm2d.c
+        aom/av1/common/av1_loopfilter.c
+        aom/av1/common/av1_txfm.c
+        aom/av1/common/av1_rtcd.c
+        aom/av1/common/blockd.c
+        aom/av1/common/cdef.c
+        aom/av1/common/cdef_block.c
+        aom/av1/common/cfl.c
+        aom/av1/common/convolve.c
+        aom/av1/common/entropymode.c 
+        aom/av1/common/entropy.c
+        aom/av1/common/entropymv.c
+        aom/av1/common/frame_buffers.c
+        aom/av1/common/idct.c
+        aom/av1/common/mvref_common.c
+        aom/av1/common/obu_util.c
+        aom/av1/common/pred_common.c
+        aom/av1/common/quant_common.c        
+        aom/av1/common/reconinter.c
+        aom/av1/common/reconintra.c
+        aom/av1/common/resize.c
+        aom/av1/common/restoration.c
+        aom/av1/common/av1_scale.c
+        aom/av1/common/scan.c
+        aom/av1/common/seg_common.c
+        aom/av1/common/thread_common.c
+        aom/av1/common/timing.c
+        aom/av1/common/txb_common.c
+        aom/av1/common/tile_common.c
+        aom/av1/common/warped_motion.c
+        aom/av1/decoder/decodeframe.c
+        aom/av1/decoder/decodemv.c
+        aom/av1/decoder/decoder.c
+        aom/av1/decoder/decodetxb.c
+        aom/av1/decoder/detokenize.c
+        aom/av1/decoder/obu.c
+        AVIF/src/alpha.c
+        AVIF/src/avif.c
+        AVIF/src/codec_aom.c
+        AVIF/src/colr.c
+        AVIF/src/diag.c
+        AVIF/src/exif.c
+        AVIF/src/io.c
+        AVIF/src/mem.c
+        AVIF/src/avif_obu.c
+        AVIF/src/rawdata.c
+        AVIF/src/read.c
+        AVIF/src/reformat.c
+        AVIF/src/reformat_libsharpyuv.c
+        AVIF/src/reformat_libyuv.c
+        AVIF/src/avif-scale.c
+        AVIF/src/stream.c
+        AVIF/src/utils.c
+        AVIF/src/write.c
+        AVIF/src/src-libyuv/planar_functions.c
+        AVIF/src/src-libyuv/row_common.c
+        AVIF/src/src-libyuv/yuv_scale.c
+        AVIF/src/src-libyuv/scale_any.c
+        AVIF/src/src-libyuv/scale_common.c
+        AVIFImage.cpp
+
+    RESOURCE_FILES
+        plugInfo.json
+)
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    if (TARGET hioAvif)
+        # Hide symbols and inlines in the C code
+        target_compile_options(hioAvif PRIVATE
+             $<$<COMPILE_LANGUAGE:C>:-fvisibility=hidden>)
+    endif()
+endif()
+
+pxr_install_test_dir(
+    SRC testenv/testHioAvif
+    DEST testHioAvif
+)
+
+pxr_build_test(testHioAvif
+    LIBRARIES
+        hio
+    CPPFILES
+        testenv/testHioAvif.cpp
+)
+
+pxr_register_test(testHioAvif
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testHioAvif"
+    EXPECTED_RETURN_CODE 0
+)
diff --git a/pxr/imaging/plugin/hioAvif/README.md b/pxr/imaging/plugin/hioAvif/README.md
new file mode 100644
index 0000000000..98fde178cc
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/README.md
@@ -0,0 +1,60 @@
+# hioAvif plugin
+
+This library implements reading AVIF image files for Hio.
+
+The AV1 Image Format is a royalty-free open-source picture format, with modern compression, flexible color specification, high dynamic range values, 
+depth images and alpha channels, and support for layered and sequential images.
+
+The supported feature set here is currently restricted to single frame iamges,
+which are decoded to linear Rec709 RGB or RGBA if an alpha channel is present.
+
+Reading is implemented through the use of libaom, and libavif.
+YUV to RGB decoding is accomplished by libyuv.
+
+libaom is the reference codec library created by the Alliance for Open Media.
+libavif is a portable C implementation of the AV1 Image File Format.
+
+libavif is obtained from the v1.0.4 tag release found here:
+https://github.com/AOMediaCodec/libavif
+
+libyuv was contained within the libavif release tag.
+
+libaom is obtaned from the v3.8.3 tag release found here:
+https://aomedia.googlesource.com/aom/
+
+Please see AVIF_AOM_LICENSE.txt to learn about the licenses used by these
+libraries.
+
+The decoding, but not the encoding, portions of those libraries are used here, 
+with minimal modification to accomodate the OpenUSD build environment. In
+particular, the following files have been renamed:
+
+aom/av1/common/scale.c --> aom/av1/common/aom_scale.c
+AVIF/src/obu.c --> AVIF/src/avif_obu.c
+AVIF/src/src-libyuv/scale.c --> AVIF/src/src-libyuv/yuv_scale.c
+
+In addition to this renaming, the `#include` directives within the interred
+source code have been modified to be compatible with the OpenUSD build system
+which requires qualified paths in certain cases that would otherwise require
+local relative includes, currently unsupported by the build systems across all
+build configurations.
+
+For example, this path
+
+```
+#include "aom_image.h"
+```
+
+becomes
+
+```
+#include "pxr/imaging/plugin/hioAvif/aom/aom_image.h"
+```
+
+Due to the large number of rewritten includes, neither a patch for reference,
+nor an elaboration of the changes are included here. 
+
+There are no other modifications to the interred library code beyond this, and
+the code is in all other respects used as is.
+
+
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom.h b/pxr/imaging/plugin/hioAvif/aom/aom.h
new file mode 100644
index 0000000000..29f31d1098
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\defgroup aom AOM
+ * \ingroup codecs
+ * AOM is aom's newest video compression algorithm that uses motion
+ * compensated prediction, Discrete Cosine Transform (DCT) coding of the
+ * prediction error signal and context dependent entropy coding techniques
+ * based on arithmetic principles. It features:
+ *  - YUV 4:2:0 image format
+ *  - Macro-block based coding (16x16 luma plus two 8x8 chroma)
+ *  - 1/4 (1/8) pixel accuracy motion compensated prediction
+ *  - 4x4 DCT transform
+ *  - 128 level linear quantizer
+ *  - In loop deblocking filter
+ *  - Context-based entropy coding
+ *
+ * @{
+ */
+/*!\file
+ * \brief Provides controls common to both the AOM encoder and decoder.
+ */
+#ifndef AOM_AOM_AOM_H_
+#define AOM_AOM_AOM_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_image.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!\brief Control functions
+ *
+ * The set of macros define the control functions of AOM interface
+ * The range for common control IDs is 230-255(max).
+ */
+enum aom_com_control_id {
+  /*!\brief Codec control function to get a pointer to a reference frame
+   *
+   * av1_ref_frame_t* parameter
+   */
+  AV1_GET_REFERENCE = 230,
+
+  /*!\brief Codec control function to write a frame into a reference buffer
+   *
+   * av1_ref_frame_t* parameter
+   */
+  AV1_SET_REFERENCE = 231,
+
+  /*!\brief Codec control function to get a copy of reference frame from the
+   * decoder
+   *
+   * av1_ref_frame_t* parameter
+   */
+  AV1_COPY_REFERENCE = 232,
+
+  /*!\brief Codec control function to get a pointer to the new frame
+   *
+   * aom_image_t* parameter
+   */
+  AV1_GET_NEW_FRAME_IMAGE = 233,
+
+  /*!\brief Codec control function to copy the new frame to an external buffer
+   *
+   * aom_image_t* parameter
+   */
+  AV1_COPY_NEW_FRAME_IMAGE = 234,
+
+  /*!\brief Start point of control IDs for aom_dec_control_id.
+   * Any new common control IDs should be added above.
+   */
+  AOM_DECODER_CTRL_ID_START = 256
+  // No common control IDs should be added after AOM_DECODER_CTRL_ID_START.
+};
+
+/*!\brief AV1 specific reference frame data struct
+ *
+ * Define the data struct to access av1 reference frames.
+ */
+typedef struct av1_ref_frame {
+  int idx;              /**< frame index to get (input) */
+  int use_external_ref; /**< Directly use external ref buffer(decoder only) */
+  aom_image_t img;      /**< img structure to populate (output) */
+} av1_ref_frame_t;
+
+/*!\cond */
+/*!\brief aom decoder control function parameter type
+ *
+ * Defines the data type for each of AOM decoder control function requires.
+ *
+ * \note For each control ID "X", a macro-define of
+ * AOM_CTRL_X is provided. It is used at compile time to determine
+ * if the control ID is supported by the libaom library available,
+ * when the libaom version cannot be controlled.
+ */
+AOM_CTRL_USE_TYPE(AV1_GET_REFERENCE, av1_ref_frame_t *)
+#define AOM_CTRL_AV1_GET_REFERENCE
+
+AOM_CTRL_USE_TYPE(AV1_SET_REFERENCE, av1_ref_frame_t *)
+#define AOM_CTRL_AV1_SET_REFERENCE
+
+AOM_CTRL_USE_TYPE(AV1_COPY_REFERENCE, av1_ref_frame_t *)
+#define AOM_CTRL_AV1_COPY_REFERENCE
+
+AOM_CTRL_USE_TYPE(AV1_GET_NEW_FRAME_IMAGE, aom_image_t *)
+#define AOM_CTRL_AV1_GET_NEW_FRAME_IMAGE
+
+AOM_CTRL_USE_TYPE(AV1_COPY_NEW_FRAME_IMAGE, aom_image_t *)
+#define AOM_CTRL_AV1_COPY_NEW_FRAME_IMAGE
+
+/*!\endcond */
+/*! @} - end defgroup aom */
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_AOM_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_codec.c b/pxr/imaging/plugin/hioAvif/aom/aom_codec.c
new file mode 100644
index 0000000000..6cfb640b35
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_codec.c
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\file
+ * \brief Provides the high level interface to wrap decoder algorithms.
+ *
+ */
+#include <stdarg.h>
+#include <stdlib.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_version.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h"
+
+int aom_codec_version(void) { return VERSION_PACKED; }
+
+const char *aom_codec_version_str(void) { return VERSION_STRING_NOSP; }
+
+const char *aom_codec_version_extra_str(void) { return VERSION_EXTRA; }
+
+const char *aom_codec_iface_name(aom_codec_iface_t *iface) {
+  return iface ? iface->name : "<invalid interface>";
+}
+
+const char *aom_codec_err_to_string(aom_codec_err_t err) {
+  switch (err) {
+    case AOM_CODEC_OK: return "Success";
+    case AOM_CODEC_ERROR: return "Unspecified internal error";
+    case AOM_CODEC_MEM_ERROR: return "Memory allocation error";
+    case AOM_CODEC_ABI_MISMATCH: return "ABI version mismatch";
+    case AOM_CODEC_INCAPABLE:
+      return "Codec does not implement requested capability";
+    case AOM_CODEC_UNSUP_BITSTREAM:
+      return "Bitstream not supported by this decoder";
+    case AOM_CODEC_UNSUP_FEATURE:
+      return "Bitstream required feature not supported by this decoder";
+    case AOM_CODEC_CORRUPT_FRAME: return "Corrupt frame detected";
+    case AOM_CODEC_INVALID_PARAM: return "Invalid parameter";
+    case AOM_CODEC_LIST_END: return "End of iterated list";
+  }
+
+  return "Unrecognized error code";
+}
+
+const char *aom_codec_error(aom_codec_ctx_t *ctx) {
+  return (ctx) ? aom_codec_err_to_string(ctx->err)
+               : aom_codec_err_to_string(AOM_CODEC_INVALID_PARAM);
+}
+
+const char *aom_codec_error_detail(aom_codec_ctx_t *ctx) {
+  if (ctx && ctx->err)
+    return ctx->priv ? ctx->priv->err_detail : ctx->err_detail;
+
+  return NULL;
+}
+
+aom_codec_err_t aom_codec_destroy(aom_codec_ctx_t *ctx) {
+  if (!ctx) {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+  if (!ctx->iface || !ctx->priv) {
+    ctx->err = AOM_CODEC_ERROR;
+    return AOM_CODEC_ERROR;
+  }
+  ctx->iface->destroy((aom_codec_alg_priv_t *)ctx->priv);
+  ctx->iface = NULL;
+  ctx->name = NULL;
+  ctx->priv = NULL;
+  ctx->err = AOM_CODEC_OK;
+  return AOM_CODEC_OK;
+}
+
+aom_codec_caps_t aom_codec_get_caps(aom_codec_iface_t *iface) {
+  return (iface) ? iface->caps : 0;
+}
+
+aom_codec_err_t aom_codec_control(aom_codec_ctx_t *ctx, int ctrl_id, ...) {
+  if (!ctx) {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+  // Control ID must be non-zero.
+  if (!ctrl_id) {
+    ctx->err = AOM_CODEC_INVALID_PARAM;
+    return AOM_CODEC_INVALID_PARAM;
+  }
+  if (!ctx->iface || !ctx->priv || !ctx->iface->ctrl_maps) {
+    ctx->err = AOM_CODEC_ERROR;
+    return AOM_CODEC_ERROR;
+  }
+
+  // "ctrl_maps" is an array of (control ID, function pointer) elements,
+  // with CTRL_MAP_END as a sentinel.
+  for (aom_codec_ctrl_fn_map_t *entry = ctx->iface->ctrl_maps;
+       !at_ctrl_map_end(entry); ++entry) {
+    if (entry->ctrl_id == ctrl_id) {
+      va_list ap;
+      va_start(ap, ctrl_id);
+      ctx->err = entry->fn((aom_codec_alg_priv_t *)ctx->priv, ap);
+      va_end(ap);
+      return ctx->err;
+    }
+  }
+  ctx->err = AOM_CODEC_ERROR;
+  return AOM_CODEC_ERROR;
+}
+
+aom_codec_err_t aom_codec_set_option(aom_codec_ctx_t *ctx, const char *name,
+                                     const char *value) {
+  if (!ctx) {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+  if (!ctx->iface || !ctx->priv || !ctx->iface->set_option) {
+    ctx->err = AOM_CODEC_ERROR;
+    return AOM_CODEC_ERROR;
+  }
+  ctx->err =
+      ctx->iface->set_option((aom_codec_alg_priv_t *)ctx->priv, name, value);
+  return ctx->err;
+}
+
+void aom_internal_error(struct aom_internal_error_info *info,
+                        aom_codec_err_t error, const char *fmt, ...) {
+  va_list ap;
+
+  info->error_code = error;
+  info->has_detail = 0;
+
+  if (fmt) {
+    size_t sz = sizeof(info->detail);
+
+    info->has_detail = 1;
+    va_start(ap, fmt);
+    vsnprintf(info->detail, sz - 1, fmt, ap);
+    va_end(ap);
+    info->detail[sz - 1] = '\0';
+  }
+
+  if (info->setjmp) longjmp(info->jmp, info->error_code);
+}
+
+void aom_merge_corrupted_flag(int *corrupted, int value) {
+  *corrupted |= value;
+}
+
+const char *aom_obu_type_to_string(OBU_TYPE type) {
+  switch (type) {
+    case OBU_SEQUENCE_HEADER: return "OBU_SEQUENCE_HEADER";
+    case OBU_TEMPORAL_DELIMITER: return "OBU_TEMPORAL_DELIMITER";
+    case OBU_FRAME_HEADER: return "OBU_FRAME_HEADER";
+    case OBU_REDUNDANT_FRAME_HEADER: return "OBU_REDUNDANT_FRAME_HEADER";
+    case OBU_FRAME: return "OBU_FRAME";
+    case OBU_TILE_GROUP: return "OBU_TILE_GROUP";
+    case OBU_METADATA: return "OBU_METADATA";
+    case OBU_TILE_LIST: return "OBU_TILE_LIST";
+    case OBU_PADDING: return "OBU_PADDING";
+    default: break;
+  }
+  return "<Invalid OBU Type>";
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_codec.h b/pxr/imaging/plugin/hioAvif/aom/aom_codec.h
new file mode 100644
index 0000000000..9a7aa7b073
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_codec.h
@@ -0,0 +1,572 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+///////////////////////////////////////////////////////////////////////////////
+// Internal implementation details
+///////////////////////////////////////////////////////////////////////////////
+//
+// There are two levels of interfaces used to access the AOM codec: the
+// the aom_codec_iface and the aom_codec_ctx.
+//
+// 1. aom_codec_iface_t
+//    (Related files: aom/aom_codec.h, aom/src/aom_codec.c,
+//    aom/internal/aom_codec_internal.h, av1/av1_cx_iface.c,
+//    av1/av1_dx_iface.c)
+//
+// Used to initialize the codec context, which contains the configuration for
+// for modifying the encoder/decoder during run-time. See the other
+// documentation in this header file for more details. For the most part,
+// users will call helper functions, such as aom_codec_iface_name,
+// aom_codec_get_caps, etc., to interact with it.
+//
+// The main purpose of the aom_codec_iface_t is to provide a way to generate
+// a default codec config, find out what capabilities the implementation has,
+// and create an aom_codec_ctx_t (which is actually used to interact with the
+// codec).
+//
+// Note that the implementations for the AV1 algorithm are located in
+// av1/av1_cx_iface.c and av1/av1_dx_iface.c
+//
+//
+// 2. aom_codec_ctx_t
+//  (Related files: aom/aom_codec.h, av1/av1_cx_iface.c, av1/av1_dx_iface.c,
+//   aom/aomcx.h, aom/aomdx.h, aom/src/aom_encoder.c, aom/src/aom_decoder.c)
+//
+// The actual interface between user code and the codec. It stores the name
+// of the codec, a pointer back to the aom_codec_iface_t that initialized it,
+// initialization flags, a config for either encoder or the decoder, and a
+// pointer to internal data.
+//
+// The codec is configured / queried through calls to aom_codec_control,
+// which takes a control ID (listed in aomcx.h and aomdx.h) and a parameter.
+// In the case of "getter" control IDs, the parameter is modified to have
+// the requested value; in the case of "setter" control IDs, the codec's
+// configuration is changed based on the parameter. Note that a aom_codec_err_t
+// is returned, which indicates if the operation was successful or not.
+//
+// Note that for the encoder, the aom_codec_alg_priv_t points to the
+// the aom_codec_alg_priv structure in av1/av1_cx_iface.c, and for the decoder,
+// the struct in av1/av1_dx_iface.c. Variables such as AV1_COMP cpi are stored
+// here and also used in the core algorithm.
+//
+// At the end, aom_codec_destroy should be called for each initialized
+// aom_codec_ctx_t.
+
+/*!\defgroup codec Common Algorithm Interface
+ * This abstraction allows applications to easily support multiple video
+ * formats with minimal code duplication. This section describes the interface
+ * common to all codecs (both encoders and decoders).
+ * @{
+ */
+
+/*!\file
+ * \brief Describes the codec algorithm interface to applications.
+ *
+ * This file describes the interface between an application and a
+ * video codec algorithm.
+ *
+ * An application instantiates a specific codec instance by using
+ * aom_codec_dec_init() or aom_codec_enc_init() and a pointer to the
+ * algorithm's interface structure:
+ *     <pre>
+ *     my_app.c:
+ *       extern aom_codec_iface_t my_codec;
+ *       {
+ *           aom_codec_ctx_t algo;
+ *           int threads = 4;
+ *           aom_codec_dec_cfg_t cfg = { threads, 0, 0, 1 };
+ *           res = aom_codec_dec_init(&algo, &my_codec, &cfg, 0);
+ *       }
+ *     </pre>
+ *
+ * Once initialized, the instance is managed using other functions from
+ * the aom_codec_* family.
+ */
+#ifndef AOM_AOM_AOM_CODEC_H_
+#define AOM_AOM_AOM_CODEC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_image.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+/*!\brief Decorator indicating a function is deprecated */
+#ifndef AOM_DEPRECATED
+#if defined(__GNUC__) && __GNUC__
+#define AOM_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#define AOM_DEPRECATED
+#else
+#define AOM_DEPRECATED
+#endif
+#endif /* AOM_DEPRECATED */
+
+#ifndef AOM_DECLSPEC_DEPRECATED
+#if defined(__GNUC__) && __GNUC__
+#define AOM_DECLSPEC_DEPRECATED /**< \copydoc #AOM_DEPRECATED */
+#elif defined(_MSC_VER)
+/*!\brief \copydoc #AOM_DEPRECATED */
+#define AOM_DECLSPEC_DEPRECATED __declspec(deprecated)
+#else
+#define AOM_DECLSPEC_DEPRECATED /**< \copydoc #AOM_DEPRECATED */
+#endif
+#endif /* AOM_DECLSPEC_DEPRECATED */
+
+/*!\brief Decorator indicating a function is potentially unused */
+#ifdef AOM_UNUSED
+#elif defined(__GNUC__) || defined(__clang__)
+#define AOM_UNUSED __attribute__((unused))
+#else
+#define AOM_UNUSED
+#endif
+
+/*!\brief Decorator indicating that given struct/union/enum is packed */
+#ifndef ATTRIBUTE_PACKED
+#if defined(__GNUC__) && __GNUC__
+#define ATTRIBUTE_PACKED __attribute__((packed))
+#elif defined(_MSC_VER)
+#define ATTRIBUTE_PACKED
+#else
+#define ATTRIBUTE_PACKED
+#endif
+#endif /* ATTRIBUTE_PACKED */
+
+/*!\brief Current ABI version number
+ *
+ * \internal
+ * If this file is altered in any way that changes the ABI, this value
+ * must be bumped.  Examples include, but are not limited to, changing
+ * types, removing or reassigning enums, adding/removing/rearranging
+ * fields to structures
+ */
+#define AOM_CODEC_ABI_VERSION (7 + AOM_IMAGE_ABI_VERSION) /**<\hideinitializer*/
+
+/*!\brief Algorithm return codes */
+typedef enum {
+  /*!\brief Operation completed without error */
+  AOM_CODEC_OK,
+
+  /*!\brief Unspecified error */
+  AOM_CODEC_ERROR,
+
+  /*!\brief Memory operation failed */
+  AOM_CODEC_MEM_ERROR,
+
+  /*!\brief ABI version mismatch */
+  AOM_CODEC_ABI_MISMATCH,
+
+  /*!\brief Algorithm does not have required capability */
+  AOM_CODEC_INCAPABLE,
+
+  /*!\brief The given bitstream is not supported.
+   *
+   * The bitstream was unable to be parsed at the highest level. The decoder
+   * is unable to proceed. This error \ref SHOULD be treated as fatal to the
+   * stream. */
+  AOM_CODEC_UNSUP_BITSTREAM,
+
+  /*!\brief Encoded bitstream uses an unsupported feature
+   *
+   * The decoder does not implement a feature required by the encoder. This
+   * return code should only be used for features that prevent future
+   * pictures from being properly decoded. This error \ref MAY be treated as
+   * fatal to the stream or \ref MAY be treated as fatal to the current GOP.
+   */
+  AOM_CODEC_UNSUP_FEATURE,
+
+  /*!\brief The coded data for this stream is corrupt or incomplete
+   *
+   * There was a problem decoding the current frame.  This return code
+   * should only be used for failures that prevent future pictures from
+   * being properly decoded. This error \ref MAY be treated as fatal to the
+   * stream or \ref MAY be treated as fatal to the current GOP. If decoding
+   * is continued for the current GOP, artifacts may be present.
+   */
+  AOM_CODEC_CORRUPT_FRAME,
+
+  /*!\brief An application-supplied parameter is not valid.
+   *
+   */
+  AOM_CODEC_INVALID_PARAM,
+
+  /*!\brief An iterator reached the end of list.
+   *
+   */
+  AOM_CODEC_LIST_END
+
+} aom_codec_err_t;
+
+/*! \brief Codec capabilities bitfield
+ *
+ *  Each codec advertises the capabilities it supports as part of its
+ *  ::aom_codec_iface_t interface structure. Capabilities are extra interfaces
+ *  or functionality, and are not required to be supported.
+ *
+ *  The available flags are specified by AOM_CODEC_CAP_* defines.
+ */
+typedef long aom_codec_caps_t;
+#define AOM_CODEC_CAP_DECODER 0x1 /**< Is a decoder */
+#define AOM_CODEC_CAP_ENCODER 0x2 /**< Is an encoder */
+
+/*! \brief Initialization-time Feature Enabling
+ *
+ *  Certain codec features must be known at initialization time, to allow for
+ *  proper memory allocation.
+ *
+ *  The available flags are specified by AOM_CODEC_USE_* defines.
+ */
+typedef long aom_codec_flags_t;
+
+/*!\brief Time Stamp Type
+ *
+ * An integer, which when multiplied by the stream's time base, provides
+ * the absolute time of a sample.
+ */
+typedef int64_t aom_codec_pts_t;
+
+/*!\brief Codec interface structure.
+ *
+ * Contains function pointers and other data private to the codec
+ * implementation. This structure is opaque to the application. Common
+ * functions used with this structure:
+ *   - aom_codec_iface_name(aom_codec_iface_t *iface): get the
+ *     name of the codec
+ *   - aom_codec_get_caps(aom_codec_iface_t *iface): returns
+ *     the capabilities of the codec
+ *   - aom_codec_enc_config_default: generate the default config for
+ *     initializing the encoder (see documention in aom_encoder.h)
+ *   - aom_codec_dec_init, aom_codec_enc_init: initialize the codec context
+ *     structure (see documentation on aom_codec_ctx).
+ *
+ * To get access to the AV1 encoder and decoder, use aom_codec_av1_cx() and
+ *  aom_codec_av1_dx().
+ */
+typedef const struct aom_codec_iface aom_codec_iface_t;
+
+/*!\brief Codec private data structure.
+ *
+ * Contains data private to the codec implementation. This structure is opaque
+ * to the application.
+ */
+typedef struct aom_codec_priv aom_codec_priv_t;
+
+/*!\brief Compressed Frame Flags
+ *
+ * This type represents a bitfield containing information about a compressed
+ * frame that may be useful to an application. The most significant 16 bits
+ * can be used by an algorithm to provide additional detail, for example to
+ * support frame types that are codec specific (MPEG-1 D-frames for example)
+ */
+typedef uint32_t aom_codec_frame_flags_t;
+#define AOM_FRAME_IS_KEY 0x1 /**< frame is the start of a GOP */
+/*!\brief frame can be dropped without affecting the stream (no future frame
+ * depends on this one) */
+#define AOM_FRAME_IS_DROPPABLE 0x2
+/*!\brief this is an INTRA_ONLY frame */
+#define AOM_FRAME_IS_INTRAONLY 0x10
+/*!\brief this is an S-frame */
+#define AOM_FRAME_IS_SWITCH 0x20
+/*!\brief this is an error-resilient frame */
+#define AOM_FRAME_IS_ERROR_RESILIENT 0x40
+/*!\brief this is a key-frame dependent recovery-point frame */
+#define AOM_FRAME_IS_DELAYED_RANDOM_ACCESS_POINT 0x80
+
+/*!\brief Iterator
+ *
+ * Opaque storage used for iterating over lists.
+ */
+typedef const void *aom_codec_iter_t;
+
+/*!\brief Codec context structure
+ *
+ * All codecs \ref MUST support this context structure fully. In general,
+ * this data should be considered private to the codec algorithm, and
+ * not be manipulated or examined by the calling application. Applications
+ * may reference the 'name' member to get a printable description of the
+ * algorithm.
+ */
+typedef struct aom_codec_ctx {
+  const char *name;             /**< Printable interface name */
+  aom_codec_iface_t *iface;     /**< Interface pointers */
+  aom_codec_err_t err;          /**< Last returned error */
+  const char *err_detail;       /**< Detailed info, if available */
+  aom_codec_flags_t init_flags; /**< Flags passed at init time */
+  union {
+    /**< Decoder Configuration Pointer */
+    const struct aom_codec_dec_cfg *dec;
+    /**< Encoder Configuration Pointer */
+    const struct aom_codec_enc_cfg *enc;
+    const void *raw;
+  } config;               /**< Configuration pointer aliasing union */
+  aom_codec_priv_t *priv; /**< Algorithm private storage */
+} aom_codec_ctx_t;
+
+/*!\brief Bit depth for codec
+ * *
+ * This enumeration determines the bit depth of the codec.
+ */
+typedef enum aom_bit_depth {
+  AOM_BITS_8 = 8,   /**<  8 bits */
+  AOM_BITS_10 = 10, /**< 10 bits */
+  AOM_BITS_12 = 12, /**< 12 bits */
+} aom_bit_depth_t;
+
+/*!\brief Superblock size selection.
+ *
+ * Defines the superblock size used for encoding. The superblock size can
+ * either be fixed at 64x64 or 128x128 pixels, or it can be dynamically
+ * selected by the encoder for each frame.
+ */
+typedef enum aom_superblock_size {
+  AOM_SUPERBLOCK_SIZE_64X64,   /**< Always use 64x64 superblocks. */
+  AOM_SUPERBLOCK_SIZE_128X128, /**< Always use 128x128 superblocks. */
+  AOM_SUPERBLOCK_SIZE_DYNAMIC  /**< Select superblock size dynamically. */
+} aom_superblock_size_t;
+
+/*
+ * Library Version Number Interface
+ *
+ * For example, see the following sample return values:
+ *     aom_codec_version()           (1<<16 | 2<<8 | 3)
+ *     aom_codec_version_str()       "v1.2.3-rc1-16-gec6a1ba"
+ *     aom_codec_version_extra_str() "rc1-16-gec6a1ba"
+ */
+
+/*!\brief Return the version information (as an integer)
+ *
+ * Returns a packed encoding of the library version number. This will only
+ * include the major.minor.patch component of the version number. Note that this
+ * encoded value should be accessed through the macros provided, as the encoding
+ * may change in the future.
+ *
+ */
+int aom_codec_version(void);
+
+/*!\brief Return the major version number */
+#define aom_codec_version_major() ((aom_codec_version() >> 16) & 0xff)
+
+/*!\brief Return the minor version number */
+#define aom_codec_version_minor() ((aom_codec_version() >> 8) & 0xff)
+
+/*!\brief Return the patch version number */
+#define aom_codec_version_patch() ((aom_codec_version() >> 0) & 0xff)
+
+/*!\brief Return the version information (as a string)
+ *
+ * Returns a printable string containing the full library version number. This
+ * may contain additional text following the three digit version number, as to
+ * indicate release candidates, prerelease versions, etc.
+ *
+ */
+const char *aom_codec_version_str(void);
+
+/*!\brief Return the version information (as a string)
+ *
+ * Returns a printable "extra string". This is the component of the string
+ * returned by aom_codec_version_str() following the three digit version number.
+ *
+ */
+const char *aom_codec_version_extra_str(void);
+
+/*!\brief Return the build configuration
+ *
+ * Returns a printable string containing an encoded version of the build
+ * configuration. This may be useful to aom support.
+ *
+ */
+const char *aom_codec_build_config(void);
+
+/*!\brief Return the name for a given interface
+ *
+ * Returns a human readable string for name of the given codec interface.
+ *
+ * \param[in]    iface     Interface pointer
+ *
+ */
+const char *aom_codec_iface_name(aom_codec_iface_t *iface);
+
+/*!\brief Convert error number to printable string
+ *
+ * Returns a human readable string for the last error returned by the
+ * algorithm. The returned error will be one line and will not contain
+ * any newline characters.
+ *
+ *
+ * \param[in]    err     Error number.
+ *
+ */
+const char *aom_codec_err_to_string(aom_codec_err_t err);
+
+/*!\brief Retrieve error synopsis for codec context
+ *
+ * Returns a human readable string for the last error returned by the
+ * algorithm. The returned error will be one line and will not contain
+ * any newline characters.
+ *
+ *
+ * \param[in]    ctx     Pointer to this instance's context.
+ *
+ */
+const char *aom_codec_error(aom_codec_ctx_t *ctx);
+
+/*!\brief Retrieve detailed error information for codec context
+ *
+ * Returns a human readable string providing detailed information about
+ * the last error.
+ *
+ * \param[in]    ctx     Pointer to this instance's context.
+ *
+ * \retval NULL
+ *     No detailed information is available.
+ */
+const char *aom_codec_error_detail(aom_codec_ctx_t *ctx);
+
+/* REQUIRED FUNCTIONS
+ *
+ * The following functions are required to be implemented for all codecs.
+ * They represent the base case functionality expected of all codecs.
+ */
+
+/*!\brief Destroy a codec instance
+ *
+ * Destroys a codec context, freeing any associated memory buffers.
+ *
+ * \param[in] ctx   Pointer to this instance's context
+ *
+ * \retval #AOM_CODEC_OK
+ *     The codec algorithm initialized.
+ * \retval #AOM_CODEC_MEM_ERROR
+ *     Memory allocation failed.
+ */
+aom_codec_err_t aom_codec_destroy(aom_codec_ctx_t *ctx);
+
+/*!\brief Get the capabilities of an algorithm.
+ *
+ * Retrieves the capabilities bitfield from the algorithm's interface.
+ *
+ * \param[in] iface   Pointer to the algorithm interface
+ *
+ */
+aom_codec_caps_t aom_codec_get_caps(aom_codec_iface_t *iface);
+
+/*!\name Codec Control
+ *
+ * The aom_codec_control function exchanges algorithm specific data with the
+ * codec instance. Additionally, the macro AOM_CODEC_CONTROL_TYPECHECKED is
+ * provided, which will type-check the parameter against the control ID before
+ * calling aom_codec_control - note that this macro requires the control ID
+ * to be directly encoded in it, e.g.,
+ * AOM_CODEC_CONTROL_TYPECHECKED(&ctx, AOME_SET_CPUUSED, 8).
+ *
+ * The codec control IDs can be found in aom.h, aomcx.h, and aomdx.h
+ * (defined as aom_com_control_id, aome_enc_control_id, and aom_dec_control_id).
+ * @{
+ */
+/*!\brief Algorithm Control
+ *
+ * aom_codec_control takes a context, a control ID, and a third parameter
+ * (with varying type). If the context is non-null and an error occurs,
+ * ctx->err will be set to the same value as the return value.
+ *
+ * \param[in]     ctx              Pointer to this instance's context
+ * \param[in]     ctrl_id          Algorithm specific control identifier
+ *
+ * \retval #AOM_CODEC_OK
+ *     The control request was processed.
+ * \retval #AOM_CODEC_ERROR
+ *     The control request was not processed.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     The data was not valid.
+ */
+aom_codec_err_t aom_codec_control(aom_codec_ctx_t *ctx, int ctrl_id, ...);
+
+/*!\brief Key & Value API
+ *
+ * aom_codec_set_option() takes a context, a key (option name) and a value. If
+ * the context is non-null and an error occurs, ctx->err will be set to the same
+ * value as the return value.
+ *
+ * \param[in]     ctx              Pointer to this instance's context
+ * \param[in]     name             The name of the option (key)
+ * \param[in]     value            The value of the option
+ *
+ * \retval #AOM_CODEC_OK
+ *     The value of the option was set.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     The data was not valid.
+ * \retval #AOM_CODEC_ERROR
+ *     The option was not successfully set.
+ */
+aom_codec_err_t aom_codec_set_option(aom_codec_ctx_t *ctx, const char *name,
+                                     const char *value);
+
+/*!\brief aom_codec_control wrapper macro (adds type-checking, less flexible)
+ *
+ * This macro allows for type safe conversions across the variadic parameter
+ * to aom_codec_control(). However, it requires the explicit control ID
+ * be passed in (it cannot be passed in via a variable) -- otherwise a compiler
+ * error will occur. After the type checking, it calls aom_codec_control.
+ */
+#define AOM_CODEC_CONTROL_TYPECHECKED(ctx, id, data) \
+  aom_codec_control_typechecked_##id(ctx, id, data) /**<\hideinitializer*/
+
+/*!\brief Creates typechecking mechanisms for aom_codec_control
+ *
+ * It defines a static function with the correctly typed arguments as a wrapper
+ * to the type-unsafe aom_codec_control function. It also creates a typedef
+ * for each type.
+ */
+#define AOM_CTRL_USE_TYPE(id, typ)                           \
+  static aom_codec_err_t aom_codec_control_typechecked_##id( \
+      aom_codec_ctx_t *, int, typ) AOM_UNUSED;               \
+  static aom_codec_err_t aom_codec_control_typechecked_##id( \
+      aom_codec_ctx_t *ctx, int ctrl, typ data) {            \
+    return aom_codec_control(ctx, ctrl, data);               \
+  } /**<\hideinitializer*/                                   \
+  typedef typ aom_codec_control_type_##id;
+/*!@} end Codec Control group */
+
+/*!\brief OBU types. */
+typedef enum ATTRIBUTE_PACKED {
+  OBU_SEQUENCE_HEADER = 1,
+  OBU_TEMPORAL_DELIMITER = 2,
+  OBU_FRAME_HEADER = 3,
+  OBU_TILE_GROUP = 4,
+  OBU_METADATA = 5,
+  OBU_FRAME = 6,
+  OBU_REDUNDANT_FRAME_HEADER = 7,
+  OBU_TILE_LIST = 8,
+  OBU_PADDING = 15,
+} OBU_TYPE;
+
+/*!\brief OBU metadata types. */
+typedef enum {
+  OBU_METADATA_TYPE_AOM_RESERVED_0 = 0,
+  OBU_METADATA_TYPE_HDR_CLL = 1,
+  OBU_METADATA_TYPE_HDR_MDCV = 2,
+  OBU_METADATA_TYPE_SCALABILITY = 3,
+  OBU_METADATA_TYPE_ITUT_T35 = 4,
+  OBU_METADATA_TYPE_TIMECODE = 5,
+} OBU_METADATA_TYPE;
+
+/*!\brief Returns string representation of OBU_TYPE.
+ *
+ * \param[in]     type            The OBU_TYPE to convert to string.
+ */
+const char *aom_obu_type_to_string(OBU_TYPE type);
+
+/*!@} - end defgroup codec*/
+#ifdef __cplusplus
+}
+#endif
+#endif  // AOM_AOM_AOM_CODEC_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_decoder.c b/pxr/imaging/plugin/hioAvif/aom/aom_decoder.c
new file mode 100644
index 0000000000..d9005d3538
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_decoder.c
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\file
+ * \brief Provides the high level interface to wrap decoder algorithms.
+ *
+ */
+#include <string.h>
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h"
+
+#define SAVE_STATUS(ctx, var) (ctx ? (ctx->err = var) : var)
+
+static aom_codec_alg_priv_t *get_alg_priv(aom_codec_ctx_t *ctx) {
+  return (aom_codec_alg_priv_t *)ctx->priv;
+}
+
+aom_codec_err_t aom_codec_dec_init_ver(aom_codec_ctx_t *ctx,
+                                       aom_codec_iface_t *iface,
+                                       const aom_codec_dec_cfg_t *cfg,
+                                       aom_codec_flags_t flags, int ver) {
+  aom_codec_err_t res;
+
+  if (ver != AOM_DECODER_ABI_VERSION)
+    res = AOM_CODEC_ABI_MISMATCH;
+  else if (!ctx || !iface)
+    res = AOM_CODEC_INVALID_PARAM;
+  else if (iface->abi_version != AOM_CODEC_INTERNAL_ABI_VERSION)
+    res = AOM_CODEC_ABI_MISMATCH;
+  else if (!(iface->caps & AOM_CODEC_CAP_DECODER))
+    res = AOM_CODEC_INCAPABLE;
+  else {
+    memset(ctx, 0, sizeof(*ctx));
+    ctx->iface = iface;
+    ctx->name = iface->name;
+    ctx->priv = NULL;
+    ctx->init_flags = flags;
+    ctx->config.dec = cfg;
+
+    res = ctx->iface->init(ctx);
+    if (res) {
+      ctx->err_detail = ctx->priv ? ctx->priv->err_detail : NULL;
+      aom_codec_destroy(ctx);
+    }
+  }
+
+  return SAVE_STATUS(ctx, res);
+}
+
+aom_codec_err_t aom_codec_peek_stream_info(aom_codec_iface_t *iface,
+                                           const uint8_t *data, size_t data_sz,
+                                           aom_codec_stream_info_t *si) {
+  aom_codec_err_t res;
+
+  if (!iface || !data || !data_sz || !si) {
+    res = AOM_CODEC_INVALID_PARAM;
+  } else {
+    /* Set default/unknown values */
+    si->w = 0;
+    si->h = 0;
+
+    res = iface->dec.peek_si(data, data_sz, si);
+  }
+
+  return res;
+}
+
+aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx,
+                                          aom_codec_stream_info_t *si) {
+  aom_codec_err_t res;
+
+  if (!ctx || !si) {
+    res = AOM_CODEC_INVALID_PARAM;
+  } else if (!ctx->iface || !ctx->priv) {
+    res = AOM_CODEC_ERROR;
+  } else {
+    /* Set default/unknown values */
+    si->w = 0;
+    si->h = 0;
+
+    res = ctx->iface->dec.get_si(get_alg_priv(ctx), si);
+  }
+
+  return SAVE_STATUS(ctx, res);
+}
+
+aom_codec_err_t aom_codec_decode(aom_codec_ctx_t *ctx, const uint8_t *data,
+                                 size_t data_sz, void *user_priv) {
+  aom_codec_err_t res;
+
+  if (!ctx)
+    res = AOM_CODEC_INVALID_PARAM;
+  else if (!ctx->iface || !ctx->priv)
+    res = AOM_CODEC_ERROR;
+  else {
+    res = ctx->iface->dec.decode(get_alg_priv(ctx), data, data_sz, user_priv);
+  }
+
+  return SAVE_STATUS(ctx, res);
+}
+
+aom_image_t *aom_codec_get_frame(aom_codec_ctx_t *ctx, aom_codec_iter_t *iter) {
+  aom_image_t *img;
+
+  if (!ctx || !iter || !ctx->iface || !ctx->priv)
+    img = NULL;
+  else
+    img = ctx->iface->dec.get_frame(get_alg_priv(ctx), iter);
+
+  return img;
+}
+
+aom_codec_err_t aom_codec_set_frame_buffer_functions(
+    aom_codec_ctx_t *ctx, aom_get_frame_buffer_cb_fn_t cb_get,
+    aom_release_frame_buffer_cb_fn_t cb_release, void *cb_priv) {
+  aom_codec_err_t res;
+
+  if (!ctx || !cb_get || !cb_release) {
+    res = AOM_CODEC_INVALID_PARAM;
+  } else if (!ctx->iface || !ctx->priv) {
+    res = AOM_CODEC_ERROR;
+  } else if (!(ctx->iface->caps & AOM_CODEC_CAP_EXTERNAL_FRAME_BUFFER)) {
+    res = AOM_CODEC_INCAPABLE;
+  } else {
+    res = ctx->iface->dec.set_fb_fn(get_alg_priv(ctx), cb_get, cb_release,
+                                    cb_priv);
+  }
+
+  return SAVE_STATUS(ctx, res);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_decoder.h b/pxr/imaging/plugin/hioAvif/aom/aom_decoder.h
new file mode 100644
index 0000000000..325bf07ea5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_decoder.h
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#ifndef AOM_AOM_AOM_DECODER_H_
+#define AOM_AOM_AOM_DECODER_H_
+
+/*!\defgroup decoder Decoder Algorithm Interface
+ * \ingroup codec
+ * This abstraction allows applications using this decoder to easily support
+ * multiple video formats with minimal code duplication. This section describes
+ * the interface common to all decoders.
+ * @{
+ */
+
+/*!\file
+ * \brief Describes the decoder algorithm interface to applications.
+ *
+ * This file describes the interface between an application and a
+ * video decoder algorithm.
+ *
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_frame_buffer.h"
+
+/*!\brief Current ABI version number
+ *
+ * \internal
+ * If this file is altered in any way that changes the ABI, this value
+ * must be bumped.  Examples include, but are not limited to, changing
+ * types, removing or reassigning enums, adding/removing/rearranging
+ * fields to structures
+ */
+#define AOM_DECODER_ABI_VERSION \
+  (6 + AOM_CODEC_ABI_VERSION) /**<\hideinitializer*/
+
+/*! \brief Decoder capabilities bitfield
+ *
+ *  Each decoder advertises the capabilities it supports as part of its
+ *  ::aom_codec_iface_t interface structure. Capabilities are extra interfaces
+ *  or functionality, and are not required to be supported by a decoder.
+ *
+ *  The available flags are specified by AOM_CODEC_CAP_* defines.
+ */
+/*!brief Can support external frame buffers */
+#define AOM_CODEC_CAP_EXTERNAL_FRAME_BUFFER 0x200000
+
+/*! \brief Initialization-time Feature Enabling
+ *
+ *  Certain codec features must be known at initialization time, to allow for
+ *  proper memory allocation.
+ *
+ *  The available flags are specified by AOM_CODEC_USE_* defines.
+ */
+
+/*!\brief Stream properties
+ *
+ * This structure is used to query or set properties of the decoded
+ * stream.
+ */
+typedef struct aom_codec_stream_info {
+  unsigned int w;                      /**< Width (or 0 for unknown/default) */
+  unsigned int h;                      /**< Height (or 0 for unknown/default) */
+  unsigned int is_kf;                  /**< Current frame is a keyframe */
+  unsigned int number_spatial_layers;  /**< Number of spatial layers */
+  unsigned int number_temporal_layers; /**< Number of temporal layers */
+  unsigned int is_annexb;              /**< Is Bitstream in Annex-B format */
+} aom_codec_stream_info_t;
+
+/* REQUIRED FUNCTIONS
+ *
+ * The following functions are required to be implemented for all decoders.
+ * They represent the base case functionality expected of all decoders.
+ */
+
+/*!\brief Initialization Configurations
+ *
+ * This structure is used to pass init time configuration options to the
+ * decoder.
+ */
+typedef struct aom_codec_dec_cfg {
+  unsigned int threads; /**< Maximum number of threads to use, default 1 */
+  unsigned int w;       /**< Width */
+  unsigned int h;       /**< Height */
+  unsigned int allow_lowbitdepth; /**< Allow use of low-bitdepth coding path */
+} aom_codec_dec_cfg_t;            /**< alias for struct aom_codec_dec_cfg */
+
+/*!\brief Initialize a decoder instance
+ *
+ * Initializes a decoder context using the given interface. Applications
+ * should call the aom_codec_dec_init convenience macro instead of this
+ * function directly, to ensure that the ABI version number parameter
+ * is properly initialized.
+ *
+ * If the library was configured with cmake -DCONFIG_MULTITHREAD=0, this
+ * call is not thread safe and should be guarded with a lock if being used
+ * in a multithreaded context.
+ *
+ * \param[in]    ctx     Pointer to this instance's context.
+ * \param[in]    iface   Pointer to the algorithm interface to use.
+ * \param[in]    cfg     Configuration to use, if known. May be NULL.
+ * \param[in]    flags   Bitfield of AOM_CODEC_USE_* flags
+ * \param[in]    ver     ABI version number. Must be set to
+ *                       AOM_DECODER_ABI_VERSION
+ * \retval #AOM_CODEC_OK
+ *     The decoder algorithm initialized.
+ * \retval #AOM_CODEC_MEM_ERROR
+ *     Memory allocation failed.
+ */
+aom_codec_err_t aom_codec_dec_init_ver(aom_codec_ctx_t *ctx,
+                                       aom_codec_iface_t *iface,
+                                       const aom_codec_dec_cfg_t *cfg,
+                                       aom_codec_flags_t flags, int ver);
+
+/*!\brief Convenience macro for aom_codec_dec_init_ver()
+ *
+ * Ensures the ABI version parameter is properly set.
+ */
+#define aom_codec_dec_init(ctx, iface, cfg, flags) \
+  aom_codec_dec_init_ver(ctx, iface, cfg, flags, AOM_DECODER_ABI_VERSION)
+
+/*!\brief Parse stream info from a buffer
+ *
+ * Performs high level parsing of the bitstream. Construction of a decoder
+ * context is not necessary. Can be used to determine if the bitstream is
+ * of the proper format, and to extract information from the stream.
+ *
+ * \param[in]      iface   Pointer to the algorithm interface
+ * \param[in]      data    Pointer to a block of data to parse
+ * \param[in]      data_sz Size of the data buffer
+ * \param[in,out]  si      Pointer to stream info to update. The is_annexb
+ *                         member \ref MUST be properly initialized. This
+ *                         function sets the rest of the members.
+ *
+ * \retval #AOM_CODEC_OK
+ *     Bitstream is parsable and stream information updated.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     One of the arguments is invalid, for example a NULL pointer.
+ * \retval #AOM_CODEC_UNSUP_BITSTREAM
+ *     The decoder didn't recognize the coded data, or the
+ *     buffer was too short.
+ */
+aom_codec_err_t aom_codec_peek_stream_info(aom_codec_iface_t *iface,
+                                           const uint8_t *data, size_t data_sz,
+                                           aom_codec_stream_info_t *si);
+
+/*!\brief Return information about the current stream.
+ *
+ * Returns information about the stream that has been parsed during decoding.
+ *
+ * \param[in]      ctx     Pointer to this instance's context
+ * \param[in,out]  si      Pointer to stream info to update.
+ *
+ * \retval #AOM_CODEC_OK
+ *     Bitstream is parsable and stream information updated.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     One of the arguments is invalid, for example a NULL pointer.
+ * \retval #AOM_CODEC_UNSUP_BITSTREAM
+ *     The decoder couldn't parse the submitted data.
+ */
+aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx,
+                                          aom_codec_stream_info_t *si);
+
+/*!\brief Decode data
+ *
+ * Processes a buffer of coded data. Encoded data \ref MUST be passed in DTS
+ * (decode time stamp) order. Frames produced will always be in PTS
+ * (presentation time stamp) order.
+ *
+ * \param[in] ctx          Pointer to this instance's context
+ * \param[in] data         Pointer to this block of new coded data.
+ * \param[in] data_sz      Size of the coded data, in bytes.
+ * \param[in] user_priv    Application specific data to associate with
+ *                         this frame.
+ *
+ * \return Returns #AOM_CODEC_OK if the coded data was processed completely
+ *         and future pictures can be decoded without error. Otherwise,
+ *         see the descriptions of the other error codes in ::aom_codec_err_t
+ *         for recoverability capabilities.
+ */
+aom_codec_err_t aom_codec_decode(aom_codec_ctx_t *ctx, const uint8_t *data,
+                                 size_t data_sz, void *user_priv);
+
+/*!\brief Decoded frames iterator
+ *
+ * Iterates over a list of the frames available for display. The iterator
+ * storage should be initialized to NULL to start the iteration. Iteration is
+ * complete when this function returns NULL.
+ *
+ * The list of available frames becomes valid upon completion of the
+ * aom_codec_decode call, and remains valid until the next call to
+ * aom_codec_decode.
+ *
+ * \param[in]     ctx      Pointer to this instance's context
+ * \param[in,out] iter     Iterator storage, initialized to NULL
+ *
+ * \return Returns a pointer to an image, if one is ready for display. Frames
+ *         produced will always be in PTS (presentation time stamp) order.
+ */
+aom_image_t *aom_codec_get_frame(aom_codec_ctx_t *ctx, aom_codec_iter_t *iter);
+
+/*!\defgroup cap_external_frame_buffer External Frame Buffer Functions
+ *
+ * The following function is required to be implemented for all decoders
+ * that advertise the AOM_CODEC_CAP_EXTERNAL_FRAME_BUFFER capability.
+ * Calling this function for codecs that don't advertise this capability
+ * will result in an error code being returned, usually AOM_CODEC_INCAPABLE.
+ * @{
+ */
+
+/*!\brief Pass in external frame buffers for the decoder to use.
+ *
+ * Registers functions to be called when libaom needs a frame buffer
+ * to decode the current frame and a function to be called when libaom does
+ * not internally reference the frame buffer. This set function must
+ * be called before the first call to decode or libaom will assume the
+ * default behavior of allocating frame buffers internally.
+ *
+ * \param[in] ctx          Pointer to this instance's context
+ * \param[in] cb_get       Pointer to the get callback function
+ * \param[in] cb_release   Pointer to the release callback function
+ * \param[in] cb_priv      Callback's private data
+ *
+ * \retval #AOM_CODEC_OK
+ *     External frame buffers will be used by libaom.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     One or more of the callbacks were NULL.
+ * \retval #AOM_CODEC_ERROR
+ *     Decoder context not initialized.
+ * \retval #AOM_CODEC_INCAPABLE
+ *     Algorithm not capable of using external frame buffers.
+ *
+ * \note
+ * When decoding AV1, the application may be required to pass in at least
+ * #AOM_MAXIMUM_WORK_BUFFERS external frame buffers.
+ */
+aom_codec_err_t aom_codec_set_frame_buffer_functions(
+    aom_codec_ctx_t *ctx, aom_get_frame_buffer_cb_fn_t cb_get,
+    aom_release_frame_buffer_cb_fn_t cb_release, void *cb_priv);
+
+/*!@} - end defgroup cap_external_frame_buffer */
+
+/*!@} - end defgroup decoder*/
+#ifdef __cplusplus
+}
+#endif
+#endif  // AOM_AOM_AOM_DECODER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_convolve.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_convolve.c
new file mode 100644
index 0000000000..90321b6f83
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_convolve.c
@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_filter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+static INLINE int horz_scalar_product(const uint8_t *a, const int16_t *b) {
+  int sum = 0;
+  for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k] * b[k];
+  return sum;
+}
+
+static INLINE int vert_scalar_product(const uint8_t *a, ptrdiff_t a_stride,
+                                      const int16_t *b) {
+  int sum = 0;
+  for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k * a_stride] * b[k];
+  return sum;
+}
+
+static void convolve_horiz(const uint8_t *src, ptrdiff_t src_stride,
+                           uint8_t *dst, ptrdiff_t dst_stride,
+                           const InterpKernel *x_filters, int x0_q4,
+                           int x_step_q4, int w, int h) {
+  src -= SUBPEL_TAPS / 2 - 1;
+  for (int y = 0; y < h; ++y) {
+    int x_q4 = x0_q4;
+    for (int x = 0; x < w; ++x) {
+      const uint8_t *const src_x = &src[x_q4 >> SUBPEL_BITS];
+      const int16_t *const x_filter = x_filters[x_q4 & SUBPEL_MASK];
+      const int sum = horz_scalar_product(src_x, x_filter);
+      dst[x] = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
+      x_q4 += x_step_q4;
+    }
+    src += src_stride;
+    dst += dst_stride;
+  }
+}
+
+static void convolve_vert(const uint8_t *src, ptrdiff_t src_stride,
+                          uint8_t *dst, ptrdiff_t dst_stride,
+                          const InterpKernel *y_filters, int y0_q4,
+                          int y_step_q4, int w, int h) {
+  src -= src_stride * (SUBPEL_TAPS / 2 - 1);
+
+  for (int x = 0; x < w; ++x) {
+    int y_q4 = y0_q4;
+    for (int y = 0; y < h; ++y) {
+      const unsigned char *src_y = &src[(y_q4 >> SUBPEL_BITS) * src_stride];
+      const int16_t *const y_filter = y_filters[y_q4 & SUBPEL_MASK];
+      const int sum = vert_scalar_product(src_y, src_stride, y_filter);
+      dst[y * dst_stride] = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
+      y_q4 += y_step_q4;
+    }
+    ++src;
+    ++dst;
+  }
+}
+
+static const InterpKernel *get_filter_base(const int16_t *filter) {
+  // NOTE: This assumes that the filter table is 256-byte aligned.
+  return (const InterpKernel *)(((intptr_t)filter) & ~((intptr_t)0xFF));
+}
+
+static int get_filter_offset(const int16_t *f, const InterpKernel *base) {
+  return (int)((const InterpKernel *)(intptr_t)f - base);
+}
+
+void aom_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride,
+                           uint8_t *dst, ptrdiff_t dst_stride,
+                           const int16_t *filter_x, int x_step_q4,
+                           const int16_t *filter_y, int y_step_q4, int w,
+                           int h) {
+  const InterpKernel *const filters_x = get_filter_base(filter_x);
+  const int x0_q4 = get_filter_offset(filter_x, filters_x);
+
+  (void)filter_y;
+  (void)y_step_q4;
+
+  convolve_horiz(src, src_stride, dst, dst_stride, filters_x, x0_q4, x_step_q4,
+                 w, h);
+}
+
+void aom_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride,
+                          uint8_t *dst, ptrdiff_t dst_stride,
+                          const int16_t *filter_x, int x_step_q4,
+                          const int16_t *filter_y, int y_step_q4, int w,
+                          int h) {
+  const InterpKernel *const filters_y = get_filter_base(filter_y);
+  const int y0_q4 = get_filter_offset(filter_y, filters_y);
+
+  (void)filter_x;
+  (void)x_step_q4;
+
+  convolve_vert(src, src_stride, dst, dst_stride, filters_y, y0_q4, y_step_q4,
+                w, h);
+}
+
+void aom_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
+                     ptrdiff_t dst_stride, const InterpKernel *filter,
+                     int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w,
+                     int h) {
+  // Note: Fixed size intermediate buffer, temp, places limits on parameters.
+  // 2d filtering proceeds in 2 steps:
+  //   (1) Interpolate horizontally into an intermediate buffer, temp.
+  //   (2) Interpolate temp vertically to derive the sub-pixel result.
+  // Deriving the maximum number of rows in the temp buffer (135):
+  // --Smallest scaling factor is x1/2 ==> y_step_q4 = 32 (Normative).
+  // --Largest block size is 64x64 pixels.
+  // --64 rows in the downscaled frame span a distance of (64 - 1) * 32 in the
+  //   original frame (in 1/16th pixel units).
+  // --Must round-up because block may be located at sub-pixel position.
+  // --Require an additional SUBPEL_TAPS rows for the 8-tap filter tails.
+  // --((64 - 1) * 32 + 15) >> 4 + 8 = 135.
+  // When calling in frame scaling function, the smallest scaling factor is x1/4
+  // ==> y_step_q4 = 64. Since w and h are at most 16, the temp buffer is still
+  // big enough.
+  uint8_t temp[64 * 135];
+  const int intermediate_height =
+      (((h - 1) * y_step_q4 + y0_q4) >> SUBPEL_BITS) + SUBPEL_TAPS;
+
+  assert(w <= 64);
+  assert(h <= 64);
+  assert(y_step_q4 <= 32 || (y_step_q4 <= 64 && h <= 32));
+  assert(x_step_q4 <= 64);
+
+  convolve_horiz(src - src_stride * (SUBPEL_TAPS / 2 - 1), src_stride, temp, 64,
+                 filter, x0_q4, x_step_q4, w, intermediate_height);
+  convolve_vert(temp + 64 * (SUBPEL_TAPS / 2 - 1), 64, dst, dst_stride, filter,
+                y0_q4, y_step_q4, w, h);
+}
+
+void aom_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
+                     ptrdiff_t dst_stride, const InterpKernel *filter,
+                     int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w,
+                     int h) {
+  aom_convolve8_c(src, src_stride, dst, dst_stride, filter, x0_q4, x_step_q4,
+                  y0_q4, y_step_q4, w, h);
+}
+
+void aom_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
+                         ptrdiff_t dst_stride, int w, int h) {
+  for (int r = h; r > 0; --r) {
+    memmove(dst, src, w);
+    src += src_stride;
+    dst += dst_stride;
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static INLINE int highbd_vert_scalar_product(const uint16_t *a,
+                                             ptrdiff_t a_stride,
+                                             const int16_t *b) {
+  int sum = 0;
+  for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k * a_stride] * b[k];
+  return sum;
+}
+
+static INLINE int highbd_horz_scalar_product(const uint16_t *a,
+                                             const int16_t *b) {
+  int sum = 0;
+  for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k] * b[k];
+  return sum;
+}
+
+static void highbd_convolve_horiz(const uint8_t *src8, ptrdiff_t src_stride,
+                                  uint8_t *dst8, ptrdiff_t dst_stride,
+                                  const InterpKernel *x_filters, int x0_q4,
+                                  int x_step_q4, int w, int h, int bd) {
+  uint16_t *src = CONVERT_TO_SHORTPTR(src8);
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
+  src -= SUBPEL_TAPS / 2 - 1;
+  for (int y = 0; y < h; ++y) {
+    int x_q4 = x0_q4;
+    for (int x = 0; x < w; ++x) {
+      const uint16_t *const src_x = &src[x_q4 >> SUBPEL_BITS];
+      const int16_t *const x_filter = x_filters[x_q4 & SUBPEL_MASK];
+      const int sum = highbd_horz_scalar_product(src_x, x_filter);
+      dst[x] = clip_pixel_highbd(ROUND_POWER_OF_TWO(sum, FILTER_BITS), bd);
+      x_q4 += x_step_q4;
+    }
+    src += src_stride;
+    dst += dst_stride;
+  }
+}
+
+static void highbd_convolve_vert(const uint8_t *src8, ptrdiff_t src_stride,
+                                 uint8_t *dst8, ptrdiff_t dst_stride,
+                                 const InterpKernel *y_filters, int y0_q4,
+                                 int y_step_q4, int w, int h, int bd) {
+  uint16_t *src = CONVERT_TO_SHORTPTR(src8);
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
+  src -= src_stride * (SUBPEL_TAPS / 2 - 1);
+  for (int x = 0; x < w; ++x) {
+    int y_q4 = y0_q4;
+    for (int y = 0; y < h; ++y) {
+      const uint16_t *src_y = &src[(y_q4 >> SUBPEL_BITS) * src_stride];
+      const int16_t *const y_filter = y_filters[y_q4 & SUBPEL_MASK];
+      const int sum = highbd_vert_scalar_product(src_y, src_stride, y_filter);
+      dst[y * dst_stride] =
+          clip_pixel_highbd(ROUND_POWER_OF_TWO(sum, FILTER_BITS), bd);
+      y_q4 += y_step_q4;
+    }
+    ++src;
+    ++dst;
+  }
+}
+
+void aom_highbd_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride,
+                                  uint8_t *dst, ptrdiff_t dst_stride,
+                                  const int16_t *filter_x, int x_step_q4,
+                                  const int16_t *filter_y, int y_step_q4, int w,
+                                  int h, int bd) {
+  const InterpKernel *const filters_x = get_filter_base(filter_x);
+  const int x0_q4 = get_filter_offset(filter_x, filters_x);
+  (void)filter_y;
+  (void)y_step_q4;
+
+  highbd_convolve_horiz(src, src_stride, dst, dst_stride, filters_x, x0_q4,
+                        x_step_q4, w, h, bd);
+}
+
+void aom_highbd_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride,
+                                 uint8_t *dst, ptrdiff_t dst_stride,
+                                 const int16_t *filter_x, int x_step_q4,
+                                 const int16_t *filter_y, int y_step_q4, int w,
+                                 int h, int bd) {
+  const InterpKernel *const filters_y = get_filter_base(filter_y);
+  const int y0_q4 = get_filter_offset(filter_y, filters_y);
+  (void)filter_x;
+  (void)x_step_q4;
+
+  highbd_convolve_vert(src, src_stride, dst, dst_stride, filters_y, y0_q4,
+                       y_step_q4, w, h, bd);
+}
+
+void aom_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride,
+                                uint16_t *dst, ptrdiff_t dst_stride, int w,
+                                int h) {
+  for (int y = 0; y < h; ++y) {
+    memmove(dst, src, w * sizeof(src[0]));
+    src += src_stride;
+    dst += dst_stride;
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h
new file mode 100644
index 0000000000..c676bd6189
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_AOM_DSP_COMMON_H_
+#define AOM_AOM_DSP_AOM_DSP_COMMON_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef MAX_SB_SIZE
+#define MAX_SB_SIZE 128
+#endif  // ndef MAX_SB_SIZE
+
+#define AOMMIN(x, y) (((x) < (y)) ? (x) : (y))
+#define AOMMAX(x, y) (((x) > (y)) ? (x) : (y))
+#define AOMSIGN(x) ((x) < 0 ? -1 : 0)
+
+#define NELEMENTS(x) (int)(sizeof(x) / sizeof(x[0]))
+
+#define IMPLIES(a, b) (!(a) || (b))  //  Logical 'a implies b' (or 'a -> b')
+
+#define IS_POWER_OF_TWO(x) (((x) & ((x)-1)) == 0)
+
+/* Left shifting a negative value became undefined behavior in C99 (downgraded
+   from merely implementation-defined in C89). This should still compile to the
+   correct thing on any two's-complement machine, but avoid ubsan warnings.*/
+#define AOM_SIGNED_SHL(x, shift) ((x) * (((x)*0 + 1) << (shift)))
+
+// These can be used to give a hint about branch outcomes.
+// This can have an effect, even if your target processor has a
+// good branch predictor, as these hints can affect basic block
+// ordering by the compiler.
+#ifdef __GNUC__
+#define LIKELY(v) __builtin_expect(v, 1)
+#define UNLIKELY(v) __builtin_expect(v, 0)
+#else
+#define LIKELY(v) (v)
+#define UNLIKELY(v) (v)
+#endif
+
+typedef uint8_t qm_val_t;
+#define AOM_QM_BITS 5
+
+// Note:
+// tran_low_t  is the datatype used for final transform coefficients.
+// tran_high_t is the datatype used for intermediate transform stages.
+typedef int64_t tran_high_t;
+typedef int32_t tran_low_t;
+
+static INLINE uint8_t clip_pixel(int val) {
+  return (val > 255) ? 255 : (val < 0) ? 0 : val;
+}
+
+static INLINE int clamp(int value, int low, int high) {
+  return value < low ? low : (value > high ? high : value);
+}
+
+static INLINE int64_t clamp64(int64_t value, int64_t low, int64_t high) {
+  return value < low ? low : (value > high ? high : value);
+}
+
+static INLINE double fclamp(double value, double low, double high) {
+  return value < low ? low : (value > high ? high : value);
+}
+
+static INLINE uint16_t clip_pixel_highbd(int val, int bd) {
+  switch (bd) {
+    case 8:
+    default: return (uint16_t)clamp(val, 0, 255);
+    case 10: return (uint16_t)clamp(val, 0, 1023);
+    case 12: return (uint16_t)clamp(val, 0, 4095);
+  }
+}
+
+// The result of this branchless code is equivalent to (value < 0 ? 0 : value)
+// or max(0, value) and might be faster in some cases.
+// Care should be taken since the behavior of right shifting signed type
+// negative value is undefined by C standards and implementation defined,
+static INLINE unsigned int negative_to_zero(int value) {
+  return value & ~(value >> (sizeof(value) * 8 - 1));
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_DSP_AOM_DSP_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_rtcd.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_rtcd.c
new file mode 100644
index 0000000000..2684400823
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_rtcd.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#define RTCD_C
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_once.h"
+
+void aom_dsp_rtcd() { aom_once(setup_rtcd_internal); }
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_filter.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_filter.h
new file mode 100644
index 0000000000..c9a2d526ab
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_filter.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_AOM_FILTER_H_
+#define AOM_AOM_DSP_AOM_FILTER_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define FILTER_BITS 7
+
+#define SUBPEL_BITS 4
+#define SUBPEL_MASK ((1 << SUBPEL_BITS) - 1)
+#define SUBPEL_SHIFTS (1 << SUBPEL_BITS)
+#define SUBPEL_TAPS 8
+
+#define SCALE_SUBPEL_BITS 10
+#define SCALE_SUBPEL_SHIFTS (1 << SCALE_SUBPEL_BITS)
+#define SCALE_SUBPEL_MASK (SCALE_SUBPEL_SHIFTS - 1)
+#define SCALE_EXTRA_BITS (SCALE_SUBPEL_BITS - SUBPEL_BITS)
+#define SCALE_EXTRA_OFF ((1 << SCALE_EXTRA_BITS) / 2)
+
+#define RS_SUBPEL_BITS 6
+#define RS_SUBPEL_MASK ((1 << RS_SUBPEL_BITS) - 1)
+#define RS_SCALE_SUBPEL_BITS 14
+#define RS_SCALE_SUBPEL_MASK ((1 << RS_SCALE_SUBPEL_BITS) - 1)
+#define RS_SCALE_EXTRA_BITS (RS_SCALE_SUBPEL_BITS - RS_SUBPEL_BITS)
+#define RS_SCALE_EXTRA_OFF (1 << (RS_SCALE_EXTRA_BITS - 1))
+
+typedef int16_t InterpKernel[SUBPEL_TAPS];
+
+#define BIL_SUBPEL_BITS 3
+#define BIL_SUBPEL_SHIFTS (1 << BIL_SUBPEL_BITS)
+
+// 2 tap bilinear filters
+static const uint8_t bilinear_filters_2t[BIL_SUBPEL_SHIFTS][2] = {
+  { 128, 0 }, { 112, 16 }, { 96, 32 }, { 80, 48 },
+  { 64, 64 }, { 48, 80 },  { 32, 96 }, { 16, 112 },
+};
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_DSP_AOM_FILTER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/binary_codes_reader.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/binary_codes_reader.c
new file mode 100644
index 0000000000..8c2dc2df94
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/binary_codes_reader.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/binary_codes_reader.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/recenter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+
+uint16_t aom_read_primitive_quniform_(aom_reader *r,
+                                      uint16_t n ACCT_STR_PARAM) {
+  if (n <= 1) return 0;
+  const int l = get_msb(n) + 1;
+  const int m = (1 << l) - n;
+  const int v = aom_read_literal(r, l - 1, ACCT_STR_NAME);
+  return v < m ? v : (v << 1) - m + aom_read_bit(r, ACCT_STR_NAME);
+}
+
+// Decode finite subexponential code that for a symbol v in [0, n-1] with
+// parameter k
+uint16_t aom_read_primitive_subexpfin_(aom_reader *r, uint16_t n,
+                                       uint16_t k ACCT_STR_PARAM) {
+  int i = 0;
+  int mk = 0;
+
+  while (1) {
+    int b = (i ? k + i - 1 : k);
+    int a = (1 << b);
+
+    if (n <= mk + 3 * a) {
+      return aom_read_primitive_quniform(r, n - mk, ACCT_STR_NAME) + mk;
+    }
+
+    if (!aom_read_bit(r, ACCT_STR_NAME)) {
+      return aom_read_literal(r, b, ACCT_STR_NAME) + mk;
+    }
+
+    i = i + 1;
+    mk += a;
+  }
+
+  assert(0);
+  return 0;
+}
+
+uint16_t aom_read_primitive_refsubexpfin_(aom_reader *r, uint16_t n, uint16_t k,
+                                          uint16_t ref ACCT_STR_PARAM) {
+  return inv_recenter_finite_nonneg(
+      n, ref, aom_read_primitive_subexpfin(r, n, k, ACCT_STR_NAME));
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/binary_codes_reader.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/binary_codes_reader.h
new file mode 100644
index 0000000000..86b3931791
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/binary_codes_reader.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_BINARY_CODES_READER_H_
+#define AOM_AOM_DSP_BINARY_CODES_READER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h"
+
+#define aom_read_primitive_quniform(r, n, ACCT_STR_NAME) \
+  aom_read_primitive_quniform_(r, n ACCT_STR_ARG(ACCT_STR_NAME))
+#define aom_read_primitive_subexpfin(r, n, k, ACCT_STR_NAME) \
+  aom_read_primitive_subexpfin_(r, n, k ACCT_STR_ARG(ACCT_STR_NAME))
+#define aom_read_primitive_refsubexpfin(r, n, k, ref, ACCT_STR_NAME) \
+  aom_read_primitive_refsubexpfin_(r, n, k, ref ACCT_STR_ARG(ACCT_STR_NAME))
+
+uint16_t aom_read_primitive_quniform_(aom_reader *r, uint16_t n ACCT_STR_PARAM);
+uint16_t aom_read_primitive_subexpfin_(aom_reader *r, uint16_t n,
+                                       uint16_t k ACCT_STR_PARAM);
+uint16_t aom_read_primitive_refsubexpfin_(aom_reader *r, uint16_t n, uint16_t k,
+                                          uint16_t ref ACCT_STR_PARAM);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_DSP_BINARY_CODES_READER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.c
new file mode 100644
index 0000000000..06e9c89af1
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.h"
+
+int aom_reader_init(aom_reader *r, const uint8_t *buffer, size_t size) {
+  if (size && !buffer) {
+    return 1;
+  }
+  r->buffer_end = buffer + size;
+  r->buffer = buffer;
+  od_ec_dec_init(&r->ec, buffer, (uint32_t)size);
+#if CONFIG_ACCOUNTING
+  r->accounting = NULL;
+#endif
+  return 0;
+}
+
+const uint8_t *aom_reader_find_begin(aom_reader *r) { return r->buffer; }
+
+const uint8_t *aom_reader_find_end(aom_reader *r) { return r->buffer_end; }
+
+uint32_t aom_reader_tell(const aom_reader *r) { return od_ec_dec_tell(&r->ec); }
+
+uint32_t aom_reader_tell_frac(const aom_reader *r) {
+  return od_ec_dec_tell_frac(&r->ec);
+}
+
+int aom_reader_has_overflowed(const aom_reader *r) {
+  const uint32_t tell_bits = aom_reader_tell(r);
+  const uint32_t tell_bytes = (tell_bits + 7) >> 3;
+  return ((ptrdiff_t)tell_bytes > r->buffer_end - r->buffer);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.h
new file mode 100644
index 0000000000..c9d350bdbb
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.h
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_BITREADER_H_
+#define AOM_AOM_DSP_BITREADER_H_
+
+#include <assert.h>
+#include <limits.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aomdx.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/entdec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h"
+
+#if CONFIG_BITSTREAM_DEBUG
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/debug_util.h"
+#endif  // CONFIG_BITSTREAM_DEBUG
+
+#if CONFIG_ACCOUNTING
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/accounting.h"
+#define ACCT_STR_NAME acct_str
+#define ACCT_STR_PARAM , const char *ACCT_STR_NAME
+#define ACCT_STR_ARG(s) , s
+#else
+#define ACCT_STR_PARAM
+#define ACCT_STR_ARG(s)
+#endif
+
+#define aom_read(r, prob, ACCT_STR_NAME) \
+  aom_read_(r, prob ACCT_STR_ARG(ACCT_STR_NAME))
+#define aom_read_bit(r, ACCT_STR_NAME) \
+  aom_read_bit_(r ACCT_STR_ARG(ACCT_STR_NAME))
+#define aom_read_tree(r, tree, probs, ACCT_STR_NAME) \
+  aom_read_tree_(r, tree, probs ACCT_STR_ARG(ACCT_STR_NAME))
+#define aom_read_literal(r, bits, ACCT_STR_NAME) \
+  aom_read_literal_(r, bits ACCT_STR_ARG(ACCT_STR_NAME))
+#define aom_read_cdf(r, cdf, nsymbs, ACCT_STR_NAME) \
+  aom_read_cdf_(r, cdf, nsymbs ACCT_STR_ARG(ACCT_STR_NAME))
+#define aom_read_symbol(r, cdf, nsymbs, ACCT_STR_NAME) \
+  aom_read_symbol_(r, cdf, nsymbs ACCT_STR_ARG(ACCT_STR_NAME))
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct aom_reader {
+  const uint8_t *buffer;
+  const uint8_t *buffer_end;
+  od_ec_dec ec;
+#if CONFIG_ACCOUNTING
+  Accounting *accounting;
+#endif
+  uint8_t allow_update_cdf;
+};
+
+typedef struct aom_reader aom_reader;
+
+int aom_reader_init(aom_reader *r, const uint8_t *buffer, size_t size);
+
+const uint8_t *aom_reader_find_begin(aom_reader *r);
+
+const uint8_t *aom_reader_find_end(aom_reader *r);
+
+// Returns true if the bit reader has tried to decode more data from the buffer
+// than was actually provided.
+int aom_reader_has_overflowed(const aom_reader *r);
+
+// Returns the position in the bit reader in bits.
+uint32_t aom_reader_tell(const aom_reader *r);
+
+// Returns the position in the bit reader in 1/8th bits.
+uint32_t aom_reader_tell_frac(const aom_reader *r);
+
+#if CONFIG_ACCOUNTING
+static INLINE void aom_process_accounting(const aom_reader *r ACCT_STR_PARAM) {
+  if (r->accounting != NULL) {
+    uint32_t tell_frac;
+    tell_frac = aom_reader_tell_frac(r);
+    aom_accounting_record(r->accounting, ACCT_STR_NAME,
+                          tell_frac - r->accounting->last_tell_frac);
+    r->accounting->last_tell_frac = tell_frac;
+  }
+}
+
+static INLINE void aom_update_symb_counts(const aom_reader *r, int is_binary) {
+  if (r->accounting != NULL) {
+    r->accounting->syms.num_multi_syms += !is_binary;
+    r->accounting->syms.num_binary_syms += !!is_binary;
+  }
+}
+#endif
+
+static INLINE int aom_read_(aom_reader *r, int prob ACCT_STR_PARAM) {
+  int p = (0x7FFFFF - (prob << 15) + prob) >> 8;
+  int bit = od_ec_decode_bool_q15(&r->ec, p);
+
+#if CONFIG_BITSTREAM_DEBUG
+  {
+    int i;
+    int ref_bit, ref_nsymbs;
+    aom_cdf_prob ref_cdf[16];
+    const int queue_r = bitstream_queue_get_read();
+    const int frame_idx = aom_bitstream_queue_get_frame_read();
+    bitstream_queue_pop(&ref_bit, ref_cdf, &ref_nsymbs);
+    if (ref_nsymbs != 2) {
+      fprintf(stderr,
+              "\n *** [bit] nsymbs error, frame_idx_r %d nsymbs %d ref_nsymbs "
+              "%d queue_r %d\n",
+              frame_idx, 2, ref_nsymbs, queue_r);
+      assert(0);
+    }
+    if ((ref_nsymbs != 2) || (ref_cdf[0] != (aom_cdf_prob)p) ||
+        (ref_cdf[1] != 32767)) {
+      fprintf(stderr,
+              "\n *** [bit] cdf error, frame_idx_r %d cdf {%d, %d} ref_cdf {%d",
+              frame_idx, p, 32767, ref_cdf[0]);
+      for (i = 1; i < ref_nsymbs; ++i) fprintf(stderr, ", %d", ref_cdf[i]);
+      fprintf(stderr, "} queue_r %d\n", queue_r);
+      assert(0);
+    }
+    if (bit != ref_bit) {
+      fprintf(stderr,
+              "\n *** [bit] symb error, frame_idx_r %d symb %d ref_symb %d "
+              "queue_r %d\n",
+              frame_idx, bit, ref_bit, queue_r);
+      assert(0);
+    }
+  }
+#endif
+
+#if CONFIG_ACCOUNTING
+  if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME);
+  aom_update_symb_counts(r, 1);
+#endif
+  return bit;
+}
+
+static INLINE int aom_read_bit_(aom_reader *r ACCT_STR_PARAM) {
+  int ret;
+  ret = aom_read(r, 128, NULL);  // aom_prob_half
+#if CONFIG_ACCOUNTING
+  if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME);
+#endif
+  return ret;
+}
+
+static INLINE int aom_read_literal_(aom_reader *r, int bits ACCT_STR_PARAM) {
+  int literal = 0, bit;
+
+  for (bit = bits - 1; bit >= 0; bit--) literal |= aom_read_bit(r, NULL) << bit;
+#if CONFIG_ACCOUNTING
+  if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME);
+#endif
+  return literal;
+}
+
+static INLINE int aom_read_cdf_(aom_reader *r, const aom_cdf_prob *cdf,
+                                int nsymbs ACCT_STR_PARAM) {
+  int symb;
+  assert(cdf != NULL);
+  symb = od_ec_decode_cdf_q15(&r->ec, cdf, nsymbs);
+
+#if CONFIG_BITSTREAM_DEBUG
+  {
+    int i;
+    int cdf_error = 0;
+    int ref_symb, ref_nsymbs;
+    aom_cdf_prob ref_cdf[16];
+    const int queue_r = bitstream_queue_get_read();
+    const int frame_idx = aom_bitstream_queue_get_frame_read();
+    bitstream_queue_pop(&ref_symb, ref_cdf, &ref_nsymbs);
+    if (nsymbs != ref_nsymbs) {
+      fprintf(stderr,
+              "\n *** nsymbs error, frame_idx_r %d nsymbs %d ref_nsymbs %d "
+              "queue_r %d\n",
+              frame_idx, nsymbs, ref_nsymbs, queue_r);
+      cdf_error = 0;
+      assert(0);
+    } else {
+      for (i = 0; i < nsymbs; ++i)
+        if (cdf[i] != ref_cdf[i]) cdf_error = 1;
+    }
+    if (cdf_error) {
+      fprintf(stderr, "\n *** cdf error, frame_idx_r %d cdf {%d", frame_idx,
+              cdf[0]);
+      for (i = 1; i < nsymbs; ++i) fprintf(stderr, ", %d", cdf[i]);
+      fprintf(stderr, "} ref_cdf {%d", ref_cdf[0]);
+      for (i = 1; i < ref_nsymbs; ++i) fprintf(stderr, ", %d", ref_cdf[i]);
+      fprintf(stderr, "} queue_r %d\n", queue_r);
+      assert(0);
+    }
+    if (symb != ref_symb) {
+      fprintf(
+          stderr,
+          "\n *** symb error, frame_idx_r %d symb %d ref_symb %d queue_r %d\n",
+          frame_idx, symb, ref_symb, queue_r);
+      assert(0);
+    }
+  }
+#endif
+
+#if CONFIG_ACCOUNTING
+  if (ACCT_STR_NAME) aom_process_accounting(r, ACCT_STR_NAME);
+  aom_update_symb_counts(r, (nsymbs == 2));
+#endif
+  return symb;
+}
+
+static INLINE int aom_read_symbol_(aom_reader *r, aom_cdf_prob *cdf,
+                                   int nsymbs ACCT_STR_PARAM) {
+  int ret;
+  ret = aom_read_cdf(r, cdf, nsymbs, ACCT_STR_NAME);
+  if (r->allow_update_cdf) update_cdf(cdf, ret, nsymbs);
+  return ret;
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_DSP_BITREADER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.c
new file mode 100644
index 0000000000..a77258388b
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/recenter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/bitops.h"
+
+size_t aom_rb_bytes_read(const struct aom_read_bit_buffer *rb) {
+  return (rb->bit_offset + 7) >> 3;
+}
+
+int aom_rb_read_bit(struct aom_read_bit_buffer *rb) {
+  const uint32_t off = rb->bit_offset;
+  const uint32_t p = off >> 3;
+  const int q = 7 - (int)(off & 0x7);
+  if (rb->bit_buffer + p < rb->bit_buffer_end) {
+    const int bit = (rb->bit_buffer[p] >> q) & 1;
+    rb->bit_offset = off + 1;
+    return bit;
+  } else {
+    if (rb->error_handler) rb->error_handler(rb->error_handler_data);
+    return 0;
+  }
+}
+
+int aom_rb_read_literal(struct aom_read_bit_buffer *rb, int bits) {
+  assert(bits <= 31);
+  int value = 0, bit;
+  for (bit = bits - 1; bit >= 0; bit--) value |= aom_rb_read_bit(rb) << bit;
+  return value;
+}
+
+uint32_t aom_rb_read_unsigned_literal(struct aom_read_bit_buffer *rb,
+                                      int bits) {
+  assert(bits <= 32);
+  uint32_t value = 0;
+  int bit;
+  for (bit = bits - 1; bit >= 0; bit--)
+    value |= (uint32_t)aom_rb_read_bit(rb) << bit;
+  return value;
+}
+
+int aom_rb_read_inv_signed_literal(struct aom_read_bit_buffer *rb, int bits) {
+  const int nbits = sizeof(unsigned) * 8 - bits - 1;
+  const unsigned value = (unsigned)aom_rb_read_literal(rb, bits + 1) << nbits;
+  return ((int)value) >> nbits;
+}
+
+uint32_t aom_rb_read_uvlc(struct aom_read_bit_buffer *rb) {
+  int leading_zeros = 0;
+  while (leading_zeros < 32 && !aom_rb_read_bit(rb)) ++leading_zeros;
+  // Maximum 32 bits.
+  if (leading_zeros == 32) return UINT32_MAX;
+  const uint32_t base = (1u << leading_zeros) - 1;
+  const uint32_t value = aom_rb_read_literal(rb, leading_zeros);
+  return base + value;
+}
+
+static uint16_t aom_rb_read_primitive_quniform(struct aom_read_bit_buffer *rb,
+                                               uint16_t n) {
+  if (n <= 1) return 0;
+  const int l = get_msb(n) + 1;
+  const int m = (1 << l) - n;
+  const int v = aom_rb_read_literal(rb, l - 1);
+  return v < m ? v : (v << 1) - m + aom_rb_read_bit(rb);
+}
+
+static uint16_t aom_rb_read_primitive_subexpfin(struct aom_read_bit_buffer *rb,
+                                                uint16_t n, uint16_t k) {
+  int i = 0;
+  int mk = 0;
+
+  while (1) {
+    int b = (i ? k + i - 1 : k);
+    int a = (1 << b);
+
+    if (n <= mk + 3 * a) {
+      return aom_rb_read_primitive_quniform(rb, n - mk) + mk;
+    }
+
+    if (!aom_rb_read_bit(rb)) {
+      return aom_rb_read_literal(rb, b) + mk;
+    }
+
+    i = i + 1;
+    mk += a;
+  }
+
+  assert(0);
+  return 0;
+}
+
+static uint16_t aom_rb_read_primitive_refsubexpfin(
+    struct aom_read_bit_buffer *rb, uint16_t n, uint16_t k, uint16_t ref) {
+  return inv_recenter_finite_nonneg(n, ref,
+                                    aom_rb_read_primitive_subexpfin(rb, n, k));
+}
+
+int16_t aom_rb_read_signed_primitive_refsubexpfin(
+    struct aom_read_bit_buffer *rb, uint16_t n, uint16_t k, int16_t ref) {
+  ref += n - 1;
+  const uint16_t scaled_n = (n << 1) - 1;
+  return aom_rb_read_primitive_refsubexpfin(rb, scaled_n, k, ref) - n + 1;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h
new file mode 100644
index 0000000000..78af81fb93
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_BITREADER_BUFFER_H_
+#define AOM_AOM_DSP_BITREADER_BUFFER_H_
+
+#include <limits.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*aom_rb_error_handler)(void *data);
+
+struct aom_read_bit_buffer {
+  const uint8_t *bit_buffer;
+  const uint8_t *bit_buffer_end;
+  uint32_t bit_offset;
+
+  void *error_handler_data;
+  aom_rb_error_handler error_handler;
+};
+
+size_t aom_rb_bytes_read(const struct aom_read_bit_buffer *rb);
+
+int aom_rb_read_bit(struct aom_read_bit_buffer *rb);
+
+int aom_rb_read_literal(struct aom_read_bit_buffer *rb, int bits);
+
+uint32_t aom_rb_read_unsigned_literal(struct aom_read_bit_buffer *rb, int bits);
+
+int aom_rb_read_inv_signed_literal(struct aom_read_bit_buffer *rb, int bits);
+
+uint32_t aom_rb_read_uvlc(struct aom_read_bit_buffer *rb);
+
+int16_t aom_rb_read_signed_primitive_refsubexpfin(
+    struct aom_read_bit_buffer *rb, uint16_t n, uint16_t k, int16_t ref);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_DSP_BITREADER_BUFFER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend.h
new file mode 100644
index 0000000000..a21e62ba09
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_BLEND_H_
+#define AOM_AOM_DSP_BLEND_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+// Various blending functions and macros.
+// See also the aom_blend_* functions in aom_dsp_rtcd.h
+
+// Alpha blending with alpha values from the range [0, 64], where 64
+// means use the first input and 0 means use the second input.
+
+#define AOM_BLEND_A64_ROUND_BITS 6
+#define AOM_BLEND_A64_MAX_ALPHA (1 << AOM_BLEND_A64_ROUND_BITS)  // 64
+
+#define AOM_BLEND_A64(a, v0, v1)                                          \
+  ROUND_POWER_OF_TWO((a) * (v0) + (AOM_BLEND_A64_MAX_ALPHA - (a)) * (v1), \
+                     AOM_BLEND_A64_ROUND_BITS)
+
+// Alpha blending with alpha values from the range [0, 256], where 256
+// means use the first input and 0 means use the second input.
+#define AOM_BLEND_A256_ROUND_BITS 8
+#define AOM_BLEND_A256_MAX_ALPHA (1 << AOM_BLEND_A256_ROUND_BITS)  // 256
+
+#define AOM_BLEND_A256(a, v0, v1)                                          \
+  ROUND_POWER_OF_TWO((a) * (v0) + (AOM_BLEND_A256_MAX_ALPHA - (a)) * (v1), \
+                     AOM_BLEND_A256_ROUND_BITS)
+
+// Blending by averaging.
+#define AOM_BLEND_AVG(v0, v1) ROUND_POWER_OF_TWO((v0) + (v1), 1)
+
+#define DIFF_FACTOR_LOG2 4
+#define DIFF_FACTOR (1 << DIFF_FACTOR_LOG2)
+
+#endif  // AOM_AOM_DSP_BLEND_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_hmask.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_hmask.c
new file mode 100644
index 0000000000..d86140a666
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_hmask.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+
+void aom_blend_a64_hmask_c(uint8_t *dst, uint32_t dst_stride,
+                           const uint8_t *src0, uint32_t src0_stride,
+                           const uint8_t *src1, uint32_t src1_stride,
+                           const uint8_t *mask, int w, int h) {
+  int i, j;
+
+  assert(IMPLIES(src0 == dst, src0_stride == dst_stride));
+  assert(IMPLIES(src1 == dst, src1_stride == dst_stride));
+
+  assert(h >= 1);
+  assert(w >= 1);
+  assert(IS_POWER_OF_TWO(h));
+  assert(IS_POWER_OF_TWO(w));
+
+  for (i = 0; i < h; ++i) {
+    for (j = 0; j < w; ++j) {
+      dst[i * dst_stride + j] = AOM_BLEND_A64(
+          mask[j], src0[i * src0_stride + j], src1[i * src1_stride + j]);
+    }
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+void aom_highbd_blend_a64_hmask_c(uint8_t *dst_8, uint32_t dst_stride,
+                                  const uint8_t *src0_8, uint32_t src0_stride,
+                                  const uint8_t *src1_8, uint32_t src1_stride,
+                                  const uint8_t *mask, int w, int h, int bd) {
+  int i, j;
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst_8);
+  const uint16_t *src0 = CONVERT_TO_SHORTPTR(src0_8);
+  const uint16_t *src1 = CONVERT_TO_SHORTPTR(src1_8);
+  (void)bd;
+
+  assert(IMPLIES(src0 == dst, src0_stride == dst_stride));
+  assert(IMPLIES(src1 == dst, src1_stride == dst_stride));
+
+  assert(h >= 1);
+  assert(w >= 1);
+  assert(IS_POWER_OF_TWO(h));
+  assert(IS_POWER_OF_TWO(w));
+
+  assert(bd == 8 || bd == 10 || bd == 12);
+
+  for (i = 0; i < h; ++i) {
+    for (j = 0; j < w; ++j) {
+      dst[i * dst_stride + j] = AOM_BLEND_A64(
+          mask[j], src0[i * src0_stride + j], src1[i * src1_stride + j]);
+    }
+  }
+}
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_mask.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_mask.c
new file mode 100644
index 0000000000..058f3862fc
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_mask.c
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+
+// Blending with alpha mask. Mask values come from the range [0, 64],
+// as described for AOM_BLEND_A64 in aom_dsp/blend.h. src0 or src1 can
+// be the same as dst, or dst can be different from both sources.
+
+// NOTE(david.barker): The input and output of aom_blend_a64_d16_mask_c() are
+// in a higher intermediate precision, and will later be rounded down to pixel
+// precision.
+// Thus, in order to avoid double-rounding, we want to use normal right shifts
+// within this function, not ROUND_POWER_OF_TWO.
+// This works because of the identity:
+// ROUND_POWER_OF_TWO(x >> y, z) == ROUND_POWER_OF_TWO(x, y+z)
+//
+// In contrast, the output of the non-d16 functions will not be further rounded,
+// so we *should* use ROUND_POWER_OF_TWO there.
+
+void aom_lowbd_blend_a64_d16_mask_c(
+    uint8_t *dst, uint32_t dst_stride, const CONV_BUF_TYPE *src0,
+    uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride,
+    const uint8_t *mask, uint32_t mask_stride, int w, int h, int subw, int subh,
+    ConvolveParams *conv_params) {
+  int i, j;
+  const int bd = 8;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int round_offset = (1 << (offset_bits - conv_params->round_1)) +
+                           (1 << (offset_bits - conv_params->round_1 - 1));
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+
+  assert(IMPLIES((void *)src0 == dst, src0_stride == dst_stride));
+  assert(IMPLIES((void *)src1 == dst, src1_stride == dst_stride));
+
+  assert(h >= 4);
+  assert(w >= 4);
+  assert(IS_POWER_OF_TWO(h));
+  assert(IS_POWER_OF_TWO(w));
+
+  if (subw == 0 && subh == 0) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        int32_t res;
+        const int m = mask[i * mask_stride + j];
+        res = ((m * (int32_t)src0[i * src0_stride + j] +
+                (AOM_BLEND_A64_MAX_ALPHA - m) *
+                    (int32_t)src1[i * src1_stride + j]) >>
+               AOM_BLEND_A64_ROUND_BITS);
+        res -= round_offset;
+        dst[i * dst_stride + j] =
+            clip_pixel(ROUND_POWER_OF_TWO(res, round_bits));
+      }
+    }
+  } else if (subw == 1 && subh == 1) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        int32_t res;
+        const int m = ROUND_POWER_OF_TWO(
+            mask[(2 * i) * mask_stride + (2 * j)] +
+                mask[(2 * i + 1) * mask_stride + (2 * j)] +
+                mask[(2 * i) * mask_stride + (2 * j + 1)] +
+                mask[(2 * i + 1) * mask_stride + (2 * j + 1)],
+            2);
+        res = ((m * (int32_t)src0[i * src0_stride + j] +
+                (AOM_BLEND_A64_MAX_ALPHA - m) *
+                    (int32_t)src1[i * src1_stride + j]) >>
+               AOM_BLEND_A64_ROUND_BITS);
+        res -= round_offset;
+        dst[i * dst_stride + j] =
+            clip_pixel(ROUND_POWER_OF_TWO(res, round_bits));
+      }
+    }
+  } else if (subw == 1 && subh == 0) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        int32_t res;
+        const int m = AOM_BLEND_AVG(mask[i * mask_stride + (2 * j)],
+                                    mask[i * mask_stride + (2 * j + 1)]);
+        res = ((m * (int32_t)src0[i * src0_stride + j] +
+                (AOM_BLEND_A64_MAX_ALPHA - m) *
+                    (int32_t)src1[i * src1_stride + j]) >>
+               AOM_BLEND_A64_ROUND_BITS);
+        res -= round_offset;
+        dst[i * dst_stride + j] =
+            clip_pixel(ROUND_POWER_OF_TWO(res, round_bits));
+      }
+    }
+  } else {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        int32_t res;
+        const int m = AOM_BLEND_AVG(mask[(2 * i) * mask_stride + j],
+                                    mask[(2 * i + 1) * mask_stride + j]);
+        res = ((int32_t)(m * (int32_t)src0[i * src0_stride + j] +
+                         (AOM_BLEND_A64_MAX_ALPHA - m) *
+                             (int32_t)src1[i * src1_stride + j]) >>
+               AOM_BLEND_A64_ROUND_BITS);
+        res -= round_offset;
+        dst[i * dst_stride + j] =
+            clip_pixel(ROUND_POWER_OF_TWO(res, round_bits));
+      }
+    }
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+void aom_highbd_blend_a64_d16_mask_c(
+    uint8_t *dst_8, uint32_t dst_stride, const CONV_BUF_TYPE *src0,
+    uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride,
+    const uint8_t *mask, uint32_t mask_stride, int w, int h, int subw, int subh,
+    ConvolveParams *conv_params, const int bd) {
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int round_offset = (1 << (offset_bits - conv_params->round_1)) +
+                           (1 << (offset_bits - conv_params->round_1 - 1));
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst_8);
+
+  assert(IMPLIES(src0 == dst, src0_stride == dst_stride));
+  assert(IMPLIES(src1 == dst, src1_stride == dst_stride));
+
+  assert(h >= 1);
+  assert(w >= 1);
+  assert(IS_POWER_OF_TWO(h));
+  assert(IS_POWER_OF_TWO(w));
+
+  // excerpt from clip_pixel_highbd()
+  // set saturation_value to (1 << bd) - 1
+  unsigned int saturation_value;
+  switch (bd) {
+    case 8:
+    default: saturation_value = 255; break;
+    case 10: saturation_value = 1023; break;
+    case 12: saturation_value = 4095; break;
+  }
+
+  if (subw == 0 && subh == 0) {
+    for (int i = 0; i < h; ++i) {
+      for (int j = 0; j < w; ++j) {
+        int32_t res;
+        const int m = mask[j];
+        res = ((m * src0[j] + (AOM_BLEND_A64_MAX_ALPHA - m) * src1[j]) >>
+               AOM_BLEND_A64_ROUND_BITS);
+        res -= round_offset;
+        unsigned int v = negative_to_zero(ROUND_POWER_OF_TWO(res, round_bits));
+        dst[j] = AOMMIN(v, saturation_value);
+      }
+      mask += mask_stride;
+      src0 += src0_stride;
+      src1 += src1_stride;
+      dst += dst_stride;
+    }
+  } else if (subw == 1 && subh == 1) {
+    for (int i = 0; i < h; ++i) {
+      for (int j = 0; j < w; ++j) {
+        int32_t res;
+        const int m = ROUND_POWER_OF_TWO(
+            mask[2 * j] + mask[mask_stride + 2 * j] + mask[2 * j + 1] +
+                mask[mask_stride + 2 * j + 1],
+            2);
+        res = (m * src0[j] + (AOM_BLEND_A64_MAX_ALPHA - m) * src1[j]) >>
+              AOM_BLEND_A64_ROUND_BITS;
+        res -= round_offset;
+        unsigned int v = negative_to_zero(ROUND_POWER_OF_TWO(res, round_bits));
+        dst[j] = AOMMIN(v, saturation_value);
+      }
+      mask += 2 * mask_stride;
+      src0 += src0_stride;
+      src1 += src1_stride;
+      dst += dst_stride;
+    }
+  } else if (subw == 1 && subh == 0) {
+    for (int i = 0; i < h; ++i) {
+      for (int j = 0; j < w; ++j) {
+        int32_t res;
+        const int m = AOM_BLEND_AVG(mask[2 * j], mask[2 * j + 1]);
+        res = (m * src0[j] + (AOM_BLEND_A64_MAX_ALPHA - m) * src1[j]) >>
+              AOM_BLEND_A64_ROUND_BITS;
+        res -= round_offset;
+        unsigned int v = negative_to_zero(ROUND_POWER_OF_TWO(res, round_bits));
+        dst[j] = AOMMIN(v, saturation_value);
+      }
+      mask += mask_stride;
+      src0 += src0_stride;
+      src1 += src1_stride;
+      dst += dst_stride;
+    }
+  } else {
+    for (int i = 0; i < h; ++i) {
+      for (int j = 0; j < w; ++j) {
+        int32_t res;
+        const int m = AOM_BLEND_AVG(mask[j], mask[mask_stride + j]);
+        res = (m * src0[j] + (AOM_BLEND_A64_MAX_ALPHA - m) * src1[j]) >>
+              AOM_BLEND_A64_ROUND_BITS;
+        res -= round_offset;
+        unsigned int v = negative_to_zero(ROUND_POWER_OF_TWO(res, round_bits));
+        dst[j] = AOMMIN(v, saturation_value);
+      }
+      mask += 2 * mask_stride;
+      src0 += src0_stride;
+      src1 += src1_stride;
+      dst += dst_stride;
+    }
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+// Blending with alpha mask. Mask values come from the range [0, 64],
+// as described for AOM_BLEND_A64 in aom_dsp/blend.h. src0 or src1 can
+// be the same as dst, or dst can be different from both sources.
+
+void aom_blend_a64_mask_c(uint8_t *dst, uint32_t dst_stride,
+                          const uint8_t *src0, uint32_t src0_stride,
+                          const uint8_t *src1, uint32_t src1_stride,
+                          const uint8_t *mask, uint32_t mask_stride, int w,
+                          int h, int subw, int subh) {
+  int i, j;
+
+  assert(IMPLIES(src0 == dst, src0_stride == dst_stride));
+  assert(IMPLIES(src1 == dst, src1_stride == dst_stride));
+
+  assert(h >= 1);
+  assert(w >= 1);
+  assert(IS_POWER_OF_TWO(h));
+  assert(IS_POWER_OF_TWO(w));
+
+  if (subw == 0 && subh == 0) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        const int m = mask[i * mask_stride + j];
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
+      }
+    }
+  } else if (subw == 1 && subh == 1) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        const int m = ROUND_POWER_OF_TWO(
+            mask[(2 * i) * mask_stride + (2 * j)] +
+                mask[(2 * i + 1) * mask_stride + (2 * j)] +
+                mask[(2 * i) * mask_stride + (2 * j + 1)] +
+                mask[(2 * i + 1) * mask_stride + (2 * j + 1)],
+            2);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
+      }
+    }
+  } else if (subw == 1 && subh == 0) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        const int m = AOM_BLEND_AVG(mask[i * mask_stride + (2 * j)],
+                                    mask[i * mask_stride + (2 * j + 1)]);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
+      }
+    }
+  } else {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        const int m = AOM_BLEND_AVG(mask[(2 * i) * mask_stride + j],
+                                    mask[(2 * i + 1) * mask_stride + j]);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
+      }
+    }
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+void aom_highbd_blend_a64_mask_c(uint8_t *dst_8, uint32_t dst_stride,
+                                 const uint8_t *src0_8, uint32_t src0_stride,
+                                 const uint8_t *src1_8, uint32_t src1_stride,
+                                 const uint8_t *mask, uint32_t mask_stride,
+                                 int w, int h, int subw, int subh, int bd) {
+  int i, j;
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst_8);
+  const uint16_t *src0 = CONVERT_TO_SHORTPTR(src0_8);
+  const uint16_t *src1 = CONVERT_TO_SHORTPTR(src1_8);
+  (void)bd;
+
+  assert(IMPLIES(src0 == dst, src0_stride == dst_stride));
+  assert(IMPLIES(src1 == dst, src1_stride == dst_stride));
+
+  assert(h >= 1);
+  assert(w >= 1);
+  assert(IS_POWER_OF_TWO(h));
+  assert(IS_POWER_OF_TWO(w));
+
+  assert(bd == 8 || bd == 10 || bd == 12);
+
+  if (subw == 0 && subh == 0) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        const int m = mask[i * mask_stride + j];
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
+      }
+    }
+  } else if (subw == 1 && subh == 1) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        const int m = ROUND_POWER_OF_TWO(
+            mask[(2 * i) * mask_stride + (2 * j)] +
+                mask[(2 * i + 1) * mask_stride + (2 * j)] +
+                mask[(2 * i) * mask_stride + (2 * j + 1)] +
+                mask[(2 * i + 1) * mask_stride + (2 * j + 1)],
+            2);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
+      }
+    }
+  } else if (subw == 1 && subh == 0) {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        const int m = AOM_BLEND_AVG(mask[i * mask_stride + (2 * j)],
+                                    mask[i * mask_stride + (2 * j + 1)]);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
+      }
+    }
+  } else {
+    for (i = 0; i < h; ++i) {
+      for (j = 0; j < w; ++j) {
+        const int m = AOM_BLEND_AVG(mask[(2 * i) * mask_stride + j],
+                                    mask[(2 * i + 1) * mask_stride + j]);
+        dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                                src1[i * src1_stride + j]);
+      }
+    }
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_vmask.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_vmask.c
new file mode 100644
index 0000000000..1d383849fb
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend_a64_vmask.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+
+void aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride,
+                           const uint8_t *src0, uint32_t src0_stride,
+                           const uint8_t *src1, uint32_t src1_stride,
+                           const uint8_t *mask, int w, int h) {
+  int i, j;
+
+  assert(IMPLIES(src0 == dst, src0_stride == dst_stride));
+  assert(IMPLIES(src1 == dst, src1_stride == dst_stride));
+
+  assert(h >= 1);
+  assert(w >= 1);
+  assert(IS_POWER_OF_TWO(h));
+  assert(IS_POWER_OF_TWO(w));
+
+  for (i = 0; i < h; ++i) {
+    const int m = mask[i];
+    for (j = 0; j < w; ++j) {
+      dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                              src1[i * src1_stride + j]);
+    }
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+void aom_highbd_blend_a64_vmask_c(uint8_t *dst_8, uint32_t dst_stride,
+                                  const uint8_t *src0_8, uint32_t src0_stride,
+                                  const uint8_t *src1_8, uint32_t src1_stride,
+                                  const uint8_t *mask, int w, int h, int bd) {
+  int i, j;
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst_8);
+  const uint16_t *src0 = CONVERT_TO_SHORTPTR(src0_8);
+  const uint16_t *src1 = CONVERT_TO_SHORTPTR(src1_8);
+  (void)bd;
+
+  assert(IMPLIES(src0 == dst, src0_stride == dst_stride));
+  assert(IMPLIES(src1 == dst, src1_stride == dst_stride));
+
+  assert(h >= 1);
+  assert(w >= 1);
+  assert(IS_POWER_OF_TWO(h));
+  assert(IS_POWER_OF_TWO(w));
+
+  assert(bd == 8 || bd == 10 || bd == 12);
+
+  for (i = 0; i < h; ++i) {
+    const int m = mask[i];
+    for (j = 0; j < w; ++j) {
+      dst[i * dst_stride + j] = AOM_BLEND_A64(m, src0[i * src0_stride + j],
+                                              src1[i * src1_stride + j]);
+    }
+  }
+}
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.c
new file mode 100644
index 0000000000..11dc71bf74
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.h"
+
+/*Given the current total integer number of bits used and the current value of
+   rng, computes the fraction number of bits used to OD_BITRES precision.
+  This is used by od_ec_enc_tell_frac() and od_ec_dec_tell_frac().
+  nbits_total: The number of whole bits currently used, i.e., the value
+                returned by od_ec_enc_tell() or od_ec_dec_tell().
+  rng: The current value of rng from either the encoder or decoder state.
+  Return: The number of bits scaled by 2**OD_BITRES.
+          This will always be slightly larger than the exact value (e.g., all
+           rounding error is in the positive direction).*/
+uint32_t od_ec_tell_frac(uint32_t nbits_total, uint32_t rng) {
+  uint32_t nbits;
+  int l;
+  int i;
+  /*To handle the non-integral number of bits still left in the encoder/decoder
+     state, we compute the worst-case number of bits of val that must be
+     encoded to ensure that the value is inside the range for any possible
+     subsequent bits.
+    The computation here is independent of val itself (the decoder does not
+     even track that value), even though the real number of bits used after
+     od_ec_enc_done() may be 1 smaller if rng is a power of two and the
+     corresponding trailing bits of val are all zeros.
+    If we did try to track that special case, then coding a value with a
+     probability of 1/(1 << n) might sometimes appear to use more than n bits.
+    This may help explain the surprising result that a newly initialized
+     encoder or decoder claims to have used 1 bit.*/
+  nbits = nbits_total << OD_BITRES;
+  l = 0;
+  for (i = OD_BITRES; i-- > 0;) {
+    int b;
+    rng = rng * rng >> 15;
+    b = (int)(rng >> 16);
+    l = l << 1 | b;
+    rng >>= b;
+  }
+  return nbits - l;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.h
new file mode 100644
index 0000000000..fad2385362
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_ENTCODE_H_
+#define AOM_AOM_DSP_ENTCODE_H_
+
+#include <limits.h>
+#include <stddef.h>
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h"
+
+#define EC_PROB_SHIFT 6
+#define EC_MIN_PROB 4  // must be <= (1<<EC_PROB_SHIFT)/16
+
+/*OPT: od_ec_window must be at least 32 bits, but if you have fast arithmetic
+   on a larger type, you can speed up the decoder by using it here.*/
+typedef uint32_t od_ec_window;
+
+/*The size in bits of od_ec_window.*/
+#define OD_EC_WINDOW_SIZE ((int)sizeof(od_ec_window) * CHAR_BIT)
+
+/*The resolution of fractional-precision bit usage measurements, i.e.,
+   3 => 1/8th bits.*/
+#define OD_BITRES (3)
+
+#define OD_ICDF AOM_ICDF
+
+/*See entcode.c for further documentation.*/
+
+OD_WARN_UNUSED_RESULT uint32_t od_ec_tell_frac(uint32_t nbits_total,
+                                               uint32_t rng);
+
+#endif  // AOM_AOM_DSP_ENTCODE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entdec.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entdec.c
new file mode 100644
index 0000000000..e7a559d67b
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entdec.c
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/entdec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h"
+
+/*A range decoder.
+  This is an entropy decoder based upon \cite{Mar79}, which is itself a
+   rediscovery of the FIFO arithmetic code introduced by \cite{Pas76}.
+  It is very similar to arithmetic encoding, except that encoding is done with
+   digits in any base, instead of with bits, and so it is faster when using
+   larger bases (i.e.: a byte).
+  The author claims an average waste of $\frac{1}{2}\log_b(2b)$ bits, where $b$
+   is the base, longer than the theoretical optimum, but to my knowledge there
+   is no published justification for this claim.
+  This only seems true when using near-infinite precision arithmetic so that
+   the process is carried out with no rounding errors.
+
+  An excellent description of implementation details is available at
+   http://www.arturocampos.com/ac_range.html
+  A recent work \cite{MNW98} which proposes several changes to arithmetic
+   encoding for efficiency actually re-discovers many of the principles
+   behind range encoding, and presents a good theoretical analysis of them.
+
+  End of stream is handled by writing out the smallest number of bits that
+   ensures that the stream will be correctly decoded regardless of the value of
+   any subsequent bits.
+  od_ec_dec_tell() can be used to determine how many bits were needed to decode
+   all the symbols thus far; other data can be packed in the remaining bits of
+   the input buffer.
+  @PHDTHESIS{Pas76,
+    author="Richard Clark Pasco",
+    title="Source coding algorithms for fast data compression",
+    school="Dept. of Electrical Engineering, Stanford University",
+    address="Stanford, CA",
+    month=May,
+    year=1976,
+    URL="http://www.richpasco.org/scaffdc.pdf"
+  }
+  @INPROCEEDINGS{Mar79,
+   author="Martin, G.N.N.",
+   title="Range encoding: an algorithm for removing redundancy from a digitised
+    message",
+   booktitle="Video & Data Recording Conference",
+   year=1979,
+   address="Southampton",
+   month=Jul,
+   URL="http://www.compressconsult.com/rangecoder/rngcod.pdf.gz"
+  }
+  @ARTICLE{MNW98,
+   author="Alistair Moffat and Radford Neal and Ian H. Witten",
+   title="Arithmetic Coding Revisited",
+   journal="{ACM} Transactions on Information Systems",
+   year=1998,
+   volume=16,
+   number=3,
+   pages="256--294",
+   month=Jul,
+   URL="http://researchcommons.waikato.ac.nz/bitstream/handle/10289/78/content.pdf"
+  }*/
+
+/*This is meant to be a large, positive constant that can still be efficiently
+   loaded as an immediate (on platforms like ARM, for example).
+  Even relatively modest values like 100 would work fine.*/
+#define OD_EC_LOTS_OF_BITS (0x4000)
+
+/*The return value of od_ec_dec_tell does not change across an od_ec_dec_refill
+   call.*/
+static void od_ec_dec_refill(od_ec_dec *dec) {
+  int s;
+  od_ec_window dif;
+  int16_t cnt;
+  const unsigned char *bptr;
+  const unsigned char *end;
+  dif = dec->dif;
+  cnt = dec->cnt;
+  bptr = dec->bptr;
+  end = dec->end;
+  s = OD_EC_WINDOW_SIZE - 9 - (cnt + 15);
+  for (; s >= 0 && bptr < end; s -= 8, bptr++) {
+    /*Each time a byte is inserted into the window (dif), bptr advances and cnt
+       is incremented by 8, so the total number of consumed bits (the return
+       value of od_ec_dec_tell) does not change.*/
+    assert(s <= OD_EC_WINDOW_SIZE - 8);
+    dif ^= (od_ec_window)bptr[0] << s;
+    cnt += 8;
+  }
+  if (bptr >= end) {
+    /*We've reached the end of the buffer. It is perfectly valid for us to need
+       to fill the window with additional bits past the end of the buffer (and
+       this happens in normal operation). These bits should all just be taken
+       as zero. But we cannot increment bptr past 'end' (this is undefined
+       behavior), so we start to increment dec->tell_offs. We also don't want
+       to keep testing bptr against 'end', so we set cnt to OD_EC_LOTS_OF_BITS
+       and adjust dec->tell_offs so that the total number of unconsumed bits in
+       the window (dec->cnt - dec->tell_offs) does not change. This effectively
+       puts lots of zero bits into the window, and means we won't try to refill
+       it from the buffer for a very long time (at which point we'll put lots
+       of zero bits into the window again).*/
+    dec->tell_offs += OD_EC_LOTS_OF_BITS - cnt;
+    cnt = OD_EC_LOTS_OF_BITS;
+  }
+  dec->dif = dif;
+  dec->cnt = cnt;
+  dec->bptr = bptr;
+}
+
+/*Takes updated dif and range values, renormalizes them so that
+   32768 <= rng < 65536 (reading more bytes from the stream into dif if
+   necessary), and stores them back in the decoder context.
+  dif: The new value of dif.
+  rng: The new value of the range.
+  ret: The value to return.
+  Return: ret.
+          This allows the compiler to jump to this function via a tail-call.*/
+static int od_ec_dec_normalize(od_ec_dec *dec, od_ec_window dif, unsigned rng,
+                               int ret) {
+  int d;
+  assert(rng <= 65535U);
+  /*The number of leading zeros in the 16-bit binary representation of rng.*/
+  d = 16 - OD_ILOG_NZ(rng);
+  /*d bits in dec->dif are consumed.*/
+  dec->cnt -= d;
+  /*This is equivalent to shifting in 1's instead of 0's.*/
+  dec->dif = ((dif + 1) << d) - 1;
+  dec->rng = rng << d;
+  if (dec->cnt < 0) od_ec_dec_refill(dec);
+  return ret;
+}
+
+/*Initializes the decoder.
+  buf: The input buffer to use.
+  storage: The size in bytes of the input buffer.*/
+void od_ec_dec_init(od_ec_dec *dec, const unsigned char *buf,
+                    uint32_t storage) {
+  dec->buf = buf;
+  dec->tell_offs = 10 - (OD_EC_WINDOW_SIZE - 8);
+  dec->end = buf + storage;
+  dec->bptr = buf;
+  dec->dif = ((od_ec_window)1 << (OD_EC_WINDOW_SIZE - 1)) - 1;
+  dec->rng = 0x8000;
+  dec->cnt = -15;
+  od_ec_dec_refill(dec);
+}
+
+/*Decode a single binary value.
+  f: The probability that the bit is one, scaled by 32768.
+  Return: The value decoded (0 or 1).*/
+int od_ec_decode_bool_q15(od_ec_dec *dec, unsigned f) {
+  od_ec_window dif;
+  od_ec_window vw;
+  unsigned r;
+  unsigned r_new;
+  unsigned v;
+  int ret;
+  assert(0 < f);
+  assert(f < 32768U);
+  dif = dec->dif;
+  r = dec->rng;
+  assert(dif >> (OD_EC_WINDOW_SIZE - 16) < r);
+  assert(32768U <= r);
+  v = ((r >> 8) * (uint32_t)(f >> EC_PROB_SHIFT) >> (7 - EC_PROB_SHIFT));
+  v += EC_MIN_PROB;
+  vw = (od_ec_window)v << (OD_EC_WINDOW_SIZE - 16);
+  ret = 1;
+  r_new = v;
+  if (dif >= vw) {
+    r_new = r - v;
+    dif -= vw;
+    ret = 0;
+  }
+  return od_ec_dec_normalize(dec, dif, r_new, ret);
+}
+
+/*Decodes a symbol given an inverse cumulative distribution function (CDF)
+   table in Q15.
+  icdf: CDF_PROB_TOP minus the CDF, such that symbol s falls in the range
+         [s > 0 ? (CDF_PROB_TOP - icdf[s - 1]) : 0, CDF_PROB_TOP - icdf[s]).
+        The values must be monotonically non-increasing, and icdf[nsyms - 1]
+         must be 0.
+  nsyms: The number of symbols in the alphabet.
+         This should be at most 16.
+  Return: The decoded symbol s.*/
+int od_ec_decode_cdf_q15(od_ec_dec *dec, const uint16_t *icdf, int nsyms) {
+  od_ec_window dif;
+  unsigned r;
+  unsigned c;
+  unsigned u;
+  unsigned v;
+  int ret;
+  (void)nsyms;
+  dif = dec->dif;
+  r = dec->rng;
+  const int N = nsyms - 1;
+
+  assert(dif >> (OD_EC_WINDOW_SIZE - 16) < r);
+  assert(icdf[nsyms - 1] == OD_ICDF(CDF_PROB_TOP));
+  assert(32768U <= r);
+  assert(7 - EC_PROB_SHIFT - CDF_SHIFT >= 0);
+  c = (unsigned)(dif >> (OD_EC_WINDOW_SIZE - 16));
+  v = r;
+  ret = -1;
+  do {
+    u = v;
+    v = ((r >> 8) * (uint32_t)(icdf[++ret] >> EC_PROB_SHIFT) >>
+         (7 - EC_PROB_SHIFT - CDF_SHIFT));
+    v += EC_MIN_PROB * (N - ret);
+  } while (c < v);
+  assert(v < u);
+  assert(u <= r);
+  r = u - v;
+  dif -= (od_ec_window)v << (OD_EC_WINDOW_SIZE - 16);
+  return od_ec_dec_normalize(dec, dif, r, ret);
+}
+
+/*Returns the number of bits "used" by the decoded symbols so far.
+  This same number can be computed in either the encoder or the decoder, and is
+   suitable for making coding decisions.
+  Return: The number of bits.
+          This will always be slightly larger than the exact value (e.g., all
+           rounding error is in the positive direction).*/
+int od_ec_dec_tell(const od_ec_dec *dec) {
+  /*There is a window of bits stored in dec->dif. The difference
+     (dec->bptr - dec->buf) tells us how many bytes have been read into this
+     window. The difference (dec->cnt - dec->tell_offs) tells us how many of
+     the bits in that window remain unconsumed.*/
+  return (int)((dec->bptr - dec->buf) * 8 - dec->cnt + dec->tell_offs);
+}
+
+/*Returns the number of bits "used" by the decoded symbols so far.
+  This same number can be computed in either the encoder or the decoder, and is
+   suitable for making coding decisions.
+  Return: The number of bits scaled by 2**OD_BITRES.
+          This will always be slightly larger than the exact value (e.g., all
+           rounding error is in the positive direction).*/
+uint32_t od_ec_dec_tell_frac(const od_ec_dec *dec) {
+  return od_ec_tell_frac(od_ec_dec_tell(dec), dec->rng);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entdec.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entdec.h
new file mode 100644
index 0000000000..c49ec133db
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/entdec.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_ENTDEC_H_
+#define AOM_AOM_DSP_ENTDEC_H_
+#include <limits.h>
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct od_ec_dec od_ec_dec;
+
+#if defined(OD_ACCOUNTING) && OD_ACCOUNTING
+#define OD_ACC_STR , char *acc_str
+#define od_ec_dec_bits(dec, ftb, str) od_ec_dec_bits_(dec, ftb, str)
+#else
+#define OD_ACC_STR
+#define od_ec_dec_bits(dec, ftb, str) od_ec_dec_bits_(dec, ftb)
+#endif
+
+/*The entropy decoder context.*/
+struct od_ec_dec {
+  /*The start of the current input buffer.*/
+  const unsigned char *buf;
+  /*An offset used to keep track of tell after reaching the end of the stream.
+    This is constant throughout most of the decoding process, but becomes
+     important once we hit the end of the buffer and stop incrementing bptr
+     (and instead pretend cnt has lots of bits).*/
+  int32_t tell_offs;
+  /*The end of the current input buffer.*/
+  const unsigned char *end;
+  /*The read pointer for the entropy-coded bits.*/
+  const unsigned char *bptr;
+  /*The difference between the high end of the current range, (low + rng), and
+     the coded value, minus 1.
+    This stores up to OD_EC_WINDOW_SIZE bits of that difference, but the
+     decoder only uses the top 16 bits of the window to decode the next symbol.
+    As we shift up during renormalization, if we don't have enough bits left in
+     the window to fill the top 16, we'll read in more bits of the coded
+     value.*/
+  od_ec_window dif;
+  /*The number of values in the current range.*/
+  uint16_t rng;
+  /*The number of bits of data in the current value.*/
+  int16_t cnt;
+};
+
+/*See entdec.c for further documentation.*/
+
+void od_ec_dec_init(od_ec_dec *dec, const unsigned char *buf, uint32_t storage)
+    OD_ARG_NONNULL(1) OD_ARG_NONNULL(2);
+
+OD_WARN_UNUSED_RESULT int od_ec_decode_bool_q15(od_ec_dec *dec, unsigned f)
+    OD_ARG_NONNULL(1);
+OD_WARN_UNUSED_RESULT int od_ec_decode_cdf_q15(od_ec_dec *dec,
+                                               const uint16_t *cdf, int nsyms)
+    OD_ARG_NONNULL(1) OD_ARG_NONNULL(2);
+
+OD_WARN_UNUSED_RESULT uint32_t od_ec_dec_bits_(od_ec_dec *dec, unsigned ftb)
+    OD_ARG_NONNULL(1);
+
+OD_WARN_UNUSED_RESULT int od_ec_dec_tell(const od_ec_dec *dec)
+    OD_ARG_NONNULL(1);
+OD_WARN_UNUSED_RESULT uint32_t od_ec_dec_tell_frac(const od_ec_dec *dec)
+    OD_ARG_NONNULL(1);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_DSP_ENTDEC_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.c
new file mode 100644
index 0000000000..38d6af43f7
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.c
@@ -0,0 +1,1408 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\file
+ * \brief Describes film grain parameters and film grain synthesis
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+
+// Samples with Gaussian distribution in the range of [-2048, 2047] (12 bits)
+// with zero mean and standard deviation of about 512.
+// should be divided by 4 for 10-bit range and 16 for 8-bit range.
+static const int gaussian_sequence[2048] = {
+  56,    568,   -180,  172,   124,   -84,   172,   -64,   -900,  24,   820,
+  224,   1248,  996,   272,   -8,    -916,  -388,  -732,  -104,  -188, 800,
+  112,   -652,  -320,  -376,  140,   -252,  492,   -168,  44,    -788, 588,
+  -584,  500,   -228,  12,    680,   272,   -476,  972,   -100,  652,  368,
+  432,   -196,  -720,  -192,  1000,  -332,  652,   -136,  -552,  -604, -4,
+  192,   -220,  -136,  1000,  -52,   372,   -96,   -624,  124,   -24,  396,
+  540,   -12,   -104,  640,   464,   244,   -208,  -84,   368,   -528, -740,
+  248,   -968,  -848,  608,   376,   -60,   -292,  -40,   -156,  252,  -292,
+  248,   224,   -280,  400,   -244,  244,   -60,   76,    -80,   212,  532,
+  340,   128,   -36,   824,   -352,  -60,   -264,  -96,   -612,  416,  -704,
+  220,   -204,  640,   -160,  1220,  -408,  900,   336,   20,    -336, -96,
+  -792,  304,   48,    -28,   -1232, -1172, -448,  104,   -292,  -520, 244,
+  60,    -948,  0,     -708,  268,   108,   356,   -548,  488,   -344, -136,
+  488,   -196,  -224,  656,   -236,  -1128, 60,    4,     140,   276,  -676,
+  -376,  168,   -108,  464,   8,     564,   64,    240,   308,   -300, -400,
+  -456,  -136,  56,    120,   -408,  -116,  436,   504,   -232,  328,  844,
+  -164,  -84,   784,   -168,  232,   -224,  348,   -376,  128,   568,  96,
+  -1244, -288,  276,   848,   832,   -360,  656,   464,   -384,  -332, -356,
+  728,   -388,  160,   -192,  468,   296,   224,   140,   -776,  -100, 280,
+  4,     196,   44,    -36,   -648,  932,   16,    1428,  28,    528,  808,
+  772,   20,    268,   88,    -332,  -284,  124,   -384,  -448,  208,  -228,
+  -1044, -328,  660,   380,   -148,  -300,  588,   240,   540,   28,   136,
+  -88,   -436,  256,   296,   -1000, 1400,  0,     -48,   1056,  -136, 264,
+  -528,  -1108, 632,   -484,  -592,  -344,  796,   124,   -668,  -768, 388,
+  1296,  -232,  -188,  -200,  -288,  -4,    308,   100,   -168,  256,  -500,
+  204,   -508,  648,   -136,  372,   -272,  -120,  -1004, -552,  -548, -384,
+  548,   -296,  428,   -108,  -8,    -912,  -324,  -224,  -88,   -112, -220,
+  -100,  996,   -796,  548,   360,   -216,  180,   428,   -200,  -212, 148,
+  96,    148,   284,   216,   -412,  -320,  120,   -300,  -384,  -604, -572,
+  -332,  -8,    -180,  -176,  696,   116,   -88,   628,   76,    44,   -516,
+  240,   -208,  -40,   100,   -592,  344,   -308,  -452,  -228,  20,   916,
+  -1752, -136,  -340,  -804,  140,   40,    512,   340,   248,   184,  -492,
+  896,   -156,  932,   -628,  328,   -688,  -448,  -616,  -752,  -100, 560,
+  -1020, 180,   -800,  -64,   76,    576,   1068,  396,   660,   552,  -108,
+  -28,   320,   -628,  312,   -92,   -92,   -472,  268,   16,    560,  516,
+  -672,  -52,   492,   -100,  260,   384,   284,   292,   304,   -148, 88,
+  -152,  1012,  1064,  -228,  164,   -376,  -684,  592,   -392,  156,  196,
+  -524,  -64,   -884,  160,   -176,  636,   648,   404,   -396,  -436, 864,
+  424,   -728,  988,   -604,  904,   -592,  296,   -224,  536,   -176, -920,
+  436,   -48,   1176,  -884,  416,   -776,  -824,  -884,  524,   -548, -564,
+  -68,   -164,  -96,   692,   364,   -692,  -1012, -68,   260,   -480, 876,
+  -1116, 452,   -332,  -352,  892,   -1088, 1220,  -676,  12,    -292, 244,
+  496,   372,   -32,   280,   200,   112,   -440,  -96,   24,    -644, -184,
+  56,    -432,  224,   -980,  272,   -260,  144,   -436,  420,   356,  364,
+  -528,  76,    172,   -744,  -368,  404,   -752,  -416,  684,   -688, 72,
+  540,   416,   92,    444,   480,   -72,   -1416, 164,   -1172, -68,  24,
+  424,   264,   1040,  128,   -912,  -524,  -356,  64,    876,   -12,  4,
+  -88,   532,   272,   -524,  320,   276,   -508,  940,   24,    -400, -120,
+  756,   60,    236,   -412,  100,   376,   -484,  400,   -100,  -740, -108,
+  -260,  328,   -268,  224,   -200,  -416,  184,   -604,  -564,  -20,  296,
+  60,    892,   -888,  60,    164,   68,    -760,  216,   -296,  904,  -336,
+  -28,   404,   -356,  -568,  -208,  -1480, -512,  296,   328,   -360, -164,
+  -1560, -776,  1156,  -428,  164,   -504,  -112,  120,   -216,  -148, -264,
+  308,   32,    64,    -72,   72,    116,   176,   -64,   -272,  460,  -536,
+  -784,  -280,  348,   108,   -752,  -132,  524,   -540,  -776,  116,  -296,
+  -1196, -288,  -560,  1040,  -472,  116,   -848,  -1116, 116,   636,  696,
+  284,   -176,  1016,  204,   -864,  -648,  -248,  356,   972,   -584, -204,
+  264,   880,   528,   -24,   -184,  116,   448,   -144,  828,   524,  212,
+  -212,  52,    12,    200,   268,   -488,  -404,  -880,  824,   -672, -40,
+  908,   -248,  500,   716,   -576,  492,   -576,  16,    720,   -108, 384,
+  124,   344,   280,   576,   -500,  252,   104,   -308,  196,   -188, -8,
+  1268,  296,   1032,  -1196, 436,   316,   372,   -432,  -200,  -660, 704,
+  -224,  596,   -132,  268,   32,    -452,  884,   104,   -1008, 424,  -1348,
+  -280,  4,     -1168, 368,   476,   696,   300,   -8,    24,    180,  -592,
+  -196,  388,   304,   500,   724,   -160,  244,   -84,   272,   -256, -420,
+  320,   208,   -144,  -156,  156,   364,   452,   28,    540,   316,  220,
+  -644,  -248,  464,   72,    360,   32,    -388,  496,   -680,  -48,  208,
+  -116,  -408,  60,    -604,  -392,  548,   -840,  784,   -460,  656,  -544,
+  -388,  -264,  908,   -800,  -628,  -612,  -568,  572,   -220,  164,  288,
+  -16,   -308,  308,   -112,  -636,  -760,  280,   -668,  432,   364,  240,
+  -196,  604,   340,   384,   196,   592,   -44,   -500,  432,   -580, -132,
+  636,   -76,   392,   4,     -412,  540,   508,   328,   -356,  -36,  16,
+  -220,  -64,   -248,  -60,   24,    -192,  368,   1040,  92,    -24,  -1044,
+  -32,   40,    104,   148,   192,   -136,  -520,  56,    -816,  -224, 732,
+  392,   356,   212,   -80,   -424,  -1008, -324,  588,   -1496, 576,  460,
+  -816,  -848,  56,    -580,  -92,   -1372, -112,  -496,  200,   364,  52,
+  -140,  48,    -48,   -60,   84,    72,    40,    132,   -356,  -268, -104,
+  -284,  -404,  732,   -520,  164,   -304,  -540,  120,   328,   -76,  -460,
+  756,   388,   588,   236,   -436,  -72,   -176,  -404,  -316,  -148, 716,
+  -604,  404,   -72,   -88,   -888,  -68,   944,   88,    -220,  -344, 960,
+  472,   460,   -232,  704,   120,   832,   -228,  692,   -508,  132,  -476,
+  844,   -748,  -364,  -44,   1116,  -1104, -1056, 76,    428,   552,  -692,
+  60,    356,   96,    -384,  -188,  -612,  -576,  736,   508,   892,  352,
+  -1132, 504,   -24,   -352,  324,   332,   -600,  -312,  292,   508,  -144,
+  -8,    484,   48,    284,   -260,  -240,  256,   -100,  -292,  -204, -44,
+  472,   -204,  908,   -188,  -1000, -256,  92,    1164,  -392,  564,  356,
+  652,   -28,   -884,  256,   484,   -192,  760,   -176,  376,   -524, -452,
+  -436,  860,   -736,  212,   124,   504,   -476,  468,   76,    -472, 552,
+  -692,  -944,  -620,  740,   -240,  400,   132,   20,    192,   -196, 264,
+  -668,  -1012, -60,   296,   -316,  -828,  76,    -156,  284,   -768, -448,
+  -832,  148,   248,   652,   616,   1236,  288,   -328,  -400,  -124, 588,
+  220,   520,   -696,  1032,  768,   -740,  -92,   -272,  296,   448,  -464,
+  412,   -200,  392,   440,   -200,  264,   -152,  -260,  320,   1032, 216,
+  320,   -8,    -64,   156,   -1016, 1084,  1172,  536,   484,   -432, 132,
+  372,   -52,   -256,  84,    116,   -352,  48,    116,   304,   -384, 412,
+  924,   -300,  528,   628,   180,   648,   44,    -980,  -220,  1320, 48,
+  332,   748,   524,   -268,  -720,  540,   -276,  564,   -344,  -208, -196,
+  436,   896,   88,    -392,  132,   80,    -964,  -288,  568,   56,   -48,
+  -456,  888,   8,     552,   -156,  -292,  948,   288,   128,   -716, -292,
+  1192,  -152,  876,   352,   -600,  -260,  -812,  -468,  -28,   -120, -32,
+  -44,   1284,  496,   192,   464,   312,   -76,   -516,  -380,  -456, -1012,
+  -48,   308,   -156,  36,    492,   -156,  -808,  188,   1652,  68,   -120,
+  -116,  316,   160,   -140,  352,   808,   -416,  592,   316,   -480, 56,
+  528,   -204,  -568,  372,   -232,  752,   -344,  744,   -4,    324,  -416,
+  -600,  768,   268,   -248,  -88,   -132,  -420,  -432,  80,    -288, 404,
+  -316,  -1216, -588,  520,   -108,  92,    -320,  368,   -480,  -216, -92,
+  1688,  -300,  180,   1020,  -176,  820,   -68,   -228,  -260,  436,  -904,
+  20,    40,    -508,  440,   -736,  312,   332,   204,   760,   -372, 728,
+  96,    -20,   -632,  -520,  -560,  336,   1076,  -64,   -532,  776,  584,
+  192,   396,   -728,  -520,  276,   -188,  80,    -52,   -612,  -252, -48,
+  648,   212,   -688,  228,   -52,   -260,  428,   -412,  -272,  -404, 180,
+  816,   -796,  48,    152,   484,   -88,   -216,  988,   696,   188,  -528,
+  648,   -116,  -180,  316,   476,   12,    -564,  96,    476,   -252, -364,
+  -376,  -392,  556,   -256,  -576,  260,   -352,  120,   -16,   -136, -260,
+  -492,  72,    556,   660,   580,   616,   772,   436,   424,   -32,  -324,
+  -1268, 416,   -324,  -80,   920,   160,   228,   724,   32,    -516, 64,
+  384,   68,    -128,  136,   240,   248,   -204,  -68,   252,   -932, -120,
+  -480,  -628,  -84,   192,   852,   -404,  -288,  -132,  204,   100,  168,
+  -68,   -196,  -868,  460,   1080,  380,   -80,   244,   0,     484,  -888,
+  64,    184,   352,   600,   460,   164,   604,   -196,  320,   -64,  588,
+  -184,  228,   12,    372,   48,    -848,  -344,  224,   208,   -200, 484,
+  128,   -20,   272,   -468,  -840,  384,   256,   -720,  -520,  -464, -580,
+  112,   -120,  644,   -356,  -208,  -608,  -528,  704,   560,   -424, 392,
+  828,   40,    84,    200,   -152,  0,     -144,  584,   280,   -120, 80,
+  -556,  -972,  -196,  -472,  724,   80,    168,   -32,   88,    160,  -688,
+  0,     160,   356,   372,   -776,  740,   -128,  676,   -248,  -480, 4,
+  -364,  96,    544,   232,   -1032, 956,   236,   356,   20,    -40,  300,
+  24,    -676,  -596,  132,   1120,  -104,  532,   -1096, 568,   648,  444,
+  508,   380,   188,   -376,  -604,  1488,  424,   24,    756,   -220, -192,
+  716,   120,   920,   688,   168,   44,    -460,  568,   284,   1144, 1160,
+  600,   424,   888,   656,   -356,  -320,  220,   316,   -176,  -724, -188,
+  -816,  -628,  -348,  -228,  -380,  1012,  -452,  -660,  736,   928,  404,
+  -696,  -72,   -268,  -892,  128,   184,   -344,  -780,  360,   336,  400,
+  344,   428,   548,   -112,  136,   -228,  -216,  -820,  -516,  340,  92,
+  -136,  116,   -300,  376,   -244,  100,   -316,  -520,  -284,  -12,  824,
+  164,   -548,  -180,  -128,  116,   -924,  -828,  268,   -368,  -580, 620,
+  192,   160,   0,     -1676, 1068,  424,   -56,   -360,  468,   -156, 720,
+  288,   -528,  556,   -364,  548,   -148,  504,   316,   152,   -648, -620,
+  -684,  -24,   -376,  -384,  -108,  -920,  -1032, 768,   180,   -264, -508,
+  -1268, -260,  -60,   300,   -240,  988,   724,   -376,  -576,  -212, -736,
+  556,   192,   1092,  -620,  -880,  376,   -56,   -4,    -216,  -32,  836,
+  268,   396,   1332,  864,   -600,  100,   56,    -412,  -92,   356,  180,
+  884,   -468,  -436,  292,   -388,  -804,  -704,  -840,  368,   -348, 140,
+  -724,  1536,  940,   372,   112,   -372,  436,   -480,  1136,  296,  -32,
+  -228,  132,   -48,   -220,  868,   -1016, -60,   -1044, -464,  328,  916,
+  244,   12,    -736,  -296,  360,   468,   -376,  -108,  -92,   788,  368,
+  -56,   544,   400,   -672,  -420,  728,   16,    320,   44,    -284, -380,
+  -796,  488,   132,   204,   -596,  -372,  88,    -152,  -908,  -636, -572,
+  -624,  -116,  -692,  -200,  -56,   276,   -88,   484,   -324,  948,  864,
+  1000,  -456,  -184,  -276,  292,   -296,  156,   676,   320,   160,  908,
+  -84,   -1236, -288,  -116,  260,   -372,  -644,  732,   -756,  -96,  84,
+  344,   -520,  348,   -688,  240,   -84,   216,   -1044, -136,  -676, -396,
+  -1500, 960,   -40,   176,   168,   1516,  420,   -504,  -344,  -364, -360,
+  1216,  -940,  -380,  -212,  252,   -660,  -708,  484,   -444,  -152, 928,
+  -120,  1112,  476,   -260,  560,   -148,  -344,  108,   -196,  228,  -288,
+  504,   560,   -328,  -88,   288,   -1008, 460,   -228,  468,   -836, -196,
+  76,    388,   232,   412,   -1168, -716,  -644,  756,   -172,  -356, -504,
+  116,   432,   528,   48,    476,   -168,  -608,  448,   160,   -532, -272,
+  28,    -676,  -12,   828,   980,   456,   520,   104,   -104,  256,  -344,
+  -4,    -28,   -368,  -52,   -524,  -572,  -556,  -200,  768,   1124, -208,
+  -512,  176,   232,   248,   -148,  -888,  604,   -600,  -304,  804,  -156,
+  -212,  488,   -192,  -804,  -256,  368,   -360,  -916,  -328,  228,  -240,
+  -448,  -472,  856,   -556,  -364,  572,   -12,   -156,  -368,  -340, 432,
+  252,   -752,  -152,  288,   268,   -580,  -848,  -592,  108,   -76,  244,
+  312,   -716,  592,   -80,   436,   360,   4,     -248,  160,   516,  584,
+  732,   44,    -468,  -280,  -292,  -156,  -588,  28,    308,   912,  24,
+  124,   156,   180,   -252,  944,   -924,  -772,  -520,  -428,  -624, 300,
+  -212,  -1144, 32,    -724,  800,   -1128, -212,  -1288, -848,  180,  -416,
+  440,   192,   -576,  -792,  -76,   -1080, 80,    -532,  -352,  -132, 380,
+  -820,  148,   1112,  128,   164,   456,   700,   -924,  144,   -668, -384,
+  648,   -832,  508,   552,   -52,   -100,  -656,  208,   -568,  748,  -88,
+  680,   232,   300,   192,   -408,  -1012, -152,  -252,  -268,  272,  -876,
+  -664,  -648,  -332,  -136,  16,    12,    1152,  -28,   332,   -536, 320,
+  -672,  -460,  -316,  532,   -260,  228,   -40,   1052,  -816,  180,  88,
+  -496,  -556,  -672,  -368,  428,   92,    356,   404,   -408,  252,  196,
+  -176,  -556,  792,   268,   32,    372,   40,    96,    -332,  328,  120,
+  372,   -900,  -40,   472,   -264,  -592,  952,   128,   656,   112,  664,
+  -232,  420,   4,     -344,  -464,  556,   244,   -416,  -32,   252,  0,
+  -412,  188,   -696,  508,   -476,  324,   -1096, 656,   -312,  560,  264,
+  -136,  304,   160,   -64,   -580,  248,   336,   -720,  560,   -348, -288,
+  -276,  -196,  -500,  852,   -544,  -236,  -1128, -992,  -776,  116,  56,
+  52,    860,   884,   212,   -12,   168,   1020,  512,   -552,  924,  -148,
+  716,   188,   164,   -340,  -520,  -184,  880,   -152,  -680,  -208, -1156,
+  -300,  -528,  -472,  364,   100,   -744,  -1056, -32,   540,   280,  144,
+  -676,  -32,   -232,  -280,  -224,  96,    568,   -76,   172,   148,  148,
+  104,   32,    -296,  -32,   788,   -80,   32,    -16,   280,   288,  944,
+  428,   -484
+};
+
+static const int gauss_bits = 11;
+
+static int luma_subblock_size_y = 32;
+static int luma_subblock_size_x = 32;
+
+static int chroma_subblock_size_y = 16;
+static int chroma_subblock_size_x = 16;
+
+static const int min_luma_legal_range = 16;
+static const int max_luma_legal_range = 235;
+
+static const int min_chroma_legal_range = 16;
+static const int max_chroma_legal_range = 240;
+
+static int scaling_lut_y[256];
+static int scaling_lut_cb[256];
+static int scaling_lut_cr[256];
+
+static int grain_min;
+static int grain_max;
+
+static uint16_t random_register = 0;  // random number generator register
+
+static void init_arrays(const aom_film_grain_t *params, int luma_stride,
+                        int chroma_stride, int ***pred_pos_luma_p,
+                        int ***pred_pos_chroma_p, int **luma_grain_block,
+                        int **cb_grain_block, int **cr_grain_block,
+                        int **y_line_buf, int **cb_line_buf, int **cr_line_buf,
+                        int **y_col_buf, int **cb_col_buf, int **cr_col_buf,
+                        int luma_grain_samples, int chroma_grain_samples,
+                        int chroma_subsamp_y, int chroma_subsamp_x) {
+  memset(scaling_lut_y, 0, sizeof(*scaling_lut_y) * 256);
+  memset(scaling_lut_cb, 0, sizeof(*scaling_lut_cb) * 256);
+  memset(scaling_lut_cr, 0, sizeof(*scaling_lut_cr) * 256);
+
+  int num_pos_luma = 2 * params->ar_coeff_lag * (params->ar_coeff_lag + 1);
+  int num_pos_chroma = num_pos_luma;
+  if (params->num_y_points > 0) ++num_pos_chroma;
+
+  int **pred_pos_luma;
+  int **pred_pos_chroma;
+
+  pred_pos_luma = (int **)aom_malloc(sizeof(*pred_pos_luma) * num_pos_luma);
+
+  for (int row = 0; row < num_pos_luma; row++) {
+    pred_pos_luma[row] = (int *)aom_malloc(sizeof(**pred_pos_luma) * 3);
+  }
+
+  pred_pos_chroma =
+      (int **)aom_malloc(sizeof(*pred_pos_chroma) * num_pos_chroma);
+
+  for (int row = 0; row < num_pos_chroma; row++) {
+    pred_pos_chroma[row] = (int *)aom_malloc(sizeof(**pred_pos_chroma) * 3);
+  }
+
+  int pos_ar_index = 0;
+
+  for (int row = -params->ar_coeff_lag; row < 0; row++) {
+    for (int col = -params->ar_coeff_lag; col < params->ar_coeff_lag + 1;
+         col++) {
+      pred_pos_luma[pos_ar_index][0] = row;
+      pred_pos_luma[pos_ar_index][1] = col;
+      pred_pos_luma[pos_ar_index][2] = 0;
+
+      pred_pos_chroma[pos_ar_index][0] = row;
+      pred_pos_chroma[pos_ar_index][1] = col;
+      pred_pos_chroma[pos_ar_index][2] = 0;
+      ++pos_ar_index;
+    }
+  }
+
+  for (int col = -params->ar_coeff_lag; col < 0; col++) {
+    pred_pos_luma[pos_ar_index][0] = 0;
+    pred_pos_luma[pos_ar_index][1] = col;
+    pred_pos_luma[pos_ar_index][2] = 0;
+
+    pred_pos_chroma[pos_ar_index][0] = 0;
+    pred_pos_chroma[pos_ar_index][1] = col;
+    pred_pos_chroma[pos_ar_index][2] = 0;
+
+    ++pos_ar_index;
+  }
+
+  if (params->num_y_points > 0) {
+    pred_pos_chroma[pos_ar_index][0] = 0;
+    pred_pos_chroma[pos_ar_index][1] = 0;
+    pred_pos_chroma[pos_ar_index][2] = 1;
+  }
+
+  *pred_pos_luma_p = pred_pos_luma;
+  *pred_pos_chroma_p = pred_pos_chroma;
+
+  *y_line_buf = (int *)aom_malloc(sizeof(**y_line_buf) * luma_stride * 2);
+  *cb_line_buf = (int *)aom_malloc(sizeof(**cb_line_buf) * chroma_stride *
+                                   (2 >> chroma_subsamp_y));
+  *cr_line_buf = (int *)aom_malloc(sizeof(**cr_line_buf) * chroma_stride *
+                                   (2 >> chroma_subsamp_y));
+
+  *y_col_buf =
+      (int *)aom_malloc(sizeof(**y_col_buf) * (luma_subblock_size_y + 2) * 2);
+  *cb_col_buf =
+      (int *)aom_malloc(sizeof(**cb_col_buf) *
+                        (chroma_subblock_size_y + (2 >> chroma_subsamp_y)) *
+                        (2 >> chroma_subsamp_x));
+  *cr_col_buf =
+      (int *)aom_malloc(sizeof(**cr_col_buf) *
+                        (chroma_subblock_size_y + (2 >> chroma_subsamp_y)) *
+                        (2 >> chroma_subsamp_x));
+
+  *luma_grain_block =
+      (int *)aom_malloc(sizeof(**luma_grain_block) * luma_grain_samples);
+  *cb_grain_block =
+      (int *)aom_malloc(sizeof(**cb_grain_block) * chroma_grain_samples);
+  *cr_grain_block =
+      (int *)aom_malloc(sizeof(**cr_grain_block) * chroma_grain_samples);
+}
+
+static void dealloc_arrays(const aom_film_grain_t *params, int ***pred_pos_luma,
+                           int ***pred_pos_chroma, int **luma_grain_block,
+                           int **cb_grain_block, int **cr_grain_block,
+                           int **y_line_buf, int **cb_line_buf,
+                           int **cr_line_buf, int **y_col_buf, int **cb_col_buf,
+                           int **cr_col_buf) {
+  int num_pos_luma = 2 * params->ar_coeff_lag * (params->ar_coeff_lag + 1);
+  int num_pos_chroma = num_pos_luma;
+  if (params->num_y_points > 0) ++num_pos_chroma;
+
+  for (int row = 0; row < num_pos_luma; row++) {
+    aom_free((*pred_pos_luma)[row]);
+  }
+  aom_free(*pred_pos_luma);
+
+  for (int row = 0; row < num_pos_chroma; row++) {
+    aom_free((*pred_pos_chroma)[row]);
+  }
+  aom_free((*pred_pos_chroma));
+
+  aom_free(*y_line_buf);
+
+  aom_free(*cb_line_buf);
+
+  aom_free(*cr_line_buf);
+
+  aom_free(*y_col_buf);
+
+  aom_free(*cb_col_buf);
+
+  aom_free(*cr_col_buf);
+
+  aom_free(*luma_grain_block);
+
+  aom_free(*cb_grain_block);
+
+  aom_free(*cr_grain_block);
+}
+
+// get a number between 0 and 2^bits - 1
+static INLINE int get_random_number(int bits) {
+  uint16_t bit;
+  bit = ((random_register >> 0) ^ (random_register >> 1) ^
+         (random_register >> 3) ^ (random_register >> 12)) &
+        1;
+  random_register = (random_register >> 1) | (bit << 15);
+  return (random_register >> (16 - bits)) & ((1 << bits) - 1);
+}
+
+static void init_random_generator(int luma_line, uint16_t seed) {
+  // same for the picture
+
+  uint16_t msb = (seed >> 8) & 255;
+  uint16_t lsb = seed & 255;
+
+  random_register = (msb << 8) + lsb;
+
+  //  changes for each row
+  int luma_num = luma_line >> 5;
+
+  random_register ^= ((luma_num * 37 + 178) & 255) << 8;
+  random_register ^= ((luma_num * 173 + 105) & 255);
+}
+
+// Return 0 for success, -1 for failure
+static int generate_luma_grain_block(
+    const aom_film_grain_t *params, int **pred_pos_luma, int *luma_grain_block,
+    int luma_block_size_y, int luma_block_size_x, int luma_grain_stride,
+    int left_pad, int top_pad, int right_pad, int bottom_pad) {
+  if (params->num_y_points == 0) {
+    memset(luma_grain_block, 0,
+           sizeof(*luma_grain_block) * luma_block_size_y * luma_grain_stride);
+    return 0;
+  }
+
+  int bit_depth = params->bit_depth;
+  int gauss_sec_shift = 12 - bit_depth + params->grain_scale_shift;
+
+  int num_pos_luma = 2 * params->ar_coeff_lag * (params->ar_coeff_lag + 1);
+  int rounding_offset = (1 << (params->ar_coeff_shift - 1));
+
+  for (int i = 0; i < luma_block_size_y; i++)
+    for (int j = 0; j < luma_block_size_x; j++)
+      luma_grain_block[i * luma_grain_stride + j] =
+          (gaussian_sequence[get_random_number(gauss_bits)] +
+           ((1 << gauss_sec_shift) >> 1)) >>
+          gauss_sec_shift;
+
+  for (int i = top_pad; i < luma_block_size_y - bottom_pad; i++)
+    for (int j = left_pad; j < luma_block_size_x - right_pad; j++) {
+      int wsum = 0;
+      for (int pos = 0; pos < num_pos_luma; pos++) {
+        wsum = wsum + params->ar_coeffs_y[pos] *
+                          luma_grain_block[(i + pred_pos_luma[pos][0]) *
+                                               luma_grain_stride +
+                                           j + pred_pos_luma[pos][1]];
+      }
+      luma_grain_block[i * luma_grain_stride + j] =
+          clamp(luma_grain_block[i * luma_grain_stride + j] +
+                    ((wsum + rounding_offset) >> params->ar_coeff_shift),
+                grain_min, grain_max);
+    }
+  return 0;
+}
+
+// Return 0 for success, -1 for failure
+static int generate_chroma_grain_blocks(
+    const aom_film_grain_t *params,
+    //                                  int** pred_pos_luma,
+    int **pred_pos_chroma, int *luma_grain_block, int *cb_grain_block,
+    int *cr_grain_block, int luma_grain_stride, int chroma_block_size_y,
+    int chroma_block_size_x, int chroma_grain_stride, int left_pad, int top_pad,
+    int right_pad, int bottom_pad, int chroma_subsamp_y, int chroma_subsamp_x) {
+  int bit_depth = params->bit_depth;
+  int gauss_sec_shift = 12 - bit_depth + params->grain_scale_shift;
+
+  int num_pos_chroma = 2 * params->ar_coeff_lag * (params->ar_coeff_lag + 1);
+  if (params->num_y_points > 0) ++num_pos_chroma;
+  int rounding_offset = (1 << (params->ar_coeff_shift - 1));
+  int chroma_grain_block_size = chroma_block_size_y * chroma_grain_stride;
+
+  if (params->num_cb_points || params->chroma_scaling_from_luma) {
+    init_random_generator(7 << 5, params->random_seed);
+
+    for (int i = 0; i < chroma_block_size_y; i++)
+      for (int j = 0; j < chroma_block_size_x; j++)
+        cb_grain_block[i * chroma_grain_stride + j] =
+            (gaussian_sequence[get_random_number(gauss_bits)] +
+             ((1 << gauss_sec_shift) >> 1)) >>
+            gauss_sec_shift;
+  } else {
+    memset(cb_grain_block, 0,
+           sizeof(*cb_grain_block) * chroma_grain_block_size);
+  }
+
+  if (params->num_cr_points || params->chroma_scaling_from_luma) {
+    init_random_generator(11 << 5, params->random_seed);
+
+    for (int i = 0; i < chroma_block_size_y; i++)
+      for (int j = 0; j < chroma_block_size_x; j++)
+        cr_grain_block[i * chroma_grain_stride + j] =
+            (gaussian_sequence[get_random_number(gauss_bits)] +
+             ((1 << gauss_sec_shift) >> 1)) >>
+            gauss_sec_shift;
+  } else {
+    memset(cr_grain_block, 0,
+           sizeof(*cr_grain_block) * chroma_grain_block_size);
+  }
+
+  for (int i = top_pad; i < chroma_block_size_y - bottom_pad; i++)
+    for (int j = left_pad; j < chroma_block_size_x - right_pad; j++) {
+      int wsum_cb = 0;
+      int wsum_cr = 0;
+      for (int pos = 0; pos < num_pos_chroma; pos++) {
+        if (pred_pos_chroma[pos][2] == 0) {
+          wsum_cb = wsum_cb + params->ar_coeffs_cb[pos] *
+                                  cb_grain_block[(i + pred_pos_chroma[pos][0]) *
+                                                     chroma_grain_stride +
+                                                 j + pred_pos_chroma[pos][1]];
+          wsum_cr = wsum_cr + params->ar_coeffs_cr[pos] *
+                                  cr_grain_block[(i + pred_pos_chroma[pos][0]) *
+                                                     chroma_grain_stride +
+                                                 j + pred_pos_chroma[pos][1]];
+        } else if (pred_pos_chroma[pos][2] == 1) {
+          int av_luma = 0;
+          int luma_coord_y = ((i - top_pad) << chroma_subsamp_y) + top_pad;
+          int luma_coord_x = ((j - left_pad) << chroma_subsamp_x) + left_pad;
+
+          for (int k = luma_coord_y; k < luma_coord_y + chroma_subsamp_y + 1;
+               k++)
+            for (int l = luma_coord_x; l < luma_coord_x + chroma_subsamp_x + 1;
+                 l++)
+              av_luma += luma_grain_block[k * luma_grain_stride + l];
+
+          av_luma =
+              (av_luma + ((1 << (chroma_subsamp_y + chroma_subsamp_x)) >> 1)) >>
+              (chroma_subsamp_y + chroma_subsamp_x);
+
+          wsum_cb = wsum_cb + params->ar_coeffs_cb[pos] * av_luma;
+          wsum_cr = wsum_cr + params->ar_coeffs_cr[pos] * av_luma;
+        } else {
+          fprintf(
+              stderr,
+              "Grain synthesis: prediction between two chroma components is "
+              "not supported!");
+          return -1;
+        }
+      }
+      if (params->num_cb_points || params->chroma_scaling_from_luma)
+        cb_grain_block[i * chroma_grain_stride + j] =
+            clamp(cb_grain_block[i * chroma_grain_stride + j] +
+                      ((wsum_cb + rounding_offset) >> params->ar_coeff_shift),
+                  grain_min, grain_max);
+      if (params->num_cr_points || params->chroma_scaling_from_luma)
+        cr_grain_block[i * chroma_grain_stride + j] =
+            clamp(cr_grain_block[i * chroma_grain_stride + j] +
+                      ((wsum_cr + rounding_offset) >> params->ar_coeff_shift),
+                  grain_min, grain_max);
+    }
+  return 0;
+}
+
+static void init_scaling_function(const int scaling_points[][2], int num_points,
+                                  int scaling_lut[]) {
+  if (num_points == 0) return;
+
+  for (int i = 0; i < scaling_points[0][0]; i++)
+    scaling_lut[i] = scaling_points[0][1];
+
+  for (int point = 0; point < num_points - 1; point++) {
+    int delta_y = scaling_points[point + 1][1] - scaling_points[point][1];
+    int delta_x = scaling_points[point + 1][0] - scaling_points[point][0];
+
+    int64_t delta = delta_y * ((65536 + (delta_x >> 1)) / delta_x);
+
+    for (int x = 0; x < delta_x; x++) {
+      scaling_lut[scaling_points[point][0] + x] =
+          scaling_points[point][1] + (int)((x * delta + 32768) >> 16);
+    }
+  }
+
+  for (int i = scaling_points[num_points - 1][0]; i < 256; i++)
+    scaling_lut[i] = scaling_points[num_points - 1][1];
+}
+
+// function that extracts samples from a LUT (and interpolates intemediate
+// frames for 10- and 12-bit video)
+static int scale_LUT(int *scaling_lut, int index, int bit_depth) {
+  int x = index >> (bit_depth - 8);
+
+  if (!(bit_depth - 8) || x == 255)
+    return scaling_lut[x];
+  else
+    return scaling_lut[x] + (((scaling_lut[x + 1] - scaling_lut[x]) *
+                                  (index & ((1 << (bit_depth - 8)) - 1)) +
+                              (1 << (bit_depth - 9))) >>
+                             (bit_depth - 8));
+}
+
+static void add_noise_to_block(const aom_film_grain_t *params, uint8_t *luma,
+                               uint8_t *cb, uint8_t *cr, int luma_stride,
+                               int chroma_stride, int *luma_grain,
+                               int *cb_grain, int *cr_grain,
+                               int luma_grain_stride, int chroma_grain_stride,
+                               int half_luma_height, int half_luma_width,
+                               int bit_depth, int chroma_subsamp_y,
+                               int chroma_subsamp_x, int mc_identity) {
+  int cb_mult = params->cb_mult - 128;            // fixed scale
+  int cb_luma_mult = params->cb_luma_mult - 128;  // fixed scale
+  int cb_offset = params->cb_offset - 256;
+
+  int cr_mult = params->cr_mult - 128;            // fixed scale
+  int cr_luma_mult = params->cr_luma_mult - 128;  // fixed scale
+  int cr_offset = params->cr_offset - 256;
+
+  int rounding_offset = (1 << (params->scaling_shift - 1));
+
+  int apply_y = params->num_y_points > 0 ? 1 : 0;
+  int apply_cb =
+      (params->num_cb_points > 0 || params->chroma_scaling_from_luma) ? 1 : 0;
+  int apply_cr =
+      (params->num_cr_points > 0 || params->chroma_scaling_from_luma) ? 1 : 0;
+
+  if (params->chroma_scaling_from_luma) {
+    cb_mult = 0;        // fixed scale
+    cb_luma_mult = 64;  // fixed scale
+    cb_offset = 0;
+
+    cr_mult = 0;        // fixed scale
+    cr_luma_mult = 64;  // fixed scale
+    cr_offset = 0;
+  }
+
+  int min_luma, max_luma, min_chroma, max_chroma;
+
+  if (params->clip_to_restricted_range) {
+    min_luma = min_luma_legal_range;
+    max_luma = max_luma_legal_range;
+
+    if (mc_identity) {
+      min_chroma = min_luma_legal_range;
+      max_chroma = max_luma_legal_range;
+    } else {
+      min_chroma = min_chroma_legal_range;
+      max_chroma = max_chroma_legal_range;
+    }
+  } else {
+    min_luma = min_chroma = 0;
+    max_luma = max_chroma = 255;
+  }
+
+  for (int i = 0; i < (half_luma_height << (1 - chroma_subsamp_y)); i++) {
+    for (int j = 0; j < (half_luma_width << (1 - chroma_subsamp_x)); j++) {
+      int average_luma = 0;
+      if (chroma_subsamp_x) {
+        average_luma = (luma[(i << chroma_subsamp_y) * luma_stride +
+                             (j << chroma_subsamp_x)] +
+                        luma[(i << chroma_subsamp_y) * luma_stride +
+                             (j << chroma_subsamp_x) + 1] +
+                        1) >>
+                       1;
+      } else {
+        average_luma = luma[(i << chroma_subsamp_y) * luma_stride + j];
+      }
+
+      if (apply_cb) {
+        cb[i * chroma_stride + j] = clamp(
+            cb[i * chroma_stride + j] +
+                ((scale_LUT(scaling_lut_cb,
+                            clamp(((average_luma * cb_luma_mult +
+                                    cb_mult * cb[i * chroma_stride + j]) >>
+                                   6) +
+                                      cb_offset,
+                                  0, (256 << (bit_depth - 8)) - 1),
+                            8) *
+                      cb_grain[i * chroma_grain_stride + j] +
+                  rounding_offset) >>
+                 params->scaling_shift),
+            min_chroma, max_chroma);
+      }
+
+      if (apply_cr) {
+        cr[i * chroma_stride + j] = clamp(
+            cr[i * chroma_stride + j] +
+                ((scale_LUT(scaling_lut_cr,
+                            clamp(((average_luma * cr_luma_mult +
+                                    cr_mult * cr[i * chroma_stride + j]) >>
+                                   6) +
+                                      cr_offset,
+                                  0, (256 << (bit_depth - 8)) - 1),
+                            8) *
+                      cr_grain[i * chroma_grain_stride + j] +
+                  rounding_offset) >>
+                 params->scaling_shift),
+            min_chroma, max_chroma);
+      }
+    }
+  }
+
+  if (apply_y) {
+    for (int i = 0; i < (half_luma_height << 1); i++) {
+      for (int j = 0; j < (half_luma_width << 1); j++) {
+        luma[i * luma_stride + j] =
+            clamp(luma[i * luma_stride + j] +
+                      ((scale_LUT(scaling_lut_y, luma[i * luma_stride + j], 8) *
+                            luma_grain[i * luma_grain_stride + j] +
+                        rounding_offset) >>
+                       params->scaling_shift),
+                  min_luma, max_luma);
+      }
+    }
+  }
+}
+
+static void add_noise_to_block_hbd(
+    const aom_film_grain_t *params, uint16_t *luma, uint16_t *cb, uint16_t *cr,
+    int luma_stride, int chroma_stride, int *luma_grain, int *cb_grain,
+    int *cr_grain, int luma_grain_stride, int chroma_grain_stride,
+    int half_luma_height, int half_luma_width, int bit_depth,
+    int chroma_subsamp_y, int chroma_subsamp_x, int mc_identity) {
+  int cb_mult = params->cb_mult - 128;            // fixed scale
+  int cb_luma_mult = params->cb_luma_mult - 128;  // fixed scale
+  // offset value depends on the bit depth
+  int cb_offset = (params->cb_offset << (bit_depth - 8)) - (1 << bit_depth);
+
+  int cr_mult = params->cr_mult - 128;            // fixed scale
+  int cr_luma_mult = params->cr_luma_mult - 128;  // fixed scale
+  // offset value depends on the bit depth
+  int cr_offset = (params->cr_offset << (bit_depth - 8)) - (1 << bit_depth);
+
+  int rounding_offset = (1 << (params->scaling_shift - 1));
+
+  int apply_y = params->num_y_points > 0 ? 1 : 0;
+  int apply_cb =
+      (params->num_cb_points > 0 || params->chroma_scaling_from_luma) > 0 ? 1
+                                                                          : 0;
+  int apply_cr =
+      (params->num_cr_points > 0 || params->chroma_scaling_from_luma) > 0 ? 1
+                                                                          : 0;
+
+  if (params->chroma_scaling_from_luma) {
+    cb_mult = 0;        // fixed scale
+    cb_luma_mult = 64;  // fixed scale
+    cb_offset = 0;
+
+    cr_mult = 0;        // fixed scale
+    cr_luma_mult = 64;  // fixed scale
+    cr_offset = 0;
+  }
+
+  int min_luma, max_luma, min_chroma, max_chroma;
+
+  if (params->clip_to_restricted_range) {
+    min_luma = min_luma_legal_range << (bit_depth - 8);
+    max_luma = max_luma_legal_range << (bit_depth - 8);
+
+    if (mc_identity) {
+      min_chroma = min_luma_legal_range << (bit_depth - 8);
+      max_chroma = max_luma_legal_range << (bit_depth - 8);
+    } else {
+      min_chroma = min_chroma_legal_range << (bit_depth - 8);
+      max_chroma = max_chroma_legal_range << (bit_depth - 8);
+    }
+  } else {
+    min_luma = min_chroma = 0;
+    max_luma = max_chroma = (256 << (bit_depth - 8)) - 1;
+  }
+
+  for (int i = 0; i < (half_luma_height << (1 - chroma_subsamp_y)); i++) {
+    for (int j = 0; j < (half_luma_width << (1 - chroma_subsamp_x)); j++) {
+      int average_luma = 0;
+      if (chroma_subsamp_x) {
+        average_luma = (luma[(i << chroma_subsamp_y) * luma_stride +
+                             (j << chroma_subsamp_x)] +
+                        luma[(i << chroma_subsamp_y) * luma_stride +
+                             (j << chroma_subsamp_x) + 1] +
+                        1) >>
+                       1;
+      } else {
+        average_luma = luma[(i << chroma_subsamp_y) * luma_stride + j];
+      }
+
+      if (apply_cb) {
+        cb[i * chroma_stride + j] = clamp(
+            cb[i * chroma_stride + j] +
+                ((scale_LUT(scaling_lut_cb,
+                            clamp(((average_luma * cb_luma_mult +
+                                    cb_mult * cb[i * chroma_stride + j]) >>
+                                   6) +
+                                      cb_offset,
+                                  0, (256 << (bit_depth - 8)) - 1),
+                            bit_depth) *
+                      cb_grain[i * chroma_grain_stride + j] +
+                  rounding_offset) >>
+                 params->scaling_shift),
+            min_chroma, max_chroma);
+      }
+      if (apply_cr) {
+        cr[i * chroma_stride + j] = clamp(
+            cr[i * chroma_stride + j] +
+                ((scale_LUT(scaling_lut_cr,
+                            clamp(((average_luma * cr_luma_mult +
+                                    cr_mult * cr[i * chroma_stride + j]) >>
+                                   6) +
+                                      cr_offset,
+                                  0, (256 << (bit_depth - 8)) - 1),
+                            bit_depth) *
+                      cr_grain[i * chroma_grain_stride + j] +
+                  rounding_offset) >>
+                 params->scaling_shift),
+            min_chroma, max_chroma);
+      }
+    }
+  }
+
+  if (apply_y) {
+    for (int i = 0; i < (half_luma_height << 1); i++) {
+      for (int j = 0; j < (half_luma_width << 1); j++) {
+        luma[i * luma_stride + j] =
+            clamp(luma[i * luma_stride + j] +
+                      ((scale_LUT(scaling_lut_y, luma[i * luma_stride + j],
+                                  bit_depth) *
+                            luma_grain[i * luma_grain_stride + j] +
+                        rounding_offset) >>
+                       params->scaling_shift),
+                  min_luma, max_luma);
+      }
+    }
+  }
+}
+
+static void copy_rect(uint8_t *src, int src_stride, uint8_t *dst,
+                      int dst_stride, int width, int height,
+                      int use_high_bit_depth) {
+  int hbd_coeff = use_high_bit_depth ? 2 : 1;
+  while (height) {
+    memcpy(dst, src, width * sizeof(uint8_t) * hbd_coeff);
+    src += src_stride;
+    dst += dst_stride;
+    --height;
+  }
+  return;
+}
+
+static void copy_area(int *src, int src_stride, int *dst, int dst_stride,
+                      int width, int height) {
+  while (height) {
+    memcpy(dst, src, width * sizeof(*src));
+    src += src_stride;
+    dst += dst_stride;
+    --height;
+  }
+  return;
+}
+
+static void extend_even(uint8_t *dst, int dst_stride, int width, int height,
+                        int use_high_bit_depth) {
+  if ((width & 1) == 0 && (height & 1) == 0) return;
+  if (use_high_bit_depth) {
+    uint16_t *dst16 = (uint16_t *)dst;
+    int dst16_stride = dst_stride / 2;
+    if (width & 1) {
+      for (int i = 0; i < height; ++i)
+        dst16[i * dst16_stride + width] = dst16[i * dst16_stride + width - 1];
+    }
+    width = (width + 1) & (~1);
+    if (height & 1) {
+      memcpy(&dst16[height * dst16_stride], &dst16[(height - 1) * dst16_stride],
+             sizeof(*dst16) * width);
+    }
+  } else {
+    if (width & 1) {
+      for (int i = 0; i < height; ++i)
+        dst[i * dst_stride + width] = dst[i * dst_stride + width - 1];
+    }
+    width = (width + 1) & (~1);
+    if (height & 1) {
+      memcpy(&dst[height * dst_stride], &dst[(height - 1) * dst_stride],
+             sizeof(*dst) * width);
+    }
+  }
+}
+
+static void ver_boundary_overlap(int *left_block, int left_stride,
+                                 int *right_block, int right_stride,
+                                 int *dst_block, int dst_stride, int width,
+                                 int height) {
+  if (width == 1) {
+    while (height) {
+      *dst_block = clamp((*left_block * 23 + *right_block * 22 + 16) >> 5,
+                         grain_min, grain_max);
+      left_block += left_stride;
+      right_block += right_stride;
+      dst_block += dst_stride;
+      --height;
+    }
+    return;
+  } else if (width == 2) {
+    while (height) {
+      dst_block[0] = clamp((27 * left_block[0] + 17 * right_block[0] + 16) >> 5,
+                           grain_min, grain_max);
+      dst_block[1] = clamp((17 * left_block[1] + 27 * right_block[1] + 16) >> 5,
+                           grain_min, grain_max);
+      left_block += left_stride;
+      right_block += right_stride;
+      dst_block += dst_stride;
+      --height;
+    }
+    return;
+  }
+}
+
+static void hor_boundary_overlap(int *top_block, int top_stride,
+                                 int *bottom_block, int bottom_stride,
+                                 int *dst_block, int dst_stride, int width,
+                                 int height) {
+  if (height == 1) {
+    while (width) {
+      *dst_block = clamp((*top_block * 23 + *bottom_block * 22 + 16) >> 5,
+                         grain_min, grain_max);
+      ++top_block;
+      ++bottom_block;
+      ++dst_block;
+      --width;
+    }
+    return;
+  } else if (height == 2) {
+    while (width) {
+      dst_block[0] = clamp((27 * top_block[0] + 17 * bottom_block[0] + 16) >> 5,
+                           grain_min, grain_max);
+      dst_block[dst_stride] = clamp((17 * top_block[top_stride] +
+                                     27 * bottom_block[bottom_stride] + 16) >>
+                                        5,
+                                    grain_min, grain_max);
+      ++top_block;
+      ++bottom_block;
+      ++dst_block;
+      --width;
+    }
+    return;
+  }
+}
+
+int av1_add_film_grain(const aom_film_grain_t *params, const aom_image_t *src,
+                       aom_image_t *dst) {
+  uint8_t *luma, *cb, *cr;
+  int height, width, luma_stride, chroma_stride;
+  int use_high_bit_depth = 0;
+  int chroma_subsamp_x = 0;
+  int chroma_subsamp_y = 0;
+  int mc_identity = src->mc == AOM_CICP_MC_IDENTITY ? 1 : 0;
+
+  switch (src->fmt) {
+    case AOM_IMG_FMT_AOMI420:
+    case AOM_IMG_FMT_I420:
+      use_high_bit_depth = 0;
+      chroma_subsamp_x = 1;
+      chroma_subsamp_y = 1;
+      break;
+    case AOM_IMG_FMT_I42016:
+      use_high_bit_depth = 1;
+      chroma_subsamp_x = 1;
+      chroma_subsamp_y = 1;
+      break;
+      //    case AOM_IMG_FMT_444A:
+    case AOM_IMG_FMT_I444:
+      use_high_bit_depth = 0;
+      chroma_subsamp_x = 0;
+      chroma_subsamp_y = 0;
+      break;
+    case AOM_IMG_FMT_I44416:
+      use_high_bit_depth = 1;
+      chroma_subsamp_x = 0;
+      chroma_subsamp_y = 0;
+      break;
+    case AOM_IMG_FMT_I422:
+      use_high_bit_depth = 0;
+      chroma_subsamp_x = 1;
+      chroma_subsamp_y = 0;
+      break;
+    case AOM_IMG_FMT_I42216:
+      use_high_bit_depth = 1;
+      chroma_subsamp_x = 1;
+      chroma_subsamp_y = 0;
+      break;
+    default:  // unknown input format
+      fprintf(stderr, "Film grain error: input format is not supported!");
+      return -1;
+  }
+
+  assert(params->bit_depth == src->bit_depth);
+
+  dst->fmt = src->fmt;
+  dst->bit_depth = src->bit_depth;
+
+  dst->r_w = src->r_w;
+  dst->r_h = src->r_h;
+  dst->d_w = src->d_w;
+  dst->d_h = src->d_h;
+
+  dst->cp = src->cp;
+  dst->tc = src->tc;
+  dst->mc = src->mc;
+
+  dst->monochrome = src->monochrome;
+  dst->csp = src->csp;
+  dst->range = src->range;
+
+  dst->x_chroma_shift = src->x_chroma_shift;
+  dst->y_chroma_shift = src->y_chroma_shift;
+
+  dst->temporal_id = src->temporal_id;
+  dst->spatial_id = src->spatial_id;
+
+  width = src->d_w % 2 ? src->d_w + 1 : src->d_w;
+  height = src->d_h % 2 ? src->d_h + 1 : src->d_h;
+
+  copy_rect(src->planes[AOM_PLANE_Y], src->stride[AOM_PLANE_Y],
+            dst->planes[AOM_PLANE_Y], dst->stride[AOM_PLANE_Y], src->d_w,
+            src->d_h, use_high_bit_depth);
+  // Note that dst is already assumed to be aligned to even.
+  extend_even(dst->planes[AOM_PLANE_Y], dst->stride[AOM_PLANE_Y], src->d_w,
+              src->d_h, use_high_bit_depth);
+
+  if (!src->monochrome) {
+    copy_rect(src->planes[AOM_PLANE_U], src->stride[AOM_PLANE_U],
+              dst->planes[AOM_PLANE_U], dst->stride[AOM_PLANE_U],
+              width >> chroma_subsamp_x, height >> chroma_subsamp_y,
+              use_high_bit_depth);
+
+    copy_rect(src->planes[AOM_PLANE_V], src->stride[AOM_PLANE_V],
+              dst->planes[AOM_PLANE_V], dst->stride[AOM_PLANE_V],
+              width >> chroma_subsamp_x, height >> chroma_subsamp_y,
+              use_high_bit_depth);
+  }
+
+  luma = dst->planes[AOM_PLANE_Y];
+  cb = dst->planes[AOM_PLANE_U];
+  cr = dst->planes[AOM_PLANE_V];
+
+  // luma and chroma strides in samples
+  luma_stride = dst->stride[AOM_PLANE_Y] >> use_high_bit_depth;
+  chroma_stride = dst->stride[AOM_PLANE_U] >> use_high_bit_depth;
+
+  return av1_add_film_grain_run(
+      params, luma, cb, cr, height, width, luma_stride, chroma_stride,
+      use_high_bit_depth, chroma_subsamp_y, chroma_subsamp_x, mc_identity);
+}
+
+int av1_add_film_grain_run(const aom_film_grain_t *params, uint8_t *luma,
+                           uint8_t *cb, uint8_t *cr, int height, int width,
+                           int luma_stride, int chroma_stride,
+                           int use_high_bit_depth, int chroma_subsamp_y,
+                           int chroma_subsamp_x, int mc_identity) {
+  int **pred_pos_luma;
+  int **pred_pos_chroma;
+  int *luma_grain_block;
+  int *cb_grain_block;
+  int *cr_grain_block;
+
+  int *y_line_buf;
+  int *cb_line_buf;
+  int *cr_line_buf;
+
+  int *y_col_buf;
+  int *cb_col_buf;
+  int *cr_col_buf;
+
+  random_register = params->random_seed;
+
+  int left_pad = 3;
+  int right_pad = 3;  // padding to offset for AR coefficients
+  int top_pad = 3;
+  int bottom_pad = 0;
+
+  int ar_padding = 3;  // maximum lag used for stabilization of AR coefficients
+
+  luma_subblock_size_y = 32;
+  luma_subblock_size_x = 32;
+
+  chroma_subblock_size_y = luma_subblock_size_y >> chroma_subsamp_y;
+  chroma_subblock_size_x = luma_subblock_size_x >> chroma_subsamp_x;
+
+  // Initial padding is only needed for generation of
+  // film grain templates (to stabilize the AR process)
+  // Only a 64x64 luma and 32x32 chroma part of a template
+  // is used later for adding grain, padding can be discarded
+
+  int luma_block_size_y =
+      top_pad + 2 * ar_padding + luma_subblock_size_y * 2 + bottom_pad;
+  int luma_block_size_x = left_pad + 2 * ar_padding + luma_subblock_size_x * 2 +
+                          2 * ar_padding + right_pad;
+
+  int chroma_block_size_y = top_pad + (2 >> chroma_subsamp_y) * ar_padding +
+                            chroma_subblock_size_y * 2 + bottom_pad;
+  int chroma_block_size_x = left_pad + (2 >> chroma_subsamp_x) * ar_padding +
+                            chroma_subblock_size_x * 2 +
+                            (2 >> chroma_subsamp_x) * ar_padding + right_pad;
+
+  int luma_grain_stride = luma_block_size_x;
+  int chroma_grain_stride = chroma_block_size_x;
+
+  int overlap = params->overlap_flag;
+  int bit_depth = params->bit_depth;
+
+  const int grain_center = 128 << (bit_depth - 8);
+  grain_min = 0 - grain_center;
+  grain_max = grain_center - 1;
+
+  init_arrays(params, luma_stride, chroma_stride, &pred_pos_luma,
+              &pred_pos_chroma, &luma_grain_block, &cb_grain_block,
+              &cr_grain_block, &y_line_buf, &cb_line_buf, &cr_line_buf,
+              &y_col_buf, &cb_col_buf, &cr_col_buf,
+              luma_block_size_y * luma_block_size_x,
+              chroma_block_size_y * chroma_block_size_x, chroma_subsamp_y,
+              chroma_subsamp_x);
+
+  if (generate_luma_grain_block(params, pred_pos_luma, luma_grain_block,
+                                luma_block_size_y, luma_block_size_x,
+                                luma_grain_stride, left_pad, top_pad, right_pad,
+                                bottom_pad))
+    return -1;
+
+  if (generate_chroma_grain_blocks(
+          params,
+          //                               pred_pos_luma,
+          pred_pos_chroma, luma_grain_block, cb_grain_block, cr_grain_block,
+          luma_grain_stride, chroma_block_size_y, chroma_block_size_x,
+          chroma_grain_stride, left_pad, top_pad, right_pad, bottom_pad,
+          chroma_subsamp_y, chroma_subsamp_x))
+    return -1;
+
+  init_scaling_function(params->scaling_points_y, params->num_y_points,
+                        scaling_lut_y);
+
+  if (params->chroma_scaling_from_luma) {
+    memcpy(scaling_lut_cb, scaling_lut_y, sizeof(*scaling_lut_y) * 256);
+    memcpy(scaling_lut_cr, scaling_lut_y, sizeof(*scaling_lut_y) * 256);
+  } else {
+    init_scaling_function(params->scaling_points_cb, params->num_cb_points,
+                          scaling_lut_cb);
+    init_scaling_function(params->scaling_points_cr, params->num_cr_points,
+                          scaling_lut_cr);
+  }
+  for (int y = 0; y < height / 2; y += (luma_subblock_size_y >> 1)) {
+    init_random_generator(y * 2, params->random_seed);
+
+    for (int x = 0; x < width / 2; x += (luma_subblock_size_x >> 1)) {
+      int offset_y = get_random_number(8);
+      int offset_x = (offset_y >> 4) & 15;
+      offset_y &= 15;
+
+      int luma_offset_y = left_pad + 2 * ar_padding + (offset_y << 1);
+      int luma_offset_x = top_pad + 2 * ar_padding + (offset_x << 1);
+
+      int chroma_offset_y = top_pad + (2 >> chroma_subsamp_y) * ar_padding +
+                            offset_y * (2 >> chroma_subsamp_y);
+      int chroma_offset_x = left_pad + (2 >> chroma_subsamp_x) * ar_padding +
+                            offset_x * (2 >> chroma_subsamp_x);
+
+      if (overlap && x) {
+        ver_boundary_overlap(
+            y_col_buf, 2,
+            luma_grain_block + luma_offset_y * luma_grain_stride +
+                luma_offset_x,
+            luma_grain_stride, y_col_buf, 2, 2,
+            AOMMIN(luma_subblock_size_y + 2, height - (y << 1)));
+
+        ver_boundary_overlap(
+            cb_col_buf, 2 >> chroma_subsamp_x,
+            cb_grain_block + chroma_offset_y * chroma_grain_stride +
+                chroma_offset_x,
+            chroma_grain_stride, cb_col_buf, 2 >> chroma_subsamp_x,
+            2 >> chroma_subsamp_x,
+            AOMMIN(chroma_subblock_size_y + (2 >> chroma_subsamp_y),
+                   (height - (y << 1)) >> chroma_subsamp_y));
+
+        ver_boundary_overlap(
+            cr_col_buf, 2 >> chroma_subsamp_x,
+            cr_grain_block + chroma_offset_y * chroma_grain_stride +
+                chroma_offset_x,
+            chroma_grain_stride, cr_col_buf, 2 >> chroma_subsamp_x,
+            2 >> chroma_subsamp_x,
+            AOMMIN(chroma_subblock_size_y + (2 >> chroma_subsamp_y),
+                   (height - (y << 1)) >> chroma_subsamp_y));
+
+        int i = y ? 1 : 0;
+
+        if (use_high_bit_depth) {
+          add_noise_to_block_hbd(
+              params,
+              (uint16_t *)luma + ((y + i) << 1) * luma_stride + (x << 1),
+              (uint16_t *)cb +
+                  ((y + i) << (1 - chroma_subsamp_y)) * chroma_stride +
+                  (x << (1 - chroma_subsamp_x)),
+              (uint16_t *)cr +
+                  ((y + i) << (1 - chroma_subsamp_y)) * chroma_stride +
+                  (x << (1 - chroma_subsamp_x)),
+              luma_stride, chroma_stride, y_col_buf + i * 4,
+              cb_col_buf + i * (2 - chroma_subsamp_y) * (2 - chroma_subsamp_x),
+              cr_col_buf + i * (2 - chroma_subsamp_y) * (2 - chroma_subsamp_x),
+              2, (2 - chroma_subsamp_x),
+              AOMMIN(luma_subblock_size_y >> 1, height / 2 - y) - i, 1,
+              bit_depth, chroma_subsamp_y, chroma_subsamp_x, mc_identity);
+        } else {
+          add_noise_to_block(
+              params, luma + ((y + i) << 1) * luma_stride + (x << 1),
+              cb + ((y + i) << (1 - chroma_subsamp_y)) * chroma_stride +
+                  (x << (1 - chroma_subsamp_x)),
+              cr + ((y + i) << (1 - chroma_subsamp_y)) * chroma_stride +
+                  (x << (1 - chroma_subsamp_x)),
+              luma_stride, chroma_stride, y_col_buf + i * 4,
+              cb_col_buf + i * (2 - chroma_subsamp_y) * (2 - chroma_subsamp_x),
+              cr_col_buf + i * (2 - chroma_subsamp_y) * (2 - chroma_subsamp_x),
+              2, (2 - chroma_subsamp_x),
+              AOMMIN(luma_subblock_size_y >> 1, height / 2 - y) - i, 1,
+              bit_depth, chroma_subsamp_y, chroma_subsamp_x, mc_identity);
+        }
+      }
+
+      if (overlap && y) {
+        if (x) {
+          hor_boundary_overlap(y_line_buf + (x << 1), luma_stride, y_col_buf, 2,
+                               y_line_buf + (x << 1), luma_stride, 2, 2);
+
+          hor_boundary_overlap(cb_line_buf + x * (2 >> chroma_subsamp_x),
+                               chroma_stride, cb_col_buf, 2 >> chroma_subsamp_x,
+                               cb_line_buf + x * (2 >> chroma_subsamp_x),
+                               chroma_stride, 2 >> chroma_subsamp_x,
+                               2 >> chroma_subsamp_y);
+
+          hor_boundary_overlap(cr_line_buf + x * (2 >> chroma_subsamp_x),
+                               chroma_stride, cr_col_buf, 2 >> chroma_subsamp_x,
+                               cr_line_buf + x * (2 >> chroma_subsamp_x),
+                               chroma_stride, 2 >> chroma_subsamp_x,
+                               2 >> chroma_subsamp_y);
+        }
+
+        hor_boundary_overlap(
+            y_line_buf + ((x ? x + 1 : 0) << 1), luma_stride,
+            luma_grain_block + luma_offset_y * luma_grain_stride +
+                luma_offset_x + (x ? 2 : 0),
+            luma_grain_stride, y_line_buf + ((x ? x + 1 : 0) << 1), luma_stride,
+            AOMMIN(luma_subblock_size_x - ((x ? 1 : 0) << 1),
+                   width - ((x ? x + 1 : 0) << 1)),
+            2);
+
+        hor_boundary_overlap(
+            cb_line_buf + ((x ? x + 1 : 0) << (1 - chroma_subsamp_x)),
+            chroma_stride,
+            cb_grain_block + chroma_offset_y * chroma_grain_stride +
+                chroma_offset_x + ((x ? 1 : 0) << (1 - chroma_subsamp_x)),
+            chroma_grain_stride,
+            cb_line_buf + ((x ? x + 1 : 0) << (1 - chroma_subsamp_x)),
+            chroma_stride,
+            AOMMIN(chroma_subblock_size_x -
+                       ((x ? 1 : 0) << (1 - chroma_subsamp_x)),
+                   (width - ((x ? x + 1 : 0) << 1)) >> chroma_subsamp_x),
+            2 >> chroma_subsamp_y);
+
+        hor_boundary_overlap(
+            cr_line_buf + ((x ? x + 1 : 0) << (1 - chroma_subsamp_x)),
+            chroma_stride,
+            cr_grain_block + chroma_offset_y * chroma_grain_stride +
+                chroma_offset_x + ((x ? 1 : 0) << (1 - chroma_subsamp_x)),
+            chroma_grain_stride,
+            cr_line_buf + ((x ? x + 1 : 0) << (1 - chroma_subsamp_x)),
+            chroma_stride,
+            AOMMIN(chroma_subblock_size_x -
+                       ((x ? 1 : 0) << (1 - chroma_subsamp_x)),
+                   (width - ((x ? x + 1 : 0) << 1)) >> chroma_subsamp_x),
+            2 >> chroma_subsamp_y);
+
+        if (use_high_bit_depth) {
+          add_noise_to_block_hbd(
+              params, (uint16_t *)luma + (y << 1) * luma_stride + (x << 1),
+              (uint16_t *)cb + (y << (1 - chroma_subsamp_y)) * chroma_stride +
+                  (x << ((1 - chroma_subsamp_x))),
+              (uint16_t *)cr + (y << (1 - chroma_subsamp_y)) * chroma_stride +
+                  (x << ((1 - chroma_subsamp_x))),
+              luma_stride, chroma_stride, y_line_buf + (x << 1),
+              cb_line_buf + (x << (1 - chroma_subsamp_x)),
+              cr_line_buf + (x << (1 - chroma_subsamp_x)), luma_stride,
+              chroma_stride, 1,
+              AOMMIN(luma_subblock_size_x >> 1, width / 2 - x), bit_depth,
+              chroma_subsamp_y, chroma_subsamp_x, mc_identity);
+        } else {
+          add_noise_to_block(
+              params, luma + (y << 1) * luma_stride + (x << 1),
+              cb + (y << (1 - chroma_subsamp_y)) * chroma_stride +
+                  (x << ((1 - chroma_subsamp_x))),
+              cr + (y << (1 - chroma_subsamp_y)) * chroma_stride +
+                  (x << ((1 - chroma_subsamp_x))),
+              luma_stride, chroma_stride, y_line_buf + (x << 1),
+              cb_line_buf + (x << (1 - chroma_subsamp_x)),
+              cr_line_buf + (x << (1 - chroma_subsamp_x)), luma_stride,
+              chroma_stride, 1,
+              AOMMIN(luma_subblock_size_x >> 1, width / 2 - x), bit_depth,
+              chroma_subsamp_y, chroma_subsamp_x, mc_identity);
+        }
+      }
+
+      int i = overlap && y ? 1 : 0;
+      int j = overlap && x ? 1 : 0;
+
+      if (use_high_bit_depth) {
+        add_noise_to_block_hbd(
+            params,
+            (uint16_t *)luma + ((y + i) << 1) * luma_stride + ((x + j) << 1),
+            (uint16_t *)cb +
+                ((y + i) << (1 - chroma_subsamp_y)) * chroma_stride +
+                ((x + j) << (1 - chroma_subsamp_x)),
+            (uint16_t *)cr +
+                ((y + i) << (1 - chroma_subsamp_y)) * chroma_stride +
+                ((x + j) << (1 - chroma_subsamp_x)),
+            luma_stride, chroma_stride,
+            luma_grain_block + (luma_offset_y + (i << 1)) * luma_grain_stride +
+                luma_offset_x + (j << 1),
+            cb_grain_block +
+                (chroma_offset_y + (i << (1 - chroma_subsamp_y))) *
+                    chroma_grain_stride +
+                chroma_offset_x + (j << (1 - chroma_subsamp_x)),
+            cr_grain_block +
+                (chroma_offset_y + (i << (1 - chroma_subsamp_y))) *
+                    chroma_grain_stride +
+                chroma_offset_x + (j << (1 - chroma_subsamp_x)),
+            luma_grain_stride, chroma_grain_stride,
+            AOMMIN(luma_subblock_size_y >> 1, height / 2 - y) - i,
+            AOMMIN(luma_subblock_size_x >> 1, width / 2 - x) - j, bit_depth,
+            chroma_subsamp_y, chroma_subsamp_x, mc_identity);
+      } else {
+        add_noise_to_block(
+            params, luma + ((y + i) << 1) * luma_stride + ((x + j) << 1),
+            cb + ((y + i) << (1 - chroma_subsamp_y)) * chroma_stride +
+                ((x + j) << (1 - chroma_subsamp_x)),
+            cr + ((y + i) << (1 - chroma_subsamp_y)) * chroma_stride +
+                ((x + j) << (1 - chroma_subsamp_x)),
+            luma_stride, chroma_stride,
+            luma_grain_block + (luma_offset_y + (i << 1)) * luma_grain_stride +
+                luma_offset_x + (j << 1),
+            cb_grain_block +
+                (chroma_offset_y + (i << (1 - chroma_subsamp_y))) *
+                    chroma_grain_stride +
+                chroma_offset_x + (j << (1 - chroma_subsamp_x)),
+            cr_grain_block +
+                (chroma_offset_y + (i << (1 - chroma_subsamp_y))) *
+                    chroma_grain_stride +
+                chroma_offset_x + (j << (1 - chroma_subsamp_x)),
+            luma_grain_stride, chroma_grain_stride,
+            AOMMIN(luma_subblock_size_y >> 1, height / 2 - y) - i,
+            AOMMIN(luma_subblock_size_x >> 1, width / 2 - x) - j, bit_depth,
+            chroma_subsamp_y, chroma_subsamp_x, mc_identity);
+      }
+
+      if (overlap) {
+        if (x) {
+          // Copy overlapped column bufer to line buffer
+          copy_area(y_col_buf + (luma_subblock_size_y << 1), 2,
+                    y_line_buf + (x << 1), luma_stride, 2, 2);
+
+          copy_area(
+              cb_col_buf + (chroma_subblock_size_y << (1 - chroma_subsamp_x)),
+              2 >> chroma_subsamp_x,
+              cb_line_buf + (x << (1 - chroma_subsamp_x)), chroma_stride,
+              2 >> chroma_subsamp_x, 2 >> chroma_subsamp_y);
+
+          copy_area(
+              cr_col_buf + (chroma_subblock_size_y << (1 - chroma_subsamp_x)),
+              2 >> chroma_subsamp_x,
+              cr_line_buf + (x << (1 - chroma_subsamp_x)), chroma_stride,
+              2 >> chroma_subsamp_x, 2 >> chroma_subsamp_y);
+        }
+
+        // Copy grain to the line buffer for overlap with a bottom block
+        copy_area(
+            luma_grain_block +
+                (luma_offset_y + luma_subblock_size_y) * luma_grain_stride +
+                luma_offset_x + ((x ? 2 : 0)),
+            luma_grain_stride, y_line_buf + ((x ? x + 1 : 0) << 1), luma_stride,
+            AOMMIN(luma_subblock_size_x, width - (x << 1)) - (x ? 2 : 0), 2);
+
+        copy_area(cb_grain_block +
+                      (chroma_offset_y + chroma_subblock_size_y) *
+                          chroma_grain_stride +
+                      chroma_offset_x + (x ? 2 >> chroma_subsamp_x : 0),
+                  chroma_grain_stride,
+                  cb_line_buf + ((x ? x + 1 : 0) << (1 - chroma_subsamp_x)),
+                  chroma_stride,
+                  AOMMIN(chroma_subblock_size_x,
+                         ((width - (x << 1)) >> chroma_subsamp_x)) -
+                      (x ? 2 >> chroma_subsamp_x : 0),
+                  2 >> chroma_subsamp_y);
+
+        copy_area(cr_grain_block +
+                      (chroma_offset_y + chroma_subblock_size_y) *
+                          chroma_grain_stride +
+                      chroma_offset_x + (x ? 2 >> chroma_subsamp_x : 0),
+                  chroma_grain_stride,
+                  cr_line_buf + ((x ? x + 1 : 0) << (1 - chroma_subsamp_x)),
+                  chroma_stride,
+                  AOMMIN(chroma_subblock_size_x,
+                         ((width - (x << 1)) >> chroma_subsamp_x)) -
+                      (x ? 2 >> chroma_subsamp_x : 0),
+                  2 >> chroma_subsamp_y);
+
+        // Copy grain to the column buffer for overlap with the next block to
+        // the right
+
+        copy_area(luma_grain_block + luma_offset_y * luma_grain_stride +
+                      luma_offset_x + luma_subblock_size_x,
+                  luma_grain_stride, y_col_buf, 2, 2,
+                  AOMMIN(luma_subblock_size_y + 2, height - (y << 1)));
+
+        copy_area(cb_grain_block + chroma_offset_y * chroma_grain_stride +
+                      chroma_offset_x + chroma_subblock_size_x,
+                  chroma_grain_stride, cb_col_buf, 2 >> chroma_subsamp_x,
+                  2 >> chroma_subsamp_x,
+                  AOMMIN(chroma_subblock_size_y + (2 >> chroma_subsamp_y),
+                         (height - (y << 1)) >> chroma_subsamp_y));
+
+        copy_area(cr_grain_block + chroma_offset_y * chroma_grain_stride +
+                      chroma_offset_x + chroma_subblock_size_x,
+                  chroma_grain_stride, cr_col_buf, 2 >> chroma_subsamp_x,
+                  2 >> chroma_subsamp_x,
+                  AOMMIN(chroma_subblock_size_y + (2 >> chroma_subsamp_y),
+                         (height - (y << 1)) >> chroma_subsamp_y));
+      }
+    }
+  }
+
+  dealloc_arrays(params, &pred_pos_luma, &pred_pos_chroma, &luma_grain_block,
+                 &cb_grain_block, &cr_grain_block, &y_line_buf, &cb_line_buf,
+                 &cr_line_buf, &y_col_buf, &cb_col_buf, &cr_col_buf);
+  return 0;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.h
new file mode 100644
index 0000000000..e7daf80976
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.h
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\file
+ * \brief Describes film grain parameters and film grain synthesis
+ *
+ */
+#ifndef AOM_AOM_DSP_GRAIN_SYNTHESIS_H_
+#define AOM_AOM_DSP_GRAIN_SYNTHESIS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_image.h"
+
+/*!\brief Structure containing film grain synthesis parameters for a frame
+ *
+ * This structure contains input parameters for film grain synthesis
+ */
+typedef struct {
+  // This structure is compared element-by-element in the function
+  // av1_check_grain_params_equiv: this function must be updated if any changes
+  // are made to this structure.
+  int apply_grain;
+
+  int update_parameters;
+
+  // 8 bit values
+  int scaling_points_y[14][2];
+  int num_y_points;  // value: 0..14
+
+  // 8 bit values
+  int scaling_points_cb[10][2];
+  int num_cb_points;  // value: 0..10
+
+  // 8 bit values
+  int scaling_points_cr[10][2];
+  int num_cr_points;  // value: 0..10
+
+  int scaling_shift;  // values : 8..11
+
+  int ar_coeff_lag;  // values:  0..3
+
+  // 8 bit values
+  int ar_coeffs_y[24];
+  int ar_coeffs_cb[25];
+  int ar_coeffs_cr[25];
+
+  // Shift value: AR coeffs range
+  // 6: [-2, 2)
+  // 7: [-1, 1)
+  // 8: [-0.5, 0.5)
+  // 9: [-0.25, 0.25)
+  int ar_coeff_shift;  // values : 6..9
+
+  int cb_mult;       // 8 bits
+  int cb_luma_mult;  // 8 bits
+  int cb_offset;     // 9 bits
+
+  int cr_mult;       // 8 bits
+  int cr_luma_mult;  // 8 bits
+  int cr_offset;     // 9 bits
+
+  int overlap_flag;
+
+  int clip_to_restricted_range;
+
+  unsigned int bit_depth;  // video bit depth
+
+  int chroma_scaling_from_luma;
+
+  int grain_scale_shift;
+
+  uint16_t random_seed;
+  // This structure is compared element-by-element in the function
+  // av1_check_grain_params_equiv: this function must be updated if any changes
+  // are made to this structure.
+} aom_film_grain_t;
+
+/*!\brief Check if two film grain parameters structs are equivalent
+ *
+ * Check if two film grain parameters are equal, except for the
+ * update_parameters and random_seed elements which are ignored.
+ *
+ * \param[in]    pa               The first set of parameters to compare
+ * \param[in]    pb               The second set of parameters to compare
+ * \return       Returns 1 if the params are equivalent, 0 otherwise
+ */
+static INLINE int av1_check_grain_params_equiv(
+    const aom_film_grain_t *const pa, const aom_film_grain_t *const pb) {
+  if (pa->apply_grain != pb->apply_grain) return 0;
+  // Don't compare update_parameters
+
+  if (pa->num_y_points != pb->num_y_points) return 0;
+  if (memcmp(pa->scaling_points_y, pb->scaling_points_y,
+             pa->num_y_points * 2 * sizeof(*pa->scaling_points_y)) != 0)
+    return 0;
+
+  if (pa->num_cb_points != pb->num_cb_points) return 0;
+  if (memcmp(pa->scaling_points_cb, pb->scaling_points_cb,
+             pa->num_cb_points * 2 * sizeof(*pa->scaling_points_cb)) != 0)
+    return 0;
+
+  if (pa->num_cr_points != pb->num_cr_points) return 0;
+  if (memcmp(pa->scaling_points_cr, pb->scaling_points_cr,
+             pa->num_cr_points * 2 * sizeof(*pa->scaling_points_cr)) != 0)
+    return 0;
+
+  if (pa->scaling_shift != pb->scaling_shift) return 0;
+  if (pa->ar_coeff_lag != pb->ar_coeff_lag) return 0;
+
+  const int num_pos = 2 * pa->ar_coeff_lag * (pa->ar_coeff_lag + 1);
+  if (memcmp(pa->ar_coeffs_y, pb->ar_coeffs_y,
+             num_pos * sizeof(*pa->ar_coeffs_y)) != 0)
+    return 0;
+  if (memcmp(pa->ar_coeffs_cb, pb->ar_coeffs_cb,
+             num_pos * sizeof(*pa->ar_coeffs_cb)) != 0)
+    return 0;
+  if (memcmp(pa->ar_coeffs_cr, pb->ar_coeffs_cr,
+             num_pos * sizeof(*pa->ar_coeffs_cr)) != 0)
+    return 0;
+
+  if (pa->ar_coeff_shift != pb->ar_coeff_shift) return 0;
+
+  if (pa->cb_mult != pb->cb_mult) return 0;
+  if (pa->cb_luma_mult != pb->cb_luma_mult) return 0;
+  if (pa->cb_offset != pb->cb_offset) return 0;
+
+  if (pa->cr_mult != pb->cr_mult) return 0;
+  if (pa->cr_luma_mult != pb->cr_luma_mult) return 0;
+  if (pa->cr_offset != pb->cr_offset) return 0;
+
+  if (pa->overlap_flag != pb->overlap_flag) return 0;
+  if (pa->clip_to_restricted_range != pb->clip_to_restricted_range) return 0;
+  if (pa->bit_depth != pb->bit_depth) return 0;
+  if (pa->chroma_scaling_from_luma != pb->chroma_scaling_from_luma) return 0;
+  if (pa->grain_scale_shift != pb->grain_scale_shift) return 0;
+
+  return 1;
+}
+
+/*!\brief Add film grain
+ *
+ * Add film grain to an image
+ *
+ * Returns 0 for success, -1 for failure
+ *
+ * \param[in]    grain_params     Grain parameters
+ * \param[in]    luma             luma plane
+ * \param[in]    cb               cb plane
+ * \param[in]    cr               cr plane
+ * \param[in]    height           luma plane height
+ * \param[in]    width            luma plane width
+ * \param[in]    luma_stride      luma plane stride
+ * \param[in]    chroma_stride    chroma plane stride
+ */
+int av1_add_film_grain_run(const aom_film_grain_t *grain_params, uint8_t *luma,
+                           uint8_t *cb, uint8_t *cr, int height, int width,
+                           int luma_stride, int chroma_stride,
+                           int use_high_bit_depth, int chroma_subsamp_y,
+                           int chroma_subsamp_x, int mc_identity);
+
+/*!\brief Add film grain
+ *
+ * Add film grain to an image
+ *
+ * Returns 0 for success, -1 for failure
+ *
+ * \param[in]    grain_params     Grain parameters
+ * \param[in]    src              Source image
+ * \param[out]   dst              Resulting image with grain
+ */
+int av1_add_film_grain(const aom_film_grain_t *grain_params,
+                       const aom_image_t *src, aom_image_t *dst);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_DSP_GRAIN_SYNTHESIS_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_table.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_table.h
new file mode 100644
index 0000000000..559d7e9f49
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_table.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\file
+ * \brief A table mapping from time to corresponding film grain parameters.
+ *
+ * In order to apply grain synthesis in the decoder, the film grain parameters
+ * need to be signalled in the encoder. The film grain parameters are time
+ * varying, and for two-pass encoding (and denoiser implementation flexibility)
+ * it is common to denoise the video and do parameter estimation before encoding
+ * the denoised video.
+ *
+ * The film grain table is used to provide this flexibility and is used as a
+ * parameter that is passed to the encoder.
+ *
+ * Further, if regraining is to be done in say a single pass mode, or in two
+ * pass within the encoder (before frames are added to the lookahead buffer),
+ * this data structure can be used to keep track of on-the-fly estimated grain
+ * parameters, that are then extracted from the table before the encoded frame
+ * is written.
+ */
+#ifndef AOM_AOM_DSP_GRAIN_TABLE_H_
+#define AOM_AOM_DSP_GRAIN_TABLE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.h"
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h"
+
+typedef struct aom_film_grain_table_entry_t {
+  aom_film_grain_t params;
+  int64_t start_time;
+  int64_t end_time;
+  struct aom_film_grain_table_entry_t *next;
+} aom_film_grain_table_entry_t;
+
+typedef struct {
+  aom_film_grain_table_entry_t *head;
+  aom_film_grain_table_entry_t *tail;
+} aom_film_grain_table_t;
+
+/*!\brief Add a mapping from [time_stamp, end_time) to the given grain
+ * parameters
+ *
+ * \param[in/out] table      The grain table
+ * \param[in]     time_stamp The start time stamp
+ * \param[in]     end_stamp  The end time_stamp
+ * \param[in]     grain      The grain parameters
+ */
+void aom_film_grain_table_append(aom_film_grain_table_t *table,
+                                 int64_t time_stamp, int64_t end_time,
+                                 const aom_film_grain_t *grain);
+
+/*!\brief Look-up (and optionally erase) the grain parameters for the given time
+ *
+ * \param[in]  table      The grain table
+ * \param[in]  time_stamp The start time stamp
+ * \param[in]  end_stamp  The end time_stamp
+ * \param[in]  erase      Whether the time segment can be deleted
+ * \param[out] grain      The output grain parameters
+ */
+int aom_film_grain_table_lookup(aom_film_grain_table_t *t, int64_t time_stamp,
+                                int64_t end_time, int erase,
+                                aom_film_grain_t *grain);
+
+/*!\brief Reads the grain table from a file.
+ *
+ * \param[out]  table       The grain table
+ * \param[in]   filename    The file to read from
+ * \param[in]   error_info  Error info for tracking errors
+ */
+aom_codec_err_t aom_film_grain_table_read(
+    aom_film_grain_table_t *table, const char *filename,
+    struct aom_internal_error_info *error_info);
+
+/*!\brief Writes the grain table from a file.
+ *
+ * \param[out]  table       The grain table
+ * \param[in]   filename    The file to read from
+ * \param[in]   error_info  Error info for tracking errors
+ */
+aom_codec_err_t aom_film_grain_table_write(
+    const aom_film_grain_table_t *t, const char *filename,
+    struct aom_internal_error_info *error_info);
+
+void aom_film_grain_table_free(aom_film_grain_table_t *t);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // AOM_AOM_DSP_GRAIN_TABLE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/intrapred.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/intrapred.c
new file mode 100644
index 0000000000..ccc3785995
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/intrapred.c
@@ -0,0 +1,813 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include <math.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/intrapred_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/bitops.h"
+
+static INLINE void v_predictor(uint8_t *dst, ptrdiff_t stride, int bw, int bh,
+                               const uint8_t *above, const uint8_t *left) {
+  int r;
+  (void)left;
+
+  for (r = 0; r < bh; r++) {
+    memcpy(dst, above, bw);
+    dst += stride;
+  }
+}
+
+static INLINE void h_predictor(uint8_t *dst, ptrdiff_t stride, int bw, int bh,
+                               const uint8_t *above, const uint8_t *left) {
+  int r;
+  (void)above;
+
+  for (r = 0; r < bh; r++) {
+    memset(dst, left[r], bw);
+    dst += stride;
+  }
+}
+
+static INLINE int abs_diff(int a, int b) { return (a > b) ? a - b : b - a; }
+
+static INLINE uint16_t paeth_predictor_single(uint16_t left, uint16_t top,
+                                              uint16_t top_left) {
+  const int base = top + left - top_left;
+  const int p_left = abs_diff(base, left);
+  const int p_top = abs_diff(base, top);
+  const int p_top_left = abs_diff(base, top_left);
+
+  // Return nearest to base of left, top and top_left.
+  return (p_left <= p_top && p_left <= p_top_left)
+             ? left
+             : (p_top <= p_top_left) ? top : top_left;
+}
+
+static INLINE void paeth_predictor(uint8_t *dst, ptrdiff_t stride, int bw,
+                                   int bh, const uint8_t *above,
+                                   const uint8_t *left) {
+  int r, c;
+  const uint8_t ytop_left = above[-1];
+
+  for (r = 0; r < bh; r++) {
+    for (c = 0; c < bw; c++)
+      dst[c] = (uint8_t)paeth_predictor_single(left[r], above[c], ytop_left);
+    dst += stride;
+  }
+}
+
+// Some basic checks on weights for smooth predictor.
+#define sm_weights_sanity_checks(weights_w, weights_h, weights_scale, \
+                                 pred_scale)                          \
+  assert(weights_w[0] < weights_scale);                               \
+  assert(weights_h[0] < weights_scale);                               \
+  assert(weights_scale - weights_w[bw - 1] < weights_scale);          \
+  assert(weights_scale - weights_h[bh - 1] < weights_scale);          \
+  assert(pred_scale < 31)  // ensures no overflow when calculating predictor.
+
+#define divide_round(value, bits) (((value) + (1 << ((bits)-1))) >> (bits))
+
+static INLINE void smooth_predictor(uint8_t *dst, ptrdiff_t stride, int bw,
+                                    int bh, const uint8_t *above,
+                                    const uint8_t *left) {
+  const uint8_t below_pred = left[bh - 1];   // estimated by bottom-left pixel
+  const uint8_t right_pred = above[bw - 1];  // estimated by top-right pixel
+  const uint8_t *const sm_weights_w = sm_weight_arrays + bw;
+  const uint8_t *const sm_weights_h = sm_weight_arrays + bh;
+  // scale = 2 * 2^sm_weight_log2_scale
+  const int log2_scale = 1 + sm_weight_log2_scale;
+  const uint16_t scale = (1 << sm_weight_log2_scale);
+  sm_weights_sanity_checks(sm_weights_w, sm_weights_h, scale,
+                           log2_scale + sizeof(*dst));
+  int r;
+  for (r = 0; r < bh; ++r) {
+    int c;
+    for (c = 0; c < bw; ++c) {
+      const uint8_t pixels[] = { above[c], below_pred, left[r], right_pred };
+      const uint8_t weights[] = { sm_weights_h[r], scale - sm_weights_h[r],
+                                  sm_weights_w[c], scale - sm_weights_w[c] };
+      uint32_t this_pred = 0;
+      int i;
+      assert(scale >= sm_weights_h[r] && scale >= sm_weights_w[c]);
+      for (i = 0; i < 4; ++i) {
+        this_pred += weights[i] * pixels[i];
+      }
+      dst[c] = divide_round(this_pred, log2_scale);
+    }
+    dst += stride;
+  }
+}
+
+static INLINE void smooth_v_predictor(uint8_t *dst, ptrdiff_t stride, int bw,
+                                      int bh, const uint8_t *above,
+                                      const uint8_t *left) {
+  const uint8_t below_pred = left[bh - 1];  // estimated by bottom-left pixel
+  const uint8_t *const sm_weights = sm_weight_arrays + bh;
+  // scale = 2^sm_weight_log2_scale
+  const int log2_scale = sm_weight_log2_scale;
+  const uint16_t scale = (1 << sm_weight_log2_scale);
+  sm_weights_sanity_checks(sm_weights, sm_weights, scale,
+                           log2_scale + sizeof(*dst));
+
+  int r;
+  for (r = 0; r < bh; r++) {
+    int c;
+    for (c = 0; c < bw; ++c) {
+      const uint8_t pixels[] = { above[c], below_pred };
+      const uint8_t weights[] = { sm_weights[r], scale - sm_weights[r] };
+      uint32_t this_pred = 0;
+      assert(scale >= sm_weights[r]);
+      int i;
+      for (i = 0; i < 2; ++i) {
+        this_pred += weights[i] * pixels[i];
+      }
+      dst[c] = divide_round(this_pred, log2_scale);
+    }
+    dst += stride;
+  }
+}
+
+static INLINE void smooth_h_predictor(uint8_t *dst, ptrdiff_t stride, int bw,
+                                      int bh, const uint8_t *above,
+                                      const uint8_t *left) {
+  const uint8_t right_pred = above[bw - 1];  // estimated by top-right pixel
+  const uint8_t *const sm_weights = sm_weight_arrays + bw;
+  // scale = 2^sm_weight_log2_scale
+  const int log2_scale = sm_weight_log2_scale;
+  const uint16_t scale = (1 << sm_weight_log2_scale);
+  sm_weights_sanity_checks(sm_weights, sm_weights, scale,
+                           log2_scale + sizeof(*dst));
+
+  int r;
+  for (r = 0; r < bh; r++) {
+    int c;
+    for (c = 0; c < bw; ++c) {
+      const uint8_t pixels[] = { left[r], right_pred };
+      const uint8_t weights[] = { sm_weights[c], scale - sm_weights[c] };
+      uint32_t this_pred = 0;
+      assert(scale >= sm_weights[c]);
+      int i;
+      for (i = 0; i < 2; ++i) {
+        this_pred += weights[i] * pixels[i];
+      }
+      dst[c] = divide_round(this_pred, log2_scale);
+    }
+    dst += stride;
+  }
+}
+
+static INLINE void dc_128_predictor(uint8_t *dst, ptrdiff_t stride, int bw,
+                                    int bh, const uint8_t *above,
+                                    const uint8_t *left) {
+  int r;
+  (void)above;
+  (void)left;
+
+  for (r = 0; r < bh; r++) {
+    memset(dst, 128, bw);
+    dst += stride;
+  }
+}
+
+static INLINE void dc_left_predictor(uint8_t *dst, ptrdiff_t stride, int bw,
+                                     int bh, const uint8_t *above,
+                                     const uint8_t *left) {
+  int i, r, expected_dc, sum = 0;
+  (void)above;
+
+  for (i = 0; i < bh; i++) sum += left[i];
+  expected_dc = (sum + (bh >> 1)) / bh;
+
+  for (r = 0; r < bh; r++) {
+    memset(dst, expected_dc, bw);
+    dst += stride;
+  }
+}
+
+static INLINE void dc_top_predictor(uint8_t *dst, ptrdiff_t stride, int bw,
+                                    int bh, const uint8_t *above,
+                                    const uint8_t *left) {
+  int i, r, expected_dc, sum = 0;
+  (void)left;
+
+  for (i = 0; i < bw; i++) sum += above[i];
+  expected_dc = (sum + (bw >> 1)) / bw;
+
+  for (r = 0; r < bh; r++) {
+    memset(dst, expected_dc, bw);
+    dst += stride;
+  }
+}
+
+static INLINE void dc_predictor(uint8_t *dst, ptrdiff_t stride, int bw, int bh,
+                                const uint8_t *above, const uint8_t *left) {
+  int i, r, expected_dc, sum = 0;
+  const int count = bw + bh;
+
+  for (i = 0; i < bw; i++) {
+    sum += above[i];
+  }
+  for (i = 0; i < bh; i++) {
+    sum += left[i];
+  }
+
+  expected_dc = (sum + (count >> 1)) / count;
+
+  for (r = 0; r < bh; r++) {
+    memset(dst, expected_dc, bw);
+    dst += stride;
+  }
+}
+
+static INLINE int divide_using_multiply_shift(int num, int shift1,
+                                              int multiplier, int shift2) {
+  const int interm = num >> shift1;
+  return interm * multiplier >> shift2;
+}
+
+// The constants (multiplier and shifts) for a given block size are obtained
+// as follows:
+// - Let sum_w_h =  block width + block height.
+// - Shift 'sum_w_h' right until we reach an odd number. Let the number of
+// shifts for that block size be called 'shift1' (see the parameter in
+// dc_predictor_rect() function), and let the odd number be 'd'. [d has only 2
+// possible values: d = 3 for a 1:2 rect block and d = 5 for a 1:4 rect
+// block].
+// - Find multipliers for (i) dividing by 3, and (ii) dividing by 5,
+// using the "Algorithm 1" in:
+// http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=1467632
+// by ensuring that m + n = 16 (in that algorithm). This ensures that our 2nd
+// shift will be 16, regardless of the block size.
+
+// Note: For low bitdepth, assembly code may be optimized by using smaller
+// constants for smaller block sizes, where the range of the 'sum' is
+// restricted to fewer bits.
+
+#define DC_MULTIPLIER_1X2 0x5556
+#define DC_MULTIPLIER_1X4 0x3334
+
+#define DC_SHIFT2 16
+
+static INLINE void dc_predictor_rect(uint8_t *dst, ptrdiff_t stride, int bw,
+                                     int bh, const uint8_t *above,
+                                     const uint8_t *left, int shift1,
+                                     int multiplier) {
+  int sum = 0;
+
+  for (int i = 0; i < bw; i++) {
+    sum += above[i];
+  }
+  for (int i = 0; i < bh; i++) {
+    sum += left[i];
+  }
+
+  const int expected_dc = divide_using_multiply_shift(
+      sum + ((bw + bh) >> 1), shift1, multiplier, DC_SHIFT2);
+  assert(expected_dc < (1 << 8));
+
+  for (int r = 0; r < bh; r++) {
+    memset(dst, expected_dc, bw);
+    dst += stride;
+  }
+}
+
+#undef DC_SHIFT2
+
+void aom_dc_predictor_4x8_c(uint8_t *dst, ptrdiff_t stride,
+                            const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 4, 8, above, left, 2, DC_MULTIPLIER_1X2);
+}
+
+void aom_dc_predictor_8x4_c(uint8_t *dst, ptrdiff_t stride,
+                            const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 8, 4, above, left, 2, DC_MULTIPLIER_1X2);
+}
+
+void aom_dc_predictor_4x16_c(uint8_t *dst, ptrdiff_t stride,
+                             const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 4, 16, above, left, 2, DC_MULTIPLIER_1X4);
+}
+
+void aom_dc_predictor_16x4_c(uint8_t *dst, ptrdiff_t stride,
+                             const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 16, 4, above, left, 2, DC_MULTIPLIER_1X4);
+}
+
+void aom_dc_predictor_8x16_c(uint8_t *dst, ptrdiff_t stride,
+                             const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 8, 16, above, left, 3, DC_MULTIPLIER_1X2);
+}
+
+void aom_dc_predictor_16x8_c(uint8_t *dst, ptrdiff_t stride,
+                             const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 16, 8, above, left, 3, DC_MULTIPLIER_1X2);
+}
+
+void aom_dc_predictor_8x32_c(uint8_t *dst, ptrdiff_t stride,
+                             const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 8, 32, above, left, 3, DC_MULTIPLIER_1X4);
+}
+
+void aom_dc_predictor_32x8_c(uint8_t *dst, ptrdiff_t stride,
+                             const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 32, 8, above, left, 3, DC_MULTIPLIER_1X4);
+}
+
+void aom_dc_predictor_16x32_c(uint8_t *dst, ptrdiff_t stride,
+                              const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 16, 32, above, left, 4, DC_MULTIPLIER_1X2);
+}
+
+void aom_dc_predictor_32x16_c(uint8_t *dst, ptrdiff_t stride,
+                              const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 32, 16, above, left, 4, DC_MULTIPLIER_1X2);
+}
+
+void aom_dc_predictor_16x64_c(uint8_t *dst, ptrdiff_t stride,
+                              const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 16, 64, above, left, 4, DC_MULTIPLIER_1X4);
+}
+
+void aom_dc_predictor_64x16_c(uint8_t *dst, ptrdiff_t stride,
+                              const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 64, 16, above, left, 4, DC_MULTIPLIER_1X4);
+}
+
+void aom_dc_predictor_32x64_c(uint8_t *dst, ptrdiff_t stride,
+                              const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 32, 64, above, left, 5, DC_MULTIPLIER_1X2);
+}
+
+void aom_dc_predictor_64x32_c(uint8_t *dst, ptrdiff_t stride,
+                              const uint8_t *above, const uint8_t *left) {
+  dc_predictor_rect(dst, stride, 64, 32, above, left, 5, DC_MULTIPLIER_1X2);
+}
+
+#undef DC_MULTIPLIER_1X2
+#undef DC_MULTIPLIER_1X4
+
+static INLINE void highbd_v_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
+                                      int bh, const uint16_t *above,
+                                      const uint16_t *left, int bd) {
+  int r;
+  (void)left;
+  (void)bd;
+  for (r = 0; r < bh; r++) {
+    memcpy(dst, above, bw * sizeof(uint16_t));
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_h_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
+                                      int bh, const uint16_t *above,
+                                      const uint16_t *left, int bd) {
+  int r;
+  (void)above;
+  (void)bd;
+  for (r = 0; r < bh; r++) {
+    aom_memset16(dst, left[r], bw);
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_paeth_predictor(uint16_t *dst, ptrdiff_t stride,
+                                          int bw, int bh, const uint16_t *above,
+                                          const uint16_t *left, int bd) {
+  int r, c;
+  const uint16_t ytop_left = above[-1];
+  (void)bd;
+
+  for (r = 0; r < bh; r++) {
+    for (c = 0; c < bw; c++)
+      dst[c] = paeth_predictor_single(left[r], above[c], ytop_left);
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_smooth_predictor(uint16_t *dst, ptrdiff_t stride,
+                                           int bw, int bh,
+                                           const uint16_t *above,
+                                           const uint16_t *left, int bd) {
+  (void)bd;
+  const uint16_t below_pred = left[bh - 1];   // estimated by bottom-left pixel
+  const uint16_t right_pred = above[bw - 1];  // estimated by top-right pixel
+  const uint8_t *const sm_weights_w = sm_weight_arrays + bw;
+  const uint8_t *const sm_weights_h = sm_weight_arrays + bh;
+  // scale = 2 * 2^sm_weight_log2_scale
+  const int log2_scale = 1 + sm_weight_log2_scale;
+  const uint16_t scale = (1 << sm_weight_log2_scale);
+  sm_weights_sanity_checks(sm_weights_w, sm_weights_h, scale,
+                           log2_scale + sizeof(*dst));
+  int r;
+  for (r = 0; r < bh; ++r) {
+    int c;
+    for (c = 0; c < bw; ++c) {
+      const uint16_t pixels[] = { above[c], below_pred, left[r], right_pred };
+      const uint8_t weights[] = { sm_weights_h[r], scale - sm_weights_h[r],
+                                  sm_weights_w[c], scale - sm_weights_w[c] };
+      uint32_t this_pred = 0;
+      int i;
+      assert(scale >= sm_weights_h[r] && scale >= sm_weights_w[c]);
+      for (i = 0; i < 4; ++i) {
+        this_pred += weights[i] * pixels[i];
+      }
+      dst[c] = divide_round(this_pred, log2_scale);
+    }
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_smooth_v_predictor(uint16_t *dst, ptrdiff_t stride,
+                                             int bw, int bh,
+                                             const uint16_t *above,
+                                             const uint16_t *left, int bd) {
+  (void)bd;
+  const uint16_t below_pred = left[bh - 1];  // estimated by bottom-left pixel
+  const uint8_t *const sm_weights = sm_weight_arrays + bh;
+  // scale = 2^sm_weight_log2_scale
+  const int log2_scale = sm_weight_log2_scale;
+  const uint16_t scale = (1 << sm_weight_log2_scale);
+  sm_weights_sanity_checks(sm_weights, sm_weights, scale,
+                           log2_scale + sizeof(*dst));
+
+  int r;
+  for (r = 0; r < bh; r++) {
+    int c;
+    for (c = 0; c < bw; ++c) {
+      const uint16_t pixels[] = { above[c], below_pred };
+      const uint8_t weights[] = { sm_weights[r], scale - sm_weights[r] };
+      uint32_t this_pred = 0;
+      assert(scale >= sm_weights[r]);
+      int i;
+      for (i = 0; i < 2; ++i) {
+        this_pred += weights[i] * pixels[i];
+      }
+      dst[c] = divide_round(this_pred, log2_scale);
+    }
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_smooth_h_predictor(uint16_t *dst, ptrdiff_t stride,
+                                             int bw, int bh,
+                                             const uint16_t *above,
+                                             const uint16_t *left, int bd) {
+  (void)bd;
+  const uint16_t right_pred = above[bw - 1];  // estimated by top-right pixel
+  const uint8_t *const sm_weights = sm_weight_arrays + bw;
+  // scale = 2^sm_weight_log2_scale
+  const int log2_scale = sm_weight_log2_scale;
+  const uint16_t scale = (1 << sm_weight_log2_scale);
+  sm_weights_sanity_checks(sm_weights, sm_weights, scale,
+                           log2_scale + sizeof(*dst));
+
+  int r;
+  for (r = 0; r < bh; r++) {
+    int c;
+    for (c = 0; c < bw; ++c) {
+      const uint16_t pixels[] = { left[r], right_pred };
+      const uint8_t weights[] = { sm_weights[c], scale - sm_weights[c] };
+      uint32_t this_pred = 0;
+      assert(scale >= sm_weights[c]);
+      int i;
+      for (i = 0; i < 2; ++i) {
+        this_pred += weights[i] * pixels[i];
+      }
+      dst[c] = divide_round(this_pred, log2_scale);
+    }
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_dc_128_predictor(uint16_t *dst, ptrdiff_t stride,
+                                           int bw, int bh,
+                                           const uint16_t *above,
+                                           const uint16_t *left, int bd) {
+  int r;
+  (void)above;
+  (void)left;
+
+  for (r = 0; r < bh; r++) {
+    aom_memset16(dst, 128 << (bd - 8), bw);
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_dc_left_predictor(uint16_t *dst, ptrdiff_t stride,
+                                            int bw, int bh,
+                                            const uint16_t *above,
+                                            const uint16_t *left, int bd) {
+  int i, r, expected_dc, sum = 0;
+  (void)above;
+  (void)bd;
+
+  for (i = 0; i < bh; i++) sum += left[i];
+  expected_dc = (sum + (bh >> 1)) / bh;
+
+  for (r = 0; r < bh; r++) {
+    aom_memset16(dst, expected_dc, bw);
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_dc_top_predictor(uint16_t *dst, ptrdiff_t stride,
+                                           int bw, int bh,
+                                           const uint16_t *above,
+                                           const uint16_t *left, int bd) {
+  int i, r, expected_dc, sum = 0;
+  (void)left;
+  (void)bd;
+
+  for (i = 0; i < bw; i++) sum += above[i];
+  expected_dc = (sum + (bw >> 1)) / bw;
+
+  for (r = 0; r < bh; r++) {
+    aom_memset16(dst, expected_dc, bw);
+    dst += stride;
+  }
+}
+
+static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
+                                       int bh, const uint16_t *above,
+                                       const uint16_t *left, int bd) {
+  int i, r, expected_dc, sum = 0;
+  const int count = bw + bh;
+  (void)bd;
+
+  for (i = 0; i < bw; i++) {
+    sum += above[i];
+  }
+  for (i = 0; i < bh; i++) {
+    sum += left[i];
+  }
+
+  expected_dc = (sum + (count >> 1)) / count;
+
+  for (r = 0; r < bh; r++) {
+    aom_memset16(dst, expected_dc, bw);
+    dst += stride;
+  }
+}
+
+// Obtained similarly as DC_MULTIPLIER_1X2 and DC_MULTIPLIER_1X4 above, but
+// assume 2nd shift of 17 bits instead of 16.
+// Note: Strictly speaking, 2nd shift needs to be 17 only when:
+// - bit depth == 12, and
+// - bw + bh is divisible by 5 (as opposed to divisible by 3).
+// All other cases can use half the multipliers with a shift of 16 instead.
+// This special optimization can be used when writing assembly code.
+#define HIGHBD_DC_MULTIPLIER_1X2 0xAAAB
+// Note: This constant is odd, but a smaller even constant (0x199a) with the
+// appropriate shift should work for neon in 8/10-bit.
+#define HIGHBD_DC_MULTIPLIER_1X4 0x6667
+
+#define HIGHBD_DC_SHIFT2 17
+
+static INLINE void highbd_dc_predictor_rect(uint16_t *dst, ptrdiff_t stride,
+                                            int bw, int bh,
+                                            const uint16_t *above,
+                                            const uint16_t *left, int bd,
+                                            int shift1, uint32_t multiplier) {
+  int sum = 0;
+  (void)bd;
+
+  for (int i = 0; i < bw; i++) {
+    sum += above[i];
+  }
+  for (int i = 0; i < bh; i++) {
+    sum += left[i];
+  }
+
+  const int expected_dc = divide_using_multiply_shift(
+      sum + ((bw + bh) >> 1), shift1, multiplier, HIGHBD_DC_SHIFT2);
+  assert(expected_dc < (1 << bd));
+
+  for (int r = 0; r < bh; r++) {
+    aom_memset16(dst, expected_dc, bw);
+    dst += stride;
+  }
+}
+
+#undef HIGHBD_DC_SHIFT2
+
+void aom_highbd_dc_predictor_4x8_c(uint16_t *dst, ptrdiff_t stride,
+                                   const uint16_t *above, const uint16_t *left,
+                                   int bd) {
+  highbd_dc_predictor_rect(dst, stride, 4, 8, above, left, bd, 2,
+                           HIGHBD_DC_MULTIPLIER_1X2);
+}
+
+void aom_highbd_dc_predictor_8x4_c(uint16_t *dst, ptrdiff_t stride,
+                                   const uint16_t *above, const uint16_t *left,
+                                   int bd) {
+  highbd_dc_predictor_rect(dst, stride, 8, 4, above, left, bd, 2,
+                           HIGHBD_DC_MULTIPLIER_1X2);
+}
+
+void aom_highbd_dc_predictor_4x16_c(uint16_t *dst, ptrdiff_t stride,
+                                    const uint16_t *above, const uint16_t *left,
+                                    int bd) {
+  highbd_dc_predictor_rect(dst, stride, 4, 16, above, left, bd, 2,
+                           HIGHBD_DC_MULTIPLIER_1X4);
+}
+
+void aom_highbd_dc_predictor_16x4_c(uint16_t *dst, ptrdiff_t stride,
+                                    const uint16_t *above, const uint16_t *left,
+                                    int bd) {
+  highbd_dc_predictor_rect(dst, stride, 16, 4, above, left, bd, 2,
+                           HIGHBD_DC_MULTIPLIER_1X4);
+}
+
+void aom_highbd_dc_predictor_8x16_c(uint16_t *dst, ptrdiff_t stride,
+                                    const uint16_t *above, const uint16_t *left,
+                                    int bd) {
+  highbd_dc_predictor_rect(dst, stride, 8, 16, above, left, bd, 3,
+                           HIGHBD_DC_MULTIPLIER_1X2);
+}
+
+void aom_highbd_dc_predictor_16x8_c(uint16_t *dst, ptrdiff_t stride,
+                                    const uint16_t *above, const uint16_t *left,
+                                    int bd) {
+  highbd_dc_predictor_rect(dst, stride, 16, 8, above, left, bd, 3,
+                           HIGHBD_DC_MULTIPLIER_1X2);
+}
+
+void aom_highbd_dc_predictor_8x32_c(uint16_t *dst, ptrdiff_t stride,
+                                    const uint16_t *above, const uint16_t *left,
+                                    int bd) {
+  highbd_dc_predictor_rect(dst, stride, 8, 32, above, left, bd, 3,
+                           HIGHBD_DC_MULTIPLIER_1X4);
+}
+
+void aom_highbd_dc_predictor_32x8_c(uint16_t *dst, ptrdiff_t stride,
+                                    const uint16_t *above, const uint16_t *left,
+                                    int bd) {
+  highbd_dc_predictor_rect(dst, stride, 32, 8, above, left, bd, 3,
+                           HIGHBD_DC_MULTIPLIER_1X4);
+}
+
+void aom_highbd_dc_predictor_16x32_c(uint16_t *dst, ptrdiff_t stride,
+                                     const uint16_t *above,
+                                     const uint16_t *left, int bd) {
+  highbd_dc_predictor_rect(dst, stride, 16, 32, above, left, bd, 4,
+                           HIGHBD_DC_MULTIPLIER_1X2);
+}
+
+void aom_highbd_dc_predictor_32x16_c(uint16_t *dst, ptrdiff_t stride,
+                                     const uint16_t *above,
+                                     const uint16_t *left, int bd) {
+  highbd_dc_predictor_rect(dst, stride, 32, 16, above, left, bd, 4,
+                           HIGHBD_DC_MULTIPLIER_1X2);
+}
+
+void aom_highbd_dc_predictor_16x64_c(uint16_t *dst, ptrdiff_t stride,
+                                     const uint16_t *above,
+                                     const uint16_t *left, int bd) {
+  highbd_dc_predictor_rect(dst, stride, 16, 64, above, left, bd, 4,
+                           HIGHBD_DC_MULTIPLIER_1X4);
+}
+
+void aom_highbd_dc_predictor_64x16_c(uint16_t *dst, ptrdiff_t stride,
+                                     const uint16_t *above,
+                                     const uint16_t *left, int bd) {
+  highbd_dc_predictor_rect(dst, stride, 64, 16, above, left, bd, 4,
+                           HIGHBD_DC_MULTIPLIER_1X4);
+}
+
+void aom_highbd_dc_predictor_32x64_c(uint16_t *dst, ptrdiff_t stride,
+                                     const uint16_t *above,
+                                     const uint16_t *left, int bd) {
+  highbd_dc_predictor_rect(dst, stride, 32, 64, above, left, bd, 5,
+                           HIGHBD_DC_MULTIPLIER_1X2);
+}
+
+void aom_highbd_dc_predictor_64x32_c(uint16_t *dst, ptrdiff_t stride,
+                                     const uint16_t *above,
+                                     const uint16_t *left, int bd) {
+  highbd_dc_predictor_rect(dst, stride, 64, 32, above, left, bd, 5,
+                           HIGHBD_DC_MULTIPLIER_1X2);
+}
+
+#undef HIGHBD_DC_MULTIPLIER_1X2
+#undef HIGHBD_DC_MULTIPLIER_1X4
+
+// This serves as a wrapper function, so that all the prediction functions
+// can be unified and accessed as a pointer array. Note that the boundary
+// above and left are not necessarily used all the time.
+#define intra_pred_sized(type, width, height)                  \
+  void aom_##type##_predictor_##width##x##height##_c(          \
+      uint8_t *dst, ptrdiff_t stride, const uint8_t *above,    \
+      const uint8_t *left) {                                   \
+    type##_predictor(dst, stride, width, height, above, left); \
+  }
+
+#define intra_pred_highbd_sized(type, width, height)                        \
+  void aom_highbd_##type##_predictor_##width##x##height##_c(                \
+      uint16_t *dst, ptrdiff_t stride, const uint16_t *above,               \
+      const uint16_t *left, int bd) {                                       \
+    highbd_##type##_predictor(dst, stride, width, height, above, left, bd); \
+  }
+
+/* clang-format off */
+#if CONFIG_REALTIME_ONLY
+#define intra_pred_rectangular(type) \
+  intra_pred_sized(type, 4, 8) \
+  intra_pred_sized(type, 8, 4) \
+  intra_pred_sized(type, 8, 16) \
+  intra_pred_sized(type, 16, 8) \
+  intra_pred_sized(type, 16, 32) \
+  intra_pred_sized(type, 32, 16) \
+  intra_pred_sized(type, 32, 64) \
+  intra_pred_sized(type, 64, 32) \
+  intra_pred_highbd_sized(type, 4, 8) \
+  intra_pred_highbd_sized(type, 8, 4) \
+  intra_pred_highbd_sized(type, 8, 16) \
+  intra_pred_highbd_sized(type, 16, 8) \
+  intra_pred_highbd_sized(type, 16, 32) \
+  intra_pred_highbd_sized(type, 32, 16) \
+  intra_pred_highbd_sized(type, 32, 64) \
+  intra_pred_highbd_sized(type, 64, 32)
+#else
+#define intra_pred_rectangular(type) \
+  intra_pred_sized(type, 4, 8) \
+  intra_pred_sized(type, 8, 4) \
+  intra_pred_sized(type, 8, 16) \
+  intra_pred_sized(type, 16, 8) \
+  intra_pred_sized(type, 16, 32) \
+  intra_pred_sized(type, 32, 16) \
+  intra_pred_sized(type, 32, 64) \
+  intra_pred_sized(type, 64, 32) \
+  intra_pred_sized(type, 4, 16) \
+  intra_pred_sized(type, 16, 4) \
+  intra_pred_sized(type, 8, 32) \
+  intra_pred_sized(type, 32, 8) \
+  intra_pred_sized(type, 16, 64) \
+  intra_pred_sized(type, 64, 16) \
+  intra_pred_highbd_sized(type, 4, 8) \
+  intra_pred_highbd_sized(type, 8, 4) \
+  intra_pred_highbd_sized(type, 8, 16) \
+  intra_pred_highbd_sized(type, 16, 8) \
+  intra_pred_highbd_sized(type, 16, 32) \
+  intra_pred_highbd_sized(type, 32, 16) \
+  intra_pred_highbd_sized(type, 32, 64) \
+  intra_pred_highbd_sized(type, 64, 32) \
+  intra_pred_highbd_sized(type, 4, 16) \
+  intra_pred_highbd_sized(type, 16, 4) \
+  intra_pred_highbd_sized(type, 8, 32) \
+  intra_pred_highbd_sized(type, 32, 8) \
+  intra_pred_highbd_sized(type, 16, 64) \
+  intra_pred_highbd_sized(type, 64, 16)
+#endif
+
+#define intra_pred_above_4x4(type) \
+  intra_pred_sized(type, 8, 8) \
+  intra_pred_sized(type, 16, 16) \
+  intra_pred_sized(type, 32, 32) \
+  intra_pred_sized(type, 64, 64) \
+  intra_pred_highbd_sized(type, 4, 4) \
+  intra_pred_highbd_sized(type, 8, 8) \
+  intra_pred_highbd_sized(type, 16, 16) \
+  intra_pred_highbd_sized(type, 32, 32) \
+  intra_pred_highbd_sized(type, 64, 64) \
+  intra_pred_rectangular(type)
+#define intra_pred_allsizes(type) \
+  intra_pred_sized(type, 4, 4) \
+  intra_pred_above_4x4(type)
+#define intra_pred_square(type) \
+  intra_pred_sized(type, 4, 4) \
+  intra_pred_sized(type, 8, 8) \
+  intra_pred_sized(type, 16, 16) \
+  intra_pred_sized(type, 32, 32) \
+  intra_pred_sized(type, 64, 64) \
+  intra_pred_highbd_sized(type, 4, 4) \
+  intra_pred_highbd_sized(type, 8, 8) \
+  intra_pred_highbd_sized(type, 16, 16) \
+  intra_pred_highbd_sized(type, 32, 32) \
+  intra_pred_highbd_sized(type, 64, 64)
+
+intra_pred_allsizes(v)
+intra_pred_allsizes(h)
+intra_pred_allsizes(smooth)
+intra_pred_allsizes(smooth_v)
+intra_pred_allsizes(smooth_h)
+intra_pred_allsizes(paeth)
+intra_pred_allsizes(dc_128)
+intra_pred_allsizes(dc_left)
+intra_pred_allsizes(dc_top)
+intra_pred_square(dc)
+/* clang-format on */
+#undef intra_pred_allsizes
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/intrapred_common.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/intrapred_common.h
new file mode 100644
index 0000000000..13bccbb240
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/intrapred_common.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_INTRAPRED_COMMON_H_
+#define AOM_AOM_DSP_INTRAPRED_COMMON_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+// Weights are quadratic from '1' to '1 / block_size', scaled by
+// 2^sm_weight_log2_scale.
+static const int sm_weight_log2_scale = 8;
+
+// max(block_size_wide[BLOCK_LARGEST], block_size_high[BLOCK_LARGEST])
+#define MAX_BLOCK_DIM 64
+
+/* clang-format off */
+static const uint8_t sm_weight_arrays[2 * MAX_BLOCK_DIM] = {
+  // Unused, because we always offset by bs, which is at least 2.
+  0, 0,
+  // bs = 2
+  255, 128,
+  // bs = 4
+  255, 149, 85, 64,
+  // bs = 8
+  255, 197, 146, 105, 73, 50, 37, 32,
+  // bs = 16
+  255, 225, 196, 170, 145, 123, 102, 84, 68, 54, 43, 33, 26, 20, 17, 16,
+  // bs = 32
+  255, 240, 225, 210, 196, 182, 169, 157, 145, 133, 122, 111, 101, 92, 83, 74,
+  66, 59, 52, 45, 39, 34, 29, 25, 21, 17, 14, 12, 10, 9, 8, 8,
+  // bs = 64
+  255, 248, 240, 233, 225, 218, 210, 203, 196, 189, 182, 176, 169, 163, 156,
+  150, 144, 138, 133, 127, 121, 116, 111, 106, 101, 96, 91, 86, 82, 77, 73, 69,
+  65, 61, 57, 54, 50, 47, 44, 41, 38, 35, 32, 29, 27, 25, 22, 20, 18, 16, 15,
+  13, 12, 10, 9, 8, 7, 6, 6, 5, 5, 4, 4, 4,
+};
+/* clang-format on */
+
+#endif  // AOM_AOM_DSP_INTRAPRED_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/loopfilter.c b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/loopfilter.c
new file mode 100644
index 0000000000..a643ac6763
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/loopfilter.c
@@ -0,0 +1,929 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <stdlib.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+static INLINE int8_t signed_char_clamp(int t) {
+  return (int8_t)clamp(t, -128, 127);
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static INLINE int16_t signed_char_clamp_high(int t, int bd) {
+  switch (bd) {
+    case 10: return (int16_t)clamp(t, -128 * 4, 128 * 4 - 1);
+    case 12: return (int16_t)clamp(t, -128 * 16, 128 * 16 - 1);
+    case 8:
+    default: return (int16_t)clamp(t, -128, 128 - 1);
+  }
+}
+#endif
+
+// should we apply any filter at all: 11111111 yes, 00000000 no
+static INLINE int8_t filter_mask2(uint8_t limit, uint8_t blimit, uint8_t p1,
+                                  uint8_t p0, uint8_t q0, uint8_t q1) {
+  int8_t mask = 0;
+  mask |= (abs(p1 - p0) > limit) * -1;
+  mask |= (abs(q1 - q0) > limit) * -1;
+  mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit) * -1;
+  return ~mask;
+}
+
+static INLINE int8_t filter_mask(uint8_t limit, uint8_t blimit, uint8_t p3,
+                                 uint8_t p2, uint8_t p1, uint8_t p0, uint8_t q0,
+                                 uint8_t q1, uint8_t q2, uint8_t q3) {
+  int8_t mask = 0;
+  mask |= (abs(p3 - p2) > limit) * -1;
+  mask |= (abs(p2 - p1) > limit) * -1;
+  mask |= (abs(p1 - p0) > limit) * -1;
+  mask |= (abs(q1 - q0) > limit) * -1;
+  mask |= (abs(q2 - q1) > limit) * -1;
+  mask |= (abs(q3 - q2) > limit) * -1;
+  mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit) * -1;
+  return ~mask;
+}
+
+static INLINE int8_t filter_mask3_chroma(uint8_t limit, uint8_t blimit,
+                                         uint8_t p2, uint8_t p1, uint8_t p0,
+                                         uint8_t q0, uint8_t q1, uint8_t q2) {
+  int8_t mask = 0;
+  mask |= (abs(p2 - p1) > limit) * -1;
+  mask |= (abs(p1 - p0) > limit) * -1;
+  mask |= (abs(q1 - q0) > limit) * -1;
+  mask |= (abs(q2 - q1) > limit) * -1;
+  mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit) * -1;
+  return ~mask;
+}
+
+static INLINE int8_t flat_mask3_chroma(uint8_t thresh, uint8_t p2, uint8_t p1,
+                                       uint8_t p0, uint8_t q0, uint8_t q1,
+                                       uint8_t q2) {
+  int8_t mask = 0;
+  mask |= (abs(p1 - p0) > thresh) * -1;
+  mask |= (abs(q1 - q0) > thresh) * -1;
+  mask |= (abs(p2 - p0) > thresh) * -1;
+  mask |= (abs(q2 - q0) > thresh) * -1;
+  return ~mask;
+}
+
+static INLINE int8_t flat_mask4(uint8_t thresh, uint8_t p3, uint8_t p2,
+                                uint8_t p1, uint8_t p0, uint8_t q0, uint8_t q1,
+                                uint8_t q2, uint8_t q3) {
+  int8_t mask = 0;
+  mask |= (abs(p1 - p0) > thresh) * -1;
+  mask |= (abs(q1 - q0) > thresh) * -1;
+  mask |= (abs(p2 - p0) > thresh) * -1;
+  mask |= (abs(q2 - q0) > thresh) * -1;
+  mask |= (abs(p3 - p0) > thresh) * -1;
+  mask |= (abs(q3 - q0) > thresh) * -1;
+  return ~mask;
+}
+
+// is there high edge variance internal edge: 11111111 yes, 00000000 no
+static INLINE int8_t hev_mask(uint8_t thresh, uint8_t p1, uint8_t p0,
+                              uint8_t q0, uint8_t q1) {
+  int8_t hev = 0;
+  hev |= (abs(p1 - p0) > thresh) * -1;
+  hev |= (abs(q1 - q0) > thresh) * -1;
+  return hev;
+}
+
+static INLINE void filter4(int8_t mask, uint8_t thresh, uint8_t *op1,
+                           uint8_t *op0, uint8_t *oq0, uint8_t *oq1) {
+  int8_t filter1, filter2;
+
+  const int8_t ps1 = (int8_t)(*op1 ^ 0x80);
+  const int8_t ps0 = (int8_t)(*op0 ^ 0x80);
+  const int8_t qs0 = (int8_t)(*oq0 ^ 0x80);
+  const int8_t qs1 = (int8_t)(*oq1 ^ 0x80);
+  const int8_t hev = hev_mask(thresh, *op1, *op0, *oq0, *oq1);
+
+  // add outer taps if we have high edge variance
+  int8_t filter = signed_char_clamp(ps1 - qs1) & hev;
+
+  // inner taps
+  filter = signed_char_clamp(filter + 3 * (qs0 - ps0)) & mask;
+
+  // save bottom 3 bits so that we round one side +4 and the other +3
+  // if it equals 4 we'll set to adjust by -1 to account for the fact
+  // we'd round 3 the other way
+  filter1 = signed_char_clamp(filter + 4) >> 3;
+  filter2 = signed_char_clamp(filter + 3) >> 3;
+
+  *oq0 = (uint8_t)(signed_char_clamp(qs0 - filter1) ^ 0x80);
+  *op0 = (uint8_t)(signed_char_clamp(ps0 + filter2) ^ 0x80);
+
+  // outer tap adjustments
+  filter = ROUND_POWER_OF_TWO(filter1, 1) & ~hev;
+
+  *oq1 = (uint8_t)(signed_char_clamp(qs1 - filter) ^ 0x80);
+  *op1 = (uint8_t)(signed_char_clamp(ps1 + filter) ^ 0x80);
+}
+
+void aom_lpf_horizontal_4_c(uint8_t *s, int p /* pitch */,
+                            const uint8_t *blimit, const uint8_t *limit,
+                            const uint8_t *thresh) {
+  int i;
+  int count = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < count; ++i) {
+    const uint8_t p1 = s[-2 * p], p0 = s[-p];
+    const uint8_t q0 = s[0 * p], q1 = s[1 * p];
+    const int8_t mask = filter_mask2(*limit, *blimit, p1, p0, q0, q1);
+    filter4(mask, *thresh, s - 2 * p, s - 1 * p, s, s + 1 * p);
+    ++s;
+  }
+}
+
+void aom_lpf_horizontal_4_dual_c(uint8_t *s, int p, const uint8_t *blimit0,
+                                 const uint8_t *limit0, const uint8_t *thresh0,
+                                 const uint8_t *blimit1, const uint8_t *limit1,
+                                 const uint8_t *thresh1) {
+  aom_lpf_horizontal_4_c(s, p, blimit0, limit0, thresh0);
+  aom_lpf_horizontal_4_c(s + 4, p, blimit1, limit1, thresh1);
+}
+
+void aom_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit,
+                          const uint8_t *limit, const uint8_t *thresh) {
+  int i;
+  int count = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < count; ++i) {
+    const uint8_t p1 = s[-2], p0 = s[-1];
+    const uint8_t q0 = s[0], q1 = s[1];
+    const int8_t mask = filter_mask2(*limit, *blimit, p1, p0, q0, q1);
+    filter4(mask, *thresh, s - 2, s - 1, s, s + 1);
+    s += pitch;
+  }
+}
+
+void aom_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0,
+                               const uint8_t *limit0, const uint8_t *thresh0,
+                               const uint8_t *blimit1, const uint8_t *limit1,
+                               const uint8_t *thresh1) {
+  aom_lpf_vertical_4_c(s, pitch, blimit0, limit0, thresh0);
+  aom_lpf_vertical_4_c(s + 4 * pitch, pitch, blimit1, limit1, thresh1);
+}
+
+static INLINE void filter6(int8_t mask, uint8_t thresh, int8_t flat,
+                           uint8_t *op2, uint8_t *op1, uint8_t *op0,
+                           uint8_t *oq0, uint8_t *oq1, uint8_t *oq2) {
+  if (flat && mask) {
+    const uint8_t p2 = *op2, p1 = *op1, p0 = *op0;
+    const uint8_t q0 = *oq0, q1 = *oq1, q2 = *oq2;
+
+    // 5-tap filter [1, 2, 2, 2, 1]
+    *op1 = ROUND_POWER_OF_TWO(p2 * 3 + p1 * 2 + p0 * 2 + q0, 3);
+    *op0 = ROUND_POWER_OF_TWO(p2 + p1 * 2 + p0 * 2 + q0 * 2 + q1, 3);
+    *oq0 = ROUND_POWER_OF_TWO(p1 + p0 * 2 + q0 * 2 + q1 * 2 + q2, 3);
+    *oq1 = ROUND_POWER_OF_TWO(p0 + q0 * 2 + q1 * 2 + q2 * 3, 3);
+  } else {
+    filter4(mask, thresh, op1, op0, oq0, oq1);
+  }
+}
+
+static INLINE void filter8(int8_t mask, uint8_t thresh, int8_t flat,
+                           uint8_t *op3, uint8_t *op2, uint8_t *op1,
+                           uint8_t *op0, uint8_t *oq0, uint8_t *oq1,
+                           uint8_t *oq2, uint8_t *oq3) {
+  if (flat && mask) {
+    const uint8_t p3 = *op3, p2 = *op2, p1 = *op1, p0 = *op0;
+    const uint8_t q0 = *oq0, q1 = *oq1, q2 = *oq2, q3 = *oq3;
+
+    // 7-tap filter [1, 1, 1, 2, 1, 1, 1]
+    *op2 = ROUND_POWER_OF_TWO(p3 + p3 + p3 + 2 * p2 + p1 + p0 + q0, 3);
+    *op1 = ROUND_POWER_OF_TWO(p3 + p3 + p2 + 2 * p1 + p0 + q0 + q1, 3);
+    *op0 = ROUND_POWER_OF_TWO(p3 + p2 + p1 + 2 * p0 + q0 + q1 + q2, 3);
+    *oq0 = ROUND_POWER_OF_TWO(p2 + p1 + p0 + 2 * q0 + q1 + q2 + q3, 3);
+    *oq1 = ROUND_POWER_OF_TWO(p1 + p0 + q0 + 2 * q1 + q2 + q3 + q3, 3);
+    *oq2 = ROUND_POWER_OF_TWO(p0 + q0 + q1 + 2 * q2 + q3 + q3 + q3, 3);
+  } else {
+    filter4(mask, thresh, op1, op0, oq0, oq1);
+  }
+}
+
+void aom_lpf_horizontal_6_c(uint8_t *s, int p, const uint8_t *blimit,
+                            const uint8_t *limit, const uint8_t *thresh) {
+  int i;
+  int count = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < count; ++i) {
+    const uint8_t p2 = s[-3 * p], p1 = s[-2 * p], p0 = s[-p];
+    const uint8_t q0 = s[0 * p], q1 = s[1 * p], q2 = s[2 * p];
+
+    const int8_t mask =
+        filter_mask3_chroma(*limit, *blimit, p2, p1, p0, q0, q1, q2);
+    const int8_t flat = flat_mask3_chroma(1, p2, p1, p0, q0, q1, q2);
+    filter6(mask, *thresh, flat, s - 3 * p, s - 2 * p, s - 1 * p, s, s + 1 * p,
+            s + 2 * p);
+    ++s;
+  }
+}
+
+void aom_lpf_horizontal_6_dual_c(uint8_t *s, int p, const uint8_t *blimit0,
+                                 const uint8_t *limit0, const uint8_t *thresh0,
+                                 const uint8_t *blimit1, const uint8_t *limit1,
+                                 const uint8_t *thresh1) {
+  aom_lpf_horizontal_6_c(s, p, blimit0, limit0, thresh0);
+  aom_lpf_horizontal_6_c(s + 4, p, blimit1, limit1, thresh1);
+}
+
+void aom_lpf_horizontal_8_c(uint8_t *s, int p, const uint8_t *blimit,
+                            const uint8_t *limit, const uint8_t *thresh) {
+  int i;
+  int count = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < count; ++i) {
+    const uint8_t p3 = s[-4 * p], p2 = s[-3 * p], p1 = s[-2 * p], p0 = s[-p];
+    const uint8_t q0 = s[0 * p], q1 = s[1 * p], q2 = s[2 * p], q3 = s[3 * p];
+
+    const int8_t mask =
+        filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3);
+    const int8_t flat = flat_mask4(1, p3, p2, p1, p0, q0, q1, q2, q3);
+    filter8(mask, *thresh, flat, s - 4 * p, s - 3 * p, s - 2 * p, s - 1 * p, s,
+            s + 1 * p, s + 2 * p, s + 3 * p);
+    ++s;
+  }
+}
+
+void aom_lpf_horizontal_8_dual_c(uint8_t *s, int p, const uint8_t *blimit0,
+                                 const uint8_t *limit0, const uint8_t *thresh0,
+                                 const uint8_t *blimit1, const uint8_t *limit1,
+                                 const uint8_t *thresh1) {
+  aom_lpf_horizontal_8_c(s, p, blimit0, limit0, thresh0);
+  aom_lpf_horizontal_8_c(s + 4, p, blimit1, limit1, thresh1);
+}
+
+void aom_lpf_vertical_6_c(uint8_t *s, int pitch, const uint8_t *blimit,
+                          const uint8_t *limit, const uint8_t *thresh) {
+  int i;
+  int count = 4;
+
+  for (i = 0; i < count; ++i) {
+    const uint8_t p2 = s[-3], p1 = s[-2], p0 = s[-1];
+    const uint8_t q0 = s[0], q1 = s[1], q2 = s[2];
+    const int8_t mask =
+        filter_mask3_chroma(*limit, *blimit, p2, p1, p0, q0, q1, q2);
+    const int8_t flat = flat_mask3_chroma(1, p2, p1, p0, q0, q1, q2);
+    filter6(mask, *thresh, flat, s - 3, s - 2, s - 1, s, s + 1, s + 2);
+    s += pitch;
+  }
+}
+
+void aom_lpf_vertical_6_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0,
+                               const uint8_t *limit0, const uint8_t *thresh0,
+                               const uint8_t *blimit1, const uint8_t *limit1,
+                               const uint8_t *thresh1) {
+  aom_lpf_vertical_6_c(s, pitch, blimit0, limit0, thresh0);
+  aom_lpf_vertical_6_c(s + 4 * pitch, pitch, blimit1, limit1, thresh1);
+}
+
+void aom_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit,
+                          const uint8_t *limit, const uint8_t *thresh) {
+  int i;
+  int count = 4;
+
+  for (i = 0; i < count; ++i) {
+    const uint8_t p3 = s[-4], p2 = s[-3], p1 = s[-2], p0 = s[-1];
+    const uint8_t q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3];
+    const int8_t mask =
+        filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3);
+    const int8_t flat = flat_mask4(1, p3, p2, p1, p0, q0, q1, q2, q3);
+    filter8(mask, *thresh, flat, s - 4, s - 3, s - 2, s - 1, s, s + 1, s + 2,
+            s + 3);
+    s += pitch;
+  }
+}
+
+void aom_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0,
+                               const uint8_t *limit0, const uint8_t *thresh0,
+                               const uint8_t *blimit1, const uint8_t *limit1,
+                               const uint8_t *thresh1) {
+  aom_lpf_vertical_8_c(s, pitch, blimit0, limit0, thresh0);
+  aom_lpf_vertical_8_c(s + 4 * pitch, pitch, blimit1, limit1, thresh1);
+}
+
+static INLINE void filter14(int8_t mask, uint8_t thresh, int8_t flat,
+                            int8_t flat2, uint8_t *op6, uint8_t *op5,
+                            uint8_t *op4, uint8_t *op3, uint8_t *op2,
+                            uint8_t *op1, uint8_t *op0, uint8_t *oq0,
+                            uint8_t *oq1, uint8_t *oq2, uint8_t *oq3,
+                            uint8_t *oq4, uint8_t *oq5, uint8_t *oq6) {
+  if (flat2 && flat && mask) {
+    const uint8_t p6 = *op6, p5 = *op5, p4 = *op4, p3 = *op3, p2 = *op2,
+                  p1 = *op1, p0 = *op0;
+    const uint8_t q0 = *oq0, q1 = *oq1, q2 = *oq2, q3 = *oq3, q4 = *oq4,
+                  q5 = *oq5, q6 = *oq6;
+
+    // 13-tap filter [1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1]
+    *op5 = ROUND_POWER_OF_TWO(p6 * 7 + p5 * 2 + p4 * 2 + p3 + p2 + p1 + p0 + q0,
+                              4);
+    *op4 = ROUND_POWER_OF_TWO(
+        p6 * 5 + p5 * 2 + p4 * 2 + p3 * 2 + p2 + p1 + p0 + q0 + q1, 4);
+    *op3 = ROUND_POWER_OF_TWO(
+        p6 * 4 + p5 + p4 * 2 + p3 * 2 + p2 * 2 + p1 + p0 + q0 + q1 + q2, 4);
+    *op2 = ROUND_POWER_OF_TWO(
+        p6 * 3 + p5 + p4 + p3 * 2 + p2 * 2 + p1 * 2 + p0 + q0 + q1 + q2 + q3,
+        4);
+    *op1 = ROUND_POWER_OF_TWO(p6 * 2 + p5 + p4 + p3 + p2 * 2 + p1 * 2 + p0 * 2 +
+                                  q0 + q1 + q2 + q3 + q4,
+                              4);
+    *op0 = ROUND_POWER_OF_TWO(p6 + p5 + p4 + p3 + p2 + p1 * 2 + p0 * 2 +
+                                  q0 * 2 + q1 + q2 + q3 + q4 + q5,
+                              4);
+    *oq0 = ROUND_POWER_OF_TWO(p5 + p4 + p3 + p2 + p1 + p0 * 2 + q0 * 2 +
+                                  q1 * 2 + q2 + q3 + q4 + q5 + q6,
+                              4);
+    *oq1 = ROUND_POWER_OF_TWO(p4 + p3 + p2 + p1 + p0 + q0 * 2 + q1 * 2 +
+                                  q2 * 2 + q3 + q4 + q5 + q6 * 2,
+                              4);
+    *oq2 = ROUND_POWER_OF_TWO(
+        p3 + p2 + p1 + p0 + q0 + q1 * 2 + q2 * 2 + q3 * 2 + q4 + q5 + q6 * 3,
+        4);
+    *oq3 = ROUND_POWER_OF_TWO(
+        p2 + p1 + p0 + q0 + q1 + q2 * 2 + q3 * 2 + q4 * 2 + q5 + q6 * 4, 4);
+    *oq4 = ROUND_POWER_OF_TWO(
+        p1 + p0 + q0 + q1 + q2 + q3 * 2 + q4 * 2 + q5 * 2 + q6 * 5, 4);
+    *oq5 = ROUND_POWER_OF_TWO(p0 + q0 + q1 + q2 + q3 + q4 * 2 + q5 * 2 + q6 * 7,
+                              4);
+  } else {
+    filter8(mask, thresh, flat, op3, op2, op1, op0, oq0, oq1, oq2, oq3);
+  }
+}
+
+static void mb_lpf_horizontal_edge_w(uint8_t *s, int p, const uint8_t *blimit,
+                                     const uint8_t *limit,
+                                     const uint8_t *thresh, int count) {
+  int i;
+  int step = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < step * count; ++i) {
+    const uint8_t p6 = s[-7 * p], p5 = s[-6 * p], p4 = s[-5 * p],
+                  p3 = s[-4 * p], p2 = s[-3 * p], p1 = s[-2 * p], p0 = s[-p];
+    const uint8_t q0 = s[0 * p], q1 = s[1 * p], q2 = s[2 * p], q3 = s[3 * p],
+                  q4 = s[4 * p], q5 = s[5 * p], q6 = s[6 * p];
+    const int8_t mask =
+        filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3);
+    const int8_t flat = flat_mask4(1, p3, p2, p1, p0, q0, q1, q2, q3);
+    const int8_t flat2 = flat_mask4(1, p6, p5, p4, p0, q0, q4, q5, q6);
+
+    filter14(mask, *thresh, flat, flat2, s - 7 * p, s - 6 * p, s - 5 * p,
+             s - 4 * p, s - 3 * p, s - 2 * p, s - 1 * p, s, s + 1 * p,
+             s + 2 * p, s + 3 * p, s + 4 * p, s + 5 * p, s + 6 * p);
+    ++s;
+  }
+}
+
+void aom_lpf_horizontal_14_c(uint8_t *s, int p, const uint8_t *blimit,
+                             const uint8_t *limit, const uint8_t *thresh) {
+  mb_lpf_horizontal_edge_w(s, p, blimit, limit, thresh, 1);
+}
+
+void aom_lpf_horizontal_14_dual_c(uint8_t *s, int p, const uint8_t *blimit0,
+                                  const uint8_t *limit0, const uint8_t *thresh0,
+                                  const uint8_t *blimit1, const uint8_t *limit1,
+                                  const uint8_t *thresh1) {
+  mb_lpf_horizontal_edge_w(s, p, blimit0, limit0, thresh0, 1);
+  mb_lpf_horizontal_edge_w(s + 4, p, blimit1, limit1, thresh1, 1);
+}
+
+static void mb_lpf_vertical_edge_w(uint8_t *s, int p, const uint8_t *blimit,
+                                   const uint8_t *limit, const uint8_t *thresh,
+                                   int count) {
+  int i;
+
+  for (i = 0; i < count; ++i) {
+    const uint8_t p6 = s[-7], p5 = s[-6], p4 = s[-5], p3 = s[-4], p2 = s[-3],
+                  p1 = s[-2], p0 = s[-1];
+    const uint8_t q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3], q4 = s[4],
+                  q5 = s[5], q6 = s[6];
+    const int8_t mask =
+        filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3);
+    const int8_t flat = flat_mask4(1, p3, p2, p1, p0, q0, q1, q2, q3);
+    const int8_t flat2 = flat_mask4(1, p6, p5, p4, p0, q0, q4, q5, q6);
+
+    filter14(mask, *thresh, flat, flat2, s - 7, s - 6, s - 5, s - 4, s - 3,
+             s - 2, s - 1, s, s + 1, s + 2, s + 3, s + 4, s + 5, s + 6);
+    s += p;
+  }
+}
+
+void aom_lpf_vertical_14_c(uint8_t *s, int p, const uint8_t *blimit,
+                           const uint8_t *limit, const uint8_t *thresh) {
+  mb_lpf_vertical_edge_w(s, p, blimit, limit, thresh, 4);
+}
+
+void aom_lpf_vertical_14_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0,
+                                const uint8_t *limit0, const uint8_t *thresh0,
+                                const uint8_t *blimit1, const uint8_t *limit1,
+                                const uint8_t *thresh1) {
+  mb_lpf_vertical_edge_w(s, pitch, blimit0, limit0, thresh0, 4);
+  mb_lpf_vertical_edge_w(s + 4 * pitch, pitch, blimit1, limit1, thresh1, 4);
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+// Should we apply any filter at all: 11111111 yes, 00000000 no ?
+static INLINE int8_t highbd_filter_mask2(uint8_t limit, uint8_t blimit,
+                                         uint16_t p1, uint16_t p0, uint16_t q0,
+                                         uint16_t q1, int bd) {
+  int8_t mask = 0;
+  int16_t limit16 = (uint16_t)limit << (bd - 8);
+  int16_t blimit16 = (uint16_t)blimit << (bd - 8);
+  mask |= (abs(p1 - p0) > limit16) * -1;
+  mask |= (abs(q1 - q0) > limit16) * -1;
+  mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit16) * -1;
+  return ~mask;
+}
+
+// Should we apply any filter at all: 11111111 yes, 00000000 no ?
+static INLINE int8_t highbd_filter_mask(uint8_t limit, uint8_t blimit,
+                                        uint16_t p3, uint16_t p2, uint16_t p1,
+                                        uint16_t p0, uint16_t q0, uint16_t q1,
+                                        uint16_t q2, uint16_t q3, int bd) {
+  int8_t mask = 0;
+  int16_t limit16 = (uint16_t)limit << (bd - 8);
+  int16_t blimit16 = (uint16_t)blimit << (bd - 8);
+  mask |= (abs(p3 - p2) > limit16) * -1;
+  mask |= (abs(p2 - p1) > limit16) * -1;
+  mask |= (abs(p1 - p0) > limit16) * -1;
+  mask |= (abs(q1 - q0) > limit16) * -1;
+  mask |= (abs(q2 - q1) > limit16) * -1;
+  mask |= (abs(q3 - q2) > limit16) * -1;
+  mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit16) * -1;
+  return ~mask;
+}
+
+static INLINE int8_t highbd_filter_mask3_chroma(uint8_t limit, uint8_t blimit,
+                                                uint16_t p2, uint16_t p1,
+                                                uint16_t p0, uint16_t q0,
+                                                uint16_t q1, uint16_t q2,
+                                                int bd) {
+  int8_t mask = 0;
+  int16_t limit16 = (uint16_t)limit << (bd - 8);
+  int16_t blimit16 = (uint16_t)blimit << (bd - 8);
+  mask |= (abs(p2 - p1) > limit16) * -1;
+  mask |= (abs(p1 - p0) > limit16) * -1;
+  mask |= (abs(q1 - q0) > limit16) * -1;
+  mask |= (abs(q2 - q1) > limit16) * -1;
+  mask |= (abs(p0 - q0) * 2 + abs(p1 - q1) / 2 > blimit16) * -1;
+  return ~mask;
+}
+
+static INLINE int8_t highbd_flat_mask3_chroma(uint8_t thresh, uint16_t p2,
+                                              uint16_t p1, uint16_t p0,
+                                              uint16_t q0, uint16_t q1,
+                                              uint16_t q2, int bd) {
+  int8_t mask = 0;
+  int16_t thresh16 = (uint16_t)thresh << (bd - 8);
+  mask |= (abs(p1 - p0) > thresh16) * -1;
+  mask |= (abs(q1 - q0) > thresh16) * -1;
+  mask |= (abs(p2 - p0) > thresh16) * -1;
+  mask |= (abs(q2 - q0) > thresh16) * -1;
+  return ~mask;
+}
+
+static INLINE int8_t highbd_flat_mask4(uint8_t thresh, uint16_t p3, uint16_t p2,
+                                       uint16_t p1, uint16_t p0, uint16_t q0,
+                                       uint16_t q1, uint16_t q2, uint16_t q3,
+                                       int bd) {
+  int8_t mask = 0;
+  int16_t thresh16 = (uint16_t)thresh << (bd - 8);
+  mask |= (abs(p1 - p0) > thresh16) * -1;
+  mask |= (abs(q1 - q0) > thresh16) * -1;
+  mask |= (abs(p2 - p0) > thresh16) * -1;
+  mask |= (abs(q2 - q0) > thresh16) * -1;
+  mask |= (abs(p3 - p0) > thresh16) * -1;
+  mask |= (abs(q3 - q0) > thresh16) * -1;
+  return ~mask;
+}
+
+// Is there high edge variance internal edge:
+// 11111111_11111111 yes, 00000000_00000000 no ?
+static INLINE int16_t highbd_hev_mask(uint8_t thresh, uint16_t p1, uint16_t p0,
+                                      uint16_t q0, uint16_t q1, int bd) {
+  int16_t hev = 0;
+  int16_t thresh16 = (uint16_t)thresh << (bd - 8);
+  hev |= (abs(p1 - p0) > thresh16) * -1;
+  hev |= (abs(q1 - q0) > thresh16) * -1;
+  return hev;
+}
+
+static INLINE void highbd_filter4(int8_t mask, uint8_t thresh, uint16_t *op1,
+                                  uint16_t *op0, uint16_t *oq0, uint16_t *oq1,
+                                  int bd) {
+  int16_t filter1, filter2;
+  // ^0x80 equivalent to subtracting 0x80 from the values to turn them
+  // into -128 to +127 instead of 0 to 255.
+  int shift = bd - 8;
+  const int16_t ps1 = (int16_t)*op1 - (0x80 << shift);
+  const int16_t ps0 = (int16_t)*op0 - (0x80 << shift);
+  const int16_t qs0 = (int16_t)*oq0 - (0x80 << shift);
+  const int16_t qs1 = (int16_t)*oq1 - (0x80 << shift);
+  const int16_t hev = highbd_hev_mask(thresh, *op1, *op0, *oq0, *oq1, bd);
+
+  // Add outer taps if we have high edge variance.
+  int16_t filter = signed_char_clamp_high(ps1 - qs1, bd) & hev;
+
+  // Inner taps.
+  filter = signed_char_clamp_high(filter + 3 * (qs0 - ps0), bd) & mask;
+
+  // Save bottom 3 bits so that we round one side +4 and the other +3
+  // if it equals 4 we'll set to adjust by -1 to account for the fact
+  // we'd round 3 the other way.
+  filter1 = signed_char_clamp_high(filter + 4, bd) >> 3;
+  filter2 = signed_char_clamp_high(filter + 3, bd) >> 3;
+
+  *oq0 = signed_char_clamp_high(qs0 - filter1, bd) + (0x80 << shift);
+  *op0 = signed_char_clamp_high(ps0 + filter2, bd) + (0x80 << shift);
+
+  // Outer tap adjustments.
+  filter = ROUND_POWER_OF_TWO(filter1, 1) & ~hev;
+
+  *oq1 = signed_char_clamp_high(qs1 - filter, bd) + (0x80 << shift);
+  *op1 = signed_char_clamp_high(ps1 + filter, bd) + (0x80 << shift);
+}
+
+void aom_highbd_lpf_horizontal_4_c(uint16_t *s, int p /* pitch */,
+                                   const uint8_t *blimit, const uint8_t *limit,
+                                   const uint8_t *thresh, int bd) {
+  int i;
+  int count = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < count; ++i) {
+    const uint16_t p1 = s[-2 * p];
+    const uint16_t p0 = s[-p];
+    const uint16_t q0 = s[0 * p];
+    const uint16_t q1 = s[1 * p];
+    const int8_t mask =
+        highbd_filter_mask2(*limit, *blimit, p1, p0, q0, q1, bd);
+    highbd_filter4(mask, *thresh, s - 2 * p, s - 1 * p, s, s + 1 * p, bd);
+    ++s;
+  }
+}
+
+void aom_highbd_lpf_horizontal_4_dual_c(
+    uint16_t *s, int p, const uint8_t *blimit0, const uint8_t *limit0,
+    const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1,
+    const uint8_t *thresh1, int bd) {
+  aom_highbd_lpf_horizontal_4_c(s, p, blimit0, limit0, thresh0, bd);
+  aom_highbd_lpf_horizontal_4_c(s + 4, p, blimit1, limit1, thresh1, bd);
+}
+
+void aom_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit,
+                                 const uint8_t *limit, const uint8_t *thresh,
+                                 int bd) {
+  int i;
+  int count = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < count; ++i) {
+    const uint16_t p1 = s[-2], p0 = s[-1];
+    const uint16_t q0 = s[0], q1 = s[1];
+    const int8_t mask =
+        highbd_filter_mask2(*limit, *blimit, p1, p0, q0, q1, bd);
+    highbd_filter4(mask, *thresh, s - 2, s - 1, s, s + 1, bd);
+    s += pitch;
+  }
+}
+
+void aom_highbd_lpf_vertical_4_dual_c(
+    uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0,
+    const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1,
+    const uint8_t *thresh1, int bd) {
+  aom_highbd_lpf_vertical_4_c(s, pitch, blimit0, limit0, thresh0, bd);
+  aom_highbd_lpf_vertical_4_c(s + 4 * pitch, pitch, blimit1, limit1, thresh1,
+                              bd);
+}
+
+static INLINE void highbd_filter6(int8_t mask, uint8_t thresh, int8_t flat,
+                                  uint16_t *op2, uint16_t *op1, uint16_t *op0,
+                                  uint16_t *oq0, uint16_t *oq1, uint16_t *oq2,
+                                  int bd) {
+  if (flat && mask) {
+    const uint16_t p2 = *op2, p1 = *op1, p0 = *op0;
+    const uint16_t q0 = *oq0, q1 = *oq1, q2 = *oq2;
+
+    // 5-tap filter [1, 2, 2, 2, 1]
+    *op1 = ROUND_POWER_OF_TWO(p2 * 3 + p1 * 2 + p0 * 2 + q0, 3);
+    *op0 = ROUND_POWER_OF_TWO(p2 + p1 * 2 + p0 * 2 + q0 * 2 + q1, 3);
+    *oq0 = ROUND_POWER_OF_TWO(p1 + p0 * 2 + q0 * 2 + q1 * 2 + q2, 3);
+    *oq1 = ROUND_POWER_OF_TWO(p0 + q0 * 2 + q1 * 2 + q2 * 3, 3);
+  } else {
+    highbd_filter4(mask, thresh, op1, op0, oq0, oq1, bd);
+  }
+}
+
+static INLINE void highbd_filter8(int8_t mask, uint8_t thresh, int8_t flat,
+                                  uint16_t *op3, uint16_t *op2, uint16_t *op1,
+                                  uint16_t *op0, uint16_t *oq0, uint16_t *oq1,
+                                  uint16_t *oq2, uint16_t *oq3, int bd) {
+  if (flat && mask) {
+    const uint16_t p3 = *op3, p2 = *op2, p1 = *op1, p0 = *op0;
+    const uint16_t q0 = *oq0, q1 = *oq1, q2 = *oq2, q3 = *oq3;
+
+    // 7-tap filter [1, 1, 1, 2, 1, 1, 1]
+    *op2 = ROUND_POWER_OF_TWO(p3 + p3 + p3 + 2 * p2 + p1 + p0 + q0, 3);
+    *op1 = ROUND_POWER_OF_TWO(p3 + p3 + p2 + 2 * p1 + p0 + q0 + q1, 3);
+    *op0 = ROUND_POWER_OF_TWO(p3 + p2 + p1 + 2 * p0 + q0 + q1 + q2, 3);
+    *oq0 = ROUND_POWER_OF_TWO(p2 + p1 + p0 + 2 * q0 + q1 + q2 + q3, 3);
+    *oq1 = ROUND_POWER_OF_TWO(p1 + p0 + q0 + 2 * q1 + q2 + q3 + q3, 3);
+    *oq2 = ROUND_POWER_OF_TWO(p0 + q0 + q1 + 2 * q2 + q3 + q3 + q3, 3);
+  } else {
+    highbd_filter4(mask, thresh, op1, op0, oq0, oq1, bd);
+  }
+}
+
+void aom_highbd_lpf_horizontal_8_c(uint16_t *s, int p, const uint8_t *blimit,
+                                   const uint8_t *limit, const uint8_t *thresh,
+                                   int bd) {
+  int i;
+  int count = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < count; ++i) {
+    const uint16_t p3 = s[-4 * p], p2 = s[-3 * p], p1 = s[-2 * p], p0 = s[-p];
+    const uint16_t q0 = s[0 * p], q1 = s[1 * p], q2 = s[2 * p], q3 = s[3 * p];
+
+    const int8_t mask =
+        highbd_filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd);
+    const int8_t flat =
+        highbd_flat_mask4(1, p3, p2, p1, p0, q0, q1, q2, q3, bd);
+    highbd_filter8(mask, *thresh, flat, s - 4 * p, s - 3 * p, s - 2 * p,
+                   s - 1 * p, s, s + 1 * p, s + 2 * p, s + 3 * p, bd);
+    ++s;
+  }
+}
+
+void aom_highbd_lpf_horizontal_6_c(uint16_t *s, int p, const uint8_t *blimit,
+                                   const uint8_t *limit, const uint8_t *thresh,
+                                   int bd) {
+  int i;
+  int count = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < count; ++i) {
+    const uint16_t p2 = s[-3 * p], p1 = s[-2 * p], p0 = s[-p];
+    const uint16_t q0 = s[0 * p], q1 = s[1 * p], q2 = s[2 * p];
+
+    const int8_t mask =
+        highbd_filter_mask3_chroma(*limit, *blimit, p2, p1, p0, q0, q1, q2, bd);
+    const int8_t flat = highbd_flat_mask3_chroma(1, p2, p1, p0, q0, q1, q2, bd);
+    highbd_filter6(mask, *thresh, flat, s - 3 * p, s - 2 * p, s - 1 * p, s,
+                   s + 1 * p, s + 2 * p, bd);
+    ++s;
+  }
+}
+
+void aom_highbd_lpf_horizontal_6_dual_c(
+    uint16_t *s, int p, const uint8_t *blimit0, const uint8_t *limit0,
+    const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1,
+    const uint8_t *thresh1, int bd) {
+  aom_highbd_lpf_horizontal_6_c(s, p, blimit0, limit0, thresh0, bd);
+  aom_highbd_lpf_horizontal_6_c(s + 4, p, blimit1, limit1, thresh1, bd);
+}
+
+void aom_highbd_lpf_horizontal_8_dual_c(
+    uint16_t *s, int p, const uint8_t *blimit0, const uint8_t *limit0,
+    const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1,
+    const uint8_t *thresh1, int bd) {
+  aom_highbd_lpf_horizontal_8_c(s, p, blimit0, limit0, thresh0, bd);
+  aom_highbd_lpf_horizontal_8_c(s + 4, p, blimit1, limit1, thresh1, bd);
+}
+
+void aom_highbd_lpf_vertical_6_c(uint16_t *s, int pitch, const uint8_t *blimit,
+                                 const uint8_t *limit, const uint8_t *thresh,
+                                 int bd) {
+  int i;
+  int count = 4;
+
+  for (i = 0; i < count; ++i) {
+    const uint16_t p2 = s[-3], p1 = s[-2], p0 = s[-1];
+    const uint16_t q0 = s[0], q1 = s[1], q2 = s[2];
+    const int8_t mask =
+        highbd_filter_mask3_chroma(*limit, *blimit, p2, p1, p0, q0, q1, q2, bd);
+    const int8_t flat = highbd_flat_mask3_chroma(1, p2, p1, p0, q0, q1, q2, bd);
+    highbd_filter6(mask, *thresh, flat, s - 3, s - 2, s - 1, s, s + 1, s + 2,
+                   bd);
+    s += pitch;
+  }
+}
+
+void aom_highbd_lpf_vertical_6_dual_c(
+    uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0,
+    const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1,
+    const uint8_t *thresh1, int bd) {
+  aom_highbd_lpf_vertical_6_c(s, pitch, blimit0, limit0, thresh0, bd);
+  aom_highbd_lpf_vertical_6_c(s + 4 * pitch, pitch, blimit1, limit1, thresh1,
+                              bd);
+}
+
+void aom_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit,
+                                 const uint8_t *limit, const uint8_t *thresh,
+                                 int bd) {
+  int i;
+  int count = 4;
+
+  for (i = 0; i < count; ++i) {
+    const uint16_t p3 = s[-4], p2 = s[-3], p1 = s[-2], p0 = s[-1];
+    const uint16_t q0 = s[0], q1 = s[1], q2 = s[2], q3 = s[3];
+    const int8_t mask =
+        highbd_filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd);
+    const int8_t flat =
+        highbd_flat_mask4(1, p3, p2, p1, p0, q0, q1, q2, q3, bd);
+    highbd_filter8(mask, *thresh, flat, s - 4, s - 3, s - 2, s - 1, s, s + 1,
+                   s + 2, s + 3, bd);
+    s += pitch;
+  }
+}
+
+void aom_highbd_lpf_vertical_8_dual_c(
+    uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0,
+    const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1,
+    const uint8_t *thresh1, int bd) {
+  aom_highbd_lpf_vertical_8_c(s, pitch, blimit0, limit0, thresh0, bd);
+  aom_highbd_lpf_vertical_8_c(s + 4 * pitch, pitch, blimit1, limit1, thresh1,
+                              bd);
+}
+
+static INLINE void highbd_filter14(int8_t mask, uint8_t thresh, int8_t flat,
+                                   int8_t flat2, uint16_t *op6, uint16_t *op5,
+                                   uint16_t *op4, uint16_t *op3, uint16_t *op2,
+                                   uint16_t *op1, uint16_t *op0, uint16_t *oq0,
+                                   uint16_t *oq1, uint16_t *oq2, uint16_t *oq3,
+                                   uint16_t *oq4, uint16_t *oq5, uint16_t *oq6,
+                                   int bd) {
+  if (flat2 && flat && mask) {
+    const uint16_t p6 = *op6;
+    const uint16_t p5 = *op5;
+    const uint16_t p4 = *op4;
+    const uint16_t p3 = *op3;
+    const uint16_t p2 = *op2;
+    const uint16_t p1 = *op1;
+    const uint16_t p0 = *op0;
+    const uint16_t q0 = *oq0;
+    const uint16_t q1 = *oq1;
+    const uint16_t q2 = *oq2;
+    const uint16_t q3 = *oq3;
+    const uint16_t q4 = *oq4;
+    const uint16_t q5 = *oq5;
+    const uint16_t q6 = *oq6;
+
+    // 13-tap filter [1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1]
+    *op5 = ROUND_POWER_OF_TWO(p6 * 7 + p5 * 2 + p4 * 2 + p3 + p2 + p1 + p0 + q0,
+                              4);
+    *op4 = ROUND_POWER_OF_TWO(
+        p6 * 5 + p5 * 2 + p4 * 2 + p3 * 2 + p2 + p1 + p0 + q0 + q1, 4);
+    *op3 = ROUND_POWER_OF_TWO(
+        p6 * 4 + p5 + p4 * 2 + p3 * 2 + p2 * 2 + p1 + p0 + q0 + q1 + q2, 4);
+    *op2 = ROUND_POWER_OF_TWO(
+        p6 * 3 + p5 + p4 + p3 * 2 + p2 * 2 + p1 * 2 + p0 + q0 + q1 + q2 + q3,
+        4);
+    *op1 = ROUND_POWER_OF_TWO(p6 * 2 + p5 + p4 + p3 + p2 * 2 + p1 * 2 + p0 * 2 +
+                                  q0 + q1 + q2 + q3 + q4,
+                              4);
+    *op0 = ROUND_POWER_OF_TWO(p6 + p5 + p4 + p3 + p2 + p1 * 2 + p0 * 2 +
+                                  q0 * 2 + q1 + q2 + q3 + q4 + q5,
+                              4);
+    *oq0 = ROUND_POWER_OF_TWO(p5 + p4 + p3 + p2 + p1 + p0 * 2 + q0 * 2 +
+                                  q1 * 2 + q2 + q3 + q4 + q5 + q6,
+                              4);
+    *oq1 = ROUND_POWER_OF_TWO(p4 + p3 + p2 + p1 + p0 + q0 * 2 + q1 * 2 +
+                                  q2 * 2 + q3 + q4 + q5 + q6 * 2,
+                              4);
+    *oq2 = ROUND_POWER_OF_TWO(
+        p3 + p2 + p1 + p0 + q0 + q1 * 2 + q2 * 2 + q3 * 2 + q4 + q5 + q6 * 3,
+        4);
+    *oq3 = ROUND_POWER_OF_TWO(
+        p2 + p1 + p0 + q0 + q1 + q2 * 2 + q3 * 2 + q4 * 2 + q5 + q6 * 4, 4);
+    *oq4 = ROUND_POWER_OF_TWO(
+        p1 + p0 + q0 + q1 + q2 + q3 * 2 + q4 * 2 + q5 * 2 + q6 * 5, 4);
+    *oq5 = ROUND_POWER_OF_TWO(p0 + q0 + q1 + q2 + q3 + q4 * 2 + q5 * 2 + q6 * 7,
+                              4);
+  } else {
+    highbd_filter8(mask, thresh, flat, op3, op2, op1, op0, oq0, oq1, oq2, oq3,
+                   bd);
+  }
+}
+
+static void highbd_mb_lpf_horizontal_edge_w(uint16_t *s, int p,
+                                            const uint8_t *blimit,
+                                            const uint8_t *limit,
+                                            const uint8_t *thresh, int count,
+                                            int bd) {
+  int i;
+  int step = 4;
+
+  // loop filter designed to work using chars so that we can make maximum use
+  // of 8 bit simd instructions.
+  for (i = 0; i < step * count; ++i) {
+    const uint16_t p3 = s[-4 * p];
+    const uint16_t p2 = s[-3 * p];
+    const uint16_t p1 = s[-2 * p];
+    const uint16_t p0 = s[-p];
+    const uint16_t q0 = s[0 * p];
+    const uint16_t q1 = s[1 * p];
+    const uint16_t q2 = s[2 * p];
+    const uint16_t q3 = s[3 * p];
+    const int8_t mask =
+        highbd_filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd);
+    const int8_t flat =
+        highbd_flat_mask4(1, p3, p2, p1, p0, q0, q1, q2, q3, bd);
+
+    const int8_t flat2 =
+        highbd_flat_mask4(1, s[-7 * p], s[-6 * p], s[-5 * p], p0, q0, s[4 * p],
+                          s[5 * p], s[6 * p], bd);
+
+    highbd_filter14(mask, *thresh, flat, flat2, s - 7 * p, s - 6 * p, s - 5 * p,
+                    s - 4 * p, s - 3 * p, s - 2 * p, s - 1 * p, s, s + 1 * p,
+                    s + 2 * p, s + 3 * p, s + 4 * p, s + 5 * p, s + 6 * p, bd);
+    ++s;
+  }
+}
+
+void aom_highbd_lpf_horizontal_14_c(uint16_t *s, int pitch,
+                                    const uint8_t *blimit, const uint8_t *limit,
+                                    const uint8_t *thresh, int bd) {
+  highbd_mb_lpf_horizontal_edge_w(s, pitch, blimit, limit, thresh, 1, bd);
+}
+
+void aom_highbd_lpf_horizontal_14_dual_c(
+    uint16_t *s, int p, const uint8_t *blimit0, const uint8_t *limit0,
+    const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1,
+    const uint8_t *thresh1, int bd) {
+  highbd_mb_lpf_horizontal_edge_w(s, p, blimit0, limit0, thresh0, 1, bd);
+  highbd_mb_lpf_horizontal_edge_w(s + 4, p, blimit1, limit1, thresh1, 1, bd);
+}
+
+static void highbd_mb_lpf_vertical_edge_w(uint16_t *s, int p,
+                                          const uint8_t *blimit,
+                                          const uint8_t *limit,
+                                          const uint8_t *thresh, int count,
+                                          int bd) {
+  int i;
+
+  for (i = 0; i < count; ++i) {
+    const uint16_t p3 = s[-4];
+    const uint16_t p2 = s[-3];
+    const uint16_t p1 = s[-2];
+    const uint16_t p0 = s[-1];
+    const uint16_t q0 = s[0];
+    const uint16_t q1 = s[1];
+    const uint16_t q2 = s[2];
+    const uint16_t q3 = s[3];
+    const int8_t mask =
+        highbd_filter_mask(*limit, *blimit, p3, p2, p1, p0, q0, q1, q2, q3, bd);
+    const int8_t flat =
+        highbd_flat_mask4(1, p3, p2, p1, p0, q0, q1, q2, q3, bd);
+    const int8_t flat2 =
+        highbd_flat_mask4(1, s[-7], s[-6], s[-5], p0, q0, s[4], s[5], s[6], bd);
+
+    highbd_filter14(mask, *thresh, flat, flat2, s - 7, s - 6, s - 5, s - 4,
+                    s - 3, s - 2, s - 1, s, s + 1, s + 2, s + 3, s + 4, s + 5,
+                    s + 6, bd);
+    s += p;
+  }
+}
+
+void aom_highbd_lpf_vertical_14_c(uint16_t *s, int p, const uint8_t *blimit,
+                                  const uint8_t *limit, const uint8_t *thresh,
+                                  int bd) {
+  highbd_mb_lpf_vertical_edge_w(s, p, blimit, limit, thresh, 4, bd);
+}
+
+void aom_highbd_lpf_vertical_14_dual_c(
+    uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0,
+    const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1,
+    const uint8_t *thresh1, int bd) {
+  highbd_mb_lpf_vertical_edge_w(s, pitch, blimit0, limit0, thresh0, 4, bd);
+  highbd_mb_lpf_vertical_edge_w(s + 4 * pitch, pitch, blimit1, limit1, thresh1,
+                                4, bd);
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h
new file mode 100644
index 0000000000..f1c723127e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h
@@ -0,0 +1,670 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_PROB_H_
+#define AOM_AOM_DSP_PROB_H_
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/entcode.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/bitops.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef uint16_t aom_cdf_prob;
+
+#define CDF_SIZE(x) ((x) + 1)
+#define CDF_PROB_BITS 15
+#define CDF_PROB_TOP (1 << CDF_PROB_BITS)
+#define CDF_INIT_TOP 32768
+#define CDF_SHIFT (15 - CDF_PROB_BITS)
+/*The value stored in an iCDF is CDF_PROB_TOP minus the actual cumulative
+  probability (an "inverse" CDF).
+  This function converts from one representation to the other (and is its own
+  inverse).*/
+#define AOM_ICDF(x) (CDF_PROB_TOP - (x))
+
+#if CDF_SHIFT == 0
+
+#define AOM_CDF2(a0) AOM_ICDF(a0), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF3(a0, a1) AOM_ICDF(a0), AOM_ICDF(a1), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF4(a0, a1, a2) \
+  AOM_ICDF(a0), AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF5(a0, a1, a2, a3) \
+  AOM_ICDF(a0)                   \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF6(a0, a1, a2, a3, a4)                        \
+  AOM_ICDF(a0)                                              \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF7(a0, a1, a2, a3, a4, a5)                                  \
+  AOM_ICDF(a0)                                                            \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5), \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF8(a0, a1, a2, a3, a4, a5, a6)                              \
+  AOM_ICDF(a0)                                                            \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5), \
+      AOM_ICDF(a6), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF9(a0, a1, a2, a3, a4, a5, a6, a7)                          \
+  AOM_ICDF(a0)                                                            \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5), \
+      AOM_ICDF(a6), AOM_ICDF(a7), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF10(a0, a1, a2, a3, a4, a5, a6, a7, a8)                     \
+  AOM_ICDF(a0)                                                            \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5), \
+      AOM_ICDF(a6), AOM_ICDF(a7), AOM_ICDF(a8), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF11(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)                 \
+  AOM_ICDF(a0)                                                            \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5), \
+      AOM_ICDF(a6), AOM_ICDF(a7), AOM_ICDF(a8), AOM_ICDF(a9),             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF12(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)               \
+  AOM_ICDF(a0)                                                               \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5),    \
+      AOM_ICDF(a6), AOM_ICDF(a7), AOM_ICDF(a8), AOM_ICDF(a9), AOM_ICDF(a10), \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF13(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)          \
+  AOM_ICDF(a0)                                                               \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5),    \
+      AOM_ICDF(a6), AOM_ICDF(a7), AOM_ICDF(a8), AOM_ICDF(a9), AOM_ICDF(a10), \
+      AOM_ICDF(a11), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF14(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)     \
+  AOM_ICDF(a0)                                                               \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5),    \
+      AOM_ICDF(a6), AOM_ICDF(a7), AOM_ICDF(a8), AOM_ICDF(a9), AOM_ICDF(a10), \
+      AOM_ICDF(a11), AOM_ICDF(a12), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF15(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13) \
+  AOM_ICDF(a0)                                                                \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5),     \
+      AOM_ICDF(a6), AOM_ICDF(a7), AOM_ICDF(a8), AOM_ICDF(a9), AOM_ICDF(a10),  \
+      AOM_ICDF(a11), AOM_ICDF(a12), AOM_ICDF(a13), AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF16(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, \
+                  a14)                                                        \
+  AOM_ICDF(a0)                                                                \
+  , AOM_ICDF(a1), AOM_ICDF(a2), AOM_ICDF(a3), AOM_ICDF(a4), AOM_ICDF(a5),     \
+      AOM_ICDF(a6), AOM_ICDF(a7), AOM_ICDF(a8), AOM_ICDF(a9), AOM_ICDF(a10),  \
+      AOM_ICDF(a11), AOM_ICDF(a12), AOM_ICDF(a13), AOM_ICDF(a14),             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+
+#else
+#define AOM_CDF2(a0)                                       \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 2) + \
+            ((CDF_INIT_TOP - 2) >> 1)) /                   \
+               ((CDF_INIT_TOP - 2)) +                      \
+           1)                                              \
+  , AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF3(a0, a1)                                       \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 3) +     \
+            ((CDF_INIT_TOP - 3) >> 1)) /                       \
+               ((CDF_INIT_TOP - 3)) +                          \
+           1)                                                  \
+  ,                                                            \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 3) + \
+                ((CDF_INIT_TOP - 3) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 3)) +                      \
+               2),                                             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF4(a0, a1, a2)                                   \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 4) +     \
+            ((CDF_INIT_TOP - 4) >> 1)) /                       \
+               ((CDF_INIT_TOP - 4)) +                          \
+           1)                                                  \
+  ,                                                            \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 4) + \
+                ((CDF_INIT_TOP - 4) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 4)) +                      \
+               2),                                             \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 4) + \
+                ((CDF_INIT_TOP - 4) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 4)) +                      \
+               3),                                             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF5(a0, a1, a2, a3)                               \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 5) +     \
+            ((CDF_INIT_TOP - 5) >> 1)) /                       \
+               ((CDF_INIT_TOP - 5)) +                          \
+           1)                                                  \
+  ,                                                            \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 5) + \
+                ((CDF_INIT_TOP - 5) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 5)) +                      \
+               2),                                             \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 5) + \
+                ((CDF_INIT_TOP - 5) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 5)) +                      \
+               3),                                             \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 5) + \
+                ((CDF_INIT_TOP - 5) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 5)) +                      \
+               4),                                             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF6(a0, a1, a2, a3, a4)                           \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 6) +     \
+            ((CDF_INIT_TOP - 6) >> 1)) /                       \
+               ((CDF_INIT_TOP - 6)) +                          \
+           1)                                                  \
+  ,                                                            \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 6) + \
+                ((CDF_INIT_TOP - 6) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 6)) +                      \
+               2),                                             \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 6) + \
+                ((CDF_INIT_TOP - 6) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 6)) +                      \
+               3),                                             \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 6) + \
+                ((CDF_INIT_TOP - 6) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 6)) +                      \
+               4),                                             \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 6) + \
+                ((CDF_INIT_TOP - 6) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 6)) +                      \
+               5),                                             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF7(a0, a1, a2, a3, a4, a5)                       \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 7) +     \
+            ((CDF_INIT_TOP - 7) >> 1)) /                       \
+               ((CDF_INIT_TOP - 7)) +                          \
+           1)                                                  \
+  ,                                                            \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 7) + \
+                ((CDF_INIT_TOP - 7) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 7)) +                      \
+               2),                                             \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 7) + \
+                ((CDF_INIT_TOP - 7) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 7)) +                      \
+               3),                                             \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 7) + \
+                ((CDF_INIT_TOP - 7) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 7)) +                      \
+               4),                                             \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 7) + \
+                ((CDF_INIT_TOP - 7) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 7)) +                      \
+               5),                                             \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 7) + \
+                ((CDF_INIT_TOP - 7) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 7)) +                      \
+               6),                                             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF8(a0, a1, a2, a3, a4, a5, a6)                   \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 8) +     \
+            ((CDF_INIT_TOP - 8) >> 1)) /                       \
+               ((CDF_INIT_TOP - 8)) +                          \
+           1)                                                  \
+  ,                                                            \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 8) + \
+                ((CDF_INIT_TOP - 8) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 8)) +                      \
+               2),                                             \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 8) + \
+                ((CDF_INIT_TOP - 8) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 8)) +                      \
+               3),                                             \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 8) + \
+                ((CDF_INIT_TOP - 8) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 8)) +                      \
+               4),                                             \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 8) + \
+                ((CDF_INIT_TOP - 8) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 8)) +                      \
+               5),                                             \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 8) + \
+                ((CDF_INIT_TOP - 8) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 8)) +                      \
+               6),                                             \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 8) + \
+                ((CDF_INIT_TOP - 8) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 8)) +                      \
+               7),                                             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF9(a0, a1, a2, a3, a4, a5, a6, a7)               \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 9) +     \
+            ((CDF_INIT_TOP - 9) >> 1)) /                       \
+               ((CDF_INIT_TOP - 9)) +                          \
+           1)                                                  \
+  ,                                                            \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 9) + \
+                ((CDF_INIT_TOP - 9) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 9)) +                      \
+               2),                                             \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 9) + \
+                ((CDF_INIT_TOP - 9) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 9)) +                      \
+               3),                                             \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 9) + \
+                ((CDF_INIT_TOP - 9) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 9)) +                      \
+               4),                                             \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 9) + \
+                ((CDF_INIT_TOP - 9) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 9)) +                      \
+               5),                                             \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 9) + \
+                ((CDF_INIT_TOP - 9) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 9)) +                      \
+               6),                                             \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 9) + \
+                ((CDF_INIT_TOP - 9) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 9)) +                      \
+               7),                                             \
+      AOM_ICDF((((a7)-8) * ((CDF_INIT_TOP >> CDF_SHIFT) - 9) + \
+                ((CDF_INIT_TOP - 9) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 9)) +                      \
+               8),                                             \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF10(a0, a1, a2, a3, a4, a5, a6, a7, a8)           \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) +     \
+            ((CDF_INIT_TOP - 10) >> 1)) /                       \
+               ((CDF_INIT_TOP - 10)) +                          \
+           1)                                                   \
+  ,                                                             \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) + \
+                ((CDF_INIT_TOP - 10) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 10)) +                      \
+               2),                                              \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) + \
+                ((CDF_INIT_TOP - 10) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 10)) +                      \
+               3),                                              \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) + \
+                ((CDF_INIT_TOP - 10) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 10)) +                      \
+               4),                                              \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) + \
+                ((CDF_INIT_TOP - 10) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 10)) +                      \
+               5),                                              \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) + \
+                ((CDF_INIT_TOP - 10) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 10)) +                      \
+               6),                                              \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) + \
+                ((CDF_INIT_TOP - 10) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 10)) +                      \
+               7),                                              \
+      AOM_ICDF((((a7)-8) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) + \
+                ((CDF_INIT_TOP - 10) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 10)) +                      \
+               8),                                              \
+      AOM_ICDF((((a8)-9) * ((CDF_INIT_TOP >> CDF_SHIFT) - 10) + \
+                ((CDF_INIT_TOP - 10) >> 1)) /                   \
+                   ((CDF_INIT_TOP - 10)) +                      \
+               9),                                              \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF11(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)        \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +      \
+            ((CDF_INIT_TOP - 11) >> 1)) /                        \
+               ((CDF_INIT_TOP - 11)) +                           \
+           1)                                                    \
+  ,                                                              \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +  \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               2),                                               \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +  \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               3),                                               \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +  \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               4),                                               \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +  \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               5),                                               \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +  \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               6),                                               \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +  \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               7),                                               \
+      AOM_ICDF((((a7)-8) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +  \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               8),                                               \
+      AOM_ICDF((((a8)-9) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) +  \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               9),                                               \
+      AOM_ICDF((((a9)-10) * ((CDF_INIT_TOP >> CDF_SHIFT) - 11) + \
+                ((CDF_INIT_TOP - 11) >> 1)) /                    \
+                   ((CDF_INIT_TOP - 11)) +                       \
+               10),                                              \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF12(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)    \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +       \
+            ((CDF_INIT_TOP - 12) >> 1)) /                         \
+               ((CDF_INIT_TOP - 12)) +                            \
+           1)                                                     \
+  ,                                                               \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +   \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               2),                                                \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +   \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               3),                                                \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +   \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               4),                                                \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +   \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               5),                                                \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +   \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               6),                                                \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +   \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               7),                                                \
+      AOM_ICDF((((a7)-8) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +   \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               8),                                                \
+      AOM_ICDF((((a8)-9) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +   \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               9),                                                \
+      AOM_ICDF((((a9)-10) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) +  \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               10),                                               \
+      AOM_ICDF((((a10)-11) * ((CDF_INIT_TOP >> CDF_SHIFT) - 12) + \
+                ((CDF_INIT_TOP - 12) >> 1)) /                     \
+                   ((CDF_INIT_TOP - 12)) +                        \
+               11),                                               \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF13(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +         \
+            ((CDF_INIT_TOP - 13) >> 1)) /                           \
+               ((CDF_INIT_TOP - 13)) +                              \
+           1)                                                       \
+  ,                                                                 \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +     \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               2),                                                  \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +     \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               3),                                                  \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +     \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               4),                                                  \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +     \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               5),                                                  \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +     \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               6),                                                  \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +     \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               7),                                                  \
+      AOM_ICDF((((a7)-8) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +     \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               8),                                                  \
+      AOM_ICDF((((a8)-9) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +     \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               9),                                                  \
+      AOM_ICDF((((a9)-10) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +    \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               10),                                                 \
+      AOM_ICDF((((a10)-11) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +   \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               11),                                                 \
+      AOM_ICDF((((a11)-12) * ((CDF_INIT_TOP >> CDF_SHIFT) - 13) +   \
+                ((CDF_INIT_TOP - 13) >> 1)) /                       \
+                   ((CDF_INIT_TOP - 13)) +                          \
+               12),                                                 \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF14(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +              \
+            ((CDF_INIT_TOP - 14) >> 1)) /                                \
+               ((CDF_INIT_TOP - 14)) +                                   \
+           1)                                                            \
+  ,                                                                      \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +          \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               2),                                                       \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +          \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               3),                                                       \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +          \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               4),                                                       \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +          \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               5),                                                       \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +          \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               6),                                                       \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +          \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               7),                                                       \
+      AOM_ICDF((((a7)-8) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +          \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               8),                                                       \
+      AOM_ICDF((((a8)-9) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +          \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               9),                                                       \
+      AOM_ICDF((((a9)-10) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +         \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               10),                                                      \
+      AOM_ICDF((((a10)-11) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +        \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               11),                                                      \
+      AOM_ICDF((((a11)-12) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +        \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               12),                                                      \
+      AOM_ICDF((((a12)-13) * ((CDF_INIT_TOP >> CDF_SHIFT) - 14) +        \
+                ((CDF_INIT_TOP - 14) >> 1)) /                            \
+                   ((CDF_INIT_TOP - 14)) +                               \
+               13),                                                      \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF15(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13) \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +                   \
+            ((CDF_INIT_TOP - 15) >> 1)) /                                     \
+               ((CDF_INIT_TOP - 15)) +                                        \
+           1)                                                                 \
+  ,                                                                           \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +               \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               2),                                                            \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +               \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               3),                                                            \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +               \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               4),                                                            \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +               \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               5),                                                            \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +               \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               6),                                                            \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +               \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               7),                                                            \
+      AOM_ICDF((((a7)-8) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +               \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               8),                                                            \
+      AOM_ICDF((((a8)-9) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +               \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               9),                                                            \
+      AOM_ICDF((((a9)-10) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +              \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               10),                                                           \
+      AOM_ICDF((((a10)-11) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +             \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               11),                                                           \
+      AOM_ICDF((((a11)-12) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +             \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               12),                                                           \
+      AOM_ICDF((((a12)-13) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +             \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               13),                                                           \
+      AOM_ICDF((((a13)-14) * ((CDF_INIT_TOP >> CDF_SHIFT) - 15) +             \
+                ((CDF_INIT_TOP - 15) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 15)) +                                    \
+               14),                                                           \
+      AOM_ICDF(CDF_PROB_TOP), 0
+#define AOM_CDF16(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, \
+                  a14)                                                        \
+  AOM_ICDF((((a0)-1) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +                   \
+            ((CDF_INIT_TOP - 16) >> 1)) /                                     \
+               ((CDF_INIT_TOP - 16)) +                                        \
+           1)                                                                 \
+  ,                                                                           \
+      AOM_ICDF((((a1)-2) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +               \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               2),                                                            \
+      AOM_ICDF((((a2)-3) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +               \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               3),                                                            \
+      AOM_ICDF((((a3)-4) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +               \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               4),                                                            \
+      AOM_ICDF((((a4)-5) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +               \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               5),                                                            \
+      AOM_ICDF((((a5)-6) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +               \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               6),                                                            \
+      AOM_ICDF((((a6)-7) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +               \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               7),                                                            \
+      AOM_ICDF((((a7)-8) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +               \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               8),                                                            \
+      AOM_ICDF((((a8)-9) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +               \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               9),                                                            \
+      AOM_ICDF((((a9)-10) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +              \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               10),                                                           \
+      AOM_ICDF((((a10)-11) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +             \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               11),                                                           \
+      AOM_ICDF((((a11)-12) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +             \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               12),                                                           \
+      AOM_ICDF((((a12)-13) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +             \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               13),                                                           \
+      AOM_ICDF((((a13)-14) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +             \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               14),                                                           \
+      AOM_ICDF((((a14)-15) * ((CDF_INIT_TOP >> CDF_SHIFT) - 16) +             \
+                ((CDF_INIT_TOP - 16) >> 1)) /                                 \
+                   ((CDF_INIT_TOP - 16)) +                                    \
+               15),                                                           \
+      AOM_ICDF(CDF_PROB_TOP), 0
+
+#endif
+
+static INLINE uint8_t get_prob(unsigned int num, unsigned int den) {
+  assert(den != 0);
+  {
+    const int p = (int)(((uint64_t)num * 256 + (den >> 1)) / den);
+    // (p > 255) ? 255 : (p < 1) ? 1 : p;
+    const int clipped_prob = p | ((255 - p) >> 23) | (p == 0);
+    return (uint8_t)clipped_prob;
+  }
+}
+
+static INLINE void update_cdf(aom_cdf_prob *cdf, int8_t val, int nsymbs) {
+  int rate;
+  int i, tmp;
+
+  static const int nsymbs2speed[17] = { 0, 0, 1, 1, 2, 2, 2, 2, 2,
+                                        2, 2, 2, 2, 2, 2, 2, 2 };
+  assert(nsymbs < 17);
+  rate = 3 + (cdf[nsymbs] > 15) + (cdf[nsymbs] > 31) +
+         nsymbs2speed[nsymbs];  // + get_msb(nsymbs);
+  tmp = AOM_ICDF(0);
+
+  // Single loop (faster)
+  for (i = 0; i < nsymbs - 1; ++i) {
+    tmp = (i == val) ? 0 : tmp;
+    if (tmp < cdf[i]) {
+      cdf[i] -= ((cdf[i] - tmp) >> rate);
+    } else {
+      cdf[i] += ((tmp - cdf[i]) >> rate);
+    }
+  }
+  cdf[nsymbs] += (cdf[nsymbs] < 32);
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_DSP_PROB_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/recenter.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/recenter.h
new file mode 100644
index 0000000000..a51e3e97b8
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/recenter.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_RECENTER_H_
+#define AOM_AOM_DSP_RECENTER_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+// Inverse recenters a non-negative literal v around a reference r
+static INLINE uint16_t inv_recenter_nonneg(uint16_t r, uint16_t v) {
+  if (v > (r << 1))
+    return v;
+  else if ((v & 1) == 0)
+    return (v >> 1) + r;
+  else
+    return r - ((v + 1) >> 1);
+}
+
+// Inverse recenters a non-negative literal v in [0, n-1] around a
+// reference r also in [0, n-1]
+static INLINE uint16_t inv_recenter_finite_nonneg(uint16_t n, uint16_t r,
+                                                  uint16_t v) {
+  if ((r << 1) <= n) {
+    return inv_recenter_nonneg(r, v);
+  } else {
+    return n - 1 - inv_recenter_nonneg(n - 1 - r, v);
+  }
+}
+
+// Recenters a non-negative literal v around a reference r
+static INLINE uint16_t recenter_nonneg(uint16_t r, uint16_t v) {
+  if (v > (r << 1))
+    return v;
+  else if (v >= r)
+    return ((v - r) << 1);
+  else
+    return ((r - v) << 1) - 1;
+}
+
+// Recenters a non-negative literal v in [0, n-1] around a
+// reference r also in [0, n-1]
+static INLINE uint16_t recenter_finite_nonneg(uint16_t n, uint16_t r,
+                                              uint16_t v) {
+  if ((r << 1) <= n) {
+    return recenter_nonneg(r, v);
+  } else {
+    return recenter_nonneg(n - 1 - r, n - 1 - v);
+  }
+}
+
+#endif  // AOM_AOM_DSP_RECENTER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_dsp/txfm_common.h b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/txfm_common.h
new file mode 100644
index 0000000000..9c1f916f20
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_dsp/txfm_common.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_DSP_TXFM_COMMON_H_
+#define AOM_AOM_DSP_TXFM_COMMON_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+// Constants and Macros used by all idct/dct functions
+#define DCT_CONST_BITS 14
+#define DCT_CONST_ROUNDING (1 << (DCT_CONST_BITS - 1))
+
+#define UNIT_QUANT_SHIFT 2
+#define UNIT_QUANT_FACTOR (1 << UNIT_QUANT_SHIFT)
+
+typedef struct txfm_param {
+  // for both forward and inverse transforms
+  TX_TYPE tx_type;
+  TX_SIZE tx_size;
+  int lossless;
+  int bd;
+  // are the pixel buffers octets or shorts?  This should collapse to
+  // bd==8 implies !is_hbd, but that's not certain right now.
+  int is_hbd;
+  TxSetType tx_set_type;
+  // for inverse transforms only
+  int eob;
+} TxfmParam;
+
+// Constants:
+//  for (int i = 1; i< 32; ++i)
+//    printf("static const int cospi_%d_64 = %.0f;\n", i,
+//           round(16384 * cos(i*PI/64)));
+// Note: sin(k*Pi/64) = cos((32-k)*Pi/64)
+static const tran_high_t cospi_1_64 = 16364;
+static const tran_high_t cospi_2_64 = 16305;
+static const tran_high_t cospi_3_64 = 16207;
+static const tran_high_t cospi_4_64 = 16069;
+static const tran_high_t cospi_5_64 = 15893;
+static const tran_high_t cospi_6_64 = 15679;
+static const tran_high_t cospi_7_64 = 15426;
+static const tran_high_t cospi_8_64 = 15137;
+static const tran_high_t cospi_9_64 = 14811;
+static const tran_high_t cospi_10_64 = 14449;
+static const tran_high_t cospi_11_64 = 14053;
+static const tran_high_t cospi_12_64 = 13623;
+static const tran_high_t cospi_13_64 = 13160;
+static const tran_high_t cospi_14_64 = 12665;
+static const tran_high_t cospi_15_64 = 12140;
+static const tran_high_t cospi_16_64 = 11585;
+static const tran_high_t cospi_17_64 = 11003;
+static const tran_high_t cospi_18_64 = 10394;
+static const tran_high_t cospi_19_64 = 9760;
+static const tran_high_t cospi_20_64 = 9102;
+static const tran_high_t cospi_21_64 = 8423;
+static const tran_high_t cospi_22_64 = 7723;
+static const tran_high_t cospi_23_64 = 7005;
+static const tran_high_t cospi_24_64 = 6270;
+static const tran_high_t cospi_25_64 = 5520;
+static const tran_high_t cospi_26_64 = 4756;
+static const tran_high_t cospi_27_64 = 3981;
+static const tran_high_t cospi_28_64 = 3196;
+static const tran_high_t cospi_29_64 = 2404;
+static const tran_high_t cospi_30_64 = 1606;
+static const tran_high_t cospi_31_64 = 804;
+
+//  16384 * sqrt(2) * sin(kPi/9) * 2 / 3
+static const tran_high_t sinpi_1_9 = 5283;
+static const tran_high_t sinpi_2_9 = 9929;
+static const tran_high_t sinpi_3_9 = 13377;
+static const tran_high_t sinpi_4_9 = 15212;
+
+// 16384 * sqrt(2)
+static const tran_high_t Sqrt2 = 23170;
+static const tran_high_t InvSqrt2 = 11585;
+
+static INLINE tran_high_t fdct_round_shift(tran_high_t input) {
+  tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
+  return rv;
+}
+
+#endif  // AOM_AOM_DSP_TXFM_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_encoder.h b/pxr/imaging/plugin/hioAvif/aom/aom_encoder.h
new file mode 100644
index 0000000000..d141794e0d
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_encoder.h
@@ -0,0 +1,1129 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#ifndef AOM_AOM_AOM_ENCODER_H_
+#define AOM_AOM_AOM_ENCODER_H_
+
+/*!\defgroup encoder Encoder Algorithm Interface
+ * \ingroup codec
+ * This abstraction allows applications using this encoder to easily support
+ * multiple video formats with minimal code duplication. This section describes
+ * the interface common to all encoders.
+ * @{
+ */
+
+/*!\file
+ * \brief Describes the encoder algorithm interface to applications.
+ *
+ * This file describes the interface between an application and a
+ * video encoder algorithm.
+ *
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+
+/*!\brief Current ABI version number
+ *
+ * \internal
+ * If this file is altered in any way that changes the ABI, this value
+ * must be bumped.  Examples include, but are not limited to, changing
+ * types, removing or reassigning enums, adding/removing/rearranging
+ * fields to structures
+ */
+#define AOM_ENCODER_ABI_VERSION \
+  (9 + AOM_CODEC_ABI_VERSION) /**<\hideinitializer*/
+
+/*! \brief Encoder capabilities bitfield
+ *
+ *  Each encoder advertises the capabilities it supports as part of its
+ *  ::aom_codec_iface_t interface structure. Capabilities are extra
+ *  interfaces or functionality, and are not required to be supported
+ *  by an encoder.
+ *
+ *  The available flags are specified by AOM_CODEC_CAP_* defines.
+ */
+#define AOM_CODEC_CAP_PSNR 0x10000 /**< Can issue PSNR packets */
+
+/*! Can support input images at greater than 8 bitdepth.
+ */
+#define AOM_CODEC_CAP_HIGHBITDEPTH 0x40000
+
+/*! \brief Initialization-time Feature Enabling
+ *
+ *  Certain codec features must be known at initialization time, to allow
+ *  for proper memory allocation.
+ *
+ *  The available flags are specified by AOM_CODEC_USE_* defines.
+ */
+#define AOM_CODEC_USE_PSNR 0x10000 /**< Calculate PSNR on each frame */
+/*!\brief Make the encoder output one  partition at a time. */
+#define AOM_CODEC_USE_HIGHBITDEPTH 0x40000 /**< Use high bitdepth */
+
+/*!\brief Generic fixed size buffer structure
+ *
+ * This structure is able to hold a reference to any fixed size buffer.
+ */
+typedef struct aom_fixed_buf {
+  void *buf;       /**< Pointer to the data. Does NOT own the data! */
+  size_t sz;       /**< Length of the buffer, in chars */
+} aom_fixed_buf_t; /**< alias for struct aom_fixed_buf */
+
+/*!\brief Error Resilient flags
+ *
+ * These flags define which error resilient features to enable in the
+ * encoder. The flags are specified through the
+ * aom_codec_enc_cfg::g_error_resilient variable.
+ */
+typedef uint32_t aom_codec_er_flags_t;
+/*!\brief Improve resiliency against losses of whole frames */
+#define AOM_ERROR_RESILIENT_DEFAULT 0x1
+
+/*!\brief Encoder output packet variants
+ *
+ * This enumeration lists the different kinds of data packets that can be
+ * returned by calls to aom_codec_get_cx_data(). Algorithms \ref MAY
+ * extend this list to provide additional functionality.
+ */
+enum aom_codec_cx_pkt_kind {
+  AOM_CODEC_CX_FRAME_PKT,    /**< Compressed video frame */
+  AOM_CODEC_STATS_PKT,       /**< Two-pass statistics for this frame */
+  AOM_CODEC_FPMB_STATS_PKT,  /**< first pass mb statistics for this frame */
+  AOM_CODEC_PSNR_PKT,        /**< PSNR statistics for this frame */
+  AOM_CODEC_CUSTOM_PKT = 256 /**< Algorithm extensions  */
+};
+
+/*!\brief Encoder output packet
+ *
+ * This structure contains the different kinds of output data the encoder
+ * may produce while compressing a frame.
+ */
+typedef struct aom_codec_cx_pkt {
+  enum aom_codec_cx_pkt_kind kind; /**< packet variant */
+  union {
+    struct {
+      void *buf; /**< compressed data buffer */
+      size_t sz; /**< length of compressed data */
+      /*!\brief time stamp to show frame (in timebase units) */
+      aom_codec_pts_t pts;
+      /*!\brief duration to show frame (in timebase units) */
+      unsigned long duration;
+      aom_codec_frame_flags_t flags; /**< flags for this frame */
+      /*!\brief the partition id defines the decoding order of the partitions.
+       * Only applicable when "output partition" mode is enabled. First
+       * partition has id 0.*/
+      int partition_id;
+      /*!\brief size of the visible frame in this packet */
+      size_t vis_frame_size;
+    } frame;                            /**< data for compressed frame packet */
+    aom_fixed_buf_t twopass_stats;      /**< data for two-pass packet */
+    aom_fixed_buf_t firstpass_mb_stats; /**< first pass mb packet */
+    struct aom_psnr_pkt {
+      unsigned int samples[4]; /**< Number of samples, total/y/u/v */
+      uint64_t sse[4];         /**< sum squared error, total/y/u/v */
+      double psnr[4];          /**< PSNR, total/y/u/v */
+      /*!\brief Number of samples, total/y/u/v when
+       * input bit-depth < stream bit-depth.*/
+      unsigned int samples_hbd[4];
+      /*!\brief sum squared error, total/y/u/v when
+       * input bit-depth < stream bit-depth.*/
+      uint64_t sse_hbd[4];
+      /*!\brief PSNR, total/y/u/v when
+       * input bit-depth < stream bit-depth.*/
+      double psnr_hbd[4];
+    } psnr;              /**< data for PSNR packet */
+    aom_fixed_buf_t raw; /**< data for arbitrary packets */
+  } data;                /**< packet data */
+} aom_codec_cx_pkt_t;    /**< alias for struct aom_codec_cx_pkt */
+
+/*!\brief Rational Number
+ *
+ * This structure holds a fractional value.
+ */
+typedef struct aom_rational {
+  int num;        /**< fraction numerator */
+  int den;        /**< fraction denominator */
+} aom_rational_t; /**< alias for struct aom_rational */
+
+/*!\brief Multi-pass Encoding Pass */
+enum aom_enc_pass {
+  AOM_RC_ONE_PASS,   /**< Single pass mode */
+  AOM_RC_FIRST_PASS, /**< First pass of multi-pass mode */
+  AOM_RC_LAST_PASS   /**< Final pass of multi-pass mode */
+};
+
+/*!\brief Rate control mode */
+enum aom_rc_mode {
+  AOM_VBR, /**< Variable Bit Rate (VBR) mode */
+  AOM_CBR, /**< Constant Bit Rate (CBR) mode */
+  AOM_CQ,  /**< Constrained Quality (CQ)  mode */
+  AOM_Q,   /**< Constant Quality (Q) mode */
+};
+
+/*!\brief Keyframe placement mode.
+ *
+ * This enumeration determines whether keyframes are placed automatically by
+ * the encoder or whether this behavior is disabled. Older releases of this
+ * SDK were implemented such that AOM_KF_FIXED meant keyframes were disabled.
+ * This name is confusing for this behavior, so the new symbols to be used
+ * are AOM_KF_AUTO and AOM_KF_DISABLED.
+ */
+enum aom_kf_mode {
+  AOM_KF_FIXED,       /**< deprecated, implies AOM_KF_DISABLED */
+  AOM_KF_AUTO,        /**< Encoder determines optimal placement automatically */
+  AOM_KF_DISABLED = 0 /**< Encoder does not place keyframes. */
+};
+
+/*!\brief Frame super-resolution mode. */
+typedef enum {
+  /**< Frame super-resolution is disabled for all frames. */
+  AOM_SUPERRES_NONE,
+  /**< All frames are coded at the specified scale and super-resolved. */
+  AOM_SUPERRES_FIXED,
+  /**< All frames are coded at a random scale and super-resolved. */
+  AOM_SUPERRES_RANDOM,
+  /**< Super-resolution scale for each frame is determined based on the q index
+     of that frame. */
+  AOM_SUPERRES_QTHRESH,
+  /**< Full-resolution or super-resolution and the scale (in case of
+     super-resolution) are automatically selected for each frame. */
+  AOM_SUPERRES_AUTO,
+} aom_superres_mode;
+
+/*!\brief Encoder Config Options
+ *
+ * This type allows to enumerate and control flags defined for encoder control
+ * via config file at runtime.
+ */
+typedef struct cfg_options {
+  /*!\brief Indicate init by cfg file
+   * 0 or 1
+   */
+  unsigned int init_by_cfg_file;
+  /*!\brief Superblock size
+   * 0, 64 or 128
+   */
+  unsigned int super_block_size;
+  /*!\brief max partition size
+   * 8, 16, 32, 64, 128
+   */
+  unsigned int max_partition_size;
+  /*!\brief min partition size
+   * 8, 16, 32, 64, 128
+   */
+  unsigned int min_partition_size;
+  /*!\brief disable AB Shape partition type
+   *
+   */
+  unsigned int disable_ab_partition_type;
+  /*!\brief disable rectangular partition type
+   *
+   */
+  unsigned int disable_rect_partition_type;
+  /*!\brief disable 1:4/4:1 partition type
+   *
+   */
+  unsigned int disable_1to4_partition_type;
+  /*!\brief disable flip and identity transform type
+   *
+   */
+  unsigned int disable_flip_idtx;
+  /*!\brief disable CDEF filter
+   *
+   */
+  unsigned int disable_cdef;
+  /*!\brief disable Loop Restoration Filter
+   *
+   */
+  unsigned int disable_lr;
+  /*!\brief disable OBMC
+   *
+   */
+  unsigned int disable_obmc;
+  /*!\brief disable Warped Motion
+   *
+   */
+  unsigned int disable_warp_motion;
+  /*!\brief disable global motion
+   *
+   */
+  unsigned int disable_global_motion;
+  /*!\brief disable dist weighted compound
+   *
+   */
+  unsigned int disable_dist_wtd_comp;
+  /*!\brief disable diff weighted compound
+   *
+   */
+  unsigned int disable_diff_wtd_comp;
+  /*!\brief disable inter/intra compound
+   *
+   */
+  unsigned int disable_inter_intra_comp;
+  /*!\brief disable masked compound
+   *
+   */
+  unsigned int disable_masked_comp;
+  /*!\brief disable one sided compound
+   *
+   */
+  unsigned int disable_one_sided_comp;
+  /*!\brief disable Palette
+   *
+   */
+  unsigned int disable_palette;
+  /*!\brief disable Intra Block Copy
+   *
+   */
+  unsigned int disable_intrabc;
+  /*!\brief disable chroma from luma
+   *
+   */
+  unsigned int disable_cfl;
+  /*!\brief disable intra smooth mode
+   *
+   */
+  unsigned int disable_smooth_intra;
+  /*!\brief disable filter intra
+   *
+   */
+  unsigned int disable_filter_intra;
+  /*!\brief disable dual filter
+   *
+   */
+  unsigned int disable_dual_filter;
+  /*!\brief disable intra angle delta
+   *
+   */
+  unsigned int disable_intra_angle_delta;
+  /*!\brief disable intra edge filter
+   *
+   */
+  unsigned int disable_intra_edge_filter;
+  /*!\brief disable 64x64 transform
+   *
+   */
+  unsigned int disable_tx_64x64;
+  /*!\brief disable smooth inter/intra
+   *
+   */
+  unsigned int disable_smooth_inter_intra;
+  /*!\brief disable inter/inter wedge comp
+   *
+   */
+  unsigned int disable_inter_inter_wedge;
+  /*!\brief disable inter/intra wedge comp
+   *
+   */
+  unsigned int disable_inter_intra_wedge;
+  /*!\brief disable paeth intra
+   *
+   */
+  unsigned int disable_paeth_intra;
+  /*!\brief disable trellis quantization
+   *
+   */
+  unsigned int disable_trellis_quant;
+  /*!\brief disable ref frame MV
+   *
+   */
+  unsigned int disable_ref_frame_mv;
+  /*!\brief use reduced reference frame set
+   *
+   */
+  unsigned int reduced_reference_set;
+  /*!\brief use reduced transform type set
+   *
+   */
+  unsigned int reduced_tx_type_set;
+} cfg_options_t;
+
+/*!\brief Encoded Frame Flags
+ *
+ * This type indicates a bitfield to be passed to aom_codec_encode(), defining
+ * per-frame boolean values. By convention, bits common to all codecs will be
+ * named AOM_EFLAG_*, and bits specific to an algorithm will be named
+ * /algo/_eflag_*. The lower order 16 bits are reserved for common use.
+ */
+typedef long aom_enc_frame_flags_t;
+/*!\brief Force this frame to be a keyframe */
+#define AOM_EFLAG_FORCE_KF (1 << 0)
+
+/*!\brief Encoder configuration structure
+ *
+ * This structure contains the encoder settings that have common representations
+ * across all codecs. This doesn't imply that all codecs support all features,
+ * however.
+ */
+typedef struct aom_codec_enc_cfg {
+  /*
+   * generic settings (g)
+   */
+
+  /*!\brief Algorithm specific "usage" value
+   *
+   * Algorithms may define multiple values for usage, which may convey the
+   * intent of how the application intends to use the stream. If this value
+   * is non-zero, consult the documentation for the codec to determine its
+   * meaning.
+   */
+  unsigned int g_usage;
+
+  /*!\brief Maximum number of threads to use
+   *
+   * For multi-threaded implementations, use no more than this number of
+   * threads. The codec may use fewer threads than allowed. The value
+   * 0 is equivalent to the value 1.
+   */
+  unsigned int g_threads;
+
+  /*!\brief Bitstream profile to use
+   *
+   * Some codecs support a notion of multiple bitstream profiles. Typically
+   * this maps to a set of features that are turned on or off. Often the
+   * profile to use is determined by the features of the intended decoder.
+   * Consult the documentation for the codec to determine the valid values
+   * for this parameter, or set to zero for a sane default.
+   */
+  unsigned int g_profile; /**< profile of bitstream to use */
+
+  /*!\brief Width of the frame
+   *
+   * This value identifies the presentation resolution of the frame,
+   * in pixels. Note that the frames passed as input to the encoder must
+   * have this resolution. Frames will be presented by the decoder in this
+   * resolution, independent of any spatial resampling the encoder may do.
+   */
+  unsigned int g_w;
+
+  /*!\brief Height of the frame
+   *
+   * This value identifies the presentation resolution of the frame,
+   * in pixels. Note that the frames passed as input to the encoder must
+   * have this resolution. Frames will be presented by the decoder in this
+   * resolution, independent of any spatial resampling the encoder may do.
+   */
+  unsigned int g_h;
+
+  /*!\brief Max number of frames to encode
+   *
+   */
+  unsigned int g_limit;
+
+  /*!\brief Forced maximum width of the frame
+   *
+   * If this value is non-zero then it is used to force the maximum frame
+   * width written in write_sequence_header().
+   */
+  unsigned int g_forced_max_frame_width;
+
+  /*!\brief Forced maximum height of the frame
+   *
+   * If this value is non-zero then it is used to force the maximum frame
+   * height written in write_sequence_header().
+   */
+  unsigned int g_forced_max_frame_height;
+
+  /*!\brief Bit-depth of the codec
+   *
+   * This value identifies the bit_depth of the codec,
+   * Only certain bit-depths are supported as identified in the
+   * aom_bit_depth_t enum.
+   */
+  aom_bit_depth_t g_bit_depth;
+
+  /*!\brief Bit-depth of the input frames
+   *
+   * This value identifies the bit_depth of the input frames in bits.
+   * Note that the frames passed as input to the encoder must have
+   * this bit-depth.
+   */
+  unsigned int g_input_bit_depth;
+
+  /*!\brief Stream timebase units
+   *
+   * Indicates the smallest interval of time, in seconds, used by the stream.
+   * For fixed frame rate material, or variable frame rate material where
+   * frames are timed at a multiple of a given clock (ex: video capture),
+   * the \ref RECOMMENDED method is to set the timebase to the reciprocal
+   * of the frame rate (ex: 1001/30000 for 29.970 Hz NTSC). This allows the
+   * pts to correspond to the frame number, which can be handy. For
+   * re-encoding video from containers with absolute time timestamps, the
+   * \ref RECOMMENDED method is to set the timebase to that of the parent
+   * container or multimedia framework (ex: 1/1000 for ms, as in FLV).
+   */
+  struct aom_rational g_timebase;
+
+  /*!\brief Enable error resilient modes.
+   *
+   * The error resilient bitfield indicates to the encoder which features
+   * it should enable to take measures for streaming over lossy or noisy
+   * links.
+   */
+  aom_codec_er_flags_t g_error_resilient;
+
+  /*!\brief Multi-pass Encoding Mode
+   *
+   * This value should be set to the current phase for multi-pass encoding.
+   * For single pass, set to #AOM_RC_ONE_PASS.
+   */
+  enum aom_enc_pass g_pass;
+
+  /*!\brief Allow lagged encoding
+   *
+   * If set, this value allows the encoder to consume a number of input
+   * frames before producing output frames. This allows the encoder to
+   * base decisions for the current frame on future frames. This does
+   * increase the latency of the encoding pipeline, so it is not appropriate
+   * in all situations (ex: realtime encoding).
+   *
+   * Note that this is a maximum value -- the encoder may produce frames
+   * sooner than the given limit. Set this value to 0 to disable this
+   * feature.
+   */
+  unsigned int g_lag_in_frames;
+
+  /*
+   * rate control settings (rc)
+   */
+
+  /*!\brief Temporal resampling configuration, if supported by the codec.
+   *
+   * Temporal resampling allows the codec to "drop" frames as a strategy to
+   * meet its target data rate. This can cause temporal discontinuities in
+   * the encoded video, which may appear as stuttering during playback. This
+   * trade-off is often acceptable, but for many applications is not. It can
+   * be disabled in these cases.
+   *
+   * Note that not all codecs support this feature. All aom AVx codecs do.
+   * For other codecs, consult the documentation for that algorithm.
+   *
+   * This threshold is described as a percentage of the target data buffer.
+   * When the data buffer falls below this percentage of fullness, a
+   * dropped frame is indicated. Set the threshold to zero (0) to disable
+   * this feature.
+   */
+  unsigned int rc_dropframe_thresh;
+
+  /*!\brief Mode for spatial resampling, if supported by the codec.
+   *
+   * Spatial resampling allows the codec to compress a lower resolution
+   * version of the frame, which is then upscaled by the decoder to the
+   * correct presentation resolution. This increases visual quality at
+   * low data rates, at the expense of CPU time on the encoder/decoder.
+   */
+  unsigned int rc_resize_mode;
+
+  /*!\brief Frame resize denominator.
+   *
+   * The denominator for resize to use, assuming 8 as the numerator.
+   *
+   * Valid denominators are  8 - 16 for now.
+   */
+  unsigned int rc_resize_denominator;
+
+  /*!\brief Keyframe resize denominator.
+   *
+   * The denominator for resize to use, assuming 8 as the numerator.
+   *
+   * Valid denominators are  8 - 16 for now.
+   */
+  unsigned int rc_resize_kf_denominator;
+
+  /*!\brief Frame super-resolution scaling mode.
+   *
+   * Similar to spatial resampling, frame super-resolution integrates
+   * upscaling after the encode/decode process. Taking control of upscaling and
+   * using restoration filters should allow it to outperform normal resizing.
+   */
+  aom_superres_mode rc_superres_mode;
+
+  /*!\brief Frame super-resolution denominator.
+   *
+   * The denominator for superres to use. If fixed it will only change if the
+   * cumulative scale change over resizing and superres is greater than 1/2;
+   * this forces superres to reduce scaling.
+   *
+   * Valid denominators are 8 to 16.
+   *
+   * Used only by AOM_SUPERRES_FIXED.
+   */
+  unsigned int rc_superres_denominator;
+
+  /*!\brief Keyframe super-resolution denominator.
+   *
+   * The denominator for superres to use. If fixed it will only change if the
+   * cumulative scale change over resizing and superres is greater than 1/2;
+   * this forces superres to reduce scaling.
+   *
+   * Valid denominators are 8 - 16 for now.
+   */
+  unsigned int rc_superres_kf_denominator;
+
+  /*!\brief Frame super-resolution q threshold.
+   *
+   * The q level threshold after which superres is used.
+   * Valid values are 1 to 63.
+   *
+   * Used only by AOM_SUPERRES_QTHRESH
+   */
+  unsigned int rc_superres_qthresh;
+
+  /*!\brief Keyframe super-resolution q threshold.
+   *
+   * The q level threshold after which superres is used for key frames.
+   * Valid values are 1 to 63.
+   *
+   * Used only by AOM_SUPERRES_QTHRESH
+   */
+  unsigned int rc_superres_kf_qthresh;
+
+  /*!\brief Rate control algorithm to use.
+   *
+   * Indicates whether the end usage of this stream is to be streamed over
+   * a bandwidth constrained link, indicating that Constant Bit Rate (CBR)
+   * mode should be used, or whether it will be played back on a high
+   * bandwidth link, as from a local disk, where higher variations in
+   * bitrate are acceptable.
+   */
+  enum aom_rc_mode rc_end_usage;
+
+  /*!\brief Two-pass stats buffer.
+   *
+   * A buffer containing all of the stats packets produced in the first
+   * pass, concatenated.
+   */
+  aom_fixed_buf_t rc_twopass_stats_in;
+
+  /*!\brief first pass mb stats buffer.
+   *
+   * A buffer containing all of the first pass mb stats packets produced
+   * in the first pass, concatenated.
+   */
+  aom_fixed_buf_t rc_firstpass_mb_stats_in;
+
+  /*!\brief Target data rate
+   *
+   * Target bandwidth to use for this stream, in kilobits per second.
+   */
+  unsigned int rc_target_bitrate;
+
+  /*
+   * quantizer settings
+   */
+
+  /*!\brief Minimum (Best Quality) Quantizer
+   *
+   * The quantizer is the most direct control over the quality of the
+   * encoded image. The range of valid values for the quantizer is codec
+   * specific. Consult the documentation for the codec to determine the
+   * values to use. To determine the range programmatically, call
+   * aom_codec_enc_config_default() with a usage value of 0.
+   */
+  unsigned int rc_min_quantizer;
+
+  /*!\brief Maximum (Worst Quality) Quantizer
+   *
+   * The quantizer is the most direct control over the quality of the
+   * encoded image. The range of valid values for the quantizer is codec
+   * specific. Consult the documentation for the codec to determine the
+   * values to use. To determine the range programmatically, call
+   * aom_codec_enc_config_default() with a usage value of 0.
+   */
+  unsigned int rc_max_quantizer;
+
+  /*
+   * bitrate tolerance
+   */
+
+  /*!\brief Rate control adaptation undershoot control
+   *
+   * This value, controls the tolerance of the VBR algorithm to undershoot
+   * and is used as a trigger threshold for more agressive adaptation of Q.
+   *
+   * Valid values in the range 0-100.
+   */
+  unsigned int rc_undershoot_pct;
+
+  /*!\brief Rate control adaptation overshoot control
+   *
+   * This value, controls the tolerance of the VBR algorithm to overshoot
+   * and is used as a trigger threshold for more agressive adaptation of Q.
+   *
+   * Valid values in the range 0-1000.
+   */
+  unsigned int rc_overshoot_pct;
+
+  /*
+   * decoder buffer model parameters
+   */
+
+  /*!\brief Decoder Buffer Size
+   *
+   * This value indicates the amount of data that may be buffered by the
+   * decoding application. Note that this value is expressed in units of
+   * time (milliseconds). For example, a value of 5000 indicates that the
+   * client will buffer (at least) 5000ms worth of encoded data. Use the
+   * target bitrate (#rc_target_bitrate) to convert to bits/bytes, if
+   * necessary.
+   */
+  unsigned int rc_buf_sz;
+
+  /*!\brief Decoder Buffer Initial Size
+   *
+   * This value indicates the amount of data that will be buffered by the
+   * decoding application prior to beginning playback. This value is
+   * expressed in units of time (milliseconds). Use the target bitrate
+   * (#rc_target_bitrate) to convert to bits/bytes, if necessary.
+   */
+  unsigned int rc_buf_initial_sz;
+
+  /*!\brief Decoder Buffer Optimal Size
+   *
+   * This value indicates the amount of data that the encoder should try
+   * to maintain in the decoder's buffer. This value is expressed in units
+   * of time (milliseconds). Use the target bitrate (#rc_target_bitrate)
+   * to convert to bits/bytes, if necessary.
+   */
+  unsigned int rc_buf_optimal_sz;
+
+  /*
+   * 2 pass rate control parameters
+   */
+
+  /*!\brief Two-pass mode CBR/VBR bias
+   *
+   * Bias, expressed on a scale of 0 to 100, for determining target size
+   * for the current frame. The value 0 indicates the optimal CBR mode
+   * value should be used. The value 100 indicates the optimal VBR mode
+   * value should be used. Values in between indicate which way the
+   * encoder should "lean."
+   */
+  unsigned int rc_2pass_vbr_bias_pct;
+
+  /*!\brief Two-pass mode per-GOP minimum bitrate
+   *
+   * This value, expressed as a percentage of the target bitrate, indicates
+   * the minimum bitrate to be used for a single GOP (aka "section")
+   */
+  unsigned int rc_2pass_vbr_minsection_pct;
+
+  /*!\brief Two-pass mode per-GOP maximum bitrate
+   *
+   * This value, expressed as a percentage of the target bitrate, indicates
+   * the maximum bitrate to be used for a single GOP (aka "section")
+   */
+  unsigned int rc_2pass_vbr_maxsection_pct;
+
+  /*
+   * keyframing settings (kf)
+   */
+
+  /*!\brief Option to enable forward reference key frame
+   *
+   */
+  int fwd_kf_enabled;
+
+  /*!\brief Keyframe placement mode
+   *
+   * This value indicates whether the encoder should place keyframes at a
+   * fixed interval, or determine the optimal placement automatically
+   * (as governed by the #kf_min_dist and #kf_max_dist parameters)
+   */
+  enum aom_kf_mode kf_mode;
+
+  /*!\brief Keyframe minimum interval
+   *
+   * This value, expressed as a number of frames, prevents the encoder from
+   * placing a keyframe nearer than kf_min_dist to the previous keyframe. At
+   * least kf_min_dist frames non-keyframes will be coded before the next
+   * keyframe. Set kf_min_dist equal to kf_max_dist for a fixed interval.
+   */
+  unsigned int kf_min_dist;
+
+  /*!\brief Keyframe maximum interval
+   *
+   * This value, expressed as a number of frames, forces the encoder to code
+   * a keyframe if one has not been coded in the last kf_max_dist frames.
+   * A value of 0 implies all frames will be keyframes. Set kf_min_dist
+   * equal to kf_max_dist for a fixed interval.
+   */
+  unsigned int kf_max_dist;
+
+  /*!\brief sframe interval
+   *
+   * This value, expressed as a number of frames, forces the encoder to code
+   * an S-Frame every sframe_dist frames.
+   */
+  unsigned int sframe_dist;
+
+  /*!\brief sframe insertion mode
+   *
+   * This value must be set to 1 or 2, and tells the encoder how to insert
+   * S-Frames. It will only have an effect if sframe_dist != 0.
+   *
+   * If altref is enabled:
+   *   - if sframe_mode == 1, the considered frame will be made into an
+   *     S-Frame only if it is an altref frame
+   *   - if sframe_mode == 2, the next altref frame will be made into an
+   *     S-Frame.
+   *
+   * Otherwise: the considered frame will be made into an S-Frame.
+   */
+  unsigned int sframe_mode;
+
+  /*!\brief Tile coding mode
+   *
+   * This value indicates the tile coding mode.
+   * A value of 0 implies a normal non-large-scale tile coding. A value of 1
+   * implies a large-scale tile coding.
+   */
+  unsigned int large_scale_tile;
+
+  /*!\brief Monochrome mode
+   *
+   * If this is nonzero, the encoder will generate a monochrome stream
+   * with no chroma planes.
+   */
+  unsigned int monochrome;
+
+  /*!\brief full_still_picture_hdr
+   *
+   * If this is nonzero, the encoder will generate a full header even for
+   * still picture encoding. if zero, a reduced header is used for still
+   * picture. This flag has no effect when a regular video with more than
+   * a single frame is encoded.
+   */
+  unsigned int full_still_picture_hdr;
+
+  /*!\brief Bitstream syntax mode
+   *
+   * This value indicates the bitstream syntax mode.
+   * A value of 0 indicates bitstream is saved as Section 5 bitstream. A value
+   * of 1 indicates the bitstream is saved in Annex-B format
+   */
+  unsigned int save_as_annexb;
+
+  /*!\brief Number of explicit tile widths specified
+   *
+   * This value indicates the number of tile widths specified
+   * A value of 0 implies no tile widths are specified.
+   * Tile widths are given in the array tile_widths[]
+   */
+  int tile_width_count;
+
+  /*!\brief Number of explicit tile heights specified
+   *
+   * This value indicates the number of tile heights specified
+   * A value of 0 implies no tile heights are specified.
+   * Tile heights are given in the array tile_heights[]
+   */
+  int tile_height_count;
+
+/*!\brief Maximum number of tile widths in tile widths array
+ *
+ * This define gives the maximum number of elements in the tile_widths array.
+ */
+#define MAX_TILE_WIDTHS 64  // maximum tile width array length
+
+  /*!\brief Array of specified tile widths
+   *
+   * This array specifies tile widths (and may be empty)
+   * The number of widths specified is given by tile_width_count
+   */
+  int tile_widths[MAX_TILE_WIDTHS];
+
+/*!\brief Maximum number of tile heights in tile heights array.
+ *
+ * This define gives the maximum number of elements in the tile_heights array.
+ */
+#define MAX_TILE_HEIGHTS 64  // maximum tile height array length
+
+  /*!\brief Array of specified tile heights
+   *
+   * This array specifies tile heights (and may be empty)
+   * The number of heights specified is given by tile_height_count
+   */
+  int tile_heights[MAX_TILE_HEIGHTS];
+
+  /*!\brief Whether encoder should use fixed QP offsets.
+   *
+   * If a value of 1 is provided, encoder will use fixed QP offsets for frames
+   * at different levels of the pyramid.
+   * - If 'fixed_qp_offsets' is also provided, encoder will use the given
+   * offsets
+   * - If not, encoder will select the fixed offsets based on the cq-level
+   *   provided.
+   * If a value of 0 is provided and fixed_qp_offset are not provided, encoder
+   * will NOT use fixed QP offsets.
+   * Note: This option is only relevant for --end-usage=q.
+   */
+  unsigned int use_fixed_qp_offsets;
+
+/*!\brief Number of fixed QP offsets
+ *
+ * This defines the number of elements in the fixed_qp_offsets array.
+ */
+#define FIXED_QP_OFFSET_COUNT 5
+
+  /*!\brief Array of fixed QP offsets
+   *
+   * This array specifies fixed QP offsets (range: 0 to 63) for frames at
+   * different levels of the pyramid. It is a comma-separated list of 5 values:
+   * - QP offset for keyframe
+   * - QP offset for ALTREF frame
+   * - QP offset for 1st level internal ARF
+   * - QP offset for 2nd level internal ARF
+   * - QP offset for 3rd level internal ARF
+   * Notes:
+   * - QP offset for leaf level frames is not explicitly specified. These frames
+   *   use the worst quality allowed (--cq-level).
+   * - This option is only relevant for --end-usage=q.
+   */
+  int fixed_qp_offsets[FIXED_QP_OFFSET_COUNT];
+
+  /*!\brief Options defined per config file
+   *
+   */
+  cfg_options_t encoder_cfg;
+} aom_codec_enc_cfg_t; /**< alias for struct aom_codec_enc_cfg */
+
+/*!\brief Initialize an encoder instance
+ *
+ * Initializes a encoder context using the given interface. Applications
+ * should call the aom_codec_enc_init convenience macro instead of this
+ * function directly, to ensure that the ABI version number parameter
+ * is properly initialized.
+ *
+ * If the library was configured with --disable-multithread, this call
+ * is not thread safe and should be guarded with a lock if being used
+ * in a multithreaded context.
+ *
+ * \param[in]    ctx     Pointer to this instance's context.
+ * \param[in]    iface   Pointer to the algorithm interface to use.
+ * \param[in]    cfg     Configuration to use, if known.
+ * \param[in]    flags   Bitfield of AOM_CODEC_USE_* flags
+ * \param[in]    ver     ABI version number. Must be set to
+ *                       AOM_ENCODER_ABI_VERSION
+ * \retval #AOM_CODEC_OK
+ *     The decoder algorithm initialized.
+ * \retval #AOM_CODEC_MEM_ERROR
+ *     Memory allocation failed.
+ */
+aom_codec_err_t aom_codec_enc_init_ver(aom_codec_ctx_t *ctx,
+                                       aom_codec_iface_t *iface,
+                                       const aom_codec_enc_cfg_t *cfg,
+                                       aom_codec_flags_t flags, int ver);
+
+/*!\brief Convenience macro for aom_codec_enc_init_ver()
+ *
+ * Ensures the ABI version parameter is properly set.
+ */
+#define aom_codec_enc_init(ctx, iface, cfg, flags) \
+  aom_codec_enc_init_ver(ctx, iface, cfg, flags, AOM_ENCODER_ABI_VERSION)
+
+/*!\brief Get the default configuration for a usage.
+ *
+ * Initializes an encoder configuration structure with default values. Supports
+ * the notion of "usages" so that an algorithm may offer different default
+ * settings depending on the user's intended goal. This function \ref SHOULD
+ * be called by all applications to initialize the configuration structure
+ * before specializing the configuration with application specific values.
+ *
+ * \param[in]    iface     Pointer to the algorithm interface to use.
+ * \param[out]   cfg       Configuration buffer to populate.
+ * \param[in]    usage     Algorithm specific usage value. For AV1, must be
+ *                         set to AOM_USAGE_GOOD_QUALITY (0) or
+ *                         AOM_USAGE_REALTIME (1).
+ *
+ * \retval #AOM_CODEC_OK
+ *     The configuration was populated.
+ * \retval #AOM_CODEC_INCAPABLE
+ *     Interface is not an encoder interface.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     A parameter was NULL, or the usage value was not recognized.
+ */
+aom_codec_err_t aom_codec_enc_config_default(aom_codec_iface_t *iface,
+                                             aom_codec_enc_cfg_t *cfg,
+                                             unsigned int usage);
+
+/*!\brief Set or change configuration
+ *
+ * Reconfigures an encoder instance according to the given configuration.
+ *
+ * \param[in]    ctx     Pointer to this instance's context
+ * \param[in]    cfg     Configuration buffer to use
+ *
+ * \retval #AOM_CODEC_OK
+ *     The configuration was populated.
+ * \retval #AOM_CODEC_INCAPABLE
+ *     Interface is not an encoder interface.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     A parameter was NULL, or the usage value was not recognized.
+ */
+aom_codec_err_t aom_codec_enc_config_set(aom_codec_ctx_t *ctx,
+                                         const aom_codec_enc_cfg_t *cfg);
+
+/*!\brief Get global stream headers
+ *
+ * Retrieves a stream level global header packet, if supported by the codec.
+ * Calls to this function should be deferred until all configuration information
+ * has been passed to libaom. Otherwise the global header data may be
+ * invalidated by additional configuration changes.
+ *
+ * The AV1 implementation of this function returns an OBU. The OBU returned is
+ * in Low Overhead Bitstream Format. Specifically, the obu_has_size_field bit is
+ * set, and the buffer contains the obu_size field for the returned OBU.
+ *
+ * \param[in]    ctx     Pointer to this instance's context
+ *
+ * \retval NULL
+ *     Encoder does not support global header, or an error occurred while
+ *     generating the global header.
+ *
+ * \retval Non-NULL
+ *     Pointer to buffer containing global header packet. The caller owns the
+ *     memory associated with this buffer, and must free the 'buf' member of the
+ *     aom_fixed_buf_t as well as the aom_fixed_buf_t pointer. Memory returned
+ *     must be freed via call to free().
+ */
+aom_fixed_buf_t *aom_codec_get_global_headers(aom_codec_ctx_t *ctx);
+
+/*!\brief usage parameter analogous to AV1 GOOD QUALITY mode. */
+#define AOM_USAGE_GOOD_QUALITY (0)
+/*!\brief usage parameter analogous to AV1 REALTIME mode. */
+#define AOM_USAGE_REALTIME (1)
+
+/*!\brief Encode a frame
+ *
+ * Encodes a video frame at the given "presentation time." The presentation
+ * time stamp (PTS) \ref MUST be strictly increasing.
+ *
+ * When the last frame has been passed to the encoder, this function should
+ * continue to be called in a loop, with the img parameter set to NULL. This
+ * will signal the end-of-stream condition to the encoder and allow it to
+ * encode any held buffers. Encoding is complete when aom_codec_encode() is
+ * called with img set to NULL and aom_codec_get_cx_data() returns no data.
+ *
+ * \param[in]    ctx       Pointer to this instance's context
+ * \param[in]    img       Image data to encode, NULL to flush.
+ * \param[in]    pts       Presentation time stamp, in timebase units. If img
+ *                         is NULL, pts is ignored.
+ * \param[in]    duration  Duration to show frame, in timebase units. If img
+ *                         is not NULL, duration must be nonzero. If img is
+ *                         NULL, duration is ignored.
+ * \param[in]    flags     Flags to use for encoding this frame.
+ *
+ * \retval #AOM_CODEC_OK
+ *     The configuration was populated.
+ * \retval #AOM_CODEC_INCAPABLE
+ *     Interface is not an encoder interface.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     A parameter was NULL, the image format is unsupported, etc.
+ */
+aom_codec_err_t aom_codec_encode(aom_codec_ctx_t *ctx, const aom_image_t *img,
+                                 aom_codec_pts_t pts, unsigned long duration,
+                                 aom_enc_frame_flags_t flags);
+
+/*!\brief Set compressed data output buffer
+ *
+ * Sets the buffer that the codec should output the compressed data
+ * into. This call effectively sets the buffer pointer returned in the
+ * next AOM_CODEC_CX_FRAME_PKT packet. Subsequent packets will be
+ * appended into this buffer. The buffer is preserved across frames,
+ * so applications must periodically call this function after flushing
+ * the accumulated compressed data to disk or to the network to reset
+ * the pointer to the buffer's head.
+ *
+ * `pad_before` bytes will be skipped before writing the compressed
+ * data, and `pad_after` bytes will be appended to the packet. The size
+ * of the packet will be the sum of the size of the actual compressed
+ * data, pad_before, and pad_after. The padding bytes will be preserved
+ * (not overwritten).
+ *
+ * Note that calling this function does not guarantee that the returned
+ * compressed data will be placed into the specified buffer. In the
+ * event that the encoded data will not fit into the buffer provided,
+ * the returned packet \ref MAY point to an internal buffer, as it would
+ * if this call were never used. In this event, the output packet will
+ * NOT have any padding, and the application must free space and copy it
+ * to the proper place. This is of particular note in configurations
+ * that may output multiple packets for a single encoded frame (e.g., lagged
+ * encoding) or if the application does not reset the buffer periodically.
+ *
+ * Applications may restore the default behavior of the codec providing
+ * the compressed data buffer by calling this function with a NULL
+ * buffer.
+ *
+ * Applications \ref MUSTNOT call this function during iteration of
+ * aom_codec_get_cx_data().
+ *
+ * \param[in]    ctx         Pointer to this instance's context
+ * \param[in]    buf         Buffer to store compressed data into
+ * \param[in]    pad_before  Bytes to skip before writing compressed data
+ * \param[in]    pad_after   Bytes to skip after writing compressed data
+ *
+ * \retval #AOM_CODEC_OK
+ *     The buffer was set successfully.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     A parameter was NULL, the image format is unsupported, etc.
+ */
+aom_codec_err_t aom_codec_set_cx_data_buf(aom_codec_ctx_t *ctx,
+                                          const aom_fixed_buf_t *buf,
+                                          unsigned int pad_before,
+                                          unsigned int pad_after);
+
+/*!\brief Encoded data iterator
+ *
+ * Iterates over a list of data packets to be passed from the encoder to the
+ * application. The different kinds of packets available are enumerated in
+ * #aom_codec_cx_pkt_kind.
+ *
+ * #AOM_CODEC_CX_FRAME_PKT packets should be passed to the application's
+ * muxer. Multiple compressed frames may be in the list.
+ * #AOM_CODEC_STATS_PKT packets should be appended to a global buffer.
+ *
+ * The application \ref MUST silently ignore any packet kinds that it does
+ * not recognize or support.
+ *
+ * The data buffers returned from this function are only guaranteed to be
+ * valid until the application makes another call to any aom_codec_* function.
+ *
+ * \param[in]     ctx      Pointer to this instance's context
+ * \param[in,out] iter     Iterator storage, initialized to NULL
+ *
+ * \return Returns a pointer to an output data packet (compressed frame data,
+ *         two-pass statistics, etc.) or NULL to signal end-of-list.
+ *
+ */
+const aom_codec_cx_pkt_t *aom_codec_get_cx_data(aom_codec_ctx_t *ctx,
+                                                aom_codec_iter_t *iter);
+
+/*!\brief Get Preview Frame
+ *
+ * Returns an image that can be used as a preview. Shows the image as it would
+ * exist at the decompressor. The application \ref MUST NOT write into this
+ * image buffer.
+ *
+ * \param[in]     ctx      Pointer to this instance's context
+ *
+ * \return Returns a pointer to a preview image, or NULL if no image is
+ *         available.
+ *
+ */
+const aom_image_t *aom_codec_get_preview_frame(aom_codec_ctx_t *ctx);
+
+/*!@} - end defgroup encoder*/
+#ifdef __cplusplus
+}
+#endif
+#endif  // AOM_AOM_AOM_ENCODER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_frame_buffer.h b/pxr/imaging/plugin/hioAvif/aom/aom_frame_buffer.h
new file mode 100644
index 0000000000..fe5e230e51
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_frame_buffer.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_AOM_FRAME_BUFFER_H_
+#define AOM_AOM_AOM_FRAME_BUFFER_H_
+
+/*!\file
+ * \brief Describes the decoder external frame buffer interface.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+/*!\brief The maximum number of work buffers used by libaom.
+ *  Support maximum 4 threads to decode video in parallel.
+ *  Each thread will use one work buffer.
+ * TODO(hkuang): Add support to set number of worker threads dynamically.
+ */
+#define AOM_MAXIMUM_WORK_BUFFERS 8
+
+/*!\brief The maximum number of reference buffers that a AV1 encoder may use.
+ */
+#define AOM_MAXIMUM_REF_BUFFERS 8
+
+/*!\brief External frame buffer
+ *
+ * This structure holds allocated frame buffers used by the decoder.
+ */
+typedef struct aom_codec_frame_buffer {
+  uint8_t *data; /**< Pointer to the data buffer */
+  size_t size;   /**< Size of data in bytes */
+  void *priv;    /**< Frame's private data */
+} aom_codec_frame_buffer_t;
+
+/*!\brief get frame buffer callback prototype
+ *
+ * This callback is invoked by the decoder to retrieve data for the frame
+ * buffer in order for the decode call to complete. The callback must
+ * allocate at least min_size in bytes and assign it to fb->data. The callback
+ * must zero out all the data allocated. Then the callback must set fb->size
+ * to the allocated size. The application does not need to align the allocated
+ * data. The callback is triggered when the decoder needs a frame buffer to
+ * decode a compressed image into. This function may be called more than once
+ * for every call to aom_codec_decode. The application may set fb->priv to
+ * some data which will be passed back in the aom_image_t and the release
+ * function call. |fb| is guaranteed to not be NULL. On success the callback
+ * must return 0. Any failure the callback must return a value less than 0.
+ *
+ * \param[in] priv         Callback's private data
+ * \param[in] min_size     Size in bytes needed by the buffer
+ * \param[in,out] fb       Pointer to aom_codec_frame_buffer_t
+ */
+typedef int (*aom_get_frame_buffer_cb_fn_t)(void *priv, size_t min_size,
+                                            aom_codec_frame_buffer_t *fb);
+
+/*!\brief release frame buffer callback prototype
+ *
+ * This callback is invoked by the decoder when the frame buffer is not
+ * referenced by any other buffers. |fb| is guaranteed to not be NULL. On
+ * success the callback must return 0. Any failure the callback must return
+ * a value less than 0.
+ *
+ * \param[in] priv         Callback's private data
+ * \param[in] fb           Pointer to aom_codec_frame_buffer_t
+ */
+typedef int (*aom_release_frame_buffer_cb_fn_t)(void *priv,
+                                                aom_codec_frame_buffer_t *fb);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_AOM_FRAME_BUFFER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_image.c b/pxr/imaging/plugin/hioAvif/aom/aom_image.c
new file mode 100644
index 0000000000..53a97db717
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_image.c
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_image.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_image_internal.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+
+static INLINE unsigned int align_image_dimension(unsigned int d,
+                                                 unsigned int subsampling,
+                                                 unsigned int size_align) {
+  unsigned int align;
+
+  align = (1 << subsampling) - 1;
+  align = (size_align - 1 > align) ? (size_align - 1) : align;
+  return ((d + align) & ~align);
+}
+
+static aom_image_t *img_alloc_helper(
+    aom_image_t *img, aom_img_fmt_t fmt, unsigned int d_w, unsigned int d_h,
+    unsigned int buf_align, unsigned int stride_align, unsigned int size_align,
+    unsigned int border, unsigned char *img_data,
+    aom_alloc_img_data_cb_fn_t alloc_cb, void *cb_priv) {
+  /* NOTE: In this function, bit_depth is either 8 or 16 (if
+   * AOM_IMG_FMT_HIGHBITDEPTH is set), never 10 or 12.
+   */
+  unsigned int h, w, s, xcs, ycs, bps, bit_depth;
+  unsigned int stride_in_bytes;
+
+  /* Treat align==0 like align==1 */
+  if (!buf_align) buf_align = 1;
+
+  /* Validate alignment (must be power of 2) */
+  if (buf_align & (buf_align - 1)) goto fail;
+
+  /* Treat align==0 like align==1 */
+  if (!stride_align) stride_align = 1;
+
+  /* Validate alignment (must be power of 2) */
+  if (stride_align & (stride_align - 1)) goto fail;
+
+  /* Treat align==0 like align==1 */
+  if (!size_align) size_align = 1;
+
+  /* Validate alignment (must be power of 2) */
+  if (size_align & (size_align - 1)) goto fail;
+
+  /* Get sample size for this format */
+  switch (fmt) {
+    case AOM_IMG_FMT_I420:
+    case AOM_IMG_FMT_YV12:
+    case AOM_IMG_FMT_AOMI420:
+    case AOM_IMG_FMT_AOMYV12: bps = 12; break;
+    case AOM_IMG_FMT_I422: bps = 16; break;
+    case AOM_IMG_FMT_I444: bps = 24; break;
+    case AOM_IMG_FMT_YV1216:
+    case AOM_IMG_FMT_I42016: bps = 24; break;
+    case AOM_IMG_FMT_I42216: bps = 32; break;
+    case AOM_IMG_FMT_I44416: bps = 48; break;
+    default: bps = 16; break;
+  }
+
+  bit_depth = (fmt & AOM_IMG_FMT_HIGHBITDEPTH) ? 16 : 8;
+
+  /* Get chroma shift values for this format */
+  switch (fmt) {
+    case AOM_IMG_FMT_I420:
+    case AOM_IMG_FMT_YV12:
+    case AOM_IMG_FMT_AOMI420:
+    case AOM_IMG_FMT_AOMYV12:
+    case AOM_IMG_FMT_I422:
+    case AOM_IMG_FMT_I42016:
+    case AOM_IMG_FMT_YV1216:
+    case AOM_IMG_FMT_I42216: xcs = 1; break;
+    default: xcs = 0; break;
+  }
+
+  switch (fmt) {
+    case AOM_IMG_FMT_I420:
+    case AOM_IMG_FMT_YV12:
+    case AOM_IMG_FMT_AOMI420:
+    case AOM_IMG_FMT_AOMYV12:
+    case AOM_IMG_FMT_YV1216:
+    case AOM_IMG_FMT_I42016: ycs = 1; break;
+    default: ycs = 0; break;
+  }
+
+  /* Calculate storage sizes given the chroma subsampling */
+  w = align_image_dimension(d_w, xcs, size_align);
+  h = align_image_dimension(d_h, ycs, size_align);
+
+  s = (fmt & AOM_IMG_FMT_PLANAR) ? w : bps * w / bit_depth;
+  s = (s + 2 * border + stride_align - 1) & ~(stride_align - 1);
+  stride_in_bytes = s * bit_depth / 8;
+
+  /* Allocate the new image */
+  if (!img) {
+    img = (aom_image_t *)calloc(1, sizeof(aom_image_t));
+
+    if (!img) goto fail;
+
+    img->self_allocd = 1;
+  } else {
+    memset(img, 0, sizeof(aom_image_t));
+  }
+
+  img->img_data = img_data;
+
+  if (!img_data) {
+    const uint64_t alloc_size =
+        (fmt & AOM_IMG_FMT_PLANAR)
+            ? (uint64_t)(h + 2 * border) * stride_in_bytes * bps / bit_depth
+            : (uint64_t)(h + 2 * border) * stride_in_bytes;
+
+    if (alloc_size != (size_t)alloc_size) goto fail;
+
+    if (alloc_cb) {
+      const size_t padded_alloc_size = (size_t)alloc_size + buf_align - 1;
+      img->img_data = (uint8_t *)alloc_cb(cb_priv, padded_alloc_size);
+      if (img->img_data) {
+        img->img_data = (uint8_t *)aom_align_addr(img->img_data, buf_align);
+      }
+      img->img_data_owner = 0;
+    } else {
+      img->img_data = (uint8_t *)aom_memalign(buf_align, (size_t)alloc_size);
+      img->img_data_owner = 1;
+    }
+    img->sz = (size_t)alloc_size;
+  }
+
+  if (!img->img_data) goto fail;
+
+  img->fmt = fmt;
+  img->bit_depth = bit_depth;
+  // aligned width and aligned height
+  img->w = w;
+  img->h = h;
+  img->x_chroma_shift = xcs;
+  img->y_chroma_shift = ycs;
+  img->bps = bps;
+
+  /* Calculate strides */
+  img->stride[AOM_PLANE_Y] = stride_in_bytes;
+  img->stride[AOM_PLANE_U] = img->stride[AOM_PLANE_V] = stride_in_bytes >> xcs;
+
+  /* Default viewport to entire image. (This aom_img_set_rect call always
+   * succeeds.) */
+  aom_img_set_rect(img, 0, 0, d_w, d_h, border);
+  return img;
+
+fail:
+  aom_img_free(img);
+  return NULL;
+}
+
+aom_image_t *aom_img_alloc(aom_image_t *img, aom_img_fmt_t fmt,
+                           unsigned int d_w, unsigned int d_h,
+                           unsigned int align) {
+  return img_alloc_helper(img, fmt, d_w, d_h, align, align, 1, 0, NULL, NULL,
+                          NULL);
+}
+
+aom_image_t *aom_img_alloc_with_cb(aom_image_t *img, aom_img_fmt_t fmt,
+                                   unsigned int d_w, unsigned int d_h,
+                                   unsigned int align,
+                                   aom_alloc_img_data_cb_fn_t alloc_cb,
+                                   void *cb_priv) {
+  return img_alloc_helper(img, fmt, d_w, d_h, align, align, 1, 0, NULL,
+                          alloc_cb, cb_priv);
+}
+
+aom_image_t *aom_img_wrap(aom_image_t *img, aom_img_fmt_t fmt, unsigned int d_w,
+                          unsigned int d_h, unsigned int stride_align,
+                          unsigned char *img_data) {
+  /* Set buf_align = 1. It is ignored by img_alloc_helper because img_data is
+   * not NULL. */
+  return img_alloc_helper(img, fmt, d_w, d_h, 1, stride_align, 1, 0, img_data,
+                          NULL, NULL);
+}
+
+aom_image_t *aom_img_alloc_with_border(aom_image_t *img, aom_img_fmt_t fmt,
+                                       unsigned int d_w, unsigned int d_h,
+                                       unsigned int align,
+                                       unsigned int size_align,
+                                       unsigned int border) {
+  return img_alloc_helper(img, fmt, d_w, d_h, align, align, size_align, border,
+                          NULL, NULL, NULL);
+}
+
+int aom_img_set_rect(aom_image_t *img, unsigned int x, unsigned int y,
+                     unsigned int w, unsigned int h, unsigned int border) {
+  unsigned char *data;
+
+  if (x + w <= img->w && y + h <= img->h) {
+    img->d_w = w;
+    img->d_h = h;
+
+    x += border;
+    y += border;
+
+    /* Calculate plane pointers */
+    if (!(img->fmt & AOM_IMG_FMT_PLANAR)) {
+      img->planes[AOM_PLANE_PACKED] =
+          img->img_data + x * img->bps / 8 + y * img->stride[AOM_PLANE_PACKED];
+    } else {
+      const int bytes_per_sample =
+          (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) ? 2 : 1;
+      data = img->img_data;
+
+      img->planes[AOM_PLANE_Y] =
+          data + x * bytes_per_sample + y * img->stride[AOM_PLANE_Y];
+      data += (img->h + 2 * border) * img->stride[AOM_PLANE_Y];
+
+      unsigned int uv_border_h = border >> img->y_chroma_shift;
+      unsigned int uv_x = x >> img->x_chroma_shift;
+      unsigned int uv_y = y >> img->y_chroma_shift;
+      if (!(img->fmt & AOM_IMG_FMT_UV_FLIP)) {
+        img->planes[AOM_PLANE_U] =
+            data + uv_x * bytes_per_sample + uv_y * img->stride[AOM_PLANE_U];
+        data += ((img->h >> img->y_chroma_shift) + 2 * uv_border_h) *
+                img->stride[AOM_PLANE_U];
+        img->planes[AOM_PLANE_V] =
+            data + uv_x * bytes_per_sample + uv_y * img->stride[AOM_PLANE_V];
+      } else {
+        img->planes[AOM_PLANE_V] =
+            data + uv_x * bytes_per_sample + uv_y * img->stride[AOM_PLANE_V];
+        data += ((img->h >> img->y_chroma_shift) + 2 * uv_border_h) *
+                img->stride[AOM_PLANE_V];
+        img->planes[AOM_PLANE_U] =
+            data + uv_x * bytes_per_sample + uv_y * img->stride[AOM_PLANE_U];
+      }
+    }
+    return 0;
+  }
+  return -1;
+}
+
+void aom_img_flip(aom_image_t *img) {
+  /* Note: In the calculation pointer adjustment calculation, we want the
+   * rhs to be promoted to a signed type. Section 6.3.1.8 of the ISO C99
+   * standard indicates that if the adjustment parameter is unsigned, the
+   * stride parameter will be promoted to unsigned, causing errors when
+   * the lhs is a larger type than the rhs.
+   */
+  img->planes[AOM_PLANE_Y] += (signed)(img->d_h - 1) * img->stride[AOM_PLANE_Y];
+  img->stride[AOM_PLANE_Y] = -img->stride[AOM_PLANE_Y];
+
+  img->planes[AOM_PLANE_U] += (signed)((img->d_h >> img->y_chroma_shift) - 1) *
+                              img->stride[AOM_PLANE_U];
+  img->stride[AOM_PLANE_U] = -img->stride[AOM_PLANE_U];
+
+  img->planes[AOM_PLANE_V] += (signed)((img->d_h >> img->y_chroma_shift) - 1) *
+                              img->stride[AOM_PLANE_V];
+  img->stride[AOM_PLANE_V] = -img->stride[AOM_PLANE_V];
+}
+
+void aom_img_free(aom_image_t *img) {
+  if (img) {
+    aom_img_remove_metadata(img);
+    if (img->img_data && img->img_data_owner) aom_free(img->img_data);
+
+    if (img->self_allocd) free(img);
+  }
+}
+
+int aom_img_plane_width(const aom_image_t *img, int plane) {
+  if (plane > 0 && img->x_chroma_shift > 0)
+    return (img->d_w + 1) >> img->x_chroma_shift;
+  else
+    return img->d_w;
+}
+
+int aom_img_plane_height(const aom_image_t *img, int plane) {
+  if (plane > 0 && img->y_chroma_shift > 0)
+    return (img->d_h + 1) >> img->y_chroma_shift;
+  else
+    return img->d_h;
+}
+
+aom_metadata_t *aom_img_metadata_alloc(
+    uint32_t type, const uint8_t *data, size_t sz,
+    aom_metadata_insert_flags_t insert_flag) {
+  if (!data || sz == 0) return NULL;
+  aom_metadata_t *metadata = (aom_metadata_t *)malloc(sizeof(aom_metadata_t));
+  if (!metadata) return NULL;
+  metadata->type = type;
+  metadata->payload = (uint8_t *)malloc(sz);
+  if (!metadata->payload) {
+    free(metadata);
+    return NULL;
+  }
+  memcpy(metadata->payload, data, sz);
+  metadata->sz = sz;
+  metadata->insert_flag = insert_flag;
+  return metadata;
+}
+
+void aom_img_metadata_free(aom_metadata_t *metadata) {
+  if (metadata) {
+    if (metadata->payload) free(metadata->payload);
+    free(metadata);
+  }
+}
+
+aom_metadata_array_t *aom_img_metadata_array_alloc(size_t sz) {
+  aom_metadata_array_t *arr =
+      (aom_metadata_array_t *)calloc(1, sizeof(aom_metadata_array_t));
+  if (!arr) return NULL;
+  if (sz > 0) {
+    arr->metadata_array =
+        (aom_metadata_t **)calloc(sz, sizeof(aom_metadata_t *));
+    if (!arr->metadata_array) {
+      aom_img_metadata_array_free(arr);
+      return NULL;
+    }
+    arr->sz = sz;
+  }
+  return arr;
+}
+
+void aom_img_metadata_array_free(aom_metadata_array_t *arr) {
+  if (arr) {
+    if (arr->metadata_array) {
+      for (size_t i = 0; i < arr->sz; i++) {
+        aom_img_metadata_free(arr->metadata_array[i]);
+      }
+      free(arr->metadata_array);
+    }
+    free(arr);
+  }
+}
+
+int aom_img_add_metadata(aom_image_t *img, uint32_t type, const uint8_t *data,
+                         size_t sz, aom_metadata_insert_flags_t insert_flag) {
+  if (!img) return -1;
+  if (!img->metadata) {
+    img->metadata = aom_img_metadata_array_alloc(0);
+    if (!img->metadata) return -1;
+  }
+  aom_metadata_t *metadata =
+      aom_img_metadata_alloc(type, data, sz, insert_flag);
+  if (!metadata) return -1;
+  aom_metadata_t **metadata_array =
+      (aom_metadata_t **)realloc(img->metadata->metadata_array,
+                                 (img->metadata->sz + 1) * sizeof(metadata));
+  if (!metadata_array) {
+    aom_img_metadata_free(metadata);
+    return -1;
+  }
+  img->metadata->metadata_array = metadata_array;
+  img->metadata->metadata_array[img->metadata->sz] = metadata;
+  img->metadata->sz++;
+  return 0;
+}
+
+void aom_img_remove_metadata(aom_image_t *img) {
+  if (img && img->metadata) {
+    aom_img_metadata_array_free(img->metadata);
+    img->metadata = NULL;
+  }
+}
+
+const aom_metadata_t *aom_img_get_metadata(const aom_image_t *img,
+                                           size_t index) {
+  if (!img) return NULL;
+  const aom_metadata_array_t *array = img->metadata;
+  if (array && index < array->sz) {
+    return array->metadata_array[index];
+  }
+  return NULL;
+}
+
+size_t aom_img_num_metadata(const aom_image_t *img) {
+  if (!img || !img->metadata) return 0;
+  return img->metadata->sz;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_image.h b/pxr/imaging/plugin/hioAvif/aom/aom_image.h
new file mode 100644
index 0000000000..2c9fe00d61
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_image.h
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\file
+ * \brief Describes the aom image descriptor and associated operations
+ *
+ */
+#ifndef AOM_AOM_AOM_IMAGE_H_
+#define AOM_AOM_AOM_IMAGE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+/*!\brief Current ABI version number
+ *
+ * \internal
+ * If this file is altered in any way that changes the ABI, this value
+ * must be bumped.  Examples include, but are not limited to, changing
+ * types, removing or reassigning enums, adding/removing/rearranging
+ * fields to structures
+ */
+#define AOM_IMAGE_ABI_VERSION (9) /**<\hideinitializer*/
+
+#define AOM_IMG_FMT_PLANAR 0x100  /**< Image is a planar format. */
+#define AOM_IMG_FMT_UV_FLIP 0x200 /**< V plane precedes U in memory. */
+/** 0x400 used to signal alpha channel, skipping for backwards compatibility. */
+#define AOM_IMG_FMT_HIGHBITDEPTH 0x800 /**< Image uses 16bit framebuffer. */
+
+/*!\brief List of supported image formats */
+typedef enum aom_img_fmt {
+  AOM_IMG_FMT_NONE,
+  AOM_IMG_FMT_YV12 =
+      AOM_IMG_FMT_PLANAR | AOM_IMG_FMT_UV_FLIP | 1, /**< planar YVU */
+  AOM_IMG_FMT_I420 = AOM_IMG_FMT_PLANAR | 2,
+  AOM_IMG_FMT_AOMYV12 = AOM_IMG_FMT_PLANAR | AOM_IMG_FMT_UV_FLIP |
+                        3, /** < planar 4:2:0 format with aom color space */
+  AOM_IMG_FMT_AOMI420 = AOM_IMG_FMT_PLANAR | 4,
+  AOM_IMG_FMT_I422 = AOM_IMG_FMT_PLANAR | 5,
+  AOM_IMG_FMT_I444 = AOM_IMG_FMT_PLANAR | 6,
+  AOM_IMG_FMT_I42016 = AOM_IMG_FMT_I420 | AOM_IMG_FMT_HIGHBITDEPTH,
+  AOM_IMG_FMT_YV1216 = AOM_IMG_FMT_YV12 | AOM_IMG_FMT_HIGHBITDEPTH,
+  AOM_IMG_FMT_I42216 = AOM_IMG_FMT_I422 | AOM_IMG_FMT_HIGHBITDEPTH,
+  AOM_IMG_FMT_I44416 = AOM_IMG_FMT_I444 | AOM_IMG_FMT_HIGHBITDEPTH,
+} aom_img_fmt_t; /**< alias for enum aom_img_fmt */
+
+/*!\brief List of supported color primaries */
+typedef enum aom_color_primaries {
+  AOM_CICP_CP_RESERVED_0 = 0,  /**< For future use */
+  AOM_CICP_CP_BT_709 = 1,      /**< BT.709 */
+  AOM_CICP_CP_UNSPECIFIED = 2, /**< Unspecified */
+  AOM_CICP_CP_RESERVED_3 = 3,  /**< For future use */
+  AOM_CICP_CP_BT_470_M = 4,    /**< BT.470 System M (historical) */
+  AOM_CICP_CP_BT_470_B_G = 5,  /**< BT.470 System B, G (historical) */
+  AOM_CICP_CP_BT_601 = 6,      /**< BT.601 */
+  AOM_CICP_CP_SMPTE_240 = 7,   /**< SMPTE 240 */
+  AOM_CICP_CP_GENERIC_FILM =
+      8, /**< Generic film (color filters using illuminant C) */
+  AOM_CICP_CP_BT_2020 = 9,      /**< BT.2020, BT.2100 */
+  AOM_CICP_CP_XYZ = 10,         /**< SMPTE 428 (CIE 1921 XYZ) */
+  AOM_CICP_CP_SMPTE_431 = 11,   /**< SMPTE RP 431-2 */
+  AOM_CICP_CP_SMPTE_432 = 12,   /**< SMPTE EG 432-1  */
+  AOM_CICP_CP_RESERVED_13 = 13, /**< For future use (values 13 - 21)  */
+  AOM_CICP_CP_EBU_3213 = 22,    /**< EBU Tech. 3213-E  */
+  AOM_CICP_CP_RESERVED_23 = 23  /**< For future use (values 23 - 255)  */
+} aom_color_primaries_t;        /**< alias for enum aom_color_primaries */
+
+/*!\brief List of supported transfer functions */
+typedef enum aom_transfer_characteristics {
+  AOM_CICP_TC_RESERVED_0 = 0,  /**< For future use */
+  AOM_CICP_TC_BT_709 = 1,      /**< BT.709 */
+  AOM_CICP_TC_UNSPECIFIED = 2, /**< Unspecified */
+  AOM_CICP_TC_RESERVED_3 = 3,  /**< For future use */
+  AOM_CICP_TC_BT_470_M = 4,    /**< BT.470 System M (historical)  */
+  AOM_CICP_TC_BT_470_B_G = 5,  /**< BT.470 System B, G (historical) */
+  AOM_CICP_TC_BT_601 = 6,      /**< BT.601 */
+  AOM_CICP_TC_SMPTE_240 = 7,   /**< SMPTE 240 M */
+  AOM_CICP_TC_LINEAR = 8,      /**< Linear */
+  AOM_CICP_TC_LOG_100 = 9,     /**< Logarithmic (100 : 1 range) */
+  AOM_CICP_TC_LOG_100_SQRT10 =
+      10,                     /**< Logarithmic (100 * Sqrt(10) : 1 range) */
+  AOM_CICP_TC_IEC_61966 = 11, /**< IEC 61966-2-4 */
+  AOM_CICP_TC_BT_1361 = 12,   /**< BT.1361 */
+  AOM_CICP_TC_SRGB = 13,      /**< sRGB or sYCC*/
+  AOM_CICP_TC_BT_2020_10_BIT = 14, /**< BT.2020 10-bit systems */
+  AOM_CICP_TC_BT_2020_12_BIT = 15, /**< BT.2020 12-bit systems */
+  AOM_CICP_TC_SMPTE_2084 = 16,     /**< SMPTE ST 2084, ITU BT.2100 PQ */
+  AOM_CICP_TC_SMPTE_428 = 17,      /**< SMPTE ST 428 */
+  AOM_CICP_TC_HLG = 18,            /**< BT.2100 HLG, ARIB STD-B67 */
+  AOM_CICP_TC_RESERVED_19 = 19     /**< For future use (values 19-255) */
+} aom_transfer_characteristics_t;  /**< alias for enum aom_transfer_function */
+
+/*!\brief List of supported matrix coefficients */
+typedef enum aom_matrix_coefficients {
+  AOM_CICP_MC_IDENTITY = 0,    /**< Identity matrix */
+  AOM_CICP_MC_BT_709 = 1,      /**< BT.709 */
+  AOM_CICP_MC_UNSPECIFIED = 2, /**< Unspecified */
+  AOM_CICP_MC_RESERVED_3 = 3,  /**< For future use */
+  AOM_CICP_MC_FCC = 4,         /**< US FCC 73.628 */
+  AOM_CICP_MC_BT_470_B_G = 5,  /**< BT.470 System B, G (historical) */
+  AOM_CICP_MC_BT_601 = 6,      /**< BT.601 */
+  AOM_CICP_MC_SMPTE_240 = 7,   /**< SMPTE 240 M */
+  AOM_CICP_MC_SMPTE_YCGCO = 8, /**< YCgCo */
+  AOM_CICP_MC_BT_2020_NCL =
+      9, /**< BT.2020 non-constant luminance, BT.2100 YCbCr  */
+  AOM_CICP_MC_BT_2020_CL = 10, /**< BT.2020 constant luminance */
+  AOM_CICP_MC_SMPTE_2085 = 11, /**< SMPTE ST 2085 YDzDx */
+  AOM_CICP_MC_CHROMAT_NCL =
+      12, /**< Chromaticity-derived non-constant luminance */
+  AOM_CICP_MC_CHROMAT_CL = 13, /**< Chromaticity-derived constant luminance */
+  AOM_CICP_MC_ICTCP = 14,      /**< BT.2100 ICtCp */
+  AOM_CICP_MC_RESERVED_15 = 15 /**< For future use (values 15-255)  */
+} aom_matrix_coefficients_t;
+
+/*!\brief List of supported color range */
+typedef enum aom_color_range {
+  AOM_CR_STUDIO_RANGE = 0, /**< Y [16..235], UV [16..240] */
+  AOM_CR_FULL_RANGE = 1    /**< YUV/RGB [0..255] */
+} aom_color_range_t;       /**< alias for enum aom_color_range */
+
+/*!\brief List of chroma sample positions */
+typedef enum aom_chroma_sample_position {
+  AOM_CSP_UNKNOWN = 0,          /**< Unknown */
+  AOM_CSP_VERTICAL = 1,         /**< Horizontally co-located with luma(0, 0)*/
+                                /**< sample, between two vertical samples */
+  AOM_CSP_COLOCATED = 2,        /**< Co-located with luma(0, 0) sample */
+  AOM_CSP_RESERVED = 3          /**< Reserved value */
+} aom_chroma_sample_position_t; /**< alias for enum aom_transfer_function */
+
+/*!\brief List of insert flags for Metadata
+ *
+ * These flags control how the library treats metadata during encode.
+ *
+ * While encoding, when metadata is added to an aom_image via
+ * aom_img_add_metadata(), the flag passed along with the metadata will
+ * determine where the metadata OBU will be placed in the encoded OBU stream.
+ * Metadata will be emitted into the output stream within the next temporal unit
+ * if it satisfies the specified insertion flag.
+ *
+ * During decoding, when the library encounters a metadata OBU, it is always
+ * flagged as AOM_MIF_ANY_FRAME and emitted with the next output aom_image.
+ */
+typedef enum aom_metadata_insert_flags {
+  AOM_MIF_NON_KEY_FRAME = 0, /**< Adds metadata if it's not keyframe */
+  AOM_MIF_KEY_FRAME = 1,     /**< Adds metadata only if it's a keyframe */
+  AOM_MIF_ANY_FRAME = 2      /**< Adds metadata to any type of frame */
+} aom_metadata_insert_flags_t;
+
+/*!\brief Array of aom_metadata structs for an image. */
+typedef struct aom_metadata_array aom_metadata_array_t;
+
+/*!\brief Metadata payload. */
+typedef struct aom_metadata {
+  uint32_t type;                           /**< Metadata type */
+  uint8_t *payload;                        /**< Metadata payload data */
+  size_t sz;                               /**< Metadata payload size */
+  aom_metadata_insert_flags_t insert_flag; /**< Metadata insertion flag */
+} aom_metadata_t;
+
+/**\brief Image Descriptor */
+typedef struct aom_image {
+  aom_img_fmt_t fmt;                 /**< Image Format */
+  aom_color_primaries_t cp;          /**< CICP Color Primaries */
+  aom_transfer_characteristics_t tc; /**< CICP Transfer Characteristics */
+  aom_matrix_coefficients_t mc;      /**< CICP Matrix Coefficients */
+  int monochrome;                    /**< Whether image is monochrome */
+  aom_chroma_sample_position_t csp;  /**< chroma sample position */
+  aom_color_range_t range;           /**< Color Range */
+
+  /* Image storage dimensions */
+  unsigned int w;         /**< Stored image width */
+  unsigned int h;         /**< Stored image height */
+  unsigned int bit_depth; /**< Stored image bit-depth */
+
+  /* Image display dimensions */
+  unsigned int d_w; /**< Displayed image width */
+  unsigned int d_h; /**< Displayed image height */
+
+  /* Image intended rendering dimensions */
+  unsigned int r_w; /**< Intended rendering image width */
+  unsigned int r_h; /**< Intended rendering image height */
+
+  /* Chroma subsampling info */
+  unsigned int x_chroma_shift; /**< subsampling order, X */
+  unsigned int y_chroma_shift; /**< subsampling order, Y */
+
+/* Image data pointers. */
+#define AOM_PLANE_PACKED 0  /**< To be used for all packed formats */
+#define AOM_PLANE_Y 0       /**< Y (Luminance) plane */
+#define AOM_PLANE_U 1       /**< U (Chroma) plane */
+#define AOM_PLANE_V 2       /**< V (Chroma) plane */
+  unsigned char *planes[3]; /**< pointer to the top left pixel for each plane */
+  int stride[3];            /**< stride between rows for each plane */
+  size_t sz;                /**< data size */
+
+  int bps; /**< bits per sample (for packed formats) */
+
+  int temporal_id; /**< Temporal layer Id of image */
+  int spatial_id;  /**< Spatial layer Id of image */
+
+  /*!\brief The following member may be set by the application to associate
+   * data with this image.
+   */
+  void *user_priv;
+
+  /* The following members should be treated as private. */
+  unsigned char *img_data; /**< private */
+  int img_data_owner;      /**< private */
+  int self_allocd;         /**< private */
+
+  aom_metadata_array_t
+      *metadata; /**< Metadata payloads associated with the image. */
+
+  void *fb_priv; /**< Frame buffer data associated with the image. */
+} aom_image_t;   /**< alias for struct aom_image */
+
+/*!\brief Open a descriptor, allocating storage for the underlying image
+ *
+ * Returns a descriptor for storing an image of the given format. The
+ * storage for the image is allocated on the heap.
+ *
+ * \param[in]    img       Pointer to storage for descriptor. If this parameter
+ *                         is NULL, the storage for the descriptor will be
+ *                         allocated on the heap.
+ * \param[in]    fmt       Format for the image
+ * \param[in]    d_w       Width of the image
+ * \param[in]    d_h       Height of the image
+ * \param[in]    align     Alignment, in bytes, of the image buffer and
+ *                         each row in the image (stride).
+ *
+ * \return Returns a pointer to the initialized image descriptor. If the img
+ *         parameter is non-null, the value of the img parameter will be
+ *         returned.
+ */
+aom_image_t *aom_img_alloc(aom_image_t *img, aom_img_fmt_t fmt,
+                           unsigned int d_w, unsigned int d_h,
+                           unsigned int align);
+
+/*!\brief Open a descriptor, using existing storage for the underlying image
+ *
+ * Returns a descriptor for storing an image of the given format. The
+ * storage for the image has been allocated elsewhere, and a descriptor is
+ * desired to "wrap" that storage.
+ *
+ * \param[in]    img       Pointer to storage for descriptor. If this parameter
+ *                         is NULL, the storage for the descriptor will be
+ *                         allocated on the heap.
+ * \param[in]    fmt       Format for the image
+ * \param[in]    d_w       Width of the image
+ * \param[in]    d_h       Height of the image
+ * \param[in]    align     Alignment, in bytes, of each row in the image
+ *                         (stride).
+ * \param[in]    img_data  Storage to use for the image
+ *
+ * \return Returns a pointer to the initialized image descriptor. If the img
+ *         parameter is non-null, the value of the img parameter will be
+ *         returned.
+ */
+aom_image_t *aom_img_wrap(aom_image_t *img, aom_img_fmt_t fmt, unsigned int d_w,
+                          unsigned int d_h, unsigned int align,
+                          unsigned char *img_data);
+
+/*!\brief Open a descriptor, allocating storage for the underlying image with a
+ * border
+ *
+ * Returns a descriptor for storing an image of the given format and its
+ * borders. The storage for the image is allocated on the heap.
+ *
+ * \param[in]    img        Pointer to storage for descriptor. If this parameter
+ *                          is NULL, the storage for the descriptor will be
+ *                          allocated on the heap.
+ * \param[in]    fmt        Format for the image
+ * \param[in]    d_w        Width of the image
+ * \param[in]    d_h        Height of the image
+ * \param[in]    align      Alignment, in bytes, of the image buffer and
+ *                          each row in the image (stride).
+ * \param[in]    size_align Alignment, in pixels, of the image width and height.
+ * \param[in]    border     A border that is padded on four sides of the image.
+ *
+ * \return Returns a pointer to the initialized image descriptor. If the img
+ *         parameter is non-null, the value of the img parameter will be
+ *         returned.
+ */
+aom_image_t *aom_img_alloc_with_border(aom_image_t *img, aom_img_fmt_t fmt,
+                                       unsigned int d_w, unsigned int d_h,
+                                       unsigned int align,
+                                       unsigned int size_align,
+                                       unsigned int border);
+
+/*!\brief Set the rectangle identifying the displayed portion of the image
+ *
+ * Updates the displayed rectangle (aka viewport) on the image surface to
+ * match the specified coordinates and size.
+ *
+ * \param[in]    img       Image descriptor
+ * \param[in]    x         leftmost column
+ * \param[in]    y         topmost row
+ * \param[in]    w         width
+ * \param[in]    h         height
+ * \param[in]    border    A border that is padded on four sides of the image.
+ *
+ * \return 0 if the requested rectangle is valid, nonzero otherwise.
+ */
+int aom_img_set_rect(aom_image_t *img, unsigned int x, unsigned int y,
+                     unsigned int w, unsigned int h, unsigned int border);
+
+/*!\brief Flip the image vertically (top for bottom)
+ *
+ * Adjusts the image descriptor's pointers and strides to make the image
+ * be referenced upside-down.
+ *
+ * \param[in]    img       Image descriptor
+ */
+void aom_img_flip(aom_image_t *img);
+
+/*!\brief Close an image descriptor
+ *
+ * Frees all allocated storage associated with an image descriptor.
+ *
+ * \param[in]    img       Image descriptor
+ */
+void aom_img_free(aom_image_t *img);
+
+/*!\brief Get the width of a plane
+ *
+ * Get the width of a plane of an image
+ *
+ * \param[in]    img       Image descriptor
+ * \param[in]    plane     Plane index
+ */
+int aom_img_plane_width(const aom_image_t *img, int plane);
+
+/*!\brief Get the height of a plane
+ *
+ * Get the height of a plane of an image
+ *
+ * \param[in]    img       Image descriptor
+ * \param[in]    plane     Plane index
+ */
+int aom_img_plane_height(const aom_image_t *img, int plane);
+
+/*!\brief Add metadata to image.
+ *
+ * Adds metadata to aom_image_t.
+ * Function makes a copy of the provided data parameter.
+ * Metadata insertion point is controlled by insert_flag.
+ *
+ * \param[in]    img          Image descriptor
+ * \param[in]    type         Metadata type
+ * \param[in]    data         Metadata contents
+ * \param[in]    sz           Metadata contents size
+ * \param[in]    insert_flag  Metadata insert flag
+ *
+ * \return Returns 0 on success. If img or data is NULL, sz is 0, or memory
+ * allocation fails, it returns -1.
+ */
+int aom_img_add_metadata(aom_image_t *img, uint32_t type, const uint8_t *data,
+                         size_t sz, aom_metadata_insert_flags_t insert_flag);
+
+/*!\brief Return a metadata payload stored within the image metadata array.
+ *
+ * Gets the metadata (aom_metadata_t) at the indicated index in the image
+ * metadata array.
+ *
+ * \param[in] img          Pointer to image descriptor to get metadata from
+ * \param[in] index        Metadata index to get from metadata array
+ *
+ * \return Returns a const pointer to the selected metadata, if img and/or index
+ * is invalid, it returns NULL.
+ */
+const aom_metadata_t *aom_img_get_metadata(const aom_image_t *img,
+                                           size_t index);
+
+/*!\brief Return the number of metadata blocks within the image.
+ *
+ * Gets the number of metadata blocks contained within the provided image
+ * metadata array.
+ *
+ * \param[in] img          Pointer to image descriptor to get metadata number
+ * from.
+ *
+ * \return Returns the size of the metadata array. If img or metadata is NULL,
+ * it returns 0.
+ */
+size_t aom_img_num_metadata(const aom_image_t *img);
+
+/*!\brief Remove metadata from image.
+ *
+ * Removes all metadata in image metadata list and sets metadata list pointer
+ * to NULL.
+ *
+ * \param[in]    img       Image descriptor
+ */
+void aom_img_remove_metadata(aom_image_t *img);
+
+/*!\brief Allocate memory for aom_metadata struct.
+ *
+ * Allocates storage for the metadata payload, sets its type and copies the
+ * payload data into the aom_metadata struct. A metadata payload buffer of size
+ * sz is allocated and sz bytes are copied from data into the payload buffer.
+ *
+ * \param[in]    type         Metadata type
+ * \param[in]    data         Metadata data pointer
+ * \param[in]    sz           Metadata size
+ * \param[in]    insert_flag  Metadata insert flag
+ *
+ * \return Returns the newly allocated aom_metadata struct. If data is NULL,
+ * sz is 0, or memory allocation fails, it returns NULL.
+ */
+aom_metadata_t *aom_img_metadata_alloc(uint32_t type, const uint8_t *data,
+                                       size_t sz,
+                                       aom_metadata_insert_flags_t insert_flag);
+
+/*!\brief Free metadata struct.
+ *
+ * Free metadata struct and its buffer.
+ *
+ * \param[in]    metadata       Metadata struct pointer
+ */
+void aom_img_metadata_free(aom_metadata_t *metadata);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_AOM_IMAGE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_integer.c b/pxr/imaging/plugin/hioAvif/aom/aom_integer.c
new file mode 100644
index 0000000000..93ce39cc49
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_integer.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+static const size_t kMaximumLeb128Size = 8;
+static const uint8_t kLeb128ByteMask = 0x7f;  // Binary: 01111111
+
+// Disallow values larger than 32-bits to ensure consistent behavior on 32 and
+// 64 bit targets: value is typically used to determine buffer allocation size
+// when decoded.
+static const uint64_t kMaximumLeb128Value = UINT32_MAX;
+
+size_t aom_uleb_size_in_bytes(uint64_t value) {
+  size_t size = 0;
+  do {
+    ++size;
+  } while ((value >>= 7) != 0);
+  return size;
+}
+
+int aom_uleb_decode(const uint8_t *buffer, size_t available, uint64_t *value,
+                    size_t *length) {
+  if (buffer && value) {
+    *value = 0;
+    for (size_t i = 0; i < kMaximumLeb128Size && i < available; ++i) {
+      const uint8_t decoded_byte = *(buffer + i) & kLeb128ByteMask;
+      *value |= ((uint64_t)decoded_byte) << (i * 7);
+      if ((*(buffer + i) >> 7) == 0) {
+        if (length) {
+          *length = i + 1;
+        }
+
+        // Fail on values larger than 32-bits to ensure consistent behavior on
+        // 32 and 64 bit targets: value is typically used to determine buffer
+        // allocation size.
+        if (*value > UINT32_MAX) return -1;
+
+        return 0;
+      }
+    }
+  }
+
+  // If we get here, either the buffer/value pointers were invalid,
+  // or we ran over the available space
+  return -1;
+}
+
+int aom_uleb_encode(uint64_t value, size_t available, uint8_t *coded_value,
+                    size_t *coded_size) {
+  const size_t leb_size = aom_uleb_size_in_bytes(value);
+  if (value > kMaximumLeb128Value || leb_size > kMaximumLeb128Size ||
+      leb_size > available || !coded_value || !coded_size) {
+    return -1;
+  }
+
+  for (size_t i = 0; i < leb_size; ++i) {
+    uint8_t byte = value & 0x7f;
+    value >>= 7;
+
+    if (value != 0) byte |= 0x80;  // Signal that more bytes follow.
+
+    *(coded_value + i) = byte;
+  }
+
+  *coded_size = leb_size;
+  return 0;
+}
+
+int aom_uleb_encode_fixed_size(uint64_t value, size_t available,
+                               size_t pad_to_size, uint8_t *coded_value,
+                               size_t *coded_size) {
+  if (value > kMaximumLeb128Value || !coded_value || !coded_size ||
+      available < pad_to_size || pad_to_size > kMaximumLeb128Size) {
+    return -1;
+  }
+  const uint64_t limit = 1ULL << (7 * pad_to_size);
+  if (value >= limit) {
+    // Can't encode 'value' within 'pad_to_size' bytes
+    return -1;
+  }
+
+  for (size_t i = 0; i < pad_to_size; ++i) {
+    uint8_t byte = value & 0x7f;
+    value >>= 7;
+
+    if (i < pad_to_size - 1) byte |= 0x80;  // Signal that more bytes follow.
+
+    *(coded_value + i) = byte;
+  }
+
+  assert(value == 0);
+
+  *coded_size = pad_to_size;
+  return 0;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_integer.h b/pxr/imaging/plugin/hioAvif/aom/aom_integer.h
new file mode 100644
index 0000000000..d9bba09f25
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_integer.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#ifndef AOM_AOM_AOM_INTEGER_H_
+#define AOM_AOM_AOM_INTEGER_H_
+
+/* get ptrdiff_t, size_t, wchar_t, NULL */
+#include <stddef.h>
+
+#if defined(_MSC_VER)
+#define AOM_FORCE_INLINE __forceinline
+#define AOM_INLINE __inline
+#else
+#define AOM_FORCE_INLINE __inline__ __attribute__((always_inline))
+#define AOM_INLINE inline
+#endif
+
+/* Assume platforms have the C99 standard integer types. */
+
+#if defined(__cplusplus)
+#if !defined(__STDC_FORMAT_MACROS)
+#define __STDC_FORMAT_MACROS
+#endif
+#if !defined(__STDC_LIMIT_MACROS)
+#define __STDC_LIMIT_MACROS
+#endif
+#endif  // __cplusplus
+
+#include <stdint.h>
+#include <inttypes.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif  // __cplusplus
+
+// Returns size of uint64_t when encoded using LEB128.
+size_t aom_uleb_size_in_bytes(uint64_t value);
+
+// Returns 0 on success, -1 on decode failure.
+// On success, 'value' stores the decoded LEB128 value and 'length' stores
+// the number of bytes decoded.
+int aom_uleb_decode(const uint8_t *buffer, size_t available, uint64_t *value,
+                    size_t *length);
+
+// Encodes LEB128 integer. Returns 0 when successful, and -1 upon failure.
+int aom_uleb_encode(uint64_t value, size_t available, uint8_t *coded_value,
+                    size_t *coded_size);
+
+// Encodes LEB128 integer to size specified. Returns 0 when successful, and -1
+// upon failure.
+// Note: This will write exactly pad_to_size bytes; if the value cannot be
+// encoded in this many bytes, then this will fail.
+int aom_uleb_encode_fixed_size(uint64_t value, size_t available,
+                               size_t pad_to_size, uint8_t *coded_value,
+                               size_t *coded_size);
+
+#if defined(__cplusplus)
+}  // extern "C"
+#endif  // __cplusplus
+
+#endif  // AOM_AOM_AOM_INTEGER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.c b/pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.c
new file mode 100644
index 0000000000..67e51aa24e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.c
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/include/aom_mem_intrnl.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+#if defined(AOM_MAX_ALLOCABLE_MEMORY)
+// Returns 0 in case of overflow of nmemb * size.
+static int check_size_argument_overflow(uint64_t nmemb, uint64_t size) {
+  const uint64_t total_size = nmemb * size;
+  if (nmemb == 0) return 1;
+  if (size > AOM_MAX_ALLOCABLE_MEMORY / nmemb) return 0;
+  if (total_size != (size_t)total_size) return 0;
+  return 1;
+}
+#endif
+
+static size_t GetAlignedMallocSize(size_t size, size_t align) {
+  return size + align - 1 + ADDRESS_STORAGE_SIZE;
+}
+
+static size_t *GetMallocAddressLocation(void *const mem) {
+  return ((size_t *)mem) - 1;
+}
+
+static void SetActualMallocAddress(void *const mem,
+                                   const void *const malloc_addr) {
+  size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
+  *malloc_addr_location = (size_t)malloc_addr;
+}
+
+static void *GetActualMallocAddress(void *const mem) {
+  const size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
+  return (void *)(*malloc_addr_location);
+}
+
+void *aom_memalign(size_t align, size_t size) {
+  void *x = NULL;
+  const size_t aligned_size = GetAlignedMallocSize(size, align);
+#if defined(AOM_MAX_ALLOCABLE_MEMORY)
+  if (!check_size_argument_overflow(1, aligned_size)) return NULL;
+#endif
+  void *const addr = malloc(aligned_size);
+  if (addr) {
+    x = aom_align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, align);
+    SetActualMallocAddress(x, addr);
+  }
+  return x;
+}
+
+void *aom_malloc(size_t size) { return aom_memalign(DEFAULT_ALIGNMENT, size); }
+
+void *aom_calloc(size_t num, size_t size) {
+  const size_t total_size = num * size;
+  void *const x = aom_malloc(total_size);
+  if (x) memset(x, 0, total_size);
+  return x;
+}
+
+void aom_free(void *memblk) {
+  if (memblk) {
+    void *addr = GetActualMallocAddress(memblk);
+    free(addr);
+  }
+}
+
+void *aom_memset16(void *dest, int val, size_t length) {
+  size_t i;
+  uint16_t *dest16 = (uint16_t *)dest;
+  for (i = 0; i < length; i++) *dest16++ = val;
+  return dest;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h b/pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h
new file mode 100644
index 0000000000..b8fdf235e2
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_MEM_AOM_MEM_H_
+#define AOM_AOM_MEM_AOM_MEM_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#if defined(__uClinux__)
+#include <lddk.h>
+#endif
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#ifndef AOM_MAX_ALLOCABLE_MEMORY
+#if SIZE_MAX > (1ULL << 32)
+#define AOM_MAX_ALLOCABLE_MEMORY 8589934592  // 8 GB
+#else
+// For 32-bit targets keep this below INT_MAX to avoid valgrind warnings.
+#define AOM_MAX_ALLOCABLE_MEMORY ((1ULL << 31) - (1 << 16))
+#endif
+#endif
+
+void *aom_memalign(size_t align, size_t size);
+void *aom_malloc(size_t size);
+void *aom_calloc(size_t num, size_t size);
+void aom_free(void *memblk);
+void *aom_memset16(void *dest, int val, size_t length);
+
+/*returns an addr aligned to the byte boundary specified by align*/
+#define aom_align_addr(addr, align) \
+  (void *)(((uintptr_t)(addr) + ((align)-1)) & ~(uintptr_t)((align)-1))
+
+#include <string.h>
+
+#ifdef AOM_MEM_PLTFRM
+#include AOM_MEM_PLTFRM
+#endif
+
+#if CONFIG_DEBUG
+#define AOM_CHECK_MEM_ERROR(error_info, lval, expr)                         \
+  do {                                                                      \
+    lval = (expr);                                                          \
+    if (!lval)                                                              \
+      aom_internal_error(error_info, AOM_CODEC_MEM_ERROR,                   \
+                         "Failed to allocate " #lval " at %s:%d", __FILE__, \
+                         __LINE__);                                         \
+  } while (0)
+#else
+#define AOM_CHECK_MEM_ERROR(error_info, lval, expr)       \
+  do {                                                    \
+    lval = (expr);                                        \
+    if (!lval)                                            \
+      aom_internal_error(error_info, AOM_CODEC_MEM_ERROR, \
+                         "Failed to allocate " #lval);    \
+  } while (0)
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif  // AOM_AOM_MEM_AOM_MEM_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_mem/include/aom_mem_intrnl.h b/pxr/imaging/plugin/hioAvif/aom/aom_mem/include/aom_mem_intrnl.h
new file mode 100644
index 0000000000..7bd2d6ee50
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_mem/include/aom_mem_intrnl.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_
+#define AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#define ADDRESS_STORAGE_SIZE sizeof(size_t)
+
+#ifndef DEFAULT_ALIGNMENT
+#if defined(VXWORKS)
+/*default addr alignment to use in calls to aom_* functions other than
+  aom_memalign*/
+#define DEFAULT_ALIGNMENT 32
+#else
+#define DEFAULT_ALIGNMENT (2 * sizeof(void *)) /* NOLINT */
+#endif
+#endif
+
+#endif  // AOM_AOM_MEM_INCLUDE_AOM_MEM_INTRNL_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_once.h b/pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_once.h
new file mode 100644
index 0000000000..d6bae95104
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_once.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_PORTS_AOM_ONCE_H_
+#define AOM_AOM_PORTS_AOM_ONCE_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+/* Implement a function wrapper to guarantee initialization
+ * thread-safety for library singletons.
+ *
+ * NOTE: This function uses static locks, and can only be
+ * used with one common argument per compilation unit. So
+ *
+ * file1.c:
+ *   aom_once(foo);
+ *   ...
+ *   aom_once(foo);
+ *
+ * file2.c:
+ *   aom_once(bar);
+ *
+ * will ensure foo() and bar() are each called only once, but in
+ *
+ * file1.c:
+ *   aom_once(foo);
+ *   aom_once(bar):
+ *
+ * bar() will never be called because the lock is used up
+ * by the call to foo().
+ */
+
+#if CONFIG_MULTITHREAD && defined(_WIN32)
+#include <windows.h>
+/* Declare a per-compilation-unit state variable to track the progress
+ * of calling func() only once. This must be at global scope because
+ * local initializers are not thread-safe in MSVC prior to Visual
+ * Studio 2015.
+ */
+static INIT_ONCE aom_init_once = INIT_ONCE_STATIC_INIT;
+
+static void aom_once(void (*func)(void)) {
+  BOOL pending;
+  InitOnceBeginInitialize(&aom_init_once, 0, &pending, NULL);
+  if (!pending) {
+    // Initialization has already completed.
+    return;
+  }
+  func();
+  InitOnceComplete(&aom_init_once, 0, NULL);
+}
+
+#elif CONFIG_MULTITHREAD && defined(__OS2__)
+#define INCL_DOS
+#include <os2.h>
+static void aom_once(void (*func)(void)) {
+  static int done;
+
+  /* If the initialization is complete, return early. */
+  if (done) return;
+
+  /* Causes all other threads in the process to block themselves
+   * and give up their time slice.
+   */
+  DosEnterCritSec();
+
+  if (!done) {
+    func();
+    done = 1;
+  }
+
+  /* Restores normal thread dispatching for the current process. */
+  DosExitCritSec();
+}
+
+#elif CONFIG_MULTITHREAD && HAVE_PTHREAD_H
+#include <pthread.h>
+static void aom_once(void (*func)(void)) {
+  static pthread_once_t lock = PTHREAD_ONCE_INIT;
+  pthread_once(&lock, func);
+}
+
+#else
+/* Default version that performs no synchronization. */
+
+static void aom_once(void (*func)(void)) {
+  static int done;
+
+  if (!done) {
+    func();
+    done = 1;
+  }
+}
+#endif
+
+#endif  // AOM_AOM_PORTS_AOM_ONCE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_timer.h b/pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_timer.h
new file mode 100644
index 0000000000..5fe7245c5b
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_timer.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_PORTS_AOM_TIMER_H_
+#define AOM_AOM_PORTS_AOM_TIMER_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+#if CONFIG_OS_SUPPORT
+
+#if defined(_WIN32)
+/*
+ * Win32 specific includes
+ */
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#else
+/*
+ * POSIX specific includes
+ */
+#include <sys/time.h>
+
+/* timersub is not provided by msys at this time. */
+#ifndef timersub
+#define timersub(a, b, result)                       \
+  do {                                               \
+    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;    \
+    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
+    if ((result)->tv_usec < 0) {                     \
+      --(result)->tv_sec;                            \
+      (result)->tv_usec += 1000000;                  \
+    }                                                \
+  } while (0)
+#endif
+#endif
+
+struct aom_usec_timer {
+#if defined(_WIN32)
+  LARGE_INTEGER begin, end;
+#else
+  struct timeval begin, end;
+#endif
+};
+
+static INLINE void aom_usec_timer_start(struct aom_usec_timer *t) {
+#if defined(_WIN32)
+  QueryPerformanceCounter(&t->begin);
+#else
+  gettimeofday(&t->begin, NULL);
+#endif
+}
+
+static INLINE void aom_usec_timer_mark(struct aom_usec_timer *t) {
+#if defined(_WIN32)
+  QueryPerformanceCounter(&t->end);
+#else
+  gettimeofday(&t->end, NULL);
+#endif
+}
+
+static INLINE int64_t aom_usec_timer_elapsed(struct aom_usec_timer *t) {
+#if defined(_WIN32)
+  LARGE_INTEGER freq, diff;
+
+  diff.QuadPart = t->end.QuadPart - t->begin.QuadPart;
+
+  QueryPerformanceFrequency(&freq);
+  return diff.QuadPart * 1000000 / freq.QuadPart;
+#else
+  struct timeval diff;
+
+  timersub(&t->end, &t->begin, &diff);
+  return ((int64_t)diff.tv_sec) * 1000000 + diff.tv_usec;
+#endif
+}
+
+#else /* CONFIG_OS_SUPPORT = 0*/
+
+/* Empty timer functions if CONFIG_OS_SUPPORT = 0 */
+#ifndef timersub
+#define timersub(a, b, result)
+#endif
+
+struct aom_usec_timer {
+  void *dummy;
+};
+
+static INLINE void aom_usec_timer_start(struct aom_usec_timer *t) { (void)t; }
+
+static INLINE void aom_usec_timer_mark(struct aom_usec_timer *t) { (void)t; }
+
+static INLINE int aom_usec_timer_elapsed(struct aom_usec_timer *t) {
+  (void)t;
+  return 0;
+}
+
+#endif /* CONFIG_OS_SUPPORT */
+
+#endif  // AOM_AOM_PORTS_AOM_TIMER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_ports/bitops.h b/pxr/imaging/plugin/hioAvif/aom/aom_ports/bitops.h
new file mode 100644
index 0000000000..53abf69924
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_ports/bitops.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_PORTS_BITOPS_H_
+#define AOM_AOM_PORTS_BITOPS_H_
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/msvc.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#ifdef _MSC_VER
+#if defined(_M_X64) || defined(_M_IX86)
+#include <intrin.h>
+#define USE_MSC_INTRINSICS
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// get_msb:
+// Returns (int)floor(log2(n)). n must be > 0.
+// These versions of get_msb() are only valid when n != 0 because all
+// of the optimized versions are undefined when n == 0:
+// https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
+
+// use GNU builtins where available.
+#if defined(__GNUC__) && \
+    ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
+static INLINE int get_msb(unsigned int n) {
+  assert(n != 0);
+  return 31 ^ __builtin_clz(n);
+}
+#elif defined(USE_MSC_INTRINSICS)
+#pragma intrinsic(_BitScanReverse)
+
+static INLINE int get_msb(unsigned int n) {
+  unsigned long first_set_bit;
+  assert(n != 0);
+  _BitScanReverse(&first_set_bit, n);
+  return first_set_bit;
+}
+#undef USE_MSC_INTRINSICS
+#else
+static INLINE int get_msb(unsigned int n) {
+  int log = 0;
+  unsigned int value = n;
+  int i;
+
+  assert(n != 0);
+
+  for (i = 4; i >= 0; --i) {
+    const int shift = (1 << i);
+    const unsigned int x = value >> shift;
+    if (x != 0) {
+      value = x;
+      log += shift;
+    }
+  }
+  return log;
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_PORTS_BITOPS_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h b/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h
new file mode 100644
index 0000000000..95cf0580b5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_PORTS_MEM_H_
+#define AOM_AOM_PORTS_MEM_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#if (defined(__GNUC__) && __GNUC__) || defined(__SUNPRO_C)
+#define DECLARE_ALIGNED(n, typ, val) typ val __attribute__((aligned(n)))
+#elif defined(_MSC_VER)
+#define DECLARE_ALIGNED(n, typ, val) __declspec(align(n)) typ val
+#else
+#warning No alignment directives known for this compiler.
+#define DECLARE_ALIGNED(n, typ, val) typ val
+#endif
+
+/* Indicates that the usage of the specified variable has been audited to assure
+ * that it's safe to use uninitialized. Silences 'may be used uninitialized'
+ * warnings on gcc.
+ */
+#if defined(__GNUC__) && __GNUC__
+#define UNINITIALIZED_IS_SAFE(x) x = x
+#else
+#define UNINITIALIZED_IS_SAFE(x) x
+#endif
+
+#if HAVE_NEON && defined(_MSC_VER)
+#define __builtin_prefetch(x)
+#endif
+
+/* Shift down with rounding for use when n >= 0. Usually value >= 0, but the
+ * macro can be used with a negative value if the direction of rounding is
+ * acceptable.
+ */
+#define ROUND_POWER_OF_TWO(value, n) (((value) + (((1 << (n)) >> 1))) >> (n))
+
+/* Shift down with rounding for signed integers, for use when n >= 0 */
+#define ROUND_POWER_OF_TWO_SIGNED(value, n)           \
+  (((value) < 0) ? -ROUND_POWER_OF_TWO(-(value), (n)) \
+                 : ROUND_POWER_OF_TWO((value), (n)))
+
+/* Shift down with rounding for use when n >= 0 (64-bit value). Usually
+ * value >= 0, but the macro can be used with a negative value if the direction
+ * of rounding is acceptable.
+ */
+#define ROUND_POWER_OF_TWO_64(value, n) \
+  (((value) + ((((int64_t)1 << (n)) >> 1))) >> (n))
+/* Shift down with rounding for signed integers, for use when n >= 0 (64-bit
+ * value)
+ */
+#define ROUND_POWER_OF_TWO_SIGNED_64(value, n)           \
+  (((value) < 0) ? -ROUND_POWER_OF_TWO_64(-(value), (n)) \
+                 : ROUND_POWER_OF_TWO_64((value), (n)))
+
+/* shift right or left depending on sign of n */
+#define RIGHT_SIGNED_SHIFT(value, n) \
+  ((n) < 0 ? ((value) << (-(n))) : ((value) >> (n)))
+
+#define ALIGN_POWER_OF_TWO(value, n) \
+  (((value) + ((1 << (n)) - 1)) & ~((1 << (n)) - 1))
+
+#define DIVIDE_AND_ROUND(x, y) (((x) + ((y) >> 1)) / (y))
+
+#define CONVERT_TO_SHORTPTR(x) ((uint16_t *)(((uintptr_t)(x)) << 1))
+#define CONVERT_TO_BYTEPTR(x) ((uint8_t *)(((uintptr_t)(x)) >> 1))
+
+/*!\brief force enum to be unsigned 1 byte*/
+#define UENUM1BYTE(enumvar) \
+  ;                         \
+  typedef uint8_t enumvar
+
+/*!\brief force enum to be signed 1 byte*/
+#define SENUM1BYTE(enumvar) \
+  ;                         \
+  typedef int8_t enumvar
+
+/*!\brief force enum to be unsigned 2 byte*/
+#define UENUM2BYTE(enumvar) \
+  ;                         \
+  typedef uint16_t enumvar
+
+/*!\brief force enum to be signed 2 byte*/
+#define SENUM2BYTE(enumvar) \
+  ;                         \
+  typedef int16_t enumvar
+
+/*!\brief force enum to be unsigned 4 byte*/
+#define UENUM4BYTE(enumvar) \
+  ;                         \
+  typedef uint32_t enumvar
+
+/*!\brief force enum to be unsigned 4 byte*/
+#define SENUM4BYTE(enumvar) \
+  ;                         \
+  typedef int32_t enumvar
+
+#endif  // AOM_AOM_PORTS_MEM_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops.h b/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops.h
new file mode 100644
index 0000000000..e3df9bd1f3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops.h
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_PORTS_MEM_OPS_H_
+#define AOM_AOM_PORTS_MEM_OPS_H_
+
+/* \file
+ * \brief Provides portable memory access primitives
+ *
+ * This function provides portable primitives for getting and setting of
+ * signed and unsigned integers in 16, 24, and 32 bit sizes. The operations
+ * can be performed on unaligned data regardless of hardware support for
+ * unaligned accesses.
+ *
+ * The type used to pass the integral values may be changed by defining
+ * MEM_VALUE_T with the appropriate type. The type given must be an integral
+ * numeric type.
+ *
+ * The actual functions instantiated have the MEM_VALUE_T type name pasted
+ * on to the symbol name. This allows the developer to instantiate these
+ * operations for multiple types within the same translation unit. This is
+ * of somewhat questionable utility, but the capability exists nonetheless.
+ * Users not making use of this functionality should call the functions
+ * without the type name appended, and the preprocessor will take care of
+ * it.
+ *
+ * NOTE: This code is not supported on platforms where char > 1 octet ATM.
+ */
+
+#ifndef MAU_T
+/* Minimum Access Unit for this target */
+#define MAU_T unsigned char
+#endif
+
+#ifndef MEM_VALUE_T
+#define MEM_VALUE_T int
+#endif
+
+#undef MEM_VALUE_T_SZ_BITS
+#define MEM_VALUE_T_SZ_BITS (sizeof(MEM_VALUE_T) << 3)
+
+#undef mem_ops_wrap_symbol
+#define mem_ops_wrap_symbol(fn) mem_ops_wrap_symbol2(fn, MEM_VALUE_T)
+#undef mem_ops_wrap_symbol2
+#define mem_ops_wrap_symbol2(fn, typ) mem_ops_wrap_symbol3(fn, typ)
+#undef mem_ops_wrap_symbol3
+#define mem_ops_wrap_symbol3(fn, typ) fn##_as_##typ
+
+/*
+ * Include aligned access routines
+ */
+#define INCLUDED_BY_MEM_OPS_H
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops_aligned.h"
+#undef INCLUDED_BY_MEM_OPS_H
+
+#undef mem_get_be16
+#define mem_get_be16 mem_ops_wrap_symbol(mem_get_be16)
+static unsigned MEM_VALUE_T mem_get_be16(const void *vmem) {
+  unsigned MEM_VALUE_T val;
+  const MAU_T *mem = (const MAU_T *)vmem;
+
+  val = mem[0] << 8;
+  val |= mem[1];
+  return val;
+}
+
+#undef mem_get_be24
+#define mem_get_be24 mem_ops_wrap_symbol(mem_get_be24)
+static unsigned MEM_VALUE_T mem_get_be24(const void *vmem) {
+  unsigned MEM_VALUE_T val;
+  const MAU_T *mem = (const MAU_T *)vmem;
+
+  val = mem[0] << 16;
+  val |= mem[1] << 8;
+  val |= mem[2];
+  return val;
+}
+
+#undef mem_get_be32
+#define mem_get_be32 mem_ops_wrap_symbol(mem_get_be32)
+static unsigned MEM_VALUE_T mem_get_be32(const void *vmem) {
+  unsigned MEM_VALUE_T val;
+  const MAU_T *mem = (const MAU_T *)vmem;
+
+  val = ((unsigned MEM_VALUE_T)mem[0]) << 24;
+  val |= mem[1] << 16;
+  val |= mem[2] << 8;
+  val |= mem[3];
+  return val;
+}
+
+#undef mem_get_le16
+#define mem_get_le16 mem_ops_wrap_symbol(mem_get_le16)
+static unsigned MEM_VALUE_T mem_get_le16(const void *vmem) {
+  unsigned MEM_VALUE_T val;
+  const MAU_T *mem = (const MAU_T *)vmem;
+
+  val = mem[1] << 8;
+  val |= mem[0];
+  return val;
+}
+
+#undef mem_get_le24
+#define mem_get_le24 mem_ops_wrap_symbol(mem_get_le24)
+static unsigned MEM_VALUE_T mem_get_le24(const void *vmem) {
+  unsigned MEM_VALUE_T val;
+  const MAU_T *mem = (const MAU_T *)vmem;
+
+  val = mem[2] << 16;
+  val |= mem[1] << 8;
+  val |= mem[0];
+  return val;
+}
+
+#undef mem_get_le32
+#define mem_get_le32 mem_ops_wrap_symbol(mem_get_le32)
+static unsigned MEM_VALUE_T mem_get_le32(const void *vmem) {
+  unsigned MEM_VALUE_T val;
+  const MAU_T *mem = (const MAU_T *)vmem;
+
+  val = ((unsigned MEM_VALUE_T)mem[3]) << 24;
+  val |= mem[2] << 16;
+  val |= mem[1] << 8;
+  val |= mem[0];
+  return val;
+}
+
+#define mem_get_s_generic(end, sz)                                            \
+  static AOM_INLINE signed MEM_VALUE_T mem_get_s##end##sz(const void *vmem) { \
+    const MAU_T *mem = (const MAU_T *)vmem;                                   \
+    signed MEM_VALUE_T val = mem_get_##end##sz(mem);                          \
+    return (val << (MEM_VALUE_T_SZ_BITS - sz)) >> (MEM_VALUE_T_SZ_BITS - sz); \
+  }
+
+/* clang-format off */
+#undef  mem_get_sbe16
+#define mem_get_sbe16 mem_ops_wrap_symbol(mem_get_sbe16)
+mem_get_s_generic(be, 16)
+
+#undef  mem_get_sbe24
+#define mem_get_sbe24 mem_ops_wrap_symbol(mem_get_sbe24)
+mem_get_s_generic(be, 24)
+
+#undef  mem_get_sbe32
+#define mem_get_sbe32 mem_ops_wrap_symbol(mem_get_sbe32)
+mem_get_s_generic(be, 32)
+
+#undef  mem_get_sle16
+#define mem_get_sle16 mem_ops_wrap_symbol(mem_get_sle16)
+mem_get_s_generic(le, 16)
+
+#undef  mem_get_sle24
+#define mem_get_sle24 mem_ops_wrap_symbol(mem_get_sle24)
+mem_get_s_generic(le, 24)
+
+#undef  mem_get_sle32
+#define mem_get_sle32 mem_ops_wrap_symbol(mem_get_sle32)
+mem_get_s_generic(le, 32)
+
+#undef  mem_put_be16
+#define mem_put_be16 mem_ops_wrap_symbol(mem_put_be16)
+static AOM_INLINE void mem_put_be16(void *vmem, MEM_VALUE_T val) {
+  MAU_T *mem = (MAU_T *)vmem;
+
+  mem[0] = (MAU_T)((val >> 8) & 0xff);
+  mem[1] = (MAU_T)((val >> 0) & 0xff);
+}
+
+#undef  mem_put_be24
+#define mem_put_be24 mem_ops_wrap_symbol(mem_put_be24)
+static AOM_INLINE void mem_put_be24(void *vmem, MEM_VALUE_T val) {
+  MAU_T *mem = (MAU_T *)vmem;
+
+  mem[0] = (MAU_T)((val >> 16) & 0xff);
+  mem[1] = (MAU_T)((val >>  8) & 0xff);
+  mem[2] = (MAU_T)((val >>  0) & 0xff);
+}
+
+#undef  mem_put_be32
+#define mem_put_be32 mem_ops_wrap_symbol(mem_put_be32)
+static AOM_INLINE void mem_put_be32(void *vmem, MEM_VALUE_T val) {
+  MAU_T *mem = (MAU_T *)vmem;
+
+  mem[0] = (MAU_T)((val >> 24) & 0xff);
+  mem[1] = (MAU_T)((val >> 16) & 0xff);
+  mem[2] = (MAU_T)((val >>  8) & 0xff);
+  mem[3] = (MAU_T)((val >>  0) & 0xff);
+}
+
+#undef  mem_put_le16
+#define mem_put_le16 mem_ops_wrap_symbol(mem_put_le16)
+static AOM_INLINE void mem_put_le16(void *vmem, MEM_VALUE_T val) {
+  MAU_T *mem = (MAU_T *)vmem;
+
+  mem[0] = (MAU_T)((val >> 0) & 0xff);
+  mem[1] = (MAU_T)((val >> 8) & 0xff);
+}
+
+#undef  mem_put_le24
+#define mem_put_le24 mem_ops_wrap_symbol(mem_put_le24)
+static AOM_INLINE void mem_put_le24(void *vmem, MEM_VALUE_T val) {
+  MAU_T *mem = (MAU_T *)vmem;
+
+  mem[0] = (MAU_T)((val >>  0) & 0xff);
+  mem[1] = (MAU_T)((val >>  8) & 0xff);
+  mem[2] = (MAU_T)((val >> 16) & 0xff);
+}
+
+#undef  mem_put_le32
+#define mem_put_le32 mem_ops_wrap_symbol(mem_put_le32)
+static AOM_INLINE void mem_put_le32(void *vmem, MEM_VALUE_T val) {
+  MAU_T *mem = (MAU_T *)vmem;
+
+  mem[0] = (MAU_T)((val >>  0) & 0xff);
+  mem[1] = (MAU_T)((val >>  8) & 0xff);
+  mem[2] = (MAU_T)((val >> 16) & 0xff);
+  mem[3] = (MAU_T)((val >> 24) & 0xff);
+}
+/* clang-format on */
+#endif  // AOM_AOM_PORTS_MEM_OPS_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops_aligned.h b/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops_aligned.h
new file mode 100644
index 0000000000..8c9549d39f
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops_aligned.h
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_PORTS_MEM_OPS_ALIGNED_H_
+#define AOM_AOM_PORTS_MEM_OPS_ALIGNED_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+/* \file
+ * \brief Provides portable memory access primitives for operating on aligned
+ *        data
+ *
+ * This file is split from mem_ops.h for easier maintenance. See mem_ops.h
+ * for a more detailed description of these primitives.
+ */
+#ifndef INCLUDED_BY_MEM_OPS_H
+#error Include mem_ops.h, not mem_ops_aligned.h directly.
+#endif
+
+/* Architectures that provide instructions for doing this byte swapping
+ * could redefine these macros.
+ */
+#define swap_endian_16(val, raw)                                     \
+  do {                                                               \
+    val = (uint16_t)(((raw >> 8) & 0x00ff) | ((raw << 8) & 0xff00)); \
+  } while (0)
+#define swap_endian_32(val, raw)                                   \
+  do {                                                             \
+    val = ((raw >> 24) & 0x000000ff) | ((raw >> 8) & 0x0000ff00) | \
+          ((raw << 8) & 0x00ff0000) | ((raw << 24) & 0xff000000);  \
+  } while (0)
+#define swap_endian_16_se(val, raw) \
+  do {                              \
+    swap_endian_16(val, raw);       \
+    val = ((val << 16) >> 16);      \
+  } while (0)
+#define swap_endian_32_se(val, raw) swap_endian_32(val, raw)
+
+#define mem_get_ne_aligned_generic(end, sz)                           \
+  static AOM_INLINE unsigned MEM_VALUE_T mem_get_##end##sz##_aligned( \
+      const void *vmem) {                                             \
+    const uint##sz##_t *mem = (const uint##sz##_t *)vmem;             \
+    return *mem;                                                      \
+  }
+
+#define mem_get_sne_aligned_generic(end, sz)                         \
+  static AOM_INLINE signed MEM_VALUE_T mem_get_s##end##sz##_aligned( \
+      const void *vmem) {                                            \
+    const int##sz##_t *mem = (const int##sz##_t *)vmem;              \
+    return *mem;                                                     \
+  }
+
+#define mem_get_se_aligned_generic(end, sz)                           \
+  static AOM_INLINE unsigned MEM_VALUE_T mem_get_##end##sz##_aligned( \
+      const void *vmem) {                                             \
+    const uint##sz##_t *mem = (const uint##sz##_t *)vmem;             \
+    unsigned MEM_VALUE_T val, raw = *mem;                             \
+    swap_endian_##sz(val, raw);                                       \
+    return val;                                                       \
+  }
+
+#define mem_get_sse_aligned_generic(end, sz)                         \
+  static AOM_INLINE signed MEM_VALUE_T mem_get_s##end##sz##_aligned( \
+      const void *vmem) {                                            \
+    const int##sz##_t *mem = (const int##sz##_t *)vmem;              \
+    unsigned MEM_VALUE_T val, raw = *mem;                            \
+    swap_endian_##sz##_se(val, raw);                                 \
+    return val;                                                      \
+  }
+
+#define mem_put_ne_aligned_generic(end, sz)                             \
+  static AOM_INLINE void mem_put_##end##sz##_aligned(void *vmem,        \
+                                                     MEM_VALUE_T val) { \
+    uint##sz##_t *mem = (uint##sz##_t *)vmem;                           \
+    *mem = (uint##sz##_t)val;                                           \
+  }
+
+#define mem_put_se_aligned_generic(end, sz)                             \
+  static AOM_INLINE void mem_put_##end##sz##_aligned(void *vmem,        \
+                                                     MEM_VALUE_T val) { \
+    uint##sz##_t *mem = (uint##sz##_t *)vmem, raw;                      \
+    swap_endian_##sz(raw, val);                                         \
+    *mem = (uint##sz##_t)raw;                                           \
+  }
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#if CONFIG_BIG_ENDIAN
+#define mem_get_be_aligned_generic(sz) mem_get_ne_aligned_generic(be, sz)
+#define mem_get_sbe_aligned_generic(sz) mem_get_sne_aligned_generic(be, sz)
+#define mem_get_le_aligned_generic(sz) mem_get_se_aligned_generic(le, sz)
+#define mem_get_sle_aligned_generic(sz) mem_get_sse_aligned_generic(le, sz)
+#define mem_put_be_aligned_generic(sz) mem_put_ne_aligned_generic(be, sz)
+#define mem_put_le_aligned_generic(sz) mem_put_se_aligned_generic(le, sz)
+#else
+#define mem_get_be_aligned_generic(sz) mem_get_se_aligned_generic(be, sz)
+#define mem_get_sbe_aligned_generic(sz) mem_get_sse_aligned_generic(be, sz)
+#define mem_get_le_aligned_generic(sz) mem_get_ne_aligned_generic(le, sz)
+#define mem_get_sle_aligned_generic(sz) mem_get_sne_aligned_generic(le, sz)
+#define mem_put_be_aligned_generic(sz) mem_put_se_aligned_generic(be, sz)
+#define mem_put_le_aligned_generic(sz) mem_put_ne_aligned_generic(le, sz)
+#endif
+
+/* clang-format off */
+#undef  mem_get_be16_aligned
+#define mem_get_be16_aligned mem_ops_wrap_symbol(mem_get_be16_aligned)
+mem_get_be_aligned_generic(16)
+
+#undef  mem_get_be32_aligned
+#define mem_get_be32_aligned mem_ops_wrap_symbol(mem_get_be32_aligned)
+mem_get_be_aligned_generic(32)
+
+#undef  mem_get_le16_aligned
+#define mem_get_le16_aligned mem_ops_wrap_symbol(mem_get_le16_aligned)
+mem_get_le_aligned_generic(16)
+
+#undef  mem_get_le32_aligned
+#define mem_get_le32_aligned mem_ops_wrap_symbol(mem_get_le32_aligned)
+mem_get_le_aligned_generic(32)
+
+#undef  mem_get_sbe16_aligned
+#define mem_get_sbe16_aligned mem_ops_wrap_symbol(mem_get_sbe16_aligned)
+mem_get_sbe_aligned_generic(16)
+
+#undef  mem_get_sbe32_aligned
+#define mem_get_sbe32_aligned mem_ops_wrap_symbol(mem_get_sbe32_aligned)
+mem_get_sbe_aligned_generic(32)
+
+#undef  mem_get_sle16_aligned
+#define mem_get_sle16_aligned mem_ops_wrap_symbol(mem_get_sle16_aligned)
+mem_get_sle_aligned_generic(16)
+
+#undef  mem_get_sle32_aligned
+#define mem_get_sle32_aligned mem_ops_wrap_symbol(mem_get_sle32_aligned)
+mem_get_sle_aligned_generic(32)
+
+#undef  mem_put_be16_aligned
+#define mem_put_be16_aligned mem_ops_wrap_symbol(mem_put_be16_aligned)
+mem_put_be_aligned_generic(16)
+
+#undef  mem_put_be32_aligned
+#define mem_put_be32_aligned mem_ops_wrap_symbol(mem_put_be32_aligned)
+mem_put_be_aligned_generic(32)
+
+#undef  mem_put_le16_aligned
+#define mem_put_le16_aligned mem_ops_wrap_symbol(mem_put_le16_aligned)
+mem_put_le_aligned_generic(16)
+
+#undef  mem_put_le32_aligned
+#define mem_put_le32_aligned mem_ops_wrap_symbol(mem_put_le32_aligned)
+mem_put_le_aligned_generic(32)
+
+#undef mem_get_ne_aligned_generic
+#undef mem_get_se_aligned_generic
+#undef mem_get_sne_aligned_generic
+#undef mem_get_sse_aligned_generic
+#undef mem_put_ne_aligned_generic
+#undef mem_put_se_aligned_generic
+#undef swap_endian_16
+#undef swap_endian_32
+#undef swap_endian_16_se
+#undef swap_endian_32_se
+/* clang-format on */
+
+#endif  // AOM_AOM_PORTS_MEM_OPS_ALIGNED_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_ports/msvc.h b/pxr/imaging/plugin/hioAvif/aom/aom_ports/msvc.h
new file mode 100644
index 0000000000..2a0aee0f56
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_ports/msvc.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_PORTS_MSVC_H_
+#define AOM_AOM_PORTS_MSVC_H_
+#ifdef _MSC_VER
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#if _MSC_VER < 1900  // VS2015 provides snprintf
+#define snprintf _snprintf
+#endif  // _MSC_VER < 1900
+
+#if _MSC_VER < 1800  // VS2013 provides round
+#include <math.h>
+static INLINE double round(double x) {
+  if (x < 0)
+    return ceil(x - 0.5);
+  else
+    return floor(x + 0.5);
+}
+
+static INLINE float roundf(float x) {
+  if (x < 0)
+    return (float)ceil(x - 0.5f);
+  else
+    return (float)floor(x + 0.5f);
+}
+
+static INLINE long lroundf(float x) {
+  if (x < 0)
+    return (long)(x - 0.5f);
+  else
+    return (long)(x + 0.5f);
+}
+#endif  // _MSC_VER < 1800
+
+#if HAVE_AVX
+#include <immintrin.h>
+// Note:
+// _mm256_insert_epi16 intrinsics is available from vs2017.
+// We define this macro for vs2015 and earlier. The
+// intrinsics used here are in vs2015 document:
+// https://msdn.microsoft.com/en-us/library/hh977022.aspx
+// Input parameters:
+// a: __m256i,
+// d: int16_t,
+// indx: imm8 (0 - 15)
+#if _MSC_VER <= 1900
+#define _mm256_insert_epi16(a, d, indx)                                      \
+  _mm256_insertf128_si256(                                                   \
+      a,                                                                     \
+      _mm_insert_epi16(_mm256_extractf128_si256(a, indx >> 3), d, indx % 8), \
+      indx >> 3)
+
+static INLINE int _mm256_extract_epi32(__m256i a, const int i) {
+  return a.m256i_i32[i & 7];
+}
+static INLINE __m256i _mm256_insert_epi32(__m256i a, int b, const int i) {
+  __m256i c = a;
+  c.m256i_i32[i & 7] = b;
+  return c;
+}
+#endif  // _MSC_VER <= 1900
+#endif  // HAVE_AVX
+#endif  // _MSC_VER
+#endif  // AOM_AOM_PORTS_MSVC_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_ports/system_state.h b/pxr/imaging/plugin/hioAvif/aom/aom_ports/system_state.h
new file mode 100644
index 0000000000..2e567085ab
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_ports/system_state.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_PORTS_SYSTEM_STATE_H_
+#define AOM_AOM_PORTS_SYSTEM_STATE_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#if ARCH_X86 || ARCH_X86_64
+void aom_reset_mmx_state(void);
+#define aom_clear_system_state() aom_reset_mmx_state()
+#else
+#define aom_clear_system_state()
+#endif  // ARCH_X86 || ARCH_X86_64
+#endif  // AOM_AOM_PORTS_SYSTEM_STATE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale.h b/pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale.h
new file mode 100644
index 0000000000..e36bf16ca4
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_SCALE_AOM_SCALE_H_
+#define AOM_AOM_SCALE_AOM_SCALE_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h"
+
+extern void aom_scale_frame(YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst,
+                            unsigned char *temp_area, unsigned char temp_height,
+                            unsigned int hscale, unsigned int hratio,
+                            unsigned int vscale, unsigned int vratio,
+                            unsigned int interlaced, const int num_planes);
+
+#endif  // AOM_AOM_SCALE_AOM_SCALE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale_rtcd.c b/pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale_rtcd.c
new file mode 100644
index 0000000000..7ce8d3cf70
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale_rtcd.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#define RTCD_C
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_once.h"
+
+void aom_scale_rtcd() { aom_once(setup_rtcd_internal); }
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/aom_scale.c b/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/aom_scale.c
new file mode 100644
index 0000000000..080949f248
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/aom_scale.c
@@ -0,0 +1,506 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/****************************************************************************
+ *
+ *   Module Title :     scale.c
+ *
+ *   Description  :     Image scaling functions.
+ *
+ ***************************************************************************/
+
+/****************************************************************************
+ *  Header Files
+ ****************************************************************************/
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h"
+
+typedef struct {
+  int expanded_frame_width;
+  int expanded_frame_height;
+
+  int HScale;
+  int HRatio;
+  int VScale;
+  int VRatio;
+
+  YV12_BUFFER_CONFIG *src_yuv_config;
+  YV12_BUFFER_CONFIG *dst_yuv_config;
+
+} SCALE_VARS;
+
+/****************************************************************************
+ *
+ *  ROUTINE       : scale1d_2t1_i
+ *
+ *  INPUTS        : const unsigned char *source : Pointer to data to be scaled.
+ *                  int source_step             : Number of pixels to step on
+ *                                                in source.
+ *                  unsigned int source_scale   : Scale for source (UNUSED).
+ *                  unsigned int source_length  : Length of source (UNUSED).
+ *                  unsigned char *dest         : Pointer to output data array.
+ *                  int dest_step               : Number of pixels to step on
+ *                                                in destination.
+ *                  unsigned int dest_scale     : Scale for destination
+ *                                                (UNUSED).
+ *                  unsigned int dest_length    : Length of destination.
+ *
+ *  OUTPUTS       : None.
+ *
+ *  RETURNS       : void
+ *
+ *  FUNCTION      : Performs 2-to-1 interpolated scaling.
+ *
+ *  SPECIAL NOTES : None.
+ *
+ ****************************************************************************/
+static void scale1d_2t1_i(const unsigned char *source, int source_step,
+                          unsigned int source_scale, unsigned int source_length,
+                          unsigned char *dest, int dest_step,
+                          unsigned int dest_scale, unsigned int dest_length) {
+  const unsigned char *const dest_end = dest + dest_length * dest_step;
+  (void)source_length;
+  (void)source_scale;
+  (void)dest_scale;
+
+  source_step *= 2;  // Every other row.
+
+  dest[0] = source[0];  // Special case: 1st pixel.
+  source += source_step;
+  dest += dest_step;
+
+  while (dest < dest_end) {
+    const unsigned int a = 3 * source[-source_step];
+    const unsigned int b = 10 * source[0];
+    const unsigned int c = 3 * source[source_step];
+    *dest = (unsigned char)((8 + a + b + c) >> 4);
+    source += source_step;
+    dest += dest_step;
+  }
+}
+
+/****************************************************************************
+ *
+ *  ROUTINE       : scale1d_2t1_ps
+ *
+ *  INPUTS        : const unsigned char *source : Pointer to data to be scaled.
+ *                  int source_step             : Number of pixels to step on
+ *                                                in source.
+ *                  unsigned int source_scale   : Scale for source (UNUSED).
+ *                  unsigned int source_length  : Length of source (UNUSED).
+ *                  unsigned char *dest         : Pointer to output data array.
+ *                  int dest_step               : Number of pixels to step on
+ *                                                in destination.
+ *                  unsigned int dest_scale     : Scale for destination
+ *                                                (UNUSED).
+ *                  unsigned int dest_length    : Length of destination.
+ *
+ *  OUTPUTS       : None.
+ *
+ *  RETURNS       : void
+ *
+ *  FUNCTION      : Performs 2-to-1 point subsampled scaling.
+ *
+ *  SPECIAL NOTES : None.
+ *
+ ****************************************************************************/
+static void scale1d_2t1_ps(const unsigned char *source, int source_step,
+                           unsigned int source_scale,
+                           unsigned int source_length, unsigned char *dest,
+                           int dest_step, unsigned int dest_scale,
+                           unsigned int dest_length) {
+  const unsigned char *const dest_end = dest + dest_length * dest_step;
+  (void)source_length;
+  (void)source_scale;
+  (void)dest_scale;
+
+  source_step *= 2;  // Every other row.
+
+  while (dest < dest_end) {
+    *dest = *source;
+    source += source_step;
+    dest += dest_step;
+  }
+}
+/****************************************************************************
+ *
+ *  ROUTINE       : scale1d_c
+ *
+ *  INPUTS        : const unsigned char *source : Pointer to data to be scaled.
+ *                  int source_step             : Number of pixels to step on
+ *                                                in source.
+ *                  unsigned int source_scale   : Scale for source.
+ *                  unsigned int source_length  : Length of source (UNUSED).
+ *                  unsigned char *dest         : Pointer to output data array.
+ *                  int dest_step               : Number of pixels to step on
+ *                                                in destination.
+ *                  unsigned int dest_scale     : Scale for destination.
+ *                  unsigned int dest_length    : Length of destination.
+ *
+ *  OUTPUTS       : None.
+ *
+ *  RETURNS       : void
+ *
+ *  FUNCTION      : Performs linear interpolation in one dimension.
+ *
+ *  SPECIAL NOTES : None.
+ *
+ ****************************************************************************/
+static void scale1d_c(const unsigned char *source, int source_step,
+                      unsigned int source_scale, unsigned int source_length,
+                      unsigned char *dest, int dest_step,
+                      unsigned int dest_scale, unsigned int dest_length) {
+  const unsigned char *const dest_end = dest + dest_length * dest_step;
+  const unsigned int round_value = dest_scale / 2;
+  unsigned int left_modifier = dest_scale;
+  unsigned int right_modifier = 0;
+  unsigned char left_pixel = source[0];
+  unsigned char right_pixel = source[source_step];
+
+  (void)source_length;
+
+  /* These asserts are needed if there are boundary issues... */
+  /* assert ( dest_scale > source_scale );*/
+  /* assert ( (source_length - 1) * dest_scale >= (dest_length - 1) *
+   * source_scale);*/
+
+  while (dest < dest_end) {
+    *dest = (unsigned char)((left_modifier * left_pixel +
+                             right_modifier * right_pixel + round_value) /
+                            dest_scale);
+
+    right_modifier += source_scale;
+
+    while (right_modifier > dest_scale) {
+      right_modifier -= dest_scale;
+      source += source_step;
+      left_pixel = source[0];
+      right_pixel = source[source_step];
+    }
+
+    left_modifier = dest_scale - right_modifier;
+  }
+}
+
+/****************************************************************************
+ *
+ *  ROUTINE       : Scale2D
+ *
+ *  INPUTS        : const unsigned char *source    : Pointer to data to be
+ *                                                   scaled.
+ *                  int source_pitch               : Stride of source image.
+ *                  unsigned int source_width      : Width of input image.
+ *                  unsigned int source_height     : Height of input image.
+ *                  unsigned char *dest            : Pointer to output data
+ *                                                   array.
+ *                  int dest_pitch                 : Stride of destination
+ *                                                   image.
+ *                  unsigned int dest_width        : Width of destination image.
+ *                  unsigned int dest_height       : Height of destination
+ *                                                   image.
+ *                  unsigned char *temp_area       : Pointer to temp work area.
+ *                  unsigned char temp_area_height : Height of temp work area.
+ *                  unsigned int hscale            : Horizontal scale factor
+ *                                                   numerator.
+ *                  unsigned int hratio            : Horizontal scale factor
+ *                                                   denominator.
+ *                  unsigned int vscale            : Vertical scale factor
+ *                                                   numerator.
+ *                  unsigned int vratio            : Vertical scale factor
+ *                                                   denominator.
+ *                  unsigned int interlaced        : Interlace flag.
+ *
+ *  OUTPUTS       : None.
+ *
+ *  RETURNS       : void
+ *
+ *  FUNCTION      : Performs 2-tap linear interpolation in two dimensions.
+ *
+ *  SPECIAL NOTES : Expansion is performed one band at a time to help with
+ *                  caching.
+ *
+ ****************************************************************************/
+static void Scale2D(
+    /*const*/
+    unsigned char *source, int source_pitch, unsigned int source_width,
+    unsigned int source_height, unsigned char *dest, int dest_pitch,
+    unsigned int dest_width, unsigned int dest_height, unsigned char *temp_area,
+    unsigned char temp_area_height, unsigned int hscale, unsigned int hratio,
+    unsigned int vscale, unsigned int vratio, unsigned int interlaced) {
+  unsigned int i, j, k;
+  unsigned int bands;
+  unsigned int dest_band_height;
+  unsigned int source_band_height;
+
+  typedef void (*Scale1D)(const unsigned char *source, int source_step,
+                          unsigned int source_scale, unsigned int source_length,
+                          unsigned char *dest, int dest_step,
+                          unsigned int dest_scale, unsigned int dest_length);
+
+  Scale1D Scale1Dv = scale1d_c;
+  Scale1D Scale1Dh = scale1d_c;
+
+  void (*horiz_line_scale)(const unsigned char *, unsigned int, unsigned char *,
+                           unsigned int) = NULL;
+  void (*vert_band_scale)(unsigned char *, int, unsigned char *, int,
+                          unsigned int) = NULL;
+
+  int ratio_scalable = 1;
+  int interpolation = 0;
+
+  unsigned char *source_base;
+  unsigned char *line_src;
+
+  source_base = (unsigned char *)source;
+
+  if (source_pitch < 0) {
+    int offset;
+
+    offset = (source_height - 1);
+    offset *= source_pitch;
+
+    source_base += offset;
+  }
+
+  /* find out the ratio for each direction */
+  switch (hratio * 10 / hscale) {
+    case 8:
+      /* 4-5 Scale in Width direction */
+      horiz_line_scale = aom_horizontal_line_5_4_scale;
+      break;
+    case 6:
+      /* 3-5 Scale in Width direction */
+      horiz_line_scale = aom_horizontal_line_5_3_scale;
+      break;
+    case 5:
+      /* 1-2 Scale in Width direction */
+      horiz_line_scale = aom_horizontal_line_2_1_scale;
+      break;
+    default:
+      /* The ratio is not acceptable now */
+      /* throw("The ratio is not acceptable for now!"); */
+      ratio_scalable = 0;
+      break;
+  }
+
+  switch (vratio * 10 / vscale) {
+    case 8:
+      /* 4-5 Scale in vertical direction */
+      vert_band_scale = aom_vertical_band_5_4_scale;
+      source_band_height = 5;
+      dest_band_height = 4;
+      break;
+    case 6:
+      /* 3-5 Scale in vertical direction */
+      vert_band_scale = aom_vertical_band_5_3_scale;
+      source_band_height = 5;
+      dest_band_height = 3;
+      break;
+    case 5:
+      /* 1-2 Scale in vertical direction */
+
+      if (interlaced) {
+        /* if the content is interlaced, point sampling is used */
+        vert_band_scale = aom_vertical_band_2_1_scale;
+      } else {
+        interpolation = 1;
+        /* if the content is progressive, interplo */
+        vert_band_scale = aom_vertical_band_2_1_scale_i;
+      }
+
+      source_band_height = 2;
+      dest_band_height = 1;
+      break;
+    default:
+      /* The ratio is not acceptable now */
+      /* throw("The ratio is not acceptable for now!"); */
+      ratio_scalable = 0;
+      break;
+  }
+
+  if (ratio_scalable) {
+    if (source_height == dest_height) {
+      /* for each band of the image */
+      for (k = 0; k < dest_height; ++k) {
+        horiz_line_scale(source, source_width, dest, dest_width);
+        source += source_pitch;
+        dest += dest_pitch;
+      }
+
+      return;
+    }
+
+    if (interpolation) {
+      if (source < source_base) source = source_base;
+
+      horiz_line_scale(source, source_width, temp_area, dest_width);
+    }
+
+    for (k = 0; k < (dest_height + dest_band_height - 1) / dest_band_height;
+         ++k) {
+      /* scale one band horizontally */
+      for (i = 0; i < source_band_height; ++i) {
+        /* Trap case where we could read off the base of the source buffer */
+
+        line_src = source + i * source_pitch;
+
+        if (line_src < source_base) line_src = source_base;
+
+        horiz_line_scale(line_src, source_width,
+                         temp_area + (i + 1) * dest_pitch, dest_width);
+      }
+
+      /* Vertical scaling is in place */
+      vert_band_scale(temp_area + dest_pitch, dest_pitch, dest, dest_pitch,
+                      dest_width);
+
+      if (interpolation)
+        memcpy(temp_area, temp_area + source_band_height * dest_pitch,
+               dest_width);
+
+      /* Next band... */
+      source += (unsigned long)source_band_height * source_pitch;
+      dest += (unsigned long)dest_band_height * dest_pitch;
+    }
+
+    return;
+  }
+
+  if (hscale == 2 && hratio == 1) Scale1Dh = scale1d_2t1_ps;
+
+  if (vscale == 2 && vratio == 1) {
+    if (interlaced)
+      Scale1Dv = scale1d_2t1_ps;
+    else
+      Scale1Dv = scale1d_2t1_i;
+  }
+
+  if (source_height == dest_height) {
+    /* for each band of the image */
+    for (k = 0; k < dest_height; ++k) {
+      Scale1Dh(source, 1, hscale, source_width + 1, dest, 1, hratio,
+               dest_width);
+      source += source_pitch;
+      dest += dest_pitch;
+    }
+
+    return;
+  }
+
+  if (dest_height > source_height) {
+    dest_band_height = temp_area_height - 1;
+    source_band_height = dest_band_height * source_height / dest_height;
+  } else {
+    source_band_height = temp_area_height - 1;
+    dest_band_height = source_band_height * vratio / vscale;
+  }
+
+  /* first row needs to be done so that we can stay one row ahead for vertical
+   * zoom */
+  Scale1Dh(source, 1, hscale, source_width + 1, temp_area, 1, hratio,
+           dest_width);
+
+  /* for each band of the image */
+  bands = (dest_height + dest_band_height - 1) / dest_band_height;
+
+  for (k = 0; k < bands; ++k) {
+    /* scale one band horizontally */
+    for (i = 1; i < source_band_height + 1; ++i) {
+      if (k * source_band_height + i < source_height) {
+        Scale1Dh(source + i * source_pitch, 1, hscale, source_width + 1,
+                 temp_area + i * dest_pitch, 1, hratio, dest_width);
+      } else { /*  Duplicate the last row */
+        /* copy temp_area row 0 over from last row in the past */
+        memcpy(temp_area + i * dest_pitch, temp_area + (i - 1) * dest_pitch,
+               dest_pitch);
+      }
+    }
+
+    /* scale one band vertically */
+    for (j = 0; j < dest_width; ++j) {
+      Scale1Dv(&temp_area[j], dest_pitch, vscale, source_band_height + 1,
+               &dest[j], dest_pitch, vratio, dest_band_height);
+    }
+
+    /* copy temp_area row 0 over from last row in the past */
+    memcpy(temp_area, temp_area + source_band_height * dest_pitch, dest_pitch);
+
+    /* move to the next band */
+    source += source_band_height * source_pitch;
+    dest += dest_band_height * dest_pitch;
+  }
+}
+
+/****************************************************************************
+ *
+ *  ROUTINE       : aom_scale_frame
+ *
+ *  INPUTS        : YV12_BUFFER_CONFIG *src        : Pointer to frame to be
+ *                                                   scaled.
+ *                  YV12_BUFFER_CONFIG *dst        : Pointer to buffer to hold
+ *                                                   scaled frame.
+ *                  unsigned char *temp_area       : Pointer to temp work area.
+ *                  unsigned char temp_area_height : Height of temp work area.
+ *                  unsigned int hscale            : Horizontal scale factor
+ *                                                   numerator.
+ *                  unsigned int hratio            : Horizontal scale factor
+ *                                                   denominator.
+ *                  unsigned int vscale            : Vertical scale factor
+ *                                                   numerator.
+ *                  unsigned int vratio            : Vertical scale factor
+ *                                                   denominator.
+ *                  unsigned int interlaced        : Interlace flag.
+ *
+ *  OUTPUTS       : None.
+ *
+ *  RETURNS       : void
+ *
+ *  FUNCTION      : Performs 2-tap linear interpolation in two dimensions.
+ *
+ *  SPECIAL NOTES : Expansion is performed one band at a time to help with
+ *                  caching.
+ *
+ ****************************************************************************/
+void aom_scale_frame(YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst,
+                     unsigned char *temp_area, unsigned char temp_height,
+                     unsigned int hscale, unsigned int hratio,
+                     unsigned int vscale, unsigned int vratio,
+                     unsigned int interlaced, const int num_planes) {
+  const int dw = (hscale - 1 + src->y_width * hratio) / hscale;
+  const int dh = (vscale - 1 + src->y_height * vratio) / vscale;
+
+  for (int plane = 0; plane < num_planes; ++plane) {
+    const int is_uv = plane > 0;
+    const int plane_dw = dw >> is_uv;
+    const int plane_dh = dh >> is_uv;
+
+    Scale2D((unsigned char *)src->buffers[plane], src->strides[is_uv],
+            src->widths[is_uv], src->heights[is_uv],
+            (unsigned char *)dst->buffers[plane], dst->strides[is_uv], plane_dw,
+            plane_dh, temp_area, temp_height, hscale, hratio, vscale, vratio,
+            interlaced);
+
+    if (plane_dw < dst->widths[is_uv])
+      for (int i = 0; i < plane_dh; ++i)
+        memset(dst->buffers[plane] + i * dst->strides[is_uv] + plane_dw - 1,
+               dst->buffers[plane][i * dst->strides[is_uv] + plane_dw - 2],
+               dst->widths[is_uv] - plane_dw + 1);
+
+    if (plane_dh < dst->heights[is_uv])
+      for (int i = plane_dh - 1; i < dst->heights[is_uv]; ++i)
+        memcpy(dst->buffers[plane] + i * dst->strides[is_uv],
+               dst->buffers[plane] + (plane_dh - 2) * dst->strides[is_uv],
+               dst->widths[is_uv] + 1);
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/gen_scalers.c b/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/gen_scalers.c
new file mode 100644
index 0000000000..14bf03732f
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/gen_scalers.c
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+/****************************************************************************
+ *  Imports
+ ****************************************************************************/
+
+/****************************************************************************
+ *
+ *
+ *  INPUTS        : const unsigned char *source : Pointer to source data.
+ *                  unsigned int source_width   : Stride of source.
+ *                  unsigned char *dest         : Pointer to destination data.
+ *                  unsigned int dest_width     : Stride of destination
+ *                                                (NOT USED).
+ *
+ *  OUTPUTS       : None.
+ *
+ *  RETURNS       : void
+ *
+ *  FUNCTION      : Copies horizontal line of pixels from source to
+ *                  destination scaling up by 4 to 5.
+ *
+ *  SPECIAL NOTES : None.
+ *
+ ****************************************************************************/
+void aom_horizontal_line_5_4_scale_c(const unsigned char *source,
+                                     unsigned int source_width,
+                                     unsigned char *dest,
+                                     unsigned int dest_width) {
+  const unsigned char *const source_end = source + source_width;
+  (void)dest_width;
+
+  while (source < source_end) {
+    const unsigned int a = source[0];
+    const unsigned int b = source[1];
+    const unsigned int c = source[2];
+    const unsigned int d = source[3];
+    const unsigned int e = source[4];
+
+    dest[0] = (unsigned char)a;
+    dest[1] = (unsigned char)((b * 192 + c * 64 + 128) >> 8);
+    dest[2] = (unsigned char)((c * 128 + d * 128 + 128) >> 8);
+    dest[3] = (unsigned char)((d * 64 + e * 192 + 128) >> 8);
+
+    source += 5;
+    dest += 4;
+  }
+}
+
+void aom_vertical_band_5_4_scale_c(unsigned char *source, int src_pitch,
+                                   unsigned char *dest, int dest_pitch,
+                                   unsigned int dest_width) {
+  const unsigned char *const dest_end = dest + dest_width;
+  while (dest < dest_end) {
+    const unsigned int a = source[0 * src_pitch];
+    const unsigned int b = source[1 * src_pitch];
+    const unsigned int c = source[2 * src_pitch];
+    const unsigned int d = source[3 * src_pitch];
+    const unsigned int e = source[4 * src_pitch];
+
+    dest[0 * dest_pitch] = (unsigned char)a;
+    dest[1 * dest_pitch] = (unsigned char)((b * 192 + c * 64 + 128) >> 8);
+    dest[2 * dest_pitch] = (unsigned char)((c * 128 + d * 128 + 128) >> 8);
+    dest[3 * dest_pitch] = (unsigned char)((d * 64 + e * 192 + 128) >> 8);
+
+    ++source;
+    ++dest;
+  }
+}
+
+/*7***************************************************************************
+ *
+ *  ROUTINE       : aom_horizontal_line_3_5_scale_c
+ *
+ *  INPUTS        : const unsigned char *source : Pointer to source data.
+ *                  unsigned int source_width   : Stride of source.
+ *                  unsigned char *dest         : Pointer to destination data.
+ *                  unsigned int dest_width     : Stride of destination
+ *                                                (NOT USED).
+ *
+ *  OUTPUTS       : None.
+ *
+ *  RETURNS       : void
+ *
+ *  FUNCTION      : Copies horizontal line of pixels from source to
+ *                  destination scaling up by 3 to 5.
+ *
+ *  SPECIAL NOTES : None.
+ *
+ *
+ ****************************************************************************/
+void aom_horizontal_line_5_3_scale_c(const unsigned char *source,
+                                     unsigned int source_width,
+                                     unsigned char *dest,
+                                     unsigned int dest_width) {
+  const unsigned char *const source_end = source + source_width;
+  (void)dest_width;
+  while (source < source_end) {
+    const unsigned int a = source[0];
+    const unsigned int b = source[1];
+    const unsigned int c = source[2];
+    const unsigned int d = source[3];
+    const unsigned int e = source[4];
+
+    dest[0] = (unsigned char)a;
+    dest[1] = (unsigned char)((b * 85 + c * 171 + 128) >> 8);
+    dest[2] = (unsigned char)((d * 171 + e * 85 + 128) >> 8);
+
+    source += 5;
+    dest += 3;
+  }
+}
+
+void aom_vertical_band_5_3_scale_c(unsigned char *source, int src_pitch,
+                                   unsigned char *dest, int dest_pitch,
+                                   unsigned int dest_width) {
+  const unsigned char *const dest_end = dest + dest_width;
+  while (dest < dest_end) {
+    const unsigned int a = source[0 * src_pitch];
+    const unsigned int b = source[1 * src_pitch];
+    const unsigned int c = source[2 * src_pitch];
+    const unsigned int d = source[3 * src_pitch];
+    const unsigned int e = source[4 * src_pitch];
+
+    dest[0 * dest_pitch] = (unsigned char)a;
+    dest[1 * dest_pitch] = (unsigned char)((b * 85 + c * 171 + 128) >> 8);
+    dest[2 * dest_pitch] = (unsigned char)((d * 171 + e * 85 + 128) >> 8);
+
+    ++source;
+    ++dest;
+  }
+}
+
+/****************************************************************************
+ *
+ *  ROUTINE       : aom_horizontal_line_1_2_scale_c
+ *
+ *  INPUTS        : const unsigned char *source : Pointer to source data.
+ *                  unsigned int source_width   : Stride of source.
+ *                  unsigned char *dest         : Pointer to destination data.
+ *                  unsigned int dest_width     : Stride of destination
+ *                                                (NOT USED).
+ *
+ *  OUTPUTS       : None.
+ *
+ *  RETURNS       : void
+ *
+ *  FUNCTION      : Copies horizontal line of pixels from source to
+ *                  destination scaling up by 1 to 2.
+ *
+ *  SPECIAL NOTES : None.
+ *
+ ****************************************************************************/
+void aom_horizontal_line_2_1_scale_c(const unsigned char *source,
+                                     unsigned int source_width,
+                                     unsigned char *dest,
+                                     unsigned int dest_width) {
+  const unsigned char *const source_end = source + source_width;
+  (void)dest_width;
+  while (source < source_end) {
+    dest[0] = source[0];
+    source += 2;
+    ++dest;
+  }
+}
+
+void aom_vertical_band_2_1_scale_c(unsigned char *source, int src_pitch,
+                                   unsigned char *dest, int dest_pitch,
+                                   unsigned int dest_width) {
+  (void)dest_pitch;
+  (void)src_pitch;
+  memcpy(dest, source, dest_width);
+}
+
+void aom_vertical_band_2_1_scale_i_c(unsigned char *source, int src_pitch,
+                                     unsigned char *dest, int dest_pitch,
+                                     unsigned int dest_width) {
+  const unsigned char *const dest_end = dest + dest_width;
+  (void)dest_pitch;
+  while (dest < dest_end) {
+    const unsigned int a = source[-src_pitch] * 3;
+    const unsigned int b = source[0] * 10;
+    const unsigned int c = source[src_pitch] * 3;
+    dest[0] = (unsigned char)((8 + a + b + c) >> 4);
+    ++source;
+    ++dest;
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/yv12config.c b/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/yv12config.c
new file mode 100644
index 0000000000..d04f9a815f
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/yv12config.c
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_image_internal.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+/****************************************************************************
+ *  Exports
+ ****************************************************************************/
+
+/****************************************************************************
+ *
+ ****************************************************************************/
+
+// TODO(jkoleszar): Maybe replace this with struct aom_image
+int aom_free_frame_buffer(YV12_BUFFER_CONFIG *ybf) {
+  if (ybf) {
+    if (ybf->buffer_alloc_sz > 0) {
+      aom_free(ybf->buffer_alloc);
+    }
+    if (ybf->y_buffer_8bit) aom_free(ybf->y_buffer_8bit);
+    aom_remove_metadata_from_frame_buffer(ybf);
+    /* buffer_alloc isn't accessed by most functions.  Rather y_buffer,
+      u_buffer and v_buffer point to buffer_alloc and are used.  Clear out
+      all of this so that a freed pointer isn't inadvertently used */
+    memset(ybf, 0, sizeof(YV12_BUFFER_CONFIG));
+    return 0;
+  }
+
+  return AOM_CODEC_MEM_ERROR;
+}
+
+static int realloc_frame_buffer_aligned(
+    YV12_BUFFER_CONFIG *ybf, int width, int height, int ss_x, int ss_y,
+    int use_highbitdepth, int border, int byte_alignment,
+    aom_codec_frame_buffer_t *fb, aom_get_frame_buffer_cb_fn_t cb,
+    void *cb_priv, const int y_stride, const uint64_t yplane_size,
+    const uint64_t uvplane_size, const int aligned_width,
+    const int aligned_height, const int uv_width, const int uv_height,
+    const int uv_stride, const int uv_border_w, const int uv_border_h) {
+  if (ybf) {
+    const int aom_byte_align = (byte_alignment == 0) ? 1 : byte_alignment;
+    const uint64_t frame_size =
+        (1 + use_highbitdepth) * (yplane_size + 2 * uvplane_size);
+
+    uint8_t *buf = NULL;
+
+#if defined AOM_MAX_ALLOCABLE_MEMORY
+    // The size of ybf->buffer_alloc.
+    uint64_t alloc_size = frame_size;
+    // The size of ybf->y_buffer_8bit.
+    if (use_highbitdepth) alloc_size += yplane_size;
+    // The decoder may allocate REF_FRAMES frame buffers in the frame buffer
+    // pool. Bound the total amount of allocated memory as if these REF_FRAMES
+    // frame buffers were allocated in a single allocation.
+    if (alloc_size > AOM_MAX_ALLOCABLE_MEMORY / REF_FRAMES)
+      return AOM_CODEC_MEM_ERROR;
+#endif
+
+    if (cb != NULL) {
+      const int align_addr_extra_size = 31;
+      const uint64_t external_frame_size = frame_size + align_addr_extra_size;
+
+      assert(fb != NULL);
+
+      if (external_frame_size != (size_t)external_frame_size)
+        return AOM_CODEC_MEM_ERROR;
+
+      // Allocation to hold larger frame, or first allocation.
+      if (cb(cb_priv, (size_t)external_frame_size, fb) < 0)
+        return AOM_CODEC_MEM_ERROR;
+
+      if (fb->data == NULL || fb->size < external_frame_size)
+        return AOM_CODEC_MEM_ERROR;
+
+      ybf->buffer_alloc = (uint8_t *)aom_align_addr(fb->data, 32);
+
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+      // This memset is needed for fixing the issue of using uninitialized
+      // value in msan test. It will cause a perf loss, so only do this for
+      // msan test.
+      memset(ybf->buffer_alloc, 0, (size_t)frame_size);
+#endif
+#endif
+    } else if (frame_size > ybf->buffer_alloc_sz) {
+      // Allocation to hold larger frame, or first allocation.
+      aom_free(ybf->buffer_alloc);
+      ybf->buffer_alloc = NULL;
+      ybf->buffer_alloc_sz = 0;
+
+      if (frame_size != (size_t)frame_size) return AOM_CODEC_MEM_ERROR;
+
+      ybf->buffer_alloc = (uint8_t *)aom_memalign(32, (size_t)frame_size);
+      if (!ybf->buffer_alloc) return AOM_CODEC_MEM_ERROR;
+
+      ybf->buffer_alloc_sz = (size_t)frame_size;
+
+      // This memset is needed for fixing valgrind error from C loop filter
+      // due to access uninitialized memory in frame border. It could be
+      // removed if border is totally removed.
+      memset(ybf->buffer_alloc, 0, ybf->buffer_alloc_sz);
+    }
+
+    ybf->y_crop_width = width;
+    ybf->y_crop_height = height;
+    ybf->y_width = aligned_width;
+    ybf->y_height = aligned_height;
+    ybf->y_stride = y_stride;
+
+    ybf->uv_crop_width = (width + ss_x) >> ss_x;
+    ybf->uv_crop_height = (height + ss_y) >> ss_y;
+    ybf->uv_width = uv_width;
+    ybf->uv_height = uv_height;
+    ybf->uv_stride = uv_stride;
+
+    ybf->border = border;
+    ybf->frame_size = (size_t)frame_size;
+    ybf->subsampling_x = ss_x;
+    ybf->subsampling_y = ss_y;
+
+    buf = ybf->buffer_alloc;
+    if (use_highbitdepth) {
+      // Store uint16 addresses when using 16bit framebuffers
+      buf = CONVERT_TO_BYTEPTR(ybf->buffer_alloc);
+      ybf->flags = YV12_FLAG_HIGHBITDEPTH;
+    } else {
+      ybf->flags = 0;
+    }
+
+    ybf->y_buffer = (uint8_t *)aom_align_addr(
+        buf + (border * y_stride) + border, aom_byte_align);
+    ybf->u_buffer = (uint8_t *)aom_align_addr(
+        buf + yplane_size + (uv_border_h * uv_stride) + uv_border_w,
+        aom_byte_align);
+    ybf->v_buffer =
+        (uint8_t *)aom_align_addr(buf + yplane_size + uvplane_size +
+                                      (uv_border_h * uv_stride) + uv_border_w,
+                                  aom_byte_align);
+
+    ybf->use_external_reference_buffers = 0;
+
+    if (use_highbitdepth) {
+      if (ybf->y_buffer_8bit) aom_free(ybf->y_buffer_8bit);
+      ybf->y_buffer_8bit = (uint8_t *)aom_memalign(32, (size_t)yplane_size);
+      if (!ybf->y_buffer_8bit) return AOM_CODEC_MEM_ERROR;
+    } else {
+      if (ybf->y_buffer_8bit) {
+        aom_free(ybf->y_buffer_8bit);
+        ybf->y_buffer_8bit = NULL;
+        ybf->buf_8bit_valid = 0;
+      }
+    }
+
+    ybf->corrupted = 0; /* assume not corrupted by errors */
+    return 0;
+  }
+  return AOM_CODEC_MEM_ERROR;
+}
+
+static int calc_stride_and_planesize(const int ss_x, const int ss_y,
+                                     const int aligned_width,
+                                     const int aligned_height, const int border,
+                                     const int byte_alignment, int *y_stride,
+                                     int *uv_stride, uint64_t *yplane_size,
+                                     uint64_t *uvplane_size,
+                                     const int uv_height) {
+  /* Only support allocating buffers that have a border that's a multiple
+   * of 32. The border restriction is required to get 16-byte alignment of
+   * the start of the chroma rows without introducing an arbitrary gap
+   * between planes, which would break the semantics of things like
+   * aom_img_set_rect(). */
+  if (border & 0x1f) return AOM_CODEC_MEM_ERROR;
+  *y_stride = ((aligned_width + 2 * border) + 31) & ~31;
+  *yplane_size =
+      (aligned_height + 2 * border) * (uint64_t)(*y_stride) + byte_alignment;
+
+  *uv_stride = *y_stride >> ss_x;
+  *uvplane_size = (uv_height + 2 * (border >> ss_y)) * (uint64_t)(*uv_stride) +
+                  byte_alignment;
+  return 0;
+}
+
+int aom_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height,
+                             int ss_x, int ss_y, int use_highbitdepth,
+                             int border, int byte_alignment,
+                             aom_codec_frame_buffer_t *fb,
+                             aom_get_frame_buffer_cb_fn_t cb, void *cb_priv) {
+#if CONFIG_SIZE_LIMIT
+  if (width > DECODE_WIDTH_LIMIT || height > DECODE_HEIGHT_LIMIT)
+    return AOM_CODEC_MEM_ERROR;
+#endif
+
+  if (ybf) {
+    int y_stride = 0;
+    int uv_stride = 0;
+    uint64_t yplane_size = 0;
+    uint64_t uvplane_size = 0;
+    const int aligned_width = (width + 7) & ~7;
+    const int aligned_height = (height + 7) & ~7;
+    const int uv_width = aligned_width >> ss_x;
+    const int uv_height = aligned_height >> ss_y;
+    const int uv_border_w = border >> ss_x;
+    const int uv_border_h = border >> ss_y;
+
+    int error = calc_stride_and_planesize(
+        ss_x, ss_y, aligned_width, aligned_height, border, byte_alignment,
+        &y_stride, &uv_stride, &yplane_size, &uvplane_size, uv_height);
+    if (error) return error;
+    return realloc_frame_buffer_aligned(
+        ybf, width, height, ss_x, ss_y, use_highbitdepth, border,
+        byte_alignment, fb, cb, cb_priv, y_stride, yplane_size, uvplane_size,
+        aligned_width, aligned_height, uv_width, uv_height, uv_stride,
+        uv_border_w, uv_border_h);
+  }
+  return AOM_CODEC_MEM_ERROR;
+}
+
+int aom_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height,
+                           int ss_x, int ss_y, int use_highbitdepth, int border,
+                           int byte_alignment) {
+  if (ybf) {
+    aom_free_frame_buffer(ybf);
+    return aom_realloc_frame_buffer(ybf, width, height, ss_x, ss_y,
+                                    use_highbitdepth, border, byte_alignment,
+                                    NULL, NULL, NULL);
+  }
+  return AOM_CODEC_MEM_ERROR;
+}
+
+void aom_remove_metadata_from_frame_buffer(YV12_BUFFER_CONFIG *ybf) {
+  if (ybf && ybf->metadata) {
+    aom_img_metadata_array_free(ybf->metadata);
+    ybf->metadata = NULL;
+  }
+}
+
+int aom_copy_metadata_to_frame_buffer(YV12_BUFFER_CONFIG *ybf,
+                                      const aom_metadata_array_t *arr) {
+  if (!ybf || !arr || !arr->metadata_array) return -1;
+  if (ybf->metadata == arr) return 0;
+  aom_remove_metadata_from_frame_buffer(ybf);
+  ybf->metadata = aom_img_metadata_array_alloc(arr->sz);
+  if (!ybf->metadata) return -1;
+  for (size_t i = 0; i < ybf->metadata->sz; i++) {
+    ybf->metadata->metadata_array[i] = aom_img_metadata_alloc(
+        arr->metadata_array[i]->type, arr->metadata_array[i]->payload,
+        arr->metadata_array[i]->sz, arr->metadata_array[i]->insert_flag);
+    if (ybf->metadata->metadata_array[i] == NULL) {
+      aom_img_metadata_array_free(ybf->metadata);
+      ybf->metadata = NULL;
+      return -1;
+    }
+  }
+  ybf->metadata->sz = arr->sz;
+  return 0;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/yv12extend.c b/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/yv12extend.c
new file mode 100644
index 0000000000..107dc9cdbc
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_scale/generic/yv12extend.c
@@ -0,0 +1,473 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h"
+
+static void extend_plane(uint8_t *const src, int src_stride, int width,
+                         int height, int extend_top, int extend_left,
+                         int extend_bottom, int extend_right) {
+  assert(src != NULL);
+  int i;
+  const int linesize = extend_left + extend_right + width;
+
+  /* copy the left and right most columns out */
+  uint8_t *src_ptr1 = src;
+  uint8_t *src_ptr2 = src + width - 1;
+  uint8_t *dst_ptr1 = src - extend_left;
+  uint8_t *dst_ptr2 = src + width;
+
+  for (i = 0; i < height; ++i) {
+    memset(dst_ptr1, src_ptr1[0], extend_left);
+    memset(dst_ptr2, src_ptr2[0], extend_right);
+    src_ptr1 += src_stride;
+    src_ptr2 += src_stride;
+    dst_ptr1 += src_stride;
+    dst_ptr2 += src_stride;
+  }
+
+  /* Now copy the top and bottom lines into each line of the respective
+   * borders
+   */
+  src_ptr1 = src - extend_left;
+  src_ptr2 = src + src_stride * (height - 1) - extend_left;
+  dst_ptr1 = src + src_stride * -extend_top - extend_left;
+  dst_ptr2 = src + src_stride * height - extend_left;
+
+  for (i = 0; i < extend_top; ++i) {
+    memcpy(dst_ptr1, src_ptr1, linesize);
+    dst_ptr1 += src_stride;
+  }
+
+  for (i = 0; i < extend_bottom; ++i) {
+    memcpy(dst_ptr2, src_ptr2, linesize);
+    dst_ptr2 += src_stride;
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void extend_plane_high(uint8_t *const src8, int src_stride, int width,
+                              int height, int extend_top, int extend_left,
+                              int extend_bottom, int extend_right) {
+  int i;
+  const int linesize = extend_left + extend_right + width;
+  uint16_t *src = CONVERT_TO_SHORTPTR(src8);
+
+  /* copy the left and right most columns out */
+  uint16_t *src_ptr1 = src;
+  uint16_t *src_ptr2 = src + width - 1;
+  uint16_t *dst_ptr1 = src - extend_left;
+  uint16_t *dst_ptr2 = src + width;
+
+  for (i = 0; i < height; ++i) {
+    aom_memset16(dst_ptr1, src_ptr1[0], extend_left);
+    aom_memset16(dst_ptr2, src_ptr2[0], extend_right);
+    src_ptr1 += src_stride;
+    src_ptr2 += src_stride;
+    dst_ptr1 += src_stride;
+    dst_ptr2 += src_stride;
+  }
+
+  /* Now copy the top and bottom lines into each line of the respective
+   * borders
+   */
+  src_ptr1 = src - extend_left;
+  src_ptr2 = src + src_stride * (height - 1) - extend_left;
+  dst_ptr1 = src + src_stride * -extend_top - extend_left;
+  dst_ptr2 = src + src_stride * height - extend_left;
+
+  for (i = 0; i < extend_top; ++i) {
+    memcpy(dst_ptr1, src_ptr1, linesize * sizeof(uint16_t));
+    dst_ptr1 += src_stride;
+  }
+
+  for (i = 0; i < extend_bottom; ++i) {
+    memcpy(dst_ptr2, src_ptr2, linesize * sizeof(uint16_t));
+    dst_ptr2 += src_stride;
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+void aom_yv12_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf,
+                                     const int num_planes) {
+  assert(ybf->border % 2 == 0);
+  assert(ybf->y_height - ybf->y_crop_height < 16);
+  assert(ybf->y_width - ybf->y_crop_width < 16);
+  assert(ybf->y_height - ybf->y_crop_height >= 0);
+  assert(ybf->y_width - ybf->y_crop_width >= 0);
+
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (ybf->flags & YV12_FLAG_HIGHBITDEPTH) {
+    for (int plane = 0; plane < num_planes; ++plane) {
+      const int is_uv = plane > 0;
+      const int plane_border = ybf->border >> is_uv;
+      extend_plane_high(
+          ybf->buffers[plane], ybf->strides[is_uv], ybf->crop_widths[is_uv],
+          ybf->crop_heights[is_uv], plane_border, plane_border,
+          plane_border + ybf->heights[is_uv] - ybf->crop_heights[is_uv],
+          plane_border + ybf->widths[is_uv] - ybf->crop_widths[is_uv]);
+    }
+    return;
+  }
+#endif
+
+  for (int plane = 0; plane < num_planes; ++plane) {
+    const int is_uv = plane > 0;
+    const int plane_border = ybf->border >> is_uv;
+    extend_plane(ybf->buffers[plane], ybf->strides[is_uv],
+                 ybf->crop_widths[is_uv], ybf->crop_heights[is_uv],
+                 plane_border, plane_border,
+                 plane_border + ybf->heights[is_uv] - ybf->crop_heights[is_uv],
+                 plane_border + ybf->widths[is_uv] - ybf->crop_widths[is_uv]);
+  }
+}
+
+static void extend_frame(YV12_BUFFER_CONFIG *const ybf, int ext_size,
+                         const int num_planes) {
+  const int ss_x = ybf->uv_width < ybf->y_width;
+  const int ss_y = ybf->uv_height < ybf->y_height;
+
+  assert(ybf->y_height - ybf->y_crop_height < 16);
+  assert(ybf->y_width - ybf->y_crop_width < 16);
+  assert(ybf->y_height - ybf->y_crop_height >= 0);
+  assert(ybf->y_width - ybf->y_crop_width >= 0);
+
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (ybf->flags & YV12_FLAG_HIGHBITDEPTH) {
+    for (int plane = 0; plane < num_planes; ++plane) {
+      const int is_uv = plane > 0;
+      const int top = ext_size >> (is_uv ? ss_y : 0);
+      const int left = ext_size >> (is_uv ? ss_x : 0);
+      const int bottom = top + ybf->heights[is_uv] - ybf->crop_heights[is_uv];
+      const int right = left + ybf->widths[is_uv] - ybf->crop_widths[is_uv];
+      extend_plane_high(ybf->buffers[plane], ybf->strides[is_uv],
+                        ybf->crop_widths[is_uv], ybf->crop_heights[is_uv], top,
+                        left, bottom, right);
+    }
+    return;
+  }
+#endif
+
+  for (int plane = 0; plane < num_planes; ++plane) {
+    const int is_uv = plane > 0;
+    const int top = ext_size >> (is_uv ? ss_y : 0);
+    const int left = ext_size >> (is_uv ? ss_x : 0);
+    const int bottom = top + ybf->heights[is_uv] - ybf->crop_heights[is_uv];
+    const int right = left + ybf->widths[is_uv] - ybf->crop_widths[is_uv];
+    extend_plane(ybf->buffers[plane], ybf->strides[is_uv],
+                 ybf->crop_widths[is_uv], ybf->crop_heights[is_uv], top, left,
+                 bottom, right);
+  }
+}
+
+void aom_extend_frame_borders_c(YV12_BUFFER_CONFIG *ybf, const int num_planes) {
+  extend_frame(ybf, ybf->border, num_planes);
+}
+
+void aom_extend_frame_inner_borders_c(YV12_BUFFER_CONFIG *ybf,
+                                      const int num_planes) {
+  const int inner_bw = (ybf->border > AOMINNERBORDERINPIXELS)
+                           ? AOMINNERBORDERINPIXELS
+                           : ybf->border;
+  extend_frame(ybf, inner_bw, num_planes);
+}
+
+void aom_extend_frame_borders_y_c(YV12_BUFFER_CONFIG *ybf) {
+  int ext_size = ybf->border;
+  assert(ybf->y_height - ybf->y_crop_height < 16);
+  assert(ybf->y_width - ybf->y_crop_width < 16);
+  assert(ybf->y_height - ybf->y_crop_height >= 0);
+  assert(ybf->y_width - ybf->y_crop_width >= 0);
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (ybf->flags & YV12_FLAG_HIGHBITDEPTH) {
+    extend_plane_high(ybf->y_buffer, ybf->y_stride, ybf->y_crop_width,
+                      ybf->y_crop_height, ext_size, ext_size,
+                      ext_size + ybf->y_height - ybf->y_crop_height,
+                      ext_size + ybf->y_width - ybf->y_crop_width);
+    return;
+  }
+#endif
+  extend_plane(ybf->y_buffer, ybf->y_stride, ybf->y_crop_width,
+               ybf->y_crop_height, ext_size, ext_size,
+               ext_size + ybf->y_height - ybf->y_crop_height,
+               ext_size + ybf->y_width - ybf->y_crop_width);
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void memcpy_short_addr(uint8_t *dst8, const uint8_t *src8, int num) {
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
+  uint16_t *src = CONVERT_TO_SHORTPTR(src8);
+  memcpy(dst, src, num * sizeof(uint16_t));
+}
+#endif
+
+// Copies the source image into the destination image and updates the
+// destination's UMV borders.
+// Note: The frames are assumed to be identical in size.
+void aom_yv12_copy_frame_c(const YV12_BUFFER_CONFIG *src_bc,
+                           YV12_BUFFER_CONFIG *dst_bc, const int num_planes) {
+  assert(src_bc->y_width == dst_bc->y_width);
+  assert(src_bc->y_height == dst_bc->y_height);
+
+#if CONFIG_AV1_HIGHBITDEPTH
+  assert((src_bc->flags & YV12_FLAG_HIGHBITDEPTH) ==
+         (dst_bc->flags & YV12_FLAG_HIGHBITDEPTH));
+
+  if (src_bc->flags & YV12_FLAG_HIGHBITDEPTH) {
+    for (int plane = 0; plane < num_planes; ++plane) {
+      const uint8_t *plane_src = src_bc->buffers[plane];
+      uint8_t *plane_dst = dst_bc->buffers[plane];
+      const int is_uv = plane > 0;
+
+      for (int row = 0; row < src_bc->heights[is_uv]; ++row) {
+        memcpy_short_addr(plane_dst, plane_src, src_bc->widths[is_uv]);
+        plane_src += src_bc->strides[is_uv];
+        plane_dst += dst_bc->strides[is_uv];
+      }
+    }
+    aom_yv12_extend_frame_borders_c(dst_bc, num_planes);
+    return;
+  }
+#endif
+  for (int plane = 0; plane < num_planes; ++plane) {
+    const uint8_t *plane_src = src_bc->buffers[plane];
+    uint8_t *plane_dst = dst_bc->buffers[plane];
+    const int is_uv = plane > 0;
+
+    for (int row = 0; row < src_bc->heights[is_uv]; ++row) {
+      memcpy(plane_dst, plane_src, src_bc->widths[is_uv]);
+      plane_src += src_bc->strides[is_uv];
+      plane_dst += dst_bc->strides[is_uv];
+    }
+  }
+  aom_yv12_extend_frame_borders_c(dst_bc, num_planes);
+}
+
+void aom_yv12_copy_y_c(const YV12_BUFFER_CONFIG *src_ybc,
+                       YV12_BUFFER_CONFIG *dst_ybc) {
+  int row;
+  const uint8_t *src = src_ybc->y_buffer;
+  uint8_t *dst = dst_ybc->y_buffer;
+
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (src_ybc->flags & YV12_FLAG_HIGHBITDEPTH) {
+    const uint16_t *src16 = CONVERT_TO_SHORTPTR(src);
+    uint16_t *dst16 = CONVERT_TO_SHORTPTR(dst);
+    for (row = 0; row < src_ybc->y_height; ++row) {
+      memcpy(dst16, src16, src_ybc->y_width * sizeof(uint16_t));
+      src16 += src_ybc->y_stride;
+      dst16 += dst_ybc->y_stride;
+    }
+    return;
+  }
+#endif
+
+  for (row = 0; row < src_ybc->y_height; ++row) {
+    memcpy(dst, src, src_ybc->y_width);
+    src += src_ybc->y_stride;
+    dst += dst_ybc->y_stride;
+  }
+}
+
+void aom_yv12_copy_u_c(const YV12_BUFFER_CONFIG *src_bc,
+                       YV12_BUFFER_CONFIG *dst_bc) {
+  int row;
+  const uint8_t *src = src_bc->u_buffer;
+  uint8_t *dst = dst_bc->u_buffer;
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (src_bc->flags & YV12_FLAG_HIGHBITDEPTH) {
+    const uint16_t *src16 = CONVERT_TO_SHORTPTR(src);
+    uint16_t *dst16 = CONVERT_TO_SHORTPTR(dst);
+    for (row = 0; row < src_bc->uv_height; ++row) {
+      memcpy(dst16, src16, src_bc->uv_width * sizeof(uint16_t));
+      src16 += src_bc->uv_stride;
+      dst16 += dst_bc->uv_stride;
+    }
+    return;
+  }
+#endif
+  for (row = 0; row < src_bc->uv_height; ++row) {
+    memcpy(dst, src, src_bc->uv_width);
+    src += src_bc->uv_stride;
+    dst += dst_bc->uv_stride;
+  }
+}
+
+void aom_yv12_copy_v_c(const YV12_BUFFER_CONFIG *src_bc,
+                       YV12_BUFFER_CONFIG *dst_bc) {
+  int row;
+  const uint8_t *src = src_bc->v_buffer;
+  uint8_t *dst = dst_bc->v_buffer;
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (src_bc->flags & YV12_FLAG_HIGHBITDEPTH) {
+    const uint16_t *src16 = CONVERT_TO_SHORTPTR(src);
+    uint16_t *dst16 = CONVERT_TO_SHORTPTR(dst);
+    for (row = 0; row < src_bc->uv_height; ++row) {
+      memcpy(dst16, src16, src_bc->uv_width * sizeof(uint16_t));
+      src16 += src_bc->uv_stride;
+      dst16 += dst_bc->uv_stride;
+    }
+    return;
+  }
+#endif
+  for (row = 0; row < src_bc->uv_height; ++row) {
+    memcpy(dst, src, src_bc->uv_width);
+    src += src_bc->uv_stride;
+    dst += dst_bc->uv_stride;
+  }
+}
+
+void aom_yv12_partial_copy_y_c(const YV12_BUFFER_CONFIG *src_ybc, int hstart1,
+                               int hend1, int vstart1, int vend1,
+                               YV12_BUFFER_CONFIG *dst_ybc, int hstart2,
+                               int vstart2) {
+  int row;
+  const uint8_t *src = src_ybc->y_buffer;
+  uint8_t *dst = dst_ybc->y_buffer;
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (src_ybc->flags & YV12_FLAG_HIGHBITDEPTH) {
+    const uint16_t *src16 =
+        CONVERT_TO_SHORTPTR(src + vstart1 * src_ybc->y_stride + hstart1);
+    uint16_t *dst16 =
+        CONVERT_TO_SHORTPTR(dst + vstart2 * dst_ybc->y_stride + hstart2);
+
+    for (row = vstart1; row < vend1; ++row) {
+      memcpy(dst16, src16, (hend1 - hstart1) * sizeof(uint16_t));
+      src16 += src_ybc->y_stride;
+      dst16 += dst_ybc->y_stride;
+    }
+    return;
+  }
+#endif
+  src = (src + vstart1 * src_ybc->y_stride + hstart1);
+  dst = (dst + vstart2 * dst_ybc->y_stride + hstart2);
+
+  for (row = vstart1; row < vend1; ++row) {
+    memcpy(dst, src, (hend1 - hstart1));
+    src += src_ybc->y_stride;
+    dst += dst_ybc->y_stride;
+  }
+}
+
+void aom_yv12_partial_coloc_copy_y_c(const YV12_BUFFER_CONFIG *src_ybc,
+                                     YV12_BUFFER_CONFIG *dst_ybc, int hstart,
+                                     int hend, int vstart, int vend) {
+  aom_yv12_partial_copy_y_c(src_ybc, hstart, hend, vstart, vend, dst_ybc,
+                            hstart, vstart);
+}
+
+void aom_yv12_partial_copy_u_c(const YV12_BUFFER_CONFIG *src_bc, int hstart1,
+                               int hend1, int vstart1, int vend1,
+                               YV12_BUFFER_CONFIG *dst_bc, int hstart2,
+                               int vstart2) {
+  int row;
+  const uint8_t *src = src_bc->u_buffer;
+  uint8_t *dst = dst_bc->u_buffer;
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (src_bc->flags & YV12_FLAG_HIGHBITDEPTH) {
+    const uint16_t *src16 =
+        CONVERT_TO_SHORTPTR(src + vstart1 * src_bc->uv_stride + hstart1);
+    uint16_t *dst16 =
+        CONVERT_TO_SHORTPTR(dst + vstart2 * dst_bc->uv_stride + hstart2);
+    for (row = vstart1; row < vend1; ++row) {
+      memcpy(dst16, src16, (hend1 - hstart1) * sizeof(uint16_t));
+      src16 += src_bc->uv_stride;
+      dst16 += dst_bc->uv_stride;
+    }
+    return;
+  }
+#endif
+  src = (src + vstart1 * src_bc->uv_stride + hstart1);
+  dst = (dst + vstart2 * dst_bc->uv_stride + hstart2);
+
+  for (row = vstart1; row < vend1; ++row) {
+    memcpy(dst, src, (hend1 - hstart1));
+    src += src_bc->uv_stride;
+    dst += dst_bc->uv_stride;
+  }
+}
+
+void aom_yv12_partial_coloc_copy_u_c(const YV12_BUFFER_CONFIG *src_bc,
+                                     YV12_BUFFER_CONFIG *dst_bc, int hstart,
+                                     int hend, int vstart, int vend) {
+  aom_yv12_partial_copy_u_c(src_bc, hstart, hend, vstart, vend, dst_bc, hstart,
+                            vstart);
+}
+
+void aom_yv12_partial_copy_v_c(const YV12_BUFFER_CONFIG *src_bc, int hstart1,
+                               int hend1, int vstart1, int vend1,
+                               YV12_BUFFER_CONFIG *dst_bc, int hstart2,
+                               int vstart2) {
+  int row;
+  const uint8_t *src = src_bc->v_buffer;
+  uint8_t *dst = dst_bc->v_buffer;
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (src_bc->flags & YV12_FLAG_HIGHBITDEPTH) {
+    const uint16_t *src16 =
+        CONVERT_TO_SHORTPTR(src + vstart1 * src_bc->uv_stride + hstart1);
+    uint16_t *dst16 =
+        CONVERT_TO_SHORTPTR(dst + vstart2 * dst_bc->uv_stride + hstart2);
+    for (row = vstart1; row < vend1; ++row) {
+      memcpy(dst16, src16, (hend1 - hstart1) * sizeof(uint16_t));
+      src16 += src_bc->uv_stride;
+      dst16 += dst_bc->uv_stride;
+    }
+    return;
+  }
+#endif
+  src = (src + vstart1 * src_bc->uv_stride + hstart1);
+  dst = (dst + vstart2 * dst_bc->uv_stride + hstart2);
+
+  for (row = vstart1; row < vend1; ++row) {
+    memcpy(dst, src, (hend1 - hstart1));
+    src += src_bc->uv_stride;
+    dst += dst_bc->uv_stride;
+  }
+}
+
+void aom_yv12_partial_coloc_copy_v_c(const YV12_BUFFER_CONFIG *src_bc,
+                                     YV12_BUFFER_CONFIG *dst_bc, int hstart,
+                                     int hend, int vstart, int vend) {
+  aom_yv12_partial_copy_v_c(src_bc, hstart, hend, vstart, vend, dst_bc, hstart,
+                            vstart);
+}
+
+int aom_yv12_realloc_with_new_border_c(YV12_BUFFER_CONFIG *ybf, int new_border,
+                                       int byte_alignment, int num_planes) {
+  if (ybf) {
+    if (new_border == ybf->border) return 0;
+    YV12_BUFFER_CONFIG new_buf;
+    memset(&new_buf, 0, sizeof(new_buf));
+    const int error = aom_alloc_frame_buffer(
+        &new_buf, ybf->y_crop_width, ybf->y_crop_height, ybf->subsampling_x,
+        ybf->subsampling_y, ybf->flags & YV12_FLAG_HIGHBITDEPTH, new_border,
+        byte_alignment);
+    if (error) return error;
+    // Copy image buffer
+    aom_yv12_copy_frame(ybf, &new_buf, num_planes);
+
+    // Extend up to new border
+    aom_extend_frame_borders(&new_buf, num_planes);
+
+    // Now free the old buffer and replace with the new
+    aom_free_frame_buffer(ybf);
+    memcpy(ybf, &new_buf, sizeof(new_buf));
+    return 0;
+  }
+  return -2;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h b/pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h
new file mode 100644
index 0000000000..c10371267e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AOM_SCALE_YV12CONFIG_H_
+#define AOM_AOM_SCALE_YV12CONFIG_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_frame_buffer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_image_internal.h"
+
+/*!\cond */
+
+#define AOMINNERBORDERINPIXELS 160
+#define AOM_INTERP_EXTEND 4
+#define AOM_BORDER_IN_PIXELS 288
+#define AOM_ENC_NO_SCALE_BORDER 160
+#define AOM_DEC_BORDER_IN_PIXELS 64
+
+/*!\endcond */
+/*!
+ * \brief YV12 frame buffer data structure
+ */
+typedef struct yv12_buffer_config {
+  /*!\cond */
+  union {
+    struct {
+      int y_width;
+      int uv_width;
+    };
+    int widths[2];
+  };
+  union {
+    struct {
+      int y_height;
+      int uv_height;
+    };
+    int heights[2];
+  };
+  union {
+    struct {
+      int y_crop_width;
+      int uv_crop_width;
+    };
+    int crop_widths[2];
+  };
+  union {
+    struct {
+      int y_crop_height;
+      int uv_crop_height;
+    };
+    int crop_heights[2];
+  };
+  union {
+    struct {
+      int y_stride;
+      int uv_stride;
+    };
+    int strides[2];
+  };
+  union {
+    struct {
+      uint8_t *y_buffer;
+      uint8_t *u_buffer;
+      uint8_t *v_buffer;
+    };
+    uint8_t *buffers[3];
+  };
+
+  // Indicate whether y_buffer, u_buffer, and v_buffer points to the internally
+  // allocated memory or external buffers.
+  int use_external_reference_buffers;
+  // This is needed to store y_buffer, u_buffer, and v_buffer when set reference
+  // uses an external refernece, and restore those buffer pointers after the
+  // external reference frame is no longer used.
+  uint8_t *store_buf_adr[3];
+
+  // If the frame is stored in a 16-bit buffer, this stores an 8-bit version
+  // for use in global motion detection. It is allocated on-demand.
+  uint8_t *y_buffer_8bit;
+  int buf_8bit_valid;
+
+  uint8_t *buffer_alloc;
+  size_t buffer_alloc_sz;
+  int border;
+  size_t frame_size;
+  int subsampling_x;
+  int subsampling_y;
+  unsigned int bit_depth;
+  aom_color_primaries_t color_primaries;
+  aom_transfer_characteristics_t transfer_characteristics;
+  aom_matrix_coefficients_t matrix_coefficients;
+  uint8_t monochrome;
+  aom_chroma_sample_position_t chroma_sample_position;
+  aom_color_range_t color_range;
+  int render_width;
+  int render_height;
+
+  int corrupted;
+  int flags;
+  aom_metadata_array_t *metadata;
+  /*!\endcond */
+} YV12_BUFFER_CONFIG;
+
+/*!\cond */
+
+#define YV12_FLAG_HIGHBITDEPTH 8
+
+int aom_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height,
+                           int ss_x, int ss_y, int use_highbitdepth, int border,
+                           int byte_alignment);
+
+// Updates the yv12 buffer config with the frame buffer. |byte_alignment| must
+// be a power of 2, from 32 to 1024. 0 sets legacy alignment. If cb is not
+// NULL, then libaom is using the frame buffer callbacks to handle memory.
+// If cb is not NULL, libaom will call cb with minimum size in bytes needed
+// to decode the current frame. If cb is NULL, libaom will allocate memory
+// internally to decode the current frame. Returns 0 on success. Returns < 0
+// on failure.
+int aom_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height,
+                             int ss_x, int ss_y, int use_highbitdepth,
+                             int border, int byte_alignment,
+                             aom_codec_frame_buffer_t *fb,
+                             aom_get_frame_buffer_cb_fn_t cb, void *cb_priv);
+
+int aom_free_frame_buffer(YV12_BUFFER_CONFIG *ybf);
+
+/*!\endcond */
+/*!\brief Removes metadata from YUV_BUFFER_CONFIG struct.
+ *
+ * Frees metadata in frame buffer.
+ * Frame buffer metadata pointer will be set to NULL.
+ *
+ * \param[in]    ybf       Frame buffer struct pointer
+ */
+void aom_remove_metadata_from_frame_buffer(YV12_BUFFER_CONFIG *ybf);
+
+/*!\brief Copy metadata to YUV_BUFFER_CONFIG struct.
+ *
+ * Copies metadata to frame buffer.
+ * Frame buffer will clear any previous metadata and will reallocate the
+ * metadata array to the new metadata size. Then, it will copy the new metadata
+ * array into it.
+ * If arr metadata pointer points to the same address as current metadata in the
+ * frame buffer, function will do nothing and return 0.
+ * Returns 0 on success or -1 on failure.
+ *
+ * \param[in]    ybf       Frame buffer struct pointer
+ * \param[in]    arr       Metadata array struct pointer
+ */
+int aom_copy_metadata_to_frame_buffer(YV12_BUFFER_CONFIG *ybf,
+                                      const aom_metadata_array_t *arr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // AOM_AOM_SCALE_YV12CONFIG_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.c b/pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.c
new file mode 100644
index 0000000000..64d6ff9ba0
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.c
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+//
+// Multi-threaded worker
+//
+// Original source:
+//  https://chromium.googlesource.com/webm/libwebp
+
+// Enable GNU extensions in glibc so that we can call pthread_setname_np().
+// This must be before any #include statements.
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <assert.h>
+#include <string.h>  // for memset()
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h"
+
+#if CONFIG_MULTITHREAD
+
+struct AVxWorkerImpl {
+  pthread_mutex_t mutex_;
+  pthread_cond_t condition_;
+  pthread_t thread_;
+};
+
+//------------------------------------------------------------------------------
+
+static void execute(AVxWorker *const worker);  // Forward declaration.
+
+static THREADFN thread_loop(void *ptr) {
+  AVxWorker *const worker = (AVxWorker *)ptr;
+#ifdef __APPLE__
+  if (worker->thread_name != NULL) {
+    // Apple's version of pthread_setname_np takes one argument and operates on
+    // the current thread only. The maximum size of the thread_name buffer was
+    // noted in the Chromium source code and was confirmed by experiments. If
+    // thread_name is too long, pthread_setname_np returns -1 with errno
+    // ENAMETOOLONG (63).
+    char thread_name[64];
+    strncpy(thread_name, worker->thread_name, sizeof(thread_name) - 1);
+    thread_name[sizeof(thread_name) - 1] = '\0';
+    pthread_setname_np(thread_name);
+  }
+#elif defined(__GLIBC__) || defined(__BIONIC__)
+  if (worker->thread_name != NULL) {
+    // Linux and Android require names (with nul) fit in 16 chars, otherwise
+    // pthread_setname_np() returns ERANGE (34).
+    char thread_name[16];
+    strncpy(thread_name, worker->thread_name, sizeof(thread_name) - 1);
+    thread_name[sizeof(thread_name) - 1] = '\0';
+    pthread_setname_np(pthread_self(), thread_name);
+  }
+#endif
+  int done = 0;
+  while (!done) {
+    pthread_mutex_lock(&worker->impl_->mutex_);
+    while (worker->status_ == OK) {  // wait in idling mode
+      pthread_cond_wait(&worker->impl_->condition_, &worker->impl_->mutex_);
+    }
+    if (worker->status_ == WORK) {
+      execute(worker);
+      worker->status_ = OK;
+    } else if (worker->status_ == NOT_OK) {  // finish the worker
+      done = 1;
+    }
+    // signal to the main thread that we're done (for sync())
+    pthread_cond_signal(&worker->impl_->condition_);
+    pthread_mutex_unlock(&worker->impl_->mutex_);
+  }
+  return THREAD_RETURN(NULL);  // Thread is finished
+}
+
+// main thread state control
+static void change_state(AVxWorker *const worker, AVxWorkerStatus new_status) {
+  // No-op when attempting to change state on a thread that didn't come up.
+  // Checking status_ without acquiring the lock first would result in a data
+  // race.
+  if (worker->impl_ == NULL) return;
+
+  pthread_mutex_lock(&worker->impl_->mutex_);
+  if (worker->status_ >= OK) {
+    // wait for the worker to finish
+    while (worker->status_ != OK) {
+      pthread_cond_wait(&worker->impl_->condition_, &worker->impl_->mutex_);
+    }
+    // assign new status and release the working thread if needed
+    if (new_status != OK) {
+      worker->status_ = new_status;
+      pthread_cond_signal(&worker->impl_->condition_);
+    }
+  }
+  pthread_mutex_unlock(&worker->impl_->mutex_);
+}
+
+#endif  // CONFIG_MULTITHREAD
+
+//------------------------------------------------------------------------------
+
+static void init(AVxWorker *const worker) {
+  memset(worker, 0, sizeof(*worker));
+  worker->status_ = NOT_OK;
+}
+
+static int sync(AVxWorker *const worker) {
+#if CONFIG_MULTITHREAD
+  change_state(worker, OK);
+#endif
+  assert(worker->status_ <= OK);
+  return !worker->had_error;
+}
+
+static int reset(AVxWorker *const worker) {
+  int ok = 1;
+  worker->had_error = 0;
+  if (worker->status_ < OK) {
+#if CONFIG_MULTITHREAD
+    worker->impl_ = (AVxWorkerImpl *)aom_calloc(1, sizeof(*worker->impl_));
+    if (worker->impl_ == NULL) {
+      return 0;
+    }
+    if (pthread_mutex_init(&worker->impl_->mutex_, NULL)) {
+      goto Error;
+    }
+    if (pthread_cond_init(&worker->impl_->condition_, NULL)) {
+      pthread_mutex_destroy(&worker->impl_->mutex_);
+      goto Error;
+    }
+    pthread_mutex_lock(&worker->impl_->mutex_);
+    ok = !pthread_create(&worker->impl_->thread_, NULL, thread_loop, worker);
+    if (ok) worker->status_ = OK;
+    pthread_mutex_unlock(&worker->impl_->mutex_);
+    if (!ok) {
+      pthread_mutex_destroy(&worker->impl_->mutex_);
+      pthread_cond_destroy(&worker->impl_->condition_);
+    Error:
+      aom_free(worker->impl_);
+      worker->impl_ = NULL;
+      return 0;
+    }
+#else
+    worker->status_ = OK;
+#endif
+  } else if (worker->status_ > OK) {
+    ok = sync(worker);
+  }
+  assert(!ok || (worker->status_ == OK));
+  return ok;
+}
+
+static void execute(AVxWorker *const worker) {
+  if (worker->hook != NULL) {
+    worker->had_error |= !worker->hook(worker->data1, worker->data2);
+  }
+}
+
+static void launch(AVxWorker *const worker) {
+#if CONFIG_MULTITHREAD
+  change_state(worker, WORK);
+#else
+  execute(worker);
+#endif
+}
+
+static void end(AVxWorker *const worker) {
+#if CONFIG_MULTITHREAD
+  if (worker->impl_ != NULL) {
+    change_state(worker, NOT_OK);
+    pthread_join(worker->impl_->thread_, NULL);
+    pthread_mutex_destroy(&worker->impl_->mutex_);
+    pthread_cond_destroy(&worker->impl_->condition_);
+    aom_free(worker->impl_);
+    worker->impl_ = NULL;
+  }
+#else
+  worker->status_ = NOT_OK;
+  assert(worker->impl_ == NULL);
+#endif
+  assert(worker->status_ == NOT_OK);
+}
+
+//------------------------------------------------------------------------------
+
+static AVxWorkerInterface g_worker_interface = { init,   reset,   sync,
+                                                 launch, execute, end };
+
+int aom_set_worker_interface(const AVxWorkerInterface *const winterface) {
+  if (winterface == NULL || winterface->init == NULL ||
+      winterface->reset == NULL || winterface->sync == NULL ||
+      winterface->launch == NULL || winterface->execute == NULL ||
+      winterface->end == NULL) {
+    return 0;
+  }
+  g_worker_interface = *winterface;
+  return 1;
+}
+
+const AVxWorkerInterface *aom_get_worker_interface(void) {
+  return &g_worker_interface;
+}
+
+//------------------------------------------------------------------------------
diff --git a/pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h b/pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h
new file mode 100644
index 0000000000..a3681e4a45
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h
@@ -0,0 +1,364 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+//
+// Multi-threaded worker
+//
+// Original source:
+//  https://chromium.googlesource.com/webm/libwebp
+
+#ifndef AOM_AOM_UTIL_AOM_THREAD_H_
+#define AOM_AOM_UTIL_AOM_THREAD_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAX_NUM_THREADS 64
+
+#if CONFIG_MULTITHREAD
+
+#if defined(_WIN32) && !HAVE_PTHREAD_H
+#include <errno.h>    // NOLINT
+#include <process.h>  // NOLINT
+#include <windows.h>  // NOLINT
+typedef HANDLE pthread_t;
+typedef CRITICAL_SECTION pthread_mutex_t;
+
+#if _WIN32_WINNT < 0x0600
+#error _WIN32_WINNT must target Windows Vista / Server 2008 or newer.
+#endif
+typedef CONDITION_VARIABLE pthread_cond_t;
+
+#ifndef WINAPI_FAMILY_PARTITION
+#define WINAPI_PARTITION_DESKTOP 1
+#define WINAPI_FAMILY_PARTITION(x) x
+#endif
+
+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#define USE_CREATE_THREAD
+#endif
+
+//------------------------------------------------------------------------------
+// simplistic pthread emulation layer
+
+// _beginthreadex requires __stdcall
+#define THREADFN unsigned int __stdcall
+#define THREAD_RETURN(val) (unsigned int)((DWORD_PTR)val)
+
+static INLINE int pthread_create(pthread_t *const thread, const void *attr,
+                                 unsigned int(__stdcall *start)(void *),
+                                 void *arg) {
+  (void)attr;
+#ifdef USE_CREATE_THREAD
+  *thread = CreateThread(NULL,          /* lpThreadAttributes */
+                         0,             /* dwStackSize */
+                         start, arg, 0, /* dwStackSize */
+                         NULL);         /* lpThreadId */
+#else
+  *thread = (pthread_t)_beginthreadex(NULL,          /* void *security */
+                                      0,             /* unsigned stack_size */
+                                      start, arg, 0, /* unsigned initflag */
+                                      NULL);         /* unsigned *thrdaddr */
+#endif
+  if (*thread == NULL) return 1;
+  SetThreadPriority(*thread, THREAD_PRIORITY_ABOVE_NORMAL);
+  return 0;
+}
+
+static INLINE int pthread_join(pthread_t thread, void **value_ptr) {
+  (void)value_ptr;
+  return (WaitForSingleObjectEx(thread, INFINITE, FALSE /*bAlertable*/) !=
+              WAIT_OBJECT_0 ||
+          CloseHandle(thread) == 0);
+}
+
+// Mutex
+static INLINE int pthread_mutex_init(pthread_mutex_t *const mutex,
+                                     void *mutexattr) {
+  (void)mutexattr;
+  InitializeCriticalSectionEx(mutex, 0 /*dwSpinCount*/, 0 /*Flags*/);
+  return 0;
+}
+
+static INLINE int pthread_mutex_trylock(pthread_mutex_t *const mutex) {
+  return TryEnterCriticalSection(mutex) ? 0 : EBUSY;
+}
+
+static INLINE int pthread_mutex_lock(pthread_mutex_t *const mutex) {
+  EnterCriticalSection(mutex);
+  return 0;
+}
+
+static INLINE int pthread_mutex_unlock(pthread_mutex_t *const mutex) {
+  LeaveCriticalSection(mutex);
+  return 0;
+}
+
+static INLINE int pthread_mutex_destroy(pthread_mutex_t *const mutex) {
+  DeleteCriticalSection(mutex);
+  return 0;
+}
+
+// Condition
+static INLINE int pthread_cond_destroy(pthread_cond_t *const condition) {
+  (void)condition;
+  return 0;
+}
+
+static INLINE int pthread_cond_init(pthread_cond_t *const condition,
+                                    void *cond_attr) {
+  (void)cond_attr;
+  InitializeConditionVariable(condition);
+  return 0;
+}
+
+static INLINE int pthread_cond_signal(pthread_cond_t *const condition) {
+  WakeConditionVariable(condition);
+  return 0;
+}
+
+static INLINE int pthread_cond_broadcast(pthread_cond_t *const condition) {
+  WakeAllConditionVariable(condition);
+  return 0;
+}
+
+static INLINE int pthread_cond_wait(pthread_cond_t *const condition,
+                                    pthread_mutex_t *const mutex) {
+  int ok;
+  ok = SleepConditionVariableCS(condition, mutex, INFINITE);
+  return !ok;
+}
+#elif defined(__OS2__)
+#define INCL_DOS
+#include <os2.h>  // NOLINT
+
+#include <errno.h>        // NOLINT
+#include <stdlib.h>       // NOLINT
+#include <sys/builtin.h>  // NOLINT
+
+#define pthread_t TID
+#define pthread_mutex_t HMTX
+
+typedef struct {
+  HEV event_sem_;
+  HEV ack_sem_;
+  volatile unsigned wait_count_;
+} pthread_cond_t;
+
+//------------------------------------------------------------------------------
+// simplistic pthread emulation layer
+
+#define THREADFN void *
+#define THREAD_RETURN(val) (val)
+
+typedef struct {
+  void *(*start_)(void *);
+  void *arg_;
+} thread_arg;
+
+static void thread_start(void *arg) {
+  thread_arg targ = *(thread_arg *)arg;
+  free(arg);
+
+  targ.start_(targ.arg_);
+}
+
+static INLINE int pthread_create(pthread_t *const thread, const void *attr,
+                                 void *(*start)(void *), void *arg) {
+  int tid;
+  thread_arg *targ = (thread_arg *)malloc(sizeof(*targ));
+  if (targ == NULL) return 1;
+
+  (void)attr;
+
+  targ->start_ = start;
+  targ->arg_ = arg;
+  tid = (pthread_t)_beginthread(thread_start, NULL, 1024 * 1024, targ);
+  if (tid == -1) {
+    free(targ);
+    return 1;
+  }
+
+  *thread = tid;
+  return 0;
+}
+
+static INLINE int pthread_join(pthread_t thread, void **value_ptr) {
+  (void)value_ptr;
+  return DosWaitThread(&thread, DCWW_WAIT) != 0;
+}
+
+// Mutex
+static INLINE int pthread_mutex_init(pthread_mutex_t *const mutex,
+                                     void *mutexattr) {
+  (void)mutexattr;
+  return DosCreateMutexSem(NULL, mutex, 0, FALSE) != 0;
+}
+
+static INLINE int pthread_mutex_trylock(pthread_mutex_t *const mutex) {
+  return DosRequestMutexSem(*mutex, SEM_IMMEDIATE_RETURN) == 0 ? 0 : EBUSY;
+}
+
+static INLINE int pthread_mutex_lock(pthread_mutex_t *const mutex) {
+  return DosRequestMutexSem(*mutex, SEM_INDEFINITE_WAIT) != 0;
+}
+
+static INLINE int pthread_mutex_unlock(pthread_mutex_t *const mutex) {
+  return DosReleaseMutexSem(*mutex) != 0;
+}
+
+static INLINE int pthread_mutex_destroy(pthread_mutex_t *const mutex) {
+  return DosCloseMutexSem(*mutex) != 0;
+}
+
+// Condition
+static INLINE int pthread_cond_destroy(pthread_cond_t *const condition) {
+  int ok = 1;
+  ok &= DosCloseEventSem(condition->event_sem_) == 0;
+  ok &= DosCloseEventSem(condition->ack_sem_) == 0;
+  return !ok;
+}
+
+static INLINE int pthread_cond_init(pthread_cond_t *const condition,
+                                    void *cond_attr) {
+  int ok = 1;
+  (void)cond_attr;
+
+  ok &=
+      DosCreateEventSem(NULL, &condition->event_sem_, DCE_POSTONE, FALSE) == 0;
+  ok &= DosCreateEventSem(NULL, &condition->ack_sem_, DCE_POSTONE, FALSE) == 0;
+  if (!ok) {
+    pthread_cond_destroy(condition);
+    return 1;
+  }
+  condition->wait_count_ = 0;
+  return 0;
+}
+
+static INLINE int pthread_cond_signal(pthread_cond_t *const condition) {
+  int ok = 1;
+
+  if (!__atomic_cmpxchg32(&condition->wait_count_, 0, 0)) {
+    ok &= DosPostEventSem(condition->event_sem_) == 0;
+    ok &= DosWaitEventSem(condition->ack_sem_, SEM_INDEFINITE_WAIT) == 0;
+  }
+
+  return !ok;
+}
+
+static INLINE int pthread_cond_broadcast(pthread_cond_t *const condition) {
+  int ok = 1;
+
+  while (!__atomic_cmpxchg32(&condition->wait_count_, 0, 0))
+    ok &= pthread_cond_signal(condition) == 0;
+
+  return !ok;
+}
+
+static INLINE int pthread_cond_wait(pthread_cond_t *const condition,
+                                    pthread_mutex_t *const mutex) {
+  int ok = 1;
+
+  __atomic_increment(&condition->wait_count_);
+
+  ok &= pthread_mutex_unlock(mutex) == 0;
+
+  ok &= DosWaitEventSem(condition->event_sem_, SEM_INDEFINITE_WAIT) == 0;
+
+  __atomic_decrement(&condition->wait_count_);
+
+  ok &= DosPostEventSem(condition->ack_sem_) == 0;
+
+  pthread_mutex_lock(mutex);
+
+  return !ok;
+}
+#else                 // _WIN32
+#include <pthread.h>  // NOLINT
+#define THREADFN void *
+#define THREAD_RETURN(val) val
+#endif
+
+#endif  // CONFIG_MULTITHREAD
+
+// State of the worker thread object
+typedef enum {
+  NOT_OK = 0,  // object is unusable
+  OK,          // ready to work
+  WORK         // busy finishing the current task
+} AVxWorkerStatus;
+
+// Function to be called by the worker thread. Takes two opaque pointers as
+// arguments (data1 and data2). Should return true on success and return false
+// in case of error.
+typedef int (*AVxWorkerHook)(void *, void *);
+
+// Platform-dependent implementation details for the worker.
+typedef struct AVxWorkerImpl AVxWorkerImpl;
+
+// Synchronization object used to launch job in the worker thread
+typedef struct {
+  AVxWorkerImpl *impl_;
+  AVxWorkerStatus status_;
+  // Thread name for the debugger. If not NULL, must point to a string that
+  // outlives the worker thread. For portability, use a name <= 15 characters
+  // long (not including the terminating NUL character).
+  const char *thread_name;
+  AVxWorkerHook hook;  // hook to call
+  void *data1;         // first argument passed to 'hook'
+  void *data2;         // second argument passed to 'hook'
+  int had_error;       // true if a call to 'hook' returned false
+} AVxWorker;
+
+// The interface for all thread-worker related functions. All these functions
+// must be implemented.
+typedef struct {
+  // Must be called first, before any other method.
+  void (*init)(AVxWorker *const worker);
+  // Must be called to initialize the object and spawn the thread. Re-entrant.
+  // Will potentially launch the thread. Returns false in case of error.
+  int (*reset)(AVxWorker *const worker);
+  // Makes sure the previous work is finished. Returns true if worker->had_error
+  // was not set and no error condition was triggered by the working thread.
+  int (*sync)(AVxWorker *const worker);
+  // Triggers the thread to call hook() with data1 and data2 arguments. These
+  // hook/data1/data2 values can be changed at any time before calling this
+  // function, but not be changed afterward until the next call to Sync().
+  void (*launch)(AVxWorker *const worker);
+  // This function is similar to launch() except that it calls the
+  // hook directly instead of using a thread. Convenient to bypass the thread
+  // mechanism while still using the AVxWorker structs. sync() must
+  // still be called afterward (for error reporting).
+  void (*execute)(AVxWorker *const worker);
+  // Kill the thread and terminate the object. To use the object again, one
+  // must call reset() again.
+  void (*end)(AVxWorker *const worker);
+} AVxWorkerInterface;
+
+// Install a new set of threading functions, overriding the defaults. This
+// should be done before any workers are started, i.e., before any encoding or
+// decoding takes place. The contents of the interface struct are copied, it
+// is safe to free the corresponding memory after this call. This function is
+// not thread-safe. Return false in case of invalid pointer or methods.
+int aom_set_worker_interface(const AVxWorkerInterface *const winterface);
+
+// Retrieve the currently set thread worker interface.
+const AVxWorkerInterface *aom_get_worker_interface(void);
+
+//------------------------------------------------------------------------------
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_UTIL_AOM_THREAD_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/aomdx.h b/pxr/imaging/plugin/hioAvif/aom/aomdx.h
new file mode 100644
index 0000000000..5c86558748
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/aomdx.h
@@ -0,0 +1,550 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\defgroup aom_decoder AOMedia AOM/AV1 Decoder
+ * \ingroup aom
+ *
+ * @{
+ */
+/*!\file
+ * \brief Provides definitions for using AOM or AV1 within the aom Decoder
+ *        interface.
+ */
+#ifndef AOM_AOM_AOMDX_H_
+#define AOM_AOM_AOMDX_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Include controls common to both the encoder and decoder */
+#include "pxr/imaging/plugin/hioAvif/aom/aom.h"
+
+/*!\name Algorithm interface for AV1
+ *
+ * This interface provides the capability to decode AV1 streams.
+ * @{
+ */
+
+/*!\brief A single instance of the AV1 decoder.
+ *\deprecated This access mechanism is provided for backwards compatibility;
+ * prefer aom_codec_av1_dx().
+ */
+extern aom_codec_iface_t aom_codec_av1_dx_algo;
+/*!\brief The interface to the AV1 decoder.
+ */
+extern aom_codec_iface_t *aom_codec_av1_dx(void);
+
+/*!@} - end algorithm interface member group */
+
+/** Data structure that stores bit accounting for debug
+ */
+typedef struct Accounting Accounting;
+
+#ifndef AOM_INSPECTION_H_
+/** Callback that inspects decoder frame data.
+ */
+typedef void (*aom_inspect_cb)(void *decoder, void *ctx);
+
+#endif
+
+/*!\brief Structure to hold inspection callback and context.
+ *
+ * Defines a structure to hold the inspection callback function and calling
+ * context.
+ */
+typedef struct aom_inspect_init {
+  /*! Inspection callback. */
+  aom_inspect_cb inspect_cb;
+
+  /*! Inspection context. */
+  void *inspect_ctx;
+} aom_inspect_init;
+
+/*!\brief Structure to collect a buffer index when inspecting.
+ *
+ * Defines a structure to hold the buffer and return an index
+ * when calling decode from inspect. This enables us to decode
+ * non showable sub frames.
+ */
+typedef struct {
+  /*! Pointer for new position in compressed buffer after decoding 1 OBU. */
+  const unsigned char *buf;
+  /*! Index into reference buffer array to see result of decoding 1 OBU. */
+  int idx;
+  /*! Is a show existing frame. */
+  int show_existing;
+} Av1DecodeReturn;
+
+/*!\brief Structure to hold a tile's start address and size in the bitstream.
+ *
+ * Defines a structure to hold a tile's start address and size in the bitstream.
+ */
+typedef struct aom_tile_data {
+  /*! Tile data size. */
+  size_t coded_tile_data_size;
+  /*! Tile's start address. */
+  const void *coded_tile_data;
+  /*! Extra size information. */
+  size_t extra_size;
+} aom_tile_data;
+
+/*!\brief Max number of tile columns
+ *
+ * This is the limit of number of tile columns allowed within a frame.
+ *
+ * Currently same as "MAX_TILE_COLS" in AV1, the maximum that AV1 supports.
+ *
+ */
+#define AOM_MAX_TILE_COLS 64
+/*!\brief Max number of tile rows
+ *
+ * This is the limit of number of tile rows allowed within a frame.
+ *
+ * Currently same as "MAX_TILE_ROWS" in AV1, the maximum that AV1 supports.
+ *
+ */
+#define AOM_MAX_TILE_ROWS 64
+
+/*!\brief Structure to hold information about tiles in a frame.
+ *
+ * Defines a structure to hold a frame's tile information, namely
+ * number of tile columns, number of tile_rows, and the width and
+ * height of each tile.
+ */
+typedef struct aom_tile_info {
+  /*! Indicates the number of tile columns. */
+  int tile_columns;
+  /*! Indicates the number of tile rows. */
+  int tile_rows;
+  /*! Indicates the tile widths in units of SB. */
+  int tile_widths[AOM_MAX_TILE_COLS];
+  /*! Indicates the tile heights in units of SB. */
+  int tile_heights[AOM_MAX_TILE_ROWS];
+  /*! Indicates the number of tile groups present in a frame. */
+  int num_tile_groups;
+} aom_tile_info;
+
+/*!\brief Structure to hold information about still image coding.
+ *
+ * Defines a structure to hold a information regarding still picture
+ * and its header type.
+ */
+typedef struct aom_still_picture_info {
+  /*! Video is a single frame still picture */
+  int is_still_picture;
+  /*! Use full header for still picture */
+  int is_reduced_still_picture_hdr;
+} aom_still_picture_info;
+
+/*!\brief Structure to hold information about S_FRAME.
+ *
+ * Defines a structure to hold a information regarding S_FRAME
+ * and its position.
+ */
+typedef struct aom_s_frame_info {
+  /*! Indicates if current frame is S_FRAME */
+  int is_s_frame;
+  /*! Indicates if current S_FRAME is present at ALTREF frame*/
+  int is_s_frame_at_altref;
+} aom_s_frame_info;
+
+/*!\brief Structure to hold information about screen content tools.
+ *
+ * Defines a structure to hold information about screen content
+ * tools, namely: allow_screen_content_tools, allow_intrabc, and
+ * force_integer_mv.
+ */
+typedef struct aom_screen_content_tools_info {
+  /*! Are screen content tools allowed */
+  int allow_screen_content_tools;
+  /*! Is intrabc allowed */
+  int allow_intrabc;
+  /*! Is integer mv forced */
+  int force_integer_mv;
+} aom_screen_content_tools_info;
+
+/*!\brief Structure to hold the external reference frame pointer.
+ *
+ * Define a structure to hold the external reference frame pointer.
+ */
+typedef struct av1_ext_ref_frame {
+  /*! Start pointer of external references. */
+  aom_image_t *img;
+  /*! Number of available external references. */
+  int num;
+} av1_ext_ref_frame_t;
+
+/*!\enum aom_dec_control_id
+ * \brief AOM decoder control functions
+ *
+ * This set of macros define the control functions available for the AOM
+ * decoder interface.
+ * The range for decoder control ID is >= 256.
+ *
+ * \sa #aom_codec_control(aom_codec_ctx_t *ctx, int ctrl_id, ...)
+ */
+enum aom_dec_control_id {
+  /*!\brief Codec control function to get info on which reference frames were
+   * updated by the last decode, int* parameter
+   */
+  AOMD_GET_LAST_REF_UPDATES = AOM_DECODER_CTRL_ID_START,
+
+  /*!\brief Codec control function to check if the indicated frame is
+    corrupted, int* parameter
+  */
+  AOMD_GET_FRAME_CORRUPTED,
+
+  /*!\brief Codec control function to get info on which reference frames were
+   * used by the last decode, int* parameter
+   */
+  AOMD_GET_LAST_REF_USED,
+
+  /*!\brief Codec control function to get the dimensions that the current
+   * frame is decoded at, int* parameter. This may be different to the
+   * intended display size for the frame as specified in the wrapper or frame
+   * header (see AV1D_GET_DISPLAY_SIZE).
+   */
+  AV1D_GET_FRAME_SIZE,
+
+  /*!\brief Codec control function to get the current frame's intended display
+   * dimensions (as specified in the wrapper or frame header), int* parameter.
+   * This may be different to the decoded dimensions of this frame (see
+   * AV1D_GET_FRAME_SIZE).
+   */
+  AV1D_GET_DISPLAY_SIZE,
+
+  /*!\brief Codec control function to get the bit depth of the stream,
+   * unsigned int* parameter
+   */
+  AV1D_GET_BIT_DEPTH,
+
+  /*!\brief Codec control function to get the image format of the stream,
+   * aom_img_fmt_t* parameter
+   */
+  AV1D_GET_IMG_FORMAT,
+
+  /*!\brief Codec control function to get the size of the tile, unsigned int
+    parameter */
+  AV1D_GET_TILE_SIZE,
+
+  /*!\brief Codec control function to get the tile count in a tile list, int*
+   * parameter
+   */
+  AV1D_GET_TILE_COUNT,
+
+  /*!\brief Codec control function to set the byte alignment of the planes in
+   * the reference buffers, int parameter
+   *
+   * Valid values are power of 2, from 32 to 1024. A value of 0 sets
+   * legacy alignment. I.e. Y plane is aligned to 32 bytes, U plane directly
+   * follows Y plane, and V plane directly follows U plane. Default value is 0.
+   */
+  AV1_SET_BYTE_ALIGNMENT,
+
+  /*!\brief Codec control function to invert the decoding order to from right to
+   * left, int parameter
+   *
+   * The function is used in a test to confirm the decoding independence of tile
+   * columns. The function may be used in application where this order
+   * of decoding is desired. int parameter
+   *
+   * TODO(yaowu): Rework the unit test that uses this control, and in a future
+   *              release, this test-only control shall be removed.
+   */
+  AV1_INVERT_TILE_DECODE_ORDER,
+
+  /*!\brief Codec control function to set the skip loop filter flag, int
+   * parameter
+   *
+   * Valid values are integers. The decoder will skip the loop filter
+   * when its value is set to nonzero. If the loop filter is skipped the
+   * decoder may accumulate decode artifacts. The default value is 0.
+   */
+  AV1_SET_SKIP_LOOP_FILTER,
+
+  /*!\brief Codec control function to retrieve a pointer to the Accounting
+   * struct, takes Accounting** as parameter
+   *
+   * If called before a frame has been decoded, this returns AOM_CODEC_ERROR.
+   * The caller should ensure that AOM_CODEC_OK is returned before attempting
+   * to dereference the Accounting pointer.
+   *
+   * \attention When compiled without --enable-accounting, this returns
+   * AOM_CODEC_INCAPABLE.
+   */
+  AV1_GET_ACCOUNTING,
+
+  /*!\brief Codec control function to get last decoded frame quantizer,
+   * int* parameter
+   *
+   * Returned value uses internal quantizer scale defined by the codec.
+   */
+  AOMD_GET_LAST_QUANTIZER,
+
+  /*!\brief Codec control function to set the range of tile decoding, int
+   * parameter
+   *
+   * A value that is greater and equal to zero indicates only the specific
+   * row/column is decoded. A value that is -1 indicates the whole row/column
+   * is decoded. A special case is both values are -1 that means the whole
+   * frame is decoded.
+   */
+  AV1_SET_DECODE_TILE_ROW,
+  AV1_SET_DECODE_TILE_COL,
+
+  /*!\brief Codec control function to set the tile coding mode, int parameter
+   *
+   * - 0 = tiles are coded in normal tile mode
+   * - 1 = tiles are coded in large-scale tile mode
+   */
+  AV1_SET_TILE_MODE,
+
+  /*!\brief Codec control function to get the frame header information of an
+   * encoded frame, unsigned int* parameter
+   */
+  AV1D_GET_FRAME_HEADER_INFO,
+
+  /*!\brief Codec control function to get the start address and size of a
+   * tile in the coded bitstream, aom_tile_data* parameter.
+   */
+  AV1D_GET_TILE_DATA,
+
+  /*!\brief Codec control function to set the external references' pointers in
+   * the decoder, av1_ext_ref_frame_t* parameter.
+   *
+   * This is used while decoding the tile list OBU in large-scale tile coding
+   * mode.
+   */
+  AV1D_SET_EXT_REF_PTR,
+
+  /*!\brief Codec control function to enable the ext-tile software debug and
+   * testing code in the decoder, unsigned int parameter
+   */
+  AV1D_EXT_TILE_DEBUG,
+
+  /*!\brief Codec control function to enable the row based multi-threading of
+   * decoding, unsigned int parameter
+   *
+   * - 0 = disabled
+   * - 1 = enabled (default)
+   */
+  AV1D_SET_ROW_MT,
+
+  /*!\brief Codec control function to indicate whether bitstream is in
+   * Annex-B format, unsigned int parameter
+   */
+  AV1D_SET_IS_ANNEXB,
+
+  /*!\brief Codec control function to indicate which operating point to use,
+   * int parameter
+   *
+   * A scalable stream may define multiple operating points, each of which
+   * defines a set of temporal and spatial layers to be processed. The
+   * operating point index may take a value between 0 and
+   * operating_points_cnt_minus_1 (which is at most 31).
+   */
+  AV1D_SET_OPERATING_POINT,
+
+  /*!\brief Codec control function to indicate whether to output one frame per
+   * temporal unit (the default), or one frame per spatial layer. int parameter
+   *
+   * In a scalable stream, each temporal unit corresponds to a single "frame"
+   * of video, and within a temporal unit there may be multiple spatial layers
+   * with different versions of that frame.
+   * For video playback, only the highest-quality version (within the
+   * selected operating point) is needed, but for some use cases it is useful
+   * to have access to multiple versions of a frame when they are available.
+   */
+  AV1D_SET_OUTPUT_ALL_LAYERS,
+
+  /*!\brief Codec control function to set an aom_inspect_cb callback that is
+   * invoked each time a frame is decoded, aom_inspect_init* parameter
+   *
+   * \attention When compiled without --enable-inspection, this
+   * returns AOM_CODEC_INCAPABLE.
+   */
+  AV1_SET_INSPECTION_CALLBACK,
+
+  /*!\brief Codec control function to set the skip film grain flag, int
+   * parameter
+   *
+   * Valid values are integers. The decoder will skip the film grain when its
+   * value is set to nonzero. The default value is 0.
+   */
+  AV1D_SET_SKIP_FILM_GRAIN,
+
+  /*!\brief Codec control function to check the presence of forward key frames
+   */
+  AOMD_GET_FWD_KF_PRESENT,
+
+  /*!\brief Codec control function to get the frame flags of the previous frame
+   * decoded. This will return a flag of type aom_codec_frame_flags_t.
+   */
+  AOMD_GET_FRAME_FLAGS,
+
+  /*!\brief Codec control function to check the presence of altref frames */
+  AOMD_GET_ALTREF_PRESENT,
+
+  /*!\brief Codec control function to get tile information of the previous frame
+   * decoded. This will return a struct of type aom_tile_info.
+   */
+  AOMD_GET_TILE_INFO,
+
+  /*!\brief Codec control function to get screen content tools information.
+   * It returns a struct of type aom_screen_content_tools_info, which contains
+   * the header flags allow_screen_content_tools, allow_intrabc, and
+   * force_integer_mv.
+   */
+  AOMD_GET_SCREEN_CONTENT_TOOLS_INFO,
+
+  /*!\brief Codec control function to get the still picture coding information
+   */
+  AOMD_GET_STILL_PICTURE,
+
+  /*!\brief Codec control function to get superblock size.
+   * It returns an integer, indicating the superblock size
+   * read from the sequence header(0 for BLOCK_64X64 and
+   * 1 for BLOCK_128X128)
+   */
+  AOMD_GET_SB_SIZE,
+
+  /*!\brief Codec control function to check if the previous frame
+   * decoded has show existing frame flag set.
+   */
+  AOMD_GET_SHOW_EXISTING_FRAME_FLAG,
+
+  /*!\brief Codec control function to get the S_FRAME coding information
+   */
+  AOMD_GET_S_FRAME_INFO,
+};
+
+/*!\cond */
+/*!\brief AOM decoder control function parameter type
+ *
+ * Defines the data types that AOMD control functions take.
+ *
+ * \note Additional common controls are defined in aom.h.
+ *
+ * \note For each control ID "X", a macro-define of
+ * AOM_CTRL_X is provided. It is used at compile time to determine
+ * if the control ID is supported by the libaom library available,
+ * when the libaom version cannot be controlled.
+ */
+AOM_CTRL_USE_TYPE(AOMD_GET_LAST_REF_UPDATES, int *)
+#define AOM_CTRL_AOMD_GET_LAST_REF_UPDATES
+
+AOM_CTRL_USE_TYPE(AOMD_GET_FRAME_CORRUPTED, int *)
+#define AOM_CTRL_AOMD_GET_FRAME_CORRUPTED
+
+AOM_CTRL_USE_TYPE(AOMD_GET_LAST_REF_USED, int *)
+#define AOM_CTRL_AOMD_GET_LAST_REF_USED
+
+AOM_CTRL_USE_TYPE(AOMD_GET_LAST_QUANTIZER, int *)
+#define AOM_CTRL_AOMD_GET_LAST_QUANTIZER
+
+AOM_CTRL_USE_TYPE(AOMD_GET_FWD_KF_PRESENT, int *)
+#define AOM_CTRL_AOMD_GET_FWD_KF_PRESENT
+
+AOM_CTRL_USE_TYPE(AOMD_GET_ALTREF_PRESENT, int *)
+#define AOM_CTRL_AOMD_GET_ALTREF_PRESENT
+
+AOM_CTRL_USE_TYPE(AOMD_GET_FRAME_FLAGS, int *)
+#define AOM_CTRL_AOMD_GET_FRAME_FLAGS
+
+AOM_CTRL_USE_TYPE(AOMD_GET_TILE_INFO, aom_tile_info *)
+#define AOM_CTRL_AOMD_GET_TILE_INFO
+
+AOM_CTRL_USE_TYPE(AOMD_GET_SCREEN_CONTENT_TOOLS_INFO,
+                  aom_screen_content_tools_info *)
+#define AOM_CTRL_AOMD_GET_SCREEN_CONTENT_TOOLS_INFO
+
+AOM_CTRL_USE_TYPE(AOMD_GET_STILL_PICTURE, aom_still_picture_info *)
+#define AOM_CTRL_AOMD_GET_STILL_PICTURE
+
+AOM_CTRL_USE_TYPE(AOMD_GET_SB_SIZE, aom_superblock_size_t *)
+#define AOMD_CTRL_AOMD_GET_SB_SIZE
+
+AOM_CTRL_USE_TYPE(AOMD_GET_SHOW_EXISTING_FRAME_FLAG, int *)
+#define AOMD_CTRL_AOMD_GET_SHOW_EXISTING_FRAME_FLAG
+
+AOM_CTRL_USE_TYPE(AOMD_GET_S_FRAME_INFO, aom_s_frame_info *)
+#define AOMD_CTRL_AOMD_GET_S_FRAME_INFO
+
+AOM_CTRL_USE_TYPE(AV1D_GET_DISPLAY_SIZE, int *)
+#define AOM_CTRL_AV1D_GET_DISPLAY_SIZE
+
+AOM_CTRL_USE_TYPE(AV1D_GET_BIT_DEPTH, unsigned int *)
+#define AOM_CTRL_AV1D_GET_BIT_DEPTH
+
+AOM_CTRL_USE_TYPE(AV1D_GET_IMG_FORMAT, aom_img_fmt_t *)
+#define AOM_CTRL_AV1D_GET_IMG_FORMAT
+
+AOM_CTRL_USE_TYPE(AV1D_GET_TILE_SIZE, unsigned int *)
+#define AOM_CTRL_AV1D_GET_TILE_SIZE
+
+AOM_CTRL_USE_TYPE(AV1D_GET_TILE_COUNT, unsigned int *)
+#define AOM_CTRL_AV1D_GET_TILE_COUNT
+
+AOM_CTRL_USE_TYPE(AV1D_GET_FRAME_SIZE, int *)
+#define AOM_CTRL_AV1D_GET_FRAME_SIZE
+
+AOM_CTRL_USE_TYPE(AV1_INVERT_TILE_DECODE_ORDER, int)
+#define AOM_CTRL_AV1_INVERT_TILE_DECODE_ORDER
+
+AOM_CTRL_USE_TYPE(AV1_GET_ACCOUNTING, Accounting **)
+#define AOM_CTRL_AV1_GET_ACCOUNTING
+
+AOM_CTRL_USE_TYPE(AV1_SET_DECODE_TILE_ROW, int)
+#define AOM_CTRL_AV1_SET_DECODE_TILE_ROW
+
+AOM_CTRL_USE_TYPE(AV1_SET_DECODE_TILE_COL, int)
+#define AOM_CTRL_AV1_SET_DECODE_TILE_COL
+
+AOM_CTRL_USE_TYPE(AV1_SET_TILE_MODE, unsigned int)
+#define AOM_CTRL_AV1_SET_TILE_MODE
+
+AOM_CTRL_USE_TYPE(AV1D_GET_FRAME_HEADER_INFO, aom_tile_data *)
+#define AOM_CTRL_AV1D_GET_FRAME_HEADER_INFO
+
+AOM_CTRL_USE_TYPE(AV1D_GET_TILE_DATA, aom_tile_data *)
+#define AOM_CTRL_AV1D_GET_TILE_DATA
+
+AOM_CTRL_USE_TYPE(AV1D_SET_EXT_REF_PTR, av1_ext_ref_frame_t *)
+#define AOM_CTRL_AV1D_SET_EXT_REF_PTR
+
+AOM_CTRL_USE_TYPE(AV1D_EXT_TILE_DEBUG, unsigned int)
+#define AOM_CTRL_AV1D_EXT_TILE_DEBUG
+
+AOM_CTRL_USE_TYPE(AV1D_SET_ROW_MT, unsigned int)
+#define AOM_CTRL_AV1D_SET_ROW_MT
+
+AOM_CTRL_USE_TYPE(AV1D_SET_SKIP_FILM_GRAIN, int)
+#define AOM_CTRL_AV1D_SET_SKIP_FILM_GRAIN
+
+AOM_CTRL_USE_TYPE(AV1D_SET_IS_ANNEXB, unsigned int)
+#define AOM_CTRL_AV1D_SET_IS_ANNEXB
+
+AOM_CTRL_USE_TYPE(AV1D_SET_OPERATING_POINT, int)
+#define AOM_CTRL_AV1D_SET_OPERATING_POINT
+
+AOM_CTRL_USE_TYPE(AV1D_SET_OUTPUT_ALL_LAYERS, int)
+#define AOM_CTRL_AV1D_SET_OUTPUT_ALL_LAYERS
+
+AOM_CTRL_USE_TYPE(AV1_SET_INSPECTION_CALLBACK, aom_inspect_init *)
+#define AOM_CTRL_AV1_SET_INSPECTION_CALLBACK
+/*!\endcond */
+/*! @} - end defgroup aom_decoder */
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_AOMDX_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/av1_dx_iface.c b/pxr/imaging/plugin/hioAvif/aom/av1/av1_dx_iface.c
new file mode 100644
index 0000000000..f8be866255
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/av1_dx_iface.c
@@ -0,0 +1,1605 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_version.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h"
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_image_internal.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aomdx.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_decoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/av1_iface_common.h"
+
+struct aom_codec_alg_priv {
+  aom_codec_priv_t base;
+  aom_codec_dec_cfg_t cfg;
+  aom_codec_stream_info_t si;
+  aom_image_t img;
+  int img_avail;
+  int flushed;
+  int invert_tile_order;
+  RefCntBuffer *last_show_frame;  // Last output frame buffer
+  int byte_alignment;
+  int skip_loop_filter;
+  int skip_film_grain;
+  int decode_tile_row;
+  int decode_tile_col;
+  unsigned int tile_mode;
+  unsigned int ext_tile_debug;
+  unsigned int row_mt;
+  EXTERNAL_REFERENCES ext_refs;
+  unsigned int is_annexb;
+  int operating_point;
+  int output_all_layers;
+
+  AVxWorker *frame_worker;
+
+  aom_image_t image_with_grain;
+  aom_codec_frame_buffer_t grain_image_frame_buffers[MAX_NUM_SPATIAL_LAYERS];
+  size_t num_grain_image_frame_buffers;
+  int need_resync;  // wait for key/intra-only frame
+  // BufferPool that holds all reference frames. Shared by all the FrameWorkers.
+  BufferPool *buffer_pool;
+
+  // External frame buffer info to save for AV1 common.
+  void *ext_priv;  // Private data associated with the external frame buffers.
+  aom_get_frame_buffer_cb_fn_t get_ext_fb_cb;
+  aom_release_frame_buffer_cb_fn_t release_ext_fb_cb;
+
+#if CONFIG_INSPECTION
+  aom_inspect_cb inspect_cb;
+  void *inspect_ctx;
+#endif
+};
+
+static aom_codec_err_t decoder_init(aom_codec_ctx_t *ctx) {
+  // This function only allocates space for the aom_codec_alg_priv_t
+  // structure. More memory may be required at the time the stream
+  // information becomes known.
+  if (!ctx->priv) {
+    aom_codec_alg_priv_t *const priv =
+        (aom_codec_alg_priv_t *)aom_calloc(1, sizeof(*priv));
+    if (priv == NULL) return AOM_CODEC_MEM_ERROR;
+
+    ctx->priv = (aom_codec_priv_t *)priv;
+    ctx->priv->init_flags = ctx->init_flags;
+    priv->flushed = 0;
+
+    // TODO(tdaede): this should not be exposed to the API
+    priv->cfg.allow_lowbitdepth = !FORCE_HIGHBITDEPTH_DECODING;
+    if (ctx->config.dec) {
+      priv->cfg = *ctx->config.dec;
+      ctx->config.dec = &priv->cfg;
+    }
+    priv->num_grain_image_frame_buffers = 0;
+    // Turn row_mt on by default.
+    priv->row_mt = 1;
+
+    // Turn on normal tile coding mode by default.
+    // 0 is for normal tile coding mode, and 1 is for large scale tile coding
+    // mode(refer to lightfield example).
+    priv->tile_mode = 0;
+    priv->decode_tile_row = -1;
+    priv->decode_tile_col = -1;
+  }
+
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t decoder_destroy(aom_codec_alg_priv_t *ctx) {
+  if (ctx->frame_worker != NULL) {
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    aom_get_worker_interface()->end(worker);
+    aom_free(frame_worker_data->pbi->common.tpl_mvs);
+    frame_worker_data->pbi->common.tpl_mvs = NULL;
+    av1_remove_common(&frame_worker_data->pbi->common);
+#if !CONFIG_REALTIME_ONLY
+    av1_free_restoration_buffers(&frame_worker_data->pbi->common);
+#endif
+    av1_decoder_remove(frame_worker_data->pbi);
+    aom_free(frame_worker_data);
+#if CONFIG_MULTITHREAD
+    pthread_mutex_destroy(&ctx->buffer_pool->pool_mutex);
+#endif
+  }
+
+  if (ctx->buffer_pool) {
+    for (size_t i = 0; i < ctx->num_grain_image_frame_buffers; i++) {
+      ctx->buffer_pool->release_fb_cb(ctx->buffer_pool->cb_priv,
+                                      &ctx->grain_image_frame_buffers[i]);
+    }
+    av1_free_ref_frame_buffers(ctx->buffer_pool);
+    av1_free_internal_frame_buffers(&ctx->buffer_pool->int_frame_buffers);
+  }
+
+  aom_free(ctx->frame_worker);
+  aom_free(ctx->buffer_pool);
+  aom_img_free(&ctx->img);
+  aom_free(ctx);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t parse_timing_info(struct aom_read_bit_buffer *rb) {
+  const uint32_t num_units_in_display_tick =
+      aom_rb_read_unsigned_literal(rb, 32);
+  const uint32_t time_scale = aom_rb_read_unsigned_literal(rb, 32);
+  if (num_units_in_display_tick == 0 || time_scale == 0)
+    return AOM_CODEC_UNSUP_BITSTREAM;
+  const uint8_t equal_picture_interval = aom_rb_read_bit(rb);
+  if (equal_picture_interval) {
+    const uint32_t num_ticks_per_picture_minus_1 = aom_rb_read_uvlc(rb);
+    if (num_ticks_per_picture_minus_1 == UINT32_MAX) {
+      // num_ticks_per_picture_minus_1 cannot be (1 << 32) - 1.
+      return AOM_CODEC_UNSUP_BITSTREAM;
+    }
+  }
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t parse_decoder_model_info(
+    struct aom_read_bit_buffer *rb, int *buffer_delay_length_minus_1) {
+  *buffer_delay_length_minus_1 = aom_rb_read_literal(rb, 5);
+  const uint32_t num_units_in_decoding_tick =
+      aom_rb_read_unsigned_literal(rb, 32);
+  const uint8_t buffer_removal_time_length_minus_1 = aom_rb_read_literal(rb, 5);
+  const uint8_t frame_presentation_time_length_minus_1 =
+      aom_rb_read_literal(rb, 5);
+  (void)num_units_in_decoding_tick;
+  (void)buffer_removal_time_length_minus_1;
+  (void)frame_presentation_time_length_minus_1;
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t parse_op_parameters_info(
+    struct aom_read_bit_buffer *rb, int buffer_delay_length_minus_1) {
+  const int n = buffer_delay_length_minus_1 + 1;
+  const uint32_t decoder_buffer_delay = aom_rb_read_unsigned_literal(rb, n);
+  const uint32_t encoder_buffer_delay = aom_rb_read_unsigned_literal(rb, n);
+  const uint8_t low_delay_mode_flag = aom_rb_read_bit(rb);
+  (void)decoder_buffer_delay;
+  (void)encoder_buffer_delay;
+  (void)low_delay_mode_flag;
+  return AOM_CODEC_OK;
+}
+
+// Parses the operating points (including operating_point_idc, seq_level_idx,
+// and seq_tier) and then sets si->number_spatial_layers and
+// si->number_temporal_layers based on operating_point_idc[0].
+static aom_codec_err_t parse_operating_points(struct aom_read_bit_buffer *rb,
+                                              int is_reduced_header,
+                                              aom_codec_stream_info_t *si) {
+  int operating_point_idc0 = 0;
+  if (is_reduced_header) {
+    aom_rb_read_literal(rb, LEVEL_BITS);  // level
+  } else {
+    uint8_t decoder_model_info_present_flag = 0;
+    int buffer_delay_length_minus_1 = 0;
+    aom_codec_err_t status;
+    const uint8_t timing_info_present_flag = aom_rb_read_bit(rb);
+    if (timing_info_present_flag) {
+      if ((status = parse_timing_info(rb)) != AOM_CODEC_OK) return status;
+      decoder_model_info_present_flag = aom_rb_read_bit(rb);
+      if (decoder_model_info_present_flag) {
+        if ((status = parse_decoder_model_info(
+                 rb, &buffer_delay_length_minus_1)) != AOM_CODEC_OK)
+          return status;
+      }
+    }
+    const uint8_t initial_display_delay_present_flag = aom_rb_read_bit(rb);
+    const uint8_t operating_points_cnt_minus_1 =
+        aom_rb_read_literal(rb, OP_POINTS_CNT_MINUS_1_BITS);
+    for (int i = 0; i < operating_points_cnt_minus_1 + 1; i++) {
+      int operating_point_idc;
+      operating_point_idc = aom_rb_read_literal(rb, OP_POINTS_IDC_BITS);
+      if (i == 0) operating_point_idc0 = operating_point_idc;
+      int seq_level_idx = aom_rb_read_literal(rb, LEVEL_BITS);  // level
+      if (seq_level_idx > 7) aom_rb_read_bit(rb);               // tier
+      if (decoder_model_info_present_flag) {
+        const uint8_t decoder_model_present_for_this_op = aom_rb_read_bit(rb);
+        if (decoder_model_present_for_this_op) {
+          if ((status = parse_op_parameters_info(
+                   rb, buffer_delay_length_minus_1)) != AOM_CODEC_OK)
+            return status;
+        }
+      }
+      if (initial_display_delay_present_flag) {
+        const uint8_t initial_display_delay_present_for_this_op =
+            aom_rb_read_bit(rb);
+        if (initial_display_delay_present_for_this_op)
+          aom_rb_read_literal(rb, 4);  // initial_display_delay_minus_1
+      }
+    }
+  }
+
+  if (aom_get_num_layers_from_operating_point_idc(
+          operating_point_idc0, &si->number_spatial_layers,
+          &si->number_temporal_layers) != AOM_CODEC_OK) {
+    return AOM_CODEC_ERROR;
+  }
+
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t decoder_peek_si_internal(const uint8_t *data,
+                                                size_t data_sz,
+                                                aom_codec_stream_info_t *si,
+                                                int *is_intra_only) {
+  int intra_only_flag = 0;
+  int got_sequence_header = 0;
+  int found_keyframe = 0;
+
+  if (data + data_sz <= data || data_sz < 1) return AOM_CODEC_INVALID_PARAM;
+
+  si->w = 0;
+  si->h = 0;
+  si->is_kf = 0;  // is_kf indicates whether the current packet contains a RAP
+
+  ObuHeader obu_header;
+  memset(&obu_header, 0, sizeof(obu_header));
+  size_t payload_size = 0;
+  size_t bytes_read = 0;
+  uint8_t reduced_still_picture_hdr = 0;
+  aom_codec_err_t status = aom_read_obu_header_and_size(
+      data, data_sz, si->is_annexb, &obu_header, &payload_size, &bytes_read);
+  if (status != AOM_CODEC_OK) return status;
+
+  // If the first OBU is a temporal delimiter, skip over it and look at the next
+  // OBU in the bitstream
+  if (obu_header.type == OBU_TEMPORAL_DELIMITER) {
+    // Skip any associated payload (there shouldn't be one, but just in case)
+    if (data_sz < bytes_read + payload_size) return AOM_CODEC_CORRUPT_FRAME;
+    data += bytes_read + payload_size;
+    data_sz -= bytes_read + payload_size;
+
+    status = aom_read_obu_header_and_size(
+        data, data_sz, si->is_annexb, &obu_header, &payload_size, &bytes_read);
+    if (status != AOM_CODEC_OK) return status;
+  }
+  while (1) {
+    data += bytes_read;
+    data_sz -= bytes_read;
+    if (data_sz < payload_size) return AOM_CODEC_CORRUPT_FRAME;
+    // Check that the selected OBU is a sequence header
+    if (obu_header.type == OBU_SEQUENCE_HEADER) {
+      // Sanity check on sequence header size
+      if (data_sz < 2) return AOM_CODEC_CORRUPT_FRAME;
+      // Read a few values from the sequence header payload
+      struct aom_read_bit_buffer rb = { data, data + data_sz, 0, NULL, NULL };
+
+      av1_read_profile(&rb);  // profile
+      const uint8_t still_picture = aom_rb_read_bit(&rb);
+      reduced_still_picture_hdr = aom_rb_read_bit(&rb);
+
+      if (!still_picture && reduced_still_picture_hdr) {
+        return AOM_CODEC_UNSUP_BITSTREAM;
+      }
+
+      if (parse_operating_points(&rb, reduced_still_picture_hdr, si) !=
+          AOM_CODEC_OK) {
+        return AOM_CODEC_ERROR;
+      }
+
+      int num_bits_width = aom_rb_read_literal(&rb, 4) + 1;
+      int num_bits_height = aom_rb_read_literal(&rb, 4) + 1;
+      int max_frame_width = aom_rb_read_literal(&rb, num_bits_width) + 1;
+      int max_frame_height = aom_rb_read_literal(&rb, num_bits_height) + 1;
+      si->w = max_frame_width;
+      si->h = max_frame_height;
+      got_sequence_header = 1;
+    } else if (obu_header.type == OBU_FRAME_HEADER ||
+               obu_header.type == OBU_FRAME) {
+      if (got_sequence_header && reduced_still_picture_hdr) {
+        found_keyframe = 1;
+        break;
+      } else {
+        // make sure we have enough bits to get the frame type out
+        if (data_sz < 1) return AOM_CODEC_CORRUPT_FRAME;
+        struct aom_read_bit_buffer rb = { data, data + data_sz, 0, NULL, NULL };
+        const int show_existing_frame = aom_rb_read_bit(&rb);
+        if (!show_existing_frame) {
+          const FRAME_TYPE frame_type = (FRAME_TYPE)aom_rb_read_literal(&rb, 2);
+          if (frame_type == KEY_FRAME) {
+            found_keyframe = 1;
+            break;  // Stop here as no further OBUs will change the outcome.
+          } else if (frame_type == INTRA_ONLY_FRAME) {
+            intra_only_flag = 1;
+          }
+        }
+      }
+    }
+    // skip past any unread OBU header data
+    data += payload_size;
+    data_sz -= payload_size;
+    if (data_sz == 0) break;  // exit if we're out of OBUs
+    status = aom_read_obu_header_and_size(
+        data, data_sz, si->is_annexb, &obu_header, &payload_size, &bytes_read);
+    if (status != AOM_CODEC_OK) return status;
+  }
+  if (got_sequence_header && found_keyframe) si->is_kf = 1;
+  if (is_intra_only != NULL) *is_intra_only = intra_only_flag;
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t decoder_peek_si(const uint8_t *data, size_t data_sz,
+                                       aom_codec_stream_info_t *si) {
+  return decoder_peek_si_internal(data, data_sz, si, NULL);
+}
+
+static aom_codec_err_t decoder_get_si(aom_codec_alg_priv_t *ctx,
+                                      aom_codec_stream_info_t *si) {
+  memcpy(si, &ctx->si, sizeof(*si));
+
+  return AOM_CODEC_OK;
+}
+
+static void set_error_detail(aom_codec_alg_priv_t *ctx,
+                             const char *const error) {
+  ctx->base.err_detail = error;
+}
+
+static aom_codec_err_t update_error_state(
+    aom_codec_alg_priv_t *ctx, const struct aom_internal_error_info *error) {
+  if (error->error_code)
+    set_error_detail(ctx, error->has_detail ? error->detail : NULL);
+
+  return error->error_code;
+}
+
+static void init_buffer_callbacks(aom_codec_alg_priv_t *ctx) {
+  AVxWorker *const worker = ctx->frame_worker;
+  FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+  AV1Decoder *const pbi = frame_worker_data->pbi;
+  AV1_COMMON *const cm = &pbi->common;
+  BufferPool *const pool = cm->buffer_pool;
+
+  cm->cur_frame = NULL;
+  cm->features.byte_alignment = ctx->byte_alignment;
+  pbi->skip_loop_filter = ctx->skip_loop_filter;
+  pbi->skip_film_grain = ctx->skip_film_grain;
+
+  if (ctx->get_ext_fb_cb != NULL && ctx->release_ext_fb_cb != NULL) {
+    pool->get_fb_cb = ctx->get_ext_fb_cb;
+    pool->release_fb_cb = ctx->release_ext_fb_cb;
+    pool->cb_priv = ctx->ext_priv;
+  } else {
+    pool->get_fb_cb = av1_get_frame_buffer;
+    pool->release_fb_cb = av1_release_frame_buffer;
+
+    if (av1_alloc_internal_frame_buffers(&pool->int_frame_buffers))
+      aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                         "Failed to initialize internal frame buffers");
+
+    pool->cb_priv = &pool->int_frame_buffers;
+  }
+}
+
+static int frame_worker_hook(void *arg1, void *arg2) {
+  FrameWorkerData *const frame_worker_data = (FrameWorkerData *)arg1;
+  const uint8_t *data = frame_worker_data->data;
+  (void)arg2;
+
+  int result = av1_receive_compressed_data(frame_worker_data->pbi,
+                                           frame_worker_data->data_size, &data);
+  frame_worker_data->data_end = data;
+
+  if (result != 0) {
+    // Check decode result in serial decode.
+    frame_worker_data->pbi->need_resync = 1;
+  }
+  return !result;
+}
+
+static aom_codec_err_t init_decoder(aom_codec_alg_priv_t *ctx) {
+  const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+
+  ctx->last_show_frame = NULL;
+  ctx->need_resync = 1;
+  ctx->flushed = 0;
+
+  ctx->buffer_pool = (BufferPool *)aom_calloc(1, sizeof(BufferPool));
+  if (ctx->buffer_pool == NULL) return AOM_CODEC_MEM_ERROR;
+
+#if CONFIG_MULTITHREAD
+  if (pthread_mutex_init(&ctx->buffer_pool->pool_mutex, NULL)) {
+    set_error_detail(ctx, "Failed to allocate buffer pool mutex");
+    return AOM_CODEC_MEM_ERROR;
+  }
+#endif
+
+  ctx->frame_worker = (AVxWorker *)aom_malloc(sizeof(*ctx->frame_worker));
+  if (ctx->frame_worker == NULL) {
+    set_error_detail(ctx, "Failed to allocate frame_worker");
+    return AOM_CODEC_MEM_ERROR;
+  }
+
+  AVxWorker *const worker = ctx->frame_worker;
+  FrameWorkerData *frame_worker_data = NULL;
+  winterface->init(worker);
+  worker->thread_name = "aom frameworker";
+  worker->data1 = aom_memalign(32, sizeof(FrameWorkerData));
+  if (worker->data1 == NULL) {
+    set_error_detail(ctx, "Failed to allocate frame_worker_data");
+    return AOM_CODEC_MEM_ERROR;
+  }
+  frame_worker_data = (FrameWorkerData *)worker->data1;
+  frame_worker_data->pbi = av1_decoder_create(ctx->buffer_pool);
+  if (frame_worker_data->pbi == NULL) {
+    set_error_detail(ctx, "Failed to allocate frame_worker_data");
+    return AOM_CODEC_MEM_ERROR;
+  }
+  frame_worker_data->frame_context_ready = 0;
+  frame_worker_data->received_frame = 0;
+  frame_worker_data->pbi->allow_lowbitdepth = ctx->cfg.allow_lowbitdepth;
+
+  // If decoding in serial mode, FrameWorker thread could create tile worker
+  // thread or loopfilter thread.
+  frame_worker_data->pbi->max_threads = ctx->cfg.threads;
+  frame_worker_data->pbi->inv_tile_order = ctx->invert_tile_order;
+  frame_worker_data->pbi->common.tiles.large_scale = ctx->tile_mode;
+  frame_worker_data->pbi->is_annexb = ctx->is_annexb;
+  frame_worker_data->pbi->dec_tile_row = ctx->decode_tile_row;
+  frame_worker_data->pbi->dec_tile_col = ctx->decode_tile_col;
+  frame_worker_data->pbi->operating_point = ctx->operating_point;
+  frame_worker_data->pbi->output_all_layers = ctx->output_all_layers;
+  frame_worker_data->pbi->ext_tile_debug = ctx->ext_tile_debug;
+  frame_worker_data->pbi->row_mt = ctx->row_mt;
+  frame_worker_data->pbi->is_fwd_kf_present = 0;
+  frame_worker_data->pbi->is_arf_frame_present = 0;
+  worker->hook = frame_worker_hook;
+
+  init_buffer_callbacks(ctx);
+
+  return AOM_CODEC_OK;
+}
+
+static INLINE void check_resync(aom_codec_alg_priv_t *const ctx,
+                                const AV1Decoder *const pbi) {
+  // Clear resync flag if worker got a key frame or intra only frame.
+  if (ctx->need_resync == 1 && pbi->need_resync == 0 &&
+      frame_is_intra_only(&pbi->common))
+    ctx->need_resync = 0;
+}
+
+static aom_codec_err_t decode_one(aom_codec_alg_priv_t *ctx,
+                                  const uint8_t **data, size_t data_sz,
+                                  void *user_priv) {
+  const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+
+  // Determine the stream parameters. Note that we rely on peek_si to
+  // validate that we have a buffer that does not wrap around the top
+  // of the heap.
+  if (!ctx->si.h) {
+    int is_intra_only = 0;
+    ctx->si.is_annexb = ctx->is_annexb;
+    const aom_codec_err_t res =
+        decoder_peek_si_internal(*data, data_sz, &ctx->si, &is_intra_only);
+    if (res != AOM_CODEC_OK) return res;
+
+    if (!ctx->si.is_kf && !is_intra_only) return AOM_CODEC_ERROR;
+  }
+
+  AVxWorker *const worker = ctx->frame_worker;
+  FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+  frame_worker_data->data = *data;
+  frame_worker_data->data_size = data_sz;
+  frame_worker_data->user_priv = user_priv;
+  frame_worker_data->received_frame = 1;
+
+  frame_worker_data->pbi->common.tiles.large_scale = ctx->tile_mode;
+  frame_worker_data->pbi->dec_tile_row = ctx->decode_tile_row;
+  frame_worker_data->pbi->dec_tile_col = ctx->decode_tile_col;
+  frame_worker_data->pbi->ext_tile_debug = ctx->ext_tile_debug;
+  frame_worker_data->pbi->row_mt = ctx->row_mt;
+  frame_worker_data->pbi->ext_refs = ctx->ext_refs;
+
+  frame_worker_data->pbi->is_annexb = ctx->is_annexb;
+
+  worker->had_error = 0;
+  winterface->execute(worker);
+
+  // Update data pointer after decode.
+  *data = frame_worker_data->data_end;
+
+  if (worker->had_error)
+    return update_error_state(ctx, &frame_worker_data->pbi->common.error);
+
+  check_resync(ctx, frame_worker_data->pbi);
+
+  return AOM_CODEC_OK;
+}
+
+#if CONFIG_INSPECTION
+// This function enables the inspector to inspect non visible frames.
+static aom_codec_err_t decoder_inspect(aom_codec_alg_priv_t *ctx,
+                                       const uint8_t *data, size_t data_sz,
+                                       void *user_priv) {
+  aom_codec_err_t res = AOM_CODEC_OK;
+
+  const uint8_t *const data_end = data + data_sz;
+  Av1DecodeReturn *data2 = (Av1DecodeReturn *)user_priv;
+
+  if (ctx->frame_worker == NULL) {
+    res = init_decoder(ctx);
+    if (res != AOM_CODEC_OK) return res;
+  }
+  FrameWorkerData *const frame_worker_data =
+      (FrameWorkerData *)ctx->frame_worker->data1;
+  AV1Decoder *const pbi = frame_worker_data->pbi;
+  AV1_COMMON *const cm = &pbi->common;
+  frame_worker_data->pbi->inspect_cb = ctx->inspect_cb;
+  frame_worker_data->pbi->inspect_ctx = ctx->inspect_ctx;
+  res = av1_receive_compressed_data(frame_worker_data->pbi, data_sz, &data);
+  check_resync(ctx, frame_worker_data->pbi);
+
+  if (ctx->frame_worker->had_error)
+    return update_error_state(ctx, &frame_worker_data->pbi->common.error);
+
+  // Allow extra zero bytes after the frame end
+  while (data < data_end) {
+    const uint8_t marker = data[0];
+    if (marker) break;
+    ++data;
+  }
+
+  data2->idx = -1;
+  for (int i = 0; i < REF_FRAMES; ++i)
+    if (cm->ref_frame_map[i] == cm->cur_frame) data2->idx = i;
+  data2->buf = data;
+  data2->show_existing = cm->show_existing_frame;
+  return res;
+}
+#endif
+
+static aom_codec_err_t decoder_decode(aom_codec_alg_priv_t *ctx,
+                                      const uint8_t *data, size_t data_sz,
+                                      void *user_priv) {
+  aom_codec_err_t res = AOM_CODEC_OK;
+
+#if CONFIG_INSPECTION
+  if (user_priv != 0) {
+    return decoder_inspect(ctx, data, data_sz, user_priv);
+  }
+#endif
+  // Release any pending output frames from the previous decoder_decode call.
+  // We need to do this even if the decoder is being flushed or the input
+  // arguments are invalid.
+  if (ctx->frame_worker) {
+    BufferPool *const pool = ctx->buffer_pool;
+    lock_buffer_pool(pool);
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    struct AV1Decoder *pbi = frame_worker_data->pbi;
+    for (size_t j = 0; j < pbi->num_output_frames; j++) {
+      decrease_ref_count(pbi->output_frames[j], pool);
+    }
+    pbi->num_output_frames = 0;
+    unlock_buffer_pool(pool);
+    for (size_t j = 0; j < ctx->num_grain_image_frame_buffers; j++) {
+      pool->release_fb_cb(pool->cb_priv, &ctx->grain_image_frame_buffers[j]);
+      ctx->grain_image_frame_buffers[j].data = NULL;
+      ctx->grain_image_frame_buffers[j].size = 0;
+      ctx->grain_image_frame_buffers[j].priv = NULL;
+    }
+    ctx->num_grain_image_frame_buffers = 0;
+  }
+
+  /* Sanity checks */
+  /* NULL data ptr allowed if data_sz is 0 too */
+  if (data == NULL && data_sz == 0) {
+    ctx->flushed = 1;
+    return AOM_CODEC_OK;
+  }
+  if (data == NULL || data_sz == 0) return AOM_CODEC_INVALID_PARAM;
+
+  // Reset flushed when receiving a valid frame.
+  ctx->flushed = 0;
+
+  // Initialize the decoder worker on the first frame.
+  if (ctx->frame_worker == NULL) {
+    res = init_decoder(ctx);
+    if (res != AOM_CODEC_OK) return res;
+  }
+
+  const uint8_t *data_start = data;
+  const uint8_t *data_end = data + data_sz;
+
+  if (ctx->is_annexb) {
+    // read the size of this temporal unit
+    size_t length_of_size;
+    uint64_t temporal_unit_size;
+    if (aom_uleb_decode(data_start, data_sz, &temporal_unit_size,
+                        &length_of_size) != 0) {
+      return AOM_CODEC_CORRUPT_FRAME;
+    }
+    data_start += length_of_size;
+    if (temporal_unit_size > (size_t)(data_end - data_start))
+      return AOM_CODEC_CORRUPT_FRAME;
+    data_end = data_start + temporal_unit_size;
+  }
+
+  // Decode in serial mode.
+  while (data_start < data_end) {
+    uint64_t frame_size;
+    if (ctx->is_annexb) {
+      // read the size of this frame unit
+      size_t length_of_size;
+      if (aom_uleb_decode(data_start, (size_t)(data_end - data_start),
+                          &frame_size, &length_of_size) != 0) {
+        return AOM_CODEC_CORRUPT_FRAME;
+      }
+      data_start += length_of_size;
+      if (frame_size > (size_t)(data_end - data_start))
+        return AOM_CODEC_CORRUPT_FRAME;
+    } else {
+      frame_size = (uint64_t)(data_end - data_start);
+    }
+
+    res = decode_one(ctx, &data_start, (size_t)frame_size, user_priv);
+    if (res != AOM_CODEC_OK) return res;
+
+    // Allow extra zero bytes after the frame end
+    while (data_start < data_end) {
+      const uint8_t marker = data_start[0];
+      if (marker) break;
+      ++data_start;
+    }
+  }
+
+  return res;
+}
+
+typedef struct {
+  BufferPool *pool;
+  aom_codec_frame_buffer_t *fb;
+} AllocCbParam;
+
+static void *AllocWithGetFrameBufferCb(void *priv, size_t size) {
+  AllocCbParam *param = (AllocCbParam *)priv;
+  if (param->pool->get_fb_cb(param->pool->cb_priv, size, param->fb) < 0)
+    return NULL;
+  if (param->fb->data == NULL || param->fb->size < size) return NULL;
+  return param->fb->data;
+}
+
+// If grain_params->apply_grain is false, returns img. Otherwise, adds film
+// grain to img, saves the result in grain_img, and returns grain_img.
+static aom_image_t *add_grain_if_needed(aom_codec_alg_priv_t *ctx,
+                                        aom_image_t *img,
+                                        aom_image_t *grain_img,
+                                        aom_film_grain_t *grain_params) {
+  if (!grain_params->apply_grain) return img;
+
+  const int w_even = ALIGN_POWER_OF_TWO(img->d_w, 1);
+  const int h_even = ALIGN_POWER_OF_TWO(img->d_h, 1);
+
+  BufferPool *const pool = ctx->buffer_pool;
+  aom_codec_frame_buffer_t *fb =
+      &ctx->grain_image_frame_buffers[ctx->num_grain_image_frame_buffers];
+  AllocCbParam param;
+  param.pool = pool;
+  param.fb = fb;
+  if (!aom_img_alloc_with_cb(grain_img, img->fmt, w_even, h_even, 16,
+                             AllocWithGetFrameBufferCb, &param)) {
+    return NULL;
+  }
+
+  grain_img->user_priv = img->user_priv;
+  grain_img->fb_priv = fb->priv;
+  if (av1_add_film_grain(grain_params, img, grain_img)) {
+    pool->release_fb_cb(pool->cb_priv, fb);
+    return NULL;
+  }
+
+  ctx->num_grain_image_frame_buffers++;
+  return grain_img;
+}
+
+// Copies and clears the metadata from AV1Decoder.
+static void move_decoder_metadata_to_img(AV1Decoder *pbi, aom_image_t *img) {
+  if (pbi->metadata && img) {
+    assert(!img->metadata);
+    img->metadata = pbi->metadata;
+    pbi->metadata = NULL;
+  }
+}
+
+static aom_image_t *decoder_get_frame(aom_codec_alg_priv_t *ctx,
+                                      aom_codec_iter_t *iter) {
+  aom_image_t *img = NULL;
+
+  if (!iter) {
+    return NULL;
+  }
+
+  // To avoid having to allocate any extra storage, treat 'iter' as
+  // simply a pointer to an integer index
+  uintptr_t *index = (uintptr_t *)iter;
+
+  if (ctx->frame_worker != NULL) {
+    const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    AV1Decoder *const pbi = frame_worker_data->pbi;
+    AV1_COMMON *const cm = &pbi->common;
+    CommonTileParams *const tiles = &cm->tiles;
+    // Wait for the frame from worker thread.
+    if (winterface->sync(worker)) {
+      // Check if worker has received any frames.
+      if (frame_worker_data->received_frame == 1) {
+        frame_worker_data->received_frame = 0;
+        check_resync(ctx, frame_worker_data->pbi);
+      }
+      YV12_BUFFER_CONFIG *sd;
+      aom_film_grain_t *grain_params;
+      if (av1_get_raw_frame(frame_worker_data->pbi, *index, &sd,
+                            &grain_params) == 0) {
+        RefCntBuffer *const output_frame_buf = pbi->output_frames[*index];
+        ctx->last_show_frame = output_frame_buf;
+        if (ctx->need_resync) return NULL;
+        aom_img_remove_metadata(&ctx->img);
+        yuvconfig2image(&ctx->img, sd, frame_worker_data->user_priv);
+        move_decoder_metadata_to_img(pbi, &ctx->img);
+
+        if (!pbi->ext_tile_debug && tiles->large_scale) {
+          *index += 1;  // Advance the iterator to point to the next image
+          aom_img_remove_metadata(&ctx->img);
+          yuvconfig2image(&ctx->img, &pbi->tile_list_outbuf, NULL);
+          move_decoder_metadata_to_img(pbi, &ctx->img);
+          img = &ctx->img;
+          return img;
+        }
+
+        const int num_planes = av1_num_planes(cm);
+        if (pbi->ext_tile_debug && tiles->single_tile_decoding &&
+            pbi->dec_tile_row >= 0) {
+          int tile_width, tile_height;
+          av1_get_uniform_tile_size(cm, &tile_width, &tile_height);
+          const int tile_row = AOMMIN(pbi->dec_tile_row, tiles->rows - 1);
+          const int mi_row = tile_row * tile_height;
+          const int ssy = ctx->img.y_chroma_shift;
+          int plane;
+          ctx->img.planes[0] += mi_row * MI_SIZE * ctx->img.stride[0];
+          if (num_planes > 1) {
+            for (plane = 1; plane < MAX_MB_PLANE; ++plane) {
+              ctx->img.planes[plane] +=
+                  mi_row * (MI_SIZE >> ssy) * ctx->img.stride[plane];
+            }
+          }
+          ctx->img.d_h =
+              AOMMIN(tile_height, cm->mi_params.mi_rows - mi_row) * MI_SIZE;
+        }
+
+        if (pbi->ext_tile_debug && tiles->single_tile_decoding &&
+            pbi->dec_tile_col >= 0) {
+          int tile_width, tile_height;
+          av1_get_uniform_tile_size(cm, &tile_width, &tile_height);
+          const int tile_col = AOMMIN(pbi->dec_tile_col, tiles->cols - 1);
+          const int mi_col = tile_col * tile_width;
+          const int ssx = ctx->img.x_chroma_shift;
+          const int is_hbd = (ctx->img.fmt & AOM_IMG_FMT_HIGHBITDEPTH) ? 1 : 0;
+          int plane;
+          ctx->img.planes[0] += mi_col * MI_SIZE * (1 + is_hbd);
+          if (num_planes > 1) {
+            for (plane = 1; plane < MAX_MB_PLANE; ++plane) {
+              ctx->img.planes[plane] +=
+                  mi_col * (MI_SIZE >> ssx) * (1 + is_hbd);
+            }
+          }
+          ctx->img.d_w =
+              AOMMIN(tile_width, cm->mi_params.mi_cols - mi_col) * MI_SIZE;
+        }
+
+        ctx->img.fb_priv = output_frame_buf->raw_frame_buffer.priv;
+        img = &ctx->img;
+        img->temporal_id = cm->temporal_layer_id;
+        img->spatial_id = cm->spatial_layer_id;
+        if (pbi->skip_film_grain) grain_params->apply_grain = 0;
+        aom_image_t *res =
+            add_grain_if_needed(ctx, img, &ctx->image_with_grain, grain_params);
+        if (!res) {
+          aom_internal_error(&pbi->common.error, AOM_CODEC_CORRUPT_FRAME,
+                             "Grain systhesis failed\n");
+        }
+        *index += 1;  // Advance the iterator to point to the next image
+        return res;
+      }
+    } else {
+      // Decoding failed. Release the worker thread.
+      frame_worker_data->received_frame = 0;
+      ctx->need_resync = 1;
+      if (ctx->flushed != 1) return NULL;
+    }
+  }
+  return NULL;
+}
+
+static aom_codec_err_t decoder_set_fb_fn(
+    aom_codec_alg_priv_t *ctx, aom_get_frame_buffer_cb_fn_t cb_get,
+    aom_release_frame_buffer_cb_fn_t cb_release, void *cb_priv) {
+  if (cb_get == NULL || cb_release == NULL) {
+    return AOM_CODEC_INVALID_PARAM;
+  } else if (ctx->frame_worker == NULL) {
+    // If the decoder has already been initialized, do not accept changes to
+    // the frame buffer functions.
+    ctx->get_ext_fb_cb = cb_get;
+    ctx->release_ext_fb_cb = cb_release;
+    ctx->ext_priv = cb_priv;
+    return AOM_CODEC_OK;
+  }
+
+  return AOM_CODEC_ERROR;
+}
+
+static aom_codec_err_t ctrl_set_reference(aom_codec_alg_priv_t *ctx,
+                                          va_list args) {
+  av1_ref_frame_t *const data = va_arg(args, av1_ref_frame_t *);
+
+  if (data) {
+    av1_ref_frame_t *const frame = data;
+    YV12_BUFFER_CONFIG sd;
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    image2yuvconfig(&frame->img, &sd);
+    return av1_set_reference_dec(&frame_worker_data->pbi->common, frame->idx,
+                                 frame->use_external_ref, &sd);
+  } else {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+}
+
+static aom_codec_err_t ctrl_copy_reference(aom_codec_alg_priv_t *ctx,
+                                           va_list args) {
+  const av1_ref_frame_t *const frame = va_arg(args, av1_ref_frame_t *);
+  if (frame) {
+    YV12_BUFFER_CONFIG sd;
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    image2yuvconfig(&frame->img, &sd);
+    return av1_copy_reference_dec(frame_worker_data->pbi, frame->idx, &sd);
+  } else {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+}
+
+static aom_codec_err_t ctrl_get_reference(aom_codec_alg_priv_t *ctx,
+                                          va_list args) {
+  av1_ref_frame_t *data = va_arg(args, av1_ref_frame_t *);
+  if (data) {
+    YV12_BUFFER_CONFIG *fb;
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    fb = get_ref_frame(&frame_worker_data->pbi->common, data->idx);
+    if (fb == NULL) return AOM_CODEC_ERROR;
+    yuvconfig2image(&data->img, fb, NULL);
+    return AOM_CODEC_OK;
+  } else {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+}
+
+static aom_codec_err_t ctrl_get_new_frame_image(aom_codec_alg_priv_t *ctx,
+                                                va_list args) {
+  aom_image_t *new_img = va_arg(args, aom_image_t *);
+  if (new_img) {
+    YV12_BUFFER_CONFIG new_frame;
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+
+    if (av1_get_frame_to_show(frame_worker_data->pbi, &new_frame) == 0) {
+      yuvconfig2image(new_img, &new_frame, NULL);
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  } else {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+}
+
+static aom_codec_err_t ctrl_copy_new_frame_image(aom_codec_alg_priv_t *ctx,
+                                                 va_list args) {
+  aom_image_t *img = va_arg(args, aom_image_t *);
+  if (img) {
+    YV12_BUFFER_CONFIG new_frame;
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+
+    if (av1_get_frame_to_show(frame_worker_data->pbi, &new_frame) == 0) {
+      YV12_BUFFER_CONFIG sd;
+      image2yuvconfig(img, &sd);
+      return av1_copy_new_frame_dec(&frame_worker_data->pbi->common, &new_frame,
+                                    &sd);
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  } else {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+}
+
+static aom_codec_err_t ctrl_get_last_ref_updates(aom_codec_alg_priv_t *ctx,
+                                                 va_list args) {
+  int *const update_info = va_arg(args, int *);
+
+  if (update_info) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      *update_info =
+          frame_worker_data->pbi->common.current_frame.refresh_frame_flags;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_last_quantizer(aom_codec_alg_priv_t *ctx,
+                                               va_list args) {
+  int *const arg = va_arg(args, int *);
+  if (arg == NULL) return AOM_CODEC_INVALID_PARAM;
+  if (ctx->frame_worker == NULL) return AOM_CODEC_ERROR;
+  *arg = ((FrameWorkerData *)ctx->frame_worker->data1)
+             ->pbi->common.quant_params.base_qindex;
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_get_fwd_kf_value(aom_codec_alg_priv_t *ctx,
+                                             va_list args) {
+  int *const arg = va_arg(args, int *);
+  if (arg == NULL) return AOM_CODEC_INVALID_PARAM;
+  if (ctx->frame_worker == NULL) return AOM_CODEC_ERROR;
+  *arg = ((FrameWorkerData *)ctx->frame_worker->data1)->pbi->is_fwd_kf_present;
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_get_altref_present(aom_codec_alg_priv_t *ctx,
+                                               va_list args) {
+  int *const arg = va_arg(args, int *);
+  if (arg == NULL) return AOM_CODEC_INVALID_PARAM;
+  if (ctx->frame_worker == NULL) return AOM_CODEC_ERROR;
+  *arg =
+      ((FrameWorkerData *)ctx->frame_worker->data1)->pbi->is_arf_frame_present;
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_get_frame_flags(aom_codec_alg_priv_t *ctx,
+                                            va_list args) {
+  int *const arg = va_arg(args, int *);
+  if (arg == NULL) return AOM_CODEC_INVALID_PARAM;
+  if (ctx->frame_worker == NULL) return AOM_CODEC_ERROR;
+  AV1Decoder *pbi = ((FrameWorkerData *)ctx->frame_worker->data1)->pbi;
+  *arg = 0;
+  switch (pbi->common.current_frame.frame_type) {
+    case KEY_FRAME:
+      *arg |= AOM_FRAME_IS_KEY;
+      *arg |= AOM_FRAME_IS_INTRAONLY;
+      if (!pbi->common.show_frame) {
+        *arg |= AOM_FRAME_IS_DELAYED_RANDOM_ACCESS_POINT;
+      }
+      break;
+    case INTRA_ONLY_FRAME: *arg |= AOM_FRAME_IS_INTRAONLY; break;
+    case S_FRAME: *arg |= AOM_FRAME_IS_SWITCH; break;
+  }
+  if (pbi->common.features.error_resilient_mode) {
+    *arg |= AOM_FRAME_IS_ERROR_RESILIENT;
+  }
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_get_tile_info(aom_codec_alg_priv_t *ctx,
+                                          va_list args) {
+  aom_tile_info *const tile_info = va_arg(args, aom_tile_info *);
+
+  if (tile_info) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1Decoder *pbi = frame_worker_data->pbi;
+      const CommonTileParams *tiles = &pbi->common.tiles;
+
+      int tile_rows = tiles->rows;
+      int tile_cols = tiles->cols;
+
+      if (tiles->uniform_spacing) {
+        tile_info->tile_rows = 1 << tiles->log2_rows;
+        tile_info->tile_columns = 1 << tiles->log2_cols;
+      } else {
+        tile_info->tile_rows = tile_rows;
+        tile_info->tile_columns = tile_cols;
+      }
+
+      for (int tile_col = 1; tile_col <= tile_cols; tile_col++) {
+        tile_info->tile_widths[tile_col - 1] =
+            tiles->col_start_sb[tile_col] - tiles->col_start_sb[tile_col - 1];
+      }
+
+      for (int tile_row = 1; tile_row <= tile_rows; tile_row++) {
+        tile_info->tile_heights[tile_row - 1] =
+            tiles->row_start_sb[tile_row] - tiles->row_start_sb[tile_row - 1];
+      }
+      tile_info->num_tile_groups = pbi->num_tile_groups;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_screen_content_tools_info(
+    aom_codec_alg_priv_t *ctx, va_list args) {
+  aom_screen_content_tools_info *const sc_info =
+      va_arg(args, aom_screen_content_tools_info *);
+  if (sc_info) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1Decoder *pbi = frame_worker_data->pbi;
+      sc_info->allow_screen_content_tools =
+          pbi->common.features.allow_screen_content_tools;
+      sc_info->allow_intrabc = pbi->common.features.allow_intrabc;
+      sc_info->force_integer_mv =
+          (int)pbi->common.features.cur_frame_force_integer_mv;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_still_picture(aom_codec_alg_priv_t *ctx,
+                                              va_list args) {
+  aom_still_picture_info *const still_picture_info =
+      va_arg(args, aom_still_picture_info *);
+  if (still_picture_info) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1Decoder *pbi = frame_worker_data->pbi;
+      still_picture_info->is_still_picture =
+          (int)pbi->common.seq_params.still_picture;
+      still_picture_info->is_reduced_still_picture_hdr =
+          (int)(pbi->common.seq_params.reduced_still_picture_hdr);
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_sb_size(aom_codec_alg_priv_t *ctx,
+                                        va_list args) {
+  aom_superblock_size_t *const sb_size = va_arg(args, aom_superblock_size_t *);
+  if (sb_size) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1Decoder *pbi = frame_worker_data->pbi;
+      if (pbi->common.seq_params.sb_size == BLOCK_128X128) {
+        *sb_size = AOM_SUPERBLOCK_SIZE_128X128;
+      } else {
+        *sb_size = AOM_SUPERBLOCK_SIZE_64X64;
+      }
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_show_existing_frame_flag(
+    aom_codec_alg_priv_t *ctx, va_list args) {
+  int *const arg = va_arg(args, int *);
+  if (arg == NULL) return AOM_CODEC_INVALID_PARAM;
+  if (ctx->frame_worker == NULL) return AOM_CODEC_ERROR;
+  *arg = ((FrameWorkerData *)ctx->frame_worker->data1)
+             ->pbi->common.show_existing_frame;
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_get_s_frame_info(aom_codec_alg_priv_t *ctx,
+                                             va_list args) {
+  aom_s_frame_info *const s_frame_info = va_arg(args, aom_s_frame_info *);
+  if (s_frame_info) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1Decoder *pbi = frame_worker_data->pbi;
+      s_frame_info->is_s_frame = pbi->sframe_info.is_s_frame;
+      s_frame_info->is_s_frame_at_altref =
+          pbi->sframe_info.is_s_frame_at_altref;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_frame_corrupted(aom_codec_alg_priv_t *ctx,
+                                                va_list args) {
+  int *corrupted = va_arg(args, int *);
+
+  if (corrupted) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      AV1Decoder *const pbi = frame_worker_data->pbi;
+      if (pbi->seen_frame_header && pbi->num_output_frames == 0)
+        return AOM_CODEC_ERROR;
+      if (ctx->last_show_frame != NULL)
+        *corrupted = ctx->last_show_frame->buf.corrupted;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_frame_size(aom_codec_alg_priv_t *ctx,
+                                           va_list args) {
+  int *const frame_size = va_arg(args, int *);
+
+  if (frame_size) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1_COMMON *const cm = &frame_worker_data->pbi->common;
+      frame_size[0] = cm->width;
+      frame_size[1] = cm->height;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_frame_header_info(aom_codec_alg_priv_t *ctx,
+                                                  va_list args) {
+  aom_tile_data *const frame_header_info = va_arg(args, aom_tile_data *);
+
+  if (frame_header_info) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1Decoder *pbi = frame_worker_data->pbi;
+      frame_header_info->coded_tile_data_size = pbi->obu_size_hdr.size;
+      frame_header_info->coded_tile_data = pbi->obu_size_hdr.data;
+      frame_header_info->extra_size = pbi->frame_header_size;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_tile_data(aom_codec_alg_priv_t *ctx,
+                                          va_list args) {
+  aom_tile_data *const tile_data = va_arg(args, aom_tile_data *);
+
+  if (tile_data) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1Decoder *pbi = frame_worker_data->pbi;
+      tile_data->coded_tile_data_size =
+          pbi->tile_buffers[pbi->dec_tile_row][pbi->dec_tile_col].size;
+      tile_data->coded_tile_data =
+          pbi->tile_buffers[pbi->dec_tile_row][pbi->dec_tile_col].data;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_set_ext_ref_ptr(aom_codec_alg_priv_t *ctx,
+                                            va_list args) {
+  av1_ext_ref_frame_t *const data = va_arg(args, av1_ext_ref_frame_t *);
+
+  if (data) {
+    av1_ext_ref_frame_t *const ext_frames = data;
+    ctx->ext_refs.num = ext_frames->num;
+    for (int i = 0; i < ctx->ext_refs.num; i++) {
+      image2yuvconfig(ext_frames->img++, &ctx->ext_refs.refs[i]);
+    }
+    return AOM_CODEC_OK;
+  } else {
+    return AOM_CODEC_INVALID_PARAM;
+  }
+}
+
+static aom_codec_err_t ctrl_get_render_size(aom_codec_alg_priv_t *ctx,
+                                            va_list args) {
+  int *const render_size = va_arg(args, int *);
+
+  if (render_size) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1_COMMON *const cm = &frame_worker_data->pbi->common;
+      render_size[0] = cm->render_width;
+      render_size[1] = cm->render_height;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_bit_depth(aom_codec_alg_priv_t *ctx,
+                                          va_list args) {
+  unsigned int *const bit_depth = va_arg(args, unsigned int *);
+  AVxWorker *const worker = ctx->frame_worker;
+
+  if (bit_depth) {
+    if (worker) {
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1_COMMON *const cm = &frame_worker_data->pbi->common;
+      *bit_depth = cm->seq_params.bit_depth;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_img_fmt_t get_img_format(int subsampling_x, int subsampling_y,
+                                    int use_highbitdepth) {
+  aom_img_fmt_t fmt = 0;
+
+  if (subsampling_x == 0 && subsampling_y == 0)
+    fmt = AOM_IMG_FMT_I444;
+  else if (subsampling_x == 1 && subsampling_y == 0)
+    fmt = AOM_IMG_FMT_I422;
+  else if (subsampling_x == 1 && subsampling_y == 1)
+    fmt = AOM_IMG_FMT_I420;
+
+  if (use_highbitdepth) fmt |= AOM_IMG_FMT_HIGHBITDEPTH;
+  return fmt;
+}
+
+static aom_codec_err_t ctrl_get_img_format(aom_codec_alg_priv_t *ctx,
+                                           va_list args) {
+  aom_img_fmt_t *const img_fmt = va_arg(args, aom_img_fmt_t *);
+  AVxWorker *const worker = ctx->frame_worker;
+
+  if (img_fmt) {
+    if (worker) {
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1_COMMON *const cm = &frame_worker_data->pbi->common;
+
+      *img_fmt = get_img_format(cm->seq_params.subsampling_x,
+                                cm->seq_params.subsampling_y,
+                                cm->seq_params.use_highbitdepth);
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_tile_size(aom_codec_alg_priv_t *ctx,
+                                          va_list args) {
+  unsigned int *const tile_size = va_arg(args, unsigned int *);
+  AVxWorker *const worker = ctx->frame_worker;
+
+  if (tile_size) {
+    if (worker) {
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      const AV1_COMMON *const cm = &frame_worker_data->pbi->common;
+      int tile_width, tile_height;
+      av1_get_uniform_tile_size(cm, &tile_width, &tile_height);
+      *tile_size = ((tile_width * MI_SIZE) << 16) + tile_height * MI_SIZE;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_get_tile_count(aom_codec_alg_priv_t *ctx,
+                                           va_list args) {
+  unsigned int *const tile_count = va_arg(args, unsigned int *);
+
+  if (tile_count) {
+    AVxWorker *const worker = ctx->frame_worker;
+    if (worker) {
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      *tile_count = frame_worker_data->pbi->tile_count_minus_1 + 1;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+  return AOM_CODEC_INVALID_PARAM;
+}
+
+static aom_codec_err_t ctrl_set_invert_tile_order(aom_codec_alg_priv_t *ctx,
+                                                  va_list args) {
+  ctx->invert_tile_order = va_arg(args, int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_byte_alignment(aom_codec_alg_priv_t *ctx,
+                                               va_list args) {
+  const int legacy_byte_alignment = 0;
+  const int min_byte_alignment = 32;
+  const int max_byte_alignment = 1024;
+  const int byte_alignment = va_arg(args, int);
+
+  if (byte_alignment != legacy_byte_alignment &&
+      (byte_alignment < min_byte_alignment ||
+       byte_alignment > max_byte_alignment ||
+       (byte_alignment & (byte_alignment - 1)) != 0))
+    return AOM_CODEC_INVALID_PARAM;
+
+  ctx->byte_alignment = byte_alignment;
+  if (ctx->frame_worker) {
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    frame_worker_data->pbi->common.features.byte_alignment = byte_alignment;
+  }
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_skip_loop_filter(aom_codec_alg_priv_t *ctx,
+                                                 va_list args) {
+  ctx->skip_loop_filter = va_arg(args, int);
+
+  if (ctx->frame_worker) {
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    frame_worker_data->pbi->skip_loop_filter = ctx->skip_loop_filter;
+  }
+
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_skip_film_grain(aom_codec_alg_priv_t *ctx,
+                                                va_list args) {
+  ctx->skip_film_grain = va_arg(args, int);
+
+  if (ctx->frame_worker) {
+    AVxWorker *const worker = ctx->frame_worker;
+    FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
+    frame_worker_data->pbi->skip_film_grain = ctx->skip_film_grain;
+  }
+
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_get_accounting(aom_codec_alg_priv_t *ctx,
+                                           va_list args) {
+#if !CONFIG_ACCOUNTING
+  (void)ctx;
+  (void)args;
+  return AOM_CODEC_INCAPABLE;
+#else
+  Accounting **acct = va_arg(args, Accounting **);
+
+  if (acct) {
+    if (ctx->frame_worker) {
+      AVxWorker *const worker = ctx->frame_worker;
+      FrameWorkerData *const frame_worker_data =
+          (FrameWorkerData *)worker->data1;
+      AV1Decoder *pbi = frame_worker_data->pbi;
+      *acct = &pbi->accounting;
+      return AOM_CODEC_OK;
+    } else {
+      return AOM_CODEC_ERROR;
+    }
+  }
+
+  return AOM_CODEC_INVALID_PARAM;
+#endif
+}
+
+static aom_codec_err_t ctrl_set_decode_tile_row(aom_codec_alg_priv_t *ctx,
+                                                va_list args) {
+  ctx->decode_tile_row = va_arg(args, int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_decode_tile_col(aom_codec_alg_priv_t *ctx,
+                                                va_list args) {
+  ctx->decode_tile_col = va_arg(args, int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_tile_mode(aom_codec_alg_priv_t *ctx,
+                                          va_list args) {
+  ctx->tile_mode = va_arg(args, unsigned int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_is_annexb(aom_codec_alg_priv_t *ctx,
+                                          va_list args) {
+  ctx->is_annexb = va_arg(args, unsigned int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_operating_point(aom_codec_alg_priv_t *ctx,
+                                                va_list args) {
+  ctx->operating_point = va_arg(args, int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_output_all_layers(aom_codec_alg_priv_t *ctx,
+                                                  va_list args) {
+  ctx->output_all_layers = va_arg(args, int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_inspection_callback(aom_codec_alg_priv_t *ctx,
+                                                    va_list args) {
+#if !CONFIG_INSPECTION
+  (void)ctx;
+  (void)args;
+  return AOM_CODEC_INCAPABLE;
+#else
+  aom_inspect_init *init = va_arg(args, aom_inspect_init *);
+  ctx->inspect_cb = init->inspect_cb;
+  ctx->inspect_ctx = init->inspect_ctx;
+  return AOM_CODEC_OK;
+#endif
+}
+
+static aom_codec_err_t ctrl_ext_tile_debug(aom_codec_alg_priv_t *ctx,
+                                           va_list args) {
+  ctx->ext_tile_debug = va_arg(args, int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_err_t ctrl_set_row_mt(aom_codec_alg_priv_t *ctx,
+                                       va_list args) {
+  ctx->row_mt = va_arg(args, unsigned int);
+  return AOM_CODEC_OK;
+}
+
+static aom_codec_ctrl_fn_map_t decoder_ctrl_maps[] = {
+  { AV1_COPY_REFERENCE, ctrl_copy_reference },
+
+  // Setters
+  { AV1_SET_REFERENCE, ctrl_set_reference },
+  { AV1_INVERT_TILE_DECODE_ORDER, ctrl_set_invert_tile_order },
+  { AV1_SET_BYTE_ALIGNMENT, ctrl_set_byte_alignment },
+  { AV1_SET_SKIP_LOOP_FILTER, ctrl_set_skip_loop_filter },
+  { AV1_SET_DECODE_TILE_ROW, ctrl_set_decode_tile_row },
+  { AV1_SET_DECODE_TILE_COL, ctrl_set_decode_tile_col },
+  { AV1_SET_TILE_MODE, ctrl_set_tile_mode },
+  { AV1D_SET_IS_ANNEXB, ctrl_set_is_annexb },
+  { AV1D_SET_OPERATING_POINT, ctrl_set_operating_point },
+  { AV1D_SET_OUTPUT_ALL_LAYERS, ctrl_set_output_all_layers },
+  { AV1_SET_INSPECTION_CALLBACK, ctrl_set_inspection_callback },
+  { AV1D_EXT_TILE_DEBUG, ctrl_ext_tile_debug },
+  { AV1D_SET_ROW_MT, ctrl_set_row_mt },
+  { AV1D_SET_EXT_REF_PTR, ctrl_set_ext_ref_ptr },
+  { AV1D_SET_SKIP_FILM_GRAIN, ctrl_set_skip_film_grain },
+
+  // Getters
+  { AOMD_GET_FRAME_CORRUPTED, ctrl_get_frame_corrupted },
+  { AOMD_GET_LAST_QUANTIZER, ctrl_get_last_quantizer },
+  { AOMD_GET_LAST_REF_UPDATES, ctrl_get_last_ref_updates },
+  { AV1D_GET_BIT_DEPTH, ctrl_get_bit_depth },
+  { AV1D_GET_IMG_FORMAT, ctrl_get_img_format },
+  { AV1D_GET_TILE_SIZE, ctrl_get_tile_size },
+  { AV1D_GET_TILE_COUNT, ctrl_get_tile_count },
+  { AV1D_GET_DISPLAY_SIZE, ctrl_get_render_size },
+  { AV1D_GET_FRAME_SIZE, ctrl_get_frame_size },
+  { AV1_GET_ACCOUNTING, ctrl_get_accounting },
+  { AV1_GET_NEW_FRAME_IMAGE, ctrl_get_new_frame_image },
+  { AV1_COPY_NEW_FRAME_IMAGE, ctrl_copy_new_frame_image },
+  { AV1_GET_REFERENCE, ctrl_get_reference },
+  { AV1D_GET_FRAME_HEADER_INFO, ctrl_get_frame_header_info },
+  { AV1D_GET_TILE_DATA, ctrl_get_tile_data },
+  { AOMD_GET_FWD_KF_PRESENT, ctrl_get_fwd_kf_value },
+  { AOMD_GET_ALTREF_PRESENT, ctrl_get_altref_present },
+  { AOMD_GET_FRAME_FLAGS, ctrl_get_frame_flags },
+  { AOMD_GET_TILE_INFO, ctrl_get_tile_info },
+  { AOMD_GET_SCREEN_CONTENT_TOOLS_INFO, ctrl_get_screen_content_tools_info },
+  { AOMD_GET_STILL_PICTURE, ctrl_get_still_picture },
+  { AOMD_GET_SB_SIZE, ctrl_get_sb_size },
+  { AOMD_GET_SHOW_EXISTING_FRAME_FLAG, ctrl_get_show_existing_frame_flag },
+  { AOMD_GET_S_FRAME_INFO, ctrl_get_s_frame_info },
+
+  CTRL_MAP_END,
+};
+
+// This data structure and function are exported in aom/aomdx.h
+#ifndef VERSION_STRING
+#define VERSION_STRING
+#endif
+aom_codec_iface_t aom_codec_av1_dx_algo = {
+  "AOMedia Project AV1 Decoder" VERSION_STRING,
+  AOM_CODEC_INTERNAL_ABI_VERSION,
+  AOM_CODEC_CAP_DECODER |
+      AOM_CODEC_CAP_EXTERNAL_FRAME_BUFFER,  // aom_codec_caps_t
+  decoder_init,                             // aom_codec_init_fn_t
+  decoder_destroy,                          // aom_codec_destroy_fn_t
+  decoder_ctrl_maps,                        // aom_codec_ctrl_fn_map_t
+  {
+      // NOLINT
+      decoder_peek_si,    // aom_codec_peek_si_fn_t
+      decoder_get_si,     // aom_codec_get_si_fn_t
+      decoder_decode,     // aom_codec_decode_fn_t
+      decoder_get_frame,  // aom_codec_get_frame_fn_t
+      decoder_set_fb_fn,  // aom_codec_set_fb_fn_t
+  },
+  {
+      // NOLINT
+      0,
+      NULL,  // aom_codec_enc_cfg_t
+      NULL,  // aom_codec_encode_fn_t
+      NULL,  // aom_codec_get_cx_data_fn_t
+      NULL,  // aom_codec_enc_config_set_fn_t
+      NULL,  // aom_codec_get_global_headers_fn_t
+      NULL   // aom_codec_get_preview_frame_fn_t
+  },
+  NULL  // aom_codec_set_option_fn_t
+};
+
+aom_codec_iface_t *aom_codec_av1_dx(void) { return &aom_codec_av1_dx_algo; }
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/av1_iface_common.h b/pxr/imaging/plugin/hioAvif/aom/av1/av1_iface_common.h
new file mode 100644
index 0000000000..6047b2eb38
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/av1_iface_common.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#ifndef AOM_AV1_AV1_IFACE_COMMON_H_
+#define AOM_AV1_AV1_IFACE_COMMON_H_
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h"
+
+static void yuvconfig2image(aom_image_t *img, const YV12_BUFFER_CONFIG *yv12,
+                            void *user_priv) {
+  /* aom_img_wrap() doesn't allow specifying independent strides for
+   * the Y, U, and V planes, nor other alignment adjustments that
+   * might be representable by a YV12_BUFFER_CONFIG, so we just
+   * initialize all the fields.
+   */
+  int bps;
+  if (!yv12->subsampling_y) {
+    if (!yv12->subsampling_x) {
+      img->fmt = AOM_IMG_FMT_I444;
+      bps = 24;
+    } else {
+      img->fmt = AOM_IMG_FMT_I422;
+      bps = 16;
+    }
+  } else {
+    img->fmt = AOM_IMG_FMT_I420;
+    bps = 12;
+  }
+  img->cp = yv12->color_primaries;
+  img->tc = yv12->transfer_characteristics;
+  img->mc = yv12->matrix_coefficients;
+  img->monochrome = yv12->monochrome;
+  img->csp = yv12->chroma_sample_position;
+  img->range = yv12->color_range;
+  img->bit_depth = 8;
+  img->w = yv12->y_width;
+  img->h = yv12->y_height;
+  img->d_w = yv12->y_crop_width;
+  img->d_h = yv12->y_crop_height;
+  img->r_w = yv12->render_width;
+  img->r_h = yv12->render_height;
+  img->x_chroma_shift = yv12->subsampling_x;
+  img->y_chroma_shift = yv12->subsampling_y;
+  img->planes[AOM_PLANE_Y] = yv12->y_buffer;
+  img->planes[AOM_PLANE_U] = yv12->u_buffer;
+  img->planes[AOM_PLANE_V] = yv12->v_buffer;
+  img->stride[AOM_PLANE_Y] = yv12->y_stride;
+  img->stride[AOM_PLANE_U] = yv12->uv_stride;
+  img->stride[AOM_PLANE_V] = yv12->uv_stride;
+  if (yv12->flags & YV12_FLAG_HIGHBITDEPTH) {
+    bps *= 2;
+    // aom_image_t uses byte strides and a pointer to the first byte
+    // of the image.
+    img->fmt = (aom_img_fmt_t)(img->fmt | AOM_IMG_FMT_HIGHBITDEPTH);
+    img->bit_depth = yv12->bit_depth;
+    img->planes[AOM_PLANE_Y] = (uint8_t *)CONVERT_TO_SHORTPTR(yv12->y_buffer);
+    img->planes[AOM_PLANE_U] = (uint8_t *)CONVERT_TO_SHORTPTR(yv12->u_buffer);
+    img->planes[AOM_PLANE_V] = (uint8_t *)CONVERT_TO_SHORTPTR(yv12->v_buffer);
+    img->stride[AOM_PLANE_Y] = 2 * yv12->y_stride;
+    img->stride[AOM_PLANE_U] = 2 * yv12->uv_stride;
+    img->stride[AOM_PLANE_V] = 2 * yv12->uv_stride;
+  }
+  img->bps = bps;
+  img->user_priv = user_priv;
+  img->img_data = yv12->buffer_alloc;
+  img->img_data_owner = 0;
+  img->self_allocd = 0;
+  img->sz = yv12->frame_size;
+  assert(!yv12->metadata);
+  img->metadata = NULL;
+}
+
+static aom_codec_err_t image2yuvconfig(const aom_image_t *img,
+                                       YV12_BUFFER_CONFIG *yv12) {
+  yv12->y_buffer = img->planes[AOM_PLANE_Y];
+  yv12->u_buffer = img->planes[AOM_PLANE_U];
+  yv12->v_buffer = img->planes[AOM_PLANE_V];
+
+  yv12->y_crop_width = img->d_w;
+  yv12->y_crop_height = img->d_h;
+  yv12->render_width = img->r_w;
+  yv12->render_height = img->r_h;
+  yv12->y_width = img->w;
+  yv12->y_height = img->h;
+
+  yv12->uv_width =
+      img->x_chroma_shift == 1 ? (1 + yv12->y_width) / 2 : yv12->y_width;
+  yv12->uv_height =
+      img->y_chroma_shift == 1 ? (1 + yv12->y_height) / 2 : yv12->y_height;
+  yv12->uv_crop_width = yv12->uv_width;
+  yv12->uv_crop_height = yv12->uv_height;
+
+  yv12->y_stride = img->stride[AOM_PLANE_Y];
+  yv12->uv_stride = img->stride[AOM_PLANE_U];
+  yv12->color_primaries = img->cp;
+  yv12->transfer_characteristics = img->tc;
+  yv12->matrix_coefficients = img->mc;
+  yv12->monochrome = img->monochrome;
+  yv12->chroma_sample_position = img->csp;
+  yv12->color_range = img->range;
+
+  if (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) {
+    // In aom_image_t
+    //     planes point to uint8 address of start of data
+    //     stride counts uint8s to reach next row
+    // In YV12_BUFFER_CONFIG
+    //     y_buffer, u_buffer, v_buffer point to uint16 address of data
+    //     stride and border counts in uint16s
+    // This means that all the address calculations in the main body of code
+    // should work correctly.
+    // However, before we do any pixel operations we need to cast the address
+    // to a uint16 ponter and double its value.
+    yv12->y_buffer = CONVERT_TO_BYTEPTR(yv12->y_buffer);
+    yv12->u_buffer = CONVERT_TO_BYTEPTR(yv12->u_buffer);
+    yv12->v_buffer = CONVERT_TO_BYTEPTR(yv12->v_buffer);
+    yv12->y_stride >>= 1;
+    yv12->uv_stride >>= 1;
+    yv12->flags = YV12_FLAG_HIGHBITDEPTH;
+  } else {
+    yv12->flags = 0;
+  }
+
+  // Note(yunqing): if img is allocated the same as the frame buffer, y_stride
+  // is 32-byte aligned. Also, handle the cases while allocating img without a
+  // border or stride_align is less than 32.
+  int border = (yv12->y_stride - (int)((img->w + 31) & ~31)) / 2;
+  yv12->border = (border < 0) ? 0 : border;
+  yv12->subsampling_x = img->x_chroma_shift;
+  yv12->subsampling_y = img->y_chroma_shift;
+  yv12->metadata = img->metadata;
+  return AOM_CODEC_OK;
+}
+
+#endif  // AOM_AV1_AV1_IFACE_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.c
new file mode 100644
index 0000000000..ecc4f6b281
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.c
@@ -0,0 +1,311 @@
+/*
+ *
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h"
+
+int av1_get_MBs(int width, int height) {
+  const int aligned_width = ALIGN_POWER_OF_TWO(width, 3);
+  const int aligned_height = ALIGN_POWER_OF_TWO(height, 3);
+  const int mi_cols = aligned_width >> MI_SIZE_LOG2;
+  const int mi_rows = aligned_height >> MI_SIZE_LOG2;
+
+  const int mb_cols = (mi_cols + 2) >> 2;
+  const int mb_rows = (mi_rows + 2) >> 2;
+  return mb_rows * mb_cols;
+}
+
+void av1_free_ref_frame_buffers(BufferPool *pool) {
+  int i;
+
+  for (i = 0; i < FRAME_BUFFERS; ++i) {
+    if (pool->frame_bufs[i].ref_count > 0 &&
+        pool->frame_bufs[i].raw_frame_buffer.data != NULL) {
+      pool->release_fb_cb(pool->cb_priv, &pool->frame_bufs[i].raw_frame_buffer);
+      pool->frame_bufs[i].raw_frame_buffer.data = NULL;
+      pool->frame_bufs[i].raw_frame_buffer.size = 0;
+      pool->frame_bufs[i].raw_frame_buffer.priv = NULL;
+      pool->frame_bufs[i].ref_count = 0;
+    }
+    aom_free(pool->frame_bufs[i].mvs);
+    pool->frame_bufs[i].mvs = NULL;
+    aom_free(pool->frame_bufs[i].seg_map);
+    pool->frame_bufs[i].seg_map = NULL;
+    aom_free_frame_buffer(&pool->frame_bufs[i].buf);
+  }
+}
+
+#if !CONFIG_REALTIME_ONLY
+// Assumes cm->rst_info[p].restoration_unit_size is already initialized
+void av1_alloc_restoration_buffers(AV1_COMMON *cm) {
+  const int num_planes = av1_num_planes(cm);
+  for (int p = 0; p < num_planes; ++p)
+    av1_alloc_restoration_struct(cm, &cm->rst_info[p], p > 0);
+
+  if (cm->rst_tmpbuf == NULL) {
+    CHECK_MEM_ERROR(cm, cm->rst_tmpbuf,
+                    (int32_t *)aom_memalign(16, RESTORATION_TMPBUF_SIZE));
+  }
+
+  if (cm->rlbs == NULL) {
+    CHECK_MEM_ERROR(cm, cm->rlbs, aom_malloc(sizeof(RestorationLineBuffers)));
+  }
+
+  // For striped loop restoration, we divide each row of tiles into "stripes",
+  // of height 64 luma pixels but with an offset by RESTORATION_UNIT_OFFSET
+  // luma pixels to match the output from CDEF. We will need to store 2 *
+  // RESTORATION_CTX_VERT lines of data for each stripe, and also need to be
+  // able to quickly answer the question "Where is the <n>'th stripe for tile
+  // row <m>?" To make that efficient, we generate the rst_last_stripe array.
+  int num_stripes = 0;
+  for (int i = 0; i < cm->tiles.rows; ++i) {
+    TileInfo tile_info;
+    av1_tile_set_row(&tile_info, cm, i);
+    const int mi_h = tile_info.mi_row_end - tile_info.mi_row_start;
+    const int ext_h = RESTORATION_UNIT_OFFSET + (mi_h << MI_SIZE_LOG2);
+    const int tile_stripes = (ext_h + 63) / 64;
+    num_stripes += tile_stripes;
+  }
+
+  // Now we need to allocate enough space to store the line buffers for the
+  // stripes
+  const int frame_w = cm->superres_upscaled_width;
+  const int use_highbd = cm->seq_params.use_highbitdepth;
+
+  for (int p = 0; p < num_planes; ++p) {
+    const int is_uv = p > 0;
+    const int ss_x = is_uv && cm->seq_params.subsampling_x;
+    const int plane_w = ((frame_w + ss_x) >> ss_x) + 2 * RESTORATION_EXTRA_HORZ;
+    const int stride = ALIGN_POWER_OF_TWO(plane_w, 5);
+    const int buf_size = num_stripes * stride * RESTORATION_CTX_VERT
+                         << use_highbd;
+    RestorationStripeBoundaries *boundaries = &cm->rst_info[p].boundaries;
+
+    if (buf_size != boundaries->stripe_boundary_size ||
+        boundaries->stripe_boundary_above == NULL ||
+        boundaries->stripe_boundary_below == NULL) {
+      aom_free(boundaries->stripe_boundary_above);
+      aom_free(boundaries->stripe_boundary_below);
+
+      CHECK_MEM_ERROR(cm, boundaries->stripe_boundary_above,
+                      (uint8_t *)aom_memalign(32, buf_size));
+      CHECK_MEM_ERROR(cm, boundaries->stripe_boundary_below,
+                      (uint8_t *)aom_memalign(32, buf_size));
+
+      boundaries->stripe_boundary_size = buf_size;
+    }
+    boundaries->stripe_boundary_stride = stride;
+  }
+}
+
+void av1_free_restoration_buffers(AV1_COMMON *cm) {
+  int p;
+  for (p = 0; p < MAX_MB_PLANE; ++p)
+    av1_free_restoration_struct(&cm->rst_info[p]);
+  aom_free(cm->rst_tmpbuf);
+  cm->rst_tmpbuf = NULL;
+  aom_free(cm->rlbs);
+  cm->rlbs = NULL;
+  for (p = 0; p < MAX_MB_PLANE; ++p) {
+    RestorationStripeBoundaries *boundaries = &cm->rst_info[p].boundaries;
+    aom_free(boundaries->stripe_boundary_above);
+    aom_free(boundaries->stripe_boundary_below);
+    boundaries->stripe_boundary_above = NULL;
+    boundaries->stripe_boundary_below = NULL;
+  }
+
+  aom_free_frame_buffer(&cm->rst_frame);
+}
+#endif  // !CONFIG_REALTIME_ONLY
+
+void av1_free_above_context_buffers(CommonContexts *above_contexts) {
+  int i;
+  const int num_planes = above_contexts->num_planes;
+
+  for (int tile_row = 0; tile_row < above_contexts->num_tile_rows; tile_row++) {
+    for (i = 0; i < num_planes; i++) {
+      aom_free(above_contexts->entropy[i][tile_row]);
+      above_contexts->entropy[i][tile_row] = NULL;
+    }
+    aom_free(above_contexts->partition[tile_row]);
+    above_contexts->partition[tile_row] = NULL;
+
+    aom_free(above_contexts->txfm[tile_row]);
+    above_contexts->txfm[tile_row] = NULL;
+  }
+  for (i = 0; i < num_planes; i++) {
+    aom_free(above_contexts->entropy[i]);
+    above_contexts->entropy[i] = NULL;
+  }
+  aom_free(above_contexts->partition);
+  above_contexts->partition = NULL;
+
+  aom_free(above_contexts->txfm);
+  above_contexts->txfm = NULL;
+
+  above_contexts->num_tile_rows = 0;
+  above_contexts->num_mi_cols = 0;
+  above_contexts->num_planes = 0;
+}
+
+void av1_free_context_buffers(AV1_COMMON *cm) {
+  cm->mi_params.free_mi(&cm->mi_params);
+
+  av1_free_above_context_buffers(&cm->above_contexts);
+
+#if CONFIG_LPF_MASK
+  av1_free_loop_filter_mask(cm);
+#endif
+}
+
+int av1_alloc_above_context_buffers(CommonContexts *above_contexts,
+                                    int num_tile_rows, int num_mi_cols,
+                                    int num_planes) {
+  const int aligned_mi_cols =
+      ALIGN_POWER_OF_TWO(num_mi_cols, MAX_MIB_SIZE_LOG2);
+
+  // Allocate above context buffers
+  above_contexts->num_tile_rows = num_tile_rows;
+  above_contexts->num_mi_cols = aligned_mi_cols;
+  above_contexts->num_planes = num_planes;
+  for (int plane_idx = 0; plane_idx < num_planes; plane_idx++) {
+    above_contexts->entropy[plane_idx] = (ENTROPY_CONTEXT **)aom_calloc(
+        num_tile_rows, sizeof(above_contexts->entropy[0]));
+    if (!above_contexts->entropy[plane_idx]) return 1;
+  }
+
+  above_contexts->partition = (PARTITION_CONTEXT **)aom_calloc(
+      num_tile_rows, sizeof(above_contexts->partition));
+  if (!above_contexts->partition) return 1;
+
+  above_contexts->txfm =
+      (TXFM_CONTEXT **)aom_calloc(num_tile_rows, sizeof(above_contexts->txfm));
+  if (!above_contexts->txfm) return 1;
+
+  for (int tile_row = 0; tile_row < num_tile_rows; tile_row++) {
+    for (int plane_idx = 0; plane_idx < num_planes; plane_idx++) {
+      above_contexts->entropy[plane_idx][tile_row] =
+          (ENTROPY_CONTEXT *)aom_calloc(
+              aligned_mi_cols, sizeof(*above_contexts->entropy[0][tile_row]));
+      if (!above_contexts->entropy[plane_idx][tile_row]) return 1;
+    }
+
+    above_contexts->partition[tile_row] = (PARTITION_CONTEXT *)aom_calloc(
+        aligned_mi_cols, sizeof(*above_contexts->partition[tile_row]));
+    if (!above_contexts->partition[tile_row]) return 1;
+
+    above_contexts->txfm[tile_row] = (TXFM_CONTEXT *)aom_calloc(
+        aligned_mi_cols, sizeof(*above_contexts->txfm[tile_row]));
+    if (!above_contexts->txfm[tile_row]) return 1;
+  }
+
+  return 0;
+}
+
+// Allocate the dynamically allocated arrays in 'mi_params' assuming
+// 'mi_params->set_mb_mi()' was already called earlier to initialize the rest of
+// the struct members.
+static int alloc_mi(CommonModeInfoParams *mi_params) {
+  const int aligned_mi_rows = calc_mi_size(mi_params->mi_rows);
+  const int mi_grid_size = mi_params->mi_stride * aligned_mi_rows;
+  const int alloc_size_1d = mi_size_wide[mi_params->mi_alloc_bsize];
+  const int alloc_mi_size =
+      mi_params->mi_alloc_stride * (aligned_mi_rows / alloc_size_1d);
+
+  if (mi_params->mi_alloc_size < alloc_mi_size ||
+      mi_params->mi_grid_size < mi_grid_size) {
+    mi_params->free_mi(mi_params);
+
+    mi_params->mi_alloc =
+        aom_calloc(alloc_mi_size, sizeof(*mi_params->mi_alloc));
+    if (!mi_params->mi_alloc) return 1;
+    mi_params->mi_alloc_size = alloc_mi_size;
+
+    mi_params->mi_grid_base = (MB_MODE_INFO **)aom_calloc(
+        mi_grid_size, sizeof(*mi_params->mi_grid_base));
+    if (!mi_params->mi_grid_base) return 1;
+    mi_params->mi_grid_size = mi_grid_size;
+
+    mi_params->tx_type_map =
+        aom_calloc(mi_grid_size, sizeof(*mi_params->tx_type_map));
+    if (!mi_params->tx_type_map) return 1;
+  }
+
+  return 0;
+}
+
+int av1_alloc_context_buffers(AV1_COMMON *cm, int width, int height) {
+  CommonModeInfoParams *const mi_params = &cm->mi_params;
+  mi_params->set_mb_mi(mi_params, width, height);
+  if (alloc_mi(mi_params)) goto fail;
+  return 0;
+
+fail:
+  // clear the mi_* values to force a realloc on resync
+  mi_params->set_mb_mi(mi_params, 0, 0);
+  av1_free_context_buffers(cm);
+  return 1;
+}
+
+void av1_remove_common(AV1_COMMON *cm) {
+  av1_free_context_buffers(cm);
+
+  aom_free(cm->fc);
+  cm->fc = NULL;
+  aom_free(cm->default_frame_context);
+  cm->default_frame_context = NULL;
+}
+
+void av1_init_mi_buffers(CommonModeInfoParams *mi_params) {
+  mi_params->setup_mi(mi_params);
+}
+
+#if CONFIG_LPF_MASK
+int av1_alloc_loop_filter_mask(AV1_COMMON *cm) {
+  aom_free(cm->lf.lfm);
+  cm->lf.lfm = NULL;
+
+  // Each lfm holds bit masks for all the 4x4 blocks in a max
+  // 64x64 (128x128 for ext_partitions) region.  The stride
+  // and rows are rounded up / truncated to a multiple of 16
+  // (32 for ext_partition).
+  cm->lf.lfm_stride =
+      (cm->mi_params.mi_cols + (MI_SIZE_64X64 - 1)) >> MIN_MIB_SIZE_LOG2;
+  cm->lf.lfm_num =
+      ((cm->mi_params.mi_rows + (MI_SIZE_64X64 - 1)) >> MIN_MIB_SIZE_LOG2) *
+      cm->lf.lfm_stride;
+  cm->lf.lfm =
+      (LoopFilterMask *)aom_calloc(cm->lf.lfm_num, sizeof(*cm->lf.lfm));
+  if (!cm->lf.lfm) return 1;
+
+  unsigned int i;
+  for (i = 0; i < cm->lf.lfm_num; ++i) av1_zero(cm->lf.lfm[i]);
+
+  return 0;
+}
+
+void av1_free_loop_filter_mask(AV1_COMMON *cm) {
+  if (cm->lf.lfm == NULL) return;
+
+  aom_free(cm->lf.lfm);
+  cm->lf.lfm = NULL;
+  cm->lf.lfm_num = 0;
+  cm->lf.lfm_stride = 0;
+}
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.h
new file mode 100644
index 0000000000..286332e868
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_ALLOCCOMMON_H_
+#define AOM_AV1_COMMON_ALLOCCOMMON_H_
+
+#define INVALID_IDX -1  // Invalid buffer index.
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct AV1Common;
+struct BufferPool;
+struct CommonContexts;
+struct CommonModeInfoParams;
+
+void av1_remove_common(struct AV1Common *cm);
+
+int av1_alloc_above_context_buffers(struct CommonContexts *above_contexts,
+                                    int num_tile_rows, int num_mi_cols,
+                                    int num_planes);
+void av1_free_above_context_buffers(struct CommonContexts *above_contexts);
+int av1_alloc_context_buffers(struct AV1Common *cm, int width, int height);
+void av1_init_mi_buffers(struct CommonModeInfoParams *mi_params);
+void av1_free_context_buffers(struct AV1Common *cm);
+
+void av1_free_ref_frame_buffers(struct BufferPool *pool);
+#if !CONFIG_REALTIME_ONLY
+void av1_alloc_restoration_buffers(struct AV1Common *cm);
+void av1_free_restoration_buffers(struct AV1Common *cm);
+#endif
+
+int av1_alloc_state_buffers(struct AV1Common *cm, int width, int height);
+void av1_free_state_buffers(struct AV1Common *cm);
+
+int av1_get_MBs(int width, int height);
+
+#if CONFIG_LPF_MASK
+int av1_alloc_loop_filter_mask(struct AV1Common *cm);
+void av1_free_loop_filter_mask(struct AV1Common *cm);
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_ALLOCCOMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h
new file mode 100644
index 0000000000..e526cef292
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h
@@ -0,0 +1,1874 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_AV1_COMMON_INT_H_
+#define AOM_AV1_COMMON_AV1_COMMON_INT_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mv.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/timing.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h"
+//#include "pxr/imaging/plugin/hioAvif/aom/av1/encoder/hash_motion.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_synthesis.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/grain_table.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__clang__) && defined(__has_warning)
+#if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
+#define AOM_FALLTHROUGH_INTENDED [[clang::fallthrough]]  // NOLINT
+#endif
+#elif defined(__GNUC__) && __GNUC__ >= 7
+#define AOM_FALLTHROUGH_INTENDED __attribute__((fallthrough))  // NOLINT
+#endif
+
+#ifndef AOM_FALLTHROUGH_INTENDED
+#define AOM_FALLTHROUGH_INTENDED \
+  do {                           \
+  } while (0)
+#endif
+
+#define CDEF_MAX_STRENGTHS 16
+
+/* Constant values while waiting for the sequence header */
+#define FRAME_ID_LENGTH 15
+#define DELTA_FRAME_ID_LENGTH 14
+
+#define FRAME_CONTEXTS (FRAME_BUFFERS + 1)
+// Extra frame context which is always kept at default values
+#define FRAME_CONTEXT_DEFAULTS (FRAME_CONTEXTS - 1)
+#define PRIMARY_REF_BITS 3
+#define PRIMARY_REF_NONE 7
+
+#define NUM_PING_PONG_BUFFERS 2
+
+#define MAX_NUM_TEMPORAL_LAYERS 8
+#define MAX_NUM_SPATIAL_LAYERS 4
+/* clang-format off */
+// clang-format seems to think this is a pointer dereference and not a
+// multiplication.
+#define MAX_NUM_OPERATING_POINTS \
+  (MAX_NUM_TEMPORAL_LAYERS * MAX_NUM_SPATIAL_LAYERS)
+/* clang-format on */
+
+// TODO(jingning): Turning this on to set up transform coefficient
+// processing timer.
+#define TXCOEFF_TIMER 0
+#define TXCOEFF_COST_TIMER 0
+
+/*!\cond */
+
+enum {
+  SINGLE_REFERENCE = 0,
+  COMPOUND_REFERENCE = 1,
+  REFERENCE_MODE_SELECT = 2,
+  REFERENCE_MODES = 3,
+} UENUM1BYTE(REFERENCE_MODE);
+
+enum {
+  /**
+   * Frame context updates are disabled
+   */
+  REFRESH_FRAME_CONTEXT_DISABLED,
+  /**
+   * Update frame context to values resulting from backward probability
+   * updates based on entropy/counts in the decoded frame
+   */
+  REFRESH_FRAME_CONTEXT_BACKWARD,
+} UENUM1BYTE(REFRESH_FRAME_CONTEXT_MODE);
+
+#define MFMV_STACK_SIZE 3
+typedef struct {
+  int_mv mfmv0;
+  uint8_t ref_frame_offset;
+} TPL_MV_REF;
+
+typedef struct {
+  int_mv mv;
+  MV_REFERENCE_FRAME ref_frame;
+} MV_REF;
+
+typedef struct RefCntBuffer {
+  // For a RefCntBuffer, the following are reference-holding variables:
+  // - cm->ref_frame_map[]
+  // - cm->cur_frame
+  // - cm->scaled_ref_buf[] (encoder only)
+  // - pbi->output_frame_index[] (decoder only)
+  // With that definition, 'ref_count' is the number of reference-holding
+  // variables that are currently referencing this buffer.
+  // For example:
+  // - suppose this buffer is at index 'k' in the buffer pool, and
+  // - Total 'n' of the variables / array elements above have value 'k' (that
+  // is, they are pointing to buffer at index 'k').
+  // Then, pool->frame_bufs[k].ref_count = n.
+  int ref_count;
+
+  unsigned int order_hint;
+  unsigned int ref_order_hints[INTER_REFS_PER_FRAME];
+
+  // These variables are used only in encoder and compare the absolute
+  // display order hint to compute the relative distance and overcome
+  // the limitation of get_relative_dist() which returns incorrect
+  // distance when a very old frame is used as a reference.
+  unsigned int display_order_hint;
+  unsigned int ref_display_order_hint[INTER_REFS_PER_FRAME];
+
+  MV_REF *mvs;
+  uint8_t *seg_map;
+  struct segmentation seg;
+  int mi_rows;
+  int mi_cols;
+  // Width and height give the size of the buffer (before any upscaling, unlike
+  // the sizes that can be derived from the buf structure)
+  int width;
+  int height;
+  WarpedMotionParams global_motion[REF_FRAMES];
+  int showable_frame;  // frame can be used as show existing frame in future
+  uint8_t film_grain_params_present;
+  aom_film_grain_t film_grain_params;
+  aom_codec_frame_buffer_t raw_frame_buffer;
+  YV12_BUFFER_CONFIG buf;
+  FRAME_TYPE frame_type;
+
+  // This is only used in the encoder but needs to be indexed per ref frame
+  // so it's extremely convenient to keep it here.
+  int interp_filter_selected[SWITCHABLE];
+
+  // Inter frame reference frame delta for loop filter
+  int8_t ref_deltas[REF_FRAMES];
+
+  // 0 = ZERO_MV, MV
+  int8_t mode_deltas[MAX_MODE_LF_DELTAS];
+
+  FRAME_CONTEXT frame_context;
+} RefCntBuffer;
+
+typedef struct BufferPool {
+// Protect BufferPool from being accessed by several FrameWorkers at
+// the same time during frame parallel decode.
+// TODO(hkuang): Try to use atomic variable instead of locking the whole pool.
+// TODO(wtc): Remove this. See
+// https://chromium-review.googlesource.com/c/webm/libvpx/+/560630.
+#if CONFIG_MULTITHREAD
+  pthread_mutex_t pool_mutex;
+#endif
+
+  // Private data associated with the frame buffer callbacks.
+  void *cb_priv;
+
+  aom_get_frame_buffer_cb_fn_t get_fb_cb;
+  aom_release_frame_buffer_cb_fn_t release_fb_cb;
+
+  RefCntBuffer frame_bufs[FRAME_BUFFERS];
+
+  // Frame buffers allocated internally by the codec.
+  InternalFrameBufferList int_frame_buffers;
+} BufferPool;
+
+/*!\endcond */
+
+/*!\brief Parameters related to CDEF */
+typedef struct {
+  int cdef_damping;                       /*!< CDEF damping factor */
+  int nb_cdef_strengths;                  /*!< Number of CDEF strength values */
+  int cdef_strengths[CDEF_MAX_STRENGTHS]; /*!< CDEF strength values for luma */
+  int cdef_uv_strengths[CDEF_MAX_STRENGTHS]; /*!< CDEF strength values for
+                                                chroma */
+  int cdef_bits; /*!< Number of CDEF strength values in bits */
+} CdefInfo;
+
+/*!\cond */
+
+typedef struct {
+  int delta_q_present_flag;
+  // Resolution of delta quant
+  int delta_q_res;
+  int delta_lf_present_flag;
+  // Resolution of delta lf level
+  int delta_lf_res;
+  // This is a flag for number of deltas of loop filter level
+  // 0: use 1 delta, for y_vertical, y_horizontal, u, and v
+  // 1: use separate deltas for each filter level
+  int delta_lf_multi;
+} DeltaQInfo;
+
+typedef struct {
+  int enable_order_hint;        // 0 - disable order hint, and related tools
+  int order_hint_bits_minus_1;  // dist_wtd_comp, ref_frame_mvs,
+                                // frame_sign_bias
+                                // if 0, enable_dist_wtd_comp and
+                                // enable_ref_frame_mvs must be set as 0.
+  int enable_dist_wtd_comp;     // 0 - disable dist-wtd compound modes
+                                // 1 - enable it
+  int enable_ref_frame_mvs;     // 0 - disable ref frame mvs
+                                // 1 - enable it
+} OrderHintInfo;
+
+// Sequence header structure.
+// Note: All syntax elements of sequence_header_obu that need to be
+// bit-identical across multiple sequence headers must be part of this struct,
+// so that consistency is checked by are_seq_headers_consistent() function.
+// One exception is the last member 'op_params' that is ignored by
+// are_seq_headers_consistent() function.
+typedef struct SequenceHeader {
+  int num_bits_width;
+  int num_bits_height;
+  int max_frame_width;
+  int max_frame_height;
+  // Whether current and reference frame IDs are signaled in the bitstream.
+  // Frame id numbers are additional information that do not affect the
+  // decoding process, but provide decoders with a way of detecting missing
+  // reference frames so that appropriate action can be taken.
+  uint8_t frame_id_numbers_present_flag;
+  int frame_id_length;
+  int delta_frame_id_length;
+  BLOCK_SIZE sb_size;  // Size of the superblock used for this frame
+  int mib_size;        // Size of the superblock in units of MI blocks
+  int mib_size_log2;   // Log 2 of above.
+
+  OrderHintInfo order_hint_info;
+
+  uint8_t force_screen_content_tools;  // 0 - force off
+                                       // 1 - force on
+                                       // 2 - adaptive
+  uint8_t still_picture;               // Video is a single frame still picture
+  uint8_t reduced_still_picture_hdr;   // Use reduced header for still picture
+  uint8_t force_integer_mv;            // 0 - Don't force. MV can use subpel
+                                       // 1 - force to integer
+                                       // 2 - adaptive
+  uint8_t enable_filter_intra;         // enables/disables filterintra
+  uint8_t enable_intra_edge_filter;    // enables/disables edge upsampling
+  uint8_t enable_interintra_compound;  // enables/disables interintra_compound
+  uint8_t enable_masked_compound;      // enables/disables masked compound
+  uint8_t enable_dual_filter;          // 0 - disable dual interpolation filter
+                                       // 1 - enable vert/horz filter selection
+  uint8_t enable_warped_motion;        // 0 - disable warp for the sequence
+                                       // 1 - enable warp for the sequence
+  uint8_t enable_superres;             // 0 - Disable superres for the sequence
+                                       //     and no frame level superres flag
+                                       // 1 - Enable superres for the sequence
+                                       //     enable per-frame superres flag
+  uint8_t enable_cdef;                 // To turn on/off CDEF
+  uint8_t enable_restoration;          // To turn on/off loop restoration
+  BITSTREAM_PROFILE profile;
+
+  // Color config.
+  aom_bit_depth_t bit_depth;  // AOM_BITS_8 in profile 0 or 1,
+                              // AOM_BITS_10 or AOM_BITS_12 in profile 2 or 3.
+  uint8_t use_highbitdepth;   // If true, we need to use 16bit frame buffers.
+  uint8_t monochrome;         // Monochorme video
+  aom_color_primaries_t color_primaries;
+  aom_transfer_characteristics_t transfer_characteristics;
+  aom_matrix_coefficients_t matrix_coefficients;
+  int color_range;
+  int subsampling_x;  // Chroma subsampling for x
+  int subsampling_y;  // Chroma subsampling for y
+  aom_chroma_sample_position_t chroma_sample_position;
+  uint8_t separate_uv_delta_q;
+  uint8_t film_grain_params_present;
+
+  // Operating point info.
+  int operating_points_cnt_minus_1;
+  int operating_point_idc[MAX_NUM_OPERATING_POINTS];
+  int timing_info_present;
+  aom_timing_info_t timing_info;
+  uint8_t decoder_model_info_present_flag;
+  aom_dec_model_info_t decoder_model_info;
+  uint8_t display_model_info_present_flag;
+  AV1_LEVEL seq_level_idx[MAX_NUM_OPERATING_POINTS];
+  uint8_t tier[MAX_NUM_OPERATING_POINTS];  // seq_tier in spec. One bit: 0 or 1.
+
+  // IMPORTANT: the op_params member must be at the end of the struct so that
+  // are_seq_headers_consistent() can be implemented with a memcmp() call.
+  // TODO(urvang): We probably don't need the +1 here.
+  aom_dec_model_op_parameters_t op_params[MAX_NUM_OPERATING_POINTS + 1];
+} SequenceHeader;
+
+typedef struct {
+  int skip_mode_allowed;
+  int skip_mode_flag;
+  int ref_frame_idx_0;
+  int ref_frame_idx_1;
+} SkipModeInfo;
+
+typedef struct {
+  FRAME_TYPE frame_type;
+  REFERENCE_MODE reference_mode;
+
+  unsigned int order_hint;
+  unsigned int display_order_hint;
+  unsigned int frame_number;
+  SkipModeInfo skip_mode_info;
+  int refresh_frame_flags;  // Which ref frames are overwritten by this frame
+  int frame_refs_short_signaling;
+} CurrentFrame;
+
+/*!\endcond */
+
+/*!
+ * \brief Frame level features.
+ */
+typedef struct {
+  /*!
+   * If true, CDF update in the symbol encoding/decoding process is disabled.
+   */
+  bool disable_cdf_update;
+  /*!
+   * If true, motion vectors are specified to eighth pel precision; and
+   * if false, motion vectors are specified to quarter pel precision.
+   */
+  bool allow_high_precision_mv;
+  /*!
+   * If true, force integer motion vectors; if false, use the default.
+   */
+  bool cur_frame_force_integer_mv;
+  /*!
+   * If true, palette tool and/or intra block copy tools may be used.
+   */
+  bool allow_screen_content_tools;
+  bool allow_intrabc;       /*!< If true, intra block copy tool may be used. */
+  bool allow_warped_motion; /*!< If true, frame may use warped motion mode. */
+  /*!
+   * If true, using previous frames' motion vectors for prediction is allowed.
+   */
+  bool allow_ref_frame_mvs;
+  /*!
+   * If true, frame is fully lossless at coded resolution.
+   * */
+  bool coded_lossless;
+  /*!
+   * If true, frame is fully lossless at upscaled resolution.
+   */
+  bool all_lossless;
+  /*!
+   * If true, the frame is restricted to a reduced subset of the full set of
+   * transform types.
+   */
+  bool reduced_tx_set_used;
+  /*!
+   * If true, error resilient mode is enabled.
+   * Note: Error resilient mode allows the syntax of a frame to be parsed
+   * independently of previously decoded frames.
+   */
+  bool error_resilient_mode;
+  /*!
+   * If false, only MOTION_MODE that may be used is SIMPLE_TRANSLATION;
+   * if true, all MOTION_MODES may be used.
+   */
+  bool switchable_motion_mode;
+  TX_MODE tx_mode;            /*!< Transform mode at frame level. */
+  InterpFilter interp_filter; /*!< Interpolation filter at frame level. */
+  /*!
+   * The reference frame that contains the CDF values and other state that
+   * should be loaded at the start of the frame.
+   */
+  int primary_ref_frame;
+  /*!
+   * Byte alignment of the planes in the reference buffers.
+   */
+  int byte_alignment;
+  /*!
+   * Flag signaling how frame contexts should be updated at the end of
+   * a frame decode.
+   */
+  REFRESH_FRAME_CONTEXT_MODE refresh_frame_context;
+} FeatureFlags;
+
+/*!
+ * \brief Params related to tiles.
+ */
+typedef struct CommonTileParams {
+  int cols;          /*!< number of tile columns that frame is divided into */
+  int rows;          /*!< number of tile rows that frame is divided into */
+  int max_width_sb;  /*!< maximum tile width in superblock units. */
+  int max_height_sb; /*!< maximum tile height in superblock units. */
+
+  /*!
+   * Min width of non-rightmost tile in MI units. Only valid if cols > 1.
+   */
+  int min_inner_width;
+
+  /*!
+   * If true, tiles are uniformly spaced with power-of-two number of rows and
+   * columns.
+   * If false, tiles have explicitly configured widths and heights.
+   */
+  int uniform_spacing;
+
+  /**
+   * \name Members only valid when uniform_spacing == 1
+   */
+  /**@{*/
+  int log2_cols; /*!< log2 of 'cols'. */
+  int log2_rows; /*!< log2 of 'rows'. */
+  int width;     /*!< tile width in MI units */
+  int height;    /*!< tile height in MI units */
+  /**@}*/
+
+  /*!
+   * Min num of tile columns possible based on 'max_width_sb' and frame width.
+   */
+  int min_log2_cols;
+  /*!
+   * Min num of tile rows possible based on 'max_height_sb' and frame height.
+   */
+  int min_log2_rows;
+  /*!
+   * Min num of tile columns possible based on frame width.
+   */
+  int max_log2_cols;
+  /*!
+   * Max num of tile columns possible based on frame width.
+   */
+  int max_log2_rows;
+  /*!
+   * log2 of min number of tiles (same as min_log2_cols + min_log2_rows).
+   */
+  int min_log2;
+  /*!
+   * col_start_sb[i] is the start position of tile column i in superblock units.
+   * valid for 0 <= i <= cols
+   */
+  int col_start_sb[MAX_TILE_COLS + 1];
+  /*!
+   * row_start_sb[i] is the start position of tile row i in superblock units.
+   * valid for 0 <= i <= rows
+   */
+  int row_start_sb[MAX_TILE_ROWS + 1];
+  /*!
+   * If true, we are using large scale tile mode.
+   */
+  unsigned int large_scale;
+  /*!
+   * Only relevant when large_scale == 1.
+   * If true, the independent decoding of a single tile or a section of a frame
+   * is allowed.
+   */
+  unsigned int single_tile_decoding;
+} CommonTileParams;
+
+typedef struct CommonModeInfoParams CommonModeInfoParams;
+/*!
+ * \brief Params related to MB_MODE_INFO arrays and related info.
+ */
+struct CommonModeInfoParams {
+  /*!
+   * Number of rows in the frame in 16 pixel units.
+   * This is computed from frame height aligned to a multiple of 8.
+   */
+  int mb_rows;
+  /*!
+   * Number of cols in the frame in 16 pixel units.
+   * This is computed from frame width aligned to a multiple of 8.
+   */
+  int mb_cols;
+
+  /*!
+   * Total MBs = mb_rows * mb_cols.
+   */
+  int MBs;
+
+  /*!
+   * Number of rows in the frame in 4 pixel (MB_MODE_INFO) units.
+   * This is computed from frame height aligned to a multiple of 8.
+   */
+  int mi_rows;
+  /*!
+   * Number of cols in the frame in 4 pixel (MB_MODE_INFO) units.
+   * This is computed from frame width aligned to a multiple of 8.
+   */
+  int mi_cols;
+
+  /*!
+   * An array of MB_MODE_INFO structs for every 'mi_alloc_bsize' sized block
+   * in the frame.
+   * Note: This array should be treated like a scratch memory, and should NOT be
+   * accessed directly, in most cases. Please use 'mi_grid_base' array instead.
+   */
+  MB_MODE_INFO *mi_alloc;
+  /*!
+   * Number of allocated elements in 'mi_alloc'.
+   */
+  int mi_alloc_size;
+  /*!
+   * Stride for 'mi_alloc' array.
+   */
+  int mi_alloc_stride;
+  /*!
+   * The minimum block size that each element in 'mi_alloc' can correspond to.
+   * For decoder, this is always BLOCK_4X4.
+   * For encoder, this is currently set to BLOCK_4X4 for resolution < 4k,
+   * and BLOCK_8X8 for resolution >= 4k.
+   */
+  BLOCK_SIZE mi_alloc_bsize;
+
+  /*!
+   * Grid of pointers to 4x4 MB_MODE_INFO structs allocated in 'mi_alloc'.
+   * It's possible that:
+   * - Multiple pointers in the grid point to the same element in 'mi_alloc'
+   * (for example, for all 4x4 blocks that belong to the same partition block).
+   * - Some pointers can be NULL (for example, for blocks outside visible area).
+   */
+  MB_MODE_INFO **mi_grid_base;
+  /*!
+   * Number of allocated elements in 'mi_grid_base' (and 'tx_type_map' also).
+   */
+  int mi_grid_size;
+  /*!
+   * Stride for 'mi_grid_base' (and 'tx_type_map' also).
+   */
+  int mi_stride;
+
+  /*!
+   * An array of tx types for each 4x4 block in the frame.
+   * Number of allocated elements is same as 'mi_grid_size', and stride is
+   * same as 'mi_grid_size'. So, indexing into 'tx_type_map' is same as that of
+   * 'mi_grid_base'.
+   */
+  TX_TYPE *tx_type_map;
+
+  /**
+   * \name Function pointers to allow separate logic for encoder and decoder.
+   */
+  /**@{*/
+  /*!
+   * Free the memory allocated to arrays in 'mi_params'.
+   * \param[in,out]   mi_params   object containing common mode info parameters
+   */
+  void (*free_mi)(struct CommonModeInfoParams *mi_params);
+  /*!
+   * Initialize / reset appropriate arrays in 'mi_params'.
+   * \param[in,out]   mi_params   object containing common mode info parameters
+   */
+  void (*setup_mi)(struct CommonModeInfoParams *mi_params);
+  /*!
+   * Allocate required memory for arrays in 'mi_params'.
+   * \param[in,out]   mi_params   object containing common mode info parameters
+   * \param           width       frame width
+   * \param           height      frame height
+   */
+  void (*set_mb_mi)(struct CommonModeInfoParams *mi_params, int width,
+                    int height);
+  /**@}*/
+};
+
+typedef struct CommonQuantParams CommonQuantParams;
+/*!
+ * \brief Parameters related to quantization at the frame level.
+ */
+struct CommonQuantParams {
+  /*!
+   * Base qindex of the frame in the range 0 to 255.
+   */
+  int base_qindex;
+
+  /*!
+   * Delta of qindex (from base_qindex) for Y plane DC coefficient.
+   * Note: y_ac_delta_q is implicitly 0.
+   */
+  int y_dc_delta_q;
+
+  /*!
+   * Delta of qindex (from base_qindex) for U plane DC coefficients.
+   */
+  int u_dc_delta_q;
+  /*!
+   * Delta of qindex (from base_qindex) for U plane AC coefficients.
+   */
+  int v_dc_delta_q;
+
+  /*!
+   * Delta of qindex (from base_qindex) for V plane DC coefficients.
+   * Same as those for U plane if cm->seq_params.separate_uv_delta_q == 0.
+   */
+  int u_ac_delta_q;
+  /*!
+   * Delta of qindex (from base_qindex) for V plane AC coefficients.
+   * Same as those for U plane if cm->seq_params.separate_uv_delta_q == 0.
+   */
+  int v_ac_delta_q;
+
+  /*
+   * Note: The qindex per superblock may have a delta from the qindex obtained
+   * at frame level from parameters above, based on 'cm->delta_q_info'.
+   */
+
+  /**
+   * \name True dequantizers.
+   * The dequantizers below are true dequantizers used only in the
+   * dequantization process.  They have the same coefficient
+   * shift/scale as TX.
+   */
+  /**@{*/
+  int16_t y_dequant_QTX[MAX_SEGMENTS][2]; /*!< Dequant for Y plane */
+  int16_t u_dequant_QTX[MAX_SEGMENTS][2]; /*!< Dequant for U plane */
+  int16_t v_dequant_QTX[MAX_SEGMENTS][2]; /*!< Dequant for V plane */
+  /**@}*/
+
+  /**
+   * \name Global quantization matrix tables.
+   */
+  /**@{*/
+  /*!
+   * Global dquantization matrix table.
+   */
+  const qm_val_t *giqmatrix[NUM_QM_LEVELS][3][TX_SIZES_ALL];
+  /*!
+   * Global quantization matrix table.
+   */
+  const qm_val_t *gqmatrix[NUM_QM_LEVELS][3][TX_SIZES_ALL];
+  /**@}*/
+
+  /**
+   * \name Local dequantization matrix tables for each frame.
+   */
+  /**@{*/
+  /*!
+   * Local dequant matrix for Y plane.
+   */
+  const qm_val_t *y_iqmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
+  /*!
+   * Local dequant matrix for U plane.
+   */
+  const qm_val_t *u_iqmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
+  /*!
+   * Local dequant matrix for V plane.
+   */
+  const qm_val_t *v_iqmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
+  /**@}*/
+
+  /*!
+   * Flag indicating whether quantization matrices are being used:
+   *  - If true, qm_level_y, qm_level_u and qm_level_v indicate the level
+   *    indices to be used to access appropriate global quant matrix tables.
+   *  - If false, we implicitly use level index 'NUM_QM_LEVELS - 1'.
+   */
+  bool using_qmatrix;
+  /**
+   * \name Valid only when using_qmatrix == true
+   * Indicate the level indices to be used to access appropriate global quant
+   * matrix tables.
+   */
+  /**@{*/
+  int qmatrix_level_y; /*!< Level index for Y plane */
+  int qmatrix_level_u; /*!< Level index for U plane */
+  int qmatrix_level_v; /*!< Level index for V plane */
+  /**@}*/
+};
+
+typedef struct CommonContexts CommonContexts;
+/*!
+ * \brief Contexts used for transmitting various symbols in the bitstream.
+ */
+struct CommonContexts {
+  /*!
+   * Context used by 'FRAME_CONTEXT.partition_cdf' to transmit partition type.
+   * partition[i][j] is the context for ith tile row, jth mi_col.
+   */
+  PARTITION_CONTEXT **partition;
+
+  /*!
+   * Context used to derive context for multiple symbols:
+   * - 'TXB_CTX.txb_skip_ctx' used by 'FRAME_CONTEXT.txb_skip_cdf' to transmit
+   * to transmit skip_txfm flag.
+   * - 'TXB_CTX.dc_sign_ctx' used by 'FRAME_CONTEXT.dc_sign_cdf' to transmit
+   * sign.
+   * entropy[i][j][k] is the context for ith plane, jth tile row, kth mi_col.
+   */
+  ENTROPY_CONTEXT **entropy[MAX_MB_PLANE];
+
+  /*!
+   * Context used to derive context for 'FRAME_CONTEXT.txfm_partition_cdf' to
+   * transmit 'is_split' flag to indicate if this transform block should be
+   * split into smaller sub-blocks.
+   * txfm[i][j] is the context for ith tile row, jth mi_col.
+   */
+  TXFM_CONTEXT **txfm;
+
+  /*!
+   * Dimensions that were used to allocate the arrays above.
+   * If these dimensions change, the arrays may have to be re-allocated.
+   */
+  int num_planes;    /*!< Corresponds to av1_num_planes(cm) */
+  int num_tile_rows; /*!< Corresponds to cm->tiles.row */
+  int num_mi_cols;   /*!< Corresponds to cm->mi_params.mi_cols */
+};
+
+/*!
+ * \brief Top level common structure used by both encoder and decoder.
+ */
+typedef struct AV1Common {
+  /*!
+   * Information about the current frame that is being coded.
+   */
+  CurrentFrame current_frame;
+  /*!
+   * Code and details about current error status.
+   */
+  struct aom_internal_error_info error;
+
+  /*!
+   * AV1 allows two types of frame scaling operations:
+   * 1. Frame super-resolution: that allows coding a frame at lower resolution
+   * and after decoding the frame, normatively uscales and restores the frame --
+   * inside the coding loop.
+   * 2. Frame resize: that allows coding frame at lower/higher resolution, and
+   * then non-normatively upscale the frame at the time of rendering -- outside
+   * the coding loop.
+   * Hence, the need for 3 types of dimensions.
+   */
+
+  /**
+   * \name Coded frame dimensions.
+   */
+  /**@{*/
+  int width;  /*!< Coded frame width */
+  int height; /*!< Coded frame height */
+  /**@}*/
+
+  /**
+   * \name Rendered frame dimensions.
+   * Dimensions after applying both super-resolution and resize to the coded
+   * frame. Different from coded dimensions if super-resolution and/or resize
+   * are being used for this frame.
+   */
+  /**@{*/
+  int render_width;  /*!< Rendered frame width */
+  int render_height; /*!< Rendered frame height */
+  /**@}*/
+
+  /**
+   * \name Super-resolved frame dimensions.
+   * Frame dimensions after applying super-resolution to the coded frame (if
+   * present), but before applying resize.
+   * Larger than the coded dimensions if super-resolution is being used for
+   * this frame.
+   * Different from rendered dimensions if resize is being used for this frame.
+   */
+  /**@{*/
+  int superres_upscaled_width;  /*!< Super-resolved frame width */
+  int superres_upscaled_height; /*!< Super-resolved frame height */
+  /**@}*/
+
+  /*!
+   * The denominator of the superres scale used by this frame.
+   * Note: The numerator is fixed to be SCALE_NUMERATOR.
+   */
+  uint8_t superres_scale_denominator;
+
+  /*!
+   * If true, buffer removal times are present.
+   */
+  bool buffer_removal_time_present;
+  /*!
+   * buffer_removal_times[op_num] specifies the frame removal time in units of
+   * DecCT clock ticks counted from the removal time of the last random access
+   * point for operating point op_num.
+   * TODO(urvang): We probably don't need the +1 here.
+   */
+  uint32_t buffer_removal_times[MAX_NUM_OPERATING_POINTS + 1];
+  /*!
+   * Presentation time of the frame in clock ticks DispCT counted from the
+   * removal time of the last random access point for the operating point that
+   * is being decoded.
+   */
+  uint32_t frame_presentation_time;
+
+  /*!
+   * Buffer where previous frame is stored.
+   */
+  RefCntBuffer *prev_frame;
+
+  /*!
+   * Buffer into which the current frame will be stored and other related info.
+   * TODO(hkuang): Combine this with cur_buf in macroblockd.
+   */
+  RefCntBuffer *cur_frame;
+
+  /*!
+   * For encoder, we have a two-level mapping from reference frame type to the
+   * corresponding buffer in the buffer pool:
+   * * 'remapped_ref_idx[i - 1]' maps reference type 'i' (range: LAST_FRAME ...
+   * EXTREF_FRAME) to a remapped index 'j' (in range: 0 ... REF_FRAMES - 1)
+   * * Later, 'cm->ref_frame_map[j]' maps the remapped index 'j' to a pointer to
+   * the reference counted buffer structure RefCntBuffer, taken from the buffer
+   * pool cm->buffer_pool->frame_bufs.
+   *
+   * LAST_FRAME,                        ...,      EXTREF_FRAME
+   *      |                                           |
+   *      v                                           v
+   * remapped_ref_idx[LAST_FRAME - 1],  ...,  remapped_ref_idx[EXTREF_FRAME - 1]
+   *      |                                           |
+   *      v                                           v
+   * ref_frame_map[],                   ...,     ref_frame_map[]
+   *
+   * Note: INTRA_FRAME always refers to the current frame, so there's no need to
+   * have a remapped index for the same.
+   */
+  int remapped_ref_idx[REF_FRAMES];
+
+  /*!
+   * Scale of the current frame with respect to itself.
+   * This is currently used for intra block copy, which behaves like an inter
+   * prediction mode, where the reference frame is the current frame itself.
+   */
+  struct scale_factors sf_identity;
+
+  /*!
+   * Scale factors of the reference frame with respect to the current frame.
+   * This is required for generating inter prediction and will be non-identity
+   * for a reference frame, if it has different dimensions than the coded
+   * dimensions of the current frame.
+   */
+  struct scale_factors ref_scale_factors[REF_FRAMES];
+
+  /*!
+   * For decoder, ref_frame_map[i] maps reference type 'i' to a pointer to
+   * the buffer in the buffer pool 'cm->buffer_pool.frame_bufs'.
+   * For encoder, ref_frame_map[j] (where j = remapped_ref_idx[i]) maps
+   * remapped reference index 'j' (that is, original reference type 'i') to
+   * a pointer to the buffer in the buffer pool 'cm->buffer_pool.frame_bufs'.
+   */
+  RefCntBuffer *ref_frame_map[REF_FRAMES];
+
+  /*!
+   * If true, this frame is actually shown after decoding.
+   * If false, this frame is coded in the bitstream, but not shown. It is only
+   * used as a reference for other frames coded later.
+   */
+  int show_frame;
+
+  /*!
+   * If true, this frame can be used as a show-existing frame for other frames
+   * coded later.
+   * When 'show_frame' is true, this is always true for all non-keyframes.
+   * When 'show_frame' is false, this value is transmitted in the bitstream.
+   */
+  int showable_frame;
+
+  /*!
+   * If true, show an existing frame coded before, instead of actually coding a
+   * frame. The existing frame comes from one of the existing reference buffers,
+   * as signaled in the bitstream.
+   */
+  int show_existing_frame;
+
+  /*!
+   * Whether some features are allowed or not.
+   */
+  FeatureFlags features;
+
+  /*!
+   * Params related to MB_MODE_INFO arrays and related info.
+   */
+  CommonModeInfoParams mi_params;
+
+#if CONFIG_ENTROPY_STATS
+  /*!
+   * Context type used by token CDFs, in the range 0 .. (TOKEN_CDF_Q_CTXS - 1).
+   */
+  int coef_cdf_category;
+#endif  // CONFIG_ENTROPY_STATS
+
+  /*!
+   * Quantization params.
+   */
+  CommonQuantParams quant_params;
+
+  /*!
+   * Segmentation info for current frame.
+   */
+  struct segmentation seg;
+
+  /*!
+   * Segmentation map for previous frame.
+   */
+  uint8_t *last_frame_seg_map;
+
+  /**
+   * \name Deblocking filter parameters.
+   */
+  /**@{*/
+  loop_filter_info_n lf_info; /*!< Loop filter info */
+  struct loopfilter lf;       /*!< Loop filter parameters */
+  /**@}*/
+
+  /**
+   * \name Loop Restoration filter parameters.
+   */
+  /**@{*/
+  RestorationInfo rst_info[MAX_MB_PLANE]; /*!< Loop Restoration filter info */
+  int32_t *rst_tmpbuf; /*!< Scratch buffer for self-guided restoration */
+  RestorationLineBuffers *rlbs; /*!< Line buffers needed by loop restoration */
+  YV12_BUFFER_CONFIG rst_frame; /*!< Stores the output of loop restoration */
+  /**@}*/
+
+  /*!
+   * CDEF (Constrained Directional Enhancement Filter) parameters.
+   */
+  CdefInfo cdef_info;
+
+  /*!
+   * Parameters for film grain synthesis.
+   */
+  aom_film_grain_t film_grain_params;
+
+  /*!
+   * Parameters for delta quantization and delta loop filter level.
+   */
+  DeltaQInfo delta_q_info;
+
+  /*!
+   * Global motion parameters for each reference frame.
+   */
+  WarpedMotionParams global_motion[REF_FRAMES];
+
+  /*!
+   * Elements part of the sequence header, that are applicable for all the
+   * frames in the video.
+   */
+  SequenceHeader seq_params;
+
+  /*!
+   * Current CDFs of all the symbols for the current frame.
+   */
+  FRAME_CONTEXT *fc;
+  /*!
+   * Default CDFs used when features.primary_ref_frame = PRIMARY_REF_NONE
+   * (e.g. for a keyframe). These default CDFs are defined by the bitstream and
+   * copied from default CDF tables for each symbol.
+   */
+  FRAME_CONTEXT *default_frame_context;
+
+  /*!
+   * Parameters related to tiling.
+   */
+  CommonTileParams tiles;
+
+  /*!
+   * External BufferPool passed from outside.
+   */
+  BufferPool *buffer_pool;
+
+  /*!
+   * Above context buffers and their sizes.
+   * Note: above contexts are allocated in this struct, as their size is
+   * dependent on frame width, while left contexts are declared and allocated in
+   * MACROBLOCKD struct, as they have a fixed size.
+   */
+  CommonContexts above_contexts;
+
+  /**
+   * \name Signaled when cm->seq_params.frame_id_numbers_present_flag == 1
+   */
+  /**@{*/
+  int current_frame_id;         /*!< frame ID for the current frame. */
+  int ref_frame_id[REF_FRAMES]; /*!< frame IDs for the reference frames. */
+  /**@}*/
+
+  /*!
+   * Motion vectors provided by motion field estimation.
+   * tpl_mvs[row * stride + col] stores MV for block at [mi_row, mi_col] where:
+   * mi_row = 2 * row,
+   * mi_col = 2 * col, and
+   * stride = cm->mi_params.mi_stride / 2
+   */
+  TPL_MV_REF *tpl_mvs;
+  /*!
+   * Allocated size of 'tpl_mvs' array. Refer to 'ensure_mv_buffer()' function.
+   */
+  int tpl_mvs_mem_size;
+  /*!
+   * ref_frame_sign_bias[k] is 1 if relative distance between reference 'k' and
+   * current frame is positive; and 0 otherwise.
+   */
+  int ref_frame_sign_bias[REF_FRAMES];
+  /*!
+   * ref_frame_side[k] is 1 if relative distance between reference 'k' and
+   * current frame is positive, -1 if relative distance is 0; and 0 otherwise.
+   * TODO(jingning): This can be combined with sign_bias later.
+   */
+  int8_t ref_frame_side[REF_FRAMES];
+
+  /*!
+   * Number of temporal layers: may be > 1 for SVC (scalable vector coding).
+   */
+  unsigned int number_temporal_layers;
+  /*!
+   * Temporal layer ID of this frame
+   * (in the range 0 ... (number_temporal_layers - 1)).
+   */
+  int temporal_layer_id;
+
+  /*!
+   * Number of spatial layers: may be > 1 for SVC (scalable vector coding).
+   */
+  unsigned int number_spatial_layers;
+  /*!
+   * Spatial layer ID of this frame
+   * (in the range 0 ... (number_spatial_layers - 1)).
+   */
+  int spatial_layer_id;
+
+#if TXCOEFF_TIMER
+  int64_t cum_txcoeff_timer;
+  int64_t txcoeff_timer;
+  int txb_count;
+#endif  // TXCOEFF_TIMER
+
+#if TXCOEFF_COST_TIMER
+  int64_t cum_txcoeff_cost_timer;
+  int64_t txcoeff_cost_timer;
+  int64_t txcoeff_cost_count;
+#endif  // TXCOEFF_COST_TIMER
+
+#if CONFIG_LPF_MASK
+  int is_decoding;
+#endif  // CONFIG_LPF_MASK
+} AV1_COMMON;
+
+/*!\cond */
+
+// TODO(hkuang): Don't need to lock the whole pool after implementing atomic
+// frame reference count.
+static void lock_buffer_pool(BufferPool *const pool) {
+#if CONFIG_MULTITHREAD
+  pthread_mutex_lock(&pool->pool_mutex);
+#else
+  (void)pool;
+#endif
+}
+
+static void unlock_buffer_pool(BufferPool *const pool) {
+#if CONFIG_MULTITHREAD
+  pthread_mutex_unlock(&pool->pool_mutex);
+#else
+  (void)pool;
+#endif
+}
+
+static INLINE YV12_BUFFER_CONFIG *get_ref_frame(AV1_COMMON *cm, int index) {
+  if (index < 0 || index >= REF_FRAMES) return NULL;
+  if (cm->ref_frame_map[index] == NULL) return NULL;
+  return &cm->ref_frame_map[index]->buf;
+}
+
+static INLINE int get_free_fb(AV1_COMMON *cm) {
+  RefCntBuffer *const frame_bufs = cm->buffer_pool->frame_bufs;
+  int i;
+
+  lock_buffer_pool(cm->buffer_pool);
+  for (i = 0; i < FRAME_BUFFERS; ++i)
+    if (frame_bufs[i].ref_count == 0) break;
+
+  if (i != FRAME_BUFFERS) {
+    if (frame_bufs[i].buf.use_external_reference_buffers) {
+      // If this frame buffer's y_buffer, u_buffer, and v_buffer point to the
+      // external reference buffers. Restore the buffer pointers to point to the
+      // internally allocated memory.
+      YV12_BUFFER_CONFIG *ybf = &frame_bufs[i].buf;
+      ybf->y_buffer = ybf->store_buf_adr[0];
+      ybf->u_buffer = ybf->store_buf_adr[1];
+      ybf->v_buffer = ybf->store_buf_adr[2];
+      ybf->use_external_reference_buffers = 0;
+    }
+
+    frame_bufs[i].ref_count = 1;
+  } else {
+    // We should never run out of free buffers. If this assertion fails, there
+    // is a reference leak.
+    assert(0 && "Ran out of free frame buffers. Likely a reference leak.");
+    // Reset i to be INVALID_IDX to indicate no free buffer found.
+    i = INVALID_IDX;
+  }
+
+  unlock_buffer_pool(cm->buffer_pool);
+  return i;
+}
+
+static INLINE RefCntBuffer *assign_cur_frame_new_fb(AV1_COMMON *const cm) {
+  // Release the previously-used frame-buffer
+  if (cm->cur_frame != NULL) {
+    --cm->cur_frame->ref_count;
+    cm->cur_frame = NULL;
+  }
+
+  // Assign a new framebuffer
+  const int new_fb_idx = get_free_fb(cm);
+  if (new_fb_idx == INVALID_IDX) return NULL;
+
+  cm->cur_frame = &cm->buffer_pool->frame_bufs[new_fb_idx];
+  cm->cur_frame->buf.buf_8bit_valid = 0;
+  av1_zero(cm->cur_frame->interp_filter_selected);
+  return cm->cur_frame;
+}
+
+// Modify 'lhs_ptr' to reference the buffer at 'rhs_ptr', and update the ref
+// counts accordingly.
+static INLINE void assign_frame_buffer_p(RefCntBuffer **lhs_ptr,
+                                         RefCntBuffer *rhs_ptr) {
+  RefCntBuffer *const old_ptr = *lhs_ptr;
+  if (old_ptr != NULL) {
+    assert(old_ptr->ref_count > 0);
+    // One less reference to the buffer at 'old_ptr', so decrease ref count.
+    --old_ptr->ref_count;
+  }
+
+  *lhs_ptr = rhs_ptr;
+  // One more reference to the buffer at 'rhs_ptr', so increase ref count.
+  ++rhs_ptr->ref_count;
+}
+
+static INLINE int frame_is_intra_only(const AV1_COMMON *const cm) {
+  return cm->current_frame.frame_type == KEY_FRAME ||
+         cm->current_frame.frame_type == INTRA_ONLY_FRAME;
+}
+
+static INLINE int frame_is_sframe(const AV1_COMMON *cm) {
+  return cm->current_frame.frame_type == S_FRAME;
+}
+
+// These functions take a reference frame label between LAST_FRAME and
+// EXTREF_FRAME inclusive.  Note that this is different to the indexing
+// previously used by the frame_refs[] array.
+static INLINE int get_ref_frame_map_idx(const AV1_COMMON *const cm,
+                                        const MV_REFERENCE_FRAME ref_frame) {
+  return (ref_frame >= LAST_FRAME && ref_frame <= EXTREF_FRAME)
+             ? cm->remapped_ref_idx[ref_frame - LAST_FRAME]
+             : INVALID_IDX;
+}
+
+static INLINE RefCntBuffer *get_ref_frame_buf(
+    const AV1_COMMON *const cm, const MV_REFERENCE_FRAME ref_frame) {
+  const int map_idx = get_ref_frame_map_idx(cm, ref_frame);
+  return (map_idx != INVALID_IDX) ? cm->ref_frame_map[map_idx] : NULL;
+}
+
+// Both const and non-const versions of this function are provided so that it
+// can be used with a const AV1_COMMON if needed.
+static INLINE const struct scale_factors *get_ref_scale_factors_const(
+    const AV1_COMMON *const cm, const MV_REFERENCE_FRAME ref_frame) {
+  const int map_idx = get_ref_frame_map_idx(cm, ref_frame);
+  return (map_idx != INVALID_IDX) ? &cm->ref_scale_factors[map_idx] : NULL;
+}
+
+static INLINE struct scale_factors *get_ref_scale_factors(
+    AV1_COMMON *const cm, const MV_REFERENCE_FRAME ref_frame) {
+  const int map_idx = get_ref_frame_map_idx(cm, ref_frame);
+  return (map_idx != INVALID_IDX) ? &cm->ref_scale_factors[map_idx] : NULL;
+}
+
+static INLINE RefCntBuffer *get_primary_ref_frame_buf(
+    const AV1_COMMON *const cm) {
+  const int primary_ref_frame = cm->features.primary_ref_frame;
+  if (primary_ref_frame == PRIMARY_REF_NONE) return NULL;
+  const int map_idx = get_ref_frame_map_idx(cm, primary_ref_frame + 1);
+  return (map_idx != INVALID_IDX) ? cm->ref_frame_map[map_idx] : NULL;
+}
+
+// Returns 1 if this frame might allow mvs from some reference frame.
+static INLINE int frame_might_allow_ref_frame_mvs(const AV1_COMMON *cm) {
+  return !cm->features.error_resilient_mode &&
+         cm->seq_params.order_hint_info.enable_ref_frame_mvs &&
+         cm->seq_params.order_hint_info.enable_order_hint &&
+         !frame_is_intra_only(cm);
+}
+
+// Returns 1 if this frame might use warped_motion
+static INLINE int frame_might_allow_warped_motion(const AV1_COMMON *cm) {
+  return !cm->features.error_resilient_mode && !frame_is_intra_only(cm) &&
+         cm->seq_params.enable_warped_motion;
+}
+
+static INLINE void ensure_mv_buffer(RefCntBuffer *buf, AV1_COMMON *cm) {
+  const int buf_rows = buf->mi_rows;
+  const int buf_cols = buf->mi_cols;
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+
+  if (buf->mvs == NULL || buf_rows != mi_params->mi_rows ||
+      buf_cols != mi_params->mi_cols) {
+    aom_free(buf->mvs);
+    buf->mi_rows = mi_params->mi_rows;
+    buf->mi_cols = mi_params->mi_cols;
+    CHECK_MEM_ERROR(cm, buf->mvs,
+                    (MV_REF *)aom_calloc(((mi_params->mi_rows + 1) >> 1) *
+                                             ((mi_params->mi_cols + 1) >> 1),
+                                         sizeof(*buf->mvs)));
+    aom_free(buf->seg_map);
+    CHECK_MEM_ERROR(
+        cm, buf->seg_map,
+        (uint8_t *)aom_calloc(mi_params->mi_rows * mi_params->mi_cols,
+                              sizeof(*buf->seg_map)));
+  }
+
+  const int mem_size =
+      ((mi_params->mi_rows + MAX_MIB_SIZE) >> 1) * (mi_params->mi_stride >> 1);
+  int realloc = cm->tpl_mvs == NULL;
+  if (cm->tpl_mvs) realloc |= cm->tpl_mvs_mem_size < mem_size;
+
+  if (realloc) {
+    aom_free(cm->tpl_mvs);
+    CHECK_MEM_ERROR(cm, cm->tpl_mvs,
+                    (TPL_MV_REF *)aom_calloc(mem_size, sizeof(*cm->tpl_mvs)));
+    cm->tpl_mvs_mem_size = mem_size;
+  }
+}
+
+void cfl_init(CFL_CTX *cfl, const SequenceHeader *seq_params);
+
+static INLINE int av1_num_planes(const AV1_COMMON *cm) {
+  return cm->seq_params.monochrome ? 1 : MAX_MB_PLANE;
+}
+
+static INLINE void av1_init_above_context(CommonContexts *above_contexts,
+                                          int num_planes, int tile_row,
+                                          MACROBLOCKD *xd) {
+  for (int i = 0; i < num_planes; ++i) {
+    xd->above_entropy_context[i] = above_contexts->entropy[i][tile_row];
+  }
+  xd->above_partition_context = above_contexts->partition[tile_row];
+  xd->above_txfm_context = above_contexts->txfm[tile_row];
+}
+
+static INLINE void av1_init_macroblockd(AV1_COMMON *cm, MACROBLOCKD *xd) {
+  const int num_planes = av1_num_planes(cm);
+  const CommonQuantParams *const quant_params = &cm->quant_params;
+
+  for (int i = 0; i < num_planes; ++i) {
+    if (xd->plane[i].plane_type == PLANE_TYPE_Y) {
+      memcpy(xd->plane[i].seg_dequant_QTX, quant_params->y_dequant_QTX,
+             sizeof(quant_params->y_dequant_QTX));
+      memcpy(xd->plane[i].seg_iqmatrix, quant_params->y_iqmatrix,
+             sizeof(quant_params->y_iqmatrix));
+
+    } else {
+      if (i == AOM_PLANE_U) {
+        memcpy(xd->plane[i].seg_dequant_QTX, quant_params->u_dequant_QTX,
+               sizeof(quant_params->u_dequant_QTX));
+        memcpy(xd->plane[i].seg_iqmatrix, quant_params->u_iqmatrix,
+               sizeof(quant_params->u_iqmatrix));
+      } else {
+        memcpy(xd->plane[i].seg_dequant_QTX, quant_params->v_dequant_QTX,
+               sizeof(quant_params->v_dequant_QTX));
+        memcpy(xd->plane[i].seg_iqmatrix, quant_params->v_iqmatrix,
+               sizeof(quant_params->v_iqmatrix));
+      }
+    }
+  }
+  xd->mi_stride = cm->mi_params.mi_stride;
+  xd->error_info = &cm->error;
+  cfl_init(&xd->cfl, &cm->seq_params);
+}
+
+static INLINE void set_entropy_context(MACROBLOCKD *xd, int mi_row, int mi_col,
+                                       const int num_planes) {
+  int i;
+  int row_offset = mi_row;
+  int col_offset = mi_col;
+  for (i = 0; i < num_planes; ++i) {
+    struct macroblockd_plane *const pd = &xd->plane[i];
+    // Offset the buffer pointer
+    const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+    if (pd->subsampling_y && (mi_row & 0x01) && (mi_size_high[bsize] == 1))
+      row_offset = mi_row - 1;
+    if (pd->subsampling_x && (mi_col & 0x01) && (mi_size_wide[bsize] == 1))
+      col_offset = mi_col - 1;
+    int above_idx = col_offset;
+    int left_idx = row_offset & MAX_MIB_MASK;
+    pd->above_entropy_context =
+        &xd->above_entropy_context[i][above_idx >> pd->subsampling_x];
+    pd->left_entropy_context =
+        &xd->left_entropy_context[i][left_idx >> pd->subsampling_y];
+  }
+}
+
+static INLINE int calc_mi_size(int len) {
+  // len is in mi units. Align to a multiple of SBs.
+  return ALIGN_POWER_OF_TWO(len, MAX_MIB_SIZE_LOG2);
+}
+
+static INLINE void set_plane_n4(MACROBLOCKD *const xd, int bw, int bh,
+                                const int num_planes) {
+  int i;
+  for (i = 0; i < num_planes; i++) {
+    xd->plane[i].width = (bw * MI_SIZE) >> xd->plane[i].subsampling_x;
+    xd->plane[i].height = (bh * MI_SIZE) >> xd->plane[i].subsampling_y;
+
+    xd->plane[i].width = AOMMAX(xd->plane[i].width, 4);
+    xd->plane[i].height = AOMMAX(xd->plane[i].height, 4);
+  }
+}
+
+static INLINE void set_mi_row_col(MACROBLOCKD *xd, const TileInfo *const tile,
+                                  int mi_row, int bh, int mi_col, int bw,
+                                  int mi_rows, int mi_cols) {
+  xd->mb_to_top_edge = -GET_MV_SUBPEL(mi_row * MI_SIZE);
+  xd->mb_to_bottom_edge = GET_MV_SUBPEL((mi_rows - bh - mi_row) * MI_SIZE);
+  xd->mb_to_left_edge = -GET_MV_SUBPEL((mi_col * MI_SIZE));
+  xd->mb_to_right_edge = GET_MV_SUBPEL((mi_cols - bw - mi_col) * MI_SIZE);
+
+  xd->mi_row = mi_row;
+  xd->mi_col = mi_col;
+
+  // Are edges available for intra prediction?
+  xd->up_available = (mi_row > tile->mi_row_start);
+
+  const int ss_x = xd->plane[1].subsampling_x;
+  const int ss_y = xd->plane[1].subsampling_y;
+
+  xd->left_available = (mi_col > tile->mi_col_start);
+  xd->chroma_up_available = xd->up_available;
+  xd->chroma_left_available = xd->left_available;
+  if (ss_x && bw < mi_size_wide[BLOCK_8X8])
+    xd->chroma_left_available = (mi_col - 1) > tile->mi_col_start;
+  if (ss_y && bh < mi_size_high[BLOCK_8X8])
+    xd->chroma_up_available = (mi_row - 1) > tile->mi_row_start;
+  if (xd->up_available) {
+    xd->above_mbmi = xd->mi[-xd->mi_stride];
+  } else {
+    xd->above_mbmi = NULL;
+  }
+
+  if (xd->left_available) {
+    xd->left_mbmi = xd->mi[-1];
+  } else {
+    xd->left_mbmi = NULL;
+  }
+
+  const int chroma_ref = ((mi_row & 0x01) || !(bh & 0x01) || !ss_y) &&
+                         ((mi_col & 0x01) || !(bw & 0x01) || !ss_x);
+  xd->is_chroma_ref = chroma_ref;
+  if (chroma_ref) {
+    // To help calculate the "above" and "left" chroma blocks, note that the
+    // current block may cover multiple luma blocks (eg, if partitioned into
+    // 4x4 luma blocks).
+    // First, find the top-left-most luma block covered by this chroma block
+    MB_MODE_INFO **base_mi =
+        &xd->mi[-(mi_row & ss_y) * xd->mi_stride - (mi_col & ss_x)];
+
+    // Then, we consider the luma region covered by the left or above 4x4 chroma
+    // prediction. We want to point to the chroma reference block in that
+    // region, which is the bottom-right-most mi unit.
+    // This leads to the following offsets:
+    MB_MODE_INFO *chroma_above_mi =
+        xd->chroma_up_available ? base_mi[-xd->mi_stride + ss_x] : NULL;
+    xd->chroma_above_mbmi = chroma_above_mi;
+
+    MB_MODE_INFO *chroma_left_mi =
+        xd->chroma_left_available ? base_mi[ss_y * xd->mi_stride - 1] : NULL;
+    xd->chroma_left_mbmi = chroma_left_mi;
+  }
+
+  xd->height = bh;
+  xd->width = bw;
+
+  xd->is_last_vertical_rect = 0;
+  if (xd->width < xd->height) {
+    if (!((mi_col + xd->width) & (xd->height - 1))) {
+      xd->is_last_vertical_rect = 1;
+    }
+  }
+
+  xd->is_first_horizontal_rect = 0;
+  if (xd->width > xd->height)
+    if (!(mi_row & (xd->width - 1))) xd->is_first_horizontal_rect = 1;
+}
+
+static INLINE aom_cdf_prob *get_y_mode_cdf(FRAME_CONTEXT *tile_ctx,
+                                           const MB_MODE_INFO *above_mi,
+                                           const MB_MODE_INFO *left_mi) {
+  const PREDICTION_MODE above = av1_above_block_mode(above_mi);
+  const PREDICTION_MODE left = av1_left_block_mode(left_mi);
+  const int above_ctx = intra_mode_context[above];
+  const int left_ctx = intra_mode_context[left];
+  return tile_ctx->kf_y_cdf[above_ctx][left_ctx];
+}
+
+static INLINE void update_partition_context(MACROBLOCKD *xd, int mi_row,
+                                            int mi_col, BLOCK_SIZE subsize,
+                                            BLOCK_SIZE bsize) {
+  PARTITION_CONTEXT *const above_ctx = xd->above_partition_context + mi_col;
+  PARTITION_CONTEXT *const left_ctx =
+      xd->left_partition_context + (mi_row & MAX_MIB_MASK);
+
+  const int bw = mi_size_wide[bsize];
+  const int bh = mi_size_high[bsize];
+  memset(above_ctx, partition_context_lookup[subsize].above, bw);
+  memset(left_ctx, partition_context_lookup[subsize].left, bh);
+}
+
+static INLINE int is_chroma_reference(int mi_row, int mi_col, BLOCK_SIZE bsize,
+                                      int subsampling_x, int subsampling_y) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  const int bw = mi_size_wide[bsize];
+  const int bh = mi_size_high[bsize];
+  int ref_pos = ((mi_row & 0x01) || !(bh & 0x01) || !subsampling_y) &&
+                ((mi_col & 0x01) || !(bw & 0x01) || !subsampling_x);
+  return ref_pos;
+}
+
+static INLINE aom_cdf_prob cdf_element_prob(const aom_cdf_prob *cdf,
+                                            size_t element) {
+  assert(cdf != NULL);
+  return (element > 0 ? cdf[element - 1] : CDF_PROB_TOP) - cdf[element];
+}
+
+static INLINE void partition_gather_horz_alike(aom_cdf_prob *out,
+                                               const aom_cdf_prob *const in,
+                                               BLOCK_SIZE bsize) {
+  (void)bsize;
+  out[0] = CDF_PROB_TOP;
+  out[0] -= cdf_element_prob(in, PARTITION_HORZ);
+  out[0] -= cdf_element_prob(in, PARTITION_SPLIT);
+  out[0] -= cdf_element_prob(in, PARTITION_HORZ_A);
+  out[0] -= cdf_element_prob(in, PARTITION_HORZ_B);
+  out[0] -= cdf_element_prob(in, PARTITION_VERT_A);
+  if (bsize != BLOCK_128X128) out[0] -= cdf_element_prob(in, PARTITION_HORZ_4);
+  out[0] = AOM_ICDF(out[0]);
+  out[1] = AOM_ICDF(CDF_PROB_TOP);
+}
+
+static INLINE void partition_gather_vert_alike(aom_cdf_prob *out,
+                                               const aom_cdf_prob *const in,
+                                               BLOCK_SIZE bsize) {
+  (void)bsize;
+  out[0] = CDF_PROB_TOP;
+  out[0] -= cdf_element_prob(in, PARTITION_VERT);
+  out[0] -= cdf_element_prob(in, PARTITION_SPLIT);
+  out[0] -= cdf_element_prob(in, PARTITION_HORZ_A);
+  out[0] -= cdf_element_prob(in, PARTITION_VERT_A);
+  out[0] -= cdf_element_prob(in, PARTITION_VERT_B);
+  if (bsize != BLOCK_128X128) out[0] -= cdf_element_prob(in, PARTITION_VERT_4);
+  out[0] = AOM_ICDF(out[0]);
+  out[1] = AOM_ICDF(CDF_PROB_TOP);
+}
+
+static INLINE void update_ext_partition_context(MACROBLOCKD *xd, int mi_row,
+                                                int mi_col, BLOCK_SIZE subsize,
+                                                BLOCK_SIZE bsize,
+                                                PARTITION_TYPE partition) {
+  if (bsize >= BLOCK_8X8) {
+    const int hbs = mi_size_wide[bsize] / 2;
+    BLOCK_SIZE bsize2 = get_partition_subsize(bsize, PARTITION_SPLIT);
+    switch (partition) {
+      case PARTITION_SPLIT:
+        if (bsize != BLOCK_8X8) break;
+        AOM_FALLTHROUGH_INTENDED;
+      case PARTITION_NONE:
+      case PARTITION_HORZ:
+      case PARTITION_VERT:
+      case PARTITION_HORZ_4:
+      case PARTITION_VERT_4:
+        update_partition_context(xd, mi_row, mi_col, subsize, bsize);
+        break;
+      case PARTITION_HORZ_A:
+        update_partition_context(xd, mi_row, mi_col, bsize2, subsize);
+        update_partition_context(xd, mi_row + hbs, mi_col, subsize, subsize);
+        break;
+      case PARTITION_HORZ_B:
+        update_partition_context(xd, mi_row, mi_col, subsize, subsize);
+        update_partition_context(xd, mi_row + hbs, mi_col, bsize2, subsize);
+        break;
+      case PARTITION_VERT_A:
+        update_partition_context(xd, mi_row, mi_col, bsize2, subsize);
+        update_partition_context(xd, mi_row, mi_col + hbs, subsize, subsize);
+        break;
+      case PARTITION_VERT_B:
+        update_partition_context(xd, mi_row, mi_col, subsize, subsize);
+        update_partition_context(xd, mi_row, mi_col + hbs, bsize2, subsize);
+        break;
+      default: assert(0 && "Invalid partition type");
+    }
+  }
+}
+
+static INLINE int partition_plane_context(const MACROBLOCKD *xd, int mi_row,
+                                          int mi_col, BLOCK_SIZE bsize) {
+  const PARTITION_CONTEXT *above_ctx = xd->above_partition_context + mi_col;
+  const PARTITION_CONTEXT *left_ctx =
+      xd->left_partition_context + (mi_row & MAX_MIB_MASK);
+  // Minimum partition point is 8x8. Offset the bsl accordingly.
+  const int bsl = mi_size_wide_log2[bsize] - mi_size_wide_log2[BLOCK_8X8];
+  int above = (*above_ctx >> bsl) & 1, left = (*left_ctx >> bsl) & 1;
+
+  assert(mi_size_wide_log2[bsize] == mi_size_high_log2[bsize]);
+  assert(bsl >= 0);
+
+  return (left * 2 + above) + bsl * PARTITION_PLOFFSET;
+}
+
+// Return the number of elements in the partition CDF when
+// partitioning the (square) block with luma block size of bsize.
+static INLINE int partition_cdf_length(BLOCK_SIZE bsize) {
+  if (bsize <= BLOCK_8X8)
+    return PARTITION_TYPES;
+  else if (bsize == BLOCK_128X128)
+    return EXT_PARTITION_TYPES - 2;
+  else
+    return EXT_PARTITION_TYPES;
+}
+
+static INLINE int max_block_wide(const MACROBLOCKD *xd, BLOCK_SIZE bsize,
+                                 int plane) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  int max_blocks_wide = block_size_wide[bsize];
+
+  if (xd->mb_to_right_edge < 0) {
+    const struct macroblockd_plane *const pd = &xd->plane[plane];
+    max_blocks_wide += xd->mb_to_right_edge >> (3 + pd->subsampling_x);
+  }
+
+  // Scale the width in the transform block unit.
+  return max_blocks_wide >> MI_SIZE_LOG2;
+}
+
+static INLINE int max_block_high(const MACROBLOCKD *xd, BLOCK_SIZE bsize,
+                                 int plane) {
+  int max_blocks_high = block_size_high[bsize];
+
+  if (xd->mb_to_bottom_edge < 0) {
+    const struct macroblockd_plane *const pd = &xd->plane[plane];
+    max_blocks_high += xd->mb_to_bottom_edge >> (3 + pd->subsampling_y);
+  }
+
+  // Scale the height in the transform block unit.
+  return max_blocks_high >> MI_SIZE_LOG2;
+}
+
+static INLINE void av1_zero_above_context(AV1_COMMON *const cm,
+                                          const MACROBLOCKD *xd,
+                                          int mi_col_start, int mi_col_end,
+                                          const int tile_row) {
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  const int num_planes = av1_num_planes(cm);
+  const int width = mi_col_end - mi_col_start;
+  const int aligned_width =
+      ALIGN_POWER_OF_TWO(width, seq_params->mib_size_log2);
+  const int offset_y = mi_col_start;
+  const int width_y = aligned_width;
+  const int offset_uv = offset_y >> seq_params->subsampling_x;
+  const int width_uv = width_y >> seq_params->subsampling_x;
+  CommonContexts *const above_contexts = &cm->above_contexts;
+
+  av1_zero_array(above_contexts->entropy[0][tile_row] + offset_y, width_y);
+  if (num_planes > 1) {
+    if (above_contexts->entropy[1][tile_row] &&
+        above_contexts->entropy[2][tile_row]) {
+      av1_zero_array(above_contexts->entropy[1][tile_row] + offset_uv,
+                     width_uv);
+      av1_zero_array(above_contexts->entropy[2][tile_row] + offset_uv,
+                     width_uv);
+    } else {
+      aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
+                         "Invalid value of planes");
+    }
+  }
+
+  av1_zero_array(above_contexts->partition[tile_row] + mi_col_start,
+                 aligned_width);
+
+  memset(above_contexts->txfm[tile_row] + mi_col_start,
+         tx_size_wide[TX_SIZES_LARGEST], aligned_width * sizeof(TXFM_CONTEXT));
+}
+
+static INLINE void av1_zero_left_context(MACROBLOCKD *const xd) {
+  av1_zero(xd->left_entropy_context);
+  av1_zero(xd->left_partition_context);
+
+  memset(xd->left_txfm_context_buffer, tx_size_high[TX_SIZES_LARGEST],
+         sizeof(xd->left_txfm_context_buffer));
+}
+
+// Disable array-bounds checks as the TX_SIZE enum contains values larger than
+// TX_SIZES_ALL (TX_INVALID) which make extending the array as a workaround
+// infeasible. The assert is enough for static analysis and this or other tools
+// asan, valgrind would catch oob access at runtime.
+#if defined(__GNUC__) && __GNUC__ >= 4
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+#pragma GCC diagnostic warning "-Warray-bounds"
+#endif
+
+static INLINE void set_txfm_ctx(TXFM_CONTEXT *txfm_ctx, uint8_t txs, int len) {
+  int i;
+  for (i = 0; i < len; ++i) txfm_ctx[i] = txs;
+}
+
+static INLINE void set_txfm_ctxs(TX_SIZE tx_size, int n4_w, int n4_h, int skip,
+                                 const MACROBLOCKD *xd) {
+  uint8_t bw = tx_size_wide[tx_size];
+  uint8_t bh = tx_size_high[tx_size];
+
+  if (skip) {
+    bw = n4_w * MI_SIZE;
+    bh = n4_h * MI_SIZE;
+  }
+
+  set_txfm_ctx(xd->above_txfm_context, bw, n4_w);
+  set_txfm_ctx(xd->left_txfm_context, bh, n4_h);
+}
+
+static INLINE int get_mi_grid_idx(const CommonModeInfoParams *const mi_params,
+                                  int mi_row, int mi_col) {
+  return mi_row * mi_params->mi_stride + mi_col;
+}
+
+static INLINE int get_alloc_mi_idx(const CommonModeInfoParams *const mi_params,
+                                   int mi_row, int mi_col) {
+  const int mi_alloc_size_1d = mi_size_wide[mi_params->mi_alloc_bsize];
+  const int mi_alloc_row = mi_row / mi_alloc_size_1d;
+  const int mi_alloc_col = mi_col / mi_alloc_size_1d;
+
+  return mi_alloc_row * mi_params->mi_alloc_stride + mi_alloc_col;
+}
+
+// For this partition block, set pointers in mi_params->mi_grid_base and xd->mi.
+static INLINE void set_mi_offsets(const CommonModeInfoParams *const mi_params,
+                                  MACROBLOCKD *const xd, int mi_row,
+                                  int mi_col) {
+  // 'mi_grid_base' should point to appropriate memory in 'mi'.
+  const int mi_grid_idx = get_mi_grid_idx(mi_params, mi_row, mi_col);
+  const int mi_alloc_idx = get_alloc_mi_idx(mi_params, mi_row, mi_col);
+  mi_params->mi_grid_base[mi_grid_idx] = &mi_params->mi_alloc[mi_alloc_idx];
+  // 'xd->mi' should point to an offset in 'mi_grid_base';
+  xd->mi = mi_params->mi_grid_base + mi_grid_idx;
+  // 'xd->tx_type_map' should point to an offset in 'mi_params->tx_type_map'.
+  xd->tx_type_map = mi_params->tx_type_map + mi_grid_idx;
+  xd->tx_type_map_stride = mi_params->mi_stride;
+}
+
+static INLINE void txfm_partition_update(TXFM_CONTEXT *above_ctx,
+                                         TXFM_CONTEXT *left_ctx,
+                                         TX_SIZE tx_size, TX_SIZE txb_size) {
+  BLOCK_SIZE bsize = txsize_to_bsize[txb_size];
+  int bh = mi_size_high[bsize];
+  int bw = mi_size_wide[bsize];
+  uint8_t txw = tx_size_wide[tx_size];
+  uint8_t txh = tx_size_high[tx_size];
+  int i;
+  for (i = 0; i < bh; ++i) left_ctx[i] = txh;
+  for (i = 0; i < bw; ++i) above_ctx[i] = txw;
+}
+
+static INLINE TX_SIZE get_sqr_tx_size(int tx_dim) {
+  switch (tx_dim) {
+    case 128:
+    case 64: return TX_64X64; break;
+    case 32: return TX_32X32; break;
+    case 16: return TX_16X16; break;
+    case 8: return TX_8X8; break;
+    default: return TX_4X4;
+  }
+}
+
+static INLINE TX_SIZE get_tx_size(int width, int height) {
+  if (width == height) {
+    return get_sqr_tx_size(width);
+  }
+  if (width < height) {
+    if (width + width == height) {
+      switch (width) {
+        case 4: return TX_4X8; break;
+        case 8: return TX_8X16; break;
+        case 16: return TX_16X32; break;
+        case 32: return TX_32X64; break;
+      }
+    } else {
+      switch (width) {
+        case 4: return TX_4X16; break;
+        case 8: return TX_8X32; break;
+        case 16: return TX_16X64; break;
+      }
+    }
+  } else {
+    if (height + height == width) {
+      switch (height) {
+        case 4: return TX_8X4; break;
+        case 8: return TX_16X8; break;
+        case 16: return TX_32X16; break;
+        case 32: return TX_64X32; break;
+      }
+    } else {
+      switch (height) {
+        case 4: return TX_16X4; break;
+        case 8: return TX_32X8; break;
+        case 16: return TX_64X16; break;
+      }
+    }
+  }
+  assert(0);
+  return TX_4X4;
+}
+
+static INLINE int txfm_partition_context(const TXFM_CONTEXT *const above_ctx,
+                                         const TXFM_CONTEXT *const left_ctx,
+                                         BLOCK_SIZE bsize, TX_SIZE tx_size) {
+  const uint8_t txw = tx_size_wide[tx_size];
+  const uint8_t txh = tx_size_high[tx_size];
+  const int above = *above_ctx < txw;
+  const int left = *left_ctx < txh;
+  int category = TXFM_PARTITION_CONTEXTS;
+
+  // dummy return, not used by others.
+  if (tx_size <= TX_4X4) return 0;
+
+  TX_SIZE max_tx_size =
+      get_sqr_tx_size(AOMMAX(block_size_wide[bsize], block_size_high[bsize]));
+
+  if (max_tx_size >= TX_8X8) {
+    category =
+        (txsize_sqr_up_map[tx_size] != max_tx_size && max_tx_size > TX_8X8) +
+        (TX_SIZES - 1 - max_tx_size) * 2;
+  }
+  assert(category != TXFM_PARTITION_CONTEXTS);
+  return category * 3 + above + left;
+}
+
+// Compute the next partition in the direction of the sb_type stored in the mi
+// array, starting with bsize.
+static INLINE PARTITION_TYPE get_partition(const AV1_COMMON *const cm,
+                                           int mi_row, int mi_col,
+                                           BLOCK_SIZE bsize) {
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+  if (mi_row >= mi_params->mi_rows || mi_col >= mi_params->mi_cols)
+    return PARTITION_INVALID;
+
+  const int offset = mi_row * mi_params->mi_stride + mi_col;
+  MB_MODE_INFO **mi = mi_params->mi_grid_base + offset;
+  const BLOCK_SIZE subsize = mi[0]->bsize;
+
+  assert(bsize < BLOCK_SIZES_ALL);
+
+  if (subsize == bsize) return PARTITION_NONE;
+
+  const int bhigh = mi_size_high[bsize];
+  const int bwide = mi_size_wide[bsize];
+  const int sshigh = mi_size_high[subsize];
+  const int sswide = mi_size_wide[subsize];
+
+  if (bsize > BLOCK_8X8 && mi_row + bwide / 2 < mi_params->mi_rows &&
+      mi_col + bhigh / 2 < mi_params->mi_cols) {
+    // In this case, the block might be using an extended partition
+    // type.
+    const MB_MODE_INFO *const mbmi_right = mi[bwide / 2];
+    const MB_MODE_INFO *const mbmi_below = mi[bhigh / 2 * mi_params->mi_stride];
+
+    if (sswide == bwide) {
+      // Smaller height but same width. Is PARTITION_HORZ_4, PARTITION_HORZ or
+      // PARTITION_HORZ_B. To distinguish the latter two, check if the lower
+      // half was split.
+      if (sshigh * 4 == bhigh) return PARTITION_HORZ_4;
+      assert(sshigh * 2 == bhigh);
+
+      if (mbmi_below->bsize == subsize)
+        return PARTITION_HORZ;
+      else
+        return PARTITION_HORZ_B;
+    } else if (sshigh == bhigh) {
+      // Smaller width but same height. Is PARTITION_VERT_4, PARTITION_VERT or
+      // PARTITION_VERT_B. To distinguish the latter two, check if the right
+      // half was split.
+      if (sswide * 4 == bwide) return PARTITION_VERT_4;
+      assert(sswide * 2 == bhigh);
+
+      if (mbmi_right->bsize == subsize)
+        return PARTITION_VERT;
+      else
+        return PARTITION_VERT_B;
+    } else {
+      // Smaller width and smaller height. Might be PARTITION_SPLIT or could be
+      // PARTITION_HORZ_A or PARTITION_VERT_A. If subsize isn't halved in both
+      // dimensions, we immediately know this is a split (which will recurse to
+      // get to subsize). Otherwise look down and to the right. With
+      // PARTITION_VERT_A, the right block will have height bhigh; with
+      // PARTITION_HORZ_A, the lower block with have width bwide. Otherwise
+      // it's PARTITION_SPLIT.
+      if (sswide * 2 != bwide || sshigh * 2 != bhigh) return PARTITION_SPLIT;
+
+      if (mi_size_wide[mbmi_below->bsize] == bwide) return PARTITION_HORZ_A;
+      if (mi_size_high[mbmi_right->bsize] == bhigh) return PARTITION_VERT_A;
+
+      return PARTITION_SPLIT;
+    }
+  }
+  const int vert_split = sswide < bwide;
+  const int horz_split = sshigh < bhigh;
+  const int split_idx = (vert_split << 1) | horz_split;
+  assert(split_idx != 0);
+
+  static const PARTITION_TYPE base_partitions[4] = {
+    PARTITION_INVALID, PARTITION_HORZ, PARTITION_VERT, PARTITION_SPLIT
+  };
+
+  return base_partitions[split_idx];
+}
+
+static INLINE void set_sb_size(SequenceHeader *const seq_params,
+                               BLOCK_SIZE sb_size) {
+  seq_params->sb_size = sb_size;
+  seq_params->mib_size = mi_size_wide[seq_params->sb_size];
+  seq_params->mib_size_log2 = mi_size_wide_log2[seq_params->sb_size];
+}
+
+// Returns true if the frame is fully lossless at the coded resolution.
+// Note: If super-resolution is used, such a frame will still NOT be lossless at
+// the upscaled resolution.
+static INLINE int is_coded_lossless(const AV1_COMMON *cm,
+                                    const MACROBLOCKD *xd) {
+  int coded_lossless = 1;
+  if (cm->seg.enabled) {
+    for (int i = 0; i < MAX_SEGMENTS; ++i) {
+      if (!xd->lossless[i]) {
+        coded_lossless = 0;
+        break;
+      }
+    }
+  } else {
+    coded_lossless = xd->lossless[0];
+  }
+  return coded_lossless;
+}
+
+static INLINE int is_valid_seq_level_idx(AV1_LEVEL seq_level_idx) {
+  return seq_level_idx == SEQ_LEVEL_MAX ||
+         (seq_level_idx < SEQ_LEVELS &&
+          // The following levels are currently undefined.
+          seq_level_idx != SEQ_LEVEL_2_2 && seq_level_idx != SEQ_LEVEL_2_3 &&
+          seq_level_idx != SEQ_LEVEL_3_2 && seq_level_idx != SEQ_LEVEL_3_3 &&
+          seq_level_idx != SEQ_LEVEL_4_2 && seq_level_idx != SEQ_LEVEL_4_3 &&
+          seq_level_idx != SEQ_LEVEL_7_0 && seq_level_idx != SEQ_LEVEL_7_1 &&
+          seq_level_idx != SEQ_LEVEL_7_2 && seq_level_idx != SEQ_LEVEL_7_3);
+}
+
+/*!\endcond */
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_AV1_COMMON_INT_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.c
new file mode 100644
index 0000000000..7926a56945
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.c
@@ -0,0 +1,1841 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <stdlib.h>
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h"
+
+void av1_idct4(const int32_t *input, int32_t *output, int8_t cos_bit,
+               const int8_t *stage_range) {
+  assert(output != input);
+  const int32_t size = 4;
+  const int32_t *cospi = cospi_arr(cos_bit);
+
+  int32_t stage = 0;
+  int32_t *bf0, *bf1;
+  int32_t step[4];
+
+  // stage 0;
+
+  // stage 1;
+  stage++;
+  bf1 = output;
+  bf1[0] = input[0];
+  bf1[1] = input[2];
+  bf1[2] = input[1];
+  bf1[3] = input[3];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 2
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = half_btf(cospi[32], bf0[0], cospi[32], bf0[1], cos_bit);
+  bf1[1] = half_btf(cospi[32], bf0[0], -cospi[32], bf0[1], cos_bit);
+  bf1[2] = half_btf(cospi[48], bf0[2], -cospi[16], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[16], bf0[2], cospi[48], bf0[3], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 3
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[3], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[2], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[1] - bf0[2], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[0] - bf0[3], stage_range[stage]);
+}
+
+void av1_idct8(const int32_t *input, int32_t *output, int8_t cos_bit,
+               const int8_t *stage_range) {
+  assert(output != input);
+  const int32_t size = 8;
+  const int32_t *cospi = cospi_arr(cos_bit);
+
+  int32_t stage = 0;
+  int32_t *bf0, *bf1;
+  int32_t step[8];
+
+  // stage 0;
+
+  // stage 1;
+  stage++;
+  bf1 = output;
+  bf1[0] = input[0];
+  bf1[1] = input[4];
+  bf1[2] = input[2];
+  bf1[3] = input[6];
+  bf1[4] = input[1];
+  bf1[5] = input[5];
+  bf1[6] = input[3];
+  bf1[7] = input[7];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 2
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = half_btf(cospi[56], bf0[4], -cospi[8], bf0[7], cos_bit);
+  bf1[5] = half_btf(cospi[24], bf0[5], -cospi[40], bf0[6], cos_bit);
+  bf1[6] = half_btf(cospi[40], bf0[5], cospi[24], bf0[6], cos_bit);
+  bf1[7] = half_btf(cospi[8], bf0[4], cospi[56], bf0[7], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 3
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = half_btf(cospi[32], bf0[0], cospi[32], bf0[1], cos_bit);
+  bf1[1] = half_btf(cospi[32], bf0[0], -cospi[32], bf0[1], cos_bit);
+  bf1[2] = half_btf(cospi[48], bf0[2], -cospi[16], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[16], bf0[2], cospi[48], bf0[3], cos_bit);
+  bf1[4] = clamp_value(bf0[4] + bf0[5], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[4] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(-bf0[6] + bf0[7], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[6] + bf0[7], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 4
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = clamp_value(bf0[0] + bf0[3], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[2], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[1] - bf0[2], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[0] - bf0[3], stage_range[stage]);
+  bf1[4] = bf0[4];
+  bf1[5] = half_btf(-cospi[32], bf0[5], cospi[32], bf0[6], cos_bit);
+  bf1[6] = half_btf(cospi[32], bf0[5], cospi[32], bf0[6], cos_bit);
+  bf1[7] = bf0[7];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 5
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[7], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[6], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[5], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[4], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[3] - bf0[4], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[2] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[1] - bf0[6], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[0] - bf0[7], stage_range[stage]);
+}
+
+void av1_idct16(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range) {
+  assert(output != input);
+  const int32_t size = 16;
+  const int32_t *cospi = cospi_arr(cos_bit);
+
+  int32_t stage = 0;
+  int32_t *bf0, *bf1;
+  int32_t step[16];
+
+  // stage 0;
+
+  // stage 1;
+  stage++;
+  bf1 = output;
+  bf1[0] = input[0];
+  bf1[1] = input[8];
+  bf1[2] = input[4];
+  bf1[3] = input[12];
+  bf1[4] = input[2];
+  bf1[5] = input[10];
+  bf1[6] = input[6];
+  bf1[7] = input[14];
+  bf1[8] = input[1];
+  bf1[9] = input[9];
+  bf1[10] = input[5];
+  bf1[11] = input[13];
+  bf1[12] = input[3];
+  bf1[13] = input[11];
+  bf1[14] = input[7];
+  bf1[15] = input[15];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 2
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = bf0[6];
+  bf1[7] = bf0[7];
+  bf1[8] = half_btf(cospi[60], bf0[8], -cospi[4], bf0[15], cos_bit);
+  bf1[9] = half_btf(cospi[28], bf0[9], -cospi[36], bf0[14], cos_bit);
+  bf1[10] = half_btf(cospi[44], bf0[10], -cospi[20], bf0[13], cos_bit);
+  bf1[11] = half_btf(cospi[12], bf0[11], -cospi[52], bf0[12], cos_bit);
+  bf1[12] = half_btf(cospi[52], bf0[11], cospi[12], bf0[12], cos_bit);
+  bf1[13] = half_btf(cospi[20], bf0[10], cospi[44], bf0[13], cos_bit);
+  bf1[14] = half_btf(cospi[36], bf0[9], cospi[28], bf0[14], cos_bit);
+  bf1[15] = half_btf(cospi[4], bf0[8], cospi[60], bf0[15], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 3
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = half_btf(cospi[56], bf0[4], -cospi[8], bf0[7], cos_bit);
+  bf1[5] = half_btf(cospi[24], bf0[5], -cospi[40], bf0[6], cos_bit);
+  bf1[6] = half_btf(cospi[40], bf0[5], cospi[24], bf0[6], cos_bit);
+  bf1[7] = half_btf(cospi[8], bf0[4], cospi[56], bf0[7], cos_bit);
+  bf1[8] = clamp_value(bf0[8] + bf0[9], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[8] - bf0[9], stage_range[stage]);
+  bf1[10] = clamp_value(-bf0[10] + bf0[11], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[10] + bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[12] + bf0[13], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[12] - bf0[13], stage_range[stage]);
+  bf1[14] = clamp_value(-bf0[14] + bf0[15], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[14] + bf0[15], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 4
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = half_btf(cospi[32], bf0[0], cospi[32], bf0[1], cos_bit);
+  bf1[1] = half_btf(cospi[32], bf0[0], -cospi[32], bf0[1], cos_bit);
+  bf1[2] = half_btf(cospi[48], bf0[2], -cospi[16], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[16], bf0[2], cospi[48], bf0[3], cos_bit);
+  bf1[4] = clamp_value(bf0[4] + bf0[5], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[4] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(-bf0[6] + bf0[7], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[6] + bf0[7], stage_range[stage]);
+  bf1[8] = bf0[8];
+  bf1[9] = half_btf(-cospi[16], bf0[9], cospi[48], bf0[14], cos_bit);
+  bf1[10] = half_btf(-cospi[48], bf0[10], -cospi[16], bf0[13], cos_bit);
+  bf1[11] = bf0[11];
+  bf1[12] = bf0[12];
+  bf1[13] = half_btf(-cospi[16], bf0[10], cospi[48], bf0[13], cos_bit);
+  bf1[14] = half_btf(cospi[48], bf0[9], cospi[16], bf0[14], cos_bit);
+  bf1[15] = bf0[15];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 5
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[3], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[2], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[1] - bf0[2], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[0] - bf0[3], stage_range[stage]);
+  bf1[4] = bf0[4];
+  bf1[5] = half_btf(-cospi[32], bf0[5], cospi[32], bf0[6], cos_bit);
+  bf1[6] = half_btf(cospi[32], bf0[5], cospi[32], bf0[6], cos_bit);
+  bf1[7] = bf0[7];
+  bf1[8] = clamp_value(bf0[8] + bf0[11], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[9] + bf0[10], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[9] - bf0[10], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[8] - bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(-bf0[12] + bf0[15], stage_range[stage]);
+  bf1[13] = clamp_value(-bf0[13] + bf0[14], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[13] + bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[12] + bf0[15], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 6
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = clamp_value(bf0[0] + bf0[7], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[6], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[5], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[4], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[3] - bf0[4], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[2] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[1] - bf0[6], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[0] - bf0[7], stage_range[stage]);
+  bf1[8] = bf0[8];
+  bf1[9] = bf0[9];
+  bf1[10] = half_btf(-cospi[32], bf0[10], cospi[32], bf0[13], cos_bit);
+  bf1[11] = half_btf(-cospi[32], bf0[11], cospi[32], bf0[12], cos_bit);
+  bf1[12] = half_btf(cospi[32], bf0[11], cospi[32], bf0[12], cos_bit);
+  bf1[13] = half_btf(cospi[32], bf0[10], cospi[32], bf0[13], cos_bit);
+  bf1[14] = bf0[14];
+  bf1[15] = bf0[15];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 7
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[15], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[14], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[13], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[12], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[11], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[10], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[6] + bf0[9], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[7] + bf0[8], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[7] - bf0[8], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[6] - bf0[9], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[5] - bf0[10], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[4] - bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[3] - bf0[12], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[2] - bf0[13], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[1] - bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[0] - bf0[15], stage_range[stage]);
+}
+
+void av1_idct32(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range) {
+  assert(output != input);
+  const int32_t size = 32;
+  const int32_t *cospi = cospi_arr(cos_bit);
+
+  int32_t stage = 0;
+  int32_t *bf0, *bf1;
+  int32_t step[32];
+
+  // stage 0;
+
+  // stage 1;
+  stage++;
+  bf1 = output;
+  bf1[0] = input[0];
+  bf1[1] = input[16];
+  bf1[2] = input[8];
+  bf1[3] = input[24];
+  bf1[4] = input[4];
+  bf1[5] = input[20];
+  bf1[6] = input[12];
+  bf1[7] = input[28];
+  bf1[8] = input[2];
+  bf1[9] = input[18];
+  bf1[10] = input[10];
+  bf1[11] = input[26];
+  bf1[12] = input[6];
+  bf1[13] = input[22];
+  bf1[14] = input[14];
+  bf1[15] = input[30];
+  bf1[16] = input[1];
+  bf1[17] = input[17];
+  bf1[18] = input[9];
+  bf1[19] = input[25];
+  bf1[20] = input[5];
+  bf1[21] = input[21];
+  bf1[22] = input[13];
+  bf1[23] = input[29];
+  bf1[24] = input[3];
+  bf1[25] = input[19];
+  bf1[26] = input[11];
+  bf1[27] = input[27];
+  bf1[28] = input[7];
+  bf1[29] = input[23];
+  bf1[30] = input[15];
+  bf1[31] = input[31];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 2
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = bf0[6];
+  bf1[7] = bf0[7];
+  bf1[8] = bf0[8];
+  bf1[9] = bf0[9];
+  bf1[10] = bf0[10];
+  bf1[11] = bf0[11];
+  bf1[12] = bf0[12];
+  bf1[13] = bf0[13];
+  bf1[14] = bf0[14];
+  bf1[15] = bf0[15];
+  bf1[16] = half_btf(cospi[62], bf0[16], -cospi[2], bf0[31], cos_bit);
+  bf1[17] = half_btf(cospi[30], bf0[17], -cospi[34], bf0[30], cos_bit);
+  bf1[18] = half_btf(cospi[46], bf0[18], -cospi[18], bf0[29], cos_bit);
+  bf1[19] = half_btf(cospi[14], bf0[19], -cospi[50], bf0[28], cos_bit);
+  bf1[20] = half_btf(cospi[54], bf0[20], -cospi[10], bf0[27], cos_bit);
+  bf1[21] = half_btf(cospi[22], bf0[21], -cospi[42], bf0[26], cos_bit);
+  bf1[22] = half_btf(cospi[38], bf0[22], -cospi[26], bf0[25], cos_bit);
+  bf1[23] = half_btf(cospi[6], bf0[23], -cospi[58], bf0[24], cos_bit);
+  bf1[24] = half_btf(cospi[58], bf0[23], cospi[6], bf0[24], cos_bit);
+  bf1[25] = half_btf(cospi[26], bf0[22], cospi[38], bf0[25], cos_bit);
+  bf1[26] = half_btf(cospi[42], bf0[21], cospi[22], bf0[26], cos_bit);
+  bf1[27] = half_btf(cospi[10], bf0[20], cospi[54], bf0[27], cos_bit);
+  bf1[28] = half_btf(cospi[50], bf0[19], cospi[14], bf0[28], cos_bit);
+  bf1[29] = half_btf(cospi[18], bf0[18], cospi[46], bf0[29], cos_bit);
+  bf1[30] = half_btf(cospi[34], bf0[17], cospi[30], bf0[30], cos_bit);
+  bf1[31] = half_btf(cospi[2], bf0[16], cospi[62], bf0[31], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 3
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = bf0[6];
+  bf1[7] = bf0[7];
+  bf1[8] = half_btf(cospi[60], bf0[8], -cospi[4], bf0[15], cos_bit);
+  bf1[9] = half_btf(cospi[28], bf0[9], -cospi[36], bf0[14], cos_bit);
+  bf1[10] = half_btf(cospi[44], bf0[10], -cospi[20], bf0[13], cos_bit);
+  bf1[11] = half_btf(cospi[12], bf0[11], -cospi[52], bf0[12], cos_bit);
+  bf1[12] = half_btf(cospi[52], bf0[11], cospi[12], bf0[12], cos_bit);
+  bf1[13] = half_btf(cospi[20], bf0[10], cospi[44], bf0[13], cos_bit);
+  bf1[14] = half_btf(cospi[36], bf0[9], cospi[28], bf0[14], cos_bit);
+  bf1[15] = half_btf(cospi[4], bf0[8], cospi[60], bf0[15], cos_bit);
+  bf1[16] = clamp_value(bf0[16] + bf0[17], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[16] - bf0[17], stage_range[stage]);
+  bf1[18] = clamp_value(-bf0[18] + bf0[19], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[18] + bf0[19], stage_range[stage]);
+  bf1[20] = clamp_value(bf0[20] + bf0[21], stage_range[stage]);
+  bf1[21] = clamp_value(bf0[20] - bf0[21], stage_range[stage]);
+  bf1[22] = clamp_value(-bf0[22] + bf0[23], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[22] + bf0[23], stage_range[stage]);
+  bf1[24] = clamp_value(bf0[24] + bf0[25], stage_range[stage]);
+  bf1[25] = clamp_value(bf0[24] - bf0[25], stage_range[stage]);
+  bf1[26] = clamp_value(-bf0[26] + bf0[27], stage_range[stage]);
+  bf1[27] = clamp_value(bf0[26] + bf0[27], stage_range[stage]);
+  bf1[28] = clamp_value(bf0[28] + bf0[29], stage_range[stage]);
+  bf1[29] = clamp_value(bf0[28] - bf0[29], stage_range[stage]);
+  bf1[30] = clamp_value(-bf0[30] + bf0[31], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[30] + bf0[31], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 4
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = half_btf(cospi[56], bf0[4], -cospi[8], bf0[7], cos_bit);
+  bf1[5] = half_btf(cospi[24], bf0[5], -cospi[40], bf0[6], cos_bit);
+  bf1[6] = half_btf(cospi[40], bf0[5], cospi[24], bf0[6], cos_bit);
+  bf1[7] = half_btf(cospi[8], bf0[4], cospi[56], bf0[7], cos_bit);
+  bf1[8] = clamp_value(bf0[8] + bf0[9], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[8] - bf0[9], stage_range[stage]);
+  bf1[10] = clamp_value(-bf0[10] + bf0[11], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[10] + bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[12] + bf0[13], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[12] - bf0[13], stage_range[stage]);
+  bf1[14] = clamp_value(-bf0[14] + bf0[15], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[14] + bf0[15], stage_range[stage]);
+  bf1[16] = bf0[16];
+  bf1[17] = half_btf(-cospi[8], bf0[17], cospi[56], bf0[30], cos_bit);
+  bf1[18] = half_btf(-cospi[56], bf0[18], -cospi[8], bf0[29], cos_bit);
+  bf1[19] = bf0[19];
+  bf1[20] = bf0[20];
+  bf1[21] = half_btf(-cospi[40], bf0[21], cospi[24], bf0[26], cos_bit);
+  bf1[22] = half_btf(-cospi[24], bf0[22], -cospi[40], bf0[25], cos_bit);
+  bf1[23] = bf0[23];
+  bf1[24] = bf0[24];
+  bf1[25] = half_btf(-cospi[40], bf0[22], cospi[24], bf0[25], cos_bit);
+  bf1[26] = half_btf(cospi[24], bf0[21], cospi[40], bf0[26], cos_bit);
+  bf1[27] = bf0[27];
+  bf1[28] = bf0[28];
+  bf1[29] = half_btf(-cospi[8], bf0[18], cospi[56], bf0[29], cos_bit);
+  bf1[30] = half_btf(cospi[56], bf0[17], cospi[8], bf0[30], cos_bit);
+  bf1[31] = bf0[31];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 5
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = half_btf(cospi[32], bf0[0], cospi[32], bf0[1], cos_bit);
+  bf1[1] = half_btf(cospi[32], bf0[0], -cospi[32], bf0[1], cos_bit);
+  bf1[2] = half_btf(cospi[48], bf0[2], -cospi[16], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[16], bf0[2], cospi[48], bf0[3], cos_bit);
+  bf1[4] = clamp_value(bf0[4] + bf0[5], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[4] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(-bf0[6] + bf0[7], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[6] + bf0[7], stage_range[stage]);
+  bf1[8] = bf0[8];
+  bf1[9] = half_btf(-cospi[16], bf0[9], cospi[48], bf0[14], cos_bit);
+  bf1[10] = half_btf(-cospi[48], bf0[10], -cospi[16], bf0[13], cos_bit);
+  bf1[11] = bf0[11];
+  bf1[12] = bf0[12];
+  bf1[13] = half_btf(-cospi[16], bf0[10], cospi[48], bf0[13], cos_bit);
+  bf1[14] = half_btf(cospi[48], bf0[9], cospi[16], bf0[14], cos_bit);
+  bf1[15] = bf0[15];
+  bf1[16] = clamp_value(bf0[16] + bf0[19], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[17] + bf0[18], stage_range[stage]);
+  bf1[18] = clamp_value(bf0[17] - bf0[18], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[16] - bf0[19], stage_range[stage]);
+  bf1[20] = clamp_value(-bf0[20] + bf0[23], stage_range[stage]);
+  bf1[21] = clamp_value(-bf0[21] + bf0[22], stage_range[stage]);
+  bf1[22] = clamp_value(bf0[21] + bf0[22], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[20] + bf0[23], stage_range[stage]);
+  bf1[24] = clamp_value(bf0[24] + bf0[27], stage_range[stage]);
+  bf1[25] = clamp_value(bf0[25] + bf0[26], stage_range[stage]);
+  bf1[26] = clamp_value(bf0[25] - bf0[26], stage_range[stage]);
+  bf1[27] = clamp_value(bf0[24] - bf0[27], stage_range[stage]);
+  bf1[28] = clamp_value(-bf0[28] + bf0[31], stage_range[stage]);
+  bf1[29] = clamp_value(-bf0[29] + bf0[30], stage_range[stage]);
+  bf1[30] = clamp_value(bf0[29] + bf0[30], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[28] + bf0[31], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 6
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = clamp_value(bf0[0] + bf0[3], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[2], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[1] - bf0[2], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[0] - bf0[3], stage_range[stage]);
+  bf1[4] = bf0[4];
+  bf1[5] = half_btf(-cospi[32], bf0[5], cospi[32], bf0[6], cos_bit);
+  bf1[6] = half_btf(cospi[32], bf0[5], cospi[32], bf0[6], cos_bit);
+  bf1[7] = bf0[7];
+  bf1[8] = clamp_value(bf0[8] + bf0[11], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[9] + bf0[10], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[9] - bf0[10], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[8] - bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(-bf0[12] + bf0[15], stage_range[stage]);
+  bf1[13] = clamp_value(-bf0[13] + bf0[14], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[13] + bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[12] + bf0[15], stage_range[stage]);
+  bf1[16] = bf0[16];
+  bf1[17] = bf0[17];
+  bf1[18] = half_btf(-cospi[16], bf0[18], cospi[48], bf0[29], cos_bit);
+  bf1[19] = half_btf(-cospi[16], bf0[19], cospi[48], bf0[28], cos_bit);
+  bf1[20] = half_btf(-cospi[48], bf0[20], -cospi[16], bf0[27], cos_bit);
+  bf1[21] = half_btf(-cospi[48], bf0[21], -cospi[16], bf0[26], cos_bit);
+  bf1[22] = bf0[22];
+  bf1[23] = bf0[23];
+  bf1[24] = bf0[24];
+  bf1[25] = bf0[25];
+  bf1[26] = half_btf(-cospi[16], bf0[21], cospi[48], bf0[26], cos_bit);
+  bf1[27] = half_btf(-cospi[16], bf0[20], cospi[48], bf0[27], cos_bit);
+  bf1[28] = half_btf(cospi[48], bf0[19], cospi[16], bf0[28], cos_bit);
+  bf1[29] = half_btf(cospi[48], bf0[18], cospi[16], bf0[29], cos_bit);
+  bf1[30] = bf0[30];
+  bf1[31] = bf0[31];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 7
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[7], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[6], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[5], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[4], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[3] - bf0[4], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[2] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[1] - bf0[6], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[0] - bf0[7], stage_range[stage]);
+  bf1[8] = bf0[8];
+  bf1[9] = bf0[9];
+  bf1[10] = half_btf(-cospi[32], bf0[10], cospi[32], bf0[13], cos_bit);
+  bf1[11] = half_btf(-cospi[32], bf0[11], cospi[32], bf0[12], cos_bit);
+  bf1[12] = half_btf(cospi[32], bf0[11], cospi[32], bf0[12], cos_bit);
+  bf1[13] = half_btf(cospi[32], bf0[10], cospi[32], bf0[13], cos_bit);
+  bf1[14] = bf0[14];
+  bf1[15] = bf0[15];
+  bf1[16] = clamp_value(bf0[16] + bf0[23], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[17] + bf0[22], stage_range[stage]);
+  bf1[18] = clamp_value(bf0[18] + bf0[21], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[19] + bf0[20], stage_range[stage]);
+  bf1[20] = clamp_value(bf0[19] - bf0[20], stage_range[stage]);
+  bf1[21] = clamp_value(bf0[18] - bf0[21], stage_range[stage]);
+  bf1[22] = clamp_value(bf0[17] - bf0[22], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[16] - bf0[23], stage_range[stage]);
+  bf1[24] = clamp_value(-bf0[24] + bf0[31], stage_range[stage]);
+  bf1[25] = clamp_value(-bf0[25] + bf0[30], stage_range[stage]);
+  bf1[26] = clamp_value(-bf0[26] + bf0[29], stage_range[stage]);
+  bf1[27] = clamp_value(-bf0[27] + bf0[28], stage_range[stage]);
+  bf1[28] = clamp_value(bf0[27] + bf0[28], stage_range[stage]);
+  bf1[29] = clamp_value(bf0[26] + bf0[29], stage_range[stage]);
+  bf1[30] = clamp_value(bf0[25] + bf0[30], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[24] + bf0[31], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 8
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = clamp_value(bf0[0] + bf0[15], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[14], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[13], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[12], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[11], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[10], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[6] + bf0[9], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[7] + bf0[8], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[7] - bf0[8], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[6] - bf0[9], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[5] - bf0[10], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[4] - bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[3] - bf0[12], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[2] - bf0[13], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[1] - bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[0] - bf0[15], stage_range[stage]);
+  bf1[16] = bf0[16];
+  bf1[17] = bf0[17];
+  bf1[18] = bf0[18];
+  bf1[19] = bf0[19];
+  bf1[20] = half_btf(-cospi[32], bf0[20], cospi[32], bf0[27], cos_bit);
+  bf1[21] = half_btf(-cospi[32], bf0[21], cospi[32], bf0[26], cos_bit);
+  bf1[22] = half_btf(-cospi[32], bf0[22], cospi[32], bf0[25], cos_bit);
+  bf1[23] = half_btf(-cospi[32], bf0[23], cospi[32], bf0[24], cos_bit);
+  bf1[24] = half_btf(cospi[32], bf0[23], cospi[32], bf0[24], cos_bit);
+  bf1[25] = half_btf(cospi[32], bf0[22], cospi[32], bf0[25], cos_bit);
+  bf1[26] = half_btf(cospi[32], bf0[21], cospi[32], bf0[26], cos_bit);
+  bf1[27] = half_btf(cospi[32], bf0[20], cospi[32], bf0[27], cos_bit);
+  bf1[28] = bf0[28];
+  bf1[29] = bf0[29];
+  bf1[30] = bf0[30];
+  bf1[31] = bf0[31];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 9
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[31], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[30], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[29], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[28], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[27], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[26], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[6] + bf0[25], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[7] + bf0[24], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[8] + bf0[23], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[9] + bf0[22], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[10] + bf0[21], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[11] + bf0[20], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[12] + bf0[19], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[13] + bf0[18], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[14] + bf0[17], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[15] + bf0[16], stage_range[stage]);
+  bf1[16] = clamp_value(bf0[15] - bf0[16], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[14] - bf0[17], stage_range[stage]);
+  bf1[18] = clamp_value(bf0[13] - bf0[18], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[12] - bf0[19], stage_range[stage]);
+  bf1[20] = clamp_value(bf0[11] - bf0[20], stage_range[stage]);
+  bf1[21] = clamp_value(bf0[10] - bf0[21], stage_range[stage]);
+  bf1[22] = clamp_value(bf0[9] - bf0[22], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[8] - bf0[23], stage_range[stage]);
+  bf1[24] = clamp_value(bf0[7] - bf0[24], stage_range[stage]);
+  bf1[25] = clamp_value(bf0[6] - bf0[25], stage_range[stage]);
+  bf1[26] = clamp_value(bf0[5] - bf0[26], stage_range[stage]);
+  bf1[27] = clamp_value(bf0[4] - bf0[27], stage_range[stage]);
+  bf1[28] = clamp_value(bf0[3] - bf0[28], stage_range[stage]);
+  bf1[29] = clamp_value(bf0[2] - bf0[29], stage_range[stage]);
+  bf1[30] = clamp_value(bf0[1] - bf0[30], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[0] - bf0[31], stage_range[stage]);
+}
+
+void av1_iadst4(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range) {
+  int bit = cos_bit;
+  const int32_t *sinpi = sinpi_arr(bit);
+  int32_t s0, s1, s2, s3, s4, s5, s6, s7;
+
+  int32_t x0 = input[0];
+  int32_t x1 = input[1];
+  int32_t x2 = input[2];
+  int32_t x3 = input[3];
+
+  if (!(x0 | x1 | x2 | x3)) {
+    output[0] = output[1] = output[2] = output[3] = 0;
+    return;
+  }
+
+  assert(sinpi[1] + sinpi[2] == sinpi[4]);
+
+  // stage 1
+  s0 = range_check_value(sinpi[1] * x0, stage_range[1] + bit);
+  s1 = range_check_value(sinpi[2] * x0, stage_range[1] + bit);
+  s2 = range_check_value(sinpi[3] * x1, stage_range[1] + bit);
+  s3 = range_check_value(sinpi[4] * x2, stage_range[1] + bit);
+  s4 = range_check_value(sinpi[1] * x2, stage_range[1] + bit);
+  s5 = range_check_value(sinpi[2] * x3, stage_range[1] + bit);
+  s6 = range_check_value(sinpi[4] * x3, stage_range[1] + bit);
+
+  // stage 2
+  // NOTICE: (x0 - x2) here may use one extra bit compared to the
+  // opt_range_row/col specified in av1_gen_inv_stage_range()
+  s7 = range_check_value((x0 - x2) + x3, stage_range[2]);
+
+  // stage 3
+  s0 = range_check_value(s0 + s3, stage_range[3] + bit);
+  s1 = range_check_value(s1 - s4, stage_range[3] + bit);
+  s3 = range_check_value(s2, stage_range[3] + bit);
+  s2 = range_check_value(sinpi[3] * s7, stage_range[3] + bit);
+
+  // stage 4
+  s0 = range_check_value(s0 + s5, stage_range[4] + bit);
+  s1 = range_check_value(s1 - s6, stage_range[4] + bit);
+
+  // stage 5
+  x0 = range_check_value(s0 + s3, stage_range[5] + bit);
+  x1 = range_check_value(s1 + s3, stage_range[5] + bit);
+  x2 = range_check_value(s2, stage_range[5] + bit);
+  x3 = range_check_value(s0 + s1, stage_range[5] + bit);
+
+  // stage 6
+  x3 = range_check_value(x3 - s3, stage_range[6] + bit);
+
+  output[0] = round_shift(x0, bit);
+  output[1] = round_shift(x1, bit);
+  output[2] = round_shift(x2, bit);
+  output[3] = round_shift(x3, bit);
+}
+
+void av1_iadst8(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range) {
+  assert(output != input);
+  const int32_t size = 8;
+  const int32_t *cospi = cospi_arr(cos_bit);
+
+  int32_t stage = 0;
+  int32_t *bf0, *bf1;
+  int32_t step[8];
+
+  // stage 0;
+
+  // stage 1;
+  stage++;
+  bf1 = output;
+  bf1[0] = input[7];
+  bf1[1] = input[0];
+  bf1[2] = input[5];
+  bf1[3] = input[2];
+  bf1[4] = input[3];
+  bf1[5] = input[4];
+  bf1[6] = input[1];
+  bf1[7] = input[6];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 2
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = half_btf(cospi[4], bf0[0], cospi[60], bf0[1], cos_bit);
+  bf1[1] = half_btf(cospi[60], bf0[0], -cospi[4], bf0[1], cos_bit);
+  bf1[2] = half_btf(cospi[20], bf0[2], cospi[44], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[44], bf0[2], -cospi[20], bf0[3], cos_bit);
+  bf1[4] = half_btf(cospi[36], bf0[4], cospi[28], bf0[5], cos_bit);
+  bf1[5] = half_btf(cospi[28], bf0[4], -cospi[36], bf0[5], cos_bit);
+  bf1[6] = half_btf(cospi[52], bf0[6], cospi[12], bf0[7], cos_bit);
+  bf1[7] = half_btf(cospi[12], bf0[6], -cospi[52], bf0[7], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 3
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[4], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[5], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[6], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[7], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[0] - bf0[4], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[1] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[2] - bf0[6], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[3] - bf0[7], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 4
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = half_btf(cospi[16], bf0[4], cospi[48], bf0[5], cos_bit);
+  bf1[5] = half_btf(cospi[48], bf0[4], -cospi[16], bf0[5], cos_bit);
+  bf1[6] = half_btf(-cospi[48], bf0[6], cospi[16], bf0[7], cos_bit);
+  bf1[7] = half_btf(cospi[16], bf0[6], cospi[48], bf0[7], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 5
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[2], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[3], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[0] - bf0[2], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[1] - bf0[3], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[6], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[7], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[4] - bf0[6], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[5] - bf0[7], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 6
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = half_btf(cospi[32], bf0[2], cospi[32], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[32], bf0[2], -cospi[32], bf0[3], cos_bit);
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = half_btf(cospi[32], bf0[6], cospi[32], bf0[7], cos_bit);
+  bf1[7] = half_btf(cospi[32], bf0[6], -cospi[32], bf0[7], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 7
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = bf0[0];
+  bf1[1] = -bf0[4];
+  bf1[2] = bf0[6];
+  bf1[3] = -bf0[2];
+  bf1[4] = bf0[3];
+  bf1[5] = -bf0[7];
+  bf1[6] = bf0[5];
+  bf1[7] = -bf0[1];
+}
+
+void av1_iadst16(const int32_t *input, int32_t *output, int8_t cos_bit,
+                 const int8_t *stage_range) {
+  assert(output != input);
+  const int32_t size = 16;
+  const int32_t *cospi = cospi_arr(cos_bit);
+
+  int32_t stage = 0;
+  int32_t *bf0, *bf1;
+  int32_t step[16];
+
+  // stage 0;
+
+  // stage 1;
+  stage++;
+  bf1 = output;
+  bf1[0] = input[15];
+  bf1[1] = input[0];
+  bf1[2] = input[13];
+  bf1[3] = input[2];
+  bf1[4] = input[11];
+  bf1[5] = input[4];
+  bf1[6] = input[9];
+  bf1[7] = input[6];
+  bf1[8] = input[7];
+  bf1[9] = input[8];
+  bf1[10] = input[5];
+  bf1[11] = input[10];
+  bf1[12] = input[3];
+  bf1[13] = input[12];
+  bf1[14] = input[1];
+  bf1[15] = input[14];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 2
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = half_btf(cospi[2], bf0[0], cospi[62], bf0[1], cos_bit);
+  bf1[1] = half_btf(cospi[62], bf0[0], -cospi[2], bf0[1], cos_bit);
+  bf1[2] = half_btf(cospi[10], bf0[2], cospi[54], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[54], bf0[2], -cospi[10], bf0[3], cos_bit);
+  bf1[4] = half_btf(cospi[18], bf0[4], cospi[46], bf0[5], cos_bit);
+  bf1[5] = half_btf(cospi[46], bf0[4], -cospi[18], bf0[5], cos_bit);
+  bf1[6] = half_btf(cospi[26], bf0[6], cospi[38], bf0[7], cos_bit);
+  bf1[7] = half_btf(cospi[38], bf0[6], -cospi[26], bf0[7], cos_bit);
+  bf1[8] = half_btf(cospi[34], bf0[8], cospi[30], bf0[9], cos_bit);
+  bf1[9] = half_btf(cospi[30], bf0[8], -cospi[34], bf0[9], cos_bit);
+  bf1[10] = half_btf(cospi[42], bf0[10], cospi[22], bf0[11], cos_bit);
+  bf1[11] = half_btf(cospi[22], bf0[10], -cospi[42], bf0[11], cos_bit);
+  bf1[12] = half_btf(cospi[50], bf0[12], cospi[14], bf0[13], cos_bit);
+  bf1[13] = half_btf(cospi[14], bf0[12], -cospi[50], bf0[13], cos_bit);
+  bf1[14] = half_btf(cospi[58], bf0[14], cospi[6], bf0[15], cos_bit);
+  bf1[15] = half_btf(cospi[6], bf0[14], -cospi[58], bf0[15], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 3
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[8], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[9], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[10], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[11], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[12], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[13], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[6] + bf0[14], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[7] + bf0[15], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[0] - bf0[8], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[1] - bf0[9], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[2] - bf0[10], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[3] - bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[4] - bf0[12], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[5] - bf0[13], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[6] - bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[7] - bf0[15], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 4
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = bf0[6];
+  bf1[7] = bf0[7];
+  bf1[8] = half_btf(cospi[8], bf0[8], cospi[56], bf0[9], cos_bit);
+  bf1[9] = half_btf(cospi[56], bf0[8], -cospi[8], bf0[9], cos_bit);
+  bf1[10] = half_btf(cospi[40], bf0[10], cospi[24], bf0[11], cos_bit);
+  bf1[11] = half_btf(cospi[24], bf0[10], -cospi[40], bf0[11], cos_bit);
+  bf1[12] = half_btf(-cospi[56], bf0[12], cospi[8], bf0[13], cos_bit);
+  bf1[13] = half_btf(cospi[8], bf0[12], cospi[56], bf0[13], cos_bit);
+  bf1[14] = half_btf(-cospi[24], bf0[14], cospi[40], bf0[15], cos_bit);
+  bf1[15] = half_btf(cospi[40], bf0[14], cospi[24], bf0[15], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 5
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[4], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[5], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[6], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[7], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[0] - bf0[4], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[1] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[2] - bf0[6], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[3] - bf0[7], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[8] + bf0[12], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[9] + bf0[13], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[10] + bf0[14], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[11] + bf0[15], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[8] - bf0[12], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[9] - bf0[13], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[10] - bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[11] - bf0[15], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 6
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = half_btf(cospi[16], bf0[4], cospi[48], bf0[5], cos_bit);
+  bf1[5] = half_btf(cospi[48], bf0[4], -cospi[16], bf0[5], cos_bit);
+  bf1[6] = half_btf(-cospi[48], bf0[6], cospi[16], bf0[7], cos_bit);
+  bf1[7] = half_btf(cospi[16], bf0[6], cospi[48], bf0[7], cos_bit);
+  bf1[8] = bf0[8];
+  bf1[9] = bf0[9];
+  bf1[10] = bf0[10];
+  bf1[11] = bf0[11];
+  bf1[12] = half_btf(cospi[16], bf0[12], cospi[48], bf0[13], cos_bit);
+  bf1[13] = half_btf(cospi[48], bf0[12], -cospi[16], bf0[13], cos_bit);
+  bf1[14] = half_btf(-cospi[48], bf0[14], cospi[16], bf0[15], cos_bit);
+  bf1[15] = half_btf(cospi[16], bf0[14], cospi[48], bf0[15], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 7
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[2], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[3], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[0] - bf0[2], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[1] - bf0[3], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[6], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[7], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[4] - bf0[6], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[5] - bf0[7], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[8] + bf0[10], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[9] + bf0[11], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[8] - bf0[10], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[9] - bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[12] + bf0[14], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[13] + bf0[15], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[12] - bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[13] - bf0[15], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 8
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = half_btf(cospi[32], bf0[2], cospi[32], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[32], bf0[2], -cospi[32], bf0[3], cos_bit);
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = half_btf(cospi[32], bf0[6], cospi[32], bf0[7], cos_bit);
+  bf1[7] = half_btf(cospi[32], bf0[6], -cospi[32], bf0[7], cos_bit);
+  bf1[8] = bf0[8];
+  bf1[9] = bf0[9];
+  bf1[10] = half_btf(cospi[32], bf0[10], cospi[32], bf0[11], cos_bit);
+  bf1[11] = half_btf(cospi[32], bf0[10], -cospi[32], bf0[11], cos_bit);
+  bf1[12] = bf0[12];
+  bf1[13] = bf0[13];
+  bf1[14] = half_btf(cospi[32], bf0[14], cospi[32], bf0[15], cos_bit);
+  bf1[15] = half_btf(cospi[32], bf0[14], -cospi[32], bf0[15], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 9
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = bf0[0];
+  bf1[1] = -bf0[8];
+  bf1[2] = bf0[12];
+  bf1[3] = -bf0[4];
+  bf1[4] = bf0[6];
+  bf1[5] = -bf0[14];
+  bf1[6] = bf0[10];
+  bf1[7] = -bf0[2];
+  bf1[8] = bf0[3];
+  bf1[9] = -bf0[11];
+  bf1[10] = bf0[15];
+  bf1[11] = -bf0[7];
+  bf1[12] = bf0[5];
+  bf1[13] = -bf0[13];
+  bf1[14] = bf0[9];
+  bf1[15] = -bf0[1];
+}
+
+void av1_iidentity4_c(const int32_t *input, int32_t *output, int8_t cos_bit,
+                      const int8_t *stage_range) {
+  (void)cos_bit;
+  (void)stage_range;
+  for (int i = 0; i < 4; ++i) {
+    output[i] = round_shift((int64_t)NewSqrt2 * input[i], NewSqrt2Bits);
+  }
+  assert(stage_range[0] + NewSqrt2Bits <= 32);
+}
+
+void av1_iidentity8_c(const int32_t *input, int32_t *output, int8_t cos_bit,
+                      const int8_t *stage_range) {
+  (void)cos_bit;
+  (void)stage_range;
+  for (int i = 0; i < 8; ++i) output[i] = (int32_t)((int64_t)input[i] * 2);
+}
+
+void av1_iidentity16_c(const int32_t *input, int32_t *output, int8_t cos_bit,
+                       const int8_t *stage_range) {
+  (void)cos_bit;
+  (void)stage_range;
+  for (int i = 0; i < 16; ++i)
+    output[i] = round_shift((int64_t)NewSqrt2 * 2 * input[i], NewSqrt2Bits);
+  assert(stage_range[0] + NewSqrt2Bits <= 32);
+}
+
+void av1_iidentity32_c(const int32_t *input, int32_t *output, int8_t cos_bit,
+                       const int8_t *stage_range) {
+  (void)cos_bit;
+  (void)stage_range;
+  for (int i = 0; i < 32; ++i) output[i] = (int32_t)((int64_t)input[i] * 4);
+}
+
+void av1_idct64(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range) {
+  assert(output != input);
+  const int32_t size = 64;
+  const int32_t *cospi = cospi_arr(cos_bit);
+
+  int32_t stage = 0;
+  int32_t *bf0, *bf1;
+  int32_t step[64];
+
+  // stage 0;
+
+  // stage 1;
+  stage++;
+  bf1 = output;
+  bf1[0] = input[0];
+  bf1[1] = input[32];
+  bf1[2] = input[16];
+  bf1[3] = input[48];
+  bf1[4] = input[8];
+  bf1[5] = input[40];
+  bf1[6] = input[24];
+  bf1[7] = input[56];
+  bf1[8] = input[4];
+  bf1[9] = input[36];
+  bf1[10] = input[20];
+  bf1[11] = input[52];
+  bf1[12] = input[12];
+  bf1[13] = input[44];
+  bf1[14] = input[28];
+  bf1[15] = input[60];
+  bf1[16] = input[2];
+  bf1[17] = input[34];
+  bf1[18] = input[18];
+  bf1[19] = input[50];
+  bf1[20] = input[10];
+  bf1[21] = input[42];
+  bf1[22] = input[26];
+  bf1[23] = input[58];
+  bf1[24] = input[6];
+  bf1[25] = input[38];
+  bf1[26] = input[22];
+  bf1[27] = input[54];
+  bf1[28] = input[14];
+  bf1[29] = input[46];
+  bf1[30] = input[30];
+  bf1[31] = input[62];
+  bf1[32] = input[1];
+  bf1[33] = input[33];
+  bf1[34] = input[17];
+  bf1[35] = input[49];
+  bf1[36] = input[9];
+  bf1[37] = input[41];
+  bf1[38] = input[25];
+  bf1[39] = input[57];
+  bf1[40] = input[5];
+  bf1[41] = input[37];
+  bf1[42] = input[21];
+  bf1[43] = input[53];
+  bf1[44] = input[13];
+  bf1[45] = input[45];
+  bf1[46] = input[29];
+  bf1[47] = input[61];
+  bf1[48] = input[3];
+  bf1[49] = input[35];
+  bf1[50] = input[19];
+  bf1[51] = input[51];
+  bf1[52] = input[11];
+  bf1[53] = input[43];
+  bf1[54] = input[27];
+  bf1[55] = input[59];
+  bf1[56] = input[7];
+  bf1[57] = input[39];
+  bf1[58] = input[23];
+  bf1[59] = input[55];
+  bf1[60] = input[15];
+  bf1[61] = input[47];
+  bf1[62] = input[31];
+  bf1[63] = input[63];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 2
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = bf0[6];
+  bf1[7] = bf0[7];
+  bf1[8] = bf0[8];
+  bf1[9] = bf0[9];
+  bf1[10] = bf0[10];
+  bf1[11] = bf0[11];
+  bf1[12] = bf0[12];
+  bf1[13] = bf0[13];
+  bf1[14] = bf0[14];
+  bf1[15] = bf0[15];
+  bf1[16] = bf0[16];
+  bf1[17] = bf0[17];
+  bf1[18] = bf0[18];
+  bf1[19] = bf0[19];
+  bf1[20] = bf0[20];
+  bf1[21] = bf0[21];
+  bf1[22] = bf0[22];
+  bf1[23] = bf0[23];
+  bf1[24] = bf0[24];
+  bf1[25] = bf0[25];
+  bf1[26] = bf0[26];
+  bf1[27] = bf0[27];
+  bf1[28] = bf0[28];
+  bf1[29] = bf0[29];
+  bf1[30] = bf0[30];
+  bf1[31] = bf0[31];
+  bf1[32] = half_btf(cospi[63], bf0[32], -cospi[1], bf0[63], cos_bit);
+  bf1[33] = half_btf(cospi[31], bf0[33], -cospi[33], bf0[62], cos_bit);
+  bf1[34] = half_btf(cospi[47], bf0[34], -cospi[17], bf0[61], cos_bit);
+  bf1[35] = half_btf(cospi[15], bf0[35], -cospi[49], bf0[60], cos_bit);
+  bf1[36] = half_btf(cospi[55], bf0[36], -cospi[9], bf0[59], cos_bit);
+  bf1[37] = half_btf(cospi[23], bf0[37], -cospi[41], bf0[58], cos_bit);
+  bf1[38] = half_btf(cospi[39], bf0[38], -cospi[25], bf0[57], cos_bit);
+  bf1[39] = half_btf(cospi[7], bf0[39], -cospi[57], bf0[56], cos_bit);
+  bf1[40] = half_btf(cospi[59], bf0[40], -cospi[5], bf0[55], cos_bit);
+  bf1[41] = half_btf(cospi[27], bf0[41], -cospi[37], bf0[54], cos_bit);
+  bf1[42] = half_btf(cospi[43], bf0[42], -cospi[21], bf0[53], cos_bit);
+  bf1[43] = half_btf(cospi[11], bf0[43], -cospi[53], bf0[52], cos_bit);
+  bf1[44] = half_btf(cospi[51], bf0[44], -cospi[13], bf0[51], cos_bit);
+  bf1[45] = half_btf(cospi[19], bf0[45], -cospi[45], bf0[50], cos_bit);
+  bf1[46] = half_btf(cospi[35], bf0[46], -cospi[29], bf0[49], cos_bit);
+  bf1[47] = half_btf(cospi[3], bf0[47], -cospi[61], bf0[48], cos_bit);
+  bf1[48] = half_btf(cospi[61], bf0[47], cospi[3], bf0[48], cos_bit);
+  bf1[49] = half_btf(cospi[29], bf0[46], cospi[35], bf0[49], cos_bit);
+  bf1[50] = half_btf(cospi[45], bf0[45], cospi[19], bf0[50], cos_bit);
+  bf1[51] = half_btf(cospi[13], bf0[44], cospi[51], bf0[51], cos_bit);
+  bf1[52] = half_btf(cospi[53], bf0[43], cospi[11], bf0[52], cos_bit);
+  bf1[53] = half_btf(cospi[21], bf0[42], cospi[43], bf0[53], cos_bit);
+  bf1[54] = half_btf(cospi[37], bf0[41], cospi[27], bf0[54], cos_bit);
+  bf1[55] = half_btf(cospi[5], bf0[40], cospi[59], bf0[55], cos_bit);
+  bf1[56] = half_btf(cospi[57], bf0[39], cospi[7], bf0[56], cos_bit);
+  bf1[57] = half_btf(cospi[25], bf0[38], cospi[39], bf0[57], cos_bit);
+  bf1[58] = half_btf(cospi[41], bf0[37], cospi[23], bf0[58], cos_bit);
+  bf1[59] = half_btf(cospi[9], bf0[36], cospi[55], bf0[59], cos_bit);
+  bf1[60] = half_btf(cospi[49], bf0[35], cospi[15], bf0[60], cos_bit);
+  bf1[61] = half_btf(cospi[17], bf0[34], cospi[47], bf0[61], cos_bit);
+  bf1[62] = half_btf(cospi[33], bf0[33], cospi[31], bf0[62], cos_bit);
+  bf1[63] = half_btf(cospi[1], bf0[32], cospi[63], bf0[63], cos_bit);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 3
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = bf0[6];
+  bf1[7] = bf0[7];
+  bf1[8] = bf0[8];
+  bf1[9] = bf0[9];
+  bf1[10] = bf0[10];
+  bf1[11] = bf0[11];
+  bf1[12] = bf0[12];
+  bf1[13] = bf0[13];
+  bf1[14] = bf0[14];
+  bf1[15] = bf0[15];
+  bf1[16] = half_btf(cospi[62], bf0[16], -cospi[2], bf0[31], cos_bit);
+  bf1[17] = half_btf(cospi[30], bf0[17], -cospi[34], bf0[30], cos_bit);
+  bf1[18] = half_btf(cospi[46], bf0[18], -cospi[18], bf0[29], cos_bit);
+  bf1[19] = half_btf(cospi[14], bf0[19], -cospi[50], bf0[28], cos_bit);
+  bf1[20] = half_btf(cospi[54], bf0[20], -cospi[10], bf0[27], cos_bit);
+  bf1[21] = half_btf(cospi[22], bf0[21], -cospi[42], bf0[26], cos_bit);
+  bf1[22] = half_btf(cospi[38], bf0[22], -cospi[26], bf0[25], cos_bit);
+  bf1[23] = half_btf(cospi[6], bf0[23], -cospi[58], bf0[24], cos_bit);
+  bf1[24] = half_btf(cospi[58], bf0[23], cospi[6], bf0[24], cos_bit);
+  bf1[25] = half_btf(cospi[26], bf0[22], cospi[38], bf0[25], cos_bit);
+  bf1[26] = half_btf(cospi[42], bf0[21], cospi[22], bf0[26], cos_bit);
+  bf1[27] = half_btf(cospi[10], bf0[20], cospi[54], bf0[27], cos_bit);
+  bf1[28] = half_btf(cospi[50], bf0[19], cospi[14], bf0[28], cos_bit);
+  bf1[29] = half_btf(cospi[18], bf0[18], cospi[46], bf0[29], cos_bit);
+  bf1[30] = half_btf(cospi[34], bf0[17], cospi[30], bf0[30], cos_bit);
+  bf1[31] = half_btf(cospi[2], bf0[16], cospi[62], bf0[31], cos_bit);
+  bf1[32] = clamp_value(bf0[32] + bf0[33], stage_range[stage]);
+  bf1[33] = clamp_value(bf0[32] - bf0[33], stage_range[stage]);
+  bf1[34] = clamp_value(-bf0[34] + bf0[35], stage_range[stage]);
+  bf1[35] = clamp_value(bf0[34] + bf0[35], stage_range[stage]);
+  bf1[36] = clamp_value(bf0[36] + bf0[37], stage_range[stage]);
+  bf1[37] = clamp_value(bf0[36] - bf0[37], stage_range[stage]);
+  bf1[38] = clamp_value(-bf0[38] + bf0[39], stage_range[stage]);
+  bf1[39] = clamp_value(bf0[38] + bf0[39], stage_range[stage]);
+  bf1[40] = clamp_value(bf0[40] + bf0[41], stage_range[stage]);
+  bf1[41] = clamp_value(bf0[40] - bf0[41], stage_range[stage]);
+  bf1[42] = clamp_value(-bf0[42] + bf0[43], stage_range[stage]);
+  bf1[43] = clamp_value(bf0[42] + bf0[43], stage_range[stage]);
+  bf1[44] = clamp_value(bf0[44] + bf0[45], stage_range[stage]);
+  bf1[45] = clamp_value(bf0[44] - bf0[45], stage_range[stage]);
+  bf1[46] = clamp_value(-bf0[46] + bf0[47], stage_range[stage]);
+  bf1[47] = clamp_value(bf0[46] + bf0[47], stage_range[stage]);
+  bf1[48] = clamp_value(bf0[48] + bf0[49], stage_range[stage]);
+  bf1[49] = clamp_value(bf0[48] - bf0[49], stage_range[stage]);
+  bf1[50] = clamp_value(-bf0[50] + bf0[51], stage_range[stage]);
+  bf1[51] = clamp_value(bf0[50] + bf0[51], stage_range[stage]);
+  bf1[52] = clamp_value(bf0[52] + bf0[53], stage_range[stage]);
+  bf1[53] = clamp_value(bf0[52] - bf0[53], stage_range[stage]);
+  bf1[54] = clamp_value(-bf0[54] + bf0[55], stage_range[stage]);
+  bf1[55] = clamp_value(bf0[54] + bf0[55], stage_range[stage]);
+  bf1[56] = clamp_value(bf0[56] + bf0[57], stage_range[stage]);
+  bf1[57] = clamp_value(bf0[56] - bf0[57], stage_range[stage]);
+  bf1[58] = clamp_value(-bf0[58] + bf0[59], stage_range[stage]);
+  bf1[59] = clamp_value(bf0[58] + bf0[59], stage_range[stage]);
+  bf1[60] = clamp_value(bf0[60] + bf0[61], stage_range[stage]);
+  bf1[61] = clamp_value(bf0[60] - bf0[61], stage_range[stage]);
+  bf1[62] = clamp_value(-bf0[62] + bf0[63], stage_range[stage]);
+  bf1[63] = clamp_value(bf0[62] + bf0[63], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 4
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = bf0[4];
+  bf1[5] = bf0[5];
+  bf1[6] = bf0[6];
+  bf1[7] = bf0[7];
+  bf1[8] = half_btf(cospi[60], bf0[8], -cospi[4], bf0[15], cos_bit);
+  bf1[9] = half_btf(cospi[28], bf0[9], -cospi[36], bf0[14], cos_bit);
+  bf1[10] = half_btf(cospi[44], bf0[10], -cospi[20], bf0[13], cos_bit);
+  bf1[11] = half_btf(cospi[12], bf0[11], -cospi[52], bf0[12], cos_bit);
+  bf1[12] = half_btf(cospi[52], bf0[11], cospi[12], bf0[12], cos_bit);
+  bf1[13] = half_btf(cospi[20], bf0[10], cospi[44], bf0[13], cos_bit);
+  bf1[14] = half_btf(cospi[36], bf0[9], cospi[28], bf0[14], cos_bit);
+  bf1[15] = half_btf(cospi[4], bf0[8], cospi[60], bf0[15], cos_bit);
+  bf1[16] = clamp_value(bf0[16] + bf0[17], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[16] - bf0[17], stage_range[stage]);
+  bf1[18] = clamp_value(-bf0[18] + bf0[19], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[18] + bf0[19], stage_range[stage]);
+  bf1[20] = clamp_value(bf0[20] + bf0[21], stage_range[stage]);
+  bf1[21] = clamp_value(bf0[20] - bf0[21], stage_range[stage]);
+  bf1[22] = clamp_value(-bf0[22] + bf0[23], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[22] + bf0[23], stage_range[stage]);
+  bf1[24] = clamp_value(bf0[24] + bf0[25], stage_range[stage]);
+  bf1[25] = clamp_value(bf0[24] - bf0[25], stage_range[stage]);
+  bf1[26] = clamp_value(-bf0[26] + bf0[27], stage_range[stage]);
+  bf1[27] = clamp_value(bf0[26] + bf0[27], stage_range[stage]);
+  bf1[28] = clamp_value(bf0[28] + bf0[29], stage_range[stage]);
+  bf1[29] = clamp_value(bf0[28] - bf0[29], stage_range[stage]);
+  bf1[30] = clamp_value(-bf0[30] + bf0[31], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[30] + bf0[31], stage_range[stage]);
+  bf1[32] = bf0[32];
+  bf1[33] = half_btf(-cospi[4], bf0[33], cospi[60], bf0[62], cos_bit);
+  bf1[34] = half_btf(-cospi[60], bf0[34], -cospi[4], bf0[61], cos_bit);
+  bf1[35] = bf0[35];
+  bf1[36] = bf0[36];
+  bf1[37] = half_btf(-cospi[36], bf0[37], cospi[28], bf0[58], cos_bit);
+  bf1[38] = half_btf(-cospi[28], bf0[38], -cospi[36], bf0[57], cos_bit);
+  bf1[39] = bf0[39];
+  bf1[40] = bf0[40];
+  bf1[41] = half_btf(-cospi[20], bf0[41], cospi[44], bf0[54], cos_bit);
+  bf1[42] = half_btf(-cospi[44], bf0[42], -cospi[20], bf0[53], cos_bit);
+  bf1[43] = bf0[43];
+  bf1[44] = bf0[44];
+  bf1[45] = half_btf(-cospi[52], bf0[45], cospi[12], bf0[50], cos_bit);
+  bf1[46] = half_btf(-cospi[12], bf0[46], -cospi[52], bf0[49], cos_bit);
+  bf1[47] = bf0[47];
+  bf1[48] = bf0[48];
+  bf1[49] = half_btf(-cospi[52], bf0[46], cospi[12], bf0[49], cos_bit);
+  bf1[50] = half_btf(cospi[12], bf0[45], cospi[52], bf0[50], cos_bit);
+  bf1[51] = bf0[51];
+  bf1[52] = bf0[52];
+  bf1[53] = half_btf(-cospi[20], bf0[42], cospi[44], bf0[53], cos_bit);
+  bf1[54] = half_btf(cospi[44], bf0[41], cospi[20], bf0[54], cos_bit);
+  bf1[55] = bf0[55];
+  bf1[56] = bf0[56];
+  bf1[57] = half_btf(-cospi[36], bf0[38], cospi[28], bf0[57], cos_bit);
+  bf1[58] = half_btf(cospi[28], bf0[37], cospi[36], bf0[58], cos_bit);
+  bf1[59] = bf0[59];
+  bf1[60] = bf0[60];
+  bf1[61] = half_btf(-cospi[4], bf0[34], cospi[60], bf0[61], cos_bit);
+  bf1[62] = half_btf(cospi[60], bf0[33], cospi[4], bf0[62], cos_bit);
+  bf1[63] = bf0[63];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 5
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = bf0[0];
+  bf1[1] = bf0[1];
+  bf1[2] = bf0[2];
+  bf1[3] = bf0[3];
+  bf1[4] = half_btf(cospi[56], bf0[4], -cospi[8], bf0[7], cos_bit);
+  bf1[5] = half_btf(cospi[24], bf0[5], -cospi[40], bf0[6], cos_bit);
+  bf1[6] = half_btf(cospi[40], bf0[5], cospi[24], bf0[6], cos_bit);
+  bf1[7] = half_btf(cospi[8], bf0[4], cospi[56], bf0[7], cos_bit);
+  bf1[8] = clamp_value(bf0[8] + bf0[9], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[8] - bf0[9], stage_range[stage]);
+  bf1[10] = clamp_value(-bf0[10] + bf0[11], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[10] + bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[12] + bf0[13], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[12] - bf0[13], stage_range[stage]);
+  bf1[14] = clamp_value(-bf0[14] + bf0[15], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[14] + bf0[15], stage_range[stage]);
+  bf1[16] = bf0[16];
+  bf1[17] = half_btf(-cospi[8], bf0[17], cospi[56], bf0[30], cos_bit);
+  bf1[18] = half_btf(-cospi[56], bf0[18], -cospi[8], bf0[29], cos_bit);
+  bf1[19] = bf0[19];
+  bf1[20] = bf0[20];
+  bf1[21] = half_btf(-cospi[40], bf0[21], cospi[24], bf0[26], cos_bit);
+  bf1[22] = half_btf(-cospi[24], bf0[22], -cospi[40], bf0[25], cos_bit);
+  bf1[23] = bf0[23];
+  bf1[24] = bf0[24];
+  bf1[25] = half_btf(-cospi[40], bf0[22], cospi[24], bf0[25], cos_bit);
+  bf1[26] = half_btf(cospi[24], bf0[21], cospi[40], bf0[26], cos_bit);
+  bf1[27] = bf0[27];
+  bf1[28] = bf0[28];
+  bf1[29] = half_btf(-cospi[8], bf0[18], cospi[56], bf0[29], cos_bit);
+  bf1[30] = half_btf(cospi[56], bf0[17], cospi[8], bf0[30], cos_bit);
+  bf1[31] = bf0[31];
+  bf1[32] = clamp_value(bf0[32] + bf0[35], stage_range[stage]);
+  bf1[33] = clamp_value(bf0[33] + bf0[34], stage_range[stage]);
+  bf1[34] = clamp_value(bf0[33] - bf0[34], stage_range[stage]);
+  bf1[35] = clamp_value(bf0[32] - bf0[35], stage_range[stage]);
+  bf1[36] = clamp_value(-bf0[36] + bf0[39], stage_range[stage]);
+  bf1[37] = clamp_value(-bf0[37] + bf0[38], stage_range[stage]);
+  bf1[38] = clamp_value(bf0[37] + bf0[38], stage_range[stage]);
+  bf1[39] = clamp_value(bf0[36] + bf0[39], stage_range[stage]);
+  bf1[40] = clamp_value(bf0[40] + bf0[43], stage_range[stage]);
+  bf1[41] = clamp_value(bf0[41] + bf0[42], stage_range[stage]);
+  bf1[42] = clamp_value(bf0[41] - bf0[42], stage_range[stage]);
+  bf1[43] = clamp_value(bf0[40] - bf0[43], stage_range[stage]);
+  bf1[44] = clamp_value(-bf0[44] + bf0[47], stage_range[stage]);
+  bf1[45] = clamp_value(-bf0[45] + bf0[46], stage_range[stage]);
+  bf1[46] = clamp_value(bf0[45] + bf0[46], stage_range[stage]);
+  bf1[47] = clamp_value(bf0[44] + bf0[47], stage_range[stage]);
+  bf1[48] = clamp_value(bf0[48] + bf0[51], stage_range[stage]);
+  bf1[49] = clamp_value(bf0[49] + bf0[50], stage_range[stage]);
+  bf1[50] = clamp_value(bf0[49] - bf0[50], stage_range[stage]);
+  bf1[51] = clamp_value(bf0[48] - bf0[51], stage_range[stage]);
+  bf1[52] = clamp_value(-bf0[52] + bf0[55], stage_range[stage]);
+  bf1[53] = clamp_value(-bf0[53] + bf0[54], stage_range[stage]);
+  bf1[54] = clamp_value(bf0[53] + bf0[54], stage_range[stage]);
+  bf1[55] = clamp_value(bf0[52] + bf0[55], stage_range[stage]);
+  bf1[56] = clamp_value(bf0[56] + bf0[59], stage_range[stage]);
+  bf1[57] = clamp_value(bf0[57] + bf0[58], stage_range[stage]);
+  bf1[58] = clamp_value(bf0[57] - bf0[58], stage_range[stage]);
+  bf1[59] = clamp_value(bf0[56] - bf0[59], stage_range[stage]);
+  bf1[60] = clamp_value(-bf0[60] + bf0[63], stage_range[stage]);
+  bf1[61] = clamp_value(-bf0[61] + bf0[62], stage_range[stage]);
+  bf1[62] = clamp_value(bf0[61] + bf0[62], stage_range[stage]);
+  bf1[63] = clamp_value(bf0[60] + bf0[63], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 6
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = half_btf(cospi[32], bf0[0], cospi[32], bf0[1], cos_bit);
+  bf1[1] = half_btf(cospi[32], bf0[0], -cospi[32], bf0[1], cos_bit);
+  bf1[2] = half_btf(cospi[48], bf0[2], -cospi[16], bf0[3], cos_bit);
+  bf1[3] = half_btf(cospi[16], bf0[2], cospi[48], bf0[3], cos_bit);
+  bf1[4] = clamp_value(bf0[4] + bf0[5], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[4] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(-bf0[6] + bf0[7], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[6] + bf0[7], stage_range[stage]);
+  bf1[8] = bf0[8];
+  bf1[9] = half_btf(-cospi[16], bf0[9], cospi[48], bf0[14], cos_bit);
+  bf1[10] = half_btf(-cospi[48], bf0[10], -cospi[16], bf0[13], cos_bit);
+  bf1[11] = bf0[11];
+  bf1[12] = bf0[12];
+  bf1[13] = half_btf(-cospi[16], bf0[10], cospi[48], bf0[13], cos_bit);
+  bf1[14] = half_btf(cospi[48], bf0[9], cospi[16], bf0[14], cos_bit);
+  bf1[15] = bf0[15];
+  bf1[16] = clamp_value(bf0[16] + bf0[19], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[17] + bf0[18], stage_range[stage]);
+  bf1[18] = clamp_value(bf0[17] - bf0[18], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[16] - bf0[19], stage_range[stage]);
+  bf1[20] = clamp_value(-bf0[20] + bf0[23], stage_range[stage]);
+  bf1[21] = clamp_value(-bf0[21] + bf0[22], stage_range[stage]);
+  bf1[22] = clamp_value(bf0[21] + bf0[22], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[20] + bf0[23], stage_range[stage]);
+  bf1[24] = clamp_value(bf0[24] + bf0[27], stage_range[stage]);
+  bf1[25] = clamp_value(bf0[25] + bf0[26], stage_range[stage]);
+  bf1[26] = clamp_value(bf0[25] - bf0[26], stage_range[stage]);
+  bf1[27] = clamp_value(bf0[24] - bf0[27], stage_range[stage]);
+  bf1[28] = clamp_value(-bf0[28] + bf0[31], stage_range[stage]);
+  bf1[29] = clamp_value(-bf0[29] + bf0[30], stage_range[stage]);
+  bf1[30] = clamp_value(bf0[29] + bf0[30], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[28] + bf0[31], stage_range[stage]);
+  bf1[32] = bf0[32];
+  bf1[33] = bf0[33];
+  bf1[34] = half_btf(-cospi[8], bf0[34], cospi[56], bf0[61], cos_bit);
+  bf1[35] = half_btf(-cospi[8], bf0[35], cospi[56], bf0[60], cos_bit);
+  bf1[36] = half_btf(-cospi[56], bf0[36], -cospi[8], bf0[59], cos_bit);
+  bf1[37] = half_btf(-cospi[56], bf0[37], -cospi[8], bf0[58], cos_bit);
+  bf1[38] = bf0[38];
+  bf1[39] = bf0[39];
+  bf1[40] = bf0[40];
+  bf1[41] = bf0[41];
+  bf1[42] = half_btf(-cospi[40], bf0[42], cospi[24], bf0[53], cos_bit);
+  bf1[43] = half_btf(-cospi[40], bf0[43], cospi[24], bf0[52], cos_bit);
+  bf1[44] = half_btf(-cospi[24], bf0[44], -cospi[40], bf0[51], cos_bit);
+  bf1[45] = half_btf(-cospi[24], bf0[45], -cospi[40], bf0[50], cos_bit);
+  bf1[46] = bf0[46];
+  bf1[47] = bf0[47];
+  bf1[48] = bf0[48];
+  bf1[49] = bf0[49];
+  bf1[50] = half_btf(-cospi[40], bf0[45], cospi[24], bf0[50], cos_bit);
+  bf1[51] = half_btf(-cospi[40], bf0[44], cospi[24], bf0[51], cos_bit);
+  bf1[52] = half_btf(cospi[24], bf0[43], cospi[40], bf0[52], cos_bit);
+  bf1[53] = half_btf(cospi[24], bf0[42], cospi[40], bf0[53], cos_bit);
+  bf1[54] = bf0[54];
+  bf1[55] = bf0[55];
+  bf1[56] = bf0[56];
+  bf1[57] = bf0[57];
+  bf1[58] = half_btf(-cospi[8], bf0[37], cospi[56], bf0[58], cos_bit);
+  bf1[59] = half_btf(-cospi[8], bf0[36], cospi[56], bf0[59], cos_bit);
+  bf1[60] = half_btf(cospi[56], bf0[35], cospi[8], bf0[60], cos_bit);
+  bf1[61] = half_btf(cospi[56], bf0[34], cospi[8], bf0[61], cos_bit);
+  bf1[62] = bf0[62];
+  bf1[63] = bf0[63];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 7
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[3], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[2], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[1] - bf0[2], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[0] - bf0[3], stage_range[stage]);
+  bf1[4] = bf0[4];
+  bf1[5] = half_btf(-cospi[32], bf0[5], cospi[32], bf0[6], cos_bit);
+  bf1[6] = half_btf(cospi[32], bf0[5], cospi[32], bf0[6], cos_bit);
+  bf1[7] = bf0[7];
+  bf1[8] = clamp_value(bf0[8] + bf0[11], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[9] + bf0[10], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[9] - bf0[10], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[8] - bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(-bf0[12] + bf0[15], stage_range[stage]);
+  bf1[13] = clamp_value(-bf0[13] + bf0[14], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[13] + bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[12] + bf0[15], stage_range[stage]);
+  bf1[16] = bf0[16];
+  bf1[17] = bf0[17];
+  bf1[18] = half_btf(-cospi[16], bf0[18], cospi[48], bf0[29], cos_bit);
+  bf1[19] = half_btf(-cospi[16], bf0[19], cospi[48], bf0[28], cos_bit);
+  bf1[20] = half_btf(-cospi[48], bf0[20], -cospi[16], bf0[27], cos_bit);
+  bf1[21] = half_btf(-cospi[48], bf0[21], -cospi[16], bf0[26], cos_bit);
+  bf1[22] = bf0[22];
+  bf1[23] = bf0[23];
+  bf1[24] = bf0[24];
+  bf1[25] = bf0[25];
+  bf1[26] = half_btf(-cospi[16], bf0[21], cospi[48], bf0[26], cos_bit);
+  bf1[27] = half_btf(-cospi[16], bf0[20], cospi[48], bf0[27], cos_bit);
+  bf1[28] = half_btf(cospi[48], bf0[19], cospi[16], bf0[28], cos_bit);
+  bf1[29] = half_btf(cospi[48], bf0[18], cospi[16], bf0[29], cos_bit);
+  bf1[30] = bf0[30];
+  bf1[31] = bf0[31];
+  bf1[32] = clamp_value(bf0[32] + bf0[39], stage_range[stage]);
+  bf1[33] = clamp_value(bf0[33] + bf0[38], stage_range[stage]);
+  bf1[34] = clamp_value(bf0[34] + bf0[37], stage_range[stage]);
+  bf1[35] = clamp_value(bf0[35] + bf0[36], stage_range[stage]);
+  bf1[36] = clamp_value(bf0[35] - bf0[36], stage_range[stage]);
+  bf1[37] = clamp_value(bf0[34] - bf0[37], stage_range[stage]);
+  bf1[38] = clamp_value(bf0[33] - bf0[38], stage_range[stage]);
+  bf1[39] = clamp_value(bf0[32] - bf0[39], stage_range[stage]);
+  bf1[40] = clamp_value(-bf0[40] + bf0[47], stage_range[stage]);
+  bf1[41] = clamp_value(-bf0[41] + bf0[46], stage_range[stage]);
+  bf1[42] = clamp_value(-bf0[42] + bf0[45], stage_range[stage]);
+  bf1[43] = clamp_value(-bf0[43] + bf0[44], stage_range[stage]);
+  bf1[44] = clamp_value(bf0[43] + bf0[44], stage_range[stage]);
+  bf1[45] = clamp_value(bf0[42] + bf0[45], stage_range[stage]);
+  bf1[46] = clamp_value(bf0[41] + bf0[46], stage_range[stage]);
+  bf1[47] = clamp_value(bf0[40] + bf0[47], stage_range[stage]);
+  bf1[48] = clamp_value(bf0[48] + bf0[55], stage_range[stage]);
+  bf1[49] = clamp_value(bf0[49] + bf0[54], stage_range[stage]);
+  bf1[50] = clamp_value(bf0[50] + bf0[53], stage_range[stage]);
+  bf1[51] = clamp_value(bf0[51] + bf0[52], stage_range[stage]);
+  bf1[52] = clamp_value(bf0[51] - bf0[52], stage_range[stage]);
+  bf1[53] = clamp_value(bf0[50] - bf0[53], stage_range[stage]);
+  bf1[54] = clamp_value(bf0[49] - bf0[54], stage_range[stage]);
+  bf1[55] = clamp_value(bf0[48] - bf0[55], stage_range[stage]);
+  bf1[56] = clamp_value(-bf0[56] + bf0[63], stage_range[stage]);
+  bf1[57] = clamp_value(-bf0[57] + bf0[62], stage_range[stage]);
+  bf1[58] = clamp_value(-bf0[58] + bf0[61], stage_range[stage]);
+  bf1[59] = clamp_value(-bf0[59] + bf0[60], stage_range[stage]);
+  bf1[60] = clamp_value(bf0[59] + bf0[60], stage_range[stage]);
+  bf1[61] = clamp_value(bf0[58] + bf0[61], stage_range[stage]);
+  bf1[62] = clamp_value(bf0[57] + bf0[62], stage_range[stage]);
+  bf1[63] = clamp_value(bf0[56] + bf0[63], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 8
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = clamp_value(bf0[0] + bf0[7], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[6], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[5], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[4], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[3] - bf0[4], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[2] - bf0[5], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[1] - bf0[6], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[0] - bf0[7], stage_range[stage]);
+  bf1[8] = bf0[8];
+  bf1[9] = bf0[9];
+  bf1[10] = half_btf(-cospi[32], bf0[10], cospi[32], bf0[13], cos_bit);
+  bf1[11] = half_btf(-cospi[32], bf0[11], cospi[32], bf0[12], cos_bit);
+  bf1[12] = half_btf(cospi[32], bf0[11], cospi[32], bf0[12], cos_bit);
+  bf1[13] = half_btf(cospi[32], bf0[10], cospi[32], bf0[13], cos_bit);
+  bf1[14] = bf0[14];
+  bf1[15] = bf0[15];
+  bf1[16] = clamp_value(bf0[16] + bf0[23], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[17] + bf0[22], stage_range[stage]);
+  bf1[18] = clamp_value(bf0[18] + bf0[21], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[19] + bf0[20], stage_range[stage]);
+  bf1[20] = clamp_value(bf0[19] - bf0[20], stage_range[stage]);
+  bf1[21] = clamp_value(bf0[18] - bf0[21], stage_range[stage]);
+  bf1[22] = clamp_value(bf0[17] - bf0[22], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[16] - bf0[23], stage_range[stage]);
+  bf1[24] = clamp_value(-bf0[24] + bf0[31], stage_range[stage]);
+  bf1[25] = clamp_value(-bf0[25] + bf0[30], stage_range[stage]);
+  bf1[26] = clamp_value(-bf0[26] + bf0[29], stage_range[stage]);
+  bf1[27] = clamp_value(-bf0[27] + bf0[28], stage_range[stage]);
+  bf1[28] = clamp_value(bf0[27] + bf0[28], stage_range[stage]);
+  bf1[29] = clamp_value(bf0[26] + bf0[29], stage_range[stage]);
+  bf1[30] = clamp_value(bf0[25] + bf0[30], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[24] + bf0[31], stage_range[stage]);
+  bf1[32] = bf0[32];
+  bf1[33] = bf0[33];
+  bf1[34] = bf0[34];
+  bf1[35] = bf0[35];
+  bf1[36] = half_btf(-cospi[16], bf0[36], cospi[48], bf0[59], cos_bit);
+  bf1[37] = half_btf(-cospi[16], bf0[37], cospi[48], bf0[58], cos_bit);
+  bf1[38] = half_btf(-cospi[16], bf0[38], cospi[48], bf0[57], cos_bit);
+  bf1[39] = half_btf(-cospi[16], bf0[39], cospi[48], bf0[56], cos_bit);
+  bf1[40] = half_btf(-cospi[48], bf0[40], -cospi[16], bf0[55], cos_bit);
+  bf1[41] = half_btf(-cospi[48], bf0[41], -cospi[16], bf0[54], cos_bit);
+  bf1[42] = half_btf(-cospi[48], bf0[42], -cospi[16], bf0[53], cos_bit);
+  bf1[43] = half_btf(-cospi[48], bf0[43], -cospi[16], bf0[52], cos_bit);
+  bf1[44] = bf0[44];
+  bf1[45] = bf0[45];
+  bf1[46] = bf0[46];
+  bf1[47] = bf0[47];
+  bf1[48] = bf0[48];
+  bf1[49] = bf0[49];
+  bf1[50] = bf0[50];
+  bf1[51] = bf0[51];
+  bf1[52] = half_btf(-cospi[16], bf0[43], cospi[48], bf0[52], cos_bit);
+  bf1[53] = half_btf(-cospi[16], bf0[42], cospi[48], bf0[53], cos_bit);
+  bf1[54] = half_btf(-cospi[16], bf0[41], cospi[48], bf0[54], cos_bit);
+  bf1[55] = half_btf(-cospi[16], bf0[40], cospi[48], bf0[55], cos_bit);
+  bf1[56] = half_btf(cospi[48], bf0[39], cospi[16], bf0[56], cos_bit);
+  bf1[57] = half_btf(cospi[48], bf0[38], cospi[16], bf0[57], cos_bit);
+  bf1[58] = half_btf(cospi[48], bf0[37], cospi[16], bf0[58], cos_bit);
+  bf1[59] = half_btf(cospi[48], bf0[36], cospi[16], bf0[59], cos_bit);
+  bf1[60] = bf0[60];
+  bf1[61] = bf0[61];
+  bf1[62] = bf0[62];
+  bf1[63] = bf0[63];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 9
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[15], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[14], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[13], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[12], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[11], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[10], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[6] + bf0[9], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[7] + bf0[8], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[7] - bf0[8], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[6] - bf0[9], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[5] - bf0[10], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[4] - bf0[11], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[3] - bf0[12], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[2] - bf0[13], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[1] - bf0[14], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[0] - bf0[15], stage_range[stage]);
+  bf1[16] = bf0[16];
+  bf1[17] = bf0[17];
+  bf1[18] = bf0[18];
+  bf1[19] = bf0[19];
+  bf1[20] = half_btf(-cospi[32], bf0[20], cospi[32], bf0[27], cos_bit);
+  bf1[21] = half_btf(-cospi[32], bf0[21], cospi[32], bf0[26], cos_bit);
+  bf1[22] = half_btf(-cospi[32], bf0[22], cospi[32], bf0[25], cos_bit);
+  bf1[23] = half_btf(-cospi[32], bf0[23], cospi[32], bf0[24], cos_bit);
+  bf1[24] = half_btf(cospi[32], bf0[23], cospi[32], bf0[24], cos_bit);
+  bf1[25] = half_btf(cospi[32], bf0[22], cospi[32], bf0[25], cos_bit);
+  bf1[26] = half_btf(cospi[32], bf0[21], cospi[32], bf0[26], cos_bit);
+  bf1[27] = half_btf(cospi[32], bf0[20], cospi[32], bf0[27], cos_bit);
+  bf1[28] = bf0[28];
+  bf1[29] = bf0[29];
+  bf1[30] = bf0[30];
+  bf1[31] = bf0[31];
+  bf1[32] = clamp_value(bf0[32] + bf0[47], stage_range[stage]);
+  bf1[33] = clamp_value(bf0[33] + bf0[46], stage_range[stage]);
+  bf1[34] = clamp_value(bf0[34] + bf0[45], stage_range[stage]);
+  bf1[35] = clamp_value(bf0[35] + bf0[44], stage_range[stage]);
+  bf1[36] = clamp_value(bf0[36] + bf0[43], stage_range[stage]);
+  bf1[37] = clamp_value(bf0[37] + bf0[42], stage_range[stage]);
+  bf1[38] = clamp_value(bf0[38] + bf0[41], stage_range[stage]);
+  bf1[39] = clamp_value(bf0[39] + bf0[40], stage_range[stage]);
+  bf1[40] = clamp_value(bf0[39] - bf0[40], stage_range[stage]);
+  bf1[41] = clamp_value(bf0[38] - bf0[41], stage_range[stage]);
+  bf1[42] = clamp_value(bf0[37] - bf0[42], stage_range[stage]);
+  bf1[43] = clamp_value(bf0[36] - bf0[43], stage_range[stage]);
+  bf1[44] = clamp_value(bf0[35] - bf0[44], stage_range[stage]);
+  bf1[45] = clamp_value(bf0[34] - bf0[45], stage_range[stage]);
+  bf1[46] = clamp_value(bf0[33] - bf0[46], stage_range[stage]);
+  bf1[47] = clamp_value(bf0[32] - bf0[47], stage_range[stage]);
+  bf1[48] = clamp_value(-bf0[48] + bf0[63], stage_range[stage]);
+  bf1[49] = clamp_value(-bf0[49] + bf0[62], stage_range[stage]);
+  bf1[50] = clamp_value(-bf0[50] + bf0[61], stage_range[stage]);
+  bf1[51] = clamp_value(-bf0[51] + bf0[60], stage_range[stage]);
+  bf1[52] = clamp_value(-bf0[52] + bf0[59], stage_range[stage]);
+  bf1[53] = clamp_value(-bf0[53] + bf0[58], stage_range[stage]);
+  bf1[54] = clamp_value(-bf0[54] + bf0[57], stage_range[stage]);
+  bf1[55] = clamp_value(-bf0[55] + bf0[56], stage_range[stage]);
+  bf1[56] = clamp_value(bf0[55] + bf0[56], stage_range[stage]);
+  bf1[57] = clamp_value(bf0[54] + bf0[57], stage_range[stage]);
+  bf1[58] = clamp_value(bf0[53] + bf0[58], stage_range[stage]);
+  bf1[59] = clamp_value(bf0[52] + bf0[59], stage_range[stage]);
+  bf1[60] = clamp_value(bf0[51] + bf0[60], stage_range[stage]);
+  bf1[61] = clamp_value(bf0[50] + bf0[61], stage_range[stage]);
+  bf1[62] = clamp_value(bf0[49] + bf0[62], stage_range[stage]);
+  bf1[63] = clamp_value(bf0[48] + bf0[63], stage_range[stage]);
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 10
+  stage++;
+  bf0 = output;
+  bf1 = step;
+  bf1[0] = clamp_value(bf0[0] + bf0[31], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[30], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[29], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[28], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[27], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[26], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[6] + bf0[25], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[7] + bf0[24], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[8] + bf0[23], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[9] + bf0[22], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[10] + bf0[21], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[11] + bf0[20], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[12] + bf0[19], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[13] + bf0[18], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[14] + bf0[17], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[15] + bf0[16], stage_range[stage]);
+  bf1[16] = clamp_value(bf0[15] - bf0[16], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[14] - bf0[17], stage_range[stage]);
+  bf1[18] = clamp_value(bf0[13] - bf0[18], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[12] - bf0[19], stage_range[stage]);
+  bf1[20] = clamp_value(bf0[11] - bf0[20], stage_range[stage]);
+  bf1[21] = clamp_value(bf0[10] - bf0[21], stage_range[stage]);
+  bf1[22] = clamp_value(bf0[9] - bf0[22], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[8] - bf0[23], stage_range[stage]);
+  bf1[24] = clamp_value(bf0[7] - bf0[24], stage_range[stage]);
+  bf1[25] = clamp_value(bf0[6] - bf0[25], stage_range[stage]);
+  bf1[26] = clamp_value(bf0[5] - bf0[26], stage_range[stage]);
+  bf1[27] = clamp_value(bf0[4] - bf0[27], stage_range[stage]);
+  bf1[28] = clamp_value(bf0[3] - bf0[28], stage_range[stage]);
+  bf1[29] = clamp_value(bf0[2] - bf0[29], stage_range[stage]);
+  bf1[30] = clamp_value(bf0[1] - bf0[30], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[0] - bf0[31], stage_range[stage]);
+  bf1[32] = bf0[32];
+  bf1[33] = bf0[33];
+  bf1[34] = bf0[34];
+  bf1[35] = bf0[35];
+  bf1[36] = bf0[36];
+  bf1[37] = bf0[37];
+  bf1[38] = bf0[38];
+  bf1[39] = bf0[39];
+  bf1[40] = half_btf(-cospi[32], bf0[40], cospi[32], bf0[55], cos_bit);
+  bf1[41] = half_btf(-cospi[32], bf0[41], cospi[32], bf0[54], cos_bit);
+  bf1[42] = half_btf(-cospi[32], bf0[42], cospi[32], bf0[53], cos_bit);
+  bf1[43] = half_btf(-cospi[32], bf0[43], cospi[32], bf0[52], cos_bit);
+  bf1[44] = half_btf(-cospi[32], bf0[44], cospi[32], bf0[51], cos_bit);
+  bf1[45] = half_btf(-cospi[32], bf0[45], cospi[32], bf0[50], cos_bit);
+  bf1[46] = half_btf(-cospi[32], bf0[46], cospi[32], bf0[49], cos_bit);
+  bf1[47] = half_btf(-cospi[32], bf0[47], cospi[32], bf0[48], cos_bit);
+  bf1[48] = half_btf(cospi[32], bf0[47], cospi[32], bf0[48], cos_bit);
+  bf1[49] = half_btf(cospi[32], bf0[46], cospi[32], bf0[49], cos_bit);
+  bf1[50] = half_btf(cospi[32], bf0[45], cospi[32], bf0[50], cos_bit);
+  bf1[51] = half_btf(cospi[32], bf0[44], cospi[32], bf0[51], cos_bit);
+  bf1[52] = half_btf(cospi[32], bf0[43], cospi[32], bf0[52], cos_bit);
+  bf1[53] = half_btf(cospi[32], bf0[42], cospi[32], bf0[53], cos_bit);
+  bf1[54] = half_btf(cospi[32], bf0[41], cospi[32], bf0[54], cos_bit);
+  bf1[55] = half_btf(cospi[32], bf0[40], cospi[32], bf0[55], cos_bit);
+  bf1[56] = bf0[56];
+  bf1[57] = bf0[57];
+  bf1[58] = bf0[58];
+  bf1[59] = bf0[59];
+  bf1[60] = bf0[60];
+  bf1[61] = bf0[61];
+  bf1[62] = bf0[62];
+  bf1[63] = bf0[63];
+  av1_range_check_buf(stage, input, bf1, size, stage_range[stage]);
+
+  // stage 11
+  stage++;
+  bf0 = step;
+  bf1 = output;
+  bf1[0] = clamp_value(bf0[0] + bf0[63], stage_range[stage]);
+  bf1[1] = clamp_value(bf0[1] + bf0[62], stage_range[stage]);
+  bf1[2] = clamp_value(bf0[2] + bf0[61], stage_range[stage]);
+  bf1[3] = clamp_value(bf0[3] + bf0[60], stage_range[stage]);
+  bf1[4] = clamp_value(bf0[4] + bf0[59], stage_range[stage]);
+  bf1[5] = clamp_value(bf0[5] + bf0[58], stage_range[stage]);
+  bf1[6] = clamp_value(bf0[6] + bf0[57], stage_range[stage]);
+  bf1[7] = clamp_value(bf0[7] + bf0[56], stage_range[stage]);
+  bf1[8] = clamp_value(bf0[8] + bf0[55], stage_range[stage]);
+  bf1[9] = clamp_value(bf0[9] + bf0[54], stage_range[stage]);
+  bf1[10] = clamp_value(bf0[10] + bf0[53], stage_range[stage]);
+  bf1[11] = clamp_value(bf0[11] + bf0[52], stage_range[stage]);
+  bf1[12] = clamp_value(bf0[12] + bf0[51], stage_range[stage]);
+  bf1[13] = clamp_value(bf0[13] + bf0[50], stage_range[stage]);
+  bf1[14] = clamp_value(bf0[14] + bf0[49], stage_range[stage]);
+  bf1[15] = clamp_value(bf0[15] + bf0[48], stage_range[stage]);
+  bf1[16] = clamp_value(bf0[16] + bf0[47], stage_range[stage]);
+  bf1[17] = clamp_value(bf0[17] + bf0[46], stage_range[stage]);
+  bf1[18] = clamp_value(bf0[18] + bf0[45], stage_range[stage]);
+  bf1[19] = clamp_value(bf0[19] + bf0[44], stage_range[stage]);
+  bf1[20] = clamp_value(bf0[20] + bf0[43], stage_range[stage]);
+  bf1[21] = clamp_value(bf0[21] + bf0[42], stage_range[stage]);
+  bf1[22] = clamp_value(bf0[22] + bf0[41], stage_range[stage]);
+  bf1[23] = clamp_value(bf0[23] + bf0[40], stage_range[stage]);
+  bf1[24] = clamp_value(bf0[24] + bf0[39], stage_range[stage]);
+  bf1[25] = clamp_value(bf0[25] + bf0[38], stage_range[stage]);
+  bf1[26] = clamp_value(bf0[26] + bf0[37], stage_range[stage]);
+  bf1[27] = clamp_value(bf0[27] + bf0[36], stage_range[stage]);
+  bf1[28] = clamp_value(bf0[28] + bf0[35], stage_range[stage]);
+  bf1[29] = clamp_value(bf0[29] + bf0[34], stage_range[stage]);
+  bf1[30] = clamp_value(bf0[30] + bf0[33], stage_range[stage]);
+  bf1[31] = clamp_value(bf0[31] + bf0[32], stage_range[stage]);
+  bf1[32] = clamp_value(bf0[31] - bf0[32], stage_range[stage]);
+  bf1[33] = clamp_value(bf0[30] - bf0[33], stage_range[stage]);
+  bf1[34] = clamp_value(bf0[29] - bf0[34], stage_range[stage]);
+  bf1[35] = clamp_value(bf0[28] - bf0[35], stage_range[stage]);
+  bf1[36] = clamp_value(bf0[27] - bf0[36], stage_range[stage]);
+  bf1[37] = clamp_value(bf0[26] - bf0[37], stage_range[stage]);
+  bf1[38] = clamp_value(bf0[25] - bf0[38], stage_range[stage]);
+  bf1[39] = clamp_value(bf0[24] - bf0[39], stage_range[stage]);
+  bf1[40] = clamp_value(bf0[23] - bf0[40], stage_range[stage]);
+  bf1[41] = clamp_value(bf0[22] - bf0[41], stage_range[stage]);
+  bf1[42] = clamp_value(bf0[21] - bf0[42], stage_range[stage]);
+  bf1[43] = clamp_value(bf0[20] - bf0[43], stage_range[stage]);
+  bf1[44] = clamp_value(bf0[19] - bf0[44], stage_range[stage]);
+  bf1[45] = clamp_value(bf0[18] - bf0[45], stage_range[stage]);
+  bf1[46] = clamp_value(bf0[17] - bf0[46], stage_range[stage]);
+  bf1[47] = clamp_value(bf0[16] - bf0[47], stage_range[stage]);
+  bf1[48] = clamp_value(bf0[15] - bf0[48], stage_range[stage]);
+  bf1[49] = clamp_value(bf0[14] - bf0[49], stage_range[stage]);
+  bf1[50] = clamp_value(bf0[13] - bf0[50], stage_range[stage]);
+  bf1[51] = clamp_value(bf0[12] - bf0[51], stage_range[stage]);
+  bf1[52] = clamp_value(bf0[11] - bf0[52], stage_range[stage]);
+  bf1[53] = clamp_value(bf0[10] - bf0[53], stage_range[stage]);
+  bf1[54] = clamp_value(bf0[9] - bf0[54], stage_range[stage]);
+  bf1[55] = clamp_value(bf0[8] - bf0[55], stage_range[stage]);
+  bf1[56] = clamp_value(bf0[7] - bf0[56], stage_range[stage]);
+  bf1[57] = clamp_value(bf0[6] - bf0[57], stage_range[stage]);
+  bf1[58] = clamp_value(bf0[5] - bf0[58], stage_range[stage]);
+  bf1[59] = clamp_value(bf0[4] - bf0[59], stage_range[stage]);
+  bf1[60] = clamp_value(bf0[3] - bf0[60], stage_range[stage]);
+  bf1[61] = clamp_value(bf0[2] - bf0[61], stage_range[stage]);
+  bf1[62] = clamp_value(bf0[1] - bf0[62], stage_range[stage]);
+  bf1[63] = clamp_value(bf0[0] - bf0[63], stage_range[stage]);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.h
new file mode 100644
index 0000000000..08fb382ab3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_AV1_INV_TXFM1D_H_
+#define AOM_AV1_COMMON_AV1_INV_TXFM1D_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static INLINE int32_t clamp_value(int32_t value, int8_t bit) {
+  if (bit <= 0) return value;  // Do nothing for invalid clamp bit.
+  const int64_t max_value = (1LL << (bit - 1)) - 1;
+  const int64_t min_value = -(1LL << (bit - 1));
+  return (int32_t)clamp64(value, min_value, max_value);
+}
+
+static INLINE void clamp_buf(int32_t *buf, int32_t size, int8_t bit) {
+  for (int i = 0; i < size; ++i) buf[i] = clamp_value(buf[i], bit);
+}
+
+void av1_idct4(const int32_t *input, int32_t *output, int8_t cos_bit,
+               const int8_t *stage_range);
+void av1_idct8(const int32_t *input, int32_t *output, int8_t cos_bit,
+               const int8_t *stage_range);
+void av1_idct16(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range);
+void av1_idct32(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range);
+void av1_idct64(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range);
+void av1_iadst4(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range);
+void av1_iadst8(const int32_t *input, int32_t *output, int8_t cos_bit,
+                const int8_t *stage_range);
+void av1_iadst16(const int32_t *input, int32_t *output, int8_t cos_bit,
+                 const int8_t *stage_range);
+void av1_iidentity4_c(const int32_t *input, int32_t *output, int8_t cos_bit,
+                      const int8_t *stage_range);
+void av1_iidentity8_c(const int32_t *input, int32_t *output, int8_t cos_bit,
+                      const int8_t *stage_range);
+void av1_iidentity16_c(const int32_t *input, int32_t *output, int8_t cos_bit,
+                       const int8_t *stage_range);
+void av1_iidentity32_c(const int32_t *input, int32_t *output, int8_t cos_bit,
+                       const int8_t *stage_range);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // AOM_AV1_COMMON_AV1_INV_TXFM1D_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d_cfg.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d_cfg.h
new file mode 100644
index 0000000000..9c247b8a00
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d_cfg.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_AV1_INV_TXFM1D_CFG_H_
+#define AOM_AV1_COMMON_AV1_INV_TXFM1D_CFG_H_
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.h"
+
+// sum of fwd_shift_##
+static const int8_t inv_start_range[TX_SIZES_ALL] = {
+  5,  // 4x4 transform
+  6,  // 8x8 transform
+  7,  // 16x16 transform
+  7,  // 32x32 transform
+  7,  // 64x64 transform
+  5,  // 4x8 transform
+  5,  // 8x4 transform
+  6,  // 8x16 transform
+  6,  // 16x8 transform
+  6,  // 16x32 transform
+  6,  // 32x16 transform
+  6,  // 32x64 transform
+  6,  // 64x32 transform
+  6,  // 4x16 transform
+  6,  // 16x4 transform
+  7,  // 8x32 transform
+  7,  // 32x8 transform
+  7,  // 16x64 transform
+  7,  // 64x16 transform
+};
+
+extern const int8_t *av1_inv_txfm_shift_ls[TX_SIZES_ALL];
+
+// Values in both av1_inv_cos_bit_col and av1_inv_cos_bit_row are always 12
+// for each valid row and col combination
+#define INV_COS_BIT 12
+extern const int8_t av1_inv_cos_bit_col[5 /*row*/][5 /*col*/];
+extern const int8_t av1_inv_cos_bit_row[5 /*row*/][5 /*col*/];
+
+#endif  // AOM_AV1_COMMON_AV1_INV_TXFM1D_CFG_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm2d.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm2d.c
new file mode 100644
index 0000000000..9fadcaa9f6
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm2d.c
@@ -0,0 +1,504 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d_cfg.h"
+
+void av1_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest8,
+                                 int stride, int bd) {
+  /* 4-point reversible, orthonormal inverse Walsh-Hadamard in 3.5 adds,
+     0.5 shifts per pixel. */
+  int i;
+  tran_low_t output[16];
+  tran_low_t a1, b1, c1, d1, e1;
+  const tran_low_t *ip = input;
+  tran_low_t *op = output;
+  uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);
+
+  for (i = 0; i < 4; i++) {
+    a1 = ip[0] >> UNIT_QUANT_SHIFT;
+    c1 = ip[1] >> UNIT_QUANT_SHIFT;
+    d1 = ip[2] >> UNIT_QUANT_SHIFT;
+    b1 = ip[3] >> UNIT_QUANT_SHIFT;
+    a1 += c1;
+    d1 -= b1;
+    e1 = (a1 - d1) >> 1;
+    b1 = e1 - b1;
+    c1 = e1 - c1;
+    a1 -= b1;
+    d1 += c1;
+
+    op[0] = a1;
+    op[1] = b1;
+    op[2] = c1;
+    op[3] = d1;
+    ip += 4;
+    op += 4;
+  }
+
+  ip = output;
+  for (i = 0; i < 4; i++) {
+    a1 = ip[4 * 0];
+    c1 = ip[4 * 1];
+    d1 = ip[4 * 2];
+    b1 = ip[4 * 3];
+    a1 += c1;
+    d1 -= b1;
+    e1 = (a1 - d1) >> 1;
+    b1 = e1 - b1;
+    c1 = e1 - c1;
+    a1 -= b1;
+    d1 += c1;
+
+    range_check_value(a1, bd + 1);
+    range_check_value(b1, bd + 1);
+    range_check_value(c1, bd + 1);
+    range_check_value(d1, bd + 1);
+
+    dest[stride * 0] = highbd_clip_pixel_add(dest[stride * 0], a1, bd);
+    dest[stride * 1] = highbd_clip_pixel_add(dest[stride * 1], b1, bd);
+    dest[stride * 2] = highbd_clip_pixel_add(dest[stride * 2], c1, bd);
+    dest[stride * 3] = highbd_clip_pixel_add(dest[stride * 3], d1, bd);
+
+    ip++;
+    dest++;
+  }
+}
+
+void av1_highbd_iwht4x4_1_add_c(const tran_low_t *in, uint8_t *dest8,
+                                int dest_stride, int bd) {
+  int i;
+  tran_low_t a1, e1;
+  tran_low_t tmp[4];
+  const tran_low_t *ip = in;
+  tran_low_t *op = tmp;
+  uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);
+  (void)bd;
+
+  a1 = ip[0] >> UNIT_QUANT_SHIFT;
+  e1 = a1 >> 1;
+  a1 -= e1;
+  op[0] = a1;
+  op[1] = op[2] = op[3] = e1;
+
+  ip = tmp;
+  for (i = 0; i < 4; i++) {
+    e1 = ip[0] >> 1;
+    a1 = ip[0] - e1;
+    dest[dest_stride * 0] =
+        highbd_clip_pixel_add(dest[dest_stride * 0], a1, bd);
+    dest[dest_stride * 1] =
+        highbd_clip_pixel_add(dest[dest_stride * 1], e1, bd);
+    dest[dest_stride * 2] =
+        highbd_clip_pixel_add(dest[dest_stride * 2], e1, bd);
+    dest[dest_stride * 3] =
+        highbd_clip_pixel_add(dest[dest_stride * 3], e1, bd);
+    ip++;
+    dest++;
+  }
+}
+
+static INLINE TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) {
+  switch (txfm_type) {
+    case TXFM_TYPE_DCT4: return av1_idct4;
+    case TXFM_TYPE_DCT8: return av1_idct8;
+    case TXFM_TYPE_DCT16: return av1_idct16;
+    case TXFM_TYPE_DCT32: return av1_idct32;
+    case TXFM_TYPE_DCT64: return av1_idct64;
+    case TXFM_TYPE_ADST4: return av1_iadst4;
+    case TXFM_TYPE_ADST8: return av1_iadst8;
+    case TXFM_TYPE_ADST16: return av1_iadst16;
+    case TXFM_TYPE_IDENTITY4: return av1_iidentity4_c;
+    case TXFM_TYPE_IDENTITY8: return av1_iidentity8_c;
+    case TXFM_TYPE_IDENTITY16: return av1_iidentity16_c;
+    case TXFM_TYPE_IDENTITY32: return av1_iidentity32_c;
+    default: assert(0); return NULL;
+  }
+}
+
+static const int8_t inv_shift_4x4[2] = { 0, -4 };
+static const int8_t inv_shift_8x8[2] = { -1, -4 };
+static const int8_t inv_shift_16x16[2] = { -2, -4 };
+static const int8_t inv_shift_32x32[2] = { -2, -4 };
+static const int8_t inv_shift_64x64[2] = { -2, -4 };
+static const int8_t inv_shift_4x8[2] = { 0, -4 };
+static const int8_t inv_shift_8x4[2] = { 0, -4 };
+static const int8_t inv_shift_8x16[2] = { -1, -4 };
+static const int8_t inv_shift_16x8[2] = { -1, -4 };
+static const int8_t inv_shift_16x32[2] = { -1, -4 };
+static const int8_t inv_shift_32x16[2] = { -1, -4 };
+static const int8_t inv_shift_32x64[2] = { -1, -4 };
+static const int8_t inv_shift_64x32[2] = { -1, -4 };
+static const int8_t inv_shift_4x16[2] = { -1, -4 };
+static const int8_t inv_shift_16x4[2] = { -1, -4 };
+static const int8_t inv_shift_8x32[2] = { -2, -4 };
+static const int8_t inv_shift_32x8[2] = { -2, -4 };
+static const int8_t inv_shift_16x64[2] = { -2, -4 };
+static const int8_t inv_shift_64x16[2] = { -2, -4 };
+
+const int8_t *av1_inv_txfm_shift_ls[TX_SIZES_ALL] = {
+  inv_shift_4x4,   inv_shift_8x8,   inv_shift_16x16, inv_shift_32x32,
+  inv_shift_64x64, inv_shift_4x8,   inv_shift_8x4,   inv_shift_8x16,
+  inv_shift_16x8,  inv_shift_16x32, inv_shift_32x16, inv_shift_32x64,
+  inv_shift_64x32, inv_shift_4x16,  inv_shift_16x4,  inv_shift_8x32,
+  inv_shift_32x8,  inv_shift_16x64, inv_shift_64x16,
+};
+
+/* clang-format off */
+const int8_t av1_inv_cos_bit_col[MAX_TXWH_IDX]      // txw_idx
+                            [MAX_TXWH_IDX] = {  // txh_idx
+    { INV_COS_BIT, INV_COS_BIT, INV_COS_BIT,           0,           0 },
+    { INV_COS_BIT, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT,           0 },
+    { INV_COS_BIT, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT },
+    {           0, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT },
+    {           0,           0, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT }
+  };
+
+const int8_t av1_inv_cos_bit_row[MAX_TXWH_IDX]      // txw_idx
+                            [MAX_TXWH_IDX] = {  // txh_idx
+    { INV_COS_BIT, INV_COS_BIT, INV_COS_BIT,           0,           0 },
+    { INV_COS_BIT, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT,           0 },
+    { INV_COS_BIT, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT },
+    {           0, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT },
+    {           0,           0, INV_COS_BIT, INV_COS_BIT, INV_COS_BIT }
+  };
+/* clang-format on */
+
+static const int8_t iadst4_range[7] = { 0, 1, 0, 0, 0, 0, 0 };
+
+void av1_get_inv_txfm_cfg(TX_TYPE tx_type, TX_SIZE tx_size,
+                          TXFM_2D_FLIP_CFG *cfg) {
+  assert(cfg != NULL);
+  cfg->tx_size = tx_size;
+  av1_zero(cfg->stage_range_col);
+  av1_zero(cfg->stage_range_row);
+  set_flip_cfg(tx_type, cfg);
+  const TX_TYPE_1D tx_type_1d_col = vtx_tab[tx_type];
+  const TX_TYPE_1D tx_type_1d_row = htx_tab[tx_type];
+  cfg->shift = av1_inv_txfm_shift_ls[tx_size];
+  const int txw_idx = get_txw_idx(tx_size);
+  const int txh_idx = get_txh_idx(tx_size);
+  cfg->cos_bit_col = av1_inv_cos_bit_col[txw_idx][txh_idx];
+  cfg->cos_bit_row = av1_inv_cos_bit_row[txw_idx][txh_idx];
+  cfg->txfm_type_col = av1_txfm_type_ls[txh_idx][tx_type_1d_col];
+  if (cfg->txfm_type_col == TXFM_TYPE_ADST4) {
+    memcpy(cfg->stage_range_col, iadst4_range, sizeof(iadst4_range));
+  }
+  cfg->txfm_type_row = av1_txfm_type_ls[txw_idx][tx_type_1d_row];
+  if (cfg->txfm_type_row == TXFM_TYPE_ADST4) {
+    memcpy(cfg->stage_range_row, iadst4_range, sizeof(iadst4_range));
+  }
+  cfg->stage_num_col = av1_txfm_stage_num_list[cfg->txfm_type_col];
+  cfg->stage_num_row = av1_txfm_stage_num_list[cfg->txfm_type_row];
+}
+
+void av1_gen_inv_stage_range(int8_t *stage_range_col, int8_t *stage_range_row,
+                             const TXFM_2D_FLIP_CFG *cfg, TX_SIZE tx_size,
+                             int bd) {
+  const int fwd_shift = inv_start_range[tx_size];
+  const int8_t *shift = cfg->shift;
+  int8_t opt_range_row, opt_range_col;
+  if (bd == 8) {
+    opt_range_row = 16;
+    opt_range_col = 16;
+  } else if (bd == 10) {
+    opt_range_row = 18;
+    opt_range_col = 16;
+  } else {
+    assert(bd == 12);
+    opt_range_row = 20;
+    opt_range_col = 18;
+  }
+  // i < MAX_TXFM_STAGE_NUM will mute above array bounds warning
+  for (int i = 0; i < cfg->stage_num_row && i < MAX_TXFM_STAGE_NUM; ++i) {
+    int real_range_row = cfg->stage_range_row[i] + fwd_shift + bd + 1;
+    (void)real_range_row;
+    if (cfg->txfm_type_row == TXFM_TYPE_ADST4 && i == 1) {
+      // the adst4 may use 1 extra bit on top of opt_range_row at stage 1
+      // so opt_range_row >= real_range_row will not hold
+      stage_range_row[i] = opt_range_row;
+    } else {
+      assert(opt_range_row >= real_range_row);
+      stage_range_row[i] = opt_range_row;
+    }
+  }
+  // i < MAX_TXFM_STAGE_NUM will mute above array bounds warning
+  for (int i = 0; i < cfg->stage_num_col && i < MAX_TXFM_STAGE_NUM; ++i) {
+    int real_range_col =
+        cfg->stage_range_col[i] + fwd_shift + shift[0] + bd + 1;
+    (void)real_range_col;
+    if (cfg->txfm_type_col == TXFM_TYPE_ADST4 && i == 1) {
+      // the adst4 may use 1 extra bit on top of opt_range_col at stage 1
+      // so opt_range_col >= real_range_col will not hold
+      stage_range_col[i] = opt_range_col;
+    } else {
+      assert(opt_range_col >= real_range_col);
+      stage_range_col[i] = opt_range_col;
+    }
+  }
+}
+
+static INLINE void inv_txfm2d_add_c(const int32_t *input, uint16_t *output,
+                                    int stride, TXFM_2D_FLIP_CFG *cfg,
+                                    int32_t *txfm_buf, TX_SIZE tx_size,
+                                    int bd) {
+  // Note when assigning txfm_size_col, we use the txfm_size from the
+  // row configuration and vice versa. This is intentionally done to
+  // accurately perform rectangular transforms. When the transform is
+  // rectangular, the number of columns will be the same as the
+  // txfm_size stored in the row cfg struct. It will make no difference
+  // for square transforms.
+  const int txfm_size_col = tx_size_wide[cfg->tx_size];
+  const int txfm_size_row = tx_size_high[cfg->tx_size];
+  // Take the shift from the larger dimension in the rectangular case.
+  const int8_t *shift = cfg->shift;
+  const int rect_type = get_rect_tx_log_ratio(txfm_size_col, txfm_size_row);
+  int8_t stage_range_row[MAX_TXFM_STAGE_NUM];
+  int8_t stage_range_col[MAX_TXFM_STAGE_NUM];
+  assert(cfg->stage_num_row <= MAX_TXFM_STAGE_NUM);
+  assert(cfg->stage_num_col <= MAX_TXFM_STAGE_NUM);
+  av1_gen_inv_stage_range(stage_range_col, stage_range_row, cfg, tx_size, bd);
+
+  const int8_t cos_bit_col = cfg->cos_bit_col;
+  const int8_t cos_bit_row = cfg->cos_bit_row;
+  const TxfmFunc txfm_func_col = inv_txfm_type_to_func(cfg->txfm_type_col);
+  const TxfmFunc txfm_func_row = inv_txfm_type_to_func(cfg->txfm_type_row);
+
+  // txfm_buf's length is  txfm_size_row * txfm_size_col + 2 *
+  // AOMMAX(txfm_size_row, txfm_size_col)
+  // it is used for intermediate data buffering
+  const int buf_offset = AOMMAX(txfm_size_row, txfm_size_col);
+  int32_t *temp_in = txfm_buf;
+  int32_t *temp_out = temp_in + buf_offset;
+  int32_t *buf = temp_out + buf_offset;
+  int32_t *buf_ptr = buf;
+  int c, r;
+
+  // Rows
+  for (r = 0; r < txfm_size_row; ++r) {
+    if (abs(rect_type) == 1) {
+      for (c = 0; c < txfm_size_col; ++c) {
+        temp_in[c] = round_shift((int64_t)input[c] * NewInvSqrt2, NewSqrt2Bits);
+      }
+      clamp_buf(temp_in, txfm_size_col, bd + 8);
+      txfm_func_row(temp_in, buf_ptr, cos_bit_row, stage_range_row);
+    } else {
+      for (c = 0; c < txfm_size_col; ++c) {
+        temp_in[c] = input[c];
+      }
+      clamp_buf(temp_in, txfm_size_col, bd + 8);
+      txfm_func_row(temp_in, buf_ptr, cos_bit_row, stage_range_row);
+    }
+    av1_round_shift_array(buf_ptr, txfm_size_col, -shift[0]);
+    input += txfm_size_col;
+    buf_ptr += txfm_size_col;
+  }
+
+  // Columns
+  for (c = 0; c < txfm_size_col; ++c) {
+    if (cfg->lr_flip == 0) {
+      for (r = 0; r < txfm_size_row; ++r)
+        temp_in[r] = buf[r * txfm_size_col + c];
+    } else {
+      // flip left right
+      for (r = 0; r < txfm_size_row; ++r)
+        temp_in[r] = buf[r * txfm_size_col + (txfm_size_col - c - 1)];
+    }
+    clamp_buf(temp_in, txfm_size_row, AOMMAX(bd + 6, 16));
+    txfm_func_col(temp_in, temp_out, cos_bit_col, stage_range_col);
+    av1_round_shift_array(temp_out, txfm_size_row, -shift[1]);
+    if (cfg->ud_flip == 0) {
+      for (r = 0; r < txfm_size_row; ++r) {
+        output[r * stride + c] =
+            highbd_clip_pixel_add(output[r * stride + c], temp_out[r], bd);
+      }
+    } else {
+      // flip upside down
+      for (r = 0; r < txfm_size_row; ++r) {
+        output[r * stride + c] = highbd_clip_pixel_add(
+            output[r * stride + c], temp_out[txfm_size_row - r - 1], bd);
+      }
+    }
+  }
+}
+
+static INLINE void inv_txfm2d_add_facade(const int32_t *input, uint16_t *output,
+                                         int stride, int32_t *txfm_buf,
+                                         TX_TYPE tx_type, TX_SIZE tx_size,
+                                         int bd) {
+  TXFM_2D_FLIP_CFG cfg;
+  av1_get_inv_txfm_cfg(tx_type, tx_size, &cfg);
+  // Forward shift sum uses larger square size, to be consistent with what
+  // av1_gen_inv_stage_range() does for inverse shifts.
+  inv_txfm2d_add_c(input, output, stride, &cfg, txfm_buf, tx_size, bd);
+}
+
+void av1_inv_txfm2d_add_4x8_c(const int32_t *input, uint16_t *output,
+                              int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[4 * 8 + 8 + 8]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_4X8, bd);
+}
+
+void av1_inv_txfm2d_add_8x4_c(const int32_t *input, uint16_t *output,
+                              int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[8 * 4 + 8 + 8]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_8X4, bd);
+}
+
+void av1_inv_txfm2d_add_8x16_c(const int32_t *input, uint16_t *output,
+                               int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[8 * 16 + 16 + 16]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_8X16, bd);
+}
+
+void av1_inv_txfm2d_add_16x8_c(const int32_t *input, uint16_t *output,
+                               int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[16 * 8 + 16 + 16]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_16X8, bd);
+}
+
+void av1_inv_txfm2d_add_16x32_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[16 * 32 + 32 + 32]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_16X32, bd);
+}
+
+void av1_inv_txfm2d_add_32x16_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[32 * 16 + 32 + 32]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_32X16, bd);
+}
+
+void av1_inv_txfm2d_add_4x4_c(const int32_t *input, uint16_t *output,
+                              int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[4 * 4 + 4 + 4]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_4X4, bd);
+}
+
+void av1_inv_txfm2d_add_8x8_c(const int32_t *input, uint16_t *output,
+                              int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[8 * 8 + 8 + 8]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_8X8, bd);
+}
+
+void av1_inv_txfm2d_add_16x16_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[16 * 16 + 16 + 16]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_16X16, bd);
+}
+
+void av1_inv_txfm2d_add_32x32_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[32 * 32 + 32 + 32]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_32X32, bd);
+}
+
+void av1_inv_txfm2d_add_64x64_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  // TODO(urvang): Can the same array be reused, instead of using a new array?
+  // Remap 32x32 input into a modified 64x64 by:
+  // - Copying over these values in top-left 32x32 locations.
+  // - Setting the rest of the locations to 0.
+  int32_t mod_input[64 * 64];
+  for (int row = 0; row < 32; ++row) {
+    memcpy(mod_input + row * 64, input + row * 32, 32 * sizeof(*mod_input));
+    memset(mod_input + row * 64 + 32, 0, 32 * sizeof(*mod_input));
+  }
+  memset(mod_input + 32 * 64, 0, 32 * 64 * sizeof(*mod_input));
+  DECLARE_ALIGNED(32, int, txfm_buf[64 * 64 + 64 + 64]);
+  inv_txfm2d_add_facade(mod_input, output, stride, txfm_buf, tx_type, TX_64X64,
+                        bd);
+}
+
+void av1_inv_txfm2d_add_64x32_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  // Remap 32x32 input into a modified 64x32 by:
+  // - Copying over these values in top-left 32x32 locations.
+  // - Setting the rest of the locations to 0.
+  int32_t mod_input[64 * 32];
+  for (int row = 0; row < 32; ++row) {
+    memcpy(mod_input + row * 64, input + row * 32, 32 * sizeof(*mod_input));
+    memset(mod_input + row * 64 + 32, 0, 32 * sizeof(*mod_input));
+  }
+  DECLARE_ALIGNED(32, int, txfm_buf[64 * 32 + 64 + 64]);
+  inv_txfm2d_add_facade(mod_input, output, stride, txfm_buf, tx_type, TX_64X32,
+                        bd);
+}
+
+void av1_inv_txfm2d_add_32x64_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  // Remap 32x32 input into a modified 32x64 input by:
+  // - Copying over these values in top-left 32x32 locations.
+  // - Setting the rest of the locations to 0.
+  int32_t mod_input[32 * 64];
+  memcpy(mod_input, input, 32 * 32 * sizeof(*mod_input));
+  memset(mod_input + 32 * 32, 0, 32 * 32 * sizeof(*mod_input));
+  DECLARE_ALIGNED(32, int, txfm_buf[64 * 32 + 64 + 64]);
+  inv_txfm2d_add_facade(mod_input, output, stride, txfm_buf, tx_type, TX_32X64,
+                        bd);
+}
+
+void av1_inv_txfm2d_add_16x64_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  // Remap 16x32 input into a modified 16x64 input by:
+  // - Copying over these values in top-left 16x32 locations.
+  // - Setting the rest of the locations to 0.
+  int32_t mod_input[16 * 64];
+  memcpy(mod_input, input, 16 * 32 * sizeof(*mod_input));
+  memset(mod_input + 16 * 32, 0, 16 * 32 * sizeof(*mod_input));
+  DECLARE_ALIGNED(32, int, txfm_buf[16 * 64 + 64 + 64]);
+  inv_txfm2d_add_facade(mod_input, output, stride, txfm_buf, tx_type, TX_16X64,
+                        bd);
+}
+
+void av1_inv_txfm2d_add_64x16_c(const int32_t *input, uint16_t *output,
+                                int stride, TX_TYPE tx_type, int bd) {
+  // Remap 32x16 input into a modified 64x16 by:
+  // - Copying over these values in top-left 32x16 locations.
+  // - Setting the rest of the locations to 0.
+  int32_t mod_input[64 * 16];
+  for (int row = 0; row < 16; ++row) {
+    memcpy(mod_input + row * 64, input + row * 32, 32 * sizeof(*mod_input));
+    memset(mod_input + row * 64 + 32, 0, 32 * sizeof(*mod_input));
+  }
+  DECLARE_ALIGNED(32, int, txfm_buf[16 * 64 + 64 + 64]);
+  inv_txfm2d_add_facade(mod_input, output, stride, txfm_buf, tx_type, TX_64X16,
+                        bd);
+}
+
+void av1_inv_txfm2d_add_4x16_c(const int32_t *input, uint16_t *output,
+                               int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[4 * 16 + 16 + 16]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_4X16, bd);
+}
+
+void av1_inv_txfm2d_add_16x4_c(const int32_t *input, uint16_t *output,
+                               int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[4 * 16 + 16 + 16]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_16X4, bd);
+}
+
+void av1_inv_txfm2d_add_8x32_c(const int32_t *input, uint16_t *output,
+                               int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[8 * 32 + 32 + 32]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_8X32, bd);
+}
+
+void av1_inv_txfm2d_add_32x8_c(const int32_t *input, uint16_t *output,
+                               int stride, TX_TYPE tx_type, int bd) {
+  DECLARE_ALIGNED(32, int, txfm_buf[8 * 32 + 32 + 32]);
+  inv_txfm2d_add_facade(input, output, stride, txfm_buf, tx_type, TX_32X8, bd);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.c
new file mode 100644
index 0000000000..3e13f4b576
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.c
@@ -0,0 +1,790 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <math.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+
+static const SEG_LVL_FEATURES seg_lvl_lf_lut[MAX_MB_PLANE][2] = {
+  { SEG_LVL_ALT_LF_Y_V, SEG_LVL_ALT_LF_Y_H },
+  { SEG_LVL_ALT_LF_U, SEG_LVL_ALT_LF_U },
+  { SEG_LVL_ALT_LF_V, SEG_LVL_ALT_LF_V }
+};
+
+static const int delta_lf_id_lut[MAX_MB_PLANE][2] = { { 0, 1 },
+                                                      { 2, 2 },
+                                                      { 3, 3 } };
+
+static const int mode_lf_lut[] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // INTRA_MODES
+  1, 1, 0, 1,                             // INTER_MODES (GLOBALMV == 0)
+  1, 1, 1, 1, 1, 1, 0, 1  // INTER_COMPOUND_MODES (GLOBAL_GLOBALMV == 0)
+};
+
+static void update_sharpness(loop_filter_info_n *lfi, int sharpness_lvl) {
+  int lvl;
+
+  // For each possible value for the loop filter fill out limits
+  for (lvl = 0; lvl <= MAX_LOOP_FILTER; lvl++) {
+    // Set loop filter parameters that control sharpness.
+    int block_inside_limit = lvl >> ((sharpness_lvl > 0) + (sharpness_lvl > 4));
+
+    if (sharpness_lvl > 0) {
+      if (block_inside_limit > (9 - sharpness_lvl))
+        block_inside_limit = (9 - sharpness_lvl);
+    }
+
+    if (block_inside_limit < 1) block_inside_limit = 1;
+
+    memset(lfi->lfthr[lvl].lim, block_inside_limit, SIMD_WIDTH);
+    memset(lfi->lfthr[lvl].mblim, (2 * (lvl + 2) + block_inside_limit),
+           SIMD_WIDTH);
+  }
+}
+
+uint8_t av1_get_filter_level(const AV1_COMMON *cm,
+                             const loop_filter_info_n *lfi_n, const int dir_idx,
+                             int plane, const MB_MODE_INFO *mbmi) {
+  const int segment_id = mbmi->segment_id;
+  if (cm->delta_q_info.delta_lf_present_flag) {
+    int8_t delta_lf;
+    if (cm->delta_q_info.delta_lf_multi) {
+      const int delta_lf_idx = delta_lf_id_lut[plane][dir_idx];
+      delta_lf = mbmi->delta_lf[delta_lf_idx];
+    } else {
+      delta_lf = mbmi->delta_lf_from_base;
+    }
+    int base_level;
+    if (plane == 0)
+      base_level = cm->lf.filter_level[dir_idx];
+    else if (plane == 1)
+      base_level = cm->lf.filter_level_u;
+    else
+      base_level = cm->lf.filter_level_v;
+    int lvl_seg = clamp(delta_lf + base_level, 0, MAX_LOOP_FILTER);
+    assert(plane >= 0 && plane <= 2);
+    const int seg_lf_feature_id = seg_lvl_lf_lut[plane][dir_idx];
+    if (segfeature_active(&cm->seg, segment_id, seg_lf_feature_id)) {
+      const int data = get_segdata(&cm->seg, segment_id, seg_lf_feature_id);
+      lvl_seg = clamp(lvl_seg + data, 0, MAX_LOOP_FILTER);
+    }
+
+    if (cm->lf.mode_ref_delta_enabled) {
+      const int scale = 1 << (lvl_seg >> 5);
+      lvl_seg += cm->lf.ref_deltas[mbmi->ref_frame[0]] * scale;
+      if (mbmi->ref_frame[0] > INTRA_FRAME)
+        lvl_seg += cm->lf.mode_deltas[mode_lf_lut[mbmi->mode]] * scale;
+      lvl_seg = clamp(lvl_seg, 0, MAX_LOOP_FILTER);
+    }
+    return lvl_seg;
+  } else {
+    return lfi_n->lvl[plane][segment_id][dir_idx][mbmi->ref_frame[0]]
+                     [mode_lf_lut[mbmi->mode]];
+  }
+}
+
+void av1_loop_filter_init(AV1_COMMON *cm) {
+  assert(MB_MODE_COUNT == NELEMENTS(mode_lf_lut));
+  loop_filter_info_n *lfi = &cm->lf_info;
+  struct loopfilter *lf = &cm->lf;
+  int lvl;
+
+  lf->combine_vert_horz_lf = 1;
+
+  // init limits for given sharpness
+  update_sharpness(lfi, lf->sharpness_level);
+
+  // init hev threshold const vectors
+  for (lvl = 0; lvl <= MAX_LOOP_FILTER; lvl++)
+    memset(lfi->lfthr[lvl].hev_thr, (lvl >> 4), SIMD_WIDTH);
+}
+
+// Update the loop filter for the current frame.
+// This should be called before loop_filter_rows(),
+// av1_loop_filter_frame() calls this function directly.
+void av1_loop_filter_frame_init(AV1_COMMON *cm, int plane_start,
+                                int plane_end) {
+  int filt_lvl[MAX_MB_PLANE], filt_lvl_r[MAX_MB_PLANE];
+  int plane;
+  int seg_id;
+  // n_shift is the multiplier for lf_deltas
+  // the multiplier is 1 for when filter_lvl is between 0 and 31;
+  // 2 when filter_lvl is between 32 and 63
+  loop_filter_info_n *const lfi = &cm->lf_info;
+  struct loopfilter *const lf = &cm->lf;
+  const struct segmentation *const seg = &cm->seg;
+
+  // update sharpness limits
+  update_sharpness(lfi, lf->sharpness_level);
+
+  filt_lvl[0] = cm->lf.filter_level[0];
+  filt_lvl[1] = cm->lf.filter_level_u;
+  filt_lvl[2] = cm->lf.filter_level_v;
+
+  filt_lvl_r[0] = cm->lf.filter_level[1];
+  filt_lvl_r[1] = cm->lf.filter_level_u;
+  filt_lvl_r[2] = cm->lf.filter_level_v;
+
+  assert(plane_start >= AOM_PLANE_Y);
+  assert(plane_end <= MAX_MB_PLANE);
+
+  for (plane = plane_start; plane < plane_end; plane++) {
+    if (plane == 0 && !filt_lvl[0] && !filt_lvl_r[0])
+      break;
+    else if (plane == 1 && !filt_lvl[1])
+      continue;
+    else if (plane == 2 && !filt_lvl[2])
+      continue;
+
+    for (seg_id = 0; seg_id < MAX_SEGMENTS; seg_id++) {
+      for (int dir = 0; dir < 2; ++dir) {
+        int lvl_seg = (dir == 0) ? filt_lvl[plane] : filt_lvl_r[plane];
+        const int seg_lf_feature_id = seg_lvl_lf_lut[plane][dir];
+        if (segfeature_active(seg, seg_id, seg_lf_feature_id)) {
+          const int data = get_segdata(&cm->seg, seg_id, seg_lf_feature_id);
+          lvl_seg = clamp(lvl_seg + data, 0, MAX_LOOP_FILTER);
+        }
+
+        if (!lf->mode_ref_delta_enabled) {
+          // we could get rid of this if we assume that deltas are set to
+          // zero when not in use; encoder always uses deltas
+          memset(lfi->lvl[plane][seg_id][dir], lvl_seg,
+                 sizeof(lfi->lvl[plane][seg_id][dir]));
+        } else {
+          int ref, mode;
+          const int scale = 1 << (lvl_seg >> 5);
+          const int intra_lvl = lvl_seg + lf->ref_deltas[INTRA_FRAME] * scale;
+          lfi->lvl[plane][seg_id][dir][INTRA_FRAME][0] =
+              clamp(intra_lvl, 0, MAX_LOOP_FILTER);
+
+          for (ref = LAST_FRAME; ref < REF_FRAMES; ++ref) {
+            for (mode = 0; mode < MAX_MODE_LF_DELTAS; ++mode) {
+              const int inter_lvl = lvl_seg + lf->ref_deltas[ref] * scale +
+                                    lf->mode_deltas[mode] * scale;
+              lfi->lvl[plane][seg_id][dir][ref][mode] =
+                  clamp(inter_lvl, 0, MAX_LOOP_FILTER);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+static TX_SIZE get_transform_size(const MACROBLOCKD *const xd,
+                                  const MB_MODE_INFO *const mbmi,
+                                  const EDGE_DIR edge_dir, const int mi_row,
+                                  const int mi_col, const int plane,
+                                  const struct macroblockd_plane *plane_ptr) {
+  assert(mbmi != NULL);
+  if (xd && xd->lossless[mbmi->segment_id]) return TX_4X4;
+
+  TX_SIZE tx_size =
+      (plane == AOM_PLANE_Y)
+          ? mbmi->tx_size
+          : av1_get_max_uv_txsize(mbmi->bsize, plane_ptr->subsampling_x,
+                                  plane_ptr->subsampling_y);
+  assert(tx_size < TX_SIZES_ALL);
+  if ((plane == AOM_PLANE_Y) && is_inter_block(mbmi) && !mbmi->skip_txfm) {
+    const BLOCK_SIZE sb_type = mbmi->bsize;
+    const int blk_row = mi_row & (mi_size_high[sb_type] - 1);
+    const int blk_col = mi_col & (mi_size_wide[sb_type] - 1);
+    const TX_SIZE mb_tx_size =
+        mbmi->inter_tx_size[av1_get_txb_size_index(sb_type, blk_row, blk_col)];
+    assert(mb_tx_size < TX_SIZES_ALL);
+    tx_size = mb_tx_size;
+  }
+
+  // since in case of chrominance or non-square transform need to convert
+  // transform size into transform size in particular direction.
+  // for vertical edge, filter direction is horizontal, for horizontal
+  // edge, filter direction is vertical.
+  tx_size = (VERT_EDGE == edge_dir) ? txsize_horz_map[tx_size]
+                                    : txsize_vert_map[tx_size];
+  return tx_size;
+}
+
+typedef struct AV1_DEBLOCKING_PARAMETERS {
+  // length of the filter applied to the outer edge
+  uint32_t filter_length;
+  // deblocking limits
+  const uint8_t *lim;
+  const uint8_t *mblim;
+  const uint8_t *hev_thr;
+} AV1_DEBLOCKING_PARAMETERS;
+
+// Return TX_SIZE from get_transform_size(), so it is plane and direction
+// aware
+static TX_SIZE set_lpf_parameters(
+    AV1_DEBLOCKING_PARAMETERS *const params, const ptrdiff_t mode_step,
+    const AV1_COMMON *const cm, const MACROBLOCKD *const xd,
+    const EDGE_DIR edge_dir, const uint32_t x, const uint32_t y,
+    const int plane, const struct macroblockd_plane *const plane_ptr) {
+  // reset to initial values
+  params->filter_length = 0;
+
+  // no deblocking is required
+  const uint32_t width = plane_ptr->dst.width;
+  const uint32_t height = plane_ptr->dst.height;
+  if ((width <= x) || (height <= y)) {
+    // just return the smallest transform unit size
+    return TX_4X4;
+  }
+
+  const uint32_t scale_horz = plane_ptr->subsampling_x;
+  const uint32_t scale_vert = plane_ptr->subsampling_y;
+  // for sub8x8 block, chroma prediction mode is obtained from the bottom/right
+  // mi structure of the co-located 8x8 luma block. so for chroma plane, mi_row
+  // and mi_col should map to the bottom/right mi structure, i.e, both mi_row
+  // and mi_col should be odd number for chroma plane.
+  const int mi_row = scale_vert | ((y << scale_vert) >> MI_SIZE_LOG2);
+  const int mi_col = scale_horz | ((x << scale_horz) >> MI_SIZE_LOG2);
+  MB_MODE_INFO **mi =
+      cm->mi_params.mi_grid_base + mi_row * cm->mi_params.mi_stride + mi_col;
+  const MB_MODE_INFO *mbmi = mi[0];
+  // If current mbmi is not correctly setup, return an invalid value to stop
+  // filtering. One example is that if this tile is not coded, then its mbmi
+  // it not set up.
+  if (mbmi == NULL) return TX_INVALID;
+
+  const TX_SIZE ts =
+      get_transform_size(xd, mi[0], edge_dir, mi_row, mi_col, plane, plane_ptr);
+
+  {
+    const uint32_t coord = (VERT_EDGE == edge_dir) ? (x) : (y);
+    const uint32_t transform_masks =
+        edge_dir == VERT_EDGE ? tx_size_wide[ts] - 1 : tx_size_high[ts] - 1;
+    const int32_t tu_edge = (coord & transform_masks) ? (0) : (1);
+
+    if (!tu_edge) return ts;
+
+    // prepare outer edge parameters. deblock the edge if it's an edge of a TU
+    {
+      const uint32_t curr_level =
+          av1_get_filter_level(cm, &cm->lf_info, edge_dir, plane, mbmi);
+      const int curr_skipped = mbmi->skip_txfm && is_inter_block(mbmi);
+      uint32_t level = curr_level;
+      if (coord) {
+        {
+          const MB_MODE_INFO *const mi_prev = *(mi - mode_step);
+          if (mi_prev == NULL) return TX_INVALID;
+          const int pv_row =
+              (VERT_EDGE == edge_dir) ? (mi_row) : (mi_row - (1 << scale_vert));
+          const int pv_col =
+              (VERT_EDGE == edge_dir) ? (mi_col - (1 << scale_horz)) : (mi_col);
+          const TX_SIZE pv_ts = get_transform_size(
+              xd, mi_prev, edge_dir, pv_row, pv_col, plane, plane_ptr);
+
+          const uint32_t pv_lvl =
+              av1_get_filter_level(cm, &cm->lf_info, edge_dir, plane, mi_prev);
+
+          const int pv_skip_txfm =
+              mi_prev->skip_txfm && is_inter_block(mi_prev);
+          const BLOCK_SIZE bsize = get_plane_block_size(
+              mbmi->bsize, plane_ptr->subsampling_x, plane_ptr->subsampling_y);
+          assert(bsize < BLOCK_SIZES_ALL);
+          const int prediction_masks = edge_dir == VERT_EDGE
+                                           ? block_size_wide[bsize] - 1
+                                           : block_size_high[bsize] - 1;
+          const int32_t pu_edge = !(coord & prediction_masks);
+          // if the current and the previous blocks are skipped,
+          // deblock the edge if the edge belongs to a PU's edge only.
+          if ((curr_level || pv_lvl) &&
+              (!pv_skip_txfm || !curr_skipped || pu_edge)) {
+            const TX_SIZE min_ts = AOMMIN(ts, pv_ts);
+            if (TX_4X4 >= min_ts) {
+              params->filter_length = 4;
+            } else if (TX_8X8 == min_ts) {
+              if (plane != 0)
+                params->filter_length = 6;
+              else
+                params->filter_length = 8;
+            } else {
+              params->filter_length = 14;
+              // No wide filtering for chroma plane
+              if (plane != 0) {
+                params->filter_length = 6;
+              }
+            }
+
+            // update the level if the current block is skipped,
+            // but the previous one is not
+            level = (curr_level) ? (curr_level) : (pv_lvl);
+          }
+        }
+      }
+      // prepare common parameters
+      if (params->filter_length) {
+        const loop_filter_thresh *const limits = cm->lf_info.lfthr + level;
+        params->lim = limits->lim;
+        params->mblim = limits->mblim;
+        params->hev_thr = limits->hev_thr;
+      }
+    }
+  }
+
+  return ts;
+}
+
+void av1_filter_block_plane_vert(const AV1_COMMON *const cm,
+                                 const MACROBLOCKD *const xd, const int plane,
+                                 const MACROBLOCKD_PLANE *const plane_ptr,
+                                 const uint32_t mi_row, const uint32_t mi_col) {
+  const uint32_t scale_horz = plane_ptr->subsampling_x;
+  const uint32_t scale_vert = plane_ptr->subsampling_y;
+  uint8_t *const dst_ptr = plane_ptr->dst.buf;
+  const int dst_stride = plane_ptr->dst.stride;
+  const int y_range = (MAX_MIB_SIZE >> scale_vert);
+  const int x_range = (MAX_MIB_SIZE >> scale_horz);
+  for (int y = 0; y < y_range; y++) {
+    uint8_t *p = dst_ptr + y * MI_SIZE * dst_stride;
+    for (int x = 0; x < x_range;) {
+      // inner loop always filter vertical edges in a MI block. If MI size
+      // is 8x8, it will filter the vertical edge aligned with a 8x8 block.
+      // If 4x4 transform is used, it will then filter the internal edge
+      //  aligned with a 4x4 block
+      const uint32_t curr_x = ((mi_col * MI_SIZE) >> scale_horz) + x * MI_SIZE;
+      const uint32_t curr_y = ((mi_row * MI_SIZE) >> scale_vert) + y * MI_SIZE;
+      uint32_t advance_units;
+      TX_SIZE tx_size;
+      AV1_DEBLOCKING_PARAMETERS params;
+      memset(&params, 0, sizeof(params));
+
+      tx_size =
+          set_lpf_parameters(&params, ((ptrdiff_t)1 << scale_horz), cm, xd,
+                             VERT_EDGE, curr_x, curr_y, plane, plane_ptr);
+      if (tx_size == TX_INVALID) {
+        params.filter_length = 0;
+        tx_size = TX_4X4;
+      }
+
+#if CONFIG_AV1_HIGHBITDEPTH
+      const int use_highbitdepth = cm->seq_params.use_highbitdepth;
+      const aom_bit_depth_t bit_depth = cm->seq_params.bit_depth;
+      switch (params.filter_length) {
+        // apply 4-tap filtering
+        case 4:
+          if (use_highbitdepth)
+            aom_highbd_lpf_vertical_4(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                      params.mblim, params.lim, params.hev_thr,
+                                      bit_depth);
+          else
+            aom_lpf_vertical_4(p, dst_stride, params.mblim, params.lim,
+                               params.hev_thr);
+          break;
+        case 6:  // apply 6-tap filter for chroma plane only
+          assert(plane != 0);
+          if (use_highbitdepth)
+            aom_highbd_lpf_vertical_6(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                      params.mblim, params.lim, params.hev_thr,
+                                      bit_depth);
+          else
+            aom_lpf_vertical_6(p, dst_stride, params.mblim, params.lim,
+                               params.hev_thr);
+          break;
+        // apply 8-tap filtering
+        case 8:
+          if (use_highbitdepth)
+            aom_highbd_lpf_vertical_8(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                      params.mblim, params.lim, params.hev_thr,
+                                      bit_depth);
+          else
+            aom_lpf_vertical_8(p, dst_stride, params.mblim, params.lim,
+                               params.hev_thr);
+          break;
+        // apply 14-tap filtering
+        case 14:
+          if (use_highbitdepth)
+            aom_highbd_lpf_vertical_14(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                       params.mblim, params.lim, params.hev_thr,
+                                       bit_depth);
+          else
+            aom_lpf_vertical_14(p, dst_stride, params.mblim, params.lim,
+                                params.hev_thr);
+          break;
+        // no filtering
+        default: break;
+      }
+#else
+      switch (params.filter_length) {
+        // apply 4-tap filtering
+        case 4:
+          aom_lpf_vertical_4(p, dst_stride, params.mblim, params.lim,
+                             params.hev_thr);
+          break;
+        case 6:  // apply 6-tap filter for chroma plane only
+          assert(plane != 0);
+          aom_lpf_vertical_6(p, dst_stride, params.mblim, params.lim,
+                             params.hev_thr);
+          break;
+        // apply 8-tap filtering
+        case 8:
+          aom_lpf_vertical_8(p, dst_stride, params.mblim, params.lim,
+                             params.hev_thr);
+          break;
+        // apply 14-tap filtering
+        case 14:
+          aom_lpf_vertical_14(p, dst_stride, params.mblim, params.lim,
+                              params.hev_thr);
+          break;
+        // no filtering
+        default: break;
+      }
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+      // advance the destination pointer
+      advance_units = tx_size_wide_unit[tx_size];
+      x += advance_units;
+      p += advance_units * MI_SIZE;
+    }
+  }
+}
+
+void av1_filter_block_plane_horz(const AV1_COMMON *const cm,
+                                 const MACROBLOCKD *const xd, const int plane,
+                                 const MACROBLOCKD_PLANE *const plane_ptr,
+                                 const uint32_t mi_row, const uint32_t mi_col) {
+  const uint32_t scale_horz = plane_ptr->subsampling_x;
+  const uint32_t scale_vert = plane_ptr->subsampling_y;
+  uint8_t *const dst_ptr = plane_ptr->dst.buf;
+  const int dst_stride = plane_ptr->dst.stride;
+  const int y_range = (MAX_MIB_SIZE >> scale_vert);
+  const int x_range = (MAX_MIB_SIZE >> scale_horz);
+  for (int x = 0; x < x_range; x++) {
+    uint8_t *p = dst_ptr + x * MI_SIZE;
+    for (int y = 0; y < y_range;) {
+      // inner loop always filter vertical edges in a MI block. If MI size
+      // is 8x8, it will first filter the vertical edge aligned with a 8x8
+      // block. If 4x4 transform is used, it will then filter the internal
+      // edge aligned with a 4x4 block
+      const uint32_t curr_x = ((mi_col * MI_SIZE) >> scale_horz) + x * MI_SIZE;
+      const uint32_t curr_y = ((mi_row * MI_SIZE) >> scale_vert) + y * MI_SIZE;
+      uint32_t advance_units;
+      TX_SIZE tx_size;
+      AV1_DEBLOCKING_PARAMETERS params;
+      memset(&params, 0, sizeof(params));
+
+      tx_size = set_lpf_parameters(
+          &params, (cm->mi_params.mi_stride << scale_vert), cm, xd, HORZ_EDGE,
+          curr_x, curr_y, plane, plane_ptr);
+      if (tx_size == TX_INVALID) {
+        params.filter_length = 0;
+        tx_size = TX_4X4;
+      }
+
+#if CONFIG_AV1_HIGHBITDEPTH
+      const int use_highbitdepth = cm->seq_params.use_highbitdepth;
+      const aom_bit_depth_t bit_depth = cm->seq_params.bit_depth;
+      switch (params.filter_length) {
+        // apply 4-tap filtering
+        case 4:
+          if (use_highbitdepth)
+            aom_highbd_lpf_horizontal_4(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                        params.mblim, params.lim,
+                                        params.hev_thr, bit_depth);
+          else
+            aom_lpf_horizontal_4(p, dst_stride, params.mblim, params.lim,
+                                 params.hev_thr);
+          break;
+        // apply 6-tap filtering
+        case 6:
+          assert(plane != 0);
+          if (use_highbitdepth)
+            aom_highbd_lpf_horizontal_6(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                        params.mblim, params.lim,
+                                        params.hev_thr, bit_depth);
+          else
+            aom_lpf_horizontal_6(p, dst_stride, params.mblim, params.lim,
+                                 params.hev_thr);
+          break;
+        // apply 8-tap filtering
+        case 8:
+          if (use_highbitdepth)
+            aom_highbd_lpf_horizontal_8(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                        params.mblim, params.lim,
+                                        params.hev_thr, bit_depth);
+          else
+            aom_lpf_horizontal_8(p, dst_stride, params.mblim, params.lim,
+                                 params.hev_thr);
+          break;
+        // apply 14-tap filtering
+        case 14:
+          if (use_highbitdepth)
+            aom_highbd_lpf_horizontal_14(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                         params.mblim, params.lim,
+                                         params.hev_thr, bit_depth);
+          else
+            aom_lpf_horizontal_14(p, dst_stride, params.mblim, params.lim,
+                                  params.hev_thr);
+          break;
+        // no filtering
+        default: break;
+      }
+#else
+      switch (params.filter_length) {
+        // apply 4-tap filtering
+        case 4:
+          aom_lpf_horizontal_4(p, dst_stride, params.mblim, params.lim,
+                               params.hev_thr);
+          break;
+        // apply 6-tap filtering
+        case 6:
+          assert(plane != 0);
+          aom_lpf_horizontal_6(p, dst_stride, params.mblim, params.lim,
+                               params.hev_thr);
+          break;
+        // apply 8-tap filtering
+        case 8:
+          aom_lpf_horizontal_8(p, dst_stride, params.mblim, params.lim,
+                               params.hev_thr);
+          break;
+        // apply 14-tap filtering
+        case 14:
+          aom_lpf_horizontal_14(p, dst_stride, params.mblim, params.lim,
+                                params.hev_thr);
+          break;
+        // no filtering
+        default: break;
+      }
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+      // advance the destination pointer
+      advance_units = tx_size_high_unit[tx_size];
+      y += advance_units;
+      p += advance_units * dst_stride * MI_SIZE;
+    }
+  }
+}
+
+void av1_filter_block_plane_vert_test(const AV1_COMMON *const cm,
+                                      const MACROBLOCKD *const xd,
+                                      const int plane,
+                                      const MACROBLOCKD_PLANE *const plane_ptr,
+                                      const uint32_t mi_row,
+                                      const uint32_t mi_col) {
+  const uint32_t scale_horz = plane_ptr->subsampling_x;
+  const uint32_t scale_vert = plane_ptr->subsampling_y;
+  uint8_t *const dst_ptr = plane_ptr->dst.buf;
+  const int dst_stride = plane_ptr->dst.stride;
+  const int y_range = cm->mi_params.mi_rows >> scale_vert;
+  const int x_range = cm->mi_params.mi_cols >> scale_horz;
+  for (int y = 0; y < y_range; y++) {
+    uint8_t *p = dst_ptr + y * MI_SIZE * dst_stride;
+    for (int x = 0; x < x_range;) {
+      // inner loop always filter vertical edges in a MI block. If MI size
+      // is 8x8, it will filter the vertical edge aligned with a 8x8 block.
+      // If 4x4 transform is used, it will then filter the internal edge
+      //  aligned with a 4x4 block
+      const uint32_t curr_x = ((mi_col * MI_SIZE) >> scale_horz) + x * MI_SIZE;
+      const uint32_t curr_y = ((mi_row * MI_SIZE) >> scale_vert) + y * MI_SIZE;
+      uint32_t advance_units;
+      TX_SIZE tx_size;
+      AV1_DEBLOCKING_PARAMETERS params;
+      memset(&params, 0, sizeof(params));
+
+      tx_size =
+          set_lpf_parameters(&params, ((ptrdiff_t)1 << scale_horz), cm, xd,
+                             VERT_EDGE, curr_x, curr_y, plane, plane_ptr);
+      if (tx_size == TX_INVALID) {
+        params.filter_length = 0;
+        tx_size = TX_4X4;
+      }
+
+      // advance the destination pointer
+      advance_units = tx_size_wide_unit[tx_size];
+      x += advance_units;
+      p += advance_units * MI_SIZE;
+    }
+  }
+}
+
+void av1_filter_block_plane_horz_test(const AV1_COMMON *const cm,
+                                      const MACROBLOCKD *const xd,
+                                      const int plane,
+                                      const MACROBLOCKD_PLANE *const plane_ptr,
+                                      const uint32_t mi_row,
+                                      const uint32_t mi_col) {
+  const uint32_t scale_horz = plane_ptr->subsampling_x;
+  const uint32_t scale_vert = plane_ptr->subsampling_y;
+  uint8_t *const dst_ptr = plane_ptr->dst.buf;
+  const int dst_stride = plane_ptr->dst.stride;
+  const int y_range = cm->mi_params.mi_rows >> scale_vert;
+  const int x_range = cm->mi_params.mi_cols >> scale_horz;
+  for (int x = 0; x < x_range; x++) {
+    uint8_t *p = dst_ptr + x * MI_SIZE;
+    for (int y = 0; y < y_range;) {
+      // inner loop always filter vertical edges in a MI block. If MI size
+      // is 8x8, it will first filter the vertical edge aligned with a 8x8
+      // block. If 4x4 transform is used, it will then filter the internal
+      // edge aligned with a 4x4 block
+      const uint32_t curr_x = ((mi_col * MI_SIZE) >> scale_horz) + x * MI_SIZE;
+      const uint32_t curr_y = ((mi_row * MI_SIZE) >> scale_vert) + y * MI_SIZE;
+      uint32_t advance_units;
+      TX_SIZE tx_size;
+      AV1_DEBLOCKING_PARAMETERS params;
+      memset(&params, 0, sizeof(params));
+
+      tx_size = set_lpf_parameters(
+          &params, (cm->mi_params.mi_stride << scale_vert), cm, xd, HORZ_EDGE,
+          curr_x, curr_y, plane, plane_ptr);
+      if (tx_size == TX_INVALID) {
+        params.filter_length = 0;
+        tx_size = TX_4X4;
+      }
+
+      // advance the destination pointer
+      advance_units = tx_size_high_unit[tx_size];
+      y += advance_units;
+      p += advance_units * dst_stride * MI_SIZE;
+    }
+  }
+}
+
+static void loop_filter_rows(YV12_BUFFER_CONFIG *frame_buffer, AV1_COMMON *cm,
+                             MACROBLOCKD *xd, int start, int stop,
+#if CONFIG_LPF_MASK
+                             int is_decoding,
+#endif
+                             int plane_start, int plane_end) {
+  struct macroblockd_plane *pd = xd->plane;
+  const int col_start = 0;
+  const int col_end = cm->mi_params.mi_cols;
+  int mi_row, mi_col;
+  int plane;
+
+#if CONFIG_LPF_MASK
+  if (is_decoding) {
+    cm->is_decoding = is_decoding;
+    for (plane = plane_start; plane < plane_end; plane++) {
+      if (plane == 0 && !(cm->lf.filter_level[0]) && !(cm->lf.filter_level[1]))
+        break;
+      else if (plane == 1 && !(cm->lf.filter_level_u))
+        continue;
+      else if (plane == 2 && !(cm->lf.filter_level_v))
+        continue;
+
+      av1_setup_dst_planes(pd, cm->seq_params.sb_size, frame_buffer, 0, 0,
+                           plane, plane + 1);
+
+      av1_build_bitmask_vert_info(cm, &pd[plane], plane);
+      av1_build_bitmask_horz_info(cm, &pd[plane], plane);
+
+      // apply loop filtering which only goes through buffer once
+      for (mi_row = start; mi_row < stop; mi_row += MI_SIZE_64X64) {
+        for (mi_col = col_start; mi_col < col_end; mi_col += MI_SIZE_64X64) {
+          av1_setup_dst_planes(pd, BLOCK_64X64, frame_buffer, mi_row, mi_col,
+                               plane, plane + 1);
+          av1_filter_block_plane_bitmask_vert(cm, &pd[plane], plane, mi_row,
+                                              mi_col);
+          if (mi_col - MI_SIZE_64X64 >= 0) {
+            av1_setup_dst_planes(pd, BLOCK_64X64, frame_buffer, mi_row,
+                                 mi_col - MI_SIZE_64X64, plane, plane + 1);
+            av1_filter_block_plane_bitmask_horz(cm, &pd[plane], plane, mi_row,
+                                                mi_col - MI_SIZE_64X64);
+          }
+        }
+        av1_setup_dst_planes(pd, BLOCK_64X64, frame_buffer, mi_row,
+                             mi_col - MI_SIZE_64X64, plane, plane + 1);
+        av1_filter_block_plane_bitmask_horz(cm, &pd[plane], plane, mi_row,
+                                            mi_col - MI_SIZE_64X64);
+      }
+    }
+    return;
+  }
+#endif
+
+  for (plane = plane_start; plane < plane_end; plane++) {
+    if (plane == 0 && !(cm->lf.filter_level[0]) && !(cm->lf.filter_level[1]))
+      break;
+    else if (plane == 1 && !(cm->lf.filter_level_u))
+      continue;
+    else if (plane == 2 && !(cm->lf.filter_level_v))
+      continue;
+
+    if (cm->lf.combine_vert_horz_lf) {
+      // filter all vertical and horizontal edges in every 128x128 super block
+      for (mi_row = start; mi_row < stop; mi_row += MAX_MIB_SIZE) {
+        for (mi_col = col_start; mi_col < col_end; mi_col += MAX_MIB_SIZE) {
+          // filter vertical edges
+          av1_setup_dst_planes(pd, cm->seq_params.sb_size, frame_buffer, mi_row,
+                               mi_col, plane, plane + 1);
+          av1_filter_block_plane_vert(cm, xd, plane, &pd[plane], mi_row,
+                                      mi_col);
+          // filter horizontal edges
+          if (mi_col - MAX_MIB_SIZE >= 0) {
+            av1_setup_dst_planes(pd, cm->seq_params.sb_size, frame_buffer,
+                                 mi_row, mi_col - MAX_MIB_SIZE, plane,
+                                 plane + 1);
+            av1_filter_block_plane_horz(cm, xd, plane, &pd[plane], mi_row,
+                                        mi_col - MAX_MIB_SIZE);
+          }
+        }
+        // filter horizontal edges
+        av1_setup_dst_planes(pd, cm->seq_params.sb_size, frame_buffer, mi_row,
+                             mi_col - MAX_MIB_SIZE, plane, plane + 1);
+        av1_filter_block_plane_horz(cm, xd, plane, &pd[plane], mi_row,
+                                    mi_col - MAX_MIB_SIZE);
+      }
+    } else {
+      // filter all vertical edges in every 128x128 super block
+      for (mi_row = start; mi_row < stop; mi_row += MAX_MIB_SIZE) {
+        for (mi_col = col_start; mi_col < col_end; mi_col += MAX_MIB_SIZE) {
+          av1_setup_dst_planes(pd, cm->seq_params.sb_size, frame_buffer, mi_row,
+                               mi_col, plane, plane + 1);
+          av1_filter_block_plane_vert(cm, xd, plane, &pd[plane], mi_row,
+                                      mi_col);
+        }
+      }
+
+      // filter all horizontal edges in every 128x128 super block
+      for (mi_row = start; mi_row < stop; mi_row += MAX_MIB_SIZE) {
+        for (mi_col = col_start; mi_col < col_end; mi_col += MAX_MIB_SIZE) {
+          av1_setup_dst_planes(pd, cm->seq_params.sb_size, frame_buffer, mi_row,
+                               mi_col, plane, plane + 1);
+          av1_filter_block_plane_horz(cm, xd, plane, &pd[plane], mi_row,
+                                      mi_col);
+        }
+      }
+    }
+  }
+}
+
+void av1_loop_filter_frame(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
+                           MACROBLOCKD *xd,
+#if CONFIG_LPF_MASK
+                           int is_decoding,
+#endif
+                           int plane_start, int plane_end, int partial_frame) {
+  int start_mi_row, end_mi_row, mi_rows_to_filter;
+
+  start_mi_row = 0;
+  mi_rows_to_filter = cm->mi_params.mi_rows;
+  if (partial_frame && cm->mi_params.mi_rows > 8) {
+    start_mi_row = cm->mi_params.mi_rows >> 1;
+    start_mi_row &= 0xfffffff8;
+    mi_rows_to_filter = AOMMAX(cm->mi_params.mi_rows / 8, 8);
+  }
+  end_mi_row = start_mi_row + mi_rows_to_filter;
+  av1_loop_filter_frame_init(cm, plane_start, plane_end);
+  loop_filter_rows(frame, cm, xd, start_mi_row, end_mi_row,
+#if CONFIG_LPF_MASK
+                   is_decoding,
+#endif
+                   plane_start, plane_end);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h
new file mode 100644
index 0000000000..b2b90778c0
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_AV1_LOOPFILTER_H_
+#define AOM_AV1_COMMON_AV1_LOOPFILTER_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAX_LOOP_FILTER 63
+#define MAX_SHARPNESS 7
+
+#define SIMD_WIDTH 16
+
+enum lf_path {
+  LF_PATH_420,
+  LF_PATH_444,
+  LF_PATH_SLOW,
+};
+
+/*!\cond */
+enum { VERT_EDGE = 0, HORZ_EDGE = 1, NUM_EDGE_DIRS } UENUM1BYTE(EDGE_DIR);
+typedef struct {
+  uint64_t bits[4];
+} FilterMask;
+
+#if CONFIG_LPF_MASK
+// This structure holds bit masks for all 4x4 blocks in a 64x64 region.
+// Each 1 bit represents a position in which we want to apply the loop filter.
+// For Y plane, 4x4 in 64x64 requires 16x16 = 256 bit, therefore we use 4
+// uint64_t; For U, V plane, for 420 format, plane size is 32x32, thus we use
+// a uint64_t to represent bitmask.
+// Left_ entries refer to whether we apply a filter on the border to the
+// left of the block.   Above_ entries refer to whether or not to apply a
+// filter on the above border.
+// Since each transform is accompanied by a potentially different type of
+// loop filter there is a different entry in the array for each transform size.
+typedef struct {
+  FilterMask left_y[TX_SIZES];
+  FilterMask above_y[TX_SIZES];
+  FilterMask left_u[TX_SIZES];
+  FilterMask above_u[TX_SIZES];
+  FilterMask left_v[TX_SIZES];
+  FilterMask above_v[TX_SIZES];
+
+  // Y plane vertical edge and horizontal edge filter level
+  uint8_t lfl_y_hor[MI_SIZE_64X64][MI_SIZE_64X64];
+  uint8_t lfl_y_ver[MI_SIZE_64X64][MI_SIZE_64X64];
+
+  // U plane filter level
+  uint8_t lfl_u_ver[MI_SIZE_64X64][MI_SIZE_64X64];
+  uint8_t lfl_u_hor[MI_SIZE_64X64][MI_SIZE_64X64];
+
+  // V plane filter level
+  uint8_t lfl_v_ver[MI_SIZE_64X64][MI_SIZE_64X64];
+  uint8_t lfl_v_hor[MI_SIZE_64X64][MI_SIZE_64X64];
+
+  // other info
+  FilterMask skip;
+  FilterMask is_vert_border;
+  FilterMask is_horz_border;
+  // Y or UV planes, 5 tx sizes: 4x4, 8x8, 16x16, 32x32, 64x64
+  FilterMask tx_size_ver[2][5];
+  FilterMask tx_size_hor[2][5];
+} LoopFilterMask;
+#endif  // CONFIG_LPF_MASK
+
+struct loopfilter {
+  int filter_level[2];
+  int filter_level_u;
+  int filter_level_v;
+
+  int sharpness_level;
+
+  uint8_t mode_ref_delta_enabled;
+  uint8_t mode_ref_delta_update;
+
+  // 0 = Intra, Last, Last2+Last3,
+  // GF, BRF, ARF2, ARF
+  int8_t ref_deltas[REF_FRAMES];
+
+  // 0 = ZERO_MV, MV
+  int8_t mode_deltas[MAX_MODE_LF_DELTAS];
+
+  int combine_vert_horz_lf;
+
+#if CONFIG_LPF_MASK
+  LoopFilterMask *lfm;
+  size_t lfm_num;
+  int lfm_stride;
+#endif  // CONFIG_LPF_MASK
+};
+
+// Need to align this structure so when it is declared and
+// passed it can be loaded into vector registers.
+typedef struct {
+  DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, mblim[SIMD_WIDTH]);
+  DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, lim[SIMD_WIDTH]);
+  DECLARE_ALIGNED(SIMD_WIDTH, uint8_t, hev_thr[SIMD_WIDTH]);
+} loop_filter_thresh;
+
+typedef struct {
+  loop_filter_thresh lfthr[MAX_LOOP_FILTER + 1];
+  uint8_t lvl[MAX_MB_PLANE][MAX_SEGMENTS][2][REF_FRAMES][MAX_MODE_LF_DELTAS];
+} loop_filter_info_n;
+
+typedef struct LoopFilterWorkerData {
+  YV12_BUFFER_CONFIG *frame_buffer;
+  struct AV1Common *cm;
+  struct macroblockd_plane planes[MAX_MB_PLANE];
+  // TODO(Ranjit): When the filter functions are modified to use xd->lossless
+  // add lossless as a member here.
+  MACROBLOCKD *xd;
+} LFWorkerData;
+/*!\endcond */
+
+/* assorted loopfilter functions which get used elsewhere */
+struct AV1Common;
+struct macroblockd;
+struct AV1LfSyncData;
+
+void av1_loop_filter_init(struct AV1Common *cm);
+
+void av1_loop_filter_frame_init(struct AV1Common *cm, int plane_start,
+                                int plane_end);
+
+/*!\brief Apply AV1 loop filter
+ *
+ * \ingroup in_loop_filter
+ * \callgraph
+ */
+#if CONFIG_LPF_MASK
+void av1_loop_filter_frame(YV12_BUFFER_CONFIG *frame, struct AV1Common *cm,
+                           struct macroblockd *xd, int is_decoding,
+                           int plane_start, int plane_end, int partial_frame);
+#else
+void av1_loop_filter_frame(YV12_BUFFER_CONFIG *frame, struct AV1Common *cm,
+                           struct macroblockd *xd, int plane_start,
+                           int plane_end, int partial_frame);
+#endif
+
+void av1_filter_block_plane_vert(const struct AV1Common *const cm,
+                                 const MACROBLOCKD *const xd, const int plane,
+                                 const MACROBLOCKD_PLANE *const plane_ptr,
+                                 const uint32_t mi_row, const uint32_t mi_col);
+
+void av1_filter_block_plane_horz(const struct AV1Common *const cm,
+                                 const MACROBLOCKD *const xd, const int plane,
+                                 const MACROBLOCKD_PLANE *const plane_ptr,
+                                 const uint32_t mi_row, const uint32_t mi_col);
+
+uint8_t av1_get_filter_level(const struct AV1Common *cm,
+                             const loop_filter_info_n *lfi_n, const int dir_idx,
+                             int plane, const MB_MODE_INFO *mbmi);
+#if CONFIG_LPF_MASK
+void av1_filter_block_plane_ver(struct AV1Common *const cm,
+                                struct macroblockd_plane *const plane_ptr,
+                                int pl, int mi_row, int mi_col);
+
+void av1_filter_block_plane_hor(struct AV1Common *const cm,
+                                struct macroblockd_plane *const plane, int pl,
+                                int mi_row, int mi_col);
+
+int get_index_shift(int mi_col, int mi_row, int *index);
+
+void av1_build_bitmask_vert_info(
+    struct AV1Common *const cm, const struct macroblockd_plane *const plane_ptr,
+    int plane);
+
+void av1_build_bitmask_horz_info(
+    struct AV1Common *const cm, const struct macroblockd_plane *const plane_ptr,
+    int plane);
+
+void av1_filter_block_plane_bitmask_vert(
+    struct AV1Common *const cm, struct macroblockd_plane *const plane_ptr,
+    int pl, int mi_row, int mi_col);
+
+void av1_filter_block_plane_bitmask_horz(
+    struct AV1Common *const cm, struct macroblockd_plane *const plane_ptr,
+    int pl, int mi_row, int mi_col);
+
+void av1_store_bitmask_univariant_tx(struct AV1Common *cm, int mi_row,
+                                     int mi_col, BLOCK_SIZE bsize,
+                                     MB_MODE_INFO *mbmi);
+
+void av1_store_bitmask_other_info(struct AV1Common *cm, int mi_row, int mi_col,
+                                  BLOCK_SIZE bsize, MB_MODE_INFO *mbmi,
+                                  int is_horz_coding_block_border,
+                                  int is_vert_coding_block_border);
+
+void av1_store_bitmask_vartx(struct AV1Common *cm, int mi_row, int mi_col,
+                             BLOCK_SIZE bsize, TX_SIZE tx_size,
+                             MB_MODE_INFO *mbmi);
+#endif  // CONFIG_LPF_MASK
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_AV1_LOOPFILTER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_rtcd.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_rtcd.c
new file mode 100644
index 0000000000..a485d17710
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_rtcd.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#define RTCD_C
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_once.h"
+
+void av1_rtcd() {
+  // TODO(JBB): Remove this aom_once, by insuring that both the encoder and
+  // decoder setup functions are protected by aom_once();
+  aom_once(setup_rtcd_internal);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_scale.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_scale.c
new file mode 100644
index 0000000000..0156e438c3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_scale.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/scale.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_filter.h"
+
+// Note: Expect val to be in q4 precision
+static INLINE int scaled_x(int val, const struct scale_factors *sf) {
+  const int off =
+      (sf->x_scale_fp - (1 << REF_SCALE_SHIFT)) * (1 << (SUBPEL_BITS - 1));
+  const int64_t tval = (int64_t)val * sf->x_scale_fp + off;
+  return (int)ROUND_POWER_OF_TWO_SIGNED_64(tval,
+                                           REF_SCALE_SHIFT - SCALE_EXTRA_BITS);
+}
+
+// Note: Expect val to be in q4 precision
+static INLINE int scaled_y(int val, const struct scale_factors *sf) {
+  const int off =
+      (sf->y_scale_fp - (1 << REF_SCALE_SHIFT)) * (1 << (SUBPEL_BITS - 1));
+  const int64_t tval = (int64_t)val * sf->y_scale_fp + off;
+  return (int)ROUND_POWER_OF_TWO_SIGNED_64(tval,
+                                           REF_SCALE_SHIFT - SCALE_EXTRA_BITS);
+}
+
+// Note: Expect val to be in q4 precision
+static int unscaled_value(int val, const struct scale_factors *sf) {
+  (void)sf;
+  return val * (1 << SCALE_EXTRA_BITS);
+}
+
+static int get_fixed_point_scale_factor(int other_size, int this_size) {
+  // Calculate scaling factor once for each reference frame
+  // and use fixed point scaling factors in decoding and encoding routines.
+  // Hardware implementations can calculate scale factor in device driver
+  // and use multiplication and shifting on hardware instead of division.
+  return ((other_size << REF_SCALE_SHIFT) + this_size / 2) / this_size;
+}
+
+// Given the fixed point scale, calculate coarse point scale.
+static int fixed_point_scale_to_coarse_point_scale(int scale_fp) {
+  return ROUND_POWER_OF_TWO(scale_fp, REF_SCALE_SHIFT - SCALE_SUBPEL_BITS);
+}
+
+// Note: x and y are integer precision, mvq4 is q4 precision.
+MV32 av1_scale_mv(const MV *mvq4, int x, int y,
+                  const struct scale_factors *sf) {
+  const int x_off_q4 = scaled_x(x << SUBPEL_BITS, sf);
+  const int y_off_q4 = scaled_y(y << SUBPEL_BITS, sf);
+  const MV32 res = { scaled_y((y << SUBPEL_BITS) + mvq4->row, sf) - y_off_q4,
+                     scaled_x((x << SUBPEL_BITS) + mvq4->col, sf) - x_off_q4 };
+  return res;
+}
+
+void av1_setup_scale_factors_for_frame(struct scale_factors *sf, int other_w,
+                                       int other_h, int this_w, int this_h) {
+  if (!valid_ref_frame_size(other_w, other_h, this_w, this_h)) {
+    sf->x_scale_fp = REF_INVALID_SCALE;
+    sf->y_scale_fp = REF_INVALID_SCALE;
+    return;
+  }
+
+  sf->x_scale_fp = get_fixed_point_scale_factor(other_w, this_w);
+  sf->y_scale_fp = get_fixed_point_scale_factor(other_h, this_h);
+
+  sf->x_step_q4 = fixed_point_scale_to_coarse_point_scale(sf->x_scale_fp);
+  sf->y_step_q4 = fixed_point_scale_to_coarse_point_scale(sf->y_scale_fp);
+
+  if (av1_is_scaled(sf)) {
+    sf->scale_value_x = scaled_x;
+    sf->scale_value_y = scaled_y;
+  } else {
+    sf->scale_value_x = unscaled_value;
+    sf->scale_value_y = unscaled_value;
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.c
new file mode 100644
index 0000000000..e99b307c29
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h"
+
+// av1_cospi_arr[i][j] = (int)round(cos(PI*j/128) * (1<<(cos_bit_min+i)));
+const int32_t av1_cospi_arr_data[7][64] = {
+  { 1024, 1024, 1023, 1021, 1019, 1016, 1013, 1009, 1004, 999, 993, 987, 980,
+    972,  964,  955,  946,  936,  926,  915,  903,  891,  878, 865, 851, 837,
+    822,  807,  792,  775,  759,  742,  724,  706,  688,  669, 650, 630, 610,
+    590,  569,  548,  526,  505,  483,  460,  438,  415,  392, 369, 345, 321,
+    297,  273,  249,  224,  200,  175,  150,  125,  100,  75,  50,  25 },
+  { 2048, 2047, 2046, 2042, 2038, 2033, 2026, 2018, 2009, 1998, 1987,
+    1974, 1960, 1945, 1928, 1911, 1892, 1872, 1851, 1829, 1806, 1782,
+    1757, 1730, 1703, 1674, 1645, 1615, 1583, 1551, 1517, 1483, 1448,
+    1412, 1375, 1338, 1299, 1260, 1220, 1179, 1138, 1096, 1053, 1009,
+    965,  921,  876,  830,  784,  737,  690,  642,  595,  546,  498,
+    449,  400,  350,  301,  251,  201,  151,  100,  50 },
+  { 4096, 4095, 4091, 4085, 4076, 4065, 4052, 4036, 4017, 3996, 3973,
+    3948, 3920, 3889, 3857, 3822, 3784, 3745, 3703, 3659, 3612, 3564,
+    3513, 3461, 3406, 3349, 3290, 3229, 3166, 3102, 3035, 2967, 2896,
+    2824, 2751, 2675, 2598, 2520, 2440, 2359, 2276, 2191, 2106, 2019,
+    1931, 1842, 1751, 1660, 1567, 1474, 1380, 1285, 1189, 1092, 995,
+    897,  799,  700,  601,  501,  401,  301,  201,  101 },
+  { 8192, 8190, 8182, 8170, 8153, 8130, 8103, 8071, 8035, 7993, 7946,
+    7895, 7839, 7779, 7713, 7643, 7568, 7489, 7405, 7317, 7225, 7128,
+    7027, 6921, 6811, 6698, 6580, 6458, 6333, 6203, 6070, 5933, 5793,
+    5649, 5501, 5351, 5197, 5040, 4880, 4717, 4551, 4383, 4212, 4038,
+    3862, 3683, 3503, 3320, 3135, 2948, 2760, 2570, 2378, 2185, 1990,
+    1795, 1598, 1401, 1202, 1003, 803,  603,  402,  201 },
+  { 16384, 16379, 16364, 16340, 16305, 16261, 16207, 16143, 16069, 15986, 15893,
+    15791, 15679, 15557, 15426, 15286, 15137, 14978, 14811, 14635, 14449, 14256,
+    14053, 13842, 13623, 13395, 13160, 12916, 12665, 12406, 12140, 11866, 11585,
+    11297, 11003, 10702, 10394, 10080, 9760,  9434,  9102,  8765,  8423,  8076,
+    7723,  7366,  7005,  6639,  6270,  5897,  5520,  5139,  4756,  4370,  3981,
+    3590,  3196,  2801,  2404,  2006,  1606,  1205,  804,   402 },
+  { 32768, 32758, 32729, 32679, 32610, 32522, 32413, 32286, 32138, 31972, 31786,
+    31581, 31357, 31114, 30853, 30572, 30274, 29957, 29622, 29269, 28899, 28511,
+    28106, 27684, 27246, 26791, 26320, 25833, 25330, 24812, 24279, 23732, 23170,
+    22595, 22006, 21403, 20788, 20160, 19520, 18868, 18205, 17531, 16846, 16151,
+    15447, 14733, 14010, 13279, 12540, 11793, 11039, 10279, 9512,  8740,  7962,
+    7180,  6393,  5602,  4808,  4011,  3212,  2411,  1608,  804 },
+  { 65536, 65516, 65457, 65358, 65220, 65043, 64827, 64571, 64277, 63944, 63572,
+    63162, 62714, 62228, 61705, 61145, 60547, 59914, 59244, 58538, 57798, 57022,
+    56212, 55368, 54491, 53581, 52639, 51665, 50660, 49624, 48559, 47464, 46341,
+    45190, 44011, 42806, 41576, 40320, 39040, 37736, 36410, 35062, 33692, 32303,
+    30893, 29466, 28020, 26558, 25080, 23586, 22078, 20557, 19024, 17479, 15924,
+    14359, 12785, 11204, 9616,  8022,  6424,  4821,  3216,  1608 }
+};
+
+// av1_sinpi_arr_data[i][j] = (int)round((sqrt(2) * sin(j*Pi/9) * 2 / 3) * (1
+// << (cos_bit_min + i))) modified so that elements j=1,2 sum to element j=4.
+const int32_t av1_sinpi_arr_data[7][5] = {
+  { 0, 330, 621, 836, 951 },        { 0, 660, 1241, 1672, 1901 },
+  { 0, 1321, 2482, 3344, 3803 },    { 0, 2642, 4964, 6689, 7606 },
+  { 0, 5283, 9929, 13377, 15212 },  { 0, 10566, 19858, 26755, 30424 },
+  { 0, 21133, 39716, 53510, 60849 }
+};
+
+void av1_round_shift_array_c(int32_t *arr, int size, int bit) {
+  int i;
+  if (bit == 0) {
+    return;
+  } else {
+    if (bit > 0) {
+      for (i = 0; i < size; i++) {
+        arr[i] = round_shift(arr[i], bit);
+      }
+    } else {
+      for (i = 0; i < size; i++) {
+        arr[i] = (int32_t)clamp64(((int64_t)1 << (-bit)) * arr[i], INT32_MIN,
+                                  INT32_MAX);
+      }
+    }
+  }
+}
+
+const TXFM_TYPE av1_txfm_type_ls[5][TX_TYPES_1D] = {
+  { TXFM_TYPE_DCT4, TXFM_TYPE_ADST4, TXFM_TYPE_ADST4, TXFM_TYPE_IDENTITY4 },
+  { TXFM_TYPE_DCT8, TXFM_TYPE_ADST8, TXFM_TYPE_ADST8, TXFM_TYPE_IDENTITY8 },
+  { TXFM_TYPE_DCT16, TXFM_TYPE_ADST16, TXFM_TYPE_ADST16, TXFM_TYPE_IDENTITY16 },
+  { TXFM_TYPE_DCT32, TXFM_TYPE_INVALID, TXFM_TYPE_INVALID,
+    TXFM_TYPE_IDENTITY32 },
+  { TXFM_TYPE_DCT64, TXFM_TYPE_INVALID, TXFM_TYPE_INVALID, TXFM_TYPE_INVALID }
+};
+
+const int8_t av1_txfm_stage_num_list[TXFM_TYPES] = {
+  4,   // TXFM_TYPE_DCT4
+  6,   // TXFM_TYPE_DCT8
+  8,   // TXFM_TYPE_DCT16
+  10,  // TXFM_TYPE_DCT32
+  12,  // TXFM_TYPE_DCT64
+  7,   // TXFM_TYPE_ADST4
+  8,   // TXFM_TYPE_ADST8
+  10,  // TXFM_TYPE_ADST16
+  1,   // TXFM_TYPE_IDENTITY4
+  1,   // TXFM_TYPE_IDENTITY8
+  1,   // TXFM_TYPE_IDENTITY16
+  1,   // TXFM_TYPE_IDENTITY32
+};
+
+void av1_range_check_buf(int32_t stage, const int32_t *input,
+                         const int32_t *buf, int32_t size, int8_t bit) {
+#if CONFIG_COEFFICIENT_RANGE_CHECKING
+  const int64_t max_value = (1LL << (bit - 1)) - 1;
+  const int64_t min_value = -(1LL << (bit - 1));
+
+  int in_range = 1;
+
+  for (int i = 0; i < size; ++i) {
+    if (buf[i] < min_value || buf[i] > max_value) {
+      in_range = 0;
+    }
+  }
+
+  if (!in_range) {
+    fprintf(stderr, "Error: coeffs contain out-of-range values\n");
+    fprintf(stderr, "size: %d\n", size);
+    fprintf(stderr, "stage: %d\n", stage);
+    fprintf(stderr, "allowed range: [%" PRId64 ";%" PRId64 "]\n", min_value,
+            max_value);
+
+    fprintf(stderr, "coeffs: ");
+
+    fprintf(stderr, "[");
+    for (int j = 0; j < size; j++) {
+      if (j > 0) fprintf(stderr, ", ");
+      fprintf(stderr, "%d", input[j]);
+    }
+    fprintf(stderr, "]\n");
+
+    fprintf(stderr, "   buf: ");
+
+    fprintf(stderr, "[");
+    for (int j = 0; j < size; j++) {
+      if (j > 0) fprintf(stderr, ", ");
+      fprintf(stderr, "%d", buf[j]);
+    }
+    fprintf(stderr, "]\n\n");
+  }
+
+  assert(in_range);
+#else
+  (void)stage;
+  (void)input;
+  (void)buf;
+  (void)size;
+  (void)bit;
+#endif
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h
new file mode 100644
index 0000000000..84a97a3fc5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_AV1_TXFM_H_
+#define AOM_AV1_COMMON_AV1_TXFM_H_
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(DO_RANGE_CHECK_CLAMP)
+#define DO_RANGE_CHECK_CLAMP 0
+#endif
+
+extern const int32_t av1_cospi_arr_data[7][64];
+extern const int32_t av1_sinpi_arr_data[7][5];
+
+#define MAX_TXFM_STAGE_NUM 12
+
+static const int cos_bit_min = 10;
+static const int cos_bit_max = 16;
+
+#define NewSqrt2Bits ((int32_t)12)
+// 2^12 * sqrt(2)
+static const int32_t NewSqrt2 = 5793;
+// 2^12 / sqrt(2)
+static const int32_t NewInvSqrt2 = 2896;
+
+static INLINE const int32_t *cospi_arr(int n) {
+  return av1_cospi_arr_data[n - cos_bit_min];
+}
+
+static INLINE const int32_t *sinpi_arr(int n) {
+  return av1_sinpi_arr_data[n - cos_bit_min];
+}
+
+static INLINE int32_t range_check_value(int32_t value, int8_t bit) {
+#if CONFIG_COEFFICIENT_RANGE_CHECKING
+  const int64_t max_value = (1LL << (bit - 1)) - 1;
+  const int64_t min_value = -(1LL << (bit - 1));
+  if (value < min_value || value > max_value) {
+    fprintf(stderr, "coeff out of bit range, value: %d bit %d\n", value, bit);
+#if !CONFIG_AV1_ENCODER
+    assert(0);
+#endif
+  }
+#endif  // CONFIG_COEFFICIENT_RANGE_CHECKING
+#if DO_RANGE_CHECK_CLAMP
+  bit = AOMMIN(bit, 31);
+  return clamp(value, -(1 << (bit - 1)), (1 << (bit - 1)) - 1);
+#endif  // DO_RANGE_CHECK_CLAMP
+  (void)bit;
+  return value;
+}
+
+static INLINE int32_t round_shift(int64_t value, int bit) {
+  assert(bit >= 1);
+  return (int32_t)((value + (1ll << (bit - 1))) >> bit);
+}
+
+static INLINE int32_t half_btf(int32_t w0, int32_t in0, int32_t w1, int32_t in1,
+                               int bit) {
+  int64_t result_64 = (int64_t)(w0 * in0) + (int64_t)(w1 * in1);
+  int64_t intermediate = result_64 + (1LL << (bit - 1));
+  // NOTE(david.barker): The value 'result_64' may not necessarily fit
+  // into 32 bits. However, the result of this function is nominally
+  // ROUND_POWER_OF_TWO_64(result_64, bit)
+  // and that is required to fit into stage_range[stage] many bits
+  // (checked by range_check_buf()).
+  //
+  // Here we've unpacked that rounding operation, and it can be shown
+  // that the value of 'intermediate' here *does* fit into 32 bits
+  // for any conformant bitstream.
+  // The upshot is that, if you do all this calculation using
+  // wrapping 32-bit arithmetic instead of (non-wrapping) 64-bit arithmetic,
+  // then you'll still get the correct result.
+  // To provide a check on this logic, we assert that 'intermediate'
+  // would fit into an int32 if range checking is enabled.
+#if CONFIG_COEFFICIENT_RANGE_CHECKING
+  assert(intermediate >= INT32_MIN && intermediate <= INT32_MAX);
+#endif
+  return (int32_t)(intermediate >> bit);
+}
+
+static INLINE uint16_t highbd_clip_pixel_add(uint16_t dest, tran_high_t trans,
+                                             int bd) {
+  return clip_pixel_highbd(dest + (int)trans, bd);
+}
+
+typedef void (*TxfmFunc)(const int32_t *input, int32_t *output, int8_t cos_bit,
+                         const int8_t *stage_range);
+
+typedef void (*FwdTxfm2dFunc)(const int16_t *input, int32_t *output, int stride,
+                              TX_TYPE tx_type, int bd);
+
+enum {
+  TXFM_TYPE_DCT4,
+  TXFM_TYPE_DCT8,
+  TXFM_TYPE_DCT16,
+  TXFM_TYPE_DCT32,
+  TXFM_TYPE_DCT64,
+  TXFM_TYPE_ADST4,
+  TXFM_TYPE_ADST8,
+  TXFM_TYPE_ADST16,
+  TXFM_TYPE_IDENTITY4,
+  TXFM_TYPE_IDENTITY8,
+  TXFM_TYPE_IDENTITY16,
+  TXFM_TYPE_IDENTITY32,
+  TXFM_TYPES,
+  TXFM_TYPE_INVALID,
+} UENUM1BYTE(TXFM_TYPE);
+
+typedef struct TXFM_2D_FLIP_CFG {
+  TX_SIZE tx_size;
+  int ud_flip;  // flip upside down
+  int lr_flip;  // flip left to right
+  const int8_t *shift;
+  int8_t cos_bit_col;
+  int8_t cos_bit_row;
+  int8_t stage_range_col[MAX_TXFM_STAGE_NUM];
+  int8_t stage_range_row[MAX_TXFM_STAGE_NUM];
+  TXFM_TYPE txfm_type_col;
+  TXFM_TYPE txfm_type_row;
+  int stage_num_col;
+  int stage_num_row;
+} TXFM_2D_FLIP_CFG;
+
+static INLINE void get_flip_cfg(TX_TYPE tx_type, int *ud_flip, int *lr_flip) {
+  switch (tx_type) {
+    case DCT_DCT:
+    case ADST_DCT:
+    case DCT_ADST:
+    case ADST_ADST:
+      *ud_flip = 0;
+      *lr_flip = 0;
+      break;
+    case IDTX:
+    case V_DCT:
+    case H_DCT:
+    case V_ADST:
+    case H_ADST:
+      *ud_flip = 0;
+      *lr_flip = 0;
+      break;
+    case FLIPADST_DCT:
+    case FLIPADST_ADST:
+    case V_FLIPADST:
+      *ud_flip = 1;
+      *lr_flip = 0;
+      break;
+    case DCT_FLIPADST:
+    case ADST_FLIPADST:
+    case H_FLIPADST:
+      *ud_flip = 0;
+      *lr_flip = 1;
+      break;
+    case FLIPADST_FLIPADST:
+      *ud_flip = 1;
+      *lr_flip = 1;
+      break;
+    default:
+      *ud_flip = 0;
+      *lr_flip = 0;
+      assert(0);
+  }
+}
+
+static INLINE void set_flip_cfg(TX_TYPE tx_type, TXFM_2D_FLIP_CFG *cfg) {
+  get_flip_cfg(tx_type, &cfg->ud_flip, &cfg->lr_flip);
+}
+
+// Utility function that returns the log of the ratio of the col and row
+// sizes.
+static INLINE int get_rect_tx_log_ratio(int col, int row) {
+  if (col == row) return 0;
+  if (col > row) {
+    if (col == row * 2) return 1;
+    if (col == row * 4) return 2;
+    assert(0 && "Unsupported transform size");
+  } else {
+    if (row == col * 2) return -1;
+    if (row == col * 4) return -2;
+    assert(0 && "Unsupported transform size");
+  }
+  return 0;  // Invalid
+}
+
+void av1_gen_fwd_stage_range(int8_t *stage_range_col, int8_t *stage_range_row,
+                             const TXFM_2D_FLIP_CFG *cfg, int bd);
+
+void av1_gen_inv_stage_range(int8_t *stage_range_col, int8_t *stage_range_row,
+                             const TXFM_2D_FLIP_CFG *cfg, TX_SIZE tx_size,
+                             int bd);
+
+void av1_get_fwd_txfm_cfg(TX_TYPE tx_type, TX_SIZE tx_size,
+                          TXFM_2D_FLIP_CFG *cfg);
+void av1_get_inv_txfm_cfg(TX_TYPE tx_type, TX_SIZE tx_size,
+                          TXFM_2D_FLIP_CFG *cfg);
+extern const TXFM_TYPE av1_txfm_type_ls[5][TX_TYPES_1D];
+extern const int8_t av1_txfm_stage_num_list[TXFM_TYPES];
+static INLINE int get_txw_idx(TX_SIZE tx_size) {
+  return tx_size_wide_log2[tx_size] - tx_size_wide_log2[0];
+}
+static INLINE int get_txh_idx(TX_SIZE tx_size) {
+  return tx_size_high_log2[tx_size] - tx_size_high_log2[0];
+}
+
+void av1_range_check_buf(int32_t stage, const int32_t *input,
+                         const int32_t *buf, int32_t size, int8_t bit);
+#define MAX_TXWH_IDX 5
+#ifdef __cplusplus
+}
+#endif  // __cplusplus
+
+#endif  // AOM_AV1_COMMON_AV1_TXFM_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.c
new file mode 100644
index 0000000000..2f558240c6
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.c
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <math.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/system_state.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+
+PREDICTION_MODE av1_left_block_mode(const MB_MODE_INFO *left_mi) {
+  if (!left_mi) return DC_PRED;
+  assert(!is_inter_block(left_mi) || is_intrabc_block(left_mi));
+  return left_mi->mode;
+}
+
+PREDICTION_MODE av1_above_block_mode(const MB_MODE_INFO *above_mi) {
+  if (!above_mi) return DC_PRED;
+  assert(!is_inter_block(above_mi) || is_intrabc_block(above_mi));
+  return above_mi->mode;
+}
+
+void av1_set_entropy_contexts(const MACROBLOCKD *xd,
+                              struct macroblockd_plane *pd, int plane,
+                              BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
+                              int has_eob, int aoff, int loff) {
+  ENTROPY_CONTEXT *const a = pd->above_entropy_context + aoff;
+  ENTROPY_CONTEXT *const l = pd->left_entropy_context + loff;
+  const int txs_wide = tx_size_wide_unit[tx_size];
+  const int txs_high = tx_size_high_unit[tx_size];
+
+  // above
+  if (has_eob && xd->mb_to_right_edge < 0) {
+    const int blocks_wide = max_block_wide(xd, plane_bsize, plane);
+    const int above_contexts = AOMMIN(txs_wide, blocks_wide - aoff);
+    memset(a, has_eob, sizeof(*a) * above_contexts);
+    memset(a + above_contexts, 0, sizeof(*a) * (txs_wide - above_contexts));
+  } else {
+    memset(a, has_eob, sizeof(*a) * txs_wide);
+  }
+
+  // left
+  if (has_eob && xd->mb_to_bottom_edge < 0) {
+    const int blocks_high = max_block_high(xd, plane_bsize, plane);
+    const int left_contexts = AOMMIN(txs_high, blocks_high - loff);
+    memset(l, has_eob, sizeof(*l) * left_contexts);
+    memset(l + left_contexts, 0, sizeof(*l) * (txs_high - left_contexts));
+  } else {
+    memset(l, has_eob, sizeof(*l) * txs_high);
+  }
+}
+void av1_reset_entropy_context(MACROBLOCKD *xd, BLOCK_SIZE bsize,
+                               const int num_planes) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  const int nplanes = 1 + (num_planes - 1) * xd->is_chroma_ref;
+  for (int i = 0; i < nplanes; i++) {
+    struct macroblockd_plane *const pd = &xd->plane[i];
+    const BLOCK_SIZE plane_bsize =
+        get_plane_block_size(bsize, pd->subsampling_x, pd->subsampling_y);
+    const int txs_wide = mi_size_wide[plane_bsize];
+    const int txs_high = mi_size_high[plane_bsize];
+    memset(pd->above_entropy_context, 0, sizeof(ENTROPY_CONTEXT) * txs_wide);
+    memset(pd->left_entropy_context, 0, sizeof(ENTROPY_CONTEXT) * txs_high);
+  }
+}
+
+void av1_reset_loop_filter_delta(MACROBLOCKD *xd, int num_planes) {
+  xd->delta_lf_from_base = 0;
+  const int frame_lf_count =
+      num_planes > 1 ? FRAME_LF_COUNT : FRAME_LF_COUNT - 2;
+  for (int lf_id = 0; lf_id < frame_lf_count; ++lf_id) xd->delta_lf[lf_id] = 0;
+}
+
+void av1_reset_loop_restoration(MACROBLOCKD *xd, const int num_planes) {
+  for (int p = 0; p < num_planes; ++p) {
+    set_default_wiener(xd->wiener_info + p);
+    set_default_sgrproj(xd->sgrproj_info + p);
+  }
+}
+
+void av1_setup_block_planes(MACROBLOCKD *xd, int ss_x, int ss_y,
+                            const int num_planes) {
+  int i;
+
+  for (i = 0; i < num_planes; i++) {
+    xd->plane[i].plane_type = get_plane_type(i);
+    xd->plane[i].subsampling_x = i ? ss_x : 0;
+    xd->plane[i].subsampling_y = i ? ss_y : 0;
+  }
+  for (i = num_planes; i < MAX_MB_PLANE; i++) {
+    xd->plane[i].subsampling_x = 1;
+    xd->plane[i].subsampling_y = 1;
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h
new file mode 100644
index 0000000000..33fad7bd5e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h
@@ -0,0 +1,1564 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_BLOCKD_H_
+#define AOM_AV1_COMMON_BLOCKD_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common_data.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mv.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/scale.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define USE_B_QUANT_NO_TRELLIS 1
+
+#define MAX_MB_PLANE 3
+
+#define MAX_DIFFWTD_MASK_BITS 1
+
+#define INTERINTRA_WEDGE_SIGN 0
+
+/*!\cond */
+
+// DIFFWTD_MASK_TYPES should not surpass 1 << MAX_DIFFWTD_MASK_BITS
+enum {
+  DIFFWTD_38 = 0,
+  DIFFWTD_38_INV,
+  DIFFWTD_MASK_TYPES,
+} UENUM1BYTE(DIFFWTD_MASK_TYPE);
+
+enum {
+  KEY_FRAME = 0,
+  INTER_FRAME = 1,
+  INTRA_ONLY_FRAME = 2,  // replaces intra-only
+  S_FRAME = 3,
+  FRAME_TYPES,
+} UENUM1BYTE(FRAME_TYPE);
+
+static INLINE int is_comp_ref_allowed(BLOCK_SIZE bsize) {
+  return AOMMIN(block_size_wide[bsize], block_size_high[bsize]) >= 8;
+}
+
+static INLINE int is_inter_mode(PREDICTION_MODE mode) {
+  return mode >= INTER_MODE_START && mode < INTER_MODE_END;
+}
+
+typedef struct {
+  uint8_t *plane[MAX_MB_PLANE];
+  int stride[MAX_MB_PLANE];
+} BUFFER_SET;
+
+static INLINE int is_inter_singleref_mode(PREDICTION_MODE mode) {
+  return mode >= SINGLE_INTER_MODE_START && mode < SINGLE_INTER_MODE_END;
+}
+static INLINE int is_inter_compound_mode(PREDICTION_MODE mode) {
+  return mode >= COMP_INTER_MODE_START && mode < COMP_INTER_MODE_END;
+}
+
+static INLINE PREDICTION_MODE compound_ref0_mode(PREDICTION_MODE mode) {
+  static const PREDICTION_MODE lut[] = {
+    DC_PRED,        // DC_PRED
+    V_PRED,         // V_PRED
+    H_PRED,         // H_PRED
+    D45_PRED,       // D45_PRED
+    D135_PRED,      // D135_PRED
+    D113_PRED,      // D113_PRED
+    D157_PRED,      // D157_PRED
+    D203_PRED,      // D203_PRED
+    D67_PRED,       // D67_PRED
+    SMOOTH_PRED,    // SMOOTH_PRED
+    SMOOTH_V_PRED,  // SMOOTH_V_PRED
+    SMOOTH_H_PRED,  // SMOOTH_H_PRED
+    PAETH_PRED,     // PAETH_PRED
+    NEARESTMV,      // NEARESTMV
+    NEARMV,         // NEARMV
+    GLOBALMV,       // GLOBALMV
+    NEWMV,          // NEWMV
+    NEARESTMV,      // NEAREST_NEARESTMV
+    NEARMV,         // NEAR_NEARMV
+    NEARESTMV,      // NEAREST_NEWMV
+    NEWMV,          // NEW_NEARESTMV
+    NEARMV,         // NEAR_NEWMV
+    NEWMV,          // NEW_NEARMV
+    GLOBALMV,       // GLOBAL_GLOBALMV
+    NEWMV,          // NEW_NEWMV
+  };
+  assert(NELEMENTS(lut) == MB_MODE_COUNT);
+  assert(is_inter_compound_mode(mode) || is_inter_singleref_mode(mode));
+  return lut[mode];
+}
+
+static INLINE PREDICTION_MODE compound_ref1_mode(PREDICTION_MODE mode) {
+  static const PREDICTION_MODE lut[] = {
+    MB_MODE_COUNT,  // DC_PRED
+    MB_MODE_COUNT,  // V_PRED
+    MB_MODE_COUNT,  // H_PRED
+    MB_MODE_COUNT,  // D45_PRED
+    MB_MODE_COUNT,  // D135_PRED
+    MB_MODE_COUNT,  // D113_PRED
+    MB_MODE_COUNT,  // D157_PRED
+    MB_MODE_COUNT,  // D203_PRED
+    MB_MODE_COUNT,  // D67_PRED
+    MB_MODE_COUNT,  // SMOOTH_PRED
+    MB_MODE_COUNT,  // SMOOTH_V_PRED
+    MB_MODE_COUNT,  // SMOOTH_H_PRED
+    MB_MODE_COUNT,  // PAETH_PRED
+    MB_MODE_COUNT,  // NEARESTMV
+    MB_MODE_COUNT,  // NEARMV
+    MB_MODE_COUNT,  // GLOBALMV
+    MB_MODE_COUNT,  // NEWMV
+    NEARESTMV,      // NEAREST_NEARESTMV
+    NEARMV,         // NEAR_NEARMV
+    NEWMV,          // NEAREST_NEWMV
+    NEARESTMV,      // NEW_NEARESTMV
+    NEWMV,          // NEAR_NEWMV
+    NEARMV,         // NEW_NEARMV
+    GLOBALMV,       // GLOBAL_GLOBALMV
+    NEWMV,          // NEW_NEWMV
+  };
+  assert(NELEMENTS(lut) == MB_MODE_COUNT);
+  assert(is_inter_compound_mode(mode));
+  return lut[mode];
+}
+
+static INLINE int have_nearmv_in_inter_mode(PREDICTION_MODE mode) {
+  return (mode == NEARMV || mode == NEAR_NEARMV || mode == NEAR_NEWMV ||
+          mode == NEW_NEARMV);
+}
+
+static INLINE int have_newmv_in_inter_mode(PREDICTION_MODE mode) {
+  return (mode == NEWMV || mode == NEW_NEWMV || mode == NEAREST_NEWMV ||
+          mode == NEW_NEARESTMV || mode == NEAR_NEWMV || mode == NEW_NEARMV);
+}
+
+static INLINE int is_masked_compound_type(COMPOUND_TYPE type) {
+  return (type == COMPOUND_WEDGE || type == COMPOUND_DIFFWTD);
+}
+
+/* For keyframes, intra block modes are predicted by the (already decoded)
+   modes for the Y blocks to the left and above us; for interframes, there
+   is a single probability table. */
+
+typedef struct {
+  // Value of base colors for Y, U, and V
+  uint16_t palette_colors[3 * PALETTE_MAX_SIZE];
+  // Number of base colors for Y (0) and UV (1)
+  uint8_t palette_size[2];
+} PALETTE_MODE_INFO;
+
+typedef struct {
+  FILTER_INTRA_MODE filter_intra_mode;
+  uint8_t use_filter_intra;
+} FILTER_INTRA_MODE_INFO;
+
+static const PREDICTION_MODE fimode_to_intradir[FILTER_INTRA_MODES] = {
+  DC_PRED, V_PRED, H_PRED, D157_PRED, DC_PRED
+};
+
+#if CONFIG_RD_DEBUG
+#define TXB_COEFF_COST_MAP_SIZE (MAX_MIB_SIZE)
+#endif
+
+typedef struct RD_STATS {
+  int rate;
+  int64_t dist;
+  // Please be careful of using rdcost, it's not guaranteed to be set all the
+  // time.
+  // TODO(angiebird): Create a set of functions to manipulate the RD_STATS. In
+  // these functions, make sure rdcost is always up-to-date according to
+  // rate/dist.
+  int64_t rdcost;
+  int64_t sse;
+  int skip_txfm;  // sse should equal to dist when skip_txfm == 1
+  int zero_rate;
+#if CONFIG_RD_DEBUG
+  int txb_coeff_cost[MAX_MB_PLANE];
+  // TODO(jingning): Temporary solution to silence stack over-size warning
+  // in handle_inter_mode. This should be fixed after rate-distortion
+  // optimization refactoring.
+  int16_t txb_coeff_cost_map[MAX_MB_PLANE][TXB_COEFF_COST_MAP_SIZE]
+                            [TXB_COEFF_COST_MAP_SIZE];
+#endif  // CONFIG_RD_DEBUG
+} RD_STATS;
+
+// This struct is used to group function args that are commonly
+// sent together in functions related to interinter compound modes
+typedef struct {
+  uint8_t *seg_mask;
+  int8_t wedge_index;
+  int8_t wedge_sign;
+  DIFFWTD_MASK_TYPE mask_type;
+  COMPOUND_TYPE type;
+} INTERINTER_COMPOUND_DATA;
+
+#define INTER_TX_SIZE_BUF_LEN 16
+#define TXK_TYPE_BUF_LEN 64
+/*!\endcond */
+
+/*! \brief Stores the prediction/txfm mode of the current coding block
+ */
+typedef struct MB_MODE_INFO {
+  /*****************************************************************************
+   * \name General Info of the Coding Block
+   ****************************************************************************/
+  /**@{*/
+  /*! \brief The block size of the current coding block */
+  BLOCK_SIZE bsize;
+  /*! \brief The partition type of the current coding block. */
+  PARTITION_TYPE partition;
+  /*! \brief The prediction mode used */
+  PREDICTION_MODE mode;
+  /*! \brief The UV mode when intra is used */
+  UV_PREDICTION_MODE uv_mode;
+  /*! \brief The q index for the current coding block. */
+  int current_qindex;
+  /**@}*/
+
+  /*****************************************************************************
+   * \name Inter Mode Info
+   ****************************************************************************/
+  /**@{*/
+  /*! \brief The motion vectors used by the current inter mode */
+  int_mv mv[2];
+  /*! \brief The reference frames for the MV */
+  MV_REFERENCE_FRAME ref_frame[2];
+  /*! \brief Filter used in subpel interpolation. */
+  int_interpfilters interp_filters;
+  /*! \brief The motion mode used by the inter prediction. */
+  MOTION_MODE motion_mode;
+  /*! \brief Number of samples used by warp causal */
+  uint8_t num_proj_ref;
+  /*! \brief The number of overlapped neighbors above/left for obmc/warp motion
+   * mode. */
+  uint8_t overlappable_neighbors;
+  /*! \brief The parameters used in warp motion mode. */
+  WarpedMotionParams wm_params;
+  /*! \brief The type of intra mode used by inter-intra */
+  INTERINTRA_MODE interintra_mode;
+  /*! \brief The type of wedge used in interintra mode. */
+  int8_t interintra_wedge_index;
+  /*! \brief Struct that stores the data used in interinter compound mode. */
+  INTERINTER_COMPOUND_DATA interinter_comp;
+  /**@}*/
+
+  /*****************************************************************************
+   * \name Intra Mode Info
+   ****************************************************************************/
+  /**@{*/
+  /*! \brief Directional mode delta: the angle is base angle + (angle_delta *
+   * step). */
+  int8_t angle_delta[PLANE_TYPES];
+  /*! \brief The type of filter intra mode used (if applicable). */
+  FILTER_INTRA_MODE_INFO filter_intra_mode_info;
+  /*! \brief Chroma from Luma: Joint sign of alpha Cb and alpha Cr */
+  int8_t cfl_alpha_signs;
+  /*! \brief Chroma from Luma: Index of the alpha Cb and alpha Cr combination */
+  uint8_t cfl_alpha_idx;
+  /*! \brief Stores the size and colors of palette mode */
+  PALETTE_MODE_INFO palette_mode_info;
+  /**@}*/
+
+  /*****************************************************************************
+   * \name Transform Info
+   ****************************************************************************/
+  /**@{*/
+  /*! \brief Whether to skip transforming and sending. */
+  int8_t skip_txfm;
+  /*! \brief Transform size when fixed size txfm is used (e.g. intra modes). */
+  TX_SIZE tx_size;
+  /*! \brief Transform size when recursive txfm tree is on. */
+  TX_SIZE inter_tx_size[INTER_TX_SIZE_BUF_LEN];
+  /**@}*/
+
+  /*****************************************************************************
+   * \name Loop Filter Info
+   ****************************************************************************/
+  /**@{*/
+  /*! \copydoc MACROBLOCKD::delta_lf_from_base */
+  int8_t delta_lf_from_base;
+  /*! \copydoc MACROBLOCKD::delta_lf */
+  int8_t delta_lf[FRAME_LF_COUNT];
+  /**@}*/
+
+  /*****************************************************************************
+   * \name Bitfield for Memory Reduction
+   ****************************************************************************/
+  /**@{*/
+  /*! \brief The segment id */
+  uint8_t segment_id : 3;
+  /*! \brief Only valid when temporal update if off. */
+  uint8_t seg_id_predicted : 1;
+  /*! \brief Which ref_mv to use */
+  uint8_t ref_mv_idx : 2;
+  /*! \brief Inter skip mode */
+  uint8_t skip_mode : 1;
+  /*! \brief Whether intrabc is used. */
+  uint8_t use_intrabc : 1;
+  /*! \brief Indicates if masked compound is used(1) or not (0). */
+  uint8_t comp_group_idx : 1;
+  /*! \brief Indicates whether dist_wtd_comp(0) is used or not (0). */
+  uint8_t compound_idx : 1;
+  /*! \brief Whether to use interintra wedge */
+  uint8_t use_wedge_interintra : 1;
+  /*! \brief CDEF strength per BLOCK_64X64 */
+  int8_t cdef_strength : 4;
+  /**@}*/
+
+#if CONFIG_RD_DEBUG
+  /*! \brief RD info used for debugging */
+  RD_STATS rd_stats;
+  /*! \brief The current row in unit of 4x4 blocks for debugging */
+  int mi_row;
+  /*! \brief The current col in unit of 4x4 blocks for debugging */
+  int mi_col;
+#endif
+#if CONFIG_INSPECTION
+  /*! \brief Whether we are skipping the current rows or columns. */
+  int16_t tx_skip[TXK_TYPE_BUF_LEN];
+#endif
+} MB_MODE_INFO;
+
+/*!\cond */
+
+static INLINE int is_intrabc_block(const MB_MODE_INFO *mbmi) {
+  return mbmi->use_intrabc;
+}
+
+static INLINE PREDICTION_MODE get_uv_mode(UV_PREDICTION_MODE mode) {
+  assert(mode < UV_INTRA_MODES);
+  static const PREDICTION_MODE uv2y[] = {
+    DC_PRED,        // UV_DC_PRED
+    V_PRED,         // UV_V_PRED
+    H_PRED,         // UV_H_PRED
+    D45_PRED,       // UV_D45_PRED
+    D135_PRED,      // UV_D135_PRED
+    D113_PRED,      // UV_D113_PRED
+    D157_PRED,      // UV_D157_PRED
+    D203_PRED,      // UV_D203_PRED
+    D67_PRED,       // UV_D67_PRED
+    SMOOTH_PRED,    // UV_SMOOTH_PRED
+    SMOOTH_V_PRED,  // UV_SMOOTH_V_PRED
+    SMOOTH_H_PRED,  // UV_SMOOTH_H_PRED
+    PAETH_PRED,     // UV_PAETH_PRED
+    DC_PRED,        // UV_CFL_PRED
+    INTRA_INVALID,  // UV_INTRA_MODES
+    INTRA_INVALID,  // UV_MODE_INVALID
+  };
+  return uv2y[mode];
+}
+
+static INLINE int is_inter_block(const MB_MODE_INFO *mbmi) {
+  return is_intrabc_block(mbmi) || mbmi->ref_frame[0] > INTRA_FRAME;
+}
+
+static INLINE int has_second_ref(const MB_MODE_INFO *mbmi) {
+  return mbmi->ref_frame[1] > INTRA_FRAME;
+}
+
+static INLINE int has_uni_comp_refs(const MB_MODE_INFO *mbmi) {
+  return has_second_ref(mbmi) && (!((mbmi->ref_frame[0] >= BWDREF_FRAME) ^
+                                    (mbmi->ref_frame[1] >= BWDREF_FRAME)));
+}
+
+static INLINE MV_REFERENCE_FRAME comp_ref0(int ref_idx) {
+  static const MV_REFERENCE_FRAME lut[] = {
+    LAST_FRAME,     // LAST_LAST2_FRAMES,
+    LAST_FRAME,     // LAST_LAST3_FRAMES,
+    LAST_FRAME,     // LAST_GOLDEN_FRAMES,
+    BWDREF_FRAME,   // BWDREF_ALTREF_FRAMES,
+    LAST2_FRAME,    // LAST2_LAST3_FRAMES
+    LAST2_FRAME,    // LAST2_GOLDEN_FRAMES,
+    LAST3_FRAME,    // LAST3_GOLDEN_FRAMES,
+    BWDREF_FRAME,   // BWDREF_ALTREF2_FRAMES,
+    ALTREF2_FRAME,  // ALTREF2_ALTREF_FRAMES,
+  };
+  assert(NELEMENTS(lut) == TOTAL_UNIDIR_COMP_REFS);
+  return lut[ref_idx];
+}
+
+static INLINE MV_REFERENCE_FRAME comp_ref1(int ref_idx) {
+  static const MV_REFERENCE_FRAME lut[] = {
+    LAST2_FRAME,    // LAST_LAST2_FRAMES,
+    LAST3_FRAME,    // LAST_LAST3_FRAMES,
+    GOLDEN_FRAME,   // LAST_GOLDEN_FRAMES,
+    ALTREF_FRAME,   // BWDREF_ALTREF_FRAMES,
+    LAST3_FRAME,    // LAST2_LAST3_FRAMES
+    GOLDEN_FRAME,   // LAST2_GOLDEN_FRAMES,
+    GOLDEN_FRAME,   // LAST3_GOLDEN_FRAMES,
+    ALTREF2_FRAME,  // BWDREF_ALTREF2_FRAMES,
+    ALTREF_FRAME,   // ALTREF2_ALTREF_FRAMES,
+  };
+  assert(NELEMENTS(lut) == TOTAL_UNIDIR_COMP_REFS);
+  return lut[ref_idx];
+}
+
+PREDICTION_MODE av1_left_block_mode(const MB_MODE_INFO *left_mi);
+
+PREDICTION_MODE av1_above_block_mode(const MB_MODE_INFO *above_mi);
+
+static INLINE int is_global_mv_block(const MB_MODE_INFO *const mbmi,
+                                     TransformationType type) {
+  const PREDICTION_MODE mode = mbmi->mode;
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  const int block_size_allowed =
+      AOMMIN(block_size_wide[bsize], block_size_high[bsize]) >= 8;
+  return (mode == GLOBALMV || mode == GLOBAL_GLOBALMV) && type > TRANSLATION &&
+         block_size_allowed;
+}
+
+#if CONFIG_MISMATCH_DEBUG
+static INLINE void mi_to_pixel_loc(int *pixel_c, int *pixel_r, int mi_col,
+                                   int mi_row, int tx_blk_col, int tx_blk_row,
+                                   int subsampling_x, int subsampling_y) {
+  *pixel_c = ((mi_col >> subsampling_x) << MI_SIZE_LOG2) +
+             (tx_blk_col << MI_SIZE_LOG2);
+  *pixel_r = ((mi_row >> subsampling_y) << MI_SIZE_LOG2) +
+             (tx_blk_row << MI_SIZE_LOG2);
+}
+#endif
+
+enum { MV_PRECISION_Q3, MV_PRECISION_Q4 } UENUM1BYTE(mv_precision);
+
+struct buf_2d {
+  uint8_t *buf;
+  uint8_t *buf0;
+  int width;
+  int height;
+  int stride;
+};
+
+typedef struct eob_info {
+  uint16_t eob;
+  uint16_t max_scan_line;
+} eob_info;
+
+typedef struct {
+  DECLARE_ALIGNED(32, tran_low_t, dqcoeff[MAX_MB_PLANE][MAX_SB_SQUARE]);
+  eob_info eob_data[MAX_MB_PLANE]
+                   [MAX_SB_SQUARE / (TX_SIZE_W_MIN * TX_SIZE_H_MIN)];
+  DECLARE_ALIGNED(16, uint8_t, color_index_map[2][MAX_SB_SQUARE]);
+} CB_BUFFER;
+
+typedef struct macroblockd_plane {
+  PLANE_TYPE plane_type;
+  int subsampling_x;
+  int subsampling_y;
+  struct buf_2d dst;
+  struct buf_2d pre[2];
+  ENTROPY_CONTEXT *above_entropy_context;
+  ENTROPY_CONTEXT *left_entropy_context;
+
+  // The dequantizers below are true dequantizers used only in the
+  // dequantization process.  They have the same coefficient
+  // shift/scale as TX.
+  int16_t seg_dequant_QTX[MAX_SEGMENTS][2];
+  // Pointer to color index map of:
+  // - Current coding block, on encoder side.
+  // - Current superblock, on decoder side.
+  uint8_t *color_index_map;
+
+  // block size in pixels
+  uint8_t width, height;
+
+  qm_val_t *seg_iqmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
+  qm_val_t *seg_qmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
+} MACROBLOCKD_PLANE;
+
+#define BLOCK_OFFSET(i) ((i) << 4)
+
+/*!\endcond */
+
+/*!\brief Parameters related to Wiener Filter */
+typedef struct {
+  /*!
+   * Vertical filter kernel.
+   */
+  DECLARE_ALIGNED(16, InterpKernel, vfilter);
+
+  /*!
+   * Horizontal filter kernel.
+   */
+  DECLARE_ALIGNED(16, InterpKernel, hfilter);
+} WienerInfo;
+
+/*!\brief Parameters related to Sgrproj Filter */
+typedef struct {
+  /*!
+   * Parameter index.
+   */
+  int ep;
+
+  /*!
+   * Weights for linear combination of filtered versions
+   */
+  int xqd[2];
+} SgrprojInfo;
+
+/*!\cond */
+
+#if CONFIG_DEBUG
+#define CFL_SUB8X8_VAL_MI_SIZE (4)
+#define CFL_SUB8X8_VAL_MI_SQUARE \
+  (CFL_SUB8X8_VAL_MI_SIZE * CFL_SUB8X8_VAL_MI_SIZE)
+#endif  // CONFIG_DEBUG
+#define CFL_MAX_BLOCK_SIZE (BLOCK_32X32)
+#define CFL_BUF_LINE (32)
+#define CFL_BUF_LINE_I128 (CFL_BUF_LINE >> 3)
+#define CFL_BUF_LINE_I256 (CFL_BUF_LINE >> 4)
+#define CFL_BUF_SQUARE (CFL_BUF_LINE * CFL_BUF_LINE)
+typedef struct cfl_ctx {
+  // Q3 reconstructed luma pixels (only Q2 is required, but Q3 is used to avoid
+  // shifts)
+  uint16_t recon_buf_q3[CFL_BUF_SQUARE];
+  // Q3 AC contributions (reconstructed luma pixels - tx block avg)
+  int16_t ac_buf_q3[CFL_BUF_SQUARE];
+
+  // Cache the DC_PRED when performing RDO, so it does not have to be recomputed
+  // for every scaling parameter
+  int dc_pred_is_cached[CFL_PRED_PLANES];
+  // The DC_PRED cache is disable when decoding
+  int use_dc_pred_cache;
+  // Only cache the first row of the DC_PRED
+  int16_t dc_pred_cache[CFL_PRED_PLANES][CFL_BUF_LINE];
+
+  // Height and width currently used in the CfL prediction buffer.
+  int buf_height, buf_width;
+
+  int are_parameters_computed;
+
+  // Chroma subsampling
+  int subsampling_x, subsampling_y;
+
+  // Whether the reconstructed luma pixels need to be stored
+  int store_y;
+
+#if CONFIG_DEBUG
+  int rate;
+#endif  // CONFIG_DEBUG
+} CFL_CTX;
+
+typedef struct dist_wtd_comp_params {
+  int use_dist_wtd_comp_avg;
+  int fwd_offset;
+  int bck_offset;
+} DIST_WTD_COMP_PARAMS;
+
+struct scale_factors;
+
+/*!\endcond */
+
+/*! \brief Variables related to current coding block.
+ *
+ * This is a common set of variables used by both encoder and decoder.
+ * Most/all of the pointers are mere pointers to actual arrays are allocated
+ * elsewhere. This is mostly for coding convenience.
+ */
+typedef struct macroblockd {
+  /**
+   * \name Position of current macroblock in mi units
+   */
+  /**@{*/
+  int mi_row; /*!< Row position in mi units. */
+  int mi_col; /*!< Column position in mi units. */
+  /**@}*/
+
+  /*!
+   * Same as cm->mi_params.mi_stride, copied here for convenience.
+   */
+  int mi_stride;
+
+  /*!
+   * True if current block transmits chroma information.
+   * More detail:
+   * Smallest supported block size for both luma and chroma plane is 4x4. Hence,
+   * in case of subsampled chroma plane (YUV 4:2:0 or YUV 4:2:2), multiple luma
+   * blocks smaller than 8x8 maybe combined into one chroma block.
+   * For example, for YUV 4:2:0, let's say an 8x8 area is split into four 4x4
+   * luma blocks. Then, a single chroma block of size 4x4 will cover the area of
+   * these four luma blocks. This is implemented in bitstream as follows:
+   * - There are four MB_MODE_INFO structs for the four luma blocks.
+   * - First 3 MB_MODE_INFO have is_chroma_ref = false, and so do not transmit
+   * any information for chroma planes.
+   * - Last block will have is_chroma_ref = true and transmits chroma
+   * information for the 4x4 chroma block that covers whole 8x8 area covered by
+   * four luma blocks.
+   * Similar logic applies for chroma blocks that cover 2 or 3 luma blocks.
+   */
+  bool is_chroma_ref;
+
+  /*!
+   * Info specific to each plane.
+   */
+  struct macroblockd_plane plane[MAX_MB_PLANE];
+
+  /*!
+   * Tile related info.
+   */
+  TileInfo tile;
+
+  /*!
+   * Appropriate offset inside cm->mi_params.mi_grid_base based on current
+   * mi_row and mi_col.
+   */
+  MB_MODE_INFO **mi;
+
+  /*!
+   * True if 4x4 block above the current block is available.
+   */
+  bool up_available;
+  /*!
+   * True if 4x4 block to the left of the current block is available.
+   */
+  bool left_available;
+  /*!
+   * True if the above chrome reference block is available.
+   */
+  bool chroma_up_available;
+  /*!
+   * True if the left chrome reference block is available.
+   */
+  bool chroma_left_available;
+
+  /*!
+   * MB_MODE_INFO for 4x4 block to the left of the current block, if
+   * left_available == true; otherwise NULL.
+   */
+  MB_MODE_INFO *left_mbmi;
+  /*!
+   * MB_MODE_INFO for 4x4 block above the current block, if
+   * up_available == true; otherwise NULL.
+   */
+  MB_MODE_INFO *above_mbmi;
+  /*!
+   * Above chroma reference block if is_chroma_ref == true for the current block
+   * and chroma_up_available == true; otherwise NULL.
+   * See also: the special case logic when current chroma block covers more than
+   * one luma blocks in set_mi_row_col().
+   */
+  MB_MODE_INFO *chroma_left_mbmi;
+  /*!
+   * Left chroma reference block if is_chroma_ref == true for the current block
+   * and chroma_left_available == true; otherwise NULL.
+   * See also: the special case logic when current chroma block covers more than
+   * one luma blocks in set_mi_row_col().
+   */
+  MB_MODE_INFO *chroma_above_mbmi;
+
+  /*!
+   * Appropriate offset based on current 'mi_row' and 'mi_col', inside
+   * 'tx_type_map' in one of 'CommonModeInfoParams', 'PICK_MODE_CONTEXT' or
+   * 'MACROBLOCK' structs.
+   */
+  uint8_t *tx_type_map;
+  /*!
+   * Stride for 'tx_type_map'. Note that this may / may not be same as
+   * 'mi_stride', depending on which actual array 'tx_type_map' points to.
+   */
+  int tx_type_map_stride;
+
+  /**
+   * \name Distance of this macroblock from frame edges in 1/8th pixel units.
+   */
+  /**@{*/
+  int mb_to_left_edge;   /*!< Distance from left edge */
+  int mb_to_right_edge;  /*!< Distance from right edge */
+  int mb_to_top_edge;    /*!< Distance from top edge */
+  int mb_to_bottom_edge; /*!< Distance from bottom edge */
+  /**@}*/
+
+  /*!
+   * Scale factors for reference frames of the current block.
+   * These are pointers into 'cm->ref_scale_factors'.
+   */
+  const struct scale_factors *block_ref_scale_factors[2];
+
+  /*!
+   * - On encoder side: points to cpi->source, which is the buffer containing
+   * the current *source* frame (maybe filtered).
+   * - On decoder side: points to cm->cur_frame->buf, which is the buffer into
+   * which current frame is being *decoded*.
+   */
+  const YV12_BUFFER_CONFIG *cur_buf;
+
+  /*!
+   * Entropy contexts for the above blocks.
+   * above_entropy_context[i][j] corresponds to above entropy context for ith
+   * plane and jth mi column of this *frame*, wrt current 'mi_row'.
+   * These are pointers into 'cm->above_contexts.entropy'.
+   */
+  ENTROPY_CONTEXT *above_entropy_context[MAX_MB_PLANE];
+  /*!
+   * Entropy contexts for the left blocks.
+   * left_entropy_context[i][j] corresponds to left entropy context for ith
+   * plane and jth mi row of this *superblock*, wrt current 'mi_col'.
+   * Note: These contain actual data, NOT pointers.
+   */
+  ENTROPY_CONTEXT left_entropy_context[MAX_MB_PLANE][MAX_MIB_SIZE];
+
+  /*!
+   * Partition contexts for the above blocks.
+   * above_partition_context[i] corresponds to above partition context for ith
+   * mi column of this *frame*, wrt current 'mi_row'.
+   * This is a pointer into 'cm->above_contexts.partition'.
+   */
+  PARTITION_CONTEXT *above_partition_context;
+  /*!
+   * Partition contexts for the left blocks.
+   * left_partition_context[i] corresponds to left partition context for ith
+   * mi row of this *superblock*, wrt current 'mi_col'.
+   * Note: These contain actual data, NOT pointers.
+   */
+  PARTITION_CONTEXT left_partition_context[MAX_MIB_SIZE];
+
+  /*!
+   * Transform contexts for the above blocks.
+   * above_txfm_context[i] corresponds to above transform context for ith mi col
+   * from the current position (mi row and mi column) for this *frame*.
+   * This is a pointer into 'cm->above_contexts.txfm'.
+   */
+  TXFM_CONTEXT *above_txfm_context;
+  /*!
+   * Transform contexts for the left blocks.
+   * left_txfm_context[i] corresponds to left transform context for ith mi row
+   * from the current position (mi_row and mi_col) for this *superblock*.
+   * This is a pointer into 'left_txfm_context_buffer'.
+   */
+  TXFM_CONTEXT *left_txfm_context;
+  /*!
+   * left_txfm_context_buffer[i] is the left transform context for ith mi_row
+   * in this *superblock*.
+   * Behaves like an internal actual buffer which 'left_txt_context' points to,
+   * and never accessed directly except to fill in initial default values.
+   */
+  TXFM_CONTEXT left_txfm_context_buffer[MAX_MIB_SIZE];
+
+  /**
+   * \name Default values for the two restoration filters for each plane.
+   * Default values for the two restoration filters for each plane.
+   * These values are used as reference values when writing the bitstream. That
+   * is, we transmit the delta between the actual values in
+   * cm->rst_info[plane].unit_info[unit_idx] and these reference values.
+   */
+  /**@{*/
+  WienerInfo wiener_info[MAX_MB_PLANE];   /*!< Defaults for Wiener filter*/
+  SgrprojInfo sgrproj_info[MAX_MB_PLANE]; /*!< Defaults for SGR filter */
+  /**@}*/
+
+  /**
+   * \name Block dimensions in MB_MODE_INFO units.
+   */
+  /**@{*/
+  uint8_t width;  /*!< Block width in MB_MODE_INFO units */
+  uint8_t height; /*!< Block height in MB_MODE_INFO units */
+  /**@}*/
+
+  /*!
+   * Contains the motion vector candidates found during motion vector prediction
+   * process. ref_mv_stack[i] contains the candidates for ith type of
+   * reference frame (single/compound). The actual number of candidates found in
+   * ref_mv_stack[i] is stored in either dcb->ref_mv_count[i] (decoder side)
+   * or mbmi_ext->ref_mv_count[i] (encoder side).
+   */
+  CANDIDATE_MV ref_mv_stack[MODE_CTX_REF_FRAMES][MAX_REF_MV_STACK_SIZE];
+  /*!
+   * weight[i][j] is the weight for ref_mv_stack[i][j] and used to compute the
+   * DRL (dynamic reference list) mode contexts.
+   */
+  uint16_t weight[MODE_CTX_REF_FRAMES][MAX_REF_MV_STACK_SIZE];
+
+  /*!
+   * True if this is the last vertical rectangular block in a VERTICAL or
+   * VERTICAL_4 partition.
+   */
+  bool is_last_vertical_rect;
+  /*!
+   * True if this is the 1st horizontal rectangular block in a HORIZONTAL or
+   * HORIZONTAL_4 partition.
+   */
+  bool is_first_horizontal_rect;
+
+  /*!
+   * Counts of each reference frame in the above and left neighboring blocks.
+   * NOTE: Take into account both single and comp references.
+   */
+  uint8_t neighbors_ref_counts[REF_FRAMES];
+
+  /*!
+   * Current CDFs of all the symbols for the current tile.
+   */
+  FRAME_CONTEXT *tile_ctx;
+
+  /*!
+   * Bit depth: copied from cm->seq_params.bit_depth for convenience.
+   */
+  int bd;
+
+  /*!
+   * Quantizer index for each segment (base qindex + delta for each segment).
+   */
+  int qindex[MAX_SEGMENTS];
+  /*!
+   * lossless[s] is true if segment 's' is coded losslessly.
+   */
+  int lossless[MAX_SEGMENTS];
+  /*!
+   * Q index for the coding blocks in this superblock will be stored in
+   * mbmi->current_qindex. Now, when cm->delta_q_info.delta_q_present_flag is
+   * true, mbmi->current_qindex is computed by taking 'current_base_qindex' as
+   * the base, and adding any transmitted delta qindex on top of it.
+   * Precisely, this is the latest qindex used by the first coding block of a
+   * non-skip superblock in the current tile; OR
+   * same as cm->quant_params.base_qindex (if not explicitly set yet).
+   * Note: This is 'CurrentQIndex' in the AV1 spec.
+   */
+  int current_base_qindex;
+
+  /*!
+   * Same as cm->features.cur_frame_force_integer_mv.
+   */
+  int cur_frame_force_integer_mv;
+
+  /*!
+   * Pointer to cm->error.
+   */
+  struct aom_internal_error_info *error_info;
+
+  /*!
+   * Same as cm->global_motion.
+   */
+  const WarpedMotionParams *global_motion;
+
+  /*!
+   * Since actual frame level loop filtering level value is not available
+   * at the beginning of the tile (only available during actual filtering)
+   * at encoder side.we record the delta_lf (against the frame level loop
+   * filtering level) and code the delta between previous superblock's delta
+   * lf and current delta lf. It is equivalent to the delta between previous
+   * superblock's actual lf and current lf.
+   */
+  int8_t delta_lf_from_base;
+  /*!
+   * We have four frame filter levels for different plane and direction. So, to
+   * support the per superblock update, we need to add a few more params:
+   * 0. delta loop filter level for y plane vertical
+   * 1. delta loop filter level for y plane horizontal
+   * 2. delta loop filter level for u plane
+   * 3. delta loop filter level for v plane
+   * To make it consistent with the reference to each filter level in segment,
+   * we need to -1, since
+   * - SEG_LVL_ALT_LF_Y_V = 1;
+   * - SEG_LVL_ALT_LF_Y_H = 2;
+   * - SEG_LVL_ALT_LF_U   = 3;
+   * - SEG_LVL_ALT_LF_V   = 4;
+   */
+  int8_t delta_lf[FRAME_LF_COUNT];
+  /*!
+   * cdef_transmitted[i] is true if CDEF strength for ith CDEF unit in the
+   * current superblock has already been read from (decoder) / written to
+   * (encoder) the bitstream; and false otherwise.
+   * More detail:
+   * 1. CDEF strength is transmitted only once per CDEF unit, in the 1st
+   * non-skip coding block. So, we need this array to keep track of whether CDEF
+   * strengths for the given CDEF units have been transmitted yet or not.
+   * 2. Superblock size can be either 128x128 or 64x64, but CDEF unit size is
+   * fixed to be 64x64. So, there may be 4 CDEF units within a superblock (if
+   * superblock size is 128x128). Hence the array size is 4.
+   * 3. In the current implementation, CDEF strength for this CDEF unit is
+   * stored in the MB_MODE_INFO of the 1st block in this CDEF unit (inside
+   * cm->mi_params.mi_grid_base).
+   */
+  bool cdef_transmitted[4];
+
+  /*!
+   * Mask for this block used for compound prediction.
+   */
+  DECLARE_ALIGNED(16, uint8_t, seg_mask[2 * MAX_SB_SQUARE]);
+
+  /*!
+   * CFL (chroma from luma) related parameters.
+   */
+  CFL_CTX cfl;
+
+  /*!
+   * Offset to plane[p].color_index_map.
+   * Currently:
+   * - On encoder side, this is always 0 as 'color_index_map' is allocated per
+   * *coding block* there.
+   * - On decoder side, this may be non-zero, as 'color_index_map' is a (static)
+   * memory pointing to the base of a *superblock* there, and we need an offset
+   * to it to get the color index map for current coding block.
+   */
+  uint16_t color_index_map_offset[2];
+
+  /*!
+   * Temporary buffer used for convolution in case of compound reference only
+   * for (weighted or uniform) averaging operation.
+   * There are pointers to actual buffers allocated elsewhere: e.g.
+   * - In decoder, 'pbi->td.tmp_conv_dst' or
+   * 'pbi->thread_data[t].td->xd.tmp_conv_dst' and
+   * - In encoder, 'x->tmp_conv_dst' or
+   * 'cpi->tile_thr_data[t].td->mb.tmp_conv_dst'.
+   */
+  CONV_BUF_TYPE *tmp_conv_dst;
+  /*!
+   * Temporary buffers used to build OBMC prediction by above (index 0) and left
+   * (index 1) predictors respectively.
+   * tmp_obmc_bufs[i][p * MAX_SB_SQUARE] is the buffer used for plane 'p'.
+   * There are pointers to actual buffers allocated elsewhere: e.g.
+   * - In decoder, 'pbi->td.tmp_obmc_bufs' or
+   * 'pbi->thread_data[t].td->xd.tmp_conv_dst' and
+   * -In encoder, 'x->tmp_pred_bufs' or
+   * 'cpi->tile_thr_data[t].td->mb.tmp_pred_bufs'.
+   */
+  uint8_t *tmp_obmc_bufs[2];
+} MACROBLOCKD;
+
+/*!\cond */
+
+static INLINE int is_cur_buf_hbd(const MACROBLOCKD *xd) {
+  return xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH ? 1 : 0;
+}
+
+static INLINE uint8_t *get_buf_by_bd(const MACROBLOCKD *xd, uint8_t *buf16) {
+  return (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH)
+             ? CONVERT_TO_BYTEPTR(buf16)
+             : buf16;
+}
+
+static INLINE int get_sqr_bsize_idx(BLOCK_SIZE bsize) {
+  switch (bsize) {
+    case BLOCK_4X4: return 0;
+    case BLOCK_8X8: return 1;
+    case BLOCK_16X16: return 2;
+    case BLOCK_32X32: return 3;
+    case BLOCK_64X64: return 4;
+    case BLOCK_128X128: return 5;
+    default: return SQR_BLOCK_SIZES;
+  }
+}
+
+// For a square block size 'bsize', returns the size of the sub-blocks used by
+// the given partition type. If the partition produces sub-blocks of different
+// sizes, then the function returns the largest sub-block size.
+// Implements the Partition_Subsize lookup table in the spec (Section 9.3.
+// Conversion tables).
+// Note: the input block size should be square.
+// Otherwise it's considered invalid.
+static INLINE BLOCK_SIZE get_partition_subsize(BLOCK_SIZE bsize,
+                                               PARTITION_TYPE partition) {
+  if (partition == PARTITION_INVALID) {
+    return BLOCK_INVALID;
+  } else {
+    const int sqr_bsize_idx = get_sqr_bsize_idx(bsize);
+    return sqr_bsize_idx >= SQR_BLOCK_SIZES
+               ? BLOCK_INVALID
+               : subsize_lookup[partition][sqr_bsize_idx];
+  }
+}
+
+static TX_TYPE intra_mode_to_tx_type(const MB_MODE_INFO *mbmi,
+                                     PLANE_TYPE plane_type) {
+  static const TX_TYPE _intra_mode_to_tx_type[INTRA_MODES] = {
+    DCT_DCT,    // DC_PRED
+    ADST_DCT,   // V_PRED
+    DCT_ADST,   // H_PRED
+    DCT_DCT,    // D45_PRED
+    ADST_ADST,  // D135_PRED
+    ADST_DCT,   // D113_PRED
+    DCT_ADST,   // D157_PRED
+    DCT_ADST,   // D203_PRED
+    ADST_DCT,   // D67_PRED
+    ADST_ADST,  // SMOOTH_PRED
+    ADST_DCT,   // SMOOTH_V_PRED
+    DCT_ADST,   // SMOOTH_H_PRED
+    ADST_ADST,  // PAETH_PRED
+  };
+  const PREDICTION_MODE mode =
+      (plane_type == PLANE_TYPE_Y) ? mbmi->mode : get_uv_mode(mbmi->uv_mode);
+  assert(mode < INTRA_MODES);
+  return _intra_mode_to_tx_type[mode];
+}
+
+static INLINE int is_rect_tx(TX_SIZE tx_size) { return tx_size >= TX_SIZES; }
+
+static INLINE int block_signals_txsize(BLOCK_SIZE bsize) {
+  return bsize > BLOCK_4X4;
+}
+
+// Number of transform types in each set type
+static const int av1_num_ext_tx_set[EXT_TX_SET_TYPES] = {
+  1, 2, 5, 7, 12, 16,
+};
+
+static const int av1_ext_tx_used[EXT_TX_SET_TYPES][TX_TYPES] = {
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+  { 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
+  { 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0 },
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+};
+
+static const uint16_t av1_reduced_intra_tx_used_flag[INTRA_MODES] = {
+  0x080F,  // DC_PRED:       0000 1000 0000 1111
+  0x040F,  // V_PRED:        0000 0100 0000 1111
+  0x080F,  // H_PRED:        0000 1000 0000 1111
+  0x020F,  // D45_PRED:      0000 0010 0000 1111
+  0x080F,  // D135_PRED:     0000 1000 0000 1111
+  0x040F,  // D113_PRED:     0000 0100 0000 1111
+  0x080F,  // D157_PRED:     0000 1000 0000 1111
+  0x080F,  // D203_PRED:     0000 1000 0000 1111
+  0x040F,  // D67_PRED:      0000 0100 0000 1111
+  0x080F,  // SMOOTH_PRED:   0000 1000 0000 1111
+  0x040F,  // SMOOTH_V_PRED: 0000 0100 0000 1111
+  0x080F,  // SMOOTH_H_PRED: 0000 1000 0000 1111
+  0x0C0E,  // PAETH_PRED:    0000 1100 0000 1110
+};
+
+static const uint16_t av1_ext_tx_used_flag[EXT_TX_SET_TYPES] = {
+  0x0001,  // 0000 0000 0000 0001
+  0x0201,  // 0000 0010 0000 0001
+  0x020F,  // 0000 0010 0000 1111
+  0x0E0F,  // 0000 1110 0000 1111
+  0x0FFF,  // 0000 1111 1111 1111
+  0xFFFF,  // 1111 1111 1111 1111
+};
+
+static const TxSetType av1_ext_tx_set_lookup[2][2] = {
+  { EXT_TX_SET_DTT4_IDTX_1DDCT, EXT_TX_SET_DTT4_IDTX },
+  { EXT_TX_SET_ALL16, EXT_TX_SET_DTT9_IDTX_1DDCT },
+};
+
+static INLINE TxSetType av1_get_ext_tx_set_type(TX_SIZE tx_size, int is_inter,
+                                                int use_reduced_set) {
+  const TX_SIZE tx_size_sqr_up = txsize_sqr_up_map[tx_size];
+  if (tx_size_sqr_up > TX_32X32) return EXT_TX_SET_DCTONLY;
+  if (tx_size_sqr_up == TX_32X32)
+    return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DCTONLY;
+  if (use_reduced_set)
+    return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DTT4_IDTX;
+  const TX_SIZE tx_size_sqr = txsize_sqr_map[tx_size];
+  return av1_ext_tx_set_lookup[is_inter][tx_size_sqr == TX_16X16];
+}
+
+// Maps tx set types to the indices.
+static const int ext_tx_set_index[2][EXT_TX_SET_TYPES] = {
+  { // Intra
+    0, -1, 2, 1, -1, -1 },
+  { // Inter
+    0, 3, -1, -1, 2, 1 },
+};
+
+static INLINE int get_ext_tx_set(TX_SIZE tx_size, int is_inter,
+                                 int use_reduced_set) {
+  const TxSetType set_type =
+      av1_get_ext_tx_set_type(tx_size, is_inter, use_reduced_set);
+  return ext_tx_set_index[is_inter][set_type];
+}
+
+static INLINE int get_ext_tx_types(TX_SIZE tx_size, int is_inter,
+                                   int use_reduced_set) {
+  const int set_type =
+      av1_get_ext_tx_set_type(tx_size, is_inter, use_reduced_set);
+  return av1_num_ext_tx_set[set_type];
+}
+
+#define TXSIZEMAX(t1, t2) (tx_size_2d[(t1)] >= tx_size_2d[(t2)] ? (t1) : (t2))
+#define TXSIZEMIN(t1, t2) (tx_size_2d[(t1)] <= tx_size_2d[(t2)] ? (t1) : (t2))
+
+static INLINE TX_SIZE tx_size_from_tx_mode(BLOCK_SIZE bsize, TX_MODE tx_mode) {
+  const TX_SIZE largest_tx_size = tx_mode_to_biggest_tx_size[tx_mode];
+  const TX_SIZE max_rect_tx_size = max_txsize_rect_lookup[bsize];
+  if (bsize == BLOCK_4X4)
+    return AOMMIN(max_txsize_lookup[bsize], largest_tx_size);
+  if (txsize_sqr_map[max_rect_tx_size] <= largest_tx_size)
+    return max_rect_tx_size;
+  else
+    return largest_tx_size;
+}
+
+static const uint8_t mode_to_angle_map[] = {
+  0, 90, 180, 45, 135, 113, 157, 203, 67, 0, 0, 0, 0,
+};
+
+// Converts block_index for given transform size to index of the block in raster
+// order.
+static INLINE int av1_block_index_to_raster_order(TX_SIZE tx_size,
+                                                  int block_idx) {
+  // For transform size 4x8, the possible block_idx values are 0 & 2, because
+  // block_idx values are incremented in steps of size 'tx_width_unit x
+  // tx_height_unit'. But, for this transform size, block_idx = 2 corresponds to
+  // block number 1 in raster order, inside an 8x8 MI block.
+  // For any other transform size, the two indices are equivalent.
+  return (tx_size == TX_4X8 && block_idx == 2) ? 1 : block_idx;
+}
+
+// Inverse of above function.
+// Note: only implemented for transform sizes 4x4, 4x8 and 8x4 right now.
+static INLINE int av1_raster_order_to_block_index(TX_SIZE tx_size,
+                                                  int raster_order) {
+  assert(tx_size == TX_4X4 || tx_size == TX_4X8 || tx_size == TX_8X4);
+  // We ensure that block indices are 0 & 2 if tx size is 4x8 or 8x4.
+  return (tx_size == TX_4X4) ? raster_order : (raster_order > 0) ? 2 : 0;
+}
+
+static INLINE TX_TYPE get_default_tx_type(PLANE_TYPE plane_type,
+                                          const MACROBLOCKD *xd,
+                                          TX_SIZE tx_size,
+                                          int use_screen_content_tools) {
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+
+  if (is_inter_block(mbmi) || plane_type != PLANE_TYPE_Y ||
+      xd->lossless[mbmi->segment_id] || tx_size >= TX_32X32 ||
+      use_screen_content_tools)
+    return DCT_DCT;
+
+  return intra_mode_to_tx_type(mbmi, plane_type);
+}
+
+// Implements the get_plane_residual_size() function in the spec (Section
+// 5.11.38. Get plane residual size function).
+static INLINE BLOCK_SIZE get_plane_block_size(BLOCK_SIZE bsize,
+                                              int subsampling_x,
+                                              int subsampling_y) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  assert(subsampling_x >= 0 && subsampling_x < 2);
+  assert(subsampling_y >= 0 && subsampling_y < 2);
+  return ss_size_lookup[bsize][subsampling_x][subsampling_y];
+}
+
+/*
+ * Logic to generate the lookup tables:
+ *
+ * TX_SIZE txs = max_txsize_rect_lookup[bsize];
+ * for (int level = 0; level < MAX_VARTX_DEPTH - 1; ++level)
+ *   txs = sub_tx_size_map[txs];
+ * const int tx_w_log2 = tx_size_wide_log2[txs] - MI_SIZE_LOG2;
+ * const int tx_h_log2 = tx_size_high_log2[txs] - MI_SIZE_LOG2;
+ * const int bw_uint_log2 = mi_size_wide_log2[bsize];
+ * const int stride_log2 = bw_uint_log2 - tx_w_log2;
+ */
+static INLINE int av1_get_txb_size_index(BLOCK_SIZE bsize, int blk_row,
+                                         int blk_col) {
+  static const uint8_t tw_w_log2_table[BLOCK_SIZES_ALL] = {
+    0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 0, 1, 1, 2, 2, 3,
+  };
+  static const uint8_t tw_h_log2_table[BLOCK_SIZES_ALL] = {
+    0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 1, 0, 2, 1, 3, 2,
+  };
+  static const uint8_t stride_log2_table[BLOCK_SIZES_ALL] = {
+    0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 2, 2, 0, 1, 0, 1, 0, 1,
+  };
+  const int index =
+      ((blk_row >> tw_h_log2_table[bsize]) << stride_log2_table[bsize]) +
+      (blk_col >> tw_w_log2_table[bsize]);
+  assert(index < INTER_TX_SIZE_BUF_LEN);
+  return index;
+}
+
+#if CONFIG_INSPECTION
+/*
+ * Here is the logic to generate the lookup tables:
+ *
+ * TX_SIZE txs = max_txsize_rect_lookup[bsize];
+ * for (int level = 0; level < MAX_VARTX_DEPTH; ++level)
+ *   txs = sub_tx_size_map[txs];
+ * const int tx_w_log2 = tx_size_wide_log2[txs] - MI_SIZE_LOG2;
+ * const int tx_h_log2 = tx_size_high_log2[txs] - MI_SIZE_LOG2;
+ * const int bw_uint_log2 = mi_size_wide_log2[bsize];
+ * const int stride_log2 = bw_uint_log2 - tx_w_log2;
+ */
+static INLINE int av1_get_txk_type_index(BLOCK_SIZE bsize, int blk_row,
+                                         int blk_col) {
+  static const uint8_t tw_w_log2_table[BLOCK_SIZES_ALL] = {
+    0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 0, 0, 1, 1, 2, 2,
+  };
+  static const uint8_t tw_h_log2_table[BLOCK_SIZES_ALL] = {
+    0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 0, 0, 1, 1, 2, 2,
+  };
+  static const uint8_t stride_log2_table[BLOCK_SIZES_ALL] = {
+    0, 0, 1, 1, 1, 2, 2, 1, 2, 2, 1, 2, 2, 2, 3, 3, 0, 2, 0, 2, 0, 2,
+  };
+  const int index =
+      ((blk_row >> tw_h_log2_table[bsize]) << stride_log2_table[bsize]) +
+      (blk_col >> tw_w_log2_table[bsize]);
+  assert(index < TXK_TYPE_BUF_LEN);
+  return index;
+}
+#endif  // CONFIG_INSPECTION
+
+static INLINE void update_txk_array(MACROBLOCKD *const xd, int blk_row,
+                                    int blk_col, TX_SIZE tx_size,
+                                    TX_TYPE tx_type) {
+  const int stride = xd->tx_type_map_stride;
+  xd->tx_type_map[blk_row * stride + blk_col] = tx_type;
+
+  const int txw = tx_size_wide_unit[tx_size];
+  const int txh = tx_size_high_unit[tx_size];
+  // The 16x16 unit is due to the constraint from tx_64x64 which sets the
+  // maximum tx size for chroma as 32x32. Coupled with 4x1 transform block
+  // size, the constraint takes effect in 32x16 / 16x32 size too. To solve
+  // the intricacy, cover all the 16x16 units inside a 64 level transform.
+  if (txw == tx_size_wide_unit[TX_64X64] ||
+      txh == tx_size_high_unit[TX_64X64]) {
+    const int tx_unit = tx_size_wide_unit[TX_16X16];
+    for (int idy = 0; idy < txh; idy += tx_unit) {
+      for (int idx = 0; idx < txw; idx += tx_unit) {
+        xd->tx_type_map[(blk_row + idy) * stride + blk_col + idx] = tx_type;
+      }
+    }
+  }
+}
+
+static INLINE TX_TYPE av1_get_tx_type(const MACROBLOCKD *xd,
+                                      PLANE_TYPE plane_type, int blk_row,
+                                      int blk_col, TX_SIZE tx_size,
+                                      int reduced_tx_set) {
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  if (xd->lossless[mbmi->segment_id] || txsize_sqr_up_map[tx_size] > TX_32X32) {
+    return DCT_DCT;
+  }
+
+  TX_TYPE tx_type;
+  if (plane_type == PLANE_TYPE_Y) {
+    tx_type = xd->tx_type_map[blk_row * xd->tx_type_map_stride + blk_col];
+  } else {
+    if (is_inter_block(mbmi)) {
+      // scale back to y plane's coordinate
+      const struct macroblockd_plane *const pd = &xd->plane[plane_type];
+      blk_row <<= pd->subsampling_y;
+      blk_col <<= pd->subsampling_x;
+      tx_type = xd->tx_type_map[blk_row * xd->tx_type_map_stride + blk_col];
+    } else {
+      // In intra mode, uv planes don't share the same prediction mode as y
+      // plane, so the tx_type should not be shared
+      tx_type = intra_mode_to_tx_type(mbmi, PLANE_TYPE_UV);
+    }
+    const TxSetType tx_set_type =
+        av1_get_ext_tx_set_type(tx_size, is_inter_block(mbmi), reduced_tx_set);
+    if (!av1_ext_tx_used[tx_set_type][tx_type]) tx_type = DCT_DCT;
+  }
+  assert(tx_type < TX_TYPES);
+  assert(av1_ext_tx_used[av1_get_ext_tx_set_type(tx_size, is_inter_block(mbmi),
+                                                 reduced_tx_set)][tx_type]);
+  return tx_type;
+}
+
+void av1_setup_block_planes(MACROBLOCKD *xd, int ss_x, int ss_y,
+                            const int num_planes);
+
+/*
+ * Logic to generate the lookup table:
+ *
+ * TX_SIZE tx_size = max_txsize_rect_lookup[bsize];
+ * int depth = 0;
+ * while (depth < MAX_TX_DEPTH && tx_size != TX_4X4) {
+ *   depth++;
+ *   tx_size = sub_tx_size_map[tx_size];
+ * }
+ */
+static INLINE int bsize_to_max_depth(BLOCK_SIZE bsize) {
+  static const uint8_t bsize_to_max_depth_table[BLOCK_SIZES_ALL] = {
+    0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  };
+  return bsize_to_max_depth_table[bsize];
+}
+
+/*
+ * Logic to generate the lookup table:
+ *
+ * TX_SIZE tx_size = max_txsize_rect_lookup[bsize];
+ * assert(tx_size != TX_4X4);
+ * int depth = 0;
+ * while (tx_size != TX_4X4) {
+ *   depth++;
+ *   tx_size = sub_tx_size_map[tx_size];
+ * }
+ * assert(depth < 10);
+ */
+static INLINE int bsize_to_tx_size_cat(BLOCK_SIZE bsize) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  static const uint8_t bsize_to_tx_size_depth_table[BLOCK_SIZES_ALL] = {
+    0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 2, 2, 3, 3, 4, 4,
+  };
+  const int depth = bsize_to_tx_size_depth_table[bsize];
+  assert(depth <= MAX_TX_CATS);
+  return depth - 1;
+}
+
+static INLINE TX_SIZE depth_to_tx_size(int depth, BLOCK_SIZE bsize) {
+  TX_SIZE max_tx_size = max_txsize_rect_lookup[bsize];
+  TX_SIZE tx_size = max_tx_size;
+  for (int d = 0; d < depth; ++d) tx_size = sub_tx_size_map[tx_size];
+  return tx_size;
+}
+
+static INLINE TX_SIZE av1_get_adjusted_tx_size(TX_SIZE tx_size) {
+  switch (tx_size) {
+    case TX_64X64:
+    case TX_64X32:
+    case TX_32X64: return TX_32X32;
+    case TX_64X16: return TX_32X16;
+    case TX_16X64: return TX_16X32;
+    default: return tx_size;
+  }
+}
+
+static INLINE TX_SIZE av1_get_max_uv_txsize(BLOCK_SIZE bsize, int subsampling_x,
+                                            int subsampling_y) {
+  const BLOCK_SIZE plane_bsize =
+      get_plane_block_size(bsize, subsampling_x, subsampling_y);
+  assert(plane_bsize < BLOCK_SIZES_ALL);
+  const TX_SIZE uv_tx = max_txsize_rect_lookup[plane_bsize];
+  return av1_get_adjusted_tx_size(uv_tx);
+}
+
+static INLINE TX_SIZE av1_get_tx_size(int plane, const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *mbmi = xd->mi[0];
+  if (xd->lossless[mbmi->segment_id]) return TX_4X4;
+  if (plane == 0) return mbmi->tx_size;
+  const MACROBLOCKD_PLANE *pd = &xd->plane[plane];
+  return av1_get_max_uv_txsize(mbmi->bsize, pd->subsampling_x,
+                               pd->subsampling_y);
+}
+
+void av1_reset_entropy_context(MACROBLOCKD *xd, BLOCK_SIZE bsize,
+                               const int num_planes);
+
+void av1_reset_loop_filter_delta(MACROBLOCKD *xd, int num_planes);
+
+void av1_reset_loop_restoration(MACROBLOCKD *xd, const int num_planes);
+
+typedef void (*foreach_transformed_block_visitor)(int plane, int block,
+                                                  int blk_row, int blk_col,
+                                                  BLOCK_SIZE plane_bsize,
+                                                  TX_SIZE tx_size, void *arg);
+
+void av1_set_entropy_contexts(const MACROBLOCKD *xd,
+                              struct macroblockd_plane *pd, int plane,
+                              BLOCK_SIZE plane_bsize, TX_SIZE tx_size,
+                              int has_eob, int aoff, int loff);
+
+#define MAX_INTERINTRA_SB_SQUARE 32 * 32
+static INLINE int is_interintra_mode(const MB_MODE_INFO *mbmi) {
+  return (mbmi->ref_frame[0] > INTRA_FRAME &&
+          mbmi->ref_frame[1] == INTRA_FRAME);
+}
+
+static INLINE int is_interintra_allowed_bsize(const BLOCK_SIZE bsize) {
+  return (bsize >= BLOCK_8X8) && (bsize <= BLOCK_32X32);
+}
+
+static INLINE int is_interintra_allowed_mode(const PREDICTION_MODE mode) {
+  return (mode >= SINGLE_INTER_MODE_START) && (mode < SINGLE_INTER_MODE_END);
+}
+
+static INLINE int is_interintra_allowed_ref(const MV_REFERENCE_FRAME rf[2]) {
+  return (rf[0] > INTRA_FRAME) && (rf[1] <= INTRA_FRAME);
+}
+
+static INLINE int is_interintra_allowed(const MB_MODE_INFO *mbmi) {
+  return is_interintra_allowed_bsize(mbmi->bsize) &&
+         is_interintra_allowed_mode(mbmi->mode) &&
+         is_interintra_allowed_ref(mbmi->ref_frame);
+}
+
+static INLINE int is_interintra_allowed_bsize_group(int group) {
+  int i;
+  for (i = 0; i < BLOCK_SIZES_ALL; i++) {
+    if (size_group_lookup[i] == group &&
+        is_interintra_allowed_bsize((BLOCK_SIZE)i)) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+static INLINE int is_interintra_pred(const MB_MODE_INFO *mbmi) {
+  return mbmi->ref_frame[0] > INTRA_FRAME &&
+         mbmi->ref_frame[1] == INTRA_FRAME && is_interintra_allowed(mbmi);
+}
+
+static INLINE int get_vartx_max_txsize(const MACROBLOCKD *xd, BLOCK_SIZE bsize,
+                                       int plane) {
+  if (xd->lossless[xd->mi[0]->segment_id]) return TX_4X4;
+  const TX_SIZE max_txsize = max_txsize_rect_lookup[bsize];
+  if (plane == 0) return max_txsize;            // luma
+  return av1_get_adjusted_tx_size(max_txsize);  // chroma
+}
+
+static INLINE int is_motion_variation_allowed_bsize(BLOCK_SIZE bsize) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  return AOMMIN(block_size_wide[bsize], block_size_high[bsize]) >= 8;
+}
+
+static INLINE int is_motion_variation_allowed_compound(
+    const MB_MODE_INFO *mbmi) {
+  return !has_second_ref(mbmi);
+}
+
+// input: log2 of length, 0(4), 1(8), ...
+static const int max_neighbor_obmc[6] = { 0, 1, 2, 3, 4, 4 };
+
+static INLINE int check_num_overlappable_neighbors(const MB_MODE_INFO *mbmi) {
+  return mbmi->overlappable_neighbors != 0;
+}
+
+static INLINE MOTION_MODE
+motion_mode_allowed(const WarpedMotionParams *gm_params, const MACROBLOCKD *xd,
+                    const MB_MODE_INFO *mbmi, int allow_warped_motion) {
+  if (!check_num_overlappable_neighbors(mbmi)) return SIMPLE_TRANSLATION;
+  if (xd->cur_frame_force_integer_mv == 0) {
+    const TransformationType gm_type = gm_params[mbmi->ref_frame[0]].wmtype;
+    if (is_global_mv_block(mbmi, gm_type)) return SIMPLE_TRANSLATION;
+  }
+  if (is_motion_variation_allowed_bsize(mbmi->bsize) &&
+      is_inter_mode(mbmi->mode) && mbmi->ref_frame[1] != INTRA_FRAME &&
+      is_motion_variation_allowed_compound(mbmi)) {
+    assert(!has_second_ref(mbmi));
+    if (mbmi->num_proj_ref >= 1 && allow_warped_motion &&
+        !xd->cur_frame_force_integer_mv &&
+        !av1_is_scaled(xd->block_ref_scale_factors[0])) {
+      return WARPED_CAUSAL;
+    }
+    return OBMC_CAUSAL;
+  }
+  return SIMPLE_TRANSLATION;
+}
+
+static INLINE int is_neighbor_overlappable(const MB_MODE_INFO *mbmi) {
+  return (is_inter_block(mbmi));
+}
+
+static INLINE int av1_allow_palette(int allow_screen_content_tools,
+                                    BLOCK_SIZE sb_type) {
+  assert(sb_type < BLOCK_SIZES_ALL);
+  return allow_screen_content_tools && block_size_wide[sb_type] <= 64 &&
+         block_size_high[sb_type] <= 64 && sb_type >= BLOCK_8X8;
+}
+
+// Returns sub-sampled dimensions of the given block.
+// The output values for 'rows_within_bounds' and 'cols_within_bounds' will
+// differ from 'height' and 'width' when part of the block is outside the
+// right
+// and/or bottom image boundary.
+static INLINE void av1_get_block_dimensions(BLOCK_SIZE bsize, int plane,
+                                            const MACROBLOCKD *xd, int *width,
+                                            int *height,
+                                            int *rows_within_bounds,
+                                            int *cols_within_bounds) {
+  const int block_height = block_size_high[bsize];
+  const int block_width = block_size_wide[bsize];
+  const int block_rows = (xd->mb_to_bottom_edge >= 0)
+                             ? block_height
+                             : (xd->mb_to_bottom_edge >> 3) + block_height;
+  const int block_cols = (xd->mb_to_right_edge >= 0)
+                             ? block_width
+                             : (xd->mb_to_right_edge >> 3) + block_width;
+  const struct macroblockd_plane *const pd = &xd->plane[plane];
+  assert(IMPLIES(plane == PLANE_TYPE_Y, pd->subsampling_x == 0));
+  assert(IMPLIES(plane == PLANE_TYPE_Y, pd->subsampling_y == 0));
+  assert(block_width >= block_cols);
+  assert(block_height >= block_rows);
+  const int plane_block_width = block_width >> pd->subsampling_x;
+  const int plane_block_height = block_height >> pd->subsampling_y;
+  // Special handling for chroma sub8x8.
+  const int is_chroma_sub8_x = plane > 0 && plane_block_width < 4;
+  const int is_chroma_sub8_y = plane > 0 && plane_block_height < 4;
+  if (width) {
+    *width = plane_block_width + 2 * is_chroma_sub8_x;
+    assert(*width >= 0);
+  }
+  if (height) {
+    *height = plane_block_height + 2 * is_chroma_sub8_y;
+    assert(*height >= 0);
+  }
+  if (rows_within_bounds) {
+    *rows_within_bounds =
+        (block_rows >> pd->subsampling_y) + 2 * is_chroma_sub8_y;
+    assert(*rows_within_bounds >= 0);
+  }
+  if (cols_within_bounds) {
+    *cols_within_bounds =
+        (block_cols >> pd->subsampling_x) + 2 * is_chroma_sub8_x;
+    assert(*cols_within_bounds >= 0);
+  }
+}
+
+/* clang-format off */
+typedef aom_cdf_prob (*MapCdf)[PALETTE_COLOR_INDEX_CONTEXTS]
+                              [CDF_SIZE(PALETTE_COLORS)];
+typedef const int (*ColorCost)[PALETTE_SIZES][PALETTE_COLOR_INDEX_CONTEXTS]
+                              [PALETTE_COLORS];
+/* clang-format on */
+
+typedef struct {
+  int rows;
+  int cols;
+  int n_colors;
+  int plane_width;
+  int plane_height;
+  uint8_t *color_map;
+  MapCdf map_cdf;
+  ColorCost color_cost;
+} Av1ColorMapParam;
+
+static INLINE int is_nontrans_global_motion(const MACROBLOCKD *xd,
+                                            const MB_MODE_INFO *mbmi) {
+  int ref;
+
+  // First check if all modes are GLOBALMV
+  if (mbmi->mode != GLOBALMV && mbmi->mode != GLOBAL_GLOBALMV) return 0;
+
+  if (AOMMIN(mi_size_wide[mbmi->bsize], mi_size_high[mbmi->bsize]) < 2)
+    return 0;
+
+  // Now check if all global motion is non translational
+  for (ref = 0; ref < 1 + has_second_ref(mbmi); ++ref) {
+    if (xd->global_motion[mbmi->ref_frame[ref]].wmtype == TRANSLATION) return 0;
+  }
+  return 1;
+}
+
+static INLINE PLANE_TYPE get_plane_type(int plane) {
+  return (plane == 0) ? PLANE_TYPE_Y : PLANE_TYPE_UV;
+}
+
+static INLINE int av1_get_max_eob(TX_SIZE tx_size) {
+  if (tx_size == TX_64X64 || tx_size == TX_64X32 || tx_size == TX_32X64) {
+    return 1024;
+  }
+  if (tx_size == TX_16X64 || tx_size == TX_64X16) {
+    return 512;
+  }
+  return tx_size_2d[tx_size];
+}
+
+/*!\endcond */
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_BLOCKD_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.c
new file mode 100644
index 0000000000..ea5e81bbd1
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.c
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include <math.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cdef_block.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+
+static int is_8x8_block_skip(MB_MODE_INFO **grid, int mi_row, int mi_col,
+                             int mi_stride) {
+  MB_MODE_INFO **mbmi = grid + mi_row * mi_stride + mi_col;
+  for (int r = 0; r < mi_size_high[BLOCK_8X8]; ++r, mbmi += mi_stride) {
+    for (int c = 0; c < mi_size_wide[BLOCK_8X8]; ++c) {
+      if (!mbmi[c]->skip_txfm) return 0;
+    }
+  }
+
+  return 1;
+}
+
+int av1_cdef_compute_sb_list(const CommonModeInfoParams *const mi_params,
+                             int mi_row, int mi_col, cdef_list *dlist,
+                             BLOCK_SIZE bs) {
+  MB_MODE_INFO **grid = mi_params->mi_grid_base;
+  int maxc = mi_params->mi_cols - mi_col;
+  int maxr = mi_params->mi_rows - mi_row;
+
+  if (bs == BLOCK_128X128 || bs == BLOCK_128X64)
+    maxc = AOMMIN(maxc, MI_SIZE_128X128);
+  else
+    maxc = AOMMIN(maxc, MI_SIZE_64X64);
+  if (bs == BLOCK_128X128 || bs == BLOCK_64X128)
+    maxr = AOMMIN(maxr, MI_SIZE_128X128);
+  else
+    maxr = AOMMIN(maxr, MI_SIZE_64X64);
+
+  const int r_step = 2;  // mi_size_high[BLOCK_8X8]
+  const int c_step = 2;  // mi_size_wide[BLOCK_8X8]
+  const int r_shift = 1;
+  const int c_shift = 1;
+  int count = 0;
+  for (int r = 0; r < maxr; r += r_step) {
+    for (int c = 0; c < maxc; c += c_step) {
+      if (!is_8x8_block_skip(grid, mi_row + r, mi_col + c,
+                             mi_params->mi_stride)) {
+        dlist[count].by = r >> r_shift;
+        dlist[count].bx = c >> c_shift;
+        count++;
+      }
+    }
+  }
+  return count;
+}
+
+void cdef_copy_rect8_8bit_to_16bit_c(uint16_t *dst, int dstride,
+                                     const uint8_t *src, int sstride, int v,
+                                     int h) {
+  for (int i = 0; i < v; i++) {
+    for (int j = 0; j < h; j++) {
+      dst[i * dstride + j] = src[i * sstride + j];
+    }
+  }
+}
+
+void cdef_copy_rect8_16bit_to_16bit_c(uint16_t *dst, int dstride,
+                                      const uint16_t *src, int sstride, int v,
+                                      int h) {
+  for (int i = 0; i < v; i++) {
+    for (int j = 0; j < h; j++) {
+      dst[i * dstride + j] = src[i * sstride + j];
+    }
+  }
+}
+
+static void copy_sb8_16(AV1_COMMON *cm, uint16_t *dst, int dstride,
+                        const uint8_t *src, int src_voffset, int src_hoffset,
+                        int sstride, int vsize, int hsize) {
+  if (cm->seq_params.use_highbitdepth) {
+    const uint16_t *base =
+        &CONVERT_TO_SHORTPTR(src)[src_voffset * sstride + src_hoffset];
+    cdef_copy_rect8_16bit_to_16bit(dst, dstride, base, sstride, vsize, hsize);
+  } else {
+    const uint8_t *base = &src[src_voffset * sstride + src_hoffset];
+    cdef_copy_rect8_8bit_to_16bit(dst, dstride, base, sstride, vsize, hsize);
+  }
+}
+
+static INLINE void fill_rect(uint16_t *dst, int dstride, int v, int h,
+                             uint16_t x) {
+  for (int i = 0; i < v; i++) {
+    for (int j = 0; j < h; j++) {
+      dst[i * dstride + j] = x;
+    }
+  }
+}
+
+static INLINE void copy_rect(uint16_t *dst, int dstride, const uint16_t *src,
+                             int sstride, int v, int h) {
+  for (int i = 0; i < v; i++) {
+    for (int j = 0; j < h; j++) {
+      dst[i * dstride + j] = src[i * sstride + j];
+    }
+  }
+}
+
+void av1_cdef_frame(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
+                    MACROBLOCKD *xd) {
+  const CdefInfo *const cdef_info = &cm->cdef_info;
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+  const int num_planes = av1_num_planes(cm);
+  DECLARE_ALIGNED(16, uint16_t, src[CDEF_INBUF_SIZE]);
+  uint16_t *linebuf[3];
+  uint16_t *colbuf[3];
+  cdef_list dlist[MI_SIZE_64X64 * MI_SIZE_64X64];
+  unsigned char *row_cdef, *prev_row_cdef, *curr_row_cdef;
+  int cdef_count;
+  int dir[CDEF_NBLOCKS][CDEF_NBLOCKS] = { { 0 } };
+  int var[CDEF_NBLOCKS][CDEF_NBLOCKS] = { { 0 } };
+  int mi_wide_l2[3];
+  int mi_high_l2[3];
+  int xdec[3];
+  int ydec[3];
+  int coeff_shift = AOMMAX(cm->seq_params.bit_depth - 8, 0);
+  const int nvfb = (mi_params->mi_rows + MI_SIZE_64X64 - 1) / MI_SIZE_64X64;
+  const int nhfb = (mi_params->mi_cols + MI_SIZE_64X64 - 1) / MI_SIZE_64X64;
+  av1_setup_dst_planes(xd->plane, cm->seq_params.sb_size, frame, 0, 0, 0,
+                       num_planes);
+  row_cdef = aom_malloc(sizeof(*row_cdef) * (nhfb + 2) * 2);
+  memset(row_cdef, 1, sizeof(*row_cdef) * (nhfb + 2) * 2);
+  prev_row_cdef = row_cdef + 1;
+  curr_row_cdef = prev_row_cdef + nhfb + 2;
+  for (int pli = 0; pli < num_planes; pli++) {
+    xdec[pli] = xd->plane[pli].subsampling_x;
+    ydec[pli] = xd->plane[pli].subsampling_y;
+    mi_wide_l2[pli] = MI_SIZE_LOG2 - xd->plane[pli].subsampling_x;
+    mi_high_l2[pli] = MI_SIZE_LOG2 - xd->plane[pli].subsampling_y;
+  }
+  const int stride = (mi_params->mi_cols << MI_SIZE_LOG2) + 2 * CDEF_HBORDER;
+  for (int pli = 0; pli < num_planes; pli++) {
+    linebuf[pli] = aom_malloc(sizeof(*linebuf) * CDEF_VBORDER * stride);
+    colbuf[pli] =
+        aom_malloc(sizeof(*colbuf) *
+                   ((CDEF_BLOCKSIZE << mi_high_l2[pli]) + 2 * CDEF_VBORDER) *
+                   CDEF_HBORDER);
+  }
+  for (int fbr = 0; fbr < nvfb; fbr++) {
+    for (int pli = 0; pli < num_planes; pli++) {
+      const int block_height =
+          (MI_SIZE_64X64 << mi_high_l2[pli]) + 2 * CDEF_VBORDER;
+      fill_rect(colbuf[pli], CDEF_HBORDER, block_height, CDEF_HBORDER,
+                CDEF_VERY_LARGE);
+    }
+    int cdef_left = 1;
+    for (int fbc = 0; fbc < nhfb; fbc++) {
+      int level, sec_strength;
+      int uv_level, uv_sec_strength;
+      int nhb, nvb;
+      int cstart = 0;
+      curr_row_cdef[fbc] = 0;
+      if (mi_params->mi_grid_base[MI_SIZE_64X64 * fbr * mi_params->mi_stride +
+                                  MI_SIZE_64X64 * fbc] == NULL ||
+          mi_params
+                  ->mi_grid_base[MI_SIZE_64X64 * fbr * mi_params->mi_stride +
+                                 MI_SIZE_64X64 * fbc]
+                  ->cdef_strength == -1) {
+        cdef_left = 0;
+        continue;
+      }
+      if (!cdef_left) cstart = -CDEF_HBORDER;
+      nhb = AOMMIN(MI_SIZE_64X64, mi_params->mi_cols - MI_SIZE_64X64 * fbc);
+      nvb = AOMMIN(MI_SIZE_64X64, mi_params->mi_rows - MI_SIZE_64X64 * fbr);
+      int frame_top, frame_left, frame_bottom, frame_right;
+
+      int mi_row = MI_SIZE_64X64 * fbr;
+      int mi_col = MI_SIZE_64X64 * fbc;
+      // for the current filter block, it's top left corner mi structure (mi_tl)
+      // is first accessed to check whether the top and left boundaries are
+      // frame boundaries. Then bottom-left and top-right mi structures are
+      // accessed to check whether the bottom and right boundaries
+      // (respectively) are frame boundaries.
+      //
+      // Note that we can't just check the bottom-right mi structure - eg. if
+      // we're at the right-hand edge of the frame but not the bottom, then
+      // the bottom-right mi is NULL but the bottom-left is not.
+      frame_top = (mi_row == 0) ? 1 : 0;
+      frame_left = (mi_col == 0) ? 1 : 0;
+
+      if (fbr != nvfb - 1)
+        frame_bottom = (mi_row + MI_SIZE_64X64 == mi_params->mi_rows) ? 1 : 0;
+      else
+        frame_bottom = 1;
+
+      if (fbc != nhfb - 1)
+        frame_right = (mi_col + MI_SIZE_64X64 == mi_params->mi_cols) ? 1 : 0;
+      else
+        frame_right = 1;
+
+      const int mbmi_cdef_strength =
+          mi_params
+              ->mi_grid_base[MI_SIZE_64X64 * fbr * mi_params->mi_stride +
+                             MI_SIZE_64X64 * fbc]
+              ->cdef_strength;
+      level =
+          cdef_info->cdef_strengths[mbmi_cdef_strength] / CDEF_SEC_STRENGTHS;
+      sec_strength =
+          cdef_info->cdef_strengths[mbmi_cdef_strength] % CDEF_SEC_STRENGTHS;
+      sec_strength += sec_strength == 3;
+      uv_level =
+          cdef_info->cdef_uv_strengths[mbmi_cdef_strength] / CDEF_SEC_STRENGTHS;
+      uv_sec_strength =
+          cdef_info->cdef_uv_strengths[mbmi_cdef_strength] % CDEF_SEC_STRENGTHS;
+      uv_sec_strength += uv_sec_strength == 3;
+      if ((level == 0 && sec_strength == 0 && uv_level == 0 &&
+           uv_sec_strength == 0) ||
+          (cdef_count = av1_cdef_compute_sb_list(mi_params, fbr * MI_SIZE_64X64,
+                                                 fbc * MI_SIZE_64X64, dlist,
+                                                 BLOCK_64X64)) == 0) {
+        cdef_left = 0;
+        continue;
+      }
+
+      curr_row_cdef[fbc] = 1;
+      for (int pli = 0; pli < num_planes; pli++) {
+        int coffset;
+        int rend, cend;
+        int damping = cdef_info->cdef_damping;
+        int hsize = nhb << mi_wide_l2[pli];
+        int vsize = nvb << mi_high_l2[pli];
+
+        if (pli) {
+          level = uv_level;
+          sec_strength = uv_sec_strength;
+        }
+
+        if (fbc == nhfb - 1)
+          cend = hsize;
+        else
+          cend = hsize + CDEF_HBORDER;
+
+        if (fbr == nvfb - 1)
+          rend = vsize;
+        else
+          rend = vsize + CDEF_VBORDER;
+
+        coffset = fbc * MI_SIZE_64X64 << mi_wide_l2[pli];
+        if (fbc == nhfb - 1) {
+          /* On the last superblock column, fill in the right border with
+             CDEF_VERY_LARGE to avoid filtering with the outside. */
+          fill_rect(&src[cend + CDEF_HBORDER], CDEF_BSTRIDE,
+                    rend + CDEF_VBORDER, hsize + CDEF_HBORDER - cend,
+                    CDEF_VERY_LARGE);
+        }
+        if (fbr == nvfb - 1) {
+          /* On the last superblock row, fill in the bottom border with
+             CDEF_VERY_LARGE to avoid filtering with the outside. */
+          fill_rect(&src[(rend + CDEF_VBORDER) * CDEF_BSTRIDE], CDEF_BSTRIDE,
+                    CDEF_VBORDER, hsize + 2 * CDEF_HBORDER, CDEF_VERY_LARGE);
+        }
+        /* Copy in the pixels we need from the current superblock for
+           deringing.*/
+        copy_sb8_16(cm,
+                    &src[CDEF_VBORDER * CDEF_BSTRIDE + CDEF_HBORDER + cstart],
+                    CDEF_BSTRIDE, xd->plane[pli].dst.buf,
+                    (MI_SIZE_64X64 << mi_high_l2[pli]) * fbr, coffset + cstart,
+                    xd->plane[pli].dst.stride, rend, cend - cstart);
+        if (!prev_row_cdef[fbc]) {
+          copy_sb8_16(cm, &src[CDEF_HBORDER], CDEF_BSTRIDE,
+                      xd->plane[pli].dst.buf,
+                      (MI_SIZE_64X64 << mi_high_l2[pli]) * fbr - CDEF_VBORDER,
+                      coffset, xd->plane[pli].dst.stride, CDEF_VBORDER, hsize);
+        } else if (fbr > 0) {
+          copy_rect(&src[CDEF_HBORDER], CDEF_BSTRIDE, &linebuf[pli][coffset],
+                    stride, CDEF_VBORDER, hsize);
+        } else {
+          fill_rect(&src[CDEF_HBORDER], CDEF_BSTRIDE, CDEF_VBORDER, hsize,
+                    CDEF_VERY_LARGE);
+        }
+        if (!prev_row_cdef[fbc - 1]) {
+          copy_sb8_16(cm, src, CDEF_BSTRIDE, xd->plane[pli].dst.buf,
+                      (MI_SIZE_64X64 << mi_high_l2[pli]) * fbr - CDEF_VBORDER,
+                      coffset - CDEF_HBORDER, xd->plane[pli].dst.stride,
+                      CDEF_VBORDER, CDEF_HBORDER);
+        } else if (fbr > 0 && fbc > 0) {
+          copy_rect(src, CDEF_BSTRIDE, &linebuf[pli][coffset - CDEF_HBORDER],
+                    stride, CDEF_VBORDER, CDEF_HBORDER);
+        } else {
+          fill_rect(src, CDEF_BSTRIDE, CDEF_VBORDER, CDEF_HBORDER,
+                    CDEF_VERY_LARGE);
+        }
+        if (!prev_row_cdef[fbc + 1]) {
+          copy_sb8_16(cm, &src[CDEF_HBORDER + (nhb << mi_wide_l2[pli])],
+                      CDEF_BSTRIDE, xd->plane[pli].dst.buf,
+                      (MI_SIZE_64X64 << mi_high_l2[pli]) * fbr - CDEF_VBORDER,
+                      coffset + hsize, xd->plane[pli].dst.stride, CDEF_VBORDER,
+                      CDEF_HBORDER);
+        } else if (fbr > 0 && fbc < nhfb - 1) {
+          copy_rect(&src[hsize + CDEF_HBORDER], CDEF_BSTRIDE,
+                    &linebuf[pli][coffset + hsize], stride, CDEF_VBORDER,
+                    CDEF_HBORDER);
+        } else {
+          fill_rect(&src[hsize + CDEF_HBORDER], CDEF_BSTRIDE, CDEF_VBORDER,
+                    CDEF_HBORDER, CDEF_VERY_LARGE);
+        }
+        if (cdef_left) {
+          /* If we deringed the superblock on the left then we need to copy in
+             saved pixels. */
+          copy_rect(src, CDEF_BSTRIDE, colbuf[pli], CDEF_HBORDER,
+                    rend + CDEF_VBORDER, CDEF_HBORDER);
+        }
+        /* Saving pixels in case we need to dering the superblock on the
+            right. */
+        copy_rect(colbuf[pli], CDEF_HBORDER, src + hsize, CDEF_BSTRIDE,
+                  rend + CDEF_VBORDER, CDEF_HBORDER);
+        copy_sb8_16(
+            cm, &linebuf[pli][coffset], stride, xd->plane[pli].dst.buf,
+            (MI_SIZE_64X64 << mi_high_l2[pli]) * (fbr + 1) - CDEF_VBORDER,
+            coffset, xd->plane[pli].dst.stride, CDEF_VBORDER, hsize);
+
+        if (frame_top) {
+          fill_rect(src, CDEF_BSTRIDE, CDEF_VBORDER, hsize + 2 * CDEF_HBORDER,
+                    CDEF_VERY_LARGE);
+        }
+        if (frame_left) {
+          fill_rect(src, CDEF_BSTRIDE, vsize + 2 * CDEF_VBORDER, CDEF_HBORDER,
+                    CDEF_VERY_LARGE);
+        }
+        if (frame_bottom) {
+          fill_rect(&src[(vsize + CDEF_VBORDER) * CDEF_BSTRIDE], CDEF_BSTRIDE,
+                    CDEF_VBORDER, hsize + 2 * CDEF_HBORDER, CDEF_VERY_LARGE);
+        }
+        if (frame_right) {
+          fill_rect(&src[hsize + CDEF_HBORDER], CDEF_BSTRIDE,
+                    vsize + 2 * CDEF_VBORDER, CDEF_HBORDER, CDEF_VERY_LARGE);
+        }
+
+        if (cm->seq_params.use_highbitdepth) {
+          av1_cdef_filter_fb(
+              NULL,
+              &CONVERT_TO_SHORTPTR(
+                  xd->plane[pli]
+                      .dst.buf)[xd->plane[pli].dst.stride *
+                                    (MI_SIZE_64X64 * fbr << mi_high_l2[pli]) +
+                                (fbc * MI_SIZE_64X64 << mi_wide_l2[pli])],
+              xd->plane[pli].dst.stride,
+              &src[CDEF_VBORDER * CDEF_BSTRIDE + CDEF_HBORDER], xdec[pli],
+              ydec[pli], dir, NULL, var, pli, dlist, cdef_count, level,
+              sec_strength, damping, coeff_shift);
+        } else {
+          av1_cdef_filter_fb(
+              &xd->plane[pli]
+                   .dst.buf[xd->plane[pli].dst.stride *
+                                (MI_SIZE_64X64 * fbr << mi_high_l2[pli]) +
+                            (fbc * MI_SIZE_64X64 << mi_wide_l2[pli])],
+              NULL, xd->plane[pli].dst.stride,
+              &src[CDEF_VBORDER * CDEF_BSTRIDE + CDEF_HBORDER], xdec[pli],
+              ydec[pli], dir, NULL, var, pli, dlist, cdef_count, level,
+              sec_strength, damping, coeff_shift);
+        }
+      }
+      cdef_left = 1;
+    }
+    {
+      unsigned char *tmp = prev_row_cdef;
+      prev_row_cdef = curr_row_cdef;
+      curr_row_cdef = tmp;
+    }
+  }
+  aom_free(row_cdef);
+  for (int pli = 0; pli < num_planes; pli++) {
+    aom_free(linebuf[pli]);
+    aom_free(colbuf[pli]);
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.h
new file mode 100644
index 0000000000..0405cc2fdd
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#ifndef AOM_AV1_COMMON_CDEF_H_
+#define AOM_AV1_COMMON_CDEF_H_
+
+#define CDEF_STRENGTH_BITS 6
+
+#define CDEF_PRI_STRENGTHS 16
+#define CDEF_SEC_STRENGTHS 4
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cdef_block.h"
+
+static INLINE int sign(int i) { return i < 0 ? -1 : 1; }
+
+static INLINE int constrain(int diff, int threshold, int damping) {
+  if (!threshold) return 0;
+
+  const int shift = AOMMAX(0, damping - get_msb(threshold));
+  return sign(diff) *
+         AOMMIN(abs(diff), AOMMAX(0, threshold - (abs(diff) >> shift)));
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int av1_cdef_compute_sb_list(const CommonModeInfoParams *const mi_params,
+                             int mi_row, int mi_col, cdef_list *dlist,
+                             BLOCK_SIZE bsize);
+
+/*!\brief Function for applying CDEF to a frame
+ *
+ * \ingroup in_loop_cdef
+ * This function applies CDEF to a frame.
+ *
+ * \param[in, out]  frame       Compressed frame buffer
+ * \param[in, out]  cm          Pointer to top level common structure
+ * \param[in]       xd          Pointer to common current coding block structure
+ *
+ * \return Nothing is returned. Instead, the filtered frame is output in
+ * \c frame.
+ */
+void av1_cdef_frame(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm, MACROBLOCKD *xd);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+#endif  // AOM_AV1_COMMON_CDEF_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef_block.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef_block.c
new file mode 100644
index 0000000000..3b95b65e97
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef_block.c
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <math.h>
+#include <stdlib.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.h"
+
+/* Generated from gen_filter_tables.c. */
+DECLARE_ALIGNED(16, const int, cdef_directions[8][2]) = {
+  { -1 * CDEF_BSTRIDE + 1, -2 * CDEF_BSTRIDE + 2 },
+  { 0 * CDEF_BSTRIDE + 1, -1 * CDEF_BSTRIDE + 2 },
+  { 0 * CDEF_BSTRIDE + 1, 0 * CDEF_BSTRIDE + 2 },
+  { 0 * CDEF_BSTRIDE + 1, 1 * CDEF_BSTRIDE + 2 },
+  { 1 * CDEF_BSTRIDE + 1, 2 * CDEF_BSTRIDE + 2 },
+  { 1 * CDEF_BSTRIDE + 0, 2 * CDEF_BSTRIDE + 1 },
+  { 1 * CDEF_BSTRIDE + 0, 2 * CDEF_BSTRIDE + 0 },
+  { 1 * CDEF_BSTRIDE + 0, 2 * CDEF_BSTRIDE - 1 }
+};
+
+/* Detect direction. 0 means 45-degree up-right, 2 is horizontal, and so on.
+   The search minimizes the weighted variance along all the lines in a
+   particular direction, i.e. the squared error between the input and a
+   "predicted" block where each pixel is replaced by the average along a line
+   in a particular direction. Since each direction have the same sum(x^2) term,
+   that term is never computed. See Section 2, step 2, of:
+   http://jmvalin.ca/notes/intra_paint.pdf */
+int cdef_find_dir_c(const uint16_t *img, int stride, int32_t *var,
+                    int coeff_shift) {
+  int i;
+  int32_t cost[8] = { 0 };
+  int partial[8][15] = { { 0 } };
+  int32_t best_cost = 0;
+  int best_dir = 0;
+  /* Instead of dividing by n between 2 and 8, we multiply by 3*5*7*8/n.
+     The output is then 840 times larger, but we don't care for finding
+     the max. */
+  static const int div_table[] = { 0, 840, 420, 280, 210, 168, 140, 120, 105 };
+  for (i = 0; i < 8; i++) {
+    int j;
+    for (j = 0; j < 8; j++) {
+      int x;
+      /* We subtract 128 here to reduce the maximum range of the squared
+         partial sums. */
+      x = (img[i * stride + j] >> coeff_shift) - 128;
+      partial[0][i + j] += x;
+      partial[1][i + j / 2] += x;
+      partial[2][i] += x;
+      partial[3][3 + i - j / 2] += x;
+      partial[4][7 + i - j] += x;
+      partial[5][3 - i / 2 + j] += x;
+      partial[6][j] += x;
+      partial[7][i / 2 + j] += x;
+    }
+  }
+  for (i = 0; i < 8; i++) {
+    cost[2] += partial[2][i] * partial[2][i];
+    cost[6] += partial[6][i] * partial[6][i];
+  }
+  cost[2] *= div_table[8];
+  cost[6] *= div_table[8];
+  for (i = 0; i < 7; i++) {
+    cost[0] += (partial[0][i] * partial[0][i] +
+                partial[0][14 - i] * partial[0][14 - i]) *
+               div_table[i + 1];
+    cost[4] += (partial[4][i] * partial[4][i] +
+                partial[4][14 - i] * partial[4][14 - i]) *
+               div_table[i + 1];
+  }
+  cost[0] += partial[0][7] * partial[0][7] * div_table[8];
+  cost[4] += partial[4][7] * partial[4][7] * div_table[8];
+  for (i = 1; i < 8; i += 2) {
+    int j;
+    for (j = 0; j < 4 + 1; j++) {
+      cost[i] += partial[i][3 + j] * partial[i][3 + j];
+    }
+    cost[i] *= div_table[8];
+    for (j = 0; j < 4 - 1; j++) {
+      cost[i] += (partial[i][j] * partial[i][j] +
+                  partial[i][10 - j] * partial[i][10 - j]) *
+                 div_table[2 * j + 2];
+    }
+  }
+  for (i = 0; i < 8; i++) {
+    if (cost[i] > best_cost) {
+      best_cost = cost[i];
+      best_dir = i;
+    }
+  }
+  /* Difference between the optimal variance and the variance along the
+     orthogonal direction. Again, the sum(x^2) terms cancel out. */
+  *var = best_cost - cost[(best_dir + 4) & 7];
+  /* We'd normally divide by 840, but dividing by 1024 is close enough
+     for what we're going to do with this. */
+  *var >>= 10;
+  return best_dir;
+}
+
+const int cdef_pri_taps[2][2] = { { 4, 2 }, { 3, 3 } };
+const int cdef_sec_taps[2] = { 2, 1 };
+
+/* Smooth in the direction detected. */
+void cdef_filter_block_c(uint8_t *dst8, uint16_t *dst16, int dstride,
+                         const uint16_t *in, int pri_strength, int sec_strength,
+                         int dir, int pri_damping, int sec_damping, int bsize,
+                         int coeff_shift) {
+  int i, j, k;
+  const int s = CDEF_BSTRIDE;
+  const int *pri_taps = cdef_pri_taps[(pri_strength >> coeff_shift) & 1];
+  const int *sec_taps = cdef_sec_taps;
+  for (i = 0; i < 4 << (bsize == BLOCK_8X8 || bsize == BLOCK_4X8); i++) {
+    for (j = 0; j < 4 << (bsize == BLOCK_8X8 || bsize == BLOCK_8X4); j++) {
+      int16_t sum = 0;
+      int16_t y;
+      int16_t x = in[i * s + j];
+      int max = x;
+      int min = x;
+      for (k = 0; k < 2; k++) {
+        int16_t p0 = in[i * s + j + cdef_directions[dir][k]];
+        int16_t p1 = in[i * s + j - cdef_directions[dir][k]];
+        sum += pri_taps[k] * constrain(p0 - x, pri_strength, pri_damping);
+        sum += pri_taps[k] * constrain(p1 - x, pri_strength, pri_damping);
+        if (p0 != CDEF_VERY_LARGE) max = AOMMAX(p0, max);
+        if (p1 != CDEF_VERY_LARGE) max = AOMMAX(p1, max);
+        min = AOMMIN(p0, min);
+        min = AOMMIN(p1, min);
+        int16_t s0 = in[i * s + j + cdef_directions[(dir + 2) & 7][k]];
+        int16_t s1 = in[i * s + j - cdef_directions[(dir + 2) & 7][k]];
+        int16_t s2 = in[i * s + j + cdef_directions[(dir + 6) & 7][k]];
+        int16_t s3 = in[i * s + j - cdef_directions[(dir + 6) & 7][k]];
+        if (s0 != CDEF_VERY_LARGE) max = AOMMAX(s0, max);
+        if (s1 != CDEF_VERY_LARGE) max = AOMMAX(s1, max);
+        if (s2 != CDEF_VERY_LARGE) max = AOMMAX(s2, max);
+        if (s3 != CDEF_VERY_LARGE) max = AOMMAX(s3, max);
+        min = AOMMIN(s0, min);
+        min = AOMMIN(s1, min);
+        min = AOMMIN(s2, min);
+        min = AOMMIN(s3, min);
+        sum += sec_taps[k] * constrain(s0 - x, sec_strength, sec_damping);
+        sum += sec_taps[k] * constrain(s1 - x, sec_strength, sec_damping);
+        sum += sec_taps[k] * constrain(s2 - x, sec_strength, sec_damping);
+        sum += sec_taps[k] * constrain(s3 - x, sec_strength, sec_damping);
+      }
+      y = clamp((int16_t)x + ((8 + sum - (sum < 0)) >> 4), min, max);
+      if (dst8)
+        dst8[i * dstride + j] = (uint8_t)y;
+      else
+        dst16[i * dstride + j] = (uint16_t)y;
+    }
+  }
+}
+
+/* Compute the primary filter strength for an 8x8 block based on the
+   directional variance difference. A high variance difference means
+   that we have a highly directional pattern (e.g. a high contrast
+   edge), so we can apply more deringing. A low variance means that we
+   either have a low contrast edge, or a non-directional texture, so
+   we want to be careful not to blur. */
+static INLINE int adjust_strength(int strength, int32_t var) {
+  const int i = var >> 6 ? AOMMIN(get_msb(var >> 6), 12) : 0;
+  /* We use the variance of 8x8 blocks to adjust the strength. */
+  return var ? (strength * (4 + i) + 8) >> 4 : 0;
+}
+
+void av1_cdef_filter_fb(uint8_t *dst8, uint16_t *dst16, int dstride,
+                        uint16_t *in, int xdec, int ydec,
+                        int dir[CDEF_NBLOCKS][CDEF_NBLOCKS], int *dirinit,
+                        int var[CDEF_NBLOCKS][CDEF_NBLOCKS], int pli,
+                        cdef_list *dlist, int cdef_count, int level,
+                        int sec_strength, int damping, int coeff_shift) {
+  int bi;
+  int bx;
+  int by;
+  const int pri_strength = level << coeff_shift;
+  sec_strength <<= coeff_shift;
+  damping += coeff_shift - (pli != AOM_PLANE_Y);
+  const int bw_log2 = 3 - xdec;
+  const int bh_log2 = 3 - ydec;
+  if (dirinit && pri_strength == 0 && sec_strength == 0) {
+    // If we're here, both primary and secondary strengths are 0, and
+    // we still haven't written anything to y[] yet, so we just copy
+    // the input to y[]. This is necessary only for av1_cdef_search()
+    // and only av1_cdef_search() sets dirinit.
+    for (bi = 0; bi < cdef_count; bi++) {
+      by = dlist[bi].by;
+      bx = dlist[bi].bx;
+      // TODO(stemidts/jmvalin): SIMD optimisations
+      for (int iy = 0; iy < 1 << bh_log2; iy++) {
+        memcpy(&dst16[(bi << (bw_log2 + bh_log2)) + (iy << bw_log2)],
+               &in[((by << bh_log2) + iy) * CDEF_BSTRIDE + (bx << bw_log2)],
+               ((size_t)1 << bw_log2) * sizeof(*dst16));
+      }
+    }
+    return;
+  }
+
+  if (pli == 0) {
+    if (!dirinit || !*dirinit) {
+      for (bi = 0; bi < cdef_count; bi++) {
+        by = dlist[bi].by;
+        bx = dlist[bi].bx;
+        dir[by][bx] = cdef_find_dir(&in[8 * by * CDEF_BSTRIDE + 8 * bx],
+                                    CDEF_BSTRIDE, &var[by][bx], coeff_shift);
+      }
+      if (dirinit) *dirinit = 1;
+    }
+  }
+  if (pli == 1 && xdec != ydec) {
+    for (bi = 0; bi < cdef_count; bi++) {
+      static const int conv422[8] = { 7, 0, 2, 4, 5, 6, 6, 6 };
+      static const int conv440[8] = { 1, 2, 2, 2, 3, 4, 6, 0 };
+      by = dlist[bi].by;
+      bx = dlist[bi].bx;
+      dir[by][bx] = (xdec ? conv422 : conv440)[dir[by][bx]];
+    }
+  }
+
+  const int bsize =
+      ydec ? (xdec ? BLOCK_4X4 : BLOCK_8X4) : (xdec ? BLOCK_4X8 : BLOCK_8X8);
+  const int t = pri_strength;
+  const int s = sec_strength;
+  for (bi = 0; bi < cdef_count; bi++) {
+    by = dlist[bi].by;
+    bx = dlist[bi].bx;
+    if (dst8) {
+      cdef_filter_block(
+          &dst8[(by << bh_log2) * dstride + (bx << bw_log2)], NULL, dstride,
+          &in[(by * CDEF_BSTRIDE << bh_log2) + (bx << bw_log2)],
+          (pli ? t : adjust_strength(t, var[by][bx])), s, t ? dir[by][bx] : 0,
+          damping, damping, bsize, coeff_shift);
+    } else {
+      cdef_filter_block(
+          NULL,
+          &dst16[dirinit ? bi << (bw_log2 + bh_log2)
+                         : (by << bh_log2) * dstride + (bx << bw_log2)],
+          dirinit ? 1 << bw_log2 : dstride,
+          &in[(by * CDEF_BSTRIDE << bh_log2) + (bx << bw_log2)],
+          (pli ? t : adjust_strength(t, var[by][bx])), s, t ? dir[by][bx] : 0,
+          damping, damping, bsize, coeff_shift);
+    }
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef_block.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef_block.h
new file mode 100644
index 0000000000..594a5a16be
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/cdef_block.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_CDEF_BLOCK_H_
+#define AOM_AV1_COMMON_CDEF_BLOCK_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h"
+
+#define CDEF_BLOCKSIZE 64
+#define CDEF_BLOCKSIZE_LOG2 6
+#define CDEF_NBLOCKS ((1 << MAX_SB_SIZE_LOG2) / 8)
+#define CDEF_SB_SHIFT (MAX_SB_SIZE_LOG2 - CDEF_BLOCKSIZE_LOG2)
+
+/* We need to buffer three vertical lines. */
+#define CDEF_VBORDER (3)
+/* We only need to buffer three horizontal pixels too, but let's align to
+   16 bytes (8 x 16 bits) to make vectorization easier. */
+#define CDEF_HBORDER (8)
+#define CDEF_BSTRIDE \
+  ALIGN_POWER_OF_TWO((1 << MAX_SB_SIZE_LOG2) + 2 * CDEF_HBORDER, 3)
+
+#define CDEF_VERY_LARGE (30000)
+#define CDEF_INBUF_SIZE \
+  (CDEF_BSTRIDE * ((1 << MAX_SB_SIZE_LOG2) + 2 * CDEF_VBORDER))
+
+extern const int cdef_pri_taps[2][2];
+extern const int cdef_sec_taps[2];
+DECLARE_ALIGNED(16, extern const int, cdef_directions[8][2]);
+
+typedef struct {
+  uint8_t by;
+  uint8_t bx;
+} cdef_list;
+
+typedef void (*cdef_filter_block_func)(uint8_t *dst8, uint16_t *dst16,
+                                       int dstride, const uint16_t *in,
+                                       int pri_strength, int sec_strength,
+                                       int dir, int pri_damping,
+                                       int sec_damping, int bsize,
+                                       int coeff_shift);
+void copy_cdef_16bit_to_16bit(uint16_t *dst, int dstride, uint16_t *src,
+                              cdef_list *dlist, int cdef_count, int bsize);
+
+void av1_cdef_filter_fb(uint8_t *dst8, uint16_t *dst16, int dstride,
+                        uint16_t *in, int xdec, int ydec,
+                        int dir[CDEF_NBLOCKS][CDEF_NBLOCKS], int *dirinit,
+                        int var[CDEF_NBLOCKS][CDEF_NBLOCKS], int pli,
+                        cdef_list *dlist, int cdef_count, int level,
+                        int sec_strength, int damping, int coeff_shift);
+#endif  // AOM_AV1_COMMON_CDEF_BLOCK_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.c
new file mode 100644
index 0000000000..dadd07d937
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.c
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common_data.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+void cfl_init(CFL_CTX *cfl, const SequenceHeader *seq_params) {
+  assert(block_size_wide[CFL_MAX_BLOCK_SIZE] == CFL_BUF_LINE);
+  assert(block_size_high[CFL_MAX_BLOCK_SIZE] == CFL_BUF_LINE);
+
+  memset(&cfl->recon_buf_q3, 0, sizeof(cfl->recon_buf_q3));
+  memset(&cfl->ac_buf_q3, 0, sizeof(cfl->ac_buf_q3));
+  cfl->subsampling_x = seq_params->subsampling_x;
+  cfl->subsampling_y = seq_params->subsampling_y;
+  cfl->are_parameters_computed = 0;
+  cfl->store_y = 0;
+  // The DC_PRED cache is disabled by default and is only enabled in
+  // cfl_rd_pick_alpha
+  cfl->use_dc_pred_cache = 0;
+  cfl->dc_pred_is_cached[CFL_PRED_U] = 0;
+  cfl->dc_pred_is_cached[CFL_PRED_V] = 0;
+}
+
+void cfl_store_dc_pred(MACROBLOCKD *const xd, const uint8_t *input,
+                       CFL_PRED_TYPE pred_plane, int width) {
+  assert(pred_plane < CFL_PRED_PLANES);
+  assert(width <= CFL_BUF_LINE);
+
+  if (is_cur_buf_hbd(xd)) {
+    uint16_t *const input_16 = CONVERT_TO_SHORTPTR(input);
+    memcpy(xd->cfl.dc_pred_cache[pred_plane], input_16, width << 1);
+    return;
+  }
+
+  memcpy(xd->cfl.dc_pred_cache[pred_plane], input, width);
+}
+
+static void cfl_load_dc_pred_lbd(const int16_t *dc_pred_cache, uint8_t *dst,
+                                 int dst_stride, int width, int height) {
+  for (int j = 0; j < height; j++) {
+    memcpy(dst, dc_pred_cache, width);
+    dst += dst_stride;
+  }
+}
+
+static void cfl_load_dc_pred_hbd(const int16_t *dc_pred_cache, uint16_t *dst,
+                                 int dst_stride, int width, int height) {
+  const size_t num_bytes = width << 1;
+  for (int j = 0; j < height; j++) {
+    memcpy(dst, dc_pred_cache, num_bytes);
+    dst += dst_stride;
+  }
+}
+void cfl_load_dc_pred(MACROBLOCKD *const xd, uint8_t *dst, int dst_stride,
+                      TX_SIZE tx_size, CFL_PRED_TYPE pred_plane) {
+  const int width = tx_size_wide[tx_size];
+  const int height = tx_size_high[tx_size];
+  assert(pred_plane < CFL_PRED_PLANES);
+  assert(width <= CFL_BUF_LINE);
+  assert(height <= CFL_BUF_LINE);
+  if (is_cur_buf_hbd(xd)) {
+    uint16_t *dst_16 = CONVERT_TO_SHORTPTR(dst);
+    cfl_load_dc_pred_hbd(xd->cfl.dc_pred_cache[pred_plane], dst_16, dst_stride,
+                         width, height);
+    return;
+  }
+  cfl_load_dc_pred_lbd(xd->cfl.dc_pred_cache[pred_plane], dst, dst_stride,
+                       width, height);
+}
+
+// Due to frame boundary issues, it is possible that the total area covered by
+// chroma exceeds that of luma. When this happens, we fill the missing pixels by
+// repeating the last columns and/or rows.
+static INLINE void cfl_pad(CFL_CTX *cfl, int width, int height) {
+  const int diff_width = width - cfl->buf_width;
+  const int diff_height = height - cfl->buf_height;
+
+  if (diff_width > 0) {
+    const int min_height = height - diff_height;
+    uint16_t *recon_buf_q3 = cfl->recon_buf_q3 + (width - diff_width);
+    for (int j = 0; j < min_height; j++) {
+      const uint16_t last_pixel = recon_buf_q3[-1];
+      assert(recon_buf_q3 + diff_width <= cfl->recon_buf_q3 + CFL_BUF_SQUARE);
+      for (int i = 0; i < diff_width; i++) {
+        recon_buf_q3[i] = last_pixel;
+      }
+      recon_buf_q3 += CFL_BUF_LINE;
+    }
+    cfl->buf_width = width;
+  }
+  if (diff_height > 0) {
+    uint16_t *recon_buf_q3 =
+        cfl->recon_buf_q3 + ((height - diff_height) * CFL_BUF_LINE);
+    for (int j = 0; j < diff_height; j++) {
+      const uint16_t *last_row_q3 = recon_buf_q3 - CFL_BUF_LINE;
+      assert(recon_buf_q3 + width <= cfl->recon_buf_q3 + CFL_BUF_SQUARE);
+      for (int i = 0; i < width; i++) {
+        recon_buf_q3[i] = last_row_q3[i];
+      }
+      recon_buf_q3 += CFL_BUF_LINE;
+    }
+    cfl->buf_height = height;
+  }
+}
+
+static void subtract_average_c(const uint16_t *src, int16_t *dst, int width,
+                               int height, int round_offset, int num_pel_log2) {
+  int sum = round_offset;
+  const uint16_t *recon = src;
+  for (int j = 0; j < height; j++) {
+    for (int i = 0; i < width; i++) {
+      sum += recon[i];
+    }
+    recon += CFL_BUF_LINE;
+  }
+  const int avg = sum >> num_pel_log2;
+  for (int j = 0; j < height; j++) {
+    for (int i = 0; i < width; i++) {
+      dst[i] = src[i] - avg;
+    }
+    src += CFL_BUF_LINE;
+    dst += CFL_BUF_LINE;
+  }
+}
+
+CFL_SUB_AVG_FN(c)
+
+static INLINE int cfl_idx_to_alpha(uint8_t alpha_idx, int8_t joint_sign,
+                                   CFL_PRED_TYPE pred_type) {
+  const int alpha_sign = (pred_type == CFL_PRED_U) ? CFL_SIGN_U(joint_sign)
+                                                   : CFL_SIGN_V(joint_sign);
+  if (alpha_sign == CFL_SIGN_ZERO) return 0;
+  const int abs_alpha_q3 =
+      (pred_type == CFL_PRED_U) ? CFL_IDX_U(alpha_idx) : CFL_IDX_V(alpha_idx);
+  return (alpha_sign == CFL_SIGN_POS) ? abs_alpha_q3 + 1 : -abs_alpha_q3 - 1;
+}
+
+static INLINE void cfl_predict_lbd_c(const int16_t *ac_buf_q3, uint8_t *dst,
+                                     int dst_stride, int alpha_q3, int width,
+                                     int height) {
+  for (int j = 0; j < height; j++) {
+    for (int i = 0; i < width; i++) {
+      dst[i] = clip_pixel(get_scaled_luma_q0(alpha_q3, ac_buf_q3[i]) + dst[i]);
+    }
+    dst += dst_stride;
+    ac_buf_q3 += CFL_BUF_LINE;
+  }
+}
+
+CFL_PREDICT_FN(c, lbd)
+
+#if CONFIG_AV1_HIGHBITDEPTH
+void cfl_predict_hbd_c(const int16_t *ac_buf_q3, uint16_t *dst, int dst_stride,
+                       int alpha_q3, int bit_depth, int width, int height) {
+  for (int j = 0; j < height; j++) {
+    for (int i = 0; i < width; i++) {
+      dst[i] = clip_pixel_highbd(
+          get_scaled_luma_q0(alpha_q3, ac_buf_q3[i]) + dst[i], bit_depth);
+    }
+    dst += dst_stride;
+    ac_buf_q3 += CFL_BUF_LINE;
+  }
+}
+
+CFL_PREDICT_FN(c, hbd)
+#endif
+
+static void cfl_compute_parameters(MACROBLOCKD *const xd, TX_SIZE tx_size) {
+  CFL_CTX *const cfl = &xd->cfl;
+  // Do not call cfl_compute_parameters multiple time on the same values.
+  assert(cfl->are_parameters_computed == 0);
+
+  cfl_pad(cfl, tx_size_wide[tx_size], tx_size_high[tx_size]);
+  cfl_get_subtract_average_fn(tx_size)(cfl->recon_buf_q3, cfl->ac_buf_q3);
+  cfl->are_parameters_computed = 1;
+}
+
+void cfl_predict_block(MACROBLOCKD *const xd, uint8_t *dst, int dst_stride,
+                       TX_SIZE tx_size, int plane) {
+  CFL_CTX *const cfl = &xd->cfl;
+  MB_MODE_INFO *mbmi = xd->mi[0];
+  assert(is_cfl_allowed(xd));
+
+  if (!cfl->are_parameters_computed) cfl_compute_parameters(xd, tx_size);
+
+  const int alpha_q3 =
+      cfl_idx_to_alpha(mbmi->cfl_alpha_idx, mbmi->cfl_alpha_signs, plane - 1);
+  assert((tx_size_high[tx_size] - 1) * CFL_BUF_LINE + tx_size_wide[tx_size] <=
+         CFL_BUF_SQUARE);
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (is_cur_buf_hbd(xd)) {
+    uint16_t *dst_16 = CONVERT_TO_SHORTPTR(dst);
+    cfl_get_predict_hbd_fn(tx_size)(cfl->ac_buf_q3, dst_16, dst_stride,
+                                    alpha_q3, xd->bd);
+    return;
+  }
+#endif
+  cfl_get_predict_lbd_fn(tx_size)(cfl->ac_buf_q3, dst, dst_stride, alpha_q3);
+}
+
+static void cfl_luma_subsampling_420_lbd_c(const uint8_t *input,
+                                           int input_stride,
+                                           uint16_t *output_q3, int width,
+                                           int height) {
+  for (int j = 0; j < height; j += 2) {
+    for (int i = 0; i < width; i += 2) {
+      const int bot = i + input_stride;
+      output_q3[i >> 1] =
+          (input[i] + input[i + 1] + input[bot] + input[bot + 1]) << 1;
+    }
+    input += input_stride << 1;
+    output_q3 += CFL_BUF_LINE;
+  }
+}
+
+static void cfl_luma_subsampling_422_lbd_c(const uint8_t *input,
+                                           int input_stride,
+                                           uint16_t *output_q3, int width,
+                                           int height) {
+  assert((height - 1) * CFL_BUF_LINE + width <= CFL_BUF_SQUARE);
+  for (int j = 0; j < height; j++) {
+    for (int i = 0; i < width; i += 2) {
+      output_q3[i >> 1] = (input[i] + input[i + 1]) << 2;
+    }
+    input += input_stride;
+    output_q3 += CFL_BUF_LINE;
+  }
+}
+
+static void cfl_luma_subsampling_444_lbd_c(const uint8_t *input,
+                                           int input_stride,
+                                           uint16_t *output_q3, int width,
+                                           int height) {
+  assert((height - 1) * CFL_BUF_LINE + width <= CFL_BUF_SQUARE);
+  for (int j = 0; j < height; j++) {
+    for (int i = 0; i < width; i++) {
+      output_q3[i] = input[i] << 3;
+    }
+    input += input_stride;
+    output_q3 += CFL_BUF_LINE;
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void cfl_luma_subsampling_420_hbd_c(const uint16_t *input,
+                                           int input_stride,
+                                           uint16_t *output_q3, int width,
+                                           int height) {
+  for (int j = 0; j < height; j += 2) {
+    for (int i = 0; i < width; i += 2) {
+      const int bot = i + input_stride;
+      output_q3[i >> 1] =
+          (input[i] + input[i + 1] + input[bot] + input[bot + 1]) << 1;
+    }
+    input += input_stride << 1;
+    output_q3 += CFL_BUF_LINE;
+  }
+}
+
+static void cfl_luma_subsampling_422_hbd_c(const uint16_t *input,
+                                           int input_stride,
+                                           uint16_t *output_q3, int width,
+                                           int height) {
+  assert((height - 1) * CFL_BUF_LINE + width <= CFL_BUF_SQUARE);
+  for (int j = 0; j < height; j++) {
+    for (int i = 0; i < width; i += 2) {
+      output_q3[i >> 1] = (input[i] + input[i + 1]) << 2;
+    }
+    input += input_stride;
+    output_q3 += CFL_BUF_LINE;
+  }
+}
+
+static void cfl_luma_subsampling_444_hbd_c(const uint16_t *input,
+                                           int input_stride,
+                                           uint16_t *output_q3, int width,
+                                           int height) {
+  assert((height - 1) * CFL_BUF_LINE + width <= CFL_BUF_SQUARE);
+  for (int j = 0; j < height; j++) {
+    for (int i = 0; i < width; i++) {
+      output_q3[i] = input[i] << 3;
+    }
+    input += input_stride;
+    output_q3 += CFL_BUF_LINE;
+  }
+}
+#endif
+
+CFL_GET_SUBSAMPLE_FUNCTION(c)
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static INLINE cfl_subsample_hbd_fn cfl_subsampling_hbd(TX_SIZE tx_size,
+                                                       int sub_x, int sub_y) {
+  if (sub_x == 1) {
+    if (sub_y == 1) {
+      return cfl_get_luma_subsampling_420_hbd(tx_size);
+    }
+    return cfl_get_luma_subsampling_422_hbd(tx_size);
+  }
+  return cfl_get_luma_subsampling_444_hbd(tx_size);
+}
+#endif
+
+static INLINE cfl_subsample_lbd_fn cfl_subsampling_lbd(TX_SIZE tx_size,
+                                                       int sub_x, int sub_y) {
+  if (sub_x == 1) {
+    if (sub_y == 1) {
+      return cfl_get_luma_subsampling_420_lbd(tx_size);
+    }
+    return cfl_get_luma_subsampling_422_lbd(tx_size);
+  }
+  return cfl_get_luma_subsampling_444_lbd(tx_size);
+}
+
+static void cfl_store(CFL_CTX *cfl, const uint8_t *input, int input_stride,
+                      int row, int col, TX_SIZE tx_size, int use_hbd) {
+  const int width = tx_size_wide[tx_size];
+  const int height = tx_size_high[tx_size];
+  const int tx_off_log2 = MI_SIZE_LOG2;
+  const int sub_x = cfl->subsampling_x;
+  const int sub_y = cfl->subsampling_y;
+  const int store_row = row << (tx_off_log2 - sub_y);
+  const int store_col = col << (tx_off_log2 - sub_x);
+  const int store_height = height >> sub_y;
+  const int store_width = width >> sub_x;
+
+  // Invalidate current parameters
+  cfl->are_parameters_computed = 0;
+
+  // Store the surface of the pixel buffer that was written to, this way we
+  // can manage chroma overrun (e.g. when the chroma surfaces goes beyond the
+  // frame boundary)
+  if (col == 0 && row == 0) {
+    cfl->buf_width = store_width;
+    cfl->buf_height = store_height;
+  } else {
+    cfl->buf_width = OD_MAXI(store_col + store_width, cfl->buf_width);
+    cfl->buf_height = OD_MAXI(store_row + store_height, cfl->buf_height);
+  }
+
+  // Check that we will remain inside the pixel buffer.
+  assert(store_row + store_height <= CFL_BUF_LINE);
+  assert(store_col + store_width <= CFL_BUF_LINE);
+
+  // Store the input into the CfL pixel buffer
+  uint16_t *recon_buf_q3 =
+      cfl->recon_buf_q3 + (store_row * CFL_BUF_LINE + store_col);
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (use_hbd) {
+    cfl_subsampling_hbd(tx_size, sub_x, sub_y)(CONVERT_TO_SHORTPTR(input),
+                                               input_stride, recon_buf_q3);
+  } else {
+    cfl_subsampling_lbd(tx_size, sub_x, sub_y)(input, input_stride,
+                                               recon_buf_q3);
+  }
+#else
+  (void)use_hbd;
+  cfl_subsampling_lbd(tx_size, sub_x, sub_y)(input, input_stride, recon_buf_q3);
+#endif
+}
+
+// Adjust the row and column of blocks smaller than 8X8, as chroma-referenced
+// and non-chroma-referenced blocks are stored together in the CfL buffer.
+static INLINE void sub8x8_adjust_offset(const CFL_CTX *cfl, int mi_row,
+                                        int mi_col, int *row_out,
+                                        int *col_out) {
+  // Increment row index for bottom: 8x4, 16x4 or both bottom 4x4s.
+  if ((mi_row & 0x01) && cfl->subsampling_y) {
+    assert(*row_out == 0);
+    (*row_out)++;
+  }
+
+  // Increment col index for right: 4x8, 4x16 or both right 4x4s.
+  if ((mi_col & 0x01) && cfl->subsampling_x) {
+    assert(*col_out == 0);
+    (*col_out)++;
+  }
+}
+
+void cfl_store_tx(MACROBLOCKD *const xd, int row, int col, TX_SIZE tx_size,
+                  BLOCK_SIZE bsize) {
+  CFL_CTX *const cfl = &xd->cfl;
+  struct macroblockd_plane *const pd = &xd->plane[AOM_PLANE_Y];
+  uint8_t *dst = &pd->dst.buf[(row * pd->dst.stride + col) << MI_SIZE_LOG2];
+
+  if (block_size_high[bsize] == 4 || block_size_wide[bsize] == 4) {
+    // Only dimensions of size 4 can have an odd offset.
+    assert(!((col & 1) && tx_size_wide[tx_size] != 4));
+    assert(!((row & 1) && tx_size_high[tx_size] != 4));
+    sub8x8_adjust_offset(cfl, xd->mi_row, xd->mi_col, &row, &col);
+  }
+  cfl_store(cfl, dst, pd->dst.stride, row, col, tx_size, is_cur_buf_hbd(xd));
+}
+
+static INLINE int max_intra_block_width(const MACROBLOCKD *xd,
+                                        BLOCK_SIZE plane_bsize, int plane,
+                                        TX_SIZE tx_size) {
+  const int max_blocks_wide = max_block_wide(xd, plane_bsize, plane)
+                              << MI_SIZE_LOG2;
+  return ALIGN_POWER_OF_TWO(max_blocks_wide, tx_size_wide_log2[tx_size]);
+}
+
+static INLINE int max_intra_block_height(const MACROBLOCKD *xd,
+                                         BLOCK_SIZE plane_bsize, int plane,
+                                         TX_SIZE tx_size) {
+  const int max_blocks_high = max_block_high(xd, plane_bsize, plane)
+                              << MI_SIZE_LOG2;
+  return ALIGN_POWER_OF_TWO(max_blocks_high, tx_size_high_log2[tx_size]);
+}
+
+void cfl_store_block(MACROBLOCKD *const xd, BLOCK_SIZE bsize, TX_SIZE tx_size) {
+  CFL_CTX *const cfl = &xd->cfl;
+  struct macroblockd_plane *const pd = &xd->plane[AOM_PLANE_Y];
+  int row = 0;
+  int col = 0;
+
+  if (block_size_high[bsize] == 4 || block_size_wide[bsize] == 4) {
+    sub8x8_adjust_offset(cfl, xd->mi_row, xd->mi_col, &row, &col);
+  }
+  const int width = max_intra_block_width(xd, bsize, AOM_PLANE_Y, tx_size);
+  const int height = max_intra_block_height(xd, bsize, AOM_PLANE_Y, tx_size);
+  tx_size = get_tx_size(width, height);
+  cfl_store(cfl, pd->dst.buf, pd->dst.stride, row, col, tx_size,
+            is_cur_buf_hbd(xd));
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.h
new file mode 100644
index 0000000000..78c26e6ba2
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.h
@@ -0,0 +1,288 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_CFL_H_
+#define AOM_AV1_COMMON_CFL_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+
+// Can we use CfL for the current block?
+static INLINE CFL_ALLOWED_TYPE is_cfl_allowed(const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *mbmi = xd->mi[0];
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  assert(bsize < BLOCK_SIZES_ALL);
+  if (xd->lossless[mbmi->segment_id]) {
+    // In lossless, CfL is available when the partition size is equal to the
+    // transform size.
+    const int ssx = xd->plane[AOM_PLANE_U].subsampling_x;
+    const int ssy = xd->plane[AOM_PLANE_U].subsampling_y;
+    const int plane_bsize = get_plane_block_size(bsize, ssx, ssy);
+    return (CFL_ALLOWED_TYPE)(plane_bsize == BLOCK_4X4);
+  }
+  // Spec: CfL is available to luma partitions lesser than or equal to 32x32
+  return (CFL_ALLOWED_TYPE)(block_size_wide[bsize] <= 32 &&
+                            block_size_high[bsize] <= 32);
+}
+
+// Do we need to save the luma pixels from the current block,
+// for a possible future CfL prediction?
+static INLINE CFL_ALLOWED_TYPE store_cfl_required(const AV1_COMMON *cm,
+                                                  const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *mbmi = xd->mi[0];
+
+  if (cm->seq_params.monochrome) return CFL_DISALLOWED;
+
+  if (!xd->is_chroma_ref) {
+    // For non-chroma-reference blocks, we should always store the luma pixels,
+    // in case the corresponding chroma-reference block uses CfL.
+    // Note that this can only happen for block sizes which are <8 on
+    // their shortest side, as otherwise they would be chroma reference
+    // blocks.
+    return CFL_ALLOWED;
+  }
+
+  // If this block has chroma information, we know whether we're
+  // actually going to perform a CfL prediction
+  return (CFL_ALLOWED_TYPE)(!is_inter_block(mbmi) &&
+                            mbmi->uv_mode == UV_CFL_PRED);
+}
+
+static INLINE int get_scaled_luma_q0(int alpha_q3, int16_t pred_buf_q3) {
+  int scaled_luma_q6 = alpha_q3 * pred_buf_q3;
+  return ROUND_POWER_OF_TWO_SIGNED(scaled_luma_q6, 6);
+}
+
+static INLINE CFL_PRED_TYPE get_cfl_pred_type(PLANE_TYPE plane) {
+  assert(plane > 0);
+  return (CFL_PRED_TYPE)(plane - 1);
+}
+
+void cfl_predict_block(MACROBLOCKD *const xd, uint8_t *dst, int dst_stride,
+                       TX_SIZE tx_size, int plane);
+
+void cfl_store_block(MACROBLOCKD *const xd, BLOCK_SIZE bsize, TX_SIZE tx_size);
+
+void cfl_store_tx(MACROBLOCKD *const xd, int row, int col, TX_SIZE tx_size,
+                  BLOCK_SIZE bsize);
+
+void cfl_store_dc_pred(MACROBLOCKD *const xd, const uint8_t *input,
+                       CFL_PRED_TYPE pred_plane, int width);
+
+void cfl_load_dc_pred(MACROBLOCKD *const xd, uint8_t *dst, int dst_stride,
+                      TX_SIZE tx_size, CFL_PRED_TYPE pred_plane);
+
+// Allows the CFL_SUBSAMPLE function to switch types depending on the bitdepth.
+#define CFL_lbd_TYPE uint8_t *cfl_type
+#define CFL_hbd_TYPE uint16_t *cfl_type
+
+// Declare a size-specific wrapper for the size-generic function. The compiler
+// will inline the size generic function in here, the advantage is that the size
+// will be constant allowing for loop unrolling and other constant propagated
+// goodness.
+#define CFL_SUBSAMPLE(arch, sub, bd, width, height)                       \
+  void cfl_subsample_##bd##_##sub##_##width##x##height##_##arch(          \
+      const CFL_##bd##_TYPE, int input_stride, uint16_t *output_q3) {     \
+    cfl_luma_subsampling_##sub##_##bd##_##arch(cfl_type, input_stride,    \
+                                               output_q3, width, height); \
+  }
+
+// Declare size-specific wrappers for all valid CfL sizes.
+#define CFL_SUBSAMPLE_FUNCTIONS(arch, sub, bd)                            \
+  CFL_SUBSAMPLE(arch, sub, bd, 4, 4)                                      \
+  CFL_SUBSAMPLE(arch, sub, bd, 8, 8)                                      \
+  CFL_SUBSAMPLE(arch, sub, bd, 16, 16)                                    \
+  CFL_SUBSAMPLE(arch, sub, bd, 32, 32)                                    \
+  CFL_SUBSAMPLE(arch, sub, bd, 4, 8)                                      \
+  CFL_SUBSAMPLE(arch, sub, bd, 8, 4)                                      \
+  CFL_SUBSAMPLE(arch, sub, bd, 8, 16)                                     \
+  CFL_SUBSAMPLE(arch, sub, bd, 16, 8)                                     \
+  CFL_SUBSAMPLE(arch, sub, bd, 16, 32)                                    \
+  CFL_SUBSAMPLE(arch, sub, bd, 32, 16)                                    \
+  CFL_SUBSAMPLE(arch, sub, bd, 4, 16)                                     \
+  CFL_SUBSAMPLE(arch, sub, bd, 16, 4)                                     \
+  CFL_SUBSAMPLE(arch, sub, bd, 8, 32)                                     \
+  CFL_SUBSAMPLE(arch, sub, bd, 32, 8)                                     \
+  cfl_subsample_##bd##_fn cfl_get_luma_subsampling_##sub##_##bd##_##arch( \
+      TX_SIZE tx_size) {                                                  \
+    CFL_SUBSAMPLE_FUNCTION_ARRAY(arch, sub, bd)                           \
+    return subfn_##sub[tx_size];                                          \
+  }
+
+// Declare an architecture-specific array of function pointers for size-specific
+// wrappers.
+#define CFL_SUBSAMPLE_FUNCTION_ARRAY(arch, sub, bd)                           \
+  static const cfl_subsample_##bd##_fn subfn_##sub[TX_SIZES_ALL] = {          \
+    cfl_subsample_##bd##_##sub##_4x4_##arch,   /* 4x4 */                      \
+    cfl_subsample_##bd##_##sub##_8x8_##arch,   /* 8x8 */                      \
+    cfl_subsample_##bd##_##sub##_16x16_##arch, /* 16x16 */                    \
+    cfl_subsample_##bd##_##sub##_32x32_##arch, /* 32x32 */                    \
+    NULL,                                      /* 64x64 (invalid CFL size) */ \
+    cfl_subsample_##bd##_##sub##_4x8_##arch,   /* 4x8 */                      \
+    cfl_subsample_##bd##_##sub##_8x4_##arch,   /* 8x4 */                      \
+    cfl_subsample_##bd##_##sub##_8x16_##arch,  /* 8x16 */                     \
+    cfl_subsample_##bd##_##sub##_16x8_##arch,  /* 16x8 */                     \
+    cfl_subsample_##bd##_##sub##_16x32_##arch, /* 16x32 */                    \
+    cfl_subsample_##bd##_##sub##_32x16_##arch, /* 32x16 */                    \
+    NULL,                                      /* 32x64 (invalid CFL size) */ \
+    NULL,                                      /* 64x32 (invalid CFL size) */ \
+    cfl_subsample_##bd##_##sub##_4x16_##arch,  /* 4x16  */                    \
+    cfl_subsample_##bd##_##sub##_16x4_##arch,  /* 16x4  */                    \
+    cfl_subsample_##bd##_##sub##_8x32_##arch,  /* 8x32  */                    \
+    cfl_subsample_##bd##_##sub##_32x8_##arch,  /* 32x8  */                    \
+    NULL,                                      /* 16x64 (invalid CFL size) */ \
+    NULL,                                      /* 64x16 (invalid CFL size) */ \
+  };
+
+// The RTCD script does not support passing in an array, so we wrap it in this
+// function.
+#if CONFIG_AV1_HIGHBITDEPTH
+#define CFL_GET_SUBSAMPLE_FUNCTION(arch)  \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 420, lbd) \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 422, lbd) \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 444, lbd) \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 420, hbd) \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 422, hbd) \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 444, hbd)
+#else
+#define CFL_GET_SUBSAMPLE_FUNCTION(arch)  \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 420, lbd) \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 422, lbd) \
+  CFL_SUBSAMPLE_FUNCTIONS(arch, 444, lbd)
+#endif
+
+// Declare a size-specific wrapper for the size-generic function. The compiler
+// will inline the size generic function in here, the advantage is that the size
+// will be constant allowing for loop unrolling and other constant propagated
+// goodness.
+#define CFL_SUB_AVG_X(arch, width, height, round_offset, num_pel_log2)       \
+  void cfl_subtract_average_##width##x##height##_##arch(const uint16_t *src, \
+                                                        int16_t *dst) {      \
+    subtract_average_##arch(src, dst, width, height, round_offset,           \
+                            num_pel_log2);                                   \
+  }
+
+// Declare size-specific wrappers for all valid CfL sizes.
+#define CFL_SUB_AVG_FN(arch)                                              \
+  CFL_SUB_AVG_X(arch, 4, 4, 8, 4)                                         \
+  CFL_SUB_AVG_X(arch, 4, 8, 16, 5)                                        \
+  CFL_SUB_AVG_X(arch, 4, 16, 32, 6)                                       \
+  CFL_SUB_AVG_X(arch, 8, 4, 16, 5)                                        \
+  CFL_SUB_AVG_X(arch, 8, 8, 32, 6)                                        \
+  CFL_SUB_AVG_X(arch, 8, 16, 64, 7)                                       \
+  CFL_SUB_AVG_X(arch, 8, 32, 128, 8)                                      \
+  CFL_SUB_AVG_X(arch, 16, 4, 32, 6)                                       \
+  CFL_SUB_AVG_X(arch, 16, 8, 64, 7)                                       \
+  CFL_SUB_AVG_X(arch, 16, 16, 128, 8)                                     \
+  CFL_SUB_AVG_X(arch, 16, 32, 256, 9)                                     \
+  CFL_SUB_AVG_X(arch, 32, 8, 128, 8)                                      \
+  CFL_SUB_AVG_X(arch, 32, 16, 256, 9)                                     \
+  CFL_SUB_AVG_X(arch, 32, 32, 512, 10)                                    \
+  cfl_subtract_average_fn cfl_get_subtract_average_fn_##arch(             \
+      TX_SIZE tx_size) {                                                  \
+    static const cfl_subtract_average_fn sub_avg[TX_SIZES_ALL] = {        \
+      cfl_subtract_average_4x4_##arch,   /* 4x4 */                        \
+      cfl_subtract_average_8x8_##arch,   /* 8x8 */                        \
+      cfl_subtract_average_16x16_##arch, /* 16x16 */                      \
+      cfl_subtract_average_32x32_##arch, /* 32x32 */                      \
+      NULL,                              /* 64x64 (invalid CFL size) */   \
+      cfl_subtract_average_4x8_##arch,   /* 4x8 */                        \
+      cfl_subtract_average_8x4_##arch,   /* 8x4 */                        \
+      cfl_subtract_average_8x16_##arch,  /* 8x16 */                       \
+      cfl_subtract_average_16x8_##arch,  /* 16x8 */                       \
+      cfl_subtract_average_16x32_##arch, /* 16x32 */                      \
+      cfl_subtract_average_32x16_##arch, /* 32x16 */                      \
+      NULL,                              /* 32x64 (invalid CFL size) */   \
+      NULL,                              /* 64x32 (invalid CFL size) */   \
+      cfl_subtract_average_4x16_##arch,  /* 4x16 (invalid CFL size) */    \
+      cfl_subtract_average_16x4_##arch,  /* 16x4 (invalid CFL size) */    \
+      cfl_subtract_average_8x32_##arch,  /* 8x32 (invalid CFL size) */    \
+      cfl_subtract_average_32x8_##arch,  /* 32x8 (invalid CFL size) */    \
+      NULL,                              /* 16x64 (invalid CFL size) */   \
+      NULL,                              /* 64x16 (invalid CFL size) */   \
+    };                                                                    \
+    /* Modulo TX_SIZES_ALL to ensure that an attacker won't be able to */ \
+    /* index the function pointer array out of bounds. */                 \
+    return sub_avg[tx_size % TX_SIZES_ALL];                               \
+  }
+
+// For VSX SIMD optimization, the C versions of width == 4 subtract are
+// faster than the VSX. As such, the VSX code calls the C versions.
+void cfl_subtract_average_4x4_c(const uint16_t *src, int16_t *dst);
+void cfl_subtract_average_4x8_c(const uint16_t *src, int16_t *dst);
+void cfl_subtract_average_4x16_c(const uint16_t *src, int16_t *dst);
+
+#define CFL_PREDICT_lbd(arch, width, height)                              \
+  void cfl_predict_lbd_##width##x##height##_##arch(                       \
+      const int16_t *pred_buf_q3, uint8_t *dst, int dst_stride,           \
+      int alpha_q3) {                                                     \
+    cfl_predict_lbd_##arch(pred_buf_q3, dst, dst_stride, alpha_q3, width, \
+                           height);                                       \
+  }
+
+#if CONFIG_AV1_HIGHBITDEPTH
+#define CFL_PREDICT_hbd(arch, width, height)                                   \
+  void cfl_predict_hbd_##width##x##height##_##arch(                            \
+      const int16_t *pred_buf_q3, uint16_t *dst, int dst_stride, int alpha_q3, \
+      int bd) {                                                                \
+    cfl_predict_hbd_##arch(pred_buf_q3, dst, dst_stride, alpha_q3, bd, width,  \
+                           height);                                            \
+  }
+#endif
+
+// This wrapper exists because clang format does not like calling macros with
+// lowercase letters.
+#define CFL_PREDICT_X(arch, width, height, bd) \
+  CFL_PREDICT_##bd(arch, width, height)
+
+#define CFL_PREDICT_FN(arch, bd)                                            \
+  CFL_PREDICT_X(arch, 4, 4, bd)                                             \
+  CFL_PREDICT_X(arch, 4, 8, bd)                                             \
+  CFL_PREDICT_X(arch, 4, 16, bd)                                            \
+  CFL_PREDICT_X(arch, 8, 4, bd)                                             \
+  CFL_PREDICT_X(arch, 8, 8, bd)                                             \
+  CFL_PREDICT_X(arch, 8, 16, bd)                                            \
+  CFL_PREDICT_X(arch, 8, 32, bd)                                            \
+  CFL_PREDICT_X(arch, 16, 4, bd)                                            \
+  CFL_PREDICT_X(arch, 16, 8, bd)                                            \
+  CFL_PREDICT_X(arch, 16, 16, bd)                                           \
+  CFL_PREDICT_X(arch, 16, 32, bd)                                           \
+  CFL_PREDICT_X(arch, 32, 8, bd)                                            \
+  CFL_PREDICT_X(arch, 32, 16, bd)                                           \
+  CFL_PREDICT_X(arch, 32, 32, bd)                                           \
+  cfl_predict_##bd##_fn cfl_get_predict_##bd##_fn_##arch(TX_SIZE tx_size) { \
+    static const cfl_predict_##bd##_fn pred[TX_SIZES_ALL] = {               \
+      cfl_predict_##bd##_4x4_##arch,   /* 4x4 */                            \
+      cfl_predict_##bd##_8x8_##arch,   /* 8x8 */                            \
+      cfl_predict_##bd##_16x16_##arch, /* 16x16 */                          \
+      cfl_predict_##bd##_32x32_##arch, /* 32x32 */                          \
+      NULL,                            /* 64x64 (invalid CFL size) */       \
+      cfl_predict_##bd##_4x8_##arch,   /* 4x8 */                            \
+      cfl_predict_##bd##_8x4_##arch,   /* 8x4 */                            \
+      cfl_predict_##bd##_8x16_##arch,  /* 8x16 */                           \
+      cfl_predict_##bd##_16x8_##arch,  /* 16x8 */                           \
+      cfl_predict_##bd##_16x32_##arch, /* 16x32 */                          \
+      cfl_predict_##bd##_32x16_##arch, /* 32x16 */                          \
+      NULL,                            /* 32x64 (invalid CFL size) */       \
+      NULL,                            /* 64x32 (invalid CFL size) */       \
+      cfl_predict_##bd##_4x16_##arch,  /* 4x16  */                          \
+      cfl_predict_##bd##_16x4_##arch,  /* 16x4  */                          \
+      cfl_predict_##bd##_8x32_##arch,  /* 8x32  */                          \
+      cfl_predict_##bd##_32x8_##arch,  /* 32x8  */                          \
+      NULL,                            /* 16x64 (invalid CFL size) */       \
+      NULL,                            /* 64x16 (invalid CFL size) */       \
+    };                                                                      \
+    /* Modulo TX_SIZES_ALL to ensure that an attacker won't be able to */   \
+    /* index the function pointer array out of bounds. */                   \
+    return pred[tx_size % TX_SIZES_ALL];                                    \
+  }
+
+#endif  // AOM_AV1_COMMON_CFL_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/common.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/common.h
new file mode 100644
index 0000000000..9b08d59fee
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/common.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_COMMON_H_
+#define AOM_AV1_COMMON_COMMON_H_
+
+/* Interface header for common constant data structures and lookup tables */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/bitops.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PI 3.141592653589793238462643383279502884
+
+// Only need this for fixed-size arrays, for structs just assign.
+#define av1_copy(dest, src)              \
+  {                                      \
+    assert(sizeof(dest) == sizeof(src)); \
+    memcpy(dest, src, sizeof(src));      \
+  }
+
+// Use this for variably-sized arrays.
+#define av1_copy_array(dest, src, n)           \
+  {                                            \
+    assert(sizeof(*(dest)) == sizeof(*(src))); \
+    memcpy(dest, src, n * sizeof(*(src)));     \
+  }
+
+#define av1_zero(dest) memset(&(dest), 0, sizeof(dest))
+#define av1_zero_array(dest, n) memset(dest, 0, n * sizeof(*(dest)))
+
+static INLINE int get_unsigned_bits(unsigned int num_values) {
+  return num_values > 0 ? get_msb(num_values) + 1 : 0;
+}
+
+#define CHECK_MEM_ERROR(cm, lval, expr) \
+  AOM_CHECK_MEM_ERROR(&cm->error, lval, expr)
+
+#define AOM_FRAME_MARKER 0x2
+
+#define AV1_MIN_TILE_SIZE_BYTES 1
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/common_data.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/common_data.h
new file mode 100644
index 0000000000..bac09c6e9f
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/common_data.h
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_COMMON_DATA_H_
+#define AOM_AV1_COMMON_COMMON_DATA_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Log 2 conversion lookup tables in units of mode info (4x4).
+// The Mi_Width_Log2 table in the spec (Section 9.3. Conversion tables).
+static const uint8_t mi_size_wide_log2[BLOCK_SIZES_ALL] = {
+  0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 0, 2, 1, 3, 2, 4
+};
+// The Mi_Height_Log2 table in the spec (Section 9.3. Conversion tables).
+static const uint8_t mi_size_high_log2[BLOCK_SIZES_ALL] = {
+  0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4, 5, 4, 5, 2, 0, 3, 1, 4, 2
+};
+
+// Width/height lookup tables in units of mode info (4x4).
+// The Num_4x4_Blocks_Wide table in the spec (Section 9.3. Conversion tables).
+static const uint8_t mi_size_wide[BLOCK_SIZES_ALL] = {
+  1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 16, 16, 16, 32, 32, 1, 4, 2, 8, 4, 16
+};
+
+// The Num_4x4_Blocks_High table in the spec (Section 9.3. Conversion tables).
+static const uint8_t mi_size_high[BLOCK_SIZES_ALL] = {
+  1, 2, 1, 2, 4, 2, 4, 8, 4, 8, 16, 8, 16, 32, 16, 32, 4, 1, 8, 2, 16, 4
+};
+
+// Width/height lookup tables in units of samples.
+// The Block_Width table in the spec (Section 9.3. Conversion tables).
+static const uint8_t block_size_wide[BLOCK_SIZES_ALL] = {
+  4,  4,  8,  8,   8,   16, 16, 16, 32, 32, 32,
+  64, 64, 64, 128, 128, 4,  16, 8,  32, 16, 64
+};
+
+// The Block_Height table in the spec (Section 9.3. Conversion tables).
+static const uint8_t block_size_high[BLOCK_SIZES_ALL] = {
+  4,  8,  4,   8,  16,  8,  16, 32, 16, 32, 64,
+  32, 64, 128, 64, 128, 16, 4,  32, 8,  64, 16
+};
+
+// Maps a block size to a context.
+// The Size_Group table in the spec (Section 9.3. Conversion tables).
+// AOMMIN(3, AOMMIN(mi_size_wide_log2(bsize), mi_size_high_log2(bsize)))
+static const uint8_t size_group_lookup[BLOCK_SIZES_ALL] = {
+  0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 0, 0, 1, 1, 2, 2
+};
+
+static const uint8_t num_pels_log2_lookup[BLOCK_SIZES_ALL] = {
+  4, 5, 5, 6, 7, 7, 8, 9, 9, 10, 11, 11, 12, 13, 13, 14, 6, 6, 8, 8, 10, 10
+};
+
+// A compressed version of the Partition_Subsize table in the spec (9.3.
+// Conversion tables), for square block sizes only.
+/* clang-format off */
+static const BLOCK_SIZE subsize_lookup[EXT_PARTITION_TYPES][SQR_BLOCK_SIZES] = {
+  {     // PARTITION_NONE
+    BLOCK_4X4, BLOCK_8X8, BLOCK_16X16,
+    BLOCK_32X32, BLOCK_64X64, BLOCK_128X128
+  }, {  // PARTITION_HORZ
+    BLOCK_INVALID, BLOCK_8X4, BLOCK_16X8,
+    BLOCK_32X16, BLOCK_64X32, BLOCK_128X64
+  }, {  // PARTITION_VERT
+    BLOCK_INVALID, BLOCK_4X8, BLOCK_8X16,
+    BLOCK_16X32, BLOCK_32X64, BLOCK_64X128
+  }, {  // PARTITION_SPLIT
+    BLOCK_INVALID, BLOCK_4X4, BLOCK_8X8,
+    BLOCK_16X16, BLOCK_32X32, BLOCK_64X64
+  }, {  // PARTITION_HORZ_A
+    BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X8,
+    BLOCK_32X16, BLOCK_64X32, BLOCK_128X64
+  }, {  // PARTITION_HORZ_B
+    BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X8,
+    BLOCK_32X16, BLOCK_64X32, BLOCK_128X64
+  }, {  // PARTITION_VERT_A
+    BLOCK_INVALID, BLOCK_INVALID, BLOCK_8X16,
+    BLOCK_16X32, BLOCK_32X64, BLOCK_64X128
+  }, {  // PARTITION_VERT_B
+    BLOCK_INVALID, BLOCK_INVALID, BLOCK_8X16,
+    BLOCK_16X32, BLOCK_32X64, BLOCK_64X128
+  }, {  // PARTITION_HORZ_4
+    BLOCK_INVALID, BLOCK_INVALID, BLOCK_16X4,
+    BLOCK_32X8, BLOCK_64X16, BLOCK_INVALID
+  }, {  // PARTITION_VERT_4
+    BLOCK_INVALID, BLOCK_INVALID, BLOCK_4X16,
+    BLOCK_8X32, BLOCK_16X64, BLOCK_INVALID
+  }
+};
+
+static const TX_SIZE max_txsize_lookup[BLOCK_SIZES_ALL] = {
+  //                   4X4
+                       TX_4X4,
+  // 4X8,    8X4,      8X8
+  TX_4X4,    TX_4X4,   TX_8X8,
+  // 8X16,   16X8,     16X16
+  TX_8X8,    TX_8X8,   TX_16X16,
+  // 16X32,  32X16,    32X32
+  TX_16X16,  TX_16X16, TX_32X32,
+  // 32X64,  64X32,
+  TX_32X32,  TX_32X32,
+  // 64X64
+  TX_64X64,
+  // 64x128, 128x64,   128x128
+  TX_64X64,  TX_64X64, TX_64X64,
+  // 4x16,   16x4,     8x32
+  TX_4X4,    TX_4X4,   TX_8X8,
+  // 32x8,   16x64     64x16
+  TX_8X8,    TX_16X16, TX_16X16
+};
+
+static const TX_SIZE max_txsize_rect_lookup[BLOCK_SIZES_ALL] = {
+      // 4X4
+      TX_4X4,
+      // 4X8,    8X4,      8X8
+      TX_4X8,    TX_8X4,   TX_8X8,
+      // 8X16,   16X8,     16X16
+      TX_8X16,   TX_16X8,  TX_16X16,
+      // 16X32,  32X16,    32X32
+      TX_16X32,  TX_32X16, TX_32X32,
+      // 32X64,  64X32,
+      TX_32X64,  TX_64X32,
+      // 64X64
+      TX_64X64,
+      // 64x128, 128x64,   128x128
+      TX_64X64,  TX_64X64, TX_64X64,
+      // 4x16,   16x4,
+      TX_4X16,   TX_16X4,
+      // 8x32,   32x8
+      TX_8X32,   TX_32X8,
+      // 16x64,  64x16
+      TX_16X64,  TX_64X16
+};
+
+static const TX_TYPE_1D vtx_tab[TX_TYPES] = {
+  DCT_1D,      ADST_1D, DCT_1D,      ADST_1D,
+  FLIPADST_1D, DCT_1D,  FLIPADST_1D, ADST_1D, FLIPADST_1D, IDTX_1D,
+  DCT_1D,      IDTX_1D, ADST_1D,     IDTX_1D, FLIPADST_1D, IDTX_1D,
+};
+
+static const TX_TYPE_1D htx_tab[TX_TYPES] = {
+  DCT_1D,  DCT_1D,      ADST_1D,     ADST_1D,
+  DCT_1D,  FLIPADST_1D, FLIPADST_1D, FLIPADST_1D, ADST_1D, IDTX_1D,
+  IDTX_1D, DCT_1D,      IDTX_1D,     ADST_1D,     IDTX_1D, FLIPADST_1D,
+};
+
+#define TXSIZE_CAT_INVALID (-1)
+
+/* clang-format on */
+
+static const TX_SIZE sub_tx_size_map[TX_SIZES_ALL] = {
+  TX_4X4,    // TX_4X4
+  TX_4X4,    // TX_8X8
+  TX_8X8,    // TX_16X16
+  TX_16X16,  // TX_32X32
+  TX_32X32,  // TX_64X64
+  TX_4X4,    // TX_4X8
+  TX_4X4,    // TX_8X4
+  TX_8X8,    // TX_8X16
+  TX_8X8,    // TX_16X8
+  TX_16X16,  // TX_16X32
+  TX_16X16,  // TX_32X16
+  TX_32X32,  // TX_32X64
+  TX_32X32,  // TX_64X32
+  TX_4X8,    // TX_4X16
+  TX_8X4,    // TX_16X4
+  TX_8X16,   // TX_8X32
+  TX_16X8,   // TX_32X8
+  TX_16X32,  // TX_16X64
+  TX_32X16,  // TX_64X16
+};
+
+static const TX_SIZE txsize_horz_map[TX_SIZES_ALL] = {
+  TX_4X4,    // TX_4X4
+  TX_8X8,    // TX_8X8
+  TX_16X16,  // TX_16X16
+  TX_32X32,  // TX_32X32
+  TX_64X64,  // TX_64X64
+  TX_4X4,    // TX_4X8
+  TX_8X8,    // TX_8X4
+  TX_8X8,    // TX_8X16
+  TX_16X16,  // TX_16X8
+  TX_16X16,  // TX_16X32
+  TX_32X32,  // TX_32X16
+  TX_32X32,  // TX_32X64
+  TX_64X64,  // TX_64X32
+  TX_4X4,    // TX_4X16
+  TX_16X16,  // TX_16X4
+  TX_8X8,    // TX_8X32
+  TX_32X32,  // TX_32X8
+  TX_16X16,  // TX_16X64
+  TX_64X64,  // TX_64X16
+};
+
+static const TX_SIZE txsize_vert_map[TX_SIZES_ALL] = {
+  TX_4X4,    // TX_4X4
+  TX_8X8,    // TX_8X8
+  TX_16X16,  // TX_16X16
+  TX_32X32,  // TX_32X32
+  TX_64X64,  // TX_64X64
+  TX_8X8,    // TX_4X8
+  TX_4X4,    // TX_8X4
+  TX_16X16,  // TX_8X16
+  TX_8X8,    // TX_16X8
+  TX_32X32,  // TX_16X32
+  TX_16X16,  // TX_32X16
+  TX_64X64,  // TX_32X64
+  TX_32X32,  // TX_64X32
+  TX_16X16,  // TX_4X16
+  TX_4X4,    // TX_16X4
+  TX_32X32,  // TX_8X32
+  TX_8X8,    // TX_32X8
+  TX_64X64,  // TX_16X64
+  TX_16X16,  // TX_64X16
+};
+
+#define TX_SIZE_W_MIN 4
+
+// Transform block width in pixels
+static const int tx_size_wide[TX_SIZES_ALL] = {
+  4, 8, 16, 32, 64, 4, 8, 8, 16, 16, 32, 32, 64, 4, 16, 8, 32, 16, 64,
+};
+
+#define TX_SIZE_H_MIN 4
+
+// Transform block height in pixels
+static const int tx_size_high[TX_SIZES_ALL] = {
+  4, 8, 16, 32, 64, 8, 4, 16, 8, 32, 16, 64, 32, 16, 4, 32, 8, 64, 16,
+};
+
+// Transform block width in unit
+static const int tx_size_wide_unit[TX_SIZES_ALL] = {
+  1, 2, 4, 8, 16, 1, 2, 2, 4, 4, 8, 8, 16, 1, 4, 2, 8, 4, 16,
+};
+
+// Transform block height in unit
+static const int tx_size_high_unit[TX_SIZES_ALL] = {
+  1, 2, 4, 8, 16, 2, 1, 4, 2, 8, 4, 16, 8, 4, 1, 8, 2, 16, 4,
+};
+
+// Transform block width in log2
+static const int tx_size_wide_log2[TX_SIZES_ALL] = {
+  2, 3, 4, 5, 6, 2, 3, 3, 4, 4, 5, 5, 6, 2, 4, 3, 5, 4, 6,
+};
+
+// Transform block height in log2
+static const int tx_size_high_log2[TX_SIZES_ALL] = {
+  2, 3, 4, 5, 6, 3, 2, 4, 3, 5, 4, 6, 5, 4, 2, 5, 3, 6, 4,
+};
+
+static const int tx_size_2d[TX_SIZES_ALL + 1] = {
+  16,  64,   256,  1024, 4096, 32,  32,  128,  128,  512,
+  512, 2048, 2048, 64,   64,   256, 256, 1024, 1024,
+};
+
+static const BLOCK_SIZE txsize_to_bsize[TX_SIZES_ALL] = {
+  BLOCK_4X4,    // TX_4X4
+  BLOCK_8X8,    // TX_8X8
+  BLOCK_16X16,  // TX_16X16
+  BLOCK_32X32,  // TX_32X32
+  BLOCK_64X64,  // TX_64X64
+  BLOCK_4X8,    // TX_4X8
+  BLOCK_8X4,    // TX_8X4
+  BLOCK_8X16,   // TX_8X16
+  BLOCK_16X8,   // TX_16X8
+  BLOCK_16X32,  // TX_16X32
+  BLOCK_32X16,  // TX_32X16
+  BLOCK_32X64,  // TX_32X64
+  BLOCK_64X32,  // TX_64X32
+  BLOCK_4X16,   // TX_4X16
+  BLOCK_16X4,   // TX_16X4
+  BLOCK_8X32,   // TX_8X32
+  BLOCK_32X8,   // TX_32X8
+  BLOCK_16X64,  // TX_16X64
+  BLOCK_64X16,  // TX_64X16
+};
+
+static const TX_SIZE txsize_sqr_map[TX_SIZES_ALL] = {
+  TX_4X4,    // TX_4X4
+  TX_8X8,    // TX_8X8
+  TX_16X16,  // TX_16X16
+  TX_32X32,  // TX_32X32
+  TX_64X64,  // TX_64X64
+  TX_4X4,    // TX_4X8
+  TX_4X4,    // TX_8X4
+  TX_8X8,    // TX_8X16
+  TX_8X8,    // TX_16X8
+  TX_16X16,  // TX_16X32
+  TX_16X16,  // TX_32X16
+  TX_32X32,  // TX_32X64
+  TX_32X32,  // TX_64X32
+  TX_4X4,    // TX_4X16
+  TX_4X4,    // TX_16X4
+  TX_8X8,    // TX_8X32
+  TX_8X8,    // TX_32X8
+  TX_16X16,  // TX_16X64
+  TX_16X16,  // TX_64X16
+};
+
+static const TX_SIZE txsize_sqr_up_map[TX_SIZES_ALL] = {
+  TX_4X4,    // TX_4X4
+  TX_8X8,    // TX_8X8
+  TX_16X16,  // TX_16X16
+  TX_32X32,  // TX_32X32
+  TX_64X64,  // TX_64X64
+  TX_8X8,    // TX_4X8
+  TX_8X8,    // TX_8X4
+  TX_16X16,  // TX_8X16
+  TX_16X16,  // TX_16X8
+  TX_32X32,  // TX_16X32
+  TX_32X32,  // TX_32X16
+  TX_64X64,  // TX_32X64
+  TX_64X64,  // TX_64X32
+  TX_16X16,  // TX_4X16
+  TX_16X16,  // TX_16X4
+  TX_32X32,  // TX_8X32
+  TX_32X32,  // TX_32X8
+  TX_64X64,  // TX_16X64
+  TX_64X64,  // TX_64X16
+};
+
+static const int8_t txsize_log2_minus4[TX_SIZES_ALL] = {
+  0,  // TX_4X4
+  2,  // TX_8X8
+  4,  // TX_16X16
+  6,  // TX_32X32
+  6,  // TX_64X64
+  1,  // TX_4X8
+  1,  // TX_8X4
+  3,  // TX_8X16
+  3,  // TX_16X8
+  5,  // TX_16X32
+  5,  // TX_32X16
+  6,  // TX_32X64
+  6,  // TX_64X32
+  2,  // TX_4X16
+  2,  // TX_16X4
+  4,  // TX_8X32
+  4,  // TX_32X8
+  5,  // TX_16X64
+  5,  // TX_64X16
+};
+
+/* clang-format off */
+static const TX_SIZE tx_mode_to_biggest_tx_size[TX_MODES] = {
+  TX_4X4,    // ONLY_4X4
+  TX_64X64,  // TX_MODE_LARGEST
+  TX_64X64,  // TX_MODE_SELECT
+};
+
+// The Subsampled_Size table in the spec (Section 5.11.38. Get plane residual
+// size function).
+static const BLOCK_SIZE ss_size_lookup[BLOCK_SIZES_ALL][2][2] = {
+  //  ss_x == 0      ss_x == 0          ss_x == 1      ss_x == 1
+  //  ss_y == 0      ss_y == 1          ss_y == 0      ss_y == 1
+  { { BLOCK_4X4,     BLOCK_4X4 },     { BLOCK_4X4,     BLOCK_4X4 } },
+  { { BLOCK_4X8,     BLOCK_4X4 },     { BLOCK_INVALID, BLOCK_4X4 } },
+  { { BLOCK_8X4,     BLOCK_INVALID }, { BLOCK_4X4,     BLOCK_4X4 } },
+  { { BLOCK_8X8,     BLOCK_8X4 },     { BLOCK_4X8,     BLOCK_4X4 } },
+  { { BLOCK_8X16,    BLOCK_8X8 },     { BLOCK_INVALID, BLOCK_4X8 } },
+  { { BLOCK_16X8,    BLOCK_INVALID }, { BLOCK_8X8,     BLOCK_8X4 } },
+  { { BLOCK_16X16,   BLOCK_16X8 },    { BLOCK_8X16,    BLOCK_8X8 } },
+  { { BLOCK_16X32,   BLOCK_16X16 },   { BLOCK_INVALID, BLOCK_8X16 } },
+  { { BLOCK_32X16,   BLOCK_INVALID }, { BLOCK_16X16,   BLOCK_16X8 } },
+  { { BLOCK_32X32,   BLOCK_32X16 },   { BLOCK_16X32,   BLOCK_16X16 } },
+  { { BLOCK_32X64,   BLOCK_32X32 },   { BLOCK_INVALID, BLOCK_16X32 } },
+  { { BLOCK_64X32,   BLOCK_INVALID }, { BLOCK_32X32,   BLOCK_32X16 } },
+  { { BLOCK_64X64,   BLOCK_64X32 },   { BLOCK_32X64,   BLOCK_32X32 } },
+  { { BLOCK_64X128,  BLOCK_64X64 },   { BLOCK_INVALID, BLOCK_32X64 } },
+  { { BLOCK_128X64,  BLOCK_INVALID }, { BLOCK_64X64,   BLOCK_64X32 } },
+  { { BLOCK_128X128, BLOCK_128X64 },  { BLOCK_64X128,  BLOCK_64X64 } },
+  { { BLOCK_4X16,    BLOCK_4X8 },     { BLOCK_INVALID, BLOCK_4X8 } },
+  { { BLOCK_16X4,    BLOCK_INVALID }, { BLOCK_8X4,     BLOCK_8X4 } },
+  { { BLOCK_8X32,    BLOCK_8X16 },    { BLOCK_INVALID, BLOCK_4X16 } },
+  { { BLOCK_32X8,    BLOCK_INVALID }, { BLOCK_16X8,    BLOCK_16X4 } },
+  { { BLOCK_16X64,   BLOCK_16X32 },   { BLOCK_INVALID, BLOCK_8X32 } },
+  { { BLOCK_64X16,   BLOCK_INVALID }, { BLOCK_32X16,   BLOCK_32X8 } }
+};
+/* clang-format on */
+
+// Generates 5 bit field in which each bit set to 1 represents
+// a blocksize partition  11111 means we split 128x128, 64x64, 32x32, 16x16
+// and 8x8.  10000 means we just split the 128x128 to 64x64
+/* clang-format off */
+static const struct {
+  PARTITION_CONTEXT above;
+  PARTITION_CONTEXT left;
+} partition_context_lookup[BLOCK_SIZES_ALL] = {
+  { 31, 31 },  // 4X4   - {0b11111, 0b11111}
+  { 31, 30 },  // 4X8   - {0b11111, 0b11110}
+  { 30, 31 },  // 8X4   - {0b11110, 0b11111}
+  { 30, 30 },  // 8X8   - {0b11110, 0b11110}
+  { 30, 28 },  // 8X16  - {0b11110, 0b11100}
+  { 28, 30 },  // 16X8  - {0b11100, 0b11110}
+  { 28, 28 },  // 16X16 - {0b11100, 0b11100}
+  { 28, 24 },  // 16X32 - {0b11100, 0b11000}
+  { 24, 28 },  // 32X16 - {0b11000, 0b11100}
+  { 24, 24 },  // 32X32 - {0b11000, 0b11000}
+  { 24, 16 },  // 32X64 - {0b11000, 0b10000}
+  { 16, 24 },  // 64X32 - {0b10000, 0b11000}
+  { 16, 16 },  // 64X64 - {0b10000, 0b10000}
+  { 16, 0 },   // 64X128- {0b10000, 0b00000}
+  { 0, 16 },   // 128X64- {0b00000, 0b10000}
+  { 0, 0 },    // 128X128-{0b00000, 0b00000}
+  { 31, 28 },  // 4X16  - {0b11111, 0b11100}
+  { 28, 31 },  // 16X4  - {0b11100, 0b11111}
+  { 30, 24 },  // 8X32  - {0b11110, 0b11000}
+  { 24, 30 },  // 32X8  - {0b11000, 0b11110}
+  { 28, 16 },  // 16X64 - {0b11100, 0b10000}
+  { 16, 28 },  // 64X16 - {0b10000, 0b11100}
+};
+/* clang-format on */
+
+static const int intra_mode_context[INTRA_MODES] = {
+  0, 1, 2, 3, 4, 4, 4, 4, 3, 0, 1, 2, 0,
+};
+
+// Note: this is also used in unit tests. So whenever one changes the table,
+// the unit tests need to be changed accordingly.
+static const int quant_dist_weight[4][2] = {
+  { 2, 3 }, { 2, 5 }, { 2, 7 }, { 1, MAX_FRAME_DISTANCE }
+};
+static const int quant_dist_lookup_table[2][4][2] = {
+  { { 9, 7 }, { 11, 5 }, { 12, 4 }, { 13, 3 } },
+  { { 7, 9 }, { 5, 11 }, { 4, 12 }, { 3, 13 } },
+};
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_COMMON_DATA_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.c
new file mode 100644
index 0000000000..0e77e06955
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.c
@@ -0,0 +1,1292 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/resize.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+void av1_convolve_horiz_rs_c(const uint8_t *src, int src_stride, uint8_t *dst,
+                             int dst_stride, int w, int h,
+                             const int16_t *x_filters, int x0_qn,
+                             int x_step_qn) {
+  src -= UPSCALE_NORMATIVE_TAPS / 2 - 1;
+  for (int y = 0; y < h; ++y) {
+    int x_qn = x0_qn;
+    for (int x = 0; x < w; ++x) {
+      const uint8_t *const src_x = &src[x_qn >> RS_SCALE_SUBPEL_BITS];
+      const int x_filter_idx =
+          (x_qn & RS_SCALE_SUBPEL_MASK) >> RS_SCALE_EXTRA_BITS;
+      assert(x_filter_idx <= RS_SUBPEL_MASK);
+      const int16_t *const x_filter =
+          &x_filters[x_filter_idx * UPSCALE_NORMATIVE_TAPS];
+      int sum = 0;
+      for (int k = 0; k < UPSCALE_NORMATIVE_TAPS; ++k)
+        sum += src_x[k] * x_filter[k];
+      dst[x] = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
+      x_qn += x_step_qn;
+    }
+    src += src_stride;
+    dst += dst_stride;
+  }
+}
+
+void av1_highbd_convolve_horiz_rs_c(const uint16_t *src, int src_stride,
+                                    uint16_t *dst, int dst_stride, int w, int h,
+                                    const int16_t *x_filters, int x0_qn,
+                                    int x_step_qn, int bd) {
+  src -= UPSCALE_NORMATIVE_TAPS / 2 - 1;
+  for (int y = 0; y < h; ++y) {
+    int x_qn = x0_qn;
+    for (int x = 0; x < w; ++x) {
+      const uint16_t *const src_x = &src[x_qn >> RS_SCALE_SUBPEL_BITS];
+      const int x_filter_idx =
+          (x_qn & RS_SCALE_SUBPEL_MASK) >> RS_SCALE_EXTRA_BITS;
+      assert(x_filter_idx <= RS_SUBPEL_MASK);
+      const int16_t *const x_filter =
+          &x_filters[x_filter_idx * UPSCALE_NORMATIVE_TAPS];
+      int sum = 0;
+      for (int k = 0; k < UPSCALE_NORMATIVE_TAPS; ++k)
+        sum += src_x[k] * x_filter[k];
+      dst[x] = clip_pixel_highbd(ROUND_POWER_OF_TWO(sum, FILTER_BITS), bd);
+      x_qn += x_step_qn;
+    }
+    src += src_stride;
+    dst += dst_stride;
+  }
+}
+
+void av1_convolve_2d_sobel_y_c(const uint8_t *src, int src_stride, double *dst,
+                               int dst_stride, int w, int h, int dir,
+                               double norm) {
+  int16_t im_block[(MAX_SB_SIZE + MAX_FILTER_TAP - 1) * MAX_SB_SIZE];
+  DECLARE_ALIGNED(256, static const int16_t, sobel_a[3]) = { 1, 0, -1 };
+  DECLARE_ALIGNED(256, static const int16_t, sobel_b[3]) = { 1, 2, 1 };
+  const int taps = 3;
+  int im_h = h + taps - 1;
+  int im_stride = w;
+  const int fo_vert = 1;
+  const int fo_horiz = 1;
+
+  // horizontal filter
+  const uint8_t *src_horiz = src - fo_vert * src_stride;
+  const int16_t *x_filter = dir ? sobel_a : sobel_b;
+  for (int y = 0; y < im_h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int16_t sum = 0;
+      for (int k = 0; k < taps; ++k) {
+        sum += x_filter[k] * src_horiz[y * src_stride + x - fo_horiz + k];
+      }
+      im_block[y * im_stride + x] = sum;
+    }
+  }
+
+  // vertical filter
+  int16_t *src_vert = im_block + fo_vert * im_stride;
+  const int16_t *y_filter = dir ? sobel_b : sobel_a;
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int16_t sum = 0;
+      for (int k = 0; k < taps; ++k) {
+        sum += y_filter[k] * src_vert[(y - fo_vert + k) * im_stride + x];
+      }
+      dst[y * dst_stride + x] = sum * norm;
+    }
+  }
+}
+
+void av1_convolve_2d_sr_c(const uint8_t *src, int src_stride, uint8_t *dst,
+                          int dst_stride, int w, int h,
+                          const InterpFilterParams *filter_params_x,
+                          const InterpFilterParams *filter_params_y,
+                          const int subpel_x_qn, const int subpel_y_qn,
+                          ConvolveParams *conv_params) {
+  int16_t im_block[(MAX_SB_SIZE + MAX_FILTER_TAP - 1) * MAX_SB_SIZE];
+  int im_h = h + filter_params_y->taps - 1;
+  int im_stride = w;
+  assert(w <= MAX_SB_SIZE && h <= MAX_SB_SIZE);
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int bd = 8;
+  const int bits =
+      FILTER_BITS * 2 - conv_params->round_0 - conv_params->round_1;
+
+  // horizontal filter
+  const uint8_t *src_horiz = src - fo_vert * src_stride;
+  const int16_t *x_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_x, subpel_x_qn & SUBPEL_MASK);
+  for (int y = 0; y < im_h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t sum = (1 << (bd + FILTER_BITS - 1));
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        sum += x_filter[k] * src_horiz[y * src_stride + x - fo_horiz + k];
+      }
+      assert(0 <= sum && sum < (1 << (bd + FILTER_BITS + 1)));
+      im_block[y * im_stride + x] =
+          (int16_t)ROUND_POWER_OF_TWO(sum, conv_params->round_0);
+    }
+  }
+
+  // vertical filter
+  int16_t *src_vert = im_block + fo_vert * im_stride;
+  const int16_t *y_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_y, subpel_y_qn & SUBPEL_MASK);
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t sum = 1 << offset_bits;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        sum += y_filter[k] * src_vert[(y - fo_vert + k) * im_stride + x];
+      }
+      assert(0 <= sum && sum < (1 << (offset_bits + 2)));
+      int16_t res = ROUND_POWER_OF_TWO(sum, conv_params->round_1) -
+                    ((1 << (offset_bits - conv_params->round_1)) +
+                     (1 << (offset_bits - conv_params->round_1 - 1)));
+      dst[y * dst_stride + x] = clip_pixel(ROUND_POWER_OF_TWO(res, bits));
+    }
+  }
+}
+
+void av1_convolve_y_sr_c(const uint8_t *src, int src_stride, uint8_t *dst,
+                         int dst_stride, int w, int h,
+                         const InterpFilterParams *filter_params_y,
+                         const int subpel_y_qn) {
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+
+  // vertical filter
+  const int16_t *y_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_y, subpel_y_qn & SUBPEL_MASK);
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t res = 0;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        res += y_filter[k] * src[(y - fo_vert + k) * src_stride + x];
+      }
+      dst[y * dst_stride + x] =
+          clip_pixel(ROUND_POWER_OF_TWO(res, FILTER_BITS));
+    }
+  }
+}
+
+void av1_convolve_x_sr_c(const uint8_t *src, int src_stride, uint8_t *dst,
+                         int dst_stride, int w, int h,
+                         const InterpFilterParams *filter_params_x,
+                         const int subpel_x_qn, ConvolveParams *conv_params) {
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int bits = FILTER_BITS - conv_params->round_0;
+
+  assert(bits >= 0);
+  assert((FILTER_BITS - conv_params->round_1) >= 0 ||
+         ((conv_params->round_0 + conv_params->round_1) == 2 * FILTER_BITS));
+
+  // horizontal filter
+  const int16_t *x_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_x, subpel_x_qn & SUBPEL_MASK);
+
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t res = 0;
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        res += x_filter[k] * src[y * src_stride + x - fo_horiz + k];
+      }
+      res = ROUND_POWER_OF_TWO(res, conv_params->round_0);
+      dst[y * dst_stride + x] = clip_pixel(ROUND_POWER_OF_TWO(res, bits));
+    }
+  }
+}
+
+void av1_dist_wtd_convolve_2d_c(const uint8_t *src, int src_stride,
+                                uint8_t *dst, int dst_stride, int w, int h,
+                                const InterpFilterParams *filter_params_x,
+                                const InterpFilterParams *filter_params_y,
+                                const int subpel_x_qn, const int subpel_y_qn,
+                                ConvolveParams *conv_params) {
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  int dst16_stride = conv_params->dst_stride;
+  int16_t im_block[(MAX_SB_SIZE + MAX_FILTER_TAP - 1) * MAX_SB_SIZE];
+  int im_h = h + filter_params_y->taps - 1;
+  int im_stride = w;
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int bd = 8;
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+
+  // horizontal filter
+  const uint8_t *src_horiz = src - fo_vert * src_stride;
+  const int16_t *x_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_x, subpel_x_qn & SUBPEL_MASK);
+  for (int y = 0; y < im_h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t sum = (1 << (bd + FILTER_BITS - 1));
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        sum += x_filter[k] * src_horiz[y * src_stride + x - fo_horiz + k];
+      }
+      assert(0 <= sum && sum < (1 << (bd + FILTER_BITS + 1)));
+      im_block[y * im_stride + x] =
+          (int16_t)ROUND_POWER_OF_TWO(sum, conv_params->round_0);
+    }
+  }
+
+  // vertical filter
+  int16_t *src_vert = im_block + fo_vert * im_stride;
+  const int16_t *y_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_y, subpel_y_qn & SUBPEL_MASK);
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t sum = 1 << offset_bits;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        sum += y_filter[k] * src_vert[(y - fo_vert + k) * im_stride + x];
+      }
+      assert(0 <= sum && sum < (1 << (offset_bits + 2)));
+      CONV_BUF_TYPE res = ROUND_POWER_OF_TWO(sum, conv_params->round_1);
+      if (conv_params->do_average) {
+        int32_t tmp = dst16[y * dst16_stride + x];
+        if (conv_params->use_dist_wtd_comp_avg) {
+          tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+          tmp = tmp >> DIST_PRECISION_BITS;
+        } else {
+          tmp += res;
+          tmp = tmp >> 1;
+        }
+        tmp -= (1 << (offset_bits - conv_params->round_1)) +
+               (1 << (offset_bits - conv_params->round_1 - 1));
+        dst[y * dst_stride + x] =
+            clip_pixel(ROUND_POWER_OF_TWO(tmp, round_bits));
+      } else {
+        dst16[y * dst16_stride + x] = res;
+      }
+    }
+  }
+}
+
+void av1_dist_wtd_convolve_y_c(const uint8_t *src, int src_stride, uint8_t *dst,
+                               int dst_stride, int w, int h,
+                               const InterpFilterParams *filter_params_y,
+                               const int subpel_y_qn,
+                               ConvolveParams *conv_params) {
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  int dst16_stride = conv_params->dst_stride;
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  const int bits = FILTER_BITS - conv_params->round_0;
+  const int bd = 8;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int round_offset = (1 << (offset_bits - conv_params->round_1)) +
+                           (1 << (offset_bits - conv_params->round_1 - 1));
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+
+  // vertical filter
+  const int16_t *y_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_y, subpel_y_qn & SUBPEL_MASK);
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t res = 0;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        res += y_filter[k] * src[(y - fo_vert + k) * src_stride + x];
+      }
+      res *= (1 << bits);
+      res = ROUND_POWER_OF_TWO(res, conv_params->round_1) + round_offset;
+
+      if (conv_params->do_average) {
+        int32_t tmp = dst16[y * dst16_stride + x];
+        if (conv_params->use_dist_wtd_comp_avg) {
+          tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+          tmp = tmp >> DIST_PRECISION_BITS;
+        } else {
+          tmp += res;
+          tmp = tmp >> 1;
+        }
+        tmp -= round_offset;
+        dst[y * dst_stride + x] =
+            clip_pixel(ROUND_POWER_OF_TWO(tmp, round_bits));
+      } else {
+        dst16[y * dst16_stride + x] = res;
+      }
+    }
+  }
+}
+
+void av1_dist_wtd_convolve_x_c(const uint8_t *src, int src_stride, uint8_t *dst,
+                               int dst_stride, int w, int h,
+                               const InterpFilterParams *filter_params_x,
+                               const int subpel_x_qn,
+                               ConvolveParams *conv_params) {
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  int dst16_stride = conv_params->dst_stride;
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int bits = FILTER_BITS - conv_params->round_1;
+  const int bd = 8;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int round_offset = (1 << (offset_bits - conv_params->round_1)) +
+                           (1 << (offset_bits - conv_params->round_1 - 1));
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+
+  // horizontal filter
+  const int16_t *x_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_x, subpel_x_qn & SUBPEL_MASK);
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t res = 0;
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        res += x_filter[k] * src[y * src_stride + x - fo_horiz + k];
+      }
+      res = (1 << bits) * ROUND_POWER_OF_TWO(res, conv_params->round_0);
+      res += round_offset;
+
+      if (conv_params->do_average) {
+        int32_t tmp = dst16[y * dst16_stride + x];
+        if (conv_params->use_dist_wtd_comp_avg) {
+          tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+          tmp = tmp >> DIST_PRECISION_BITS;
+        } else {
+          tmp += res;
+          tmp = tmp >> 1;
+        }
+        tmp -= round_offset;
+        dst[y * dst_stride + x] =
+            clip_pixel(ROUND_POWER_OF_TWO(tmp, round_bits));
+      } else {
+        dst16[y * dst16_stride + x] = res;
+      }
+    }
+  }
+}
+
+void av1_dist_wtd_convolve_2d_copy_c(const uint8_t *src, int src_stride,
+                                     uint8_t *dst, int dst_stride, int w, int h,
+                                     ConvolveParams *conv_params) {
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  int dst16_stride = conv_params->dst_stride;
+  const int bits =
+      FILTER_BITS * 2 - conv_params->round_1 - conv_params->round_0;
+  const int bd = 8;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int round_offset = (1 << (offset_bits - conv_params->round_1)) +
+                           (1 << (offset_bits - conv_params->round_1 - 1));
+
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      CONV_BUF_TYPE res = src[y * src_stride + x] << bits;
+      res += round_offset;
+
+      if (conv_params->do_average) {
+        int32_t tmp = dst16[y * dst16_stride + x];
+        if (conv_params->use_dist_wtd_comp_avg) {
+          tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+          tmp = tmp >> DIST_PRECISION_BITS;
+        } else {
+          tmp += res;
+          tmp = tmp >> 1;
+        }
+        tmp -= round_offset;
+        dst[y * dst_stride + x] = clip_pixel(ROUND_POWER_OF_TWO(tmp, bits));
+      } else {
+        dst16[y * dst16_stride + x] = res;
+      }
+    }
+  }
+}
+
+void av1_convolve_2d_scale_c(const uint8_t *src, int src_stride, uint8_t *dst,
+                             int dst_stride, int w, int h,
+                             const InterpFilterParams *filter_params_x,
+                             const InterpFilterParams *filter_params_y,
+                             const int subpel_x_qn, const int x_step_qn,
+                             const int subpel_y_qn, const int y_step_qn,
+                             ConvolveParams *conv_params) {
+  int16_t im_block[(2 * MAX_SB_SIZE + MAX_FILTER_TAP) * MAX_SB_SIZE];
+  int im_h = (((h - 1) * y_step_qn + subpel_y_qn) >> SCALE_SUBPEL_BITS) +
+             filter_params_y->taps;
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  const int dst16_stride = conv_params->dst_stride;
+  const int bits =
+      FILTER_BITS * 2 - conv_params->round_0 - conv_params->round_1;
+  assert(bits >= 0);
+  int im_stride = w;
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int bd = 8;
+
+  // horizontal filter
+  const uint8_t *src_horiz = src - fo_vert * src_stride;
+  for (int y = 0; y < im_h; ++y) {
+    int x_qn = subpel_x_qn;
+    for (int x = 0; x < w; ++x, x_qn += x_step_qn) {
+      const uint8_t *const src_x = &src_horiz[(x_qn >> SCALE_SUBPEL_BITS)];
+      const int x_filter_idx = (x_qn & SCALE_SUBPEL_MASK) >> SCALE_EXTRA_BITS;
+      assert(x_filter_idx < SUBPEL_SHIFTS);
+      const int16_t *x_filter =
+          av1_get_interp_filter_subpel_kernel(filter_params_x, x_filter_idx);
+      int32_t sum = (1 << (bd + FILTER_BITS - 1));
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        sum += x_filter[k] * src_x[k - fo_horiz];
+      }
+      assert(0 <= sum && sum < (1 << (bd + FILTER_BITS + 1)));
+      im_block[y * im_stride + x] =
+          (int16_t)ROUND_POWER_OF_TWO(sum, conv_params->round_0);
+    }
+    src_horiz += src_stride;
+  }
+
+  // vertical filter
+  int16_t *src_vert = im_block + fo_vert * im_stride;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  for (int x = 0; x < w; ++x) {
+    int y_qn = subpel_y_qn;
+    for (int y = 0; y < h; ++y, y_qn += y_step_qn) {
+      const int16_t *src_y = &src_vert[(y_qn >> SCALE_SUBPEL_BITS) * im_stride];
+      const int y_filter_idx = (y_qn & SCALE_SUBPEL_MASK) >> SCALE_EXTRA_BITS;
+      assert(y_filter_idx < SUBPEL_SHIFTS);
+      const int16_t *y_filter =
+          av1_get_interp_filter_subpel_kernel(filter_params_y, y_filter_idx);
+      int32_t sum = 1 << offset_bits;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        sum += y_filter[k] * src_y[(k - fo_vert) * im_stride];
+      }
+      assert(0 <= sum && sum < (1 << (offset_bits + 2)));
+      CONV_BUF_TYPE res = ROUND_POWER_OF_TWO(sum, conv_params->round_1);
+      if (conv_params->is_compound) {
+        if (conv_params->do_average) {
+          int32_t tmp = dst16[y * dst16_stride + x];
+          if (conv_params->use_dist_wtd_comp_avg) {
+            tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+            tmp = tmp >> DIST_PRECISION_BITS;
+          } else {
+            tmp += res;
+            tmp = tmp >> 1;
+          }
+          /* Subtract round offset and convolve round */
+          tmp = tmp - ((1 << (offset_bits - conv_params->round_1)) +
+                       (1 << (offset_bits - conv_params->round_1 - 1)));
+          dst[y * dst_stride + x] = clip_pixel(ROUND_POWER_OF_TWO(tmp, bits));
+        } else {
+          dst16[y * dst16_stride + x] = res;
+        }
+      } else {
+        /* Subtract round offset and convolve round */
+        int32_t tmp = res - ((1 << (offset_bits - conv_params->round_1)) +
+                             (1 << (offset_bits - conv_params->round_1 - 1)));
+        dst[y * dst_stride + x] = clip_pixel(ROUND_POWER_OF_TWO(tmp, bits));
+      }
+    }
+    src_vert++;
+  }
+}
+
+static void convolve_2d_scale_wrapper(
+    const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w,
+    int h, const InterpFilterParams *filter_params_x,
+    const InterpFilterParams *filter_params_y, const int subpel_x_qn,
+    const int x_step_qn, const int subpel_y_qn, const int y_step_qn,
+    ConvolveParams *conv_params) {
+  if (conv_params->is_compound) {
+    assert(conv_params->dst != NULL);
+  }
+  av1_convolve_2d_scale(src, src_stride, dst, dst_stride, w, h, filter_params_x,
+                        filter_params_y, subpel_x_qn, x_step_qn, subpel_y_qn,
+                        y_step_qn, conv_params);
+}
+
+static void convolve_2d_facade_compound(
+    const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w,
+    int h, const InterpFilterParams *filter_params_x,
+    const InterpFilterParams *filter_params_y, const int subpel_x_qn,
+    const int subpel_y_qn, ConvolveParams *conv_params) {
+  const bool need_x = subpel_x_qn != 0;
+  const bool need_y = subpel_y_qn != 0;
+  if (!need_x && !need_y) {
+    av1_dist_wtd_convolve_2d_copy(src, src_stride, dst, dst_stride, w, h,
+                                  conv_params);
+  } else if (need_x && !need_y) {
+    av1_dist_wtd_convolve_x(src, src_stride, dst, dst_stride, w, h,
+                            filter_params_x, subpel_x_qn, conv_params);
+  } else if (!need_x && need_y) {
+    av1_dist_wtd_convolve_y(src, src_stride, dst, dst_stride, w, h,
+                            filter_params_y, subpel_y_qn, conv_params);
+  } else {
+    assert(need_y && need_x);
+    av1_dist_wtd_convolve_2d(src, src_stride, dst, dst_stride, w, h,
+                             filter_params_x, filter_params_y, subpel_x_qn,
+                             subpel_y_qn, conv_params);
+  }
+}
+
+static void convolve_2d_facade_single(
+    const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w,
+    int h, const InterpFilterParams *filter_params_x,
+    const InterpFilterParams *filter_params_y, const int subpel_x_qn,
+    const int subpel_y_qn, ConvolveParams *conv_params) {
+  const bool need_x = subpel_x_qn != 0;
+  const bool need_y = subpel_y_qn != 0;
+  if (!need_x && !need_y) {
+    aom_convolve_copy(src, src_stride, dst, dst_stride, w, h);
+  } else if (need_x && !need_y) {
+    av1_convolve_x_sr(src, src_stride, dst, dst_stride, w, h, filter_params_x,
+                      subpel_x_qn, conv_params);
+  } else if (!need_x && need_y) {
+    av1_convolve_y_sr(src, src_stride, dst, dst_stride, w, h, filter_params_y,
+                      subpel_y_qn);
+  } else {
+    assert(need_x && need_y);
+    av1_convolve_2d_sr(src, src_stride, dst, dst_stride, w, h, filter_params_x,
+                       filter_params_y, subpel_x_qn, subpel_y_qn, conv_params);
+  }
+}
+
+void av1_convolve_2d_facade(const uint8_t *src, int src_stride, uint8_t *dst,
+                            int dst_stride, int w, int h,
+                            const InterpFilterParams *interp_filters[2],
+                            const int subpel_x_qn, int x_step_q4,
+                            const int subpel_y_qn, int y_step_q4, int scaled,
+                            ConvolveParams *conv_params) {
+  (void)x_step_q4;
+  (void)y_step_q4;
+  (void)dst;
+  (void)dst_stride;
+
+  const InterpFilterParams *filter_params_x = interp_filters[0];
+  const InterpFilterParams *filter_params_y = interp_filters[1];
+
+  // TODO(jingning, yunqing): Add SIMD support to 2-tap filter case.
+  // Do we have SIMD support to 4-tap case?
+  // 2-tap filter indicates that it is for IntraBC.
+  if (filter_params_x->taps == 2 || filter_params_y->taps == 2) {
+    assert(filter_params_x->taps == 2 && filter_params_y->taps == 2);
+    assert(!scaled);
+    if (subpel_x_qn && subpel_y_qn) {
+      av1_convolve_2d_sr_c(src, src_stride, dst, dst_stride, w, h,
+                           filter_params_x, filter_params_y, subpel_x_qn,
+                           subpel_y_qn, conv_params);
+      return;
+    } else if (subpel_x_qn) {
+      av1_convolve_x_sr_c(src, src_stride, dst, dst_stride, w, h,
+                          filter_params_x, subpel_x_qn, conv_params);
+      return;
+    } else if (subpel_y_qn) {
+      av1_convolve_y_sr_c(src, src_stride, dst, dst_stride, w, h,
+                          filter_params_y, subpel_y_qn);
+      return;
+    }
+  }
+
+  if (scaled) {
+    convolve_2d_scale_wrapper(src, src_stride, dst, dst_stride, w, h,
+                              filter_params_x, filter_params_y, subpel_x_qn,
+                              x_step_q4, subpel_y_qn, y_step_q4, conv_params);
+  } else if (conv_params->is_compound) {
+    convolve_2d_facade_compound(src, src_stride, dst, dst_stride, w, h,
+                                filter_params_x, filter_params_y, subpel_x_qn,
+                                subpel_y_qn, conv_params);
+  } else {
+    convolve_2d_facade_single(src, src_stride, dst, dst_stride, w, h,
+                              filter_params_x, filter_params_y, subpel_x_qn,
+                              subpel_y_qn, conv_params);
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+void av1_highbd_convolve_x_sr_c(const uint16_t *src, int src_stride,
+                                uint16_t *dst, int dst_stride, int w, int h,
+                                const InterpFilterParams *filter_params_x,
+                                const int subpel_x_qn,
+                                ConvolveParams *conv_params, int bd) {
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int bits = FILTER_BITS - conv_params->round_0;
+
+  assert(bits >= 0);
+  assert((FILTER_BITS - conv_params->round_1) >= 0 ||
+         ((conv_params->round_0 + conv_params->round_1) == 2 * FILTER_BITS));
+
+  // horizontal filter
+  const int16_t *x_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_x, subpel_x_qn & SUBPEL_MASK);
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t res = 0;
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        res += x_filter[k] * src[y * src_stride + x - fo_horiz + k];
+      }
+      res = ROUND_POWER_OF_TWO(res, conv_params->round_0);
+      dst[y * dst_stride + x] =
+          clip_pixel_highbd(ROUND_POWER_OF_TWO(res, bits), bd);
+    }
+  }
+}
+
+void av1_highbd_convolve_y_sr_c(const uint16_t *src, int src_stride,
+                                uint16_t *dst, int dst_stride, int w, int h,
+                                const InterpFilterParams *filter_params_y,
+                                const int subpel_y_qn, int bd) {
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  // vertical filter
+  const int16_t *y_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_y, subpel_y_qn & SUBPEL_MASK);
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t res = 0;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        res += y_filter[k] * src[(y - fo_vert + k) * src_stride + x];
+      }
+      dst[y * dst_stride + x] =
+          clip_pixel_highbd(ROUND_POWER_OF_TWO(res, FILTER_BITS), bd);
+    }
+  }
+}
+
+void av1_highbd_convolve_2d_sr_c(const uint16_t *src, int src_stride,
+                                 uint16_t *dst, int dst_stride, int w, int h,
+                                 const InterpFilterParams *filter_params_x,
+                                 const InterpFilterParams *filter_params_y,
+                                 const int subpel_x_qn, const int subpel_y_qn,
+                                 ConvolveParams *conv_params, int bd) {
+  int16_t im_block[(MAX_SB_SIZE + MAX_FILTER_TAP - 1) * MAX_SB_SIZE];
+  int im_h = h + filter_params_y->taps - 1;
+  int im_stride = w;
+  assert(w <= MAX_SB_SIZE && h <= MAX_SB_SIZE);
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int bits =
+      FILTER_BITS * 2 - conv_params->round_0 - conv_params->round_1;
+  assert(bits >= 0);
+
+  // horizontal filter
+  const uint16_t *src_horiz = src - fo_vert * src_stride;
+  const int16_t *x_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_x, subpel_x_qn & SUBPEL_MASK);
+  for (int y = 0; y < im_h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t sum = (1 << (bd + FILTER_BITS - 1));
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        sum += x_filter[k] * src_horiz[y * src_stride + x - fo_horiz + k];
+      }
+      assert(0 <= sum && sum < (1 << (bd + FILTER_BITS + 1)));
+      im_block[y * im_stride + x] =
+          ROUND_POWER_OF_TWO(sum, conv_params->round_0);
+    }
+  }
+
+  // vertical filter
+  int16_t *src_vert = im_block + fo_vert * im_stride;
+  const int16_t *y_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_y, subpel_y_qn & SUBPEL_MASK);
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t sum = 1 << offset_bits;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        sum += y_filter[k] * src_vert[(y - fo_vert + k) * im_stride + x];
+      }
+      assert(0 <= sum && sum < (1 << (offset_bits + 2)));
+      int32_t res = ROUND_POWER_OF_TWO(sum, conv_params->round_1) -
+                    ((1 << (offset_bits - conv_params->round_1)) +
+                     (1 << (offset_bits - conv_params->round_1 - 1)));
+      dst[y * dst_stride + x] =
+          clip_pixel_highbd(ROUND_POWER_OF_TWO(res, bits), bd);
+    }
+  }
+}
+
+void av1_highbd_dist_wtd_convolve_2d_c(
+    const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w,
+    int h, const InterpFilterParams *filter_params_x,
+    const InterpFilterParams *filter_params_y, const int subpel_x_qn,
+    const int subpel_y_qn, ConvolveParams *conv_params, int bd) {
+  int x, y, k;
+  int16_t im_block[(MAX_SB_SIZE + MAX_FILTER_TAP - 1) * MAX_SB_SIZE];
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  int dst16_stride = conv_params->dst_stride;
+  int im_h = h + filter_params_y->taps - 1;
+  int im_stride = w;
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+  assert(round_bits >= 0);
+
+  // horizontal filter
+  const uint16_t *src_horiz = src - fo_vert * src_stride;
+  const int16_t *x_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_x, subpel_x_qn & SUBPEL_MASK);
+  for (y = 0; y < im_h; ++y) {
+    for (x = 0; x < w; ++x) {
+      int32_t sum = (1 << (bd + FILTER_BITS - 1));
+      for (k = 0; k < filter_params_x->taps; ++k) {
+        sum += x_filter[k] * src_horiz[y * src_stride + x - fo_horiz + k];
+      }
+      assert(0 <= sum && sum < (1 << (bd + FILTER_BITS + 1)));
+      (void)bd;
+      im_block[y * im_stride + x] =
+          (int16_t)ROUND_POWER_OF_TWO(sum, conv_params->round_0);
+    }
+  }
+
+  // vertical filter
+  int16_t *src_vert = im_block + fo_vert * im_stride;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int16_t *y_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_y, subpel_y_qn & SUBPEL_MASK);
+  for (y = 0; y < h; ++y) {
+    for (x = 0; x < w; ++x) {
+      int32_t sum = 1 << offset_bits;
+      for (k = 0; k < filter_params_y->taps; ++k) {
+        sum += y_filter[k] * src_vert[(y - fo_vert + k) * im_stride + x];
+      }
+      assert(0 <= sum && sum < (1 << (offset_bits + 2)));
+      CONV_BUF_TYPE res = ROUND_POWER_OF_TWO(sum, conv_params->round_1);
+      if (conv_params->do_average) {
+        int32_t tmp = dst16[y * dst16_stride + x];
+        if (conv_params->use_dist_wtd_comp_avg) {
+          tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+          tmp = tmp >> DIST_PRECISION_BITS;
+        } else {
+          tmp += res;
+          tmp = tmp >> 1;
+        }
+        tmp -= (1 << (offset_bits - conv_params->round_1)) +
+               (1 << (offset_bits - conv_params->round_1 - 1));
+        dst[y * dst_stride + x] =
+            clip_pixel_highbd(ROUND_POWER_OF_TWO(tmp, round_bits), bd);
+      } else {
+        dst16[y * dst16_stride + x] = res;
+      }
+    }
+  }
+}
+
+void av1_highbd_dist_wtd_convolve_x_c(const uint16_t *src, int src_stride,
+                                      uint16_t *dst, int dst_stride, int w,
+                                      int h,
+                                      const InterpFilterParams *filter_params_x,
+                                      const int subpel_x_qn,
+                                      ConvolveParams *conv_params, int bd) {
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  int dst16_stride = conv_params->dst_stride;
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  const int bits = FILTER_BITS - conv_params->round_1;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int round_offset = (1 << (offset_bits - conv_params->round_1)) +
+                           (1 << (offset_bits - conv_params->round_1 - 1));
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+  assert(round_bits >= 0);
+  assert(bits >= 0);
+  // horizontal filter
+  const int16_t *x_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_x, subpel_x_qn & SUBPEL_MASK);
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t res = 0;
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        res += x_filter[k] * src[y * src_stride + x - fo_horiz + k];
+      }
+      res = (1 << bits) * ROUND_POWER_OF_TWO(res, conv_params->round_0);
+      res += round_offset;
+
+      if (conv_params->do_average) {
+        int32_t tmp = dst16[y * dst16_stride + x];
+        if (conv_params->use_dist_wtd_comp_avg) {
+          tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+          tmp = tmp >> DIST_PRECISION_BITS;
+        } else {
+          tmp += res;
+          tmp = tmp >> 1;
+        }
+        tmp -= round_offset;
+        dst[y * dst_stride + x] =
+            clip_pixel_highbd(ROUND_POWER_OF_TWO(tmp, round_bits), bd);
+      } else {
+        dst16[y * dst16_stride + x] = res;
+      }
+    }
+  }
+}
+
+void av1_highbd_dist_wtd_convolve_y_c(const uint16_t *src, int src_stride,
+                                      uint16_t *dst, int dst_stride, int w,
+                                      int h,
+                                      const InterpFilterParams *filter_params_y,
+                                      const int subpel_y_qn,
+                                      ConvolveParams *conv_params, int bd) {
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  int dst16_stride = conv_params->dst_stride;
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  const int bits = FILTER_BITS - conv_params->round_0;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int round_offset = (1 << (offset_bits - conv_params->round_1)) +
+                           (1 << (offset_bits - conv_params->round_1 - 1));
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+  assert(round_bits >= 0);
+  assert(bits >= 0);
+  // vertical filter
+  const int16_t *y_filter = av1_get_interp_filter_subpel_kernel(
+      filter_params_y, subpel_y_qn & SUBPEL_MASK);
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      int32_t res = 0;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        res += y_filter[k] * src[(y - fo_vert + k) * src_stride + x];
+      }
+      res *= (1 << bits);
+      res = ROUND_POWER_OF_TWO(res, conv_params->round_1) + round_offset;
+
+      if (conv_params->do_average) {
+        int32_t tmp = dst16[y * dst16_stride + x];
+        if (conv_params->use_dist_wtd_comp_avg) {
+          tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+          tmp = tmp >> DIST_PRECISION_BITS;
+        } else {
+          tmp += res;
+          tmp = tmp >> 1;
+        }
+        tmp -= round_offset;
+        dst[y * dst_stride + x] =
+            clip_pixel_highbd(ROUND_POWER_OF_TWO(tmp, round_bits), bd);
+      } else {
+        dst16[y * dst16_stride + x] = res;
+      }
+    }
+  }
+}
+
+void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t *src, int src_stride,
+                                            uint16_t *dst, int dst_stride,
+                                            int w, int h,
+                                            ConvolveParams *conv_params,
+                                            int bd) {
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  int dst16_stride = conv_params->dst_stride;
+  const int bits =
+      FILTER_BITS * 2 - conv_params->round_1 - conv_params->round_0;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  const int round_offset = (1 << (offset_bits - conv_params->round_1)) +
+                           (1 << (offset_bits - conv_params->round_1 - 1));
+  assert(bits >= 0);
+
+  for (int y = 0; y < h; ++y) {
+    for (int x = 0; x < w; ++x) {
+      CONV_BUF_TYPE res = src[y * src_stride + x] << bits;
+      res += round_offset;
+      if (conv_params->do_average) {
+        int32_t tmp = dst16[y * dst16_stride + x];
+        if (conv_params->use_dist_wtd_comp_avg) {
+          tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+          tmp = tmp >> DIST_PRECISION_BITS;
+        } else {
+          tmp += res;
+          tmp = tmp >> 1;
+        }
+        tmp -= round_offset;
+        dst[y * dst_stride + x] =
+            clip_pixel_highbd(ROUND_POWER_OF_TWO(tmp, bits), bd);
+      } else {
+        dst16[y * dst16_stride + x] = res;
+      }
+    }
+  }
+}
+
+void av1_highbd_convolve_2d_scale_c(const uint16_t *src, int src_stride,
+                                    uint16_t *dst, int dst_stride, int w, int h,
+                                    const InterpFilterParams *filter_params_x,
+                                    const InterpFilterParams *filter_params_y,
+                                    const int subpel_x_qn, const int x_step_qn,
+                                    const int subpel_y_qn, const int y_step_qn,
+                                    ConvolveParams *conv_params, int bd) {
+  int16_t im_block[(2 * MAX_SB_SIZE + MAX_FILTER_TAP) * MAX_SB_SIZE];
+  int im_h = (((h - 1) * y_step_qn + subpel_y_qn) >> SCALE_SUBPEL_BITS) +
+             filter_params_y->taps;
+  int im_stride = w;
+  const int fo_vert = filter_params_y->taps / 2 - 1;
+  const int fo_horiz = filter_params_x->taps / 2 - 1;
+  CONV_BUF_TYPE *dst16 = conv_params->dst;
+  const int dst16_stride = conv_params->dst_stride;
+  const int bits =
+      FILTER_BITS * 2 - conv_params->round_0 - conv_params->round_1;
+  assert(bits >= 0);
+  // horizontal filter
+  const uint16_t *src_horiz = src - fo_vert * src_stride;
+  for (int y = 0; y < im_h; ++y) {
+    int x_qn = subpel_x_qn;
+    for (int x = 0; x < w; ++x, x_qn += x_step_qn) {
+      const uint16_t *const src_x = &src_horiz[(x_qn >> SCALE_SUBPEL_BITS)];
+      const int x_filter_idx = (x_qn & SCALE_SUBPEL_MASK) >> SCALE_EXTRA_BITS;
+      assert(x_filter_idx < SUBPEL_SHIFTS);
+      const int16_t *x_filter =
+          av1_get_interp_filter_subpel_kernel(filter_params_x, x_filter_idx);
+      int32_t sum = (1 << (bd + FILTER_BITS - 1));
+      for (int k = 0; k < filter_params_x->taps; ++k) {
+        sum += x_filter[k] * src_x[k - fo_horiz];
+      }
+      assert(0 <= sum && sum < (1 << (bd + FILTER_BITS + 1)));
+      im_block[y * im_stride + x] =
+          (int16_t)ROUND_POWER_OF_TWO(sum, conv_params->round_0);
+    }
+    src_horiz += src_stride;
+  }
+
+  // vertical filter
+  int16_t *src_vert = im_block + fo_vert * im_stride;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  for (int x = 0; x < w; ++x) {
+    int y_qn = subpel_y_qn;
+    for (int y = 0; y < h; ++y, y_qn += y_step_qn) {
+      const int16_t *src_y = &src_vert[(y_qn >> SCALE_SUBPEL_BITS) * im_stride];
+      const int y_filter_idx = (y_qn & SCALE_SUBPEL_MASK) >> SCALE_EXTRA_BITS;
+      assert(y_filter_idx < SUBPEL_SHIFTS);
+      const int16_t *y_filter =
+          av1_get_interp_filter_subpel_kernel(filter_params_y, y_filter_idx);
+      int32_t sum = 1 << offset_bits;
+      for (int k = 0; k < filter_params_y->taps; ++k) {
+        sum += y_filter[k] * src_y[(k - fo_vert) * im_stride];
+      }
+      assert(0 <= sum && sum < (1 << (offset_bits + 2)));
+      CONV_BUF_TYPE res = ROUND_POWER_OF_TWO(sum, conv_params->round_1);
+      if (conv_params->is_compound) {
+        if (conv_params->do_average) {
+          int32_t tmp = dst16[y * dst16_stride + x];
+          if (conv_params->use_dist_wtd_comp_avg) {
+            tmp = tmp * conv_params->fwd_offset + res * conv_params->bck_offset;
+            tmp = tmp >> DIST_PRECISION_BITS;
+          } else {
+            tmp += res;
+            tmp = tmp >> 1;
+          }
+          /* Subtract round offset and convolve round */
+          tmp = tmp - ((1 << (offset_bits - conv_params->round_1)) +
+                       (1 << (offset_bits - conv_params->round_1 - 1)));
+          dst[y * dst_stride + x] =
+              clip_pixel_highbd(ROUND_POWER_OF_TWO(tmp, bits), bd);
+        } else {
+          dst16[y * dst16_stride + x] = res;
+        }
+      } else {
+        /* Subtract round offset and convolve round */
+        int32_t tmp = res - ((1 << (offset_bits - conv_params->round_1)) +
+                             (1 << (offset_bits - conv_params->round_1 - 1)));
+        dst[y * dst_stride + x] =
+            clip_pixel_highbd(ROUND_POWER_OF_TWO(tmp, bits), bd);
+      }
+    }
+    src_vert++;
+  }
+}
+
+static void highbd_convolve_2d_facade_compound(
+    const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride,
+    const int w, const int h, const InterpFilterParams *filter_params_x,
+    const InterpFilterParams *filter_params_y, const int subpel_x_qn,
+    const int subpel_y_qn, ConvolveParams *conv_params, int bd) {
+  const bool need_x = subpel_x_qn != 0;
+  const bool need_y = subpel_y_qn != 0;
+  if (!need_x && !need_y) {
+    av1_highbd_dist_wtd_convolve_2d_copy(src, src_stride, dst, dst_stride, w, h,
+                                         conv_params, bd);
+  } else if (need_x && !need_y) {
+    av1_highbd_dist_wtd_convolve_x(src, src_stride, dst, dst_stride, w, h,
+                                   filter_params_x, subpel_x_qn, conv_params,
+                                   bd);
+  } else if (!need_x && need_y) {
+    av1_highbd_dist_wtd_convolve_y(src, src_stride, dst, dst_stride, w, h,
+                                   filter_params_y, subpel_y_qn, conv_params,
+                                   bd);
+  } else {
+    assert(need_x && need_y);
+    av1_highbd_dist_wtd_convolve_2d(src, src_stride, dst, dst_stride, w, h,
+                                    filter_params_x, filter_params_y,
+                                    subpel_x_qn, subpel_y_qn, conv_params, bd);
+  }
+}
+
+static void highbd_convolve_2d_facade_single(
+    const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride,
+    const int w, const int h, const InterpFilterParams *filter_params_x,
+    const InterpFilterParams *filter_params_y, const int subpel_x_qn,
+    const int subpel_y_qn, ConvolveParams *conv_params, int bd) {
+  const bool need_x = subpel_x_qn != 0;
+  const bool need_y = subpel_y_qn != 0;
+
+  if (!need_x && !need_y) {
+    aom_highbd_convolve_copy(src, src_stride, dst, dst_stride, w, h);
+  } else if (need_x && !need_y) {
+    av1_highbd_convolve_x_sr(src, src_stride, dst, dst_stride, w, h,
+                             filter_params_x, subpel_x_qn, conv_params, bd);
+  } else if (!need_x && need_y) {
+    av1_highbd_convolve_y_sr(src, src_stride, dst, dst_stride, w, h,
+                             filter_params_y, subpel_y_qn, bd);
+  } else {
+    assert(need_x && need_y);
+    av1_highbd_convolve_2d_sr(src, src_stride, dst, dst_stride, w, h,
+                              filter_params_x, filter_params_y, subpel_x_qn,
+                              subpel_y_qn, conv_params, bd);
+  }
+}
+
+void av1_highbd_convolve_2d_facade(const uint8_t *src8, int src_stride,
+                                   uint8_t *dst8, int dst_stride, int w, int h,
+                                   const InterpFilterParams *interp_filters[2],
+                                   const int subpel_x_qn, int x_step_q4,
+                                   const int subpel_y_qn, int y_step_q4,
+                                   int scaled, ConvolveParams *conv_params,
+                                   int bd) {
+  (void)x_step_q4;
+  (void)y_step_q4;
+  (void)dst_stride;
+  const uint16_t *src = CONVERT_TO_SHORTPTR(src8);
+
+  const int need_filter_params_x = (subpel_x_qn != 0) | scaled;
+  const int need_filter_params_y = (subpel_y_qn != 0) | scaled;
+  const InterpFilterParams *filter_params_x =
+      need_filter_params_x ? interp_filters[0] : NULL;
+  const InterpFilterParams *filter_params_y =
+      need_filter_params_y ? interp_filters[1] : NULL;
+
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
+  if (scaled) {
+    if (conv_params->is_compound) {
+      assert(conv_params->dst != NULL);
+    }
+    av1_highbd_convolve_2d_scale(src, src_stride, dst, dst_stride, w, h,
+                                 filter_params_x, filter_params_y, subpel_x_qn,
+                                 x_step_q4, subpel_y_qn, y_step_q4, conv_params,
+                                 bd);
+  } else if (conv_params->is_compound) {
+    highbd_convolve_2d_facade_compound(
+        src, src_stride, dst, dst_stride, w, h, filter_params_x,
+        filter_params_y, subpel_x_qn, subpel_y_qn, conv_params, bd);
+  } else {
+    highbd_convolve_2d_facade_single(src, src_stride, dst, dst_stride, w, h,
+                                     filter_params_x, filter_params_y,
+                                     subpel_x_qn, subpel_y_qn, conv_params, bd);
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+// Note: Fixed size intermediate buffers, place limits on parameters
+// of some functions. 2d filtering proceeds in 2 steps:
+//   (1) Interpolate horizontally into an intermediate buffer, temp.
+//   (2) Interpolate temp vertically to derive the sub-pixel result.
+// Deriving the maximum number of rows in the temp buffer (135):
+// --Smallest scaling factor is x1/2 ==> y_step_q4 = 32 (Normative).
+// --Largest block size is 128x128 pixels.
+// --128 rows in the downscaled frame span a distance of (128 - 1) * 32 in the
+//   original frame (in 1/16th pixel units).
+// --Must round-up because block may be located at sub-pixel position.
+// --Require an additional SUBPEL_TAPS rows for the 8-tap filter tails.
+// --((128 - 1) * 32 + 15) >> 4 + 8 = 263.
+#define WIENER_MAX_EXT_SIZE 263
+
+static INLINE int horz_scalar_product(const uint8_t *a, const int16_t *b) {
+  int sum = 0;
+  for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k] * b[k];
+  return sum;
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static INLINE int highbd_horz_scalar_product(const uint16_t *a,
+                                             const int16_t *b) {
+  int sum = 0;
+  for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k] * b[k];
+  return sum;
+}
+#endif
+
+static INLINE int highbd_vert_scalar_product(const uint16_t *a,
+                                             ptrdiff_t a_stride,
+                                             const int16_t *b) {
+  int sum = 0;
+  for (int k = 0; k < SUBPEL_TAPS; ++k) sum += a[k * a_stride] * b[k];
+  return sum;
+}
+
+static const InterpKernel *get_filter_base(const int16_t *filter) {
+  // NOTE: This assumes that the filter table is 256-byte aligned.
+  // TODO(agrange) Modify to make independent of table alignment.
+  return (const InterpKernel *)(((intptr_t)filter) & ~((intptr_t)0xFF));
+}
+
+static int get_filter_offset(const int16_t *f, const InterpKernel *base) {
+  return (int)((const InterpKernel *)(intptr_t)f - base);
+}
+
+static void convolve_add_src_horiz_hip(const uint8_t *src, ptrdiff_t src_stride,
+                                       uint16_t *dst, ptrdiff_t dst_stride,
+                                       const InterpKernel *x_filters, int x0_q4,
+                                       int x_step_q4, int w, int h,
+                                       int round0_bits) {
+  const int bd = 8;
+  src -= SUBPEL_TAPS / 2 - 1;
+  for (int y = 0; y < h; ++y) {
+    int x_q4 = x0_q4;
+    for (int x = 0; x < w; ++x) {
+      const uint8_t *const src_x = &src[x_q4 >> SUBPEL_BITS];
+      const int16_t *const x_filter = x_filters[x_q4 & SUBPEL_MASK];
+      const int rounding = ((int)src_x[SUBPEL_TAPS / 2 - 1] << FILTER_BITS) +
+                           (1 << (bd + FILTER_BITS - 1));
+      const int sum = horz_scalar_product(src_x, x_filter) + rounding;
+      dst[x] = (uint16_t)clamp(ROUND_POWER_OF_TWO(sum, round0_bits), 0,
+                               WIENER_CLAMP_LIMIT(round0_bits, bd) - 1);
+      x_q4 += x_step_q4;
+    }
+    src += src_stride;
+    dst += dst_stride;
+  }
+}
+
+static void convolve_add_src_vert_hip(const uint16_t *src, ptrdiff_t src_stride,
+                                      uint8_t *dst, ptrdiff_t dst_stride,
+                                      const InterpKernel *y_filters, int y0_q4,
+                                      int y_step_q4, int w, int h,
+                                      int round1_bits) {
+  const int bd = 8;
+  src -= src_stride * (SUBPEL_TAPS / 2 - 1);
+
+  for (int x = 0; x < w; ++x) {
+    int y_q4 = y0_q4;
+    for (int y = 0; y < h; ++y) {
+      const uint16_t *src_y = &src[(y_q4 >> SUBPEL_BITS) * src_stride];
+      const int16_t *const y_filter = y_filters[y_q4 & SUBPEL_MASK];
+      const int rounding =
+          ((int)src_y[(SUBPEL_TAPS / 2 - 1) * src_stride] << FILTER_BITS) -
+          (1 << (bd + round1_bits - 1));
+      const int sum =
+          highbd_vert_scalar_product(src_y, src_stride, y_filter) + rounding;
+      dst[y * dst_stride] = clip_pixel(ROUND_POWER_OF_TWO(sum, round1_bits));
+      y_q4 += y_step_q4;
+    }
+    ++src;
+    ++dst;
+  }
+}
+
+void av1_wiener_convolve_add_src_c(const uint8_t *src, ptrdiff_t src_stride,
+                                   uint8_t *dst, ptrdiff_t dst_stride,
+                                   const int16_t *filter_x, int x_step_q4,
+                                   const int16_t *filter_y, int y_step_q4,
+                                   int w, int h,
+                                   const ConvolveParams *conv_params) {
+  const InterpKernel *const filters_x = get_filter_base(filter_x);
+  const int x0_q4 = get_filter_offset(filter_x, filters_x);
+
+  const InterpKernel *const filters_y = get_filter_base(filter_y);
+  const int y0_q4 = get_filter_offset(filter_y, filters_y);
+
+  uint16_t temp[WIENER_MAX_EXT_SIZE * MAX_SB_SIZE];
+  const int intermediate_height =
+      (((h - 1) * y_step_q4 + y0_q4) >> SUBPEL_BITS) + SUBPEL_TAPS - 1;
+  memset(temp + (intermediate_height * MAX_SB_SIZE), 0, MAX_SB_SIZE);
+
+  assert(w <= MAX_SB_SIZE);
+  assert(h <= MAX_SB_SIZE);
+  assert(y_step_q4 <= 32);
+  assert(x_step_q4 <= 32);
+
+  convolve_add_src_horiz_hip(src - src_stride * (SUBPEL_TAPS / 2 - 1),
+                             src_stride, temp, MAX_SB_SIZE, filters_x, x0_q4,
+                             x_step_q4, w, intermediate_height,
+                             conv_params->round_0);
+  convolve_add_src_vert_hip(temp + MAX_SB_SIZE * (SUBPEL_TAPS / 2 - 1),
+                            MAX_SB_SIZE, dst, dst_stride, filters_y, y0_q4,
+                            y_step_q4, w, h, conv_params->round_1);
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void highbd_convolve_add_src_horiz_hip(
+    const uint8_t *src8, ptrdiff_t src_stride, uint16_t *dst,
+    ptrdiff_t dst_stride, const InterpKernel *x_filters, int x0_q4,
+    int x_step_q4, int w, int h, int round0_bits, int bd) {
+  const int extraprec_clamp_limit = WIENER_CLAMP_LIMIT(round0_bits, bd);
+  uint16_t *src = CONVERT_TO_SHORTPTR(src8);
+  src -= SUBPEL_TAPS / 2 - 1;
+  for (int y = 0; y < h; ++y) {
+    int x_q4 = x0_q4;
+    for (int x = 0; x < w; ++x) {
+      const uint16_t *const src_x = &src[x_q4 >> SUBPEL_BITS];
+      const int16_t *const x_filter = x_filters[x_q4 & SUBPEL_MASK];
+      const int rounding = ((int)src_x[SUBPEL_TAPS / 2 - 1] << FILTER_BITS) +
+                           (1 << (bd + FILTER_BITS - 1));
+      const int sum = highbd_horz_scalar_product(src_x, x_filter) + rounding;
+      dst[x] = (uint16_t)clamp(ROUND_POWER_OF_TWO(sum, round0_bits), 0,
+                               extraprec_clamp_limit - 1);
+      x_q4 += x_step_q4;
+    }
+    src += src_stride;
+    dst += dst_stride;
+  }
+}
+
+static void highbd_convolve_add_src_vert_hip(
+    const uint16_t *src, ptrdiff_t src_stride, uint8_t *dst8,
+    ptrdiff_t dst_stride, const InterpKernel *y_filters, int y0_q4,
+    int y_step_q4, int w, int h, int round1_bits, int bd) {
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
+  src -= src_stride * (SUBPEL_TAPS / 2 - 1);
+  for (int x = 0; x < w; ++x) {
+    int y_q4 = y0_q4;
+    for (int y = 0; y < h; ++y) {
+      const uint16_t *src_y = &src[(y_q4 >> SUBPEL_BITS) * src_stride];
+      const int16_t *const y_filter = y_filters[y_q4 & SUBPEL_MASK];
+      const int rounding =
+          ((int)src_y[(SUBPEL_TAPS / 2 - 1) * src_stride] << FILTER_BITS) -
+          (1 << (bd + round1_bits - 1));
+      const int sum =
+          highbd_vert_scalar_product(src_y, src_stride, y_filter) + rounding;
+      dst[y * dst_stride] =
+          clip_pixel_highbd(ROUND_POWER_OF_TWO(sum, round1_bits), bd);
+      y_q4 += y_step_q4;
+    }
+    ++src;
+    ++dst;
+  }
+}
+
+void av1_highbd_wiener_convolve_add_src_c(
+    const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst,
+    ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4,
+    const int16_t *filter_y, int y_step_q4, int w, int h,
+    const ConvolveParams *conv_params, int bd) {
+  const InterpKernel *const filters_x = get_filter_base(filter_x);
+  const int x0_q4 = get_filter_offset(filter_x, filters_x);
+
+  const InterpKernel *const filters_y = get_filter_base(filter_y);
+  const int y0_q4 = get_filter_offset(filter_y, filters_y);
+
+  uint16_t temp[WIENER_MAX_EXT_SIZE * MAX_SB_SIZE];
+  const int intermediate_height =
+      (((h - 1) * y_step_q4 + y0_q4) >> SUBPEL_BITS) + SUBPEL_TAPS;
+
+  assert(w <= MAX_SB_SIZE);
+  assert(h <= MAX_SB_SIZE);
+  assert(y_step_q4 <= 32);
+  assert(x_step_q4 <= 32);
+  assert(bd + FILTER_BITS - conv_params->round_0 + 2 <= 16);
+
+  highbd_convolve_add_src_horiz_hip(src - src_stride * (SUBPEL_TAPS / 2 - 1),
+                                    src_stride, temp, MAX_SB_SIZE, filters_x,
+                                    x0_q4, x_step_q4, w, intermediate_height,
+                                    conv_params->round_0, bd);
+  highbd_convolve_add_src_vert_hip(
+      temp + MAX_SB_SIZE * (SUBPEL_TAPS / 2 - 1), MAX_SB_SIZE, dst, dst_stride,
+      filters_y, y0_q4, y_step_q4, w, h, conv_params->round_1, bd);
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.h
new file mode 100644
index 0000000000..200d805883
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_CONVOLVE_H_
+#define AOM_AV1_COMMON_CONVOLVE_H_
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef uint16_t CONV_BUF_TYPE;
+typedef struct ConvolveParams {
+  int do_average;
+  CONV_BUF_TYPE *dst;
+  int dst_stride;
+  int round_0;
+  int round_1;
+  int plane;
+  int is_compound;
+  int use_dist_wtd_comp_avg;
+  int fwd_offset;
+  int bck_offset;
+} ConvolveParams;
+
+#define ROUND0_BITS 3
+#define COMPOUND_ROUND1_BITS 7
+#define WIENER_ROUND0_BITS 3
+
+#define WIENER_CLAMP_LIMIT(r0, bd) (1 << ((bd) + 1 + FILTER_BITS - r0))
+
+typedef void (*aom_convolve_fn_t)(const uint8_t *src, int src_stride,
+                                  uint8_t *dst, int dst_stride, int w, int h,
+                                  const InterpFilterParams *filter_params_x,
+                                  const InterpFilterParams *filter_params_y,
+                                  const int subpel_x_qn, const int subpel_y_qn,
+                                  ConvolveParams *conv_params);
+
+typedef void (*aom_highbd_convolve_fn_t)(
+    const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w,
+    int h, const InterpFilterParams *filter_params_x,
+    const InterpFilterParams *filter_params_y, const int subpel_x_qn,
+    const int subpel_y_qn, ConvolveParams *conv_params, int bd);
+
+struct AV1Common;
+struct scale_factors;
+
+void av1_convolve_2d_facade(const uint8_t *src, int src_stride, uint8_t *dst,
+                            int dst_stride, int w, int h,
+                            const InterpFilterParams *interp_filters[2],
+                            const int subpel_x_qn, int x_step_q4,
+                            const int subpel_y_qn, int y_step_q4, int scaled,
+                            ConvolveParams *conv_params);
+
+static INLINE ConvolveParams get_conv_params_no_round(int cmp_index, int plane,
+                                                      CONV_BUF_TYPE *dst,
+                                                      int dst_stride,
+                                                      int is_compound, int bd) {
+  ConvolveParams conv_params;
+  assert(IMPLIES(cmp_index, is_compound));
+
+  conv_params.is_compound = is_compound;
+  conv_params.use_dist_wtd_comp_avg = 0;
+  conv_params.round_0 = ROUND0_BITS;
+  conv_params.round_1 = is_compound ? COMPOUND_ROUND1_BITS
+                                    : 2 * FILTER_BITS - conv_params.round_0;
+  const int intbufrange = bd + FILTER_BITS - conv_params.round_0 + 2;
+  assert(IMPLIES(bd < 12, intbufrange <= 16));
+  if (intbufrange > 16) {
+    conv_params.round_0 += intbufrange - 16;
+    if (!is_compound) conv_params.round_1 -= intbufrange - 16;
+  }
+  // TODO(yunqing): The following dst should only be valid while
+  // is_compound = 1;
+  conv_params.dst = dst;
+  conv_params.dst_stride = dst_stride;
+  conv_params.plane = plane;
+
+  // By default, set do average to 1 if this is the second single prediction
+  // in a compound mode.
+  conv_params.do_average = cmp_index;
+  return conv_params;
+}
+
+static INLINE ConvolveParams get_conv_params(int do_average, int plane,
+                                             int bd) {
+  return get_conv_params_no_round(do_average, plane, NULL, 0, 0, bd);
+}
+
+static INLINE ConvolveParams get_conv_params_wiener(int bd) {
+  ConvolveParams conv_params;
+  (void)bd;
+  conv_params.do_average = 0;
+  conv_params.is_compound = 0;
+  conv_params.round_0 = WIENER_ROUND0_BITS;
+  conv_params.round_1 = 2 * FILTER_BITS - conv_params.round_0;
+  const int intbufrange = bd + FILTER_BITS - conv_params.round_0 + 2;
+  assert(IMPLIES(bd < 12, intbufrange <= 16));
+  if (intbufrange > 16) {
+    conv_params.round_0 += intbufrange - 16;
+    conv_params.round_1 -= intbufrange - 16;
+  }
+  conv_params.dst = NULL;
+  conv_params.dst_stride = 0;
+  conv_params.plane = 0;
+  return conv_params;
+}
+
+void av1_highbd_convolve_2d_facade(const uint8_t *src8, int src_stride,
+                                   uint8_t *dst, int dst_stride, int w, int h,
+                                   const InterpFilterParams *interp_filters[2],
+                                   const int subpel_x_qn, int x_step_q4,
+                                   const int subpel_y_qn, int y_step_q4,
+                                   int scaled, ConvolveParams *conv_params,
+                                   int bd);
+
+// TODO(sarahparker) This will need to be integerized and optimized
+void av1_convolve_2d_sobel_y_c(const uint8_t *src, int src_stride, double *dst,
+                               int dst_stride, int w, int h, int dir,
+                               double norm);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_CONVOLVE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.c
new file mode 100644
index 0000000000..8d9dedb4f5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.c
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/scan.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/token_cdfs.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.h"
+
+static int get_q_ctx(int q) {
+  if (q <= 20) return 0;
+  if (q <= 60) return 1;
+  if (q <= 120) return 2;
+  return 3;
+}
+
+void av1_default_coef_probs(AV1_COMMON *cm) {
+  const int index = get_q_ctx(cm->quant_params.base_qindex);
+#if CONFIG_ENTROPY_STATS
+  cm->coef_cdf_category = index;
+#endif
+
+  av1_copy(cm->fc->txb_skip_cdf, av1_default_txb_skip_cdfs[index]);
+  av1_copy(cm->fc->eob_extra_cdf, av1_default_eob_extra_cdfs[index]);
+  av1_copy(cm->fc->dc_sign_cdf, av1_default_dc_sign_cdfs[index]);
+  av1_copy(cm->fc->coeff_br_cdf, av1_default_coeff_lps_multi_cdfs[index]);
+  av1_copy(cm->fc->coeff_base_cdf, av1_default_coeff_base_multi_cdfs[index]);
+  av1_copy(cm->fc->coeff_base_eob_cdf,
+           av1_default_coeff_base_eob_multi_cdfs[index]);
+  av1_copy(cm->fc->eob_flag_cdf16, av1_default_eob_multi16_cdfs[index]);
+  av1_copy(cm->fc->eob_flag_cdf32, av1_default_eob_multi32_cdfs[index]);
+  av1_copy(cm->fc->eob_flag_cdf64, av1_default_eob_multi64_cdfs[index]);
+  av1_copy(cm->fc->eob_flag_cdf128, av1_default_eob_multi128_cdfs[index]);
+  av1_copy(cm->fc->eob_flag_cdf256, av1_default_eob_multi256_cdfs[index]);
+  av1_copy(cm->fc->eob_flag_cdf512, av1_default_eob_multi512_cdfs[index]);
+  av1_copy(cm->fc->eob_flag_cdf1024, av1_default_eob_multi1024_cdfs[index]);
+}
+
+static AOM_INLINE void reset_cdf_symbol_counter(aom_cdf_prob *cdf_ptr,
+                                                int num_cdfs, int cdf_stride,
+                                                int nsymbs) {
+  for (int i = 0; i < num_cdfs; i++) {
+    cdf_ptr[i * cdf_stride + nsymbs] = 0;
+  }
+}
+
+#define RESET_CDF_COUNTER(cname, nsymbs) \
+  RESET_CDF_COUNTER_STRIDE(cname, nsymbs, CDF_SIZE(nsymbs))
+
+#define RESET_CDF_COUNTER_STRIDE(cname, nsymbs, cdf_stride)          \
+  do {                                                               \
+    aom_cdf_prob *cdf_ptr = (aom_cdf_prob *)cname;                   \
+    int array_size = (int)sizeof(cname) / sizeof(aom_cdf_prob);      \
+    int num_cdfs = array_size / cdf_stride;                          \
+    reset_cdf_symbol_counter(cdf_ptr, num_cdfs, cdf_stride, nsymbs); \
+  } while (0)
+
+static AOM_INLINE void reset_nmv_counter(nmv_context *nmv) {
+  RESET_CDF_COUNTER(nmv->joints_cdf, 4);
+  for (int i = 0; i < 2; i++) {
+    RESET_CDF_COUNTER(nmv->comps[i].classes_cdf, MV_CLASSES);
+    RESET_CDF_COUNTER(nmv->comps[i].class0_fp_cdf, MV_FP_SIZE);
+    RESET_CDF_COUNTER(nmv->comps[i].fp_cdf, MV_FP_SIZE);
+    RESET_CDF_COUNTER(nmv->comps[i].sign_cdf, 2);
+    RESET_CDF_COUNTER(nmv->comps[i].class0_hp_cdf, 2);
+    RESET_CDF_COUNTER(nmv->comps[i].hp_cdf, 2);
+    RESET_CDF_COUNTER(nmv->comps[i].class0_cdf, CLASS0_SIZE);
+    RESET_CDF_COUNTER(nmv->comps[i].bits_cdf, 2);
+  }
+}
+
+void av1_reset_cdf_symbol_counters(FRAME_CONTEXT *fc) {
+  RESET_CDF_COUNTER(fc->txb_skip_cdf, 2);
+  RESET_CDF_COUNTER(fc->eob_extra_cdf, 2);
+  RESET_CDF_COUNTER(fc->dc_sign_cdf, 2);
+  RESET_CDF_COUNTER(fc->eob_flag_cdf16, 5);
+  RESET_CDF_COUNTER(fc->eob_flag_cdf32, 6);
+  RESET_CDF_COUNTER(fc->eob_flag_cdf64, 7);
+  RESET_CDF_COUNTER(fc->eob_flag_cdf128, 8);
+  RESET_CDF_COUNTER(fc->eob_flag_cdf256, 9);
+  RESET_CDF_COUNTER(fc->eob_flag_cdf512, 10);
+  RESET_CDF_COUNTER(fc->eob_flag_cdf1024, 11);
+  RESET_CDF_COUNTER(fc->coeff_base_eob_cdf, 3);
+  RESET_CDF_COUNTER(fc->coeff_base_cdf, 4);
+  RESET_CDF_COUNTER(fc->coeff_br_cdf, BR_CDF_SIZE);
+  RESET_CDF_COUNTER(fc->newmv_cdf, 2);
+  RESET_CDF_COUNTER(fc->zeromv_cdf, 2);
+  RESET_CDF_COUNTER(fc->refmv_cdf, 2);
+  RESET_CDF_COUNTER(fc->drl_cdf, 2);
+  RESET_CDF_COUNTER(fc->inter_compound_mode_cdf, INTER_COMPOUND_MODES);
+  RESET_CDF_COUNTER(fc->compound_type_cdf, MASKED_COMPOUND_TYPES);
+  RESET_CDF_COUNTER(fc->wedge_idx_cdf, 16);
+  RESET_CDF_COUNTER(fc->interintra_cdf, 2);
+  RESET_CDF_COUNTER(fc->wedge_interintra_cdf, 2);
+  RESET_CDF_COUNTER(fc->interintra_mode_cdf, INTERINTRA_MODES);
+  RESET_CDF_COUNTER(fc->motion_mode_cdf, MOTION_MODES);
+  RESET_CDF_COUNTER(fc->obmc_cdf, 2);
+  RESET_CDF_COUNTER(fc->palette_y_size_cdf, PALETTE_SIZES);
+  RESET_CDF_COUNTER(fc->palette_uv_size_cdf, PALETTE_SIZES);
+  for (int j = 0; j < PALETTE_SIZES; j++) {
+    int nsymbs = j + PALETTE_MIN_SIZE;
+    RESET_CDF_COUNTER_STRIDE(fc->palette_y_color_index_cdf[j], nsymbs,
+                             CDF_SIZE(PALETTE_COLORS));
+    RESET_CDF_COUNTER_STRIDE(fc->palette_uv_color_index_cdf[j], nsymbs,
+                             CDF_SIZE(PALETTE_COLORS));
+  }
+  RESET_CDF_COUNTER(fc->palette_y_mode_cdf, 2);
+  RESET_CDF_COUNTER(fc->palette_uv_mode_cdf, 2);
+  RESET_CDF_COUNTER(fc->comp_inter_cdf, 2);
+  RESET_CDF_COUNTER(fc->single_ref_cdf, 2);
+  RESET_CDF_COUNTER(fc->comp_ref_type_cdf, 2);
+  RESET_CDF_COUNTER(fc->uni_comp_ref_cdf, 2);
+  RESET_CDF_COUNTER(fc->comp_ref_cdf, 2);
+  RESET_CDF_COUNTER(fc->comp_bwdref_cdf, 2);
+  RESET_CDF_COUNTER(fc->txfm_partition_cdf, 2);
+  RESET_CDF_COUNTER(fc->compound_index_cdf, 2);
+  RESET_CDF_COUNTER(fc->comp_group_idx_cdf, 2);
+  RESET_CDF_COUNTER(fc->skip_mode_cdfs, 2);
+  RESET_CDF_COUNTER(fc->skip_txfm_cdfs, 2);
+  RESET_CDF_COUNTER(fc->intra_inter_cdf, 2);
+  reset_nmv_counter(&fc->nmvc);
+  reset_nmv_counter(&fc->ndvc);
+  RESET_CDF_COUNTER(fc->intrabc_cdf, 2);
+  RESET_CDF_COUNTER(fc->seg.tree_cdf, MAX_SEGMENTS);
+  RESET_CDF_COUNTER(fc->seg.pred_cdf, 2);
+  RESET_CDF_COUNTER(fc->seg.spatial_pred_seg_cdf, MAX_SEGMENTS);
+  RESET_CDF_COUNTER(fc->filter_intra_cdfs, 2);
+  RESET_CDF_COUNTER(fc->filter_intra_mode_cdf, FILTER_INTRA_MODES);
+  RESET_CDF_COUNTER(fc->switchable_restore_cdf, RESTORE_SWITCHABLE_TYPES);
+  RESET_CDF_COUNTER(fc->wiener_restore_cdf, 2);
+  RESET_CDF_COUNTER(fc->sgrproj_restore_cdf, 2);
+  RESET_CDF_COUNTER(fc->y_mode_cdf, INTRA_MODES);
+  RESET_CDF_COUNTER_STRIDE(fc->uv_mode_cdf[0], UV_INTRA_MODES - 1,
+                           CDF_SIZE(UV_INTRA_MODES));
+  RESET_CDF_COUNTER(fc->uv_mode_cdf[1], UV_INTRA_MODES);
+  for (int i = 0; i < PARTITION_CONTEXTS; i++) {
+    if (i < 4) {
+      RESET_CDF_COUNTER_STRIDE(fc->partition_cdf[i], 4, CDF_SIZE(10));
+    } else if (i < 16) {
+      RESET_CDF_COUNTER(fc->partition_cdf[i], 10);
+    } else {
+      RESET_CDF_COUNTER_STRIDE(fc->partition_cdf[i], 8, CDF_SIZE(10));
+    }
+  }
+  RESET_CDF_COUNTER(fc->switchable_interp_cdf, SWITCHABLE_FILTERS);
+  RESET_CDF_COUNTER(fc->kf_y_cdf, INTRA_MODES);
+  RESET_CDF_COUNTER(fc->angle_delta_cdf, 2 * MAX_ANGLE_DELTA + 1);
+  RESET_CDF_COUNTER_STRIDE(fc->tx_size_cdf[0], MAX_TX_DEPTH,
+                           CDF_SIZE(MAX_TX_DEPTH + 1));
+  RESET_CDF_COUNTER(fc->tx_size_cdf[1], MAX_TX_DEPTH + 1);
+  RESET_CDF_COUNTER(fc->tx_size_cdf[2], MAX_TX_DEPTH + 1);
+  RESET_CDF_COUNTER(fc->tx_size_cdf[3], MAX_TX_DEPTH + 1);
+  RESET_CDF_COUNTER(fc->delta_q_cdf, DELTA_Q_PROBS + 1);
+  RESET_CDF_COUNTER(fc->delta_lf_cdf, DELTA_LF_PROBS + 1);
+  for (int i = 0; i < FRAME_LF_COUNT; i++) {
+    RESET_CDF_COUNTER(fc->delta_lf_multi_cdf[i], DELTA_LF_PROBS + 1);
+  }
+  RESET_CDF_COUNTER_STRIDE(fc->intra_ext_tx_cdf[1], 7, CDF_SIZE(TX_TYPES));
+  RESET_CDF_COUNTER_STRIDE(fc->intra_ext_tx_cdf[2], 5, CDF_SIZE(TX_TYPES));
+  RESET_CDF_COUNTER_STRIDE(fc->inter_ext_tx_cdf[1], 16, CDF_SIZE(TX_TYPES));
+  RESET_CDF_COUNTER_STRIDE(fc->inter_ext_tx_cdf[2], 12, CDF_SIZE(TX_TYPES));
+  RESET_CDF_COUNTER_STRIDE(fc->inter_ext_tx_cdf[3], 2, CDF_SIZE(TX_TYPES));
+  RESET_CDF_COUNTER(fc->cfl_sign_cdf, CFL_JOINT_SIGNS);
+  RESET_CDF_COUNTER(fc->cfl_alpha_cdf, CFL_ALPHABET_SIZE);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h
new file mode 100644
index 0000000000..2f58151e49
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_ENTROPY_H_
+#define AOM_AV1_COMMON_ENTROPY_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common_data.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TOKEN_CDF_Q_CTXS 4
+
+#define TXB_SKIP_CONTEXTS 13
+
+#define EOB_COEF_CONTEXTS 9
+
+#define SIG_COEF_CONTEXTS_2D 26
+#define SIG_COEF_CONTEXTS_1D 16
+#define SIG_COEF_CONTEXTS_EOB 4
+#define SIG_COEF_CONTEXTS (SIG_COEF_CONTEXTS_2D + SIG_COEF_CONTEXTS_1D)
+
+#define COEFF_BASE_CONTEXTS (SIG_COEF_CONTEXTS)
+#define DC_SIGN_CONTEXTS 3
+
+#define BR_TMP_OFFSET 12
+#define BR_REF_CAT 4
+#define LEVEL_CONTEXTS 21
+
+#define NUM_BASE_LEVELS 2
+
+#define BR_CDF_SIZE (4)
+#define COEFF_BASE_RANGE (4 * (BR_CDF_SIZE - 1))
+
+#define COEFF_CONTEXT_BITS 3
+#define COEFF_CONTEXT_MASK ((1 << COEFF_CONTEXT_BITS) - 1)
+#define MAX_BASE_BR_RANGE (COEFF_BASE_RANGE + NUM_BASE_LEVELS + 1)
+
+#define BASE_CONTEXT_POSITION_NUM 12
+
+enum {
+  TX_CLASS_2D = 0,
+  TX_CLASS_HORIZ = 1,
+  TX_CLASS_VERT = 2,
+  TX_CLASSES = 3,
+} UENUM1BYTE(TX_CLASS);
+
+#define DCT_MAX_VALUE 16384
+#define DCT_MAX_VALUE_HIGH10 65536
+#define DCT_MAX_VALUE_HIGH12 262144
+
+/* Coefficients are predicted via a 3-dimensional probability table indexed on
+ * REF_TYPES, COEF_BANDS and COEF_CONTEXTS. */
+#define REF_TYPES 2  // intra=0, inter=1
+
+struct AV1Common;
+struct frame_contexts;
+void av1_reset_cdf_symbol_counters(struct frame_contexts *fc);
+void av1_default_coef_probs(struct AV1Common *cm);
+void av1_init_mode_probs(struct frame_contexts *fc);
+
+struct frame_contexts;
+
+typedef char ENTROPY_CONTEXT;
+
+static INLINE int combine_entropy_contexts(ENTROPY_CONTEXT a,
+                                           ENTROPY_CONTEXT b) {
+  return (a != 0) + (b != 0);
+}
+
+static INLINE int get_entropy_context(TX_SIZE tx_size, const ENTROPY_CONTEXT *a,
+                                      const ENTROPY_CONTEXT *l) {
+  ENTROPY_CONTEXT above_ec = 0, left_ec = 0;
+
+  switch (tx_size) {
+    case TX_4X4:
+      above_ec = a[0] != 0;
+      left_ec = l[0] != 0;
+      break;
+    case TX_4X8:
+      above_ec = a[0] != 0;
+      left_ec = !!*(const uint16_t *)l;
+      break;
+    case TX_8X4:
+      above_ec = !!*(const uint16_t *)a;
+      left_ec = l[0] != 0;
+      break;
+    case TX_8X16:
+      above_ec = !!*(const uint16_t *)a;
+      left_ec = !!*(const uint32_t *)l;
+      break;
+    case TX_16X8:
+      above_ec = !!*(const uint32_t *)a;
+      left_ec = !!*(const uint16_t *)l;
+      break;
+    case TX_16X32:
+      above_ec = !!*(const uint32_t *)a;
+      left_ec = !!*(const uint64_t *)l;
+      break;
+    case TX_32X16:
+      above_ec = !!*(const uint64_t *)a;
+      left_ec = !!*(const uint32_t *)l;
+      break;
+    case TX_8X8:
+      above_ec = !!*(const uint16_t *)a;
+      left_ec = !!*(const uint16_t *)l;
+      break;
+    case TX_16X16:
+      above_ec = !!*(const uint32_t *)a;
+      left_ec = !!*(const uint32_t *)l;
+      break;
+    case TX_32X32:
+      above_ec = !!*(const uint64_t *)a;
+      left_ec = !!*(const uint64_t *)l;
+      break;
+    case TX_64X64:
+      above_ec = !!(*(const uint64_t *)a | *(const uint64_t *)(a + 8));
+      left_ec = !!(*(const uint64_t *)l | *(const uint64_t *)(l + 8));
+      break;
+    case TX_32X64:
+      above_ec = !!*(const uint64_t *)a;
+      left_ec = !!(*(const uint64_t *)l | *(const uint64_t *)(l + 8));
+      break;
+    case TX_64X32:
+      above_ec = !!(*(const uint64_t *)a | *(const uint64_t *)(a + 8));
+      left_ec = !!*(const uint64_t *)l;
+      break;
+    case TX_4X16:
+      above_ec = a[0] != 0;
+      left_ec = !!*(const uint32_t *)l;
+      break;
+    case TX_16X4:
+      above_ec = !!*(const uint32_t *)a;
+      left_ec = l[0] != 0;
+      break;
+    case TX_8X32:
+      above_ec = !!*(const uint16_t *)a;
+      left_ec = !!*(const uint64_t *)l;
+      break;
+    case TX_32X8:
+      above_ec = !!*(const uint64_t *)a;
+      left_ec = !!*(const uint16_t *)l;
+      break;
+    case TX_16X64:
+      above_ec = !!*(const uint32_t *)a;
+      left_ec = !!(*(const uint64_t *)l | *(const uint64_t *)(l + 8));
+      break;
+    case TX_64X16:
+      above_ec = !!(*(const uint64_t *)a | *(const uint64_t *)(a + 8));
+      left_ec = !!*(const uint32_t *)l;
+      break;
+    default: assert(0 && "Invalid transform size."); break;
+  }
+  return combine_entropy_contexts(above_ec, left_ec);
+}
+
+static INLINE TX_SIZE get_txsize_entropy_ctx(TX_SIZE txsize) {
+  return (TX_SIZE)((txsize_sqr_map[txsize] + txsize_sqr_up_map[txsize] + 1) >>
+                   1);
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_ENTROPY_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.c
new file mode 100644
index 0000000000..1edcbba685
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.c
@@ -0,0 +1,1211 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/scan.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.h"
+
+static const aom_cdf_prob
+    default_kf_y_mode_cdf[KF_MODE_CONTEXTS][KF_MODE_CONTEXTS][CDF_SIZE(
+        INTRA_MODES)] = {
+      { { AOM_CDF13(15588, 17027, 19338, 20218, 20682, 21110, 21825, 23244,
+                    24189, 28165, 29093, 30466) },
+        { AOM_CDF13(12016, 18066, 19516, 20303, 20719, 21444, 21888, 23032,
+                    24434, 28658, 30172, 31409) },
+        { AOM_CDF13(10052, 10771, 22296, 22788, 23055, 23239, 24133, 25620,
+                    26160, 29336, 29929, 31567) },
+        { AOM_CDF13(14091, 15406, 16442, 18808, 19136, 19546, 19998, 22096,
+                    24746, 29585, 30958, 32462) },
+        { AOM_CDF13(12122, 13265, 15603, 16501, 18609, 20033, 22391, 25583,
+                    26437, 30261, 31073, 32475) } },
+      { { AOM_CDF13(10023, 19585, 20848, 21440, 21832, 22760, 23089, 24023,
+                    25381, 29014, 30482, 31436) },
+        { AOM_CDF13(5983, 24099, 24560, 24886, 25066, 25795, 25913, 26423,
+                    27610, 29905, 31276, 31794) },
+        { AOM_CDF13(7444, 12781, 20177, 20728, 21077, 21607, 22170, 23405,
+                    24469, 27915, 29090, 30492) },
+        { AOM_CDF13(8537, 14689, 15432, 17087, 17408, 18172, 18408, 19825,
+                    24649, 29153, 31096, 32210) },
+        { AOM_CDF13(7543, 14231, 15496, 16195, 17905, 20717, 21984, 24516,
+                    26001, 29675, 30981, 31994) } },
+      { { AOM_CDF13(12613, 13591, 21383, 22004, 22312, 22577, 23401, 25055,
+                    25729, 29538, 30305, 32077) },
+        { AOM_CDF13(9687, 13470, 18506, 19230, 19604, 20147, 20695, 22062,
+                    23219, 27743, 29211, 30907) },
+        { AOM_CDF13(6183, 6505, 26024, 26252, 26366, 26434, 27082, 28354, 28555,
+                    30467, 30794, 32086) },
+        { AOM_CDF13(10718, 11734, 14954, 17224, 17565, 17924, 18561, 21523,
+                    23878, 28975, 30287, 32252) },
+        { AOM_CDF13(9194, 9858, 16501, 17263, 18424, 19171, 21563, 25961, 26561,
+                    30072, 30737, 32463) } },
+      { { AOM_CDF13(12602, 14399, 15488, 18381, 18778, 19315, 19724, 21419,
+                    25060, 29696, 30917, 32409) },
+        { AOM_CDF13(8203, 13821, 14524, 17105, 17439, 18131, 18404, 19468,
+                    25225, 29485, 31158, 32342) },
+        { AOM_CDF13(8451, 9731, 15004, 17643, 18012, 18425, 19070, 21538, 24605,
+                    29118, 30078, 32018) },
+        { AOM_CDF13(7714, 9048, 9516, 16667, 16817, 16994, 17153, 18767, 26743,
+                    30389, 31536, 32528) },
+        { AOM_CDF13(8843, 10280, 11496, 15317, 16652, 17943, 19108, 22718,
+                    25769, 29953, 30983, 32485) } },
+      { { AOM_CDF13(12578, 13671, 15979, 16834, 19075, 20913, 22989, 25449,
+                    26219, 30214, 31150, 32477) },
+        { AOM_CDF13(9563, 13626, 15080, 15892, 17756, 20863, 22207, 24236,
+                    25380, 29653, 31143, 32277) },
+        { AOM_CDF13(8356, 8901, 17616, 18256, 19350, 20106, 22598, 25947, 26466,
+                    29900, 30523, 32261) },
+        { AOM_CDF13(10835, 11815, 13124, 16042, 17018, 18039, 18947, 22753,
+                    24615, 29489, 30883, 32482) },
+        { AOM_CDF13(7618, 8288, 9859, 10509, 15386, 18657, 22903, 28776, 29180,
+                    31355, 31802, 32593) } }
+    };
+
+static const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
+    2 * MAX_ANGLE_DELTA + 1)] = {
+  { AOM_CDF7(2180, 5032, 7567, 22776, 26989, 30217) },
+  { AOM_CDF7(2301, 5608, 8801, 23487, 26974, 30330) },
+  { AOM_CDF7(3780, 11018, 13699, 19354, 23083, 31286) },
+  { AOM_CDF7(4581, 11226, 15147, 17138, 21834, 28397) },
+  { AOM_CDF7(1737, 10927, 14509, 19588, 22745, 28823) },
+  { AOM_CDF7(2664, 10176, 12485, 17650, 21600, 30495) },
+  { AOM_CDF7(2240, 11096, 15453, 20341, 22561, 28917) },
+  { AOM_CDF7(3605, 10428, 12459, 17676, 21244, 30655) }
+};
+
+static const aom_cdf_prob default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
+    INTRA_MODES)] = { { AOM_CDF13(22801, 23489, 24293, 24756, 25601, 26123,
+                                  26606, 27418, 27945, 29228, 29685, 30349) },
+                      { AOM_CDF13(18673, 19845, 22631, 23318, 23950, 24649,
+                                  25527, 27364, 28152, 29701, 29984, 30852) },
+                      { AOM_CDF13(19770, 20979, 23396, 23939, 24241, 24654,
+                                  25136, 27073, 27830, 29360, 29730, 30659) },
+                      { AOM_CDF13(20155, 21301, 22838, 23178, 23261, 23533,
+                                  23703, 24804, 25352, 26575, 27016, 28049) } };
+
+static const aom_cdf_prob
+    default_uv_mode_cdf[CFL_ALLOWED_TYPES][INTRA_MODES][CDF_SIZE(
+        UV_INTRA_MODES)] = {
+      { { AOM_CDF13(22631, 24152, 25378, 25661, 25986, 26520, 27055, 27923,
+                    28244, 30059, 30941, 31961) },
+        { AOM_CDF13(9513, 26881, 26973, 27046, 27118, 27664, 27739, 27824,
+                    28359, 29505, 29800, 31796) },
+        { AOM_CDF13(9845, 9915, 28663, 28704, 28757, 28780, 29198, 29822, 29854,
+                    30764, 31777, 32029) },
+        { AOM_CDF13(13639, 13897, 14171, 25331, 25606, 25727, 25953, 27148,
+                    28577, 30612, 31355, 32493) },
+        { AOM_CDF13(9764, 9835, 9930, 9954, 25386, 27053, 27958, 28148, 28243,
+                    31101, 31744, 32363) },
+        { AOM_CDF13(11825, 13589, 13677, 13720, 15048, 29213, 29301, 29458,
+                    29711, 31161, 31441, 32550) },
+        { AOM_CDF13(14175, 14399, 16608, 16821, 17718, 17775, 28551, 30200,
+                    30245, 31837, 32342, 32667) },
+        { AOM_CDF13(12885, 13038, 14978, 15590, 15673, 15748, 16176, 29128,
+                    29267, 30643, 31961, 32461) },
+        { AOM_CDF13(12026, 13661, 13874, 15305, 15490, 15726, 15995, 16273,
+                    28443, 30388, 30767, 32416) },
+        { AOM_CDF13(19052, 19840, 20579, 20916, 21150, 21467, 21885, 22719,
+                    23174, 28861, 30379, 32175) },
+        { AOM_CDF13(18627, 19649, 20974, 21219, 21492, 21816, 22199, 23119,
+                    23527, 27053, 31397, 32148) },
+        { AOM_CDF13(17026, 19004, 19997, 20339, 20586, 21103, 21349, 21907,
+                    22482, 25896, 26541, 31819) },
+        { AOM_CDF13(12124, 13759, 14959, 14992, 15007, 15051, 15078, 15166,
+                    15255, 15753, 16039, 16606) } },
+      { { AOM_CDF14(10407, 11208, 12900, 13181, 13823, 14175, 14899, 15656,
+                    15986, 20086, 20995, 22455, 24212) },
+        { AOM_CDF14(4532, 19780, 20057, 20215, 20428, 21071, 21199, 21451,
+                    22099, 24228, 24693, 27032, 29472) },
+        { AOM_CDF14(5273, 5379, 20177, 20270, 20385, 20439, 20949, 21695, 21774,
+                    23138, 24256, 24703, 26679) },
+        { AOM_CDF14(6740, 7167, 7662, 14152, 14536, 14785, 15034, 16741, 18371,
+                    21520, 22206, 23389, 24182) },
+        { AOM_CDF14(4987, 5368, 5928, 6068, 19114, 20315, 21857, 22253, 22411,
+                    24911, 25380, 26027, 26376) },
+        { AOM_CDF14(5370, 6889, 7247, 7393, 9498, 21114, 21402, 21753, 21981,
+                    24780, 25386, 26517, 27176) },
+        { AOM_CDF14(4816, 4961, 7204, 7326, 8765, 8930, 20169, 20682, 20803,
+                    23188, 23763, 24455, 24940) },
+        { AOM_CDF14(6608, 6740, 8529, 9049, 9257, 9356, 9735, 18827, 19059,
+                    22336, 23204, 23964, 24793) },
+        { AOM_CDF14(5998, 7419, 7781, 8933, 9255, 9549, 9753, 10417, 18898,
+                    22494, 23139, 24764, 25989) },
+        { AOM_CDF14(10660, 11298, 12550, 12957, 13322, 13624, 14040, 15004,
+                    15534, 20714, 21789, 23443, 24861) },
+        { AOM_CDF14(10522, 11530, 12552, 12963, 13378, 13779, 14245, 15235,
+                    15902, 20102, 22696, 23774, 25838) },
+        { AOM_CDF14(10099, 10691, 12639, 13049, 13386, 13665, 14125, 15163,
+                    15636, 19676, 20474, 23519, 25208) },
+        { AOM_CDF14(3144, 5087, 7382, 7504, 7593, 7690, 7801, 8064, 8232, 9248,
+                    9875, 10521, 29048) } }
+    };
+
+static const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(
+    EXT_PARTITION_TYPES)] = {
+  { AOM_CDF4(19132, 25510, 30392) },
+  { AOM_CDF4(13928, 19855, 28540) },
+  { AOM_CDF4(12522, 23679, 28629) },
+  { AOM_CDF4(9896, 18783, 25853) },
+  { AOM_CDF10(15597, 20929, 24571, 26706, 27664, 28821, 29601, 30571, 31902) },
+  { AOM_CDF10(7925, 11043, 16785, 22470, 23971, 25043, 26651, 28701, 29834) },
+  { AOM_CDF10(5414, 13269, 15111, 20488, 22360, 24500, 25537, 26336, 32117) },
+  { AOM_CDF10(2662, 6362, 8614, 20860, 23053, 24778, 26436, 27829, 31171) },
+  { AOM_CDF10(18462, 20920, 23124, 27647, 28227, 29049, 29519, 30178, 31544) },
+  { AOM_CDF10(7689, 9060, 12056, 24992, 25660, 26182, 26951, 28041, 29052) },
+  { AOM_CDF10(6015, 9009, 10062, 24544, 25409, 26545, 27071, 27526, 32047) },
+  { AOM_CDF10(1394, 2208, 2796, 28614, 29061, 29466, 29840, 30185, 31899) },
+  { AOM_CDF10(20137, 21547, 23078, 29566, 29837, 30261, 30524, 30892, 31724) },
+  { AOM_CDF10(6732, 7490, 9497, 27944, 28250, 28515, 28969, 29630, 30104) },
+  { AOM_CDF10(5945, 7663, 8348, 28683, 29117, 29749, 30064, 30298, 32238) },
+  { AOM_CDF10(870, 1212, 1487, 31198, 31394, 31574, 31743, 31881, 32332) },
+  { AOM_CDF8(27899, 28219, 28529, 32484, 32539, 32619, 32639) },
+  { AOM_CDF8(6607, 6990, 8268, 32060, 32219, 32338, 32371) },
+  { AOM_CDF8(5429, 6676, 7122, 32027, 32227, 32531, 32582) },
+  { AOM_CDF8(711, 966, 1172, 32448, 32538, 32617, 32664) },
+};
+
+static const aom_cdf_prob default_intra_ext_tx_cdf
+    [EXT_TX_SETS_INTRA][EXT_TX_SIZES][INTRA_MODES][CDF_SIZE(TX_TYPES)] = {
+      {
+          {
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+          },
+          {
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+          },
+          {
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+          },
+          {
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+              { 0 },
+          },
+      },
+      {
+          {
+              { AOM_CDF7(1535, 8035, 9461, 12751, 23467, 27825) },
+              { AOM_CDF7(564, 3335, 9709, 10870, 18143, 28094) },
+              { AOM_CDF7(672, 3247, 3676, 11982, 19415, 23127) },
+              { AOM_CDF7(5279, 13885, 15487, 18044, 23527, 30252) },
+              { AOM_CDF7(4423, 6074, 7985, 10416, 25693, 29298) },
+              { AOM_CDF7(1486, 4241, 9460, 10662, 16456, 27694) },
+              { AOM_CDF7(439, 2838, 3522, 6737, 18058, 23754) },
+              { AOM_CDF7(1190, 4233, 4855, 11670, 20281, 24377) },
+              { AOM_CDF7(1045, 4312, 8647, 10159, 18644, 29335) },
+              { AOM_CDF7(202, 3734, 4747, 7298, 17127, 24016) },
+              { AOM_CDF7(447, 4312, 6819, 8884, 16010, 23858) },
+              { AOM_CDF7(277, 4369, 5255, 8905, 16465, 22271) },
+              { AOM_CDF7(3409, 5436, 10599, 15599, 19687, 24040) },
+          },
+          {
+              { AOM_CDF7(1870, 13742, 14530, 16498, 23770, 27698) },
+              { AOM_CDF7(326, 8796, 14632, 15079, 19272, 27486) },
+              { AOM_CDF7(484, 7576, 7712, 14443, 19159, 22591) },
+              { AOM_CDF7(1126, 15340, 15895, 17023, 20896, 30279) },
+              { AOM_CDF7(655, 4854, 5249, 5913, 22099, 27138) },
+              { AOM_CDF7(1299, 6458, 8885, 9290, 14851, 25497) },
+              { AOM_CDF7(311, 5295, 5552, 6885, 16107, 22672) },
+              { AOM_CDF7(883, 8059, 8270, 11258, 17289, 21549) },
+              { AOM_CDF7(741, 7580, 9318, 10345, 16688, 29046) },
+              { AOM_CDF7(110, 7406, 7915, 9195, 16041, 23329) },
+              { AOM_CDF7(363, 7974, 9357, 10673, 15629, 24474) },
+              { AOM_CDF7(153, 7647, 8112, 9936, 15307, 19996) },
+              { AOM_CDF7(3511, 6332, 11165, 15335, 19323, 23594) },
+          },
+          {
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+          },
+          {
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+              { AOM_CDF7(4681, 9362, 14043, 18725, 23406, 28087) },
+          },
+      },
+      {
+          {
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+          },
+          {
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+          },
+          {
+              { AOM_CDF5(1127, 12814, 22772, 27483) },
+              { AOM_CDF5(145, 6761, 11980, 26667) },
+              { AOM_CDF5(362, 5887, 11678, 16725) },
+              { AOM_CDF5(385, 15213, 18587, 30693) },
+              { AOM_CDF5(25, 2914, 23134, 27903) },
+              { AOM_CDF5(60, 4470, 11749, 23991) },
+              { AOM_CDF5(37, 3332, 14511, 21448) },
+              { AOM_CDF5(157, 6320, 13036, 17439) },
+              { AOM_CDF5(119, 6719, 12906, 29396) },
+              { AOM_CDF5(47, 5537, 12576, 21499) },
+              { AOM_CDF5(269, 6076, 11258, 23115) },
+              { AOM_CDF5(83, 5615, 12001, 17228) },
+              { AOM_CDF5(1968, 5556, 12023, 18547) },
+          },
+          {
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+              { AOM_CDF5(6554, 13107, 19661, 26214) },
+          },
+      },
+    };
+
+static const aom_cdf_prob
+    default_inter_ext_tx_cdf[EXT_TX_SETS_INTER][EXT_TX_SIZES][CDF_SIZE(
+        TX_TYPES)] = {
+      {
+          { 0 },
+          { 0 },
+          { 0 },
+          { 0 },
+      },
+      {
+          { AOM_CDF16(4458, 5560, 7695, 9709, 13330, 14789, 17537, 20266, 21504,
+                      22848, 23934, 25474, 27727, 28915, 30631) },
+          { AOM_CDF16(1645, 2573, 4778, 5711, 7807, 8622, 10522, 15357, 17674,
+                      20408, 22517, 25010, 27116, 28856, 30749) },
+          { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384, 18432,
+                      20480, 22528, 24576, 26624, 28672, 30720) },
+          { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384, 18432,
+                      20480, 22528, 24576, 26624, 28672, 30720) },
+      },
+      {
+          { AOM_CDF12(2731, 5461, 8192, 10923, 13653, 16384, 19115, 21845,
+                      24576, 27307, 30037) },
+          { AOM_CDF12(2731, 5461, 8192, 10923, 13653, 16384, 19115, 21845,
+                      24576, 27307, 30037) },
+          { AOM_CDF12(770, 2421, 5225, 12907, 15819, 18927, 21561, 24089, 26595,
+                      28526, 30529) },
+          { AOM_CDF12(2731, 5461, 8192, 10923, 13653, 16384, 19115, 21845,
+                      24576, 27307, 30037) },
+      },
+      {
+          { AOM_CDF2(16384) },
+          { AOM_CDF2(4167) },
+          { AOM_CDF2(1998) },
+          { AOM_CDF2(748) },
+      },
+    };
+
+static const aom_cdf_prob default_cfl_sign_cdf[CDF_SIZE(CFL_JOINT_SIGNS)] = {
+  AOM_CDF8(1418, 2123, 13340, 18405, 26972, 28343, 32294)
+};
+
+static const aom_cdf_prob
+    default_cfl_alpha_cdf[CFL_ALPHA_CONTEXTS][CDF_SIZE(CFL_ALPHABET_SIZE)] = {
+      { AOM_CDF16(7637, 20719, 31401, 32481, 32657, 32688, 32692, 32696, 32700,
+                  32704, 32708, 32712, 32716, 32720, 32724) },
+      { AOM_CDF16(14365, 23603, 28135, 31168, 32167, 32395, 32487, 32573, 32620,
+                  32647, 32668, 32672, 32676, 32680, 32684) },
+      { AOM_CDF16(11532, 22380, 28445, 31360, 32349, 32523, 32584, 32649, 32673,
+                  32677, 32681, 32685, 32689, 32693, 32697) },
+      { AOM_CDF16(26990, 31402, 32282, 32571, 32692, 32696, 32700, 32704, 32708,
+                  32712, 32716, 32720, 32724, 32728, 32732) },
+      { AOM_CDF16(17248, 26058, 28904, 30608, 31305, 31877, 32126, 32321, 32394,
+                  32464, 32516, 32560, 32576, 32593, 32622) },
+      { AOM_CDF16(14738, 21678, 25779, 27901, 29024, 30302, 30980, 31843, 32144,
+                  32413, 32520, 32594, 32622, 32656, 32660) }
+    };
+
+static const aom_cdf_prob
+    default_switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS][CDF_SIZE(
+        SWITCHABLE_FILTERS)] = {
+      { AOM_CDF3(31935, 32720) }, { AOM_CDF3(5568, 32719) },
+      { AOM_CDF3(422, 2938) },    { AOM_CDF3(28244, 32608) },
+      { AOM_CDF3(31206, 31953) }, { AOM_CDF3(4862, 32121) },
+      { AOM_CDF3(770, 1152) },    { AOM_CDF3(20889, 25637) },
+      { AOM_CDF3(31910, 32724) }, { AOM_CDF3(4120, 32712) },
+      { AOM_CDF3(305, 2247) },    { AOM_CDF3(27403, 32636) },
+      { AOM_CDF3(31022, 32009) }, { AOM_CDF3(2963, 32093) },
+      { AOM_CDF3(601, 943) },     { AOM_CDF3(14969, 21398) }
+    };
+
+static const aom_cdf_prob default_newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(
+    2)] = { { AOM_CDF2(24035) }, { AOM_CDF2(16630) }, { AOM_CDF2(15339) },
+            { AOM_CDF2(8386) },  { AOM_CDF2(12222) }, { AOM_CDF2(4676) } };
+
+static const aom_cdf_prob default_zeromv_cdf[GLOBALMV_MODE_CONTEXTS][CDF_SIZE(
+    2)] = { { AOM_CDF2(2175) }, { AOM_CDF2(1054) } };
+
+static const aom_cdf_prob default_refmv_cdf[REFMV_MODE_CONTEXTS][CDF_SIZE(
+    2)] = { { AOM_CDF2(23974) }, { AOM_CDF2(24188) }, { AOM_CDF2(17848) },
+            { AOM_CDF2(28622) }, { AOM_CDF2(24312) }, { AOM_CDF2(19923) } };
+
+static const aom_cdf_prob default_drl_cdf[DRL_MODE_CONTEXTS][CDF_SIZE(2)] = {
+  { AOM_CDF2(13104) }, { AOM_CDF2(24560) }, { AOM_CDF2(18945) }
+};
+
+static const aom_cdf_prob
+    default_inter_compound_mode_cdf[INTER_MODE_CONTEXTS][CDF_SIZE(
+        INTER_COMPOUND_MODES)] = {
+      { AOM_CDF8(7760, 13823, 15808, 17641, 19156, 20666, 26891) },
+      { AOM_CDF8(10730, 19452, 21145, 22749, 24039, 25131, 28724) },
+      { AOM_CDF8(10664, 20221, 21588, 22906, 24295, 25387, 28436) },
+      { AOM_CDF8(13298, 16984, 20471, 24182, 25067, 25736, 26422) },
+      { AOM_CDF8(18904, 23325, 25242, 27432, 27898, 28258, 30758) },
+      { AOM_CDF8(10725, 17454, 20124, 22820, 24195, 25168, 26046) },
+      { AOM_CDF8(17125, 24273, 25814, 27492, 28214, 28704, 30592) },
+      { AOM_CDF8(13046, 23214, 24505, 25942, 27435, 28442, 29330) }
+    };
+
+static const aom_cdf_prob default_interintra_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
+    2)] = { { AOM_CDF2(16384) },
+            { AOM_CDF2(26887) },
+            { AOM_CDF2(27597) },
+            { AOM_CDF2(30237) } };
+
+static const aom_cdf_prob
+    default_interintra_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
+        INTERINTRA_MODES)] = { { AOM_CDF4(8192, 16384, 24576) },
+                               { AOM_CDF4(1875, 11082, 27332) },
+                               { AOM_CDF4(2473, 9996, 26388) },
+                               { AOM_CDF4(4238, 11537, 25926) } };
+
+static const aom_cdf_prob
+    default_wedge_interintra_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
+      { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+      { AOM_CDF2(20036) }, { AOM_CDF2(24957) }, { AOM_CDF2(26704) },
+      { AOM_CDF2(27530) }, { AOM_CDF2(29564) }, { AOM_CDF2(29444) },
+      { AOM_CDF2(26872) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+      { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+      { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+      { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+      { AOM_CDF2(16384) }
+    };
+
+static const aom_cdf_prob default_compound_type_cdf[BLOCK_SIZES_ALL][CDF_SIZE(
+    MASKED_COMPOUND_TYPES)] = {
+  { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+  { AOM_CDF2(23431) }, { AOM_CDF2(13171) }, { AOM_CDF2(11470) },
+  { AOM_CDF2(9770) },  { AOM_CDF2(9100) },  { AOM_CDF2(8233) },
+  { AOM_CDF2(6172) },  { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+  { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+  { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+  { AOM_CDF2(11820) }, { AOM_CDF2(7701) },  { AOM_CDF2(16384) },
+  { AOM_CDF2(16384) }
+};
+
+static const aom_cdf_prob default_wedge_idx_cdf[BLOCK_SIZES_ALL][CDF_SIZE(
+    16)] = { { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2438, 4440, 6599, 8663, 11005, 12874, 15751, 18094,
+                         20359, 22362, 24127, 25702, 27752, 29450, 31171) },
+             { AOM_CDF16(806, 3266, 6005, 6738, 7218, 7367, 7771, 14588, 16323,
+                         17367, 18452, 19422, 22839, 26127, 29629) },
+             { AOM_CDF16(2779, 3738, 4683, 7213, 7775, 8017, 8655, 14357, 17939,
+                         21332, 24520, 27470, 29456, 30529, 31656) },
+             { AOM_CDF16(1684, 3625, 5675, 7108, 9302, 11274, 14429, 17144,
+                         19163, 20961, 22884, 24471, 26719, 28714, 30877) },
+             { AOM_CDF16(1142, 3491, 6277, 7314, 8089, 8355, 9023, 13624, 15369,
+                         16730, 18114, 19313, 22521, 26012, 29550) },
+             { AOM_CDF16(2742, 4195, 5727, 8035, 8980, 9336, 10146, 14124,
+                         17270, 20533, 23434, 25972, 27944, 29570, 31416) },
+             { AOM_CDF16(1727, 3948, 6101, 7796, 9841, 12344, 15766, 18944,
+                         20638, 22038, 23963, 25311, 26988, 28766, 31012) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(154, 987, 1925, 2051, 2088, 2111, 2151, 23033, 23703,
+                         24284, 24985, 25684, 27259, 28883, 30911) },
+             { AOM_CDF16(1135, 1322, 1493, 2635, 2696, 2737, 2770, 21016, 22935,
+                         25057, 27251, 29173, 30089, 30960, 31933) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) },
+             { AOM_CDF16(2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384,
+                         18432, 20480, 22528, 24576, 26624, 28672, 30720) } };
+
+static const aom_cdf_prob default_motion_mode_cdf[BLOCK_SIZES_ALL][CDF_SIZE(
+    MOTION_MODES)] = { { AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
+                       { AOM_CDF3(10923, 21845) }, { AOM_CDF3(7651, 24760) },
+                       { AOM_CDF3(4738, 24765) },  { AOM_CDF3(5391, 25528) },
+                       { AOM_CDF3(19419, 26810) }, { AOM_CDF3(5123, 23606) },
+                       { AOM_CDF3(11606, 24308) }, { AOM_CDF3(26260, 29116) },
+                       { AOM_CDF3(20360, 28062) }, { AOM_CDF3(21679, 26830) },
+                       { AOM_CDF3(29516, 30701) }, { AOM_CDF3(28898, 30397) },
+                       { AOM_CDF3(30878, 31335) }, { AOM_CDF3(32507, 32558) },
+                       { AOM_CDF3(10923, 21845) }, { AOM_CDF3(10923, 21845) },
+                       { AOM_CDF3(28799, 31390) }, { AOM_CDF3(26431, 30774) },
+                       { AOM_CDF3(28973, 31594) }, { AOM_CDF3(29742, 31203) } };
+
+static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
+  { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+  { AOM_CDF2(10437) }, { AOM_CDF2(9371) },  { AOM_CDF2(9301) },
+  { AOM_CDF2(17432) }, { AOM_CDF2(14423) }, { AOM_CDF2(15142) },
+  { AOM_CDF2(25817) }, { AOM_CDF2(22823) }, { AOM_CDF2(22083) },
+  { AOM_CDF2(30128) }, { AOM_CDF2(31014) }, { AOM_CDF2(31560) },
+  { AOM_CDF2(32638) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+  { AOM_CDF2(23664) }, { AOM_CDF2(20901) }, { AOM_CDF2(24008) },
+  { AOM_CDF2(26879) }
+};
+
+static const aom_cdf_prob default_intra_inter_cdf[INTRA_INTER_CONTEXTS]
+                                                 [CDF_SIZE(2)] = {
+                                                   { AOM_CDF2(806) },
+                                                   { AOM_CDF2(16662) },
+                                                   { AOM_CDF2(20186) },
+                                                   { AOM_CDF2(26538) }
+                                                 };
+
+static const aom_cdf_prob default_comp_inter_cdf[COMP_INTER_CONTEXTS][CDF_SIZE(
+    2)] = { { AOM_CDF2(26828) },
+            { AOM_CDF2(24035) },
+            { AOM_CDF2(12031) },
+            { AOM_CDF2(10640) },
+            { AOM_CDF2(2901) } };
+
+static const aom_cdf_prob default_comp_ref_type_cdf[COMP_REF_TYPE_CONTEXTS]
+                                                   [CDF_SIZE(2)] = {
+                                                     { AOM_CDF2(1198) },
+                                                     { AOM_CDF2(2070) },
+                                                     { AOM_CDF2(9166) },
+                                                     { AOM_CDF2(7499) },
+                                                     { AOM_CDF2(22475) }
+                                                   };
+
+static const aom_cdf_prob
+    default_uni_comp_ref_cdf[UNI_COMP_REF_CONTEXTS][UNIDIR_COMP_REFS -
+                                                    1][CDF_SIZE(2)] = {
+      { { AOM_CDF2(5284) }, { AOM_CDF2(3865) }, { AOM_CDF2(3128) } },
+      { { AOM_CDF2(23152) }, { AOM_CDF2(14173) }, { AOM_CDF2(15270) } },
+      { { AOM_CDF2(31774) }, { AOM_CDF2(25120) }, { AOM_CDF2(26710) } }
+    };
+
+static const aom_cdf_prob default_single_ref_cdf[REF_CONTEXTS][SINGLE_REFS - 1]
+                                                [CDF_SIZE(2)] = {
+                                                  { { AOM_CDF2(4897) },
+                                                    { AOM_CDF2(1555) },
+                                                    { AOM_CDF2(4236) },
+                                                    { AOM_CDF2(8650) },
+                                                    { AOM_CDF2(904) },
+                                                    { AOM_CDF2(1444) } },
+                                                  { { AOM_CDF2(16973) },
+                                                    { AOM_CDF2(16751) },
+                                                    { AOM_CDF2(19647) },
+                                                    { AOM_CDF2(24773) },
+                                                    { AOM_CDF2(11014) },
+                                                    { AOM_CDF2(15087) } },
+                                                  { { AOM_CDF2(29744) },
+                                                    { AOM_CDF2(30279) },
+                                                    { AOM_CDF2(31194) },
+                                                    { AOM_CDF2(31895) },
+                                                    { AOM_CDF2(26875) },
+                                                    { AOM_CDF2(30304) } }
+                                                };
+
+static const aom_cdf_prob
+    default_comp_ref_cdf[REF_CONTEXTS][FWD_REFS - 1][CDF_SIZE(2)] = {
+      { { AOM_CDF2(4946) }, { AOM_CDF2(9468) }, { AOM_CDF2(1503) } },
+      { { AOM_CDF2(19891) }, { AOM_CDF2(22441) }, { AOM_CDF2(15160) } },
+      { { AOM_CDF2(30731) }, { AOM_CDF2(31059) }, { AOM_CDF2(27544) } }
+    };
+
+static const aom_cdf_prob
+    default_comp_bwdref_cdf[REF_CONTEXTS][BWD_REFS - 1][CDF_SIZE(2)] = {
+      { { AOM_CDF2(2235) }, { AOM_CDF2(1423) } },
+      { { AOM_CDF2(17182) }, { AOM_CDF2(15175) } },
+      { { AOM_CDF2(30606) }, { AOM_CDF2(30489) } }
+    };
+
+static const aom_cdf_prob
+    default_palette_y_size_cdf[PALATTE_BSIZE_CTXS][CDF_SIZE(PALETTE_SIZES)] = {
+      { AOM_CDF7(7952, 13000, 18149, 21478, 25527, 29241) },
+      { AOM_CDF7(7139, 11421, 16195, 19544, 23666, 28073) },
+      { AOM_CDF7(7788, 12741, 17325, 20500, 24315, 28530) },
+      { AOM_CDF7(8271, 14064, 18246, 21564, 25071, 28533) },
+      { AOM_CDF7(12725, 19180, 21863, 24839, 27535, 30120) },
+      { AOM_CDF7(9711, 14888, 16923, 21052, 25661, 27875) },
+      { AOM_CDF7(14940, 20797, 21678, 24186, 27033, 28999) }
+    };
+
+static const aom_cdf_prob
+    default_palette_uv_size_cdf[PALATTE_BSIZE_CTXS][CDF_SIZE(PALETTE_SIZES)] = {
+      { AOM_CDF7(8713, 19979, 27128, 29609, 31331, 32272) },
+      { AOM_CDF7(5839, 15573, 23581, 26947, 29848, 31700) },
+      { AOM_CDF7(4426, 11260, 17999, 21483, 25863, 29430) },
+      { AOM_CDF7(3228, 9464, 14993, 18089, 22523, 27420) },
+      { AOM_CDF7(3768, 8886, 13091, 17852, 22495, 27207) },
+      { AOM_CDF7(2464, 8451, 12861, 21632, 25525, 28555) },
+      { AOM_CDF7(1269, 5435, 10433, 18963, 21700, 25865) }
+    };
+
+static const aom_cdf_prob default_palette_y_mode_cdf
+    [PALATTE_BSIZE_CTXS][PALETTE_Y_MODE_CONTEXTS][CDF_SIZE(2)] = {
+      { { AOM_CDF2(31676) }, { AOM_CDF2(3419) }, { AOM_CDF2(1261) } },
+      { { AOM_CDF2(31912) }, { AOM_CDF2(2859) }, { AOM_CDF2(980) } },
+      { { AOM_CDF2(31823) }, { AOM_CDF2(3400) }, { AOM_CDF2(781) } },
+      { { AOM_CDF2(32030) }, { AOM_CDF2(3561) }, { AOM_CDF2(904) } },
+      { { AOM_CDF2(32309) }, { AOM_CDF2(7337) }, { AOM_CDF2(1462) } },
+      { { AOM_CDF2(32265) }, { AOM_CDF2(4015) }, { AOM_CDF2(1521) } },
+      { { AOM_CDF2(32450) }, { AOM_CDF2(7946) }, { AOM_CDF2(129) } }
+    };
+
+static const aom_cdf_prob
+    default_palette_uv_mode_cdf[PALETTE_UV_MODE_CONTEXTS][CDF_SIZE(2)] = {
+      { AOM_CDF2(32461) }, { AOM_CDF2(21488) }
+    };
+
+static const aom_cdf_prob default_palette_y_color_index_cdf
+    [PALETTE_SIZES][PALETTE_COLOR_INDEX_CONTEXTS][CDF_SIZE(PALETTE_COLORS)] = {
+      {
+          { AOM_CDF2(28710) },
+          { AOM_CDF2(16384) },
+          { AOM_CDF2(10553) },
+          { AOM_CDF2(27036) },
+          { AOM_CDF2(31603) },
+      },
+      {
+          { AOM_CDF3(27877, 30490) },
+          { AOM_CDF3(11532, 25697) },
+          { AOM_CDF3(6544, 30234) },
+          { AOM_CDF3(23018, 28072) },
+          { AOM_CDF3(31915, 32385) },
+      },
+      {
+          { AOM_CDF4(25572, 28046, 30045) },
+          { AOM_CDF4(9478, 21590, 27256) },
+          { AOM_CDF4(7248, 26837, 29824) },
+          { AOM_CDF4(19167, 24486, 28349) },
+          { AOM_CDF4(31400, 31825, 32250) },
+      },
+      {
+          { AOM_CDF5(24779, 26955, 28576, 30282) },
+          { AOM_CDF5(8669, 20364, 24073, 28093) },
+          { AOM_CDF5(4255, 27565, 29377, 31067) },
+          { AOM_CDF5(19864, 23674, 26716, 29530) },
+          { AOM_CDF5(31646, 31893, 32147, 32426) },
+      },
+      {
+          { AOM_CDF6(23132, 25407, 26970, 28435, 30073) },
+          { AOM_CDF6(7443, 17242, 20717, 24762, 27982) },
+          { AOM_CDF6(6300, 24862, 26944, 28784, 30671) },
+          { AOM_CDF6(18916, 22895, 25267, 27435, 29652) },
+          { AOM_CDF6(31270, 31550, 31808, 32059, 32353) },
+      },
+      {
+          { AOM_CDF7(23105, 25199, 26464, 27684, 28931, 30318) },
+          { AOM_CDF7(6950, 15447, 18952, 22681, 25567, 28563) },
+          { AOM_CDF7(7560, 23474, 25490, 27203, 28921, 30708) },
+          { AOM_CDF7(18544, 22373, 24457, 26195, 28119, 30045) },
+          { AOM_CDF7(31198, 31451, 31670, 31882, 32123, 32391) },
+      },
+      {
+          { AOM_CDF8(21689, 23883, 25163, 26352, 27506, 28827, 30195) },
+          { AOM_CDF8(6892, 15385, 17840, 21606, 24287, 26753, 29204) },
+          { AOM_CDF8(5651, 23182, 25042, 26518, 27982, 29392, 30900) },
+          { AOM_CDF8(19349, 22578, 24418, 25994, 27524, 29031, 30448) },
+          { AOM_CDF8(31028, 31270, 31504, 31705, 31927, 32153, 32392) },
+      },
+    };
+
+static const aom_cdf_prob default_palette_uv_color_index_cdf
+    [PALETTE_SIZES][PALETTE_COLOR_INDEX_CONTEXTS][CDF_SIZE(PALETTE_COLORS)] = {
+      {
+          { AOM_CDF2(29089) },
+          { AOM_CDF2(16384) },
+          { AOM_CDF2(8713) },
+          { AOM_CDF2(29257) },
+          { AOM_CDF2(31610) },
+      },
+      {
+          { AOM_CDF3(25257, 29145) },
+          { AOM_CDF3(12287, 27293) },
+          { AOM_CDF3(7033, 27960) },
+          { AOM_CDF3(20145, 25405) },
+          { AOM_CDF3(30608, 31639) },
+      },
+      {
+          { AOM_CDF4(24210, 27175, 29903) },
+          { AOM_CDF4(9888, 22386, 27214) },
+          { AOM_CDF4(5901, 26053, 29293) },
+          { AOM_CDF4(18318, 22152, 28333) },
+          { AOM_CDF4(30459, 31136, 31926) },
+      },
+      {
+          { AOM_CDF5(22980, 25479, 27781, 29986) },
+          { AOM_CDF5(8413, 21408, 24859, 28874) },
+          { AOM_CDF5(2257, 29449, 30594, 31598) },
+          { AOM_CDF5(19189, 21202, 25915, 28620) },
+          { AOM_CDF5(31844, 32044, 32281, 32518) },
+      },
+      {
+          { AOM_CDF6(22217, 24567, 26637, 28683, 30548) },
+          { AOM_CDF6(7307, 16406, 19636, 24632, 28424) },
+          { AOM_CDF6(4441, 25064, 26879, 28942, 30919) },
+          { AOM_CDF6(17210, 20528, 23319, 26750, 29582) },
+          { AOM_CDF6(30674, 30953, 31396, 31735, 32207) },
+      },
+      {
+          { AOM_CDF7(21239, 23168, 25044, 26962, 28705, 30506) },
+          { AOM_CDF7(6545, 15012, 18004, 21817, 25503, 28701) },
+          { AOM_CDF7(3448, 26295, 27437, 28704, 30126, 31442) },
+          { AOM_CDF7(15889, 18323, 21704, 24698, 26976, 29690) },
+          { AOM_CDF7(30988, 31204, 31479, 31734, 31983, 32325) },
+      },
+      {
+          { AOM_CDF8(21442, 23288, 24758, 26246, 27649, 28980, 30563) },
+          { AOM_CDF8(5863, 14933, 17552, 20668, 23683, 26411, 29273) },
+          { AOM_CDF8(3415, 25810, 26877, 27990, 29223, 30394, 31618) },
+          { AOM_CDF8(17965, 20084, 22232, 23974, 26274, 28402, 30390) },
+          { AOM_CDF8(31190, 31329, 31516, 31679, 31825, 32026, 32322) },
+      },
+    };
+
+static const aom_cdf_prob
+    default_txfm_partition_cdf[TXFM_PARTITION_CONTEXTS][CDF_SIZE(2)] = {
+      { AOM_CDF2(28581) }, { AOM_CDF2(23846) }, { AOM_CDF2(20847) },
+      { AOM_CDF2(24315) }, { AOM_CDF2(18196) }, { AOM_CDF2(12133) },
+      { AOM_CDF2(18791) }, { AOM_CDF2(10887) }, { AOM_CDF2(11005) },
+      { AOM_CDF2(27179) }, { AOM_CDF2(20004) }, { AOM_CDF2(11281) },
+      { AOM_CDF2(26549) }, { AOM_CDF2(19308) }, { AOM_CDF2(14224) },
+      { AOM_CDF2(28015) }, { AOM_CDF2(21546) }, { AOM_CDF2(14400) },
+      { AOM_CDF2(28165) }, { AOM_CDF2(22401) }, { AOM_CDF2(16088) }
+    };
+
+static const aom_cdf_prob default_skip_txfm_cdfs[SKIP_CONTEXTS][CDF_SIZE(2)] = {
+  { AOM_CDF2(31671) }, { AOM_CDF2(16515) }, { AOM_CDF2(4576) }
+};
+
+static const aom_cdf_prob default_skip_mode_cdfs[SKIP_MODE_CONTEXTS][CDF_SIZE(
+    2)] = { { AOM_CDF2(32621) }, { AOM_CDF2(20708) }, { AOM_CDF2(8127) } };
+
+static const aom_cdf_prob
+    default_compound_idx_cdfs[COMP_INDEX_CONTEXTS][CDF_SIZE(2)] = {
+      { AOM_CDF2(18244) }, { AOM_CDF2(12865) }, { AOM_CDF2(7053) },
+      { AOM_CDF2(13259) }, { AOM_CDF2(9334) },  { AOM_CDF2(4644) }
+    };
+
+static const aom_cdf_prob
+    default_comp_group_idx_cdfs[COMP_GROUP_IDX_CONTEXTS][CDF_SIZE(2)] = {
+      { AOM_CDF2(26607) }, { AOM_CDF2(22891) }, { AOM_CDF2(18840) },
+      { AOM_CDF2(24594) }, { AOM_CDF2(19934) }, { AOM_CDF2(22674) }
+    };
+
+static const aom_cdf_prob default_intrabc_cdf[CDF_SIZE(2)] = { AOM_CDF2(
+    30531) };
+
+static const aom_cdf_prob default_filter_intra_mode_cdf[CDF_SIZE(
+    FILTER_INTRA_MODES)] = { AOM_CDF5(8949, 12776, 17211, 29558) };
+
+static const aom_cdf_prob default_filter_intra_cdfs[BLOCK_SIZES_ALL][CDF_SIZE(
+    2)] = { { AOM_CDF2(4621) },  { AOM_CDF2(6743) },  { AOM_CDF2(5893) },
+            { AOM_CDF2(7866) },  { AOM_CDF2(12551) }, { AOM_CDF2(9394) },
+            { AOM_CDF2(12408) }, { AOM_CDF2(14301) }, { AOM_CDF2(12756) },
+            { AOM_CDF2(22343) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+            { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
+            { AOM_CDF2(16384) }, { AOM_CDF2(12770) }, { AOM_CDF2(10368) },
+            { AOM_CDF2(20229) }, { AOM_CDF2(18101) }, { AOM_CDF2(16384) },
+            { AOM_CDF2(16384) } };
+
+static const aom_cdf_prob default_switchable_restore_cdf[CDF_SIZE(
+    RESTORE_SWITCHABLE_TYPES)] = { AOM_CDF3(9413, 22581) };
+
+static const aom_cdf_prob default_wiener_restore_cdf[CDF_SIZE(2)] = { AOM_CDF2(
+    11570) };
+
+static const aom_cdf_prob default_sgrproj_restore_cdf[CDF_SIZE(2)] = { AOM_CDF2(
+    16855) };
+
+static const aom_cdf_prob default_delta_q_cdf[CDF_SIZE(DELTA_Q_PROBS + 1)] = {
+  AOM_CDF4(28160, 32120, 32677)
+};
+
+static const aom_cdf_prob default_delta_lf_multi_cdf[FRAME_LF_COUNT][CDF_SIZE(
+    DELTA_LF_PROBS + 1)] = { { AOM_CDF4(28160, 32120, 32677) },
+                             { AOM_CDF4(28160, 32120, 32677) },
+                             { AOM_CDF4(28160, 32120, 32677) },
+                             { AOM_CDF4(28160, 32120, 32677) } };
+static const aom_cdf_prob default_delta_lf_cdf[CDF_SIZE(DELTA_LF_PROBS + 1)] = {
+  AOM_CDF4(28160, 32120, 32677)
+};
+
+// FIXME(someone) need real defaults here
+static const aom_cdf_prob default_seg_tree_cdf[CDF_SIZE(MAX_SEGMENTS)] = {
+  AOM_CDF8(4096, 8192, 12288, 16384, 20480, 24576, 28672)
+};
+
+static const aom_cdf_prob
+    default_segment_pred_cdf[SEG_TEMPORAL_PRED_CTXS][CDF_SIZE(2)] = {
+      { AOM_CDF2(128 * 128) }, { AOM_CDF2(128 * 128) }, { AOM_CDF2(128 * 128) }
+    };
+
+static const aom_cdf_prob
+    default_spatial_pred_seg_tree_cdf[SPATIAL_PREDICTION_PROBS][CDF_SIZE(
+        MAX_SEGMENTS)] = {
+      {
+          AOM_CDF8(5622, 7893, 16093, 18233, 27809, 28373, 32533),
+      },
+      {
+          AOM_CDF8(14274, 18230, 22557, 24935, 29980, 30851, 32344),
+      },
+      {
+          AOM_CDF8(27527, 28487, 28723, 28890, 32397, 32647, 32679),
+      },
+    };
+
+static const aom_cdf_prob default_tx_size_cdf[MAX_TX_CATS][TX_SIZE_CONTEXTS]
+                                             [CDF_SIZE(MAX_TX_DEPTH + 1)] = {
+                                               { { AOM_CDF2(19968) },
+                                                 { AOM_CDF2(19968) },
+                                                 { AOM_CDF2(24320) } },
+                                               { { AOM_CDF3(12272, 30172) },
+                                                 { AOM_CDF3(12272, 30172) },
+                                                 { AOM_CDF3(18677, 30848) } },
+                                               { { AOM_CDF3(12986, 15180) },
+                                                 { AOM_CDF3(12986, 15180) },
+                                                 { AOM_CDF3(24302, 25602) } },
+                                               { { AOM_CDF3(5782, 11475) },
+                                                 { AOM_CDF3(5782, 11475) },
+                                                 { AOM_CDF3(16803, 22759) } },
+                                             };
+
+#define MAX_COLOR_CONTEXT_HASH 8
+// Negative values are invalid
+static const int palette_color_index_context_lookup[MAX_COLOR_CONTEXT_HASH +
+                                                    1] = { -1, -1, 0, -1, -1,
+                                                           4,  3,  2, 1 };
+
+#define NUM_PALETTE_NEIGHBORS 3  // left, top-left and top.
+int av1_get_palette_color_index_context(const uint8_t *color_map, int stride,
+                                        int r, int c, int palette_size,
+                                        uint8_t *color_order, int *color_idx) {
+  assert(palette_size <= PALETTE_MAX_SIZE);
+  assert(r > 0 || c > 0);
+
+  // Get color indices of neighbors.
+  int color_neighbors[NUM_PALETTE_NEIGHBORS];
+  color_neighbors[0] = (c - 1 >= 0) ? color_map[r * stride + c - 1] : -1;
+  color_neighbors[1] =
+      (c - 1 >= 0 && r - 1 >= 0) ? color_map[(r - 1) * stride + c - 1] : -1;
+  color_neighbors[2] = (r - 1 >= 0) ? color_map[(r - 1) * stride + c] : -1;
+
+  // The +10 below should not be needed. But we get a warning "array subscript
+  // is above array bounds [-Werror=array-bounds]" without it, possibly due to
+  // this (or similar) bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
+  int scores[PALETTE_MAX_SIZE + 10] = { 0 };
+  int i;
+  static const int weights[NUM_PALETTE_NEIGHBORS] = { 2, 1, 2 };
+  for (i = 0; i < NUM_PALETTE_NEIGHBORS; ++i) {
+    if (color_neighbors[i] >= 0) {
+      scores[color_neighbors[i]] += weights[i];
+    }
+  }
+
+  int inverse_color_order[PALETTE_MAX_SIZE];
+  for (i = 0; i < PALETTE_MAX_SIZE; ++i) {
+    color_order[i] = i;
+    inverse_color_order[i] = i;
+  }
+
+  // Get the top NUM_PALETTE_NEIGHBORS scores (sorted from large to small).
+  for (i = 0; i < NUM_PALETTE_NEIGHBORS; ++i) {
+    int max = scores[i];
+    int max_idx = i;
+    for (int j = i + 1; j < palette_size; ++j) {
+      if (scores[j] > max) {
+        max = scores[j];
+        max_idx = j;
+      }
+    }
+    if (max_idx != i) {
+      // Move the score at index 'max_idx' to index 'i', and shift the scores
+      // from 'i' to 'max_idx - 1' by 1.
+      const int max_score = scores[max_idx];
+      const uint8_t max_color_order = color_order[max_idx];
+      for (int k = max_idx; k > i; --k) {
+        scores[k] = scores[k - 1];
+        color_order[k] = color_order[k - 1];
+        inverse_color_order[color_order[k]] = k;
+      }
+      scores[i] = max_score;
+      color_order[i] = max_color_order;
+      inverse_color_order[color_order[i]] = i;
+    }
+  }
+
+  if (color_idx != NULL)
+    *color_idx = inverse_color_order[color_map[r * stride + c]];
+
+  // Get hash value of context.
+  int color_index_ctx_hash = 0;
+  static const int hash_multipliers[NUM_PALETTE_NEIGHBORS] = { 1, 2, 2 };
+  for (i = 0; i < NUM_PALETTE_NEIGHBORS; ++i) {
+    color_index_ctx_hash += scores[i] * hash_multipliers[i];
+  }
+  assert(color_index_ctx_hash > 0);
+  assert(color_index_ctx_hash <= MAX_COLOR_CONTEXT_HASH);
+
+  // Lookup context from hash.
+  const int color_index_ctx =
+      palette_color_index_context_lookup[color_index_ctx_hash];
+  assert(color_index_ctx >= 0);
+  assert(color_index_ctx < PALETTE_COLOR_INDEX_CONTEXTS);
+  return color_index_ctx;
+}
+
+int av1_fast_palette_color_index_context(const uint8_t *color_map, int stride,
+                                         int r, int c, int *color_idx) {
+  assert(r > 0 || c > 0);
+
+  // This goes in the order of left, top, and top-left. This has the advantage
+  // that unless anything here are not distinct or invalid, this will already
+  // be in sorted order. Furthermore, if either of the first two are not
+  // invalid, we know the last one is also invalid.
+  int color_neighbors[NUM_PALETTE_NEIGHBORS];
+  color_neighbors[0] = (c - 1 >= 0) ? color_map[r * stride + c - 1] : -1;
+  color_neighbors[1] = (r - 1 >= 0) ? color_map[(r - 1) * stride + c] : -1;
+  color_neighbors[2] =
+      (c - 1 >= 0 && r - 1 >= 0) ? color_map[(r - 1) * stride + c - 1] : -1;
+
+  // Since our array is so small, using a couple if statements is faster
+  int scores[NUM_PALETTE_NEIGHBORS] = { 2, 2, 1 };
+  if (color_neighbors[0] == color_neighbors[1]) {
+    scores[0] += scores[1];
+    color_neighbors[1] = -1;
+
+    if (color_neighbors[0] == color_neighbors[2]) {
+      scores[0] += scores[2];
+      color_neighbors[2] = -1;
+    }
+  } else if (color_neighbors[0] == color_neighbors[2]) {
+    scores[0] += scores[2];
+    color_neighbors[2] = -1;
+  } else if (color_neighbors[1] == color_neighbors[2]) {
+    scores[1] += scores[2];
+    color_neighbors[2] = -1;
+  }
+
+  int color_rank[NUM_PALETTE_NEIGHBORS] = { -1, -1, -1 };
+  int score_rank[NUM_PALETTE_NEIGHBORS] = { 0, 0, 0 };
+  int num_valid_colors = 0;
+  for (int idx = 0; idx < NUM_PALETTE_NEIGHBORS; idx++) {
+    if (color_neighbors[idx] != -1) {
+      score_rank[num_valid_colors] = scores[idx];
+      color_rank[num_valid_colors] = color_neighbors[idx];
+      num_valid_colors++;
+    }
+  }
+
+  // Sort everything
+  // We need to swap the first two elements if they have the same score but
+  // the color indices are not in the right order
+  if (score_rank[0] < score_rank[1] ||
+      (score_rank[0] == score_rank[1] && color_rank[0] > color_rank[1])) {
+    const int tmp_score = score_rank[0];
+    const int tmp_color = color_rank[0];
+    score_rank[0] = score_rank[1];
+    color_rank[0] = color_rank[1];
+    score_rank[1] = tmp_score;
+    color_rank[1] = tmp_color;
+  }
+  if (score_rank[0] < score_rank[2]) {
+    const int tmp_score = score_rank[0];
+    const int tmp_color = color_rank[0];
+    score_rank[0] = score_rank[2];
+    color_rank[0] = color_rank[2];
+    score_rank[2] = tmp_score;
+    color_rank[2] = tmp_color;
+  }
+  if (score_rank[1] < score_rank[2]) {
+    const int tmp_score = score_rank[1];
+    const int tmp_color = color_rank[1];
+    score_rank[1] = score_rank[2];
+    color_rank[1] = color_rank[2];
+    score_rank[2] = tmp_score;
+    color_rank[2] = tmp_color;
+  }
+
+  if (color_idx != NULL) {
+    // If any of the neighbor color has higher index than current color index,
+    // then we move up by 1 unless the current color is the same as one of the
+    // neighbor
+    const int current_color = *color_idx = color_map[r * stride + c];
+    int same_neighbor = -1;
+    for (int idx = 0; idx < NUM_PALETTE_NEIGHBORS; idx++) {
+      if (color_rank[idx] > current_color) {
+        (*color_idx)++;
+      } else if (color_rank[idx] == current_color) {
+        same_neighbor = idx;
+      }
+    }
+    if (same_neighbor != -1) {
+      *color_idx = same_neighbor;
+    }
+  }
+
+  // Get hash value of context.
+  int color_index_ctx_hash = 0;
+  static const int hash_multipliers[NUM_PALETTE_NEIGHBORS] = { 1, 2, 2 };
+  for (int idx = 0; idx < NUM_PALETTE_NEIGHBORS; ++idx) {
+    color_index_ctx_hash += score_rank[idx] * hash_multipliers[idx];
+  }
+  assert(color_index_ctx_hash > 0);
+  assert(color_index_ctx_hash <= MAX_COLOR_CONTEXT_HASH);
+
+  // Lookup context from hash.
+  const int color_index_ctx =
+      palette_color_index_context_lookup[color_index_ctx_hash];
+  assert(color_index_ctx >= 0);
+  assert(color_index_ctx < PALETTE_COLOR_INDEX_CONTEXTS);
+  return color_index_ctx;
+}
+#undef NUM_PALETTE_NEIGHBORS
+#undef MAX_COLOR_CONTEXT_HASH
+
+void av1_init_mode_probs(FRAME_CONTEXT *fc) {
+  av1_copy(fc->palette_y_size_cdf, default_palette_y_size_cdf);
+  av1_copy(fc->palette_uv_size_cdf, default_palette_uv_size_cdf);
+  av1_copy(fc->palette_y_color_index_cdf, default_palette_y_color_index_cdf);
+  av1_copy(fc->palette_uv_color_index_cdf, default_palette_uv_color_index_cdf);
+  av1_copy(fc->kf_y_cdf, default_kf_y_mode_cdf);
+  av1_copy(fc->angle_delta_cdf, default_angle_delta_cdf);
+  av1_copy(fc->comp_inter_cdf, default_comp_inter_cdf);
+  av1_copy(fc->comp_ref_type_cdf, default_comp_ref_type_cdf);
+  av1_copy(fc->uni_comp_ref_cdf, default_uni_comp_ref_cdf);
+  av1_copy(fc->palette_y_mode_cdf, default_palette_y_mode_cdf);
+  av1_copy(fc->palette_uv_mode_cdf, default_palette_uv_mode_cdf);
+  av1_copy(fc->comp_ref_cdf, default_comp_ref_cdf);
+  av1_copy(fc->comp_bwdref_cdf, default_comp_bwdref_cdf);
+  av1_copy(fc->single_ref_cdf, default_single_ref_cdf);
+  av1_copy(fc->txfm_partition_cdf, default_txfm_partition_cdf);
+  av1_copy(fc->compound_index_cdf, default_compound_idx_cdfs);
+  av1_copy(fc->comp_group_idx_cdf, default_comp_group_idx_cdfs);
+  av1_copy(fc->newmv_cdf, default_newmv_cdf);
+  av1_copy(fc->zeromv_cdf, default_zeromv_cdf);
+  av1_copy(fc->refmv_cdf, default_refmv_cdf);
+  av1_copy(fc->drl_cdf, default_drl_cdf);
+  av1_copy(fc->motion_mode_cdf, default_motion_mode_cdf);
+  av1_copy(fc->obmc_cdf, default_obmc_cdf);
+  av1_copy(fc->inter_compound_mode_cdf, default_inter_compound_mode_cdf);
+  av1_copy(fc->compound_type_cdf, default_compound_type_cdf);
+  av1_copy(fc->wedge_idx_cdf, default_wedge_idx_cdf);
+  av1_copy(fc->interintra_cdf, default_interintra_cdf);
+  av1_copy(fc->wedge_interintra_cdf, default_wedge_interintra_cdf);
+  av1_copy(fc->interintra_mode_cdf, default_interintra_mode_cdf);
+  av1_copy(fc->seg.pred_cdf, default_segment_pred_cdf);
+  av1_copy(fc->seg.tree_cdf, default_seg_tree_cdf);
+  av1_copy(fc->filter_intra_cdfs, default_filter_intra_cdfs);
+  av1_copy(fc->filter_intra_mode_cdf, default_filter_intra_mode_cdf);
+  av1_copy(fc->switchable_restore_cdf, default_switchable_restore_cdf);
+  av1_copy(fc->wiener_restore_cdf, default_wiener_restore_cdf);
+  av1_copy(fc->sgrproj_restore_cdf, default_sgrproj_restore_cdf);
+  av1_copy(fc->y_mode_cdf, default_if_y_mode_cdf);
+  av1_copy(fc->uv_mode_cdf, default_uv_mode_cdf);
+  av1_copy(fc->switchable_interp_cdf, default_switchable_interp_cdf);
+  av1_copy(fc->partition_cdf, default_partition_cdf);
+  av1_copy(fc->intra_ext_tx_cdf, default_intra_ext_tx_cdf);
+  av1_copy(fc->inter_ext_tx_cdf, default_inter_ext_tx_cdf);
+  av1_copy(fc->skip_mode_cdfs, default_skip_mode_cdfs);
+  av1_copy(fc->skip_txfm_cdfs, default_skip_txfm_cdfs);
+  av1_copy(fc->intra_inter_cdf, default_intra_inter_cdf);
+  for (int i = 0; i < SPATIAL_PREDICTION_PROBS; i++)
+    av1_copy(fc->seg.spatial_pred_seg_cdf[i],
+             default_spatial_pred_seg_tree_cdf[i]);
+  av1_copy(fc->tx_size_cdf, default_tx_size_cdf);
+  av1_copy(fc->delta_q_cdf, default_delta_q_cdf);
+  av1_copy(fc->delta_lf_cdf, default_delta_lf_cdf);
+  av1_copy(fc->delta_lf_multi_cdf, default_delta_lf_multi_cdf);
+  av1_copy(fc->cfl_sign_cdf, default_cfl_sign_cdf);
+  av1_copy(fc->cfl_alpha_cdf, default_cfl_alpha_cdf);
+  av1_copy(fc->intrabc_cdf, default_intrabc_cdf);
+}
+
+void av1_set_default_ref_deltas(int8_t *ref_deltas) {
+  assert(ref_deltas != NULL);
+
+  ref_deltas[INTRA_FRAME] = 1;
+  ref_deltas[LAST_FRAME] = 0;
+  ref_deltas[LAST2_FRAME] = ref_deltas[LAST_FRAME];
+  ref_deltas[LAST3_FRAME] = ref_deltas[LAST_FRAME];
+  ref_deltas[BWDREF_FRAME] = ref_deltas[LAST_FRAME];
+  ref_deltas[GOLDEN_FRAME] = -1;
+  ref_deltas[ALTREF2_FRAME] = -1;
+  ref_deltas[ALTREF_FRAME] = -1;
+}
+
+void av1_set_default_mode_deltas(int8_t *mode_deltas) {
+  assert(mode_deltas != NULL);
+
+  mode_deltas[0] = 0;
+  mode_deltas[1] = 0;
+}
+
+static void set_default_lf_deltas(struct loopfilter *lf) {
+  lf->mode_ref_delta_enabled = 1;
+  lf->mode_ref_delta_update = 1;
+
+  av1_set_default_ref_deltas(lf->ref_deltas);
+  av1_set_default_mode_deltas(lf->mode_deltas);
+}
+
+void av1_setup_frame_contexts(AV1_COMMON *cm) {
+  // Store the frame context into a special slot (not associated with any
+  // reference buffer), so that we can set up cm->pre_fc correctly later
+  // This function must ONLY be called when cm->fc has been initialized with
+  // default probs, either by av1_setup_past_independence or after manually
+  // initializing them
+  *cm->default_frame_context = *cm->fc;
+  // TODO(jack.haughton@argondesign.com): don't think this should be necessary,
+  // but could do with fuller testing
+  if (cm->tiles.large_scale) {
+    for (int i = LAST_FRAME; i <= ALTREF_FRAME; ++i) {
+      RefCntBuffer *const buf = get_ref_frame_buf(cm, i);
+      if (buf != NULL) buf->frame_context = *cm->fc;
+    }
+    for (int i = 0; i < FRAME_BUFFERS; ++i)
+      cm->buffer_pool->frame_bufs[i].frame_context = *cm->fc;
+  }
+}
+
+void av1_setup_past_independence(AV1_COMMON *cm) {
+  // Reset the segment feature data to the default stats:
+  // Features disabled, 0, with delta coding (Default state).
+  av1_clearall_segfeatures(&cm->seg);
+
+  if (cm->cur_frame->seg_map) {
+    memset(cm->cur_frame->seg_map, 0,
+           (cm->cur_frame->mi_rows * cm->cur_frame->mi_cols));
+  }
+
+  // reset mode ref deltas
+  av1_set_default_ref_deltas(cm->cur_frame->ref_deltas);
+  av1_set_default_mode_deltas(cm->cur_frame->mode_deltas);
+  set_default_lf_deltas(&cm->lf);
+
+  av1_default_coef_probs(cm);
+  av1_init_mode_probs(cm->fc);
+  av1_init_mv_probs(cm);
+  cm->fc->initialized = 1;
+  av1_setup_frame_contexts(cm);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h
new file mode 100644
index 0000000000..653e65a640
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_ENTROPYMODE_H_
+#define AOM_AV1_COMMON_ENTROPYMODE_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_filter.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BLOCK_SIZE_GROUPS 4
+
+#define TX_SIZE_CONTEXTS 3
+
+#define INTER_OFFSET(mode) ((mode)-NEARESTMV)
+#define INTER_COMPOUND_OFFSET(mode) (uint8_t)((mode)-NEAREST_NEARESTMV)
+
+// Number of possible contexts for a color index.
+// As can be seen from av1_get_palette_color_index_context(), the possible
+// contexts are (2,0,0), (2,2,1), (3,2,0), (4,1,0), (5,0,0). These are mapped to
+// a value from 0 to 4 using 'palette_color_index_context_lookup' table.
+#define PALETTE_COLOR_INDEX_CONTEXTS 5
+
+// Palette Y mode context for a block is determined by number of neighboring
+// blocks (top and/or left) using a palette for Y plane. So, possible Y mode'
+// context values are:
+// 0 if neither left nor top block uses palette for Y plane,
+// 1 if exactly one of left or top block uses palette for Y plane, and
+// 2 if both left and top blocks use palette for Y plane.
+#define PALETTE_Y_MODE_CONTEXTS 3
+
+// Palette UV mode context for a block is determined by whether this block uses
+// palette for the Y plane. So, possible values are:
+// 0 if this block doesn't use palette for Y plane.
+// 1 if this block uses palette for Y plane (i.e. Y palette size > 0).
+#define PALETTE_UV_MODE_CONTEXTS 2
+
+// Map the number of pixels in a block size to a context
+//   64(BLOCK_8X8, BLOCK_4x16, BLOCK_16X4)  -> 0
+//  128(BLOCK_8X16, BLOCK_16x8)             -> 1
+//   ...
+// 4096(BLOCK_64X64)                        -> 6
+#define PALATTE_BSIZE_CTXS 7
+
+#define KF_MODE_CONTEXTS 5
+
+struct AV1Common;
+
+typedef struct {
+  const int16_t *scan;
+  const int16_t *iscan;
+} SCAN_ORDER;
+
+typedef struct frame_contexts {
+  aom_cdf_prob txb_skip_cdf[TX_SIZES][TXB_SKIP_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob eob_extra_cdf[TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS]
+                            [CDF_SIZE(2)];
+  aom_cdf_prob dc_sign_cdf[PLANE_TYPES][DC_SIGN_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob eob_flag_cdf16[PLANE_TYPES][2][CDF_SIZE(5)];
+  aom_cdf_prob eob_flag_cdf32[PLANE_TYPES][2][CDF_SIZE(6)];
+  aom_cdf_prob eob_flag_cdf64[PLANE_TYPES][2][CDF_SIZE(7)];
+  aom_cdf_prob eob_flag_cdf128[PLANE_TYPES][2][CDF_SIZE(8)];
+  aom_cdf_prob eob_flag_cdf256[PLANE_TYPES][2][CDF_SIZE(9)];
+  aom_cdf_prob eob_flag_cdf512[PLANE_TYPES][2][CDF_SIZE(10)];
+  aom_cdf_prob eob_flag_cdf1024[PLANE_TYPES][2][CDF_SIZE(11)];
+  aom_cdf_prob coeff_base_eob_cdf[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS_EOB]
+                                 [CDF_SIZE(3)];
+  aom_cdf_prob coeff_base_cdf[TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS]
+                             [CDF_SIZE(4)];
+  aom_cdf_prob coeff_br_cdf[TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS]
+                           [CDF_SIZE(BR_CDF_SIZE)];
+
+  aom_cdf_prob newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob zeromv_cdf[GLOBALMV_MODE_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob refmv_cdf[REFMV_MODE_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob drl_cdf[DRL_MODE_CONTEXTS][CDF_SIZE(2)];
+
+  aom_cdf_prob inter_compound_mode_cdf[INTER_MODE_CONTEXTS]
+                                      [CDF_SIZE(INTER_COMPOUND_MODES)];
+  aom_cdf_prob compound_type_cdf[BLOCK_SIZES_ALL]
+                                [CDF_SIZE(MASKED_COMPOUND_TYPES)];
+  aom_cdf_prob wedge_idx_cdf[BLOCK_SIZES_ALL][CDF_SIZE(16)];
+  aom_cdf_prob interintra_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(2)];
+  aom_cdf_prob wedge_interintra_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)];
+  aom_cdf_prob interintra_mode_cdf[BLOCK_SIZE_GROUPS]
+                                  [CDF_SIZE(INTERINTRA_MODES)];
+  aom_cdf_prob motion_mode_cdf[BLOCK_SIZES_ALL][CDF_SIZE(MOTION_MODES)];
+  aom_cdf_prob obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)];
+  aom_cdf_prob palette_y_size_cdf[PALATTE_BSIZE_CTXS][CDF_SIZE(PALETTE_SIZES)];
+  aom_cdf_prob palette_uv_size_cdf[PALATTE_BSIZE_CTXS][CDF_SIZE(PALETTE_SIZES)];
+  aom_cdf_prob palette_y_color_index_cdf[PALETTE_SIZES]
+                                        [PALETTE_COLOR_INDEX_CONTEXTS]
+                                        [CDF_SIZE(PALETTE_COLORS)];
+  aom_cdf_prob palette_uv_color_index_cdf[PALETTE_SIZES]
+                                         [PALETTE_COLOR_INDEX_CONTEXTS]
+                                         [CDF_SIZE(PALETTE_COLORS)];
+  aom_cdf_prob palette_y_mode_cdf[PALATTE_BSIZE_CTXS][PALETTE_Y_MODE_CONTEXTS]
+                                 [CDF_SIZE(2)];
+  aom_cdf_prob palette_uv_mode_cdf[PALETTE_UV_MODE_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob comp_inter_cdf[COMP_INTER_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob single_ref_cdf[REF_CONTEXTS][SINGLE_REFS - 1][CDF_SIZE(2)];
+  aom_cdf_prob comp_ref_type_cdf[COMP_REF_TYPE_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob uni_comp_ref_cdf[UNI_COMP_REF_CONTEXTS][UNIDIR_COMP_REFS - 1]
+                               [CDF_SIZE(2)];
+  aom_cdf_prob comp_ref_cdf[REF_CONTEXTS][FWD_REFS - 1][CDF_SIZE(2)];
+  aom_cdf_prob comp_bwdref_cdf[REF_CONTEXTS][BWD_REFS - 1][CDF_SIZE(2)];
+  aom_cdf_prob txfm_partition_cdf[TXFM_PARTITION_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob compound_index_cdf[COMP_INDEX_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob comp_group_idx_cdf[COMP_GROUP_IDX_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob skip_mode_cdfs[SKIP_MODE_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob skip_txfm_cdfs[SKIP_CONTEXTS][CDF_SIZE(2)];
+  aom_cdf_prob intra_inter_cdf[INTRA_INTER_CONTEXTS][CDF_SIZE(2)];
+  nmv_context nmvc;
+  nmv_context ndvc;
+  aom_cdf_prob intrabc_cdf[CDF_SIZE(2)];
+  struct segmentation_probs seg;
+  aom_cdf_prob filter_intra_cdfs[BLOCK_SIZES_ALL][CDF_SIZE(2)];
+  aom_cdf_prob filter_intra_mode_cdf[CDF_SIZE(FILTER_INTRA_MODES)];
+  aom_cdf_prob switchable_restore_cdf[CDF_SIZE(RESTORE_SWITCHABLE_TYPES)];
+  aom_cdf_prob wiener_restore_cdf[CDF_SIZE(2)];
+  aom_cdf_prob sgrproj_restore_cdf[CDF_SIZE(2)];
+  aom_cdf_prob y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(INTRA_MODES)];
+  aom_cdf_prob uv_mode_cdf[CFL_ALLOWED_TYPES][INTRA_MODES]
+                          [CDF_SIZE(UV_INTRA_MODES)];
+  aom_cdf_prob partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(EXT_PARTITION_TYPES)];
+  aom_cdf_prob switchable_interp_cdf[SWITCHABLE_FILTER_CONTEXTS]
+                                    [CDF_SIZE(SWITCHABLE_FILTERS)];
+  /* kf_y_cdf is discarded after use, so does not require persistent storage.
+     However, we keep it with the other CDFs in this struct since it needs to
+     be copied to each tile to support parallelism just like the others.
+  */
+  aom_cdf_prob kf_y_cdf[KF_MODE_CONTEXTS][KF_MODE_CONTEXTS]
+                       [CDF_SIZE(INTRA_MODES)];
+
+  aom_cdf_prob angle_delta_cdf[DIRECTIONAL_MODES]
+                              [CDF_SIZE(2 * MAX_ANGLE_DELTA + 1)];
+
+  aom_cdf_prob tx_size_cdf[MAX_TX_CATS][TX_SIZE_CONTEXTS]
+                          [CDF_SIZE(MAX_TX_DEPTH + 1)];
+  aom_cdf_prob delta_q_cdf[CDF_SIZE(DELTA_Q_PROBS + 1)];
+  aom_cdf_prob delta_lf_multi_cdf[FRAME_LF_COUNT][CDF_SIZE(DELTA_LF_PROBS + 1)];
+  aom_cdf_prob delta_lf_cdf[CDF_SIZE(DELTA_LF_PROBS + 1)];
+  aom_cdf_prob intra_ext_tx_cdf[EXT_TX_SETS_INTRA][EXT_TX_SIZES][INTRA_MODES]
+                               [CDF_SIZE(TX_TYPES)];
+  aom_cdf_prob inter_ext_tx_cdf[EXT_TX_SETS_INTER][EXT_TX_SIZES]
+                               [CDF_SIZE(TX_TYPES)];
+  aom_cdf_prob cfl_sign_cdf[CDF_SIZE(CFL_JOINT_SIGNS)];
+  aom_cdf_prob cfl_alpha_cdf[CFL_ALPHA_CONTEXTS][CDF_SIZE(CFL_ALPHABET_SIZE)];
+  int initialized;
+} FRAME_CONTEXT;
+
+static const int av1_ext_tx_ind[EXT_TX_SET_TYPES][TX_TYPES] = {
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 1, 3, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 1, 5, 6, 4, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 0, 0 },
+  { 3, 4, 5, 8, 6, 7, 9, 10, 11, 0, 1, 2, 0, 0, 0, 0 },
+  { 7, 8, 9, 12, 10, 11, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6 },
+};
+
+static const int av1_ext_tx_inv[EXT_TX_SET_TYPES][TX_TYPES] = {
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 9, 0, 3, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 9, 0, 10, 11, 3, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 9, 10, 11, 0, 1, 2, 4, 5, 3, 6, 7, 8, 0, 0, 0, 0 },
+  { 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 4, 5, 3, 6, 7, 8 },
+};
+
+void av1_set_default_ref_deltas(int8_t *ref_deltas);
+void av1_set_default_mode_deltas(int8_t *mode_deltas);
+void av1_setup_frame_contexts(struct AV1Common *cm);
+void av1_setup_past_independence(struct AV1Common *cm);
+
+// Returns (int)ceil(log2(n)).
+// NOTE: This implementation only works for n <= 2^30.
+static INLINE int av1_ceil_log2(int n) {
+  if (n < 2) return 0;
+  int i = 1, p = 2;
+  while (p < n) {
+    i++;
+    p = p << 1;
+  }
+  return i;
+}
+
+// Returns the context for palette color index at row 'r' and column 'c',
+// along with the 'color_order' of neighbors and the 'color_idx'.
+// The 'color_map' is a 2D array with the given 'stride'.
+int av1_get_palette_color_index_context(const uint8_t *color_map, int stride,
+                                        int r, int c, int palette_size,
+                                        uint8_t *color_order, int *color_idx);
+
+// A faster version of av1_get_palette_color_index_context used by the encoder
+// exploiting the fact that the encoder does not need to maintain a color order.
+int av1_fast_palette_color_index_context(const uint8_t *color_map, int stride,
+                                         int r, int c, int *color_idx);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_ENTROPYMODE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.c
new file mode 100644
index 0000000000..1ba2550baa
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h"
+
+static const nmv_context default_nmv_context = {
+  { AOM_CDF4(4096, 11264, 19328) },  // joints_cdf
+  { {
+        // Vertical component
+        { AOM_CDF11(28672, 30976, 31858, 32320, 32551, 32656, 32740, 32757,
+                    32762, 32767) },  // class_cdf // fp
+        { { AOM_CDF4(16384, 24576, 26624) },
+          { AOM_CDF4(12288, 21248, 24128) } },  // class0_fp_cdf
+        { AOM_CDF4(8192, 17408, 21248) },       // fp_cdf
+        { AOM_CDF2(128 * 128) },                // sign_cdf
+        { AOM_CDF2(160 * 128) },                // class0_hp_cdf
+        { AOM_CDF2(128 * 128) },                // hp_cdf
+        { AOM_CDF2(216 * 128) },                // class0_cdf
+        { { AOM_CDF2(128 * 136) },
+          { AOM_CDF2(128 * 140) },
+          { AOM_CDF2(128 * 148) },
+          { AOM_CDF2(128 * 160) },
+          { AOM_CDF2(128 * 176) },
+          { AOM_CDF2(128 * 192) },
+          { AOM_CDF2(128 * 224) },
+          { AOM_CDF2(128 * 234) },
+          { AOM_CDF2(128 * 234) },
+          { AOM_CDF2(128 * 240) } },  // bits_cdf
+    },
+    {
+        // Horizontal component
+        { AOM_CDF11(28672, 30976, 31858, 32320, 32551, 32656, 32740, 32757,
+                    32762, 32767) },  // class_cdf // fp
+        { { AOM_CDF4(16384, 24576, 26624) },
+          { AOM_CDF4(12288, 21248, 24128) } },  // class0_fp_cdf
+        { AOM_CDF4(8192, 17408, 21248) },       // fp_cdf
+        { AOM_CDF2(128 * 128) },                // sign_cdf
+        { AOM_CDF2(160 * 128) },                // class0_hp_cdf
+        { AOM_CDF2(128 * 128) },                // hp_cdf
+        { AOM_CDF2(216 * 128) },                // class0_cdf
+        { { AOM_CDF2(128 * 136) },
+          { AOM_CDF2(128 * 140) },
+          { AOM_CDF2(128 * 148) },
+          { AOM_CDF2(128 * 160) },
+          { AOM_CDF2(128 * 176) },
+          { AOM_CDF2(128 * 192) },
+          { AOM_CDF2(128 * 224) },
+          { AOM_CDF2(128 * 234) },
+          { AOM_CDF2(128 * 234) },
+          { AOM_CDF2(128 * 240) } },  // bits_cdf
+    } },
+};
+
+void av1_init_mv_probs(AV1_COMMON *cm) {
+  // NB: this sets CDFs too
+  cm->fc->nmvc = default_nmv_context;
+  cm->fc->ndvc = default_nmv_context;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h
new file mode 100644
index 0000000000..4fbe9c106b
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_ENTROPYMV_H_
+#define AOM_AV1_COMMON_ENTROPYMV_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mv.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct AV1Common;
+
+void av1_init_mv_probs(struct AV1Common *cm);
+
+#define MV_UPDATE_PROB 252
+
+/* Symbols for coding which components are zero jointly */
+#define MV_JOINTS 4
+enum {
+  MV_JOINT_ZERO = 0,   /* Zero vector */
+  MV_JOINT_HNZVZ = 1,  /* Vert zero, hor nonzero */
+  MV_JOINT_HZVNZ = 2,  /* Hor zero, vert nonzero */
+  MV_JOINT_HNZVNZ = 3, /* Both components nonzero */
+} UENUM1BYTE(MV_JOINT_TYPE);
+
+static INLINE int mv_joint_vertical(MV_JOINT_TYPE type) {
+  return type == MV_JOINT_HZVNZ || type == MV_JOINT_HNZVNZ;
+}
+
+static INLINE int mv_joint_horizontal(MV_JOINT_TYPE type) {
+  return type == MV_JOINT_HNZVZ || type == MV_JOINT_HNZVNZ;
+}
+
+/* Symbols for coding magnitude class of nonzero components */
+#define MV_CLASSES 11
+enum {
+  MV_CLASS_0 = 0,   /* (0, 2]     integer pel */
+  MV_CLASS_1 = 1,   /* (2, 4]     integer pel */
+  MV_CLASS_2 = 2,   /* (4, 8]     integer pel */
+  MV_CLASS_3 = 3,   /* (8, 16]    integer pel */
+  MV_CLASS_4 = 4,   /* (16, 32]   integer pel */
+  MV_CLASS_5 = 5,   /* (32, 64]   integer pel */
+  MV_CLASS_6 = 6,   /* (64, 128]  integer pel */
+  MV_CLASS_7 = 7,   /* (128, 256] integer pel */
+  MV_CLASS_8 = 8,   /* (256, 512] integer pel */
+  MV_CLASS_9 = 9,   /* (512, 1024] integer pel */
+  MV_CLASS_10 = 10, /* (1024,2048] integer pel */
+} UENUM1BYTE(MV_CLASS_TYPE);
+
+#define CLASS0_BITS 1 /* bits at integer precision for class 0 */
+#define CLASS0_SIZE (1 << CLASS0_BITS)
+#define MV_OFFSET_BITS (MV_CLASSES + CLASS0_BITS - 2)
+#define MV_BITS_CONTEXTS 6
+#define MV_FP_SIZE 4
+
+#define MV_MAX_BITS (MV_CLASSES + CLASS0_BITS + 2)
+#define MV_MAX ((1 << MV_MAX_BITS) - 1)
+#define MV_VALS ((MV_MAX << 1) + 1)
+
+#define MV_IN_USE_BITS 14
+#define MV_UPP (1 << MV_IN_USE_BITS)
+#define MV_LOW (-(1 << MV_IN_USE_BITS))
+
+typedef struct {
+  aom_cdf_prob classes_cdf[CDF_SIZE(MV_CLASSES)];
+  aom_cdf_prob class0_fp_cdf[CLASS0_SIZE][CDF_SIZE(MV_FP_SIZE)];
+  aom_cdf_prob fp_cdf[CDF_SIZE(MV_FP_SIZE)];
+  aom_cdf_prob sign_cdf[CDF_SIZE(2)];
+  aom_cdf_prob class0_hp_cdf[CDF_SIZE(2)];
+  aom_cdf_prob hp_cdf[CDF_SIZE(2)];
+  aom_cdf_prob class0_cdf[CDF_SIZE(CLASS0_SIZE)];
+  aom_cdf_prob bits_cdf[MV_OFFSET_BITS][CDF_SIZE(2)];
+} nmv_component;
+
+typedef struct {
+  aom_cdf_prob joints_cdf[CDF_SIZE(MV_JOINTS)];
+  nmv_component comps[2];
+} nmv_context;
+
+enum {
+  MV_SUBPEL_NONE = -1,
+  MV_SUBPEL_LOW_PRECISION = 0,
+  MV_SUBPEL_HIGH_PRECISION,
+} SENUM1BYTE(MvSubpelPrecision);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_ENTROPYMV_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h
new file mode 100644
index 0000000000..ec6972e980
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h
@@ -0,0 +1,691 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_ENUMS_H_
+#define AOM_AV1_COMMON_ENUMS_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*! @file */
+
+/*!\cond */
+
+#undef MAX_SB_SIZE
+
+// Max superblock size
+#define MAX_SB_SIZE_LOG2 7
+#define MAX_SB_SIZE (1 << MAX_SB_SIZE_LOG2)
+#define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE)
+
+// Min superblock size
+#define MIN_SB_SIZE_LOG2 6
+
+// Pixels per Mode Info (MI) unit
+#define MI_SIZE_LOG2 2
+#define MI_SIZE (1 << MI_SIZE_LOG2)
+
+// MI-units per max superblock (MI Block - MIB)
+#define MAX_MIB_SIZE_LOG2 (MAX_SB_SIZE_LOG2 - MI_SIZE_LOG2)
+#define MAX_MIB_SIZE (1 << MAX_MIB_SIZE_LOG2)
+
+// MI-units per min superblock
+#define MIN_MIB_SIZE_LOG2 (MIN_SB_SIZE_LOG2 - MI_SIZE_LOG2)
+
+// Mask to extract MI offset within max MIB
+#define MAX_MIB_MASK (MAX_MIB_SIZE - 1)
+
+// Maximum number of tile rows and tile columns
+#define MAX_TILE_ROWS 64
+#define MAX_TILE_COLS 64
+
+#define MAX_VARTX_DEPTH 2
+
+#define MI_SIZE_64X64 (64 >> MI_SIZE_LOG2)
+#define MI_SIZE_128X128 (128 >> MI_SIZE_LOG2)
+
+#define MAX_PALETTE_SQUARE (64 * 64)
+// Maximum number of colors in a palette.
+#define PALETTE_MAX_SIZE 8
+// Minimum number of colors in a palette.
+#define PALETTE_MIN_SIZE 2
+
+#define FRAME_OFFSET_BITS 5
+#define MAX_FRAME_DISTANCE ((1 << FRAME_OFFSET_BITS) - 1)
+
+// 4 frame filter levels: y plane vertical, y plane horizontal,
+// u plane, and v plane
+#define FRAME_LF_COUNT 4
+#define DEFAULT_DELTA_LF_MULTI 0
+#define MAX_MODE_LF_DELTAS 2
+
+#define DIST_PRECISION_BITS 4
+#define DIST_PRECISION (1 << DIST_PRECISION_BITS)  // 16
+
+#define PROFILE_BITS 3
+// The following three profiles are currently defined.
+// Profile 0.  8-bit and 10-bit 4:2:0 and 4:0:0 only.
+// Profile 1.  8-bit and 10-bit 4:4:4
+// Profile 2.  8-bit and 10-bit 4:2:2
+//            12-bit  4:0:0, 4:2:2 and 4:4:4
+// Since we have three bits for the profiles, it can be extended later.
+enum {
+  PROFILE_0,
+  PROFILE_1,
+  PROFILE_2,
+  MAX_PROFILES,
+} SENUM1BYTE(BITSTREAM_PROFILE);
+
+#define OP_POINTS_CNT_MINUS_1_BITS 5
+#define OP_POINTS_IDC_BITS 12
+
+// Note: Some enums use the attribute 'packed' to use smallest possible integer
+// type, so that we can save memory when they are used in structs/arrays.
+
+typedef enum ATTRIBUTE_PACKED {
+  BLOCK_4X4,
+  BLOCK_4X8,
+  BLOCK_8X4,
+  BLOCK_8X8,
+  BLOCK_8X16,
+  BLOCK_16X8,
+  BLOCK_16X16,
+  BLOCK_16X32,
+  BLOCK_32X16,
+  BLOCK_32X32,
+  BLOCK_32X64,
+  BLOCK_64X32,
+  BLOCK_64X64,
+  BLOCK_64X128,
+  BLOCK_128X64,
+  BLOCK_128X128,
+  BLOCK_4X16,
+  BLOCK_16X4,
+  BLOCK_8X32,
+  BLOCK_32X8,
+  BLOCK_16X64,
+  BLOCK_64X16,
+  BLOCK_SIZES_ALL,
+  BLOCK_SIZES = BLOCK_4X16,
+  BLOCK_INVALID = 255,
+  BLOCK_LARGEST = (BLOCK_SIZES - 1)
+} BLOCK_SIZE;
+
+// 4X4, 8X8, 16X16, 32X32, 64X64, 128X128
+#define SQR_BLOCK_SIZES 6
+
+//  Partition types.  R: Recursive
+//
+//  NONE          HORZ          VERT          SPLIT
+//  +-------+     +-------+     +---+---+     +---+---+
+//  |       |     |       |     |   |   |     | R | R |
+//  |       |     +-------+     |   |   |     +---+---+
+//  |       |     |       |     |   |   |     | R | R |
+//  +-------+     +-------+     +---+---+     +---+---+
+//
+//  HORZ_A        HORZ_B        VERT_A        VERT_B
+//  +---+---+     +-------+     +---+---+     +---+---+
+//  |   |   |     |       |     |   |   |     |   |   |
+//  +---+---+     +---+---+     +---+   |     |   +---+
+//  |       |     |   |   |     |   |   |     |   |   |
+//  +-------+     +---+---+     +---+---+     +---+---+
+//
+//  HORZ_4        VERT_4
+//  +-----+       +-+-+-+
+//  +-----+       | | | |
+//  +-----+       | | | |
+//  +-----+       +-+-+-+
+enum {
+  PARTITION_NONE,
+  PARTITION_HORZ,
+  PARTITION_VERT,
+  PARTITION_SPLIT,
+  PARTITION_HORZ_A,  // HORZ split and the top partition is split again
+  PARTITION_HORZ_B,  // HORZ split and the bottom partition is split again
+  PARTITION_VERT_A,  // VERT split and the left partition is split again
+  PARTITION_VERT_B,  // VERT split and the right partition is split again
+  PARTITION_HORZ_4,  // 4:1 horizontal partition
+  PARTITION_VERT_4,  // 4:1 vertical partition
+  EXT_PARTITION_TYPES,
+  PARTITION_TYPES = PARTITION_SPLIT + 1,
+  PARTITION_INVALID = 255
+} UENUM1BYTE(PARTITION_TYPE);
+
+typedef char PARTITION_CONTEXT;
+#define PARTITION_PLOFFSET 4  // number of probability models per block size
+#define PARTITION_BLOCK_SIZES 5
+#define PARTITION_CONTEXTS (PARTITION_BLOCK_SIZES * PARTITION_PLOFFSET)
+
+// block transform size
+enum {
+  TX_4X4,             // 4x4 transform
+  TX_8X8,             // 8x8 transform
+  TX_16X16,           // 16x16 transform
+  TX_32X32,           // 32x32 transform
+  TX_64X64,           // 64x64 transform
+  TX_4X8,             // 4x8 transform
+  TX_8X4,             // 8x4 transform
+  TX_8X16,            // 8x16 transform
+  TX_16X8,            // 16x8 transform
+  TX_16X32,           // 16x32 transform
+  TX_32X16,           // 32x16 transform
+  TX_32X64,           // 32x64 transform
+  TX_64X32,           // 64x32 transform
+  TX_4X16,            // 4x16 transform
+  TX_16X4,            // 16x4 transform
+  TX_8X32,            // 8x32 transform
+  TX_32X8,            // 32x8 transform
+  TX_16X64,           // 16x64 transform
+  TX_64X16,           // 64x16 transform
+  TX_SIZES_ALL,       // Includes rectangular transforms
+  TX_SIZES = TX_4X8,  // Does NOT include rectangular transforms
+  TX_SIZES_LARGEST = TX_64X64,
+  TX_INVALID = 255  // Invalid transform size
+} UENUM1BYTE(TX_SIZE);
+
+#define TX_SIZE_LUMA_MIN (TX_4X4)
+/* We don't need to code a transform size unless the allowed size is at least
+   one more than the minimum. */
+#define TX_SIZE_CTX_MIN (TX_SIZE_LUMA_MIN + 1)
+
+// Maximum tx_size categories
+#define MAX_TX_CATS (TX_SIZES - TX_SIZE_CTX_MIN)
+#define MAX_TX_DEPTH 2
+
+#define MAX_TX_SIZE_LOG2 (6)
+#define MAX_TX_SIZE (1 << MAX_TX_SIZE_LOG2)
+#define MIN_TX_SIZE_LOG2 2
+#define MIN_TX_SIZE (1 << MIN_TX_SIZE_LOG2)
+#define MAX_TX_SQUARE (MAX_TX_SIZE * MAX_TX_SIZE)
+
+// Pad 4 extra columns to remove horizontal availability check.
+#define TX_PAD_HOR_LOG2 2
+#define TX_PAD_HOR 4
+// Pad 6 extra rows (2 on top and 4 on bottom) to remove vertical availability
+// check.
+#define TX_PAD_TOP 0
+#define TX_PAD_BOTTOM 4
+#define TX_PAD_VER (TX_PAD_TOP + TX_PAD_BOTTOM)
+// Pad 16 extra bytes to avoid reading overflow in SIMD optimization.
+#define TX_PAD_END 16
+#define TX_PAD_2D ((32 + TX_PAD_HOR) * (32 + TX_PAD_VER) + TX_PAD_END)
+
+// Number of maxium size transform blocks in the maximum size superblock
+#define MAX_TX_BLOCKS_IN_MAX_SB_LOG2 ((MAX_SB_SIZE_LOG2 - MAX_TX_SIZE_LOG2) * 2)
+#define MAX_TX_BLOCKS_IN_MAX_SB (1 << MAX_TX_BLOCKS_IN_MAX_SB_LOG2)
+
+// frame transform mode
+enum {
+  ONLY_4X4,         // use only 4x4 transform
+  TX_MODE_LARGEST,  // transform size is the largest possible for pu size
+  TX_MODE_SELECT,   // transform specified for each block
+  TX_MODES,
+} UENUM1BYTE(TX_MODE);
+
+// 1D tx types
+enum {
+  DCT_1D,
+  ADST_1D,
+  FLIPADST_1D,
+  IDTX_1D,
+  TX_TYPES_1D,
+} UENUM1BYTE(TX_TYPE_1D);
+
+enum {
+  DCT_DCT,            // DCT in both horizontal and vertical
+  ADST_DCT,           // ADST in vertical, DCT in horizontal
+  DCT_ADST,           // DCT in vertical, ADST in horizontal
+  ADST_ADST,          // ADST in both directions
+  FLIPADST_DCT,       // FLIPADST in vertical, DCT in horizontal
+  DCT_FLIPADST,       // DCT in vertical, FLIPADST in horizontal
+  FLIPADST_FLIPADST,  // FLIPADST in both directions
+  ADST_FLIPADST,      // ADST in vertical, FLIPADST in horizontal
+  FLIPADST_ADST,      // FLIPADST in vertical, ADST in horizontal
+  IDTX,               // Identity in both directions
+  V_DCT,              // DCT in vertical, identity in horizontal
+  H_DCT,              // Identity in vertical, DCT in horizontal
+  V_ADST,             // ADST in vertical, identity in horizontal
+  H_ADST,             // Identity in vertical, ADST in horizontal
+  V_FLIPADST,         // FLIPADST in vertical, identity in horizontal
+  H_FLIPADST,         // Identity in vertical, FLIPADST in horizontal
+  TX_TYPES,
+  DCT_ADST_TX_MASK = 0x000F,  // Either DCT or ADST in each direction
+} UENUM1BYTE(TX_TYPE);
+
+enum {
+  REG_REG,
+  REG_SMOOTH,
+  REG_SHARP,
+  SMOOTH_REG,
+  SMOOTH_SMOOTH,
+  SMOOTH_SHARP,
+  SHARP_REG,
+  SHARP_SMOOTH,
+  SHARP_SHARP,
+} UENUM1BYTE(DUAL_FILTER_TYPE);
+
+enum {
+  // DCT only
+  EXT_TX_SET_DCTONLY,
+  // DCT + Identity only
+  EXT_TX_SET_DCT_IDTX,
+  // Discrete Trig transforms w/o flip (4) + Identity (1)
+  EXT_TX_SET_DTT4_IDTX,
+  // Discrete Trig transforms w/o flip (4) + Identity (1) + 1D Hor/vert DCT (2)
+  EXT_TX_SET_DTT4_IDTX_1DDCT,
+  // Discrete Trig transforms w/ flip (9) + Identity (1) + 1D Hor/Ver DCT (2)
+  EXT_TX_SET_DTT9_IDTX_1DDCT,
+  // Discrete Trig transforms w/ flip (9) + Identity (1) + 1D Hor/Ver (6)
+  EXT_TX_SET_ALL16,
+  EXT_TX_SET_TYPES
+} UENUM1BYTE(TxSetType);
+
+#define EXT_TX_SIZES 4       // number of sizes that use extended transforms
+#define EXT_TX_SETS_INTER 4  // Sets of transform selections for INTER
+#define EXT_TX_SETS_INTRA 3  // Sets of transform selections for INTRA
+
+enum {
+  AOM_LAST_FLAG = 1 << 0,
+  AOM_LAST2_FLAG = 1 << 1,
+  AOM_LAST3_FLAG = 1 << 2,
+  AOM_GOLD_FLAG = 1 << 3,
+  AOM_BWD_FLAG = 1 << 4,
+  AOM_ALT2_FLAG = 1 << 5,
+  AOM_ALT_FLAG = 1 << 6,
+  AOM_REFFRAME_ALL = (1 << 7) - 1
+} UENUM1BYTE(AOM_REFFRAME);
+
+enum {
+  UNIDIR_COMP_REFERENCE,
+  BIDIR_COMP_REFERENCE,
+  COMP_REFERENCE_TYPES,
+} UENUM1BYTE(COMP_REFERENCE_TYPE);
+
+enum { PLANE_TYPE_Y, PLANE_TYPE_UV, PLANE_TYPES } UENUM1BYTE(PLANE_TYPE);
+
+#define CFL_ALPHABET_SIZE_LOG2 4
+#define CFL_ALPHABET_SIZE (1 << CFL_ALPHABET_SIZE_LOG2)
+#define CFL_MAGS_SIZE ((2 << CFL_ALPHABET_SIZE_LOG2) + 1)
+#define CFL_IDX_U(idx) (idx >> CFL_ALPHABET_SIZE_LOG2)
+#define CFL_IDX_V(idx) (idx & (CFL_ALPHABET_SIZE - 1))
+
+enum { CFL_PRED_U, CFL_PRED_V, CFL_PRED_PLANES } UENUM1BYTE(CFL_PRED_TYPE);
+
+enum {
+  CFL_SIGN_ZERO,
+  CFL_SIGN_NEG,
+  CFL_SIGN_POS,
+  CFL_SIGNS
+} UENUM1BYTE(CFL_SIGN_TYPE);
+
+enum {
+  CFL_DISALLOWED,
+  CFL_ALLOWED,
+  CFL_ALLOWED_TYPES
+} UENUM1BYTE(CFL_ALLOWED_TYPE);
+
+// CFL_SIGN_ZERO,CFL_SIGN_ZERO is invalid
+#define CFL_JOINT_SIGNS (CFL_SIGNS * CFL_SIGNS - 1)
+// CFL_SIGN_U is equivalent to (js + 1) / 3 for js in 0 to 8
+#define CFL_SIGN_U(js) (((js + 1) * 11) >> 5)
+// CFL_SIGN_V is equivalent to (js + 1) % 3 for js in 0 to 8
+#define CFL_SIGN_V(js) ((js + 1) - CFL_SIGNS * CFL_SIGN_U(js))
+
+// There is no context when the alpha for a given plane is zero.
+// So there are 2 fewer contexts than joint signs.
+#define CFL_ALPHA_CONTEXTS (CFL_JOINT_SIGNS + 1 - CFL_SIGNS)
+#define CFL_CONTEXT_U(js) (js + 1 - CFL_SIGNS)
+// Also, the contexts are symmetric under swapping the planes.
+#define CFL_CONTEXT_V(js) \
+  (CFL_SIGN_V(js) * CFL_SIGNS + CFL_SIGN_U(js) - CFL_SIGNS)
+
+enum {
+  PALETTE_MAP,
+  COLOR_MAP_TYPES,
+} UENUM1BYTE(COLOR_MAP_TYPE);
+
+enum {
+  TWO_COLORS,
+  THREE_COLORS,
+  FOUR_COLORS,
+  FIVE_COLORS,
+  SIX_COLORS,
+  SEVEN_COLORS,
+  EIGHT_COLORS,
+  PALETTE_SIZES
+} UENUM1BYTE(PALETTE_SIZE);
+
+enum {
+  PALETTE_COLOR_ONE,
+  PALETTE_COLOR_TWO,
+  PALETTE_COLOR_THREE,
+  PALETTE_COLOR_FOUR,
+  PALETTE_COLOR_FIVE,
+  PALETTE_COLOR_SIX,
+  PALETTE_COLOR_SEVEN,
+  PALETTE_COLOR_EIGHT,
+  PALETTE_COLORS
+} UENUM1BYTE(PALETTE_COLOR);
+
+// Note: All directional predictors must be between V_PRED and D67_PRED (both
+// inclusive).
+enum {
+  DC_PRED,        // Average of above and left pixels
+  V_PRED,         // Vertical
+  H_PRED,         // Horizontal
+  D45_PRED,       // Directional 45  degree
+  D135_PRED,      // Directional 135 degree
+  D113_PRED,      // Directional 113 degree
+  D157_PRED,      // Directional 157 degree
+  D203_PRED,      // Directional 203 degree
+  D67_PRED,       // Directional 67  degree
+  SMOOTH_PRED,    // Combination of horizontal and vertical interpolation
+  SMOOTH_V_PRED,  // Vertical interpolation
+  SMOOTH_H_PRED,  // Horizontal interpolation
+  PAETH_PRED,     // Predict from the direction of smallest gradient
+  NEARESTMV,
+  NEARMV,
+  GLOBALMV,
+  NEWMV,
+  // Compound ref compound modes
+  NEAREST_NEARESTMV,
+  NEAR_NEARMV,
+  NEAREST_NEWMV,
+  NEW_NEARESTMV,
+  NEAR_NEWMV,
+  NEW_NEARMV,
+  GLOBAL_GLOBALMV,
+  NEW_NEWMV,
+  MB_MODE_COUNT,
+  PRED_MODE_INVALID = MB_MODE_COUNT,
+  INTRA_MODE_START = DC_PRED,
+  INTRA_MODE_END = NEARESTMV,
+  DIR_MODE_START = V_PRED,
+  DIR_MODE_END = D67_PRED + 1,
+  INTRA_MODE_NUM = INTRA_MODE_END - INTRA_MODE_START,
+  SINGLE_INTER_MODE_START = NEARESTMV,
+  SINGLE_INTER_MODE_END = NEAREST_NEARESTMV,
+  SINGLE_INTER_MODE_NUM = SINGLE_INTER_MODE_END - SINGLE_INTER_MODE_START,
+  COMP_INTER_MODE_START = NEAREST_NEARESTMV,
+  COMP_INTER_MODE_END = MB_MODE_COUNT,
+  COMP_INTER_MODE_NUM = COMP_INTER_MODE_END - COMP_INTER_MODE_START,
+  INTER_MODE_START = NEARESTMV,
+  INTER_MODE_END = MB_MODE_COUNT,
+  INTRA_MODES = PAETH_PRED + 1,  // PAETH_PRED has to be the last intra mode.
+  INTRA_INVALID = MB_MODE_COUNT  // For uv_mode in inter blocks
+} UENUM1BYTE(PREDICTION_MODE);
+
+// TODO(ltrudeau) Do we really want to pack this?
+// TODO(ltrudeau) Do we match with PREDICTION_MODE?
+enum {
+  UV_DC_PRED,        // Average of above and left pixels
+  UV_V_PRED,         // Vertical
+  UV_H_PRED,         // Horizontal
+  UV_D45_PRED,       // Directional 45  degree
+  UV_D135_PRED,      // Directional 135 degree
+  UV_D113_PRED,      // Directional 113 degree
+  UV_D157_PRED,      // Directional 157 degree
+  UV_D203_PRED,      // Directional 203 degree
+  UV_D67_PRED,       // Directional 67  degree
+  UV_SMOOTH_PRED,    // Combination of horizontal and vertical interpolation
+  UV_SMOOTH_V_PRED,  // Vertical interpolation
+  UV_SMOOTH_H_PRED,  // Horizontal interpolation
+  UV_PAETH_PRED,     // Predict from the direction of smallest gradient
+  UV_CFL_PRED,       // Chroma-from-Luma
+  UV_INTRA_MODES,
+  UV_MODE_INVALID,  // For uv_mode in inter blocks
+} UENUM1BYTE(UV_PREDICTION_MODE);
+
+enum {
+  SIMPLE_TRANSLATION,
+  OBMC_CAUSAL,    // 2-sided OBMC
+  WARPED_CAUSAL,  // 2-sided WARPED
+  MOTION_MODES
+} UENUM1BYTE(MOTION_MODE);
+
+enum {
+  II_DC_PRED,
+  II_V_PRED,
+  II_H_PRED,
+  II_SMOOTH_PRED,
+  INTERINTRA_MODES
+} UENUM1BYTE(INTERINTRA_MODE);
+
+enum {
+  COMPOUND_AVERAGE,
+  COMPOUND_DISTWTD,
+  COMPOUND_WEDGE,
+  COMPOUND_DIFFWTD,
+  COMPOUND_TYPES,
+  MASKED_COMPOUND_TYPES = 2,
+} UENUM1BYTE(COMPOUND_TYPE);
+
+enum {
+  FILTER_DC_PRED,
+  FILTER_V_PRED,
+  FILTER_H_PRED,
+  FILTER_D157_PRED,
+  FILTER_PAETH_PRED,
+  FILTER_INTRA_MODES,
+} UENUM1BYTE(FILTER_INTRA_MODE);
+
+enum {
+  SEQ_LEVEL_2_0,
+  SEQ_LEVEL_2_1,
+  SEQ_LEVEL_2_2,
+  SEQ_LEVEL_2_3,
+  SEQ_LEVEL_3_0,
+  SEQ_LEVEL_3_1,
+  SEQ_LEVEL_3_2,
+  SEQ_LEVEL_3_3,
+  SEQ_LEVEL_4_0,
+  SEQ_LEVEL_4_1,
+  SEQ_LEVEL_4_2,
+  SEQ_LEVEL_4_3,
+  SEQ_LEVEL_5_0,
+  SEQ_LEVEL_5_1,
+  SEQ_LEVEL_5_2,
+  SEQ_LEVEL_5_3,
+  SEQ_LEVEL_6_0,
+  SEQ_LEVEL_6_1,
+  SEQ_LEVEL_6_2,
+  SEQ_LEVEL_6_3,
+  SEQ_LEVEL_7_0,
+  SEQ_LEVEL_7_1,
+  SEQ_LEVEL_7_2,
+  SEQ_LEVEL_7_3,
+  SEQ_LEVELS,
+  SEQ_LEVEL_MAX = 31
+} UENUM1BYTE(AV1_LEVEL);
+
+#define LEVEL_BITS 5
+
+#define DIRECTIONAL_MODES 8
+#define MAX_ANGLE_DELTA 3
+#define ANGLE_STEP 3
+
+#define INTER_MODES (1 + NEWMV - NEARESTMV)
+
+#define INTER_COMPOUND_MODES (1 + NEW_NEWMV - NEAREST_NEARESTMV)
+
+#define SKIP_CONTEXTS 3
+#define SKIP_MODE_CONTEXTS 3
+
+#define COMP_INDEX_CONTEXTS 6
+#define COMP_GROUP_IDX_CONTEXTS 6
+
+#define NMV_CONTEXTS 3
+
+#define NEWMV_MODE_CONTEXTS 6
+#define GLOBALMV_MODE_CONTEXTS 2
+#define REFMV_MODE_CONTEXTS 6
+#define DRL_MODE_CONTEXTS 3
+
+#define GLOBALMV_OFFSET 3
+#define REFMV_OFFSET 4
+
+#define NEWMV_CTX_MASK ((1 << GLOBALMV_OFFSET) - 1)
+#define GLOBALMV_CTX_MASK ((1 << (REFMV_OFFSET - GLOBALMV_OFFSET)) - 1)
+#define REFMV_CTX_MASK ((1 << (8 - REFMV_OFFSET)) - 1)
+
+#define COMP_NEWMV_CTXS 5
+#define INTER_MODE_CONTEXTS 8
+
+#define DELTA_Q_SMALL 3
+#define DELTA_Q_PROBS (DELTA_Q_SMALL)
+#define DEFAULT_DELTA_Q_RES_PERCEPTUAL 4
+#define DEFAULT_DELTA_Q_RES_OBJECTIVE 4
+
+#define DELTA_LF_SMALL 3
+#define DELTA_LF_PROBS (DELTA_LF_SMALL)
+#define DEFAULT_DELTA_LF_RES 2
+
+/* Segment Feature Masks */
+#define MAX_MV_REF_CANDIDATES 2
+
+#define MAX_REF_MV_STACK_SIZE 8
+#define USABLE_REF_MV_STACK_SIZE 4
+#define REF_CAT_LEVEL 640
+
+#define INTRA_INTER_CONTEXTS 4
+#define COMP_INTER_CONTEXTS 5
+#define REF_CONTEXTS 3
+
+#define COMP_REF_TYPE_CONTEXTS 5
+#define UNI_COMP_REF_CONTEXTS 3
+
+#define TXFM_PARTITION_CONTEXTS ((TX_SIZES - TX_8X8) * 6 - 3)
+typedef uint8_t TXFM_CONTEXT;
+
+// An enum for single reference types (and some derived values).
+enum {
+  NONE_FRAME = -1,
+  INTRA_FRAME,
+  LAST_FRAME,
+  LAST2_FRAME,
+  LAST3_FRAME,
+  GOLDEN_FRAME,
+  BWDREF_FRAME,
+  ALTREF2_FRAME,
+  ALTREF_FRAME,
+  REF_FRAMES,
+
+  // Extra/scratch reference frame. It may be:
+  // - used to update the ALTREF2_FRAME ref (see lshift_bwd_ref_frames()), or
+  // - updated from ALTREF2_FRAME ref (see rshift_bwd_ref_frames()).
+  EXTREF_FRAME = REF_FRAMES,
+
+  // Number of inter (non-intra) reference types.
+  INTER_REFS_PER_FRAME = ALTREF_FRAME - LAST_FRAME + 1,
+
+  // Number of forward (aka past) reference types.
+  FWD_REFS = GOLDEN_FRAME - LAST_FRAME + 1,
+
+  // Number of backward (aka future) reference types.
+  BWD_REFS = ALTREF_FRAME - BWDREF_FRAME + 1,
+
+  SINGLE_REFS = FWD_REFS + BWD_REFS,
+};
+
+#define REF_FRAMES_LOG2 3
+
+// REF_FRAMES for the cm->ref_frame_map array, 1 scratch frame for the new
+// frame in cm->cur_frame, INTER_REFS_PER_FRAME for scaled references on the
+// encoder in the cpi->scaled_ref_buf array.
+#define FRAME_BUFFERS (REF_FRAMES + 1 + INTER_REFS_PER_FRAME)
+
+#define FWD_RF_OFFSET(ref) (ref - LAST_FRAME)
+#define BWD_RF_OFFSET(ref) (ref - BWDREF_FRAME)
+
+enum {
+  LAST_LAST2_FRAMES,      // { LAST_FRAME, LAST2_FRAME }
+  LAST_LAST3_FRAMES,      // { LAST_FRAME, LAST3_FRAME }
+  LAST_GOLDEN_FRAMES,     // { LAST_FRAME, GOLDEN_FRAME }
+  BWDREF_ALTREF_FRAMES,   // { BWDREF_FRAME, ALTREF_FRAME }
+  LAST2_LAST3_FRAMES,     // { LAST2_FRAME, LAST3_FRAME }
+  LAST2_GOLDEN_FRAMES,    // { LAST2_FRAME, GOLDEN_FRAME }
+  LAST3_GOLDEN_FRAMES,    // { LAST3_FRAME, GOLDEN_FRAME }
+  BWDREF_ALTREF2_FRAMES,  // { BWDREF_FRAME, ALTREF2_FRAME }
+  ALTREF2_ALTREF_FRAMES,  // { ALTREF2_FRAME, ALTREF_FRAME }
+  TOTAL_UNIDIR_COMP_REFS,
+  // NOTE: UNIDIR_COMP_REFS is the number of uni-directional reference pairs
+  //       that are explicitly signaled.
+  UNIDIR_COMP_REFS = BWDREF_ALTREF_FRAMES + 1,
+} UENUM1BYTE(UNIDIR_COMP_REF);
+
+#define TOTAL_COMP_REFS (FWD_REFS * BWD_REFS + TOTAL_UNIDIR_COMP_REFS)
+
+#define COMP_REFS (FWD_REFS * BWD_REFS + UNIDIR_COMP_REFS)
+
+// NOTE: A limited number of unidirectional reference pairs can be signalled for
+//       compound prediction. The use of skip mode, on the other hand, makes it
+//       possible to have a reference pair not listed for explicit signaling.
+#define MODE_CTX_REF_FRAMES (REF_FRAMES + TOTAL_COMP_REFS)
+
+// Note: It includes single and compound references. So, it can take values from
+// NONE_FRAME to (MODE_CTX_REF_FRAMES - 1). Hence, it is not defined as an enum.
+typedef int8_t MV_REFERENCE_FRAME;
+
+/*!\endcond */
+
+/*!\enum RestorationType
+ * \brief This enumeration defines various restoration types supported
+ */
+typedef enum {
+  RESTORE_NONE,       /**< No restoration */
+  RESTORE_WIENER,     /**< Separable Wiener restoration */
+  RESTORE_SGRPROJ,    /**< Selfguided restoration */
+  RESTORE_SWITCHABLE, /**< Switchable restoration */
+  RESTORE_SWITCHABLE_TYPES = RESTORE_SWITCHABLE, /**< Num Switchable types */
+  RESTORE_TYPES = 4,                             /**< Num Restore types */
+} RestorationType;
+
+/*!\cond */
+// Picture prediction structures (0-12 are predefined) in scalability metadata.
+enum {
+  SCALABILITY_L1T2 = 0,
+  SCALABILITY_L1T3 = 1,
+  SCALABILITY_L2T1 = 2,
+  SCALABILITY_L2T2 = 3,
+  SCALABILITY_L2T3 = 4,
+  SCALABILITY_S2T1 = 5,
+  SCALABILITY_S2T2 = 6,
+  SCALABILITY_S2T3 = 7,
+  SCALABILITY_L2T1h = 8,
+  SCALABILITY_L2T2h = 9,
+  SCALABILITY_L2T3h = 10,
+  SCALABILITY_S2T1h = 11,
+  SCALABILITY_S2T2h = 12,
+  SCALABILITY_S2T3h = 13,
+  SCALABILITY_SS = 14
+} UENUM1BYTE(SCALABILITY_STRUCTURES);
+
+#define SUPERRES_SCALE_BITS 3
+#define SUPERRES_SCALE_DENOMINATOR_MIN (SCALE_NUMERATOR + 1)
+
+// In large_scale_tile coding, external references are used.
+#define MAX_EXTERNAL_REFERENCES 128
+#define MAX_TILES 512
+
+/*!\endcond */
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_ENUMS_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h
new file mode 100644
index 0000000000..21a24d246b
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h
@@ -0,0 +1,301 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_FILTER_H_
+#define AOM_AV1_COMMON_FILTER_H_
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_filter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAX_FILTER_TAP 12
+
+typedef enum ATTRIBUTE_PACKED {
+  EIGHTTAP_REGULAR,
+  EIGHTTAP_SMOOTH,
+  MULTITAP_SHARP,
+  BILINEAR,
+  // Encoder side only filters
+  MULTITAP_SHARP2,
+
+  INTERP_FILTERS_ALL,
+  SWITCHABLE_FILTERS = BILINEAR,
+  SWITCHABLE = SWITCHABLE_FILTERS + 1, /* the last switchable one */
+  EXTRA_FILTERS = INTERP_FILTERS_ALL - SWITCHABLE_FILTERS,
+  INTERP_INVALID = 0xff,
+} InterpFilter;
+
+enum {
+  USE_2_TAPS_ORIG = 0,  // This is used in temporal filtering.
+  USE_2_TAPS,
+  USE_4_TAPS,
+  USE_8_TAPS,
+} UENUM1BYTE(SUBPEL_SEARCH_TYPE);
+
+enum {
+  INTERP_EVAL_LUMA_EVAL_CHROMA = 0,
+  INTERP_SKIP_LUMA_EVAL_CHROMA,
+  INTERP_EVAL_INVALID,
+  INTERP_SKIP_LUMA_SKIP_CHROMA,
+} UENUM1BYTE(INTERP_EVAL_PLANE);
+
+enum {
+  INTERP_HORZ_NEQ_VERT_NEQ = 0,
+  INTERP_HORZ_EQ_VERT_NEQ,
+  INTERP_HORZ_NEQ_VERT_EQ,
+  INTERP_HORZ_EQ_VERT_EQ,
+  INTERP_PRED_TYPE_ALL,
+} UENUM1BYTE(INTERP_PRED_TYPE);
+// Pack two InterpFilter's into a uint32_t: since there are at most 10 filters,
+// we can use 16 bits for each and have more than enough space. This reduces
+// argument passing and unifies the operation of setting a (pair of) filters.
+typedef struct InterpFilters {
+  uint16_t y_filter;
+  uint16_t x_filter;
+} InterpFilters;
+
+typedef union int_interpfilters {
+  uint32_t as_int;
+  InterpFilters as_filters;
+} int_interpfilters;
+
+static INLINE InterpFilter av1_extract_interp_filter(int_interpfilters filters,
+                                                     int dir) {
+  return (InterpFilter)((dir) ? filters.as_filters.x_filter
+                              : filters.as_filters.y_filter);
+}
+
+static INLINE int_interpfilters
+av1_broadcast_interp_filter(InterpFilter filter) {
+  int_interpfilters filters;
+  filters.as_filters.x_filter = filter;
+  filters.as_filters.y_filter = filter;
+  return filters;
+}
+
+static INLINE InterpFilter av1_unswitchable_filter(InterpFilter filter) {
+  return filter == SWITCHABLE ? EIGHTTAP_REGULAR : filter;
+}
+
+/* (1 << LOG_SWITCHABLE_FILTERS) > SWITCHABLE_FILTERS */
+#define LOG_SWITCHABLE_FILTERS 2
+
+#define SWITCHABLE_FILTER_CONTEXTS ((SWITCHABLE_FILTERS + 1) * 4)
+#define INTER_FILTER_COMP_OFFSET (SWITCHABLE_FILTERS + 1)
+#define INTER_FILTER_DIR_OFFSET ((SWITCHABLE_FILTERS + 1) * 2)
+#define ALLOW_ALL_INTERP_FILT_MASK (0x01ff)
+
+typedef struct InterpFilterParams {
+  const int16_t *filter_ptr;
+  uint16_t taps;
+  InterpFilter interp_filter;
+} InterpFilterParams;
+
+DECLARE_ALIGNED(256, static const InterpKernel,
+                av1_bilinear_filters[SUBPEL_SHIFTS]) = {
+  { 0, 0, 0, 128, 0, 0, 0, 0 },  { 0, 0, 0, 120, 8, 0, 0, 0 },
+  { 0, 0, 0, 112, 16, 0, 0, 0 }, { 0, 0, 0, 104, 24, 0, 0, 0 },
+  { 0, 0, 0, 96, 32, 0, 0, 0 },  { 0, 0, 0, 88, 40, 0, 0, 0 },
+  { 0, 0, 0, 80, 48, 0, 0, 0 },  { 0, 0, 0, 72, 56, 0, 0, 0 },
+  { 0, 0, 0, 64, 64, 0, 0, 0 },  { 0, 0, 0, 56, 72, 0, 0, 0 },
+  { 0, 0, 0, 48, 80, 0, 0, 0 },  { 0, 0, 0, 40, 88, 0, 0, 0 },
+  { 0, 0, 0, 32, 96, 0, 0, 0 },  { 0, 0, 0, 24, 104, 0, 0, 0 },
+  { 0, 0, 0, 16, 112, 0, 0, 0 }, { 0, 0, 0, 8, 120, 0, 0, 0 }
+};
+
+DECLARE_ALIGNED(256, static const InterpKernel,
+                av1_sub_pel_filters_8[SUBPEL_SHIFTS]) = {
+  { 0, 0, 0, 128, 0, 0, 0, 0 },      { 0, 2, -6, 126, 8, -2, 0, 0 },
+  { 0, 2, -10, 122, 18, -4, 0, 0 },  { 0, 2, -12, 116, 28, -8, 2, 0 },
+  { 0, 2, -14, 110, 38, -10, 2, 0 }, { 0, 2, -14, 102, 48, -12, 2, 0 },
+  { 0, 2, -16, 94, 58, -12, 2, 0 },  { 0, 2, -14, 84, 66, -12, 2, 0 },
+  { 0, 2, -14, 76, 76, -14, 2, 0 },  { 0, 2, -12, 66, 84, -14, 2, 0 },
+  { 0, 2, -12, 58, 94, -16, 2, 0 },  { 0, 2, -12, 48, 102, -14, 2, 0 },
+  { 0, 2, -10, 38, 110, -14, 2, 0 }, { 0, 2, -8, 28, 116, -12, 2, 0 },
+  { 0, 0, -4, 18, 122, -10, 2, 0 },  { 0, 0, -2, 8, 126, -6, 2, 0 }
+};
+
+DECLARE_ALIGNED(256, static const InterpKernel,
+                av1_sub_pel_filters_8sharp[SUBPEL_SHIFTS]) = {
+  { 0, 0, 0, 128, 0, 0, 0, 0 },         { -2, 2, -6, 126, 8, -2, 2, 0 },
+  { -2, 6, -12, 124, 16, -6, 4, -2 },   { -2, 8, -18, 120, 26, -10, 6, -2 },
+  { -4, 10, -22, 116, 38, -14, 6, -2 }, { -4, 10, -22, 108, 48, -18, 8, -2 },
+  { -4, 10, -24, 100, 60, -20, 8, -2 }, { -4, 10, -24, 90, 70, -22, 10, -2 },
+  { -4, 12, -24, 80, 80, -24, 12, -4 }, { -2, 10, -22, 70, 90, -24, 10, -4 },
+  { -2, 8, -20, 60, 100, -24, 10, -4 }, { -2, 8, -18, 48, 108, -22, 10, -4 },
+  { -2, 6, -14, 38, 116, -22, 10, -4 }, { -2, 6, -10, 26, 120, -18, 8, -2 },
+  { -2, 4, -6, 16, 124, -12, 6, -2 },   { 0, 2, -2, 8, 126, -6, 2, -2 }
+};
+
+DECLARE_ALIGNED(256, static const InterpKernel,
+                av1_sub_pel_filters_8smooth[SUBPEL_SHIFTS]) = {
+  { 0, 0, 0, 128, 0, 0, 0, 0 },     { 0, 2, 28, 62, 34, 2, 0, 0 },
+  { 0, 0, 26, 62, 36, 4, 0, 0 },    { 0, 0, 22, 62, 40, 4, 0, 0 },
+  { 0, 0, 20, 60, 42, 6, 0, 0 },    { 0, 0, 18, 58, 44, 8, 0, 0 },
+  { 0, 0, 16, 56, 46, 10, 0, 0 },   { 0, -2, 16, 54, 48, 12, 0, 0 },
+  { 0, -2, 14, 52, 52, 14, -2, 0 }, { 0, 0, 12, 48, 54, 16, -2, 0 },
+  { 0, 0, 10, 46, 56, 16, 0, 0 },   { 0, 0, 8, 44, 58, 18, 0, 0 },
+  { 0, 0, 6, 42, 60, 20, 0, 0 },    { 0, 0, 4, 40, 62, 22, 0, 0 },
+  { 0, 0, 4, 36, 62, 26, 0, 0 },    { 0, 0, 2, 34, 62, 28, 2, 0 }
+};
+
+DECLARE_ALIGNED(256, static const int16_t,
+                av1_sub_pel_filters_12sharp[SUBPEL_SHIFTS][12]) = {
+  { 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0 },
+  { 0, 1, -2, 3, -7, 127, 8, -4, 2, -1, 1, 0 },
+  { -1, 2, -3, 6, -13, 124, 18, -8, 4, -2, 2, -1 },
+  { -1, 3, -4, 8, -18, 120, 28, -12, 7, -4, 2, -1 },
+  { -1, 3, -6, 10, -21, 115, 38, -15, 8, -5, 3, -1 },
+  { -2, 4, -6, 12, -24, 108, 49, -18, 10, -6, 3, -2 },
+  { -2, 4, -7, 13, -25, 100, 60, -21, 11, -7, 4, -2 },
+  { -2, 4, -7, 13, -26, 91, 71, -24, 13, -7, 4, -2 },
+  { -2, 4, -7, 13, -25, 81, 81, -25, 13, -7, 4, -2 },
+  { -2, 4, -7, 13, -24, 71, 91, -26, 13, -7, 4, -2 },
+  { -2, 4, -7, 11, -21, 60, 100, -25, 13, -7, 4, -2 },
+  { -2, 3, -6, 10, -18, 49, 108, -24, 12, -6, 4, -2 },
+  { -1, 3, -5, 8, -15, 38, 115, -21, 10, -6, 3, -1 },
+  { -1, 2, -4, 7, -12, 28, 120, -18, 8, -4, 3, -1 },
+  { -1, 2, -2, 4, -8, 18, 124, -13, 6, -3, 2, -1 },
+  { 0, 1, -1, 2, -4, 8, 127, -7, 3, -2, 1, 0 }
+};
+
+static const InterpFilterParams
+    av1_interp_filter_params_list[INTERP_FILTERS_ALL] = {
+      { (const int16_t *)av1_sub_pel_filters_8, SUBPEL_TAPS, EIGHTTAP_REGULAR },
+      { (const int16_t *)av1_sub_pel_filters_8smooth, SUBPEL_TAPS,
+        EIGHTTAP_SMOOTH },
+      { (const int16_t *)av1_sub_pel_filters_8sharp, SUBPEL_TAPS,
+        MULTITAP_SHARP },
+      { (const int16_t *)av1_bilinear_filters, SUBPEL_TAPS, BILINEAR },
+
+      // The following filters are for encoder only, and now they are used in
+      // temporal filtering. The predictor block size >= 16 in temporal filter.
+      { (const int16_t *)av1_sub_pel_filters_12sharp, 12, MULTITAP_SHARP2 },
+    };
+
+// A special 2-tap bilinear filter for IntraBC chroma. IntraBC uses full pixel
+// MV for luma. If sub-sampling exists, chroma may possibly use half-pel MV.
+DECLARE_ALIGNED(256, static const int16_t,
+                av1_intrabc_bilinear_filter[2 * SUBPEL_SHIFTS]) = {
+  128, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  64,  64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const InterpFilterParams av1_intrabc_filter_params = {
+  av1_intrabc_bilinear_filter, 2, BILINEAR
+};
+
+DECLARE_ALIGNED(256, static const InterpKernel,
+                av1_sub_pel_filters_4[SUBPEL_SHIFTS]) = {
+  { 0, 0, 0, 128, 0, 0, 0, 0 },     { 0, 0, -4, 126, 8, -2, 0, 0 },
+  { 0, 0, -8, 122, 18, -4, 0, 0 },  { 0, 0, -10, 116, 28, -6, 0, 0 },
+  { 0, 0, -12, 110, 38, -8, 0, 0 }, { 0, 0, -12, 102, 48, -10, 0, 0 },
+  { 0, 0, -14, 94, 58, -10, 0, 0 }, { 0, 0, -12, 84, 66, -10, 0, 0 },
+  { 0, 0, -12, 76, 76, -12, 0, 0 }, { 0, 0, -10, 66, 84, -12, 0, 0 },
+  { 0, 0, -10, 58, 94, -14, 0, 0 }, { 0, 0, -10, 48, 102, -12, 0, 0 },
+  { 0, 0, -8, 38, 110, -12, 0, 0 }, { 0, 0, -6, 28, 116, -10, 0, 0 },
+  { 0, 0, -4, 18, 122, -8, 0, 0 },  { 0, 0, -2, 8, 126, -4, 0, 0 }
+};
+DECLARE_ALIGNED(256, static const InterpKernel,
+                av1_sub_pel_filters_4smooth[SUBPEL_SHIFTS]) = {
+  { 0, 0, 0, 128, 0, 0, 0, 0 },   { 0, 0, 30, 62, 34, 2, 0, 0 },
+  { 0, 0, 26, 62, 36, 4, 0, 0 },  { 0, 0, 22, 62, 40, 4, 0, 0 },
+  { 0, 0, 20, 60, 42, 6, 0, 0 },  { 0, 0, 18, 58, 44, 8, 0, 0 },
+  { 0, 0, 16, 56, 46, 10, 0, 0 }, { 0, 0, 14, 54, 48, 12, 0, 0 },
+  { 0, 0, 12, 52, 52, 12, 0, 0 }, { 0, 0, 12, 48, 54, 14, 0, 0 },
+  { 0, 0, 10, 46, 56, 16, 0, 0 }, { 0, 0, 8, 44, 58, 18, 0, 0 },
+  { 0, 0, 6, 42, 60, 20, 0, 0 },  { 0, 0, 4, 40, 62, 22, 0, 0 },
+  { 0, 0, 4, 36, 62, 26, 0, 0 },  { 0, 0, 2, 34, 62, 30, 0, 0 }
+};
+
+static const uint16_t
+    av1_interp_dual_filt_mask[INTERP_PRED_TYPE_ALL - 2][SWITCHABLE_FILTERS] = {
+      { (1 << REG_REG) | (1 << SMOOTH_REG) | (1 << SHARP_REG),
+        (1 << REG_SMOOTH) | (1 << SMOOTH_SMOOTH) | (1 << SHARP_SMOOTH),
+        (1 << REG_SHARP) | (1 << SMOOTH_SHARP) | (1 << SHARP_SHARP) },
+      { (1 << REG_REG) | (1 << REG_SMOOTH) | (1 << REG_SHARP),
+        (1 << SMOOTH_REG) | (1 << SMOOTH_SMOOTH) | (1 << SMOOTH_SHARP),
+        (1 << SHARP_REG) | (1 << SHARP_SMOOTH) | (1 << SHARP_SHARP) }
+    };
+
+// For w<=4, MULTITAP_SHARP is the same as EIGHTTAP_REGULAR
+static const InterpFilterParams av1_interp_4tap[SWITCHABLE_FILTERS + 1] = {
+  { (const int16_t *)av1_sub_pel_filters_4, SUBPEL_TAPS, EIGHTTAP_REGULAR },
+  { (const int16_t *)av1_sub_pel_filters_4smooth, SUBPEL_TAPS,
+    EIGHTTAP_SMOOTH },
+  { (const int16_t *)av1_sub_pel_filters_4, SUBPEL_TAPS, EIGHTTAP_REGULAR },
+  { (const int16_t *)av1_bilinear_filters, SUBPEL_TAPS, BILINEAR },
+};
+
+static INLINE const InterpFilterParams *
+av1_get_interp_filter_params_with_block_size(const InterpFilter interp_filter,
+                                             const int w) {
+  if (w <= 4 && interp_filter != MULTITAP_SHARP2)
+    return &av1_interp_4tap[interp_filter];
+  return &av1_interp_filter_params_list[interp_filter];
+}
+
+static INLINE const int16_t *av1_get_interp_filter_kernel(
+    const InterpFilter interp_filter, int subpel_search) {
+  assert(subpel_search >= USE_2_TAPS);
+  return (subpel_search == USE_2_TAPS)
+             ? av1_interp_4tap[BILINEAR].filter_ptr
+             : ((subpel_search == USE_4_TAPS)
+                    ? av1_interp_4tap[interp_filter].filter_ptr
+                    : av1_interp_filter_params_list[interp_filter].filter_ptr);
+}
+
+static INLINE const int16_t *av1_get_interp_filter_subpel_kernel(
+    const InterpFilterParams *const filter_params, const int subpel) {
+  return filter_params->filter_ptr + filter_params->taps * subpel;
+}
+
+static INLINE const InterpFilterParams *av1_get_filter(int subpel_search) {
+  assert(subpel_search >= USE_2_TAPS);
+
+  switch (subpel_search) {
+    case USE_2_TAPS: return &av1_interp_4tap[BILINEAR];
+    case USE_4_TAPS: return &av1_interp_4tap[EIGHTTAP_REGULAR];
+    case USE_8_TAPS: return &av1_interp_filter_params_list[EIGHTTAP_REGULAR];
+    default: assert(0); return NULL;
+  }
+}
+
+static INLINE void reset_interp_filter_allowed_mask(
+    uint16_t *allow_interp_mask, DUAL_FILTER_TYPE filt_type) {
+  uint16_t tmp = (~(1 << filt_type)) & 0xffff;
+  *allow_interp_mask &= (tmp & ALLOW_ALL_INTERP_FILT_MASK);
+}
+
+static INLINE void set_interp_filter_allowed_mask(uint16_t *allow_interp_mask,
+                                                  DUAL_FILTER_TYPE filt_type) {
+  *allow_interp_mask |= (1 << filt_type);
+}
+
+static INLINE uint8_t get_interp_filter_allowed_mask(
+    uint16_t allow_interp_mask, DUAL_FILTER_TYPE filt_type) {
+  return (allow_interp_mask >> filt_type) & 1;
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_FILTER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.c
new file mode 100644
index 0000000000..b6996e60c8
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+
+int av1_alloc_internal_frame_buffers(InternalFrameBufferList *list) {
+  assert(list != NULL);
+  av1_free_internal_frame_buffers(list);
+
+  list->num_internal_frame_buffers =
+      AOM_MAXIMUM_REF_BUFFERS + AOM_MAXIMUM_WORK_BUFFERS;
+  list->int_fb = (InternalFrameBuffer *)aom_calloc(
+      list->num_internal_frame_buffers, sizeof(*list->int_fb));
+  if (list->int_fb == NULL) {
+    list->num_internal_frame_buffers = 0;
+    return 1;
+  }
+  return 0;
+}
+
+void av1_free_internal_frame_buffers(InternalFrameBufferList *list) {
+  int i;
+
+  assert(list != NULL);
+
+  for (i = 0; i < list->num_internal_frame_buffers; ++i) {
+    aom_free(list->int_fb[i].data);
+    list->int_fb[i].data = NULL;
+  }
+  aom_free(list->int_fb);
+  list->int_fb = NULL;
+  list->num_internal_frame_buffers = 0;
+}
+
+void av1_zero_unused_internal_frame_buffers(InternalFrameBufferList *list) {
+  int i;
+
+  assert(list != NULL);
+
+  for (i = 0; i < list->num_internal_frame_buffers; ++i) {
+    if (list->int_fb[i].data && !list->int_fb[i].in_use)
+      memset(list->int_fb[i].data, 0, list->int_fb[i].size);
+  }
+}
+
+int av1_get_frame_buffer(void *cb_priv, size_t min_size,
+                         aom_codec_frame_buffer_t *fb) {
+  int i;
+  InternalFrameBufferList *const int_fb_list =
+      (InternalFrameBufferList *)cb_priv;
+  if (int_fb_list == NULL) return -1;
+
+  // Find a free frame buffer.
+  for (i = 0; i < int_fb_list->num_internal_frame_buffers; ++i) {
+    if (!int_fb_list->int_fb[i].in_use) break;
+  }
+
+  if (i == int_fb_list->num_internal_frame_buffers) return -1;
+
+  if (int_fb_list->int_fb[i].size < min_size) {
+    aom_free(int_fb_list->int_fb[i].data);
+    // The data must be zeroed to fix a valgrind error from the C loop filter
+    // due to access uninitialized memory in frame border. It could be
+    // skipped if border were totally removed.
+    int_fb_list->int_fb[i].data = (uint8_t *)aom_calloc(1, min_size);
+    if (!int_fb_list->int_fb[i].data) {
+      int_fb_list->int_fb[i].size = 0;
+      return -1;
+    }
+    int_fb_list->int_fb[i].size = min_size;
+  }
+
+  fb->data = int_fb_list->int_fb[i].data;
+  fb->size = int_fb_list->int_fb[i].size;
+  int_fb_list->int_fb[i].in_use = 1;
+
+  // Set the frame buffer's private data to point at the internal frame buffer.
+  fb->priv = &int_fb_list->int_fb[i];
+  return 0;
+}
+
+int av1_release_frame_buffer(void *cb_priv, aom_codec_frame_buffer_t *fb) {
+  InternalFrameBuffer *const int_fb = (InternalFrameBuffer *)fb->priv;
+  (void)cb_priv;
+  if (int_fb) int_fb->in_use = 0;
+  return 0;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.h
new file mode 100644
index 0000000000..4c5fc1931f
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_FRAME_BUFFERS_H_
+#define AOM_AV1_COMMON_FRAME_BUFFERS_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_frame_buffer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct InternalFrameBuffer {
+  uint8_t *data;
+  size_t size;
+  int in_use;
+} InternalFrameBuffer;
+
+typedef struct InternalFrameBufferList {
+  int num_internal_frame_buffers;
+  InternalFrameBuffer *int_fb;
+} InternalFrameBufferList;
+
+// Initializes |list|. Returns 0 on success.
+int av1_alloc_internal_frame_buffers(InternalFrameBufferList *list);
+
+// Free any data allocated to the frame buffers.
+void av1_free_internal_frame_buffers(InternalFrameBufferList *list);
+
+// Zeros all unused internal frame buffers. In particular, this zeros the
+// frame borders. Call this function after a sequence header change to
+// re-initialize the frame borders for the different width, height, or bit
+// depth.
+void av1_zero_unused_internal_frame_buffers(InternalFrameBufferList *list);
+
+// Callback used by libaom to request an external frame buffer. |cb_priv|
+// Callback private data, which points to an InternalFrameBufferList.
+// |min_size| is the minimum size in bytes needed to decode the next frame.
+// |fb| pointer to the frame buffer.
+int av1_get_frame_buffer(void *cb_priv, size_t min_size,
+                         aom_codec_frame_buffer_t *fb);
+
+// Callback used by libaom when there are no references to the frame buffer.
+// |cb_priv| is not used. |fb| pointer to the frame buffer.
+int av1_release_frame_buffer(void *cb_priv, aom_codec_frame_buffer_t *fb);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_FRAME_BUFFERS_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/idct.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/idct.c
new file mode 100644
index 0000000000..bae303fc47
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/idct.c
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <math.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_inv_txfm1d_cfg.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/idct.h"
+
+int av1_get_tx_scale(const TX_SIZE tx_size) {
+  const int pels = tx_size_2d[tx_size];
+  // Largest possible pels is 4096 (64x64).
+  return (pels > 256) + (pels > 1024);
+}
+
+// NOTE: The implementation of all inverses need to be aware of the fact
+// that input and output could be the same buffer.
+
+// idct
+void av1_highbd_iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
+                            int eob, int bd) {
+  if (eob > 1)
+    av1_highbd_iwht4x4_16_add(input, dest, stride, bd);
+  else
+    av1_highbd_iwht4x4_1_add(input, dest, stride, bd);
+}
+
+void av1_highbd_inv_txfm_add_4x4_c(const tran_low_t *input, uint8_t *dest,
+                                   int stride, const TxfmParam *txfm_param) {
+  assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]);
+  int eob = txfm_param->eob;
+  int bd = txfm_param->bd;
+  int lossless = txfm_param->lossless;
+  const int32_t *src = cast_to_int32(input);
+  const TX_TYPE tx_type = txfm_param->tx_type;
+  if (lossless) {
+    assert(tx_type == DCT_DCT);
+    av1_highbd_iwht4x4_add(input, dest, stride, eob, bd);
+    return;
+  }
+
+  av1_inv_txfm2d_add_4x4_c(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type, bd);
+}
+
+void av1_highbd_inv_txfm_add_4x8_c(const tran_low_t *input, uint8_t *dest,
+                                   int stride, const TxfmParam *txfm_param) {
+  assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]);
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_4x8_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                           txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_8x4_c(const tran_low_t *input, uint8_t *dest,
+                                   int stride, const TxfmParam *txfm_param) {
+  assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]);
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_8x4_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                           txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_16x32_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_16x32_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                             txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_32x16_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_32x16_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                             txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_16x4_c(const tran_low_t *input, uint8_t *dest,
+                                    int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_16x4_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                            txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_4x16_c(const tran_low_t *input, uint8_t *dest,
+                                    int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_4x16_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                            txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_32x8_c(const tran_low_t *input, uint8_t *dest,
+                                    int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_32x8_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                            txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_8x32_c(const tran_low_t *input, uint8_t *dest,
+                                    int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_8x32_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                            txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_32x64_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_32x64_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                             txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_64x32_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_64x32_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                             txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_16x64_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_16x64_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                             txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_64x16_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_64x16_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                             txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_8x8_c(const tran_low_t *input, uint8_t *dest,
+                                   int stride, const TxfmParam *txfm_param) {
+  int bd = txfm_param->bd;
+  const TX_TYPE tx_type = txfm_param->tx_type;
+  const int32_t *src = cast_to_int32(input);
+
+  av1_inv_txfm2d_add_8x8_c(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type, bd);
+}
+
+void av1_highbd_inv_txfm_add_16x16_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  int bd = txfm_param->bd;
+  const TX_TYPE tx_type = txfm_param->tx_type;
+  const int32_t *src = cast_to_int32(input);
+
+  av1_inv_txfm2d_add_16x16_c(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type,
+                             bd);
+}
+
+void av1_highbd_inv_txfm_add_8x16_c(const tran_low_t *input, uint8_t *dest,
+                                    int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_8x16_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                            txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_16x8_c(const tran_low_t *input, uint8_t *dest,
+                                    int stride, const TxfmParam *txfm_param) {
+  const int32_t *src = cast_to_int32(input);
+  av1_inv_txfm2d_add_16x8_c(src, CONVERT_TO_SHORTPTR(dest), stride,
+                            txfm_param->tx_type, txfm_param->bd);
+}
+
+void av1_highbd_inv_txfm_add_32x32_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  const int bd = txfm_param->bd;
+  const TX_TYPE tx_type = txfm_param->tx_type;
+  const int32_t *src = cast_to_int32(input);
+
+  av1_inv_txfm2d_add_32x32_c(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type,
+                             bd);
+}
+
+void av1_highbd_inv_txfm_add_64x64_c(const tran_low_t *input, uint8_t *dest,
+                                     int stride, const TxfmParam *txfm_param) {
+  const int bd = txfm_param->bd;
+  const TX_TYPE tx_type = txfm_param->tx_type;
+  const int32_t *src = cast_to_int32(input);
+  assert(tx_type == DCT_DCT);
+  av1_inv_txfm2d_add_64x64_c(src, CONVERT_TO_SHORTPTR(dest), stride, tx_type,
+                             bd);
+}
+
+static void init_txfm_param(const MACROBLOCKD *xd, int plane, TX_SIZE tx_size,
+                            TX_TYPE tx_type, int eob, int reduced_tx_set,
+                            TxfmParam *txfm_param) {
+  (void)plane;
+  txfm_param->tx_type = tx_type;
+  txfm_param->tx_size = tx_size;
+  txfm_param->eob = eob;
+  txfm_param->lossless = xd->lossless[xd->mi[0]->segment_id];
+  txfm_param->bd = xd->bd;
+  txfm_param->is_hbd = is_cur_buf_hbd(xd);
+  txfm_param->tx_set_type = av1_get_ext_tx_set_type(
+      txfm_param->tx_size, is_inter_block(xd->mi[0]), reduced_tx_set);
+}
+
+void av1_highbd_inv_txfm_add_c(const tran_low_t *input, uint8_t *dest,
+                               int stride, const TxfmParam *txfm_param) {
+  assert(av1_ext_tx_used[txfm_param->tx_set_type][txfm_param->tx_type]);
+  const TX_SIZE tx_size = txfm_param->tx_size;
+  switch (tx_size) {
+    case TX_32X32:
+      av1_highbd_inv_txfm_add_32x32_c(input, dest, stride, txfm_param);
+      break;
+    case TX_16X16:
+      av1_highbd_inv_txfm_add_16x16_c(input, dest, stride, txfm_param);
+      break;
+    case TX_8X8:
+      av1_highbd_inv_txfm_add_8x8_c(input, dest, stride, txfm_param);
+      break;
+    case TX_4X8:
+      av1_highbd_inv_txfm_add_4x8_c(input, dest, stride, txfm_param);
+      break;
+    case TX_8X4:
+      av1_highbd_inv_txfm_add_8x4_c(input, dest, stride, txfm_param);
+      break;
+    case TX_8X16:
+      av1_highbd_inv_txfm_add_8x16_c(input, dest, stride, txfm_param);
+      break;
+    case TX_16X8:
+      av1_highbd_inv_txfm_add_16x8_c(input, dest, stride, txfm_param);
+      break;
+    case TX_16X32:
+      av1_highbd_inv_txfm_add_16x32_c(input, dest, stride, txfm_param);
+      break;
+    case TX_32X16:
+      av1_highbd_inv_txfm_add_32x16_c(input, dest, stride, txfm_param);
+      break;
+    case TX_64X64:
+      av1_highbd_inv_txfm_add_64x64_c(input, dest, stride, txfm_param);
+      break;
+    case TX_32X64:
+      av1_highbd_inv_txfm_add_32x64_c(input, dest, stride, txfm_param);
+      break;
+    case TX_64X32:
+      av1_highbd_inv_txfm_add_64x32_c(input, dest, stride, txfm_param);
+      break;
+    case TX_16X64:
+      av1_highbd_inv_txfm_add_16x64_c(input, dest, stride, txfm_param);
+      break;
+    case TX_64X16:
+      av1_highbd_inv_txfm_add_64x16_c(input, dest, stride, txfm_param);
+      break;
+    case TX_4X4:
+      // this is like av1_short_idct4x4 but has a special case around eob<=1
+      // which is significant (not just an optimization) for the lossless
+      // case.
+      av1_highbd_inv_txfm_add_4x4_c(input, dest, stride, txfm_param);
+      break;
+    case TX_16X4:
+      av1_highbd_inv_txfm_add_16x4_c(input, dest, stride, txfm_param);
+      break;
+    case TX_4X16:
+      av1_highbd_inv_txfm_add_4x16_c(input, dest, stride, txfm_param);
+      break;
+    case TX_8X32:
+      av1_highbd_inv_txfm_add_8x32_c(input, dest, stride, txfm_param);
+      break;
+    case TX_32X8:
+      av1_highbd_inv_txfm_add_32x8_c(input, dest, stride, txfm_param);
+      break;
+    default: assert(0 && "Invalid transform size"); break;
+  }
+}
+
+void av1_inv_txfm_add_c(const tran_low_t *dqcoeff, uint8_t *dst, int stride,
+                        const TxfmParam *txfm_param) {
+  const TX_SIZE tx_size = txfm_param->tx_size;
+  DECLARE_ALIGNED(32, uint16_t, tmp[MAX_TX_SQUARE]);
+  int tmp_stride = MAX_TX_SIZE;
+  int w = tx_size_wide[tx_size];
+  int h = tx_size_high[tx_size];
+  for (int r = 0; r < h; ++r) {
+    for (int c = 0; c < w; ++c) {
+      tmp[r * tmp_stride + c] = dst[r * stride + c];
+    }
+  }
+
+  av1_highbd_inv_txfm_add(dqcoeff, CONVERT_TO_BYTEPTR(tmp), tmp_stride,
+                          txfm_param);
+
+  for (int r = 0; r < h; ++r) {
+    for (int c = 0; c < w; ++c) {
+      dst[r * stride + c] = (uint8_t)tmp[r * tmp_stride + c];
+    }
+  }
+}
+
+void av1_inverse_transform_block(const MACROBLOCKD *xd,
+                                 const tran_low_t *dqcoeff, int plane,
+                                 TX_TYPE tx_type, TX_SIZE tx_size, uint8_t *dst,
+                                 int stride, int eob, int reduced_tx_set) {
+  if (!eob) return;
+
+  assert(eob <= av1_get_max_eob(tx_size));
+
+  TxfmParam txfm_param;
+  init_txfm_param(xd, plane, tx_size, tx_type, eob, reduced_tx_set,
+                  &txfm_param);
+  assert(av1_ext_tx_used[txfm_param.tx_set_type][txfm_param.tx_type]);
+
+  if (txfm_param.is_hbd) {
+    av1_highbd_inv_txfm_add(dqcoeff, dst, stride, &txfm_param);
+  } else {
+    av1_inv_txfm_add(dqcoeff, dst, stride, &txfm_param);
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/idct.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/idct.h
new file mode 100644
index 0000000000..47eca65958
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/idct.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_IDCT_H_
+#define AOM_AV1_COMMON_IDCT_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/txfm_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*transform_1d)(const tran_low_t *, tran_low_t *);
+
+typedef struct {
+  transform_1d cols, rows;  // vertical and horizontal
+} transform_2d;
+
+#define MAX_TX_SCALE 1
+int av1_get_tx_scale(const TX_SIZE tx_size);
+
+void av1_inverse_transform_block(const MACROBLOCKD *xd,
+                                 const tran_low_t *dqcoeff, int plane,
+                                 TX_TYPE tx_type, TX_SIZE tx_size, uint8_t *dst,
+                                 int stride, int eob, int reduced_tx_set);
+void av1_highbd_iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
+                            int eob, int bd);
+
+static INLINE const int32_t *cast_to_int32(const tran_low_t *input) {
+  assert(sizeof(int32_t) == sizeof(tran_low_t));
+  return (const int32_t *)input;
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_IDCT_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/mv.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/mv.h
new file mode 100644
index 0000000000..eb2085efae
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/mv.h
@@ -0,0 +1,354 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_MV_H_
+#define AOM_AV1_COMMON_MV_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common_data.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_filter.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define INVALID_MV 0x80008000
+#define GET_MV_RAWPEL(x) (((x) + 3 + ((x) >= 0)) >> 3)
+#define GET_MV_SUBPEL(x) ((x)*8)
+
+#define MARK_MV_INVALID(mv)                \
+  do {                                     \
+    ((int_mv *)(mv))->as_int = INVALID_MV; \
+  } while (0);
+#define CHECK_MV_EQUAL(x, y) (((x).row == (y).row) && ((x).col == (y).col))
+
+// The motion vector in units of full pixel
+typedef struct fullpel_mv {
+  int16_t row;
+  int16_t col;
+} FULLPEL_MV;
+
+// The motion vector in units of 1/8-pel
+typedef struct mv {
+  int16_t row;
+  int16_t col;
+} MV;
+
+static const MV kZeroMv = { 0, 0 };
+static const FULLPEL_MV kZeroFullMv = { 0, 0 };
+
+typedef union int_mv {
+  uint32_t as_int;
+  MV as_mv;
+  FULLPEL_MV as_fullmv;
+} int_mv; /* facilitates faster equality tests and copies */
+
+typedef struct mv32 {
+  int32_t row;
+  int32_t col;
+} MV32;
+
+// The mv limit for fullpel mvs
+typedef struct {
+  int col_min;
+  int col_max;
+  int row_min;
+  int row_max;
+} FullMvLimits;
+
+// The mv limit for subpel mvs
+typedef struct {
+  int col_min;
+  int col_max;
+  int row_min;
+  int row_max;
+} SubpelMvLimits;
+
+static AOM_INLINE FULLPEL_MV get_fullmv_from_mv(const MV *subpel_mv) {
+  const FULLPEL_MV full_mv = { (int16_t)GET_MV_RAWPEL(subpel_mv->row),
+                               (int16_t)GET_MV_RAWPEL(subpel_mv->col) };
+  return full_mv;
+}
+
+static AOM_INLINE MV get_mv_from_fullmv(const FULLPEL_MV *full_mv) {
+  const MV subpel_mv = { (int16_t)GET_MV_SUBPEL(full_mv->row),
+                         (int16_t)GET_MV_SUBPEL(full_mv->col) };
+  return subpel_mv;
+}
+
+static AOM_INLINE void convert_fullmv_to_mv(int_mv *mv) {
+  mv->as_mv = get_mv_from_fullmv(&mv->as_fullmv);
+}
+
+// Bits of precision used for the model
+#define WARPEDMODEL_PREC_BITS 16
+#define WARPEDMODEL_ROW3HOMO_PREC_BITS 16
+
+#define WARPEDMODEL_TRANS_CLAMP (128 << WARPEDMODEL_PREC_BITS)
+#define WARPEDMODEL_NONDIAGAFFINE_CLAMP (1 << (WARPEDMODEL_PREC_BITS - 3))
+#define WARPEDMODEL_ROW3HOMO_CLAMP (1 << (WARPEDMODEL_PREC_BITS - 2))
+
+// Bits of subpel precision for warped interpolation
+#define WARPEDPIXEL_PREC_BITS 6
+#define WARPEDPIXEL_PREC_SHIFTS (1 << WARPEDPIXEL_PREC_BITS)
+
+#define WARP_PARAM_REDUCE_BITS 6
+
+#define WARPEDDIFF_PREC_BITS (WARPEDMODEL_PREC_BITS - WARPEDPIXEL_PREC_BITS)
+
+/* clang-format off */
+enum {
+  IDENTITY = 0,      // identity transformation, 0-parameter
+  TRANSLATION = 1,   // translational motion 2-parameter
+  ROTZOOM = 2,       // simplified affine with rotation + zoom only, 4-parameter
+  AFFINE = 3,        // affine, 6-parameter
+  TRANS_TYPES,
+} UENUM1BYTE(TransformationType);
+/* clang-format on */
+
+// Number of types used for global motion (must be >= 3 and <= TRANS_TYPES)
+// The following can be useful:
+// GLOBAL_TRANS_TYPES 3 - up to rotation-zoom
+// GLOBAL_TRANS_TYPES 4 - up to affine
+// GLOBAL_TRANS_TYPES 6 - up to hor/ver trapezoids
+// GLOBAL_TRANS_TYPES 7 - up to full homography
+#define GLOBAL_TRANS_TYPES 4
+
+typedef struct {
+  int global_warp_allowed;
+  int local_warp_allowed;
+} WarpTypesAllowed;
+
+// number of parameters used by each transformation in TransformationTypes
+static const int trans_model_params[TRANS_TYPES] = { 0, 2, 4, 6 };
+
+// The order of values in the wmmat matrix below is best described
+// by the homography:
+//      [x'     (m2 m3 m0   [x
+//  z .  y'  =   m4 m5 m1 *  y
+//       1]      m6 m7 1)    1]
+typedef struct {
+  int32_t wmmat[8];
+  int16_t alpha, beta, gamma, delta;
+  TransformationType wmtype;
+  int8_t invalid;
+} WarpedMotionParams;
+
+/* clang-format off */
+static const WarpedMotionParams default_warp_params = {
+  { 0, 0, (1 << WARPEDMODEL_PREC_BITS), 0, 0, (1 << WARPEDMODEL_PREC_BITS), 0,
+    0 },
+  0, 0, 0, 0,
+  IDENTITY,
+  0,
+};
+/* clang-format on */
+
+// The following constants describe the various precisions
+// of different parameters in the global motion experiment.
+//
+// Given the general homography:
+//      [x'     (a  b  c   [x
+//  z .  y'  =   d  e  f *  y
+//       1]      g  h  i)    1]
+//
+// Constants using the name ALPHA here are related to parameters
+// a, b, d, e. Constants using the name TRANS are related
+// to parameters c and f.
+//
+// Anything ending in PREC_BITS is the number of bits of precision
+// to maintain when converting from double to integer.
+//
+// The ABS parameters are used to create an upper and lower bound
+// for each parameter. In other words, after a parameter is integerized
+// it is clamped between -(1 << ABS_XXX_BITS) and (1 << ABS_XXX_BITS).
+//
+// XXX_PREC_DIFF and XXX_DECODE_FACTOR
+// are computed once here to prevent repetitive
+// computation on the decoder side. These are
+// to allow the global motion parameters to be encoded in a lower
+// precision than the warped model precision. This means that they
+// need to be changed to warped precision when they are decoded.
+//
+// XX_MIN, XX_MAX are also computed to avoid repeated computation
+
+#define SUBEXPFIN_K 3
+#define GM_TRANS_PREC_BITS 6
+#define GM_ABS_TRANS_BITS 12
+#define GM_ABS_TRANS_ONLY_BITS (GM_ABS_TRANS_BITS - GM_TRANS_PREC_BITS + 3)
+#define GM_TRANS_PREC_DIFF (WARPEDMODEL_PREC_BITS - GM_TRANS_PREC_BITS)
+#define GM_TRANS_ONLY_PREC_DIFF (WARPEDMODEL_PREC_BITS - 3)
+#define GM_TRANS_DECODE_FACTOR (1 << GM_TRANS_PREC_DIFF)
+#define GM_TRANS_ONLY_DECODE_FACTOR (1 << GM_TRANS_ONLY_PREC_DIFF)
+
+#define GM_ALPHA_PREC_BITS 15
+#define GM_ABS_ALPHA_BITS 12
+#define GM_ALPHA_PREC_DIFF (WARPEDMODEL_PREC_BITS - GM_ALPHA_PREC_BITS)
+#define GM_ALPHA_DECODE_FACTOR (1 << GM_ALPHA_PREC_DIFF)
+
+#define GM_ROW3HOMO_PREC_BITS 16
+#define GM_ABS_ROW3HOMO_BITS 11
+#define GM_ROW3HOMO_PREC_DIFF \
+  (WARPEDMODEL_ROW3HOMO_PREC_BITS - GM_ROW3HOMO_PREC_BITS)
+#define GM_ROW3HOMO_DECODE_FACTOR (1 << GM_ROW3HOMO_PREC_DIFF)
+
+#define GM_TRANS_MAX (1 << GM_ABS_TRANS_BITS)
+#define GM_ALPHA_MAX (1 << GM_ABS_ALPHA_BITS)
+#define GM_ROW3HOMO_MAX (1 << GM_ABS_ROW3HOMO_BITS)
+
+#define GM_TRANS_MIN -GM_TRANS_MAX
+#define GM_ALPHA_MIN -GM_ALPHA_MAX
+#define GM_ROW3HOMO_MIN -GM_ROW3HOMO_MAX
+
+static INLINE int block_center_x(int mi_col, BLOCK_SIZE bs) {
+  const int bw = block_size_wide[bs];
+  return mi_col * MI_SIZE + bw / 2 - 1;
+}
+
+static INLINE int block_center_y(int mi_row, BLOCK_SIZE bs) {
+  const int bh = block_size_high[bs];
+  return mi_row * MI_SIZE + bh / 2 - 1;
+}
+
+static INLINE int convert_to_trans_prec(int allow_hp, int coor) {
+  if (allow_hp)
+    return ROUND_POWER_OF_TWO_SIGNED(coor, WARPEDMODEL_PREC_BITS - 3);
+  else
+    return ROUND_POWER_OF_TWO_SIGNED(coor, WARPEDMODEL_PREC_BITS - 2) * 2;
+}
+static INLINE void integer_mv_precision(MV *mv) {
+  int mod = (mv->row % 8);
+  if (mod != 0) {
+    mv->row -= mod;
+    if (abs(mod) > 4) {
+      if (mod > 0) {
+        mv->row += 8;
+      } else {
+        mv->row -= 8;
+      }
+    }
+  }
+
+  mod = (mv->col % 8);
+  if (mod != 0) {
+    mv->col -= mod;
+    if (abs(mod) > 4) {
+      if (mod > 0) {
+        mv->col += 8;
+      } else {
+        mv->col -= 8;
+      }
+    }
+  }
+}
+// Convert a global motion vector into a motion vector at the centre of the
+// given block.
+//
+// The resulting motion vector will have three fractional bits of precision. If
+// allow_hp is zero, the bottom bit will always be zero. If CONFIG_AMVR and
+// is_integer is true, the bottom three bits will be zero (so the motion vector
+// represents an integer)
+static INLINE int_mv gm_get_motion_vector(const WarpedMotionParams *gm,
+                                          int allow_hp, BLOCK_SIZE bsize,
+                                          int mi_col, int mi_row,
+                                          int is_integer) {
+  int_mv res;
+
+  if (gm->wmtype == IDENTITY) {
+    res.as_int = 0;
+    return res;
+  }
+
+  const int32_t *mat = gm->wmmat;
+  int x, y, tx, ty;
+
+  if (gm->wmtype == TRANSLATION) {
+    // All global motion vectors are stored with WARPEDMODEL_PREC_BITS (16)
+    // bits of fractional precision. The offset for a translation is stored in
+    // entries 0 and 1. For translations, all but the top three (two if
+    // cm->features.allow_high_precision_mv is false) fractional bits are always
+    // zero.
+    //
+    // After the right shifts, there are 3 fractional bits of precision. If
+    // allow_hp is false, the bottom bit is always zero (so we don't need a
+    // call to convert_to_trans_prec here)
+    res.as_mv.row = gm->wmmat[0] >> GM_TRANS_ONLY_PREC_DIFF;
+    res.as_mv.col = gm->wmmat[1] >> GM_TRANS_ONLY_PREC_DIFF;
+    assert(IMPLIES(1 & (res.as_mv.row | res.as_mv.col), allow_hp));
+    if (is_integer) {
+      integer_mv_precision(&res.as_mv);
+    }
+    return res;
+  }
+
+  x = block_center_x(mi_col, bsize);
+  y = block_center_y(mi_row, bsize);
+
+  if (gm->wmtype == ROTZOOM) {
+    assert(gm->wmmat[5] == gm->wmmat[2]);
+    assert(gm->wmmat[4] == -gm->wmmat[3]);
+  }
+
+  const int xc =
+      (mat[2] - (1 << WARPEDMODEL_PREC_BITS)) * x + mat[3] * y + mat[0];
+  const int yc =
+      mat[4] * x + (mat[5] - (1 << WARPEDMODEL_PREC_BITS)) * y + mat[1];
+  tx = convert_to_trans_prec(allow_hp, xc);
+  ty = convert_to_trans_prec(allow_hp, yc);
+
+  res.as_mv.row = ty;
+  res.as_mv.col = tx;
+
+  if (is_integer) {
+    integer_mv_precision(&res.as_mv);
+  }
+  return res;
+}
+
+static INLINE TransformationType get_wmtype(const WarpedMotionParams *gm) {
+  if (gm->wmmat[5] == (1 << WARPEDMODEL_PREC_BITS) && !gm->wmmat[4] &&
+      gm->wmmat[2] == (1 << WARPEDMODEL_PREC_BITS) && !gm->wmmat[3]) {
+    return ((!gm->wmmat[1] && !gm->wmmat[0]) ? IDENTITY : TRANSLATION);
+  }
+  if (gm->wmmat[2] == gm->wmmat[5] && gm->wmmat[3] == -gm->wmmat[4])
+    return ROTZOOM;
+  else
+    return AFFINE;
+}
+
+typedef struct candidate_mv {
+  int_mv this_mv;
+  int_mv comp_mv;
+} CANDIDATE_MV;
+
+static INLINE int is_zero_mv(const MV *mv) {
+  return *((const uint32_t *)mv) == 0;
+}
+
+static INLINE int is_equal_mv(const MV *a, const MV *b) {
+  return *((const uint32_t *)a) == *((const uint32_t *)b);
+}
+
+static INLINE void clamp_mv(MV *mv, const SubpelMvLimits *mv_limits) {
+  mv->col = clamp(mv->col, mv_limits->col_min, mv_limits->col_max);
+  mv->row = clamp(mv->row, mv_limits->row_min, mv_limits->row_max);
+}
+
+static INLINE void clamp_fullmv(FULLPEL_MV *mv, const FullMvLimits *mv_limits) {
+  mv->col = clamp(mv->col, mv_limits->col_min, mv_limits->col_max);
+  mv->row = clamp(mv->row, mv_limits->row_min, mv_limits->row_max);
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_MV_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.c
new file mode 100644
index 0000000000..25678570d5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.c
@@ -0,0 +1,1485 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <stdlib.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.h"
+
+// Although we assign 32 bit integers, all the values are strictly under 14
+// bits.
+static int div_mult[32] = { 0,    16384, 8192, 5461, 4096, 3276, 2730, 2340,
+                            2048, 1820,  1638, 1489, 1365, 1260, 1170, 1092,
+                            1024, 963,   910,  862,  819,  780,  744,  712,
+                            682,  655,   630,  606,  585,  564,  546,  528 };
+
+// TODO(jingning): Consider the use of lookup table for (num / den)
+// altogether.
+static AOM_INLINE void get_mv_projection(MV *output, MV ref, int num, int den) {
+  den = AOMMIN(den, MAX_FRAME_DISTANCE);
+  num = num > 0 ? AOMMIN(num, MAX_FRAME_DISTANCE)
+                : AOMMAX(num, -MAX_FRAME_DISTANCE);
+  const int mv_row =
+      ROUND_POWER_OF_TWO_SIGNED(ref.row * num * div_mult[den], 14);
+  const int mv_col =
+      ROUND_POWER_OF_TWO_SIGNED(ref.col * num * div_mult[den], 14);
+  const int clamp_max = MV_UPP - 1;
+  const int clamp_min = MV_LOW + 1;
+  output->row = (int16_t)clamp(mv_row, clamp_min, clamp_max);
+  output->col = (int16_t)clamp(mv_col, clamp_min, clamp_max);
+}
+
+void av1_copy_frame_mvs(const AV1_COMMON *const cm,
+                        const MB_MODE_INFO *const mi, int mi_row, int mi_col,
+                        int x_mis, int y_mis) {
+  const int frame_mvs_stride = ROUND_POWER_OF_TWO(cm->mi_params.mi_cols, 1);
+  MV_REF *frame_mvs =
+      cm->cur_frame->mvs + (mi_row >> 1) * frame_mvs_stride + (mi_col >> 1);
+  x_mis = ROUND_POWER_OF_TWO(x_mis, 1);
+  y_mis = ROUND_POWER_OF_TWO(y_mis, 1);
+  int w, h;
+
+  for (h = 0; h < y_mis; h++) {
+    MV_REF *mv = frame_mvs;
+    for (w = 0; w < x_mis; w++) {
+      mv->ref_frame = NONE_FRAME;
+      mv->mv.as_int = 0;
+
+      for (int idx = 0; idx < 2; ++idx) {
+        MV_REFERENCE_FRAME ref_frame = mi->ref_frame[idx];
+        if (ref_frame > INTRA_FRAME) {
+          int8_t ref_idx = cm->ref_frame_side[ref_frame];
+          if (ref_idx) continue;
+          if ((abs(mi->mv[idx].as_mv.row) > REFMVS_LIMIT) ||
+              (abs(mi->mv[idx].as_mv.col) > REFMVS_LIMIT))
+            continue;
+          mv->ref_frame = ref_frame;
+          mv->mv.as_int = mi->mv[idx].as_int;
+        }
+      }
+      mv++;
+    }
+    frame_mvs += frame_mvs_stride;
+  }
+}
+
+static AOM_INLINE void add_ref_mv_candidate(
+    const MB_MODE_INFO *const candidate, const MV_REFERENCE_FRAME rf[2],
+    uint8_t *refmv_count, uint8_t *ref_match_count, uint8_t *newmv_count,
+    CANDIDATE_MV *ref_mv_stack, uint16_t *ref_mv_weight,
+    int_mv *gm_mv_candidates, const WarpedMotionParams *gm_params,
+    uint16_t weight) {
+  if (!is_inter_block(candidate)) return;
+  assert(weight % 2 == 0);
+  int index, ref;
+
+  if (rf[1] == NONE_FRAME) {
+    // single reference frame
+    for (ref = 0; ref < 2; ++ref) {
+      if (candidate->ref_frame[ref] == rf[0]) {
+        const int is_gm_block =
+            is_global_mv_block(candidate, gm_params[rf[0]].wmtype);
+        const int_mv this_refmv =
+            is_gm_block ? gm_mv_candidates[0] : get_block_mv(candidate, ref);
+        for (index = 0; index < *refmv_count; ++index) {
+          if (ref_mv_stack[index].this_mv.as_int == this_refmv.as_int) {
+            ref_mv_weight[index] += weight;
+            break;
+          }
+        }
+
+        // Add a new item to the list.
+        if (index == *refmv_count && *refmv_count < MAX_REF_MV_STACK_SIZE) {
+          ref_mv_stack[index].this_mv = this_refmv;
+          ref_mv_weight[index] = weight;
+          ++(*refmv_count);
+        }
+        if (have_newmv_in_inter_mode(candidate->mode)) ++*newmv_count;
+        ++*ref_match_count;
+      }
+    }
+  } else {
+    // compound reference frame
+    if (candidate->ref_frame[0] == rf[0] && candidate->ref_frame[1] == rf[1]) {
+      int_mv this_refmv[2];
+
+      for (ref = 0; ref < 2; ++ref) {
+        if (is_global_mv_block(candidate, gm_params[rf[ref]].wmtype))
+          this_refmv[ref] = gm_mv_candidates[ref];
+        else
+          this_refmv[ref] = get_block_mv(candidate, ref);
+      }
+
+      for (index = 0; index < *refmv_count; ++index) {
+        if ((ref_mv_stack[index].this_mv.as_int == this_refmv[0].as_int) &&
+            (ref_mv_stack[index].comp_mv.as_int == this_refmv[1].as_int)) {
+          ref_mv_weight[index] += weight;
+          break;
+        }
+      }
+
+      // Add a new item to the list.
+      if (index == *refmv_count && *refmv_count < MAX_REF_MV_STACK_SIZE) {
+        ref_mv_stack[index].this_mv = this_refmv[0];
+        ref_mv_stack[index].comp_mv = this_refmv[1];
+        ref_mv_weight[index] = weight;
+        ++(*refmv_count);
+      }
+      if (have_newmv_in_inter_mode(candidate->mode)) ++*newmv_count;
+      ++*ref_match_count;
+    }
+  }
+}
+
+static AOM_INLINE void scan_row_mbmi(
+    const AV1_COMMON *cm, const MACROBLOCKD *xd, int mi_col,
+    const MV_REFERENCE_FRAME rf[2], int row_offset, CANDIDATE_MV *ref_mv_stack,
+    uint16_t *ref_mv_weight, uint8_t *refmv_count, uint8_t *ref_match_count,
+    uint8_t *newmv_count, int_mv *gm_mv_candidates, int max_row_offset,
+    int *processed_rows) {
+  int end_mi = AOMMIN(xd->width, cm->mi_params.mi_cols - mi_col);
+  end_mi = AOMMIN(end_mi, mi_size_wide[BLOCK_64X64]);
+  const int width_8x8 = mi_size_wide[BLOCK_8X8];
+  const int width_16x16 = mi_size_wide[BLOCK_16X16];
+  int col_offset = 0;
+  // TODO(jingning): Revisit this part after cb4x4 is stable.
+  if (abs(row_offset) > 1) {
+    col_offset = 1;
+    if ((mi_col & 0x01) && xd->width < width_8x8) --col_offset;
+  }
+  const int use_step_16 = (xd->width >= 16);
+  MB_MODE_INFO **const candidate_mi0 = xd->mi + row_offset * xd->mi_stride;
+
+  for (int i = 0; i < end_mi;) {
+    const MB_MODE_INFO *const candidate = candidate_mi0[col_offset + i];
+    const int candidate_bsize = candidate->bsize;
+    const int n4_w = mi_size_wide[candidate_bsize];
+    int len = AOMMIN(xd->width, n4_w);
+    if (use_step_16)
+      len = AOMMAX(width_16x16, len);
+    else if (abs(row_offset) > 1)
+      len = AOMMAX(len, width_8x8);
+
+    uint16_t weight = 2;
+    if (xd->width >= width_8x8 && xd->width <= n4_w) {
+      uint16_t inc = AOMMIN(-max_row_offset + row_offset + 1,
+                            mi_size_high[candidate_bsize]);
+      // Obtain range used in weight calculation.
+      weight = AOMMAX(weight, inc);
+      // Update processed rows.
+      *processed_rows = inc - row_offset - 1;
+    }
+
+    add_ref_mv_candidate(candidate, rf, refmv_count, ref_match_count,
+                         newmv_count, ref_mv_stack, ref_mv_weight,
+                         gm_mv_candidates, cm->global_motion, len * weight);
+
+    i += len;
+  }
+}
+
+static AOM_INLINE void scan_col_mbmi(
+    const AV1_COMMON *cm, const MACROBLOCKD *xd, int mi_row,
+    const MV_REFERENCE_FRAME rf[2], int col_offset, CANDIDATE_MV *ref_mv_stack,
+    uint16_t *ref_mv_weight, uint8_t *refmv_count, uint8_t *ref_match_count,
+    uint8_t *newmv_count, int_mv *gm_mv_candidates, int max_col_offset,
+    int *processed_cols) {
+  int end_mi = AOMMIN(xd->height, cm->mi_params.mi_rows - mi_row);
+  end_mi = AOMMIN(end_mi, mi_size_high[BLOCK_64X64]);
+  const int n8_h_8 = mi_size_high[BLOCK_8X8];
+  const int n8_h_16 = mi_size_high[BLOCK_16X16];
+  int i;
+  int row_offset = 0;
+  if (abs(col_offset) > 1) {
+    row_offset = 1;
+    if ((mi_row & 0x01) && xd->height < n8_h_8) --row_offset;
+  }
+  const int use_step_16 = (xd->height >= 16);
+
+  for (i = 0; i < end_mi;) {
+    const MB_MODE_INFO *const candidate =
+        xd->mi[(row_offset + i) * xd->mi_stride + col_offset];
+    const int candidate_bsize = candidate->bsize;
+    const int n4_h = mi_size_high[candidate_bsize];
+    int len = AOMMIN(xd->height, n4_h);
+    if (use_step_16)
+      len = AOMMAX(n8_h_16, len);
+    else if (abs(col_offset) > 1)
+      len = AOMMAX(len, n8_h_8);
+
+    int weight = 2;
+    if (xd->height >= n8_h_8 && xd->height <= n4_h) {
+      int inc = AOMMIN(-max_col_offset + col_offset + 1,
+                       mi_size_wide[candidate_bsize]);
+      // Obtain range used in weight calculation.
+      weight = AOMMAX(weight, inc);
+      // Update processed cols.
+      *processed_cols = inc - col_offset - 1;
+    }
+
+    add_ref_mv_candidate(candidate, rf, refmv_count, ref_match_count,
+                         newmv_count, ref_mv_stack, ref_mv_weight,
+                         gm_mv_candidates, cm->global_motion, len * weight);
+
+    i += len;
+  }
+}
+
+static AOM_INLINE void scan_blk_mbmi(
+    const AV1_COMMON *cm, const MACROBLOCKD *xd, const int mi_row,
+    const int mi_col, const MV_REFERENCE_FRAME rf[2], int row_offset,
+    int col_offset, CANDIDATE_MV *ref_mv_stack, uint16_t *ref_mv_weight,
+    uint8_t *ref_match_count, uint8_t *newmv_count, int_mv *gm_mv_candidates,
+    uint8_t *refmv_count) {
+  const TileInfo *const tile = &xd->tile;
+  POSITION mi_pos;
+
+  mi_pos.row = row_offset;
+  mi_pos.col = col_offset;
+
+  if (is_inside(tile, mi_col, mi_row, &mi_pos)) {
+    const MB_MODE_INFO *const candidate =
+        xd->mi[mi_pos.row * xd->mi_stride + mi_pos.col];
+    const int len = mi_size_wide[BLOCK_8X8];
+
+    add_ref_mv_candidate(candidate, rf, refmv_count, ref_match_count,
+                         newmv_count, ref_mv_stack, ref_mv_weight,
+                         gm_mv_candidates, cm->global_motion, 2 * len);
+  }  // Analyze a single 8x8 block motion information.
+}
+
+static int has_top_right(const AV1_COMMON *cm, const MACROBLOCKD *xd,
+                         int mi_row, int mi_col, int bs) {
+  const int sb_mi_size = mi_size_wide[cm->seq_params.sb_size];
+  const int mask_row = mi_row & (sb_mi_size - 1);
+  const int mask_col = mi_col & (sb_mi_size - 1);
+
+  if (bs > mi_size_wide[BLOCK_64X64]) return 0;
+
+  // In a split partition all apart from the bottom right has a top right
+  int has_tr = !((mask_row & bs) && (mask_col & bs));
+
+  // bs > 0 and bs is a power of 2
+  assert(bs > 0 && !(bs & (bs - 1)));
+
+  // For each 4x4 group of blocks, when the bottom right is decoded the blocks
+  // to the right have not been decoded therefore the bottom right does
+  // not have a top right
+  while (bs < sb_mi_size) {
+    if (mask_col & bs) {
+      if ((mask_col & (2 * bs)) && (mask_row & (2 * bs))) {
+        has_tr = 0;
+        break;
+      }
+    } else {
+      break;
+    }
+    bs <<= 1;
+  }
+
+  // In a VERTICAL or VERTICAL_4 partition, all partition before the last one
+  // always have a top right (as the block above will have been decoded).
+  if (xd->width < xd->height) {
+    if (!xd->is_last_vertical_rect) has_tr = 1;
+  }
+
+  // In a HORIZONTAL or HORIZONTAL_4 partition, partitions after the first one
+  // never have a top right (as the block to the right won't have been decoded).
+  if (xd->width > xd->height) {
+    if (!xd->is_first_horizontal_rect) has_tr = 0;
+  }
+
+  // The bottom left square of a Vertical A (in the old format) does
+  // not have a top right as it is decoded before the right hand
+  // rectangle of the partition
+  if (xd->mi[0]->partition == PARTITION_VERT_A) {
+    if (xd->width == xd->height)
+      if (mask_row & bs) has_tr = 0;
+  }
+
+  return has_tr;
+}
+
+static int check_sb_border(const int mi_row, const int mi_col,
+                           const int row_offset, const int col_offset) {
+  const int sb_mi_size = mi_size_wide[BLOCK_64X64];
+  const int row = mi_row & (sb_mi_size - 1);
+  const int col = mi_col & (sb_mi_size - 1);
+
+  if (row + row_offset < 0 || row + row_offset >= sb_mi_size ||
+      col + col_offset < 0 || col + col_offset >= sb_mi_size)
+    return 0;
+
+  return 1;
+}
+
+static int add_tpl_ref_mv(const AV1_COMMON *cm, const MACROBLOCKD *xd,
+                          int mi_row, int mi_col, MV_REFERENCE_FRAME ref_frame,
+                          int blk_row, int blk_col, int_mv *gm_mv_candidates,
+                          uint8_t *const refmv_count,
+                          CANDIDATE_MV ref_mv_stack[MAX_REF_MV_STACK_SIZE],
+                          uint16_t ref_mv_weight[MAX_REF_MV_STACK_SIZE],
+                          int16_t *mode_context) {
+  POSITION mi_pos;
+  mi_pos.row = (mi_row & 0x01) ? blk_row : blk_row + 1;
+  mi_pos.col = (mi_col & 0x01) ? blk_col : blk_col + 1;
+
+  if (!is_inside(&xd->tile, mi_col, mi_row, &mi_pos)) return 0;
+
+  const TPL_MV_REF *prev_frame_mvs =
+      cm->tpl_mvs +
+      ((mi_row + mi_pos.row) >> 1) * (cm->mi_params.mi_stride >> 1) +
+      ((mi_col + mi_pos.col) >> 1);
+  if (prev_frame_mvs->mfmv0.as_int == INVALID_MV) return 0;
+
+  MV_REFERENCE_FRAME rf[2];
+  av1_set_ref_frame(rf, ref_frame);
+
+  const uint16_t weight_unit = 1;  // mi_size_wide[BLOCK_8X8];
+  const int cur_frame_index = cm->cur_frame->order_hint;
+  const RefCntBuffer *const buf_0 = get_ref_frame_buf(cm, rf[0]);
+  const int frame0_index = buf_0->order_hint;
+  const int cur_offset_0 = get_relative_dist(&cm->seq_params.order_hint_info,
+                                             cur_frame_index, frame0_index);
+  int idx;
+  const int allow_high_precision_mv = cm->features.allow_high_precision_mv;
+  const int force_integer_mv = cm->features.cur_frame_force_integer_mv;
+
+  int_mv this_refmv;
+  get_mv_projection(&this_refmv.as_mv, prev_frame_mvs->mfmv0.as_mv,
+                    cur_offset_0, prev_frame_mvs->ref_frame_offset);
+  lower_mv_precision(&this_refmv.as_mv, allow_high_precision_mv,
+                     force_integer_mv);
+
+  if (rf[1] == NONE_FRAME) {
+    if (blk_row == 0 && blk_col == 0) {
+      if (abs(this_refmv.as_mv.row - gm_mv_candidates[0].as_mv.row) >= 16 ||
+          abs(this_refmv.as_mv.col - gm_mv_candidates[0].as_mv.col) >= 16)
+        mode_context[ref_frame] |= (1 << GLOBALMV_OFFSET);
+    }
+
+    for (idx = 0; idx < *refmv_count; ++idx)
+      if (this_refmv.as_int == ref_mv_stack[idx].this_mv.as_int) break;
+
+    if (idx < *refmv_count) ref_mv_weight[idx] += 2 * weight_unit;
+
+    if (idx == *refmv_count && *refmv_count < MAX_REF_MV_STACK_SIZE) {
+      ref_mv_stack[idx].this_mv.as_int = this_refmv.as_int;
+      ref_mv_weight[idx] = 2 * weight_unit;
+      ++(*refmv_count);
+    }
+  } else {
+    // Process compound inter mode
+    const RefCntBuffer *const buf_1 = get_ref_frame_buf(cm, rf[1]);
+    const int frame1_index = buf_1->order_hint;
+    const int cur_offset_1 = get_relative_dist(&cm->seq_params.order_hint_info,
+                                               cur_frame_index, frame1_index);
+    int_mv comp_refmv;
+    get_mv_projection(&comp_refmv.as_mv, prev_frame_mvs->mfmv0.as_mv,
+                      cur_offset_1, prev_frame_mvs->ref_frame_offset);
+    lower_mv_precision(&comp_refmv.as_mv, allow_high_precision_mv,
+                       force_integer_mv);
+
+    if (blk_row == 0 && blk_col == 0) {
+      if (abs(this_refmv.as_mv.row - gm_mv_candidates[0].as_mv.row) >= 16 ||
+          abs(this_refmv.as_mv.col - gm_mv_candidates[0].as_mv.col) >= 16 ||
+          abs(comp_refmv.as_mv.row - gm_mv_candidates[1].as_mv.row) >= 16 ||
+          abs(comp_refmv.as_mv.col - gm_mv_candidates[1].as_mv.col) >= 16)
+        mode_context[ref_frame] |= (1 << GLOBALMV_OFFSET);
+    }
+
+    for (idx = 0; idx < *refmv_count; ++idx) {
+      if (this_refmv.as_int == ref_mv_stack[idx].this_mv.as_int &&
+          comp_refmv.as_int == ref_mv_stack[idx].comp_mv.as_int)
+        break;
+    }
+
+    if (idx < *refmv_count) ref_mv_weight[idx] += 2 * weight_unit;
+
+    if (idx == *refmv_count && *refmv_count < MAX_REF_MV_STACK_SIZE) {
+      ref_mv_stack[idx].this_mv.as_int = this_refmv.as_int;
+      ref_mv_stack[idx].comp_mv.as_int = comp_refmv.as_int;
+      ref_mv_weight[idx] = 2 * weight_unit;
+      ++(*refmv_count);
+    }
+  }
+
+  return 1;
+}
+
+static AOM_INLINE void process_compound_ref_mv_candidate(
+    const MB_MODE_INFO *const candidate, const AV1_COMMON *const cm,
+    const MV_REFERENCE_FRAME *const rf, int_mv ref_id[2][2],
+    int ref_id_count[2], int_mv ref_diff[2][2], int ref_diff_count[2]) {
+  for (int rf_idx = 0; rf_idx < 2; ++rf_idx) {
+    MV_REFERENCE_FRAME can_rf = candidate->ref_frame[rf_idx];
+
+    for (int cmp_idx = 0; cmp_idx < 2; ++cmp_idx) {
+      if (can_rf == rf[cmp_idx] && ref_id_count[cmp_idx] < 2) {
+        ref_id[cmp_idx][ref_id_count[cmp_idx]] = candidate->mv[rf_idx];
+        ++ref_id_count[cmp_idx];
+      } else if (can_rf > INTRA_FRAME && ref_diff_count[cmp_idx] < 2) {
+        int_mv this_mv = candidate->mv[rf_idx];
+        if (cm->ref_frame_sign_bias[can_rf] !=
+            cm->ref_frame_sign_bias[rf[cmp_idx]]) {
+          this_mv.as_mv.row = -this_mv.as_mv.row;
+          this_mv.as_mv.col = -this_mv.as_mv.col;
+        }
+        ref_diff[cmp_idx][ref_diff_count[cmp_idx]] = this_mv;
+        ++ref_diff_count[cmp_idx];
+      }
+    }
+  }
+}
+
+static AOM_INLINE void process_single_ref_mv_candidate(
+    const MB_MODE_INFO *const candidate, const AV1_COMMON *const cm,
+    MV_REFERENCE_FRAME ref_frame, uint8_t *const refmv_count,
+    CANDIDATE_MV ref_mv_stack[MAX_REF_MV_STACK_SIZE],
+    uint16_t ref_mv_weight[MAX_REF_MV_STACK_SIZE]) {
+  for (int rf_idx = 0; rf_idx < 2; ++rf_idx) {
+    if (candidate->ref_frame[rf_idx] > INTRA_FRAME) {
+      int_mv this_mv = candidate->mv[rf_idx];
+      if (cm->ref_frame_sign_bias[candidate->ref_frame[rf_idx]] !=
+          cm->ref_frame_sign_bias[ref_frame]) {
+        this_mv.as_mv.row = -this_mv.as_mv.row;
+        this_mv.as_mv.col = -this_mv.as_mv.col;
+      }
+      int stack_idx;
+      for (stack_idx = 0; stack_idx < *refmv_count; ++stack_idx) {
+        const int_mv stack_mv = ref_mv_stack[stack_idx].this_mv;
+        if (this_mv.as_int == stack_mv.as_int) break;
+      }
+
+      if (stack_idx == *refmv_count) {
+        ref_mv_stack[stack_idx].this_mv = this_mv;
+
+        // TODO(jingning): Set an arbitrary small number here. The weight
+        // doesn't matter as long as it is properly initialized.
+        ref_mv_weight[stack_idx] = 2;
+        ++(*refmv_count);
+      }
+    }
+  }
+}
+
+static AOM_INLINE void setup_ref_mv_list(
+    const AV1_COMMON *cm, const MACROBLOCKD *xd, MV_REFERENCE_FRAME ref_frame,
+    uint8_t *const refmv_count,
+    CANDIDATE_MV ref_mv_stack[MAX_REF_MV_STACK_SIZE],
+    uint16_t ref_mv_weight[MAX_REF_MV_STACK_SIZE],
+    int_mv mv_ref_list[MAX_MV_REF_CANDIDATES], int_mv *gm_mv_candidates,
+    int mi_row, int mi_col, int16_t *mode_context) {
+  const int bs = AOMMAX(xd->width, xd->height);
+  const int has_tr = has_top_right(cm, xd, mi_row, mi_col, bs);
+  MV_REFERENCE_FRAME rf[2];
+
+  const TileInfo *const tile = &xd->tile;
+  int max_row_offset = 0, max_col_offset = 0;
+  const int row_adj = (xd->height < mi_size_high[BLOCK_8X8]) && (mi_row & 0x01);
+  const int col_adj = (xd->width < mi_size_wide[BLOCK_8X8]) && (mi_col & 0x01);
+  int processed_rows = 0;
+  int processed_cols = 0;
+
+  av1_set_ref_frame(rf, ref_frame);
+  mode_context[ref_frame] = 0;
+  *refmv_count = 0;
+
+  // Find valid maximum row/col offset.
+  if (xd->up_available) {
+    max_row_offset = -(MVREF_ROW_COLS << 1) + row_adj;
+
+    if (xd->height < mi_size_high[BLOCK_8X8])
+      max_row_offset = -(2 << 1) + row_adj;
+
+    max_row_offset = find_valid_row_offset(tile, mi_row, max_row_offset);
+  }
+
+  if (xd->left_available) {
+    max_col_offset = -(MVREF_ROW_COLS << 1) + col_adj;
+
+    if (xd->width < mi_size_wide[BLOCK_8X8])
+      max_col_offset = -(2 << 1) + col_adj;
+
+    max_col_offset = find_valid_col_offset(tile, mi_col, max_col_offset);
+  }
+
+  uint8_t col_match_count = 0;
+  uint8_t row_match_count = 0;
+  uint8_t newmv_count = 0;
+
+  // Scan the first above row mode info. row_offset = -1;
+  if (abs(max_row_offset) >= 1)
+    scan_row_mbmi(cm, xd, mi_col, rf, -1, ref_mv_stack, ref_mv_weight,
+                  refmv_count, &row_match_count, &newmv_count, gm_mv_candidates,
+                  max_row_offset, &processed_rows);
+  // Scan the first left column mode info. col_offset = -1;
+  if (abs(max_col_offset) >= 1)
+    scan_col_mbmi(cm, xd, mi_row, rf, -1, ref_mv_stack, ref_mv_weight,
+                  refmv_count, &col_match_count, &newmv_count, gm_mv_candidates,
+                  max_col_offset, &processed_cols);
+  // Check top-right boundary
+  if (has_tr)
+    scan_blk_mbmi(cm, xd, mi_row, mi_col, rf, -1, xd->width, ref_mv_stack,
+                  ref_mv_weight, &row_match_count, &newmv_count,
+                  gm_mv_candidates, refmv_count);
+
+  const uint8_t nearest_match = (row_match_count > 0) + (col_match_count > 0);
+  const uint8_t nearest_refmv_count = *refmv_count;
+
+  // TODO(yunqing): for comp_search, do it for all 3 cases.
+  for (int idx = 0; idx < nearest_refmv_count; ++idx)
+    ref_mv_weight[idx] += REF_CAT_LEVEL;
+
+  if (cm->features.allow_ref_frame_mvs) {
+    int is_available = 0;
+    const int voffset = AOMMAX(mi_size_high[BLOCK_8X8], xd->height);
+    const int hoffset = AOMMAX(mi_size_wide[BLOCK_8X8], xd->width);
+    const int blk_row_end = AOMMIN(xd->height, mi_size_high[BLOCK_64X64]);
+    const int blk_col_end = AOMMIN(xd->width, mi_size_wide[BLOCK_64X64]);
+
+    const int tpl_sample_pos[3][2] = {
+      { voffset, -2 },
+      { voffset, hoffset },
+      { voffset - 2, hoffset },
+    };
+    const int allow_extension = (xd->height >= mi_size_high[BLOCK_8X8]) &&
+                                (xd->height < mi_size_high[BLOCK_64X64]) &&
+                                (xd->width >= mi_size_wide[BLOCK_8X8]) &&
+                                (xd->width < mi_size_wide[BLOCK_64X64]);
+
+    const int step_h = (xd->height >= mi_size_high[BLOCK_64X64])
+                           ? mi_size_high[BLOCK_16X16]
+                           : mi_size_high[BLOCK_8X8];
+    const int step_w = (xd->width >= mi_size_wide[BLOCK_64X64])
+                           ? mi_size_wide[BLOCK_16X16]
+                           : mi_size_wide[BLOCK_8X8];
+
+    for (int blk_row = 0; blk_row < blk_row_end; blk_row += step_h) {
+      for (int blk_col = 0; blk_col < blk_col_end; blk_col += step_w) {
+        int ret = add_tpl_ref_mv(cm, xd, mi_row, mi_col, ref_frame, blk_row,
+                                 blk_col, gm_mv_candidates, refmv_count,
+                                 ref_mv_stack, ref_mv_weight, mode_context);
+        if (blk_row == 0 && blk_col == 0) is_available = ret;
+      }
+    }
+
+    if (is_available == 0) mode_context[ref_frame] |= (1 << GLOBALMV_OFFSET);
+
+    for (int i = 0; i < 3 && allow_extension; ++i) {
+      const int blk_row = tpl_sample_pos[i][0];
+      const int blk_col = tpl_sample_pos[i][1];
+
+      if (!check_sb_border(mi_row, mi_col, blk_row, blk_col)) continue;
+      add_tpl_ref_mv(cm, xd, mi_row, mi_col, ref_frame, blk_row, blk_col,
+                     gm_mv_candidates, refmv_count, ref_mv_stack, ref_mv_weight,
+                     mode_context);
+    }
+  }
+
+  uint8_t dummy_newmv_count = 0;
+
+  // Scan the second outer area.
+  scan_blk_mbmi(cm, xd, mi_row, mi_col, rf, -1, -1, ref_mv_stack, ref_mv_weight,
+                &row_match_count, &dummy_newmv_count, gm_mv_candidates,
+                refmv_count);
+
+  for (int idx = 2; idx <= MVREF_ROW_COLS; ++idx) {
+    const int row_offset = -(idx << 1) + 1 + row_adj;
+    const int col_offset = -(idx << 1) + 1 + col_adj;
+
+    if (abs(row_offset) <= abs(max_row_offset) &&
+        abs(row_offset) > processed_rows)
+      scan_row_mbmi(cm, xd, mi_col, rf, row_offset, ref_mv_stack, ref_mv_weight,
+                    refmv_count, &row_match_count, &dummy_newmv_count,
+                    gm_mv_candidates, max_row_offset, &processed_rows);
+
+    if (abs(col_offset) <= abs(max_col_offset) &&
+        abs(col_offset) > processed_cols)
+      scan_col_mbmi(cm, xd, mi_row, rf, col_offset, ref_mv_stack, ref_mv_weight,
+                    refmv_count, &col_match_count, &dummy_newmv_count,
+                    gm_mv_candidates, max_col_offset, &processed_cols);
+  }
+
+  const uint8_t ref_match_count = (row_match_count > 0) + (col_match_count > 0);
+
+  switch (nearest_match) {
+    case 0:
+      if (ref_match_count >= 1) mode_context[ref_frame] |= 1;
+      if (ref_match_count == 1)
+        mode_context[ref_frame] |= (1 << REFMV_OFFSET);
+      else if (ref_match_count >= 2)
+        mode_context[ref_frame] |= (2 << REFMV_OFFSET);
+      break;
+    case 1:
+      mode_context[ref_frame] |= (newmv_count > 0) ? 2 : 3;
+      if (ref_match_count == 1)
+        mode_context[ref_frame] |= (3 << REFMV_OFFSET);
+      else if (ref_match_count >= 2)
+        mode_context[ref_frame] |= (4 << REFMV_OFFSET);
+      break;
+    case 2:
+    default:
+      if (newmv_count >= 1)
+        mode_context[ref_frame] |= 4;
+      else
+        mode_context[ref_frame] |= 5;
+
+      mode_context[ref_frame] |= (5 << REFMV_OFFSET);
+      break;
+  }
+
+  // Rank the likelihood and assign nearest and near mvs.
+  int len = nearest_refmv_count;
+  while (len > 0) {
+    int nr_len = 0;
+    for (int idx = 1; idx < len; ++idx) {
+      if (ref_mv_weight[idx - 1] < ref_mv_weight[idx]) {
+        const CANDIDATE_MV tmp_mv = ref_mv_stack[idx - 1];
+        const uint16_t tmp_ref_mv_weight = ref_mv_weight[idx - 1];
+        ref_mv_stack[idx - 1] = ref_mv_stack[idx];
+        ref_mv_stack[idx] = tmp_mv;
+        ref_mv_weight[idx - 1] = ref_mv_weight[idx];
+        ref_mv_weight[idx] = tmp_ref_mv_weight;
+        nr_len = idx;
+      }
+    }
+    len = nr_len;
+  }
+
+  len = *refmv_count;
+  while (len > nearest_refmv_count) {
+    int nr_len = nearest_refmv_count;
+    for (int idx = nearest_refmv_count + 1; idx < len; ++idx) {
+      if (ref_mv_weight[idx - 1] < ref_mv_weight[idx]) {
+        const CANDIDATE_MV tmp_mv = ref_mv_stack[idx - 1];
+        const uint16_t tmp_ref_mv_weight = ref_mv_weight[idx - 1];
+        ref_mv_stack[idx - 1] = ref_mv_stack[idx];
+        ref_mv_stack[idx] = tmp_mv;
+        ref_mv_weight[idx - 1] = ref_mv_weight[idx];
+        ref_mv_weight[idx] = tmp_ref_mv_weight;
+        nr_len = idx;
+      }
+    }
+    len = nr_len;
+  }
+
+  int mi_width = AOMMIN(mi_size_wide[BLOCK_64X64], xd->width);
+  mi_width = AOMMIN(mi_width, cm->mi_params.mi_cols - mi_col);
+  int mi_height = AOMMIN(mi_size_high[BLOCK_64X64], xd->height);
+  mi_height = AOMMIN(mi_height, cm->mi_params.mi_rows - mi_row);
+  const int mi_size = AOMMIN(mi_width, mi_height);
+  if (rf[1] > NONE_FRAME) {
+    // TODO(jingning, yunqing): Refactor and consolidate the compound and
+    // single reference frame modes. Reduce unnecessary redundancy.
+    if (*refmv_count < MAX_MV_REF_CANDIDATES) {
+      int_mv ref_id[2][2], ref_diff[2][2];
+      int ref_id_count[2] = { 0 }, ref_diff_count[2] = { 0 };
+
+      for (int idx = 0; abs(max_row_offset) >= 1 && idx < mi_size;) {
+        const MB_MODE_INFO *const candidate = xd->mi[-xd->mi_stride + idx];
+        process_compound_ref_mv_candidate(
+            candidate, cm, rf, ref_id, ref_id_count, ref_diff, ref_diff_count);
+        idx += mi_size_wide[candidate->bsize];
+      }
+
+      for (int idx = 0; abs(max_col_offset) >= 1 && idx < mi_size;) {
+        const MB_MODE_INFO *const candidate = xd->mi[idx * xd->mi_stride - 1];
+        process_compound_ref_mv_candidate(
+            candidate, cm, rf, ref_id, ref_id_count, ref_diff, ref_diff_count);
+        idx += mi_size_high[candidate->bsize];
+      }
+
+      // Build up the compound mv predictor
+      int_mv comp_list[MAX_MV_REF_CANDIDATES][2];
+
+      for (int idx = 0; idx < 2; ++idx) {
+        int comp_idx = 0;
+        for (int list_idx = 0;
+             list_idx < ref_id_count[idx] && comp_idx < MAX_MV_REF_CANDIDATES;
+             ++list_idx, ++comp_idx)
+          comp_list[comp_idx][idx] = ref_id[idx][list_idx];
+        for (int list_idx = 0;
+             list_idx < ref_diff_count[idx] && comp_idx < MAX_MV_REF_CANDIDATES;
+             ++list_idx, ++comp_idx)
+          comp_list[comp_idx][idx] = ref_diff[idx][list_idx];
+        for (; comp_idx < MAX_MV_REF_CANDIDATES; ++comp_idx)
+          comp_list[comp_idx][idx] = gm_mv_candidates[idx];
+      }
+
+      if (*refmv_count) {
+        assert(*refmv_count == 1);
+        if (comp_list[0][0].as_int == ref_mv_stack[0].this_mv.as_int &&
+            comp_list[0][1].as_int == ref_mv_stack[0].comp_mv.as_int) {
+          ref_mv_stack[*refmv_count].this_mv = comp_list[1][0];
+          ref_mv_stack[*refmv_count].comp_mv = comp_list[1][1];
+        } else {
+          ref_mv_stack[*refmv_count].this_mv = comp_list[0][0];
+          ref_mv_stack[*refmv_count].comp_mv = comp_list[0][1];
+        }
+        ref_mv_weight[*refmv_count] = 2;
+        ++*refmv_count;
+      } else {
+        for (int idx = 0; idx < MAX_MV_REF_CANDIDATES; ++idx) {
+          ref_mv_stack[*refmv_count].this_mv = comp_list[idx][0];
+          ref_mv_stack[*refmv_count].comp_mv = comp_list[idx][1];
+          ref_mv_weight[*refmv_count] = 2;
+          ++*refmv_count;
+        }
+      }
+    }
+
+    assert(*refmv_count >= 2);
+
+    for (int idx = 0; idx < *refmv_count; ++idx) {
+      clamp_mv_ref(&ref_mv_stack[idx].this_mv.as_mv, xd->width << MI_SIZE_LOG2,
+                   xd->height << MI_SIZE_LOG2, xd);
+      clamp_mv_ref(&ref_mv_stack[idx].comp_mv.as_mv, xd->width << MI_SIZE_LOG2,
+                   xd->height << MI_SIZE_LOG2, xd);
+    }
+  } else {
+    // Handle single reference frame extension
+    for (int idx = 0; abs(max_row_offset) >= 1 && idx < mi_size &&
+                      *refmv_count < MAX_MV_REF_CANDIDATES;) {
+      const MB_MODE_INFO *const candidate = xd->mi[-xd->mi_stride + idx];
+      process_single_ref_mv_candidate(candidate, cm, ref_frame, refmv_count,
+                                      ref_mv_stack, ref_mv_weight);
+      idx += mi_size_wide[candidate->bsize];
+    }
+
+    for (int idx = 0; abs(max_col_offset) >= 1 && idx < mi_size &&
+                      *refmv_count < MAX_MV_REF_CANDIDATES;) {
+      const MB_MODE_INFO *const candidate = xd->mi[idx * xd->mi_stride - 1];
+      process_single_ref_mv_candidate(candidate, cm, ref_frame, refmv_count,
+                                      ref_mv_stack, ref_mv_weight);
+      idx += mi_size_high[candidate->bsize];
+    }
+
+    for (int idx = 0; idx < *refmv_count; ++idx) {
+      clamp_mv_ref(&ref_mv_stack[idx].this_mv.as_mv, xd->width << MI_SIZE_LOG2,
+                   xd->height << MI_SIZE_LOG2, xd);
+    }
+
+    if (mv_ref_list != NULL) {
+      for (int idx = *refmv_count; idx < MAX_MV_REF_CANDIDATES; ++idx)
+        mv_ref_list[idx].as_int = gm_mv_candidates[0].as_int;
+
+      for (int idx = 0; idx < AOMMIN(MAX_MV_REF_CANDIDATES, *refmv_count);
+           ++idx) {
+        mv_ref_list[idx].as_int = ref_mv_stack[idx].this_mv.as_int;
+      }
+    }
+  }
+}
+
+void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd,
+                      MB_MODE_INFO *mi, MV_REFERENCE_FRAME ref_frame,
+                      uint8_t ref_mv_count[MODE_CTX_REF_FRAMES],
+                      CANDIDATE_MV ref_mv_stack[][MAX_REF_MV_STACK_SIZE],
+                      uint16_t ref_mv_weight[][MAX_REF_MV_STACK_SIZE],
+                      int_mv mv_ref_list[][MAX_MV_REF_CANDIDATES],
+                      int_mv *global_mvs, int16_t *mode_context) {
+  const int mi_row = xd->mi_row;
+  const int mi_col = xd->mi_col;
+  int_mv gm_mv[2];
+
+  if (ref_frame == INTRA_FRAME) {
+    gm_mv[0].as_int = gm_mv[1].as_int = 0;
+    if (global_mvs != NULL) {
+      global_mvs[ref_frame].as_int = INVALID_MV;
+    }
+  } else {
+    const BLOCK_SIZE bsize = mi->bsize;
+    const int allow_high_precision_mv = cm->features.allow_high_precision_mv;
+    const int force_integer_mv = cm->features.cur_frame_force_integer_mv;
+    if (ref_frame < REF_FRAMES) {
+      gm_mv[0] = gm_get_motion_vector(&cm->global_motion[ref_frame],
+                                      allow_high_precision_mv, bsize, mi_col,
+                                      mi_row, force_integer_mv);
+      gm_mv[1].as_int = 0;
+      if (global_mvs != NULL) global_mvs[ref_frame] = gm_mv[0];
+    } else {
+      MV_REFERENCE_FRAME rf[2];
+      av1_set_ref_frame(rf, ref_frame);
+      gm_mv[0] = gm_get_motion_vector(&cm->global_motion[rf[0]],
+                                      allow_high_precision_mv, bsize, mi_col,
+                                      mi_row, force_integer_mv);
+      gm_mv[1] = gm_get_motion_vector(&cm->global_motion[rf[1]],
+                                      allow_high_precision_mv, bsize, mi_col,
+                                      mi_row, force_integer_mv);
+    }
+  }
+
+  setup_ref_mv_list(cm, xd, ref_frame, &ref_mv_count[ref_frame],
+                    ref_mv_stack[ref_frame], ref_mv_weight[ref_frame],
+                    mv_ref_list ? mv_ref_list[ref_frame] : NULL, gm_mv, mi_row,
+                    mi_col, mode_context);
+}
+
+void av1_find_best_ref_mvs(int allow_hp, int_mv *mvlist, int_mv *nearest_mv,
+                           int_mv *near_mv, int is_integer) {
+  int i;
+  // Make sure all the candidates are properly clamped etc
+  for (i = 0; i < MAX_MV_REF_CANDIDATES; ++i) {
+    lower_mv_precision(&mvlist[i].as_mv, allow_hp, is_integer);
+  }
+  *nearest_mv = mvlist[0];
+  *near_mv = mvlist[1];
+}
+
+void av1_setup_frame_buf_refs(AV1_COMMON *cm) {
+  cm->cur_frame->order_hint = cm->current_frame.order_hint;
+  cm->cur_frame->display_order_hint = cm->current_frame.display_order_hint;
+
+  MV_REFERENCE_FRAME ref_frame;
+  for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) {
+    const RefCntBuffer *const buf = get_ref_frame_buf(cm, ref_frame);
+    if (buf != NULL) {
+      cm->cur_frame->ref_order_hints[ref_frame - LAST_FRAME] = buf->order_hint;
+      cm->cur_frame->ref_display_order_hint[ref_frame - LAST_FRAME] =
+          buf->display_order_hint;
+    }
+  }
+}
+
+void av1_setup_frame_sign_bias(AV1_COMMON *cm) {
+  MV_REFERENCE_FRAME ref_frame;
+  for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) {
+    const RefCntBuffer *const buf = get_ref_frame_buf(cm, ref_frame);
+    if (cm->seq_params.order_hint_info.enable_order_hint && buf != NULL) {
+      const int ref_order_hint = buf->order_hint;
+      cm->ref_frame_sign_bias[ref_frame] =
+          (get_relative_dist(&cm->seq_params.order_hint_info, ref_order_hint,
+                             (int)cm->current_frame.order_hint) <= 0)
+              ? 0
+              : 1;
+    } else {
+      cm->ref_frame_sign_bias[ref_frame] = 0;
+    }
+  }
+}
+
+#define MAX_OFFSET_WIDTH 64
+#define MAX_OFFSET_HEIGHT 0
+
+static int get_block_position(AV1_COMMON *cm, int *mi_r, int *mi_c, int blk_row,
+                              int blk_col, MV mv, int sign_bias) {
+  const int base_blk_row = (blk_row >> 3) << 3;
+  const int base_blk_col = (blk_col >> 3) << 3;
+
+  const int row_offset = (mv.row >= 0) ? (mv.row >> (4 + MI_SIZE_LOG2))
+                                       : -((-mv.row) >> (4 + MI_SIZE_LOG2));
+
+  const int col_offset = (mv.col >= 0) ? (mv.col >> (4 + MI_SIZE_LOG2))
+                                       : -((-mv.col) >> (4 + MI_SIZE_LOG2));
+
+  const int row =
+      (sign_bias == 1) ? blk_row - row_offset : blk_row + row_offset;
+  const int col =
+      (sign_bias == 1) ? blk_col - col_offset : blk_col + col_offset;
+
+  if (row < 0 || row >= (cm->mi_params.mi_rows >> 1) || col < 0 ||
+      col >= (cm->mi_params.mi_cols >> 1))
+    return 0;
+
+  if (row < base_blk_row - (MAX_OFFSET_HEIGHT >> 3) ||
+      row >= base_blk_row + 8 + (MAX_OFFSET_HEIGHT >> 3) ||
+      col < base_blk_col - (MAX_OFFSET_WIDTH >> 3) ||
+      col >= base_blk_col + 8 + (MAX_OFFSET_WIDTH >> 3))
+    return 0;
+
+  *mi_r = row;
+  *mi_c = col;
+
+  return 1;
+}
+
+// Note: motion_filed_projection finds motion vectors of current frame's
+// reference frame, and projects them to current frame. To make it clear,
+// let's call current frame's reference frame as start frame.
+// Call Start frame's reference frames as reference frames.
+// Call ref_offset as frame distances between start frame and its reference
+// frames.
+static int motion_field_projection(AV1_COMMON *cm,
+                                   MV_REFERENCE_FRAME start_frame, int dir) {
+  TPL_MV_REF *tpl_mvs_base = cm->tpl_mvs;
+  int ref_offset[REF_FRAMES] = { 0 };
+
+  const RefCntBuffer *const start_frame_buf =
+      get_ref_frame_buf(cm, start_frame);
+  if (start_frame_buf == NULL) return 0;
+
+  if (start_frame_buf->frame_type == KEY_FRAME ||
+      start_frame_buf->frame_type == INTRA_ONLY_FRAME)
+    return 0;
+
+  if (start_frame_buf->mi_rows != cm->mi_params.mi_rows ||
+      start_frame_buf->mi_cols != cm->mi_params.mi_cols)
+    return 0;
+
+  const int start_frame_order_hint = start_frame_buf->order_hint;
+  const unsigned int *const ref_order_hints =
+      &start_frame_buf->ref_order_hints[0];
+  const int cur_order_hint = cm->cur_frame->order_hint;
+  int start_to_current_frame_offset = get_relative_dist(
+      &cm->seq_params.order_hint_info, start_frame_order_hint, cur_order_hint);
+
+  for (MV_REFERENCE_FRAME rf = LAST_FRAME; rf <= INTER_REFS_PER_FRAME; ++rf) {
+    ref_offset[rf] = get_relative_dist(&cm->seq_params.order_hint_info,
+                                       start_frame_order_hint,
+                                       ref_order_hints[rf - LAST_FRAME]);
+  }
+
+  if (dir == 2) start_to_current_frame_offset = -start_to_current_frame_offset;
+
+  MV_REF *mv_ref_base = start_frame_buf->mvs;
+  const int mvs_rows = (cm->mi_params.mi_rows + 1) >> 1;
+  const int mvs_cols = (cm->mi_params.mi_cols + 1) >> 1;
+
+  for (int blk_row = 0; blk_row < mvs_rows; ++blk_row) {
+    for (int blk_col = 0; blk_col < mvs_cols; ++blk_col) {
+      MV_REF *mv_ref = &mv_ref_base[blk_row * mvs_cols + blk_col];
+      MV fwd_mv = mv_ref->mv.as_mv;
+
+      if (mv_ref->ref_frame > INTRA_FRAME) {
+        int_mv this_mv;
+        int mi_r, mi_c;
+        const int ref_frame_offset = ref_offset[mv_ref->ref_frame];
+
+        int pos_valid =
+            abs(ref_frame_offset) <= MAX_FRAME_DISTANCE &&
+            ref_frame_offset > 0 &&
+            abs(start_to_current_frame_offset) <= MAX_FRAME_DISTANCE;
+
+        if (pos_valid) {
+          get_mv_projection(&this_mv.as_mv, fwd_mv,
+                            start_to_current_frame_offset, ref_frame_offset);
+          pos_valid = get_block_position(cm, &mi_r, &mi_c, blk_row, blk_col,
+                                         this_mv.as_mv, dir >> 1);
+        }
+
+        if (pos_valid) {
+          const int mi_offset = mi_r * (cm->mi_params.mi_stride >> 1) + mi_c;
+
+          tpl_mvs_base[mi_offset].mfmv0.as_mv.row = fwd_mv.row;
+          tpl_mvs_base[mi_offset].mfmv0.as_mv.col = fwd_mv.col;
+          tpl_mvs_base[mi_offset].ref_frame_offset = ref_frame_offset;
+        }
+      }
+    }
+  }
+
+  return 1;
+}
+
+void av1_setup_motion_field(AV1_COMMON *cm) {
+  const OrderHintInfo *const order_hint_info = &cm->seq_params.order_hint_info;
+
+  memset(cm->ref_frame_side, 0, sizeof(cm->ref_frame_side));
+  if (!order_hint_info->enable_order_hint) return;
+
+  TPL_MV_REF *tpl_mvs_base = cm->tpl_mvs;
+  int size = ((cm->mi_params.mi_rows + MAX_MIB_SIZE) >> 1) *
+             (cm->mi_params.mi_stride >> 1);
+  for (int idx = 0; idx < size; ++idx) {
+    tpl_mvs_base[idx].mfmv0.as_int = INVALID_MV;
+    tpl_mvs_base[idx].ref_frame_offset = 0;
+  }
+
+  const int cur_order_hint = cm->cur_frame->order_hint;
+
+  const RefCntBuffer *ref_buf[INTER_REFS_PER_FRAME];
+  int ref_order_hint[INTER_REFS_PER_FRAME];
+
+  for (int ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ref_frame++) {
+    const int ref_idx = ref_frame - LAST_FRAME;
+    const RefCntBuffer *const buf = get_ref_frame_buf(cm, ref_frame);
+    int order_hint = 0;
+
+    if (buf != NULL) order_hint = buf->order_hint;
+
+    ref_buf[ref_idx] = buf;
+    ref_order_hint[ref_idx] = order_hint;
+
+    if (get_relative_dist(order_hint_info, order_hint, cur_order_hint) > 0)
+      cm->ref_frame_side[ref_frame] = 1;
+    else if (order_hint == cur_order_hint)
+      cm->ref_frame_side[ref_frame] = -1;
+  }
+
+  int ref_stamp = MFMV_STACK_SIZE - 1;
+
+  if (ref_buf[LAST_FRAME - LAST_FRAME] != NULL) {
+    const int alt_of_lst_order_hint =
+        ref_buf[LAST_FRAME - LAST_FRAME]
+            ->ref_order_hints[ALTREF_FRAME - LAST_FRAME];
+
+    const int is_lst_overlay =
+        (alt_of_lst_order_hint == ref_order_hint[GOLDEN_FRAME - LAST_FRAME]);
+    if (!is_lst_overlay) motion_field_projection(cm, LAST_FRAME, 2);
+    --ref_stamp;
+  }
+
+  if (get_relative_dist(order_hint_info,
+                        ref_order_hint[BWDREF_FRAME - LAST_FRAME],
+                        cur_order_hint) > 0) {
+    if (motion_field_projection(cm, BWDREF_FRAME, 0)) --ref_stamp;
+  }
+
+  if (get_relative_dist(order_hint_info,
+                        ref_order_hint[ALTREF2_FRAME - LAST_FRAME],
+                        cur_order_hint) > 0) {
+    if (motion_field_projection(cm, ALTREF2_FRAME, 0)) --ref_stamp;
+  }
+
+  if (get_relative_dist(order_hint_info,
+                        ref_order_hint[ALTREF_FRAME - LAST_FRAME],
+                        cur_order_hint) > 0 &&
+      ref_stamp >= 0)
+    if (motion_field_projection(cm, ALTREF_FRAME, 0)) --ref_stamp;
+
+  if (ref_stamp >= 0) motion_field_projection(cm, LAST2_FRAME, 2);
+}
+
+static INLINE void record_samples(const MB_MODE_INFO *mbmi, int *pts,
+                                  int *pts_inref, int row_offset, int sign_r,
+                                  int col_offset, int sign_c) {
+  const int bw = block_size_wide[mbmi->bsize];
+  const int bh = block_size_high[mbmi->bsize];
+  const int x = col_offset * MI_SIZE + sign_c * bw / 2 - 1;
+  const int y = row_offset * MI_SIZE + sign_r * bh / 2 - 1;
+
+  pts[0] = GET_MV_SUBPEL(x);
+  pts[1] = GET_MV_SUBPEL(y);
+  pts_inref[0] = pts[0] + mbmi->mv[0].as_mv.col;
+  pts_inref[1] = pts[1] + mbmi->mv[0].as_mv.row;
+}
+
+// Select samples according to the motion vector difference.
+uint8_t av1_selectSamples(MV *mv, int *pts, int *pts_inref, int len,
+                          BLOCK_SIZE bsize) {
+  const int bw = block_size_wide[bsize];
+  const int bh = block_size_high[bsize];
+  const int thresh = clamp(AOMMAX(bw, bh), 16, 112);
+  uint8_t ret = 0;
+  assert(len <= LEAST_SQUARES_SAMPLES_MAX);
+
+  // Only keep the samples with MV differences within threshold.
+  for (int i = 0; i < len; ++i) {
+    const int diff = abs(pts_inref[2 * i] - pts[2 * i] - mv->col) +
+                     abs(pts_inref[2 * i + 1] - pts[2 * i + 1] - mv->row);
+    if (diff > thresh) continue;
+    if (ret != i) {
+      memcpy(pts + 2 * ret, pts + 2 * i, 2 * sizeof(pts[0]));
+      memcpy(pts_inref + 2 * ret, pts_inref + 2 * i, 2 * sizeof(pts_inref[0]));
+    }
+    ++ret;
+  }
+  // Keep at least 1 sample.
+  return AOMMAX(ret, 1);
+}
+
+// Note: Samples returned are at 1/8-pel precision
+// Sample are the neighbor block center point's coordinates relative to the
+// left-top pixel of current block.
+uint8_t av1_findSamples(const AV1_COMMON *cm, MACROBLOCKD *xd, int *pts,
+                        int *pts_inref) {
+  const MB_MODE_INFO *const mbmi0 = xd->mi[0];
+  const int ref_frame = mbmi0->ref_frame[0];
+  const int up_available = xd->up_available;
+  const int left_available = xd->left_available;
+  uint8_t np = 0;
+  int do_tl = 1;
+  int do_tr = 1;
+  const int mi_stride = xd->mi_stride;
+  const int mi_row = xd->mi_row;
+  const int mi_col = xd->mi_col;
+
+  // scan the nearest above rows
+  if (up_available) {
+    const int mi_row_offset = -1;
+    const MB_MODE_INFO *mbmi = xd->mi[mi_row_offset * mi_stride];
+    uint8_t superblock_width = mi_size_wide[mbmi->bsize];
+
+    if (xd->width <= superblock_width) {
+      // Handle "current block width <= above block width" case.
+      const int col_offset = -mi_col % superblock_width;
+
+      if (col_offset < 0) do_tl = 0;
+      if (col_offset + superblock_width > xd->width) do_tr = 0;
+
+      if (mbmi->ref_frame[0] == ref_frame && mbmi->ref_frame[1] == NONE_FRAME) {
+        record_samples(mbmi, pts, pts_inref, 0, -1, col_offset, 1);
+        pts += 2;
+        pts_inref += 2;
+        if (++np >= LEAST_SQUARES_SAMPLES_MAX) return LEAST_SQUARES_SAMPLES_MAX;
+      }
+    } else {
+      // Handle "current block width > above block width" case.
+      for (int i = 0; i < AOMMIN(xd->width, cm->mi_params.mi_cols - mi_col);
+           i += superblock_width) {
+        mbmi = xd->mi[i + mi_row_offset * mi_stride];
+        superblock_width = mi_size_wide[mbmi->bsize];
+
+        if (mbmi->ref_frame[0] == ref_frame &&
+            mbmi->ref_frame[1] == NONE_FRAME) {
+          record_samples(mbmi, pts, pts_inref, 0, -1, i, 1);
+          pts += 2;
+          pts_inref += 2;
+          if (++np >= LEAST_SQUARES_SAMPLES_MAX)
+            return LEAST_SQUARES_SAMPLES_MAX;
+        }
+      }
+    }
+  }
+  assert(np <= LEAST_SQUARES_SAMPLES_MAX);
+
+  // scan the nearest left columns
+  if (left_available) {
+    const int mi_col_offset = -1;
+    const MB_MODE_INFO *mbmi = xd->mi[mi_col_offset];
+    uint8_t superblock_height = mi_size_high[mbmi->bsize];
+
+    if (xd->height <= superblock_height) {
+      // Handle "current block height <= above block height" case.
+      const int row_offset = -mi_row % superblock_height;
+
+      if (row_offset < 0) do_tl = 0;
+
+      if (mbmi->ref_frame[0] == ref_frame && mbmi->ref_frame[1] == NONE_FRAME) {
+        record_samples(mbmi, pts, pts_inref, row_offset, 1, 0, -1);
+        pts += 2;
+        pts_inref += 2;
+        np++;
+        if (np >= LEAST_SQUARES_SAMPLES_MAX) return LEAST_SQUARES_SAMPLES_MAX;
+      }
+    } else {
+      // Handle "current block height > above block height" case.
+      for (int i = 0; i < AOMMIN(xd->height, cm->mi_params.mi_rows - mi_row);
+           i += superblock_height) {
+        mbmi = xd->mi[mi_col_offset + i * mi_stride];
+        superblock_height = mi_size_high[mbmi->bsize];
+
+        if (mbmi->ref_frame[0] == ref_frame &&
+            mbmi->ref_frame[1] == NONE_FRAME) {
+          record_samples(mbmi, pts, pts_inref, i, 1, 0, -1);
+          pts += 2;
+          pts_inref += 2;
+          if (++np >= LEAST_SQUARES_SAMPLES_MAX)
+            return LEAST_SQUARES_SAMPLES_MAX;
+        }
+      }
+    }
+  }
+  assert(np <= LEAST_SQUARES_SAMPLES_MAX);
+
+  // Top-left block
+  if (do_tl && left_available && up_available) {
+    const int mi_row_offset = -1;
+    const int mi_col_offset = -1;
+    MB_MODE_INFO *mbmi = xd->mi[mi_col_offset + mi_row_offset * mi_stride];
+
+    if (mbmi->ref_frame[0] == ref_frame && mbmi->ref_frame[1] == NONE_FRAME) {
+      record_samples(mbmi, pts, pts_inref, 0, -1, 0, -1);
+      pts += 2;
+      pts_inref += 2;
+      if (++np >= LEAST_SQUARES_SAMPLES_MAX) return LEAST_SQUARES_SAMPLES_MAX;
+    }
+  }
+  assert(np <= LEAST_SQUARES_SAMPLES_MAX);
+
+  // Top-right block
+  if (do_tr &&
+      has_top_right(cm, xd, mi_row, mi_col, AOMMAX(xd->width, xd->height))) {
+    const POSITION trb_pos = { -1, xd->width };
+    const TileInfo *const tile = &xd->tile;
+    if (is_inside(tile, mi_col, mi_row, &trb_pos)) {
+      const int mi_row_offset = -1;
+      const int mi_col_offset = xd->width;
+      const MB_MODE_INFO *mbmi =
+          xd->mi[mi_col_offset + mi_row_offset * mi_stride];
+
+      if (mbmi->ref_frame[0] == ref_frame && mbmi->ref_frame[1] == NONE_FRAME) {
+        record_samples(mbmi, pts, pts_inref, 0, -1, xd->width, 1);
+        if (++np >= LEAST_SQUARES_SAMPLES_MAX) return LEAST_SQUARES_SAMPLES_MAX;
+      }
+    }
+  }
+  assert(np <= LEAST_SQUARES_SAMPLES_MAX);
+
+  return np;
+}
+
+void av1_setup_skip_mode_allowed(AV1_COMMON *cm) {
+  const OrderHintInfo *const order_hint_info = &cm->seq_params.order_hint_info;
+  SkipModeInfo *const skip_mode_info = &cm->current_frame.skip_mode_info;
+
+  skip_mode_info->skip_mode_allowed = 0;
+  skip_mode_info->ref_frame_idx_0 = INVALID_IDX;
+  skip_mode_info->ref_frame_idx_1 = INVALID_IDX;
+
+  if (!order_hint_info->enable_order_hint || frame_is_intra_only(cm) ||
+      cm->current_frame.reference_mode == SINGLE_REFERENCE)
+    return;
+
+  const int cur_order_hint = cm->current_frame.order_hint;
+  int ref_order_hints[2] = { -1, INT_MAX };
+  int ref_idx[2] = { INVALID_IDX, INVALID_IDX };
+
+  // Identify the nearest forward and backward references.
+  for (int i = 0; i < INTER_REFS_PER_FRAME; ++i) {
+    const RefCntBuffer *const buf = get_ref_frame_buf(cm, LAST_FRAME + i);
+    if (buf == NULL) continue;
+
+    const int ref_order_hint = buf->order_hint;
+    if (get_relative_dist(order_hint_info, ref_order_hint, cur_order_hint) <
+        0) {
+      // Forward reference
+      if (ref_order_hints[0] == -1 ||
+          get_relative_dist(order_hint_info, ref_order_hint,
+                            ref_order_hints[0]) > 0) {
+        ref_order_hints[0] = ref_order_hint;
+        ref_idx[0] = i;
+      }
+    } else if (get_relative_dist(order_hint_info, ref_order_hint,
+                                 cur_order_hint) > 0) {
+      // Backward reference
+      if (ref_order_hints[1] == INT_MAX ||
+          get_relative_dist(order_hint_info, ref_order_hint,
+                            ref_order_hints[1]) < 0) {
+        ref_order_hints[1] = ref_order_hint;
+        ref_idx[1] = i;
+      }
+    }
+  }
+
+  if (ref_idx[0] != INVALID_IDX && ref_idx[1] != INVALID_IDX) {
+    // == Bi-directional prediction ==
+    skip_mode_info->skip_mode_allowed = 1;
+    skip_mode_info->ref_frame_idx_0 = AOMMIN(ref_idx[0], ref_idx[1]);
+    skip_mode_info->ref_frame_idx_1 = AOMMAX(ref_idx[0], ref_idx[1]);
+  } else if (ref_idx[0] != INVALID_IDX && ref_idx[1] == INVALID_IDX) {
+    // == Forward prediction only ==
+    // Identify the second nearest forward reference.
+    ref_order_hints[1] = -1;
+    for (int i = 0; i < INTER_REFS_PER_FRAME; ++i) {
+      const RefCntBuffer *const buf = get_ref_frame_buf(cm, LAST_FRAME + i);
+      if (buf == NULL) continue;
+
+      const int ref_order_hint = buf->order_hint;
+      if ((ref_order_hints[0] != -1 &&
+           get_relative_dist(order_hint_info, ref_order_hint,
+                             ref_order_hints[0]) < 0) &&
+          (ref_order_hints[1] == -1 ||
+           get_relative_dist(order_hint_info, ref_order_hint,
+                             ref_order_hints[1]) > 0)) {
+        // Second closest forward reference
+        ref_order_hints[1] = ref_order_hint;
+        ref_idx[1] = i;
+      }
+    }
+    if (ref_order_hints[1] != -1) {
+      skip_mode_info->skip_mode_allowed = 1;
+      skip_mode_info->ref_frame_idx_0 = AOMMIN(ref_idx[0], ref_idx[1]);
+      skip_mode_info->ref_frame_idx_1 = AOMMAX(ref_idx[0], ref_idx[1]);
+    }
+  }
+}
+
+typedef struct {
+  int map_idx;        // frame map index
+  RefCntBuffer *buf;  // frame buffer
+  int sort_idx;       // index based on the offset to be used for sorting
+} REF_FRAME_INFO;
+
+// Compares the sort_idx fields. If they are equal, then compares the map_idx
+// fields to break the tie. This ensures a stable sort.
+static int compare_ref_frame_info(const void *arg_a, const void *arg_b) {
+  const REF_FRAME_INFO *info_a = (REF_FRAME_INFO *)arg_a;
+  const REF_FRAME_INFO *info_b = (REF_FRAME_INFO *)arg_b;
+
+  const int sort_idx_diff = info_a->sort_idx - info_b->sort_idx;
+  if (sort_idx_diff != 0) return sort_idx_diff;
+  return info_a->map_idx - info_b->map_idx;
+}
+
+static AOM_INLINE void set_ref_frame_info(int *remapped_ref_idx, int frame_idx,
+                                          REF_FRAME_INFO *ref_info) {
+  assert(frame_idx >= 0 && frame_idx < INTER_REFS_PER_FRAME);
+
+  remapped_ref_idx[frame_idx] = ref_info->map_idx;
+}
+
+void av1_set_frame_refs(AV1_COMMON *const cm, int *remapped_ref_idx,
+                        int lst_map_idx, int gld_map_idx) {
+  int lst_frame_sort_idx = -1;
+  int gld_frame_sort_idx = -1;
+
+  assert(cm->seq_params.order_hint_info.enable_order_hint);
+  assert(cm->seq_params.order_hint_info.order_hint_bits_minus_1 >= 0);
+  const int cur_order_hint = (int)cm->current_frame.order_hint;
+  const int cur_frame_sort_idx =
+      1 << cm->seq_params.order_hint_info.order_hint_bits_minus_1;
+
+  REF_FRAME_INFO ref_frame_info[REF_FRAMES];
+  int ref_flag_list[INTER_REFS_PER_FRAME] = { 0, 0, 0, 0, 0, 0, 0 };
+
+  for (int i = 0; i < REF_FRAMES; ++i) {
+    const int map_idx = i;
+
+    ref_frame_info[i].map_idx = map_idx;
+    ref_frame_info[i].sort_idx = -1;
+
+    RefCntBuffer *const buf = cm->ref_frame_map[map_idx];
+    ref_frame_info[i].buf = buf;
+
+    if (buf == NULL) continue;
+    // If this assertion fails, there is a reference leak.
+    assert(buf->ref_count > 0);
+
+    const int offset = (int)buf->order_hint;
+    ref_frame_info[i].sort_idx =
+        (offset == -1) ? -1
+                       : cur_frame_sort_idx +
+                             get_relative_dist(&cm->seq_params.order_hint_info,
+                                               offset, cur_order_hint);
+    assert(ref_frame_info[i].sort_idx >= -1);
+
+    if (map_idx == lst_map_idx) lst_frame_sort_idx = ref_frame_info[i].sort_idx;
+    if (map_idx == gld_map_idx) gld_frame_sort_idx = ref_frame_info[i].sort_idx;
+  }
+
+  // Confirm both LAST_FRAME and GOLDEN_FRAME are valid forward reference
+  // frames.
+  if (lst_frame_sort_idx == -1 || lst_frame_sort_idx >= cur_frame_sort_idx) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Inter frame requests a look-ahead frame as LAST");
+  }
+  if (gld_frame_sort_idx == -1 || gld_frame_sort_idx >= cur_frame_sort_idx) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Inter frame requests a look-ahead frame as GOLDEN");
+  }
+
+  // Sort ref frames based on their frame_offset values.
+  qsort(ref_frame_info, REF_FRAMES, sizeof(REF_FRAME_INFO),
+        compare_ref_frame_info);
+
+  // Identify forward and backward reference frames.
+  // Forward  reference: offset < order_hint
+  // Backward reference: offset >= order_hint
+  int fwd_start_idx = 0, fwd_end_idx = REF_FRAMES - 1;
+
+  for (int i = 0; i < REF_FRAMES; i++) {
+    if (ref_frame_info[i].sort_idx == -1) {
+      fwd_start_idx++;
+      continue;
+    }
+
+    if (ref_frame_info[i].sort_idx >= cur_frame_sort_idx) {
+      fwd_end_idx = i - 1;
+      break;
+    }
+  }
+
+  int bwd_start_idx = fwd_end_idx + 1;
+  int bwd_end_idx = REF_FRAMES - 1;
+
+  // === Backward Reference Frames ===
+
+  // == ALTREF_FRAME ==
+  if (bwd_start_idx <= bwd_end_idx) {
+    set_ref_frame_info(remapped_ref_idx, ALTREF_FRAME - LAST_FRAME,
+                       &ref_frame_info[bwd_end_idx]);
+    ref_flag_list[ALTREF_FRAME - LAST_FRAME] = 1;
+    bwd_end_idx--;
+  }
+
+  // == BWDREF_FRAME ==
+  if (bwd_start_idx <= bwd_end_idx) {
+    set_ref_frame_info(remapped_ref_idx, BWDREF_FRAME - LAST_FRAME,
+                       &ref_frame_info[bwd_start_idx]);
+    ref_flag_list[BWDREF_FRAME - LAST_FRAME] = 1;
+    bwd_start_idx++;
+  }
+
+  // == ALTREF2_FRAME ==
+  if (bwd_start_idx <= bwd_end_idx) {
+    set_ref_frame_info(remapped_ref_idx, ALTREF2_FRAME - LAST_FRAME,
+                       &ref_frame_info[bwd_start_idx]);
+    ref_flag_list[ALTREF2_FRAME - LAST_FRAME] = 1;
+  }
+
+  // === Forward Reference Frames ===
+
+  for (int i = fwd_start_idx; i <= fwd_end_idx; ++i) {
+    // == LAST_FRAME ==
+    if (ref_frame_info[i].map_idx == lst_map_idx) {
+      set_ref_frame_info(remapped_ref_idx, LAST_FRAME - LAST_FRAME,
+                         &ref_frame_info[i]);
+      ref_flag_list[LAST_FRAME - LAST_FRAME] = 1;
+    }
+
+    // == GOLDEN_FRAME ==
+    if (ref_frame_info[i].map_idx == gld_map_idx) {
+      set_ref_frame_info(remapped_ref_idx, GOLDEN_FRAME - LAST_FRAME,
+                         &ref_frame_info[i]);
+      ref_flag_list[GOLDEN_FRAME - LAST_FRAME] = 1;
+    }
+  }
+
+  assert(ref_flag_list[LAST_FRAME - LAST_FRAME] == 1 &&
+         ref_flag_list[GOLDEN_FRAME - LAST_FRAME] == 1);
+
+  // == LAST2_FRAME ==
+  // == LAST3_FRAME ==
+  // == BWDREF_FRAME ==
+  // == ALTREF2_FRAME ==
+  // == ALTREF_FRAME ==
+
+  // Set up the reference frames in the anti-chronological order.
+  static const MV_REFERENCE_FRAME ref_frame_list[INTER_REFS_PER_FRAME - 2] = {
+    LAST2_FRAME, LAST3_FRAME, BWDREF_FRAME, ALTREF2_FRAME, ALTREF_FRAME
+  };
+
+  int ref_idx;
+  for (ref_idx = 0; ref_idx < (INTER_REFS_PER_FRAME - 2); ref_idx++) {
+    const MV_REFERENCE_FRAME ref_frame = ref_frame_list[ref_idx];
+
+    if (ref_flag_list[ref_frame - LAST_FRAME] == 1) continue;
+
+    while (fwd_start_idx <= fwd_end_idx &&
+           (ref_frame_info[fwd_end_idx].map_idx == lst_map_idx ||
+            ref_frame_info[fwd_end_idx].map_idx == gld_map_idx)) {
+      fwd_end_idx--;
+    }
+    if (fwd_start_idx > fwd_end_idx) break;
+
+    set_ref_frame_info(remapped_ref_idx, ref_frame - LAST_FRAME,
+                       &ref_frame_info[fwd_end_idx]);
+    ref_flag_list[ref_frame - LAST_FRAME] = 1;
+
+    fwd_end_idx--;
+  }
+
+  // Assign all the remaining frame(s), if any, to the earliest reference
+  // frame.
+  for (; ref_idx < (INTER_REFS_PER_FRAME - 2); ref_idx++) {
+    const MV_REFERENCE_FRAME ref_frame = ref_frame_list[ref_idx];
+    if (ref_flag_list[ref_frame - LAST_FRAME] == 1) continue;
+    set_ref_frame_info(remapped_ref_idx, ref_frame - LAST_FRAME,
+                       &ref_frame_info[fwd_start_idx]);
+    ref_flag_list[ref_frame - LAST_FRAME] = 1;
+  }
+
+  for (int i = 0; i < INTER_REFS_PER_FRAME; i++) {
+    assert(ref_flag_list[i] == 1);
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.h
new file mode 100644
index 0000000000..83aaa199c9
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.h
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#ifndef AOM_AV1_COMMON_MVREF_COMMON_H_
+#define AOM_AV1_COMMON_MVREF_COMMON_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MVREF_ROW_COLS 3
+
+// Set the upper limit of the motion vector component magnitude.
+// This would make a motion vector fit in 26 bits. Plus 3 bits for the
+// reference frame index. A tuple of motion vector can hence be stored within
+// 32 bit range for efficient load/store operations.
+#define REFMVS_LIMIT ((1 << 12) - 1)
+
+typedef struct position {
+  int row;
+  int col;
+} POSITION;
+
+// clamp_mv_ref
+#define MV_BORDER (16 << 3)  // Allow 16 pels in 1/8th pel units
+
+static INLINE int get_relative_dist(const OrderHintInfo *oh, int a, int b) {
+  if (!oh->enable_order_hint) return 0;
+
+  const int bits = oh->order_hint_bits_minus_1 + 1;
+
+  assert(bits >= 1);
+  assert(a >= 0 && a < (1 << bits));
+  assert(b >= 0 && b < (1 << bits));
+
+  int diff = a - b;
+  const int m = 1 << (bits - 1);
+  diff = (diff & (m - 1)) - (diff & m);
+  return diff;
+}
+
+static INLINE void clamp_mv_ref(MV *mv, int bw, int bh, const MACROBLOCKD *xd) {
+  const SubpelMvLimits mv_limits = {
+    xd->mb_to_left_edge - GET_MV_SUBPEL(bw) - MV_BORDER,
+    xd->mb_to_right_edge + GET_MV_SUBPEL(bw) + MV_BORDER,
+    xd->mb_to_top_edge - GET_MV_SUBPEL(bh) - MV_BORDER,
+    xd->mb_to_bottom_edge + GET_MV_SUBPEL(bh) + MV_BORDER
+  };
+  clamp_mv(mv, &mv_limits);
+}
+
+static INLINE int_mv get_block_mv(const MB_MODE_INFO *candidate, int which_mv) {
+  return candidate->mv[which_mv];
+}
+
+// Checks that the given mi_row, mi_col and search point
+// are inside the borders of the tile.
+static INLINE int is_inside(const TileInfo *const tile, int mi_col, int mi_row,
+                            const POSITION *mi_pos) {
+  return !(mi_row + mi_pos->row < tile->mi_row_start ||
+           mi_col + mi_pos->col < tile->mi_col_start ||
+           mi_row + mi_pos->row >= tile->mi_row_end ||
+           mi_col + mi_pos->col >= tile->mi_col_end);
+}
+
+static INLINE int find_valid_row_offset(const TileInfo *const tile, int mi_row,
+                                        int row_offset) {
+  return clamp(row_offset, tile->mi_row_start - mi_row,
+               tile->mi_row_end - mi_row - 1);
+}
+
+static INLINE int find_valid_col_offset(const TileInfo *const tile, int mi_col,
+                                        int col_offset) {
+  return clamp(col_offset, tile->mi_col_start - mi_col,
+               tile->mi_col_end - mi_col - 1);
+}
+
+static INLINE void lower_mv_precision(MV *mv, int allow_hp, int is_integer) {
+  if (is_integer) {
+    integer_mv_precision(mv);
+  } else {
+    if (!allow_hp) {
+      if (mv->row & 1) mv->row += (mv->row > 0 ? -1 : 1);
+      if (mv->col & 1) mv->col += (mv->col > 0 ? -1 : 1);
+    }
+  }
+}
+
+static INLINE int8_t get_uni_comp_ref_idx(const MV_REFERENCE_FRAME *const rf) {
+  // Single ref pred
+  if (rf[1] <= INTRA_FRAME) return -1;
+
+  // Bi-directional comp ref pred
+  if ((rf[0] < BWDREF_FRAME) && (rf[1] >= BWDREF_FRAME)) return -1;
+
+  for (int8_t ref_idx = 0; ref_idx < TOTAL_UNIDIR_COMP_REFS; ++ref_idx) {
+    if (rf[0] == comp_ref0(ref_idx) && rf[1] == comp_ref1(ref_idx))
+      return ref_idx;
+  }
+  return -1;
+}
+
+static INLINE int8_t av1_ref_frame_type(const MV_REFERENCE_FRAME *const rf) {
+  if (rf[1] > INTRA_FRAME) {
+    const int8_t uni_comp_ref_idx = get_uni_comp_ref_idx(rf);
+    if (uni_comp_ref_idx >= 0) {
+      assert((REF_FRAMES + FWD_REFS * BWD_REFS + uni_comp_ref_idx) <
+             MODE_CTX_REF_FRAMES);
+      return REF_FRAMES + FWD_REFS * BWD_REFS + uni_comp_ref_idx;
+    } else {
+      return REF_FRAMES + FWD_RF_OFFSET(rf[0]) +
+             BWD_RF_OFFSET(rf[1]) * FWD_REFS;
+    }
+  }
+
+  return rf[0];
+}
+
+// clang-format off
+static MV_REFERENCE_FRAME ref_frame_map[TOTAL_COMP_REFS][2] = {
+  { LAST_FRAME, BWDREF_FRAME },  { LAST2_FRAME, BWDREF_FRAME },
+  { LAST3_FRAME, BWDREF_FRAME }, { GOLDEN_FRAME, BWDREF_FRAME },
+
+  { LAST_FRAME, ALTREF2_FRAME },  { LAST2_FRAME, ALTREF2_FRAME },
+  { LAST3_FRAME, ALTREF2_FRAME }, { GOLDEN_FRAME, ALTREF2_FRAME },
+
+  { LAST_FRAME, ALTREF_FRAME },  { LAST2_FRAME, ALTREF_FRAME },
+  { LAST3_FRAME, ALTREF_FRAME }, { GOLDEN_FRAME, ALTREF_FRAME },
+
+  { LAST_FRAME, LAST2_FRAME }, { LAST_FRAME, LAST3_FRAME },
+  { LAST_FRAME, GOLDEN_FRAME }, { BWDREF_FRAME, ALTREF_FRAME },
+
+  // NOTE: Following reference frame pairs are not supported to be explicitly
+  //       signalled, but they are possibly chosen by the use of skip_mode,
+  //       which may use the most recent one-sided reference frame pair.
+  { LAST2_FRAME, LAST3_FRAME }, { LAST2_FRAME, GOLDEN_FRAME },
+  { LAST3_FRAME, GOLDEN_FRAME }, {BWDREF_FRAME, ALTREF2_FRAME},
+  { ALTREF2_FRAME, ALTREF_FRAME }
+};
+// clang-format on
+
+static INLINE void av1_set_ref_frame(MV_REFERENCE_FRAME *rf,
+                                     MV_REFERENCE_FRAME ref_frame_type) {
+  if (ref_frame_type >= REF_FRAMES) {
+    rf[0] = ref_frame_map[ref_frame_type - REF_FRAMES][0];
+    rf[1] = ref_frame_map[ref_frame_type - REF_FRAMES][1];
+  } else {
+    assert(ref_frame_type > NONE_FRAME);
+    rf[0] = ref_frame_type;
+    rf[1] = NONE_FRAME;
+  }
+}
+
+static uint16_t compound_mode_ctx_map[3][COMP_NEWMV_CTXS] = {
+  { 0, 1, 1, 1, 1 },
+  { 1, 2, 3, 4, 4 },
+  { 4, 4, 5, 6, 7 },
+};
+
+static INLINE int16_t av1_mode_context_analyzer(
+    const int16_t *const mode_context, const MV_REFERENCE_FRAME *const rf) {
+  const int8_t ref_frame = av1_ref_frame_type(rf);
+
+  if (rf[1] <= INTRA_FRAME) return mode_context[ref_frame];
+
+  const int16_t newmv_ctx = mode_context[ref_frame] & NEWMV_CTX_MASK;
+  const int16_t refmv_ctx =
+      (mode_context[ref_frame] >> REFMV_OFFSET) & REFMV_CTX_MASK;
+
+  const int16_t comp_ctx = compound_mode_ctx_map[refmv_ctx >> 1][AOMMIN(
+      newmv_ctx, COMP_NEWMV_CTXS - 1)];
+  return comp_ctx;
+}
+
+static INLINE uint8_t av1_drl_ctx(const uint16_t *ref_mv_weight, int ref_idx) {
+  if (ref_mv_weight[ref_idx] >= REF_CAT_LEVEL &&
+      ref_mv_weight[ref_idx + 1] >= REF_CAT_LEVEL)
+    return 0;
+
+  if (ref_mv_weight[ref_idx] >= REF_CAT_LEVEL &&
+      ref_mv_weight[ref_idx + 1] < REF_CAT_LEVEL)
+    return 1;
+
+  if (ref_mv_weight[ref_idx] < REF_CAT_LEVEL &&
+      ref_mv_weight[ref_idx + 1] < REF_CAT_LEVEL)
+    return 2;
+
+  return 0;
+}
+
+void av1_setup_frame_buf_refs(AV1_COMMON *cm);
+void av1_setup_frame_sign_bias(AV1_COMMON *cm);
+void av1_setup_skip_mode_allowed(AV1_COMMON *cm);
+void av1_setup_motion_field(AV1_COMMON *cm);
+void av1_set_frame_refs(AV1_COMMON *const cm, int *remapped_ref_idx,
+                        int lst_map_idx, int gld_map_idx);
+
+static INLINE void av1_collect_neighbors_ref_counts(MACROBLOCKD *const xd) {
+  av1_zero(xd->neighbors_ref_counts);
+
+  uint8_t *const ref_counts = xd->neighbors_ref_counts;
+
+  const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;
+  const int above_in_image = xd->up_available;
+  const int left_in_image = xd->left_available;
+
+  // Above neighbor
+  if (above_in_image && is_inter_block(above_mbmi)) {
+    ref_counts[above_mbmi->ref_frame[0]]++;
+    if (has_second_ref(above_mbmi)) {
+      ref_counts[above_mbmi->ref_frame[1]]++;
+    }
+  }
+
+  // Left neighbor
+  if (left_in_image && is_inter_block(left_mbmi)) {
+    ref_counts[left_mbmi->ref_frame[0]]++;
+    if (has_second_ref(left_mbmi)) {
+      ref_counts[left_mbmi->ref_frame[1]]++;
+    }
+  }
+}
+
+void av1_copy_frame_mvs(const AV1_COMMON *const cm,
+                        const MB_MODE_INFO *const mi, int mi_row, int mi_col,
+                        int x_mis, int y_mis);
+
+// The global_mvs output parameter points to an array of REF_FRAMES elements.
+// The caller may pass a null global_mvs if it does not need the global_mvs
+// output.
+void av1_find_mv_refs(const AV1_COMMON *cm, const MACROBLOCKD *xd,
+                      MB_MODE_INFO *mi, MV_REFERENCE_FRAME ref_frame,
+                      uint8_t ref_mv_count[MODE_CTX_REF_FRAMES],
+                      CANDIDATE_MV ref_mv_stack[][MAX_REF_MV_STACK_SIZE],
+                      uint16_t ref_mv_weight[][MAX_REF_MV_STACK_SIZE],
+                      int_mv mv_ref_list[][MAX_MV_REF_CANDIDATES],
+                      int_mv *global_mvs, int16_t *mode_context);
+
+// check a list of motion vectors by sad score using a number rows of pixels
+// above and a number cols of pixels in the left to select the one with best
+// score to use as ref motion vector
+void av1_find_best_ref_mvs(int allow_hp, int_mv *mvlist, int_mv *nearest_mv,
+                           int_mv *near_mv, int is_integer);
+
+uint8_t av1_selectSamples(MV *mv, int *pts, int *pts_inref, int len,
+                          BLOCK_SIZE bsize);
+uint8_t av1_findSamples(const AV1_COMMON *cm, MACROBLOCKD *xd, int *pts,
+                        int *pts_inref);
+
+#define INTRABC_DELAY_PIXELS 256  //  Delay of 256 pixels
+#define INTRABC_DELAY_SB64 (INTRABC_DELAY_PIXELS / 64)
+
+static INLINE void av1_find_ref_dv(int_mv *ref_dv, const TileInfo *const tile,
+                                   int mib_size, int mi_row) {
+  if (mi_row - mib_size < tile->mi_row_start) {
+    ref_dv->as_fullmv.row = 0;
+    ref_dv->as_fullmv.col = -MI_SIZE * mib_size - INTRABC_DELAY_PIXELS;
+  } else {
+    ref_dv->as_fullmv.row = -MI_SIZE * mib_size;
+    ref_dv->as_fullmv.col = 0;
+  }
+  convert_fullmv_to_mv(ref_dv);
+}
+
+static INLINE int av1_is_dv_valid(const MV dv, const AV1_COMMON *cm,
+                                  const MACROBLOCKD *xd, int mi_row, int mi_col,
+                                  BLOCK_SIZE bsize, int mib_size_log2) {
+  const int bw = block_size_wide[bsize];
+  const int bh = block_size_high[bsize];
+  const int SCALE_PX_TO_MV = 8;
+  // Disallow subpixel for now
+  // SUBPEL_MASK is not the correct scale
+  if (((dv.row & (SCALE_PX_TO_MV - 1)) || (dv.col & (SCALE_PX_TO_MV - 1))))
+    return 0;
+
+  const TileInfo *const tile = &xd->tile;
+  // Is the source top-left inside the current tile?
+  const int src_top_edge = mi_row * MI_SIZE * SCALE_PX_TO_MV + dv.row;
+  const int tile_top_edge = tile->mi_row_start * MI_SIZE * SCALE_PX_TO_MV;
+  if (src_top_edge < tile_top_edge) return 0;
+  const int src_left_edge = mi_col * MI_SIZE * SCALE_PX_TO_MV + dv.col;
+  const int tile_left_edge = tile->mi_col_start * MI_SIZE * SCALE_PX_TO_MV;
+  if (src_left_edge < tile_left_edge) return 0;
+  // Is the bottom right inside the current tile?
+  const int src_bottom_edge = (mi_row * MI_SIZE + bh) * SCALE_PX_TO_MV + dv.row;
+  const int tile_bottom_edge = tile->mi_row_end * MI_SIZE * SCALE_PX_TO_MV;
+  if (src_bottom_edge > tile_bottom_edge) return 0;
+  const int src_right_edge = (mi_col * MI_SIZE + bw) * SCALE_PX_TO_MV + dv.col;
+  const int tile_right_edge = tile->mi_col_end * MI_SIZE * SCALE_PX_TO_MV;
+  if (src_right_edge > tile_right_edge) return 0;
+
+  // Special case for sub 8x8 chroma cases, to prevent referring to chroma
+  // pixels outside current tile.
+  if (xd->is_chroma_ref && av1_num_planes(cm) > 1) {
+    const struct macroblockd_plane *const pd = &xd->plane[1];
+    if (bw < 8 && pd->subsampling_x)
+      if (src_left_edge < tile_left_edge + 4 * SCALE_PX_TO_MV) return 0;
+    if (bh < 8 && pd->subsampling_y)
+      if (src_top_edge < tile_top_edge + 4 * SCALE_PX_TO_MV) return 0;
+  }
+
+  // Is the bottom right within an already coded SB? Also consider additional
+  // constraints to facilitate HW decoder.
+  const int max_mib_size = 1 << mib_size_log2;
+  const int active_sb_row = mi_row >> mib_size_log2;
+  const int active_sb64_col = (mi_col * MI_SIZE) >> 6;
+  const int sb_size = max_mib_size * MI_SIZE;
+  const int src_sb_row = ((src_bottom_edge >> 3) - 1) / sb_size;
+  const int src_sb64_col = ((src_right_edge >> 3) - 1) >> 6;
+  const int total_sb64_per_row =
+      ((tile->mi_col_end - tile->mi_col_start - 1) >> 4) + 1;
+  const int active_sb64 = active_sb_row * total_sb64_per_row + active_sb64_col;
+  const int src_sb64 = src_sb_row * total_sb64_per_row + src_sb64_col;
+  if (src_sb64 >= active_sb64 - INTRABC_DELAY_SB64) return 0;
+
+  // Wavefront constraint: use only top left area of frame for reference.
+  const int gradient = 1 + INTRABC_DELAY_SB64 + (sb_size > 64);
+  const int wf_offset = gradient * (active_sb_row - src_sb_row);
+  if (src_sb_row > active_sb_row ||
+      src_sb64_col >= active_sb64_col - INTRABC_DELAY_SB64 + wf_offset)
+    return 0;
+
+  return 1;
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_MVREF_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/obmc.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/obmc.h
new file mode 100644
index 0000000000..b84034541e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/obmc.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_OBMC_H_
+#define AOM_AV1_COMMON_OBMC_H_
+
+typedef void (*overlappable_nb_visitor_t)(MACROBLOCKD *xd, int rel_mi_row,
+                                          int rel_mi_col, uint8_t op_mi_size,
+                                          int dir, MB_MODE_INFO *nb_mi,
+                                          void *fun_ctxt, const int num_planes);
+
+static INLINE void foreach_overlappable_nb_above(const AV1_COMMON *cm,
+                                                 MACROBLOCKD *xd, int nb_max,
+                                                 overlappable_nb_visitor_t fun,
+                                                 void *fun_ctxt) {
+  if (!xd->up_available) return;
+
+  const int num_planes = av1_num_planes(cm);
+  int nb_count = 0;
+  const int mi_col = xd->mi_col;
+  // prev_row_mi points into the mi array, starting at the beginning of the
+  // previous row.
+  MB_MODE_INFO **prev_row_mi = xd->mi - mi_col - 1 * xd->mi_stride;
+  const int end_col = AOMMIN(mi_col + xd->width, cm->mi_params.mi_cols);
+  uint8_t mi_step;
+  for (int above_mi_col = mi_col; above_mi_col < end_col && nb_count < nb_max;
+       above_mi_col += mi_step) {
+    MB_MODE_INFO **above_mi = prev_row_mi + above_mi_col;
+    mi_step =
+        AOMMIN(mi_size_wide[above_mi[0]->bsize], mi_size_wide[BLOCK_64X64]);
+    // If we're considering a block with width 4, it should be treated as
+    // half of a pair of blocks with chroma information in the second. Move
+    // above_mi_col back to the start of the pair if needed, set above_mbmi
+    // to point at the block with chroma information, and set mi_step to 2 to
+    // step over the entire pair at the end of the iteration.
+    if (mi_step == 1) {
+      above_mi_col &= ~1;
+      above_mi = prev_row_mi + above_mi_col + 1;
+      mi_step = 2;
+    }
+    if (is_neighbor_overlappable(*above_mi)) {
+      ++nb_count;
+      fun(xd, 0, above_mi_col - mi_col, AOMMIN(xd->width, mi_step), 0,
+          *above_mi, fun_ctxt, num_planes);
+    }
+  }
+}
+
+static INLINE void foreach_overlappable_nb_left(const AV1_COMMON *cm,
+                                                MACROBLOCKD *xd, int nb_max,
+                                                overlappable_nb_visitor_t fun,
+                                                void *fun_ctxt) {
+  if (!xd->left_available) return;
+
+  const int num_planes = av1_num_planes(cm);
+  int nb_count = 0;
+  // prev_col_mi points into the mi array, starting at the top of the
+  // previous column
+  const int mi_row = xd->mi_row;
+  MB_MODE_INFO **prev_col_mi = xd->mi - 1 - mi_row * xd->mi_stride;
+  const int end_row = AOMMIN(mi_row + xd->height, cm->mi_params.mi_rows);
+  uint8_t mi_step;
+  for (int left_mi_row = mi_row; left_mi_row < end_row && nb_count < nb_max;
+       left_mi_row += mi_step) {
+    MB_MODE_INFO **left_mi = prev_col_mi + left_mi_row * xd->mi_stride;
+    mi_step =
+        AOMMIN(mi_size_high[left_mi[0]->bsize], mi_size_high[BLOCK_64X64]);
+    if (mi_step == 1) {
+      left_mi_row &= ~1;
+      left_mi = prev_col_mi + (left_mi_row + 1) * xd->mi_stride;
+      mi_step = 2;
+    }
+    if (is_neighbor_overlappable(*left_mi)) {
+      ++nb_count;
+      fun(xd, left_mi_row - mi_row, 0, AOMMIN(xd->height, mi_step), 1, *left_mi,
+          fun_ctxt, num_planes);
+    }
+  }
+}
+
+#endif  // AOM_AV1_COMMON_OBMC_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.c
new file mode 100644
index 0000000000..e16f6cad55
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h"
+
+static aom_codec_err_t read_obu_size(const uint8_t *data,
+                                     size_t bytes_available,
+                                     size_t *const obu_size,
+                                     size_t *const length_field_size) {
+  uint64_t u_obu_size = 0;
+  if (aom_uleb_decode(data, bytes_available, &u_obu_size, length_field_size) !=
+      0) {
+    return AOM_CODEC_CORRUPT_FRAME;
+  }
+
+  if (u_obu_size > UINT32_MAX) return AOM_CODEC_CORRUPT_FRAME;
+  *obu_size = (size_t)u_obu_size;
+  return AOM_CODEC_OK;
+}
+
+// Parses OBU header and stores values in 'header'.
+static aom_codec_err_t read_obu_header(struct aom_read_bit_buffer *rb,
+                                       int is_annexb, ObuHeader *header) {
+  if (!rb || !header) return AOM_CODEC_INVALID_PARAM;
+
+  const ptrdiff_t bit_buffer_byte_length = rb->bit_buffer_end - rb->bit_buffer;
+  if (bit_buffer_byte_length < 1) return AOM_CODEC_CORRUPT_FRAME;
+
+  header->size = 1;
+
+  if (aom_rb_read_bit(rb) != 0) {
+    // Forbidden bit. Must not be set.
+    return AOM_CODEC_CORRUPT_FRAME;
+  }
+
+  header->type = (OBU_TYPE)aom_rb_read_literal(rb, 4);
+  header->has_extension = aom_rb_read_bit(rb);
+  header->has_size_field = aom_rb_read_bit(rb);
+
+  if (!header->has_size_field && !is_annexb) {
+    // section 5 obu streams must have obu_size field set.
+    return AOM_CODEC_UNSUP_BITSTREAM;
+  }
+
+  // obu_reserved_1bit must be set to 0. The value is ignored by a decoder.
+  aom_rb_read_bit(rb);
+
+  if (header->has_extension) {
+    if (bit_buffer_byte_length == 1) return AOM_CODEC_CORRUPT_FRAME;
+
+    header->size += 1;
+    header->temporal_layer_id = aom_rb_read_literal(rb, 3);
+    header->spatial_layer_id = aom_rb_read_literal(rb, 2);
+    // extension_header_reserved_3bits must be set to 0. The value is ignored by
+    // a decoder.
+    aom_rb_read_literal(rb, 3);
+  } else {
+    header->temporal_layer_id = 0;
+    header->spatial_layer_id = 0;
+  }
+
+  return AOM_CODEC_OK;
+}
+
+aom_codec_err_t aom_read_obu_header(uint8_t *buffer, size_t buffer_length,
+                                    size_t *consumed, ObuHeader *header,
+                                    int is_annexb) {
+  if (buffer_length < 1 || !consumed || !header) return AOM_CODEC_INVALID_PARAM;
+
+  // TODO(tomfinegan): Set the error handler here and throughout this file, and
+  // confirm parsing work done via aom_read_bit_buffer is successful.
+  struct aom_read_bit_buffer rb = { buffer, buffer + buffer_length, 0, NULL,
+                                    NULL };
+  aom_codec_err_t parse_result = read_obu_header(&rb, is_annexb, header);
+  if (parse_result == AOM_CODEC_OK) *consumed = header->size;
+  return parse_result;
+}
+
+aom_codec_err_t aom_read_obu_header_and_size(const uint8_t *data,
+                                             size_t bytes_available,
+                                             int is_annexb,
+                                             ObuHeader *obu_header,
+                                             size_t *const payload_size,
+                                             size_t *const bytes_read) {
+  size_t length_field_size_obu = 0;
+  size_t length_field_size_payload = 0;
+  size_t obu_size = 0;
+  aom_codec_err_t status;
+
+  if (is_annexb) {
+    // Size field comes before the OBU header, and includes the OBU header
+    status =
+        read_obu_size(data, bytes_available, &obu_size, &length_field_size_obu);
+
+    if (status != AOM_CODEC_OK) return status;
+  }
+
+  struct aom_read_bit_buffer rb = { data + length_field_size_obu,
+                                    data + bytes_available, 0, NULL, NULL };
+
+  status = read_obu_header(&rb, is_annexb, obu_header);
+  if (status != AOM_CODEC_OK) return status;
+
+  if (!obu_header->has_size_field) {
+    assert(is_annexb);
+    // Derive the payload size from the data we've already read
+    if (obu_size < obu_header->size) return AOM_CODEC_CORRUPT_FRAME;
+
+    *payload_size = obu_size - obu_header->size;
+  } else {
+    // Size field comes after the OBU header, and is just the payload size
+    status = read_obu_size(
+        data + length_field_size_obu + obu_header->size,
+        bytes_available - length_field_size_obu - obu_header->size,
+        payload_size, &length_field_size_payload);
+    if (status != AOM_CODEC_OK) return status;
+  }
+
+  *bytes_read =
+      length_field_size_obu + obu_header->size + length_field_size_payload;
+  return AOM_CODEC_OK;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.h
new file mode 100644
index 0000000000..5f2a870f26
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2018, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#ifndef AOM_AV1_COMMON_OBU_UTIL_H_
+#define AOM_AV1_COMMON_OBU_UTIL_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  size_t size;  // Size (1 or 2 bytes) of the OBU header (including the
+                // optional OBU extension header) in the bitstream.
+  OBU_TYPE type;
+  int has_size_field;
+  int has_extension;  // Whether the optional OBU extension header is present.
+  // The following fields come from the OBU extension header. They are set to 0
+  // if has_extension is false.
+  int temporal_layer_id;
+  int spatial_layer_id;
+} ObuHeader;
+
+aom_codec_err_t aom_read_obu_header(uint8_t *buffer, size_t buffer_length,
+                                    size_t *consumed, ObuHeader *header,
+                                    int is_annexb);
+
+aom_codec_err_t aom_read_obu_header_and_size(const uint8_t *data,
+                                             size_t bytes_available,
+                                             int is_annexb,
+                                             ObuHeader *obu_header,
+                                             size_t *const payload_size,
+                                             size_t *const bytes_read);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_OBU_UTIL_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.c
new file mode 100644
index 0000000000..830f5952fe
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.c
@@ -0,0 +1,541 @@
+/*
+ * Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/* clang-format off */
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h"
+
+/*Constants for use with OD_DIVU_SMALL().
+  See \cite{Rob05} for details on computing these constants.
+  @INPROCEEDINGS{Rob05,
+    author="Arch D. Robison",
+    title="{N}-bit Unsigned Division via {N}-bit Multiply-Add",
+    booktitle="Proc. of the 17th IEEE Symposium on Computer Arithmetic
+     (ARITH'05)",
+    pages="131--139",
+    address="Cape Cod, MA",
+    month=Jun,
+    year=2005
+  }*/
+uint32_t OD_DIVU_SMALL_CONSTS[OD_DIVU_DMAX][2] = {
+  { 0xFFFFFFFF, 0xFFFFFFFF }, { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xAAAAAAAB, 0 },          { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xCCCCCCCD, 0 },          { 0xAAAAAAAB, 0 },
+  { 0x92492492, 0x92492492 }, { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xE38E38E4, 0 },          { 0xCCCCCCCD, 0 },
+  { 0xBA2E8BA3, 0 },          { 0xAAAAAAAB, 0 },
+  { 0x9D89D89E, 0 },          { 0x92492492, 0x92492492 },
+  { 0x88888889, 0 },          { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xF0F0F0F1, 0 },          { 0xE38E38E4, 0 },
+  { 0xD79435E5, 0xD79435E5 }, { 0xCCCCCCCD, 0 },
+  { 0xC30C30C3, 0xC30C30C3 }, { 0xBA2E8BA3, 0 },
+  { 0xB21642C9, 0 },          { 0xAAAAAAAB, 0 },
+  { 0xA3D70A3E, 0 },          { 0x9D89D89E, 0 },
+  { 0x97B425ED, 0x97B425ED }, { 0x92492492, 0x92492492 },
+  { 0x8D3DCB09, 0 },          { 0x88888889, 0 },
+  { 0x84210842, 0x84210842 }, { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xF83E0F84, 0 },          { 0xF0F0F0F1, 0 },
+  { 0xEA0EA0EA, 0xEA0EA0EA }, { 0xE38E38E4, 0 },
+  { 0xDD67C8A6, 0xDD67C8A6 }, { 0xD79435E5, 0xD79435E5 },
+  { 0xD20D20D2, 0xD20D20D2 }, { 0xCCCCCCCD, 0 },
+  { 0xC7CE0C7D, 0 },          { 0xC30C30C3, 0xC30C30C3 },
+  { 0xBE82FA0C, 0 },          { 0xBA2E8BA3, 0 },
+  { 0xB60B60B6, 0xB60B60B6 }, { 0xB21642C9, 0 },
+  { 0xAE4C415D, 0 },          { 0xAAAAAAAB, 0 },
+  { 0xA72F053A, 0 },          { 0xA3D70A3E, 0 },
+  { 0xA0A0A0A1, 0 },          { 0x9D89D89E, 0 },
+  { 0x9A90E7D9, 0x9A90E7D9 }, { 0x97B425ED, 0x97B425ED },
+  { 0x94F2094F, 0x94F2094F }, { 0x92492492, 0x92492492 },
+  { 0x8FB823EE, 0x8FB823EE }, { 0x8D3DCB09, 0 },
+  { 0x8AD8F2FC, 0 },          { 0x88888889, 0 },
+  { 0x864B8A7E, 0 },          { 0x84210842, 0x84210842 },
+  { 0x82082082, 0x82082082 }, { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xFC0FC0FD, 0 },          { 0xF83E0F84, 0 },
+  { 0xF4898D60, 0 },          { 0xF0F0F0F1, 0 },
+  { 0xED7303B6, 0 },          { 0xEA0EA0EA, 0xEA0EA0EA },
+  { 0xE6C2B449, 0 },          { 0xE38E38E4, 0 },
+  { 0xE070381C, 0xE070381C }, { 0xDD67C8A6, 0xDD67C8A6 },
+  { 0xDA740DA8, 0 },          { 0xD79435E5, 0xD79435E5 },
+  { 0xD4C77B04, 0 },          { 0xD20D20D2, 0xD20D20D2 },
+  { 0xCF6474A9, 0 },          { 0xCCCCCCCD, 0 },
+  { 0xCA4587E7, 0 },          { 0xC7CE0C7D, 0 },
+  { 0xC565C87C, 0 },          { 0xC30C30C3, 0xC30C30C3 },
+  { 0xC0C0C0C1, 0 },          { 0xBE82FA0C, 0 },
+  { 0xBC52640C, 0 },          { 0xBA2E8BA3, 0 },
+  { 0xB81702E1, 0 },          { 0xB60B60B6, 0xB60B60B6 },
+  { 0xB40B40B4, 0xB40B40B4 }, { 0xB21642C9, 0 },
+  { 0xB02C0B03, 0 },          { 0xAE4C415D, 0 },
+  { 0xAC769184, 0xAC769184 }, { 0xAAAAAAAB, 0 },
+  { 0xA8E83F57, 0xA8E83F57 }, { 0xA72F053A, 0 },
+  { 0xA57EB503, 0 },          { 0xA3D70A3E, 0 },
+  { 0xA237C32B, 0xA237C32B }, { 0xA0A0A0A1, 0 },
+  { 0x9F1165E7, 0x9F1165E7 }, { 0x9D89D89E, 0 },
+  { 0x9C09C09C, 0x9C09C09C }, { 0x9A90E7D9, 0x9A90E7D9 },
+  { 0x991F1A51, 0x991F1A51 }, { 0x97B425ED, 0x97B425ED },
+  { 0x964FDA6C, 0x964FDA6C }, { 0x94F2094F, 0x94F2094F },
+  { 0x939A85C4, 0x939A85C4 }, { 0x92492492, 0x92492492 },
+  { 0x90FDBC09, 0x90FDBC09 }, { 0x8FB823EE, 0x8FB823EE },
+  { 0x8E78356D, 0x8E78356D }, { 0x8D3DCB09, 0 },
+  { 0x8C08C08C, 0x8C08C08C }, { 0x8AD8F2FC, 0 },
+  { 0x89AE408A, 0 },          { 0x88888889, 0 },
+  { 0x8767AB5F, 0x8767AB5F }, { 0x864B8A7E, 0 },
+  { 0x85340853, 0x85340853 }, { 0x84210842, 0x84210842 },
+  { 0x83126E98, 0 },          { 0x82082082, 0x82082082 },
+  { 0x81020408, 0x81020408 }, { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xFE03F810, 0 },          { 0xFC0FC0FD, 0 },
+  { 0xFA232CF3, 0 },          { 0xF83E0F84, 0 },
+  { 0xF6603D99, 0 },          { 0xF4898D60, 0 },
+  { 0xF2B9D649, 0 },          { 0xF0F0F0F1, 0 },
+  { 0xEF2EB720, 0 },          { 0xED7303B6, 0 },
+  { 0xEBBDB2A6, 0 },          { 0xEA0EA0EA, 0xEA0EA0EA },
+  { 0xE865AC7C, 0 },          { 0xE6C2B449, 0 },
+  { 0xE525982B, 0 },          { 0xE38E38E4, 0 },
+  { 0xE1FC780F, 0 },          { 0xE070381C, 0xE070381C },
+  { 0xDEE95C4D, 0 },          { 0xDD67C8A6, 0xDD67C8A6 },
+  { 0xDBEB61EF, 0 },          { 0xDA740DA8, 0 },
+  { 0xD901B204, 0 },          { 0xD79435E5, 0xD79435E5 },
+  { 0xD62B80D7, 0 },          { 0xD4C77B04, 0 },
+  { 0xD3680D37, 0 },          { 0xD20D20D2, 0xD20D20D2 },
+  { 0xD0B69FCC, 0 },          { 0xCF6474A9, 0 },
+  { 0xCE168A77, 0xCE168A77 }, { 0xCCCCCCCD, 0 },
+  { 0xCB8727C1, 0 },          { 0xCA4587E7, 0 },
+  { 0xC907DA4F, 0 },          { 0xC7CE0C7D, 0 },
+  { 0xC6980C6A, 0 },          { 0xC565C87C, 0 },
+  { 0xC4372F86, 0 },          { 0xC30C30C3, 0xC30C30C3 },
+  { 0xC1E4BBD6, 0 },          { 0xC0C0C0C1, 0 },
+  { 0xBFA02FE8, 0xBFA02FE8 }, { 0xBE82FA0C, 0 },
+  { 0xBD691047, 0xBD691047 }, { 0xBC52640C, 0 },
+  { 0xBB3EE722, 0 },          { 0xBA2E8BA3, 0 },
+  { 0xB92143FA, 0xB92143FA }, { 0xB81702E1, 0 },
+  { 0xB70FBB5A, 0xB70FBB5A }, { 0xB60B60B6, 0xB60B60B6 },
+  { 0xB509E68B, 0 },          { 0xB40B40B4, 0xB40B40B4 },
+  { 0xB30F6353, 0 },          { 0xB21642C9, 0 },
+  { 0xB11FD3B8, 0xB11FD3B8 }, { 0xB02C0B03, 0 },
+  { 0xAF3ADDC7, 0 },          { 0xAE4C415D, 0 },
+  { 0xAD602B58, 0xAD602B58 }, { 0xAC769184, 0xAC769184 },
+  { 0xAB8F69E3, 0 },          { 0xAAAAAAAB, 0 },
+  { 0xA9C84A48, 0 },          { 0xA8E83F57, 0xA8E83F57 },
+  { 0xA80A80A8, 0xA80A80A8 }, { 0xA72F053A, 0 },
+  { 0xA655C439, 0xA655C439 }, { 0xA57EB503, 0 },
+  { 0xA4A9CF1E, 0 },          { 0xA3D70A3E, 0 },
+  { 0xA3065E40, 0 },          { 0xA237C32B, 0xA237C32B },
+  { 0xA16B312F, 0 },          { 0xA0A0A0A1, 0 },
+  { 0x9FD809FE, 0 },          { 0x9F1165E7, 0x9F1165E7 },
+  { 0x9E4CAD24, 0 },          { 0x9D89D89E, 0 },
+  { 0x9CC8E161, 0 },          { 0x9C09C09C, 0x9C09C09C },
+  { 0x9B4C6F9F, 0 },          { 0x9A90E7D9, 0x9A90E7D9 },
+  { 0x99D722DB, 0 },          { 0x991F1A51, 0x991F1A51 },
+  { 0x9868C80A, 0 },          { 0x97B425ED, 0x97B425ED },
+  { 0x97012E02, 0x97012E02 }, { 0x964FDA6C, 0x964FDA6C },
+  { 0x95A02568, 0x95A02568 }, { 0x94F2094F, 0x94F2094F },
+  { 0x94458094, 0x94458094 }, { 0x939A85C4, 0x939A85C4 },
+  { 0x92F11384, 0x92F11384 }, { 0x92492492, 0x92492492 },
+  { 0x91A2B3C5, 0 },          { 0x90FDBC09, 0x90FDBC09 },
+  { 0x905A3863, 0x905A3863 }, { 0x8FB823EE, 0x8FB823EE },
+  { 0x8F1779DA, 0 },          { 0x8E78356D, 0x8E78356D },
+  { 0x8DDA5202, 0x8DDA5202 }, { 0x8D3DCB09, 0 },
+  { 0x8CA29C04, 0x8CA29C04 }, { 0x8C08C08C, 0x8C08C08C },
+  { 0x8B70344A, 0x8B70344A }, { 0x8AD8F2FC, 0 },
+  { 0x8A42F870, 0x8A42F870 }, { 0x89AE408A, 0 },
+  { 0x891AC73B, 0 },          { 0x88888889, 0 },
+  { 0x87F78088, 0 },          { 0x8767AB5F, 0x8767AB5F },
+  { 0x86D90545, 0 },          { 0x864B8A7E, 0 },
+  { 0x85BF3761, 0x85BF3761 }, { 0x85340853, 0x85340853 },
+  { 0x84A9F9C8, 0x84A9F9C8 }, { 0x84210842, 0x84210842 },
+  { 0x83993052, 0x83993052 }, { 0x83126E98, 0 },
+  { 0x828CBFBF, 0 },          { 0x82082082, 0x82082082 },
+  { 0x81848DA9, 0 },          { 0x81020408, 0x81020408 },
+  { 0x80808081, 0 },          { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xFF00FF01, 0 },          { 0xFE03F810, 0 },
+  { 0xFD08E551, 0 },          { 0xFC0FC0FD, 0 },
+  { 0xFB188566, 0 },          { 0xFA232CF3, 0 },
+  { 0xF92FB222, 0 },          { 0xF83E0F84, 0 },
+  { 0xF74E3FC3, 0 },          { 0xF6603D99, 0 },
+  { 0xF57403D6, 0 },          { 0xF4898D60, 0 },
+  { 0xF3A0D52D, 0 },          { 0xF2B9D649, 0 },
+  { 0xF1D48BCF, 0 },          { 0xF0F0F0F1, 0 },
+  { 0xF00F00F0, 0xF00F00F0 }, { 0xEF2EB720, 0 },
+  { 0xEE500EE5, 0xEE500EE5 }, { 0xED7303B6, 0 },
+  { 0xEC979119, 0 },          { 0xEBBDB2A6, 0 },
+  { 0xEAE56404, 0 },          { 0xEA0EA0EA, 0xEA0EA0EA },
+  { 0xE9396520, 0 },          { 0xE865AC7C, 0 },
+  { 0xE79372E3, 0 },          { 0xE6C2B449, 0 },
+  { 0xE5F36CB0, 0xE5F36CB0 }, { 0xE525982B, 0 },
+  { 0xE45932D8, 0 },          { 0xE38E38E4, 0 },
+  { 0xE2C4A689, 0 },          { 0xE1FC780F, 0 },
+  { 0xE135A9CA, 0 },          { 0xE070381C, 0xE070381C },
+  { 0xDFAC1F75, 0 },          { 0xDEE95C4D, 0 },
+  { 0xDE27EB2D, 0 },          { 0xDD67C8A6, 0xDD67C8A6 },
+  { 0xDCA8F159, 0 },          { 0xDBEB61EF, 0 },
+  { 0xDB2F171E, 0 },          { 0xDA740DA8, 0 },
+  { 0xD9BA4257, 0 },          { 0xD901B204, 0 },
+  { 0xD84A598F, 0 },          { 0xD79435E5, 0xD79435E5 },
+  { 0xD6DF43FD, 0 },          { 0xD62B80D7, 0 },
+  { 0xD578E97D, 0 },          { 0xD4C77B04, 0 },
+  { 0xD417328A, 0 },          { 0xD3680D37, 0 },
+  { 0xD2BA083C, 0 },          { 0xD20D20D2, 0xD20D20D2 },
+  { 0xD161543E, 0xD161543E }, { 0xD0B69FCC, 0 },
+  { 0xD00D00D0, 0xD00D00D0 }, { 0xCF6474A9, 0 },
+  { 0xCEBCF8BC, 0 },          { 0xCE168A77, 0xCE168A77 },
+  { 0xCD712753, 0 },          { 0xCCCCCCCD, 0 },
+  { 0xCC29786D, 0 },          { 0xCB8727C1, 0 },
+  { 0xCAE5D85F, 0xCAE5D85F }, { 0xCA4587E7, 0 },
+  { 0xC9A633FD, 0 },          { 0xC907DA4F, 0 },
+  { 0xC86A7890, 0xC86A7890 }, { 0xC7CE0C7D, 0 },
+  { 0xC73293D8, 0 },          { 0xC6980C6A, 0 },
+  { 0xC5FE7403, 0xC5FE7403 }, { 0xC565C87C, 0 },
+  { 0xC4CE07B0, 0xC4CE07B0 }, { 0xC4372F86, 0 },
+  { 0xC3A13DE6, 0xC3A13DE6 }, { 0xC30C30C3, 0xC30C30C3 },
+  { 0xC2780614, 0 },          { 0xC1E4BBD6, 0 },
+  { 0xC152500C, 0xC152500C }, { 0xC0C0C0C1, 0 },
+  { 0xC0300C03, 0xC0300C03 }, { 0xBFA02FE8, 0xBFA02FE8 },
+  { 0xBF112A8B, 0 },          { 0xBE82FA0C, 0 },
+  { 0xBDF59C92, 0 },          { 0xBD691047, 0xBD691047 },
+  { 0xBCDD535E, 0 },          { 0xBC52640C, 0 },
+  { 0xBBC8408D, 0 },          { 0xBB3EE722, 0 },
+  { 0xBAB65610, 0xBAB65610 }, { 0xBA2E8BA3, 0 },
+  { 0xB9A7862A, 0xB9A7862A }, { 0xB92143FA, 0xB92143FA },
+  { 0xB89BC36D, 0 },          { 0xB81702E1, 0 },
+  { 0xB79300B8, 0 },          { 0xB70FBB5A, 0xB70FBB5A },
+  { 0xB68D3134, 0xB68D3134 }, { 0xB60B60B6, 0xB60B60B6 },
+  { 0xB58A4855, 0xB58A4855 }, { 0xB509E68B, 0 },
+  { 0xB48A39D4, 0xB48A39D4 }, { 0xB40B40B4, 0xB40B40B4 },
+  { 0xB38CF9B0, 0xB38CF9B0 }, { 0xB30F6353, 0 },
+  { 0xB2927C2A, 0 },          { 0xB21642C9, 0 },
+  { 0xB19AB5C5, 0 },          { 0xB11FD3B8, 0xB11FD3B8 },
+  { 0xB0A59B42, 0 },          { 0xB02C0B03, 0 },
+  { 0xAFB321A1, 0xAFB321A1 }, { 0xAF3ADDC7, 0 },
+  { 0xAEC33E20, 0 },          { 0xAE4C415D, 0 },
+  { 0xADD5E632, 0xADD5E632 }, { 0xAD602B58, 0xAD602B58 },
+  { 0xACEB0F89, 0xACEB0F89 }, { 0xAC769184, 0xAC769184 },
+  { 0xAC02B00B, 0 },          { 0xAB8F69E3, 0 },
+  { 0xAB1CBDD4, 0 },          { 0xAAAAAAAB, 0 },
+  { 0xAA392F36, 0 },          { 0xA9C84A48, 0 },
+  { 0xA957FAB5, 0xA957FAB5 }, { 0xA8E83F57, 0xA8E83F57 },
+  { 0xA8791709, 0 },          { 0xA80A80A8, 0xA80A80A8 },
+  { 0xA79C7B17, 0 },          { 0xA72F053A, 0 },
+  { 0xA6C21DF7, 0 },          { 0xA655C439, 0xA655C439 },
+  { 0xA5E9F6ED, 0xA5E9F6ED }, { 0xA57EB503, 0 },
+  { 0xA513FD6C, 0 },          { 0xA4A9CF1E, 0 },
+  { 0xA4402910, 0xA4402910 }, { 0xA3D70A3E, 0 },
+  { 0xA36E71A3, 0 },          { 0xA3065E40, 0 },
+  { 0xA29ECF16, 0xA29ECF16 }, { 0xA237C32B, 0xA237C32B },
+  { 0xA1D13986, 0 },          { 0xA16B312F, 0 },
+  { 0xA105A933, 0 },          { 0xA0A0A0A1, 0 },
+  { 0xA03C1689, 0 },          { 0x9FD809FE, 0 },
+  { 0x9F747A15, 0x9F747A15 }, { 0x9F1165E7, 0x9F1165E7 },
+  { 0x9EAECC8D, 0x9EAECC8D }, { 0x9E4CAD24, 0 },
+  { 0x9DEB06C9, 0x9DEB06C9 }, { 0x9D89D89E, 0 },
+  { 0x9D2921C4, 0 },          { 0x9CC8E161, 0 },
+  { 0x9C69169B, 0x9C69169B }, { 0x9C09C09C, 0x9C09C09C },
+  { 0x9BAADE8E, 0x9BAADE8E }, { 0x9B4C6F9F, 0 },
+  { 0x9AEE72FD, 0 },          { 0x9A90E7D9, 0x9A90E7D9 },
+  { 0x9A33CD67, 0x9A33CD67 }, { 0x99D722DB, 0 },
+  { 0x997AE76B, 0x997AE76B }, { 0x991F1A51, 0x991F1A51 },
+  { 0x98C3BAC7, 0x98C3BAC7 }, { 0x9868C80A, 0 },
+  { 0x980E4156, 0x980E4156 }, { 0x97B425ED, 0x97B425ED },
+  { 0x975A7510, 0 },          { 0x97012E02, 0x97012E02 },
+  { 0x96A8500A, 0 },          { 0x964FDA6C, 0x964FDA6C },
+  { 0x95F7CC73, 0 },          { 0x95A02568, 0x95A02568 },
+  { 0x9548E498, 0 },          { 0x94F2094F, 0x94F2094F },
+  { 0x949B92DE, 0 },          { 0x94458094, 0x94458094 },
+  { 0x93EFD1C5, 0x93EFD1C5 }, { 0x939A85C4, 0x939A85C4 },
+  { 0x93459BE7, 0 },          { 0x92F11384, 0x92F11384 },
+  { 0x929CEBF5, 0 },          { 0x92492492, 0x92492492 },
+  { 0x91F5BCB9, 0 },          { 0x91A2B3C5, 0 },
+  { 0x91500915, 0x91500915 }, { 0x90FDBC09, 0x90FDBC09 },
+  { 0x90ABCC02, 0x90ABCC02 }, { 0x905A3863, 0x905A3863 },
+  { 0x90090090, 0x90090090 }, { 0x8FB823EE, 0x8FB823EE },
+  { 0x8F67A1E4, 0 },          { 0x8F1779DA, 0 },
+  { 0x8EC7AB3A, 0 },          { 0x8E78356D, 0x8E78356D },
+  { 0x8E2917E1, 0 },          { 0x8DDA5202, 0x8DDA5202 },
+  { 0x8D8BE340, 0 },          { 0x8D3DCB09, 0 },
+  { 0x8CF008CF, 0x8CF008CF }, { 0x8CA29C04, 0x8CA29C04 },
+  { 0x8C55841D, 0 },          { 0x8C08C08C, 0x8C08C08C },
+  { 0x8BBC50C9, 0 },          { 0x8B70344A, 0x8B70344A },
+  { 0x8B246A88, 0 },          { 0x8AD8F2FC, 0 },
+  { 0x8A8DCD20, 0 },          { 0x8A42F870, 0x8A42F870 },
+  { 0x89F8746A, 0 },          { 0x89AE408A, 0 },
+  { 0x89645C4F, 0x89645C4F }, { 0x891AC73B, 0 },
+  { 0x88D180CD, 0x88D180CD }, { 0x88888889, 0 },
+  { 0x883FDDF0, 0x883FDDF0 }, { 0x87F78088, 0 },
+  { 0x87AF6FD6, 0 },          { 0x8767AB5F, 0x8767AB5F },
+  { 0x872032AC, 0x872032AC }, { 0x86D90545, 0 },
+  { 0x869222B2, 0 },          { 0x864B8A7E, 0 },
+  { 0x86053C34, 0x86053C34 }, { 0x85BF3761, 0x85BF3761 },
+  { 0x85797B91, 0x85797B91 }, { 0x85340853, 0x85340853 },
+  { 0x84EEDD36, 0 },          { 0x84A9F9C8, 0x84A9F9C8 },
+  { 0x84655D9C, 0 },          { 0x84210842, 0x84210842 },
+  { 0x83DCF94E, 0 },          { 0x83993052, 0x83993052 },
+  { 0x8355ACE4, 0 },          { 0x83126E98, 0 },
+  { 0x82CF7504, 0 },          { 0x828CBFBF, 0 },
+  { 0x824A4E61, 0 },          { 0x82082082, 0x82082082 },
+  { 0x81C635BC, 0x81C635BC }, { 0x81848DA9, 0 },
+  { 0x814327E4, 0 },          { 0x81020408, 0x81020408 },
+  { 0x80C121B3, 0 },          { 0x80808081, 0 },
+  { 0x80402010, 0x80402010 }, { 0xFFFFFFFF, 0xFFFFFFFF },
+  { 0xFF803FE1, 0 },          { 0xFF00FF01, 0 },
+  { 0xFE823CA6, 0 },          { 0xFE03F810, 0 },
+  { 0xFD863087, 0 },          { 0xFD08E551, 0 },
+  { 0xFC8C15B5, 0 },          { 0xFC0FC0FD, 0 },
+  { 0xFB93E673, 0 },          { 0xFB188566, 0 },
+  { 0xFA9D9D20, 0 },          { 0xFA232CF3, 0 },
+  { 0xF9A9342D, 0 },          { 0xF92FB222, 0 },
+  { 0xF8B6A622, 0xF8B6A622 }, { 0xF83E0F84, 0 },
+  { 0xF7C5ED9D, 0 },          { 0xF74E3FC3, 0 },
+  { 0xF6D7054E, 0 },          { 0xF6603D99, 0 },
+  { 0xF5E9E7FD, 0 },          { 0xF57403D6, 0 },
+  { 0xF4FE9083, 0 },          { 0xF4898D60, 0 },
+  { 0xF414F9CE, 0 },          { 0xF3A0D52D, 0 },
+  { 0xF32D1EE0, 0 },          { 0xF2B9D649, 0 },
+  { 0xF246FACC, 0 },          { 0xF1D48BCF, 0 },
+  { 0xF16288B9, 0 },          { 0xF0F0F0F1, 0 },
+  { 0xF07FC3E0, 0xF07FC3E0 }, { 0xF00F00F0, 0xF00F00F0 },
+  { 0xEF9EA78C, 0 },          { 0xEF2EB720, 0 },
+  { 0xEEBF2F19, 0 },          { 0xEE500EE5, 0xEE500EE5 },
+  { 0xEDE155F4, 0 },          { 0xED7303B6, 0 },
+  { 0xED05179C, 0xED05179C }, { 0xEC979119, 0 },
+  { 0xEC2A6FA0, 0xEC2A6FA0 }, { 0xEBBDB2A6, 0 },
+  { 0xEB5159A0, 0 },          { 0xEAE56404, 0 },
+  { 0xEA79D14A, 0 },          { 0xEA0EA0EA, 0xEA0EA0EA },
+  { 0xE9A3D25E, 0xE9A3D25E }, { 0xE9396520, 0 },
+  { 0xE8CF58AB, 0 },          { 0xE865AC7C, 0 },
+  { 0xE7FC600F, 0 },          { 0xE79372E3, 0 },
+  { 0xE72AE476, 0 },          { 0xE6C2B449, 0 },
+  { 0xE65AE1DC, 0 },          { 0xE5F36CB0, 0xE5F36CB0 },
+  { 0xE58C544A, 0 },          { 0xE525982B, 0 },
+  { 0xE4BF37D9, 0 },          { 0xE45932D8, 0 },
+  { 0xE3F388AF, 0 },          { 0xE38E38E4, 0 },
+  { 0xE32942FF, 0 },          { 0xE2C4A689, 0 },
+  { 0xE260630B, 0 },          { 0xE1FC780F, 0 },
+  { 0xE198E520, 0 },          { 0xE135A9CA, 0 },
+  { 0xE0D2C59A, 0 },          { 0xE070381C, 0xE070381C },
+  { 0xE00E00E0, 0xE00E00E0 }, { 0xDFAC1F75, 0 },
+  { 0xDF4A9369, 0 },          { 0xDEE95C4D, 0 },
+  { 0xDE8879B3, 0 },          { 0xDE27EB2D, 0 },
+  { 0xDDC7B04D, 0 },          { 0xDD67C8A6, 0xDD67C8A6 },
+  { 0xDD0833CE, 0 },          { 0xDCA8F159, 0 },
+  { 0xDC4A00DD, 0 },          { 0xDBEB61EF, 0 },
+  { 0xDB8D1428, 0 },          { 0xDB2F171E, 0 },
+  { 0xDAD16A6B, 0 },          { 0xDA740DA8, 0 },
+  { 0xDA17006D, 0xDA17006D }, { 0xD9BA4257, 0 },
+  { 0xD95DD300, 0 },          { 0xD901B204, 0 },
+  { 0xD8A5DEFF, 0 },          { 0xD84A598F, 0 },
+  { 0xD7EF2152, 0 },          { 0xD79435E5, 0xD79435E5 },
+  { 0xD73996E9, 0 },          { 0xD6DF43FD, 0 },
+  { 0xD6853CC1, 0 },          { 0xD62B80D7, 0 },
+  { 0xD5D20FDF, 0 },          { 0xD578E97D, 0 },
+  { 0xD5200D52, 0xD5200D52 }, { 0xD4C77B04, 0 },
+  { 0xD46F3235, 0 },          { 0xD417328A, 0 },
+  { 0xD3BF7BA9, 0 },          { 0xD3680D37, 0 },
+  { 0xD310E6DB, 0 },          { 0xD2BA083C, 0 },
+  { 0xD2637101, 0 },          { 0xD20D20D2, 0xD20D20D2 },
+  { 0xD1B71759, 0 },          { 0xD161543E, 0xD161543E },
+  { 0xD10BD72C, 0 },          { 0xD0B69FCC, 0 },
+  { 0xD061ADCA, 0 },          { 0xD00D00D0, 0xD00D00D0 },
+  { 0xCFB8988C, 0 },          { 0xCF6474A9, 0 },
+  { 0xCF1094D4, 0 },          { 0xCEBCF8BC, 0 },
+  { 0xCE69A00D, 0 },          { 0xCE168A77, 0xCE168A77 },
+  { 0xCDC3B7A9, 0xCDC3B7A9 }, { 0xCD712753, 0 },
+  { 0xCD1ED924, 0 },          { 0xCCCCCCCD, 0 },
+  { 0xCC7B0200, 0 },          { 0xCC29786D, 0 },
+  { 0xCBD82FC7, 0 },          { 0xCB8727C1, 0 },
+  { 0xCB36600D, 0 },          { 0xCAE5D85F, 0xCAE5D85F },
+  { 0xCA95906C, 0 },          { 0xCA4587E7, 0 },
+  { 0xC9F5BE86, 0 },          { 0xC9A633FD, 0 },
+  { 0xC956E803, 0xC956E803 }, { 0xC907DA4F, 0 },
+  { 0xC8B90A96, 0 },          { 0xC86A7890, 0xC86A7890 },
+  { 0xC81C23F5, 0xC81C23F5 }, { 0xC7CE0C7D, 0 },
+  { 0xC78031E0, 0xC78031E0 }, { 0xC73293D8, 0 },
+  { 0xC6E5321D, 0 },          { 0xC6980C6A, 0 },
+  { 0xC64B2278, 0xC64B2278 }, { 0xC5FE7403, 0xC5FE7403 },
+  { 0xC5B200C6, 0 },          { 0xC565C87C, 0 },
+  { 0xC519CAE0, 0xC519CAE0 }, { 0xC4CE07B0, 0xC4CE07B0 },
+  { 0xC4827EA8, 0xC4827EA8 }, { 0xC4372F86, 0 },
+  { 0xC3EC1A06, 0 },          { 0xC3A13DE6, 0xC3A13DE6 },
+  { 0xC3569AE6, 0 },          { 0xC30C30C3, 0xC30C30C3 },
+  { 0xC2C1FF3E, 0 },          { 0xC2780614, 0 },
+  { 0xC22E4507, 0 },          { 0xC1E4BBD6, 0 },
+  { 0xC19B6A42, 0 },          { 0xC152500C, 0xC152500C },
+  { 0xC1096CF6, 0 },          { 0xC0C0C0C1, 0 },
+  { 0xC0784B2F, 0 },          { 0xC0300C03, 0xC0300C03 },
+  { 0xBFE80300, 0 },          { 0xBFA02FE8, 0xBFA02FE8 },
+  { 0xBF589280, 0 },          { 0xBF112A8B, 0 },
+  { 0xBEC9F7CE, 0 },          { 0xBE82FA0C, 0 },
+  { 0xBE3C310C, 0 },          { 0xBDF59C92, 0 },
+  { 0xBDAF3C64, 0 },          { 0xBD691047, 0xBD691047 },
+  { 0xBD231803, 0 },          { 0xBCDD535E, 0 },
+  { 0xBC97C21E, 0xBC97C21E }, { 0xBC52640C, 0 },
+  { 0xBC0D38EE, 0xBC0D38EE }, { 0xBBC8408D, 0 },
+  { 0xBB837AB1, 0 },          { 0xBB3EE722, 0 },
+  { 0xBAFA85A9, 0xBAFA85A9 }, { 0xBAB65610, 0xBAB65610 },
+  { 0xBA725820, 0xBA725820 }, { 0xBA2E8BA3, 0 },
+  { 0xB9EAF063, 0 },          { 0xB9A7862A, 0xB9A7862A },
+  { 0xB9644CC4, 0 },          { 0xB92143FA, 0xB92143FA },
+  { 0xB8DE6B9A, 0 },          { 0xB89BC36D, 0 },
+  { 0xB8594B41, 0 },          { 0xB81702E1, 0 },
+  { 0xB7D4EA19, 0xB7D4EA19 }, { 0xB79300B8, 0 },
+  { 0xB7514689, 0 },          { 0xB70FBB5A, 0xB70FBB5A },
+  { 0xB6CE5EF9, 0xB6CE5EF9 }, { 0xB68D3134, 0xB68D3134 },
+  { 0xB64C31D9, 0 },          { 0xB60B60B6, 0xB60B60B6 },
+  { 0xB5CABD9B, 0 },          { 0xB58A4855, 0xB58A4855 },
+  { 0xB54A00B5, 0xB54A00B5 }, { 0xB509E68B, 0 },
+  { 0xB4C9F9A5, 0 },          { 0xB48A39D4, 0xB48A39D4 },
+  { 0xB44AA6E9, 0xB44AA6E9 }, { 0xB40B40B4, 0xB40B40B4 },
+  { 0xB3CC0706, 0 },          { 0xB38CF9B0, 0xB38CF9B0 },
+  { 0xB34E1884, 0 },          { 0xB30F6353, 0 },
+  { 0xB2D0D9EF, 0 },          { 0xB2927C2A, 0 },
+  { 0xB25449D7, 0 },          { 0xB21642C9, 0 },
+  { 0xB1D866D1, 0xB1D866D1 }, { 0xB19AB5C5, 0 },
+  { 0xB15D2F76, 0 },          { 0xB11FD3B8, 0xB11FD3B8 },
+  { 0xB0E2A260, 0xB0E2A260 }, { 0xB0A59B42, 0 },
+  { 0xB068BE31, 0 },          { 0xB02C0B03, 0 },
+  { 0xAFEF818C, 0 },          { 0xAFB321A1, 0xAFB321A1 },
+  { 0xAF76EB19, 0 },          { 0xAF3ADDC7, 0 },
+  { 0xAEFEF982, 0 },          { 0xAEC33E20, 0 },
+  { 0xAE87AB76, 0xAE87AB76 }, { 0xAE4C415D, 0 },
+  { 0xAE10FFA9, 0 },          { 0xADD5E632, 0xADD5E632 },
+  { 0xAD9AF4D0, 0 },          { 0xAD602B58, 0xAD602B58 },
+  { 0xAD2589A4, 0 },          { 0xACEB0F89, 0xACEB0F89 },
+  { 0xACB0BCE1, 0xACB0BCE1 }, { 0xAC769184, 0xAC769184 },
+  { 0xAC3C8D4A, 0 },          { 0xAC02B00B, 0 },
+  { 0xABC8F9A0, 0xABC8F9A0 }, { 0xAB8F69E3, 0 },
+  { 0xAB5600AC, 0 },          { 0xAB1CBDD4, 0 },
+  { 0xAAE3A136, 0 },          { 0xAAAAAAAB, 0 },
+  { 0xAA71DA0D, 0 },          { 0xAA392F36, 0 },
+  { 0xAA00AA01, 0 },          { 0xA9C84A48, 0 },
+  { 0xA9900FE6, 0 },          { 0xA957FAB5, 0xA957FAB5 },
+  { 0xA9200A92, 0xA9200A92 }, { 0xA8E83F57, 0xA8E83F57 },
+  { 0xA8B098E0, 0xA8B098E0 }, { 0xA8791709, 0 },
+  { 0xA841B9AD, 0 },          { 0xA80A80A8, 0xA80A80A8 },
+  { 0xA7D36BD8, 0 },          { 0xA79C7B17, 0 },
+  { 0xA765AE44, 0 },          { 0xA72F053A, 0 },
+  { 0xA6F87FD6, 0xA6F87FD6 }, { 0xA6C21DF7, 0 },
+  { 0xA68BDF79, 0 },          { 0xA655C439, 0xA655C439 },
+  { 0xA61FCC16, 0xA61FCC16 }, { 0xA5E9F6ED, 0xA5E9F6ED },
+  { 0xA5B4449D, 0 },          { 0xA57EB503, 0 },
+  { 0xA54947FE, 0 },          { 0xA513FD6C, 0 },
+  { 0xA4DED52C, 0xA4DED52C }, { 0xA4A9CF1E, 0 },
+  { 0xA474EB1F, 0xA474EB1F }, { 0xA4402910, 0xA4402910 },
+  { 0xA40B88D0, 0 },          { 0xA3D70A3E, 0 },
+  { 0xA3A2AD39, 0xA3A2AD39 }, { 0xA36E71A3, 0 },
+  { 0xA33A575A, 0xA33A575A }, { 0xA3065E40, 0 },
+  { 0xA2D28634, 0 },          { 0xA29ECF16, 0xA29ECF16 },
+  { 0xA26B38C9, 0 },          { 0xA237C32B, 0xA237C32B },
+  { 0xA2046E1F, 0xA2046E1F }, { 0xA1D13986, 0 },
+  { 0xA19E2540, 0 },          { 0xA16B312F, 0 },
+  { 0xA1385D35, 0 },          { 0xA105A933, 0 },
+  { 0xA0D3150C, 0 },          { 0xA0A0A0A1, 0 },
+  { 0xA06E4BD4, 0xA06E4BD4 }, { 0xA03C1689, 0 },
+  { 0xA00A00A0, 0xA00A00A0 }, { 0x9FD809FE, 0 },
+  { 0x9FA63284, 0 },          { 0x9F747A15, 0x9F747A15 },
+  { 0x9F42E095, 0x9F42E095 }, { 0x9F1165E7, 0x9F1165E7 },
+  { 0x9EE009EE, 0x9EE009EE }, { 0x9EAECC8D, 0x9EAECC8D },
+  { 0x9E7DADA9, 0 },          { 0x9E4CAD24, 0 },
+  { 0x9E1BCAE3, 0 },          { 0x9DEB06C9, 0x9DEB06C9 },
+  { 0x9DBA60BB, 0x9DBA60BB }, { 0x9D89D89E, 0 },
+  { 0x9D596E54, 0x9D596E54 }, { 0x9D2921C4, 0 },
+  { 0x9CF8F2D1, 0x9CF8F2D1 }, { 0x9CC8E161, 0 },
+  { 0x9C98ED58, 0 },          { 0x9C69169B, 0x9C69169B },
+  { 0x9C395D10, 0x9C395D10 }, { 0x9C09C09C, 0x9C09C09C },
+  { 0x9BDA4124, 0x9BDA4124 }, { 0x9BAADE8E, 0x9BAADE8E },
+  { 0x9B7B98C0, 0 },          { 0x9B4C6F9F, 0 },
+  { 0x9B1D6311, 0x9B1D6311 }, { 0x9AEE72FD, 0 },
+  { 0x9ABF9F48, 0x9ABF9F48 }, { 0x9A90E7D9, 0x9A90E7D9 },
+  { 0x9A624C97, 0 },          { 0x9A33CD67, 0x9A33CD67 },
+  { 0x9A056A31, 0 },          { 0x99D722DB, 0 },
+  { 0x99A8F74C, 0 },          { 0x997AE76B, 0x997AE76B },
+  { 0x994CF320, 0x994CF320 }, { 0x991F1A51, 0x991F1A51 },
+  { 0x98F15CE7, 0 },          { 0x98C3BAC7, 0x98C3BAC7 },
+  { 0x989633DB, 0x989633DB }, { 0x9868C80A, 0 },
+  { 0x983B773B, 0 },          { 0x980E4156, 0x980E4156 },
+  { 0x97E12644, 0x97E12644 }, { 0x97B425ED, 0x97B425ED },
+  { 0x97874039, 0 },          { 0x975A7510, 0 },
+  { 0x972DC45B, 0 },          { 0x97012E02, 0x97012E02 },
+  { 0x96D4B1EF, 0 },          { 0x96A8500A, 0 },
+  { 0x967C083B, 0 },          { 0x964FDA6C, 0x964FDA6C },
+  { 0x9623C686, 0x9623C686 }, { 0x95F7CC73, 0 },
+  { 0x95CBEC1B, 0 },          { 0x95A02568, 0x95A02568 },
+  { 0x95747844, 0 },          { 0x9548E498, 0 },
+  { 0x951D6A4E, 0 },          { 0x94F2094F, 0x94F2094F },
+  { 0x94C6C187, 0 },          { 0x949B92DE, 0 },
+  { 0x94707D3F, 0 },          { 0x94458094, 0x94458094 },
+  { 0x941A9CC8, 0x941A9CC8 }, { 0x93EFD1C5, 0x93EFD1C5 },
+  { 0x93C51F76, 0 },          { 0x939A85C4, 0x939A85C4 },
+  { 0x9370049C, 0 },          { 0x93459BE7, 0 },
+  { 0x931B4B91, 0 },          { 0x92F11384, 0x92F11384 },
+  { 0x92C6F3AC, 0x92C6F3AC }, { 0x929CEBF5, 0 },
+  { 0x9272FC48, 0x9272FC48 }, { 0x92492492, 0x92492492 },
+  { 0x921F64BF, 0 },          { 0x91F5BCB9, 0 },
+  { 0x91CC2C6C, 0x91CC2C6C }, { 0x91A2B3C5, 0 },
+  { 0x917952AF, 0 },          { 0x91500915, 0x91500915 },
+  { 0x9126D6E5, 0 },          { 0x90FDBC09, 0x90FDBC09 },
+  { 0x90D4B86F, 0 },          { 0x90ABCC02, 0x90ABCC02 },
+  { 0x9082F6B0, 0 },          { 0x905A3863, 0x905A3863 },
+  { 0x9031910A, 0 },          { 0x90090090, 0x90090090 },
+  { 0x8FE086E3, 0 },          { 0x8FB823EE, 0x8FB823EE },
+  { 0x8F8FD7A0, 0 },          { 0x8F67A1E4, 0 },
+  { 0x8F3F82A8, 0x8F3F82A8 }, { 0x8F1779DA, 0 },
+  { 0x8EEF8766, 0 },          { 0x8EC7AB3A, 0 },
+  { 0x8E9FE542, 0x8E9FE542 }, { 0x8E78356D, 0x8E78356D },
+  { 0x8E509BA8, 0x8E509BA8 }, { 0x8E2917E1, 0 },
+  { 0x8E01AA05, 0 },          { 0x8DDA5202, 0x8DDA5202 },
+  { 0x8DB30FC6, 0x8DB30FC6 }, { 0x8D8BE340, 0 },
+  { 0x8D64CC5C, 0 },          { 0x8D3DCB09, 0 },
+  { 0x8D16DF35, 0x8D16DF35 }, { 0x8CF008CF, 0x8CF008CF },
+  { 0x8CC947C5, 0 },          { 0x8CA29C04, 0x8CA29C04 },
+  { 0x8C7C057D, 0 },          { 0x8C55841D, 0 },
+  { 0x8C2F17D2, 0x8C2F17D2 }, { 0x8C08C08C, 0x8C08C08C },
+  { 0x8BE27E39, 0x8BE27E39 }, { 0x8BBC50C9, 0 },
+  { 0x8B963829, 0x8B963829 }, { 0x8B70344A, 0x8B70344A },
+  { 0x8B4A451A, 0 },          { 0x8B246A88, 0 },
+  { 0x8AFEA483, 0x8AFEA483 }, { 0x8AD8F2FC, 0 },
+  { 0x8AB355E0, 0x8AB355E0 }, { 0x8A8DCD20, 0 },
+  { 0x8A6858AB, 0 },          { 0x8A42F870, 0x8A42F870 },
+  { 0x8A1DAC60, 0x8A1DAC60 }, { 0x89F8746A, 0 },
+  { 0x89D3507D, 0 },          { 0x89AE408A, 0 },
+  { 0x89894480, 0 },          { 0x89645C4F, 0x89645C4F },
+  { 0x893F87E8, 0x893F87E8 }, { 0x891AC73B, 0 },
+  { 0x88F61A37, 0x88F61A37 }, { 0x88D180CD, 0x88D180CD },
+  { 0x88ACFAEE, 0 },          { 0x88888889, 0 },
+  { 0x8864298F, 0 },          { 0x883FDDF0, 0x883FDDF0 },
+  { 0x881BA59E, 0 },          { 0x87F78088, 0 },
+  { 0x87D36EA0, 0 },          { 0x87AF6FD6, 0 },
+  { 0x878B841B, 0 },          { 0x8767AB5F, 0x8767AB5F },
+  { 0x8743E595, 0 },          { 0x872032AC, 0x872032AC },
+  { 0x86FC9296, 0x86FC9296 }, { 0x86D90545, 0 },
+  { 0x86B58AA8, 0 },          { 0x869222B2, 0 },
+  { 0x866ECD53, 0x866ECD53 }, { 0x864B8A7E, 0 },
+  { 0x86285A23, 0x86285A23 }, { 0x86053C34, 0x86053C34 },
+  { 0x85E230A3, 0x85E230A3 }, { 0x85BF3761, 0x85BF3761 },
+  { 0x859C5060, 0x859C5060 }, { 0x85797B91, 0x85797B91 },
+  { 0x8556B8E7, 0x8556B8E7 }, { 0x85340853, 0x85340853 },
+  { 0x851169C7, 0x851169C7 }, { 0x84EEDD36, 0 },
+  { 0x84CC6290, 0 },          { 0x84A9F9C8, 0x84A9F9C8 },
+  { 0x8487A2D1, 0 },          { 0x84655D9C, 0 },
+  { 0x84432A1B, 0x84432A1B }, { 0x84210842, 0x84210842 },
+  { 0x83FEF802, 0x83FEF802 }, { 0x83DCF94E, 0 },
+  { 0x83BB0C18, 0 },          { 0x83993052, 0x83993052 },
+  { 0x837765F0, 0x837765F0 }, { 0x8355ACE4, 0 },
+  { 0x83340520, 0x83340520 }, { 0x83126E98, 0 },
+  { 0x82F0E93D, 0x82F0E93D }, { 0x82CF7504, 0 },
+  { 0x82AE11DE, 0 },          { 0x828CBFBF, 0 },
+  { 0x826B7E99, 0x826B7E99 }, { 0x824A4E61, 0 },
+  { 0x82292F08, 0 },          { 0x82082082, 0x82082082 },
+  { 0x81E722C2, 0x81E722C2 }, { 0x81C635BC, 0x81C635BC },
+  { 0x81A55963, 0 },          { 0x81848DA9, 0 },
+  { 0x8163D283, 0 },          { 0x814327E4, 0 },
+  { 0x81228DBF, 0 },          { 0x81020408, 0x81020408 },
+  { 0x80E18AB3, 0 },          { 0x80C121B3, 0 },
+  { 0x80A0C8FB, 0x80A0C8FB }, { 0x80808081, 0 },
+  { 0x80604836, 0x80604836 }, { 0x80402010, 0x80402010 },
+  { 0x80200802, 0x80200802 }, { 0xFFFFFFFF, 0xFFFFFFFF }
+};
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h
new file mode 100644
index 0000000000..36ffb9d87a
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2001-2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/* clang-format off */
+
+#ifndef AOM_AV1_COMMON_ODINTRIN_H_
+#define AOM_AV1_COMMON_ODINTRIN_H_
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/bitops.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef int od_coeff;
+
+#define OD_DIVU_DMAX (1024)
+
+extern uint32_t OD_DIVU_SMALL_CONSTS[OD_DIVU_DMAX][2];
+
+/*Translate unsigned division by small divisors into multiplications.*/
+#define OD_DIVU_SMALL(_x, _d)                                     \
+  ((uint32_t)((OD_DIVU_SMALL_CONSTS[(_d)-1][0] * (uint64_t)(_x) + \
+               OD_DIVU_SMALL_CONSTS[(_d)-1][1]) >>                \
+              32) >>                                              \
+   (OD_ILOG_NZ(_d) - 1))
+
+#define OD_DIVU(_x, _d) \
+  (((_d) < OD_DIVU_DMAX) ? (OD_DIVU_SMALL((_x), (_d))) : ((_x) / (_d)))
+
+#define OD_MINI AOMMIN
+#define OD_MAXI AOMMAX
+#define OD_CLAMPI(min, val, max) (OD_MAXI(min, OD_MINI(val, max)))
+
+/*Integer logarithm (base 2) of a nonzero unsigned 32-bit integer.
+  OD_ILOG_NZ(x) = (int)floor(log2(x)) + 1.*/
+#define OD_ILOG_NZ(x) (1 + get_msb(x))
+
+/*Enable special features for gcc and compatible compilers.*/
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#define OD_GNUC_PREREQ(maj, min, pat)                                \
+  ((__GNUC__ << 16) + (__GNUC_MINOR__ << 8) + __GNUC_PATCHLEVEL__ >= \
+   ((maj) << 16) + ((min) << 8) + pat)  // NOLINT
+#else
+#define OD_GNUC_PREREQ(maj, min, pat) (0)
+#endif
+
+#if OD_GNUC_PREREQ(3, 4, 0)
+#define OD_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+#else
+#define OD_WARN_UNUSED_RESULT
+#endif
+
+#if OD_GNUC_PREREQ(3, 4, 0)
+#define OD_ARG_NONNULL(x) __attribute__((__nonnull__(x)))
+#else
+#define OD_ARG_NONNULL(x)
+#endif
+
+/** Copy n elements of memory from src to dst. The 0* term provides
+    compile-time type checking  */
+#if !defined(OVERRIDE_OD_COPY)
+#define OD_COPY(dst, src, n) \
+  (memcpy((dst), (src), sizeof(*(dst)) * (n) + 0 * ((dst) - (src))))
+#endif
+
+/** Copy n elements of memory from src to dst, allowing overlapping regions.
+    The 0* term provides compile-time type checking */
+#if !defined(OVERRIDE_OD_MOVE)
+# define OD_MOVE(dst, src, n) \
+ (memmove((dst), (src), sizeof(*(dst))*(n) + 0*((dst) - (src)) ))
+#endif
+
+/*All of these macros should expect floats as arguments.*/
+# define OD_SIGNMASK(a) (-((a) < 0))
+# define OD_FLIPSIGNI(a, b) (((a) + OD_SIGNMASK(b)) ^ OD_SIGNMASK(b))
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_ODINTRIN_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.c
new file mode 100644
index 0000000000..6cd52bf3f6
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.c
@@ -0,0 +1,501 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+
+// Returns a context number for the given MB prediction signal
+static InterpFilter get_ref_filter_type(const MB_MODE_INFO *ref_mbmi,
+                                        const MACROBLOCKD *xd, int dir,
+                                        MV_REFERENCE_FRAME ref_frame) {
+  (void)xd;
+
+  return ((ref_mbmi->ref_frame[0] == ref_frame ||
+           ref_mbmi->ref_frame[1] == ref_frame)
+              ? av1_extract_interp_filter(ref_mbmi->interp_filters, dir & 0x01)
+              : SWITCHABLE_FILTERS);
+}
+
+int av1_get_pred_context_switchable_interp(const MACROBLOCKD *xd, int dir) {
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  const int ctx_offset =
+      (mbmi->ref_frame[1] > INTRA_FRAME) * INTER_FILTER_COMP_OFFSET;
+  assert(dir == 0 || dir == 1);
+  const MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame[0];
+  // Note:
+  // The mode info data structure has a one element border above and to the
+  // left of the entries corresponding to real macroblocks.
+  // The prediction flags in these dummy entries are initialized to 0.
+  int filter_type_ctx = ctx_offset + (dir & 0x01) * INTER_FILTER_DIR_OFFSET;
+  int left_type = SWITCHABLE_FILTERS;
+  int above_type = SWITCHABLE_FILTERS;
+
+  if (xd->left_available)
+    left_type = get_ref_filter_type(xd->mi[-1], xd, dir, ref_frame);
+
+  if (xd->up_available)
+    above_type =
+        get_ref_filter_type(xd->mi[-xd->mi_stride], xd, dir, ref_frame);
+
+  if (left_type == above_type) {
+    filter_type_ctx += left_type;
+  } else if (left_type == SWITCHABLE_FILTERS) {
+    assert(above_type != SWITCHABLE_FILTERS);
+    filter_type_ctx += above_type;
+  } else if (above_type == SWITCHABLE_FILTERS) {
+    assert(left_type != SWITCHABLE_FILTERS);
+    filter_type_ctx += left_type;
+  } else {
+    filter_type_ctx += SWITCHABLE_FILTERS;
+  }
+
+  return filter_type_ctx;
+}
+
+static void palette_add_to_cache(uint16_t *cache, int *n, uint16_t val) {
+  // Do not add an already existing value
+  if (*n > 0 && val == cache[*n - 1]) return;
+
+  cache[(*n)++] = val;
+}
+
+int av1_get_palette_cache(const MACROBLOCKD *const xd, int plane,
+                          uint16_t *cache) {
+  const int row = -xd->mb_to_top_edge >> 3;
+  // Do not refer to above SB row when on SB boundary.
+  const MB_MODE_INFO *const above_mi =
+      (row % (1 << MIN_SB_SIZE_LOG2)) ? xd->above_mbmi : NULL;
+  const MB_MODE_INFO *const left_mi = xd->left_mbmi;
+  int above_n = 0, left_n = 0;
+  if (above_mi) above_n = above_mi->palette_mode_info.palette_size[plane != 0];
+  if (left_mi) left_n = left_mi->palette_mode_info.palette_size[plane != 0];
+  if (above_n == 0 && left_n == 0) return 0;
+  int above_idx = plane * PALETTE_MAX_SIZE;
+  int left_idx = plane * PALETTE_MAX_SIZE;
+  int n = 0;
+  const uint16_t *above_colors =
+      above_mi ? above_mi->palette_mode_info.palette_colors : NULL;
+  const uint16_t *left_colors =
+      left_mi ? left_mi->palette_mode_info.palette_colors : NULL;
+  // Merge the sorted lists of base colors from above and left to get
+  // combined sorted color cache.
+  while (above_n > 0 && left_n > 0) {
+    uint16_t v_above = above_colors[above_idx];
+    uint16_t v_left = left_colors[left_idx];
+    if (v_left < v_above) {
+      palette_add_to_cache(cache, &n, v_left);
+      ++left_idx, --left_n;
+    } else {
+      palette_add_to_cache(cache, &n, v_above);
+      ++above_idx, --above_n;
+      if (v_left == v_above) ++left_idx, --left_n;
+    }
+  }
+  while (above_n-- > 0) {
+    uint16_t val = above_colors[above_idx++];
+    palette_add_to_cache(cache, &n, val);
+  }
+  while (left_n-- > 0) {
+    uint16_t val = left_colors[left_idx++];
+    palette_add_to_cache(cache, &n, val);
+  }
+  assert(n <= 2 * PALETTE_MAX_SIZE);
+  return n;
+}
+
+// The mode info data structure has a one element border above and to the
+// left of the entries corresponding to real macroblocks.
+// The prediction flags in these dummy entries are initialized to 0.
+// 0 - inter/inter, inter/--, --/inter, --/--
+// 1 - intra/inter, inter/intra
+// 2 - intra/--, --/intra
+// 3 - intra/intra
+int av1_get_intra_inter_context(const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;
+  const int has_above = xd->up_available;
+  const int has_left = xd->left_available;
+
+  if (has_above && has_left) {  // both edges available
+    const int above_intra = !is_inter_block(above_mbmi);
+    const int left_intra = !is_inter_block(left_mbmi);
+    return left_intra && above_intra ? 3 : left_intra || above_intra;
+  } else if (has_above || has_left) {  // one edge available
+    return 2 * !is_inter_block(has_above ? above_mbmi : left_mbmi);
+  } else {
+    return 0;
+  }
+}
+
+#define CHECK_BACKWARD_REFS(ref_frame) \
+  (((ref_frame) >= BWDREF_FRAME) && ((ref_frame) <= ALTREF_FRAME))
+#define IS_BACKWARD_REF_FRAME(ref_frame) CHECK_BACKWARD_REFS(ref_frame)
+
+int av1_get_reference_mode_context(const MACROBLOCKD *xd) {
+  int ctx;
+  const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;
+  const int has_above = xd->up_available;
+  const int has_left = xd->left_available;
+
+  // Note:
+  // The mode info data structure has a one element border above and to the
+  // left of the entries corresponding to real macroblocks.
+  // The prediction flags in these dummy entries are initialized to 0.
+  if (has_above && has_left) {  // both edges available
+    if (!has_second_ref(above_mbmi) && !has_second_ref(left_mbmi))
+      // neither edge uses comp pred (0/1)
+      ctx = IS_BACKWARD_REF_FRAME(above_mbmi->ref_frame[0]) ^
+            IS_BACKWARD_REF_FRAME(left_mbmi->ref_frame[0]);
+    else if (!has_second_ref(above_mbmi))
+      // one of two edges uses comp pred (2/3)
+      ctx = 2 + (IS_BACKWARD_REF_FRAME(above_mbmi->ref_frame[0]) ||
+                 !is_inter_block(above_mbmi));
+    else if (!has_second_ref(left_mbmi))
+      // one of two edges uses comp pred (2/3)
+      ctx = 2 + (IS_BACKWARD_REF_FRAME(left_mbmi->ref_frame[0]) ||
+                 !is_inter_block(left_mbmi));
+    else  // both edges use comp pred (4)
+      ctx = 4;
+  } else if (has_above || has_left) {  // one edge available
+    const MB_MODE_INFO *edge_mbmi = has_above ? above_mbmi : left_mbmi;
+
+    if (!has_second_ref(edge_mbmi))
+      // edge does not use comp pred (0/1)
+      ctx = IS_BACKWARD_REF_FRAME(edge_mbmi->ref_frame[0]);
+    else
+      // edge uses comp pred (3)
+      ctx = 3;
+  } else {  // no edges available (1)
+    ctx = 1;
+  }
+  assert(ctx >= 0 && ctx < COMP_INTER_CONTEXTS);
+  return ctx;
+}
+
+int av1_get_comp_reference_type_context(const MACROBLOCKD *xd) {
+  int pred_context;
+  const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;
+  const int above_in_image = xd->up_available;
+  const int left_in_image = xd->left_available;
+
+  if (above_in_image && left_in_image) {  // both edges available
+    const int above_intra = !is_inter_block(above_mbmi);
+    const int left_intra = !is_inter_block(left_mbmi);
+
+    if (above_intra && left_intra) {  // intra/intra
+      pred_context = 2;
+    } else if (above_intra || left_intra) {  // intra/inter
+      const MB_MODE_INFO *inter_mbmi = above_intra ? left_mbmi : above_mbmi;
+
+      if (!has_second_ref(inter_mbmi))  // single pred
+        pred_context = 2;
+      else  // comp pred
+        pred_context = 1 + 2 * has_uni_comp_refs(inter_mbmi);
+    } else {  // inter/inter
+      const int a_sg = !has_second_ref(above_mbmi);
+      const int l_sg = !has_second_ref(left_mbmi);
+      const MV_REFERENCE_FRAME frfa = above_mbmi->ref_frame[0];
+      const MV_REFERENCE_FRAME frfl = left_mbmi->ref_frame[0];
+
+      if (a_sg && l_sg) {  // single/single
+        pred_context = 1 + 2 * (!(IS_BACKWARD_REF_FRAME(frfa) ^
+                                  IS_BACKWARD_REF_FRAME(frfl)));
+      } else if (l_sg || a_sg) {  // single/comp
+        const int uni_rfc =
+            a_sg ? has_uni_comp_refs(left_mbmi) : has_uni_comp_refs(above_mbmi);
+
+        if (!uni_rfc)  // comp bidir
+          pred_context = 1;
+        else  // comp unidir
+          pred_context = 3 + (!(IS_BACKWARD_REF_FRAME(frfa) ^
+                                IS_BACKWARD_REF_FRAME(frfl)));
+      } else {  // comp/comp
+        const int a_uni_rfc = has_uni_comp_refs(above_mbmi);
+        const int l_uni_rfc = has_uni_comp_refs(left_mbmi);
+
+        if (!a_uni_rfc && !l_uni_rfc)  // bidir/bidir
+          pred_context = 0;
+        else if (!a_uni_rfc || !l_uni_rfc)  // unidir/bidir
+          pred_context = 2;
+        else  // unidir/unidir
+          pred_context =
+              3 + (!((frfa == BWDREF_FRAME) ^ (frfl == BWDREF_FRAME)));
+      }
+    }
+  } else if (above_in_image || left_in_image) {  // one edge available
+    const MB_MODE_INFO *edge_mbmi = above_in_image ? above_mbmi : left_mbmi;
+
+    if (!is_inter_block(edge_mbmi)) {  // intra
+      pred_context = 2;
+    } else {                           // inter
+      if (!has_second_ref(edge_mbmi))  // single pred
+        pred_context = 2;
+      else  // comp pred
+        pred_context = 4 * has_uni_comp_refs(edge_mbmi);
+    }
+  } else {  // no edges available
+    pred_context = 2;
+  }
+
+  assert(pred_context >= 0 && pred_context < COMP_REF_TYPE_CONTEXTS);
+  return pred_context;
+}
+
+// Returns a context number for the given MB prediction signal
+//
+// Signal the uni-directional compound reference frame pair as either
+// (BWDREF, ALTREF), or (LAST, LAST2) / (LAST, LAST3) / (LAST, GOLDEN),
+// conditioning on the pair is known as uni-directional.
+//
+// 3 contexts: Voting is used to compare the count of forward references with
+//             that of backward references from the spatial neighbors.
+int av1_get_pred_context_uni_comp_ref_p(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Count of forward references (L, L2, L3, or G)
+  const int frf_count = ref_counts[LAST_FRAME] + ref_counts[LAST2_FRAME] +
+                        ref_counts[LAST3_FRAME] + ref_counts[GOLDEN_FRAME];
+  // Count of backward references (B or A)
+  const int brf_count = ref_counts[BWDREF_FRAME] + ref_counts[ALTREF2_FRAME] +
+                        ref_counts[ALTREF_FRAME];
+
+  const int pred_context =
+      (frf_count == brf_count) ? 1 : ((frf_count < brf_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < UNI_COMP_REF_CONTEXTS);
+  return pred_context;
+}
+
+// Returns a context number for the given MB prediction signal
+//
+// Signal the uni-directional compound reference frame pair as
+// either (LAST, LAST2), or (LAST, LAST3) / (LAST, GOLDEN),
+// conditioning on the pair is known as one of the above three.
+//
+// 3 contexts: Voting is used to compare the count of LAST2_FRAME with the
+//             total count of LAST3/GOLDEN from the spatial neighbors.
+int av1_get_pred_context_uni_comp_ref_p1(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Count of LAST2
+  const int last2_count = ref_counts[LAST2_FRAME];
+  // Count of LAST3 or GOLDEN
+  const int last3_or_gld_count =
+      ref_counts[LAST3_FRAME] + ref_counts[GOLDEN_FRAME];
+
+  const int pred_context = (last2_count == last3_or_gld_count)
+                               ? 1
+                               : ((last2_count < last3_or_gld_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < UNI_COMP_REF_CONTEXTS);
+  return pred_context;
+}
+
+// Returns a context number for the given MB prediction signal
+//
+// Signal the uni-directional compound reference frame pair as
+// either (LAST, LAST3) or (LAST, GOLDEN),
+// conditioning on the pair is known as one of the above two.
+//
+// 3 contexts: Voting is used to compare the count of LAST3_FRAME with the
+//             total count of GOLDEN_FRAME from the spatial neighbors.
+int av1_get_pred_context_uni_comp_ref_p2(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Count of LAST3
+  const int last3_count = ref_counts[LAST3_FRAME];
+  // Count of GOLDEN
+  const int gld_count = ref_counts[GOLDEN_FRAME];
+
+  const int pred_context =
+      (last3_count == gld_count) ? 1 : ((last3_count < gld_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < UNI_COMP_REF_CONTEXTS);
+  return pred_context;
+}
+
+// == Common context functions for both comp and single ref ==
+//
+// Obtain contexts to signal a reference frame to be either LAST/LAST2 or
+// LAST3/GOLDEN.
+static int get_pred_context_ll2_or_l3gld(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Count of LAST + LAST2
+  const int last_last2_count = ref_counts[LAST_FRAME] + ref_counts[LAST2_FRAME];
+  // Count of LAST3 + GOLDEN
+  const int last3_gld_count =
+      ref_counts[LAST3_FRAME] + ref_counts[GOLDEN_FRAME];
+
+  const int pred_context = (last_last2_count == last3_gld_count)
+                               ? 1
+                               : ((last_last2_count < last3_gld_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < REF_CONTEXTS);
+  return pred_context;
+}
+
+// Obtain contexts to signal a reference frame to be either LAST or LAST2.
+static int get_pred_context_last_or_last2(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Count of LAST
+  const int last_count = ref_counts[LAST_FRAME];
+  // Count of LAST2
+  const int last2_count = ref_counts[LAST2_FRAME];
+
+  const int pred_context =
+      (last_count == last2_count) ? 1 : ((last_count < last2_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < REF_CONTEXTS);
+  return pred_context;
+}
+
+// Obtain contexts to signal a reference frame to be either LAST3 or GOLDEN.
+static int get_pred_context_last3_or_gld(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Count of LAST3
+  const int last3_count = ref_counts[LAST3_FRAME];
+  // Count of GOLDEN
+  const int gld_count = ref_counts[GOLDEN_FRAME];
+
+  const int pred_context =
+      (last3_count == gld_count) ? 1 : ((last3_count < gld_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < REF_CONTEXTS);
+  return pred_context;
+}
+
+// Obtain contexts to signal a reference frame be either BWDREF/ALTREF2, or
+// ALTREF.
+static int get_pred_context_brfarf2_or_arf(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Counts of BWDREF, ALTREF2, or ALTREF frames (B, A2, or A)
+  const int brfarf2_count =
+      ref_counts[BWDREF_FRAME] + ref_counts[ALTREF2_FRAME];
+  const int arf_count = ref_counts[ALTREF_FRAME];
+
+  const int pred_context =
+      (brfarf2_count == arf_count) ? 1 : ((brfarf2_count < arf_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < REF_CONTEXTS);
+  return pred_context;
+}
+
+// Obtain contexts to signal a reference frame be either BWDREF or ALTREF2.
+static int get_pred_context_brf_or_arf2(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Count of BWDREF frames (B)
+  const int brf_count = ref_counts[BWDREF_FRAME];
+  // Count of ALTREF2 frames (A2)
+  const int arf2_count = ref_counts[ALTREF2_FRAME];
+
+  const int pred_context =
+      (brf_count == arf2_count) ? 1 : ((brf_count < arf2_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < REF_CONTEXTS);
+  return pred_context;
+}
+
+// == Context functions for comp ref ==
+//
+// Returns a context number for the given MB prediction signal
+// Signal the first reference frame for a compound mode be either
+// GOLDEN/LAST3, or LAST/LAST2.
+int av1_get_pred_context_comp_ref_p(const MACROBLOCKD *xd) {
+  return get_pred_context_ll2_or_l3gld(xd);
+}
+
+// Returns a context number for the given MB prediction signal
+// Signal the first reference frame for a compound mode be LAST,
+// conditioning on that it is known either LAST/LAST2.
+int av1_get_pred_context_comp_ref_p1(const MACROBLOCKD *xd) {
+  return get_pred_context_last_or_last2(xd);
+}
+
+// Returns a context number for the given MB prediction signal
+// Signal the first reference frame for a compound mode be GOLDEN,
+// conditioning on that it is known either GOLDEN or LAST3.
+int av1_get_pred_context_comp_ref_p2(const MACROBLOCKD *xd) {
+  return get_pred_context_last3_or_gld(xd);
+}
+
+// Signal the 2nd reference frame for a compound mode be either
+// ALTREF, or ALTREF2/BWDREF.
+int av1_get_pred_context_comp_bwdref_p(const MACROBLOCKD *xd) {
+  return get_pred_context_brfarf2_or_arf(xd);
+}
+
+// Signal the 2nd reference frame for a compound mode be either
+// ALTREF2 or BWDREF.
+int av1_get_pred_context_comp_bwdref_p1(const MACROBLOCKD *xd) {
+  return get_pred_context_brf_or_arf2(xd);
+}
+
+// == Context functions for single ref ==
+//
+// For the bit to signal whether the single reference is a forward reference
+// frame or a backward reference frame.
+int av1_get_pred_context_single_ref_p1(const MACROBLOCKD *xd) {
+  const uint8_t *const ref_counts = &xd->neighbors_ref_counts[0];
+
+  // Count of forward reference frames
+  const int fwd_count = ref_counts[LAST_FRAME] + ref_counts[LAST2_FRAME] +
+                        ref_counts[LAST3_FRAME] + ref_counts[GOLDEN_FRAME];
+  // Count of backward reference frames
+  const int bwd_count = ref_counts[BWDREF_FRAME] + ref_counts[ALTREF2_FRAME] +
+                        ref_counts[ALTREF_FRAME];
+
+  const int pred_context =
+      (fwd_count == bwd_count) ? 1 : ((fwd_count < bwd_count) ? 0 : 2);
+
+  assert(pred_context >= 0 && pred_context < REF_CONTEXTS);
+  return pred_context;
+}
+
+// For the bit to signal whether the single reference is ALTREF_FRAME or
+// non-ALTREF backward reference frame, knowing that it shall be either of
+// these 2 choices.
+int av1_get_pred_context_single_ref_p2(const MACROBLOCKD *xd) {
+  return get_pred_context_brfarf2_or_arf(xd);
+}
+
+// For the bit to signal whether the single reference is LAST3/GOLDEN or
+// LAST2/LAST, knowing that it shall be either of these 2 choices.
+int av1_get_pred_context_single_ref_p3(const MACROBLOCKD *xd) {
+  return get_pred_context_ll2_or_l3gld(xd);
+}
+
+// For the bit to signal whether the single reference is LAST2_FRAME or
+// LAST_FRAME, knowing that it shall be either of these 2 choices.
+int av1_get_pred_context_single_ref_p4(const MACROBLOCKD *xd) {
+  return get_pred_context_last_or_last2(xd);
+}
+
+// For the bit to signal whether the single reference is GOLDEN_FRAME or
+// LAST3_FRAME, knowing that it shall be either of these 2 choices.
+int av1_get_pred_context_single_ref_p5(const MACROBLOCKD *xd) {
+  return get_pred_context_last3_or_gld(xd);
+}
+
+// For the bit to signal whether the single reference is ALTREF2_FRAME or
+// BWDREF_FRAME, knowing that it shall be either of these 2 choices.
+int av1_get_pred_context_single_ref_p6(const MACROBLOCKD *xd) {
+  return get_pred_context_brf_or_arf2(xd);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.h
new file mode 100644
index 0000000000..e03f12576c
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.h
@@ -0,0 +1,374 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_PRED_COMMON_H_
+#define AOM_AV1_COMMON_PRED_COMMON_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static INLINE int get_segment_id(const CommonModeInfoParams *const mi_params,
+                                 const uint8_t *segment_ids, BLOCK_SIZE bsize,
+                                 int mi_row, int mi_col) {
+  const int mi_offset = mi_row * mi_params->mi_cols + mi_col;
+  const int bw = mi_size_wide[bsize];
+  const int bh = mi_size_high[bsize];
+  const int xmis = AOMMIN(mi_params->mi_cols - mi_col, bw);
+  const int ymis = AOMMIN(mi_params->mi_rows - mi_row, bh);
+  int segment_id = MAX_SEGMENTS;
+
+  for (int y = 0; y < ymis; ++y) {
+    for (int x = 0; x < xmis; ++x) {
+      segment_id = AOMMIN(segment_id,
+                          segment_ids[mi_offset + y * mi_params->mi_cols + x]);
+    }
+  }
+
+  assert(segment_id >= 0 && segment_id < MAX_SEGMENTS);
+  return segment_id;
+}
+
+static INLINE int av1_get_spatial_seg_pred(const AV1_COMMON *const cm,
+                                           const MACROBLOCKD *const xd,
+                                           int *cdf_index) {
+  int prev_ul = -1;  // top left segment_id
+  int prev_l = -1;   // left segment_id
+  int prev_u = -1;   // top segment_id
+  const int mi_row = xd->mi_row;
+  const int mi_col = xd->mi_col;
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+  const uint8_t *seg_map = cm->cur_frame->seg_map;
+  if ((xd->up_available) && (xd->left_available)) {
+    prev_ul =
+        get_segment_id(mi_params, seg_map, BLOCK_4X4, mi_row - 1, mi_col - 1);
+  }
+  if (xd->up_available) {
+    prev_u =
+        get_segment_id(mi_params, seg_map, BLOCK_4X4, mi_row - 1, mi_col - 0);
+  }
+  if (xd->left_available) {
+    prev_l =
+        get_segment_id(mi_params, seg_map, BLOCK_4X4, mi_row - 0, mi_col - 1);
+  }
+  // This property follows from the fact that get_segment_id() returns a
+  // nonnegative value. This allows us to test for all edge cases with a simple
+  // prev_ul < 0 check.
+  assert(IMPLIES(prev_ul >= 0, prev_u >= 0 && prev_l >= 0));
+
+  // Pick CDF index based on number of matching/out-of-bounds segment IDs.
+  if (prev_ul < 0) /* Edge cases */
+    *cdf_index = 0;
+  else if ((prev_ul == prev_u) && (prev_ul == prev_l))
+    *cdf_index = 2;
+  else if ((prev_ul == prev_u) || (prev_ul == prev_l) || (prev_u == prev_l))
+    *cdf_index = 1;
+  else
+    *cdf_index = 0;
+
+  // If 2 or more are identical returns that as predictor, otherwise prev_l.
+  if (prev_u == -1)  // edge case
+    return prev_l == -1 ? 0 : prev_l;
+  if (prev_l == -1)  // edge case
+    return prev_u;
+  return (prev_ul == prev_u) ? prev_u : prev_l;
+}
+
+static INLINE int av1_get_pred_context_seg_id(const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *const above_mi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mi = xd->left_mbmi;
+  const int above_sip = (above_mi != NULL) ? above_mi->seg_id_predicted : 0;
+  const int left_sip = (left_mi != NULL) ? left_mi->seg_id_predicted : 0;
+
+  return above_sip + left_sip;
+}
+
+static INLINE int get_comp_index_context(const AV1_COMMON *cm,
+                                         const MACROBLOCKD *xd) {
+  MB_MODE_INFO *mbmi = xd->mi[0];
+  const RefCntBuffer *const bck_buf = get_ref_frame_buf(cm, mbmi->ref_frame[0]);
+  const RefCntBuffer *const fwd_buf = get_ref_frame_buf(cm, mbmi->ref_frame[1]);
+  int bck_frame_index = 0, fwd_frame_index = 0;
+  int cur_frame_index = cm->cur_frame->order_hint;
+
+  if (bck_buf != NULL) bck_frame_index = bck_buf->order_hint;
+  if (fwd_buf != NULL) fwd_frame_index = fwd_buf->order_hint;
+
+  int fwd = abs(get_relative_dist(&cm->seq_params.order_hint_info,
+                                  fwd_frame_index, cur_frame_index));
+  int bck = abs(get_relative_dist(&cm->seq_params.order_hint_info,
+                                  cur_frame_index, bck_frame_index));
+
+  const MB_MODE_INFO *const above_mi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mi = xd->left_mbmi;
+
+  int above_ctx = 0, left_ctx = 0;
+  const int offset = (fwd == bck);
+
+  if (above_mi != NULL) {
+    if (has_second_ref(above_mi))
+      above_ctx = above_mi->compound_idx;
+    else if (above_mi->ref_frame[0] == ALTREF_FRAME)
+      above_ctx = 1;
+  }
+
+  if (left_mi != NULL) {
+    if (has_second_ref(left_mi))
+      left_ctx = left_mi->compound_idx;
+    else if (left_mi->ref_frame[0] == ALTREF_FRAME)
+      left_ctx = 1;
+  }
+
+  return above_ctx + left_ctx + 3 * offset;
+}
+
+static INLINE int get_comp_group_idx_context(const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *const above_mi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mi = xd->left_mbmi;
+  int above_ctx = 0, left_ctx = 0;
+
+  if (above_mi) {
+    if (has_second_ref(above_mi))
+      above_ctx = above_mi->comp_group_idx;
+    else if (above_mi->ref_frame[0] == ALTREF_FRAME)
+      above_ctx = 3;
+  }
+  if (left_mi) {
+    if (has_second_ref(left_mi))
+      left_ctx = left_mi->comp_group_idx;
+    else if (left_mi->ref_frame[0] == ALTREF_FRAME)
+      left_ctx = 3;
+  }
+
+  return AOMMIN(5, above_ctx + left_ctx);
+}
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_seg_id(
+    struct segmentation_probs *segp, const MACROBLOCKD *xd) {
+  return segp->pred_cdf[av1_get_pred_context_seg_id(xd)];
+}
+
+static INLINE int av1_get_skip_mode_context(const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *const above_mi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mi = xd->left_mbmi;
+  const int above_skip_mode = above_mi ? above_mi->skip_mode : 0;
+  const int left_skip_mode = left_mi ? left_mi->skip_mode : 0;
+  return above_skip_mode + left_skip_mode;
+}
+
+static INLINE int av1_get_skip_txfm_context(const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *const above_mi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mi = xd->left_mbmi;
+  const int above_skip_txfm = above_mi ? above_mi->skip_txfm : 0;
+  const int left_skip_txfm = left_mi ? left_mi->skip_txfm : 0;
+  return above_skip_txfm + left_skip_txfm;
+}
+
+int av1_get_pred_context_switchable_interp(const MACROBLOCKD *xd, int dir);
+
+// Get a list of palette base colors that are used in the above and left blocks,
+// referred to as "color cache". The return value is the number of colors in the
+// cache (<= 2 * PALETTE_MAX_SIZE). The color values are stored in "cache"
+// in ascending order.
+int av1_get_palette_cache(const MACROBLOCKD *const xd, int plane,
+                          uint16_t *cache);
+
+static INLINE int av1_get_palette_bsize_ctx(BLOCK_SIZE bsize) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  return num_pels_log2_lookup[bsize] - num_pels_log2_lookup[BLOCK_8X8];
+}
+
+static INLINE int av1_get_palette_mode_ctx(const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *const above_mi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mi = xd->left_mbmi;
+  int ctx = 0;
+  if (above_mi) ctx += (above_mi->palette_mode_info.palette_size[0] > 0);
+  if (left_mi) ctx += (left_mi->palette_mode_info.palette_size[0] > 0);
+  return ctx;
+}
+
+int av1_get_intra_inter_context(const MACROBLOCKD *xd);
+
+int av1_get_reference_mode_context(const MACROBLOCKD *xd);
+
+static INLINE aom_cdf_prob *av1_get_reference_mode_cdf(const MACROBLOCKD *xd) {
+  return xd->tile_ctx->comp_inter_cdf[av1_get_reference_mode_context(xd)];
+}
+
+static INLINE aom_cdf_prob *av1_get_skip_txfm_cdf(const MACROBLOCKD *xd) {
+  return xd->tile_ctx->skip_txfm_cdfs[av1_get_skip_txfm_context(xd)];
+}
+
+int av1_get_comp_reference_type_context(const MACROBLOCKD *xd);
+
+// == Uni-directional contexts ==
+
+int av1_get_pred_context_uni_comp_ref_p(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_uni_comp_ref_p1(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_uni_comp_ref_p2(const MACROBLOCKD *xd);
+
+static INLINE aom_cdf_prob *av1_get_comp_reference_type_cdf(
+    const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_comp_reference_type_context(xd);
+  return xd->tile_ctx->comp_ref_type_cdf[pred_context];
+}
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_uni_comp_ref_p(
+    const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_pred_context_uni_comp_ref_p(xd);
+  return xd->tile_ctx->uni_comp_ref_cdf[pred_context][0];
+}
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_uni_comp_ref_p1(
+    const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_pred_context_uni_comp_ref_p1(xd);
+  return xd->tile_ctx->uni_comp_ref_cdf[pred_context][1];
+}
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_uni_comp_ref_p2(
+    const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_pred_context_uni_comp_ref_p2(xd);
+  return xd->tile_ctx->uni_comp_ref_cdf[pred_context][2];
+}
+
+// == Bi-directional contexts ==
+
+int av1_get_pred_context_comp_ref_p(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_comp_ref_p1(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_comp_ref_p2(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_comp_bwdref_p(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_comp_bwdref_p1(const MACROBLOCKD *xd);
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_comp_ref_p(const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_pred_context_comp_ref_p(xd);
+  return xd->tile_ctx->comp_ref_cdf[pred_context][0];
+}
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_comp_ref_p1(
+    const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_pred_context_comp_ref_p1(xd);
+  return xd->tile_ctx->comp_ref_cdf[pred_context][1];
+}
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_comp_ref_p2(
+    const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_pred_context_comp_ref_p2(xd);
+  return xd->tile_ctx->comp_ref_cdf[pred_context][2];
+}
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_comp_bwdref_p(
+    const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_pred_context_comp_bwdref_p(xd);
+  return xd->tile_ctx->comp_bwdref_cdf[pred_context][0];
+}
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_comp_bwdref_p1(
+    const MACROBLOCKD *xd) {
+  const int pred_context = av1_get_pred_context_comp_bwdref_p1(xd);
+  return xd->tile_ctx->comp_bwdref_cdf[pred_context][1];
+}
+
+// == Single contexts ==
+
+int av1_get_pred_context_single_ref_p1(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_single_ref_p2(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_single_ref_p3(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_single_ref_p4(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_single_ref_p5(const MACROBLOCKD *xd);
+
+int av1_get_pred_context_single_ref_p6(const MACROBLOCKD *xd);
+
+static INLINE aom_cdf_prob *av1_get_pred_cdf_single_ref_p1(
+    const MACROBLOCKD *xd) {
+  return xd->tile_ctx
+      ->single_ref_cdf[av1_get_pred_context_single_ref_p1(xd)][0];
+}
+static INLINE aom_cdf_prob *av1_get_pred_cdf_single_ref_p2(
+    const MACROBLOCKD *xd) {
+  return xd->tile_ctx
+      ->single_ref_cdf[av1_get_pred_context_single_ref_p2(xd)][1];
+}
+static INLINE aom_cdf_prob *av1_get_pred_cdf_single_ref_p3(
+    const MACROBLOCKD *xd) {
+  return xd->tile_ctx
+      ->single_ref_cdf[av1_get_pred_context_single_ref_p3(xd)][2];
+}
+static INLINE aom_cdf_prob *av1_get_pred_cdf_single_ref_p4(
+    const MACROBLOCKD *xd) {
+  return xd->tile_ctx
+      ->single_ref_cdf[av1_get_pred_context_single_ref_p4(xd)][3];
+}
+static INLINE aom_cdf_prob *av1_get_pred_cdf_single_ref_p5(
+    const MACROBLOCKD *xd) {
+  return xd->tile_ctx
+      ->single_ref_cdf[av1_get_pred_context_single_ref_p5(xd)][4];
+}
+static INLINE aom_cdf_prob *av1_get_pred_cdf_single_ref_p6(
+    const MACROBLOCKD *xd) {
+  return xd->tile_ctx
+      ->single_ref_cdf[av1_get_pred_context_single_ref_p6(xd)][5];
+}
+
+// Returns a context number for the given MB prediction signal
+// The mode info data structure has a one element border above and to the
+// left of the entries corresponding to real blocks.
+// The prediction flags in these dummy entries are initialized to 0.
+static INLINE int get_tx_size_context(const MACROBLOCKD *xd) {
+  const MB_MODE_INFO *mbmi = xd->mi[0];
+  const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
+  const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;
+  const TX_SIZE max_tx_size = max_txsize_rect_lookup[mbmi->bsize];
+  const int max_tx_wide = tx_size_wide[max_tx_size];
+  const int max_tx_high = tx_size_high[max_tx_size];
+  const int has_above = xd->up_available;
+  const int has_left = xd->left_available;
+
+  int above = xd->above_txfm_context[0] >= max_tx_wide;
+  int left = xd->left_txfm_context[0] >= max_tx_high;
+
+  if (has_above)
+    if (is_inter_block(above_mbmi))
+      above = block_size_wide[above_mbmi->bsize] >= max_tx_wide;
+
+  if (has_left)
+    if (is_inter_block(left_mbmi))
+      left = block_size_high[left_mbmi->bsize] >= max_tx_high;
+
+  if (has_above && has_left)
+    return (above + left);
+  else if (has_above)
+    return above;
+  else if (has_left)
+    return left;
+  else
+    return 0;
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_PRED_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.c
new file mode 100644
index 0000000000..2e75ff5deb
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.c
@@ -0,0 +1,12875 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+
+static const int16_t dc_qlookup_QTX[QINDEX_RANGE] = {
+  4,    8,    8,    9,    10,  11,  12,  12,  13,  14,  15,   16,   17,   18,
+  19,   19,   20,   21,   22,  23,  24,  25,  26,  26,  27,   28,   29,   30,
+  31,   32,   32,   33,   34,  35,  36,  37,  38,  38,  39,   40,   41,   42,
+  43,   43,   44,   45,   46,  47,  48,  48,  49,  50,  51,   52,   53,   53,
+  54,   55,   56,   57,   57,  58,  59,  60,  61,  62,  62,   63,   64,   65,
+  66,   66,   67,   68,   69,  70,  70,  71,  72,  73,  74,   74,   75,   76,
+  77,   78,   78,   79,   80,  81,  81,  82,  83,  84,  85,   85,   87,   88,
+  90,   92,   93,   95,   96,  98,  99,  101, 102, 104, 105,  107,  108,  110,
+  111,  113,  114,  116,  117, 118, 120, 121, 123, 125, 127,  129,  131,  134,
+  136,  138,  140,  142,  144, 146, 148, 150, 152, 154, 156,  158,  161,  164,
+  166,  169,  172,  174,  177, 180, 182, 185, 187, 190, 192,  195,  199,  202,
+  205,  208,  211,  214,  217, 220, 223, 226, 230, 233, 237,  240,  243,  247,
+  250,  253,  257,  261,  265, 269, 272, 276, 280, 284, 288,  292,  296,  300,
+  304,  309,  313,  317,  322, 326, 330, 335, 340, 344, 349,  354,  359,  364,
+  369,  374,  379,  384,  389, 395, 400, 406, 411, 417, 423,  429,  435,  441,
+  447,  454,  461,  467,  475, 482, 489, 497, 505, 513, 522,  530,  539,  549,
+  559,  569,  579,  590,  602, 614, 626, 640, 654, 668, 684,  700,  717,  736,
+  755,  775,  796,  819,  843, 869, 896, 925, 955, 988, 1022, 1058, 1098, 1139,
+  1184, 1232, 1282, 1336,
+};
+
+static const int16_t dc_qlookup_10_QTX[QINDEX_RANGE] = {
+  4,    9,    10,   13,   15,   17,   20,   22,   25,   28,   31,   34,   37,
+  40,   43,   47,   50,   53,   57,   60,   64,   68,   71,   75,   78,   82,
+  86,   90,   93,   97,   101,  105,  109,  113,  116,  120,  124,  128,  132,
+  136,  140,  143,  147,  151,  155,  159,  163,  166,  170,  174,  178,  182,
+  185,  189,  193,  197,  200,  204,  208,  212,  215,  219,  223,  226,  230,
+  233,  237,  241,  244,  248,  251,  255,  259,  262,  266,  269,  273,  276,
+  280,  283,  287,  290,  293,  297,  300,  304,  307,  310,  314,  317,  321,
+  324,  327,  331,  334,  337,  343,  350,  356,  362,  369,  375,  381,  387,
+  394,  400,  406,  412,  418,  424,  430,  436,  442,  448,  454,  460,  466,
+  472,  478,  484,  490,  499,  507,  516,  525,  533,  542,  550,  559,  567,
+  576,  584,  592,  601,  609,  617,  625,  634,  644,  655,  666,  676,  687,
+  698,  708,  718,  729,  739,  749,  759,  770,  782,  795,  807,  819,  831,
+  844,  856,  868,  880,  891,  906,  920,  933,  947,  961,  975,  988,  1001,
+  1015, 1030, 1045, 1061, 1076, 1090, 1105, 1120, 1137, 1153, 1170, 1186, 1202,
+  1218, 1236, 1253, 1271, 1288, 1306, 1323, 1342, 1361, 1379, 1398, 1416, 1436,
+  1456, 1476, 1496, 1516, 1537, 1559, 1580, 1601, 1624, 1647, 1670, 1692, 1717,
+  1741, 1766, 1791, 1817, 1844, 1871, 1900, 1929, 1958, 1990, 2021, 2054, 2088,
+  2123, 2159, 2197, 2236, 2276, 2319, 2363, 2410, 2458, 2508, 2561, 2616, 2675,
+  2737, 2802, 2871, 2944, 3020, 3102, 3188, 3280, 3375, 3478, 3586, 3702, 3823,
+  3953, 4089, 4236, 4394, 4559, 4737, 4929, 5130, 5347,
+};
+
+static const int16_t dc_qlookup_12_QTX[QINDEX_RANGE] = {
+  4,     12,    18,    25,    33,    41,    50,    60,    70,    80,    91,
+  103,   115,   127,   140,   153,   166,   180,   194,   208,   222,   237,
+  251,   266,   281,   296,   312,   327,   343,   358,   374,   390,   405,
+  421,   437,   453,   469,   484,   500,   516,   532,   548,   564,   580,
+  596,   611,   627,   643,   659,   674,   690,   706,   721,   737,   752,
+  768,   783,   798,   814,   829,   844,   859,   874,   889,   904,   919,
+  934,   949,   964,   978,   993,   1008,  1022,  1037,  1051,  1065,  1080,
+  1094,  1108,  1122,  1136,  1151,  1165,  1179,  1192,  1206,  1220,  1234,
+  1248,  1261,  1275,  1288,  1302,  1315,  1329,  1342,  1368,  1393,  1419,
+  1444,  1469,  1494,  1519,  1544,  1569,  1594,  1618,  1643,  1668,  1692,
+  1717,  1741,  1765,  1789,  1814,  1838,  1862,  1885,  1909,  1933,  1957,
+  1992,  2027,  2061,  2096,  2130,  2165,  2199,  2233,  2267,  2300,  2334,
+  2367,  2400,  2434,  2467,  2499,  2532,  2575,  2618,  2661,  2704,  2746,
+  2788,  2830,  2872,  2913,  2954,  2995,  3036,  3076,  3127,  3177,  3226,
+  3275,  3324,  3373,  3421,  3469,  3517,  3565,  3621,  3677,  3733,  3788,
+  3843,  3897,  3951,  4005,  4058,  4119,  4181,  4241,  4301,  4361,  4420,
+  4479,  4546,  4612,  4677,  4742,  4807,  4871,  4942,  5013,  5083,  5153,
+  5222,  5291,  5367,  5442,  5517,  5591,  5665,  5745,  5825,  5905,  5984,
+  6063,  6149,  6234,  6319,  6404,  6495,  6587,  6678,  6769,  6867,  6966,
+  7064,  7163,  7269,  7376,  7483,  7599,  7715,  7832,  7958,  8085,  8214,
+  8352,  8492,  8635,  8788,  8945,  9104,  9275,  9450,  9639,  9832,  10031,
+  10245, 10465, 10702, 10946, 11210, 11482, 11776, 12081, 12409, 12750, 13118,
+  13501, 13913, 14343, 14807, 15290, 15812, 16356, 16943, 17575, 18237, 18949,
+  19718, 20521, 21387,
+};
+
+static const int16_t ac_qlookup_QTX[QINDEX_RANGE] = {
+  4,    8,    9,    10,   11,   12,   13,   14,   15,   16,   17,   18,   19,
+  20,   21,   22,   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
+  33,   34,   35,   36,   37,   38,   39,   40,   41,   42,   43,   44,   45,
+  46,   47,   48,   49,   50,   51,   52,   53,   54,   55,   56,   57,   58,
+  59,   60,   61,   62,   63,   64,   65,   66,   67,   68,   69,   70,   71,
+  72,   73,   74,   75,   76,   77,   78,   79,   80,   81,   82,   83,   84,
+  85,   86,   87,   88,   89,   90,   91,   92,   93,   94,   95,   96,   97,
+  98,   99,   100,  101,  102,  104,  106,  108,  110,  112,  114,  116,  118,
+  120,  122,  124,  126,  128,  130,  132,  134,  136,  138,  140,  142,  144,
+  146,  148,  150,  152,  155,  158,  161,  164,  167,  170,  173,  176,  179,
+  182,  185,  188,  191,  194,  197,  200,  203,  207,  211,  215,  219,  223,
+  227,  231,  235,  239,  243,  247,  251,  255,  260,  265,  270,  275,  280,
+  285,  290,  295,  300,  305,  311,  317,  323,  329,  335,  341,  347,  353,
+  359,  366,  373,  380,  387,  394,  401,  408,  416,  424,  432,  440,  448,
+  456,  465,  474,  483,  492,  501,  510,  520,  530,  540,  550,  560,  571,
+  582,  593,  604,  615,  627,  639,  651,  663,  676,  689,  702,  715,  729,
+  743,  757,  771,  786,  801,  816,  832,  848,  864,  881,  898,  915,  933,
+  951,  969,  988,  1007, 1026, 1046, 1066, 1087, 1108, 1129, 1151, 1173, 1196,
+  1219, 1243, 1267, 1292, 1317, 1343, 1369, 1396, 1423, 1451, 1479, 1508, 1537,
+  1567, 1597, 1628, 1660, 1692, 1725, 1759, 1793, 1828,
+};
+
+static const int16_t ac_qlookup_10_QTX[QINDEX_RANGE] = {
+  4,    9,    11,   13,   16,   18,   21,   24,   27,   30,   33,   37,   40,
+  44,   48,   51,   55,   59,   63,   67,   71,   75,   79,   83,   88,   92,
+  96,   100,  105,  109,  114,  118,  122,  127,  131,  136,  140,  145,  149,
+  154,  158,  163,  168,  172,  177,  181,  186,  190,  195,  199,  204,  208,
+  213,  217,  222,  226,  231,  235,  240,  244,  249,  253,  258,  262,  267,
+  271,  275,  280,  284,  289,  293,  297,  302,  306,  311,  315,  319,  324,
+  328,  332,  337,  341,  345,  349,  354,  358,  362,  367,  371,  375,  379,
+  384,  388,  392,  396,  401,  409,  417,  425,  433,  441,  449,  458,  466,
+  474,  482,  490,  498,  506,  514,  523,  531,  539,  547,  555,  563,  571,
+  579,  588,  596,  604,  616,  628,  640,  652,  664,  676,  688,  700,  713,
+  725,  737,  749,  761,  773,  785,  797,  809,  825,  841,  857,  873,  889,
+  905,  922,  938,  954,  970,  986,  1002, 1018, 1038, 1058, 1078, 1098, 1118,
+  1138, 1158, 1178, 1198, 1218, 1242, 1266, 1290, 1314, 1338, 1362, 1386, 1411,
+  1435, 1463, 1491, 1519, 1547, 1575, 1603, 1631, 1663, 1695, 1727, 1759, 1791,
+  1823, 1859, 1895, 1931, 1967, 2003, 2039, 2079, 2119, 2159, 2199, 2239, 2283,
+  2327, 2371, 2415, 2459, 2507, 2555, 2603, 2651, 2703, 2755, 2807, 2859, 2915,
+  2971, 3027, 3083, 3143, 3203, 3263, 3327, 3391, 3455, 3523, 3591, 3659, 3731,
+  3803, 3876, 3952, 4028, 4104, 4184, 4264, 4348, 4432, 4516, 4604, 4692, 4784,
+  4876, 4972, 5068, 5168, 5268, 5372, 5476, 5584, 5692, 5804, 5916, 6032, 6148,
+  6268, 6388, 6512, 6640, 6768, 6900, 7036, 7172, 7312,
+};
+
+static const int16_t ac_qlookup_12_QTX[QINDEX_RANGE] = {
+  4,     13,    19,    27,    35,    44,    54,    64,    75,    87,    99,
+  112,   126,   139,   154,   168,   183,   199,   214,   230,   247,   263,
+  280,   297,   314,   331,   349,   366,   384,   402,   420,   438,   456,
+  475,   493,   511,   530,   548,   567,   586,   604,   623,   642,   660,
+  679,   698,   716,   735,   753,   772,   791,   809,   828,   846,   865,
+  884,   902,   920,   939,   957,   976,   994,   1012,  1030,  1049,  1067,
+  1085,  1103,  1121,  1139,  1157,  1175,  1193,  1211,  1229,  1246,  1264,
+  1282,  1299,  1317,  1335,  1352,  1370,  1387,  1405,  1422,  1440,  1457,
+  1474,  1491,  1509,  1526,  1543,  1560,  1577,  1595,  1627,  1660,  1693,
+  1725,  1758,  1791,  1824,  1856,  1889,  1922,  1954,  1987,  2020,  2052,
+  2085,  2118,  2150,  2183,  2216,  2248,  2281,  2313,  2346,  2378,  2411,
+  2459,  2508,  2556,  2605,  2653,  2701,  2750,  2798,  2847,  2895,  2943,
+  2992,  3040,  3088,  3137,  3185,  3234,  3298,  3362,  3426,  3491,  3555,
+  3619,  3684,  3748,  3812,  3876,  3941,  4005,  4069,  4149,  4230,  4310,
+  4390,  4470,  4550,  4631,  4711,  4791,  4871,  4967,  5064,  5160,  5256,
+  5352,  5448,  5544,  5641,  5737,  5849,  5961,  6073,  6185,  6297,  6410,
+  6522,  6650,  6778,  6906,  7034,  7162,  7290,  7435,  7579,  7723,  7867,
+  8011,  8155,  8315,  8475,  8635,  8795,  8956,  9132,  9308,  9484,  9660,
+  9836,  10028, 10220, 10412, 10604, 10812, 11020, 11228, 11437, 11661, 11885,
+  12109, 12333, 12573, 12813, 13053, 13309, 13565, 13821, 14093, 14365, 14637,
+  14925, 15213, 15502, 15806, 16110, 16414, 16734, 17054, 17390, 17726, 18062,
+  18414, 18766, 19134, 19502, 19886, 20270, 20670, 21070, 21486, 21902, 22334,
+  22766, 23214, 23662, 24126, 24590, 25070, 25551, 26047, 26559, 27071, 27599,
+  28143, 28687, 29247,
+};
+
+// Coefficient scaling and quantization with AV1 TX are tailored to
+// the AV1 TX transforms.  Regardless of the bit-depth of the input,
+// the transform stages scale the coefficient values up by a factor of
+// 8 (3 bits) over the scale of the pixel values.  Thus, for 8-bit
+// input, the coefficients have effectively 11 bits of scale depth
+// (8+3), 10-bit input pixels result in 13-bit coefficient depth
+// (10+3) and 12-bit pixels yield 15-bit (12+3) coefficient depth.
+// All quantizers are built using this invariant of x8, 3-bit scaling,
+// thus the Q3 suffix.
+
+// A partial exception to this rule is large transforms; to avoid
+// overflow, TX blocks with > 256 pels (>16x16) are scaled only
+// 4-times unity (2 bits) over the pixel depth, and TX blocks with
+// over 1024 pixels (>32x32) are scaled up only 2x unity (1 bit).
+// This descaling is found via av1_tx_get_scale().  Thus, 16x32, 32x16
+// and 32x32 transforms actually return Q2 coefficients, and 32x64,
+// 64x32 and 64x64 transforms return Q1 coefficients.  However, the
+// quantizers are de-scaled down on-the-fly by the same amount
+// (av1_tx_get_scale()) during quantization, and as such the
+// dequantized/decoded coefficients, even for large TX blocks, are always
+// effectively Q3. Meanwhile, quantized/coded coefficients are Q0
+// because Qn quantizers are applied to Qn tx coefficients.
+
+// Note that encoder decision making (which uses the quantizer to
+// generate several bespoke lamdas for RDO and other heuristics)
+// expects quantizers to be larger for higher-bitdepth input.  In
+// addition, the minimum allowable quantizer is 4; smaller values will
+// underflow to 0 in the actual quantization routines.
+
+int16_t av1_dc_quant_QTX(int qindex, int delta, aom_bit_depth_t bit_depth) {
+  const int q_clamped = clamp(qindex + delta, 0, MAXQ);
+  switch (bit_depth) {
+    case AOM_BITS_8: return dc_qlookup_QTX[q_clamped];
+    case AOM_BITS_10: return dc_qlookup_10_QTX[q_clamped];
+    case AOM_BITS_12: return dc_qlookup_12_QTX[q_clamped];
+    default:
+      assert(0 && "bit_depth should be AOM_BITS_8, AOM_BITS_10 or AOM_BITS_12");
+      return -1;
+  }
+}
+
+int16_t av1_ac_quant_QTX(int qindex, int delta, aom_bit_depth_t bit_depth) {
+  const int q_clamped = clamp(qindex + delta, 0, MAXQ);
+  switch (bit_depth) {
+    case AOM_BITS_8: return ac_qlookup_QTX[q_clamped];
+    case AOM_BITS_10: return ac_qlookup_10_QTX[q_clamped];
+    case AOM_BITS_12: return ac_qlookup_12_QTX[q_clamped];
+    default:
+      assert(0 && "bit_depth should be AOM_BITS_8, AOM_BITS_10 or AOM_BITS_12");
+      return -1;
+  }
+}
+
+int av1_get_qindex(const struct segmentation *seg, int segment_id,
+                   int base_qindex) {
+  if (segfeature_active(seg, segment_id, SEG_LVL_ALT_Q)) {
+    const int data = get_segdata(seg, segment_id, SEG_LVL_ALT_Q);
+    const int seg_qindex = base_qindex + data;
+    return clamp(seg_qindex, 0, MAXQ);
+  } else {
+    return base_qindex;
+  }
+}
+
+bool av1_use_qmatrix(const CommonQuantParams *quant_params,
+                     const struct macroblockd *xd, int segment_id) {
+  // True if explicit Q matrix levels and this is not a lossless segment.
+  return quant_params->using_qmatrix && !xd->lossless[segment_id];
+}
+
+const qm_val_t *av1_iqmatrix(const CommonQuantParams *quant_params, int qmlevel,
+                             int plane, TX_SIZE tx_size) {
+  assert(quant_params->giqmatrix[qmlevel][plane][tx_size] != NULL ||
+         qmlevel == NUM_QM_LEVELS - 1);
+  return quant_params->giqmatrix[qmlevel][plane][tx_size];
+}
+const qm_val_t *av1_qmatrix(const CommonQuantParams *quant_params, int qmlevel,
+                            int plane, TX_SIZE tx_size) {
+  assert(quant_params->gqmatrix[qmlevel][plane][tx_size] != NULL ||
+         qmlevel == NUM_QM_LEVELS - 1);
+  return quant_params->gqmatrix[qmlevel][plane][tx_size];
+}
+
+// Returns true if the tx_type corresponds to non-identity transform in both
+// horizontal and vertical directions.
+static INLINE bool is_2d_transform(TX_TYPE tx_type) { return (tx_type < IDTX); }
+
+const qm_val_t *av1_get_iqmatrix(const CommonQuantParams *quant_params,
+                                 const MACROBLOCKD *xd, int plane,
+                                 TX_SIZE tx_size, TX_TYPE tx_type) {
+  const struct macroblockd_plane *const pd = &xd->plane[plane];
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  const int seg_id = mbmi->segment_id;
+  const TX_SIZE qm_tx_size = av1_get_adjusted_tx_size(tx_size);
+  // Use a flat matrix (i.e. no weighting) for 1D and Identity transforms
+  return is_2d_transform(tx_type)
+             ? pd->seg_iqmatrix[seg_id][qm_tx_size]
+             : quant_params->giqmatrix[NUM_QM_LEVELS - 1][0][qm_tx_size];
+}
+
+const qm_val_t *av1_get_qmatrix(const CommonQuantParams *quant_params,
+                                const MACROBLOCKD *xd, int plane,
+                                TX_SIZE tx_size, TX_TYPE tx_type) {
+  const struct macroblockd_plane *const pd = &xd->plane[plane];
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  const int seg_id = mbmi->segment_id;
+  const TX_SIZE qm_tx_size = av1_get_adjusted_tx_size(tx_size);
+  // Use a flat matrix (i.e. no weighting) for 1D and Identity transforms
+  return is_2d_transform(tx_type)
+             ? pd->seg_qmatrix[seg_id][qm_tx_size]
+             : quant_params->gqmatrix[NUM_QM_LEVELS - 1][0][qm_tx_size];
+}
+
+#define QM_TOTAL_SIZE 3344
+// We only use wt_matrix_ref[q] and iwt_matrix_ref[q]
+// for q = 0, ..., NUM_QM_LEVELS - 2.
+static const qm_val_t wt_matrix_ref[NUM_QM_LEVELS - 1][2][QM_TOTAL_SIZE];
+static const qm_val_t iwt_matrix_ref[NUM_QM_LEVELS - 1][2][QM_TOTAL_SIZE];
+
+void av1_qm_init(CommonQuantParams *quant_params, int num_planes) {
+  for (int q = 0; q < NUM_QM_LEVELS; ++q) {
+    for (int c = 0; c < num_planes; ++c) {
+      int current = 0;
+      for (int t = 0; t < TX_SIZES_ALL; ++t) {
+        const int size = tx_size_2d[t];
+        const int qm_tx_size = av1_get_adjusted_tx_size(t);
+        if (q == NUM_QM_LEVELS - 1) {
+          quant_params->gqmatrix[q][c][t] = NULL;
+          quant_params->giqmatrix[q][c][t] = NULL;
+        } else if (t != qm_tx_size) {  // Reuse matrices for 'qm_tx_size'
+          assert(t > qm_tx_size);
+          quant_params->gqmatrix[q][c][t] =
+              quant_params->gqmatrix[q][c][qm_tx_size];
+          quant_params->giqmatrix[q][c][t] =
+              quant_params->giqmatrix[q][c][qm_tx_size];
+        } else {
+          assert(current + size <= QM_TOTAL_SIZE);
+          quant_params->gqmatrix[q][c][t] = &wt_matrix_ref[q][c >= 1][current];
+          quant_params->giqmatrix[q][c][t] =
+              &iwt_matrix_ref[q][c >= 1][current];
+          current += size;
+        }
+      }
+    }
+  }
+}
+
+/* Provide 15 sets of quantization matrices for chroma and luma
+   and each TX size. Matrices for different TX sizes are in fact
+   sub-sampled from the 32x32 and 16x16 sizes, but explicitly
+   defined here for convenience. Intra and inter matrix sets are the
+   same but changing DEFAULT_QM_INTER_OFFSET from zero allows
+   for different matrices for inter and intra blocks in the same
+   frame.
+   Matrices for different QM levels have been rescaled in the
+   frequency domain according to different nominal viewing
+   distances. Matrices for QM level 15 are omitted because they are
+   not used.
+ */
+static const qm_val_t iwt_matrix_ref[NUM_QM_LEVELS - 1][2][QM_TOTAL_SIZE] = {
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 43, 73, 97, 43, 67, 94, 110, 73, 94, 137, 150, 97, 110, 150, 200,
+        /* Size 8x8 */
+        32, 32, 38, 51, 68, 84, 95, 109, 32, 35, 40, 49, 63, 76, 89, 102, 38,
+        40, 54, 65, 78, 91, 98, 106, 51, 49, 65, 82, 97, 111, 113, 121, 68, 63,
+        78, 97, 117, 134, 138, 142, 84, 76, 91, 111, 134, 152, 159, 168, 95, 89,
+        98, 113, 138, 159, 183, 199, 109, 102, 106, 121, 142, 168, 199, 220,
+        /* Size 16x16 */
+        32, 31, 31, 34, 36, 44, 48, 59, 65, 80, 83, 91, 97, 104, 111, 119, 31,
+        32, 32, 33, 34, 41, 44, 54, 59, 72, 75, 83, 90, 97, 104, 112, 31, 32,
+        33, 35, 36, 42, 45, 54, 59, 71, 74, 81, 86, 93, 100, 107, 34, 33, 35,
+        39, 42, 47, 51, 58, 63, 74, 76, 81, 84, 90, 97, 105, 36, 34, 36, 42, 48,
+        54, 57, 64, 68, 79, 81, 88, 91, 96, 102, 105, 44, 41, 42, 47, 54, 63,
+        67, 75, 79, 90, 92, 95, 100, 102, 109, 112, 48, 44, 45, 51, 57, 67, 71,
+        80, 85, 96, 99, 107, 108, 111, 117, 120, 59, 54, 54, 58, 64, 75, 80, 92,
+        98, 110, 113, 115, 116, 122, 125, 130, 65, 59, 59, 63, 68, 79, 85, 98,
+        105, 118, 121, 127, 130, 134, 135, 140, 80, 72, 71, 74, 79, 90, 96, 110,
+        118, 134, 137, 140, 143, 144, 146, 152, 83, 75, 74, 76, 81, 92, 99, 113,
+        121, 137, 140, 151, 152, 155, 158, 165, 91, 83, 81, 81, 88, 95, 107,
+        115, 127, 140, 151, 159, 166, 169, 173, 179, 97, 90, 86, 84, 91, 100,
+        108, 116, 130, 143, 152, 166, 174, 182, 189, 193, 104, 97, 93, 90, 96,
+        102, 111, 122, 134, 144, 155, 169, 182, 191, 200, 210, 111, 104, 100,
+        97, 102, 109, 117, 125, 135, 146, 158, 173, 189, 200, 210, 220, 119,
+        112, 107, 105, 105, 112, 120, 130, 140, 152, 165, 179, 193, 210, 220,
+        231,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 32, 34, 35, 36, 39, 44, 46, 48, 54, 59, 62, 65, 71,
+        80, 81, 83, 88, 91, 94, 97, 101, 104, 107, 111, 115, 119, 123, 31, 32,
+        32, 32, 32, 32, 34, 34, 35, 38, 42, 44, 46, 51, 56, 59, 62, 68, 76, 77,
+        78, 84, 86, 89, 92, 95, 99, 102, 105, 109, 113, 116, 31, 32, 32, 32, 32,
+        32, 33, 34, 34, 37, 41, 42, 44, 49, 54, 56, 59, 65, 72, 73, 75, 80, 83,
+        86, 90, 93, 97, 101, 104, 108, 112, 116, 31, 32, 32, 32, 33, 33, 34, 35,
+        35, 38, 41, 43, 45, 49, 54, 56, 59, 64, 72, 73, 74, 79, 82, 85, 88, 91,
+        94, 97, 101, 104, 107, 111, 31, 32, 32, 33, 33, 34, 35, 36, 36, 39, 42,
+        44, 45, 50, 54, 56, 59, 64, 71, 72, 74, 78, 81, 84, 86, 89, 93, 96, 100,
+        104, 107, 111, 32, 32, 32, 33, 34, 35, 37, 37, 38, 40, 42, 44, 46, 49,
+        53, 55, 58, 63, 69, 70, 72, 76, 79, 82, 85, 89, 93, 96, 99, 102, 106,
+        109, 34, 34, 33, 34, 35, 37, 39, 41, 42, 45, 47, 49, 51, 54, 58, 60, 63,
+        68, 74, 75, 76, 80, 81, 82, 84, 87, 90, 93, 97, 101, 105, 110, 35, 34,
+        34, 35, 36, 37, 41, 43, 45, 47, 50, 52, 53, 57, 61, 63, 65, 70, 76, 77,
+        79, 82, 84, 86, 89, 91, 92, 93, 96, 100, 103, 107, 36, 35, 34, 35, 36,
+        38, 42, 45, 48, 50, 54, 55, 57, 60, 64, 66, 68, 73, 79, 80, 81, 85, 88,
+        90, 91, 93, 96, 99, 102, 103, 105, 107, 39, 38, 37, 38, 39, 40, 45, 47,
+        50, 54, 58, 59, 61, 65, 69, 71, 73, 78, 84, 85, 86, 91, 92, 92, 95, 98,
+        100, 101, 103, 106, 110, 114, 44, 42, 41, 41, 42, 42, 47, 50, 54, 58,
+        63, 65, 67, 71, 75, 77, 79, 84, 90, 91, 92, 95, 95, 97, 100, 101, 102,
+        105, 109, 111, 112, 114, 46, 44, 42, 43, 44, 44, 49, 52, 55, 59, 65, 67,
+        69, 74, 78, 80, 82, 87, 93, 94, 95, 98, 100, 103, 102, 105, 108, 110,
+        111, 113, 117, 121, 48, 46, 44, 45, 45, 46, 51, 53, 57, 61, 67, 69, 71,
+        76, 80, 83, 85, 90, 96, 97, 99, 103, 107, 105, 108, 111, 111, 113, 117,
+        119, 120, 122, 54, 51, 49, 49, 50, 49, 54, 57, 60, 65, 71, 74, 76, 82,
+        87, 89, 92, 97, 104, 105, 106, 111, 110, 111, 114, 113, 116, 120, 120,
+        121, 125, 130, 59, 56, 54, 54, 54, 53, 58, 61, 64, 69, 75, 78, 80, 87,
+        92, 95, 98, 103, 110, 111, 113, 115, 115, 119, 116, 120, 122, 122, 125,
+        129, 130, 130, 62, 59, 56, 56, 56, 55, 60, 63, 66, 71, 77, 80, 83, 89,
+        95, 98, 101, 107, 114, 115, 117, 119, 123, 121, 125, 126, 125, 129, 131,
+        131, 135, 140, 65, 62, 59, 59, 59, 58, 63, 65, 68, 73, 79, 82, 85, 92,
+        98, 101, 105, 111, 118, 119, 121, 126, 127, 128, 130, 130, 134, 133,
+        135, 140, 140, 140, 71, 68, 65, 64, 64, 63, 68, 70, 73, 78, 84, 87, 90,
+        97, 103, 107, 111, 117, 125, 126, 128, 134, 132, 136, 133, 138, 137,
+        140, 143, 142, 145, 150, 80, 76, 72, 72, 71, 69, 74, 76, 79, 84, 90, 93,
+        96, 104, 110, 114, 118, 125, 134, 135, 137, 139, 140, 139, 143, 142,
+        144, 146, 146, 151, 152, 151, 81, 77, 73, 73, 72, 70, 75, 77, 80, 85,
+        91, 94, 97, 105, 111, 115, 119, 126, 135, 137, 138, 144, 147, 146, 148,
+        149, 151, 150, 156, 155, 157, 163, 83, 78, 75, 74, 74, 72, 76, 79, 81,
+        86, 92, 95, 99, 106, 113, 117, 121, 128, 137, 138, 140, 147, 151, 156,
+        152, 157, 155, 161, 158, 162, 165, 164, 88, 84, 80, 79, 78, 76, 80, 82,
+        85, 91, 95, 98, 103, 111, 115, 119, 126, 134, 139, 144, 147, 152, 154,
+        158, 163, 159, 165, 163, 168, 168, 169, 176, 91, 86, 83, 82, 81, 79, 81,
+        84, 88, 92, 95, 100, 107, 110, 115, 123, 127, 132, 140, 147, 151, 154,
+        159, 161, 166, 171, 169, 173, 173, 176, 179, 177, 94, 89, 86, 85, 84,
+        82, 82, 86, 90, 92, 97, 103, 105, 111, 119, 121, 128, 136, 139, 146,
+        156, 158, 161, 166, 168, 174, 179, 178, 180, 183, 183, 190, 97, 92, 90,
+        88, 86, 85, 84, 89, 91, 95, 100, 102, 108, 114, 116, 125, 130, 133, 143,
+        148, 152, 163, 166, 168, 174, 176, 182, 187, 189, 188, 193, 191, 101,
+        95, 93, 91, 89, 89, 87, 91, 93, 98, 101, 105, 111, 113, 120, 126, 130,
+        138, 142, 149, 157, 159, 171, 174, 176, 183, 184, 191, 195, 199, 197,
+        204, 104, 99, 97, 94, 93, 93, 90, 92, 96, 100, 102, 108, 111, 116, 122,
+        125, 134, 137, 144, 151, 155, 165, 169, 179, 182, 184, 191, 193, 200,
+        204, 210, 206, 107, 102, 101, 97, 96, 96, 93, 93, 99, 101, 105, 110,
+        113, 120, 122, 129, 133, 140, 146, 150, 161, 163, 173, 178, 187, 191,
+        193, 200, 202, 210, 214, 222, 111, 105, 104, 101, 100, 99, 97, 96, 102,
+        103, 109, 111, 117, 120, 125, 131, 135, 143, 146, 156, 158, 168, 173,
+        180, 189, 195, 200, 202, 210, 212, 220, 224, 115, 109, 108, 104, 104,
+        102, 101, 100, 103, 106, 111, 113, 119, 121, 129, 131, 140, 142, 151,
+        155, 162, 168, 176, 183, 188, 199, 204, 210, 212, 220, 222, 230, 119,
+        113, 112, 107, 107, 106, 105, 103, 105, 110, 112, 117, 120, 125, 130,
+        135, 140, 145, 152, 157, 165, 169, 179, 183, 193, 197, 210, 214, 220,
+        222, 231, 232, 123, 116, 116, 111, 111, 109, 110, 107, 107, 114, 114,
+        121, 122, 130, 130, 140, 140, 150, 151, 163, 164, 176, 177, 190, 191,
+        204, 206, 222, 224, 230, 232, 242,
+        /* Size 4x8 */
+        32, 42, 75, 91, 33, 42, 69, 86, 37, 58, 84, 91, 49, 71, 103, 110, 65,
+        84, 125, 128, 80, 97, 142, 152, 91, 100, 145, 178, 104, 112, 146, 190,
+        /* Size 8x4 */
+        32, 33, 37, 49, 65, 80, 91, 104, 42, 42, 58, 71, 84, 97, 100, 112, 75,
+        69, 84, 103, 125, 142, 145, 146, 91, 86, 91, 110, 128, 152, 178, 190,
+        /* Size 8x16 */
+        32, 32, 36, 53, 65, 87, 93, 99, 31, 33, 34, 49, 59, 78, 86, 93, 32, 34,
+        36, 50, 59, 77, 82, 89, 34, 37, 42, 54, 63, 79, 80, 88, 36, 38, 48, 60,
+        68, 84, 86, 90, 44, 43, 53, 71, 79, 95, 94, 97, 48, 46, 56, 76, 85, 102,
+        105, 105, 58, 54, 63, 87, 98, 116, 112, 115, 65, 58, 68, 92, 105, 124,
+        122, 124, 79, 70, 79, 104, 118, 141, 135, 135, 82, 72, 81, 106, 121,
+        144, 149, 146, 91, 80, 88, 106, 130, 148, 162, 159, 97, 86, 94, 107,
+        128, 157, 167, 171, 103, 93, 98, 114, 131, 150, 174, 186, 110, 100, 101,
+        117, 138, 161, 183, 193, 118, 107, 105, 118, 136, 157, 182, 203,
+        /* Size 16x8 */
+        32, 31, 32, 34, 36, 44, 48, 58, 65, 79, 82, 91, 97, 103, 110, 118, 32,
+        33, 34, 37, 38, 43, 46, 54, 58, 70, 72, 80, 86, 93, 100, 107, 36, 34,
+        36, 42, 48, 53, 56, 63, 68, 79, 81, 88, 94, 98, 101, 105, 53, 49, 50,
+        54, 60, 71, 76, 87, 92, 104, 106, 106, 107, 114, 117, 118, 65, 59, 59,
+        63, 68, 79, 85, 98, 105, 118, 121, 130, 128, 131, 138, 136, 87, 78, 77,
+        79, 84, 95, 102, 116, 124, 141, 144, 148, 157, 150, 161, 157, 93, 86,
+        82, 80, 86, 94, 105, 112, 122, 135, 149, 162, 167, 174, 183, 182, 99,
+        93, 89, 88, 90, 97, 105, 115, 124, 135, 146, 159, 171, 186, 193, 203,
+        /* Size 16x32 */
+        32, 31, 32, 34, 36, 44, 53, 59, 65, 79, 87, 90, 93, 96, 99, 102, 31, 32,
+        32, 34, 35, 42, 51, 56, 62, 75, 82, 85, 88, 91, 94, 97, 31, 32, 33, 33,
+        34, 41, 49, 54, 59, 72, 78, 82, 86, 90, 93, 97, 31, 32, 33, 34, 35, 41,
+        49, 54, 59, 71, 78, 81, 84, 87, 90, 93, 32, 32, 34, 35, 36, 42, 50, 54,
+        59, 71, 77, 80, 82, 86, 89, 93, 32, 33, 35, 37, 38, 42, 49, 53, 58, 69,
+        75, 78, 82, 86, 89, 92, 34, 34, 37, 39, 42, 48, 54, 58, 63, 73, 79, 78,
+        80, 83, 88, 92, 35, 34, 37, 41, 45, 50, 57, 61, 65, 76, 82, 83, 84, 84,
+        87, 90, 36, 34, 38, 43, 48, 54, 60, 64, 68, 78, 84, 87, 86, 89, 90, 90,
+        39, 37, 40, 45, 50, 58, 65, 69, 73, 84, 89, 89, 91, 91, 93, 96, 44, 41,
+        43, 48, 53, 63, 71, 75, 79, 90, 95, 93, 94, 95, 97, 97, 46, 43, 44, 49,
+        55, 65, 73, 78, 82, 93, 98, 100, 98, 100, 99, 103, 48, 45, 46, 51, 56,
+        67, 76, 80, 85, 96, 102, 102, 105, 102, 105, 104, 53, 49, 50, 54, 60,
+        71, 82, 87, 92, 103, 109, 107, 107, 110, 107, 111, 58, 54, 54, 58, 63,
+        75, 87, 92, 98, 110, 116, 115, 112, 111, 115, 112, 61, 57, 56, 60, 66,
+        77, 89, 95, 101, 114, 120, 118, 119, 118, 116, 120, 65, 60, 58, 63, 68,
+        79, 92, 98, 105, 118, 124, 123, 122, 123, 124, 121, 71, 65, 63, 68, 73,
+        84, 97, 103, 111, 125, 132, 132, 130, 128, 127, 130, 79, 72, 70, 74, 79,
+        90, 104, 110, 118, 133, 141, 136, 135, 135, 135, 131, 81, 74, 71, 75,
+        80, 91, 105, 112, 119, 135, 142, 140, 140, 138, 139, 142, 82, 75, 72,
+        76, 81, 92, 106, 113, 121, 136, 144, 151, 149, 149, 146, 143, 88, 80,
+        77, 80, 85, 97, 108, 115, 126, 142, 149, 153, 153, 152, 152, 154, 91,
+        83, 80, 81, 88, 100, 106, 114, 130, 142, 148, 155, 162, 160, 159, 155,
+        94, 85, 83, 82, 91, 100, 105, 118, 131, 137, 153, 160, 165, 167, 166,
+        168, 97, 88, 86, 85, 94, 100, 107, 123, 128, 140, 157, 161, 167, 173,
+        171, 169, 100, 91, 89, 87, 97, 100, 111, 121, 127, 145, 152, 164, 173,
+        178, 182, 181, 103, 94, 93, 90, 98, 101, 114, 120, 131, 144, 150, 170,
+        174, 180, 186, 183, 107, 97, 96, 93, 100, 104, 117, 119, 136, 142, 155,
+        168, 177, 187, 191, 198, 110, 101, 100, 97, 101, 108, 117, 123, 138,
+        141, 161, 165, 183, 188, 193, 200, 114, 104, 104, 100, 103, 112, 117,
+        127, 137, 146, 159, 167, 185, 190, 201, 206, 118, 108, 107, 103, 105,
+        115, 118, 131, 136, 151, 157, 172, 182, 197, 203, 208, 122, 111, 111,
+        107, 107, 119, 119, 136, 136, 156, 156, 178, 179, 203, 204, 217,
+        /* Size 32x16 */
+        32, 31, 31, 31, 32, 32, 34, 35, 36, 39, 44, 46, 48, 53, 58, 61, 65, 71,
+        79, 81, 82, 88, 91, 94, 97, 100, 103, 107, 110, 114, 118, 122, 31, 32,
+        32, 32, 32, 33, 34, 34, 34, 37, 41, 43, 45, 49, 54, 57, 60, 65, 72, 74,
+        75, 80, 83, 85, 88, 91, 94, 97, 101, 104, 108, 111, 32, 32, 33, 33, 34,
+        35, 37, 37, 38, 40, 43, 44, 46, 50, 54, 56, 58, 63, 70, 71, 72, 77, 80,
+        83, 86, 89, 93, 96, 100, 104, 107, 111, 34, 34, 33, 34, 35, 37, 39, 41,
+        43, 45, 48, 49, 51, 54, 58, 60, 63, 68, 74, 75, 76, 80, 81, 82, 85, 87,
+        90, 93, 97, 100, 103, 107, 36, 35, 34, 35, 36, 38, 42, 45, 48, 50, 53,
+        55, 56, 60, 63, 66, 68, 73, 79, 80, 81, 85, 88, 91, 94, 97, 98, 100,
+        101, 103, 105, 107, 44, 42, 41, 41, 42, 42, 48, 50, 54, 58, 63, 65, 67,
+        71, 75, 77, 79, 84, 90, 91, 92, 97, 100, 100, 100, 100, 101, 104, 108,
+        112, 115, 119, 53, 51, 49, 49, 50, 49, 54, 57, 60, 65, 71, 73, 76, 82,
+        87, 89, 92, 97, 104, 105, 106, 108, 106, 105, 107, 111, 114, 117, 117,
+        117, 118, 119, 59, 56, 54, 54, 54, 53, 58, 61, 64, 69, 75, 78, 80, 87,
+        92, 95, 98, 103, 110, 112, 113, 115, 114, 118, 123, 121, 120, 119, 123,
+        127, 131, 136, 65, 62, 59, 59, 59, 58, 63, 65, 68, 73, 79, 82, 85, 92,
+        98, 101, 105, 111, 118, 119, 121, 126, 130, 131, 128, 127, 131, 136,
+        138, 137, 136, 136, 79, 75, 72, 71, 71, 69, 73, 76, 78, 84, 90, 93, 96,
+        103, 110, 114, 118, 125, 133, 135, 136, 142, 142, 137, 140, 145, 144,
+        142, 141, 146, 151, 156, 87, 82, 78, 78, 77, 75, 79, 82, 84, 89, 95, 98,
+        102, 109, 116, 120, 124, 132, 141, 142, 144, 149, 148, 153, 157, 152,
+        150, 155, 161, 159, 157, 156, 90, 85, 82, 81, 80, 78, 78, 83, 87, 89,
+        93, 100, 102, 107, 115, 118, 123, 132, 136, 140, 151, 153, 155, 160,
+        161, 164, 170, 168, 165, 167, 172, 178, 93, 88, 86, 84, 82, 82, 80, 84,
+        86, 91, 94, 98, 105, 107, 112, 119, 122, 130, 135, 140, 149, 153, 162,
+        165, 167, 173, 174, 177, 183, 185, 182, 179, 96, 91, 90, 87, 86, 86, 83,
+        84, 89, 91, 95, 100, 102, 110, 111, 118, 123, 128, 135, 138, 149, 152,
+        160, 167, 173, 178, 180, 187, 188, 190, 197, 203, 99, 94, 93, 90, 89,
+        89, 88, 87, 90, 93, 97, 99, 105, 107, 115, 116, 124, 127, 135, 139, 146,
+        152, 159, 166, 171, 182, 186, 191, 193, 201, 203, 204, 102, 97, 97, 93,
+        93, 92, 92, 90, 90, 96, 97, 103, 104, 111, 112, 120, 121, 130, 131, 142,
+        143, 154, 155, 168, 169, 181, 183, 198, 200, 206, 208, 217,
+        /* Size 4x16 */
+        31, 44, 79, 96, 32, 41, 72, 90, 32, 42, 71, 86, 34, 48, 73, 83, 34, 54,
+        78, 89, 41, 63, 90, 95, 45, 67, 96, 102, 54, 75, 110, 111, 60, 79, 118,
+        123, 72, 90, 133, 135, 75, 92, 136, 149, 83, 100, 142, 160, 88, 100,
+        140, 173, 94, 101, 144, 180, 101, 108, 141, 188, 108, 115, 151, 197,
+        /* Size 16x4 */
+        31, 32, 32, 34, 34, 41, 45, 54, 60, 72, 75, 83, 88, 94, 101, 108, 44,
+        41, 42, 48, 54, 63, 67, 75, 79, 90, 92, 100, 100, 101, 108, 115, 79, 72,
+        71, 73, 78, 90, 96, 110, 118, 133, 136, 142, 140, 144, 141, 151, 96, 90,
+        86, 83, 89, 95, 102, 111, 123, 135, 149, 160, 173, 180, 188, 197,
+        /* Size 8x32 */
+        32, 32, 36, 53, 65, 87, 93, 99, 31, 32, 35, 51, 62, 82, 88, 94, 31, 33,
+        34, 49, 59, 78, 86, 93, 31, 33, 35, 49, 59, 78, 84, 90, 32, 34, 36, 50,
+        59, 77, 82, 89, 32, 35, 38, 49, 58, 75, 82, 89, 34, 37, 42, 54, 63, 79,
+        80, 88, 35, 37, 45, 57, 65, 82, 84, 87, 36, 38, 48, 60, 68, 84, 86, 90,
+        39, 40, 50, 65, 73, 89, 91, 93, 44, 43, 53, 71, 79, 95, 94, 97, 46, 44,
+        55, 73, 82, 98, 98, 99, 48, 46, 56, 76, 85, 102, 105, 105, 53, 50, 60,
+        82, 92, 109, 107, 107, 58, 54, 63, 87, 98, 116, 112, 115, 61, 56, 66,
+        89, 101, 120, 119, 116, 65, 58, 68, 92, 105, 124, 122, 124, 71, 63, 73,
+        97, 111, 132, 130, 127, 79, 70, 79, 104, 118, 141, 135, 135, 81, 71, 80,
+        105, 119, 142, 140, 139, 82, 72, 81, 106, 121, 144, 149, 146, 88, 77,
+        85, 108, 126, 149, 153, 152, 91, 80, 88, 106, 130, 148, 162, 159, 94,
+        83, 91, 105, 131, 153, 165, 166, 97, 86, 94, 107, 128, 157, 167, 171,
+        100, 89, 97, 111, 127, 152, 173, 182, 103, 93, 98, 114, 131, 150, 174,
+        186, 107, 96, 100, 117, 136, 155, 177, 191, 110, 100, 101, 117, 138,
+        161, 183, 193, 114, 104, 103, 117, 137, 159, 185, 201, 118, 107, 105,
+        118, 136, 157, 182, 203, 122, 111, 107, 119, 136, 156, 179, 204,
+        /* Size 32x8 */
+        32, 31, 31, 31, 32, 32, 34, 35, 36, 39, 44, 46, 48, 53, 58, 61, 65, 71,
+        79, 81, 82, 88, 91, 94, 97, 100, 103, 107, 110, 114, 118, 122, 32, 32,
+        33, 33, 34, 35, 37, 37, 38, 40, 43, 44, 46, 50, 54, 56, 58, 63, 70, 71,
+        72, 77, 80, 83, 86, 89, 93, 96, 100, 104, 107, 111, 36, 35, 34, 35, 36,
+        38, 42, 45, 48, 50, 53, 55, 56, 60, 63, 66, 68, 73, 79, 80, 81, 85, 88,
+        91, 94, 97, 98, 100, 101, 103, 105, 107, 53, 51, 49, 49, 50, 49, 54, 57,
+        60, 65, 71, 73, 76, 82, 87, 89, 92, 97, 104, 105, 106, 108, 106, 105,
+        107, 111, 114, 117, 117, 117, 118, 119, 65, 62, 59, 59, 59, 58, 63, 65,
+        68, 73, 79, 82, 85, 92, 98, 101, 105, 111, 118, 119, 121, 126, 130, 131,
+        128, 127, 131, 136, 138, 137, 136, 136, 87, 82, 78, 78, 77, 75, 79, 82,
+        84, 89, 95, 98, 102, 109, 116, 120, 124, 132, 141, 142, 144, 149, 148,
+        153, 157, 152, 150, 155, 161, 159, 157, 156, 93, 88, 86, 84, 82, 82, 80,
+        84, 86, 91, 94, 98, 105, 107, 112, 119, 122, 130, 135, 140, 149, 153,
+        162, 165, 167, 173, 174, 177, 183, 185, 182, 179, 99, 94, 93, 90, 89,
+        89, 88, 87, 90, 93, 97, 99, 105, 107, 115, 116, 124, 127, 135, 139, 146,
+        152, 159, 166, 171, 182, 186, 191, 193, 201, 203, 204 },
+      { /* Chroma */
+        /* Size 4x4 */
+        35, 46, 57, 66, 46, 60, 69, 71, 57, 69, 90, 90, 66, 71, 90, 109,
+        /* Size 8x8 */
+        31, 38, 47, 50, 57, 63, 67, 71, 38, 47, 46, 47, 52, 57, 62, 67, 47, 46,
+        54, 57, 61, 66, 67, 68, 50, 47, 57, 66, 72, 77, 75, 75, 57, 52, 61, 72,
+        82, 88, 86, 84, 63, 57, 66, 77, 88, 96, 95, 95, 67, 62, 67, 75, 86, 95,
+        104, 107, 71, 67, 68, 75, 84, 95, 107, 113,
+        /* Size 16x16 */
+        32, 30, 33, 41, 49, 49, 50, 54, 57, 63, 65, 68, 70, 72, 74, 76, 30, 32,
+        35, 42, 46, 45, 46, 49, 52, 57, 58, 62, 64, 67, 70, 72, 33, 35, 39, 45,
+        47, 45, 46, 49, 51, 56, 57, 60, 62, 64, 66, 69, 41, 42, 45, 48, 50, 49,
+        50, 52, 53, 57, 58, 59, 60, 61, 64, 67, 49, 46, 47, 50, 53, 53, 54, 55,
+        56, 60, 61, 64, 64, 65, 66, 66, 49, 45, 45, 49, 53, 58, 60, 62, 63, 67,
+        68, 67, 69, 68, 70, 70, 50, 46, 46, 50, 54, 60, 61, 65, 67, 71, 71, 74,
+        73, 73, 74, 74, 54, 49, 49, 52, 55, 62, 65, 71, 73, 78, 79, 78, 77, 78,
+        78, 78, 57, 52, 51, 53, 56, 63, 67, 73, 76, 82, 83, 84, 84, 84, 82, 83,
+        63, 57, 56, 57, 60, 67, 71, 78, 82, 89, 90, 90, 89, 88, 87, 88, 65, 58,
+        57, 58, 61, 68, 71, 79, 83, 90, 91, 94, 93, 93, 92, 93, 68, 62, 60, 59,
+        64, 67, 74, 78, 84, 90, 94, 98, 99, 98, 98, 98, 70, 64, 62, 60, 64, 69,
+        73, 77, 84, 89, 93, 99, 102, 103, 104, 104, 72, 67, 64, 61, 65, 68, 73,
+        78, 84, 88, 93, 98, 103, 106, 108, 109, 74, 70, 66, 64, 66, 70, 74, 78,
+        82, 87, 92, 98, 104, 108, 111, 112, 76, 72, 69, 67, 66, 70, 74, 78, 83,
+        88, 93, 98, 104, 109, 112, 116,
+        /* Size 32x32 */
+        32, 31, 30, 32, 33, 36, 41, 45, 49, 48, 49, 50, 50, 52, 54, 56, 57, 60,
+        63, 64, 65, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 78, 31, 31, 31, 33,
+        34, 38, 42, 45, 47, 47, 47, 47, 48, 50, 52, 53, 54, 57, 60, 61, 61, 63,
+        64, 65, 66, 67, 68, 69, 70, 71, 72, 74, 30, 31, 32, 33, 35, 40, 42, 44,
+        46, 45, 45, 45, 46, 47, 49, 51, 52, 54, 57, 58, 58, 61, 62, 63, 64, 66,
+        67, 68, 70, 71, 72, 74, 32, 33, 33, 35, 37, 41, 43, 45, 47, 46, 45, 46,
+        46, 47, 49, 50, 51, 54, 57, 57, 58, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+        69, 70, 33, 34, 35, 37, 39, 43, 45, 46, 47, 46, 45, 46, 46, 47, 49, 50,
+        51, 53, 56, 57, 57, 59, 60, 61, 62, 63, 64, 65, 66, 68, 69, 70, 36, 38,
+        40, 41, 43, 47, 47, 47, 48, 46, 45, 46, 46, 47, 48, 49, 50, 52, 54, 55,
+        55, 57, 58, 59, 61, 62, 64, 65, 66, 67, 68, 69, 41, 42, 42, 43, 45, 47,
+        48, 49, 50, 49, 49, 49, 50, 50, 52, 52, 53, 55, 57, 58, 58, 60, 59, 59,
+        60, 61, 61, 63, 64, 66, 67, 69, 45, 45, 44, 45, 46, 47, 49, 50, 51, 51,
+        51, 51, 52, 52, 53, 54, 55, 57, 59, 59, 60, 61, 61, 62, 63, 63, 63, 63,
+        63, 64, 65, 66, 49, 47, 46, 47, 47, 48, 50, 51, 53, 53, 53, 54, 54, 54,
+        55, 56, 56, 58, 60, 61, 61, 63, 64, 64, 64, 64, 65, 66, 66, 66, 66, 66,
+        48, 47, 45, 46, 46, 46, 49, 51, 53, 54, 55, 56, 56, 57, 58, 59, 60, 61,
+        63, 64, 64, 66, 66, 65, 66, 67, 67, 67, 67, 68, 69, 70, 49, 47, 45, 45,
+        45, 45, 49, 51, 53, 55, 58, 59, 60, 61, 62, 63, 63, 65, 67, 67, 68, 69,
+        67, 68, 69, 68, 68, 69, 70, 70, 70, 70, 50, 47, 45, 46, 46, 46, 49, 51,
+        54, 56, 59, 60, 60, 62, 64, 64, 65, 67, 69, 69, 70, 70, 71, 71, 70, 70,
+        71, 71, 71, 71, 72, 74, 50, 48, 46, 46, 46, 46, 50, 52, 54, 56, 60, 60,
+        61, 63, 65, 66, 67, 68, 71, 71, 71, 73, 74, 72, 73, 74, 73, 73, 74, 74,
+        74, 74, 52, 50, 47, 47, 47, 47, 50, 52, 54, 57, 61, 62, 63, 66, 68, 69,
+        70, 72, 75, 75, 75, 77, 75, 75, 76, 75, 75, 76, 75, 75, 76, 77, 54, 52,
+        49, 49, 49, 48, 52, 53, 55, 58, 62, 64, 65, 68, 71, 72, 73, 75, 78, 78,
+        79, 79, 78, 79, 77, 78, 78, 77, 78, 79, 78, 78, 56, 53, 51, 50, 50, 49,
+        52, 54, 56, 59, 63, 64, 66, 69, 72, 73, 75, 77, 80, 80, 81, 81, 82, 80,
+        81, 81, 79, 81, 80, 79, 81, 82, 57, 54, 52, 51, 51, 50, 53, 55, 56, 60,
+        63, 65, 67, 70, 73, 75, 76, 79, 82, 82, 83, 85, 84, 83, 84, 83, 84, 82,
+        82, 84, 83, 82, 60, 57, 54, 54, 53, 52, 55, 57, 58, 61, 65, 67, 68, 72,
+        75, 77, 79, 82, 85, 85, 86, 88, 86, 87, 85, 86, 85, 85, 86, 84, 85, 86,
+        63, 60, 57, 57, 56, 54, 57, 59, 60, 63, 67, 69, 71, 75, 78, 80, 82, 85,
+        89, 89, 90, 90, 90, 89, 89, 88, 88, 88, 87, 88, 88, 87, 64, 61, 58, 57,
+        57, 55, 58, 59, 61, 64, 67, 69, 71, 75, 78, 80, 82, 85, 89, 90, 91, 92,
+        93, 92, 92, 91, 91, 90, 91, 90, 90, 92, 65, 61, 58, 58, 57, 55, 58, 60,
+        61, 64, 68, 70, 71, 75, 79, 81, 83, 86, 90, 91, 91, 94, 94, 96, 93, 94,
+        93, 94, 92, 93, 93, 92, 67, 63, 61, 60, 59, 57, 60, 61, 63, 66, 69, 70,
+        73, 77, 79, 81, 85, 88, 90, 92, 94, 96, 96, 97, 98, 95, 97, 95, 96, 95,
+        95, 96, 68, 64, 62, 61, 60, 58, 59, 61, 64, 66, 67, 71, 74, 75, 78, 82,
+        84, 86, 90, 93, 94, 96, 98, 98, 99, 100, 98, 99, 98, 98, 98, 97, 69, 65,
+        63, 62, 61, 59, 59, 62, 64, 65, 68, 71, 72, 75, 79, 80, 83, 87, 89, 92,
+        96, 97, 98, 100, 100, 101, 102, 101, 101, 101, 100, 102, 70, 66, 64, 63,
+        62, 61, 60, 63, 64, 66, 69, 70, 73, 76, 77, 81, 84, 85, 89, 92, 93, 98,
+        99, 100, 102, 102, 103, 104, 104, 103, 104, 102, 71, 67, 66, 64, 63, 62,
+        61, 63, 64, 67, 68, 70, 74, 75, 78, 81, 83, 86, 88, 91, 94, 95, 100,
+        101, 102, 104, 104, 105, 106, 107, 105, 107, 72, 68, 67, 65, 64, 64, 61,
+        63, 65, 67, 68, 71, 73, 75, 78, 79, 84, 85, 88, 91, 93, 97, 98, 102,
+        103, 104, 106, 106, 108, 108, 109, 107, 73, 69, 68, 66, 65, 65, 63, 63,
+        66, 67, 69, 71, 73, 76, 77, 81, 82, 85, 88, 90, 94, 95, 99, 101, 104,
+        105, 106, 109, 108, 110, 111, 112, 74, 70, 70, 67, 66, 66, 64, 63, 66,
+        67, 70, 71, 74, 75, 78, 80, 82, 86, 87, 91, 92, 96, 98, 101, 104, 106,
+        108, 108, 111, 111, 112, 113, 75, 71, 71, 68, 68, 67, 66, 64, 66, 68,
+        70, 71, 74, 75, 79, 79, 84, 84, 88, 90, 93, 95, 98, 101, 103, 107, 108,
+        110, 111, 113, 113, 115, 76, 72, 72, 69, 69, 68, 67, 65, 66, 69, 70, 72,
+        74, 76, 78, 81, 83, 85, 88, 90, 93, 95, 98, 100, 104, 105, 109, 111,
+        112, 113, 116, 115, 78, 74, 74, 70, 70, 69, 69, 66, 66, 70, 70, 74, 74,
+        77, 78, 82, 82, 86, 87, 92, 92, 96, 97, 102, 102, 107, 107, 112, 113,
+        115, 115, 118,
+        /* Size 4x8 */
+        31, 47, 60, 66, 40, 45, 54, 61, 46, 56, 64, 64, 48, 61, 75, 73, 54, 65,
+        85, 82, 61, 69, 92, 92, 64, 68, 90, 102, 68, 71, 87, 105,
+        /* Size 8x4 */
+        31, 40, 46, 48, 54, 61, 64, 68, 47, 45, 56, 61, 65, 69, 68, 71, 60, 54,
+        64, 75, 85, 92, 90, 87, 66, 61, 64, 73, 82, 92, 102, 105,
+        /* Size 8x16 */
+        32, 37, 48, 52, 57, 66, 68, 71, 30, 40, 46, 48, 52, 60, 63, 66, 33, 43,
+        47, 47, 51, 59, 60, 63, 42, 47, 50, 50, 53, 60, 59, 62, 49, 48, 53, 54,
+        57, 62, 62, 62, 49, 46, 53, 61, 64, 69, 66, 66, 50, 46, 54, 64, 67, 73,
+        72, 70, 54, 49, 55, 68, 73, 80, 76, 75, 57, 50, 56, 70, 76, 84, 80, 79,
+        63, 55, 60, 75, 82, 92, 87, 84, 64, 56, 61, 75, 83, 93, 93, 89, 68, 59,
+        64, 74, 86, 94, 98, 94, 70, 62, 66, 73, 83, 96, 99, 98, 72, 64, 66, 75,
+        83, 92, 101, 104, 74, 67, 66, 74, 84, 94, 103, 106, 76, 69, 67, 73, 82,
+        91, 101, 109,
+        /* Size 16x8 */
+        32, 30, 33, 42, 49, 49, 50, 54, 57, 63, 64, 68, 70, 72, 74, 76, 37, 40,
+        43, 47, 48, 46, 46, 49, 50, 55, 56, 59, 62, 64, 67, 69, 48, 46, 47, 50,
+        53, 53, 54, 55, 56, 60, 61, 64, 66, 66, 66, 67, 52, 48, 47, 50, 54, 61,
+        64, 68, 70, 75, 75, 74, 73, 75, 74, 73, 57, 52, 51, 53, 57, 64, 67, 73,
+        76, 82, 83, 86, 83, 83, 84, 82, 66, 60, 59, 60, 62, 69, 73, 80, 84, 92,
+        93, 94, 96, 92, 94, 91, 68, 63, 60, 59, 62, 66, 72, 76, 80, 87, 93, 98,
+        99, 101, 103, 101, 71, 66, 63, 62, 62, 66, 70, 75, 79, 84, 89, 94, 98,
+        104, 106, 109,
+        /* Size 16x32 */
+        32, 31, 37, 42, 48, 49, 52, 54, 57, 63, 66, 67, 68, 69, 71, 72, 31, 31,
+        38, 42, 47, 47, 50, 52, 54, 60, 63, 64, 65, 66, 67, 68, 30, 32, 40, 42,
+        46, 45, 48, 50, 52, 57, 60, 62, 63, 65, 66, 68, 32, 34, 41, 44, 46, 45,
+        48, 49, 51, 57, 59, 61, 62, 63, 64, 65, 33, 36, 43, 45, 47, 46, 47, 49,
+        51, 56, 59, 60, 60, 62, 63, 65, 37, 40, 47, 47, 47, 45, 47, 48, 50, 54,
+        57, 58, 60, 61, 62, 63, 42, 43, 47, 48, 50, 49, 50, 52, 53, 57, 60, 58,
+        59, 60, 62, 63, 45, 44, 47, 49, 51, 51, 52, 54, 55, 59, 61, 61, 61, 60,
+        61, 61, 49, 46, 48, 50, 53, 53, 54, 55, 57, 60, 62, 63, 62, 63, 62, 62,
+        48, 46, 47, 50, 53, 56, 57, 59, 60, 64, 66, 65, 65, 64, 64, 65, 49, 45,
+        46, 49, 53, 58, 61, 62, 64, 67, 69, 67, 66, 66, 66, 65, 49, 46, 46, 49,
+        53, 59, 62, 64, 65, 69, 71, 70, 68, 68, 67, 68, 50, 46, 46, 50, 54, 59,
+        64, 65, 67, 71, 73, 72, 72, 70, 70, 69, 52, 48, 47, 50, 54, 61, 66, 68,
+        71, 75, 77, 74, 73, 73, 71, 72, 54, 50, 49, 52, 55, 62, 68, 71, 73, 78,
+        80, 78, 76, 74, 75, 73, 55, 51, 49, 52, 56, 63, 69, 72, 75, 80, 82, 80,
+        79, 78, 76, 77, 57, 52, 50, 53, 56, 64, 70, 73, 76, 82, 84, 82, 80, 80,
+        79, 77, 60, 54, 52, 55, 58, 65, 72, 75, 79, 85, 88, 86, 84, 82, 81, 81,
+        63, 57, 55, 58, 60, 67, 75, 78, 82, 89, 92, 88, 87, 85, 84, 81, 64, 58,
+        55, 58, 61, 68, 75, 78, 82, 89, 92, 90, 89, 87, 86, 86, 64, 59, 56, 58,
+        61, 68, 75, 79, 83, 90, 93, 95, 93, 91, 89, 87, 67, 61, 58, 60, 63, 69,
+        76, 79, 85, 92, 95, 96, 94, 92, 91, 91, 68, 62, 59, 60, 64, 71, 74, 78,
+        86, 91, 94, 96, 98, 96, 94, 91, 69, 62, 60, 60, 65, 70, 72, 79, 85, 88,
+        95, 98, 99, 98, 97, 96, 70, 63, 62, 60, 66, 69, 73, 81, 83, 89, 96, 97,
+        99, 101, 98, 97, 71, 64, 63, 61, 67, 68, 74, 79, 82, 90, 93, 98, 102,
+        102, 102, 101, 72, 65, 64, 62, 66, 68, 75, 78, 83, 89, 92, 100, 101,
+        103, 104, 102, 73, 66, 65, 63, 66, 69, 75, 76, 84, 87, 93, 98, 102, 105,
+        106, 107, 74, 67, 67, 64, 66, 70, 74, 77, 84, 86, 94, 96, 103, 105, 106,
+        107, 75, 68, 68, 65, 66, 71, 74, 78, 83, 87, 93, 96, 103, 105, 109, 109,
+        76, 69, 69, 66, 67, 72, 73, 80, 82, 88, 91, 97, 101, 107, 109, 110, 77,
+        70, 70, 67, 67, 73, 73, 81, 81, 90, 90, 99, 99, 108, 108, 113,
+        /* Size 32x16 */
+        32, 31, 30, 32, 33, 37, 42, 45, 49, 48, 49, 49, 50, 52, 54, 55, 57, 60,
+        63, 64, 64, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 31, 31, 32, 34,
+        36, 40, 43, 44, 46, 46, 45, 46, 46, 48, 50, 51, 52, 54, 57, 58, 59, 61,
+        62, 62, 63, 64, 65, 66, 67, 68, 69, 70, 37, 38, 40, 41, 43, 47, 47, 47,
+        48, 47, 46, 46, 46, 47, 49, 49, 50, 52, 55, 55, 56, 58, 59, 60, 62, 63,
+        64, 65, 67, 68, 69, 70, 42, 42, 42, 44, 45, 47, 48, 49, 50, 50, 49, 49,
+        50, 50, 52, 52, 53, 55, 58, 58, 58, 60, 60, 60, 60, 61, 62, 63, 64, 65,
+        66, 67, 48, 47, 46, 46, 47, 47, 50, 51, 53, 53, 53, 53, 54, 54, 55, 56,
+        56, 58, 60, 61, 61, 63, 64, 65, 66, 67, 66, 66, 66, 66, 67, 67, 49, 47,
+        45, 45, 46, 45, 49, 51, 53, 56, 58, 59, 59, 61, 62, 63, 64, 65, 67, 68,
+        68, 69, 71, 70, 69, 68, 68, 69, 70, 71, 72, 73, 52, 50, 48, 48, 47, 47,
+        50, 52, 54, 57, 61, 62, 64, 66, 68, 69, 70, 72, 75, 75, 75, 76, 74, 72,
+        73, 74, 75, 75, 74, 74, 73, 73, 54, 52, 50, 49, 49, 48, 52, 54, 55, 59,
+        62, 64, 65, 68, 71, 72, 73, 75, 78, 78, 79, 79, 78, 79, 81, 79, 78, 76,
+        77, 78, 80, 81, 57, 54, 52, 51, 51, 50, 53, 55, 57, 60, 64, 65, 67, 71,
+        73, 75, 76, 79, 82, 82, 83, 85, 86, 85, 83, 82, 83, 84, 84, 83, 82, 81,
+        63, 60, 57, 57, 56, 54, 57, 59, 60, 64, 67, 69, 71, 75, 78, 80, 82, 85,
+        89, 89, 90, 92, 91, 88, 89, 90, 89, 87, 86, 87, 88, 90, 66, 63, 60, 59,
+        59, 57, 60, 61, 62, 66, 69, 71, 73, 77, 80, 82, 84, 88, 92, 92, 93, 95,
+        94, 95, 96, 93, 92, 93, 94, 93, 91, 90, 67, 64, 62, 61, 60, 58, 58, 61,
+        63, 65, 67, 70, 72, 74, 78, 80, 82, 86, 88, 90, 95, 96, 96, 98, 97, 98,
+        100, 98, 96, 96, 97, 99, 68, 65, 63, 62, 60, 60, 59, 61, 62, 65, 66, 68,
+        72, 73, 76, 79, 80, 84, 87, 89, 93, 94, 98, 99, 99, 102, 101, 102, 103,
+        103, 101, 99, 69, 66, 65, 63, 62, 61, 60, 60, 63, 64, 66, 68, 70, 73,
+        74, 78, 80, 82, 85, 87, 91, 92, 96, 98, 101, 102, 103, 105, 105, 105,
+        107, 108, 71, 67, 66, 64, 63, 62, 62, 61, 62, 64, 66, 67, 70, 71, 75,
+        76, 79, 81, 84, 86, 89, 91, 94, 97, 98, 102, 104, 106, 106, 109, 109,
+        108, 72, 68, 68, 65, 65, 63, 63, 61, 62, 65, 65, 68, 69, 72, 73, 77, 77,
+        81, 81, 86, 87, 91, 91, 96, 97, 101, 102, 107, 107, 109, 110, 113,
+        /* Size 4x16 */
+        31, 49, 63, 69, 32, 45, 57, 65, 36, 46, 56, 62, 43, 49, 57, 60, 46, 53,
+        60, 63, 45, 58, 67, 66, 46, 59, 71, 70, 50, 62, 78, 74, 52, 64, 82, 80,
+        57, 67, 89, 85, 59, 68, 90, 91, 62, 71, 91, 96, 63, 69, 89, 101, 65, 68,
+        89, 103, 67, 70, 86, 105, 69, 72, 88, 107,
+        /* Size 16x4 */
+        31, 32, 36, 43, 46, 45, 46, 50, 52, 57, 59, 62, 63, 65, 67, 69, 49, 45,
+        46, 49, 53, 58, 59, 62, 64, 67, 68, 71, 69, 68, 70, 72, 63, 57, 56, 57,
+        60, 67, 71, 78, 82, 89, 90, 91, 89, 89, 86, 88, 69, 65, 62, 60, 63, 66,
+        70, 74, 80, 85, 91, 96, 101, 103, 105, 107,
+        /* Size 8x32 */
+        32, 37, 48, 52, 57, 66, 68, 71, 31, 38, 47, 50, 54, 63, 65, 67, 30, 40,
+        46, 48, 52, 60, 63, 66, 32, 41, 46, 48, 51, 59, 62, 64, 33, 43, 47, 47,
+        51, 59, 60, 63, 37, 47, 47, 47, 50, 57, 60, 62, 42, 47, 50, 50, 53, 60,
+        59, 62, 45, 47, 51, 52, 55, 61, 61, 61, 49, 48, 53, 54, 57, 62, 62, 62,
+        48, 47, 53, 57, 60, 66, 65, 64, 49, 46, 53, 61, 64, 69, 66, 66, 49, 46,
+        53, 62, 65, 71, 68, 67, 50, 46, 54, 64, 67, 73, 72, 70, 52, 47, 54, 66,
+        71, 77, 73, 71, 54, 49, 55, 68, 73, 80, 76, 75, 55, 49, 56, 69, 75, 82,
+        79, 76, 57, 50, 56, 70, 76, 84, 80, 79, 60, 52, 58, 72, 79, 88, 84, 81,
+        63, 55, 60, 75, 82, 92, 87, 84, 64, 55, 61, 75, 82, 92, 89, 86, 64, 56,
+        61, 75, 83, 93, 93, 89, 67, 58, 63, 76, 85, 95, 94, 91, 68, 59, 64, 74,
+        86, 94, 98, 94, 69, 60, 65, 72, 85, 95, 99, 97, 70, 62, 66, 73, 83, 96,
+        99, 98, 71, 63, 67, 74, 82, 93, 102, 102, 72, 64, 66, 75, 83, 92, 101,
+        104, 73, 65, 66, 75, 84, 93, 102, 106, 74, 67, 66, 74, 84, 94, 103, 106,
+        75, 68, 66, 74, 83, 93, 103, 109, 76, 69, 67, 73, 82, 91, 101, 109, 77,
+        70, 67, 73, 81, 90, 99, 108,
+        /* Size 32x8 */
+        32, 31, 30, 32, 33, 37, 42, 45, 49, 48, 49, 49, 50, 52, 54, 55, 57, 60,
+        63, 64, 64, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 37, 38, 40, 41,
+        43, 47, 47, 47, 48, 47, 46, 46, 46, 47, 49, 49, 50, 52, 55, 55, 56, 58,
+        59, 60, 62, 63, 64, 65, 67, 68, 69, 70, 48, 47, 46, 46, 47, 47, 50, 51,
+        53, 53, 53, 53, 54, 54, 55, 56, 56, 58, 60, 61, 61, 63, 64, 65, 66, 67,
+        66, 66, 66, 66, 67, 67, 52, 50, 48, 48, 47, 47, 50, 52, 54, 57, 61, 62,
+        64, 66, 68, 69, 70, 72, 75, 75, 75, 76, 74, 72, 73, 74, 75, 75, 74, 74,
+        73, 73, 57, 54, 52, 51, 51, 50, 53, 55, 57, 60, 64, 65, 67, 71, 73, 75,
+        76, 79, 82, 82, 83, 85, 86, 85, 83, 82, 83, 84, 84, 83, 82, 81, 66, 63,
+        60, 59, 59, 57, 60, 61, 62, 66, 69, 71, 73, 77, 80, 82, 84, 88, 92, 92,
+        93, 95, 94, 95, 96, 93, 92, 93, 94, 93, 91, 90, 68, 65, 63, 62, 60, 60,
+        59, 61, 62, 65, 66, 68, 72, 73, 76, 79, 80, 84, 87, 89, 93, 94, 98, 99,
+        99, 102, 101, 102, 103, 103, 101, 99, 71, 67, 66, 64, 63, 62, 62, 61,
+        62, 64, 66, 67, 70, 71, 75, 76, 79, 81, 84, 86, 89, 91, 94, 97, 98, 102,
+        104, 106, 106, 109, 109, 108 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 41, 69, 92, 41, 63, 88, 103, 69, 88, 127, 140, 92, 103, 140, 184,
+        /* Size 8x8 */
+        32, 32, 37, 47, 62, 78, 90, 102, 32, 35, 39, 46, 58, 72, 84, 96, 37, 39,
+        51, 60, 71, 84, 93, 100, 47, 46, 60, 73, 87, 100, 106, 113, 62, 58, 71,
+        87, 105, 121, 129, 132, 78, 72, 84, 100, 121, 140, 148, 155, 90, 84, 93,
+        106, 129, 148, 169, 183, 102, 96, 100, 113, 132, 155, 183, 201,
+        /* Size 16x16 */
+        32, 31, 31, 32, 36, 39, 47, 54, 61, 71, 80, 86, 92, 98, 104, 111, 31,
+        32, 32, 33, 34, 37, 44, 50, 56, 65, 73, 79, 85, 91, 98, 105, 31, 32, 33,
+        34, 36, 39, 45, 50, 56, 64, 71, 77, 82, 88, 94, 100, 32, 33, 34, 36, 40,
+        42, 47, 51, 57, 65, 71, 76, 80, 85, 91, 98, 36, 34, 36, 40, 48, 50, 56,
+        60, 65, 73, 79, 84, 86, 90, 95, 98, 39, 37, 39, 42, 50, 54, 60, 65, 70,
+        78, 84, 89, 95, 96, 102, 105, 47, 44, 45, 47, 56, 60, 69, 75, 81, 89,
+        95, 100, 102, 104, 109, 112, 54, 50, 50, 51, 60, 65, 75, 82, 89, 97,
+        104, 109, 110, 114, 117, 121, 61, 56, 56, 57, 65, 70, 81, 89, 97, 106,
+        113, 119, 122, 126, 125, 130, 71, 65, 64, 65, 73, 78, 89, 97, 106, 117,
+        125, 131, 134, 134, 136, 141, 80, 73, 71, 71, 79, 84, 95, 104, 113, 125,
+        134, 140, 142, 145, 146, 152, 86, 79, 77, 76, 84, 89, 100, 109, 119,
+        131, 140, 147, 154, 157, 160, 165, 92, 85, 82, 80, 86, 95, 102, 110,
+        122, 134, 142, 154, 162, 168, 174, 178, 98, 91, 88, 85, 90, 96, 104,
+        114, 126, 134, 145, 157, 168, 176, 184, 193, 104, 98, 94, 91, 95, 102,
+        109, 117, 125, 136, 146, 160, 174, 184, 193, 201, 111, 105, 100, 98, 98,
+        105, 112, 121, 130, 141, 152, 165, 178, 193, 201, 210,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 32, 32, 34, 36, 38, 39, 44, 47, 49, 54, 59, 61, 65,
+        71, 76, 80, 83, 86, 89, 92, 95, 98, 101, 104, 108, 111, 114, 31, 32, 32,
+        32, 32, 32, 33, 34, 35, 37, 38, 42, 45, 47, 51, 56, 58, 62, 68, 72, 76,
+        78, 82, 85, 88, 90, 93, 96, 99, 102, 105, 109, 31, 32, 32, 32, 32, 32,
+        33, 33, 34, 36, 37, 41, 44, 46, 50, 54, 56, 60, 65, 70, 73, 76, 79, 82,
+        85, 88, 91, 95, 98, 101, 105, 109, 31, 32, 32, 32, 32, 33, 33, 34, 35,
+        36, 38, 41, 44, 45, 49, 54, 56, 59, 65, 69, 72, 75, 78, 81, 84, 86, 89,
+        92, 95, 98, 101, 104, 31, 32, 32, 32, 33, 34, 34, 35, 36, 38, 39, 42,
+        45, 46, 50, 54, 56, 59, 64, 68, 71, 74, 77, 79, 82, 85, 88, 91, 94, 97,
+        100, 104, 32, 32, 32, 33, 34, 35, 36, 37, 38, 39, 40, 42, 45, 46, 49,
+        53, 55, 58, 63, 66, 69, 72, 74, 78, 81, 84, 87, 90, 93, 96, 99, 102, 32,
+        33, 33, 33, 34, 36, 36, 38, 40, 41, 42, 44, 47, 48, 51, 55, 57, 60, 65,
+        68, 71, 73, 76, 78, 80, 82, 85, 88, 91, 95, 98, 102, 34, 34, 33, 34, 35,
+        37, 38, 39, 42, 44, 45, 47, 50, 51, 54, 58, 60, 63, 68, 71, 74, 76, 79,
+        82, 85, 86, 87, 88, 90, 93, 96, 99, 36, 35, 34, 35, 36, 38, 40, 42, 48,
+        50, 50, 54, 56, 57, 60, 64, 65, 68, 73, 76, 79, 81, 84, 86, 86, 88, 90,
+        93, 95, 97, 98, 100, 38, 37, 36, 36, 38, 39, 41, 44, 50, 51, 52, 56, 58,
+        60, 63, 67, 68, 71, 76, 79, 82, 84, 87, 87, 90, 93, 94, 95, 96, 100,
+        103, 106, 39, 38, 37, 38, 39, 40, 42, 45, 50, 52, 54, 58, 60, 62, 65,
+        69, 70, 73, 78, 81, 84, 86, 89, 92, 95, 95, 96, 99, 102, 104, 105, 106,
+        44, 42, 41, 41, 42, 42, 44, 47, 54, 56, 58, 63, 66, 68, 71, 75, 77, 79,
+        84, 88, 90, 92, 95, 97, 97, 99, 102, 103, 103, 106, 109, 113, 47, 45,
+        44, 44, 45, 45, 47, 50, 56, 58, 60, 66, 69, 71, 75, 79, 81, 84, 89, 92,
+        95, 97, 100, 100, 102, 105, 104, 106, 109, 111, 112, 113, 49, 47, 46,
+        45, 46, 46, 48, 51, 57, 60, 62, 68, 71, 73, 77, 81, 83, 87, 92, 95, 98,
+        100, 103, 105, 107, 106, 109, 112, 112, 113, 117, 120, 54, 51, 50, 49,
+        50, 49, 51, 54, 60, 63, 65, 71, 75, 77, 82, 87, 89, 92, 97, 101, 104,
+        106, 109, 112, 110, 113, 114, 114, 117, 121, 121, 121, 59, 56, 54, 54,
+        54, 53, 55, 58, 64, 67, 69, 75, 79, 81, 87, 92, 94, 98, 103, 107, 110,
+        113, 116, 114, 117, 118, 117, 121, 122, 122, 125, 129, 61, 58, 56, 56,
+        56, 55, 57, 60, 65, 68, 70, 77, 81, 83, 89, 94, 97, 101, 106, 110, 113,
+        116, 119, 120, 122, 121, 126, 124, 125, 130, 130, 130, 65, 62, 60, 59,
+        59, 58, 60, 63, 68, 71, 73, 79, 84, 87, 92, 98, 101, 105, 111, 115, 118,
+        121, 124, 128, 125, 129, 128, 131, 133, 132, 135, 139, 71, 68, 65, 65,
+        64, 63, 65, 68, 73, 76, 78, 84, 89, 92, 97, 103, 106, 111, 117, 122,
+        125, 128, 131, 131, 134, 132, 134, 136, 136, 140, 141, 140, 76, 72, 70,
+        69, 68, 66, 68, 71, 76, 79, 81, 88, 92, 95, 101, 107, 110, 115, 122,
+        127, 130, 133, 136, 136, 138, 139, 141, 140, 145, 143, 146, 151, 80, 76,
+        73, 72, 71, 69, 71, 74, 79, 82, 84, 90, 95, 98, 104, 110, 113, 118, 125,
+        130, 134, 137, 140, 146, 142, 146, 145, 149, 146, 150, 152, 151, 83, 78,
+        76, 75, 74, 72, 73, 76, 81, 84, 86, 92, 97, 100, 106, 113, 116, 121,
+        128, 133, 137, 140, 144, 147, 152, 148, 154, 151, 156, 155, 156, 162,
+        86, 82, 79, 78, 77, 74, 76, 79, 84, 87, 89, 95, 100, 103, 109, 116, 119,
+        124, 131, 136, 140, 144, 147, 150, 154, 159, 157, 160, 160, 162, 165,
+        162, 89, 85, 82, 81, 79, 78, 78, 82, 86, 87, 92, 97, 100, 105, 112, 114,
+        120, 128, 131, 136, 146, 147, 150, 155, 156, 161, 166, 165, 167, 169,
+        169, 175, 92, 88, 85, 84, 82, 81, 80, 85, 86, 90, 95, 97, 102, 107, 110,
+        117, 122, 125, 134, 138, 142, 152, 154, 156, 162, 163, 168, 173, 174,
+        174, 178, 176, 95, 90, 88, 86, 85, 84, 82, 86, 88, 93, 95, 99, 105, 106,
+        113, 118, 121, 129, 132, 139, 146, 148, 159, 161, 163, 169, 170, 176,
+        180, 183, 181, 187, 98, 93, 91, 89, 88, 87, 85, 87, 90, 94, 96, 102,
+        104, 109, 114, 117, 126, 128, 134, 141, 145, 154, 157, 166, 168, 170,
+        176, 178, 184, 188, 193, 188, 101, 96, 95, 92, 91, 90, 88, 88, 93, 95,
+        99, 103, 106, 112, 114, 121, 124, 131, 136, 140, 149, 151, 160, 165,
+        173, 176, 178, 184, 186, 192, 196, 203, 104, 99, 98, 95, 94, 93, 91, 90,
+        95, 96, 102, 103, 109, 112, 117, 122, 125, 133, 136, 145, 146, 156, 160,
+        167, 174, 180, 184, 186, 193, 194, 201, 204, 108, 102, 101, 98, 97, 96,
+        95, 93, 97, 100, 104, 106, 111, 113, 121, 122, 130, 132, 140, 143, 150,
+        155, 162, 169, 174, 183, 188, 192, 194, 201, 202, 210, 111, 105, 105,
+        101, 100, 99, 98, 96, 98, 103, 105, 109, 112, 117, 121, 125, 130, 135,
+        141, 146, 152, 156, 165, 169, 178, 181, 193, 196, 201, 202, 210, 211,
+        114, 109, 109, 104, 104, 102, 102, 99, 100, 106, 106, 113, 113, 120,
+        121, 129, 130, 139, 140, 151, 151, 162, 162, 175, 176, 187, 188, 203,
+        204, 210, 211, 219,
+        /* Size 4x8 */
+        32, 42, 69, 88, 33, 42, 64, 83, 36, 56, 77, 88, 46, 67, 93, 105, 60, 79,
+        112, 122, 75, 92, 130, 144, 86, 95, 136, 167, 98, 105, 136, 177,
+        /* Size 8x4 */
+        32, 33, 36, 46, 60, 75, 86, 98, 42, 42, 56, 67, 79, 92, 95, 105, 69, 64,
+        77, 93, 112, 130, 136, 136, 88, 83, 88, 105, 122, 144, 167, 177,
+        /* Size 8x16 */
+        32, 32, 36, 47, 65, 79, 90, 96, 31, 32, 35, 44, 60, 72, 84, 90, 32, 34,
+        36, 45, 59, 71, 80, 87, 32, 35, 40, 47, 60, 71, 78, 85, 36, 37, 48, 56,
+        68, 78, 83, 87, 39, 40, 50, 60, 73, 84, 91, 94, 47, 45, 56, 69, 84, 95,
+        101, 101, 53, 50, 60, 75, 92, 103, 108, 110, 61, 56, 65, 81, 100, 113,
+        116, 118, 71, 64, 73, 89, 111, 125, 129, 129, 79, 70, 79, 95, 118, 133,
+        142, 138, 86, 76, 84, 100, 124, 140, 153, 150, 92, 82, 89, 101, 121,
+        148, 157, 161, 98, 88, 93, 108, 124, 141, 163, 174, 104, 94, 95, 110,
+        129, 151, 171, 181, 110, 100, 98, 111, 127, 147, 169, 188,
+        /* Size 16x8 */
+        32, 31, 32, 32, 36, 39, 47, 53, 61, 71, 79, 86, 92, 98, 104, 110, 32,
+        32, 34, 35, 37, 40, 45, 50, 56, 64, 70, 76, 82, 88, 94, 100, 36, 35, 36,
+        40, 48, 50, 56, 60, 65, 73, 79, 84, 89, 93, 95, 98, 47, 44, 45, 47, 56,
+        60, 69, 75, 81, 89, 95, 100, 101, 108, 110, 111, 65, 60, 59, 60, 68, 73,
+        84, 92, 100, 111, 118, 124, 121, 124, 129, 127, 79, 72, 71, 71, 78, 84,
+        95, 103, 113, 125, 133, 140, 148, 141, 151, 147, 90, 84, 80, 78, 83, 91,
+        101, 108, 116, 129, 142, 153, 157, 163, 171, 169, 96, 90, 87, 85, 87,
+        94, 101, 110, 118, 129, 138, 150, 161, 174, 181, 188,
+        /* Size 16x32 */
+        32, 31, 32, 32, 36, 44, 47, 53, 65, 73, 79, 87, 90, 93, 96, 99, 31, 32,
+        32, 33, 35, 42, 45, 51, 62, 69, 75, 83, 86, 88, 91, 94, 31, 32, 32, 33,
+        35, 41, 44, 49, 60, 67, 72, 80, 84, 87, 90, 94, 31, 32, 33, 33, 35, 41,
+        44, 49, 59, 66, 71, 79, 82, 84, 87, 90, 32, 32, 34, 34, 36, 42, 45, 50,
+        59, 65, 71, 78, 80, 83, 87, 90, 32, 33, 35, 36, 38, 42, 45, 49, 58, 64,
+        69, 76, 80, 83, 86, 88, 32, 33, 35, 36, 40, 44, 47, 51, 60, 66, 71, 76,
+        78, 81, 85, 89, 34, 34, 36, 38, 42, 48, 50, 54, 63, 69, 73, 80, 82, 81,
+        84, 86, 36, 34, 37, 40, 48, 54, 56, 60, 68, 74, 78, 84, 83, 86, 87, 87,
+        38, 36, 39, 41, 49, 56, 58, 63, 71, 77, 81, 86, 88, 88, 90, 93, 39, 37,
+        40, 42, 50, 58, 60, 65, 73, 79, 84, 90, 91, 92, 94, 93, 44, 41, 42, 45,
+        53, 63, 66, 71, 79, 85, 90, 96, 94, 96, 96, 99, 47, 44, 45, 47, 56, 66,
+        69, 75, 84, 90, 95, 99, 101, 98, 101, 99, 49, 46, 47, 48, 57, 67, 71,
+        77, 86, 93, 97, 103, 103, 105, 102, 106, 53, 49, 50, 51, 60, 71, 75, 82,
+        92, 99, 103, 111, 108, 107, 110, 107, 58, 54, 54, 55, 63, 75, 79, 87,
+        98, 105, 110, 114, 114, 113, 111, 115, 61, 56, 56, 57, 65, 77, 81, 89,
+        100, 107, 113, 118, 116, 117, 118, 116, 65, 60, 59, 60, 68, 79, 84, 92,
+        105, 112, 118, 126, 124, 122, 121, 124, 71, 65, 64, 65, 73, 84, 89, 97,
+        111, 119, 125, 130, 129, 129, 129, 125, 76, 69, 68, 69, 76, 88, 92, 101,
+        115, 123, 130, 134, 134, 131, 132, 135, 79, 72, 70, 71, 79, 90, 95, 104,
+        118, 127, 133, 143, 142, 141, 138, 136, 82, 75, 73, 74, 81, 92, 97, 106,
+        121, 130, 136, 146, 145, 144, 144, 145, 86, 78, 76, 77, 84, 95, 100,
+        109, 124, 133, 140, 147, 153, 151, 150, 146, 89, 81, 79, 78, 87, 95, 99,
+        112, 124, 130, 145, 152, 156, 157, 156, 158, 92, 84, 82, 80, 89, 95,
+        101, 116, 121, 132, 148, 151, 157, 163, 161, 159, 95, 86, 85, 83, 92,
+        95, 105, 114, 120, 136, 143, 155, 163, 167, 171, 170, 98, 89, 88, 85,
+        93, 95, 108, 113, 124, 136, 141, 160, 163, 169, 174, 171, 101, 92, 91,
+        88, 94, 98, 110, 112, 128, 133, 146, 158, 166, 175, 179, 185, 104, 95,
+        94, 91, 95, 101, 110, 115, 129, 132, 151, 154, 171, 175, 181, 186, 107,
+        98, 97, 94, 96, 105, 110, 119, 128, 136, 149, 156, 173, 177, 188, 192,
+        110, 101, 100, 97, 98, 108, 111, 123, 127, 141, 147, 161, 169, 183, 188,
+        193, 114, 104, 104, 100, 100, 111, 111, 126, 127, 145, 145, 166, 166,
+        189, 190, 201,
+        /* Size 32x16 */
+        32, 31, 31, 31, 32, 32, 32, 34, 36, 38, 39, 44, 47, 49, 53, 58, 61, 65,
+        71, 76, 79, 82, 86, 89, 92, 95, 98, 101, 104, 107, 110, 114, 31, 32, 32,
+        32, 32, 33, 33, 34, 34, 36, 37, 41, 44, 46, 49, 54, 56, 60, 65, 69, 72,
+        75, 78, 81, 84, 86, 89, 92, 95, 98, 101, 104, 32, 32, 32, 33, 34, 35,
+        35, 36, 37, 39, 40, 42, 45, 47, 50, 54, 56, 59, 64, 68, 70, 73, 76, 79,
+        82, 85, 88, 91, 94, 97, 100, 104, 32, 33, 33, 33, 34, 36, 36, 38, 40,
+        41, 42, 45, 47, 48, 51, 55, 57, 60, 65, 69, 71, 74, 77, 78, 80, 83, 85,
+        88, 91, 94, 97, 100, 36, 35, 35, 35, 36, 38, 40, 42, 48, 49, 50, 53, 56,
+        57, 60, 63, 65, 68, 73, 76, 79, 81, 84, 87, 89, 92, 93, 94, 95, 96, 98,
+        100, 44, 42, 41, 41, 42, 42, 44, 48, 54, 56, 58, 63, 66, 67, 71, 75, 77,
+        79, 84, 88, 90, 92, 95, 95, 95, 95, 95, 98, 101, 105, 108, 111, 47, 45,
+        44, 44, 45, 45, 47, 50, 56, 58, 60, 66, 69, 71, 75, 79, 81, 84, 89, 92,
+        95, 97, 100, 99, 101, 105, 108, 110, 110, 110, 111, 111, 53, 51, 49, 49,
+        50, 49, 51, 54, 60, 63, 65, 71, 75, 77, 82, 87, 89, 92, 97, 101, 104,
+        106, 109, 112, 116, 114, 113, 112, 115, 119, 123, 126, 65, 62, 60, 59,
+        59, 58, 60, 63, 68, 71, 73, 79, 84, 86, 92, 98, 100, 105, 111, 115, 118,
+        121, 124, 124, 121, 120, 124, 128, 129, 128, 127, 127, 73, 69, 67, 66,
+        65, 64, 66, 69, 74, 77, 79, 85, 90, 93, 99, 105, 107, 112, 119, 123,
+        127, 130, 133, 130, 132, 136, 136, 133, 132, 136, 141, 145, 79, 75, 72,
+        71, 71, 69, 71, 73, 78, 81, 84, 90, 95, 97, 103, 110, 113, 118, 125,
+        130, 133, 136, 140, 145, 148, 143, 141, 146, 151, 149, 147, 145, 87, 83,
+        80, 79, 78, 76, 76, 80, 84, 86, 90, 96, 99, 103, 111, 114, 118, 126,
+        130, 134, 143, 146, 147, 152, 151, 155, 160, 158, 154, 156, 161, 166,
+        90, 86, 84, 82, 80, 80, 78, 82, 83, 88, 91, 94, 101, 103, 108, 114, 116,
+        124, 129, 134, 142, 145, 153, 156, 157, 163, 163, 166, 171, 173, 169,
+        166, 93, 88, 87, 84, 83, 83, 81, 81, 86, 88, 92, 96, 98, 105, 107, 113,
+        117, 122, 129, 131, 141, 144, 151, 157, 163, 167, 169, 175, 175, 177,
+        183, 189, 96, 91, 90, 87, 87, 86, 85, 84, 87, 90, 94, 96, 101, 102, 110,
+        111, 118, 121, 129, 132, 138, 144, 150, 156, 161, 171, 174, 179, 181,
+        188, 188, 190, 99, 94, 94, 90, 90, 88, 89, 86, 87, 93, 93, 99, 99, 106,
+        107, 115, 116, 124, 125, 135, 136, 145, 146, 158, 159, 170, 171, 185,
+        186, 192, 193, 201,
+        /* Size 4x16 */
+        31, 44, 73, 93, 32, 41, 67, 87, 32, 42, 65, 83, 33, 44, 66, 81, 34, 54,
+        74, 86, 37, 58, 79, 92, 44, 66, 90, 98, 49, 71, 99, 107, 56, 77, 107,
+        117, 65, 84, 119, 129, 72, 90, 127, 141, 78, 95, 133, 151, 84, 95, 132,
+        163, 89, 95, 136, 169, 95, 101, 132, 175, 101, 108, 141, 183,
+        /* Size 16x4 */
+        31, 32, 32, 33, 34, 37, 44, 49, 56, 65, 72, 78, 84, 89, 95, 101, 44, 41,
+        42, 44, 54, 58, 66, 71, 77, 84, 90, 95, 95, 95, 101, 108, 73, 67, 65,
+        66, 74, 79, 90, 99, 107, 119, 127, 133, 132, 136, 132, 141, 93, 87, 83,
+        81, 86, 92, 98, 107, 117, 129, 141, 151, 163, 169, 175, 183,
+        /* Size 8x32 */
+        32, 32, 36, 47, 65, 79, 90, 96, 31, 32, 35, 45, 62, 75, 86, 91, 31, 32,
+        35, 44, 60, 72, 84, 90, 31, 33, 35, 44, 59, 71, 82, 87, 32, 34, 36, 45,
+        59, 71, 80, 87, 32, 35, 38, 45, 58, 69, 80, 86, 32, 35, 40, 47, 60, 71,
+        78, 85, 34, 36, 42, 50, 63, 73, 82, 84, 36, 37, 48, 56, 68, 78, 83, 87,
+        38, 39, 49, 58, 71, 81, 88, 90, 39, 40, 50, 60, 73, 84, 91, 94, 44, 42,
+        53, 66, 79, 90, 94, 96, 47, 45, 56, 69, 84, 95, 101, 101, 49, 47, 57,
+        71, 86, 97, 103, 102, 53, 50, 60, 75, 92, 103, 108, 110, 58, 54, 63, 79,
+        98, 110, 114, 111, 61, 56, 65, 81, 100, 113, 116, 118, 65, 59, 68, 84,
+        105, 118, 124, 121, 71, 64, 73, 89, 111, 125, 129, 129, 76, 68, 76, 92,
+        115, 130, 134, 132, 79, 70, 79, 95, 118, 133, 142, 138, 82, 73, 81, 97,
+        121, 136, 145, 144, 86, 76, 84, 100, 124, 140, 153, 150, 89, 79, 87, 99,
+        124, 145, 156, 156, 92, 82, 89, 101, 121, 148, 157, 161, 95, 85, 92,
+        105, 120, 143, 163, 171, 98, 88, 93, 108, 124, 141, 163, 174, 101, 91,
+        94, 110, 128, 146, 166, 179, 104, 94, 95, 110, 129, 151, 171, 181, 107,
+        97, 96, 110, 128, 149, 173, 188, 110, 100, 98, 111, 127, 147, 169, 188,
+        114, 104, 100, 111, 127, 145, 166, 190,
+        /* Size 32x8 */
+        32, 31, 31, 31, 32, 32, 32, 34, 36, 38, 39, 44, 47, 49, 53, 58, 61, 65,
+        71, 76, 79, 82, 86, 89, 92, 95, 98, 101, 104, 107, 110, 114, 32, 32, 32,
+        33, 34, 35, 35, 36, 37, 39, 40, 42, 45, 47, 50, 54, 56, 59, 64, 68, 70,
+        73, 76, 79, 82, 85, 88, 91, 94, 97, 100, 104, 36, 35, 35, 35, 36, 38,
+        40, 42, 48, 49, 50, 53, 56, 57, 60, 63, 65, 68, 73, 76, 79, 81, 84, 87,
+        89, 92, 93, 94, 95, 96, 98, 100, 47, 45, 44, 44, 45, 45, 47, 50, 56, 58,
+        60, 66, 69, 71, 75, 79, 81, 84, 89, 92, 95, 97, 100, 99, 101, 105, 108,
+        110, 110, 110, 111, 111, 65, 62, 60, 59, 59, 58, 60, 63, 68, 71, 73, 79,
+        84, 86, 92, 98, 100, 105, 111, 115, 118, 121, 124, 124, 121, 120, 124,
+        128, 129, 128, 127, 127, 79, 75, 72, 71, 71, 69, 71, 73, 78, 81, 84, 90,
+        95, 97, 103, 110, 113, 118, 125, 130, 133, 136, 140, 145, 148, 143, 141,
+        146, 151, 149, 147, 145, 90, 86, 84, 82, 80, 80, 78, 82, 83, 88, 91, 94,
+        101, 103, 108, 114, 116, 124, 129, 134, 142, 145, 153, 156, 157, 163,
+        163, 166, 171, 173, 169, 166, 96, 91, 90, 87, 87, 86, 85, 84, 87, 90,
+        94, 96, 101, 102, 110, 111, 118, 121, 129, 132, 138, 144, 150, 156, 161,
+        171, 174, 179, 181, 188, 188, 190 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 45, 56, 64, 45, 58, 66, 69, 56, 66, 86, 87, 64, 69, 87, 105,
+        /* Size 8x8 */
+        31, 38, 47, 48, 54, 61, 66, 69, 38, 47, 47, 46, 50, 55, 61, 65, 47, 47,
+        53, 55, 58, 63, 65, 66, 48, 46, 55, 62, 67, 72, 73, 73, 54, 50, 58, 67,
+        76, 83, 84, 82, 61, 55, 63, 72, 83, 91, 92, 92, 66, 61, 65, 73, 84, 92,
+        101, 103, 69, 65, 66, 73, 82, 92, 103, 109,
+        /* Size 16x16 */
+        32, 30, 33, 38, 49, 48, 50, 52, 55, 60, 63, 66, 68, 70, 72, 74, 30, 31,
+        35, 41, 46, 46, 46, 48, 51, 55, 58, 60, 63, 65, 68, 70, 33, 35, 39, 44,
+        47, 46, 46, 47, 50, 53, 56, 58, 60, 62, 65, 67, 38, 41, 44, 47, 49, 48,
+        47, 48, 50, 53, 55, 58, 58, 60, 62, 65, 49, 46, 47, 49, 53, 53, 54, 54,
+        56, 58, 60, 62, 62, 63, 64, 64, 48, 46, 46, 48, 53, 54, 56, 57, 59, 61,
+        63, 65, 67, 66, 68, 68, 50, 46, 46, 47, 54, 56, 61, 63, 65, 68, 70, 72,
+        71, 71, 72, 72, 52, 48, 47, 48, 54, 57, 63, 66, 69, 72, 75, 76, 75, 76,
+        76, 76, 55, 51, 50, 50, 56, 59, 65, 69, 73, 77, 79, 81, 81, 81, 80, 80,
+        60, 55, 53, 53, 58, 61, 68, 72, 77, 82, 85, 87, 87, 85, 84, 85, 63, 58,
+        56, 55, 60, 63, 70, 75, 79, 85, 89, 91, 91, 90, 89, 90, 66, 60, 58, 58,
+        62, 65, 72, 76, 81, 87, 91, 94, 96, 95, 95, 95, 68, 63, 60, 58, 62, 67,
+        71, 75, 81, 87, 91, 96, 99, 100, 100, 100, 70, 65, 62, 60, 63, 66, 71,
+        76, 81, 85, 90, 95, 100, 103, 104, 105, 72, 68, 65, 62, 64, 68, 72, 76,
+        80, 84, 89, 95, 100, 104, 107, 108, 74, 70, 67, 65, 64, 68, 72, 76, 80,
+        85, 90, 95, 100, 105, 108, 111,
+        /* Size 32x32 */
+        32, 31, 30, 31, 33, 36, 38, 41, 49, 49, 48, 49, 50, 51, 52, 54, 55, 57,
+        60, 62, 63, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 31, 31, 31, 32,
+        34, 38, 40, 42, 47, 47, 47, 47, 48, 48, 50, 52, 53, 54, 57, 59, 60, 61,
+        63, 64, 65, 66, 67, 67, 68, 69, 70, 71, 30, 31, 31, 32, 35, 39, 41, 42,
+        46, 46, 46, 45, 46, 47, 48, 50, 51, 52, 55, 57, 58, 59, 60, 62, 63, 64,
+        65, 67, 68, 69, 70, 71, 31, 32, 32, 33, 36, 40, 41, 43, 46, 46, 45, 45,
+        46, 46, 47, 49, 50, 51, 54, 56, 57, 58, 59, 61, 62, 63, 63, 64, 65, 66,
+        67, 68, 33, 34, 35, 36, 39, 43, 44, 45, 47, 46, 46, 45, 46, 47, 47, 49,
+        50, 51, 53, 55, 56, 57, 58, 59, 60, 61, 62, 63, 65, 66, 67, 68, 36, 38,
+        39, 40, 43, 47, 47, 47, 48, 47, 46, 45, 46, 46, 47, 48, 49, 50, 52, 53,
+        54, 55, 56, 58, 59, 61, 62, 63, 64, 65, 66, 66, 38, 40, 41, 41, 44, 47,
+        47, 48, 49, 48, 48, 47, 47, 47, 48, 49, 50, 51, 53, 54, 55, 56, 58, 58,
+        58, 59, 60, 61, 62, 64, 65, 66, 41, 42, 42, 43, 45, 47, 48, 48, 50, 50,
+        49, 49, 50, 50, 50, 52, 52, 53, 55, 56, 57, 58, 59, 60, 61, 61, 61, 61,
+        62, 63, 63, 64, 49, 47, 46, 46, 47, 48, 49, 50, 53, 53, 53, 53, 54, 54,
+        54, 55, 56, 56, 58, 59, 60, 61, 62, 63, 62, 62, 63, 64, 64, 64, 64, 64,
+        49, 47, 46, 46, 46, 47, 48, 50, 53, 53, 54, 55, 55, 55, 56, 57, 58, 58,
+        60, 61, 62, 63, 64, 64, 64, 65, 65, 65, 65, 66, 67, 68, 48, 47, 46, 45,
+        46, 46, 48, 49, 53, 54, 54, 55, 56, 56, 57, 58, 59, 60, 61, 63, 63, 64,
+        65, 66, 67, 66, 66, 67, 68, 68, 68, 68, 49, 47, 45, 45, 45, 45, 47, 49,
+        53, 55, 55, 58, 59, 60, 61, 62, 63, 63, 65, 66, 67, 68, 69, 69, 68, 68,
+        69, 69, 69, 69, 70, 71, 50, 48, 46, 46, 46, 46, 47, 50, 54, 55, 56, 59,
+        61, 61, 63, 64, 65, 66, 68, 69, 70, 71, 72, 71, 71, 72, 71, 71, 72, 72,
+        72, 71, 51, 48, 47, 46, 47, 46, 47, 50, 54, 55, 56, 60, 61, 62, 64, 66,
+        66, 67, 69, 70, 71, 72, 73, 73, 74, 73, 73, 74, 73, 73, 74, 75, 52, 50,
+        48, 47, 47, 47, 48, 50, 54, 56, 57, 61, 63, 64, 66, 68, 69, 70, 72, 74,
+        75, 75, 76, 77, 75, 76, 76, 75, 76, 77, 76, 75, 54, 52, 50, 49, 49, 48,
+        49, 52, 55, 57, 58, 62, 64, 66, 68, 71, 72, 73, 75, 77, 78, 79, 80, 78,
+        79, 78, 77, 78, 78, 77, 78, 79, 55, 53, 51, 50, 50, 49, 50, 52, 56, 58,
+        59, 63, 65, 66, 69, 72, 73, 74, 77, 78, 79, 80, 81, 81, 81, 80, 81, 80,
+        80, 81, 80, 79, 57, 54, 52, 51, 51, 50, 51, 53, 56, 58, 60, 63, 66, 67,
+        70, 73, 74, 76, 79, 80, 82, 83, 84, 85, 83, 84, 83, 83, 83, 82, 82, 83,
+        60, 57, 55, 54, 53, 52, 53, 55, 58, 60, 61, 65, 68, 69, 72, 75, 77, 79,
+        82, 84, 85, 86, 87, 86, 87, 85, 85, 85, 84, 86, 85, 84, 62, 59, 57, 56,
+        55, 53, 54, 56, 59, 61, 63, 66, 69, 70, 74, 77, 78, 80, 84, 86, 87, 88,
+        90, 89, 89, 88, 88, 87, 88, 87, 87, 88, 63, 60, 58, 57, 56, 54, 55, 57,
+        60, 62, 63, 67, 70, 71, 75, 78, 79, 82, 85, 87, 89, 90, 91, 93, 91, 91,
+        90, 91, 89, 90, 90, 89, 65, 61, 59, 58, 57, 55, 56, 58, 61, 63, 64, 68,
+        71, 72, 75, 79, 80, 83, 86, 88, 90, 91, 93, 94, 95, 92, 94, 92, 93, 92,
+        91, 93, 66, 63, 60, 59, 58, 56, 58, 59, 62, 64, 65, 69, 72, 73, 76, 80,
+        81, 84, 87, 90, 91, 93, 94, 95, 96, 97, 95, 95, 95, 95, 95, 93, 67, 64,
+        62, 61, 59, 58, 58, 60, 63, 64, 66, 69, 71, 73, 77, 78, 81, 85, 86, 89,
+        93, 94, 95, 97, 97, 98, 99, 97, 97, 97, 96, 98, 68, 65, 63, 62, 60, 59,
+        58, 61, 62, 64, 67, 68, 71, 74, 75, 79, 81, 83, 87, 89, 91, 95, 96, 97,
+        99, 98, 100, 100, 100, 99, 100, 98, 69, 66, 64, 63, 61, 61, 59, 61, 62,
+        65, 66, 68, 72, 73, 76, 78, 80, 84, 85, 88, 91, 92, 97, 98, 98, 101,
+        100, 102, 102, 103, 101, 102, 70, 67, 65, 63, 62, 62, 60, 61, 63, 65,
+        66, 69, 71, 73, 76, 77, 81, 83, 85, 88, 90, 94, 95, 99, 100, 100, 103,
+        102, 104, 104, 105, 103, 71, 67, 67, 64, 63, 63, 61, 61, 64, 65, 67, 69,
+        71, 74, 75, 78, 80, 83, 85, 87, 91, 92, 95, 97, 100, 102, 102, 105, 104,
+        106, 106, 108, 72, 68, 68, 65, 65, 64, 62, 62, 64, 65, 68, 69, 72, 73,
+        76, 78, 80, 83, 84, 88, 89, 93, 95, 97, 100, 102, 104, 104, 107, 106,
+        108, 108, 73, 69, 69, 66, 66, 65, 64, 63, 64, 66, 68, 69, 72, 73, 77,
+        77, 81, 82, 86, 87, 90, 92, 95, 97, 99, 103, 104, 106, 106, 109, 108,
+        110, 74, 70, 70, 67, 67, 66, 65, 63, 64, 67, 68, 70, 72, 74, 76, 78, 80,
+        82, 85, 87, 90, 91, 95, 96, 100, 101, 105, 106, 108, 108, 111, 110, 75,
+        71, 71, 68, 68, 66, 66, 64, 64, 68, 68, 71, 71, 75, 75, 79, 79, 83, 84,
+        88, 89, 93, 93, 98, 98, 102, 103, 108, 108, 110, 110, 113,
+        /* Size 4x8 */
+        31, 47, 57, 65, 40, 45, 52, 61, 46, 55, 61, 63, 47, 60, 70, 72, 52, 64,
+        79, 81, 59, 68, 87, 90, 63, 66, 88, 99, 66, 69, 85, 102,
+        /* Size 8x4 */
+        31, 40, 46, 47, 52, 59, 63, 66, 47, 45, 55, 60, 64, 68, 66, 69, 57, 52,
+        61, 70, 79, 87, 88, 85, 65, 61, 63, 72, 81, 90, 99, 102,
+        /* Size 8x16 */
+        32, 35, 48, 50, 57, 63, 68, 70, 30, 38, 46, 46, 52, 58, 63, 65, 33, 41,
+        47, 46, 51, 56, 60, 63, 39, 46, 48, 47, 51, 55, 58, 61, 49, 48, 53, 54,
+        57, 60, 61, 61, 48, 46, 53, 56, 60, 64, 65, 65, 50, 46, 54, 61, 66, 70,
+        71, 69, 52, 47, 54, 63, 71, 75, 75, 74, 55, 49, 56, 65, 74, 79, 79, 78,
+        60, 53, 58, 68, 79, 85, 85, 82, 63, 55, 60, 70, 82, 89, 91, 87, 66, 58,
+        62, 72, 84, 91, 95, 91, 68, 60, 64, 71, 81, 94, 97, 96, 70, 62, 65, 73,
+        81, 89, 98, 101, 72, 65, 65, 72, 82, 92, 100, 103, 74, 67, 65, 71, 79,
+        89, 98, 105,
+        /* Size 16x8 */
+        32, 30, 33, 39, 49, 48, 50, 52, 55, 60, 63, 66, 68, 70, 72, 74, 35, 38,
+        41, 46, 48, 46, 46, 47, 49, 53, 55, 58, 60, 62, 65, 67, 48, 46, 47, 48,
+        53, 53, 54, 54, 56, 58, 60, 62, 64, 65, 65, 65, 50, 46, 46, 47, 54, 56,
+        61, 63, 65, 68, 70, 72, 71, 73, 72, 71, 57, 52, 51, 51, 57, 60, 66, 71,
+        74, 79, 82, 84, 81, 81, 82, 79, 63, 58, 56, 55, 60, 64, 70, 75, 79, 85,
+        89, 91, 94, 89, 92, 89, 68, 63, 60, 58, 61, 65, 71, 75, 79, 85, 91, 95,
+        97, 98, 100, 98, 70, 65, 63, 61, 61, 65, 69, 74, 78, 82, 87, 91, 96,
+        101, 103, 105,
+        /* Size 16x32 */
+        32, 31, 35, 38, 48, 49, 50, 52, 57, 61, 63, 67, 68, 69, 70, 71, 31, 31,
+        37, 40, 47, 47, 48, 50, 54, 57, 60, 63, 64, 65, 66, 67, 30, 32, 38, 40,
+        46, 45, 46, 48, 52, 55, 58, 61, 63, 64, 65, 67, 31, 33, 38, 41, 46, 45,
+        46, 48, 52, 55, 57, 60, 61, 62, 63, 64, 33, 36, 41, 44, 47, 46, 46, 47,
+        51, 54, 56, 59, 60, 61, 63, 64, 37, 40, 45, 47, 47, 45, 46, 47, 50, 52,
+        54, 57, 59, 61, 62, 62, 39, 41, 46, 47, 48, 47, 47, 48, 51, 54, 55, 57,
+        58, 59, 61, 62, 42, 43, 46, 48, 50, 49, 50, 50, 53, 56, 57, 60, 60, 59,
+        60, 60, 49, 46, 48, 49, 53, 53, 54, 54, 57, 59, 60, 63, 61, 62, 61, 61,
+        48, 46, 47, 48, 53, 55, 55, 56, 58, 61, 62, 64, 64, 63, 63, 64, 48, 46,
+        46, 48, 53, 56, 56, 57, 60, 62, 64, 66, 65, 65, 65, 64, 49, 45, 45, 47,
+        53, 58, 59, 61, 64, 66, 67, 69, 67, 67, 66, 67, 50, 46, 46, 48, 54, 59,
+        61, 63, 66, 68, 70, 71, 71, 68, 69, 67, 51, 47, 47, 48, 54, 60, 61, 64,
+        68, 70, 71, 73, 72, 72, 70, 71, 52, 48, 47, 48, 54, 61, 63, 66, 71, 73,
+        75, 77, 75, 73, 74, 71, 54, 50, 49, 50, 55, 62, 65, 68, 73, 76, 78, 79,
+        78, 76, 74, 75, 55, 51, 49, 50, 56, 63, 65, 69, 74, 77, 79, 81, 79, 78,
+        78, 75, 57, 52, 50, 51, 56, 64, 66, 70, 76, 79, 82, 85, 83, 81, 79, 79,
+        60, 54, 53, 53, 58, 65, 68, 72, 79, 82, 85, 87, 85, 84, 82, 80, 62, 56,
+        54, 55, 60, 66, 69, 74, 81, 84, 87, 88, 87, 85, 84, 84, 63, 57, 55, 56,
+        60, 67, 70, 75, 82, 86, 89, 92, 91, 89, 87, 84, 64, 59, 56, 57, 61, 68,
+        71, 75, 83, 87, 90, 93, 92, 90, 89, 89, 66, 60, 58, 58, 62, 69, 72, 76,
+        84, 88, 91, 94, 95, 93, 91, 89, 67, 61, 59, 58, 63, 68, 71, 78, 83, 86,
+        93, 96, 96, 96, 94, 94, 68, 62, 60, 59, 64, 67, 71, 79, 81, 86, 94, 95,
+        97, 98, 96, 94, 69, 63, 61, 60, 65, 66, 72, 77, 80, 88, 91, 96, 99, 99,
+        100, 98, 70, 64, 62, 60, 65, 66, 73, 76, 81, 87, 89, 97, 98, 100, 101,
+        99, 71, 65, 64, 61, 65, 67, 73, 74, 82, 85, 90, 95, 99, 102, 103, 104,
+        72, 65, 65, 62, 65, 68, 72, 75, 82, 83, 92, 93, 100, 102, 103, 104, 73,
+        66, 66, 63, 65, 69, 72, 76, 81, 85, 90, 93, 100, 102, 105, 106, 74, 67,
+        67, 64, 65, 70, 71, 77, 79, 86, 89, 94, 98, 103, 105, 106, 75, 68, 68,
+        65, 65, 71, 71, 78, 78, 87, 87, 96, 96, 105, 105, 109,
+        /* Size 32x16 */
+        32, 31, 30, 31, 33, 37, 39, 42, 49, 48, 48, 49, 50, 51, 52, 54, 55, 57,
+        60, 62, 63, 64, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 31, 31, 32, 33,
+        36, 40, 41, 43, 46, 46, 46, 45, 46, 47, 48, 50, 51, 52, 54, 56, 57, 59,
+        60, 61, 62, 63, 64, 65, 65, 66, 67, 68, 35, 37, 38, 38, 41, 45, 46, 46,
+        48, 47, 46, 45, 46, 47, 47, 49, 49, 50, 53, 54, 55, 56, 58, 59, 60, 61,
+        62, 64, 65, 66, 67, 68, 38, 40, 40, 41, 44, 47, 47, 48, 49, 48, 48, 47,
+        48, 48, 48, 50, 50, 51, 53, 55, 56, 57, 58, 58, 59, 60, 60, 61, 62, 63,
+        64, 65, 48, 47, 46, 46, 47, 47, 48, 50, 53, 53, 53, 53, 54, 54, 54, 55,
+        56, 56, 58, 60, 60, 61, 62, 63, 64, 65, 65, 65, 65, 65, 65, 65, 49, 47,
+        45, 45, 46, 45, 47, 49, 53, 55, 56, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+        67, 68, 69, 68, 67, 66, 66, 67, 68, 69, 70, 71, 50, 48, 46, 46, 46, 46,
+        47, 50, 54, 55, 56, 59, 61, 61, 63, 65, 65, 66, 68, 69, 70, 71, 72, 71,
+        71, 72, 73, 73, 72, 72, 71, 71, 52, 50, 48, 48, 47, 47, 48, 50, 54, 56,
+        57, 61, 63, 64, 66, 68, 69, 70, 72, 74, 75, 75, 76, 78, 79, 77, 76, 74,
+        75, 76, 77, 78, 57, 54, 52, 52, 51, 50, 51, 53, 57, 58, 60, 64, 66, 68,
+        71, 73, 74, 76, 79, 81, 82, 83, 84, 83, 81, 80, 81, 82, 82, 81, 79, 78,
+        61, 57, 55, 55, 54, 52, 54, 56, 59, 61, 62, 66, 68, 70, 73, 76, 77, 79,
+        82, 84, 86, 87, 88, 86, 86, 88, 87, 85, 83, 85, 86, 87, 63, 60, 58, 57,
+        56, 54, 55, 57, 60, 62, 64, 67, 70, 71, 75, 78, 79, 82, 85, 87, 89, 90,
+        91, 93, 94, 91, 89, 90, 92, 90, 89, 87, 67, 63, 61, 60, 59, 57, 57, 60,
+        63, 64, 66, 69, 71, 73, 77, 79, 81, 85, 87, 88, 92, 93, 94, 96, 95, 96,
+        97, 95, 93, 93, 94, 96, 68, 64, 63, 61, 60, 59, 58, 60, 61, 64, 65, 67,
+        71, 72, 75, 78, 79, 83, 85, 87, 91, 92, 95, 96, 97, 99, 98, 99, 100,
+        100, 98, 96, 69, 65, 64, 62, 61, 61, 59, 59, 62, 63, 65, 67, 68, 72, 73,
+        76, 78, 81, 84, 85, 89, 90, 93, 96, 98, 99, 100, 102, 102, 102, 103,
+        105, 70, 66, 65, 63, 63, 62, 61, 60, 61, 63, 65, 66, 69, 70, 74, 74, 78,
+        79, 82, 84, 87, 89, 91, 94, 96, 100, 101, 103, 103, 105, 105, 105, 71,
+        67, 67, 64, 64, 62, 62, 60, 61, 64, 64, 67, 67, 71, 71, 75, 75, 79, 80,
+        84, 84, 89, 89, 94, 94, 98, 99, 104, 104, 106, 106, 109,
+        /* Size 4x16 */
+        31, 49, 61, 69, 32, 45, 55, 64, 36, 46, 54, 61, 41, 47, 54, 59, 46, 53,
+        59, 62, 46, 56, 62, 65, 46, 59, 68, 68, 48, 61, 73, 73, 51, 63, 77, 78,
+        54, 65, 82, 84, 57, 67, 86, 89, 60, 69, 88, 93, 62, 67, 86, 98, 64, 66,
+        87, 100, 65, 68, 83, 102, 67, 70, 86, 103,
+        /* Size 16x4 */
+        31, 32, 36, 41, 46, 46, 46, 48, 51, 54, 57, 60, 62, 64, 65, 67, 49, 45,
+        46, 47, 53, 56, 59, 61, 63, 65, 67, 69, 67, 66, 68, 70, 61, 55, 54, 54,
+        59, 62, 68, 73, 77, 82, 86, 88, 86, 87, 83, 86, 69, 64, 61, 59, 62, 65,
+        68, 73, 78, 84, 89, 93, 98, 100, 102, 103,
+        /* Size 8x32 */
+        32, 35, 48, 50, 57, 63, 68, 70, 31, 37, 47, 48, 54, 60, 64, 66, 30, 38,
+        46, 46, 52, 58, 63, 65, 31, 38, 46, 46, 52, 57, 61, 63, 33, 41, 47, 46,
+        51, 56, 60, 63, 37, 45, 47, 46, 50, 54, 59, 62, 39, 46, 48, 47, 51, 55,
+        58, 61, 42, 46, 50, 50, 53, 57, 60, 60, 49, 48, 53, 54, 57, 60, 61, 61,
+        48, 47, 53, 55, 58, 62, 64, 63, 48, 46, 53, 56, 60, 64, 65, 65, 49, 45,
+        53, 59, 64, 67, 67, 66, 50, 46, 54, 61, 66, 70, 71, 69, 51, 47, 54, 61,
+        68, 71, 72, 70, 52, 47, 54, 63, 71, 75, 75, 74, 54, 49, 55, 65, 73, 78,
+        78, 74, 55, 49, 56, 65, 74, 79, 79, 78, 57, 50, 56, 66, 76, 82, 83, 79,
+        60, 53, 58, 68, 79, 85, 85, 82, 62, 54, 60, 69, 81, 87, 87, 84, 63, 55,
+        60, 70, 82, 89, 91, 87, 64, 56, 61, 71, 83, 90, 92, 89, 66, 58, 62, 72,
+        84, 91, 95, 91, 67, 59, 63, 71, 83, 93, 96, 94, 68, 60, 64, 71, 81, 94,
+        97, 96, 69, 61, 65, 72, 80, 91, 99, 100, 70, 62, 65, 73, 81, 89, 98,
+        101, 71, 64, 65, 73, 82, 90, 99, 103, 72, 65, 65, 72, 82, 92, 100, 103,
+        73, 66, 65, 72, 81, 90, 100, 105, 74, 67, 65, 71, 79, 89, 98, 105, 75,
+        68, 65, 71, 78, 87, 96, 105,
+        /* Size 32x8 */
+        32, 31, 30, 31, 33, 37, 39, 42, 49, 48, 48, 49, 50, 51, 52, 54, 55, 57,
+        60, 62, 63, 64, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 35, 37, 38, 38,
+        41, 45, 46, 46, 48, 47, 46, 45, 46, 47, 47, 49, 49, 50, 53, 54, 55, 56,
+        58, 59, 60, 61, 62, 64, 65, 66, 67, 68, 48, 47, 46, 46, 47, 47, 48, 50,
+        53, 53, 53, 53, 54, 54, 54, 55, 56, 56, 58, 60, 60, 61, 62, 63, 64, 65,
+        65, 65, 65, 65, 65, 65, 50, 48, 46, 46, 46, 46, 47, 50, 54, 55, 56, 59,
+        61, 61, 63, 65, 65, 66, 68, 69, 70, 71, 72, 71, 71, 72, 73, 73, 72, 72,
+        71, 71, 57, 54, 52, 52, 51, 50, 51, 53, 57, 58, 60, 64, 66, 68, 71, 73,
+        74, 76, 79, 81, 82, 83, 84, 83, 81, 80, 81, 82, 82, 81, 79, 78, 63, 60,
+        58, 57, 56, 54, 55, 57, 60, 62, 64, 67, 70, 71, 75, 78, 79, 82, 85, 87,
+        89, 90, 91, 93, 94, 91, 89, 90, 92, 90, 89, 87, 68, 64, 63, 61, 60, 59,
+        58, 60, 61, 64, 65, 67, 71, 72, 75, 78, 79, 83, 85, 87, 91, 92, 95, 96,
+        97, 99, 98, 99, 100, 100, 98, 96, 70, 66, 65, 63, 63, 62, 61, 60, 61,
+        63, 65, 66, 69, 70, 74, 74, 78, 79, 82, 84, 87, 89, 91, 94, 96, 100,
+        101, 103, 103, 105, 105, 105 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 38, 63, 86, 38, 56, 78, 97, 63, 78, 113, 130, 86, 97, 130, 169,
+        /* Size 8x8 */
+        32, 32, 35, 46, 57, 76, 85, 96, 32, 34, 37, 45, 54, 70, 79, 90, 35, 37,
+        48, 56, 64, 79, 87, 93, 46, 45, 56, 70, 80, 96, 100, 105, 57, 54, 64,
+        80, 93, 111, 121, 122, 76, 70, 79, 96, 111, 134, 138, 144, 85, 79, 87,
+        100, 121, 138, 156, 168, 96, 90, 93, 105, 122, 144, 168, 184,
+        /* Size 16x16 */
+        32, 31, 31, 32, 34, 39, 44, 49, 58, 65, 71, 81, 87, 93, 98, 104, 31, 32,
+        32, 32, 34, 38, 41, 46, 54, 60, 66, 75, 81, 86, 92, 98, 31, 32, 33, 34,
+        36, 39, 42, 46, 53, 59, 64, 73, 78, 83, 88, 94, 32, 32, 34, 35, 37, 40,
+        42, 46, 52, 58, 63, 71, 75, 80, 86, 92, 34, 34, 36, 37, 42, 47, 50, 53,
+        59, 65, 70, 77, 82, 85, 89, 92, 39, 38, 39, 40, 47, 54, 58, 62, 68, 73,
+        78, 85, 90, 90, 96, 98, 44, 41, 42, 42, 50, 58, 63, 68, 74, 79, 84, 91,
+        96, 98, 102, 104, 49, 46, 46, 46, 53, 62, 68, 73, 81, 87, 92, 99, 103,
+        107, 109, 112, 58, 54, 53, 52, 59, 68, 74, 81, 90, 97, 102, 110, 114,
+        118, 117, 121, 65, 60, 59, 58, 65, 73, 79, 87, 97, 105, 111, 120, 125,
+        125, 126, 130, 71, 66, 64, 63, 70, 78, 84, 92, 102, 111, 117, 127, 133,
+        134, 136, 141, 81, 75, 73, 71, 77, 85, 91, 99, 110, 120, 127, 137, 143,
+        145, 148, 152, 87, 81, 78, 75, 82, 90, 96, 103, 114, 125, 133, 143, 150,
+        156, 160, 163, 93, 86, 83, 80, 85, 90, 98, 107, 118, 125, 134, 145, 156,
+        163, 169, 177, 98, 92, 88, 86, 89, 96, 102, 109, 117, 126, 136, 148,
+        160, 169, 176, 184, 104, 98, 94, 92, 92, 98, 104, 112, 121, 130, 141,
+        152, 163, 177, 184, 191,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 32, 32, 34, 34, 36, 39, 41, 44, 48, 49, 54, 58, 59,
+        65, 69, 71, 80, 81, 83, 87, 90, 93, 95, 98, 101, 104, 107, 31, 32, 32,
+        32, 32, 32, 32, 34, 34, 35, 38, 39, 42, 46, 47, 51, 55, 57, 62, 66, 68,
+        76, 77, 78, 83, 85, 88, 90, 93, 96, 99, 101, 31, 32, 32, 32, 32, 32, 32,
+        33, 34, 34, 38, 39, 41, 45, 46, 50, 54, 55, 60, 64, 66, 73, 75, 76, 81,
+        83, 86, 89, 92, 95, 98, 101, 31, 32, 32, 32, 32, 32, 32, 33, 34, 34, 37,
+        38, 41, 44, 45, 49, 53, 54, 59, 63, 65, 72, 74, 75, 79, 81, 84, 86, 89,
+        91, 94, 97, 31, 32, 32, 32, 33, 33, 34, 35, 36, 36, 39, 40, 42, 45, 46,
+        50, 53, 54, 59, 63, 64, 71, 73, 74, 78, 80, 83, 85, 88, 91, 94, 97, 32,
+        32, 32, 32, 33, 34, 34, 36, 36, 37, 40, 40, 42, 45, 46, 49, 53, 54, 58,
+        62, 63, 70, 72, 73, 77, 79, 82, 85, 87, 90, 92, 95, 32, 32, 32, 32, 34,
+        34, 35, 37, 37, 38, 40, 41, 42, 45, 46, 49, 52, 54, 58, 61, 63, 69, 71,
+        72, 75, 78, 80, 83, 86, 89, 92, 95, 34, 34, 33, 33, 35, 36, 37, 39, 41,
+        42, 45, 46, 47, 50, 51, 54, 57, 59, 63, 66, 68, 74, 75, 76, 80, 81, 82,
+        83, 85, 87, 90, 93, 34, 34, 34, 34, 36, 36, 37, 41, 42, 45, 47, 48, 50,
+        53, 53, 56, 59, 61, 65, 68, 70, 76, 77, 78, 82, 83, 85, 88, 89, 90, 92,
+        93, 36, 35, 34, 34, 36, 37, 38, 42, 45, 48, 50, 51, 54, 56, 57, 60, 63,
+        64, 68, 71, 73, 79, 80, 81, 85, 87, 89, 89, 90, 93, 96, 99, 39, 38, 38,
+        37, 39, 40, 40, 45, 47, 50, 54, 55, 58, 61, 62, 65, 68, 69, 73, 76, 78,
+        84, 85, 86, 90, 89, 90, 93, 96, 97, 98, 99, 41, 39, 39, 38, 40, 40, 41,
+        46, 48, 51, 55, 56, 59, 62, 63, 67, 70, 71, 75, 78, 80, 86, 87, 88, 91,
+        93, 96, 97, 97, 99, 102, 105, 44, 42, 41, 41, 42, 42, 42, 47, 50, 54,
+        58, 59, 63, 66, 68, 71, 74, 75, 79, 83, 84, 90, 91, 92, 96, 98, 98, 99,
+        102, 104, 104, 105, 48, 46, 45, 44, 45, 45, 45, 50, 53, 56, 61, 62, 66,
+        70, 71, 76, 79, 80, 85, 88, 90, 96, 97, 98, 101, 100, 102, 105, 105,
+        105, 109, 112, 49, 47, 46, 45, 46, 46, 46, 51, 53, 57, 62, 63, 68, 71,
+        73, 77, 81, 82, 87, 90, 92, 98, 99, 100, 103, 106, 107, 106, 109, 112,
+        112, 112, 54, 51, 50, 49, 50, 49, 49, 54, 56, 60, 65, 67, 71, 76, 77,
+        82, 86, 87, 92, 96, 97, 104, 105, 106, 110, 110, 109, 113, 114, 113,
+        116, 120, 58, 55, 54, 53, 53, 53, 52, 57, 59, 63, 68, 70, 74, 79, 81,
+        86, 90, 91, 97, 100, 102, 109, 110, 111, 114, 114, 118, 116, 117, 121,
+        121, 120, 59, 57, 55, 54, 54, 54, 54, 59, 61, 64, 69, 71, 75, 80, 82,
+        87, 91, 93, 99, 102, 104, 111, 112, 113, 117, 121, 120, 122, 124, 122,
+        125, 129, 65, 62, 60, 59, 59, 58, 58, 63, 65, 68, 73, 75, 79, 85, 87,
+        92, 97, 99, 105, 109, 111, 118, 120, 121, 125, 124, 125, 127, 126, 130,
+        130, 129, 69, 66, 64, 63, 63, 62, 61, 66, 68, 71, 76, 78, 83, 88, 90,
+        96, 100, 102, 109, 113, 115, 123, 125, 126, 129, 130, 131, 130, 134,
+        133, 135, 139, 71, 68, 66, 65, 64, 63, 63, 68, 70, 73, 78, 80, 84, 90,
+        92, 97, 102, 104, 111, 115, 117, 125, 127, 128, 133, 136, 134, 139, 136,
+        139, 141, 140, 80, 76, 73, 72, 71, 70, 69, 74, 76, 79, 84, 86, 90, 96,
+        98, 104, 109, 111, 118, 123, 125, 134, 136, 137, 142, 138, 143, 140,
+        144, 144, 144, 149, 81, 77, 75, 74, 73, 72, 71, 75, 77, 80, 85, 87, 91,
+        97, 99, 105, 110, 112, 120, 125, 127, 136, 137, 139, 143, 148, 145, 148,
+        148, 150, 152, 149, 83, 78, 76, 75, 74, 73, 72, 76, 78, 81, 86, 88, 92,
+        98, 100, 106, 111, 113, 121, 126, 128, 137, 139, 140, 145, 149, 153,
+        153, 154, 155, 155, 161, 87, 83, 81, 79, 78, 77, 75, 80, 82, 85, 90, 91,
+        96, 101, 103, 110, 114, 117, 125, 129, 133, 142, 143, 145, 150, 151,
+        156, 159, 160, 160, 163, 161, 90, 85, 83, 81, 80, 79, 78, 81, 83, 87,
+        89, 93, 98, 100, 106, 110, 114, 121, 124, 130, 136, 138, 148, 149, 151,
+        156, 157, 162, 166, 168, 166, 172, 93, 88, 86, 84, 83, 82, 80, 82, 85,
+        89, 90, 96, 98, 102, 107, 109, 118, 120, 125, 131, 134, 143, 145, 153,
+        156, 157, 163, 164, 169, 172, 177, 172, 95, 90, 89, 86, 85, 85, 83, 83,
+        88, 89, 93, 97, 99, 105, 106, 113, 116, 122, 127, 130, 139, 140, 148,
+        153, 159, 162, 164, 169, 170, 176, 179, 185, 98, 93, 92, 89, 88, 87, 86,
+        85, 89, 90, 96, 97, 102, 105, 109, 114, 117, 124, 126, 134, 136, 144,
+        148, 154, 160, 166, 169, 170, 176, 177, 184, 186, 101, 96, 95, 91, 91,
+        90, 89, 87, 90, 93, 97, 99, 104, 105, 112, 113, 121, 122, 130, 133, 139,
+        144, 150, 155, 160, 168, 172, 176, 177, 184, 185, 191, 104, 99, 98, 94,
+        94, 92, 92, 90, 92, 96, 98, 102, 104, 109, 112, 116, 121, 125, 130, 135,
+        141, 144, 152, 155, 163, 166, 177, 179, 184, 185, 191, 192, 107, 101,
+        101, 97, 97, 95, 95, 93, 93, 99, 99, 105, 105, 112, 112, 120, 120, 129,
+        129, 139, 140, 149, 149, 161, 161, 172, 172, 185, 186, 191, 192, 199,
+        /* Size 4x8 */
+        32, 38, 62, 86, 32, 40, 58, 80, 34, 51, 68, 85, 44, 61, 85, 101, 54, 69,
+        98, 117, 72, 84, 118, 136, 82, 89, 129, 157, 92, 98, 127, 165,
+        /* Size 8x4 */
+        32, 32, 34, 44, 54, 72, 82, 92, 38, 40, 51, 61, 69, 84, 89, 98, 62, 58,
+        68, 85, 98, 118, 129, 127, 86, 80, 85, 101, 117, 136, 157, 165,
+        /* Size 8x16 */
+        32, 32, 36, 44, 58, 79, 88, 93, 31, 32, 35, 41, 54, 73, 81, 88, 32, 33,
+        36, 42, 53, 71, 78, 84, 32, 34, 38, 42, 52, 69, 76, 82, 34, 36, 44, 50,
+        59, 75, 81, 84, 39, 39, 50, 58, 68, 84, 88, 90, 44, 42, 53, 63, 74, 90,
+        97, 97, 49, 46, 57, 67, 81, 97, 104, 105, 57, 53, 63, 74, 90, 108, 111,
+        113, 65, 59, 68, 79, 97, 118, 123, 122, 71, 64, 73, 84, 102, 125, 135,
+        131, 81, 72, 80, 91, 110, 135, 145, 141, 87, 77, 85, 96, 114, 140, 148,
+        151, 92, 83, 88, 102, 117, 133, 153, 163, 98, 88, 89, 103, 121, 141,
+        160, 169, 103, 94, 92, 103, 119, 137, 158, 175,
+        /* Size 16x8 */
+        32, 31, 32, 32, 34, 39, 44, 49, 57, 65, 71, 81, 87, 92, 98, 103, 32, 32,
+        33, 34, 36, 39, 42, 46, 53, 59, 64, 72, 77, 83, 88, 94, 36, 35, 36, 38,
+        44, 50, 53, 57, 63, 68, 73, 80, 85, 88, 89, 92, 44, 41, 42, 42, 50, 58,
+        63, 67, 74, 79, 84, 91, 96, 102, 103, 103, 58, 54, 53, 52, 59, 68, 74,
+        81, 90, 97, 102, 110, 114, 117, 121, 119, 79, 73, 71, 69, 75, 84, 90,
+        97, 108, 118, 125, 135, 140, 133, 141, 137, 88, 81, 78, 76, 81, 88, 97,
+        104, 111, 123, 135, 145, 148, 153, 160, 158, 93, 88, 84, 82, 84, 90, 97,
+        105, 113, 122, 131, 141, 151, 163, 169, 175,
+        /* Size 16x32 */
+        32, 31, 32, 32, 36, 39, 44, 53, 58, 65, 79, 81, 88, 90, 93, 96, 31, 32,
+        32, 32, 35, 38, 42, 51, 55, 62, 75, 77, 83, 86, 88, 91, 31, 32, 32, 32,
+        35, 38, 41, 50, 54, 60, 73, 75, 81, 84, 88, 91, 31, 32, 32, 33, 34, 37,
+        41, 49, 53, 59, 72, 74, 79, 82, 84, 87, 32, 32, 33, 34, 36, 39, 42, 50,
+        53, 59, 71, 72, 78, 81, 84, 87, 32, 32, 34, 34, 37, 40, 42, 49, 53, 58,
+        70, 71, 77, 80, 83, 85, 32, 33, 34, 35, 38, 40, 42, 49, 52, 58, 69, 70,
+        76, 78, 82, 86, 34, 34, 35, 37, 42, 45, 48, 54, 57, 63, 73, 75, 79, 79,
+        81, 83, 34, 34, 36, 37, 44, 47, 50, 56, 59, 65, 75, 77, 81, 83, 84, 84,
+        36, 34, 37, 38, 48, 51, 54, 60, 63, 68, 78, 80, 85, 85, 86, 89, 39, 37,
+        39, 40, 50, 54, 58, 65, 68, 73, 84, 85, 88, 89, 90, 89, 40, 38, 40, 41,
+        51, 55, 59, 67, 70, 75, 85, 87, 91, 92, 92, 95, 44, 41, 42, 43, 53, 58,
+        63, 71, 74, 79, 90, 91, 97, 94, 97, 95, 47, 44, 45, 46, 56, 61, 66, 75,
+        79, 85, 95, 97, 99, 101, 98, 102, 49, 46, 46, 47, 57, 62, 67, 77, 81,
+        86, 97, 99, 104, 102, 105, 102, 53, 49, 50, 50, 60, 65, 71, 82, 86, 92,
+        103, 105, 109, 108, 106, 110, 57, 53, 53, 53, 63, 68, 74, 86, 90, 97,
+        108, 110, 111, 112, 113, 110, 59, 54, 54, 54, 64, 69, 75, 87, 91, 98,
+        111, 112, 119, 117, 115, 118, 65, 60, 59, 58, 68, 73, 79, 92, 97, 105,
+        118, 119, 123, 123, 122, 119, 69, 63, 62, 62, 71, 76, 83, 96, 100, 109,
+        122, 124, 127, 125, 125, 128, 71, 65, 64, 63, 73, 78, 84, 97, 102, 111,
+        125, 127, 135, 134, 131, 129, 79, 72, 71, 70, 79, 84, 90, 104, 109, 118,
+        133, 135, 137, 136, 136, 137, 81, 74, 72, 71, 80, 85, 91, 105, 110, 120,
+        135, 137, 145, 143, 141, 138, 82, 75, 73, 72, 81, 86, 92, 106, 111, 121,
+        136, 139, 147, 148, 147, 149, 87, 79, 77, 76, 85, 90, 96, 110, 114, 125,
+        140, 143, 148, 154, 151, 149, 90, 82, 80, 78, 87, 89, 99, 108, 113, 129,
+        135, 146, 153, 157, 160, 159, 92, 84, 83, 81, 88, 90, 102, 106, 117,
+        128, 133, 150, 153, 158, 163, 160, 95, 87, 85, 83, 88, 92, 103, 105,
+        120, 125, 137, 148, 155, 164, 168, 173, 98, 89, 88, 85, 89, 95, 103,
+        108, 121, 124, 141, 144, 160, 164, 169, 174, 100, 92, 91, 88, 90, 98,
+        103, 111, 120, 127, 139, 146, 161, 165, 175, 179, 103, 94, 94, 90, 92,
+        101, 103, 114, 119, 131, 137, 150, 158, 170, 175, 180, 106, 97, 97, 93,
+        93, 104, 104, 118, 118, 135, 135, 154, 155, 175, 176, 187,
+        /* Size 32x16 */
+        32, 31, 31, 31, 32, 32, 32, 34, 34, 36, 39, 40, 44, 47, 49, 53, 57, 59,
+        65, 69, 71, 79, 81, 82, 87, 90, 92, 95, 98, 100, 103, 106, 31, 32, 32,
+        32, 32, 32, 33, 34, 34, 34, 37, 38, 41, 44, 46, 49, 53, 54, 60, 63, 65,
+        72, 74, 75, 79, 82, 84, 87, 89, 92, 94, 97, 32, 32, 32, 32, 33, 34, 34,
+        35, 36, 37, 39, 40, 42, 45, 46, 50, 53, 54, 59, 62, 64, 71, 72, 73, 77,
+        80, 83, 85, 88, 91, 94, 97, 32, 32, 32, 33, 34, 34, 35, 37, 37, 38, 40,
+        41, 43, 46, 47, 50, 53, 54, 58, 62, 63, 70, 71, 72, 76, 78, 81, 83, 85,
+        88, 90, 93, 36, 35, 35, 34, 36, 37, 38, 42, 44, 48, 50, 51, 53, 56, 57,
+        60, 63, 64, 68, 71, 73, 79, 80, 81, 85, 87, 88, 88, 89, 90, 92, 93, 39,
+        38, 38, 37, 39, 40, 40, 45, 47, 51, 54, 55, 58, 61, 62, 65, 68, 69, 73,
+        76, 78, 84, 85, 86, 90, 89, 90, 92, 95, 98, 101, 104, 44, 42, 41, 41,
+        42, 42, 42, 48, 50, 54, 58, 59, 63, 66, 67, 71, 74, 75, 79, 83, 84, 90,
+        91, 92, 96, 99, 102, 103, 103, 103, 103, 104, 53, 51, 50, 49, 50, 49,
+        49, 54, 56, 60, 65, 67, 71, 75, 77, 82, 86, 87, 92, 96, 97, 104, 105,
+        106, 110, 108, 106, 105, 108, 111, 114, 118, 58, 55, 54, 53, 53, 53, 52,
+        57, 59, 63, 68, 70, 74, 79, 81, 86, 90, 91, 97, 100, 102, 109, 110, 111,
+        114, 113, 117, 120, 121, 120, 119, 118, 65, 62, 60, 59, 59, 58, 58, 63,
+        65, 68, 73, 75, 79, 85, 86, 92, 97, 98, 105, 109, 111, 118, 120, 121,
+        125, 129, 128, 125, 124, 127, 131, 135, 79, 75, 73, 72, 71, 70, 69, 73,
+        75, 78, 84, 85, 90, 95, 97, 103, 108, 111, 118, 122, 125, 133, 135, 136,
+        140, 135, 133, 137, 141, 139, 137, 135, 81, 77, 75, 74, 72, 71, 70, 75,
+        77, 80, 85, 87, 91, 97, 99, 105, 110, 112, 119, 124, 127, 135, 137, 139,
+        143, 146, 150, 148, 144, 146, 150, 154, 88, 83, 81, 79, 78, 77, 76, 79,
+        81, 85, 88, 91, 97, 99, 104, 109, 111, 119, 123, 127, 135, 137, 145,
+        147, 148, 153, 153, 155, 160, 161, 158, 155, 90, 86, 84, 82, 81, 80, 78,
+        79, 83, 85, 89, 92, 94, 101, 102, 108, 112, 117, 123, 125, 134, 136,
+        143, 148, 154, 157, 158, 164, 164, 165, 170, 175, 93, 88, 88, 84, 84,
+        83, 82, 81, 84, 86, 90, 92, 97, 98, 105, 106, 113, 115, 122, 125, 131,
+        136, 141, 147, 151, 160, 163, 168, 169, 175, 175, 176, 96, 91, 91, 87,
+        87, 85, 86, 83, 84, 89, 89, 95, 95, 102, 102, 110, 110, 118, 119, 128,
+        129, 137, 138, 149, 149, 159, 160, 173, 174, 179, 180, 187,
+        /* Size 4x16 */
+        31, 39, 65, 90, 32, 38, 60, 84, 32, 39, 59, 81, 33, 40, 58, 78, 34, 47,
+        65, 83, 37, 54, 73, 89, 41, 58, 79, 94, 46, 62, 86, 102, 53, 68, 97,
+        112, 60, 73, 105, 123, 65, 78, 111, 134, 74, 85, 120, 143, 79, 90, 125,
+        154, 84, 90, 128, 158, 89, 95, 124, 164, 94, 101, 131, 170,
+        /* Size 16x4 */
+        31, 32, 32, 33, 34, 37, 41, 46, 53, 60, 65, 74, 79, 84, 89, 94, 39, 38,
+        39, 40, 47, 54, 58, 62, 68, 73, 78, 85, 90, 90, 95, 101, 65, 60, 59, 58,
+        65, 73, 79, 86, 97, 105, 111, 120, 125, 128, 124, 131, 90, 84, 81, 78,
+        83, 89, 94, 102, 112, 123, 134, 143, 154, 158, 164, 170,
+        /* Size 8x32 */
+        32, 32, 36, 44, 58, 79, 88, 93, 31, 32, 35, 42, 55, 75, 83, 88, 31, 32,
+        35, 41, 54, 73, 81, 88, 31, 32, 34, 41, 53, 72, 79, 84, 32, 33, 36, 42,
+        53, 71, 78, 84, 32, 34, 37, 42, 53, 70, 77, 83, 32, 34, 38, 42, 52, 69,
+        76, 82, 34, 35, 42, 48, 57, 73, 79, 81, 34, 36, 44, 50, 59, 75, 81, 84,
+        36, 37, 48, 54, 63, 78, 85, 86, 39, 39, 50, 58, 68, 84, 88, 90, 40, 40,
+        51, 59, 70, 85, 91, 92, 44, 42, 53, 63, 74, 90, 97, 97, 47, 45, 56, 66,
+        79, 95, 99, 98, 49, 46, 57, 67, 81, 97, 104, 105, 53, 50, 60, 71, 86,
+        103, 109, 106, 57, 53, 63, 74, 90, 108, 111, 113, 59, 54, 64, 75, 91,
+        111, 119, 115, 65, 59, 68, 79, 97, 118, 123, 122, 69, 62, 71, 83, 100,
+        122, 127, 125, 71, 64, 73, 84, 102, 125, 135, 131, 79, 71, 79, 90, 109,
+        133, 137, 136, 81, 72, 80, 91, 110, 135, 145, 141, 82, 73, 81, 92, 111,
+        136, 147, 147, 87, 77, 85, 96, 114, 140, 148, 151, 90, 80, 87, 99, 113,
+        135, 153, 160, 92, 83, 88, 102, 117, 133, 153, 163, 95, 85, 88, 103,
+        120, 137, 155, 168, 98, 88, 89, 103, 121, 141, 160, 169, 100, 91, 90,
+        103, 120, 139, 161, 175, 103, 94, 92, 103, 119, 137, 158, 175, 106, 97,
+        93, 104, 118, 135, 155, 176,
+        /* Size 32x8 */
+        32, 31, 31, 31, 32, 32, 32, 34, 34, 36, 39, 40, 44, 47, 49, 53, 57, 59,
+        65, 69, 71, 79, 81, 82, 87, 90, 92, 95, 98, 100, 103, 106, 32, 32, 32,
+        32, 33, 34, 34, 35, 36, 37, 39, 40, 42, 45, 46, 50, 53, 54, 59, 62, 64,
+        71, 72, 73, 77, 80, 83, 85, 88, 91, 94, 97, 36, 35, 35, 34, 36, 37, 38,
+        42, 44, 48, 50, 51, 53, 56, 57, 60, 63, 64, 68, 71, 73, 79, 80, 81, 85,
+        87, 88, 88, 89, 90, 92, 93, 44, 42, 41, 41, 42, 42, 42, 48, 50, 54, 58,
+        59, 63, 66, 67, 71, 74, 75, 79, 83, 84, 90, 91, 92, 96, 99, 102, 103,
+        103, 103, 103, 104, 58, 55, 54, 53, 53, 53, 52, 57, 59, 63, 68, 70, 74,
+        79, 81, 86, 90, 91, 97, 100, 102, 109, 110, 111, 114, 113, 117, 120,
+        121, 120, 119, 118, 79, 75, 73, 72, 71, 70, 69, 73, 75, 78, 84, 85, 90,
+        95, 97, 103, 108, 111, 118, 122, 125, 133, 135, 136, 140, 135, 133, 137,
+        141, 139, 137, 135, 88, 83, 81, 79, 78, 77, 76, 79, 81, 85, 88, 91, 97,
+        99, 104, 109, 111, 119, 123, 127, 135, 137, 145, 147, 148, 153, 153,
+        155, 160, 161, 158, 155, 93, 88, 88, 84, 84, 83, 82, 81, 84, 86, 90, 92,
+        97, 98, 105, 106, 113, 115, 122, 125, 131, 136, 141, 147, 151, 160, 163,
+        168, 169, 175, 175, 176 },
+      { /* Chroma */
+        /* Size 4x4 */
+        32, 45, 53, 63, 45, 55, 62, 67, 53, 62, 80, 84, 63, 67, 84, 101,
+        /* Size 8x8 */
+        31, 36, 47, 48, 52, 60, 64, 67, 36, 43, 47, 46, 49, 55, 59, 63, 47, 47,
+        53, 54, 55, 60, 63, 64, 48, 46, 54, 61, 65, 70, 71, 71, 52, 49, 55, 65,
+        71, 78, 81, 79, 60, 55, 60, 70, 78, 89, 89, 89, 64, 59, 63, 71, 81, 89,
+        97, 99, 67, 63, 64, 71, 79, 89, 99, 104,
+        /* Size 16x16 */
+        32, 30, 33, 36, 44, 48, 49, 51, 54, 57, 60, 64, 67, 68, 70, 72, 30, 31,
+        35, 39, 44, 46, 46, 47, 50, 53, 55, 59, 61, 64, 66, 68, 33, 35, 39, 43,
+        46, 46, 45, 47, 49, 51, 53, 57, 59, 61, 63, 65, 36, 39, 43, 47, 47, 46,
+        45, 46, 48, 50, 52, 55, 57, 58, 61, 63, 44, 44, 46, 47, 50, 51, 51, 51,
+        53, 54, 56, 59, 61, 61, 63, 62, 48, 46, 46, 46, 51, 54, 55, 56, 58, 60,
+        61, 64, 65, 64, 66, 66, 49, 46, 45, 45, 51, 55, 58, 60, 62, 63, 65, 68,
+        69, 69, 69, 69, 51, 47, 47, 46, 51, 56, 60, 62, 65, 67, 69, 72, 73, 74,
+        73, 73, 54, 50, 49, 48, 53, 58, 62, 65, 70, 73, 75, 78, 79, 79, 77, 77,
+        57, 53, 51, 50, 54, 60, 63, 67, 73, 76, 79, 82, 84, 83, 82, 82, 60, 55,
+        53, 52, 56, 61, 65, 69, 75, 79, 82, 86, 88, 87, 86, 87, 64, 59, 57, 55,
+        59, 64, 68, 72, 78, 82, 86, 90, 93, 92, 91, 92, 67, 61, 59, 57, 61, 65,
+        69, 73, 79, 84, 88, 93, 95, 96, 96, 96, 68, 64, 61, 58, 61, 64, 69, 74,
+        79, 83, 87, 92, 96, 99, 100, 101, 70, 66, 63, 61, 63, 66, 69, 73, 77,
+        82, 86, 91, 96, 100, 103, 104, 72, 68, 65, 63, 62, 66, 69, 73, 77, 82,
+        87, 92, 96, 101, 104, 106,
+        /* Size 32x32 */
+        32, 31, 30, 30, 33, 35, 36, 41, 44, 49, 48, 48, 49, 50, 51, 52, 54, 55,
+        57, 59, 60, 63, 64, 65, 67, 68, 68, 69, 70, 71, 72, 73, 31, 31, 31, 31,
+        34, 36, 38, 42, 44, 47, 47, 47, 47, 48, 48, 50, 51, 52, 54, 56, 57, 60,
+        61, 61, 63, 64, 65, 66, 67, 67, 68, 69, 30, 31, 31, 31, 35, 37, 39, 42,
+        44, 47, 46, 46, 46, 47, 47, 48, 50, 51, 53, 54, 55, 58, 59, 60, 61, 63,
+        64, 65, 66, 67, 68, 69, 30, 31, 31, 32, 35, 37, 40, 42, 44, 46, 45, 45,
+        45, 46, 46, 47, 49, 50, 52, 53, 54, 57, 58, 58, 60, 61, 62, 63, 63, 64,
+        65, 66, 33, 34, 35, 35, 39, 41, 43, 45, 46, 47, 46, 46, 45, 46, 47, 47,
+        49, 49, 51, 53, 53, 56, 57, 57, 59, 60, 61, 62, 63, 64, 65, 66, 35, 36,
+        37, 37, 41, 43, 45, 46, 46, 47, 46, 46, 45, 46, 46, 47, 48, 49, 50, 52,
+        53, 55, 56, 56, 58, 59, 60, 61, 62, 63, 64, 64, 36, 38, 39, 40, 43, 45,
+        47, 47, 47, 48, 46, 46, 45, 46, 46, 47, 48, 48, 50, 51, 52, 54, 55, 55,
+        57, 58, 58, 59, 61, 62, 63, 64, 41, 42, 42, 42, 45, 46, 47, 48, 49, 50,
+        49, 49, 49, 50, 50, 50, 51, 52, 53, 54, 55, 57, 58, 58, 60, 60, 59, 59,
+        60, 61, 61, 62, 44, 44, 44, 44, 46, 46, 47, 49, 50, 51, 51, 51, 51, 51,
+        51, 52, 53, 53, 54, 56, 56, 59, 59, 59, 61, 61, 61, 62, 63, 62, 62, 62,
+        49, 47, 47, 46, 47, 47, 48, 50, 51, 53, 53, 53, 53, 54, 54, 54, 55, 55,
+        56, 58, 58, 60, 61, 61, 63, 63, 64, 63, 63, 64, 65, 66, 48, 47, 46, 45,
+        46, 46, 46, 49, 51, 53, 54, 54, 55, 56, 56, 57, 58, 59, 60, 61, 61, 63,
+        64, 64, 65, 65, 64, 65, 66, 66, 66, 66, 48, 47, 46, 45, 46, 46, 46, 49,
+        51, 53, 54, 55, 56, 57, 57, 58, 59, 60, 61, 62, 63, 65, 65, 65, 66, 67,
+        68, 67, 67, 67, 68, 69, 49, 47, 46, 45, 45, 45, 45, 49, 51, 53, 55, 56,
+        58, 59, 60, 61, 62, 62, 63, 65, 65, 67, 68, 68, 69, 70, 69, 69, 69, 70,
+        69, 69, 50, 48, 47, 46, 46, 46, 46, 50, 51, 54, 56, 57, 59, 61, 62, 63,
+        64, 65, 66, 68, 68, 70, 71, 71, 72, 71, 71, 72, 71, 71, 71, 72, 51, 48,
+        47, 46, 47, 46, 46, 50, 51, 54, 56, 57, 60, 62, 62, 64, 65, 66, 67, 69,
+        69, 71, 72, 72, 73, 74, 74, 72, 73, 74, 73, 73, 52, 50, 48, 47, 47, 47,
+        47, 50, 52, 54, 57, 58, 61, 63, 64, 66, 68, 68, 70, 72, 72, 75, 75, 75,
+        77, 76, 75, 76, 76, 74, 75, 76, 54, 51, 50, 49, 49, 48, 48, 51, 53, 55,
+        58, 59, 62, 64, 65, 68, 70, 70, 73, 74, 75, 77, 78, 78, 79, 78, 79, 78,
+        77, 78, 77, 77, 55, 52, 51, 50, 49, 49, 48, 52, 53, 55, 59, 60, 62, 65,
+        66, 68, 70, 71, 73, 75, 76, 78, 79, 79, 80, 81, 80, 80, 81, 79, 79, 81,
+        57, 54, 53, 52, 51, 50, 50, 53, 54, 56, 60, 61, 63, 66, 67, 70, 73, 73,
+        76, 78, 79, 82, 82, 83, 84, 83, 83, 83, 82, 83, 82, 81, 59, 56, 54, 53,
+        53, 52, 51, 54, 56, 58, 61, 62, 65, 68, 69, 72, 74, 75, 78, 80, 81, 84,
+        85, 85, 86, 86, 86, 84, 85, 84, 84, 85, 60, 57, 55, 54, 53, 53, 52, 55,
+        56, 58, 61, 63, 65, 68, 69, 72, 75, 76, 79, 81, 82, 85, 86, 86, 88, 88,
+        87, 88, 86, 87, 87, 85, 63, 60, 58, 57, 56, 55, 54, 57, 59, 60, 63, 65,
+        67, 70, 71, 75, 77, 78, 82, 84, 85, 89, 89, 90, 92, 89, 91, 89, 90, 89,
+        88, 89, 64, 61, 59, 58, 57, 56, 55, 58, 59, 61, 64, 65, 68, 71, 72, 75,
+        78, 79, 82, 85, 86, 89, 90, 91, 93, 94, 92, 92, 91, 91, 92, 90, 65, 61,
+        60, 58, 57, 56, 55, 58, 59, 61, 64, 65, 68, 71, 72, 75, 78, 79, 83, 85,
+        86, 90, 91, 91, 93, 94, 95, 94, 94, 94, 93, 94, 67, 63, 61, 60, 59, 58,
+        57, 60, 61, 63, 65, 66, 69, 72, 73, 77, 79, 80, 84, 86, 88, 92, 93, 93,
+        95, 95, 96, 97, 96, 95, 96, 94, 68, 64, 63, 61, 60, 59, 58, 60, 61, 63,
+        65, 67, 70, 71, 74, 76, 78, 81, 83, 86, 88, 89, 94, 94, 95, 97, 97, 98,
+        99, 99, 97, 99, 68, 65, 64, 62, 61, 60, 58, 59, 61, 64, 64, 68, 69, 71,
+        74, 75, 79, 80, 83, 86, 87, 91, 92, 95, 96, 97, 99, 99, 100, 100, 101,
+        99, 69, 66, 65, 63, 62, 61, 59, 59, 62, 63, 65, 67, 69, 72, 72, 76, 78,
+        80, 83, 84, 88, 89, 92, 94, 97, 98, 99, 101, 100, 102, 102, 104, 70, 67,
+        66, 63, 63, 62, 61, 60, 63, 63, 66, 67, 69, 71, 73, 76, 77, 81, 82, 85,
+        86, 90, 91, 94, 96, 99, 100, 100, 103, 102, 104, 104, 71, 67, 67, 64,
+        64, 63, 62, 61, 62, 64, 66, 67, 70, 71, 74, 74, 78, 79, 83, 84, 87, 89,
+        91, 94, 95, 99, 100, 102, 102, 104, 104, 106, 72, 68, 68, 65, 65, 64,
+        63, 61, 62, 65, 66, 68, 69, 71, 73, 75, 77, 79, 82, 84, 87, 88, 92, 93,
+        96, 97, 101, 102, 104, 104, 106, 106, 73, 69, 69, 66, 66, 64, 64, 62,
+        62, 66, 66, 69, 69, 72, 73, 76, 77, 81, 81, 85, 85, 89, 90, 94, 94, 99,
+        99, 104, 104, 106, 106, 108,
+        /* Size 4x8 */
+        31, 47, 54, 64, 38, 46, 50, 60, 46, 53, 57, 62, 46, 56, 66, 71, 50, 59,
+        74, 79, 57, 64, 82, 88, 61, 65, 85, 97, 65, 67, 82, 99,
+        /* Size 8x4 */
+        31, 38, 46, 46, 50, 57, 61, 65, 47, 46, 53, 56, 59, 64, 65, 67, 54, 50,
+        57, 66, 74, 82, 85, 82, 64, 60, 62, 71, 79, 88, 97, 99,
+        /* Size 8x16 */
+        32, 34, 48, 49, 54, 63, 67, 69, 31, 36, 46, 46, 50, 58, 62, 65, 33, 40,
+        47, 46, 49, 56, 59, 62, 37, 44, 47, 45, 48, 54, 57, 60, 44, 46, 51, 51,
+        53, 59, 60, 61, 48, 46, 53, 56, 58, 64, 64, 64, 49, 45, 53, 58, 62, 67,
+        70, 68, 51, 47, 54, 60, 65, 71, 73, 72, 54, 49, 55, 62, 70, 77, 77, 76,
+        57, 51, 56, 64, 73, 82, 83, 81, 60, 53, 58, 65, 75, 85, 89, 85, 64, 57,
+        61, 68, 78, 89, 93, 89, 66, 59, 63, 69, 79, 91, 94, 93, 68, 61, 63, 71,
+        79, 87, 96, 98, 70, 63, 63, 70, 80, 89, 97, 100, 72, 65, 63, 69, 77, 86,
+        95, 102,
+        /* Size 16x8 */
+        32, 31, 33, 37, 44, 48, 49, 51, 54, 57, 60, 64, 66, 68, 70, 72, 34, 36,
+        40, 44, 46, 46, 45, 47, 49, 51, 53, 57, 59, 61, 63, 65, 48, 46, 47, 47,
+        51, 53, 53, 54, 55, 56, 58, 61, 63, 63, 63, 63, 49, 46, 46, 45, 51, 56,
+        58, 60, 62, 64, 65, 68, 69, 71, 70, 69, 54, 50, 49, 48, 53, 58, 62, 65,
+        70, 73, 75, 78, 79, 79, 80, 77, 63, 58, 56, 54, 59, 64, 67, 71, 77, 82,
+        85, 89, 91, 87, 89, 86, 67, 62, 59, 57, 60, 64, 70, 73, 77, 83, 89, 93,
+        94, 96, 97, 95, 69, 65, 62, 60, 61, 64, 68, 72, 76, 81, 85, 89, 93, 98,
+        100, 102,
+        /* Size 16x32 */
+        32, 31, 34, 37, 48, 48, 49, 52, 54, 57, 63, 64, 67, 68, 69, 69, 31, 31,
+        35, 38, 47, 47, 47, 50, 51, 54, 60, 61, 63, 64, 65, 66, 31, 32, 36, 39,
+        46, 46, 46, 48, 50, 53, 58, 59, 62, 63, 65, 66, 30, 32, 36, 40, 46, 45,
+        45, 48, 49, 52, 57, 58, 60, 61, 62, 63, 33, 36, 40, 43, 47, 46, 46, 47,
+        49, 51, 56, 57, 59, 60, 62, 63, 35, 38, 42, 45, 47, 46, 45, 47, 48, 50,
+        55, 56, 58, 60, 61, 61, 37, 40, 44, 47, 47, 46, 45, 47, 48, 50, 54, 55,
+        57, 58, 60, 61, 42, 43, 45, 47, 50, 50, 49, 50, 51, 53, 57, 58, 59, 58,
+        59, 59, 44, 44, 46, 47, 51, 51, 51, 52, 53, 54, 59, 59, 60, 61, 61, 60,
+        49, 46, 47, 48, 53, 53, 53, 54, 55, 57, 60, 61, 63, 62, 62, 63, 48, 46,
+        46, 47, 53, 54, 56, 57, 58, 60, 64, 64, 64, 64, 64, 63, 48, 45, 46, 46,
+        53, 55, 56, 58, 59, 61, 65, 65, 66, 66, 65, 66, 49, 45, 45, 46, 53, 56,
+        58, 61, 62, 64, 67, 68, 70, 67, 68, 66, 50, 46, 46, 46, 54, 56, 59, 63,
+        65, 66, 70, 71, 70, 71, 68, 70, 51, 47, 47, 47, 54, 57, 60, 64, 65, 68,
+        71, 72, 73, 71, 72, 70, 52, 48, 47, 47, 54, 57, 61, 66, 68, 71, 75, 75,
+        76, 75, 73, 73, 54, 49, 49, 48, 55, 58, 62, 68, 70, 73, 77, 78, 77, 77,
+        76, 74, 54, 50, 49, 49, 55, 59, 62, 68, 70, 74, 78, 79, 81, 79, 77, 78,
+        57, 52, 51, 50, 56, 60, 64, 70, 73, 76, 82, 82, 83, 82, 81, 78, 59, 54,
+        52, 52, 58, 61, 65, 72, 74, 78, 84, 85, 85, 83, 82, 82, 60, 54, 53, 52,
+        58, 62, 65, 72, 75, 79, 85, 86, 89, 87, 85, 82, 63, 57, 56, 55, 60, 64,
+        67, 75, 77, 82, 89, 90, 90, 88, 87, 86, 64, 58, 57, 55, 61, 64, 68, 75,
+        78, 82, 89, 90, 93, 91, 89, 87, 64, 59, 57, 56, 61, 65, 68, 75, 78, 83,
+        90, 91, 94, 93, 92, 91, 66, 60, 59, 57, 63, 66, 69, 77, 79, 84, 91, 93,
+        94, 95, 93, 91, 67, 61, 60, 58, 63, 65, 70, 75, 78, 85, 88, 93, 96, 97,
+        97, 95, 68, 62, 61, 59, 63, 64, 71, 74, 79, 84, 87, 94, 96, 97, 98, 96,
+        69, 63, 62, 60, 63, 65, 71, 72, 80, 82, 88, 93, 96, 99, 100, 101, 70,
+        64, 63, 60, 63, 66, 70, 73, 80, 81, 89, 90, 97, 99, 100, 101, 71, 65,
+        64, 61, 63, 67, 70, 74, 78, 82, 88, 90, 97, 99, 102, 103, 72, 65, 65,
+        62, 63, 68, 69, 75, 77, 83, 86, 92, 95, 100, 102, 103, 73, 66, 66, 63,
+        63, 69, 69, 76, 76, 84, 84, 93, 93, 101, 101, 105,
+        /* Size 32x16 */
+        32, 31, 31, 30, 33, 35, 37, 42, 44, 49, 48, 48, 49, 50, 51, 52, 54, 54,
+        57, 59, 60, 63, 64, 64, 66, 67, 68, 69, 70, 71, 72, 73, 31, 31, 32, 32,
+        36, 38, 40, 43, 44, 46, 46, 45, 45, 46, 47, 48, 49, 50, 52, 54, 54, 57,
+        58, 59, 60, 61, 62, 63, 64, 65, 65, 66, 34, 35, 36, 36, 40, 42, 44, 45,
+        46, 47, 46, 46, 45, 46, 47, 47, 49, 49, 51, 52, 53, 56, 57, 57, 59, 60,
+        61, 62, 63, 64, 65, 66, 37, 38, 39, 40, 43, 45, 47, 47, 47, 48, 47, 46,
+        46, 46, 47, 47, 48, 49, 50, 52, 52, 55, 55, 56, 57, 58, 59, 60, 60, 61,
+        62, 63, 48, 47, 46, 46, 47, 47, 47, 50, 51, 53, 53, 53, 53, 54, 54, 54,
+        55, 55, 56, 58, 58, 60, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63, 48, 47,
+        46, 45, 46, 46, 46, 50, 51, 53, 54, 55, 56, 56, 57, 57, 58, 59, 60, 61,
+        62, 64, 64, 65, 66, 65, 64, 65, 66, 67, 68, 69, 49, 47, 46, 45, 46, 45,
+        45, 49, 51, 53, 56, 56, 58, 59, 60, 61, 62, 62, 64, 65, 65, 67, 68, 68,
+        69, 70, 71, 71, 70, 70, 69, 69, 52, 50, 48, 48, 47, 47, 47, 50, 52, 54,
+        57, 58, 61, 63, 64, 66, 68, 68, 70, 72, 72, 75, 75, 75, 77, 75, 74, 72,
+        73, 74, 75, 76, 54, 51, 50, 49, 49, 48, 48, 51, 53, 55, 58, 59, 62, 65,
+        65, 68, 70, 70, 73, 74, 75, 77, 78, 78, 79, 78, 79, 80, 80, 78, 77, 76,
+        57, 54, 53, 52, 51, 50, 50, 53, 54, 57, 60, 61, 64, 66, 68, 71, 73, 74,
+        76, 78, 79, 82, 82, 83, 84, 85, 84, 82, 81, 82, 83, 84, 63, 60, 58, 57,
+        56, 55, 54, 57, 59, 60, 64, 65, 67, 70, 71, 75, 77, 78, 82, 84, 85, 89,
+        89, 90, 91, 88, 87, 88, 89, 88, 86, 84, 64, 61, 59, 58, 57, 56, 55, 58,
+        59, 61, 64, 65, 68, 71, 72, 75, 78, 79, 82, 85, 86, 90, 90, 91, 93, 93,
+        94, 93, 90, 90, 92, 93, 67, 63, 62, 60, 59, 58, 57, 59, 60, 63, 64, 66,
+        70, 70, 73, 76, 77, 81, 83, 85, 89, 90, 93, 94, 94, 96, 96, 96, 97, 97,
+        95, 93, 68, 64, 63, 61, 60, 60, 58, 58, 61, 62, 64, 66, 67, 71, 71, 75,
+        77, 79, 82, 83, 87, 88, 91, 93, 95, 97, 97, 99, 99, 99, 100, 101, 69,
+        65, 65, 62, 62, 61, 60, 59, 61, 62, 64, 65, 68, 68, 72, 73, 76, 77, 81,
+        82, 85, 87, 89, 92, 93, 97, 98, 100, 100, 102, 102, 101, 69, 66, 66, 63,
+        63, 61, 61, 59, 60, 63, 63, 66, 66, 70, 70, 73, 74, 78, 78, 82, 82, 86,
+        87, 91, 91, 95, 96, 101, 101, 103, 103, 105,
+        /* Size 4x16 */
+        31, 48, 57, 68, 32, 46, 53, 63, 36, 46, 51, 60, 40, 46, 50, 58, 44, 51,
+        54, 61, 46, 54, 60, 64, 45, 56, 64, 67, 47, 57, 68, 71, 49, 58, 73, 77,
+        52, 60, 76, 82, 54, 62, 79, 87, 58, 64, 82, 91, 60, 66, 84, 95, 62, 64,
+        84, 97, 64, 66, 81, 99, 65, 68, 83, 100,
+        /* Size 16x4 */
+        31, 32, 36, 40, 44, 46, 45, 47, 49, 52, 54, 58, 60, 62, 64, 65, 48, 46,
+        46, 46, 51, 54, 56, 57, 58, 60, 62, 64, 66, 64, 66, 68, 57, 53, 51, 50,
+        54, 60, 64, 68, 73, 76, 79, 82, 84, 84, 81, 83, 68, 63, 60, 58, 61, 64,
+        67, 71, 77, 82, 87, 91, 95, 97, 99, 100,
+        /* Size 8x32 */
+        32, 34, 48, 49, 54, 63, 67, 69, 31, 35, 47, 47, 51, 60, 63, 65, 31, 36,
+        46, 46, 50, 58, 62, 65, 30, 36, 46, 45, 49, 57, 60, 62, 33, 40, 47, 46,
+        49, 56, 59, 62, 35, 42, 47, 45, 48, 55, 58, 61, 37, 44, 47, 45, 48, 54,
+        57, 60, 42, 45, 50, 49, 51, 57, 59, 59, 44, 46, 51, 51, 53, 59, 60, 61,
+        49, 47, 53, 53, 55, 60, 63, 62, 48, 46, 53, 56, 58, 64, 64, 64, 48, 46,
+        53, 56, 59, 65, 66, 65, 49, 45, 53, 58, 62, 67, 70, 68, 50, 46, 54, 59,
+        65, 70, 70, 68, 51, 47, 54, 60, 65, 71, 73, 72, 52, 47, 54, 61, 68, 75,
+        76, 73, 54, 49, 55, 62, 70, 77, 77, 76, 54, 49, 55, 62, 70, 78, 81, 77,
+        57, 51, 56, 64, 73, 82, 83, 81, 59, 52, 58, 65, 74, 84, 85, 82, 60, 53,
+        58, 65, 75, 85, 89, 85, 63, 56, 60, 67, 77, 89, 90, 87, 64, 57, 61, 68,
+        78, 89, 93, 89, 64, 57, 61, 68, 78, 90, 94, 92, 66, 59, 63, 69, 79, 91,
+        94, 93, 67, 60, 63, 70, 78, 88, 96, 97, 68, 61, 63, 71, 79, 87, 96, 98,
+        69, 62, 63, 71, 80, 88, 96, 100, 70, 63, 63, 70, 80, 89, 97, 100, 71,
+        64, 63, 70, 78, 88, 97, 102, 72, 65, 63, 69, 77, 86, 95, 102, 73, 66,
+        63, 69, 76, 84, 93, 101,
+        /* Size 32x8 */
+        32, 31, 31, 30, 33, 35, 37, 42, 44, 49, 48, 48, 49, 50, 51, 52, 54, 54,
+        57, 59, 60, 63, 64, 64, 66, 67, 68, 69, 70, 71, 72, 73, 34, 35, 36, 36,
+        40, 42, 44, 45, 46, 47, 46, 46, 45, 46, 47, 47, 49, 49, 51, 52, 53, 56,
+        57, 57, 59, 60, 61, 62, 63, 64, 65, 66, 48, 47, 46, 46, 47, 47, 47, 50,
+        51, 53, 53, 53, 53, 54, 54, 54, 55, 55, 56, 58, 58, 60, 61, 61, 63, 63,
+        63, 63, 63, 63, 63, 63, 49, 47, 46, 45, 46, 45, 45, 49, 51, 53, 56, 56,
+        58, 59, 60, 61, 62, 62, 64, 65, 65, 67, 68, 68, 69, 70, 71, 71, 70, 70,
+        69, 69, 54, 51, 50, 49, 49, 48, 48, 51, 53, 55, 58, 59, 62, 65, 65, 68,
+        70, 70, 73, 74, 75, 77, 78, 78, 79, 78, 79, 80, 80, 78, 77, 76, 63, 60,
+        58, 57, 56, 55, 54, 57, 59, 60, 64, 65, 67, 70, 71, 75, 77, 78, 82, 84,
+        85, 89, 89, 90, 91, 88, 87, 88, 89, 88, 86, 84, 67, 63, 62, 60, 59, 58,
+        57, 59, 60, 63, 64, 66, 70, 70, 73, 76, 77, 81, 83, 85, 89, 90, 93, 94,
+        94, 96, 96, 96, 97, 97, 95, 93, 69, 65, 65, 62, 62, 61, 60, 59, 61, 62,
+        64, 65, 68, 68, 72, 73, 76, 77, 81, 82, 85, 87, 89, 92, 93, 97, 98, 100,
+        100, 102, 102, 101 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 37, 58, 81, 37, 54, 72, 91, 58, 72, 102, 121, 81, 91, 121, 156,
+        /* Size 8x8 */
+        32, 32, 35, 42, 53, 68, 78, 90, 32, 33, 36, 42, 51, 64, 74, 84, 35, 36,
+        46, 52, 60, 72, 80, 87, 42, 42, 52, 63, 73, 84, 92, 98, 53, 51, 60, 73,
+        86, 100, 109, 114, 68, 64, 72, 84, 100, 117, 128, 133, 78, 74, 80, 92,
+        109, 128, 140, 155, 90, 84, 87, 98, 114, 133, 155, 168,
+        /* Size 16x16 */
+        32, 31, 31, 32, 34, 36, 41, 47, 54, 59, 65, 74, 82, 87, 92, 97, 31, 32,
+        32, 32, 34, 35, 39, 45, 50, 55, 61, 69, 76, 81, 87, 92, 31, 32, 33, 33,
+        35, 36, 40, 44, 49, 54, 59, 67, 73, 78, 83, 88, 32, 32, 33, 35, 37, 38,
+        41, 45, 49, 53, 58, 65, 71, 75, 80, 86, 34, 34, 35, 37, 39, 42, 46, 50,
+        54, 58, 63, 70, 76, 80, 84, 85, 36, 35, 36, 38, 42, 48, 52, 56, 60, 64,
+        68, 75, 80, 85, 90, 91, 41, 39, 40, 41, 46, 52, 57, 62, 67, 71, 75, 83,
+        88, 92, 95, 97, 47, 45, 44, 45, 50, 56, 62, 69, 75, 79, 84, 91, 97, 100,
+        102, 104, 54, 50, 49, 49, 54, 60, 67, 75, 82, 87, 92, 100, 106, 110,
+        109, 112, 59, 55, 54, 53, 58, 64, 71, 79, 87, 92, 98, 106, 112, 117,
+        117, 121, 65, 61, 59, 58, 63, 68, 75, 84, 92, 98, 105, 114, 120, 125,
+        126, 130, 74, 69, 67, 65, 70, 75, 83, 91, 100, 106, 114, 123, 131, 135,
+        137, 140, 82, 76, 73, 71, 76, 80, 88, 97, 106, 112, 120, 131, 139, 144,
+        148, 150, 87, 81, 78, 75, 80, 85, 92, 100, 110, 117, 125, 135, 144, 150,
+        155, 162, 92, 87, 83, 80, 84, 90, 95, 102, 109, 117, 126, 137, 148, 155,
+        162, 168, 97, 92, 88, 86, 85, 91, 97, 104, 112, 121, 130, 140, 150, 162,
+        168, 174,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 32, 32, 34, 35, 36, 39, 41, 44, 47, 48, 54, 56,
+        59, 64, 65, 71, 74, 80, 82, 83, 87, 90, 92, 95, 97, 100, 31, 32, 32, 32,
+        32, 32, 32, 33, 34, 35, 35, 38, 40, 42, 45, 46, 51, 53, 56, 61, 62, 68,
+        71, 76, 78, 78, 83, 85, 88, 90, 92, 95, 31, 32, 32, 32, 32, 32, 32, 33,
+        34, 34, 35, 38, 39, 42, 45, 45, 50, 52, 55, 60, 61, 67, 69, 74, 76, 77,
+        81, 84, 87, 89, 92, 95, 31, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 37,
+        38, 41, 44, 44, 49, 51, 54, 58, 59, 65, 68, 72, 74, 75, 79, 81, 84, 86,
+        88, 90, 31, 32, 32, 32, 33, 33, 33, 34, 35, 36, 36, 39, 40, 42, 44, 45,
+        49, 51, 54, 58, 59, 64, 67, 71, 73, 74, 78, 80, 83, 85, 88, 90, 31, 32,
+        32, 32, 33, 33, 34, 34, 35, 36, 36, 39, 40, 42, 45, 45, 50, 51, 54, 58,
+        59, 64, 67, 71, 73, 74, 78, 80, 82, 84, 86, 89, 32, 32, 32, 32, 33, 34,
+        35, 36, 37, 38, 38, 40, 41, 42, 45, 46, 49, 51, 53, 57, 58, 63, 65, 69,
+        71, 72, 75, 78, 80, 83, 86, 89, 32, 33, 33, 33, 34, 34, 36, 36, 38, 39,
+        40, 42, 43, 44, 47, 47, 51, 53, 55, 59, 60, 65, 67, 71, 73, 73, 77, 78,
+        80, 82, 84, 86, 34, 34, 34, 33, 35, 35, 37, 38, 39, 42, 42, 45, 46, 47,
+        50, 51, 54, 56, 58, 62, 63, 68, 70, 74, 76, 76, 80, 82, 84, 85, 85, 86,
+        35, 35, 34, 34, 36, 36, 38, 39, 42, 46, 47, 49, 50, 52, 55, 55, 59, 60,
+        62, 66, 67, 72, 74, 78, 79, 80, 83, 84, 85, 87, 90, 92, 36, 35, 35, 34,
+        36, 36, 38, 40, 42, 47, 48, 50, 52, 54, 56, 57, 60, 61, 64, 67, 68, 73,
+        75, 79, 80, 81, 85, 87, 90, 91, 91, 92, 39, 38, 38, 37, 39, 39, 40, 42,
+        45, 49, 50, 54, 55, 58, 60, 61, 65, 66, 69, 72, 73, 78, 80, 84, 86, 86,
+        90, 91, 91, 92, 95, 97, 41, 40, 39, 38, 40, 40, 41, 43, 46, 50, 52, 55,
+        57, 60, 62, 63, 67, 69, 71, 75, 75, 80, 83, 86, 88, 89, 92, 93, 95, 97,
+        97, 98, 44, 42, 42, 41, 42, 42, 42, 44, 47, 52, 54, 58, 60, 63, 66, 67,
+        71, 73, 75, 79, 79, 84, 86, 90, 92, 92, 96, 98, 98, 98, 101, 104, 47,
+        45, 45, 44, 44, 45, 45, 47, 50, 55, 56, 60, 62, 66, 69, 70, 75, 77, 79,
+        83, 84, 89, 91, 95, 97, 97, 100, 99, 102, 105, 104, 104, 48, 46, 45, 44,
+        45, 45, 46, 47, 51, 55, 57, 61, 63, 67, 70, 71, 76, 78, 80, 84, 85, 90,
+        93, 96, 98, 99, 102, 106, 106, 105, 108, 111, 54, 51, 50, 49, 49, 50,
+        49, 51, 54, 59, 60, 65, 67, 71, 75, 76, 82, 84, 87, 91, 92, 97, 100,
+        104, 106, 106, 110, 108, 109, 112, 112, 111, 56, 53, 52, 51, 51, 51, 51,
+        53, 56, 60, 61, 66, 69, 73, 77, 78, 84, 86, 89, 93, 94, 100, 102, 106,
+        108, 109, 112, 113, 115, 114, 116, 119, 59, 56, 55, 54, 54, 54, 53, 55,
+        58, 62, 64, 69, 71, 75, 79, 80, 87, 89, 92, 97, 98, 103, 106, 110, 112,
+        113, 117, 118, 117, 121, 121, 119, 64, 61, 60, 58, 58, 58, 57, 59, 62,
+        66, 67, 72, 75, 79, 83, 84, 91, 93, 97, 102, 103, 109, 112, 116, 118,
+        119, 122, 121, 125, 123, 125, 128, 65, 62, 61, 59, 59, 59, 58, 60, 63,
+        67, 68, 73, 75, 79, 84, 85, 92, 94, 98, 103, 105, 111, 114, 118, 120,
+        121, 125, 129, 126, 129, 130, 129, 71, 68, 67, 65, 64, 64, 63, 65, 68,
+        72, 73, 78, 80, 84, 89, 90, 97, 100, 103, 109, 111, 117, 120, 125, 127,
+        128, 133, 130, 134, 133, 133, 137, 74, 71, 69, 68, 67, 67, 65, 67, 70,
+        74, 75, 80, 83, 86, 91, 93, 100, 102, 106, 112, 114, 120, 123, 128, 131,
+        131, 135, 137, 137, 138, 140, 137, 80, 76, 74, 72, 71, 71, 69, 71, 74,
+        78, 79, 84, 86, 90, 95, 96, 104, 106, 110, 116, 118, 125, 128, 134, 136,
+        137, 142, 141, 142, 143, 143, 147, 82, 78, 76, 74, 73, 73, 71, 73, 76,
+        79, 80, 86, 88, 92, 97, 98, 106, 108, 112, 118, 120, 127, 131, 136, 139,
+        139, 144, 147, 148, 147, 150, 148, 83, 78, 77, 75, 74, 74, 72, 73, 76,
+        80, 81, 86, 89, 92, 97, 99, 106, 109, 113, 119, 121, 128, 131, 137, 139,
+        140, 145, 150, 152, 155, 152, 157, 87, 83, 81, 79, 78, 78, 75, 77, 80,
+        83, 85, 90, 92, 96, 100, 102, 110, 112, 117, 122, 125, 133, 135, 142,
+        144, 145, 150, 151, 155, 158, 162, 158, 90, 85, 84, 81, 80, 80, 78, 78,
+        82, 84, 87, 91, 93, 98, 99, 106, 108, 113, 118, 121, 129, 130, 137, 141,
+        147, 150, 151, 156, 156, 161, 164, 169, 92, 88, 87, 84, 83, 82, 80, 80,
+        84, 85, 90, 91, 95, 98, 102, 106, 109, 115, 117, 125, 126, 134, 137,
+        142, 148, 152, 155, 156, 162, 162, 168, 170, 95, 90, 89, 86, 85, 84, 83,
+        82, 85, 87, 91, 92, 97, 98, 105, 105, 112, 114, 121, 123, 129, 133, 138,
+        143, 147, 155, 158, 161, 162, 168, 168, 174, 97, 92, 92, 88, 88, 86, 86,
+        84, 85, 90, 91, 95, 97, 101, 104, 108, 112, 116, 121, 125, 130, 133,
+        140, 143, 150, 152, 162, 164, 168, 168, 174, 175, 100, 95, 95, 90, 90,
+        89, 89, 86, 86, 92, 92, 97, 98, 104, 104, 111, 111, 119, 119, 128, 129,
+        137, 137, 147, 148, 157, 158, 169, 170, 174, 175, 181,
+        /* Size 4x8 */
+        32, 35, 59, 83, 32, 36, 57, 78, 34, 47, 65, 82, 41, 53, 78, 97, 51, 61,
+        92, 111, 65, 73, 108, 129, 75, 81, 117, 148, 86, 92, 119, 154,
+        /* Size 8x4 */
+        32, 32, 34, 41, 51, 65, 75, 86, 35, 36, 47, 53, 61, 73, 81, 92, 59, 57,
+        65, 78, 92, 108, 117, 119, 83, 78, 82, 97, 111, 129, 148, 154,
+        /* Size 8x16 */
+        32, 31, 35, 44, 53, 65, 82, 90, 31, 32, 34, 41, 50, 61, 76, 85, 31, 33,
+        35, 42, 49, 59, 73, 81, 32, 34, 37, 42, 49, 58, 71, 79, 34, 35, 41, 48,
+        54, 63, 76, 81, 36, 36, 46, 54, 60, 68, 80, 87, 41, 40, 49, 60, 67, 76,
+        88, 93, 47, 44, 53, 66, 75, 84, 97, 101, 53, 50, 57, 71, 82, 92, 106,
+        108, 58, 54, 61, 75, 87, 98, 112, 116, 65, 59, 66, 79, 92, 105, 120,
+        124, 74, 67, 73, 86, 100, 113, 131, 134, 82, 73, 79, 92, 105, 120, 139,
+        142, 87, 78, 83, 96, 110, 125, 144, 153, 92, 83, 84, 97, 114, 132, 150,
+        157, 97, 88, 86, 97, 111, 128, 147, 163,
+        /* Size 16x8 */
+        32, 31, 31, 32, 34, 36, 41, 47, 53, 58, 65, 74, 82, 87, 92, 97, 31, 32,
+        33, 34, 35, 36, 40, 44, 50, 54, 59, 67, 73, 78, 83, 88, 35, 34, 35, 37,
+        41, 46, 49, 53, 57, 61, 66, 73, 79, 83, 84, 86, 44, 41, 42, 42, 48, 54,
+        60, 66, 71, 75, 79, 86, 92, 96, 97, 97, 53, 50, 49, 49, 54, 60, 67, 75,
+        82, 87, 92, 100, 105, 110, 114, 111, 65, 61, 59, 58, 63, 68, 76, 84, 92,
+        98, 105, 113, 120, 125, 132, 128, 82, 76, 73, 71, 76, 80, 88, 97, 106,
+        112, 120, 131, 139, 144, 150, 147, 90, 85, 81, 79, 81, 87, 93, 101, 108,
+        116, 124, 134, 142, 153, 157, 163,
+        /* Size 16x32 */
+        32, 31, 31, 32, 35, 36, 44, 47, 53, 62, 65, 79, 82, 88, 90, 93, 31, 32,
+        32, 32, 35, 35, 42, 45, 51, 59, 62, 75, 78, 83, 86, 88, 31, 32, 32, 32,
+        34, 35, 41, 45, 50, 58, 61, 74, 76, 82, 85, 88, 31, 32, 32, 33, 34, 34,
+        41, 44, 49, 57, 59, 72, 74, 79, 82, 84, 31, 32, 33, 34, 35, 36, 42, 44,
+        49, 57, 59, 71, 73, 79, 81, 84, 32, 32, 33, 34, 36, 36, 42, 45, 50, 57,
+        59, 71, 73, 78, 80, 82, 32, 33, 34, 35, 37, 38, 42, 45, 49, 56, 58, 69,
+        71, 76, 79, 83, 32, 33, 34, 36, 39, 40, 44, 47, 51, 58, 60, 71, 73, 76,
+        78, 80, 34, 34, 35, 37, 41, 42, 48, 50, 54, 61, 63, 73, 76, 81, 81, 80,
+        35, 34, 36, 38, 45, 47, 52, 55, 59, 65, 67, 77, 79, 82, 83, 86, 36, 34,
+        36, 38, 46, 48, 54, 56, 60, 66, 68, 78, 80, 85, 87, 86, 39, 37, 39, 40,
+        48, 50, 58, 60, 65, 71, 73, 84, 86, 89, 88, 91, 41, 39, 40, 41, 49, 51,
+        60, 62, 67, 74, 76, 86, 88, 91, 93, 91, 44, 41, 42, 43, 51, 53, 63, 66,
+        71, 78, 79, 90, 92, 97, 94, 97, 47, 44, 44, 45, 53, 56, 66, 69, 75, 82,
+        84, 95, 97, 98, 101, 98, 48, 45, 45, 46, 54, 56, 67, 70, 76, 83, 85, 96,
+        98, 104, 101, 105, 53, 49, 50, 50, 57, 60, 71, 75, 82, 90, 92, 103, 106,
+        107, 108, 105, 55, 51, 51, 51, 59, 61, 72, 77, 84, 92, 94, 106, 108,
+        111, 110, 112, 58, 54, 54, 54, 61, 63, 75, 79, 87, 95, 98, 110, 112,
+        117, 116, 113, 63, 58, 58, 57, 65, 67, 78, 83, 91, 100, 103, 116, 118,
+        119, 119, 121, 65, 60, 59, 58, 66, 68, 79, 84, 92, 102, 105, 118, 120,
+        127, 124, 122, 71, 65, 64, 63, 71, 73, 84, 89, 97, 108, 111, 125, 127,
+        129, 129, 130, 74, 68, 67, 66, 73, 75, 86, 91, 100, 110, 113, 128, 131,
+        135, 134, 130, 79, 72, 71, 70, 77, 79, 90, 95, 104, 115, 118, 133, 136,
+        140, 139, 140, 82, 75, 73, 72, 79, 81, 92, 97, 105, 117, 120, 136, 139,
+        145, 142, 140, 82, 75, 74, 72, 79, 81, 92, 97, 106, 117, 121, 136, 139,
+        148, 150, 149, 87, 79, 78, 76, 83, 85, 96, 100, 110, 120, 125, 141, 144,
+        148, 153, 150, 89, 82, 81, 78, 83, 87, 97, 99, 113, 118, 128, 139, 145,
+        153, 157, 161, 92, 84, 83, 80, 84, 89, 97, 101, 114, 116, 132, 135, 150,
+        153, 157, 162, 94, 86, 85, 82, 85, 92, 97, 104, 112, 119, 130, 136, 151,
+        154, 163, 166, 97, 88, 88, 85, 86, 94, 97, 107, 111, 123, 128, 140, 147,
+        159, 163, 167, 99, 91, 91, 87, 87, 97, 97, 110, 110, 126, 126, 144, 144,
+        163, 163, 173,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 32, 32, 32, 34, 35, 36, 39, 41, 44, 47, 48, 53, 55,
+        58, 63, 65, 71, 74, 79, 82, 82, 87, 89, 92, 94, 97, 99, 31, 32, 32, 32,
+        32, 32, 33, 33, 34, 34, 34, 37, 39, 41, 44, 45, 49, 51, 54, 58, 60, 65,
+        68, 72, 75, 75, 79, 82, 84, 86, 88, 91, 31, 32, 32, 32, 33, 33, 34, 34,
+        35, 36, 36, 39, 40, 42, 44, 45, 50, 51, 54, 58, 59, 64, 67, 71, 73, 74,
+        78, 81, 83, 85, 88, 91, 32, 32, 32, 33, 34, 34, 35, 36, 37, 38, 38, 40,
+        41, 43, 45, 46, 50, 51, 54, 57, 58, 63, 66, 70, 72, 72, 76, 78, 80, 82,
+        85, 87, 35, 35, 34, 34, 35, 36, 37, 39, 41, 45, 46, 48, 49, 51, 53, 54,
+        57, 59, 61, 65, 66, 71, 73, 77, 79, 79, 83, 83, 84, 85, 86, 87, 36, 35,
+        35, 34, 36, 36, 38, 40, 42, 47, 48, 50, 51, 53, 56, 56, 60, 61, 63, 67,
+        68, 73, 75, 79, 81, 81, 85, 87, 89, 92, 94, 97, 44, 42, 41, 41, 42, 42,
+        42, 44, 48, 52, 54, 58, 60, 63, 66, 67, 71, 72, 75, 78, 79, 84, 86, 90,
+        92, 92, 96, 97, 97, 97, 97, 97, 47, 45, 45, 44, 44, 45, 45, 47, 50, 55,
+        56, 60, 62, 66, 69, 70, 75, 77, 79, 83, 84, 89, 91, 95, 97, 97, 100, 99,
+        101, 104, 107, 110, 53, 51, 50, 49, 49, 50, 49, 51, 54, 59, 60, 65, 67,
+        71, 75, 76, 82, 84, 87, 91, 92, 97, 100, 104, 105, 106, 110, 113, 114,
+        112, 111, 110, 62, 59, 58, 57, 57, 57, 56, 58, 61, 65, 66, 71, 74, 78,
+        82, 83, 90, 92, 95, 100, 102, 108, 110, 115, 117, 117, 120, 118, 116,
+        119, 123, 126, 65, 62, 61, 59, 59, 59, 58, 60, 63, 67, 68, 73, 76, 79,
+        84, 85, 92, 94, 98, 103, 105, 111, 113, 118, 120, 121, 125, 128, 132,
+        130, 128, 126, 79, 75, 74, 72, 71, 71, 69, 71, 73, 77, 78, 84, 86, 90,
+        95, 96, 103, 106, 110, 116, 118, 125, 128, 133, 136, 136, 141, 139, 135,
+        136, 140, 144, 82, 78, 76, 74, 73, 73, 71, 73, 76, 79, 80, 86, 88, 92,
+        97, 98, 106, 108, 112, 118, 120, 127, 131, 136, 139, 139, 144, 145, 150,
+        151, 147, 144, 88, 83, 82, 79, 79, 78, 76, 76, 81, 82, 85, 89, 91, 97,
+        98, 104, 107, 111, 117, 119, 127, 129, 135, 140, 145, 148, 148, 153,
+        153, 154, 159, 163, 90, 86, 85, 82, 81, 80, 79, 78, 81, 83, 87, 88, 93,
+        94, 101, 101, 108, 110, 116, 119, 124, 129, 134, 139, 142, 150, 153,
+        157, 157, 163, 163, 163, 93, 88, 88, 84, 84, 82, 83, 80, 80, 86, 86, 91,
+        91, 97, 98, 105, 105, 112, 113, 121, 122, 130, 130, 140, 140, 149, 150,
+        161, 162, 166, 167, 173,
+        /* Size 4x16 */
+        31, 36, 62, 88, 32, 35, 58, 82, 32, 36, 57, 79, 33, 38, 56, 76, 34, 42,
+        61, 81, 34, 48, 66, 85, 39, 51, 74, 91, 44, 56, 82, 98, 49, 60, 90, 107,
+        54, 63, 95, 117, 60, 68, 102, 127, 68, 75, 110, 135, 75, 81, 117, 145,
+        79, 85, 120, 148, 84, 89, 116, 153, 88, 94, 123, 159,
+        /* Size 16x4 */
+        31, 32, 32, 33, 34, 34, 39, 44, 49, 54, 60, 68, 75, 79, 84, 88, 36, 35,
+        36, 38, 42, 48, 51, 56, 60, 63, 68, 75, 81, 85, 89, 94, 62, 58, 57, 56,
+        61, 66, 74, 82, 90, 95, 102, 110, 117, 120, 116, 123, 88, 82, 79, 76,
+        81, 85, 91, 98, 107, 117, 127, 135, 145, 148, 153, 159,
+        /* Size 8x32 */
+        32, 31, 35, 44, 53, 65, 82, 90, 31, 32, 35, 42, 51, 62, 78, 86, 31, 32,
+        34, 41, 50, 61, 76, 85, 31, 32, 34, 41, 49, 59, 74, 82, 31, 33, 35, 42,
+        49, 59, 73, 81, 32, 33, 36, 42, 50, 59, 73, 80, 32, 34, 37, 42, 49, 58,
+        71, 79, 32, 34, 39, 44, 51, 60, 73, 78, 34, 35, 41, 48, 54, 63, 76, 81,
+        35, 36, 45, 52, 59, 67, 79, 83, 36, 36, 46, 54, 60, 68, 80, 87, 39, 39,
+        48, 58, 65, 73, 86, 88, 41, 40, 49, 60, 67, 76, 88, 93, 44, 42, 51, 63,
+        71, 79, 92, 94, 47, 44, 53, 66, 75, 84, 97, 101, 48, 45, 54, 67, 76, 85,
+        98, 101, 53, 50, 57, 71, 82, 92, 106, 108, 55, 51, 59, 72, 84, 94, 108,
+        110, 58, 54, 61, 75, 87, 98, 112, 116, 63, 58, 65, 78, 91, 103, 118,
+        119, 65, 59, 66, 79, 92, 105, 120, 124, 71, 64, 71, 84, 97, 111, 127,
+        129, 74, 67, 73, 86, 100, 113, 131, 134, 79, 71, 77, 90, 104, 118, 136,
+        139, 82, 73, 79, 92, 105, 120, 139, 142, 82, 74, 79, 92, 106, 121, 139,
+        150, 87, 78, 83, 96, 110, 125, 144, 153, 89, 81, 83, 97, 113, 128, 145,
+        157, 92, 83, 84, 97, 114, 132, 150, 157, 94, 85, 85, 97, 112, 130, 151,
+        163, 97, 88, 86, 97, 111, 128, 147, 163, 99, 91, 87, 97, 110, 126, 144,
+        163,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 32, 32, 32, 34, 35, 36, 39, 41, 44, 47, 48, 53, 55,
+        58, 63, 65, 71, 74, 79, 82, 82, 87, 89, 92, 94, 97, 99, 31, 32, 32, 32,
+        33, 33, 34, 34, 35, 36, 36, 39, 40, 42, 44, 45, 50, 51, 54, 58, 59, 64,
+        67, 71, 73, 74, 78, 81, 83, 85, 88, 91, 35, 35, 34, 34, 35, 36, 37, 39,
+        41, 45, 46, 48, 49, 51, 53, 54, 57, 59, 61, 65, 66, 71, 73, 77, 79, 79,
+        83, 83, 84, 85, 86, 87, 44, 42, 41, 41, 42, 42, 42, 44, 48, 52, 54, 58,
+        60, 63, 66, 67, 71, 72, 75, 78, 79, 84, 86, 90, 92, 92, 96, 97, 97, 97,
+        97, 97, 53, 51, 50, 49, 49, 50, 49, 51, 54, 59, 60, 65, 67, 71, 75, 76,
+        82, 84, 87, 91, 92, 97, 100, 104, 105, 106, 110, 113, 114, 112, 111,
+        110, 65, 62, 61, 59, 59, 59, 58, 60, 63, 67, 68, 73, 76, 79, 84, 85, 92,
+        94, 98, 103, 105, 111, 113, 118, 120, 121, 125, 128, 132, 130, 128, 126,
+        82, 78, 76, 74, 73, 73, 71, 73, 76, 79, 80, 86, 88, 92, 97, 98, 106,
+        108, 112, 118, 120, 127, 131, 136, 139, 139, 144, 145, 150, 151, 147,
+        144, 90, 86, 85, 82, 81, 80, 79, 78, 81, 83, 87, 88, 93, 94, 101, 101,
+        108, 110, 116, 119, 124, 129, 134, 139, 142, 150, 153, 157, 157, 163,
+        163, 163 },
+      { /* Chroma */
+        /* Size 4x4 */
+        32, 45, 51, 61, 45, 54, 59, 65, 51, 59, 75, 81, 61, 65, 81, 97,
+        /* Size 8x8 */
+        31, 34, 46, 47, 50, 57, 61, 65, 34, 39, 47, 45, 48, 53, 57, 61, 46, 47,
+        52, 52, 54, 58, 61, 62, 47, 45, 52, 58, 62, 65, 68, 68, 50, 48, 54, 62,
+        68, 73, 77, 76, 57, 53, 58, 65, 73, 82, 86, 86, 61, 57, 61, 68, 77, 86,
+        91, 95, 65, 61, 62, 68, 76, 86, 95, 100,
+        /* Size 16x16 */
+        32, 31, 33, 36, 41, 49, 49, 50, 52, 54, 57, 61, 64, 67, 68, 70, 31, 31,
+        34, 39, 42, 47, 46, 47, 49, 51, 53, 57, 60, 62, 64, 66, 33, 34, 37, 42,
+        44, 47, 46, 46, 47, 49, 51, 55, 57, 59, 61, 63, 36, 39, 42, 47, 47, 48,
+        46, 46, 47, 48, 50, 53, 55, 57, 59, 61, 41, 42, 44, 47, 48, 50, 49, 50,
+        50, 52, 53, 56, 58, 60, 61, 60, 49, 47, 47, 48, 50, 53, 53, 54, 54, 55,
+        56, 59, 61, 63, 64, 64, 49, 46, 46, 46, 49, 53, 55, 57, 59, 60, 61, 64,
+        66, 67, 67, 67, 50, 47, 46, 46, 50, 54, 57, 61, 63, 64, 66, 69, 70, 72,
+        71, 71, 52, 49, 47, 47, 50, 54, 59, 63, 66, 68, 70, 73, 75, 77, 75, 75,
+        54, 51, 49, 48, 52, 55, 60, 64, 68, 71, 73, 76, 79, 80, 79, 79, 57, 53,
+        51, 50, 53, 56, 61, 66, 70, 73, 76, 80, 82, 84, 83, 84, 61, 57, 55, 53,
+        56, 59, 64, 69, 73, 76, 80, 84, 87, 89, 88, 88, 64, 60, 57, 55, 58, 61,
+        66, 70, 75, 79, 82, 87, 91, 93, 93, 93, 67, 62, 59, 57, 60, 63, 67, 72,
+        77, 80, 84, 89, 93, 95, 96, 97, 68, 64, 61, 59, 61, 64, 67, 71, 75, 79,
+        83, 88, 93, 96, 99, 100, 70, 66, 63, 61, 60, 64, 67, 71, 75, 79, 84, 88,
+        93, 97, 100, 102,
+        /* Size 32x32 */
+        32, 31, 31, 30, 33, 33, 36, 38, 41, 47, 49, 48, 49, 49, 50, 50, 52, 53,
+        54, 56, 57, 60, 61, 63, 64, 65, 67, 67, 68, 69, 70, 71, 31, 31, 31, 31,
+        34, 34, 38, 40, 42, 46, 47, 47, 47, 47, 48, 48, 50, 50, 52, 54, 54, 57,
+        58, 60, 61, 61, 63, 64, 65, 65, 66, 67, 31, 31, 31, 31, 34, 35, 39, 40,
+        42, 46, 47, 46, 46, 46, 47, 47, 49, 50, 51, 53, 53, 56, 57, 59, 60, 60,
+        62, 63, 64, 65, 66, 67, 30, 31, 31, 32, 34, 35, 40, 41, 42, 45, 46, 45,
+        45, 45, 46, 46, 47, 48, 49, 51, 52, 54, 55, 57, 58, 58, 60, 61, 62, 62,
+        63, 64, 33, 34, 34, 34, 37, 38, 42, 43, 44, 46, 47, 46, 46, 45, 46, 46,
+        47, 48, 49, 51, 51, 53, 55, 56, 57, 57, 59, 60, 61, 62, 63, 64, 33, 34,
+        35, 35, 38, 39, 43, 44, 45, 47, 47, 46, 46, 45, 46, 46, 47, 48, 49, 51,
+        51, 53, 54, 56, 57, 57, 59, 60, 60, 61, 62, 62, 36, 38, 39, 40, 42, 43,
+        47, 47, 47, 47, 48, 46, 46, 45, 46, 46, 47, 47, 48, 49, 50, 52, 53, 54,
+        55, 55, 57, 58, 59, 60, 61, 62, 38, 40, 40, 41, 43, 44, 47, 47, 48, 48,
+        49, 48, 47, 47, 47, 47, 48, 49, 49, 51, 51, 53, 54, 55, 56, 56, 58, 58,
+        58, 59, 60, 60, 41, 42, 42, 42, 44, 45, 47, 48, 48, 50, 50, 49, 49, 49,
+        50, 50, 50, 51, 52, 53, 53, 55, 56, 57, 58, 58, 60, 61, 61, 61, 60, 60,
+        47, 46, 46, 45, 46, 47, 47, 48, 50, 52, 52, 52, 52, 52, 53, 53, 53, 54,
+        55, 55, 56, 58, 58, 60, 60, 61, 62, 61, 61, 62, 63, 64, 49, 47, 47, 46,
+        47, 47, 48, 49, 50, 52, 53, 53, 53, 53, 54, 54, 54, 55, 55, 56, 56, 58,
+        59, 60, 61, 61, 63, 63, 64, 64, 64, 64, 48, 47, 46, 45, 46, 46, 46, 48,
+        49, 52, 53, 54, 55, 55, 56, 56, 57, 58, 58, 59, 60, 61, 62, 63, 64, 64,
+        66, 65, 65, 65, 66, 67, 49, 47, 46, 45, 46, 46, 46, 47, 49, 52, 53, 55,
+        55, 57, 57, 58, 59, 59, 60, 61, 61, 63, 64, 65, 66, 66, 67, 67, 67, 68,
+        67, 67, 49, 47, 46, 45, 45, 45, 45, 47, 49, 52, 53, 55, 57, 58, 59, 60,
+        61, 62, 62, 63, 63, 65, 66, 67, 68, 68, 69, 70, 69, 68, 69, 70, 50, 48,
+        47, 46, 46, 46, 46, 47, 50, 53, 54, 56, 57, 59, 61, 61, 63, 64, 64, 66,
+        66, 68, 69, 70, 70, 71, 72, 70, 71, 72, 71, 70, 50, 48, 47, 46, 46, 46,
+        46, 47, 50, 53, 54, 56, 58, 60, 61, 61, 63, 64, 65, 66, 67, 68, 69, 71,
+        71, 71, 73, 74, 73, 72, 73, 74, 52, 50, 49, 47, 47, 47, 47, 48, 50, 53,
+        54, 57, 59, 61, 63, 63, 66, 67, 68, 70, 70, 72, 73, 75, 75, 75, 77, 75,
+        75, 76, 75, 74, 53, 50, 50, 48, 48, 48, 47, 49, 51, 54, 55, 58, 59, 62,
+        64, 64, 67, 68, 69, 71, 71, 73, 74, 76, 77, 77, 78, 78, 78, 76, 77, 78,
+        54, 52, 51, 49, 49, 49, 48, 49, 52, 55, 55, 58, 60, 62, 64, 65, 68, 69,
+        71, 73, 73, 75, 76, 78, 79, 79, 80, 80, 79, 80, 79, 78, 56, 54, 53, 51,
+        51, 51, 49, 51, 53, 55, 56, 59, 61, 63, 66, 66, 70, 71, 73, 75, 76, 78,
+        79, 81, 82, 82, 83, 81, 83, 81, 81, 82, 57, 54, 53, 52, 51, 51, 50, 51,
+        53, 56, 56, 60, 61, 63, 66, 67, 70, 71, 73, 76, 76, 79, 80, 82, 82, 83,
+        84, 85, 83, 84, 84, 82, 60, 57, 56, 54, 53, 53, 52, 53, 55, 58, 58, 61,
+        63, 65, 68, 68, 72, 73, 75, 78, 79, 82, 83, 85, 86, 86, 88, 86, 87, 86,
+        85, 86, 61, 58, 57, 55, 55, 54, 53, 54, 56, 58, 59, 62, 64, 66, 69, 69,
+        73, 74, 76, 79, 80, 83, 84, 86, 87, 88, 89, 89, 88, 88, 88, 86, 63, 60,
+        59, 57, 56, 56, 54, 55, 57, 60, 60, 63, 65, 67, 70, 71, 75, 76, 78, 81,
+        82, 85, 86, 89, 90, 90, 92, 91, 91, 90, 89, 91, 64, 61, 60, 58, 57, 57,
+        55, 56, 58, 60, 61, 64, 66, 68, 70, 71, 75, 77, 79, 82, 82, 86, 87, 90,
+        91, 91, 93, 93, 93, 92, 93, 91, 65, 61, 60, 58, 57, 57, 55, 56, 58, 61,
+        61, 64, 66, 68, 71, 71, 75, 77, 79, 82, 83, 86, 88, 90, 91, 91, 93, 94,
+        95, 95, 93, 95, 67, 63, 62, 60, 59, 59, 57, 58, 60, 62, 63, 66, 67, 69,
+        72, 73, 77, 78, 80, 83, 84, 88, 89, 92, 93, 93, 95, 95, 96, 96, 97, 95,
+        67, 64, 63, 61, 60, 60, 58, 58, 61, 61, 63, 65, 67, 70, 70, 74, 75, 78,
+        80, 81, 85, 86, 89, 91, 93, 94, 95, 97, 97, 98, 98, 100, 68, 65, 64, 62,
+        61, 60, 59, 58, 61, 61, 64, 65, 67, 69, 71, 73, 75, 78, 79, 83, 83, 87,
+        88, 91, 93, 95, 96, 97, 99, 98, 100, 100, 69, 65, 65, 62, 62, 61, 60,
+        59, 61, 62, 64, 65, 68, 68, 72, 72, 76, 76, 80, 81, 84, 86, 88, 90, 92,
+        95, 96, 98, 98, 100, 100, 101, 70, 66, 66, 63, 63, 62, 61, 60, 60, 63,
+        64, 66, 67, 69, 71, 73, 75, 77, 79, 81, 84, 85, 88, 89, 93, 93, 97, 98,
+        100, 100, 102, 101, 71, 67, 67, 64, 64, 62, 62, 60, 60, 64, 64, 67, 67,
+        70, 70, 74, 74, 78, 78, 82, 82, 86, 86, 91, 91, 95, 95, 100, 100, 101,
+        101, 104,
+        /* Size 4x8 */
+        31, 47, 53, 63, 36, 47, 50, 59, 46, 52, 55, 61, 45, 53, 63, 70, 49, 55,
+        71, 77, 54, 58, 77, 86, 59, 61, 81, 94, 63, 65, 80, 95,
+        /* Size 8x4 */
+        31, 36, 46, 45, 49, 54, 59, 63, 47, 47, 52, 53, 55, 58, 61, 65, 53, 50,
+        55, 63, 71, 77, 81, 80, 63, 59, 61, 70, 77, 86, 94, 95,
+        /* Size 8x16 */
+        32, 33, 45, 49, 52, 57, 64, 68, 31, 34, 45, 46, 49, 53, 60, 64, 33, 37,
+        46, 45, 47, 51, 57, 61, 37, 43, 47, 45, 47, 50, 55, 59, 42, 44, 49, 49,
+        50, 53, 58, 60, 49, 47, 52, 53, 54, 57, 61, 63, 48, 46, 51, 57, 59, 61,
+        66, 67, 50, 46, 52, 59, 63, 66, 71, 71, 52, 47, 53, 61, 66, 71, 75, 74,
+        54, 49, 54, 62, 68, 73, 79, 79, 57, 51, 55, 64, 70, 76, 83, 83, 61, 55,
+        58, 66, 73, 80, 87, 87, 64, 57, 60, 68, 75, 83, 91, 91, 66, 59, 61, 69,
+        77, 84, 93, 95, 68, 61, 61, 68, 77, 86, 94, 97, 70, 63, 61, 67, 75, 83,
+        92, 98,
+        /* Size 16x8 */
+        32, 31, 33, 37, 42, 49, 48, 50, 52, 54, 57, 61, 64, 66, 68, 70, 33, 34,
+        37, 43, 44, 47, 46, 46, 47, 49, 51, 55, 57, 59, 61, 63, 45, 45, 46, 47,
+        49, 52, 51, 52, 53, 54, 55, 58, 60, 61, 61, 61, 49, 46, 45, 45, 49, 53,
+        57, 59, 61, 62, 64, 66, 68, 69, 68, 67, 52, 49, 47, 47, 50, 54, 59, 63,
+        66, 68, 70, 73, 75, 77, 77, 75, 57, 53, 51, 50, 53, 57, 61, 66, 71, 73,
+        76, 80, 83, 84, 86, 83, 64, 60, 57, 55, 58, 61, 66, 71, 75, 79, 83, 87,
+        91, 93, 94, 92, 68, 64, 61, 59, 60, 63, 67, 71, 74, 79, 83, 87, 91, 95,
+        97, 98,
+        /* Size 16x32 */
+        32, 31, 33, 37, 45, 48, 49, 50, 52, 56, 57, 63, 64, 67, 68, 68, 31, 31,
+        34, 38, 45, 47, 47, 48, 50, 53, 54, 60, 61, 63, 64, 65, 31, 32, 34, 39,
+        45, 46, 46, 47, 49, 52, 53, 59, 60, 62, 64, 65, 30, 32, 35, 40, 44, 46,
+        45, 46, 48, 51, 52, 57, 58, 60, 61, 62, 33, 35, 37, 42, 46, 47, 45, 46,
+        47, 50, 51, 56, 57, 60, 61, 62, 33, 36, 38, 43, 46, 47, 46, 46, 47, 50,
+        51, 56, 57, 59, 60, 60, 37, 40, 43, 47, 47, 47, 45, 46, 47, 49, 50, 54,
+        55, 57, 59, 61, 39, 41, 43, 47, 48, 48, 47, 47, 48, 50, 51, 55, 56, 57,
+        58, 59, 42, 43, 44, 47, 49, 50, 49, 50, 50, 53, 53, 57, 58, 60, 60, 59,
+        47, 46, 46, 48, 51, 52, 53, 53, 53, 55, 56, 60, 61, 61, 61, 62, 49, 46,
+        47, 48, 52, 53, 53, 54, 54, 56, 57, 60, 61, 63, 63, 62, 48, 46, 46, 47,
+        51, 53, 56, 56, 57, 59, 60, 64, 64, 65, 64, 65, 48, 45, 46, 46, 51, 53,
+        57, 57, 59, 61, 61, 65, 66, 66, 67, 65, 49, 45, 45, 46, 51, 53, 58, 59,
+        61, 63, 64, 67, 68, 70, 67, 68, 50, 46, 46, 46, 52, 54, 59, 61, 63, 65,
+        66, 70, 71, 70, 71, 68, 50, 46, 46, 46, 52, 54, 59, 61, 64, 66, 67, 71,
+        71, 73, 71, 72, 52, 48, 47, 47, 53, 54, 61, 63, 66, 70, 71, 75, 75, 75,
+        74, 72, 53, 49, 48, 48, 53, 55, 61, 64, 67, 71, 72, 76, 77, 77, 75, 76,
+        54, 50, 49, 49, 54, 55, 62, 65, 68, 72, 73, 78, 79, 80, 79, 76, 56, 51,
+        51, 50, 55, 56, 63, 66, 70, 74, 76, 81, 82, 81, 80, 80, 57, 52, 51, 50,
+        55, 56, 64, 66, 70, 75, 76, 82, 83, 85, 83, 80, 60, 54, 54, 52, 57, 58,
+        65, 68, 72, 77, 79, 85, 86, 86, 85, 84, 61, 56, 55, 53, 58, 59, 66, 69,
+        73, 79, 80, 86, 87, 89, 87, 84, 63, 57, 56, 55, 59, 60, 67, 70, 75, 80,
+        82, 89, 90, 91, 89, 89, 64, 58, 57, 56, 60, 61, 68, 71, 75, 81, 83, 90,
+        91, 93, 91, 89, 64, 59, 58, 56, 60, 61, 68, 71, 75, 81, 83, 90, 91, 94,
+        94, 93, 66, 60, 59, 57, 61, 63, 69, 72, 77, 82, 84, 92, 93, 94, 95, 93,
+        67, 61, 60, 58, 61, 63, 69, 70, 78, 80, 85, 90, 93, 96, 97, 97, 68, 62,
+        61, 59, 61, 64, 68, 71, 77, 79, 86, 88, 94, 96, 97, 98, 69, 63, 62, 59,
+        61, 65, 68, 72, 76, 80, 85, 88, 94, 95, 99, 99, 70, 63, 63, 60, 61, 66,
+        67, 73, 75, 81, 83, 89, 92, 97, 98, 99, 70, 64, 64, 61, 61, 67, 67, 74,
+        74, 82, 82, 90, 90, 98, 98, 102,
+        /* Size 32x16 */
+        32, 31, 31, 30, 33, 33, 37, 39, 42, 47, 49, 48, 48, 49, 50, 50, 52, 53,
+        54, 56, 57, 60, 61, 63, 64, 64, 66, 67, 68, 69, 70, 70, 31, 31, 32, 32,
+        35, 36, 40, 41, 43, 46, 46, 46, 45, 45, 46, 46, 48, 49, 50, 51, 52, 54,
+        56, 57, 58, 59, 60, 61, 62, 63, 63, 64, 33, 34, 34, 35, 37, 38, 43, 43,
+        44, 46, 47, 46, 46, 45, 46, 46, 47, 48, 49, 51, 51, 54, 55, 56, 57, 58,
+        59, 60, 61, 62, 63, 64, 37, 38, 39, 40, 42, 43, 47, 47, 47, 48, 48, 47,
+        46, 46, 46, 46, 47, 48, 49, 50, 50, 52, 53, 55, 56, 56, 57, 58, 59, 59,
+        60, 61, 45, 45, 45, 44, 46, 46, 47, 48, 49, 51, 52, 51, 51, 51, 52, 52,
+        53, 53, 54, 55, 55, 57, 58, 59, 60, 60, 61, 61, 61, 61, 61, 61, 48, 47,
+        46, 46, 47, 47, 47, 48, 50, 52, 53, 53, 53, 53, 54, 54, 54, 55, 55, 56,
+        56, 58, 59, 60, 61, 61, 63, 63, 64, 65, 66, 67, 49, 47, 46, 45, 45, 46,
+        45, 47, 49, 53, 53, 56, 57, 58, 59, 59, 61, 61, 62, 63, 64, 65, 66, 67,
+        68, 68, 69, 69, 68, 68, 67, 67, 50, 48, 47, 46, 46, 46, 46, 47, 50, 53,
+        54, 56, 57, 59, 61, 61, 63, 64, 65, 66, 66, 68, 69, 70, 71, 71, 72, 70,
+        71, 72, 73, 74, 52, 50, 49, 48, 47, 47, 47, 48, 50, 53, 54, 57, 59, 61,
+        63, 64, 66, 67, 68, 70, 70, 72, 73, 75, 75, 75, 77, 78, 77, 76, 75, 74,
+        56, 53, 52, 51, 50, 50, 49, 50, 53, 55, 56, 59, 61, 63, 65, 66, 70, 71,
+        72, 74, 75, 77, 79, 80, 81, 81, 82, 80, 79, 80, 81, 82, 57, 54, 53, 52,
+        51, 51, 50, 51, 53, 56, 57, 60, 61, 64, 66, 67, 71, 72, 73, 76, 76, 79,
+        80, 82, 83, 83, 84, 85, 86, 85, 83, 82, 63, 60, 59, 57, 56, 56, 54, 55,
+        57, 60, 60, 64, 65, 67, 70, 71, 75, 76, 78, 81, 82, 85, 86, 89, 90, 90,
+        92, 90, 88, 88, 89, 90, 64, 61, 60, 58, 57, 57, 55, 56, 58, 61, 61, 64,
+        66, 68, 71, 71, 75, 77, 79, 82, 83, 86, 87, 90, 91, 91, 93, 93, 94, 94,
+        92, 90, 67, 63, 62, 60, 60, 59, 57, 57, 60, 61, 63, 65, 66, 70, 70, 73,
+        75, 77, 80, 81, 85, 86, 89, 91, 93, 94, 94, 96, 96, 95, 97, 98, 68, 64,
+        64, 61, 61, 60, 59, 58, 60, 61, 63, 64, 67, 67, 71, 71, 74, 75, 79, 80,
+        83, 85, 87, 89, 91, 94, 95, 97, 97, 99, 98, 98, 68, 65, 65, 62, 62, 60,
+        61, 59, 59, 62, 62, 65, 65, 68, 68, 72, 72, 76, 76, 80, 80, 84, 84, 89,
+        89, 93, 93, 97, 98, 99, 99, 102,
+        /* Size 4x16 */
+        31, 48, 56, 67, 32, 46, 52, 62, 35, 47, 50, 60, 40, 47, 49, 57, 43, 50,
+        53, 60, 46, 53, 56, 63, 45, 53, 61, 66, 46, 54, 65, 70, 48, 54, 70, 75,
+        50, 55, 72, 80, 52, 56, 75, 85, 56, 59, 79, 89, 58, 61, 81, 93, 60, 63,
+        82, 94, 62, 64, 79, 96, 63, 66, 81, 97,
+        /* Size 16x4 */
+        31, 32, 35, 40, 43, 46, 45, 46, 48, 50, 52, 56, 58, 60, 62, 63, 48, 46,
+        47, 47, 50, 53, 53, 54, 54, 55, 56, 59, 61, 63, 64, 66, 56, 52, 50, 49,
+        53, 56, 61, 65, 70, 72, 75, 79, 81, 82, 79, 81, 67, 62, 60, 57, 60, 63,
+        66, 70, 75, 80, 85, 89, 93, 94, 96, 97,
+        /* Size 8x32 */
+        32, 33, 45, 49, 52, 57, 64, 68, 31, 34, 45, 47, 50, 54, 61, 64, 31, 34,
+        45, 46, 49, 53, 60, 64, 30, 35, 44, 45, 48, 52, 58, 61, 33, 37, 46, 45,
+        47, 51, 57, 61, 33, 38, 46, 46, 47, 51, 57, 60, 37, 43, 47, 45, 47, 50,
+        55, 59, 39, 43, 48, 47, 48, 51, 56, 58, 42, 44, 49, 49, 50, 53, 58, 60,
+        47, 46, 51, 53, 53, 56, 61, 61, 49, 47, 52, 53, 54, 57, 61, 63, 48, 46,
+        51, 56, 57, 60, 64, 64, 48, 46, 51, 57, 59, 61, 66, 67, 49, 45, 51, 58,
+        61, 64, 68, 67, 50, 46, 52, 59, 63, 66, 71, 71, 50, 46, 52, 59, 64, 67,
+        71, 71, 52, 47, 53, 61, 66, 71, 75, 74, 53, 48, 53, 61, 67, 72, 77, 75,
+        54, 49, 54, 62, 68, 73, 79, 79, 56, 51, 55, 63, 70, 76, 82, 80, 57, 51,
+        55, 64, 70, 76, 83, 83, 60, 54, 57, 65, 72, 79, 86, 85, 61, 55, 58, 66,
+        73, 80, 87, 87, 63, 56, 59, 67, 75, 82, 90, 89, 64, 57, 60, 68, 75, 83,
+        91, 91, 64, 58, 60, 68, 75, 83, 91, 94, 66, 59, 61, 69, 77, 84, 93, 95,
+        67, 60, 61, 69, 78, 85, 93, 97, 68, 61, 61, 68, 77, 86, 94, 97, 69, 62,
+        61, 68, 76, 85, 94, 99, 70, 63, 61, 67, 75, 83, 92, 98, 70, 64, 61, 67,
+        74, 82, 90, 98,
+        /* Size 32x8 */
+        32, 31, 31, 30, 33, 33, 37, 39, 42, 47, 49, 48, 48, 49, 50, 50, 52, 53,
+        54, 56, 57, 60, 61, 63, 64, 64, 66, 67, 68, 69, 70, 70, 33, 34, 34, 35,
+        37, 38, 43, 43, 44, 46, 47, 46, 46, 45, 46, 46, 47, 48, 49, 51, 51, 54,
+        55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 45, 45, 45, 44, 46, 46, 47, 48,
+        49, 51, 52, 51, 51, 51, 52, 52, 53, 53, 54, 55, 55, 57, 58, 59, 60, 60,
+        61, 61, 61, 61, 61, 61, 49, 47, 46, 45, 45, 46, 45, 47, 49, 53, 53, 56,
+        57, 58, 59, 59, 61, 61, 62, 63, 64, 65, 66, 67, 68, 68, 69, 69, 68, 68,
+        67, 67, 52, 50, 49, 48, 47, 47, 47, 48, 50, 53, 54, 57, 59, 61, 63, 64,
+        66, 67, 68, 70, 70, 72, 73, 75, 75, 75, 77, 78, 77, 76, 75, 74, 57, 54,
+        53, 52, 51, 51, 50, 51, 53, 56, 57, 60, 61, 64, 66, 67, 71, 72, 73, 76,
+        76, 79, 80, 82, 83, 83, 84, 85, 86, 85, 83, 82, 64, 61, 60, 58, 57, 57,
+        55, 56, 58, 61, 61, 64, 66, 68, 71, 71, 75, 77, 79, 82, 83, 86, 87, 90,
+        91, 91, 93, 93, 94, 94, 92, 90, 68, 64, 64, 61, 61, 60, 59, 58, 60, 61,
+        63, 64, 67, 67, 71, 71, 74, 75, 79, 80, 83, 85, 87, 89, 91, 94, 95, 97,
+        97, 99, 98, 98 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 34, 53, 75, 34, 49, 64, 81, 53, 64, 91, 112, 75, 81, 112, 140,
+        /* Size 8x8 */
+        32, 32, 34, 39, 50, 62, 76, 84, 32, 33, 35, 40, 48, 59, 71, 79, 34, 35,
+        39, 46, 53, 63, 74, 81, 39, 40, 46, 56, 65, 75, 86, 92, 50, 48, 53, 65,
+        78, 90, 101, 106, 62, 59, 63, 75, 90, 105, 118, 123, 76, 71, 74, 86,
+        101, 118, 134, 142, 84, 79, 81, 92, 106, 123, 142, 153,
+        /* Size 16x16 */
+        32, 31, 31, 32, 33, 36, 39, 44, 48, 54, 59, 66, 74, 81, 86, 91, 31, 32,
+        32, 32, 33, 35, 38, 42, 46, 51, 56, 63, 70, 77, 81, 86, 31, 32, 32, 33,
+        34, 35, 38, 41, 45, 49, 54, 60, 67, 73, 77, 82, 32, 32, 33, 34, 36, 37,
+        40, 42, 45, 49, 53, 59, 66, 71, 75, 80, 33, 33, 34, 36, 38, 42, 44, 46,
+        50, 53, 57, 63, 69, 74, 78, 80, 36, 35, 35, 37, 42, 48, 50, 54, 57, 60,
+        64, 69, 75, 80, 84, 85, 39, 38, 38, 40, 44, 50, 54, 58, 61, 65, 69, 74,
+        80, 85, 89, 91, 44, 42, 41, 42, 46, 54, 58, 63, 67, 71, 75, 80, 86, 91,
+        95, 97, 48, 46, 45, 45, 50, 57, 61, 67, 71, 76, 80, 86, 93, 98, 101,
+        104, 54, 51, 49, 49, 53, 60, 65, 71, 76, 82, 87, 93, 100, 105, 109, 112,
+        59, 56, 54, 53, 57, 64, 69, 75, 80, 87, 92, 99, 106, 112, 116, 120, 66,
+        63, 60, 59, 63, 69, 74, 80, 86, 93, 99, 107, 115, 121, 125, 129, 74, 70,
+        67, 66, 69, 75, 80, 86, 93, 100, 106, 115, 123, 130, 135, 138, 81, 77,
+        73, 71, 74, 80, 85, 91, 98, 105, 112, 121, 130, 137, 142, 148, 86, 81,
+        77, 75, 78, 84, 89, 95, 101, 109, 116, 125, 135, 142, 147, 153, 91, 86,
+        82, 80, 80, 85, 91, 97, 104, 112, 120, 129, 138, 148, 153, 159,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 32, 32, 33, 34, 36, 36, 39, 41, 44, 46, 48, 52,
+        54, 58, 59, 65, 66, 71, 74, 80, 81, 83, 86, 89, 91, 93, 31, 32, 32, 32,
+        32, 32, 32, 32, 33, 34, 35, 35, 38, 39, 42, 44, 46, 50, 51, 56, 56, 62,
+        63, 68, 71, 76, 77, 78, 82, 84, 86, 88, 31, 32, 32, 32, 32, 32, 32, 32,
+        33, 34, 35, 35, 38, 39, 42, 44, 46, 49, 51, 55, 56, 61, 63, 67, 70, 75,
+        77, 78, 81, 84, 86, 88, 31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34,
+        37, 38, 41, 42, 44, 48, 49, 53, 54, 59, 60, 65, 68, 72, 74, 75, 78, 80,
+        82, 84, 31, 32, 32, 32, 32, 33, 33, 33, 34, 34, 35, 35, 38, 39, 41, 43,
+        45, 48, 49, 53, 54, 59, 60, 65, 67, 72, 73, 74, 77, 80, 82, 84, 31, 32,
+        32, 32, 33, 33, 33, 34, 35, 35, 36, 36, 39, 40, 42, 44, 45, 48, 50, 53,
+        54, 59, 60, 64, 67, 71, 73, 74, 77, 79, 81, 83, 32, 32, 32, 32, 33, 33,
+        34, 35, 36, 36, 37, 38, 40, 40, 42, 44, 45, 48, 49, 53, 53, 58, 59, 63,
+        66, 70, 71, 72, 75, 78, 80, 83, 32, 32, 32, 32, 33, 34, 35, 35, 36, 37,
+        38, 38, 40, 41, 42, 44, 46, 48, 49, 53, 53, 58, 59, 63, 65, 69, 71, 72,
+        74, 77, 79, 80, 33, 33, 33, 33, 34, 35, 36, 36, 38, 39, 42, 42, 44, 45,
+        46, 48, 50, 52, 53, 57, 57, 62, 63, 67, 69, 73, 74, 75, 78, 79, 80, 81,
+        34, 34, 34, 33, 34, 35, 36, 37, 39, 39, 42, 43, 45, 46, 47, 49, 51, 53,
+        54, 58, 58, 63, 64, 68, 70, 74, 75, 76, 79, 81, 84, 86, 36, 35, 35, 34,
+        35, 36, 37, 38, 42, 42, 48, 48, 50, 51, 54, 55, 57, 59, 60, 63, 64, 68,
+        69, 73, 75, 79, 80, 81, 84, 85, 85, 86, 36, 35, 35, 34, 35, 36, 38, 38,
+        42, 43, 48, 49, 51, 52, 54, 55, 57, 59, 60, 64, 64, 68, 69, 73, 75, 79,
+        80, 81, 84, 86, 88, 91, 39, 38, 38, 37, 38, 39, 40, 40, 44, 45, 50, 51,
+        54, 55, 58, 59, 61, 64, 65, 68, 69, 73, 74, 78, 80, 84, 85, 86, 89, 91,
+        91, 91, 41, 39, 39, 38, 39, 40, 40, 41, 45, 46, 51, 52, 55, 56, 59, 61,
+        63, 65, 67, 70, 70, 75, 76, 80, 82, 86, 87, 88, 91, 92, 94, 96, 44, 42,
+        42, 41, 41, 42, 42, 42, 46, 47, 54, 54, 58, 59, 63, 65, 67, 70, 71, 75,
+        75, 79, 80, 84, 86, 90, 91, 92, 95, 97, 97, 97, 46, 44, 44, 42, 43, 44,
+        44, 44, 48, 49, 55, 55, 59, 61, 65, 67, 69, 72, 74, 77, 78, 82, 83, 87,
+        89, 93, 94, 95, 98, 98, 100, 103, 48, 46, 46, 44, 45, 45, 45, 46, 50,
+        51, 57, 57, 61, 63, 67, 69, 71, 74, 76, 80, 80, 85, 86, 90, 93, 96, 98,
+        99, 101, 104, 104, 103, 52, 50, 49, 48, 48, 48, 48, 48, 52, 53, 59, 59,
+        64, 65, 70, 72, 74, 78, 80, 84, 85, 90, 91, 95, 97, 101, 103, 104, 106,
+        106, 107, 110, 54, 51, 51, 49, 49, 50, 49, 49, 53, 54, 60, 60, 65, 67,
+        71, 74, 76, 80, 82, 86, 87, 92, 93, 97, 100, 104, 105, 106, 109, 112,
+        112, 110, 58, 56, 55, 53, 53, 53, 53, 53, 57, 58, 63, 64, 68, 70, 75,
+        77, 80, 84, 86, 91, 91, 97, 98, 103, 105, 110, 111, 112, 115, 114, 115,
+        118, 59, 56, 56, 54, 54, 54, 53, 53, 57, 58, 64, 64, 69, 70, 75, 78, 80,
+        85, 87, 91, 92, 98, 99, 103, 106, 110, 112, 113, 116, 119, 120, 119, 65,
+        62, 61, 59, 59, 59, 58, 58, 62, 63, 68, 68, 73, 75, 79, 82, 85, 90, 92,
+        97, 98, 105, 106, 111, 114, 118, 120, 121, 124, 123, 123, 126, 66, 63,
+        63, 60, 60, 60, 59, 59, 63, 64, 69, 69, 74, 76, 80, 83, 86, 91, 93, 98,
+        99, 106, 107, 112, 115, 119, 121, 122, 125, 128, 129, 126, 71, 68, 67,
+        65, 65, 64, 63, 63, 67, 68, 73, 73, 78, 80, 84, 87, 90, 95, 97, 103,
+        103, 111, 112, 117, 120, 125, 127, 128, 131, 132, 132, 135, 74, 71, 70,
+        68, 67, 67, 66, 65, 69, 70, 75, 75, 80, 82, 86, 89, 93, 97, 100, 105,
+        106, 114, 115, 120, 123, 128, 130, 131, 135, 135, 138, 136, 80, 76, 75,
+        72, 72, 71, 70, 69, 73, 74, 79, 79, 84, 86, 90, 93, 96, 101, 104, 110,
+        110, 118, 119, 125, 128, 134, 136, 137, 140, 142, 140, 144, 81, 77, 77,
+        74, 73, 73, 71, 71, 74, 75, 80, 80, 85, 87, 91, 94, 98, 103, 105, 111,
+        112, 120, 121, 127, 130, 136, 137, 139, 142, 145, 148, 144, 83, 78, 78,
+        75, 74, 74, 72, 72, 75, 76, 81, 81, 86, 88, 92, 95, 99, 104, 106, 112,
+        113, 121, 122, 128, 131, 137, 139, 140, 144, 148, 150, 155, 86, 82, 81,
+        78, 77, 77, 75, 74, 78, 79, 84, 84, 89, 91, 95, 98, 101, 106, 109, 115,
+        116, 124, 125, 131, 135, 140, 142, 144, 147, 149, 153, 155, 89, 84, 84,
+        80, 80, 79, 78, 77, 79, 81, 85, 86, 91, 92, 97, 98, 104, 106, 112, 114,
+        119, 123, 128, 132, 135, 142, 145, 148, 149, 153, 154, 159, 91, 86, 86,
+        82, 82, 81, 80, 79, 80, 84, 85, 88, 91, 94, 97, 100, 104, 107, 112, 115,
+        120, 123, 129, 132, 138, 140, 148, 150, 153, 154, 159, 159, 93, 88, 88,
+        84, 84, 83, 83, 80, 81, 86, 86, 91, 91, 96, 97, 103, 103, 110, 110, 118,
+        119, 126, 126, 135, 136, 144, 144, 155, 155, 159, 159, 164,
+        /* Size 4x8 */
+        32, 35, 51, 77, 32, 36, 50, 72, 34, 42, 54, 75, 38, 51, 67, 87, 48, 59,
+        80, 103, 60, 68, 92, 119, 72, 79, 104, 135, 81, 86, 112, 144,
+        /* Size 8x4 */
+        32, 32, 34, 38, 48, 60, 72, 81, 35, 36, 42, 51, 59, 68, 79, 86, 51, 50,
+        54, 67, 80, 92, 104, 112, 77, 72, 75, 87, 103, 119, 135, 144,
+        /* Size 8x16 */
+        32, 31, 33, 40, 51, 65, 79, 87, 31, 32, 33, 39, 49, 61, 74, 82, 31, 32,
+        34, 38, 47, 59, 71, 79, 32, 33, 36, 40, 48, 58, 69, 77, 33, 34, 38, 44,
+        52, 62, 72, 78, 36, 35, 42, 51, 58, 68, 78, 84, 39, 38, 44, 54, 63, 73,
+        84, 89, 44, 41, 46, 59, 69, 79, 90, 96, 48, 45, 50, 62, 74, 85, 96, 103,
+        53, 49, 53, 66, 79, 92, 103, 111, 58, 54, 57, 70, 84, 98, 110, 118, 66,
+        60, 63, 75, 90, 106, 119, 126, 74, 67, 69, 81, 97, 113, 128, 134, 81,
+        73, 75, 86, 102, 120, 135, 143, 86, 78, 78, 90, 106, 124, 140, 147, 91,
+        82, 80, 90, 103, 119, 137, 151,
+        /* Size 16x8 */
+        32, 31, 31, 32, 33, 36, 39, 44, 48, 53, 58, 66, 74, 81, 86, 91, 31, 32,
+        32, 33, 34, 35, 38, 41, 45, 49, 54, 60, 67, 73, 78, 82, 33, 33, 34, 36,
+        38, 42, 44, 46, 50, 53, 57, 63, 69, 75, 78, 80, 40, 39, 38, 40, 44, 51,
+        54, 59, 62, 66, 70, 75, 81, 86, 90, 90, 51, 49, 47, 48, 52, 58, 63, 69,
+        74, 79, 84, 90, 97, 102, 106, 103, 65, 61, 59, 58, 62, 68, 73, 79, 85,
+        92, 98, 106, 113, 120, 124, 119, 79, 74, 71, 69, 72, 78, 84, 90, 96,
+        103, 110, 119, 128, 135, 140, 137, 87, 82, 79, 77, 78, 84, 89, 96, 103,
+        111, 118, 126, 134, 143, 147, 151,
+        /* Size 16x32 */
+        32, 31, 31, 32, 33, 36, 40, 44, 51, 53, 65, 66, 79, 81, 87, 90, 31, 32,
+        32, 32, 33, 35, 39, 42, 49, 51, 62, 63, 75, 77, 83, 85, 31, 32, 32, 32,
+        33, 35, 39, 42, 49, 51, 61, 62, 74, 76, 82, 85, 31, 32, 32, 33, 33, 34,
+        38, 41, 47, 49, 59, 60, 72, 74, 79, 81, 31, 32, 32, 33, 34, 35, 38, 41,
+        47, 49, 59, 60, 71, 73, 79, 81, 32, 32, 33, 34, 35, 36, 39, 42, 48, 50,
+        59, 60, 71, 72, 78, 80, 32, 32, 33, 35, 36, 37, 40, 42, 48, 49, 58, 59,
+        69, 71, 77, 80, 32, 33, 33, 35, 36, 38, 41, 42, 48, 49, 58, 59, 69, 70,
+        75, 77, 33, 33, 34, 36, 38, 41, 44, 46, 52, 53, 62, 63, 72, 74, 78, 78,
+        34, 34, 34, 37, 39, 42, 45, 48, 53, 54, 63, 64, 73, 75, 80, 83, 36, 34,
+        35, 38, 42, 48, 51, 54, 58, 60, 68, 69, 78, 80, 84, 83, 36, 35, 35, 38,
+        42, 48, 51, 54, 59, 60, 68, 69, 79, 80, 85, 87, 39, 37, 38, 40, 44, 50,
+        54, 58, 63, 65, 73, 74, 84, 85, 89, 88, 40, 38, 39, 41, 45, 51, 56, 59,
+        65, 67, 75, 76, 85, 87, 90, 93, 44, 41, 41, 43, 46, 53, 59, 63, 69, 71,
+        79, 80, 90, 91, 96, 93, 46, 43, 43, 44, 48, 55, 60, 65, 72, 73, 82, 83,
+        93, 94, 97, 100, 48, 45, 45, 46, 50, 56, 62, 67, 74, 76, 85, 86, 96, 98,
+        103, 100, 52, 48, 48, 49, 52, 59, 65, 70, 78, 80, 90, 91, 101, 103, 105,
+        107, 53, 49, 49, 50, 53, 60, 66, 71, 79, 82, 92, 93, 103, 105, 111, 107,
+        58, 53, 53, 53, 57, 63, 69, 74, 83, 86, 97, 98, 109, 111, 113, 115, 58,
+        54, 54, 54, 57, 63, 70, 75, 84, 87, 98, 99, 110, 112, 118, 115, 65, 60,
+        59, 58, 62, 68, 74, 79, 89, 92, 105, 106, 118, 119, 122, 123, 66, 61,
+        60, 59, 63, 69, 75, 80, 90, 93, 106, 107, 119, 121, 126, 123, 71, 65,
+        65, 63, 67, 73, 79, 84, 94, 97, 111, 112, 125, 127, 131, 132, 74, 68,
+        67, 66, 69, 75, 81, 86, 97, 100, 113, 115, 128, 130, 134, 132, 79, 72,
+        72, 70, 73, 79, 85, 90, 101, 104, 118, 119, 133, 135, 141, 140, 81, 74,
+        73, 71, 75, 80, 86, 91, 102, 105, 120, 121, 135, 137, 143, 140, 82, 75,
+        74, 72, 75, 81, 87, 92, 103, 106, 121, 122, 136, 139, 147, 151, 86, 78,
+        78, 75, 78, 84, 90, 95, 106, 109, 124, 125, 140, 142, 147, 151, 88, 81,
+        80, 77, 80, 86, 90, 98, 105, 112, 122, 127, 140, 144, 152, 155, 91, 83,
+        82, 79, 80, 88, 90, 100, 103, 114, 119, 130, 137, 148, 151, 155, 93, 85,
+        85, 81, 81, 90, 90, 102, 103, 117, 117, 134, 134, 151, 152, 160,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 32, 32, 32, 33, 34, 36, 36, 39, 40, 44, 46, 48, 52,
+        53, 58, 58, 65, 66, 71, 74, 79, 81, 82, 86, 88, 91, 93, 31, 32, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 35, 37, 38, 41, 43, 45, 48, 49, 53, 54, 60,
+        61, 65, 68, 72, 74, 75, 78, 81, 83, 85, 31, 32, 32, 32, 32, 33, 33, 33,
+        34, 34, 35, 35, 38, 39, 41, 43, 45, 48, 49, 53, 54, 59, 60, 65, 67, 72,
+        73, 74, 78, 80, 82, 85, 32, 32, 32, 33, 33, 34, 35, 35, 36, 37, 38, 38,
+        40, 41, 43, 44, 46, 49, 50, 53, 54, 58, 59, 63, 66, 70, 71, 72, 75, 77,
+        79, 81, 33, 33, 33, 33, 34, 35, 36, 36, 38, 39, 42, 42, 44, 45, 46, 48,
+        50, 52, 53, 57, 57, 62, 63, 67, 69, 73, 75, 75, 78, 80, 80, 81, 36, 35,
+        35, 34, 35, 36, 37, 38, 41, 42, 48, 48, 50, 51, 53, 55, 56, 59, 60, 63,
+        63, 68, 69, 73, 75, 79, 80, 81, 84, 86, 88, 90, 40, 39, 39, 38, 38, 39,
+        40, 41, 44, 45, 51, 51, 54, 56, 59, 60, 62, 65, 66, 69, 70, 74, 75, 79,
+        81, 85, 86, 87, 90, 90, 90, 90, 44, 42, 42, 41, 41, 42, 42, 42, 46, 48,
+        54, 54, 58, 59, 63, 65, 67, 70, 71, 74, 75, 79, 80, 84, 86, 90, 91, 92,
+        95, 98, 100, 102, 51, 49, 49, 47, 47, 48, 48, 48, 52, 53, 58, 59, 63,
+        65, 69, 72, 74, 78, 79, 83, 84, 89, 90, 94, 97, 101, 102, 103, 106, 105,
+        103, 103, 53, 51, 51, 49, 49, 50, 49, 49, 53, 54, 60, 60, 65, 67, 71,
+        73, 76, 80, 82, 86, 87, 92, 93, 97, 100, 104, 105, 106, 109, 112, 114,
+        117, 65, 62, 61, 59, 59, 59, 58, 58, 62, 63, 68, 68, 73, 75, 79, 82, 85,
+        90, 92, 97, 98, 105, 106, 111, 113, 118, 120, 121, 124, 122, 119, 117,
+        66, 63, 62, 60, 60, 60, 59, 59, 63, 64, 69, 69, 74, 76, 80, 83, 86, 91,
+        93, 98, 99, 106, 107, 112, 115, 119, 121, 122, 125, 127, 130, 134, 79,
+        75, 74, 72, 71, 71, 69, 69, 72, 73, 78, 79, 84, 85, 90, 93, 96, 101,
+        103, 109, 110, 118, 119, 125, 128, 133, 135, 136, 140, 140, 137, 134,
+        81, 77, 76, 74, 73, 72, 71, 70, 74, 75, 80, 80, 85, 87, 91, 94, 98, 103,
+        105, 111, 112, 119, 121, 127, 130, 135, 137, 139, 142, 144, 148, 151,
+        87, 83, 82, 79, 79, 78, 77, 75, 78, 80, 84, 85, 89, 90, 96, 97, 103,
+        105, 111, 113, 118, 122, 126, 131, 134, 141, 143, 147, 147, 152, 151,
+        152, 90, 85, 85, 81, 81, 80, 80, 77, 78, 83, 83, 87, 88, 93, 93, 100,
+        100, 107, 107, 115, 115, 123, 123, 132, 132, 140, 140, 151, 151, 155,
+        155, 160,
+        /* Size 4x16 */
+        31, 36, 53, 81, 32, 35, 51, 76, 32, 35, 49, 73, 32, 37, 49, 71, 33, 41,
+        53, 74, 34, 48, 60, 80, 37, 50, 65, 85, 41, 53, 71, 91, 45, 56, 76, 98,
+        49, 60, 82, 105, 54, 63, 87, 112, 61, 69, 93, 121, 68, 75, 100, 130, 74,
+        80, 105, 137, 78, 84, 109, 142, 83, 88, 114, 148,
+        /* Size 16x4 */
+        31, 32, 32, 32, 33, 34, 37, 41, 45, 49, 54, 61, 68, 74, 78, 83, 36, 35,
+        35, 37, 41, 48, 50, 53, 56, 60, 63, 69, 75, 80, 84, 88, 53, 51, 49, 49,
+        53, 60, 65, 71, 76, 82, 87, 93, 100, 105, 109, 114, 81, 76, 73, 71, 74,
+        80, 85, 91, 98, 105, 112, 121, 130, 137, 142, 148,
+        /* Size 8x32 */
+        32, 31, 33, 40, 51, 65, 79, 87, 31, 32, 33, 39, 49, 62, 75, 83, 31, 32,
+        33, 39, 49, 61, 74, 82, 31, 32, 33, 38, 47, 59, 72, 79, 31, 32, 34, 38,
+        47, 59, 71, 79, 32, 33, 35, 39, 48, 59, 71, 78, 32, 33, 36, 40, 48, 58,
+        69, 77, 32, 33, 36, 41, 48, 58, 69, 75, 33, 34, 38, 44, 52, 62, 72, 78,
+        34, 34, 39, 45, 53, 63, 73, 80, 36, 35, 42, 51, 58, 68, 78, 84, 36, 35,
+        42, 51, 59, 68, 79, 85, 39, 38, 44, 54, 63, 73, 84, 89, 40, 39, 45, 56,
+        65, 75, 85, 90, 44, 41, 46, 59, 69, 79, 90, 96, 46, 43, 48, 60, 72, 82,
+        93, 97, 48, 45, 50, 62, 74, 85, 96, 103, 52, 48, 52, 65, 78, 90, 101,
+        105, 53, 49, 53, 66, 79, 92, 103, 111, 58, 53, 57, 69, 83, 97, 109, 113,
+        58, 54, 57, 70, 84, 98, 110, 118, 65, 59, 62, 74, 89, 105, 118, 122, 66,
+        60, 63, 75, 90, 106, 119, 126, 71, 65, 67, 79, 94, 111, 125, 131, 74,
+        67, 69, 81, 97, 113, 128, 134, 79, 72, 73, 85, 101, 118, 133, 141, 81,
+        73, 75, 86, 102, 120, 135, 143, 82, 74, 75, 87, 103, 121, 136, 147, 86,
+        78, 78, 90, 106, 124, 140, 147, 88, 80, 80, 90, 105, 122, 140, 152, 91,
+        82, 80, 90, 103, 119, 137, 151, 93, 85, 81, 90, 103, 117, 134, 152,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 32, 32, 32, 33, 34, 36, 36, 39, 40, 44, 46, 48, 52,
+        53, 58, 58, 65, 66, 71, 74, 79, 81, 82, 86, 88, 91, 93, 31, 32, 32, 32,
+        32, 33, 33, 33, 34, 34, 35, 35, 38, 39, 41, 43, 45, 48, 49, 53, 54, 59,
+        60, 65, 67, 72, 73, 74, 78, 80, 82, 85, 33, 33, 33, 33, 34, 35, 36, 36,
+        38, 39, 42, 42, 44, 45, 46, 48, 50, 52, 53, 57, 57, 62, 63, 67, 69, 73,
+        75, 75, 78, 80, 80, 81, 40, 39, 39, 38, 38, 39, 40, 41, 44, 45, 51, 51,
+        54, 56, 59, 60, 62, 65, 66, 69, 70, 74, 75, 79, 81, 85, 86, 87, 90, 90,
+        90, 90, 51, 49, 49, 47, 47, 48, 48, 48, 52, 53, 58, 59, 63, 65, 69, 72,
+        74, 78, 79, 83, 84, 89, 90, 94, 97, 101, 102, 103, 106, 105, 103, 103,
+        65, 62, 61, 59, 59, 59, 58, 58, 62, 63, 68, 68, 73, 75, 79, 82, 85, 90,
+        92, 97, 98, 105, 106, 111, 113, 118, 120, 121, 124, 122, 119, 117, 79,
+        75, 74, 72, 71, 71, 69, 69, 72, 73, 78, 79, 84, 85, 90, 93, 96, 101,
+        103, 109, 110, 118, 119, 125, 128, 133, 135, 136, 140, 140, 137, 134,
+        87, 83, 82, 79, 79, 78, 77, 75, 78, 80, 84, 85, 89, 90, 96, 97, 103,
+        105, 111, 113, 118, 122, 126, 131, 134, 141, 143, 147, 147, 152, 151,
+        152 },
+      { /* Chroma */
+        /* Size 4x4 */
+        32, 46, 49, 58, 46, 53, 55, 62, 49, 55, 70, 78, 58, 62, 78, 91,
+        /* Size 8x8 */
+        31, 34, 42, 47, 49, 54, 60, 64, 34, 39, 45, 46, 47, 51, 56, 59, 42, 45,
+        48, 49, 50, 53, 57, 60, 47, 46, 49, 55, 58, 61, 65, 66, 49, 47, 50, 58,
+        65, 69, 73, 74, 54, 51, 53, 61, 69, 76, 82, 83, 60, 56, 57, 65, 73, 82,
+        89, 92, 64, 59, 60, 66, 74, 83, 92, 96,
+        /* Size 16x16 */
+        32, 31, 31, 35, 40, 49, 48, 49, 50, 52, 54, 57, 61, 64, 66, 68, 31, 31,
+        32, 37, 41, 47, 47, 46, 48, 49, 51, 54, 57, 60, 62, 64, 31, 32, 34, 39,
+        43, 46, 46, 45, 46, 47, 49, 52, 55, 57, 59, 61, 35, 37, 39, 44, 46, 47,
+        46, 45, 46, 47, 48, 51, 53, 56, 57, 59, 40, 41, 43, 46, 48, 50, 49, 48,
+        49, 49, 51, 53, 55, 57, 59, 59, 49, 47, 46, 47, 50, 53, 53, 53, 54, 54,
+        55, 57, 59, 61, 62, 62, 48, 47, 46, 46, 49, 53, 54, 55, 56, 57, 58, 60,
+        62, 64, 65, 65, 49, 46, 45, 45, 48, 53, 55, 58, 60, 61, 62, 64, 66, 68,
+        69, 69, 50, 48, 46, 46, 49, 54, 56, 60, 61, 63, 65, 67, 69, 71, 72, 72,
+        52, 49, 47, 47, 49, 54, 57, 61, 63, 66, 68, 71, 73, 75, 76, 77, 54, 51,
+        49, 48, 51, 55, 58, 62, 65, 68, 71, 74, 76, 78, 80, 81, 57, 54, 52, 51,
+        53, 57, 60, 64, 67, 71, 74, 77, 80, 83, 84, 85, 61, 57, 55, 53, 55, 59,
+        62, 66, 69, 73, 76, 80, 84, 87, 89, 89, 64, 60, 57, 56, 57, 61, 64, 68,
+        71, 75, 78, 83, 87, 90, 92, 94, 66, 62, 59, 57, 59, 62, 65, 69, 72, 76,
+        80, 84, 89, 92, 94, 96, 68, 64, 61, 59, 59, 62, 65, 69, 72, 77, 81, 85,
+        89, 94, 96, 98,
+        /* Size 32x32 */
+        32, 31, 31, 30, 31, 33, 35, 36, 40, 41, 49, 49, 48, 48, 49, 50, 50, 52,
+        52, 54, 54, 57, 57, 60, 61, 63, 64, 65, 66, 67, 68, 69, 31, 31, 31, 31,
+        32, 34, 37, 38, 41, 42, 47, 47, 47, 47, 47, 47, 48, 49, 50, 52, 52, 54,
+        55, 57, 58, 60, 61, 61, 63, 64, 64, 65, 31, 31, 31, 31, 32, 35, 37, 39,
+        41, 42, 47, 47, 47, 46, 46, 47, 48, 49, 49, 51, 51, 54, 54, 56, 57, 59,
+        60, 61, 62, 63, 64, 65, 30, 31, 31, 32, 33, 35, 38, 40, 42, 42, 46, 46,
+        45, 45, 45, 45, 46, 47, 47, 49, 49, 52, 52, 54, 55, 57, 58, 58, 60, 61,
+        61, 62, 31, 32, 32, 33, 34, 37, 39, 41, 43, 43, 46, 46, 46, 45, 45, 46,
+        46, 47, 47, 49, 49, 51, 52, 54, 55, 57, 57, 58, 59, 60, 61, 62, 33, 34,
+        35, 35, 37, 39, 41, 43, 44, 45, 47, 47, 46, 46, 45, 46, 46, 47, 47, 49,
+        49, 51, 51, 53, 54, 56, 57, 57, 58, 59, 60, 61, 35, 37, 37, 38, 39, 41,
+        44, 46, 46, 46, 47, 47, 46, 46, 45, 46, 46, 47, 47, 48, 48, 50, 51, 52,
+        53, 55, 56, 56, 57, 58, 59, 61, 36, 38, 39, 40, 41, 43, 46, 47, 47, 47,
+        48, 47, 46, 46, 45, 46, 46, 46, 47, 48, 48, 50, 50, 52, 53, 54, 55, 55,
+        56, 57, 58, 58, 40, 41, 41, 42, 43, 44, 46, 47, 48, 48, 50, 49, 49, 49,
+        48, 49, 49, 49, 49, 51, 51, 52, 53, 54, 55, 57, 57, 58, 59, 59, 59, 59,
+        41, 42, 42, 42, 43, 45, 46, 47, 48, 48, 50, 50, 49, 49, 49, 49, 50, 50,
+        50, 52, 52, 53, 53, 55, 56, 57, 58, 58, 59, 60, 61, 62, 49, 47, 47, 46,
+        46, 47, 47, 48, 50, 50, 53, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 56,
+        57, 58, 59, 60, 61, 61, 62, 62, 62, 62, 49, 47, 47, 46, 46, 47, 47, 47,
+        49, 50, 53, 53, 53, 53, 54, 54, 54, 54, 54, 55, 56, 57, 57, 59, 59, 61,
+        61, 62, 63, 63, 64, 65, 48, 47, 47, 45, 46, 46, 46, 46, 49, 49, 53, 53,
+        54, 54, 55, 56, 56, 57, 57, 58, 58, 60, 60, 61, 62, 63, 64, 64, 65, 66,
+        65, 65, 48, 47, 46, 45, 45, 46, 46, 46, 49, 49, 53, 53, 54, 55, 56, 57,
+        57, 58, 58, 59, 60, 61, 61, 63, 63, 65, 65, 65, 66, 66, 67, 68, 49, 47,
+        46, 45, 45, 45, 45, 45, 48, 49, 53, 54, 55, 56, 58, 59, 60, 61, 61, 62,
+        62, 63, 64, 65, 66, 67, 68, 68, 69, 70, 69, 68, 50, 47, 47, 45, 46, 46,
+        46, 46, 49, 49, 54, 54, 56, 57, 59, 60, 60, 62, 62, 63, 64, 65, 65, 67,
+        68, 69, 69, 70, 70, 70, 71, 71, 50, 48, 48, 46, 46, 46, 46, 46, 49, 50,
+        54, 54, 56, 57, 60, 60, 61, 63, 63, 65, 65, 67, 67, 68, 69, 71, 71, 71,
+        72, 73, 72, 71, 52, 49, 49, 47, 47, 47, 47, 46, 49, 50, 54, 54, 57, 58,
+        61, 62, 63, 65, 65, 67, 67, 69, 70, 71, 72, 73, 74, 74, 75, 74, 74, 75,
+        52, 50, 49, 47, 47, 47, 47, 47, 49, 50, 54, 54, 57, 58, 61, 62, 63, 65,
+        66, 68, 68, 70, 71, 72, 73, 75, 75, 75, 76, 77, 77, 75, 54, 52, 51, 49,
+        49, 49, 48, 48, 51, 52, 55, 55, 58, 59, 62, 63, 65, 67, 68, 70, 70, 73,
+        73, 75, 76, 78, 78, 78, 79, 78, 78, 79, 54, 52, 51, 49, 49, 49, 48, 48,
+        51, 52, 55, 56, 58, 60, 62, 64, 65, 67, 68, 70, 71, 73, 74, 75, 76, 78,
+        78, 79, 80, 81, 81, 79, 57, 54, 54, 52, 51, 51, 50, 50, 52, 53, 56, 57,
+        60, 61, 63, 65, 67, 69, 70, 73, 73, 76, 77, 79, 80, 82, 82, 83, 84, 83,
+        82, 83, 57, 55, 54, 52, 52, 51, 51, 50, 53, 53, 57, 57, 60, 61, 64, 65,
+        67, 70, 71, 73, 74, 77, 77, 79, 80, 82, 83, 83, 84, 85, 85, 83, 60, 57,
+        56, 54, 54, 53, 52, 52, 54, 55, 58, 59, 61, 63, 65, 67, 68, 71, 72, 75,
+        75, 79, 79, 82, 83, 85, 86, 86, 87, 87, 86, 87, 61, 58, 57, 55, 55, 54,
+        53, 53, 55, 56, 59, 59, 62, 63, 66, 68, 69, 72, 73, 76, 76, 80, 80, 83,
+        84, 86, 87, 88, 89, 89, 89, 87, 63, 60, 59, 57, 57, 56, 55, 54, 57, 57,
+        60, 61, 63, 65, 67, 69, 71, 73, 75, 78, 78, 82, 82, 85, 86, 89, 89, 90,
+        91, 92, 90, 91, 64, 61, 60, 58, 57, 57, 56, 55, 57, 58, 61, 61, 64, 65,
+        68, 69, 71, 74, 75, 78, 78, 82, 83, 86, 87, 89, 90, 91, 92, 93, 94, 91,
+        65, 61, 61, 58, 58, 57, 56, 55, 58, 58, 61, 62, 64, 65, 68, 70, 71, 74,
+        75, 78, 79, 83, 83, 86, 88, 90, 91, 91, 93, 94, 94, 96, 66, 63, 62, 60,
+        59, 58, 57, 56, 59, 59, 62, 63, 65, 66, 69, 70, 72, 75, 76, 79, 80, 84,
+        84, 87, 89, 91, 92, 93, 94, 94, 96, 96, 67, 64, 63, 61, 60, 59, 58, 57,
+        59, 60, 62, 63, 66, 66, 70, 70, 73, 74, 77, 78, 81, 83, 85, 87, 89, 92,
+        93, 94, 94, 96, 96, 97, 68, 64, 64, 61, 61, 60, 59, 58, 59, 61, 62, 64,
+        65, 67, 69, 71, 72, 74, 77, 78, 81, 82, 85, 86, 89, 90, 94, 94, 96, 96,
+        98, 97, 69, 65, 65, 62, 62, 61, 61, 58, 59, 62, 62, 65, 65, 68, 68, 71,
+        71, 75, 75, 79, 79, 83, 83, 87, 87, 91, 91, 96, 96, 97, 97, 99,
+        /* Size 4x8 */
+        31, 47, 50, 61, 36, 47, 47, 57, 43, 50, 50, 58, 45, 53, 58, 65, 47, 54,
+        66, 74, 52, 56, 70, 82, 57, 60, 75, 90, 61, 63, 77, 93,
+        /* Size 8x4 */
+        31, 36, 43, 45, 47, 52, 57, 61, 47, 47, 50, 53, 54, 56, 60, 63, 50, 47,
+        50, 58, 66, 70, 75, 77, 61, 57, 58, 65, 74, 82, 90, 93,
+        /* Size 8x16 */
+        32, 32, 40, 49, 51, 57, 63, 67, 31, 33, 41, 47, 49, 54, 59, 63, 31, 35,
+        43, 46, 47, 51, 57, 60, 35, 39, 46, 46, 47, 50, 55, 58, 41, 43, 48, 49,
+        49, 52, 57, 59, 49, 47, 50, 53, 54, 57, 60, 62, 48, 46, 49, 54, 57, 60,
+        64, 65, 49, 45, 48, 56, 61, 64, 67, 69, 50, 46, 49, 57, 63, 67, 71, 73,
+        52, 48, 50, 58, 65, 71, 75, 77, 54, 50, 51, 59, 67, 73, 78, 81, 57, 52,
+        53, 61, 69, 77, 82, 85, 61, 55, 56, 63, 72, 80, 86, 88, 64, 58, 58, 65,
+        73, 82, 89, 92, 66, 59, 59, 66, 75, 84, 91, 94, 68, 61, 59, 65, 72, 81,
+        89, 95,
+        /* Size 16x8 */
+        32, 31, 31, 35, 41, 49, 48, 49, 50, 52, 54, 57, 61, 64, 66, 68, 32, 33,
+        35, 39, 43, 47, 46, 45, 46, 48, 50, 52, 55, 58, 59, 61, 40, 41, 43, 46,
+        48, 50, 49, 48, 49, 50, 51, 53, 56, 58, 59, 59, 49, 47, 46, 46, 49, 53,
+        54, 56, 57, 58, 59, 61, 63, 65, 66, 65, 51, 49, 47, 47, 49, 54, 57, 61,
+        63, 65, 67, 69, 72, 73, 75, 72, 57, 54, 51, 50, 52, 57, 60, 64, 67, 71,
+        73, 77, 80, 82, 84, 81, 63, 59, 57, 55, 57, 60, 64, 67, 71, 75, 78, 82,
+        86, 89, 91, 89, 67, 63, 60, 58, 59, 62, 65, 69, 73, 77, 81, 85, 88, 92,
+        94, 95,
+        /* Size 16x32 */
+        32, 31, 32, 37, 40, 48, 49, 49, 51, 52, 57, 58, 63, 64, 67, 67, 31, 31,
+        33, 38, 41, 47, 47, 47, 49, 50, 54, 55, 60, 61, 63, 64, 31, 31, 33, 38,
+        41, 47, 47, 47, 49, 49, 54, 54, 59, 60, 63, 64, 30, 32, 33, 40, 42, 46,
+        45, 45, 47, 48, 52, 52, 57, 58, 60, 61, 31, 33, 35, 41, 43, 46, 46, 45,
+        47, 48, 51, 52, 57, 57, 60, 61, 33, 36, 37, 43, 44, 47, 46, 46, 47, 47,
+        51, 52, 56, 57, 59, 60, 35, 38, 39, 45, 46, 47, 46, 45, 47, 47, 50, 51,
+        55, 56, 58, 60, 37, 40, 41, 47, 47, 47, 46, 45, 46, 47, 50, 50, 54, 55,
+        57, 58, 41, 42, 43, 47, 48, 49, 49, 48, 49, 50, 52, 53, 57, 57, 59, 58,
+        42, 43, 43, 47, 48, 50, 49, 49, 50, 50, 53, 54, 57, 58, 60, 61, 49, 46,
+        47, 48, 50, 53, 53, 53, 54, 54, 57, 57, 60, 61, 62, 61, 49, 46, 47, 48,
+        50, 53, 53, 54, 54, 55, 57, 57, 61, 61, 63, 64, 48, 46, 46, 47, 49, 53,
+        54, 56, 57, 57, 60, 60, 64, 64, 65, 64, 48, 45, 46, 46, 49, 53, 55, 56,
+        58, 58, 61, 61, 65, 65, 66, 67, 49, 45, 45, 46, 48, 53, 56, 58, 61, 61,
+        64, 64, 67, 68, 69, 67, 49, 46, 46, 46, 49, 53, 57, 59, 62, 62, 65, 66,
+        69, 69, 70, 70, 50, 46, 46, 46, 49, 54, 57, 59, 63, 64, 67, 67, 71, 71,
+        73, 71, 51, 47, 47, 47, 49, 54, 58, 61, 64, 66, 69, 70, 73, 74, 74, 74,
+        52, 48, 48, 47, 50, 54, 58, 61, 65, 66, 71, 71, 75, 75, 77, 74, 54, 50,
+        49, 48, 51, 55, 59, 62, 67, 68, 73, 73, 77, 78, 78, 78, 54, 50, 50, 49,
+        51, 55, 59, 62, 67, 68, 73, 74, 78, 78, 81, 78, 57, 52, 52, 50, 52, 56,
+        60, 64, 69, 70, 76, 77, 82, 82, 83, 82, 57, 52, 52, 51, 53, 57, 61, 64,
+        69, 71, 77, 77, 82, 83, 85, 82, 60, 54, 54, 52, 55, 58, 62, 65, 71, 72,
+        79, 79, 85, 86, 87, 86, 61, 56, 55, 53, 56, 59, 63, 66, 72, 73, 80, 81,
+        86, 87, 88, 86, 63, 57, 57, 55, 57, 60, 64, 67, 73, 75, 82, 82, 89, 90,
+        92, 90, 64, 58, 58, 55, 58, 61, 65, 68, 73, 75, 82, 83, 89, 90, 92, 90,
+        64, 59, 58, 56, 58, 61, 65, 68, 74, 75, 83, 83, 90, 91, 94, 95, 66, 60,
+        59, 57, 59, 62, 66, 69, 75, 76, 84, 85, 91, 92, 94, 95, 67, 61, 60, 58,
+        59, 63, 66, 70, 74, 77, 82, 85, 91, 93, 96, 96, 68, 62, 61, 58, 59, 64,
+        65, 71, 72, 78, 81, 86, 89, 94, 95, 96, 68, 62, 62, 59, 59, 65, 65, 71,
+        71, 79, 79, 87, 87, 95, 95, 98,
+        /* Size 32x16 */
+        32, 31, 31, 30, 31, 33, 35, 37, 41, 42, 49, 49, 48, 48, 49, 49, 50, 51,
+        52, 54, 54, 57, 57, 60, 61, 63, 64, 64, 66, 67, 68, 68, 31, 31, 31, 32,
+        33, 36, 38, 40, 42, 43, 46, 46, 46, 45, 45, 46, 46, 47, 48, 50, 50, 52,
+        52, 54, 56, 57, 58, 59, 60, 61, 62, 62, 32, 33, 33, 33, 35, 37, 39, 41,
+        43, 43, 47, 47, 46, 46, 45, 46, 46, 47, 48, 49, 50, 52, 52, 54, 55, 57,
+        58, 58, 59, 60, 61, 62, 37, 38, 38, 40, 41, 43, 45, 47, 47, 47, 48, 48,
+        47, 46, 46, 46, 46, 47, 47, 48, 49, 50, 51, 52, 53, 55, 55, 56, 57, 58,
+        58, 59, 40, 41, 41, 42, 43, 44, 46, 47, 48, 48, 50, 50, 49, 49, 48, 49,
+        49, 49, 50, 51, 51, 52, 53, 55, 56, 57, 58, 58, 59, 59, 59, 59, 48, 47,
+        47, 46, 46, 47, 47, 47, 49, 50, 53, 53, 53, 53, 53, 53, 54, 54, 54, 55,
+        55, 56, 57, 58, 59, 60, 61, 61, 62, 63, 64, 65, 49, 47, 47, 45, 46, 46,
+        46, 46, 49, 49, 53, 53, 54, 55, 56, 57, 57, 58, 58, 59, 59, 60, 61, 62,
+        63, 64, 65, 65, 66, 66, 65, 65, 49, 47, 47, 45, 45, 46, 45, 45, 48, 49,
+        53, 54, 56, 56, 58, 59, 59, 61, 61, 62, 62, 64, 64, 65, 66, 67, 68, 68,
+        69, 70, 71, 71, 51, 49, 49, 47, 47, 47, 47, 46, 49, 50, 54, 54, 57, 58,
+        61, 62, 63, 64, 65, 67, 67, 69, 69, 71, 72, 73, 73, 74, 75, 74, 72, 71,
+        52, 50, 49, 48, 48, 47, 47, 47, 50, 50, 54, 55, 57, 58, 61, 62, 64, 66,
+        66, 68, 68, 70, 71, 72, 73, 75, 75, 75, 76, 77, 78, 79, 57, 54, 54, 52,
+        51, 51, 50, 50, 52, 53, 57, 57, 60, 61, 64, 65, 67, 69, 71, 73, 73, 76,
+        77, 79, 80, 82, 82, 83, 84, 82, 81, 79, 58, 55, 54, 52, 52, 52, 51, 50,
+        53, 54, 57, 57, 60, 61, 64, 66, 67, 70, 71, 73, 74, 77, 77, 79, 81, 82,
+        83, 83, 85, 85, 86, 87, 63, 60, 59, 57, 57, 56, 55, 54, 57, 57, 60, 61,
+        64, 65, 67, 69, 71, 73, 75, 77, 78, 82, 82, 85, 86, 89, 89, 90, 91, 91,
+        89, 87, 64, 61, 60, 58, 57, 57, 56, 55, 57, 58, 61, 61, 64, 65, 68, 69,
+        71, 74, 75, 78, 78, 82, 83, 86, 87, 90, 90, 91, 92, 93, 94, 95, 67, 63,
+        63, 60, 60, 59, 58, 57, 59, 60, 62, 63, 65, 66, 69, 70, 73, 74, 77, 78,
+        81, 83, 85, 87, 88, 92, 92, 94, 94, 96, 95, 95, 67, 64, 64, 61, 61, 60,
+        60, 58, 58, 61, 61, 64, 64, 67, 67, 70, 71, 74, 74, 78, 78, 82, 82, 86,
+        86, 90, 90, 95, 95, 96, 96, 98,
+        /* Size 4x16 */
+        31, 48, 52, 64, 31, 47, 49, 60, 33, 46, 48, 57, 38, 47, 47, 56, 42, 49,
+        50, 57, 46, 53, 54, 61, 46, 53, 57, 64, 45, 53, 61, 68, 46, 54, 64, 71,
+        48, 54, 66, 75, 50, 55, 68, 78, 52, 57, 71, 83, 56, 59, 73, 87, 58, 61,
+        75, 90, 60, 62, 76, 92, 62, 64, 78, 94,
+        /* Size 16x4 */
+        31, 31, 33, 38, 42, 46, 46, 45, 46, 48, 50, 52, 56, 58, 60, 62, 48, 47,
+        46, 47, 49, 53, 53, 53, 54, 54, 55, 57, 59, 61, 62, 64, 52, 49, 48, 47,
+        50, 54, 57, 61, 64, 66, 68, 71, 73, 75, 76, 78, 64, 60, 57, 56, 57, 61,
+        64, 68, 71, 75, 78, 83, 87, 90, 92, 94,
+        /* Size 8x32 */
+        32, 32, 40, 49, 51, 57, 63, 67, 31, 33, 41, 47, 49, 54, 60, 63, 31, 33,
+        41, 47, 49, 54, 59, 63, 30, 33, 42, 45, 47, 52, 57, 60, 31, 35, 43, 46,
+        47, 51, 57, 60, 33, 37, 44, 46, 47, 51, 56, 59, 35, 39, 46, 46, 47, 50,
+        55, 58, 37, 41, 47, 46, 46, 50, 54, 57, 41, 43, 48, 49, 49, 52, 57, 59,
+        42, 43, 48, 49, 50, 53, 57, 60, 49, 47, 50, 53, 54, 57, 60, 62, 49, 47,
+        50, 53, 54, 57, 61, 63, 48, 46, 49, 54, 57, 60, 64, 65, 48, 46, 49, 55,
+        58, 61, 65, 66, 49, 45, 48, 56, 61, 64, 67, 69, 49, 46, 49, 57, 62, 65,
+        69, 70, 50, 46, 49, 57, 63, 67, 71, 73, 51, 47, 49, 58, 64, 69, 73, 74,
+        52, 48, 50, 58, 65, 71, 75, 77, 54, 49, 51, 59, 67, 73, 77, 78, 54, 50,
+        51, 59, 67, 73, 78, 81, 57, 52, 52, 60, 69, 76, 82, 83, 57, 52, 53, 61,
+        69, 77, 82, 85, 60, 54, 55, 62, 71, 79, 85, 87, 61, 55, 56, 63, 72, 80,
+        86, 88, 63, 57, 57, 64, 73, 82, 89, 92, 64, 58, 58, 65, 73, 82, 89, 92,
+        64, 58, 58, 65, 74, 83, 90, 94, 66, 59, 59, 66, 75, 84, 91, 94, 67, 60,
+        59, 66, 74, 82, 91, 96, 68, 61, 59, 65, 72, 81, 89, 95, 68, 62, 59, 65,
+        71, 79, 87, 95,
+        /* Size 32x8 */
+        32, 31, 31, 30, 31, 33, 35, 37, 41, 42, 49, 49, 48, 48, 49, 49, 50, 51,
+        52, 54, 54, 57, 57, 60, 61, 63, 64, 64, 66, 67, 68, 68, 32, 33, 33, 33,
+        35, 37, 39, 41, 43, 43, 47, 47, 46, 46, 45, 46, 46, 47, 48, 49, 50, 52,
+        52, 54, 55, 57, 58, 58, 59, 60, 61, 62, 40, 41, 41, 42, 43, 44, 46, 47,
+        48, 48, 50, 50, 49, 49, 48, 49, 49, 49, 50, 51, 51, 52, 53, 55, 56, 57,
+        58, 58, 59, 59, 59, 59, 49, 47, 47, 45, 46, 46, 46, 46, 49, 49, 53, 53,
+        54, 55, 56, 57, 57, 58, 58, 59, 59, 60, 61, 62, 63, 64, 65, 65, 66, 66,
+        65, 65, 51, 49, 49, 47, 47, 47, 47, 46, 49, 50, 54, 54, 57, 58, 61, 62,
+        63, 64, 65, 67, 67, 69, 69, 71, 72, 73, 73, 74, 75, 74, 72, 71, 57, 54,
+        54, 52, 51, 51, 50, 50, 52, 53, 57, 57, 60, 61, 64, 65, 67, 69, 71, 73,
+        73, 76, 77, 79, 80, 82, 82, 83, 84, 82, 81, 79, 63, 60, 59, 57, 57, 56,
+        55, 54, 57, 57, 60, 61, 64, 65, 67, 69, 71, 73, 75, 77, 78, 82, 82, 85,
+        86, 89, 89, 90, 91, 91, 89, 87, 67, 63, 63, 60, 60, 59, 58, 57, 59, 60,
+        62, 63, 65, 66, 69, 70, 73, 74, 77, 78, 81, 83, 85, 87, 88, 92, 92, 94,
+        94, 96, 95, 95 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 34, 49, 72, 34, 48, 60, 79, 49, 60, 82, 104, 72, 79, 104, 134,
+        /* Size 8x8 */
+        32, 32, 34, 38, 46, 56, 68, 78, 32, 33, 35, 39, 45, 54, 64, 74, 34, 35,
+        39, 45, 51, 58, 68, 76, 38, 39, 45, 54, 61, 69, 78, 86, 46, 45, 51, 61,
+        71, 80, 90, 99, 56, 54, 58, 69, 80, 92, 103, 113, 68, 64, 68, 78, 90,
+        103, 117, 128, 78, 74, 76, 86, 99, 113, 128, 140,
+        /* Size 16x16 */
+        32, 31, 31, 31, 32, 34, 36, 39, 44, 48, 54, 59, 65, 71, 80, 83, 31, 32,
+        32, 32, 32, 34, 35, 38, 42, 46, 51, 56, 62, 68, 76, 78, 31, 32, 32, 32,
+        32, 33, 34, 37, 41, 44, 49, 54, 59, 65, 72, 75, 31, 32, 32, 33, 34, 35,
+        36, 39, 42, 45, 50, 54, 59, 64, 71, 74, 32, 32, 32, 34, 35, 37, 38, 40,
+        42, 46, 49, 53, 58, 63, 69, 72, 34, 34, 33, 35, 37, 39, 42, 45, 47, 51,
+        54, 58, 63, 68, 74, 76, 36, 35, 34, 36, 38, 42, 48, 50, 54, 57, 60, 64,
+        68, 73, 79, 81, 39, 38, 37, 39, 40, 45, 50, 54, 58, 61, 65, 69, 73, 78,
+        84, 86, 44, 42, 41, 42, 42, 47, 54, 58, 63, 67, 71, 75, 79, 84, 90, 92,
+        48, 46, 44, 45, 46, 51, 57, 61, 67, 71, 76, 80, 85, 90, 96, 99, 54, 51,
+        49, 50, 49, 54, 60, 65, 71, 76, 82, 87, 92, 97, 104, 106, 59, 56, 54,
+        54, 53, 58, 64, 69, 75, 80, 87, 92, 98, 103, 110, 113, 65, 62, 59, 59,
+        58, 63, 68, 73, 79, 85, 92, 98, 105, 111, 118, 121, 71, 68, 65, 64, 63,
+        68, 73, 78, 84, 90, 97, 103, 111, 117, 125, 128, 80, 76, 72, 71, 69, 74,
+        79, 84, 90, 96, 104, 110, 118, 125, 134, 137, 83, 78, 75, 74, 72, 76,
+        81, 86, 92, 99, 106, 113, 121, 128, 137, 140,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 34, 34, 36, 36, 39, 39, 44, 44, 48,
+        48, 54, 54, 59, 59, 65, 65, 71, 71, 80, 80, 83, 83, 87, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 34, 34, 35, 35, 38, 38, 42, 42, 46, 46, 51, 51, 56,
+        56, 62, 62, 68, 68, 76, 76, 78, 78, 83, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 34, 34, 35, 35, 38, 38, 42, 42, 46, 46, 51, 51, 56, 56, 62, 62, 68,
+        68, 76, 76, 78, 78, 83, 31, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34,
+        34, 37, 37, 41, 41, 44, 44, 49, 49, 54, 54, 59, 59, 65, 65, 72, 72, 75,
+        75, 79, 31, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 37, 37, 41,
+        41, 44, 44, 49, 49, 54, 54, 59, 59, 65, 65, 72, 72, 75, 75, 79, 31, 32,
+        32, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 39, 39, 42, 42, 45, 45, 50,
+        50, 54, 54, 59, 59, 64, 64, 71, 71, 74, 74, 77, 31, 32, 32, 32, 32, 33,
+        33, 34, 34, 35, 35, 36, 36, 39, 39, 42, 42, 45, 45, 50, 50, 54, 54, 59,
+        59, 64, 64, 71, 71, 74, 74, 77, 32, 32, 32, 32, 32, 34, 34, 35, 35, 37,
+        37, 38, 38, 40, 40, 42, 42, 46, 46, 49, 49, 53, 53, 58, 58, 63, 63, 69,
+        69, 72, 72, 75, 32, 32, 32, 32, 32, 34, 34, 35, 35, 37, 37, 38, 38, 40,
+        40, 42, 42, 46, 46, 49, 49, 53, 53, 58, 58, 63, 63, 69, 69, 72, 72, 75,
+        34, 34, 34, 33, 33, 35, 35, 37, 37, 39, 39, 42, 42, 45, 45, 47, 47, 51,
+        51, 54, 54, 58, 58, 63, 63, 68, 68, 74, 74, 76, 76, 80, 34, 34, 34, 33,
+        33, 35, 35, 37, 37, 39, 39, 42, 42, 45, 45, 47, 47, 51, 51, 54, 54, 58,
+        58, 63, 63, 68, 68, 74, 74, 76, 76, 80, 36, 35, 35, 34, 34, 36, 36, 38,
+        38, 42, 42, 48, 48, 50, 50, 54, 54, 57, 57, 60, 60, 64, 64, 68, 68, 73,
+        73, 79, 79, 81, 81, 84, 36, 35, 35, 34, 34, 36, 36, 38, 38, 42, 42, 48,
+        48, 50, 50, 54, 54, 57, 57, 60, 60, 64, 64, 68, 68, 73, 73, 79, 79, 81,
+        81, 84, 39, 38, 38, 37, 37, 39, 39, 40, 40, 45, 45, 50, 50, 54, 54, 58,
+        58, 61, 61, 65, 65, 69, 69, 73, 73, 78, 78, 84, 84, 86, 86, 90, 39, 38,
+        38, 37, 37, 39, 39, 40, 40, 45, 45, 50, 50, 54, 54, 58, 58, 61, 61, 65,
+        65, 69, 69, 73, 73, 78, 78, 84, 84, 86, 86, 90, 44, 42, 42, 41, 41, 42,
+        42, 42, 42, 47, 47, 54, 54, 58, 58, 63, 63, 67, 67, 71, 71, 75, 75, 79,
+        79, 84, 84, 90, 90, 92, 92, 96, 44, 42, 42, 41, 41, 42, 42, 42, 42, 47,
+        47, 54, 54, 58, 58, 63, 63, 67, 67, 71, 71, 75, 75, 79, 79, 84, 84, 90,
+        90, 92, 92, 96, 48, 46, 46, 44, 44, 45, 45, 46, 46, 51, 51, 57, 57, 61,
+        61, 67, 67, 71, 71, 76, 76, 80, 80, 85, 85, 90, 90, 96, 96, 99, 99, 102,
+        48, 46, 46, 44, 44, 45, 45, 46, 46, 51, 51, 57, 57, 61, 61, 67, 67, 71,
+        71, 76, 76, 80, 80, 85, 85, 90, 90, 96, 96, 99, 99, 102, 54, 51, 51, 49,
+        49, 50, 50, 49, 49, 54, 54, 60, 60, 65, 65, 71, 71, 76, 76, 82, 82, 87,
+        87, 92, 92, 97, 97, 104, 104, 106, 106, 109, 54, 51, 51, 49, 49, 50, 50,
+        49, 49, 54, 54, 60, 60, 65, 65, 71, 71, 76, 76, 82, 82, 87, 87, 92, 92,
+        97, 97, 104, 104, 106, 106, 109, 59, 56, 56, 54, 54, 54, 54, 53, 53, 58,
+        58, 64, 64, 69, 69, 75, 75, 80, 80, 87, 87, 92, 92, 98, 98, 103, 103,
+        110, 110, 113, 113, 116, 59, 56, 56, 54, 54, 54, 54, 53, 53, 58, 58, 64,
+        64, 69, 69, 75, 75, 80, 80, 87, 87, 92, 92, 98, 98, 103, 103, 110, 110,
+        113, 113, 116, 65, 62, 62, 59, 59, 59, 59, 58, 58, 63, 63, 68, 68, 73,
+        73, 79, 79, 85, 85, 92, 92, 98, 98, 105, 105, 111, 111, 118, 118, 121,
+        121, 124, 65, 62, 62, 59, 59, 59, 59, 58, 58, 63, 63, 68, 68, 73, 73,
+        79, 79, 85, 85, 92, 92, 98, 98, 105, 105, 111, 111, 118, 118, 121, 121,
+        124, 71, 68, 68, 65, 65, 64, 64, 63, 63, 68, 68, 73, 73, 78, 78, 84, 84,
+        90, 90, 97, 97, 103, 103, 111, 111, 117, 117, 125, 125, 128, 128, 132,
+        71, 68, 68, 65, 65, 64, 64, 63, 63, 68, 68, 73, 73, 78, 78, 84, 84, 90,
+        90, 97, 97, 103, 103, 111, 111, 117, 117, 125, 125, 128, 128, 132, 80,
+        76, 76, 72, 72, 71, 71, 69, 69, 74, 74, 79, 79, 84, 84, 90, 90, 96, 96,
+        104, 104, 110, 110, 118, 118, 125, 125, 134, 134, 137, 137, 141, 80, 76,
+        76, 72, 72, 71, 71, 69, 69, 74, 74, 79, 79, 84, 84, 90, 90, 96, 96, 104,
+        104, 110, 110, 118, 118, 125, 125, 134, 134, 137, 137, 141, 83, 78, 78,
+        75, 75, 74, 74, 72, 72, 76, 76, 81, 81, 86, 86, 92, 92, 99, 99, 106,
+        106, 113, 113, 121, 121, 128, 128, 137, 137, 140, 140, 144, 83, 78, 78,
+        75, 75, 74, 74, 72, 72, 76, 76, 81, 81, 86, 86, 92, 92, 99, 99, 106,
+        106, 113, 113, 121, 121, 128, 128, 137, 137, 140, 140, 144, 87, 83, 83,
+        79, 79, 77, 77, 75, 75, 80, 80, 84, 84, 90, 90, 96, 96, 102, 102, 109,
+        109, 116, 116, 124, 124, 132, 132, 141, 141, 144, 144, 149,
+        /* Size 4x8 */
+        32, 35, 51, 75, 32, 36, 50, 71, 34, 42, 54, 73, 37, 50, 65, 84, 45, 56,
+        76, 96, 54, 63, 87, 110, 65, 73, 97, 125, 75, 81, 106, 136,
+        /* Size 8x4 */
+        32, 32, 34, 37, 45, 54, 65, 75, 35, 36, 42, 50, 56, 63, 73, 81, 51, 50,
+        54, 65, 76, 87, 97, 106, 75, 71, 73, 84, 96, 110, 125, 136,
+        /* Size 8x16 */
+        32, 31, 32, 36, 44, 53, 65, 79, 31, 32, 32, 35, 42, 51, 62, 75, 31, 32,
+        33, 34, 41, 49, 59, 72, 32, 32, 34, 36, 42, 50, 59, 71, 32, 33, 35, 38,
+        42, 49, 58, 69, 34, 34, 37, 42, 48, 54, 63, 73, 36, 34, 38, 48, 54, 60,
+        68, 78, 39, 37, 40, 50, 58, 65, 73, 84, 44, 41, 43, 53, 63, 71, 79, 90,
+        48, 45, 46, 56, 67, 76, 85, 96, 53, 49, 50, 60, 71, 82, 92, 103, 58, 54,
+        54, 63, 75, 87, 98, 110, 65, 60, 58, 68, 79, 92, 105, 118, 71, 65, 63,
+        73, 84, 97, 111, 125, 79, 72, 70, 79, 90, 104, 118, 133, 82, 75, 72, 81,
+        92, 106, 121, 136,
+        /* Size 16x8 */
+        32, 31, 31, 32, 32, 34, 36, 39, 44, 48, 53, 58, 65, 71, 79, 82, 31, 32,
+        32, 32, 33, 34, 34, 37, 41, 45, 49, 54, 60, 65, 72, 75, 32, 32, 33, 34,
+        35, 37, 38, 40, 43, 46, 50, 54, 58, 63, 70, 72, 36, 35, 34, 36, 38, 42,
+        48, 50, 53, 56, 60, 63, 68, 73, 79, 81, 44, 42, 41, 42, 42, 48, 54, 58,
+        63, 67, 71, 75, 79, 84, 90, 92, 53, 51, 49, 50, 49, 54, 60, 65, 71, 76,
+        82, 87, 92, 97, 104, 106, 65, 62, 59, 59, 58, 63, 68, 73, 79, 85, 92,
+        98, 105, 111, 118, 121, 79, 75, 72, 71, 69, 73, 78, 84, 90, 96, 103,
+        110, 118, 125, 133, 136,
+        /* Size 16x32 */
+        32, 31, 31, 32, 32, 36, 36, 44, 44, 53, 53, 65, 65, 79, 79, 87, 31, 32,
+        32, 32, 32, 35, 35, 42, 42, 51, 51, 62, 62, 75, 75, 82, 31, 32, 32, 32,
+        32, 35, 35, 42, 42, 51, 51, 62, 62, 75, 75, 82, 31, 32, 32, 33, 33, 34,
+        34, 41, 41, 49, 49, 59, 59, 72, 72, 78, 31, 32, 32, 33, 33, 34, 34, 41,
+        41, 49, 49, 59, 59, 72, 72, 78, 32, 32, 32, 34, 34, 36, 36, 42, 42, 50,
+        50, 59, 59, 71, 71, 77, 32, 32, 32, 34, 34, 36, 36, 42, 42, 50, 50, 59,
+        59, 71, 71, 77, 32, 33, 33, 35, 35, 38, 38, 42, 42, 49, 49, 58, 58, 69,
+        69, 75, 32, 33, 33, 35, 35, 38, 38, 42, 42, 49, 49, 58, 58, 69, 69, 75,
+        34, 34, 34, 37, 37, 42, 42, 48, 48, 54, 54, 63, 63, 73, 73, 79, 34, 34,
+        34, 37, 37, 42, 42, 48, 48, 54, 54, 63, 63, 73, 73, 79, 36, 34, 34, 38,
+        38, 48, 48, 54, 54, 60, 60, 68, 68, 78, 78, 84, 36, 34, 34, 38, 38, 48,
+        48, 54, 54, 60, 60, 68, 68, 78, 78, 84, 39, 37, 37, 40, 40, 50, 50, 58,
+        58, 65, 65, 73, 73, 84, 84, 89, 39, 37, 37, 40, 40, 50, 50, 58, 58, 65,
+        65, 73, 73, 84, 84, 89, 44, 41, 41, 43, 43, 53, 53, 63, 63, 71, 71, 79,
+        79, 90, 90, 95, 44, 41, 41, 43, 43, 53, 53, 63, 63, 71, 71, 79, 79, 90,
+        90, 95, 48, 45, 45, 46, 46, 56, 56, 67, 67, 76, 76, 85, 85, 96, 96, 102,
+        48, 45, 45, 46, 46, 56, 56, 67, 67, 76, 76, 85, 85, 96, 96, 102, 53, 49,
+        49, 50, 50, 60, 60, 71, 71, 82, 82, 92, 92, 103, 103, 109, 53, 49, 49,
+        50, 50, 60, 60, 71, 71, 82, 82, 92, 92, 103, 103, 109, 58, 54, 54, 54,
+        54, 63, 63, 75, 75, 87, 87, 98, 98, 110, 110, 116, 58, 54, 54, 54, 54,
+        63, 63, 75, 75, 87, 87, 98, 98, 110, 110, 116, 65, 60, 60, 58, 58, 68,
+        68, 79, 79, 92, 92, 105, 105, 118, 118, 124, 65, 60, 60, 58, 58, 68, 68,
+        79, 79, 92, 92, 105, 105, 118, 118, 124, 71, 65, 65, 63, 63, 73, 73, 84,
+        84, 97, 97, 111, 111, 125, 125, 132, 71, 65, 65, 63, 63, 73, 73, 84, 84,
+        97, 97, 111, 111, 125, 125, 132, 79, 72, 72, 70, 70, 79, 79, 90, 90,
+        104, 104, 118, 118, 133, 133, 141, 79, 72, 72, 70, 70, 79, 79, 90, 90,
+        104, 104, 118, 118, 133, 133, 141, 82, 75, 75, 72, 72, 81, 81, 92, 92,
+        106, 106, 121, 121, 136, 136, 144, 82, 75, 75, 72, 72, 81, 81, 92, 92,
+        106, 106, 121, 121, 136, 136, 144, 87, 79, 79, 76, 76, 84, 84, 96, 96,
+        109, 109, 124, 124, 141, 141, 149,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 32, 32, 32, 32, 34, 34, 36, 36, 39, 39, 44, 44, 48,
+        48, 53, 53, 58, 58, 65, 65, 71, 71, 79, 79, 82, 82, 87, 31, 32, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 34, 34, 37, 37, 41, 41, 45, 45, 49, 49, 54,
+        54, 60, 60, 65, 65, 72, 72, 75, 75, 79, 31, 32, 32, 32, 32, 32, 32, 33,
+        33, 34, 34, 34, 34, 37, 37, 41, 41, 45, 45, 49, 49, 54, 54, 60, 60, 65,
+        65, 72, 72, 75, 75, 79, 32, 32, 32, 33, 33, 34, 34, 35, 35, 37, 37, 38,
+        38, 40, 40, 43, 43, 46, 46, 50, 50, 54, 54, 58, 58, 63, 63, 70, 70, 72,
+        72, 76, 32, 32, 32, 33, 33, 34, 34, 35, 35, 37, 37, 38, 38, 40, 40, 43,
+        43, 46, 46, 50, 50, 54, 54, 58, 58, 63, 63, 70, 70, 72, 72, 76, 36, 35,
+        35, 34, 34, 36, 36, 38, 38, 42, 42, 48, 48, 50, 50, 53, 53, 56, 56, 60,
+        60, 63, 63, 68, 68, 73, 73, 79, 79, 81, 81, 84, 36, 35, 35, 34, 34, 36,
+        36, 38, 38, 42, 42, 48, 48, 50, 50, 53, 53, 56, 56, 60, 60, 63, 63, 68,
+        68, 73, 73, 79, 79, 81, 81, 84, 44, 42, 42, 41, 41, 42, 42, 42, 42, 48,
+        48, 54, 54, 58, 58, 63, 63, 67, 67, 71, 71, 75, 75, 79, 79, 84, 84, 90,
+        90, 92, 92, 96, 44, 42, 42, 41, 41, 42, 42, 42, 42, 48, 48, 54, 54, 58,
+        58, 63, 63, 67, 67, 71, 71, 75, 75, 79, 79, 84, 84, 90, 90, 92, 92, 96,
+        53, 51, 51, 49, 49, 50, 50, 49, 49, 54, 54, 60, 60, 65, 65, 71, 71, 76,
+        76, 82, 82, 87, 87, 92, 92, 97, 97, 104, 104, 106, 106, 109, 53, 51, 51,
+        49, 49, 50, 50, 49, 49, 54, 54, 60, 60, 65, 65, 71, 71, 76, 76, 82, 82,
+        87, 87, 92, 92, 97, 97, 104, 104, 106, 106, 109, 65, 62, 62, 59, 59, 59,
+        59, 58, 58, 63, 63, 68, 68, 73, 73, 79, 79, 85, 85, 92, 92, 98, 98, 105,
+        105, 111, 111, 118, 118, 121, 121, 124, 65, 62, 62, 59, 59, 59, 59, 58,
+        58, 63, 63, 68, 68, 73, 73, 79, 79, 85, 85, 92, 92, 98, 98, 105, 105,
+        111, 111, 118, 118, 121, 121, 124, 79, 75, 75, 72, 72, 71, 71, 69, 69,
+        73, 73, 78, 78, 84, 84, 90, 90, 96, 96, 103, 103, 110, 110, 118, 118,
+        125, 125, 133, 133, 136, 136, 141, 79, 75, 75, 72, 72, 71, 71, 69, 69,
+        73, 73, 78, 78, 84, 84, 90, 90, 96, 96, 103, 103, 110, 110, 118, 118,
+        125, 125, 133, 133, 136, 136, 141, 87, 82, 82, 78, 78, 77, 77, 75, 75,
+        79, 79, 84, 84, 89, 89, 95, 95, 102, 102, 109, 109, 116, 116, 124, 124,
+        132, 132, 141, 141, 144, 144, 149,
+        /* Size 4x16 */
+        31, 36, 53, 79, 32, 35, 51, 75, 32, 34, 49, 72, 32, 36, 50, 71, 33, 38,
+        49, 69, 34, 42, 54, 73, 34, 48, 60, 78, 37, 50, 65, 84, 41, 53, 71, 90,
+        45, 56, 76, 96, 49, 60, 82, 103, 54, 63, 87, 110, 60, 68, 92, 118, 65,
+        73, 97, 125, 72, 79, 104, 133, 75, 81, 106, 136,
+        /* Size 16x4 */
+        31, 32, 32, 32, 33, 34, 34, 37, 41, 45, 49, 54, 60, 65, 72, 75, 36, 35,
+        34, 36, 38, 42, 48, 50, 53, 56, 60, 63, 68, 73, 79, 81, 53, 51, 49, 50,
+        49, 54, 60, 65, 71, 76, 82, 87, 92, 97, 104, 106, 79, 75, 72, 71, 69,
+        73, 78, 84, 90, 96, 103, 110, 118, 125, 133, 136,
+        /* Size 8x32 */
+        32, 31, 32, 36, 44, 53, 65, 79, 31, 32, 32, 35, 42, 51, 62, 75, 31, 32,
+        32, 35, 42, 51, 62, 75, 31, 32, 33, 34, 41, 49, 59, 72, 31, 32, 33, 34,
+        41, 49, 59, 72, 32, 32, 34, 36, 42, 50, 59, 71, 32, 32, 34, 36, 42, 50,
+        59, 71, 32, 33, 35, 38, 42, 49, 58, 69, 32, 33, 35, 38, 42, 49, 58, 69,
+        34, 34, 37, 42, 48, 54, 63, 73, 34, 34, 37, 42, 48, 54, 63, 73, 36, 34,
+        38, 48, 54, 60, 68, 78, 36, 34, 38, 48, 54, 60, 68, 78, 39, 37, 40, 50,
+        58, 65, 73, 84, 39, 37, 40, 50, 58, 65, 73, 84, 44, 41, 43, 53, 63, 71,
+        79, 90, 44, 41, 43, 53, 63, 71, 79, 90, 48, 45, 46, 56, 67, 76, 85, 96,
+        48, 45, 46, 56, 67, 76, 85, 96, 53, 49, 50, 60, 71, 82, 92, 103, 53, 49,
+        50, 60, 71, 82, 92, 103, 58, 54, 54, 63, 75, 87, 98, 110, 58, 54, 54,
+        63, 75, 87, 98, 110, 65, 60, 58, 68, 79, 92, 105, 118, 65, 60, 58, 68,
+        79, 92, 105, 118, 71, 65, 63, 73, 84, 97, 111, 125, 71, 65, 63, 73, 84,
+        97, 111, 125, 79, 72, 70, 79, 90, 104, 118, 133, 79, 72, 70, 79, 90,
+        104, 118, 133, 82, 75, 72, 81, 92, 106, 121, 136, 82, 75, 72, 81, 92,
+        106, 121, 136, 87, 79, 76, 84, 96, 109, 124, 141,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 32, 32, 32, 32, 34, 34, 36, 36, 39, 39, 44, 44, 48,
+        48, 53, 53, 58, 58, 65, 65, 71, 71, 79, 79, 82, 82, 87, 31, 32, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 34, 34, 37, 37, 41, 41, 45, 45, 49, 49, 54,
+        54, 60, 60, 65, 65, 72, 72, 75, 75, 79, 32, 32, 32, 33, 33, 34, 34, 35,
+        35, 37, 37, 38, 38, 40, 40, 43, 43, 46, 46, 50, 50, 54, 54, 58, 58, 63,
+        63, 70, 70, 72, 72, 76, 36, 35, 35, 34, 34, 36, 36, 38, 38, 42, 42, 48,
+        48, 50, 50, 53, 53, 56, 56, 60, 60, 63, 63, 68, 68, 73, 73, 79, 79, 81,
+        81, 84, 44, 42, 42, 41, 41, 42, 42, 42, 42, 48, 48, 54, 54, 58, 58, 63,
+        63, 67, 67, 71, 71, 75, 75, 79, 79, 84, 84, 90, 90, 92, 92, 96, 53, 51,
+        51, 49, 49, 50, 50, 49, 49, 54, 54, 60, 60, 65, 65, 71, 71, 76, 76, 82,
+        82, 87, 87, 92, 92, 97, 97, 104, 104, 106, 106, 109, 65, 62, 62, 59, 59,
+        59, 59, 58, 58, 63, 63, 68, 68, 73, 73, 79, 79, 85, 85, 92, 92, 98, 98,
+        105, 105, 111, 111, 118, 118, 121, 121, 124, 79, 75, 75, 72, 72, 71, 71,
+        69, 69, 73, 73, 78, 78, 84, 84, 90, 90, 96, 96, 103, 103, 110, 110, 118,
+        118, 125, 125, 133, 133, 136, 136, 141 },
+      { /* Chroma */
+        /* Size 4x4 */
+        32, 46, 47, 57, 46, 53, 54, 60, 47, 54, 66, 75, 57, 60, 75, 89,
+        /* Size 8x8 */
+        31, 34, 42, 47, 48, 52, 57, 61, 34, 39, 45, 46, 46, 49, 53, 57, 42, 45,
+        48, 49, 50, 52, 55, 58, 47, 46, 49, 54, 56, 58, 61, 64, 48, 46, 50, 56,
+        61, 65, 68, 71, 52, 49, 52, 58, 65, 71, 75, 79, 57, 53, 55, 61, 68, 75,
+        82, 86, 61, 57, 58, 64, 71, 79, 86, 91,
+        /* Size 16x16 */
+        32, 31, 30, 33, 36, 41, 49, 48, 49, 50, 52, 54, 57, 60, 63, 65, 31, 31,
+        31, 34, 38, 42, 47, 47, 47, 48, 50, 52, 54, 57, 60, 61, 30, 31, 32, 35,
+        40, 42, 46, 45, 45, 46, 47, 49, 52, 54, 57, 58, 33, 34, 35, 39, 43, 45,
+        47, 46, 45, 46, 47, 49, 51, 53, 56, 57, 36, 38, 40, 43, 47, 47, 48, 46,
+        45, 46, 47, 48, 50, 52, 54, 55, 41, 42, 42, 45, 47, 48, 50, 49, 49, 50,
+        50, 52, 53, 55, 57, 58, 49, 47, 46, 47, 48, 50, 53, 53, 53, 54, 54, 55,
+        56, 58, 60, 61, 48, 47, 45, 46, 46, 49, 53, 54, 55, 56, 57, 58, 60, 61,
+        63, 64, 49, 47, 45, 45, 45, 49, 53, 55, 58, 60, 61, 62, 63, 65, 67, 68,
+        50, 48, 46, 46, 46, 50, 54, 56, 60, 61, 63, 65, 67, 68, 71, 71, 52, 50,
+        47, 47, 47, 50, 54, 57, 61, 63, 66, 68, 70, 72, 75, 75, 54, 52, 49, 49,
+        48, 52, 55, 58, 62, 65, 68, 71, 73, 75, 78, 79, 57, 54, 52, 51, 50, 53,
+        56, 60, 63, 67, 70, 73, 76, 79, 82, 83, 60, 57, 54, 53, 52, 55, 58, 61,
+        65, 68, 72, 75, 79, 82, 85, 86, 63, 60, 57, 56, 54, 57, 60, 63, 67, 71,
+        75, 78, 82, 85, 89, 90, 65, 61, 58, 57, 55, 58, 61, 64, 68, 71, 75, 79,
+        83, 86, 90, 91,
+        /* Size 32x32 */
+        32, 31, 31, 30, 30, 33, 33, 36, 36, 41, 41, 49, 49, 48, 48, 49, 49, 50,
+        50, 52, 52, 54, 54, 57, 57, 60, 60, 63, 63, 65, 65, 67, 31, 31, 31, 31,
+        31, 34, 34, 38, 38, 42, 42, 47, 47, 47, 47, 47, 47, 48, 48, 50, 50, 52,
+        52, 54, 54, 57, 57, 60, 60, 61, 61, 63, 31, 31, 31, 31, 31, 34, 34, 38,
+        38, 42, 42, 47, 47, 47, 47, 47, 47, 48, 48, 50, 50, 52, 52, 54, 54, 57,
+        57, 60, 60, 61, 61, 63, 30, 31, 31, 32, 32, 35, 35, 40, 40, 42, 42, 46,
+        46, 45, 45, 45, 45, 46, 46, 47, 47, 49, 49, 52, 52, 54, 54, 57, 57, 58,
+        58, 60, 30, 31, 31, 32, 32, 35, 35, 40, 40, 42, 42, 46, 46, 45, 45, 45,
+        45, 46, 46, 47, 47, 49, 49, 52, 52, 54, 54, 57, 57, 58, 58, 60, 33, 34,
+        34, 35, 35, 39, 39, 43, 43, 45, 45, 47, 47, 46, 46, 45, 45, 46, 46, 47,
+        47, 49, 49, 51, 51, 53, 53, 56, 56, 57, 57, 59, 33, 34, 34, 35, 35, 39,
+        39, 43, 43, 45, 45, 47, 47, 46, 46, 45, 45, 46, 46, 47, 47, 49, 49, 51,
+        51, 53, 53, 56, 56, 57, 57, 59, 36, 38, 38, 40, 40, 43, 43, 47, 47, 47,
+        47, 48, 48, 46, 46, 45, 45, 46, 46, 47, 47, 48, 48, 50, 50, 52, 52, 54,
+        54, 55, 55, 57, 36, 38, 38, 40, 40, 43, 43, 47, 47, 47, 47, 48, 48, 46,
+        46, 45, 45, 46, 46, 47, 47, 48, 48, 50, 50, 52, 52, 54, 54, 55, 55, 57,
+        41, 42, 42, 42, 42, 45, 45, 47, 47, 48, 48, 50, 50, 49, 49, 49, 49, 50,
+        50, 50, 50, 52, 52, 53, 53, 55, 55, 57, 57, 58, 58, 60, 41, 42, 42, 42,
+        42, 45, 45, 47, 47, 48, 48, 50, 50, 49, 49, 49, 49, 50, 50, 50, 50, 52,
+        52, 53, 53, 55, 55, 57, 57, 58, 58, 60, 49, 47, 47, 46, 46, 47, 47, 48,
+        48, 50, 50, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 56, 56, 58,
+        58, 60, 60, 61, 61, 62, 49, 47, 47, 46, 46, 47, 47, 48, 48, 50, 50, 53,
+        53, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 56, 56, 58, 58, 60, 60, 61,
+        61, 62, 48, 47, 47, 45, 45, 46, 46, 46, 46, 49, 49, 53, 53, 54, 54, 55,
+        55, 56, 56, 57, 57, 58, 58, 60, 60, 61, 61, 63, 63, 64, 64, 66, 48, 47,
+        47, 45, 45, 46, 46, 46, 46, 49, 49, 53, 53, 54, 54, 55, 55, 56, 56, 57,
+        57, 58, 58, 60, 60, 61, 61, 63, 63, 64, 64, 66, 49, 47, 47, 45, 45, 45,
+        45, 45, 45, 49, 49, 53, 53, 55, 55, 58, 58, 60, 60, 61, 61, 62, 62, 63,
+        63, 65, 65, 67, 67, 68, 68, 69, 49, 47, 47, 45, 45, 45, 45, 45, 45, 49,
+        49, 53, 53, 55, 55, 58, 58, 60, 60, 61, 61, 62, 62, 63, 63, 65, 65, 67,
+        67, 68, 68, 69, 50, 48, 48, 46, 46, 46, 46, 46, 46, 50, 50, 54, 54, 56,
+        56, 60, 60, 61, 61, 63, 63, 65, 65, 67, 67, 68, 68, 71, 71, 71, 71, 72,
+        50, 48, 48, 46, 46, 46, 46, 46, 46, 50, 50, 54, 54, 56, 56, 60, 60, 61,
+        61, 63, 63, 65, 65, 67, 67, 68, 68, 71, 71, 71, 71, 72, 52, 50, 50, 47,
+        47, 47, 47, 47, 47, 50, 50, 54, 54, 57, 57, 61, 61, 63, 63, 66, 66, 68,
+        68, 70, 70, 72, 72, 75, 75, 75, 75, 76, 52, 50, 50, 47, 47, 47, 47, 47,
+        47, 50, 50, 54, 54, 57, 57, 61, 61, 63, 63, 66, 66, 68, 68, 70, 70, 72,
+        72, 75, 75, 75, 75, 76, 54, 52, 52, 49, 49, 49, 49, 48, 48, 52, 52, 55,
+        55, 58, 58, 62, 62, 65, 65, 68, 68, 71, 71, 73, 73, 75, 75, 78, 78, 79,
+        79, 80, 54, 52, 52, 49, 49, 49, 49, 48, 48, 52, 52, 55, 55, 58, 58, 62,
+        62, 65, 65, 68, 68, 71, 71, 73, 73, 75, 75, 78, 78, 79, 79, 80, 57, 54,
+        54, 52, 52, 51, 51, 50, 50, 53, 53, 56, 56, 60, 60, 63, 63, 67, 67, 70,
+        70, 73, 73, 76, 76, 79, 79, 82, 82, 83, 83, 84, 57, 54, 54, 52, 52, 51,
+        51, 50, 50, 53, 53, 56, 56, 60, 60, 63, 63, 67, 67, 70, 70, 73, 73, 76,
+        76, 79, 79, 82, 82, 83, 83, 84, 60, 57, 57, 54, 54, 53, 53, 52, 52, 55,
+        55, 58, 58, 61, 61, 65, 65, 68, 68, 72, 72, 75, 75, 79, 79, 82, 82, 85,
+        85, 86, 86, 88, 60, 57, 57, 54, 54, 53, 53, 52, 52, 55, 55, 58, 58, 61,
+        61, 65, 65, 68, 68, 72, 72, 75, 75, 79, 79, 82, 82, 85, 85, 86, 86, 88,
+        63, 60, 60, 57, 57, 56, 56, 54, 54, 57, 57, 60, 60, 63, 63, 67, 67, 71,
+        71, 75, 75, 78, 78, 82, 82, 85, 85, 89, 89, 90, 90, 92, 63, 60, 60, 57,
+        57, 56, 56, 54, 54, 57, 57, 60, 60, 63, 63, 67, 67, 71, 71, 75, 75, 78,
+        78, 82, 82, 85, 85, 89, 89, 90, 90, 92, 65, 61, 61, 58, 58, 57, 57, 55,
+        55, 58, 58, 61, 61, 64, 64, 68, 68, 71, 71, 75, 75, 79, 79, 83, 83, 86,
+        86, 90, 90, 91, 91, 93, 65, 61, 61, 58, 58, 57, 57, 55, 55, 58, 58, 61,
+        61, 64, 64, 68, 68, 71, 71, 75, 75, 79, 79, 83, 83, 86, 86, 90, 90, 91,
+        91, 93, 67, 63, 63, 60, 60, 59, 59, 57, 57, 60, 60, 62, 62, 66, 66, 69,
+        69, 72, 72, 76, 76, 80, 80, 84, 84, 88, 88, 92, 92, 93, 93, 95,
+        /* Size 4x8 */
+        31, 47, 50, 60, 36, 47, 47, 56, 43, 50, 50, 57, 46, 53, 57, 64, 46, 54,
+        64, 71, 50, 55, 68, 78, 54, 58, 72, 85, 59, 61, 75, 90,
+        /* Size 8x4 */
+        31, 36, 43, 46, 46, 50, 54, 59, 47, 47, 50, 53, 54, 55, 58, 61, 50, 47,
+        50, 57, 64, 68, 72, 75, 60, 56, 57, 64, 71, 78, 85, 90,
+        /* Size 8x16 */
+        32, 31, 37, 48, 49, 52, 57, 63, 31, 31, 38, 47, 47, 50, 54, 60, 30, 32,
+        40, 46, 45, 48, 52, 57, 33, 36, 43, 47, 46, 47, 51, 56, 37, 40, 47, 47,
+        45, 47, 50, 54, 42, 43, 47, 50, 49, 50, 53, 57, 49, 46, 48, 53, 53, 54,
+        57, 60, 48, 46, 47, 53, 56, 57, 60, 64, 49, 45, 46, 53, 58, 61, 64, 67,
+        50, 46, 46, 54, 59, 64, 67, 71, 52, 48, 47, 54, 61, 66, 71, 75, 54, 50,
+        49, 55, 62, 68, 73, 78, 57, 52, 50, 56, 64, 70, 76, 82, 60, 54, 52, 58,
+        65, 72, 79, 85, 63, 57, 55, 60, 67, 75, 82, 89, 64, 59, 56, 61, 68, 75,
+        83, 90,
+        /* Size 16x8 */
+        32, 31, 30, 33, 37, 42, 49, 48, 49, 50, 52, 54, 57, 60, 63, 64, 31, 31,
+        32, 36, 40, 43, 46, 46, 45, 46, 48, 50, 52, 54, 57, 59, 37, 38, 40, 43,
+        47, 47, 48, 47, 46, 46, 47, 49, 50, 52, 55, 56, 48, 47, 46, 47, 47, 50,
+        53, 53, 53, 54, 54, 55, 56, 58, 60, 61, 49, 47, 45, 46, 45, 49, 53, 56,
+        58, 59, 61, 62, 64, 65, 67, 68, 52, 50, 48, 47, 47, 50, 54, 57, 61, 64,
+        66, 68, 70, 72, 75, 75, 57, 54, 52, 51, 50, 53, 57, 60, 64, 67, 71, 73,
+        76, 79, 82, 83, 63, 60, 57, 56, 54, 57, 60, 64, 67, 71, 75, 78, 82, 85,
+        89, 90,
+        /* Size 16x32 */
+        32, 31, 31, 37, 37, 48, 48, 49, 49, 52, 52, 57, 57, 63, 63, 66, 31, 31,
+        31, 38, 38, 47, 47, 47, 47, 50, 50, 54, 54, 60, 60, 63, 31, 31, 31, 38,
+        38, 47, 47, 47, 47, 50, 50, 54, 54, 60, 60, 63, 30, 32, 32, 40, 40, 46,
+        46, 45, 45, 48, 48, 52, 52, 57, 57, 60, 30, 32, 32, 40, 40, 46, 46, 45,
+        45, 48, 48, 52, 52, 57, 57, 60, 33, 36, 36, 43, 43, 47, 47, 46, 46, 47,
+        47, 51, 51, 56, 56, 59, 33, 36, 36, 43, 43, 47, 47, 46, 46, 47, 47, 51,
+        51, 56, 56, 59, 37, 40, 40, 47, 47, 47, 47, 45, 45, 47, 47, 50, 50, 54,
+        54, 57, 37, 40, 40, 47, 47, 47, 47, 45, 45, 47, 47, 50, 50, 54, 54, 57,
+        42, 43, 43, 47, 47, 50, 50, 49, 49, 50, 50, 53, 53, 57, 57, 60, 42, 43,
+        43, 47, 47, 50, 50, 49, 49, 50, 50, 53, 53, 57, 57, 60, 49, 46, 46, 48,
+        48, 53, 53, 53, 53, 54, 54, 57, 57, 60, 60, 62, 49, 46, 46, 48, 48, 53,
+        53, 53, 53, 54, 54, 57, 57, 60, 60, 62, 48, 46, 46, 47, 47, 53, 53, 56,
+        56, 57, 57, 60, 60, 64, 64, 66, 48, 46, 46, 47, 47, 53, 53, 56, 56, 57,
+        57, 60, 60, 64, 64, 66, 49, 45, 45, 46, 46, 53, 53, 58, 58, 61, 61, 64,
+        64, 67, 67, 69, 49, 45, 45, 46, 46, 53, 53, 58, 58, 61, 61, 64, 64, 67,
+        67, 69, 50, 46, 46, 46, 46, 54, 54, 59, 59, 64, 64, 67, 67, 71, 71, 73,
+        50, 46, 46, 46, 46, 54, 54, 59, 59, 64, 64, 67, 67, 71, 71, 73, 52, 48,
+        48, 47, 47, 54, 54, 61, 61, 66, 66, 71, 71, 75, 75, 77, 52, 48, 48, 47,
+        47, 54, 54, 61, 61, 66, 66, 71, 71, 75, 75, 77, 54, 50, 50, 49, 49, 55,
+        55, 62, 62, 68, 68, 73, 73, 78, 78, 80, 54, 50, 50, 49, 49, 55, 55, 62,
+        62, 68, 68, 73, 73, 78, 78, 80, 57, 52, 52, 50, 50, 56, 56, 64, 64, 70,
+        70, 76, 76, 82, 82, 84, 57, 52, 52, 50, 50, 56, 56, 64, 64, 70, 70, 76,
+        76, 82, 82, 84, 60, 54, 54, 52, 52, 58, 58, 65, 65, 72, 72, 79, 79, 85,
+        85, 88, 60, 54, 54, 52, 52, 58, 58, 65, 65, 72, 72, 79, 79, 85, 85, 88,
+        63, 57, 57, 55, 55, 60, 60, 67, 67, 75, 75, 82, 82, 89, 89, 92, 63, 57,
+        57, 55, 55, 60, 60, 67, 67, 75, 75, 82, 82, 89, 89, 92, 64, 59, 59, 56,
+        56, 61, 61, 68, 68, 75, 75, 83, 83, 90, 90, 93, 64, 59, 59, 56, 56, 61,
+        61, 68, 68, 75, 75, 83, 83, 90, 90, 93, 66, 60, 60, 57, 57, 63, 63, 69,
+        69, 77, 77, 84, 84, 92, 92, 95,
+        /* Size 32x16 */
+        32, 31, 31, 30, 30, 33, 33, 37, 37, 42, 42, 49, 49, 48, 48, 49, 49, 50,
+        50, 52, 52, 54, 54, 57, 57, 60, 60, 63, 63, 64, 64, 66, 31, 31, 31, 32,
+        32, 36, 36, 40, 40, 43, 43, 46, 46, 46, 46, 45, 45, 46, 46, 48, 48, 50,
+        50, 52, 52, 54, 54, 57, 57, 59, 59, 60, 31, 31, 31, 32, 32, 36, 36, 40,
+        40, 43, 43, 46, 46, 46, 46, 45, 45, 46, 46, 48, 48, 50, 50, 52, 52, 54,
+        54, 57, 57, 59, 59, 60, 37, 38, 38, 40, 40, 43, 43, 47, 47, 47, 47, 48,
+        48, 47, 47, 46, 46, 46, 46, 47, 47, 49, 49, 50, 50, 52, 52, 55, 55, 56,
+        56, 57, 37, 38, 38, 40, 40, 43, 43, 47, 47, 47, 47, 48, 48, 47, 47, 46,
+        46, 46, 46, 47, 47, 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 57, 48, 47,
+        47, 46, 46, 47, 47, 47, 47, 50, 50, 53, 53, 53, 53, 53, 53, 54, 54, 54,
+        54, 55, 55, 56, 56, 58, 58, 60, 60, 61, 61, 63, 48, 47, 47, 46, 46, 47,
+        47, 47, 47, 50, 50, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 56,
+        56, 58, 58, 60, 60, 61, 61, 63, 49, 47, 47, 45, 45, 46, 46, 45, 45, 49,
+        49, 53, 53, 56, 56, 58, 58, 59, 59, 61, 61, 62, 62, 64, 64, 65, 65, 67,
+        67, 68, 68, 69, 49, 47, 47, 45, 45, 46, 46, 45, 45, 49, 49, 53, 53, 56,
+        56, 58, 58, 59, 59, 61, 61, 62, 62, 64, 64, 65, 65, 67, 67, 68, 68, 69,
+        52, 50, 50, 48, 48, 47, 47, 47, 47, 50, 50, 54, 54, 57, 57, 61, 61, 64,
+        64, 66, 66, 68, 68, 70, 70, 72, 72, 75, 75, 75, 75, 77, 52, 50, 50, 48,
+        48, 47, 47, 47, 47, 50, 50, 54, 54, 57, 57, 61, 61, 64, 64, 66, 66, 68,
+        68, 70, 70, 72, 72, 75, 75, 75, 75, 77, 57, 54, 54, 52, 52, 51, 51, 50,
+        50, 53, 53, 57, 57, 60, 60, 64, 64, 67, 67, 71, 71, 73, 73, 76, 76, 79,
+        79, 82, 82, 83, 83, 84, 57, 54, 54, 52, 52, 51, 51, 50, 50, 53, 53, 57,
+        57, 60, 60, 64, 64, 67, 67, 71, 71, 73, 73, 76, 76, 79, 79, 82, 82, 83,
+        83, 84, 63, 60, 60, 57, 57, 56, 56, 54, 54, 57, 57, 60, 60, 64, 64, 67,
+        67, 71, 71, 75, 75, 78, 78, 82, 82, 85, 85, 89, 89, 90, 90, 92, 63, 60,
+        60, 57, 57, 56, 56, 54, 54, 57, 57, 60, 60, 64, 64, 67, 67, 71, 71, 75,
+        75, 78, 78, 82, 82, 85, 85, 89, 89, 90, 90, 92, 66, 63, 63, 60, 60, 59,
+        59, 57, 57, 60, 60, 62, 62, 66, 66, 69, 69, 73, 73, 77, 77, 80, 80, 84,
+        84, 88, 88, 92, 92, 93, 93, 95,
+        /* Size 4x16 */
+        31, 48, 52, 63, 31, 47, 50, 60, 32, 46, 48, 57, 36, 47, 47, 56, 40, 47,
+        47, 54, 43, 50, 50, 57, 46, 53, 54, 60, 46, 53, 57, 64, 45, 53, 61, 67,
+        46, 54, 64, 71, 48, 54, 66, 75, 50, 55, 68, 78, 52, 56, 70, 82, 54, 58,
+        72, 85, 57, 60, 75, 89, 59, 61, 75, 90,
+        /* Size 16x4 */
+        31, 31, 32, 36, 40, 43, 46, 46, 45, 46, 48, 50, 52, 54, 57, 59, 48, 47,
+        46, 47, 47, 50, 53, 53, 53, 54, 54, 55, 56, 58, 60, 61, 52, 50, 48, 47,
+        47, 50, 54, 57, 61, 64, 66, 68, 70, 72, 75, 75, 63, 60, 57, 56, 54, 57,
+        60, 64, 67, 71, 75, 78, 82, 85, 89, 90,
+        /* Size 8x32 */
+        32, 31, 37, 48, 49, 52, 57, 63, 31, 31, 38, 47, 47, 50, 54, 60, 31, 31,
+        38, 47, 47, 50, 54, 60, 30, 32, 40, 46, 45, 48, 52, 57, 30, 32, 40, 46,
+        45, 48, 52, 57, 33, 36, 43, 47, 46, 47, 51, 56, 33, 36, 43, 47, 46, 47,
+        51, 56, 37, 40, 47, 47, 45, 47, 50, 54, 37, 40, 47, 47, 45, 47, 50, 54,
+        42, 43, 47, 50, 49, 50, 53, 57, 42, 43, 47, 50, 49, 50, 53, 57, 49, 46,
+        48, 53, 53, 54, 57, 60, 49, 46, 48, 53, 53, 54, 57, 60, 48, 46, 47, 53,
+        56, 57, 60, 64, 48, 46, 47, 53, 56, 57, 60, 64, 49, 45, 46, 53, 58, 61,
+        64, 67, 49, 45, 46, 53, 58, 61, 64, 67, 50, 46, 46, 54, 59, 64, 67, 71,
+        50, 46, 46, 54, 59, 64, 67, 71, 52, 48, 47, 54, 61, 66, 71, 75, 52, 48,
+        47, 54, 61, 66, 71, 75, 54, 50, 49, 55, 62, 68, 73, 78, 54, 50, 49, 55,
+        62, 68, 73, 78, 57, 52, 50, 56, 64, 70, 76, 82, 57, 52, 50, 56, 64, 70,
+        76, 82, 60, 54, 52, 58, 65, 72, 79, 85, 60, 54, 52, 58, 65, 72, 79, 85,
+        63, 57, 55, 60, 67, 75, 82, 89, 63, 57, 55, 60, 67, 75, 82, 89, 64, 59,
+        56, 61, 68, 75, 83, 90, 64, 59, 56, 61, 68, 75, 83, 90, 66, 60, 57, 63,
+        69, 77, 84, 92,
+        /* Size 32x8 */
+        32, 31, 31, 30, 30, 33, 33, 37, 37, 42, 42, 49, 49, 48, 48, 49, 49, 50,
+        50, 52, 52, 54, 54, 57, 57, 60, 60, 63, 63, 64, 64, 66, 31, 31, 31, 32,
+        32, 36, 36, 40, 40, 43, 43, 46, 46, 46, 46, 45, 45, 46, 46, 48, 48, 50,
+        50, 52, 52, 54, 54, 57, 57, 59, 59, 60, 37, 38, 38, 40, 40, 43, 43, 47,
+        47, 47, 47, 48, 48, 47, 47, 46, 46, 46, 46, 47, 47, 49, 49, 50, 50, 52,
+        52, 55, 55, 56, 56, 57, 48, 47, 47, 46, 46, 47, 47, 47, 47, 50, 50, 53,
+        53, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 56, 56, 58, 58, 60, 60, 61,
+        61, 63, 49, 47, 47, 45, 45, 46, 46, 45, 45, 49, 49, 53, 53, 56, 56, 58,
+        58, 59, 59, 61, 61, 62, 62, 64, 64, 65, 65, 67, 67, 68, 68, 69, 52, 50,
+        50, 48, 48, 47, 47, 47, 47, 50, 50, 54, 54, 57, 57, 61, 61, 64, 64, 66,
+        66, 68, 68, 70, 70, 72, 72, 75, 75, 75, 75, 77, 57, 54, 54, 52, 52, 51,
+        51, 50, 50, 53, 53, 57, 57, 60, 60, 64, 64, 67, 67, 71, 71, 73, 73, 76,
+        76, 79, 79, 82, 82, 83, 83, 84, 63, 60, 60, 57, 57, 56, 56, 54, 54, 57,
+        57, 60, 60, 64, 64, 67, 67, 71, 71, 75, 75, 78, 78, 82, 82, 85, 85, 89,
+        89, 90, 90, 92 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 33, 45, 62, 33, 39, 51, 64, 45, 51, 71, 87, 62, 64, 87, 108,
+        /* Size 8x8 */
+        31, 32, 32, 35, 42, 51, 59, 69, 32, 32, 33, 35, 41, 49, 56, 65, 32, 33,
+        35, 38, 43, 49, 56, 64, 35, 35, 38, 48, 54, 59, 66, 73, 42, 41, 43, 54,
+        63, 71, 77, 85, 51, 49, 49, 59, 71, 81, 89, 97, 59, 56, 56, 66, 77, 89,
+        98, 108, 69, 65, 64, 73, 85, 97, 108, 119,
+        /* Size 16x16 */
+        32, 31, 31, 31, 32, 34, 35, 38, 41, 45, 48, 54, 59, 65, 71, 80, 31, 32,
+        32, 32, 32, 34, 35, 37, 40, 43, 46, 51, 56, 62, 68, 76, 31, 32, 32, 32,
+        32, 33, 34, 36, 38, 41, 44, 49, 54, 59, 65, 72, 31, 32, 32, 33, 34, 35,
+        36, 38, 40, 42, 45, 50, 54, 59, 64, 71, 32, 32, 32, 34, 35, 37, 38, 39,
+        41, 43, 46, 49, 53, 58, 63, 69, 34, 34, 33, 35, 37, 39, 42, 44, 46, 48,
+        51, 54, 58, 63, 68, 74, 35, 35, 34, 36, 38, 42, 46, 48, 50, 53, 55, 59,
+        62, 67, 72, 78, 38, 37, 36, 38, 39, 44, 48, 51, 54, 57, 59, 63, 67, 71,
+        76, 82, 41, 40, 38, 40, 41, 46, 50, 54, 57, 60, 63, 67, 71, 75, 80, 86,
+        45, 43, 41, 42, 43, 48, 53, 57, 60, 65, 68, 72, 76, 81, 85, 91, 48, 46,
+        44, 45, 46, 51, 55, 59, 63, 68, 71, 76, 80, 85, 90, 96, 54, 51, 49, 50,
+        49, 54, 59, 63, 67, 72, 76, 82, 87, 92, 97, 104, 59, 56, 54, 54, 53, 58,
+        62, 67, 71, 76, 80, 87, 92, 98, 103, 110, 65, 62, 59, 59, 58, 63, 67,
+        71, 75, 81, 85, 92, 98, 105, 111, 118, 71, 68, 65, 64, 63, 68, 72, 76,
+        80, 85, 90, 97, 103, 111, 117, 125, 80, 76, 72, 71, 69, 74, 78, 82, 86,
+        91, 96, 104, 110, 118, 125, 134,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 34, 34, 35, 36, 38, 39, 41, 44,
+        45, 48, 48, 53, 54, 57, 59, 62, 65, 67, 71, 72, 80, 80, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 34, 34, 35, 35, 37, 38, 40, 42, 43, 46, 46, 51,
+        52, 55, 56, 59, 62, 64, 68, 69, 76, 76, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 34, 34, 35, 35, 37, 38, 40, 42, 43, 46, 46, 51, 51, 55, 56, 59,
+        62, 64, 68, 69, 76, 76, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        34, 34, 36, 38, 39, 41, 42, 45, 45, 49, 50, 53, 54, 57, 60, 62, 66, 66,
+        73, 73, 31, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 36, 37,
+        38, 41, 41, 44, 44, 49, 49, 52, 54, 56, 59, 61, 65, 65, 72, 72, 31, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 35, 35, 37, 38, 39, 41, 42, 45,
+        45, 49, 49, 52, 54, 56, 59, 61, 64, 65, 72, 72, 31, 32, 32, 32, 32, 33,
+        33, 33, 34, 34, 35, 35, 36, 36, 38, 39, 40, 42, 42, 45, 45, 49, 50, 52,
+        54, 56, 59, 60, 64, 65, 71, 71, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34,
+        35, 35, 36, 37, 38, 39, 40, 42, 43, 45, 45, 49, 49, 52, 54, 56, 59, 60,
+        64, 64, 70, 70, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 37, 37, 38, 38,
+        39, 40, 41, 42, 43, 46, 46, 49, 49, 52, 53, 55, 58, 59, 63, 63, 69, 69,
+        32, 32, 32, 32, 33, 33, 34, 34, 35, 35, 37, 37, 38, 38, 40, 41, 41, 43,
+        43, 46, 46, 49, 50, 52, 54, 56, 58, 60, 63, 64, 70, 70, 34, 34, 34, 33,
+        33, 34, 35, 35, 37, 37, 39, 39, 42, 42, 44, 45, 46, 47, 48, 51, 51, 54,
+        54, 57, 58, 60, 63, 64, 68, 68, 74, 74, 34, 34, 34, 33, 33, 34, 35, 35,
+        37, 37, 39, 39, 42, 42, 44, 45, 46, 47, 48, 51, 51, 54, 54, 57, 58, 60,
+        63, 64, 68, 68, 74, 74, 35, 35, 35, 34, 34, 35, 36, 36, 38, 38, 42, 42,
+        46, 47, 48, 49, 50, 52, 53, 55, 55, 58, 59, 61, 62, 64, 67, 68, 72, 72,
+        78, 78, 36, 35, 35, 34, 34, 35, 36, 37, 38, 38, 42, 42, 47, 48, 50, 50,
+        52, 54, 54, 57, 57, 59, 60, 62, 64, 66, 68, 69, 73, 73, 79, 79, 38, 37,
+        37, 36, 36, 37, 38, 38, 39, 40, 44, 44, 48, 50, 51, 52, 54, 56, 57, 59,
+        59, 62, 63, 65, 67, 69, 71, 72, 76, 76, 82, 82, 39, 38, 38, 38, 37, 38,
+        39, 39, 40, 41, 45, 45, 49, 50, 52, 54, 55, 58, 58, 61, 61, 64, 65, 67,
+        69, 71, 73, 74, 78, 78, 84, 84, 41, 40, 40, 39, 38, 39, 40, 40, 41, 41,
+        46, 46, 50, 52, 54, 55, 57, 60, 60, 63, 63, 67, 67, 70, 71, 73, 75, 77,
+        80, 81, 86, 86, 44, 42, 42, 41, 41, 41, 42, 42, 42, 43, 47, 47, 52, 54,
+        56, 58, 60, 63, 64, 67, 67, 71, 71, 74, 75, 77, 79, 81, 84, 85, 90, 90,
+        45, 43, 43, 42, 41, 42, 42, 43, 43, 43, 48, 48, 53, 54, 57, 58, 60, 64,
+        65, 68, 68, 72, 72, 75, 76, 78, 81, 82, 85, 86, 91, 91, 48, 46, 46, 45,
+        44, 45, 45, 45, 46, 46, 51, 51, 55, 57, 59, 61, 63, 67, 68, 71, 71, 75,
+        76, 79, 80, 83, 85, 87, 90, 91, 96, 96, 48, 46, 46, 45, 44, 45, 45, 45,
+        46, 46, 51, 51, 55, 57, 59, 61, 63, 67, 68, 71, 71, 75, 76, 79, 80, 83,
+        85, 87, 90, 91, 96, 96, 53, 51, 51, 49, 49, 49, 49, 49, 49, 49, 54, 54,
+        58, 59, 62, 64, 67, 71, 72, 75, 75, 81, 81, 85, 86, 89, 91, 93, 97, 97,
+        103, 103, 54, 52, 51, 50, 49, 49, 50, 49, 49, 50, 54, 54, 59, 60, 63,
+        65, 67, 71, 72, 76, 76, 81, 82, 85, 87, 89, 92, 94, 97, 98, 104, 104,
+        57, 55, 55, 53, 52, 52, 52, 52, 52, 52, 57, 57, 61, 62, 65, 67, 70, 74,
+        75, 79, 79, 85, 85, 89, 90, 93, 96, 98, 102, 102, 108, 108, 59, 56, 56,
+        54, 54, 54, 54, 54, 53, 54, 58, 58, 62, 64, 67, 69, 71, 75, 76, 80, 80,
+        86, 87, 90, 92, 95, 98, 99, 103, 104, 110, 110, 62, 59, 59, 57, 56, 56,
+        56, 56, 55, 56, 60, 60, 64, 66, 69, 71, 73, 77, 78, 83, 83, 89, 89, 93,
+        95, 98, 101, 103, 107, 108, 114, 114, 65, 62, 62, 60, 59, 59, 59, 59,
+        58, 58, 63, 63, 67, 68, 71, 73, 75, 79, 81, 85, 85, 91, 92, 96, 98, 101,
+        105, 106, 111, 111, 118, 118, 67, 64, 64, 62, 61, 61, 60, 60, 59, 60,
+        64, 64, 68, 69, 72, 74, 77, 81, 82, 87, 87, 93, 94, 98, 99, 103, 106,
+        108, 113, 113, 120, 120, 71, 68, 68, 66, 65, 64, 64, 64, 63, 63, 68, 68,
+        72, 73, 76, 78, 80, 84, 85, 90, 90, 97, 97, 102, 103, 107, 111, 113,
+        117, 118, 125, 125, 72, 69, 69, 66, 65, 65, 65, 64, 63, 64, 68, 68, 72,
+        73, 76, 78, 81, 85, 86, 91, 91, 97, 98, 102, 104, 108, 111, 113, 118,
+        119, 126, 126, 80, 76, 76, 73, 72, 72, 71, 70, 69, 70, 74, 74, 78, 79,
+        82, 84, 86, 90, 91, 96, 96, 103, 104, 108, 110, 114, 118, 120, 125, 126,
+        134, 134, 80, 76, 76, 73, 72, 72, 71, 70, 69, 70, 74, 74, 78, 79, 82,
+        84, 86, 90, 91, 96, 96, 103, 104, 108, 110, 114, 118, 120, 125, 126,
+        134, 134,
+        /* Size 4x8 */
+        32, 34, 43, 62, 32, 34, 42, 59, 33, 37, 44, 58, 35, 43, 54, 68, 41, 48,
+        64, 79, 49, 54, 71, 91, 57, 60, 78, 101, 66, 68, 86, 111,
+        /* Size 8x4 */
+        32, 32, 33, 35, 41, 49, 57, 66, 34, 34, 37, 43, 48, 54, 60, 68, 43, 42,
+        44, 54, 64, 71, 78, 86, 62, 59, 58, 68, 79, 91, 101, 111,
+        /* Size 8x16 */
+        32, 31, 32, 36, 44, 53, 62, 73, 31, 32, 32, 35, 42, 51, 59, 69, 31, 32,
+        33, 34, 41, 49, 57, 66, 32, 32, 34, 36, 42, 50, 57, 65, 32, 33, 35, 38,
+        42, 49, 56, 64, 34, 34, 37, 42, 48, 54, 61, 69, 35, 34, 38, 47, 52, 59,
+        65, 73, 38, 36, 40, 49, 56, 63, 69, 77, 41, 39, 41, 51, 60, 67, 74, 81,
+        44, 42, 43, 54, 64, 72, 79, 86, 48, 45, 46, 56, 67, 76, 83, 91, 53, 49,
+        50, 60, 71, 82, 90, 99, 58, 54, 54, 63, 75, 87, 95, 105, 65, 60, 58, 68,
+        79, 92, 102, 112, 71, 65, 63, 73, 84, 97, 108, 119, 79, 72, 70, 79, 90,
+        104, 115, 127,
+        /* Size 16x8 */
+        32, 31, 31, 32, 32, 34, 35, 38, 41, 44, 48, 53, 58, 65, 71, 79, 31, 32,
+        32, 32, 33, 34, 34, 36, 39, 42, 45, 49, 54, 60, 65, 72, 32, 32, 33, 34,
+        35, 37, 38, 40, 41, 43, 46, 50, 54, 58, 63, 70, 36, 35, 34, 36, 38, 42,
+        47, 49, 51, 54, 56, 60, 63, 68, 73, 79, 44, 42, 41, 42, 42, 48, 52, 56,
+        60, 64, 67, 71, 75, 79, 84, 90, 53, 51, 49, 50, 49, 54, 59, 63, 67, 72,
+        76, 82, 87, 92, 97, 104, 62, 59, 57, 57, 56, 61, 65, 69, 74, 79, 83, 90,
+        95, 102, 108, 115, 73, 69, 66, 65, 64, 69, 73, 77, 81, 86, 91, 99, 105,
+        112, 119, 127,
+        /* Size 16x32 */
+        32, 31, 31, 32, 32, 34, 36, 38, 44, 44, 53, 53, 62, 65, 73, 79, 31, 32,
+        32, 32, 32, 34, 35, 37, 42, 43, 51, 51, 60, 62, 70, 75, 31, 32, 32, 32,
+        32, 34, 35, 37, 42, 43, 51, 51, 59, 62, 69, 75, 31, 32, 32, 32, 32, 33,
+        35, 36, 41, 42, 50, 50, 58, 60, 67, 73, 31, 32, 32, 32, 33, 33, 34, 36,
+        41, 41, 49, 49, 57, 59, 66, 72, 31, 32, 32, 33, 33, 34, 35, 37, 41, 42,
+        49, 49, 57, 59, 66, 71, 32, 32, 32, 33, 34, 35, 36, 38, 42, 43, 50, 50,
+        57, 59, 65, 71, 32, 32, 32, 34, 34, 35, 37, 38, 42, 43, 49, 49, 56, 59,
+        65, 70, 32, 32, 33, 34, 35, 37, 38, 39, 42, 43, 49, 49, 56, 58, 64, 69,
+        32, 33, 33, 34, 35, 37, 39, 40, 43, 44, 50, 50, 56, 58, 64, 69, 34, 34,
+        34, 36, 37, 39, 42, 44, 48, 48, 54, 54, 61, 63, 69, 73, 34, 34, 34, 36,
+        37, 39, 42, 44, 48, 48, 54, 54, 61, 63, 69, 73, 35, 34, 34, 37, 38, 42,
+        47, 48, 52, 53, 59, 59, 65, 67, 73, 77, 36, 35, 34, 37, 38, 43, 48, 49,
+        54, 54, 60, 60, 66, 68, 74, 78, 38, 36, 36, 38, 40, 44, 49, 51, 56, 57,
+        63, 63, 69, 71, 77, 81, 39, 38, 37, 40, 40, 45, 50, 52, 58, 58, 65, 65,
+        71, 73, 79, 84, 41, 39, 39, 41, 41, 46, 51, 54, 60, 60, 67, 67, 74, 76,
+        81, 86, 44, 41, 41, 42, 43, 48, 53, 56, 63, 64, 71, 71, 78, 79, 85, 90,
+        44, 42, 42, 43, 43, 48, 54, 56, 64, 64, 72, 72, 79, 81, 86, 91, 48, 45,
+        45, 46, 46, 51, 56, 59, 67, 67, 76, 76, 83, 85, 91, 96, 48, 45, 45, 46,
+        46, 51, 56, 59, 67, 67, 76, 76, 83, 85, 91, 96, 53, 49, 49, 49, 49, 54,
+        59, 62, 71, 71, 81, 81, 89, 91, 98, 103, 53, 50, 49, 50, 50, 54, 60, 63,
+        71, 72, 82, 82, 90, 92, 99, 103, 57, 53, 52, 52, 52, 57, 62, 65, 74, 75,
+        85, 85, 94, 96, 103, 108, 58, 54, 54, 54, 54, 58, 63, 67, 75, 76, 87,
+        87, 95, 98, 105, 110, 61, 57, 57, 56, 56, 60, 66, 69, 77, 78, 89, 89,
+        98, 101, 108, 114, 65, 60, 60, 59, 58, 63, 68, 71, 79, 80, 92, 92, 102,
+        105, 112, 118, 67, 62, 61, 60, 60, 64, 69, 72, 81, 82, 94, 94, 103, 106,
+        114, 120, 71, 66, 65, 64, 63, 68, 73, 76, 84, 85, 97, 97, 108, 111, 119,
+        125, 72, 66, 66, 64, 64, 68, 73, 76, 85, 86, 98, 98, 108, 111, 119, 125,
+        79, 73, 72, 71, 70, 74, 79, 82, 90, 91, 104, 104, 115, 118, 127, 133,
+        79, 73, 72, 71, 70, 74, 79, 82, 90, 91, 104, 104, 115, 118, 127, 133,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 34, 34, 35, 36, 38, 39, 41, 44,
+        44, 48, 48, 53, 53, 57, 58, 61, 65, 67, 71, 72, 79, 79, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 34, 34, 34, 35, 36, 38, 39, 41, 42, 45, 45, 49,
+        50, 53, 54, 57, 60, 62, 66, 66, 73, 73, 31, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 34, 34, 34, 34, 36, 37, 39, 41, 42, 45, 45, 49, 49, 52, 54, 57,
+        60, 61, 65, 66, 72, 72, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 36, 36,
+        37, 37, 38, 40, 41, 42, 43, 46, 46, 49, 50, 52, 54, 56, 59, 60, 64, 64,
+        71, 71, 32, 32, 32, 32, 33, 33, 34, 34, 35, 35, 37, 37, 38, 38, 40, 40,
+        41, 43, 43, 46, 46, 49, 50, 52, 54, 56, 58, 60, 63, 64, 70, 70, 34, 34,
+        34, 33, 33, 34, 35, 35, 37, 37, 39, 39, 42, 43, 44, 45, 46, 48, 48, 51,
+        51, 54, 54, 57, 58, 60, 63, 64, 68, 68, 74, 74, 36, 35, 35, 35, 34, 35,
+        36, 37, 38, 39, 42, 42, 47, 48, 49, 50, 51, 53, 54, 56, 56, 59, 60, 62,
+        63, 66, 68, 69, 73, 73, 79, 79, 38, 37, 37, 36, 36, 37, 38, 38, 39, 40,
+        44, 44, 48, 49, 51, 52, 54, 56, 56, 59, 59, 62, 63, 65, 67, 69, 71, 72,
+        76, 76, 82, 82, 44, 42, 42, 41, 41, 41, 42, 42, 42, 43, 48, 48, 52, 54,
+        56, 58, 60, 63, 64, 67, 67, 71, 71, 74, 75, 77, 79, 81, 84, 85, 90, 90,
+        44, 43, 43, 42, 41, 42, 43, 43, 43, 44, 48, 48, 53, 54, 57, 58, 60, 64,
+        64, 67, 67, 71, 72, 75, 76, 78, 80, 82, 85, 86, 91, 91, 53, 51, 51, 50,
+        49, 49, 50, 49, 49, 50, 54, 54, 59, 60, 63, 65, 67, 71, 72, 76, 76, 81,
+        82, 85, 87, 89, 92, 94, 97, 98, 104, 104, 53, 51, 51, 50, 49, 49, 50,
+        49, 49, 50, 54, 54, 59, 60, 63, 65, 67, 71, 72, 76, 76, 81, 82, 85, 87,
+        89, 92, 94, 97, 98, 104, 104, 62, 60, 59, 58, 57, 57, 57, 56, 56, 56,
+        61, 61, 65, 66, 69, 71, 74, 78, 79, 83, 83, 89, 90, 94, 95, 98, 102,
+        103, 108, 108, 115, 115, 65, 62, 62, 60, 59, 59, 59, 59, 58, 58, 63, 63,
+        67, 68, 71, 73, 76, 79, 81, 85, 85, 91, 92, 96, 98, 101, 105, 106, 111,
+        111, 118, 118, 73, 70, 69, 67, 66, 66, 65, 65, 64, 64, 69, 69, 73, 74,
+        77, 79, 81, 85, 86, 91, 91, 98, 99, 103, 105, 108, 112, 114, 119, 119,
+        127, 127, 79, 75, 75, 73, 72, 71, 71, 70, 69, 69, 73, 73, 77, 78, 81,
+        84, 86, 90, 91, 96, 96, 103, 103, 108, 110, 114, 118, 120, 125, 125,
+        133, 133,
+        /* Size 4x16 */
+        31, 34, 44, 65, 32, 34, 43, 62, 32, 33, 41, 59, 32, 35, 43, 59, 32, 37,
+        43, 58, 34, 39, 48, 63, 34, 42, 53, 67, 36, 44, 57, 71, 39, 46, 60, 76,
+        42, 48, 64, 81, 45, 51, 67, 85, 50, 54, 72, 92, 54, 58, 76, 98, 60, 63,
+        80, 105, 66, 68, 85, 111, 73, 74, 91, 118,
+        /* Size 16x4 */
+        31, 32, 32, 32, 32, 34, 34, 36, 39, 42, 45, 50, 54, 60, 66, 73, 34, 34,
+        33, 35, 37, 39, 42, 44, 46, 48, 51, 54, 58, 63, 68, 74, 44, 43, 41, 43,
+        43, 48, 53, 57, 60, 64, 67, 72, 76, 80, 85, 91, 65, 62, 59, 59, 58, 63,
+        67, 71, 76, 81, 85, 92, 98, 105, 111, 118,
+        /* Size 8x32 */
+        32, 31, 32, 36, 44, 53, 62, 73, 31, 32, 32, 35, 42, 51, 60, 70, 31, 32,
+        32, 35, 42, 51, 59, 69, 31, 32, 32, 35, 41, 50, 58, 67, 31, 32, 33, 34,
+        41, 49, 57, 66, 31, 32, 33, 35, 41, 49, 57, 66, 32, 32, 34, 36, 42, 50,
+        57, 65, 32, 32, 34, 37, 42, 49, 56, 65, 32, 33, 35, 38, 42, 49, 56, 64,
+        32, 33, 35, 39, 43, 50, 56, 64, 34, 34, 37, 42, 48, 54, 61, 69, 34, 34,
+        37, 42, 48, 54, 61, 69, 35, 34, 38, 47, 52, 59, 65, 73, 36, 34, 38, 48,
+        54, 60, 66, 74, 38, 36, 40, 49, 56, 63, 69, 77, 39, 37, 40, 50, 58, 65,
+        71, 79, 41, 39, 41, 51, 60, 67, 74, 81, 44, 41, 43, 53, 63, 71, 78, 85,
+        44, 42, 43, 54, 64, 72, 79, 86, 48, 45, 46, 56, 67, 76, 83, 91, 48, 45,
+        46, 56, 67, 76, 83, 91, 53, 49, 49, 59, 71, 81, 89, 98, 53, 49, 50, 60,
+        71, 82, 90, 99, 57, 52, 52, 62, 74, 85, 94, 103, 58, 54, 54, 63, 75, 87,
+        95, 105, 61, 57, 56, 66, 77, 89, 98, 108, 65, 60, 58, 68, 79, 92, 102,
+        112, 67, 61, 60, 69, 81, 94, 103, 114, 71, 65, 63, 73, 84, 97, 108, 119,
+        72, 66, 64, 73, 85, 98, 108, 119, 79, 72, 70, 79, 90, 104, 115, 127, 79,
+        72, 70, 79, 90, 104, 115, 127,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 34, 34, 35, 36, 38, 39, 41, 44,
+        44, 48, 48, 53, 53, 57, 58, 61, 65, 67, 71, 72, 79, 79, 31, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 34, 34, 34, 34, 36, 37, 39, 41, 42, 45, 45, 49,
+        49, 52, 54, 57, 60, 61, 65, 66, 72, 72, 32, 32, 32, 32, 33, 33, 34, 34,
+        35, 35, 37, 37, 38, 38, 40, 40, 41, 43, 43, 46, 46, 49, 50, 52, 54, 56,
+        58, 60, 63, 64, 70, 70, 36, 35, 35, 35, 34, 35, 36, 37, 38, 39, 42, 42,
+        47, 48, 49, 50, 51, 53, 54, 56, 56, 59, 60, 62, 63, 66, 68, 69, 73, 73,
+        79, 79, 44, 42, 42, 41, 41, 41, 42, 42, 42, 43, 48, 48, 52, 54, 56, 58,
+        60, 63, 64, 67, 67, 71, 71, 74, 75, 77, 79, 81, 84, 85, 90, 90, 53, 51,
+        51, 50, 49, 49, 50, 49, 49, 50, 54, 54, 59, 60, 63, 65, 67, 71, 72, 76,
+        76, 81, 82, 85, 87, 89, 92, 94, 97, 98, 104, 104, 62, 60, 59, 58, 57,
+        57, 57, 56, 56, 56, 61, 61, 65, 66, 69, 71, 74, 78, 79, 83, 83, 89, 90,
+        94, 95, 98, 102, 103, 108, 108, 115, 115, 73, 70, 69, 67, 66, 66, 65,
+        65, 64, 64, 69, 69, 73, 74, 77, 79, 81, 85, 86, 91, 91, 98, 99, 103,
+        105, 108, 112, 114, 119, 119, 127, 127 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 42, 47, 53, 42, 48, 50, 54, 47, 50, 61, 67, 53, 54, 67, 78,
+        /* Size 8x8 */
+        31, 32, 38, 48, 47, 50, 53, 57, 32, 35, 42, 47, 45, 47, 50, 54, 38, 42,
+        47, 48, 45, 47, 49, 52, 48, 47, 48, 53, 53, 54, 56, 58, 47, 45, 45, 53,
+        58, 61, 63, 65, 50, 47, 47, 54, 61, 66, 69, 72, 53, 50, 49, 56, 63, 69,
+        73, 77, 57, 54, 52, 58, 65, 72, 77, 82,
+        /* Size 16x16 */
+        32, 31, 30, 33, 36, 41, 47, 49, 49, 49, 50, 52, 54, 57, 60, 63, 31, 31,
+        31, 34, 38, 42, 46, 47, 47, 47, 48, 50, 52, 54, 57, 60, 30, 31, 32, 35,
+        40, 42, 45, 46, 45, 45, 46, 47, 49, 52, 54, 57, 33, 34, 35, 39, 43, 45,
+        47, 46, 46, 45, 46, 47, 49, 51, 53, 56, 36, 38, 40, 43, 47, 47, 47, 47,
+        46, 45, 46, 47, 48, 50, 52, 54, 41, 42, 42, 45, 47, 48, 50, 50, 49, 49,
+        50, 50, 52, 53, 55, 57, 47, 46, 45, 47, 47, 50, 52, 52, 52, 52, 53, 53,
+        55, 56, 58, 60, 49, 47, 46, 46, 47, 50, 52, 53, 54, 55, 55, 56, 57, 58,
+        60, 62, 49, 47, 45, 46, 46, 49, 52, 54, 55, 57, 58, 59, 60, 61, 63, 65,
+        49, 47, 45, 45, 45, 49, 52, 55, 57, 59, 60, 61, 63, 64, 66, 68, 50, 48,
+        46, 46, 46, 50, 53, 55, 58, 60, 61, 63, 65, 67, 68, 71, 52, 50, 47, 47,
+        47, 50, 53, 56, 59, 61, 63, 66, 68, 70, 72, 75, 54, 52, 49, 49, 48, 52,
+        55, 57, 60, 63, 65, 68, 71, 73, 75, 78, 57, 54, 52, 51, 50, 53, 56, 58,
+        61, 64, 67, 70, 73, 76, 79, 82, 60, 57, 54, 53, 52, 55, 58, 60, 63, 66,
+        68, 72, 75, 79, 82, 85, 63, 60, 57, 56, 54, 57, 60, 62, 65, 68, 71, 75,
+        78, 82, 85, 89,
+        /* Size 32x32 */
+        32, 31, 31, 30, 30, 32, 33, 34, 36, 37, 41, 41, 47, 49, 49, 48, 49, 49,
+        49, 50, 50, 52, 52, 54, 54, 56, 57, 58, 60, 60, 63, 63, 31, 31, 31, 31,
+        31, 32, 34, 35, 38, 38, 42, 42, 46, 48, 47, 47, 47, 47, 47, 48, 48, 50,
+        50, 51, 52, 53, 54, 55, 57, 57, 60, 60, 31, 31, 31, 31, 31, 33, 34, 35,
+        38, 39, 42, 42, 46, 47, 47, 47, 47, 47, 47, 48, 48, 49, 50, 51, 52, 53,
+        54, 55, 57, 57, 60, 60, 30, 31, 31, 31, 31, 33, 35, 36, 39, 40, 42, 42,
+        46, 47, 46, 46, 46, 45, 46, 47, 47, 48, 48, 50, 50, 51, 52, 53, 55, 55,
+        58, 58, 30, 31, 31, 31, 32, 33, 35, 36, 40, 40, 42, 42, 45, 46, 46, 45,
+        45, 45, 45, 46, 46, 47, 47, 49, 49, 51, 52, 52, 54, 54, 57, 57, 32, 32,
+        33, 33, 33, 35, 37, 38, 41, 42, 43, 43, 46, 47, 46, 46, 45, 45, 45, 46,
+        46, 47, 47, 49, 49, 50, 51, 52, 54, 54, 57, 57, 33, 34, 34, 35, 35, 37,
+        39, 40, 43, 43, 45, 45, 47, 47, 46, 46, 46, 45, 45, 46, 46, 47, 47, 49,
+        49, 50, 51, 52, 53, 54, 56, 56, 34, 35, 35, 36, 36, 38, 40, 41, 44, 44,
+        45, 45, 47, 47, 47, 46, 46, 45, 45, 46, 46, 47, 47, 48, 49, 50, 51, 51,
+        53, 53, 55, 55, 36, 38, 38, 39, 40, 41, 43, 44, 47, 47, 47, 47, 47, 48,
+        47, 46, 46, 45, 45, 46, 46, 46, 47, 48, 48, 49, 50, 50, 52, 52, 54, 54,
+        37, 38, 39, 40, 40, 42, 43, 44, 47, 47, 47, 47, 48, 48, 47, 47, 46, 45,
+        46, 46, 46, 47, 47, 48, 48, 49, 50, 51, 52, 52, 55, 55, 41, 42, 42, 42,
+        42, 43, 45, 45, 47, 47, 48, 48, 50, 50, 50, 49, 49, 49, 49, 50, 50, 50,
+        50, 51, 52, 52, 53, 54, 55, 55, 57, 57, 41, 42, 42, 42, 42, 43, 45, 45,
+        47, 47, 48, 48, 50, 50, 50, 49, 49, 49, 49, 50, 50, 50, 50, 51, 52, 52,
+        53, 54, 55, 55, 57, 57, 47, 46, 46, 46, 45, 46, 47, 47, 47, 48, 50, 50,
+        52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53, 54, 55, 55, 56, 56, 58, 58,
+        60, 60, 49, 48, 47, 47, 46, 47, 47, 47, 48, 48, 50, 50, 52, 53, 53, 53,
+        53, 53, 53, 54, 54, 54, 54, 55, 55, 56, 56, 57, 58, 58, 60, 60, 49, 47,
+        47, 46, 46, 46, 46, 47, 47, 47, 50, 50, 52, 53, 53, 54, 54, 55, 55, 55,
+        55, 56, 56, 57, 57, 58, 58, 59, 60, 60, 62, 62, 48, 47, 47, 46, 45, 46,
+        46, 46, 46, 47, 49, 49, 52, 53, 54, 54, 55, 55, 56, 56, 56, 57, 57, 58,
+        58, 59, 60, 60, 61, 62, 63, 63, 49, 47, 47, 46, 45, 45, 46, 46, 46, 46,
+        49, 49, 52, 53, 54, 55, 55, 57, 57, 58, 58, 59, 59, 60, 60, 61, 61, 62,
+        63, 63, 65, 65, 49, 47, 47, 45, 45, 45, 45, 45, 45, 45, 49, 49, 52, 53,
+        55, 55, 57, 58, 59, 60, 60, 61, 61, 62, 62, 63, 63, 64, 65, 65, 67, 67,
+        49, 47, 47, 46, 45, 45, 45, 45, 45, 46, 49, 49, 52, 53, 55, 56, 57, 59,
+        59, 60, 60, 61, 61, 62, 63, 63, 64, 65, 66, 66, 68, 68, 50, 48, 48, 47,
+        46, 46, 46, 46, 46, 46, 50, 50, 53, 54, 55, 56, 58, 60, 60, 61, 61, 63,
+        63, 65, 65, 66, 67, 67, 68, 69, 71, 71, 50, 48, 48, 47, 46, 46, 46, 46,
+        46, 46, 50, 50, 53, 54, 55, 56, 58, 60, 60, 61, 61, 63, 63, 65, 65, 66,
+        67, 67, 68, 69, 71, 71, 52, 50, 49, 48, 47, 47, 47, 47, 46, 47, 50, 50,
+        53, 54, 56, 57, 59, 61, 61, 63, 63, 66, 66, 67, 68, 69, 70, 71, 72, 72,
+        74, 74, 52, 50, 50, 48, 47, 47, 47, 47, 47, 47, 50, 50, 53, 54, 56, 57,
+        59, 61, 61, 63, 63, 66, 66, 68, 68, 69, 70, 71, 72, 73, 75, 75, 54, 51,
+        51, 50, 49, 49, 49, 48, 48, 48, 51, 51, 54, 55, 57, 58, 60, 62, 62, 65,
+        65, 67, 68, 69, 70, 71, 72, 73, 74, 75, 77, 77, 54, 52, 52, 50, 49, 49,
+        49, 49, 48, 48, 52, 52, 55, 55, 57, 58, 60, 62, 63, 65, 65, 68, 68, 70,
+        71, 72, 73, 74, 75, 76, 78, 78, 56, 53, 53, 51, 51, 50, 50, 50, 49, 49,
+        52, 52, 55, 56, 58, 59, 61, 63, 63, 66, 66, 69, 69, 71, 72, 73, 75, 75,
+        77, 77, 80, 80, 57, 54, 54, 52, 52, 51, 51, 51, 50, 50, 53, 53, 56, 56,
+        58, 60, 61, 63, 64, 67, 67, 70, 70, 72, 73, 75, 76, 77, 79, 79, 82, 82,
+        58, 55, 55, 53, 52, 52, 52, 51, 50, 51, 54, 54, 56, 57, 59, 60, 62, 64,
+        65, 67, 67, 71, 71, 73, 74, 75, 77, 78, 80, 80, 83, 83, 60, 57, 57, 55,
+        54, 54, 53, 53, 52, 52, 55, 55, 58, 58, 60, 61, 63, 65, 66, 68, 68, 72,
+        72, 74, 75, 77, 79, 80, 82, 82, 85, 85, 60, 57, 57, 55, 54, 54, 54, 53,
+        52, 52, 55, 55, 58, 58, 60, 62, 63, 65, 66, 69, 69, 72, 73, 75, 76, 77,
+        79, 80, 82, 82, 85, 85, 63, 60, 60, 58, 57, 57, 56, 55, 54, 55, 57, 57,
+        60, 60, 62, 63, 65, 67, 68, 71, 71, 74, 75, 77, 78, 80, 82, 83, 85, 85,
+        89, 89, 63, 60, 60, 58, 57, 57, 56, 55, 54, 55, 57, 57, 60, 60, 62, 63,
+        65, 67, 68, 71, 71, 74, 75, 77, 78, 80, 82, 83, 85, 85, 89, 89,
+        /* Size 4x8 */
+        31, 42, 47, 54, 33, 44, 45, 51, 40, 47, 46, 50, 47, 50, 54, 57, 45, 49,
+        59, 64, 48, 50, 61, 70, 51, 52, 63, 75, 55, 55, 66, 79,
+        /* Size 8x4 */
+        31, 33, 40, 47, 45, 48, 51, 55, 42, 44, 47, 50, 49, 50, 52, 55, 47, 45,
+        46, 54, 59, 61, 63, 66, 54, 51, 50, 57, 64, 70, 75, 79,
+        /* Size 8x16 */
+        32, 31, 37, 48, 49, 52, 56, 61, 31, 31, 38, 47, 47, 50, 53, 57, 30, 32,
+        40, 46, 45, 48, 51, 55, 33, 36, 43, 47, 46, 47, 50, 54, 37, 40, 47, 47,
+        45, 47, 49, 52, 42, 43, 47, 50, 49, 50, 53, 56, 47, 46, 48, 52, 53, 53,
+        55, 58, 48, 46, 47, 53, 55, 56, 58, 61, 48, 45, 46, 53, 57, 59, 61, 63,
+        49, 45, 46, 53, 58, 62, 64, 66, 50, 46, 46, 54, 59, 64, 66, 69, 52, 48,
+        47, 54, 61, 66, 70, 73, 54, 50, 49, 55, 62, 68, 72, 76, 57, 52, 50, 56,
+        64, 70, 75, 79, 60, 54, 52, 58, 65, 72, 77, 82, 63, 57, 55, 60, 67, 75,
+        80, 86,
+        /* Size 16x8 */
+        32, 31, 30, 33, 37, 42, 47, 48, 48, 49, 50, 52, 54, 57, 60, 63, 31, 31,
+        32, 36, 40, 43, 46, 46, 45, 45, 46, 48, 50, 52, 54, 57, 37, 38, 40, 43,
+        47, 47, 48, 47, 46, 46, 46, 47, 49, 50, 52, 55, 48, 47, 46, 47, 47, 50,
+        52, 53, 53, 53, 54, 54, 55, 56, 58, 60, 49, 47, 45, 46, 45, 49, 53, 55,
+        57, 58, 59, 61, 62, 64, 65, 67, 52, 50, 48, 47, 47, 50, 53, 56, 59, 62,
+        64, 66, 68, 70, 72, 75, 56, 53, 51, 50, 49, 53, 55, 58, 61, 64, 66, 70,
+        72, 75, 77, 80, 61, 57, 55, 54, 52, 56, 58, 61, 63, 66, 69, 73, 76, 79,
+        82, 86,
+        /* Size 16x32 */
+        32, 31, 31, 35, 37, 42, 48, 48, 49, 49, 52, 52, 56, 57, 61, 63, 31, 31,
+        31, 36, 38, 42, 47, 47, 47, 47, 50, 50, 54, 54, 58, 60, 31, 31, 31, 36,
+        38, 42, 47, 47, 47, 47, 50, 50, 53, 54, 57, 60, 30, 32, 32, 37, 39, 42,
+        46, 46, 46, 46, 48, 48, 52, 52, 56, 58, 30, 32, 32, 37, 40, 42, 46, 46,
+        45, 45, 48, 48, 51, 52, 55, 57, 32, 33, 34, 39, 41, 44, 46, 46, 45, 45,
+        48, 48, 51, 51, 54, 57, 33, 35, 36, 40, 43, 45, 47, 46, 46, 46, 47, 47,
+        50, 51, 54, 56, 34, 37, 37, 42, 44, 45, 47, 47, 45, 46, 47, 47, 50, 51,
+        53, 55, 37, 40, 40, 45, 47, 47, 47, 47, 45, 46, 47, 47, 49, 50, 52, 54,
+        37, 40, 40, 45, 47, 47, 48, 47, 46, 46, 47, 47, 49, 50, 53, 55, 42, 43,
+        43, 46, 47, 48, 50, 50, 49, 49, 50, 50, 53, 53, 56, 57, 42, 43, 43, 46,
+        47, 48, 50, 50, 49, 49, 50, 50, 53, 53, 56, 57, 47, 46, 46, 47, 48, 50,
+        52, 52, 53, 53, 53, 53, 55, 56, 58, 60, 49, 47, 46, 47, 48, 50, 53, 53,
+        53, 54, 54, 54, 56, 57, 59, 60, 48, 46, 46, 47, 47, 50, 53, 53, 55, 55,
+        56, 56, 58, 58, 61, 62, 48, 46, 46, 46, 47, 50, 53, 54, 56, 56, 57, 57,
+        59, 60, 62, 64, 48, 46, 45, 46, 46, 49, 53, 54, 57, 57, 59, 59, 61, 61,
+        63, 65, 49, 45, 45, 45, 46, 49, 53, 55, 58, 59, 61, 61, 63, 64, 66, 67,
+        49, 46, 45, 46, 46, 49, 53, 55, 58, 59, 62, 62, 64, 64, 66, 68, 50, 47,
+        46, 46, 46, 50, 54, 55, 59, 60, 64, 64, 66, 67, 69, 71, 50, 47, 46, 46,
+        46, 50, 54, 55, 59, 60, 64, 64, 66, 67, 69, 71, 52, 48, 48, 47, 47, 50,
+        54, 56, 61, 61, 66, 66, 69, 70, 72, 74, 52, 48, 48, 47, 47, 50, 54, 56,
+        61, 61, 66, 66, 70, 71, 73, 75, 53, 50, 49, 48, 48, 51, 55, 57, 62, 62,
+        68, 68, 71, 72, 75, 77, 54, 50, 50, 49, 49, 52, 55, 57, 62, 63, 68, 68,
+        72, 73, 76, 78, 55, 51, 51, 50, 49, 52, 56, 58, 63, 63, 69, 69, 74, 75,
+        78, 80, 57, 52, 52, 51, 50, 53, 56, 58, 64, 64, 70, 70, 75, 76, 79, 82,
+        58, 53, 53, 51, 51, 54, 57, 59, 64, 65, 71, 71, 76, 77, 80, 83, 60, 55,
+        54, 53, 52, 55, 58, 60, 65, 66, 72, 72, 77, 79, 82, 85, 60, 55, 55, 53,
+        53, 55, 59, 60, 65, 66, 73, 73, 78, 79, 83, 85, 63, 58, 57, 56, 55, 58,
+        60, 62, 67, 68, 75, 75, 80, 82, 86, 89, 63, 58, 57, 56, 55, 58, 60, 62,
+        67, 68, 75, 75, 80, 82, 86, 89,
+        /* Size 32x16 */
+        32, 31, 31, 30, 30, 32, 33, 34, 37, 37, 42, 42, 47, 49, 48, 48, 48, 49,
+        49, 50, 50, 52, 52, 53, 54, 55, 57, 58, 60, 60, 63, 63, 31, 31, 31, 32,
+        32, 33, 35, 37, 40, 40, 43, 43, 46, 47, 46, 46, 46, 45, 46, 47, 47, 48,
+        48, 50, 50, 51, 52, 53, 55, 55, 58, 58, 31, 31, 31, 32, 32, 34, 36, 37,
+        40, 40, 43, 43, 46, 46, 46, 46, 45, 45, 45, 46, 46, 48, 48, 49, 50, 51,
+        52, 53, 54, 55, 57, 57, 35, 36, 36, 37, 37, 39, 40, 42, 45, 45, 46, 46,
+        47, 47, 47, 46, 46, 45, 46, 46, 46, 47, 47, 48, 49, 50, 51, 51, 53, 53,
+        56, 56, 37, 38, 38, 39, 40, 41, 43, 44, 47, 47, 47, 47, 48, 48, 47, 47,
+        46, 46, 46, 46, 46, 47, 47, 48, 49, 49, 50, 51, 52, 53, 55, 55, 42, 42,
+        42, 42, 42, 44, 45, 45, 47, 47, 48, 48, 50, 50, 50, 50, 49, 49, 49, 50,
+        50, 50, 50, 51, 52, 52, 53, 54, 55, 55, 58, 58, 48, 47, 47, 46, 46, 46,
+        47, 47, 47, 48, 50, 50, 52, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 55,
+        55, 56, 56, 57, 58, 59, 60, 60, 48, 47, 47, 46, 46, 46, 46, 47, 47, 47,
+        50, 50, 52, 53, 53, 54, 54, 55, 55, 55, 55, 56, 56, 57, 57, 58, 58, 59,
+        60, 60, 62, 62, 49, 47, 47, 46, 45, 45, 46, 45, 45, 46, 49, 49, 53, 53,
+        55, 56, 57, 58, 58, 59, 59, 61, 61, 62, 62, 63, 64, 64, 65, 65, 67, 67,
+        49, 47, 47, 46, 45, 45, 46, 46, 46, 46, 49, 49, 53, 54, 55, 56, 57, 59,
+        59, 60, 60, 61, 61, 62, 63, 63, 64, 65, 66, 66, 68, 68, 52, 50, 50, 48,
+        48, 48, 47, 47, 47, 47, 50, 50, 53, 54, 56, 57, 59, 61, 62, 64, 64, 66,
+        66, 68, 68, 69, 70, 71, 72, 73, 75, 75, 52, 50, 50, 48, 48, 48, 47, 47,
+        47, 47, 50, 50, 53, 54, 56, 57, 59, 61, 62, 64, 64, 66, 66, 68, 68, 69,
+        70, 71, 72, 73, 75, 75, 56, 54, 53, 52, 51, 51, 50, 50, 49, 49, 53, 53,
+        55, 56, 58, 59, 61, 63, 64, 66, 66, 69, 70, 71, 72, 74, 75, 76, 77, 78,
+        80, 80, 57, 54, 54, 52, 52, 51, 51, 51, 50, 50, 53, 53, 56, 57, 58, 60,
+        61, 64, 64, 67, 67, 70, 71, 72, 73, 75, 76, 77, 79, 79, 82, 82, 61, 58,
+        57, 56, 55, 54, 54, 53, 52, 53, 56, 56, 58, 59, 61, 62, 63, 66, 66, 69,
+        69, 72, 73, 75, 76, 78, 79, 80, 82, 83, 86, 86, 63, 60, 60, 58, 57, 57,
+        56, 55, 54, 55, 57, 57, 60, 60, 62, 64, 65, 67, 68, 71, 71, 74, 75, 77,
+        78, 80, 82, 83, 85, 85, 89, 89,
+        /* Size 4x16 */
+        31, 42, 49, 57, 31, 42, 47, 54, 32, 42, 45, 52, 35, 45, 46, 51, 40, 47,
+        46, 50, 43, 48, 49, 53, 46, 50, 53, 56, 46, 50, 55, 58, 46, 49, 57, 61,
+        46, 49, 59, 64, 47, 50, 60, 67, 48, 50, 61, 71, 50, 52, 63, 73, 52, 53,
+        64, 76, 55, 55, 66, 79, 58, 58, 68, 82,
+        /* Size 16x4 */
+        31, 31, 32, 35, 40, 43, 46, 46, 46, 46, 47, 48, 50, 52, 55, 58, 42, 42,
+        42, 45, 47, 48, 50, 50, 49, 49, 50, 50, 52, 53, 55, 58, 49, 47, 45, 46,
+        46, 49, 53, 55, 57, 59, 60, 61, 63, 64, 66, 68, 57, 54, 52, 51, 50, 53,
+        56, 58, 61, 64, 67, 71, 73, 76, 79, 82,
+        /* Size 8x32 */
+        32, 31, 37, 48, 49, 52, 56, 61, 31, 31, 38, 47, 47, 50, 54, 58, 31, 31,
+        38, 47, 47, 50, 53, 57, 30, 32, 39, 46, 46, 48, 52, 56, 30, 32, 40, 46,
+        45, 48, 51, 55, 32, 34, 41, 46, 45, 48, 51, 54, 33, 36, 43, 47, 46, 47,
+        50, 54, 34, 37, 44, 47, 45, 47, 50, 53, 37, 40, 47, 47, 45, 47, 49, 52,
+        37, 40, 47, 48, 46, 47, 49, 53, 42, 43, 47, 50, 49, 50, 53, 56, 42, 43,
+        47, 50, 49, 50, 53, 56, 47, 46, 48, 52, 53, 53, 55, 58, 49, 46, 48, 53,
+        53, 54, 56, 59, 48, 46, 47, 53, 55, 56, 58, 61, 48, 46, 47, 53, 56, 57,
+        59, 62, 48, 45, 46, 53, 57, 59, 61, 63, 49, 45, 46, 53, 58, 61, 63, 66,
+        49, 45, 46, 53, 58, 62, 64, 66, 50, 46, 46, 54, 59, 64, 66, 69, 50, 46,
+        46, 54, 59, 64, 66, 69, 52, 48, 47, 54, 61, 66, 69, 72, 52, 48, 47, 54,
+        61, 66, 70, 73, 53, 49, 48, 55, 62, 68, 71, 75, 54, 50, 49, 55, 62, 68,
+        72, 76, 55, 51, 49, 56, 63, 69, 74, 78, 57, 52, 50, 56, 64, 70, 75, 79,
+        58, 53, 51, 57, 64, 71, 76, 80, 60, 54, 52, 58, 65, 72, 77, 82, 60, 55,
+        53, 59, 65, 73, 78, 83, 63, 57, 55, 60, 67, 75, 80, 86, 63, 57, 55, 60,
+        67, 75, 80, 86,
+        /* Size 32x8 */
+        32, 31, 31, 30, 30, 32, 33, 34, 37, 37, 42, 42, 47, 49, 48, 48, 48, 49,
+        49, 50, 50, 52, 52, 53, 54, 55, 57, 58, 60, 60, 63, 63, 31, 31, 31, 32,
+        32, 34, 36, 37, 40, 40, 43, 43, 46, 46, 46, 46, 45, 45, 45, 46, 46, 48,
+        48, 49, 50, 51, 52, 53, 54, 55, 57, 57, 37, 38, 38, 39, 40, 41, 43, 44,
+        47, 47, 47, 47, 48, 48, 47, 47, 46, 46, 46, 46, 46, 47, 47, 48, 49, 49,
+        50, 51, 52, 53, 55, 55, 48, 47, 47, 46, 46, 46, 47, 47, 47, 48, 50, 50,
+        52, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 56, 56, 57, 58, 59,
+        60, 60, 49, 47, 47, 46, 45, 45, 46, 45, 45, 46, 49, 49, 53, 53, 55, 56,
+        57, 58, 58, 59, 59, 61, 61, 62, 62, 63, 64, 64, 65, 65, 67, 67, 52, 50,
+        50, 48, 48, 48, 47, 47, 47, 47, 50, 50, 53, 54, 56, 57, 59, 61, 62, 64,
+        64, 66, 66, 68, 68, 69, 70, 71, 72, 73, 75, 75, 56, 54, 53, 52, 51, 51,
+        50, 50, 49, 49, 53, 53, 55, 56, 58, 59, 61, 63, 64, 66, 66, 69, 70, 71,
+        72, 74, 75, 76, 77, 78, 80, 80, 61, 58, 57, 56, 55, 54, 54, 53, 52, 53,
+        56, 56, 58, 59, 61, 62, 63, 66, 66, 69, 69, 72, 73, 75, 76, 78, 79, 80,
+        82, 83, 86, 86 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 33, 42, 55, 33, 38, 46, 57, 42, 46, 63, 75, 55, 57, 75, 92,
+        /* Size 8x8 */
+        31, 32, 32, 34, 38, 46, 52, 63, 32, 32, 32, 34, 37, 44, 49, 59, 32, 32,
+        35, 37, 40, 45, 49, 58, 34, 34, 37, 42, 47, 52, 56, 65, 38, 37, 40, 47,
+        54, 60, 65, 73, 46, 44, 45, 52, 60, 69, 75, 84, 52, 49, 49, 56, 65, 75,
+        82, 92, 63, 59, 58, 65, 73, 84, 92, 105,
+        /* Size 16x16 */
+        32, 31, 31, 31, 32, 32, 34, 36, 38, 41, 44, 48, 54, 58, 61, 65, 31, 32,
+        32, 32, 32, 32, 34, 35, 38, 40, 42, 46, 51, 55, 58, 62, 31, 32, 32, 32,
+        32, 32, 33, 34, 37, 38, 41, 44, 49, 53, 56, 59, 31, 32, 32, 33, 33, 33,
+        35, 36, 38, 40, 42, 45, 49, 53, 56, 59, 32, 32, 32, 33, 34, 34, 36, 37,
+        39, 40, 42, 45, 49, 53, 55, 59, 32, 32, 32, 33, 34, 35, 37, 38, 40, 41,
+        42, 46, 49, 52, 55, 58, 34, 34, 33, 35, 36, 37, 39, 42, 44, 46, 47, 51,
+        54, 57, 60, 63, 36, 35, 34, 36, 37, 38, 42, 48, 50, 52, 54, 57, 60, 63,
+        65, 68, 38, 38, 37, 38, 39, 40, 44, 50, 52, 54, 57, 60, 64, 67, 69, 72,
+        41, 40, 38, 40, 40, 41, 46, 52, 54, 57, 60, 63, 67, 70, 73, 75, 44, 42,
+        41, 42, 42, 42, 47, 54, 57, 60, 63, 67, 71, 74, 77, 79, 48, 46, 44, 45,
+        45, 46, 51, 57, 60, 63, 67, 71, 76, 79, 82, 85, 54, 51, 49, 49, 49, 49,
+        54, 60, 64, 67, 71, 76, 82, 86, 89, 92, 58, 55, 53, 53, 53, 52, 57, 63,
+        67, 70, 74, 79, 86, 90, 93, 97, 61, 58, 56, 56, 55, 55, 60, 65, 69, 73,
+        77, 82, 89, 93, 97, 101, 65, 62, 59, 59, 59, 58, 63, 68, 72, 75, 79, 85,
+        92, 97, 101, 105,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 33, 34, 34, 36, 36, 38, 39,
+        41, 44, 44, 47, 48, 50, 54, 54, 58, 59, 61, 65, 65, 70, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 38, 38, 40, 42, 42, 46,
+        47, 49, 52, 52, 56, 57, 59, 63, 63, 67, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 34, 34, 35, 35, 38, 38, 40, 42, 42, 45, 46, 48, 51, 51,
+        55, 56, 58, 62, 62, 67, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        34, 34, 35, 35, 37, 38, 39, 42, 42, 45, 45, 47, 50, 50, 54, 55, 57, 61,
+        61, 65, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34,
+        37, 37, 38, 41, 41, 44, 44, 46, 49, 49, 53, 54, 56, 59, 59, 64, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 37, 37, 38, 41,
+        41, 44, 44, 46, 49, 49, 53, 54, 56, 59, 59, 64, 31, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 34, 35, 35, 36, 36, 38, 39, 40, 42, 42, 44, 45, 47,
+        49, 49, 53, 54, 56, 59, 59, 63, 31, 32, 32, 32, 32, 32, 33, 33, 33, 34,
+        34, 35, 35, 36, 36, 36, 38, 39, 40, 42, 42, 45, 45, 47, 50, 50, 53, 54,
+        56, 59, 59, 63, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 35, 36, 36,
+        37, 37, 39, 39, 40, 42, 42, 45, 45, 47, 49, 49, 53, 54, 55, 59, 59, 63,
+        32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 36, 37, 37, 38, 38, 40, 40,
+        41, 42, 42, 45, 46, 47, 49, 49, 52, 53, 55, 58, 58, 62, 32, 32, 32, 32,
+        32, 32, 33, 34, 34, 35, 35, 36, 37, 37, 38, 38, 40, 40, 41, 42, 42, 45,
+        46, 47, 49, 49, 52, 53, 55, 58, 58, 62, 33, 33, 33, 33, 33, 33, 34, 35,
+        35, 36, 36, 38, 39, 40, 42, 42, 43, 44, 45, 46, 46, 49, 50, 51, 53, 53,
+        56, 57, 59, 62, 62, 66, 34, 34, 34, 34, 33, 33, 35, 35, 36, 37, 37, 39,
+        39, 41, 42, 42, 44, 45, 46, 47, 47, 50, 51, 52, 54, 54, 57, 58, 60, 63,
+        63, 67, 34, 34, 34, 34, 34, 34, 35, 36, 36, 37, 37, 40, 41, 42, 45, 45,
+        46, 47, 48, 50, 50, 52, 53, 54, 56, 56, 59, 60, 62, 65, 65, 69, 36, 35,
+        35, 35, 34, 34, 36, 36, 37, 38, 38, 42, 42, 45, 48, 48, 50, 50, 52, 54,
+        54, 56, 57, 58, 60, 60, 63, 64, 65, 68, 68, 72, 36, 35, 35, 35, 34, 34,
+        36, 36, 37, 38, 38, 42, 42, 45, 48, 48, 50, 50, 52, 54, 54, 56, 57, 58,
+        60, 60, 63, 64, 65, 68, 68, 72, 38, 38, 38, 37, 37, 37, 38, 38, 39, 40,
+        40, 43, 44, 46, 50, 50, 52, 53, 54, 57, 57, 59, 60, 61, 64, 64, 67, 68,
+        69, 72, 72, 76, 39, 38, 38, 38, 37, 37, 39, 39, 39, 40, 40, 44, 45, 47,
+        50, 50, 53, 54, 55, 58, 58, 60, 61, 62, 65, 65, 68, 69, 70, 73, 73, 77,
+        41, 40, 40, 39, 38, 38, 40, 40, 40, 41, 41, 45, 46, 48, 52, 52, 54, 55,
+        57, 60, 60, 62, 63, 65, 67, 67, 70, 71, 73, 75, 75, 79, 44, 42, 42, 42,
+        41, 41, 42, 42, 42, 42, 42, 46, 47, 50, 54, 54, 57, 58, 60, 63, 63, 66,
+        67, 68, 71, 71, 74, 75, 77, 79, 79, 83, 44, 42, 42, 42, 41, 41, 42, 42,
+        42, 42, 42, 46, 47, 50, 54, 54, 57, 58, 60, 63, 63, 66, 67, 68, 71, 71,
+        74, 75, 77, 79, 79, 83, 47, 46, 45, 45, 44, 44, 44, 45, 45, 45, 45, 49,
+        50, 52, 56, 56, 59, 60, 62, 66, 66, 69, 70, 72, 75, 75, 78, 79, 81, 84,
+        84, 88, 48, 47, 46, 45, 44, 44, 45, 45, 45, 46, 46, 50, 51, 53, 57, 57,
+        60, 61, 63, 67, 67, 70, 71, 73, 76, 76, 79, 80, 82, 85, 85, 89, 50, 49,
+        48, 47, 46, 46, 47, 47, 47, 47, 47, 51, 52, 54, 58, 58, 61, 62, 65, 68,
+        68, 72, 73, 75, 78, 78, 82, 83, 85, 88, 88, 92, 54, 52, 51, 50, 49, 49,
+        49, 50, 49, 49, 49, 53, 54, 56, 60, 60, 64, 65, 67, 71, 71, 75, 76, 78,
+        82, 82, 86, 87, 89, 92, 92, 96, 54, 52, 51, 50, 49, 49, 49, 50, 49, 49,
+        49, 53, 54, 56, 60, 60, 64, 65, 67, 71, 71, 75, 76, 78, 82, 82, 86, 87,
+        89, 92, 92, 96, 58, 56, 55, 54, 53, 53, 53, 53, 53, 52, 52, 56, 57, 59,
+        63, 63, 67, 68, 70, 74, 74, 78, 79, 82, 86, 86, 90, 91, 93, 97, 97, 101,
+        59, 57, 56, 55, 54, 54, 54, 54, 54, 53, 53, 57, 58, 60, 64, 64, 68, 69,
+        71, 75, 75, 79, 80, 83, 87, 87, 91, 92, 94, 98, 98, 102, 61, 59, 58, 57,
+        56, 56, 56, 56, 55, 55, 55, 59, 60, 62, 65, 65, 69, 70, 73, 77, 77, 81,
+        82, 85, 89, 89, 93, 94, 97, 101, 101, 105, 65, 63, 62, 61, 59, 59, 59,
+        59, 59, 58, 58, 62, 63, 65, 68, 68, 72, 73, 75, 79, 79, 84, 85, 88, 92,
+        92, 97, 98, 101, 105, 105, 109, 65, 63, 62, 61, 59, 59, 59, 59, 59, 58,
+        58, 62, 63, 65, 68, 68, 72, 73, 75, 79, 79, 84, 85, 88, 92, 92, 97, 98,
+        101, 105, 105, 109, 70, 67, 67, 65, 64, 64, 63, 63, 63, 62, 62, 66, 67,
+        69, 72, 72, 76, 77, 79, 83, 83, 88, 89, 92, 96, 96, 101, 102, 105, 109,
+        109, 114,
+        /* Size 4x8 */
+        32, 32, 42, 56, 32, 33, 41, 53, 32, 35, 42, 52, 34, 37, 50, 59, 38, 40,
+        58, 68, 44, 45, 66, 78, 50, 50, 71, 86, 61, 58, 79, 97,
+        /* Size 8x4 */
+        32, 32, 32, 34, 38, 44, 50, 61, 32, 33, 35, 37, 40, 45, 50, 58, 42, 41,
+        42, 50, 58, 66, 71, 79, 56, 53, 52, 59, 68, 78, 86, 97,
+        /* Size 8x16 */
+        32, 31, 32, 35, 39, 44, 53, 65, 31, 32, 32, 35, 38, 42, 51, 62, 31, 32,
+        33, 34, 37, 41, 49, 59, 31, 32, 34, 35, 38, 42, 49, 59, 32, 32, 34, 36,
+        39, 42, 49, 58, 32, 33, 35, 37, 40, 42, 49, 58, 34, 34, 37, 41, 44, 48,
+        54, 63, 36, 34, 38, 46, 50, 54, 60, 68, 38, 37, 40, 47, 52, 57, 64, 72,
+        41, 39, 41, 49, 54, 60, 67, 76, 44, 41, 43, 51, 57, 63, 71, 79, 48, 45,
+        46, 54, 60, 67, 76, 85, 53, 49, 50, 57, 64, 71, 82, 92, 57, 53, 53, 60,
+        67, 74, 86, 97, 61, 56, 56, 63, 69, 77, 89, 100, 65, 60, 58, 66, 72, 79,
+        92, 105,
+        /* Size 16x8 */
+        32, 31, 31, 31, 32, 32, 34, 36, 38, 41, 44, 48, 53, 57, 61, 65, 31, 32,
+        32, 32, 32, 33, 34, 34, 37, 39, 41, 45, 49, 53, 56, 60, 32, 32, 33, 34,
+        34, 35, 37, 38, 40, 41, 43, 46, 50, 53, 56, 58, 35, 35, 34, 35, 36, 37,
+        41, 46, 47, 49, 51, 54, 57, 60, 63, 66, 39, 38, 37, 38, 39, 40, 44, 50,
+        52, 54, 57, 60, 64, 67, 69, 72, 44, 42, 41, 42, 42, 42, 48, 54, 57, 60,
+        63, 67, 71, 74, 77, 79, 53, 51, 49, 49, 49, 49, 54, 60, 64, 67, 71, 76,
+        82, 86, 89, 92, 65, 62, 59, 59, 58, 58, 63, 68, 72, 76, 79, 85, 92, 97,
+        100, 105,
+        /* Size 16x32 */
+        32, 31, 31, 31, 32, 32, 35, 36, 39, 44, 44, 51, 53, 58, 65, 65, 31, 32,
+        32, 32, 32, 32, 35, 35, 38, 42, 42, 49, 52, 56, 63, 63, 31, 32, 32, 32,
+        32, 32, 35, 35, 38, 42, 42, 49, 51, 55, 62, 62, 31, 32, 32, 32, 32, 32,
+        34, 35, 37, 41, 41, 48, 50, 54, 61, 61, 31, 32, 32, 32, 33, 33, 34, 34,
+        37, 41, 41, 47, 49, 53, 59, 59, 31, 32, 32, 32, 33, 33, 34, 34, 37, 41,
+        41, 47, 49, 53, 59, 59, 31, 32, 32, 33, 34, 34, 35, 36, 38, 42, 42, 48,
+        49, 53, 59, 59, 32, 32, 32, 33, 34, 34, 36, 36, 38, 42, 42, 48, 50, 53,
+        59, 59, 32, 32, 32, 33, 34, 34, 36, 37, 39, 42, 42, 48, 49, 53, 58, 58,
+        32, 32, 33, 34, 35, 35, 37, 38, 40, 42, 42, 48, 49, 52, 58, 58, 32, 32,
+        33, 34, 35, 35, 37, 38, 40, 42, 42, 48, 49, 52, 58, 58, 33, 33, 33, 35,
+        36, 36, 40, 41, 43, 46, 46, 52, 53, 56, 62, 62, 34, 34, 34, 35, 37, 37,
+        41, 42, 44, 48, 48, 53, 54, 57, 63, 63, 34, 34, 34, 35, 37, 37, 43, 44,
+        46, 50, 50, 55, 56, 59, 65, 65, 36, 35, 34, 36, 38, 38, 46, 48, 50, 54,
+        54, 58, 60, 63, 68, 68, 36, 35, 34, 36, 38, 38, 46, 48, 50, 54, 54, 58,
+        60, 63, 68, 68, 38, 37, 37, 38, 40, 40, 47, 50, 52, 57, 57, 62, 64, 67,
+        72, 72, 39, 38, 37, 39, 40, 40, 48, 50, 53, 58, 58, 63, 65, 68, 73, 73,
+        41, 39, 39, 40, 41, 41, 49, 51, 54, 60, 60, 66, 67, 70, 76, 76, 44, 41,
+        41, 42, 43, 43, 51, 53, 57, 63, 63, 69, 71, 74, 79, 79, 44, 41, 41, 42,
+        43, 43, 51, 53, 57, 63, 63, 69, 71, 74, 79, 79, 47, 44, 44, 44, 45, 45,
+        53, 56, 59, 66, 66, 73, 75, 78, 84, 84, 48, 45, 45, 45, 46, 46, 54, 56,
+        60, 67, 67, 74, 76, 79, 85, 85, 50, 47, 46, 47, 47, 47, 55, 58, 61, 68,
+        68, 76, 78, 82, 88, 88, 53, 50, 49, 50, 50, 50, 57, 60, 64, 71, 71, 79,
+        82, 86, 92, 92, 53, 50, 49, 50, 50, 50, 57, 60, 64, 71, 71, 79, 82, 86,
+        92, 92, 57, 54, 53, 53, 53, 53, 60, 63, 67, 74, 74, 83, 86, 90, 97, 97,
+        58, 55, 54, 54, 54, 54, 61, 63, 68, 75, 75, 84, 87, 91, 98, 98, 61, 57,
+        56, 56, 56, 56, 63, 65, 69, 77, 77, 86, 89, 93, 100, 100, 65, 61, 60,
+        59, 58, 58, 66, 68, 72, 79, 79, 89, 92, 97, 105, 105, 65, 61, 60, 59,
+        58, 58, 66, 68, 72, 79, 79, 89, 92, 97, 105, 105, 70, 65, 64, 63, 62,
+        62, 70, 72, 76, 83, 83, 93, 96, 101, 109, 109,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 33, 34, 34, 36, 36, 38, 39,
+        41, 44, 44, 47, 48, 50, 53, 53, 57, 58, 61, 65, 65, 70, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 37, 38, 39, 41, 41, 44,
+        45, 47, 50, 50, 54, 55, 57, 61, 61, 65, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 34, 34, 34, 34, 37, 37, 39, 41, 41, 44, 45, 46, 49, 49,
+        53, 54, 56, 60, 60, 64, 31, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 35,
+        35, 35, 36, 36, 38, 39, 40, 42, 42, 44, 45, 47, 50, 50, 53, 54, 56, 59,
+        59, 63, 32, 32, 32, 32, 33, 33, 34, 34, 34, 35, 35, 36, 37, 37, 38, 38,
+        40, 40, 41, 43, 43, 45, 46, 47, 50, 50, 53, 54, 56, 58, 58, 62, 32, 32,
+        32, 32, 33, 33, 34, 34, 34, 35, 35, 36, 37, 37, 38, 38, 40, 40, 41, 43,
+        43, 45, 46, 47, 50, 50, 53, 54, 56, 58, 58, 62, 35, 35, 35, 34, 34, 34,
+        35, 36, 36, 37, 37, 40, 41, 43, 46, 46, 47, 48, 49, 51, 51, 53, 54, 55,
+        57, 57, 60, 61, 63, 66, 66, 70, 36, 35, 35, 35, 34, 34, 36, 36, 37, 38,
+        38, 41, 42, 44, 48, 48, 50, 50, 51, 53, 53, 56, 56, 58, 60, 60, 63, 63,
+        65, 68, 68, 72, 39, 38, 38, 37, 37, 37, 38, 38, 39, 40, 40, 43, 44, 46,
+        50, 50, 52, 53, 54, 57, 57, 59, 60, 61, 64, 64, 67, 68, 69, 72, 72, 76,
+        44, 42, 42, 41, 41, 41, 42, 42, 42, 42, 42, 46, 48, 50, 54, 54, 57, 58,
+        60, 63, 63, 66, 67, 68, 71, 71, 74, 75, 77, 79, 79, 83, 44, 42, 42, 41,
+        41, 41, 42, 42, 42, 42, 42, 46, 48, 50, 54, 54, 57, 58, 60, 63, 63, 66,
+        67, 68, 71, 71, 74, 75, 77, 79, 79, 83, 51, 49, 49, 48, 47, 47, 48, 48,
+        48, 48, 48, 52, 53, 55, 58, 58, 62, 63, 66, 69, 69, 73, 74, 76, 79, 79,
+        83, 84, 86, 89, 89, 93, 53, 52, 51, 50, 49, 49, 49, 50, 49, 49, 49, 53,
+        54, 56, 60, 60, 64, 65, 67, 71, 71, 75, 76, 78, 82, 82, 86, 87, 89, 92,
+        92, 96, 58, 56, 55, 54, 53, 53, 53, 53, 53, 52, 52, 56, 57, 59, 63, 63,
+        67, 68, 70, 74, 74, 78, 79, 82, 86, 86, 90, 91, 93, 97, 97, 101, 65, 63,
+        62, 61, 59, 59, 59, 59, 58, 58, 58, 62, 63, 65, 68, 68, 72, 73, 76, 79,
+        79, 84, 85, 88, 92, 92, 97, 98, 100, 105, 105, 109, 65, 63, 62, 61, 59,
+        59, 59, 59, 58, 58, 58, 62, 63, 65, 68, 68, 72, 73, 76, 79, 79, 84, 85,
+        88, 92, 92, 97, 98, 100, 105, 105, 109,
+        /* Size 4x16 */
+        31, 32, 44, 58, 32, 32, 42, 55, 32, 33, 41, 53, 32, 34, 42, 53, 32, 34,
+        42, 53, 32, 35, 42, 52, 34, 37, 48, 57, 35, 38, 54, 63, 37, 40, 57, 67,
+        39, 41, 60, 70, 41, 43, 63, 74, 45, 46, 67, 79, 50, 50, 71, 86, 54, 53,
+        74, 90, 57, 56, 77, 93, 61, 58, 79, 97,
+        /* Size 16x4 */
+        31, 32, 32, 32, 32, 32, 34, 35, 37, 39, 41, 45, 50, 54, 57, 61, 32, 32,
+        33, 34, 34, 35, 37, 38, 40, 41, 43, 46, 50, 53, 56, 58, 44, 42, 41, 42,
+        42, 42, 48, 54, 57, 60, 63, 67, 71, 74, 77, 79, 58, 55, 53, 53, 53, 52,
+        57, 63, 67, 70, 74, 79, 86, 90, 93, 97,
+        /* Size 8x32 */
+        32, 31, 32, 35, 39, 44, 53, 65, 31, 32, 32, 35, 38, 42, 52, 63, 31, 32,
+        32, 35, 38, 42, 51, 62, 31, 32, 32, 34, 37, 41, 50, 61, 31, 32, 33, 34,
+        37, 41, 49, 59, 31, 32, 33, 34, 37, 41, 49, 59, 31, 32, 34, 35, 38, 42,
+        49, 59, 32, 32, 34, 36, 38, 42, 50, 59, 32, 32, 34, 36, 39, 42, 49, 58,
+        32, 33, 35, 37, 40, 42, 49, 58, 32, 33, 35, 37, 40, 42, 49, 58, 33, 33,
+        36, 40, 43, 46, 53, 62, 34, 34, 37, 41, 44, 48, 54, 63, 34, 34, 37, 43,
+        46, 50, 56, 65, 36, 34, 38, 46, 50, 54, 60, 68, 36, 34, 38, 46, 50, 54,
+        60, 68, 38, 37, 40, 47, 52, 57, 64, 72, 39, 37, 40, 48, 53, 58, 65, 73,
+        41, 39, 41, 49, 54, 60, 67, 76, 44, 41, 43, 51, 57, 63, 71, 79, 44, 41,
+        43, 51, 57, 63, 71, 79, 47, 44, 45, 53, 59, 66, 75, 84, 48, 45, 46, 54,
+        60, 67, 76, 85, 50, 46, 47, 55, 61, 68, 78, 88, 53, 49, 50, 57, 64, 71,
+        82, 92, 53, 49, 50, 57, 64, 71, 82, 92, 57, 53, 53, 60, 67, 74, 86, 97,
+        58, 54, 54, 61, 68, 75, 87, 98, 61, 56, 56, 63, 69, 77, 89, 100, 65, 60,
+        58, 66, 72, 79, 92, 105, 65, 60, 58, 66, 72, 79, 92, 105, 70, 64, 62,
+        70, 76, 83, 96, 109,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 33, 34, 34, 36, 36, 38, 39,
+        41, 44, 44, 47, 48, 50, 53, 53, 57, 58, 61, 65, 65, 70, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 37, 37, 39, 41, 41, 44,
+        45, 46, 49, 49, 53, 54, 56, 60, 60, 64, 32, 32, 32, 32, 33, 33, 34, 34,
+        34, 35, 35, 36, 37, 37, 38, 38, 40, 40, 41, 43, 43, 45, 46, 47, 50, 50,
+        53, 54, 56, 58, 58, 62, 35, 35, 35, 34, 34, 34, 35, 36, 36, 37, 37, 40,
+        41, 43, 46, 46, 47, 48, 49, 51, 51, 53, 54, 55, 57, 57, 60, 61, 63, 66,
+        66, 70, 39, 38, 38, 37, 37, 37, 38, 38, 39, 40, 40, 43, 44, 46, 50, 50,
+        52, 53, 54, 57, 57, 59, 60, 61, 64, 64, 67, 68, 69, 72, 72, 76, 44, 42,
+        42, 41, 41, 41, 42, 42, 42, 42, 42, 46, 48, 50, 54, 54, 57, 58, 60, 63,
+        63, 66, 67, 68, 71, 71, 74, 75, 77, 79, 79, 83, 53, 52, 51, 50, 49, 49,
+        49, 50, 49, 49, 49, 53, 54, 56, 60, 60, 64, 65, 67, 71, 71, 75, 76, 78,
+        82, 82, 86, 87, 89, 92, 92, 96, 65, 63, 62, 61, 59, 59, 59, 59, 58, 58,
+        58, 62, 63, 65, 68, 68, 72, 73, 76, 79, 79, 84, 85, 88, 92, 92, 97, 98,
+        100, 105, 105, 109 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 41, 46, 51, 41, 48, 48, 51, 46, 48, 58, 62, 51, 51, 62, 71,
+        /* Size 8x8 */
+        31, 31, 38, 44, 47, 48, 50, 55, 31, 32, 40, 44, 45, 46, 47, 52, 38, 40,
+        47, 47, 46, 46, 47, 50, 44, 44, 47, 50, 51, 51, 52, 54, 47, 45, 46, 51,
+        54, 56, 57, 60, 48, 46, 46, 51, 56, 61, 63, 66, 50, 47, 47, 52, 57, 63,
+        66, 70, 55, 52, 50, 54, 60, 66, 70, 76,
+        /* Size 16x16 */
+        32, 31, 30, 33, 34, 36, 41, 49, 48, 49, 49, 50, 52, 54, 55, 57, 31, 31,
+        31, 34, 36, 38, 42, 47, 47, 47, 47, 48, 50, 51, 53, 54, 30, 31, 32, 34,
+        37, 40, 42, 46, 45, 45, 45, 46, 47, 49, 50, 52, 33, 34, 34, 37, 40, 42,
+        44, 47, 46, 46, 45, 46, 47, 49, 50, 51, 34, 36, 37, 40, 42, 45, 46, 47,
+        46, 46, 45, 46, 47, 48, 49, 50, 36, 38, 40, 42, 45, 47, 47, 48, 47, 46,
+        45, 46, 47, 48, 49, 50, 41, 42, 42, 44, 46, 47, 48, 50, 50, 49, 49, 50,
+        50, 51, 52, 53, 49, 47, 46, 47, 47, 48, 50, 53, 53, 53, 53, 54, 54, 55,
+        56, 56, 48, 47, 45, 46, 46, 47, 50, 53, 54, 54, 55, 56, 57, 58, 58, 59,
+        49, 47, 45, 46, 46, 46, 49, 53, 54, 55, 57, 58, 59, 60, 60, 61, 49, 47,
+        45, 45, 45, 45, 49, 53, 55, 57, 58, 60, 61, 62, 63, 63, 50, 48, 46, 46,
+        46, 46, 50, 54, 56, 58, 60, 61, 63, 65, 66, 67, 52, 50, 47, 47, 47, 47,
+        50, 54, 57, 59, 61, 63, 66, 68, 69, 70, 54, 51, 49, 49, 48, 48, 51, 55,
+        58, 60, 62, 65, 68, 70, 71, 73, 55, 53, 50, 50, 49, 49, 52, 56, 58, 60,
+        63, 66, 69, 71, 73, 74, 57, 54, 52, 51, 50, 50, 53, 56, 59, 61, 63, 67,
+        70, 73, 74, 76,
+        /* Size 32x32 */
+        32, 31, 31, 31, 30, 30, 33, 33, 34, 36, 36, 40, 41, 44, 49, 49, 48, 48,
+        49, 49, 49, 50, 50, 51, 52, 52, 54, 54, 55, 57, 57, 59, 31, 31, 31, 31,
+        31, 31, 33, 34, 36, 38, 38, 41, 42, 44, 48, 48, 47, 47, 47, 47, 47, 48,
+        49, 49, 50, 50, 52, 52, 53, 55, 55, 57, 31, 31, 31, 31, 31, 31, 34, 34,
+        36, 38, 38, 41, 42, 44, 47, 47, 47, 47, 47, 47, 47, 48, 48, 49, 50, 50,
+        51, 52, 53, 54, 54, 56, 31, 31, 31, 31, 31, 31, 34, 35, 36, 39, 39, 41,
+        42, 44, 47, 47, 46, 46, 46, 46, 46, 47, 47, 48, 49, 49, 50, 51, 52, 53,
+        53, 55, 30, 31, 31, 31, 32, 32, 34, 35, 37, 40, 40, 42, 42, 44, 46, 46,
+        45, 45, 45, 45, 45, 46, 46, 47, 47, 47, 49, 49, 50, 52, 52, 54, 30, 31,
+        31, 31, 32, 32, 34, 35, 37, 40, 40, 42, 42, 44, 46, 46, 45, 45, 45, 45,
+        45, 46, 46, 47, 47, 47, 49, 49, 50, 52, 52, 54, 33, 33, 34, 34, 34, 34,
+        37, 38, 40, 42, 42, 44, 44, 45, 47, 47, 46, 46, 46, 45, 45, 46, 46, 47,
+        47, 47, 49, 49, 50, 51, 51, 53, 33, 34, 34, 35, 35, 35, 38, 39, 40, 43,
+        43, 44, 45, 46, 47, 47, 46, 46, 46, 45, 45, 46, 46, 47, 47, 47, 49, 49,
+        50, 51, 51, 53, 34, 36, 36, 36, 37, 37, 40, 40, 42, 45, 45, 45, 46, 46,
+        47, 47, 46, 46, 46, 45, 45, 46, 46, 47, 47, 47, 48, 49, 49, 50, 50, 52,
+        36, 38, 38, 39, 40, 40, 42, 43, 45, 47, 47, 47, 47, 47, 48, 48, 47, 46,
+        46, 45, 45, 46, 46, 46, 47, 47, 48, 48, 49, 50, 50, 51, 36, 38, 38, 39,
+        40, 40, 42, 43, 45, 47, 47, 47, 47, 47, 48, 48, 47, 46, 46, 45, 45, 46,
+        46, 46, 47, 47, 48, 48, 49, 50, 50, 51, 40, 41, 41, 41, 42, 42, 44, 44,
+        45, 47, 47, 48, 48, 49, 50, 50, 49, 49, 49, 48, 48, 49, 49, 49, 49, 49,
+        51, 51, 51, 52, 52, 54, 41, 42, 42, 42, 42, 42, 44, 45, 46, 47, 47, 48,
+        48, 49, 50, 50, 50, 49, 49, 49, 49, 50, 50, 50, 50, 50, 51, 52, 52, 53,
+        53, 55, 44, 44, 44, 44, 44, 44, 45, 46, 46, 47, 47, 49, 49, 50, 51, 51,
+        51, 51, 51, 51, 51, 51, 51, 51, 52, 52, 53, 53, 54, 54, 54, 56, 49, 48,
+        47, 47, 46, 46, 47, 47, 47, 48, 48, 50, 50, 51, 53, 53, 53, 53, 53, 53,
+        53, 54, 54, 54, 54, 54, 55, 55, 56, 56, 56, 58, 49, 48, 47, 47, 46, 46,
+        47, 47, 47, 48, 48, 50, 50, 51, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54,
+        54, 54, 55, 55, 56, 56, 56, 58, 48, 47, 47, 46, 45, 45, 46, 46, 46, 47,
+        47, 49, 50, 51, 53, 53, 54, 54, 54, 55, 55, 56, 56, 56, 57, 57, 58, 58,
+        58, 59, 59, 60, 48, 47, 47, 46, 45, 45, 46, 46, 46, 46, 46, 49, 49, 51,
+        53, 53, 54, 54, 55, 55, 55, 56, 56, 57, 57, 57, 58, 58, 59, 60, 60, 61,
+        49, 47, 47, 46, 45, 45, 46, 46, 46, 46, 46, 49, 49, 51, 53, 53, 54, 55,
+        55, 57, 57, 57, 58, 58, 59, 59, 60, 60, 60, 61, 61, 63, 49, 47, 47, 46,
+        45, 45, 45, 45, 45, 45, 45, 48, 49, 51, 53, 53, 55, 55, 57, 58, 58, 59,
+        60, 60, 61, 61, 62, 62, 63, 63, 63, 65, 49, 47, 47, 46, 45, 45, 45, 45,
+        45, 45, 45, 48, 49, 51, 53, 53, 55, 55, 57, 58, 58, 59, 60, 60, 61, 61,
+        62, 62, 63, 63, 63, 65, 50, 48, 48, 47, 46, 46, 46, 46, 46, 46, 46, 49,
+        50, 51, 54, 54, 56, 56, 57, 59, 59, 61, 61, 62, 63, 63, 64, 64, 65, 66,
+        66, 67, 50, 49, 48, 47, 46, 46, 46, 46, 46, 46, 46, 49, 50, 51, 54, 54,
+        56, 56, 58, 60, 60, 61, 61, 62, 63, 63, 65, 65, 66, 67, 67, 68, 51, 49,
+        49, 48, 47, 47, 47, 47, 47, 46, 46, 49, 50, 51, 54, 54, 56, 57, 58, 60,
+        60, 62, 62, 63, 65, 65, 66, 66, 67, 68, 68, 70, 52, 50, 50, 49, 47, 47,
+        47, 47, 47, 47, 47, 49, 50, 52, 54, 54, 57, 57, 59, 61, 61, 63, 63, 65,
+        66, 66, 68, 68, 69, 70, 70, 72, 52, 50, 50, 49, 47, 47, 47, 47, 47, 47,
+        47, 49, 50, 52, 54, 54, 57, 57, 59, 61, 61, 63, 63, 65, 66, 66, 68, 68,
+        69, 70, 70, 72, 54, 52, 51, 50, 49, 49, 49, 49, 48, 48, 48, 51, 51, 53,
+        55, 55, 58, 58, 60, 62, 62, 64, 65, 66, 68, 68, 70, 70, 71, 73, 73, 74,
+        54, 52, 52, 51, 49, 49, 49, 49, 49, 48, 48, 51, 52, 53, 55, 55, 58, 58,
+        60, 62, 62, 64, 65, 66, 68, 68, 70, 71, 72, 73, 73, 75, 55, 53, 53, 52,
+        50, 50, 50, 50, 49, 49, 49, 51, 52, 54, 56, 56, 58, 59, 60, 63, 63, 65,
+        66, 67, 69, 69, 71, 72, 73, 74, 74, 76, 57, 55, 54, 53, 52, 52, 51, 51,
+        50, 50, 50, 52, 53, 54, 56, 56, 59, 60, 61, 63, 63, 66, 67, 68, 70, 70,
+        73, 73, 74, 76, 76, 78, 57, 55, 54, 53, 52, 52, 51, 51, 50, 50, 50, 52,
+        53, 54, 56, 56, 59, 60, 61, 63, 63, 66, 67, 68, 70, 70, 73, 73, 74, 76,
+        76, 78, 59, 57, 56, 55, 54, 54, 53, 53, 52, 51, 51, 54, 55, 56, 58, 58,
+        60, 61, 63, 65, 65, 67, 68, 70, 72, 72, 74, 75, 76, 78, 78, 80,
+        /* Size 4x8 */
+        31, 38, 47, 52, 32, 40, 45, 49, 39, 47, 45, 48, 44, 47, 51, 53, 46, 47,
+        56, 58, 47, 46, 59, 64, 48, 47, 61, 68, 53, 50, 64, 73,
+        /* Size 8x4 */
+        31, 32, 39, 44, 46, 47, 48, 53, 38, 40, 47, 47, 47, 46, 47, 50, 47, 45,
+        45, 51, 56, 59, 61, 64, 52, 49, 48, 53, 58, 64, 68, 73,
+        /* Size 8x16 */
+        32, 31, 37, 45, 48, 49, 52, 57, 31, 31, 38, 45, 47, 47, 50, 54, 30, 32,
+        40, 44, 45, 45, 48, 52, 33, 35, 42, 46, 46, 45, 47, 51, 35, 37, 44, 46,
+        46, 45, 47, 51, 37, 40, 47, 47, 47, 45, 47, 50, 42, 43, 47, 49, 50, 49,
+        50, 53, 49, 46, 48, 52, 53, 53, 54, 57, 48, 46, 47, 51, 54, 55, 57, 59,
+        48, 45, 46, 51, 54, 57, 59, 61, 49, 45, 46, 51, 55, 58, 61, 64, 50, 46,
+        46, 52, 56, 59, 64, 67, 52, 48, 47, 53, 57, 61, 66, 71, 54, 49, 48, 54,
+        58, 62, 68, 73, 55, 51, 49, 54, 58, 63, 69, 74, 57, 52, 50, 55, 59, 64,
+        70, 76,
+        /* Size 16x8 */
+        32, 31, 30, 33, 35, 37, 42, 49, 48, 48, 49, 50, 52, 54, 55, 57, 31, 31,
+        32, 35, 37, 40, 43, 46, 46, 45, 45, 46, 48, 49, 51, 52, 37, 38, 40, 42,
+        44, 47, 47, 48, 47, 46, 46, 46, 47, 48, 49, 50, 45, 45, 44, 46, 46, 47,
+        49, 52, 51, 51, 51, 52, 53, 54, 54, 55, 48, 47, 45, 46, 46, 47, 50, 53,
+        54, 54, 55, 56, 57, 58, 58, 59, 49, 47, 45, 45, 45, 45, 49, 53, 55, 57,
+        58, 59, 61, 62, 63, 64, 52, 50, 48, 47, 47, 47, 50, 54, 57, 59, 61, 64,
+        66, 68, 69, 70, 57, 54, 52, 51, 51, 50, 53, 57, 59, 61, 64, 67, 71, 73,
+        74, 76,
+        /* Size 16x32 */
+        32, 31, 31, 33, 37, 37, 45, 48, 48, 49, 49, 51, 52, 54, 57, 57, 31, 31,
+        31, 34, 38, 38, 45, 47, 47, 47, 47, 50, 50, 52, 55, 55, 31, 31, 31, 34,
+        38, 38, 45, 47, 47, 47, 47, 49, 50, 51, 54, 54, 31, 31, 32, 34, 39, 39,
+        45, 46, 46, 46, 46, 48, 49, 51, 53, 53, 30, 32, 32, 35, 40, 40, 44, 46,
+        45, 45, 45, 47, 48, 49, 52, 52, 30, 32, 32, 35, 40, 40, 44, 46, 45, 45,
+        45, 47, 48, 49, 52, 52, 33, 34, 35, 37, 42, 42, 46, 47, 46, 45, 45, 47,
+        47, 49, 51, 51, 33, 35, 36, 38, 43, 43, 46, 47, 46, 46, 46, 47, 47, 49,
+        51, 51, 35, 37, 37, 40, 44, 44, 46, 47, 46, 45, 45, 47, 47, 48, 51, 51,
+        37, 39, 40, 43, 47, 47, 47, 47, 47, 45, 45, 46, 47, 48, 50, 50, 37, 39,
+        40, 43, 47, 47, 47, 47, 47, 45, 45, 46, 47, 48, 50, 50, 41, 42, 42, 44,
+        47, 47, 49, 49, 49, 48, 48, 49, 50, 51, 52, 52, 42, 42, 43, 44, 47, 47,
+        49, 50, 50, 49, 49, 50, 50, 51, 53, 53, 44, 44, 44, 45, 47, 47, 50, 51,
+        51, 51, 51, 52, 52, 53, 54, 54, 49, 47, 46, 47, 48, 48, 52, 53, 53, 53,
+        53, 54, 54, 55, 57, 57, 49, 47, 46, 47, 48, 48, 52, 53, 53, 53, 53, 54,
+        54, 55, 57, 57, 48, 46, 46, 46, 47, 47, 51, 53, 54, 55, 55, 56, 57, 58,
+        59, 59, 48, 46, 46, 46, 47, 47, 51, 53, 54, 56, 56, 57, 57, 58, 60, 60,
+        48, 46, 45, 46, 46, 46, 51, 53, 54, 57, 57, 58, 59, 60, 61, 61, 49, 46,
+        45, 45, 46, 46, 51, 53, 55, 58, 58, 61, 61, 62, 64, 64, 49, 46, 45, 45,
+        46, 46, 51, 53, 55, 58, 58, 61, 61, 62, 64, 64, 50, 47, 46, 46, 46, 46,
+        52, 54, 56, 59, 59, 62, 63, 64, 66, 66, 50, 47, 46, 46, 46, 46, 52, 54,
+        56, 59, 59, 63, 64, 65, 67, 67, 51, 48, 47, 47, 47, 47, 52, 54, 56, 60,
+        60, 64, 65, 66, 68, 68, 52, 48, 48, 47, 47, 47, 53, 54, 57, 61, 61, 65,
+        66, 68, 71, 71, 52, 48, 48, 47, 47, 47, 53, 54, 57, 61, 61, 65, 66, 68,
+        71, 71, 54, 50, 49, 49, 48, 48, 54, 55, 58, 62, 62, 67, 68, 70, 73, 73,
+        54, 51, 50, 49, 49, 49, 54, 55, 58, 62, 62, 67, 68, 70, 73, 73, 55, 51,
+        51, 50, 49, 49, 54, 56, 58, 63, 63, 68, 69, 71, 74, 74, 57, 53, 52, 51,
+        50, 50, 55, 56, 59, 64, 64, 69, 70, 73, 76, 76, 57, 53, 52, 51, 50, 50,
+        55, 56, 59, 64, 64, 69, 70, 73, 76, 76, 59, 55, 54, 53, 52, 52, 57, 58,
+        61, 65, 65, 70, 72, 74, 78, 78,
+        /* Size 32x16 */
+        32, 31, 31, 31, 30, 30, 33, 33, 35, 37, 37, 41, 42, 44, 49, 49, 48, 48,
+        48, 49, 49, 50, 50, 51, 52, 52, 54, 54, 55, 57, 57, 59, 31, 31, 31, 31,
+        32, 32, 34, 35, 37, 39, 39, 42, 42, 44, 47, 47, 46, 46, 46, 46, 46, 47,
+        47, 48, 48, 48, 50, 51, 51, 53, 53, 55, 31, 31, 31, 32, 32, 32, 35, 36,
+        37, 40, 40, 42, 43, 44, 46, 46, 46, 46, 45, 45, 45, 46, 46, 47, 48, 48,
+        49, 50, 51, 52, 52, 54, 33, 34, 34, 34, 35, 35, 37, 38, 40, 43, 43, 44,
+        44, 45, 47, 47, 46, 46, 46, 45, 45, 46, 46, 47, 47, 47, 49, 49, 50, 51,
+        51, 53, 37, 38, 38, 39, 40, 40, 42, 43, 44, 47, 47, 47, 47, 47, 48, 48,
+        47, 47, 46, 46, 46, 46, 46, 47, 47, 47, 48, 49, 49, 50, 50, 52, 37, 38,
+        38, 39, 40, 40, 42, 43, 44, 47, 47, 47, 47, 47, 48, 48, 47, 47, 46, 46,
+        46, 46, 46, 47, 47, 47, 48, 49, 49, 50, 50, 52, 45, 45, 45, 45, 44, 44,
+        46, 46, 46, 47, 47, 49, 49, 50, 52, 52, 51, 51, 51, 51, 51, 52, 52, 52,
+        53, 53, 54, 54, 54, 55, 55, 57, 48, 47, 47, 46, 46, 46, 47, 47, 47, 47,
+        47, 49, 50, 51, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 54, 55, 55,
+        56, 56, 56, 58, 48, 47, 47, 46, 45, 45, 46, 46, 46, 47, 47, 49, 50, 51,
+        53, 53, 54, 54, 54, 55, 55, 56, 56, 56, 57, 57, 58, 58, 58, 59, 59, 61,
+        49, 47, 47, 46, 45, 45, 45, 46, 45, 45, 45, 48, 49, 51, 53, 53, 55, 56,
+        57, 58, 58, 59, 59, 60, 61, 61, 62, 62, 63, 64, 64, 65, 49, 47, 47, 46,
+        45, 45, 45, 46, 45, 45, 45, 48, 49, 51, 53, 53, 55, 56, 57, 58, 58, 59,
+        59, 60, 61, 61, 62, 62, 63, 64, 64, 65, 51, 50, 49, 48, 47, 47, 47, 47,
+        47, 46, 46, 49, 50, 52, 54, 54, 56, 57, 58, 61, 61, 62, 63, 64, 65, 65,
+        67, 67, 68, 69, 69, 70, 52, 50, 50, 49, 48, 48, 47, 47, 47, 47, 47, 50,
+        50, 52, 54, 54, 57, 57, 59, 61, 61, 63, 64, 65, 66, 66, 68, 68, 69, 70,
+        70, 72, 54, 52, 51, 51, 49, 49, 49, 49, 48, 48, 48, 51, 51, 53, 55, 55,
+        58, 58, 60, 62, 62, 64, 65, 66, 68, 68, 70, 70, 71, 73, 73, 74, 57, 55,
+        54, 53, 52, 52, 51, 51, 51, 50, 50, 52, 53, 54, 57, 57, 59, 60, 61, 64,
+        64, 66, 67, 68, 71, 71, 73, 73, 74, 76, 76, 78, 57, 55, 54, 53, 52, 52,
+        51, 51, 51, 50, 50, 52, 53, 54, 57, 57, 59, 60, 61, 64, 64, 66, 67, 68,
+        71, 71, 73, 73, 74, 76, 76, 78,
+        /* Size 4x16 */
+        31, 37, 49, 54, 31, 38, 47, 51, 32, 40, 45, 49, 34, 42, 45, 49, 37, 44,
+        45, 48, 39, 47, 45, 48, 42, 47, 49, 51, 47, 48, 53, 55, 46, 47, 55, 58,
+        46, 46, 57, 60, 46, 46, 58, 62, 47, 46, 59, 65, 48, 47, 61, 68, 50, 48,
+        62, 70, 51, 49, 63, 71, 53, 50, 64, 73,
+        /* Size 16x4 */
+        31, 31, 32, 34, 37, 39, 42, 47, 46, 46, 46, 47, 48, 50, 51, 53, 37, 38,
+        40, 42, 44, 47, 47, 48, 47, 46, 46, 46, 47, 48, 49, 50, 49, 47, 45, 45,
+        45, 45, 49, 53, 55, 57, 58, 59, 61, 62, 63, 64, 54, 51, 49, 49, 48, 48,
+        51, 55, 58, 60, 62, 65, 68, 70, 71, 73,
+        /* Size 8x32 */
+        32, 31, 37, 45, 48, 49, 52, 57, 31, 31, 38, 45, 47, 47, 50, 55, 31, 31,
+        38, 45, 47, 47, 50, 54, 31, 32, 39, 45, 46, 46, 49, 53, 30, 32, 40, 44,
+        45, 45, 48, 52, 30, 32, 40, 44, 45, 45, 48, 52, 33, 35, 42, 46, 46, 45,
+        47, 51, 33, 36, 43, 46, 46, 46, 47, 51, 35, 37, 44, 46, 46, 45, 47, 51,
+        37, 40, 47, 47, 47, 45, 47, 50, 37, 40, 47, 47, 47, 45, 47, 50, 41, 42,
+        47, 49, 49, 48, 50, 52, 42, 43, 47, 49, 50, 49, 50, 53, 44, 44, 47, 50,
+        51, 51, 52, 54, 49, 46, 48, 52, 53, 53, 54, 57, 49, 46, 48, 52, 53, 53,
+        54, 57, 48, 46, 47, 51, 54, 55, 57, 59, 48, 46, 47, 51, 54, 56, 57, 60,
+        48, 45, 46, 51, 54, 57, 59, 61, 49, 45, 46, 51, 55, 58, 61, 64, 49, 45,
+        46, 51, 55, 58, 61, 64, 50, 46, 46, 52, 56, 59, 63, 66, 50, 46, 46, 52,
+        56, 59, 64, 67, 51, 47, 47, 52, 56, 60, 65, 68, 52, 48, 47, 53, 57, 61,
+        66, 71, 52, 48, 47, 53, 57, 61, 66, 71, 54, 49, 48, 54, 58, 62, 68, 73,
+        54, 50, 49, 54, 58, 62, 68, 73, 55, 51, 49, 54, 58, 63, 69, 74, 57, 52,
+        50, 55, 59, 64, 70, 76, 57, 52, 50, 55, 59, 64, 70, 76, 59, 54, 52, 57,
+        61, 65, 72, 78,
+        /* Size 32x8 */
+        32, 31, 31, 31, 30, 30, 33, 33, 35, 37, 37, 41, 42, 44, 49, 49, 48, 48,
+        48, 49, 49, 50, 50, 51, 52, 52, 54, 54, 55, 57, 57, 59, 31, 31, 31, 32,
+        32, 32, 35, 36, 37, 40, 40, 42, 43, 44, 46, 46, 46, 46, 45, 45, 45, 46,
+        46, 47, 48, 48, 49, 50, 51, 52, 52, 54, 37, 38, 38, 39, 40, 40, 42, 43,
+        44, 47, 47, 47, 47, 47, 48, 48, 47, 47, 46, 46, 46, 46, 46, 47, 47, 47,
+        48, 49, 49, 50, 50, 52, 45, 45, 45, 45, 44, 44, 46, 46, 46, 47, 47, 49,
+        49, 50, 52, 52, 51, 51, 51, 51, 51, 52, 52, 52, 53, 53, 54, 54, 54, 55,
+        55, 57, 48, 47, 47, 46, 45, 45, 46, 46, 46, 47, 47, 49, 50, 51, 53, 53,
+        54, 54, 54, 55, 55, 56, 56, 56, 57, 57, 58, 58, 58, 59, 59, 61, 49, 47,
+        47, 46, 45, 45, 45, 46, 45, 45, 45, 48, 49, 51, 53, 53, 55, 56, 57, 58,
+        58, 59, 59, 60, 61, 61, 62, 62, 63, 64, 64, 65, 52, 50, 50, 49, 48, 48,
+        47, 47, 47, 47, 47, 50, 50, 52, 54, 54, 57, 57, 59, 61, 61, 63, 64, 65,
+        66, 66, 68, 68, 69, 70, 70, 72, 57, 55, 54, 53, 52, 52, 51, 51, 51, 50,
+        50, 52, 53, 54, 57, 57, 59, 60, 61, 64, 64, 66, 67, 68, 71, 71, 73, 73,
+        74, 76, 76, 78 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 32, 38, 51, 32, 35, 40, 49, 38, 40, 54, 64, 51, 49, 64, 81,
+        /* Size 8x8 */
+        31, 32, 32, 34, 35, 41, 47, 53, 32, 32, 32, 33, 34, 40, 44, 50, 32, 32,
+        34, 35, 37, 41, 45, 51, 34, 33, 35, 39, 42, 47, 51, 55, 35, 34, 37, 42,
+        48, 53, 57, 61, 41, 40, 41, 47, 53, 60, 65, 70, 47, 44, 45, 51, 57, 65,
+        71, 77, 53, 50, 51, 55, 61, 70, 77, 85,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 32, 32, 34, 36, 38, 39, 44, 47, 49, 54, 59, 31, 32,
+        32, 32, 32, 32, 33, 34, 35, 37, 38, 42, 45, 47, 51, 56, 31, 32, 32, 32,
+        32, 32, 33, 33, 34, 36, 37, 41, 44, 46, 50, 54, 31, 32, 32, 32, 32, 33,
+        33, 34, 35, 36, 38, 41, 44, 45, 49, 54, 31, 32, 32, 32, 33, 34, 34, 35,
+        36, 38, 39, 42, 45, 46, 50, 54, 32, 32, 32, 33, 34, 35, 36, 37, 38, 39,
+        40, 42, 45, 46, 49, 53, 32, 33, 33, 33, 34, 36, 36, 38, 40, 41, 42, 44,
+        47, 48, 51, 55, 34, 34, 33, 34, 35, 37, 38, 39, 42, 44, 45, 47, 50, 51,
+        54, 58, 36, 35, 34, 35, 36, 38, 40, 42, 48, 50, 50, 54, 56, 57, 60, 64,
+        38, 37, 36, 36, 38, 39, 41, 44, 50, 51, 52, 56, 58, 60, 63, 67, 39, 38,
+        37, 38, 39, 40, 42, 45, 50, 52, 54, 58, 60, 62, 65, 69, 44, 42, 41, 41,
+        42, 42, 44, 47, 54, 56, 58, 63, 66, 68, 71, 75, 47, 45, 44, 44, 45, 45,
+        47, 50, 56, 58, 60, 66, 69, 71, 75, 79, 49, 47, 46, 45, 46, 46, 48, 51,
+        57, 60, 62, 68, 71, 73, 77, 81, 54, 51, 50, 49, 50, 49, 51, 54, 60, 63,
+        65, 71, 75, 77, 82, 87, 59, 56, 54, 54, 54, 53, 55, 58, 64, 67, 69, 75,
+        79, 81, 87, 92,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 34, 34, 35, 36, 36,
+        38, 39, 39, 42, 44, 44, 47, 48, 49, 53, 54, 55, 59, 59, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 35, 35, 37, 39, 39, 41,
+        43, 43, 46, 47, 48, 51, 52, 53, 57, 57, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 34, 34, 34, 35, 35, 37, 38, 38, 41, 42, 43, 45, 46,
+        47, 51, 51, 53, 56, 56, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 34, 34, 34, 35, 35, 37, 38, 38, 41, 42, 42, 45, 46, 47, 51, 51, 52,
+        56, 56, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34,
+        34, 34, 36, 37, 37, 40, 41, 41, 44, 45, 46, 49, 50, 51, 54, 54, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 36, 37,
+        37, 40, 41, 41, 44, 44, 45, 49, 49, 50, 54, 54, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 35, 35, 36, 38, 38, 40, 41, 41,
+        44, 45, 45, 49, 49, 50, 54, 54, 31, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        34, 34, 34, 35, 35, 35, 36, 36, 38, 39, 39, 41, 42, 42, 44, 45, 46, 49,
+        50, 51, 54, 54, 31, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 35,
+        35, 36, 36, 36, 38, 39, 39, 41, 42, 42, 45, 45, 46, 49, 50, 51, 54, 54,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 35, 35, 35, 36, 37, 37,
+        38, 39, 39, 41, 42, 42, 45, 45, 46, 49, 49, 51, 54, 54, 32, 32, 32, 32,
+        32, 32, 33, 34, 34, 34, 35, 35, 36, 37, 37, 37, 38, 38, 39, 40, 40, 42,
+        42, 43, 45, 46, 46, 49, 49, 50, 53, 53, 32, 32, 32, 32, 32, 32, 33, 34,
+        34, 34, 35, 35, 36, 37, 37, 37, 38, 38, 39, 40, 40, 42, 42, 43, 45, 46,
+        46, 49, 49, 50, 53, 53, 32, 33, 33, 33, 33, 33, 33, 34, 34, 35, 36, 36,
+        36, 38, 38, 39, 40, 40, 41, 42, 42, 44, 44, 45, 47, 47, 48, 51, 51, 52,
+        55, 55, 34, 34, 34, 34, 33, 33, 34, 35, 35, 35, 37, 37, 38, 39, 39, 41,
+        42, 42, 44, 45, 45, 47, 47, 48, 50, 51, 51, 54, 54, 55, 58, 58, 34, 34,
+        34, 34, 33, 33, 34, 35, 35, 35, 37, 37, 38, 39, 39, 41, 42, 42, 44, 45,
+        45, 47, 47, 48, 50, 51, 51, 54, 54, 55, 58, 58, 35, 34, 34, 34, 34, 34,
+        34, 35, 36, 36, 37, 37, 39, 41, 41, 43, 45, 45, 47, 47, 47, 49, 50, 51,
+        53, 53, 54, 57, 57, 58, 61, 61, 36, 35, 35, 35, 34, 34, 35, 36, 36, 37,
+        38, 38, 40, 42, 42, 45, 48, 48, 50, 50, 50, 53, 54, 54, 56, 57, 57, 59,
+        60, 61, 64, 64, 36, 35, 35, 35, 34, 34, 35, 36, 36, 37, 38, 38, 40, 42,
+        42, 45, 48, 48, 50, 50, 50, 53, 54, 54, 56, 57, 57, 59, 60, 61, 64, 64,
+        38, 37, 37, 37, 36, 36, 36, 38, 38, 38, 39, 39, 41, 44, 44, 47, 50, 50,
+        51, 52, 52, 55, 56, 56, 58, 59, 60, 62, 63, 64, 67, 67, 39, 39, 38, 38,
+        37, 37, 38, 39, 39, 39, 40, 40, 42, 45, 45, 47, 50, 50, 52, 54, 54, 56,
+        58, 58, 60, 61, 62, 64, 65, 66, 69, 69, 39, 39, 38, 38, 37, 37, 38, 39,
+        39, 39, 40, 40, 42, 45, 45, 47, 50, 50, 52, 54, 54, 56, 58, 58, 60, 61,
+        62, 64, 65, 66, 69, 69, 42, 41, 41, 41, 40, 40, 40, 41, 41, 41, 42, 42,
+        44, 47, 47, 49, 53, 53, 55, 56, 56, 60, 61, 62, 64, 65, 66, 69, 69, 70,
+        73, 73, 44, 43, 42, 42, 41, 41, 41, 42, 42, 42, 42, 42, 44, 47, 47, 50,
+        54, 54, 56, 58, 58, 61, 63, 64, 66, 67, 68, 71, 71, 72, 75, 75, 44, 43,
+        43, 42, 41, 41, 41, 42, 42, 42, 43, 43, 45, 48, 48, 51, 54, 54, 56, 58,
+        58, 62, 64, 64, 66, 67, 68, 71, 72, 73, 76, 76, 47, 46, 45, 45, 44, 44,
+        44, 44, 45, 45, 45, 45, 47, 50, 50, 53, 56, 56, 58, 60, 60, 64, 66, 66,
+        69, 70, 71, 74, 75, 76, 79, 79, 48, 47, 46, 46, 45, 44, 45, 45, 45, 45,
+        46, 46, 47, 51, 51, 53, 57, 57, 59, 61, 61, 65, 67, 67, 70, 71, 72, 75,
+        76, 77, 80, 80, 49, 48, 47, 47, 46, 45, 45, 46, 46, 46, 46, 46, 48, 51,
+        51, 54, 57, 57, 60, 62, 62, 66, 68, 68, 71, 72, 73, 77, 77, 78, 81, 81,
+        53, 51, 51, 51, 49, 49, 49, 49, 49, 49, 49, 49, 51, 54, 54, 57, 59, 59,
+        62, 64, 64, 69, 71, 71, 74, 75, 77, 81, 81, 83, 86, 86, 54, 52, 51, 51,
+        50, 49, 49, 50, 50, 49, 49, 49, 51, 54, 54, 57, 60, 60, 63, 65, 65, 69,
+        71, 72, 75, 76, 77, 81, 82, 83, 87, 87, 55, 53, 53, 52, 51, 50, 50, 51,
+        51, 51, 50, 50, 52, 55, 55, 58, 61, 61, 64, 66, 66, 70, 72, 73, 76, 77,
+        78, 83, 83, 85, 88, 88, 59, 57, 56, 56, 54, 54, 54, 54, 54, 54, 53, 53,
+        55, 58, 58, 61, 64, 64, 67, 69, 69, 73, 75, 76, 79, 80, 81, 86, 87, 88,
+        92, 92, 59, 57, 56, 56, 54, 54, 54, 54, 54, 54, 53, 53, 55, 58, 58, 61,
+        64, 64, 67, 69, 69, 73, 75, 76, 79, 80, 81, 86, 87, 88, 92, 92,
+        /* Size 4x8 */
+        32, 32, 37, 52, 32, 33, 36, 49, 32, 34, 38, 49, 34, 37, 44, 54, 35, 38,
+        49, 60, 40, 42, 55, 69, 46, 46, 59, 76, 52, 51, 64, 83,
+        /* Size 8x4 */
+        32, 32, 32, 34, 35, 40, 46, 52, 32, 33, 34, 37, 38, 42, 46, 51, 37, 36,
+        38, 44, 49, 55, 59, 64, 52, 49, 49, 54, 60, 69, 76, 83,
+        /* Size 8x16 */
+        32, 31, 32, 32, 36, 44, 47, 53, 31, 32, 32, 33, 35, 42, 45, 51, 31, 32,
+        32, 33, 35, 41, 44, 49, 31, 32, 33, 33, 35, 41, 44, 49, 32, 32, 34, 34,
+        36, 42, 45, 50, 32, 33, 35, 36, 38, 42, 45, 49, 32, 33, 35, 36, 40, 44,
+        47, 51, 34, 34, 36, 38, 42, 48, 50, 54, 36, 34, 37, 40, 48, 54, 56, 60,
+        38, 36, 39, 41, 49, 56, 58, 63, 39, 37, 40, 42, 50, 58, 60, 65, 44, 41,
+        42, 45, 53, 63, 66, 71, 47, 44, 45, 47, 56, 66, 69, 75, 49, 46, 47, 48,
+        57, 67, 71, 77, 53, 49, 50, 51, 60, 71, 75, 82, 58, 54, 54, 55, 63, 75,
+        79, 87,
+        /* Size 16x8 */
+        32, 31, 31, 31, 32, 32, 32, 34, 36, 38, 39, 44, 47, 49, 53, 58, 31, 32,
+        32, 32, 32, 33, 33, 34, 34, 36, 37, 41, 44, 46, 49, 54, 32, 32, 32, 33,
+        34, 35, 35, 36, 37, 39, 40, 42, 45, 47, 50, 54, 32, 33, 33, 33, 34, 36,
+        36, 38, 40, 41, 42, 45, 47, 48, 51, 55, 36, 35, 35, 35, 36, 38, 40, 42,
+        48, 49, 50, 53, 56, 57, 60, 63, 44, 42, 41, 41, 42, 42, 44, 48, 54, 56,
+        58, 63, 66, 67, 71, 75, 47, 45, 44, 44, 45, 45, 47, 50, 56, 58, 60, 66,
+        69, 71, 75, 79, 53, 51, 49, 49, 50, 49, 51, 54, 60, 63, 65, 71, 75, 77,
+        82, 87,
+        /* Size 16x32 */
+        32, 31, 31, 31, 32, 32, 32, 35, 36, 38, 44, 44, 47, 53, 53, 59, 31, 32,
+        32, 32, 32, 32, 33, 35, 35, 37, 43, 43, 46, 52, 52, 57, 31, 32, 32, 32,
+        32, 32, 33, 35, 35, 37, 42, 42, 45, 51, 51, 56, 31, 32, 32, 32, 32, 32,
+        33, 35, 35, 37, 42, 42, 45, 51, 51, 56, 31, 32, 32, 32, 32, 32, 33, 34,
+        35, 36, 41, 41, 44, 49, 49, 54, 31, 32, 32, 32, 32, 33, 33, 34, 34, 36,
+        41, 41, 44, 49, 49, 54, 31, 32, 32, 32, 33, 33, 33, 35, 35, 36, 41, 41,
+        44, 49, 49, 54, 32, 32, 32, 32, 33, 34, 34, 36, 36, 38, 42, 42, 45, 49,
+        49, 54, 32, 32, 32, 33, 34, 34, 34, 36, 36, 38, 42, 42, 45, 50, 50, 54,
+        32, 32, 32, 33, 34, 34, 35, 37, 37, 38, 42, 42, 45, 49, 49, 54, 32, 32,
+        33, 33, 35, 35, 36, 38, 38, 39, 42, 42, 45, 49, 49, 53, 32, 32, 33, 33,
+        35, 35, 36, 38, 38, 39, 42, 42, 45, 49, 49, 53, 32, 33, 33, 33, 35, 36,
+        36, 39, 40, 41, 44, 44, 47, 51, 51, 55, 34, 34, 34, 34, 36, 37, 38, 42,
+        42, 44, 48, 48, 50, 54, 54, 58, 34, 34, 34, 34, 36, 37, 38, 42, 42, 44,
+        48, 48, 50, 54, 54, 58, 35, 34, 34, 34, 37, 37, 39, 44, 45, 46, 50, 50,
+        53, 57, 57, 61, 36, 35, 34, 35, 37, 38, 40, 47, 48, 49, 54, 54, 56, 60,
+        60, 64, 36, 35, 34, 35, 37, 38, 40, 47, 48, 49, 54, 54, 56, 60, 60, 64,
+        38, 37, 36, 37, 39, 40, 41, 48, 49, 51, 56, 56, 58, 63, 63, 67, 39, 38,
+        37, 38, 40, 40, 42, 49, 50, 52, 58, 58, 60, 65, 65, 69, 39, 38, 37, 38,
+        40, 40, 42, 49, 50, 52, 58, 58, 60, 65, 65, 69, 42, 40, 40, 40, 42, 42,
+        44, 51, 52, 55, 61, 61, 64, 69, 69, 73, 44, 42, 41, 41, 42, 43, 45, 52,
+        53, 56, 63, 63, 66, 71, 71, 75, 44, 42, 41, 41, 43, 43, 45, 52, 54, 56,
+        63, 63, 66, 72, 72, 76, 47, 45, 44, 44, 45, 45, 47, 54, 56, 58, 66, 66,
+        69, 75, 75, 79, 48, 46, 45, 45, 46, 46, 48, 55, 56, 59, 67, 67, 70, 76,
+        76, 80, 49, 47, 46, 46, 47, 47, 48, 56, 57, 60, 67, 67, 71, 77, 77, 81,
+        53, 50, 49, 49, 49, 49, 51, 58, 59, 62, 71, 71, 74, 81, 81, 86, 53, 51,
+        49, 49, 50, 50, 51, 59, 60, 63, 71, 71, 75, 82, 82, 87, 55, 52, 51, 51,
+        51, 51, 53, 60, 61, 64, 72, 72, 76, 83, 83, 88, 58, 55, 54, 54, 54, 54,
+        55, 62, 63, 67, 75, 75, 79, 87, 87, 92, 58, 55, 54, 54, 54, 54, 55, 62,
+        63, 67, 75, 75, 79, 87, 87, 92,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 34, 34, 35, 36, 36,
+        38, 39, 39, 42, 44, 44, 47, 48, 49, 53, 53, 55, 58, 58, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 35, 35, 37, 38, 38, 40,
+        42, 42, 45, 46, 47, 50, 51, 52, 55, 55, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 36, 37, 37, 40, 41, 41, 44, 45,
+        46, 49, 49, 51, 54, 54, 31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 34, 34, 34, 35, 35, 37, 38, 38, 40, 41, 41, 44, 45, 46, 49, 49, 51,
+        54, 54, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 35, 35, 36, 36, 37,
+        37, 37, 39, 40, 40, 42, 42, 43, 45, 46, 47, 49, 50, 51, 54, 54, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 34, 35, 35, 36, 37, 37, 37, 38, 38, 40, 40,
+        40, 42, 43, 43, 45, 46, 47, 49, 50, 51, 54, 54, 32, 33, 33, 33, 33, 33,
+        33, 34, 34, 35, 36, 36, 36, 38, 38, 39, 40, 40, 41, 42, 42, 44, 45, 45,
+        47, 48, 48, 51, 51, 53, 55, 55, 35, 35, 35, 35, 34, 34, 35, 36, 36, 37,
+        38, 38, 39, 42, 42, 44, 47, 47, 48, 49, 49, 51, 52, 52, 54, 55, 56, 58,
+        59, 60, 62, 62, 36, 35, 35, 35, 35, 34, 35, 36, 36, 37, 38, 38, 40, 42,
+        42, 45, 48, 48, 49, 50, 50, 52, 53, 54, 56, 56, 57, 59, 60, 61, 63, 63,
+        38, 37, 37, 37, 36, 36, 36, 38, 38, 38, 39, 39, 41, 44, 44, 46, 49, 49,
+        51, 52, 52, 55, 56, 56, 58, 59, 60, 62, 63, 64, 67, 67, 44, 43, 42, 42,
+        41, 41, 41, 42, 42, 42, 42, 42, 44, 48, 48, 50, 54, 54, 56, 58, 58, 61,
+        63, 63, 66, 67, 67, 71, 71, 72, 75, 75, 44, 43, 42, 42, 41, 41, 41, 42,
+        42, 42, 42, 42, 44, 48, 48, 50, 54, 54, 56, 58, 58, 61, 63, 63, 66, 67,
+        67, 71, 71, 72, 75, 75, 47, 46, 45, 45, 44, 44, 44, 45, 45, 45, 45, 45,
+        47, 50, 50, 53, 56, 56, 58, 60, 60, 64, 66, 66, 69, 70, 71, 74, 75, 76,
+        79, 79, 53, 52, 51, 51, 49, 49, 49, 49, 50, 49, 49, 49, 51, 54, 54, 57,
+        60, 60, 63, 65, 65, 69, 71, 72, 75, 76, 77, 81, 82, 83, 87, 87, 53, 52,
+        51, 51, 49, 49, 49, 49, 50, 49, 49, 49, 51, 54, 54, 57, 60, 60, 63, 65,
+        65, 69, 71, 72, 75, 76, 77, 81, 82, 83, 87, 87, 59, 57, 56, 56, 54, 54,
+        54, 54, 54, 54, 53, 53, 55, 58, 58, 61, 64, 64, 67, 69, 69, 73, 75, 76,
+        79, 80, 81, 86, 87, 88, 92, 92,
+        /* Size 4x16 */
+        31, 32, 38, 53, 32, 32, 37, 51, 32, 32, 36, 49, 32, 33, 36, 49, 32, 34,
+        38, 50, 32, 35, 39, 49, 33, 36, 41, 51, 34, 37, 44, 54, 35, 38, 49, 60,
+        37, 40, 51, 63, 38, 40, 52, 65, 42, 43, 56, 71, 45, 45, 58, 75, 47, 47,
+        60, 77, 51, 50, 63, 82, 55, 54, 67, 87,
+        /* Size 16x4 */
+        31, 32, 32, 32, 32, 32, 33, 34, 35, 37, 38, 42, 45, 47, 51, 55, 32, 32,
+        32, 33, 34, 35, 36, 37, 38, 40, 40, 43, 45, 47, 50, 54, 38, 37, 36, 36,
+        38, 39, 41, 44, 49, 51, 52, 56, 58, 60, 63, 67, 53, 51, 49, 49, 50, 49,
+        51, 54, 60, 63, 65, 71, 75, 77, 82, 87,
+        /* Size 8x32 */
+        32, 31, 32, 32, 36, 44, 47, 53, 31, 32, 32, 33, 35, 43, 46, 52, 31, 32,
+        32, 33, 35, 42, 45, 51, 31, 32, 32, 33, 35, 42, 45, 51, 31, 32, 32, 33,
+        35, 41, 44, 49, 31, 32, 32, 33, 34, 41, 44, 49, 31, 32, 33, 33, 35, 41,
+        44, 49, 32, 32, 33, 34, 36, 42, 45, 49, 32, 32, 34, 34, 36, 42, 45, 50,
+        32, 32, 34, 35, 37, 42, 45, 49, 32, 33, 35, 36, 38, 42, 45, 49, 32, 33,
+        35, 36, 38, 42, 45, 49, 32, 33, 35, 36, 40, 44, 47, 51, 34, 34, 36, 38,
+        42, 48, 50, 54, 34, 34, 36, 38, 42, 48, 50, 54, 35, 34, 37, 39, 45, 50,
+        53, 57, 36, 34, 37, 40, 48, 54, 56, 60, 36, 34, 37, 40, 48, 54, 56, 60,
+        38, 36, 39, 41, 49, 56, 58, 63, 39, 37, 40, 42, 50, 58, 60, 65, 39, 37,
+        40, 42, 50, 58, 60, 65, 42, 40, 42, 44, 52, 61, 64, 69, 44, 41, 42, 45,
+        53, 63, 66, 71, 44, 41, 43, 45, 54, 63, 66, 72, 47, 44, 45, 47, 56, 66,
+        69, 75, 48, 45, 46, 48, 56, 67, 70, 76, 49, 46, 47, 48, 57, 67, 71, 77,
+        53, 49, 49, 51, 59, 71, 74, 81, 53, 49, 50, 51, 60, 71, 75, 82, 55, 51,
+        51, 53, 61, 72, 76, 83, 58, 54, 54, 55, 63, 75, 79, 87, 58, 54, 54, 55,
+        63, 75, 79, 87,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 34, 34, 35, 36, 36,
+        38, 39, 39, 42, 44, 44, 47, 48, 49, 53, 53, 55, 58, 58, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 36, 37, 37, 40,
+        41, 41, 44, 45, 46, 49, 49, 51, 54, 54, 32, 32, 32, 32, 32, 32, 33, 33,
+        34, 34, 35, 35, 35, 36, 36, 37, 37, 37, 39, 40, 40, 42, 42, 43, 45, 46,
+        47, 49, 50, 51, 54, 54, 32, 33, 33, 33, 33, 33, 33, 34, 34, 35, 36, 36,
+        36, 38, 38, 39, 40, 40, 41, 42, 42, 44, 45, 45, 47, 48, 48, 51, 51, 53,
+        55, 55, 36, 35, 35, 35, 35, 34, 35, 36, 36, 37, 38, 38, 40, 42, 42, 45,
+        48, 48, 49, 50, 50, 52, 53, 54, 56, 56, 57, 59, 60, 61, 63, 63, 44, 43,
+        42, 42, 41, 41, 41, 42, 42, 42, 42, 42, 44, 48, 48, 50, 54, 54, 56, 58,
+        58, 61, 63, 63, 66, 67, 67, 71, 71, 72, 75, 75, 47, 46, 45, 45, 44, 44,
+        44, 45, 45, 45, 45, 45, 47, 50, 50, 53, 56, 56, 58, 60, 60, 64, 66, 66,
+        69, 70, 71, 74, 75, 76, 79, 79, 53, 52, 51, 51, 49, 49, 49, 49, 50, 49,
+        49, 49, 51, 54, 54, 57, 60, 60, 63, 65, 65, 69, 71, 72, 75, 76, 77, 81,
+        82, 83, 87, 87 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 38, 47, 49, 38, 47, 46, 46, 47, 46, 54, 57, 49, 46, 57, 66,
+        /* Size 8x8 */
+        31, 31, 35, 42, 48, 47, 49, 51, 31, 32, 36, 42, 46, 45, 46, 48, 35, 36,
+        41, 45, 47, 45, 46, 48, 42, 42, 45, 48, 50, 49, 50, 51, 48, 46, 47, 50,
+        53, 53, 54, 54, 47, 45, 45, 49, 53, 57, 59, 60, 49, 46, 46, 50, 54, 59,
+        61, 64, 51, 48, 48, 51, 54, 60, 64, 68,
+        /* Size 16x16 */
+        32, 31, 30, 31, 33, 36, 38, 41, 49, 49, 48, 49, 50, 51, 52, 54, 31, 31,
+        31, 32, 34, 38, 40, 42, 47, 47, 47, 47, 48, 48, 50, 52, 30, 31, 31, 32,
+        35, 39, 41, 42, 46, 46, 46, 45, 46, 47, 48, 50, 31, 32, 32, 33, 36, 40,
+        41, 43, 46, 46, 45, 45, 46, 46, 47, 49, 33, 34, 35, 36, 39, 43, 44, 45,
+        47, 46, 46, 45, 46, 47, 47, 49, 36, 38, 39, 40, 43, 47, 47, 47, 48, 47,
+        46, 45, 46, 46, 47, 48, 38, 40, 41, 41, 44, 47, 47, 48, 49, 48, 48, 47,
+        47, 47, 48, 49, 41, 42, 42, 43, 45, 47, 48, 48, 50, 50, 49, 49, 50, 50,
+        50, 52, 49, 47, 46, 46, 47, 48, 49, 50, 53, 53, 53, 53, 54, 54, 54, 55,
+        49, 47, 46, 46, 46, 47, 48, 50, 53, 53, 54, 55, 55, 55, 56, 57, 48, 47,
+        46, 45, 46, 46, 48, 49, 53, 54, 54, 55, 56, 56, 57, 58, 49, 47, 45, 45,
+        45, 45, 47, 49, 53, 55, 55, 58, 59, 60, 61, 62, 50, 48, 46, 46, 46, 46,
+        47, 50, 54, 55, 56, 59, 61, 61, 63, 64, 51, 48, 47, 46, 47, 46, 47, 50,
+        54, 55, 56, 60, 61, 62, 64, 66, 52, 50, 48, 47, 47, 47, 48, 50, 54, 56,
+        57, 61, 63, 64, 66, 68, 54, 52, 50, 49, 49, 48, 49, 52, 55, 57, 58, 62,
+        64, 66, 68, 71,
+        /* Size 32x32 */
+        32, 31, 31, 31, 30, 30, 31, 33, 33, 34, 36, 36, 38, 41, 41, 45, 49, 49,
+        49, 48, 48, 49, 49, 49, 50, 50, 51, 52, 52, 53, 54, 54, 31, 31, 31, 31,
+        31, 31, 31, 34, 34, 35, 38, 38, 39, 42, 42, 45, 48, 48, 47, 47, 47, 47,
+        47, 47, 49, 49, 49, 50, 50, 51, 53, 53, 31, 31, 31, 31, 31, 31, 32, 34,
+        34, 35, 38, 38, 40, 42, 42, 45, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48,
+        48, 49, 50, 50, 52, 52, 31, 31, 31, 31, 31, 31, 32, 34, 34, 36, 38, 38,
+        40, 42, 42, 45, 47, 47, 47, 47, 47, 47, 46, 47, 48, 48, 48, 49, 49, 50,
+        52, 52, 30, 31, 31, 31, 31, 31, 32, 35, 35, 36, 39, 39, 41, 42, 42, 44,
+        46, 46, 46, 46, 46, 45, 45, 45, 46, 47, 47, 48, 48, 48, 50, 50, 30, 31,
+        31, 31, 31, 32, 32, 35, 35, 36, 40, 40, 41, 42, 42, 44, 46, 46, 46, 45,
+        45, 45, 45, 45, 46, 46, 46, 47, 47, 48, 49, 49, 31, 31, 32, 32, 32, 32,
+        33, 35, 36, 37, 40, 40, 41, 43, 43, 44, 46, 46, 46, 45, 45, 45, 45, 45,
+        46, 46, 46, 47, 47, 48, 49, 49, 33, 34, 34, 34, 35, 35, 35, 38, 38, 40,
+        43, 43, 43, 44, 44, 46, 47, 47, 46, 46, 46, 45, 45, 45, 46, 46, 47, 47,
+        47, 48, 49, 49, 33, 34, 34, 34, 35, 35, 36, 38, 39, 40, 43, 43, 44, 45,
+        45, 46, 47, 47, 46, 46, 46, 45, 45, 45, 46, 46, 47, 47, 47, 48, 49, 49,
+        34, 35, 35, 36, 36, 36, 37, 40, 40, 41, 44, 44, 45, 45, 45, 46, 47, 47,
+        47, 46, 46, 45, 45, 45, 46, 46, 46, 47, 47, 48, 49, 49, 36, 38, 38, 38,
+        39, 40, 40, 43, 43, 44, 47, 47, 47, 47, 47, 47, 48, 48, 47, 46, 46, 45,
+        45, 45, 46, 46, 46, 46, 47, 47, 48, 48, 36, 38, 38, 38, 39, 40, 40, 43,
+        43, 44, 47, 47, 47, 47, 47, 47, 48, 48, 47, 46, 46, 45, 45, 45, 46, 46,
+        46, 46, 47, 47, 48, 48, 38, 39, 40, 40, 41, 41, 41, 43, 44, 45, 47, 47,
+        47, 48, 48, 48, 49, 49, 48, 48, 48, 47, 47, 47, 47, 47, 47, 48, 48, 48,
+        49, 49, 41, 42, 42, 42, 42, 42, 43, 44, 45, 45, 47, 47, 48, 48, 48, 49,
+        50, 50, 50, 49, 49, 49, 49, 49, 50, 50, 50, 50, 50, 51, 52, 52, 41, 42,
+        42, 42, 42, 42, 43, 44, 45, 45, 47, 47, 48, 48, 48, 49, 50, 50, 50, 49,
+        49, 49, 49, 49, 50, 50, 50, 50, 50, 51, 52, 52, 45, 45, 45, 45, 44, 44,
+        44, 46, 46, 46, 47, 47, 48, 49, 49, 50, 51, 51, 51, 51, 51, 51, 51, 51,
+        52, 52, 52, 52, 52, 52, 53, 53, 49, 48, 47, 47, 46, 46, 46, 47, 47, 47,
+        48, 48, 49, 50, 50, 51, 53, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54,
+        54, 54, 55, 55, 49, 48, 47, 47, 46, 46, 46, 47, 47, 47, 48, 48, 49, 50,
+        50, 51, 53, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 54, 54, 55, 55,
+        49, 47, 47, 47, 46, 46, 46, 46, 46, 47, 47, 47, 48, 50, 50, 51, 53, 53,
+        53, 54, 54, 54, 55, 55, 55, 55, 55, 56, 56, 56, 57, 57, 48, 47, 47, 47,
+        46, 45, 45, 46, 46, 46, 46, 46, 48, 49, 49, 51, 53, 53, 54, 54, 54, 55,
+        55, 56, 56, 56, 56, 57, 57, 58, 58, 58, 48, 47, 47, 47, 46, 45, 45, 46,
+        46, 46, 46, 46, 48, 49, 49, 51, 53, 53, 54, 54, 54, 55, 55, 56, 56, 56,
+        56, 57, 57, 58, 58, 58, 49, 47, 47, 47, 45, 45, 45, 45, 45, 45, 45, 45,
+        47, 49, 49, 51, 53, 53, 54, 55, 55, 57, 57, 58, 58, 59, 59, 60, 60, 60,
+        61, 61, 49, 47, 47, 46, 45, 45, 45, 45, 45, 45, 45, 45, 47, 49, 49, 51,
+        53, 53, 55, 55, 55, 57, 58, 58, 59, 60, 60, 61, 61, 61, 62, 62, 49, 47,
+        47, 47, 45, 45, 45, 45, 45, 45, 45, 45, 47, 49, 49, 51, 53, 53, 55, 56,
+        56, 58, 58, 59, 59, 60, 60, 61, 61, 62, 63, 63, 50, 49, 48, 48, 46, 46,
+        46, 46, 46, 46, 46, 46, 47, 50, 50, 52, 54, 54, 55, 56, 56, 58, 59, 59,
+        61, 61, 61, 63, 63, 63, 64, 64, 50, 49, 48, 48, 47, 46, 46, 46, 46, 46,
+        46, 46, 47, 50, 50, 52, 54, 54, 55, 56, 56, 59, 60, 60, 61, 61, 62, 63,
+        63, 64, 65, 65, 51, 49, 48, 48, 47, 46, 46, 47, 47, 46, 46, 46, 47, 50,
+        50, 52, 54, 54, 55, 56, 56, 59, 60, 60, 61, 62, 62, 64, 64, 64, 66, 66,
+        52, 50, 49, 49, 48, 47, 47, 47, 47, 47, 46, 46, 48, 50, 50, 52, 54, 54,
+        56, 57, 57, 60, 61, 61, 63, 63, 64, 66, 66, 67, 68, 68, 52, 50, 50, 49,
+        48, 47, 47, 47, 47, 47, 47, 47, 48, 50, 50, 52, 54, 54, 56, 57, 57, 60,
+        61, 61, 63, 63, 64, 66, 66, 67, 68, 68, 53, 51, 50, 50, 48, 48, 48, 48,
+        48, 48, 47, 47, 48, 51, 51, 52, 54, 54, 56, 58, 58, 60, 61, 62, 63, 64,
+        64, 67, 67, 68, 69, 69, 54, 53, 52, 52, 50, 49, 49, 49, 49, 49, 48, 48,
+        49, 52, 52, 53, 55, 55, 57, 58, 58, 61, 62, 63, 64, 65, 66, 68, 68, 69,
+        71, 71, 54, 53, 52, 52, 50, 49, 49, 49, 49, 49, 48, 48, 49, 52, 52, 53,
+        55, 55, 57, 58, 58, 61, 62, 63, 64, 65, 66, 68, 68, 69, 71, 71,
+        /* Size 4x8 */
+        31, 38, 47, 50, 31, 40, 46, 48, 36, 44, 47, 47, 42, 47, 50, 50, 47, 48,
+        53, 54, 46, 46, 54, 60, 48, 46, 55, 64, 50, 48, 56, 67,
+        /* Size 8x4 */
+        31, 31, 36, 42, 47, 46, 48, 50, 38, 40, 44, 47, 48, 46, 46, 48, 47, 46,
+        47, 50, 53, 54, 55, 56, 50, 48, 47, 50, 54, 60, 64, 67,
+        /* Size 8x16 */
+        32, 31, 35, 38, 48, 49, 50, 52, 31, 31, 37, 40, 47, 47, 48, 50, 30, 32,
+        38, 40, 46, 45, 46, 48, 31, 33, 38, 41, 46, 45, 46, 48, 33, 36, 41, 44,
+        47, 46, 46, 47, 37, 40, 45, 47, 47, 45, 46, 47, 39, 41, 46, 47, 48, 47,
+        47, 48, 42, 43, 46, 48, 50, 49, 50, 50, 49, 46, 48, 49, 53, 53, 54, 54,
+        48, 46, 47, 48, 53, 55, 55, 56, 48, 46, 46, 48, 53, 56, 56, 57, 49, 45,
+        45, 47, 53, 58, 59, 61, 50, 46, 46, 48, 54, 59, 61, 63, 51, 47, 47, 48,
+        54, 60, 61, 64, 52, 48, 47, 48, 54, 61, 63, 66, 54, 50, 49, 50, 55, 62,
+        65, 68,
+        /* Size 16x8 */
+        32, 31, 30, 31, 33, 37, 39, 42, 49, 48, 48, 49, 50, 51, 52, 54, 31, 31,
+        32, 33, 36, 40, 41, 43, 46, 46, 46, 45, 46, 47, 48, 50, 35, 37, 38, 38,
+        41, 45, 46, 46, 48, 47, 46, 45, 46, 47, 47, 49, 38, 40, 40, 41, 44, 47,
+        47, 48, 49, 48, 48, 47, 48, 48, 48, 50, 48, 47, 46, 46, 47, 47, 48, 50,
+        53, 53, 53, 53, 54, 54, 54, 55, 49, 47, 45, 45, 46, 45, 47, 49, 53, 55,
+        56, 58, 59, 60, 61, 62, 50, 48, 46, 46, 46, 46, 47, 50, 54, 55, 56, 59,
+        61, 61, 63, 65, 52, 50, 48, 48, 47, 47, 48, 50, 54, 56, 57, 61, 63, 64,
+        66, 68,
+        /* Size 16x32 */
+        32, 31, 31, 31, 35, 37, 38, 47, 48, 48, 49, 49, 50, 52, 52, 54, 31, 31,
+        31, 32, 36, 38, 39, 46, 47, 47, 48, 48, 49, 50, 50, 53, 31, 31, 31, 32,
+        37, 38, 40, 46, 47, 47, 47, 47, 48, 50, 50, 52, 31, 31, 31, 32, 37, 38,
+        40, 46, 47, 47, 47, 47, 48, 50, 50, 52, 30, 31, 32, 32, 38, 39, 40, 45,
+        46, 46, 45, 45, 46, 48, 48, 50, 30, 31, 32, 33, 38, 40, 41, 45, 46, 46,
+        45, 45, 46, 48, 48, 50, 31, 32, 33, 33, 38, 40, 41, 45, 46, 46, 45, 45,
+        46, 48, 48, 50, 33, 35, 35, 36, 41, 43, 43, 46, 47, 46, 45, 45, 46, 47,
+        47, 49, 33, 35, 36, 36, 41, 43, 44, 46, 47, 46, 46, 46, 46, 47, 47, 49,
+        34, 36, 37, 37, 42, 44, 45, 47, 47, 47, 45, 45, 46, 47, 47, 49, 37, 39,
+        40, 41, 45, 47, 47, 47, 47, 47, 45, 45, 46, 47, 47, 48, 37, 39, 40, 41,
+        45, 47, 47, 47, 47, 47, 45, 45, 46, 47, 47, 48, 39, 40, 41, 42, 46, 47,
+        47, 48, 48, 48, 47, 47, 47, 48, 48, 50, 42, 42, 43, 43, 46, 47, 48, 50,
+        50, 50, 49, 49, 50, 50, 50, 52, 42, 42, 43, 43, 46, 47, 48, 50, 50, 50,
+        49, 49, 50, 50, 50, 52, 45, 45, 44, 45, 47, 47, 48, 51, 51, 51, 51, 51,
+        52, 52, 52, 54, 49, 47, 46, 47, 48, 48, 49, 52, 53, 53, 53, 53, 54, 54,
+        54, 55, 49, 47, 46, 47, 48, 48, 49, 52, 53, 53, 53, 53, 54, 54, 54, 55,
+        48, 47, 46, 46, 47, 47, 48, 52, 53, 53, 55, 55, 55, 56, 56, 57, 48, 46,
+        46, 46, 46, 47, 48, 52, 53, 54, 56, 56, 56, 57, 57, 59, 48, 46, 46, 46,
+        46, 47, 48, 52, 53, 54, 56, 56, 56, 57, 57, 59, 49, 46, 45, 45, 46, 46,
+        47, 52, 53, 54, 57, 57, 58, 60, 60, 61, 49, 46, 45, 45, 45, 46, 47, 52,
+        53, 55, 58, 58, 59, 61, 61, 62, 49, 46, 45, 45, 46, 46, 47, 52, 53, 55,
+        58, 58, 60, 61, 61, 63, 50, 47, 46, 46, 46, 46, 48, 53, 54, 55, 59, 59,
+        61, 63, 63, 65, 50, 48, 46, 46, 46, 46, 48, 53, 54, 55, 59, 59, 61, 64,
+        64, 65, 51, 48, 47, 47, 47, 47, 48, 53, 54, 55, 60, 60, 61, 64, 64, 66,
+        52, 49, 48, 48, 47, 47, 48, 53, 54, 56, 61, 61, 63, 66, 66, 68, 52, 49,
+        48, 48, 47, 47, 48, 53, 54, 56, 61, 61, 63, 66, 66, 68, 53, 50, 48, 48,
+        48, 48, 49, 54, 54, 56, 61, 61, 63, 67, 67, 69, 54, 51, 50, 50, 49, 49,
+        50, 55, 55, 57, 62, 62, 65, 68, 68, 71, 54, 51, 50, 50, 49, 49, 50, 55,
+        55, 57, 62, 62, 65, 68, 68, 71,
+        /* Size 32x16 */
+        32, 31, 31, 31, 30, 30, 31, 33, 33, 34, 37, 37, 39, 42, 42, 45, 49, 49,
+        48, 48, 48, 49, 49, 49, 50, 50, 51, 52, 52, 53, 54, 54, 31, 31, 31, 31,
+        31, 31, 32, 35, 35, 36, 39, 39, 40, 42, 42, 45, 47, 47, 47, 46, 46, 46,
+        46, 46, 47, 48, 48, 49, 49, 50, 51, 51, 31, 31, 31, 31, 32, 32, 33, 35,
+        36, 37, 40, 40, 41, 43, 43, 44, 46, 46, 46, 46, 46, 45, 45, 45, 46, 46,
+        47, 48, 48, 48, 50, 50, 31, 32, 32, 32, 32, 33, 33, 36, 36, 37, 41, 41,
+        42, 43, 43, 45, 47, 47, 46, 46, 46, 45, 45, 45, 46, 46, 47, 48, 48, 48,
+        50, 50, 35, 36, 37, 37, 38, 38, 38, 41, 41, 42, 45, 45, 46, 46, 46, 47,
+        48, 48, 47, 46, 46, 46, 45, 46, 46, 46, 47, 47, 47, 48, 49, 49, 37, 38,
+        38, 38, 39, 40, 40, 43, 43, 44, 47, 47, 47, 47, 47, 47, 48, 48, 47, 47,
+        47, 46, 46, 46, 46, 46, 47, 47, 47, 48, 49, 49, 38, 39, 40, 40, 40, 41,
+        41, 43, 44, 45, 47, 47, 47, 48, 48, 48, 49, 49, 48, 48, 48, 47, 47, 47,
+        48, 48, 48, 48, 48, 49, 50, 50, 47, 46, 46, 46, 45, 45, 45, 46, 46, 47,
+        47, 47, 48, 50, 50, 51, 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53,
+        53, 54, 55, 55, 48, 47, 47, 47, 46, 46, 46, 47, 47, 47, 47, 47, 48, 50,
+        50, 51, 53, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 54, 54, 55, 55,
+        48, 47, 47, 47, 46, 46, 46, 46, 46, 47, 47, 47, 48, 50, 50, 51, 53, 53,
+        53, 54, 54, 54, 55, 55, 55, 55, 55, 56, 56, 56, 57, 57, 49, 48, 47, 47,
+        45, 45, 45, 45, 46, 45, 45, 45, 47, 49, 49, 51, 53, 53, 55, 56, 56, 57,
+        58, 58, 59, 59, 60, 61, 61, 61, 62, 62, 49, 48, 47, 47, 45, 45, 45, 45,
+        46, 45, 45, 45, 47, 49, 49, 51, 53, 53, 55, 56, 56, 57, 58, 58, 59, 59,
+        60, 61, 61, 61, 62, 62, 50, 49, 48, 48, 46, 46, 46, 46, 46, 46, 46, 46,
+        47, 50, 50, 52, 54, 54, 55, 56, 56, 58, 59, 60, 61, 61, 61, 63, 63, 63,
+        65, 65, 52, 50, 50, 50, 48, 48, 48, 47, 47, 47, 47, 47, 48, 50, 50, 52,
+        54, 54, 56, 57, 57, 60, 61, 61, 63, 64, 64, 66, 66, 67, 68, 68, 52, 50,
+        50, 50, 48, 48, 48, 47, 47, 47, 47, 47, 48, 50, 50, 52, 54, 54, 56, 57,
+        57, 60, 61, 61, 63, 64, 64, 66, 66, 67, 68, 68, 54, 53, 52, 52, 50, 50,
+        50, 49, 49, 49, 48, 48, 50, 52, 52, 54, 55, 55, 57, 59, 59, 61, 62, 63,
+        65, 65, 66, 68, 68, 69, 71, 71,
+        /* Size 4x16 */
+        31, 37, 48, 52, 31, 38, 47, 50, 31, 39, 46, 48, 32, 40, 46, 48, 35, 43,
+        46, 47, 39, 47, 47, 47, 40, 47, 48, 48, 42, 47, 50, 50, 47, 48, 53, 54,
+        47, 47, 53, 56, 46, 47, 54, 57, 46, 46, 55, 61, 47, 46, 55, 63, 48, 47,
+        55, 64, 49, 47, 56, 66, 51, 49, 57, 68,
+        /* Size 16x4 */
+        31, 31, 31, 32, 35, 39, 40, 42, 47, 47, 46, 46, 47, 48, 49, 51, 37, 38,
+        39, 40, 43, 47, 47, 47, 48, 47, 47, 46, 46, 47, 47, 49, 48, 47, 46, 46,
+        46, 47, 48, 50, 53, 53, 54, 55, 55, 55, 56, 57, 52, 50, 48, 48, 47, 47,
+        48, 50, 54, 56, 57, 61, 63, 64, 66, 68,
+        /* Size 8x32 */
+        32, 31, 35, 38, 48, 49, 50, 52, 31, 31, 36, 39, 47, 48, 49, 50, 31, 31,
+        37, 40, 47, 47, 48, 50, 31, 31, 37, 40, 47, 47, 48, 50, 30, 32, 38, 40,
+        46, 45, 46, 48, 30, 32, 38, 41, 46, 45, 46, 48, 31, 33, 38, 41, 46, 45,
+        46, 48, 33, 35, 41, 43, 47, 45, 46, 47, 33, 36, 41, 44, 47, 46, 46, 47,
+        34, 37, 42, 45, 47, 45, 46, 47, 37, 40, 45, 47, 47, 45, 46, 47, 37, 40,
+        45, 47, 47, 45, 46, 47, 39, 41, 46, 47, 48, 47, 47, 48, 42, 43, 46, 48,
+        50, 49, 50, 50, 42, 43, 46, 48, 50, 49, 50, 50, 45, 44, 47, 48, 51, 51,
+        52, 52, 49, 46, 48, 49, 53, 53, 54, 54, 49, 46, 48, 49, 53, 53, 54, 54,
+        48, 46, 47, 48, 53, 55, 55, 56, 48, 46, 46, 48, 53, 56, 56, 57, 48, 46,
+        46, 48, 53, 56, 56, 57, 49, 45, 46, 47, 53, 57, 58, 60, 49, 45, 45, 47,
+        53, 58, 59, 61, 49, 45, 46, 47, 53, 58, 60, 61, 50, 46, 46, 48, 54, 59,
+        61, 63, 50, 46, 46, 48, 54, 59, 61, 64, 51, 47, 47, 48, 54, 60, 61, 64,
+        52, 48, 47, 48, 54, 61, 63, 66, 52, 48, 47, 48, 54, 61, 63, 66, 53, 48,
+        48, 49, 54, 61, 63, 67, 54, 50, 49, 50, 55, 62, 65, 68, 54, 50, 49, 50,
+        55, 62, 65, 68,
+        /* Size 32x8 */
+        32, 31, 31, 31, 30, 30, 31, 33, 33, 34, 37, 37, 39, 42, 42, 45, 49, 49,
+        48, 48, 48, 49, 49, 49, 50, 50, 51, 52, 52, 53, 54, 54, 31, 31, 31, 31,
+        32, 32, 33, 35, 36, 37, 40, 40, 41, 43, 43, 44, 46, 46, 46, 46, 46, 45,
+        45, 45, 46, 46, 47, 48, 48, 48, 50, 50, 35, 36, 37, 37, 38, 38, 38, 41,
+        41, 42, 45, 45, 46, 46, 46, 47, 48, 48, 47, 46, 46, 46, 45, 46, 46, 46,
+        47, 47, 47, 48, 49, 49, 38, 39, 40, 40, 40, 41, 41, 43, 44, 45, 47, 47,
+        47, 48, 48, 48, 49, 49, 48, 48, 48, 47, 47, 47, 48, 48, 48, 48, 48, 49,
+        50, 50, 48, 47, 47, 47, 46, 46, 46, 47, 47, 47, 47, 47, 48, 50, 50, 51,
+        53, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 54, 54, 55, 55, 49, 48,
+        47, 47, 45, 45, 45, 45, 46, 45, 45, 45, 47, 49, 49, 51, 53, 53, 55, 56,
+        56, 57, 58, 58, 59, 59, 60, 61, 61, 61, 62, 62, 50, 49, 48, 48, 46, 46,
+        46, 46, 46, 46, 46, 46, 47, 50, 50, 52, 54, 54, 55, 56, 56, 58, 59, 60,
+        61, 61, 61, 63, 63, 63, 65, 65, 52, 50, 50, 50, 48, 48, 48, 47, 47, 47,
+        47, 47, 48, 50, 50, 52, 54, 54, 56, 57, 57, 60, 61, 61, 63, 64, 64, 66,
+        66, 67, 68, 68 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 32, 35, 43, 32, 34, 37, 43, 35, 37, 48, 54, 43, 43, 54, 65,
+        /* Size 8x8 */
+        31, 31, 32, 32, 34, 37, 43, 47, 31, 32, 32, 32, 34, 36, 41, 44, 32, 32,
+        33, 34, 35, 38, 42, 45, 32, 32, 34, 35, 37, 39, 42, 46, 34, 34, 35, 37,
+        41, 45, 49, 52, 37, 36, 38, 39, 45, 51, 56, 59, 43, 41, 42, 42, 49, 56,
+        63, 67, 47, 44, 45, 46, 52, 59, 67, 71,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 31, 32, 32, 34, 35, 36, 39, 41, 44, 47, 48, 31, 32,
+        32, 32, 32, 32, 32, 33, 34, 35, 35, 38, 40, 42, 45, 46, 31, 32, 32, 32,
+        32, 32, 32, 33, 34, 34, 35, 38, 39, 42, 45, 45, 31, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 34, 37, 38, 41, 44, 44, 31, 32, 32, 32, 33, 33, 33, 34,
+        35, 36, 36, 39, 40, 42, 44, 45, 31, 32, 32, 32, 33, 33, 34, 34, 35, 36,
+        36, 39, 40, 42, 45, 45, 32, 32, 32, 32, 33, 34, 35, 36, 37, 38, 38, 40,
+        41, 42, 45, 46, 32, 33, 33, 33, 34, 34, 36, 36, 38, 39, 40, 42, 43, 44,
+        47, 47, 34, 34, 34, 33, 35, 35, 37, 38, 39, 42, 42, 45, 46, 47, 50, 51,
+        35, 35, 34, 34, 36, 36, 38, 39, 42, 46, 47, 49, 50, 52, 55, 55, 36, 35,
+        35, 34, 36, 36, 38, 40, 42, 47, 48, 50, 52, 54, 56, 57, 39, 38, 38, 37,
+        39, 39, 40, 42, 45, 49, 50, 54, 55, 58, 60, 61, 41, 40, 39, 38, 40, 40,
+        41, 43, 46, 50, 52, 55, 57, 60, 62, 63, 44, 42, 42, 41, 42, 42, 42, 44,
+        47, 52, 54, 58, 60, 63, 66, 67, 47, 45, 45, 44, 44, 45, 45, 47, 50, 55,
+        56, 60, 62, 66, 69, 70, 48, 46, 45, 44, 45, 45, 46, 47, 51, 55, 57, 61,
+        63, 67, 70, 71,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 34, 34, 34,
+        35, 36, 36, 38, 39, 39, 41, 44, 44, 45, 47, 48, 48, 51, 31, 31, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 35, 35, 35, 37,
+        39, 39, 40, 43, 43, 44, 46, 47, 47, 50, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 35, 35, 35, 37, 38, 38, 40, 42,
+        42, 43, 45, 46, 46, 49, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 34, 34, 34, 35, 35, 35, 37, 38, 38, 40, 42, 42, 43, 45, 46,
+        46, 49, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34,
+        34, 34, 34, 35, 35, 36, 38, 38, 39, 42, 42, 42, 45, 45, 45, 48, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34,
+        34, 36, 37, 37, 38, 41, 41, 41, 44, 44, 44, 47, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 36, 37, 37,
+        38, 41, 41, 41, 44, 44, 44, 47, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 36, 38, 38, 39, 41, 41, 42,
+        44, 45, 45, 47, 31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        34, 35, 35, 35, 36, 36, 36, 37, 39, 39, 40, 42, 42, 42, 44, 45, 45, 48,
+        31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 35, 35, 35,
+        36, 36, 36, 38, 39, 39, 40, 42, 42, 42, 45, 45, 45, 48, 31, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 35, 35, 35, 36, 36, 36, 38,
+        39, 39, 40, 42, 42, 42, 45, 45, 45, 48, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 34, 35, 35, 35, 36, 36, 36, 37, 37, 37, 39, 40, 40, 41, 42,
+        42, 43, 45, 45, 45, 48, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35,
+        35, 35, 36, 37, 37, 37, 38, 38, 38, 39, 40, 40, 41, 42, 42, 43, 45, 46,
+        46, 48, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 35, 35, 36, 37,
+        37, 37, 38, 38, 38, 39, 40, 40, 41, 42, 42, 43, 45, 46, 46, 48, 32, 33,
+        33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 36, 36, 36, 38, 38, 38, 39, 40,
+        40, 41, 42, 42, 43, 44, 44, 45, 47, 47, 47, 50, 34, 34, 34, 34, 34, 33,
+        33, 34, 35, 35, 35, 36, 37, 37, 38, 39, 39, 40, 42, 42, 42, 44, 45, 45,
+        46, 47, 47, 48, 50, 51, 51, 53, 34, 34, 34, 34, 34, 33, 33, 34, 35, 35,
+        35, 36, 37, 37, 38, 39, 39, 40, 42, 42, 42, 44, 45, 45, 46, 47, 47, 48,
+        50, 51, 51, 53, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36, 37, 37,
+        38, 40, 40, 41, 43, 44, 44, 45, 46, 46, 47, 49, 49, 49, 51, 52, 52, 54,
+        35, 35, 35, 35, 34, 34, 34, 34, 36, 36, 36, 37, 38, 38, 39, 42, 42, 43,
+        46, 47, 47, 48, 49, 49, 50, 52, 52, 53, 55, 55, 55, 57, 36, 35, 35, 35,
+        35, 34, 34, 35, 36, 36, 36, 37, 38, 38, 40, 42, 42, 44, 47, 48, 48, 50,
+        50, 50, 52, 54, 54, 54, 56, 57, 57, 58, 36, 35, 35, 35, 35, 34, 34, 35,
+        36, 36, 36, 37, 38, 38, 40, 42, 42, 44, 47, 48, 48, 50, 50, 50, 52, 54,
+        54, 54, 56, 57, 57, 58, 38, 37, 37, 37, 36, 36, 36, 36, 37, 38, 38, 39,
+        39, 39, 41, 44, 44, 45, 48, 50, 50, 51, 52, 52, 54, 56, 56, 57, 58, 59,
+        59, 61, 39, 39, 38, 38, 38, 37, 37, 38, 39, 39, 39, 40, 40, 40, 42, 45,
+        45, 46, 49, 50, 50, 52, 54, 54, 55, 58, 58, 58, 60, 61, 61, 63, 39, 39,
+        38, 38, 38, 37, 37, 38, 39, 39, 39, 40, 40, 40, 42, 45, 45, 46, 49, 50,
+        50, 52, 54, 54, 55, 58, 58, 58, 60, 61, 61, 63, 41, 40, 40, 40, 39, 38,
+        38, 39, 40, 40, 40, 41, 41, 41, 43, 46, 46, 47, 50, 52, 52, 54, 55, 55,
+        57, 60, 60, 60, 62, 63, 63, 66, 44, 43, 42, 42, 42, 41, 41, 41, 42, 42,
+        42, 42, 42, 42, 44, 47, 47, 49, 52, 54, 54, 56, 58, 58, 60, 63, 63, 64,
+        66, 67, 67, 69, 44, 43, 42, 42, 42, 41, 41, 41, 42, 42, 42, 42, 42, 42,
+        44, 47, 47, 49, 52, 54, 54, 56, 58, 58, 60, 63, 63, 64, 66, 67, 67, 69,
+        45, 44, 43, 43, 42, 41, 41, 42, 42, 42, 42, 43, 43, 43, 45, 48, 48, 49,
+        53, 54, 54, 57, 58, 58, 60, 64, 64, 65, 67, 68, 68, 70, 47, 46, 45, 45,
+        45, 44, 44, 44, 44, 45, 45, 45, 45, 45, 47, 50, 50, 51, 55, 56, 56, 58,
+        60, 60, 62, 66, 66, 67, 69, 70, 70, 73, 48, 47, 46, 46, 45, 44, 44, 45,
+        45, 45, 45, 45, 46, 46, 47, 51, 51, 52, 55, 57, 57, 59, 61, 61, 63, 67,
+        67, 68, 70, 71, 71, 74, 48, 47, 46, 46, 45, 44, 44, 45, 45, 45, 45, 45,
+        46, 46, 47, 51, 51, 52, 55, 57, 57, 59, 61, 61, 63, 67, 67, 68, 70, 71,
+        71, 74, 51, 50, 49, 49, 48, 47, 47, 47, 48, 48, 48, 48, 48, 48, 50, 53,
+        53, 54, 57, 58, 58, 61, 63, 63, 66, 69, 69, 70, 73, 74, 74, 77,
+        /* Size 4x8 */
+        31, 32, 35, 43, 32, 33, 34, 41, 32, 34, 36, 42, 32, 35, 38, 42, 34, 37,
+        43, 49, 37, 40, 49, 56, 42, 43, 53, 63, 46, 46, 56, 67,
+        /* Size 8x4 */
+        31, 32, 32, 32, 34, 37, 42, 46, 32, 33, 34, 35, 37, 40, 43, 46, 35, 34,
+        36, 38, 43, 49, 53, 56, 43, 41, 42, 42, 49, 56, 63, 67,
+        /* Size 8x16 */
+        32, 31, 31, 32, 35, 36, 44, 47, 31, 32, 32, 32, 35, 35, 42, 45, 31, 32,
+        32, 32, 34, 35, 41, 45, 31, 32, 32, 33, 34, 34, 41, 44, 31, 32, 33, 34,
+        35, 36, 42, 44, 32, 32, 33, 34, 36, 36, 42, 45, 32, 33, 34, 35, 37, 38,
+        42, 45, 32, 33, 34, 36, 39, 40, 44, 47, 34, 34, 35, 37, 41, 42, 48, 50,
+        35, 34, 36, 38, 45, 47, 52, 55, 36, 34, 36, 38, 46, 48, 54, 56, 39, 37,
+        39, 40, 48, 50, 58, 60, 41, 39, 40, 41, 49, 51, 60, 62, 44, 41, 42, 43,
+        51, 53, 63, 66, 47, 44, 44, 45, 53, 56, 66, 69, 48, 45, 45, 46, 54, 56,
+        67, 70,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 32, 32, 32, 34, 35, 36, 39, 41, 44, 47, 48, 31, 32,
+        32, 32, 32, 32, 33, 33, 34, 34, 34, 37, 39, 41, 44, 45, 31, 32, 32, 32,
+        33, 33, 34, 34, 35, 36, 36, 39, 40, 42, 44, 45, 32, 32, 32, 33, 34, 34,
+        35, 36, 37, 38, 38, 40, 41, 43, 45, 46, 35, 35, 34, 34, 35, 36, 37, 39,
+        41, 45, 46, 48, 49, 51, 53, 54, 36, 35, 35, 34, 36, 36, 38, 40, 42, 47,
+        48, 50, 51, 53, 56, 56, 44, 42, 41, 41, 42, 42, 42, 44, 48, 52, 54, 58,
+        60, 63, 66, 67, 47, 45, 45, 44, 44, 45, 45, 47, 50, 55, 56, 60, 62, 66,
+        69, 70,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 32, 32, 32, 35, 36, 36, 40, 44, 44, 47, 53, 31, 31,
+        32, 32, 32, 32, 32, 33, 35, 35, 35, 39, 43, 43, 46, 52, 31, 32, 32, 32,
+        32, 32, 32, 33, 35, 35, 35, 39, 42, 42, 45, 51, 31, 32, 32, 32, 32, 32,
+        32, 33, 35, 35, 35, 39, 42, 42, 45, 51, 31, 32, 32, 32, 32, 32, 32, 33,
+        34, 35, 35, 39, 41, 41, 45, 50, 31, 32, 32, 32, 32, 33, 33, 33, 34, 34,
+        34, 38, 41, 41, 44, 49, 31, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 38,
+        41, 41, 44, 49, 31, 32, 32, 32, 32, 33, 33, 33, 34, 35, 35, 38, 41, 41,
+        44, 49, 31, 32, 32, 32, 33, 34, 34, 34, 35, 36, 36, 39, 42, 42, 44, 49,
+        32, 32, 32, 32, 33, 34, 34, 34, 36, 36, 36, 39, 42, 42, 45, 50, 32, 32,
+        32, 32, 33, 34, 34, 34, 36, 36, 36, 39, 42, 42, 45, 50, 32, 32, 32, 32,
+        33, 35, 35, 35, 37, 37, 37, 40, 42, 42, 45, 49, 32, 32, 33, 33, 34, 35,
+        35, 36, 37, 38, 38, 41, 42, 42, 45, 49, 32, 32, 33, 33, 34, 35, 35, 36,
+        37, 38, 38, 41, 42, 42, 45, 49, 32, 33, 33, 33, 34, 36, 36, 36, 39, 40,
+        40, 42, 44, 44, 47, 51, 34, 34, 34, 34, 35, 37, 37, 38, 41, 42, 42, 45,
+        48, 48, 50, 54, 34, 34, 34, 34, 35, 37, 37, 38, 41, 42, 42, 45, 48, 48,
+        50, 54, 34, 34, 34, 34, 35, 37, 37, 38, 42, 43, 43, 46, 49, 49, 51, 55,
+        35, 35, 34, 34, 36, 38, 38, 39, 45, 47, 47, 50, 52, 52, 55, 59, 36, 35,
+        34, 34, 36, 38, 38, 40, 46, 48, 48, 51, 54, 54, 56, 60, 36, 35, 34, 34,
+        36, 38, 38, 40, 46, 48, 48, 51, 54, 54, 56, 60, 38, 37, 36, 36, 37, 40,
+        40, 41, 47, 49, 49, 53, 56, 56, 58, 63, 39, 38, 37, 37, 39, 40, 40, 42,
+        48, 50, 50, 54, 58, 58, 60, 65, 39, 38, 37, 37, 39, 40, 40, 42, 48, 50,
+        50, 54, 58, 58, 60, 65, 41, 40, 39, 39, 40, 41, 41, 43, 49, 51, 51, 56,
+        60, 60, 62, 67, 44, 42, 41, 41, 42, 43, 43, 45, 51, 53, 53, 59, 63, 63,
+        66, 71, 44, 42, 41, 41, 42, 43, 43, 45, 51, 53, 53, 59, 63, 63, 66, 71,
+        44, 43, 42, 42, 42, 43, 43, 45, 51, 54, 54, 59, 64, 64, 67, 72, 47, 45,
+        44, 44, 44, 45, 45, 47, 53, 56, 56, 61, 66, 66, 69, 75, 48, 46, 45, 45,
+        45, 46, 46, 48, 54, 56, 56, 62, 67, 67, 70, 76, 48, 46, 45, 45, 45, 46,
+        46, 48, 54, 56, 56, 62, 67, 67, 70, 76, 51, 49, 47, 47, 48, 48, 48, 50,
+        56, 58, 58, 64, 69, 69, 73, 79,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 34, 34, 34,
+        35, 36, 36, 38, 39, 39, 41, 44, 44, 44, 47, 48, 48, 51, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 35, 35, 35, 37,
+        38, 38, 40, 42, 42, 43, 45, 46, 46, 49, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 34, 36, 37, 37, 39, 41,
+        41, 42, 44, 45, 45, 47, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 34, 34, 34, 34, 34, 34, 36, 37, 37, 39, 41, 41, 42, 44, 45,
+        45, 47, 31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 35,
+        35, 35, 36, 36, 36, 37, 39, 39, 40, 42, 42, 42, 44, 45, 45, 48, 32, 32,
+        32, 32, 32, 33, 33, 33, 34, 34, 34, 35, 35, 35, 36, 37, 37, 37, 38, 38,
+        38, 40, 40, 40, 41, 43, 43, 43, 45, 46, 46, 48, 32, 32, 32, 32, 32, 33,
+        33, 33, 34, 34, 34, 35, 35, 35, 36, 37, 37, 37, 38, 38, 38, 40, 40, 40,
+        41, 43, 43, 43, 45, 46, 46, 48, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34,
+        34, 35, 36, 36, 36, 38, 38, 38, 39, 40, 40, 41, 42, 42, 43, 45, 45, 45,
+        47, 48, 48, 50, 35, 35, 35, 35, 34, 34, 34, 34, 35, 36, 36, 37, 37, 37,
+        39, 41, 41, 42, 45, 46, 46, 47, 48, 48, 49, 51, 51, 51, 53, 54, 54, 56,
+        36, 35, 35, 35, 35, 34, 34, 35, 36, 36, 36, 37, 38, 38, 40, 42, 42, 43,
+        47, 48, 48, 49, 50, 50, 51, 53, 53, 54, 56, 56, 56, 58, 36, 35, 35, 35,
+        35, 34, 34, 35, 36, 36, 36, 37, 38, 38, 40, 42, 42, 43, 47, 48, 48, 49,
+        50, 50, 51, 53, 53, 54, 56, 56, 56, 58, 40, 39, 39, 39, 39, 38, 38, 38,
+        39, 39, 39, 40, 41, 41, 42, 45, 45, 46, 50, 51, 51, 53, 54, 54, 56, 59,
+        59, 59, 61, 62, 62, 64, 44, 43, 42, 42, 41, 41, 41, 41, 42, 42, 42, 42,
+        42, 42, 44, 48, 48, 49, 52, 54, 54, 56, 58, 58, 60, 63, 63, 64, 66, 67,
+        67, 69, 44, 43, 42, 42, 41, 41, 41, 41, 42, 42, 42, 42, 42, 42, 44, 48,
+        48, 49, 52, 54, 54, 56, 58, 58, 60, 63, 63, 64, 66, 67, 67, 69, 47, 46,
+        45, 45, 45, 44, 44, 44, 44, 45, 45, 45, 45, 45, 47, 50, 50, 51, 55, 56,
+        56, 58, 60, 60, 62, 66, 66, 67, 69, 70, 70, 73, 53, 52, 51, 51, 50, 49,
+        49, 49, 49, 50, 50, 49, 49, 49, 51, 54, 54, 55, 59, 60, 60, 63, 65, 65,
+        67, 71, 71, 72, 75, 76, 76, 79,
+        /* Size 4x16 */
+        31, 32, 36, 44, 32, 32, 35, 42, 32, 32, 35, 41, 32, 33, 34, 41, 32, 34,
+        36, 42, 32, 34, 36, 42, 32, 35, 38, 42, 33, 36, 40, 44, 34, 37, 42, 48,
+        35, 38, 47, 52, 35, 38, 48, 54, 38, 40, 50, 58, 40, 41, 51, 60, 42, 43,
+        53, 63, 45, 45, 56, 66, 46, 46, 56, 67,
+        /* Size 16x4 */
+        31, 32, 32, 32, 32, 32, 32, 33, 34, 35, 35, 38, 40, 42, 45, 46, 32, 32,
+        32, 33, 34, 34, 35, 36, 37, 38, 38, 40, 41, 43, 45, 46, 36, 35, 35, 34,
+        36, 36, 38, 40, 42, 47, 48, 50, 51, 53, 56, 56, 44, 42, 41, 41, 42, 42,
+        42, 44, 48, 52, 54, 58, 60, 63, 66, 67,
+        /* Size 8x32 */
+        32, 31, 31, 32, 35, 36, 44, 47, 31, 32, 32, 32, 35, 35, 43, 46, 31, 32,
+        32, 32, 35, 35, 42, 45, 31, 32, 32, 32, 35, 35, 42, 45, 31, 32, 32, 32,
+        34, 35, 41, 45, 31, 32, 32, 33, 34, 34, 41, 44, 31, 32, 32, 33, 34, 34,
+        41, 44, 31, 32, 32, 33, 34, 35, 41, 44, 31, 32, 33, 34, 35, 36, 42, 44,
+        32, 32, 33, 34, 36, 36, 42, 45, 32, 32, 33, 34, 36, 36, 42, 45, 32, 32,
+        33, 35, 37, 37, 42, 45, 32, 33, 34, 35, 37, 38, 42, 45, 32, 33, 34, 35,
+        37, 38, 42, 45, 32, 33, 34, 36, 39, 40, 44, 47, 34, 34, 35, 37, 41, 42,
+        48, 50, 34, 34, 35, 37, 41, 42, 48, 50, 34, 34, 35, 37, 42, 43, 49, 51,
+        35, 34, 36, 38, 45, 47, 52, 55, 36, 34, 36, 38, 46, 48, 54, 56, 36, 34,
+        36, 38, 46, 48, 54, 56, 38, 36, 37, 40, 47, 49, 56, 58, 39, 37, 39, 40,
+        48, 50, 58, 60, 39, 37, 39, 40, 48, 50, 58, 60, 41, 39, 40, 41, 49, 51,
+        60, 62, 44, 41, 42, 43, 51, 53, 63, 66, 44, 41, 42, 43, 51, 53, 63, 66,
+        44, 42, 42, 43, 51, 54, 64, 67, 47, 44, 44, 45, 53, 56, 66, 69, 48, 45,
+        45, 46, 54, 56, 67, 70, 48, 45, 45, 46, 54, 56, 67, 70, 51, 47, 48, 48,
+        56, 58, 69, 73,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 34, 34, 34,
+        35, 36, 36, 38, 39, 39, 41, 44, 44, 44, 47, 48, 48, 51, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 34, 36,
+        37, 37, 39, 41, 41, 42, 44, 45, 45, 47, 31, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 34, 34, 34, 35, 35, 35, 36, 36, 36, 37, 39, 39, 40, 42,
+        42, 42, 44, 45, 45, 48, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 35,
+        35, 35, 36, 37, 37, 37, 38, 38, 38, 40, 40, 40, 41, 43, 43, 43, 45, 46,
+        46, 48, 35, 35, 35, 35, 34, 34, 34, 34, 35, 36, 36, 37, 37, 37, 39, 41,
+        41, 42, 45, 46, 46, 47, 48, 48, 49, 51, 51, 51, 53, 54, 54, 56, 36, 35,
+        35, 35, 35, 34, 34, 35, 36, 36, 36, 37, 38, 38, 40, 42, 42, 43, 47, 48,
+        48, 49, 50, 50, 51, 53, 53, 54, 56, 56, 56, 58, 44, 43, 42, 42, 41, 41,
+        41, 41, 42, 42, 42, 42, 42, 42, 44, 48, 48, 49, 52, 54, 54, 56, 58, 58,
+        60, 63, 63, 64, 66, 67, 67, 69, 47, 46, 45, 45, 45, 44, 44, 44, 44, 45,
+        45, 45, 45, 45, 47, 50, 50, 51, 55, 56, 56, 58, 60, 60, 62, 66, 66, 67,
+        69, 70, 70, 73 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 37, 47, 47, 37, 44, 47, 45, 47, 47, 53, 53, 47, 45, 53, 59,
+        /* Size 8x8 */
+        31, 31, 34, 37, 43, 48, 47, 49, 31, 32, 35, 40, 43, 46, 45, 46, 34, 35,
+        39, 43, 45, 46, 45, 46, 37, 40, 43, 47, 47, 47, 45, 46, 43, 43, 45, 47,
+        49, 50, 50, 50, 48, 46, 46, 47, 50, 53, 55, 55, 47, 45, 45, 45, 50, 55,
+        58, 60, 49, 46, 46, 46, 50, 55, 60, 61,
+        /* Size 16x16 */
+        32, 31, 31, 30, 33, 33, 36, 38, 41, 47, 49, 48, 49, 49, 50, 50, 31, 31,
+        31, 31, 34, 34, 38, 40, 42, 46, 47, 47, 47, 47, 48, 48, 31, 31, 31, 31,
+        34, 35, 39, 40, 42, 46, 47, 46, 46, 46, 47, 47, 30, 31, 31, 32, 34, 35,
+        40, 41, 42, 45, 46, 45, 45, 45, 46, 46, 33, 34, 34, 34, 37, 38, 42, 43,
+        44, 46, 47, 46, 46, 45, 46, 46, 33, 34, 35, 35, 38, 39, 43, 44, 45, 47,
+        47, 46, 46, 45, 46, 46, 36, 38, 39, 40, 42, 43, 47, 47, 47, 47, 48, 46,
+        46, 45, 46, 46, 38, 40, 40, 41, 43, 44, 47, 47, 48, 48, 49, 48, 47, 47,
+        47, 47, 41, 42, 42, 42, 44, 45, 47, 48, 48, 50, 50, 49, 49, 49, 50, 50,
+        47, 46, 46, 45, 46, 47, 47, 48, 50, 52, 52, 52, 52, 52, 53, 53, 49, 47,
+        47, 46, 47, 47, 48, 49, 50, 52, 53, 53, 53, 53, 54, 54, 48, 47, 46, 45,
+        46, 46, 46, 48, 49, 52, 53, 54, 55, 55, 56, 56, 49, 47, 46, 45, 46, 46,
+        46, 47, 49, 52, 53, 55, 55, 57, 57, 58, 49, 47, 46, 45, 45, 45, 45, 47,
+        49, 52, 53, 55, 57, 58, 59, 60, 50, 48, 47, 46, 46, 46, 46, 47, 50, 53,
+        54, 56, 57, 59, 61, 61, 50, 48, 47, 46, 46, 46, 46, 47, 50, 53, 54, 56,
+        58, 60, 61, 61,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 30, 30, 31, 33, 33, 33, 35, 36, 36, 38, 41, 41, 43,
+        47, 49, 49, 49, 48, 48, 49, 49, 49, 49, 50, 50, 50, 51, 31, 31, 31, 31,
+        31, 31, 31, 31, 33, 34, 34, 36, 37, 37, 39, 42, 42, 43, 47, 48, 48, 48,
+        47, 47, 47, 47, 47, 48, 49, 49, 49, 50, 31, 31, 31, 31, 31, 31, 31, 32,
+        34, 34, 34, 37, 38, 38, 40, 42, 42, 43, 46, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 48, 48, 48, 49, 31, 31, 31, 31, 31, 31, 31, 32, 34, 34, 34, 37,
+        38, 38, 40, 42, 42, 43, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48,
+        48, 49, 31, 31, 31, 31, 31, 31, 31, 32, 34, 35, 35, 37, 39, 39, 40, 42,
+        42, 43, 46, 47, 47, 46, 46, 46, 46, 46, 46, 46, 47, 47, 47, 48, 30, 31,
+        31, 31, 31, 32, 32, 32, 34, 35, 35, 38, 40, 40, 41, 42, 42, 43, 45, 46,
+        46, 46, 45, 45, 45, 45, 45, 45, 46, 46, 46, 47, 30, 31, 31, 31, 31, 32,
+        32, 32, 34, 35, 35, 38, 40, 40, 41, 42, 42, 43, 45, 46, 46, 46, 45, 45,
+        45, 45, 45, 45, 46, 46, 46, 47, 31, 31, 32, 32, 32, 32, 32, 33, 35, 36,
+        36, 38, 40, 40, 41, 43, 43, 43, 46, 46, 46, 46, 45, 45, 45, 45, 45, 45,
+        46, 46, 46, 47, 33, 33, 34, 34, 34, 34, 34, 35, 37, 38, 38, 41, 42, 42,
+        43, 44, 44, 45, 46, 47, 47, 46, 46, 46, 46, 45, 45, 45, 46, 46, 46, 47,
+        33, 34, 34, 34, 35, 35, 35, 36, 38, 39, 39, 41, 43, 43, 44, 45, 45, 45,
+        47, 47, 47, 46, 46, 46, 46, 45, 45, 45, 46, 46, 46, 47, 33, 34, 34, 34,
+        35, 35, 35, 36, 38, 39, 39, 41, 43, 43, 44, 45, 45, 45, 47, 47, 47, 46,
+        46, 46, 46, 45, 45, 45, 46, 46, 46, 47, 35, 36, 37, 37, 37, 38, 38, 38,
+        41, 41, 41, 44, 46, 46, 46, 46, 46, 46, 47, 47, 47, 47, 46, 46, 46, 45,
+        45, 45, 46, 46, 46, 47, 36, 37, 38, 38, 39, 40, 40, 40, 42, 43, 43, 46,
+        47, 47, 47, 47, 47, 47, 47, 48, 48, 47, 46, 46, 46, 45, 45, 45, 46, 46,
+        46, 46, 36, 37, 38, 38, 39, 40, 40, 40, 42, 43, 43, 46, 47, 47, 47, 47,
+        47, 47, 47, 48, 48, 47, 46, 46, 46, 45, 45, 45, 46, 46, 46, 46, 38, 39,
+        40, 40, 40, 41, 41, 41, 43, 44, 44, 46, 47, 47, 47, 48, 48, 48, 48, 49,
+        49, 48, 48, 48, 47, 47, 47, 47, 47, 47, 47, 48, 41, 42, 42, 42, 42, 42,
+        42, 43, 44, 45, 45, 46, 47, 47, 48, 48, 48, 49, 50, 50, 50, 50, 49, 49,
+        49, 49, 49, 49, 50, 50, 50, 50, 41, 42, 42, 42, 42, 42, 42, 43, 44, 45,
+        45, 46, 47, 47, 48, 48, 48, 49, 50, 50, 50, 50, 49, 49, 49, 49, 49, 49,
+        50, 50, 50, 50, 43, 43, 43, 43, 43, 43, 43, 43, 45, 45, 45, 46, 47, 47,
+        48, 49, 49, 49, 50, 51, 51, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 51,
+        47, 47, 46, 46, 46, 45, 45, 46, 46, 47, 47, 47, 47, 47, 48, 50, 50, 50,
+        52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53, 49, 48, 47, 47,
+        47, 46, 46, 46, 47, 47, 47, 47, 48, 48, 49, 50, 50, 51, 52, 53, 53, 53,
+        53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 49, 48, 47, 47, 47, 46, 46, 46,
+        47, 47, 47, 47, 48, 48, 49, 50, 50, 51, 52, 53, 53, 53, 53, 53, 53, 53,
+        53, 53, 54, 54, 54, 54, 49, 48, 47, 47, 46, 46, 46, 46, 46, 46, 46, 47,
+        47, 47, 48, 50, 50, 50, 52, 53, 53, 53, 54, 54, 54, 55, 55, 55, 55, 55,
+        55, 56, 48, 47, 47, 47, 46, 45, 45, 45, 46, 46, 46, 46, 46, 46, 48, 49,
+        49, 50, 52, 53, 53, 54, 54, 54, 55, 55, 55, 56, 56, 56, 56, 57, 48, 47,
+        47, 47, 46, 45, 45, 45, 46, 46, 46, 46, 46, 46, 48, 49, 49, 50, 52, 53,
+        53, 54, 54, 54, 55, 55, 55, 56, 56, 56, 56, 57, 49, 47, 47, 47, 46, 45,
+        45, 45, 46, 46, 46, 46, 46, 46, 47, 49, 49, 50, 52, 53, 53, 54, 55, 55,
+        55, 57, 57, 57, 57, 58, 58, 58, 49, 47, 47, 47, 46, 45, 45, 45, 45, 45,
+        45, 45, 45, 45, 47, 49, 49, 50, 52, 53, 53, 55, 55, 55, 57, 58, 58, 59,
+        59, 60, 60, 60, 49, 47, 47, 47, 46, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+        47, 49, 49, 50, 52, 53, 53, 55, 55, 55, 57, 58, 58, 59, 59, 60, 60, 60,
+        49, 48, 47, 47, 46, 45, 45, 45, 45, 45, 45, 45, 45, 45, 47, 49, 49, 50,
+        52, 53, 53, 55, 56, 56, 57, 59, 59, 59, 60, 60, 60, 61, 50, 49, 48, 48,
+        47, 46, 46, 46, 46, 46, 46, 46, 46, 46, 47, 50, 50, 50, 53, 54, 54, 55,
+        56, 56, 57, 59, 59, 60, 61, 61, 61, 62, 50, 49, 48, 48, 47, 46, 46, 46,
+        46, 46, 46, 46, 46, 46, 47, 50, 50, 50, 53, 54, 54, 55, 56, 56, 58, 60,
+        60, 60, 61, 61, 61, 63, 50, 49, 48, 48, 47, 46, 46, 46, 46, 46, 46, 46,
+        46, 46, 47, 50, 50, 50, 53, 54, 54, 55, 56, 56, 58, 60, 60, 60, 61, 61,
+        61, 63, 51, 50, 49, 49, 48, 47, 47, 47, 47, 47, 47, 47, 46, 46, 48, 50,
+        50, 51, 53, 54, 54, 56, 57, 57, 58, 60, 60, 61, 62, 63, 63, 64,
+        /* Size 4x8 */
+        31, 38, 47, 48, 31, 40, 46, 45, 35, 43, 47, 46, 39, 47, 47, 45, 43, 47,
+        50, 50, 47, 47, 53, 55, 46, 46, 53, 58, 48, 46, 54, 59,
+        /* Size 8x4 */
+        31, 31, 35, 39, 43, 47, 46, 48, 38, 40, 43, 47, 47, 47, 46, 46, 47, 46,
+        47, 47, 50, 53, 53, 54, 48, 45, 46, 45, 50, 55, 58, 59,
+        /* Size 8x16 */
+        32, 31, 33, 37, 45, 48, 49, 50, 31, 31, 34, 38, 45, 47, 47, 48, 31, 32,
+        34, 39, 45, 46, 46, 47, 30, 32, 35, 40, 44, 46, 45, 46, 33, 35, 37, 42,
+        46, 47, 45, 46, 33, 36, 38, 43, 46, 47, 46, 46, 37, 40, 43, 47, 47, 47,
+        45, 46, 39, 41, 43, 47, 48, 48, 47, 47, 42, 43, 44, 47, 49, 50, 49, 50,
+        47, 46, 46, 48, 51, 52, 53, 53, 49, 46, 47, 48, 52, 53, 53, 54, 48, 46,
+        46, 47, 51, 53, 56, 56, 48, 45, 46, 46, 51, 53, 57, 57, 49, 45, 45, 46,
+        51, 53, 58, 59, 50, 46, 46, 46, 52, 54, 59, 61, 50, 46, 46, 46, 52, 54,
+        59, 61,
+        /* Size 16x8 */
+        32, 31, 31, 30, 33, 33, 37, 39, 42, 47, 49, 48, 48, 49, 50, 50, 31, 31,
+        32, 32, 35, 36, 40, 41, 43, 46, 46, 46, 45, 45, 46, 46, 33, 34, 34, 35,
+        37, 38, 43, 43, 44, 46, 47, 46, 46, 45, 46, 46, 37, 38, 39, 40, 42, 43,
+        47, 47, 47, 48, 48, 47, 46, 46, 46, 46, 45, 45, 45, 44, 46, 46, 47, 48,
+        49, 51, 52, 51, 51, 51, 52, 52, 48, 47, 46, 46, 47, 47, 47, 48, 50, 52,
+        53, 53, 53, 53, 54, 54, 49, 47, 46, 45, 45, 46, 45, 47, 49, 53, 53, 56,
+        57, 58, 59, 59, 50, 48, 47, 46, 46, 46, 46, 47, 50, 53, 54, 56, 57, 59,
+        61, 61,
+        /* Size 16x32 */
+        32, 31, 31, 31, 33, 37, 37, 38, 45, 48, 48, 49, 49, 49, 50, 52, 31, 31,
+        31, 31, 33, 38, 38, 39, 45, 47, 47, 48, 48, 48, 49, 51, 31, 31, 31, 31,
+        34, 38, 38, 40, 45, 47, 47, 47, 47, 47, 48, 50, 31, 31, 31, 31, 34, 38,
+        38, 40, 45, 47, 47, 47, 47, 47, 48, 50, 31, 31, 32, 32, 34, 39, 39, 40,
+        45, 46, 46, 46, 46, 46, 47, 49, 30, 31, 32, 32, 35, 40, 40, 41, 44, 46,
+        46, 45, 45, 45, 46, 48, 30, 31, 32, 32, 35, 40, 40, 41, 44, 46, 46, 45,
+        45, 45, 46, 48, 31, 32, 33, 33, 35, 40, 40, 41, 45, 46, 46, 45, 45, 45,
+        46, 48, 33, 34, 35, 35, 37, 42, 42, 43, 46, 47, 47, 46, 45, 45, 46, 47,
+        33, 35, 36, 36, 38, 43, 43, 44, 46, 47, 47, 46, 46, 46, 46, 47, 33, 35,
+        36, 36, 38, 43, 43, 44, 46, 47, 47, 46, 46, 46, 46, 47, 35, 37, 38, 38,
+        41, 45, 45, 46, 47, 47, 47, 46, 45, 45, 46, 47, 37, 39, 40, 40, 43, 47,
+        47, 47, 47, 47, 47, 46, 45, 45, 46, 47, 37, 39, 40, 40, 43, 47, 47, 47,
+        47, 47, 47, 46, 45, 45, 46, 47, 39, 40, 41, 41, 43, 47, 47, 47, 48, 48,
+        48, 47, 47, 47, 47, 48, 42, 42, 43, 43, 44, 47, 47, 48, 49, 50, 50, 49,
+        49, 49, 50, 50, 42, 42, 43, 43, 44, 47, 47, 48, 49, 50, 50, 49, 49, 49,
+        50, 50, 43, 43, 43, 43, 45, 47, 47, 48, 50, 50, 50, 50, 50, 50, 50, 51,
+        47, 46, 46, 46, 46, 48, 48, 48, 51, 52, 52, 52, 53, 53, 53, 53, 49, 47,
+        46, 46, 47, 48, 48, 49, 52, 53, 53, 53, 53, 53, 54, 54, 49, 47, 46, 46,
+        47, 48, 48, 49, 52, 53, 53, 53, 53, 53, 54, 54, 48, 47, 46, 46, 46, 47,
+        47, 48, 52, 53, 53, 54, 55, 55, 55, 56, 48, 47, 46, 46, 46, 47, 47, 48,
+        51, 53, 53, 54, 56, 56, 56, 57, 48, 47, 46, 46, 46, 47, 47, 48, 51, 53,
+        53, 54, 56, 56, 56, 57, 48, 47, 45, 45, 46, 46, 46, 47, 51, 53, 53, 55,
+        57, 57, 57, 59, 49, 46, 45, 45, 45, 46, 46, 47, 51, 53, 53, 56, 58, 58,
+        59, 61, 49, 46, 45, 45, 45, 46, 46, 47, 51, 53, 53, 56, 58, 58, 59, 61,
+        49, 47, 45, 45, 45, 46, 46, 47, 52, 53, 53, 56, 58, 58, 60, 62, 50, 48,
+        46, 46, 46, 46, 46, 48, 52, 54, 54, 57, 59, 59, 61, 63, 50, 48, 46, 46,
+        46, 46, 46, 48, 52, 54, 54, 57, 59, 59, 61, 64, 50, 48, 46, 46, 46, 46,
+        46, 48, 52, 54, 54, 57, 59, 59, 61, 64, 51, 49, 47, 47, 47, 47, 47, 48,
+        52, 54, 54, 58, 60, 60, 62, 65,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 30, 30, 31, 33, 33, 33, 35, 37, 37, 39, 42, 42, 43,
+        47, 49, 49, 48, 48, 48, 48, 49, 49, 49, 50, 50, 50, 51, 31, 31, 31, 31,
+        31, 31, 31, 32, 34, 35, 35, 37, 39, 39, 40, 42, 42, 43, 46, 47, 47, 47,
+        47, 47, 47, 46, 46, 47, 48, 48, 48, 49, 31, 31, 31, 31, 32, 32, 32, 33,
+        35, 36, 36, 38, 40, 40, 41, 43, 43, 43, 46, 46, 46, 46, 46, 46, 45, 45,
+        45, 45, 46, 46, 46, 47, 31, 31, 31, 31, 32, 32, 32, 33, 35, 36, 36, 38,
+        40, 40, 41, 43, 43, 43, 46, 46, 46, 46, 46, 46, 45, 45, 45, 45, 46, 46,
+        46, 47, 33, 33, 34, 34, 34, 35, 35, 35, 37, 38, 38, 41, 43, 43, 43, 44,
+        44, 45, 46, 47, 47, 46, 46, 46, 46, 45, 45, 45, 46, 46, 46, 47, 37, 38,
+        38, 38, 39, 40, 40, 40, 42, 43, 43, 45, 47, 47, 47, 47, 47, 47, 48, 48,
+        48, 47, 47, 47, 46, 46, 46, 46, 46, 46, 46, 47, 37, 38, 38, 38, 39, 40,
+        40, 40, 42, 43, 43, 45, 47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 47, 47,
+        46, 46, 46, 46, 46, 46, 46, 47, 38, 39, 40, 40, 40, 41, 41, 41, 43, 44,
+        44, 46, 47, 47, 47, 48, 48, 48, 48, 49, 49, 48, 48, 48, 47, 47, 47, 47,
+        48, 48, 48, 48, 45, 45, 45, 45, 45, 44, 44, 45, 46, 46, 46, 47, 47, 47,
+        48, 49, 49, 50, 51, 52, 52, 52, 51, 51, 51, 51, 51, 52, 52, 52, 52, 52,
+        48, 47, 47, 47, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 48, 50, 50, 50,
+        52, 53, 53, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 48, 47, 47, 47,
+        46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 48, 50, 50, 50, 52, 53, 53, 53,
+        53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 49, 48, 47, 47, 46, 45, 45, 45,
+        46, 46, 46, 46, 46, 46, 47, 49, 49, 50, 52, 53, 53, 54, 54, 54, 55, 56,
+        56, 56, 57, 57, 57, 58, 49, 48, 47, 47, 46, 45, 45, 45, 45, 46, 46, 45,
+        45, 45, 47, 49, 49, 50, 53, 53, 53, 55, 56, 56, 57, 58, 58, 58, 59, 59,
+        59, 60, 49, 48, 47, 47, 46, 45, 45, 45, 45, 46, 46, 45, 45, 45, 47, 49,
+        49, 50, 53, 53, 53, 55, 56, 56, 57, 58, 58, 58, 59, 59, 59, 60, 50, 49,
+        48, 48, 47, 46, 46, 46, 46, 46, 46, 46, 46, 46, 47, 50, 50, 50, 53, 54,
+        54, 55, 56, 56, 57, 59, 59, 60, 61, 61, 61, 62, 52, 51, 50, 50, 49, 48,
+        48, 48, 47, 47, 47, 47, 47, 47, 48, 50, 50, 51, 53, 54, 54, 56, 57, 57,
+        59, 61, 61, 62, 63, 64, 64, 65,
+        /* Size 4x16 */
+        31, 37, 48, 49, 31, 38, 47, 47, 31, 39, 46, 46, 31, 40, 46, 45, 34, 42,
+        47, 45, 35, 43, 47, 46, 39, 47, 47, 45, 40, 47, 48, 47, 42, 47, 50, 49,
+        46, 48, 52, 53, 47, 48, 53, 53, 47, 47, 53, 56, 47, 46, 53, 57, 46, 46,
+        53, 58, 48, 46, 54, 59, 48, 46, 54, 59,
+        /* Size 16x4 */
+        31, 31, 31, 31, 34, 35, 39, 40, 42, 46, 47, 47, 47, 46, 48, 48, 37, 38,
+        39, 40, 42, 43, 47, 47, 47, 48, 48, 47, 46, 46, 46, 46, 48, 47, 46, 46,
+        47, 47, 47, 48, 50, 52, 53, 53, 53, 53, 54, 54, 49, 47, 46, 45, 45, 46,
+        45, 47, 49, 53, 53, 56, 57, 58, 59, 59,
+        /* Size 8x32 */
+        32, 31, 33, 37, 45, 48, 49, 50, 31, 31, 33, 38, 45, 47, 48, 49, 31, 31,
+        34, 38, 45, 47, 47, 48, 31, 31, 34, 38, 45, 47, 47, 48, 31, 32, 34, 39,
+        45, 46, 46, 47, 30, 32, 35, 40, 44, 46, 45, 46, 30, 32, 35, 40, 44, 46,
+        45, 46, 31, 33, 35, 40, 45, 46, 45, 46, 33, 35, 37, 42, 46, 47, 45, 46,
+        33, 36, 38, 43, 46, 47, 46, 46, 33, 36, 38, 43, 46, 47, 46, 46, 35, 38,
+        41, 45, 47, 47, 45, 46, 37, 40, 43, 47, 47, 47, 45, 46, 37, 40, 43, 47,
+        47, 47, 45, 46, 39, 41, 43, 47, 48, 48, 47, 47, 42, 43, 44, 47, 49, 50,
+        49, 50, 42, 43, 44, 47, 49, 50, 49, 50, 43, 43, 45, 47, 50, 50, 50, 50,
+        47, 46, 46, 48, 51, 52, 53, 53, 49, 46, 47, 48, 52, 53, 53, 54, 49, 46,
+        47, 48, 52, 53, 53, 54, 48, 46, 46, 47, 52, 53, 55, 55, 48, 46, 46, 47,
+        51, 53, 56, 56, 48, 46, 46, 47, 51, 53, 56, 56, 48, 45, 46, 46, 51, 53,
+        57, 57, 49, 45, 45, 46, 51, 53, 58, 59, 49, 45, 45, 46, 51, 53, 58, 59,
+        49, 45, 45, 46, 52, 53, 58, 60, 50, 46, 46, 46, 52, 54, 59, 61, 50, 46,
+        46, 46, 52, 54, 59, 61, 50, 46, 46, 46, 52, 54, 59, 61, 51, 47, 47, 47,
+        52, 54, 60, 62,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 30, 30, 31, 33, 33, 33, 35, 37, 37, 39, 42, 42, 43,
+        47, 49, 49, 48, 48, 48, 48, 49, 49, 49, 50, 50, 50, 51, 31, 31, 31, 31,
+        32, 32, 32, 33, 35, 36, 36, 38, 40, 40, 41, 43, 43, 43, 46, 46, 46, 46,
+        46, 46, 45, 45, 45, 45, 46, 46, 46, 47, 33, 33, 34, 34, 34, 35, 35, 35,
+        37, 38, 38, 41, 43, 43, 43, 44, 44, 45, 46, 47, 47, 46, 46, 46, 46, 45,
+        45, 45, 46, 46, 46, 47, 37, 38, 38, 38, 39, 40, 40, 40, 42, 43, 43, 45,
+        47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 47, 47, 46, 46, 46, 46, 46, 46,
+        46, 47, 45, 45, 45, 45, 45, 44, 44, 45, 46, 46, 46, 47, 47, 47, 48, 49,
+        49, 50, 51, 52, 52, 52, 51, 51, 51, 51, 51, 52, 52, 52, 52, 52, 48, 47,
+        47, 47, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 48, 50, 50, 50, 52, 53,
+        53, 53, 53, 53, 53, 53, 53, 53, 54, 54, 54, 54, 49, 48, 47, 47, 46, 45,
+        45, 45, 45, 46, 46, 45, 45, 45, 47, 49, 49, 50, 53, 53, 53, 55, 56, 56,
+        57, 58, 58, 58, 59, 59, 59, 60, 50, 49, 48, 48, 47, 46, 46, 46, 46, 46,
+        46, 46, 46, 46, 47, 50, 50, 50, 53, 54, 54, 55, 56, 56, 57, 59, 59, 60,
+        61, 61, 61, 62 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 32, 34, 38, 32, 33, 35, 39, 34, 35, 39, 45, 38, 39, 45, 54,
+        /* Size 8x8 */
+        31, 31, 32, 32, 33, 34, 37, 41, 31, 32, 32, 32, 33, 34, 36, 39, 32, 32,
+        32, 33, 34, 35, 37, 40, 32, 32, 33, 34, 35, 36, 38, 41, 33, 33, 34, 35,
+        37, 39, 41, 44, 34, 34, 35, 36, 39, 43, 46, 49, 37, 36, 37, 38, 41, 46,
+        51, 54, 41, 39, 40, 41, 44, 49, 54, 58,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 34, 34, 36, 36, 39, 39, 44, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 34, 34, 35, 35, 38, 38, 42, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 34, 34, 35, 35, 38, 38, 42, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 37, 37, 41, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 34, 37, 37, 41, 31, 32, 32, 32, 32, 33, 33, 34, 34, 35,
+        35, 36, 36, 39, 39, 42, 31, 32, 32, 32, 32, 33, 33, 34, 34, 35, 35, 36,
+        36, 39, 39, 42, 32, 32, 32, 32, 32, 34, 34, 35, 35, 37, 37, 38, 38, 40,
+        40, 42, 32, 32, 32, 32, 32, 34, 34, 35, 35, 37, 37, 38, 38, 40, 40, 42,
+        34, 34, 34, 33, 33, 35, 35, 37, 37, 39, 39, 42, 42, 45, 45, 47, 34, 34,
+        34, 33, 33, 35, 35, 37, 37, 39, 39, 42, 42, 45, 45, 47, 36, 35, 35, 34,
+        34, 36, 36, 38, 38, 42, 42, 48, 48, 50, 50, 54, 36, 35, 35, 34, 34, 36,
+        36, 38, 38, 42, 42, 48, 48, 50, 50, 54, 39, 38, 38, 37, 37, 39, 39, 40,
+        40, 45, 45, 50, 50, 54, 54, 58, 39, 38, 38, 37, 37, 39, 39, 40, 40, 45,
+        45, 50, 50, 54, 54, 58, 44, 42, 42, 41, 41, 42, 42, 42, 42, 47, 47, 54,
+        54, 58, 58, 63,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 33,
+        34, 34, 34, 35, 36, 36, 36, 37, 39, 39, 39, 41, 44, 44, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 34,
+        35, 35, 35, 37, 39, 39, 39, 41, 43, 43, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 34, 35, 35, 35, 37,
+        38, 38, 38, 40, 42, 42, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 34, 34, 34, 34, 35, 35, 35, 37, 38, 38, 38, 40,
+        42, 42, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 34, 34, 34, 34, 35, 35, 35, 37, 38, 38, 38, 40, 42, 42, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34,
+        34, 34, 35, 35, 35, 36, 38, 38, 38, 39, 41, 41, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34,
+        34, 36, 37, 37, 37, 39, 41, 41, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 36, 37, 37,
+        37, 39, 41, 41, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 36, 37, 37, 37, 39, 41, 41,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 34,
+        34, 34, 34, 35, 35, 35, 35, 37, 38, 38, 38, 40, 41, 41, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 36,
+        36, 36, 36, 38, 39, 39, 39, 40, 42, 42, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 36, 36, 36, 36, 38,
+        39, 39, 39, 40, 42, 42, 31, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        33, 33, 34, 34, 34, 34, 35, 35, 35, 36, 36, 36, 36, 38, 39, 39, 39, 40,
+        42, 42, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34,
+        34, 35, 36, 36, 36, 36, 37, 37, 37, 38, 40, 40, 40, 41, 42, 42, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 34, 35, 35, 35, 36, 37, 37,
+        37, 37, 38, 38, 38, 39, 40, 40, 40, 41, 42, 42, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 34, 34, 34, 34, 35, 35, 35, 36, 37, 37, 37, 37, 38, 38,
+        38, 39, 40, 40, 40, 41, 42, 42, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        34, 34, 34, 34, 35, 35, 35, 36, 37, 37, 37, 37, 38, 38, 38, 39, 40, 40,
+        40, 41, 42, 42, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35,
+        36, 36, 36, 37, 38, 38, 38, 39, 40, 40, 40, 41, 42, 42, 42, 44, 45, 45,
+        34, 34, 34, 34, 34, 34, 33, 33, 33, 34, 35, 35, 35, 36, 37, 37, 37, 38,
+        39, 39, 39, 41, 42, 42, 42, 44, 45, 45, 45, 46, 47, 47, 34, 34, 34, 34,
+        34, 34, 33, 33, 33, 34, 35, 35, 35, 36, 37, 37, 37, 38, 39, 39, 39, 41,
+        42, 42, 42, 44, 45, 45, 45, 46, 47, 47, 34, 34, 34, 34, 34, 34, 33, 33,
+        33, 34, 35, 35, 35, 36, 37, 37, 37, 38, 39, 39, 39, 41, 42, 42, 42, 44,
+        45, 45, 45, 46, 47, 47, 35, 34, 34, 34, 34, 34, 34, 34, 34, 35, 36, 36,
+        36, 36, 37, 37, 37, 39, 41, 41, 41, 43, 45, 45, 45, 46, 47, 47, 47, 49,
+        50, 50, 36, 35, 35, 35, 35, 35, 34, 34, 34, 35, 36, 36, 36, 37, 38, 38,
+        38, 40, 42, 42, 42, 45, 48, 48, 48, 49, 50, 50, 50, 52, 54, 54, 36, 35,
+        35, 35, 35, 35, 34, 34, 34, 35, 36, 36, 36, 37, 38, 38, 38, 40, 42, 42,
+        42, 45, 48, 48, 48, 49, 50, 50, 50, 52, 54, 54, 36, 35, 35, 35, 35, 35,
+        34, 34, 34, 35, 36, 36, 36, 37, 38, 38, 38, 40, 42, 42, 42, 45, 48, 48,
+        48, 49, 50, 50, 50, 52, 54, 54, 37, 37, 37, 37, 37, 36, 36, 36, 36, 37,
+        38, 38, 38, 38, 39, 39, 39, 41, 44, 44, 44, 46, 49, 49, 49, 51, 52, 52,
+        52, 54, 56, 56, 39, 39, 38, 38, 38, 38, 37, 37, 37, 38, 39, 39, 39, 40,
+        40, 40, 40, 42, 45, 45, 45, 47, 50, 50, 50, 52, 54, 54, 54, 56, 58, 58,
+        39, 39, 38, 38, 38, 38, 37, 37, 37, 38, 39, 39, 39, 40, 40, 40, 40, 42,
+        45, 45, 45, 47, 50, 50, 50, 52, 54, 54, 54, 56, 58, 58, 39, 39, 38, 38,
+        38, 38, 37, 37, 37, 38, 39, 39, 39, 40, 40, 40, 40, 42, 45, 45, 45, 47,
+        50, 50, 50, 52, 54, 54, 54, 56, 58, 58, 41, 41, 40, 40, 40, 39, 39, 39,
+        39, 40, 40, 40, 40, 41, 41, 41, 41, 44, 46, 46, 46, 49, 52, 52, 52, 54,
+        56, 56, 56, 58, 60, 60, 44, 43, 42, 42, 42, 41, 41, 41, 41, 41, 42, 42,
+        42, 42, 42, 42, 42, 45, 47, 47, 47, 50, 54, 54, 54, 56, 58, 58, 58, 60,
+        63, 63, 44, 43, 42, 42, 42, 41, 41, 41, 41, 41, 42, 42, 42, 42, 42, 42,
+        42, 45, 47, 47, 47, 50, 54, 54, 54, 56, 58, 58, 58, 60, 63, 63,
+        /* Size 4x8 */
+        31, 32, 34, 39, 32, 32, 34, 38, 32, 33, 34, 38, 32, 33, 36, 40, 33, 34,
+        38, 42, 34, 36, 41, 47, 37, 38, 44, 52, 40, 40, 46, 56,
+        /* Size 8x4 */
+        31, 32, 32, 32, 33, 34, 37, 40, 32, 32, 33, 33, 34, 36, 38, 40, 34, 34,
+        34, 36, 38, 41, 44, 46, 39, 38, 38, 40, 42, 47, 52, 56,
+        /* Size 8x16 */
+        32, 31, 31, 32, 32, 36, 36, 44, 31, 32, 32, 32, 32, 35, 35, 42, 31, 32,
+        32, 32, 32, 35, 35, 42, 31, 32, 32, 33, 33, 34, 34, 41, 31, 32, 32, 33,
+        33, 34, 34, 41, 32, 32, 32, 34, 34, 36, 36, 42, 32, 32, 32, 34, 34, 36,
+        36, 42, 32, 33, 33, 35, 35, 38, 38, 42, 32, 33, 33, 35, 35, 38, 38, 42,
+        34, 34, 34, 37, 37, 42, 42, 48, 34, 34, 34, 37, 37, 42, 42, 48, 36, 34,
+        34, 38, 38, 48, 48, 54, 36, 34, 34, 38, 38, 48, 48, 54, 39, 37, 37, 40,
+        40, 50, 50, 58, 39, 37, 37, 40, 40, 50, 50, 58, 44, 41, 41, 43, 43, 53,
+        53, 63,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 32, 32, 32, 32, 34, 34, 36, 36, 39, 39, 44, 31, 32,
+        32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 34, 37, 37, 41, 31, 32, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 34, 34, 37, 37, 41, 32, 32, 32, 33, 33, 34,
+        34, 35, 35, 37, 37, 38, 38, 40, 40, 43, 32, 32, 32, 33, 33, 34, 34, 35,
+        35, 37, 37, 38, 38, 40, 40, 43, 36, 35, 35, 34, 34, 36, 36, 38, 38, 42,
+        42, 48, 48, 50, 50, 53, 36, 35, 35, 34, 34, 36, 36, 38, 38, 42, 42, 48,
+        48, 50, 50, 53, 44, 42, 42, 41, 41, 42, 42, 42, 42, 48, 48, 54, 54, 58,
+        58, 63,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 32, 32, 32, 32, 34, 36, 36, 36, 39, 44, 44, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 34, 35, 35, 35, 39, 43, 43, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 34, 35, 35, 35, 38, 42, 42, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 34, 35, 35, 35, 38, 42, 42, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 34, 35, 35, 35, 38, 42, 42, 31, 32, 32, 32, 32, 32, 32, 32, 32, 34,
+        35, 35, 35, 38, 41, 41, 31, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34,
+        34, 37, 41, 41, 31, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 37,
+        41, 41, 31, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 37, 41, 41,
+        31, 32, 32, 32, 32, 33, 33, 33, 33, 34, 35, 35, 35, 38, 41, 41, 32, 32,
+        32, 32, 32, 33, 34, 34, 34, 35, 36, 36, 36, 39, 42, 42, 32, 32, 32, 32,
+        32, 33, 34, 34, 34, 35, 36, 36, 36, 39, 42, 42, 32, 32, 32, 32, 32, 33,
+        34, 34, 34, 35, 36, 36, 36, 39, 42, 42, 32, 32, 32, 32, 32, 33, 34, 34,
+        34, 36, 37, 37, 37, 40, 42, 42, 32, 32, 33, 33, 33, 34, 35, 35, 35, 37,
+        38, 38, 38, 40, 42, 42, 32, 32, 33, 33, 33, 34, 35, 35, 35, 37, 38, 38,
+        38, 40, 42, 42, 32, 32, 33, 33, 33, 34, 35, 35, 35, 37, 38, 38, 38, 40,
+        42, 42, 33, 33, 33, 33, 33, 34, 36, 36, 36, 38, 40, 40, 40, 42, 45, 45,
+        34, 34, 34, 34, 34, 35, 37, 37, 37, 39, 42, 42, 42, 45, 48, 48, 34, 34,
+        34, 34, 34, 35, 37, 37, 37, 39, 42, 42, 42, 45, 48, 48, 34, 34, 34, 34,
+        34, 35, 37, 37, 37, 39, 42, 42, 42, 45, 48, 48, 35, 34, 34, 34, 34, 36,
+        37, 37, 37, 41, 45, 45, 45, 47, 50, 50, 36, 35, 34, 34, 34, 36, 38, 38,
+        38, 43, 48, 48, 48, 51, 54, 54, 36, 35, 34, 34, 34, 36, 38, 38, 38, 43,
+        48, 48, 48, 51, 54, 54, 36, 35, 34, 34, 34, 36, 38, 38, 38, 43, 48, 48,
+        48, 51, 54, 54, 37, 37, 36, 36, 36, 38, 39, 39, 39, 44, 49, 49, 49, 52,
+        56, 56, 39, 38, 37, 37, 37, 39, 40, 40, 40, 45, 50, 50, 50, 54, 58, 58,
+        39, 38, 37, 37, 37, 39, 40, 40, 40, 45, 50, 50, 50, 54, 58, 58, 39, 38,
+        37, 37, 37, 39, 40, 40, 40, 45, 50, 50, 50, 54, 58, 58, 41, 40, 39, 39,
+        39, 40, 42, 42, 42, 46, 52, 52, 52, 56, 60, 60, 44, 42, 41, 41, 41, 42,
+        43, 43, 43, 48, 53, 53, 53, 58, 63, 63, 44, 42, 41, 41, 41, 42, 43, 43,
+        43, 48, 53, 53, 53, 58, 63, 63,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33,
+        34, 34, 34, 35, 36, 36, 36, 37, 39, 39, 39, 41, 44, 44, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 34,
+        35, 35, 35, 37, 38, 38, 38, 40, 42, 42, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 36,
+        37, 37, 37, 39, 41, 41, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 36, 37, 37, 37, 39,
+        41, 41, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 34, 34, 34, 34, 34, 34, 34, 36, 37, 37, 37, 39, 41, 41, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35,
+        35, 36, 36, 36, 36, 38, 39, 39, 39, 40, 42, 42, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 36, 37, 37, 37, 37, 38, 38,
+        38, 39, 40, 40, 40, 42, 43, 43, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        34, 34, 34, 34, 35, 35, 35, 36, 37, 37, 37, 37, 38, 38, 38, 39, 40, 40,
+        40, 42, 43, 43, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34,
+        35, 35, 35, 36, 37, 37, 37, 37, 38, 38, 38, 39, 40, 40, 40, 42, 43, 43,
+        34, 34, 34, 34, 34, 34, 33, 33, 33, 34, 35, 35, 35, 36, 37, 37, 37, 38,
+        39, 39, 39, 41, 43, 43, 43, 44, 45, 45, 45, 46, 48, 48, 36, 35, 35, 35,
+        35, 35, 34, 34, 34, 35, 36, 36, 36, 37, 38, 38, 38, 40, 42, 42, 42, 45,
+        48, 48, 48, 49, 50, 50, 50, 52, 53, 53, 36, 35, 35, 35, 35, 35, 34, 34,
+        34, 35, 36, 36, 36, 37, 38, 38, 38, 40, 42, 42, 42, 45, 48, 48, 48, 49,
+        50, 50, 50, 52, 53, 53, 36, 35, 35, 35, 35, 35, 34, 34, 34, 35, 36, 36,
+        36, 37, 38, 38, 38, 40, 42, 42, 42, 45, 48, 48, 48, 49, 50, 50, 50, 52,
+        53, 53, 39, 39, 38, 38, 38, 38, 37, 37, 37, 38, 39, 39, 39, 40, 40, 40,
+        40, 42, 45, 45, 45, 47, 51, 51, 51, 52, 54, 54, 54, 56, 58, 58, 44, 43,
+        42, 42, 42, 41, 41, 41, 41, 41, 42, 42, 42, 42, 42, 42, 42, 45, 48, 48,
+        48, 50, 54, 54, 54, 56, 58, 58, 58, 60, 63, 63, 44, 43, 42, 42, 42, 41,
+        41, 41, 41, 41, 42, 42, 42, 42, 42, 42, 42, 45, 48, 48, 48, 50, 54, 54,
+        54, 56, 58, 58, 58, 60, 63, 63,
+        /* Size 4x16 */
+        31, 32, 34, 39, 32, 32, 34, 38, 32, 32, 34, 38, 32, 32, 33, 37, 32, 32,
+        33, 37, 32, 33, 35, 39, 32, 33, 35, 39, 32, 34, 37, 40, 32, 34, 37, 40,
+        34, 35, 39, 45, 34, 35, 39, 45, 35, 36, 43, 51, 35, 36, 43, 51, 38, 39,
+        45, 54, 38, 39, 45, 54, 42, 42, 48, 58,
+        /* Size 16x4 */
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 34, 34, 35, 35, 38, 38, 42, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 39, 39, 42, 34, 34, 34, 33,
+        33, 35, 35, 37, 37, 39, 39, 43, 43, 45, 45, 48, 39, 38, 38, 37, 37, 39,
+        39, 40, 40, 45, 45, 51, 51, 54, 54, 58,
+        /* Size 8x32 */
+        32, 31, 31, 32, 32, 36, 36, 44, 31, 31, 31, 32, 32, 35, 35, 43, 31, 32,
+        32, 32, 32, 35, 35, 42, 31, 32, 32, 32, 32, 35, 35, 42, 31, 32, 32, 32,
+        32, 35, 35, 42, 31, 32, 32, 32, 32, 35, 35, 41, 31, 32, 32, 33, 33, 34,
+        34, 41, 31, 32, 32, 33, 33, 34, 34, 41, 31, 32, 32, 33, 33, 34, 34, 41,
+        31, 32, 32, 33, 33, 35, 35, 41, 32, 32, 32, 34, 34, 36, 36, 42, 32, 32,
+        32, 34, 34, 36, 36, 42, 32, 32, 32, 34, 34, 36, 36, 42, 32, 32, 32, 34,
+        34, 37, 37, 42, 32, 33, 33, 35, 35, 38, 38, 42, 32, 33, 33, 35, 35, 38,
+        38, 42, 32, 33, 33, 35, 35, 38, 38, 42, 33, 33, 33, 36, 36, 40, 40, 45,
+        34, 34, 34, 37, 37, 42, 42, 48, 34, 34, 34, 37, 37, 42, 42, 48, 34, 34,
+        34, 37, 37, 42, 42, 48, 35, 34, 34, 37, 37, 45, 45, 50, 36, 34, 34, 38,
+        38, 48, 48, 54, 36, 34, 34, 38, 38, 48, 48, 54, 36, 34, 34, 38, 38, 48,
+        48, 54, 37, 36, 36, 39, 39, 49, 49, 56, 39, 37, 37, 40, 40, 50, 50, 58,
+        39, 37, 37, 40, 40, 50, 50, 58, 39, 37, 37, 40, 40, 50, 50, 58, 41, 39,
+        39, 42, 42, 52, 52, 60, 44, 41, 41, 43, 43, 53, 53, 63, 44, 41, 41, 43,
+        43, 53, 53, 63,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33,
+        34, 34, 34, 35, 36, 36, 36, 37, 39, 39, 39, 41, 44, 44, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34,
+        34, 34, 34, 36, 37, 37, 37, 39, 41, 41, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 36,
+        37, 37, 37, 39, 41, 41, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34,
+        34, 34, 35, 35, 35, 36, 37, 37, 37, 37, 38, 38, 38, 39, 40, 40, 40, 42,
+        43, 43, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35,
+        35, 36, 37, 37, 37, 37, 38, 38, 38, 39, 40, 40, 40, 42, 43, 43, 36, 35,
+        35, 35, 35, 35, 34, 34, 34, 35, 36, 36, 36, 37, 38, 38, 38, 40, 42, 42,
+        42, 45, 48, 48, 48, 49, 50, 50, 50, 52, 53, 53, 36, 35, 35, 35, 35, 35,
+        34, 34, 34, 35, 36, 36, 36, 37, 38, 38, 38, 40, 42, 42, 42, 45, 48, 48,
+        48, 49, 50, 50, 50, 52, 53, 53, 44, 43, 42, 42, 42, 41, 41, 41, 41, 41,
+        42, 42, 42, 42, 42, 42, 42, 45, 48, 48, 48, 50, 54, 54, 54, 56, 58, 58,
+        58, 60, 63, 63 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 34, 42, 47, 34, 39, 45, 46, 42, 45, 48, 49, 47, 46, 49, 54,
+        /* Size 8x8 */
+        31, 31, 32, 35, 39, 45, 48, 48, 31, 31, 33, 37, 41, 44, 46, 46, 32, 33,
+        35, 39, 42, 45, 46, 45, 35, 37, 39, 43, 45, 47, 47, 46, 39, 41, 42, 45,
+        47, 48, 48, 47, 45, 44, 45, 47, 48, 50, 51, 51, 48, 46, 46, 47, 48, 51,
+        53, 54, 48, 46, 45, 46, 47, 51, 54, 56,
+        /* Size 16x16 */
+        32, 31, 31, 30, 30, 33, 33, 36, 36, 41, 41, 49, 49, 48, 48, 49, 31, 31,
+        31, 31, 31, 34, 34, 38, 38, 42, 42, 47, 47, 47, 47, 47, 31, 31, 31, 31,
+        31, 34, 34, 38, 38, 42, 42, 47, 47, 47, 47, 47, 30, 31, 31, 32, 32, 35,
+        35, 40, 40, 42, 42, 46, 46, 45, 45, 45, 30, 31, 31, 32, 32, 35, 35, 40,
+        40, 42, 42, 46, 46, 45, 45, 45, 33, 34, 34, 35, 35, 39, 39, 43, 43, 45,
+        45, 47, 47, 46, 46, 45, 33, 34, 34, 35, 35, 39, 39, 43, 43, 45, 45, 47,
+        47, 46, 46, 45, 36, 38, 38, 40, 40, 43, 43, 47, 47, 47, 47, 48, 48, 46,
+        46, 45, 36, 38, 38, 40, 40, 43, 43, 47, 47, 47, 47, 48, 48, 46, 46, 45,
+        41, 42, 42, 42, 42, 45, 45, 47, 47, 48, 48, 50, 50, 49, 49, 49, 41, 42,
+        42, 42, 42, 45, 45, 47, 47, 48, 48, 50, 50, 49, 49, 49, 49, 47, 47, 46,
+        46, 47, 47, 48, 48, 50, 50, 53, 53, 53, 53, 53, 49, 47, 47, 46, 46, 47,
+        47, 48, 48, 50, 50, 53, 53, 53, 53, 53, 48, 47, 47, 45, 45, 46, 46, 46,
+        46, 49, 49, 53, 53, 54, 54, 55, 48, 47, 47, 45, 45, 46, 46, 46, 46, 49,
+        49, 53, 53, 54, 54, 55, 49, 47, 47, 45, 45, 45, 45, 45, 45, 49, 49, 53,
+        53, 55, 55, 58,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 30, 30, 30, 32, 33, 33, 33, 35, 36, 36, 36, 39,
+        41, 41, 41, 45, 49, 49, 49, 49, 48, 48, 48, 49, 49, 49, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 34, 34, 34, 35, 37, 37, 37, 39, 42, 42, 42, 45,
+        48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 33, 34, 34, 34, 36, 38, 38, 38, 40, 42, 42, 42, 45, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 34, 34,
+        34, 36, 38, 38, 38, 40, 42, 42, 42, 45, 47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 34, 34, 34, 36, 38, 38,
+        38, 40, 42, 42, 42, 45, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 33, 35, 35, 35, 37, 39, 39, 39, 41, 42, 42,
+        42, 44, 47, 47, 47, 46, 46, 46, 46, 46, 46, 46, 30, 31, 31, 31, 31, 31,
+        32, 32, 32, 33, 35, 35, 35, 37, 40, 40, 40, 41, 42, 42, 42, 44, 46, 46,
+        46, 46, 45, 45, 45, 45, 45, 45, 30, 31, 31, 31, 31, 31, 32, 32, 32, 33,
+        35, 35, 35, 37, 40, 40, 40, 41, 42, 42, 42, 44, 46, 46, 46, 46, 45, 45,
+        45, 45, 45, 45, 30, 31, 31, 31, 31, 31, 32, 32, 32, 33, 35, 35, 35, 37,
+        40, 40, 40, 41, 42, 42, 42, 44, 46, 46, 46, 46, 45, 45, 45, 45, 45, 45,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 35, 37, 37, 37, 39, 41, 41, 41, 42,
+        43, 43, 43, 45, 47, 47, 47, 46, 46, 46, 46, 45, 45, 45, 33, 34, 34, 34,
+        34, 35, 35, 35, 35, 37, 39, 39, 39, 41, 43, 43, 43, 44, 45, 45, 45, 46,
+        47, 47, 47, 47, 46, 46, 46, 46, 45, 45, 33, 34, 34, 34, 34, 35, 35, 35,
+        35, 37, 39, 39, 39, 41, 43, 43, 43, 44, 45, 45, 45, 46, 47, 47, 47, 47,
+        46, 46, 46, 46, 45, 45, 33, 34, 34, 34, 34, 35, 35, 35, 35, 37, 39, 39,
+        39, 41, 43, 43, 43, 44, 45, 45, 45, 46, 47, 47, 47, 47, 46, 46, 46, 46,
+        45, 45, 35, 35, 36, 36, 36, 37, 37, 37, 37, 39, 41, 41, 41, 43, 45, 45,
+        45, 45, 46, 46, 46, 47, 47, 47, 47, 47, 46, 46, 46, 46, 45, 45, 36, 37,
+        38, 38, 38, 39, 40, 40, 40, 41, 43, 43, 43, 45, 47, 47, 47, 47, 47, 47,
+        47, 47, 48, 48, 48, 47, 46, 46, 46, 46, 45, 45, 36, 37, 38, 38, 38, 39,
+        40, 40, 40, 41, 43, 43, 43, 45, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48,
+        48, 47, 46, 46, 46, 46, 45, 45, 36, 37, 38, 38, 38, 39, 40, 40, 40, 41,
+        43, 43, 43, 45, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 46, 46,
+        46, 46, 45, 45, 39, 39, 40, 40, 40, 41, 41, 41, 41, 42, 44, 44, 44, 45,
+        47, 47, 47, 47, 48, 48, 48, 48, 49, 49, 49, 48, 48, 48, 48, 47, 47, 47,
+        41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 45, 45, 45, 46, 47, 47, 47, 48,
+        48, 48, 48, 49, 50, 50, 50, 50, 49, 49, 49, 49, 49, 49, 41, 42, 42, 42,
+        42, 42, 42, 42, 42, 43, 45, 45, 45, 46, 47, 47, 47, 48, 48, 48, 48, 49,
+        50, 50, 50, 50, 49, 49, 49, 49, 49, 49, 41, 42, 42, 42, 42, 42, 42, 42,
+        42, 43, 45, 45, 45, 46, 47, 47, 47, 48, 48, 48, 48, 49, 50, 50, 50, 50,
+        49, 49, 49, 49, 49, 49, 45, 45, 45, 45, 45, 44, 44, 44, 44, 45, 46, 46,
+        46, 47, 47, 47, 47, 48, 49, 49, 49, 50, 51, 51, 51, 51, 51, 51, 51, 51,
+        51, 51, 49, 48, 47, 47, 47, 47, 46, 46, 46, 47, 47, 47, 47, 47, 48, 48,
+        48, 49, 50, 50, 50, 51, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 49, 48,
+        47, 47, 47, 47, 46, 46, 46, 47, 47, 47, 47, 47, 48, 48, 48, 49, 50, 50,
+        50, 51, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 49, 48, 47, 47, 47, 47,
+        46, 46, 46, 47, 47, 47, 47, 47, 48, 48, 48, 49, 50, 50, 50, 51, 53, 53,
+        53, 53, 53, 53, 53, 53, 53, 53, 49, 48, 47, 47, 47, 46, 46, 46, 46, 46,
+        47, 47, 47, 47, 47, 47, 47, 48, 50, 50, 50, 51, 53, 53, 53, 53, 53, 53,
+        53, 54, 54, 54, 48, 48, 47, 47, 47, 46, 45, 45, 45, 46, 46, 46, 46, 46,
+        46, 46, 46, 48, 49, 49, 49, 51, 53, 53, 53, 53, 54, 54, 54, 55, 55, 55,
+        48, 48, 47, 47, 47, 46, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46, 48,
+        49, 49, 49, 51, 53, 53, 53, 53, 54, 54, 54, 55, 55, 55, 48, 48, 47, 47,
+        47, 46, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46, 48, 49, 49, 49, 51,
+        53, 53, 53, 53, 54, 54, 54, 55, 55, 55, 49, 48, 47, 47, 47, 46, 45, 45,
+        45, 45, 46, 46, 46, 46, 46, 46, 46, 47, 49, 49, 49, 51, 53, 53, 53, 54,
+        55, 55, 55, 56, 57, 57, 49, 48, 47, 47, 47, 46, 45, 45, 45, 45, 45, 45,
+        45, 45, 45, 45, 45, 47, 49, 49, 49, 51, 53, 53, 53, 54, 55, 55, 55, 57,
+        58, 58, 49, 48, 47, 47, 47, 46, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+        45, 47, 49, 49, 49, 51, 53, 53, 53, 54, 55, 55, 55, 57, 58, 58,
+        /* Size 4x8 */
+        31, 34, 42, 48, 31, 35, 42, 46, 33, 37, 44, 46, 36, 41, 46, 46, 40, 44,
+        48, 48, 45, 46, 49, 51, 47, 47, 50, 54, 47, 46, 49, 55,
+        /* Size 8x4 */
+        31, 31, 33, 36, 40, 45, 47, 47, 34, 35, 37, 41, 44, 46, 47, 46, 42, 42,
+        44, 46, 48, 49, 50, 49, 48, 46, 46, 46, 48, 51, 54, 55,
+        /* Size 8x16 */
+        32, 31, 31, 37, 37, 48, 48, 49, 31, 31, 31, 38, 38, 47, 47, 47, 31, 31,
+        31, 38, 38, 47, 47, 47, 30, 32, 32, 40, 40, 46, 46, 45, 30, 32, 32, 40,
+        40, 46, 46, 45, 33, 36, 36, 43, 43, 47, 47, 46, 33, 36, 36, 43, 43, 47,
+        47, 46, 37, 40, 40, 47, 47, 47, 47, 45, 37, 40, 40, 47, 47, 47, 47, 45,
+        42, 43, 43, 47, 47, 50, 50, 49, 42, 43, 43, 47, 47, 50, 50, 49, 49, 46,
+        46, 48, 48, 53, 53, 53, 49, 46, 46, 48, 48, 53, 53, 53, 48, 46, 46, 47,
+        47, 53, 53, 56, 48, 46, 46, 47, 47, 53, 53, 56, 49, 45, 45, 46, 46, 53,
+        53, 58,
+        /* Size 16x8 */
+        32, 31, 31, 30, 30, 33, 33, 37, 37, 42, 42, 49, 49, 48, 48, 49, 31, 31,
+        31, 32, 32, 36, 36, 40, 40, 43, 43, 46, 46, 46, 46, 45, 31, 31, 31, 32,
+        32, 36, 36, 40, 40, 43, 43, 46, 46, 46, 46, 45, 37, 38, 38, 40, 40, 43,
+        43, 47, 47, 47, 47, 48, 48, 47, 47, 46, 37, 38, 38, 40, 40, 43, 43, 47,
+        47, 47, 47, 48, 48, 47, 47, 46, 48, 47, 47, 46, 46, 47, 47, 47, 47, 50,
+        50, 53, 53, 53, 53, 53, 48, 47, 47, 46, 46, 47, 47, 47, 47, 50, 50, 53,
+        53, 53, 53, 53, 49, 47, 47, 45, 45, 46, 46, 45, 45, 49, 49, 53, 53, 56,
+        56, 58,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 33, 37, 37, 37, 42, 48, 48, 48, 48, 49, 49, 31, 31,
+        31, 31, 31, 34, 37, 37, 37, 42, 47, 47, 47, 48, 48, 48, 31, 31, 31, 31,
+        31, 34, 38, 38, 38, 42, 47, 47, 47, 47, 47, 47, 31, 31, 31, 31, 31, 34,
+        38, 38, 38, 42, 47, 47, 47, 47, 47, 47, 31, 31, 31, 31, 31, 34, 38, 38,
+        38, 42, 47, 47, 47, 47, 47, 47, 31, 31, 32, 32, 32, 35, 39, 39, 39, 42,
+        46, 46, 46, 46, 46, 46, 30, 31, 32, 32, 32, 35, 40, 40, 40, 42, 46, 46,
+        46, 45, 45, 45, 30, 31, 32, 32, 32, 35, 40, 40, 40, 42, 46, 46, 46, 45,
+        45, 45, 30, 31, 32, 32, 32, 35, 40, 40, 40, 42, 46, 46, 46, 45, 45, 45,
+        32, 33, 34, 34, 34, 37, 41, 41, 41, 44, 46, 46, 46, 46, 45, 45, 33, 34,
+        36, 36, 36, 39, 43, 43, 43, 45, 47, 47, 47, 46, 46, 46, 33, 34, 36, 36,
+        36, 39, 43, 43, 43, 45, 47, 47, 47, 46, 46, 46, 33, 34, 36, 36, 36, 39,
+        43, 43, 43, 45, 47, 47, 47, 46, 46, 46, 35, 36, 38, 38, 38, 41, 45, 45,
+        45, 46, 47, 47, 47, 46, 45, 45, 37, 38, 40, 40, 40, 43, 47, 47, 47, 47,
+        47, 47, 47, 46, 45, 45, 37, 38, 40, 40, 40, 43, 47, 47, 47, 47, 47, 47,
+        47, 46, 45, 45, 37, 38, 40, 40, 40, 43, 47, 47, 47, 47, 47, 47, 47, 46,
+        45, 45, 39, 40, 41, 41, 41, 44, 47, 47, 47, 48, 49, 49, 49, 48, 47, 47,
+        42, 42, 43, 43, 43, 45, 47, 47, 47, 48, 50, 50, 50, 50, 49, 49, 42, 42,
+        43, 43, 43, 45, 47, 47, 47, 48, 50, 50, 50, 50, 49, 49, 42, 42, 43, 43,
+        43, 45, 47, 47, 47, 48, 50, 50, 50, 50, 49, 49, 45, 45, 44, 44, 44, 46,
+        47, 47, 47, 49, 51, 51, 51, 51, 51, 51, 49, 48, 46, 46, 46, 47, 48, 48,
+        48, 50, 53, 53, 53, 53, 53, 53, 49, 48, 46, 46, 46, 47, 48, 48, 48, 50,
+        53, 53, 53, 53, 53, 53, 49, 48, 46, 46, 46, 47, 48, 48, 48, 50, 53, 53,
+        53, 53, 53, 53, 48, 47, 46, 46, 46, 47, 47, 47, 47, 50, 53, 53, 53, 54,
+        54, 54, 48, 47, 46, 46, 46, 46, 47, 47, 47, 50, 53, 53, 53, 54, 56, 56,
+        48, 47, 46, 46, 46, 46, 47, 47, 47, 50, 53, 53, 53, 54, 56, 56, 48, 47,
+        46, 46, 46, 46, 47, 47, 47, 50, 53, 53, 53, 54, 56, 56, 48, 47, 45, 45,
+        45, 46, 46, 46, 46, 49, 53, 53, 53, 55, 57, 57, 49, 47, 45, 45, 45, 45,
+        46, 46, 46, 49, 53, 53, 53, 56, 58, 58, 49, 47, 45, 45, 45, 45, 46, 46,
+        46, 49, 53, 53, 53, 56, 58, 58,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 30, 30, 30, 32, 33, 33, 33, 35, 37, 37, 37, 39,
+        42, 42, 42, 45, 49, 49, 49, 48, 48, 48, 48, 48, 49, 49, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 33, 34, 34, 34, 36, 38, 38, 38, 40, 42, 42, 42, 45,
+        48, 48, 48, 47, 47, 47, 47, 47, 47, 47, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 34, 36, 36, 36, 38, 40, 40, 40, 41, 43, 43, 43, 44, 46, 46, 46, 46,
+        46, 46, 46, 45, 45, 45, 31, 31, 31, 31, 31, 32, 32, 32, 32, 34, 36, 36,
+        36, 38, 40, 40, 40, 41, 43, 43, 43, 44, 46, 46, 46, 46, 46, 46, 46, 45,
+        45, 45, 31, 31, 31, 31, 31, 32, 32, 32, 32, 34, 36, 36, 36, 38, 40, 40,
+        40, 41, 43, 43, 43, 44, 46, 46, 46, 46, 46, 46, 46, 45, 45, 45, 33, 34,
+        34, 34, 34, 35, 35, 35, 35, 37, 39, 39, 39, 41, 43, 43, 43, 44, 45, 45,
+        45, 46, 47, 47, 47, 47, 46, 46, 46, 46, 45, 45, 37, 37, 38, 38, 38, 39,
+        40, 40, 40, 41, 43, 43, 43, 45, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48,
+        48, 47, 47, 47, 47, 46, 46, 46, 37, 37, 38, 38, 38, 39, 40, 40, 40, 41,
+        43, 43, 43, 45, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 47, 47,
+        47, 46, 46, 46, 37, 37, 38, 38, 38, 39, 40, 40, 40, 41, 43, 43, 43, 45,
+        47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 47, 47, 47, 46, 46, 46,
+        42, 42, 42, 42, 42, 42, 42, 42, 42, 44, 45, 45, 45, 46, 47, 47, 47, 48,
+        48, 48, 48, 49, 50, 50, 50, 50, 50, 50, 50, 49, 49, 49, 48, 47, 47, 47,
+        47, 46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 49, 50, 50, 50, 51,
+        53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 48, 47, 47, 47, 47, 46, 46, 46,
+        46, 46, 47, 47, 47, 47, 47, 47, 47, 49, 50, 50, 50, 51, 53, 53, 53, 53,
+        53, 53, 53, 53, 53, 53, 48, 47, 47, 47, 47, 46, 46, 46, 46, 46, 47, 47,
+        47, 47, 47, 47, 47, 49, 50, 50, 50, 51, 53, 53, 53, 53, 53, 53, 53, 53,
+        53, 53, 48, 48, 47, 47, 47, 46, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46,
+        46, 48, 50, 50, 50, 51, 53, 53, 53, 54, 54, 54, 54, 55, 56, 56, 49, 48,
+        47, 47, 47, 46, 45, 45, 45, 45, 46, 46, 46, 45, 45, 45, 45, 47, 49, 49,
+        49, 51, 53, 53, 53, 54, 56, 56, 56, 57, 58, 58, 49, 48, 47, 47, 47, 46,
+        45, 45, 45, 45, 46, 46, 46, 45, 45, 45, 45, 47, 49, 49, 49, 51, 53, 53,
+        53, 54, 56, 56, 56, 57, 58, 58,
+        /* Size 4x16 */
+        31, 33, 42, 48, 31, 34, 42, 47, 31, 34, 42, 47, 31, 35, 42, 45, 31, 35,
+        42, 45, 34, 39, 45, 46, 34, 39, 45, 46, 38, 43, 47, 46, 38, 43, 47, 46,
+        42, 45, 48, 50, 42, 45, 48, 50, 48, 47, 50, 53, 48, 47, 50, 53, 47, 46,
+        50, 54, 47, 46, 50, 54, 47, 45, 49, 56,
+        /* Size 16x4 */
+        31, 31, 31, 31, 31, 34, 34, 38, 38, 42, 42, 48, 48, 47, 47, 47, 33, 34,
+        34, 35, 35, 39, 39, 43, 43, 45, 45, 47, 47, 46, 46, 45, 42, 42, 42, 42,
+        42, 45, 45, 47, 47, 48, 48, 50, 50, 50, 50, 49, 48, 47, 47, 45, 45, 46,
+        46, 46, 46, 50, 50, 53, 53, 54, 54, 56,
+        /* Size 8x32 */
+        32, 31, 31, 37, 37, 48, 48, 49, 31, 31, 31, 37, 37, 47, 47, 48, 31, 31,
+        31, 38, 38, 47, 47, 47, 31, 31, 31, 38, 38, 47, 47, 47, 31, 31, 31, 38,
+        38, 47, 47, 47, 31, 32, 32, 39, 39, 46, 46, 46, 30, 32, 32, 40, 40, 46,
+        46, 45, 30, 32, 32, 40, 40, 46, 46, 45, 30, 32, 32, 40, 40, 46, 46, 45,
+        32, 34, 34, 41, 41, 46, 46, 45, 33, 36, 36, 43, 43, 47, 47, 46, 33, 36,
+        36, 43, 43, 47, 47, 46, 33, 36, 36, 43, 43, 47, 47, 46, 35, 38, 38, 45,
+        45, 47, 47, 45, 37, 40, 40, 47, 47, 47, 47, 45, 37, 40, 40, 47, 47, 47,
+        47, 45, 37, 40, 40, 47, 47, 47, 47, 45, 39, 41, 41, 47, 47, 49, 49, 47,
+        42, 43, 43, 47, 47, 50, 50, 49, 42, 43, 43, 47, 47, 50, 50, 49, 42, 43,
+        43, 47, 47, 50, 50, 49, 45, 44, 44, 47, 47, 51, 51, 51, 49, 46, 46, 48,
+        48, 53, 53, 53, 49, 46, 46, 48, 48, 53, 53, 53, 49, 46, 46, 48, 48, 53,
+        53, 53, 48, 46, 46, 47, 47, 53, 53, 54, 48, 46, 46, 47, 47, 53, 53, 56,
+        48, 46, 46, 47, 47, 53, 53, 56, 48, 46, 46, 47, 47, 53, 53, 56, 48, 45,
+        45, 46, 46, 53, 53, 57, 49, 45, 45, 46, 46, 53, 53, 58, 49, 45, 45, 46,
+        46, 53, 53, 58,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 30, 30, 30, 32, 33, 33, 33, 35, 37, 37, 37, 39,
+        42, 42, 42, 45, 49, 49, 49, 48, 48, 48, 48, 48, 49, 49, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 34, 36, 36, 36, 38, 40, 40, 40, 41, 43, 43, 43, 44,
+        46, 46, 46, 46, 46, 46, 46, 45, 45, 45, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 34, 36, 36, 36, 38, 40, 40, 40, 41, 43, 43, 43, 44, 46, 46, 46, 46,
+        46, 46, 46, 45, 45, 45, 37, 37, 38, 38, 38, 39, 40, 40, 40, 41, 43, 43,
+        43, 45, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 47, 47, 47, 46,
+        46, 46, 37, 37, 38, 38, 38, 39, 40, 40, 40, 41, 43, 43, 43, 45, 47, 47,
+        47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 47, 47, 47, 46, 46, 46, 48, 47,
+        47, 47, 47, 46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 49, 50, 50,
+        50, 51, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 48, 47, 47, 47, 47, 46,
+        46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 49, 50, 50, 50, 51, 53, 53,
+        53, 53, 53, 53, 53, 53, 53, 53, 49, 48, 47, 47, 47, 46, 45, 45, 45, 45,
+        46, 46, 46, 45, 45, 45, 45, 47, 49, 49, 49, 51, 53, 53, 53, 54, 56, 56,
+        56, 57, 58, 58 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 32, 32, 35, 32, 32, 33, 35, 32, 33, 35, 38, 35, 35, 38, 46,
+        /* Size 8x8 */
+        31, 31, 31, 32, 32, 32, 34, 35, 31, 32, 32, 32, 32, 33, 34, 35, 31, 32,
+        32, 32, 32, 33, 33, 34, 32, 32, 32, 33, 34, 34, 35, 36, 32, 32, 32, 34,
+        35, 35, 36, 38, 32, 33, 33, 34, 35, 36, 38, 40, 34, 34, 33, 35, 36, 38,
+        39, 42, 35, 35, 34, 36, 38, 40, 42, 48,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 33, 34, 34, 36, 36, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 34, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 34, 34, 31, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 34,
+        35, 35, 36, 36, 31, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 35, 35, 36,
+        36, 36, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 35, 36, 36, 37, 37,
+        32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 36, 37, 37, 38, 38, 32, 32,
+        32, 32, 32, 32, 33, 34, 34, 35, 35, 36, 37, 37, 38, 38, 33, 33, 33, 33,
+        33, 33, 34, 35, 35, 36, 36, 38, 39, 40, 42, 42, 34, 34, 34, 34, 33, 33,
+        35, 35, 36, 37, 37, 39, 39, 41, 42, 42, 34, 34, 34, 34, 34, 34, 35, 36,
+        36, 37, 37, 40, 41, 42, 45, 45, 36, 35, 35, 35, 34, 34, 36, 36, 37, 38,
+        38, 42, 42, 45, 48, 48, 36, 35, 35, 35, 34, 34, 36, 36, 37, 38, 38, 42,
+        42, 45, 48, 48,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 33, 34, 34, 34, 34, 35, 36, 36, 36, 37, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 34, 34, 34, 34, 35, 35, 35, 35, 37, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34,
+        34, 35, 35, 35, 35, 36, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 34, 35, 35, 35,
+        35, 36, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35, 36, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35, 36, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34,
+        34, 34, 34, 34, 35, 35, 35, 36, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 34, 34,
+        34, 34, 34, 35, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34,
+        34, 35, 35, 35, 35, 36, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 35, 35, 35, 35, 36, 36, 36,
+        36, 37, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33,
+        33, 34, 34, 34, 34, 34, 35, 35, 35, 35, 36, 36, 36, 36, 36, 37, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34,
+        34, 34, 35, 35, 35, 35, 36, 36, 36, 36, 36, 37, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35,
+        35, 35, 36, 36, 36, 36, 36, 37, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 36, 36, 36, 36, 37,
+        37, 37, 37, 38, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34,
+        34, 34, 34, 35, 35, 35, 35, 35, 36, 36, 36, 36, 37, 37, 38, 38, 38, 39,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 34, 35,
+        35, 35, 35, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35, 36,
+        36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35, 36, 36, 37, 37, 37,
+        37, 38, 38, 38, 38, 39, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        34, 34, 34, 34, 35, 35, 36, 36, 36, 36, 37, 38, 38, 38, 38, 39, 40, 40,
+        40, 41, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 35, 35, 35,
+        35, 36, 36, 36, 36, 37, 38, 39, 39, 39, 40, 41, 42, 42, 42, 42, 34, 34,
+        34, 34, 34, 34, 34, 33, 33, 33, 33, 34, 35, 35, 35, 35, 36, 36, 37, 37,
+        37, 38, 39, 39, 39, 39, 41, 42, 42, 42, 42, 43, 34, 34, 34, 34, 34, 34,
+        34, 33, 33, 33, 33, 34, 35, 35, 35, 35, 36, 36, 37, 37, 37, 38, 39, 39,
+        39, 39, 41, 42, 42, 42, 42, 43, 34, 34, 34, 34, 34, 34, 34, 33, 33, 33,
+        33, 34, 35, 35, 35, 35, 36, 36, 37, 37, 37, 38, 39, 39, 39, 39, 41, 42,
+        42, 42, 42, 43, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 36,
+        36, 36, 36, 37, 37, 37, 37, 38, 40, 41, 41, 41, 42, 44, 45, 45, 45, 45,
+        35, 35, 35, 35, 35, 35, 34, 34, 34, 34, 34, 35, 36, 36, 36, 36, 37, 37,
+        38, 38, 38, 39, 41, 42, 42, 42, 44, 46, 47, 47, 47, 48, 36, 35, 35, 35,
+        35, 35, 35, 34, 34, 34, 34, 35, 36, 36, 36, 36, 37, 38, 38, 38, 38, 40,
+        42, 42, 42, 42, 45, 47, 48, 48, 48, 49, 36, 35, 35, 35, 35, 35, 35, 34,
+        34, 34, 34, 35, 36, 36, 36, 36, 37, 38, 38, 38, 38, 40, 42, 42, 42, 42,
+        45, 47, 48, 48, 48, 49, 36, 35, 35, 35, 35, 35, 35, 34, 34, 34, 34, 35,
+        36, 36, 36, 36, 37, 38, 38, 38, 38, 40, 42, 42, 42, 42, 45, 47, 48, 48,
+        48, 49, 37, 37, 36, 36, 36, 36, 36, 35, 35, 35, 35, 36, 37, 37, 37, 37,
+        38, 39, 39, 39, 39, 41, 42, 43, 43, 43, 45, 48, 49, 49, 49, 50,
+        /* Size 4x8 */
+        31, 31, 32, 35, 32, 32, 32, 35, 32, 32, 33, 34, 32, 32, 34, 36, 32, 33,
+        35, 38, 33, 33, 36, 40, 34, 34, 37, 42, 35, 34, 38, 48,
+        /* Size 8x4 */
+        31, 32, 32, 32, 32, 33, 34, 35, 31, 32, 32, 32, 33, 33, 34, 34, 32, 32,
+        33, 34, 35, 36, 37, 38, 35, 35, 34, 36, 38, 40, 42, 48,
+        /* Size 8x16 */
+        32, 31, 31, 31, 32, 32, 35, 36, 31, 32, 32, 32, 32, 32, 35, 35, 31, 32,
+        32, 32, 32, 32, 35, 35, 31, 32, 32, 32, 32, 32, 34, 35, 31, 32, 32, 32,
+        33, 33, 34, 34, 31, 32, 32, 32, 33, 33, 34, 34, 31, 32, 32, 33, 34, 34,
+        35, 36, 32, 32, 32, 33, 34, 34, 36, 36, 32, 32, 32, 33, 34, 34, 36, 37,
+        32, 32, 33, 34, 35, 35, 37, 38, 32, 32, 33, 34, 35, 35, 37, 38, 33, 33,
+        33, 35, 36, 36, 40, 41, 34, 34, 34, 35, 37, 37, 41, 42, 34, 34, 34, 35,
+        37, 37, 43, 44, 36, 35, 34, 36, 38, 38, 46, 48, 36, 35, 34, 36, 38, 38,
+        46, 48,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 33, 34, 34, 36, 36, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 31, 32, 32, 32, 32, 32,
+        33, 33, 33, 34, 34, 35, 35, 35, 36, 36, 32, 32, 32, 32, 33, 33, 34, 34,
+        34, 35, 35, 36, 37, 37, 38, 38, 32, 32, 32, 32, 33, 33, 34, 34, 34, 35,
+        35, 36, 37, 37, 38, 38, 35, 35, 35, 34, 34, 34, 35, 36, 36, 37, 37, 40,
+        41, 43, 46, 46, 36, 35, 35, 35, 34, 34, 36, 36, 37, 38, 38, 41, 42, 44,
+        48, 48,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 33, 35, 36, 36, 36, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 33, 35, 35, 35, 35, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 35, 35, 35, 35, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 35, 35, 35, 35, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 35, 35, 35, 35, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 35, 35, 35, 35, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        34, 35, 35, 35, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 35,
+        35, 35, 31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34,
+        31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 31, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 31, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 34, 35, 35, 35, 35, 31, 32, 32, 32, 32, 32,
+        33, 33, 34, 34, 34, 34, 35, 36, 36, 36, 32, 32, 32, 32, 32, 32, 33, 34,
+        34, 34, 34, 35, 36, 36, 36, 36, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34,
+        34, 35, 36, 36, 36, 36, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 34, 35,
+        36, 36, 36, 36, 32, 32, 32, 32, 32, 32, 33, 34, 34, 34, 34, 35, 36, 37,
+        37, 37, 32, 32, 32, 33, 33, 33, 33, 34, 35, 35, 35, 36, 37, 38, 38, 38,
+        32, 32, 32, 33, 33, 33, 34, 35, 35, 35, 35, 36, 37, 38, 38, 38, 32, 32,
+        32, 33, 33, 33, 34, 35, 35, 35, 35, 36, 37, 38, 38, 38, 32, 32, 32, 33,
+        33, 33, 34, 35, 35, 35, 35, 36, 37, 38, 38, 38, 32, 33, 33, 33, 33, 33,
+        34, 35, 36, 36, 36, 37, 39, 40, 40, 40, 33, 33, 33, 33, 33, 33, 35, 36,
+        36, 36, 36, 38, 40, 41, 41, 41, 34, 34, 34, 34, 34, 34, 35, 36, 37, 37,
+        37, 39, 41, 42, 42, 42, 34, 34, 34, 34, 34, 34, 35, 36, 37, 37, 37, 39,
+        41, 42, 42, 42, 34, 34, 34, 34, 34, 34, 35, 36, 37, 37, 37, 39, 41, 42,
+        42, 42, 34, 34, 34, 34, 34, 34, 35, 37, 37, 37, 37, 40, 43, 44, 44, 44,
+        35, 35, 34, 34, 34, 34, 36, 37, 38, 38, 38, 41, 45, 47, 47, 47, 36, 35,
+        35, 34, 34, 34, 36, 37, 38, 38, 38, 42, 46, 48, 48, 48, 36, 35, 35, 34,
+        34, 34, 36, 37, 38, 38, 38, 42, 46, 48, 48, 48, 36, 35, 35, 34, 34, 34,
+        36, 37, 38, 38, 38, 42, 46, 48, 48, 48, 37, 36, 36, 36, 36, 36, 37, 38,
+        39, 39, 39, 42, 46, 49, 49, 49,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 34, 34, 34, 34, 35, 36, 36, 36, 37, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 34, 34, 34, 34, 35, 35, 35, 35, 36, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34,
+        34, 34, 35, 35, 35, 36, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34,
+        34, 36, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 36, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 36, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35,
+        35, 35, 35, 36, 36, 36, 36, 37, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 34, 34, 34, 34, 35, 35, 35, 35, 36, 36, 36, 36, 37, 37,
+        37, 37, 37, 38, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34,
+        34, 34, 34, 35, 35, 35, 35, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35,
+        35, 35, 35, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 35, 35, 36,
+        36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 34, 34, 35, 35, 35, 35, 36, 36, 36, 36, 37, 38, 39, 39, 39,
+        40, 41, 42, 42, 42, 42, 35, 35, 35, 35, 35, 35, 34, 34, 34, 34, 34, 35,
+        35, 36, 36, 36, 36, 37, 37, 37, 37, 39, 40, 41, 41, 41, 43, 45, 46, 46,
+        46, 46, 36, 35, 35, 35, 35, 35, 35, 35, 34, 34, 34, 35, 36, 36, 36, 36,
+        37, 38, 38, 38, 38, 40, 41, 42, 42, 42, 44, 47, 48, 48, 48, 49, 36, 35,
+        35, 35, 35, 35, 35, 35, 34, 34, 34, 35, 36, 36, 36, 36, 37, 38, 38, 38,
+        38, 40, 41, 42, 42, 42, 44, 47, 48, 48, 48, 49, 36, 35, 35, 35, 35, 35,
+        35, 35, 34, 34, 34, 35, 36, 36, 36, 36, 37, 38, 38, 38, 38, 40, 41, 42,
+        42, 42, 44, 47, 48, 48, 48, 49,
+        /* Size 4x16 */
+        31, 31, 32, 36, 31, 32, 32, 35, 32, 32, 32, 35, 32, 32, 32, 35, 32, 32,
+        33, 34, 32, 32, 33, 34, 32, 32, 34, 36, 32, 32, 34, 36, 32, 32, 34, 37,
+        32, 33, 35, 38, 32, 33, 35, 38, 33, 33, 36, 41, 34, 34, 37, 42, 34, 34,
+        37, 44, 35, 34, 38, 48, 35, 34, 38, 48,
+        /* Size 16x4 */
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 32, 32, 32, 32,
+        33, 33, 34, 34, 34, 35, 35, 36, 37, 37, 38, 38, 36, 35, 35, 35, 34, 34,
+        36, 36, 37, 38, 38, 41, 42, 44, 48, 48,
+        /* Size 8x32 */
+        32, 31, 31, 31, 32, 32, 35, 36, 31, 31, 31, 32, 32, 32, 35, 35, 31, 32,
+        32, 32, 32, 32, 35, 35, 31, 32, 32, 32, 32, 32, 35, 35, 31, 32, 32, 32,
+        32, 32, 35, 35, 31, 32, 32, 32, 32, 32, 35, 35, 31, 32, 32, 32, 32, 32,
+        34, 35, 31, 32, 32, 32, 32, 32, 34, 35, 31, 32, 32, 32, 33, 33, 34, 34,
+        31, 32, 32, 32, 33, 33, 34, 34, 31, 32, 32, 32, 33, 33, 34, 34, 31, 32,
+        32, 33, 33, 33, 35, 35, 31, 32, 32, 33, 34, 34, 35, 36, 32, 32, 32, 33,
+        34, 34, 36, 36, 32, 32, 32, 33, 34, 34, 36, 36, 32, 32, 32, 33, 34, 34,
+        36, 36, 32, 32, 32, 33, 34, 34, 36, 37, 32, 32, 33, 33, 35, 35, 37, 38,
+        32, 32, 33, 34, 35, 35, 37, 38, 32, 32, 33, 34, 35, 35, 37, 38, 32, 32,
+        33, 34, 35, 35, 37, 38, 32, 33, 33, 34, 36, 36, 39, 40, 33, 33, 33, 35,
+        36, 36, 40, 41, 34, 34, 34, 35, 37, 37, 41, 42, 34, 34, 34, 35, 37, 37,
+        41, 42, 34, 34, 34, 35, 37, 37, 41, 42, 34, 34, 34, 35, 37, 37, 43, 44,
+        35, 34, 34, 36, 38, 38, 45, 47, 36, 35, 34, 36, 38, 38, 46, 48, 36, 35,
+        34, 36, 38, 38, 46, 48, 36, 35, 34, 36, 38, 38, 46, 48, 37, 36, 36, 37,
+        39, 39, 46, 49,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 34, 34, 34, 34, 35, 36, 36, 36, 37, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 34, 34, 34, 34, 34, 35, 35, 35, 36, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34,
+        34, 34, 34, 34, 34, 36, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35, 35, 36, 36, 36,
+        36, 37, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34,
+        34, 35, 35, 35, 35, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 35,
+        35, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 35, 35, 35, 35, 35, 35,
+        34, 34, 34, 34, 34, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37, 39, 40, 41,
+        41, 41, 43, 45, 46, 46, 46, 46, 36, 35, 35, 35, 35, 35, 35, 35, 34, 34,
+        34, 35, 36, 36, 36, 36, 37, 38, 38, 38, 38, 40, 41, 42, 42, 42, 44, 47,
+        48, 48, 48, 49 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 32, 38, 46, 32, 34, 41, 46, 38, 41, 47, 47, 46, 46, 47, 52,
+        /* Size 8x8 */
+        31, 31, 30, 34, 36, 39, 42, 48, 31, 31, 31, 34, 37, 40, 42, 47, 30, 31,
+        32, 35, 39, 41, 42, 46, 34, 34, 35, 39, 42, 44, 45, 47, 36, 37, 39, 42,
+        46, 47, 47, 47, 39, 40, 41, 44, 47, 47, 48, 49, 42, 42, 42, 45, 47, 48,
+        48, 50, 48, 47, 46, 47, 47, 49, 50, 53,
+        /* Size 16x16 */
+        32, 31, 31, 31, 30, 30, 33, 33, 34, 36, 36, 40, 41, 44, 49, 49, 31, 31,
+        31, 31, 31, 31, 33, 34, 36, 38, 38, 41, 42, 44, 48, 48, 31, 31, 31, 31,
+        31, 31, 34, 34, 36, 38, 38, 41, 42, 44, 47, 47, 31, 31, 31, 31, 31, 31,
+        34, 35, 36, 39, 39, 41, 42, 44, 47, 47, 30, 31, 31, 31, 32, 32, 34, 35,
+        37, 40, 40, 42, 42, 44, 46, 46, 30, 31, 31, 31, 32, 32, 34, 35, 37, 40,
+        40, 42, 42, 44, 46, 46, 33, 33, 34, 34, 34, 34, 37, 38, 40, 42, 42, 44,
+        44, 45, 47, 47, 33, 34, 34, 35, 35, 35, 38, 39, 40, 43, 43, 44, 45, 46,
+        47, 47, 34, 36, 36, 36, 37, 37, 40, 40, 42, 45, 45, 45, 46, 46, 47, 47,
+        36, 38, 38, 39, 40, 40, 42, 43, 45, 47, 47, 47, 47, 47, 48, 48, 36, 38,
+        38, 39, 40, 40, 42, 43, 45, 47, 47, 47, 47, 47, 48, 48, 40, 41, 41, 41,
+        42, 42, 44, 44, 45, 47, 47, 48, 48, 49, 50, 50, 41, 42, 42, 42, 42, 42,
+        44, 45, 46, 47, 47, 48, 48, 49, 50, 50, 44, 44, 44, 44, 44, 44, 45, 46,
+        46, 47, 47, 49, 49, 50, 51, 51, 49, 48, 47, 47, 46, 46, 47, 47, 47, 48,
+        48, 50, 50, 51, 53, 53, 49, 48, 47, 47, 46, 46, 47, 47, 47, 48, 48, 50,
+        50, 51, 53, 53,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 31, 33, 33, 33, 33, 34, 36,
+        36, 36, 36, 38, 40, 41, 41, 41, 44, 47, 49, 49, 49, 49, 31, 31, 31, 31,
+        31, 31, 31, 31, 30, 30, 30, 32, 33, 34, 34, 34, 35, 36, 37, 37, 37, 39,
+        41, 42, 42, 42, 44, 47, 48, 48, 48, 48, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 33, 34, 34, 34, 36, 37, 38, 38, 38, 39, 41, 42, 42, 42,
+        44, 46, 48, 48, 48, 47, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32,
+        34, 34, 34, 34, 36, 37, 38, 38, 38, 40, 41, 42, 42, 42, 44, 46, 47, 47,
+        47, 47, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 34, 34, 34, 34,
+        36, 37, 38, 38, 38, 40, 41, 42, 42, 42, 44, 46, 47, 47, 47, 47, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 34, 34, 34, 34, 36, 37, 38, 38,
+        38, 40, 41, 42, 42, 42, 44, 46, 47, 47, 47, 47, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 33, 34, 35, 35, 35, 36, 38, 39, 39, 39, 40, 41, 42,
+        42, 42, 44, 46, 47, 47, 47, 47, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 33, 34, 35, 35, 35, 37, 38, 39, 39, 39, 41, 42, 42, 42, 42, 44, 46,
+        46, 46, 46, 46, 30, 30, 31, 31, 31, 31, 31, 31, 32, 32, 32, 33, 34, 35,
+        35, 35, 37, 39, 40, 40, 40, 41, 42, 42, 42, 42, 44, 45, 46, 46, 46, 46,
+        30, 30, 31, 31, 31, 31, 31, 31, 32, 32, 32, 33, 34, 35, 35, 35, 37, 39,
+        40, 40, 40, 41, 42, 42, 42, 42, 44, 45, 46, 46, 46, 46, 30, 30, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 33, 34, 35, 35, 35, 37, 39, 40, 40, 40, 41,
+        42, 42, 42, 42, 44, 45, 46, 46, 46, 46, 31, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 34, 36, 37, 37, 37, 38, 40, 41, 41, 41, 42, 43, 43, 43, 43,
+        44, 46, 46, 46, 46, 46, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 36,
+        37, 38, 38, 38, 40, 41, 42, 42, 42, 43, 44, 44, 44, 44, 45, 46, 47, 47,
+        47, 46, 33, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 37, 38, 39, 39, 39,
+        40, 42, 43, 43, 43, 44, 44, 45, 45, 45, 46, 47, 47, 47, 47, 47, 33, 34,
+        34, 34, 34, 34, 35, 35, 35, 35, 35, 37, 38, 39, 39, 39, 40, 42, 43, 43,
+        43, 44, 44, 45, 45, 45, 46, 47, 47, 47, 47, 47, 33, 34, 34, 34, 34, 34,
+        35, 35, 35, 35, 35, 37, 38, 39, 39, 39, 40, 42, 43, 43, 43, 44, 44, 45,
+        45, 45, 46, 47, 47, 47, 47, 47, 34, 35, 36, 36, 36, 36, 36, 37, 37, 37,
+        37, 38, 40, 40, 40, 40, 42, 44, 45, 45, 45, 45, 45, 46, 46, 46, 46, 47,
+        47, 47, 47, 47, 36, 36, 37, 37, 37, 37, 38, 38, 39, 39, 39, 40, 41, 42,
+        42, 42, 44, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+        36, 37, 38, 38, 38, 38, 39, 39, 40, 40, 40, 41, 42, 43, 43, 43, 45, 46,
+        47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 36, 37, 38, 38,
+        38, 38, 39, 39, 40, 40, 40, 41, 42, 43, 43, 43, 45, 46, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 48, 48, 48, 47, 36, 37, 38, 38, 38, 38, 39, 39,
+        40, 40, 40, 41, 42, 43, 43, 43, 45, 46, 47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 48, 48, 48, 47, 38, 39, 39, 40, 40, 40, 40, 41, 41, 41, 41, 42,
+        43, 44, 44, 44, 45, 47, 47, 47, 47, 47, 48, 48, 48, 48, 48, 48, 49, 49,
+        49, 48, 40, 41, 41, 41, 41, 41, 41, 42, 42, 42, 42, 43, 44, 44, 44, 44,
+        45, 47, 47, 47, 47, 48, 48, 48, 48, 48, 49, 49, 50, 50, 50, 49, 41, 42,
+        42, 42, 42, 42, 42, 42, 42, 42, 42, 43, 44, 45, 45, 45, 46, 47, 47, 47,
+        47, 48, 48, 48, 48, 48, 49, 50, 50, 50, 50, 50, 41, 42, 42, 42, 42, 42,
+        42, 42, 42, 42, 42, 43, 44, 45, 45, 45, 46, 47, 47, 47, 47, 48, 48, 48,
+        48, 48, 49, 50, 50, 50, 50, 50, 41, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+        42, 43, 44, 45, 45, 45, 46, 47, 47, 47, 47, 48, 48, 48, 48, 48, 49, 50,
+        50, 50, 50, 50, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45, 46,
+        46, 46, 46, 47, 47, 47, 47, 48, 49, 49, 49, 49, 50, 51, 51, 51, 51, 51,
+        47, 47, 46, 46, 46, 46, 46, 46, 45, 45, 45, 46, 46, 47, 47, 47, 47, 47,
+        47, 47, 47, 48, 49, 50, 50, 50, 51, 52, 52, 52, 52, 52, 49, 48, 48, 47,
+        47, 47, 47, 46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 48, 48, 48, 49,
+        50, 50, 50, 50, 51, 52, 53, 53, 53, 53, 49, 48, 48, 47, 47, 47, 47, 46,
+        46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 48, 48, 48, 49, 50, 50, 50, 50,
+        51, 52, 53, 53, 53, 53, 49, 48, 48, 47, 47, 47, 47, 46, 46, 46, 46, 46,
+        47, 47, 47, 47, 47, 47, 48, 48, 48, 49, 50, 50, 50, 50, 51, 52, 53, 53,
+        53, 53, 49, 48, 47, 47, 47, 47, 47, 46, 46, 46, 46, 46, 46, 47, 47, 47,
+        47, 47, 47, 47, 47, 48, 49, 50, 50, 50, 51, 52, 53, 53, 53, 53,
+        /* Size 4x8 */
+        31, 31, 37, 48, 31, 31, 38, 47, 31, 32, 40, 46, 34, 36, 43, 47, 37, 39,
+        46, 47, 39, 41, 47, 48, 42, 43, 47, 50, 48, 46, 48, 53,
+        /* Size 8x4 */
+        31, 31, 31, 34, 37, 39, 42, 48, 31, 31, 32, 36, 39, 41, 43, 46, 37, 38,
+        40, 43, 46, 47, 47, 48, 48, 47, 46, 47, 47, 48, 50, 53,
+        /* Size 8x16 */
+        32, 31, 31, 33, 37, 37, 45, 48, 31, 31, 31, 34, 38, 38, 45, 47, 31, 31,
+        31, 34, 38, 38, 45, 47, 31, 31, 32, 34, 39, 39, 45, 46, 30, 32, 32, 35,
+        40, 40, 44, 46, 30, 32, 32, 35, 40, 40, 44, 46, 33, 34, 35, 37, 42, 42,
+        46, 47, 33, 35, 36, 38, 43, 43, 46, 47, 35, 37, 37, 40, 44, 44, 46, 47,
+        37, 39, 40, 43, 47, 47, 47, 47, 37, 39, 40, 43, 47, 47, 47, 47, 41, 42,
+        42, 44, 47, 47, 49, 49, 42, 42, 43, 44, 47, 47, 49, 50, 44, 44, 44, 45,
+        47, 47, 50, 51, 49, 47, 46, 47, 48, 48, 52, 53, 49, 47, 46, 47, 48, 48,
+        52, 53,
+        /* Size 16x8 */
+        32, 31, 31, 31, 30, 30, 33, 33, 35, 37, 37, 41, 42, 44, 49, 49, 31, 31,
+        31, 31, 32, 32, 34, 35, 37, 39, 39, 42, 42, 44, 47, 47, 31, 31, 31, 32,
+        32, 32, 35, 36, 37, 40, 40, 42, 43, 44, 46, 46, 33, 34, 34, 34, 35, 35,
+        37, 38, 40, 43, 43, 44, 44, 45, 47, 47, 37, 38, 38, 39, 40, 40, 42, 43,
+        44, 47, 47, 47, 47, 47, 48, 48, 37, 38, 38, 39, 40, 40, 42, 43, 44, 47,
+        47, 47, 47, 47, 48, 48, 45, 45, 45, 45, 44, 44, 46, 46, 46, 47, 47, 49,
+        49, 50, 52, 52, 48, 47, 47, 46, 46, 46, 47, 47, 47, 47, 47, 49, 50, 51,
+        53, 53,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 31, 33, 35, 37, 37, 37, 40, 45, 48, 48, 48, 31, 31,
+        31, 31, 31, 31, 33, 36, 37, 37, 37, 41, 45, 48, 48, 48, 31, 31, 31, 31,
+        31, 31, 34, 36, 38, 38, 38, 41, 45, 47, 47, 47, 31, 31, 31, 31, 31, 31,
+        34, 37, 38, 38, 38, 41, 45, 47, 47, 47, 31, 31, 31, 31, 31, 31, 34, 37,
+        38, 38, 38, 41, 45, 47, 47, 47, 31, 31, 31, 31, 31, 31, 34, 37, 38, 38,
+        38, 41, 45, 47, 47, 47, 31, 31, 31, 32, 32, 32, 34, 37, 39, 39, 39, 41,
+        45, 46, 46, 46, 30, 31, 31, 32, 32, 32, 34, 38, 39, 39, 39, 42, 44, 46,
+        46, 46, 30, 31, 32, 32, 32, 32, 35, 38, 40, 40, 40, 42, 44, 46, 46, 46,
+        30, 31, 32, 32, 32, 32, 35, 38, 40, 40, 40, 42, 44, 46, 46, 46, 30, 31,
+        32, 32, 32, 32, 35, 38, 40, 40, 40, 42, 44, 46, 46, 46, 31, 32, 33, 33,
+        33, 33, 36, 39, 41, 41, 41, 43, 45, 46, 46, 46, 33, 34, 34, 35, 35, 35,
+        37, 40, 42, 42, 42, 44, 46, 47, 47, 47, 33, 34, 35, 36, 36, 36, 38, 41,
+        43, 43, 43, 44, 46, 47, 47, 47, 33, 34, 35, 36, 36, 36, 38, 41, 43, 43,
+        43, 44, 46, 47, 47, 47, 33, 34, 35, 36, 36, 36, 38, 41, 43, 43, 43, 44,
+        46, 47, 47, 47, 35, 36, 37, 37, 37, 37, 40, 43, 44, 44, 44, 45, 46, 47,
+        47, 47, 36, 37, 38, 39, 39, 39, 42, 44, 46, 46, 46, 47, 47, 47, 47, 47,
+        37, 38, 39, 40, 40, 40, 43, 45, 47, 47, 47, 47, 47, 47, 47, 47, 37, 38,
+        39, 40, 40, 40, 43, 45, 47, 47, 47, 47, 47, 47, 47, 47, 37, 38, 39, 40,
+        40, 40, 43, 45, 47, 47, 47, 47, 47, 47, 47, 47, 39, 39, 40, 41, 41, 41,
+        43, 46, 47, 47, 47, 48, 48, 48, 48, 48, 41, 41, 42, 42, 42, 42, 44, 46,
+        47, 47, 47, 48, 49, 49, 49, 49, 42, 42, 42, 43, 43, 43, 44, 46, 47, 47,
+        47, 48, 49, 50, 50, 50, 42, 42, 42, 43, 43, 43, 44, 46, 47, 47, 47, 48,
+        49, 50, 50, 50, 42, 42, 42, 43, 43, 43, 44, 46, 47, 47, 47, 48, 49, 50,
+        50, 50, 44, 44, 44, 44, 44, 44, 45, 47, 47, 47, 47, 49, 50, 51, 51, 51,
+        47, 46, 46, 46, 46, 46, 46, 47, 48, 48, 48, 49, 51, 52, 52, 52, 49, 48,
+        47, 46, 46, 46, 47, 48, 48, 48, 48, 50, 52, 53, 53, 53, 49, 48, 47, 46,
+        46, 46, 47, 48, 48, 48, 48, 50, 52, 53, 53, 53, 49, 48, 47, 46, 46, 46,
+        47, 48, 48, 48, 48, 50, 52, 53, 53, 53, 49, 48, 47, 46, 46, 46, 47, 47,
+        47, 47, 47, 49, 52, 53, 53, 53,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 31, 33, 33, 33, 33, 35, 36,
+        37, 37, 37, 39, 41, 42, 42, 42, 44, 47, 49, 49, 49, 49, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 34, 34, 34, 34, 36, 37, 38, 38, 38, 39,
+        41, 42, 42, 42, 44, 46, 48, 48, 48, 48, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 33, 34, 35, 35, 35, 37, 38, 39, 39, 39, 40, 42, 42, 42, 42,
+        44, 46, 47, 47, 47, 47, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 33,
+        35, 36, 36, 36, 37, 39, 40, 40, 40, 41, 42, 43, 43, 43, 44, 46, 46, 46,
+        46, 46, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 33, 35, 36, 36, 36,
+        37, 39, 40, 40, 40, 41, 42, 43, 43, 43, 44, 46, 46, 46, 46, 46, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 33, 35, 36, 36, 36, 37, 39, 40, 40,
+        40, 41, 42, 43, 43, 43, 44, 46, 46, 46, 46, 46, 33, 33, 34, 34, 34, 34,
+        34, 34, 35, 35, 35, 36, 37, 38, 38, 38, 40, 42, 43, 43, 43, 43, 44, 44,
+        44, 44, 45, 46, 47, 47, 47, 47, 35, 36, 36, 37, 37, 37, 37, 38, 38, 38,
+        38, 39, 40, 41, 41, 41, 43, 44, 45, 45, 45, 46, 46, 46, 46, 46, 47, 47,
+        48, 48, 48, 47, 37, 37, 38, 38, 38, 38, 39, 39, 40, 40, 40, 41, 42, 43,
+        43, 43, 44, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 47,
+        37, 37, 38, 38, 38, 38, 39, 39, 40, 40, 40, 41, 42, 43, 43, 43, 44, 46,
+        47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 47, 37, 37, 38, 38,
+        38, 38, 39, 39, 40, 40, 40, 41, 42, 43, 43, 43, 44, 46, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 48, 48, 48, 48, 47, 40, 41, 41, 41, 41, 41, 41, 42,
+        42, 42, 42, 43, 44, 44, 44, 44, 45, 47, 47, 47, 47, 48, 48, 48, 48, 48,
+        49, 49, 50, 50, 50, 49, 45, 45, 45, 45, 45, 45, 45, 44, 44, 44, 44, 45,
+        46, 46, 46, 46, 46, 47, 47, 47, 47, 48, 49, 49, 49, 49, 50, 51, 52, 52,
+        52, 52, 48, 48, 47, 47, 47, 47, 46, 46, 46, 46, 46, 46, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 48, 49, 50, 50, 50, 51, 52, 53, 53, 53, 53, 48, 48,
+        47, 47, 47, 47, 46, 46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 47,
+        47, 48, 49, 50, 50, 50, 51, 52, 53, 53, 53, 53, 48, 48, 47, 47, 47, 47,
+        46, 46, 46, 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 49, 50,
+        50, 50, 51, 52, 53, 53, 53, 53,
+        /* Size 4x16 */
+        31, 31, 37, 48, 31, 31, 38, 47, 31, 31, 38, 47, 31, 32, 39, 46, 31, 32,
+        40, 46, 31, 32, 40, 46, 34, 35, 42, 47, 34, 36, 43, 47, 36, 37, 44, 47,
+        38, 40, 47, 47, 38, 40, 47, 47, 41, 42, 47, 49, 42, 43, 47, 50, 44, 44,
+        47, 51, 48, 46, 48, 53, 48, 46, 48, 53,
+        /* Size 16x4 */
+        31, 31, 31, 31, 31, 31, 34, 34, 36, 38, 38, 41, 42, 44, 48, 48, 31, 31,
+        31, 32, 32, 32, 35, 36, 37, 40, 40, 42, 43, 44, 46, 46, 37, 38, 38, 39,
+        40, 40, 42, 43, 44, 47, 47, 47, 47, 47, 48, 48, 48, 47, 47, 46, 46, 46,
+        47, 47, 47, 47, 47, 49, 50, 51, 53, 53,
+        /* Size 8x32 */
+        32, 31, 31, 33, 37, 37, 45, 48, 31, 31, 31, 33, 37, 37, 45, 48, 31, 31,
+        31, 34, 38, 38, 45, 47, 31, 31, 31, 34, 38, 38, 45, 47, 31, 31, 31, 34,
+        38, 38, 45, 47, 31, 31, 31, 34, 38, 38, 45, 47, 31, 31, 32, 34, 39, 39,
+        45, 46, 30, 31, 32, 34, 39, 39, 44, 46, 30, 32, 32, 35, 40, 40, 44, 46,
+        30, 32, 32, 35, 40, 40, 44, 46, 30, 32, 32, 35, 40, 40, 44, 46, 31, 33,
+        33, 36, 41, 41, 45, 46, 33, 34, 35, 37, 42, 42, 46, 47, 33, 35, 36, 38,
+        43, 43, 46, 47, 33, 35, 36, 38, 43, 43, 46, 47, 33, 35, 36, 38, 43, 43,
+        46, 47, 35, 37, 37, 40, 44, 44, 46, 47, 36, 38, 39, 42, 46, 46, 47, 47,
+        37, 39, 40, 43, 47, 47, 47, 47, 37, 39, 40, 43, 47, 47, 47, 47, 37, 39,
+        40, 43, 47, 47, 47, 47, 39, 40, 41, 43, 47, 47, 48, 48, 41, 42, 42, 44,
+        47, 47, 49, 49, 42, 42, 43, 44, 47, 47, 49, 50, 42, 42, 43, 44, 47, 47,
+        49, 50, 42, 42, 43, 44, 47, 47, 49, 50, 44, 44, 44, 45, 47, 47, 50, 51,
+        47, 46, 46, 46, 48, 48, 51, 52, 49, 47, 46, 47, 48, 48, 52, 53, 49, 47,
+        46, 47, 48, 48, 52, 53, 49, 47, 46, 47, 48, 48, 52, 53, 49, 47, 46, 47,
+        47, 47, 52, 53,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 31, 33, 33, 33, 33, 35, 36,
+        37, 37, 37, 39, 41, 42, 42, 42, 44, 47, 49, 49, 49, 49, 31, 31, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 33, 34, 35, 35, 35, 37, 38, 39, 39, 39, 40,
+        42, 42, 42, 42, 44, 46, 47, 47, 47, 47, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 33, 35, 36, 36, 36, 37, 39, 40, 40, 40, 41, 42, 43, 43, 43,
+        44, 46, 46, 46, 46, 46, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36,
+        37, 38, 38, 38, 40, 42, 43, 43, 43, 43, 44, 44, 44, 44, 45, 46, 47, 47,
+        47, 47, 37, 37, 38, 38, 38, 38, 39, 39, 40, 40, 40, 41, 42, 43, 43, 43,
+        44, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 47, 37, 37,
+        38, 38, 38, 38, 39, 39, 40, 40, 40, 41, 42, 43, 43, 43, 44, 46, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 47, 45, 45, 45, 45, 45, 45,
+        45, 44, 44, 44, 44, 45, 46, 46, 46, 46, 46, 47, 47, 47, 47, 48, 49, 49,
+        49, 49, 50, 51, 52, 52, 52, 52, 48, 48, 47, 47, 47, 47, 46, 46, 46, 46,
+        46, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 49, 50, 50, 50, 51, 52,
+        53, 53, 53, 53 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        31, 32, 32, 32, 32, 32, 32, 33, 32, 32, 33, 34, 32, 33, 34, 35,
+        /* Size 8x8 */
+        31, 31, 31, 31, 32, 32, 32, 33, 31, 32, 32, 32, 32, 32, 32, 33, 31, 32,
+        32, 32, 32, 32, 32, 33, 31, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32,
+        33, 33, 34, 35, 32, 32, 32, 32, 33, 34, 34, 35, 32, 32, 32, 32, 34, 34,
+        35, 36, 33, 33, 33, 33, 35, 35, 36, 38,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 34, 31, 31,
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 34, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        33, 34, 31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 35,
+        31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 35, 31, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 35, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 33, 34, 35, 35, 35, 36, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 34, 35, 35, 35, 36, 37, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 34, 34, 35, 35, 35, 36, 37, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34,
+        34, 35, 36, 36, 36, 38, 34, 34, 34, 34, 34, 33, 33, 34, 35, 35, 35, 36,
+        37, 37, 38, 39,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 34, 34, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        34, 34, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 34, 34, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 34, 34, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 33, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        33, 33, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 34, 34, 34, 34, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34,
+        34, 34, 35, 35, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 35,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 35, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33,
+        33, 34, 34, 34, 34, 34, 34, 35, 35, 35, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34,
+        34, 34, 34, 35, 35, 35, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 35, 35,
+        35, 35, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34,
+        34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 36, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35,
+        35, 35, 35, 35, 36, 36, 37, 37, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35,
+        36, 36, 37, 37, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34,
+        34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35,
+        35, 35, 36, 36, 36, 36, 36, 37, 38, 38, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 36,
+        36, 36, 37, 38, 38, 38, 34, 34, 34, 34, 34, 34, 34, 34, 34, 33, 33, 33,
+        33, 33, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 37, 37, 38, 38,
+        39, 39, 34, 34, 34, 34, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 34, 34,
+        35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 37, 37, 38, 38, 39, 39,
+        /* Size 4x8 */
+        31, 31, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32,
+        33, 34, 32, 32, 34, 34, 32, 33, 34, 35, 33, 33, 35, 36,
+        /* Size 8x4 */
+        31, 31, 32, 32, 32, 32, 32, 33, 31, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 33, 34, 34, 35, 32, 32, 32, 33, 34, 34, 35, 36,
+        /* Size 8x16 */
+        32, 31, 31, 31, 31, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 33, 31, 32,
+        32, 32, 32, 32, 32, 33, 31, 32, 32, 32, 32, 32, 32, 33, 31, 32, 32, 32,
+        32, 32, 32, 33, 31, 32, 32, 32, 32, 33, 33, 33, 31, 32, 32, 32, 32, 33,
+        33, 33, 31, 32, 32, 32, 32, 33, 33, 33, 31, 32, 32, 32, 33, 34, 34, 34,
+        32, 32, 32, 32, 33, 34, 34, 34, 32, 32, 32, 32, 33, 34, 34, 34, 32, 32,
+        32, 32, 33, 35, 35, 35, 32, 32, 33, 33, 34, 35, 35, 36, 32, 32, 33, 33,
+        34, 35, 35, 36, 32, 33, 33, 33, 34, 36, 36, 36, 34, 34, 34, 34, 35, 37,
+        37, 38,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 34, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 31, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 34, 34, 34, 35, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34,
+        34, 35, 35, 35, 36, 37, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 35,
+        35, 35, 36, 37, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 36, 36,
+        36, 38,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 34, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 33, 34, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 33, 33, 34, 31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 34, 34, 31, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 34, 34,
+        34, 35, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 35,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 35, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 35, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 34, 34, 34, 34, 34, 35, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 34, 34, 34, 34, 35, 35, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 34, 35, 35, 35, 35, 35, 36, 32, 32, 32, 32, 33, 33, 33, 33, 33, 34,
+        35, 35, 35, 35, 36, 36, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 35, 35,
+        35, 35, 36, 37, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 35, 35, 35, 35,
+        36, 37, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 35, 35, 35, 35, 36, 37,
+        32, 32, 32, 33, 33, 33, 33, 33, 34, 34, 35, 35, 35, 35, 36, 37, 32, 33,
+        33, 33, 33, 33, 33, 33, 34, 35, 36, 36, 36, 36, 36, 38, 33, 33, 33, 33,
+        33, 33, 33, 34, 34, 35, 36, 36, 36, 36, 37, 38, 34, 34, 34, 34, 34, 34,
+        34, 34, 35, 36, 37, 37, 37, 37, 38, 39, 34, 34, 34, 34, 34, 34, 34, 34,
+        35, 36, 37, 37, 37, 37, 38, 39,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 34, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        34, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 33, 33, 33, 34, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 34, 34, 34, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 35, 35, 36, 36, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34,
+        35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35,
+        35, 35, 36, 36, 37, 37, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36,
+        37, 37, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 32, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34,
+        34, 35, 35, 36, 36, 36, 36, 36, 36, 37, 38, 38, 34, 34, 34, 34, 34, 34,
+        34, 34, 34, 33, 33, 33, 33, 33, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36,
+        37, 37, 37, 37, 38, 38, 39, 39,
+        /* Size 4x16 */
+        31, 31, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32,
+        32, 32, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 33, 33, 32, 32, 33, 34,
+        32, 32, 33, 34, 32, 32, 33, 34, 32, 32, 34, 35, 32, 33, 34, 35, 32, 33,
+        34, 35, 33, 33, 35, 36, 34, 34, 36, 37,
+        /* Size 16x4 */
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 33, 34, 34, 34, 35, 36, 32, 32, 32, 32, 32, 33,
+        33, 33, 34, 34, 34, 35, 35, 35, 36, 37,
+        /* Size 8x32 */
+        32, 31, 31, 31, 31, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 33, 31, 31,
+        32, 32, 32, 32, 32, 33, 31, 32, 32, 32, 32, 32, 32, 33, 31, 32, 32, 32,
+        32, 32, 32, 33, 31, 32, 32, 32, 32, 32, 32, 33, 31, 32, 32, 32, 32, 32,
+        32, 33, 31, 32, 32, 32, 32, 32, 32, 33, 31, 32, 32, 32, 32, 32, 32, 33,
+        31, 32, 32, 32, 32, 32, 32, 33, 31, 32, 32, 32, 32, 33, 33, 33, 31, 32,
+        32, 32, 32, 33, 33, 33, 31, 32, 32, 32, 32, 33, 33, 33, 31, 32, 32, 32,
+        32, 33, 33, 33, 31, 32, 32, 32, 32, 33, 33, 33, 31, 32, 32, 32, 33, 33,
+        33, 34, 31, 32, 32, 32, 33, 34, 34, 34, 32, 32, 32, 32, 33, 34, 34, 34,
+        32, 32, 32, 32, 33, 34, 34, 34, 32, 32, 32, 32, 33, 34, 34, 34, 32, 32,
+        32, 32, 33, 34, 34, 34, 32, 32, 32, 32, 33, 34, 34, 35, 32, 32, 32, 32,
+        33, 35, 35, 35, 32, 32, 33, 33, 33, 35, 35, 36, 32, 32, 33, 33, 34, 35,
+        35, 36, 32, 32, 33, 33, 34, 35, 35, 36, 32, 32, 33, 33, 34, 35, 35, 36,
+        32, 32, 33, 33, 34, 35, 35, 36, 32, 33, 33, 33, 34, 36, 36, 36, 33, 33,
+        33, 33, 34, 36, 36, 37, 34, 34, 34, 34, 35, 37, 37, 38, 34, 34, 34, 34,
+        35, 37, 37, 38,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        33, 33, 33, 33, 34, 34, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33,
+        34, 34, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34,
+        34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35,
+        35, 35, 35, 35, 36, 36, 37, 37, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 36, 36, 36, 36, 36,
+        36, 37, 38, 38 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 31, 34, 38, 31, 32, 35, 40, 34, 35, 39, 43, 38, 40, 43, 47,
+        /* Size 8x8 */
+        31, 31, 31, 30, 34, 35, 37, 40, 31, 31, 31, 31, 34, 35, 38, 41, 31, 31,
+        31, 31, 35, 36, 39, 41, 30, 31, 31, 32, 35, 36, 40, 42, 34, 34, 35, 35,
+        39, 40, 43, 44, 35, 35, 36, 36, 40, 41, 44, 45, 37, 38, 39, 40, 43, 44,
+        47, 47, 40, 41, 41, 42, 44, 45, 47, 48,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 30, 30, 31, 33, 33, 33, 35, 36, 36, 38, 41, 31, 31,
+        31, 31, 31, 31, 31, 31, 33, 34, 34, 36, 37, 37, 39, 42, 31, 31, 31, 31,
+        31, 31, 31, 32, 34, 34, 34, 37, 38, 38, 40, 42, 31, 31, 31, 31, 31, 31,
+        31, 32, 34, 34, 34, 37, 38, 38, 40, 42, 31, 31, 31, 31, 31, 31, 31, 32,
+        34, 35, 35, 37, 39, 39, 40, 42, 30, 31, 31, 31, 31, 32, 32, 32, 34, 35,
+        35, 38, 40, 40, 41, 42, 30, 31, 31, 31, 31, 32, 32, 32, 34, 35, 35, 38,
+        40, 40, 41, 42, 31, 31, 32, 32, 32, 32, 32, 33, 35, 36, 36, 38, 40, 40,
+        41, 43, 33, 33, 34, 34, 34, 34, 34, 35, 37, 38, 38, 41, 42, 42, 43, 44,
+        33, 34, 34, 34, 35, 35, 35, 36, 38, 39, 39, 41, 43, 43, 44, 45, 33, 34,
+        34, 34, 35, 35, 35, 36, 38, 39, 39, 41, 43, 43, 44, 45, 35, 36, 37, 37,
+        37, 38, 38, 38, 41, 41, 41, 44, 46, 46, 46, 46, 36, 37, 38, 38, 39, 40,
+        40, 40, 42, 43, 43, 46, 47, 47, 47, 47, 36, 37, 38, 38, 39, 40, 40, 40,
+        42, 43, 43, 46, 47, 47, 47, 47, 38, 39, 40, 40, 40, 41, 41, 41, 43, 44,
+        44, 46, 47, 47, 47, 48, 41, 42, 42, 42, 42, 42, 42, 43, 44, 45, 45, 46,
+        47, 47, 48, 48,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 31, 32, 33, 33,
+        33, 33, 33, 34, 35, 36, 36, 36, 36, 37, 38, 40, 41, 41, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 31, 32, 33, 34, 34, 34, 34, 35,
+        36, 37, 37, 37, 37, 37, 39, 40, 42, 42, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 34, 34, 34, 35, 36, 37, 37, 37,
+        37, 38, 39, 40, 42, 42, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 34, 34, 34, 34, 34, 35, 36, 38, 38, 38, 38, 38, 40, 41,
+        42, 42, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33,
+        34, 34, 34, 34, 34, 35, 37, 38, 38, 38, 38, 39, 40, 41, 42, 42, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 34, 34, 34,
+        34, 35, 37, 38, 38, 38, 38, 39, 40, 41, 42, 42, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 34, 34, 34, 34, 35, 37, 38,
+        38, 38, 38, 39, 40, 41, 42, 42, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 32, 33, 34, 34, 34, 34, 34, 36, 37, 38, 38, 38, 38, 39,
+        40, 41, 42, 42, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 33, 34, 35, 35, 35, 35, 36, 37, 38, 39, 39, 39, 39, 40, 41, 42, 42,
+        30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 35,
+        35, 35, 35, 36, 37, 39, 39, 39, 39, 40, 40, 41, 42, 42, 30, 30, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 33, 34, 35, 35, 35, 35, 36,
+        38, 39, 40, 40, 40, 40, 41, 42, 42, 42, 30, 30, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 33, 34, 35, 35, 35, 35, 36, 38, 39, 40, 40,
+        40, 40, 41, 42, 42, 42, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 33, 34, 35, 35, 35, 35, 36, 38, 39, 40, 40, 40, 40, 41, 42,
+        42, 42, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 33,
+        34, 35, 35, 35, 35, 36, 38, 39, 40, 40, 40, 40, 41, 42, 42, 42, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 35, 36, 36, 36,
+        36, 37, 38, 40, 40, 40, 40, 41, 41, 42, 43, 43, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 34, 35, 36, 37, 37, 37, 37, 38, 39, 41,
+        41, 41, 41, 42, 42, 43, 43, 43, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34,
+        34, 34, 34, 34, 35, 36, 37, 38, 38, 38, 38, 39, 41, 42, 42, 42, 42, 43,
+        43, 44, 44, 44, 33, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35,
+        36, 37, 38, 39, 39, 39, 39, 40, 41, 43, 43, 43, 43, 43, 44, 44, 45, 45,
+        33, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 37, 38, 39,
+        39, 39, 39, 40, 41, 43, 43, 43, 43, 43, 44, 44, 45, 45, 33, 34, 34, 34,
+        34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 37, 38, 39, 39, 39, 39, 40,
+        41, 43, 43, 43, 43, 43, 44, 44, 45, 45, 33, 34, 34, 34, 34, 34, 34, 34,
+        35, 35, 35, 35, 35, 35, 36, 37, 38, 39, 39, 39, 39, 40, 41, 43, 43, 43,
+        43, 43, 44, 44, 45, 45, 34, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36,
+        36, 36, 37, 38, 39, 40, 40, 40, 40, 41, 42, 44, 44, 44, 44, 44, 45, 45,
+        45, 45, 35, 36, 36, 36, 37, 37, 37, 37, 37, 37, 38, 38, 38, 38, 38, 39,
+        41, 41, 41, 41, 41, 42, 44, 45, 46, 46, 46, 46, 46, 46, 46, 46, 36, 37,
+        37, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 40, 41, 42, 43, 43, 43,
+        43, 44, 45, 46, 47, 47, 47, 47, 47, 47, 47, 47, 36, 37, 37, 38, 38, 38,
+        38, 38, 39, 39, 40, 40, 40, 40, 40, 41, 42, 43, 43, 43, 43, 44, 46, 47,
+        47, 47, 47, 47, 47, 47, 47, 47, 36, 37, 37, 38, 38, 38, 38, 38, 39, 39,
+        40, 40, 40, 40, 40, 41, 42, 43, 43, 43, 43, 44, 46, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 36, 37, 37, 38, 38, 38, 38, 38, 39, 39, 40, 40, 40, 40,
+        40, 41, 42, 43, 43, 43, 43, 44, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+        37, 37, 38, 38, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 41, 42, 43, 43,
+        43, 43, 43, 44, 46, 47, 47, 47, 47, 47, 47, 47, 47, 47, 38, 39, 39, 40,
+        40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 42, 43, 44, 44, 44, 44, 45,
+        46, 47, 47, 47, 47, 47, 47, 48, 48, 48, 40, 40, 40, 41, 41, 41, 41, 41,
+        41, 41, 42, 42, 42, 42, 42, 43, 44, 44, 44, 44, 44, 45, 46, 47, 47, 47,
+        47, 47, 48, 48, 48, 48, 41, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+        42, 42, 43, 43, 44, 45, 45, 45, 45, 45, 46, 47, 47, 47, 47, 47, 48, 48,
+        48, 48, 41, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 43, 43,
+        44, 45, 45, 45, 45, 45, 46, 47, 47, 47, 47, 47, 48, 48, 48, 48,
+        /* Size 4x8 */
+        31, 31, 35, 37, 31, 31, 36, 38, 31, 32, 37, 39, 31, 32, 37, 40, 34, 36,
+        40, 43, 35, 37, 42, 44, 38, 40, 45, 47, 41, 42, 45, 47,
+        /* Size 8x4 */
+        31, 31, 31, 31, 34, 35, 38, 41, 31, 31, 32, 32, 36, 37, 40, 42, 35, 36,
+        37, 37, 40, 42, 45, 45, 37, 38, 39, 40, 43, 44, 47, 47,
+        /* Size 8x16 */
+        32, 31, 31, 31, 33, 37, 37, 38, 31, 31, 31, 31, 33, 38, 38, 39, 31, 31,
+        31, 31, 34, 38, 38, 40, 31, 31, 31, 31, 34, 38, 38, 40, 31, 31, 32, 32,
+        34, 39, 39, 40, 30, 31, 32, 32, 35, 40, 40, 41, 30, 31, 32, 32, 35, 40,
+        40, 41, 31, 32, 33, 33, 35, 40, 40, 41, 33, 34, 35, 35, 37, 42, 42, 43,
+        33, 35, 36, 36, 38, 43, 43, 44, 33, 35, 36, 36, 38, 43, 43, 44, 35, 37,
+        38, 38, 41, 45, 45, 46, 37, 39, 40, 40, 43, 47, 47, 47, 37, 39, 40, 40,
+        43, 47, 47, 47, 39, 40, 41, 41, 43, 47, 47, 47, 42, 42, 43, 43, 44, 47,
+        47, 48,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 30, 30, 31, 33, 33, 33, 35, 37, 37, 39, 42, 31, 31,
+        31, 31, 31, 31, 31, 32, 34, 35, 35, 37, 39, 39, 40, 42, 31, 31, 31, 31,
+        32, 32, 32, 33, 35, 36, 36, 38, 40, 40, 41, 43, 31, 31, 31, 31, 32, 32,
+        32, 33, 35, 36, 36, 38, 40, 40, 41, 43, 33, 33, 34, 34, 34, 35, 35, 35,
+        37, 38, 38, 41, 43, 43, 43, 44, 37, 38, 38, 38, 39, 40, 40, 40, 42, 43,
+        43, 45, 47, 47, 47, 47, 37, 38, 38, 38, 39, 40, 40, 40, 42, 43, 43, 45,
+        47, 47, 47, 47, 38, 39, 40, 40, 40, 41, 41, 41, 43, 44, 44, 46, 47, 47,
+        47, 48,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 33, 35, 37, 37, 37, 37, 38, 42, 31, 31,
+        31, 31, 31, 31, 31, 31, 33, 35, 37, 37, 37, 37, 39, 42, 31, 31, 31, 31,
+        31, 31, 31, 32, 33, 35, 38, 38, 38, 38, 39, 42, 31, 31, 31, 31, 31, 31,
+        31, 32, 34, 36, 38, 38, 38, 38, 40, 42, 31, 31, 31, 31, 31, 31, 31, 32,
+        34, 36, 38, 38, 38, 38, 40, 42, 31, 31, 31, 31, 31, 31, 31, 32, 34, 36,
+        38, 38, 38, 38, 40, 42, 31, 31, 31, 31, 31, 31, 31, 32, 34, 36, 38, 38,
+        38, 38, 40, 42, 31, 31, 31, 31, 31, 31, 31, 32, 34, 36, 38, 38, 38, 38,
+        40, 42, 31, 31, 31, 31, 32, 32, 32, 32, 34, 36, 39, 39, 39, 39, 40, 42,
+        30, 31, 31, 32, 32, 32, 32, 32, 34, 37, 39, 39, 39, 39, 40, 42, 30, 31,
+        31, 32, 32, 32, 32, 33, 35, 37, 40, 40, 40, 40, 41, 42, 30, 31, 31, 32,
+        32, 32, 32, 33, 35, 37, 40, 40, 40, 40, 41, 42, 30, 31, 31, 32, 32, 32,
+        32, 33, 35, 37, 40, 40, 40, 40, 41, 42, 30, 31, 31, 32, 32, 32, 32, 33,
+        35, 37, 40, 40, 40, 40, 41, 42, 31, 31, 32, 32, 33, 33, 33, 33, 35, 38,
+        40, 40, 40, 40, 41, 43, 32, 32, 33, 33, 34, 34, 34, 34, 36, 39, 41, 41,
+        41, 41, 42, 44, 33, 33, 34, 35, 35, 35, 35, 35, 37, 40, 42, 42, 42, 42,
+        43, 44, 33, 34, 35, 35, 36, 36, 36, 36, 38, 40, 43, 43, 43, 43, 44, 45,
+        33, 34, 35, 35, 36, 36, 36, 36, 38, 40, 43, 43, 43, 43, 44, 45, 33, 34,
+        35, 35, 36, 36, 36, 36, 38, 40, 43, 43, 43, 43, 44, 45, 33, 34, 35, 35,
+        36, 36, 36, 36, 38, 40, 43, 43, 43, 43, 44, 45, 34, 35, 36, 37, 37, 37,
+        37, 37, 39, 42, 44, 44, 44, 44, 45, 45, 35, 36, 37, 38, 38, 38, 38, 39,
+        41, 43, 45, 45, 45, 45, 46, 46, 36, 37, 38, 39, 39, 39, 39, 40, 42, 44,
+        47, 47, 47, 47, 47, 47, 37, 38, 39, 40, 40, 40, 40, 41, 43, 45, 47, 47,
+        47, 47, 47, 47, 37, 38, 39, 40, 40, 40, 40, 41, 43, 45, 47, 47, 47, 47,
+        47, 47, 37, 38, 39, 40, 40, 40, 40, 41, 43, 45, 47, 47, 47, 47, 47, 47,
+        37, 38, 39, 40, 40, 40, 40, 41, 43, 45, 47, 47, 47, 47, 47, 47, 39, 39,
+        40, 41, 41, 41, 41, 42, 43, 45, 47, 47, 47, 47, 47, 48, 40, 41, 41, 42,
+        42, 42, 42, 42, 44, 45, 47, 47, 47, 47, 47, 48, 42, 42, 42, 43, 43, 43,
+        43, 43, 44, 46, 47, 47, 47, 47, 48, 48, 42, 42, 42, 43, 43, 43, 43, 43,
+        44, 46, 47, 47, 47, 47, 48, 48,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 31, 32, 33, 33,
+        33, 33, 33, 34, 35, 36, 37, 37, 37, 37, 39, 40, 42, 42, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 34, 34, 34, 35,
+        36, 37, 38, 38, 38, 38, 39, 41, 42, 42, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 33, 34, 35, 35, 35, 35, 36, 37, 38, 39, 39,
+        39, 39, 40, 41, 42, 42, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 33, 35, 35, 35, 35, 35, 37, 38, 39, 40, 40, 40, 40, 41, 42,
+        43, 43, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 33, 34,
+        35, 36, 36, 36, 36, 37, 38, 39, 40, 40, 40, 40, 41, 42, 43, 43, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 33, 34, 35, 36, 36, 36,
+        36, 37, 38, 39, 40, 40, 40, 40, 41, 42, 43, 43, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 33, 34, 35, 36, 36, 36, 36, 37, 38, 39,
+        40, 40, 40, 40, 41, 42, 43, 43, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 34, 35, 36, 36, 36, 36, 37, 39, 40, 41, 41, 41, 41,
+        42, 42, 43, 43, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35,
+        35, 36, 37, 38, 38, 38, 38, 39, 41, 42, 43, 43, 43, 43, 43, 44, 44, 44,
+        35, 35, 35, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 37, 38, 39, 40, 40,
+        40, 40, 40, 42, 43, 44, 45, 45, 45, 45, 45, 45, 46, 46, 37, 37, 38, 38,
+        38, 38, 38, 38, 39, 39, 40, 40, 40, 40, 40, 41, 42, 43, 43, 43, 43, 44,
+        45, 47, 47, 47, 47, 47, 47, 47, 47, 47, 37, 37, 38, 38, 38, 38, 38, 38,
+        39, 39, 40, 40, 40, 40, 40, 41, 42, 43, 43, 43, 43, 44, 45, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 37, 37, 38, 38, 38, 38, 38, 38, 39, 39, 40, 40,
+        40, 40, 40, 41, 42, 43, 43, 43, 43, 44, 45, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 37, 37, 38, 38, 38, 38, 38, 38, 39, 39, 40, 40, 40, 40, 40, 41,
+        42, 43, 43, 43, 43, 44, 45, 47, 47, 47, 47, 47, 47, 47, 47, 47, 38, 39,
+        39, 40, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 42, 43, 44, 44, 44,
+        44, 45, 46, 47, 47, 47, 47, 47, 47, 47, 48, 48, 42, 42, 42, 42, 42, 42,
+        42, 42, 42, 42, 42, 42, 42, 42, 43, 44, 44, 45, 45, 45, 45, 45, 46, 47,
+        47, 47, 47, 47, 48, 48, 48, 48,
+        /* Size 4x16 */
+        31, 31, 35, 37, 31, 31, 35, 38, 31, 31, 36, 38, 31, 31, 36, 38, 31, 32,
+        36, 39, 31, 32, 37, 40, 31, 32, 37, 40, 31, 33, 38, 40, 33, 35, 40, 42,
+        34, 36, 40, 43, 34, 36, 40, 43, 36, 38, 43, 45, 38, 40, 45, 47, 38, 40,
+        45, 47, 39, 41, 45, 47, 42, 43, 46, 47,
+        /* Size 16x4 */
+        31, 31, 31, 31, 31, 31, 31, 31, 33, 34, 34, 36, 38, 38, 39, 42, 31, 31,
+        31, 31, 32, 32, 32, 33, 35, 36, 36, 38, 40, 40, 41, 43, 35, 35, 36, 36,
+        36, 37, 37, 38, 40, 40, 40, 43, 45, 45, 45, 46, 37, 38, 38, 38, 39, 40,
+        40, 40, 42, 43, 43, 45, 47, 47, 47, 47,
+        /* Size 8x32 */
+        32, 31, 31, 31, 33, 37, 37, 38, 31, 31, 31, 31, 33, 37, 37, 39, 31, 31,
+        31, 31, 33, 38, 38, 39, 31, 31, 31, 31, 34, 38, 38, 40, 31, 31, 31, 31,
+        34, 38, 38, 40, 31, 31, 31, 31, 34, 38, 38, 40, 31, 31, 31, 31, 34, 38,
+        38, 40, 31, 31, 31, 31, 34, 38, 38, 40, 31, 31, 32, 32, 34, 39, 39, 40,
+        30, 31, 32, 32, 34, 39, 39, 40, 30, 31, 32, 32, 35, 40, 40, 41, 30, 31,
+        32, 32, 35, 40, 40, 41, 30, 31, 32, 32, 35, 40, 40, 41, 30, 31, 32, 32,
+        35, 40, 40, 41, 31, 32, 33, 33, 35, 40, 40, 41, 32, 33, 34, 34, 36, 41,
+        41, 42, 33, 34, 35, 35, 37, 42, 42, 43, 33, 35, 36, 36, 38, 43, 43, 44,
+        33, 35, 36, 36, 38, 43, 43, 44, 33, 35, 36, 36, 38, 43, 43, 44, 33, 35,
+        36, 36, 38, 43, 43, 44, 34, 36, 37, 37, 39, 44, 44, 45, 35, 37, 38, 38,
+        41, 45, 45, 46, 36, 38, 39, 39, 42, 47, 47, 47, 37, 39, 40, 40, 43, 47,
+        47, 47, 37, 39, 40, 40, 43, 47, 47, 47, 37, 39, 40, 40, 43, 47, 47, 47,
+        37, 39, 40, 40, 43, 47, 47, 47, 39, 40, 41, 41, 43, 47, 47, 47, 40, 41,
+        42, 42, 44, 47, 47, 47, 42, 42, 43, 43, 44, 47, 47, 48, 42, 42, 43, 43,
+        44, 47, 47, 48,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 31, 32, 33, 33,
+        33, 33, 33, 34, 35, 36, 37, 37, 37, 37, 39, 40, 42, 42, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 35, 35, 35, 35, 36,
+        37, 38, 39, 39, 39, 39, 40, 41, 42, 42, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 33, 34, 35, 36, 36, 36, 36, 37, 38, 39, 40, 40,
+        40, 40, 41, 42, 43, 43, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 33, 34, 35, 36, 36, 36, 36, 37, 38, 39, 40, 40, 40, 40, 41, 42,
+        43, 43, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 36,
+        37, 38, 38, 38, 38, 39, 41, 42, 43, 43, 43, 43, 43, 44, 44, 44, 37, 37,
+        38, 38, 38, 38, 38, 38, 39, 39, 40, 40, 40, 40, 40, 41, 42, 43, 43, 43,
+        43, 44, 45, 47, 47, 47, 47, 47, 47, 47, 47, 47, 37, 37, 38, 38, 38, 38,
+        38, 38, 39, 39, 40, 40, 40, 40, 40, 41, 42, 43, 43, 43, 43, 44, 45, 47,
+        47, 47, 47, 47, 47, 47, 47, 47, 38, 39, 39, 40, 40, 40, 40, 40, 40, 40,
+        41, 41, 41, 41, 41, 42, 43, 44, 44, 44, 44, 45, 46, 47, 47, 47, 47, 47,
+        47, 47, 48, 48 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        31, 31, 31, 32, 31, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 33,
+        /* Size 8x8 */
+        31, 31, 31, 31, 31, 31, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32,
+        32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32,
+        32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 32, 32, 32, 32, 32, 32, 33, 33,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 33,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        /* Size 4x8 */
+        31, 31, 31, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32,
+        32, 32, 31, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33,
+        /* Size 8x4 */
+        31, 31, 31, 31, 31, 31, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        /* Size 8x16 */
+        32, 31, 31, 31, 31, 31, 31, 32, 31, 31, 31, 31, 31, 31, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32,
+        32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32,
+        32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32,
+        31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32,
+        32, 32, 32, 32, 33, 33, 31, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32,
+        32, 32, 33, 34, 32, 32, 32, 32, 32, 32, 33, 34, 32, 32, 32, 32, 32, 32,
+        33, 34,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34,
+        34, 34,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 33, 33, 34, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+        34, 34, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 34, 34, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 33, 34, 34,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        34, 34, 34, 34, 34, 34, 34, 34,
+        /* Size 4x16 */
+        31, 31, 31, 32, 31, 31, 31, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32,
+        32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32,
+        31, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32,
+        32, 33, 32, 32, 32, 33, 32, 32, 32, 33,
+        /* Size 16x4 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 33, 33, 33,
+        /* Size 8x32 */
+        32, 31, 31, 31, 31, 31, 31, 32, 31, 31, 31, 31, 31, 31, 32, 32, 31, 31,
+        31, 31, 31, 31, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32,
+        32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32,
+        31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32,
+        32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32,
+        32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32,
+        32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32,
+        31, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 32, 31, 32,
+        32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32, 32, 33, 31, 32, 32, 32,
+        32, 32, 33, 33, 31, 32, 32, 32, 32, 32, 33, 33, 31, 32, 32, 32, 32, 32,
+        33, 33, 32, 32, 32, 32, 32, 32, 33, 34, 32, 32, 32, 32, 32, 32, 33, 34,
+        32, 32, 32, 32, 32, 32, 33, 34, 32, 32, 32, 32, 32, 32, 33, 34, 32, 32,
+        32, 32, 32, 32, 33, 34, 32, 32, 32, 32, 32, 32, 33, 34, 32, 32, 32, 32,
+        32, 32, 33, 34,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34,
+        34, 34, 34, 34 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 31, 31, 34, 31, 31, 31, 35, 31, 31, 32, 35, 34, 35, 35, 39,
+        /* Size 8x8 */
+        31, 31, 31, 31, 30, 31, 33, 33, 31, 31, 31, 31, 31, 32, 34, 34, 31, 31,
+        31, 31, 31, 32, 34, 34, 31, 31, 31, 31, 31, 32, 35, 35, 30, 31, 31, 31,
+        32, 32, 35, 35, 31, 32, 32, 32, 32, 33, 36, 36, 33, 34, 34, 35, 35, 36,
+        39, 39, 33, 34, 34, 35, 35, 36, 39, 39,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 31, 33, 33, 33, 33, 31, 31,
+        31, 31, 31, 31, 31, 31, 30, 30, 30, 32, 33, 34, 34, 34, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 34, 34, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 34, 34, 34, 34, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 34, 34, 34, 34, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 34, 34, 34, 34, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33,
+        34, 35, 35, 35, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 34, 35,
+        35, 35, 30, 30, 31, 31, 31, 31, 31, 31, 32, 32, 32, 33, 34, 35, 35, 35,
+        30, 30, 31, 31, 31, 31, 31, 31, 32, 32, 32, 33, 34, 35, 35, 35, 30, 30,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 33, 34, 35, 35, 35, 31, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 34, 36, 37, 37, 37, 33, 33, 33, 34, 34, 34,
+        34, 34, 34, 34, 34, 36, 37, 38, 38, 38, 33, 34, 34, 34, 34, 34, 35, 35,
+        35, 35, 35, 37, 38, 39, 39, 39, 33, 34, 34, 34, 34, 34, 35, 35, 35, 35,
+        35, 37, 38, 39, 39, 39, 33, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 37,
+        38, 39, 39, 39,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30,
+        30, 30, 30, 31, 31, 32, 33, 33, 33, 33, 33, 33, 33, 34, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 31,
+        31, 32, 33, 33, 33, 33, 33, 33, 33, 34, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 31, 32, 32, 33, 34,
+        34, 34, 34, 34, 34, 34, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33, 34, 34, 34, 34, 34,
+        34, 35, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 33, 33, 34, 34, 34, 34, 34, 34, 35, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 33, 34, 34, 34, 34, 34, 34, 34, 35, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 33,
+        34, 34, 34, 34, 34, 34, 34, 35, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 33, 34, 34, 34, 34,
+        34, 34, 34, 35, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 33, 34, 34, 34, 34, 34, 34, 34, 35,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 32, 33, 34, 34, 34, 34, 34, 34, 34, 35, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32,
+        32, 33, 34, 34, 34, 34, 34, 34, 34, 35, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 33, 34, 35,
+        35, 35, 35, 35, 35, 35, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33, 34, 35, 35, 35, 35, 35,
+        35, 35, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 33, 33, 34, 35, 35, 35, 35, 35, 35, 36, 30, 30,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 33, 34, 34, 35, 35, 35, 35, 35, 35, 36, 30, 30, 30, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 34,
+        34, 35, 35, 35, 35, 35, 35, 36, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 35,
+        35, 35, 35, 36, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 35, 35, 35, 35, 36,
+        30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 33, 34, 34, 35, 35, 35, 35, 35, 35, 36, 30, 30, 30, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        33, 34, 34, 35, 35, 35, 35, 35, 35, 36, 30, 30, 30, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35,
+        35, 35, 35, 35, 35, 36, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 36, 36, 36, 36, 36,
+        36, 37, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 34, 34, 35, 36, 37, 37, 37, 37, 37, 37, 37, 32, 32,
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34,
+        34, 34, 35, 36, 37, 37, 37, 37, 37, 37, 37, 38, 33, 33, 33, 33, 33, 34,
+        34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 36, 37,
+        37, 38, 38, 38, 38, 38, 38, 39, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34,
+        34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 37, 37, 38, 39, 39, 39,
+        39, 39, 39, 40, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35,
+        35, 35, 35, 35, 35, 35, 35, 36, 37, 37, 38, 39, 39, 39, 39, 39, 39, 40,
+        33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35,
+        35, 35, 35, 36, 37, 37, 38, 39, 39, 39, 39, 39, 39, 40, 33, 33, 34, 34,
+        34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36,
+        37, 37, 38, 39, 39, 39, 39, 39, 39, 40, 33, 33, 34, 34, 34, 34, 34, 34,
+        34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 37, 37, 38, 39,
+        39, 39, 39, 39, 39, 40, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35,
+        35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 37, 37, 38, 39, 39, 39, 39, 39,
+        39, 40, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36,
+        36, 36, 36, 36, 36, 37, 37, 38, 39, 40, 40, 40, 40, 40, 40, 40,
+        /* Size 4x8 */
+        31, 31, 31, 34, 31, 31, 31, 35, 31, 31, 31, 35, 31, 32, 32, 36, 31, 32,
+        32, 36, 31, 33, 33, 37, 34, 36, 36, 40, 34, 36, 36, 40,
+        /* Size 8x4 */
+        31, 31, 31, 31, 31, 31, 34, 34, 31, 31, 31, 32, 32, 33, 36, 36, 31, 31,
+        31, 32, 32, 33, 36, 36, 34, 35, 35, 36, 36, 37, 40, 40,
+        /* Size 8x16 */
+        32, 31, 31, 31, 31, 31, 33, 35, 31, 31, 31, 31, 31, 31, 33, 36, 31, 31,
+        31, 31, 31, 31, 34, 36, 31, 31, 31, 31, 31, 31, 34, 37, 31, 31, 31, 31,
+        31, 31, 34, 37, 31, 31, 31, 31, 31, 31, 34, 37, 31, 31, 31, 32, 32, 32,
+        34, 37, 30, 31, 31, 32, 32, 32, 34, 38, 30, 31, 32, 32, 32, 32, 35, 38,
+        30, 31, 32, 32, 32, 32, 35, 38, 30, 31, 32, 32, 32, 32, 35, 38, 31, 32,
+        33, 33, 33, 33, 36, 39, 33, 34, 34, 35, 35, 35, 37, 40, 33, 34, 35, 36,
+        36, 36, 38, 41, 33, 34, 35, 36, 36, 36, 38, 41, 33, 34, 35, 36, 36, 36,
+        38, 41,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 31, 33, 33, 33, 33, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 34, 34, 34, 34, 31, 31, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 33, 34, 35, 35, 35, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 33, 35, 36, 36, 36, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 33, 35, 36, 36, 36, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 33, 35, 36, 36, 36, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36,
+        37, 38, 38, 38, 35, 36, 36, 37, 37, 37, 37, 38, 38, 38, 38, 39, 40, 41,
+        41, 41,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 35, 37, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 35, 37, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 36, 37, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 33, 35, 36, 38, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 34, 35, 36, 38, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 33, 34, 35, 37, 38, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33,
+        34, 35, 37, 38, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 34, 35,
+        37, 38, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 34, 35, 37, 38,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 34, 35, 37, 38, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 34, 35, 37, 38, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 33, 34, 35, 37, 38, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 33, 34, 36, 37, 39, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 33, 34, 36, 37, 39, 30, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 33, 34, 36, 38, 39, 30, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33,
+        35, 36, 38, 40, 30, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 35, 36,
+        38, 40, 30, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 35, 36, 38, 40,
+        30, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 35, 36, 38, 40, 30, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 35, 36, 38, 40, 30, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 33, 35, 36, 38, 40, 31, 31, 31, 32, 32, 33,
+        33, 33, 33, 33, 33, 34, 35, 37, 38, 40, 31, 32, 32, 33, 33, 33, 33, 33,
+        33, 33, 33, 35, 36, 37, 39, 41, 32, 32, 33, 33, 34, 34, 34, 34, 34, 34,
+        34, 35, 37, 38, 40, 41, 33, 33, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36,
+        37, 39, 40, 42, 33, 34, 34, 35, 35, 36, 36, 36, 36, 36, 36, 37, 38, 40,
+        41, 43, 33, 34, 34, 35, 35, 36, 36, 36, 36, 36, 36, 37, 38, 40, 41, 43,
+        33, 34, 34, 35, 35, 36, 36, 36, 36, 36, 36, 37, 38, 40, 41, 43, 33, 34,
+        34, 35, 35, 36, 36, 36, 36, 36, 36, 37, 38, 40, 41, 43, 33, 34, 34, 35,
+        35, 36, 36, 36, 36, 36, 36, 37, 38, 40, 41, 43, 33, 34, 34, 35, 35, 36,
+        36, 36, 36, 36, 36, 37, 38, 40, 41, 43, 34, 34, 35, 35, 36, 36, 36, 36,
+        36, 36, 36, 38, 39, 40, 42, 44,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30,
+        30, 30, 30, 31, 31, 32, 33, 33, 33, 33, 33, 33, 33, 34, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 32, 33, 34, 34, 34, 34, 34, 34, 34, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 34,
+        34, 34, 34, 34, 34, 35, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33, 34, 35, 35, 35, 35, 35,
+        35, 35, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 35, 35, 35, 35, 35, 36, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 35, 36, 36, 36, 36, 36, 36, 36, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34,
+        35, 36, 36, 36, 36, 36, 36, 36, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 35, 36, 36, 36,
+        36, 36, 36, 36, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 35, 36, 36, 36, 36, 36, 36, 36,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 33, 33, 34, 35, 36, 36, 36, 36, 36, 36, 36, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33,
+        33, 34, 35, 36, 36, 36, 36, 36, 36, 36, 32, 32, 32, 32, 32, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 35, 35, 36, 37,
+        37, 37, 37, 37, 37, 38, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34,
+        34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 36, 37, 37, 38, 38, 38, 38, 38,
+        38, 39, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36,
+        36, 36, 36, 36, 36, 37, 37, 38, 39, 40, 40, 40, 40, 40, 40, 40, 35, 35,
+        36, 36, 36, 37, 37, 37, 37, 37, 37, 37, 37, 37, 38, 38, 38, 38, 38, 38,
+        38, 38, 39, 40, 40, 41, 41, 41, 41, 41, 41, 42, 37, 37, 37, 38, 38, 38,
+        38, 38, 38, 38, 38, 38, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40, 41, 41,
+        42, 43, 43, 43, 43, 43, 43, 44,
+        /* Size 4x16 */
+        31, 31, 31, 34, 31, 31, 31, 34, 31, 31, 31, 35, 31, 31, 31, 35, 31, 31,
+        31, 35, 31, 31, 31, 35, 31, 32, 32, 36, 31, 32, 32, 36, 31, 32, 32, 36,
+        31, 32, 32, 36, 31, 32, 32, 36, 32, 33, 33, 37, 33, 35, 35, 39, 34, 36,
+        36, 40, 34, 36, 36, 40, 34, 36, 36, 40,
+        /* Size 16x4 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 34, 34, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 33, 35, 36, 36, 36, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 33, 35, 36, 36, 36, 34, 34, 35, 35, 35, 35,
+        36, 36, 36, 36, 36, 37, 39, 40, 40, 40,
+        /* Size 8x32 */
+        32, 31, 31, 31, 31, 31, 33, 35, 31, 31, 31, 31, 31, 31, 33, 35, 31, 31,
+        31, 31, 31, 31, 33, 36, 31, 31, 31, 31, 31, 31, 33, 36, 31, 31, 31, 31,
+        31, 31, 34, 36, 31, 31, 31, 31, 31, 31, 34, 37, 31, 31, 31, 31, 31, 31,
+        34, 37, 31, 31, 31, 31, 31, 31, 34, 37, 31, 31, 31, 31, 31, 31, 34, 37,
+        31, 31, 31, 31, 31, 31, 34, 37, 31, 31, 31, 31, 31, 31, 34, 37, 31, 31,
+        31, 31, 31, 31, 34, 37, 31, 31, 31, 32, 32, 32, 34, 37, 31, 31, 31, 32,
+        32, 32, 34, 37, 30, 31, 31, 32, 32, 32, 34, 38, 30, 31, 32, 32, 32, 32,
+        35, 38, 30, 31, 32, 32, 32, 32, 35, 38, 30, 31, 32, 32, 32, 32, 35, 38,
+        30, 31, 32, 32, 32, 32, 35, 38, 30, 31, 32, 32, 32, 32, 35, 38, 30, 31,
+        32, 32, 32, 32, 35, 38, 31, 31, 32, 33, 33, 33, 35, 38, 31, 32, 33, 33,
+        33, 33, 36, 39, 32, 33, 34, 34, 34, 34, 37, 40, 33, 34, 34, 35, 35, 35,
+        37, 40, 33, 34, 35, 36, 36, 36, 38, 41, 33, 34, 35, 36, 36, 36, 38, 41,
+        33, 34, 35, 36, 36, 36, 38, 41, 33, 34, 35, 36, 36, 36, 38, 41, 33, 34,
+        35, 36, 36, 36, 38, 41, 33, 34, 35, 36, 36, 36, 38, 41, 34, 35, 36, 36,
+        36, 36, 39, 42,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30,
+        30, 30, 30, 31, 31, 32, 33, 33, 33, 33, 33, 33, 33, 34, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 33, 34, 34, 34, 34, 34, 34, 34, 35, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35,
+        35, 35, 35, 35, 35, 36, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 35, 36, 36, 36, 36, 36,
+        36, 36, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 33, 33, 34, 35, 36, 36, 36, 36, 36, 36, 36, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 33, 33, 34, 35, 36, 36, 36, 36, 36, 36, 36, 33, 33, 33, 33, 34, 34,
+        34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 36, 37,
+        37, 38, 38, 38, 38, 38, 38, 39, 35, 35, 36, 36, 36, 37, 37, 37, 37, 37,
+        37, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 39, 40, 40, 41, 41, 41,
+        41, 41, 41, 42 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        31, 31, 31, 31, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32,
+        /* Size 8x8 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32,
+        32, 32, 31, 31, 32, 32, 32, 32, 32, 32,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 4x8 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32,
+        32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32,
+        /* Size 8x4 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32,
+        /* Size 8x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 31, 31, 31, 32,
+        32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32,
+        32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32,
+        31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32,
+        32, 32,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 4x16 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 31, 32,
+        32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32,
+        31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31, 32,
+        32, 32, 31, 32, 32, 32, 31, 32, 32, 32,
+        /* Size 16x4 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 8x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 31, 31, 31, 32, 32, 32, 32, 32, 31, 31, 31, 32, 32, 32, 32, 32,
+        31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32,
+        32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32,
+        31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32,
+        32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32,
+        31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31,
+        32, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 32, 32,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        /* Size 8x8 */
+        31, 31, 31, 31, 31, 31, 31, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 30, 31, 31, 31, 31, 31, 31, 31,
+        /* Size 16x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32,
+        /* Size 32x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30,
+        30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 32, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
+        /* Size 4x8 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 30, 31, 32, 32,
+        /* Size 8x4 */
+        31, 31, 31, 31, 31, 31, 31, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 32, 32, 31, 31, 31, 31, 31, 31, 32, 32,
+        /* Size 8x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 31, 31, 31, 31,
+        31, 32, 32, 32, 30, 31, 31, 31, 31, 32, 32, 32, 30, 31, 31, 31, 32, 32,
+        32, 32,
+        /* Size 16x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32,
+        /* Size 16x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        30, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 30, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 30, 30, 31, 31,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 30, 30, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 30, 30, 31, 31, 31, 31, 31, 31,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 32x16 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 4x16 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 31, 31,
+        32, 32, 31, 31, 32, 32, 30, 31, 32, 32,
+        /* Size 16x4 */
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 32, 32, 32, 32,
+        /* Size 8x32 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 31, 31, 31, 31, 31, 32,
+        32, 32, 31, 31, 31, 31, 31, 32, 32, 32, 31, 31, 31, 31, 31, 32, 32, 32,
+        30, 31, 31, 31, 31, 32, 32, 32, 30, 31, 31, 31, 31, 32, 32, 32, 30, 31,
+        31, 31, 32, 32, 32, 32, 30, 31, 31, 31, 32, 32, 32, 32, 30, 31, 31, 31,
+        32, 32, 32, 32,
+        /* Size 32x8 */
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32,
+        32, 32, 32, 32 },
+  },
+};
+
+static const qm_val_t wt_matrix_ref[NUM_QM_LEVELS - 1][2][QM_TOTAL_SIZE] = {
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 24, 14, 11, 24, 15, 11, 9, 14, 11, 7, 7, 11, 9, 7, 5,
+        /* Size 8x8 */
+        32, 32, 27, 20, 15, 12, 11, 9, 32, 29, 26, 21, 16, 13, 12, 10, 27, 26,
+        19, 16, 13, 11, 10, 10, 20, 21, 16, 12, 11, 9, 9, 8, 15, 16, 13, 11, 9,
+        8, 7, 7, 12, 13, 11, 9, 8, 7, 6, 6, 11, 12, 10, 9, 7, 6, 6, 5, 9, 10,
+        10, 8, 7, 6, 5, 5,
+        /* Size 16x16 */
+        32, 33, 33, 30, 28, 23, 21, 17, 16, 13, 12, 11, 11, 10, 9, 9, 33, 32,
+        32, 31, 30, 25, 23, 19, 17, 14, 14, 12, 11, 11, 10, 9, 33, 32, 31, 29,
+        28, 24, 23, 19, 17, 14, 14, 13, 12, 11, 10, 10, 30, 31, 29, 26, 24, 22,
+        20, 18, 16, 14, 13, 13, 12, 11, 11, 10, 28, 30, 28, 24, 21, 19, 18, 16,
+        15, 13, 13, 12, 11, 11, 10, 10, 23, 25, 24, 22, 19, 16, 15, 14, 13, 11,
+        11, 11, 10, 10, 9, 9, 21, 23, 23, 20, 18, 15, 14, 13, 12, 11, 10, 10, 9,
+        9, 9, 9, 17, 19, 19, 18, 16, 14, 13, 11, 10, 9, 9, 9, 9, 8, 8, 8, 16,
+        17, 17, 16, 15, 13, 12, 10, 10, 9, 8, 8, 8, 8, 8, 7, 13, 14, 14, 14, 13,
+        11, 11, 9, 9, 8, 7, 7, 7, 7, 7, 7, 12, 14, 14, 13, 13, 11, 10, 9, 8, 7,
+        7, 7, 7, 7, 6, 6, 11, 12, 13, 13, 12, 11, 10, 9, 8, 7, 7, 6, 6, 6, 6, 6,
+        11, 11, 12, 12, 11, 10, 9, 9, 8, 7, 7, 6, 6, 6, 5, 5, 10, 11, 11, 11,
+        11, 10, 9, 8, 8, 7, 7, 6, 6, 5, 5, 5, 9, 10, 10, 11, 10, 9, 9, 8, 8, 7,
+        6, 6, 5, 5, 5, 5, 9, 9, 10, 10, 10, 9, 9, 8, 7, 7, 6, 6, 5, 5, 5, 4,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 32, 30, 29, 28, 26, 23, 22, 21, 19, 17, 17, 16, 14,
+        13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 8, 33, 32, 32, 32, 32,
+        32, 30, 30, 29, 27, 24, 23, 22, 20, 18, 17, 17, 15, 13, 13, 13, 12, 12,
+        12, 11, 11, 10, 10, 10, 9, 9, 9, 33, 32, 32, 32, 32, 32, 31, 30, 30, 28,
+        25, 24, 23, 21, 19, 18, 17, 16, 14, 14, 14, 13, 12, 12, 11, 11, 11, 10,
+        10, 9, 9, 9, 33, 32, 32, 32, 31, 31, 30, 29, 29, 27, 25, 24, 23, 21, 19,
+        18, 17, 16, 14, 14, 14, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 33,
+        32, 32, 31, 31, 30, 29, 28, 28, 26, 24, 23, 23, 20, 19, 18, 17, 16, 14,
+        14, 14, 13, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9, 32, 32, 32, 31, 30,
+        29, 28, 28, 27, 26, 24, 23, 22, 21, 19, 19, 18, 16, 15, 15, 14, 13, 13,
+        12, 12, 12, 11, 11, 10, 10, 10, 9, 30, 30, 31, 30, 29, 28, 26, 25, 24,
+        23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11,
+        11, 11, 10, 10, 9, 29, 30, 30, 29, 28, 28, 25, 24, 23, 22, 20, 20, 19,
+        18, 17, 16, 16, 15, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10,
+        10, 28, 29, 30, 29, 28, 27, 24, 23, 21, 20, 19, 19, 18, 17, 16, 16, 15,
+        14, 13, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10, 26, 27, 28,
+        27, 26, 26, 23, 22, 20, 19, 18, 17, 17, 16, 15, 14, 14, 13, 12, 12, 12,
+        11, 11, 11, 11, 10, 10, 10, 10, 10, 9, 9, 23, 24, 25, 25, 24, 24, 22,
+        20, 19, 18, 16, 16, 15, 14, 14, 13, 13, 12, 11, 11, 11, 11, 11, 11, 10,
+        10, 10, 10, 9, 9, 9, 9, 22, 23, 24, 24, 23, 23, 21, 20, 19, 17, 16, 15,
+        15, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9,
+        8, 21, 22, 23, 23, 23, 22, 20, 19, 18, 17, 15, 15, 14, 13, 13, 12, 12,
+        11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 8, 19, 20, 21, 21, 20,
+        21, 19, 18, 17, 16, 14, 14, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 9,
+        9, 9, 9, 9, 9, 8, 8, 8, 17, 18, 19, 19, 19, 19, 18, 17, 16, 15, 14, 13,
+        13, 12, 11, 11, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 17,
+        17, 18, 18, 18, 19, 17, 16, 16, 14, 13, 13, 12, 12, 11, 10, 10, 10, 9,
+        9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 16, 17, 17, 17, 17, 18, 16, 16,
+        15, 14, 13, 12, 12, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+        7, 7, 7, 14, 15, 16, 16, 16, 16, 15, 15, 14, 13, 12, 12, 11, 11, 10, 10,
+        9, 9, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 13, 13, 14, 14, 14, 15,
+        14, 13, 13, 12, 11, 11, 11, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 13, 13, 14, 14, 14, 15, 14, 13, 13, 12, 11, 11, 11, 10,
+        9, 9, 9, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 12, 13, 14, 14,
+        14, 14, 13, 13, 13, 12, 11, 11, 10, 10, 9, 9, 8, 8, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 6, 6, 6, 6, 6, 12, 12, 13, 13, 13, 13, 13, 12, 12, 11, 11, 10, 10,
+        9, 9, 9, 8, 8, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 11, 12, 12, 12,
+        13, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6,
+        6, 6, 6, 6, 6, 6, 6, 11, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 10, 10,
+        9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 11, 11, 11, 12,
+        12, 12, 12, 12, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6,
+        6, 6, 5, 5, 5, 5, 5, 10, 11, 11, 11, 12, 12, 12, 11, 11, 10, 10, 10, 9,
+        9, 9, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 10, 10, 11, 11,
+        11, 11, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6,
+        5, 5, 5, 5, 5, 5, 10, 10, 10, 11, 11, 11, 11, 11, 10, 10, 10, 9, 9, 9,
+        8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 9, 10, 10, 10, 10,
+        10, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5,
+        5, 5, 5, 5, 5, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 8, 8, 8, 7,
+        7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 4, 9, 9, 9, 10, 10, 10, 10,
+        10, 10, 9, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5,
+        4, 4, 8, 9, 9, 9, 9, 9, 9, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6,
+        6, 6, 5, 5, 5, 5, 5, 5, 4, 4, 4,
+        /* Size 4x8 */
+        32, 24, 14, 11, 31, 24, 15, 12, 28, 18, 12, 11, 21, 14, 10, 9, 16, 12,
+        8, 8, 13, 11, 7, 7, 11, 10, 7, 6, 10, 9, 7, 5,
+        /* Size 8x4 */
+        32, 31, 28, 21, 16, 13, 11, 10, 24, 24, 18, 14, 12, 11, 10, 9, 14, 15,
+        12, 10, 8, 7, 7, 7, 11, 12, 11, 9, 8, 7, 6, 5,
+        /* Size 8x16 */
+        32, 32, 28, 19, 16, 12, 11, 10, 33, 31, 30, 21, 17, 13, 12, 11, 32, 30,
+        28, 20, 17, 13, 12, 12, 30, 28, 24, 19, 16, 13, 13, 12, 28, 27, 21, 17,
+        15, 12, 12, 11, 23, 24, 19, 14, 13, 11, 11, 11, 21, 22, 18, 13, 12, 10,
+        10, 10, 18, 19, 16, 12, 10, 9, 9, 9, 16, 18, 15, 11, 10, 8, 8, 8, 13,
+        15, 13, 10, 9, 7, 8, 8, 12, 14, 13, 10, 8, 7, 7, 7, 11, 13, 12, 10, 8,
+        7, 6, 6, 11, 12, 11, 10, 8, 7, 6, 6, 10, 11, 10, 9, 8, 7, 6, 6, 9, 10,
+        10, 9, 7, 6, 6, 5, 9, 10, 10, 9, 8, 7, 6, 5,
+        /* Size 16x8 */
+        32, 33, 32, 30, 28, 23, 21, 18, 16, 13, 12, 11, 11, 10, 9, 9, 32, 31,
+        30, 28, 27, 24, 22, 19, 18, 15, 14, 13, 12, 11, 10, 10, 28, 30, 28, 24,
+        21, 19, 18, 16, 15, 13, 13, 12, 11, 10, 10, 10, 19, 21, 20, 19, 17, 14,
+        13, 12, 11, 10, 10, 10, 10, 9, 9, 9, 16, 17, 17, 16, 15, 13, 12, 10, 10,
+        9, 8, 8, 8, 8, 7, 8, 12, 13, 13, 13, 12, 11, 10, 9, 8, 7, 7, 7, 7, 7, 6,
+        7, 11, 12, 12, 13, 12, 11, 10, 9, 8, 8, 7, 6, 6, 6, 6, 6, 10, 11, 12,
+        12, 11, 11, 10, 9, 8, 8, 7, 6, 6, 6, 5, 5,
+        /* Size 16x32 */
+        32, 33, 32, 30, 28, 23, 19, 17, 16, 13, 12, 11, 11, 11, 10, 10, 33, 32,
+        32, 30, 29, 24, 20, 18, 17, 14, 12, 12, 12, 11, 11, 11, 33, 32, 31, 31,
+        30, 25, 21, 19, 17, 14, 13, 12, 12, 11, 11, 11, 33, 32, 31, 30, 29, 25,
+        21, 19, 17, 14, 13, 13, 12, 12, 11, 11, 32, 32, 30, 29, 28, 24, 20, 19,
+        17, 14, 13, 13, 12, 12, 12, 11, 32, 31, 29, 28, 27, 24, 21, 19, 18, 15,
+        14, 13, 12, 12, 12, 11, 30, 30, 28, 26, 24, 21, 19, 18, 16, 14, 13, 13,
+        13, 12, 12, 11, 29, 30, 28, 25, 23, 20, 18, 17, 16, 13, 12, 12, 12, 12,
+        12, 11, 28, 30, 27, 24, 21, 19, 17, 16, 15, 13, 12, 12, 12, 12, 11, 11,
+        26, 28, 26, 23, 20, 18, 16, 15, 14, 12, 12, 12, 11, 11, 11, 11, 23, 25,
+        24, 21, 19, 16, 14, 14, 13, 11, 11, 11, 11, 11, 11, 11, 22, 24, 23, 21,
+        19, 16, 14, 13, 12, 11, 10, 10, 10, 10, 10, 10, 21, 23, 22, 20, 18, 15,
+        13, 13, 12, 11, 10, 10, 10, 10, 10, 10, 19, 21, 20, 19, 17, 14, 12, 12,
+        11, 10, 9, 10, 10, 9, 10, 9, 18, 19, 19, 18, 16, 14, 12, 11, 10, 9, 9,
+        9, 9, 9, 9, 9, 17, 18, 18, 17, 16, 13, 12, 11, 10, 9, 9, 9, 9, 9, 9, 9,
+        16, 17, 18, 16, 15, 13, 11, 10, 10, 9, 8, 8, 8, 8, 8, 8, 14, 16, 16, 15,
+        14, 12, 11, 10, 9, 8, 8, 8, 8, 8, 8, 8, 13, 14, 15, 14, 13, 11, 10, 9,
+        9, 8, 7, 8, 8, 8, 8, 8, 13, 14, 14, 14, 13, 11, 10, 9, 9, 8, 7, 7, 7, 7,
+        7, 7, 12, 14, 14, 13, 13, 11, 10, 9, 8, 8, 7, 7, 7, 7, 7, 7, 12, 13, 13,
+        13, 12, 11, 9, 9, 8, 7, 7, 7, 7, 7, 7, 7, 11, 12, 13, 13, 12, 10, 10, 9,
+        8, 7, 7, 7, 6, 6, 6, 7, 11, 12, 12, 12, 11, 10, 10, 9, 8, 7, 7, 6, 6, 6,
+        6, 6, 11, 12, 12, 12, 11, 10, 10, 8, 8, 7, 7, 6, 6, 6, 6, 6, 10, 11, 12,
+        12, 11, 10, 9, 8, 8, 7, 7, 6, 6, 6, 6, 6, 10, 11, 11, 11, 10, 10, 9, 9,
+        8, 7, 7, 6, 6, 6, 6, 6, 10, 11, 11, 11, 10, 10, 9, 9, 8, 7, 7, 6, 6, 5,
+        5, 5, 9, 10, 10, 11, 10, 9, 9, 8, 7, 7, 6, 6, 6, 5, 5, 5, 9, 10, 10, 10,
+        10, 9, 9, 8, 7, 7, 6, 6, 6, 5, 5, 5, 9, 9, 10, 10, 10, 9, 9, 8, 8, 7, 7,
+        6, 6, 5, 5, 5, 8, 9, 9, 10, 10, 9, 9, 8, 8, 7, 7, 6, 6, 5, 5, 5,
+        /* Size 32x16 */
+        32, 33, 33, 33, 32, 32, 30, 29, 28, 26, 23, 22, 21, 19, 18, 17, 16, 14,
+        13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 8, 33, 32, 32, 32, 32,
+        31, 30, 30, 30, 28, 25, 24, 23, 21, 19, 18, 17, 16, 14, 14, 14, 13, 12,
+        12, 12, 11, 11, 11, 10, 10, 9, 9, 32, 32, 31, 31, 30, 29, 28, 28, 27,
+        26, 24, 23, 22, 20, 19, 18, 18, 16, 15, 14, 14, 13, 13, 12, 12, 12, 11,
+        11, 10, 10, 10, 9, 30, 30, 31, 30, 29, 28, 26, 25, 24, 23, 21, 21, 20,
+        19, 18, 17, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10,
+        10, 28, 29, 30, 29, 28, 27, 24, 23, 21, 20, 19, 19, 18, 17, 16, 16, 15,
+        14, 13, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 23, 24, 25,
+        25, 24, 24, 21, 20, 19, 18, 16, 16, 15, 14, 14, 13, 13, 12, 11, 11, 11,
+        11, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 19, 20, 21, 21, 20, 21, 19, 18,
+        17, 16, 14, 14, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9, 10, 10, 10, 9, 9,
+        9, 9, 9, 9, 9, 17, 18, 19, 19, 19, 19, 18, 17, 16, 15, 14, 13, 13, 12,
+        11, 11, 10, 10, 9, 9, 9, 9, 9, 9, 8, 8, 9, 9, 8, 8, 8, 8, 16, 17, 17,
+        17, 17, 18, 16, 16, 15, 14, 13, 12, 12, 11, 10, 10, 10, 9, 9, 9, 8, 8,
+        8, 8, 8, 8, 8, 8, 7, 7, 8, 8, 13, 14, 14, 14, 14, 15, 14, 13, 13, 12,
+        11, 11, 11, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+        12, 12, 13, 13, 13, 14, 13, 12, 12, 12, 11, 10, 10, 9, 9, 9, 8, 8, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 7, 7, 11, 12, 12, 13, 13, 13, 13, 12, 12,
+        12, 11, 10, 10, 10, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6,
+        6, 11, 12, 12, 12, 12, 12, 13, 12, 12, 11, 11, 10, 10, 10, 9, 9, 8, 8,
+        8, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 11, 11, 11, 12, 12, 12, 12,
+        12, 12, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 5, 5,
+        5, 5, 5, 10, 11, 11, 11, 12, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9,
+        8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 10, 11, 11, 11, 11, 11,
+        11, 11, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 5,
+        5, 5, 5, 5,
+        /* Size 4x16 */
+        33, 23, 13, 11, 32, 25, 14, 11, 32, 24, 14, 12, 30, 21, 14, 12, 30, 19,
+        13, 12, 25, 16, 11, 11, 23, 15, 11, 10, 19, 14, 9, 9, 17, 13, 9, 8, 14,
+        11, 8, 8, 14, 11, 8, 7, 12, 10, 7, 6, 12, 10, 7, 6, 11, 10, 7, 6, 10, 9,
+        7, 5, 9, 9, 7, 5,
+        /* Size 16x4 */
+        33, 32, 32, 30, 30, 25, 23, 19, 17, 14, 14, 12, 12, 11, 10, 9, 23, 25,
+        24, 21, 19, 16, 15, 14, 13, 11, 11, 10, 10, 10, 9, 9, 13, 14, 14, 14,
+        13, 11, 11, 9, 9, 8, 8, 7, 7, 7, 7, 7, 11, 11, 12, 12, 12, 11, 10, 9, 8,
+        8, 7, 6, 6, 6, 5, 5,
+        /* Size 8x32 */
+        32, 32, 28, 19, 16, 12, 11, 10, 33, 32, 29, 20, 17, 12, 12, 11, 33, 31,
+        30, 21, 17, 13, 12, 11, 33, 31, 29, 21, 17, 13, 12, 11, 32, 30, 28, 20,
+        17, 13, 12, 12, 32, 29, 27, 21, 18, 14, 12, 12, 30, 28, 24, 19, 16, 13,
+        13, 12, 29, 28, 23, 18, 16, 12, 12, 12, 28, 27, 21, 17, 15, 12, 12, 11,
+        26, 26, 20, 16, 14, 12, 11, 11, 23, 24, 19, 14, 13, 11, 11, 11, 22, 23,
+        19, 14, 12, 10, 10, 10, 21, 22, 18, 13, 12, 10, 10, 10, 19, 20, 17, 12,
+        11, 9, 10, 10, 18, 19, 16, 12, 10, 9, 9, 9, 17, 18, 16, 12, 10, 9, 9, 9,
+        16, 18, 15, 11, 10, 8, 8, 8, 14, 16, 14, 11, 9, 8, 8, 8, 13, 15, 13, 10,
+        9, 7, 8, 8, 13, 14, 13, 10, 9, 7, 7, 7, 12, 14, 13, 10, 8, 7, 7, 7, 12,
+        13, 12, 9, 8, 7, 7, 7, 11, 13, 12, 10, 8, 7, 6, 6, 11, 12, 11, 10, 8, 7,
+        6, 6, 11, 12, 11, 10, 8, 7, 6, 6, 10, 12, 11, 9, 8, 7, 6, 6, 10, 11, 10,
+        9, 8, 7, 6, 6, 10, 11, 10, 9, 8, 7, 6, 5, 9, 10, 10, 9, 7, 6, 6, 5, 9,
+        10, 10, 9, 7, 6, 6, 5, 9, 10, 10, 9, 8, 7, 6, 5, 8, 9, 10, 9, 8, 7, 6,
+        5,
+        /* Size 32x8 */
+        32, 33, 33, 33, 32, 32, 30, 29, 28, 26, 23, 22, 21, 19, 18, 17, 16, 14,
+        13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 8, 32, 32, 31, 31, 30,
+        29, 28, 28, 27, 26, 24, 23, 22, 20, 19, 18, 18, 16, 15, 14, 14, 13, 13,
+        12, 12, 12, 11, 11, 10, 10, 10, 9, 28, 29, 30, 29, 28, 27, 24, 23, 21,
+        20, 19, 19, 18, 17, 16, 16, 15, 14, 13, 13, 13, 12, 12, 11, 11, 11, 10,
+        10, 10, 10, 10, 10, 19, 20, 21, 21, 20, 21, 19, 18, 17, 16, 14, 14, 13,
+        12, 12, 12, 11, 11, 10, 10, 10, 9, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 16,
+        17, 17, 17, 17, 18, 16, 16, 15, 14, 13, 12, 12, 11, 10, 10, 10, 9, 9, 9,
+        8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 8, 8, 12, 12, 13, 13, 13, 14, 13, 12, 12,
+        12, 11, 10, 10, 9, 9, 9, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 7, 7,
+        11, 12, 12, 12, 12, 12, 13, 12, 12, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8,
+        7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 10, 11, 11, 11, 12, 12, 12, 12,
+        11, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 5, 5, 5,
+        5, 5 },
+      { /* Chroma */
+        /* Size 4x4 */
+        29, 22, 18, 16, 22, 17, 15, 14, 18, 15, 11, 11, 16, 14, 11, 9,
+        /* Size 8x8 */
+        33, 27, 22, 20, 18, 16, 15, 14, 27, 22, 22, 22, 20, 18, 17, 15, 22, 22,
+        19, 18, 17, 16, 15, 15, 20, 22, 18, 16, 14, 13, 14, 14, 18, 20, 17, 14,
+        12, 12, 12, 12, 16, 18, 16, 13, 12, 11, 11, 11, 15, 17, 15, 14, 12, 11,
+        10, 10, 14, 15, 15, 14, 12, 11, 10, 9,
+        /* Size 16x16 */
+        32, 34, 31, 25, 21, 21, 20, 19, 18, 16, 16, 15, 15, 14, 14, 13, 34, 32,
+        29, 24, 22, 23, 22, 21, 20, 18, 18, 17, 16, 15, 15, 14, 31, 29, 26, 23,
+        22, 23, 22, 21, 20, 18, 18, 17, 17, 16, 16, 15, 25, 24, 23, 21, 20, 21,
+        20, 20, 19, 18, 18, 17, 17, 17, 16, 15, 21, 22, 22, 20, 19, 19, 19, 19,
+        18, 17, 17, 16, 16, 16, 16, 16, 21, 23, 23, 21, 19, 18, 17, 17, 16, 15,
+        15, 15, 15, 15, 15, 15, 20, 22, 22, 20, 19, 17, 17, 16, 15, 14, 14, 14,
+        14, 14, 14, 14, 19, 21, 21, 20, 19, 17, 16, 14, 14, 13, 13, 13, 13, 13,
+        13, 13, 18, 20, 20, 19, 18, 16, 15, 14, 13, 12, 12, 12, 12, 12, 12, 12,
+        16, 18, 18, 18, 17, 15, 14, 13, 12, 12, 11, 11, 12, 12, 12, 12, 16, 18,
+        18, 18, 17, 15, 14, 13, 12, 11, 11, 11, 11, 11, 11, 11, 15, 17, 17, 17,
+        16, 15, 14, 13, 12, 11, 11, 10, 10, 10, 10, 10, 15, 16, 17, 17, 16, 15,
+        14, 13, 12, 12, 11, 10, 10, 10, 10, 10, 14, 15, 16, 17, 16, 15, 14, 13,
+        12, 12, 11, 10, 10, 10, 9, 9, 14, 15, 16, 16, 16, 15, 14, 13, 12, 12,
+        11, 10, 10, 9, 9, 9, 13, 14, 15, 15, 16, 15, 14, 13, 12, 12, 11, 10, 10,
+        9, 9, 9,
+        /* Size 32x32 */
+        32, 33, 34, 32, 31, 28, 25, 23, 21, 21, 21, 20, 20, 20, 19, 18, 18, 17,
+        16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 33, 33, 33, 31,
+        30, 27, 24, 23, 22, 22, 22, 22, 21, 20, 20, 19, 19, 18, 17, 17, 17, 16,
+        16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 34, 33, 32, 31, 29, 26, 24, 23,
+        22, 23, 23, 23, 22, 22, 21, 20, 20, 19, 18, 18, 18, 17, 17, 16, 16, 16,
+        15, 15, 15, 14, 14, 14, 32, 31, 31, 29, 28, 25, 24, 23, 22, 22, 23, 22,
+        22, 22, 21, 20, 20, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16, 15, 15,
+        15, 15, 31, 30, 29, 28, 26, 24, 23, 22, 22, 22, 23, 22, 22, 22, 21, 20,
+        20, 19, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 28, 27,
+        26, 25, 24, 22, 22, 22, 21, 22, 23, 22, 22, 22, 21, 21, 20, 20, 19, 19,
+        19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 15, 25, 24, 24, 24, 23, 22,
+        21, 21, 20, 21, 21, 21, 20, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17,
+        17, 17, 17, 16, 16, 16, 15, 15, 23, 23, 23, 23, 22, 22, 21, 20, 20, 20,
+        20, 20, 20, 20, 19, 19, 19, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16,
+        16, 16, 16, 16, 21, 22, 22, 22, 22, 21, 20, 20, 19, 19, 19, 19, 19, 19,
+        19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+        21, 22, 23, 22, 22, 22, 21, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
+        16, 16, 16, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 15, 21, 22, 23, 23,
+        23, 23, 21, 20, 19, 19, 18, 17, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15,
+        15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 20, 22, 23, 22, 22, 22, 21, 20,
+        19, 18, 17, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15, 15, 14, 14, 15, 15,
+        14, 14, 14, 14, 14, 14, 20, 21, 22, 22, 22, 22, 20, 20, 19, 18, 17, 17,
+        17, 16, 16, 16, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+        14, 14, 20, 20, 22, 22, 22, 22, 20, 20, 19, 18, 17, 17, 16, 16, 15, 15,
+        15, 14, 14, 14, 14, 13, 14, 14, 13, 14, 14, 13, 14, 14, 13, 13, 19, 20,
+        21, 21, 21, 21, 20, 19, 19, 18, 17, 16, 16, 15, 14, 14, 14, 14, 13, 13,
+        13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 18, 19, 20, 20, 20, 21,
+        20, 19, 18, 17, 16, 16, 16, 15, 14, 14, 14, 13, 13, 13, 13, 13, 12, 13,
+        13, 13, 13, 13, 13, 13, 13, 12, 18, 19, 20, 20, 20, 20, 19, 19, 18, 17,
+        16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+        12, 12, 12, 12, 17, 18, 19, 19, 19, 20, 19, 18, 18, 17, 16, 15, 15, 14,
+        14, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+        16, 17, 18, 18, 18, 19, 18, 17, 17, 16, 15, 15, 14, 14, 13, 13, 12, 12,
+        12, 12, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, 17, 18, 18,
+        18, 19, 18, 17, 17, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16, 17, 18, 18, 18, 19, 18, 17,
+        17, 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11,
+        11, 11, 11, 11, 11, 11, 15, 16, 17, 17, 17, 18, 17, 17, 16, 16, 15, 15,
+        14, 13, 13, 13, 12, 12, 11, 11, 11, 11, 11, 11, 10, 11, 11, 11, 11, 11,
+        11, 11, 15, 16, 17, 17, 17, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 12,
+        12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 15, 16,
+        16, 17, 17, 17, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 11,
+        11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 15, 16, 16, 16, 17, 17,
+        17, 16, 16, 16, 15, 15, 14, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10, 10,
+        10, 10, 10, 10, 10, 10, 10, 10, 14, 15, 16, 16, 16, 17, 17, 16, 16, 15,
+        15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10,
+        10, 10, 10, 10, 14, 15, 15, 16, 16, 16, 17, 16, 16, 15, 15, 14, 14, 14,
+        13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 9, 9, 9, 10, 14,
+        15, 15, 16, 16, 16, 16, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12,
+        11, 11, 11, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 14, 15, 15, 15, 16, 16,
+        16, 16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10,
+        10, 10, 9, 9, 9, 9, 9, 9, 14, 14, 14, 15, 15, 15, 16, 16, 16, 15, 15,
+        14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9,
+        9, 9, 13, 14, 14, 15, 15, 15, 15, 16, 16, 15, 15, 14, 14, 13, 13, 13,
+        12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 13, 14, 14,
+        15, 15, 15, 15, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11,
+        11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9,
+        /* Size 4x8 */
+        33, 22, 17, 16, 26, 23, 19, 17, 22, 18, 16, 16, 21, 17, 14, 14, 19, 16,
+        12, 12, 17, 15, 11, 11, 16, 15, 11, 10, 15, 14, 12, 10,
+        /* Size 8x4 */
+        33, 26, 22, 21, 19, 17, 16, 15, 22, 23, 18, 17, 16, 15, 15, 14, 17, 19,
+        16, 14, 12, 11, 11, 12, 16, 17, 16, 14, 12, 11, 10, 10,
+        /* Size 8x16 */
+        32, 28, 21, 20, 18, 16, 15, 14, 34, 26, 22, 21, 20, 17, 16, 16, 31, 24,
+        22, 22, 20, 17, 17, 16, 24, 22, 20, 20, 19, 17, 17, 17, 21, 21, 19, 19,
+        18, 17, 17, 17, 21, 22, 19, 17, 16, 15, 16, 16, 20, 22, 19, 16, 15, 14,
+        14, 15, 19, 21, 19, 15, 14, 13, 13, 14, 18, 20, 18, 15, 13, 12, 13, 13,
+        16, 19, 17, 14, 12, 11, 12, 12, 16, 18, 17, 14, 12, 11, 11, 12, 15, 17,
+        16, 14, 12, 11, 10, 11, 15, 17, 16, 14, 12, 11, 10, 10, 14, 16, 16, 14,
+        12, 11, 10, 10, 14, 15, 16, 14, 12, 11, 10, 10, 13, 15, 15, 14, 12, 11,
+        10, 9,
+        /* Size 16x8 */
+        32, 34, 31, 24, 21, 21, 20, 19, 18, 16, 16, 15, 15, 14, 14, 13, 28, 26,
+        24, 22, 21, 22, 22, 21, 20, 19, 18, 17, 17, 16, 15, 15, 21, 22, 22, 20,
+        19, 19, 19, 19, 18, 17, 17, 16, 16, 16, 16, 15, 20, 21, 22, 20, 19, 17,
+        16, 15, 15, 14, 14, 14, 14, 14, 14, 14, 18, 20, 20, 19, 18, 16, 15, 14,
+        13, 12, 12, 12, 12, 12, 12, 12, 16, 17, 17, 17, 17, 15, 14, 13, 12, 11,
+        11, 11, 11, 11, 11, 11, 15, 16, 17, 17, 17, 16, 14, 13, 13, 12, 11, 10,
+        10, 10, 10, 10, 14, 16, 16, 17, 17, 16, 15, 14, 13, 12, 12, 11, 10, 10,
+        10, 9,
+        /* Size 16x32 */
+        32, 33, 28, 24, 21, 21, 20, 19, 18, 16, 16, 15, 15, 15, 14, 14, 33, 33,
+        27, 24, 22, 22, 20, 20, 19, 17, 16, 16, 16, 16, 15, 15, 34, 32, 26, 24,
+        22, 23, 21, 20, 20, 18, 17, 17, 16, 16, 16, 15, 32, 30, 25, 23, 22, 23,
+        21, 21, 20, 18, 17, 17, 17, 16, 16, 16, 31, 28, 24, 23, 22, 22, 22, 21,
+        20, 18, 17, 17, 17, 17, 16, 16, 28, 26, 22, 22, 22, 23, 22, 21, 20, 19,
+        18, 18, 17, 17, 17, 16, 24, 24, 22, 21, 20, 21, 20, 20, 19, 18, 17, 18,
+        17, 17, 17, 16, 23, 23, 22, 21, 20, 20, 20, 19, 19, 17, 17, 17, 17, 17,
+        17, 17, 21, 22, 21, 20, 19, 19, 19, 19, 18, 17, 17, 16, 17, 16, 17, 17,
+        21, 22, 22, 20, 19, 18, 18, 17, 17, 16, 16, 16, 16, 16, 16, 16, 21, 23,
+        22, 21, 19, 18, 17, 17, 16, 15, 15, 15, 16, 16, 16, 16, 21, 22, 22, 21,
+        19, 17, 17, 16, 16, 15, 14, 15, 15, 15, 15, 15, 20, 22, 22, 20, 19, 17,
+        16, 16, 15, 14, 14, 14, 14, 15, 15, 15, 20, 21, 22, 20, 19, 17, 16, 15,
+        14, 14, 13, 14, 14, 14, 14, 14, 19, 20, 21, 20, 19, 17, 15, 14, 14, 13,
+        13, 13, 13, 14, 14, 14, 19, 20, 21, 20, 18, 16, 15, 14, 14, 13, 12, 13,
+        13, 13, 13, 13, 18, 20, 20, 19, 18, 16, 15, 14, 13, 12, 12, 12, 13, 13,
+        13, 13, 17, 19, 20, 19, 18, 16, 14, 14, 13, 12, 12, 12, 12, 12, 13, 13,
+        16, 18, 19, 18, 17, 15, 14, 13, 12, 12, 11, 12, 12, 12, 12, 13, 16, 18,
+        19, 18, 17, 15, 14, 13, 12, 12, 11, 11, 12, 12, 12, 12, 16, 17, 18, 18,
+        17, 15, 14, 13, 12, 11, 11, 11, 11, 11, 12, 12, 15, 17, 18, 17, 16, 15,
+        13, 13, 12, 11, 11, 11, 11, 11, 11, 11, 15, 17, 17, 17, 16, 14, 14, 13,
+        12, 11, 11, 11, 10, 11, 11, 11, 15, 17, 17, 17, 16, 15, 14, 13, 12, 12,
+        11, 10, 10, 10, 11, 11, 15, 16, 17, 17, 16, 15, 14, 13, 12, 12, 11, 11,
+        10, 10, 10, 11, 14, 16, 16, 17, 15, 15, 14, 13, 12, 11, 11, 10, 10, 10,
+        10, 10, 14, 16, 16, 17, 16, 15, 14, 13, 12, 12, 11, 10, 10, 10, 10, 10,
+        14, 16, 16, 16, 16, 15, 14, 13, 12, 12, 11, 10, 10, 10, 10, 10, 14, 15,
+        15, 16, 16, 15, 14, 13, 12, 12, 11, 11, 10, 10, 10, 10, 14, 15, 15, 16,
+        16, 14, 14, 13, 12, 12, 11, 11, 10, 10, 9, 9, 13, 15, 15, 16, 15, 14,
+        14, 13, 12, 12, 11, 11, 10, 10, 9, 9, 13, 15, 15, 15, 15, 14, 14, 13,
+        13, 11, 11, 10, 10, 9, 9, 9,
+        /* Size 32x16 */
+        32, 33, 34, 32, 31, 28, 24, 23, 21, 21, 21, 21, 20, 20, 19, 19, 18, 17,
+        16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 33, 33, 32, 30,
+        28, 26, 24, 23, 22, 22, 23, 22, 22, 21, 20, 20, 20, 19, 18, 18, 17, 17,
+        17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 28, 27, 26, 25, 24, 22, 22, 22,
+        21, 22, 22, 22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16,
+        16, 16, 15, 15, 15, 15, 24, 24, 24, 23, 23, 22, 21, 21, 20, 20, 21, 21,
+        20, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16,
+        16, 15, 21, 22, 22, 22, 22, 22, 20, 20, 19, 19, 19, 19, 19, 19, 19, 18,
+        18, 18, 17, 17, 17, 16, 16, 16, 16, 15, 16, 16, 16, 16, 15, 15, 21, 22,
+        23, 23, 22, 23, 21, 20, 19, 18, 18, 17, 17, 17, 17, 16, 16, 16, 15, 15,
+        15, 15, 14, 15, 15, 15, 15, 15, 15, 14, 14, 14, 20, 20, 21, 21, 22, 22,
+        20, 20, 19, 18, 17, 17, 16, 16, 15, 15, 15, 14, 14, 14, 14, 13, 14, 14,
+        14, 14, 14, 14, 14, 14, 14, 14, 19, 20, 20, 21, 21, 21, 20, 19, 19, 17,
+        17, 16, 16, 15, 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+        13, 13, 13, 13, 18, 19, 20, 20, 20, 20, 19, 19, 18, 17, 16, 16, 15, 14,
+        14, 14, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13,
+        16, 17, 18, 18, 18, 19, 18, 17, 17, 16, 15, 15, 14, 14, 13, 13, 12, 12,
+        12, 12, 11, 11, 11, 12, 12, 11, 12, 12, 12, 12, 12, 11, 16, 16, 17, 17,
+        17, 18, 17, 17, 17, 16, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 15, 16, 17, 17, 17, 18, 18, 17,
+        16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 10, 11, 10,
+        10, 10, 11, 11, 11, 10, 15, 16, 16, 17, 17, 17, 17, 17, 17, 16, 16, 15,
+        14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10,
+        10, 10, 15, 16, 16, 16, 17, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 13,
+        13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 9, 14, 15,
+        16, 16, 16, 17, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12,
+        12, 11, 11, 11, 10, 10, 10, 10, 10, 9, 9, 9, 14, 15, 15, 16, 16, 16, 16,
+        17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 11, 11, 11, 11,
+        10, 10, 10, 10, 9, 9, 9,
+        /* Size 4x16 */
+        33, 21, 16, 15, 32, 23, 18, 16, 28, 22, 18, 17, 24, 21, 18, 17, 22, 19,
+        17, 16, 23, 18, 15, 16, 22, 17, 14, 15, 20, 17, 13, 14, 20, 16, 12, 13,
+        18, 15, 12, 12, 17, 15, 11, 11, 17, 14, 11, 11, 16, 15, 12, 10, 16, 15,
+        12, 10, 15, 15, 12, 10, 15, 14, 12, 10,
+        /* Size 16x4 */
+        33, 32, 28, 24, 22, 23, 22, 20, 20, 18, 17, 17, 16, 16, 15, 15, 21, 23,
+        22, 21, 19, 18, 17, 17, 16, 15, 15, 14, 15, 15, 15, 14, 16, 18, 18, 18,
+        17, 15, 14, 13, 12, 12, 11, 11, 12, 12, 12, 12, 15, 16, 17, 17, 16, 16,
+        15, 14, 13, 12, 11, 11, 10, 10, 10, 10,
+        /* Size 8x32 */
+        32, 28, 21, 20, 18, 16, 15, 14, 33, 27, 22, 20, 19, 16, 16, 15, 34, 26,
+        22, 21, 20, 17, 16, 16, 32, 25, 22, 21, 20, 17, 17, 16, 31, 24, 22, 22,
+        20, 17, 17, 16, 28, 22, 22, 22, 20, 18, 17, 17, 24, 22, 20, 20, 19, 17,
+        17, 17, 23, 22, 20, 20, 19, 17, 17, 17, 21, 21, 19, 19, 18, 17, 17, 17,
+        21, 22, 19, 18, 17, 16, 16, 16, 21, 22, 19, 17, 16, 15, 16, 16, 21, 22,
+        19, 17, 16, 14, 15, 15, 20, 22, 19, 16, 15, 14, 14, 15, 20, 22, 19, 16,
+        14, 13, 14, 14, 19, 21, 19, 15, 14, 13, 13, 14, 19, 21, 18, 15, 14, 12,
+        13, 13, 18, 20, 18, 15, 13, 12, 13, 13, 17, 20, 18, 14, 13, 12, 12, 13,
+        16, 19, 17, 14, 12, 11, 12, 12, 16, 19, 17, 14, 12, 11, 12, 12, 16, 18,
+        17, 14, 12, 11, 11, 12, 15, 18, 16, 13, 12, 11, 11, 11, 15, 17, 16, 14,
+        12, 11, 10, 11, 15, 17, 16, 14, 12, 11, 10, 11, 15, 17, 16, 14, 12, 11,
+        10, 10, 14, 16, 15, 14, 12, 11, 10, 10, 14, 16, 16, 14, 12, 11, 10, 10,
+        14, 16, 16, 14, 12, 11, 10, 10, 14, 15, 16, 14, 12, 11, 10, 10, 14, 15,
+        16, 14, 12, 11, 10, 9, 13, 15, 15, 14, 12, 11, 10, 9, 13, 15, 15, 14,
+        13, 11, 10, 9,
+        /* Size 32x8 */
+        32, 33, 34, 32, 31, 28, 24, 23, 21, 21, 21, 21, 20, 20, 19, 19, 18, 17,
+        16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 28, 27, 26, 25,
+        24, 22, 22, 22, 21, 22, 22, 22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18,
+        17, 17, 17, 16, 16, 16, 15, 15, 15, 15, 21, 22, 22, 22, 22, 22, 20, 20,
+        19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16, 15,
+        16, 16, 16, 16, 15, 15, 20, 20, 21, 21, 22, 22, 20, 20, 19, 18, 17, 17,
+        16, 16, 15, 15, 15, 14, 14, 14, 14, 13, 14, 14, 14, 14, 14, 14, 14, 14,
+        14, 14, 18, 19, 20, 20, 20, 20, 19, 19, 18, 17, 16, 16, 15, 14, 14, 14,
+        13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 16, 16,
+        17, 17, 17, 18, 17, 17, 17, 16, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17,
+        17, 17, 17, 16, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10,
+        10, 10, 10, 10, 10, 10, 10, 10, 14, 15, 16, 16, 16, 17, 17, 17, 17, 16,
+        16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10,
+        10, 9, 9, 9 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 25, 15, 11, 25, 16, 12, 10, 15, 12, 8, 7, 11, 10, 7, 6,
+        /* Size 8x8 */
+        32, 32, 28, 22, 17, 13, 11, 10, 32, 29, 26, 22, 18, 14, 12, 11, 28, 26,
+        20, 17, 14, 12, 11, 10, 22, 22, 17, 14, 12, 10, 10, 9, 17, 18, 14, 12,
+        10, 8, 8, 8, 13, 14, 12, 10, 8, 7, 7, 7, 11, 12, 11, 10, 8, 7, 6, 6, 10,
+        11, 10, 9, 8, 7, 6, 5,
+        /* Size 16x16 */
+        32, 33, 33, 32, 28, 26, 22, 19, 17, 14, 13, 12, 11, 10, 10, 9, 33, 32,
+        32, 31, 30, 28, 23, 20, 18, 16, 14, 13, 12, 11, 10, 10, 33, 32, 31, 30,
+        28, 26, 23, 20, 18, 16, 14, 13, 12, 12, 11, 10, 32, 31, 30, 28, 26, 24,
+        22, 20, 18, 16, 14, 13, 13, 12, 11, 10, 28, 30, 28, 26, 21, 20, 18, 17,
+        16, 14, 13, 12, 12, 11, 11, 10, 26, 28, 26, 24, 20, 19, 17, 16, 15, 13,
+        12, 12, 11, 11, 10, 10, 22, 23, 23, 22, 18, 17, 15, 14, 13, 12, 11, 10,
+        10, 10, 9, 9, 19, 20, 20, 20, 17, 16, 14, 12, 12, 11, 10, 9, 9, 9, 9, 8,
+        17, 18, 18, 18, 16, 15, 13, 12, 11, 10, 9, 9, 8, 8, 8, 8, 14, 16, 16,
+        16, 14, 13, 12, 11, 10, 9, 8, 8, 8, 8, 8, 7, 13, 14, 14, 14, 13, 12, 11,
+        10, 9, 8, 8, 7, 7, 7, 7, 7, 12, 13, 13, 13, 12, 12, 10, 9, 9, 8, 7, 7,
+        7, 7, 6, 6, 11, 12, 12, 13, 12, 11, 10, 9, 8, 8, 7, 7, 6, 6, 6, 6, 10,
+        11, 12, 12, 11, 11, 10, 9, 8, 8, 7, 7, 6, 6, 6, 5, 10, 10, 11, 11, 11,
+        10, 9, 9, 8, 8, 7, 6, 6, 6, 5, 5, 9, 10, 10, 10, 10, 10, 9, 8, 8, 7, 7,
+        6, 6, 5, 5, 5,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 32, 32, 30, 28, 27, 26, 23, 22, 21, 19, 17, 17, 16,
+        14, 13, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 9, 33, 32, 32, 32, 32,
+        32, 31, 30, 29, 28, 27, 24, 23, 22, 20, 18, 18, 17, 15, 14, 13, 13, 12,
+        12, 12, 11, 11, 11, 10, 10, 10, 9, 33, 32, 32, 32, 32, 32, 31, 31, 30,
+        28, 28, 25, 23, 22, 20, 19, 18, 17, 16, 15, 14, 13, 13, 12, 12, 12, 11,
+        11, 10, 10, 10, 9, 33, 32, 32, 32, 32, 31, 31, 30, 29, 28, 27, 25, 23,
+        23, 21, 19, 18, 17, 16, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 10, 10,
+        10, 33, 32, 32, 32, 31, 30, 30, 29, 28, 27, 26, 24, 23, 22, 20, 19, 18,
+        17, 16, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 32, 32, 32,
+        31, 30, 29, 28, 28, 27, 26, 26, 24, 23, 22, 21, 19, 19, 18, 16, 16, 15,
+        14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 32, 31, 31, 31, 30, 28, 28,
+        27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 14, 13, 13, 13,
+        12, 12, 12, 11, 11, 10, 10, 30, 30, 31, 30, 29, 28, 27, 26, 24, 23, 23,
+        22, 20, 20, 19, 18, 17, 16, 15, 14, 14, 13, 13, 12, 12, 12, 12, 12, 11,
+        11, 11, 10, 28, 29, 30, 29, 28, 27, 26, 24, 21, 20, 20, 19, 18, 18, 17,
+        16, 16, 15, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 27,
+        28, 28, 28, 27, 26, 25, 23, 20, 20, 20, 18, 18, 17, 16, 15, 15, 14, 13,
+        13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 10, 10, 10, 26, 27, 28, 27, 26,
+        26, 24, 23, 20, 20, 19, 18, 17, 17, 16, 15, 15, 14, 13, 13, 12, 12, 12,
+        11, 11, 11, 11, 10, 10, 10, 10, 10, 23, 24, 25, 25, 24, 24, 23, 22, 19,
+        18, 18, 16, 16, 15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 11, 10, 10,
+        10, 10, 10, 9, 9, 22, 23, 23, 23, 23, 23, 22, 20, 18, 18, 17, 16, 15,
+        14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9,
+        21, 22, 22, 23, 22, 22, 21, 20, 18, 17, 17, 15, 14, 14, 13, 13, 12, 12,
+        11, 11, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 19, 20, 20, 21, 20,
+        21, 20, 19, 17, 16, 16, 14, 14, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9,
+        9, 9, 9, 9, 9, 9, 8, 8, 8, 17, 18, 19, 19, 19, 19, 19, 18, 16, 15, 15,
+        14, 13, 13, 12, 11, 11, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8,
+        17, 18, 18, 18, 18, 19, 18, 17, 16, 15, 15, 13, 13, 12, 12, 11, 11, 10,
+        10, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 16, 17, 17, 17, 17, 18, 17,
+        16, 15, 14, 14, 13, 12, 12, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 7, 14, 15, 16, 16, 16, 16, 16, 15, 14, 13, 13, 12, 12, 11,
+        11, 10, 10, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 13, 14, 15, 15,
+        15, 16, 15, 14, 13, 13, 13, 12, 11, 11, 10, 10, 9, 9, 8, 8, 8, 8, 8, 8,
+        7, 7, 7, 7, 7, 7, 7, 7, 13, 13, 14, 14, 14, 15, 14, 14, 13, 12, 12, 11,
+        11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 12, 13,
+        13, 14, 14, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 8, 8, 8, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 12, 12, 13, 13, 13, 14, 13, 13, 12, 12,
+        12, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 6, 7, 6, 6, 6, 6, 6,
+        12, 12, 12, 13, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10, 9, 9, 9, 8, 8,
+        8, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 11, 12, 12, 12, 12, 13, 13, 12,
+        12, 11, 11, 11, 10, 10, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6,
+        6, 6, 11, 11, 12, 12, 12, 12, 12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 8,
+        8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 10, 11, 11, 12, 12, 12, 12,
+        12, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6,
+        5, 5, 5, 10, 11, 11, 11, 11, 11, 12, 12, 11, 11, 10, 10, 10, 9, 9, 8, 8,
+        8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 10, 10, 10, 11, 11, 11, 11,
+        11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 6, 5,
+        5, 5, 5, 9, 10, 10, 10, 11, 11, 11, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8,
+        8, 7, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 9, 10, 10, 10, 10, 10, 10,
+        11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 5, 5, 5, 5,
+        5, 5, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7,
+        7, 7, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5,
+        /* Size 4x8 */
+        32, 24, 15, 12, 31, 24, 16, 12, 28, 18, 13, 12, 22, 15, 11, 10, 17, 13,
+        9, 8, 14, 11, 8, 7, 12, 11, 8, 6, 10, 10, 8, 6,
+        /* Size 8x4 */
+        32, 31, 28, 22, 17, 14, 12, 10, 24, 24, 18, 15, 13, 11, 11, 10, 15, 16,
+        13, 11, 9, 8, 8, 8, 12, 12, 12, 10, 8, 7, 6, 6,
+        /* Size 8x16 */
+        32, 32, 28, 22, 16, 13, 11, 11, 33, 32, 29, 23, 17, 14, 12, 11, 32, 30,
+        28, 23, 17, 14, 13, 12, 32, 29, 26, 22, 17, 14, 13, 12, 28, 28, 21, 18,
+        15, 13, 12, 12, 26, 26, 20, 17, 14, 12, 11, 11, 22, 23, 18, 15, 12, 11,
+        10, 10, 19, 20, 17, 14, 11, 10, 9, 9, 17, 18, 16, 13, 10, 9, 9, 9, 14,
+        16, 14, 12, 9, 8, 8, 8, 13, 15, 13, 11, 9, 8, 7, 7, 12, 13, 12, 10, 8,
+        7, 7, 7, 11, 12, 12, 10, 8, 7, 7, 6, 10, 12, 11, 9, 8, 7, 6, 6, 10, 11,
+        11, 9, 8, 7, 6, 6, 9, 10, 10, 9, 8, 7, 6, 5,
+        /* Size 16x8 */
+        32, 33, 32, 32, 28, 26, 22, 19, 17, 14, 13, 12, 11, 10, 10, 9, 32, 32,
+        30, 29, 28, 26, 23, 20, 18, 16, 15, 13, 12, 12, 11, 10, 28, 29, 28, 26,
+        21, 20, 18, 17, 16, 14, 13, 12, 12, 11, 11, 10, 22, 23, 23, 22, 18, 17,
+        15, 14, 13, 12, 11, 10, 10, 9, 9, 9, 16, 17, 17, 17, 15, 14, 12, 11, 10,
+        9, 9, 8, 8, 8, 8, 8, 13, 14, 14, 14, 13, 12, 11, 10, 9, 8, 8, 7, 7, 7,
+        7, 7, 11, 12, 13, 13, 12, 11, 10, 9, 9, 8, 7, 7, 7, 6, 6, 6, 11, 11, 12,
+        12, 12, 11, 10, 9, 9, 8, 7, 7, 6, 6, 6, 5,
+        /* Size 16x32 */
+        32, 33, 32, 32, 28, 23, 22, 19, 16, 14, 13, 12, 11, 11, 11, 10, 33, 32,
+        32, 31, 29, 24, 23, 20, 17, 15, 14, 12, 12, 12, 11, 11, 33, 32, 32, 31,
+        29, 25, 23, 21, 17, 15, 14, 13, 12, 12, 11, 11, 33, 32, 31, 31, 29, 25,
+        23, 21, 17, 16, 14, 13, 12, 12, 12, 11, 32, 32, 30, 30, 28, 24, 23, 20,
+        17, 16, 14, 13, 13, 12, 12, 11, 32, 31, 29, 28, 27, 24, 23, 21, 18, 16,
+        15, 13, 13, 12, 12, 12, 32, 31, 29, 28, 26, 23, 22, 20, 17, 16, 14, 13,
+        13, 13, 12, 12, 30, 30, 28, 27, 24, 21, 20, 19, 16, 15, 14, 13, 12, 13,
+        12, 12, 28, 30, 28, 26, 21, 19, 18, 17, 15, 14, 13, 12, 12, 12, 12, 12,
+        27, 28, 26, 25, 21, 18, 18, 16, 14, 13, 13, 12, 12, 12, 11, 11, 26, 28,
+        26, 24, 20, 18, 17, 16, 14, 13, 12, 11, 11, 11, 11, 11, 23, 25, 24, 23,
+        19, 16, 16, 14, 13, 12, 11, 11, 11, 11, 11, 10, 22, 23, 23, 22, 18, 16,
+        15, 14, 12, 11, 11, 10, 10, 10, 10, 10, 21, 22, 22, 21, 18, 15, 14, 13,
+        12, 11, 11, 10, 10, 10, 10, 10, 19, 21, 20, 20, 17, 14, 14, 12, 11, 10,
+        10, 9, 9, 10, 9, 10, 18, 19, 19, 19, 16, 14, 13, 12, 10, 10, 9, 9, 9, 9,
+        9, 9, 17, 18, 18, 18, 16, 13, 13, 12, 10, 10, 9, 9, 9, 9, 9, 9, 16, 17,
+        17, 17, 15, 13, 12, 11, 10, 9, 9, 8, 8, 8, 8, 8, 14, 16, 16, 16, 14, 12,
+        12, 11, 9, 9, 8, 8, 8, 8, 8, 8, 13, 15, 15, 15, 13, 12, 11, 10, 9, 8, 8,
+        8, 8, 8, 8, 8, 13, 14, 15, 14, 13, 11, 11, 10, 9, 8, 8, 7, 7, 7, 7, 8,
+        12, 14, 14, 14, 13, 11, 11, 10, 8, 8, 8, 7, 7, 7, 7, 7, 12, 13, 13, 13,
+        12, 11, 10, 9, 8, 8, 7, 7, 7, 7, 7, 7, 12, 13, 13, 13, 12, 11, 10, 9, 8,
+        8, 7, 7, 7, 7, 7, 6, 11, 12, 12, 13, 12, 11, 10, 9, 8, 8, 7, 7, 7, 6, 6,
+        6, 11, 12, 12, 12, 11, 11, 10, 9, 9, 8, 7, 7, 6, 6, 6, 6, 10, 12, 12,
+        12, 11, 11, 9, 9, 8, 8, 7, 6, 6, 6, 6, 6, 10, 11, 11, 12, 11, 10, 9, 9,
+        8, 8, 7, 6, 6, 6, 6, 6, 10, 11, 11, 11, 11, 10, 9, 9, 8, 8, 7, 7, 6, 6,
+        6, 6, 10, 10, 11, 11, 11, 10, 9, 9, 8, 8, 7, 7, 6, 6, 5, 5, 9, 10, 10,
+        11, 10, 9, 9, 8, 8, 7, 7, 6, 6, 6, 5, 5, 9, 10, 10, 10, 10, 9, 9, 8, 8,
+        7, 7, 6, 6, 5, 5, 5,
+        /* Size 32x16 */
+        32, 33, 33, 33, 32, 32, 32, 30, 28, 27, 26, 23, 22, 21, 19, 18, 17, 16,
+        14, 13, 13, 12, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 33, 32, 32, 32,
+        32, 31, 31, 30, 30, 28, 28, 25, 23, 22, 21, 19, 18, 17, 16, 15, 14, 14,
+        13, 13, 12, 12, 12, 11, 11, 10, 10, 10, 32, 32, 32, 31, 30, 29, 29, 28,
+        28, 26, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15, 15, 14, 13, 13, 12, 12,
+        12, 11, 11, 11, 10, 10, 32, 31, 31, 31, 30, 28, 28, 27, 26, 25, 24, 23,
+        22, 21, 20, 19, 18, 17, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11,
+        11, 10, 28, 29, 29, 29, 28, 27, 26, 24, 21, 21, 20, 19, 18, 18, 17, 16,
+        16, 15, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 10, 10, 23, 24,
+        25, 25, 24, 24, 23, 21, 19, 18, 18, 16, 16, 15, 14, 14, 13, 13, 12, 12,
+        11, 11, 11, 11, 11, 11, 11, 10, 10, 10, 9, 9, 22, 23, 23, 23, 23, 23,
+        22, 20, 18, 18, 17, 16, 15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10,
+        10, 10, 9, 9, 9, 9, 9, 9, 19, 20, 21, 21, 20, 21, 20, 19, 17, 16, 16,
+        14, 14, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 8,
+        8, 16, 17, 17, 17, 17, 18, 17, 16, 15, 14, 14, 13, 12, 12, 11, 10, 10,
+        10, 9, 9, 9, 8, 8, 8, 8, 9, 8, 8, 8, 8, 8, 8, 14, 15, 15, 16, 16, 16,
+        16, 15, 14, 13, 13, 12, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 7, 7, 13, 14, 14, 14, 14, 15, 14, 14, 13, 13, 12, 11, 11,
+        11, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 12, 12, 13,
+        13, 13, 13, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7,
+        7, 7, 7, 6, 6, 7, 7, 6, 6, 11, 12, 12, 12, 13, 13, 13, 12, 12, 12, 11,
+        11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 11,
+        12, 12, 12, 12, 12, 13, 13, 12, 12, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8,
+        7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 5, 11, 11, 11, 12, 12, 12, 12, 12, 12,
+        11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 5, 5,
+        5, 10, 11, 11, 11, 11, 12, 12, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 8,
+        8, 8, 8, 7, 7, 6, 6, 6, 6, 6, 6, 5, 5, 5,
+        /* Size 4x16 */
+        33, 23, 14, 11, 32, 25, 15, 12, 32, 24, 16, 12, 31, 23, 16, 13, 30, 19,
+        14, 12, 28, 18, 13, 11, 23, 16, 11, 10, 21, 14, 10, 10, 18, 13, 10, 9,
+        16, 12, 9, 8, 14, 11, 8, 7, 13, 11, 8, 7, 12, 11, 8, 6, 12, 11, 8, 6,
+        11, 10, 8, 6, 10, 9, 7, 6,
+        /* Size 16x4 */
+        33, 32, 32, 31, 30, 28, 23, 21, 18, 16, 14, 13, 12, 12, 11, 10, 23, 25,
+        24, 23, 19, 18, 16, 14, 13, 12, 11, 11, 11, 11, 10, 9, 14, 15, 16, 16,
+        14, 13, 11, 10, 10, 9, 8, 8, 8, 8, 8, 7, 11, 12, 12, 13, 12, 11, 10, 10,
+        9, 8, 7, 7, 6, 6, 6, 6,
+        /* Size 8x32 */
+        32, 32, 28, 22, 16, 13, 11, 11, 33, 32, 29, 23, 17, 14, 12, 11, 33, 32,
+        29, 23, 17, 14, 12, 11, 33, 31, 29, 23, 17, 14, 12, 12, 32, 30, 28, 23,
+        17, 14, 13, 12, 32, 29, 27, 23, 18, 15, 13, 12, 32, 29, 26, 22, 17, 14,
+        13, 12, 30, 28, 24, 20, 16, 14, 12, 12, 28, 28, 21, 18, 15, 13, 12, 12,
+        27, 26, 21, 18, 14, 13, 12, 11, 26, 26, 20, 17, 14, 12, 11, 11, 23, 24,
+        19, 16, 13, 11, 11, 11, 22, 23, 18, 15, 12, 11, 10, 10, 21, 22, 18, 14,
+        12, 11, 10, 10, 19, 20, 17, 14, 11, 10, 9, 9, 18, 19, 16, 13, 10, 9, 9,
+        9, 17, 18, 16, 13, 10, 9, 9, 9, 16, 17, 15, 12, 10, 9, 8, 8, 14, 16, 14,
+        12, 9, 8, 8, 8, 13, 15, 13, 11, 9, 8, 8, 8, 13, 15, 13, 11, 9, 8, 7, 7,
+        12, 14, 13, 11, 8, 8, 7, 7, 12, 13, 12, 10, 8, 7, 7, 7, 12, 13, 12, 10,
+        8, 7, 7, 7, 11, 12, 12, 10, 8, 7, 7, 6, 11, 12, 11, 10, 9, 7, 6, 6, 10,
+        12, 11, 9, 8, 7, 6, 6, 10, 11, 11, 9, 8, 7, 6, 6, 10, 11, 11, 9, 8, 7,
+        6, 6, 10, 11, 11, 9, 8, 7, 6, 5, 9, 10, 10, 9, 8, 7, 6, 5, 9, 10, 10, 9,
+        8, 7, 6, 5,
+        /* Size 32x8 */
+        32, 33, 33, 33, 32, 32, 32, 30, 28, 27, 26, 23, 22, 21, 19, 18, 17, 16,
+        14, 13, 13, 12, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 32, 32, 32, 31,
+        30, 29, 29, 28, 28, 26, 26, 24, 23, 22, 20, 19, 18, 17, 16, 15, 15, 14,
+        13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 28, 29, 29, 29, 28, 27, 26, 24,
+        21, 21, 20, 19, 18, 18, 17, 16, 16, 15, 14, 13, 13, 13, 12, 12, 12, 11,
+        11, 11, 11, 11, 10, 10, 22, 23, 23, 23, 23, 23, 22, 20, 18, 18, 17, 16,
+        15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9,
+        9, 16, 17, 17, 17, 17, 18, 17, 16, 15, 14, 14, 13, 12, 12, 11, 10, 10,
+        10, 9, 9, 9, 8, 8, 8, 8, 9, 8, 8, 8, 8, 8, 8, 13, 14, 14, 14, 14, 15,
+        14, 14, 13, 13, 12, 11, 11, 11, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 11, 12, 12, 12, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10,
+        9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 11, 11, 11, 12,
+        12, 12, 12, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6,
+        6, 6, 6, 6, 5, 5, 5 },
+      { /* Chroma */
+        /* Size 4x4 */
+        31, 23, 18, 16, 23, 18, 16, 15, 18, 16, 12, 12, 16, 15, 12, 10,
+        /* Size 8x8 */
+        33, 27, 22, 21, 19, 17, 16, 15, 27, 22, 22, 22, 20, 19, 17, 16, 22, 22,
+        19, 19, 18, 16, 16, 16, 21, 22, 19, 17, 15, 14, 14, 14, 19, 20, 18, 15,
+        13, 12, 12, 12, 17, 19, 16, 14, 12, 11, 11, 11, 16, 17, 16, 14, 12, 11,
+        10, 10, 15, 16, 16, 14, 12, 11, 10, 9,
+        /* Size 16x16 */
+        32, 34, 31, 27, 21, 21, 20, 20, 19, 17, 16, 16, 15, 15, 14, 14, 34, 33,
+        29, 25, 22, 22, 22, 21, 20, 19, 18, 17, 16, 16, 15, 15, 31, 29, 26, 23,
+        22, 22, 22, 22, 20, 19, 18, 18, 17, 17, 16, 15, 27, 25, 23, 22, 21, 21,
+        22, 21, 20, 19, 19, 18, 18, 17, 17, 16, 21, 22, 22, 21, 19, 19, 19, 19,
+        18, 18, 17, 17, 17, 16, 16, 16, 21, 22, 22, 21, 19, 19, 18, 18, 17, 17,
+        16, 16, 15, 16, 15, 15, 20, 22, 22, 22, 19, 18, 17, 16, 16, 15, 15, 14,
+        14, 14, 14, 14, 20, 21, 22, 21, 19, 18, 16, 16, 15, 14, 14, 13, 14, 13,
+        13, 13, 19, 20, 20, 20, 18, 17, 16, 15, 14, 13, 13, 13, 13, 13, 13, 13,
+        17, 19, 19, 19, 18, 17, 15, 14, 13, 12, 12, 12, 12, 12, 12, 12, 16, 18,
+        18, 19, 17, 16, 15, 14, 13, 12, 12, 11, 11, 11, 12, 11, 16, 17, 18, 18,
+        17, 16, 14, 13, 13, 12, 11, 11, 11, 11, 11, 11, 15, 16, 17, 18, 17, 15,
+        14, 14, 13, 12, 11, 11, 10, 10, 10, 10, 15, 16, 17, 17, 16, 16, 14, 13,
+        13, 12, 11, 11, 10, 10, 10, 10, 14, 15, 16, 17, 16, 15, 14, 13, 13, 12,
+        12, 11, 10, 10, 10, 9, 14, 15, 15, 16, 16, 15, 14, 13, 13, 12, 11, 11,
+        10, 10, 9, 9,
+        /* Size 32x32 */
+        32, 33, 34, 33, 31, 28, 27, 25, 21, 21, 21, 21, 20, 20, 20, 19, 19, 18,
+        17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 33, 33, 33, 32,
+        30, 27, 26, 24, 22, 22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 17, 17, 17,
+        16, 16, 16, 16, 15, 15, 15, 15, 15, 14, 34, 33, 33, 32, 29, 26, 25, 24,
+        22, 22, 22, 23, 22, 22, 21, 20, 20, 20, 19, 18, 18, 17, 17, 17, 16, 16,
+        16, 15, 15, 15, 15, 14, 33, 32, 32, 31, 28, 26, 25, 24, 22, 22, 23, 23,
+        22, 22, 22, 21, 20, 20, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16,
+        15, 15, 31, 30, 29, 28, 26, 24, 23, 23, 22, 22, 22, 23, 22, 22, 22, 21,
+        20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 15, 15, 28, 27,
+        26, 26, 24, 22, 22, 22, 21, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20, 19,
+        19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 27, 26, 25, 25, 23, 22,
+        22, 21, 21, 21, 21, 22, 22, 22, 21, 21, 20, 20, 19, 19, 19, 18, 18, 18,
+        18, 17, 17, 17, 17, 16, 16, 16, 25, 24, 24, 24, 23, 22, 21, 21, 20, 20,
+        21, 21, 20, 20, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 17,
+        17, 16, 16, 16, 21, 22, 22, 22, 22, 21, 21, 20, 19, 19, 19, 19, 19, 19,
+        19, 19, 18, 18, 18, 17, 17, 17, 17, 16, 17, 17, 16, 16, 16, 16, 16, 16,
+        21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18,
+        17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16, 16, 15, 15, 21, 22, 22, 23,
+        22, 22, 21, 21, 19, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 16, 16, 16,
+        16, 16, 15, 16, 16, 15, 15, 15, 15, 15, 21, 22, 23, 23, 23, 23, 22, 21,
+        19, 19, 19, 18, 17, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15,
+        15, 15, 15, 15, 15, 14, 20, 21, 22, 22, 22, 22, 22, 20, 19, 19, 18, 17,
+        17, 17, 16, 16, 16, 16, 15, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+        14, 14, 20, 21, 22, 22, 22, 22, 22, 20, 19, 19, 18, 17, 17, 17, 16, 16,
+        16, 15, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 20, 20,
+        21, 22, 22, 22, 21, 20, 19, 18, 18, 17, 16, 16, 16, 15, 15, 15, 14, 14,
+        14, 14, 13, 13, 14, 13, 13, 14, 13, 13, 13, 14, 19, 20, 20, 21, 21, 21,
+        21, 20, 19, 18, 18, 17, 16, 16, 15, 14, 14, 14, 14, 13, 13, 13, 13, 13,
+        13, 13, 13, 13, 13, 13, 13, 13, 19, 19, 20, 20, 20, 21, 20, 20, 18, 18,
+        17, 16, 16, 16, 15, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+        13, 13, 13, 13, 18, 19, 20, 20, 20, 20, 20, 19, 18, 18, 17, 16, 16, 15,
+        15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+        17, 18, 19, 19, 19, 20, 19, 19, 18, 17, 17, 16, 15, 15, 14, 14, 13, 13,
+        12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 17, 17, 18, 18,
+        19, 19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 13, 13, 13, 12, 12, 12, 12,
+        11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, 17, 18, 18, 18, 19, 19, 18,
+        17, 17, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11,
+        11, 11, 12, 11, 11, 12, 16, 17, 17, 18, 18, 19, 18, 18, 17, 16, 16, 15,
+        14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+        11, 11, 16, 16, 17, 17, 18, 18, 18, 17, 17, 16, 16, 15, 14, 14, 13, 13,
+        13, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 15, 16,
+        17, 17, 17, 18, 18, 17, 16, 16, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12,
+        11, 11, 11, 11, 11, 10, 10, 11, 11, 11, 11, 10, 15, 16, 16, 17, 17, 17,
+        18, 17, 17, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11,
+        10, 10, 10, 10, 10, 10, 10, 10, 15, 16, 16, 16, 17, 17, 17, 17, 17, 16,
+        16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10,
+        10, 10, 10, 10, 15, 15, 16, 16, 17, 17, 17, 17, 16, 16, 16, 15, 14, 14,
+        13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+        14, 15, 15, 16, 16, 16, 17, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 12,
+        12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 9, 14, 15, 15, 16,
+        16, 16, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11,
+        11, 11, 10, 10, 10, 10, 10, 10, 9, 9, 14, 15, 15, 16, 16, 16, 16, 16,
+        16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 11, 10, 10,
+        10, 10, 10, 9, 9, 9, 14, 15, 15, 15, 15, 16, 16, 16, 16, 15, 15, 15, 14,
+        14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9,
+        14, 14, 14, 15, 15, 16, 16, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12,
+        12, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9,
+        /* Size 4x8 */
+        33, 22, 18, 16, 26, 23, 20, 17, 22, 19, 17, 16, 22, 17, 15, 14, 20, 16,
+        13, 13, 17, 15, 12, 11, 16, 16, 12, 10, 16, 15, 12, 10,
+        /* Size 8x4 */
+        33, 26, 22, 22, 20, 17, 16, 16, 22, 23, 19, 17, 16, 15, 16, 15, 18, 20,
+        17, 15, 13, 12, 12, 12, 16, 17, 16, 14, 13, 11, 10, 10,
+        /* Size 8x16 */
+        32, 29, 21, 20, 18, 16, 15, 15, 34, 27, 22, 22, 20, 18, 16, 16, 31, 25,
+        22, 22, 20, 18, 17, 16, 26, 22, 21, 22, 20, 19, 18, 17, 21, 21, 19, 19,
+        18, 17, 17, 17, 21, 22, 19, 18, 17, 16, 16, 16, 20, 22, 19, 17, 16, 15,
+        14, 15, 20, 22, 19, 16, 14, 14, 14, 14, 19, 21, 18, 16, 14, 13, 13, 13,
+        17, 19, 18, 15, 13, 12, 12, 12, 16, 19, 17, 15, 12, 12, 11, 12, 16, 18,
+        17, 14, 12, 11, 11, 11, 15, 17, 16, 14, 13, 11, 11, 11, 15, 17, 16, 14,
+        13, 12, 10, 10, 14, 16, 16, 14, 12, 11, 10, 10, 14, 15, 16, 14, 13, 12,
+        10, 10,
+        /* Size 16x8 */
+        32, 34, 31, 26, 21, 21, 20, 20, 19, 17, 16, 16, 15, 15, 14, 14, 29, 27,
+        25, 22, 21, 22, 22, 22, 21, 19, 19, 18, 17, 17, 16, 15, 21, 22, 22, 21,
+        19, 19, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 20, 22, 22, 22, 19, 18,
+        17, 16, 16, 15, 15, 14, 14, 14, 14, 14, 18, 20, 20, 20, 18, 17, 16, 14,
+        14, 13, 12, 12, 13, 13, 12, 13, 16, 18, 18, 19, 17, 16, 15, 14, 13, 12,
+        12, 11, 11, 12, 11, 12, 15, 16, 17, 18, 17, 16, 14, 14, 13, 12, 11, 11,
+        11, 10, 10, 10, 15, 16, 16, 17, 17, 16, 15, 14, 13, 12, 12, 11, 11, 10,
+        10, 10,
+        /* Size 16x32 */
+        32, 33, 29, 27, 21, 21, 20, 20, 18, 17, 16, 15, 15, 15, 15, 14, 33, 33,
+        28, 26, 22, 22, 21, 20, 19, 18, 17, 16, 16, 16, 16, 15, 34, 32, 27, 26,
+        22, 23, 22, 21, 20, 19, 18, 17, 16, 16, 16, 15, 33, 31, 27, 25, 22, 23,
+        22, 21, 20, 19, 18, 17, 17, 17, 16, 16, 31, 28, 25, 23, 22, 22, 22, 22,
+        20, 19, 18, 17, 17, 17, 16, 16, 28, 26, 23, 22, 22, 23, 22, 22, 20, 20,
+        19, 18, 17, 17, 17, 17, 26, 25, 22, 22, 21, 22, 22, 21, 20, 19, 19, 18,
+        18, 17, 17, 17, 24, 24, 22, 21, 20, 21, 20, 20, 19, 18, 18, 17, 17, 17,
+        17, 17, 21, 22, 21, 21, 19, 19, 19, 19, 18, 17, 17, 16, 17, 17, 17, 17,
+        21, 22, 22, 21, 19, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 16, 21, 22,
+        22, 21, 19, 18, 18, 18, 17, 17, 16, 16, 16, 16, 16, 16, 21, 23, 23, 22,
+        19, 18, 17, 17, 16, 16, 15, 15, 15, 15, 16, 15, 20, 22, 22, 21, 19, 17,
+        17, 16, 16, 15, 15, 14, 14, 15, 15, 15, 20, 22, 22, 21, 19, 17, 17, 16,
+        15, 15, 14, 14, 14, 14, 15, 14, 20, 21, 22, 21, 19, 17, 16, 16, 14, 14,
+        14, 13, 14, 14, 14, 14, 19, 20, 21, 20, 19, 17, 16, 15, 14, 13, 13, 13,
+        13, 13, 14, 14, 19, 20, 21, 20, 18, 16, 16, 15, 14, 13, 13, 13, 13, 13,
+        13, 14, 18, 20, 20, 20, 18, 16, 16, 15, 13, 13, 12, 12, 12, 13, 13, 13,
+        17, 19, 19, 19, 18, 16, 15, 14, 13, 12, 12, 12, 12, 12, 12, 13, 17, 18,
+        19, 19, 17, 16, 15, 14, 13, 12, 12, 12, 12, 12, 12, 12, 16, 18, 19, 18,
+        17, 15, 15, 14, 12, 12, 12, 11, 11, 12, 12, 12, 16, 17, 18, 18, 17, 15,
+        14, 14, 12, 12, 11, 11, 11, 11, 12, 12, 16, 17, 18, 18, 17, 15, 14, 13,
+        12, 12, 11, 11, 11, 11, 11, 12, 15, 17, 17, 18, 16, 15, 14, 13, 12, 12,
+        11, 11, 11, 11, 11, 11, 15, 17, 17, 17, 16, 15, 14, 13, 13, 12, 11, 11,
+        11, 10, 11, 11, 15, 16, 17, 17, 16, 16, 14, 13, 13, 12, 11, 11, 10, 10,
+        10, 10, 15, 16, 17, 17, 16, 16, 14, 13, 13, 12, 12, 11, 10, 10, 10, 10,
+        14, 16, 16, 17, 16, 15, 14, 14, 12, 12, 11, 11, 10, 10, 10, 10, 14, 16,
+        16, 17, 16, 15, 14, 14, 12, 12, 11, 11, 10, 10, 10, 10, 14, 16, 16, 16,
+        16, 15, 14, 13, 13, 12, 11, 11, 10, 10, 10, 10, 14, 15, 15, 16, 16, 15,
+        14, 13, 13, 12, 12, 11, 10, 10, 10, 10, 14, 15, 15, 16, 16, 14, 14, 13,
+        13, 12, 12, 11, 11, 10, 10, 9,
+        /* Size 32x16 */
+        32, 33, 34, 33, 31, 28, 26, 24, 21, 21, 21, 21, 20, 20, 20, 19, 19, 18,
+        17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 33, 33, 32, 31,
+        28, 26, 25, 24, 22, 22, 22, 23, 22, 22, 21, 20, 20, 20, 19, 18, 18, 17,
+        17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 29, 28, 27, 27, 25, 23, 22, 22,
+        21, 22, 22, 23, 22, 22, 22, 21, 21, 20, 19, 19, 19, 18, 18, 17, 17, 17,
+        17, 16, 16, 16, 15, 15, 27, 26, 26, 25, 23, 22, 22, 21, 21, 21, 21, 22,
+        21, 21, 21, 20, 20, 20, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 17, 16,
+        16, 16, 21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 19, 19, 19, 19, 19, 19,
+        18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16, 16, 21, 22,
+        23, 23, 22, 23, 22, 21, 19, 19, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16,
+        15, 15, 15, 15, 15, 16, 16, 15, 15, 15, 15, 14, 20, 21, 22, 22, 22, 22,
+        22, 20, 19, 19, 18, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 14, 14, 14,
+        14, 14, 14, 14, 14, 14, 14, 14, 20, 20, 21, 21, 22, 22, 21, 20, 19, 18,
+        18, 17, 16, 16, 16, 15, 15, 15, 14, 14, 14, 14, 13, 13, 13, 13, 13, 14,
+        14, 13, 13, 13, 18, 19, 20, 20, 20, 20, 20, 19, 18, 18, 17, 16, 16, 15,
+        14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 13, 13, 13, 12, 12, 13, 13, 13,
+        17, 18, 19, 19, 19, 20, 19, 18, 17, 17, 17, 16, 15, 15, 14, 13, 13, 13,
+        12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, 17, 18, 18,
+        18, 19, 19, 18, 17, 17, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11,
+        11, 11, 11, 11, 12, 11, 11, 11, 12, 12, 15, 16, 17, 17, 17, 18, 18, 17,
+        16, 16, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 11,
+        11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17, 18, 17, 17, 16, 16, 15,
+        14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10,
+        10, 11, 15, 16, 16, 17, 17, 17, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13,
+        13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 15, 16,
+        16, 16, 16, 17, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12,
+        12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 14, 15, 15, 16, 16, 17,
+        17, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11,
+        11, 10, 10, 10, 10, 10, 10, 9,
+        /* Size 4x16 */
+        33, 21, 17, 15, 32, 23, 19, 16, 28, 22, 19, 17, 25, 22, 19, 17, 22, 19,
+        17, 17, 22, 18, 17, 16, 22, 17, 15, 15, 21, 17, 14, 14, 20, 16, 13, 13,
+        19, 16, 12, 12, 18, 15, 12, 12, 17, 15, 12, 11, 17, 15, 12, 10, 16, 16,
+        12, 10, 16, 15, 12, 10, 15, 15, 12, 10,
+        /* Size 16x4 */
+        33, 32, 28, 25, 22, 22, 22, 21, 20, 19, 18, 17, 17, 16, 16, 15, 21, 23,
+        22, 22, 19, 18, 17, 17, 16, 16, 15, 15, 15, 16, 15, 15, 17, 19, 19, 19,
+        17, 17, 15, 14, 13, 12, 12, 12, 12, 12, 12, 12, 15, 16, 17, 17, 17, 16,
+        15, 14, 13, 12, 12, 11, 10, 10, 10, 10,
+        /* Size 8x32 */
+        32, 29, 21, 20, 18, 16, 15, 15, 33, 28, 22, 21, 19, 17, 16, 16, 34, 27,
+        22, 22, 20, 18, 16, 16, 33, 27, 22, 22, 20, 18, 17, 16, 31, 25, 22, 22,
+        20, 18, 17, 16, 28, 23, 22, 22, 20, 19, 17, 17, 26, 22, 21, 22, 20, 19,
+        18, 17, 24, 22, 20, 20, 19, 18, 17, 17, 21, 21, 19, 19, 18, 17, 17, 17,
+        21, 22, 19, 19, 18, 17, 16, 16, 21, 22, 19, 18, 17, 16, 16, 16, 21, 23,
+        19, 17, 16, 15, 15, 16, 20, 22, 19, 17, 16, 15, 14, 15, 20, 22, 19, 17,
+        15, 14, 14, 15, 20, 22, 19, 16, 14, 14, 14, 14, 19, 21, 19, 16, 14, 13,
+        13, 14, 19, 21, 18, 16, 14, 13, 13, 13, 18, 20, 18, 16, 13, 12, 12, 13,
+        17, 19, 18, 15, 13, 12, 12, 12, 17, 19, 17, 15, 13, 12, 12, 12, 16, 19,
+        17, 15, 12, 12, 11, 12, 16, 18, 17, 14, 12, 11, 11, 12, 16, 18, 17, 14,
+        12, 11, 11, 11, 15, 17, 16, 14, 12, 11, 11, 11, 15, 17, 16, 14, 13, 11,
+        11, 11, 15, 17, 16, 14, 13, 11, 10, 10, 15, 17, 16, 14, 13, 12, 10, 10,
+        14, 16, 16, 14, 12, 11, 10, 10, 14, 16, 16, 14, 12, 11, 10, 10, 14, 16,
+        16, 14, 13, 11, 10, 10, 14, 15, 16, 14, 13, 12, 10, 10, 14, 15, 16, 14,
+        13, 12, 11, 10,
+        /* Size 32x8 */
+        32, 33, 34, 33, 31, 28, 26, 24, 21, 21, 21, 21, 20, 20, 20, 19, 19, 18,
+        17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 29, 28, 27, 27,
+        25, 23, 22, 22, 21, 22, 22, 23, 22, 22, 22, 21, 21, 20, 19, 19, 19, 18,
+        18, 17, 17, 17, 17, 16, 16, 16, 15, 15, 21, 22, 22, 22, 22, 22, 21, 20,
+        19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16,
+        16, 16, 16, 16, 16, 16, 20, 21, 22, 22, 22, 22, 22, 20, 19, 19, 18, 17,
+        17, 17, 16, 16, 16, 16, 15, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+        14, 14, 18, 19, 20, 20, 20, 20, 20, 19, 18, 18, 17, 16, 16, 15, 14, 14,
+        14, 13, 13, 13, 12, 12, 12, 12, 13, 13, 13, 12, 12, 13, 13, 13, 16, 17,
+        18, 18, 18, 19, 19, 18, 17, 17, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12,
+        12, 11, 11, 11, 11, 11, 12, 11, 11, 11, 12, 12, 15, 16, 16, 17, 17, 17,
+        18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11,
+        11, 10, 10, 10, 10, 10, 10, 11, 15, 16, 16, 16, 16, 17, 17, 17, 17, 16,
+        16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10, 10,
+        10, 10, 10, 10 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 27, 16, 12, 27, 18, 13, 11, 16, 13, 9, 8, 12, 11, 8, 6,
+        /* Size 8x8 */
+        32, 32, 29, 22, 18, 13, 12, 11, 32, 30, 28, 23, 19, 15, 13, 11, 29, 28,
+        21, 18, 16, 13, 12, 11, 22, 23, 18, 15, 13, 11, 10, 10, 18, 19, 16, 13,
+        11, 9, 8, 8, 13, 15, 13, 11, 9, 8, 7, 7, 12, 13, 12, 10, 8, 7, 7, 6, 11,
+        11, 11, 10, 8, 7, 6, 6,
+        /* Size 16x16 */
+        32, 33, 33, 32, 30, 26, 23, 21, 18, 16, 14, 13, 12, 11, 10, 10, 33, 32,
+        32, 32, 30, 27, 25, 22, 19, 17, 16, 14, 13, 12, 11, 10, 33, 32, 31, 30,
+        28, 26, 24, 22, 19, 17, 16, 14, 13, 12, 12, 11, 32, 32, 30, 29, 28, 26,
+        24, 22, 20, 18, 16, 14, 14, 13, 12, 11, 30, 30, 28, 28, 24, 22, 20, 19,
+        17, 16, 15, 13, 12, 12, 12, 11, 26, 27, 26, 26, 22, 19, 18, 17, 15, 14,
+        13, 12, 11, 11, 11, 10, 23, 25, 24, 24, 20, 18, 16, 15, 14, 13, 12, 11,
+        11, 10, 10, 10, 21, 22, 22, 22, 19, 17, 15, 14, 13, 12, 11, 10, 10, 10,
+        9, 9, 18, 19, 19, 20, 17, 15, 14, 13, 11, 11, 10, 9, 9, 9, 9, 8, 16, 17,
+        17, 18, 16, 14, 13, 12, 11, 10, 9, 9, 8, 8, 8, 8, 14, 16, 16, 16, 15,
+        13, 12, 11, 10, 9, 9, 8, 8, 8, 8, 7, 13, 14, 14, 14, 13, 12, 11, 10, 9,
+        9, 8, 7, 7, 7, 7, 7, 12, 13, 13, 14, 12, 11, 11, 10, 9, 8, 8, 7, 7, 7,
+        6, 6, 11, 12, 12, 13, 12, 11, 10, 10, 9, 8, 8, 7, 7, 6, 6, 6, 10, 11,
+        12, 12, 12, 11, 10, 9, 9, 8, 8, 7, 6, 6, 6, 6, 10, 10, 11, 11, 11, 10,
+        10, 9, 8, 8, 7, 7, 6, 6, 6, 5,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 32, 32, 30, 30, 28, 26, 25, 23, 21, 21, 19, 18, 17,
+        16, 15, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 33, 32, 32, 32,
+        32, 32, 32, 30, 30, 29, 27, 26, 24, 22, 22, 20, 19, 18, 17, 16, 15, 13,
+        13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 33, 32, 32, 32, 32, 32, 32, 31,
+        30, 30, 27, 26, 25, 23, 22, 20, 19, 19, 17, 16, 16, 14, 14, 13, 13, 12,
+        12, 12, 11, 11, 10, 10, 33, 32, 32, 32, 32, 32, 32, 31, 30, 30, 28, 27,
+        25, 23, 23, 21, 19, 19, 17, 16, 16, 14, 14, 14, 13, 13, 12, 12, 12, 11,
+        11, 11, 33, 32, 32, 32, 31, 31, 30, 29, 28, 28, 26, 26, 24, 23, 22, 20,
+        19, 19, 17, 16, 16, 14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 32, 32,
+        32, 32, 31, 30, 30, 28, 28, 28, 26, 26, 24, 23, 22, 21, 19, 19, 18, 17,
+        16, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 32, 32, 32, 32, 30, 30,
+        29, 28, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 14,
+        14, 13, 13, 12, 12, 12, 11, 11, 30, 30, 31, 31, 29, 28, 28, 26, 25, 24,
+        23, 22, 22, 20, 20, 19, 18, 17, 16, 16, 15, 14, 14, 13, 13, 13, 12, 12,
+        12, 12, 11, 11, 30, 30, 30, 30, 28, 28, 28, 25, 24, 23, 22, 21, 20, 19,
+        19, 18, 17, 17, 16, 15, 15, 13, 13, 13, 12, 12, 12, 12, 12, 11, 11, 11,
+        28, 29, 30, 30, 28, 28, 27, 24, 23, 21, 20, 20, 19, 18, 18, 17, 16, 16,
+        15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 26, 27, 27, 28,
+        26, 26, 26, 23, 22, 20, 19, 19, 18, 17, 17, 16, 15, 15, 14, 13, 13, 12,
+        12, 12, 11, 12, 11, 11, 11, 11, 10, 10, 25, 26, 26, 27, 26, 26, 25, 22,
+        21, 20, 19, 18, 17, 17, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11,
+        11, 11, 11, 10, 10, 10, 23, 24, 25, 25, 24, 24, 24, 22, 20, 19, 18, 17,
+        16, 16, 15, 14, 14, 14, 13, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10,
+        10, 10, 21, 22, 23, 23, 23, 23, 23, 20, 19, 18, 17, 17, 16, 15, 14, 13,
+        13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 9, 9, 21, 22,
+        22, 23, 22, 22, 22, 20, 19, 18, 17, 16, 15, 14, 14, 13, 13, 12, 12, 11,
+        11, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 19, 20, 20, 21, 20, 21, 21,
+        19, 18, 17, 16, 15, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9,
+        9, 9, 9, 9, 9, 9, 9, 18, 19, 19, 19, 19, 19, 20, 18, 17, 16, 15, 15, 14,
+        13, 13, 12, 11, 11, 11, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 9, 17, 18,
+        19, 19, 19, 19, 19, 17, 17, 16, 15, 14, 14, 13, 12, 12, 11, 11, 10, 10,
+        10, 9, 9, 9, 9, 8, 9, 8, 8, 8, 8, 8, 16, 17, 17, 17, 17, 18, 18, 16, 16,
+        15, 14, 14, 13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 15, 16, 16, 16, 16, 17, 17, 16, 15, 14, 13, 13, 12, 12, 11, 11,
+        10, 10, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 14, 15, 16, 16, 16,
+        16, 16, 15, 15, 14, 13, 13, 12, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 8,
+        8, 8, 7, 8, 7, 7, 7, 13, 13, 14, 14, 14, 15, 15, 14, 13, 13, 12, 12, 11,
+        11, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 13, 13, 14,
+        14, 14, 14, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 12, 13, 13, 14, 14, 14, 14, 13, 13, 13, 12,
+        12, 11, 10, 10, 10, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 12,
+        12, 13, 13, 13, 13, 14, 13, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8,
+        8, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 11, 12, 12, 13, 13, 13, 13, 13, 12,
+        12, 12, 11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6,
+        6, 11, 12, 12, 12, 12, 12, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 9,
+        8, 8, 8, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 11, 11, 12, 12, 12, 12, 12,
+        12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6,
+        6, 6, 6, 6, 10, 11, 11, 12, 12, 12, 12, 12, 12, 11, 11, 11, 10, 10, 9,
+        9, 9, 8, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 10, 11, 11, 11, 11,
+        11, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6,
+        6, 6, 6, 6, 6, 5, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 10, 10, 10, 9,
+        9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 5, 5, 10, 10, 10, 11,
+        11, 11, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 8, 8, 7, 7, 7, 7, 6, 6,
+        6, 6, 6, 6, 5, 5, 5,
+        /* Size 4x8 */
+        32, 27, 17, 12, 32, 26, 18, 13, 30, 20, 15, 12, 23, 17, 12, 10, 19, 15,
+        10, 9, 14, 12, 9, 8, 12, 12, 8, 7, 11, 10, 8, 6,
+        /* Size 8x4 */
+        32, 32, 30, 23, 19, 14, 12, 11, 27, 26, 20, 17, 15, 12, 12, 10, 17, 18,
+        15, 12, 10, 9, 8, 8, 12, 13, 12, 10, 9, 8, 7, 6,
+        /* Size 8x16 */
+        32, 32, 28, 23, 18, 13, 12, 11, 33, 32, 29, 25, 19, 14, 13, 12, 32, 31,
+        28, 24, 19, 14, 13, 12, 32, 30, 27, 24, 20, 15, 13, 12, 30, 28, 23, 20,
+        17, 14, 13, 12, 26, 26, 20, 18, 15, 12, 12, 11, 23, 24, 19, 16, 14, 11,
+        11, 11, 21, 22, 18, 15, 13, 11, 10, 10, 18, 19, 16, 14, 11, 9, 9, 9, 16,
+        17, 15, 13, 11, 9, 8, 8, 14, 16, 14, 12, 10, 8, 8, 8, 13, 14, 13, 11, 9,
+        8, 7, 7, 12, 13, 12, 11, 9, 7, 7, 7, 11, 12, 12, 10, 9, 8, 7, 6, 10, 12,
+        12, 10, 8, 7, 6, 6, 10, 11, 11, 10, 9, 7, 6, 6,
+        /* Size 16x8 */
+        32, 33, 32, 32, 30, 26, 23, 21, 18, 16, 14, 13, 12, 11, 10, 10, 32, 32,
+        31, 30, 28, 26, 24, 22, 19, 17, 16, 14, 13, 12, 12, 11, 28, 29, 28, 27,
+        23, 20, 19, 18, 16, 15, 14, 13, 12, 12, 12, 11, 23, 25, 24, 24, 20, 18,
+        16, 15, 14, 13, 12, 11, 11, 10, 10, 10, 18, 19, 19, 20, 17, 15, 14, 13,
+        11, 11, 10, 9, 9, 9, 8, 9, 13, 14, 14, 15, 14, 12, 11, 11, 9, 9, 8, 8,
+        7, 8, 7, 7, 12, 13, 13, 13, 13, 12, 11, 10, 9, 8, 8, 7, 7, 7, 6, 6, 11,
+        12, 12, 12, 12, 11, 11, 10, 9, 8, 8, 7, 7, 6, 6, 6,
+        /* Size 16x32 */
+        32, 33, 32, 32, 28, 26, 23, 19, 18, 16, 13, 13, 12, 11, 11, 11, 33, 32,
+        32, 32, 29, 27, 24, 20, 19, 17, 14, 13, 12, 12, 12, 11, 33, 32, 32, 32,
+        29, 27, 25, 20, 19, 17, 14, 14, 13, 12, 12, 11, 33, 32, 32, 31, 30, 28,
+        25, 21, 19, 17, 14, 14, 13, 12, 12, 12, 32, 32, 31, 30, 28, 26, 24, 20,
+        19, 17, 14, 14, 13, 13, 12, 12, 32, 32, 30, 30, 28, 26, 24, 21, 19, 18,
+        15, 14, 13, 13, 12, 12, 32, 31, 30, 29, 27, 26, 24, 21, 20, 18, 15, 15,
+        13, 13, 12, 12, 30, 30, 29, 28, 24, 23, 21, 19, 18, 16, 14, 14, 13, 13,
+        13, 12, 30, 30, 28, 28, 23, 22, 20, 18, 17, 16, 14, 13, 13, 12, 12, 12,
+        28, 30, 28, 27, 21, 20, 19, 17, 16, 15, 13, 13, 12, 12, 12, 12, 26, 28,
+        26, 26, 20, 19, 18, 16, 15, 14, 12, 12, 12, 12, 11, 12, 26, 27, 26, 25,
+        20, 19, 17, 15, 15, 14, 12, 12, 11, 11, 11, 11, 23, 25, 24, 24, 19, 18,
+        16, 14, 14, 13, 11, 11, 11, 11, 11, 11, 22, 23, 23, 22, 18, 17, 16, 14,
+        13, 12, 11, 11, 10, 10, 10, 10, 21, 22, 22, 22, 18, 17, 15, 13, 13, 12,
+        11, 10, 10, 10, 10, 10, 19, 21, 20, 20, 17, 16, 14, 12, 12, 11, 10, 10,
+        9, 9, 10, 9, 18, 19, 19, 19, 16, 15, 14, 12, 11, 11, 9, 9, 9, 9, 9, 9,
+        17, 19, 19, 19, 16, 15, 14, 12, 11, 10, 9, 9, 9, 9, 9, 9, 16, 17, 17,
+        18, 15, 14, 13, 11, 11, 10, 9, 9, 8, 8, 8, 9, 15, 16, 17, 17, 14, 13,
+        12, 11, 10, 9, 8, 8, 8, 8, 8, 8, 14, 16, 16, 16, 14, 13, 12, 11, 10, 9,
+        8, 8, 8, 8, 8, 8, 13, 14, 14, 15, 13, 12, 11, 10, 9, 9, 8, 8, 7, 8, 8,
+        7, 13, 14, 14, 14, 13, 12, 11, 10, 9, 9, 8, 7, 7, 7, 7, 7, 12, 14, 14,
+        14, 13, 12, 11, 10, 9, 8, 8, 7, 7, 7, 7, 7, 12, 13, 13, 13, 12, 11, 11,
+        9, 9, 8, 7, 7, 7, 7, 7, 7, 11, 12, 13, 13, 12, 12, 10, 9, 9, 8, 8, 7, 7,
+        7, 6, 6, 11, 12, 12, 13, 12, 11, 10, 10, 9, 8, 8, 7, 7, 6, 6, 6, 11, 12,
+        12, 12, 12, 11, 10, 10, 9, 8, 7, 7, 7, 6, 6, 6, 10, 12, 12, 12, 12, 11,
+        10, 9, 8, 8, 7, 7, 6, 6, 6, 6, 10, 11, 11, 12, 11, 10, 10, 9, 9, 8, 7,
+        7, 6, 6, 6, 6, 10, 11, 11, 11, 11, 10, 10, 9, 9, 8, 7, 7, 6, 6, 6, 6,
+        10, 11, 11, 11, 11, 10, 10, 9, 9, 8, 8, 7, 7, 6, 6, 5,
+        /* Size 32x16 */
+        32, 33, 33, 33, 32, 32, 32, 30, 30, 28, 26, 26, 23, 22, 21, 19, 18, 17,
+        16, 15, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 33, 32, 32, 32,
+        32, 32, 31, 30, 30, 30, 28, 27, 25, 23, 22, 21, 19, 19, 17, 16, 16, 14,
+        14, 14, 13, 12, 12, 12, 12, 11, 11, 11, 32, 32, 32, 32, 31, 30, 30, 29,
+        28, 28, 26, 26, 24, 23, 22, 20, 19, 19, 17, 17, 16, 14, 14, 14, 13, 13,
+        12, 12, 12, 11, 11, 11, 32, 32, 32, 31, 30, 30, 29, 28, 28, 27, 26, 25,
+        24, 22, 22, 20, 19, 19, 18, 17, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12,
+        11, 11, 28, 29, 29, 30, 28, 28, 27, 24, 23, 21, 20, 20, 19, 18, 18, 17,
+        16, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 12, 11, 11, 11, 26, 27,
+        27, 28, 26, 26, 26, 23, 22, 20, 19, 19, 18, 17, 17, 16, 15, 15, 14, 13,
+        13, 12, 12, 12, 11, 12, 11, 11, 11, 10, 10, 10, 23, 24, 25, 25, 24, 24,
+        24, 21, 20, 19, 18, 17, 16, 16, 15, 14, 14, 14, 13, 12, 12, 11, 11, 11,
+        11, 10, 10, 10, 10, 10, 10, 10, 19, 20, 20, 21, 20, 21, 21, 19, 18, 17,
+        16, 15, 14, 14, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 10, 10, 9,
+        9, 9, 9, 18, 19, 19, 19, 19, 19, 20, 18, 17, 16, 15, 15, 14, 13, 13, 12,
+        11, 11, 11, 10, 10, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 16, 17, 17, 17, 17,
+        18, 18, 16, 16, 15, 14, 14, 13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 9, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 13, 14, 14, 14, 14, 15, 15, 14, 14, 13, 12, 12,
+        11, 11, 11, 10, 9, 9, 9, 8, 8, 8, 8, 8, 7, 8, 8, 7, 7, 7, 7, 8, 13, 13,
+        14, 14, 14, 14, 15, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 8, 8,
+        8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 12, 12, 13, 13, 13, 13, 13, 13, 13, 12,
+        12, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7,
+        11, 12, 12, 12, 13, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10, 9, 9, 9, 8,
+        8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 11, 12, 12, 12, 12, 12, 12, 13,
+        12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 6, 6, 6, 6,
+        6, 6, 6, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 11, 11, 10, 10, 9,
+        9, 9, 9, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 5,
+        /* Size 4x16 */
+        33, 26, 16, 11, 32, 27, 17, 12, 32, 26, 17, 13, 31, 26, 18, 13, 30, 22,
+        16, 12, 28, 19, 14, 12, 25, 18, 13, 11, 22, 17, 12, 10, 19, 15, 11, 9,
+        17, 14, 10, 8, 16, 13, 9, 8, 14, 12, 9, 7, 13, 11, 8, 7, 12, 11, 8, 6,
+        12, 11, 8, 6, 11, 10, 8, 6,
+        /* Size 16x4 */
+        33, 32, 32, 31, 30, 28, 25, 22, 19, 17, 16, 14, 13, 12, 12, 11, 26, 27,
+        26, 26, 22, 19, 18, 17, 15, 14, 13, 12, 11, 11, 11, 10, 16, 17, 17, 18,
+        16, 14, 13, 12, 11, 10, 9, 9, 8, 8, 8, 8, 11, 12, 13, 13, 12, 12, 11,
+        10, 9, 8, 8, 7, 7, 6, 6, 6,
+        /* Size 8x32 */
+        32, 32, 28, 23, 18, 13, 12, 11, 33, 32, 29, 24, 19, 14, 12, 12, 33, 32,
+        29, 25, 19, 14, 13, 12, 33, 32, 30, 25, 19, 14, 13, 12, 32, 31, 28, 24,
+        19, 14, 13, 12, 32, 30, 28, 24, 19, 15, 13, 12, 32, 30, 27, 24, 20, 15,
+        13, 12, 30, 29, 24, 21, 18, 14, 13, 13, 30, 28, 23, 20, 17, 14, 13, 12,
+        28, 28, 21, 19, 16, 13, 12, 12, 26, 26, 20, 18, 15, 12, 12, 11, 26, 26,
+        20, 17, 15, 12, 11, 11, 23, 24, 19, 16, 14, 11, 11, 11, 22, 23, 18, 16,
+        13, 11, 10, 10, 21, 22, 18, 15, 13, 11, 10, 10, 19, 20, 17, 14, 12, 10,
+        9, 10, 18, 19, 16, 14, 11, 9, 9, 9, 17, 19, 16, 14, 11, 9, 9, 9, 16, 17,
+        15, 13, 11, 9, 8, 8, 15, 17, 14, 12, 10, 8, 8, 8, 14, 16, 14, 12, 10, 8,
+        8, 8, 13, 14, 13, 11, 9, 8, 7, 8, 13, 14, 13, 11, 9, 8, 7, 7, 12, 14,
+        13, 11, 9, 8, 7, 7, 12, 13, 12, 11, 9, 7, 7, 7, 11, 13, 12, 10, 9, 8, 7,
+        6, 11, 12, 12, 10, 9, 8, 7, 6, 11, 12, 12, 10, 9, 7, 7, 6, 10, 12, 12,
+        10, 8, 7, 6, 6, 10, 11, 11, 10, 9, 7, 6, 6, 10, 11, 11, 10, 9, 7, 6, 6,
+        10, 11, 11, 10, 9, 8, 7, 6,
+        /* Size 32x8 */
+        32, 33, 33, 33, 32, 32, 32, 30, 30, 28, 26, 26, 23, 22, 21, 19, 18, 17,
+        16, 15, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 32, 32, 32, 32,
+        31, 30, 30, 29, 28, 28, 26, 26, 24, 23, 22, 20, 19, 19, 17, 17, 16, 14,
+        14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 28, 29, 29, 30, 28, 28, 27, 24,
+        23, 21, 20, 20, 19, 18, 18, 17, 16, 16, 15, 14, 14, 13, 13, 13, 12, 12,
+        12, 12, 12, 11, 11, 11, 23, 24, 25, 25, 24, 24, 24, 21, 20, 19, 18, 17,
+        16, 16, 15, 14, 14, 14, 13, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10,
+        10, 10, 18, 19, 19, 19, 19, 19, 20, 18, 17, 16, 15, 15, 14, 13, 13, 12,
+        11, 11, 11, 10, 10, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 13, 14, 14, 14, 14,
+        15, 15, 14, 14, 13, 12, 12, 11, 11, 11, 10, 9, 9, 9, 8, 8, 8, 8, 8, 7,
+        8, 8, 7, 7, 7, 7, 8, 12, 12, 13, 13, 13, 13, 13, 13, 13, 12, 12, 11, 11,
+        10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 11, 12, 12,
+        12, 12, 12, 12, 13, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7,
+        7, 7, 6, 6, 6, 6, 6, 6, 6 },
+      { /* Chroma */
+        /* Size 4x4 */
+        32, 23, 19, 16, 23, 19, 17, 15, 19, 17, 13, 12, 16, 15, 12, 10,
+        /* Size 8x8 */
+        33, 28, 22, 21, 20, 17, 16, 15, 28, 24, 22, 22, 21, 19, 17, 16, 22, 22,
+        19, 19, 19, 17, 16, 16, 21, 22, 19, 17, 16, 15, 14, 14, 20, 21, 19, 16,
+        14, 13, 13, 13, 17, 19, 17, 15, 13, 12, 12, 12, 16, 17, 16, 14, 13, 12,
+        11, 10, 15, 16, 16, 14, 13, 12, 10, 10,
+        /* Size 16x16 */
+        32, 34, 31, 28, 23, 21, 21, 20, 19, 18, 17, 16, 15, 15, 15, 14, 34, 33,
+        29, 26, 23, 22, 22, 22, 20, 19, 19, 17, 17, 16, 16, 15, 31, 29, 26, 24,
+        22, 22, 23, 22, 21, 20, 19, 18, 17, 17, 16, 16, 28, 26, 24, 22, 22, 22,
+        23, 22, 21, 20, 20, 19, 18, 18, 17, 16, 23, 23, 22, 22, 20, 20, 20, 20,
+        19, 19, 18, 17, 17, 17, 16, 17, 21, 22, 22, 22, 20, 19, 19, 18, 18, 17,
+        17, 16, 16, 16, 16, 16, 21, 22, 23, 23, 20, 19, 18, 17, 17, 16, 16, 15,
+        15, 15, 15, 15, 20, 22, 22, 22, 20, 18, 17, 17, 16, 15, 15, 14, 14, 14,
+        14, 14, 19, 20, 21, 21, 19, 18, 17, 16, 15, 14, 14, 13, 13, 13, 13, 13,
+        18, 19, 20, 20, 19, 17, 16, 15, 14, 13, 13, 12, 12, 12, 12, 12, 17, 19,
+        19, 20, 18, 17, 16, 15, 14, 13, 12, 12, 12, 12, 12, 12, 16, 17, 18, 19,
+        17, 16, 15, 14, 13, 12, 12, 11, 11, 11, 11, 11, 15, 17, 17, 18, 17, 16,
+        15, 14, 13, 12, 12, 11, 11, 11, 11, 11, 15, 16, 17, 18, 17, 16, 15, 14,
+        13, 12, 12, 11, 11, 10, 10, 10, 15, 16, 16, 17, 16, 16, 15, 14, 13, 12,
+        12, 11, 11, 10, 10, 10, 14, 15, 16, 16, 17, 16, 15, 14, 13, 12, 12, 11,
+        11, 10, 10, 10,
+        /* Size 32x32 */
+        32, 33, 34, 34, 31, 29, 28, 25, 23, 21, 21, 21, 21, 20, 20, 20, 19, 19,
+        18, 17, 17, 16, 16, 16, 15, 15, 15, 15, 15, 14, 14, 14, 33, 33, 33, 33,
+        30, 28, 27, 24, 23, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 18, 18, 17,
+        17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 34, 33, 33, 33, 29, 28, 26, 24,
+        23, 22, 22, 22, 22, 22, 22, 21, 20, 20, 19, 19, 19, 18, 17, 17, 17, 16,
+        16, 16, 16, 15, 15, 15, 34, 33, 33, 32, 29, 28, 26, 24, 23, 22, 23, 23,
+        23, 22, 22, 22, 21, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16,
+        16, 16, 31, 30, 29, 29, 26, 25, 24, 23, 22, 22, 22, 22, 23, 22, 22, 22,
+        21, 21, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 29, 28,
+        28, 28, 25, 24, 23, 22, 22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20,
+        19, 19, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 28, 27, 26, 26, 24, 23,
+        22, 22, 22, 21, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 19,
+        18, 18, 18, 17, 17, 17, 16, 16, 25, 24, 24, 24, 23, 22, 22, 21, 21, 20,
+        21, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17,
+        17, 17, 17, 17, 23, 23, 23, 23, 22, 22, 22, 21, 20, 20, 20, 20, 20, 20,
+        20, 20, 19, 19, 19, 18, 18, 17, 17, 17, 17, 17, 17, 17, 16, 17, 17, 17,
+        21, 22, 22, 22, 22, 22, 21, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        18, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16, 21, 22, 22, 23,
+        22, 22, 22, 21, 20, 19, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 16,
+        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 21, 22, 22, 23, 22, 22, 22, 21,
+        20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 16, 15,
+        15, 15, 15, 15, 15, 15, 21, 22, 22, 23, 23, 23, 23, 21, 20, 19, 19, 18,
+        18, 17, 17, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+        15, 15, 20, 21, 22, 22, 22, 22, 22, 20, 20, 19, 18, 18, 17, 17, 17, 16,
+        16, 16, 16, 15, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 20, 21,
+        22, 22, 22, 22, 22, 20, 20, 19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15,
+        15, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 20, 20, 21, 22, 22, 22,
+        22, 20, 20, 19, 18, 18, 17, 16, 16, 16, 15, 15, 15, 14, 14, 14, 14, 14,
+        13, 13, 14, 13, 13, 14, 14, 13, 19, 20, 20, 21, 21, 21, 21, 20, 19, 19,
+        18, 17, 17, 16, 16, 15, 15, 15, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13,
+        13, 13, 13, 13, 19, 20, 20, 20, 21, 21, 21, 20, 19, 19, 17, 17, 17, 16,
+        16, 15, 15, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+        18, 19, 19, 20, 20, 20, 20, 19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14,
+        13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 17, 18, 19, 19,
+        19, 20, 20, 19, 18, 18, 17, 17, 16, 15, 15, 14, 14, 14, 13, 13, 13, 12,
+        12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 17, 18, 19, 19, 19, 19, 20, 19,
+        18, 18, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 12, 12,
+        12, 12, 12, 12, 12, 12, 16, 17, 18, 18, 18, 19, 19, 18, 17, 17, 16, 16,
+        15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 12, 11, 11, 12, 11, 12, 11, 12,
+        12, 12, 16, 17, 17, 18, 18, 18, 19, 18, 17, 17, 16, 16, 15, 14, 14, 14,
+        13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16, 17,
+        17, 18, 18, 18, 19, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12,
+        12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 15, 16, 17, 17, 17, 18,
+        18, 17, 17, 16, 16, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17, 18, 17, 17, 16,
+        16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 10,
+        10, 10, 11, 10, 15, 16, 16, 17, 17, 17, 18, 17, 17, 16, 16, 15, 15, 14,
+        14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10,
+        15, 16, 16, 16, 17, 17, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13,
+        12, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 15, 15, 16, 16,
+        16, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11,
+        11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 14, 15, 15, 16, 16, 16, 17, 17,
+        17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10,
+        10, 10, 10, 10, 10, 10, 14, 15, 15, 16, 16, 16, 16, 17, 17, 16, 16, 15,
+        15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10,
+        10, 10, 14, 15, 15, 16, 16, 16, 16, 17, 17, 16, 16, 15, 15, 14, 14, 13,
+        13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 9,
+        /* Size 4x8 */
+        33, 22, 19, 16, 27, 22, 20, 17, 22, 19, 18, 17, 22, 18, 16, 14, 20, 17,
+        14, 13, 18, 16, 12, 12, 17, 16, 12, 11, 16, 15, 12, 10,
+        /* Size 8x4 */
+        33, 27, 22, 22, 20, 18, 17, 16, 22, 22, 19, 18, 17, 16, 16, 15, 19, 20,
+        18, 16, 14, 12, 12, 12, 16, 17, 17, 14, 13, 12, 11, 10,
+        /* Size 8x16 */
+        32, 30, 21, 21, 19, 16, 15, 15, 33, 28, 22, 22, 20, 18, 17, 16, 31, 26,
+        22, 22, 21, 18, 17, 17, 28, 23, 22, 23, 21, 19, 18, 17, 23, 22, 20, 20,
+        19, 17, 17, 17, 21, 22, 19, 18, 18, 16, 16, 16, 21, 23, 19, 18, 17, 15,
+        15, 15, 20, 22, 19, 17, 16, 14, 14, 14, 19, 21, 19, 17, 15, 13, 13, 13,
+        18, 20, 18, 16, 14, 12, 12, 13, 17, 19, 18, 16, 14, 12, 12, 12, 16, 18,
+        17, 15, 13, 12, 11, 12, 16, 17, 16, 15, 13, 11, 11, 11, 15, 17, 16, 14,
+        13, 12, 11, 10, 15, 16, 16, 15, 13, 12, 11, 10, 14, 16, 16, 15, 13, 12,
+        11, 10,
+        /* Size 16x8 */
+        32, 33, 31, 28, 23, 21, 21, 20, 19, 18, 17, 16, 16, 15, 15, 14, 30, 28,
+        26, 23, 22, 22, 23, 22, 21, 20, 19, 18, 17, 17, 16, 16, 21, 22, 22, 22,
+        20, 19, 19, 19, 19, 18, 18, 17, 16, 16, 16, 16, 21, 22, 22, 23, 20, 18,
+        18, 17, 17, 16, 16, 15, 15, 14, 15, 15, 19, 20, 21, 21, 19, 18, 17, 16,
+        15, 14, 14, 13, 13, 13, 13, 13, 16, 18, 18, 19, 17, 16, 15, 14, 13, 12,
+        12, 12, 11, 12, 12, 12, 15, 17, 17, 18, 17, 16, 15, 14, 13, 12, 12, 11,
+        11, 11, 11, 11, 15, 16, 17, 17, 17, 16, 15, 14, 13, 13, 12, 12, 11, 10,
+        10, 10,
+        /* Size 16x32 */
+        32, 33, 30, 28, 21, 21, 21, 20, 19, 18, 16, 16, 15, 15, 15, 15, 33, 33,
+        29, 27, 22, 22, 22, 20, 20, 19, 17, 17, 16, 16, 16, 16, 33, 32, 28, 26,
+        22, 22, 22, 21, 20, 19, 18, 17, 17, 16, 16, 16, 34, 32, 28, 26, 22, 23,
+        23, 21, 21, 20, 18, 18, 17, 17, 17, 16, 31, 28, 26, 24, 22, 22, 22, 22,
+        21, 20, 18, 18, 17, 17, 17, 16, 29, 27, 24, 23, 22, 22, 23, 22, 21, 20,
+        19, 18, 18, 17, 17, 17, 28, 26, 23, 22, 22, 22, 23, 22, 21, 20, 19, 19,
+        18, 18, 17, 17, 24, 24, 23, 22, 20, 20, 21, 20, 20, 19, 18, 18, 17, 18,
+        17, 17, 23, 23, 22, 22, 20, 20, 20, 20, 19, 19, 17, 17, 17, 17, 17, 17,
+        21, 22, 22, 21, 19, 19, 19, 19, 19, 18, 17, 17, 16, 17, 17, 16, 21, 22,
+        22, 22, 19, 19, 18, 18, 18, 17, 16, 16, 16, 16, 16, 16, 21, 23, 22, 22,
+        19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 16, 16, 21, 23, 23, 22, 19, 18,
+        18, 17, 17, 16, 15, 15, 15, 15, 15, 16, 20, 22, 22, 22, 19, 18, 17, 16,
+        16, 16, 15, 14, 15, 14, 15, 15, 20, 22, 22, 22, 19, 18, 17, 16, 16, 15,
+        14, 14, 14, 14, 14, 15, 20, 21, 22, 22, 19, 18, 17, 16, 15, 14, 14, 14,
+        13, 14, 14, 14, 19, 21, 21, 21, 19, 18, 17, 15, 15, 14, 13, 13, 13, 13,
+        13, 14, 19, 20, 21, 21, 19, 17, 17, 15, 15, 14, 13, 13, 13, 13, 13, 13,
+        18, 20, 20, 20, 18, 17, 16, 15, 14, 13, 12, 12, 12, 12, 13, 13, 17, 19,
+        20, 20, 18, 17, 16, 14, 14, 13, 12, 12, 12, 12, 12, 12, 17, 19, 19, 20,
+        18, 17, 16, 14, 14, 13, 12, 12, 12, 12, 12, 12, 16, 18, 18, 19, 17, 16,
+        15, 14, 13, 12, 12, 11, 11, 12, 12, 12, 16, 18, 18, 19, 17, 16, 15, 14,
+        13, 12, 12, 11, 11, 11, 12, 12, 16, 17, 18, 18, 17, 16, 15, 14, 13, 12,
+        11, 11, 11, 11, 11, 11, 16, 17, 17, 18, 16, 16, 15, 13, 13, 12, 11, 11,
+        11, 11, 11, 11, 15, 17, 17, 18, 16, 16, 15, 14, 13, 12, 12, 11, 11, 11,
+        11, 11, 15, 17, 17, 17, 16, 16, 14, 14, 13, 12, 12, 11, 11, 11, 10, 11,
+        15, 16, 17, 17, 16, 16, 14, 14, 13, 12, 12, 11, 11, 10, 10, 10, 15, 16,
+        16, 17, 16, 16, 15, 14, 13, 13, 12, 11, 11, 10, 10, 10, 14, 16, 16, 17,
+        16, 15, 15, 14, 13, 12, 12, 11, 11, 10, 10, 10, 14, 16, 16, 17, 16, 15,
+        15, 14, 13, 12, 12, 11, 11, 10, 10, 10, 14, 16, 16, 16, 16, 15, 15, 13,
+        13, 12, 12, 11, 11, 10, 10, 10,
+        /* Size 32x16 */
+        32, 33, 33, 34, 31, 29, 28, 24, 23, 21, 21, 21, 21, 20, 20, 20, 19, 19,
+        18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 33, 33, 32, 32,
+        28, 27, 26, 24, 23, 22, 22, 23, 23, 22, 22, 21, 21, 20, 20, 19, 19, 18,
+        18, 17, 17, 17, 17, 16, 16, 16, 16, 16, 30, 29, 28, 28, 26, 24, 23, 23,
+        22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20, 19, 18, 18, 18, 17, 17,
+        17, 17, 16, 16, 16, 16, 28, 27, 26, 26, 24, 23, 22, 22, 22, 21, 22, 22,
+        22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17,
+        17, 16, 21, 22, 22, 22, 22, 22, 22, 20, 20, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16, 21, 22,
+        22, 23, 22, 22, 22, 20, 20, 19, 19, 19, 18, 18, 18, 18, 18, 17, 17, 17,
+        17, 16, 16, 16, 16, 16, 16, 16, 16, 15, 15, 15, 21, 22, 22, 23, 22, 23,
+        23, 21, 20, 19, 18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 15, 15, 15,
+        15, 15, 14, 14, 15, 15, 15, 15, 20, 20, 21, 21, 22, 22, 22, 20, 20, 19,
+        18, 18, 17, 16, 16, 16, 15, 15, 15, 14, 14, 14, 14, 14, 13, 14, 14, 14,
+        14, 14, 14, 13, 19, 20, 20, 21, 21, 21, 21, 20, 19, 19, 18, 17, 17, 16,
+        16, 15, 15, 15, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+        18, 19, 19, 20, 20, 20, 20, 19, 19, 18, 17, 17, 16, 16, 15, 14, 14, 14,
+        13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 13, 12, 12, 12, 16, 17, 18, 18,
+        18, 19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12,
+        12, 11, 11, 12, 12, 12, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18, 19, 18,
+        17, 17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11,
+        11, 11, 11, 11, 11, 11, 15, 16, 17, 17, 17, 18, 18, 17, 17, 16, 16, 16,
+        15, 15, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+        11, 11, 15, 16, 16, 17, 17, 17, 18, 18, 17, 17, 16, 16, 15, 14, 14, 14,
+        13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 15, 16,
+        16, 17, 17, 17, 17, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12,
+        12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 15, 16, 16, 16, 16, 17,
+        17, 17, 17, 16, 16, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11,
+        11, 11, 11, 10, 10, 10, 10, 10,
+        /* Size 4x16 */
+        33, 21, 18, 15, 32, 22, 19, 16, 28, 22, 20, 17, 26, 22, 20, 18, 23, 20,
+        19, 17, 22, 19, 17, 16, 23, 18, 16, 15, 22, 18, 15, 14, 21, 18, 14, 13,
+        20, 17, 13, 12, 19, 17, 13, 12, 18, 16, 12, 11, 17, 16, 12, 11, 17, 16,
+        12, 11, 16, 16, 13, 10, 16, 15, 12, 10,
+        /* Size 16x4 */
+        33, 32, 28, 26, 23, 22, 23, 22, 21, 20, 19, 18, 17, 17, 16, 16, 21, 22,
+        22, 22, 20, 19, 18, 18, 18, 17, 17, 16, 16, 16, 16, 15, 18, 19, 20, 20,
+        19, 17, 16, 15, 14, 13, 13, 12, 12, 12, 13, 12, 15, 16, 17, 18, 17, 16,
+        15, 14, 13, 12, 12, 11, 11, 11, 10, 10,
+        /* Size 8x32 */
+        32, 30, 21, 21, 19, 16, 15, 15, 33, 29, 22, 22, 20, 17, 16, 16, 33, 28,
+        22, 22, 20, 18, 17, 16, 34, 28, 22, 23, 21, 18, 17, 17, 31, 26, 22, 22,
+        21, 18, 17, 17, 29, 24, 22, 23, 21, 19, 18, 17, 28, 23, 22, 23, 21, 19,
+        18, 17, 24, 23, 20, 21, 20, 18, 17, 17, 23, 22, 20, 20, 19, 17, 17, 17,
+        21, 22, 19, 19, 19, 17, 16, 17, 21, 22, 19, 18, 18, 16, 16, 16, 21, 22,
+        19, 18, 17, 16, 16, 16, 21, 23, 19, 18, 17, 15, 15, 15, 20, 22, 19, 17,
+        16, 15, 15, 15, 20, 22, 19, 17, 16, 14, 14, 14, 20, 22, 19, 17, 15, 14,
+        13, 14, 19, 21, 19, 17, 15, 13, 13, 13, 19, 21, 19, 17, 15, 13, 13, 13,
+        18, 20, 18, 16, 14, 12, 12, 13, 17, 20, 18, 16, 14, 12, 12, 12, 17, 19,
+        18, 16, 14, 12, 12, 12, 16, 18, 17, 15, 13, 12, 11, 12, 16, 18, 17, 15,
+        13, 12, 11, 12, 16, 18, 17, 15, 13, 11, 11, 11, 16, 17, 16, 15, 13, 11,
+        11, 11, 15, 17, 16, 15, 13, 12, 11, 11, 15, 17, 16, 14, 13, 12, 11, 10,
+        15, 17, 16, 14, 13, 12, 11, 10, 15, 16, 16, 15, 13, 12, 11, 10, 14, 16,
+        16, 15, 13, 12, 11, 10, 14, 16, 16, 15, 13, 12, 11, 10, 14, 16, 16, 15,
+        13, 12, 11, 10,
+        /* Size 32x8 */
+        32, 33, 33, 34, 31, 29, 28, 24, 23, 21, 21, 21, 21, 20, 20, 20, 19, 19,
+        18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 30, 29, 28, 28,
+        26, 24, 23, 23, 22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20, 19, 18,
+        18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 21, 22, 22, 22, 22, 22, 22, 20,
+        20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16,
+        16, 16, 16, 16, 16, 16, 21, 22, 22, 23, 22, 23, 23, 21, 20, 19, 18, 18,
+        18, 17, 17, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15, 15, 14, 14, 15, 15,
+        15, 15, 19, 20, 20, 21, 21, 21, 21, 20, 19, 19, 18, 17, 17, 16, 16, 15,
+        15, 15, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 16, 17,
+        18, 18, 18, 19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12,
+        12, 12, 12, 11, 11, 12, 12, 12, 12, 12, 12, 12, 15, 16, 17, 17, 17, 18,
+        18, 17, 17, 16, 16, 16, 15, 15, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17, 17, 17, 17, 17,
+        16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10,
+        10, 10, 10, 10 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 28, 18, 13, 28, 19, 14, 11, 18, 14, 10, 8, 13, 11, 8, 7,
+        /* Size 8x8 */
+        32, 32, 29, 24, 19, 15, 13, 11, 32, 31, 28, 24, 20, 16, 14, 12, 29, 28,
+        22, 20, 17, 14, 13, 12, 24, 24, 20, 16, 14, 12, 11, 10, 19, 20, 17, 14,
+        12, 10, 9, 9, 15, 16, 14, 12, 10, 9, 8, 8, 13, 14, 13, 11, 9, 8, 7, 7,
+        11, 12, 12, 10, 9, 8, 7, 6,
+        /* Size 16x16 */
+        32, 33, 33, 32, 30, 28, 25, 22, 19, 17, 16, 14, 12, 12, 11, 11, 33, 32,
+        32, 32, 30, 29, 26, 23, 20, 19, 17, 15, 13, 13, 12, 11, 33, 32, 31, 31,
+        29, 28, 26, 23, 21, 19, 17, 15, 14, 13, 12, 12, 32, 32, 31, 29, 28, 27,
+        25, 23, 21, 19, 18, 16, 14, 14, 13, 12, 30, 30, 29, 28, 26, 24, 22, 20,
+        19, 18, 16, 15, 13, 13, 12, 12, 28, 29, 28, 27, 24, 21, 20, 18, 17, 16,
+        15, 14, 13, 12, 11, 11, 25, 26, 26, 25, 22, 20, 18, 17, 15, 14, 14, 12,
+        12, 11, 11, 11, 22, 23, 23, 23, 20, 18, 17, 15, 14, 13, 12, 11, 11, 10,
+        10, 10, 19, 20, 21, 21, 19, 17, 15, 14, 12, 12, 11, 10, 10, 9, 9, 9, 17,
+        19, 19, 19, 18, 16, 14, 13, 12, 11, 10, 10, 9, 9, 9, 8, 16, 17, 17, 18,
+        16, 15, 14, 12, 11, 10, 10, 9, 9, 8, 8, 8, 14, 15, 15, 16, 15, 14, 12,
+        11, 10, 10, 9, 8, 8, 8, 7, 7, 12, 13, 14, 14, 13, 13, 12, 11, 10, 9, 9,
+        8, 7, 7, 7, 7, 12, 13, 13, 14, 13, 12, 11, 10, 9, 9, 8, 8, 7, 7, 7, 6,
+        11, 12, 12, 13, 12, 11, 11, 10, 9, 9, 8, 7, 7, 7, 6, 6, 11, 11, 12, 12,
+        12, 11, 11, 10, 9, 8, 8, 7, 7, 6, 6, 6,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 32, 32, 30, 29, 28, 26, 25, 23, 22, 21, 19, 18,
+        17, 16, 16, 14, 14, 13, 12, 12, 12, 11, 11, 11, 11, 10, 33, 32, 32, 32,
+        32, 32, 32, 31, 30, 29, 29, 27, 26, 24, 23, 22, 20, 19, 18, 17, 17, 15,
+        14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 33, 32, 32, 32, 32, 32, 32, 31,
+        30, 30, 29, 27, 26, 24, 23, 23, 20, 20, 19, 17, 17, 15, 15, 14, 13, 13,
+        13, 12, 12, 12, 11, 11, 33, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 28,
+        27, 25, 23, 23, 21, 20, 19, 18, 17, 16, 15, 14, 14, 14, 13, 13, 12, 12,
+        12, 11, 33, 32, 32, 32, 31, 31, 31, 30, 29, 28, 28, 26, 26, 24, 23, 23,
+        21, 20, 19, 18, 17, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 11, 33, 32,
+        32, 32, 31, 31, 30, 30, 29, 28, 28, 26, 26, 24, 23, 23, 20, 20, 19, 18,
+        17, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 32, 32, 32, 32, 31, 30,
+        29, 28, 28, 27, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 18, 16, 16, 15,
+        14, 14, 14, 13, 13, 12, 12, 12, 32, 31, 31, 31, 30, 30, 28, 28, 27, 26,
+        26, 24, 24, 23, 22, 22, 20, 19, 19, 17, 17, 16, 15, 14, 14, 14, 13, 13,
+        13, 12, 12, 12, 30, 30, 30, 31, 29, 29, 28, 27, 26, 24, 24, 23, 22, 22,
+        20, 20, 19, 18, 18, 17, 16, 15, 15, 14, 13, 13, 13, 12, 12, 12, 12, 12,
+        29, 29, 30, 30, 28, 28, 27, 26, 24, 22, 22, 21, 20, 20, 19, 19, 17, 17,
+        17, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 28, 29, 29, 30,
+        28, 28, 27, 26, 24, 22, 21, 20, 20, 19, 18, 18, 17, 17, 16, 15, 15, 14,
+        14, 13, 13, 13, 12, 12, 11, 11, 11, 11, 26, 27, 27, 28, 26, 26, 26, 24,
+        23, 21, 20, 19, 19, 18, 17, 17, 16, 16, 15, 14, 14, 13, 13, 12, 12, 12,
+        11, 11, 11, 11, 11, 11, 25, 26, 26, 27, 26, 26, 25, 24, 22, 20, 20, 19,
+        18, 17, 17, 16, 15, 15, 14, 14, 14, 13, 12, 12, 12, 12, 11, 11, 11, 11,
+        11, 10, 23, 24, 24, 25, 24, 24, 24, 23, 22, 20, 19, 18, 17, 16, 16, 15,
+        14, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10, 22, 23,
+        23, 23, 23, 23, 23, 22, 20, 19, 18, 17, 17, 16, 15, 15, 14, 13, 13, 12,
+        12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 21, 22, 23, 23, 23, 23,
+        22, 22, 20, 19, 18, 17, 16, 15, 15, 14, 13, 13, 13, 12, 12, 11, 11, 11,
+        10, 10, 10, 10, 10, 10, 9, 9, 19, 20, 20, 21, 21, 20, 21, 20, 19, 17,
+        17, 16, 15, 14, 14, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9,
+        9, 9, 9, 18, 19, 20, 20, 20, 20, 20, 19, 18, 17, 17, 16, 15, 14, 13, 13,
+        12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 17, 18, 19, 19,
+        19, 19, 19, 19, 18, 17, 16, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10,
+        10, 9, 9, 9, 9, 9, 9, 8, 8, 9, 16, 17, 17, 18, 18, 18, 18, 17, 17, 16,
+        15, 14, 14, 13, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 9, 9, 8, 8, 8, 8,
+        8, 8, 16, 17, 17, 17, 17, 17, 18, 17, 16, 15, 15, 14, 14, 13, 12, 12,
+        11, 11, 10, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 14, 15, 15, 16, 16,
+        16, 16, 16, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 9, 8,
+        8, 8, 8, 8, 8, 8, 8, 7, 14, 14, 15, 15, 15, 15, 16, 15, 15, 14, 14, 13,
+        12, 12, 11, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 13,
+        13, 14, 14, 14, 14, 15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 9,
+        9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 12, 13, 13, 14, 14, 14, 14, 14,
+        13, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7,
+        7, 7, 7, 12, 13, 13, 14, 14, 14, 14, 14, 13, 13, 13, 12, 12, 11, 11, 10,
+        10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 12, 12, 13, 13, 13, 13,
+        14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7,
+        7, 7, 6, 6, 6, 11, 12, 12, 13, 13, 13, 13, 13, 12, 12, 12, 11, 11, 10,
+        10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 11, 12, 12, 12,
+        12, 12, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7,
+        7, 7, 7, 7, 6, 6, 6, 6, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 11, 11,
+        11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 11, 11,
+        11, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 8,
+        7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 10, 11, 11, 11, 11, 12, 12, 12, 12, 11,
+        11, 11, 10, 10, 10, 9, 9, 9, 9, 8, 8, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6,
+        /* Size 4x8 */
+        32, 29, 17, 12, 32, 28, 18, 13, 30, 22, 16, 12, 25, 19, 13, 11, 20, 17,
+        11, 9, 16, 14, 9, 8, 14, 13, 9, 7, 12, 11, 9, 7,
+        /* Size 8x4 */
+        32, 32, 30, 25, 20, 16, 14, 12, 29, 28, 22, 19, 17, 14, 13, 11, 17, 18,
+        16, 13, 11, 9, 9, 9, 12, 13, 12, 11, 9, 8, 7, 7,
+        /* Size 8x16 */
+        32, 33, 29, 23, 19, 16, 12, 11, 33, 32, 30, 25, 20, 17, 13, 12, 33, 31,
+        29, 24, 21, 17, 14, 13, 32, 30, 28, 24, 21, 18, 14, 13, 30, 29, 25, 21,
+        19, 16, 13, 13, 28, 28, 22, 19, 17, 15, 13, 12, 25, 26, 21, 17, 15, 13,
+        12, 11, 22, 23, 19, 16, 14, 12, 11, 10, 19, 20, 18, 14, 12, 11, 10, 9,
+        18, 19, 17, 14, 12, 10, 9, 9, 16, 17, 16, 13, 11, 10, 9, 8, 14, 15, 14,
+        12, 10, 9, 8, 8, 12, 14, 13, 11, 10, 9, 7, 7, 12, 13, 12, 11, 9, 8, 7,
+        7, 11, 12, 12, 11, 9, 8, 7, 7, 11, 12, 12, 11, 9, 8, 7, 6,
+        /* Size 16x8 */
+        32, 33, 33, 32, 30, 28, 25, 22, 19, 18, 16, 14, 12, 12, 11, 11, 33, 32,
+        31, 30, 29, 28, 26, 23, 20, 19, 17, 15, 14, 13, 12, 12, 29, 30, 29, 28,
+        25, 22, 21, 19, 18, 17, 16, 14, 13, 12, 12, 12, 23, 25, 24, 24, 21, 19,
+        17, 16, 14, 14, 13, 12, 11, 11, 11, 11, 19, 20, 21, 21, 19, 17, 15, 14,
+        12, 12, 11, 10, 10, 9, 9, 9, 16, 17, 17, 18, 16, 15, 13, 12, 11, 10, 10,
+        9, 9, 8, 8, 8, 12, 13, 14, 14, 13, 13, 12, 11, 10, 9, 9, 8, 7, 7, 7, 7,
+        11, 12, 13, 13, 13, 12, 11, 10, 9, 9, 8, 8, 7, 7, 7, 6,
+        /* Size 16x32 */
+        32, 33, 33, 32, 29, 28, 23, 22, 19, 17, 16, 13, 12, 12, 11, 11, 33, 32,
+        32, 32, 29, 29, 24, 23, 20, 17, 17, 14, 13, 12, 12, 12, 33, 32, 32, 32,
+        30, 29, 25, 23, 20, 18, 17, 14, 13, 12, 12, 12, 33, 32, 32, 31, 30, 30,
+        25, 23, 21, 18, 17, 14, 14, 13, 12, 12, 33, 32, 31, 30, 29, 28, 24, 23,
+        21, 18, 17, 14, 14, 13, 13, 12, 32, 32, 31, 30, 28, 28, 24, 23, 20, 18,
+        17, 14, 14, 13, 13, 12, 32, 31, 30, 29, 28, 27, 24, 23, 21, 18, 18, 15,
+        14, 13, 13, 12, 32, 31, 30, 28, 26, 26, 23, 22, 20, 18, 17, 14, 14, 13,
+        13, 13, 30, 30, 29, 28, 25, 24, 21, 20, 19, 17, 16, 14, 13, 13, 13, 13,
+        29, 30, 28, 27, 23, 22, 20, 19, 17, 16, 15, 13, 13, 12, 12, 12, 28, 30,
+        28, 27, 22, 21, 19, 18, 17, 16, 15, 13, 13, 12, 12, 12, 26, 28, 26, 26,
+        21, 20, 18, 17, 16, 14, 14, 12, 12, 12, 12, 11, 25, 26, 26, 25, 21, 20,
+        17, 17, 15, 14, 13, 12, 12, 11, 11, 11, 23, 25, 24, 24, 20, 19, 16, 16,
+        14, 13, 13, 11, 11, 11, 11, 11, 22, 23, 23, 23, 19, 18, 16, 15, 14, 12,
+        12, 11, 11, 10, 10, 10, 21, 23, 23, 22, 19, 18, 15, 15, 13, 12, 12, 11,
+        10, 10, 10, 10, 19, 21, 20, 20, 18, 17, 14, 14, 12, 11, 11, 10, 10, 10,
+        9, 10, 19, 20, 20, 20, 17, 17, 14, 13, 12, 11, 11, 10, 9, 9, 9, 9, 18,
+        19, 19, 19, 17, 16, 14, 13, 12, 11, 10, 9, 9, 9, 9, 9, 16, 18, 18, 18,
+        16, 15, 13, 12, 11, 10, 10, 9, 9, 9, 9, 8, 16, 17, 17, 18, 16, 15, 13,
+        12, 11, 10, 10, 9, 9, 8, 8, 8, 14, 16, 16, 16, 14, 14, 12, 12, 11, 9, 9,
+        8, 8, 8, 8, 8, 14, 15, 15, 16, 14, 14, 12, 11, 10, 9, 9, 8, 8, 8, 8, 8,
+        13, 14, 14, 15, 13, 13, 11, 11, 10, 9, 9, 8, 8, 7, 7, 7, 12, 14, 14, 14,
+        13, 13, 11, 11, 10, 9, 9, 8, 7, 7, 7, 7, 12, 14, 14, 14, 13, 13, 11, 11,
+        10, 9, 8, 8, 7, 7, 7, 7, 12, 13, 13, 13, 12, 12, 11, 10, 9, 9, 8, 7, 7,
+        7, 7, 7, 12, 12, 13, 13, 12, 12, 11, 10, 9, 9, 8, 7, 7, 7, 7, 6, 11, 12,
+        12, 13, 12, 12, 11, 10, 9, 9, 8, 8, 7, 7, 7, 6, 11, 12, 12, 12, 12, 11,
+        11, 10, 9, 9, 8, 8, 7, 7, 6, 6, 11, 12, 12, 12, 12, 11, 11, 10, 9, 8, 8,
+        7, 7, 6, 6, 6, 10, 11, 11, 12, 12, 11, 11, 9, 9, 8, 8, 7, 7, 6, 6, 6,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 32, 32, 32, 30, 29, 28, 26, 25, 23, 22, 21, 19, 19,
+        18, 16, 16, 14, 14, 13, 12, 12, 12, 12, 11, 11, 11, 10, 33, 32, 32, 32,
+        32, 32, 31, 31, 30, 30, 30, 28, 26, 25, 23, 23, 21, 20, 19, 18, 17, 16,
+        15, 14, 14, 14, 13, 12, 12, 12, 12, 11, 33, 32, 32, 32, 31, 31, 30, 30,
+        29, 28, 28, 26, 26, 24, 23, 23, 20, 20, 19, 18, 17, 16, 15, 14, 14, 14,
+        13, 13, 12, 12, 12, 11, 32, 32, 32, 31, 30, 30, 29, 28, 28, 27, 27, 26,
+        25, 24, 23, 22, 20, 20, 19, 18, 18, 16, 16, 15, 14, 14, 13, 13, 13, 12,
+        12, 12, 29, 29, 30, 30, 29, 28, 28, 26, 25, 23, 22, 21, 21, 20, 19, 19,
+        18, 17, 17, 16, 16, 14, 14, 13, 13, 13, 12, 12, 12, 12, 12, 12, 28, 29,
+        29, 30, 28, 28, 27, 26, 24, 22, 21, 20, 20, 19, 18, 18, 17, 17, 16, 15,
+        15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 23, 24, 25, 25, 24, 24,
+        24, 23, 21, 20, 19, 18, 17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 22, 23, 23, 23, 23, 23, 23, 22, 20, 19,
+        18, 17, 17, 16, 15, 15, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 10, 10,
+        10, 10, 10, 9, 19, 20, 20, 21, 21, 20, 21, 20, 19, 17, 17, 16, 15, 14,
+        14, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 17,
+        17, 18, 18, 18, 18, 18, 18, 17, 16, 16, 14, 14, 13, 12, 12, 11, 11, 11,
+        10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 16, 17, 17, 17, 17, 17, 18, 17,
+        16, 15, 15, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10, 9, 9, 9, 9, 8, 8, 8,
+        8, 8, 8, 8, 13, 14, 14, 14, 14, 14, 15, 14, 14, 13, 13, 12, 12, 11, 11,
+        11, 10, 10, 9, 9, 9, 8, 8, 8, 8, 8, 7, 7, 8, 8, 7, 7, 12, 13, 13, 14,
+        14, 14, 14, 14, 13, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8,
+        7, 7, 7, 7, 7, 7, 7, 7, 12, 12, 12, 13, 13, 13, 13, 13, 13, 12, 12, 12,
+        11, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 11, 12,
+        12, 12, 13, 13, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10, 9, 9, 9, 9, 8,
+        8, 8, 7, 7, 7, 7, 7, 7, 6, 6, 6, 11, 12, 12, 12, 12, 12, 12, 13, 13, 12,
+        12, 11, 11, 11, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6,
+        /* Size 4x16 */
+        33, 28, 17, 12, 32, 29, 18, 12, 32, 28, 18, 13, 31, 27, 18, 13, 30, 24,
+        17, 13, 30, 21, 16, 12, 26, 20, 14, 11, 23, 18, 12, 10, 21, 17, 11, 10,
+        19, 16, 11, 9, 17, 15, 10, 8, 15, 14, 9, 8, 14, 13, 9, 7, 13, 12, 9, 7,
+        12, 12, 9, 7, 12, 11, 8, 6,
+        /* Size 16x4 */
+        33, 32, 32, 31, 30, 30, 26, 23, 21, 19, 17, 15, 14, 13, 12, 12, 28, 29,
+        28, 27, 24, 21, 20, 18, 17, 16, 15, 14, 13, 12, 12, 11, 17, 18, 18, 18,
+        17, 16, 14, 12, 11, 11, 10, 9, 9, 9, 9, 8, 12, 12, 13, 13, 13, 12, 11,
+        10, 10, 9, 8, 8, 7, 7, 7, 6,
+        /* Size 8x32 */
+        32, 33, 29, 23, 19, 16, 12, 11, 33, 32, 29, 24, 20, 17, 13, 12, 33, 32,
+        30, 25, 20, 17, 13, 12, 33, 32, 30, 25, 21, 17, 14, 12, 33, 31, 29, 24,
+        21, 17, 14, 13, 32, 31, 28, 24, 20, 17, 14, 13, 32, 30, 28, 24, 21, 18,
+        14, 13, 32, 30, 26, 23, 20, 17, 14, 13, 30, 29, 25, 21, 19, 16, 13, 13,
+        29, 28, 23, 20, 17, 15, 13, 12, 28, 28, 22, 19, 17, 15, 13, 12, 26, 26,
+        21, 18, 16, 14, 12, 12, 25, 26, 21, 17, 15, 13, 12, 11, 23, 24, 20, 16,
+        14, 13, 11, 11, 22, 23, 19, 16, 14, 12, 11, 10, 21, 23, 19, 15, 13, 12,
+        10, 10, 19, 20, 18, 14, 12, 11, 10, 9, 19, 20, 17, 14, 12, 11, 9, 9, 18,
+        19, 17, 14, 12, 10, 9, 9, 16, 18, 16, 13, 11, 10, 9, 9, 16, 17, 16, 13,
+        11, 10, 9, 8, 14, 16, 14, 12, 11, 9, 8, 8, 14, 15, 14, 12, 10, 9, 8, 8,
+        13, 14, 13, 11, 10, 9, 8, 7, 12, 14, 13, 11, 10, 9, 7, 7, 12, 14, 13,
+        11, 10, 8, 7, 7, 12, 13, 12, 11, 9, 8, 7, 7, 12, 13, 12, 11, 9, 8, 7, 7,
+        11, 12, 12, 11, 9, 8, 7, 7, 11, 12, 12, 11, 9, 8, 7, 6, 11, 12, 12, 11,
+        9, 8, 7, 6, 10, 11, 12, 11, 9, 8, 7, 6,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 32, 32, 32, 30, 29, 28, 26, 25, 23, 22, 21, 19, 19,
+        18, 16, 16, 14, 14, 13, 12, 12, 12, 12, 11, 11, 11, 10, 33, 32, 32, 32,
+        31, 31, 30, 30, 29, 28, 28, 26, 26, 24, 23, 23, 20, 20, 19, 18, 17, 16,
+        15, 14, 14, 14, 13, 13, 12, 12, 12, 11, 29, 29, 30, 30, 29, 28, 28, 26,
+        25, 23, 22, 21, 21, 20, 19, 19, 18, 17, 17, 16, 16, 14, 14, 13, 13, 13,
+        12, 12, 12, 12, 12, 12, 23, 24, 25, 25, 24, 24, 24, 23, 21, 20, 19, 18,
+        17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 11, 11, 11,
+        11, 11, 19, 20, 20, 21, 21, 20, 21, 20, 19, 17, 17, 16, 15, 14, 14, 13,
+        12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 16, 17, 17,
+        17, 17, 17, 18, 17, 16, 15, 15, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10,
+        9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 12, 13, 13, 14, 14, 14, 14, 14, 13, 13,
+        13, 12, 12, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7,
+        11, 12, 12, 12, 13, 13, 13, 13, 13, 12, 12, 12, 11, 11, 10, 10, 9, 9, 9,
+        9, 8, 8, 8, 7, 7, 7, 7, 7, 7, 6, 6, 6 },
+      { /* Chroma */
+        /* Size 4x4 */
+        32, 23, 20, 17, 23, 19, 17, 16, 20, 17, 14, 13, 17, 16, 13, 11,
+        /* Size 8x8 */
+        33, 30, 22, 22, 20, 18, 17, 16, 30, 26, 22, 23, 21, 19, 18, 17, 22, 22,
+        20, 20, 19, 18, 17, 17, 22, 23, 20, 18, 17, 16, 15, 15, 20, 21, 19, 17,
+        15, 14, 13, 13, 18, 19, 18, 16, 14, 12, 12, 12, 17, 18, 17, 15, 13, 12,
+        11, 11, 16, 17, 17, 15, 13, 12, 11, 10,
+        /* Size 16x16 */
+        32, 33, 31, 28, 25, 21, 21, 20, 20, 19, 18, 17, 16, 15, 15, 15, 33, 33,
+        30, 26, 24, 22, 22, 22, 21, 20, 19, 18, 17, 17, 16, 16, 31, 30, 28, 24,
+        23, 22, 22, 22, 22, 21, 20, 19, 18, 17, 17, 16, 28, 26, 24, 22, 22, 21,
+        22, 22, 22, 21, 20, 19, 19, 18, 17, 17, 25, 24, 23, 22, 21, 20, 21, 20,
+        20, 20, 19, 18, 18, 17, 17, 17, 21, 22, 22, 21, 20, 19, 19, 19, 19, 19,
+        18, 17, 17, 16, 16, 16, 21, 22, 22, 22, 21, 19, 19, 18, 17, 17, 17, 16,
+        16, 15, 15, 15, 20, 22, 22, 22, 20, 19, 18, 17, 16, 16, 16, 15, 15, 14,
+        14, 14, 20, 21, 22, 22, 20, 19, 17, 16, 16, 15, 15, 14, 14, 13, 14, 14,
+        19, 20, 21, 21, 20, 19, 17, 16, 15, 14, 14, 13, 13, 13, 13, 13, 18, 19,
+        20, 20, 19, 18, 17, 16, 15, 14, 13, 13, 12, 12, 12, 12, 17, 18, 19, 19,
+        18, 17, 16, 15, 14, 13, 13, 12, 12, 12, 12, 12, 16, 17, 18, 19, 18, 17,
+        16, 15, 14, 13, 12, 12, 11, 11, 11, 11, 15, 17, 17, 18, 17, 16, 15, 14,
+        13, 13, 12, 12, 11, 11, 11, 11, 15, 16, 17, 17, 17, 16, 15, 14, 14, 13,
+        12, 12, 11, 11, 10, 10, 15, 16, 16, 17, 17, 16, 15, 14, 14, 13, 12, 12,
+        11, 11, 10, 10,
+        /* Size 32x32 */
+        32, 33, 33, 34, 31, 31, 28, 27, 25, 22, 21, 21, 21, 21, 20, 20, 20, 19,
+        19, 18, 18, 17, 17, 16, 16, 16, 15, 15, 15, 15, 15, 14, 33, 33, 33, 33,
+        30, 30, 27, 26, 24, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 18,
+        18, 17, 17, 17, 16, 16, 16, 16, 16, 15, 33, 33, 33, 33, 30, 29, 26, 26,
+        24, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 19, 19, 18, 18, 17, 17, 17,
+        17, 16, 16, 16, 16, 15, 34, 33, 33, 32, 30, 29, 26, 25, 24, 23, 22, 23,
+        23, 23, 22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17,
+        16, 16, 31, 30, 30, 30, 28, 27, 24, 24, 23, 22, 22, 22, 22, 23, 22, 22,
+        22, 21, 21, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 16, 16, 31, 30,
+        29, 29, 27, 26, 24, 23, 23, 22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20,
+        20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 17, 28, 27, 26, 26, 24, 24,
+        22, 22, 22, 22, 21, 22, 22, 23, 22, 22, 22, 22, 21, 21, 20, 20, 19, 19,
+        19, 19, 18, 18, 17, 17, 17, 17, 27, 26, 26, 25, 24, 23, 22, 22, 21, 21,
+        21, 21, 22, 22, 22, 22, 21, 21, 21, 20, 20, 19, 19, 19, 18, 18, 18, 18,
+        18, 17, 17, 17, 25, 24, 24, 24, 23, 23, 22, 21, 21, 20, 20, 21, 21, 21,
+        20, 20, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 17, 17,
+        22, 22, 22, 23, 22, 22, 22, 21, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19,
+        19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 16, 16, 21, 22, 22, 22,
+        22, 22, 21, 21, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18,
+        17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 21, 22, 22, 23, 22, 22, 22, 21,
+        21, 20, 19, 19, 19, 19, 18, 18, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16,
+        16, 16, 16, 16, 16, 15, 21, 22, 22, 23, 22, 22, 22, 22, 21, 20, 19, 19,
+        19, 18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 15,
+        15, 15, 21, 22, 22, 23, 23, 23, 23, 22, 21, 20, 19, 19, 18, 18, 17, 17,
+        17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 15, 15, 15, 20, 21,
+        22, 22, 22, 22, 22, 22, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 16,
+        16, 15, 15, 15, 15, 14, 14, 15, 14, 14, 14, 15, 20, 21, 22, 22, 22, 22,
+        22, 22, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 14,
+        14, 14, 14, 14, 14, 14, 14, 14, 20, 20, 21, 22, 22, 22, 22, 21, 20, 19,
+        19, 18, 17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 14,
+        14, 13, 14, 14, 19, 20, 20, 21, 21, 21, 22, 21, 20, 19, 19, 18, 17, 17,
+        16, 16, 15, 15, 15, 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+        19, 20, 20, 21, 21, 21, 21, 21, 20, 19, 19, 18, 17, 17, 16, 16, 15, 15,
+        14, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 18, 19, 19, 20,
+        20, 20, 21, 20, 19, 19, 18, 17, 17, 16, 16, 16, 15, 14, 14, 14, 13, 13,
+        13, 13, 12, 12, 12, 13, 12, 13, 13, 12, 18, 19, 19, 20, 20, 20, 20, 20,
+        19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 12,
+        12, 12, 12, 12, 12, 12, 17, 18, 18, 19, 19, 19, 20, 19, 19, 18, 18, 17,
+        16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+        12, 12, 17, 18, 18, 19, 19, 19, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15,
+        14, 14, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, 17,
+        17, 18, 18, 18, 19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13,
+        12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 12, 11, 16, 17, 17, 18, 18, 18,
+        19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 16, 17, 17, 18, 18, 18, 19, 18, 18, 17,
+        17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11,
+        11, 11, 11, 11, 15, 16, 17, 17, 17, 17, 18, 18, 17, 17, 16, 16, 15, 15,
+        14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+        15, 16, 16, 17, 17, 17, 18, 18, 17, 17, 16, 16, 15, 15, 15, 14, 14, 13,
+        13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 11, 10, 10, 10, 15, 16, 16, 17,
+        17, 17, 17, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12,
+        12, 11, 11, 11, 11, 11, 10, 10, 10, 10, 15, 16, 16, 17, 17, 17, 17, 17,
+        17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 12, 11, 11, 11,
+        11, 10, 10, 10, 10, 10, 15, 16, 16, 16, 16, 17, 17, 17, 17, 16, 16, 16,
+        15, 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10, 10,
+        10, 10, 14, 15, 15, 16, 16, 17, 17, 17, 17, 16, 16, 15, 15, 15, 15, 14,
+        14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10,
+        /* Size 4x8 */
+        33, 22, 19, 16, 28, 22, 20, 17, 22, 20, 19, 17, 23, 19, 16, 15, 21, 19,
+        14, 13, 19, 18, 13, 12, 17, 17, 13, 11, 16, 16, 13, 11,
+        /* Size 8x4 */
+        33, 28, 22, 23, 21, 19, 17, 16, 22, 22, 20, 19, 19, 18, 17, 16, 19, 20,
+        19, 16, 14, 13, 13, 13, 16, 17, 17, 15, 13, 12, 11, 11,
+        /* Size 8x16 */
+        32, 31, 23, 21, 20, 18, 16, 15, 33, 30, 23, 22, 21, 19, 17, 16, 31, 28,
+        22, 23, 22, 20, 18, 17, 28, 24, 22, 23, 22, 20, 19, 17, 24, 23, 21, 21,
+        20, 19, 18, 17, 21, 22, 20, 19, 19, 18, 17, 16, 21, 22, 20, 18, 17, 17,
+        16, 15, 20, 22, 20, 17, 16, 16, 14, 14, 20, 22, 19, 17, 16, 14, 14, 14,
+        19, 21, 19, 17, 15, 14, 13, 13, 18, 20, 19, 16, 15, 13, 12, 12, 17, 19,
+        18, 16, 14, 13, 12, 12, 16, 18, 17, 15, 14, 12, 11, 11, 16, 17, 17, 15,
+        13, 12, 11, 11, 15, 17, 17, 15, 13, 12, 11, 11, 15, 16, 17, 15, 14, 12,
+        11, 10,
+        /* Size 16x8 */
+        32, 33, 31, 28, 24, 21, 21, 20, 20, 19, 18, 17, 16, 16, 15, 15, 31, 30,
+        28, 24, 23, 22, 22, 22, 22, 21, 20, 19, 18, 17, 17, 16, 23, 23, 22, 22,
+        21, 20, 20, 20, 19, 19, 19, 18, 17, 17, 17, 17, 21, 22, 23, 23, 21, 19,
+        18, 17, 17, 17, 16, 16, 15, 15, 15, 15, 20, 21, 22, 22, 20, 19, 17, 16,
+        16, 15, 15, 14, 14, 13, 13, 14, 18, 19, 20, 20, 19, 18, 17, 16, 14, 14,
+        13, 13, 12, 12, 12, 12, 16, 17, 18, 19, 18, 17, 16, 14, 14, 13, 12, 12,
+        11, 11, 11, 11, 15, 16, 17, 17, 17, 16, 15, 14, 14, 13, 12, 12, 11, 11,
+        11, 10,
+        /* Size 16x32 */
+        32, 33, 31, 28, 23, 21, 21, 20, 20, 18, 18, 16, 16, 15, 15, 15, 33, 33,
+        30, 27, 23, 22, 22, 21, 20, 19, 19, 17, 17, 16, 16, 16, 33, 32, 30, 26,
+        23, 22, 22, 22, 21, 20, 19, 17, 17, 17, 16, 16, 34, 32, 29, 26, 23, 22,
+        23, 22, 21, 20, 20, 18, 18, 17, 17, 17, 31, 29, 28, 24, 22, 22, 23, 22,
+        22, 20, 20, 18, 18, 17, 17, 17, 31, 28, 27, 24, 22, 22, 22, 22, 22, 20,
+        20, 18, 18, 17, 17, 17, 28, 26, 24, 22, 22, 22, 23, 22, 22, 21, 20, 19,
+        19, 18, 17, 17, 26, 25, 24, 22, 21, 21, 22, 22, 21, 20, 20, 19, 18, 18,
+        18, 17, 24, 24, 23, 22, 21, 20, 21, 20, 20, 19, 19, 18, 18, 17, 17, 17,
+        22, 22, 22, 21, 20, 20, 19, 19, 19, 19, 18, 17, 17, 17, 17, 17, 21, 22,
+        22, 21, 20, 19, 19, 19, 19, 18, 18, 17, 17, 16, 16, 17, 21, 22, 22, 22,
+        20, 19, 18, 18, 18, 17, 17, 16, 16, 16, 16, 16, 21, 23, 22, 22, 20, 19,
+        18, 18, 17, 17, 17, 16, 16, 16, 15, 16, 21, 23, 23, 22, 20, 19, 18, 17,
+        17, 16, 16, 15, 15, 15, 15, 15, 20, 22, 22, 22, 20, 19, 17, 17, 16, 16,
+        16, 15, 14, 15, 14, 15, 20, 22, 22, 22, 20, 19, 17, 17, 16, 16, 15, 14,
+        14, 14, 14, 14, 20, 21, 22, 22, 19, 19, 17, 16, 16, 15, 14, 14, 14, 14,
+        14, 14, 19, 21, 21, 21, 19, 19, 17, 16, 15, 14, 14, 13, 13, 13, 14, 13,
+        19, 20, 21, 21, 19, 19, 17, 16, 15, 14, 14, 13, 13, 13, 13, 13, 18, 20,
+        20, 20, 19, 18, 16, 16, 15, 14, 13, 13, 12, 13, 13, 13, 18, 20, 20, 20,
+        19, 18, 16, 16, 15, 14, 13, 12, 12, 12, 12, 13, 17, 19, 19, 20, 18, 18,
+        16, 15, 14, 13, 13, 12, 12, 12, 12, 12, 17, 18, 19, 19, 18, 17, 16, 15,
+        14, 13, 13, 12, 12, 12, 12, 12, 16, 18, 18, 19, 17, 17, 15, 15, 14, 13,
+        12, 12, 11, 11, 12, 12, 16, 18, 18, 18, 17, 17, 15, 14, 14, 13, 12, 11,
+        11, 11, 11, 12, 16, 17, 18, 18, 17, 17, 15, 14, 14, 13, 12, 11, 11, 11,
+        11, 11, 16, 17, 17, 18, 17, 16, 15, 14, 13, 12, 12, 11, 11, 11, 11, 11,
+        15, 17, 17, 18, 17, 16, 15, 15, 13, 13, 12, 11, 11, 11, 11, 11, 15, 17,
+        17, 17, 17, 16, 15, 14, 13, 13, 12, 12, 11, 11, 11, 10, 15, 16, 17, 17,
+        17, 16, 15, 14, 13, 13, 12, 12, 11, 11, 10, 10, 15, 16, 16, 17, 17, 16,
+        15, 14, 14, 13, 12, 12, 11, 11, 10, 10, 15, 16, 16, 17, 17, 15, 15, 14,
+        14, 12, 12, 11, 11, 10, 10, 10,
+        /* Size 32x16 */
+        32, 33, 33, 34, 31, 31, 28, 26, 24, 22, 21, 21, 21, 21, 20, 20, 20, 19,
+        19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 33, 33, 32, 32,
+        29, 28, 26, 25, 24, 22, 22, 22, 23, 23, 22, 22, 21, 21, 20, 20, 20, 19,
+        18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 31, 30, 30, 29, 28, 27, 24, 24,
+        23, 22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 18,
+        17, 17, 17, 17, 16, 16, 28, 27, 26, 26, 24, 24, 22, 22, 22, 21, 21, 22,
+        22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 18, 18, 18, 18, 17, 17,
+        17, 17, 23, 23, 23, 23, 22, 22, 22, 21, 21, 20, 20, 20, 20, 20, 20, 20,
+        19, 19, 19, 19, 19, 18, 18, 17, 17, 17, 17, 17, 17, 17, 17, 17, 21, 22,
+        22, 22, 22, 22, 22, 21, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18,
+        18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 16, 15, 21, 22, 22, 23, 23, 22,
+        23, 22, 21, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 16, 15,
+        15, 15, 15, 15, 15, 15, 15, 15, 20, 21, 22, 22, 22, 22, 22, 22, 20, 19,
+        19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 14, 14, 14, 15,
+        14, 14, 14, 14, 20, 20, 21, 21, 22, 22, 22, 21, 20, 19, 19, 18, 17, 17,
+        16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13, 13, 14, 14,
+        18, 19, 20, 20, 20, 20, 21, 20, 19, 19, 18, 17, 17, 16, 16, 16, 15, 14,
+        14, 14, 14, 13, 13, 13, 13, 13, 12, 13, 13, 13, 13, 12, 18, 19, 19, 20,
+        20, 20, 20, 20, 19, 18, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13, 13,
+        13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18, 19, 19,
+        18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11,
+        11, 11, 12, 12, 12, 11, 16, 17, 17, 18, 18, 18, 19, 18, 18, 17, 17, 16,
+        16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11,
+        11, 11, 15, 16, 17, 17, 17, 17, 18, 18, 17, 17, 16, 16, 16, 15, 15, 14,
+        14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11, 10, 15, 16,
+        16, 17, 17, 17, 17, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13,
+        12, 12, 12, 12, 11, 11, 11, 11, 11, 10, 10, 10, 15, 16, 16, 17, 17, 17,
+        17, 17, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 12,
+        12, 11, 11, 11, 10, 10, 10, 10,
+        /* Size 4x16 */
+        33, 21, 18, 15, 32, 22, 20, 17, 29, 22, 20, 17, 26, 22, 21, 18, 24, 20,
+        19, 17, 22, 19, 18, 16, 23, 19, 17, 16, 22, 19, 16, 15, 21, 19, 15, 14,
+        20, 19, 14, 13, 20, 18, 14, 12, 18, 17, 13, 12, 18, 17, 13, 11, 17, 16,
+        12, 11, 17, 16, 13, 11, 16, 16, 13, 11,
+        /* Size 16x4 */
+        33, 32, 29, 26, 24, 22, 23, 22, 21, 20, 20, 18, 18, 17, 17, 16, 21, 22,
+        22, 22, 20, 19, 19, 19, 19, 19, 18, 17, 17, 16, 16, 16, 18, 20, 20, 21,
+        19, 18, 17, 16, 15, 14, 14, 13, 13, 12, 13, 13, 15, 17, 17, 18, 17, 16,
+        16, 15, 14, 13, 12, 12, 11, 11, 11, 11,
+        /* Size 8x32 */
+        32, 31, 23, 21, 20, 18, 16, 15, 33, 30, 23, 22, 20, 19, 17, 16, 33, 30,
+        23, 22, 21, 19, 17, 16, 34, 29, 23, 23, 21, 20, 18, 17, 31, 28, 22, 23,
+        22, 20, 18, 17, 31, 27, 22, 22, 22, 20, 18, 17, 28, 24, 22, 23, 22, 20,
+        19, 17, 26, 24, 21, 22, 21, 20, 18, 18, 24, 23, 21, 21, 20, 19, 18, 17,
+        22, 22, 20, 19, 19, 18, 17, 17, 21, 22, 20, 19, 19, 18, 17, 16, 21, 22,
+        20, 18, 18, 17, 16, 16, 21, 22, 20, 18, 17, 17, 16, 15, 21, 23, 20, 18,
+        17, 16, 15, 15, 20, 22, 20, 17, 16, 16, 14, 14, 20, 22, 20, 17, 16, 15,
+        14, 14, 20, 22, 19, 17, 16, 14, 14, 14, 19, 21, 19, 17, 15, 14, 13, 14,
+        19, 21, 19, 17, 15, 14, 13, 13, 18, 20, 19, 16, 15, 13, 12, 13, 18, 20,
+        19, 16, 15, 13, 12, 12, 17, 19, 18, 16, 14, 13, 12, 12, 17, 19, 18, 16,
+        14, 13, 12, 12, 16, 18, 17, 15, 14, 12, 11, 12, 16, 18, 17, 15, 14, 12,
+        11, 11, 16, 18, 17, 15, 14, 12, 11, 11, 16, 17, 17, 15, 13, 12, 11, 11,
+        15, 17, 17, 15, 13, 12, 11, 11, 15, 17, 17, 15, 13, 12, 11, 11, 15, 17,
+        17, 15, 13, 12, 11, 10, 15, 16, 17, 15, 14, 12, 11, 10, 15, 16, 17, 15,
+        14, 12, 11, 10,
+        /* Size 32x8 */
+        32, 33, 33, 34, 31, 31, 28, 26, 24, 22, 21, 21, 21, 21, 20, 20, 20, 19,
+        19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 31, 30, 30, 29,
+        28, 27, 24, 24, 23, 22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20, 19,
+        19, 18, 18, 18, 17, 17, 17, 17, 16, 16, 23, 23, 23, 23, 22, 22, 22, 21,
+        21, 20, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 19, 18, 18, 17, 17, 17,
+        17, 17, 17, 17, 17, 17, 21, 22, 22, 23, 23, 22, 23, 22, 21, 19, 19, 18,
+        18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 15,
+        15, 15, 20, 20, 21, 21, 22, 22, 22, 21, 20, 19, 19, 18, 17, 17, 16, 16,
+        16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13, 13, 14, 14, 18, 19,
+        19, 20, 20, 20, 20, 20, 19, 18, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13,
+        13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18,
+        19, 18, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17, 17, 18, 17, 17,
+        16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11,
+        11, 10, 10, 10 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 30, 19, 14, 30, 21, 16, 13, 19, 16, 11, 9, 14, 13, 9, 7,
+        /* Size 8x8 */
+        32, 32, 30, 26, 20, 17, 13, 12, 32, 31, 29, 26, 21, 17, 14, 13, 30, 29,
+        26, 22, 19, 16, 14, 13, 26, 26, 22, 18, 16, 14, 12, 11, 20, 21, 19, 16,
+        13, 11, 10, 10, 17, 17, 16, 14, 11, 10, 9, 8, 13, 14, 14, 12, 10, 9, 8,
+        7, 12, 13, 13, 11, 10, 8, 7, 7,
+        /* Size 16x16 */
+        32, 33, 33, 32, 31, 28, 26, 23, 21, 19, 17, 16, 14, 13, 12, 11, 33, 32,
+        32, 32, 31, 29, 27, 24, 22, 20, 18, 16, 15, 13, 13, 12, 33, 32, 32, 31,
+        30, 29, 27, 25, 23, 21, 19, 17, 15, 14, 13, 12, 32, 32, 31, 30, 28, 28,
+        26, 24, 23, 21, 19, 17, 16, 14, 14, 13, 31, 31, 30, 28, 27, 24, 23, 22,
+        20, 19, 18, 16, 15, 14, 13, 13, 28, 29, 29, 28, 24, 21, 20, 19, 18, 17,
+        16, 15, 14, 13, 12, 12, 26, 27, 27, 26, 23, 20, 19, 18, 17, 16, 15, 14,
+        13, 12, 12, 11, 23, 24, 25, 24, 22, 19, 18, 16, 15, 14, 14, 13, 12, 11,
+        11, 11, 21, 22, 23, 23, 20, 18, 17, 15, 14, 13, 13, 12, 11, 10, 10, 10,
+        19, 20, 21, 21, 19, 17, 16, 14, 13, 12, 12, 11, 10, 10, 9, 9, 17, 18,
+        19, 19, 18, 16, 15, 14, 13, 12, 11, 10, 10, 9, 9, 9, 16, 16, 17, 17, 16,
+        15, 14, 13, 12, 11, 10, 10, 9, 8, 8, 8, 14, 15, 15, 16, 15, 14, 13, 12,
+        11, 10, 10, 9, 8, 8, 8, 7, 13, 13, 14, 14, 14, 13, 12, 11, 10, 10, 9, 8,
+        8, 7, 7, 7, 12, 13, 13, 14, 13, 12, 12, 11, 10, 9, 9, 8, 8, 7, 7, 7, 11,
+        12, 12, 13, 13, 12, 11, 11, 10, 9, 9, 8, 7, 7, 7, 6,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 32, 32, 31, 30, 28, 28, 26, 25, 23, 22, 21, 20,
+        19, 18, 17, 16, 16, 14, 14, 13, 13, 12, 12, 12, 11, 11, 33, 32, 32, 32,
+        32, 32, 32, 32, 31, 30, 29, 29, 27, 26, 24, 23, 22, 20, 20, 18, 18, 17,
+        16, 15, 14, 13, 13, 13, 12, 12, 12, 12, 33, 32, 32, 32, 32, 32, 32, 32,
+        31, 30, 29, 29, 27, 26, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 15, 14,
+        13, 13, 13, 12, 12, 12, 33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30,
+        28, 27, 25, 24, 23, 21, 21, 19, 19, 17, 17, 16, 15, 14, 14, 14, 13, 13,
+        12, 12, 33, 32, 32, 32, 32, 31, 31, 31, 30, 30, 29, 29, 27, 26, 25, 24,
+        23, 21, 21, 19, 19, 17, 17, 16, 15, 14, 14, 14, 13, 13, 12, 12, 33, 32,
+        32, 32, 31, 31, 31, 30, 29, 29, 28, 28, 26, 26, 24, 23, 23, 21, 20, 19,
+        19, 17, 17, 16, 15, 14, 14, 14, 13, 13, 13, 12, 32, 32, 32, 32, 31, 31,
+        30, 29, 28, 28, 28, 27, 26, 26, 24, 23, 23, 21, 21, 19, 19, 18, 17, 16,
+        16, 15, 14, 14, 14, 13, 13, 12, 32, 32, 32, 32, 31, 30, 29, 29, 28, 28,
+        27, 27, 26, 25, 24, 23, 22, 21, 21, 19, 19, 18, 17, 16, 16, 15, 14, 14,
+        14, 13, 13, 13, 31, 31, 31, 31, 30, 29, 28, 28, 27, 26, 24, 24, 23, 23,
+        22, 21, 20, 20, 19, 18, 18, 17, 16, 15, 15, 14, 14, 14, 13, 13, 13, 13,
+        30, 30, 30, 31, 30, 29, 28, 28, 26, 26, 24, 24, 23, 22, 22, 21, 20, 19,
+        19, 18, 18, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 28, 29, 29, 30,
+        29, 28, 28, 27, 24, 24, 21, 21, 20, 20, 19, 19, 18, 17, 17, 16, 16, 15,
+        15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 28, 29, 29, 30, 29, 28, 27, 27,
+        24, 24, 21, 21, 20, 20, 19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13,
+        13, 13, 12, 12, 12, 11, 26, 27, 27, 28, 27, 26, 26, 26, 23, 23, 20, 20,
+        19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11,
+        11, 11, 25, 26, 26, 27, 26, 26, 26, 25, 23, 22, 20, 20, 19, 18, 17, 17,
+        16, 16, 15, 15, 15, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 23, 24,
+        24, 25, 25, 24, 24, 24, 22, 22, 19, 19, 18, 17, 16, 16, 15, 15, 14, 14,
+        14, 13, 13, 12, 12, 11, 11, 11, 11, 11, 11, 11, 22, 23, 23, 24, 24, 23,
+        23, 23, 21, 21, 19, 19, 17, 17, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12,
+        12, 11, 11, 11, 10, 10, 10, 10, 21, 22, 22, 23, 23, 23, 23, 22, 20, 20,
+        18, 18, 17, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 11, 11, 11, 10, 10,
+        10, 10, 10, 10, 20, 20, 21, 21, 21, 21, 21, 21, 20, 19, 17, 17, 16, 16,
+        15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 9,
+        19, 20, 20, 21, 21, 20, 21, 21, 19, 19, 17, 17, 16, 15, 14, 14, 13, 13,
+        12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 18, 18, 19, 19, 19,
+        19, 19, 19, 18, 18, 16, 16, 15, 15, 14, 13, 13, 12, 12, 11, 11, 11, 10,
+        10, 10, 9, 9, 9, 9, 9, 9, 9, 17, 18, 18, 19, 19, 19, 19, 19, 18, 18, 16,
+        16, 15, 15, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9,
+        9, 9, 16, 17, 17, 17, 17, 17, 18, 18, 17, 16, 15, 15, 14, 14, 13, 12,
+        12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 16, 16, 16, 17,
+        17, 17, 17, 17, 16, 16, 15, 15, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10,
+        10, 9, 9, 9, 8, 8, 8, 8, 8, 8, 14, 15, 15, 16, 16, 16, 16, 16, 15, 15,
+        14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8,
+        8, 8, 14, 14, 15, 15, 15, 15, 16, 16, 15, 15, 14, 14, 13, 12, 12, 12,
+        11, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 8, 13, 13, 14, 14, 14,
+        14, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8,
+        8, 8, 8, 7, 7, 7, 7, 7, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 13, 13,
+        12, 12, 11, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 12,
+        13, 13, 14, 14, 14, 14, 14, 14, 13, 13, 13, 12, 12, 11, 11, 10, 10, 10,
+        9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 12, 12, 13, 13, 13, 13, 14, 14,
+        13, 13, 12, 12, 12, 11, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7,
+        7, 7, 7, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 12, 12, 11, 11, 11, 10,
+        10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 6, 11, 12, 12, 12, 12,
+        13, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 7,
+        7, 7, 7, 7, 7, 6, 6, 11, 12, 12, 12, 12, 12, 12, 13, 13, 12, 12, 11, 11,
+        11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 6, 6, 6,
+        /* Size 4x8 */
+        32, 29, 20, 13, 32, 28, 20, 14, 30, 24, 19, 14, 27, 20, 15, 12, 21, 17,
+        13, 10, 17, 15, 11, 9, 14, 13, 10, 8, 13, 12, 9, 7,
+        /* Size 8x4 */
+        32, 32, 30, 27, 21, 17, 14, 13, 29, 28, 24, 20, 17, 15, 13, 12, 20, 20,
+        19, 15, 13, 11, 10, 9, 13, 14, 14, 12, 10, 9, 8, 7,
+        /* Size 8x16 */
+        32, 33, 31, 26, 20, 16, 13, 12, 33, 32, 31, 26, 21, 17, 14, 12, 33, 32,
+        30, 27, 22, 17, 14, 13, 32, 31, 28, 26, 21, 18, 15, 13, 31, 30, 27, 23,
+        20, 17, 14, 13, 28, 29, 24, 20, 18, 15, 13, 12, 26, 27, 23, 19, 16, 14,
+        12, 12, 23, 25, 22, 17, 15, 13, 11, 11, 21, 23, 20, 17, 14, 12, 11, 10,
+        19, 21, 19, 16, 13, 11, 10, 9, 18, 19, 18, 15, 12, 10, 9, 9, 16, 17, 16,
+        14, 11, 10, 9, 8, 14, 15, 15, 13, 11, 9, 8, 8, 13, 14, 14, 12, 10, 9, 8,
+        7, 12, 13, 13, 11, 10, 8, 7, 7, 11, 12, 13, 11, 10, 9, 7, 7,
+        /* Size 16x8 */
+        32, 33, 33, 32, 31, 28, 26, 23, 21, 19, 18, 16, 14, 13, 12, 11, 33, 32,
+        32, 31, 30, 29, 27, 25, 23, 21, 19, 17, 15, 14, 13, 12, 31, 31, 30, 28,
+        27, 24, 23, 22, 20, 19, 18, 16, 15, 14, 13, 13, 26, 26, 27, 26, 23, 20,
+        19, 17, 17, 16, 15, 14, 13, 12, 11, 11, 20, 21, 22, 21, 20, 18, 16, 15,
+        14, 13, 12, 11, 11, 10, 10, 10, 16, 17, 17, 18, 17, 15, 14, 13, 12, 11,
+        10, 10, 9, 9, 8, 9, 13, 14, 14, 15, 14, 13, 12, 11, 11, 10, 9, 9, 8, 8,
+        7, 7, 12, 12, 13, 13, 13, 12, 12, 11, 10, 9, 9, 8, 8, 7, 7, 7,
+        /* Size 16x32 */
+        32, 33, 33, 32, 31, 28, 26, 23, 20, 19, 16, 16, 13, 13, 12, 11, 33, 32,
+        32, 32, 31, 29, 26, 24, 21, 20, 17, 16, 14, 13, 12, 12, 33, 32, 32, 32,
+        31, 29, 26, 24, 21, 20, 17, 17, 14, 13, 12, 12, 33, 32, 32, 31, 31, 30,
+        27, 25, 22, 21, 17, 17, 14, 14, 13, 13, 33, 32, 32, 31, 30, 29, 27, 25,
+        22, 21, 17, 17, 14, 14, 13, 13, 32, 32, 31, 30, 29, 28, 26, 24, 21, 20,
+        17, 17, 14, 14, 13, 13, 32, 32, 31, 29, 28, 28, 26, 24, 21, 21, 18, 17,
+        15, 14, 13, 13, 32, 31, 31, 29, 28, 27, 25, 24, 21, 21, 18, 17, 15, 15,
+        14, 13, 31, 31, 30, 28, 27, 25, 23, 22, 20, 19, 17, 16, 14, 14, 13, 13,
+        30, 30, 30, 28, 26, 24, 23, 21, 19, 19, 16, 16, 14, 14, 13, 12, 28, 30,
+        29, 27, 24, 21, 20, 19, 18, 17, 15, 15, 13, 13, 12, 12, 28, 29, 29, 27,
+        24, 21, 20, 19, 17, 17, 15, 15, 13, 13, 12, 12, 26, 28, 27, 26, 23, 20,
+        19, 18, 16, 16, 14, 14, 12, 12, 12, 12, 26, 27, 26, 25, 23, 20, 18, 17,
+        16, 15, 14, 13, 12, 12, 11, 11, 23, 25, 25, 24, 22, 19, 17, 16, 15, 14,
+        13, 13, 11, 11, 11, 11, 22, 24, 24, 23, 21, 19, 17, 16, 14, 14, 12, 12,
+        11, 11, 11, 10, 21, 23, 23, 22, 20, 18, 17, 15, 14, 13, 12, 12, 11, 10,
+        10, 10, 20, 21, 21, 21, 20, 17, 16, 15, 13, 13, 11, 11, 10, 10, 10, 10,
+        19, 21, 21, 20, 19, 17, 16, 14, 13, 12, 11, 11, 10, 10, 9, 10, 18, 19,
+        19, 19, 18, 16, 15, 14, 12, 12, 11, 10, 9, 9, 9, 9, 18, 19, 19, 19, 18,
+        16, 15, 14, 12, 12, 10, 10, 9, 9, 9, 9, 16, 17, 17, 18, 17, 15, 14, 13,
+        12, 11, 10, 10, 9, 9, 8, 8, 16, 17, 17, 17, 16, 15, 14, 13, 11, 11, 10,
+        10, 9, 8, 8, 8, 14, 16, 16, 16, 15, 14, 13, 12, 11, 11, 9, 9, 8, 8, 8,
+        8, 14, 15, 15, 16, 15, 14, 13, 12, 11, 10, 9, 9, 8, 8, 8, 8, 13, 14, 14,
+        15, 14, 13, 12, 11, 10, 10, 9, 9, 8, 8, 7, 7, 13, 14, 14, 14, 14, 13,
+        12, 11, 10, 10, 9, 8, 8, 7, 7, 7, 12, 14, 14, 14, 14, 13, 12, 11, 10,
+        10, 8, 8, 8, 7, 7, 7, 12, 13, 13, 14, 13, 12, 11, 11, 10, 9, 8, 8, 7, 7,
+        7, 7, 12, 13, 13, 13, 13, 12, 11, 10, 10, 9, 8, 8, 7, 7, 7, 7, 11, 12,
+        12, 13, 13, 12, 11, 10, 10, 9, 9, 8, 7, 7, 7, 7, 11, 12, 12, 13, 13, 11,
+        11, 10, 10, 9, 9, 8, 8, 7, 7, 6,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 32, 32, 32, 31, 30, 28, 28, 26, 26, 23, 22, 21, 20,
+        19, 18, 18, 16, 16, 14, 14, 13, 13, 12, 12, 12, 11, 11, 33, 32, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 29, 28, 27, 25, 24, 23, 21, 21, 19, 19, 17,
+        17, 16, 15, 14, 14, 14, 13, 13, 12, 12, 33, 32, 32, 32, 32, 31, 31, 31,
+        30, 30, 29, 29, 27, 26, 25, 24, 23, 21, 21, 19, 19, 17, 17, 16, 15, 14,
+        14, 14, 13, 13, 12, 12, 32, 32, 32, 31, 31, 30, 29, 29, 28, 28, 27, 27,
+        26, 25, 24, 23, 22, 21, 20, 19, 19, 18, 17, 16, 16, 15, 14, 14, 14, 13,
+        13, 13, 31, 31, 31, 31, 30, 29, 28, 28, 27, 26, 24, 24, 23, 23, 22, 21,
+        20, 20, 19, 18, 18, 17, 16, 15, 15, 14, 14, 14, 13, 13, 13, 13, 28, 29,
+        29, 30, 29, 28, 28, 27, 25, 24, 21, 21, 20, 20, 19, 19, 18, 17, 17, 16,
+        16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 26, 26, 26, 27, 27, 26,
+        26, 25, 23, 23, 20, 20, 19, 18, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13,
+        13, 12, 12, 12, 11, 11, 11, 11, 23, 24, 24, 25, 25, 24, 24, 24, 22, 21,
+        19, 19, 18, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 11, 11, 11,
+        11, 10, 10, 10, 20, 21, 21, 22, 22, 21, 21, 21, 20, 19, 18, 17, 16, 16,
+        15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10,
+        19, 20, 20, 21, 21, 20, 21, 21, 19, 19, 17, 17, 16, 15, 14, 14, 13, 13,
+        12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 16, 17, 17, 17, 17,
+        17, 18, 18, 17, 16, 15, 15, 14, 14, 13, 12, 12, 11, 11, 11, 10, 10, 10,
+        9, 9, 9, 9, 8, 8, 8, 9, 9, 16, 16, 17, 17, 17, 17, 17, 17, 16, 16, 15,
+        15, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8, 8,
+        8, 13, 14, 14, 14, 14, 14, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 11,
+        10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 7, 7, 7, 8, 13, 13, 13, 14, 14, 14,
+        14, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10, 9, 9, 9, 8, 8, 8, 8,
+        7, 7, 7, 7, 7, 7, 12, 12, 12, 13, 13, 13, 13, 14, 13, 13, 12, 12, 12,
+        11, 11, 11, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 11, 12,
+        12, 13, 13, 13, 13, 13, 13, 12, 12, 12, 12, 11, 11, 10, 10, 10, 10, 9,
+        9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 6,
+        /* Size 4x16 */
+        33, 28, 19, 13, 32, 29, 20, 13, 32, 29, 21, 14, 32, 28, 21, 14, 31, 25,
+        19, 14, 30, 21, 17, 13, 28, 20, 16, 12, 25, 19, 14, 11, 23, 18, 13, 10,
+        21, 17, 12, 10, 19, 16, 12, 9, 17, 15, 11, 8, 15, 14, 10, 8, 14, 13, 10,
+        7, 13, 12, 9, 7, 12, 12, 9, 7,
+        /* Size 16x4 */
+        33, 32, 32, 32, 31, 30, 28, 25, 23, 21, 19, 17, 15, 14, 13, 12, 28, 29,
+        29, 28, 25, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 12, 19, 20, 21, 21,
+        19, 17, 16, 14, 13, 12, 12, 11, 10, 10, 9, 9, 13, 13, 14, 14, 14, 13,
+        12, 11, 10, 10, 9, 8, 8, 7, 7, 7,
+        /* Size 8x32 */
+        32, 33, 31, 26, 20, 16, 13, 12, 33, 32, 31, 26, 21, 17, 14, 12, 33, 32,
+        31, 26, 21, 17, 14, 12, 33, 32, 31, 27, 22, 17, 14, 13, 33, 32, 30, 27,
+        22, 17, 14, 13, 32, 31, 29, 26, 21, 17, 14, 13, 32, 31, 28, 26, 21, 18,
+        15, 13, 32, 31, 28, 25, 21, 18, 15, 14, 31, 30, 27, 23, 20, 17, 14, 13,
+        30, 30, 26, 23, 19, 16, 14, 13, 28, 29, 24, 20, 18, 15, 13, 12, 28, 29,
+        24, 20, 17, 15, 13, 12, 26, 27, 23, 19, 16, 14, 12, 12, 26, 26, 23, 18,
+        16, 14, 12, 11, 23, 25, 22, 17, 15, 13, 11, 11, 22, 24, 21, 17, 14, 12,
+        11, 11, 21, 23, 20, 17, 14, 12, 11, 10, 20, 21, 20, 16, 13, 11, 10, 10,
+        19, 21, 19, 16, 13, 11, 10, 9, 18, 19, 18, 15, 12, 11, 9, 9, 18, 19, 18,
+        15, 12, 10, 9, 9, 16, 17, 17, 14, 12, 10, 9, 8, 16, 17, 16, 14, 11, 10,
+        9, 8, 14, 16, 15, 13, 11, 9, 8, 8, 14, 15, 15, 13, 11, 9, 8, 8, 13, 14,
+        14, 12, 10, 9, 8, 7, 13, 14, 14, 12, 10, 9, 8, 7, 12, 14, 14, 12, 10, 8,
+        8, 7, 12, 13, 13, 11, 10, 8, 7, 7, 12, 13, 13, 11, 10, 8, 7, 7, 11, 12,
+        13, 11, 10, 9, 7, 7, 11, 12, 13, 11, 10, 9, 8, 7,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 32, 32, 32, 31, 30, 28, 28, 26, 26, 23, 22, 21, 20,
+        19, 18, 18, 16, 16, 14, 14, 13, 13, 12, 12, 12, 11, 11, 33, 32, 32, 32,
+        32, 31, 31, 31, 30, 30, 29, 29, 27, 26, 25, 24, 23, 21, 21, 19, 19, 17,
+        17, 16, 15, 14, 14, 14, 13, 13, 12, 12, 31, 31, 31, 31, 30, 29, 28, 28,
+        27, 26, 24, 24, 23, 23, 22, 21, 20, 20, 19, 18, 18, 17, 16, 15, 15, 14,
+        14, 14, 13, 13, 13, 13, 26, 26, 26, 27, 27, 26, 26, 25, 23, 23, 20, 20,
+        19, 18, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11,
+        11, 11, 20, 21, 21, 22, 22, 21, 21, 21, 20, 19, 18, 17, 16, 16, 15, 14,
+        14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 16, 17,
+        17, 17, 17, 17, 18, 18, 17, 16, 15, 15, 14, 14, 13, 12, 12, 11, 11, 11,
+        10, 10, 10, 9, 9, 9, 9, 8, 8, 8, 9, 9, 13, 14, 14, 14, 14, 14, 15, 15,
+        14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8,
+        7, 7, 7, 8, 12, 12, 12, 13, 13, 13, 13, 14, 13, 13, 12, 12, 12, 11, 11,
+        11, 10, 10, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7 },
+      { /* Chroma */
+        /* Size 4x4 */
+        32, 22, 21, 18, 22, 19, 19, 17, 21, 19, 15, 13, 18, 17, 13, 11,
+        /* Size 8x8 */
+        33, 30, 24, 22, 21, 19, 17, 16, 30, 26, 23, 22, 22, 20, 18, 17, 24, 23,
+        21, 21, 20, 19, 18, 17, 22, 22, 21, 19, 18, 17, 16, 16, 21, 22, 20, 18,
+        16, 15, 14, 14, 19, 20, 19, 17, 15, 13, 12, 12, 17, 18, 18, 16, 14, 12,
+        12, 11, 16, 17, 17, 16, 14, 12, 11, 11,
+        /* Size 16x16 */
+        32, 33, 33, 29, 26, 21, 21, 21, 20, 20, 19, 18, 17, 16, 16, 15, 33, 33,
+        32, 28, 25, 22, 22, 22, 21, 21, 20, 19, 18, 17, 17, 16, 33, 32, 30, 26,
+        24, 22, 22, 23, 22, 22, 21, 20, 19, 18, 17, 17, 29, 28, 26, 23, 22, 22,
+        22, 23, 22, 22, 21, 20, 19, 18, 18, 17, 26, 25, 24, 22, 21, 20, 21, 21,
+        21, 21, 20, 19, 19, 18, 17, 17, 21, 22, 22, 22, 20, 19, 19, 19, 19, 19,
+        19, 18, 17, 17, 17, 17, 21, 22, 22, 22, 21, 19, 19, 19, 18, 18, 18, 17,
+        17, 16, 16, 16, 21, 22, 23, 23, 21, 19, 19, 18, 17, 17, 17, 16, 16, 15,
+        15, 15, 20, 21, 22, 22, 21, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14,
+        20, 21, 22, 22, 21, 19, 18, 17, 16, 16, 15, 14, 14, 14, 13, 13, 19, 20,
+        21, 21, 20, 19, 18, 17, 16, 15, 14, 14, 13, 13, 13, 13, 18, 19, 20, 20,
+        19, 18, 17, 16, 15, 14, 14, 13, 13, 12, 12, 12, 17, 18, 19, 19, 19, 17,
+        17, 16, 15, 14, 13, 13, 12, 12, 12, 12, 16, 17, 18, 18, 18, 17, 16, 15,
+        14, 14, 13, 12, 12, 11, 11, 11, 16, 17, 17, 18, 17, 17, 16, 15, 14, 13,
+        13, 12, 12, 11, 11, 11, 15, 16, 17, 17, 17, 17, 16, 15, 14, 13, 13, 12,
+        12, 11, 11, 10,
+        /* Size 32x32 */
+        32, 33, 33, 34, 33, 31, 29, 28, 26, 25, 21, 21, 21, 21, 21, 20, 20, 20,
+        20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 33, 33, 33, 33,
+        32, 30, 28, 27, 25, 24, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19,
+        19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 33, 33, 33, 33, 32, 29, 28, 26,
+        25, 24, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 19, 19, 18, 18, 17,
+        17, 17, 17, 16, 16, 16, 34, 33, 33, 32, 31, 29, 27, 26, 24, 24, 22, 22,
+        23, 23, 23, 23, 22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 18, 17, 17,
+        17, 17, 33, 32, 32, 31, 30, 28, 26, 25, 24, 24, 22, 22, 22, 23, 23, 22,
+        22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 31, 30,
+        29, 29, 28, 26, 25, 24, 23, 23, 22, 22, 22, 22, 23, 22, 22, 22, 22, 21,
+        21, 20, 20, 19, 19, 18, 18, 18, 18, 17, 17, 17, 29, 28, 28, 27, 26, 25,
+        23, 22, 22, 22, 22, 22, 22, 22, 23, 22, 22, 22, 22, 21, 21, 20, 20, 20,
+        19, 19, 18, 18, 18, 18, 17, 17, 28, 27, 26, 26, 25, 24, 22, 22, 22, 22,
+        21, 22, 22, 22, 23, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 19, 19,
+        18, 18, 18, 18, 26, 25, 25, 24, 24, 23, 22, 22, 21, 21, 20, 21, 21, 21,
+        21, 21, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17,
+        25, 24, 24, 24, 24, 23, 22, 22, 21, 21, 20, 20, 21, 21, 21, 21, 20, 20,
+        20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 21, 22, 22, 22,
+        22, 22, 22, 21, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18,
+        18, 18, 17, 17, 17, 17, 17, 17, 17, 17, 21, 22, 22, 22, 22, 22, 22, 22,
+        21, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17,
+        17, 17, 16, 16, 16, 16, 21, 22, 22, 23, 22, 22, 22, 22, 21, 21, 19, 19,
+        19, 19, 19, 18, 18, 18, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 16,
+        16, 16, 21, 22, 22, 23, 23, 22, 22, 22, 21, 21, 19, 19, 19, 19, 18, 18,
+        18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 15, 15, 21, 22,
+        22, 23, 23, 23, 23, 23, 21, 21, 19, 19, 19, 18, 18, 17, 17, 17, 17, 17,
+        17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 15, 20, 22, 22, 23, 22, 22,
+        22, 22, 21, 21, 19, 19, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 16, 15,
+        15, 15, 15, 15, 15, 15, 14, 14, 20, 21, 21, 22, 22, 22, 22, 22, 21, 20,
+        19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14,
+        14, 14, 14, 14, 20, 21, 21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 18, 18,
+        17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+        20, 20, 21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 18, 18, 17, 17, 16, 16,
+        16, 15, 15, 15, 14, 14, 14, 14, 14, 14, 13, 13, 13, 14, 19, 20, 20, 21,
+        21, 21, 21, 21, 20, 20, 19, 19, 18, 17, 17, 16, 16, 15, 15, 15, 15, 14,
+        14, 14, 13, 13, 13, 13, 13, 13, 13, 13, 19, 20, 20, 21, 21, 21, 21, 21,
+        20, 20, 19, 18, 18, 17, 17, 16, 16, 15, 15, 15, 14, 14, 14, 14, 13, 13,
+        13, 13, 13, 13, 13, 13, 18, 19, 19, 20, 20, 20, 20, 20, 20, 19, 18, 18,
+        17, 17, 16, 16, 15, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 12, 12, 12,
+        12, 12, 18, 19, 19, 20, 20, 20, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16,
+        15, 15, 14, 14, 14, 13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 17, 18,
+        18, 19, 19, 19, 20, 20, 19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14,
+        14, 13, 13, 12, 12, 12, 12, 12, 12, 12, 12, 12, 17, 18, 18, 19, 19, 19,
+        19, 19, 19, 18, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 13, 12,
+        12, 12, 12, 12, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18, 19, 19, 18, 18,
+        17, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 12, 11,
+        11, 11, 11, 11, 16, 17, 17, 18, 18, 18, 18, 19, 18, 18, 17, 17, 16, 16,
+        15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11,
+        16, 17, 17, 18, 18, 18, 18, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14,
+        14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 16, 16, 17, 17,
+        17, 18, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12,
+        12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17, 18, 18,
+        17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11,
+        11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17, 17, 18, 17, 17, 17, 16,
+        16, 15, 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11,
+        10, 11, 15, 16, 16, 17, 17, 17, 17, 18, 17, 17, 17, 16, 16, 15, 15, 14,
+        14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 10,
+        /* Size 4x8 */
+        33, 22, 20, 17, 28, 22, 22, 18, 24, 20, 20, 18, 23, 19, 18, 16, 22, 19,
+        16, 14, 20, 18, 15, 12, 18, 17, 14, 11, 17, 16, 13, 11,
+        /* Size 8x4 */
+        33, 28, 24, 23, 22, 20, 18, 17, 22, 22, 20, 19, 19, 18, 17, 16, 20, 22,
+        20, 18, 16, 15, 14, 13, 17, 18, 18, 16, 14, 12, 11, 11,
+        /* Size 8x16 */
+        32, 32, 26, 21, 20, 18, 16, 15, 33, 31, 25, 22, 21, 19, 17, 16, 33, 29,
+        24, 22, 22, 20, 18, 17, 29, 26, 22, 22, 22, 20, 19, 18, 25, 24, 21, 21,
+        21, 20, 18, 17, 21, 22, 20, 19, 19, 18, 17, 17, 21, 22, 21, 19, 18, 17,
+        16, 16, 21, 23, 21, 18, 17, 16, 15, 15, 20, 22, 21, 18, 16, 15, 14, 14,
+        20, 21, 20, 18, 16, 14, 14, 13, 19, 20, 20, 17, 15, 14, 13, 13, 18, 20,
+        19, 17, 15, 13, 12, 12, 17, 19, 18, 16, 14, 13, 12, 12, 16, 18, 18, 16,
+        14, 12, 12, 11, 16, 17, 17, 16, 14, 12, 11, 11, 15, 17, 17, 16, 14, 13,
+        12, 11,
+        /* Size 16x8 */
+        32, 33, 33, 29, 25, 21, 21, 21, 20, 20, 19, 18, 17, 16, 16, 15, 32, 31,
+        29, 26, 24, 22, 22, 23, 22, 21, 20, 20, 19, 18, 17, 17, 26, 25, 24, 22,
+        21, 20, 21, 21, 21, 20, 20, 19, 18, 18, 17, 17, 21, 22, 22, 22, 21, 19,
+        19, 18, 18, 18, 17, 17, 16, 16, 16, 16, 20, 21, 22, 22, 21, 19, 18, 17,
+        16, 16, 15, 15, 14, 14, 14, 14, 18, 19, 20, 20, 20, 18, 17, 16, 15, 14,
+        14, 13, 13, 12, 12, 13, 16, 17, 18, 19, 18, 17, 16, 15, 14, 14, 13, 12,
+        12, 12, 11, 12, 15, 16, 17, 18, 17, 17, 16, 15, 14, 13, 13, 12, 12, 11,
+        11, 11,
+        /* Size 16x32 */
+        32, 33, 32, 28, 26, 21, 21, 21, 20, 20, 18, 18, 16, 16, 15, 15, 33, 33,
+        31, 27, 25, 22, 22, 22, 21, 20, 19, 19, 17, 17, 16, 16, 33, 33, 31, 27,
+        25, 22, 22, 22, 21, 21, 19, 19, 17, 17, 16, 16, 34, 32, 31, 26, 24, 22,
+        23, 23, 22, 21, 20, 20, 18, 18, 17, 17, 33, 31, 29, 25, 24, 22, 22, 23,
+        22, 21, 20, 20, 18, 18, 17, 17, 31, 28, 28, 24, 23, 22, 22, 22, 22, 22,
+        20, 20, 18, 18, 17, 17, 29, 27, 26, 23, 22, 22, 22, 23, 22, 22, 20, 20,
+        19, 18, 18, 17, 28, 26, 25, 22, 22, 22, 22, 23, 22, 22, 20, 20, 19, 19,
+        18, 18, 25, 24, 24, 22, 21, 21, 21, 21, 21, 20, 20, 19, 18, 18, 17, 18,
+        24, 24, 24, 22, 21, 20, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 21, 22,
+        22, 21, 20, 19, 19, 19, 19, 19, 18, 18, 17, 17, 17, 17, 21, 22, 22, 21,
+        20, 19, 19, 19, 19, 19, 18, 18, 17, 17, 16, 16, 21, 22, 22, 22, 21, 19,
+        19, 18, 18, 18, 17, 17, 16, 16, 16, 16, 21, 23, 22, 22, 21, 19, 19, 18,
+        18, 18, 17, 17, 16, 16, 16, 15, 21, 23, 23, 22, 21, 19, 18, 18, 17, 17,
+        16, 16, 15, 15, 15, 15, 21, 22, 22, 22, 21, 19, 18, 17, 17, 17, 16, 16,
+        15, 15, 15, 15, 20, 22, 22, 22, 21, 19, 18, 17, 16, 16, 15, 15, 14, 14,
+        14, 14, 20, 22, 22, 22, 21, 19, 18, 17, 16, 16, 15, 15, 14, 14, 14, 14,
+        20, 21, 21, 22, 20, 19, 18, 17, 16, 16, 14, 14, 14, 14, 13, 14, 19, 20,
+        21, 21, 20, 19, 17, 17, 15, 15, 14, 14, 13, 13, 13, 13, 19, 20, 20, 21,
+        20, 19, 17, 17, 15, 15, 14, 14, 13, 13, 13, 13, 18, 20, 20, 20, 20, 18,
+        17, 16, 15, 15, 13, 13, 12, 12, 12, 12, 18, 20, 20, 20, 19, 18, 17, 16,
+        15, 14, 13, 13, 12, 12, 12, 12, 17, 19, 19, 20, 19, 18, 17, 16, 14, 14,
+        13, 13, 12, 12, 12, 12, 17, 18, 19, 19, 18, 17, 16, 16, 14, 14, 13, 13,
+        12, 12, 12, 12, 16, 18, 18, 19, 18, 17, 16, 15, 14, 14, 12, 12, 12, 11,
+        11, 11, 16, 18, 18, 19, 18, 17, 16, 15, 14, 14, 12, 12, 12, 11, 11, 11,
+        16, 17, 18, 18, 18, 17, 16, 15, 14, 14, 12, 12, 11, 11, 11, 11, 16, 17,
+        17, 18, 17, 17, 16, 15, 14, 13, 12, 12, 11, 11, 11, 11, 15, 17, 17, 18,
+        17, 16, 16, 15, 14, 13, 12, 12, 11, 11, 11, 11, 15, 17, 17, 18, 17, 16,
+        16, 14, 14, 13, 13, 12, 12, 11, 11, 11, 15, 17, 17, 17, 17, 16, 16, 14,
+        14, 13, 13, 12, 12, 11, 11, 10,
+        /* Size 32x16 */
+        32, 33, 33, 34, 33, 31, 29, 28, 25, 24, 21, 21, 21, 21, 21, 21, 20, 20,
+        20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 33, 33, 33, 32,
+        31, 28, 27, 26, 24, 24, 22, 22, 22, 23, 23, 22, 22, 22, 21, 20, 20, 20,
+        20, 19, 18, 18, 18, 17, 17, 17, 17, 17, 32, 31, 31, 31, 29, 28, 26, 25,
+        24, 24, 22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 18,
+        18, 18, 17, 17, 17, 17, 28, 27, 27, 26, 25, 24, 23, 22, 22, 22, 21, 21,
+        22, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18,
+        18, 17, 26, 25, 25, 24, 24, 23, 22, 22, 21, 21, 20, 20, 21, 21, 21, 21,
+        21, 21, 20, 20, 20, 20, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 21, 22,
+        22, 22, 22, 22, 22, 22, 21, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        19, 18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 21, 22, 22, 23, 22, 22,
+        22, 22, 21, 21, 19, 19, 19, 19, 18, 18, 18, 18, 18, 17, 17, 17, 17, 17,
+        16, 16, 16, 16, 16, 16, 16, 16, 21, 22, 22, 23, 23, 22, 23, 23, 21, 21,
+        19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15,
+        15, 15, 14, 14, 20, 21, 21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 18, 18,
+        17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+        20, 20, 21, 21, 21, 22, 22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16,
+        16, 15, 15, 15, 14, 14, 14, 14, 14, 14, 13, 13, 13, 13, 18, 19, 19, 20,
+        20, 20, 20, 20, 20, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 13,
+        13, 13, 13, 12, 12, 12, 12, 12, 13, 13, 18, 19, 19, 20, 20, 20, 20, 20,
+        19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 13, 13, 12,
+        12, 12, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18, 19, 19, 18, 18, 17, 17,
+        16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 12, 11, 11, 11,
+        12, 12, 16, 17, 17, 18, 18, 18, 18, 19, 18, 18, 17, 17, 16, 16, 15, 15,
+        14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 15, 16,
+        16, 17, 17, 17, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 13, 13,
+        13, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 15, 16, 16, 17, 17, 17,
+        17, 18, 18, 17, 17, 16, 16, 15, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12,
+        12, 11, 11, 11, 11, 11, 11, 10,
+        /* Size 4x16 */
+        33, 21, 20, 16, 33, 22, 21, 17, 31, 22, 21, 18, 27, 22, 22, 18, 24, 21,
+        20, 18, 22, 19, 19, 17, 22, 19, 18, 16, 23, 19, 17, 15, 22, 19, 16, 14,
+        21, 19, 16, 14, 20, 19, 15, 13, 20, 18, 14, 12, 18, 17, 14, 12, 18, 17,
+        14, 11, 17, 17, 13, 11, 17, 16, 13, 11,
+        /* Size 16x4 */
+        33, 33, 31, 27, 24, 22, 22, 23, 22, 21, 20, 20, 18, 18, 17, 17, 21, 22,
+        22, 22, 21, 19, 19, 19, 19, 19, 19, 18, 17, 17, 17, 16, 20, 21, 21, 22,
+        20, 19, 18, 17, 16, 16, 15, 14, 14, 14, 13, 13, 16, 17, 18, 18, 18, 17,
+        16, 15, 14, 14, 13, 12, 12, 11, 11, 11,
+        /* Size 8x32 */
+        32, 32, 26, 21, 20, 18, 16, 15, 33, 31, 25, 22, 21, 19, 17, 16, 33, 31,
+        25, 22, 21, 19, 17, 16, 34, 31, 24, 23, 22, 20, 18, 17, 33, 29, 24, 22,
+        22, 20, 18, 17, 31, 28, 23, 22, 22, 20, 18, 17, 29, 26, 22, 22, 22, 20,
+        19, 18, 28, 25, 22, 22, 22, 20, 19, 18, 25, 24, 21, 21, 21, 20, 18, 17,
+        24, 24, 21, 21, 20, 19, 18, 17, 21, 22, 20, 19, 19, 18, 17, 17, 21, 22,
+        20, 19, 19, 18, 17, 16, 21, 22, 21, 19, 18, 17, 16, 16, 21, 22, 21, 19,
+        18, 17, 16, 16, 21, 23, 21, 18, 17, 16, 15, 15, 21, 22, 21, 18, 17, 16,
+        15, 15, 20, 22, 21, 18, 16, 15, 14, 14, 20, 22, 21, 18, 16, 15, 14, 14,
+        20, 21, 20, 18, 16, 14, 14, 13, 19, 21, 20, 17, 15, 14, 13, 13, 19, 20,
+        20, 17, 15, 14, 13, 13, 18, 20, 20, 17, 15, 13, 12, 12, 18, 20, 19, 17,
+        15, 13, 12, 12, 17, 19, 19, 17, 14, 13, 12, 12, 17, 19, 18, 16, 14, 13,
+        12, 12, 16, 18, 18, 16, 14, 12, 12, 11, 16, 18, 18, 16, 14, 12, 12, 11,
+        16, 18, 18, 16, 14, 12, 11, 11, 16, 17, 17, 16, 14, 12, 11, 11, 15, 17,
+        17, 16, 14, 12, 11, 11, 15, 17, 17, 16, 14, 13, 12, 11, 15, 17, 17, 16,
+        14, 13, 12, 11,
+        /* Size 32x8 */
+        32, 33, 33, 34, 33, 31, 29, 28, 25, 24, 21, 21, 21, 21, 21, 21, 20, 20,
+        20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 32, 31, 31, 31,
+        29, 28, 26, 25, 24, 24, 22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20,
+        20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 26, 25, 25, 24, 24, 23, 22, 22,
+        21, 21, 20, 20, 21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 19, 19, 18, 18,
+        18, 18, 17, 17, 17, 17, 21, 22, 22, 23, 22, 22, 22, 22, 21, 21, 19, 19,
+        19, 19, 18, 18, 18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16,
+        16, 16, 20, 21, 21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 18, 18, 17, 17,
+        16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14, 18, 19,
+        19, 20, 20, 20, 20, 20, 20, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14,
+        14, 13, 13, 13, 13, 12, 12, 12, 12, 12, 13, 13, 16, 17, 17, 18, 18, 18,
+        19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12,
+        12, 12, 12, 11, 11, 11, 12, 12, 15, 16, 16, 17, 17, 17, 18, 18, 17, 17,
+        17, 16, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11,
+        11, 11, 11, 11 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 30, 21, 14, 30, 21, 17, 13, 21, 17, 12, 10, 14, 13, 10, 8,
+        /* Size 8x8 */
+        32, 32, 30, 27, 22, 18, 15, 13, 32, 31, 29, 26, 23, 19, 16, 14, 30, 29,
+        26, 23, 20, 18, 15, 13, 27, 26, 23, 19, 17, 15, 13, 12, 22, 23, 20, 17,
+        14, 13, 11, 10, 18, 19, 18, 15, 13, 11, 10, 9, 15, 16, 15, 13, 11, 10,
+        9, 8, 13, 14, 13, 12, 10, 9, 8, 7,
+        /* Size 16x16 */
+        32, 33, 33, 33, 32, 30, 28, 26, 23, 21, 19, 17, 16, 14, 13, 12, 33, 32,
+        32, 32, 32, 30, 29, 27, 24, 22, 20, 18, 17, 15, 13, 13, 33, 32, 32, 32,
+        32, 31, 30, 28, 25, 23, 21, 19, 17, 16, 14, 14, 33, 32, 32, 31, 30, 29,
+        28, 26, 24, 23, 20, 19, 17, 16, 14, 14, 32, 32, 32, 30, 29, 28, 27, 26,
+        24, 22, 21, 19, 18, 16, 15, 14, 30, 30, 31, 29, 28, 26, 24, 23, 22, 20,
+        19, 18, 16, 15, 14, 13, 28, 29, 30, 28, 27, 24, 21, 20, 19, 18, 17, 16,
+        15, 14, 13, 13, 26, 27, 28, 26, 26, 23, 20, 19, 18, 17, 16, 15, 14, 13,
+        12, 12, 23, 24, 25, 24, 24, 22, 19, 18, 16, 15, 14, 14, 13, 12, 11, 11,
+        21, 22, 23, 23, 22, 20, 18, 17, 15, 14, 13, 13, 12, 11, 11, 10, 19, 20,
+        21, 20, 21, 19, 17, 16, 14, 13, 12, 12, 11, 11, 10, 10, 17, 18, 19, 19,
+        19, 18, 16, 15, 14, 13, 12, 11, 10, 10, 9, 9, 16, 17, 17, 17, 18, 16,
+        15, 14, 13, 12, 11, 10, 10, 9, 9, 8, 14, 15, 16, 16, 16, 15, 14, 13, 12,
+        11, 11, 10, 9, 9, 8, 8, 13, 13, 14, 14, 15, 14, 13, 12, 11, 11, 10, 9,
+        9, 8, 8, 7, 12, 13, 14, 14, 14, 13, 13, 12, 11, 10, 10, 9, 8, 8, 7, 7,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 30, 30, 28, 28, 26, 26, 23, 23, 21,
+        21, 19, 19, 17, 17, 16, 16, 14, 14, 13, 13, 12, 12, 12, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 30, 30, 29, 29, 27, 27, 24, 24, 22, 22, 20, 20, 18,
+        18, 17, 17, 15, 15, 13, 13, 13, 13, 12, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 30, 30, 29, 29, 27, 27, 24, 24, 22, 22, 20, 20, 18, 18, 17, 17, 15,
+        15, 13, 13, 13, 13, 12, 33, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30,
+        30, 28, 28, 25, 25, 23, 23, 21, 21, 19, 19, 17, 17, 16, 16, 14, 14, 14,
+        14, 13, 33, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 28, 28, 25,
+        25, 23, 23, 21, 21, 19, 19, 17, 17, 16, 16, 14, 14, 14, 14, 13, 33, 32,
+        32, 32, 32, 31, 31, 30, 30, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 20,
+        20, 19, 19, 17, 17, 16, 16, 14, 14, 14, 14, 13, 33, 32, 32, 32, 32, 31,
+        31, 30, 30, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 20, 20, 19, 19, 17,
+        17, 16, 16, 14, 14, 14, 14, 13, 32, 32, 32, 32, 32, 30, 30, 29, 29, 28,
+        28, 27, 27, 26, 26, 24, 24, 22, 22, 21, 21, 19, 19, 18, 18, 16, 16, 15,
+        15, 14, 14, 14, 32, 32, 32, 32, 32, 30, 30, 29, 29, 28, 28, 27, 27, 26,
+        26, 24, 24, 22, 22, 21, 21, 19, 19, 18, 18, 16, 16, 15, 15, 14, 14, 14,
+        30, 30, 30, 31, 31, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 22, 22, 20,
+        20, 19, 19, 18, 18, 16, 16, 15, 15, 14, 14, 13, 13, 13, 30, 30, 30, 31,
+        31, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 22, 22, 20, 20, 19, 19, 18,
+        18, 16, 16, 15, 15, 14, 14, 13, 13, 13, 28, 29, 29, 30, 30, 28, 28, 27,
+        27, 24, 24, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14,
+        14, 13, 13, 13, 13, 12, 28, 29, 29, 30, 30, 28, 28, 27, 27, 24, 24, 21,
+        21, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13,
+        13, 12, 26, 27, 27, 28, 28, 26, 26, 26, 26, 23, 23, 20, 20, 19, 19, 18,
+        18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11, 26, 27,
+        27, 28, 28, 26, 26, 26, 26, 23, 23, 20, 20, 19, 19, 18, 18, 17, 17, 16,
+        16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11, 23, 24, 24, 25, 25, 24,
+        24, 24, 24, 22, 22, 19, 19, 18, 18, 16, 16, 15, 15, 14, 14, 14, 14, 13,
+        13, 12, 12, 11, 11, 11, 11, 11, 23, 24, 24, 25, 25, 24, 24, 24, 24, 22,
+        22, 19, 19, 18, 18, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 11,
+        11, 11, 11, 11, 21, 22, 22, 23, 23, 23, 23, 22, 22, 20, 20, 18, 18, 17,
+        17, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10, 10,
+        21, 22, 22, 23, 23, 23, 23, 22, 22, 20, 20, 18, 18, 17, 17, 15, 15, 14,
+        14, 13, 13, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10, 10, 19, 20, 20, 21,
+        21, 20, 20, 21, 21, 19, 19, 17, 17, 16, 16, 14, 14, 13, 13, 12, 12, 12,
+        12, 11, 11, 11, 11, 10, 10, 10, 10, 9, 19, 20, 20, 21, 21, 20, 20, 21,
+        21, 19, 19, 17, 17, 16, 16, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11,
+        11, 10, 10, 10, 10, 9, 17, 18, 18, 19, 19, 19, 19, 19, 19, 18, 18, 16,
+        16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9,
+        9, 17, 18, 18, 19, 19, 19, 19, 19, 19, 18, 18, 16, 16, 15, 15, 14, 14,
+        13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9, 16, 17, 17, 17,
+        17, 17, 17, 18, 18, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10,
+        10, 10, 10, 9, 9, 9, 9, 8, 8, 8, 16, 17, 17, 17, 17, 17, 17, 18, 18, 16,
+        16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9,
+        8, 8, 8, 14, 15, 15, 16, 16, 16, 16, 16, 16, 15, 15, 14, 14, 13, 13, 12,
+        12, 11, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 14, 15, 15, 16,
+        16, 16, 16, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 10,
+        10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 13, 13, 13, 14, 14, 14, 14, 15, 15, 14,
+        14, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 7,
+        7, 7, 13, 13, 13, 14, 14, 14, 14, 15, 15, 14, 14, 13, 13, 12, 12, 11,
+        11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 12, 13, 13, 14, 14,
+        14, 14, 14, 14, 13, 13, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 8,
+        8, 8, 8, 7, 7, 7, 7, 7, 12, 13, 13, 14, 14, 14, 14, 14, 14, 13, 13, 13,
+        13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 12,
+        12, 12, 13, 13, 13, 13, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10,
+        9, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7,
+        /* Size 4x8 */
+        32, 29, 20, 14, 32, 28, 20, 14, 30, 24, 19, 14, 28, 20, 16, 12, 23, 18,
+        13, 11, 19, 16, 12, 9, 16, 14, 11, 8, 14, 13, 10, 8,
+        /* Size 8x4 */
+        32, 32, 30, 28, 23, 19, 16, 14, 29, 28, 24, 20, 18, 16, 14, 13, 20, 20,
+        19, 16, 13, 12, 11, 10, 14, 14, 14, 12, 11, 9, 8, 8,
+        /* Size 8x16 */
+        32, 33, 32, 28, 23, 19, 16, 13, 33, 32, 32, 29, 24, 20, 17, 14, 33, 32,
+        31, 30, 25, 21, 17, 14, 32, 32, 30, 28, 24, 20, 17, 14, 32, 31, 29, 27,
+        24, 21, 18, 15, 30, 30, 28, 24, 21, 19, 16, 14, 28, 30, 27, 21, 19, 17,
+        15, 13, 26, 28, 26, 20, 18, 16, 14, 12, 23, 25, 24, 19, 16, 14, 13, 11,
+        21, 23, 22, 18, 15, 13, 12, 11, 19, 21, 20, 17, 14, 12, 11, 10, 18, 19,
+        19, 16, 14, 12, 10, 9, 16, 17, 18, 15, 13, 11, 10, 9, 14, 16, 16, 14,
+        12, 11, 9, 8, 13, 14, 15, 13, 11, 10, 9, 8, 12, 14, 14, 13, 11, 10, 8,
+        8,
+        /* Size 16x8 */
+        32, 33, 33, 32, 32, 30, 28, 26, 23, 21, 19, 18, 16, 14, 13, 12, 33, 32,
+        32, 32, 31, 30, 30, 28, 25, 23, 21, 19, 17, 16, 14, 14, 32, 32, 31, 30,
+        29, 28, 27, 26, 24, 22, 20, 19, 18, 16, 15, 14, 28, 29, 30, 28, 27, 24,
+        21, 20, 19, 18, 17, 16, 15, 14, 13, 13, 23, 24, 25, 24, 24, 21, 19, 18,
+        16, 15, 14, 14, 13, 12, 11, 11, 19, 20, 21, 20, 21, 19, 17, 16, 14, 13,
+        12, 12, 11, 11, 10, 10, 16, 17, 17, 17, 18, 16, 15, 14, 13, 12, 11, 10,
+        10, 9, 9, 8, 13, 14, 14, 14, 15, 14, 13, 12, 11, 11, 10, 9, 9, 8, 8, 8,
+        /* Size 16x32 */
+        32, 33, 33, 32, 32, 28, 28, 23, 23, 19, 19, 16, 16, 13, 13, 12, 33, 32,
+        32, 32, 32, 29, 29, 24, 24, 20, 20, 17, 17, 14, 14, 12, 33, 32, 32, 32,
+        32, 29, 29, 24, 24, 20, 20, 17, 17, 14, 14, 12, 33, 32, 32, 31, 31, 30,
+        30, 25, 25, 21, 21, 17, 17, 14, 14, 13, 33, 32, 32, 31, 31, 30, 30, 25,
+        25, 21, 21, 17, 17, 14, 14, 13, 32, 32, 32, 30, 30, 28, 28, 24, 24, 20,
+        20, 17, 17, 14, 14, 13, 32, 32, 32, 30, 30, 28, 28, 24, 24, 20, 20, 17,
+        17, 14, 14, 13, 32, 31, 31, 29, 29, 27, 27, 24, 24, 21, 21, 18, 18, 15,
+        15, 14, 32, 31, 31, 29, 29, 27, 27, 24, 24, 21, 21, 18, 18, 15, 15, 14,
+        30, 30, 30, 28, 28, 24, 24, 21, 21, 19, 19, 16, 16, 14, 14, 13, 30, 30,
+        30, 28, 28, 24, 24, 21, 21, 19, 19, 16, 16, 14, 14, 13, 28, 30, 30, 27,
+        27, 21, 21, 19, 19, 17, 17, 15, 15, 13, 13, 12, 28, 30, 30, 27, 27, 21,
+        21, 19, 19, 17, 17, 15, 15, 13, 13, 12, 26, 28, 28, 26, 26, 20, 20, 18,
+        18, 16, 16, 14, 14, 12, 12, 12, 26, 28, 28, 26, 26, 20, 20, 18, 18, 16,
+        16, 14, 14, 12, 12, 12, 23, 25, 25, 24, 24, 19, 19, 16, 16, 14, 14, 13,
+        13, 11, 11, 11, 23, 25, 25, 24, 24, 19, 19, 16, 16, 14, 14, 13, 13, 11,
+        11, 11, 21, 23, 23, 22, 22, 18, 18, 15, 15, 13, 13, 12, 12, 11, 11, 10,
+        21, 23, 23, 22, 22, 18, 18, 15, 15, 13, 13, 12, 12, 11, 11, 10, 19, 21,
+        21, 20, 20, 17, 17, 14, 14, 12, 12, 11, 11, 10, 10, 9, 19, 21, 21, 20,
+        20, 17, 17, 14, 14, 12, 12, 11, 11, 10, 10, 9, 18, 19, 19, 19, 19, 16,
+        16, 14, 14, 12, 12, 10, 10, 9, 9, 9, 18, 19, 19, 19, 19, 16, 16, 14, 14,
+        12, 12, 10, 10, 9, 9, 9, 16, 17, 17, 18, 18, 15, 15, 13, 13, 11, 11, 10,
+        10, 9, 9, 8, 16, 17, 17, 18, 18, 15, 15, 13, 13, 11, 11, 10, 10, 9, 9,
+        8, 14, 16, 16, 16, 16, 14, 14, 12, 12, 11, 11, 9, 9, 8, 8, 8, 14, 16,
+        16, 16, 16, 14, 14, 12, 12, 11, 11, 9, 9, 8, 8, 8, 13, 14, 14, 15, 15,
+        13, 13, 11, 11, 10, 10, 9, 9, 8, 8, 7, 13, 14, 14, 15, 15, 13, 13, 11,
+        11, 10, 10, 9, 9, 8, 8, 7, 12, 14, 14, 14, 14, 13, 13, 11, 11, 10, 10,
+        8, 8, 8, 8, 7, 12, 14, 14, 14, 14, 13, 13, 11, 11, 10, 10, 8, 8, 8, 8,
+        7, 12, 13, 13, 13, 13, 12, 12, 11, 11, 9, 9, 8, 8, 7, 7, 7,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 32, 32, 32, 32, 30, 30, 28, 28, 26, 26, 23, 23, 21,
+        21, 19, 19, 18, 18, 16, 16, 14, 14, 13, 13, 12, 12, 12, 33, 32, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 30, 30, 28, 28, 25, 25, 23, 23, 21, 21, 19,
+        19, 17, 17, 16, 16, 14, 14, 14, 14, 13, 33, 32, 32, 32, 32, 32, 32, 31,
+        31, 30, 30, 30, 30, 28, 28, 25, 25, 23, 23, 21, 21, 19, 19, 17, 17, 16,
+        16, 14, 14, 14, 14, 13, 32, 32, 32, 31, 31, 30, 30, 29, 29, 28, 28, 27,
+        27, 26, 26, 24, 24, 22, 22, 20, 20, 19, 19, 18, 18, 16, 16, 15, 15, 14,
+        14, 13, 32, 32, 32, 31, 31, 30, 30, 29, 29, 28, 28, 27, 27, 26, 26, 24,
+        24, 22, 22, 20, 20, 19, 19, 18, 18, 16, 16, 15, 15, 14, 14, 13, 28, 29,
+        29, 30, 30, 28, 28, 27, 27, 24, 24, 21, 21, 20, 20, 19, 19, 18, 18, 17,
+        17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 13, 12, 28, 29, 29, 30, 30, 28,
+        28, 27, 27, 24, 24, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15,
+        15, 14, 14, 13, 13, 13, 13, 12, 23, 24, 24, 25, 25, 24, 24, 24, 24, 21,
+        21, 19, 19, 18, 18, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 11,
+        11, 11, 11, 11, 23, 24, 24, 25, 25, 24, 24, 24, 24, 21, 21, 19, 19, 18,
+        18, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 11,
+        19, 20, 20, 21, 21, 20, 20, 21, 21, 19, 19, 17, 17, 16, 16, 14, 14, 13,
+        13, 12, 12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 9, 19, 20, 20, 21,
+        21, 20, 20, 21, 21, 19, 19, 17, 17, 16, 16, 14, 14, 13, 13, 12, 12, 12,
+        12, 11, 11, 11, 11, 10, 10, 10, 10, 9, 16, 17, 17, 17, 17, 17, 17, 18,
+        18, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9,
+        9, 9, 9, 8, 8, 8, 16, 17, 17, 17, 17, 17, 17, 18, 18, 16, 16, 15, 15,
+        14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 8, 8, 8, 13,
+        14, 14, 14, 14, 14, 14, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11,
+        10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 13, 14, 14, 14, 14, 14, 14, 15,
+        15, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8,
+        8, 8, 8, 7, 12, 12, 12, 13, 13, 13, 13, 14, 14, 13, 13, 12, 12, 12, 12,
+        11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7,
+        /* Size 4x16 */
+        33, 28, 19, 13, 32, 29, 20, 14, 32, 30, 21, 14, 32, 28, 20, 14, 31, 27,
+        21, 15, 30, 24, 19, 14, 30, 21, 17, 13, 28, 20, 16, 12, 25, 19, 14, 11,
+        23, 18, 13, 11, 21, 17, 12, 10, 19, 16, 12, 9, 17, 15, 11, 9, 16, 14,
+        11, 8, 14, 13, 10, 8, 14, 13, 10, 8,
+        /* Size 16x4 */
+        33, 32, 32, 32, 31, 30, 30, 28, 25, 23, 21, 19, 17, 16, 14, 14, 28, 29,
+        30, 28, 27, 24, 21, 20, 19, 18, 17, 16, 15, 14, 13, 13, 19, 20, 21, 20,
+        21, 19, 17, 16, 14, 13, 12, 12, 11, 11, 10, 10, 13, 14, 14, 14, 15, 14,
+        13, 12, 11, 11, 10, 9, 9, 8, 8, 8,
+        /* Size 8x32 */
+        32, 33, 32, 28, 23, 19, 16, 13, 33, 32, 32, 29, 24, 20, 17, 14, 33, 32,
+        32, 29, 24, 20, 17, 14, 33, 32, 31, 30, 25, 21, 17, 14, 33, 32, 31, 30,
+        25, 21, 17, 14, 32, 32, 30, 28, 24, 20, 17, 14, 32, 32, 30, 28, 24, 20,
+        17, 14, 32, 31, 29, 27, 24, 21, 18, 15, 32, 31, 29, 27, 24, 21, 18, 15,
+        30, 30, 28, 24, 21, 19, 16, 14, 30, 30, 28, 24, 21, 19, 16, 14, 28, 30,
+        27, 21, 19, 17, 15, 13, 28, 30, 27, 21, 19, 17, 15, 13, 26, 28, 26, 20,
+        18, 16, 14, 12, 26, 28, 26, 20, 18, 16, 14, 12, 23, 25, 24, 19, 16, 14,
+        13, 11, 23, 25, 24, 19, 16, 14, 13, 11, 21, 23, 22, 18, 15, 13, 12, 11,
+        21, 23, 22, 18, 15, 13, 12, 11, 19, 21, 20, 17, 14, 12, 11, 10, 19, 21,
+        20, 17, 14, 12, 11, 10, 18, 19, 19, 16, 14, 12, 10, 9, 18, 19, 19, 16,
+        14, 12, 10, 9, 16, 17, 18, 15, 13, 11, 10, 9, 16, 17, 18, 15, 13, 11,
+        10, 9, 14, 16, 16, 14, 12, 11, 9, 8, 14, 16, 16, 14, 12, 11, 9, 8, 13,
+        14, 15, 13, 11, 10, 9, 8, 13, 14, 15, 13, 11, 10, 9, 8, 12, 14, 14, 13,
+        11, 10, 8, 8, 12, 14, 14, 13, 11, 10, 8, 8, 12, 13, 13, 12, 11, 9, 8, 7,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 32, 32, 32, 32, 30, 30, 28, 28, 26, 26, 23, 23, 21,
+        21, 19, 19, 18, 18, 16, 16, 14, 14, 13, 13, 12, 12, 12, 33, 32, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 30, 30, 28, 28, 25, 25, 23, 23, 21, 21, 19,
+        19, 17, 17, 16, 16, 14, 14, 14, 14, 13, 32, 32, 32, 31, 31, 30, 30, 29,
+        29, 28, 28, 27, 27, 26, 26, 24, 24, 22, 22, 20, 20, 19, 19, 18, 18, 16,
+        16, 15, 15, 14, 14, 13, 28, 29, 29, 30, 30, 28, 28, 27, 27, 24, 24, 21,
+        21, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13,
+        13, 12, 23, 24, 24, 25, 25, 24, 24, 24, 24, 21, 21, 19, 19, 18, 18, 16,
+        16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 11, 11, 11, 11, 11, 19, 20,
+        20, 21, 21, 20, 20, 21, 21, 19, 19, 17, 17, 16, 16, 14, 14, 13, 13, 12,
+        12, 12, 12, 11, 11, 11, 11, 10, 10, 10, 10, 9, 16, 17, 17, 17, 17, 17,
+        17, 18, 18, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 10,
+        10, 9, 9, 9, 9, 8, 8, 8, 13, 14, 14, 14, 14, 14, 14, 15, 15, 14, 14, 13,
+        13, 12, 12, 11, 11, 11, 11, 10, 10, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7 },
+      { /* Chroma */
+        /* Size 4x4 */
+        32, 22, 22, 18, 22, 19, 19, 17, 22, 19, 16, 14, 18, 17, 14, 12,
+        /* Size 8x8 */
+        33, 30, 24, 22, 21, 20, 18, 17, 30, 26, 23, 22, 22, 21, 19, 18, 24, 23,
+        21, 21, 20, 20, 19, 18, 22, 22, 21, 19, 18, 18, 17, 16, 21, 22, 20, 18,
+        17, 16, 15, 14, 20, 21, 20, 18, 16, 14, 14, 13, 18, 19, 19, 17, 15, 14,
+        12, 12, 17, 18, 18, 16, 14, 13, 12, 11,
+        /* Size 16x16 */
+        32, 33, 34, 31, 28, 25, 21, 21, 21, 20, 20, 19, 18, 17, 16, 16, 33, 33,
+        33, 30, 27, 24, 22, 22, 22, 21, 20, 20, 19, 18, 17, 17, 34, 33, 32, 29,
+        26, 24, 22, 23, 23, 22, 22, 21, 20, 19, 18, 18, 31, 30, 29, 26, 24, 23,
+        22, 22, 23, 22, 22, 21, 20, 19, 18, 18, 28, 27, 26, 24, 22, 22, 21, 22,
+        23, 22, 22, 21, 20, 20, 19, 19, 25, 24, 24, 23, 22, 21, 20, 21, 21, 20,
+        20, 20, 19, 19, 18, 18, 21, 22, 22, 22, 21, 20, 19, 19, 19, 19, 19, 19,
+        18, 18, 17, 17, 21, 22, 23, 22, 22, 21, 19, 19, 19, 18, 18, 18, 17, 17,
+        16, 16, 21, 22, 23, 23, 23, 21, 19, 19, 18, 17, 17, 17, 16, 16, 15, 15,
+        20, 21, 22, 22, 22, 20, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 20, 20,
+        22, 22, 22, 20, 19, 18, 17, 16, 16, 15, 15, 14, 14, 14, 19, 20, 21, 21,
+        21, 20, 19, 18, 17, 16, 15, 14, 14, 14, 13, 13, 18, 19, 20, 20, 20, 19,
+        18, 17, 16, 15, 15, 14, 13, 13, 12, 12, 17, 18, 19, 19, 20, 19, 18, 17,
+        16, 15, 14, 14, 13, 12, 12, 12, 16, 17, 18, 18, 19, 18, 17, 16, 15, 14,
+        14, 13, 12, 12, 12, 11, 16, 17, 18, 18, 19, 18, 17, 16, 15, 14, 14, 13,
+        12, 12, 11, 11,
+        /* Size 32x32 */
+        32, 33, 33, 34, 34, 31, 31, 28, 28, 25, 25, 21, 21, 21, 21, 21, 21, 20,
+        20, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 33, 33, 33, 33,
+        33, 30, 30, 27, 27, 24, 24, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20,
+        20, 19, 19, 18, 18, 17, 17, 17, 17, 16, 33, 33, 33, 33, 33, 30, 30, 27,
+        27, 24, 24, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 19, 19, 18,
+        18, 17, 17, 17, 17, 16, 34, 33, 33, 32, 32, 29, 29, 26, 26, 24, 24, 22,
+        22, 23, 23, 23, 23, 22, 22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 18,
+        18, 17, 34, 33, 33, 32, 32, 29, 29, 26, 26, 24, 24, 22, 22, 23, 23, 23,
+        23, 22, 22, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 18, 18, 17, 31, 30,
+        30, 29, 29, 26, 26, 24, 24, 23, 23, 22, 22, 22, 22, 23, 23, 22, 22, 22,
+        22, 21, 21, 20, 20, 19, 19, 18, 18, 18, 18, 17, 31, 30, 30, 29, 29, 26,
+        26, 24, 24, 23, 23, 22, 22, 22, 22, 23, 23, 22, 22, 22, 22, 21, 21, 20,
+        20, 19, 19, 18, 18, 18, 18, 17, 28, 27, 27, 26, 26, 24, 24, 22, 22, 22,
+        22, 21, 21, 22, 22, 23, 23, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 19,
+        19, 19, 19, 18, 28, 27, 27, 26, 26, 24, 24, 22, 22, 22, 22, 21, 21, 22,
+        22, 23, 23, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 19, 19, 19, 19, 18,
+        25, 24, 24, 24, 24, 23, 23, 22, 22, 21, 21, 20, 20, 21, 21, 21, 21, 20,
+        20, 20, 20, 20, 20, 19, 19, 19, 19, 18, 18, 18, 18, 17, 25, 24, 24, 24,
+        24, 23, 23, 22, 22, 21, 21, 20, 20, 21, 21, 21, 21, 20, 20, 20, 20, 20,
+        20, 19, 19, 19, 19, 18, 18, 18, 18, 17, 21, 22, 22, 22, 22, 22, 22, 21,
+        21, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18,
+        18, 17, 17, 17, 17, 17, 21, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
+        17, 17, 21, 22, 22, 23, 23, 22, 22, 22, 22, 21, 21, 19, 19, 19, 19, 19,
+        19, 18, 18, 18, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 16, 21, 22,
+        22, 23, 23, 22, 22, 22, 22, 21, 21, 19, 19, 19, 19, 19, 19, 18, 18, 18,
+        18, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 16, 21, 22, 22, 23, 23, 23,
+        23, 23, 23, 21, 21, 19, 19, 19, 19, 18, 18, 17, 17, 17, 17, 17, 17, 16,
+        16, 16, 16, 15, 15, 15, 15, 15, 21, 22, 22, 23, 23, 23, 23, 23, 23, 21,
+        21, 19, 19, 19, 19, 18, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 15,
+        15, 15, 15, 15, 20, 21, 21, 22, 22, 22, 22, 22, 22, 20, 20, 19, 19, 18,
+        18, 17, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14,
+        20, 21, 21, 22, 22, 22, 22, 22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 17,
+        17, 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 20, 20, 20, 22,
+        22, 22, 22, 22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15,
+        15, 15, 15, 14, 14, 14, 14, 14, 14, 13, 20, 20, 20, 22, 22, 22, 22, 22,
+        22, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 14,
+        14, 14, 14, 14, 14, 13, 19, 20, 20, 21, 21, 21, 21, 21, 21, 20, 20, 19,
+        19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 14, 14, 13, 13, 13,
+        13, 13, 19, 20, 20, 21, 21, 21, 21, 21, 21, 20, 20, 19, 19, 18, 18, 17,
+        17, 16, 16, 15, 15, 14, 14, 14, 14, 14, 14, 13, 13, 13, 13, 13, 18, 19,
+        19, 20, 20, 20, 20, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 15,
+        15, 14, 14, 13, 13, 13, 13, 12, 12, 12, 12, 12, 18, 19, 19, 20, 20, 20,
+        20, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 15, 15, 14, 14, 13,
+        13, 13, 13, 12, 12, 12, 12, 12, 17, 18, 18, 19, 19, 19, 19, 20, 20, 19,
+        19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12,
+        12, 12, 12, 12, 17, 18, 18, 19, 19, 19, 19, 20, 20, 19, 19, 18, 18, 17,
+        17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 12, 12,
+        16, 17, 17, 18, 18, 18, 18, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14,
+        14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 12, 11, 11, 11, 16, 17, 17, 18,
+        18, 18, 18, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13,
+        13, 12, 12, 12, 12, 12, 12, 11, 11, 11, 16, 17, 17, 18, 18, 18, 18, 19,
+        19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12,
+        12, 11, 11, 11, 11, 11, 16, 17, 17, 18, 18, 18, 18, 19, 19, 18, 18, 17,
+        17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 11,
+        11, 11, 15, 16, 16, 17, 17, 17, 17, 18, 18, 17, 17, 17, 17, 16, 16, 15,
+        15, 14, 14, 13, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 11, 11,
+        /* Size 4x8 */
+        33, 22, 20, 17, 28, 22, 22, 18, 24, 20, 20, 18, 22, 19, 18, 16, 22, 19,
+        16, 14, 20, 19, 15, 13, 19, 18, 14, 12, 17, 17, 14, 11,
+        /* Size 8x4 */
+        33, 28, 24, 22, 22, 20, 19, 17, 22, 22, 20, 19, 19, 19, 18, 17, 20, 22,
+        20, 18, 16, 15, 14, 14, 17, 18, 18, 16, 14, 13, 12, 11,
+        /* Size 8x16 */
+        32, 33, 28, 21, 21, 20, 18, 16, 33, 33, 27, 22, 22, 20, 19, 17, 34, 32,
+        26, 22, 23, 21, 20, 18, 31, 28, 24, 22, 22, 22, 20, 18, 28, 26, 22, 22,
+        23, 22, 20, 19, 24, 24, 22, 20, 21, 20, 19, 18, 21, 22, 21, 19, 19, 19,
+        18, 17, 21, 22, 22, 19, 18, 18, 17, 16, 21, 23, 22, 19, 18, 17, 16, 15,
+        20, 22, 22, 19, 17, 16, 15, 14, 20, 21, 22, 19, 17, 16, 14, 14, 19, 20,
+        21, 19, 17, 15, 14, 13, 18, 20, 20, 18, 16, 15, 13, 12, 17, 19, 20, 18,
+        16, 14, 13, 12, 16, 18, 19, 17, 15, 14, 12, 12, 16, 17, 18, 17, 15, 14,
+        12, 11,
+        /* Size 16x8 */
+        32, 33, 34, 31, 28, 24, 21, 21, 21, 20, 20, 19, 18, 17, 16, 16, 33, 33,
+        32, 28, 26, 24, 22, 22, 23, 22, 21, 20, 20, 19, 18, 17, 28, 27, 26, 24,
+        22, 22, 21, 22, 22, 22, 22, 21, 20, 20, 19, 18, 21, 22, 22, 22, 22, 20,
+        19, 19, 19, 19, 19, 19, 18, 18, 17, 17, 21, 22, 23, 22, 23, 21, 19, 18,
+        18, 17, 17, 17, 16, 16, 15, 15, 20, 20, 21, 22, 22, 20, 19, 18, 17, 16,
+        16, 15, 15, 14, 14, 14, 18, 19, 20, 20, 20, 19, 18, 17, 16, 15, 14, 14,
+        13, 13, 12, 12, 16, 17, 18, 18, 19, 18, 17, 16, 15, 14, 14, 13, 12, 12,
+        12, 11,
+        /* Size 16x32 */
+        32, 33, 33, 28, 28, 21, 21, 21, 21, 20, 20, 18, 18, 16, 16, 16, 33, 33,
+        33, 27, 27, 22, 22, 22, 22, 20, 20, 19, 19, 17, 17, 16, 33, 33, 33, 27,
+        27, 22, 22, 22, 22, 20, 20, 19, 19, 17, 17, 16, 34, 32, 32, 26, 26, 22,
+        22, 23, 23, 21, 21, 20, 20, 18, 18, 17, 34, 32, 32, 26, 26, 22, 22, 23,
+        23, 21, 21, 20, 20, 18, 18, 17, 31, 28, 28, 24, 24, 22, 22, 22, 22, 22,
+        22, 20, 20, 18, 18, 17, 31, 28, 28, 24, 24, 22, 22, 22, 22, 22, 22, 20,
+        20, 18, 18, 17, 28, 26, 26, 22, 22, 22, 22, 23, 23, 22, 22, 20, 20, 19,
+        19, 18, 28, 26, 26, 22, 22, 22, 22, 23, 23, 22, 22, 20, 20, 19, 19, 18,
+        24, 24, 24, 22, 22, 20, 20, 21, 21, 20, 20, 19, 19, 18, 18, 17, 24, 24,
+        24, 22, 22, 20, 20, 21, 21, 20, 20, 19, 19, 18, 18, 17, 21, 22, 22, 21,
+        21, 19, 19, 19, 19, 19, 19, 18, 18, 17, 17, 17, 21, 22, 22, 21, 21, 19,
+        19, 19, 19, 19, 19, 18, 18, 17, 17, 17, 21, 22, 22, 22, 22, 19, 19, 18,
+        18, 18, 18, 17, 17, 16, 16, 16, 21, 22, 22, 22, 22, 19, 19, 18, 18, 18,
+        18, 17, 17, 16, 16, 16, 21, 23, 23, 22, 22, 19, 19, 18, 18, 17, 17, 16,
+        16, 15, 15, 15, 21, 23, 23, 22, 22, 19, 19, 18, 18, 17, 17, 16, 16, 15,
+        15, 15, 20, 22, 22, 22, 22, 19, 19, 17, 17, 16, 16, 15, 15, 14, 14, 14,
+        20, 22, 22, 22, 22, 19, 19, 17, 17, 16, 16, 15, 15, 14, 14, 14, 20, 21,
+        21, 22, 22, 19, 19, 17, 17, 16, 16, 14, 14, 14, 14, 13, 20, 21, 21, 22,
+        22, 19, 19, 17, 17, 16, 16, 14, 14, 14, 14, 13, 19, 20, 20, 21, 21, 19,
+        19, 17, 17, 15, 15, 14, 14, 13, 13, 13, 19, 20, 20, 21, 21, 19, 19, 17,
+        17, 15, 15, 14, 14, 13, 13, 13, 18, 20, 20, 20, 20, 18, 18, 16, 16, 15,
+        15, 13, 13, 12, 12, 12, 18, 20, 20, 20, 20, 18, 18, 16, 16, 15, 15, 13,
+        13, 12, 12, 12, 17, 19, 19, 20, 20, 18, 18, 16, 16, 14, 14, 13, 13, 12,
+        12, 12, 17, 19, 19, 20, 20, 18, 18, 16, 16, 14, 14, 13, 13, 12, 12, 12,
+        16, 18, 18, 19, 19, 17, 17, 15, 15, 14, 14, 12, 12, 12, 12, 11, 16, 18,
+        18, 19, 19, 17, 17, 15, 15, 14, 14, 12, 12, 12, 12, 11, 16, 17, 17, 18,
+        18, 17, 17, 15, 15, 14, 14, 12, 12, 11, 11, 11, 16, 17, 17, 18, 18, 17,
+        17, 15, 15, 14, 14, 12, 12, 11, 11, 11, 16, 17, 17, 18, 18, 16, 16, 15,
+        15, 13, 13, 12, 12, 11, 11, 11,
+        /* Size 32x16 */
+        32, 33, 33, 34, 34, 31, 31, 28, 28, 24, 24, 21, 21, 21, 21, 21, 21, 20,
+        20, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 16, 33, 33, 33, 32,
+        32, 28, 28, 26, 26, 24, 24, 22, 22, 22, 22, 23, 23, 22, 22, 21, 21, 20,
+        20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 33, 33, 33, 32, 32, 28, 28, 26,
+        26, 24, 24, 22, 22, 22, 22, 23, 23, 22, 22, 21, 21, 20, 20, 20, 20, 19,
+        19, 18, 18, 17, 17, 17, 28, 27, 27, 26, 26, 24, 24, 22, 22, 22, 22, 21,
+        21, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 19, 19, 18,
+        18, 18, 28, 27, 27, 26, 26, 24, 24, 22, 22, 22, 22, 21, 21, 22, 22, 22,
+        22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 19, 19, 18, 18, 18, 21, 22,
+        22, 22, 22, 22, 22, 22, 22, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 16, 21, 22, 22, 22, 22, 22,
+        22, 22, 22, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18,
+        18, 18, 18, 17, 17, 17, 17, 16, 21, 22, 22, 23, 23, 22, 22, 23, 23, 21,
+        21, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 15,
+        15, 15, 15, 15, 21, 22, 22, 23, 23, 22, 22, 23, 23, 21, 21, 19, 19, 18,
+        18, 18, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 15,
+        20, 20, 20, 21, 21, 22, 22, 22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 16,
+        16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 14, 13, 20, 20, 20, 21,
+        21, 22, 22, 22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15,
+        15, 15, 15, 14, 14, 14, 14, 14, 14, 13, 18, 19, 19, 20, 20, 20, 20, 20,
+        20, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13,
+        13, 12, 12, 12, 12, 12, 18, 19, 19, 20, 20, 20, 20, 20, 20, 19, 19, 18,
+        18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13, 13, 12, 12, 12,
+        12, 12, 16, 17, 17, 18, 18, 18, 18, 19, 19, 18, 18, 17, 17, 16, 16, 15,
+        15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 12, 11, 11, 11, 16, 17,
+        17, 18, 18, 18, 18, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14,
+        14, 13, 13, 12, 12, 12, 12, 12, 12, 11, 11, 11, 16, 16, 16, 17, 17, 17,
+        17, 18, 18, 17, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 13, 12,
+        12, 12, 12, 11, 11, 11, 11, 11,
+        /* Size 4x16 */
+        33, 21, 20, 16, 33, 22, 20, 17, 32, 22, 21, 18, 28, 22, 22, 18, 26, 22,
+        22, 19, 24, 20, 20, 18, 22, 19, 19, 17, 22, 19, 18, 16, 23, 19, 17, 15,
+        22, 19, 16, 14, 21, 19, 16, 14, 20, 19, 15, 13, 20, 18, 15, 12, 19, 18,
+        14, 12, 18, 17, 14, 12, 17, 17, 14, 11,
+        /* Size 16x4 */
+        33, 33, 32, 28, 26, 24, 22, 22, 23, 22, 21, 20, 20, 19, 18, 17, 21, 22,
+        22, 22, 22, 20, 19, 19, 19, 19, 19, 19, 18, 18, 17, 17, 20, 20, 21, 22,
+        22, 20, 19, 18, 17, 16, 16, 15, 15, 14, 14, 14, 16, 17, 18, 18, 19, 18,
+        17, 16, 15, 14, 14, 13, 12, 12, 12, 11,
+        /* Size 8x32 */
+        32, 33, 28, 21, 21, 20, 18, 16, 33, 33, 27, 22, 22, 20, 19, 17, 33, 33,
+        27, 22, 22, 20, 19, 17, 34, 32, 26, 22, 23, 21, 20, 18, 34, 32, 26, 22,
+        23, 21, 20, 18, 31, 28, 24, 22, 22, 22, 20, 18, 31, 28, 24, 22, 22, 22,
+        20, 18, 28, 26, 22, 22, 23, 22, 20, 19, 28, 26, 22, 22, 23, 22, 20, 19,
+        24, 24, 22, 20, 21, 20, 19, 18, 24, 24, 22, 20, 21, 20, 19, 18, 21, 22,
+        21, 19, 19, 19, 18, 17, 21, 22, 21, 19, 19, 19, 18, 17, 21, 22, 22, 19,
+        18, 18, 17, 16, 21, 22, 22, 19, 18, 18, 17, 16, 21, 23, 22, 19, 18, 17,
+        16, 15, 21, 23, 22, 19, 18, 17, 16, 15, 20, 22, 22, 19, 17, 16, 15, 14,
+        20, 22, 22, 19, 17, 16, 15, 14, 20, 21, 22, 19, 17, 16, 14, 14, 20, 21,
+        22, 19, 17, 16, 14, 14, 19, 20, 21, 19, 17, 15, 14, 13, 19, 20, 21, 19,
+        17, 15, 14, 13, 18, 20, 20, 18, 16, 15, 13, 12, 18, 20, 20, 18, 16, 15,
+        13, 12, 17, 19, 20, 18, 16, 14, 13, 12, 17, 19, 20, 18, 16, 14, 13, 12,
+        16, 18, 19, 17, 15, 14, 12, 12, 16, 18, 19, 17, 15, 14, 12, 12, 16, 17,
+        18, 17, 15, 14, 12, 11, 16, 17, 18, 17, 15, 14, 12, 11, 16, 17, 18, 16,
+        15, 13, 12, 11,
+        /* Size 32x8 */
+        32, 33, 33, 34, 34, 31, 31, 28, 28, 24, 24, 21, 21, 21, 21, 21, 21, 20,
+        20, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 16, 33, 33, 33, 32,
+        32, 28, 28, 26, 26, 24, 24, 22, 22, 22, 22, 23, 23, 22, 22, 21, 21, 20,
+        20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 28, 27, 27, 26, 26, 24, 24, 22,
+        22, 22, 22, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20,
+        20, 19, 19, 18, 18, 18, 21, 22, 22, 22, 22, 22, 22, 22, 22, 20, 20, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
+        17, 16, 21, 22, 22, 23, 23, 22, 22, 23, 23, 21, 21, 19, 19, 18, 18, 18,
+        18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 20, 20,
+        20, 21, 21, 22, 22, 22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16,
+        16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 14, 13, 18, 19, 19, 20, 20, 20,
+        20, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13,
+        13, 13, 13, 12, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18, 18, 19, 19, 18,
+        18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12,
+        12, 11, 11, 11 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 31, 23, 17, 31, 26, 20, 16, 23, 20, 14, 12, 17, 16, 12, 9,
+        /* Size 8x8 */
+        33, 32, 32, 29, 24, 20, 17, 15, 32, 32, 31, 29, 25, 21, 18, 16, 32, 31,
+        29, 27, 24, 21, 18, 16, 29, 29, 27, 21, 19, 17, 16, 14, 24, 25, 24, 19,
+        16, 14, 13, 12, 20, 21, 21, 17, 14, 13, 12, 11, 17, 18, 18, 16, 13, 12,
+        10, 9, 15, 16, 16, 14, 12, 11, 9, 9,
+        /* Size 16x16 */
+        32, 33, 33, 33, 32, 30, 29, 27, 25, 23, 21, 19, 17, 16, 14, 13, 33, 32,
+        32, 32, 32, 30, 29, 28, 26, 24, 22, 20, 18, 17, 15, 13, 33, 32, 32, 32,
+        32, 31, 30, 28, 27, 25, 23, 21, 19, 17, 16, 14, 33, 32, 32, 31, 30, 29,
+        28, 27, 26, 24, 23, 20, 19, 17, 16, 14, 32, 32, 32, 30, 29, 28, 27, 26,
+        25, 24, 22, 21, 19, 18, 16, 15, 30, 30, 31, 29, 28, 26, 24, 23, 22, 21,
+        20, 19, 18, 16, 15, 14, 29, 29, 30, 28, 27, 24, 22, 21, 20, 19, 19, 17,
+        17, 15, 14, 13, 27, 28, 28, 27, 26, 23, 21, 20, 19, 18, 17, 16, 15, 14,
+        13, 12, 25, 26, 27, 26, 25, 22, 20, 19, 18, 17, 16, 15, 14, 14, 13, 12,
+        23, 24, 25, 24, 24, 21, 19, 18, 17, 16, 15, 14, 13, 13, 12, 11, 21, 22,
+        23, 23, 22, 20, 19, 17, 16, 15, 14, 13, 13, 12, 11, 11, 19, 20, 21, 20,
+        21, 19, 17, 16, 15, 14, 13, 12, 12, 11, 11, 10, 17, 18, 19, 19, 19, 18,
+        17, 15, 14, 13, 13, 12, 11, 10, 10, 9, 16, 17, 17, 17, 18, 16, 15, 14,
+        14, 13, 12, 11, 10, 10, 9, 9, 14, 15, 16, 16, 16, 15, 14, 13, 13, 12,
+        11, 11, 10, 9, 9, 8, 13, 13, 14, 14, 15, 14, 13, 12, 12, 11, 11, 10, 9,
+        9, 8, 8,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 30, 30, 29, 28, 27, 26, 25, 23,
+        23, 21, 21, 19, 19, 18, 17, 17, 16, 15, 14, 14, 13, 13, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 30, 30, 29, 29, 28, 27, 26, 24, 24, 22, 22, 20,
+        20, 19, 18, 17, 17, 16, 15, 15, 13, 13, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 30, 30, 29, 29, 28, 27, 26, 24, 24, 22, 22, 20, 20, 19, 18, 17,
+        17, 16, 15, 15, 13, 13, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        30, 30, 28, 27, 26, 25, 24, 23, 23, 21, 20, 19, 19, 18, 17, 17, 16, 16,
+        14, 14, 33, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 28, 28,
+        27, 25, 25, 23, 23, 21, 21, 20, 19, 18, 17, 17, 16, 16, 14, 14, 33, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 29, 29, 28, 27, 26, 25, 24, 23,
+        23, 21, 21, 20, 19, 18, 17, 17, 16, 16, 14, 14, 33, 32, 32, 32, 32, 31,
+        31, 31, 30, 30, 29, 29, 28, 28, 27, 26, 26, 24, 24, 23, 23, 21, 20, 20,
+        19, 18, 17, 17, 16, 16, 14, 14, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30,
+        29, 29, 28, 28, 27, 26, 26, 24, 24, 23, 23, 21, 21, 20, 19, 18, 17, 17,
+        16, 16, 15, 15, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 28, 28, 27, 27,
+        26, 26, 25, 24, 24, 22, 22, 21, 21, 20, 19, 19, 18, 17, 16, 16, 15, 15,
+        32, 32, 32, 32, 31, 31, 30, 30, 29, 29, 28, 28, 27, 27, 26, 25, 25, 24,
+        24, 22, 22, 21, 20, 20, 19, 18, 18, 17, 16, 16, 15, 15, 30, 30, 30, 31,
+        31, 30, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 22, 22, 21, 20, 20, 19,
+        19, 18, 18, 17, 16, 16, 15, 15, 14, 14, 30, 30, 30, 31, 31, 30, 29, 29,
+        28, 28, 26, 26, 24, 24, 23, 23, 22, 22, 21, 20, 20, 19, 19, 18, 18, 17,
+        16, 16, 15, 15, 14, 14, 29, 29, 29, 30, 30, 29, 28, 28, 27, 27, 24, 24,
+        22, 22, 21, 21, 20, 20, 19, 19, 19, 18, 17, 17, 17, 16, 15, 15, 14, 14,
+        13, 13, 28, 29, 29, 30, 30, 29, 28, 28, 27, 27, 24, 24, 22, 21, 20, 20,
+        20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 27, 28,
+        28, 28, 28, 28, 27, 27, 26, 26, 23, 23, 21, 20, 20, 20, 19, 18, 18, 17,
+        17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 26, 27, 27, 27, 28, 27,
+        26, 26, 26, 25, 23, 23, 21, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 15,
+        15, 14, 14, 14, 13, 13, 12, 12, 25, 26, 26, 26, 27, 26, 26, 26, 25, 25,
+        22, 22, 20, 20, 19, 19, 18, 17, 17, 16, 16, 15, 15, 15, 14, 14, 14, 13,
+        13, 13, 12, 12, 23, 24, 24, 25, 25, 25, 24, 24, 24, 24, 22, 22, 20, 19,
+        18, 18, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 12, 11, 11,
+        23, 24, 24, 24, 25, 24, 24, 24, 24, 24, 21, 21, 19, 19, 18, 18, 17, 16,
+        16, 15, 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 21, 22, 22, 23,
+        23, 23, 23, 23, 22, 22, 20, 20, 19, 18, 17, 17, 16, 15, 15, 14, 14, 14,
+        13, 13, 13, 12, 12, 12, 11, 11, 11, 11, 21, 22, 22, 23, 23, 23, 23, 23,
+        22, 22, 20, 20, 19, 18, 17, 17, 16, 15, 15, 14, 14, 14, 13, 13, 13, 12,
+        12, 12, 11, 11, 11, 11, 19, 20, 20, 21, 21, 21, 21, 21, 21, 21, 19, 19,
+        18, 17, 17, 16, 15, 14, 14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11,
+        10, 10, 19, 20, 20, 20, 21, 21, 20, 21, 21, 20, 19, 19, 17, 17, 16, 16,
+        15, 14, 14, 13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10, 10, 18, 19,
+        19, 19, 20, 20, 20, 20, 20, 20, 18, 18, 17, 17, 16, 15, 15, 14, 14, 13,
+        13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 17, 18, 18, 19, 19, 19,
+        19, 19, 19, 19, 18, 18, 17, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 11,
+        11, 11, 10, 10, 10, 10, 9, 9, 17, 17, 17, 18, 18, 18, 18, 18, 19, 18,
+        17, 17, 16, 16, 15, 14, 14, 13, 13, 12, 12, 12, 12, 11, 11, 10, 10, 10,
+        10, 9, 9, 9, 16, 17, 17, 17, 17, 17, 17, 17, 18, 18, 16, 16, 15, 15, 14,
+        14, 14, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 15, 16,
+        16, 17, 17, 17, 17, 17, 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12,
+        12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9, 14, 15, 15, 16, 16, 16, 16,
+        16, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10,
+        10, 9, 9, 9, 9, 8, 8, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 15, 15,
+        14, 14, 13, 13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 9, 9, 8, 8,
+        13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11,
+        11, 11, 11, 10, 10, 9, 9, 9, 9, 9, 8, 8, 8, 8, 13, 13, 13, 14, 14, 14,
+        14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 10, 10, 9,
+        9, 9, 9, 9, 8, 8, 8, 8,
+        /* Size 4x8 */
+        32, 30, 24, 17, 32, 30, 24, 17, 31, 28, 23, 18, 29, 24, 19, 15, 25, 21,
+        16, 13, 21, 19, 14, 11, 18, 17, 13, 10, 16, 15, 12, 9,
+        /* Size 8x4 */
+        32, 32, 31, 29, 25, 21, 18, 16, 30, 30, 28, 24, 21, 19, 17, 15, 24, 24,
+        23, 19, 16, 14, 13, 12, 17, 17, 18, 15, 13, 11, 10, 9,
+        /* Size 8x16 */
+        32, 33, 32, 28, 23, 19, 17, 14, 33, 32, 32, 29, 24, 20, 17, 15, 33, 32,
+        31, 30, 25, 21, 18, 16, 32, 32, 30, 28, 24, 20, 18, 16, 32, 31, 29, 27,
+        24, 21, 18, 16, 30, 30, 28, 24, 21, 19, 17, 15, 29, 30, 27, 22, 20, 17,
+        16, 14, 27, 28, 26, 21, 18, 16, 15, 13, 25, 26, 25, 20, 17, 15, 14, 13,
+        23, 24, 24, 19, 16, 14, 13, 12, 21, 23, 22, 18, 15, 13, 12, 11, 19, 21,
+        20, 17, 14, 12, 11, 10, 18, 19, 19, 16, 14, 12, 11, 10, 16, 17, 18, 15,
+        13, 11, 10, 9, 14, 16, 16, 14, 12, 11, 9, 9, 13, 14, 15, 13, 11, 10, 9,
+        8,
+        /* Size 16x8 */
+        32, 33, 33, 32, 32, 30, 29, 27, 25, 23, 21, 19, 18, 16, 14, 13, 33, 32,
+        32, 32, 31, 30, 30, 28, 26, 24, 23, 21, 19, 17, 16, 14, 32, 32, 31, 30,
+        29, 28, 27, 26, 25, 24, 22, 20, 19, 18, 16, 15, 28, 29, 30, 28, 27, 24,
+        22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 23, 24, 25, 24, 24, 21, 20, 18,
+        17, 16, 15, 14, 14, 13, 12, 11, 19, 20, 21, 20, 21, 19, 17, 16, 15, 14,
+        13, 12, 12, 11, 11, 10, 17, 17, 18, 18, 18, 17, 16, 15, 14, 13, 12, 11,
+        11, 10, 9, 9, 14, 15, 16, 16, 16, 15, 14, 13, 13, 12, 11, 10, 10, 9, 9,
+        8,
+        /* Size 16x32 */
+        32, 33, 33, 32, 32, 30, 28, 27, 23, 23, 19, 19, 17, 16, 14, 13, 33, 32,
+        32, 32, 32, 30, 29, 28, 24, 24, 20, 20, 17, 17, 15, 14, 33, 32, 32, 32,
+        32, 30, 29, 28, 24, 24, 20, 20, 17, 17, 15, 14, 33, 32, 32, 32, 32, 31,
+        29, 28, 25, 24, 20, 20, 18, 17, 15, 14, 33, 32, 32, 32, 31, 31, 30, 28,
+        25, 25, 21, 21, 18, 17, 16, 14, 33, 32, 32, 31, 31, 30, 29, 28, 25, 24,
+        21, 21, 18, 17, 16, 14, 32, 32, 32, 31, 30, 29, 28, 27, 24, 24, 20, 20,
+        18, 17, 16, 14, 32, 32, 32, 30, 30, 29, 28, 27, 24, 24, 21, 21, 18, 17,
+        16, 15, 32, 32, 31, 30, 29, 28, 27, 26, 24, 24, 21, 21, 18, 18, 16, 15,
+        32, 31, 31, 30, 29, 28, 26, 26, 24, 23, 20, 20, 18, 18, 16, 15, 30, 30,
+        30, 28, 28, 26, 24, 23, 21, 21, 19, 19, 17, 16, 15, 14, 30, 30, 30, 28,
+        28, 26, 24, 23, 21, 21, 19, 19, 17, 16, 15, 14, 29, 30, 30, 28, 27, 24,
+        22, 21, 20, 19, 17, 17, 16, 15, 14, 13, 28, 29, 30, 28, 27, 24, 21, 21,
+        19, 19, 17, 17, 16, 15, 14, 13, 27, 28, 28, 27, 26, 23, 21, 20, 18, 18,
+        16, 16, 15, 14, 13, 13, 26, 27, 28, 26, 26, 23, 20, 20, 18, 18, 16, 16,
+        14, 14, 13, 12, 25, 26, 26, 25, 25, 22, 20, 19, 17, 17, 15, 15, 14, 13,
+        13, 12, 23, 25, 25, 24, 24, 21, 19, 18, 16, 16, 14, 14, 13, 13, 12, 11,
+        23, 24, 24, 24, 24, 21, 19, 18, 16, 16, 14, 14, 13, 13, 12, 11, 21, 23,
+        23, 22, 22, 20, 18, 17, 15, 15, 13, 13, 12, 12, 11, 11, 21, 23, 23, 22,
+        22, 20, 18, 17, 15, 15, 13, 13, 12, 12, 11, 11, 19, 21, 21, 21, 21, 19,
+        17, 17, 14, 14, 13, 13, 12, 11, 10, 10, 19, 20, 21, 20, 20, 19, 17, 16,
+        14, 14, 12, 12, 11, 11, 10, 10, 18, 19, 20, 20, 20, 18, 17, 16, 14, 14,
+        12, 12, 11, 11, 10, 9, 18, 19, 19, 19, 19, 18, 16, 15, 14, 13, 12, 12,
+        11, 10, 10, 9, 17, 18, 18, 18, 18, 17, 16, 15, 13, 13, 12, 12, 10, 10,
+        9, 9, 16, 17, 17, 17, 18, 16, 15, 14, 13, 13, 11, 11, 10, 10, 9, 9, 15,
+        17, 17, 17, 17, 16, 15, 14, 13, 12, 11, 11, 10, 10, 9, 9, 14, 16, 16,
+        16, 16, 15, 14, 13, 12, 12, 11, 11, 9, 9, 9, 8, 14, 16, 16, 16, 16, 15,
+        14, 13, 12, 12, 10, 10, 9, 9, 9, 8, 13, 14, 14, 14, 15, 14, 13, 12, 11,
+        11, 10, 10, 9, 9, 8, 8, 13, 14, 14, 14, 15, 14, 13, 12, 11, 11, 10, 10,
+        9, 9, 8, 8,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 30, 30, 29, 28, 27, 26, 25, 23,
+        23, 21, 21, 19, 19, 18, 18, 17, 16, 15, 14, 14, 13, 13, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 30, 30, 30, 29, 28, 27, 26, 25, 24, 23, 23, 21,
+        20, 19, 19, 18, 17, 17, 16, 16, 14, 14, 33, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 30, 30, 30, 30, 28, 28, 26, 25, 24, 23, 23, 21, 21, 20, 19, 18,
+        17, 17, 16, 16, 14, 14, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 28, 28,
+        28, 28, 27, 26, 25, 24, 24, 22, 22, 21, 20, 20, 19, 18, 17, 17, 16, 16,
+        14, 14, 32, 32, 32, 32, 31, 31, 30, 30, 29, 29, 28, 28, 27, 27, 26, 26,
+        25, 24, 24, 22, 22, 21, 20, 20, 19, 18, 18, 17, 16, 16, 15, 15, 30, 30,
+        30, 31, 31, 30, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 22, 21, 21, 20,
+        20, 19, 19, 18, 18, 17, 16, 16, 15, 15, 14, 14, 28, 29, 29, 29, 30, 29,
+        28, 28, 27, 26, 24, 24, 22, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 17,
+        16, 16, 15, 15, 14, 14, 13, 13, 27, 28, 28, 28, 28, 28, 27, 27, 26, 26,
+        23, 23, 21, 21, 20, 20, 19, 18, 18, 17, 17, 17, 16, 16, 15, 15, 14, 14,
+        13, 13, 12, 12, 23, 24, 24, 25, 25, 25, 24, 24, 24, 24, 21, 21, 20, 19,
+        18, 18, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 12, 11, 11,
+        23, 24, 24, 24, 25, 24, 24, 24, 24, 23, 21, 21, 19, 19, 18, 18, 17, 16,
+        16, 15, 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 19, 20, 20, 20,
+        21, 21, 20, 21, 21, 20, 19, 19, 17, 17, 16, 16, 15, 14, 14, 13, 13, 13,
+        12, 12, 12, 12, 11, 11, 11, 10, 10, 10, 19, 20, 20, 20, 21, 21, 20, 21,
+        21, 20, 19, 19, 17, 17, 16, 16, 15, 14, 14, 13, 13, 13, 12, 12, 12, 12,
+        11, 11, 11, 10, 10, 10, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 17, 17,
+        16, 16, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9,
+        9, 16, 17, 17, 17, 17, 17, 17, 17, 18, 18, 16, 16, 15, 15, 14, 14, 13,
+        13, 13, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 14, 15, 15, 15,
+        16, 16, 16, 16, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 11, 11, 10,
+        10, 10, 10, 9, 9, 9, 9, 9, 8, 8, 13, 14, 14, 14, 14, 14, 14, 15, 15, 15,
+        14, 14, 13, 13, 13, 12, 12, 11, 11, 11, 11, 10, 10, 9, 9, 9, 9, 9, 8, 8,
+        8, 8,
+        /* Size 4x16 */
+        33, 30, 23, 16, 32, 30, 24, 17, 32, 31, 25, 17, 32, 29, 24, 17, 32, 28,
+        24, 18, 30, 26, 21, 16, 30, 24, 19, 15, 28, 23, 18, 14, 26, 22, 17, 13,
+        24, 21, 16, 13, 23, 20, 15, 12, 20, 19, 14, 11, 19, 18, 13, 10, 17, 16,
+        13, 10, 16, 15, 12, 9, 14, 14, 11, 9,
+        /* Size 16x4 */
+        33, 32, 32, 32, 32, 30, 30, 28, 26, 24, 23, 20, 19, 17, 16, 14, 30, 30,
+        31, 29, 28, 26, 24, 23, 22, 21, 20, 19, 18, 16, 15, 14, 23, 24, 25, 24,
+        24, 21, 19, 18, 17, 16, 15, 14, 13, 13, 12, 11, 16, 17, 17, 17, 18, 16,
+        15, 14, 13, 13, 12, 11, 10, 10, 9, 9,
+        /* Size 8x32 */
+        32, 33, 32, 28, 23, 19, 17, 14, 33, 32, 32, 29, 24, 20, 17, 15, 33, 32,
+        32, 29, 24, 20, 17, 15, 33, 32, 32, 29, 25, 20, 18, 15, 33, 32, 31, 30,
+        25, 21, 18, 16, 33, 32, 31, 29, 25, 21, 18, 16, 32, 32, 30, 28, 24, 20,
+        18, 16, 32, 32, 30, 28, 24, 21, 18, 16, 32, 31, 29, 27, 24, 21, 18, 16,
+        32, 31, 29, 26, 24, 20, 18, 16, 30, 30, 28, 24, 21, 19, 17, 15, 30, 30,
+        28, 24, 21, 19, 17, 15, 29, 30, 27, 22, 20, 17, 16, 14, 28, 30, 27, 21,
+        19, 17, 16, 14, 27, 28, 26, 21, 18, 16, 15, 13, 26, 28, 26, 20, 18, 16,
+        14, 13, 25, 26, 25, 20, 17, 15, 14, 13, 23, 25, 24, 19, 16, 14, 13, 12,
+        23, 24, 24, 19, 16, 14, 13, 12, 21, 23, 22, 18, 15, 13, 12, 11, 21, 23,
+        22, 18, 15, 13, 12, 11, 19, 21, 21, 17, 14, 13, 12, 10, 19, 21, 20, 17,
+        14, 12, 11, 10, 18, 20, 20, 17, 14, 12, 11, 10, 18, 19, 19, 16, 14, 12,
+        11, 10, 17, 18, 18, 16, 13, 12, 10, 9, 16, 17, 18, 15, 13, 11, 10, 9,
+        15, 17, 17, 15, 13, 11, 10, 9, 14, 16, 16, 14, 12, 11, 9, 9, 14, 16, 16,
+        14, 12, 10, 9, 9, 13, 14, 15, 13, 11, 10, 9, 8, 13, 14, 15, 13, 11, 10,
+        9, 8,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 30, 30, 29, 28, 27, 26, 25, 23,
+        23, 21, 21, 19, 19, 18, 18, 17, 16, 15, 14, 14, 13, 13, 33, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 30, 30, 30, 30, 28, 28, 26, 25, 24, 23, 23, 21,
+        21, 20, 19, 18, 17, 17, 16, 16, 14, 14, 32, 32, 32, 32, 31, 31, 30, 30,
+        29, 29, 28, 28, 27, 27, 26, 26, 25, 24, 24, 22, 22, 21, 20, 20, 19, 18,
+        18, 17, 16, 16, 15, 15, 28, 29, 29, 29, 30, 29, 28, 28, 27, 26, 24, 24,
+        22, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 15, 15, 14, 14,
+        13, 13, 23, 24, 24, 25, 25, 25, 24, 24, 24, 24, 21, 21, 20, 19, 18, 18,
+        17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 12, 11, 11, 19, 20,
+        20, 20, 21, 21, 20, 21, 21, 20, 19, 19, 17, 17, 16, 16, 15, 14, 14, 13,
+        13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10, 10, 17, 17, 17, 18, 18, 18,
+        18, 18, 18, 18, 17, 17, 16, 16, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11,
+        11, 10, 10, 10, 9, 9, 9, 9, 14, 15, 15, 15, 16, 16, 16, 16, 16, 16, 15,
+        15, 14, 14, 13, 13, 13, 12, 12, 11, 11, 10, 10, 10, 10, 9, 9, 9, 9, 9,
+        8, 8 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 24, 22, 19, 24, 21, 20, 19, 22, 20, 17, 15, 19, 19, 15, 13,
+        /* Size 8x8 */
+        33, 32, 27, 21, 22, 20, 19, 18, 32, 29, 24, 22, 23, 22, 20, 19, 27, 24,
+        22, 21, 23, 22, 21, 20, 21, 22, 21, 19, 19, 19, 18, 18, 22, 23, 23, 19,
+        18, 17, 16, 16, 20, 22, 22, 19, 17, 16, 15, 14, 19, 20, 21, 18, 16, 15,
+        14, 13, 18, 19, 20, 18, 16, 14, 13, 12,
+        /* Size 16x16 */
+        32, 33, 34, 31, 28, 25, 22, 21, 21, 21, 20, 20, 19, 18, 17, 16, 33, 33,
+        33, 30, 27, 24, 22, 22, 22, 22, 21, 20, 20, 19, 18, 17, 34, 33, 32, 29,
+        26, 24, 23, 22, 23, 23, 22, 22, 21, 20, 19, 18, 31, 30, 29, 26, 24, 23,
+        22, 22, 22, 23, 22, 22, 21, 20, 19, 18, 28, 27, 26, 24, 22, 22, 22, 22,
+        22, 23, 22, 22, 21, 20, 20, 19, 25, 24, 24, 23, 22, 21, 20, 20, 21, 21,
+        20, 20, 20, 19, 19, 18, 22, 22, 23, 22, 22, 20, 20, 20, 20, 20, 19, 19,
+        19, 18, 18, 17, 21, 22, 22, 22, 22, 20, 20, 19, 19, 19, 19, 18, 18, 18,
+        17, 17, 21, 22, 23, 22, 22, 21, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16,
+        21, 22, 23, 23, 23, 21, 20, 19, 18, 17, 17, 17, 16, 16, 16, 15, 20, 21,
+        22, 22, 22, 20, 19, 19, 18, 17, 17, 16, 16, 15, 15, 14, 20, 20, 22, 22,
+        22, 20, 19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 19, 20, 21, 21, 21, 20,
+        19, 18, 17, 16, 16, 15, 14, 14, 14, 13, 18, 19, 20, 20, 20, 19, 18, 18,
+        17, 16, 15, 15, 14, 13, 13, 12, 17, 18, 19, 19, 20, 19, 18, 17, 16, 16,
+        15, 14, 14, 13, 12, 12, 16, 17, 18, 18, 19, 18, 17, 17, 16, 15, 14, 14,
+        13, 12, 12, 12,
+        /* Size 32x32 */
+        32, 33, 33, 34, 34, 32, 31, 30, 28, 28, 25, 25, 22, 21, 21, 21, 21, 21,
+        21, 20, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 16, 16, 33, 33, 33, 33,
+        33, 32, 30, 29, 27, 27, 24, 24, 22, 21, 22, 22, 22, 22, 22, 21, 21, 20,
+        20, 20, 20, 19, 19, 19, 18, 18, 17, 17, 33, 33, 33, 33, 33, 31, 30, 29,
+        27, 26, 24, 24, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 19,
+        19, 19, 18, 18, 17, 17, 34, 33, 33, 33, 33, 31, 29, 28, 26, 26, 24, 24,
+        22, 22, 22, 22, 22, 23, 22, 22, 22, 21, 21, 20, 20, 20, 20, 19, 19, 19,
+        18, 18, 34, 33, 33, 33, 32, 31, 29, 28, 26, 26, 24, 24, 23, 22, 22, 23,
+        23, 23, 23, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 18, 18, 32, 32,
+        31, 31, 31, 29, 28, 27, 25, 24, 24, 24, 22, 22, 22, 22, 23, 23, 23, 22,
+        22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 18, 18, 31, 30, 30, 29, 29, 28,
+        26, 26, 24, 24, 23, 23, 22, 22, 22, 22, 22, 23, 23, 22, 22, 22, 22, 21,
+        21, 20, 20, 20, 19, 19, 18, 18, 30, 29, 29, 28, 28, 27, 26, 25, 23, 23,
+        23, 23, 22, 22, 22, 22, 22, 23, 23, 22, 22, 22, 22, 21, 21, 20, 20, 20,
+        19, 19, 19, 19, 28, 27, 27, 26, 26, 25, 24, 23, 22, 22, 22, 22, 22, 21,
+        22, 22, 22, 23, 23, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 20, 19, 19,
+        28, 27, 26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 21, 21, 22, 22, 22, 23,
+        22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 20, 19, 19, 25, 24, 24, 24,
+        24, 24, 23, 23, 22, 22, 21, 21, 20, 20, 20, 21, 21, 21, 21, 20, 20, 20,
+        20, 20, 20, 20, 19, 19, 19, 19, 18, 18, 25, 24, 24, 24, 24, 24, 23, 23,
+        22, 22, 21, 21, 20, 20, 20, 21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20,
+        19, 19, 19, 19, 18, 18, 22, 22, 22, 22, 23, 22, 22, 22, 22, 21, 20, 20,
+        20, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18,
+        17, 17, 21, 21, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 17, 17, 21, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19,
+        19, 18, 18, 18, 18, 18, 18, 17, 17, 17, 17, 17, 21, 22, 22, 22, 23, 22,
+        22, 22, 22, 22, 21, 21, 20, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18,
+        18, 17, 17, 17, 17, 17, 16, 16, 21, 22, 22, 22, 23, 23, 22, 22, 22, 22,
+        21, 21, 20, 19, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 17, 17, 17,
+        16, 16, 16, 16, 21, 22, 22, 23, 23, 23, 23, 23, 23, 23, 21, 21, 20, 19,
+        19, 19, 18, 18, 17, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15,
+        21, 22, 22, 22, 23, 23, 23, 23, 23, 22, 21, 21, 20, 19, 19, 18, 18, 17,
+        17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 15, 15, 20, 21, 21, 22,
+        22, 22, 22, 22, 22, 22, 20, 20, 19, 19, 19, 18, 18, 17, 17, 17, 17, 16,
+        16, 16, 16, 16, 15, 15, 15, 15, 14, 14, 20, 21, 21, 22, 22, 22, 22, 22,
+        22, 22, 20, 20, 19, 19, 19, 18, 18, 17, 17, 17, 17, 16, 16, 16, 16, 16,
+        15, 15, 15, 15, 14, 14, 20, 20, 21, 21, 22, 22, 22, 22, 22, 22, 20, 20,
+        19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14,
+        14, 14, 20, 20, 20, 21, 22, 22, 22, 22, 22, 22, 20, 20, 19, 19, 18, 18,
+        17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 19, 20,
+        20, 20, 21, 21, 21, 21, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16,
+        16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 19, 20, 20, 20, 21, 21,
+        21, 21, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 15, 15, 15,
+        14, 14, 14, 14, 14, 13, 13, 13, 18, 19, 19, 20, 20, 20, 20, 20, 21, 21,
+        20, 20, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 14, 14, 14, 14, 14,
+        13, 13, 13, 13, 18, 19, 19, 20, 20, 20, 20, 20, 20, 20, 19, 19, 18, 18,
+        18, 17, 17, 16, 16, 15, 15, 15, 15, 14, 14, 14, 13, 13, 13, 13, 12, 12,
+        18, 19, 19, 19, 20, 20, 20, 20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16,
+        16, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13, 13, 12, 12, 17, 18, 18, 19,
+        19, 19, 19, 19, 20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 15, 15, 14,
+        14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 17, 18, 18, 19, 19, 19, 19, 19,
+        20, 20, 19, 19, 18, 18, 17, 17, 16, 16, 16, 15, 15, 14, 14, 14, 13, 13,
+        13, 13, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18, 18, 19, 19, 19, 18, 18,
+        17, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 12, 12, 12,
+        12, 12, 16, 17, 17, 18, 18, 18, 18, 19, 19, 19, 18, 18, 17, 17, 17, 16,
+        16, 15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 12, 12,
+        /* Size 4x8 */
+        33, 24, 22, 19, 31, 23, 23, 20, 26, 22, 22, 20, 22, 20, 19, 18, 23, 21,
+        17, 16, 21, 20, 17, 15, 20, 20, 16, 14, 19, 19, 16, 13,
+        /* Size 8x4 */
+        33, 31, 26, 22, 23, 21, 20, 19, 24, 23, 22, 20, 21, 20, 20, 19, 22, 23,
+        22, 19, 17, 17, 16, 16, 19, 20, 20, 18, 16, 15, 14, 13,
+        /* Size 8x16 */
+        32, 33, 28, 21, 21, 20, 18, 17, 33, 33, 27, 22, 22, 20, 19, 18, 34, 32,
+        26, 22, 23, 21, 20, 19, 31, 28, 24, 22, 22, 22, 20, 19, 28, 26, 22, 22,
+        23, 22, 21, 20, 24, 24, 22, 20, 21, 20, 19, 18, 22, 22, 21, 20, 19, 19,
+        19, 18, 21, 22, 22, 19, 19, 18, 18, 17, 21, 23, 22, 19, 18, 17, 17, 16,
+        21, 23, 22, 19, 18, 17, 16, 16, 20, 22, 22, 19, 17, 16, 16, 15, 20, 21,
+        22, 19, 17, 16, 15, 14, 19, 20, 21, 19, 17, 15, 14, 13, 18, 20, 20, 18,
+        16, 15, 14, 13, 17, 19, 20, 18, 16, 14, 13, 12, 16, 18, 19, 17, 15, 14,
+        13, 12,
+        /* Size 16x8 */
+        32, 33, 34, 31, 28, 24, 22, 21, 21, 21, 20, 20, 19, 18, 17, 16, 33, 33,
+        32, 28, 26, 24, 22, 22, 23, 23, 22, 21, 20, 20, 19, 18, 28, 27, 26, 24,
+        22, 22, 21, 22, 22, 22, 22, 22, 21, 20, 20, 19, 21, 22, 22, 22, 22, 20,
+        20, 19, 19, 19, 19, 19, 19, 18, 18, 17, 21, 22, 23, 22, 23, 21, 19, 19,
+        18, 18, 17, 17, 17, 16, 16, 15, 20, 20, 21, 22, 22, 20, 19, 18, 17, 17,
+        16, 16, 15, 15, 14, 14, 18, 19, 20, 20, 21, 19, 19, 18, 17, 16, 16, 15,
+        14, 14, 13, 13, 17, 18, 19, 19, 20, 18, 18, 17, 16, 16, 15, 14, 13, 13,
+        12, 12,
+        /* Size 16x32 */
+        32, 33, 33, 29, 28, 24, 21, 21, 21, 21, 20, 20, 18, 18, 17, 16, 33, 33,
+        33, 28, 27, 24, 22, 22, 22, 22, 20, 20, 19, 19, 18, 17, 33, 33, 33, 28,
+        27, 24, 22, 22, 22, 22, 20, 20, 19, 19, 18, 17, 34, 32, 32, 28, 26, 24,
+        22, 22, 22, 22, 21, 21, 20, 20, 18, 18, 34, 32, 32, 28, 26, 24, 22, 22,
+        23, 23, 21, 21, 20, 20, 19, 18, 32, 31, 30, 26, 25, 23, 22, 22, 23, 23,
+        21, 21, 20, 20, 19, 18, 31, 29, 28, 26, 24, 23, 22, 22, 22, 22, 22, 22,
+        20, 20, 19, 18, 30, 28, 28, 24, 23, 23, 22, 22, 23, 22, 22, 22, 20, 20,
+        19, 19, 28, 26, 26, 23, 22, 22, 22, 22, 23, 22, 22, 22, 21, 20, 20, 19,
+        28, 26, 26, 23, 22, 22, 21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 24, 24,
+        24, 22, 22, 21, 20, 20, 21, 21, 20, 20, 19, 19, 18, 18, 24, 24, 24, 22,
+        22, 21, 20, 20, 21, 21, 20, 20, 19, 19, 18, 18, 22, 22, 22, 22, 21, 20,
+        20, 20, 19, 19, 19, 19, 19, 18, 18, 17, 21, 22, 22, 22, 21, 20, 19, 19,
+        19, 19, 19, 19, 18, 18, 17, 17, 21, 22, 22, 22, 22, 20, 19, 19, 19, 19,
+        18, 18, 18, 18, 17, 17, 21, 22, 22, 22, 22, 20, 19, 19, 18, 18, 18, 18,
+        17, 17, 17, 16, 21, 22, 23, 22, 22, 21, 19, 19, 18, 18, 17, 17, 17, 17,
+        16, 16, 21, 23, 23, 23, 22, 21, 19, 19, 18, 17, 17, 17, 16, 16, 16, 15,
+        21, 22, 23, 22, 22, 21, 19, 19, 18, 17, 17, 17, 16, 16, 16, 15, 20, 22,
+        22, 22, 22, 20, 19, 19, 17, 17, 16, 16, 16, 15, 15, 14, 20, 22, 22, 22,
+        22, 20, 19, 19, 17, 17, 16, 16, 16, 15, 15, 14, 20, 21, 21, 22, 22, 20,
+        19, 18, 17, 17, 16, 16, 15, 15, 14, 14, 20, 21, 21, 22, 22, 20, 19, 18,
+        17, 17, 16, 16, 15, 14, 14, 14, 19, 20, 21, 21, 21, 20, 19, 18, 17, 17,
+        15, 15, 14, 14, 14, 13, 19, 20, 20, 21, 21, 20, 19, 18, 17, 16, 15, 15,
+        14, 14, 13, 13, 19, 20, 20, 20, 21, 20, 18, 18, 16, 16, 15, 15, 14, 14,
+        13, 13, 18, 20, 20, 20, 20, 19, 18, 18, 16, 16, 15, 15, 14, 13, 13, 12,
+        18, 19, 19, 20, 20, 19, 18, 17, 16, 16, 14, 14, 13, 13, 13, 12, 17, 19,
+        19, 19, 20, 19, 18, 17, 16, 16, 14, 14, 13, 13, 12, 12, 17, 19, 19, 19,
+        19, 19, 17, 17, 16, 16, 14, 14, 13, 13, 12, 12, 16, 18, 18, 18, 19, 18,
+        17, 17, 15, 15, 14, 14, 13, 12, 12, 12, 16, 18, 18, 18, 19, 18, 17, 17,
+        15, 15, 14, 14, 13, 12, 12, 12,
+        /* Size 32x16 */
+        32, 33, 33, 34, 34, 32, 31, 30, 28, 28, 24, 24, 22, 21, 21, 21, 21, 21,
+        21, 20, 20, 20, 20, 19, 19, 19, 18, 18, 17, 17, 16, 16, 33, 33, 33, 32,
+        32, 31, 29, 28, 26, 26, 24, 24, 22, 22, 22, 22, 22, 23, 22, 22, 22, 21,
+        21, 20, 20, 20, 20, 19, 19, 19, 18, 18, 33, 33, 33, 32, 32, 30, 28, 28,
+        26, 26, 24, 24, 22, 22, 22, 22, 23, 23, 23, 22, 22, 21, 21, 21, 20, 20,
+        20, 19, 19, 19, 18, 18, 29, 28, 28, 28, 28, 26, 26, 24, 23, 23, 22, 22,
+        22, 22, 22, 22, 22, 23, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19,
+        18, 18, 28, 27, 27, 26, 26, 25, 24, 23, 22, 22, 22, 22, 21, 21, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 24, 24,
+        24, 24, 24, 23, 23, 23, 22, 22, 21, 21, 20, 20, 20, 20, 21, 21, 21, 20,
+        20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 18, 18, 21, 22, 22, 22, 22, 22,
+        22, 22, 22, 21, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        19, 18, 18, 18, 18, 17, 17, 17, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 17,
+        17, 17, 17, 17, 21, 22, 22, 22, 23, 23, 22, 23, 23, 22, 21, 21, 19, 19,
+        19, 18, 18, 18, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15,
+        21, 22, 22, 22, 23, 23, 22, 22, 22, 22, 21, 21, 19, 19, 19, 18, 18, 17,
+        17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 15, 15, 20, 20, 20, 21,
+        21, 21, 22, 22, 22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16,
+        16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 20, 20, 20, 21, 21, 21, 22, 22,
+        22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 15, 15, 15,
+        15, 14, 14, 14, 14, 14, 18, 19, 19, 20, 20, 20, 20, 20, 21, 21, 19, 19,
+        19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13,
+        13, 13, 18, 19, 19, 20, 20, 20, 20, 20, 20, 20, 19, 19, 18, 18, 18, 17,
+        17, 16, 16, 15, 15, 15, 14, 14, 14, 14, 13, 13, 13, 13, 12, 12, 17, 18,
+        18, 18, 19, 19, 19, 19, 20, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 15,
+        15, 14, 14, 14, 13, 13, 13, 13, 12, 12, 12, 12, 16, 17, 17, 18, 18, 18,
+        18, 19, 19, 19, 18, 18, 17, 17, 17, 16, 16, 15, 15, 14, 14, 14, 14, 13,
+        13, 13, 12, 12, 12, 12, 12, 12,
+        /* Size 4x16 */
+        33, 24, 21, 18, 33, 24, 22, 19, 32, 24, 23, 20, 29, 23, 22, 20, 26, 22,
+        22, 20, 24, 21, 21, 19, 22, 20, 19, 18, 22, 20, 19, 18, 22, 21, 18, 17,
+        22, 21, 17, 16, 22, 20, 17, 15, 21, 20, 17, 14, 20, 20, 16, 14, 20, 19,
+        16, 13, 19, 19, 16, 13, 18, 18, 15, 12,
+        /* Size 16x4 */
+        33, 33, 32, 29, 26, 24, 22, 22, 22, 22, 22, 21, 20, 20, 19, 18, 24, 24,
+        24, 23, 22, 21, 20, 20, 21, 21, 20, 20, 20, 19, 19, 18, 21, 22, 23, 22,
+        22, 21, 19, 19, 18, 17, 17, 17, 16, 16, 16, 15, 18, 19, 20, 20, 20, 19,
+        18, 18, 17, 16, 15, 14, 14, 13, 13, 12,
+        /* Size 8x32 */
+        32, 33, 28, 21, 21, 20, 18, 17, 33, 33, 27, 22, 22, 20, 19, 18, 33, 33,
+        27, 22, 22, 20, 19, 18, 34, 32, 26, 22, 22, 21, 20, 18, 34, 32, 26, 22,
+        23, 21, 20, 19, 32, 30, 25, 22, 23, 21, 20, 19, 31, 28, 24, 22, 22, 22,
+        20, 19, 30, 28, 23, 22, 23, 22, 20, 19, 28, 26, 22, 22, 23, 22, 21, 20,
+        28, 26, 22, 21, 22, 22, 21, 19, 24, 24, 22, 20, 21, 20, 19, 18, 24, 24,
+        22, 20, 21, 20, 19, 18, 22, 22, 21, 20, 19, 19, 19, 18, 21, 22, 21, 19,
+        19, 19, 18, 17, 21, 22, 22, 19, 19, 18, 18, 17, 21, 22, 22, 19, 18, 18,
+        17, 17, 21, 23, 22, 19, 18, 17, 17, 16, 21, 23, 22, 19, 18, 17, 16, 16,
+        21, 23, 22, 19, 18, 17, 16, 16, 20, 22, 22, 19, 17, 16, 16, 15, 20, 22,
+        22, 19, 17, 16, 16, 15, 20, 21, 22, 19, 17, 16, 15, 14, 20, 21, 22, 19,
+        17, 16, 15, 14, 19, 21, 21, 19, 17, 15, 14, 14, 19, 20, 21, 19, 17, 15,
+        14, 13, 19, 20, 21, 18, 16, 15, 14, 13, 18, 20, 20, 18, 16, 15, 14, 13,
+        18, 19, 20, 18, 16, 14, 13, 13, 17, 19, 20, 18, 16, 14, 13, 12, 17, 19,
+        19, 17, 16, 14, 13, 12, 16, 18, 19, 17, 15, 14, 13, 12, 16, 18, 19, 17,
+        15, 14, 13, 12,
+        /* Size 32x8 */
+        32, 33, 33, 34, 34, 32, 31, 30, 28, 28, 24, 24, 22, 21, 21, 21, 21, 21,
+        21, 20, 20, 20, 20, 19, 19, 19, 18, 18, 17, 17, 16, 16, 33, 33, 33, 32,
+        32, 30, 28, 28, 26, 26, 24, 24, 22, 22, 22, 22, 23, 23, 23, 22, 22, 21,
+        21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 28, 27, 27, 26, 26, 25, 24, 23,
+        22, 22, 22, 22, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21,
+        20, 20, 20, 19, 19, 19, 21, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20,
+        20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 17,
+        17, 17, 21, 22, 22, 22, 23, 23, 22, 23, 23, 22, 21, 21, 19, 19, 19, 18,
+        18, 18, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 20, 20,
+        20, 21, 21, 21, 22, 22, 22, 22, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16,
+        16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 18, 19, 19, 20, 20, 20,
+        20, 20, 21, 21, 19, 19, 19, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 14,
+        14, 14, 14, 13, 13, 13, 13, 13, 17, 18, 18, 18, 19, 19, 19, 19, 20, 19,
+        18, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 14, 13, 13, 13, 13,
+        12, 12, 12, 12 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 31, 24, 19, 31, 27, 22, 18, 24, 22, 16, 14, 19, 18, 14, 11,
+        /* Size 8x8 */
+        33, 32, 32, 30, 27, 22, 20, 16, 32, 32, 32, 30, 28, 23, 21, 17, 32, 32,
+        29, 28, 26, 23, 21, 18, 30, 30, 28, 24, 22, 20, 18, 16, 27, 28, 26, 22,
+        19, 17, 16, 14, 22, 23, 23, 20, 17, 15, 14, 12, 20, 21, 21, 18, 16, 14,
+        12, 11, 16, 17, 18, 16, 14, 12, 11, 10,
+        /* Size 16x16 */
+        32, 33, 33, 33, 32, 32, 30, 28, 27, 25, 23, 21, 19, 18, 17, 16, 33, 32,
+        32, 32, 32, 32, 30, 29, 27, 26, 24, 22, 20, 19, 18, 17, 33, 32, 32, 32,
+        32, 32, 31, 30, 28, 27, 25, 23, 21, 19, 18, 17, 33, 32, 32, 31, 31, 31,
+        29, 28, 27, 26, 24, 23, 21, 19, 18, 17, 32, 32, 32, 31, 30, 30, 28, 28,
+        26, 26, 24, 23, 21, 19, 19, 17, 32, 32, 32, 31, 30, 29, 28, 27, 26, 25,
+        24, 22, 21, 20, 19, 18, 30, 30, 31, 29, 28, 28, 26, 24, 23, 22, 22, 20,
+        19, 18, 17, 16, 28, 29, 30, 28, 28, 27, 24, 21, 20, 20, 19, 18, 17, 16,
+        16, 15, 27, 27, 28, 27, 26, 26, 23, 20, 20, 19, 18, 17, 16, 15, 15, 14,
+        25, 26, 27, 26, 26, 25, 22, 20, 19, 18, 17, 16, 15, 15, 14, 14, 23, 24,
+        25, 24, 24, 24, 22, 19, 18, 17, 16, 15, 14, 14, 13, 13, 21, 22, 23, 23,
+        23, 22, 20, 18, 17, 16, 15, 14, 13, 13, 12, 12, 19, 20, 21, 21, 21, 21,
+        19, 17, 16, 15, 14, 13, 12, 12, 12, 11, 18, 19, 19, 19, 19, 20, 18, 16,
+        15, 15, 14, 13, 12, 11, 11, 11, 17, 18, 18, 18, 19, 19, 17, 16, 15, 14,
+        13, 12, 12, 11, 11, 10, 16, 17, 17, 17, 17, 18, 16, 15, 14, 14, 13, 12,
+        11, 11, 10, 10,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 31, 30, 30, 28, 28, 27, 26,
+        25, 23, 23, 22, 21, 20, 19, 19, 18, 17, 17, 16, 16, 15, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 27, 27, 26, 24, 24, 22,
+        22, 21, 20, 20, 18, 18, 17, 16, 16, 15, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 30, 30, 29, 29, 27, 27, 26, 24, 24, 23, 22, 21, 20, 20,
+        19, 18, 18, 17, 17, 15, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        30, 30, 29, 29, 28, 27, 26, 24, 24, 23, 23, 22, 20, 20, 19, 19, 18, 17,
+        17, 16, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30,
+        28, 28, 27, 25, 25, 23, 23, 22, 21, 21, 19, 19, 18, 17, 17, 16, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 28, 28, 27, 25,
+        25, 23, 23, 22, 21, 21, 19, 19, 18, 17, 17, 16, 33, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 30, 29, 29, 28, 28, 27, 26, 26, 24, 24, 23, 23, 22,
+        21, 21, 19, 19, 18, 17, 17, 16, 33, 32, 32, 32, 32, 32, 31, 31, 31, 30,
+        30, 29, 29, 28, 28, 28, 27, 26, 26, 24, 24, 23, 23, 22, 20, 20, 19, 19,
+        18, 17, 17, 16, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 29, 28, 28,
+        28, 28, 26, 26, 26, 24, 24, 23, 23, 22, 21, 21, 19, 19, 19, 17, 17, 16,
+        32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 28, 28, 28, 27, 27, 26, 26,
+        25, 24, 24, 23, 22, 22, 21, 21, 20, 19, 19, 18, 18, 17, 32, 32, 32, 32,
+        32, 32, 31, 30, 30, 29, 29, 28, 28, 28, 27, 27, 26, 26, 25, 24, 24, 23,
+        22, 22, 21, 21, 20, 19, 19, 18, 18, 17, 31, 31, 31, 31, 31, 31, 30, 29,
+        29, 28, 28, 27, 26, 26, 24, 24, 24, 23, 23, 22, 22, 21, 20, 20, 19, 19,
+        18, 18, 17, 17, 17, 16, 30, 30, 30, 30, 31, 31, 29, 29, 28, 28, 28, 26,
+        26, 25, 24, 24, 23, 23, 22, 22, 22, 20, 20, 20, 19, 19, 18, 18, 17, 16,
+        16, 15, 30, 30, 30, 30, 30, 30, 29, 28, 28, 28, 28, 26, 25, 24, 23, 23,
+        22, 22, 21, 20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 15, 28, 29,
+        29, 29, 30, 30, 28, 28, 28, 27, 27, 24, 24, 23, 21, 21, 20, 20, 20, 19,
+        19, 18, 18, 18, 17, 17, 16, 16, 16, 15, 15, 14, 28, 29, 29, 29, 30, 30,
+        28, 28, 28, 27, 27, 24, 24, 23, 21, 21, 20, 20, 20, 19, 19, 18, 18, 18,
+        17, 17, 16, 16, 16, 15, 15, 14, 27, 27, 27, 28, 28, 28, 27, 27, 26, 26,
+        26, 24, 23, 22, 20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 15, 15,
+        15, 14, 14, 13, 26, 27, 27, 27, 28, 28, 26, 26, 26, 26, 26, 23, 23, 22,
+        20, 20, 19, 19, 19, 18, 18, 17, 17, 17, 16, 16, 15, 15, 15, 14, 14, 13,
+        25, 26, 26, 26, 27, 27, 26, 26, 26, 25, 25, 23, 22, 21, 20, 20, 19, 19,
+        18, 17, 17, 17, 16, 16, 15, 15, 15, 14, 14, 14, 14, 13, 23, 24, 24, 24,
+        25, 25, 24, 24, 24, 24, 24, 22, 22, 20, 19, 19, 18, 18, 17, 16, 16, 16,
+        15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 23, 24, 24, 24, 25, 25, 24, 24,
+        24, 24, 24, 22, 22, 20, 19, 19, 18, 18, 17, 16, 16, 16, 15, 15, 14, 14,
+        14, 14, 13, 13, 13, 12, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 21,
+        20, 20, 18, 18, 17, 17, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 13, 12,
+        12, 12, 21, 22, 22, 23, 23, 23, 23, 23, 23, 22, 22, 20, 20, 19, 18, 18,
+        17, 17, 16, 15, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 12, 12, 20, 21,
+        21, 22, 22, 22, 22, 22, 22, 22, 22, 20, 20, 19, 18, 18, 17, 17, 16, 15,
+        15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 11, 19, 20, 20, 20, 21, 21,
+        21, 20, 21, 21, 21, 19, 19, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13,
+        12, 12, 12, 12, 12, 11, 11, 11, 19, 20, 20, 20, 21, 21, 21, 20, 21, 21,
+        21, 19, 19, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12,
+        12, 11, 11, 11, 18, 18, 19, 19, 19, 19, 19, 19, 19, 20, 20, 18, 18, 17,
+        16, 16, 15, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 10,
+        17, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 17, 16, 16, 15, 15,
+        14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 17, 17, 18, 18,
+        18, 18, 18, 18, 19, 19, 19, 17, 17, 17, 16, 16, 15, 15, 14, 13, 13, 13,
+        12, 12, 12, 12, 11, 11, 11, 10, 10, 10, 16, 16, 17, 17, 17, 17, 17, 17,
+        17, 18, 18, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 11, 11,
+        11, 10, 10, 10, 10, 9, 16, 16, 17, 17, 17, 17, 17, 17, 17, 18, 18, 17,
+        16, 16, 15, 15, 14, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10,
+        10, 9, 15, 15, 15, 16, 16, 16, 16, 16, 16, 17, 17, 16, 15, 15, 14, 14,
+        13, 13, 13, 12, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9,
+        /* Size 4x8 */
+        32, 32, 24, 18, 32, 31, 25, 19, 32, 29, 24, 20, 30, 28, 20, 17, 27, 26,
+        18, 15, 23, 23, 16, 13, 20, 20, 14, 12, 17, 18, 13, 11,
+        /* Size 8x4 */
+        32, 32, 32, 30, 27, 23, 20, 17, 32, 31, 29, 28, 26, 23, 20, 18, 24, 25,
+        24, 20, 18, 16, 14, 13, 18, 19, 20, 17, 15, 13, 12, 11,
+        /* Size 8x16 */
+        32, 33, 32, 29, 26, 23, 19, 16, 33, 32, 32, 29, 27, 24, 20, 17, 33, 32,
+        31, 30, 28, 25, 21, 17, 33, 32, 30, 29, 27, 24, 21, 17, 32, 32, 30, 28,
+        26, 24, 21, 18, 32, 31, 29, 28, 26, 24, 21, 18, 30, 30, 28, 25, 23, 21,
+        19, 16, 28, 30, 27, 22, 20, 19, 17, 15, 27, 28, 26, 22, 20, 18, 16, 14,
+        25, 26, 25, 21, 19, 17, 15, 13, 23, 25, 24, 20, 18, 16, 14, 13, 21, 23,
+        22, 19, 17, 15, 13, 12, 19, 21, 20, 18, 16, 14, 12, 11, 18, 19, 19, 17,
+        15, 14, 12, 11, 17, 18, 18, 16, 15, 13, 12, 10, 16, 17, 18, 16, 14, 13,
+        11, 10,
+        /* Size 16x8 */
+        32, 33, 33, 33, 32, 32, 30, 28, 27, 25, 23, 21, 19, 18, 17, 16, 33, 32,
+        32, 32, 32, 31, 30, 30, 28, 26, 25, 23, 21, 19, 18, 17, 32, 32, 31, 30,
+        30, 29, 28, 27, 26, 25, 24, 22, 20, 19, 18, 18, 29, 29, 30, 29, 28, 28,
+        25, 22, 22, 21, 20, 19, 18, 17, 16, 16, 26, 27, 28, 27, 26, 26, 23, 20,
+        20, 19, 18, 17, 16, 15, 15, 14, 23, 24, 25, 24, 24, 24, 21, 19, 18, 17,
+        16, 15, 14, 14, 13, 13, 19, 20, 21, 21, 21, 21, 19, 17, 16, 15, 14, 13,
+        12, 12, 12, 11, 16, 17, 17, 17, 18, 18, 16, 15, 14, 13, 13, 12, 11, 11,
+        10, 10,
+        /* Size 16x32 */
+        32, 33, 33, 33, 32, 32, 29, 28, 26, 23, 23, 20, 19, 18, 16, 16, 33, 32,
+        32, 32, 32, 32, 29, 29, 27, 24, 24, 21, 20, 18, 16, 16, 33, 32, 32, 32,
+        32, 32, 29, 29, 27, 24, 24, 21, 20, 19, 17, 17, 33, 32, 32, 32, 32, 32,
+        30, 29, 28, 25, 25, 21, 20, 19, 17, 17, 33, 32, 32, 32, 31, 31, 30, 30,
+        28, 25, 25, 22, 21, 19, 17, 17, 33, 32, 32, 32, 31, 31, 30, 30, 28, 25,
+        25, 22, 21, 19, 17, 17, 33, 32, 32, 31, 30, 30, 29, 28, 27, 24, 24, 21,
+        21, 19, 17, 17, 32, 32, 32, 31, 30, 30, 28, 28, 27, 24, 24, 21, 20, 19,
+        17, 17, 32, 32, 32, 31, 30, 30, 28, 28, 26, 24, 24, 21, 21, 19, 18, 18,
+        32, 32, 31, 30, 29, 29, 28, 27, 26, 24, 24, 21, 21, 20, 18, 18, 32, 32,
+        31, 30, 29, 29, 28, 27, 26, 24, 24, 21, 21, 20, 18, 18, 31, 31, 31, 29,
+        28, 28, 26, 25, 24, 22, 22, 20, 19, 18, 17, 17, 30, 30, 30, 29, 28, 28,
+        25, 24, 23, 21, 21, 19, 19, 18, 16, 16, 30, 30, 30, 29, 28, 28, 24, 23,
+        22, 20, 20, 19, 18, 17, 16, 16, 28, 29, 30, 28, 27, 27, 22, 21, 20, 19,
+        19, 18, 17, 16, 15, 15, 28, 29, 30, 28, 27, 27, 22, 21, 20, 19, 19, 18,
+        17, 16, 15, 15, 27, 28, 28, 27, 26, 26, 22, 20, 20, 18, 18, 17, 16, 15,
+        14, 14, 26, 27, 28, 26, 26, 26, 21, 20, 19, 18, 18, 16, 16, 15, 14, 14,
+        25, 26, 26, 26, 25, 25, 21, 20, 19, 17, 17, 16, 15, 15, 13, 13, 23, 25,
+        25, 24, 24, 24, 20, 19, 18, 16, 16, 15, 14, 14, 13, 13, 23, 25, 25, 24,
+        24, 24, 20, 19, 18, 16, 16, 15, 14, 14, 13, 13, 22, 23, 23, 23, 23, 23,
+        19, 18, 17, 16, 16, 14, 14, 13, 12, 12, 21, 23, 23, 23, 22, 22, 19, 18,
+        17, 15, 15, 14, 13, 13, 12, 12, 20, 22, 22, 22, 22, 22, 19, 18, 17, 15,
+        15, 13, 13, 12, 12, 12, 19, 20, 21, 20, 20, 20, 18, 17, 16, 14, 14, 13,
+        12, 12, 11, 11, 19, 20, 21, 20, 20, 20, 18, 17, 16, 14, 14, 13, 12, 12,
+        11, 11, 18, 19, 19, 19, 19, 19, 17, 16, 15, 14, 14, 12, 12, 11, 11, 11,
+        18, 19, 19, 19, 19, 19, 17, 16, 15, 14, 14, 12, 12, 11, 10, 10, 17, 18,
+        18, 18, 18, 18, 16, 16, 15, 13, 13, 12, 12, 11, 10, 10, 16, 17, 17, 17,
+        18, 18, 16, 15, 14, 13, 13, 12, 11, 11, 10, 10, 16, 17, 17, 17, 18, 18,
+        16, 15, 14, 13, 13, 12, 11, 11, 10, 10, 15, 16, 16, 16, 17, 17, 15, 14,
+        13, 12, 12, 11, 11, 10, 9, 9,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 31, 30, 30, 28, 28, 27, 26,
+        25, 23, 23, 22, 21, 20, 19, 19, 18, 18, 17, 16, 16, 15, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 28, 27, 26, 25, 25, 23,
+        23, 22, 20, 20, 19, 19, 18, 17, 17, 16, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 30, 30, 30, 30, 28, 28, 26, 25, 25, 23, 23, 22, 21, 21,
+        19, 19, 18, 17, 17, 16, 33, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 29,
+        29, 29, 28, 28, 27, 26, 26, 24, 24, 23, 23, 22, 20, 20, 19, 19, 18, 17,
+        17, 16, 32, 32, 32, 32, 31, 31, 30, 30, 30, 29, 29, 28, 28, 28, 27, 27,
+        26, 26, 25, 24, 24, 23, 22, 22, 20, 20, 19, 19, 18, 18, 18, 17, 32, 32,
+        32, 32, 31, 31, 30, 30, 30, 29, 29, 28, 28, 28, 27, 27, 26, 26, 25, 24,
+        24, 23, 22, 22, 20, 20, 19, 19, 18, 18, 18, 17, 29, 29, 29, 30, 30, 30,
+        29, 28, 28, 28, 28, 26, 25, 24, 22, 22, 22, 21, 21, 20, 20, 19, 19, 19,
+        18, 18, 17, 17, 16, 16, 16, 15, 28, 29, 29, 29, 30, 30, 28, 28, 28, 27,
+        27, 25, 24, 23, 21, 21, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 16, 16,
+        16, 15, 15, 14, 26, 27, 27, 28, 28, 28, 27, 27, 26, 26, 26, 24, 23, 22,
+        20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 15, 15, 15, 14, 14, 13,
+        23, 24, 24, 25, 25, 25, 24, 24, 24, 24, 24, 22, 21, 20, 19, 19, 18, 18,
+        17, 16, 16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 23, 24, 24, 25,
+        25, 25, 24, 24, 24, 24, 24, 22, 21, 20, 19, 19, 18, 18, 17, 16, 16, 16,
+        15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 20, 21, 21, 21, 22, 22, 21, 21,
+        21, 21, 21, 20, 19, 19, 18, 18, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13,
+        12, 12, 12, 12, 12, 11, 19, 20, 20, 20, 21, 21, 21, 20, 21, 21, 21, 19,
+        19, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13, 12, 12, 12, 12, 12, 11,
+        11, 11, 18, 18, 19, 19, 19, 19, 19, 19, 19, 20, 20, 18, 18, 17, 16, 16,
+        15, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 11, 11, 11, 10, 16, 16,
+        17, 17, 17, 17, 17, 17, 18, 18, 18, 17, 16, 16, 15, 15, 14, 14, 13, 13,
+        13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 10, 9, 16, 16, 17, 17, 17, 17,
+        17, 17, 18, 18, 18, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12,
+        11, 11, 11, 10, 10, 10, 10, 9,
+        /* Size 4x16 */
+        33, 32, 23, 18, 32, 32, 24, 19, 32, 31, 25, 19, 32, 30, 24, 19, 32, 30,
+        24, 19, 32, 29, 24, 20, 30, 28, 21, 18, 29, 27, 19, 16, 28, 26, 18, 15,
+        26, 25, 17, 15, 25, 24, 16, 14, 23, 22, 15, 13, 20, 20, 14, 12, 19, 19,
+        14, 11, 18, 18, 13, 11, 17, 18, 13, 11,
+        /* Size 16x4 */
+        33, 32, 32, 32, 32, 32, 30, 29, 28, 26, 25, 23, 20, 19, 18, 17, 32, 32,
+        31, 30, 30, 29, 28, 27, 26, 25, 24, 22, 20, 19, 18, 18, 23, 24, 25, 24,
+        24, 24, 21, 19, 18, 17, 16, 15, 14, 14, 13, 13, 18, 19, 19, 19, 19, 20,
+        18, 16, 15, 15, 14, 13, 12, 11, 11, 11,
+        /* Size 8x32 */
+        32, 33, 32, 29, 26, 23, 19, 16, 33, 32, 32, 29, 27, 24, 20, 16, 33, 32,
+        32, 29, 27, 24, 20, 17, 33, 32, 32, 30, 28, 25, 20, 17, 33, 32, 31, 30,
+        28, 25, 21, 17, 33, 32, 31, 30, 28, 25, 21, 17, 33, 32, 30, 29, 27, 24,
+        21, 17, 32, 32, 30, 28, 27, 24, 20, 17, 32, 32, 30, 28, 26, 24, 21, 18,
+        32, 31, 29, 28, 26, 24, 21, 18, 32, 31, 29, 28, 26, 24, 21, 18, 31, 31,
+        28, 26, 24, 22, 19, 17, 30, 30, 28, 25, 23, 21, 19, 16, 30, 30, 28, 24,
+        22, 20, 18, 16, 28, 30, 27, 22, 20, 19, 17, 15, 28, 30, 27, 22, 20, 19,
+        17, 15, 27, 28, 26, 22, 20, 18, 16, 14, 26, 28, 26, 21, 19, 18, 16, 14,
+        25, 26, 25, 21, 19, 17, 15, 13, 23, 25, 24, 20, 18, 16, 14, 13, 23, 25,
+        24, 20, 18, 16, 14, 13, 22, 23, 23, 19, 17, 16, 14, 12, 21, 23, 22, 19,
+        17, 15, 13, 12, 20, 22, 22, 19, 17, 15, 13, 12, 19, 21, 20, 18, 16, 14,
+        12, 11, 19, 21, 20, 18, 16, 14, 12, 11, 18, 19, 19, 17, 15, 14, 12, 11,
+        18, 19, 19, 17, 15, 14, 12, 10, 17, 18, 18, 16, 15, 13, 12, 10, 16, 17,
+        18, 16, 14, 13, 11, 10, 16, 17, 18, 16, 14, 13, 11, 10, 15, 16, 17, 15,
+        13, 12, 11, 9,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 31, 30, 30, 28, 28, 27, 26,
+        25, 23, 23, 22, 21, 20, 19, 19, 18, 18, 17, 16, 16, 15, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 28, 28, 26, 25, 25, 23,
+        23, 22, 21, 21, 19, 19, 18, 17, 17, 16, 32, 32, 32, 32, 31, 31, 30, 30,
+        30, 29, 29, 28, 28, 28, 27, 27, 26, 26, 25, 24, 24, 23, 22, 22, 20, 20,
+        19, 19, 18, 18, 18, 17, 29, 29, 29, 30, 30, 30, 29, 28, 28, 28, 28, 26,
+        25, 24, 22, 22, 22, 21, 21, 20, 20, 19, 19, 19, 18, 18, 17, 17, 16, 16,
+        16, 15, 26, 27, 27, 28, 28, 28, 27, 27, 26, 26, 26, 24, 23, 22, 20, 20,
+        20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 15, 15, 15, 14, 14, 13, 23, 24,
+        24, 25, 25, 25, 24, 24, 24, 24, 24, 22, 21, 20, 19, 19, 18, 18, 17, 16,
+        16, 16, 15, 15, 14, 14, 14, 14, 13, 13, 13, 12, 19, 20, 20, 20, 21, 21,
+        21, 20, 21, 21, 21, 19, 19, 18, 17, 17, 16, 16, 15, 14, 14, 14, 13, 13,
+        12, 12, 12, 12, 12, 11, 11, 11, 16, 16, 17, 17, 17, 17, 17, 17, 18, 18,
+        18, 17, 16, 16, 15, 15, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10,
+        10, 10, 10, 9 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 25, 22, 20, 25, 21, 21, 20, 22, 21, 18, 17, 20, 20, 17, 14,
+        /* Size 8x8 */
+        33, 33, 27, 23, 22, 21, 20, 19, 33, 32, 26, 23, 23, 22, 22, 20, 27, 26,
+        22, 22, 22, 22, 22, 20, 23, 23, 22, 20, 20, 20, 20, 19, 22, 23, 22, 20,
+        19, 18, 18, 17, 21, 22, 22, 20, 18, 17, 16, 16, 20, 22, 22, 20, 18, 16,
+        16, 15, 19, 20, 20, 19, 17, 16, 15, 13,
+        /* Size 16x16 */
+        32, 33, 34, 31, 30, 28, 25, 21, 21, 21, 21, 20, 20, 19, 19, 18, 33, 33,
+        33, 30, 28, 27, 24, 22, 22, 22, 22, 21, 20, 20, 19, 19, 34, 33, 32, 30,
+        28, 26, 24, 22, 23, 23, 23, 22, 22, 21, 20, 20, 31, 30, 30, 28, 26, 24,
+        23, 22, 22, 22, 23, 22, 22, 21, 20, 20, 30, 28, 28, 26, 24, 23, 22, 22,
+        22, 22, 23, 22, 22, 21, 21, 20, 28, 27, 26, 24, 23, 22, 22, 21, 22, 22,
+        23, 22, 22, 21, 21, 20, 25, 24, 24, 23, 22, 22, 21, 20, 20, 21, 21, 20,
+        20, 20, 20, 19, 21, 22, 22, 22, 22, 21, 20, 19, 19, 19, 19, 19, 19, 19,
+        18, 18, 21, 22, 23, 22, 22, 22, 20, 19, 19, 19, 19, 18, 18, 18, 18, 17,
+        21, 22, 23, 22, 22, 22, 21, 19, 19, 19, 18, 18, 17, 17, 17, 17, 21, 22,
+        23, 23, 23, 23, 21, 19, 19, 18, 18, 17, 17, 17, 16, 16, 20, 21, 22, 22,
+        22, 22, 20, 19, 18, 18, 17, 17, 16, 16, 16, 15, 20, 20, 22, 22, 22, 22,
+        20, 19, 18, 17, 17, 16, 16, 15, 15, 15, 19, 20, 21, 21, 21, 21, 20, 19,
+        18, 17, 17, 16, 15, 15, 14, 14, 19, 19, 20, 20, 21, 21, 20, 18, 18, 17,
+        16, 16, 15, 14, 14, 14, 18, 19, 20, 20, 20, 20, 19, 18, 17, 17, 16, 15,
+        15, 14, 14, 13,
+        /* Size 32x32 */
+        32, 33, 33, 33, 34, 34, 31, 31, 30, 28, 28, 26, 25, 23, 21, 21, 21, 21,
+        21, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 18, 18, 17, 33, 33, 33, 33,
+        33, 33, 31, 30, 28, 27, 27, 25, 24, 23, 21, 21, 22, 22, 22, 22, 22, 21,
+        21, 21, 20, 20, 20, 20, 19, 19, 19, 18, 33, 33, 33, 33, 33, 33, 30, 30,
+        28, 27, 27, 25, 24, 23, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20,
+        20, 20, 19, 19, 19, 18, 33, 33, 33, 33, 33, 33, 30, 29, 28, 26, 26, 25,
+        24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 19,
+        19, 19, 34, 33, 33, 33, 32, 32, 30, 29, 28, 26, 26, 24, 24, 23, 22, 22,
+        23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 34, 33,
+        33, 33, 32, 32, 30, 29, 28, 26, 26, 24, 24, 23, 22, 22, 23, 23, 23, 23,
+        23, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 31, 31, 30, 30, 30, 30,
+        28, 27, 26, 24, 24, 23, 23, 23, 22, 22, 22, 22, 22, 23, 23, 22, 22, 22,
+        22, 22, 21, 21, 20, 20, 20, 19, 31, 30, 30, 29, 29, 29, 27, 26, 26, 24,
+        24, 23, 23, 22, 22, 22, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 21, 21,
+        20, 20, 20, 19, 30, 28, 28, 28, 28, 28, 26, 26, 24, 23, 23, 23, 22, 22,
+        22, 22, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20,
+        28, 27, 27, 26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 21, 21, 22, 22,
+        22, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 28, 27, 27, 26,
+        26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 21, 21, 22, 22, 22, 23, 23, 22,
+        22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 26, 25, 25, 25, 24, 24, 23, 23,
+        23, 22, 22, 21, 21, 21, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+        20, 20, 20, 20, 20, 19, 25, 24, 24, 24, 24, 24, 23, 23, 22, 22, 22, 21,
+        21, 21, 20, 20, 20, 21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 19,
+        19, 19, 23, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 21, 21, 20, 20, 20,
+        20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 19, 18, 21, 21,
+        22, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 21, 21, 22, 22, 22, 22,
+        22, 22, 22, 21, 21, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 18, 18, 18, 18, 21, 22, 22, 22, 23, 23, 22, 22, 22, 22,
+        22, 21, 20, 20, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 18,
+        18, 17, 17, 17, 21, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 21, 21, 20,
+        19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 18, 17, 17, 17, 17,
+        21, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 21, 21, 20, 19, 19, 19, 19,
+        19, 18, 18, 18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 16, 21, 22, 22, 22,
+        23, 23, 23, 23, 23, 23, 23, 21, 21, 20, 19, 19, 19, 19, 18, 18, 18, 17,
+        17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 21, 22, 22, 22, 23, 23, 23, 23,
+        23, 23, 23, 21, 21, 20, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17,
+        17, 17, 16, 16, 16, 16, 20, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 21,
+        20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16,
+        16, 15, 20, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 19, 19,
+        18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 20, 21,
+        21, 21, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 19, 19, 18, 18, 18, 17,
+        17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 15, 20, 20, 20, 21, 22, 22,
+        22, 22, 22, 22, 22, 21, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16,
+        16, 16, 15, 15, 15, 15, 15, 14, 20, 20, 20, 21, 22, 22, 22, 22, 22, 22,
+        22, 21, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15,
+        15, 15, 15, 14, 19, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 20, 20, 19,
+        19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14,
+        19, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 20, 20, 19, 19, 19, 18, 18,
+        17, 17, 17, 16, 16, 16, 15, 15, 15, 14, 14, 14, 14, 14, 19, 19, 19, 20,
+        20, 20, 20, 20, 21, 21, 21, 20, 20, 19, 18, 18, 18, 17, 17, 16, 16, 16,
+        16, 15, 15, 15, 14, 14, 14, 14, 14, 13, 18, 19, 19, 19, 20, 20, 20, 20,
+        20, 20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15,
+        14, 14, 14, 13, 13, 13, 18, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20,
+        19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 13,
+        13, 13, 17, 18, 18, 19, 19, 19, 19, 19, 20, 20, 20, 19, 19, 18, 18, 18,
+        17, 17, 16, 16, 16, 15, 15, 15, 14, 14, 14, 14, 13, 13, 13, 13,
+        /* Size 4x8 */
+        33, 27, 22, 20, 32, 26, 23, 21, 26, 22, 23, 21, 23, 22, 20, 19, 22, 22,
+        18, 18, 22, 22, 17, 16, 21, 22, 17, 15, 19, 20, 16, 14,
+        /* Size 8x4 */
+        33, 32, 26, 23, 22, 22, 21, 19, 27, 26, 22, 22, 22, 22, 22, 20, 22, 23,
+        23, 20, 18, 17, 17, 16, 20, 21, 21, 19, 18, 16, 15, 14,
+        /* Size 8x16 */
+        32, 33, 28, 23, 21, 21, 20, 18, 33, 33, 27, 23, 22, 22, 20, 19, 34, 32,
+        26, 23, 23, 23, 21, 20, 31, 29, 24, 22, 22, 23, 22, 20, 29, 28, 23, 22,
+        22, 23, 22, 20, 28, 26, 22, 22, 22, 23, 22, 20, 24, 24, 22, 21, 20, 21,
+        20, 19, 21, 22, 21, 20, 19, 19, 19, 18, 21, 22, 22, 20, 19, 19, 18, 17,
+        21, 23, 22, 20, 19, 18, 17, 17, 21, 23, 22, 20, 19, 18, 17, 16, 20, 22,
+        22, 20, 18, 17, 16, 15, 20, 21, 22, 19, 18, 17, 16, 14, 19, 21, 21, 19,
+        18, 17, 15, 14, 19, 20, 21, 19, 18, 16, 15, 14, 18, 20, 20, 19, 17, 16,
+        15, 13,
+        /* Size 16x8 */
+        32, 33, 34, 31, 29, 28, 24, 21, 21, 21, 21, 20, 20, 19, 19, 18, 33, 33,
+        32, 29, 28, 26, 24, 22, 22, 23, 23, 22, 21, 21, 20, 20, 28, 27, 26, 24,
+        23, 22, 22, 21, 22, 22, 22, 22, 22, 21, 21, 20, 23, 23, 23, 22, 22, 22,
+        21, 20, 20, 20, 20, 20, 19, 19, 19, 19, 21, 22, 23, 22, 22, 22, 20, 19,
+        19, 19, 19, 18, 18, 18, 18, 17, 21, 22, 23, 23, 23, 23, 21, 19, 19, 18,
+        18, 17, 17, 17, 16, 16, 20, 20, 21, 22, 22, 22, 20, 19, 18, 17, 17, 16,
+        16, 15, 15, 15, 18, 19, 20, 20, 20, 20, 19, 18, 17, 17, 16, 15, 14, 14,
+        14, 13,
+        /* Size 16x32 */
+        32, 33, 33, 31, 28, 28, 23, 21, 21, 21, 21, 20, 20, 19, 18, 18, 33, 33,
+        33, 30, 27, 27, 23, 22, 22, 22, 22, 20, 20, 20, 19, 19, 33, 33, 33, 30,
+        27, 27, 23, 22, 22, 22, 22, 21, 20, 20, 19, 19, 33, 33, 32, 30, 26, 26,
+        23, 22, 22, 22, 22, 21, 21, 20, 19, 19, 34, 32, 32, 29, 26, 26, 23, 22,
+        23, 23, 23, 22, 21, 21, 20, 20, 34, 32, 32, 29, 26, 26, 23, 22, 23, 23,
+        23, 22, 21, 21, 20, 20, 31, 30, 29, 28, 24, 24, 22, 22, 22, 23, 23, 22,
+        22, 21, 20, 20, 31, 29, 28, 27, 24, 24, 22, 22, 22, 22, 22, 22, 22, 21,
+        20, 20, 29, 28, 28, 26, 23, 23, 22, 22, 22, 23, 23, 22, 22, 21, 20, 20,
+        28, 26, 26, 24, 22, 22, 22, 22, 22, 23, 23, 22, 22, 21, 20, 20, 28, 26,
+        26, 24, 22, 22, 22, 22, 22, 23, 23, 22, 22, 21, 20, 20, 25, 24, 24, 23,
+        22, 22, 21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 24, 24, 24, 23, 22, 22,
+        21, 20, 20, 21, 21, 20, 20, 20, 19, 19, 23, 23, 23, 23, 22, 22, 20, 20,
+        20, 20, 20, 20, 20, 19, 19, 19, 21, 22, 22, 22, 21, 21, 20, 19, 19, 19,
+        19, 19, 19, 19, 18, 18, 21, 22, 22, 22, 21, 21, 20, 19, 19, 19, 19, 19,
+        19, 19, 18, 18, 21, 22, 22, 22, 22, 22, 20, 19, 19, 19, 19, 18, 18, 18,
+        17, 17, 21, 22, 22, 22, 22, 22, 20, 19, 19, 18, 18, 18, 18, 18, 17, 17,
+        21, 22, 23, 22, 22, 22, 20, 19, 19, 18, 18, 18, 17, 17, 17, 17, 21, 22,
+        23, 23, 22, 22, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 21, 22, 23, 23,
+        22, 22, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 20, 22, 22, 22, 22, 22,
+        20, 19, 18, 17, 17, 17, 16, 16, 16, 16, 20, 22, 22, 22, 22, 22, 20, 19,
+        18, 17, 17, 16, 16, 16, 15, 15, 20, 21, 22, 22, 22, 22, 20, 19, 18, 17,
+        17, 16, 16, 16, 15, 15, 20, 21, 21, 22, 22, 22, 19, 19, 18, 17, 17, 16,
+        16, 15, 14, 14, 20, 21, 21, 22, 22, 22, 19, 19, 18, 17, 17, 16, 16, 15,
+        14, 14, 19, 20, 21, 21, 21, 21, 19, 19, 18, 17, 17, 15, 15, 15, 14, 14,
+        19, 20, 20, 21, 21, 21, 19, 19, 18, 17, 17, 15, 15, 15, 14, 14, 19, 20,
+        20, 20, 21, 21, 19, 18, 18, 16, 16, 15, 15, 14, 14, 14, 18, 19, 20, 20,
+        20, 20, 19, 18, 17, 16, 16, 15, 15, 14, 13, 13, 18, 19, 20, 20, 20, 20,
+        19, 18, 17, 16, 16, 15, 15, 14, 13, 13, 17, 19, 19, 19, 20, 20, 18, 18,
+        17, 16, 16, 15, 14, 14, 13, 13,
+        /* Size 32x16 */
+        32, 33, 33, 33, 34, 34, 31, 31, 29, 28, 28, 25, 24, 23, 21, 21, 21, 21,
+        21, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 18, 18, 17, 33, 33, 33, 33,
+        32, 32, 30, 29, 28, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 33, 33, 33, 32, 32, 32, 29, 28,
+        28, 26, 26, 24, 24, 23, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 21, 21,
+        21, 20, 20, 20, 20, 19, 31, 30, 30, 30, 29, 29, 28, 27, 26, 24, 24, 23,
+        23, 23, 22, 22, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 21, 21, 20, 20,
+        20, 19, 28, 27, 27, 26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 21, 21,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 28, 27,
+        27, 26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 21, 21, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 23, 23, 23, 23, 23, 23,
+        22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+        19, 19, 19, 19, 19, 19, 19, 18, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 21, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        18, 18, 18, 18, 21, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 21, 20, 20,
+        19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 18, 18, 17, 17, 17,
+        21, 22, 22, 22, 23, 23, 23, 22, 23, 23, 23, 21, 21, 20, 19, 19, 19, 18,
+        18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 21, 22, 22, 22,
+        23, 23, 23, 22, 23, 23, 23, 21, 21, 20, 19, 19, 19, 18, 18, 18, 18, 17,
+        17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 20, 20, 21, 21, 22, 22, 22, 22,
+        22, 22, 22, 21, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16,
+        15, 15, 15, 15, 15, 15, 20, 20, 20, 21, 21, 21, 22, 22, 22, 22, 22, 20,
+        20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 15,
+        15, 14, 19, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 20, 20, 19, 19, 19,
+        18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 18, 19,
+        19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16,
+        16, 16, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13, 18, 19, 19, 19, 20, 20,
+        20, 20, 20, 20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15,
+        14, 14, 14, 14, 14, 13, 13, 13,
+        /* Size 4x16 */
+        33, 28, 21, 19, 33, 27, 22, 20, 32, 26, 23, 21, 30, 24, 23, 21, 28, 23,
+        23, 21, 26, 22, 23, 21, 24, 22, 21, 20, 22, 21, 19, 19, 22, 22, 19, 18,
+        22, 22, 18, 17, 22, 22, 18, 17, 22, 22, 17, 16, 21, 22, 17, 15, 20, 21,
+        17, 15, 20, 21, 16, 14, 19, 20, 16, 14,
+        /* Size 16x4 */
+        33, 33, 32, 30, 28, 26, 24, 22, 22, 22, 22, 22, 21, 20, 20, 19, 28, 27,
+        26, 24, 23, 22, 22, 21, 22, 22, 22, 22, 22, 21, 21, 20, 21, 22, 23, 23,
+        23, 23, 21, 19, 19, 18, 18, 17, 17, 17, 16, 16, 19, 20, 21, 21, 21, 21,
+        20, 19, 18, 17, 17, 16, 15, 15, 14, 14,
+        /* Size 8x32 */
+        32, 33, 28, 23, 21, 21, 20, 18, 33, 33, 27, 23, 22, 22, 20, 19, 33, 33,
+        27, 23, 22, 22, 20, 19, 33, 32, 26, 23, 22, 22, 21, 19, 34, 32, 26, 23,
+        23, 23, 21, 20, 34, 32, 26, 23, 23, 23, 21, 20, 31, 29, 24, 22, 22, 23,
+        22, 20, 31, 28, 24, 22, 22, 22, 22, 20, 29, 28, 23, 22, 22, 23, 22, 20,
+        28, 26, 22, 22, 22, 23, 22, 20, 28, 26, 22, 22, 22, 23, 22, 20, 25, 24,
+        22, 21, 21, 21, 20, 20, 24, 24, 22, 21, 20, 21, 20, 19, 23, 23, 22, 20,
+        20, 20, 20, 19, 21, 22, 21, 20, 19, 19, 19, 18, 21, 22, 21, 20, 19, 19,
+        19, 18, 21, 22, 22, 20, 19, 19, 18, 17, 21, 22, 22, 20, 19, 18, 18, 17,
+        21, 23, 22, 20, 19, 18, 17, 17, 21, 23, 22, 20, 19, 18, 17, 16, 21, 23,
+        22, 20, 19, 18, 17, 16, 20, 22, 22, 20, 18, 17, 16, 16, 20, 22, 22, 20,
+        18, 17, 16, 15, 20, 22, 22, 20, 18, 17, 16, 15, 20, 21, 22, 19, 18, 17,
+        16, 14, 20, 21, 22, 19, 18, 17, 16, 14, 19, 21, 21, 19, 18, 17, 15, 14,
+        19, 20, 21, 19, 18, 17, 15, 14, 19, 20, 21, 19, 18, 16, 15, 14, 18, 20,
+        20, 19, 17, 16, 15, 13, 18, 20, 20, 19, 17, 16, 15, 13, 17, 19, 20, 18,
+        17, 16, 14, 13,
+        /* Size 32x8 */
+        32, 33, 33, 33, 34, 34, 31, 31, 29, 28, 28, 25, 24, 23, 21, 21, 21, 21,
+        21, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 18, 18, 17, 33, 33, 33, 32,
+        32, 32, 29, 28, 28, 26, 26, 24, 24, 23, 22, 22, 22, 22, 23, 23, 23, 22,
+        22, 22, 21, 21, 21, 20, 20, 20, 20, 19, 28, 27, 27, 26, 26, 26, 24, 24,
+        23, 22, 22, 22, 22, 22, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        21, 21, 21, 20, 20, 20, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 21,
+        21, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19,
+        19, 18, 21, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 21, 20, 20, 19, 19,
+        19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 18, 18, 17, 17, 17, 21, 22,
+        22, 22, 23, 23, 23, 22, 23, 23, 23, 21, 21, 20, 19, 19, 19, 18, 18, 18,
+        18, 17, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 20, 20, 20, 21, 21, 21,
+        22, 22, 22, 22, 22, 20, 20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16,
+        16, 16, 15, 15, 15, 15, 15, 14, 18, 19, 19, 19, 20, 20, 20, 20, 20, 20,
+        20, 20, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 14, 14, 14, 14,
+        14, 13, 13, 13 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 32, 27, 20, 32, 29, 26, 21, 27, 26, 19, 16, 20, 21, 16, 13,
+        /* Size 8x8 */
+        33, 32, 32, 30, 29, 25, 22, 19, 32, 32, 32, 31, 30, 26, 23, 20, 32, 32,
+        30, 29, 28, 25, 23, 20, 30, 31, 29, 26, 24, 22, 20, 19, 29, 30, 28, 24,
+        21, 19, 18, 17, 25, 26, 25, 22, 19, 17, 16, 15, 22, 23, 23, 20, 18, 16,
+        14, 13, 19, 20, 20, 19, 17, 15, 13, 12,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 32, 32, 30, 28, 27, 26, 23, 22, 21, 19, 17, 33, 32,
+        32, 32, 32, 32, 31, 30, 29, 28, 27, 24, 23, 22, 20, 18, 33, 32, 32, 32,
+        32, 32, 31, 31, 30, 28, 28, 25, 23, 22, 20, 19, 33, 32, 32, 32, 32, 31,
+        31, 30, 29, 28, 27, 25, 23, 23, 21, 19, 33, 32, 32, 32, 31, 30, 30, 29,
+        28, 27, 26, 24, 23, 22, 20, 19, 32, 32, 32, 31, 30, 29, 28, 28, 27, 26,
+        26, 24, 23, 22, 21, 19, 32, 31, 31, 31, 30, 28, 28, 27, 26, 25, 24, 23,
+        22, 21, 20, 19, 30, 30, 31, 30, 29, 28, 27, 26, 24, 23, 23, 22, 20, 20,
+        19, 18, 28, 29, 30, 29, 28, 27, 26, 24, 21, 20, 20, 19, 18, 18, 17, 16,
+        27, 28, 28, 28, 27, 26, 25, 23, 20, 20, 20, 18, 18, 17, 16, 15, 26, 27,
+        28, 27, 26, 26, 24, 23, 20, 20, 19, 18, 17, 17, 16, 15, 23, 24, 25, 25,
+        24, 24, 23, 22, 19, 18, 18, 16, 16, 15, 14, 14, 22, 23, 23, 23, 23, 23,
+        22, 20, 18, 18, 17, 16, 15, 14, 14, 13, 21, 22, 22, 23, 22, 22, 21, 20,
+        18, 17, 17, 15, 14, 14, 13, 13, 19, 20, 20, 21, 20, 21, 20, 19, 17, 16,
+        16, 14, 14, 13, 12, 12, 17, 18, 19, 19, 19, 19, 19, 18, 16, 15, 15, 14,
+        13, 13, 12, 11,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 30, 30, 29, 28, 28,
+        27, 26, 26, 24, 23, 23, 22, 21, 21, 19, 19, 19, 17, 17, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 29, 29, 28, 26, 26, 25,
+        24, 24, 22, 22, 21, 20, 20, 19, 18, 18, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 30, 30, 30, 29, 29, 28, 27, 27, 25, 24, 24, 23, 22,
+        22, 20, 20, 19, 18, 18, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 30, 30, 30, 29, 29, 28, 27, 27, 25, 24, 24, 23, 22, 22, 20, 20, 20,
+        18, 18, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30,
+        30, 30, 28, 28, 28, 26, 25, 25, 23, 23, 22, 21, 20, 20, 19, 19, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 28, 28,
+        28, 26, 25, 25, 23, 23, 23, 21, 21, 20, 19, 19, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 29, 29, 28, 27, 27, 26, 25, 25,
+        23, 23, 23, 21, 21, 20, 19, 19, 33, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        30, 30, 30, 29, 29, 29, 28, 28, 27, 26, 26, 25, 24, 24, 23, 23, 22, 21,
+        20, 20, 19, 19, 33, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 29,
+        29, 28, 28, 28, 27, 26, 26, 25, 24, 24, 23, 23, 22, 21, 20, 20, 19, 19,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 29, 29, 29, 28, 28, 28,
+        27, 26, 26, 25, 24, 24, 23, 23, 22, 21, 21, 20, 19, 19, 32, 32, 32, 32,
+        32, 32, 31, 30, 30, 30, 29, 29, 28, 28, 28, 28, 27, 27, 26, 26, 26, 24,
+        24, 24, 23, 22, 22, 21, 21, 20, 19, 19, 32, 32, 32, 32, 32, 32, 31, 30,
+        30, 30, 29, 29, 28, 28, 28, 28, 27, 27, 26, 26, 26, 24, 24, 24, 23, 22,
+        22, 21, 21, 20, 19, 19, 32, 31, 31, 31, 31, 31, 31, 30, 30, 29, 28, 28,
+        28, 27, 27, 26, 26, 26, 25, 24, 24, 23, 23, 23, 22, 22, 21, 20, 20, 20,
+        19, 19, 30, 30, 30, 30, 31, 31, 30, 29, 29, 29, 28, 28, 27, 26, 26, 25,
+        24, 24, 23, 23, 23, 22, 22, 21, 20, 20, 20, 19, 19, 19, 18, 18, 30, 30,
+        30, 30, 31, 31, 30, 29, 29, 29, 28, 28, 27, 26, 26, 25, 24, 24, 23, 23,
+        23, 22, 22, 21, 20, 20, 20, 19, 19, 19, 18, 18, 29, 30, 30, 30, 30, 30,
+        30, 29, 28, 28, 28, 28, 26, 25, 25, 24, 23, 23, 22, 22, 22, 21, 20, 20,
+        19, 19, 19, 18, 18, 18, 17, 17, 28, 29, 29, 29, 30, 30, 29, 28, 28, 28,
+        27, 27, 26, 24, 24, 23, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17,
+        17, 17, 16, 16, 28, 29, 29, 29, 30, 30, 29, 28, 28, 28, 27, 27, 26, 24,
+        24, 23, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16,
+        27, 28, 28, 28, 28, 28, 28, 27, 27, 27, 26, 26, 25, 23, 23, 22, 20, 20,
+        20, 20, 20, 19, 18, 18, 18, 17, 17, 17, 16, 16, 15, 15, 26, 26, 27, 27,
+        28, 28, 27, 26, 26, 26, 26, 26, 24, 23, 23, 22, 20, 20, 20, 19, 19, 18,
+        18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 26, 26, 27, 27, 28, 28, 27, 26,
+        26, 26, 26, 26, 24, 23, 23, 22, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17,
+        17, 16, 16, 16, 15, 15, 24, 25, 25, 25, 26, 26, 26, 25, 25, 25, 24, 24,
+        23, 22, 22, 21, 19, 19, 19, 18, 18, 17, 17, 17, 16, 16, 16, 15, 15, 15,
+        14, 14, 23, 24, 24, 24, 25, 25, 25, 24, 24, 24, 24, 24, 23, 22, 22, 20,
+        19, 19, 18, 18, 18, 17, 16, 16, 16, 15, 15, 14, 14, 14, 14, 14, 23, 24,
+        24, 24, 25, 25, 25, 24, 24, 24, 24, 24, 23, 21, 21, 20, 19, 19, 18, 18,
+        18, 17, 16, 16, 16, 15, 15, 14, 14, 14, 13, 13, 22, 22, 23, 23, 23, 23,
+        23, 23, 23, 23, 23, 23, 22, 20, 20, 19, 18, 18, 18, 17, 17, 16, 16, 16,
+        15, 15, 14, 14, 14, 13, 13, 13, 21, 22, 22, 22, 23, 23, 23, 23, 23, 23,
+        22, 22, 22, 20, 20, 19, 18, 18, 17, 17, 17, 16, 15, 15, 15, 14, 14, 14,
+        13, 13, 13, 13, 21, 21, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 21, 20,
+        20, 19, 18, 18, 17, 17, 17, 16, 15, 15, 14, 14, 14, 13, 13, 13, 13, 13,
+        19, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 20, 19, 19, 18, 17, 17,
+        17, 16, 16, 15, 14, 14, 14, 14, 13, 13, 13, 12, 12, 12, 19, 20, 20, 20,
+        20, 21, 21, 20, 20, 21, 21, 21, 20, 19, 19, 18, 17, 17, 16, 16, 16, 15,
+        14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 19, 19, 19, 20, 20, 20, 20, 20,
+        20, 20, 20, 20, 20, 19, 19, 18, 17, 17, 16, 16, 16, 15, 14, 14, 13, 13,
+        13, 12, 12, 12, 12, 12, 17, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19,
+        19, 18, 18, 17, 16, 16, 15, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 12,
+        11, 11, 17, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 17,
+        16, 16, 15, 15, 15, 14, 14, 13, 13, 13, 13, 12, 12, 12, 11, 11,
+        /* Size 4x8 */
+        32, 32, 28, 20, 32, 31, 28, 21, 32, 30, 27, 21, 30, 28, 23, 19, 29, 27,
+        21, 17, 26, 24, 19, 15, 22, 22, 17, 13, 20, 20, 16, 12,
+        /* Size 8x4 */
+        32, 32, 32, 30, 29, 26, 22, 20, 32, 31, 30, 28, 27, 24, 22, 20, 28, 28,
+        27, 23, 21, 19, 17, 16, 20, 21, 21, 19, 17, 15, 13, 12,
+        /* Size 8x16 */
+        32, 33, 32, 32, 28, 23, 22, 19, 33, 32, 32, 31, 29, 24, 23, 20, 33, 32,
+        32, 31, 29, 25, 23, 21, 33, 32, 31, 31, 29, 25, 23, 21, 32, 32, 30, 30,
+        28, 24, 23, 20, 32, 31, 29, 28, 27, 24, 23, 21, 32, 31, 29, 28, 26, 23,
+        22, 20, 30, 30, 28, 27, 24, 21, 20, 19, 28, 30, 28, 26, 21, 19, 18, 17,
+        27, 28, 26, 25, 21, 18, 18, 16, 26, 28, 26, 24, 20, 18, 17, 16, 23, 25,
+        24, 23, 19, 16, 16, 14, 22, 23, 23, 22, 18, 16, 15, 14, 21, 22, 22, 21,
+        18, 15, 14, 13, 19, 21, 20, 20, 17, 14, 14, 12, 18, 19, 19, 19, 16, 14,
+        13, 12,
+        /* Size 16x8 */
+        32, 33, 33, 33, 32, 32, 32, 30, 28, 27, 26, 23, 22, 21, 19, 18, 33, 32,
+        32, 32, 32, 31, 31, 30, 30, 28, 28, 25, 23, 22, 21, 19, 32, 32, 32, 31,
+        30, 29, 29, 28, 28, 26, 26, 24, 23, 22, 20, 19, 32, 31, 31, 31, 30, 28,
+        28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 28, 29, 29, 29, 28, 27, 26, 24,
+        21, 21, 20, 19, 18, 18, 17, 16, 23, 24, 25, 25, 24, 24, 23, 21, 19, 18,
+        18, 16, 16, 15, 14, 14, 22, 23, 23, 23, 23, 23, 22, 20, 18, 18, 17, 16,
+        15, 14, 14, 13, 19, 20, 21, 21, 20, 21, 20, 19, 17, 16, 16, 14, 14, 13,
+        12, 12,
+        /* Size 16x32 */
+        32, 33, 33, 33, 32, 32, 32, 29, 28, 27, 23, 23, 22, 19, 19, 17, 33, 32,
+        32, 32, 32, 32, 31, 29, 29, 28, 24, 24, 22, 20, 20, 18, 33, 32, 32, 32,
+        32, 32, 31, 29, 29, 28, 24, 24, 23, 20, 20, 18, 33, 32, 32, 32, 32, 32,
+        31, 29, 29, 28, 24, 24, 23, 20, 20, 18, 33, 32, 32, 32, 32, 32, 31, 30,
+        29, 28, 25, 25, 23, 21, 21, 19, 33, 32, 32, 32, 32, 31, 31, 30, 30, 28,
+        25, 25, 23, 21, 21, 19, 33, 32, 32, 32, 31, 31, 31, 29, 29, 28, 25, 25,
+        23, 21, 21, 19, 32, 32, 32, 32, 31, 30, 30, 28, 28, 27, 24, 24, 23, 21,
+        21, 19, 32, 32, 32, 31, 30, 30, 30, 28, 28, 27, 24, 24, 23, 20, 20, 19,
+        32, 32, 32, 31, 30, 30, 29, 28, 28, 27, 24, 24, 23, 21, 21, 19, 32, 32,
+        31, 31, 29, 29, 28, 27, 27, 26, 24, 24, 23, 21, 21, 19, 32, 32, 31, 31,
+        29, 29, 28, 27, 27, 26, 24, 24, 23, 21, 21, 19, 32, 31, 31, 31, 29, 28,
+        28, 26, 26, 25, 23, 23, 22, 20, 20, 19, 30, 30, 30, 30, 28, 28, 27, 24,
+        24, 23, 21, 21, 20, 19, 19, 18, 30, 30, 30, 30, 28, 28, 27, 24, 24, 23,
+        21, 21, 20, 19, 19, 18, 29, 30, 30, 30, 28, 28, 26, 23, 23, 22, 20, 20,
+        19, 18, 18, 17, 28, 29, 30, 29, 28, 27, 26, 22, 21, 21, 19, 19, 18, 17,
+        17, 16, 28, 29, 30, 29, 28, 27, 26, 22, 21, 21, 19, 19, 18, 17, 17, 16,
+        27, 28, 28, 28, 26, 26, 25, 21, 21, 20, 18, 18, 18, 16, 16, 15, 26, 27,
+        28, 27, 26, 26, 24, 21, 20, 20, 18, 18, 17, 16, 16, 15, 26, 27, 28, 27,
+        26, 26, 24, 21, 20, 20, 18, 18, 17, 16, 16, 15, 24, 26, 26, 26, 24, 24,
+        23, 20, 20, 19, 17, 17, 16, 15, 15, 14, 23, 24, 25, 25, 24, 24, 23, 20,
+        19, 18, 16, 16, 16, 14, 14, 14, 23, 24, 25, 25, 24, 24, 23, 20, 19, 18,
+        16, 16, 16, 14, 14, 13, 22, 23, 23, 23, 23, 23, 22, 19, 18, 18, 16, 16,
+        15, 14, 14, 13, 21, 22, 23, 23, 22, 22, 21, 19, 18, 17, 15, 15, 15, 13,
+        13, 13, 21, 22, 22, 22, 22, 22, 21, 18, 18, 17, 15, 15, 14, 13, 13, 13,
+        19, 20, 21, 21, 21, 21, 20, 18, 17, 17, 14, 14, 14, 13, 13, 12, 19, 20,
+        21, 21, 20, 20, 20, 17, 17, 16, 14, 14, 14, 12, 12, 12, 19, 20, 20, 20,
+        20, 20, 19, 17, 17, 16, 14, 14, 13, 12, 12, 12, 18, 19, 19, 19, 19, 19,
+        19, 17, 16, 15, 14, 14, 13, 12, 12, 11, 18, 19, 19, 19, 19, 19, 19, 17,
+        16, 15, 14, 14, 13, 12, 12, 11,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 30, 30, 29, 28, 28,
+        27, 26, 26, 24, 23, 23, 22, 21, 21, 19, 19, 19, 18, 18, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 29, 29, 28, 27, 27, 26,
+        24, 24, 23, 22, 22, 20, 20, 20, 19, 19, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 28, 28, 28, 26, 25, 25, 23, 23,
+        22, 21, 21, 20, 19, 19, 33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 30, 30, 30, 29, 29, 28, 27, 27, 26, 25, 25, 23, 23, 22, 21, 21, 20,
+        19, 19, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 29, 29, 29, 28, 28, 28,
+        28, 28, 26, 26, 26, 24, 24, 24, 23, 22, 22, 21, 20, 20, 19, 19, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 30, 29, 29, 28, 28, 28, 28, 27, 27, 26, 26,
+        26, 24, 24, 24, 23, 22, 22, 21, 20, 20, 19, 19, 32, 31, 31, 31, 31, 31,
+        31, 30, 30, 29, 28, 28, 28, 27, 27, 26, 26, 26, 25, 24, 24, 23, 23, 23,
+        22, 21, 21, 20, 20, 19, 19, 19, 29, 29, 29, 29, 30, 30, 29, 28, 28, 28,
+        27, 27, 26, 24, 24, 23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 18, 18,
+        17, 17, 17, 17, 28, 29, 29, 29, 29, 30, 29, 28, 28, 28, 27, 27, 26, 24,
+        24, 23, 21, 21, 21, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16,
+        27, 28, 28, 28, 28, 28, 28, 27, 27, 27, 26, 26, 25, 23, 23, 22, 21, 21,
+        20, 20, 20, 19, 18, 18, 18, 17, 17, 17, 16, 16, 15, 15, 23, 24, 24, 24,
+        25, 25, 25, 24, 24, 24, 24, 24, 23, 21, 21, 20, 19, 19, 18, 18, 18, 17,
+        16, 16, 16, 15, 15, 14, 14, 14, 14, 14, 23, 24, 24, 24, 25, 25, 25, 24,
+        24, 24, 24, 24, 23, 21, 21, 20, 19, 19, 18, 18, 18, 17, 16, 16, 16, 15,
+        15, 14, 14, 14, 14, 14, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+        22, 20, 20, 19, 18, 18, 18, 17, 17, 16, 16, 16, 15, 15, 14, 14, 14, 13,
+        13, 13, 19, 20, 20, 20, 21, 21, 21, 21, 20, 21, 21, 21, 20, 19, 19, 18,
+        17, 17, 16, 16, 16, 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 19, 20,
+        20, 20, 21, 21, 21, 21, 20, 21, 21, 21, 20, 19, 19, 18, 17, 17, 16, 16,
+        16, 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 12, 17, 18, 18, 18, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 18, 18, 17, 16, 16, 15, 15, 15, 14, 14, 13,
+        13, 13, 13, 12, 12, 12, 11, 11,
+        /* Size 4x16 */
+        33, 32, 27, 19, 32, 32, 28, 20, 32, 32, 28, 21, 32, 31, 28, 21, 32, 30,
+        27, 20, 32, 29, 26, 21, 31, 28, 25, 20, 30, 28, 23, 19, 29, 27, 21, 17,
+        28, 26, 20, 16, 27, 26, 20, 16, 24, 24, 18, 14, 23, 23, 18, 14, 22, 22,
+        17, 13, 20, 20, 16, 12, 19, 19, 15, 12,
+        /* Size 16x4 */
+        33, 32, 32, 32, 32, 32, 31, 30, 29, 28, 27, 24, 23, 22, 20, 19, 32, 32,
+        32, 31, 30, 29, 28, 28, 27, 26, 26, 24, 23, 22, 20, 19, 27, 28, 28, 28,
+        27, 26, 25, 23, 21, 20, 20, 18, 18, 17, 16, 15, 19, 20, 21, 21, 20, 21,
+        20, 19, 17, 16, 16, 14, 14, 13, 12, 12,
+        /* Size 8x32 */
+        32, 33, 32, 32, 28, 23, 22, 19, 33, 32, 32, 31, 29, 24, 22, 20, 33, 32,
+        32, 31, 29, 24, 23, 20, 33, 32, 32, 31, 29, 24, 23, 20, 33, 32, 32, 31,
+        29, 25, 23, 21, 33, 32, 32, 31, 30, 25, 23, 21, 33, 32, 31, 31, 29, 25,
+        23, 21, 32, 32, 31, 30, 28, 24, 23, 21, 32, 32, 30, 30, 28, 24, 23, 20,
+        32, 32, 30, 29, 28, 24, 23, 21, 32, 31, 29, 28, 27, 24, 23, 21, 32, 31,
+        29, 28, 27, 24, 23, 21, 32, 31, 29, 28, 26, 23, 22, 20, 30, 30, 28, 27,
+        24, 21, 20, 19, 30, 30, 28, 27, 24, 21, 20, 19, 29, 30, 28, 26, 23, 20,
+        19, 18, 28, 30, 28, 26, 21, 19, 18, 17, 28, 30, 28, 26, 21, 19, 18, 17,
+        27, 28, 26, 25, 21, 18, 18, 16, 26, 28, 26, 24, 20, 18, 17, 16, 26, 28,
+        26, 24, 20, 18, 17, 16, 24, 26, 24, 23, 20, 17, 16, 15, 23, 25, 24, 23,
+        19, 16, 16, 14, 23, 25, 24, 23, 19, 16, 16, 14, 22, 23, 23, 22, 18, 16,
+        15, 14, 21, 23, 22, 21, 18, 15, 15, 13, 21, 22, 22, 21, 18, 15, 14, 13,
+        19, 21, 21, 20, 17, 14, 14, 13, 19, 21, 20, 20, 17, 14, 14, 12, 19, 20,
+        20, 19, 17, 14, 13, 12, 18, 19, 19, 19, 16, 14, 13, 12, 18, 19, 19, 19,
+        16, 14, 13, 12,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 30, 30, 29, 28, 28,
+        27, 26, 26, 24, 23, 23, 22, 21, 21, 19, 19, 19, 18, 18, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 28, 28, 28, 26,
+        25, 25, 23, 23, 22, 21, 21, 20, 19, 19, 32, 32, 32, 32, 32, 32, 31, 31,
+        30, 30, 29, 29, 29, 28, 28, 28, 28, 28, 26, 26, 26, 24, 24, 24, 23, 22,
+        22, 21, 20, 20, 19, 19, 32, 31, 31, 31, 31, 31, 31, 30, 30, 29, 28, 28,
+        28, 27, 27, 26, 26, 26, 25, 24, 24, 23, 23, 23, 22, 21, 21, 20, 20, 19,
+        19, 19, 28, 29, 29, 29, 29, 30, 29, 28, 28, 28, 27, 27, 26, 24, 24, 23,
+        21, 21, 21, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16, 23, 24,
+        24, 24, 25, 25, 25, 24, 24, 24, 24, 24, 23, 21, 21, 20, 19, 19, 18, 18,
+        18, 17, 16, 16, 16, 15, 15, 14, 14, 14, 14, 14, 22, 22, 23, 23, 23, 23,
+        23, 23, 23, 23, 23, 23, 22, 20, 20, 19, 18, 18, 18, 17, 17, 16, 16, 16,
+        15, 15, 14, 14, 14, 13, 13, 13, 19, 20, 20, 20, 21, 21, 21, 21, 20, 21,
+        21, 21, 20, 19, 19, 18, 17, 17, 16, 16, 16, 15, 14, 14, 14, 13, 13, 13,
+        12, 12, 12, 12 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 27, 22, 21, 27, 22, 22, 22, 22, 22, 19, 18, 21, 22, 18, 16,
+        /* Size 8x8 */
+        33, 33, 29, 24, 21, 22, 21, 20, 33, 32, 28, 24, 22, 23, 22, 21, 29, 28,
+        25, 23, 22, 23, 22, 21, 24, 24, 23, 21, 20, 21, 20, 20, 21, 22, 22, 20,
+        19, 19, 19, 19, 22, 23, 23, 21, 19, 18, 17, 17, 21, 22, 22, 20, 19, 17,
+        17, 16, 20, 21, 21, 20, 19, 17, 16, 15,
+        /* Size 16x16 */
+        32, 33, 34, 33, 31, 28, 27, 25, 21, 21, 21, 21, 20, 20, 20, 19, 33, 33,
+        33, 32, 30, 27, 26, 24, 22, 22, 22, 22, 21, 21, 20, 20, 34, 33, 33, 32,
+        29, 26, 25, 24, 22, 22, 22, 23, 22, 22, 21, 20, 33, 32, 32, 31, 28, 26,
+        25, 24, 22, 22, 23, 23, 22, 22, 22, 21, 31, 30, 29, 28, 26, 24, 23, 23,
+        22, 22, 22, 23, 22, 22, 22, 21, 28, 27, 26, 26, 24, 22, 22, 22, 21, 22,
+        22, 23, 22, 22, 22, 21, 27, 26, 25, 25, 23, 22, 22, 21, 21, 21, 21, 22,
+        22, 22, 21, 21, 25, 24, 24, 24, 23, 22, 21, 21, 20, 20, 21, 21, 20, 20,
+        20, 20, 21, 22, 22, 22, 22, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 19,
+        21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 19, 19, 19, 19, 18, 18, 21, 22,
+        22, 23, 22, 22, 21, 21, 19, 19, 19, 19, 18, 18, 18, 18, 21, 22, 23, 23,
+        23, 23, 22, 21, 19, 19, 19, 18, 17, 17, 17, 17, 20, 21, 22, 22, 22, 22,
+        22, 20, 19, 19, 18, 17, 17, 17, 16, 16, 20, 21, 22, 22, 22, 22, 22, 20,
+        19, 19, 18, 17, 17, 17, 16, 16, 20, 20, 21, 22, 22, 22, 21, 20, 19, 18,
+        18, 17, 16, 16, 16, 15, 19, 20, 20, 21, 21, 21, 21, 20, 19, 18, 18, 17,
+        16, 16, 15, 14,
+        /* Size 32x32 */
+        32, 33, 33, 33, 34, 34, 33, 31, 31, 30, 28, 28, 27, 25, 25, 23, 21, 21,
+        21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 33, 33, 33, 33,
+        33, 33, 33, 30, 30, 29, 27, 27, 26, 24, 24, 23, 21, 21, 22, 22, 22, 22,
+        22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 33, 33, 33, 33, 33, 33, 32, 30,
+        30, 29, 27, 27, 26, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 21, 20, 20, 20, 20, 33, 33, 33, 33, 33, 33, 32, 30, 30, 28, 27, 27,
+        26, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 21, 20,
+        20, 20, 34, 33, 33, 33, 33, 33, 32, 29, 29, 28, 26, 26, 25, 24, 24, 23,
+        22, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 21, 21, 21, 20, 20, 34, 33,
+        33, 33, 33, 32, 32, 29, 29, 28, 26, 26, 25, 24, 24, 23, 22, 22, 22, 23,
+        23, 23, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21, 33, 33, 32, 32, 32, 32,
+        31, 29, 28, 28, 26, 26, 25, 24, 24, 23, 22, 22, 22, 23, 23, 23, 23, 23,
+        22, 22, 22, 22, 22, 21, 21, 21, 31, 30, 30, 30, 29, 29, 29, 27, 27, 26,
+        24, 24, 24, 23, 23, 22, 22, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22,
+        22, 21, 21, 21, 31, 30, 30, 30, 29, 29, 28, 27, 26, 26, 24, 24, 23, 23,
+        23, 22, 22, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21,
+        30, 29, 29, 28, 28, 28, 28, 26, 26, 25, 23, 23, 23, 23, 23, 22, 22, 22,
+        22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21, 28, 27, 27, 27,
+        26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 22, 21, 21, 22, 22, 22, 23,
+        23, 23, 22, 22, 22, 22, 22, 22, 21, 21, 28, 27, 27, 27, 26, 26, 26, 24,
+        24, 23, 22, 22, 22, 22, 22, 22, 21, 21, 22, 22, 22, 23, 23, 23, 22, 22,
+        22, 22, 22, 22, 21, 21, 27, 26, 26, 26, 25, 25, 25, 24, 23, 23, 22, 22,
+        22, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 21, 21, 21,
+        21, 21, 25, 24, 24, 24, 24, 24, 24, 23, 23, 23, 22, 22, 21, 21, 21, 21,
+        20, 20, 20, 21, 21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 25, 24,
+        24, 24, 24, 24, 24, 23, 23, 23, 22, 22, 21, 21, 21, 21, 20, 20, 20, 21,
+        21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 23, 23, 23, 23, 23, 23,
+        23, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+        20, 20, 20, 20, 20, 20, 19, 19, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+        21, 21, 21, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20,
+        20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 21, 22, 22, 22,
+        22, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19,
+        19, 18, 18, 18, 18, 18, 18, 18, 18, 18, 21, 22, 22, 22, 22, 23, 23, 22,
+        22, 22, 22, 22, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18,
+        18, 18, 18, 18, 18, 18, 21, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+        22, 21, 21, 20, 19, 19, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 17,
+        17, 17, 21, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 22, 21, 21, 20,
+        19, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 17, 21, 22,
+        22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 22, 21, 21, 20, 19, 19, 19, 18,
+        18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 16, 16, 20, 21, 21, 21, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17,
+        17, 17, 17, 16, 16, 16, 16, 16, 20, 21, 21, 21, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 20, 20, 20, 19, 19, 19, 18, 18, 17, 17, 17, 17, 17, 17, 16,
+        16, 16, 16, 16, 20, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 20,
+        20, 20, 19, 19, 19, 18, 18, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16,
+        20, 20, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 19, 19,
+        18, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 20, 20, 20, 21,
+        21, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 19, 19, 18, 18, 18, 17,
+        17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 19, 20, 20, 20, 21, 21, 21, 21,
+        21, 21, 22, 22, 21, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16,
+        16, 15, 15, 15, 15, 15, 19, 19, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21,
+        21, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 15,
+        14, 14, 19, 19, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 20, 20, 19,
+        19, 19, 18, 18, 18, 17, 17, 16, 16, 16, 16, 15, 15, 15, 14, 14,
+        /* Size 4x8 */
+        33, 27, 22, 20, 33, 26, 22, 21, 28, 23, 22, 22, 24, 22, 20, 20, 22, 21,
+        19, 19, 22, 22, 19, 17, 21, 22, 19, 16, 20, 21, 18, 15,
+        /* Size 8x4 */
+        33, 33, 28, 24, 22, 22, 21, 20, 27, 26, 23, 22, 21, 22, 22, 21, 22, 22,
+        22, 20, 19, 19, 19, 18, 20, 21, 22, 20, 19, 17, 16, 15,
+        /* Size 8x16 */
+        32, 33, 29, 27, 21, 21, 20, 20, 33, 33, 28, 26, 22, 22, 21, 20, 34, 32,
+        27, 26, 22, 23, 22, 21, 33, 31, 27, 25, 22, 23, 22, 21, 31, 28, 25, 23,
+        22, 22, 22, 22, 28, 26, 23, 22, 22, 23, 22, 22, 26, 25, 22, 22, 21, 22,
+        22, 21, 24, 24, 22, 21, 20, 21, 20, 20, 21, 22, 21, 21, 19, 19, 19, 19,
+        21, 22, 22, 21, 19, 19, 19, 18, 21, 22, 22, 21, 19, 18, 18, 18, 21, 23,
+        23, 22, 19, 18, 17, 17, 20, 22, 22, 21, 19, 17, 17, 16, 20, 22, 22, 21,
+        19, 17, 17, 16, 20, 21, 22, 21, 19, 17, 16, 16, 19, 20, 21, 20, 19, 17,
+        16, 15,
+        /* Size 16x8 */
+        32, 33, 34, 33, 31, 28, 26, 24, 21, 21, 21, 21, 20, 20, 20, 19, 33, 33,
+        32, 31, 28, 26, 25, 24, 22, 22, 22, 23, 22, 22, 21, 20, 29, 28, 27, 27,
+        25, 23, 22, 22, 21, 22, 22, 23, 22, 22, 22, 21, 27, 26, 26, 25, 23, 22,
+        22, 21, 21, 21, 21, 22, 21, 21, 21, 20, 21, 22, 22, 22, 22, 22, 21, 20,
+        19, 19, 19, 19, 19, 19, 19, 19, 21, 22, 23, 23, 22, 23, 22, 21, 19, 19,
+        18, 18, 17, 17, 17, 17, 20, 21, 22, 22, 22, 22, 22, 20, 19, 19, 18, 17,
+        17, 17, 16, 16, 20, 20, 21, 21, 22, 22, 21, 20, 19, 18, 18, 17, 16, 16,
+        16, 15,
+        /* Size 16x32 */
+        32, 33, 33, 33, 29, 28, 27, 22, 21, 21, 21, 21, 20, 20, 20, 19, 33, 33,
+        33, 32, 28, 27, 26, 22, 22, 22, 21, 21, 21, 20, 20, 19, 33, 33, 33, 32,
+        28, 27, 26, 22, 22, 22, 22, 22, 21, 20, 20, 20, 33, 33, 33, 32, 28, 27,
+        26, 22, 22, 22, 22, 22, 21, 20, 20, 20, 34, 33, 32, 32, 27, 26, 26, 23,
+        22, 22, 23, 23, 22, 21, 21, 20, 34, 33, 32, 31, 27, 26, 25, 23, 22, 22,
+        23, 23, 22, 21, 21, 20, 33, 32, 31, 31, 27, 26, 25, 23, 22, 22, 23, 23,
+        22, 21, 21, 20, 31, 29, 29, 28, 25, 24, 24, 22, 22, 22, 23, 23, 22, 22,
+        22, 21, 31, 29, 28, 28, 25, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21,
+        30, 28, 28, 28, 24, 23, 23, 22, 22, 22, 23, 23, 22, 22, 22, 21, 28, 26,
+        26, 25, 23, 22, 22, 22, 22, 22, 23, 23, 22, 22, 22, 21, 28, 26, 26, 25,
+        23, 22, 22, 22, 22, 22, 23, 23, 22, 22, 22, 21, 26, 26, 25, 24, 22, 22,
+        22, 21, 21, 21, 22, 22, 22, 21, 21, 20, 24, 24, 24, 24, 22, 22, 21, 20,
+        20, 20, 21, 21, 20, 20, 20, 20, 24, 24, 24, 24, 22, 22, 21, 20, 20, 20,
+        21, 21, 20, 20, 20, 20, 23, 23, 23, 23, 22, 22, 21, 20, 20, 20, 20, 20,
+        20, 20, 20, 19, 21, 22, 22, 22, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19,
+        19, 19, 21, 22, 22, 22, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 19,
+        21, 22, 22, 22, 22, 22, 21, 20, 19, 19, 19, 19, 19, 18, 18, 18, 21, 22,
+        22, 22, 22, 22, 21, 20, 19, 19, 18, 18, 18, 18, 18, 17, 21, 22, 22, 22,
+        22, 22, 21, 20, 19, 19, 18, 18, 18, 18, 18, 17, 21, 22, 23, 23, 22, 22,
+        22, 20, 19, 19, 18, 18, 18, 17, 17, 17, 21, 22, 23, 23, 23, 22, 22, 20,
+        19, 19, 18, 18, 17, 17, 17, 17, 21, 22, 23, 23, 22, 22, 22, 20, 19, 19,
+        18, 18, 17, 17, 17, 16, 20, 22, 22, 22, 22, 22, 21, 19, 19, 19, 17, 17,
+        17, 16, 16, 16, 20, 21, 22, 22, 22, 22, 21, 19, 19, 19, 17, 17, 17, 16,
+        16, 16, 20, 21, 22, 22, 22, 22, 21, 19, 19, 19, 17, 17, 17, 16, 16, 16,
+        20, 21, 21, 21, 22, 22, 21, 19, 19, 18, 17, 17, 16, 16, 16, 15, 20, 21,
+        21, 21, 22, 22, 21, 19, 19, 18, 17, 17, 16, 16, 16, 15, 19, 20, 21, 21,
+        21, 21, 21, 19, 19, 18, 17, 17, 16, 15, 15, 15, 19, 20, 20, 20, 21, 21,
+        20, 19, 19, 18, 17, 17, 16, 15, 15, 14, 19, 20, 20, 20, 21, 21, 20, 19,
+        19, 18, 17, 17, 16, 15, 15, 14,
+        /* Size 32x16 */
+        32, 33, 33, 33, 34, 34, 33, 31, 31, 30, 28, 28, 26, 24, 24, 23, 21, 21,
+        21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 33, 33, 33, 33,
+        33, 33, 32, 29, 29, 28, 26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 21, 21, 21, 21, 20, 20, 20, 33, 33, 33, 33, 32, 32, 31, 29,
+        28, 28, 26, 26, 25, 24, 24, 23, 22, 22, 22, 22, 22, 23, 23, 23, 22, 22,
+        22, 21, 21, 21, 20, 20, 33, 32, 32, 32, 32, 31, 31, 28, 28, 28, 25, 25,
+        24, 24, 24, 23, 22, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 21, 21, 21,
+        20, 20, 29, 28, 28, 28, 27, 27, 27, 25, 25, 24, 23, 23, 22, 22, 22, 22,
+        21, 21, 22, 22, 22, 22, 23, 22, 22, 22, 22, 22, 22, 21, 21, 21, 28, 27,
+        27, 27, 26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 22, 21, 21, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 27, 26, 26, 26, 26, 25,
+        25, 24, 23, 23, 22, 22, 22, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22,
+        21, 21, 21, 21, 21, 21, 20, 20, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22,
+        22, 22, 21, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19,
+        19, 19, 19, 19, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20,
+        20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 21, 21, 22, 22,
+        23, 23, 23, 23, 22, 23, 23, 23, 22, 21, 21, 20, 19, 19, 19, 18, 18, 18,
+        18, 18, 17, 17, 17, 17, 17, 17, 17, 17, 21, 21, 22, 22, 23, 23, 23, 23,
+        22, 23, 23, 23, 22, 21, 21, 20, 19, 19, 19, 18, 18, 18, 18, 18, 17, 17,
+        17, 17, 17, 17, 17, 17, 20, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 16, 16, 16,
+        16, 16, 20, 20, 20, 20, 21, 21, 21, 22, 22, 22, 22, 22, 21, 20, 20, 20,
+        19, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 20, 20,
+        20, 20, 21, 21, 21, 22, 22, 22, 22, 22, 21, 20, 20, 20, 19, 19, 18, 18,
+        18, 17, 17, 17, 16, 16, 16, 16, 16, 15, 15, 15, 19, 19, 20, 20, 20, 20,
+        20, 21, 21, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 17, 17, 17, 17, 16,
+        16, 16, 16, 15, 15, 15, 14, 14,
+        /* Size 4x16 */
+        33, 28, 21, 20, 33, 27, 22, 20, 33, 26, 22, 21, 32, 26, 22, 21, 29, 24,
+        22, 22, 26, 22, 22, 22, 26, 22, 21, 21, 24, 22, 20, 20, 22, 21, 19, 19,
+        22, 22, 19, 18, 22, 22, 19, 18, 22, 22, 19, 17, 22, 22, 19, 16, 21, 22,
+        19, 16, 21, 22, 18, 16, 20, 21, 18, 15,
+        /* Size 16x4 */
+        33, 33, 33, 32, 29, 26, 26, 24, 22, 22, 22, 22, 22, 21, 21, 20, 28, 27,
+        26, 26, 24, 22, 22, 22, 21, 22, 22, 22, 22, 22, 22, 21, 21, 22, 22, 22,
+        22, 22, 21, 20, 19, 19, 19, 19, 19, 19, 18, 18, 20, 20, 21, 21, 22, 22,
+        21, 20, 19, 18, 18, 17, 16, 16, 16, 15,
+        /* Size 8x32 */
+        32, 33, 29, 27, 21, 21, 20, 20, 33, 33, 28, 26, 22, 21, 21, 20, 33, 33,
+        28, 26, 22, 22, 21, 20, 33, 33, 28, 26, 22, 22, 21, 20, 34, 32, 27, 26,
+        22, 23, 22, 21, 34, 32, 27, 25, 22, 23, 22, 21, 33, 31, 27, 25, 22, 23,
+        22, 21, 31, 29, 25, 24, 22, 23, 22, 22, 31, 28, 25, 23, 22, 22, 22, 22,
+        30, 28, 24, 23, 22, 23, 22, 22, 28, 26, 23, 22, 22, 23, 22, 22, 28, 26,
+        23, 22, 22, 23, 22, 22, 26, 25, 22, 22, 21, 22, 22, 21, 24, 24, 22, 21,
+        20, 21, 20, 20, 24, 24, 22, 21, 20, 21, 20, 20, 23, 23, 22, 21, 20, 20,
+        20, 20, 21, 22, 21, 21, 19, 19, 19, 19, 21, 22, 21, 21, 19, 19, 19, 19,
+        21, 22, 22, 21, 19, 19, 19, 18, 21, 22, 22, 21, 19, 18, 18, 18, 21, 22,
+        22, 21, 19, 18, 18, 18, 21, 23, 22, 22, 19, 18, 18, 17, 21, 23, 23, 22,
+        19, 18, 17, 17, 21, 23, 22, 22, 19, 18, 17, 17, 20, 22, 22, 21, 19, 17,
+        17, 16, 20, 22, 22, 21, 19, 17, 17, 16, 20, 22, 22, 21, 19, 17, 17, 16,
+        20, 21, 22, 21, 19, 17, 16, 16, 20, 21, 22, 21, 19, 17, 16, 16, 19, 21,
+        21, 21, 19, 17, 16, 15, 19, 20, 21, 20, 19, 17, 16, 15, 19, 20, 21, 20,
+        19, 17, 16, 15,
+        /* Size 32x8 */
+        32, 33, 33, 33, 34, 34, 33, 31, 31, 30, 28, 28, 26, 24, 24, 23, 21, 21,
+        21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 33, 33, 33, 33,
+        32, 32, 31, 29, 28, 28, 26, 26, 25, 24, 24, 23, 22, 22, 22, 22, 22, 23,
+        23, 23, 22, 22, 22, 21, 21, 21, 20, 20, 29, 28, 28, 28, 27, 27, 27, 25,
+        25, 24, 23, 23, 22, 22, 22, 22, 21, 21, 22, 22, 22, 22, 23, 22, 22, 22,
+        22, 22, 22, 21, 21, 21, 27, 26, 26, 26, 26, 25, 25, 24, 23, 23, 22, 22,
+        22, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 21, 21, 21, 21, 21, 21,
+        20, 20, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21,
+        22, 22, 23, 23, 23, 23, 22, 23, 23, 23, 22, 21, 21, 20, 19, 19, 19, 18,
+        18, 18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 17, 20, 21, 21, 21, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17,
+        17, 17, 17, 16, 16, 16, 16, 16, 20, 20, 20, 20, 21, 21, 21, 22, 22, 22,
+        22, 22, 21, 20, 20, 20, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16, 16, 16,
+        16, 15, 15, 15 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 32, 29, 24, 32, 30, 28, 24, 29, 28, 21, 19, 24, 24, 19, 16,
+        /* Size 8x8 */
+        33, 33, 32, 32, 30, 28, 24, 22, 33, 32, 32, 32, 30, 28, 25, 23, 32, 32,
+        31, 30, 29, 27, 24, 23, 32, 32, 30, 29, 28, 26, 24, 22, 30, 30, 29, 28,
+        25, 23, 21, 20, 28, 28, 27, 26, 23, 20, 18, 17, 24, 25, 24, 24, 21, 18,
+        16, 15, 22, 23, 23, 22, 20, 17, 15, 14,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 33, 32, 32, 30, 29, 28, 26, 25, 23, 22, 21, 33, 32,
+        32, 32, 32, 32, 32, 31, 30, 29, 29, 27, 26, 24, 23, 22, 33, 32, 32, 32,
+        32, 32, 32, 31, 30, 30, 29, 27, 26, 24, 23, 23, 33, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 30, 28, 27, 25, 23, 23, 33, 32, 32, 32, 31, 31, 31, 30,
+        29, 28, 28, 26, 26, 24, 23, 23, 33, 32, 32, 32, 31, 31, 30, 30, 29, 28,
+        28, 26, 26, 24, 23, 23, 32, 32, 32, 32, 31, 30, 29, 28, 28, 27, 27, 26,
+        25, 24, 23, 22, 32, 31, 31, 31, 30, 30, 28, 28, 27, 26, 26, 24, 24, 23,
+        22, 22, 30, 30, 30, 31, 29, 29, 28, 27, 26, 24, 24, 23, 22, 22, 20, 20,
+        29, 29, 30, 30, 28, 28, 27, 26, 24, 22, 22, 21, 20, 20, 19, 19, 28, 29,
+        29, 30, 28, 28, 27, 26, 24, 22, 21, 20, 20, 19, 18, 18, 26, 27, 27, 28,
+        26, 26, 26, 24, 23, 21, 20, 19, 19, 18, 17, 17, 25, 26, 26, 27, 26, 26,
+        25, 24, 22, 20, 20, 19, 18, 17, 17, 16, 23, 24, 24, 25, 24, 24, 24, 23,
+        22, 20, 19, 18, 17, 16, 16, 15, 22, 23, 23, 23, 23, 23, 23, 22, 20, 19,
+        18, 17, 17, 16, 15, 15, 21, 22, 23, 23, 23, 23, 22, 22, 20, 19, 18, 17,
+        16, 15, 15, 14,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 30, 30, 30,
+        29, 28, 28, 27, 26, 26, 25, 23, 23, 23, 22, 21, 21, 20, 33, 33, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 29, 29, 29, 28,
+        26, 26, 26, 24, 24, 23, 22, 22, 22, 20, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 29, 29, 29, 28, 27, 27, 26, 24,
+        24, 24, 23, 22, 22, 21, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 30, 30, 30, 29, 29, 29, 28, 27, 27, 26, 24, 24, 24, 23, 22,
+        22, 21, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30,
+        30, 30, 30, 29, 29, 28, 27, 27, 26, 24, 24, 24, 23, 23, 23, 21, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30,
+        30, 28, 28, 28, 27, 25, 25, 25, 23, 23, 23, 22, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 28, 28, 28,
+        27, 25, 25, 25, 23, 23, 23, 22, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 30, 30, 30, 30, 29, 29, 28, 27, 27, 26, 25, 25, 24,
+        23, 23, 23, 22, 33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        30, 29, 29, 29, 28, 28, 28, 28, 26, 26, 26, 24, 24, 24, 23, 23, 23, 21,
+        33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 29, 29, 29,
+        28, 28, 28, 27, 26, 26, 26, 24, 24, 24, 23, 23, 23, 21, 33, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 29, 29, 29, 28, 28, 28, 27,
+        26, 26, 26, 24, 24, 24, 23, 23, 23, 21, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 30, 29, 29, 29, 28, 28, 28, 28, 28, 28, 26, 26, 26, 25, 24,
+        24, 24, 23, 23, 23, 21, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 29,
+        29, 29, 28, 28, 28, 28, 27, 27, 27, 26, 26, 26, 25, 24, 24, 24, 23, 22,
+        22, 21, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 29, 29, 29, 28, 28,
+        28, 28, 27, 27, 27, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 21, 32, 31,
+        31, 31, 31, 31, 31, 31, 30, 30, 30, 29, 28, 28, 28, 27, 27, 27, 26, 26,
+        26, 25, 24, 24, 24, 23, 23, 23, 22, 22, 22, 20, 30, 30, 30, 30, 30, 31,
+        31, 30, 29, 29, 29, 28, 28, 28, 27, 26, 26, 26, 24, 24, 24, 23, 23, 23,
+        22, 22, 22, 21, 20, 20, 20, 19, 30, 30, 30, 30, 30, 31, 31, 30, 29, 29,
+        29, 28, 28, 28, 27, 26, 26, 26, 24, 24, 24, 23, 23, 23, 22, 22, 22, 21,
+        20, 20, 20, 19, 30, 30, 30, 30, 30, 30, 30, 30, 29, 29, 29, 28, 28, 28,
+        27, 26, 26, 25, 24, 23, 23, 23, 22, 22, 22, 21, 21, 21, 20, 20, 20, 19,
+        29, 29, 29, 29, 30, 30, 30, 30, 28, 28, 28, 28, 27, 27, 26, 24, 24, 24,
+        22, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 19, 18, 28, 29, 29, 29,
+        29, 30, 30, 29, 28, 28, 28, 28, 27, 27, 26, 24, 24, 23, 22, 21, 21, 20,
+        20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 28, 29, 29, 29, 29, 30, 30, 29,
+        28, 28, 28, 28, 27, 27, 26, 24, 24, 23, 22, 21, 21, 20, 20, 20, 20, 19,
+        19, 19, 18, 18, 18, 18, 27, 28, 28, 28, 28, 28, 28, 28, 28, 27, 27, 26,
+        26, 26, 25, 23, 23, 23, 21, 20, 20, 20, 20, 20, 19, 18, 18, 18, 18, 17,
+        17, 17, 26, 26, 27, 27, 27, 28, 28, 27, 26, 26, 26, 26, 26, 26, 24, 23,
+        23, 22, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 16, 26, 26,
+        27, 27, 27, 28, 28, 27, 26, 26, 26, 26, 26, 26, 24, 23, 23, 22, 21, 20,
+        20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 16, 25, 26, 26, 26, 26, 27,
+        27, 26, 26, 26, 26, 25, 25, 25, 24, 22, 22, 22, 20, 20, 20, 19, 19, 19,
+        18, 17, 17, 17, 17, 16, 16, 16, 23, 24, 24, 24, 24, 25, 25, 25, 24, 24,
+        24, 24, 24, 24, 23, 22, 22, 21, 20, 19, 19, 18, 18, 18, 17, 16, 16, 16,
+        16, 15, 15, 15, 23, 24, 24, 24, 24, 25, 25, 25, 24, 24, 24, 24, 24, 24,
+        23, 22, 22, 21, 20, 19, 19, 18, 18, 18, 17, 16, 16, 16, 16, 15, 15, 15,
+        23, 23, 24, 24, 24, 25, 25, 24, 24, 24, 24, 24, 24, 24, 23, 21, 21, 21,
+        19, 19, 19, 18, 18, 18, 17, 16, 16, 16, 15, 15, 15, 15, 22, 22, 23, 23,
+        23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 22, 20, 20, 20, 19, 18, 18, 18,
+        17, 17, 17, 16, 16, 15, 15, 15, 15, 14, 21, 22, 22, 22, 23, 23, 23, 23,
+        23, 23, 23, 23, 22, 22, 22, 20, 20, 20, 19, 18, 18, 17, 17, 17, 16, 15,
+        15, 15, 15, 14, 14, 14, 21, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+        22, 22, 22, 20, 20, 20, 19, 18, 18, 17, 17, 17, 16, 15, 15, 15, 15, 14,
+        14, 14, 20, 20, 21, 21, 21, 22, 22, 22, 21, 21, 21, 21, 21, 21, 20, 19,
+        19, 19, 18, 18, 18, 17, 16, 16, 16, 15, 15, 15, 14, 14, 14, 13,
+        /* Size 4x8 */
+        33, 32, 29, 24, 32, 31, 30, 25, 32, 30, 28, 24, 32, 29, 27, 24, 30, 28,
+        24, 21, 28, 26, 21, 18, 24, 24, 19, 16, 22, 22, 18, 15,
+        /* Size 8x4 */
+        33, 32, 32, 32, 30, 28, 24, 22, 32, 31, 30, 29, 28, 26, 24, 22, 29, 30,
+        28, 27, 24, 21, 19, 18, 24, 25, 24, 24, 21, 18, 16, 15,
+        /* Size 8x16 */
+        32, 33, 33, 32, 29, 28, 23, 22, 33, 32, 32, 32, 29, 29, 24, 23, 33, 32,
+        32, 32, 30, 29, 25, 23, 33, 32, 32, 31, 30, 30, 25, 23, 33, 32, 31, 30,
+        29, 28, 24, 23, 32, 32, 31, 30, 28, 28, 24, 23, 32, 31, 30, 29, 28, 27,
+        24, 23, 32, 31, 30, 28, 26, 26, 23, 22, 30, 30, 29, 28, 25, 24, 21, 20,
+        29, 30, 28, 27, 23, 22, 20, 19, 28, 30, 28, 27, 22, 21, 19, 18, 26, 28,
+        26, 26, 21, 20, 18, 17, 25, 26, 26, 25, 21, 20, 17, 17, 23, 25, 24, 24,
+        20, 19, 16, 16, 22, 23, 23, 23, 19, 18, 16, 15, 21, 23, 23, 22, 19, 18,
+        15, 15,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 32, 32, 32, 30, 29, 28, 26, 25, 23, 22, 21, 33, 32,
+        32, 32, 32, 32, 31, 31, 30, 30, 30, 28, 26, 25, 23, 23, 33, 32, 32, 32,
+        31, 31, 30, 30, 29, 28, 28, 26, 26, 24, 23, 23, 32, 32, 32, 31, 30, 30,
+        29, 28, 28, 27, 27, 26, 25, 24, 23, 22, 29, 29, 30, 30, 29, 28, 28, 26,
+        25, 23, 22, 21, 21, 20, 19, 19, 28, 29, 29, 30, 28, 28, 27, 26, 24, 22,
+        21, 20, 20, 19, 18, 18, 23, 24, 25, 25, 24, 24, 24, 23, 21, 20, 19, 18,
+        17, 16, 16, 15, 22, 23, 23, 23, 23, 23, 23, 22, 20, 19, 18, 17, 17, 16,
+        15, 15,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 32, 32, 32, 29, 28, 28, 26, 23, 23, 22, 19, 33, 33,
+        32, 32, 32, 32, 32, 31, 29, 29, 29, 26, 24, 24, 22, 20, 33, 32, 32, 32,
+        32, 32, 32, 31, 29, 29, 29, 26, 24, 24, 23, 20, 33, 32, 32, 32, 32, 32,
+        32, 31, 29, 29, 29, 26, 24, 24, 23, 20, 33, 32, 32, 32, 32, 32, 32, 31,
+        30, 29, 29, 26, 25, 25, 23, 20, 33, 32, 32, 32, 32, 31, 31, 31, 30, 30,
+        30, 27, 25, 25, 23, 21, 33, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 27,
+        25, 25, 23, 21, 33, 32, 32, 32, 32, 31, 31, 31, 30, 29, 29, 27, 25, 25,
+        23, 21, 33, 32, 32, 32, 31, 30, 30, 30, 29, 28, 28, 26, 24, 24, 23, 21,
+        32, 32, 32, 32, 31, 30, 30, 30, 28, 28, 28, 26, 24, 24, 23, 20, 32, 32,
+        32, 32, 31, 30, 30, 30, 28, 28, 28, 26, 24, 24, 23, 20, 32, 32, 32, 32,
+        31, 29, 29, 29, 28, 28, 28, 26, 24, 24, 23, 21, 32, 32, 31, 31, 30, 29,
+        29, 28, 28, 27, 27, 25, 24, 24, 23, 21, 32, 32, 31, 31, 30, 29, 29, 28,
+        28, 27, 27, 25, 24, 24, 23, 21, 32, 31, 31, 31, 30, 28, 28, 28, 26, 26,
+        26, 24, 23, 23, 22, 20, 30, 30, 30, 30, 29, 28, 28, 27, 25, 24, 24, 23,
+        21, 21, 20, 19, 30, 30, 30, 30, 29, 28, 28, 27, 25, 24, 24, 23, 21, 21,
+        20, 19, 30, 30, 30, 30, 29, 28, 28, 27, 24, 24, 24, 22, 21, 21, 20, 19,
+        29, 29, 30, 30, 28, 27, 27, 26, 23, 22, 22, 20, 20, 20, 19, 17, 28, 29,
+        30, 30, 28, 27, 27, 26, 22, 21, 21, 20, 19, 19, 18, 17, 28, 29, 30, 30,
+        28, 27, 27, 26, 22, 21, 21, 20, 19, 19, 18, 17, 27, 28, 28, 28, 28, 26,
+        26, 25, 22, 21, 21, 19, 18, 18, 18, 16, 26, 27, 28, 28, 26, 26, 26, 24,
+        21, 20, 20, 19, 18, 18, 17, 16, 26, 27, 28, 28, 26, 26, 26, 24, 21, 20,
+        20, 19, 18, 18, 17, 16, 25, 26, 26, 26, 26, 25, 25, 24, 21, 20, 20, 18,
+        17, 17, 17, 15, 23, 24, 25, 25, 24, 24, 24, 23, 20, 19, 19, 17, 16, 16,
+        16, 14, 23, 24, 25, 25, 24, 24, 24, 23, 20, 19, 19, 17, 16, 16, 16, 14,
+        23, 24, 24, 24, 24, 24, 24, 23, 20, 19, 19, 17, 16, 16, 15, 14, 22, 23,
+        23, 23, 23, 23, 23, 22, 19, 18, 18, 17, 16, 16, 15, 14, 21, 22, 23, 23,
+        23, 22, 22, 21, 19, 18, 18, 17, 15, 15, 15, 13, 21, 22, 23, 23, 23, 22,
+        22, 21, 19, 18, 18, 17, 15, 15, 15, 13, 20, 21, 22, 22, 21, 21, 21, 20,
+        18, 18, 18, 16, 15, 15, 14, 13,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 30, 30, 30,
+        29, 28, 28, 27, 26, 26, 25, 23, 23, 23, 22, 21, 21, 20, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 29, 29, 29, 28,
+        27, 27, 26, 24, 24, 24, 23, 22, 22, 21, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 30, 28, 28, 28, 26, 25,
+        25, 24, 23, 23, 23, 22, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 30, 30, 30, 30, 30, 30, 28, 28, 28, 26, 25, 25, 24, 23, 23,
+        23, 22, 33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 29,
+        29, 29, 28, 28, 28, 28, 26, 26, 26, 24, 24, 24, 23, 23, 23, 21, 32, 32,
+        32, 32, 32, 31, 31, 31, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 27, 27,
+        27, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 21, 32, 32, 32, 32, 32, 31,
+        31, 31, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 27, 27, 27, 26, 26, 26,
+        25, 24, 24, 24, 23, 22, 22, 21, 32, 31, 31, 31, 31, 31, 31, 31, 30, 30,
+        30, 29, 28, 28, 28, 27, 27, 27, 26, 26, 26, 25, 24, 24, 24, 23, 23, 23,
+        22, 21, 21, 20, 29, 29, 29, 29, 30, 30, 30, 30, 29, 28, 28, 28, 28, 28,
+        26, 25, 25, 24, 23, 22, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18,
+        28, 29, 29, 29, 29, 30, 30, 29, 28, 28, 28, 28, 27, 27, 26, 24, 24, 24,
+        22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 28, 29, 29, 29,
+        29, 30, 30, 29, 28, 28, 28, 28, 27, 27, 26, 24, 24, 24, 22, 21, 21, 21,
+        20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 26, 26, 26, 26, 26, 27, 27, 27,
+        26, 26, 26, 26, 25, 25, 24, 23, 23, 22, 20, 20, 20, 19, 19, 19, 18, 17,
+        17, 17, 17, 17, 17, 16, 23, 24, 24, 24, 25, 25, 25, 25, 24, 24, 24, 24,
+        24, 24, 23, 21, 21, 21, 20, 19, 19, 18, 18, 18, 17, 16, 16, 16, 16, 15,
+        15, 15, 23, 24, 24, 24, 25, 25, 25, 25, 24, 24, 24, 24, 24, 24, 23, 21,
+        21, 21, 20, 19, 19, 18, 18, 18, 17, 16, 16, 16, 16, 15, 15, 15, 22, 22,
+        23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 22, 20, 20, 20, 19, 18,
+        18, 18, 17, 17, 17, 16, 16, 15, 15, 15, 15, 14, 19, 20, 20, 20, 20, 21,
+        21, 21, 21, 20, 20, 21, 21, 21, 20, 19, 19, 19, 17, 17, 17, 16, 16, 16,
+        15, 14, 14, 14, 14, 13, 13, 13,
+        /* Size 4x16 */
+        33, 32, 28, 23, 32, 32, 29, 24, 32, 32, 29, 25, 32, 31, 30, 25, 32, 30,
+        28, 24, 32, 30, 28, 24, 32, 29, 27, 24, 31, 28, 26, 23, 30, 28, 24, 21,
+        29, 27, 22, 20, 29, 27, 21, 19, 27, 26, 20, 18, 26, 25, 20, 17, 24, 24,
+        19, 16, 23, 23, 18, 16, 22, 22, 18, 15,
+        /* Size 16x4 */
+        33, 32, 32, 32, 32, 32, 32, 31, 30, 29, 29, 27, 26, 24, 23, 22, 32, 32,
+        32, 31, 30, 30, 29, 28, 28, 27, 27, 26, 25, 24, 23, 22, 28, 29, 29, 30,
+        28, 28, 27, 26, 24, 22, 21, 20, 20, 19, 18, 18, 23, 24, 25, 25, 24, 24,
+        24, 23, 21, 20, 19, 18, 17, 16, 16, 15,
+        /* Size 8x32 */
+        32, 33, 33, 32, 29, 28, 23, 22, 33, 32, 32, 32, 29, 29, 24, 22, 33, 32,
+        32, 32, 29, 29, 24, 23, 33, 32, 32, 32, 29, 29, 24, 23, 33, 32, 32, 32,
+        30, 29, 25, 23, 33, 32, 32, 31, 30, 30, 25, 23, 33, 32, 32, 31, 30, 30,
+        25, 23, 33, 32, 32, 31, 30, 29, 25, 23, 33, 32, 31, 30, 29, 28, 24, 23,
+        32, 32, 31, 30, 28, 28, 24, 23, 32, 32, 31, 30, 28, 28, 24, 23, 32, 32,
+        31, 29, 28, 28, 24, 23, 32, 31, 30, 29, 28, 27, 24, 23, 32, 31, 30, 29,
+        28, 27, 24, 23, 32, 31, 30, 28, 26, 26, 23, 22, 30, 30, 29, 28, 25, 24,
+        21, 20, 30, 30, 29, 28, 25, 24, 21, 20, 30, 30, 29, 28, 24, 24, 21, 20,
+        29, 30, 28, 27, 23, 22, 20, 19, 28, 30, 28, 27, 22, 21, 19, 18, 28, 30,
+        28, 27, 22, 21, 19, 18, 27, 28, 28, 26, 22, 21, 18, 18, 26, 28, 26, 26,
+        21, 20, 18, 17, 26, 28, 26, 26, 21, 20, 18, 17, 25, 26, 26, 25, 21, 20,
+        17, 17, 23, 25, 24, 24, 20, 19, 16, 16, 23, 25, 24, 24, 20, 19, 16, 16,
+        23, 24, 24, 24, 20, 19, 16, 15, 22, 23, 23, 23, 19, 18, 16, 15, 21, 23,
+        23, 22, 19, 18, 15, 15, 21, 23, 23, 22, 19, 18, 15, 15, 20, 22, 21, 21,
+        18, 18, 15, 14,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 30, 30, 30,
+        29, 28, 28, 27, 26, 26, 25, 23, 23, 23, 22, 21, 21, 20, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 30, 28,
+        28, 28, 26, 25, 25, 24, 23, 23, 23, 22, 33, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 26, 26, 26, 24,
+        24, 24, 23, 23, 23, 21, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 29,
+        29, 29, 28, 28, 28, 28, 27, 27, 27, 26, 26, 26, 25, 24, 24, 24, 23, 22,
+        22, 21, 29, 29, 29, 29, 30, 30, 30, 30, 29, 28, 28, 28, 28, 28, 26, 25,
+        25, 24, 23, 22, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 28, 29,
+        29, 29, 29, 30, 30, 29, 28, 28, 28, 28, 27, 27, 26, 24, 24, 24, 22, 21,
+        21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 23, 24, 24, 24, 25, 25,
+        25, 25, 24, 24, 24, 24, 24, 24, 23, 21, 21, 21, 20, 19, 19, 18, 18, 18,
+        17, 16, 16, 16, 16, 15, 15, 15, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+        23, 23, 23, 23, 22, 20, 20, 20, 19, 18, 18, 18, 17, 17, 17, 16, 16, 15,
+        15, 15, 15, 14 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 28, 22, 22, 28, 23, 22, 23, 22, 22, 19, 19, 22, 23, 19, 17,
+        /* Size 8x8 */
+        33, 33, 30, 28, 24, 21, 22, 21, 33, 32, 29, 26, 24, 22, 23, 22, 30, 29,
+        26, 24, 23, 22, 23, 22, 28, 26, 24, 22, 22, 22, 23, 22, 24, 24, 23, 22,
+        21, 20, 20, 20, 21, 22, 22, 22, 20, 19, 19, 19, 22, 23, 23, 23, 20, 19,
+        18, 17, 21, 22, 22, 22, 20, 19, 17, 17,
+        /* Size 16x16 */
+        32, 33, 33, 34, 31, 31, 28, 27, 25, 22, 21, 21, 21, 21, 20, 20, 33, 33,
+        33, 33, 30, 30, 27, 26, 24, 22, 22, 22, 22, 22, 21, 21, 33, 33, 33, 33,
+        30, 29, 26, 26, 24, 22, 22, 22, 22, 22, 22, 22, 34, 33, 33, 32, 30, 29,
+        26, 25, 24, 23, 22, 23, 23, 23, 22, 22, 31, 30, 30, 30, 28, 27, 24, 24,
+        23, 22, 22, 22, 22, 23, 22, 22, 31, 30, 29, 29, 27, 26, 24, 23, 23, 22,
+        22, 22, 22, 23, 22, 22, 28, 27, 26, 26, 24, 24, 22, 22, 22, 22, 21, 22,
+        22, 23, 22, 22, 27, 26, 26, 25, 24, 23, 22, 22, 21, 21, 21, 21, 22, 22,
+        22, 22, 25, 24, 24, 24, 23, 23, 22, 21, 21, 20, 20, 21, 21, 21, 20, 20,
+        22, 22, 22, 23, 22, 22, 22, 21, 20, 20, 20, 20, 20, 20, 19, 19, 21, 22,
+        22, 22, 22, 22, 21, 21, 20, 20, 19, 19, 19, 19, 19, 19, 21, 22, 22, 23,
+        22, 22, 22, 21, 21, 20, 19, 19, 19, 19, 18, 18, 21, 22, 22, 23, 22, 22,
+        22, 22, 21, 20, 19, 19, 19, 18, 18, 18, 21, 22, 22, 23, 23, 23, 23, 22,
+        21, 20, 19, 19, 18, 18, 17, 17, 20, 21, 22, 22, 22, 22, 22, 22, 20, 19,
+        19, 18, 18, 17, 17, 17, 20, 21, 22, 22, 22, 22, 22, 22, 20, 19, 19, 18,
+        18, 17, 17, 17,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 34, 34, 33, 31, 31, 31, 29, 28, 28, 27, 25, 25, 24,
+        22, 21, 21, 21, 21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 33, 33, 33, 33,
+        33, 33, 33, 33, 31, 30, 30, 28, 28, 28, 26, 24, 24, 24, 22, 21, 21, 21,
+        22, 22, 22, 22, 22, 21, 21, 21, 21, 20, 33, 33, 33, 33, 33, 33, 33, 32,
+        30, 30, 30, 28, 27, 27, 26, 24, 24, 24, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 21, 21, 21, 21, 33, 33, 33, 33, 33, 33, 33, 32, 30, 30, 30, 28,
+        27, 27, 26, 24, 24, 24, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 21, 33, 33, 33, 33, 33, 33, 33, 32, 30, 29, 29, 28, 26, 26, 26, 24,
+        24, 24, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 34, 33,
+        33, 33, 33, 32, 32, 32, 30, 29, 29, 27, 26, 26, 25, 24, 24, 24, 23, 22,
+        22, 22, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 34, 33, 33, 33, 33, 32,
+        32, 32, 30, 29, 29, 27, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 23, 23,
+        23, 23, 23, 23, 22, 22, 22, 22, 33, 33, 32, 32, 32, 32, 32, 31, 29, 28,
+        28, 27, 26, 26, 25, 24, 24, 24, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23,
+        22, 22, 22, 22, 31, 31, 30, 30, 30, 30, 30, 29, 28, 27, 27, 25, 24, 24,
+        24, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22,
+        31, 30, 30, 30, 29, 29, 29, 28, 27, 26, 26, 25, 24, 24, 23, 23, 23, 23,
+        22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 31, 30, 30, 30,
+        29, 29, 29, 28, 27, 26, 26, 25, 24, 24, 23, 23, 23, 23, 22, 22, 22, 22,
+        22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 29, 28, 28, 28, 28, 27, 27, 27,
+        25, 25, 25, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23,
+        23, 23, 22, 22, 22, 22, 28, 28, 27, 27, 26, 26, 26, 26, 24, 24, 24, 22,
+        22, 22, 22, 22, 22, 22, 22, 21, 21, 22, 22, 22, 22, 23, 23, 23, 22, 22,
+        22, 22, 28, 28, 27, 27, 26, 26, 26, 26, 24, 24, 24, 22, 22, 22, 22, 22,
+        22, 22, 22, 21, 21, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 27, 26,
+        26, 26, 26, 25, 25, 25, 24, 23, 23, 22, 22, 22, 22, 21, 21, 21, 21, 21,
+        21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 21, 25, 24, 24, 24, 24, 24,
+        24, 24, 23, 23, 23, 22, 22, 22, 21, 21, 21, 21, 20, 20, 20, 20, 21, 21,
+        21, 21, 21, 21, 20, 20, 20, 20, 25, 24, 24, 24, 24, 24, 24, 24, 23, 23,
+        23, 22, 22, 22, 21, 21, 21, 21, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21,
+        20, 20, 20, 20, 24, 24, 24, 24, 24, 24, 24, 24, 23, 23, 23, 22, 22, 22,
+        21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+        22, 22, 22, 22, 22, 23, 23, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20,
+        20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 21, 21, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 20, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 21, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        19, 18, 21, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 21, 22,
+        22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 19,
+        19, 19, 19, 19, 19, 19, 19, 18, 18, 18, 18, 18, 21, 22, 22, 22, 22, 23,
+        23, 23, 22, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 19, 19, 19, 19, 19,
+        19, 18, 18, 18, 18, 18, 18, 18, 21, 22, 22, 22, 22, 23, 23, 23, 23, 23,
+        23, 23, 23, 23, 22, 21, 21, 20, 20, 19, 19, 19, 19, 19, 18, 18, 18, 17,
+        17, 17, 17, 17, 21, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+        22, 21, 21, 20, 20, 19, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17,
+        21, 21, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 22, 21, 21, 20,
+        20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 20, 21, 21, 21,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 20, 20, 20, 19, 19, 19, 19,
+        18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 20, 21, 21, 21, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 20, 20, 20, 19, 19, 19, 19, 18, 18, 18, 17,
+        17, 17, 17, 17, 17, 16, 20, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 20, 20, 20, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17, 17,
+        17, 16, 20, 20, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20,
+        20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17, 17, 16, 16, 16,
+        /* Size 4x8 */
+        33, 27, 22, 21, 33, 26, 22, 23, 29, 24, 22, 22, 26, 22, 22, 23, 24, 22,
+        20, 20, 22, 22, 19, 19, 22, 22, 19, 18, 21, 22, 19, 17,
+        /* Size 8x4 */
+        33, 33, 29, 26, 24, 22, 22, 21, 27, 26, 24, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 20, 19, 19, 19, 21, 23, 22, 23, 20, 19, 18, 17,
+        /* Size 8x16 */
+        32, 33, 31, 28, 23, 21, 21, 20, 33, 33, 30, 27, 23, 22, 22, 21, 33, 32,
+        30, 26, 23, 22, 22, 22, 34, 32, 29, 26, 23, 22, 23, 22, 31, 29, 28, 24,
+        22, 22, 23, 22, 31, 28, 27, 24, 22, 22, 22, 22, 28, 26, 24, 22, 22, 22,
+        23, 22, 26, 25, 24, 22, 21, 21, 22, 22, 24, 24, 23, 22, 21, 20, 21, 20,
+        22, 22, 22, 21, 20, 20, 19, 19, 21, 22, 22, 21, 20, 19, 19, 19, 21, 22,
+        22, 22, 20, 19, 18, 18, 21, 23, 22, 22, 20, 19, 18, 18, 21, 23, 23, 22,
+        20, 19, 18, 17, 20, 22, 22, 22, 20, 19, 17, 17, 20, 22, 22, 22, 20, 19,
+        17, 17,
+        /* Size 16x8 */
+        32, 33, 33, 34, 31, 31, 28, 26, 24, 22, 21, 21, 21, 21, 20, 20, 33, 33,
+        32, 32, 29, 28, 26, 25, 24, 22, 22, 22, 23, 23, 22, 22, 31, 30, 30, 29,
+        28, 27, 24, 24, 23, 22, 22, 22, 22, 23, 22, 22, 28, 27, 26, 26, 24, 24,
+        22, 22, 22, 21, 21, 22, 22, 22, 22, 22, 23, 23, 23, 23, 22, 22, 22, 21,
+        21, 20, 20, 20, 20, 20, 20, 20, 21, 22, 22, 22, 22, 22, 22, 21, 20, 20,
+        19, 19, 19, 19, 19, 19, 21, 22, 22, 23, 23, 22, 23, 22, 21, 19, 19, 18,
+        18, 18, 17, 17, 20, 21, 22, 22, 22, 22, 22, 22, 20, 19, 19, 18, 18, 17,
+        17, 17,
+        /* Size 16x32 */
+        32, 33, 33, 33, 31, 28, 28, 27, 23, 21, 21, 21, 21, 21, 20, 20, 33, 33,
+        33, 33, 31, 27, 27, 26, 23, 22, 22, 21, 21, 21, 21, 20, 33, 33, 33, 33,
+        30, 27, 27, 26, 23, 22, 22, 22, 22, 22, 21, 20, 33, 33, 33, 33, 30, 27,
+        27, 26, 23, 22, 22, 22, 22, 22, 21, 20, 33, 33, 32, 32, 30, 26, 26, 26,
+        23, 22, 22, 22, 22, 22, 22, 21, 34, 33, 32, 32, 29, 26, 26, 25, 23, 22,
+        22, 23, 23, 23, 22, 21, 34, 33, 32, 32, 29, 26, 26, 25, 23, 22, 22, 23,
+        23, 23, 22, 21, 33, 32, 31, 31, 29, 26, 26, 25, 23, 22, 22, 23, 23, 23,
+        22, 21, 31, 30, 29, 29, 28, 24, 24, 24, 22, 22, 22, 22, 23, 23, 22, 22,
+        31, 29, 28, 28, 27, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 31, 29,
+        28, 28, 27, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 29, 28, 27, 27,
+        25, 23, 23, 22, 22, 22, 22, 22, 23, 23, 22, 22, 28, 26, 26, 26, 24, 22,
+        22, 22, 22, 22, 22, 22, 23, 23, 22, 22, 28, 26, 26, 26, 24, 22, 22, 22,
+        22, 22, 22, 22, 23, 23, 22, 22, 26, 26, 25, 25, 24, 22, 22, 22, 21, 21,
+        21, 22, 22, 22, 22, 21, 24, 24, 24, 24, 23, 22, 22, 21, 21, 20, 20, 21,
+        21, 21, 20, 20, 24, 24, 24, 24, 23, 22, 22, 21, 21, 20, 20, 21, 21, 21,
+        20, 20, 24, 24, 24, 24, 23, 22, 22, 21, 20, 20, 20, 20, 20, 20, 20, 20,
+        22, 22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 20, 19, 19, 19, 19, 21, 22,
+        22, 22, 22, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 21, 22, 22, 22,
+        22, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 21, 22, 22, 22, 22, 22,
+        22, 21, 20, 19, 19, 19, 19, 19, 19, 18, 21, 22, 22, 22, 22, 22, 22, 21,
+        20, 19, 19, 19, 18, 18, 18, 18, 21, 22, 22, 22, 22, 22, 22, 21, 20, 19,
+        19, 19, 18, 18, 18, 18, 21, 22, 23, 23, 22, 22, 22, 22, 20, 19, 19, 19,
+        18, 18, 18, 17, 21, 22, 23, 23, 23, 22, 22, 22, 20, 19, 19, 18, 18, 18,
+        17, 17, 21, 22, 23, 23, 23, 22, 22, 22, 20, 19, 19, 18, 18, 18, 17, 17,
+        21, 22, 23, 23, 23, 22, 22, 22, 20, 19, 19, 18, 18, 18, 17, 17, 20, 21,
+        22, 22, 22, 22, 22, 21, 20, 19, 19, 18, 17, 17, 17, 16, 20, 21, 22, 22,
+        22, 22, 22, 21, 20, 19, 19, 18, 17, 17, 17, 16, 20, 21, 22, 22, 22, 22,
+        22, 21, 20, 19, 19, 18, 17, 17, 17, 16, 20, 21, 22, 22, 22, 22, 22, 21,
+        20, 19, 19, 18, 17, 17, 17, 16,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 34, 34, 33, 31, 31, 31, 29, 28, 28, 26, 24, 24, 24,
+        22, 21, 21, 21, 21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 33, 33, 33, 33,
+        33, 33, 33, 32, 30, 29, 29, 28, 26, 26, 26, 24, 24, 24, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 33, 33, 33, 33, 32, 32, 32, 31,
+        29, 28, 28, 27, 26, 26, 25, 24, 24, 24, 22, 22, 22, 22, 22, 22, 23, 23,
+        23, 23, 22, 22, 22, 22, 33, 33, 33, 33, 32, 32, 32, 31, 29, 28, 28, 27,
+        26, 26, 25, 24, 24, 24, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 22, 22,
+        22, 22, 31, 31, 30, 30, 30, 29, 29, 29, 28, 27, 27, 25, 24, 24, 24, 23,
+        23, 23, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 28, 27,
+        27, 27, 26, 26, 26, 26, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 28, 27, 27, 27, 26, 26,
+        26, 26, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 27, 26, 26, 26, 26, 25, 25, 25, 24, 23,
+        23, 22, 22, 22, 22, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+        21, 21, 21, 21, 23, 23, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22,
+        21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+        21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20,
+        20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 20, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 23, 23, 23,
+        22, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 19, 19, 19, 19, 19, 19, 18,
+        18, 18, 18, 18, 18, 18, 21, 21, 22, 22, 22, 23, 23, 23, 23, 22, 22, 23,
+        23, 23, 22, 21, 21, 20, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 17, 17,
+        17, 17, 21, 21, 22, 22, 22, 23, 23, 23, 23, 22, 22, 23, 23, 23, 22, 21,
+        21, 20, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 17, 17, 17, 17, 20, 21,
+        21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 20, 20, 20, 19, 19,
+        19, 19, 18, 18, 18, 17, 17, 17, 17, 17, 17, 17, 20, 20, 20, 20, 21, 21,
+        21, 21, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18,
+        17, 17, 17, 17, 16, 16, 16, 16,
+        /* Size 4x16 */
+        33, 28, 21, 21, 33, 27, 22, 22, 33, 26, 22, 22, 33, 26, 22, 23, 30, 24,
+        22, 23, 29, 24, 22, 22, 26, 22, 22, 23, 26, 22, 21, 22, 24, 22, 20, 21,
+        22, 21, 20, 19, 22, 21, 19, 19, 22, 22, 19, 18, 22, 22, 19, 18, 22, 22,
+        19, 18, 21, 22, 19, 17, 21, 22, 19, 17,
+        /* Size 16x4 */
+        33, 33, 33, 33, 30, 29, 26, 26, 24, 22, 22, 22, 22, 22, 21, 21, 28, 27,
+        26, 26, 24, 24, 22, 22, 22, 21, 21, 22, 22, 22, 22, 22, 21, 22, 22, 22,
+        22, 22, 22, 21, 20, 20, 19, 19, 19, 19, 19, 19, 21, 22, 22, 23, 23, 22,
+        23, 22, 21, 19, 19, 18, 18, 18, 17, 17,
+        /* Size 8x32 */
+        32, 33, 31, 28, 23, 21, 21, 20, 33, 33, 31, 27, 23, 22, 21, 21, 33, 33,
+        30, 27, 23, 22, 22, 21, 33, 33, 30, 27, 23, 22, 22, 21, 33, 32, 30, 26,
+        23, 22, 22, 22, 34, 32, 29, 26, 23, 22, 23, 22, 34, 32, 29, 26, 23, 22,
+        23, 22, 33, 31, 29, 26, 23, 22, 23, 22, 31, 29, 28, 24, 22, 22, 23, 22,
+        31, 28, 27, 24, 22, 22, 22, 22, 31, 28, 27, 24, 22, 22, 22, 22, 29, 27,
+        25, 23, 22, 22, 23, 22, 28, 26, 24, 22, 22, 22, 23, 22, 28, 26, 24, 22,
+        22, 22, 23, 22, 26, 25, 24, 22, 21, 21, 22, 22, 24, 24, 23, 22, 21, 20,
+        21, 20, 24, 24, 23, 22, 21, 20, 21, 20, 24, 24, 23, 22, 20, 20, 20, 20,
+        22, 22, 22, 21, 20, 20, 19, 19, 21, 22, 22, 21, 20, 19, 19, 19, 21, 22,
+        22, 21, 20, 19, 19, 19, 21, 22, 22, 22, 20, 19, 19, 19, 21, 22, 22, 22,
+        20, 19, 18, 18, 21, 22, 22, 22, 20, 19, 18, 18, 21, 23, 22, 22, 20, 19,
+        18, 18, 21, 23, 23, 22, 20, 19, 18, 17, 21, 23, 23, 22, 20, 19, 18, 17,
+        21, 23, 23, 22, 20, 19, 18, 17, 20, 22, 22, 22, 20, 19, 17, 17, 20, 22,
+        22, 22, 20, 19, 17, 17, 20, 22, 22, 22, 20, 19, 17, 17, 20, 22, 22, 22,
+        20, 19, 17, 17,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 34, 34, 33, 31, 31, 31, 29, 28, 28, 26, 24, 24, 24,
+        22, 21, 21, 21, 21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 33, 33, 33, 33,
+        32, 32, 32, 31, 29, 28, 28, 27, 26, 26, 25, 24, 24, 24, 22, 22, 22, 22,
+        22, 22, 23, 23, 23, 23, 22, 22, 22, 22, 31, 31, 30, 30, 30, 29, 29, 29,
+        28, 27, 27, 25, 24, 24, 24, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22, 23,
+        23, 23, 22, 22, 22, 22, 28, 27, 27, 27, 26, 26, 26, 26, 24, 24, 24, 23,
+        22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 20, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 23,
+        23, 23, 23, 22, 22, 23, 23, 23, 22, 21, 21, 20, 19, 19, 19, 19, 18, 18,
+        18, 18, 18, 18, 17, 17, 17, 17, 20, 21, 21, 21, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 20, 20, 20, 19, 19, 19, 19, 18, 18, 18, 17, 17, 17,
+        17, 17, 17, 17 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 32, 30, 27, 32, 31, 29, 26, 30, 29, 26, 23, 27, 26, 23, 19,
+        /* Size 8x8 */
+        33, 33, 32, 32, 31, 30, 28, 25, 33, 32, 32, 32, 31, 30, 28, 26, 32, 32,
+        32, 31, 30, 29, 28, 26, 32, 32, 31, 30, 29, 28, 27, 25, 31, 31, 30, 29,
+        28, 26, 25, 23, 30, 30, 29, 28, 26, 24, 22, 21, 28, 28, 28, 27, 25, 22,
+        20, 19, 25, 26, 26, 25, 23, 21, 19, 18,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 30, 30, 28, 28, 26, 26, 23, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 30, 30, 29, 29, 27, 27, 24, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 30, 30, 29, 29, 27, 27, 24, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 28, 28, 25, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 30, 28, 28, 25, 33, 32, 32, 32, 32, 31, 31, 30, 30, 29,
+        29, 28, 28, 26, 26, 24, 33, 32, 32, 32, 32, 31, 31, 30, 30, 29, 29, 28,
+        28, 26, 26, 24, 32, 32, 32, 32, 32, 30, 30, 29, 29, 28, 28, 27, 27, 26,
+        26, 24, 32, 32, 32, 32, 32, 30, 30, 29, 29, 28, 28, 27, 27, 26, 26, 24,
+        30, 30, 30, 31, 31, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 22, 30, 30,
+        30, 31, 31, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 22, 28, 29, 29, 30,
+        30, 28, 28, 27, 27, 24, 24, 21, 21, 20, 20, 19, 28, 29, 29, 30, 30, 28,
+        28, 27, 27, 24, 24, 21, 21, 20, 20, 19, 26, 27, 27, 28, 28, 26, 26, 26,
+        26, 23, 23, 20, 20, 19, 19, 18, 26, 27, 27, 28, 28, 26, 26, 26, 26, 23,
+        23, 20, 20, 19, 19, 18, 23, 24, 24, 25, 25, 24, 24, 24, 24, 22, 22, 19,
+        19, 18, 18, 16,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 31,
+        30, 30, 30, 29, 28, 28, 28, 28, 26, 26, 26, 25, 23, 23, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 30,
+        29, 29, 29, 28, 26, 26, 26, 25, 24, 24, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 30, 29, 29, 29, 28,
+        27, 27, 27, 26, 24, 24, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 30, 30, 30, 30, 29, 29, 29, 28, 27, 27, 27, 26,
+        24, 24, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 30, 30, 30, 30, 29, 29, 29, 28, 27, 27, 27, 26, 24, 24, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30,
+        30, 30, 29, 29, 29, 28, 27, 27, 27, 26, 25, 25, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30,
+        30, 28, 28, 28, 28, 26, 25, 25, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 28, 28, 28,
+        28, 26, 25, 25, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 28, 28, 28, 28, 26, 25, 25,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 30,
+        30, 30, 30, 29, 29, 29, 29, 28, 27, 27, 27, 26, 25, 25, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 30, 30, 30, 30, 29, 29, 29, 28,
+        28, 28, 28, 27, 26, 26, 26, 26, 24, 24, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 31, 30, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 27,
+        26, 26, 26, 26, 24, 24, 33, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        31, 31, 30, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 27, 26, 26, 26, 26,
+        24, 24, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30,
+        30, 29, 28, 28, 28, 28, 28, 28, 28, 27, 26, 26, 26, 25, 24, 24, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 30, 29, 29, 29, 28, 28, 28,
+        28, 28, 27, 27, 27, 26, 26, 26, 26, 25, 24, 24, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 30, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 28, 27, 27,
+        27, 26, 26, 26, 26, 25, 24, 24, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        30, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 28, 27, 27, 27, 26, 26, 26,
+        26, 25, 24, 24, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 29,
+        28, 28, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25, 24, 24, 24, 23, 23, 23,
+        30, 30, 30, 30, 30, 30, 31, 31, 31, 30, 29, 29, 29, 28, 28, 28, 28, 27,
+        26, 26, 26, 25, 24, 24, 24, 23, 23, 23, 23, 22, 22, 22, 30, 30, 30, 30,
+        30, 30, 31, 31, 31, 30, 29, 29, 29, 28, 28, 28, 28, 27, 26, 26, 26, 25,
+        24, 24, 24, 23, 23, 23, 23, 22, 22, 22, 30, 30, 30, 30, 30, 30, 31, 31,
+        31, 30, 29, 29, 29, 28, 28, 28, 28, 27, 26, 26, 26, 25, 24, 24, 24, 23,
+        23, 23, 23, 22, 22, 22, 29, 30, 30, 30, 30, 30, 30, 30, 30, 29, 28, 28,
+        28, 28, 28, 28, 28, 26, 25, 25, 25, 24, 23, 23, 23, 22, 22, 22, 22, 21,
+        20, 20, 28, 29, 29, 29, 29, 29, 30, 30, 30, 29, 28, 28, 28, 28, 27, 27,
+        27, 26, 24, 24, 24, 23, 21, 21, 21, 21, 20, 20, 20, 20, 19, 19, 28, 29,
+        29, 29, 29, 29, 30, 30, 30, 29, 28, 28, 28, 28, 27, 27, 27, 26, 24, 24,
+        24, 23, 21, 21, 21, 21, 20, 20, 20, 20, 19, 19, 28, 29, 29, 29, 29, 29,
+        30, 30, 30, 29, 28, 28, 28, 28, 27, 27, 27, 26, 24, 24, 24, 23, 21, 21,
+        21, 21, 20, 20, 20, 20, 19, 19, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+        27, 27, 27, 27, 26, 26, 26, 25, 23, 23, 23, 22, 21, 21, 21, 20, 20, 20,
+        20, 19, 18, 18, 26, 26, 27, 27, 27, 27, 28, 28, 28, 27, 26, 26, 26, 26,
+        26, 26, 26, 24, 23, 23, 23, 22, 20, 20, 20, 20, 19, 19, 19, 18, 18, 18,
+        26, 26, 27, 27, 27, 27, 28, 28, 28, 27, 26, 26, 26, 26, 26, 26, 26, 24,
+        23, 23, 23, 22, 20, 20, 20, 20, 19, 19, 19, 18, 18, 18, 26, 26, 27, 27,
+        27, 27, 28, 28, 28, 27, 26, 26, 26, 26, 26, 26, 26, 24, 23, 23, 23, 22,
+        20, 20, 20, 20, 19, 19, 19, 18, 18, 18, 25, 25, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 25, 25, 25, 25, 23, 22, 22, 22, 21, 20, 20, 20, 19,
+        18, 18, 18, 18, 17, 17, 23, 24, 24, 24, 24, 25, 25, 25, 25, 25, 24, 24,
+        24, 24, 24, 24, 24, 23, 22, 22, 22, 20, 19, 19, 19, 18, 18, 18, 18, 17,
+        16, 16, 23, 24, 24, 24, 24, 25, 25, 25, 25, 25, 24, 24, 24, 24, 24, 24,
+        24, 23, 22, 22, 22, 20, 19, 19, 19, 18, 18, 18, 18, 17, 16, 16,
+        /* Size 4x8 */
+        33, 32, 30, 26, 32, 32, 30, 27, 32, 31, 30, 27, 32, 31, 28, 26, 31, 30,
+        27, 24, 30, 28, 25, 22, 28, 27, 23, 20, 26, 26, 22, 18,
+        /* Size 8x4 */
+        33, 32, 32, 32, 31, 30, 28, 26, 32, 32, 31, 31, 30, 28, 27, 26, 30, 30,
+        30, 28, 27, 25, 23, 22, 26, 27, 27, 26, 24, 22, 20, 18,
+        /* Size 8x16 */
+        32, 33, 33, 32, 32, 28, 28, 23, 33, 32, 32, 32, 32, 29, 29, 24, 33, 32,
+        32, 32, 32, 29, 29, 24, 33, 32, 32, 31, 31, 30, 30, 25, 33, 32, 32, 31,
+        31, 30, 30, 25, 32, 32, 32, 30, 30, 28, 28, 24, 32, 32, 32, 30, 30, 28,
+        28, 24, 32, 31, 31, 29, 29, 27, 27, 24, 32, 31, 31, 29, 29, 27, 27, 24,
+        30, 30, 30, 28, 28, 24, 24, 21, 30, 30, 30, 28, 28, 24, 24, 21, 28, 30,
+        30, 27, 27, 21, 21, 19, 28, 30, 30, 27, 27, 21, 21, 19, 26, 28, 28, 26,
+        26, 20, 20, 18, 26, 28, 28, 26, 26, 20, 20, 18, 23, 25, 25, 24, 24, 19,
+        19, 16,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 32, 32, 32, 32, 30, 30, 28, 28, 26, 26, 23, 33, 32,
+        32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 30, 28, 28, 25, 33, 32, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 30, 30, 28, 28, 25, 32, 32, 32, 31, 31, 30,
+        30, 29, 29, 28, 28, 27, 27, 26, 26, 24, 32, 32, 32, 31, 31, 30, 30, 29,
+        29, 28, 28, 27, 27, 26, 26, 24, 28, 29, 29, 30, 30, 28, 28, 27, 27, 24,
+        24, 21, 21, 20, 20, 19, 28, 29, 29, 30, 30, 28, 28, 27, 27, 24, 24, 21,
+        21, 20, 20, 19, 23, 24, 24, 25, 25, 24, 24, 24, 24, 21, 21, 19, 19, 18,
+        18, 16,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 32, 32, 32, 32, 30, 28, 28, 28, 26, 23, 23, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 30, 29, 29, 29, 26, 24, 24, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 30, 29, 29, 29, 27, 24, 24, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 30, 29, 29, 29, 27, 24, 24, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 30, 29, 29, 29, 27, 24, 24, 33, 32, 32, 32, 32, 32, 32, 32, 32, 30,
+        29, 29, 29, 27, 25, 25, 33, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30,
+        30, 28, 25, 25, 33, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 28,
+        25, 25, 33, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 28, 25, 25,
+        33, 32, 32, 32, 32, 31, 31, 31, 31, 30, 29, 29, 29, 27, 25, 25, 32, 32,
+        32, 32, 32, 31, 30, 30, 30, 29, 28, 28, 28, 26, 24, 24, 32, 32, 32, 32,
+        32, 31, 30, 30, 30, 29, 28, 28, 28, 26, 24, 24, 32, 32, 32, 32, 32, 31,
+        30, 30, 30, 29, 28, 28, 28, 26, 24, 24, 32, 32, 32, 32, 32, 31, 30, 30,
+        30, 28, 28, 28, 28, 26, 24, 24, 32, 32, 31, 31, 31, 30, 29, 29, 29, 28,
+        27, 27, 27, 26, 24, 24, 32, 32, 31, 31, 31, 30, 29, 29, 29, 28, 27, 27,
+        27, 26, 24, 24, 32, 32, 31, 31, 31, 30, 29, 29, 29, 28, 27, 27, 27, 26,
+        24, 24, 31, 31, 31, 31, 31, 30, 28, 28, 28, 27, 26, 26, 26, 24, 23, 23,
+        30, 30, 30, 30, 30, 29, 28, 28, 28, 26, 24, 24, 24, 23, 21, 21, 30, 30,
+        30, 30, 30, 29, 28, 28, 28, 26, 24, 24, 24, 23, 21, 21, 30, 30, 30, 30,
+        30, 29, 28, 28, 28, 26, 24, 24, 24, 23, 21, 21, 29, 30, 30, 30, 30, 28,
+        28, 28, 28, 25, 23, 23, 23, 22, 20, 20, 28, 29, 30, 30, 30, 28, 27, 27,
+        27, 24, 21, 21, 21, 20, 19, 19, 28, 29, 30, 30, 30, 28, 27, 27, 27, 24,
+        21, 21, 21, 20, 19, 19, 28, 29, 30, 30, 30, 28, 27, 27, 27, 24, 21, 21,
+        21, 20, 19, 19, 28, 28, 28, 28, 28, 27, 26, 26, 26, 23, 21, 21, 21, 20,
+        18, 18, 26, 27, 28, 28, 28, 26, 26, 26, 26, 23, 20, 20, 20, 19, 18, 18,
+        26, 27, 28, 28, 28, 26, 26, 26, 26, 23, 20, 20, 20, 19, 18, 18, 26, 27,
+        28, 28, 28, 26, 26, 26, 26, 23, 20, 20, 20, 19, 18, 18, 25, 26, 26, 26,
+        26, 26, 24, 24, 24, 22, 20, 20, 20, 18, 17, 17, 23, 24, 25, 25, 25, 24,
+        24, 24, 24, 21, 19, 19, 19, 18, 16, 16, 23, 24, 25, 25, 25, 24, 24, 24,
+        24, 21, 19, 19, 19, 18, 16, 16,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31,
+        30, 30, 30, 29, 28, 28, 28, 28, 26, 26, 26, 25, 23, 23, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 30,
+        29, 29, 29, 28, 27, 27, 27, 26, 24, 24, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 28,
+        28, 28, 28, 26, 25, 25, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 28, 28, 28, 28, 26,
+        25, 25, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 30, 30, 30, 30, 30, 30, 30, 28, 28, 28, 28, 26, 25, 25, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 30, 30, 30, 30, 29, 29,
+        29, 28, 28, 28, 28, 27, 26, 26, 26, 26, 24, 24, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 30, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 28, 27, 27,
+        27, 26, 26, 26, 26, 24, 24, 24, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        30, 30, 30, 30, 29, 29, 29, 28, 28, 28, 28, 28, 27, 27, 27, 26, 26, 26,
+        26, 24, 24, 24, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30,
+        29, 29, 29, 28, 28, 28, 28, 28, 27, 27, 27, 26, 26, 26, 26, 24, 24, 24,
+        30, 30, 30, 30, 30, 30, 31, 31, 31, 30, 29, 29, 29, 28, 28, 28, 28, 27,
+        26, 26, 26, 25, 24, 24, 24, 23, 23, 23, 23, 22, 21, 21, 28, 29, 29, 29,
+        29, 29, 30, 30, 30, 29, 28, 28, 28, 28, 27, 27, 27, 26, 24, 24, 24, 23,
+        21, 21, 21, 21, 20, 20, 20, 20, 19, 19, 28, 29, 29, 29, 29, 29, 30, 30,
+        30, 29, 28, 28, 28, 28, 27, 27, 27, 26, 24, 24, 24, 23, 21, 21, 21, 21,
+        20, 20, 20, 20, 19, 19, 28, 29, 29, 29, 29, 29, 30, 30, 30, 29, 28, 28,
+        28, 28, 27, 27, 27, 26, 24, 24, 24, 23, 21, 21, 21, 21, 20, 20, 20, 20,
+        19, 19, 26, 26, 27, 27, 27, 27, 28, 28, 28, 27, 26, 26, 26, 26, 26, 26,
+        26, 24, 23, 23, 23, 22, 20, 20, 20, 20, 19, 19, 19, 18, 18, 18, 23, 24,
+        24, 24, 24, 25, 25, 25, 25, 25, 24, 24, 24, 24, 24, 24, 24, 23, 21, 21,
+        21, 20, 19, 19, 19, 18, 18, 18, 18, 17, 16, 16, 23, 24, 24, 24, 24, 25,
+        25, 25, 25, 25, 24, 24, 24, 24, 24, 24, 24, 23, 21, 21, 21, 20, 19, 19,
+        19, 18, 18, 18, 18, 17, 16, 16,
+        /* Size 4x16 */
+        33, 32, 30, 26, 32, 32, 30, 27, 32, 32, 30, 27, 32, 32, 31, 28, 32, 32,
+        31, 28, 32, 31, 29, 26, 32, 31, 29, 26, 32, 30, 28, 26, 32, 30, 28, 26,
+        30, 29, 26, 23, 30, 29, 26, 23, 29, 28, 24, 20, 29, 28, 24, 20, 27, 26,
+        23, 19, 27, 26, 23, 19, 24, 24, 21, 18,
+        /* Size 16x4 */
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 30, 30, 29, 29, 27, 27, 24, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 29, 29, 28, 28, 26, 26, 24, 30, 30, 30, 31,
+        31, 29, 29, 28, 28, 26, 26, 24, 24, 23, 23, 21, 26, 27, 27, 28, 28, 26,
+        26, 26, 26, 23, 23, 20, 20, 19, 19, 18,
+        /* Size 8x32 */
+        32, 33, 33, 32, 32, 28, 28, 23, 33, 33, 33, 32, 32, 29, 29, 24, 33, 32,
+        32, 32, 32, 29, 29, 24, 33, 32, 32, 32, 32, 29, 29, 24, 33, 32, 32, 32,
+        32, 29, 29, 24, 33, 32, 32, 32, 32, 29, 29, 25, 33, 32, 32, 31, 31, 30,
+        30, 25, 33, 32, 32, 31, 31, 30, 30, 25, 33, 32, 32, 31, 31, 30, 30, 25,
+        33, 32, 32, 31, 31, 29, 29, 25, 32, 32, 32, 30, 30, 28, 28, 24, 32, 32,
+        32, 30, 30, 28, 28, 24, 32, 32, 32, 30, 30, 28, 28, 24, 32, 32, 32, 30,
+        30, 28, 28, 24, 32, 31, 31, 29, 29, 27, 27, 24, 32, 31, 31, 29, 29, 27,
+        27, 24, 32, 31, 31, 29, 29, 27, 27, 24, 31, 31, 31, 28, 28, 26, 26, 23,
+        30, 30, 30, 28, 28, 24, 24, 21, 30, 30, 30, 28, 28, 24, 24, 21, 30, 30,
+        30, 28, 28, 24, 24, 21, 29, 30, 30, 28, 28, 23, 23, 20, 28, 30, 30, 27,
+        27, 21, 21, 19, 28, 30, 30, 27, 27, 21, 21, 19, 28, 30, 30, 27, 27, 21,
+        21, 19, 28, 28, 28, 26, 26, 21, 21, 18, 26, 28, 28, 26, 26, 20, 20, 18,
+        26, 28, 28, 26, 26, 20, 20, 18, 26, 28, 28, 26, 26, 20, 20, 18, 25, 26,
+        26, 24, 24, 20, 20, 17, 23, 25, 25, 24, 24, 19, 19, 16, 23, 25, 25, 24,
+        24, 19, 19, 16,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31,
+        30, 30, 30, 29, 28, 28, 28, 28, 26, 26, 26, 25, 23, 23, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30,
+        30, 30, 30, 28, 28, 28, 28, 26, 25, 25, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 28,
+        28, 28, 28, 26, 25, 25, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30,
+        30, 30, 29, 29, 29, 28, 28, 28, 28, 28, 27, 27, 27, 26, 26, 26, 26, 24,
+        24, 24, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 29, 29,
+        29, 28, 28, 28, 28, 28, 27, 27, 27, 26, 26, 26, 26, 24, 24, 24, 28, 29,
+        29, 29, 29, 29, 30, 30, 30, 29, 28, 28, 28, 28, 27, 27, 27, 26, 24, 24,
+        24, 23, 21, 21, 21, 21, 20, 20, 20, 20, 19, 19, 28, 29, 29, 29, 29, 29,
+        30, 30, 30, 29, 28, 28, 28, 28, 27, 27, 27, 26, 24, 24, 24, 23, 21, 21,
+        21, 21, 20, 20, 20, 20, 19, 19, 23, 24, 24, 24, 24, 25, 25, 25, 25, 25,
+        24, 24, 24, 24, 24, 24, 24, 23, 21, 21, 21, 20, 19, 19, 19, 18, 18, 18,
+        18, 17, 16, 16 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 30, 24, 22, 30, 26, 23, 22, 24, 23, 21, 21, 22, 22, 21, 19,
+        /* Size 8x8 */
+        33, 33, 32, 29, 26, 23, 21, 21, 33, 33, 31, 28, 25, 23, 22, 22, 32, 31,
+        29, 26, 24, 23, 22, 23, 29, 28, 26, 24, 23, 22, 22, 22, 26, 25, 24, 23,
+        22, 21, 21, 22, 23, 23, 23, 22, 21, 20, 20, 20, 21, 22, 22, 22, 21, 20,
+        19, 19, 21, 22, 23, 22, 22, 20, 19, 18,
+        /* Size 16x16 */
+        32, 33, 33, 34, 34, 31, 31, 28, 28, 25, 25, 21, 21, 21, 21, 21, 33, 33,
+        33, 33, 33, 30, 30, 27, 27, 24, 24, 22, 22, 22, 22, 22, 33, 33, 33, 33,
+        33, 30, 30, 27, 27, 24, 24, 22, 22, 22, 22, 22, 34, 33, 33, 32, 32, 29,
+        29, 26, 26, 24, 24, 22, 22, 23, 23, 23, 34, 33, 33, 32, 32, 29, 29, 26,
+        26, 24, 24, 22, 22, 23, 23, 23, 31, 30, 30, 29, 29, 26, 26, 24, 24, 23,
+        23, 22, 22, 22, 22, 23, 31, 30, 30, 29, 29, 26, 26, 24, 24, 23, 23, 22,
+        22, 22, 22, 23, 28, 27, 27, 26, 26, 24, 24, 22, 22, 22, 22, 21, 21, 22,
+        22, 23, 28, 27, 27, 26, 26, 24, 24, 22, 22, 22, 22, 21, 21, 22, 22, 23,
+        25, 24, 24, 24, 24, 23, 23, 22, 22, 21, 21, 20, 20, 21, 21, 21, 25, 24,
+        24, 24, 24, 23, 23, 22, 22, 21, 21, 20, 20, 21, 21, 21, 21, 22, 22, 22,
+        22, 22, 22, 21, 21, 20, 20, 19, 19, 19, 19, 19, 21, 22, 22, 22, 22, 22,
+        22, 21, 21, 20, 20, 19, 19, 19, 19, 19, 21, 22, 22, 23, 23, 22, 22, 22,
+        22, 21, 21, 19, 19, 19, 19, 19, 21, 22, 22, 23, 23, 22, 22, 22, 22, 21,
+        21, 19, 19, 19, 19, 19, 21, 22, 22, 23, 23, 23, 23, 23, 23, 21, 21, 19,
+        19, 19, 19, 18,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 34, 34, 34, 32, 31, 31, 31, 29, 28, 28, 28, 26,
+        25, 25, 25, 23, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 30, 30, 30, 29, 28, 28, 28, 26, 24, 24, 24, 23,
+        21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 31, 30, 30, 30, 28, 27, 27, 27, 26, 24, 24, 24, 23, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 30, 30,
+        30, 28, 27, 27, 27, 26, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 30, 30, 30, 28, 27, 27,
+        27, 26, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 31, 29, 29, 29, 28, 26, 26, 26, 25, 24, 24,
+        24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 34, 33, 33, 33, 33, 33,
+        32, 32, 32, 31, 29, 29, 29, 28, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22,
+        22, 22, 23, 23, 23, 23, 23, 23, 34, 33, 33, 33, 33, 33, 32, 32, 32, 31,
+        29, 29, 29, 28, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 23, 23,
+        23, 23, 23, 23, 34, 33, 33, 33, 33, 33, 32, 32, 32, 31, 29, 29, 29, 28,
+        26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 29, 28, 28, 28, 26, 25, 25, 25, 24,
+        24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 31, 30, 30, 30,
+        30, 29, 29, 29, 29, 28, 26, 26, 26, 25, 24, 24, 24, 23, 23, 23, 23, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 31, 30, 30, 30, 30, 29, 29, 29,
+        29, 28, 26, 26, 26, 25, 24, 24, 24, 23, 23, 23, 23, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 23, 23, 31, 30, 30, 30, 30, 29, 29, 29, 29, 28, 26, 26,
+        26, 25, 24, 24, 24, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        23, 23, 29, 29, 28, 28, 28, 28, 28, 28, 28, 26, 25, 25, 25, 24, 23, 23,
+        23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 28, 28,
+        27, 27, 27, 26, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22,
+        22, 22, 21, 21, 21, 22, 22, 22, 22, 22, 23, 23, 28, 28, 27, 27, 27, 26,
+        26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 22, 22, 22, 22, 22, 23, 23, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25,
+        24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 22, 22,
+        22, 22, 23, 23, 26, 26, 26, 26, 26, 25, 25, 25, 25, 24, 23, 23, 23, 23,
+        22, 22, 22, 22, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22,
+        25, 24, 24, 24, 24, 24, 24, 24, 24, 24, 23, 23, 23, 22, 22, 22, 22, 21,
+        21, 21, 21, 21, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 25, 24, 24, 24,
+        24, 24, 24, 24, 24, 24, 23, 23, 23, 22, 22, 22, 22, 21, 21, 21, 21, 21,
+        20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 25, 24, 24, 24, 24, 24, 24, 24,
+        24, 24, 23, 23, 23, 22, 22, 22, 22, 21, 21, 21, 21, 21, 20, 20, 20, 20,
+        21, 21, 21, 21, 21, 21, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 22, 22,
+        22, 22, 22, 22, 22, 21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+        20, 20, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 21, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 20, 20,
+        20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 20, 20, 20, 20, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 22,
+        22, 22, 22, 21, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+        21, 21, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21,
+        21, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22,
+        22, 22, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 20,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 23, 23,
+        23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 20, 19, 19, 19, 19,
+        19, 19, 19, 18, 18, 18, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23,
+        23, 23, 23, 23, 23, 22, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 18,
+        18, 18, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+        23, 22, 21, 21, 21, 20, 19, 19, 19, 19, 19, 19, 19, 18, 18, 18,
+        /* Size 4x8 */
+        33, 30, 24, 21, 33, 29, 24, 22, 31, 28, 23, 22, 28, 25, 22, 22, 26, 23,
+        21, 21, 23, 22, 21, 20, 22, 22, 20, 19, 22, 22, 21, 19,
+        /* Size 8x4 */
+        33, 33, 31, 28, 26, 23, 22, 22, 30, 29, 28, 25, 23, 22, 22, 22, 24, 24,
+        23, 22, 21, 21, 20, 21, 21, 22, 22, 22, 21, 20, 19, 19,
+        /* Size 8x16 */
+        32, 33, 33, 28, 28, 21, 21, 21, 33, 33, 33, 27, 27, 22, 22, 22, 33, 33,
+        33, 27, 27, 22, 22, 22, 34, 32, 32, 26, 26, 22, 22, 23, 34, 32, 32, 26,
+        26, 22, 22, 23, 31, 28, 28, 24, 24, 22, 22, 22, 31, 28, 28, 24, 24, 22,
+        22, 22, 28, 26, 26, 22, 22, 22, 22, 23, 28, 26, 26, 22, 22, 22, 22, 23,
+        24, 24, 24, 22, 22, 20, 20, 21, 24, 24, 24, 22, 22, 20, 20, 21, 21, 22,
+        22, 21, 21, 19, 19, 19, 21, 22, 22, 21, 21, 19, 19, 19, 21, 22, 22, 22,
+        22, 19, 19, 18, 21, 22, 22, 22, 22, 19, 19, 18, 21, 23, 23, 22, 22, 19,
+        19, 18,
+        /* Size 16x8 */
+        32, 33, 33, 34, 34, 31, 31, 28, 28, 24, 24, 21, 21, 21, 21, 21, 33, 33,
+        33, 32, 32, 28, 28, 26, 26, 24, 24, 22, 22, 22, 22, 23, 33, 33, 33, 32,
+        32, 28, 28, 26, 26, 24, 24, 22, 22, 22, 22, 23, 28, 27, 27, 26, 26, 24,
+        24, 22, 22, 22, 22, 21, 21, 22, 22, 22, 28, 27, 27, 26, 26, 24, 24, 22,
+        22, 22, 22, 21, 21, 22, 22, 22, 21, 22, 22, 22, 22, 22, 22, 22, 22, 20,
+        20, 19, 19, 19, 19, 19, 21, 22, 22, 22, 22, 22, 22, 22, 22, 20, 20, 19,
+        19, 19, 19, 19, 21, 22, 22, 23, 23, 22, 22, 23, 23, 21, 21, 19, 19, 18,
+        18, 18,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 31, 28, 28, 28, 24, 21, 21, 21, 21, 21, 21, 33, 33,
+        33, 33, 33, 30, 28, 28, 28, 24, 22, 22, 22, 21, 21, 21, 33, 33, 33, 33,
+        33, 30, 27, 27, 27, 24, 22, 22, 22, 22, 22, 22, 33, 33, 33, 33, 33, 30,
+        27, 27, 27, 24, 22, 22, 22, 22, 22, 22, 33, 33, 33, 33, 33, 30, 27, 27,
+        27, 24, 22, 22, 22, 22, 22, 22, 33, 33, 32, 32, 32, 29, 26, 26, 26, 24,
+        22, 22, 22, 22, 22, 22, 34, 33, 32, 32, 32, 29, 26, 26, 26, 24, 22, 22,
+        22, 23, 23, 23, 34, 33, 32, 32, 32, 29, 26, 26, 26, 24, 22, 22, 22, 23,
+        23, 23, 34, 33, 32, 32, 32, 29, 26, 26, 26, 24, 22, 22, 22, 23, 23, 23,
+        32, 31, 30, 30, 30, 28, 25, 25, 25, 23, 22, 22, 22, 22, 23, 23, 31, 30,
+        28, 28, 28, 26, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 31, 30, 28, 28,
+        28, 26, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 31, 30, 28, 28, 28, 26,
+        24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 29, 28, 27, 27, 27, 25, 23, 23,
+        23, 22, 22, 22, 22, 22, 23, 23, 28, 27, 26, 26, 26, 24, 22, 22, 22, 22,
+        22, 22, 22, 22, 23, 23, 28, 27, 26, 26, 26, 24, 22, 22, 22, 22, 22, 22,
+        22, 22, 23, 23, 28, 27, 26, 26, 26, 24, 22, 22, 22, 22, 22, 22, 22, 22,
+        23, 23, 26, 26, 25, 25, 25, 23, 22, 22, 22, 21, 21, 21, 21, 21, 22, 22,
+        24, 24, 24, 24, 24, 23, 22, 22, 22, 21, 20, 20, 20, 20, 21, 21, 24, 24,
+        24, 24, 24, 23, 22, 22, 22, 21, 20, 20, 20, 20, 21, 21, 24, 24, 24, 24,
+        24, 23, 22, 22, 22, 21, 20, 20, 20, 20, 21, 21, 23, 23, 23, 23, 23, 22,
+        22, 22, 22, 21, 20, 20, 20, 20, 20, 20, 21, 21, 22, 22, 22, 22, 21, 21,
+        21, 20, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 21, 21, 21, 20,
+        19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 21, 21, 21, 20, 19, 19,
+        19, 19, 19, 19, 21, 22, 22, 22, 22, 22, 22, 22, 22, 20, 19, 19, 19, 19,
+        19, 19, 21, 22, 22, 22, 22, 22, 22, 22, 22, 20, 19, 19, 19, 19, 18, 18,
+        21, 22, 22, 22, 22, 22, 22, 22, 22, 20, 19, 19, 19, 19, 18, 18, 21, 22,
+        22, 22, 22, 22, 22, 22, 22, 20, 19, 19, 19, 19, 18, 18, 21, 22, 23, 23,
+        23, 22, 22, 22, 22, 21, 19, 19, 19, 19, 18, 18, 21, 22, 23, 23, 23, 23,
+        22, 22, 22, 21, 19, 19, 19, 18, 18, 18, 21, 22, 23, 23, 23, 23, 22, 22,
+        22, 21, 19, 19, 19, 18, 18, 18,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 34, 34, 34, 32, 31, 31, 31, 29, 28, 28, 28, 26,
+        24, 24, 24, 23, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 31, 30, 30, 30, 28, 27, 27, 27, 26, 24, 24, 24, 23,
+        21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 30, 28, 28, 28, 27, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22,
+        22, 22, 22, 23, 23, 23, 33, 33, 33, 33, 33, 32, 32, 32, 32, 30, 28, 28,
+        28, 27, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 23,
+        23, 23, 33, 33, 33, 33, 33, 32, 32, 32, 32, 30, 28, 28, 28, 27, 26, 26,
+        26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 31, 30,
+        30, 30, 30, 29, 29, 29, 29, 28, 26, 26, 26, 25, 24, 24, 24, 23, 23, 23,
+        23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 28, 28, 27, 27, 27, 26,
+        26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 22, 22, 22, 22, 22, 22, 22, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25,
+        24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 22, 22,
+        22, 22, 22, 22, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25, 24, 24, 24, 23,
+        22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22,
+        24, 24, 24, 24, 24, 24, 24, 24, 24, 23, 23, 23, 23, 22, 22, 22, 22, 21,
+        21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 20,
+        19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 20, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 21, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 21, 21, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22,
+        22, 21, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 18, 18, 21, 21,
+        22, 22, 22, 22, 23, 23, 23, 23, 22, 22, 22, 23, 23, 23, 23, 22, 21, 21,
+        21, 20, 19, 19, 19, 19, 18, 18, 18, 18, 18, 18, 21, 21, 22, 22, 22, 22,
+        23, 23, 23, 23, 22, 22, 22, 23, 23, 23, 23, 22, 21, 21, 21, 20, 19, 19,
+        19, 19, 18, 18, 18, 18, 18, 18,
+        /* Size 4x16 */
+        33, 31, 24, 21, 33, 30, 24, 22, 33, 30, 24, 22, 33, 29, 24, 23, 33, 29,
+        24, 23, 30, 26, 23, 22, 30, 26, 23, 22, 27, 24, 22, 22, 27, 24, 22, 22,
+        24, 23, 21, 20, 24, 23, 21, 20, 21, 22, 20, 19, 21, 22, 20, 19, 22, 22,
+        20, 19, 22, 22, 20, 19, 22, 23, 21, 18,
+        /* Size 16x4 */
+        33, 33, 33, 33, 33, 30, 30, 27, 27, 24, 24, 21, 21, 22, 22, 22, 31, 30,
+        30, 29, 29, 26, 26, 24, 24, 23, 23, 22, 22, 22, 22, 23, 24, 24, 24, 24,
+        24, 23, 23, 22, 22, 21, 21, 20, 20, 20, 20, 21, 21, 22, 22, 23, 23, 22,
+        22, 22, 22, 20, 20, 19, 19, 19, 19, 18,
+        /* Size 8x32 */
+        32, 33, 33, 28, 28, 21, 21, 21, 33, 33, 33, 28, 28, 22, 22, 21, 33, 33,
+        33, 27, 27, 22, 22, 22, 33, 33, 33, 27, 27, 22, 22, 22, 33, 33, 33, 27,
+        27, 22, 22, 22, 33, 32, 32, 26, 26, 22, 22, 22, 34, 32, 32, 26, 26, 22,
+        22, 23, 34, 32, 32, 26, 26, 22, 22, 23, 34, 32, 32, 26, 26, 22, 22, 23,
+        32, 30, 30, 25, 25, 22, 22, 23, 31, 28, 28, 24, 24, 22, 22, 22, 31, 28,
+        28, 24, 24, 22, 22, 22, 31, 28, 28, 24, 24, 22, 22, 22, 29, 27, 27, 23,
+        23, 22, 22, 23, 28, 26, 26, 22, 22, 22, 22, 23, 28, 26, 26, 22, 22, 22,
+        22, 23, 28, 26, 26, 22, 22, 22, 22, 23, 26, 25, 25, 22, 22, 21, 21, 22,
+        24, 24, 24, 22, 22, 20, 20, 21, 24, 24, 24, 22, 22, 20, 20, 21, 24, 24,
+        24, 22, 22, 20, 20, 21, 23, 23, 23, 22, 22, 20, 20, 20, 21, 22, 22, 21,
+        21, 19, 19, 19, 21, 22, 22, 21, 21, 19, 19, 19, 21, 22, 22, 21, 21, 19,
+        19, 19, 21, 22, 22, 22, 22, 19, 19, 19, 21, 22, 22, 22, 22, 19, 19, 18,
+        21, 22, 22, 22, 22, 19, 19, 18, 21, 22, 22, 22, 22, 19, 19, 18, 21, 23,
+        23, 22, 22, 19, 19, 18, 21, 23, 23, 22, 22, 19, 19, 18, 21, 23, 23, 22,
+        22, 19, 19, 18,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 34, 34, 34, 32, 31, 31, 31, 29, 28, 28, 28, 26,
+        24, 24, 24, 23, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 30, 28, 28, 28, 27, 26, 26, 26, 25, 24, 24, 24, 23,
+        22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 30, 28, 28, 28, 27, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22,
+        22, 22, 22, 23, 23, 23, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25, 24, 24,
+        24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 22, 22, 22, 22,
+        22, 22, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25, 24, 24, 24, 23, 22, 22,
+        22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 21, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20,
+        20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 21, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20, 20, 20, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23,
+        22, 22, 22, 23, 23, 23, 23, 22, 21, 21, 21, 20, 19, 19, 19, 19, 18, 18,
+        18, 18, 18, 18 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        32, 32, 32, 29, 32, 32, 31, 29, 32, 31, 29, 27, 29, 29, 27, 22,
+        /* Size 8x8 */
+        33, 33, 33, 32, 32, 32, 30, 29, 33, 32, 32, 32, 32, 31, 30, 29, 33, 32,
+        32, 32, 32, 31, 31, 30, 32, 32, 32, 31, 30, 30, 29, 28, 32, 32, 32, 30,
+        29, 29, 28, 27, 32, 31, 31, 30, 29, 28, 27, 26, 30, 30, 31, 29, 28, 27,
+        26, 24, 29, 29, 30, 28, 27, 26, 24, 21,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 31, 30, 30, 28, 28, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 30, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 30, 30, 33, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 30,
+        29, 29, 28, 28, 33, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 29, 29, 28,
+        28, 28, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 29, 28, 28, 28, 28,
+        32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 28, 28, 28, 27, 27, 32, 32,
+        32, 32, 32, 32, 31, 30, 30, 29, 29, 28, 28, 28, 27, 27, 31, 31, 31, 31,
+        31, 31, 30, 29, 29, 28, 28, 27, 26, 26, 24, 24, 30, 30, 30, 30, 31, 31,
+        29, 29, 28, 28, 28, 26, 26, 25, 24, 24, 30, 30, 30, 30, 30, 30, 29, 28,
+        28, 28, 28, 26, 25, 24, 23, 23, 28, 29, 29, 29, 30, 30, 28, 28, 28, 27,
+        27, 24, 24, 23, 21, 21, 28, 29, 29, 29, 30, 30, 28, 28, 28, 27, 27, 24,
+        24, 23, 21, 21,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 31, 30, 30, 30, 30, 29, 28, 28, 28, 28, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 30, 30, 30, 30, 29, 29, 29, 29, 28, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30,
+        30, 29, 29, 29, 29, 28, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 30, 29, 29, 29,
+        29, 28, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 30, 29, 29, 29, 29, 28, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 30, 30, 30, 29, 29, 29, 29, 28, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30,
+        30, 30, 30, 30, 29, 29, 29, 28, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 30, 30,
+        30, 30, 30, 29, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 31, 30, 30, 30, 30, 30, 29, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30,
+        30, 29, 29, 29, 29, 28, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 29, 29, 29, 29, 28, 28, 28,
+        28, 28, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31,
+        31, 30, 30, 30, 30, 30, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 30, 30,
+        30, 30, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29, 29,
+        29, 29, 28, 28, 28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29, 29, 28, 28, 28, 28, 28,
+        28, 28, 28, 27, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30,
+        30, 30, 30, 29, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28, 27, 27, 27, 26,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 30, 29,
+        29, 29, 29, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 30, 29, 29, 29, 29, 28,
+        28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 30, 30, 30, 30, 29, 29, 29, 29, 28, 28, 28, 28, 28,
+        28, 27, 27, 27, 27, 26, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        30, 30, 30, 30, 29, 29, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 26, 26,
+        26, 25, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 29, 29, 29,
+        29, 28, 28, 28, 28, 28, 27, 26, 26, 26, 26, 25, 24, 24, 24, 24, 30, 30,
+        30, 30, 30, 30, 30, 31, 31, 31, 31, 30, 29, 29, 29, 29, 28, 28, 28, 28,
+        28, 27, 26, 26, 26, 26, 25, 24, 24, 24, 24, 24, 30, 30, 30, 30, 30, 30,
+        30, 31, 31, 31, 31, 30, 29, 29, 29, 29, 28, 28, 28, 28, 28, 27, 26, 26,
+        26, 26, 25, 24, 24, 24, 24, 24, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31,
+        31, 30, 29, 29, 29, 29, 28, 28, 28, 28, 28, 27, 26, 26, 26, 26, 25, 24,
+        24, 24, 24, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 29, 28,
+        28, 28, 28, 28, 28, 28, 28, 27, 26, 25, 25, 25, 24, 23, 23, 23, 23, 23,
+        29, 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 29, 28, 28, 28, 28, 28, 28,
+        27, 27, 27, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 21, 28, 29, 29, 29,
+        29, 29, 29, 30, 30, 30, 30, 29, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26,
+        24, 24, 24, 24, 23, 22, 21, 21, 21, 21, 28, 29, 29, 29, 29, 29, 29, 30,
+        30, 30, 30, 29, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 24, 24, 24, 24,
+        23, 22, 21, 21, 21, 21, 28, 29, 29, 29, 29, 29, 29, 30, 30, 30, 30, 29,
+        28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 24, 24, 24, 24, 23, 22, 21, 21,
+        21, 21, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 28, 28, 28, 28, 28,
+        27, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 21, 21, 21, 21, 20,
+        /* Size 4x8 */
+        33, 33, 32, 29, 32, 32, 32, 29, 32, 32, 31, 30, 32, 32, 30, 28, 32, 31,
+        29, 27, 31, 31, 28, 26, 30, 30, 28, 24, 29, 30, 27, 21,
+        /* Size 8x4 */
+        33, 32, 32, 32, 32, 31, 30, 29, 33, 32, 32, 32, 31, 31, 30, 30, 32, 32,
+        31, 30, 29, 28, 28, 27, 29, 29, 30, 28, 27, 26, 24, 21,
+        /* Size 8x16 */
+        32, 33, 33, 33, 32, 32, 29, 28, 33, 32, 32, 32, 32, 32, 29, 29, 33, 32,
+        32, 32, 32, 32, 29, 29, 33, 32, 32, 32, 32, 32, 30, 29, 33, 32, 32, 32,
+        31, 31, 30, 30, 33, 32, 32, 32, 31, 31, 30, 30, 33, 32, 32, 31, 30, 30,
+        29, 28, 32, 32, 32, 31, 30, 30, 28, 28, 32, 32, 32, 31, 30, 30, 28, 28,
+        32, 32, 31, 30, 29, 29, 28, 27, 32, 32, 31, 30, 29, 29, 28, 27, 31, 31,
+        31, 29, 28, 28, 26, 25, 30, 30, 30, 29, 28, 28, 25, 24, 30, 30, 30, 29,
+        28, 28, 24, 23, 28, 29, 30, 28, 27, 27, 22, 21, 28, 29, 30, 28, 27, 27,
+        22, 21,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 31, 30, 30, 28, 28, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 33, 32, 32, 32, 32, 32,
+        31, 31, 31, 30, 30, 29, 29, 29, 28, 28, 32, 32, 32, 32, 31, 31, 30, 30,
+        30, 29, 29, 28, 28, 28, 27, 27, 32, 32, 32, 32, 31, 31, 30, 30, 30, 29,
+        29, 28, 28, 28, 27, 27, 29, 29, 29, 30, 30, 30, 29, 28, 28, 28, 28, 26,
+        25, 24, 22, 22, 28, 29, 29, 29, 30, 30, 28, 28, 28, 27, 27, 25, 24, 23,
+        21, 21,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 31, 29, 28, 28, 28, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 31, 29, 29, 29, 29, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 29, 29, 29, 29, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 29, 29, 29, 29, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 29, 29, 29, 29, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 29, 29, 29, 29, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        30, 29, 29, 29, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 29,
+        29, 29, 33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30,
+        33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 33, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 33, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 30, 29, 29, 29, 29, 33, 32, 32, 32, 32, 32,
+        31, 31, 30, 30, 30, 30, 29, 28, 28, 28, 32, 32, 32, 32, 32, 32, 31, 30,
+        30, 30, 30, 29, 28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30,
+        30, 29, 28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 30, 29,
+        28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 31, 30, 30, 30, 30, 29, 28, 28,
+        28, 28, 32, 32, 32, 31, 31, 31, 31, 30, 29, 29, 29, 28, 28, 27, 27, 27,
+        32, 32, 32, 31, 31, 31, 30, 29, 29, 29, 29, 28, 28, 27, 27, 27, 32, 32,
+        32, 31, 31, 31, 30, 29, 29, 29, 29, 28, 28, 27, 27, 27, 32, 32, 32, 31,
+        31, 31, 30, 29, 29, 29, 29, 28, 28, 27, 27, 27, 32, 31, 31, 31, 31, 31,
+        30, 29, 28, 28, 28, 28, 26, 26, 26, 26, 31, 31, 31, 31, 31, 31, 29, 28,
+        28, 28, 28, 27, 26, 25, 25, 25, 30, 30, 30, 30, 30, 30, 29, 28, 28, 28,
+        28, 26, 25, 24, 24, 24, 30, 30, 30, 30, 30, 30, 29, 28, 28, 28, 28, 26,
+        25, 24, 24, 24, 30, 30, 30, 30, 30, 30, 29, 28, 28, 28, 28, 26, 25, 24,
+        24, 24, 30, 30, 30, 30, 30, 30, 29, 28, 28, 28, 28, 26, 24, 23, 23, 23,
+        29, 29, 30, 30, 30, 30, 28, 28, 27, 27, 27, 25, 23, 22, 22, 22, 28, 29,
+        29, 30, 30, 30, 28, 28, 27, 27, 27, 24, 22, 21, 21, 21, 28, 29, 29, 30,
+        30, 30, 28, 28, 27, 27, 27, 24, 22, 21, 21, 21, 28, 29, 29, 30, 30, 30,
+        28, 28, 27, 27, 27, 24, 22, 21, 21, 21, 28, 28, 28, 28, 28, 28, 28, 27,
+        26, 26, 26, 24, 22, 21, 21, 21,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 30, 30, 30, 30, 29, 28, 28, 28, 28, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 30, 30, 30, 30, 29, 29, 29, 29, 28, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30,
+        30, 30, 29, 29, 29, 28, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30,
+        30, 28, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 30, 28, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 30, 28, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 29, 29,
+        29, 29, 29, 28, 28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 30, 30, 30, 30, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28,
+        28, 28, 28, 27, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30,
+        30, 30, 30, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29,
+        29, 29, 29, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29, 29, 29, 29, 28,
+        28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 30, 30, 29, 29, 29, 29, 28, 28, 28, 28, 28, 27, 26, 26, 26,
+        26, 25, 24, 24, 24, 24, 29, 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 29,
+        29, 28, 28, 28, 28, 28, 28, 28, 28, 26, 26, 25, 25, 25, 24, 23, 22, 22,
+        22, 22, 28, 29, 29, 29, 29, 29, 29, 29, 30, 30, 30, 29, 28, 28, 28, 28,
+        28, 27, 27, 27, 27, 26, 25, 24, 24, 24, 23, 22, 21, 21, 21, 21, 28, 29,
+        29, 29, 29, 29, 29, 29, 30, 30, 30, 29, 28, 28, 28, 28, 28, 27, 27, 27,
+        27, 26, 25, 24, 24, 24, 23, 22, 21, 21, 21, 21, 28, 29, 29, 29, 29, 29,
+        29, 29, 30, 30, 30, 29, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 25, 24,
+        24, 24, 23, 22, 21, 21, 21, 21,
+        /* Size 4x16 */
+        33, 33, 32, 28, 33, 32, 32, 29, 32, 32, 32, 29, 32, 32, 32, 29, 32, 32,
+        31, 30, 32, 32, 31, 30, 32, 32, 30, 28, 32, 32, 30, 28, 32, 32, 30, 28,
+        32, 31, 29, 27, 32, 31, 29, 27, 31, 31, 28, 25, 30, 30, 28, 24, 30, 30,
+        28, 23, 29, 30, 27, 21, 29, 30, 27, 21,
+        /* Size 16x4 */
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 32, 32, 32, 32,
+        31, 31, 30, 30, 30, 29, 29, 28, 28, 28, 27, 27, 28, 29, 29, 29, 30, 30,
+        28, 28, 28, 27, 27, 25, 24, 23, 21, 21,
+        /* Size 8x32 */
+        32, 33, 33, 33, 32, 32, 29, 28, 33, 33, 33, 32, 32, 32, 29, 29, 33, 32,
+        32, 32, 32, 32, 29, 29, 33, 32, 32, 32, 32, 32, 29, 29, 33, 32, 32, 32,
+        32, 32, 29, 29, 33, 32, 32, 32, 32, 32, 29, 29, 33, 32, 32, 32, 32, 32,
+        30, 29, 33, 32, 32, 32, 32, 32, 30, 29, 33, 32, 32, 32, 31, 31, 30, 30,
+        33, 32, 32, 32, 31, 31, 30, 30, 33, 32, 32, 32, 31, 31, 30, 30, 33, 32,
+        32, 31, 31, 31, 29, 29, 33, 32, 32, 31, 30, 30, 29, 28, 32, 32, 32, 31,
+        30, 30, 28, 28, 32, 32, 32, 31, 30, 30, 28, 28, 32, 32, 32, 31, 30, 30,
+        28, 28, 32, 32, 32, 31, 30, 30, 28, 28, 32, 32, 31, 31, 29, 29, 28, 27,
+        32, 32, 31, 30, 29, 29, 28, 27, 32, 32, 31, 30, 29, 29, 28, 27, 32, 32,
+        31, 30, 29, 29, 28, 27, 32, 31, 31, 30, 28, 28, 26, 26, 31, 31, 31, 29,
+        28, 28, 26, 25, 30, 30, 30, 29, 28, 28, 25, 24, 30, 30, 30, 29, 28, 28,
+        25, 24, 30, 30, 30, 29, 28, 28, 25, 24, 30, 30, 30, 29, 28, 28, 24, 23,
+        29, 30, 30, 28, 27, 27, 23, 22, 28, 29, 30, 28, 27, 27, 22, 21, 28, 29,
+        30, 28, 27, 27, 22, 21, 28, 29, 30, 28, 27, 27, 22, 21, 28, 28, 28, 28,
+        26, 26, 22, 21,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 30, 30, 30, 30, 29, 28, 28, 28, 28, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 30, 30, 30, 30, 30, 29, 29, 29, 28, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 30, 30,
+        30, 30, 30, 30, 30, 28, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 29, 29, 29, 29, 29, 28, 28, 28,
+        28, 28, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30,
+        30, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29, 29, 29,
+        29, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 29, 29, 29, 29, 29, 29,
+        30, 30, 30, 30, 30, 29, 29, 28, 28, 28, 28, 28, 28, 28, 28, 26, 26, 25,
+        25, 25, 24, 23, 22, 22, 22, 22, 28, 29, 29, 29, 29, 29, 29, 29, 30, 30,
+        30, 29, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 25, 24, 24, 24, 23, 22,
+        21, 21, 21, 21 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 32, 27, 22, 32, 30, 25, 22, 27, 25, 22, 22, 22, 22, 22, 20,
+        /* Size 8x8 */
+        33, 33, 34, 30, 28, 26, 24, 21, 33, 33, 33, 30, 28, 26, 24, 22, 34, 33,
+        32, 29, 26, 25, 24, 22, 30, 30, 29, 26, 24, 23, 23, 22, 28, 28, 26, 24,
+        22, 22, 22, 22, 26, 26, 25, 23, 22, 22, 21, 21, 24, 24, 24, 23, 22, 21,
+        21, 20, 21, 22, 22, 22, 22, 21, 20, 19,
+        /* Size 16x16 */
+        32, 33, 33, 33, 34, 34, 31, 31, 30, 28, 28, 26, 25, 23, 21, 21, 33, 33,
+        33, 33, 33, 33, 31, 30, 28, 27, 27, 25, 24, 23, 21, 21, 33, 33, 33, 33,
+        33, 33, 30, 30, 28, 27, 27, 25, 24, 23, 22, 22, 33, 33, 33, 33, 33, 33,
+        30, 29, 28, 26, 26, 25, 24, 23, 22, 22, 34, 33, 33, 33, 32, 32, 30, 29,
+        28, 26, 26, 24, 24, 23, 22, 22, 34, 33, 33, 33, 32, 32, 30, 29, 28, 26,
+        26, 24, 24, 23, 22, 22, 31, 31, 30, 30, 30, 30, 28, 27, 26, 24, 24, 23,
+        23, 23, 22, 22, 31, 30, 30, 29, 29, 29, 27, 26, 26, 24, 24, 23, 23, 22,
+        22, 22, 30, 28, 28, 28, 28, 28, 26, 26, 24, 23, 23, 23, 22, 22, 22, 22,
+        28, 27, 27, 26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 21, 21, 28, 27,
+        27, 26, 26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 21, 21, 26, 25, 25, 25,
+        24, 24, 23, 23, 23, 22, 22, 21, 21, 21, 20, 20, 25, 24, 24, 24, 24, 24,
+        23, 23, 22, 22, 22, 21, 21, 21, 20, 20, 23, 23, 23, 23, 23, 23, 23, 22,
+        22, 22, 22, 21, 21, 20, 20, 20, 21, 21, 22, 22, 22, 22, 22, 22, 22, 21,
+        21, 20, 20, 20, 19, 19, 21, 21, 22, 22, 22, 22, 22, 22, 22, 21, 21, 20,
+        20, 20, 19, 19,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 33, 31, 31, 31, 31, 30, 28,
+        28, 28, 28, 27, 26, 25, 25, 25, 23, 22, 21, 21, 21, 21, 33, 33, 33, 33,
+        33, 33, 33, 33, 34, 34, 34, 32, 31, 30, 30, 30, 29, 28, 28, 28, 28, 26,
+        25, 24, 24, 24, 23, 22, 21, 21, 21, 21, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 31, 30, 30, 30, 28, 28, 27, 27, 27, 26, 25, 24, 24, 24,
+        23, 22, 21, 21, 21, 22, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32,
+        30, 30, 30, 30, 28, 28, 27, 27, 27, 26, 25, 24, 24, 24, 23, 22, 22, 22,
+        22, 22, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 30, 30, 30, 30,
+        28, 28, 27, 27, 27, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 22, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 30, 30, 30, 30, 28, 28, 27, 27,
+        27, 26, 25, 24, 24, 24, 23, 22, 22, 22, 22, 22, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 31, 30, 29, 29, 29, 28, 27, 26, 26, 26, 26, 25, 24,
+        24, 24, 23, 22, 22, 22, 22, 22, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 31, 30, 29, 29, 29, 28, 27, 26, 26, 26, 25, 24, 24, 24, 24, 23, 22,
+        22, 22, 22, 22, 34, 34, 33, 33, 33, 33, 33, 33, 32, 32, 32, 31, 30, 29,
+        29, 29, 28, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 23, 22, 22, 22, 22,
+        34, 34, 33, 33, 33, 33, 33, 33, 32, 32, 32, 31, 30, 29, 29, 29, 28, 26,
+        26, 26, 26, 25, 24, 24, 24, 24, 23, 23, 22, 22, 22, 22, 34, 34, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 31, 30, 29, 29, 29, 28, 26, 26, 26, 26, 25,
+        24, 24, 24, 24, 23, 23, 22, 22, 22, 22, 33, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 30, 28, 28, 28, 28, 27, 26, 25, 25, 25, 24, 24, 24, 24, 24,
+        23, 22, 22, 22, 22, 22, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 30, 28,
+        28, 27, 27, 27, 26, 25, 24, 24, 24, 24, 23, 23, 23, 23, 23, 22, 22, 22,
+        22, 22, 31, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 28, 27, 26, 26, 26,
+        26, 24, 24, 24, 24, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22, 31, 30,
+        30, 30, 30, 30, 29, 29, 29, 29, 29, 28, 27, 26, 26, 26, 26, 24, 24, 24,
+        24, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22, 31, 30, 30, 30, 30, 30,
+        29, 29, 29, 29, 29, 28, 27, 26, 26, 26, 26, 24, 24, 24, 24, 23, 23, 23,
+        23, 23, 22, 22, 22, 22, 22, 22, 30, 29, 28, 28, 28, 28, 28, 28, 28, 28,
+        28, 27, 26, 26, 26, 26, 24, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 28, 28, 28, 28, 28, 28, 27, 27, 26, 26, 26, 26, 25, 24,
+        24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        28, 28, 27, 27, 27, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 28, 28, 27, 27,
+        27, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 21, 21, 21, 22, 28, 28, 27, 27, 27, 27, 26, 26,
+        26, 26, 26, 25, 24, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 21, 21, 21, 22, 27, 26, 26, 26, 26, 26, 26, 25, 25, 25, 25, 24,
+        24, 23, 23, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21, 21, 21, 21, 21, 21,
+        21, 21, 26, 25, 25, 25, 25, 25, 25, 24, 24, 24, 24, 24, 23, 23, 23, 23,
+        23, 22, 22, 22, 22, 21, 21, 21, 21, 21, 21, 21, 20, 20, 20, 21, 25, 24,
+        24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 23, 23, 23, 23, 22, 22, 22, 22,
+        22, 21, 21, 21, 21, 21, 21, 20, 20, 20, 20, 20, 25, 24, 24, 24, 24, 24,
+        24, 24, 24, 24, 24, 24, 23, 23, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21,
+        21, 21, 21, 20, 20, 20, 20, 20, 25, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+        24, 24, 23, 23, 23, 23, 22, 22, 22, 22, 22, 21, 21, 21, 21, 21, 21, 20,
+        20, 20, 20, 20, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 22,
+        22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 21, 20, 20, 20, 20, 20, 20,
+        22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 21, 21, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21,
+        20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 21, 21, 21, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 20, 20, 20, 20,
+        20, 20, 19, 19, 19, 19, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 20, 20, 20, 20, 20, 20, 19, 19,
+        19, 19, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 19,
+        /* Size 4x8 */
+        33, 33, 28, 21, 33, 33, 27, 22, 33, 32, 26, 22, 30, 28, 24, 22, 28, 26,
+        22, 22, 26, 25, 22, 21, 24, 24, 22, 20, 21, 22, 21, 19,
+        /* Size 8x4 */
+        33, 33, 33, 30, 28, 26, 24, 21, 33, 33, 32, 28, 26, 25, 24, 22, 28, 27,
+        26, 24, 22, 22, 22, 21, 21, 22, 22, 22, 22, 21, 20, 19,
+        /* Size 8x16 */
+        32, 33, 33, 31, 28, 28, 23, 21, 33, 33, 33, 30, 27, 27, 23, 22, 33, 33,
+        33, 30, 27, 27, 23, 22, 33, 33, 32, 30, 26, 26, 23, 22, 34, 32, 32, 29,
+        26, 26, 23, 22, 34, 32, 32, 29, 26, 26, 23, 22, 31, 30, 29, 28, 24, 24,
+        22, 22, 31, 29, 28, 27, 24, 24, 22, 22, 29, 28, 28, 26, 23, 23, 22, 22,
+        28, 26, 26, 24, 22, 22, 22, 22, 28, 26, 26, 24, 22, 22, 22, 22, 25, 24,
+        24, 23, 22, 22, 21, 21, 24, 24, 24, 23, 22, 22, 21, 20, 23, 23, 23, 23,
+        22, 22, 20, 20, 21, 22, 22, 22, 21, 21, 20, 19, 21, 22, 22, 22, 21, 21,
+        20, 19,
+        /* Size 16x8 */
+        32, 33, 33, 33, 34, 34, 31, 31, 29, 28, 28, 25, 24, 23, 21, 21, 33, 33,
+        33, 33, 32, 32, 30, 29, 28, 26, 26, 24, 24, 23, 22, 22, 33, 33, 33, 32,
+        32, 32, 29, 28, 28, 26, 26, 24, 24, 23, 22, 22, 31, 30, 30, 30, 29, 29,
+        28, 27, 26, 24, 24, 23, 23, 23, 22, 22, 28, 27, 27, 26, 26, 26, 24, 24,
+        23, 22, 22, 22, 22, 22, 21, 21, 28, 27, 27, 26, 26, 26, 24, 24, 23, 22,
+        22, 22, 22, 22, 21, 21, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 21,
+        21, 20, 20, 20, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 20, 20,
+        19, 19,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 33, 31, 29, 28, 28, 28, 26, 23, 21, 21, 21, 33, 33,
+        33, 33, 33, 33, 31, 28, 28, 28, 28, 25, 23, 21, 21, 21, 33, 33, 33, 33,
+        33, 33, 30, 28, 27, 27, 27, 25, 23, 22, 22, 22, 33, 33, 33, 33, 33, 33,
+        30, 28, 27, 27, 27, 25, 23, 22, 22, 22, 33, 33, 33, 33, 33, 33, 30, 28,
+        27, 27, 27, 25, 23, 22, 22, 22, 33, 33, 33, 33, 33, 33, 30, 28, 27, 27,
+        27, 25, 23, 22, 22, 22, 33, 33, 33, 32, 32, 32, 30, 28, 26, 26, 26, 25,
+        23, 22, 22, 22, 34, 33, 33, 32, 32, 32, 30, 27, 26, 26, 26, 24, 23, 22,
+        22, 22, 34, 33, 32, 32, 32, 32, 29, 27, 26, 26, 26, 24, 23, 22, 22, 22,
+        34, 33, 32, 32, 32, 32, 29, 27, 26, 26, 26, 24, 23, 22, 22, 22, 34, 33,
+        32, 32, 32, 32, 29, 27, 26, 26, 26, 24, 23, 22, 22, 22, 33, 32, 31, 31,
+        31, 31, 28, 26, 25, 25, 25, 24, 23, 22, 22, 22, 31, 30, 30, 29, 29, 29,
+        28, 26, 24, 24, 24, 23, 22, 22, 22, 22, 31, 30, 29, 28, 28, 28, 27, 25,
+        24, 24, 24, 23, 22, 22, 22, 22, 31, 30, 29, 28, 28, 28, 27, 25, 24, 24,
+        24, 23, 22, 22, 22, 22, 31, 30, 29, 28, 28, 28, 27, 25, 24, 24, 24, 23,
+        22, 22, 22, 22, 29, 28, 28, 28, 28, 28, 26, 24, 23, 23, 23, 23, 22, 22,
+        22, 22, 28, 28, 27, 26, 26, 26, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22,
+        28, 27, 26, 26, 26, 26, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 28, 27,
+        26, 26, 26, 26, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 28, 27, 26, 26,
+        26, 26, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 26, 26, 26, 25, 25, 25,
+        24, 22, 22, 22, 22, 21, 21, 21, 21, 21, 25, 25, 24, 24, 24, 24, 23, 22,
+        22, 22, 22, 21, 21, 21, 21, 21, 24, 24, 24, 24, 24, 24, 23, 22, 22, 22,
+        22, 21, 21, 20, 20, 20, 24, 24, 24, 24, 24, 24, 23, 22, 22, 22, 22, 21,
+        21, 20, 20, 20, 24, 24, 24, 24, 24, 24, 23, 22, 22, 22, 22, 21, 21, 20,
+        20, 20, 23, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 21, 20, 20, 20, 20,
+        22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 20, 20, 20, 20, 21, 21,
+        22, 22, 22, 22, 22, 21, 21, 21, 21, 20, 20, 19, 19, 19, 21, 21, 22, 22,
+        22, 22, 22, 21, 21, 21, 21, 20, 20, 19, 19, 19, 21, 21, 22, 22, 22, 22,
+        22, 21, 21, 21, 21, 20, 20, 19, 19, 19, 21, 21, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 21, 20, 19, 19, 19,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 33, 31, 31, 31, 31, 29, 28,
+        28, 28, 28, 26, 25, 24, 24, 24, 23, 22, 21, 21, 21, 21, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 30, 30, 30, 30, 28, 28, 27, 27, 27, 26,
+        25, 24, 24, 24, 23, 22, 21, 21, 21, 21, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 31, 30, 29, 29, 29, 28, 27, 26, 26, 26, 26, 24, 24, 24, 24,
+        23, 22, 22, 22, 22, 22, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 31,
+        29, 28, 28, 28, 28, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 22, 22, 22,
+        22, 22, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 31, 29, 28, 28, 28,
+        28, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 22, 22, 22, 22, 22, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 31, 29, 28, 28, 28, 28, 26, 26, 26,
+        26, 25, 24, 24, 24, 24, 23, 22, 22, 22, 22, 22, 31, 31, 30, 30, 30, 30,
+        30, 30, 29, 29, 29, 28, 28, 27, 27, 27, 26, 24, 24, 24, 24, 24, 23, 23,
+        23, 23, 23, 22, 22, 22, 22, 22, 29, 28, 28, 28, 28, 28, 28, 27, 27, 27,
+        27, 26, 26, 25, 25, 25, 24, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22,
+        21, 21, 21, 22, 28, 28, 27, 27, 27, 27, 26, 26, 26, 26, 26, 25, 24, 24,
+        24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 22,
+        28, 28, 27, 27, 27, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 22, 28, 28, 27, 27,
+        27, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 21, 21, 21, 21, 22, 26, 25, 25, 25, 25, 25, 25, 24,
+        24, 24, 24, 24, 23, 23, 23, 23, 23, 22, 22, 22, 22, 21, 21, 21, 21, 21,
+        21, 21, 20, 20, 20, 21, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 21, 20, 20, 20, 20,
+        20, 20, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 19, 21, 21,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 21, 21, 20, 20, 20, 20, 20, 19, 19, 19, 19, 21, 21, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 20,
+        20, 20, 20, 20, 19, 19, 19, 19,
+        /* Size 4x16 */
+        33, 33, 28, 21, 33, 33, 27, 22, 33, 33, 27, 22, 33, 32, 26, 22, 33, 32,
+        26, 22, 33, 32, 26, 22, 30, 29, 24, 22, 30, 28, 24, 22, 28, 28, 23, 22,
+        27, 26, 22, 22, 27, 26, 22, 22, 25, 24, 22, 21, 24, 24, 22, 20, 23, 23,
+        22, 20, 21, 22, 21, 19, 21, 22, 21, 19,
+        /* Size 16x4 */
+        33, 33, 33, 33, 33, 33, 30, 30, 28, 27, 27, 25, 24, 23, 21, 21, 33, 33,
+        33, 32, 32, 32, 29, 28, 28, 26, 26, 24, 24, 23, 22, 22, 28, 27, 27, 26,
+        26, 26, 24, 24, 23, 22, 22, 22, 22, 22, 21, 21, 21, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 21, 20, 20, 19, 19,
+        /* Size 8x32 */
+        32, 33, 33, 31, 28, 28, 23, 21, 33, 33, 33, 31, 28, 28, 23, 21, 33, 33,
+        33, 30, 27, 27, 23, 22, 33, 33, 33, 30, 27, 27, 23, 22, 33, 33, 33, 30,
+        27, 27, 23, 22, 33, 33, 33, 30, 27, 27, 23, 22, 33, 33, 32, 30, 26, 26,
+        23, 22, 34, 33, 32, 30, 26, 26, 23, 22, 34, 32, 32, 29, 26, 26, 23, 22,
+        34, 32, 32, 29, 26, 26, 23, 22, 34, 32, 32, 29, 26, 26, 23, 22, 33, 31,
+        31, 28, 25, 25, 23, 22, 31, 30, 29, 28, 24, 24, 22, 22, 31, 29, 28, 27,
+        24, 24, 22, 22, 31, 29, 28, 27, 24, 24, 22, 22, 31, 29, 28, 27, 24, 24,
+        22, 22, 29, 28, 28, 26, 23, 23, 22, 22, 28, 27, 26, 24, 22, 22, 22, 22,
+        28, 26, 26, 24, 22, 22, 22, 22, 28, 26, 26, 24, 22, 22, 22, 22, 28, 26,
+        26, 24, 22, 22, 22, 22, 26, 26, 25, 24, 22, 22, 21, 21, 25, 24, 24, 23,
+        22, 22, 21, 21, 24, 24, 24, 23, 22, 22, 21, 20, 24, 24, 24, 23, 22, 22,
+        21, 20, 24, 24, 24, 23, 22, 22, 21, 20, 23, 23, 23, 23, 22, 22, 20, 20,
+        22, 22, 22, 22, 21, 21, 20, 20, 21, 22, 22, 22, 21, 21, 20, 19, 21, 22,
+        22, 22, 21, 21, 20, 19, 21, 22, 22, 22, 21, 21, 20, 19, 21, 22, 22, 22,
+        22, 22, 20, 19,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 33, 31, 31, 31, 31, 29, 28,
+        28, 28, 28, 26, 25, 24, 24, 24, 23, 22, 21, 21, 21, 21, 33, 33, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 31, 30, 29, 29, 29, 28, 27, 26, 26, 26, 26,
+        24, 24, 24, 24, 23, 22, 22, 22, 22, 22, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 31, 29, 28, 28, 28, 28, 26, 26, 26, 26, 25, 24, 24, 24, 24,
+        23, 22, 22, 22, 22, 22, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 29, 28,
+        28, 27, 27, 27, 26, 24, 24, 24, 24, 24, 23, 23, 23, 23, 23, 22, 22, 22,
+        22, 22, 28, 28, 27, 27, 27, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24,
+        23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 22, 28, 28,
+        27, 27, 27, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 23, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21, 22, 23, 23, 23, 23, 23, 23,
+        23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 21,
+        21, 21, 20, 20, 20, 20, 20, 20, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 20, 20, 20, 20, 20,
+        19, 19, 19, 19 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        33, 32, 32, 32, 32, 32, 32, 31, 32, 32, 31, 30, 32, 31, 30, 29,
+        /* Size 8x8 */
+        33, 33, 33, 33, 32, 32, 32, 31, 33, 32, 32, 32, 32, 32, 32, 31, 33, 32,
+        32, 32, 32, 32, 32, 31, 33, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 32,
+        31, 31, 30, 29, 32, 32, 32, 32, 31, 30, 30, 29, 32, 32, 32, 32, 30, 30,
+        29, 28, 31, 31, 31, 31, 29, 29, 28, 27,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 30, 33, 33,
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 30, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        31, 30, 33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 29,
+        33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 29, 33, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 29, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 31, 30, 29, 29, 29, 28, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 30, 29, 29, 29, 28, 28, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 30, 30, 29, 29, 29, 28, 28, 32, 31, 31, 31, 31, 31, 31, 31, 30, 30,
+        30, 29, 28, 28, 28, 27, 30, 30, 30, 30, 30, 31, 31, 30, 29, 29, 29, 28,
+        28, 28, 27, 26,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 30, 30, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        30, 30, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 30, 30, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 30, 30, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 31, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        31, 31, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 30, 30, 30, 30, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30,
+        30, 30, 29, 29, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 29,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 29, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31,
+        31, 30, 30, 30, 30, 30, 30, 29, 29, 29, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30,
+        30, 30, 30, 29, 29, 29, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 29, 29,
+        29, 29, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 30, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30,
+        30, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 28, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 29, 29,
+        29, 29, 29, 29, 28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29,
+        28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 28, 28,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 30,
+        30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 28, 28, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29,
+        29, 29, 28, 28, 28, 28, 28, 28, 27, 27, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 28,
+        28, 28, 28, 27, 27, 27, 30, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31,
+        31, 31, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28, 27, 27,
+        26, 26, 30, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 30, 30,
+        29, 29, 29, 29, 29, 29, 28, 28, 28, 28, 28, 28, 27, 27, 26, 26,
+        /* Size 4x8 */
+        33, 33, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 32, 32,
+        31, 30, 32, 32, 30, 30, 32, 31, 30, 29, 31, 31, 29, 28,
+        /* Size 8x4 */
+        33, 33, 32, 32, 32, 32, 32, 31, 33, 32, 32, 32, 32, 32, 31, 31, 32, 32,
+        32, 32, 31, 30, 30, 29, 32, 32, 32, 31, 30, 30, 29, 28,
+        /* Size 8x16 */
+        32, 33, 33, 33, 33, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 31, 33, 32,
+        32, 32, 32, 32, 32, 31, 33, 32, 32, 32, 32, 32, 32, 31, 33, 32, 32, 32,
+        32, 32, 32, 31, 33, 32, 32, 32, 32, 31, 31, 31, 33, 32, 32, 32, 32, 31,
+        31, 31, 33, 32, 32, 32, 32, 31, 31, 31, 33, 32, 32, 32, 31, 30, 30, 30,
+        32, 32, 32, 32, 31, 30, 30, 30, 32, 32, 32, 32, 31, 30, 30, 30, 32, 32,
+        32, 32, 31, 29, 29, 29, 32, 32, 31, 31, 30, 29, 29, 28, 32, 32, 31, 31,
+        30, 29, 29, 28, 32, 31, 31, 31, 30, 28, 28, 28, 30, 30, 30, 30, 29, 28,
+        28, 27,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 30, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 33, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 30, 30, 30, 29, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30,
+        30, 29, 29, 29, 28, 28, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 29,
+        29, 29, 28, 28, 32, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 29, 28, 28,
+        28, 27,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 30, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 31, 30, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 31, 31, 30, 33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 30, 30, 33, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 30, 30,
+        30, 29, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 29,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 29, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 29, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 30, 30, 30, 30, 30, 29, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 30, 30, 30, 30, 29, 29, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 30, 29, 29, 29, 29, 29, 28, 32, 32, 32, 32, 31, 31, 31, 31, 31, 30,
+        29, 29, 29, 29, 28, 28, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 29, 29,
+        29, 29, 28, 28, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 29, 29, 29, 29,
+        28, 28, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 29, 29, 29, 29, 28, 28,
+        32, 32, 32, 31, 31, 31, 31, 31, 30, 30, 29, 29, 29, 29, 28, 28, 32, 31,
+        31, 31, 31, 31, 31, 31, 30, 29, 28, 28, 28, 28, 28, 27, 31, 31, 31, 31,
+        31, 31, 31, 30, 30, 29, 28, 28, 28, 28, 28, 27, 30, 30, 30, 30, 30, 30,
+        30, 30, 29, 28, 28, 28, 28, 28, 27, 26, 30, 30, 30, 30, 30, 30, 30, 30,
+        29, 28, 28, 28, 28, 28, 27, 26,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 30, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        30, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 30, 30, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 30, 30, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 31, 31, 31, 30, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 30, 30, 30, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 29, 29, 28, 28, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30,
+        29, 29, 29, 29, 29, 29, 28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29,
+        29, 29, 28, 28, 28, 28, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28,
+        28, 28, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        30, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 28, 28, 32, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30,
+        30, 29, 29, 28, 28, 28, 28, 28, 28, 28, 27, 27, 30, 30, 30, 30, 30, 30,
+        30, 30, 30, 31, 31, 31, 31, 31, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28,
+        28, 28, 28, 28, 27, 27, 26, 26,
+        /* Size 4x16 */
+        33, 33, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32,
+        32, 32, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32, 31, 31, 32, 32, 31, 30,
+        32, 32, 31, 30, 32, 32, 31, 30, 32, 32, 30, 29, 32, 31, 30, 29, 32, 31,
+        30, 29, 31, 31, 29, 28, 30, 30, 28, 28,
+        /* Size 16x4 */
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 31, 30, 30, 30, 29, 28, 32, 32, 32, 32, 32, 31,
+        31, 31, 30, 30, 30, 29, 29, 29, 28, 28,
+        /* Size 8x32 */
+        32, 33, 33, 33, 33, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 31, 33, 33,
+        32, 32, 32, 32, 32, 31, 33, 32, 32, 32, 32, 32, 32, 31, 33, 32, 32, 32,
+        32, 32, 32, 31, 33, 32, 32, 32, 32, 32, 32, 31, 33, 32, 32, 32, 32, 32,
+        32, 31, 33, 32, 32, 32, 32, 32, 32, 31, 33, 32, 32, 32, 32, 32, 32, 31,
+        33, 32, 32, 32, 32, 32, 32, 31, 33, 32, 32, 32, 32, 31, 31, 31, 33, 32,
+        32, 32, 32, 31, 31, 31, 33, 32, 32, 32, 32, 31, 31, 31, 33, 32, 32, 32,
+        32, 31, 31, 31, 33, 32, 32, 32, 32, 31, 31, 31, 33, 32, 32, 32, 31, 31,
+        31, 30, 33, 32, 32, 32, 31, 30, 30, 30, 32, 32, 32, 32, 31, 30, 30, 30,
+        32, 32, 32, 32, 31, 30, 30, 30, 32, 32, 32, 32, 31, 30, 30, 30, 32, 32,
+        32, 32, 31, 30, 30, 30, 32, 32, 32, 32, 31, 30, 30, 29, 32, 32, 32, 32,
+        31, 29, 29, 29, 32, 32, 31, 31, 31, 29, 29, 28, 32, 32, 31, 31, 30, 29,
+        29, 28, 32, 32, 31, 31, 30, 29, 29, 28, 32, 32, 31, 31, 30, 29, 29, 28,
+        32, 32, 31, 31, 30, 29, 29, 28, 32, 31, 31, 31, 30, 28, 28, 28, 31, 31,
+        31, 31, 30, 28, 28, 28, 30, 30, 30, 30, 29, 28, 28, 27, 30, 30, 30, 30,
+        29, 28, 28, 27,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 31, 31, 30, 30, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        31, 31, 31, 31, 30, 30, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31,
+        30, 30, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30,
+        30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 28, 28, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29,
+        29, 29, 29, 29, 28, 28, 28, 28, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 28, 28, 28, 28, 28,
+        28, 28, 27, 27 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 33, 30, 27, 33, 32, 29, 26, 30, 29, 26, 24, 27, 26, 24, 22,
+        /* Size 8x8 */
+        33, 33, 33, 34, 30, 29, 28, 26, 33, 33, 33, 33, 30, 29, 27, 25, 33, 33,
+        33, 33, 29, 28, 26, 25, 34, 33, 33, 32, 29, 28, 26, 24, 30, 30, 29, 29,
+        26, 26, 24, 23, 29, 29, 28, 28, 26, 25, 23, 23, 28, 27, 26, 26, 24, 23,
+        22, 22, 26, 25, 25, 24, 23, 23, 22, 21,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 34, 34, 33, 31, 31, 31, 29, 28, 28, 27, 25, 33, 33,
+        33, 33, 33, 33, 33, 33, 31, 30, 30, 28, 28, 28, 26, 24, 33, 33, 33, 33,
+        33, 33, 33, 32, 30, 30, 30, 28, 27, 27, 26, 24, 33, 33, 33, 33, 33, 33,
+        33, 32, 30, 30, 30, 28, 27, 27, 26, 24, 33, 33, 33, 33, 33, 33, 33, 32,
+        30, 29, 29, 28, 26, 26, 26, 24, 34, 33, 33, 33, 33, 32, 32, 32, 30, 29,
+        29, 27, 26, 26, 25, 24, 34, 33, 33, 33, 33, 32, 32, 32, 30, 29, 29, 27,
+        26, 26, 25, 24, 33, 33, 32, 32, 32, 32, 32, 31, 29, 28, 28, 27, 26, 26,
+        25, 24, 31, 31, 30, 30, 30, 30, 30, 29, 28, 27, 27, 25, 24, 24, 24, 23,
+        31, 30, 30, 30, 29, 29, 29, 28, 27, 26, 26, 25, 24, 24, 23, 23, 31, 30,
+        30, 30, 29, 29, 29, 28, 27, 26, 26, 25, 24, 24, 23, 23, 29, 28, 28, 28,
+        28, 27, 27, 27, 25, 25, 25, 23, 22, 22, 22, 22, 28, 28, 27, 27, 26, 26,
+        26, 26, 24, 24, 24, 22, 22, 22, 22, 22, 28, 28, 27, 27, 26, 26, 26, 26,
+        24, 24, 24, 22, 22, 22, 22, 22, 27, 26, 26, 26, 26, 25, 25, 25, 24, 23,
+        23, 22, 22, 22, 22, 21, 25, 24, 24, 24, 24, 24, 24, 24, 23, 23, 23, 22,
+        22, 22, 21, 21,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 33, 32, 31, 31,
+        31, 31, 31, 30, 29, 28, 28, 28, 28, 28, 27, 26, 25, 25, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 33, 32, 31, 30, 30, 30, 30, 29,
+        28, 28, 28, 28, 28, 28, 26, 26, 24, 24, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 30, 30, 30, 29, 28, 28, 28, 28,
+        28, 27, 26, 26, 24, 24, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 30, 30, 30, 30, 30, 29, 28, 27, 27, 27, 27, 27, 26, 25,
+        24, 24, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31,
+        30, 30, 30, 30, 30, 29, 28, 27, 27, 27, 27, 26, 26, 25, 24, 24, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 30, 30, 30,
+        30, 29, 28, 27, 27, 27, 27, 26, 26, 25, 24, 24, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 30, 30, 30, 30, 29, 28, 27,
+        27, 27, 27, 26, 26, 25, 24, 24, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 32, 31, 30, 30, 30, 30, 30, 28, 28, 27, 27, 27, 27, 26,
+        26, 25, 24, 24, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 31, 30, 29, 29, 29, 29, 28, 28, 27, 26, 26, 26, 26, 26, 25, 24, 24,
+        34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 29,
+        29, 29, 29, 28, 28, 26, 26, 26, 26, 26, 26, 25, 24, 24, 34, 34, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 31, 30, 29, 29, 29, 29, 28,
+        27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 34, 34, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 31, 30, 29, 29, 29, 29, 28, 27, 26, 26, 26,
+        26, 26, 25, 24, 24, 24, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 31, 30, 29, 29, 29, 29, 28, 27, 26, 26, 26, 26, 26, 25, 24,
+        24, 24, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 31,
+        30, 29, 29, 29, 29, 28, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 29, 28, 28, 28,
+        28, 28, 27, 26, 26, 26, 26, 25, 25, 24, 24, 24, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 30, 29, 28, 28, 28, 28, 28, 27, 26, 25,
+        25, 25, 25, 24, 24, 24, 24, 24, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30,
+        30, 30, 30, 30, 29, 28, 28, 27, 27, 27, 27, 26, 25, 24, 24, 24, 24, 24,
+        24, 23, 23, 23, 31, 30, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29,
+        28, 28, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 24, 23, 23, 23, 23,
+        31, 30, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 27, 26,
+        26, 26, 26, 26, 25, 24, 24, 24, 24, 24, 23, 23, 23, 23, 31, 30, 30, 30,
+        30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 28, 28, 27, 26, 26, 26, 26, 26,
+        25, 24, 24, 24, 24, 24, 23, 23, 23, 23, 31, 30, 30, 30, 30, 30, 30, 30,
+        29, 29, 29, 29, 29, 29, 28, 28, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24,
+        24, 24, 23, 23, 23, 23, 30, 29, 29, 29, 29, 29, 29, 28, 28, 28, 28, 28,
+        28, 28, 28, 27, 26, 26, 26, 26, 26, 25, 24, 23, 23, 23, 23, 23, 23, 23,
+        23, 23, 29, 28, 28, 28, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 27, 26,
+        25, 25, 25, 25, 25, 24, 23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 28, 28,
+        28, 27, 27, 27, 27, 27, 27, 26, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24,
+        24, 23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 28, 28, 28, 27, 27, 27,
+        27, 27, 26, 26, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 24, 23, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 28, 28, 28, 27, 27, 27, 27, 27, 26, 26,
+        26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 28, 28, 28, 27, 27, 27, 27, 27, 26, 26, 26, 26, 26, 26,
+        26, 25, 24, 24, 24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+        28, 28, 27, 27, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 25, 24, 24, 24,
+        24, 24, 24, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 27, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 25, 25, 25, 25, 25, 24, 24, 23, 23, 23, 23, 23,
+        22, 22, 22, 22, 22, 22, 22, 21, 21, 21, 26, 26, 26, 25, 25, 25, 25, 25,
+        25, 25, 24, 24, 24, 24, 24, 24, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22,
+        22, 22, 21, 21, 21, 21, 25, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+        24, 24, 24, 24, 23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22, 21, 21,
+        21, 21, 25, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+        23, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22, 21, 21, 21, 21,
+        /* Size 4x8 */
+        33, 33, 29, 28, 33, 33, 28, 27, 33, 32, 28, 26, 33, 32, 28, 26, 30, 28,
+        26, 24, 29, 28, 24, 23, 27, 26, 23, 22, 25, 24, 23, 22,
+        /* Size 8x4 */
+        33, 33, 33, 33, 30, 29, 27, 25, 33, 33, 32, 32, 28, 28, 26, 24, 29, 28,
+        28, 28, 26, 24, 23, 23, 28, 27, 26, 26, 24, 23, 22, 22,
+        /* Size 8x16 */
+        32, 33, 33, 33, 31, 28, 28, 27, 33, 33, 33, 33, 31, 27, 27, 26, 33, 33,
+        33, 33, 30, 27, 27, 26, 33, 33, 33, 33, 30, 27, 27, 26, 33, 33, 32, 32,
+        30, 26, 26, 26, 34, 33, 32, 32, 29, 26, 26, 25, 34, 33, 32, 32, 29, 26,
+        26, 25, 33, 32, 31, 31, 29, 26, 26, 25, 31, 30, 29, 29, 28, 24, 24, 24,
+        31, 29, 28, 28, 27, 24, 24, 23, 31, 29, 28, 28, 27, 24, 24, 23, 29, 28,
+        27, 27, 25, 23, 23, 22, 28, 26, 26, 26, 24, 22, 22, 22, 28, 26, 26, 26,
+        24, 22, 22, 22, 26, 26, 25, 25, 24, 22, 22, 22, 24, 24, 24, 24, 23, 22,
+        22, 21,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 34, 34, 33, 31, 31, 31, 29, 28, 28, 26, 24, 33, 33,
+        33, 33, 33, 33, 33, 32, 30, 29, 29, 28, 26, 26, 26, 24, 33, 33, 33, 33,
+        32, 32, 32, 31, 29, 28, 28, 27, 26, 26, 25, 24, 33, 33, 33, 33, 32, 32,
+        32, 31, 29, 28, 28, 27, 26, 26, 25, 24, 31, 31, 30, 30, 30, 29, 29, 29,
+        28, 27, 27, 25, 24, 24, 24, 23, 28, 27, 27, 27, 26, 26, 26, 26, 24, 24,
+        24, 23, 22, 22, 22, 22, 28, 27, 27, 27, 26, 26, 26, 26, 24, 24, 24, 23,
+        22, 22, 22, 22, 27, 26, 26, 26, 26, 25, 25, 25, 24, 23, 23, 22, 22, 22,
+        22, 21,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 31, 29, 28, 28, 28, 28, 27, 24, 33, 33,
+        33, 33, 33, 33, 33, 33, 31, 29, 28, 28, 28, 28, 26, 24, 33, 33, 33, 33,
+        33, 33, 33, 32, 31, 29, 27, 27, 27, 27, 26, 24, 33, 33, 33, 33, 33, 33,
+        33, 32, 30, 28, 27, 27, 27, 27, 26, 24, 33, 33, 33, 33, 33, 33, 33, 32,
+        30, 28, 27, 27, 27, 27, 26, 24, 33, 33, 33, 33, 33, 33, 33, 32, 30, 28,
+        27, 27, 27, 27, 26, 24, 33, 33, 33, 33, 33, 33, 33, 32, 30, 28, 27, 27,
+        27, 27, 26, 24, 33, 33, 33, 33, 33, 33, 33, 32, 30, 28, 27, 27, 27, 27,
+        26, 24, 33, 33, 33, 33, 32, 32, 32, 32, 30, 28, 26, 26, 26, 26, 26, 24,
+        34, 33, 33, 32, 32, 32, 32, 32, 30, 28, 26, 26, 26, 26, 26, 24, 34, 33,
+        33, 32, 32, 32, 32, 31, 29, 28, 26, 26, 26, 26, 25, 24, 34, 33, 33, 32,
+        32, 32, 32, 31, 29, 28, 26, 26, 26, 26, 25, 24, 34, 33, 33, 32, 32, 32,
+        32, 31, 29, 28, 26, 26, 26, 26, 25, 24, 34, 33, 33, 32, 32, 32, 32, 31,
+        29, 28, 26, 26, 26, 26, 25, 24, 33, 33, 32, 32, 31, 31, 31, 31, 29, 27,
+        26, 26, 26, 26, 25, 24, 32, 32, 31, 31, 30, 30, 30, 30, 28, 26, 25, 25,
+        25, 25, 24, 23, 31, 31, 30, 29, 29, 29, 29, 29, 28, 26, 24, 24, 24, 24,
+        24, 23, 31, 30, 29, 29, 28, 28, 28, 28, 27, 26, 24, 24, 24, 24, 23, 23,
+        31, 30, 29, 29, 28, 28, 28, 28, 27, 26, 24, 24, 24, 24, 23, 23, 31, 30,
+        29, 29, 28, 28, 28, 28, 27, 26, 24, 24, 24, 24, 23, 23, 31, 30, 29, 29,
+        28, 28, 28, 28, 27, 26, 24, 24, 24, 24, 23, 23, 30, 29, 28, 28, 28, 28,
+        28, 28, 26, 24, 23, 23, 23, 23, 23, 23, 29, 28, 28, 27, 27, 27, 27, 26,
+        25, 24, 23, 23, 23, 23, 22, 22, 28, 28, 27, 26, 26, 26, 26, 26, 24, 23,
+        22, 22, 22, 22, 22, 22, 28, 27, 26, 26, 26, 26, 26, 25, 24, 23, 22, 22,
+        22, 22, 22, 22, 28, 27, 26, 26, 26, 26, 26, 25, 24, 23, 22, 22, 22, 22,
+        22, 22, 28, 27, 26, 26, 26, 26, 26, 25, 24, 23, 22, 22, 22, 22, 22, 22,
+        28, 27, 26, 26, 26, 26, 26, 25, 24, 23, 22, 22, 22, 22, 22, 22, 26, 26,
+        26, 25, 25, 25, 25, 24, 24, 23, 22, 22, 22, 22, 22, 21, 26, 25, 25, 24,
+        24, 24, 24, 24, 23, 23, 22, 22, 22, 22, 22, 21, 24, 24, 24, 24, 24, 24,
+        24, 24, 23, 22, 22, 22, 22, 22, 21, 21, 24, 24, 24, 24, 24, 24, 24, 24,
+        23, 22, 22, 22, 22, 22, 21, 21,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 33, 32, 31, 31,
+        31, 31, 31, 30, 29, 28, 28, 28, 28, 28, 26, 26, 24, 24, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 30, 30, 30, 29,
+        28, 28, 27, 27, 27, 27, 26, 25, 24, 24, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 31, 30, 29, 29, 29, 29, 28, 28, 27, 26, 26,
+        26, 26, 26, 25, 24, 24, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 31, 29, 29, 29, 29, 29, 28, 27, 26, 26, 26, 26, 26, 25, 24,
+        24, 24, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 31, 30,
+        29, 28, 28, 28, 28, 28, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 31, 30, 29, 28, 28, 28,
+        28, 28, 27, 26, 26, 26, 26, 26, 25, 24, 24, 24, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 31, 30, 29, 28, 28, 28, 28, 28, 27, 26,
+        26, 26, 26, 26, 25, 24, 24, 24, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 30, 29, 28, 28, 28, 28, 28, 26, 26, 25, 25, 25, 25,
+        24, 24, 24, 24, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29,
+        29, 28, 28, 27, 27, 27, 27, 26, 25, 24, 24, 24, 24, 24, 24, 23, 23, 23,
+        29, 29, 29, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 27, 26, 26, 26,
+        26, 26, 26, 24, 24, 23, 23, 23, 23, 23, 23, 23, 22, 22, 28, 28, 27, 27,
+        27, 27, 27, 27, 26, 26, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 24, 23,
+        23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 28, 28, 27, 27, 27, 27, 27, 27,
+        26, 26, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 24, 23, 23, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 28, 28, 27, 27, 27, 27, 27, 27, 26, 26, 26, 26,
+        26, 26, 26, 25, 24, 24, 24, 24, 24, 23, 23, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 28, 28, 27, 27, 27, 27, 27, 27, 26, 26, 26, 26, 26, 26, 26, 25,
+        24, 24, 24, 24, 24, 23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 27, 26,
+        26, 26, 26, 26, 26, 26, 26, 26, 25, 25, 25, 25, 25, 24, 24, 23, 23, 23,
+        23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 21, 21, 24, 24, 24, 24, 24, 24,
+        24, 24, 24, 24, 24, 24, 24, 24, 24, 23, 23, 23, 23, 23, 23, 23, 22, 22,
+        22, 22, 22, 22, 21, 21, 21, 21,
+        /* Size 4x16 */
+        33, 33, 29, 28, 33, 33, 29, 27, 33, 33, 28, 27, 33, 33, 28, 27, 33, 32,
+        28, 26, 33, 32, 28, 26, 33, 32, 28, 26, 33, 31, 27, 26, 31, 29, 26, 24,
+        30, 28, 26, 24, 30, 28, 26, 24, 28, 27, 24, 23, 27, 26, 23, 22, 27, 26,
+        23, 22, 26, 25, 23, 22, 24, 24, 22, 22,
+        /* Size 16x4 */
+        33, 33, 33, 33, 33, 33, 33, 33, 31, 30, 30, 28, 27, 27, 26, 24, 33, 33,
+        33, 33, 32, 32, 32, 31, 29, 28, 28, 27, 26, 26, 25, 24, 29, 29, 28, 28,
+        28, 28, 28, 27, 26, 26, 26, 24, 23, 23, 23, 22, 28, 27, 27, 27, 26, 26,
+        26, 26, 24, 24, 24, 23, 22, 22, 22, 22,
+        /* Size 8x32 */
+        32, 33, 33, 33, 31, 28, 28, 27, 33, 33, 33, 33, 31, 28, 28, 26, 33, 33,
+        33, 33, 31, 27, 27, 26, 33, 33, 33, 33, 30, 27, 27, 26, 33, 33, 33, 33,
+        30, 27, 27, 26, 33, 33, 33, 33, 30, 27, 27, 26, 33, 33, 33, 33, 30, 27,
+        27, 26, 33, 33, 33, 33, 30, 27, 27, 26, 33, 33, 32, 32, 30, 26, 26, 26,
+        34, 33, 32, 32, 30, 26, 26, 26, 34, 33, 32, 32, 29, 26, 26, 25, 34, 33,
+        32, 32, 29, 26, 26, 25, 34, 33, 32, 32, 29, 26, 26, 25, 34, 33, 32, 32,
+        29, 26, 26, 25, 33, 32, 31, 31, 29, 26, 26, 25, 32, 31, 30, 30, 28, 25,
+        25, 24, 31, 30, 29, 29, 28, 24, 24, 24, 31, 29, 28, 28, 27, 24, 24, 23,
+        31, 29, 28, 28, 27, 24, 24, 23, 31, 29, 28, 28, 27, 24, 24, 23, 31, 29,
+        28, 28, 27, 24, 24, 23, 30, 28, 28, 28, 26, 23, 23, 23, 29, 28, 27, 27,
+        25, 23, 23, 22, 28, 27, 26, 26, 24, 22, 22, 22, 28, 26, 26, 26, 24, 22,
+        22, 22, 28, 26, 26, 26, 24, 22, 22, 22, 28, 26, 26, 26, 24, 22, 22, 22,
+        28, 26, 26, 26, 24, 22, 22, 22, 26, 26, 25, 25, 24, 22, 22, 22, 26, 25,
+        24, 24, 23, 22, 22, 22, 24, 24, 24, 24, 23, 22, 22, 21, 24, 24, 24, 24,
+        23, 22, 22, 21,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 33, 32, 31, 31,
+        31, 31, 31, 30, 29, 28, 28, 28, 28, 28, 26, 26, 24, 24, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 29, 29, 29, 29, 28,
+        28, 27, 26, 26, 26, 26, 26, 25, 24, 24, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 31, 30, 29, 28, 28, 28, 28, 28, 27, 26, 26, 26,
+        26, 26, 25, 24, 24, 24, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 31, 30, 29, 28, 28, 28, 28, 28, 27, 26, 26, 26, 26, 26, 25, 24,
+        24, 24, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 28,
+        28, 27, 27, 27, 27, 26, 25, 24, 24, 24, 24, 24, 24, 23, 23, 23, 28, 28,
+        27, 27, 27, 27, 27, 27, 26, 26, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24,
+        24, 23, 23, 22, 22, 22, 22, 22, 22, 22, 22, 22, 28, 28, 27, 27, 27, 27,
+        27, 27, 26, 26, 26, 26, 26, 26, 26, 25, 24, 24, 24, 24, 24, 23, 23, 22,
+        22, 22, 22, 22, 22, 22, 22, 22, 27, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+        25, 25, 25, 25, 25, 24, 24, 23, 23, 23, 23, 23, 22, 22, 22, 22, 22, 22,
+        22, 22, 21, 21 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        33, 33, 33, 32, 33, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 31,
+        /* Size 8x8 */
+        33, 33, 33, 33, 33, 33, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32,
+        32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32,
+        32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 32, 32, 32, 32, 32, 32, 31, 31,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 31,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31,
+        31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        /* Size 4x8 */
+        33, 33, 33, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32,
+        32, 32, 33, 32, 32, 31, 32, 32, 32, 31, 32, 32, 32, 31,
+        /* Size 8x4 */
+        33, 33, 33, 33, 33, 33, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        /* Size 8x16 */
+        32, 33, 33, 33, 33, 33, 33, 32, 33, 33, 33, 33, 33, 33, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32,
+        32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32,
+        32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32,
+        33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32,
+        32, 32, 32, 32, 31, 31, 33, 32, 32, 32, 32, 32, 31, 31, 32, 32, 32, 32,
+        32, 32, 31, 30, 32, 32, 32, 32, 32, 32, 31, 30, 32, 32, 32, 32, 32, 32,
+        31, 30,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30,
+        30, 30,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 31, 31, 30, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31,
+        30, 30, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 30, 30, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 31, 30, 30,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31,
+        31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+        30, 30, 30, 30, 30, 30, 30, 30,
+        /* Size 4x16 */
+        33, 33, 33, 32, 33, 33, 33, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32,
+        32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32,
+        33, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 31, 32, 32, 32, 31, 32, 32,
+        32, 31, 32, 32, 32, 31, 32, 32, 32, 31,
+        /* Size 16x4 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 31, 31, 31,
+        /* Size 8x32 */
+        32, 33, 33, 33, 33, 33, 33, 32, 33, 33, 33, 33, 33, 33, 32, 32, 33, 33,
+        33, 33, 33, 33, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32,
+        32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32,
+        33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32,
+        32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32,
+        32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32,
+        32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32,
+        33, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 32, 33, 32,
+        32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32, 32, 31, 33, 32, 32, 32,
+        32, 32, 31, 31, 33, 32, 32, 32, 32, 32, 31, 31, 33, 32, 32, 32, 32, 32,
+        31, 31, 32, 32, 32, 32, 32, 32, 31, 30, 32, 32, 32, 32, 32, 32, 31, 30,
+        32, 32, 32, 32, 32, 32, 31, 30, 32, 32, 32, 32, 32, 32, 31, 30, 32, 32,
+        32, 32, 32, 32, 31, 30, 32, 32, 32, 32, 32, 32, 31, 30, 32, 32, 32, 32,
+        32, 32, 31, 30,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31, 30, 30, 30,
+        30, 30, 30, 30 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 33, 33, 30, 33, 33, 33, 29, 33, 33, 32, 29, 30, 29, 29, 26,
+        /* Size 8x8 */
+        33, 33, 33, 33, 34, 33, 31, 31, 33, 33, 33, 33, 33, 32, 30, 30, 33, 33,
+        33, 33, 33, 32, 30, 30, 33, 33, 33, 33, 33, 32, 29, 29, 34, 33, 33, 33,
+        32, 32, 29, 29, 33, 32, 32, 32, 32, 31, 28, 28, 31, 30, 30, 29, 29, 28,
+        26, 26, 31, 30, 30, 29, 29, 28, 26, 26,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 33, 31, 31, 31, 31, 33, 33,
+        33, 33, 33, 33, 33, 33, 34, 34, 34, 32, 31, 30, 30, 30, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 30, 30, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 30, 30, 30, 30, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 30, 30, 30, 30, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 30, 30, 30, 30, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31,
+        30, 29, 29, 29, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 30, 29,
+        29, 29, 34, 34, 33, 33, 33, 33, 33, 33, 32, 32, 32, 31, 30, 29, 29, 29,
+        34, 34, 33, 33, 33, 33, 33, 33, 32, 32, 32, 31, 30, 29, 29, 29, 34, 34,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 31, 30, 29, 29, 29, 33, 32, 32, 32,
+        32, 32, 31, 31, 31, 31, 31, 30, 28, 28, 28, 28, 31, 31, 31, 30, 30, 30,
+        30, 30, 30, 30, 30, 28, 28, 27, 27, 27, 31, 30, 30, 30, 30, 30, 29, 29,
+        29, 29, 29, 28, 27, 26, 26, 26, 31, 30, 30, 30, 30, 30, 29, 29, 29, 29,
+        29, 28, 27, 26, 26, 26, 31, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 28,
+        27, 26, 26, 26,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34,
+        34, 34, 34, 33, 33, 32, 31, 31, 31, 31, 31, 31, 31, 30, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 33,
+        33, 32, 31, 31, 31, 31, 31, 31, 31, 30, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 33, 32, 32, 31, 30,
+        30, 30, 30, 30, 30, 30, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 31, 30, 30, 30, 30, 30,
+        30, 29, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 31, 31, 30, 30, 30, 30, 30, 30, 29, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 31, 30, 30, 30, 30, 30, 30, 30, 29, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 31,
+        30, 30, 30, 30, 30, 30, 30, 29, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 31, 30, 30, 30, 30,
+        30, 30, 30, 29, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 31, 30, 30, 30, 30, 30, 30, 30, 29,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 32, 31, 30, 30, 30, 30, 30, 30, 30, 29, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32,
+        32, 31, 30, 30, 30, 30, 30, 30, 30, 29, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 31, 30, 29,
+        29, 29, 29, 29, 29, 29, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 31, 30, 29, 29, 29, 29, 29,
+        29, 29, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 31, 31, 30, 29, 29, 29, 29, 29, 29, 28, 34, 34,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 31, 30, 30, 29, 29, 29, 29, 29, 29, 28, 34, 34, 34, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 30,
+        30, 29, 29, 29, 29, 29, 29, 28, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 29,
+        29, 29, 29, 28, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 29, 29, 29, 29, 28,
+        34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 31, 30, 30, 29, 29, 29, 29, 29, 29, 28, 34, 34, 34, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        31, 30, 30, 29, 29, 29, 29, 29, 29, 28, 34, 34, 34, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29,
+        29, 29, 29, 29, 29, 28, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 28, 28, 28, 28, 28,
+        28, 28, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 31, 31,
+        31, 31, 31, 31, 31, 30, 30, 29, 28, 28, 28, 28, 28, 28, 28, 28, 32, 32,
+        32, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30,
+        30, 30, 29, 28, 28, 28, 28, 28, 28, 28, 28, 27, 31, 31, 31, 31, 31, 30,
+        30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 29, 28, 28,
+        28, 27, 27, 27, 27, 27, 27, 26, 31, 31, 30, 30, 30, 30, 30, 30, 30, 30,
+        30, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 28, 28, 28, 27, 26, 26, 26,
+        26, 26, 26, 26, 31, 31, 30, 30, 30, 30, 30, 30, 30, 30, 30, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 28, 28, 28, 27, 26, 26, 26, 26, 26, 26, 26,
+        31, 31, 30, 30, 30, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 28, 28, 28, 27, 26, 26, 26, 26, 26, 26, 26, 31, 31, 30, 30,
+        30, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 28,
+        28, 28, 27, 26, 26, 26, 26, 26, 26, 26, 31, 31, 30, 30, 30, 30, 30, 30,
+        30, 30, 30, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 28, 28, 28, 27, 26,
+        26, 26, 26, 26, 26, 26, 31, 31, 30, 30, 30, 30, 30, 30, 30, 30, 30, 29,
+        29, 29, 29, 29, 29, 29, 29, 29, 29, 28, 28, 28, 27, 26, 26, 26, 26, 26,
+        26, 26, 30, 30, 30, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 28, 28, 28,
+        28, 28, 28, 28, 28, 28, 28, 27, 26, 26, 26, 26, 26, 26, 26, 26,
+        /* Size 4x8 */
+        33, 33, 33, 30, 33, 33, 33, 29, 33, 33, 33, 29, 33, 32, 32, 28, 33, 32,
+        32, 28, 33, 31, 31, 28, 30, 28, 28, 26, 30, 28, 28, 26,
+        /* Size 8x4 */
+        33, 33, 33, 33, 33, 33, 30, 30, 33, 33, 33, 32, 32, 31, 28, 28, 33, 33,
+        33, 32, 32, 31, 28, 28, 30, 29, 29, 28, 28, 28, 26, 26,
+        /* Size 8x16 */
+        32, 33, 33, 33, 33, 33, 31, 29, 33, 33, 33, 33, 33, 33, 31, 28, 33, 33,
+        33, 33, 33, 33, 30, 28, 33, 33, 33, 33, 33, 33, 30, 28, 33, 33, 33, 33,
+        33, 33, 30, 28, 33, 33, 33, 33, 33, 33, 30, 28, 33, 33, 33, 32, 32, 32,
+        30, 28, 34, 33, 33, 32, 32, 32, 30, 27, 34, 33, 32, 32, 32, 32, 29, 27,
+        34, 33, 32, 32, 32, 32, 29, 27, 34, 33, 32, 32, 32, 32, 29, 27, 33, 32,
+        31, 31, 31, 31, 28, 26, 31, 30, 30, 29, 29, 29, 28, 26, 31, 30, 29, 28,
+        28, 28, 27, 25, 31, 30, 29, 28, 28, 28, 27, 25, 31, 30, 29, 28, 28, 28,
+        27, 25,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 33, 31, 31, 31, 31, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 30, 30, 30, 30, 33, 33, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 31, 30, 29, 29, 29, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 31, 29, 28, 28, 28, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 31, 29, 28, 28, 28, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 31, 29, 28, 28, 28, 31, 31, 30, 30, 30, 30, 30, 30, 29, 29, 29, 28,
+        28, 27, 27, 27, 29, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 26, 26, 25,
+        25, 25,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 29, 28, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 29, 28, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 28, 28, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 31, 29, 28, 27, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 30, 29, 28, 27, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 31, 30, 29, 28, 27, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31,
+        30, 29, 28, 27, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 30, 29,
+        28, 27, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 30, 29, 28, 27,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 30, 29, 28, 27, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 31, 30, 29, 28, 27, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 31, 30, 29, 28, 27, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 31, 30, 28, 28, 26, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 31, 30, 28, 28, 26, 34, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 31, 30, 28, 27, 26, 34, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31,
+        29, 28, 27, 26, 34, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 29, 28,
+        27, 26, 34, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 29, 28, 27, 26,
+        34, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 29, 28, 27, 26, 34, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 29, 28, 27, 26, 34, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 31, 29, 28, 27, 26, 33, 33, 33, 32, 32, 31,
+        31, 31, 31, 31, 31, 30, 29, 28, 27, 26, 33, 32, 32, 31, 31, 31, 31, 31,
+        31, 31, 31, 29, 28, 28, 26, 25, 32, 32, 31, 31, 30, 30, 30, 30, 30, 30,
+        30, 29, 28, 27, 26, 25, 31, 31, 30, 30, 30, 29, 29, 29, 29, 29, 29, 28,
+        28, 26, 26, 24, 31, 30, 30, 29, 29, 28, 28, 28, 28, 28, 28, 28, 27, 26,
+        25, 24, 31, 30, 30, 29, 29, 28, 28, 28, 28, 28, 28, 28, 27, 26, 25, 24,
+        31, 30, 30, 29, 29, 28, 28, 28, 28, 28, 28, 28, 27, 26, 25, 24, 31, 30,
+        30, 29, 29, 28, 28, 28, 28, 28, 28, 28, 27, 26, 25, 24, 31, 30, 30, 29,
+        29, 28, 28, 28, 28, 28, 28, 28, 27, 26, 25, 24, 31, 30, 30, 29, 29, 28,
+        28, 28, 28, 28, 28, 28, 27, 26, 25, 24, 30, 30, 29, 29, 28, 28, 28, 28,
+        28, 28, 28, 27, 26, 26, 24, 23,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34,
+        34, 34, 34, 33, 33, 32, 31, 31, 31, 31, 31, 31, 31, 30, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 32, 31, 30, 30, 30, 30, 30, 30, 30, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 30,
+        30, 30, 30, 30, 30, 29, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 31, 30, 29, 29, 29, 29, 29,
+        29, 29, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 31, 30, 30, 29, 29, 29, 29, 29, 29, 28, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 29, 28, 28, 28, 28, 28, 28, 28, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30,
+        29, 28, 28, 28, 28, 28, 28, 28, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 29, 28, 28, 28,
+        28, 28, 28, 28, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 29, 28, 28, 28, 28, 28, 28, 28,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 31, 31, 30, 29, 28, 28, 28, 28, 28, 28, 28, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 31,
+        31, 30, 29, 28, 28, 28, 28, 28, 28, 28, 32, 32, 32, 32, 32, 31, 31, 31,
+        31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 30, 29, 29, 28, 28,
+        28, 28, 28, 28, 28, 27, 31, 31, 31, 31, 30, 30, 30, 30, 30, 30, 30, 30,
+        30, 30, 30, 29, 29, 29, 29, 29, 29, 29, 28, 28, 28, 27, 27, 27, 27, 27,
+        27, 26, 30, 30, 30, 29, 29, 29, 29, 29, 29, 29, 29, 29, 28, 28, 28, 28,
+        28, 28, 28, 28, 28, 28, 28, 27, 26, 26, 26, 26, 26, 26, 26, 26, 29, 29,
+        28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 27, 27, 27, 27, 27, 27,
+        27, 27, 26, 26, 26, 25, 25, 25, 25, 25, 25, 24, 28, 28, 28, 27, 27, 27,
+        27, 27, 27, 27, 27, 27, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 25, 25,
+        24, 24, 24, 24, 24, 24, 24, 23,
+        /* Size 4x16 */
+        33, 33, 33, 30, 33, 33, 33, 30, 33, 33, 33, 29, 33, 33, 33, 29, 33, 33,
+        33, 29, 33, 33, 33, 29, 33, 32, 32, 28, 33, 32, 32, 28, 33, 32, 32, 28,
+        33, 32, 32, 28, 33, 32, 32, 28, 32, 31, 31, 28, 31, 29, 29, 26, 30, 28,
+        28, 26, 30, 28, 28, 26, 30, 28, 28, 26,
+        /* Size 16x4 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 31, 30, 30, 30, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 31, 29, 28, 28, 28, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 31, 29, 28, 28, 28, 30, 30, 29, 29, 29, 29,
+        28, 28, 28, 28, 28, 28, 26, 26, 26, 26,
+        /* Size 8x32 */
+        32, 33, 33, 33, 33, 33, 31, 29, 33, 33, 33, 33, 33, 33, 31, 29, 33, 33,
+        33, 33, 33, 33, 31, 28, 33, 33, 33, 33, 33, 33, 31, 28, 33, 33, 33, 33,
+        33, 33, 30, 28, 33, 33, 33, 33, 33, 33, 30, 28, 33, 33, 33, 33, 33, 33,
+        30, 28, 33, 33, 33, 33, 33, 33, 30, 28, 33, 33, 33, 33, 33, 33, 30, 28,
+        33, 33, 33, 33, 33, 33, 30, 28, 33, 33, 33, 33, 33, 33, 30, 28, 33, 33,
+        33, 33, 33, 33, 30, 28, 33, 33, 33, 32, 32, 32, 30, 28, 33, 33, 33, 32,
+        32, 32, 30, 28, 34, 33, 33, 32, 32, 32, 30, 27, 34, 33, 32, 32, 32, 32,
+        29, 27, 34, 33, 32, 32, 32, 32, 29, 27, 34, 33, 32, 32, 32, 32, 29, 27,
+        34, 33, 32, 32, 32, 32, 29, 27, 34, 33, 32, 32, 32, 32, 29, 27, 34, 33,
+        32, 32, 32, 32, 29, 27, 33, 33, 32, 31, 31, 31, 29, 27, 33, 32, 31, 31,
+        31, 31, 28, 26, 32, 31, 30, 30, 30, 30, 28, 26, 31, 30, 30, 29, 29, 29,
+        28, 26, 31, 30, 29, 28, 28, 28, 27, 25, 31, 30, 29, 28, 28, 28, 27, 25,
+        31, 30, 29, 28, 28, 28, 27, 25, 31, 30, 29, 28, 28, 28, 27, 25, 31, 30,
+        29, 28, 28, 28, 27, 25, 31, 30, 29, 28, 28, 28, 27, 25, 30, 29, 28, 28,
+        28, 28, 26, 24,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34,
+        34, 34, 34, 33, 33, 32, 31, 31, 31, 31, 31, 31, 31, 30, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 31, 30, 30, 30, 30, 30, 30, 30, 29, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 31, 30, 30, 29,
+        29, 29, 29, 29, 29, 28, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 31, 31, 30, 29, 28, 28, 28, 28, 28,
+        28, 28, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 31, 31, 30, 29, 28, 28, 28, 28, 28, 28, 28, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 31, 31, 30, 29, 28, 28, 28, 28, 28, 28, 28, 31, 31, 31, 31, 30, 30,
+        30, 30, 30, 30, 30, 30, 30, 30, 30, 29, 29, 29, 29, 29, 29, 29, 28, 28,
+        28, 27, 27, 27, 27, 27, 27, 26, 29, 29, 28, 28, 28, 28, 28, 28, 28, 28,
+        28, 28, 28, 28, 27, 27, 27, 27, 27, 27, 27, 27, 26, 26, 26, 25, 25, 25,
+        25, 25, 25, 24 },
+  },
+  {
+      { /* Luma */
+        /* Size 4x4 */
+        33, 33, 33, 33, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32,
+        /* Size 8x8 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32,
+        32, 32, 33, 33, 32, 32, 32, 32, 32, 32,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 4x8 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32,
+        32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32,
+        /* Size 8x4 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32,
+        /* Size 8x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 33, 33, 33, 32,
+        32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32,
+        32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32,
+        33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32,
+        32, 32,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 4x16 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 33, 32,
+        32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32,
+        33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32, 32, 32, 33, 32,
+        32, 32, 33, 32, 32, 32, 33, 32, 32, 32,
+        /* Size 16x4 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 8x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 33, 33, 33, 32, 32, 32, 32, 32, 33, 33, 33, 32, 32, 32, 32, 32,
+        33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32,
+        32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32,
+        33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32,
+        32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32,
+        33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33,
+        32, 32, 32, 32, 32, 32, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 32, 32,
+        32, 32, 32, 32,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 32 },
+      { /* Chroma */
+        /* Size 4x4 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        /* Size 8x8 */
+        33, 33, 33, 33, 33, 33, 33, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 34, 33, 33, 33, 33, 33, 33, 33,
+        /* Size 16x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32,
+        /* Size 32x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34,
+        34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 32, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
+        /* Size 4x8 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 34, 33, 32, 32,
+        /* Size 8x4 */
+        33, 33, 33, 33, 33, 33, 33, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 32, 32, 33, 33, 33, 33, 33, 33, 32, 32,
+        /* Size 8x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 33, 33, 33, 33,
+        33, 32, 32, 32, 34, 33, 33, 33, 33, 32, 32, 32, 34, 33, 33, 33, 32, 32,
+        32, 32,
+        /* Size 16x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32,
+        /* Size 16x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32,
+        32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        34, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 34, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 34, 34, 33, 33,
+        33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 34, 34, 33, 33, 33, 33,
+        33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 34, 34, 33, 33, 33, 33, 33, 33,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 32x16 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32,
+        32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32,
+        /* Size 4x16 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 33, 33,
+        32, 32, 33, 33, 32, 32, 34, 33, 32, 32,
+        /* Size 16x4 */
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 32, 32, 32, 32,
+        /* Size 8x32 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 33, 33, 33, 33, 33, 32,
+        32, 32, 33, 33, 33, 33, 33, 32, 32, 32, 33, 33, 33, 33, 33, 32, 32, 32,
+        34, 33, 33, 33, 33, 32, 32, 32, 34, 33, 33, 33, 33, 32, 32, 32, 34, 33,
+        33, 33, 32, 32, 32, 32, 34, 33, 33, 33, 32, 32, 32, 32, 34, 33, 33, 33,
+        32, 32, 32, 32,
+        /* Size 32x8 */
+        32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32,
+        32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+        33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32,
+        32, 32, 32, 32 },
+  },
+};
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h
new file mode 100644
index 0000000000..9fa022ba62
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_QUANT_COMMON_H_
+#define AOM_AV1_COMMON_QUANT_COMMON_H_
+
+#include <stdbool.h>
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MINQ 0
+#define MAXQ 255
+#define QINDEX_RANGE (MAXQ - MINQ + 1)
+#define QINDEX_BITS 8
+// Total number of QM sets stored
+#define QM_LEVEL_BITS 4
+#define NUM_QM_LEVELS (1 << QM_LEVEL_BITS)
+/* Range of QMS is between first and last value, with offset applied to inter
+ * blocks*/
+#define DEFAULT_QM_Y 10
+#define DEFAULT_QM_U 11
+#define DEFAULT_QM_V 12
+#define DEFAULT_QM_FIRST 5
+#define DEFAULT_QM_LAST 9
+
+struct AV1Common;
+struct CommonQuantParams;
+struct macroblockd;
+
+int16_t av1_dc_quant_QTX(int qindex, int delta, aom_bit_depth_t bit_depth);
+int16_t av1_ac_quant_QTX(int qindex, int delta, aom_bit_depth_t bit_depth);
+
+int av1_get_qindex(const struct segmentation *seg, int segment_id,
+                   int base_qindex);
+
+// Returns true if we are using quantization matrix.
+bool av1_use_qmatrix(const struct CommonQuantParams *quant_params,
+                     const struct macroblockd *xd, int segment_id);
+
+// Reduce the large number of quantizers to a smaller number of levels for which
+// different matrices may be defined
+static INLINE int aom_get_qmlevel(int qindex, int first, int last) {
+  return first + (qindex * (last + 1 - first)) / QINDEX_RANGE;
+}
+
+// Initialize all global quant/dequant matrices.
+void av1_qm_init(struct CommonQuantParams *quant_params, int num_planes);
+
+// Get global dequant matrix.
+const qm_val_t *av1_iqmatrix(const struct CommonQuantParams *quant_params,
+                             int qmlevel, int plane, TX_SIZE tx_size);
+// Get global quant matrix.
+const qm_val_t *av1_qmatrix(const struct CommonQuantParams *quant_params,
+                            int qmlevel, int plane, TX_SIZE tx_size);
+
+// Get either local / global dequant matrix as appropriate.
+const qm_val_t *av1_get_iqmatrix(const struct CommonQuantParams *quant_params,
+                                 const struct macroblockd *xd, int plane,
+                                 TX_SIZE tx_size, TX_TYPE tx_type);
+// Get either local / global quant matrix as appropriate.
+const qm_val_t *av1_get_qmatrix(const struct CommonQuantParams *quant_params,
+                                const struct macroblockd *xd, int plane,
+                                TX_SIZE tx_size, TX_TYPE tx_type);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_QUANT_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.c
new file mode 100644
index 0000000000..81dd568ad6
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.c
@@ -0,0 +1,1416 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <limits.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/blend.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/obmc.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h"
+
+// This function will determine whether or not to create a warped
+// prediction.
+int av1_allow_warp(const MB_MODE_INFO *const mbmi,
+                   const WarpTypesAllowed *const warp_types,
+                   const WarpedMotionParams *const gm_params,
+                   int build_for_obmc, const struct scale_factors *const sf,
+                   WarpedMotionParams *final_warp_params) {
+  // Note: As per the spec, we must test the fixed point scales here, which are
+  // at a higher precision (1 << 14) than the xs and ys in subpel_params (that
+  // have 1 << 10 precision).
+  if (av1_is_scaled(sf)) return 0;
+
+  if (final_warp_params != NULL) *final_warp_params = default_warp_params;
+
+  if (build_for_obmc) return 0;
+
+  if (warp_types->local_warp_allowed && !mbmi->wm_params.invalid) {
+    if (final_warp_params != NULL)
+      memcpy(final_warp_params, &mbmi->wm_params, sizeof(*final_warp_params));
+    return 1;
+  } else if (warp_types->global_warp_allowed && !gm_params->invalid) {
+    if (final_warp_params != NULL)
+      memcpy(final_warp_params, gm_params, sizeof(*final_warp_params));
+    return 1;
+  }
+
+  return 0;
+}
+
+void av1_init_inter_params(InterPredParams *inter_pred_params, int block_width,
+                           int block_height, int pix_row, int pix_col,
+                           int subsampling_x, int subsampling_y, int bit_depth,
+                           int use_hbd_buf, int is_intrabc,
+                           const struct scale_factors *sf,
+                           const struct buf_2d *ref_buf,
+                           int_interpfilters interp_filters) {
+  inter_pred_params->block_width = block_width;
+  inter_pred_params->block_height = block_height;
+  inter_pred_params->pix_row = pix_row;
+  inter_pred_params->pix_col = pix_col;
+  inter_pred_params->subsampling_x = subsampling_x;
+  inter_pred_params->subsampling_y = subsampling_y;
+  inter_pred_params->bit_depth = bit_depth;
+  inter_pred_params->use_hbd_buf = use_hbd_buf;
+  inter_pred_params->is_intrabc = is_intrabc;
+  inter_pred_params->scale_factors = sf;
+  inter_pred_params->ref_frame_buf = *ref_buf;
+  inter_pred_params->mode = TRANSLATION_PRED;
+  inter_pred_params->comp_mode = UNIFORM_SINGLE;
+
+  if (is_intrabc) {
+    inter_pred_params->interp_filter_params[0] = &av1_intrabc_filter_params;
+    inter_pred_params->interp_filter_params[1] = &av1_intrabc_filter_params;
+  } else {
+    inter_pred_params->interp_filter_params[0] =
+        av1_get_interp_filter_params_with_block_size(
+            interp_filters.as_filters.x_filter, block_width);
+    inter_pred_params->interp_filter_params[1] =
+        av1_get_interp_filter_params_with_block_size(
+            interp_filters.as_filters.y_filter, block_height);
+  }
+}
+
+void av1_init_comp_mode(InterPredParams *inter_pred_params) {
+  inter_pred_params->comp_mode = UNIFORM_COMP;
+}
+
+void av1_init_warp_params(InterPredParams *inter_pred_params,
+                          const WarpTypesAllowed *warp_types, int ref,
+                          const MACROBLOCKD *xd, const MB_MODE_INFO *mi) {
+  if (inter_pred_params->block_height < 8 || inter_pred_params->block_width < 8)
+    return;
+
+  if (xd->cur_frame_force_integer_mv) return;
+
+  if (av1_allow_warp(mi, warp_types, &xd->global_motion[mi->ref_frame[ref]], 0,
+                     inter_pred_params->scale_factors,
+                     &inter_pred_params->warp_params))
+    inter_pred_params->mode = WARP_PRED;
+}
+
+void av1_make_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst,
+                              int dst_stride,
+                              InterPredParams *inter_pred_params,
+                              const SubpelParams *subpel_params) {
+  assert(IMPLIES(inter_pred_params->conv_params.is_compound,
+                 inter_pred_params->conv_params.dst != NULL));
+
+  if (inter_pred_params->mode == TRANSLATION_PRED) {
+#if CONFIG_AV1_HIGHBITDEPTH
+    if (inter_pred_params->use_hbd_buf) {
+      highbd_inter_predictor(src, src_stride, dst, dst_stride, subpel_params,
+                             inter_pred_params->block_width,
+                             inter_pred_params->block_height,
+                             &inter_pred_params->conv_params,
+                             inter_pred_params->interp_filter_params,
+                             inter_pred_params->bit_depth);
+    } else {
+      inter_predictor(src, src_stride, dst, dst_stride, subpel_params,
+                      inter_pred_params->block_width,
+                      inter_pred_params->block_height,
+                      &inter_pred_params->conv_params,
+                      inter_pred_params->interp_filter_params);
+    }
+#else
+    inter_predictor(src, src_stride, dst, dst_stride, subpel_params,
+                    inter_pred_params->block_width,
+                    inter_pred_params->block_height,
+                    &inter_pred_params->conv_params,
+                    inter_pred_params->interp_filter_params);
+#endif
+  }
+#if !CONFIG_REALTIME_ONLY
+  // TODO(jingning): av1_warp_plane() can be further cleaned up.
+  else if (inter_pred_params->mode == WARP_PRED) {
+    av1_warp_plane(
+        &inter_pred_params->warp_params, inter_pred_params->use_hbd_buf,
+        inter_pred_params->bit_depth, inter_pred_params->ref_frame_buf.buf0,
+        inter_pred_params->ref_frame_buf.width,
+        inter_pred_params->ref_frame_buf.height,
+        inter_pred_params->ref_frame_buf.stride, dst,
+        inter_pred_params->pix_col, inter_pred_params->pix_row,
+        inter_pred_params->block_width, inter_pred_params->block_height,
+        dst_stride, inter_pred_params->subsampling_x,
+        inter_pred_params->subsampling_y, &inter_pred_params->conv_params);
+  }
+#endif
+}
+
+static const uint8_t wedge_master_oblique_odd[MASK_MASTER_SIZE] = {
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  6,  18,
+  37, 53, 60, 63, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+  64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+};
+static const uint8_t wedge_master_oblique_even[MASK_MASTER_SIZE] = {
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  4,  11, 27,
+  46, 58, 62, 63, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+  64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+};
+static const uint8_t wedge_master_vertical[MASK_MASTER_SIZE] = {
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  7,  21,
+  43, 57, 62, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+  64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+};
+
+static AOM_INLINE void shift_copy(const uint8_t *src, uint8_t *dst, int shift,
+                                  int width) {
+  if (shift >= 0) {
+    memcpy(dst + shift, src, width - shift);
+    memset(dst, src[0], shift);
+  } else {
+    shift = -shift;
+    memcpy(dst, src + shift, width - shift);
+    memset(dst + width - shift, src[width - 1], shift);
+  }
+}
+
+/* clang-format off */
+DECLARE_ALIGNED(16, static uint8_t,
+                wedge_signflip_lookup[BLOCK_SIZES_ALL][MAX_WEDGE_TYPES]) = {
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, },
+  { 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, },
+  { 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, },
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, },
+  { 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, },
+  { 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, },
+  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, },
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, },
+  { 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, },
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },  // not used
+};
+/* clang-format on */
+
+// [negative][direction]
+DECLARE_ALIGNED(
+    16, static uint8_t,
+    wedge_mask_obl[2][WEDGE_DIRECTIONS][MASK_MASTER_SIZE * MASK_MASTER_SIZE]);
+
+// 4 * MAX_WEDGE_SQUARE is an easy to compute and fairly tight upper bound
+// on the sum of all mask sizes up to an including MAX_WEDGE_SQUARE.
+DECLARE_ALIGNED(16, static uint8_t,
+                wedge_mask_buf[2 * MAX_WEDGE_TYPES * 4 * MAX_WEDGE_SQUARE]);
+
+DECLARE_ALIGNED(16, static uint8_t,
+                smooth_interintra_mask_buf[INTERINTRA_MODES][BLOCK_SIZES_ALL]
+                                          [MAX_WEDGE_SQUARE]);
+
+static wedge_masks_type wedge_masks[BLOCK_SIZES_ALL][2];
+
+static const wedge_code_type wedge_codebook_16_hgtw[16] = {
+  { WEDGE_OBLIQUE27, 4, 4 },  { WEDGE_OBLIQUE63, 4, 4 },
+  { WEDGE_OBLIQUE117, 4, 4 }, { WEDGE_OBLIQUE153, 4, 4 },
+  { WEDGE_HORIZONTAL, 4, 2 }, { WEDGE_HORIZONTAL, 4, 4 },
+  { WEDGE_HORIZONTAL, 4, 6 }, { WEDGE_VERTICAL, 4, 4 },
+  { WEDGE_OBLIQUE27, 4, 2 },  { WEDGE_OBLIQUE27, 4, 6 },
+  { WEDGE_OBLIQUE153, 4, 2 }, { WEDGE_OBLIQUE153, 4, 6 },
+  { WEDGE_OBLIQUE63, 2, 4 },  { WEDGE_OBLIQUE63, 6, 4 },
+  { WEDGE_OBLIQUE117, 2, 4 }, { WEDGE_OBLIQUE117, 6, 4 },
+};
+
+static const wedge_code_type wedge_codebook_16_hltw[16] = {
+  { WEDGE_OBLIQUE27, 4, 4 },  { WEDGE_OBLIQUE63, 4, 4 },
+  { WEDGE_OBLIQUE117, 4, 4 }, { WEDGE_OBLIQUE153, 4, 4 },
+  { WEDGE_VERTICAL, 2, 4 },   { WEDGE_VERTICAL, 4, 4 },
+  { WEDGE_VERTICAL, 6, 4 },   { WEDGE_HORIZONTAL, 4, 4 },
+  { WEDGE_OBLIQUE27, 4, 2 },  { WEDGE_OBLIQUE27, 4, 6 },
+  { WEDGE_OBLIQUE153, 4, 2 }, { WEDGE_OBLIQUE153, 4, 6 },
+  { WEDGE_OBLIQUE63, 2, 4 },  { WEDGE_OBLIQUE63, 6, 4 },
+  { WEDGE_OBLIQUE117, 2, 4 }, { WEDGE_OBLIQUE117, 6, 4 },
+};
+
+static const wedge_code_type wedge_codebook_16_heqw[16] = {
+  { WEDGE_OBLIQUE27, 4, 4 },  { WEDGE_OBLIQUE63, 4, 4 },
+  { WEDGE_OBLIQUE117, 4, 4 }, { WEDGE_OBLIQUE153, 4, 4 },
+  { WEDGE_HORIZONTAL, 4, 2 }, { WEDGE_HORIZONTAL, 4, 6 },
+  { WEDGE_VERTICAL, 2, 4 },   { WEDGE_VERTICAL, 6, 4 },
+  { WEDGE_OBLIQUE27, 4, 2 },  { WEDGE_OBLIQUE27, 4, 6 },
+  { WEDGE_OBLIQUE153, 4, 2 }, { WEDGE_OBLIQUE153, 4, 6 },
+  { WEDGE_OBLIQUE63, 2, 4 },  { WEDGE_OBLIQUE63, 6, 4 },
+  { WEDGE_OBLIQUE117, 2, 4 }, { WEDGE_OBLIQUE117, 6, 4 },
+};
+
+const wedge_params_type av1_wedge_params_lookup[BLOCK_SIZES_ALL] = {
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_heqw, wedge_signflip_lookup[BLOCK_8X8],
+    wedge_masks[BLOCK_8X8] },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_8X16],
+    wedge_masks[BLOCK_8X16] },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_16X8],
+    wedge_masks[BLOCK_16X8] },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_heqw, wedge_signflip_lookup[BLOCK_16X16],
+    wedge_masks[BLOCK_16X16] },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_16X32],
+    wedge_masks[BLOCK_16X32] },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_32X16],
+    wedge_masks[BLOCK_32X16] },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_heqw, wedge_signflip_lookup[BLOCK_32X32],
+    wedge_masks[BLOCK_32X32] },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_hgtw, wedge_signflip_lookup[BLOCK_8X32],
+    wedge_masks[BLOCK_8X32] },
+  { MAX_WEDGE_TYPES, wedge_codebook_16_hltw, wedge_signflip_lookup[BLOCK_32X8],
+    wedge_masks[BLOCK_32X8] },
+  { 0, NULL, NULL, NULL },
+  { 0, NULL, NULL, NULL },
+};
+
+static const uint8_t *get_wedge_mask_inplace(int wedge_index, int neg,
+                                             BLOCK_SIZE sb_type) {
+  const uint8_t *master;
+  const int bh = block_size_high[sb_type];
+  const int bw = block_size_wide[sb_type];
+  const wedge_code_type *a =
+      av1_wedge_params_lookup[sb_type].codebook + wedge_index;
+  int woff, hoff;
+  const uint8_t wsignflip =
+      av1_wedge_params_lookup[sb_type].signflip[wedge_index];
+
+  assert(wedge_index >= 0 && wedge_index < get_wedge_types_lookup(sb_type));
+  woff = (a->x_offset * bw) >> 3;
+  hoff = (a->y_offset * bh) >> 3;
+  master = wedge_mask_obl[neg ^ wsignflip][a->direction] +
+           MASK_MASTER_STRIDE * (MASK_MASTER_SIZE / 2 - hoff) +
+           MASK_MASTER_SIZE / 2 - woff;
+  return master;
+}
+
+const uint8_t *av1_get_compound_type_mask(
+    const INTERINTER_COMPOUND_DATA *const comp_data, BLOCK_SIZE sb_type) {
+  (void)sb_type;
+  switch (comp_data->type) {
+    case COMPOUND_WEDGE:
+      return av1_get_contiguous_soft_mask(comp_data->wedge_index,
+                                          comp_data->wedge_sign, sb_type);
+    default: return comp_data->seg_mask;
+  }
+}
+
+static AOM_INLINE void diffwtd_mask_d16(
+    uint8_t *mask, int which_inverse, int mask_base, const CONV_BUF_TYPE *src0,
+    int src0_stride, const CONV_BUF_TYPE *src1, int src1_stride, int h, int w,
+    ConvolveParams *conv_params, int bd) {
+  int round =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1 + (bd - 8);
+  int i, j, m, diff;
+  for (i = 0; i < h; ++i) {
+    for (j = 0; j < w; ++j) {
+      diff = abs(src0[i * src0_stride + j] - src1[i * src1_stride + j]);
+      diff = ROUND_POWER_OF_TWO(diff, round);
+      m = clamp(mask_base + (diff / DIFF_FACTOR), 0, AOM_BLEND_A64_MAX_ALPHA);
+      mask[i * w + j] = which_inverse ? AOM_BLEND_A64_MAX_ALPHA - m : m;
+    }
+  }
+}
+
+void av1_build_compound_diffwtd_mask_d16_c(
+    uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const CONV_BUF_TYPE *src0,
+    int src0_stride, const CONV_BUF_TYPE *src1, int src1_stride, int h, int w,
+    ConvolveParams *conv_params, int bd) {
+  switch (mask_type) {
+    case DIFFWTD_38:
+      diffwtd_mask_d16(mask, 0, 38, src0, src0_stride, src1, src1_stride, h, w,
+                       conv_params, bd);
+      break;
+    case DIFFWTD_38_INV:
+      diffwtd_mask_d16(mask, 1, 38, src0, src0_stride, src1, src1_stride, h, w,
+                       conv_params, bd);
+      break;
+    default: assert(0);
+  }
+}
+
+static AOM_INLINE void diffwtd_mask(uint8_t *mask, int which_inverse,
+                                    int mask_base, const uint8_t *src0,
+                                    int src0_stride, const uint8_t *src1,
+                                    int src1_stride, int h, int w) {
+  int i, j, m, diff;
+  for (i = 0; i < h; ++i) {
+    for (j = 0; j < w; ++j) {
+      diff =
+          abs((int)src0[i * src0_stride + j] - (int)src1[i * src1_stride + j]);
+      m = clamp(mask_base + (diff / DIFF_FACTOR), 0, AOM_BLEND_A64_MAX_ALPHA);
+      mask[i * w + j] = which_inverse ? AOM_BLEND_A64_MAX_ALPHA - m : m;
+    }
+  }
+}
+
+void av1_build_compound_diffwtd_mask_c(uint8_t *mask,
+                                       DIFFWTD_MASK_TYPE mask_type,
+                                       const uint8_t *src0, int src0_stride,
+                                       const uint8_t *src1, int src1_stride,
+                                       int h, int w) {
+  switch (mask_type) {
+    case DIFFWTD_38:
+      diffwtd_mask(mask, 0, 38, src0, src0_stride, src1, src1_stride, h, w);
+      break;
+    case DIFFWTD_38_INV:
+      diffwtd_mask(mask, 1, 38, src0, src0_stride, src1, src1_stride, h, w);
+      break;
+    default: assert(0);
+  }
+}
+
+static AOM_FORCE_INLINE void diffwtd_mask_highbd(
+    uint8_t *mask, int which_inverse, int mask_base, const uint16_t *src0,
+    int src0_stride, const uint16_t *src1, int src1_stride, int h, int w,
+    const unsigned int bd) {
+  assert(bd >= 8);
+  if (bd == 8) {
+    if (which_inverse) {
+      for (int i = 0; i < h; ++i) {
+        for (int j = 0; j < w; ++j) {
+          int diff = abs((int)src0[j] - (int)src1[j]) / DIFF_FACTOR;
+          unsigned int m = negative_to_zero(mask_base + diff);
+          m = AOMMIN(m, AOM_BLEND_A64_MAX_ALPHA);
+          mask[j] = AOM_BLEND_A64_MAX_ALPHA - m;
+        }
+        src0 += src0_stride;
+        src1 += src1_stride;
+        mask += w;
+      }
+    } else {
+      for (int i = 0; i < h; ++i) {
+        for (int j = 0; j < w; ++j) {
+          int diff = abs((int)src0[j] - (int)src1[j]) / DIFF_FACTOR;
+          unsigned int m = negative_to_zero(mask_base + diff);
+          m = AOMMIN(m, AOM_BLEND_A64_MAX_ALPHA);
+          mask[j] = m;
+        }
+        src0 += src0_stride;
+        src1 += src1_stride;
+        mask += w;
+      }
+    }
+  } else {
+    const unsigned int bd_shift = bd - 8;
+    if (which_inverse) {
+      for (int i = 0; i < h; ++i) {
+        for (int j = 0; j < w; ++j) {
+          int diff =
+              (abs((int)src0[j] - (int)src1[j]) >> bd_shift) / DIFF_FACTOR;
+          unsigned int m = negative_to_zero(mask_base + diff);
+          m = AOMMIN(m, AOM_BLEND_A64_MAX_ALPHA);
+          mask[j] = AOM_BLEND_A64_MAX_ALPHA - m;
+        }
+        src0 += src0_stride;
+        src1 += src1_stride;
+        mask += w;
+      }
+    } else {
+      for (int i = 0; i < h; ++i) {
+        for (int j = 0; j < w; ++j) {
+          int diff =
+              (abs((int)src0[j] - (int)src1[j]) >> bd_shift) / DIFF_FACTOR;
+          unsigned int m = negative_to_zero(mask_base + diff);
+          m = AOMMIN(m, AOM_BLEND_A64_MAX_ALPHA);
+          mask[j] = m;
+        }
+        src0 += src0_stride;
+        src1 += src1_stride;
+        mask += w;
+      }
+    }
+  }
+}
+
+void av1_build_compound_diffwtd_mask_highbd_c(
+    uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const uint8_t *src0,
+    int src0_stride, const uint8_t *src1, int src1_stride, int h, int w,
+    int bd) {
+  switch (mask_type) {
+    case DIFFWTD_38:
+      diffwtd_mask_highbd(mask, 0, 38, CONVERT_TO_SHORTPTR(src0), src0_stride,
+                          CONVERT_TO_SHORTPTR(src1), src1_stride, h, w, bd);
+      break;
+    case DIFFWTD_38_INV:
+      diffwtd_mask_highbd(mask, 1, 38, CONVERT_TO_SHORTPTR(src0), src0_stride,
+                          CONVERT_TO_SHORTPTR(src1), src1_stride, h, w, bd);
+      break;
+    default: assert(0);
+  }
+}
+
+static AOM_INLINE void init_wedge_master_masks() {
+  int i, j;
+  const int w = MASK_MASTER_SIZE;
+  const int h = MASK_MASTER_SIZE;
+  const int stride = MASK_MASTER_STRIDE;
+  // Note: index [0] stores the masters, and [1] its complement.
+  // Generate prototype by shifting the masters
+  int shift = h / 4;
+  for (i = 0; i < h; i += 2) {
+    shift_copy(wedge_master_oblique_even,
+               &wedge_mask_obl[0][WEDGE_OBLIQUE63][i * stride], shift,
+               MASK_MASTER_SIZE);
+    shift--;
+    shift_copy(wedge_master_oblique_odd,
+               &wedge_mask_obl[0][WEDGE_OBLIQUE63][(i + 1) * stride], shift,
+               MASK_MASTER_SIZE);
+    memcpy(&wedge_mask_obl[0][WEDGE_VERTICAL][i * stride],
+           wedge_master_vertical,
+           MASK_MASTER_SIZE * sizeof(wedge_master_vertical[0]));
+    memcpy(&wedge_mask_obl[0][WEDGE_VERTICAL][(i + 1) * stride],
+           wedge_master_vertical,
+           MASK_MASTER_SIZE * sizeof(wedge_master_vertical[0]));
+  }
+
+  for (i = 0; i < h; ++i) {
+    for (j = 0; j < w; ++j) {
+      const int msk = wedge_mask_obl[0][WEDGE_OBLIQUE63][i * stride + j];
+      wedge_mask_obl[0][WEDGE_OBLIQUE27][j * stride + i] = msk;
+      wedge_mask_obl[0][WEDGE_OBLIQUE117][i * stride + w - 1 - j] =
+          wedge_mask_obl[0][WEDGE_OBLIQUE153][(w - 1 - j) * stride + i] =
+              (1 << WEDGE_WEIGHT_BITS) - msk;
+      wedge_mask_obl[1][WEDGE_OBLIQUE63][i * stride + j] =
+          wedge_mask_obl[1][WEDGE_OBLIQUE27][j * stride + i] =
+              (1 << WEDGE_WEIGHT_BITS) - msk;
+      wedge_mask_obl[1][WEDGE_OBLIQUE117][i * stride + w - 1 - j] =
+          wedge_mask_obl[1][WEDGE_OBLIQUE153][(w - 1 - j) * stride + i] = msk;
+      const int mskx = wedge_mask_obl[0][WEDGE_VERTICAL][i * stride + j];
+      wedge_mask_obl[0][WEDGE_HORIZONTAL][j * stride + i] = mskx;
+      wedge_mask_obl[1][WEDGE_VERTICAL][i * stride + j] =
+          wedge_mask_obl[1][WEDGE_HORIZONTAL][j * stride + i] =
+              (1 << WEDGE_WEIGHT_BITS) - mskx;
+    }
+  }
+}
+
+static AOM_INLINE void init_wedge_masks() {
+  uint8_t *dst = wedge_mask_buf;
+  BLOCK_SIZE bsize;
+  memset(wedge_masks, 0, sizeof(wedge_masks));
+  for (bsize = BLOCK_4X4; bsize < BLOCK_SIZES_ALL; ++bsize) {
+    const wedge_params_type *wedge_params = &av1_wedge_params_lookup[bsize];
+    const int wtypes = wedge_params->wedge_types;
+    if (wtypes == 0) continue;
+    const uint8_t *mask;
+    const int bw = block_size_wide[bsize];
+    const int bh = block_size_high[bsize];
+    int w;
+    for (w = 0; w < wtypes; ++w) {
+      mask = get_wedge_mask_inplace(w, 0, bsize);
+      aom_convolve_copy(mask, MASK_MASTER_STRIDE, dst, bw /* dst_stride */, bw,
+                        bh);
+      wedge_params->masks[0][w] = dst;
+      dst += bw * bh;
+
+      mask = get_wedge_mask_inplace(w, 1, bsize);
+      aom_convolve_copy(mask, MASK_MASTER_STRIDE, dst, bw /* dst_stride */, bw,
+                        bh);
+      wedge_params->masks[1][w] = dst;
+      dst += bw * bh;
+    }
+    assert(sizeof(wedge_mask_buf) >= (size_t)(dst - wedge_mask_buf));
+  }
+}
+
+/* clang-format off */
+static const uint8_t ii_weights1d[MAX_SB_SIZE] = {
+  60, 58, 56, 54, 52, 50, 48, 47, 45, 44, 42, 41, 39, 38, 37, 35, 34, 33, 32,
+  31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 22, 21, 20, 19, 19, 18, 18, 17, 16,
+  16, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11, 11, 10, 10, 10,  9,  9,  9,  8,
+  8,  8,  8,  7,  7,  7,  7,  6,  6,  6,  6,  6,  5,  5,  5,  5,  5,  4,  4,
+  4,  4,  4,  4,  4,  4,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  2,  2,  2,
+  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  1,  1,  1,  1,  1,  1,  1,  1,
+  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1
+};
+static uint8_t ii_size_scales[BLOCK_SIZES_ALL] = {
+    32, 16, 16, 16, 8, 8, 8, 4,
+    4,  4,  2,  2,  2, 1, 1, 1,
+    8,  8,  4,  4,  2, 2
+};
+/* clang-format on */
+
+static AOM_INLINE void build_smooth_interintra_mask(uint8_t *mask, int stride,
+                                                    BLOCK_SIZE plane_bsize,
+                                                    INTERINTRA_MODE mode) {
+  int i, j;
+  const int bw = block_size_wide[plane_bsize];
+  const int bh = block_size_high[plane_bsize];
+  const int size_scale = ii_size_scales[plane_bsize];
+
+  switch (mode) {
+    case II_V_PRED:
+      for (i = 0; i < bh; ++i) {
+        memset(mask, ii_weights1d[i * size_scale], bw * sizeof(mask[0]));
+        mask += stride;
+      }
+      break;
+
+    case II_H_PRED:
+      for (i = 0; i < bh; ++i) {
+        for (j = 0; j < bw; ++j) mask[j] = ii_weights1d[j * size_scale];
+        mask += stride;
+      }
+      break;
+
+    case II_SMOOTH_PRED:
+      for (i = 0; i < bh; ++i) {
+        for (j = 0; j < bw; ++j)
+          mask[j] = ii_weights1d[(i < j ? i : j) * size_scale];
+        mask += stride;
+      }
+      break;
+
+    case II_DC_PRED:
+    default:
+      for (i = 0; i < bh; ++i) {
+        memset(mask, 32, bw * sizeof(mask[0]));
+        mask += stride;
+      }
+      break;
+  }
+}
+
+static AOM_INLINE void init_smooth_interintra_masks() {
+  for (int m = 0; m < INTERINTRA_MODES; ++m) {
+    for (int bs = 0; bs < BLOCK_SIZES_ALL; ++bs) {
+      const int bw = block_size_wide[bs];
+      const int bh = block_size_high[bs];
+      if (bw > MAX_WEDGE_SIZE || bh > MAX_WEDGE_SIZE) continue;
+      build_smooth_interintra_mask(smooth_interintra_mask_buf[m][bs], bw, bs,
+                                   m);
+    }
+  }
+}
+
+// Equation of line: f(x, y) = a[0]*(x - a[2]*w/8) + a[1]*(y - a[3]*h/8) = 0
+void av1_init_wedge_masks() {
+  init_wedge_master_masks();
+  init_wedge_masks();
+  init_smooth_interintra_masks();
+}
+
+static AOM_INLINE void build_masked_compound_no_round(
+    uint8_t *dst, int dst_stride, const CONV_BUF_TYPE *src0, int src0_stride,
+    const CONV_BUF_TYPE *src1, int src1_stride,
+    const INTERINTER_COMPOUND_DATA *const comp_data, BLOCK_SIZE sb_type, int h,
+    int w, InterPredParams *inter_pred_params) {
+  const int ssy = inter_pred_params->subsampling_y;
+  const int ssx = inter_pred_params->subsampling_x;
+  const uint8_t *mask = av1_get_compound_type_mask(comp_data, sb_type);
+  const int mask_stride = block_size_wide[sb_type];
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (inter_pred_params->use_hbd_buf) {
+    aom_highbd_blend_a64_d16_mask(dst, dst_stride, src0, src0_stride, src1,
+                                  src1_stride, mask, mask_stride, w, h, ssx,
+                                  ssy, &inter_pred_params->conv_params,
+                                  inter_pred_params->bit_depth);
+  } else {
+    aom_lowbd_blend_a64_d16_mask(dst, dst_stride, src0, src0_stride, src1,
+                                 src1_stride, mask, mask_stride, w, h, ssx, ssy,
+                                 &inter_pred_params->conv_params);
+  }
+#else
+  aom_lowbd_blend_a64_d16_mask(dst, dst_stride, src0, src0_stride, src1,
+                               src1_stride, mask, mask_stride, w, h, ssx, ssy,
+                               &inter_pred_params->conv_params);
+#endif
+}
+
+static void make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
+                                        uint8_t *dst, int dst_stride,
+                                        InterPredParams *inter_pred_params,
+                                        const SubpelParams *subpel_params) {
+  const INTERINTER_COMPOUND_DATA *comp_data = &inter_pred_params->mask_comp;
+  BLOCK_SIZE sb_type = inter_pred_params->sb_type;
+
+  // We're going to call av1_make_inter_predictor to generate a prediction into
+  // a temporary buffer, then will blend that temporary buffer with that from
+  // the other reference.
+  DECLARE_ALIGNED(32, uint8_t, tmp_buf[2 * MAX_SB_SQUARE]);
+  uint8_t *tmp_dst =
+      inter_pred_params->use_hbd_buf ? CONVERT_TO_BYTEPTR(tmp_buf) : tmp_buf;
+
+  const int tmp_buf_stride = MAX_SB_SIZE;
+  CONV_BUF_TYPE *org_dst = inter_pred_params->conv_params.dst;
+  int org_dst_stride = inter_pred_params->conv_params.dst_stride;
+  CONV_BUF_TYPE *tmp_buf16 = (CONV_BUF_TYPE *)tmp_buf;
+  inter_pred_params->conv_params.dst = tmp_buf16;
+  inter_pred_params->conv_params.dst_stride = tmp_buf_stride;
+  assert(inter_pred_params->conv_params.do_average == 0);
+
+  // This will generate a prediction in tmp_buf for the second reference
+  av1_make_inter_predictor(pre, pre_stride, tmp_dst, MAX_SB_SIZE,
+                           inter_pred_params, subpel_params);
+
+  if (!inter_pred_params->conv_params.plane &&
+      comp_data->type == COMPOUND_DIFFWTD) {
+    av1_build_compound_diffwtd_mask_d16(
+        comp_data->seg_mask, comp_data->mask_type, org_dst, org_dst_stride,
+        tmp_buf16, tmp_buf_stride, inter_pred_params->block_height,
+        inter_pred_params->block_width, &inter_pred_params->conv_params,
+        inter_pred_params->bit_depth);
+  }
+  build_masked_compound_no_round(
+      dst, dst_stride, org_dst, org_dst_stride, tmp_buf16, tmp_buf_stride,
+      comp_data, sb_type, inter_pred_params->block_height,
+      inter_pred_params->block_width, inter_pred_params);
+}
+
+void av1_build_one_inter_predictor(
+    uint8_t *dst, int dst_stride, const MV *const src_mv,
+    InterPredParams *inter_pred_params, MACROBLOCKD *xd, int mi_x, int mi_y,
+    int ref, uint8_t **mc_buf, CalcSubpelParamsFunc calc_subpel_params_func) {
+  SubpelParams subpel_params;
+  uint8_t *src;
+  int src_stride;
+  calc_subpel_params_func(src_mv, inter_pred_params, xd, mi_x, mi_y, ref,
+                          mc_buf, &src, &subpel_params, &src_stride);
+
+  if (inter_pred_params->comp_mode == UNIFORM_SINGLE ||
+      inter_pred_params->comp_mode == UNIFORM_COMP) {
+    av1_make_inter_predictor(src, src_stride, dst, dst_stride,
+                             inter_pred_params, &subpel_params);
+  } else {
+    make_masked_inter_predictor(src, src_stride, dst, dst_stride,
+                                inter_pred_params, &subpel_params);
+  }
+}
+
+void av1_dist_wtd_comp_weight_assign(const AV1_COMMON *cm,
+                                     const MB_MODE_INFO *mbmi, int order_idx,
+                                     int *fwd_offset, int *bck_offset,
+                                     int *use_dist_wtd_comp_avg,
+                                     int is_compound) {
+  assert(fwd_offset != NULL && bck_offset != NULL);
+  if (!is_compound || mbmi->compound_idx) {
+    *fwd_offset = 8;
+    *bck_offset = 8;
+    *use_dist_wtd_comp_avg = 0;
+    return;
+  }
+
+  *use_dist_wtd_comp_avg = 1;
+  const RefCntBuffer *const bck_buf = get_ref_frame_buf(cm, mbmi->ref_frame[0]);
+  const RefCntBuffer *const fwd_buf = get_ref_frame_buf(cm, mbmi->ref_frame[1]);
+  const int cur_frame_index = cm->cur_frame->order_hint;
+  int bck_frame_index = 0, fwd_frame_index = 0;
+
+  if (bck_buf != NULL) bck_frame_index = bck_buf->order_hint;
+  if (fwd_buf != NULL) fwd_frame_index = fwd_buf->order_hint;
+
+  int d0 = clamp(abs(get_relative_dist(&cm->seq_params.order_hint_info,
+                                       fwd_frame_index, cur_frame_index)),
+                 0, MAX_FRAME_DISTANCE);
+  int d1 = clamp(abs(get_relative_dist(&cm->seq_params.order_hint_info,
+                                       cur_frame_index, bck_frame_index)),
+                 0, MAX_FRAME_DISTANCE);
+
+  const int order = d0 <= d1;
+
+  if (d0 == 0 || d1 == 0) {
+    *fwd_offset = quant_dist_lookup_table[order_idx][3][order];
+    *bck_offset = quant_dist_lookup_table[order_idx][3][1 - order];
+    return;
+  }
+
+  int i;
+  for (i = 0; i < 3; ++i) {
+    int c0 = quant_dist_weight[i][order];
+    int c1 = quant_dist_weight[i][!order];
+    int d0_c0 = d0 * c0;
+    int d1_c1 = d1 * c1;
+    if ((d0 > d1 && d0_c0 < d1_c1) || (d0 <= d1 && d0_c0 > d1_c1)) break;
+  }
+
+  *fwd_offset = quant_dist_lookup_table[order_idx][i][order];
+  *bck_offset = quant_dist_lookup_table[order_idx][i][1 - order];
+}
+
+// True if the following hold:
+//  1. Not intrabc and not build_for_obmc
+//  2. At least one dimension is size 4 with subsampling
+//  3. If sub-sampled, none of the previous blocks around the sub-sample
+//     are intrabc or inter-blocks
+static bool is_sub8x8_inter(const MACROBLOCKD *xd, int plane, BLOCK_SIZE bsize,
+                            int is_intrabc, int build_for_obmc) {
+  if (is_intrabc || build_for_obmc) {
+    return false;
+  }
+
+  const struct macroblockd_plane *const pd = &xd->plane[plane];
+  const int ss_x = pd->subsampling_x;
+  const int ss_y = pd->subsampling_y;
+  const int is_sub4_x = (block_size_wide[bsize] == 4) && ss_x;
+  const int is_sub4_y = (block_size_high[bsize] == 4) && ss_y;
+  if (!is_sub4_x && !is_sub4_y) {
+    return false;
+  }
+
+  // For sub8x8 chroma blocks, we may be covering more than one luma block's
+  // worth of pixels. Thus (mi_x, mi_y) may not be the correct coordinates for
+  // the top-left corner of the prediction source - the correct top-left corner
+  // is at (pre_x, pre_y).
+  const int row_start = is_sub4_y ? -1 : 0;
+  const int col_start = is_sub4_x ? -1 : 0;
+
+  for (int row = row_start; row <= 0; ++row) {
+    for (int col = col_start; col <= 0; ++col) {
+      const MB_MODE_INFO *this_mbmi = xd->mi[row * xd->mi_stride + col];
+      if (!is_inter_block(this_mbmi)) return false;
+      if (is_intrabc_block(this_mbmi)) return false;
+    }
+  }
+  return true;
+}
+
+static void build_inter_predictors_sub8x8(
+    const AV1_COMMON *cm, MACROBLOCKD *xd, int plane, const MB_MODE_INFO *mi,
+    int mi_x, int mi_y, uint8_t **mc_buf,
+    CalcSubpelParamsFunc calc_subpel_params_func) {
+  const BLOCK_SIZE bsize = mi->bsize;
+  struct macroblockd_plane *const pd = &xd->plane[plane];
+  const bool ss_x = pd->subsampling_x;
+  const bool ss_y = pd->subsampling_y;
+  const int b4_w = block_size_wide[bsize] >> ss_x;
+  const int b4_h = block_size_high[bsize] >> ss_y;
+  const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, ss_x, ss_y);
+  const int b8_w = block_size_wide[plane_bsize];
+  const int b8_h = block_size_high[plane_bsize];
+  const int is_compound = has_second_ref(mi);
+  assert(!is_compound);
+  assert(!is_intrabc_block(mi));
+
+  // For sub8x8 chroma blocks, we may be covering more than one luma block's
+  // worth of pixels. Thus (mi_x, mi_y) may not be the correct coordinates for
+  // the top-left corner of the prediction source - the correct top-left corner
+  // is at (pre_x, pre_y).
+  const int row_start = (block_size_high[bsize] == 4) && ss_y ? -1 : 0;
+  const int col_start = (block_size_wide[bsize] == 4) && ss_x ? -1 : 0;
+  const int pre_x = (mi_x + MI_SIZE * col_start) >> ss_x;
+  const int pre_y = (mi_y + MI_SIZE * row_start) >> ss_y;
+
+  int row = row_start;
+  for (int y = 0; y < b8_h; y += b4_h) {
+    int col = col_start;
+    for (int x = 0; x < b8_w; x += b4_w) {
+      MB_MODE_INFO *this_mbmi = xd->mi[row * xd->mi_stride + col];
+      struct buf_2d *const dst_buf = &pd->dst;
+      uint8_t *dst = dst_buf->buf + dst_buf->stride * y + x;
+      int ref = 0;
+      const RefCntBuffer *ref_buf =
+          get_ref_frame_buf(cm, this_mbmi->ref_frame[ref]);
+      const struct scale_factors *ref_scale_factors =
+          get_ref_scale_factors_const(cm, this_mbmi->ref_frame[ref]);
+      const struct scale_factors *const sf = ref_scale_factors;
+      const struct buf_2d pre_buf = {
+        NULL,
+        (plane == 1) ? ref_buf->buf.u_buffer : ref_buf->buf.v_buffer,
+        ref_buf->buf.uv_crop_width,
+        ref_buf->buf.uv_crop_height,
+        ref_buf->buf.uv_stride,
+      };
+
+      const MV mv = this_mbmi->mv[ref].as_mv;
+
+      InterPredParams inter_pred_params;
+      av1_init_inter_params(&inter_pred_params, b4_w, b4_h, pre_y + y,
+                            pre_x + x, pd->subsampling_x, pd->subsampling_y,
+                            xd->bd, is_cur_buf_hbd(xd), mi->use_intrabc, sf,
+                            &pre_buf, this_mbmi->interp_filters);
+      inter_pred_params.conv_params =
+          get_conv_params_no_round(ref, plane, NULL, 0, is_compound, xd->bd);
+
+      av1_build_one_inter_predictor(dst, dst_buf->stride, &mv,
+                                    &inter_pred_params, xd, mi_x + x, mi_y + y,
+                                    ref, mc_buf, calc_subpel_params_func);
+
+      ++col;
+    }
+    ++row;
+  }
+}
+
+static void build_inter_predictors_8x8_and_bigger(
+    const AV1_COMMON *cm, MACROBLOCKD *xd, int plane, const MB_MODE_INFO *mi,
+    int build_for_obmc, int bw, int bh, int mi_x, int mi_y, uint8_t **mc_buf,
+    CalcSubpelParamsFunc calc_subpel_params_func) {
+  const int is_compound = has_second_ref(mi);
+  const int is_intrabc = is_intrabc_block(mi);
+  assert(IMPLIES(is_intrabc, !is_compound));
+  struct macroblockd_plane *const pd = &xd->plane[plane];
+  struct buf_2d *const dst_buf = &pd->dst;
+  uint8_t *const dst = dst_buf->buf;
+
+  int is_global[2] = { 0, 0 };
+  for (int ref = 0; ref < 1 + is_compound; ++ref) {
+    const WarpedMotionParams *const wm = &xd->global_motion[mi->ref_frame[ref]];
+    is_global[ref] = is_global_mv_block(mi, wm->wmtype);
+  }
+
+  const BLOCK_SIZE bsize = mi->bsize;
+  const int ss_x = pd->subsampling_x;
+  const int ss_y = pd->subsampling_y;
+  const int row_start =
+      (block_size_high[bsize] == 4) && ss_y && !build_for_obmc ? -1 : 0;
+  const int col_start =
+      (block_size_wide[bsize] == 4) && ss_x && !build_for_obmc ? -1 : 0;
+  const int pre_x = (mi_x + MI_SIZE * col_start) >> ss_x;
+  const int pre_y = (mi_y + MI_SIZE * row_start) >> ss_y;
+
+  for (int ref = 0; ref < 1 + is_compound; ++ref) {
+    const struct scale_factors *const sf =
+        is_intrabc ? &cm->sf_identity : xd->block_ref_scale_factors[ref];
+    struct buf_2d *const pre_buf = is_intrabc ? dst_buf : &pd->pre[ref];
+    const MV mv = mi->mv[ref].as_mv;
+    const WarpTypesAllowed warp_types = { is_global[ref],
+                                          mi->motion_mode == WARPED_CAUSAL };
+
+    InterPredParams inter_pred_params;
+    av1_init_inter_params(&inter_pred_params, bw, bh, pre_y, pre_x,
+                          pd->subsampling_x, pd->subsampling_y, xd->bd,
+                          is_cur_buf_hbd(xd), mi->use_intrabc, sf, pre_buf,
+                          mi->interp_filters);
+    if (is_compound) av1_init_comp_mode(&inter_pred_params);
+    inter_pred_params.conv_params = get_conv_params_no_round(
+        ref, plane, xd->tmp_conv_dst, MAX_SB_SIZE, is_compound, xd->bd);
+
+    av1_dist_wtd_comp_weight_assign(
+        cm, mi, 0, &inter_pred_params.conv_params.fwd_offset,
+        &inter_pred_params.conv_params.bck_offset,
+        &inter_pred_params.conv_params.use_dist_wtd_comp_avg, is_compound);
+
+    if (!build_for_obmc)
+      av1_init_warp_params(&inter_pred_params, &warp_types, ref, xd, mi);
+
+    if (is_masked_compound_type(mi->interinter_comp.type)) {
+      inter_pred_params.sb_type = mi->bsize;
+      inter_pred_params.mask_comp = mi->interinter_comp;
+      if (ref == 1) {
+        inter_pred_params.conv_params.do_average = 0;
+        inter_pred_params.comp_mode = MASK_COMP;
+      }
+      // Assign physical buffer.
+      inter_pred_params.mask_comp.seg_mask = xd->seg_mask;
+    }
+
+    av1_build_one_inter_predictor(dst, dst_buf->stride, &mv, &inter_pred_params,
+                                  xd, mi_x, mi_y, ref, mc_buf,
+                                  calc_subpel_params_func);
+  }
+}
+
+void av1_build_inter_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd,
+                                int plane, const MB_MODE_INFO *mi,
+                                int build_for_obmc, int bw, int bh, int mi_x,
+                                int mi_y, uint8_t **mc_buf,
+                                CalcSubpelParamsFunc calc_subpel_params_func) {
+  if (is_sub8x8_inter(xd, plane, mi->bsize, is_intrabc_block(mi),
+                      build_for_obmc)) {
+    assert(bw < 8 || bh < 8);
+    build_inter_predictors_sub8x8(cm, xd, plane, mi, mi_x, mi_y, mc_buf,
+                                  calc_subpel_params_func);
+  } else {
+    build_inter_predictors_8x8_and_bigger(cm, xd, plane, mi, build_for_obmc, bw,
+                                          bh, mi_x, mi_y, mc_buf,
+                                          calc_subpel_params_func);
+  }
+}
+void av1_setup_dst_planes(struct macroblockd_plane *planes, BLOCK_SIZE bsize,
+                          const YV12_BUFFER_CONFIG *src, int mi_row, int mi_col,
+                          const int plane_start, const int plane_end) {
+  // We use AOMMIN(num_planes, MAX_MB_PLANE) instead of num_planes to quiet
+  // the static analysis warnings.
+  for (int i = plane_start; i < AOMMIN(plane_end, MAX_MB_PLANE); ++i) {
+    struct macroblockd_plane *const pd = &planes[i];
+    const int is_uv = i > 0;
+    setup_pred_plane(&pd->dst, bsize, src->buffers[i], src->crop_widths[is_uv],
+                     src->crop_heights[is_uv], src->strides[is_uv], mi_row,
+                     mi_col, NULL, pd->subsampling_x, pd->subsampling_y);
+  }
+}
+
+void av1_setup_pre_planes(MACROBLOCKD *xd, int idx,
+                          const YV12_BUFFER_CONFIG *src, int mi_row, int mi_col,
+                          const struct scale_factors *sf,
+                          const int num_planes) {
+  if (src != NULL) {
+    // We use AOMMIN(num_planes, MAX_MB_PLANE) instead of num_planes to quiet
+    // the static analysis warnings.
+    for (int i = 0; i < AOMMIN(num_planes, MAX_MB_PLANE); ++i) {
+      struct macroblockd_plane *const pd = &xd->plane[i];
+      const int is_uv = i > 0;
+      setup_pred_plane(&pd->pre[idx], xd->mi[0]->bsize, src->buffers[i],
+                       src->crop_widths[is_uv], src->crop_heights[is_uv],
+                       src->strides[is_uv], mi_row, mi_col, sf,
+                       pd->subsampling_x, pd->subsampling_y);
+    }
+  }
+}
+
+// obmc_mask_N[overlap_position]
+static const uint8_t obmc_mask_1[1] = { 64 };
+DECLARE_ALIGNED(2, static const uint8_t, obmc_mask_2[2]) = { 45, 64 };
+
+DECLARE_ALIGNED(4, static const uint8_t, obmc_mask_4[4]) = { 39, 50, 59, 64 };
+
+static const uint8_t obmc_mask_8[8] = { 36, 42, 48, 53, 57, 61, 64, 64 };
+
+static const uint8_t obmc_mask_16[16] = { 34, 37, 40, 43, 46, 49, 52, 54,
+                                          56, 58, 60, 61, 64, 64, 64, 64 };
+
+static const uint8_t obmc_mask_32[32] = { 33, 35, 36, 38, 40, 41, 43, 44,
+                                          45, 47, 48, 50, 51, 52, 53, 55,
+                                          56, 57, 58, 59, 60, 60, 61, 62,
+                                          64, 64, 64, 64, 64, 64, 64, 64 };
+
+static const uint8_t obmc_mask_64[64] = {
+  33, 34, 35, 35, 36, 37, 38, 39, 40, 40, 41, 42, 43, 44, 44, 44,
+  45, 46, 47, 47, 48, 49, 50, 51, 51, 51, 52, 52, 53, 54, 55, 56,
+  56, 56, 57, 57, 58, 58, 59, 60, 60, 60, 60, 60, 61, 62, 62, 62,
+  62, 62, 63, 63, 63, 63, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+};
+
+const uint8_t *av1_get_obmc_mask(int length) {
+  switch (length) {
+    case 1: return obmc_mask_1;
+    case 2: return obmc_mask_2;
+    case 4: return obmc_mask_4;
+    case 8: return obmc_mask_8;
+    case 16: return obmc_mask_16;
+    case 32: return obmc_mask_32;
+    case 64: return obmc_mask_64;
+    default: assert(0); return NULL;
+  }
+}
+
+static INLINE void increment_int_ptr(MACROBLOCKD *xd, int rel_mi_row,
+                                     int rel_mi_col, uint8_t op_mi_size,
+                                     int dir, MB_MODE_INFO *mi, void *fun_ctxt,
+                                     const int num_planes) {
+  (void)xd;
+  (void)rel_mi_row;
+  (void)rel_mi_col;
+  (void)op_mi_size;
+  (void)dir;
+  (void)mi;
+  ++*(int *)fun_ctxt;
+  (void)num_planes;
+}
+
+void av1_count_overlappable_neighbors(const AV1_COMMON *cm, MACROBLOCKD *xd) {
+  MB_MODE_INFO *mbmi = xd->mi[0];
+
+  mbmi->overlappable_neighbors = 0;
+
+  if (!is_motion_variation_allowed_bsize(mbmi->bsize)) return;
+
+  foreach_overlappable_nb_above(cm, xd, INT_MAX, increment_int_ptr,
+                                &mbmi->overlappable_neighbors);
+  if (mbmi->overlappable_neighbors) return;
+  foreach_overlappable_nb_left(cm, xd, INT_MAX, increment_int_ptr,
+                               &mbmi->overlappable_neighbors);
+}
+
+// HW does not support < 4x4 prediction. To limit the bandwidth requirement, if
+// block-size of current plane is smaller than 8x8, always only blend with the
+// left neighbor(s) (skip blending with the above side).
+#define DISABLE_CHROMA_U8X8_OBMC 0  // 0: one-sided obmc; 1: disable
+
+int av1_skip_u4x4_pred_in_obmc(BLOCK_SIZE bsize,
+                               const struct macroblockd_plane *pd, int dir) {
+  assert(is_motion_variation_allowed_bsize(bsize));
+
+  const BLOCK_SIZE bsize_plane =
+      get_plane_block_size(bsize, pd->subsampling_x, pd->subsampling_y);
+  switch (bsize_plane) {
+#if DISABLE_CHROMA_U8X8_OBMC
+    case BLOCK_4X4:
+    case BLOCK_8X4:
+    case BLOCK_4X8: return 1; break;
+#else
+    case BLOCK_4X4:
+    case BLOCK_8X4:
+    case BLOCK_4X8: return dir == 0; break;
+#endif
+    default: return 0;
+  }
+}
+
+void av1_modify_neighbor_predictor_for_obmc(MB_MODE_INFO *mbmi) {
+  mbmi->ref_frame[1] = NONE_FRAME;
+  mbmi->interinter_comp.type = COMPOUND_AVERAGE;
+
+  return;
+}
+
+struct obmc_inter_pred_ctxt {
+  uint8_t **adjacent;
+  int *adjacent_stride;
+};
+
+static INLINE void build_obmc_inter_pred_above(
+    MACROBLOCKD *xd, int rel_mi_row, int rel_mi_col, uint8_t op_mi_size,
+    int dir, MB_MODE_INFO *above_mi, void *fun_ctxt, const int num_planes) {
+  (void)above_mi;
+  (void)rel_mi_row;
+  (void)dir;
+  struct obmc_inter_pred_ctxt *ctxt = (struct obmc_inter_pred_ctxt *)fun_ctxt;
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+  const int overlap =
+      AOMMIN(block_size_high[bsize], block_size_high[BLOCK_64X64]) >> 1;
+
+  for (int plane = 0; plane < num_planes; ++plane) {
+    const struct macroblockd_plane *pd = &xd->plane[plane];
+    const int bw = (op_mi_size * MI_SIZE) >> pd->subsampling_x;
+    const int bh = overlap >> pd->subsampling_y;
+    const int plane_col = (rel_mi_col * MI_SIZE) >> pd->subsampling_x;
+
+    if (av1_skip_u4x4_pred_in_obmc(bsize, pd, 0)) continue;
+
+    const int dst_stride = pd->dst.stride;
+    uint8_t *const dst = &pd->dst.buf[plane_col];
+    const int tmp_stride = ctxt->adjacent_stride[plane];
+    const uint8_t *const tmp = &ctxt->adjacent[plane][plane_col];
+    const uint8_t *const mask = av1_get_obmc_mask(bh);
+#if CONFIG_AV1_HIGHBITDEPTH
+    const int is_hbd = is_cur_buf_hbd(xd);
+    if (is_hbd)
+      aom_highbd_blend_a64_vmask(dst, dst_stride, dst, dst_stride, tmp,
+                                 tmp_stride, mask, bw, bh, xd->bd);
+    else
+      aom_blend_a64_vmask(dst, dst_stride, dst, dst_stride, tmp, tmp_stride,
+                          mask, bw, bh);
+#else
+    aom_blend_a64_vmask(dst, dst_stride, dst, dst_stride, tmp, tmp_stride, mask,
+                        bw, bh);
+#endif
+  }
+}
+
+static INLINE void build_obmc_inter_pred_left(
+    MACROBLOCKD *xd, int rel_mi_row, int rel_mi_col, uint8_t op_mi_size,
+    int dir, MB_MODE_INFO *left_mi, void *fun_ctxt, const int num_planes) {
+  (void)left_mi;
+  (void)rel_mi_col;
+  (void)dir;
+  struct obmc_inter_pred_ctxt *ctxt = (struct obmc_inter_pred_ctxt *)fun_ctxt;
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+  const int overlap =
+      AOMMIN(block_size_wide[bsize], block_size_wide[BLOCK_64X64]) >> 1;
+
+  for (int plane = 0; plane < num_planes; ++plane) {
+    const struct macroblockd_plane *pd = &xd->plane[plane];
+    const int bw = overlap >> pd->subsampling_x;
+    const int bh = (op_mi_size * MI_SIZE) >> pd->subsampling_y;
+    const int plane_row = (rel_mi_row * MI_SIZE) >> pd->subsampling_y;
+
+    if (av1_skip_u4x4_pred_in_obmc(bsize, pd, 1)) continue;
+
+    const int dst_stride = pd->dst.stride;
+    uint8_t *const dst = &pd->dst.buf[plane_row * dst_stride];
+    const int tmp_stride = ctxt->adjacent_stride[plane];
+    const uint8_t *const tmp = &ctxt->adjacent[plane][plane_row * tmp_stride];
+    const uint8_t *const mask = av1_get_obmc_mask(bw);
+
+#if CONFIG_AV1_HIGHBITDEPTH
+    const int is_hbd = is_cur_buf_hbd(xd);
+    if (is_hbd)
+      aom_highbd_blend_a64_hmask(dst, dst_stride, dst, dst_stride, tmp,
+                                 tmp_stride, mask, bw, bh, xd->bd);
+    else
+      aom_blend_a64_hmask(dst, dst_stride, dst, dst_stride, tmp, tmp_stride,
+                          mask, bw, bh);
+#else
+    aom_blend_a64_hmask(dst, dst_stride, dst, dst_stride, tmp, tmp_stride, mask,
+                        bw, bh);
+#endif
+  }
+}
+
+// This function combines motion compensated predictions that are generated by
+// top/left neighboring blocks' inter predictors with the regular inter
+// prediction. We assume the original prediction (bmc) is stored in
+// xd->plane[].dst.buf
+void av1_build_obmc_inter_prediction(const AV1_COMMON *cm, MACROBLOCKD *xd,
+                                     uint8_t *above[MAX_MB_PLANE],
+                                     int above_stride[MAX_MB_PLANE],
+                                     uint8_t *left[MAX_MB_PLANE],
+                                     int left_stride[MAX_MB_PLANE]) {
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+
+  // handle above row
+  struct obmc_inter_pred_ctxt ctxt_above = { above, above_stride };
+  foreach_overlappable_nb_above(cm, xd,
+                                max_neighbor_obmc[mi_size_wide_log2[bsize]],
+                                build_obmc_inter_pred_above, &ctxt_above);
+
+  // handle left column
+  struct obmc_inter_pred_ctxt ctxt_left = { left, left_stride };
+  foreach_overlappable_nb_left(cm, xd,
+                               max_neighbor_obmc[mi_size_high_log2[bsize]],
+                               build_obmc_inter_pred_left, &ctxt_left);
+}
+
+void av1_setup_obmc_dst_bufs(MACROBLOCKD *xd, uint8_t **dst_buf1,
+                             uint8_t **dst_buf2) {
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (is_cur_buf_hbd(xd)) {
+    int len = sizeof(uint16_t);
+    dst_buf1[0] = CONVERT_TO_BYTEPTR(xd->tmp_obmc_bufs[0]);
+    dst_buf1[1] =
+        CONVERT_TO_BYTEPTR(xd->tmp_obmc_bufs[0] + MAX_SB_SQUARE * len);
+    dst_buf1[2] =
+        CONVERT_TO_BYTEPTR(xd->tmp_obmc_bufs[0] + MAX_SB_SQUARE * 2 * len);
+    dst_buf2[0] = CONVERT_TO_BYTEPTR(xd->tmp_obmc_bufs[1]);
+    dst_buf2[1] =
+        CONVERT_TO_BYTEPTR(xd->tmp_obmc_bufs[1] + MAX_SB_SQUARE * len);
+    dst_buf2[2] =
+        CONVERT_TO_BYTEPTR(xd->tmp_obmc_bufs[1] + MAX_SB_SQUARE * 2 * len);
+  } else {
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+    dst_buf1[0] = xd->tmp_obmc_bufs[0];
+    dst_buf1[1] = xd->tmp_obmc_bufs[0] + MAX_SB_SQUARE;
+    dst_buf1[2] = xd->tmp_obmc_bufs[0] + MAX_SB_SQUARE * 2;
+    dst_buf2[0] = xd->tmp_obmc_bufs[1];
+    dst_buf2[1] = xd->tmp_obmc_bufs[1] + MAX_SB_SQUARE;
+    dst_buf2[2] = xd->tmp_obmc_bufs[1] + MAX_SB_SQUARE * 2;
+#if CONFIG_AV1_HIGHBITDEPTH
+  }
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+}
+
+void av1_setup_build_prediction_by_above_pred(
+    MACROBLOCKD *xd, int rel_mi_col, uint8_t above_mi_width,
+    MB_MODE_INFO *above_mbmi, struct build_prediction_ctxt *ctxt,
+    const int num_planes) {
+  const BLOCK_SIZE a_bsize = AOMMAX(BLOCK_8X8, above_mbmi->bsize);
+  const int above_mi_col = xd->mi_col + rel_mi_col;
+
+  av1_modify_neighbor_predictor_for_obmc(above_mbmi);
+
+  for (int j = 0; j < num_planes; ++j) {
+    struct macroblockd_plane *const pd = &xd->plane[j];
+    setup_pred_plane(&pd->dst, a_bsize, ctxt->tmp_buf[j], ctxt->tmp_width[j],
+                     ctxt->tmp_height[j], ctxt->tmp_stride[j], 0, rel_mi_col,
+                     NULL, pd->subsampling_x, pd->subsampling_y);
+  }
+
+  const int num_refs = 1 + has_second_ref(above_mbmi);
+
+  for (int ref = 0; ref < num_refs; ++ref) {
+    const MV_REFERENCE_FRAME frame = above_mbmi->ref_frame[ref];
+
+    const RefCntBuffer *const ref_buf = get_ref_frame_buf(ctxt->cm, frame);
+    const struct scale_factors *const sf =
+        get_ref_scale_factors_const(ctxt->cm, frame);
+    xd->block_ref_scale_factors[ref] = sf;
+    if ((!av1_is_valid_scale(sf)))
+      aom_internal_error(xd->error_info, AOM_CODEC_UNSUP_BITSTREAM,
+                         "Reference frame has invalid dimensions");
+    av1_setup_pre_planes(xd, ref, &ref_buf->buf, xd->mi_row, above_mi_col, sf,
+                         num_planes);
+  }
+
+  xd->mb_to_left_edge = 8 * MI_SIZE * (-above_mi_col);
+  xd->mb_to_right_edge =
+      ctxt->mb_to_far_edge +
+      (xd->width - rel_mi_col - above_mi_width) * MI_SIZE * 8;
+}
+
+void av1_setup_build_prediction_by_left_pred(MACROBLOCKD *xd, int rel_mi_row,
+                                             uint8_t left_mi_height,
+                                             MB_MODE_INFO *left_mbmi,
+                                             struct build_prediction_ctxt *ctxt,
+                                             const int num_planes) {
+  const BLOCK_SIZE l_bsize = AOMMAX(BLOCK_8X8, left_mbmi->bsize);
+  const int left_mi_row = xd->mi_row + rel_mi_row;
+
+  av1_modify_neighbor_predictor_for_obmc(left_mbmi);
+
+  for (int j = 0; j < num_planes; ++j) {
+    struct macroblockd_plane *const pd = &xd->plane[j];
+    setup_pred_plane(&pd->dst, l_bsize, ctxt->tmp_buf[j], ctxt->tmp_width[j],
+                     ctxt->tmp_height[j], ctxt->tmp_stride[j], rel_mi_row, 0,
+                     NULL, pd->subsampling_x, pd->subsampling_y);
+  }
+
+  const int num_refs = 1 + has_second_ref(left_mbmi);
+
+  for (int ref = 0; ref < num_refs; ++ref) {
+    const MV_REFERENCE_FRAME frame = left_mbmi->ref_frame[ref];
+
+    const RefCntBuffer *const ref_buf = get_ref_frame_buf(ctxt->cm, frame);
+    const struct scale_factors *const ref_scale_factors =
+        get_ref_scale_factors_const(ctxt->cm, frame);
+
+    xd->block_ref_scale_factors[ref] = ref_scale_factors;
+    if ((!av1_is_valid_scale(ref_scale_factors)))
+      aom_internal_error(xd->error_info, AOM_CODEC_UNSUP_BITSTREAM,
+                         "Reference frame has invalid dimensions");
+    av1_setup_pre_planes(xd, ref, &ref_buf->buf, left_mi_row, xd->mi_col,
+                         ref_scale_factors, num_planes);
+  }
+
+  xd->mb_to_top_edge = GET_MV_SUBPEL(MI_SIZE * (-left_mi_row));
+  xd->mb_to_bottom_edge =
+      ctxt->mb_to_far_edge +
+      GET_MV_SUBPEL((xd->height - rel_mi_row - left_mi_height) * MI_SIZE);
+}
+
+static AOM_INLINE void combine_interintra(
+    INTERINTRA_MODE mode, int8_t use_wedge_interintra, int8_t wedge_index,
+    int8_t wedge_sign, BLOCK_SIZE bsize, BLOCK_SIZE plane_bsize,
+    uint8_t *comppred, int compstride, const uint8_t *interpred,
+    int interstride, const uint8_t *intrapred, int intrastride) {
+  const int bw = block_size_wide[plane_bsize];
+  const int bh = block_size_high[plane_bsize];
+
+  if (use_wedge_interintra) {
+    if (av1_is_wedge_used(bsize)) {
+      const uint8_t *mask =
+          av1_get_contiguous_soft_mask(wedge_index, wedge_sign, bsize);
+      const int subw = 2 * mi_size_wide[bsize] == bw;
+      const int subh = 2 * mi_size_high[bsize] == bh;
+      aom_blend_a64_mask(comppred, compstride, intrapred, intrastride,
+                         interpred, interstride, mask, block_size_wide[bsize],
+                         bw, bh, subw, subh);
+    }
+    return;
+  }
+
+  const uint8_t *mask = smooth_interintra_mask_buf[mode][plane_bsize];
+  aom_blend_a64_mask(comppred, compstride, intrapred, intrastride, interpred,
+                     interstride, mask, bw, bw, bh, 0, 0);
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static AOM_INLINE void combine_interintra_highbd(
+    INTERINTRA_MODE mode, int8_t use_wedge_interintra, int8_t wedge_index,
+    int8_t wedge_sign, BLOCK_SIZE bsize, BLOCK_SIZE plane_bsize,
+    uint8_t *comppred8, int compstride, const uint8_t *interpred8,
+    int interstride, const uint8_t *intrapred8, int intrastride, int bd) {
+  const int bw = block_size_wide[plane_bsize];
+  const int bh = block_size_high[plane_bsize];
+
+  if (use_wedge_interintra) {
+    if (av1_is_wedge_used(bsize)) {
+      const uint8_t *mask =
+          av1_get_contiguous_soft_mask(wedge_index, wedge_sign, bsize);
+      const int subh = 2 * mi_size_high[bsize] == bh;
+      const int subw = 2 * mi_size_wide[bsize] == bw;
+      aom_highbd_blend_a64_mask(comppred8, compstride, intrapred8, intrastride,
+                                interpred8, interstride, mask,
+                                block_size_wide[bsize], bw, bh, subw, subh, bd);
+    }
+    return;
+  }
+
+  uint8_t mask[MAX_SB_SQUARE];
+  build_smooth_interintra_mask(mask, bw, plane_bsize, mode);
+  aom_highbd_blend_a64_mask(comppred8, compstride, intrapred8, intrastride,
+                            interpred8, interstride, mask, bw, bw, bh, 0, 0,
+                            bd);
+}
+#endif
+
+void av1_build_intra_predictors_for_interintra(const AV1_COMMON *cm,
+                                               MACROBLOCKD *xd,
+                                               BLOCK_SIZE bsize, int plane,
+                                               const BUFFER_SET *ctx,
+                                               uint8_t *dst, int dst_stride) {
+  struct macroblockd_plane *const pd = &xd->plane[plane];
+  const int ssx = xd->plane[plane].subsampling_x;
+  const int ssy = xd->plane[plane].subsampling_y;
+  BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, ssx, ssy);
+  PREDICTION_MODE mode = interintra_to_intra_mode[xd->mi[0]->interintra_mode];
+  assert(xd->mi[0]->angle_delta[PLANE_TYPE_Y] == 0);
+  assert(xd->mi[0]->angle_delta[PLANE_TYPE_UV] == 0);
+  assert(xd->mi[0]->filter_intra_mode_info.use_filter_intra == 0);
+  assert(xd->mi[0]->use_intrabc == 0);
+
+  av1_predict_intra_block(cm, xd, pd->width, pd->height,
+                          max_txsize_rect_lookup[plane_bsize], mode, 0, 0,
+                          FILTER_INTRA_MODES, ctx->plane[plane],
+                          ctx->stride[plane], dst, dst_stride, 0, 0, plane);
+}
+
+void av1_combine_interintra(MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane,
+                            const uint8_t *inter_pred, int inter_stride,
+                            const uint8_t *intra_pred, int intra_stride) {
+  const int ssx = xd->plane[plane].subsampling_x;
+  const int ssy = xd->plane[plane].subsampling_y;
+  const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, ssx, ssy);
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (is_cur_buf_hbd(xd)) {
+    combine_interintra_highbd(
+        xd->mi[0]->interintra_mode, xd->mi[0]->use_wedge_interintra,
+        xd->mi[0]->interintra_wedge_index, INTERINTRA_WEDGE_SIGN, bsize,
+        plane_bsize, xd->plane[plane].dst.buf, xd->plane[plane].dst.stride,
+        inter_pred, inter_stride, intra_pred, intra_stride, xd->bd);
+    return;
+  }
+#endif
+  combine_interintra(
+      xd->mi[0]->interintra_mode, xd->mi[0]->use_wedge_interintra,
+      xd->mi[0]->interintra_wedge_index, INTERINTRA_WEDGE_SIGN, bsize,
+      plane_bsize, xd->plane[plane].dst.buf, xd->plane[plane].dst.stride,
+      inter_pred, inter_stride, intra_pred, intra_stride);
+}
+
+// build interintra_predictors for one plane
+void av1_build_interintra_predictor(const AV1_COMMON *cm, MACROBLOCKD *xd,
+                                    uint8_t *pred, int stride,
+                                    const BUFFER_SET *ctx, int plane,
+                                    BLOCK_SIZE bsize) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  if (is_cur_buf_hbd(xd)) {
+    DECLARE_ALIGNED(16, uint16_t, intrapredictor[MAX_SB_SQUARE]);
+    av1_build_intra_predictors_for_interintra(
+        cm, xd, bsize, plane, ctx, CONVERT_TO_BYTEPTR(intrapredictor),
+        MAX_SB_SIZE);
+    av1_combine_interintra(xd, bsize, plane, pred, stride,
+                           CONVERT_TO_BYTEPTR(intrapredictor), MAX_SB_SIZE);
+  } else {
+    DECLARE_ALIGNED(16, uint8_t, intrapredictor[MAX_SB_SQUARE]);
+    av1_build_intra_predictors_for_interintra(cm, xd, bsize, plane, ctx,
+                                              intrapredictor, MAX_SB_SIZE);
+    av1_combine_interintra(xd, bsize, plane, pred, stride, intrapredictor,
+                           MAX_SB_SIZE);
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h
new file mode 100644
index 0000000000..9f69e815eb
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h
@@ -0,0 +1,405 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_RECONINTER_H_
+#define AOM_AV1_COMMON_RECONINTER_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+
+// Work out how many pixels off the edge of a reference frame we're allowed
+// to go when forming an inter prediction.
+// The outermost row/col of each referernce frame is extended by
+// (AOM_BORDER_IN_PIXELS >> subsampling) pixels, but we need to keep
+// at least AOM_INTERP_EXTEND pixels within that to account for filtering.
+//
+// We have to break this up into two macros to keep both clang-format and
+// tools/lint-hunks.py happy.
+#define AOM_LEFT_TOP_MARGIN_PX(subsampling) \
+  ((AOM_BORDER_IN_PIXELS >> subsampling) - AOM_INTERP_EXTEND)
+#define AOM_LEFT_TOP_MARGIN_SCALED(subsampling) \
+  (AOM_LEFT_TOP_MARGIN_PX(subsampling) << SCALE_SUBPEL_BITS)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAX_WEDGE_TYPES 16
+
+#define MAX_WEDGE_SIZE_LOG2 5  // 32x32
+#define MAX_WEDGE_SIZE (1 << MAX_WEDGE_SIZE_LOG2)
+#define MAX_WEDGE_SQUARE (MAX_WEDGE_SIZE * MAX_WEDGE_SIZE)
+
+#define WEDGE_WEIGHT_BITS 6
+
+#define WEDGE_NONE -1
+
+// Angles are with respect to horizontal anti-clockwise
+enum {
+  WEDGE_HORIZONTAL = 0,
+  WEDGE_VERTICAL = 1,
+  WEDGE_OBLIQUE27 = 2,
+  WEDGE_OBLIQUE63 = 3,
+  WEDGE_OBLIQUE117 = 4,
+  WEDGE_OBLIQUE153 = 5,
+  WEDGE_DIRECTIONS
+} UENUM1BYTE(WedgeDirectionType);
+
+// 3-tuple: {direction, x_offset, y_offset}
+typedef struct {
+  WedgeDirectionType direction;
+  int x_offset;
+  int y_offset;
+} wedge_code_type;
+
+typedef uint8_t *wedge_masks_type[MAX_WEDGE_TYPES];
+
+typedef struct {
+  int wedge_types;
+  const wedge_code_type *codebook;
+  uint8_t *signflip;
+  wedge_masks_type *masks;
+} wedge_params_type;
+
+extern const wedge_params_type av1_wedge_params_lookup[BLOCK_SIZES_ALL];
+
+typedef struct SubpelParams {
+  int xs;
+  int ys;
+  int subpel_x;
+  int subpel_y;
+} SubpelParams;
+
+struct build_prediction_ctxt {
+  const AV1_COMMON *cm;
+  uint8_t **tmp_buf;
+  int *tmp_width;
+  int *tmp_height;
+  int *tmp_stride;
+  int mb_to_far_edge;
+  void *dcb;  // Decoder-only coding block.
+};
+
+typedef enum InterPredMode {
+  TRANSLATION_PRED,
+  WARP_PRED,
+} InterPredMode;
+
+typedef enum InterCompMode {
+  UNIFORM_SINGLE,
+  UNIFORM_COMP,
+  MASK_COMP,
+} InterCompMode;
+
+typedef struct InterPredParams {
+  InterPredMode mode;
+  InterCompMode comp_mode;
+  WarpedMotionParams warp_params;
+  ConvolveParams conv_params;
+  const InterpFilterParams *interp_filter_params[2];
+  int block_width;
+  int block_height;
+  int pix_row;
+  int pix_col;
+  struct buf_2d ref_frame_buf;
+  int subsampling_x;
+  int subsampling_y;
+  const struct scale_factors *scale_factors;
+  int bit_depth;
+  int use_hbd_buf;
+  INTERINTER_COMPOUND_DATA mask_comp;
+  BLOCK_SIZE sb_type;
+  int is_intrabc;
+} InterPredParams;
+
+void av1_init_inter_params(InterPredParams *inter_pred_params, int block_width,
+                           int block_height, int pix_row, int pix_col,
+                           int subsampling_x, int subsampling_y, int bit_depth,
+                           int use_hbd_buf, int is_intrabc,
+                           const struct scale_factors *sf,
+                           const struct buf_2d *ref_buf,
+                           int_interpfilters interp_filters);
+
+void av1_init_comp_mode(InterPredParams *inter_pred_params);
+
+void av1_init_warp_params(InterPredParams *inter_pred_params,
+                          const WarpTypesAllowed *warp_types, int ref,
+                          const MACROBLOCKD *xd, const MB_MODE_INFO *mi);
+
+static INLINE int has_scale(int xs, int ys) {
+  return xs != SCALE_SUBPEL_SHIFTS || ys != SCALE_SUBPEL_SHIFTS;
+}
+
+static INLINE void revert_scale_extra_bits(SubpelParams *sp) {
+  sp->subpel_x >>= SCALE_EXTRA_BITS;
+  sp->subpel_y >>= SCALE_EXTRA_BITS;
+  sp->xs >>= SCALE_EXTRA_BITS;
+  sp->ys >>= SCALE_EXTRA_BITS;
+  assert(sp->subpel_x < SUBPEL_SHIFTS);
+  assert(sp->subpel_y < SUBPEL_SHIFTS);
+  assert(sp->xs <= SUBPEL_SHIFTS);
+  assert(sp->ys <= SUBPEL_SHIFTS);
+}
+
+static INLINE void inter_predictor(
+    const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride,
+    const SubpelParams *subpel_params, int w, int h,
+    ConvolveParams *conv_params, const InterpFilterParams *interp_filters[2]) {
+  assert(conv_params->do_average == 0 || conv_params->do_average == 1);
+  const int is_scaled = has_scale(subpel_params->xs, subpel_params->ys);
+  if (is_scaled) {
+    av1_convolve_2d_facade(src, src_stride, dst, dst_stride, w, h,
+                           interp_filters, subpel_params->subpel_x,
+                           subpel_params->xs, subpel_params->subpel_y,
+                           subpel_params->ys, 1, conv_params);
+  } else {
+    SubpelParams sp = *subpel_params;
+    revert_scale_extra_bits(&sp);
+    av1_convolve_2d_facade(src, src_stride, dst, dst_stride, w, h,
+                           interp_filters, sp.subpel_x, sp.xs, sp.subpel_y,
+                           sp.ys, 0, conv_params);
+  }
+}
+
+static INLINE void highbd_inter_predictor(
+    const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride,
+    const SubpelParams *subpel_params, int w, int h,
+    ConvolveParams *conv_params, const InterpFilterParams *interp_filters[2],
+    int bd) {
+  assert(conv_params->do_average == 0 || conv_params->do_average == 1);
+  const int is_scaled = has_scale(subpel_params->xs, subpel_params->ys);
+  if (is_scaled) {
+    av1_highbd_convolve_2d_facade(src, src_stride, dst, dst_stride, w, h,
+                                  interp_filters, subpel_params->subpel_x,
+                                  subpel_params->xs, subpel_params->subpel_y,
+                                  subpel_params->ys, 1, conv_params, bd);
+  } else {
+    SubpelParams sp = *subpel_params;
+    revert_scale_extra_bits(&sp);
+    av1_highbd_convolve_2d_facade(src, src_stride, dst, dst_stride, w, h,
+                                  interp_filters, sp.subpel_x, sp.xs,
+                                  sp.subpel_y, sp.ys, 0, conv_params, bd);
+  }
+}
+
+void av1_modify_neighbor_predictor_for_obmc(MB_MODE_INFO *mbmi);
+int av1_skip_u4x4_pred_in_obmc(BLOCK_SIZE bsize,
+                               const struct macroblockd_plane *pd, int dir);
+
+static INLINE int is_interinter_compound_used(COMPOUND_TYPE type,
+                                              BLOCK_SIZE sb_type) {
+  const int comp_allowed = is_comp_ref_allowed(sb_type);
+  switch (type) {
+    case COMPOUND_AVERAGE:
+    case COMPOUND_DISTWTD:
+    case COMPOUND_DIFFWTD: return comp_allowed;
+    case COMPOUND_WEDGE:
+      return comp_allowed && av1_wedge_params_lookup[sb_type].wedge_types > 0;
+    default: assert(0); return 0;
+  }
+}
+
+static INLINE int is_any_masked_compound_used(BLOCK_SIZE sb_type) {
+  COMPOUND_TYPE comp_type;
+  int i;
+  if (!is_comp_ref_allowed(sb_type)) return 0;
+  for (i = 0; i < COMPOUND_TYPES; i++) {
+    comp_type = (COMPOUND_TYPE)i;
+    if (is_masked_compound_type(comp_type) &&
+        is_interinter_compound_used(comp_type, sb_type))
+      return 1;
+  }
+  return 0;
+}
+
+static INLINE int get_wedge_types_lookup(BLOCK_SIZE sb_type) {
+  return av1_wedge_params_lookup[sb_type].wedge_types;
+}
+
+static INLINE int av1_is_wedge_used(BLOCK_SIZE sb_type) {
+  return av1_wedge_params_lookup[sb_type].wedge_types > 0;
+}
+
+void av1_make_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst,
+                              int dst_stride,
+                              InterPredParams *inter_pred_params,
+                              const SubpelParams *subpel_params);
+
+typedef void (*CalcSubpelParamsFunc)(const MV *const src_mv,
+                                     InterPredParams *const inter_pred_params,
+                                     MACROBLOCKD *xd, int mi_x, int mi_y,
+                                     int ref, uint8_t **mc_buf, uint8_t **pre,
+                                     SubpelParams *subpel_params,
+                                     int *src_stride);
+
+void av1_build_one_inter_predictor(
+    uint8_t *dst, int dst_stride, const MV *const src_mv,
+    InterPredParams *inter_pred_params, MACROBLOCKD *xd, int mi_x, int mi_y,
+    int ref, uint8_t **mc_buf, CalcSubpelParamsFunc calc_subpel_params_func);
+
+void av1_build_inter_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd,
+                                int plane, const MB_MODE_INFO *mi,
+                                int build_for_obmc, int bw, int bh, int mi_x,
+                                int mi_y, uint8_t **mc_buf,
+                                CalcSubpelParamsFunc calc_subpel_params_func);
+
+// TODO(jkoleszar): yet another mv clamping function :-(
+static INLINE MV clamp_mv_to_umv_border_sb(const MACROBLOCKD *xd,
+                                           const MV *src_mv, int bw, int bh,
+                                           int ss_x, int ss_y) {
+  // If the MV points so far into the UMV border that no visible pixels
+  // are used for reconstruction, the subpel part of the MV can be
+  // discarded and the MV limited to 16 pixels with equivalent results.
+  const int spel_left = (AOM_INTERP_EXTEND + bw) << SUBPEL_BITS;
+  const int spel_right = spel_left - SUBPEL_SHIFTS;
+  const int spel_top = (AOM_INTERP_EXTEND + bh) << SUBPEL_BITS;
+  const int spel_bottom = spel_top - SUBPEL_SHIFTS;
+  MV clamped_mv = { (int16_t)(src_mv->row * (1 << (1 - ss_y))),
+                    (int16_t)(src_mv->col * (1 << (1 - ss_x))) };
+  assert(ss_x <= 1);
+  assert(ss_y <= 1);
+  const SubpelMvLimits mv_limits = {
+    xd->mb_to_left_edge * (1 << (1 - ss_x)) - spel_left,
+    xd->mb_to_right_edge * (1 << (1 - ss_x)) + spel_right,
+    xd->mb_to_top_edge * (1 << (1 - ss_y)) - spel_top,
+    xd->mb_to_bottom_edge * (1 << (1 - ss_y)) + spel_bottom
+  };
+
+  clamp_mv(&clamped_mv, &mv_limits);
+
+  return clamped_mv;
+}
+
+static INLINE int64_t scaled_buffer_offset(int x_offset, int y_offset,
+                                           int stride,
+                                           const struct scale_factors *sf) {
+  const int x =
+      sf ? sf->scale_value_x(x_offset, sf) >> SCALE_EXTRA_BITS : x_offset;
+  const int y =
+      sf ? sf->scale_value_y(y_offset, sf) >> SCALE_EXTRA_BITS : y_offset;
+  return (int64_t)y * stride + x;
+}
+
+static INLINE void setup_pred_plane(struct buf_2d *dst, BLOCK_SIZE bsize,
+                                    uint8_t *src, int width, int height,
+                                    int stride, int mi_row, int mi_col,
+                                    const struct scale_factors *scale,
+                                    int subsampling_x, int subsampling_y) {
+  // Offset the buffer pointer
+  if (subsampling_y && (mi_row & 0x01) && (mi_size_high[bsize] == 1))
+    mi_row -= 1;
+  if (subsampling_x && (mi_col & 0x01) && (mi_size_wide[bsize] == 1))
+    mi_col -= 1;
+
+  const int x = (MI_SIZE * mi_col) >> subsampling_x;
+  const int y = (MI_SIZE * mi_row) >> subsampling_y;
+  dst->buf = src + scaled_buffer_offset(x, y, stride, scale);
+  dst->buf0 = src;
+  dst->width = width;
+  dst->height = height;
+  dst->stride = stride;
+}
+
+void av1_setup_dst_planes(struct macroblockd_plane *planes, BLOCK_SIZE bsize,
+                          const YV12_BUFFER_CONFIG *src, int mi_row, int mi_col,
+                          const int plane_start, const int plane_end);
+
+void av1_setup_pre_planes(MACROBLOCKD *xd, int idx,
+                          const YV12_BUFFER_CONFIG *src, int mi_row, int mi_col,
+                          const struct scale_factors *sf, const int num_planes);
+
+static INLINE void set_default_interp_filters(
+    MB_MODE_INFO *const mbmi, InterpFilter frame_interp_filter) {
+  mbmi->interp_filters =
+      av1_broadcast_interp_filter(av1_unswitchable_filter(frame_interp_filter));
+}
+
+static INLINE int av1_is_interp_needed(const MACROBLOCKD *const xd) {
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  if (mbmi->skip_mode) return 0;
+  if (mbmi->motion_mode == WARPED_CAUSAL) return 0;
+  if (is_nontrans_global_motion(xd, xd->mi[0])) return 0;
+  return 1;
+}
+
+// Sets up buffers 'dst_buf1' and 'dst_buf2' from relevant buffers in 'xd' for
+// subsequent use in OBMC prediction.
+void av1_setup_obmc_dst_bufs(MACROBLOCKD *xd, uint8_t **dst_buf1,
+                             uint8_t **dst_buf2);
+
+void av1_setup_build_prediction_by_above_pred(
+    MACROBLOCKD *xd, int rel_mi_col, uint8_t above_mi_width,
+    MB_MODE_INFO *above_mbmi, struct build_prediction_ctxt *ctxt,
+    const int num_planes);
+void av1_setup_build_prediction_by_left_pred(MACROBLOCKD *xd, int rel_mi_row,
+                                             uint8_t left_mi_height,
+                                             MB_MODE_INFO *left_mbmi,
+                                             struct build_prediction_ctxt *ctxt,
+                                             const int num_planes);
+void av1_build_obmc_inter_prediction(const AV1_COMMON *cm, MACROBLOCKD *xd,
+                                     uint8_t *above[MAX_MB_PLANE],
+                                     int above_stride[MAX_MB_PLANE],
+                                     uint8_t *left[MAX_MB_PLANE],
+                                     int left_stride[MAX_MB_PLANE]);
+
+const uint8_t *av1_get_obmc_mask(int length);
+void av1_count_overlappable_neighbors(const AV1_COMMON *cm, MACROBLOCKD *xd);
+
+#define MASK_MASTER_SIZE ((MAX_WEDGE_SIZE) << 1)
+#define MASK_MASTER_STRIDE (MASK_MASTER_SIZE)
+
+void av1_init_wedge_masks();
+
+static INLINE const uint8_t *av1_get_contiguous_soft_mask(int8_t wedge_index,
+                                                          int8_t wedge_sign,
+                                                          BLOCK_SIZE sb_type) {
+  return av1_wedge_params_lookup[sb_type].masks[wedge_sign][wedge_index];
+}
+
+void av1_dist_wtd_comp_weight_assign(const AV1_COMMON *cm,
+                                     const MB_MODE_INFO *mbmi, int order_idx,
+                                     int *fwd_offset, int *bck_offset,
+                                     int *use_dist_wtd_comp_avg,
+                                     int is_compound);
+
+const uint8_t *av1_get_compound_type_mask(
+    const INTERINTER_COMPOUND_DATA *const comp_data, BLOCK_SIZE sb_type);
+
+// build interintra_predictors for one plane
+void av1_build_interintra_predictor(const AV1_COMMON *cm, MACROBLOCKD *xd,
+                                    uint8_t *pred, int stride,
+                                    const BUFFER_SET *ctx, int plane,
+                                    BLOCK_SIZE bsize);
+
+void av1_build_intra_predictors_for_interintra(const AV1_COMMON *cm,
+                                               MACROBLOCKD *xd,
+                                               BLOCK_SIZE bsize, int plane,
+                                               const BUFFER_SET *ctx,
+                                               uint8_t *dst, int dst_stride);
+
+void av1_combine_interintra(MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane,
+                            const uint8_t *inter_pred, int inter_stride,
+                            const uint8_t *intra_pred, int intra_stride);
+
+int av1_allow_warp(const MB_MODE_INFO *const mbmi,
+                   const WarpTypesAllowed *const warp_types,
+                   const WarpedMotionParams *const gm_params,
+                   int build_for_obmc, const struct scale_factors *const sf,
+                   WarpedMotionParams *final_warp_params);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_RECONINTER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.c
new file mode 100644
index 0000000000..0feb1b2818
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.c
@@ -0,0 +1,1711 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <math.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_once.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/system_state.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h"
+
+enum {
+  NEED_LEFT = 1 << 1,
+  NEED_ABOVE = 1 << 2,
+  NEED_ABOVERIGHT = 1 << 3,
+  NEED_ABOVELEFT = 1 << 4,
+  NEED_BOTTOMLEFT = 1 << 5,
+};
+
+#define INTRA_EDGE_FILT 3
+#define INTRA_EDGE_TAPS 5
+#define MAX_UPSAMPLE_SZ 16
+#define NUM_INTRA_NEIGHBOUR_PIXELS (MAX_TX_SIZE * 2 + 32)
+
+static const uint8_t extend_modes[INTRA_MODES] = {
+  NEED_ABOVE | NEED_LEFT,                   // DC
+  NEED_ABOVE,                               // V
+  NEED_LEFT,                                // H
+  NEED_ABOVE | NEED_ABOVERIGHT,             // D45
+  NEED_LEFT | NEED_ABOVE | NEED_ABOVELEFT,  // D135
+  NEED_LEFT | NEED_ABOVE | NEED_ABOVELEFT,  // D113
+  NEED_LEFT | NEED_ABOVE | NEED_ABOVELEFT,  // D157
+  NEED_LEFT | NEED_BOTTOMLEFT,              // D203
+  NEED_ABOVE | NEED_ABOVERIGHT,             // D67
+  NEED_LEFT | NEED_ABOVE,                   // SMOOTH
+  NEED_LEFT | NEED_ABOVE,                   // SMOOTH_V
+  NEED_LEFT | NEED_ABOVE,                   // SMOOTH_H
+  NEED_LEFT | NEED_ABOVE | NEED_ABOVELEFT,  // PAETH
+};
+
+// Tables to store if the top-right reference pixels are available. The flags
+// are represented with bits, packed into 8-bit integers. E.g., for the 32x32
+// blocks in a 128x128 superblock, the index of the "o" block is 10 (in raster
+// order), so its flag is stored at the 3rd bit of the 2nd entry in the table,
+// i.e. (table[10 / 8] >> (10 % 8)) & 1.
+//       . . . .
+//       . . . .
+//       . . o .
+//       . . . .
+static uint8_t has_tr_4x4[128] = {
+  255, 255, 255, 255, 85, 85, 85, 85, 119, 119, 119, 119, 85, 85, 85, 85,
+  127, 127, 127, 127, 85, 85, 85, 85, 119, 119, 119, 119, 85, 85, 85, 85,
+  255, 127, 255, 127, 85, 85, 85, 85, 119, 119, 119, 119, 85, 85, 85, 85,
+  127, 127, 127, 127, 85, 85, 85, 85, 119, 119, 119, 119, 85, 85, 85, 85,
+  255, 255, 255, 127, 85, 85, 85, 85, 119, 119, 119, 119, 85, 85, 85, 85,
+  127, 127, 127, 127, 85, 85, 85, 85, 119, 119, 119, 119, 85, 85, 85, 85,
+  255, 127, 255, 127, 85, 85, 85, 85, 119, 119, 119, 119, 85, 85, 85, 85,
+  127, 127, 127, 127, 85, 85, 85, 85, 119, 119, 119, 119, 85, 85, 85, 85,
+};
+static uint8_t has_tr_4x8[64] = {
+  255, 255, 255, 255, 119, 119, 119, 119, 127, 127, 127, 127, 119,
+  119, 119, 119, 255, 127, 255, 127, 119, 119, 119, 119, 127, 127,
+  127, 127, 119, 119, 119, 119, 255, 255, 255, 127, 119, 119, 119,
+  119, 127, 127, 127, 127, 119, 119, 119, 119, 255, 127, 255, 127,
+  119, 119, 119, 119, 127, 127, 127, 127, 119, 119, 119, 119,
+};
+static uint8_t has_tr_8x4[64] = {
+  255, 255, 0, 0, 85, 85, 0, 0, 119, 119, 0, 0, 85, 85, 0, 0,
+  127, 127, 0, 0, 85, 85, 0, 0, 119, 119, 0, 0, 85, 85, 0, 0,
+  255, 127, 0, 0, 85, 85, 0, 0, 119, 119, 0, 0, 85, 85, 0, 0,
+  127, 127, 0, 0, 85, 85, 0, 0, 119, 119, 0, 0, 85, 85, 0, 0,
+};
+static uint8_t has_tr_8x8[32] = {
+  255, 255, 85, 85, 119, 119, 85, 85, 127, 127, 85, 85, 119, 119, 85, 85,
+  255, 127, 85, 85, 119, 119, 85, 85, 127, 127, 85, 85, 119, 119, 85, 85,
+};
+static uint8_t has_tr_8x16[16] = {
+  255, 255, 119, 119, 127, 127, 119, 119,
+  255, 127, 119, 119, 127, 127, 119, 119,
+};
+static uint8_t has_tr_16x8[16] = {
+  255, 0, 85, 0, 119, 0, 85, 0, 127, 0, 85, 0, 119, 0, 85, 0,
+};
+static uint8_t has_tr_16x16[8] = {
+  255, 85, 119, 85, 127, 85, 119, 85,
+};
+static uint8_t has_tr_16x32[4] = { 255, 119, 127, 119 };
+static uint8_t has_tr_32x16[4] = { 15, 5, 7, 5 };
+static uint8_t has_tr_32x32[2] = { 95, 87 };
+static uint8_t has_tr_32x64[1] = { 127 };
+static uint8_t has_tr_64x32[1] = { 19 };
+static uint8_t has_tr_64x64[1] = { 7 };
+static uint8_t has_tr_64x128[1] = { 3 };
+static uint8_t has_tr_128x64[1] = { 1 };
+static uint8_t has_tr_128x128[1] = { 1 };
+static uint8_t has_tr_4x16[32] = {
+  255, 255, 255, 255, 127, 127, 127, 127, 255, 127, 255,
+  127, 127, 127, 127, 127, 255, 255, 255, 127, 127, 127,
+  127, 127, 255, 127, 255, 127, 127, 127, 127, 127,
+};
+static uint8_t has_tr_16x4[32] = {
+  255, 0, 0, 0, 85, 0, 0, 0, 119, 0, 0, 0, 85, 0, 0, 0,
+  127, 0, 0, 0, 85, 0, 0, 0, 119, 0, 0, 0, 85, 0, 0, 0,
+};
+static uint8_t has_tr_8x32[8] = {
+  255, 255, 127, 127, 255, 127, 127, 127,
+};
+static uint8_t has_tr_32x8[8] = {
+  15, 0, 5, 0, 7, 0, 5, 0,
+};
+static uint8_t has_tr_16x64[2] = { 255, 127 };
+static uint8_t has_tr_64x16[2] = { 3, 1 };
+
+static const uint8_t *const has_tr_tables[BLOCK_SIZES_ALL] = {
+  // 4X4
+  has_tr_4x4,
+  // 4X8,       8X4,            8X8
+  has_tr_4x8, has_tr_8x4, has_tr_8x8,
+  // 8X16,      16X8,           16X16
+  has_tr_8x16, has_tr_16x8, has_tr_16x16,
+  // 16X32,     32X16,          32X32
+  has_tr_16x32, has_tr_32x16, has_tr_32x32,
+  // 32X64,     64X32,          64X64
+  has_tr_32x64, has_tr_64x32, has_tr_64x64,
+  // 64x128,    128x64,         128x128
+  has_tr_64x128, has_tr_128x64, has_tr_128x128,
+  // 4x16,      16x4,            8x32
+  has_tr_4x16, has_tr_16x4, has_tr_8x32,
+  // 32x8,      16x64,           64x16
+  has_tr_32x8, has_tr_16x64, has_tr_64x16
+};
+
+static uint8_t has_tr_vert_8x8[32] = {
+  255, 255, 0, 0, 119, 119, 0, 0, 127, 127, 0, 0, 119, 119, 0, 0,
+  255, 127, 0, 0, 119, 119, 0, 0, 127, 127, 0, 0, 119, 119, 0, 0,
+};
+static uint8_t has_tr_vert_16x16[8] = {
+  255, 0, 119, 0, 127, 0, 119, 0,
+};
+static uint8_t has_tr_vert_32x32[2] = { 15, 7 };
+static uint8_t has_tr_vert_64x64[1] = { 3 };
+
+// The _vert_* tables are like the ordinary tables above, but describe the
+// order we visit square blocks when doing a PARTITION_VERT_A or
+// PARTITION_VERT_B. This is the same order as normal except for on the last
+// split where we go vertically (TL, BL, TR, BR). We treat the rectangular block
+// as a pair of squares, which means that these tables work correctly for both
+// mixed vertical partition types.
+//
+// There are tables for each of the square sizes. Vertical rectangles (like
+// BLOCK_16X32) use their respective "non-vert" table
+static const uint8_t *const has_tr_vert_tables[BLOCK_SIZES] = {
+  // 4X4
+  NULL,
+  // 4X8,      8X4,         8X8
+  has_tr_4x8, NULL, has_tr_vert_8x8,
+  // 8X16,     16X8,        16X16
+  has_tr_8x16, NULL, has_tr_vert_16x16,
+  // 16X32,    32X16,       32X32
+  has_tr_16x32, NULL, has_tr_vert_32x32,
+  // 32X64,    64X32,       64X64
+  has_tr_32x64, NULL, has_tr_vert_64x64,
+  // 64x128,   128x64,      128x128
+  has_tr_64x128, NULL, has_tr_128x128
+};
+
+static const uint8_t *get_has_tr_table(PARTITION_TYPE partition,
+                                       BLOCK_SIZE bsize) {
+  const uint8_t *ret = NULL;
+  // If this is a mixed vertical partition, look up bsize in orders_vert.
+  if (partition == PARTITION_VERT_A || partition == PARTITION_VERT_B) {
+    assert(bsize < BLOCK_SIZES);
+    ret = has_tr_vert_tables[bsize];
+  } else {
+    ret = has_tr_tables[bsize];
+  }
+  assert(ret);
+  return ret;
+}
+
+static int has_top_right(const AV1_COMMON *cm, BLOCK_SIZE bsize, int mi_row,
+                         int mi_col, int top_available, int right_available,
+                         PARTITION_TYPE partition, TX_SIZE txsz, int row_off,
+                         int col_off, int ss_x, int ss_y) {
+  if (!top_available || !right_available) return 0;
+
+  const int bw_unit = mi_size_wide[bsize];
+  const int plane_bw_unit = AOMMAX(bw_unit >> ss_x, 1);
+  const int top_right_count_unit = tx_size_wide_unit[txsz];
+
+  if (row_off > 0) {  // Just need to check if enough pixels on the right.
+    if (block_size_wide[bsize] > block_size_wide[BLOCK_64X64]) {
+      // Special case: For 128x128 blocks, the transform unit whose
+      // top-right corner is at the center of the block does in fact have
+      // pixels available at its top-right corner.
+      if (row_off == mi_size_high[BLOCK_64X64] >> ss_y &&
+          col_off + top_right_count_unit == mi_size_wide[BLOCK_64X64] >> ss_x) {
+        return 1;
+      }
+      const int plane_bw_unit_64 = mi_size_wide[BLOCK_64X64] >> ss_x;
+      const int col_off_64 = col_off % plane_bw_unit_64;
+      return col_off_64 + top_right_count_unit < plane_bw_unit_64;
+    }
+    return col_off + top_right_count_unit < plane_bw_unit;
+  } else {
+    // All top-right pixels are in the block above, which is already available.
+    if (col_off + top_right_count_unit < plane_bw_unit) return 1;
+
+    const int bw_in_mi_log2 = mi_size_wide_log2[bsize];
+    const int bh_in_mi_log2 = mi_size_high_log2[bsize];
+    const int sb_mi_size = mi_size_high[cm->seq_params.sb_size];
+    const int blk_row_in_sb = (mi_row & (sb_mi_size - 1)) >> bh_in_mi_log2;
+    const int blk_col_in_sb = (mi_col & (sb_mi_size - 1)) >> bw_in_mi_log2;
+
+    // Top row of superblock: so top-right pixels are in the top and/or
+    // top-right superblocks, both of which are already available.
+    if (blk_row_in_sb == 0) return 1;
+
+    // Rightmost column of superblock (and not the top row): so top-right pixels
+    // fall in the right superblock, which is not available yet.
+    if (((blk_col_in_sb + 1) << bw_in_mi_log2) >= sb_mi_size) {
+      return 0;
+    }
+
+    // General case (neither top row nor rightmost column): check if the
+    // top-right block is coded before the current block.
+    const int this_blk_index =
+        ((blk_row_in_sb + 0) << (MAX_MIB_SIZE_LOG2 - bw_in_mi_log2)) +
+        blk_col_in_sb + 0;
+    const int idx1 = this_blk_index / 8;
+    const int idx2 = this_blk_index % 8;
+    const uint8_t *has_tr_table = get_has_tr_table(partition, bsize);
+    return (has_tr_table[idx1] >> idx2) & 1;
+  }
+}
+
+// Similar to the has_tr_* tables, but store if the bottom-left reference
+// pixels are available.
+static uint8_t has_bl_4x4[128] = {
+  84, 85, 85, 85, 16, 17, 17, 17, 84, 85, 85, 85, 0,  1,  1,  1,  84, 85, 85,
+  85, 16, 17, 17, 17, 84, 85, 85, 85, 0,  0,  1,  0,  84, 85, 85, 85, 16, 17,
+  17, 17, 84, 85, 85, 85, 0,  1,  1,  1,  84, 85, 85, 85, 16, 17, 17, 17, 84,
+  85, 85, 85, 0,  0,  0,  0,  84, 85, 85, 85, 16, 17, 17, 17, 84, 85, 85, 85,
+  0,  1,  1,  1,  84, 85, 85, 85, 16, 17, 17, 17, 84, 85, 85, 85, 0,  0,  1,
+  0,  84, 85, 85, 85, 16, 17, 17, 17, 84, 85, 85, 85, 0,  1,  1,  1,  84, 85,
+  85, 85, 16, 17, 17, 17, 84, 85, 85, 85, 0,  0,  0,  0,
+};
+static uint8_t has_bl_4x8[64] = {
+  16, 17, 17, 17, 0, 1, 1, 1, 16, 17, 17, 17, 0, 0, 1, 0,
+  16, 17, 17, 17, 0, 1, 1, 1, 16, 17, 17, 17, 0, 0, 0, 0,
+  16, 17, 17, 17, 0, 1, 1, 1, 16, 17, 17, 17, 0, 0, 1, 0,
+  16, 17, 17, 17, 0, 1, 1, 1, 16, 17, 17, 17, 0, 0, 0, 0,
+};
+static uint8_t has_bl_8x4[64] = {
+  254, 255, 84, 85, 254, 255, 16, 17, 254, 255, 84, 85, 254, 255, 0, 1,
+  254, 255, 84, 85, 254, 255, 16, 17, 254, 255, 84, 85, 254, 255, 0, 0,
+  254, 255, 84, 85, 254, 255, 16, 17, 254, 255, 84, 85, 254, 255, 0, 1,
+  254, 255, 84, 85, 254, 255, 16, 17, 254, 255, 84, 85, 254, 255, 0, 0,
+};
+static uint8_t has_bl_8x8[32] = {
+  84, 85, 16, 17, 84, 85, 0, 1, 84, 85, 16, 17, 84, 85, 0, 0,
+  84, 85, 16, 17, 84, 85, 0, 1, 84, 85, 16, 17, 84, 85, 0, 0,
+};
+static uint8_t has_bl_8x16[16] = {
+  16, 17, 0, 1, 16, 17, 0, 0, 16, 17, 0, 1, 16, 17, 0, 0,
+};
+static uint8_t has_bl_16x8[16] = {
+  254, 84, 254, 16, 254, 84, 254, 0, 254, 84, 254, 16, 254, 84, 254, 0,
+};
+static uint8_t has_bl_16x16[8] = {
+  84, 16, 84, 0, 84, 16, 84, 0,
+};
+static uint8_t has_bl_16x32[4] = { 16, 0, 16, 0 };
+static uint8_t has_bl_32x16[4] = { 78, 14, 78, 14 };
+static uint8_t has_bl_32x32[2] = { 4, 4 };
+static uint8_t has_bl_32x64[1] = { 0 };
+static uint8_t has_bl_64x32[1] = { 34 };
+static uint8_t has_bl_64x64[1] = { 0 };
+static uint8_t has_bl_64x128[1] = { 0 };
+static uint8_t has_bl_128x64[1] = { 0 };
+static uint8_t has_bl_128x128[1] = { 0 };
+static uint8_t has_bl_4x16[32] = {
+  0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0,
+  0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0,
+};
+static uint8_t has_bl_16x4[32] = {
+  254, 254, 254, 84, 254, 254, 254, 16, 254, 254, 254, 84, 254, 254, 254, 0,
+  254, 254, 254, 84, 254, 254, 254, 16, 254, 254, 254, 84, 254, 254, 254, 0,
+};
+static uint8_t has_bl_8x32[8] = {
+  0, 1, 0, 0, 0, 1, 0, 0,
+};
+static uint8_t has_bl_32x8[8] = {
+  238, 78, 238, 14, 238, 78, 238, 14,
+};
+static uint8_t has_bl_16x64[2] = { 0, 0 };
+static uint8_t has_bl_64x16[2] = { 42, 42 };
+
+static const uint8_t *const has_bl_tables[BLOCK_SIZES_ALL] = {
+  // 4X4
+  has_bl_4x4,
+  // 4X8,         8X4,         8X8
+  has_bl_4x8, has_bl_8x4, has_bl_8x8,
+  // 8X16,        16X8,        16X16
+  has_bl_8x16, has_bl_16x8, has_bl_16x16,
+  // 16X32,       32X16,       32X32
+  has_bl_16x32, has_bl_32x16, has_bl_32x32,
+  // 32X64,       64X32,       64X64
+  has_bl_32x64, has_bl_64x32, has_bl_64x64,
+  // 64x128,      128x64,      128x128
+  has_bl_64x128, has_bl_128x64, has_bl_128x128,
+  // 4x16,        16x4,        8x32
+  has_bl_4x16, has_bl_16x4, has_bl_8x32,
+  // 32x8,        16x64,       64x16
+  has_bl_32x8, has_bl_16x64, has_bl_64x16
+};
+
+static uint8_t has_bl_vert_8x8[32] = {
+  254, 255, 16, 17, 254, 255, 0, 1, 254, 255, 16, 17, 254, 255, 0, 0,
+  254, 255, 16, 17, 254, 255, 0, 1, 254, 255, 16, 17, 254, 255, 0, 0,
+};
+static uint8_t has_bl_vert_16x16[8] = {
+  254, 16, 254, 0, 254, 16, 254, 0,
+};
+static uint8_t has_bl_vert_32x32[2] = { 14, 14 };
+static uint8_t has_bl_vert_64x64[1] = { 2 };
+
+// The _vert_* tables are like the ordinary tables above, but describe the
+// order we visit square blocks when doing a PARTITION_VERT_A or
+// PARTITION_VERT_B. This is the same order as normal except for on the last
+// split where we go vertically (TL, BL, TR, BR). We treat the rectangular block
+// as a pair of squares, which means that these tables work correctly for both
+// mixed vertical partition types.
+//
+// There are tables for each of the square sizes. Vertical rectangles (like
+// BLOCK_16X32) use their respective "non-vert" table
+static const uint8_t *const has_bl_vert_tables[BLOCK_SIZES] = {
+  // 4X4
+  NULL,
+  // 4X8,     8X4,         8X8
+  has_bl_4x8, NULL, has_bl_vert_8x8,
+  // 8X16,    16X8,        16X16
+  has_bl_8x16, NULL, has_bl_vert_16x16,
+  // 16X32,   32X16,       32X32
+  has_bl_16x32, NULL, has_bl_vert_32x32,
+  // 32X64,   64X32,       64X64
+  has_bl_32x64, NULL, has_bl_vert_64x64,
+  // 64x128,  128x64,      128x128
+  has_bl_64x128, NULL, has_bl_128x128
+};
+
+static const uint8_t *get_has_bl_table(PARTITION_TYPE partition,
+                                       BLOCK_SIZE bsize) {
+  const uint8_t *ret = NULL;
+  // If this is a mixed vertical partition, look up bsize in orders_vert.
+  if (partition == PARTITION_VERT_A || partition == PARTITION_VERT_B) {
+    assert(bsize < BLOCK_SIZES);
+    ret = has_bl_vert_tables[bsize];
+  } else {
+    ret = has_bl_tables[bsize];
+  }
+  assert(ret);
+  return ret;
+}
+
+static int has_bottom_left(const AV1_COMMON *cm, BLOCK_SIZE bsize, int mi_row,
+                           int mi_col, int bottom_available, int left_available,
+                           PARTITION_TYPE partition, TX_SIZE txsz, int row_off,
+                           int col_off, int ss_x, int ss_y) {
+  if (!bottom_available || !left_available) return 0;
+
+  // Special case for 128x* blocks, when col_off is half the block width.
+  // This is needed because 128x* superblocks are divided into 64x* blocks in
+  // raster order
+  if (block_size_wide[bsize] > block_size_wide[BLOCK_64X64] && col_off > 0) {
+    const int plane_bw_unit_64 = mi_size_wide[BLOCK_64X64] >> ss_x;
+    const int col_off_64 = col_off % plane_bw_unit_64;
+    if (col_off_64 == 0) {
+      // We are at the left edge of top-right or bottom-right 64x* block.
+      const int plane_bh_unit_64 = mi_size_high[BLOCK_64X64] >> ss_y;
+      const int row_off_64 = row_off % plane_bh_unit_64;
+      const int plane_bh_unit =
+          AOMMIN(mi_size_high[bsize] >> ss_y, plane_bh_unit_64);
+      // Check if all bottom-left pixels are in the left 64x* block (which is
+      // already coded).
+      return row_off_64 + tx_size_high_unit[txsz] < plane_bh_unit;
+    }
+  }
+
+  if (col_off > 0) {
+    // Bottom-left pixels are in the bottom-left block, which is not available.
+    return 0;
+  } else {
+    const int bh_unit = mi_size_high[bsize];
+    const int plane_bh_unit = AOMMAX(bh_unit >> ss_y, 1);
+    const int bottom_left_count_unit = tx_size_high_unit[txsz];
+
+    // All bottom-left pixels are in the left block, which is already available.
+    if (row_off + bottom_left_count_unit < plane_bh_unit) return 1;
+
+    const int bw_in_mi_log2 = mi_size_wide_log2[bsize];
+    const int bh_in_mi_log2 = mi_size_high_log2[bsize];
+    const int sb_mi_size = mi_size_high[cm->seq_params.sb_size];
+    const int blk_row_in_sb = (mi_row & (sb_mi_size - 1)) >> bh_in_mi_log2;
+    const int blk_col_in_sb = (mi_col & (sb_mi_size - 1)) >> bw_in_mi_log2;
+
+    // Leftmost column of superblock: so bottom-left pixels maybe in the left
+    // and/or bottom-left superblocks. But only the left superblock is
+    // available, so check if all required pixels fall in that superblock.
+    if (blk_col_in_sb == 0) {
+      const int blk_start_row_off =
+          blk_row_in_sb << (bh_in_mi_log2 + MI_SIZE_LOG2 - MI_SIZE_LOG2) >>
+          ss_y;
+      const int row_off_in_sb = blk_start_row_off + row_off;
+      const int sb_height_unit = sb_mi_size >> ss_y;
+      return row_off_in_sb + bottom_left_count_unit < sb_height_unit;
+    }
+
+    // Bottom row of superblock (and not the leftmost column): so bottom-left
+    // pixels fall in the bottom superblock, which is not available yet.
+    if (((blk_row_in_sb + 1) << bh_in_mi_log2) >= sb_mi_size) return 0;
+
+    // General case (neither leftmost column nor bottom row): check if the
+    // bottom-left block is coded before the current block.
+    const int this_blk_index =
+        ((blk_row_in_sb + 0) << (MAX_MIB_SIZE_LOG2 - bw_in_mi_log2)) +
+        blk_col_in_sb + 0;
+    const int idx1 = this_blk_index / 8;
+    const int idx2 = this_blk_index % 8;
+    const uint8_t *has_bl_table = get_has_bl_table(partition, bsize);
+    return (has_bl_table[idx1] >> idx2) & 1;
+  }
+}
+
+typedef void (*intra_pred_fn)(uint8_t *dst, ptrdiff_t stride,
+                              const uint8_t *above, const uint8_t *left);
+
+static intra_pred_fn pred[INTRA_MODES][TX_SIZES_ALL];
+static intra_pred_fn dc_pred[2][2][TX_SIZES_ALL];
+
+#if CONFIG_AV1_HIGHBITDEPTH
+typedef void (*intra_high_pred_fn)(uint16_t *dst, ptrdiff_t stride,
+                                   const uint16_t *above, const uint16_t *left,
+                                   int bd);
+static intra_high_pred_fn pred_high[INTRA_MODES][TX_SIZES_ALL];
+static intra_high_pred_fn dc_pred_high[2][2][TX_SIZES_ALL];
+#endif
+
+static void init_intra_predictors_internal(void) {
+  assert(NELEMENTS(mode_to_angle_map) == INTRA_MODES);
+
+#if CONFIG_REALTIME_ONLY
+#define INIT_RECTANGULAR(p, type)             \
+  p[TX_4X8] = aom_##type##_predictor_4x8;     \
+  p[TX_8X4] = aom_##type##_predictor_8x4;     \
+  p[TX_8X16] = aom_##type##_predictor_8x16;   \
+  p[TX_16X8] = aom_##type##_predictor_16x8;   \
+  p[TX_16X32] = aom_##type##_predictor_16x32; \
+  p[TX_32X16] = aom_##type##_predictor_32x16; \
+  p[TX_32X64] = aom_##type##_predictor_32x64; \
+  p[TX_64X32] = aom_##type##_predictor_64x32;
+#else
+#define INIT_RECTANGULAR(p, type)             \
+  p[TX_4X8] = aom_##type##_predictor_4x8;     \
+  p[TX_8X4] = aom_##type##_predictor_8x4;     \
+  p[TX_8X16] = aom_##type##_predictor_8x16;   \
+  p[TX_16X8] = aom_##type##_predictor_16x8;   \
+  p[TX_16X32] = aom_##type##_predictor_16x32; \
+  p[TX_32X16] = aom_##type##_predictor_32x16; \
+  p[TX_32X64] = aom_##type##_predictor_32x64; \
+  p[TX_64X32] = aom_##type##_predictor_64x32; \
+  p[TX_4X16] = aom_##type##_predictor_4x16;   \
+  p[TX_16X4] = aom_##type##_predictor_16x4;   \
+  p[TX_8X32] = aom_##type##_predictor_8x32;   \
+  p[TX_32X8] = aom_##type##_predictor_32x8;   \
+  p[TX_16X64] = aom_##type##_predictor_16x64; \
+  p[TX_64X16] = aom_##type##_predictor_64x16;
+#endif
+
+#define INIT_NO_4X4(p, type)                  \
+  p[TX_8X8] = aom_##type##_predictor_8x8;     \
+  p[TX_16X16] = aom_##type##_predictor_16x16; \
+  p[TX_32X32] = aom_##type##_predictor_32x32; \
+  p[TX_64X64] = aom_##type##_predictor_64x64; \
+  INIT_RECTANGULAR(p, type)
+
+#define INIT_ALL_SIZES(p, type)           \
+  p[TX_4X4] = aom_##type##_predictor_4x4; \
+  INIT_NO_4X4(p, type)
+
+  INIT_ALL_SIZES(pred[V_PRED], v);
+  INIT_ALL_SIZES(pred[H_PRED], h);
+  INIT_ALL_SIZES(pred[PAETH_PRED], paeth);
+  INIT_ALL_SIZES(pred[SMOOTH_PRED], smooth);
+  INIT_ALL_SIZES(pred[SMOOTH_V_PRED], smooth_v);
+  INIT_ALL_SIZES(pred[SMOOTH_H_PRED], smooth_h);
+  INIT_ALL_SIZES(dc_pred[0][0], dc_128);
+  INIT_ALL_SIZES(dc_pred[0][1], dc_top);
+  INIT_ALL_SIZES(dc_pred[1][0], dc_left);
+  INIT_ALL_SIZES(dc_pred[1][1], dc);
+#if CONFIG_AV1_HIGHBITDEPTH
+  INIT_ALL_SIZES(pred_high[V_PRED], highbd_v);
+  INIT_ALL_SIZES(pred_high[H_PRED], highbd_h);
+  INIT_ALL_SIZES(pred_high[PAETH_PRED], highbd_paeth);
+  INIT_ALL_SIZES(pred_high[SMOOTH_PRED], highbd_smooth);
+  INIT_ALL_SIZES(pred_high[SMOOTH_V_PRED], highbd_smooth_v);
+  INIT_ALL_SIZES(pred_high[SMOOTH_H_PRED], highbd_smooth_h);
+  INIT_ALL_SIZES(dc_pred_high[0][0], highbd_dc_128);
+  INIT_ALL_SIZES(dc_pred_high[0][1], highbd_dc_top);
+  INIT_ALL_SIZES(dc_pred_high[1][0], highbd_dc_left);
+  INIT_ALL_SIZES(dc_pred_high[1][1], highbd_dc);
+#endif
+#undef intra_pred_allsizes
+}
+
+// Directional prediction, zone 1: 0 < angle < 90
+void av1_dr_prediction_z1_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh,
+                            const uint8_t *above, const uint8_t *left,
+                            int upsample_above, int dx, int dy) {
+  int r, c, x, base, shift, val;
+
+  (void)left;
+  (void)dy;
+  assert(dy == 1);
+  assert(dx > 0);
+
+  const int max_base_x = ((bw + bh) - 1) << upsample_above;
+  const int frac_bits = 6 - upsample_above;
+  const int base_inc = 1 << upsample_above;
+  x = dx;
+  for (r = 0; r < bh; ++r, dst += stride, x += dx) {
+    base = x >> frac_bits;
+    shift = ((x << upsample_above) & 0x3F) >> 1;
+
+    if (base >= max_base_x) {
+      for (int i = r; i < bh; ++i) {
+        memset(dst, above[max_base_x], bw * sizeof(dst[0]));
+        dst += stride;
+      }
+      return;
+    }
+
+    for (c = 0; c < bw; ++c, base += base_inc) {
+      if (base < max_base_x) {
+        val = above[base] * (32 - shift) + above[base + 1] * shift;
+        dst[c] = ROUND_POWER_OF_TWO(val, 5);
+      } else {
+        dst[c] = above[max_base_x];
+      }
+    }
+  }
+}
+
+// Directional prediction, zone 2: 90 < angle < 180
+void av1_dr_prediction_z2_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh,
+                            const uint8_t *above, const uint8_t *left,
+                            int upsample_above, int upsample_left, int dx,
+                            int dy) {
+  assert(dx > 0);
+  assert(dy > 0);
+
+  const int min_base_x = -(1 << upsample_above);
+  const int min_base_y = -(1 << upsample_left);
+  (void)min_base_y;
+  const int frac_bits_x = 6 - upsample_above;
+  const int frac_bits_y = 6 - upsample_left;
+
+  for (int r = 0; r < bh; ++r) {
+    for (int c = 0; c < bw; ++c) {
+      int val;
+      int y = r + 1;
+      int x = (c << 6) - y * dx;
+      const int base_x = x >> frac_bits_x;
+      if (base_x >= min_base_x) {
+        const int shift = ((x * (1 << upsample_above)) & 0x3F) >> 1;
+        val = above[base_x] * (32 - shift) + above[base_x + 1] * shift;
+        val = ROUND_POWER_OF_TWO(val, 5);
+      } else {
+        x = c + 1;
+        y = (r << 6) - x * dy;
+        const int base_y = y >> frac_bits_y;
+        assert(base_y >= min_base_y);
+        const int shift = ((y * (1 << upsample_left)) & 0x3F) >> 1;
+        val = left[base_y] * (32 - shift) + left[base_y + 1] * shift;
+        val = ROUND_POWER_OF_TWO(val, 5);
+      }
+      dst[c] = val;
+    }
+    dst += stride;
+  }
+}
+
+// Directional prediction, zone 3: 180 < angle < 270
+void av1_dr_prediction_z3_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh,
+                            const uint8_t *above, const uint8_t *left,
+                            int upsample_left, int dx, int dy) {
+  int r, c, y, base, shift, val;
+
+  (void)above;
+  (void)dx;
+
+  assert(dx == 1);
+  assert(dy > 0);
+
+  const int max_base_y = (bw + bh - 1) << upsample_left;
+  const int frac_bits = 6 - upsample_left;
+  const int base_inc = 1 << upsample_left;
+  y = dy;
+  for (c = 0; c < bw; ++c, y += dy) {
+    base = y >> frac_bits;
+    shift = ((y << upsample_left) & 0x3F) >> 1;
+
+    for (r = 0; r < bh; ++r, base += base_inc) {
+      if (base < max_base_y) {
+        val = left[base] * (32 - shift) + left[base + 1] * shift;
+        dst[r * stride + c] = val = ROUND_POWER_OF_TWO(val, 5);
+      } else {
+        for (; r < bh; ++r) dst[r * stride + c] = left[max_base_y];
+        break;
+      }
+    }
+  }
+}
+
+static void dr_predictor(uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size,
+                         const uint8_t *above, const uint8_t *left,
+                         int upsample_above, int upsample_left, int angle) {
+  const int dx = av1_get_dx(angle);
+  const int dy = av1_get_dy(angle);
+  const int bw = tx_size_wide[tx_size];
+  const int bh = tx_size_high[tx_size];
+  assert(angle > 0 && angle < 270);
+
+  if (angle > 0 && angle < 90) {
+    av1_dr_prediction_z1(dst, stride, bw, bh, above, left, upsample_above, dx,
+                         dy);
+  } else if (angle > 90 && angle < 180) {
+    av1_dr_prediction_z2(dst, stride, bw, bh, above, left, upsample_above,
+                         upsample_left, dx, dy);
+  } else if (angle > 180 && angle < 270) {
+    av1_dr_prediction_z3(dst, stride, bw, bh, above, left, upsample_left, dx,
+                         dy);
+  } else if (angle == 90) {
+    pred[V_PRED][tx_size](dst, stride, above, left);
+  } else if (angle == 180) {
+    pred[H_PRED][tx_size](dst, stride, above, left);
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+// Directional prediction, zone 1: 0 < angle < 90
+void av1_highbd_dr_prediction_z1_c(uint16_t *dst, ptrdiff_t stride, int bw,
+                                   int bh, const uint16_t *above,
+                                   const uint16_t *left, int upsample_above,
+                                   int dx, int dy, int bd) {
+  int r, c, x, base, shift, val;
+
+  (void)left;
+  (void)dy;
+  (void)bd;
+  assert(dy == 1);
+  assert(dx > 0);
+
+  const int max_base_x = ((bw + bh) - 1) << upsample_above;
+  const int frac_bits = 6 - upsample_above;
+  const int base_inc = 1 << upsample_above;
+  x = dx;
+  for (r = 0; r < bh; ++r, dst += stride, x += dx) {
+    base = x >> frac_bits;
+    shift = ((x << upsample_above) & 0x3F) >> 1;
+
+    if (base >= max_base_x) {
+      for (int i = r; i < bh; ++i) {
+        aom_memset16(dst, above[max_base_x], bw);
+        dst += stride;
+      }
+      return;
+    }
+
+    for (c = 0; c < bw; ++c, base += base_inc) {
+      if (base < max_base_x) {
+        val = above[base] * (32 - shift) + above[base + 1] * shift;
+        dst[c] = ROUND_POWER_OF_TWO(val, 5);
+      } else {
+        dst[c] = above[max_base_x];
+      }
+    }
+  }
+}
+
+// Directional prediction, zone 2: 90 < angle < 180
+void av1_highbd_dr_prediction_z2_c(uint16_t *dst, ptrdiff_t stride, int bw,
+                                   int bh, const uint16_t *above,
+                                   const uint16_t *left, int upsample_above,
+                                   int upsample_left, int dx, int dy, int bd) {
+  (void)bd;
+  assert(dx > 0);
+  assert(dy > 0);
+
+  const int min_base_x = -(1 << upsample_above);
+  const int min_base_y = -(1 << upsample_left);
+  (void)min_base_y;
+  const int frac_bits_x = 6 - upsample_above;
+  const int frac_bits_y = 6 - upsample_left;
+
+  for (int r = 0; r < bh; ++r) {
+    for (int c = 0; c < bw; ++c) {
+      int val;
+      int y = r + 1;
+      int x = (c << 6) - y * dx;
+      const int base_x = x >> frac_bits_x;
+      if (base_x >= min_base_x) {
+        const int shift = ((x * (1 << upsample_above)) & 0x3F) >> 1;
+        val = above[base_x] * (32 - shift) + above[base_x + 1] * shift;
+        val = ROUND_POWER_OF_TWO(val, 5);
+      } else {
+        x = c + 1;
+        y = (r << 6) - x * dy;
+        const int base_y = y >> frac_bits_y;
+        assert(base_y >= min_base_y);
+        const int shift = ((y * (1 << upsample_left)) & 0x3F) >> 1;
+        val = left[base_y] * (32 - shift) + left[base_y + 1] * shift;
+        val = ROUND_POWER_OF_TWO(val, 5);
+      }
+      dst[c] = val;
+    }
+    dst += stride;
+  }
+}
+
+// Directional prediction, zone 3: 180 < angle < 270
+void av1_highbd_dr_prediction_z3_c(uint16_t *dst, ptrdiff_t stride, int bw,
+                                   int bh, const uint16_t *above,
+                                   const uint16_t *left, int upsample_left,
+                                   int dx, int dy, int bd) {
+  int r, c, y, base, shift, val;
+
+  (void)above;
+  (void)dx;
+  (void)bd;
+  assert(dx == 1);
+  assert(dy > 0);
+
+  const int max_base_y = (bw + bh - 1) << upsample_left;
+  const int frac_bits = 6 - upsample_left;
+  const int base_inc = 1 << upsample_left;
+  y = dy;
+  for (c = 0; c < bw; ++c, y += dy) {
+    base = y >> frac_bits;
+    shift = ((y << upsample_left) & 0x3F) >> 1;
+
+    for (r = 0; r < bh; ++r, base += base_inc) {
+      if (base < max_base_y) {
+        val = left[base] * (32 - shift) + left[base + 1] * shift;
+        dst[r * stride + c] = ROUND_POWER_OF_TWO(val, 5);
+      } else {
+        for (; r < bh; ++r) dst[r * stride + c] = left[max_base_y];
+        break;
+      }
+    }
+  }
+}
+
+static void highbd_dr_predictor(uint16_t *dst, ptrdiff_t stride,
+                                TX_SIZE tx_size, const uint16_t *above,
+                                const uint16_t *left, int upsample_above,
+                                int upsample_left, int angle, int bd) {
+  const int dx = av1_get_dx(angle);
+  const int dy = av1_get_dy(angle);
+  const int bw = tx_size_wide[tx_size];
+  const int bh = tx_size_high[tx_size];
+  assert(angle > 0 && angle < 270);
+
+  if (angle > 0 && angle < 90) {
+    av1_highbd_dr_prediction_z1(dst, stride, bw, bh, above, left,
+                                upsample_above, dx, dy, bd);
+  } else if (angle > 90 && angle < 180) {
+    av1_highbd_dr_prediction_z2(dst, stride, bw, bh, above, left,
+                                upsample_above, upsample_left, dx, dy, bd);
+  } else if (angle > 180 && angle < 270) {
+    av1_highbd_dr_prediction_z3(dst, stride, bw, bh, above, left, upsample_left,
+                                dx, dy, bd);
+  } else if (angle == 90) {
+    pred_high[V_PRED][tx_size](dst, stride, above, left, bd);
+  } else if (angle == 180) {
+    pred_high[H_PRED][tx_size](dst, stride, above, left, bd);
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+DECLARE_ALIGNED(16, const int8_t,
+                av1_filter_intra_taps[FILTER_INTRA_MODES][8][8]) = {
+  {
+      { -6, 10, 0, 0, 0, 12, 0, 0 },
+      { -5, 2, 10, 0, 0, 9, 0, 0 },
+      { -3, 1, 1, 10, 0, 7, 0, 0 },
+      { -3, 1, 1, 2, 10, 5, 0, 0 },
+      { -4, 6, 0, 0, 0, 2, 12, 0 },
+      { -3, 2, 6, 0, 0, 2, 9, 0 },
+      { -3, 2, 2, 6, 0, 2, 7, 0 },
+      { -3, 1, 2, 2, 6, 3, 5, 0 },
+  },
+  {
+      { -10, 16, 0, 0, 0, 10, 0, 0 },
+      { -6, 0, 16, 0, 0, 6, 0, 0 },
+      { -4, 0, 0, 16, 0, 4, 0, 0 },
+      { -2, 0, 0, 0, 16, 2, 0, 0 },
+      { -10, 16, 0, 0, 0, 0, 10, 0 },
+      { -6, 0, 16, 0, 0, 0, 6, 0 },
+      { -4, 0, 0, 16, 0, 0, 4, 0 },
+      { -2, 0, 0, 0, 16, 0, 2, 0 },
+  },
+  {
+      { -8, 8, 0, 0, 0, 16, 0, 0 },
+      { -8, 0, 8, 0, 0, 16, 0, 0 },
+      { -8, 0, 0, 8, 0, 16, 0, 0 },
+      { -8, 0, 0, 0, 8, 16, 0, 0 },
+      { -4, 4, 0, 0, 0, 0, 16, 0 },
+      { -4, 0, 4, 0, 0, 0, 16, 0 },
+      { -4, 0, 0, 4, 0, 0, 16, 0 },
+      { -4, 0, 0, 0, 4, 0, 16, 0 },
+  },
+  {
+      { -2, 8, 0, 0, 0, 10, 0, 0 },
+      { -1, 3, 8, 0, 0, 6, 0, 0 },
+      { -1, 2, 3, 8, 0, 4, 0, 0 },
+      { 0, 1, 2, 3, 8, 2, 0, 0 },
+      { -1, 4, 0, 0, 0, 3, 10, 0 },
+      { -1, 3, 4, 0, 0, 4, 6, 0 },
+      { -1, 2, 3, 4, 0, 4, 4, 0 },
+      { -1, 2, 2, 3, 4, 3, 3, 0 },
+  },
+  {
+      { -12, 14, 0, 0, 0, 14, 0, 0 },
+      { -10, 0, 14, 0, 0, 12, 0, 0 },
+      { -9, 0, 0, 14, 0, 11, 0, 0 },
+      { -8, 0, 0, 0, 14, 10, 0, 0 },
+      { -10, 12, 0, 0, 0, 0, 14, 0 },
+      { -9, 1, 12, 0, 0, 0, 12, 0 },
+      { -8, 0, 0, 12, 0, 1, 11, 0 },
+      { -7, 0, 0, 1, 12, 1, 9, 0 },
+  },
+};
+
+void av1_filter_intra_predictor_c(uint8_t *dst, ptrdiff_t stride,
+                                  TX_SIZE tx_size, const uint8_t *above,
+                                  const uint8_t *left, int mode) {
+  int r, c;
+  uint8_t buffer[33][33];
+  const int bw = tx_size_wide[tx_size];
+  const int bh = tx_size_high[tx_size];
+
+  assert(bw <= 32 && bh <= 32);
+
+  for (r = 0; r < bh; ++r) buffer[r + 1][0] = left[r];
+  memcpy(buffer[0], &above[-1], (bw + 1) * sizeof(uint8_t));
+
+  for (r = 1; r < bh + 1; r += 2)
+    for (c = 1; c < bw + 1; c += 4) {
+      const uint8_t p0 = buffer[r - 1][c - 1];
+      const uint8_t p1 = buffer[r - 1][c];
+      const uint8_t p2 = buffer[r - 1][c + 1];
+      const uint8_t p3 = buffer[r - 1][c + 2];
+      const uint8_t p4 = buffer[r - 1][c + 3];
+      const uint8_t p5 = buffer[r][c - 1];
+      const uint8_t p6 = buffer[r + 1][c - 1];
+      for (int k = 0; k < 8; ++k) {
+        int r_offset = k >> 2;
+        int c_offset = k & 0x03;
+        int pr = av1_filter_intra_taps[mode][k][0] * p0 +
+                 av1_filter_intra_taps[mode][k][1] * p1 +
+                 av1_filter_intra_taps[mode][k][2] * p2 +
+                 av1_filter_intra_taps[mode][k][3] * p3 +
+                 av1_filter_intra_taps[mode][k][4] * p4 +
+                 av1_filter_intra_taps[mode][k][5] * p5 +
+                 av1_filter_intra_taps[mode][k][6] * p6;
+        // Section 7.11.2.3 specifies the right-hand side of the assignment as
+        //   Clip1( Round2Signed( pr, INTRA_FILTER_SCALE_BITS ) ).
+        // Since Clip1() clips a negative value to 0, it is safe to replace
+        // Round2Signed() with Round2().
+        buffer[r + r_offset][c + c_offset] =
+            clip_pixel(ROUND_POWER_OF_TWO(pr, FILTER_INTRA_SCALE_BITS));
+      }
+    }
+
+  for (r = 0; r < bh; ++r) {
+    memcpy(dst, &buffer[r + 1][1], bw * sizeof(uint8_t));
+    dst += stride;
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void highbd_filter_intra_predictor(uint16_t *dst, ptrdiff_t stride,
+                                          TX_SIZE tx_size,
+                                          const uint16_t *above,
+                                          const uint16_t *left, int mode,
+                                          int bd) {
+  int r, c;
+  uint16_t buffer[33][33];
+  const int bw = tx_size_wide[tx_size];
+  const int bh = tx_size_high[tx_size];
+
+  assert(bw <= 32 && bh <= 32);
+
+  for (r = 0; r < bh; ++r) buffer[r + 1][0] = left[r];
+  memcpy(buffer[0], &above[-1], (bw + 1) * sizeof(buffer[0][0]));
+
+  for (r = 1; r < bh + 1; r += 2)
+    for (c = 1; c < bw + 1; c += 4) {
+      const uint16_t p0 = buffer[r - 1][c - 1];
+      const uint16_t p1 = buffer[r - 1][c];
+      const uint16_t p2 = buffer[r - 1][c + 1];
+      const uint16_t p3 = buffer[r - 1][c + 2];
+      const uint16_t p4 = buffer[r - 1][c + 3];
+      const uint16_t p5 = buffer[r][c - 1];
+      const uint16_t p6 = buffer[r + 1][c - 1];
+      for (int k = 0; k < 8; ++k) {
+        int r_offset = k >> 2;
+        int c_offset = k & 0x03;
+        int pr = av1_filter_intra_taps[mode][k][0] * p0 +
+                 av1_filter_intra_taps[mode][k][1] * p1 +
+                 av1_filter_intra_taps[mode][k][2] * p2 +
+                 av1_filter_intra_taps[mode][k][3] * p3 +
+                 av1_filter_intra_taps[mode][k][4] * p4 +
+                 av1_filter_intra_taps[mode][k][5] * p5 +
+                 av1_filter_intra_taps[mode][k][6] * p6;
+        // Section 7.11.2.3 specifies the right-hand side of the assignment as
+        //   Clip1( Round2Signed( pr, INTRA_FILTER_SCALE_BITS ) ).
+        // Since Clip1() clips a negative value to 0, it is safe to replace
+        // Round2Signed() with Round2().
+        buffer[r + r_offset][c + c_offset] = clip_pixel_highbd(
+            ROUND_POWER_OF_TWO(pr, FILTER_INTRA_SCALE_BITS), bd);
+      }
+    }
+
+  for (r = 0; r < bh; ++r) {
+    memcpy(dst, &buffer[r + 1][1], bw * sizeof(dst[0]));
+    dst += stride;
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+static int is_smooth(const MB_MODE_INFO *mbmi, int plane) {
+  if (plane == 0) {
+    const PREDICTION_MODE mode = mbmi->mode;
+    return (mode == SMOOTH_PRED || mode == SMOOTH_V_PRED ||
+            mode == SMOOTH_H_PRED);
+  } else {
+    // uv_mode is not set for inter blocks, so need to explicitly
+    // detect that case.
+    if (is_inter_block(mbmi)) return 0;
+
+    const UV_PREDICTION_MODE uv_mode = mbmi->uv_mode;
+    return (uv_mode == UV_SMOOTH_PRED || uv_mode == UV_SMOOTH_V_PRED ||
+            uv_mode == UV_SMOOTH_H_PRED);
+  }
+}
+
+static int get_filt_type(const MACROBLOCKD *xd, int plane) {
+  int ab_sm, le_sm;
+
+  if (plane == 0) {
+    const MB_MODE_INFO *ab = xd->above_mbmi;
+    const MB_MODE_INFO *le = xd->left_mbmi;
+    ab_sm = ab ? is_smooth(ab, plane) : 0;
+    le_sm = le ? is_smooth(le, plane) : 0;
+  } else {
+    const MB_MODE_INFO *ab = xd->chroma_above_mbmi;
+    const MB_MODE_INFO *le = xd->chroma_left_mbmi;
+    ab_sm = ab ? is_smooth(ab, plane) : 0;
+    le_sm = le ? is_smooth(le, plane) : 0;
+  }
+
+  return (ab_sm || le_sm) ? 1 : 0;
+}
+
+static int intra_edge_filter_strength(int bs0, int bs1, int delta, int type) {
+  const int d = abs(delta);
+  int strength = 0;
+
+  const int blk_wh = bs0 + bs1;
+  if (type == 0) {
+    if (blk_wh <= 8) {
+      if (d >= 56) strength = 1;
+    } else if (blk_wh <= 12) {
+      if (d >= 40) strength = 1;
+    } else if (blk_wh <= 16) {
+      if (d >= 40) strength = 1;
+    } else if (blk_wh <= 24) {
+      if (d >= 8) strength = 1;
+      if (d >= 16) strength = 2;
+      if (d >= 32) strength = 3;
+    } else if (blk_wh <= 32) {
+      if (d >= 1) strength = 1;
+      if (d >= 4) strength = 2;
+      if (d >= 32) strength = 3;
+    } else {
+      if (d >= 1) strength = 3;
+    }
+  } else {
+    if (blk_wh <= 8) {
+      if (d >= 40) strength = 1;
+      if (d >= 64) strength = 2;
+    } else if (blk_wh <= 16) {
+      if (d >= 20) strength = 1;
+      if (d >= 48) strength = 2;
+    } else if (blk_wh <= 24) {
+      if (d >= 4) strength = 3;
+    } else {
+      if (d >= 1) strength = 3;
+    }
+  }
+  return strength;
+}
+
+void av1_filter_intra_edge_c(uint8_t *p, int sz, int strength) {
+  if (!strength) return;
+
+  const int kernel[INTRA_EDGE_FILT][INTRA_EDGE_TAPS] = { { 0, 4, 8, 4, 0 },
+                                                         { 0, 5, 6, 5, 0 },
+                                                         { 2, 4, 4, 4, 2 } };
+  const int filt = strength - 1;
+  uint8_t edge[129];
+
+  memcpy(edge, p, sz * sizeof(*p));
+  for (int i = 1; i < sz; i++) {
+    int s = 0;
+    for (int j = 0; j < INTRA_EDGE_TAPS; j++) {
+      int k = i - 2 + j;
+      k = (k < 0) ? 0 : k;
+      k = (k > sz - 1) ? sz - 1 : k;
+      s += edge[k] * kernel[filt][j];
+    }
+    s = (s + 8) >> 4;
+    p[i] = s;
+  }
+}
+
+static void filter_intra_edge_corner(uint8_t *p_above, uint8_t *p_left) {
+  const int kernel[3] = { 5, 6, 5 };
+
+  int s = (p_left[0] * kernel[0]) + (p_above[-1] * kernel[1]) +
+          (p_above[0] * kernel[2]);
+  s = (s + 8) >> 4;
+  p_above[-1] = s;
+  p_left[-1] = s;
+}
+
+void av1_filter_intra_edge_high_c(uint16_t *p, int sz, int strength) {
+  if (!strength) return;
+
+  const int kernel[INTRA_EDGE_FILT][INTRA_EDGE_TAPS] = { { 0, 4, 8, 4, 0 },
+                                                         { 0, 5, 6, 5, 0 },
+                                                         { 2, 4, 4, 4, 2 } };
+  const int filt = strength - 1;
+  uint16_t edge[129];
+
+  memcpy(edge, p, sz * sizeof(*p));
+  for (int i = 1; i < sz; i++) {
+    int s = 0;
+    for (int j = 0; j < INTRA_EDGE_TAPS; j++) {
+      int k = i - 2 + j;
+      k = (k < 0) ? 0 : k;
+      k = (k > sz - 1) ? sz - 1 : k;
+      s += edge[k] * kernel[filt][j];
+    }
+    s = (s + 8) >> 4;
+    p[i] = s;
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void filter_intra_edge_corner_high(uint16_t *p_above, uint16_t *p_left) {
+  const int kernel[3] = { 5, 6, 5 };
+
+  int s = (p_left[0] * kernel[0]) + (p_above[-1] * kernel[1]) +
+          (p_above[0] * kernel[2]);
+  s = (s + 8) >> 4;
+  p_above[-1] = s;
+  p_left[-1] = s;
+}
+#endif
+
+void av1_upsample_intra_edge_c(uint8_t *p, int sz) {
+  // interpolate half-sample positions
+  assert(sz <= MAX_UPSAMPLE_SZ);
+
+  uint8_t in[MAX_UPSAMPLE_SZ + 3];
+  // copy p[-1..(sz-1)] and extend first and last samples
+  in[0] = p[-1];
+  in[1] = p[-1];
+  for (int i = 0; i < sz; i++) {
+    in[i + 2] = p[i];
+  }
+  in[sz + 2] = p[sz - 1];
+
+  // interpolate half-sample edge positions
+  p[-2] = in[0];
+  for (int i = 0; i < sz; i++) {
+    int s = -in[i] + (9 * in[i + 1]) + (9 * in[i + 2]) - in[i + 3];
+    s = clip_pixel((s + 8) >> 4);
+    p[2 * i - 1] = s;
+    p[2 * i] = in[i + 2];
+  }
+}
+
+void av1_upsample_intra_edge_high_c(uint16_t *p, int sz, int bd) {
+  // interpolate half-sample positions
+  assert(sz <= MAX_UPSAMPLE_SZ);
+
+  uint16_t in[MAX_UPSAMPLE_SZ + 3];
+  // copy p[-1..(sz-1)] and extend first and last samples
+  in[0] = p[-1];
+  in[1] = p[-1];
+  for (int i = 0; i < sz; i++) {
+    in[i + 2] = p[i];
+  }
+  in[sz + 2] = p[sz - 1];
+
+  // interpolate half-sample edge positions
+  p[-2] = in[0];
+  for (int i = 0; i < sz; i++) {
+    int s = -in[i] + (9 * in[i + 1]) + (9 * in[i + 2]) - in[i + 3];
+    s = (s + 8) >> 4;
+    s = clip_pixel_highbd(s, bd);
+    p[2 * i - 1] = s;
+    p[2 * i] = in[i + 2];
+  }
+}
+#if CONFIG_AV1_HIGHBITDEPTH
+static void build_intra_predictors_high(
+    const MACROBLOCKD *xd, const uint8_t *ref8, int ref_stride, uint8_t *dst8,
+    int dst_stride, PREDICTION_MODE mode, int angle_delta,
+    FILTER_INTRA_MODE filter_intra_mode, TX_SIZE tx_size,
+    int disable_edge_filter, int n_top_px, int n_topright_px, int n_left_px,
+    int n_bottomleft_px, int plane) {
+  int i;
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
+  uint16_t *ref = CONVERT_TO_SHORTPTR(ref8);
+  DECLARE_ALIGNED(16, uint16_t, left_data[NUM_INTRA_NEIGHBOUR_PIXELS]);
+  DECLARE_ALIGNED(16, uint16_t, above_data[NUM_INTRA_NEIGHBOUR_PIXELS]);
+  uint16_t *const above_row = above_data + 16;
+  uint16_t *const left_col = left_data + 16;
+  const int txwpx = tx_size_wide[tx_size];
+  const int txhpx = tx_size_high[tx_size];
+  int need_left = extend_modes[mode] & NEED_LEFT;
+  int need_above = extend_modes[mode] & NEED_ABOVE;
+  int need_above_left = extend_modes[mode] & NEED_ABOVELEFT;
+  const uint16_t *above_ref = ref - ref_stride;
+  const uint16_t *left_ref = ref - 1;
+  int p_angle = 0;
+  const int is_dr_mode = av1_is_directional_mode(mode);
+  const int use_filter_intra = filter_intra_mode != FILTER_INTRA_MODES;
+  int base = 128 << (xd->bd - 8);
+  // The left_data, above_data buffers must be zeroed to fix some intermittent
+  // valgrind errors. Uninitialized reads in intra pred modules (e.g. width = 4
+  // path in av1_highbd_dr_prediction_z2_avx2()) from left_data, above_data are
+  // seen to be the potential reason for this issue.
+  aom_memset16(left_data, base + 1, NUM_INTRA_NEIGHBOUR_PIXELS);
+  aom_memset16(above_data, base - 1, NUM_INTRA_NEIGHBOUR_PIXELS);
+
+  // The default values if ref pixels are not available:
+  // base   base-1 base-1 .. base-1 base-1 base-1 base-1 base-1 base-1
+  // base+1   A      B  ..     Y      Z
+  // base+1   C      D  ..     W      X
+  // base+1   E      F  ..     U      V
+  // base+1   G      H  ..     S      T      T      T      T      T
+
+  if (is_dr_mode) {
+    p_angle = mode_to_angle_map[mode] + angle_delta;
+    if (p_angle <= 90)
+      need_above = 1, need_left = 0, need_above_left = 1;
+    else if (p_angle < 180)
+      need_above = 1, need_left = 1, need_above_left = 1;
+    else
+      need_above = 0, need_left = 1, need_above_left = 1;
+  }
+  if (use_filter_intra) need_left = need_above = need_above_left = 1;
+
+  assert(n_top_px >= 0);
+  assert(n_topright_px >= 0);
+  assert(n_left_px >= 0);
+  assert(n_bottomleft_px >= 0);
+
+  if ((!need_above && n_left_px == 0) || (!need_left && n_top_px == 0)) {
+    int val;
+    if (need_left) {
+      val = (n_top_px > 0) ? above_ref[0] : base + 1;
+    } else {
+      val = (n_left_px > 0) ? left_ref[0] : base - 1;
+    }
+    for (i = 0; i < txhpx; ++i) {
+      aom_memset16(dst, val, txwpx);
+      dst += dst_stride;
+    }
+    return;
+  }
+
+  // NEED_LEFT
+  if (need_left) {
+    int need_bottom = extend_modes[mode] & NEED_BOTTOMLEFT;
+    if (use_filter_intra) need_bottom = 0;
+    if (is_dr_mode) need_bottom = p_angle > 180;
+    const int num_left_pixels_needed = txhpx + (need_bottom ? txwpx : 0);
+    i = 0;
+    if (n_left_px > 0) {
+      for (; i < n_left_px; i++) left_col[i] = left_ref[i * ref_stride];
+      if (need_bottom && n_bottomleft_px > 0) {
+        assert(i == txhpx);
+        for (; i < txhpx + n_bottomleft_px; i++)
+          left_col[i] = left_ref[i * ref_stride];
+      }
+      if (i < num_left_pixels_needed)
+        aom_memset16(&left_col[i], left_col[i - 1], num_left_pixels_needed - i);
+    } else if (n_top_px > 0) {
+      aom_memset16(left_col, above_ref[0], num_left_pixels_needed);
+    }
+  }
+
+  // NEED_ABOVE
+  if (need_above) {
+    int need_right = extend_modes[mode] & NEED_ABOVERIGHT;
+    if (use_filter_intra) need_right = 0;
+    if (is_dr_mode) need_right = p_angle < 90;
+    const int num_top_pixels_needed = txwpx + (need_right ? txhpx : 0);
+    if (n_top_px > 0) {
+      memcpy(above_row, above_ref, n_top_px * sizeof(above_ref[0]));
+      i = n_top_px;
+      if (need_right && n_topright_px > 0) {
+        assert(n_top_px == txwpx);
+        memcpy(above_row + txwpx, above_ref + txwpx,
+               n_topright_px * sizeof(above_ref[0]));
+        i += n_topright_px;
+      }
+      if (i < num_top_pixels_needed)
+        aom_memset16(&above_row[i], above_row[i - 1],
+                     num_top_pixels_needed - i);
+    } else if (n_left_px > 0) {
+      aom_memset16(above_row, left_ref[0], num_top_pixels_needed);
+    }
+  }
+
+  if (need_above_left) {
+    if (n_top_px > 0 && n_left_px > 0) {
+      above_row[-1] = above_ref[-1];
+    } else if (n_top_px > 0) {
+      above_row[-1] = above_ref[0];
+    } else if (n_left_px > 0) {
+      above_row[-1] = left_ref[0];
+    } else {
+      above_row[-1] = base;
+    }
+    left_col[-1] = above_row[-1];
+  }
+
+  if (use_filter_intra) {
+    highbd_filter_intra_predictor(dst, dst_stride, tx_size, above_row, left_col,
+                                  filter_intra_mode, xd->bd);
+    return;
+  }
+
+  if (is_dr_mode) {
+    int upsample_above = 0;
+    int upsample_left = 0;
+    if (!disable_edge_filter) {
+      const int need_right = p_angle < 90;
+      const int need_bottom = p_angle > 180;
+      const int filt_type = get_filt_type(xd, plane);
+      if (p_angle != 90 && p_angle != 180) {
+        const int ab_le = need_above_left ? 1 : 0;
+        if (need_above && need_left && (txwpx + txhpx >= 24)) {
+          filter_intra_edge_corner_high(above_row, left_col);
+        }
+        if (need_above && n_top_px > 0) {
+          const int strength =
+              intra_edge_filter_strength(txwpx, txhpx, p_angle - 90, filt_type);
+          const int n_px = n_top_px + ab_le + (need_right ? txhpx : 0);
+          av1_filter_intra_edge_high(above_row - ab_le, n_px, strength);
+        }
+        if (need_left && n_left_px > 0) {
+          const int strength = intra_edge_filter_strength(
+              txhpx, txwpx, p_angle - 180, filt_type);
+          const int n_px = n_left_px + ab_le + (need_bottom ? txwpx : 0);
+          av1_filter_intra_edge_high(left_col - ab_le, n_px, strength);
+        }
+      }
+      upsample_above =
+          av1_use_intra_edge_upsample(txwpx, txhpx, p_angle - 90, filt_type);
+      if (need_above && upsample_above) {
+        const int n_px = txwpx + (need_right ? txhpx : 0);
+        av1_upsample_intra_edge_high(above_row, n_px, xd->bd);
+      }
+      upsample_left =
+          av1_use_intra_edge_upsample(txhpx, txwpx, p_angle - 180, filt_type);
+      if (need_left && upsample_left) {
+        const int n_px = txhpx + (need_bottom ? txwpx : 0);
+        av1_upsample_intra_edge_high(left_col, n_px, xd->bd);
+      }
+    }
+    highbd_dr_predictor(dst, dst_stride, tx_size, above_row, left_col,
+                        upsample_above, upsample_left, p_angle, xd->bd);
+    return;
+  }
+
+  // predict
+  if (mode == DC_PRED) {
+    dc_pred_high[n_left_px > 0][n_top_px > 0][tx_size](
+        dst, dst_stride, above_row, left_col, xd->bd);
+  } else {
+    pred_high[mode][tx_size](dst, dst_stride, above_row, left_col, xd->bd);
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+static void build_intra_predictors(const MACROBLOCKD *xd, const uint8_t *ref,
+                                   int ref_stride, uint8_t *dst, int dst_stride,
+                                   PREDICTION_MODE mode, int angle_delta,
+                                   FILTER_INTRA_MODE filter_intra_mode,
+                                   TX_SIZE tx_size, int disable_edge_filter,
+                                   int n_top_px, int n_topright_px,
+                                   int n_left_px, int n_bottomleft_px,
+                                   int plane) {
+  int i;
+  const uint8_t *above_ref = ref - ref_stride;
+  const uint8_t *left_ref = ref - 1;
+  DECLARE_ALIGNED(16, uint8_t, left_data[NUM_INTRA_NEIGHBOUR_PIXELS]);
+  DECLARE_ALIGNED(16, uint8_t, above_data[NUM_INTRA_NEIGHBOUR_PIXELS]);
+  uint8_t *const above_row = above_data + 16;
+  uint8_t *const left_col = left_data + 16;
+  const int txwpx = tx_size_wide[tx_size];
+  const int txhpx = tx_size_high[tx_size];
+  int need_left = extend_modes[mode] & NEED_LEFT;
+  int need_above = extend_modes[mode] & NEED_ABOVE;
+  int need_above_left = extend_modes[mode] & NEED_ABOVELEFT;
+  int p_angle = 0;
+  const int is_dr_mode = av1_is_directional_mode(mode);
+  const int use_filter_intra = filter_intra_mode != FILTER_INTRA_MODES;
+  // The left_data, above_data buffers must be zeroed to fix some intermittent
+  // valgrind errors. Uninitialized reads in intra pred modules (e.g. width = 4
+  // path in av1_dr_prediction_z1_avx2()) from left_data, above_data are seen to
+  // be the potential reason for this issue.
+  memset(left_data, 129, NUM_INTRA_NEIGHBOUR_PIXELS);
+  memset(above_data, 127, NUM_INTRA_NEIGHBOUR_PIXELS);
+
+  // The default values if ref pixels are not available:
+  // 128 127 127 .. 127 127 127 127 127 127
+  // 129  A   B  ..  Y   Z
+  // 129  C   D  ..  W   X
+  // 129  E   F  ..  U   V
+  // 129  G   H  ..  S   T   T   T   T   T
+  // ..
+
+  if (is_dr_mode) {
+    p_angle = mode_to_angle_map[mode] + angle_delta;
+    if (p_angle <= 90)
+      need_above = 1, need_left = 0, need_above_left = 1;
+    else if (p_angle < 180)
+      need_above = 1, need_left = 1, need_above_left = 1;
+    else
+      need_above = 0, need_left = 1, need_above_left = 1;
+  }
+  if (use_filter_intra) need_left = need_above = need_above_left = 1;
+
+  assert(n_top_px >= 0);
+  assert(n_topright_px >= 0);
+  assert(n_left_px >= 0);
+  assert(n_bottomleft_px >= 0);
+
+  if ((!need_above && n_left_px == 0) || (!need_left && n_top_px == 0)) {
+    int val;
+    if (need_left) {
+      val = (n_top_px > 0) ? above_ref[0] : 129;
+    } else {
+      val = (n_left_px > 0) ? left_ref[0] : 127;
+    }
+    for (i = 0; i < txhpx; ++i) {
+      memset(dst, val, txwpx);
+      dst += dst_stride;
+    }
+    return;
+  }
+
+  // NEED_LEFT
+  if (need_left) {
+    int need_bottom = extend_modes[mode] & NEED_BOTTOMLEFT;
+    if (use_filter_intra) need_bottom = 0;
+    if (is_dr_mode) need_bottom = p_angle > 180;
+    const int num_left_pixels_needed = txhpx + (need_bottom ? txwpx : 0);
+    i = 0;
+    if (n_left_px > 0) {
+      for (; i < n_left_px; i++) left_col[i] = left_ref[i * ref_stride];
+      if (need_bottom && n_bottomleft_px > 0) {
+        assert(i == txhpx);
+        for (; i < txhpx + n_bottomleft_px; i++)
+          left_col[i] = left_ref[i * ref_stride];
+      }
+      if (i < num_left_pixels_needed)
+        memset(&left_col[i], left_col[i - 1], num_left_pixels_needed - i);
+    } else if (n_top_px > 0) {
+      memset(left_col, above_ref[0], num_left_pixels_needed);
+    }
+  }
+
+  // NEED_ABOVE
+  if (need_above) {
+    int need_right = extend_modes[mode] & NEED_ABOVERIGHT;
+    if (use_filter_intra) need_right = 0;
+    if (is_dr_mode) need_right = p_angle < 90;
+    const int num_top_pixels_needed = txwpx + (need_right ? txhpx : 0);
+    if (n_top_px > 0) {
+      memcpy(above_row, above_ref, n_top_px);
+      i = n_top_px;
+      if (need_right && n_topright_px > 0) {
+        assert(n_top_px == txwpx);
+        memcpy(above_row + txwpx, above_ref + txwpx, n_topright_px);
+        i += n_topright_px;
+      }
+      if (i < num_top_pixels_needed)
+        memset(&above_row[i], above_row[i - 1], num_top_pixels_needed - i);
+    } else if (n_left_px > 0) {
+      memset(above_row, left_ref[0], num_top_pixels_needed);
+    }
+  }
+
+  if (need_above_left) {
+    if (n_top_px > 0 && n_left_px > 0) {
+      above_row[-1] = above_ref[-1];
+    } else if (n_top_px > 0) {
+      above_row[-1] = above_ref[0];
+    } else if (n_left_px > 0) {
+      above_row[-1] = left_ref[0];
+    } else {
+      above_row[-1] = 128;
+    }
+    left_col[-1] = above_row[-1];
+  }
+
+  if (use_filter_intra) {
+    av1_filter_intra_predictor(dst, dst_stride, tx_size, above_row, left_col,
+                               filter_intra_mode);
+    return;
+  }
+
+  if (is_dr_mode) {
+    int upsample_above = 0;
+    int upsample_left = 0;
+    if (!disable_edge_filter) {
+      const int need_right = p_angle < 90;
+      const int need_bottom = p_angle > 180;
+      const int filt_type = get_filt_type(xd, plane);
+      if (p_angle != 90 && p_angle != 180) {
+        const int ab_le = need_above_left ? 1 : 0;
+        if (need_above && need_left && (txwpx + txhpx >= 24)) {
+          filter_intra_edge_corner(above_row, left_col);
+        }
+        if (need_above && n_top_px > 0) {
+          const int strength =
+              intra_edge_filter_strength(txwpx, txhpx, p_angle - 90, filt_type);
+          const int n_px = n_top_px + ab_le + (need_right ? txhpx : 0);
+          av1_filter_intra_edge(above_row - ab_le, n_px, strength);
+        }
+        if (need_left && n_left_px > 0) {
+          const int strength = intra_edge_filter_strength(
+              txhpx, txwpx, p_angle - 180, filt_type);
+          const int n_px = n_left_px + ab_le + (need_bottom ? txwpx : 0);
+          av1_filter_intra_edge(left_col - ab_le, n_px, strength);
+        }
+      }
+      upsample_above =
+          av1_use_intra_edge_upsample(txwpx, txhpx, p_angle - 90, filt_type);
+      if (need_above && upsample_above) {
+        const int n_px = txwpx + (need_right ? txhpx : 0);
+        av1_upsample_intra_edge(above_row, n_px);
+      }
+      upsample_left =
+          av1_use_intra_edge_upsample(txhpx, txwpx, p_angle - 180, filt_type);
+      if (need_left && upsample_left) {
+        const int n_px = txhpx + (need_bottom ? txwpx : 0);
+        av1_upsample_intra_edge(left_col, n_px);
+      }
+    }
+    dr_predictor(dst, dst_stride, tx_size, above_row, left_col, upsample_above,
+                 upsample_left, p_angle);
+    return;
+  }
+
+  // predict
+  if (mode == DC_PRED) {
+    dc_pred[n_left_px > 0][n_top_px > 0][tx_size](dst, dst_stride, above_row,
+                                                  left_col);
+  } else {
+    pred[mode][tx_size](dst, dst_stride, above_row, left_col);
+  }
+}
+
+static INLINE BLOCK_SIZE scale_chroma_bsize(BLOCK_SIZE bsize, int subsampling_x,
+                                            int subsampling_y) {
+  assert(subsampling_x >= 0 && subsampling_x < 2);
+  assert(subsampling_y >= 0 && subsampling_y < 2);
+  BLOCK_SIZE bs = bsize;
+  switch (bsize) {
+    case BLOCK_4X4:
+      if (subsampling_x == 1 && subsampling_y == 1)
+        bs = BLOCK_8X8;
+      else if (subsampling_x == 1)
+        bs = BLOCK_8X4;
+      else if (subsampling_y == 1)
+        bs = BLOCK_4X8;
+      break;
+    case BLOCK_4X8:
+      if (subsampling_x == 1 && subsampling_y == 1)
+        bs = BLOCK_8X8;
+      else if (subsampling_x == 1)
+        bs = BLOCK_8X8;
+      else if (subsampling_y == 1)
+        bs = BLOCK_4X8;
+      break;
+    case BLOCK_8X4:
+      if (subsampling_x == 1 && subsampling_y == 1)
+        bs = BLOCK_8X8;
+      else if (subsampling_x == 1)
+        bs = BLOCK_8X4;
+      else if (subsampling_y == 1)
+        bs = BLOCK_8X8;
+      break;
+    case BLOCK_4X16:
+      if (subsampling_x == 1 && subsampling_y == 1)
+        bs = BLOCK_8X16;
+      else if (subsampling_x == 1)
+        bs = BLOCK_8X16;
+      else if (subsampling_y == 1)
+        bs = BLOCK_4X16;
+      break;
+    case BLOCK_16X4:
+      if (subsampling_x == 1 && subsampling_y == 1)
+        bs = BLOCK_16X8;
+      else if (subsampling_x == 1)
+        bs = BLOCK_16X4;
+      else if (subsampling_y == 1)
+        bs = BLOCK_16X8;
+      break;
+    default: break;
+  }
+  return bs;
+}
+
+void av1_predict_intra_block(
+    const AV1_COMMON *cm, const MACROBLOCKD *xd, int wpx, int hpx,
+    TX_SIZE tx_size, PREDICTION_MODE mode, int angle_delta, int use_palette,
+    FILTER_INTRA_MODE filter_intra_mode, const uint8_t *ref, int ref_stride,
+    uint8_t *dst, int dst_stride, int col_off, int row_off, int plane) {
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  const int txwpx = tx_size_wide[tx_size];
+  const int txhpx = tx_size_high[tx_size];
+  const int x = col_off << MI_SIZE_LOG2;
+  const int y = row_off << MI_SIZE_LOG2;
+
+  if (use_palette) {
+    int r, c;
+    const uint8_t *const map = xd->plane[plane != 0].color_index_map +
+                               xd->color_index_map_offset[plane != 0];
+    const uint16_t *const palette =
+        mbmi->palette_mode_info.palette_colors + plane * PALETTE_MAX_SIZE;
+    if (is_cur_buf_hbd(xd)) {
+      uint16_t *dst16 = CONVERT_TO_SHORTPTR(dst);
+      for (r = 0; r < txhpx; ++r) {
+        for (c = 0; c < txwpx; ++c) {
+          dst16[r * dst_stride + c] = palette[map[(r + y) * wpx + c + x]];
+        }
+      }
+    } else {
+      for (r = 0; r < txhpx; ++r) {
+        for (c = 0; c < txwpx; ++c) {
+          dst[r * dst_stride + c] =
+              (uint8_t)palette[map[(r + y) * wpx + c + x]];
+        }
+      }
+    }
+    return;
+  }
+
+  const struct macroblockd_plane *const pd = &xd->plane[plane];
+  const int txw = tx_size_wide_unit[tx_size];
+  const int txh = tx_size_high_unit[tx_size];
+  const int ss_x = pd->subsampling_x;
+  const int ss_y = pd->subsampling_y;
+  const int have_top =
+      row_off || (ss_y ? xd->chroma_up_available : xd->up_available);
+  const int have_left =
+      col_off || (ss_x ? xd->chroma_left_available : xd->left_available);
+  const int mi_row = -xd->mb_to_top_edge >> (3 + MI_SIZE_LOG2);
+  const int mi_col = -xd->mb_to_left_edge >> (3 + MI_SIZE_LOG2);
+
+  // Distance between the right edge of this prediction block to
+  // the frame right edge
+  const int xr = (xd->mb_to_right_edge >> (3 + ss_x)) + wpx - x - txwpx;
+  // Distance between the bottom edge of this prediction block to
+  // the frame bottom edge
+  const int yd = (xd->mb_to_bottom_edge >> (3 + ss_y)) + hpx - y - txhpx;
+  const int right_available =
+      mi_col + ((col_off + txw) << ss_x) < xd->tile.mi_col_end;
+  const int bottom_available =
+      (yd > 0) && (mi_row + ((row_off + txh) << ss_y) < xd->tile.mi_row_end);
+
+  const PARTITION_TYPE partition = mbmi->partition;
+
+  BLOCK_SIZE bsize = mbmi->bsize;
+  // force 4x4 chroma component block size.
+  if (ss_x || ss_y) {
+    bsize = scale_chroma_bsize(bsize, ss_x, ss_y);
+  }
+
+  const int have_top_right =
+      has_top_right(cm, bsize, mi_row, mi_col, have_top, right_available,
+                    partition, tx_size, row_off, col_off, ss_x, ss_y);
+  const int have_bottom_left =
+      has_bottom_left(cm, bsize, mi_row, mi_col, bottom_available, have_left,
+                      partition, tx_size, row_off, col_off, ss_x, ss_y);
+
+  const int disable_edge_filter = !cm->seq_params.enable_intra_edge_filter;
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (is_cur_buf_hbd(xd)) {
+    build_intra_predictors_high(
+        xd, ref, ref_stride, dst, dst_stride, mode, angle_delta,
+        filter_intra_mode, tx_size, disable_edge_filter,
+        have_top ? AOMMIN(txwpx, xr + txwpx) : 0,
+        have_top_right ? AOMMIN(txwpx, xr) : 0,
+        have_left ? AOMMIN(txhpx, yd + txhpx) : 0,
+        have_bottom_left ? AOMMIN(txhpx, yd) : 0, plane);
+    return;
+  }
+#endif
+  build_intra_predictors(xd, ref, ref_stride, dst, dst_stride, mode,
+                         angle_delta, filter_intra_mode, tx_size,
+                         disable_edge_filter,
+                         have_top ? AOMMIN(txwpx, xr + txwpx) : 0,
+                         have_top_right ? AOMMIN(txwpx, xr) : 0,
+                         have_left ? AOMMIN(txhpx, yd + txhpx) : 0,
+                         have_bottom_left ? AOMMIN(txhpx, yd) : 0, plane);
+}
+
+void av1_predict_intra_block_facade(const AV1_COMMON *cm, MACROBLOCKD *xd,
+                                    int plane, int blk_col, int blk_row,
+                                    TX_SIZE tx_size) {
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  struct macroblockd_plane *const pd = &xd->plane[plane];
+  const int dst_stride = pd->dst.stride;
+  uint8_t *dst = &pd->dst.buf[(blk_row * dst_stride + blk_col) << MI_SIZE_LOG2];
+  const PREDICTION_MODE mode =
+      (plane == AOM_PLANE_Y) ? mbmi->mode : get_uv_mode(mbmi->uv_mode);
+  const int use_palette = mbmi->palette_mode_info.palette_size[plane != 0] > 0;
+  const FILTER_INTRA_MODE filter_intra_mode =
+      (plane == AOM_PLANE_Y && mbmi->filter_intra_mode_info.use_filter_intra)
+          ? mbmi->filter_intra_mode_info.filter_intra_mode
+          : FILTER_INTRA_MODES;
+  const int angle_delta = mbmi->angle_delta[plane != AOM_PLANE_Y] * ANGLE_STEP;
+
+  if (plane != AOM_PLANE_Y && mbmi->uv_mode == UV_CFL_PRED) {
+#if CONFIG_DEBUG
+    assert(is_cfl_allowed(xd));
+    const BLOCK_SIZE plane_bsize =
+        get_plane_block_size(mbmi->bsize, pd->subsampling_x, pd->subsampling_y);
+    (void)plane_bsize;
+    assert(plane_bsize < BLOCK_SIZES_ALL);
+    if (!xd->lossless[mbmi->segment_id]) {
+      assert(blk_col == 0);
+      assert(blk_row == 0);
+      assert(block_size_wide[plane_bsize] == tx_size_wide[tx_size]);
+      assert(block_size_high[plane_bsize] == tx_size_high[tx_size]);
+    }
+#endif
+    CFL_CTX *const cfl = &xd->cfl;
+    CFL_PRED_TYPE pred_plane = get_cfl_pred_type(plane);
+    if (cfl->dc_pred_is_cached[pred_plane] == 0) {
+      av1_predict_intra_block(cm, xd, pd->width, pd->height, tx_size, mode,
+                              angle_delta, use_palette, filter_intra_mode, dst,
+                              dst_stride, dst, dst_stride, blk_col, blk_row,
+                              plane);
+      if (cfl->use_dc_pred_cache) {
+        cfl_store_dc_pred(xd, dst, pred_plane, tx_size_wide[tx_size]);
+        cfl->dc_pred_is_cached[pred_plane] = 1;
+      }
+    } else {
+      cfl_load_dc_pred(xd, dst, dst_stride, tx_size, pred_plane);
+    }
+    cfl_predict_block(xd, dst, dst_stride, tx_size, plane);
+    return;
+  }
+  av1_predict_intra_block(cm, xd, pd->width, pd->height, tx_size, mode,
+                          angle_delta, use_palette, filter_intra_mode, dst,
+                          dst_stride, dst, dst_stride, blk_col, blk_row, plane);
+}
+
+void av1_init_intra_predictors(void) {
+  aom_once(init_intra_predictors_internal);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h
new file mode 100644
index 0000000000..62d3a53c53
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_RECONINTRA_H_
+#define AOM_AV1_COMMON_RECONINTRA_H_
+
+#include <stdlib.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void av1_init_intra_predictors(void);
+void av1_predict_intra_block_facade(const AV1_COMMON *cm, MACROBLOCKD *xd,
+                                    int plane, int blk_col, int blk_row,
+                                    TX_SIZE tx_size);
+void av1_predict_intra_block(
+    const AV1_COMMON *cm, const MACROBLOCKD *xd, int wpx, int hpx,
+    TX_SIZE tx_size, PREDICTION_MODE mode, int angle_delta, int use_palette,
+    FILTER_INTRA_MODE filter_intra_mode, const uint8_t *ref, int ref_stride,
+    uint8_t *dst, int dst_stride, int col_off, int row_off, int plane);
+
+// Mapping of interintra to intra mode for use in the intra component
+static const PREDICTION_MODE interintra_to_intra_mode[INTERINTRA_MODES] = {
+  DC_PRED, V_PRED, H_PRED, SMOOTH_PRED
+};
+
+// Mapping of intra mode to the interintra mode
+static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
+  II_DC_PRED, II_V_PRED, II_H_PRED, II_V_PRED,      II_SMOOTH_PRED, II_V_PRED,
+  II_H_PRED,  II_H_PRED, II_V_PRED, II_SMOOTH_PRED, II_SMOOTH_PRED
+};
+
+#define FILTER_INTRA_SCALE_BITS 4
+
+static INLINE int av1_is_directional_mode(PREDICTION_MODE mode) {
+  return mode >= V_PRED && mode <= D67_PRED;
+}
+
+static INLINE int av1_use_angle_delta(BLOCK_SIZE bsize) {
+  return bsize >= BLOCK_8X8;
+}
+
+static INLINE int av1_allow_intrabc(const AV1_COMMON *const cm) {
+  return frame_is_intra_only(cm) && cm->features.allow_screen_content_tools &&
+         cm->features.allow_intrabc;
+}
+
+static INLINE int av1_filter_intra_allowed_bsize(const AV1_COMMON *const cm,
+                                                 BLOCK_SIZE bs) {
+  if (!cm->seq_params.enable_filter_intra || bs == BLOCK_INVALID) return 0;
+
+  return block_size_wide[bs] <= 32 && block_size_high[bs] <= 32;
+}
+
+static INLINE int av1_filter_intra_allowed(const AV1_COMMON *const cm,
+                                           const MB_MODE_INFO *mbmi) {
+  return mbmi->mode == DC_PRED &&
+         mbmi->palette_mode_info.palette_size[0] == 0 &&
+         av1_filter_intra_allowed_bsize(cm, mbmi->bsize);
+}
+
+extern const int8_t av1_filter_intra_taps[FILTER_INTRA_MODES][8][8];
+
+static const int16_t dr_intra_derivative[90] = {
+  // More evenly spread out angles and limited to 10-bit
+  // Values that are 0 will never be used
+  //                    Approx angle
+  0,    0, 0,        //
+  1023, 0, 0,        // 3, ...
+  547,  0, 0,        // 6, ...
+  372,  0, 0, 0, 0,  // 9, ...
+  273,  0, 0,        // 14, ...
+  215,  0, 0,        // 17, ...
+  178,  0, 0,        // 20, ...
+  151,  0, 0,        // 23, ... (113 & 203 are base angles)
+  132,  0, 0,        // 26, ...
+  116,  0, 0,        // 29, ...
+  102,  0, 0, 0,     // 32, ...
+  90,   0, 0,        // 36, ...
+  80,   0, 0,        // 39, ...
+  71,   0, 0,        // 42, ...
+  64,   0, 0,        // 45, ... (45 & 135 are base angles)
+  57,   0, 0,        // 48, ...
+  51,   0, 0,        // 51, ...
+  45,   0, 0, 0,     // 54, ...
+  40,   0, 0,        // 58, ...
+  35,   0, 0,        // 61, ...
+  31,   0, 0,        // 64, ...
+  27,   0, 0,        // 67, ... (67 & 157 are base angles)
+  23,   0, 0,        // 70, ...
+  19,   0, 0,        // 73, ...
+  15,   0, 0, 0, 0,  // 76, ...
+  11,   0, 0,        // 81, ...
+  7,    0, 0,        // 84, ...
+  3,    0, 0,        // 87, ...
+};
+
+// Get the shift (up-scaled by 256) in X w.r.t a unit change in Y.
+// If angle > 0 && angle < 90, dx = -((int)(256 / t));
+// If angle > 90 && angle < 180, dx = (int)(256 / t);
+// If angle > 180 && angle < 270, dx = 1;
+static INLINE int av1_get_dx(int angle) {
+  if (angle > 0 && angle < 90) {
+    return dr_intra_derivative[angle];
+  } else if (angle > 90 && angle < 180) {
+    return dr_intra_derivative[180 - angle];
+  } else {
+    // In this case, we are not really going to use dx. We may return any value.
+    return 1;
+  }
+}
+
+// Get the shift (up-scaled by 256) in Y w.r.t a unit change in X.
+// If angle > 0 && angle < 90, dy = 1;
+// If angle > 90 && angle < 180, dy = (int)(256 * t);
+// If angle > 180 && angle < 270, dy = -((int)(256 * t));
+static INLINE int av1_get_dy(int angle) {
+  if (angle > 90 && angle < 180) {
+    return dr_intra_derivative[angle - 90];
+  } else if (angle > 180 && angle < 270) {
+    return dr_intra_derivative[270 - angle];
+  } else {
+    // In this case, we are not really going to use dy. We may return any value.
+    return 1;
+  }
+}
+
+static INLINE int av1_use_intra_edge_upsample(int bs0, int bs1, int delta,
+                                              int type) {
+  const int d = abs(delta);
+  const int blk_wh = bs0 + bs1;
+  if (d == 0 || d >= 40) return 0;
+  return type ? (blk_wh <= 8) : (blk_wh <= 16);
+}
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+#endif  // AOM_AV1_COMMON_RECONINTRA_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/resize.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/resize.c
new file mode 100644
index 0000000000..a64a330aac
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/resize.c
@@ -0,0 +1,1517 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/resize.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+// Filters for interpolation (0.5-band) - note this also filters integer pels.
+static const InterpKernel filteredinterp_filters500[(1 << RS_SUBPEL_BITS)] = {
+  { -3, 0, 35, 64, 35, 0, -3, 0 },    { -3, 0, 34, 64, 36, 0, -3, 0 },
+  { -3, -1, 34, 64, 36, 1, -3, 0 },   { -3, -1, 33, 64, 37, 1, -3, 0 },
+  { -3, -1, 32, 64, 38, 1, -3, 0 },   { -3, -1, 31, 64, 39, 1, -3, 0 },
+  { -3, -1, 31, 63, 39, 2, -3, 0 },   { -2, -2, 30, 63, 40, 2, -3, 0 },
+  { -2, -2, 29, 63, 41, 2, -3, 0 },   { -2, -2, 29, 63, 41, 3, -4, 0 },
+  { -2, -2, 28, 63, 42, 3, -4, 0 },   { -2, -2, 27, 63, 43, 3, -4, 0 },
+  { -2, -3, 27, 63, 43, 4, -4, 0 },   { -2, -3, 26, 62, 44, 5, -4, 0 },
+  { -2, -3, 25, 62, 45, 5, -4, 0 },   { -2, -3, 25, 62, 45, 5, -4, 0 },
+  { -2, -3, 24, 62, 46, 5, -4, 0 },   { -2, -3, 23, 61, 47, 6, -4, 0 },
+  { -2, -3, 23, 61, 47, 6, -4, 0 },   { -2, -3, 22, 61, 48, 7, -4, -1 },
+  { -2, -3, 21, 60, 49, 7, -4, 0 },   { -1, -4, 20, 60, 49, 8, -4, 0 },
+  { -1, -4, 20, 60, 50, 8, -4, -1 },  { -1, -4, 19, 59, 51, 9, -4, -1 },
+  { -1, -4, 19, 59, 51, 9, -4, -1 },  { -1, -4, 18, 58, 52, 10, -4, -1 },
+  { -1, -4, 17, 58, 52, 11, -4, -1 }, { -1, -4, 16, 58, 53, 11, -4, -1 },
+  { -1, -4, 16, 57, 53, 12, -4, -1 }, { -1, -4, 15, 57, 54, 12, -4, -1 },
+  { -1, -4, 15, 56, 54, 13, -4, -1 }, { -1, -4, 14, 56, 55, 13, -4, -1 },
+  { -1, -4, 14, 55, 55, 14, -4, -1 }, { -1, -4, 13, 55, 56, 14, -4, -1 },
+  { -1, -4, 13, 54, 56, 15, -4, -1 }, { -1, -4, 12, 54, 57, 15, -4, -1 },
+  { -1, -4, 12, 53, 57, 16, -4, -1 }, { -1, -4, 11, 53, 58, 16, -4, -1 },
+  { -1, -4, 11, 52, 58, 17, -4, -1 }, { -1, -4, 10, 52, 58, 18, -4, -1 },
+  { -1, -4, 9, 51, 59, 19, -4, -1 },  { -1, -4, 9, 51, 59, 19, -4, -1 },
+  { -1, -4, 8, 50, 60, 20, -4, -1 },  { 0, -4, 8, 49, 60, 20, -4, -1 },
+  { 0, -4, 7, 49, 60, 21, -3, -2 },   { -1, -4, 7, 48, 61, 22, -3, -2 },
+  { 0, -4, 6, 47, 61, 23, -3, -2 },   { 0, -4, 6, 47, 61, 23, -3, -2 },
+  { 0, -4, 5, 46, 62, 24, -3, -2 },   { 0, -4, 5, 45, 62, 25, -3, -2 },
+  { 0, -4, 5, 45, 62, 25, -3, -2 },   { 0, -4, 5, 44, 62, 26, -3, -2 },
+  { 0, -4, 4, 43, 63, 27, -3, -2 },   { 0, -4, 3, 43, 63, 27, -2, -2 },
+  { 0, -4, 3, 42, 63, 28, -2, -2 },   { 0, -4, 3, 41, 63, 29, -2, -2 },
+  { 0, -3, 2, 41, 63, 29, -2, -2 },   { 0, -3, 2, 40, 63, 30, -2, -2 },
+  { 0, -3, 2, 39, 63, 31, -1, -3 },   { 0, -3, 1, 39, 64, 31, -1, -3 },
+  { 0, -3, 1, 38, 64, 32, -1, -3 },   { 0, -3, 1, 37, 64, 33, -1, -3 },
+  { 0, -3, 1, 36, 64, 34, -1, -3 },   { 0, -3, 0, 36, 64, 34, 0, -3 },
+};
+
+// Filters for interpolation (0.625-band) - note this also filters integer pels.
+static const InterpKernel filteredinterp_filters625[(1 << RS_SUBPEL_BITS)] = {
+  { -1, -8, 33, 80, 33, -8, -1, 0 }, { -1, -8, 31, 80, 34, -8, -1, 1 },
+  { -1, -8, 30, 80, 35, -8, -1, 1 }, { -1, -8, 29, 80, 36, -7, -2, 1 },
+  { -1, -8, 28, 80, 37, -7, -2, 1 }, { -1, -8, 27, 80, 38, -7, -2, 1 },
+  { 0, -8, 26, 79, 39, -7, -2, 1 },  { 0, -8, 25, 79, 40, -7, -2, 1 },
+  { 0, -8, 24, 79, 41, -7, -2, 1 },  { 0, -8, 23, 78, 42, -6, -2, 1 },
+  { 0, -8, 22, 78, 43, -6, -2, 1 },  { 0, -8, 21, 78, 44, -6, -2, 1 },
+  { 0, -8, 20, 78, 45, -5, -3, 1 },  { 0, -8, 19, 77, 47, -5, -3, 1 },
+  { 0, -8, 18, 77, 48, -5, -3, 1 },  { 0, -8, 17, 77, 49, -5, -3, 1 },
+  { 0, -8, 16, 76, 50, -4, -3, 1 },  { 0, -8, 15, 76, 51, -4, -3, 1 },
+  { 0, -8, 15, 75, 52, -3, -4, 1 },  { 0, -7, 14, 74, 53, -3, -4, 1 },
+  { 0, -7, 13, 74, 54, -3, -4, 1 },  { 0, -7, 12, 73, 55, -2, -4, 1 },
+  { 0, -7, 11, 73, 56, -2, -4, 1 },  { 0, -7, 10, 72, 57, -1, -4, 1 },
+  { 1, -7, 10, 71, 58, -1, -5, 1 },  { 0, -7, 9, 71, 59, 0, -5, 1 },
+  { 1, -7, 8, 70, 60, 0, -5, 1 },    { 1, -7, 7, 69, 61, 1, -5, 1 },
+  { 1, -6, 6, 68, 62, 1, -5, 1 },    { 0, -6, 6, 68, 62, 2, -5, 1 },
+  { 1, -6, 5, 67, 63, 2, -5, 1 },    { 1, -6, 5, 66, 64, 3, -6, 1 },
+  { 1, -6, 4, 65, 65, 4, -6, 1 },    { 1, -6, 3, 64, 66, 5, -6, 1 },
+  { 1, -5, 2, 63, 67, 5, -6, 1 },    { 1, -5, 2, 62, 68, 6, -6, 0 },
+  { 1, -5, 1, 62, 68, 6, -6, 1 },    { 1, -5, 1, 61, 69, 7, -7, 1 },
+  { 1, -5, 0, 60, 70, 8, -7, 1 },    { 1, -5, 0, 59, 71, 9, -7, 0 },
+  { 1, -5, -1, 58, 71, 10, -7, 1 },  { 1, -4, -1, 57, 72, 10, -7, 0 },
+  { 1, -4, -2, 56, 73, 11, -7, 0 },  { 1, -4, -2, 55, 73, 12, -7, 0 },
+  { 1, -4, -3, 54, 74, 13, -7, 0 },  { 1, -4, -3, 53, 74, 14, -7, 0 },
+  { 1, -4, -3, 52, 75, 15, -8, 0 },  { 1, -3, -4, 51, 76, 15, -8, 0 },
+  { 1, -3, -4, 50, 76, 16, -8, 0 },  { 1, -3, -5, 49, 77, 17, -8, 0 },
+  { 1, -3, -5, 48, 77, 18, -8, 0 },  { 1, -3, -5, 47, 77, 19, -8, 0 },
+  { 1, -3, -5, 45, 78, 20, -8, 0 },  { 1, -2, -6, 44, 78, 21, -8, 0 },
+  { 1, -2, -6, 43, 78, 22, -8, 0 },  { 1, -2, -6, 42, 78, 23, -8, 0 },
+  { 1, -2, -7, 41, 79, 24, -8, 0 },  { 1, -2, -7, 40, 79, 25, -8, 0 },
+  { 1, -2, -7, 39, 79, 26, -8, 0 },  { 1, -2, -7, 38, 80, 27, -8, -1 },
+  { 1, -2, -7, 37, 80, 28, -8, -1 }, { 1, -2, -7, 36, 80, 29, -8, -1 },
+  { 1, -1, -8, 35, 80, 30, -8, -1 }, { 1, -1, -8, 34, 80, 31, -8, -1 },
+};
+
+// Filters for interpolation (0.75-band) - note this also filters integer pels.
+static const InterpKernel filteredinterp_filters750[(1 << RS_SUBPEL_BITS)] = {
+  { 2, -11, 25, 96, 25, -11, 2, 0 }, { 2, -11, 24, 96, 26, -11, 2, 0 },
+  { 2, -11, 22, 96, 28, -11, 2, 0 }, { 2, -10, 21, 96, 29, -12, 2, 0 },
+  { 2, -10, 19, 96, 31, -12, 2, 0 }, { 2, -10, 18, 95, 32, -11, 2, 0 },
+  { 2, -10, 17, 95, 34, -12, 2, 0 }, { 2, -9, 15, 95, 35, -12, 2, 0 },
+  { 2, -9, 14, 94, 37, -12, 2, 0 },  { 2, -9, 13, 94, 38, -12, 2, 0 },
+  { 2, -8, 12, 93, 40, -12, 1, 0 },  { 2, -8, 11, 93, 41, -12, 1, 0 },
+  { 2, -8, 9, 92, 43, -12, 1, 1 },   { 2, -8, 8, 92, 44, -12, 1, 1 },
+  { 2, -7, 7, 91, 46, -12, 1, 0 },   { 2, -7, 6, 90, 47, -12, 1, 1 },
+  { 2, -7, 5, 90, 49, -12, 1, 0 },   { 2, -6, 4, 89, 50, -12, 1, 0 },
+  { 2, -6, 3, 88, 52, -12, 0, 1 },   { 2, -6, 2, 87, 54, -12, 0, 1 },
+  { 2, -5, 1, 86, 55, -12, 0, 1 },   { 2, -5, 0, 85, 57, -12, 0, 1 },
+  { 2, -5, -1, 84, 58, -11, 0, 1 },  { 2, -5, -2, 83, 60, -11, 0, 1 },
+  { 2, -4, -2, 82, 61, -11, -1, 1 }, { 1, -4, -3, 81, 63, -10, -1, 1 },
+  { 2, -4, -4, 80, 64, -10, -1, 1 }, { 1, -4, -4, 79, 66, -10, -1, 1 },
+  { 1, -3, -5, 77, 67, -9, -1, 1 },  { 1, -3, -6, 76, 69, -9, -1, 1 },
+  { 1, -3, -6, 75, 70, -8, -2, 1 },  { 1, -2, -7, 74, 71, -8, -2, 1 },
+  { 1, -2, -7, 72, 72, -7, -2, 1 },  { 1, -2, -8, 71, 74, -7, -2, 1 },
+  { 1, -2, -8, 70, 75, -6, -3, 1 },  { 1, -1, -9, 69, 76, -6, -3, 1 },
+  { 1, -1, -9, 67, 77, -5, -3, 1 },  { 1, -1, -10, 66, 79, -4, -4, 1 },
+  { 1, -1, -10, 64, 80, -4, -4, 2 }, { 1, -1, -10, 63, 81, -3, -4, 1 },
+  { 1, -1, -11, 61, 82, -2, -4, 2 }, { 1, 0, -11, 60, 83, -2, -5, 2 },
+  { 1, 0, -11, 58, 84, -1, -5, 2 },  { 1, 0, -12, 57, 85, 0, -5, 2 },
+  { 1, 0, -12, 55, 86, 1, -5, 2 },   { 1, 0, -12, 54, 87, 2, -6, 2 },
+  { 1, 0, -12, 52, 88, 3, -6, 2 },   { 0, 1, -12, 50, 89, 4, -6, 2 },
+  { 0, 1, -12, 49, 90, 5, -7, 2 },   { 1, 1, -12, 47, 90, 6, -7, 2 },
+  { 0, 1, -12, 46, 91, 7, -7, 2 },   { 1, 1, -12, 44, 92, 8, -8, 2 },
+  { 1, 1, -12, 43, 92, 9, -8, 2 },   { 0, 1, -12, 41, 93, 11, -8, 2 },
+  { 0, 1, -12, 40, 93, 12, -8, 2 },  { 0, 2, -12, 38, 94, 13, -9, 2 },
+  { 0, 2, -12, 37, 94, 14, -9, 2 },  { 0, 2, -12, 35, 95, 15, -9, 2 },
+  { 0, 2, -12, 34, 95, 17, -10, 2 }, { 0, 2, -11, 32, 95, 18, -10, 2 },
+  { 0, 2, -12, 31, 96, 19, -10, 2 }, { 0, 2, -12, 29, 96, 21, -10, 2 },
+  { 0, 2, -11, 28, 96, 22, -11, 2 }, { 0, 2, -11, 26, 96, 24, -11, 2 },
+};
+
+// Filters for interpolation (0.875-band) - note this also filters integer pels.
+static const InterpKernel filteredinterp_filters875[(1 << RS_SUBPEL_BITS)] = {
+  { 3, -8, 13, 112, 13, -8, 3, 0 },   { 2, -7, 12, 112, 15, -8, 3, -1 },
+  { 3, -7, 10, 112, 17, -9, 3, -1 },  { 2, -6, 8, 112, 19, -9, 3, -1 },
+  { 2, -6, 7, 112, 21, -10, 3, -1 },  { 2, -5, 6, 111, 22, -10, 3, -1 },
+  { 2, -5, 4, 111, 24, -10, 3, -1 },  { 2, -4, 3, 110, 26, -11, 3, -1 },
+  { 2, -4, 1, 110, 28, -11, 3, -1 },  { 2, -4, 0, 109, 30, -12, 4, -1 },
+  { 1, -3, -1, 108, 32, -12, 4, -1 }, { 1, -3, -2, 108, 34, -13, 4, -1 },
+  { 1, -2, -4, 107, 36, -13, 4, -1 }, { 1, -2, -5, 106, 38, -13, 4, -1 },
+  { 1, -1, -6, 105, 40, -14, 4, -1 }, { 1, -1, -7, 104, 42, -14, 4, -1 },
+  { 1, -1, -7, 103, 44, -15, 4, -1 }, { 1, 0, -8, 101, 46, -15, 4, -1 },
+  { 1, 0, -9, 100, 48, -15, 4, -1 },  { 1, 0, -10, 99, 50, -15, 4, -1 },
+  { 1, 1, -11, 97, 53, -16, 4, -1 },  { 0, 1, -11, 96, 55, -16, 4, -1 },
+  { 0, 1, -12, 95, 57, -16, 4, -1 },  { 0, 2, -13, 93, 59, -16, 4, -1 },
+  { 0, 2, -13, 91, 61, -16, 4, -1 },  { 0, 2, -14, 90, 63, -16, 4, -1 },
+  { 0, 2, -14, 88, 65, -16, 4, -1 },  { 0, 2, -15, 86, 67, -16, 4, 0 },
+  { 0, 3, -15, 84, 69, -17, 4, 0 },   { 0, 3, -16, 83, 71, -17, 4, 0 },
+  { 0, 3, -16, 81, 73, -16, 3, 0 },   { 0, 3, -16, 79, 75, -16, 3, 0 },
+  { 0, 3, -16, 77, 77, -16, 3, 0 },   { 0, 3, -16, 75, 79, -16, 3, 0 },
+  { 0, 3, -16, 73, 81, -16, 3, 0 },   { 0, 4, -17, 71, 83, -16, 3, 0 },
+  { 0, 4, -17, 69, 84, -15, 3, 0 },   { 0, 4, -16, 67, 86, -15, 2, 0 },
+  { -1, 4, -16, 65, 88, -14, 2, 0 },  { -1, 4, -16, 63, 90, -14, 2, 0 },
+  { -1, 4, -16, 61, 91, -13, 2, 0 },  { -1, 4, -16, 59, 93, -13, 2, 0 },
+  { -1, 4, -16, 57, 95, -12, 1, 0 },  { -1, 4, -16, 55, 96, -11, 1, 0 },
+  { -1, 4, -16, 53, 97, -11, 1, 1 },  { -1, 4, -15, 50, 99, -10, 0, 1 },
+  { -1, 4, -15, 48, 100, -9, 0, 1 },  { -1, 4, -15, 46, 101, -8, 0, 1 },
+  { -1, 4, -15, 44, 103, -7, -1, 1 }, { -1, 4, -14, 42, 104, -7, -1, 1 },
+  { -1, 4, -14, 40, 105, -6, -1, 1 }, { -1, 4, -13, 38, 106, -5, -2, 1 },
+  { -1, 4, -13, 36, 107, -4, -2, 1 }, { -1, 4, -13, 34, 108, -2, -3, 1 },
+  { -1, 4, -12, 32, 108, -1, -3, 1 }, { -1, 4, -12, 30, 109, 0, -4, 2 },
+  { -1, 3, -11, 28, 110, 1, -4, 2 },  { -1, 3, -11, 26, 110, 3, -4, 2 },
+  { -1, 3, -10, 24, 111, 4, -5, 2 },  { -1, 3, -10, 22, 111, 6, -5, 2 },
+  { -1, 3, -10, 21, 112, 7, -6, 2 },  { -1, 3, -9, 19, 112, 8, -6, 2 },
+  { -1, 3, -9, 17, 112, 10, -7, 3 },  { -1, 3, -8, 15, 112, 12, -7, 2 },
+};
+
+const int16_t av1_resize_filter_normative[(
+    1 << RS_SUBPEL_BITS)][UPSCALE_NORMATIVE_TAPS] = {
+#if UPSCALE_NORMATIVE_TAPS == 8
+  { 0, 0, 0, 128, 0, 0, 0, 0 },        { 0, 0, -1, 128, 2, -1, 0, 0 },
+  { 0, 1, -3, 127, 4, -2, 1, 0 },      { 0, 1, -4, 127, 6, -3, 1, 0 },
+  { 0, 2, -6, 126, 8, -3, 1, 0 },      { 0, 2, -7, 125, 11, -4, 1, 0 },
+  { -1, 2, -8, 125, 13, -5, 2, 0 },    { -1, 3, -9, 124, 15, -6, 2, 0 },
+  { -1, 3, -10, 123, 18, -6, 2, -1 },  { -1, 3, -11, 122, 20, -7, 3, -1 },
+  { -1, 4, -12, 121, 22, -8, 3, -1 },  { -1, 4, -13, 120, 25, -9, 3, -1 },
+  { -1, 4, -14, 118, 28, -9, 3, -1 },  { -1, 4, -15, 117, 30, -10, 4, -1 },
+  { -1, 5, -16, 116, 32, -11, 4, -1 }, { -1, 5, -16, 114, 35, -12, 4, -1 },
+  { -1, 5, -17, 112, 38, -12, 4, -1 }, { -1, 5, -18, 111, 40, -13, 5, -1 },
+  { -1, 5, -18, 109, 43, -14, 5, -1 }, { -1, 6, -19, 107, 45, -14, 5, -1 },
+  { -1, 6, -19, 105, 48, -15, 5, -1 }, { -1, 6, -19, 103, 51, -16, 5, -1 },
+  { -1, 6, -20, 101, 53, -16, 6, -1 }, { -1, 6, -20, 99, 56, -17, 6, -1 },
+  { -1, 6, -20, 97, 58, -17, 6, -1 },  { -1, 6, -20, 95, 61, -18, 6, -1 },
+  { -2, 7, -20, 93, 64, -18, 6, -2 },  { -2, 7, -20, 91, 66, -19, 6, -1 },
+  { -2, 7, -20, 88, 69, -19, 6, -1 },  { -2, 7, -20, 86, 71, -19, 6, -1 },
+  { -2, 7, -20, 84, 74, -20, 7, -2 },  { -2, 7, -20, 81, 76, -20, 7, -1 },
+  { -2, 7, -20, 79, 79, -20, 7, -2 },  { -1, 7, -20, 76, 81, -20, 7, -2 },
+  { -2, 7, -20, 74, 84, -20, 7, -2 },  { -1, 6, -19, 71, 86, -20, 7, -2 },
+  { -1, 6, -19, 69, 88, -20, 7, -2 },  { -1, 6, -19, 66, 91, -20, 7, -2 },
+  { -2, 6, -18, 64, 93, -20, 7, -2 },  { -1, 6, -18, 61, 95, -20, 6, -1 },
+  { -1, 6, -17, 58, 97, -20, 6, -1 },  { -1, 6, -17, 56, 99, -20, 6, -1 },
+  { -1, 6, -16, 53, 101, -20, 6, -1 }, { -1, 5, -16, 51, 103, -19, 6, -1 },
+  { -1, 5, -15, 48, 105, -19, 6, -1 }, { -1, 5, -14, 45, 107, -19, 6, -1 },
+  { -1, 5, -14, 43, 109, -18, 5, -1 }, { -1, 5, -13, 40, 111, -18, 5, -1 },
+  { -1, 4, -12, 38, 112, -17, 5, -1 }, { -1, 4, -12, 35, 114, -16, 5, -1 },
+  { -1, 4, -11, 32, 116, -16, 5, -1 }, { -1, 4, -10, 30, 117, -15, 4, -1 },
+  { -1, 3, -9, 28, 118, -14, 4, -1 },  { -1, 3, -9, 25, 120, -13, 4, -1 },
+  { -1, 3, -8, 22, 121, -12, 4, -1 },  { -1, 3, -7, 20, 122, -11, 3, -1 },
+  { -1, 2, -6, 18, 123, -10, 3, -1 },  { 0, 2, -6, 15, 124, -9, 3, -1 },
+  { 0, 2, -5, 13, 125, -8, 2, -1 },    { 0, 1, -4, 11, 125, -7, 2, 0 },
+  { 0, 1, -3, 8, 126, -6, 2, 0 },      { 0, 1, -3, 6, 127, -4, 1, 0 },
+  { 0, 1, -2, 4, 127, -3, 1, 0 },      { 0, 0, -1, 2, 128, -1, 0, 0 },
+#else
+#error "Invalid value of UPSCALE_NORMATIVE_TAPS"
+#endif  // UPSCALE_NORMATIVE_TAPS == 8
+};
+
+// Filters for interpolation (full-band) - no filtering for integer pixels
+#define filteredinterp_filters1000 av1_resize_filter_normative
+
+// Filters for factor of 2 downsampling.
+static const int16_t av1_down2_symeven_half_filter[] = { 56, 12, -3, -1 };
+static const int16_t av1_down2_symodd_half_filter[] = { 64, 35, 0, -3 };
+
+static const InterpKernel *choose_interp_filter(int in_length, int out_length) {
+  int out_length16 = out_length * 16;
+  if (out_length16 >= in_length * 16)
+    return filteredinterp_filters1000;
+  else if (out_length16 >= in_length * 13)
+    return filteredinterp_filters875;
+  else if (out_length16 >= in_length * 11)
+    return filteredinterp_filters750;
+  else if (out_length16 >= in_length * 9)
+    return filteredinterp_filters625;
+  else
+    return filteredinterp_filters500;
+}
+
+static void interpolate_core(const uint8_t *const input, int in_length,
+                             uint8_t *output, int out_length,
+                             const int16_t *interp_filters, int interp_taps) {
+  const int32_t delta =
+      (((uint32_t)in_length << RS_SCALE_SUBPEL_BITS) + out_length / 2) /
+      out_length;
+  const int32_t offset =
+      in_length > out_length
+          ? (((int32_t)(in_length - out_length) << (RS_SCALE_SUBPEL_BITS - 1)) +
+             out_length / 2) /
+                out_length
+          : -(((int32_t)(out_length - in_length)
+               << (RS_SCALE_SUBPEL_BITS - 1)) +
+              out_length / 2) /
+                out_length;
+  uint8_t *optr = output;
+  int x, x1, x2, sum, k, int_pel, sub_pel;
+  int32_t y;
+
+  x = 0;
+  y = offset + RS_SCALE_EXTRA_OFF;
+  while ((y >> RS_SCALE_SUBPEL_BITS) < (interp_taps / 2 - 1)) {
+    x++;
+    y += delta;
+  }
+  x1 = x;
+  x = out_length - 1;
+  y = delta * x + offset + RS_SCALE_EXTRA_OFF;
+  while ((y >> RS_SCALE_SUBPEL_BITS) + (int32_t)(interp_taps / 2) >=
+         in_length) {
+    x--;
+    y -= delta;
+  }
+  x2 = x;
+  if (x1 > x2) {
+    for (x = 0, y = offset + RS_SCALE_EXTRA_OFF; x < out_length;
+         ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k) {
+        const int pk = int_pel - interp_taps / 2 + 1 + k;
+        sum += filter[k] * input[AOMMAX(AOMMIN(pk, in_length - 1), 0)];
+      }
+      *optr++ = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
+    }
+  } else {
+    // Initial part.
+    for (x = 0, y = offset + RS_SCALE_EXTRA_OFF; x < x1; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] * input[AOMMAX(int_pel - interp_taps / 2 + 1 + k, 0)];
+      *optr++ = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
+    }
+    // Middle part.
+    for (; x <= x2; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] * input[int_pel - interp_taps / 2 + 1 + k];
+      *optr++ = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
+    }
+    // End part.
+    for (; x < out_length; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] *
+               input[AOMMIN(int_pel - interp_taps / 2 + 1 + k, in_length - 1)];
+      *optr++ = clip_pixel(ROUND_POWER_OF_TWO(sum, FILTER_BITS));
+    }
+  }
+}
+
+static void interpolate_core_double_prec(const double *const input,
+                                         int in_length, double *output,
+                                         int out_length,
+                                         const int16_t *interp_filters,
+                                         int interp_taps) {
+  const int32_t delta =
+      (((uint32_t)in_length << RS_SCALE_SUBPEL_BITS) + out_length / 2) /
+      out_length;
+  const int32_t offset =
+      in_length > out_length
+          ? (((int32_t)(in_length - out_length) << (RS_SCALE_SUBPEL_BITS - 1)) +
+             out_length / 2) /
+                out_length
+          : -(((int32_t)(out_length - in_length)
+               << (RS_SCALE_SUBPEL_BITS - 1)) +
+              out_length / 2) /
+                out_length;
+  double *optr = output;
+  int x, x1, x2, k, int_pel, sub_pel;
+  double sum;
+  int32_t y;
+
+  x = 0;
+  y = offset + RS_SCALE_EXTRA_OFF;
+  while ((y >> RS_SCALE_SUBPEL_BITS) < (interp_taps / 2 - 1)) {
+    x++;
+    y += delta;
+  }
+  x1 = x;
+  x = out_length - 1;
+  y = delta * x + offset + RS_SCALE_EXTRA_OFF;
+  while ((y >> RS_SCALE_SUBPEL_BITS) + (int32_t)(interp_taps / 2) >=
+         in_length) {
+    x--;
+    y -= delta;
+  }
+  x2 = x;
+  if (x1 > x2) {
+    for (x = 0, y = offset + RS_SCALE_EXTRA_OFF; x < out_length;
+         ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k) {
+        const int pk = int_pel - interp_taps / 2 + 1 + k;
+        sum += filter[k] * input[AOMMAX(AOMMIN(pk, in_length - 1), 0)];
+      }
+      *optr++ = sum / (1 << FILTER_BITS);
+    }
+  } else {
+    // Initial part.
+    for (x = 0, y = offset + RS_SCALE_EXTRA_OFF; x < x1; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] * input[AOMMAX(int_pel - interp_taps / 2 + 1 + k, 0)];
+      *optr++ = sum / (1 << FILTER_BITS);
+    }
+    // Middle part.
+    for (; x <= x2; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] * input[int_pel - interp_taps / 2 + 1 + k];
+      *optr++ = sum / (1 << FILTER_BITS);
+    }
+    // End part.
+    for (; x < out_length; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] *
+               input[AOMMIN(int_pel - interp_taps / 2 + 1 + k, in_length - 1)];
+      *optr++ = sum / (1 << FILTER_BITS);
+    }
+  }
+}
+
+static void interpolate(const uint8_t *const input, int in_length,
+                        uint8_t *output, int out_length) {
+  const InterpKernel *interp_filters =
+      choose_interp_filter(in_length, out_length);
+
+  interpolate_core(input, in_length, output, out_length, &interp_filters[0][0],
+                   SUBPEL_TAPS);
+}
+
+static void interpolate_double_prec(const double *const input, int in_length,
+                                    double *output, int out_length) {
+  const InterpKernel *interp_filters =
+      choose_interp_filter(in_length, out_length);
+
+  interpolate_core_double_prec(input, in_length, output, out_length,
+                               &interp_filters[0][0], SUBPEL_TAPS);
+}
+
+int32_t av1_get_upscale_convolve_step(int in_length, int out_length) {
+  return ((in_length << RS_SCALE_SUBPEL_BITS) + out_length / 2) / out_length;
+}
+
+static int32_t get_upscale_convolve_x0(int in_length, int out_length,
+                                       int32_t x_step_qn) {
+  const int err = out_length * x_step_qn - (in_length << RS_SCALE_SUBPEL_BITS);
+  const int32_t x0 =
+      (-((out_length - in_length) << (RS_SCALE_SUBPEL_BITS - 1)) +
+       out_length / 2) /
+          out_length +
+      RS_SCALE_EXTRA_OFF - err / 2;
+  return (int32_t)((uint32_t)x0 & RS_SCALE_SUBPEL_MASK);
+}
+
+static void down2_symeven(const uint8_t *const input, int length,
+                          uint8_t *output) {
+  // Actual filter len = 2 * filter_len_half.
+  const int16_t *filter = av1_down2_symeven_half_filter;
+  const int filter_len_half = sizeof(av1_down2_symeven_half_filter) / 2;
+  int i, j;
+  uint8_t *optr = output;
+  int l1 = filter_len_half;
+  int l2 = (length - filter_len_half);
+  l1 += (l1 & 1);
+  l2 += (l2 & 1);
+  if (l1 > l2) {
+    // Short input length.
+    for (i = 0; i < length; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1));
+      for (j = 0; j < filter_len_half; ++j) {
+        sum +=
+            (input[AOMMAX(i - j, 0)] + input[AOMMIN(i + 1 + j, length - 1)]) *
+            filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel(sum);
+    }
+  } else {
+    // Initial part.
+    for (i = 0; i < l1; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1));
+      for (j = 0; j < filter_len_half; ++j) {
+        sum += (input[AOMMAX(i - j, 0)] + input[i + 1 + j]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel(sum);
+    }
+    // Middle part.
+    for (; i < l2; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1));
+      for (j = 0; j < filter_len_half; ++j) {
+        sum += (input[i - j] + input[i + 1 + j]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel(sum);
+    }
+    // End part.
+    for (; i < length; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1));
+      for (j = 0; j < filter_len_half; ++j) {
+        sum +=
+            (input[i - j] + input[AOMMIN(i + 1 + j, length - 1)]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel(sum);
+    }
+  }
+}
+
+static void down2_symodd(const uint8_t *const input, int length,
+                         uint8_t *output) {
+  // Actual filter len = 2 * filter_len_half - 1.
+  const int16_t *filter = av1_down2_symodd_half_filter;
+  const int filter_len_half = sizeof(av1_down2_symodd_half_filter) / 2;
+  int i, j;
+  uint8_t *optr = output;
+  int l1 = filter_len_half - 1;
+  int l2 = (length - filter_len_half + 1);
+  l1 += (l1 & 1);
+  l2 += (l2 & 1);
+  if (l1 > l2) {
+    // Short input length.
+    for (i = 0; i < length; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1)) + input[i] * filter[0];
+      for (j = 1; j < filter_len_half; ++j) {
+        sum += (input[(i - j < 0 ? 0 : i - j)] +
+                input[(i + j >= length ? length - 1 : i + j)]) *
+               filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel(sum);
+    }
+  } else {
+    // Initial part.
+    for (i = 0; i < l1; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1)) + input[i] * filter[0];
+      for (j = 1; j < filter_len_half; ++j) {
+        sum += (input[(i - j < 0 ? 0 : i - j)] + input[i + j]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel(sum);
+    }
+    // Middle part.
+    for (; i < l2; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1)) + input[i] * filter[0];
+      for (j = 1; j < filter_len_half; ++j) {
+        sum += (input[i - j] + input[i + j]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel(sum);
+    }
+    // End part.
+    for (; i < length; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1)) + input[i] * filter[0];
+      for (j = 1; j < filter_len_half; ++j) {
+        sum += (input[i - j] + input[(i + j >= length ? length - 1 : i + j)]) *
+               filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel(sum);
+    }
+  }
+}
+
+static int get_down2_length(int length, int steps) {
+  for (int s = 0; s < steps; ++s) length = (length + 1) >> 1;
+  return length;
+}
+
+static int get_down2_steps(int in_length, int out_length) {
+  int steps = 0;
+  int proj_in_length;
+  while ((proj_in_length = get_down2_length(in_length, 1)) >= out_length) {
+    ++steps;
+    in_length = proj_in_length;
+    if (in_length == 1) {
+      // Special case: we break because any further calls to get_down2_length()
+      // with be with length == 1, which return 1, resulting in an infinite
+      // loop.
+      break;
+    }
+  }
+  return steps;
+}
+
+static void resize_multistep(const uint8_t *const input, int length,
+                             uint8_t *output, int olength, uint8_t *otmp) {
+  if (length == olength) {
+    memcpy(output, input, sizeof(output[0]) * length);
+    return;
+  }
+  const int steps = get_down2_steps(length, olength);
+
+  if (steps > 0) {
+    uint8_t *out = NULL;
+    int filteredlength = length;
+
+    assert(otmp != NULL);
+    uint8_t *otmp2 = otmp + get_down2_length(length, 1);
+    for (int s = 0; s < steps; ++s) {
+      const int proj_filteredlength = get_down2_length(filteredlength, 1);
+      const uint8_t *const in = (s == 0 ? input : out);
+      if (s == steps - 1 && proj_filteredlength == olength)
+        out = output;
+      else
+        out = (s & 1 ? otmp2 : otmp);
+      if (filteredlength & 1)
+        down2_symodd(in, filteredlength, out);
+      else
+        down2_symeven(in, filteredlength, out);
+      filteredlength = proj_filteredlength;
+    }
+    if (filteredlength != olength) {
+      interpolate(out, filteredlength, output, olength);
+    }
+  } else {
+    interpolate(input, length, output, olength);
+  }
+}
+
+static void upscale_multistep_double_prec(const double *const input, int length,
+                                          double *output, int olength) {
+  assert(length < olength);
+  interpolate_double_prec(input, length, output, olength);
+}
+
+static void fill_col_to_arr(uint8_t *img, int stride, int len, uint8_t *arr) {
+  int i;
+  uint8_t *iptr = img;
+  uint8_t *aptr = arr;
+  for (i = 0; i < len; ++i, iptr += stride) {
+    *aptr++ = *iptr;
+  }
+}
+
+static void fill_arr_to_col(uint8_t *img, int stride, int len, uint8_t *arr) {
+  int i;
+  uint8_t *iptr = img;
+  uint8_t *aptr = arr;
+  for (i = 0; i < len; ++i, iptr += stride) {
+    *iptr = *aptr++;
+  }
+}
+
+static void fill_col_to_arr_double_prec(double *img, int stride, int len,
+                                        double *arr) {
+  int i;
+  double *iptr = img;
+  double *aptr = arr;
+  for (i = 0; i < len; ++i, iptr += stride) {
+    *aptr++ = *iptr;
+  }
+}
+
+static void fill_arr_to_col_double_prec(double *img, int stride, int len,
+                                        double *arr) {
+  int i;
+  double *iptr = img;
+  double *aptr = arr;
+  for (i = 0; i < len; ++i, iptr += stride) {
+    *iptr = *aptr++;
+  }
+}
+
+void av1_resize_plane(const uint8_t *const input, int height, int width,
+                      int in_stride, uint8_t *output, int height2, int width2,
+                      int out_stride) {
+  int i;
+  uint8_t *intbuf = (uint8_t *)aom_malloc(sizeof(uint8_t) * width2 * height);
+  uint8_t *tmpbuf =
+      (uint8_t *)aom_malloc(sizeof(uint8_t) * AOMMAX(width, height));
+  uint8_t *arrbuf = (uint8_t *)aom_malloc(sizeof(uint8_t) * height);
+  uint8_t *arrbuf2 = (uint8_t *)aom_malloc(sizeof(uint8_t) * height2);
+  if (intbuf == NULL || tmpbuf == NULL || arrbuf == NULL || arrbuf2 == NULL)
+    goto Error;
+  assert(width > 0);
+  assert(height > 0);
+  assert(width2 > 0);
+  assert(height2 > 0);
+  for (i = 0; i < height; ++i)
+    resize_multistep(input + in_stride * i, width, intbuf + width2 * i, width2,
+                     tmpbuf);
+  for (i = 0; i < width2; ++i) {
+    fill_col_to_arr(intbuf + i, width2, height, arrbuf);
+    resize_multistep(arrbuf, height, arrbuf2, height2, tmpbuf);
+    fill_arr_to_col(output + i, out_stride, height2, arrbuf2);
+  }
+
+Error:
+  aom_free(intbuf);
+  aom_free(tmpbuf);
+  aom_free(arrbuf);
+  aom_free(arrbuf2);
+}
+
+void av1_upscale_plane_double_prec(const double *const input, int height,
+                                   int width, int in_stride, double *output,
+                                   int height2, int width2, int out_stride) {
+  int i;
+  double *intbuf = (double *)aom_malloc(sizeof(double) * width2 * height);
+  double *arrbuf = (double *)aom_malloc(sizeof(double) * height);
+  double *arrbuf2 = (double *)aom_malloc(sizeof(double) * height2);
+  if (intbuf == NULL || arrbuf == NULL || arrbuf2 == NULL) goto Error;
+  assert(width > 0);
+  assert(height > 0);
+  assert(width2 > 0);
+  assert(height2 > 0);
+  for (i = 0; i < height; ++i)
+    upscale_multistep_double_prec(input + in_stride * i, width,
+                                  intbuf + width2 * i, width2);
+  for (i = 0; i < width2; ++i) {
+    fill_col_to_arr_double_prec(intbuf + i, width2, height, arrbuf);
+    upscale_multistep_double_prec(arrbuf, height, arrbuf2, height2);
+    fill_arr_to_col_double_prec(output + i, out_stride, height2, arrbuf2);
+  }
+
+Error:
+  aom_free(intbuf);
+  aom_free(arrbuf);
+  aom_free(arrbuf2);
+}
+
+static void upscale_normative_rect(const uint8_t *const input, int height,
+                                   int width, int in_stride, uint8_t *output,
+                                   int height2, int width2, int out_stride,
+                                   int x_step_qn, int x0_qn, int pad_left,
+                                   int pad_right) {
+  assert(width > 0);
+  assert(height > 0);
+  assert(width2 > 0);
+  assert(height2 > 0);
+  assert(height2 == height);
+
+  // Extend the left/right pixels of the tile column if needed
+  // (either because we can't sample from other tiles, or because we're at
+  // a frame edge).
+  // Save the overwritten pixels into tmp_left and tmp_right.
+  // Note: Because we pass input-1 to av1_convolve_horiz_rs, we need one extra
+  // column of border pixels compared to what we'd naively think.
+  const int border_cols = UPSCALE_NORMATIVE_TAPS / 2 + 1;
+  uint8_t *tmp_left =
+      NULL;  // Silence spurious "may be used uninitialized" warnings
+  uint8_t *tmp_right = NULL;
+  uint8_t *const in_tl = (uint8_t *)(input - border_cols);  // Cast off 'const'
+  uint8_t *const in_tr = (uint8_t *)(input + width);
+  if (pad_left) {
+    tmp_left = (uint8_t *)aom_malloc(sizeof(*tmp_left) * border_cols * height);
+    for (int i = 0; i < height; i++) {
+      memcpy(tmp_left + i * border_cols, in_tl + i * in_stride, border_cols);
+      memset(in_tl + i * in_stride, input[i * in_stride], border_cols);
+    }
+  }
+  if (pad_right) {
+    tmp_right =
+        (uint8_t *)aom_malloc(sizeof(*tmp_right) * border_cols * height);
+    for (int i = 0; i < height; i++) {
+      memcpy(tmp_right + i * border_cols, in_tr + i * in_stride, border_cols);
+      memset(in_tr + i * in_stride, input[i * in_stride + width - 1],
+             border_cols);
+    }
+  }
+
+  av1_convolve_horiz_rs(input - 1, in_stride, output, out_stride, width2,
+                        height2, &av1_resize_filter_normative[0][0], x0_qn,
+                        x_step_qn);
+
+  // Restore the left/right border pixels
+  if (pad_left) {
+    for (int i = 0; i < height; i++) {
+      memcpy(in_tl + i * in_stride, tmp_left + i * border_cols, border_cols);
+    }
+    aom_free(tmp_left);
+  }
+  if (pad_right) {
+    for (int i = 0; i < height; i++) {
+      memcpy(in_tr + i * in_stride, tmp_right + i * border_cols, border_cols);
+    }
+    aom_free(tmp_right);
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void highbd_interpolate_core(const uint16_t *const input, int in_length,
+                                    uint16_t *output, int out_length, int bd,
+                                    const int16_t *interp_filters,
+                                    int interp_taps) {
+  const int32_t delta =
+      (((uint32_t)in_length << RS_SCALE_SUBPEL_BITS) + out_length / 2) /
+      out_length;
+  const int32_t offset =
+      in_length > out_length
+          ? (((int32_t)(in_length - out_length) << (RS_SCALE_SUBPEL_BITS - 1)) +
+             out_length / 2) /
+                out_length
+          : -(((int32_t)(out_length - in_length)
+               << (RS_SCALE_SUBPEL_BITS - 1)) +
+              out_length / 2) /
+                out_length;
+  uint16_t *optr = output;
+  int x, x1, x2, sum, k, int_pel, sub_pel;
+  int32_t y;
+
+  x = 0;
+  y = offset + RS_SCALE_EXTRA_OFF;
+  while ((y >> RS_SCALE_SUBPEL_BITS) < (interp_taps / 2 - 1)) {
+    x++;
+    y += delta;
+  }
+  x1 = x;
+  x = out_length - 1;
+  y = delta * x + offset + RS_SCALE_EXTRA_OFF;
+  while ((y >> RS_SCALE_SUBPEL_BITS) + (int32_t)(interp_taps / 2) >=
+         in_length) {
+    x--;
+    y -= delta;
+  }
+  x2 = x;
+  if (x1 > x2) {
+    for (x = 0, y = offset + RS_SCALE_EXTRA_OFF; x < out_length;
+         ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k) {
+        const int pk = int_pel - interp_taps / 2 + 1 + k;
+        sum += filter[k] * input[AOMMAX(AOMMIN(pk, in_length - 1), 0)];
+      }
+      *optr++ = clip_pixel_highbd(ROUND_POWER_OF_TWO(sum, FILTER_BITS), bd);
+    }
+  } else {
+    // Initial part.
+    for (x = 0, y = offset + RS_SCALE_EXTRA_OFF; x < x1; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] * input[AOMMAX(int_pel - interp_taps / 2 + 1 + k, 0)];
+      *optr++ = clip_pixel_highbd(ROUND_POWER_OF_TWO(sum, FILTER_BITS), bd);
+    }
+    // Middle part.
+    for (; x <= x2; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] * input[int_pel - interp_taps / 2 + 1 + k];
+      *optr++ = clip_pixel_highbd(ROUND_POWER_OF_TWO(sum, FILTER_BITS), bd);
+    }
+    // End part.
+    for (; x < out_length; ++x, y += delta) {
+      int_pel = y >> RS_SCALE_SUBPEL_BITS;
+      sub_pel = (y >> RS_SCALE_EXTRA_BITS) & RS_SUBPEL_MASK;
+      const int16_t *filter = &interp_filters[sub_pel * interp_taps];
+      sum = 0;
+      for (k = 0; k < interp_taps; ++k)
+        sum += filter[k] *
+               input[AOMMIN(int_pel - interp_taps / 2 + 1 + k, in_length - 1)];
+      *optr++ = clip_pixel_highbd(ROUND_POWER_OF_TWO(sum, FILTER_BITS), bd);
+    }
+  }
+}
+
+static void highbd_interpolate(const uint16_t *const input, int in_length,
+                               uint16_t *output, int out_length, int bd) {
+  const InterpKernel *interp_filters =
+      choose_interp_filter(in_length, out_length);
+
+  highbd_interpolate_core(input, in_length, output, out_length, bd,
+                          &interp_filters[0][0], SUBPEL_TAPS);
+}
+
+static void highbd_down2_symeven(const uint16_t *const input, int length,
+                                 uint16_t *output, int bd) {
+  // Actual filter len = 2 * filter_len_half.
+  static const int16_t *filter = av1_down2_symeven_half_filter;
+  const int filter_len_half = sizeof(av1_down2_symeven_half_filter) / 2;
+  int i, j;
+  uint16_t *optr = output;
+  int l1 = filter_len_half;
+  int l2 = (length - filter_len_half);
+  l1 += (l1 & 1);
+  l2 += (l2 & 1);
+  if (l1 > l2) {
+    // Short input length.
+    for (i = 0; i < length; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1));
+      for (j = 0; j < filter_len_half; ++j) {
+        sum +=
+            (input[AOMMAX(0, i - j)] + input[AOMMIN(i + 1 + j, length - 1)]) *
+            filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel_highbd(sum, bd);
+    }
+  } else {
+    // Initial part.
+    for (i = 0; i < l1; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1));
+      for (j = 0; j < filter_len_half; ++j) {
+        sum += (input[AOMMAX(0, i - j)] + input[i + 1 + j]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel_highbd(sum, bd);
+    }
+    // Middle part.
+    for (; i < l2; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1));
+      for (j = 0; j < filter_len_half; ++j) {
+        sum += (input[i - j] + input[i + 1 + j]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel_highbd(sum, bd);
+    }
+    // End part.
+    for (; i < length; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1));
+      for (j = 0; j < filter_len_half; ++j) {
+        sum +=
+            (input[i - j] + input[AOMMIN(i + 1 + j, length - 1)]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel_highbd(sum, bd);
+    }
+  }
+}
+
+static void highbd_down2_symodd(const uint16_t *const input, int length,
+                                uint16_t *output, int bd) {
+  // Actual filter len = 2 * filter_len_half - 1.
+  static const int16_t *filter = av1_down2_symodd_half_filter;
+  const int filter_len_half = sizeof(av1_down2_symodd_half_filter) / 2;
+  int i, j;
+  uint16_t *optr = output;
+  int l1 = filter_len_half - 1;
+  int l2 = (length - filter_len_half + 1);
+  l1 += (l1 & 1);
+  l2 += (l2 & 1);
+  if (l1 > l2) {
+    // Short input length.
+    for (i = 0; i < length; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1)) + input[i] * filter[0];
+      for (j = 1; j < filter_len_half; ++j) {
+        sum += (input[AOMMAX(i - j, 0)] + input[AOMMIN(i + j, length - 1)]) *
+               filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel_highbd(sum, bd);
+    }
+  } else {
+    // Initial part.
+    for (i = 0; i < l1; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1)) + input[i] * filter[0];
+      for (j = 1; j < filter_len_half; ++j) {
+        sum += (input[AOMMAX(i - j, 0)] + input[i + j]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel_highbd(sum, bd);
+    }
+    // Middle part.
+    for (; i < l2; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1)) + input[i] * filter[0];
+      for (j = 1; j < filter_len_half; ++j) {
+        sum += (input[i - j] + input[i + j]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel_highbd(sum, bd);
+    }
+    // End part.
+    for (; i < length; i += 2) {
+      int sum = (1 << (FILTER_BITS - 1)) + input[i] * filter[0];
+      for (j = 1; j < filter_len_half; ++j) {
+        sum += (input[i - j] + input[AOMMIN(i + j, length - 1)]) * filter[j];
+      }
+      sum >>= FILTER_BITS;
+      *optr++ = clip_pixel_highbd(sum, bd);
+    }
+  }
+}
+
+static void highbd_resize_multistep(const uint16_t *const input, int length,
+                                    uint16_t *output, int olength,
+                                    uint16_t *otmp, int bd) {
+  if (length == olength) {
+    memcpy(output, input, sizeof(output[0]) * length);
+    return;
+  }
+  const int steps = get_down2_steps(length, olength);
+
+  if (steps > 0) {
+    uint16_t *out = NULL;
+    int filteredlength = length;
+
+    assert(otmp != NULL);
+    uint16_t *otmp2 = otmp + get_down2_length(length, 1);
+    for (int s = 0; s < steps; ++s) {
+      const int proj_filteredlength = get_down2_length(filteredlength, 1);
+      const uint16_t *const in = (s == 0 ? input : out);
+      if (s == steps - 1 && proj_filteredlength == olength)
+        out = output;
+      else
+        out = (s & 1 ? otmp2 : otmp);
+      if (filteredlength & 1)
+        highbd_down2_symodd(in, filteredlength, out, bd);
+      else
+        highbd_down2_symeven(in, filteredlength, out, bd);
+      filteredlength = proj_filteredlength;
+    }
+    if (filteredlength != olength) {
+      highbd_interpolate(out, filteredlength, output, olength, bd);
+    }
+  } else {
+    highbd_interpolate(input, length, output, olength, bd);
+  }
+}
+
+static void highbd_fill_col_to_arr(uint16_t *img, int stride, int len,
+                                   uint16_t *arr) {
+  int i;
+  uint16_t *iptr = img;
+  uint16_t *aptr = arr;
+  for (i = 0; i < len; ++i, iptr += stride) {
+    *aptr++ = *iptr;
+  }
+}
+
+static void highbd_fill_arr_to_col(uint16_t *img, int stride, int len,
+                                   uint16_t *arr) {
+  int i;
+  uint16_t *iptr = img;
+  uint16_t *aptr = arr;
+  for (i = 0; i < len; ++i, iptr += stride) {
+    *iptr = *aptr++;
+  }
+}
+
+void av1_highbd_resize_plane(const uint8_t *const input, int height, int width,
+                             int in_stride, uint8_t *output, int height2,
+                             int width2, int out_stride, int bd) {
+  int i;
+  uint16_t *intbuf = (uint16_t *)aom_malloc(sizeof(uint16_t) * width2 * height);
+  uint16_t *tmpbuf =
+      (uint16_t *)aom_malloc(sizeof(uint16_t) * AOMMAX(width, height));
+  uint16_t *arrbuf = (uint16_t *)aom_malloc(sizeof(uint16_t) * height);
+  uint16_t *arrbuf2 = (uint16_t *)aom_malloc(sizeof(uint16_t) * height2);
+  if (intbuf == NULL || tmpbuf == NULL || arrbuf == NULL || arrbuf2 == NULL)
+    goto Error;
+  for (i = 0; i < height; ++i) {
+    highbd_resize_multistep(CONVERT_TO_SHORTPTR(input + in_stride * i), width,
+                            intbuf + width2 * i, width2, tmpbuf, bd);
+  }
+  for (i = 0; i < width2; ++i) {
+    highbd_fill_col_to_arr(intbuf + i, width2, height, arrbuf);
+    highbd_resize_multistep(arrbuf, height, arrbuf2, height2, tmpbuf, bd);
+    highbd_fill_arr_to_col(CONVERT_TO_SHORTPTR(output + i), out_stride, height2,
+                           arrbuf2);
+  }
+
+Error:
+  aom_free(intbuf);
+  aom_free(tmpbuf);
+  aom_free(arrbuf);
+  aom_free(arrbuf2);
+}
+
+static void highbd_upscale_normative_rect(const uint8_t *const input,
+                                          int height, int width, int in_stride,
+                                          uint8_t *output, int height2,
+                                          int width2, int out_stride,
+                                          int x_step_qn, int x0_qn,
+                                          int pad_left, int pad_right, int bd) {
+  assert(width > 0);
+  assert(height > 0);
+  assert(width2 > 0);
+  assert(height2 > 0);
+  assert(height2 == height);
+
+  // Extend the left/right pixels of the tile column if needed
+  // (either because we can't sample from other tiles, or because we're at
+  // a frame edge).
+  // Save the overwritten pixels into tmp_left and tmp_right.
+  // Note: Because we pass input-1 to av1_convolve_horiz_rs, we need one extra
+  // column of border pixels compared to what we'd naively think.
+  const int border_cols = UPSCALE_NORMATIVE_TAPS / 2 + 1;
+  const int border_size = border_cols * sizeof(uint16_t);
+  uint16_t *tmp_left =
+      NULL;  // Silence spurious "may be used uninitialized" warnings
+  uint16_t *tmp_right = NULL;
+  uint16_t *const input16 = CONVERT_TO_SHORTPTR(input);
+  uint16_t *const in_tl = input16 - border_cols;
+  uint16_t *const in_tr = input16 + width;
+  if (pad_left) {
+    tmp_left = (uint16_t *)aom_malloc(sizeof(*tmp_left) * border_cols * height);
+    for (int i = 0; i < height; i++) {
+      memcpy(tmp_left + i * border_cols, in_tl + i * in_stride, border_size);
+      aom_memset16(in_tl + i * in_stride, input16[i * in_stride], border_cols);
+    }
+  }
+  if (pad_right) {
+    tmp_right =
+        (uint16_t *)aom_malloc(sizeof(*tmp_right) * border_cols * height);
+    for (int i = 0; i < height; i++) {
+      memcpy(tmp_right + i * border_cols, in_tr + i * in_stride, border_size);
+      aom_memset16(in_tr + i * in_stride, input16[i * in_stride + width - 1],
+                   border_cols);
+    }
+  }
+
+  av1_highbd_convolve_horiz_rs(CONVERT_TO_SHORTPTR(input - 1), in_stride,
+                               CONVERT_TO_SHORTPTR(output), out_stride, width2,
+                               height2, &av1_resize_filter_normative[0][0],
+                               x0_qn, x_step_qn, bd);
+
+  // Restore the left/right border pixels
+  if (pad_left) {
+    for (int i = 0; i < height; i++) {
+      memcpy(in_tl + i * in_stride, tmp_left + i * border_cols, border_size);
+    }
+    aom_free(tmp_left);
+  }
+  if (pad_right) {
+    for (int i = 0; i < height; i++) {
+      memcpy(in_tr + i * in_stride, tmp_right + i * border_cols, border_size);
+    }
+    aom_free(tmp_right);
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+void av1_resize_frame420(const uint8_t *const y, int y_stride,
+                         const uint8_t *const u, const uint8_t *const v,
+                         int uv_stride, int height, int width, uint8_t *oy,
+                         int oy_stride, uint8_t *ou, uint8_t *ov,
+                         int ouv_stride, int oheight, int owidth) {
+  av1_resize_plane(y, height, width, y_stride, oy, oheight, owidth, oy_stride);
+  av1_resize_plane(u, height / 2, width / 2, uv_stride, ou, oheight / 2,
+                   owidth / 2, ouv_stride);
+  av1_resize_plane(v, height / 2, width / 2, uv_stride, ov, oheight / 2,
+                   owidth / 2, ouv_stride);
+}
+
+void av1_resize_frame422(const uint8_t *const y, int y_stride,
+                         const uint8_t *const u, const uint8_t *const v,
+                         int uv_stride, int height, int width, uint8_t *oy,
+                         int oy_stride, uint8_t *ou, uint8_t *ov,
+                         int ouv_stride, int oheight, int owidth) {
+  av1_resize_plane(y, height, width, y_stride, oy, oheight, owidth, oy_stride);
+  av1_resize_plane(u, height, width / 2, uv_stride, ou, oheight, owidth / 2,
+                   ouv_stride);
+  av1_resize_plane(v, height, width / 2, uv_stride, ov, oheight, owidth / 2,
+                   ouv_stride);
+}
+
+void av1_resize_frame444(const uint8_t *const y, int y_stride,
+                         const uint8_t *const u, const uint8_t *const v,
+                         int uv_stride, int height, int width, uint8_t *oy,
+                         int oy_stride, uint8_t *ou, uint8_t *ov,
+                         int ouv_stride, int oheight, int owidth) {
+  av1_resize_plane(y, height, width, y_stride, oy, oheight, owidth, oy_stride);
+  av1_resize_plane(u, height, width, uv_stride, ou, oheight, owidth,
+                   ouv_stride);
+  av1_resize_plane(v, height, width, uv_stride, ov, oheight, owidth,
+                   ouv_stride);
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+void av1_highbd_resize_frame420(const uint8_t *const y, int y_stride,
+                                const uint8_t *const u, const uint8_t *const v,
+                                int uv_stride, int height, int width,
+                                uint8_t *oy, int oy_stride, uint8_t *ou,
+                                uint8_t *ov, int ouv_stride, int oheight,
+                                int owidth, int bd) {
+  av1_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
+                          oy_stride, bd);
+  av1_highbd_resize_plane(u, height / 2, width / 2, uv_stride, ou, oheight / 2,
+                          owidth / 2, ouv_stride, bd);
+  av1_highbd_resize_plane(v, height / 2, width / 2, uv_stride, ov, oheight / 2,
+                          owidth / 2, ouv_stride, bd);
+}
+
+void av1_highbd_resize_frame422(const uint8_t *const y, int y_stride,
+                                const uint8_t *const u, const uint8_t *const v,
+                                int uv_stride, int height, int width,
+                                uint8_t *oy, int oy_stride, uint8_t *ou,
+                                uint8_t *ov, int ouv_stride, int oheight,
+                                int owidth, int bd) {
+  av1_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
+                          oy_stride, bd);
+  av1_highbd_resize_plane(u, height, width / 2, uv_stride, ou, oheight,
+                          owidth / 2, ouv_stride, bd);
+  av1_highbd_resize_plane(v, height, width / 2, uv_stride, ov, oheight,
+                          owidth / 2, ouv_stride, bd);
+}
+
+void av1_highbd_resize_frame444(const uint8_t *const y, int y_stride,
+                                const uint8_t *const u, const uint8_t *const v,
+                                int uv_stride, int height, int width,
+                                uint8_t *oy, int oy_stride, uint8_t *ou,
+                                uint8_t *ov, int ouv_stride, int oheight,
+                                int owidth, int bd) {
+  av1_highbd_resize_plane(y, height, width, y_stride, oy, oheight, owidth,
+                          oy_stride, bd);
+  av1_highbd_resize_plane(u, height, width, uv_stride, ou, oheight, owidth,
+                          ouv_stride, bd);
+  av1_highbd_resize_plane(v, height, width, uv_stride, ov, oheight, owidth,
+                          ouv_stride, bd);
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+void av1_resize_and_extend_frame_c(const YV12_BUFFER_CONFIG *src,
+                                   YV12_BUFFER_CONFIG *dst,
+                                   const InterpFilter filter,
+                                   const int phase_scaler,
+                                   const int num_planes) {
+  const int src_w = src->y_crop_width;
+  const int src_h = src->y_crop_height;
+  const uint8_t *const srcs[3] = { src->y_buffer, src->u_buffer,
+                                   src->v_buffer };
+  const int src_strides[3] = { src->y_stride, src->uv_stride, src->uv_stride };
+  uint8_t *const dsts[3] = { dst->y_buffer, dst->u_buffer, dst->v_buffer };
+  const int dst_strides[3] = { dst->y_stride, dst->uv_stride, dst->uv_stride };
+  assert(filter == BILINEAR || filter == EIGHTTAP_SMOOTH ||
+         filter == EIGHTTAP_REGULAR);
+  const InterpKernel *const kernel =
+      filter == BILINEAR ? av1_bilinear_filters : av1_sub_pel_filters_8smooth;
+  const int dst_w = dst->y_crop_width;
+  const int dst_h = dst->y_crop_height;
+  for (int i = 0; i < AOMMIN(num_planes, MAX_MB_PLANE); ++i) {
+    const int factor = (i == 0 || i == 3 ? 1 : 2);
+    const int src_stride = src_strides[i];
+    const int dst_stride = dst_strides[i];
+    for (int y = 0; y < dst_h; y += 16) {
+      const int y_q4 = y * (16 / factor) * src_h / dst_h + phase_scaler;
+      for (int x = 0; x < dst_w; x += 16) {
+        const int x_q4 = x * (16 / factor) * src_w / dst_w + phase_scaler;
+        const uint8_t *src_ptr = srcs[i] +
+                                 (y / factor) * src_h / dst_h * src_stride +
+                                 (x / factor) * src_w / dst_w;
+        uint8_t *dst_ptr = dsts[i] + (y / factor) * dst_stride + (x / factor);
+
+        aom_scaled_2d(src_ptr, src_stride, dst_ptr, dst_stride, kernel,
+                      x_q4 & 0xf, 16 * src_w / dst_w, y_q4 & 0xf,
+                      16 * src_h / dst_h, 16 / factor, 16 / factor);
+      }
+    }
+  }
+}
+
+void av1_resize_and_extend_frame_nonnormative(const YV12_BUFFER_CONFIG *src,
+                                              YV12_BUFFER_CONFIG *dst, int bd,
+                                              const int num_planes) {
+  // TODO(dkovalev): replace YV12_BUFFER_CONFIG with aom_image_t
+
+  // We use AOMMIN(num_planes, MAX_MB_PLANE) instead of num_planes to quiet
+  // the static analysis warnings.
+  for (int i = 0; i < AOMMIN(num_planes, MAX_MB_PLANE); ++i) {
+    const int is_uv = i > 0;
+#if CONFIG_AV1_HIGHBITDEPTH
+    if (src->flags & YV12_FLAG_HIGHBITDEPTH)
+      av1_highbd_resize_plane(src->buffers[i], src->crop_heights[is_uv],
+                              src->crop_widths[is_uv], src->strides[is_uv],
+                              dst->buffers[i], dst->crop_heights[is_uv],
+                              dst->crop_widths[is_uv], dst->strides[is_uv], bd);
+    else
+      av1_resize_plane(src->buffers[i], src->crop_heights[is_uv],
+                       src->crop_widths[is_uv], src->strides[is_uv],
+                       dst->buffers[i], dst->crop_heights[is_uv],
+                       dst->crop_widths[is_uv], dst->strides[is_uv]);
+#else
+    (void)bd;
+    av1_resize_plane(src->buffers[i], src->crop_heights[is_uv],
+                     src->crop_widths[is_uv], src->strides[is_uv],
+                     dst->buffers[i], dst->crop_heights[is_uv],
+                     dst->crop_widths[is_uv], dst->strides[is_uv]);
+#endif
+  }
+  aom_extend_frame_borders(dst, num_planes);
+}
+
+void av1_upscale_normative_rows(const AV1_COMMON *cm, const uint8_t *src,
+                                int src_stride, uint8_t *dst, int dst_stride,
+                                int plane, int rows) {
+  const int is_uv = (plane > 0);
+  const int ss_x = is_uv && cm->seq_params.subsampling_x;
+  const int downscaled_plane_width = ROUND_POWER_OF_TWO(cm->width, ss_x);
+  const int upscaled_plane_width =
+      ROUND_POWER_OF_TWO(cm->superres_upscaled_width, ss_x);
+  const int superres_denom = cm->superres_scale_denominator;
+
+  TileInfo tile_col;
+  const int32_t x_step_qn = av1_get_upscale_convolve_step(
+      downscaled_plane_width, upscaled_plane_width);
+  int32_t x0_qn = get_upscale_convolve_x0(downscaled_plane_width,
+                                          upscaled_plane_width, x_step_qn);
+
+  for (int j = 0; j < cm->tiles.cols; j++) {
+    av1_tile_set_col(&tile_col, cm, j);
+    // Determine the limits of this tile column in both the source
+    // and destination images.
+    // Note: The actual location which we start sampling from is
+    // (downscaled_x0 - 1 + (x0_qn/2^14)), and this quantity increases
+    // by exactly dst_width * (x_step_qn/2^14) pixels each iteration.
+    const int downscaled_x0 = tile_col.mi_col_start << (MI_SIZE_LOG2 - ss_x);
+    const int downscaled_x1 = tile_col.mi_col_end << (MI_SIZE_LOG2 - ss_x);
+    const int src_width = downscaled_x1 - downscaled_x0;
+
+    const int upscaled_x0 = (downscaled_x0 * superres_denom) / SCALE_NUMERATOR;
+    int upscaled_x1;
+    if (j == cm->tiles.cols - 1) {
+      // Note that we can't just use AOMMIN here - due to rounding,
+      // (downscaled_x1 * superres_denom) / SCALE_NUMERATOR may be less than
+      // upscaled_plane_width.
+      upscaled_x1 = upscaled_plane_width;
+    } else {
+      upscaled_x1 = (downscaled_x1 * superres_denom) / SCALE_NUMERATOR;
+    }
+
+    const uint8_t *const src_ptr = src + downscaled_x0;
+    uint8_t *const dst_ptr = dst + upscaled_x0;
+    const int dst_width = upscaled_x1 - upscaled_x0;
+
+    const int pad_left = (j == 0);
+    const int pad_right = (j == cm->tiles.cols - 1);
+
+#if CONFIG_AV1_HIGHBITDEPTH
+    if (cm->seq_params.use_highbitdepth)
+      highbd_upscale_normative_rect(src_ptr, rows, src_width, src_stride,
+                                    dst_ptr, rows, dst_width, dst_stride,
+                                    x_step_qn, x0_qn, pad_left, pad_right,
+                                    cm->seq_params.bit_depth);
+    else
+      upscale_normative_rect(src_ptr, rows, src_width, src_stride, dst_ptr,
+                             rows, dst_width, dst_stride, x_step_qn, x0_qn,
+                             pad_left, pad_right);
+#else
+    upscale_normative_rect(src_ptr, rows, src_width, src_stride, dst_ptr, rows,
+                           dst_width, dst_stride, x_step_qn, x0_qn, pad_left,
+                           pad_right);
+#endif
+    // Update the fractional pixel offset to prepare for the next tile column.
+    x0_qn += (dst_width * x_step_qn) - (src_width << RS_SCALE_SUBPEL_BITS);
+  }
+}
+
+void av1_upscale_normative_and_extend_frame(const AV1_COMMON *cm,
+                                            const YV12_BUFFER_CONFIG *src,
+                                            YV12_BUFFER_CONFIG *dst) {
+  const int num_planes = av1_num_planes(cm);
+  for (int i = 0; i < num_planes; ++i) {
+    const int is_uv = (i > 0);
+    av1_upscale_normative_rows(cm, src->buffers[i], src->strides[is_uv],
+                               dst->buffers[i], dst->strides[is_uv], i,
+                               src->crop_heights[is_uv]);
+  }
+
+  aom_extend_frame_borders(dst, num_planes);
+}
+
+YV12_BUFFER_CONFIG *av1_scale_if_required(
+    AV1_COMMON *cm, YV12_BUFFER_CONFIG *unscaled, YV12_BUFFER_CONFIG *scaled,
+    const InterpFilter filter, const int phase, const bool use_optimized_scaler,
+    const bool for_psnr) {
+  // If scaling is performed for the sole purpose of calculating PSNR, then our
+  // target dimensions are superres upscaled width/height. Otherwise our target
+  // dimensions are coded width/height.
+  const bool scaling_required =
+      for_psnr ? (cm->superres_upscaled_width != unscaled->y_crop_width ||
+                  cm->superres_upscaled_height != unscaled->y_crop_height)
+               : (cm->width != unscaled->y_crop_width ||
+                  cm->height != unscaled->y_crop_height);
+
+  if (scaling_required) {
+    const int num_planes = av1_num_planes(cm);
+#if CONFIG_AV1_HIGHBITDEPTH
+    if (use_optimized_scaler && cm->seq_params.bit_depth == AOM_BITS_8) {
+      av1_resize_and_extend_frame(unscaled, scaled, filter, phase, num_planes);
+    } else {
+      av1_resize_and_extend_frame_nonnormative(
+          unscaled, scaled, (int)cm->seq_params.bit_depth, num_planes);
+    }
+#else
+    if (use_optimized_scaler) {
+      av1_resize_and_extend_frame(unscaled, scaled, filter, phase, num_planes);
+    } else {
+      av1_resize_and_extend_frame_nonnormative(
+          unscaled, scaled, (int)cm->seq_params.bit_depth, num_planes);
+    }
+#endif
+    return scaled;
+  } else {
+    return unscaled;
+  }
+}
+
+// Calculates the scaled dimension given the original dimension and the scale
+// denominator.
+static void calculate_scaled_size_helper(int *dim, int denom) {
+  if (denom != SCALE_NUMERATOR) {
+    // We need to ensure the constraint in "Appendix A" of the spec:
+    // * FrameWidth is greater than or equal to 16
+    // * FrameHeight is greater than or equal to 16
+    // For this, we clamp the downscaled dimension to at least 16. One
+    // exception: if original dimension itself was < 16, then we keep the
+    // downscaled dimension to be same as the original, to ensure that resizing
+    // is valid.
+    const int min_dim = AOMMIN(16, *dim);
+    // Use this version if we need *dim to be even
+    // *width = (*width * SCALE_NUMERATOR + denom) / (2 * denom);
+    // *width <<= 1;
+    *dim = (*dim * SCALE_NUMERATOR + denom / 2) / (denom);
+    *dim = AOMMAX(*dim, min_dim);
+  }
+}
+
+void av1_calculate_scaled_size(int *width, int *height, int resize_denom) {
+  calculate_scaled_size_helper(width, resize_denom);
+  calculate_scaled_size_helper(height, resize_denom);
+}
+
+void av1_calculate_scaled_superres_size(int *width, int *height,
+                                        int superres_denom) {
+  (void)height;
+  calculate_scaled_size_helper(width, superres_denom);
+}
+
+void av1_calculate_unscaled_superres_size(int *width, int *height, int denom) {
+  if (denom != SCALE_NUMERATOR) {
+    // Note: av1_calculate_scaled_superres_size() rounds *up* after division
+    // when the resulting dimensions are odd. So here, we round *down*.
+    *width = *width * denom / SCALE_NUMERATOR;
+    (void)height;
+  }
+}
+
+// Copy only the config data from 'src' to 'dst'.
+static void copy_buffer_config(const YV12_BUFFER_CONFIG *const src,
+                               YV12_BUFFER_CONFIG *const dst) {
+  dst->bit_depth = src->bit_depth;
+  dst->color_primaries = src->color_primaries;
+  dst->transfer_characteristics = src->transfer_characteristics;
+  dst->matrix_coefficients = src->matrix_coefficients;
+  dst->monochrome = src->monochrome;
+  dst->chroma_sample_position = src->chroma_sample_position;
+  dst->color_range = src->color_range;
+}
+
+// TODO(afergs): Look for in-place upscaling
+// TODO(afergs): aom_ vs av1_ functions? Which can I use?
+// Upscale decoded image.
+void av1_superres_upscale(AV1_COMMON *cm, BufferPool *const pool) {
+  const int num_planes = av1_num_planes(cm);
+  if (!av1_superres_scaled(cm)) return;
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  const int byte_alignment = cm->features.byte_alignment;
+
+  YV12_BUFFER_CONFIG copy_buffer;
+  memset(&copy_buffer, 0, sizeof(copy_buffer));
+
+  YV12_BUFFER_CONFIG *const frame_to_show = &cm->cur_frame->buf;
+
+  const int aligned_width = ALIGN_POWER_OF_TWO(cm->width, 3);
+  if (aom_alloc_frame_buffer(
+          &copy_buffer, aligned_width, cm->height, seq_params->subsampling_x,
+          seq_params->subsampling_y, seq_params->use_highbitdepth,
+          AOM_BORDER_IN_PIXELS, byte_alignment))
+    aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                       "Failed to allocate copy buffer for superres upscaling");
+
+  // Copy function assumes the frames are the same size.
+  // Note that it does not copy YV12_BUFFER_CONFIG config data.
+  aom_yv12_copy_frame(frame_to_show, &copy_buffer, num_planes);
+
+  assert(copy_buffer.y_crop_width == aligned_width);
+  assert(copy_buffer.y_crop_height == cm->height);
+
+  // Realloc the current frame buffer at a higher resolution in place.
+  if (pool != NULL) {
+    // Use callbacks if on the decoder.
+    aom_codec_frame_buffer_t *fb = &cm->cur_frame->raw_frame_buffer;
+    aom_release_frame_buffer_cb_fn_t release_fb_cb = pool->release_fb_cb;
+    aom_get_frame_buffer_cb_fn_t cb = pool->get_fb_cb;
+    void *cb_priv = pool->cb_priv;
+
+    lock_buffer_pool(pool);
+    // Realloc with callback does not release the frame buffer - release first.
+    if (release_fb_cb(cb_priv, fb)) {
+      unlock_buffer_pool(pool);
+      aom_internal_error(
+          &cm->error, AOM_CODEC_MEM_ERROR,
+          "Failed to free current frame buffer before superres upscaling");
+    }
+    // aom_realloc_frame_buffer() leaves config data for frame_to_show intact
+    if (aom_realloc_frame_buffer(
+            frame_to_show, cm->superres_upscaled_width,
+            cm->superres_upscaled_height, seq_params->subsampling_x,
+            seq_params->subsampling_y, seq_params->use_highbitdepth,
+            AOM_BORDER_IN_PIXELS, byte_alignment, fb, cb, cb_priv)) {
+      unlock_buffer_pool(pool);
+      aom_internal_error(
+          &cm->error, AOM_CODEC_MEM_ERROR,
+          "Failed to allocate current frame buffer for superres upscaling");
+    }
+    unlock_buffer_pool(pool);
+  } else {
+    // Make a copy of the config data for frame_to_show in copy_buffer
+    copy_buffer_config(frame_to_show, &copy_buffer);
+
+    // Don't use callbacks on the encoder.
+    // aom_alloc_frame_buffer() clears the config data for frame_to_show
+    if (aom_alloc_frame_buffer(
+            frame_to_show, cm->superres_upscaled_width,
+            cm->superres_upscaled_height, seq_params->subsampling_x,
+            seq_params->subsampling_y, seq_params->use_highbitdepth,
+            AOM_BORDER_IN_PIXELS, byte_alignment))
+      aom_internal_error(
+          &cm->error, AOM_CODEC_MEM_ERROR,
+          "Failed to reallocate current frame buffer for superres upscaling");
+
+    // Restore config data back to frame_to_show
+    copy_buffer_config(&copy_buffer, frame_to_show);
+  }
+  // TODO(afergs): verify frame_to_show is correct after realloc
+  //               encoder:
+  //               decoder:
+
+  assert(frame_to_show->y_crop_width == cm->superres_upscaled_width);
+  assert(frame_to_show->y_crop_height == cm->superres_upscaled_height);
+
+  // Scale up and back into frame_to_show.
+  assert(frame_to_show->y_crop_width != cm->width);
+  av1_upscale_normative_and_extend_frame(cm, &copy_buffer, frame_to_show);
+
+  // Free the copy buffer
+  aom_free_frame_buffer(&copy_buffer);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/resize.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/resize.h
new file mode 100644
index 0000000000..13309ca682
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/resize.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_RESIZE_H_
+#define AOM_AV1_COMMON_RESIZE_H_
+
+#include <stdio.h>
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void av1_resize_plane(const uint8_t *const input, int height, int width,
+                      int in_stride, uint8_t *output, int height2, int width2,
+                      int out_stride);
+void av1_upscale_plane_double_prec(const double *const input, int height,
+                                   int width, int in_stride, double *output,
+                                   int height2, int width2, int out_stride);
+void av1_resize_frame420(const uint8_t *const y, int y_stride,
+                         const uint8_t *const u, const uint8_t *const v,
+                         int uv_stride, int height, int width, uint8_t *oy,
+                         int oy_stride, uint8_t *ou, uint8_t *ov,
+                         int ouv_stride, int oheight, int owidth);
+void av1_resize_frame422(const uint8_t *const y, int y_stride,
+                         const uint8_t *const u, const uint8_t *const v,
+                         int uv_stride, int height, int width, uint8_t *oy,
+                         int oy_stride, uint8_t *ou, uint8_t *ov,
+                         int ouv_stride, int oheight, int owidth);
+void av1_resize_frame444(const uint8_t *const y, int y_stride,
+                         const uint8_t *const u, const uint8_t *const v,
+                         int uv_stride, int height, int width, uint8_t *oy,
+                         int oy_stride, uint8_t *ou, uint8_t *ov,
+                         int ouv_stride, int oheight, int owidth);
+
+void av1_highbd_resize_plane(const uint8_t *const input, int height, int width,
+                             int in_stride, uint8_t *output, int height2,
+                             int width2, int out_stride, int bd);
+void av1_highbd_resize_frame420(const uint8_t *const y, int y_stride,
+                                const uint8_t *const u, const uint8_t *const v,
+                                int uv_stride, int height, int width,
+                                uint8_t *oy, int oy_stride, uint8_t *ou,
+                                uint8_t *ov, int ouv_stride, int oheight,
+                                int owidth, int bd);
+void av1_highbd_resize_frame422(const uint8_t *const y, int y_stride,
+                                const uint8_t *const u, const uint8_t *const v,
+                                int uv_stride, int height, int width,
+                                uint8_t *oy, int oy_stride, uint8_t *ou,
+                                uint8_t *ov, int ouv_stride, int oheight,
+                                int owidth, int bd);
+void av1_highbd_resize_frame444(const uint8_t *const y, int y_stride,
+                                const uint8_t *const u, const uint8_t *const v,
+                                int uv_stride, int height, int width,
+                                uint8_t *oy, int oy_stride, uint8_t *ou,
+                                uint8_t *ov, int ouv_stride, int oheight,
+                                int owidth, int bd);
+
+void av1_upscale_normative_rows(const AV1_COMMON *cm, const uint8_t *src,
+                                int src_stride, uint8_t *dst, int dst_stride,
+                                int plane, int rows);
+void av1_upscale_normative_and_extend_frame(const AV1_COMMON *cm,
+                                            const YV12_BUFFER_CONFIG *src,
+                                            YV12_BUFFER_CONFIG *dst);
+
+YV12_BUFFER_CONFIG *av1_scale_if_required(
+    AV1_COMMON *cm, YV12_BUFFER_CONFIG *unscaled, YV12_BUFFER_CONFIG *scaled,
+    const InterpFilter filter, const int phase, const bool use_optimized_scaler,
+    const bool for_psnr);
+
+void av1_resize_and_extend_frame_nonnormative(const YV12_BUFFER_CONFIG *src,
+                                              YV12_BUFFER_CONFIG *dst, int bd,
+                                              const int num_planes);
+
+// Calculates the scaled dimensions from the given original dimensions and the
+// resize scale denominator.
+void av1_calculate_scaled_size(int *width, int *height, int resize_denom);
+
+// Similar to above, but calculates scaled dimensions after superres from the
+// given original dimensions and superres scale denominator.
+void av1_calculate_scaled_superres_size(int *width, int *height,
+                                        int superres_denom);
+
+// Inverse of av1_calculate_scaled_superres_size() above: calculates the
+// original dimensions from the given scaled dimensions and the scale
+// denominator.
+void av1_calculate_unscaled_superres_size(int *width, int *height, int denom);
+
+void av1_superres_upscale(AV1_COMMON *cm, BufferPool *const pool);
+
+// Returns 1 if a superres upscaled frame is scaled and 0 otherwise.
+static INLINE int av1_superres_scaled(const AV1_COMMON *cm) {
+  // Note: for some corner cases (e.g. cm->width of 1), there may be no scaling
+  // required even though cm->superres_scale_denominator != SCALE_NUMERATOR.
+  // So, the following check is more accurate.
+  return !(cm->width == cm->superres_upscaled_width);
+}
+
+#define UPSCALE_NORMATIVE_TAPS 8
+extern const int16_t av1_resize_filter_normative[1 << RS_SUBPEL_BITS]
+                                                [UPSCALE_NORMATIVE_TAPS];
+
+int32_t av1_get_upscale_convolve_step(int in_length, int out_length);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_RESIZE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.c
new file mode 100644
index 0000000000..7f1aa1065c
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.c
@@ -0,0 +1,1566 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ *
+ */
+
+#include <math.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/resize.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+// The 's' values are calculated based on original 'r' and 'e' values in the
+// spec using GenSgrprojVtable().
+// Note: Setting r = 0 skips the filter; with corresponding s = -1 (invalid).
+const sgr_params_type av1_sgr_params[SGRPROJ_PARAMS] = {
+  { { 2, 1 }, { 140, 3236 } }, { { 2, 1 }, { 112, 2158 } },
+  { { 2, 1 }, { 93, 1618 } },  { { 2, 1 }, { 80, 1438 } },
+  { { 2, 1 }, { 70, 1295 } },  { { 2, 1 }, { 58, 1177 } },
+  { { 2, 1 }, { 47, 1079 } },  { { 2, 1 }, { 37, 996 } },
+  { { 2, 1 }, { 30, 925 } },   { { 2, 1 }, { 25, 863 } },
+  { { 0, 1 }, { -1, 2589 } },  { { 0, 1 }, { -1, 1618 } },
+  { { 0, 1 }, { -1, 1177 } },  { { 0, 1 }, { -1, 925 } },
+  { { 2, 0 }, { 56, -1 } },    { { 2, 0 }, { 22, -1 } },
+};
+
+AV1PixelRect av1_whole_frame_rect(const AV1_COMMON *cm, int is_uv) {
+  AV1PixelRect rect;
+
+  int ss_x = is_uv && cm->seq_params.subsampling_x;
+  int ss_y = is_uv && cm->seq_params.subsampling_y;
+
+  rect.top = 0;
+  rect.bottom = ROUND_POWER_OF_TWO(cm->height, ss_y);
+  rect.left = 0;
+  rect.right = ROUND_POWER_OF_TWO(cm->superres_upscaled_width, ss_x);
+  return rect;
+}
+
+// Count horizontal or vertical units per tile (use a width or height for
+// tile_size, respectively). We basically want to divide the tile size by the
+// size of a restoration unit. Rather than rounding up unconditionally as you
+// might expect, we round to nearest, which models the way a right or bottom
+// restoration unit can extend to up to 150% its normal width or height. The
+// max with 1 is to deal with tiles that are smaller than half of a restoration
+// unit.
+int av1_lr_count_units_in_tile(int unit_size, int tile_size) {
+  return AOMMAX((tile_size + (unit_size >> 1)) / unit_size, 1);
+}
+
+void av1_alloc_restoration_struct(AV1_COMMON *cm, RestorationInfo *rsi,
+                                  int is_uv) {
+  // We need to allocate enough space for restoration units to cover the
+  // largest tile. Without CONFIG_MAX_TILE, this is always the tile at the
+  // top-left and we can use av1_get_tile_rect(). With CONFIG_MAX_TILE, we have
+  // to do the computation ourselves, iterating over the tiles and keeping
+  // track of the largest width and height, then upscaling.
+  const AV1PixelRect tile_rect = av1_whole_frame_rect(cm, is_uv);
+  const int max_tile_w = tile_rect.right - tile_rect.left;
+  const int max_tile_h = tile_rect.bottom - tile_rect.top;
+
+  // To calculate hpertile and vpertile (horizontal and vertical units per
+  // tile), we basically want to divide the largest tile width or height by the
+  // size of a restoration unit. Rather than rounding up unconditionally as you
+  // might expect, we round to nearest, which models the way a right or bottom
+  // restoration unit can extend to up to 150% its normal width or height. The
+  // max with 1 is to deal with tiles that are smaller than half of a
+  // restoration unit.
+  const int unit_size = rsi->restoration_unit_size;
+  const int hpertile = av1_lr_count_units_in_tile(unit_size, max_tile_w);
+  const int vpertile = av1_lr_count_units_in_tile(unit_size, max_tile_h);
+
+  rsi->units_per_tile = hpertile * vpertile;
+  rsi->horz_units_per_tile = hpertile;
+  rsi->vert_units_per_tile = vpertile;
+
+  const int ntiles = 1;
+  const int nunits = ntiles * rsi->units_per_tile;
+
+  aom_free(rsi->unit_info);
+  CHECK_MEM_ERROR(cm, rsi->unit_info,
+                  (RestorationUnitInfo *)aom_memalign(
+                      16, sizeof(*rsi->unit_info) * nunits));
+}
+
+void av1_free_restoration_struct(RestorationInfo *rst_info) {
+  aom_free(rst_info->unit_info);
+  rst_info->unit_info = NULL;
+}
+
+#if 0
+// Pair of values for each sgrproj parameter:
+// Index 0 corresponds to r[0], e[0]
+// Index 1 corresponds to r[1], e[1]
+int sgrproj_mtable[SGRPROJ_PARAMS][2];
+
+static void GenSgrprojVtable() {
+  for (int i = 0; i < SGRPROJ_PARAMS; ++i) {
+    const sgr_params_type *const params = &av1_sgr_params[i];
+    for (int j = 0; j < 2; ++j) {
+      const int e = params->e[j];
+      const int r = params->r[j];
+      if (r == 0) {                 // filter is disabled
+        sgrproj_mtable[i][j] = -1;  // mark invalid
+      } else {                      // filter is enabled
+        const int n = (2 * r + 1) * (2 * r + 1);
+        const int n2e = n * n * e;
+        assert(n2e != 0);
+        sgrproj_mtable[i][j] = (((1 << SGRPROJ_MTABLE_BITS) + n2e / 2) / n2e);
+      }
+    }
+  }
+}
+#endif
+
+void av1_loop_restoration_precal() {
+#if 0
+  GenSgrprojVtable();
+#endif
+}
+
+static void extend_frame_lowbd(uint8_t *data, int width, int height, int stride,
+                               int border_horz, int border_vert) {
+  uint8_t *data_p;
+  int i;
+  for (i = 0; i < height; ++i) {
+    data_p = data + i * stride;
+    memset(data_p - border_horz, data_p[0], border_horz);
+    memset(data_p + width, data_p[width - 1], border_horz);
+  }
+  data_p = data - border_horz;
+  for (i = -border_vert; i < 0; ++i) {
+    memcpy(data_p + i * stride, data_p, width + 2 * border_horz);
+  }
+  for (i = height; i < height + border_vert; ++i) {
+    memcpy(data_p + i * stride, data_p + (height - 1) * stride,
+           width + 2 * border_horz);
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void extend_frame_highbd(uint16_t *data, int width, int height,
+                                int stride, int border_horz, int border_vert) {
+  uint16_t *data_p;
+  int i, j;
+  for (i = 0; i < height; ++i) {
+    data_p = data + i * stride;
+    for (j = -border_horz; j < 0; ++j) data_p[j] = data_p[0];
+    for (j = width; j < width + border_horz; ++j) data_p[j] = data_p[width - 1];
+  }
+  data_p = data - border_horz;
+  for (i = -border_vert; i < 0; ++i) {
+    memcpy(data_p + i * stride, data_p,
+           (width + 2 * border_horz) * sizeof(uint16_t));
+  }
+  for (i = height; i < height + border_vert; ++i) {
+    memcpy(data_p + i * stride, data_p + (height - 1) * stride,
+           (width + 2 * border_horz) * sizeof(uint16_t));
+  }
+}
+
+static void copy_tile_highbd(int width, int height, const uint16_t *src,
+                             int src_stride, uint16_t *dst, int dst_stride) {
+  for (int i = 0; i < height; ++i)
+    memcpy(dst + i * dst_stride, src + i * src_stride, width * sizeof(*dst));
+}
+#endif
+
+void av1_extend_frame(uint8_t *data, int width, int height, int stride,
+                      int border_horz, int border_vert, int highbd) {
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (highbd) {
+    extend_frame_highbd(CONVERT_TO_SHORTPTR(data), width, height, stride,
+                        border_horz, border_vert);
+    return;
+  }
+#endif
+  (void)highbd;
+  extend_frame_lowbd(data, width, height, stride, border_horz, border_vert);
+}
+
+static void copy_tile_lowbd(int width, int height, const uint8_t *src,
+                            int src_stride, uint8_t *dst, int dst_stride) {
+  for (int i = 0; i < height; ++i)
+    memcpy(dst + i * dst_stride, src + i * src_stride, width);
+}
+
+static void copy_tile(int width, int height, const uint8_t *src, int src_stride,
+                      uint8_t *dst, int dst_stride, int highbd) {
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (highbd) {
+    copy_tile_highbd(width, height, CONVERT_TO_SHORTPTR(src), src_stride,
+                     CONVERT_TO_SHORTPTR(dst), dst_stride);
+    return;
+  }
+#endif
+  (void)highbd;
+  copy_tile_lowbd(width, height, src, src_stride, dst, dst_stride);
+}
+
+#define REAL_PTR(hbd, d) ((hbd) ? (uint8_t *)CONVERT_TO_SHORTPTR(d) : (d))
+
+// With striped loop restoration, the filtering for each 64-pixel stripe gets
+// most of its input from the output of CDEF (stored in data8), but we need to
+// fill out a border of 3 pixels above/below the stripe according to the
+// following
+// rules:
+//
+// * At a frame boundary, we copy the outermost row of CDEF pixels three times.
+//   This extension is done by a call to av1_extend_frame() at the start of the
+//   loop restoration process, so the value of copy_above/copy_below doesn't
+//   strictly matter. However, by setting *copy_above = *copy_below = 1 whenever
+//   loop filtering across tiles is disabled, we can allow
+//   {setup,restore}_processing_stripe_boundary to assume that the top/bottom
+//   data has always been copied, simplifying the behaviour at the left and
+//   right edges of tiles.
+//
+// * If we're at a tile boundary and loop filtering across tiles is enabled,
+//   then there is a logical stripe which is 64 pixels high, but which is split
+//   into an 8px high and a 56px high stripe so that the processing (and
+//   coefficient set usage) can be aligned to tiles.
+//   In this case, we use the 3 rows of CDEF output across the boundary for
+//   context; this corresponds to leaving the frame buffer as-is.
+//
+// * If we're at a tile boundary and loop filtering across tiles is disabled,
+//   then we take the outermost row of CDEF pixels *within the current tile*
+//   and copy it three times. Thus we behave exactly as if the tile were a full
+//   frame.
+//
+// * Otherwise, we're at a stripe boundary within a tile. In that case, we
+//   take 2 rows of deblocked pixels and extend them to 3 rows of context.
+//
+// The distinction between the latter two cases is handled by the
+// av1_loop_restoration_save_boundary_lines() function, so here we just need
+// to decide if we're overwriting the above/below boundary pixels or not.
+static void get_stripe_boundary_info(const RestorationTileLimits *limits,
+                                     const AV1PixelRect *tile_rect, int ss_y,
+                                     int *copy_above, int *copy_below) {
+  *copy_above = 1;
+  *copy_below = 1;
+
+  const int full_stripe_height = RESTORATION_PROC_UNIT_SIZE >> ss_y;
+  const int runit_offset = RESTORATION_UNIT_OFFSET >> ss_y;
+
+  const int first_stripe_in_tile = (limits->v_start == tile_rect->top);
+  const int this_stripe_height =
+      full_stripe_height - (first_stripe_in_tile ? runit_offset : 0);
+  const int last_stripe_in_tile =
+      (limits->v_start + this_stripe_height >= tile_rect->bottom);
+
+  if (first_stripe_in_tile) *copy_above = 0;
+  if (last_stripe_in_tile) *copy_below = 0;
+}
+
+// Overwrite the border pixels around a processing stripe so that the conditions
+// listed above get_stripe_boundary_info() are preserved.
+// We save the pixels which get overwritten into a temporary buffer, so that
+// they can be restored by restore_processing_stripe_boundary() after we've
+// processed the stripe.
+//
+// limits gives the rectangular limits of the remaining stripes for the current
+// restoration unit. rsb is the stored stripe boundaries (taken from either
+// deblock or CDEF output as necessary).
+//
+// tile_rect is the limits of the current tile and tile_stripe0 is the index of
+// the first stripe in this tile (needed to convert the tile-relative stripe
+// index we get from limits into something we can look up in rsb).
+static void setup_processing_stripe_boundary(
+    const RestorationTileLimits *limits, const RestorationStripeBoundaries *rsb,
+    int rsb_row, int use_highbd, int h, uint8_t *data8, int data_stride,
+    RestorationLineBuffers *rlbs, int copy_above, int copy_below, int opt) {
+  // Offsets within the line buffers. The buffer logically starts at column
+  // -RESTORATION_EXTRA_HORZ so the 1st column (at x0 - RESTORATION_EXTRA_HORZ)
+  // has column x0 in the buffer.
+  const int buf_stride = rsb->stripe_boundary_stride;
+  const int buf_x0_off = limits->h_start;
+  const int line_width =
+      (limits->h_end - limits->h_start) + 2 * RESTORATION_EXTRA_HORZ;
+  const int line_size = line_width << use_highbd;
+
+  const int data_x0 = limits->h_start - RESTORATION_EXTRA_HORZ;
+
+  // Replace RESTORATION_BORDER pixels above the top of the stripe
+  // We expand RESTORATION_CTX_VERT=2 lines from rsb->stripe_boundary_above
+  // to fill RESTORATION_BORDER=3 lines of above pixels. This is done by
+  // duplicating the topmost of the 2 lines (see the AOMMAX call when
+  // calculating src_row, which gets the values 0, 0, 1 for i = -3, -2, -1).
+  //
+  // Special case: If we're at the top of a tile, which isn't on the topmost
+  // tile row, and we're allowed to loop filter across tiles, then we have a
+  // logical 64-pixel-high stripe which has been split into an 8-pixel high
+  // stripe and a 56-pixel high stripe (the current one). So, in this case,
+  // we want to leave the boundary alone!
+  if (!opt) {
+    if (copy_above) {
+      uint8_t *data8_tl = data8 + data_x0 + limits->v_start * data_stride;
+
+      for (int i = -RESTORATION_BORDER; i < 0; ++i) {
+        const int buf_row = rsb_row + AOMMAX(i + RESTORATION_CTX_VERT, 0);
+        const int buf_off = buf_x0_off + buf_row * buf_stride;
+        const uint8_t *buf =
+            rsb->stripe_boundary_above + (buf_off << use_highbd);
+        uint8_t *dst8 = data8_tl + i * data_stride;
+        // Save old pixels, then replace with data from stripe_boundary_above
+        memcpy(rlbs->tmp_save_above[i + RESTORATION_BORDER],
+               REAL_PTR(use_highbd, dst8), line_size);
+        memcpy(REAL_PTR(use_highbd, dst8), buf, line_size);
+      }
+    }
+
+    // Replace RESTORATION_BORDER pixels below the bottom of the stripe.
+    // The second buffer row is repeated, so src_row gets the values 0, 1, 1
+    // for i = 0, 1, 2.
+    if (copy_below) {
+      const int stripe_end = limits->v_start + h;
+      uint8_t *data8_bl = data8 + data_x0 + stripe_end * data_stride;
+
+      for (int i = 0; i < RESTORATION_BORDER; ++i) {
+        const int buf_row = rsb_row + AOMMIN(i, RESTORATION_CTX_VERT - 1);
+        const int buf_off = buf_x0_off + buf_row * buf_stride;
+        const uint8_t *src =
+            rsb->stripe_boundary_below + (buf_off << use_highbd);
+
+        uint8_t *dst8 = data8_bl + i * data_stride;
+        // Save old pixels, then replace with data from stripe_boundary_below
+        memcpy(rlbs->tmp_save_below[i], REAL_PTR(use_highbd, dst8), line_size);
+        memcpy(REAL_PTR(use_highbd, dst8), src, line_size);
+      }
+    }
+  } else {
+    if (copy_above) {
+      uint8_t *data8_tl = data8 + data_x0 + limits->v_start * data_stride;
+
+      // Only save and overwrite i=-RESTORATION_BORDER line.
+      uint8_t *dst8 = data8_tl + (-RESTORATION_BORDER) * data_stride;
+      // Save old pixels, then replace with data from stripe_boundary_above
+      memcpy(rlbs->tmp_save_above[0], REAL_PTR(use_highbd, dst8), line_size);
+      memcpy(REAL_PTR(use_highbd, dst8),
+             REAL_PTR(use_highbd,
+                      data8_tl + (-RESTORATION_BORDER + 1) * data_stride),
+             line_size);
+    }
+
+    if (copy_below) {
+      const int stripe_end = limits->v_start + h;
+      uint8_t *data8_bl = data8 + data_x0 + stripe_end * data_stride;
+
+      // Only save and overwrite i=2 line.
+      uint8_t *dst8 = data8_bl + 2 * data_stride;
+      // Save old pixels, then replace with data from stripe_boundary_below
+      memcpy(rlbs->tmp_save_below[2], REAL_PTR(use_highbd, dst8), line_size);
+      memcpy(REAL_PTR(use_highbd, dst8),
+             REAL_PTR(use_highbd, data8_bl + (2 - 1) * data_stride), line_size);
+    }
+  }
+}
+
+// This function restores the boundary lines modified by
+// setup_processing_stripe_boundary.
+//
+// Note: We need to be careful when handling the corners of the processing
+// unit, because (eg.) the top-left corner is considered to be part of
+// both the left and top borders. This means that, depending on the
+// loop_filter_across_tiles_enabled flag, the corner pixels might get
+// overwritten twice, once as part of the "top" border and once as part
+// of the "left" border (or similar for other corners).
+//
+// Everything works out fine as long as we make sure to reverse the order
+// when restoring, ie. we need to restore the left/right borders followed
+// by the top/bottom borders.
+static void restore_processing_stripe_boundary(
+    const RestorationTileLimits *limits, const RestorationLineBuffers *rlbs,
+    int use_highbd, int h, uint8_t *data8, int data_stride, int copy_above,
+    int copy_below, int opt) {
+  const int line_width =
+      (limits->h_end - limits->h_start) + 2 * RESTORATION_EXTRA_HORZ;
+  const int line_size = line_width << use_highbd;
+
+  const int data_x0 = limits->h_start - RESTORATION_EXTRA_HORZ;
+
+  if (!opt) {
+    if (copy_above) {
+      uint8_t *data8_tl = data8 + data_x0 + limits->v_start * data_stride;
+      for (int i = -RESTORATION_BORDER; i < 0; ++i) {
+        uint8_t *dst8 = data8_tl + i * data_stride;
+        memcpy(REAL_PTR(use_highbd, dst8),
+               rlbs->tmp_save_above[i + RESTORATION_BORDER], line_size);
+      }
+    }
+
+    if (copy_below) {
+      const int stripe_bottom = limits->v_start + h;
+      uint8_t *data8_bl = data8 + data_x0 + stripe_bottom * data_stride;
+
+      for (int i = 0; i < RESTORATION_BORDER; ++i) {
+        if (stripe_bottom + i >= limits->v_end + RESTORATION_BORDER) break;
+
+        uint8_t *dst8 = data8_bl + i * data_stride;
+        memcpy(REAL_PTR(use_highbd, dst8), rlbs->tmp_save_below[i], line_size);
+      }
+    }
+  } else {
+    if (copy_above) {
+      uint8_t *data8_tl = data8 + data_x0 + limits->v_start * data_stride;
+
+      // Only restore i=-RESTORATION_BORDER line.
+      uint8_t *dst8 = data8_tl + (-RESTORATION_BORDER) * data_stride;
+      memcpy(REAL_PTR(use_highbd, dst8), rlbs->tmp_save_above[0], line_size);
+    }
+
+    if (copy_below) {
+      const int stripe_bottom = limits->v_start + h;
+      uint8_t *data8_bl = data8 + data_x0 + stripe_bottom * data_stride;
+
+      // Only restore i=2 line.
+      if (stripe_bottom + 2 < limits->v_end + RESTORATION_BORDER) {
+        uint8_t *dst8 = data8_bl + 2 * data_stride;
+        memcpy(REAL_PTR(use_highbd, dst8), rlbs->tmp_save_below[2], line_size);
+      }
+    }
+  }
+}
+
+static void wiener_filter_stripe(const RestorationUnitInfo *rui,
+                                 int stripe_width, int stripe_height,
+                                 int procunit_width, const uint8_t *src,
+                                 int src_stride, uint8_t *dst, int dst_stride,
+                                 int32_t *tmpbuf, int bit_depth) {
+  (void)tmpbuf;
+  (void)bit_depth;
+  assert(bit_depth == 8);
+  const ConvolveParams conv_params = get_conv_params_wiener(8);
+
+  for (int j = 0; j < stripe_width; j += procunit_width) {
+    int w = AOMMIN(procunit_width, (stripe_width - j + 15) & ~15);
+    const uint8_t *src_p = src + j;
+    uint8_t *dst_p = dst + j;
+    av1_wiener_convolve_add_src(
+        src_p, src_stride, dst_p, dst_stride, rui->wiener_info.hfilter, 16,
+        rui->wiener_info.vfilter, 16, w, stripe_height, &conv_params);
+  }
+}
+
+/* Calculate windowed sums (if sqr=0) or sums of squares (if sqr=1)
+   over the input. The window is of size (2r + 1)x(2r + 1), and we
+   specialize to r = 1, 2, 3. A default function is used for r > 3.
+
+   Each loop follows the same format: We keep a window's worth of input
+   in individual variables and select data out of that as appropriate.
+*/
+static void boxsum1(int32_t *src, int width, int height, int src_stride,
+                    int sqr, int32_t *dst, int dst_stride) {
+  int i, j, a, b, c;
+  assert(width > 2 * SGRPROJ_BORDER_HORZ);
+  assert(height > 2 * SGRPROJ_BORDER_VERT);
+
+  // Vertical sum over 3-pixel regions, from src into dst.
+  if (!sqr) {
+    for (j = 0; j < width; ++j) {
+      a = src[j];
+      b = src[src_stride + j];
+      c = src[2 * src_stride + j];
+
+      dst[j] = a + b;
+      for (i = 1; i < height - 2; ++i) {
+        // Loop invariant: At the start of each iteration,
+        // a = src[(i - 1) * src_stride + j]
+        // b = src[(i    ) * src_stride + j]
+        // c = src[(i + 1) * src_stride + j]
+        dst[i * dst_stride + j] = a + b + c;
+        a = b;
+        b = c;
+        c = src[(i + 2) * src_stride + j];
+      }
+      dst[i * dst_stride + j] = a + b + c;
+      dst[(i + 1) * dst_stride + j] = b + c;
+    }
+  } else {
+    for (j = 0; j < width; ++j) {
+      a = src[j] * src[j];
+      b = src[src_stride + j] * src[src_stride + j];
+      c = src[2 * src_stride + j] * src[2 * src_stride + j];
+
+      dst[j] = a + b;
+      for (i = 1; i < height - 2; ++i) {
+        dst[i * dst_stride + j] = a + b + c;
+        a = b;
+        b = c;
+        c = src[(i + 2) * src_stride + j] * src[(i + 2) * src_stride + j];
+      }
+      dst[i * dst_stride + j] = a + b + c;
+      dst[(i + 1) * dst_stride + j] = b + c;
+    }
+  }
+
+  // Horizontal sum over 3-pixel regions of dst
+  for (i = 0; i < height; ++i) {
+    a = dst[i * dst_stride];
+    b = dst[i * dst_stride + 1];
+    c = dst[i * dst_stride + 2];
+
+    dst[i * dst_stride] = a + b;
+    for (j = 1; j < width - 2; ++j) {
+      // Loop invariant: At the start of each iteration,
+      // a = src[i * src_stride + (j - 1)]
+      // b = src[i * src_stride + (j    )]
+      // c = src[i * src_stride + (j + 1)]
+      dst[i * dst_stride + j] = a + b + c;
+      a = b;
+      b = c;
+      c = dst[i * dst_stride + (j + 2)];
+    }
+    dst[i * dst_stride + j] = a + b + c;
+    dst[i * dst_stride + (j + 1)] = b + c;
+  }
+}
+
+static void boxsum2(int32_t *src, int width, int height, int src_stride,
+                    int sqr, int32_t *dst, int dst_stride) {
+  int i, j, a, b, c, d, e;
+  assert(width > 2 * SGRPROJ_BORDER_HORZ);
+  assert(height > 2 * SGRPROJ_BORDER_VERT);
+
+  // Vertical sum over 5-pixel regions, from src into dst.
+  if (!sqr) {
+    for (j = 0; j < width; ++j) {
+      a = src[j];
+      b = src[src_stride + j];
+      c = src[2 * src_stride + j];
+      d = src[3 * src_stride + j];
+      e = src[4 * src_stride + j];
+
+      dst[j] = a + b + c;
+      dst[dst_stride + j] = a + b + c + d;
+      for (i = 2; i < height - 3; ++i) {
+        // Loop invariant: At the start of each iteration,
+        // a = src[(i - 2) * src_stride + j]
+        // b = src[(i - 1) * src_stride + j]
+        // c = src[(i    ) * src_stride + j]
+        // d = src[(i + 1) * src_stride + j]
+        // e = src[(i + 2) * src_stride + j]
+        dst[i * dst_stride + j] = a + b + c + d + e;
+        a = b;
+        b = c;
+        c = d;
+        d = e;
+        e = src[(i + 3) * src_stride + j];
+      }
+      dst[i * dst_stride + j] = a + b + c + d + e;
+      dst[(i + 1) * dst_stride + j] = b + c + d + e;
+      dst[(i + 2) * dst_stride + j] = c + d + e;
+    }
+  } else {
+    for (j = 0; j < width; ++j) {
+      a = src[j] * src[j];
+      b = src[src_stride + j] * src[src_stride + j];
+      c = src[2 * src_stride + j] * src[2 * src_stride + j];
+      d = src[3 * src_stride + j] * src[3 * src_stride + j];
+      e = src[4 * src_stride + j] * src[4 * src_stride + j];
+
+      dst[j] = a + b + c;
+      dst[dst_stride + j] = a + b + c + d;
+      for (i = 2; i < height - 3; ++i) {
+        dst[i * dst_stride + j] = a + b + c + d + e;
+        a = b;
+        b = c;
+        c = d;
+        d = e;
+        e = src[(i + 3) * src_stride + j] * src[(i + 3) * src_stride + j];
+      }
+      dst[i * dst_stride + j] = a + b + c + d + e;
+      dst[(i + 1) * dst_stride + j] = b + c + d + e;
+      dst[(i + 2) * dst_stride + j] = c + d + e;
+    }
+  }
+
+  // Horizontal sum over 5-pixel regions of dst
+  for (i = 0; i < height; ++i) {
+    a = dst[i * dst_stride];
+    b = dst[i * dst_stride + 1];
+    c = dst[i * dst_stride + 2];
+    d = dst[i * dst_stride + 3];
+    e = dst[i * dst_stride + 4];
+
+    dst[i * dst_stride] = a + b + c;
+    dst[i * dst_stride + 1] = a + b + c + d;
+    for (j = 2; j < width - 3; ++j) {
+      // Loop invariant: At the start of each iteration,
+      // a = src[i * src_stride + (j - 2)]
+      // b = src[i * src_stride + (j - 1)]
+      // c = src[i * src_stride + (j    )]
+      // d = src[i * src_stride + (j + 1)]
+      // e = src[i * src_stride + (j + 2)]
+      dst[i * dst_stride + j] = a + b + c + d + e;
+      a = b;
+      b = c;
+      c = d;
+      d = e;
+      e = dst[i * dst_stride + (j + 3)];
+    }
+    dst[i * dst_stride + j] = a + b + c + d + e;
+    dst[i * dst_stride + (j + 1)] = b + c + d + e;
+    dst[i * dst_stride + (j + 2)] = c + d + e;
+  }
+}
+
+static void boxsum(int32_t *src, int width, int height, int src_stride, int r,
+                   int sqr, int32_t *dst, int dst_stride) {
+  if (r == 1)
+    boxsum1(src, width, height, src_stride, sqr, dst, dst_stride);
+  else if (r == 2)
+    boxsum2(src, width, height, src_stride, sqr, dst, dst_stride);
+  else
+    assert(0 && "Invalid value of r in self-guided filter");
+}
+
+void av1_decode_xq(const int *xqd, int *xq, const sgr_params_type *params) {
+  if (params->r[0] == 0) {
+    xq[0] = 0;
+    xq[1] = (1 << SGRPROJ_PRJ_BITS) - xqd[1];
+  } else if (params->r[1] == 0) {
+    xq[0] = xqd[0];
+    xq[1] = 0;
+  } else {
+    xq[0] = xqd[0];
+    xq[1] = (1 << SGRPROJ_PRJ_BITS) - xq[0] - xqd[1];
+  }
+}
+
+const int32_t av1_x_by_xplus1[256] = {
+  // Special case: Map 0 -> 1 (corresponding to a value of 1/256)
+  // instead of 0. See comments in selfguided_restoration_internal() for why
+  1,   128, 171, 192, 205, 213, 219, 224, 228, 230, 233, 235, 236, 238, 239,
+  240, 241, 242, 243, 243, 244, 244, 245, 245, 246, 246, 247, 247, 247, 247,
+  248, 248, 248, 248, 249, 249, 249, 249, 249, 250, 250, 250, 250, 250, 250,
+  250, 251, 251, 251, 251, 251, 251, 251, 251, 251, 251, 252, 252, 252, 252,
+  252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 253, 253,
+  253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253,
+  253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, 254, 254, 254,
+  254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
+  254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
+  254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
+  254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
+  254, 254, 254, 254, 254, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+  255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+  255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+  255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+  255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+  255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+  256,
+};
+
+const int32_t av1_one_by_x[MAX_NELEM] = {
+  4096, 2048, 1365, 1024, 819, 683, 585, 512, 455, 410, 372, 341, 315,
+  293,  273,  256,  241,  228, 216, 205, 195, 186, 178, 171, 164,
+};
+
+static void calculate_intermediate_result(int32_t *dgd, int width, int height,
+                                          int dgd_stride, int bit_depth,
+                                          int sgr_params_idx, int radius_idx,
+                                          int pass, int32_t *A, int32_t *B) {
+  const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
+  const int r = params->r[radius_idx];
+  const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
+  const int height_ext = height + 2 * SGRPROJ_BORDER_VERT;
+  // Adjusting the stride of A and B here appears to avoid bad cache effects,
+  // leading to a significant speed improvement.
+  // We also align the stride to a multiple of 16 bytes, for consistency
+  // with the SIMD version of this function.
+  int buf_stride = ((width_ext + 3) & ~3) + 16;
+  const int step = pass == 0 ? 1 : 2;
+  int i, j;
+
+  assert(r <= MAX_RADIUS && "Need MAX_RADIUS >= r");
+  assert(r <= SGRPROJ_BORDER_VERT - 1 && r <= SGRPROJ_BORDER_HORZ - 1 &&
+         "Need SGRPROJ_BORDER_* >= r+1");
+
+  boxsum(dgd - dgd_stride * SGRPROJ_BORDER_VERT - SGRPROJ_BORDER_HORZ,
+         width_ext, height_ext, dgd_stride, r, 0, B, buf_stride);
+  boxsum(dgd - dgd_stride * SGRPROJ_BORDER_VERT - SGRPROJ_BORDER_HORZ,
+         width_ext, height_ext, dgd_stride, r, 1, A, buf_stride);
+  A += SGRPROJ_BORDER_VERT * buf_stride + SGRPROJ_BORDER_HORZ;
+  B += SGRPROJ_BORDER_VERT * buf_stride + SGRPROJ_BORDER_HORZ;
+  // Calculate the eventual A[] and B[] arrays. Include a 1-pixel border - ie,
+  // for a 64x64 processing unit, we calculate 66x66 pixels of A[] and B[].
+  for (i = -1; i < height + 1; i += step) {
+    for (j = -1; j < width + 1; ++j) {
+      const int k = i * buf_stride + j;
+      const int n = (2 * r + 1) * (2 * r + 1);
+
+      // a < 2^16 * n < 2^22 regardless of bit depth
+      uint32_t a = ROUND_POWER_OF_TWO(A[k], 2 * (bit_depth - 8));
+      // b < 2^8 * n < 2^14 regardless of bit depth
+      uint32_t b = ROUND_POWER_OF_TWO(B[k], bit_depth - 8);
+
+      // Each term in calculating p = a * n - b * b is < 2^16 * n^2 < 2^28,
+      // and p itself satisfies p < 2^14 * n^2 < 2^26.
+      // This bound on p is due to:
+      // https://en.wikipedia.org/wiki/Popoviciu's_inequality_on_variances
+      //
+      // Note: Sometimes, in high bit depth, we can end up with a*n < b*b.
+      // This is an artefact of rounding, and can only happen if all pixels
+      // are (almost) identical, so in this case we saturate to p=0.
+      uint32_t p = (a * n < b * b) ? 0 : a * n - b * b;
+
+      const uint32_t s = params->s[radius_idx];
+
+      // p * s < (2^14 * n^2) * round(2^20 / n^2 eps) < 2^34 / eps < 2^32
+      // as long as eps >= 4. So p * s fits into a uint32_t, and z < 2^12
+      // (this holds even after accounting for the rounding in s)
+      const uint32_t z = ROUND_POWER_OF_TWO(p * s, SGRPROJ_MTABLE_BITS);
+
+      // Note: We have to be quite careful about the value of A[k].
+      // This is used as a blend factor between individual pixel values and the
+      // local mean. So it logically has a range of [0, 256], including both
+      // endpoints.
+      //
+      // This is a pain for hardware, as we'd like something which can be stored
+      // in exactly 8 bits.
+      // Further, in the calculation of B[k] below, if z == 0 and r == 2,
+      // then A[k] "should be" 0. But then we can end up setting B[k] to a value
+      // slightly above 2^(8 + bit depth), due to rounding in the value of
+      // av1_one_by_x[25-1].
+      //
+      // Thus we saturate so that, when z == 0, A[k] is set to 1 instead of 0.
+      // This fixes the above issues (256 - A[k] fits in a uint8, and we can't
+      // overflow), without significantly affecting the final result: z == 0
+      // implies that the image is essentially "flat", so the local mean and
+      // individual pixel values are very similar.
+      //
+      // Note that saturating on the other side, ie. requring A[k] <= 255,
+      // would be a bad idea, as that corresponds to the case where the image
+      // is very variable, when we want to preserve the local pixel value as
+      // much as possible.
+      A[k] = av1_x_by_xplus1[AOMMIN(z, 255)];  // in range [1, 256]
+
+      // SGRPROJ_SGR - A[k] < 2^8 (from above), B[k] < 2^(bit_depth) * n,
+      // av1_one_by_x[n - 1] = round(2^12 / n)
+      // => the product here is < 2^(20 + bit_depth) <= 2^32,
+      // and B[k] is set to a value < 2^(8 + bit depth)
+      // This holds even with the rounding in av1_one_by_x and in the overall
+      // result, as long as SGRPROJ_SGR - A[k] is strictly less than 2^8.
+      B[k] = (int32_t)ROUND_POWER_OF_TWO((uint32_t)(SGRPROJ_SGR - A[k]) *
+                                             (uint32_t)B[k] *
+                                             (uint32_t)av1_one_by_x[n - 1],
+                                         SGRPROJ_RECIP_BITS);
+    }
+  }
+}
+
+static void selfguided_restoration_fast_internal(
+    int32_t *dgd, int width, int height, int dgd_stride, int32_t *dst,
+    int dst_stride, int bit_depth, int sgr_params_idx, int radius_idx) {
+  const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
+  const int r = params->r[radius_idx];
+  const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
+  // Adjusting the stride of A and B here appears to avoid bad cache effects,
+  // leading to a significant speed improvement.
+  // We also align the stride to a multiple of 16 bytes, for consistency
+  // with the SIMD version of this function.
+  int buf_stride = ((width_ext + 3) & ~3) + 16;
+  int32_t A_[RESTORATION_PROC_UNIT_PELS];
+  int32_t B_[RESTORATION_PROC_UNIT_PELS];
+  int32_t *A = A_;
+  int32_t *B = B_;
+  int i, j;
+  calculate_intermediate_result(dgd, width, height, dgd_stride, bit_depth,
+                                sgr_params_idx, radius_idx, 1, A, B);
+  A += SGRPROJ_BORDER_VERT * buf_stride + SGRPROJ_BORDER_HORZ;
+  B += SGRPROJ_BORDER_VERT * buf_stride + SGRPROJ_BORDER_HORZ;
+
+  // Use the A[] and B[] arrays to calculate the filtered image
+  (void)r;
+  assert(r == 2);
+  for (i = 0; i < height; ++i) {
+    if (!(i & 1)) {  // even row
+      for (j = 0; j < width; ++j) {
+        const int k = i * buf_stride + j;
+        const int l = i * dgd_stride + j;
+        const int m = i * dst_stride + j;
+        const int nb = 5;
+        const int32_t a = (A[k - buf_stride] + A[k + buf_stride]) * 6 +
+                          (A[k - 1 - buf_stride] + A[k - 1 + buf_stride] +
+                           A[k + 1 - buf_stride] + A[k + 1 + buf_stride]) *
+                              5;
+        const int32_t b = (B[k - buf_stride] + B[k + buf_stride]) * 6 +
+                          (B[k - 1 - buf_stride] + B[k - 1 + buf_stride] +
+                           B[k + 1 - buf_stride] + B[k + 1 + buf_stride]) *
+                              5;
+        const int32_t v = a * dgd[l] + b;
+        dst[m] =
+            ROUND_POWER_OF_TWO(v, SGRPROJ_SGR_BITS + nb - SGRPROJ_RST_BITS);
+      }
+    } else {  // odd row
+      for (j = 0; j < width; ++j) {
+        const int k = i * buf_stride + j;
+        const int l = i * dgd_stride + j;
+        const int m = i * dst_stride + j;
+        const int nb = 4;
+        const int32_t a = A[k] * 6 + (A[k - 1] + A[k + 1]) * 5;
+        const int32_t b = B[k] * 6 + (B[k - 1] + B[k + 1]) * 5;
+        const int32_t v = a * dgd[l] + b;
+        dst[m] =
+            ROUND_POWER_OF_TWO(v, SGRPROJ_SGR_BITS + nb - SGRPROJ_RST_BITS);
+      }
+    }
+  }
+}
+
+static void selfguided_restoration_internal(int32_t *dgd, int width, int height,
+                                            int dgd_stride, int32_t *dst,
+                                            int dst_stride, int bit_depth,
+                                            int sgr_params_idx,
+                                            int radius_idx) {
+  const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
+  // Adjusting the stride of A and B here appears to avoid bad cache effects,
+  // leading to a significant speed improvement.
+  // We also align the stride to a multiple of 16 bytes, for consistency
+  // with the SIMD version of this function.
+  int buf_stride = ((width_ext + 3) & ~3) + 16;
+  int32_t A_[RESTORATION_PROC_UNIT_PELS];
+  int32_t B_[RESTORATION_PROC_UNIT_PELS];
+  int32_t *A = A_;
+  int32_t *B = B_;
+  int i, j;
+  calculate_intermediate_result(dgd, width, height, dgd_stride, bit_depth,
+                                sgr_params_idx, radius_idx, 0, A, B);
+  A += SGRPROJ_BORDER_VERT * buf_stride + SGRPROJ_BORDER_HORZ;
+  B += SGRPROJ_BORDER_VERT * buf_stride + SGRPROJ_BORDER_HORZ;
+
+  // Use the A[] and B[] arrays to calculate the filtered image
+  for (i = 0; i < height; ++i) {
+    for (j = 0; j < width; ++j) {
+      const int k = i * buf_stride + j;
+      const int l = i * dgd_stride + j;
+      const int m = i * dst_stride + j;
+      const int nb = 5;
+      const int32_t a =
+          (A[k] + A[k - 1] + A[k + 1] + A[k - buf_stride] + A[k + buf_stride]) *
+              4 +
+          (A[k - 1 - buf_stride] + A[k - 1 + buf_stride] +
+           A[k + 1 - buf_stride] + A[k + 1 + buf_stride]) *
+              3;
+      const int32_t b =
+          (B[k] + B[k - 1] + B[k + 1] + B[k - buf_stride] + B[k + buf_stride]) *
+              4 +
+          (B[k - 1 - buf_stride] + B[k - 1 + buf_stride] +
+           B[k + 1 - buf_stride] + B[k + 1 + buf_stride]) *
+              3;
+      const int32_t v = a * dgd[l] + b;
+      dst[m] = ROUND_POWER_OF_TWO(v, SGRPROJ_SGR_BITS + nb - SGRPROJ_RST_BITS);
+    }
+  }
+}
+
+int av1_selfguided_restoration_c(const uint8_t *dgd8, int width, int height,
+                                 int dgd_stride, int32_t *flt0, int32_t *flt1,
+                                 int flt_stride, int sgr_params_idx,
+                                 int bit_depth, int highbd) {
+  int32_t dgd32_[RESTORATION_PROC_UNIT_PELS];
+  const int dgd32_stride = width + 2 * SGRPROJ_BORDER_HORZ;
+  int32_t *dgd32 =
+      dgd32_ + dgd32_stride * SGRPROJ_BORDER_VERT + SGRPROJ_BORDER_HORZ;
+
+  if (highbd) {
+    const uint16_t *dgd16 = CONVERT_TO_SHORTPTR(dgd8);
+    for (int i = -SGRPROJ_BORDER_VERT; i < height + SGRPROJ_BORDER_VERT; ++i) {
+      for (int j = -SGRPROJ_BORDER_HORZ; j < width + SGRPROJ_BORDER_HORZ; ++j) {
+        dgd32[i * dgd32_stride + j] = dgd16[i * dgd_stride + j];
+      }
+    }
+  } else {
+    for (int i = -SGRPROJ_BORDER_VERT; i < height + SGRPROJ_BORDER_VERT; ++i) {
+      for (int j = -SGRPROJ_BORDER_HORZ; j < width + SGRPROJ_BORDER_HORZ; ++j) {
+        dgd32[i * dgd32_stride + j] = dgd8[i * dgd_stride + j];
+      }
+    }
+  }
+
+  const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
+  // If params->r == 0 we skip the corresponding filter. We only allow one of
+  // the radii to be 0, as having both equal to 0 would be equivalent to
+  // skipping SGR entirely.
+  assert(!(params->r[0] == 0 && params->r[1] == 0));
+
+  if (params->r[0] > 0)
+    selfguided_restoration_fast_internal(dgd32, width, height, dgd32_stride,
+                                         flt0, flt_stride, bit_depth,
+                                         sgr_params_idx, 0);
+  if (params->r[1] > 0)
+    selfguided_restoration_internal(dgd32, width, height, dgd32_stride, flt1,
+                                    flt_stride, bit_depth, sgr_params_idx, 1);
+  return 0;
+}
+
+void av1_apply_selfguided_restoration_c(const uint8_t *dat8, int width,
+                                        int height, int stride, int eps,
+                                        const int *xqd, uint8_t *dst8,
+                                        int dst_stride, int32_t *tmpbuf,
+                                        int bit_depth, int highbd) {
+  int32_t *flt0 = tmpbuf;
+  int32_t *flt1 = flt0 + RESTORATION_UNITPELS_MAX;
+  assert(width * height <= RESTORATION_UNITPELS_MAX);
+
+  const int ret = av1_selfguided_restoration_c(
+      dat8, width, height, stride, flt0, flt1, width, eps, bit_depth, highbd);
+  (void)ret;
+  assert(!ret);
+  const sgr_params_type *const params = &av1_sgr_params[eps];
+  int xq[2];
+  av1_decode_xq(xqd, xq, params);
+  for (int i = 0; i < height; ++i) {
+    for (int j = 0; j < width; ++j) {
+      const int k = i * width + j;
+      uint8_t *dst8ij = dst8 + i * dst_stride + j;
+      const uint8_t *dat8ij = dat8 + i * stride + j;
+
+      const uint16_t pre_u = highbd ? *CONVERT_TO_SHORTPTR(dat8ij) : *dat8ij;
+      const int32_t u = (int32_t)pre_u << SGRPROJ_RST_BITS;
+      int32_t v = u << SGRPROJ_PRJ_BITS;
+      // If params->r == 0 then we skipped the filtering in
+      // av1_selfguided_restoration_c, i.e. flt[k] == u
+      if (params->r[0] > 0) v += xq[0] * (flt0[k] - u);
+      if (params->r[1] > 0) v += xq[1] * (flt1[k] - u);
+      const int16_t w =
+          (int16_t)ROUND_POWER_OF_TWO(v, SGRPROJ_PRJ_BITS + SGRPROJ_RST_BITS);
+
+      const uint16_t out = clip_pixel_highbd(w, bit_depth);
+      if (highbd)
+        *CONVERT_TO_SHORTPTR(dst8ij) = out;
+      else
+        *dst8ij = (uint8_t)out;
+    }
+  }
+}
+
+static void sgrproj_filter_stripe(const RestorationUnitInfo *rui,
+                                  int stripe_width, int stripe_height,
+                                  int procunit_width, const uint8_t *src,
+                                  int src_stride, uint8_t *dst, int dst_stride,
+                                  int32_t *tmpbuf, int bit_depth) {
+  (void)bit_depth;
+  assert(bit_depth == 8);
+
+  for (int j = 0; j < stripe_width; j += procunit_width) {
+    int w = AOMMIN(procunit_width, stripe_width - j);
+    av1_apply_selfguided_restoration(
+        src + j, w, stripe_height, src_stride, rui->sgrproj_info.ep,
+        rui->sgrproj_info.xqd, dst + j, dst_stride, tmpbuf, bit_depth, 0);
+  }
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static void wiener_filter_stripe_highbd(const RestorationUnitInfo *rui,
+                                        int stripe_width, int stripe_height,
+                                        int procunit_width, const uint8_t *src8,
+                                        int src_stride, uint8_t *dst8,
+                                        int dst_stride, int32_t *tmpbuf,
+                                        int bit_depth) {
+  (void)tmpbuf;
+  const ConvolveParams conv_params = get_conv_params_wiener(bit_depth);
+
+  for (int j = 0; j < stripe_width; j += procunit_width) {
+    int w = AOMMIN(procunit_width, (stripe_width - j + 15) & ~15);
+    const uint8_t *src8_p = src8 + j;
+    uint8_t *dst8_p = dst8 + j;
+    av1_highbd_wiener_convolve_add_src(src8_p, src_stride, dst8_p, dst_stride,
+                                       rui->wiener_info.hfilter, 16,
+                                       rui->wiener_info.vfilter, 16, w,
+                                       stripe_height, &conv_params, bit_depth);
+  }
+}
+
+static void sgrproj_filter_stripe_highbd(const RestorationUnitInfo *rui,
+                                         int stripe_width, int stripe_height,
+                                         int procunit_width,
+                                         const uint8_t *src8, int src_stride,
+                                         uint8_t *dst8, int dst_stride,
+                                         int32_t *tmpbuf, int bit_depth) {
+  for (int j = 0; j < stripe_width; j += procunit_width) {
+    int w = AOMMIN(procunit_width, stripe_width - j);
+    av1_apply_selfguided_restoration(
+        src8 + j, w, stripe_height, src_stride, rui->sgrproj_info.ep,
+        rui->sgrproj_info.xqd, dst8 + j, dst_stride, tmpbuf, bit_depth, 1);
+  }
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+typedef void (*stripe_filter_fun)(const RestorationUnitInfo *rui,
+                                  int stripe_width, int stripe_height,
+                                  int procunit_width, const uint8_t *src,
+                                  int src_stride, uint8_t *dst, int dst_stride,
+                                  int32_t *tmpbuf, int bit_depth);
+
+#if CONFIG_AV1_HIGHBITDEPTH
+#define NUM_STRIPE_FILTERS 4
+static const stripe_filter_fun stripe_filters[NUM_STRIPE_FILTERS] = {
+  wiener_filter_stripe, sgrproj_filter_stripe, wiener_filter_stripe_highbd,
+  sgrproj_filter_stripe_highbd
+};
+#else
+#define NUM_STRIPE_FILTERS 2
+static const stripe_filter_fun stripe_filters[NUM_STRIPE_FILTERS] = {
+  wiener_filter_stripe, sgrproj_filter_stripe
+};
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+// Filter one restoration unit
+void av1_loop_restoration_filter_unit(
+    const RestorationTileLimits *limits, const RestorationUnitInfo *rui,
+    const RestorationStripeBoundaries *rsb, RestorationLineBuffers *rlbs,
+    const AV1PixelRect *tile_rect, int tile_stripe0, int ss_x, int ss_y,
+    int highbd, int bit_depth, uint8_t *data8, int stride, uint8_t *dst8,
+    int dst_stride, int32_t *tmpbuf, int optimized_lr) {
+  RestorationType unit_rtype = rui->restoration_type;
+
+  int unit_h = limits->v_end - limits->v_start;
+  int unit_w = limits->h_end - limits->h_start;
+  uint8_t *data8_tl = data8 + limits->v_start * stride + limits->h_start;
+  uint8_t *dst8_tl = dst8 + limits->v_start * dst_stride + limits->h_start;
+
+  if (unit_rtype == RESTORE_NONE) {
+    copy_tile(unit_w, unit_h, data8_tl, stride, dst8_tl, dst_stride, highbd);
+    return;
+  }
+
+  const int filter_idx = 2 * highbd + (unit_rtype == RESTORE_SGRPROJ);
+  assert(filter_idx < NUM_STRIPE_FILTERS);
+  const stripe_filter_fun stripe_filter = stripe_filters[filter_idx];
+
+  const int procunit_width = RESTORATION_PROC_UNIT_SIZE >> ss_x;
+
+  // Convolve the whole tile one stripe at a time
+  RestorationTileLimits remaining_stripes = *limits;
+  int i = 0;
+  while (i < unit_h) {
+    int copy_above, copy_below;
+    remaining_stripes.v_start = limits->v_start + i;
+
+    get_stripe_boundary_info(&remaining_stripes, tile_rect, ss_y, &copy_above,
+                             &copy_below);
+
+    const int full_stripe_height = RESTORATION_PROC_UNIT_SIZE >> ss_y;
+    const int runit_offset = RESTORATION_UNIT_OFFSET >> ss_y;
+
+    // Work out where this stripe's boundaries are within
+    // rsb->stripe_boundary_{above,below}
+    const int tile_stripe =
+        (remaining_stripes.v_start - tile_rect->top + runit_offset) /
+        full_stripe_height;
+    const int frame_stripe = tile_stripe0 + tile_stripe;
+    const int rsb_row = RESTORATION_CTX_VERT * frame_stripe;
+
+    // Calculate this stripe's height, based on two rules:
+    // * The topmost stripe in each tile is 8 luma pixels shorter than usual.
+    // * We can't extend past the end of the current restoration unit
+    const int nominal_stripe_height =
+        full_stripe_height - ((tile_stripe == 0) ? runit_offset : 0);
+    const int h = AOMMIN(nominal_stripe_height,
+                         remaining_stripes.v_end - remaining_stripes.v_start);
+
+    setup_processing_stripe_boundary(&remaining_stripes, rsb, rsb_row, highbd,
+                                     h, data8, stride, rlbs, copy_above,
+                                     copy_below, optimized_lr);
+
+    stripe_filter(rui, unit_w, h, procunit_width, data8_tl + i * stride, stride,
+                  dst8_tl + i * dst_stride, dst_stride, tmpbuf, bit_depth);
+
+    restore_processing_stripe_boundary(&remaining_stripes, rlbs, highbd, h,
+                                       data8, stride, copy_above, copy_below,
+                                       optimized_lr);
+
+    i += h;
+  }
+}
+
+static void filter_frame_on_unit(const RestorationTileLimits *limits,
+                                 const AV1PixelRect *tile_rect,
+                                 int rest_unit_idx, void *priv, int32_t *tmpbuf,
+                                 RestorationLineBuffers *rlbs) {
+  FilterFrameCtxt *ctxt = (FilterFrameCtxt *)priv;
+  const RestorationInfo *rsi = ctxt->rsi;
+
+  av1_loop_restoration_filter_unit(
+      limits, &rsi->unit_info[rest_unit_idx], &rsi->boundaries, rlbs, tile_rect,
+      ctxt->tile_stripe0, ctxt->ss_x, ctxt->ss_y, ctxt->highbd, ctxt->bit_depth,
+      ctxt->data8, ctxt->data_stride, ctxt->dst8, ctxt->dst_stride, tmpbuf,
+      rsi->optimized_lr);
+}
+
+void av1_loop_restoration_filter_frame_init(AV1LrStruct *lr_ctxt,
+                                            YV12_BUFFER_CONFIG *frame,
+                                            AV1_COMMON *cm, int optimized_lr,
+                                            int num_planes) {
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  const int bit_depth = seq_params->bit_depth;
+  const int highbd = seq_params->use_highbitdepth;
+  lr_ctxt->dst = &cm->rst_frame;
+
+  const int frame_width = frame->crop_widths[0];
+  const int frame_height = frame->crop_heights[0];
+  if (aom_realloc_frame_buffer(
+          lr_ctxt->dst, frame_width, frame_height, seq_params->subsampling_x,
+          seq_params->subsampling_y, highbd, AOM_RESTORATION_FRAME_BORDER,
+          cm->features.byte_alignment, NULL, NULL, NULL) < 0)
+    aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                       "Failed to allocate restoration dst buffer");
+
+  lr_ctxt->on_rest_unit = filter_frame_on_unit;
+  lr_ctxt->frame = frame;
+  for (int plane = 0; plane < num_planes; ++plane) {
+    RestorationInfo *rsi = &cm->rst_info[plane];
+    RestorationType rtype = rsi->frame_restoration_type;
+    rsi->optimized_lr = optimized_lr;
+
+    if (rtype == RESTORE_NONE) {
+      continue;
+    }
+
+    const int is_uv = plane > 0;
+    const int plane_width = frame->crop_widths[is_uv];
+    const int plane_height = frame->crop_heights[is_uv];
+    FilterFrameCtxt *lr_plane_ctxt = &lr_ctxt->ctxt[plane];
+
+    av1_extend_frame(frame->buffers[plane], plane_width, plane_height,
+                     frame->strides[is_uv], RESTORATION_BORDER,
+                     RESTORATION_BORDER, highbd);
+
+    lr_plane_ctxt->rsi = rsi;
+    lr_plane_ctxt->ss_x = is_uv && seq_params->subsampling_x;
+    lr_plane_ctxt->ss_y = is_uv && seq_params->subsampling_y;
+    lr_plane_ctxt->highbd = highbd;
+    lr_plane_ctxt->bit_depth = bit_depth;
+    lr_plane_ctxt->data8 = frame->buffers[plane];
+    lr_plane_ctxt->dst8 = lr_ctxt->dst->buffers[plane];
+    lr_plane_ctxt->data_stride = frame->strides[is_uv];
+    lr_plane_ctxt->dst_stride = lr_ctxt->dst->strides[is_uv];
+    lr_plane_ctxt->tile_rect = av1_whole_frame_rect(cm, is_uv);
+    lr_plane_ctxt->tile_stripe0 = 0;
+  }
+}
+
+void av1_loop_restoration_copy_planes(AV1LrStruct *loop_rest_ctxt,
+                                      AV1_COMMON *cm, int num_planes) {
+  typedef void (*copy_fun)(const YV12_BUFFER_CONFIG *src_ybc,
+                           YV12_BUFFER_CONFIG *dst_ybc, int hstart, int hend,
+                           int vstart, int vend);
+  static const copy_fun copy_funs[3] = { aom_yv12_partial_coloc_copy_y,
+                                         aom_yv12_partial_coloc_copy_u,
+                                         aom_yv12_partial_coloc_copy_v };
+  assert(num_planes <= 3);
+  for (int plane = 0; plane < num_planes; ++plane) {
+    if (cm->rst_info[plane].frame_restoration_type == RESTORE_NONE) continue;
+    AV1PixelRect tile_rect = loop_rest_ctxt->ctxt[plane].tile_rect;
+    copy_funs[plane](loop_rest_ctxt->dst, loop_rest_ctxt->frame, tile_rect.left,
+                     tile_rect.right, tile_rect.top, tile_rect.bottom);
+  }
+}
+
+static void foreach_rest_unit_in_planes(AV1LrStruct *lr_ctxt, AV1_COMMON *cm,
+                                        int num_planes) {
+  FilterFrameCtxt *ctxt = lr_ctxt->ctxt;
+
+  for (int plane = 0; plane < num_planes; ++plane) {
+    if (cm->rst_info[plane].frame_restoration_type == RESTORE_NONE) {
+      continue;
+    }
+
+    av1_foreach_rest_unit_in_plane(cm, plane, lr_ctxt->on_rest_unit,
+                                   &ctxt[plane], &ctxt[plane].tile_rect,
+                                   cm->rst_tmpbuf, cm->rlbs);
+  }
+}
+
+void av1_loop_restoration_filter_frame(YV12_BUFFER_CONFIG *frame,
+                                       AV1_COMMON *cm, int optimized_lr,
+                                       void *lr_ctxt) {
+  assert(!cm->features.all_lossless);
+  const int num_planes = av1_num_planes(cm);
+
+  AV1LrStruct *loop_rest_ctxt = (AV1LrStruct *)lr_ctxt;
+
+  av1_loop_restoration_filter_frame_init(loop_rest_ctxt, frame, cm,
+                                         optimized_lr, num_planes);
+
+  foreach_rest_unit_in_planes(loop_rest_ctxt, cm, num_planes);
+
+  av1_loop_restoration_copy_planes(loop_rest_ctxt, cm, num_planes);
+}
+
+void av1_foreach_rest_unit_in_row(
+    RestorationTileLimits *limits, const AV1PixelRect *tile_rect,
+    rest_unit_visitor_t on_rest_unit, int row_number, int unit_size,
+    int unit_idx0, int hunits_per_tile, int vunits_per_tile, int plane,
+    void *priv, int32_t *tmpbuf, RestorationLineBuffers *rlbs,
+    sync_read_fn_t on_sync_read, sync_write_fn_t on_sync_write,
+    struct AV1LrSyncData *const lr_sync) {
+  const int tile_w = tile_rect->right - tile_rect->left;
+  const int ext_size = unit_size * 3 / 2;
+  int x0 = 0, j = 0;
+  while (x0 < tile_w) {
+    int remaining_w = tile_w - x0;
+    int w = (remaining_w < ext_size) ? remaining_w : unit_size;
+
+    limits->h_start = tile_rect->left + x0;
+    limits->h_end = tile_rect->left + x0 + w;
+    assert(limits->h_end <= tile_rect->right);
+
+    const int unit_idx = unit_idx0 + row_number * hunits_per_tile + j;
+
+    // No sync for even numbered rows
+    // For odd numbered rows, Loop Restoration of current block requires the LR
+    // of top-right and bottom-right blocks to be completed
+
+    // top-right sync
+    on_sync_read(lr_sync, row_number, j, plane);
+    if ((row_number + 1) < vunits_per_tile)
+      // bottom-right sync
+      on_sync_read(lr_sync, row_number + 2, j, plane);
+
+    on_rest_unit(limits, tile_rect, unit_idx, priv, tmpbuf, rlbs);
+
+    on_sync_write(lr_sync, row_number, j, hunits_per_tile, plane);
+
+    x0 += w;
+    ++j;
+  }
+}
+
+void av1_lr_sync_read_dummy(void *const lr_sync, int r, int c, int plane) {
+  (void)lr_sync;
+  (void)r;
+  (void)c;
+  (void)plane;
+}
+
+void av1_lr_sync_write_dummy(void *const lr_sync, int r, int c,
+                             const int sb_cols, int plane) {
+  (void)lr_sync;
+  (void)r;
+  (void)c;
+  (void)sb_cols;
+  (void)plane;
+}
+
+static void foreach_rest_unit_in_tile(
+    const AV1PixelRect *tile_rect, int tile_row, int tile_col, int tile_cols,
+    int hunits_per_tile, int vunits_per_tile, int units_per_tile, int unit_size,
+    int ss_y, int plane, rest_unit_visitor_t on_rest_unit, void *priv,
+    int32_t *tmpbuf, RestorationLineBuffers *rlbs) {
+  const int tile_h = tile_rect->bottom - tile_rect->top;
+  const int ext_size = unit_size * 3 / 2;
+
+  const int tile_idx = tile_col + tile_row * tile_cols;
+  const int unit_idx0 = tile_idx * units_per_tile;
+
+  int y0 = 0, i = 0;
+  while (y0 < tile_h) {
+    int remaining_h = tile_h - y0;
+    int h = (remaining_h < ext_size) ? remaining_h : unit_size;
+
+    RestorationTileLimits limits;
+    limits.v_start = tile_rect->top + y0;
+    limits.v_end = tile_rect->top + y0 + h;
+    assert(limits.v_end <= tile_rect->bottom);
+    // Offset the tile upwards to align with the restoration processing stripe
+    const int voffset = RESTORATION_UNIT_OFFSET >> ss_y;
+    limits.v_start = AOMMAX(tile_rect->top, limits.v_start - voffset);
+    if (limits.v_end < tile_rect->bottom) limits.v_end -= voffset;
+
+    av1_foreach_rest_unit_in_row(
+        &limits, tile_rect, on_rest_unit, i, unit_size, unit_idx0,
+        hunits_per_tile, vunits_per_tile, plane, priv, tmpbuf, rlbs,
+        av1_lr_sync_read_dummy, av1_lr_sync_write_dummy, NULL);
+
+    y0 += h;
+    ++i;
+  }
+}
+
+void av1_foreach_rest_unit_in_plane(const struct AV1Common *cm, int plane,
+                                    rest_unit_visitor_t on_rest_unit,
+                                    void *priv, AV1PixelRect *tile_rect,
+                                    int32_t *tmpbuf,
+                                    RestorationLineBuffers *rlbs) {
+  const int is_uv = plane > 0;
+  const int ss_y = is_uv && cm->seq_params.subsampling_y;
+
+  const RestorationInfo *rsi = &cm->rst_info[plane];
+
+  foreach_rest_unit_in_tile(tile_rect, LR_TILE_ROW, LR_TILE_COL, LR_TILE_COLS,
+                            rsi->horz_units_per_tile, rsi->vert_units_per_tile,
+                            rsi->units_per_tile, rsi->restoration_unit_size,
+                            ss_y, plane, on_rest_unit, priv, tmpbuf, rlbs);
+}
+
+int av1_loop_restoration_corners_in_sb(const struct AV1Common *cm, int plane,
+                                       int mi_row, int mi_col, BLOCK_SIZE bsize,
+                                       int *rcol0, int *rcol1, int *rrow0,
+                                       int *rrow1) {
+  assert(rcol0 && rcol1 && rrow0 && rrow1);
+
+  if (bsize != cm->seq_params.sb_size) return 0;
+  if (cm->rst_info[plane].frame_restoration_type == RESTORE_NONE) return 0;
+
+  assert(!cm->features.all_lossless);
+
+  const int is_uv = plane > 0;
+
+  const AV1PixelRect tile_rect = av1_whole_frame_rect(cm, is_uv);
+  const int tile_w = tile_rect.right - tile_rect.left;
+  const int tile_h = tile_rect.bottom - tile_rect.top;
+
+  const int mi_top = 0;
+  const int mi_left = 0;
+
+  // Compute the mi-unit corners of the superblock relative to the top-left of
+  // the tile
+  const int mi_rel_row0 = mi_row - mi_top;
+  const int mi_rel_col0 = mi_col - mi_left;
+  const int mi_rel_row1 = mi_rel_row0 + mi_size_high[bsize];
+  const int mi_rel_col1 = mi_rel_col0 + mi_size_wide[bsize];
+
+  const RestorationInfo *rsi = &cm->rst_info[plane];
+  const int size = rsi->restoration_unit_size;
+
+  // Calculate the number of restoration units in this tile (which might be
+  // strictly less than rsi->horz_units_per_tile and rsi->vert_units_per_tile)
+  const int horz_units = av1_lr_count_units_in_tile(size, tile_w);
+  const int vert_units = av1_lr_count_units_in_tile(size, tile_h);
+
+  // The size of an MI-unit on this plane of the image
+  const int ss_x = is_uv && cm->seq_params.subsampling_x;
+  const int ss_y = is_uv && cm->seq_params.subsampling_y;
+  const int mi_size_x = MI_SIZE >> ss_x;
+  const int mi_size_y = MI_SIZE >> ss_y;
+
+  // Write m for the relative mi column or row, D for the superres denominator
+  // and N for the superres numerator. If u is the upscaled pixel offset then
+  // we can write the downscaled pixel offset in two ways as:
+  //
+  //   MI_SIZE * m = N / D u
+  //
+  // from which we get u = D * MI_SIZE * m / N
+  const int mi_to_num_x = av1_superres_scaled(cm)
+                              ? mi_size_x * cm->superres_scale_denominator
+                              : mi_size_x;
+  const int mi_to_num_y = mi_size_y;
+  const int denom_x = av1_superres_scaled(cm) ? size * SCALE_NUMERATOR : size;
+  const int denom_y = size;
+
+  const int rnd_x = denom_x - 1;
+  const int rnd_y = denom_y - 1;
+
+  // rcol0/rrow0 should be the first column/row of restoration units (relative
+  // to the top-left of the tile) that doesn't start left/below of
+  // mi_col/mi_row. For this calculation, we need to round up the division (if
+  // the sb starts at runit column 10.1, the first matching runit has column
+  // index 11)
+  *rcol0 = (mi_rel_col0 * mi_to_num_x + rnd_x) / denom_x;
+  *rrow0 = (mi_rel_row0 * mi_to_num_y + rnd_y) / denom_y;
+
+  // rel_col1/rel_row1 is the equivalent calculation, but for the superblock
+  // below-right. If we're at the bottom or right of the tile, this restoration
+  // unit might not exist, in which case we'll clamp accordingly.
+  *rcol1 = AOMMIN((mi_rel_col1 * mi_to_num_x + rnd_x) / denom_x, horz_units);
+  *rrow1 = AOMMIN((mi_rel_row1 * mi_to_num_y + rnd_y) / denom_y, vert_units);
+
+  return *rcol0 < *rcol1 && *rrow0 < *rrow1;
+}
+
+// Extend to left and right
+static void extend_lines(uint8_t *buf, int width, int height, int stride,
+                         int extend, int use_highbitdepth) {
+  for (int i = 0; i < height; ++i) {
+    if (use_highbitdepth) {
+      uint16_t *buf16 = (uint16_t *)buf;
+      aom_memset16(buf16 - extend, buf16[0], extend);
+      aom_memset16(buf16 + width, buf16[width - 1], extend);
+    } else {
+      memset(buf - extend, buf[0], extend);
+      memset(buf + width, buf[width - 1], extend);
+    }
+    buf += stride;
+  }
+}
+
+static void save_deblock_boundary_lines(
+    const YV12_BUFFER_CONFIG *frame, const AV1_COMMON *cm, int plane, int row,
+    int stripe, int use_highbd, int is_above,
+    RestorationStripeBoundaries *boundaries) {
+  const int is_uv = plane > 0;
+  const uint8_t *src_buf = REAL_PTR(use_highbd, frame->buffers[plane]);
+  const int src_stride = frame->strides[is_uv] << use_highbd;
+  const uint8_t *src_rows = src_buf + row * src_stride;
+
+  uint8_t *bdry_buf = is_above ? boundaries->stripe_boundary_above
+                               : boundaries->stripe_boundary_below;
+  uint8_t *bdry_start = bdry_buf + (RESTORATION_EXTRA_HORZ << use_highbd);
+  const int bdry_stride = boundaries->stripe_boundary_stride << use_highbd;
+  uint8_t *bdry_rows = bdry_start + RESTORATION_CTX_VERT * stripe * bdry_stride;
+
+  // There is a rare case in which a processing stripe can end 1px above the
+  // crop border. In this case, we do want to use deblocked pixels from below
+  // the stripe (hence why we ended up in this function), but instead of
+  // fetching 2 "below" rows we need to fetch one and duplicate it.
+  // This is equivalent to clamping the sample locations against the crop border
+  const int lines_to_save =
+      AOMMIN(RESTORATION_CTX_VERT, frame->crop_heights[is_uv] - row);
+  assert(lines_to_save == 1 || lines_to_save == 2);
+
+  int upscaled_width;
+  int line_bytes;
+  if (av1_superres_scaled(cm)) {
+    const int ss_x = is_uv && cm->seq_params.subsampling_x;
+    upscaled_width = (cm->superres_upscaled_width + ss_x) >> ss_x;
+    line_bytes = upscaled_width << use_highbd;
+    if (use_highbd)
+      av1_upscale_normative_rows(
+          cm, CONVERT_TO_BYTEPTR(src_rows), frame->strides[is_uv],
+          CONVERT_TO_BYTEPTR(bdry_rows), boundaries->stripe_boundary_stride,
+          plane, lines_to_save);
+    else
+      av1_upscale_normative_rows(cm, src_rows, frame->strides[is_uv], bdry_rows,
+                                 boundaries->stripe_boundary_stride, plane,
+                                 lines_to_save);
+  } else {
+    upscaled_width = frame->crop_widths[is_uv];
+    line_bytes = upscaled_width << use_highbd;
+    for (int i = 0; i < lines_to_save; i++) {
+      memcpy(bdry_rows + i * bdry_stride, src_rows + i * src_stride,
+             line_bytes);
+    }
+  }
+  // If we only saved one line, then copy it into the second line buffer
+  if (lines_to_save == 1)
+    memcpy(bdry_rows + bdry_stride, bdry_rows, line_bytes);
+
+  extend_lines(bdry_rows, upscaled_width, RESTORATION_CTX_VERT, bdry_stride,
+               RESTORATION_EXTRA_HORZ, use_highbd);
+}
+
+static void save_cdef_boundary_lines(const YV12_BUFFER_CONFIG *frame,
+                                     const AV1_COMMON *cm, int plane, int row,
+                                     int stripe, int use_highbd, int is_above,
+                                     RestorationStripeBoundaries *boundaries) {
+  const int is_uv = plane > 0;
+  const uint8_t *src_buf = REAL_PTR(use_highbd, frame->buffers[plane]);
+  const int src_stride = frame->strides[is_uv] << use_highbd;
+  const uint8_t *src_rows = src_buf + row * src_stride;
+
+  uint8_t *bdry_buf = is_above ? boundaries->stripe_boundary_above
+                               : boundaries->stripe_boundary_below;
+  uint8_t *bdry_start = bdry_buf + (RESTORATION_EXTRA_HORZ << use_highbd);
+  const int bdry_stride = boundaries->stripe_boundary_stride << use_highbd;
+  uint8_t *bdry_rows = bdry_start + RESTORATION_CTX_VERT * stripe * bdry_stride;
+  const int src_width = frame->crop_widths[is_uv];
+
+  // At the point where this function is called, we've already applied
+  // superres. So we don't need to extend the lines here, we can just
+  // pull directly from the topmost row of the upscaled frame.
+  const int ss_x = is_uv && cm->seq_params.subsampling_x;
+  const int upscaled_width = av1_superres_scaled(cm)
+                                 ? (cm->superres_upscaled_width + ss_x) >> ss_x
+                                 : src_width;
+  const int line_bytes = upscaled_width << use_highbd;
+  for (int i = 0; i < RESTORATION_CTX_VERT; i++) {
+    // Copy the line at 'row' into both context lines. This is because
+    // we want to (effectively) extend the outermost row of CDEF data
+    // from this tile to produce a border, rather than using deblocked
+    // pixels from the tile above/below.
+    memcpy(bdry_rows + i * bdry_stride, src_rows, line_bytes);
+  }
+  extend_lines(bdry_rows, upscaled_width, RESTORATION_CTX_VERT, bdry_stride,
+               RESTORATION_EXTRA_HORZ, use_highbd);
+}
+
+static void save_tile_row_boundary_lines(const YV12_BUFFER_CONFIG *frame,
+                                         int use_highbd, int plane,
+                                         AV1_COMMON *cm, int after_cdef) {
+  const int is_uv = plane > 0;
+  const int ss_y = is_uv && cm->seq_params.subsampling_y;
+  const int stripe_height = RESTORATION_PROC_UNIT_SIZE >> ss_y;
+  const int stripe_off = RESTORATION_UNIT_OFFSET >> ss_y;
+
+  // Get the tile rectangle, with height rounded up to the next multiple of 8
+  // luma pixels (only relevant for the bottom tile of the frame)
+  const AV1PixelRect tile_rect = av1_whole_frame_rect(cm, is_uv);
+  const int stripe0 = 0;
+
+  RestorationStripeBoundaries *boundaries = &cm->rst_info[plane].boundaries;
+
+  const int plane_height = ROUND_POWER_OF_TWO(cm->height, ss_y);
+
+  int tile_stripe;
+  for (tile_stripe = 0;; ++tile_stripe) {
+    const int rel_y0 = AOMMAX(0, tile_stripe * stripe_height - stripe_off);
+    const int y0 = tile_rect.top + rel_y0;
+    if (y0 >= tile_rect.bottom) break;
+
+    const int rel_y1 = (tile_stripe + 1) * stripe_height - stripe_off;
+    const int y1 = AOMMIN(tile_rect.top + rel_y1, tile_rect.bottom);
+
+    const int frame_stripe = stripe0 + tile_stripe;
+
+    // In this case, we should only use CDEF pixels at the top
+    // and bottom of the frame as a whole; internal tile boundaries
+    // can use deblocked pixels from adjacent tiles for context.
+    const int use_deblock_above = (frame_stripe > 0);
+    const int use_deblock_below = (y1 < plane_height);
+
+    if (!after_cdef) {
+      // Save deblocked context where needed.
+      if (use_deblock_above) {
+        save_deblock_boundary_lines(frame, cm, plane, y0 - RESTORATION_CTX_VERT,
+                                    frame_stripe, use_highbd, 1, boundaries);
+      }
+      if (use_deblock_below) {
+        save_deblock_boundary_lines(frame, cm, plane, y1, frame_stripe,
+                                    use_highbd, 0, boundaries);
+      }
+    } else {
+      // Save CDEF context where needed. Note that we need to save the CDEF
+      // context for a particular boundary iff we *didn't* save deblocked
+      // context for that boundary.
+      //
+      // In addition, we need to save copies of the outermost line within
+      // the tile, rather than using data from outside the tile.
+      if (!use_deblock_above) {
+        save_cdef_boundary_lines(frame, cm, plane, y0, frame_stripe, use_highbd,
+                                 1, boundaries);
+      }
+      if (!use_deblock_below) {
+        save_cdef_boundary_lines(frame, cm, plane, y1 - 1, frame_stripe,
+                                 use_highbd, 0, boundaries);
+      }
+    }
+  }
+}
+
+// For each RESTORATION_PROC_UNIT_SIZE pixel high stripe, save 4 scan
+// lines to be used as boundary in the loop restoration process. The
+// lines are saved in rst_internal.stripe_boundary_lines
+void av1_loop_restoration_save_boundary_lines(const YV12_BUFFER_CONFIG *frame,
+                                              AV1_COMMON *cm, int after_cdef) {
+  const int num_planes = av1_num_planes(cm);
+  const int use_highbd = cm->seq_params.use_highbitdepth;
+  for (int p = 0; p < num_planes; ++p) {
+    save_tile_row_boundary_lines(frame, use_highbd, p, cm, after_cdef);
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.h
new file mode 100644
index 0000000000..afba87ec10
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.h
@@ -0,0 +1,487 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_RESTORATION_H_
+#define AOM_AV1_COMMON_RESTORATION_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*! @file */
+
+/*!\cond */
+
+// Border for Loop restoration buffer
+#define AOM_RESTORATION_FRAME_BORDER 32
+#define CLIP(x, lo, hi) ((x) < (lo) ? (lo) : (x) > (hi) ? (hi) : (x))
+#define RINT(x) ((x) < 0 ? (int)((x)-0.5) : (int)((x) + 0.5))
+
+#define RESTORATION_PROC_UNIT_SIZE 64
+
+// Filter tile grid offset upwards compared to the superblock grid
+#define RESTORATION_UNIT_OFFSET 8
+
+#define SGRPROJ_BORDER_VERT 3  // Vertical border used for Sgr
+#define SGRPROJ_BORDER_HORZ 3  // Horizontal border used for Sgr
+
+#define WIENER_BORDER_VERT 2  // Vertical border used for Wiener
+#define WIENER_HALFWIN 3
+#define WIENER_BORDER_HORZ (WIENER_HALFWIN)  // Horizontal border for Wiener
+
+// RESTORATION_BORDER_VERT determines line buffer requirement for LR.
+// Should be set at the max of SGRPROJ_BORDER_VERT and WIENER_BORDER_VERT.
+// Note the line buffer needed is twice the value of this macro.
+#if SGRPROJ_BORDER_VERT >= WIENER_BORDER_VERT
+#define RESTORATION_BORDER_VERT (SGRPROJ_BORDER_VERT)
+#else
+#define RESTORATION_BORDER_VERT (WIENER_BORDER_VERT)
+#endif  // SGRPROJ_BORDER_VERT >= WIENER_BORDER_VERT
+
+#if SGRPROJ_BORDER_HORZ >= WIENER_BORDER_HORZ
+#define RESTORATION_BORDER_HORZ (SGRPROJ_BORDER_HORZ)
+#else
+#define RESTORATION_BORDER_HORZ (WIENER_BORDER_HORZ)
+#endif  // SGRPROJ_BORDER_VERT >= WIENER_BORDER_VERT
+
+// How many border pixels do we need for each processing unit?
+#define RESTORATION_BORDER 3
+
+// How many rows of deblocked pixels do we save above/below each processing
+// stripe?
+#define RESTORATION_CTX_VERT 2
+
+// Additional pixels to the left and right in above/below buffers
+// It is RESTORATION_BORDER_HORZ rounded up to get nicer buffer alignment
+#define RESTORATION_EXTRA_HORZ 4
+
+// Pad up to 20 more (may be much less is needed)
+#define RESTORATION_PADDING 20
+#define RESTORATION_PROC_UNIT_PELS                             \
+  ((RESTORATION_PROC_UNIT_SIZE + RESTORATION_BORDER_HORZ * 2 + \
+    RESTORATION_PADDING) *                                     \
+   (RESTORATION_PROC_UNIT_SIZE + RESTORATION_BORDER_VERT * 2 + \
+    RESTORATION_PADDING))
+
+#define RESTORATION_UNITSIZE_MAX 256
+#define RESTORATION_UNITPELS_HORZ_MAX \
+  (RESTORATION_UNITSIZE_MAX * 3 / 2 + 2 * RESTORATION_BORDER_HORZ + 16)
+#define RESTORATION_UNITPELS_VERT_MAX                                \
+  ((RESTORATION_UNITSIZE_MAX * 3 / 2 + 2 * RESTORATION_BORDER_VERT + \
+    RESTORATION_UNIT_OFFSET))
+#define RESTORATION_UNITPELS_MAX \
+  (RESTORATION_UNITPELS_HORZ_MAX * RESTORATION_UNITPELS_VERT_MAX)
+
+// Two 32-bit buffers needed for the restored versions from two filters
+// TODO(debargha, rupert): Refactor to not need the large tilesize to be stored
+// on the decoder side.
+#define SGRPROJ_TMPBUF_SIZE (RESTORATION_UNITPELS_MAX * 2 * sizeof(int32_t))
+
+#define SGRPROJ_EXTBUF_SIZE (0)
+#define SGRPROJ_PARAMS_BITS 4
+#define SGRPROJ_PARAMS (1 << SGRPROJ_PARAMS_BITS)
+
+// Precision bits for projection
+#define SGRPROJ_PRJ_BITS 7
+// Restoration precision bits generated higher than source before projection
+#define SGRPROJ_RST_BITS 4
+// Internal precision bits for core selfguided_restoration
+#define SGRPROJ_SGR_BITS 8
+#define SGRPROJ_SGR (1 << SGRPROJ_SGR_BITS)
+
+#define SGRPROJ_PRJ_MIN0 (-(1 << SGRPROJ_PRJ_BITS) * 3 / 4)
+#define SGRPROJ_PRJ_MAX0 (SGRPROJ_PRJ_MIN0 + (1 << SGRPROJ_PRJ_BITS) - 1)
+#define SGRPROJ_PRJ_MIN1 (-(1 << SGRPROJ_PRJ_BITS) / 4)
+#define SGRPROJ_PRJ_MAX1 (SGRPROJ_PRJ_MIN1 + (1 << SGRPROJ_PRJ_BITS) - 1)
+
+#define SGRPROJ_PRJ_SUBEXP_K 4
+
+#define SGRPROJ_BITS (SGRPROJ_PRJ_BITS * 2 + SGRPROJ_PARAMS_BITS)
+
+#define MAX_RADIUS 2  // Only 1, 2, 3 allowed
+#define MAX_NELEM ((2 * MAX_RADIUS + 1) * (2 * MAX_RADIUS + 1))
+#define SGRPROJ_MTABLE_BITS 20
+#define SGRPROJ_RECIP_BITS 12
+
+#define WIENER_HALFWIN1 (WIENER_HALFWIN + 1)
+#define WIENER_WIN (2 * WIENER_HALFWIN + 1)
+#define WIENER_WIN2 ((WIENER_WIN) * (WIENER_WIN))
+#define WIENER_TMPBUF_SIZE (0)
+#define WIENER_EXTBUF_SIZE (0)
+
+// If WIENER_WIN_CHROMA == WIENER_WIN - 2, that implies 5x5 filters are used for
+// chroma. To use 7x7 for chroma set WIENER_WIN_CHROMA to WIENER_WIN.
+#define WIENER_WIN_CHROMA (WIENER_WIN - 2)
+#define WIENER_WIN_REDUCED (WIENER_WIN - 2)
+#define WIENER_WIN2_CHROMA ((WIENER_WIN_CHROMA) * (WIENER_WIN_CHROMA))
+
+#define WIENER_FILT_PREC_BITS 7
+#define WIENER_FILT_STEP (1 << WIENER_FILT_PREC_BITS)
+
+// Central values for the taps
+#define WIENER_FILT_TAP0_MIDV (3)
+#define WIENER_FILT_TAP1_MIDV (-7)
+#define WIENER_FILT_TAP2_MIDV (15)
+#define WIENER_FILT_TAP3_MIDV                                              \
+  (WIENER_FILT_STEP - 2 * (WIENER_FILT_TAP0_MIDV + WIENER_FILT_TAP1_MIDV + \
+                           WIENER_FILT_TAP2_MIDV))
+
+#define WIENER_FILT_TAP0_BITS 4
+#define WIENER_FILT_TAP1_BITS 5
+#define WIENER_FILT_TAP2_BITS 6
+
+#define WIENER_FILT_BITS \
+  ((WIENER_FILT_TAP0_BITS + WIENER_FILT_TAP1_BITS + WIENER_FILT_TAP2_BITS) * 2)
+
+#define WIENER_FILT_TAP0_MINV \
+  (WIENER_FILT_TAP0_MIDV - (1 << WIENER_FILT_TAP0_BITS) / 2)
+#define WIENER_FILT_TAP1_MINV \
+  (WIENER_FILT_TAP1_MIDV - (1 << WIENER_FILT_TAP1_BITS) / 2)
+#define WIENER_FILT_TAP2_MINV \
+  (WIENER_FILT_TAP2_MIDV - (1 << WIENER_FILT_TAP2_BITS) / 2)
+
+#define WIENER_FILT_TAP0_MAXV \
+  (WIENER_FILT_TAP0_MIDV - 1 + (1 << WIENER_FILT_TAP0_BITS) / 2)
+#define WIENER_FILT_TAP1_MAXV \
+  (WIENER_FILT_TAP1_MIDV - 1 + (1 << WIENER_FILT_TAP1_BITS) / 2)
+#define WIENER_FILT_TAP2_MAXV \
+  (WIENER_FILT_TAP2_MIDV - 1 + (1 << WIENER_FILT_TAP2_BITS) / 2)
+
+#define WIENER_FILT_TAP0_SUBEXP_K 1
+#define WIENER_FILT_TAP1_SUBEXP_K 2
+#define WIENER_FILT_TAP2_SUBEXP_K 3
+
+// Max of SGRPROJ_TMPBUF_SIZE, DOMAINTXFMRF_TMPBUF_SIZE, WIENER_TMPBUF_SIZE
+#define RESTORATION_TMPBUF_SIZE (SGRPROJ_TMPBUF_SIZE)
+
+// Max of SGRPROJ_EXTBUF_SIZE, WIENER_EXTBUF_SIZE
+#define RESTORATION_EXTBUF_SIZE (WIENER_EXTBUF_SIZE)
+
+// Check the assumptions of the existing code
+#if SUBPEL_TAPS != WIENER_WIN + 1
+#error "Wiener filter currently only works if SUBPEL_TAPS == WIENER_WIN + 1"
+#endif
+#if WIENER_FILT_PREC_BITS != 7
+#error "Wiener filter currently only works if WIENER_FILT_PREC_BITS == 7"
+#endif
+
+#define LR_TILE_ROW 0
+#define LR_TILE_COL 0
+#define LR_TILE_COLS 1
+
+typedef struct {
+  int r[2];  // radii
+  int s[2];  // sgr parameters for r[0] and r[1], based on GenSgrprojVtable()
+} sgr_params_type;
+/*!\endcond */
+
+/*!\brief Parameters related to Restoration Unit Info */
+typedef struct {
+  /*!
+   * restoration type
+   */
+  RestorationType restoration_type;
+
+  /*!
+   * Wiener filter parameters if restoration_type indicates Wiener
+   */
+  WienerInfo wiener_info;
+
+  /*!
+   * Sgrproj filter parameters if restoration_type indicates Sgrproj
+   */
+  SgrprojInfo sgrproj_info;
+} RestorationUnitInfo;
+
+/*!\cond */
+
+// A restoration line buffer needs space for two lines plus a horizontal filter
+// margin of RESTORATION_EXTRA_HORZ on each side.
+#define RESTORATION_LINEBUFFER_WIDTH \
+  (RESTORATION_UNITSIZE_MAX * 3 / 2 + 2 * RESTORATION_EXTRA_HORZ)
+
+// Similarly, the column buffers (used when we're at a vertical tile edge
+// that we can't filter across) need space for one processing unit's worth
+// of pixels, plus the top/bottom border width
+#define RESTORATION_COLBUFFER_HEIGHT \
+  (RESTORATION_PROC_UNIT_SIZE + 2 * RESTORATION_BORDER)
+
+typedef struct {
+  // Temporary buffers to save/restore 3 lines above/below the restoration
+  // stripe.
+  uint16_t tmp_save_above[RESTORATION_BORDER][RESTORATION_LINEBUFFER_WIDTH];
+  uint16_t tmp_save_below[RESTORATION_BORDER][RESTORATION_LINEBUFFER_WIDTH];
+} RestorationLineBuffers;
+/*!\endcond */
+
+/*!\brief Parameters related to Restoration Stripe boundaries */
+typedef struct {
+  /*!
+   * stripe boundary above
+   */
+  uint8_t *stripe_boundary_above;
+
+  /*!
+   * stripe boundary below
+   */
+  uint8_t *stripe_boundary_below;
+
+  /*!
+   * strides for stripe boundaries above and below
+   */
+  int stripe_boundary_stride;
+
+  /*!
+   * size of stripe boundaries above and below
+   */
+  int stripe_boundary_size;
+} RestorationStripeBoundaries;
+
+/*!\brief Parameters related to Restoration Info */
+typedef struct {
+  /*!
+   * Restoration type for frame
+   */
+  RestorationType frame_restoration_type;
+
+  /*!
+   * Restoration unit size
+   */
+  int restoration_unit_size;
+
+  /**
+   * \name Fields allocated and initialised by av1_alloc_restoration_struct.
+   * (horz_)units_per_tile give the number of restoration units in
+   * (one row of) the largest tile in the frame.
+   */
+  /**@{*/
+  /*!
+   * Number of units per tile for the largest tile in the frame
+   */
+  int units_per_tile;
+
+  /*!
+   * Number of vertical units per tile
+   */
+  int vert_units_per_tile;
+
+  /*!
+   * Number of horizontal units per tile for the largest tile in the frame
+   */
+  int horz_units_per_tile;
+  /**@}*/
+
+  /*!
+   * List of info for units in tile.
+   * The data in unit_info is laid out with units_per_tile entries for each
+   * tile, which have stride horz_units_per_tile.
+   * Even if there are tiles of different sizes, the data in unit_info is
+   * laid out as if all tiles are of full size.
+   */
+  RestorationUnitInfo *unit_info;
+
+  /*!
+   * Restoration Stripe boundary info
+   */
+  RestorationStripeBoundaries boundaries;
+
+  /*!
+   * Whether optimized lr can be used for speed.
+   * That includes cases of no cdef and no superres, or if fast trial runs
+   * are used on the encoder side.
+   */
+  int optimized_lr;
+} RestorationInfo;
+
+/*!\cond */
+
+static INLINE void set_default_sgrproj(SgrprojInfo *sgrproj_info) {
+  sgrproj_info->xqd[0] = (SGRPROJ_PRJ_MIN0 + SGRPROJ_PRJ_MAX0) / 2;
+  sgrproj_info->xqd[1] = (SGRPROJ_PRJ_MIN1 + SGRPROJ_PRJ_MAX1) / 2;
+}
+
+static INLINE void set_default_wiener(WienerInfo *wiener_info) {
+  wiener_info->vfilter[0] = wiener_info->hfilter[0] = WIENER_FILT_TAP0_MIDV;
+  wiener_info->vfilter[1] = wiener_info->hfilter[1] = WIENER_FILT_TAP1_MIDV;
+  wiener_info->vfilter[2] = wiener_info->hfilter[2] = WIENER_FILT_TAP2_MIDV;
+  wiener_info->vfilter[WIENER_HALFWIN] = wiener_info->hfilter[WIENER_HALFWIN] =
+      -2 *
+      (WIENER_FILT_TAP2_MIDV + WIENER_FILT_TAP1_MIDV + WIENER_FILT_TAP0_MIDV);
+  wiener_info->vfilter[4] = wiener_info->hfilter[4] = WIENER_FILT_TAP2_MIDV;
+  wiener_info->vfilter[5] = wiener_info->hfilter[5] = WIENER_FILT_TAP1_MIDV;
+  wiener_info->vfilter[6] = wiener_info->hfilter[6] = WIENER_FILT_TAP0_MIDV;
+}
+
+typedef struct {
+  int h_start, h_end, v_start, v_end;
+} RestorationTileLimits;
+
+typedef void (*rest_unit_visitor_t)(const RestorationTileLimits *limits,
+                                    const AV1PixelRect *tile_rect,
+                                    int rest_unit_idx, void *priv,
+                                    int32_t *tmpbuf,
+                                    RestorationLineBuffers *rlbs);
+
+typedef struct FilterFrameCtxt {
+  const RestorationInfo *rsi;
+  int tile_stripe0;
+  int ss_x, ss_y;
+  int highbd, bit_depth;
+  uint8_t *data8, *dst8;
+  int data_stride, dst_stride;
+  AV1PixelRect tile_rect;
+} FilterFrameCtxt;
+
+typedef struct AV1LrStruct {
+  rest_unit_visitor_t on_rest_unit;
+  FilterFrameCtxt ctxt[MAX_MB_PLANE];
+  YV12_BUFFER_CONFIG *frame;
+  YV12_BUFFER_CONFIG *dst;
+} AV1LrStruct;
+
+extern const sgr_params_type av1_sgr_params[SGRPROJ_PARAMS];
+extern int sgrproj_mtable[SGRPROJ_PARAMS][2];
+extern const int32_t av1_x_by_xplus1[256];
+extern const int32_t av1_one_by_x[MAX_NELEM];
+
+void av1_alloc_restoration_struct(struct AV1Common *cm, RestorationInfo *rsi,
+                                  int is_uv);
+void av1_free_restoration_struct(RestorationInfo *rst_info);
+
+void av1_extend_frame(uint8_t *data, int width, int height, int stride,
+                      int border_horz, int border_vert, int highbd);
+void av1_decode_xq(const int *xqd, int *xq, const sgr_params_type *params);
+
+/*!\endcond */
+
+/*!\brief Function for applying loop restoration filter to a single unit.
+ *
+ * \ingroup in_loop_restoration
+ * This function applies the loop restoration filter to a single
+ * loop restoration unit.
+ *
+ * \param[in]  limits        Limits of the unit
+ * \param[in]  rui           The parameters to use for this unit and its
+ *                           coefficients
+ * \param[in]  rsb           Deblocked pixels to use for stripe boundaries
+ * \param[in]  rlbs          Space to use as a scratch buffer
+ * \param[in]  tile_rect     Limits of the tile containing this unit
+ * \param[in]  tile_stripe0  Index of the first stripe in this tile
+ * \param[in]  ss_x          Horizontal subsampling for plane
+ * \param[in]  ss_y          Vertical subsampling for plane
+ * \param[in]  highbd        Whether high bitdepth pipeline is used
+ * \param[in]  bit_depth     Bit-depth of the video
+ * \param[in]  data8         Frame data (pointing at the top-left corner of
+ *                           the frame, not the restoration unit).
+ * \param[in]  stride        Stride of \c data8
+ * \param[out] dst8          Buffer where the results will be written. Like
+ *                           \c data8, \c dst8 should point at the top-left
+ *                           corner of the frame
+ * \param[in]  dst_stride    Stride of \c dst8
+ * \param[in]  tmpbuf        Scratch buffer used by the sgrproj filter which
+ *                           should be at least SGRPROJ_TMPBUF_SIZE big.
+ * \param[in]  optimized_lr  Whether to use fast optimized Loop Restoration
+ *
+ * \return Nothing is returned. Instead, the filtered unit is output in
+ * \c dst8 at the proper restoration unit offset.
+ */
+void av1_loop_restoration_filter_unit(
+    const RestorationTileLimits *limits, const RestorationUnitInfo *rui,
+    const RestorationStripeBoundaries *rsb, RestorationLineBuffers *rlbs,
+    const AV1PixelRect *tile_rect, int tile_stripe0, int ss_x, int ss_y,
+    int highbd, int bit_depth, uint8_t *data8, int stride, uint8_t *dst8,
+    int dst_stride, int32_t *tmpbuf, int optimized_lr);
+
+/*!\brief Function for applying loop restoration filter to a frame
+ *
+ * \ingroup in_loop_restoration
+ * This function applies the loop restoration filter to a frame.
+ *
+ * \param[in, out]  frame         Compressed frame buffer
+ * \param[in, out]  cm            Pointer to top level common structure
+ * \param[in]       optimized_lr  Whether to use fast optimized Loop Restoration
+ * \param[in]       lr_ctxt       Loop restoration context
+ *
+ * \return Nothing is returned. Instead, the filtered frame is output in
+ * \c frame.
+ */
+void av1_loop_restoration_filter_frame(YV12_BUFFER_CONFIG *frame,
+                                       struct AV1Common *cm, int optimized_lr,
+                                       void *lr_ctxt);
+/*!\cond */
+
+void av1_loop_restoration_precal();
+
+typedef void (*rest_tile_start_visitor_t)(int tile_row, int tile_col,
+                                          void *priv);
+struct AV1LrSyncData;
+
+typedef void (*sync_read_fn_t)(void *const lr_sync, int r, int c, int plane);
+
+typedef void (*sync_write_fn_t)(void *const lr_sync, int r, int c,
+                                const int sb_cols, int plane);
+
+// Call on_rest_unit for each loop restoration unit in the plane.
+void av1_foreach_rest_unit_in_plane(const struct AV1Common *cm, int plane,
+                                    rest_unit_visitor_t on_rest_unit,
+                                    void *priv, AV1PixelRect *tile_rect,
+                                    int32_t *tmpbuf,
+                                    RestorationLineBuffers *rlbs);
+
+// Return 1 iff the block at mi_row, mi_col with size bsize is a
+// top-level superblock containing the top-left corner of at least one
+// loop restoration unit.
+//
+// If the block is a top-level superblock, the function writes to
+// *rcol0, *rcol1, *rrow0, *rrow1. The rectangle of restoration unit
+// indices given by [*rcol0, *rcol1) x [*rrow0, *rrow1) are relative
+// to the current tile, whose starting index is returned as
+// *tile_tl_idx.
+int av1_loop_restoration_corners_in_sb(const struct AV1Common *cm, int plane,
+                                       int mi_row, int mi_col, BLOCK_SIZE bsize,
+                                       int *rcol0, int *rcol1, int *rrow0,
+                                       int *rrow1);
+
+void av1_loop_restoration_save_boundary_lines(const YV12_BUFFER_CONFIG *frame,
+                                              struct AV1Common *cm,
+                                              int after_cdef);
+void av1_loop_restoration_filter_frame_init(AV1LrStruct *lr_ctxt,
+                                            YV12_BUFFER_CONFIG *frame,
+                                            struct AV1Common *cm,
+                                            int optimized_lr, int num_planes);
+void av1_loop_restoration_copy_planes(AV1LrStruct *loop_rest_ctxt,
+                                      struct AV1Common *cm, int num_planes);
+void av1_foreach_rest_unit_in_row(
+    RestorationTileLimits *limits, const AV1PixelRect *tile_rect,
+    rest_unit_visitor_t on_rest_unit, int row_number, int unit_size,
+    int unit_idx0, int hunits_per_tile, int vunits_per_tile, int plane,
+    void *priv, int32_t *tmpbuf, RestorationLineBuffers *rlbs,
+    sync_read_fn_t on_sync_read, sync_write_fn_t on_sync_write,
+    struct AV1LrSyncData *const lr_sync);
+AV1PixelRect av1_whole_frame_rect(const struct AV1Common *cm, int is_uv);
+int av1_lr_count_units_in_tile(int unit_size, int tile_size);
+void av1_lr_sync_read_dummy(void *const lr_sync, int r, int c, int plane);
+void av1_lr_sync_write_dummy(void *const lr_sync, int r, int c,
+                             const int sb_cols, int plane);
+
+/*!\endcond */
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_RESTORATION_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/scale.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/scale.h
new file mode 100644
index 0000000000..ef270fde06
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/scale.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_SCALE_H_
+#define AOM_AV1_COMMON_SCALE_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mv.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SCALE_NUMERATOR 8
+
+#define REF_SCALE_SHIFT 14
+#define REF_NO_SCALE (1 << REF_SCALE_SHIFT)
+#define REF_INVALID_SCALE -1
+
+struct scale_factors {
+  int x_scale_fp;  // horizontal fixed point scale factor
+  int y_scale_fp;  // vertical fixed point scale factor
+  int x_step_q4;
+  int y_step_q4;
+
+  int (*scale_value_x)(int val, const struct scale_factors *sf);
+  int (*scale_value_y)(int val, const struct scale_factors *sf);
+};
+
+MV32 av1_scale_mv(const MV *mv, int x, int y, const struct scale_factors *sf);
+
+void av1_setup_scale_factors_for_frame(struct scale_factors *sf, int other_w,
+                                       int other_h, int this_w, int this_h);
+
+static INLINE int av1_is_valid_scale(const struct scale_factors *sf) {
+  assert(sf != NULL);
+  return sf->x_scale_fp != REF_INVALID_SCALE &&
+         sf->y_scale_fp != REF_INVALID_SCALE;
+}
+
+static INLINE int av1_is_scaled(const struct scale_factors *sf) {
+  assert(sf != NULL);
+  return av1_is_valid_scale(sf) &&
+         (sf->x_scale_fp != REF_NO_SCALE || sf->y_scale_fp != REF_NO_SCALE);
+}
+
+static INLINE int valid_ref_frame_size(int ref_width, int ref_height,
+                                       int this_width, int this_height) {
+  return 2 * this_width >= ref_width && 2 * this_height >= ref_height &&
+         this_width <= 16 * ref_width && this_height <= 16 * ref_height;
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_SCALE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/scan.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/scan.c
new file mode 100644
index 0000000000..d0ef82fffb
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/scan.c
@@ -0,0 +1,2038 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common_data.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/scan.h"
+
+DECLARE_ALIGNED(16, static const int16_t,
+                default_scan_4x4[16]) = { 0, 1,  4,  8,  5, 2,  3,  6,
+                                          9, 12, 13, 10, 7, 11, 14, 15 };
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_4x4[16]) = {
+  0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_4x4[16]) = {
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_4x8[32]) = {
+  0,  1,  4,  2,  5,  8,  3,  6,  9,  12, 7,  10, 13, 16, 11, 14,
+  17, 20, 15, 18, 21, 24, 19, 22, 25, 28, 23, 26, 29, 27, 30, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_4x8[32]) = {
+  0, 4, 8,  12, 16, 20, 24, 28, 1, 5, 9,  13, 17, 21, 25, 29,
+  2, 6, 10, 14, 18, 22, 26, 30, 3, 7, 11, 15, 19, 23, 27, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_4x8[32]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_8x4[32]) = {
+  0,  8, 1,  16, 9,  2, 24, 17, 10, 3, 25, 18, 11, 4,  26, 19,
+  12, 5, 27, 20, 13, 6, 28, 21, 14, 7, 29, 22, 15, 30, 23, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_8x4[32]) = {
+  0, 8,  16, 24, 1, 9,  17, 25, 2, 10, 18, 26, 3, 11, 19, 27,
+  4, 12, 20, 28, 5, 13, 21, 29, 6, 14, 22, 30, 7, 15, 23, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_8x4[32]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_4x16[64]) = {
+  0,  1,  4,  2,  5,  8,  3,  6,  9,  12, 7,  10, 13, 16, 11, 14,
+  17, 20, 15, 18, 21, 24, 19, 22, 25, 28, 23, 26, 29, 32, 27, 30,
+  33, 36, 31, 34, 37, 40, 35, 38, 41, 44, 39, 42, 45, 48, 43, 46,
+  49, 52, 47, 50, 53, 56, 51, 54, 57, 60, 55, 58, 61, 59, 62, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_16x4[64]) = {
+  0,  16, 1,  32, 17, 2,  48, 33, 18, 3,  49, 34, 19, 4,  50, 35,
+  20, 5,  51, 36, 21, 6,  52, 37, 22, 7,  53, 38, 23, 8,  54, 39,
+  24, 9,  55, 40, 25, 10, 56, 41, 26, 11, 57, 42, 27, 12, 58, 43,
+  28, 13, 59, 44, 29, 14, 60, 45, 30, 15, 61, 46, 31, 62, 47, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_4x16[64]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_16x4[64]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_4x16[64]) = {
+  0, 4, 8,  12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60,
+  1, 5, 9,  13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53, 57, 61,
+  2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 50, 54, 58, 62,
+  3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55, 59, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_16x4[64]) = {
+  0,  16, 32, 48, 1,  17, 33, 49, 2,  18, 34, 50, 3,  19, 35, 51,
+  4,  20, 36, 52, 5,  21, 37, 53, 6,  22, 38, 54, 7,  23, 39, 55,
+  8,  24, 40, 56, 9,  25, 41, 57, 10, 26, 42, 58, 11, 27, 43, 59,
+  12, 28, 44, 60, 13, 29, 45, 61, 14, 30, 46, 62, 15, 31, 47, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_8x32[256]) = {
+  0,   1,   8,   2,   9,   16,  3,   10,  17,  24,  4,   11,  18,  25,  32,
+  5,   12,  19,  26,  33,  40,  6,   13,  20,  27,  34,  41,  48,  7,   14,
+  21,  28,  35,  42,  49,  56,  15,  22,  29,  36,  43,  50,  57,  64,  23,
+  30,  37,  44,  51,  58,  65,  72,  31,  38,  45,  52,  59,  66,  73,  80,
+  39,  46,  53,  60,  67,  74,  81,  88,  47,  54,  61,  68,  75,  82,  89,
+  96,  55,  62,  69,  76,  83,  90,  97,  104, 63,  70,  77,  84,  91,  98,
+  105, 112, 71,  78,  85,  92,  99,  106, 113, 120, 79,  86,  93,  100, 107,
+  114, 121, 128, 87,  94,  101, 108, 115, 122, 129, 136, 95,  102, 109, 116,
+  123, 130, 137, 144, 103, 110, 117, 124, 131, 138, 145, 152, 111, 118, 125,
+  132, 139, 146, 153, 160, 119, 126, 133, 140, 147, 154, 161, 168, 127, 134,
+  141, 148, 155, 162, 169, 176, 135, 142, 149, 156, 163, 170, 177, 184, 143,
+  150, 157, 164, 171, 178, 185, 192, 151, 158, 165, 172, 179, 186, 193, 200,
+  159, 166, 173, 180, 187, 194, 201, 208, 167, 174, 181, 188, 195, 202, 209,
+  216, 175, 182, 189, 196, 203, 210, 217, 224, 183, 190, 197, 204, 211, 218,
+  225, 232, 191, 198, 205, 212, 219, 226, 233, 240, 199, 206, 213, 220, 227,
+  234, 241, 248, 207, 214, 221, 228, 235, 242, 249, 215, 222, 229, 236, 243,
+  250, 223, 230, 237, 244, 251, 231, 238, 245, 252, 239, 246, 253, 247, 254,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_32x8[256]) = {
+  0,   32,  1,   64,  33,  2,   96,  65,  34,  3,   128, 97,  66,  35,  4,
+  160, 129, 98,  67,  36,  5,   192, 161, 130, 99,  68,  37,  6,   224, 193,
+  162, 131, 100, 69,  38,  7,   225, 194, 163, 132, 101, 70,  39,  8,   226,
+  195, 164, 133, 102, 71,  40,  9,   227, 196, 165, 134, 103, 72,  41,  10,
+  228, 197, 166, 135, 104, 73,  42,  11,  229, 198, 167, 136, 105, 74,  43,
+  12,  230, 199, 168, 137, 106, 75,  44,  13,  231, 200, 169, 138, 107, 76,
+  45,  14,  232, 201, 170, 139, 108, 77,  46,  15,  233, 202, 171, 140, 109,
+  78,  47,  16,  234, 203, 172, 141, 110, 79,  48,  17,  235, 204, 173, 142,
+  111, 80,  49,  18,  236, 205, 174, 143, 112, 81,  50,  19,  237, 206, 175,
+  144, 113, 82,  51,  20,  238, 207, 176, 145, 114, 83,  52,  21,  239, 208,
+  177, 146, 115, 84,  53,  22,  240, 209, 178, 147, 116, 85,  54,  23,  241,
+  210, 179, 148, 117, 86,  55,  24,  242, 211, 180, 149, 118, 87,  56,  25,
+  243, 212, 181, 150, 119, 88,  57,  26,  244, 213, 182, 151, 120, 89,  58,
+  27,  245, 214, 183, 152, 121, 90,  59,  28,  246, 215, 184, 153, 122, 91,
+  60,  29,  247, 216, 185, 154, 123, 92,  61,  30,  248, 217, 186, 155, 124,
+  93,  62,  31,  249, 218, 187, 156, 125, 94,  63,  250, 219, 188, 157, 126,
+  95,  251, 220, 189, 158, 127, 252, 221, 190, 159, 253, 222, 191, 254, 223,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_8x32[256]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_32x8[256]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_8x32[256]) = {
+  0,   8,   16,  24,  32,  40,  48,  56,  64,  72,  80,  88,  96,  104, 112,
+  120, 128, 136, 144, 152, 160, 168, 176, 184, 192, 200, 208, 216, 224, 232,
+  240, 248, 1,   9,   17,  25,  33,  41,  49,  57,  65,  73,  81,  89,  97,
+  105, 113, 121, 129, 137, 145, 153, 161, 169, 177, 185, 193, 201, 209, 217,
+  225, 233, 241, 249, 2,   10,  18,  26,  34,  42,  50,  58,  66,  74,  82,
+  90,  98,  106, 114, 122, 130, 138, 146, 154, 162, 170, 178, 186, 194, 202,
+  210, 218, 226, 234, 242, 250, 3,   11,  19,  27,  35,  43,  51,  59,  67,
+  75,  83,  91,  99,  107, 115, 123, 131, 139, 147, 155, 163, 171, 179, 187,
+  195, 203, 211, 219, 227, 235, 243, 251, 4,   12,  20,  28,  36,  44,  52,
+  60,  68,  76,  84,  92,  100, 108, 116, 124, 132, 140, 148, 156, 164, 172,
+  180, 188, 196, 204, 212, 220, 228, 236, 244, 252, 5,   13,  21,  29,  37,
+  45,  53,  61,  69,  77,  85,  93,  101, 109, 117, 125, 133, 141, 149, 157,
+  165, 173, 181, 189, 197, 205, 213, 221, 229, 237, 245, 253, 6,   14,  22,
+  30,  38,  46,  54,  62,  70,  78,  86,  94,  102, 110, 118, 126, 134, 142,
+  150, 158, 166, 174, 182, 190, 198, 206, 214, 222, 230, 238, 246, 254, 7,
+  15,  23,  31,  39,  47,  55,  63,  71,  79,  87,  95,  103, 111, 119, 127,
+  135, 143, 151, 159, 167, 175, 183, 191, 199, 207, 215, 223, 231, 239, 247,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_32x8[256]) = {
+  0,  32, 64, 96,  128, 160, 192, 224, 1,  33, 65, 97,  129, 161, 193, 225,
+  2,  34, 66, 98,  130, 162, 194, 226, 3,  35, 67, 99,  131, 163, 195, 227,
+  4,  36, 68, 100, 132, 164, 196, 228, 5,  37, 69, 101, 133, 165, 197, 229,
+  6,  38, 70, 102, 134, 166, 198, 230, 7,  39, 71, 103, 135, 167, 199, 231,
+  8,  40, 72, 104, 136, 168, 200, 232, 9,  41, 73, 105, 137, 169, 201, 233,
+  10, 42, 74, 106, 138, 170, 202, 234, 11, 43, 75, 107, 139, 171, 203, 235,
+  12, 44, 76, 108, 140, 172, 204, 236, 13, 45, 77, 109, 141, 173, 205, 237,
+  14, 46, 78, 110, 142, 174, 206, 238, 15, 47, 79, 111, 143, 175, 207, 239,
+  16, 48, 80, 112, 144, 176, 208, 240, 17, 49, 81, 113, 145, 177, 209, 241,
+  18, 50, 82, 114, 146, 178, 210, 242, 19, 51, 83, 115, 147, 179, 211, 243,
+  20, 52, 84, 116, 148, 180, 212, 244, 21, 53, 85, 117, 149, 181, 213, 245,
+  22, 54, 86, 118, 150, 182, 214, 246, 23, 55, 87, 119, 151, 183, 215, 247,
+  24, 56, 88, 120, 152, 184, 216, 248, 25, 57, 89, 121, 153, 185, 217, 249,
+  26, 58, 90, 122, 154, 186, 218, 250, 27, 59, 91, 123, 155, 187, 219, 251,
+  28, 60, 92, 124, 156, 188, 220, 252, 29, 61, 93, 125, 157, 189, 221, 253,
+  30, 62, 94, 126, 158, 190, 222, 254, 31, 63, 95, 127, 159, 191, 223, 255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_8x8[64]) = {
+  0,  1,  8,  16, 9,  2,  3,  10, 17, 24, 32, 25, 18, 11, 4,  5,
+  12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6,  7,  14, 21, 28,
+  35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51,
+  58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_8x8[64]) = {
+  0, 8,  16, 24, 32, 40, 48, 56, 1, 9,  17, 25, 33, 41, 49, 57,
+  2, 10, 18, 26, 34, 42, 50, 58, 3, 11, 19, 27, 35, 43, 51, 59,
+  4, 12, 20, 28, 36, 44, 52, 60, 5, 13, 21, 29, 37, 45, 53, 61,
+  6, 14, 22, 30, 38, 46, 54, 62, 7, 15, 23, 31, 39, 47, 55, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_8x8[64]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_8x16[128]) = {
+  0,   1,   8,   2,   9,   16,  3,   10,  17,  24,  4,   11,  18,  25,  32,
+  5,   12,  19,  26,  33,  40,  6,   13,  20,  27,  34,  41,  48,  7,   14,
+  21,  28,  35,  42,  49,  56,  15,  22,  29,  36,  43,  50,  57,  64,  23,
+  30,  37,  44,  51,  58,  65,  72,  31,  38,  45,  52,  59,  66,  73,  80,
+  39,  46,  53,  60,  67,  74,  81,  88,  47,  54,  61,  68,  75,  82,  89,
+  96,  55,  62,  69,  76,  83,  90,  97,  104, 63,  70,  77,  84,  91,  98,
+  105, 112, 71,  78,  85,  92,  99,  106, 113, 120, 79,  86,  93,  100, 107,
+  114, 121, 87,  94,  101, 108, 115, 122, 95,  102, 109, 116, 123, 103, 110,
+  117, 124, 111, 118, 125, 119, 126, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_16x8[128]) = {
+  0,  16,  1,   32, 17,  2,   48,  33,  18, 3,  64,  49,  34,  19,  4,   80,
+  65, 50,  35,  20, 5,   96,  81,  66,  51, 36, 21,  6,   112, 97,  82,  67,
+  52, 37,  22,  7,  113, 98,  83,  68,  53, 38, 23,  8,   114, 99,  84,  69,
+  54, 39,  24,  9,  115, 100, 85,  70,  55, 40, 25,  10,  116, 101, 86,  71,
+  56, 41,  26,  11, 117, 102, 87,  72,  57, 42, 27,  12,  118, 103, 88,  73,
+  58, 43,  28,  13, 119, 104, 89,  74,  59, 44, 29,  14,  120, 105, 90,  75,
+  60, 45,  30,  15, 121, 106, 91,  76,  61, 46, 31,  122, 107, 92,  77,  62,
+  47, 123, 108, 93, 78,  63,  124, 109, 94, 79, 125, 110, 95,  126, 111, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_8x16[128]) = {
+  0, 8,  16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96,  104, 112, 120,
+  1, 9,  17, 25, 33, 41, 49, 57, 65, 73, 81, 89, 97,  105, 113, 121,
+  2, 10, 18, 26, 34, 42, 50, 58, 66, 74, 82, 90, 98,  106, 114, 122,
+  3, 11, 19, 27, 35, 43, 51, 59, 67, 75, 83, 91, 99,  107, 115, 123,
+  4, 12, 20, 28, 36, 44, 52, 60, 68, 76, 84, 92, 100, 108, 116, 124,
+  5, 13, 21, 29, 37, 45, 53, 61, 69, 77, 85, 93, 101, 109, 117, 125,
+  6, 14, 22, 30, 38, 46, 54, 62, 70, 78, 86, 94, 102, 110, 118, 126,
+  7, 15, 23, 31, 39, 47, 55, 63, 71, 79, 87, 95, 103, 111, 119, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_16x8[128]) = {
+  0,  16, 32, 48, 64, 80, 96,  112, 1,  17, 33, 49, 65, 81, 97,  113,
+  2,  18, 34, 50, 66, 82, 98,  114, 3,  19, 35, 51, 67, 83, 99,  115,
+  4,  20, 36, 52, 68, 84, 100, 116, 5,  21, 37, 53, 69, 85, 101, 117,
+  6,  22, 38, 54, 70, 86, 102, 118, 7,  23, 39, 55, 71, 87, 103, 119,
+  8,  24, 40, 56, 72, 88, 104, 120, 9,  25, 41, 57, 73, 89, 105, 121,
+  10, 26, 42, 58, 74, 90, 106, 122, 11, 27, 43, 59, 75, 91, 107, 123,
+  12, 28, 44, 60, 76, 92, 108, 124, 13, 29, 45, 61, 77, 93, 109, 125,
+  14, 30, 46, 62, 78, 94, 110, 126, 15, 31, 47, 63, 79, 95, 111, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_8x16[128]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_16x8[128]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_16x32[512]) = {
+  0,   1,   16,  2,   17,  32,  3,   18,  33,  48,  4,   19,  34,  49,  64,
+  5,   20,  35,  50,  65,  80,  6,   21,  36,  51,  66,  81,  96,  7,   22,
+  37,  52,  67,  82,  97,  112, 8,   23,  38,  53,  68,  83,  98,  113, 128,
+  9,   24,  39,  54,  69,  84,  99,  114, 129, 144, 10,  25,  40,  55,  70,
+  85,  100, 115, 130, 145, 160, 11,  26,  41,  56,  71,  86,  101, 116, 131,
+  146, 161, 176, 12,  27,  42,  57,  72,  87,  102, 117, 132, 147, 162, 177,
+  192, 13,  28,  43,  58,  73,  88,  103, 118, 133, 148, 163, 178, 193, 208,
+  14,  29,  44,  59,  74,  89,  104, 119, 134, 149, 164, 179, 194, 209, 224,
+  15,  30,  45,  60,  75,  90,  105, 120, 135, 150, 165, 180, 195, 210, 225,
+  240, 31,  46,  61,  76,  91,  106, 121, 136, 151, 166, 181, 196, 211, 226,
+  241, 256, 47,  62,  77,  92,  107, 122, 137, 152, 167, 182, 197, 212, 227,
+  242, 257, 272, 63,  78,  93,  108, 123, 138, 153, 168, 183, 198, 213, 228,
+  243, 258, 273, 288, 79,  94,  109, 124, 139, 154, 169, 184, 199, 214, 229,
+  244, 259, 274, 289, 304, 95,  110, 125, 140, 155, 170, 185, 200, 215, 230,
+  245, 260, 275, 290, 305, 320, 111, 126, 141, 156, 171, 186, 201, 216, 231,
+  246, 261, 276, 291, 306, 321, 336, 127, 142, 157, 172, 187, 202, 217, 232,
+  247, 262, 277, 292, 307, 322, 337, 352, 143, 158, 173, 188, 203, 218, 233,
+  248, 263, 278, 293, 308, 323, 338, 353, 368, 159, 174, 189, 204, 219, 234,
+  249, 264, 279, 294, 309, 324, 339, 354, 369, 384, 175, 190, 205, 220, 235,
+  250, 265, 280, 295, 310, 325, 340, 355, 370, 385, 400, 191, 206, 221, 236,
+  251, 266, 281, 296, 311, 326, 341, 356, 371, 386, 401, 416, 207, 222, 237,
+  252, 267, 282, 297, 312, 327, 342, 357, 372, 387, 402, 417, 432, 223, 238,
+  253, 268, 283, 298, 313, 328, 343, 358, 373, 388, 403, 418, 433, 448, 239,
+  254, 269, 284, 299, 314, 329, 344, 359, 374, 389, 404, 419, 434, 449, 464,
+  255, 270, 285, 300, 315, 330, 345, 360, 375, 390, 405, 420, 435, 450, 465,
+  480, 271, 286, 301, 316, 331, 346, 361, 376, 391, 406, 421, 436, 451, 466,
+  481, 496, 287, 302, 317, 332, 347, 362, 377, 392, 407, 422, 437, 452, 467,
+  482, 497, 303, 318, 333, 348, 363, 378, 393, 408, 423, 438, 453, 468, 483,
+  498, 319, 334, 349, 364, 379, 394, 409, 424, 439, 454, 469, 484, 499, 335,
+  350, 365, 380, 395, 410, 425, 440, 455, 470, 485, 500, 351, 366, 381, 396,
+  411, 426, 441, 456, 471, 486, 501, 367, 382, 397, 412, 427, 442, 457, 472,
+  487, 502, 383, 398, 413, 428, 443, 458, 473, 488, 503, 399, 414, 429, 444,
+  459, 474, 489, 504, 415, 430, 445, 460, 475, 490, 505, 431, 446, 461, 476,
+  491, 506, 447, 462, 477, 492, 507, 463, 478, 493, 508, 479, 494, 509, 495,
+  510, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_32x16[512]) = {
+  0,   32,  1,   64,  33,  2,   96,  65,  34,  3,   128, 97,  66,  35,  4,
+  160, 129, 98,  67,  36,  5,   192, 161, 130, 99,  68,  37,  6,   224, 193,
+  162, 131, 100, 69,  38,  7,   256, 225, 194, 163, 132, 101, 70,  39,  8,
+  288, 257, 226, 195, 164, 133, 102, 71,  40,  9,   320, 289, 258, 227, 196,
+  165, 134, 103, 72,  41,  10,  352, 321, 290, 259, 228, 197, 166, 135, 104,
+  73,  42,  11,  384, 353, 322, 291, 260, 229, 198, 167, 136, 105, 74,  43,
+  12,  416, 385, 354, 323, 292, 261, 230, 199, 168, 137, 106, 75,  44,  13,
+  448, 417, 386, 355, 324, 293, 262, 231, 200, 169, 138, 107, 76,  45,  14,
+  480, 449, 418, 387, 356, 325, 294, 263, 232, 201, 170, 139, 108, 77,  46,
+  15,  481, 450, 419, 388, 357, 326, 295, 264, 233, 202, 171, 140, 109, 78,
+  47,  16,  482, 451, 420, 389, 358, 327, 296, 265, 234, 203, 172, 141, 110,
+  79,  48,  17,  483, 452, 421, 390, 359, 328, 297, 266, 235, 204, 173, 142,
+  111, 80,  49,  18,  484, 453, 422, 391, 360, 329, 298, 267, 236, 205, 174,
+  143, 112, 81,  50,  19,  485, 454, 423, 392, 361, 330, 299, 268, 237, 206,
+  175, 144, 113, 82,  51,  20,  486, 455, 424, 393, 362, 331, 300, 269, 238,
+  207, 176, 145, 114, 83,  52,  21,  487, 456, 425, 394, 363, 332, 301, 270,
+  239, 208, 177, 146, 115, 84,  53,  22,  488, 457, 426, 395, 364, 333, 302,
+  271, 240, 209, 178, 147, 116, 85,  54,  23,  489, 458, 427, 396, 365, 334,
+  303, 272, 241, 210, 179, 148, 117, 86,  55,  24,  490, 459, 428, 397, 366,
+  335, 304, 273, 242, 211, 180, 149, 118, 87,  56,  25,  491, 460, 429, 398,
+  367, 336, 305, 274, 243, 212, 181, 150, 119, 88,  57,  26,  492, 461, 430,
+  399, 368, 337, 306, 275, 244, 213, 182, 151, 120, 89,  58,  27,  493, 462,
+  431, 400, 369, 338, 307, 276, 245, 214, 183, 152, 121, 90,  59,  28,  494,
+  463, 432, 401, 370, 339, 308, 277, 246, 215, 184, 153, 122, 91,  60,  29,
+  495, 464, 433, 402, 371, 340, 309, 278, 247, 216, 185, 154, 123, 92,  61,
+  30,  496, 465, 434, 403, 372, 341, 310, 279, 248, 217, 186, 155, 124, 93,
+  62,  31,  497, 466, 435, 404, 373, 342, 311, 280, 249, 218, 187, 156, 125,
+  94,  63,  498, 467, 436, 405, 374, 343, 312, 281, 250, 219, 188, 157, 126,
+  95,  499, 468, 437, 406, 375, 344, 313, 282, 251, 220, 189, 158, 127, 500,
+  469, 438, 407, 376, 345, 314, 283, 252, 221, 190, 159, 501, 470, 439, 408,
+  377, 346, 315, 284, 253, 222, 191, 502, 471, 440, 409, 378, 347, 316, 285,
+  254, 223, 503, 472, 441, 410, 379, 348, 317, 286, 255, 504, 473, 442, 411,
+  380, 349, 318, 287, 505, 474, 443, 412, 381, 350, 319, 506, 475, 444, 413,
+  382, 351, 507, 476, 445, 414, 383, 508, 477, 446, 415, 509, 478, 447, 510,
+  479, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_16x32[512]) = {
+  0,   16,  32,  48,  64,  80,  96,  112, 128, 144, 160, 176, 192, 208, 224,
+  240, 256, 272, 288, 304, 320, 336, 352, 368, 384, 400, 416, 432, 448, 464,
+  480, 496, 1,   17,  33,  49,  65,  81,  97,  113, 129, 145, 161, 177, 193,
+  209, 225, 241, 257, 273, 289, 305, 321, 337, 353, 369, 385, 401, 417, 433,
+  449, 465, 481, 497, 2,   18,  34,  50,  66,  82,  98,  114, 130, 146, 162,
+  178, 194, 210, 226, 242, 258, 274, 290, 306, 322, 338, 354, 370, 386, 402,
+  418, 434, 450, 466, 482, 498, 3,   19,  35,  51,  67,  83,  99,  115, 131,
+  147, 163, 179, 195, 211, 227, 243, 259, 275, 291, 307, 323, 339, 355, 371,
+  387, 403, 419, 435, 451, 467, 483, 499, 4,   20,  36,  52,  68,  84,  100,
+  116, 132, 148, 164, 180, 196, 212, 228, 244, 260, 276, 292, 308, 324, 340,
+  356, 372, 388, 404, 420, 436, 452, 468, 484, 500, 5,   21,  37,  53,  69,
+  85,  101, 117, 133, 149, 165, 181, 197, 213, 229, 245, 261, 277, 293, 309,
+  325, 341, 357, 373, 389, 405, 421, 437, 453, 469, 485, 501, 6,   22,  38,
+  54,  70,  86,  102, 118, 134, 150, 166, 182, 198, 214, 230, 246, 262, 278,
+  294, 310, 326, 342, 358, 374, 390, 406, 422, 438, 454, 470, 486, 502, 7,
+  23,  39,  55,  71,  87,  103, 119, 135, 151, 167, 183, 199, 215, 231, 247,
+  263, 279, 295, 311, 327, 343, 359, 375, 391, 407, 423, 439, 455, 471, 487,
+  503, 8,   24,  40,  56,  72,  88,  104, 120, 136, 152, 168, 184, 200, 216,
+  232, 248, 264, 280, 296, 312, 328, 344, 360, 376, 392, 408, 424, 440, 456,
+  472, 488, 504, 9,   25,  41,  57,  73,  89,  105, 121, 137, 153, 169, 185,
+  201, 217, 233, 249, 265, 281, 297, 313, 329, 345, 361, 377, 393, 409, 425,
+  441, 457, 473, 489, 505, 10,  26,  42,  58,  74,  90,  106, 122, 138, 154,
+  170, 186, 202, 218, 234, 250, 266, 282, 298, 314, 330, 346, 362, 378, 394,
+  410, 426, 442, 458, 474, 490, 506, 11,  27,  43,  59,  75,  91,  107, 123,
+  139, 155, 171, 187, 203, 219, 235, 251, 267, 283, 299, 315, 331, 347, 363,
+  379, 395, 411, 427, 443, 459, 475, 491, 507, 12,  28,  44,  60,  76,  92,
+  108, 124, 140, 156, 172, 188, 204, 220, 236, 252, 268, 284, 300, 316, 332,
+  348, 364, 380, 396, 412, 428, 444, 460, 476, 492, 508, 13,  29,  45,  61,
+  77,  93,  109, 125, 141, 157, 173, 189, 205, 221, 237, 253, 269, 285, 301,
+  317, 333, 349, 365, 381, 397, 413, 429, 445, 461, 477, 493, 509, 14,  30,
+  46,  62,  78,  94,  110, 126, 142, 158, 174, 190, 206, 222, 238, 254, 270,
+  286, 302, 318, 334, 350, 366, 382, 398, 414, 430, 446, 462, 478, 494, 510,
+  15,  31,  47,  63,  79,  95,  111, 127, 143, 159, 175, 191, 207, 223, 239,
+  255, 271, 287, 303, 319, 335, 351, 367, 383, 399, 415, 431, 447, 463, 479,
+  495, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_32x16[512]) = {
+  0,  32, 64, 96,  128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 480,
+  1,  33, 65, 97,  129, 161, 193, 225, 257, 289, 321, 353, 385, 417, 449, 481,
+  2,  34, 66, 98,  130, 162, 194, 226, 258, 290, 322, 354, 386, 418, 450, 482,
+  3,  35, 67, 99,  131, 163, 195, 227, 259, 291, 323, 355, 387, 419, 451, 483,
+  4,  36, 68, 100, 132, 164, 196, 228, 260, 292, 324, 356, 388, 420, 452, 484,
+  5,  37, 69, 101, 133, 165, 197, 229, 261, 293, 325, 357, 389, 421, 453, 485,
+  6,  38, 70, 102, 134, 166, 198, 230, 262, 294, 326, 358, 390, 422, 454, 486,
+  7,  39, 71, 103, 135, 167, 199, 231, 263, 295, 327, 359, 391, 423, 455, 487,
+  8,  40, 72, 104, 136, 168, 200, 232, 264, 296, 328, 360, 392, 424, 456, 488,
+  9,  41, 73, 105, 137, 169, 201, 233, 265, 297, 329, 361, 393, 425, 457, 489,
+  10, 42, 74, 106, 138, 170, 202, 234, 266, 298, 330, 362, 394, 426, 458, 490,
+  11, 43, 75, 107, 139, 171, 203, 235, 267, 299, 331, 363, 395, 427, 459, 491,
+  12, 44, 76, 108, 140, 172, 204, 236, 268, 300, 332, 364, 396, 428, 460, 492,
+  13, 45, 77, 109, 141, 173, 205, 237, 269, 301, 333, 365, 397, 429, 461, 493,
+  14, 46, 78, 110, 142, 174, 206, 238, 270, 302, 334, 366, 398, 430, 462, 494,
+  15, 47, 79, 111, 143, 175, 207, 239, 271, 303, 335, 367, 399, 431, 463, 495,
+  16, 48, 80, 112, 144, 176, 208, 240, 272, 304, 336, 368, 400, 432, 464, 496,
+  17, 49, 81, 113, 145, 177, 209, 241, 273, 305, 337, 369, 401, 433, 465, 497,
+  18, 50, 82, 114, 146, 178, 210, 242, 274, 306, 338, 370, 402, 434, 466, 498,
+  19, 51, 83, 115, 147, 179, 211, 243, 275, 307, 339, 371, 403, 435, 467, 499,
+  20, 52, 84, 116, 148, 180, 212, 244, 276, 308, 340, 372, 404, 436, 468, 500,
+  21, 53, 85, 117, 149, 181, 213, 245, 277, 309, 341, 373, 405, 437, 469, 501,
+  22, 54, 86, 118, 150, 182, 214, 246, 278, 310, 342, 374, 406, 438, 470, 502,
+  23, 55, 87, 119, 151, 183, 215, 247, 279, 311, 343, 375, 407, 439, 471, 503,
+  24, 56, 88, 120, 152, 184, 216, 248, 280, 312, 344, 376, 408, 440, 472, 504,
+  25, 57, 89, 121, 153, 185, 217, 249, 281, 313, 345, 377, 409, 441, 473, 505,
+  26, 58, 90, 122, 154, 186, 218, 250, 282, 314, 346, 378, 410, 442, 474, 506,
+  27, 59, 91, 123, 155, 187, 219, 251, 283, 315, 347, 379, 411, 443, 475, 507,
+  28, 60, 92, 124, 156, 188, 220, 252, 284, 316, 348, 380, 412, 444, 476, 508,
+  29, 61, 93, 125, 157, 189, 221, 253, 285, 317, 349, 381, 413, 445, 477, 509,
+  30, 62, 94, 126, 158, 190, 222, 254, 286, 318, 350, 382, 414, 446, 478, 510,
+  31, 63, 95, 127, 159, 191, 223, 255, 287, 319, 351, 383, 415, 447, 479, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_16x32[512]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+  270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+  285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+  300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+  315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329,
+  330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+  345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
+  360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
+  375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
+  390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
+  405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419,
+  420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
+  435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449,
+  450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464,
+  465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479,
+  480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494,
+  495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509,
+  510, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_32x16[512]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+  270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+  285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+  300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+  315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329,
+  330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+  345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
+  360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
+  375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
+  390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
+  405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419,
+  420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
+  435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449,
+  450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464,
+  465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479,
+  480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494,
+  495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509,
+  510, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_16x16[256]) = {
+  0,   1,   16,  32,  17,  2,   3,   18,  33,  48,  64,  49,  34,  19,  4,
+  5,   20,  35,  50,  65,  80,  96,  81,  66,  51,  36,  21,  6,   7,   22,
+  37,  52,  67,  82,  97,  112, 128, 113, 98,  83,  68,  53,  38,  23,  8,
+  9,   24,  39,  54,  69,  84,  99,  114, 129, 144, 160, 145, 130, 115, 100,
+  85,  70,  55,  40,  25,  10,  11,  26,  41,  56,  71,  86,  101, 116, 131,
+  146, 161, 176, 192, 177, 162, 147, 132, 117, 102, 87,  72,  57,  42,  27,
+  12,  13,  28,  43,  58,  73,  88,  103, 118, 133, 148, 163, 178, 193, 208,
+  224, 209, 194, 179, 164, 149, 134, 119, 104, 89,  74,  59,  44,  29,  14,
+  15,  30,  45,  60,  75,  90,  105, 120, 135, 150, 165, 180, 195, 210, 225,
+  240, 241, 226, 211, 196, 181, 166, 151, 136, 121, 106, 91,  76,  61,  46,
+  31,  47,  62,  77,  92,  107, 122, 137, 152, 167, 182, 197, 212, 227, 242,
+  243, 228, 213, 198, 183, 168, 153, 138, 123, 108, 93,  78,  63,  79,  94,
+  109, 124, 139, 154, 169, 184, 199, 214, 229, 244, 245, 230, 215, 200, 185,
+  170, 155, 140, 125, 110, 95,  111, 126, 141, 156, 171, 186, 201, 216, 231,
+  246, 247, 232, 217, 202, 187, 172, 157, 142, 127, 143, 158, 173, 188, 203,
+  218, 233, 248, 249, 234, 219, 204, 189, 174, 159, 175, 190, 205, 220, 235,
+  250, 251, 236, 221, 206, 191, 207, 222, 237, 252, 253, 238, 223, 239, 254,
+  255
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_16x16[256]) = {
+  0,  16, 32, 48, 64, 80, 96,  112, 128, 144, 160, 176, 192, 208, 224, 240,
+  1,  17, 33, 49, 65, 81, 97,  113, 129, 145, 161, 177, 193, 209, 225, 241,
+  2,  18, 34, 50, 66, 82, 98,  114, 130, 146, 162, 178, 194, 210, 226, 242,
+  3,  19, 35, 51, 67, 83, 99,  115, 131, 147, 163, 179, 195, 211, 227, 243,
+  4,  20, 36, 52, 68, 84, 100, 116, 132, 148, 164, 180, 196, 212, 228, 244,
+  5,  21, 37, 53, 69, 85, 101, 117, 133, 149, 165, 181, 197, 213, 229, 245,
+  6,  22, 38, 54, 70, 86, 102, 118, 134, 150, 166, 182, 198, 214, 230, 246,
+  7,  23, 39, 55, 71, 87, 103, 119, 135, 151, 167, 183, 199, 215, 231, 247,
+  8,  24, 40, 56, 72, 88, 104, 120, 136, 152, 168, 184, 200, 216, 232, 248,
+  9,  25, 41, 57, 73, 89, 105, 121, 137, 153, 169, 185, 201, 217, 233, 249,
+  10, 26, 42, 58, 74, 90, 106, 122, 138, 154, 170, 186, 202, 218, 234, 250,
+  11, 27, 43, 59, 75, 91, 107, 123, 139, 155, 171, 187, 203, 219, 235, 251,
+  12, 28, 44, 60, 76, 92, 108, 124, 140, 156, 172, 188, 204, 220, 236, 252,
+  13, 29, 45, 61, 77, 93, 109, 125, 141, 157, 173, 189, 205, 221, 237, 253,
+  14, 30, 46, 62, 78, 94, 110, 126, 142, 158, 174, 190, 206, 222, 238, 254,
+  15, 31, 47, 63, 79, 95, 111, 127, 143, 159, 175, 191, 207, 223, 239, 255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_16x16[256]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mcol_scan_32x32[1024]) = {
+  0,   32,   64,  96,   128, 160,  192, 224,  256, 288,  320, 352,  384, 416,
+  448, 480,  512, 544,  576, 608,  640, 672,  704, 736,  768, 800,  832, 864,
+  896, 928,  960, 992,  1,   33,   65,  97,   129, 161,  193, 225,  257, 289,
+  321, 353,  385, 417,  449, 481,  513, 545,  577, 609,  641, 673,  705, 737,
+  769, 801,  833, 865,  897, 929,  961, 993,  2,   34,   66,  98,   130, 162,
+  194, 226,  258, 290,  322, 354,  386, 418,  450, 482,  514, 546,  578, 610,
+  642, 674,  706, 738,  770, 802,  834, 866,  898, 930,  962, 994,  3,   35,
+  67,  99,   131, 163,  195, 227,  259, 291,  323, 355,  387, 419,  451, 483,
+  515, 547,  579, 611,  643, 675,  707, 739,  771, 803,  835, 867,  899, 931,
+  963, 995,  4,   36,   68,  100,  132, 164,  196, 228,  260, 292,  324, 356,
+  388, 420,  452, 484,  516, 548,  580, 612,  644, 676,  708, 740,  772, 804,
+  836, 868,  900, 932,  964, 996,  5,   37,   69,  101,  133, 165,  197, 229,
+  261, 293,  325, 357,  389, 421,  453, 485,  517, 549,  581, 613,  645, 677,
+  709, 741,  773, 805,  837, 869,  901, 933,  965, 997,  6,   38,   70,  102,
+  134, 166,  198, 230,  262, 294,  326, 358,  390, 422,  454, 486,  518, 550,
+  582, 614,  646, 678,  710, 742,  774, 806,  838, 870,  902, 934,  966, 998,
+  7,   39,   71,  103,  135, 167,  199, 231,  263, 295,  327, 359,  391, 423,
+  455, 487,  519, 551,  583, 615,  647, 679,  711, 743,  775, 807,  839, 871,
+  903, 935,  967, 999,  8,   40,   72,  104,  136, 168,  200, 232,  264, 296,
+  328, 360,  392, 424,  456, 488,  520, 552,  584, 616,  648, 680,  712, 744,
+  776, 808,  840, 872,  904, 936,  968, 1000, 9,   41,   73,  105,  137, 169,
+  201, 233,  265, 297,  329, 361,  393, 425,  457, 489,  521, 553,  585, 617,
+  649, 681,  713, 745,  777, 809,  841, 873,  905, 937,  969, 1001, 10,  42,
+  74,  106,  138, 170,  202, 234,  266, 298,  330, 362,  394, 426,  458, 490,
+  522, 554,  586, 618,  650, 682,  714, 746,  778, 810,  842, 874,  906, 938,
+  970, 1002, 11,  43,   75,  107,  139, 171,  203, 235,  267, 299,  331, 363,
+  395, 427,  459, 491,  523, 555,  587, 619,  651, 683,  715, 747,  779, 811,
+  843, 875,  907, 939,  971, 1003, 12,  44,   76,  108,  140, 172,  204, 236,
+  268, 300,  332, 364,  396, 428,  460, 492,  524, 556,  588, 620,  652, 684,
+  716, 748,  780, 812,  844, 876,  908, 940,  972, 1004, 13,  45,   77,  109,
+  141, 173,  205, 237,  269, 301,  333, 365,  397, 429,  461, 493,  525, 557,
+  589, 621,  653, 685,  717, 749,  781, 813,  845, 877,  909, 941,  973, 1005,
+  14,  46,   78,  110,  142, 174,  206, 238,  270, 302,  334, 366,  398, 430,
+  462, 494,  526, 558,  590, 622,  654, 686,  718, 750,  782, 814,  846, 878,
+  910, 942,  974, 1006, 15,  47,   79,  111,  143, 175,  207, 239,  271, 303,
+  335, 367,  399, 431,  463, 495,  527, 559,  591, 623,  655, 687,  719, 751,
+  783, 815,  847, 879,  911, 943,  975, 1007, 16,  48,   80,  112,  144, 176,
+  208, 240,  272, 304,  336, 368,  400, 432,  464, 496,  528, 560,  592, 624,
+  656, 688,  720, 752,  784, 816,  848, 880,  912, 944,  976, 1008, 17,  49,
+  81,  113,  145, 177,  209, 241,  273, 305,  337, 369,  401, 433,  465, 497,
+  529, 561,  593, 625,  657, 689,  721, 753,  785, 817,  849, 881,  913, 945,
+  977, 1009, 18,  50,   82,  114,  146, 178,  210, 242,  274, 306,  338, 370,
+  402, 434,  466, 498,  530, 562,  594, 626,  658, 690,  722, 754,  786, 818,
+  850, 882,  914, 946,  978, 1010, 19,  51,   83,  115,  147, 179,  211, 243,
+  275, 307,  339, 371,  403, 435,  467, 499,  531, 563,  595, 627,  659, 691,
+  723, 755,  787, 819,  851, 883,  915, 947,  979, 1011, 20,  52,   84,  116,
+  148, 180,  212, 244,  276, 308,  340, 372,  404, 436,  468, 500,  532, 564,
+  596, 628,  660, 692,  724, 756,  788, 820,  852, 884,  916, 948,  980, 1012,
+  21,  53,   85,  117,  149, 181,  213, 245,  277, 309,  341, 373,  405, 437,
+  469, 501,  533, 565,  597, 629,  661, 693,  725, 757,  789, 821,  853, 885,
+  917, 949,  981, 1013, 22,  54,   86,  118,  150, 182,  214, 246,  278, 310,
+  342, 374,  406, 438,  470, 502,  534, 566,  598, 630,  662, 694,  726, 758,
+  790, 822,  854, 886,  918, 950,  982, 1014, 23,  55,   87,  119,  151, 183,
+  215, 247,  279, 311,  343, 375,  407, 439,  471, 503,  535, 567,  599, 631,
+  663, 695,  727, 759,  791, 823,  855, 887,  919, 951,  983, 1015, 24,  56,
+  88,  120,  152, 184,  216, 248,  280, 312,  344, 376,  408, 440,  472, 504,
+  536, 568,  600, 632,  664, 696,  728, 760,  792, 824,  856, 888,  920, 952,
+  984, 1016, 25,  57,   89,  121,  153, 185,  217, 249,  281, 313,  345, 377,
+  409, 441,  473, 505,  537, 569,  601, 633,  665, 697,  729, 761,  793, 825,
+  857, 889,  921, 953,  985, 1017, 26,  58,   90,  122,  154, 186,  218, 250,
+  282, 314,  346, 378,  410, 442,  474, 506,  538, 570,  602, 634,  666, 698,
+  730, 762,  794, 826,  858, 890,  922, 954,  986, 1018, 27,  59,   91,  123,
+  155, 187,  219, 251,  283, 315,  347, 379,  411, 443,  475, 507,  539, 571,
+  603, 635,  667, 699,  731, 763,  795, 827,  859, 891,  923, 955,  987, 1019,
+  28,  60,   92,  124,  156, 188,  220, 252,  284, 316,  348, 380,  412, 444,
+  476, 508,  540, 572,  604, 636,  668, 700,  732, 764,  796, 828,  860, 892,
+  924, 956,  988, 1020, 29,  61,   93,  125,  157, 189,  221, 253,  285, 317,
+  349, 381,  413, 445,  477, 509,  541, 573,  605, 637,  669, 701,  733, 765,
+  797, 829,  861, 893,  925, 957,  989, 1021, 30,  62,   94,  126,  158, 190,
+  222, 254,  286, 318,  350, 382,  414, 446,  478, 510,  542, 574,  606, 638,
+  670, 702,  734, 766,  798, 830,  862, 894,  926, 958,  990, 1022, 31,  63,
+  95,  127,  159, 191,  223, 255,  287, 319,  351, 383,  415, 447,  479, 511,
+  543, 575,  607, 639,  671, 703,  735, 767,  799, 831,  863, 895,  927, 959,
+  991, 1023,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, mrow_scan_32x32[1024]) = {
+  0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    10,   11,   12,
+  13,   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,   25,
+  26,   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,
+  39,   40,   41,   42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
+  52,   53,   54,   55,   56,   57,   58,   59,   60,   61,   62,   63,   64,
+  65,   66,   67,   68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
+  78,   79,   80,   81,   82,   83,   84,   85,   86,   87,   88,   89,   90,
+  91,   92,   93,   94,   95,   96,   97,   98,   99,   100,  101,  102,  103,
+  104,  105,  106,  107,  108,  109,  110,  111,  112,  113,  114,  115,  116,
+  117,  118,  119,  120,  121,  122,  123,  124,  125,  126,  127,  128,  129,
+  130,  131,  132,  133,  134,  135,  136,  137,  138,  139,  140,  141,  142,
+  143,  144,  145,  146,  147,  148,  149,  150,  151,  152,  153,  154,  155,
+  156,  157,  158,  159,  160,  161,  162,  163,  164,  165,  166,  167,  168,
+  169,  170,  171,  172,  173,  174,  175,  176,  177,  178,  179,  180,  181,
+  182,  183,  184,  185,  186,  187,  188,  189,  190,  191,  192,  193,  194,
+  195,  196,  197,  198,  199,  200,  201,  202,  203,  204,  205,  206,  207,
+  208,  209,  210,  211,  212,  213,  214,  215,  216,  217,  218,  219,  220,
+  221,  222,  223,  224,  225,  226,  227,  228,  229,  230,  231,  232,  233,
+  234,  235,  236,  237,  238,  239,  240,  241,  242,  243,  244,  245,  246,
+  247,  248,  249,  250,  251,  252,  253,  254,  255,  256,  257,  258,  259,
+  260,  261,  262,  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
+  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,  283,  284,  285,
+  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
+  299,  300,  301,  302,  303,  304,  305,  306,  307,  308,  309,  310,  311,
+  312,  313,  314,  315,  316,  317,  318,  319,  320,  321,  322,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,  334,  335,  336,  337,
+  338,  339,  340,  341,  342,  343,  344,  345,  346,  347,  348,  349,  350,
+  351,  352,  353,  354,  355,  356,  357,  358,  359,  360,  361,  362,  363,
+  364,  365,  366,  367,  368,  369,  370,  371,  372,  373,  374,  375,  376,
+  377,  378,  379,  380,  381,  382,  383,  384,  385,  386,  387,  388,  389,
+  390,  391,  392,  393,  394,  395,  396,  397,  398,  399,  400,  401,  402,
+  403,  404,  405,  406,  407,  408,  409,  410,  411,  412,  413,  414,  415,
+  416,  417,  418,  419,  420,  421,  422,  423,  424,  425,  426,  427,  428,
+  429,  430,  431,  432,  433,  434,  435,  436,  437,  438,  439,  440,  441,
+  442,  443,  444,  445,  446,  447,  448,  449,  450,  451,  452,  453,  454,
+  455,  456,  457,  458,  459,  460,  461,  462,  463,  464,  465,  466,  467,
+  468,  469,  470,  471,  472,  473,  474,  475,  476,  477,  478,  479,  480,
+  481,  482,  483,  484,  485,  486,  487,  488,  489,  490,  491,  492,  493,
+  494,  495,  496,  497,  498,  499,  500,  501,  502,  503,  504,  505,  506,
+  507,  508,  509,  510,  511,  512,  513,  514,  515,  516,  517,  518,  519,
+  520,  521,  522,  523,  524,  525,  526,  527,  528,  529,  530,  531,  532,
+  533,  534,  535,  536,  537,  538,  539,  540,  541,  542,  543,  544,  545,
+  546,  547,  548,  549,  550,  551,  552,  553,  554,  555,  556,  557,  558,
+  559,  560,  561,  562,  563,  564,  565,  566,  567,  568,  569,  570,  571,
+  572,  573,  574,  575,  576,  577,  578,  579,  580,  581,  582,  583,  584,
+  585,  586,  587,  588,  589,  590,  591,  592,  593,  594,  595,  596,  597,
+  598,  599,  600,  601,  602,  603,  604,  605,  606,  607,  608,  609,  610,
+  611,  612,  613,  614,  615,  616,  617,  618,  619,  620,  621,  622,  623,
+  624,  625,  626,  627,  628,  629,  630,  631,  632,  633,  634,  635,  636,
+  637,  638,  639,  640,  641,  642,  643,  644,  645,  646,  647,  648,  649,
+  650,  651,  652,  653,  654,  655,  656,  657,  658,  659,  660,  661,  662,
+  663,  664,  665,  666,  667,  668,  669,  670,  671,  672,  673,  674,  675,
+  676,  677,  678,  679,  680,  681,  682,  683,  684,  685,  686,  687,  688,
+  689,  690,  691,  692,  693,  694,  695,  696,  697,  698,  699,  700,  701,
+  702,  703,  704,  705,  706,  707,  708,  709,  710,  711,  712,  713,  714,
+  715,  716,  717,  718,  719,  720,  721,  722,  723,  724,  725,  726,  727,
+  728,  729,  730,  731,  732,  733,  734,  735,  736,  737,  738,  739,  740,
+  741,  742,  743,  744,  745,  746,  747,  748,  749,  750,  751,  752,  753,
+  754,  755,  756,  757,  758,  759,  760,  761,  762,  763,  764,  765,  766,
+  767,  768,  769,  770,  771,  772,  773,  774,  775,  776,  777,  778,  779,
+  780,  781,  782,  783,  784,  785,  786,  787,  788,  789,  790,  791,  792,
+  793,  794,  795,  796,  797,  798,  799,  800,  801,  802,  803,  804,  805,
+  806,  807,  808,  809,  810,  811,  812,  813,  814,  815,  816,  817,  818,
+  819,  820,  821,  822,  823,  824,  825,  826,  827,  828,  829,  830,  831,
+  832,  833,  834,  835,  836,  837,  838,  839,  840,  841,  842,  843,  844,
+  845,  846,  847,  848,  849,  850,  851,  852,  853,  854,  855,  856,  857,
+  858,  859,  860,  861,  862,  863,  864,  865,  866,  867,  868,  869,  870,
+  871,  872,  873,  874,  875,  876,  877,  878,  879,  880,  881,  882,  883,
+  884,  885,  886,  887,  888,  889,  890,  891,  892,  893,  894,  895,  896,
+  897,  898,  899,  900,  901,  902,  903,  904,  905,  906,  907,  908,  909,
+  910,  911,  912,  913,  914,  915,  916,  917,  918,  919,  920,  921,  922,
+  923,  924,  925,  926,  927,  928,  929,  930,  931,  932,  933,  934,  935,
+  936,  937,  938,  939,  940,  941,  942,  943,  944,  945,  946,  947,  948,
+  949,  950,  951,  952,  953,  954,  955,  956,  957,  958,  959,  960,  961,
+  962,  963,  964,  965,  966,  967,  968,  969,  970,  971,  972,  973,  974,
+  975,  976,  977,  978,  979,  980,  981,  982,  983,  984,  985,  986,  987,
+  988,  989,  990,  991,  992,  993,  994,  995,  996,  997,  998,  999,  1000,
+  1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013,
+  1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, default_scan_32x32[1024]) = {
+  0,    1,    32,   64,   33,   2,   3,    34,   65,   96,   128,  97,  66,
+  35,   4,    5,    36,   67,   98,  129,  160,  192,  161,  130,  99,  68,
+  37,   6,    7,    38,   69,   100, 131,  162,  193,  224,  256,  225, 194,
+  163,  132,  101,  70,   39,   8,   9,    40,   71,   102,  133,  164, 195,
+  226,  257,  288,  320,  289,  258, 227,  196,  165,  134,  103,  72,  41,
+  10,   11,   42,   73,   104,  135, 166,  197,  228,  259,  290,  321, 352,
+  384,  353,  322,  291,  260,  229, 198,  167,  136,  105,  74,   43,  12,
+  13,   44,   75,   106,  137,  168, 199,  230,  261,  292,  323,  354, 385,
+  416,  448,  417,  386,  355,  324, 293,  262,  231,  200,  169,  138, 107,
+  76,   45,   14,   15,   46,   77,  108,  139,  170,  201,  232,  263, 294,
+  325,  356,  387,  418,  449,  480, 512,  481,  450,  419,  388,  357, 326,
+  295,  264,  233,  202,  171,  140, 109,  78,   47,   16,   17,   48,  79,
+  110,  141,  172,  203,  234,  265, 296,  327,  358,  389,  420,  451, 482,
+  513,  544,  576,  545,  514,  483, 452,  421,  390,  359,  328,  297, 266,
+  235,  204,  173,  142,  111,  80,  49,   18,   19,   50,   81,   112, 143,
+  174,  205,  236,  267,  298,  329, 360,  391,  422,  453,  484,  515, 546,
+  577,  608,  640,  609,  578,  547, 516,  485,  454,  423,  392,  361, 330,
+  299,  268,  237,  206,  175,  144, 113,  82,   51,   20,   21,   52,  83,
+  114,  145,  176,  207,  238,  269, 300,  331,  362,  393,  424,  455, 486,
+  517,  548,  579,  610,  641,  672, 704,  673,  642,  611,  580,  549, 518,
+  487,  456,  425,  394,  363,  332, 301,  270,  239,  208,  177,  146, 115,
+  84,   53,   22,   23,   54,   85,  116,  147,  178,  209,  240,  271, 302,
+  333,  364,  395,  426,  457,  488, 519,  550,  581,  612,  643,  674, 705,
+  736,  768,  737,  706,  675,  644, 613,  582,  551,  520,  489,  458, 427,
+  396,  365,  334,  303,  272,  241, 210,  179,  148,  117,  86,   55,  24,
+  25,   56,   87,   118,  149,  180, 211,  242,  273,  304,  335,  366, 397,
+  428,  459,  490,  521,  552,  583, 614,  645,  676,  707,  738,  769, 800,
+  832,  801,  770,  739,  708,  677, 646,  615,  584,  553,  522,  491, 460,
+  429,  398,  367,  336,  305,  274, 243,  212,  181,  150,  119,  88,  57,
+  26,   27,   58,   89,   120,  151, 182,  213,  244,  275,  306,  337, 368,
+  399,  430,  461,  492,  523,  554, 585,  616,  647,  678,  709,  740, 771,
+  802,  833,  864,  896,  865,  834, 803,  772,  741,  710,  679,  648, 617,
+  586,  555,  524,  493,  462,  431, 400,  369,  338,  307,  276,  245, 214,
+  183,  152,  121,  90,   59,   28,  29,   60,   91,   122,  153,  184, 215,
+  246,  277,  308,  339,  370,  401, 432,  463,  494,  525,  556,  587, 618,
+  649,  680,  711,  742,  773,  804, 835,  866,  897,  928,  960,  929, 898,
+  867,  836,  805,  774,  743,  712, 681,  650,  619,  588,  557,  526, 495,
+  464,  433,  402,  371,  340,  309, 278,  247,  216,  185,  154,  123, 92,
+  61,   30,   31,   62,   93,   124, 155,  186,  217,  248,  279,  310, 341,
+  372,  403,  434,  465,  496,  527, 558,  589,  620,  651,  682,  713, 744,
+  775,  806,  837,  868,  899,  930, 961,  992,  993,  962,  931,  900, 869,
+  838,  807,  776,  745,  714,  683, 652,  621,  590,  559,  528,  497, 466,
+  435,  404,  373,  342,  311,  280, 249,  218,  187,  156,  125,  94,  63,
+  95,   126,  157,  188,  219,  250, 281,  312,  343,  374,  405,  436, 467,
+  498,  529,  560,  591,  622,  653, 684,  715,  746,  777,  808,  839, 870,
+  901,  932,  963,  994,  995,  964, 933,  902,  871,  840,  809,  778, 747,
+  716,  685,  654,  623,  592,  561, 530,  499,  468,  437,  406,  375, 344,
+  313,  282,  251,  220,  189,  158, 127,  159,  190,  221,  252,  283, 314,
+  345,  376,  407,  438,  469,  500, 531,  562,  593,  624,  655,  686, 717,
+  748,  779,  810,  841,  872,  903, 934,  965,  996,  997,  966,  935, 904,
+  873,  842,  811,  780,  749,  718, 687,  656,  625,  594,  563,  532, 501,
+  470,  439,  408,  377,  346,  315, 284,  253,  222,  191,  223,  254, 285,
+  316,  347,  378,  409,  440,  471, 502,  533,  564,  595,  626,  657, 688,
+  719,  750,  781,  812,  843,  874, 905,  936,  967,  998,  999,  968, 937,
+  906,  875,  844,  813,  782,  751, 720,  689,  658,  627,  596,  565, 534,
+  503,  472,  441,  410,  379,  348, 317,  286,  255,  287,  318,  349, 380,
+  411,  442,  473,  504,  535,  566, 597,  628,  659,  690,  721,  752, 783,
+  814,  845,  876,  907,  938,  969, 1000, 1001, 970,  939,  908,  877, 846,
+  815,  784,  753,  722,  691,  660, 629,  598,  567,  536,  505,  474, 443,
+  412,  381,  350,  319,  351,  382, 413,  444,  475,  506,  537,  568, 599,
+  630,  661,  692,  723,  754,  785, 816,  847,  878,  909,  940,  971, 1002,
+  1003, 972,  941,  910,  879,  848, 817,  786,  755,  724,  693,  662, 631,
+  600,  569,  538,  507,  476,  445, 414,  383,  415,  446,  477,  508, 539,
+  570,  601,  632,  663,  694,  725, 756,  787,  818,  849,  880,  911, 942,
+  973,  1004, 1005, 974,  943,  912, 881,  850,  819,  788,  757,  726, 695,
+  664,  633,  602,  571,  540,  509, 478,  447,  479,  510,  541,  572, 603,
+  634,  665,  696,  727,  758,  789, 820,  851,  882,  913,  944,  975, 1006,
+  1007, 976,  945,  914,  883,  852, 821,  790,  759,  728,  697,  666, 635,
+  604,  573,  542,  511,  543,  574, 605,  636,  667,  698,  729,  760, 791,
+  822,  853,  884,  915,  946,  977, 1008, 1009, 978,  947,  916,  885, 854,
+  823,  792,  761,  730,  699,  668, 637,  606,  575,  607,  638,  669, 700,
+  731,  762,  793,  824,  855,  886, 917,  948,  979,  1010, 1011, 980, 949,
+  918,  887,  856,  825,  794,  763, 732,  701,  670,  639,  671,  702, 733,
+  764,  795,  826,  857,  888,  919, 950,  981,  1012, 1013, 982,  951, 920,
+  889,  858,  827,  796,  765,  734, 703,  735,  766,  797,  828,  859, 890,
+  921,  952,  983,  1014, 1015, 984, 953,  922,  891,  860,  829,  798, 767,
+  799,  830,  861,  892,  923,  954, 985,  1016, 1017, 986,  955,  924, 893,
+  862,  831,  863,  894,  925,  956, 987,  1018, 1019, 988,  957,  926, 895,
+  927,  958,  989,  1020, 1021, 990, 959,  991,  1022, 1023
+};
+
+DECLARE_ALIGNED(16, static const int16_t,
+                av1_default_iscan_4x4[16]) = { 0, 1, 5,  6,  2, 4,  7,  12,
+                                               3, 8, 11, 13, 9, 10, 14, 15 };
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_4x4[16]) = {
+  0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_4x4[16]) = {
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x8[32]) = {
+  0,  1,  3,  6,  2,  4,  7,  10, 5,  8,  11, 14, 9,  12, 15, 18,
+  13, 16, 19, 22, 17, 20, 23, 26, 21, 24, 27, 29, 25, 28, 30, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_4x8[32]) = {
+  0, 8,  16, 24, 1, 9,  17, 25, 2, 10, 18, 26, 3, 11, 19, 27,
+  4, 12, 20, 28, 5, 13, 21, 29, 6, 14, 22, 30, 7, 15, 23, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_4x8[32]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x4[32]) = {
+  0, 2, 5,  9,  13, 17, 21, 25, 1, 4,  8,  12, 16, 20, 24, 28,
+  3, 7, 11, 15, 19, 23, 27, 30, 6, 10, 14, 18, 22, 26, 29, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_8x4[32]) = {
+  0, 4, 8,  12, 16, 20, 24, 28, 1, 5, 9,  13, 17, 21, 25, 29,
+  2, 6, 10, 14, 18, 22, 26, 30, 3, 7, 11, 15, 19, 23, 27, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_8x4[32]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x16[64]) = {
+  0,  1,  3,  6,  2,  4,  7,  10, 5,  8,  11, 14, 9,  12, 15, 18,
+  13, 16, 19, 22, 17, 20, 23, 26, 21, 24, 27, 30, 25, 28, 31, 34,
+  29, 32, 35, 38, 33, 36, 39, 42, 37, 40, 43, 46, 41, 44, 47, 50,
+  45, 48, 51, 54, 49, 52, 55, 58, 53, 56, 59, 61, 57, 60, 62, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x4[64]) = {
+  0, 2,  5,  9,  13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53, 57,
+  1, 4,  8,  12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60,
+  3, 7,  11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55, 59, 62,
+  6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 50, 54, 58, 61, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_4x16[64]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_16x4[64]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_4x16[64]) = {
+  0,  16, 32, 48, 1,  17, 33, 49, 2,  18, 34, 50, 3,  19, 35, 51,
+  4,  20, 36, 52, 5,  21, 37, 53, 6,  22, 38, 54, 7,  23, 39, 55,
+  8,  24, 40, 56, 9,  25, 41, 57, 10, 26, 42, 58, 11, 27, 43, 59,
+  12, 28, 44, 60, 13, 29, 45, 61, 14, 30, 46, 62, 15, 31, 47, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_16x4[64]) = {
+  0, 4, 8,  12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60,
+  1, 5, 9,  13, 17, 21, 25, 29, 33, 37, 41, 45, 49, 53, 57, 61,
+  2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46, 50, 54, 58, 62,
+  3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47, 51, 55, 59, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x32[256]) = {
+  0,   1,   3,   6,   10,  15,  21,  28,  2,   4,   7,   11,  16,  22,  29,
+  36,  5,   8,   12,  17,  23,  30,  37,  44,  9,   13,  18,  24,  31,  38,
+  45,  52,  14,  19,  25,  32,  39,  46,  53,  60,  20,  26,  33,  40,  47,
+  54,  61,  68,  27,  34,  41,  48,  55,  62,  69,  76,  35,  42,  49,  56,
+  63,  70,  77,  84,  43,  50,  57,  64,  71,  78,  85,  92,  51,  58,  65,
+  72,  79,  86,  93,  100, 59,  66,  73,  80,  87,  94,  101, 108, 67,  74,
+  81,  88,  95,  102, 109, 116, 75,  82,  89,  96,  103, 110, 117, 124, 83,
+  90,  97,  104, 111, 118, 125, 132, 91,  98,  105, 112, 119, 126, 133, 140,
+  99,  106, 113, 120, 127, 134, 141, 148, 107, 114, 121, 128, 135, 142, 149,
+  156, 115, 122, 129, 136, 143, 150, 157, 164, 123, 130, 137, 144, 151, 158,
+  165, 172, 131, 138, 145, 152, 159, 166, 173, 180, 139, 146, 153, 160, 167,
+  174, 181, 188, 147, 154, 161, 168, 175, 182, 189, 196, 155, 162, 169, 176,
+  183, 190, 197, 204, 163, 170, 177, 184, 191, 198, 205, 212, 171, 178, 185,
+  192, 199, 206, 213, 220, 179, 186, 193, 200, 207, 214, 221, 228, 187, 194,
+  201, 208, 215, 222, 229, 235, 195, 202, 209, 216, 223, 230, 236, 241, 203,
+  210, 217, 224, 231, 237, 242, 246, 211, 218, 225, 232, 238, 243, 247, 250,
+  219, 226, 233, 239, 244, 248, 251, 253, 227, 234, 240, 245, 249, 252, 254,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x8[256]) = {
+  0,   2,   5,   9,   14,  20,  27,  35,  43,  51,  59,  67,  75,  83,  91,
+  99,  107, 115, 123, 131, 139, 147, 155, 163, 171, 179, 187, 195, 203, 211,
+  219, 227, 1,   4,   8,   13,  19,  26,  34,  42,  50,  58,  66,  74,  82,
+  90,  98,  106, 114, 122, 130, 138, 146, 154, 162, 170, 178, 186, 194, 202,
+  210, 218, 226, 234, 3,   7,   12,  18,  25,  33,  41,  49,  57,  65,  73,
+  81,  89,  97,  105, 113, 121, 129, 137, 145, 153, 161, 169, 177, 185, 193,
+  201, 209, 217, 225, 233, 240, 6,   11,  17,  24,  32,  40,  48,  56,  64,
+  72,  80,  88,  96,  104, 112, 120, 128, 136, 144, 152, 160, 168, 176, 184,
+  192, 200, 208, 216, 224, 232, 239, 245, 10,  16,  23,  31,  39,  47,  55,
+  63,  71,  79,  87,  95,  103, 111, 119, 127, 135, 143, 151, 159, 167, 175,
+  183, 191, 199, 207, 215, 223, 231, 238, 244, 249, 15,  22,  30,  38,  46,
+  54,  62,  70,  78,  86,  94,  102, 110, 118, 126, 134, 142, 150, 158, 166,
+  174, 182, 190, 198, 206, 214, 222, 230, 237, 243, 248, 252, 21,  29,  37,
+  45,  53,  61,  69,  77,  85,  93,  101, 109, 117, 125, 133, 141, 149, 157,
+  165, 173, 181, 189, 197, 205, 213, 221, 229, 236, 242, 247, 251, 254, 28,
+  36,  44,  52,  60,  68,  76,  84,  92,  100, 108, 116, 124, 132, 140, 148,
+  156, 164, 172, 180, 188, 196, 204, 212, 220, 228, 235, 241, 246, 250, 253,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_8x32[256]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_32x8[256]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_8x32[256]) = {
+  0,  32, 64, 96,  128, 160, 192, 224, 1,  33, 65, 97,  129, 161, 193, 225,
+  2,  34, 66, 98,  130, 162, 194, 226, 3,  35, 67, 99,  131, 163, 195, 227,
+  4,  36, 68, 100, 132, 164, 196, 228, 5,  37, 69, 101, 133, 165, 197, 229,
+  6,  38, 70, 102, 134, 166, 198, 230, 7,  39, 71, 103, 135, 167, 199, 231,
+  8,  40, 72, 104, 136, 168, 200, 232, 9,  41, 73, 105, 137, 169, 201, 233,
+  10, 42, 74, 106, 138, 170, 202, 234, 11, 43, 75, 107, 139, 171, 203, 235,
+  12, 44, 76, 108, 140, 172, 204, 236, 13, 45, 77, 109, 141, 173, 205, 237,
+  14, 46, 78, 110, 142, 174, 206, 238, 15, 47, 79, 111, 143, 175, 207, 239,
+  16, 48, 80, 112, 144, 176, 208, 240, 17, 49, 81, 113, 145, 177, 209, 241,
+  18, 50, 82, 114, 146, 178, 210, 242, 19, 51, 83, 115, 147, 179, 211, 243,
+  20, 52, 84, 116, 148, 180, 212, 244, 21, 53, 85, 117, 149, 181, 213, 245,
+  22, 54, 86, 118, 150, 182, 214, 246, 23, 55, 87, 119, 151, 183, 215, 247,
+  24, 56, 88, 120, 152, 184, 216, 248, 25, 57, 89, 121, 153, 185, 217, 249,
+  26, 58, 90, 122, 154, 186, 218, 250, 27, 59, 91, 123, 155, 187, 219, 251,
+  28, 60, 92, 124, 156, 188, 220, 252, 29, 61, 93, 125, 157, 189, 221, 253,
+  30, 62, 94, 126, 158, 190, 222, 254, 31, 63, 95, 127, 159, 191, 223, 255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_32x8[256]) = {
+  0,   8,   16,  24,  32,  40,  48,  56,  64,  72,  80,  88,  96,  104, 112,
+  120, 128, 136, 144, 152, 160, 168, 176, 184, 192, 200, 208, 216, 224, 232,
+  240, 248, 1,   9,   17,  25,  33,  41,  49,  57,  65,  73,  81,  89,  97,
+  105, 113, 121, 129, 137, 145, 153, 161, 169, 177, 185, 193, 201, 209, 217,
+  225, 233, 241, 249, 2,   10,  18,  26,  34,  42,  50,  58,  66,  74,  82,
+  90,  98,  106, 114, 122, 130, 138, 146, 154, 162, 170, 178, 186, 194, 202,
+  210, 218, 226, 234, 242, 250, 3,   11,  19,  27,  35,  43,  51,  59,  67,
+  75,  83,  91,  99,  107, 115, 123, 131, 139, 147, 155, 163, 171, 179, 187,
+  195, 203, 211, 219, 227, 235, 243, 251, 4,   12,  20,  28,  36,  44,  52,
+  60,  68,  76,  84,  92,  100, 108, 116, 124, 132, 140, 148, 156, 164, 172,
+  180, 188, 196, 204, 212, 220, 228, 236, 244, 252, 5,   13,  21,  29,  37,
+  45,  53,  61,  69,  77,  85,  93,  101, 109, 117, 125, 133, 141, 149, 157,
+  165, 173, 181, 189, 197, 205, 213, 221, 229, 237, 245, 253, 6,   14,  22,
+  30,  38,  46,  54,  62,  70,  78,  86,  94,  102, 110, 118, 126, 134, 142,
+  150, 158, 166, 174, 182, 190, 198, 206, 214, 222, 230, 238, 246, 254, 7,
+  15,  23,  31,  39,  47,  55,  63,  71,  79,  87,  95,  103, 111, 119, 127,
+  135, 143, 151, 159, 167, 175, 183, 191, 199, 207, 215, 223, 231, 239, 247,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_8x8[64]) = {
+  0, 8,  16, 24, 32, 40, 48, 56, 1, 9,  17, 25, 33, 41, 49, 57,
+  2, 10, 18, 26, 34, 42, 50, 58, 3, 11, 19, 27, 35, 43, 51, 59,
+  4, 12, 20, 28, 36, 44, 52, 60, 5, 13, 21, 29, 37, 45, 53, 61,
+  6, 14, 22, 30, 38, 46, 54, 62, 7, 15, 23, 31, 39, 47, 55, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_8x8[64]) = {
+  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+  48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x8[64]) = {
+  0,  1,  5,  6,  14, 15, 27, 28, 2,  4,  7,  13, 16, 26, 29, 42,
+  3,  8,  12, 17, 25, 30, 41, 43, 9,  11, 18, 24, 31, 40, 44, 53,
+  10, 19, 23, 32, 39, 45, 52, 54, 20, 22, 33, 38, 46, 51, 55, 60,
+  21, 34, 37, 47, 50, 56, 59, 61, 35, 36, 48, 49, 57, 58, 62, 63
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_8x16[128]) = {
+  0,  1,  3,   6,   10,  15,  21,  28,  2,  4,   7,   11,  16,  22,  29,  36,
+  5,  8,  12,  17,  23,  30,  37,  44,  9,  13,  18,  24,  31,  38,  45,  52,
+  14, 19, 25,  32,  39,  46,  53,  60,  20, 26,  33,  40,  47,  54,  61,  68,
+  27, 34, 41,  48,  55,  62,  69,  76,  35, 42,  49,  56,  63,  70,  77,  84,
+  43, 50, 57,  64,  71,  78,  85,  92,  51, 58,  65,  72,  79,  86,  93,  100,
+  59, 66, 73,  80,  87,  94,  101, 107, 67, 74,  81,  88,  95,  102, 108, 113,
+  75, 82, 89,  96,  103, 109, 114, 118, 83, 90,  97,  104, 110, 115, 119, 122,
+  91, 98, 105, 111, 116, 120, 123, 125, 99, 106, 112, 117, 121, 124, 126, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x8[128]) = {
+  0,  2,  5,  9,  14, 20, 27, 35, 43, 51,  59,  67,  75,  83,  91,  99,
+  1,  4,  8,  13, 19, 26, 34, 42, 50, 58,  66,  74,  82,  90,  98,  106,
+  3,  7,  12, 18, 25, 33, 41, 49, 57, 65,  73,  81,  89,  97,  105, 112,
+  6,  11, 17, 24, 32, 40, 48, 56, 64, 72,  80,  88,  96,  104, 111, 117,
+  10, 16, 23, 31, 39, 47, 55, 63, 71, 79,  87,  95,  103, 110, 116, 121,
+  15, 22, 30, 38, 46, 54, 62, 70, 78, 86,  94,  102, 109, 115, 120, 124,
+  21, 29, 37, 45, 53, 61, 69, 77, 85, 93,  101, 108, 114, 119, 123, 126,
+  28, 36, 44, 52, 60, 68, 76, 84, 92, 100, 107, 113, 118, 122, 125, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_8x16[128]) = {
+  0,  16, 32, 48, 64, 80, 96,  112, 1,  17, 33, 49, 65, 81, 97,  113,
+  2,  18, 34, 50, 66, 82, 98,  114, 3,  19, 35, 51, 67, 83, 99,  115,
+  4,  20, 36, 52, 68, 84, 100, 116, 5,  21, 37, 53, 69, 85, 101, 117,
+  6,  22, 38, 54, 70, 86, 102, 118, 7,  23, 39, 55, 71, 87, 103, 119,
+  8,  24, 40, 56, 72, 88, 104, 120, 9,  25, 41, 57, 73, 89, 105, 121,
+  10, 26, 42, 58, 74, 90, 106, 122, 11, 27, 43, 59, 75, 91, 107, 123,
+  12, 28, 44, 60, 76, 92, 108, 124, 13, 29, 45, 61, 77, 93, 109, 125,
+  14, 30, 46, 62, 78, 94, 110, 126, 15, 31, 47, 63, 79, 95, 111, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_16x8[128]) = {
+  0, 8,  16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96,  104, 112, 120,
+  1, 9,  17, 25, 33, 41, 49, 57, 65, 73, 81, 89, 97,  105, 113, 121,
+  2, 10, 18, 26, 34, 42, 50, 58, 66, 74, 82, 90, 98,  106, 114, 122,
+  3, 11, 19, 27, 35, 43, 51, 59, 67, 75, 83, 91, 99,  107, 115, 123,
+  4, 12, 20, 28, 36, 44, 52, 60, 68, 76, 84, 92, 100, 108, 116, 124,
+  5, 13, 21, 29, 37, 45, 53, 61, 69, 77, 85, 93, 101, 109, 117, 125,
+  6, 14, 22, 30, 38, 46, 54, 62, 70, 78, 86, 94, 102, 110, 118, 126,
+  7, 15, 23, 31, 39, 47, 55, 63, 71, 79, 87, 95, 103, 111, 119, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_8x16[128]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_16x8[128]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x32[512]) = {
+  0,   1,   3,   6,   10,  15,  21,  28,  36,  45,  55,  66,  78,  91,  105,
+  120, 2,   4,   7,   11,  16,  22,  29,  37,  46,  56,  67,  79,  92,  106,
+  121, 136, 5,   8,   12,  17,  23,  30,  38,  47,  57,  68,  80,  93,  107,
+  122, 137, 152, 9,   13,  18,  24,  31,  39,  48,  58,  69,  81,  94,  108,
+  123, 138, 153, 168, 14,  19,  25,  32,  40,  49,  59,  70,  82,  95,  109,
+  124, 139, 154, 169, 184, 20,  26,  33,  41,  50,  60,  71,  83,  96,  110,
+  125, 140, 155, 170, 185, 200, 27,  34,  42,  51,  61,  72,  84,  97,  111,
+  126, 141, 156, 171, 186, 201, 216, 35,  43,  52,  62,  73,  85,  98,  112,
+  127, 142, 157, 172, 187, 202, 217, 232, 44,  53,  63,  74,  86,  99,  113,
+  128, 143, 158, 173, 188, 203, 218, 233, 248, 54,  64,  75,  87,  100, 114,
+  129, 144, 159, 174, 189, 204, 219, 234, 249, 264, 65,  76,  88,  101, 115,
+  130, 145, 160, 175, 190, 205, 220, 235, 250, 265, 280, 77,  89,  102, 116,
+  131, 146, 161, 176, 191, 206, 221, 236, 251, 266, 281, 296, 90,  103, 117,
+  132, 147, 162, 177, 192, 207, 222, 237, 252, 267, 282, 297, 312, 104, 118,
+  133, 148, 163, 178, 193, 208, 223, 238, 253, 268, 283, 298, 313, 328, 119,
+  134, 149, 164, 179, 194, 209, 224, 239, 254, 269, 284, 299, 314, 329, 344,
+  135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 285, 300, 315, 330, 345,
+  360, 151, 166, 181, 196, 211, 226, 241, 256, 271, 286, 301, 316, 331, 346,
+  361, 376, 167, 182, 197, 212, 227, 242, 257, 272, 287, 302, 317, 332, 347,
+  362, 377, 392, 183, 198, 213, 228, 243, 258, 273, 288, 303, 318, 333, 348,
+  363, 378, 393, 407, 199, 214, 229, 244, 259, 274, 289, 304, 319, 334, 349,
+  364, 379, 394, 408, 421, 215, 230, 245, 260, 275, 290, 305, 320, 335, 350,
+  365, 380, 395, 409, 422, 434, 231, 246, 261, 276, 291, 306, 321, 336, 351,
+  366, 381, 396, 410, 423, 435, 446, 247, 262, 277, 292, 307, 322, 337, 352,
+  367, 382, 397, 411, 424, 436, 447, 457, 263, 278, 293, 308, 323, 338, 353,
+  368, 383, 398, 412, 425, 437, 448, 458, 467, 279, 294, 309, 324, 339, 354,
+  369, 384, 399, 413, 426, 438, 449, 459, 468, 476, 295, 310, 325, 340, 355,
+  370, 385, 400, 414, 427, 439, 450, 460, 469, 477, 484, 311, 326, 341, 356,
+  371, 386, 401, 415, 428, 440, 451, 461, 470, 478, 485, 491, 327, 342, 357,
+  372, 387, 402, 416, 429, 441, 452, 462, 471, 479, 486, 492, 497, 343, 358,
+  373, 388, 403, 417, 430, 442, 453, 463, 472, 480, 487, 493, 498, 502, 359,
+  374, 389, 404, 418, 431, 443, 454, 464, 473, 481, 488, 494, 499, 503, 506,
+  375, 390, 405, 419, 432, 444, 455, 465, 474, 482, 489, 495, 500, 504, 507,
+  509, 391, 406, 420, 433, 445, 456, 466, 475, 483, 490, 496, 501, 505, 508,
+  510, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x16[512]) = {
+  0,   2,   5,   9,   14,  20,  27,  35,  44,  54,  65,  77,  90,  104, 119,
+  135, 151, 167, 183, 199, 215, 231, 247, 263, 279, 295, 311, 327, 343, 359,
+  375, 391, 1,   4,   8,   13,  19,  26,  34,  43,  53,  64,  76,  89,  103,
+  118, 134, 150, 166, 182, 198, 214, 230, 246, 262, 278, 294, 310, 326, 342,
+  358, 374, 390, 406, 3,   7,   12,  18,  25,  33,  42,  52,  63,  75,  88,
+  102, 117, 133, 149, 165, 181, 197, 213, 229, 245, 261, 277, 293, 309, 325,
+  341, 357, 373, 389, 405, 420, 6,   11,  17,  24,  32,  41,  51,  62,  74,
+  87,  101, 116, 132, 148, 164, 180, 196, 212, 228, 244, 260, 276, 292, 308,
+  324, 340, 356, 372, 388, 404, 419, 433, 10,  16,  23,  31,  40,  50,  61,
+  73,  86,  100, 115, 131, 147, 163, 179, 195, 211, 227, 243, 259, 275, 291,
+  307, 323, 339, 355, 371, 387, 403, 418, 432, 445, 15,  22,  30,  39,  49,
+  60,  72,  85,  99,  114, 130, 146, 162, 178, 194, 210, 226, 242, 258, 274,
+  290, 306, 322, 338, 354, 370, 386, 402, 417, 431, 444, 456, 21,  29,  38,
+  48,  59,  71,  84,  98,  113, 129, 145, 161, 177, 193, 209, 225, 241, 257,
+  273, 289, 305, 321, 337, 353, 369, 385, 401, 416, 430, 443, 455, 466, 28,
+  37,  47,  58,  70,  83,  97,  112, 128, 144, 160, 176, 192, 208, 224, 240,
+  256, 272, 288, 304, 320, 336, 352, 368, 384, 400, 415, 429, 442, 454, 465,
+  475, 36,  46,  57,  69,  82,  96,  111, 127, 143, 159, 175, 191, 207, 223,
+  239, 255, 271, 287, 303, 319, 335, 351, 367, 383, 399, 414, 428, 441, 453,
+  464, 474, 483, 45,  56,  68,  81,  95,  110, 126, 142, 158, 174, 190, 206,
+  222, 238, 254, 270, 286, 302, 318, 334, 350, 366, 382, 398, 413, 427, 440,
+  452, 463, 473, 482, 490, 55,  67,  80,  94,  109, 125, 141, 157, 173, 189,
+  205, 221, 237, 253, 269, 285, 301, 317, 333, 349, 365, 381, 397, 412, 426,
+  439, 451, 462, 472, 481, 489, 496, 66,  79,  93,  108, 124, 140, 156, 172,
+  188, 204, 220, 236, 252, 268, 284, 300, 316, 332, 348, 364, 380, 396, 411,
+  425, 438, 450, 461, 471, 480, 488, 495, 501, 78,  92,  107, 123, 139, 155,
+  171, 187, 203, 219, 235, 251, 267, 283, 299, 315, 331, 347, 363, 379, 395,
+  410, 424, 437, 449, 460, 470, 479, 487, 494, 500, 505, 91,  106, 122, 138,
+  154, 170, 186, 202, 218, 234, 250, 266, 282, 298, 314, 330, 346, 362, 378,
+  394, 409, 423, 436, 448, 459, 469, 478, 486, 493, 499, 504, 508, 105, 121,
+  137, 153, 169, 185, 201, 217, 233, 249, 265, 281, 297, 313, 329, 345, 361,
+  377, 393, 408, 422, 435, 447, 458, 468, 477, 485, 492, 498, 503, 507, 510,
+  120, 136, 152, 168, 184, 200, 216, 232, 248, 264, 280, 296, 312, 328, 344,
+  360, 376, 392, 407, 421, 434, 446, 457, 467, 476, 484, 491, 497, 502, 506,
+  509, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_16x32[512]) = {
+  0,  32, 64, 96,  128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 480,
+  1,  33, 65, 97,  129, 161, 193, 225, 257, 289, 321, 353, 385, 417, 449, 481,
+  2,  34, 66, 98,  130, 162, 194, 226, 258, 290, 322, 354, 386, 418, 450, 482,
+  3,  35, 67, 99,  131, 163, 195, 227, 259, 291, 323, 355, 387, 419, 451, 483,
+  4,  36, 68, 100, 132, 164, 196, 228, 260, 292, 324, 356, 388, 420, 452, 484,
+  5,  37, 69, 101, 133, 165, 197, 229, 261, 293, 325, 357, 389, 421, 453, 485,
+  6,  38, 70, 102, 134, 166, 198, 230, 262, 294, 326, 358, 390, 422, 454, 486,
+  7,  39, 71, 103, 135, 167, 199, 231, 263, 295, 327, 359, 391, 423, 455, 487,
+  8,  40, 72, 104, 136, 168, 200, 232, 264, 296, 328, 360, 392, 424, 456, 488,
+  9,  41, 73, 105, 137, 169, 201, 233, 265, 297, 329, 361, 393, 425, 457, 489,
+  10, 42, 74, 106, 138, 170, 202, 234, 266, 298, 330, 362, 394, 426, 458, 490,
+  11, 43, 75, 107, 139, 171, 203, 235, 267, 299, 331, 363, 395, 427, 459, 491,
+  12, 44, 76, 108, 140, 172, 204, 236, 268, 300, 332, 364, 396, 428, 460, 492,
+  13, 45, 77, 109, 141, 173, 205, 237, 269, 301, 333, 365, 397, 429, 461, 493,
+  14, 46, 78, 110, 142, 174, 206, 238, 270, 302, 334, 366, 398, 430, 462, 494,
+  15, 47, 79, 111, 143, 175, 207, 239, 271, 303, 335, 367, 399, 431, 463, 495,
+  16, 48, 80, 112, 144, 176, 208, 240, 272, 304, 336, 368, 400, 432, 464, 496,
+  17, 49, 81, 113, 145, 177, 209, 241, 273, 305, 337, 369, 401, 433, 465, 497,
+  18, 50, 82, 114, 146, 178, 210, 242, 274, 306, 338, 370, 402, 434, 466, 498,
+  19, 51, 83, 115, 147, 179, 211, 243, 275, 307, 339, 371, 403, 435, 467, 499,
+  20, 52, 84, 116, 148, 180, 212, 244, 276, 308, 340, 372, 404, 436, 468, 500,
+  21, 53, 85, 117, 149, 181, 213, 245, 277, 309, 341, 373, 405, 437, 469, 501,
+  22, 54, 86, 118, 150, 182, 214, 246, 278, 310, 342, 374, 406, 438, 470, 502,
+  23, 55, 87, 119, 151, 183, 215, 247, 279, 311, 343, 375, 407, 439, 471, 503,
+  24, 56, 88, 120, 152, 184, 216, 248, 280, 312, 344, 376, 408, 440, 472, 504,
+  25, 57, 89, 121, 153, 185, 217, 249, 281, 313, 345, 377, 409, 441, 473, 505,
+  26, 58, 90, 122, 154, 186, 218, 250, 282, 314, 346, 378, 410, 442, 474, 506,
+  27, 59, 91, 123, 155, 187, 219, 251, 283, 315, 347, 379, 411, 443, 475, 507,
+  28, 60, 92, 124, 156, 188, 220, 252, 284, 316, 348, 380, 412, 444, 476, 508,
+  29, 61, 93, 125, 157, 189, 221, 253, 285, 317, 349, 381, 413, 445, 477, 509,
+  30, 62, 94, 126, 158, 190, 222, 254, 286, 318, 350, 382, 414, 446, 478, 510,
+  31, 63, 95, 127, 159, 191, 223, 255, 287, 319, 351, 383, 415, 447, 479, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_32x16[512]) = {
+  0,   16,  32,  48,  64,  80,  96,  112, 128, 144, 160, 176, 192, 208, 224,
+  240, 256, 272, 288, 304, 320, 336, 352, 368, 384, 400, 416, 432, 448, 464,
+  480, 496, 1,   17,  33,  49,  65,  81,  97,  113, 129, 145, 161, 177, 193,
+  209, 225, 241, 257, 273, 289, 305, 321, 337, 353, 369, 385, 401, 417, 433,
+  449, 465, 481, 497, 2,   18,  34,  50,  66,  82,  98,  114, 130, 146, 162,
+  178, 194, 210, 226, 242, 258, 274, 290, 306, 322, 338, 354, 370, 386, 402,
+  418, 434, 450, 466, 482, 498, 3,   19,  35,  51,  67,  83,  99,  115, 131,
+  147, 163, 179, 195, 211, 227, 243, 259, 275, 291, 307, 323, 339, 355, 371,
+  387, 403, 419, 435, 451, 467, 483, 499, 4,   20,  36,  52,  68,  84,  100,
+  116, 132, 148, 164, 180, 196, 212, 228, 244, 260, 276, 292, 308, 324, 340,
+  356, 372, 388, 404, 420, 436, 452, 468, 484, 500, 5,   21,  37,  53,  69,
+  85,  101, 117, 133, 149, 165, 181, 197, 213, 229, 245, 261, 277, 293, 309,
+  325, 341, 357, 373, 389, 405, 421, 437, 453, 469, 485, 501, 6,   22,  38,
+  54,  70,  86,  102, 118, 134, 150, 166, 182, 198, 214, 230, 246, 262, 278,
+  294, 310, 326, 342, 358, 374, 390, 406, 422, 438, 454, 470, 486, 502, 7,
+  23,  39,  55,  71,  87,  103, 119, 135, 151, 167, 183, 199, 215, 231, 247,
+  263, 279, 295, 311, 327, 343, 359, 375, 391, 407, 423, 439, 455, 471, 487,
+  503, 8,   24,  40,  56,  72,  88,  104, 120, 136, 152, 168, 184, 200, 216,
+  232, 248, 264, 280, 296, 312, 328, 344, 360, 376, 392, 408, 424, 440, 456,
+  472, 488, 504, 9,   25,  41,  57,  73,  89,  105, 121, 137, 153, 169, 185,
+  201, 217, 233, 249, 265, 281, 297, 313, 329, 345, 361, 377, 393, 409, 425,
+  441, 457, 473, 489, 505, 10,  26,  42,  58,  74,  90,  106, 122, 138, 154,
+  170, 186, 202, 218, 234, 250, 266, 282, 298, 314, 330, 346, 362, 378, 394,
+  410, 426, 442, 458, 474, 490, 506, 11,  27,  43,  59,  75,  91,  107, 123,
+  139, 155, 171, 187, 203, 219, 235, 251, 267, 283, 299, 315, 331, 347, 363,
+  379, 395, 411, 427, 443, 459, 475, 491, 507, 12,  28,  44,  60,  76,  92,
+  108, 124, 140, 156, 172, 188, 204, 220, 236, 252, 268, 284, 300, 316, 332,
+  348, 364, 380, 396, 412, 428, 444, 460, 476, 492, 508, 13,  29,  45,  61,
+  77,  93,  109, 125, 141, 157, 173, 189, 205, 221, 237, 253, 269, 285, 301,
+  317, 333, 349, 365, 381, 397, 413, 429, 445, 461, 477, 493, 509, 14,  30,
+  46,  62,  78,  94,  110, 126, 142, 158, 174, 190, 206, 222, 238, 254, 270,
+  286, 302, 318, 334, 350, 366, 382, 398, 414, 430, 446, 462, 478, 494, 510,
+  15,  31,  47,  63,  79,  95,  111, 127, 143, 159, 175, 191, 207, 223, 239,
+  255, 271, 287, 303, 319, 335, 351, 367, 383, 399, 415, 431, 447, 463, 479,
+  495, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_16x32[512]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+  270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+  285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+  300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+  315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329,
+  330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+  345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
+  360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
+  375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
+  390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
+  405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419,
+  420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
+  435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449,
+  450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464,
+  465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479,
+  480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494,
+  495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509,
+  510, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_32x16[512]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+  270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+  285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+  300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+  315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329,
+  330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+  345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
+  360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374,
+  375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
+  390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
+  405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419,
+  420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
+  435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449,
+  450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464,
+  465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479,
+  480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494,
+  495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509,
+  510, 511,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_16x16[256]) = {
+  0,  16, 32, 48, 64, 80, 96,  112, 128, 144, 160, 176, 192, 208, 224, 240,
+  1,  17, 33, 49, 65, 81, 97,  113, 129, 145, 161, 177, 193, 209, 225, 241,
+  2,  18, 34, 50, 66, 82, 98,  114, 130, 146, 162, 178, 194, 210, 226, 242,
+  3,  19, 35, 51, 67, 83, 99,  115, 131, 147, 163, 179, 195, 211, 227, 243,
+  4,  20, 36, 52, 68, 84, 100, 116, 132, 148, 164, 180, 196, 212, 228, 244,
+  5,  21, 37, 53, 69, 85, 101, 117, 133, 149, 165, 181, 197, 213, 229, 245,
+  6,  22, 38, 54, 70, 86, 102, 118, 134, 150, 166, 182, 198, 214, 230, 246,
+  7,  23, 39, 55, 71, 87, 103, 119, 135, 151, 167, 183, 199, 215, 231, 247,
+  8,  24, 40, 56, 72, 88, 104, 120, 136, 152, 168, 184, 200, 216, 232, 248,
+  9,  25, 41, 57, 73, 89, 105, 121, 137, 153, 169, 185, 201, 217, 233, 249,
+  10, 26, 42, 58, 74, 90, 106, 122, 138, 154, 170, 186, 202, 218, 234, 250,
+  11, 27, 43, 59, 75, 91, 107, 123, 139, 155, 171, 187, 203, 219, 235, 251,
+  12, 28, 44, 60, 76, 92, 108, 124, 140, 156, 172, 188, 204, 220, 236, 252,
+  13, 29, 45, 61, 77, 93, 109, 125, 141, 157, 173, 189, 205, 221, 237, 253,
+  14, 30, 46, 62, 78, 94, 110, 126, 142, 158, 174, 190, 206, 222, 238, 254,
+  15, 31, 47, 63, 79, 95, 111, 127, 143, 159, 175, 191, 207, 223, 239, 255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_16x16[256]) = {
+  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+  90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+  105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+  120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+  135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+  150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+  165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+  180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+  195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+  210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+  225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+  240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+  255,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_16x16[256]) = {
+  0,   1,   5,   6,   14,  15,  27,  28,  44,  45,  65,  66,  90,  91,  119,
+  120, 2,   4,   7,   13,  16,  26,  29,  43,  46,  64,  67,  89,  92,  118,
+  121, 150, 3,   8,   12,  17,  25,  30,  42,  47,  63,  68,  88,  93,  117,
+  122, 149, 151, 9,   11,  18,  24,  31,  41,  48,  62,  69,  87,  94,  116,
+  123, 148, 152, 177, 10,  19,  23,  32,  40,  49,  61,  70,  86,  95,  115,
+  124, 147, 153, 176, 178, 20,  22,  33,  39,  50,  60,  71,  85,  96,  114,
+  125, 146, 154, 175, 179, 200, 21,  34,  38,  51,  59,  72,  84,  97,  113,
+  126, 145, 155, 174, 180, 199, 201, 35,  37,  52,  58,  73,  83,  98,  112,
+  127, 144, 156, 173, 181, 198, 202, 219, 36,  53,  57,  74,  82,  99,  111,
+  128, 143, 157, 172, 182, 197, 203, 218, 220, 54,  56,  75,  81,  100, 110,
+  129, 142, 158, 171, 183, 196, 204, 217, 221, 234, 55,  76,  80,  101, 109,
+  130, 141, 159, 170, 184, 195, 205, 216, 222, 233, 235, 77,  79,  102, 108,
+  131, 140, 160, 169, 185, 194, 206, 215, 223, 232, 236, 245, 78,  103, 107,
+  132, 139, 161, 168, 186, 193, 207, 214, 224, 231, 237, 244, 246, 104, 106,
+  133, 138, 162, 167, 187, 192, 208, 213, 225, 230, 238, 243, 247, 252, 105,
+  134, 137, 163, 166, 188, 191, 209, 212, 226, 229, 239, 242, 248, 251, 253,
+  135, 136, 164, 165, 189, 190, 210, 211, 227, 228, 240, 241, 249, 250, 254,
+  255
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mcol_iscan_32x32[1024]) = {
+  0,   32,   64,  96,   128, 160,  192, 224,  256, 288,  320, 352,  384, 416,
+  448, 480,  512, 544,  576, 608,  640, 672,  704, 736,  768, 800,  832, 864,
+  896, 928,  960, 992,  1,   33,   65,  97,   129, 161,  193, 225,  257, 289,
+  321, 353,  385, 417,  449, 481,  513, 545,  577, 609,  641, 673,  705, 737,
+  769, 801,  833, 865,  897, 929,  961, 993,  2,   34,   66,  98,   130, 162,
+  194, 226,  258, 290,  322, 354,  386, 418,  450, 482,  514, 546,  578, 610,
+  642, 674,  706, 738,  770, 802,  834, 866,  898, 930,  962, 994,  3,   35,
+  67,  99,   131, 163,  195, 227,  259, 291,  323, 355,  387, 419,  451, 483,
+  515, 547,  579, 611,  643, 675,  707, 739,  771, 803,  835, 867,  899, 931,
+  963, 995,  4,   36,   68,  100,  132, 164,  196, 228,  260, 292,  324, 356,
+  388, 420,  452, 484,  516, 548,  580, 612,  644, 676,  708, 740,  772, 804,
+  836, 868,  900, 932,  964, 996,  5,   37,   69,  101,  133, 165,  197, 229,
+  261, 293,  325, 357,  389, 421,  453, 485,  517, 549,  581, 613,  645, 677,
+  709, 741,  773, 805,  837, 869,  901, 933,  965, 997,  6,   38,   70,  102,
+  134, 166,  198, 230,  262, 294,  326, 358,  390, 422,  454, 486,  518, 550,
+  582, 614,  646, 678,  710, 742,  774, 806,  838, 870,  902, 934,  966, 998,
+  7,   39,   71,  103,  135, 167,  199, 231,  263, 295,  327, 359,  391, 423,
+  455, 487,  519, 551,  583, 615,  647, 679,  711, 743,  775, 807,  839, 871,
+  903, 935,  967, 999,  8,   40,   72,  104,  136, 168,  200, 232,  264, 296,
+  328, 360,  392, 424,  456, 488,  520, 552,  584, 616,  648, 680,  712, 744,
+  776, 808,  840, 872,  904, 936,  968, 1000, 9,   41,   73,  105,  137, 169,
+  201, 233,  265, 297,  329, 361,  393, 425,  457, 489,  521, 553,  585, 617,
+  649, 681,  713, 745,  777, 809,  841, 873,  905, 937,  969, 1001, 10,  42,
+  74,  106,  138, 170,  202, 234,  266, 298,  330, 362,  394, 426,  458, 490,
+  522, 554,  586, 618,  650, 682,  714, 746,  778, 810,  842, 874,  906, 938,
+  970, 1002, 11,  43,   75,  107,  139, 171,  203, 235,  267, 299,  331, 363,
+  395, 427,  459, 491,  523, 555,  587, 619,  651, 683,  715, 747,  779, 811,
+  843, 875,  907, 939,  971, 1003, 12,  44,   76,  108,  140, 172,  204, 236,
+  268, 300,  332, 364,  396, 428,  460, 492,  524, 556,  588, 620,  652, 684,
+  716, 748,  780, 812,  844, 876,  908, 940,  972, 1004, 13,  45,   77,  109,
+  141, 173,  205, 237,  269, 301,  333, 365,  397, 429,  461, 493,  525, 557,
+  589, 621,  653, 685,  717, 749,  781, 813,  845, 877,  909, 941,  973, 1005,
+  14,  46,   78,  110,  142, 174,  206, 238,  270, 302,  334, 366,  398, 430,
+  462, 494,  526, 558,  590, 622,  654, 686,  718, 750,  782, 814,  846, 878,
+  910, 942,  974, 1006, 15,  47,   79,  111,  143, 175,  207, 239,  271, 303,
+  335, 367,  399, 431,  463, 495,  527, 559,  591, 623,  655, 687,  719, 751,
+  783, 815,  847, 879,  911, 943,  975, 1007, 16,  48,   80,  112,  144, 176,
+  208, 240,  272, 304,  336, 368,  400, 432,  464, 496,  528, 560,  592, 624,
+  656, 688,  720, 752,  784, 816,  848, 880,  912, 944,  976, 1008, 17,  49,
+  81,  113,  145, 177,  209, 241,  273, 305,  337, 369,  401, 433,  465, 497,
+  529, 561,  593, 625,  657, 689,  721, 753,  785, 817,  849, 881,  913, 945,
+  977, 1009, 18,  50,   82,  114,  146, 178,  210, 242,  274, 306,  338, 370,
+  402, 434,  466, 498,  530, 562,  594, 626,  658, 690,  722, 754,  786, 818,
+  850, 882,  914, 946,  978, 1010, 19,  51,   83,  115,  147, 179,  211, 243,
+  275, 307,  339, 371,  403, 435,  467, 499,  531, 563,  595, 627,  659, 691,
+  723, 755,  787, 819,  851, 883,  915, 947,  979, 1011, 20,  52,   84,  116,
+  148, 180,  212, 244,  276, 308,  340, 372,  404, 436,  468, 500,  532, 564,
+  596, 628,  660, 692,  724, 756,  788, 820,  852, 884,  916, 948,  980, 1012,
+  21,  53,   85,  117,  149, 181,  213, 245,  277, 309,  341, 373,  405, 437,
+  469, 501,  533, 565,  597, 629,  661, 693,  725, 757,  789, 821,  853, 885,
+  917, 949,  981, 1013, 22,  54,   86,  118,  150, 182,  214, 246,  278, 310,
+  342, 374,  406, 438,  470, 502,  534, 566,  598, 630,  662, 694,  726, 758,
+  790, 822,  854, 886,  918, 950,  982, 1014, 23,  55,   87,  119,  151, 183,
+  215, 247,  279, 311,  343, 375,  407, 439,  471, 503,  535, 567,  599, 631,
+  663, 695,  727, 759,  791, 823,  855, 887,  919, 951,  983, 1015, 24,  56,
+  88,  120,  152, 184,  216, 248,  280, 312,  344, 376,  408, 440,  472, 504,
+  536, 568,  600, 632,  664, 696,  728, 760,  792, 824,  856, 888,  920, 952,
+  984, 1016, 25,  57,   89,  121,  153, 185,  217, 249,  281, 313,  345, 377,
+  409, 441,  473, 505,  537, 569,  601, 633,  665, 697,  729, 761,  793, 825,
+  857, 889,  921, 953,  985, 1017, 26,  58,   90,  122,  154, 186,  218, 250,
+  282, 314,  346, 378,  410, 442,  474, 506,  538, 570,  602, 634,  666, 698,
+  730, 762,  794, 826,  858, 890,  922, 954,  986, 1018, 27,  59,   91,  123,
+  155, 187,  219, 251,  283, 315,  347, 379,  411, 443,  475, 507,  539, 571,
+  603, 635,  667, 699,  731, 763,  795, 827,  859, 891,  923, 955,  987, 1019,
+  28,  60,   92,  124,  156, 188,  220, 252,  284, 316,  348, 380,  412, 444,
+  476, 508,  540, 572,  604, 636,  668, 700,  732, 764,  796, 828,  860, 892,
+  924, 956,  988, 1020, 29,  61,   93,  125,  157, 189,  221, 253,  285, 317,
+  349, 381,  413, 445,  477, 509,  541, 573,  605, 637,  669, 701,  733, 765,
+  797, 829,  861, 893,  925, 957,  989, 1021, 30,  62,   94,  126,  158, 190,
+  222, 254,  286, 318,  350, 382,  414, 446,  478, 510,  542, 574,  606, 638,
+  670, 702,  734, 766,  798, 830,  862, 894,  926, 958,  990, 1022, 31,  63,
+  95,  127,  159, 191,  223, 255,  287, 319,  351, 383,  415, 447,  479, 511,
+  543, 575,  607, 639,  671, 703,  735, 767,  799, 831,  863, 895,  927, 959,
+  991, 1023,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_mrow_iscan_32x32[1024]) = {
+  0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    10,   11,   12,
+  13,   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,   25,
+  26,   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,
+  39,   40,   41,   42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
+  52,   53,   54,   55,   56,   57,   58,   59,   60,   61,   62,   63,   64,
+  65,   66,   67,   68,   69,   70,   71,   72,   73,   74,   75,   76,   77,
+  78,   79,   80,   81,   82,   83,   84,   85,   86,   87,   88,   89,   90,
+  91,   92,   93,   94,   95,   96,   97,   98,   99,   100,  101,  102,  103,
+  104,  105,  106,  107,  108,  109,  110,  111,  112,  113,  114,  115,  116,
+  117,  118,  119,  120,  121,  122,  123,  124,  125,  126,  127,  128,  129,
+  130,  131,  132,  133,  134,  135,  136,  137,  138,  139,  140,  141,  142,
+  143,  144,  145,  146,  147,  148,  149,  150,  151,  152,  153,  154,  155,
+  156,  157,  158,  159,  160,  161,  162,  163,  164,  165,  166,  167,  168,
+  169,  170,  171,  172,  173,  174,  175,  176,  177,  178,  179,  180,  181,
+  182,  183,  184,  185,  186,  187,  188,  189,  190,  191,  192,  193,  194,
+  195,  196,  197,  198,  199,  200,  201,  202,  203,  204,  205,  206,  207,
+  208,  209,  210,  211,  212,  213,  214,  215,  216,  217,  218,  219,  220,
+  221,  222,  223,  224,  225,  226,  227,  228,  229,  230,  231,  232,  233,
+  234,  235,  236,  237,  238,  239,  240,  241,  242,  243,  244,  245,  246,
+  247,  248,  249,  250,  251,  252,  253,  254,  255,  256,  257,  258,  259,
+  260,  261,  262,  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
+  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,  283,  284,  285,
+  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
+  299,  300,  301,  302,  303,  304,  305,  306,  307,  308,  309,  310,  311,
+  312,  313,  314,  315,  316,  317,  318,  319,  320,  321,  322,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,  334,  335,  336,  337,
+  338,  339,  340,  341,  342,  343,  344,  345,  346,  347,  348,  349,  350,
+  351,  352,  353,  354,  355,  356,  357,  358,  359,  360,  361,  362,  363,
+  364,  365,  366,  367,  368,  369,  370,  371,  372,  373,  374,  375,  376,
+  377,  378,  379,  380,  381,  382,  383,  384,  385,  386,  387,  388,  389,
+  390,  391,  392,  393,  394,  395,  396,  397,  398,  399,  400,  401,  402,
+  403,  404,  405,  406,  407,  408,  409,  410,  411,  412,  413,  414,  415,
+  416,  417,  418,  419,  420,  421,  422,  423,  424,  425,  426,  427,  428,
+  429,  430,  431,  432,  433,  434,  435,  436,  437,  438,  439,  440,  441,
+  442,  443,  444,  445,  446,  447,  448,  449,  450,  451,  452,  453,  454,
+  455,  456,  457,  458,  459,  460,  461,  462,  463,  464,  465,  466,  467,
+  468,  469,  470,  471,  472,  473,  474,  475,  476,  477,  478,  479,  480,
+  481,  482,  483,  484,  485,  486,  487,  488,  489,  490,  491,  492,  493,
+  494,  495,  496,  497,  498,  499,  500,  501,  502,  503,  504,  505,  506,
+  507,  508,  509,  510,  511,  512,  513,  514,  515,  516,  517,  518,  519,
+  520,  521,  522,  523,  524,  525,  526,  527,  528,  529,  530,  531,  532,
+  533,  534,  535,  536,  537,  538,  539,  540,  541,  542,  543,  544,  545,
+  546,  547,  548,  549,  550,  551,  552,  553,  554,  555,  556,  557,  558,
+  559,  560,  561,  562,  563,  564,  565,  566,  567,  568,  569,  570,  571,
+  572,  573,  574,  575,  576,  577,  578,  579,  580,  581,  582,  583,  584,
+  585,  586,  587,  588,  589,  590,  591,  592,  593,  594,  595,  596,  597,
+  598,  599,  600,  601,  602,  603,  604,  605,  606,  607,  608,  609,  610,
+  611,  612,  613,  614,  615,  616,  617,  618,  619,  620,  621,  622,  623,
+  624,  625,  626,  627,  628,  629,  630,  631,  632,  633,  634,  635,  636,
+  637,  638,  639,  640,  641,  642,  643,  644,  645,  646,  647,  648,  649,
+  650,  651,  652,  653,  654,  655,  656,  657,  658,  659,  660,  661,  662,
+  663,  664,  665,  666,  667,  668,  669,  670,  671,  672,  673,  674,  675,
+  676,  677,  678,  679,  680,  681,  682,  683,  684,  685,  686,  687,  688,
+  689,  690,  691,  692,  693,  694,  695,  696,  697,  698,  699,  700,  701,
+  702,  703,  704,  705,  706,  707,  708,  709,  710,  711,  712,  713,  714,
+  715,  716,  717,  718,  719,  720,  721,  722,  723,  724,  725,  726,  727,
+  728,  729,  730,  731,  732,  733,  734,  735,  736,  737,  738,  739,  740,
+  741,  742,  743,  744,  745,  746,  747,  748,  749,  750,  751,  752,  753,
+  754,  755,  756,  757,  758,  759,  760,  761,  762,  763,  764,  765,  766,
+  767,  768,  769,  770,  771,  772,  773,  774,  775,  776,  777,  778,  779,
+  780,  781,  782,  783,  784,  785,  786,  787,  788,  789,  790,  791,  792,
+  793,  794,  795,  796,  797,  798,  799,  800,  801,  802,  803,  804,  805,
+  806,  807,  808,  809,  810,  811,  812,  813,  814,  815,  816,  817,  818,
+  819,  820,  821,  822,  823,  824,  825,  826,  827,  828,  829,  830,  831,
+  832,  833,  834,  835,  836,  837,  838,  839,  840,  841,  842,  843,  844,
+  845,  846,  847,  848,  849,  850,  851,  852,  853,  854,  855,  856,  857,
+  858,  859,  860,  861,  862,  863,  864,  865,  866,  867,  868,  869,  870,
+  871,  872,  873,  874,  875,  876,  877,  878,  879,  880,  881,  882,  883,
+  884,  885,  886,  887,  888,  889,  890,  891,  892,  893,  894,  895,  896,
+  897,  898,  899,  900,  901,  902,  903,  904,  905,  906,  907,  908,  909,
+  910,  911,  912,  913,  914,  915,  916,  917,  918,  919,  920,  921,  922,
+  923,  924,  925,  926,  927,  928,  929,  930,  931,  932,  933,  934,  935,
+  936,  937,  938,  939,  940,  941,  942,  943,  944,  945,  946,  947,  948,
+  949,  950,  951,  952,  953,  954,  955,  956,  957,  958,  959,  960,  961,
+  962,  963,  964,  965,  966,  967,  968,  969,  970,  971,  972,  973,  974,
+  975,  976,  977,  978,  979,  980,  981,  982,  983,  984,  985,  986,  987,
+  988,  989,  990,  991,  992,  993,  994,  995,  996,  997,  998,  999,  1000,
+  1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013,
+  1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023,
+};
+
+DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_32x32[1024]) = {
+  0,    1,    5,    6,    14,   15,   27,   28,   44,   45,   65,   66,   90,
+  91,   119,  120,  152,  153,  189,  190,  230,  231,  275,  276,  324,  325,
+  377,  378,  434,  435,  495,  496,  2,    4,    7,    13,   16,   26,   29,
+  43,   46,   64,   67,   89,   92,   118,  121,  151,  154,  188,  191,  229,
+  232,  274,  277,  323,  326,  376,  379,  433,  436,  494,  497,  558,  3,
+  8,    12,   17,   25,   30,   42,   47,   63,   68,   88,   93,   117,  122,
+  150,  155,  187,  192,  228,  233,  273,  278,  322,  327,  375,  380,  432,
+  437,  493,  498,  557,  559,  9,    11,   18,   24,   31,   41,   48,   62,
+  69,   87,   94,   116,  123,  149,  156,  186,  193,  227,  234,  272,  279,
+  321,  328,  374,  381,  431,  438,  492,  499,  556,  560,  617,  10,   19,
+  23,   32,   40,   49,   61,   70,   86,   95,   115,  124,  148,  157,  185,
+  194,  226,  235,  271,  280,  320,  329,  373,  382,  430,  439,  491,  500,
+  555,  561,  616,  618,  20,   22,   33,   39,   50,   60,   71,   85,   96,
+  114,  125,  147,  158,  184,  195,  225,  236,  270,  281,  319,  330,  372,
+  383,  429,  440,  490,  501,  554,  562,  615,  619,  672,  21,   34,   38,
+  51,   59,   72,   84,   97,   113,  126,  146,  159,  183,  196,  224,  237,
+  269,  282,  318,  331,  371,  384,  428,  441,  489,  502,  553,  563,  614,
+  620,  671,  673,  35,   37,   52,   58,   73,   83,   98,   112,  127,  145,
+  160,  182,  197,  223,  238,  268,  283,  317,  332,  370,  385,  427,  442,
+  488,  503,  552,  564,  613,  621,  670,  674,  723,  36,   53,   57,   74,
+  82,   99,   111,  128,  144,  161,  181,  198,  222,  239,  267,  284,  316,
+  333,  369,  386,  426,  443,  487,  504,  551,  565,  612,  622,  669,  675,
+  722,  724,  54,   56,   75,   81,   100,  110,  129,  143,  162,  180,  199,
+  221,  240,  266,  285,  315,  334,  368,  387,  425,  444,  486,  505,  550,
+  566,  611,  623,  668,  676,  721,  725,  770,  55,   76,   80,   101,  109,
+  130,  142,  163,  179,  200,  220,  241,  265,  286,  314,  335,  367,  388,
+  424,  445,  485,  506,  549,  567,  610,  624,  667,  677,  720,  726,  769,
+  771,  77,   79,   102,  108,  131,  141,  164,  178,  201,  219,  242,  264,
+  287,  313,  336,  366,  389,  423,  446,  484,  507,  548,  568,  609,  625,
+  666,  678,  719,  727,  768,  772,  813,  78,   103,  107,  132,  140,  165,
+  177,  202,  218,  243,  263,  288,  312,  337,  365,  390,  422,  447,  483,
+  508,  547,  569,  608,  626,  665,  679,  718,  728,  767,  773,  812,  814,
+  104,  106,  133,  139,  166,  176,  203,  217,  244,  262,  289,  311,  338,
+  364,  391,  421,  448,  482,  509,  546,  570,  607,  627,  664,  680,  717,
+  729,  766,  774,  811,  815,  852,  105,  134,  138,  167,  175,  204,  216,
+  245,  261,  290,  310,  339,  363,  392,  420,  449,  481,  510,  545,  571,
+  606,  628,  663,  681,  716,  730,  765,  775,  810,  816,  851,  853,  135,
+  137,  168,  174,  205,  215,  246,  260,  291,  309,  340,  362,  393,  419,
+  450,  480,  511,  544,  572,  605,  629,  662,  682,  715,  731,  764,  776,
+  809,  817,  850,  854,  887,  136,  169,  173,  206,  214,  247,  259,  292,
+  308,  341,  361,  394,  418,  451,  479,  512,  543,  573,  604,  630,  661,
+  683,  714,  732,  763,  777,  808,  818,  849,  855,  886,  888,  170,  172,
+  207,  213,  248,  258,  293,  307,  342,  360,  395,  417,  452,  478,  513,
+  542,  574,  603,  631,  660,  684,  713,  733,  762,  778,  807,  819,  848,
+  856,  885,  889,  918,  171,  208,  212,  249,  257,  294,  306,  343,  359,
+  396,  416,  453,  477,  514,  541,  575,  602,  632,  659,  685,  712,  734,
+  761,  779,  806,  820,  847,  857,  884,  890,  917,  919,  209,  211,  250,
+  256,  295,  305,  344,  358,  397,  415,  454,  476,  515,  540,  576,  601,
+  633,  658,  686,  711,  735,  760,  780,  805,  821,  846,  858,  883,  891,
+  916,  920,  945,  210,  251,  255,  296,  304,  345,  357,  398,  414,  455,
+  475,  516,  539,  577,  600,  634,  657,  687,  710,  736,  759,  781,  804,
+  822,  845,  859,  882,  892,  915,  921,  944,  946,  252,  254,  297,  303,
+  346,  356,  399,  413,  456,  474,  517,  538,  578,  599,  635,  656,  688,
+  709,  737,  758,  782,  803,  823,  844,  860,  881,  893,  914,  922,  943,
+  947,  968,  253,  298,  302,  347,  355,  400,  412,  457,  473,  518,  537,
+  579,  598,  636,  655,  689,  708,  738,  757,  783,  802,  824,  843,  861,
+  880,  894,  913,  923,  942,  948,  967,  969,  299,  301,  348,  354,  401,
+  411,  458,  472,  519,  536,  580,  597,  637,  654,  690,  707,  739,  756,
+  784,  801,  825,  842,  862,  879,  895,  912,  924,  941,  949,  966,  970,
+  987,  300,  349,  353,  402,  410,  459,  471,  520,  535,  581,  596,  638,
+  653,  691,  706,  740,  755,  785,  800,  826,  841,  863,  878,  896,  911,
+  925,  940,  950,  965,  971,  986,  988,  350,  352,  403,  409,  460,  470,
+  521,  534,  582,  595,  639,  652,  692,  705,  741,  754,  786,  799,  827,
+  840,  864,  877,  897,  910,  926,  939,  951,  964,  972,  985,  989,  1002,
+  351,  404,  408,  461,  469,  522,  533,  583,  594,  640,  651,  693,  704,
+  742,  753,  787,  798,  828,  839,  865,  876,  898,  909,  927,  938,  952,
+  963,  973,  984,  990,  1001, 1003, 405,  407,  462,  468,  523,  532,  584,
+  593,  641,  650,  694,  703,  743,  752,  788,  797,  829,  838,  866,  875,
+  899,  908,  928,  937,  953,  962,  974,  983,  991,  1000, 1004, 1013, 406,
+  463,  467,  524,  531,  585,  592,  642,  649,  695,  702,  744,  751,  789,
+  796,  830,  837,  867,  874,  900,  907,  929,  936,  954,  961,  975,  982,
+  992,  999,  1005, 1012, 1014, 464,  466,  525,  530,  586,  591,  643,  648,
+  696,  701,  745,  750,  790,  795,  831,  836,  868,  873,  901,  906,  930,
+  935,  955,  960,  976,  981,  993,  998,  1006, 1011, 1015, 1020, 465,  526,
+  529,  587,  590,  644,  647,  697,  700,  746,  749,  791,  794,  832,  835,
+  869,  872,  902,  905,  931,  934,  956,  959,  977,  980,  994,  997,  1007,
+  1010, 1016, 1019, 1021, 527,  528,  588,  589,  645,  646,  698,  699,  747,
+  748,  792,  793,  833,  834,  870,  871,  903,  904,  932,  933,  957,  958,
+  978,  979,  995,  996,  1008, 1009, 1017, 1018, 1022, 1023
+};
+
+const SCAN_ORDER av1_scan_orders[TX_SIZES_ALL][TX_TYPES] = {
+  {
+      // TX_4X4
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { default_scan_4x4, av1_default_iscan_4x4 },
+      { mrow_scan_4x4, av1_mrow_iscan_4x4 },
+      { mcol_scan_4x4, av1_mcol_iscan_4x4 },
+      { mrow_scan_4x4, av1_mrow_iscan_4x4 },
+      { mcol_scan_4x4, av1_mcol_iscan_4x4 },
+      { mrow_scan_4x4, av1_mrow_iscan_4x4 },
+      { mcol_scan_4x4, av1_mcol_iscan_4x4 },
+  },
+  {
+      // TX_8X8
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { default_scan_8x8, av1_default_iscan_8x8 },
+      { mrow_scan_8x8, av1_mrow_iscan_8x8 },
+      { mcol_scan_8x8, av1_mcol_iscan_8x8 },
+      { mrow_scan_8x8, av1_mrow_iscan_8x8 },
+      { mcol_scan_8x8, av1_mcol_iscan_8x8 },
+      { mrow_scan_8x8, av1_mrow_iscan_8x8 },
+      { mcol_scan_8x8, av1_mcol_iscan_8x8 },
+  },
+  {
+      // TX_16X16
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { default_scan_16x16, av1_default_iscan_16x16 },
+      { mrow_scan_16x16, av1_mrow_iscan_16x16 },
+      { mcol_scan_16x16, av1_mcol_iscan_16x16 },
+      { mrow_scan_16x16, av1_mrow_iscan_16x16 },
+      { mcol_scan_16x16, av1_mcol_iscan_16x16 },
+      { mrow_scan_16x16, av1_mrow_iscan_16x16 },
+      { mcol_scan_16x16, av1_mcol_iscan_16x16 },
+  },
+  {
+      // TX_32X32
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+  },
+  {
+      // TX_64X64
+      // Half of the coefficients of tx64 at higher frequencies are set to
+      // zeros. So tx32's scan order is used.
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+  },
+  {
+      // TX_4X8
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { default_scan_4x8, av1_default_iscan_4x8 },
+      { mrow_scan_4x8, av1_mrow_iscan_4x8 },
+      { mcol_scan_4x8, av1_mcol_iscan_4x8 },
+      { mrow_scan_4x8, av1_mrow_iscan_4x8 },
+      { mcol_scan_4x8, av1_mcol_iscan_4x8 },
+      { mrow_scan_4x8, av1_mrow_iscan_4x8 },
+      { mcol_scan_4x8, av1_mcol_iscan_4x8 },
+  },
+  {
+      // TX_8X4
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { default_scan_8x4, av1_default_iscan_8x4 },
+      { mrow_scan_8x4, av1_mrow_iscan_8x4 },
+      { mcol_scan_8x4, av1_mcol_iscan_8x4 },
+      { mrow_scan_8x4, av1_mrow_iscan_8x4 },
+      { mcol_scan_8x4, av1_mcol_iscan_8x4 },
+      { mrow_scan_8x4, av1_mrow_iscan_8x4 },
+      { mcol_scan_8x4, av1_mcol_iscan_8x4 },
+  },
+  {
+      // TX_8X16
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { default_scan_8x16, av1_default_iscan_8x16 },
+      { mrow_scan_8x16, av1_mrow_iscan_8x16 },
+      { mcol_scan_8x16, av1_mcol_iscan_8x16 },
+      { mrow_scan_8x16, av1_mrow_iscan_8x16 },
+      { mcol_scan_8x16, av1_mcol_iscan_8x16 },
+      { mrow_scan_8x16, av1_mrow_iscan_8x16 },
+      { mcol_scan_8x16, av1_mcol_iscan_8x16 },
+  },
+  {
+      // TX_16X8
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { default_scan_16x8, av1_default_iscan_16x8 },
+      { mrow_scan_16x8, av1_mrow_iscan_16x8 },
+      { mcol_scan_16x8, av1_mcol_iscan_16x8 },
+      { mrow_scan_16x8, av1_mrow_iscan_16x8 },
+      { mcol_scan_16x8, av1_mcol_iscan_16x8 },
+      { mrow_scan_16x8, av1_mrow_iscan_16x8 },
+      { mcol_scan_16x8, av1_mcol_iscan_16x8 },
+  },
+  {
+      // TX_16X32
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { mrow_scan_16x32, av1_mrow_iscan_16x32 },
+      { mcol_scan_16x32, av1_mcol_iscan_16x32 },
+      { mrow_scan_16x32, av1_mrow_iscan_16x32 },
+      { mcol_scan_16x32, av1_mcol_iscan_16x32 },
+      { mrow_scan_16x32, av1_mrow_iscan_16x32 },
+      { mcol_scan_16x32, av1_mcol_iscan_16x32 },
+  },
+  {
+      // TX_32X16
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { mrow_scan_32x16, av1_mrow_iscan_32x16 },
+      { mcol_scan_32x16, av1_mcol_iscan_32x16 },
+      { mrow_scan_32x16, av1_mrow_iscan_32x16 },
+      { mcol_scan_32x16, av1_mcol_iscan_32x16 },
+      { mrow_scan_32x16, av1_mrow_iscan_32x16 },
+      { mcol_scan_32x16, av1_mcol_iscan_32x16 },
+  },
+  {
+      // TX_32X64
+      // Half of the coefficients of tx64 at higher frequencies are set to
+      // zeros. So tx32's scan order is used.
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+  },
+  {
+      // TX_64X32
+      // Half of the coefficients of tx64 at higher frequencies are set to
+      // zeros. So tx32's scan order is used.
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { default_scan_32x32, av1_default_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+      { mrow_scan_32x32, av1_mrow_iscan_32x32 },
+      { mcol_scan_32x32, av1_mcol_iscan_32x32 },
+  },
+  {
+      // TX_4X16
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { default_scan_4x16, av1_default_iscan_4x16 },
+      { mrow_scan_4x16, av1_mrow_iscan_4x16 },
+      { mcol_scan_4x16, av1_mcol_iscan_4x16 },
+      { mrow_scan_4x16, av1_mrow_iscan_4x16 },
+      { mcol_scan_4x16, av1_mcol_iscan_4x16 },
+      { mrow_scan_4x16, av1_mrow_iscan_4x16 },
+      { mcol_scan_4x16, av1_mcol_iscan_4x16 },
+  },
+  {
+      // TX_16X4
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { default_scan_16x4, av1_default_iscan_16x4 },
+      { mrow_scan_16x4, av1_mrow_iscan_16x4 },
+      { mcol_scan_16x4, av1_mcol_iscan_16x4 },
+      { mrow_scan_16x4, av1_mrow_iscan_16x4 },
+      { mcol_scan_16x4, av1_mcol_iscan_16x4 },
+      { mrow_scan_16x4, av1_mrow_iscan_16x4 },
+      { mcol_scan_16x4, av1_mcol_iscan_16x4 },
+  },
+  {
+      // TX_8X32
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { default_scan_8x32, av1_default_iscan_8x32 },
+      { mrow_scan_8x32, av1_mrow_iscan_8x32 },
+      { mcol_scan_8x32, av1_mcol_iscan_8x32 },
+      { mrow_scan_8x32, av1_mrow_iscan_8x32 },
+      { mcol_scan_8x32, av1_mcol_iscan_8x32 },
+      { mrow_scan_8x32, av1_mrow_iscan_8x32 },
+      { mcol_scan_8x32, av1_mcol_iscan_8x32 },
+  },
+  {
+      // TX_32X8
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { default_scan_32x8, av1_default_iscan_32x8 },
+      { mrow_scan_32x8, av1_mrow_iscan_32x8 },
+      { mcol_scan_32x8, av1_mcol_iscan_32x8 },
+      { mrow_scan_32x8, av1_mrow_iscan_32x8 },
+      { mcol_scan_32x8, av1_mcol_iscan_32x8 },
+      { mrow_scan_32x8, av1_mrow_iscan_32x8 },
+      { mcol_scan_32x8, av1_mcol_iscan_32x8 },
+  },
+  {
+      // TX_16X64
+      // Half of the coefficients of tx64 at higher frequencies are set to
+      // zeros. So tx32's scan order is used.
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { default_scan_16x32, av1_default_iscan_16x32 },
+      { mrow_scan_16x32, av1_mrow_iscan_16x32 },
+      { mcol_scan_16x32, av1_mcol_iscan_16x32 },
+      { mrow_scan_16x32, av1_mrow_iscan_16x32 },
+      { mcol_scan_16x32, av1_mcol_iscan_16x32 },
+      { mrow_scan_16x32, av1_mrow_iscan_16x32 },
+      { mcol_scan_16x32, av1_mcol_iscan_16x32 },
+  },
+  {
+      // TX_64X16
+      // Half of the coefficients of tx64 at higher frequencies are set to
+      // zeros. So tx32's scan order is used.
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { default_scan_32x16, av1_default_iscan_32x16 },
+      { mrow_scan_32x16, av1_mrow_iscan_32x16 },
+      { mcol_scan_32x16, av1_mcol_iscan_32x16 },
+      { mrow_scan_32x16, av1_mrow_iscan_32x16 },
+      { mcol_scan_32x16, av1_mcol_iscan_32x16 },
+      { mrow_scan_32x16, av1_mrow_iscan_32x16 },
+      { mcol_scan_32x16, av1_mcol_iscan_32x16 },
+  },
+};
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/scan.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/scan.h
new file mode 100644
index 0000000000..29c915fabf
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/scan.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_SCAN_H_
+#define AOM_AV1_COMMON_SCAN_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAX_NEIGHBORS 2
+
+enum {
+  SCAN_MODE_ZIG_ZAG,
+  SCAN_MODE_COL_DIAG,
+  SCAN_MODE_ROW_DIAG,
+  SCAN_MODE_COL_1D,
+  SCAN_MODE_ROW_1D,
+  SCAN_MODES
+} UENUM1BYTE(SCAN_MODE);
+
+extern const SCAN_ORDER av1_scan_orders[TX_SIZES_ALL][TX_TYPES];
+
+void av1_deliver_eob_threshold(const AV1_COMMON *cm, MACROBLOCKD *xd);
+
+static INLINE const SCAN_ORDER *get_default_scan(TX_SIZE tx_size,
+                                                 TX_TYPE tx_type) {
+  return &av1_scan_orders[tx_size][tx_type];
+}
+
+static INLINE const SCAN_ORDER *get_scan(TX_SIZE tx_size, TX_TYPE tx_type) {
+  return get_default_scan(tx_size, tx_type);
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_SCAN_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.c
new file mode 100644
index 0000000000..564bcc5d7e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h"
+
+static const int seg_feature_data_signed[SEG_LVL_MAX] = {
+  1, 1, 1, 1, 1, 0, 0, 0
+};
+
+static const int seg_feature_data_max[SEG_LVL_MAX] = { MAXQ,
+                                                       MAX_LOOP_FILTER,
+                                                       MAX_LOOP_FILTER,
+                                                       MAX_LOOP_FILTER,
+                                                       MAX_LOOP_FILTER,
+                                                       7,
+                                                       0,
+                                                       0 };
+
+// These functions provide access to new segment level features.
+// Eventually these function may be "optimized out" but for the moment,
+// the coding mechanism is still subject to change so these provide a
+// convenient single point of change.
+
+void av1_clearall_segfeatures(struct segmentation *seg) {
+  av1_zero(seg->feature_data);
+  av1_zero(seg->feature_mask);
+}
+
+void av1_calculate_segdata(struct segmentation *seg) {
+  seg->segid_preskip = 0;
+  seg->last_active_segid = 0;
+  for (int i = 0; i < MAX_SEGMENTS; i++) {
+    for (int j = 0; j < SEG_LVL_MAX; j++) {
+      if (seg->feature_mask[i] & (1 << j)) {
+        seg->segid_preskip |= (j >= SEG_LVL_REF_FRAME);
+        seg->last_active_segid = i;
+      }
+    }
+  }
+}
+
+void av1_enable_segfeature(struct segmentation *seg, int segment_id,
+                           SEG_LVL_FEATURES feature_id) {
+  seg->feature_mask[segment_id] |= 1 << feature_id;
+}
+
+int av1_seg_feature_data_max(SEG_LVL_FEATURES feature_id) {
+  return seg_feature_data_max[feature_id];
+}
+
+int av1_is_segfeature_signed(SEG_LVL_FEATURES feature_id) {
+  return seg_feature_data_signed[feature_id];
+}
+
+// The 'seg_data' given for each segment can be either deltas (from the default
+// value chosen for the frame) or absolute values.
+//
+// Valid range for abs values is (0-127 for MB_LVL_ALT_Q), (0-63 for
+// SEGMENT_ALT_LF)
+// Valid range for delta values are (+/-127 for MB_LVL_ALT_Q), (+/-63 for
+// SEGMENT_ALT_LF)
+//
+// abs_delta = SEGMENT_DELTADATA (deltas) abs_delta = SEGMENT_ABSDATA (use
+// the absolute values given).
+
+void av1_set_segdata(struct segmentation *seg, int segment_id,
+                     SEG_LVL_FEATURES feature_id, int seg_data) {
+  if (seg_data < 0) {
+    assert(seg_feature_data_signed[feature_id]);
+    assert(-seg_data <= seg_feature_data_max[feature_id]);
+  } else {
+    assert(seg_data <= seg_feature_data_max[feature_id]);
+  }
+
+  seg->feature_data[segment_id][feature_id] = seg_data;
+}
+
+// TBD? Functions to read and write segment data with range / validity checking
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h
new file mode 100644
index 0000000000..87526ed1f7
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_SEG_COMMON_H_
+#define AOM_AV1_COMMON_SEG_COMMON_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/prob.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAX_SEGMENTS 8
+#define SEG_TREE_PROBS (MAX_SEGMENTS - 1)
+
+#define SEG_TEMPORAL_PRED_CTXS 3
+#define SPATIAL_PREDICTION_PROBS 3
+
+enum {
+  SEG_LVL_ALT_Q,       // Use alternate Quantizer ....
+  SEG_LVL_ALT_LF_Y_V,  // Use alternate loop filter value on y plane vertical
+  SEG_LVL_ALT_LF_Y_H,  // Use alternate loop filter value on y plane horizontal
+  SEG_LVL_ALT_LF_U,    // Use alternate loop filter value on u plane
+  SEG_LVL_ALT_LF_V,    // Use alternate loop filter value on v plane
+  SEG_LVL_REF_FRAME,   // Optional Segment reference frame
+  SEG_LVL_SKIP,        // Optional Segment (0,0) + skip mode
+  SEG_LVL_GLOBALMV,
+  SEG_LVL_MAX
+} UENUM1BYTE(SEG_LVL_FEATURES);
+
+struct segmentation {
+  uint8_t enabled;
+  uint8_t update_map;
+  uint8_t update_data;
+  uint8_t temporal_update;
+
+  int16_t feature_data[MAX_SEGMENTS][SEG_LVL_MAX];
+  unsigned int feature_mask[MAX_SEGMENTS];
+  int last_active_segid;  // The highest numbered segment id that has some
+                          // enabled feature.
+  uint8_t segid_preskip;  // Whether the segment id will be read before the
+                          // skip syntax element.
+                          // 1: the segment id will be read first.
+                          // 0: the skip syntax element will be read first.
+};
+
+struct segmentation_probs {
+  aom_cdf_prob tree_cdf[CDF_SIZE(MAX_SEGMENTS)];
+  aom_cdf_prob pred_cdf[SEG_TEMPORAL_PRED_CTXS][CDF_SIZE(2)];
+  aom_cdf_prob spatial_pred_seg_cdf[SPATIAL_PREDICTION_PROBS]
+                                   [CDF_SIZE(MAX_SEGMENTS)];
+};
+
+static INLINE int segfeature_active(const struct segmentation *seg,
+                                    int segment_id,
+                                    SEG_LVL_FEATURES feature_id) {
+  return seg->enabled && (seg->feature_mask[segment_id] & (1 << feature_id));
+}
+
+static INLINE void segfeatures_copy(struct segmentation *dst,
+                                    const struct segmentation *src) {
+  int i, j;
+  for (i = 0; i < MAX_SEGMENTS; i++) {
+    dst->feature_mask[i] = src->feature_mask[i];
+    for (j = 0; j < SEG_LVL_MAX; j++) {
+      dst->feature_data[i][j] = src->feature_data[i][j];
+    }
+  }
+  dst->segid_preskip = src->segid_preskip;
+  dst->last_active_segid = src->last_active_segid;
+}
+
+void av1_clearall_segfeatures(struct segmentation *seg);
+
+void av1_enable_segfeature(struct segmentation *seg, int segment_id,
+                           SEG_LVL_FEATURES feature_id);
+
+void av1_calculate_segdata(struct segmentation *seg);
+
+int av1_seg_feature_data_max(SEG_LVL_FEATURES feature_id);
+
+int av1_is_segfeature_signed(SEG_LVL_FEATURES feature_id);
+
+void av1_set_segdata(struct segmentation *seg, int segment_id,
+                     SEG_LVL_FEATURES feature_id, int seg_data);
+
+static INLINE int get_segdata(const struct segmentation *seg, int segment_id,
+                              SEG_LVL_FEATURES feature_id) {
+  return seg->feature_data[segment_id][feature_id];
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_SEG_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.c
new file mode 100644
index 0000000000..4655a1917e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.c
@@ -0,0 +1,934 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+
+// Set up nsync by width.
+static INLINE int get_sync_range(int width) {
+  // nsync numbers are picked by testing. For example, for 4k
+  // video, using 4 gives best performance.
+  if (width < 640)
+    return 1;
+  else if (width <= 1280)
+    return 2;
+  else if (width <= 4096)
+    return 4;
+  else
+    return 8;
+}
+
+#if !CONFIG_REALTIME_ONLY
+static INLINE int get_lr_sync_range(int width) {
+#if 0
+  // nsync numbers are picked by testing. For example, for 4k
+  // video, using 4 gives best performance.
+  if (width < 640)
+    return 1;
+  else if (width <= 1280)
+    return 2;
+  else if (width <= 4096)
+    return 4;
+  else
+    return 8;
+#else
+  (void)width;
+  return 1;
+#endif
+}
+#endif
+
+// Allocate memory for lf row synchronization
+static void loop_filter_alloc(AV1LfSync *lf_sync, AV1_COMMON *cm, int rows,
+                              int width, int num_workers) {
+  lf_sync->rows = rows;
+#if CONFIG_MULTITHREAD
+  {
+    int i, j;
+
+    for (j = 0; j < MAX_MB_PLANE; j++) {
+      CHECK_MEM_ERROR(cm, lf_sync->mutex_[j],
+                      aom_malloc(sizeof(*(lf_sync->mutex_[j])) * rows));
+      if (lf_sync->mutex_[j]) {
+        for (i = 0; i < rows; ++i) {
+          pthread_mutex_init(&lf_sync->mutex_[j][i], NULL);
+        }
+      }
+
+      CHECK_MEM_ERROR(cm, lf_sync->cond_[j],
+                      aom_malloc(sizeof(*(lf_sync->cond_[j])) * rows));
+      if (lf_sync->cond_[j]) {
+        for (i = 0; i < rows; ++i) {
+          pthread_cond_init(&lf_sync->cond_[j][i], NULL);
+        }
+      }
+    }
+
+    CHECK_MEM_ERROR(cm, lf_sync->job_mutex,
+                    aom_malloc(sizeof(*(lf_sync->job_mutex))));
+    if (lf_sync->job_mutex) {
+      pthread_mutex_init(lf_sync->job_mutex, NULL);
+    }
+  }
+#endif  // CONFIG_MULTITHREAD
+  CHECK_MEM_ERROR(cm, lf_sync->lfdata,
+                  aom_malloc(num_workers * sizeof(*(lf_sync->lfdata))));
+  lf_sync->num_workers = num_workers;
+
+  for (int j = 0; j < MAX_MB_PLANE; j++) {
+    CHECK_MEM_ERROR(cm, lf_sync->cur_sb_col[j],
+                    aom_malloc(sizeof(*(lf_sync->cur_sb_col[j])) * rows));
+  }
+  CHECK_MEM_ERROR(
+      cm, lf_sync->job_queue,
+      aom_malloc(sizeof(*(lf_sync->job_queue)) * rows * MAX_MB_PLANE * 2));
+  // Set up nsync.
+  lf_sync->sync_range = get_sync_range(width);
+}
+
+// Deallocate lf synchronization related mutex and data
+void av1_loop_filter_dealloc(AV1LfSync *lf_sync) {
+  if (lf_sync != NULL) {
+    int j;
+#if CONFIG_MULTITHREAD
+    int i;
+    for (j = 0; j < MAX_MB_PLANE; j++) {
+      if (lf_sync->mutex_[j] != NULL) {
+        for (i = 0; i < lf_sync->rows; ++i) {
+          pthread_mutex_destroy(&lf_sync->mutex_[j][i]);
+        }
+        aom_free(lf_sync->mutex_[j]);
+      }
+      if (lf_sync->cond_[j] != NULL) {
+        for (i = 0; i < lf_sync->rows; ++i) {
+          pthread_cond_destroy(&lf_sync->cond_[j][i]);
+        }
+        aom_free(lf_sync->cond_[j]);
+      }
+    }
+    if (lf_sync->job_mutex != NULL) {
+      pthread_mutex_destroy(lf_sync->job_mutex);
+      aom_free(lf_sync->job_mutex);
+    }
+#endif  // CONFIG_MULTITHREAD
+    aom_free(lf_sync->lfdata);
+    for (j = 0; j < MAX_MB_PLANE; j++) {
+      aom_free(lf_sync->cur_sb_col[j]);
+    }
+
+    aom_free(lf_sync->job_queue);
+    // clear the structure as the source of this call may be a resize in which
+    // case this call will be followed by an _alloc() which may fail.
+    av1_zero(*lf_sync);
+  }
+}
+
+static void loop_filter_data_reset(LFWorkerData *lf_data,
+                                   YV12_BUFFER_CONFIG *frame_buffer,
+                                   struct AV1Common *cm, MACROBLOCKD *xd) {
+  struct macroblockd_plane *pd = xd->plane;
+  lf_data->frame_buffer = frame_buffer;
+  lf_data->cm = cm;
+  lf_data->xd = xd;
+  for (int i = 0; i < MAX_MB_PLANE; i++) {
+    memcpy(&lf_data->planes[i].dst, &pd[i].dst, sizeof(lf_data->planes[i].dst));
+    lf_data->planes[i].subsampling_x = pd[i].subsampling_x;
+    lf_data->planes[i].subsampling_y = pd[i].subsampling_y;
+  }
+}
+
+static INLINE void sync_read(AV1LfSync *const lf_sync, int r, int c,
+                             int plane) {
+#if CONFIG_MULTITHREAD
+  const int nsync = lf_sync->sync_range;
+
+  if (r && !(c & (nsync - 1))) {
+    pthread_mutex_t *const mutex = &lf_sync->mutex_[plane][r - 1];
+    pthread_mutex_lock(mutex);
+
+    while (c > lf_sync->cur_sb_col[plane][r - 1] - nsync) {
+      pthread_cond_wait(&lf_sync->cond_[plane][r - 1], mutex);
+    }
+    pthread_mutex_unlock(mutex);
+  }
+#else
+  (void)lf_sync;
+  (void)r;
+  (void)c;
+  (void)plane;
+#endif  // CONFIG_MULTITHREAD
+}
+
+static INLINE void sync_write(AV1LfSync *const lf_sync, int r, int c,
+                              const int sb_cols, int plane) {
+#if CONFIG_MULTITHREAD
+  const int nsync = lf_sync->sync_range;
+  int cur;
+  // Only signal when there are enough filtered SB for next row to run.
+  int sig = 1;
+
+  if (c < sb_cols - 1) {
+    cur = c;
+    if (c % nsync) sig = 0;
+  } else {
+    cur = sb_cols + nsync;
+  }
+
+  if (sig) {
+    pthread_mutex_lock(&lf_sync->mutex_[plane][r]);
+
+    lf_sync->cur_sb_col[plane][r] = cur;
+
+    pthread_cond_broadcast(&lf_sync->cond_[plane][r]);
+    pthread_mutex_unlock(&lf_sync->mutex_[plane][r]);
+  }
+#else
+  (void)lf_sync;
+  (void)r;
+  (void)c;
+  (void)sb_cols;
+  (void)plane;
+#endif  // CONFIG_MULTITHREAD
+}
+
+static void enqueue_lf_jobs(AV1LfSync *lf_sync, AV1_COMMON *cm, int start,
+                            int stop,
+#if CONFIG_LPF_MASK
+                            int is_decoding,
+#endif
+                            int plane_start, int plane_end) {
+  int mi_row, plane, dir;
+  AV1LfMTInfo *lf_job_queue = lf_sync->job_queue;
+  lf_sync->jobs_enqueued = 0;
+  lf_sync->jobs_dequeued = 0;
+
+  for (dir = 0; dir < 2; dir++) {
+    for (plane = plane_start; plane < plane_end; plane++) {
+      if (plane == 0 && !(cm->lf.filter_level[0]) && !(cm->lf.filter_level[1]))
+        break;
+      else if (plane == 1 && !(cm->lf.filter_level_u))
+        continue;
+      else if (plane == 2 && !(cm->lf.filter_level_v))
+        continue;
+#if CONFIG_LPF_MASK
+      int step = MAX_MIB_SIZE;
+      if (is_decoding) {
+        step = MI_SIZE_64X64;
+      }
+      for (mi_row = start; mi_row < stop; mi_row += step)
+#else
+      for (mi_row = start; mi_row < stop; mi_row += MAX_MIB_SIZE)
+#endif
+      {
+        lf_job_queue->mi_row = mi_row;
+        lf_job_queue->plane = plane;
+        lf_job_queue->dir = dir;
+        lf_job_queue++;
+        lf_sync->jobs_enqueued++;
+      }
+    }
+  }
+}
+
+static AV1LfMTInfo *get_lf_job_info(AV1LfSync *lf_sync) {
+  AV1LfMTInfo *cur_job_info = NULL;
+
+#if CONFIG_MULTITHREAD
+  pthread_mutex_lock(lf_sync->job_mutex);
+
+  if (lf_sync->jobs_dequeued < lf_sync->jobs_enqueued) {
+    cur_job_info = lf_sync->job_queue + lf_sync->jobs_dequeued;
+    lf_sync->jobs_dequeued++;
+  }
+
+  pthread_mutex_unlock(lf_sync->job_mutex);
+#else
+  (void)lf_sync;
+#endif
+
+  return cur_job_info;
+}
+
+// Implement row loopfiltering for each thread.
+static INLINE void thread_loop_filter_rows(
+    const YV12_BUFFER_CONFIG *const frame_buffer, AV1_COMMON *const cm,
+    struct macroblockd_plane *planes, MACROBLOCKD *xd,
+    AV1LfSync *const lf_sync) {
+  const int sb_cols =
+      ALIGN_POWER_OF_TWO(cm->mi_params.mi_cols, MAX_MIB_SIZE_LOG2) >>
+      MAX_MIB_SIZE_LOG2;
+  int mi_row, mi_col, plane, dir;
+  int r, c;
+
+  while (1) {
+    AV1LfMTInfo *cur_job_info = get_lf_job_info(lf_sync);
+
+    if (cur_job_info != NULL) {
+      mi_row = cur_job_info->mi_row;
+      plane = cur_job_info->plane;
+      dir = cur_job_info->dir;
+      r = mi_row >> MAX_MIB_SIZE_LOG2;
+
+      if (dir == 0) {
+        for (mi_col = 0; mi_col < cm->mi_params.mi_cols;
+             mi_col += MAX_MIB_SIZE) {
+          c = mi_col >> MAX_MIB_SIZE_LOG2;
+
+          av1_setup_dst_planes(planes, cm->seq_params.sb_size, frame_buffer,
+                               mi_row, mi_col, plane, plane + 1);
+
+          av1_filter_block_plane_vert(cm, xd, plane, &planes[plane], mi_row,
+                                      mi_col);
+          sync_write(lf_sync, r, c, sb_cols, plane);
+        }
+      } else if (dir == 1) {
+        for (mi_col = 0; mi_col < cm->mi_params.mi_cols;
+             mi_col += MAX_MIB_SIZE) {
+          c = mi_col >> MAX_MIB_SIZE_LOG2;
+
+          // Wait for vertical edge filtering of the top-right block to be
+          // completed
+          sync_read(lf_sync, r, c, plane);
+
+          // Wait for vertical edge filtering of the right block to be
+          // completed
+          sync_read(lf_sync, r + 1, c, plane);
+
+          av1_setup_dst_planes(planes, cm->seq_params.sb_size, frame_buffer,
+                               mi_row, mi_col, plane, plane + 1);
+          av1_filter_block_plane_horz(cm, xd, plane, &planes[plane], mi_row,
+                                      mi_col);
+        }
+      }
+    } else {
+      break;
+    }
+  }
+}
+
+// Row-based multi-threaded loopfilter hook
+static int loop_filter_row_worker(void *arg1, void *arg2) {
+  AV1LfSync *const lf_sync = (AV1LfSync *)arg1;
+  LFWorkerData *const lf_data = (LFWorkerData *)arg2;
+  thread_loop_filter_rows(lf_data->frame_buffer, lf_data->cm, lf_data->planes,
+                          lf_data->xd, lf_sync);
+  return 1;
+}
+
+#if CONFIG_LPF_MASK
+static INLINE void thread_loop_filter_bitmask_rows(
+    const YV12_BUFFER_CONFIG *const frame_buffer, AV1_COMMON *const cm,
+    struct macroblockd_plane *planes, MACROBLOCKD *xd,
+    AV1LfSync *const lf_sync) {
+  const int sb_cols =
+      ALIGN_POWER_OF_TWO(cm->mi_params.mi_cols, MIN_MIB_SIZE_LOG2) >>
+      MIN_MIB_SIZE_LOG2;
+  int mi_row, mi_col, plane, dir;
+  int r, c;
+  (void)xd;
+
+  while (1) {
+    AV1LfMTInfo *cur_job_info = get_lf_job_info(lf_sync);
+
+    if (cur_job_info != NULL) {
+      mi_row = cur_job_info->mi_row;
+      plane = cur_job_info->plane;
+      dir = cur_job_info->dir;
+      r = mi_row >> MIN_MIB_SIZE_LOG2;
+
+      if (dir == 0) {
+        for (mi_col = 0; mi_col < cm->mi_params.mi_cols;
+             mi_col += MI_SIZE_64X64) {
+          c = mi_col >> MIN_MIB_SIZE_LOG2;
+
+          av1_setup_dst_planes(planes, BLOCK_64X64, frame_buffer, mi_row,
+                               mi_col, plane, plane + 1);
+
+          av1_filter_block_plane_bitmask_vert(cm, &planes[plane], plane, mi_row,
+                                              mi_col);
+          sync_write(lf_sync, r, c, sb_cols, plane);
+        }
+      } else if (dir == 1) {
+        for (mi_col = 0; mi_col < cm->mi_params.mi_cols;
+             mi_col += MI_SIZE_64X64) {
+          c = mi_col >> MIN_MIB_SIZE_LOG2;
+
+          // Wait for vertical edge filtering of the top-right block to be
+          // completed
+          sync_read(lf_sync, r, c, plane);
+
+          // Wait for vertical edge filtering of the right block to be
+          // completed
+          sync_read(lf_sync, r + 1, c, plane);
+
+          av1_setup_dst_planes(planes, BLOCK_64X64, frame_buffer, mi_row,
+                               mi_col, plane, plane + 1);
+          av1_filter_block_plane_bitmask_horz(cm, &planes[plane], plane, mi_row,
+                                              mi_col);
+        }
+      }
+    } else {
+      break;
+    }
+  }
+}
+
+// Row-based multi-threaded loopfilter hook
+static int loop_filter_bitmask_row_worker(void *arg1, void *arg2) {
+  AV1LfSync *const lf_sync = (AV1LfSync *)arg1;
+  LFWorkerData *const lf_data = (LFWorkerData *)arg2;
+  thread_loop_filter_bitmask_rows(lf_data->frame_buffer, lf_data->cm,
+                                  lf_data->planes, lf_data->xd, lf_sync);
+  return 1;
+}
+#endif  // CONFIG_LPF_MASK
+
+static void loop_filter_rows_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
+                                MACROBLOCKD *xd, int start, int stop,
+                                int plane_start, int plane_end,
+#if CONFIG_LPF_MASK
+                                int is_decoding,
+#endif
+                                AVxWorker *workers, int nworkers,
+                                AV1LfSync *lf_sync) {
+  const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+#if CONFIG_LPF_MASK
+  int sb_rows;
+  if (is_decoding) {
+    sb_rows = ALIGN_POWER_OF_TWO(cm->mi_params.mi_rows, MIN_MIB_SIZE_LOG2) >>
+              MIN_MIB_SIZE_LOG2;
+  } else {
+    sb_rows = ALIGN_POWER_OF_TWO(cm->mi_params.mi_rows, MAX_MIB_SIZE_LOG2) >>
+              MAX_MIB_SIZE_LOG2;
+  }
+#else
+  // Number of superblock rows and cols
+  const int sb_rows =
+      ALIGN_POWER_OF_TWO(cm->mi_params.mi_rows, MAX_MIB_SIZE_LOG2) >>
+      MAX_MIB_SIZE_LOG2;
+#endif
+  const int num_workers = nworkers;
+  int i;
+
+  if (!lf_sync->sync_range || sb_rows != lf_sync->rows ||
+      num_workers > lf_sync->num_workers) {
+    av1_loop_filter_dealloc(lf_sync);
+    loop_filter_alloc(lf_sync, cm, sb_rows, cm->width, num_workers);
+  }
+
+  // Initialize cur_sb_col to -1 for all SB rows.
+  for (i = 0; i < MAX_MB_PLANE; i++) {
+    memset(lf_sync->cur_sb_col[i], -1,
+           sizeof(*(lf_sync->cur_sb_col[i])) * sb_rows);
+  }
+
+  enqueue_lf_jobs(lf_sync, cm, start, stop,
+#if CONFIG_LPF_MASK
+                  is_decoding,
+#endif
+                  plane_start, plane_end);
+
+  // Set up loopfilter thread data.
+  for (i = num_workers - 1; i >= 0; --i) {
+    AVxWorker *const worker = &workers[i];
+    LFWorkerData *const lf_data = &lf_sync->lfdata[i];
+
+#if CONFIG_LPF_MASK
+    if (is_decoding) {
+      worker->hook = loop_filter_bitmask_row_worker;
+    } else {
+      worker->hook = loop_filter_row_worker;
+    }
+#else
+    worker->hook = loop_filter_row_worker;
+#endif
+    worker->data1 = lf_sync;
+    worker->data2 = lf_data;
+
+    // Loopfilter data
+    loop_filter_data_reset(lf_data, frame, cm, xd);
+
+    // Start loopfiltering
+    if (i == 0) {
+      winterface->execute(worker);
+    } else {
+      winterface->launch(worker);
+    }
+  }
+
+  // Wait till all rows are finished
+  for (i = 0; i < num_workers; ++i) {
+    winterface->sync(&workers[i]);
+  }
+}
+
+void av1_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
+                              MACROBLOCKD *xd, int plane_start, int plane_end,
+                              int partial_frame,
+#if CONFIG_LPF_MASK
+                              int is_decoding,
+#endif
+                              AVxWorker *workers, int num_workers,
+                              AV1LfSync *lf_sync) {
+  int start_mi_row, end_mi_row, mi_rows_to_filter;
+
+  start_mi_row = 0;
+  mi_rows_to_filter = cm->mi_params.mi_rows;
+  if (partial_frame && cm->mi_params.mi_rows > 8) {
+    start_mi_row = cm->mi_params.mi_rows >> 1;
+    start_mi_row &= 0xfffffff8;
+    mi_rows_to_filter = AOMMAX(cm->mi_params.mi_rows / 8, 8);
+  }
+  end_mi_row = start_mi_row + mi_rows_to_filter;
+  av1_loop_filter_frame_init(cm, plane_start, plane_end);
+
+#if CONFIG_LPF_MASK
+  if (is_decoding) {
+    cm->is_decoding = is_decoding;
+    // TODO(chengchen): currently use one thread to build bitmasks for the
+    // frame. Make it support multi-thread later.
+    for (int plane = plane_start; plane < plane_end; plane++) {
+      if (plane == 0 && !(cm->lf.filter_level[0]) && !(cm->lf.filter_level[1]))
+        break;
+      else if (plane == 1 && !(cm->lf.filter_level_u))
+        continue;
+      else if (plane == 2 && !(cm->lf.filter_level_v))
+        continue;
+
+      // TODO(chengchen): can we remove this?
+      struct macroblockd_plane *pd = xd->plane;
+      av1_setup_dst_planes(pd, cm->seq_params.sb_size, frame, 0, 0, plane,
+                           plane + 1);
+
+      av1_build_bitmask_vert_info(cm, &pd[plane], plane);
+      av1_build_bitmask_horz_info(cm, &pd[plane], plane);
+    }
+    loop_filter_rows_mt(frame, cm, xd, start_mi_row, end_mi_row, plane_start,
+                        plane_end, 1, workers, num_workers, lf_sync);
+  } else {
+    loop_filter_rows_mt(frame, cm, xd, start_mi_row, end_mi_row, plane_start,
+                        plane_end, 0, workers, num_workers, lf_sync);
+  }
+#else
+  loop_filter_rows_mt(frame, cm, xd, start_mi_row, end_mi_row, plane_start,
+                      plane_end, workers, num_workers, lf_sync);
+#endif
+}
+
+#if !CONFIG_REALTIME_ONLY
+static INLINE void lr_sync_read(void *const lr_sync, int r, int c, int plane) {
+#if CONFIG_MULTITHREAD
+  AV1LrSync *const loop_res_sync = (AV1LrSync *)lr_sync;
+  const int nsync = loop_res_sync->sync_range;
+
+  if (r && !(c & (nsync - 1))) {
+    pthread_mutex_t *const mutex = &loop_res_sync->mutex_[plane][r - 1];
+    pthread_mutex_lock(mutex);
+
+    while (c > loop_res_sync->cur_sb_col[plane][r - 1] - nsync) {
+      pthread_cond_wait(&loop_res_sync->cond_[plane][r - 1], mutex);
+    }
+    pthread_mutex_unlock(mutex);
+  }
+#else
+  (void)lr_sync;
+  (void)r;
+  (void)c;
+  (void)plane;
+#endif  // CONFIG_MULTITHREAD
+}
+
+static INLINE void lr_sync_write(void *const lr_sync, int r, int c,
+                                 const int sb_cols, int plane) {
+#if CONFIG_MULTITHREAD
+  AV1LrSync *const loop_res_sync = (AV1LrSync *)lr_sync;
+  const int nsync = loop_res_sync->sync_range;
+  int cur;
+  // Only signal when there are enough filtered SB for next row to run.
+  int sig = 1;
+
+  if (c < sb_cols - 1) {
+    cur = c;
+    if (c % nsync) sig = 0;
+  } else {
+    cur = sb_cols + nsync;
+  }
+
+  if (sig) {
+    pthread_mutex_lock(&loop_res_sync->mutex_[plane][r]);
+
+    loop_res_sync->cur_sb_col[plane][r] = cur;
+
+    pthread_cond_broadcast(&loop_res_sync->cond_[plane][r]);
+    pthread_mutex_unlock(&loop_res_sync->mutex_[plane][r]);
+  }
+#else
+  (void)lr_sync;
+  (void)r;
+  (void)c;
+  (void)sb_cols;
+  (void)plane;
+#endif  // CONFIG_MULTITHREAD
+}
+
+// Allocate memory for loop restoration row synchronization
+static void loop_restoration_alloc(AV1LrSync *lr_sync, AV1_COMMON *cm,
+                                   int num_workers, int num_rows_lr,
+                                   int num_planes, int width) {
+  lr_sync->rows = num_rows_lr;
+  lr_sync->num_planes = num_planes;
+#if CONFIG_MULTITHREAD
+  {
+    int i, j;
+
+    for (j = 0; j < num_planes; j++) {
+      CHECK_MEM_ERROR(cm, lr_sync->mutex_[j],
+                      aom_malloc(sizeof(*(lr_sync->mutex_[j])) * num_rows_lr));
+      if (lr_sync->mutex_[j]) {
+        for (i = 0; i < num_rows_lr; ++i) {
+          pthread_mutex_init(&lr_sync->mutex_[j][i], NULL);
+        }
+      }
+
+      CHECK_MEM_ERROR(cm, lr_sync->cond_[j],
+                      aom_malloc(sizeof(*(lr_sync->cond_[j])) * num_rows_lr));
+      if (lr_sync->cond_[j]) {
+        for (i = 0; i < num_rows_lr; ++i) {
+          pthread_cond_init(&lr_sync->cond_[j][i], NULL);
+        }
+      }
+    }
+
+    CHECK_MEM_ERROR(cm, lr_sync->job_mutex,
+                    aom_malloc(sizeof(*(lr_sync->job_mutex))));
+    if (lr_sync->job_mutex) {
+      pthread_mutex_init(lr_sync->job_mutex, NULL);
+    }
+  }
+#endif  // CONFIG_MULTITHREAD
+  CHECK_MEM_ERROR(cm, lr_sync->lrworkerdata,
+                  aom_malloc(num_workers * sizeof(*(lr_sync->lrworkerdata))));
+
+  for (int worker_idx = 0; worker_idx < num_workers; ++worker_idx) {
+    if (worker_idx < num_workers - 1) {
+      CHECK_MEM_ERROR(cm, lr_sync->lrworkerdata[worker_idx].rst_tmpbuf,
+                      (int32_t *)aom_memalign(16, RESTORATION_TMPBUF_SIZE));
+      CHECK_MEM_ERROR(cm, lr_sync->lrworkerdata[worker_idx].rlbs,
+                      aom_malloc(sizeof(RestorationLineBuffers)));
+
+    } else {
+      lr_sync->lrworkerdata[worker_idx].rst_tmpbuf = cm->rst_tmpbuf;
+      lr_sync->lrworkerdata[worker_idx].rlbs = cm->rlbs;
+    }
+  }
+
+  lr_sync->num_workers = num_workers;
+
+  for (int j = 0; j < num_planes; j++) {
+    CHECK_MEM_ERROR(
+        cm, lr_sync->cur_sb_col[j],
+        aom_malloc(sizeof(*(lr_sync->cur_sb_col[j])) * num_rows_lr));
+  }
+  CHECK_MEM_ERROR(
+      cm, lr_sync->job_queue,
+      aom_malloc(sizeof(*(lr_sync->job_queue)) * num_rows_lr * num_planes));
+  // Set up nsync.
+  lr_sync->sync_range = get_lr_sync_range(width);
+}
+
+// Deallocate loop restoration synchronization related mutex and data
+void av1_loop_restoration_dealloc(AV1LrSync *lr_sync, int num_workers) {
+  if (lr_sync != NULL) {
+    int j;
+#if CONFIG_MULTITHREAD
+    int i;
+    for (j = 0; j < MAX_MB_PLANE; j++) {
+      if (lr_sync->mutex_[j] != NULL) {
+        for (i = 0; i < lr_sync->rows; ++i) {
+          pthread_mutex_destroy(&lr_sync->mutex_[j][i]);
+        }
+        aom_free(lr_sync->mutex_[j]);
+      }
+      if (lr_sync->cond_[j] != NULL) {
+        for (i = 0; i < lr_sync->rows; ++i) {
+          pthread_cond_destroy(&lr_sync->cond_[j][i]);
+        }
+        aom_free(lr_sync->cond_[j]);
+      }
+    }
+    if (lr_sync->job_mutex != NULL) {
+      pthread_mutex_destroy(lr_sync->job_mutex);
+      aom_free(lr_sync->job_mutex);
+    }
+#endif  // CONFIG_MULTITHREAD
+    for (j = 0; j < MAX_MB_PLANE; j++) {
+      aom_free(lr_sync->cur_sb_col[j]);
+    }
+
+    aom_free(lr_sync->job_queue);
+
+    if (lr_sync->lrworkerdata) {
+      for (int worker_idx = 0; worker_idx < num_workers - 1; worker_idx++) {
+        LRWorkerData *const workerdata_data =
+            lr_sync->lrworkerdata + worker_idx;
+
+        aom_free(workerdata_data->rst_tmpbuf);
+        aom_free(workerdata_data->rlbs);
+      }
+      aom_free(lr_sync->lrworkerdata);
+    }
+
+    // clear the structure as the source of this call may be a resize in which
+    // case this call will be followed by an _alloc() which may fail.
+    av1_zero(*lr_sync);
+  }
+}
+
+static void enqueue_lr_jobs(AV1LrSync *lr_sync, AV1LrStruct *lr_ctxt,
+                            AV1_COMMON *cm) {
+  FilterFrameCtxt *ctxt = lr_ctxt->ctxt;
+
+  const int num_planes = av1_num_planes(cm);
+  AV1LrMTInfo *lr_job_queue = lr_sync->job_queue;
+  int32_t lr_job_counter[2], num_even_lr_jobs = 0;
+  lr_sync->jobs_enqueued = 0;
+  lr_sync->jobs_dequeued = 0;
+
+  for (int plane = 0; plane < num_planes; plane++) {
+    if (cm->rst_info[plane].frame_restoration_type == RESTORE_NONE) continue;
+    num_even_lr_jobs =
+        num_even_lr_jobs + ((ctxt[plane].rsi->vert_units_per_tile + 1) >> 1);
+  }
+  lr_job_counter[0] = 0;
+  lr_job_counter[1] = num_even_lr_jobs;
+
+  for (int plane = 0; plane < num_planes; plane++) {
+    if (cm->rst_info[plane].frame_restoration_type == RESTORE_NONE) continue;
+    const int is_uv = plane > 0;
+    const int ss_y = is_uv && cm->seq_params.subsampling_y;
+
+    AV1PixelRect tile_rect = ctxt[plane].tile_rect;
+    const int unit_size = ctxt[plane].rsi->restoration_unit_size;
+
+    const int tile_h = tile_rect.bottom - tile_rect.top;
+    const int ext_size = unit_size * 3 / 2;
+
+    int y0 = 0, i = 0;
+    while (y0 < tile_h) {
+      int remaining_h = tile_h - y0;
+      int h = (remaining_h < ext_size) ? remaining_h : unit_size;
+
+      RestorationTileLimits limits;
+      limits.v_start = tile_rect.top + y0;
+      limits.v_end = tile_rect.top + y0 + h;
+      assert(limits.v_end <= tile_rect.bottom);
+      // Offset the tile upwards to align with the restoration processing stripe
+      const int voffset = RESTORATION_UNIT_OFFSET >> ss_y;
+      limits.v_start = AOMMAX(tile_rect.top, limits.v_start - voffset);
+      if (limits.v_end < tile_rect.bottom) limits.v_end -= voffset;
+
+      assert(lr_job_counter[0] <= num_even_lr_jobs);
+
+      lr_job_queue[lr_job_counter[i & 1]].lr_unit_row = i;
+      lr_job_queue[lr_job_counter[i & 1]].plane = plane;
+      lr_job_queue[lr_job_counter[i & 1]].v_start = limits.v_start;
+      lr_job_queue[lr_job_counter[i & 1]].v_end = limits.v_end;
+      lr_job_queue[lr_job_counter[i & 1]].sync_mode = i & 1;
+      if ((i & 1) == 0) {
+        lr_job_queue[lr_job_counter[i & 1]].v_copy_start =
+            limits.v_start + RESTORATION_BORDER;
+        lr_job_queue[lr_job_counter[i & 1]].v_copy_end =
+            limits.v_end - RESTORATION_BORDER;
+        if (i == 0) {
+          assert(limits.v_start == tile_rect.top);
+          lr_job_queue[lr_job_counter[i & 1]].v_copy_start = tile_rect.top;
+        }
+        if (i == (ctxt[plane].rsi->vert_units_per_tile - 1)) {
+          assert(limits.v_end == tile_rect.bottom);
+          lr_job_queue[lr_job_counter[i & 1]].v_copy_end = tile_rect.bottom;
+        }
+      } else {
+        lr_job_queue[lr_job_counter[i & 1]].v_copy_start =
+            AOMMAX(limits.v_start - RESTORATION_BORDER, tile_rect.top);
+        lr_job_queue[lr_job_counter[i & 1]].v_copy_end =
+            AOMMIN(limits.v_end + RESTORATION_BORDER, tile_rect.bottom);
+      }
+      lr_job_counter[i & 1]++;
+      lr_sync->jobs_enqueued++;
+
+      y0 += h;
+      ++i;
+    }
+  }
+}
+
+static AV1LrMTInfo *get_lr_job_info(AV1LrSync *lr_sync) {
+  AV1LrMTInfo *cur_job_info = NULL;
+
+#if CONFIG_MULTITHREAD
+  pthread_mutex_lock(lr_sync->job_mutex);
+
+  if (lr_sync->jobs_dequeued < lr_sync->jobs_enqueued) {
+    cur_job_info = lr_sync->job_queue + lr_sync->jobs_dequeued;
+    lr_sync->jobs_dequeued++;
+  }
+
+  pthread_mutex_unlock(lr_sync->job_mutex);
+#else
+  (void)lr_sync;
+#endif
+
+  return cur_job_info;
+}
+
+// Implement row loop restoration for each thread.
+static int loop_restoration_row_worker(void *arg1, void *arg2) {
+  AV1LrSync *const lr_sync = (AV1LrSync *)arg1;
+  LRWorkerData *lrworkerdata = (LRWorkerData *)arg2;
+  AV1LrStruct *lr_ctxt = (AV1LrStruct *)lrworkerdata->lr_ctxt;
+  FilterFrameCtxt *ctxt = lr_ctxt->ctxt;
+  int lr_unit_row;
+  int plane;
+  const int tile_row = LR_TILE_ROW;
+  const int tile_col = LR_TILE_COL;
+  const int tile_cols = LR_TILE_COLS;
+  const int tile_idx = tile_col + tile_row * tile_cols;
+  typedef void (*copy_fun)(const YV12_BUFFER_CONFIG *src_ybc,
+                           YV12_BUFFER_CONFIG *dst_ybc, int hstart, int hend,
+                           int vstart, int vend);
+  static const copy_fun copy_funs[3] = { aom_yv12_partial_coloc_copy_y,
+                                         aom_yv12_partial_coloc_copy_u,
+                                         aom_yv12_partial_coloc_copy_v };
+
+  while (1) {
+    AV1LrMTInfo *cur_job_info = get_lr_job_info(lr_sync);
+    if (cur_job_info != NULL) {
+      RestorationTileLimits limits;
+      sync_read_fn_t on_sync_read;
+      sync_write_fn_t on_sync_write;
+      limits.v_start = cur_job_info->v_start;
+      limits.v_end = cur_job_info->v_end;
+      lr_unit_row = cur_job_info->lr_unit_row;
+      plane = cur_job_info->plane;
+      const int unit_idx0 = tile_idx * ctxt[plane].rsi->units_per_tile;
+
+      // sync_mode == 1 implies only sync read is required in LR Multi-threading
+      // sync_mode == 0 implies only sync write is required.
+      on_sync_read =
+          cur_job_info->sync_mode == 1 ? lr_sync_read : av1_lr_sync_read_dummy;
+      on_sync_write = cur_job_info->sync_mode == 0 ? lr_sync_write
+                                                   : av1_lr_sync_write_dummy;
+
+      av1_foreach_rest_unit_in_row(
+          &limits, &(ctxt[plane].tile_rect), lr_ctxt->on_rest_unit, lr_unit_row,
+          ctxt[plane].rsi->restoration_unit_size, unit_idx0,
+          ctxt[plane].rsi->horz_units_per_tile,
+          ctxt[plane].rsi->vert_units_per_tile, plane, &ctxt[plane],
+          lrworkerdata->rst_tmpbuf, lrworkerdata->rlbs, on_sync_read,
+          on_sync_write, lr_sync);
+
+      copy_funs[plane](lr_ctxt->dst, lr_ctxt->frame, ctxt[plane].tile_rect.left,
+                       ctxt[plane].tile_rect.right, cur_job_info->v_copy_start,
+                       cur_job_info->v_copy_end);
+    } else {
+      break;
+    }
+  }
+  return 1;
+}
+
+static void foreach_rest_unit_in_planes_mt(AV1LrStruct *lr_ctxt,
+                                           AVxWorker *workers, int nworkers,
+                                           AV1LrSync *lr_sync, AV1_COMMON *cm) {
+  FilterFrameCtxt *ctxt = lr_ctxt->ctxt;
+
+  const int num_planes = av1_num_planes(cm);
+
+  const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+  int num_rows_lr = 0;
+
+  for (int plane = 0; plane < num_planes; plane++) {
+    if (cm->rst_info[plane].frame_restoration_type == RESTORE_NONE) continue;
+
+    const AV1PixelRect tile_rect = ctxt[plane].tile_rect;
+    const int max_tile_h = tile_rect.bottom - tile_rect.top;
+
+    const int unit_size = cm->rst_info[plane].restoration_unit_size;
+
+    num_rows_lr =
+        AOMMAX(num_rows_lr, av1_lr_count_units_in_tile(unit_size, max_tile_h));
+  }
+
+  const int num_workers = nworkers;
+  int i;
+  assert(MAX_MB_PLANE == 3);
+
+  if (!lr_sync->sync_range || num_rows_lr != lr_sync->rows ||
+      num_workers > lr_sync->num_workers || num_planes != lr_sync->num_planes) {
+    av1_loop_restoration_dealloc(lr_sync, num_workers);
+    loop_restoration_alloc(lr_sync, cm, num_workers, num_rows_lr, num_planes,
+                           cm->width);
+  }
+
+  // Initialize cur_sb_col to -1 for all SB rows.
+  for (i = 0; i < num_planes; i++) {
+    memset(lr_sync->cur_sb_col[i], -1,
+           sizeof(*(lr_sync->cur_sb_col[i])) * num_rows_lr);
+  }
+
+  enqueue_lr_jobs(lr_sync, lr_ctxt, cm);
+
+  // Set up looprestoration thread data.
+  for (i = num_workers - 1; i >= 0; --i) {
+    AVxWorker *const worker = &workers[i];
+    lr_sync->lrworkerdata[i].lr_ctxt = (void *)lr_ctxt;
+    worker->hook = loop_restoration_row_worker;
+    worker->data1 = lr_sync;
+    worker->data2 = &lr_sync->lrworkerdata[i];
+
+    // Start loop restoration
+    if (i == 0) {
+      winterface->execute(worker);
+    } else {
+      winterface->launch(worker);
+    }
+  }
+
+  // Wait till all rows are finished
+  for (i = 0; i < num_workers; ++i) {
+    winterface->sync(&workers[i]);
+  }
+}
+
+void av1_loop_restoration_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
+                                          AV1_COMMON *cm, int optimized_lr,
+                                          AVxWorker *workers, int num_workers,
+                                          AV1LrSync *lr_sync, void *lr_ctxt) {
+  assert(!cm->features.all_lossless);
+
+  const int num_planes = av1_num_planes(cm);
+
+  AV1LrStruct *loop_rest_ctxt = (AV1LrStruct *)lr_ctxt;
+
+  av1_loop_restoration_filter_frame_init(loop_rest_ctxt, frame, cm,
+                                         optimized_lr, num_planes);
+
+  foreach_rest_unit_in_planes_mt(loop_rest_ctxt, workers, num_workers, lr_sync,
+                                 cm);
+}
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.h
new file mode 100644
index 0000000000..a6950166df
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_THREAD_COMMON_H_
+#define AOM_AV1_COMMON_THREAD_COMMON_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct AV1Common;
+
+typedef struct AV1LfMTInfo {
+  int mi_row;
+  int plane;
+  int dir;
+} AV1LfMTInfo;
+
+// Loopfilter row synchronization
+typedef struct AV1LfSyncData {
+#if CONFIG_MULTITHREAD
+  pthread_mutex_t *mutex_[MAX_MB_PLANE];
+  pthread_cond_t *cond_[MAX_MB_PLANE];
+#endif
+  // Allocate memory to store the loop-filtered superblock index in each row.
+  int *cur_sb_col[MAX_MB_PLANE];
+  // The optimal sync_range for different resolution and platform should be
+  // determined by testing. Currently, it is chosen to be a power-of-2 number.
+  int sync_range;
+  int rows;
+
+  // Row-based parallel loopfilter data
+  LFWorkerData *lfdata;
+  int num_workers;
+
+#if CONFIG_MULTITHREAD
+  pthread_mutex_t *job_mutex;
+#endif
+  AV1LfMTInfo *job_queue;
+  int jobs_enqueued;
+  int jobs_dequeued;
+} AV1LfSync;
+
+typedef struct AV1LrMTInfo {
+  int v_start;
+  int v_end;
+  int lr_unit_row;
+  int plane;
+  int sync_mode;
+  int v_copy_start;
+  int v_copy_end;
+} AV1LrMTInfo;
+
+typedef struct LoopRestorationWorkerData {
+  int32_t *rst_tmpbuf;
+  void *rlbs;
+  void *lr_ctxt;
+} LRWorkerData;
+
+// Looprestoration row synchronization
+typedef struct AV1LrSyncData {
+#if CONFIG_MULTITHREAD
+  pthread_mutex_t *mutex_[MAX_MB_PLANE];
+  pthread_cond_t *cond_[MAX_MB_PLANE];
+#endif
+  // Allocate memory to store the loop-restoration block index in each row.
+  int *cur_sb_col[MAX_MB_PLANE];
+  // The optimal sync_range for different resolution and platform should be
+  // determined by testing. Currently, it is chosen to be a power-of-2 number.
+  int sync_range;
+  int rows;
+  int num_planes;
+
+  int num_workers;
+
+#if CONFIG_MULTITHREAD
+  pthread_mutex_t *job_mutex;
+#endif
+  // Row-based parallel loopfilter data
+  LRWorkerData *lrworkerdata;
+
+  AV1LrMTInfo *job_queue;
+  int jobs_enqueued;
+  int jobs_dequeued;
+} AV1LrSync;
+
+// Deallocate loopfilter synchronization related mutex and data.
+void av1_loop_filter_dealloc(AV1LfSync *lf_sync);
+
+void av1_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, struct AV1Common *cm,
+                              struct macroblockd *xd, int plane_start,
+                              int plane_end, int partial_frame,
+#if CONFIG_LPF_MASK
+                              int is_decoding,
+#endif
+                              AVxWorker *workers, int num_workers,
+                              AV1LfSync *lf_sync);
+
+#if !CONFIG_REALTIME_ONLY
+void av1_loop_restoration_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
+                                          struct AV1Common *cm,
+                                          int optimized_lr, AVxWorker *workers,
+                                          int num_workers, AV1LrSync *lr_sync,
+                                          void *lr_ctxt);
+void av1_loop_restoration_dealloc(AV1LrSync *lr_sync, int num_workers);
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_THREAD_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.c
new file mode 100644
index 0000000000..56554e7869
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.c
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/resize.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+
+void av1_tile_init(TileInfo *tile, const AV1_COMMON *cm, int row, int col) {
+  av1_tile_set_row(tile, cm, row);
+  av1_tile_set_col(tile, cm, col);
+}
+
+// Find smallest k>=0 such that (blk_size << k) >= target
+static int tile_log2(int blk_size, int target) {
+  int k;
+  for (k = 0; (blk_size << k) < target; k++) {
+  }
+  return k;
+}
+
+void av1_get_tile_limits(AV1_COMMON *const cm) {
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  CommonTileParams *const tiles = &cm->tiles;
+  const int mi_cols =
+      ALIGN_POWER_OF_TWO(cm->mi_params.mi_cols, seq_params->mib_size_log2);
+  const int mi_rows =
+      ALIGN_POWER_OF_TWO(cm->mi_params.mi_rows, seq_params->mib_size_log2);
+  const int sb_cols = mi_cols >> seq_params->mib_size_log2;
+  const int sb_rows = mi_rows >> seq_params->mib_size_log2;
+
+  const int sb_size_log2 = seq_params->mib_size_log2 + MI_SIZE_LOG2;
+  tiles->max_width_sb = MAX_TILE_WIDTH >> sb_size_log2;
+  const int max_tile_area_sb = MAX_TILE_AREA >> (2 * sb_size_log2);
+
+  tiles->min_log2_cols = tile_log2(tiles->max_width_sb, sb_cols);
+  tiles->max_log2_cols = tile_log2(1, AOMMIN(sb_cols, MAX_TILE_COLS));
+  tiles->max_log2_rows = tile_log2(1, AOMMIN(sb_rows, MAX_TILE_ROWS));
+  tiles->min_log2 = tile_log2(max_tile_area_sb, sb_cols * sb_rows);
+  tiles->min_log2 = AOMMAX(tiles->min_log2, tiles->min_log2_cols);
+}
+
+void av1_calculate_tile_cols(const SequenceHeader *const seq_params,
+                             int cm_mi_rows, int cm_mi_cols,
+                             CommonTileParams *const tiles) {
+  int mi_cols = ALIGN_POWER_OF_TWO(cm_mi_cols, seq_params->mib_size_log2);
+  int mi_rows = ALIGN_POWER_OF_TWO(cm_mi_rows, seq_params->mib_size_log2);
+  int sb_cols = mi_cols >> seq_params->mib_size_log2;
+  int sb_rows = mi_rows >> seq_params->mib_size_log2;
+  int i;
+
+  // This will be overridden if there is at least two columns of tiles
+  // (otherwise there is no inner tile width)
+  tiles->min_inner_width = -1;
+
+  if (tiles->uniform_spacing) {
+    int start_sb;
+    int size_sb = ALIGN_POWER_OF_TWO(sb_cols, tiles->log2_cols);
+    size_sb >>= tiles->log2_cols;
+    assert(size_sb > 0);
+    for (i = 0, start_sb = 0; start_sb < sb_cols; i++) {
+      tiles->col_start_sb[i] = start_sb;
+      start_sb += size_sb;
+    }
+    tiles->cols = i;
+    tiles->col_start_sb[i] = sb_cols;
+    tiles->min_log2_rows = AOMMAX(tiles->min_log2 - tiles->log2_cols, 0);
+    tiles->max_height_sb = sb_rows >> tiles->min_log2_rows;
+
+    tiles->width = size_sb << seq_params->mib_size_log2;
+    tiles->width = AOMMIN(tiles->width, cm_mi_cols);
+    if (tiles->cols > 1) {
+      tiles->min_inner_width = tiles->width;
+    }
+  } else {
+    int max_tile_area_sb = (sb_rows * sb_cols);
+    int widest_tile_sb = 1;
+    int narrowest_inner_tile_sb = 65536;
+    tiles->log2_cols = tile_log2(1, tiles->cols);
+    for (i = 0; i < tiles->cols; i++) {
+      int size_sb = tiles->col_start_sb[i + 1] - tiles->col_start_sb[i];
+      widest_tile_sb = AOMMAX(widest_tile_sb, size_sb);
+      // ignore the rightmost tile in frame for determining the narrowest
+      if (i < tiles->cols - 1)
+        narrowest_inner_tile_sb = AOMMIN(narrowest_inner_tile_sb, size_sb);
+    }
+    if (tiles->min_log2) {
+      max_tile_area_sb >>= (tiles->min_log2 + 1);
+    }
+    tiles->max_height_sb = AOMMAX(max_tile_area_sb / widest_tile_sb, 1);
+    if (tiles->cols > 1) {
+      tiles->min_inner_width = narrowest_inner_tile_sb
+                               << seq_params->mib_size_log2;
+    }
+  }
+}
+
+void av1_calculate_tile_rows(const SequenceHeader *const seq_params,
+                             int cm_mi_rows, CommonTileParams *const tiles) {
+  int mi_rows = ALIGN_POWER_OF_TWO(cm_mi_rows, seq_params->mib_size_log2);
+  int sb_rows = mi_rows >> seq_params->mib_size_log2;
+  int start_sb, size_sb, i;
+
+  if (tiles->uniform_spacing) {
+    size_sb = ALIGN_POWER_OF_TWO(sb_rows, tiles->log2_rows);
+    size_sb >>= tiles->log2_rows;
+    assert(size_sb > 0);
+    for (i = 0, start_sb = 0; start_sb < sb_rows; i++) {
+      tiles->row_start_sb[i] = start_sb;
+      start_sb += size_sb;
+    }
+    tiles->rows = i;
+    tiles->row_start_sb[i] = sb_rows;
+
+    tiles->height = size_sb << seq_params->mib_size_log2;
+    tiles->height = AOMMIN(tiles->height, cm_mi_rows);
+  } else {
+    tiles->log2_rows = tile_log2(1, tiles->rows);
+  }
+}
+
+void av1_tile_set_row(TileInfo *tile, const AV1_COMMON *cm, int row) {
+  assert(row < cm->tiles.rows);
+  int mi_row_start = cm->tiles.row_start_sb[row]
+                     << cm->seq_params.mib_size_log2;
+  int mi_row_end = cm->tiles.row_start_sb[row + 1]
+                   << cm->seq_params.mib_size_log2;
+  tile->tile_row = row;
+  tile->mi_row_start = mi_row_start;
+  tile->mi_row_end = AOMMIN(mi_row_end, cm->mi_params.mi_rows);
+  assert(tile->mi_row_end > tile->mi_row_start);
+}
+
+void av1_tile_set_col(TileInfo *tile, const AV1_COMMON *cm, int col) {
+  assert(col < cm->tiles.cols);
+  int mi_col_start = cm->tiles.col_start_sb[col]
+                     << cm->seq_params.mib_size_log2;
+  int mi_col_end = cm->tiles.col_start_sb[col + 1]
+                   << cm->seq_params.mib_size_log2;
+  tile->tile_col = col;
+  tile->mi_col_start = mi_col_start;
+  tile->mi_col_end = AOMMIN(mi_col_end, cm->mi_params.mi_cols);
+  assert(tile->mi_col_end > tile->mi_col_start);
+}
+
+int av1_get_sb_rows_in_tile(AV1_COMMON *cm, TileInfo tile) {
+  int mi_rows_aligned_to_sb = ALIGN_POWER_OF_TWO(
+      tile.mi_row_end - tile.mi_row_start, cm->seq_params.mib_size_log2);
+  int sb_rows = mi_rows_aligned_to_sb >> cm->seq_params.mib_size_log2;
+
+  return sb_rows;
+}
+
+int av1_get_sb_cols_in_tile(AV1_COMMON *cm, TileInfo tile) {
+  int mi_cols_aligned_to_sb = ALIGN_POWER_OF_TWO(
+      tile.mi_col_end - tile.mi_col_start, cm->seq_params.mib_size_log2);
+  int sb_cols = mi_cols_aligned_to_sb >> cm->seq_params.mib_size_log2;
+
+  return sb_cols;
+}
+
+AV1PixelRect av1_get_tile_rect(const TileInfo *tile_info, const AV1_COMMON *cm,
+                               int is_uv) {
+  AV1PixelRect r;
+
+  // Calculate position in the Y plane
+  r.left = tile_info->mi_col_start * MI_SIZE;
+  r.right = tile_info->mi_col_end * MI_SIZE;
+  r.top = tile_info->mi_row_start * MI_SIZE;
+  r.bottom = tile_info->mi_row_end * MI_SIZE;
+
+  // If upscaling is enabled, the tile limits need scaling to match the
+  // upscaled frame where the restoration units live. To do this, scale up the
+  // top-left and bottom-right of the tile.
+  if (av1_superres_scaled(cm)) {
+    av1_calculate_unscaled_superres_size(&r.left, &r.top,
+                                         cm->superres_scale_denominator);
+    av1_calculate_unscaled_superres_size(&r.right, &r.bottom,
+                                         cm->superres_scale_denominator);
+  }
+
+  const int frame_w = cm->superres_upscaled_width;
+  const int frame_h = cm->superres_upscaled_height;
+
+  // Make sure we don't fall off the bottom-right of the frame.
+  r.right = AOMMIN(r.right, frame_w);
+  r.bottom = AOMMIN(r.bottom, frame_h);
+
+  // Convert to coordinates in the appropriate plane
+  const int ss_x = is_uv && cm->seq_params.subsampling_x;
+  const int ss_y = is_uv && cm->seq_params.subsampling_y;
+
+  r.left = ROUND_POWER_OF_TWO(r.left, ss_x);
+  r.right = ROUND_POWER_OF_TWO(r.right, ss_x);
+  r.top = ROUND_POWER_OF_TWO(r.top, ss_y);
+  r.bottom = ROUND_POWER_OF_TWO(r.bottom, ss_y);
+
+  return r;
+}
+
+void av1_get_uniform_tile_size(const AV1_COMMON *cm, int *w, int *h) {
+  const CommonTileParams *const tiles = &cm->tiles;
+  if (tiles->uniform_spacing) {
+    *w = tiles->width;
+    *h = tiles->height;
+  } else {
+    for (int i = 0; i < tiles->cols; ++i) {
+      const int tile_width_sb =
+          tiles->col_start_sb[i + 1] - tiles->col_start_sb[i];
+      const int tile_w = tile_width_sb * cm->seq_params.mib_size;
+      assert(i == 0 || tile_w == *w);  // ensure all tiles have same dimension
+      *w = tile_w;
+    }
+
+    for (int i = 0; i < tiles->rows; ++i) {
+      const int tile_height_sb =
+          tiles->row_start_sb[i + 1] - tiles->row_start_sb[i];
+      const int tile_h = tile_height_sb * cm->seq_params.mib_size;
+      assert(i == 0 || tile_h == *h);  // ensure all tiles have same dimension
+      *h = tile_h;
+    }
+  }
+}
+
+int av1_is_min_tile_width_satisfied(const AV1_COMMON *cm) {
+  // Disable check if there is a single tile col in the frame
+  if (cm->tiles.cols == 1) return 1;
+
+  return ((cm->tiles.min_inner_width << MI_SIZE_LOG2) >=
+          (64 << av1_superres_scaled(cm)));
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.h
new file mode 100644
index 0000000000..1286689b3b
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_TILE_COMMON_H_
+#define AOM_AV1_COMMON_TILE_COMMON_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+struct AV1Common;
+struct SequenceHeader;
+struct CommonTileParams;
+
+#define DEFAULT_MAX_NUM_TG 1
+
+typedef struct TileInfo {
+  int mi_row_start, mi_row_end;
+  int mi_col_start, mi_col_end;
+  int tile_row;
+  int tile_col;
+} TileInfo;
+
+// initializes 'tile->mi_(row|col)_(start|end)' for (row, col) based on
+// 'cm->log2_tile_(rows|cols)' & 'cm->mi_(rows|cols)'
+void av1_tile_init(TileInfo *tile, const struct AV1Common *cm, int row,
+                   int col);
+
+void av1_tile_set_row(TileInfo *tile, const struct AV1Common *cm, int row);
+void av1_tile_set_col(TileInfo *tile, const struct AV1Common *cm, int col);
+
+int av1_get_sb_rows_in_tile(struct AV1Common *cm, TileInfo tile);
+int av1_get_sb_cols_in_tile(struct AV1Common *cm, TileInfo tile);
+
+typedef struct {
+  int left, top, right, bottom;
+} AV1PixelRect;
+
+// Return the pixel extents of the given tile
+AV1PixelRect av1_get_tile_rect(const TileInfo *tile_info,
+                               const struct AV1Common *cm, int is_uv);
+
+// Define tile maximum width and area
+// There is no maximum height since height is limited by area and width limits
+// The minimum tile width or height is fixed at one superblock
+#define MAX_TILE_WIDTH (4096)        // Max Tile width in pixels
+#define MAX_TILE_AREA (4096 * 2304)  // Maximum tile area in pixels
+
+void av1_get_uniform_tile_size(const struct AV1Common *cm, int *w, int *h);
+void av1_get_tile_limits(struct AV1Common *const cm);
+void av1_calculate_tile_cols(const struct SequenceHeader *const seq_params,
+                             int cm_mi_rows, int cm_mi_cols,
+                             struct CommonTileParams *const tiles);
+void av1_calculate_tile_rows(const struct SequenceHeader *const seq_params,
+                             int cm_mi_rows,
+                             struct CommonTileParams *const tiles);
+
+// Checks if the minimum tile_width requirement is satisfied
+int av1_is_min_tile_width_satisfied(const struct AV1Common *cm);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_COMMON_TILE_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/timing.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/timing.c
new file mode 100644
index 0000000000..4be65b95b3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/timing.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/timing.h"
+
+/* Tables for AV1 max bitrates for different levels of main and high tier.
+ * The tables are in Kbps instead of Mbps in the specification.
+ * Note that depending on the profile, a multiplier is needed.
+ */
+#define UNDEFINED_RATE \
+  (1 << 21)  // Placeholder rate for levels with undefined rate
+#define INVALID_RATE \
+  (0)  // For invalid profile-level configuration, set rate to 0
+
+/* Max Bitrates for levels of Main Tier in kbps. Bitrate in main_kbps [31] */
+/* is a dummy value. The decoder model is not applicable for level 31. */
+static int32_t main_kbps[1 << LEVEL_BITS] = {
+  1500,           3000,           UNDEFINED_RATE, UNDEFINED_RATE,
+  6000,           10000,          UNDEFINED_RATE, UNDEFINED_RATE,
+  12000,          20000,          UNDEFINED_RATE, UNDEFINED_RATE,
+  30000,          40000,          60000,          60000,
+  60000,          100000,         160000,         160000,
+  UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE,
+  UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE,
+  UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE
+};
+
+/* Max Bitrates for levels of High Tier in kbps. Bitrate in high_kbps [31] */
+/* is a dummy value. The decoder model is not applicable for level 31. */
+static int32_t high_kbps[1 << LEVEL_BITS] = {
+  INVALID_RATE,   INVALID_RATE,   INVALID_RATE,   INVALID_RATE,
+  INVALID_RATE,   INVALID_RATE,   INVALID_RATE,   INVALID_RATE,
+  30000,          50000,          UNDEFINED_RATE, UNDEFINED_RATE,
+  100000,         160000,         240000,         240000,
+  240000,         480000,         800000,         800000,
+  UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE,
+  UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE,
+  UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE, UNDEFINED_RATE
+};
+
+/* BitrateProfileFactor */
+static int bitrate_profile_factor[1 << PROFILE_BITS] = {
+  1, 2, 3, 0, 0, 0, 0, 0
+};
+
+int64_t av1_max_level_bitrate(BITSTREAM_PROFILE seq_profile, int seq_level_idx,
+                              int seq_tier) {
+  int64_t bitrate;
+
+  if (seq_tier) {
+    bitrate = high_kbps[seq_level_idx] * bitrate_profile_factor[seq_profile];
+  } else {
+    bitrate = main_kbps[seq_level_idx] * bitrate_profile_factor[seq_profile];
+  }
+
+  return bitrate * 1000;
+}
+
+void av1_set_aom_dec_model_info(aom_dec_model_info_t *decoder_model) {
+  decoder_model->encoder_decoder_buffer_delay_length = 16;
+  decoder_model->buffer_removal_time_length = 10;
+  decoder_model->frame_presentation_time_length = 10;
+}
+
+void av1_set_dec_model_op_parameters(aom_dec_model_op_parameters_t *op_params) {
+  op_params->decoder_model_param_present_flag = 1;
+  op_params->decoder_buffer_delay = 90000 >> 1;  //  0.5 s
+  op_params->encoder_buffer_delay = 90000 >> 1;  //  0.5 s
+  op_params->low_delay_mode_flag = 0;
+  op_params->display_model_param_present_flag = 1;
+  op_params->initial_display_delay = 8;  // 8 frames delay
+}
+
+void av1_set_resource_availability_parameters(
+    aom_dec_model_op_parameters_t *op_params) {
+  op_params->decoder_model_param_present_flag = 0;
+  op_params->decoder_buffer_delay =
+      70000;  // Resource availability mode default
+  op_params->encoder_buffer_delay =
+      20000;                           // Resource availability mode default
+  op_params->low_delay_mode_flag = 0;  // Resource availability mode default
+  op_params->display_model_param_present_flag = 1;
+  op_params->initial_display_delay = 8;  // 8 frames delay
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/timing.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/timing.h
new file mode 100644
index 0000000000..2e45e25de5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/timing.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_TIMING_H_
+#define AOM_AV1_COMMON_TIMING_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+#define MAX_NUM_OP_POINTS 32
+
+typedef struct aom_timing {
+  uint32_t num_units_in_display_tick;
+  uint32_t time_scale;
+  int equal_picture_interval;
+  uint32_t num_ticks_per_picture;
+} aom_timing_info_t;
+
+typedef struct aom_dec_model_info {
+  uint32_t num_units_in_decoding_tick;
+  int encoder_decoder_buffer_delay_length;
+  int buffer_removal_time_length;
+  int frame_presentation_time_length;
+} aom_dec_model_info_t;
+
+typedef struct aom_dec_model_op_parameters {
+  int decoder_model_param_present_flag;
+  int64_t bitrate;
+  int64_t buffer_size;
+  uint32_t decoder_buffer_delay;
+  uint32_t encoder_buffer_delay;
+  int low_delay_mode_flag;
+  int display_model_param_present_flag;
+  int initial_display_delay;
+} aom_dec_model_op_parameters_t;
+
+void av1_set_aom_dec_model_info(aom_dec_model_info_t *decoder_model);
+
+void av1_set_dec_model_op_parameters(aom_dec_model_op_parameters_t *op_params);
+
+void av1_set_resource_availability_parameters(
+    aom_dec_model_op_parameters_t *op_params);
+
+int64_t av1_max_level_bitrate(BITSTREAM_PROFILE seq_profile, int seq_level_idx,
+                              int seq_tier);
+
+#endif  // AOM_AV1_COMMON_TIMING_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/token_cdfs.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/token_cdfs.h
new file mode 100644
index 0000000000..67e4e101ff
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/token_cdfs.h
@@ -0,0 +1,3555 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_TOKEN_CDFS_H_
+#define AOM_AV1_COMMON_TOKEN_CDFS_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+
+static const aom_cdf_prob
+    av1_default_dc_sign_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][DC_SIGN_CONTEXTS]
+                            [CDF_SIZE(2)] = {
+                              { {
+                                    { AOM_CDF2(128 * 125) },
+                                    { AOM_CDF2(128 * 102) },
+                                    { AOM_CDF2(128 * 147) },
+                                },
+                                {
+                                    { AOM_CDF2(128 * 119) },
+                                    { AOM_CDF2(128 * 101) },
+                                    { AOM_CDF2(128 * 135) },
+                                } },
+                              { {
+                                    { AOM_CDF2(128 * 125) },
+                                    { AOM_CDF2(128 * 102) },
+                                    { AOM_CDF2(128 * 147) },
+                                },
+                                {
+                                    { AOM_CDF2(128 * 119) },
+                                    { AOM_CDF2(128 * 101) },
+                                    { AOM_CDF2(128 * 135) },
+                                } },
+                              { {
+                                    { AOM_CDF2(128 * 125) },
+                                    { AOM_CDF2(128 * 102) },
+                                    { AOM_CDF2(128 * 147) },
+                                },
+                                {
+                                    { AOM_CDF2(128 * 119) },
+                                    { AOM_CDF2(128 * 101) },
+                                    { AOM_CDF2(128 * 135) },
+                                } },
+                              { {
+                                    { AOM_CDF2(128 * 125) },
+                                    { AOM_CDF2(128 * 102) },
+                                    { AOM_CDF2(128 * 147) },
+                                },
+                                {
+                                    { AOM_CDF2(128 * 119) },
+                                    { AOM_CDF2(128 * 101) },
+                                    { AOM_CDF2(128 * 135) },
+                                } },
+                            };
+
+static const aom_cdf_prob
+    av1_default_txb_skip_cdfs[TOKEN_CDF_Q_CTXS][TX_SIZES][TXB_SKIP_CONTEXTS]
+                             [CDF_SIZE(2)] = { { { { AOM_CDF2(31849) },
+                                                   { AOM_CDF2(5892) },
+                                                   { AOM_CDF2(12112) },
+                                                   { AOM_CDF2(21935) },
+                                                   { AOM_CDF2(20289) },
+                                                   { AOM_CDF2(27473) },
+                                                   { AOM_CDF2(32487) },
+                                                   { AOM_CDF2(7654) },
+                                                   { AOM_CDF2(19473) },
+                                                   { AOM_CDF2(29984) },
+                                                   { AOM_CDF2(9961) },
+                                                   { AOM_CDF2(30242) },
+                                                   { AOM_CDF2(32117) } },
+                                                 { { AOM_CDF2(31548) },
+                                                   { AOM_CDF2(1549) },
+                                                   { AOM_CDF2(10130) },
+                                                   { AOM_CDF2(16656) },
+                                                   { AOM_CDF2(18591) },
+                                                   { AOM_CDF2(26308) },
+                                                   { AOM_CDF2(32537) },
+                                                   { AOM_CDF2(5403) },
+                                                   { AOM_CDF2(18096) },
+                                                   { AOM_CDF2(30003) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(29957) },
+                                                   { AOM_CDF2(5391) },
+                                                   { AOM_CDF2(18039) },
+                                                   { AOM_CDF2(23566) },
+                                                   { AOM_CDF2(22431) },
+                                                   { AOM_CDF2(25822) },
+                                                   { AOM_CDF2(32197) },
+                                                   { AOM_CDF2(3778) },
+                                                   { AOM_CDF2(15336) },
+                                                   { AOM_CDF2(28981) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(17920) },
+                                                   { AOM_CDF2(1818) },
+                                                   { AOM_CDF2(7282) },
+                                                   { AOM_CDF2(25273) },
+                                                   { AOM_CDF2(10923) },
+                                                   { AOM_CDF2(31554) },
+                                                   { AOM_CDF2(32624) },
+                                                   { AOM_CDF2(1366) },
+                                                   { AOM_CDF2(15628) },
+                                                   { AOM_CDF2(30462) },
+                                                   { AOM_CDF2(146) },
+                                                   { AOM_CDF2(5132) },
+                                                   { AOM_CDF2(31657) } },
+                                                 { { AOM_CDF2(6308) },
+                                                   { AOM_CDF2(117) },
+                                                   { AOM_CDF2(1638) },
+                                                   { AOM_CDF2(2161) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(10923) },
+                                                   { AOM_CDF2(30247) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } } },
+                                               { { { AOM_CDF2(30371) },
+                                                   { AOM_CDF2(7570) },
+                                                   { AOM_CDF2(13155) },
+                                                   { AOM_CDF2(20751) },
+                                                   { AOM_CDF2(20969) },
+                                                   { AOM_CDF2(27067) },
+                                                   { AOM_CDF2(32013) },
+                                                   { AOM_CDF2(5495) },
+                                                   { AOM_CDF2(17942) },
+                                                   { AOM_CDF2(28280) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(31782) },
+                                                   { AOM_CDF2(1836) },
+                                                   { AOM_CDF2(10689) },
+                                                   { AOM_CDF2(17604) },
+                                                   { AOM_CDF2(21622) },
+                                                   { AOM_CDF2(27518) },
+                                                   { AOM_CDF2(32399) },
+                                                   { AOM_CDF2(4419) },
+                                                   { AOM_CDF2(16294) },
+                                                   { AOM_CDF2(28345) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(31901) },
+                                                   { AOM_CDF2(10311) },
+                                                   { AOM_CDF2(18047) },
+                                                   { AOM_CDF2(24806) },
+                                                   { AOM_CDF2(23288) },
+                                                   { AOM_CDF2(27914) },
+                                                   { AOM_CDF2(32296) },
+                                                   { AOM_CDF2(4215) },
+                                                   { AOM_CDF2(15756) },
+                                                   { AOM_CDF2(28341) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(26726) },
+                                                   { AOM_CDF2(1045) },
+                                                   { AOM_CDF2(11703) },
+                                                   { AOM_CDF2(20590) },
+                                                   { AOM_CDF2(18554) },
+                                                   { AOM_CDF2(25970) },
+                                                   { AOM_CDF2(31938) },
+                                                   { AOM_CDF2(5583) },
+                                                   { AOM_CDF2(21313) },
+                                                   { AOM_CDF2(29390) },
+                                                   { AOM_CDF2(641) },
+                                                   { AOM_CDF2(22265) },
+                                                   { AOM_CDF2(31452) } },
+                                                 { { AOM_CDF2(26584) },
+                                                   { AOM_CDF2(188) },
+                                                   { AOM_CDF2(8847) },
+                                                   { AOM_CDF2(24519) },
+                                                   { AOM_CDF2(22938) },
+                                                   { AOM_CDF2(30583) },
+                                                   { AOM_CDF2(32608) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } } },
+                                               { { { AOM_CDF2(29614) },
+                                                   { AOM_CDF2(9068) },
+                                                   { AOM_CDF2(12924) },
+                                                   { AOM_CDF2(19538) },
+                                                   { AOM_CDF2(17737) },
+                                                   { AOM_CDF2(24619) },
+                                                   { AOM_CDF2(30642) },
+                                                   { AOM_CDF2(4119) },
+                                                   { AOM_CDF2(16026) },
+                                                   { AOM_CDF2(25657) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(31957) },
+                                                   { AOM_CDF2(3230) },
+                                                   { AOM_CDF2(11153) },
+                                                   { AOM_CDF2(18123) },
+                                                   { AOM_CDF2(20143) },
+                                                   { AOM_CDF2(26536) },
+                                                   { AOM_CDF2(31986) },
+                                                   { AOM_CDF2(3050) },
+                                                   { AOM_CDF2(14603) },
+                                                   { AOM_CDF2(25155) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(32363) },
+                                                   { AOM_CDF2(10692) },
+                                                   { AOM_CDF2(19090) },
+                                                   { AOM_CDF2(24357) },
+                                                   { AOM_CDF2(24442) },
+                                                   { AOM_CDF2(28312) },
+                                                   { AOM_CDF2(32169) },
+                                                   { AOM_CDF2(3648) },
+                                                   { AOM_CDF2(15690) },
+                                                   { AOM_CDF2(26815) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(30669) },
+                                                   { AOM_CDF2(3832) },
+                                                   { AOM_CDF2(11663) },
+                                                   { AOM_CDF2(18889) },
+                                                   { AOM_CDF2(19782) },
+                                                   { AOM_CDF2(23313) },
+                                                   { AOM_CDF2(31330) },
+                                                   { AOM_CDF2(5124) },
+                                                   { AOM_CDF2(18719) },
+                                                   { AOM_CDF2(28468) },
+                                                   { AOM_CDF2(3082) },
+                                                   { AOM_CDF2(20982) },
+                                                   { AOM_CDF2(29443) } },
+                                                 { { AOM_CDF2(28573) },
+                                                   { AOM_CDF2(3183) },
+                                                   { AOM_CDF2(17802) },
+                                                   { AOM_CDF2(25977) },
+                                                   { AOM_CDF2(26677) },
+                                                   { AOM_CDF2(27832) },
+                                                   { AOM_CDF2(32387) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } } },
+                                               { { { AOM_CDF2(26887) },
+                                                   { AOM_CDF2(6729) },
+                                                   { AOM_CDF2(10361) },
+                                                   { AOM_CDF2(17442) },
+                                                   { AOM_CDF2(15045) },
+                                                   { AOM_CDF2(22478) },
+                                                   { AOM_CDF2(29072) },
+                                                   { AOM_CDF2(2713) },
+                                                   { AOM_CDF2(11861) },
+                                                   { AOM_CDF2(20773) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(31903) },
+                                                   { AOM_CDF2(2044) },
+                                                   { AOM_CDF2(7528) },
+                                                   { AOM_CDF2(14618) },
+                                                   { AOM_CDF2(16182) },
+                                                   { AOM_CDF2(24168) },
+                                                   { AOM_CDF2(31037) },
+                                                   { AOM_CDF2(2786) },
+                                                   { AOM_CDF2(11194) },
+                                                   { AOM_CDF2(20155) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(32510) },
+                                                   { AOM_CDF2(8430) },
+                                                   { AOM_CDF2(17318) },
+                                                   { AOM_CDF2(24154) },
+                                                   { AOM_CDF2(23674) },
+                                                   { AOM_CDF2(28789) },
+                                                   { AOM_CDF2(32139) },
+                                                   { AOM_CDF2(3440) },
+                                                   { AOM_CDF2(13117) },
+                                                   { AOM_CDF2(22702) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } },
+                                                 { { AOM_CDF2(31671) },
+                                                   { AOM_CDF2(2056) },
+                                                   { AOM_CDF2(11746) },
+                                                   { AOM_CDF2(16852) },
+                                                   { AOM_CDF2(18635) },
+                                                   { AOM_CDF2(24715) },
+                                                   { AOM_CDF2(31484) },
+                                                   { AOM_CDF2(4656) },
+                                                   { AOM_CDF2(16074) },
+                                                   { AOM_CDF2(24704) },
+                                                   { AOM_CDF2(1806) },
+                                                   { AOM_CDF2(14645) },
+                                                   { AOM_CDF2(25336) } },
+                                                 { { AOM_CDF2(31539) },
+                                                   { AOM_CDF2(8433) },
+                                                   { AOM_CDF2(20576) },
+                                                   { AOM_CDF2(27904) },
+                                                   { AOM_CDF2(27852) },
+                                                   { AOM_CDF2(30026) },
+                                                   { AOM_CDF2(32441) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) },
+                                                   { AOM_CDF2(16384) } } } };
+
+static const aom_cdf_prob
+    av1_default_eob_extra_cdfs[TOKEN_CDF_Q_CTXS][TX_SIZES][PLANE_TYPES]
+                              [EOB_COEF_CONTEXTS][CDF_SIZE(2)] = {
+                                { { {
+                                        { AOM_CDF2(16961) },
+                                        { AOM_CDF2(17223) },
+                                        { AOM_CDF2(7621) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(19069) },
+                                        { AOM_CDF2(22525) },
+                                        { AOM_CDF2(13377) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(20401) },
+                                        { AOM_CDF2(17025) },
+                                        { AOM_CDF2(12845) },
+                                        { AOM_CDF2(12873) },
+                                        { AOM_CDF2(14094) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(20681) },
+                                        { AOM_CDF2(20701) },
+                                        { AOM_CDF2(15250) },
+                                        { AOM_CDF2(15017) },
+                                        { AOM_CDF2(14928) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(23905) },
+                                        { AOM_CDF2(17194) },
+                                        { AOM_CDF2(16170) },
+                                        { AOM_CDF2(17695) },
+                                        { AOM_CDF2(13826) },
+                                        { AOM_CDF2(15810) },
+                                        { AOM_CDF2(12036) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(23959) },
+                                        { AOM_CDF2(20799) },
+                                        { AOM_CDF2(19021) },
+                                        { AOM_CDF2(16203) },
+                                        { AOM_CDF2(17886) },
+                                        { AOM_CDF2(14144) },
+                                        { AOM_CDF2(12010) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(27399) },
+                                        { AOM_CDF2(16327) },
+                                        { AOM_CDF2(18071) },
+                                        { AOM_CDF2(19584) },
+                                        { AOM_CDF2(20721) },
+                                        { AOM_CDF2(18432) },
+                                        { AOM_CDF2(19560) },
+                                        { AOM_CDF2(10150) },
+                                        { AOM_CDF2(8805) },
+                                    },
+                                    {
+                                        { AOM_CDF2(24932) },
+                                        { AOM_CDF2(20833) },
+                                        { AOM_CDF2(12027) },
+                                        { AOM_CDF2(16670) },
+                                        { AOM_CDF2(19914) },
+                                        { AOM_CDF2(15106) },
+                                        { AOM_CDF2(17662) },
+                                        { AOM_CDF2(13783) },
+                                        { AOM_CDF2(28756) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(23406) },
+                                        { AOM_CDF2(21845) },
+                                        { AOM_CDF2(18432) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(17096) },
+                                        { AOM_CDF2(12561) },
+                                        { AOM_CDF2(17320) },
+                                        { AOM_CDF2(22395) },
+                                        { AOM_CDF2(21370) },
+                                    },
+                                    {
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } } },
+                                { { {
+                                        { AOM_CDF2(17471) },
+                                        { AOM_CDF2(20223) },
+                                        { AOM_CDF2(11357) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(20335) },
+                                        { AOM_CDF2(21667) },
+                                        { AOM_CDF2(14818) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(20430) },
+                                        { AOM_CDF2(20662) },
+                                        { AOM_CDF2(15367) },
+                                        { AOM_CDF2(16970) },
+                                        { AOM_CDF2(14657) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(22117) },
+                                        { AOM_CDF2(22028) },
+                                        { AOM_CDF2(18650) },
+                                        { AOM_CDF2(16042) },
+                                        { AOM_CDF2(15885) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(22409) },
+                                        { AOM_CDF2(21012) },
+                                        { AOM_CDF2(15650) },
+                                        { AOM_CDF2(17395) },
+                                        { AOM_CDF2(15469) },
+                                        { AOM_CDF2(20205) },
+                                        { AOM_CDF2(19511) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(24220) },
+                                        { AOM_CDF2(22480) },
+                                        { AOM_CDF2(17737) },
+                                        { AOM_CDF2(18916) },
+                                        { AOM_CDF2(19268) },
+                                        { AOM_CDF2(18412) },
+                                        { AOM_CDF2(18844) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(25991) },
+                                        { AOM_CDF2(20314) },
+                                        { AOM_CDF2(17731) },
+                                        { AOM_CDF2(19678) },
+                                        { AOM_CDF2(18649) },
+                                        { AOM_CDF2(17307) },
+                                        { AOM_CDF2(21798) },
+                                        { AOM_CDF2(17549) },
+                                        { AOM_CDF2(15630) },
+                                    },
+                                    {
+                                        { AOM_CDF2(26585) },
+                                        { AOM_CDF2(21469) },
+                                        { AOM_CDF2(20432) },
+                                        { AOM_CDF2(17735) },
+                                        { AOM_CDF2(19280) },
+                                        { AOM_CDF2(15235) },
+                                        { AOM_CDF2(20297) },
+                                        { AOM_CDF2(22471) },
+                                        { AOM_CDF2(28997) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(26605) },
+                                        { AOM_CDF2(11304) },
+                                        { AOM_CDF2(16726) },
+                                        { AOM_CDF2(16560) },
+                                        { AOM_CDF2(20866) },
+                                        { AOM_CDF2(23524) },
+                                        { AOM_CDF2(19878) },
+                                        { AOM_CDF2(13469) },
+                                        { AOM_CDF2(23084) },
+                                    },
+                                    {
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } } },
+                                { { {
+                                        { AOM_CDF2(18983) },
+                                        { AOM_CDF2(20512) },
+                                        { AOM_CDF2(14885) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(20090) },
+                                        { AOM_CDF2(19444) },
+                                        { AOM_CDF2(17286) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(19139) },
+                                        { AOM_CDF2(21487) },
+                                        { AOM_CDF2(18959) },
+                                        { AOM_CDF2(20910) },
+                                        { AOM_CDF2(19089) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(20536) },
+                                        { AOM_CDF2(20664) },
+                                        { AOM_CDF2(20625) },
+                                        { AOM_CDF2(19123) },
+                                        { AOM_CDF2(14862) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(19833) },
+                                        { AOM_CDF2(21502) },
+                                        { AOM_CDF2(17485) },
+                                        { AOM_CDF2(20267) },
+                                        { AOM_CDF2(18353) },
+                                        { AOM_CDF2(23329) },
+                                        { AOM_CDF2(21478) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(22041) },
+                                        { AOM_CDF2(23434) },
+                                        { AOM_CDF2(20001) },
+                                        { AOM_CDF2(20554) },
+                                        { AOM_CDF2(20951) },
+                                        { AOM_CDF2(20145) },
+                                        { AOM_CDF2(15562) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(23312) },
+                                        { AOM_CDF2(21607) },
+                                        { AOM_CDF2(16526) },
+                                        { AOM_CDF2(18957) },
+                                        { AOM_CDF2(18034) },
+                                        { AOM_CDF2(18934) },
+                                        { AOM_CDF2(24247) },
+                                        { AOM_CDF2(16921) },
+                                        { AOM_CDF2(17080) },
+                                    },
+                                    {
+                                        { AOM_CDF2(26579) },
+                                        { AOM_CDF2(24910) },
+                                        { AOM_CDF2(18637) },
+                                        { AOM_CDF2(19800) },
+                                        { AOM_CDF2(20388) },
+                                        { AOM_CDF2(9887) },
+                                        { AOM_CDF2(15642) },
+                                        { AOM_CDF2(30198) },
+                                        { AOM_CDF2(24721) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(26998) },
+                                        { AOM_CDF2(16737) },
+                                        { AOM_CDF2(17838) },
+                                        { AOM_CDF2(18922) },
+                                        { AOM_CDF2(19515) },
+                                        { AOM_CDF2(18636) },
+                                        { AOM_CDF2(17333) },
+                                        { AOM_CDF2(15776) },
+                                        { AOM_CDF2(22658) },
+                                    },
+                                    {
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } } },
+                                { { {
+                                        { AOM_CDF2(20177) },
+                                        { AOM_CDF2(20789) },
+                                        { AOM_CDF2(20262) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(21416) },
+                                        { AOM_CDF2(20855) },
+                                        { AOM_CDF2(23410) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(20238) },
+                                        { AOM_CDF2(21057) },
+                                        { AOM_CDF2(19159) },
+                                        { AOM_CDF2(22337) },
+                                        { AOM_CDF2(20159) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(20125) },
+                                        { AOM_CDF2(20559) },
+                                        { AOM_CDF2(21707) },
+                                        { AOM_CDF2(22296) },
+                                        { AOM_CDF2(17333) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(19941) },
+                                        { AOM_CDF2(20527) },
+                                        { AOM_CDF2(21470) },
+                                        { AOM_CDF2(22487) },
+                                        { AOM_CDF2(19558) },
+                                        { AOM_CDF2(22354) },
+                                        { AOM_CDF2(20331) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    },
+                                    {
+                                        { AOM_CDF2(22752) },
+                                        { AOM_CDF2(25006) },
+                                        { AOM_CDF2(22075) },
+                                        { AOM_CDF2(21576) },
+                                        { AOM_CDF2(17740) },
+                                        { AOM_CDF2(21690) },
+                                        { AOM_CDF2(19211) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(21442) },
+                                        { AOM_CDF2(22358) },
+                                        { AOM_CDF2(18503) },
+                                        { AOM_CDF2(20291) },
+                                        { AOM_CDF2(19945) },
+                                        { AOM_CDF2(21294) },
+                                        { AOM_CDF2(21178) },
+                                        { AOM_CDF2(19400) },
+                                        { AOM_CDF2(10556) },
+                                    },
+                                    {
+                                        { AOM_CDF2(24648) },
+                                        { AOM_CDF2(24949) },
+                                        { AOM_CDF2(20708) },
+                                        { AOM_CDF2(23905) },
+                                        { AOM_CDF2(20501) },
+                                        { AOM_CDF2(9558) },
+                                        { AOM_CDF2(9423) },
+                                        { AOM_CDF2(30365) },
+                                        { AOM_CDF2(19253) },
+                                    } },
+                                  { {
+                                        { AOM_CDF2(26064) },
+                                        { AOM_CDF2(22098) },
+                                        { AOM_CDF2(19613) },
+                                        { AOM_CDF2(20525) },
+                                        { AOM_CDF2(17595) },
+                                        { AOM_CDF2(16618) },
+                                        { AOM_CDF2(20497) },
+                                        { AOM_CDF2(18989) },
+                                        { AOM_CDF2(15513) },
+                                    },
+                                    {
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                        { AOM_CDF2(16384) },
+                                    } } }
+                              };
+
+static const aom_cdf_prob
+    av1_default_eob_multi16_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
+        5)] = { { { { AOM_CDF5(840, 1039, 1980, 4895) },
+                    { AOM_CDF5(370, 671, 1883, 4471) } },
+                  { { AOM_CDF5(3247, 4950, 9688, 14563) },
+                    { AOM_CDF5(1904, 3354, 7763, 14647) } } },
+                { { { AOM_CDF5(2125, 2551, 5165, 8946) },
+                    { AOM_CDF5(513, 765, 1859, 6339) } },
+                  { { AOM_CDF5(7637, 9498, 14259, 19108) },
+                    { AOM_CDF5(2497, 4096, 8866, 16993) } } },
+                { { { AOM_CDF5(4016, 4897, 8881, 14968) },
+                    { AOM_CDF5(716, 1105, 2646, 10056) } },
+                  { { AOM_CDF5(11139, 13270, 18241, 23566) },
+                    { AOM_CDF5(3192, 5032, 10297, 19755) } } },
+                { { { AOM_CDF5(6708, 8958, 14746, 22133) },
+                    { AOM_CDF5(1222, 2074, 4783, 15410) } },
+                  { { AOM_CDF5(19575, 21766, 26044, 29709) },
+                    { AOM_CDF5(7297, 10767, 19273, 28194) } } } };
+
+static const aom_cdf_prob
+    av1_default_eob_multi32_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
+        6)] = { { { { AOM_CDF6(400, 520, 977, 2102, 6542) },
+                    { AOM_CDF6(210, 405, 1315, 3326, 7537) } },
+                  { { AOM_CDF6(2636, 4273, 7588, 11794, 20401) },
+                    { AOM_CDF6(1786, 3179, 6902, 11357, 19054) } } },
+                { { { AOM_CDF6(989, 1249, 2019, 4151, 10785) },
+                    { AOM_CDF6(313, 441, 1099, 2917, 8562) } },
+                  { { AOM_CDF6(8394, 10352, 13932, 18855, 26014) },
+                    { AOM_CDF6(2578, 4124, 8181, 13670, 24234) } } },
+                { { { AOM_CDF6(2515, 3003, 4452, 8162, 16041) },
+                    { AOM_CDF6(574, 821, 1836, 5089, 13128) } },
+                  { { AOM_CDF6(13468, 16303, 20361, 25105, 29281) },
+                    { AOM_CDF6(3542, 5502, 10415, 16760, 25644) } } },
+                { { { AOM_CDF6(4617, 5709, 8446, 13584, 23135) },
+                    { AOM_CDF6(1156, 1702, 3675, 9274, 20539) } },
+                  { { AOM_CDF6(22086, 24282, 27010, 29770, 31743) },
+                    { AOM_CDF6(7699, 10897, 20891, 26926, 31628) } } } };
+
+static const aom_cdf_prob
+    av1_default_eob_multi64_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
+        7)] = { { { { AOM_CDF7(329, 498, 1101, 1784, 3265, 7758) },
+                    { AOM_CDF7(335, 730, 1459, 5494, 8755, 12997) } },
+                  { { AOM_CDF7(3505, 5304, 10086, 13814, 17684, 23370) },
+                    { AOM_CDF7(1563, 2700, 4876, 10911, 14706, 22480) } } },
+                { { { AOM_CDF7(1260, 1446, 2253, 3712, 6652, 13369) },
+                    { AOM_CDF7(401, 605, 1029, 2563, 5845, 12626) } },
+                  { { AOM_CDF7(8609, 10612, 14624, 18714, 22614, 29024) },
+                    { AOM_CDF7(1923, 3127, 5867, 9703, 14277, 27100) } } },
+                { { { AOM_CDF7(2374, 2772, 4583, 7276, 12288, 19706) },
+                    { AOM_CDF7(497, 810, 1315, 3000, 7004, 15641) } },
+                  { { AOM_CDF7(15050, 17126, 21410, 24886, 28156, 30726) },
+                    { AOM_CDF7(4034, 6290, 10235, 14982, 21214, 28491) } } },
+                { { { AOM_CDF7(6307, 7541, 12060, 16358, 22553, 27865) },
+                    { AOM_CDF7(1289, 2320, 3971, 7926, 14153, 24291) } },
+                  { { AOM_CDF7(24212, 25708, 28268, 30035, 31307, 32049) },
+                    { AOM_CDF7(8726, 12378, 19409, 26450, 30038, 32462) } } } };
+
+static const aom_cdf_prob
+    av1_default_eob_multi128_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
+        8)] = {
+      { { { AOM_CDF8(219, 482, 1140, 2091, 3680, 6028, 12586) },
+          { AOM_CDF8(371, 699, 1254, 4830, 9479, 12562, 17497) } },
+        { { AOM_CDF8(5245, 7456, 12880, 15852, 20033, 23932, 27608) },
+          { AOM_CDF8(2054, 3472, 5869, 14232, 18242, 20590, 26752) } } },
+      { { { AOM_CDF8(685, 933, 1488, 2714, 4766, 8562, 19254) },
+          { AOM_CDF8(217, 352, 618, 2303, 5261, 9969, 17472) } },
+        { { AOM_CDF8(8045, 11200, 15497, 19595, 23948, 27408, 30938) },
+          { AOM_CDF8(2310, 4160, 7471, 14997, 17931, 20768, 30240) } } },
+      { { { AOM_CDF8(1366, 1738, 2527, 5016, 9355, 15797, 24643) },
+          { AOM_CDF8(354, 558, 944, 2760, 7287, 14037, 21779) } },
+        { { AOM_CDF8(13627, 16246, 20173, 24429, 27948, 30415, 31863) },
+          { AOM_CDF8(6275, 9889, 14769, 23164, 27988, 30493, 32272) } } },
+      { { { AOM_CDF8(3472, 4885, 7489, 12481, 18517, 24536, 29635) },
+          { AOM_CDF8(886, 1731, 3271, 8469, 15569, 22126, 28383) } },
+        { { AOM_CDF8(24313, 26062, 28385, 30107, 31217, 31898, 32345) },
+          { AOM_CDF8(9165, 13282, 21150, 30286, 31894, 32571, 32712) } } }
+    };
+
+static const aom_cdf_prob
+    av1_default_eob_multi256_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
+        9)] = {
+      { { { AOM_CDF9(310, 584, 1887, 3589, 6168, 8611, 11352, 15652) },
+          { AOM_CDF9(998, 1850, 2998, 5604, 17341, 19888, 22899, 25583) } },
+        { { AOM_CDF9(2520, 3240, 5952, 8870, 12577, 17558, 19954, 24168) },
+          { AOM_CDF9(2203, 4130, 7435, 10739, 20652, 23681, 25609, 27261) } } },
+      { { { AOM_CDF9(1448, 2109, 4151, 6263, 9329, 13260, 17944, 23300) },
+          { AOM_CDF9(399, 1019, 1749, 3038, 10444, 15546, 22739, 27294) } },
+        { { AOM_CDF9(6402, 8148, 12623, 15072, 18728, 22847, 26447, 29377) },
+          { AOM_CDF9(1674, 3252, 5734, 10159, 22397, 23802, 24821, 30940) } } },
+      { { { AOM_CDF9(3089, 3920, 6038, 9460, 14266, 19881, 25766, 29176) },
+          { AOM_CDF9(1084, 2358, 3488, 5122, 11483, 18103, 26023, 29799) } },
+        { { AOM_CDF9(11514, 13794, 17480, 20754, 24361, 27378, 29492, 31277) },
+          { AOM_CDF9(6571, 9610, 15516, 21826, 29092, 30829, 31842,
+                     32708) } } },
+      { { { AOM_CDF9(5348, 7113, 11820, 15924, 22106, 26777, 30334, 31757) },
+          { AOM_CDF9(2453, 4474, 6307, 8777, 16474, 22975, 29000, 31547) } },
+        { { AOM_CDF9(23110, 24597, 27140, 28894, 30167, 30927, 31392, 32094) },
+          { AOM_CDF9(9998, 17661, 25178, 28097, 31308, 32038, 32403,
+                     32695) } } }
+    };
+
+static const aom_cdf_prob
+    av1_default_eob_multi512_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
+        10)] = { { { { AOM_CDF10(641, 983, 3707, 5430, 10234, 14958, 18788,
+                                 23412, 26061) },
+                     { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
+                                 26214, 29491) } },
+                   { { AOM_CDF10(5095, 6446, 9996, 13354, 16017, 17986, 20919,
+                                 26129, 29140) },
+                     { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
+                                 26214, 29491) } } },
+                 { { { AOM_CDF10(1230, 2278, 5035, 7776, 11871, 15346, 19590,
+                                 24584, 28749) },
+                     { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
+                                 26214, 29491) } },
+                   { { AOM_CDF10(7265, 9979, 15819, 19250, 21780, 23846, 26478,
+                                 28396, 31811) },
+                     { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
+                                 26214, 29491) } } },
+                 { { { AOM_CDF10(2624, 3936, 6480, 9686, 13979, 17726, 23267,
+                                 28410, 31078) },
+                     { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
+                                 26214, 29491) } },
+                   { { AOM_CDF10(12015, 14769, 19588, 22052, 24222, 25812,
+                                 27300, 29219, 32114) },
+                     { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
+                                 26214, 29491) } } },
+                 { { { AOM_CDF10(5927, 7809, 10923, 14597, 19439, 24135, 28456,
+                                 31142, 32060) },
+                     { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
+                                 26214, 29491) } },
+                   { { AOM_CDF10(21093, 23043, 25742, 27658, 29097, 29716,
+                                 30073, 30820, 31956) },
+                     { AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
+                                 26214, 29491) } } } };
+
+static const aom_cdf_prob
+    av1_default_eob_multi1024_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
+        11)] = { { { { AOM_CDF11(393, 421, 751, 1623, 3160, 6352, 13345, 18047,
+                                 22571, 25830) },
+                     { AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
+                                 23831, 26810, 29789) } },
+                   { { AOM_CDF11(1865, 1988, 2930, 4242, 10533, 16538, 21354,
+                                 27255, 28546, 31784) },
+                     { AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
+                                 23831, 26810, 29789) } } },
+                 { { { AOM_CDF11(696, 948, 3145, 5702, 9706, 13217, 17851,
+                                 21856, 25692, 28034) },
+                     { AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
+                                 23831, 26810, 29789) } },
+                   { { AOM_CDF11(2672, 3591, 9330, 17084, 22725, 24284, 26527,
+                                 28027, 28377, 30876) },
+                     { AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
+                                 23831, 26810, 29789) } } },
+                 { { { AOM_CDF11(2784, 3831, 7041, 10521, 14847, 18844, 23155,
+                                 26682, 29229, 31045) },
+                     { AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
+                                 23831, 26810, 29789) } },
+                   { { AOM_CDF11(9577, 12466, 17739, 20750, 22061, 23215, 24601,
+                                 25483, 25843, 32056) },
+                     { AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
+                                 23831, 26810, 29789) } } },
+                 { { { AOM_CDF11(6698, 8334, 11961, 15762, 20186, 23862, 27434,
+                                 29326, 31082, 32050) },
+                     { AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
+                                 23831, 26810, 29789) } },
+                   { { AOM_CDF11(20569, 22426, 25569, 26859, 28053, 28913,
+                                 29486, 29724, 29807, 32570) },
+                     { AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
+                                 23831, 26810, 29789) } } } };
+
+static const aom_cdf_prob av1_default_coeff_lps_multi_cdfs
+    [TOKEN_CDF_Q_CTXS][TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS]
+    [CDF_SIZE(BR_CDF_SIZE)] = {
+      { { { { AOM_CDF4(14298, 20718, 24174) },
+            { AOM_CDF4(12536, 19601, 23789) },
+            { AOM_CDF4(8712, 15051, 19503) },
+            { AOM_CDF4(6170, 11327, 15434) },
+            { AOM_CDF4(4742, 8926, 12538) },
+            { AOM_CDF4(3803, 7317, 10546) },
+            { AOM_CDF4(1696, 3317, 4871) },
+            { AOM_CDF4(14392, 19951, 22756) },
+            { AOM_CDF4(15978, 23218, 26818) },
+            { AOM_CDF4(12187, 19474, 23889) },
+            { AOM_CDF4(9176, 15640, 20259) },
+            { AOM_CDF4(7068, 12655, 17028) },
+            { AOM_CDF4(5656, 10442, 14472) },
+            { AOM_CDF4(2580, 4992, 7244) },
+            { AOM_CDF4(12136, 18049, 21426) },
+            { AOM_CDF4(13784, 20721, 24481) },
+            { AOM_CDF4(10836, 17621, 21900) },
+            { AOM_CDF4(8372, 14444, 18847) },
+            { AOM_CDF4(6523, 11779, 16000) },
+            { AOM_CDF4(5337, 9898, 13760) },
+            { AOM_CDF4(3034, 5860, 8462) } },
+          { { AOM_CDF4(15967, 22905, 26286) },
+            { AOM_CDF4(13534, 20654, 24579) },
+            { AOM_CDF4(9504, 16092, 20535) },
+            { AOM_CDF4(6975, 12568, 16903) },
+            { AOM_CDF4(5364, 10091, 14020) },
+            { AOM_CDF4(4357, 8370, 11857) },
+            { AOM_CDF4(2506, 4934, 7218) },
+            { AOM_CDF4(23032, 28815, 30936) },
+            { AOM_CDF4(19540, 26704, 29719) },
+            { AOM_CDF4(15158, 22969, 27097) },
+            { AOM_CDF4(11408, 18865, 23650) },
+            { AOM_CDF4(8885, 15448, 20250) },
+            { AOM_CDF4(7108, 12853, 17416) },
+            { AOM_CDF4(4231, 8041, 11480) },
+            { AOM_CDF4(19823, 26490, 29156) },
+            { AOM_CDF4(18890, 25929, 28932) },
+            { AOM_CDF4(15660, 23491, 27433) },
+            { AOM_CDF4(12147, 19776, 24488) },
+            { AOM_CDF4(9728, 16774, 21649) },
+            { AOM_CDF4(7919, 14277, 19066) },
+            { AOM_CDF4(5440, 10170, 14185) } } },
+        { { { AOM_CDF4(14406, 20862, 24414) },
+            { AOM_CDF4(11824, 18907, 23109) },
+            { AOM_CDF4(8257, 14393, 18803) },
+            { AOM_CDF4(5860, 10747, 14778) },
+            { AOM_CDF4(4475, 8486, 11984) },
+            { AOM_CDF4(3606, 6954, 10043) },
+            { AOM_CDF4(1736, 3410, 5048) },
+            { AOM_CDF4(14430, 20046, 22882) },
+            { AOM_CDF4(15593, 22899, 26709) },
+            { AOM_CDF4(12102, 19368, 23811) },
+            { AOM_CDF4(9059, 15584, 20262) },
+            { AOM_CDF4(6999, 12603, 17048) },
+            { AOM_CDF4(5684, 10497, 14553) },
+            { AOM_CDF4(2822, 5438, 7862) },
+            { AOM_CDF4(15785, 21585, 24359) },
+            { AOM_CDF4(18347, 25229, 28266) },
+            { AOM_CDF4(14974, 22487, 26389) },
+            { AOM_CDF4(11423, 18681, 23271) },
+            { AOM_CDF4(8863, 15350, 20008) },
+            { AOM_CDF4(7153, 12852, 17278) },
+            { AOM_CDF4(3707, 7036, 9982) } },
+          { { AOM_CDF4(15460, 21696, 25469) },
+            { AOM_CDF4(12170, 19249, 23191) },
+            { AOM_CDF4(8723, 15027, 19332) },
+            { AOM_CDF4(6428, 11704, 15874) },
+            { AOM_CDF4(4922, 9292, 13052) },
+            { AOM_CDF4(4139, 7695, 11010) },
+            { AOM_CDF4(2291, 4508, 6598) },
+            { AOM_CDF4(19856, 26920, 29828) },
+            { AOM_CDF4(17923, 25289, 28792) },
+            { AOM_CDF4(14278, 21968, 26297) },
+            { AOM_CDF4(10910, 18136, 22950) },
+            { AOM_CDF4(8423, 14815, 19627) },
+            { AOM_CDF4(6771, 12283, 16774) },
+            { AOM_CDF4(4074, 7750, 11081) },
+            { AOM_CDF4(19852, 26074, 28672) },
+            { AOM_CDF4(19371, 26110, 28989) },
+            { AOM_CDF4(16265, 23873, 27663) },
+            { AOM_CDF4(12758, 20378, 24952) },
+            { AOM_CDF4(10095, 17098, 21961) },
+            { AOM_CDF4(8250, 14628, 19451) },
+            { AOM_CDF4(5205, 9745, 13622) } } },
+        { { { AOM_CDF4(10563, 16233, 19763) },
+            { AOM_CDF4(9794, 16022, 19804) },
+            { AOM_CDF4(6750, 11945, 15759) },
+            { AOM_CDF4(4963, 9186, 12752) },
+            { AOM_CDF4(3845, 7435, 10627) },
+            { AOM_CDF4(3051, 6085, 8834) },
+            { AOM_CDF4(1311, 2596, 3830) },
+            { AOM_CDF4(11246, 16404, 19689) },
+            { AOM_CDF4(12315, 18911, 22731) },
+            { AOM_CDF4(10557, 17095, 21289) },
+            { AOM_CDF4(8136, 14006, 18249) },
+            { AOM_CDF4(6348, 11474, 15565) },
+            { AOM_CDF4(5196, 9655, 13400) },
+            { AOM_CDF4(2349, 4526, 6587) },
+            { AOM_CDF4(13337, 18730, 21569) },
+            { AOM_CDF4(19306, 26071, 28882) },
+            { AOM_CDF4(15952, 23540, 27254) },
+            { AOM_CDF4(12409, 19934, 24430) },
+            { AOM_CDF4(9760, 16706, 21389) },
+            { AOM_CDF4(8004, 14220, 18818) },
+            { AOM_CDF4(4138, 7794, 10961) } },
+          { { AOM_CDF4(10870, 16684, 20949) },
+            { AOM_CDF4(9664, 15230, 18680) },
+            { AOM_CDF4(6886, 12109, 15408) },
+            { AOM_CDF4(4825, 8900, 12305) },
+            { AOM_CDF4(3630, 7162, 10314) },
+            { AOM_CDF4(3036, 6429, 9387) },
+            { AOM_CDF4(1671, 3296, 4940) },
+            { AOM_CDF4(13819, 19159, 23026) },
+            { AOM_CDF4(11984, 19108, 23120) },
+            { AOM_CDF4(10690, 17210, 21663) },
+            { AOM_CDF4(7984, 14154, 18333) },
+            { AOM_CDF4(6868, 12294, 16124) },
+            { AOM_CDF4(5274, 8994, 12868) },
+            { AOM_CDF4(2988, 5771, 8424) },
+            { AOM_CDF4(19736, 26647, 29141) },
+            { AOM_CDF4(18933, 26070, 28984) },
+            { AOM_CDF4(15779, 23048, 27200) },
+            { AOM_CDF4(12638, 20061, 24532) },
+            { AOM_CDF4(10692, 17545, 22220) },
+            { AOM_CDF4(9217, 15251, 20054) },
+            { AOM_CDF4(5078, 9284, 12594) } } },
+        { { { AOM_CDF4(2331, 3662, 5244) },
+            { AOM_CDF4(2891, 4771, 6145) },
+            { AOM_CDF4(4598, 7623, 9729) },
+            { AOM_CDF4(3520, 6845, 9199) },
+            { AOM_CDF4(3417, 6119, 9324) },
+            { AOM_CDF4(2601, 5412, 7385) },
+            { AOM_CDF4(600, 1173, 1744) },
+            { AOM_CDF4(7672, 13286, 17469) },
+            { AOM_CDF4(4232, 7792, 10793) },
+            { AOM_CDF4(2915, 5317, 7397) },
+            { AOM_CDF4(2318, 4356, 6152) },
+            { AOM_CDF4(2127, 4000, 5554) },
+            { AOM_CDF4(1850, 3478, 5275) },
+            { AOM_CDF4(977, 1933, 2843) },
+            { AOM_CDF4(18280, 24387, 27989) },
+            { AOM_CDF4(15852, 22671, 26185) },
+            { AOM_CDF4(13845, 20951, 24789) },
+            { AOM_CDF4(11055, 17966, 22129) },
+            { AOM_CDF4(9138, 15422, 19801) },
+            { AOM_CDF4(7454, 13145, 17456) },
+            { AOM_CDF4(3370, 6393, 9013) } },
+          { { AOM_CDF4(5842, 9229, 10838) },
+            { AOM_CDF4(2313, 3491, 4276) },
+            { AOM_CDF4(2998, 6104, 7496) },
+            { AOM_CDF4(2420, 7447, 9868) },
+            { AOM_CDF4(3034, 8495, 10923) },
+            { AOM_CDF4(4076, 8937, 10975) },
+            { AOM_CDF4(1086, 2370, 3299) },
+            { AOM_CDF4(9714, 17254, 20444) },
+            { AOM_CDF4(8543, 13698, 17123) },
+            { AOM_CDF4(4918, 9007, 11910) },
+            { AOM_CDF4(4129, 7532, 10553) },
+            { AOM_CDF4(2364, 5533, 8058) },
+            { AOM_CDF4(1834, 3546, 5563) },
+            { AOM_CDF4(1473, 2908, 4133) },
+            { AOM_CDF4(15405, 21193, 25619) },
+            { AOM_CDF4(15691, 21952, 26561) },
+            { AOM_CDF4(12962, 19194, 24165) },
+            { AOM_CDF4(10272, 17855, 22129) },
+            { AOM_CDF4(8588, 15270, 20718) },
+            { AOM_CDF4(8682, 14669, 19500) },
+            { AOM_CDF4(4870, 9636, 13205) } } },
+        { { { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) } },
+          { { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) } } } },
+      { { { { AOM_CDF4(14995, 21341, 24749) },
+            { AOM_CDF4(13158, 20289, 24601) },
+            { AOM_CDF4(8941, 15326, 19876) },
+            { AOM_CDF4(6297, 11541, 15807) },
+            { AOM_CDF4(4817, 9029, 12776) },
+            { AOM_CDF4(3731, 7273, 10627) },
+            { AOM_CDF4(1847, 3617, 5354) },
+            { AOM_CDF4(14472, 19659, 22343) },
+            { AOM_CDF4(16806, 24162, 27533) },
+            { AOM_CDF4(12900, 20404, 24713) },
+            { AOM_CDF4(9411, 16112, 20797) },
+            { AOM_CDF4(7056, 12697, 17148) },
+            { AOM_CDF4(5544, 10339, 14460) },
+            { AOM_CDF4(2954, 5704, 8319) },
+            { AOM_CDF4(12464, 18071, 21354) },
+            { AOM_CDF4(15482, 22528, 26034) },
+            { AOM_CDF4(12070, 19269, 23624) },
+            { AOM_CDF4(8953, 15406, 20106) },
+            { AOM_CDF4(7027, 12730, 17220) },
+            { AOM_CDF4(5887, 10913, 15140) },
+            { AOM_CDF4(3793, 7278, 10447) } },
+          { { AOM_CDF4(15571, 22232, 25749) },
+            { AOM_CDF4(14506, 21575, 25374) },
+            { AOM_CDF4(10189, 17089, 21569) },
+            { AOM_CDF4(7316, 13301, 17915) },
+            { AOM_CDF4(5783, 10912, 15190) },
+            { AOM_CDF4(4760, 9155, 13088) },
+            { AOM_CDF4(2993, 5966, 8774) },
+            { AOM_CDF4(23424, 28903, 30778) },
+            { AOM_CDF4(20775, 27666, 30290) },
+            { AOM_CDF4(16474, 24410, 28299) },
+            { AOM_CDF4(12471, 20180, 24987) },
+            { AOM_CDF4(9410, 16487, 21439) },
+            { AOM_CDF4(7536, 13614, 18529) },
+            { AOM_CDF4(5048, 9586, 13549) },
+            { AOM_CDF4(21090, 27290, 29756) },
+            { AOM_CDF4(20796, 27402, 30026) },
+            { AOM_CDF4(17819, 25485, 28969) },
+            { AOM_CDF4(13860, 21909, 26462) },
+            { AOM_CDF4(11002, 18494, 23529) },
+            { AOM_CDF4(8953, 15929, 20897) },
+            { AOM_CDF4(6448, 11918, 16454) } } },
+        { { { AOM_CDF4(15999, 22208, 25449) },
+            { AOM_CDF4(13050, 19988, 24122) },
+            { AOM_CDF4(8594, 14864, 19378) },
+            { AOM_CDF4(6033, 11079, 15238) },
+            { AOM_CDF4(4554, 8683, 12347) },
+            { AOM_CDF4(3672, 7139, 10337) },
+            { AOM_CDF4(1900, 3771, 5576) },
+            { AOM_CDF4(15788, 21340, 23949) },
+            { AOM_CDF4(16825, 24235, 27758) },
+            { AOM_CDF4(12873, 20402, 24810) },
+            { AOM_CDF4(9590, 16363, 21094) },
+            { AOM_CDF4(7352, 13209, 17733) },
+            { AOM_CDF4(5960, 10989, 15184) },
+            { AOM_CDF4(3232, 6234, 9007) },
+            { AOM_CDF4(15761, 20716, 23224) },
+            { AOM_CDF4(19318, 25989, 28759) },
+            { AOM_CDF4(15529, 23094, 26929) },
+            { AOM_CDF4(11662, 18989, 23641) },
+            { AOM_CDF4(8955, 15568, 20366) },
+            { AOM_CDF4(7281, 13106, 17708) },
+            { AOM_CDF4(4248, 8059, 11440) } },
+          { { AOM_CDF4(14899, 21217, 24503) },
+            { AOM_CDF4(13519, 20283, 24047) },
+            { AOM_CDF4(9429, 15966, 20365) },
+            { AOM_CDF4(6700, 12355, 16652) },
+            { AOM_CDF4(5088, 9704, 13716) },
+            { AOM_CDF4(4243, 8154, 11731) },
+            { AOM_CDF4(2702, 5364, 7861) },
+            { AOM_CDF4(22745, 28388, 30454) },
+            { AOM_CDF4(20235, 27146, 29922) },
+            { AOM_CDF4(15896, 23715, 27637) },
+            { AOM_CDF4(11840, 19350, 24131) },
+            { AOM_CDF4(9122, 15932, 20880) },
+            { AOM_CDF4(7488, 13581, 18362) },
+            { AOM_CDF4(5114, 9568, 13370) },
+            { AOM_CDF4(20845, 26553, 28932) },
+            { AOM_CDF4(20981, 27372, 29884) },
+            { AOM_CDF4(17781, 25335, 28785) },
+            { AOM_CDF4(13760, 21708, 26297) },
+            { AOM_CDF4(10975, 18415, 23365) },
+            { AOM_CDF4(9045, 15789, 20686) },
+            { AOM_CDF4(6130, 11199, 15423) } } },
+        { { { AOM_CDF4(13549, 19724, 23158) },
+            { AOM_CDF4(11844, 18382, 22246) },
+            { AOM_CDF4(7919, 13619, 17773) },
+            { AOM_CDF4(5486, 10143, 13946) },
+            { AOM_CDF4(4166, 7983, 11324) },
+            { AOM_CDF4(3364, 6506, 9427) },
+            { AOM_CDF4(1598, 3160, 4674) },
+            { AOM_CDF4(15281, 20979, 23781) },
+            { AOM_CDF4(14939, 22119, 25952) },
+            { AOM_CDF4(11363, 18407, 22812) },
+            { AOM_CDF4(8609, 14857, 19370) },
+            { AOM_CDF4(6737, 12184, 16480) },
+            { AOM_CDF4(5506, 10263, 14262) },
+            { AOM_CDF4(2990, 5786, 8380) },
+            { AOM_CDF4(20249, 25253, 27417) },
+            { AOM_CDF4(21070, 27518, 30001) },
+            { AOM_CDF4(16854, 24469, 28074) },
+            { AOM_CDF4(12864, 20486, 25000) },
+            { AOM_CDF4(9962, 16978, 21778) },
+            { AOM_CDF4(8074, 14338, 19048) },
+            { AOM_CDF4(4494, 8479, 11906) } },
+          { { AOM_CDF4(13960, 19617, 22829) },
+            { AOM_CDF4(11150, 17341, 21228) },
+            { AOM_CDF4(7150, 12964, 17190) },
+            { AOM_CDF4(5331, 10002, 13867) },
+            { AOM_CDF4(4167, 7744, 11057) },
+            { AOM_CDF4(3480, 6629, 9646) },
+            { AOM_CDF4(1883, 3784, 5686) },
+            { AOM_CDF4(18752, 25660, 28912) },
+            { AOM_CDF4(16968, 24586, 28030) },
+            { AOM_CDF4(13520, 21055, 25313) },
+            { AOM_CDF4(10453, 17626, 22280) },
+            { AOM_CDF4(8386, 14505, 19116) },
+            { AOM_CDF4(6742, 12595, 17008) },
+            { AOM_CDF4(4273, 8140, 11499) },
+            { AOM_CDF4(22120, 27827, 30233) },
+            { AOM_CDF4(20563, 27358, 29895) },
+            { AOM_CDF4(17076, 24644, 28153) },
+            { AOM_CDF4(13362, 20942, 25309) },
+            { AOM_CDF4(10794, 17965, 22695) },
+            { AOM_CDF4(9014, 15652, 20319) },
+            { AOM_CDF4(5708, 10512, 14497) } } },
+        { { { AOM_CDF4(5705, 10930, 15725) },
+            { AOM_CDF4(7946, 12765, 16115) },
+            { AOM_CDF4(6801, 12123, 16226) },
+            { AOM_CDF4(5462, 10135, 14200) },
+            { AOM_CDF4(4189, 8011, 11507) },
+            { AOM_CDF4(3191, 6229, 9408) },
+            { AOM_CDF4(1057, 2137, 3212) },
+            { AOM_CDF4(10018, 17067, 21491) },
+            { AOM_CDF4(7380, 12582, 16453) },
+            { AOM_CDF4(6068, 10845, 14339) },
+            { AOM_CDF4(5098, 9198, 12555) },
+            { AOM_CDF4(4312, 8010, 11119) },
+            { AOM_CDF4(3700, 6966, 9781) },
+            { AOM_CDF4(1693, 3326, 4887) },
+            { AOM_CDF4(18757, 24930, 27774) },
+            { AOM_CDF4(17648, 24596, 27817) },
+            { AOM_CDF4(14707, 22052, 26026) },
+            { AOM_CDF4(11720, 18852, 23292) },
+            { AOM_CDF4(9357, 15952, 20525) },
+            { AOM_CDF4(7810, 13753, 18210) },
+            { AOM_CDF4(3879, 7333, 10328) } },
+          { { AOM_CDF4(8278, 13242, 15922) },
+            { AOM_CDF4(10547, 15867, 18919) },
+            { AOM_CDF4(9106, 15842, 20609) },
+            { AOM_CDF4(6833, 13007, 17218) },
+            { AOM_CDF4(4811, 9712, 13923) },
+            { AOM_CDF4(3985, 7352, 11128) },
+            { AOM_CDF4(1688, 3458, 5262) },
+            { AOM_CDF4(12951, 21861, 26510) },
+            { AOM_CDF4(9788, 16044, 20276) },
+            { AOM_CDF4(6309, 11244, 14870) },
+            { AOM_CDF4(5183, 9349, 12566) },
+            { AOM_CDF4(4389, 8229, 11492) },
+            { AOM_CDF4(3633, 6945, 10620) },
+            { AOM_CDF4(3600, 6847, 9907) },
+            { AOM_CDF4(21748, 28137, 30255) },
+            { AOM_CDF4(19436, 26581, 29560) },
+            { AOM_CDF4(16359, 24201, 27953) },
+            { AOM_CDF4(13961, 21693, 25871) },
+            { AOM_CDF4(11544, 18686, 23322) },
+            { AOM_CDF4(9372, 16462, 20952) },
+            { AOM_CDF4(6138, 11210, 15390) } } },
+        { { { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) } },
+          { { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) } } } },
+      { { { { AOM_CDF4(16138, 22223, 25509) },
+            { AOM_CDF4(15347, 22430, 26332) },
+            { AOM_CDF4(9614, 16736, 21332) },
+            { AOM_CDF4(6600, 12275, 16907) },
+            { AOM_CDF4(4811, 9424, 13547) },
+            { AOM_CDF4(3748, 7809, 11420) },
+            { AOM_CDF4(2254, 4587, 6890) },
+            { AOM_CDF4(15196, 20284, 23177) },
+            { AOM_CDF4(18317, 25469, 28451) },
+            { AOM_CDF4(13918, 21651, 25842) },
+            { AOM_CDF4(10052, 17150, 21995) },
+            { AOM_CDF4(7499, 13630, 18587) },
+            { AOM_CDF4(6158, 11417, 16003) },
+            { AOM_CDF4(4014, 7785, 11252) },
+            { AOM_CDF4(15048, 21067, 24384) },
+            { AOM_CDF4(18202, 25346, 28553) },
+            { AOM_CDF4(14302, 22019, 26356) },
+            { AOM_CDF4(10839, 18139, 23166) },
+            { AOM_CDF4(8715, 15744, 20806) },
+            { AOM_CDF4(7536, 13576, 18544) },
+            { AOM_CDF4(5413, 10335, 14498) } },
+          { { AOM_CDF4(17394, 24501, 27895) },
+            { AOM_CDF4(15889, 23420, 27185) },
+            { AOM_CDF4(11561, 19133, 23870) },
+            { AOM_CDF4(8285, 14812, 19844) },
+            { AOM_CDF4(6496, 12043, 16550) },
+            { AOM_CDF4(4771, 9574, 13677) },
+            { AOM_CDF4(3603, 6830, 10144) },
+            { AOM_CDF4(21656, 27704, 30200) },
+            { AOM_CDF4(21324, 27915, 30511) },
+            { AOM_CDF4(17327, 25336, 28997) },
+            { AOM_CDF4(13417, 21381, 26033) },
+            { AOM_CDF4(10132, 17425, 22338) },
+            { AOM_CDF4(8580, 15016, 19633) },
+            { AOM_CDF4(5694, 11477, 16411) },
+            { AOM_CDF4(24116, 29780, 31450) },
+            { AOM_CDF4(23853, 29695, 31591) },
+            { AOM_CDF4(20085, 27614, 30428) },
+            { AOM_CDF4(15326, 24335, 28575) },
+            { AOM_CDF4(11814, 19472, 24810) },
+            { AOM_CDF4(10221, 18611, 24767) },
+            { AOM_CDF4(7689, 14558, 20321) } } },
+        { { { AOM_CDF4(16214, 22380, 25770) },
+            { AOM_CDF4(14213, 21304, 25295) },
+            { AOM_CDF4(9213, 15823, 20455) },
+            { AOM_CDF4(6395, 11758, 16139) },
+            { AOM_CDF4(4779, 9187, 13066) },
+            { AOM_CDF4(3821, 7501, 10953) },
+            { AOM_CDF4(2293, 4567, 6795) },
+            { AOM_CDF4(15859, 21283, 23820) },
+            { AOM_CDF4(18404, 25602, 28726) },
+            { AOM_CDF4(14325, 21980, 26206) },
+            { AOM_CDF4(10669, 17937, 22720) },
+            { AOM_CDF4(8297, 14642, 19447) },
+            { AOM_CDF4(6746, 12389, 16893) },
+            { AOM_CDF4(4324, 8251, 11770) },
+            { AOM_CDF4(16532, 21631, 24475) },
+            { AOM_CDF4(20667, 27150, 29668) },
+            { AOM_CDF4(16728, 24510, 28175) },
+            { AOM_CDF4(12861, 20645, 25332) },
+            { AOM_CDF4(10076, 17361, 22417) },
+            { AOM_CDF4(8395, 14940, 19963) },
+            { AOM_CDF4(5731, 10683, 14912) } },
+          { { AOM_CDF4(14433, 21155, 24938) },
+            { AOM_CDF4(14658, 21716, 25545) },
+            { AOM_CDF4(9923, 16824, 21557) },
+            { AOM_CDF4(6982, 13052, 17721) },
+            { AOM_CDF4(5419, 10503, 15050) },
+            { AOM_CDF4(4852, 9162, 13014) },
+            { AOM_CDF4(3271, 6395, 9630) },
+            { AOM_CDF4(22210, 27833, 30109) },
+            { AOM_CDF4(20750, 27368, 29821) },
+            { AOM_CDF4(16894, 24828, 28573) },
+            { AOM_CDF4(13247, 21276, 25757) },
+            { AOM_CDF4(10038, 17265, 22563) },
+            { AOM_CDF4(8587, 14947, 20327) },
+            { AOM_CDF4(5645, 11371, 15252) },
+            { AOM_CDF4(22027, 27526, 29714) },
+            { AOM_CDF4(23098, 29146, 31221) },
+            { AOM_CDF4(19886, 27341, 30272) },
+            { AOM_CDF4(15609, 23747, 28046) },
+            { AOM_CDF4(11993, 20065, 24939) },
+            { AOM_CDF4(9637, 18267, 23671) },
+            { AOM_CDF4(7625, 13801, 19144) } } },
+        { { { AOM_CDF4(14438, 20798, 24089) },
+            { AOM_CDF4(12621, 19203, 23097) },
+            { AOM_CDF4(8177, 14125, 18402) },
+            { AOM_CDF4(5674, 10501, 14456) },
+            { AOM_CDF4(4236, 8239, 11733) },
+            { AOM_CDF4(3447, 6750, 9806) },
+            { AOM_CDF4(1986, 3950, 5864) },
+            { AOM_CDF4(16208, 22099, 24930) },
+            { AOM_CDF4(16537, 24025, 27585) },
+            { AOM_CDF4(12780, 20381, 24867) },
+            { AOM_CDF4(9767, 16612, 21416) },
+            { AOM_CDF4(7686, 13738, 18398) },
+            { AOM_CDF4(6333, 11614, 15964) },
+            { AOM_CDF4(3941, 7571, 10836) },
+            { AOM_CDF4(22819, 27422, 29202) },
+            { AOM_CDF4(22224, 28514, 30721) },
+            { AOM_CDF4(17660, 25433, 28913) },
+            { AOM_CDF4(13574, 21482, 26002) },
+            { AOM_CDF4(10629, 17977, 22938) },
+            { AOM_CDF4(8612, 15298, 20265) },
+            { AOM_CDF4(5607, 10491, 14596) } },
+          { { AOM_CDF4(13569, 19800, 23206) },
+            { AOM_CDF4(13128, 19924, 23869) },
+            { AOM_CDF4(8329, 14841, 19403) },
+            { AOM_CDF4(6130, 10976, 15057) },
+            { AOM_CDF4(4682, 8839, 12518) },
+            { AOM_CDF4(3656, 7409, 10588) },
+            { AOM_CDF4(2577, 5099, 7412) },
+            { AOM_CDF4(22427, 28684, 30585) },
+            { AOM_CDF4(20913, 27750, 30139) },
+            { AOM_CDF4(15840, 24109, 27834) },
+            { AOM_CDF4(12308, 20029, 24569) },
+            { AOM_CDF4(10216, 16785, 21458) },
+            { AOM_CDF4(8309, 14203, 19113) },
+            { AOM_CDF4(6043, 11168, 15307) },
+            { AOM_CDF4(23166, 28901, 30998) },
+            { AOM_CDF4(21899, 28405, 30751) },
+            { AOM_CDF4(18413, 26091, 29443) },
+            { AOM_CDF4(15233, 23114, 27352) },
+            { AOM_CDF4(12683, 20472, 25288) },
+            { AOM_CDF4(10702, 18259, 23409) },
+            { AOM_CDF4(8125, 14464, 19226) } } },
+        { { { AOM_CDF4(9040, 14786, 18360) },
+            { AOM_CDF4(9979, 15718, 19415) },
+            { AOM_CDF4(7913, 13918, 18311) },
+            { AOM_CDF4(5859, 10889, 15184) },
+            { AOM_CDF4(4593, 8677, 12510) },
+            { AOM_CDF4(3820, 7396, 10791) },
+            { AOM_CDF4(1730, 3471, 5192) },
+            { AOM_CDF4(11803, 18365, 22709) },
+            { AOM_CDF4(11419, 18058, 22225) },
+            { AOM_CDF4(9418, 15774, 20243) },
+            { AOM_CDF4(7539, 13325, 17657) },
+            { AOM_CDF4(6233, 11317, 15384) },
+            { AOM_CDF4(5137, 9656, 13545) },
+            { AOM_CDF4(2977, 5774, 8349) },
+            { AOM_CDF4(21207, 27246, 29640) },
+            { AOM_CDF4(19547, 26578, 29497) },
+            { AOM_CDF4(16169, 23871, 27690) },
+            { AOM_CDF4(12820, 20458, 25018) },
+            { AOM_CDF4(10224, 17332, 22214) },
+            { AOM_CDF4(8526, 15048, 19884) },
+            { AOM_CDF4(5037, 9410, 13118) } },
+          { { AOM_CDF4(12339, 17329, 20140) },
+            { AOM_CDF4(13505, 19895, 23225) },
+            { AOM_CDF4(9847, 16944, 21564) },
+            { AOM_CDF4(7280, 13256, 18348) },
+            { AOM_CDF4(4712, 10009, 14454) },
+            { AOM_CDF4(4361, 7914, 12477) },
+            { AOM_CDF4(2870, 5628, 7995) },
+            { AOM_CDF4(20061, 25504, 28526) },
+            { AOM_CDF4(15235, 22878, 26145) },
+            { AOM_CDF4(12985, 19958, 24155) },
+            { AOM_CDF4(9782, 16641, 21403) },
+            { AOM_CDF4(9456, 16360, 20760) },
+            { AOM_CDF4(6855, 12940, 18557) },
+            { AOM_CDF4(5661, 10564, 15002) },
+            { AOM_CDF4(25656, 30602, 31894) },
+            { AOM_CDF4(22570, 29107, 31092) },
+            { AOM_CDF4(18917, 26423, 29541) },
+            { AOM_CDF4(15940, 23649, 27754) },
+            { AOM_CDF4(12803, 20581, 25219) },
+            { AOM_CDF4(11082, 18695, 23376) },
+            { AOM_CDF4(7939, 14373, 19005) } } },
+        { { { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) } },
+          { { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) } } } },
+      { { { { AOM_CDF4(18315, 24289, 27551) },
+            { AOM_CDF4(16854, 24068, 27835) },
+            { AOM_CDF4(10140, 17927, 23173) },
+            { AOM_CDF4(6722, 12982, 18267) },
+            { AOM_CDF4(4661, 9826, 14706) },
+            { AOM_CDF4(3832, 8165, 12294) },
+            { AOM_CDF4(2795, 6098, 9245) },
+            { AOM_CDF4(17145, 23326, 26672) },
+            { AOM_CDF4(20733, 27680, 30308) },
+            { AOM_CDF4(16032, 24461, 28546) },
+            { AOM_CDF4(11653, 20093, 25081) },
+            { AOM_CDF4(9290, 16429, 22086) },
+            { AOM_CDF4(7796, 14598, 19982) },
+            { AOM_CDF4(6502, 12378, 17441) },
+            { AOM_CDF4(21681, 27732, 30320) },
+            { AOM_CDF4(22389, 29044, 31261) },
+            { AOM_CDF4(19027, 26731, 30087) },
+            { AOM_CDF4(14739, 23755, 28624) },
+            { AOM_CDF4(11358, 20778, 25511) },
+            { AOM_CDF4(10995, 18073, 24190) },
+            { AOM_CDF4(9162, 14990, 20617) } },
+          { { AOM_CDF4(21425, 27952, 30388) },
+            { AOM_CDF4(18062, 25838, 29034) },
+            { AOM_CDF4(11956, 19881, 24808) },
+            { AOM_CDF4(7718, 15000, 20980) },
+            { AOM_CDF4(5702, 11254, 16143) },
+            { AOM_CDF4(4898, 9088, 16864) },
+            { AOM_CDF4(3679, 6776, 11907) },
+            { AOM_CDF4(23294, 30160, 31663) },
+            { AOM_CDF4(24397, 29896, 31836) },
+            { AOM_CDF4(19245, 27128, 30593) },
+            { AOM_CDF4(13202, 19825, 26404) },
+            { AOM_CDF4(11578, 19297, 23957) },
+            { AOM_CDF4(8073, 13297, 21370) },
+            { AOM_CDF4(5461, 10923, 19745) },
+            { AOM_CDF4(27367, 30521, 31934) },
+            { AOM_CDF4(24904, 30671, 31940) },
+            { AOM_CDF4(23075, 28460, 31299) },
+            { AOM_CDF4(14400, 23658, 30417) },
+            { AOM_CDF4(13885, 23882, 28325) },
+            { AOM_CDF4(14746, 22938, 27853) },
+            { AOM_CDF4(5461, 16384, 27307) } } },
+        { { { AOM_CDF4(18274, 24813, 27890) },
+            { AOM_CDF4(15537, 23149, 27003) },
+            { AOM_CDF4(9449, 16740, 21827) },
+            { AOM_CDF4(6700, 12498, 17261) },
+            { AOM_CDF4(4988, 9866, 14198) },
+            { AOM_CDF4(4236, 8147, 11902) },
+            { AOM_CDF4(2867, 5860, 8654) },
+            { AOM_CDF4(17124, 23171, 26101) },
+            { AOM_CDF4(20396, 27477, 30148) },
+            { AOM_CDF4(16573, 24629, 28492) },
+            { AOM_CDF4(12749, 20846, 25674) },
+            { AOM_CDF4(10233, 17878, 22818) },
+            { AOM_CDF4(8525, 15332, 20363) },
+            { AOM_CDF4(6283, 11632, 16255) },
+            { AOM_CDF4(20466, 26511, 29286) },
+            { AOM_CDF4(23059, 29174, 31191) },
+            { AOM_CDF4(19481, 27263, 30241) },
+            { AOM_CDF4(15458, 23631, 28137) },
+            { AOM_CDF4(12416, 20608, 25693) },
+            { AOM_CDF4(10261, 18011, 23261) },
+            { AOM_CDF4(8016, 14655, 19666) } },
+          { { AOM_CDF4(17616, 24586, 28112) },
+            { AOM_CDF4(15809, 23299, 27155) },
+            { AOM_CDF4(10767, 18890, 23793) },
+            { AOM_CDF4(7727, 14255, 18865) },
+            { AOM_CDF4(6129, 11926, 16882) },
+            { AOM_CDF4(4482, 9704, 14861) },
+            { AOM_CDF4(3277, 7452, 11522) },
+            { AOM_CDF4(22956, 28551, 30730) },
+            { AOM_CDF4(22724, 28937, 30961) },
+            { AOM_CDF4(18467, 26324, 29580) },
+            { AOM_CDF4(13234, 20713, 25649) },
+            { AOM_CDF4(11181, 17592, 22481) },
+            { AOM_CDF4(8291, 18358, 24576) },
+            { AOM_CDF4(7568, 11881, 14984) },
+            { AOM_CDF4(24948, 29001, 31147) },
+            { AOM_CDF4(25674, 30619, 32151) },
+            { AOM_CDF4(20841, 26793, 29603) },
+            { AOM_CDF4(14669, 24356, 28666) },
+            { AOM_CDF4(11334, 23593, 28219) },
+            { AOM_CDF4(8922, 14762, 22873) },
+            { AOM_CDF4(8301, 13544, 20535) } } },
+        { { { AOM_CDF4(17113, 23733, 27081) },
+            { AOM_CDF4(14139, 21406, 25452) },
+            { AOM_CDF4(8552, 15002, 19776) },
+            { AOM_CDF4(5871, 11120, 15378) },
+            { AOM_CDF4(4455, 8616, 12253) },
+            { AOM_CDF4(3469, 6910, 10386) },
+            { AOM_CDF4(2255, 4553, 6782) },
+            { AOM_CDF4(18224, 24376, 27053) },
+            { AOM_CDF4(19290, 26710, 29614) },
+            { AOM_CDF4(14936, 22991, 27184) },
+            { AOM_CDF4(11238, 18951, 23762) },
+            { AOM_CDF4(8786, 15617, 20588) },
+            { AOM_CDF4(7317, 13228, 18003) },
+            { AOM_CDF4(5101, 9512, 13493) },
+            { AOM_CDF4(22639, 28222, 30210) },
+            { AOM_CDF4(23216, 29331, 31307) },
+            { AOM_CDF4(19075, 26762, 29895) },
+            { AOM_CDF4(15014, 23113, 27457) },
+            { AOM_CDF4(11938, 19857, 24752) },
+            { AOM_CDF4(9942, 17280, 22282) },
+            { AOM_CDF4(7167, 13144, 17752) } },
+          { { AOM_CDF4(15820, 22738, 26488) },
+            { AOM_CDF4(13530, 20885, 25216) },
+            { AOM_CDF4(8395, 15530, 20452) },
+            { AOM_CDF4(6574, 12321, 16380) },
+            { AOM_CDF4(5353, 10419, 14568) },
+            { AOM_CDF4(4613, 8446, 12381) },
+            { AOM_CDF4(3440, 7158, 9903) },
+            { AOM_CDF4(24247, 29051, 31224) },
+            { AOM_CDF4(22118, 28058, 30369) },
+            { AOM_CDF4(16498, 24768, 28389) },
+            { AOM_CDF4(12920, 21175, 26137) },
+            { AOM_CDF4(10730, 18619, 25352) },
+            { AOM_CDF4(10187, 16279, 22791) },
+            { AOM_CDF4(9310, 14631, 22127) },
+            { AOM_CDF4(24970, 30558, 32057) },
+            { AOM_CDF4(24801, 29942, 31698) },
+            { AOM_CDF4(22432, 28453, 30855) },
+            { AOM_CDF4(19054, 25680, 29580) },
+            { AOM_CDF4(14392, 23036, 28109) },
+            { AOM_CDF4(12495, 20947, 26650) },
+            { AOM_CDF4(12442, 20326, 26214) } } },
+        { { { AOM_CDF4(12162, 18785, 22648) },
+            { AOM_CDF4(12749, 19697, 23806) },
+            { AOM_CDF4(8580, 15297, 20346) },
+            { AOM_CDF4(6169, 11749, 16543) },
+            { AOM_CDF4(4836, 9391, 13448) },
+            { AOM_CDF4(3821, 7711, 11613) },
+            { AOM_CDF4(2228, 4601, 7070) },
+            { AOM_CDF4(16319, 24725, 28280) },
+            { AOM_CDF4(15698, 23277, 27168) },
+            { AOM_CDF4(12726, 20368, 25047) },
+            { AOM_CDF4(9912, 17015, 21976) },
+            { AOM_CDF4(7888, 14220, 19179) },
+            { AOM_CDF4(6777, 12284, 17018) },
+            { AOM_CDF4(4492, 8590, 12252) },
+            { AOM_CDF4(23249, 28904, 30947) },
+            { AOM_CDF4(21050, 27908, 30512) },
+            { AOM_CDF4(17440, 25340, 28949) },
+            { AOM_CDF4(14059, 22018, 26541) },
+            { AOM_CDF4(11288, 18903, 23898) },
+            { AOM_CDF4(9411, 16342, 21428) },
+            { AOM_CDF4(6278, 11588, 15944) } },
+          { { AOM_CDF4(13981, 20067, 23226) },
+            { AOM_CDF4(16922, 23580, 26783) },
+            { AOM_CDF4(11005, 19039, 24487) },
+            { AOM_CDF4(7389, 14218, 19798) },
+            { AOM_CDF4(5598, 11505, 17206) },
+            { AOM_CDF4(6090, 11213, 15659) },
+            { AOM_CDF4(3820, 7371, 10119) },
+            { AOM_CDF4(21082, 26925, 29675) },
+            { AOM_CDF4(21262, 28627, 31128) },
+            { AOM_CDF4(18392, 26454, 30437) },
+            { AOM_CDF4(14870, 22910, 27096) },
+            { AOM_CDF4(12620, 19484, 24908) },
+            { AOM_CDF4(9290, 16553, 22802) },
+            { AOM_CDF4(6668, 14288, 20004) },
+            { AOM_CDF4(27704, 31055, 31949) },
+            { AOM_CDF4(24709, 29978, 31788) },
+            { AOM_CDF4(21668, 29264, 31657) },
+            { AOM_CDF4(18295, 26968, 30074) },
+            { AOM_CDF4(16399, 24422, 29313) },
+            { AOM_CDF4(14347, 23026, 28104) },
+            { AOM_CDF4(12370, 19806, 24477) } } },
+        { { { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) } },
+          { { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) }, { AOM_CDF4(8192, 16384, 24576) },
+            { AOM_CDF4(8192, 16384, 24576) } } } }
+    };
+
+static const aom_cdf_prob av1_default_coeff_base_multi_cdfs
+    [TOKEN_CDF_Q_CTXS][TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS]
+    [CDF_SIZE(NUM_BASE_LEVELS +
+              2)] = { { { { { AOM_CDF4(4034, 8930, 12727) },
+                            { AOM_CDF4(18082, 29741, 31877) },
+                            { AOM_CDF4(12596, 26124, 30493) },
+                            { AOM_CDF4(9446, 21118, 27005) },
+                            { AOM_CDF4(6308, 15141, 21279) },
+                            { AOM_CDF4(2463, 6357, 9783) },
+                            { AOM_CDF4(20667, 30546, 31929) },
+                            { AOM_CDF4(13043, 26123, 30134) },
+                            { AOM_CDF4(8151, 18757, 24778) },
+                            { AOM_CDF4(5255, 12839, 18632) },
+                            { AOM_CDF4(2820, 7206, 11161) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(15736, 27553, 30604) },
+                            { AOM_CDF4(11210, 23794, 28787) },
+                            { AOM_CDF4(5947, 13874, 19701) },
+                            { AOM_CDF4(4215, 9323, 13891) },
+                            { AOM_CDF4(2833, 6462, 10059) },
+                            { AOM_CDF4(19605, 30393, 31582) },
+                            { AOM_CDF4(13523, 26252, 30248) },
+                            { AOM_CDF4(8446, 18622, 24512) },
+                            { AOM_CDF4(3818, 10343, 15974) },
+                            { AOM_CDF4(1481, 4117, 6796) },
+                            { AOM_CDF4(22649, 31302, 32190) },
+                            { AOM_CDF4(14829, 27127, 30449) },
+                            { AOM_CDF4(8313, 17702, 23304) },
+                            { AOM_CDF4(3022, 8301, 12786) },
+                            { AOM_CDF4(1536, 4412, 7184) },
+                            { AOM_CDF4(22354, 29774, 31372) },
+                            { AOM_CDF4(14723, 25472, 29214) },
+                            { AOM_CDF4(6673, 13745, 18662) },
+                            { AOM_CDF4(2068, 5766, 9322) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(6302, 16444, 21761) },
+                            { AOM_CDF4(23040, 31538, 32475) },
+                            { AOM_CDF4(15196, 28452, 31496) },
+                            { AOM_CDF4(10020, 22946, 28514) },
+                            { AOM_CDF4(6533, 16862, 23501) },
+                            { AOM_CDF4(3538, 9816, 15076) },
+                            { AOM_CDF4(24444, 31875, 32525) },
+                            { AOM_CDF4(15881, 28924, 31635) },
+                            { AOM_CDF4(9922, 22873, 28466) },
+                            { AOM_CDF4(6527, 16966, 23691) },
+                            { AOM_CDF4(4114, 11303, 17220) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(20201, 30770, 32209) },
+                            { AOM_CDF4(14754, 28071, 31258) },
+                            { AOM_CDF4(8378, 20186, 26517) },
+                            { AOM_CDF4(5916, 15299, 21978) },
+                            { AOM_CDF4(4268, 11583, 17901) },
+                            { AOM_CDF4(24361, 32025, 32581) },
+                            { AOM_CDF4(18673, 30105, 31943) },
+                            { AOM_CDF4(10196, 22244, 27576) },
+                            { AOM_CDF4(5495, 14349, 20417) },
+                            { AOM_CDF4(2676, 7415, 11498) },
+                            { AOM_CDF4(24678, 31958, 32585) },
+                            { AOM_CDF4(18629, 29906, 31831) },
+                            { AOM_CDF4(9364, 20724, 26315) },
+                            { AOM_CDF4(4641, 12318, 18094) },
+                            { AOM_CDF4(2758, 7387, 11579) },
+                            { AOM_CDF4(25433, 31842, 32469) },
+                            { AOM_CDF4(18795, 29289, 31411) },
+                            { AOM_CDF4(7644, 17584, 23592) },
+                            { AOM_CDF4(3408, 9014, 15047) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(4536, 10072, 14001) },
+                            { AOM_CDF4(25459, 31416, 32206) },
+                            { AOM_CDF4(16605, 28048, 30818) },
+                            { AOM_CDF4(11008, 22857, 27719) },
+                            { AOM_CDF4(6915, 16268, 22315) },
+                            { AOM_CDF4(2625, 6812, 10537) },
+                            { AOM_CDF4(24257, 31788, 32499) },
+                            { AOM_CDF4(16880, 29454, 31879) },
+                            { AOM_CDF4(11958, 25054, 29778) },
+                            { AOM_CDF4(7916, 18718, 25084) },
+                            { AOM_CDF4(3383, 8777, 13446) },
+                            { AOM_CDF4(22720, 31603, 32393) },
+                            { AOM_CDF4(14960, 28125, 31335) },
+                            { AOM_CDF4(9731, 22210, 27928) },
+                            { AOM_CDF4(6304, 15832, 22277) },
+                            { AOM_CDF4(2910, 7818, 12166) },
+                            { AOM_CDF4(20375, 30627, 32131) },
+                            { AOM_CDF4(13904, 27284, 30887) },
+                            { AOM_CDF4(9368, 21558, 27144) },
+                            { AOM_CDF4(5937, 14966, 21119) },
+                            { AOM_CDF4(2667, 7225, 11319) },
+                            { AOM_CDF4(23970, 31470, 32378) },
+                            { AOM_CDF4(17173, 29734, 32018) },
+                            { AOM_CDF4(12795, 25441, 29965) },
+                            { AOM_CDF4(8981, 19680, 25893) },
+                            { AOM_CDF4(4728, 11372, 16902) },
+                            { AOM_CDF4(24287, 31797, 32439) },
+                            { AOM_CDF4(16703, 29145, 31696) },
+                            { AOM_CDF4(10833, 23554, 28725) },
+                            { AOM_CDF4(6468, 16566, 23057) },
+                            { AOM_CDF4(2415, 6562, 10278) },
+                            { AOM_CDF4(26610, 32395, 32659) },
+                            { AOM_CDF4(18590, 30498, 32117) },
+                            { AOM_CDF4(12420, 25756, 29950) },
+                            { AOM_CDF4(7639, 18746, 24710) },
+                            { AOM_CDF4(3001, 8086, 12347) },
+                            { AOM_CDF4(25076, 32064, 32580) },
+                            { AOM_CDF4(17946, 30128, 32028) },
+                            { AOM_CDF4(12024, 24985, 29378) },
+                            { AOM_CDF4(7517, 18390, 24304) },
+                            { AOM_CDF4(3243, 8781, 13331) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(6037, 16771, 21957) },
+                            { AOM_CDF4(24774, 31704, 32426) },
+                            { AOM_CDF4(16830, 28589, 31056) },
+                            { AOM_CDF4(10602, 22828, 27760) },
+                            { AOM_CDF4(6733, 16829, 23071) },
+                            { AOM_CDF4(3250, 8914, 13556) },
+                            { AOM_CDF4(25582, 32220, 32668) },
+                            { AOM_CDF4(18659, 30342, 32223) },
+                            { AOM_CDF4(12546, 26149, 30515) },
+                            { AOM_CDF4(8420, 20451, 26801) },
+                            { AOM_CDF4(4636, 12420, 18344) },
+                            { AOM_CDF4(27581, 32362, 32639) },
+                            { AOM_CDF4(18987, 30083, 31978) },
+                            { AOM_CDF4(11327, 24248, 29084) },
+                            { AOM_CDF4(7264, 17719, 24120) },
+                            { AOM_CDF4(3995, 10768, 16169) },
+                            { AOM_CDF4(25893, 31831, 32487) },
+                            { AOM_CDF4(16577, 28587, 31379) },
+                            { AOM_CDF4(10189, 22748, 28182) },
+                            { AOM_CDF4(6832, 17094, 23556) },
+                            { AOM_CDF4(3708, 10110, 15334) },
+                            { AOM_CDF4(25904, 32282, 32656) },
+                            { AOM_CDF4(19721, 30792, 32276) },
+                            { AOM_CDF4(12819, 26243, 30411) },
+                            { AOM_CDF4(8572, 20614, 26891) },
+                            { AOM_CDF4(5364, 14059, 20467) },
+                            { AOM_CDF4(26580, 32438, 32677) },
+                            { AOM_CDF4(20852, 31225, 32340) },
+                            { AOM_CDF4(12435, 25700, 29967) },
+                            { AOM_CDF4(8691, 20825, 26976) },
+                            { AOM_CDF4(4446, 12209, 17269) },
+                            { AOM_CDF4(27350, 32429, 32696) },
+                            { AOM_CDF4(21372, 30977, 32272) },
+                            { AOM_CDF4(12673, 25270, 29853) },
+                            { AOM_CDF4(9208, 20925, 26640) },
+                            { AOM_CDF4(5018, 13351, 18732) },
+                            { AOM_CDF4(27351, 32479, 32713) },
+                            { AOM_CDF4(21398, 31209, 32387) },
+                            { AOM_CDF4(12162, 25047, 29842) },
+                            { AOM_CDF4(7896, 18691, 25319) },
+                            { AOM_CDF4(4670, 12882, 18881) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(5487, 10460, 13708) },
+                            { AOM_CDF4(21597, 28303, 30674) },
+                            { AOM_CDF4(11037, 21953, 26476) },
+                            { AOM_CDF4(8147, 17962, 22952) },
+                            { AOM_CDF4(5242, 13061, 18532) },
+                            { AOM_CDF4(1889, 5208, 8182) },
+                            { AOM_CDF4(26774, 32133, 32590) },
+                            { AOM_CDF4(17844, 29564, 31767) },
+                            { AOM_CDF4(11690, 24438, 29171) },
+                            { AOM_CDF4(7542, 18215, 24459) },
+                            { AOM_CDF4(2993, 8050, 12319) },
+                            { AOM_CDF4(28023, 32328, 32591) },
+                            { AOM_CDF4(18651, 30126, 31954) },
+                            { AOM_CDF4(12164, 25146, 29589) },
+                            { AOM_CDF4(7762, 18530, 24771) },
+                            { AOM_CDF4(3492, 9183, 13920) },
+                            { AOM_CDF4(27591, 32008, 32491) },
+                            { AOM_CDF4(17149, 28853, 31510) },
+                            { AOM_CDF4(11485, 24003, 28860) },
+                            { AOM_CDF4(7697, 18086, 24210) },
+                            { AOM_CDF4(3075, 7999, 12218) },
+                            { AOM_CDF4(28268, 32482, 32654) },
+                            { AOM_CDF4(19631, 31051, 32404) },
+                            { AOM_CDF4(13860, 27260, 31020) },
+                            { AOM_CDF4(9605, 21613, 27594) },
+                            { AOM_CDF4(4876, 12162, 17908) },
+                            { AOM_CDF4(27248, 32316, 32576) },
+                            { AOM_CDF4(18955, 30457, 32075) },
+                            { AOM_CDF4(11824, 23997, 28795) },
+                            { AOM_CDF4(7346, 18196, 24647) },
+                            { AOM_CDF4(3403, 9247, 14111) },
+                            { AOM_CDF4(29711, 32655, 32735) },
+                            { AOM_CDF4(21169, 31394, 32417) },
+                            { AOM_CDF4(13487, 27198, 30957) },
+                            { AOM_CDF4(8828, 21683, 27614) },
+                            { AOM_CDF4(4270, 11451, 17038) },
+                            { AOM_CDF4(28708, 32578, 32731) },
+                            { AOM_CDF4(20120, 31241, 32482) },
+                            { AOM_CDF4(13692, 27550, 31321) },
+                            { AOM_CDF4(9418, 22514, 28439) },
+                            { AOM_CDF4(4999, 13283, 19462) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(5673, 14302, 19711) },
+                            { AOM_CDF4(26251, 30701, 31834) },
+                            { AOM_CDF4(12782, 23783, 27803) },
+                            { AOM_CDF4(9127, 20657, 25808) },
+                            { AOM_CDF4(6368, 16208, 21462) },
+                            { AOM_CDF4(2465, 7177, 10822) },
+                            { AOM_CDF4(29961, 32563, 32719) },
+                            { AOM_CDF4(18318, 29891, 31949) },
+                            { AOM_CDF4(11361, 24514, 29357) },
+                            { AOM_CDF4(7900, 19603, 25607) },
+                            { AOM_CDF4(4002, 10590, 15546) },
+                            { AOM_CDF4(29637, 32310, 32595) },
+                            { AOM_CDF4(18296, 29913, 31809) },
+                            { AOM_CDF4(10144, 21515, 26871) },
+                            { AOM_CDF4(5358, 14322, 20394) },
+                            { AOM_CDF4(3067, 8362, 13346) },
+                            { AOM_CDF4(28652, 32470, 32676) },
+                            { AOM_CDF4(17538, 30771, 32209) },
+                            { AOM_CDF4(13924, 26882, 30494) },
+                            { AOM_CDF4(10496, 22837, 27869) },
+                            { AOM_CDF4(7236, 16396, 21621) },
+                            { AOM_CDF4(30743, 32687, 32746) },
+                            { AOM_CDF4(23006, 31676, 32489) },
+                            { AOM_CDF4(14494, 27828, 31120) },
+                            { AOM_CDF4(10174, 22801, 28352) },
+                            { AOM_CDF4(6242, 15281, 21043) },
+                            { AOM_CDF4(25817, 32243, 32720) },
+                            { AOM_CDF4(18618, 31367, 32325) },
+                            { AOM_CDF4(13997, 28318, 31878) },
+                            { AOM_CDF4(12255, 26534, 31383) },
+                            { AOM_CDF4(9561, 21588, 28450) },
+                            { AOM_CDF4(28188, 32635, 32724) },
+                            { AOM_CDF4(22060, 32365, 32728) },
+                            { AOM_CDF4(18102, 30690, 32528) },
+                            { AOM_CDF4(14196, 28864, 31999) },
+                            { AOM_CDF4(12262, 25792, 30865) },
+                            { AOM_CDF4(24176, 32109, 32628) },
+                            { AOM_CDF4(18280, 29681, 31963) },
+                            { AOM_CDF4(10205, 23703, 29664) },
+                            { AOM_CDF4(7889, 20025, 27676) },
+                            { AOM_CDF4(6060, 16743, 23970) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(5141, 7096, 8260) },
+                            { AOM_CDF4(27186, 29022, 29789) },
+                            { AOM_CDF4(6668, 12568, 15682) },
+                            { AOM_CDF4(2172, 6181, 8638) },
+                            { AOM_CDF4(1126, 3379, 4531) },
+                            { AOM_CDF4(443, 1361, 2254) },
+                            { AOM_CDF4(26083, 31153, 32436) },
+                            { AOM_CDF4(13486, 24603, 28483) },
+                            { AOM_CDF4(6508, 14840, 19910) },
+                            { AOM_CDF4(3386, 8800, 13286) },
+                            { AOM_CDF4(1530, 4322, 7054) },
+                            { AOM_CDF4(29639, 32080, 32548) },
+                            { AOM_CDF4(15897, 27552, 30290) },
+                            { AOM_CDF4(8588, 20047, 25383) },
+                            { AOM_CDF4(4889, 13339, 19269) },
+                            { AOM_CDF4(2240, 6871, 10498) },
+                            { AOM_CDF4(28165, 32197, 32517) },
+                            { AOM_CDF4(20735, 30427, 31568) },
+                            { AOM_CDF4(14325, 24671, 27692) },
+                            { AOM_CDF4(5119, 12554, 17805) },
+                            { AOM_CDF4(1810, 5441, 8261) },
+                            { AOM_CDF4(31212, 32724, 32748) },
+                            { AOM_CDF4(23352, 31766, 32545) },
+                            { AOM_CDF4(14669, 27570, 31059) },
+                            { AOM_CDF4(8492, 20894, 27272) },
+                            { AOM_CDF4(3644, 10194, 15204) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(2461, 7013, 9371) },
+                            { AOM_CDF4(24749, 29600, 30986) },
+                            { AOM_CDF4(9466, 19037, 22417) },
+                            { AOM_CDF4(3584, 9280, 14400) },
+                            { AOM_CDF4(1505, 3929, 5433) },
+                            { AOM_CDF4(677, 1500, 2736) },
+                            { AOM_CDF4(23987, 30702, 32117) },
+                            { AOM_CDF4(13554, 24571, 29263) },
+                            { AOM_CDF4(6211, 14556, 21155) },
+                            { AOM_CDF4(3135, 10972, 15625) },
+                            { AOM_CDF4(2435, 7127, 11427) },
+                            { AOM_CDF4(31300, 32532, 32550) },
+                            { AOM_CDF4(14757, 30365, 31954) },
+                            { AOM_CDF4(4405, 11612, 18553) },
+                            { AOM_CDF4(580, 4132, 7322) },
+                            { AOM_CDF4(1695, 10169, 14124) },
+                            { AOM_CDF4(30008, 32282, 32591) },
+                            { AOM_CDF4(19244, 30108, 31748) },
+                            { AOM_CDF4(11180, 24158, 29555) },
+                            { AOM_CDF4(5650, 14972, 19209) },
+                            { AOM_CDF4(2114, 5109, 8456) },
+                            { AOM_CDF4(31856, 32716, 32748) },
+                            { AOM_CDF4(23012, 31664, 32572) },
+                            { AOM_CDF4(13694, 26656, 30636) },
+                            { AOM_CDF4(8142, 19508, 26093) },
+                            { AOM_CDF4(4253, 10955, 16724) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(601, 983, 1311) },
+                            { AOM_CDF4(18725, 23406, 28087) },
+                            { AOM_CDF4(5461, 8192, 10923) },
+                            { AOM_CDF4(3781, 15124, 21425) },
+                            { AOM_CDF4(2587, 7761, 12072) },
+                            { AOM_CDF4(106, 458, 810) },
+                            { AOM_CDF4(22282, 29710, 31894) },
+                            { AOM_CDF4(8508, 20926, 25984) },
+                            { AOM_CDF4(3726, 12713, 18083) },
+                            { AOM_CDF4(1620, 7112, 10893) },
+                            { AOM_CDF4(729, 2236, 3495) },
+                            { AOM_CDF4(30163, 32474, 32684) },
+                            { AOM_CDF4(18304, 30464, 32000) },
+                            { AOM_CDF4(11443, 26526, 29647) },
+                            { AOM_CDF4(6007, 15292, 21299) },
+                            { AOM_CDF4(2234, 6703, 8937) },
+                            { AOM_CDF4(30954, 32177, 32571) },
+                            { AOM_CDF4(17363, 29562, 31076) },
+                            { AOM_CDF4(9686, 22464, 27410) },
+                            { AOM_CDF4(8192, 16384, 21390) },
+                            { AOM_CDF4(1755, 8046, 11264) },
+                            { AOM_CDF4(31168, 32734, 32748) },
+                            { AOM_CDF4(22486, 31441, 32471) },
+                            { AOM_CDF4(12833, 25627, 29738) },
+                            { AOM_CDF4(6980, 17379, 23122) },
+                            { AOM_CDF4(3111, 8887, 13479) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } } },
+                      { { { { AOM_CDF4(6041, 11854, 15927) },
+                            { AOM_CDF4(20326, 30905, 32251) },
+                            { AOM_CDF4(14164, 26831, 30725) },
+                            { AOM_CDF4(9760, 20647, 26585) },
+                            { AOM_CDF4(6416, 14953, 21219) },
+                            { AOM_CDF4(2966, 7151, 10891) },
+                            { AOM_CDF4(23567, 31374, 32254) },
+                            { AOM_CDF4(14978, 27416, 30946) },
+                            { AOM_CDF4(9434, 20225, 26254) },
+                            { AOM_CDF4(6658, 14558, 20535) },
+                            { AOM_CDF4(3916, 8677, 12989) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(18088, 29545, 31587) },
+                            { AOM_CDF4(13062, 25843, 30073) },
+                            { AOM_CDF4(8940, 16827, 22251) },
+                            { AOM_CDF4(7654, 13220, 17973) },
+                            { AOM_CDF4(5733, 10316, 14456) },
+                            { AOM_CDF4(22879, 31388, 32114) },
+                            { AOM_CDF4(15215, 27993, 30955) },
+                            { AOM_CDF4(9397, 19445, 24978) },
+                            { AOM_CDF4(3442, 9813, 15344) },
+                            { AOM_CDF4(1368, 3936, 6532) },
+                            { AOM_CDF4(25494, 32033, 32406) },
+                            { AOM_CDF4(16772, 27963, 30718) },
+                            { AOM_CDF4(9419, 18165, 23260) },
+                            { AOM_CDF4(2677, 7501, 11797) },
+                            { AOM_CDF4(1516, 4344, 7170) },
+                            { AOM_CDF4(26556, 31454, 32101) },
+                            { AOM_CDF4(17128, 27035, 30108) },
+                            { AOM_CDF4(8324, 15344, 20249) },
+                            { AOM_CDF4(1903, 5696, 9469) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(8455, 19003, 24368) },
+                            { AOM_CDF4(23563, 32021, 32604) },
+                            { AOM_CDF4(16237, 29446, 31935) },
+                            { AOM_CDF4(10724, 23999, 29358) },
+                            { AOM_CDF4(6725, 17528, 24416) },
+                            { AOM_CDF4(3927, 10927, 16825) },
+                            { AOM_CDF4(26313, 32288, 32634) },
+                            { AOM_CDF4(17430, 30095, 32095) },
+                            { AOM_CDF4(11116, 24606, 29679) },
+                            { AOM_CDF4(7195, 18384, 25269) },
+                            { AOM_CDF4(4726, 12852, 19315) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(22822, 31648, 32483) },
+                            { AOM_CDF4(16724, 29633, 31929) },
+                            { AOM_CDF4(10261, 23033, 28725) },
+                            { AOM_CDF4(7029, 17840, 24528) },
+                            { AOM_CDF4(4867, 13886, 21502) },
+                            { AOM_CDF4(25298, 31892, 32491) },
+                            { AOM_CDF4(17809, 29330, 31512) },
+                            { AOM_CDF4(9668, 21329, 26579) },
+                            { AOM_CDF4(4774, 12956, 18976) },
+                            { AOM_CDF4(2322, 7030, 11540) },
+                            { AOM_CDF4(25472, 31920, 32543) },
+                            { AOM_CDF4(17957, 29387, 31632) },
+                            { AOM_CDF4(9196, 20593, 26400) },
+                            { AOM_CDF4(4680, 12705, 19202) },
+                            { AOM_CDF4(2917, 8456, 13436) },
+                            { AOM_CDF4(26471, 32059, 32574) },
+                            { AOM_CDF4(18458, 29783, 31909) },
+                            { AOM_CDF4(8400, 19464, 25956) },
+                            { AOM_CDF4(3812, 10973, 17206) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(6779, 13743, 17678) },
+                            { AOM_CDF4(24806, 31797, 32457) },
+                            { AOM_CDF4(17616, 29047, 31372) },
+                            { AOM_CDF4(11063, 23175, 28003) },
+                            { AOM_CDF4(6521, 16110, 22324) },
+                            { AOM_CDF4(2764, 7504, 11654) },
+                            { AOM_CDF4(25266, 32367, 32637) },
+                            { AOM_CDF4(19054, 30553, 32175) },
+                            { AOM_CDF4(12139, 25212, 29807) },
+                            { AOM_CDF4(7311, 18162, 24704) },
+                            { AOM_CDF4(3397, 9164, 14074) },
+                            { AOM_CDF4(25988, 32208, 32522) },
+                            { AOM_CDF4(16253, 28912, 31526) },
+                            { AOM_CDF4(9151, 21387, 27372) },
+                            { AOM_CDF4(5688, 14915, 21496) },
+                            { AOM_CDF4(2717, 7627, 12004) },
+                            { AOM_CDF4(23144, 31855, 32443) },
+                            { AOM_CDF4(16070, 28491, 31325) },
+                            { AOM_CDF4(8702, 20467, 26517) },
+                            { AOM_CDF4(5243, 13956, 20367) },
+                            { AOM_CDF4(2621, 7335, 11567) },
+                            { AOM_CDF4(26636, 32340, 32630) },
+                            { AOM_CDF4(19990, 31050, 32341) },
+                            { AOM_CDF4(13243, 26105, 30315) },
+                            { AOM_CDF4(8588, 19521, 25918) },
+                            { AOM_CDF4(4717, 11585, 17304) },
+                            { AOM_CDF4(25844, 32292, 32582) },
+                            { AOM_CDF4(19090, 30635, 32097) },
+                            { AOM_CDF4(11963, 24546, 28939) },
+                            { AOM_CDF4(6218, 16087, 22354) },
+                            { AOM_CDF4(2340, 6608, 10426) },
+                            { AOM_CDF4(28046, 32576, 32694) },
+                            { AOM_CDF4(21178, 31313, 32296) },
+                            { AOM_CDF4(13486, 26184, 29870) },
+                            { AOM_CDF4(7149, 17871, 23723) },
+                            { AOM_CDF4(2833, 7958, 12259) },
+                            { AOM_CDF4(27710, 32528, 32686) },
+                            { AOM_CDF4(20674, 31076, 32268) },
+                            { AOM_CDF4(12413, 24955, 29243) },
+                            { AOM_CDF4(6676, 16927, 23097) },
+                            { AOM_CDF4(2966, 8333, 12919) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(8639, 19339, 24429) },
+                            { AOM_CDF4(24404, 31837, 32525) },
+                            { AOM_CDF4(16997, 29425, 31784) },
+                            { AOM_CDF4(11253, 24234, 29149) },
+                            { AOM_CDF4(6751, 17394, 24028) },
+                            { AOM_CDF4(3490, 9830, 15191) },
+                            { AOM_CDF4(26283, 32471, 32714) },
+                            { AOM_CDF4(19599, 31168, 32442) },
+                            { AOM_CDF4(13146, 26954, 30893) },
+                            { AOM_CDF4(8214, 20588, 26890) },
+                            { AOM_CDF4(4699, 13081, 19300) },
+                            { AOM_CDF4(28212, 32458, 32669) },
+                            { AOM_CDF4(18594, 30316, 32100) },
+                            { AOM_CDF4(11219, 24408, 29234) },
+                            { AOM_CDF4(6865, 17656, 24149) },
+                            { AOM_CDF4(3678, 10362, 16006) },
+                            { AOM_CDF4(25825, 32136, 32616) },
+                            { AOM_CDF4(17313, 29853, 32021) },
+                            { AOM_CDF4(11197, 24471, 29472) },
+                            { AOM_CDF4(6947, 17781, 24405) },
+                            { AOM_CDF4(3768, 10660, 16261) },
+                            { AOM_CDF4(27352, 32500, 32706) },
+                            { AOM_CDF4(20850, 31468, 32469) },
+                            { AOM_CDF4(14021, 27707, 31133) },
+                            { AOM_CDF4(8964, 21748, 27838) },
+                            { AOM_CDF4(5437, 14665, 21187) },
+                            { AOM_CDF4(26304, 32492, 32698) },
+                            { AOM_CDF4(20409, 31380, 32385) },
+                            { AOM_CDF4(13682, 27222, 30632) },
+                            { AOM_CDF4(8974, 21236, 26685) },
+                            { AOM_CDF4(4234, 11665, 16934) },
+                            { AOM_CDF4(26273, 32357, 32711) },
+                            { AOM_CDF4(20672, 31242, 32441) },
+                            { AOM_CDF4(14172, 27254, 30902) },
+                            { AOM_CDF4(9870, 21898, 27275) },
+                            { AOM_CDF4(5164, 13506, 19270) },
+                            { AOM_CDF4(26725, 32459, 32728) },
+                            { AOM_CDF4(20991, 31442, 32527) },
+                            { AOM_CDF4(13071, 26434, 30811) },
+                            { AOM_CDF4(8184, 20090, 26742) },
+                            { AOM_CDF4(4803, 13255, 19895) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(7555, 14942, 18501) },
+                            { AOM_CDF4(24410, 31178, 32287) },
+                            { AOM_CDF4(14394, 26738, 30253) },
+                            { AOM_CDF4(8413, 19554, 25195) },
+                            { AOM_CDF4(4766, 12924, 18785) },
+                            { AOM_CDF4(2029, 5806, 9207) },
+                            { AOM_CDF4(26776, 32364, 32663) },
+                            { AOM_CDF4(18732, 29967, 31931) },
+                            { AOM_CDF4(11005, 23786, 28852) },
+                            { AOM_CDF4(6466, 16909, 23510) },
+                            { AOM_CDF4(3044, 8638, 13419) },
+                            { AOM_CDF4(29208, 32582, 32704) },
+                            { AOM_CDF4(20068, 30857, 32208) },
+                            { AOM_CDF4(12003, 25085, 29595) },
+                            { AOM_CDF4(6947, 17750, 24189) },
+                            { AOM_CDF4(3245, 9103, 14007) },
+                            { AOM_CDF4(27359, 32465, 32669) },
+                            { AOM_CDF4(19421, 30614, 32174) },
+                            { AOM_CDF4(11915, 25010, 29579) },
+                            { AOM_CDF4(6950, 17676, 24074) },
+                            { AOM_CDF4(3007, 8473, 13096) },
+                            { AOM_CDF4(29002, 32676, 32735) },
+                            { AOM_CDF4(22102, 31849, 32576) },
+                            { AOM_CDF4(14408, 28009, 31405) },
+                            { AOM_CDF4(9027, 21679, 27931) },
+                            { AOM_CDF4(4694, 12678, 18748) },
+                            { AOM_CDF4(28216, 32528, 32682) },
+                            { AOM_CDF4(20849, 31264, 32318) },
+                            { AOM_CDF4(12756, 25815, 29751) },
+                            { AOM_CDF4(7565, 18801, 24923) },
+                            { AOM_CDF4(3509, 9533, 14477) },
+                            { AOM_CDF4(30133, 32687, 32739) },
+                            { AOM_CDF4(23063, 31910, 32515) },
+                            { AOM_CDF4(14588, 28051, 31132) },
+                            { AOM_CDF4(9085, 21649, 27457) },
+                            { AOM_CDF4(4261, 11654, 17264) },
+                            { AOM_CDF4(29518, 32691, 32748) },
+                            { AOM_CDF4(22451, 31959, 32613) },
+                            { AOM_CDF4(14864, 28722, 31700) },
+                            { AOM_CDF4(9695, 22964, 28716) },
+                            { AOM_CDF4(4932, 13358, 19502) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(6465, 16958, 21688) },
+                            { AOM_CDF4(25199, 31514, 32360) },
+                            { AOM_CDF4(14774, 27149, 30607) },
+                            { AOM_CDF4(9257, 21438, 26972) },
+                            { AOM_CDF4(5723, 15183, 21882) },
+                            { AOM_CDF4(3150, 8879, 13731) },
+                            { AOM_CDF4(26989, 32262, 32682) },
+                            { AOM_CDF4(17396, 29937, 32085) },
+                            { AOM_CDF4(11387, 24901, 29784) },
+                            { AOM_CDF4(7289, 18821, 25548) },
+                            { AOM_CDF4(3734, 10577, 16086) },
+                            { AOM_CDF4(29728, 32501, 32695) },
+                            { AOM_CDF4(17431, 29701, 31903) },
+                            { AOM_CDF4(9921, 22826, 28300) },
+                            { AOM_CDF4(5896, 15434, 22068) },
+                            { AOM_CDF4(3430, 9646, 14757) },
+                            { AOM_CDF4(28614, 32511, 32705) },
+                            { AOM_CDF4(19364, 30638, 32263) },
+                            { AOM_CDF4(13129, 26254, 30402) },
+                            { AOM_CDF4(8754, 20484, 26440) },
+                            { AOM_CDF4(4378, 11607, 17110) },
+                            { AOM_CDF4(30292, 32671, 32744) },
+                            { AOM_CDF4(21780, 31603, 32501) },
+                            { AOM_CDF4(14314, 27829, 31291) },
+                            { AOM_CDF4(9611, 22327, 28263) },
+                            { AOM_CDF4(4890, 13087, 19065) },
+                            { AOM_CDF4(25862, 32567, 32733) },
+                            { AOM_CDF4(20794, 32050, 32567) },
+                            { AOM_CDF4(17243, 30625, 32254) },
+                            { AOM_CDF4(13283, 27628, 31474) },
+                            { AOM_CDF4(9669, 22532, 28918) },
+                            { AOM_CDF4(27435, 32697, 32748) },
+                            { AOM_CDF4(24922, 32390, 32714) },
+                            { AOM_CDF4(21449, 31504, 32536) },
+                            { AOM_CDF4(16392, 29729, 31832) },
+                            { AOM_CDF4(11692, 24884, 29076) },
+                            { AOM_CDF4(24193, 32290, 32735) },
+                            { AOM_CDF4(18909, 31104, 32563) },
+                            { AOM_CDF4(12236, 26841, 31403) },
+                            { AOM_CDF4(8171, 21840, 29082) },
+                            { AOM_CDF4(7224, 17280, 25275) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(3078, 6839, 9890) },
+                            { AOM_CDF4(13837, 20450, 24479) },
+                            { AOM_CDF4(5914, 14222, 19328) },
+                            { AOM_CDF4(3866, 10267, 14762) },
+                            { AOM_CDF4(2612, 7208, 11042) },
+                            { AOM_CDF4(1067, 2991, 4776) },
+                            { AOM_CDF4(25817, 31646, 32529) },
+                            { AOM_CDF4(13708, 26338, 30385) },
+                            { AOM_CDF4(7328, 18585, 24870) },
+                            { AOM_CDF4(4691, 13080, 19276) },
+                            { AOM_CDF4(1825, 5253, 8352) },
+                            { AOM_CDF4(29386, 32315, 32624) },
+                            { AOM_CDF4(17160, 29001, 31360) },
+                            { AOM_CDF4(9602, 21862, 27396) },
+                            { AOM_CDF4(5915, 15772, 22148) },
+                            { AOM_CDF4(2786, 7779, 12047) },
+                            { AOM_CDF4(29246, 32450, 32663) },
+                            { AOM_CDF4(18696, 29929, 31818) },
+                            { AOM_CDF4(10510, 23369, 28560) },
+                            { AOM_CDF4(6229, 16499, 23125) },
+                            { AOM_CDF4(2608, 7448, 11705) },
+                            { AOM_CDF4(30753, 32710, 32748) },
+                            { AOM_CDF4(21638, 31487, 32503) },
+                            { AOM_CDF4(12937, 26854, 30870) },
+                            { AOM_CDF4(8182, 20596, 26970) },
+                            { AOM_CDF4(3637, 10269, 15497) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(5244, 12150, 16906) },
+                            { AOM_CDF4(20486, 26858, 29701) },
+                            { AOM_CDF4(7756, 18317, 23735) },
+                            { AOM_CDF4(3452, 9256, 13146) },
+                            { AOM_CDF4(2020, 5206, 8229) },
+                            { AOM_CDF4(1801, 4993, 7903) },
+                            { AOM_CDF4(27051, 31858, 32531) },
+                            { AOM_CDF4(15988, 27531, 30619) },
+                            { AOM_CDF4(9188, 21484, 26719) },
+                            { AOM_CDF4(6273, 17186, 23800) },
+                            { AOM_CDF4(3108, 9355, 14764) },
+                            { AOM_CDF4(31076, 32520, 32680) },
+                            { AOM_CDF4(18119, 30037, 31850) },
+                            { AOM_CDF4(10244, 22969, 27472) },
+                            { AOM_CDF4(4692, 14077, 19273) },
+                            { AOM_CDF4(3694, 11677, 17556) },
+                            { AOM_CDF4(30060, 32581, 32720) },
+                            { AOM_CDF4(21011, 30775, 32120) },
+                            { AOM_CDF4(11931, 24820, 29289) },
+                            { AOM_CDF4(7119, 17662, 24356) },
+                            { AOM_CDF4(3833, 10706, 16304) },
+                            { AOM_CDF4(31954, 32731, 32748) },
+                            { AOM_CDF4(23913, 31724, 32489) },
+                            { AOM_CDF4(15520, 28060, 31286) },
+                            { AOM_CDF4(11517, 23008, 28571) },
+                            { AOM_CDF4(6193, 14508, 20629) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(1035, 2807, 4156) },
+                            { AOM_CDF4(13162, 18138, 20939) },
+                            { AOM_CDF4(2696, 6633, 8755) },
+                            { AOM_CDF4(1373, 4161, 6853) },
+                            { AOM_CDF4(1099, 2746, 4716) },
+                            { AOM_CDF4(340, 1021, 1599) },
+                            { AOM_CDF4(22826, 30419, 32135) },
+                            { AOM_CDF4(10395, 21762, 26942) },
+                            { AOM_CDF4(4726, 12407, 17361) },
+                            { AOM_CDF4(2447, 7080, 10593) },
+                            { AOM_CDF4(1227, 3717, 6011) },
+                            { AOM_CDF4(28156, 31424, 31934) },
+                            { AOM_CDF4(16915, 27754, 30373) },
+                            { AOM_CDF4(9148, 20990, 26431) },
+                            { AOM_CDF4(5950, 15515, 21148) },
+                            { AOM_CDF4(2492, 7327, 11526) },
+                            { AOM_CDF4(30602, 32477, 32670) },
+                            { AOM_CDF4(20026, 29955, 31568) },
+                            { AOM_CDF4(11220, 23628, 28105) },
+                            { AOM_CDF4(6652, 17019, 22973) },
+                            { AOM_CDF4(3064, 8536, 13043) },
+                            { AOM_CDF4(31769, 32724, 32748) },
+                            { AOM_CDF4(22230, 30887, 32373) },
+                            { AOM_CDF4(12234, 25079, 29731) },
+                            { AOM_CDF4(7326, 18816, 25353) },
+                            { AOM_CDF4(3933, 10907, 16616) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } } },
+                      { { { { AOM_CDF4(8896, 16227, 20630) },
+                            { AOM_CDF4(23629, 31782, 32527) },
+                            { AOM_CDF4(15173, 27755, 31321) },
+                            { AOM_CDF4(10158, 21233, 27382) },
+                            { AOM_CDF4(6420, 14857, 21558) },
+                            { AOM_CDF4(3269, 8155, 12646) },
+                            { AOM_CDF4(24835, 32009, 32496) },
+                            { AOM_CDF4(16509, 28421, 31579) },
+                            { AOM_CDF4(10957, 21514, 27418) },
+                            { AOM_CDF4(7881, 15930, 22096) },
+                            { AOM_CDF4(5388, 10960, 15918) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(20745, 30773, 32093) },
+                            { AOM_CDF4(15200, 27221, 30861) },
+                            { AOM_CDF4(13032, 20873, 25667) },
+                            { AOM_CDF4(12285, 18663, 23494) },
+                            { AOM_CDF4(11563, 17481, 21489) },
+                            { AOM_CDF4(26260, 31982, 32320) },
+                            { AOM_CDF4(15397, 28083, 31100) },
+                            { AOM_CDF4(9742, 19217, 24824) },
+                            { AOM_CDF4(3261, 9629, 15362) },
+                            { AOM_CDF4(1480, 4322, 7499) },
+                            { AOM_CDF4(27599, 32256, 32460) },
+                            { AOM_CDF4(16857, 27659, 30774) },
+                            { AOM_CDF4(9551, 18290, 23748) },
+                            { AOM_CDF4(3052, 8933, 14103) },
+                            { AOM_CDF4(2021, 5910, 9787) },
+                            { AOM_CDF4(29005, 32015, 32392) },
+                            { AOM_CDF4(17677, 27694, 30863) },
+                            { AOM_CDF4(9204, 17356, 23219) },
+                            { AOM_CDF4(2403, 7516, 12814) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(10808, 22056, 26896) },
+                            { AOM_CDF4(25739, 32313, 32676) },
+                            { AOM_CDF4(17288, 30203, 32221) },
+                            { AOM_CDF4(11359, 24878, 29896) },
+                            { AOM_CDF4(6949, 17767, 24893) },
+                            { AOM_CDF4(4287, 11796, 18071) },
+                            { AOM_CDF4(27880, 32521, 32705) },
+                            { AOM_CDF4(19038, 31004, 32414) },
+                            { AOM_CDF4(12564, 26345, 30768) },
+                            { AOM_CDF4(8269, 19947, 26779) },
+                            { AOM_CDF4(5674, 14657, 21674) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(25742, 32319, 32671) },
+                            { AOM_CDF4(19557, 31164, 32454) },
+                            { AOM_CDF4(13381, 26381, 30755) },
+                            { AOM_CDF4(10101, 21466, 26722) },
+                            { AOM_CDF4(9209, 19650, 26825) },
+                            { AOM_CDF4(27107, 31917, 32432) },
+                            { AOM_CDF4(18056, 28893, 31203) },
+                            { AOM_CDF4(10200, 21434, 26764) },
+                            { AOM_CDF4(4660, 12913, 19502) },
+                            { AOM_CDF4(2368, 6930, 12504) },
+                            { AOM_CDF4(26960, 32158, 32613) },
+                            { AOM_CDF4(18628, 30005, 32031) },
+                            { AOM_CDF4(10233, 22442, 28232) },
+                            { AOM_CDF4(5471, 14630, 21516) },
+                            { AOM_CDF4(3235, 10767, 17109) },
+                            { AOM_CDF4(27696, 32440, 32692) },
+                            { AOM_CDF4(20032, 31167, 32438) },
+                            { AOM_CDF4(8700, 21341, 28442) },
+                            { AOM_CDF4(5662, 14831, 21795) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(9704, 17294, 21132) },
+                            { AOM_CDF4(26762, 32278, 32633) },
+                            { AOM_CDF4(18382, 29620, 31819) },
+                            { AOM_CDF4(10891, 23475, 28723) },
+                            { AOM_CDF4(6358, 16583, 23309) },
+                            { AOM_CDF4(3248, 9118, 14141) },
+                            { AOM_CDF4(27204, 32573, 32699) },
+                            { AOM_CDF4(19818, 30824, 32329) },
+                            { AOM_CDF4(11772, 25120, 30041) },
+                            { AOM_CDF4(6995, 18033, 25039) },
+                            { AOM_CDF4(3752, 10442, 16098) },
+                            { AOM_CDF4(27222, 32256, 32559) },
+                            { AOM_CDF4(15356, 28399, 31475) },
+                            { AOM_CDF4(8821, 20635, 27057) },
+                            { AOM_CDF4(5511, 14404, 21239) },
+                            { AOM_CDF4(2935, 8222, 13051) },
+                            { AOM_CDF4(24875, 32120, 32529) },
+                            { AOM_CDF4(15233, 28265, 31445) },
+                            { AOM_CDF4(8605, 20570, 26932) },
+                            { AOM_CDF4(5431, 14413, 21196) },
+                            { AOM_CDF4(2994, 8341, 13223) },
+                            { AOM_CDF4(28201, 32604, 32700) },
+                            { AOM_CDF4(21041, 31446, 32456) },
+                            { AOM_CDF4(13221, 26213, 30475) },
+                            { AOM_CDF4(8255, 19385, 26037) },
+                            { AOM_CDF4(4930, 12585, 18830) },
+                            { AOM_CDF4(28768, 32448, 32627) },
+                            { AOM_CDF4(19705, 30561, 32021) },
+                            { AOM_CDF4(11572, 23589, 28220) },
+                            { AOM_CDF4(5532, 15034, 21446) },
+                            { AOM_CDF4(2460, 7150, 11456) },
+                            { AOM_CDF4(29874, 32619, 32699) },
+                            { AOM_CDF4(21621, 31071, 32201) },
+                            { AOM_CDF4(12511, 24747, 28992) },
+                            { AOM_CDF4(6281, 16395, 22748) },
+                            { AOM_CDF4(3246, 9278, 14497) },
+                            { AOM_CDF4(29715, 32625, 32712) },
+                            { AOM_CDF4(20958, 31011, 32283) },
+                            { AOM_CDF4(11233, 23671, 28806) },
+                            { AOM_CDF4(6012, 16128, 22868) },
+                            { AOM_CDF4(3427, 9851, 15414) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(11016, 22111, 26794) },
+                            { AOM_CDF4(25946, 32357, 32677) },
+                            { AOM_CDF4(17890, 30452, 32252) },
+                            { AOM_CDF4(11678, 25142, 29816) },
+                            { AOM_CDF4(6720, 17534, 24584) },
+                            { AOM_CDF4(4230, 11665, 17820) },
+                            { AOM_CDF4(28400, 32623, 32747) },
+                            { AOM_CDF4(21164, 31668, 32575) },
+                            { AOM_CDF4(13572, 27388, 31182) },
+                            { AOM_CDF4(8234, 20750, 27358) },
+                            { AOM_CDF4(5065, 14055, 20897) },
+                            { AOM_CDF4(28981, 32547, 32705) },
+                            { AOM_CDF4(18681, 30543, 32239) },
+                            { AOM_CDF4(10919, 24075, 29286) },
+                            { AOM_CDF4(6431, 17199, 24077) },
+                            { AOM_CDF4(3819, 10464, 16618) },
+                            { AOM_CDF4(26870, 32467, 32693) },
+                            { AOM_CDF4(19041, 30831, 32347) },
+                            { AOM_CDF4(11794, 25211, 30016) },
+                            { AOM_CDF4(6888, 18019, 24970) },
+                            { AOM_CDF4(4370, 12363, 18992) },
+                            { AOM_CDF4(29578, 32670, 32744) },
+                            { AOM_CDF4(23159, 32007, 32613) },
+                            { AOM_CDF4(15315, 28669, 31676) },
+                            { AOM_CDF4(9298, 22607, 28782) },
+                            { AOM_CDF4(6144, 15913, 22968) },
+                            { AOM_CDF4(28110, 32499, 32669) },
+                            { AOM_CDF4(21574, 30937, 32015) },
+                            { AOM_CDF4(12759, 24818, 28727) },
+                            { AOM_CDF4(6545, 16761, 23042) },
+                            { AOM_CDF4(3649, 10597, 16833) },
+                            { AOM_CDF4(28163, 32552, 32728) },
+                            { AOM_CDF4(22101, 31469, 32464) },
+                            { AOM_CDF4(13160, 25472, 30143) },
+                            { AOM_CDF4(7303, 18684, 25468) },
+                            { AOM_CDF4(5241, 13975, 20955) },
+                            { AOM_CDF4(28400, 32631, 32744) },
+                            { AOM_CDF4(22104, 31793, 32603) },
+                            { AOM_CDF4(13557, 26571, 30846) },
+                            { AOM_CDF4(7749, 19861, 26675) },
+                            { AOM_CDF4(4873, 14030, 21234) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(9800, 17635, 21073) },
+                            { AOM_CDF4(26153, 31885, 32527) },
+                            { AOM_CDF4(15038, 27852, 31006) },
+                            { AOM_CDF4(8718, 20564, 26486) },
+                            { AOM_CDF4(5128, 14076, 20514) },
+                            { AOM_CDF4(2636, 7566, 11925) },
+                            { AOM_CDF4(27551, 32504, 32701) },
+                            { AOM_CDF4(18310, 30054, 32100) },
+                            { AOM_CDF4(10211, 23420, 29082) },
+                            { AOM_CDF4(6222, 16876, 23916) },
+                            { AOM_CDF4(3462, 9954, 15498) },
+                            { AOM_CDF4(29991, 32633, 32721) },
+                            { AOM_CDF4(19883, 30751, 32201) },
+                            { AOM_CDF4(11141, 24184, 29285) },
+                            { AOM_CDF4(6420, 16940, 23774) },
+                            { AOM_CDF4(3392, 9753, 15118) },
+                            { AOM_CDF4(28465, 32616, 32712) },
+                            { AOM_CDF4(19850, 30702, 32244) },
+                            { AOM_CDF4(10983, 24024, 29223) },
+                            { AOM_CDF4(6294, 16770, 23582) },
+                            { AOM_CDF4(3244, 9283, 14509) },
+                            { AOM_CDF4(30023, 32717, 32748) },
+                            { AOM_CDF4(22940, 32032, 32626) },
+                            { AOM_CDF4(14282, 27928, 31473) },
+                            { AOM_CDF4(8562, 21327, 27914) },
+                            { AOM_CDF4(4846, 13393, 19919) },
+                            { AOM_CDF4(29981, 32590, 32695) },
+                            { AOM_CDF4(20465, 30963, 32166) },
+                            { AOM_CDF4(11479, 23579, 28195) },
+                            { AOM_CDF4(5916, 15648, 22073) },
+                            { AOM_CDF4(3031, 8605, 13398) },
+                            { AOM_CDF4(31146, 32691, 32739) },
+                            { AOM_CDF4(23106, 31724, 32444) },
+                            { AOM_CDF4(13783, 26738, 30439) },
+                            { AOM_CDF4(7852, 19468, 25807) },
+                            { AOM_CDF4(3860, 11124, 16853) },
+                            { AOM_CDF4(31014, 32724, 32748) },
+                            { AOM_CDF4(23629, 32109, 32628) },
+                            { AOM_CDF4(14747, 28115, 31403) },
+                            { AOM_CDF4(8545, 21242, 27478) },
+                            { AOM_CDF4(4574, 12781, 19067) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(9185, 19694, 24688) },
+                            { AOM_CDF4(26081, 31985, 32621) },
+                            { AOM_CDF4(16015, 29000, 31787) },
+                            { AOM_CDF4(10542, 23690, 29206) },
+                            { AOM_CDF4(6732, 17945, 24677) },
+                            { AOM_CDF4(3916, 11039, 16722) },
+                            { AOM_CDF4(28224, 32566, 32744) },
+                            { AOM_CDF4(19100, 31138, 32485) },
+                            { AOM_CDF4(12528, 26620, 30879) },
+                            { AOM_CDF4(7741, 20277, 26885) },
+                            { AOM_CDF4(4566, 12845, 18990) },
+                            { AOM_CDF4(29933, 32593, 32718) },
+                            { AOM_CDF4(17670, 30333, 32155) },
+                            { AOM_CDF4(10385, 23600, 28909) },
+                            { AOM_CDF4(6243, 16236, 22407) },
+                            { AOM_CDF4(3976, 10389, 16017) },
+                            { AOM_CDF4(28377, 32561, 32738) },
+                            { AOM_CDF4(19366, 31175, 32482) },
+                            { AOM_CDF4(13327, 27175, 31094) },
+                            { AOM_CDF4(8258, 20769, 27143) },
+                            { AOM_CDF4(4703, 13198, 19527) },
+                            { AOM_CDF4(31086, 32706, 32748) },
+                            { AOM_CDF4(22853, 31902, 32583) },
+                            { AOM_CDF4(14759, 28186, 31419) },
+                            { AOM_CDF4(9284, 22382, 28348) },
+                            { AOM_CDF4(5585, 15192, 21868) },
+                            { AOM_CDF4(28291, 32652, 32746) },
+                            { AOM_CDF4(19849, 32107, 32571) },
+                            { AOM_CDF4(14834, 26818, 29214) },
+                            { AOM_CDF4(10306, 22594, 28672) },
+                            { AOM_CDF4(6615, 17384, 23384) },
+                            { AOM_CDF4(28947, 32604, 32745) },
+                            { AOM_CDF4(25625, 32289, 32646) },
+                            { AOM_CDF4(18758, 28672, 31403) },
+                            { AOM_CDF4(10017, 23430, 28523) },
+                            { AOM_CDF4(6862, 15269, 22131) },
+                            { AOM_CDF4(23933, 32509, 32739) },
+                            { AOM_CDF4(19927, 31495, 32631) },
+                            { AOM_CDF4(11903, 26023, 30621) },
+                            { AOM_CDF4(7026, 20094, 27252) },
+                            { AOM_CDF4(5998, 18106, 24437) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(4456, 11274, 15533) },
+                            { AOM_CDF4(21219, 29079, 31616) },
+                            { AOM_CDF4(11173, 23774, 28567) },
+                            { AOM_CDF4(7282, 18293, 24263) },
+                            { AOM_CDF4(4890, 13286, 19115) },
+                            { AOM_CDF4(1890, 5508, 8659) },
+                            { AOM_CDF4(26651, 32136, 32647) },
+                            { AOM_CDF4(14630, 28254, 31455) },
+                            { AOM_CDF4(8716, 21287, 27395) },
+                            { AOM_CDF4(5615, 15331, 22008) },
+                            { AOM_CDF4(2675, 7700, 12150) },
+                            { AOM_CDF4(29954, 32526, 32690) },
+                            { AOM_CDF4(16126, 28982, 31633) },
+                            { AOM_CDF4(9030, 21361, 27352) },
+                            { AOM_CDF4(5411, 14793, 21271) },
+                            { AOM_CDF4(2943, 8422, 13163) },
+                            { AOM_CDF4(29539, 32601, 32730) },
+                            { AOM_CDF4(18125, 30385, 32201) },
+                            { AOM_CDF4(10422, 24090, 29468) },
+                            { AOM_CDF4(6468, 17487, 24438) },
+                            { AOM_CDF4(2970, 8653, 13531) },
+                            { AOM_CDF4(30912, 32715, 32748) },
+                            { AOM_CDF4(20666, 31373, 32497) },
+                            { AOM_CDF4(12509, 26640, 30917) },
+                            { AOM_CDF4(8058, 20629, 27290) },
+                            { AOM_CDF4(4231, 12006, 18052) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(10202, 20633, 25484) },
+                            { AOM_CDF4(27336, 31445, 32352) },
+                            { AOM_CDF4(12420, 24384, 28552) },
+                            { AOM_CDF4(7648, 18115, 23856) },
+                            { AOM_CDF4(5662, 14341, 19902) },
+                            { AOM_CDF4(3611, 10328, 15390) },
+                            { AOM_CDF4(30945, 32616, 32736) },
+                            { AOM_CDF4(18682, 30505, 32253) },
+                            { AOM_CDF4(11513, 25336, 30203) },
+                            { AOM_CDF4(7449, 19452, 26148) },
+                            { AOM_CDF4(4482, 13051, 18886) },
+                            { AOM_CDF4(32022, 32690, 32747) },
+                            { AOM_CDF4(18578, 30501, 32146) },
+                            { AOM_CDF4(11249, 23368, 28631) },
+                            { AOM_CDF4(5645, 16958, 22158) },
+                            { AOM_CDF4(5009, 11444, 16637) },
+                            { AOM_CDF4(31357, 32710, 32748) },
+                            { AOM_CDF4(21552, 31494, 32504) },
+                            { AOM_CDF4(13891, 27677, 31340) },
+                            { AOM_CDF4(9051, 22098, 28172) },
+                            { AOM_CDF4(5190, 13377, 19486) },
+                            { AOM_CDF4(32364, 32740, 32748) },
+                            { AOM_CDF4(24839, 31907, 32551) },
+                            { AOM_CDF4(17160, 28779, 31696) },
+                            { AOM_CDF4(12452, 24137, 29602) },
+                            { AOM_CDF4(6165, 15389, 22477) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(2575, 7281, 11077) },
+                            { AOM_CDF4(14002, 20866, 25402) },
+                            { AOM_CDF4(6343, 15056, 19658) },
+                            { AOM_CDF4(4474, 11858, 17041) },
+                            { AOM_CDF4(2865, 8299, 12534) },
+                            { AOM_CDF4(1344, 3949, 6391) },
+                            { AOM_CDF4(24720, 31239, 32459) },
+                            { AOM_CDF4(12585, 25356, 29968) },
+                            { AOM_CDF4(7181, 18246, 24444) },
+                            { AOM_CDF4(5025, 13667, 19885) },
+                            { AOM_CDF4(2521, 7304, 11605) },
+                            { AOM_CDF4(29908, 32252, 32584) },
+                            { AOM_CDF4(17421, 29156, 31575) },
+                            { AOM_CDF4(9889, 22188, 27782) },
+                            { AOM_CDF4(5878, 15647, 22123) },
+                            { AOM_CDF4(2814, 8665, 13323) },
+                            { AOM_CDF4(30183, 32568, 32713) },
+                            { AOM_CDF4(18528, 30195, 32049) },
+                            { AOM_CDF4(10982, 24606, 29657) },
+                            { AOM_CDF4(6957, 18165, 25231) },
+                            { AOM_CDF4(3508, 10118, 15468) },
+                            { AOM_CDF4(31761, 32736, 32748) },
+                            { AOM_CDF4(21041, 31328, 32546) },
+                            { AOM_CDF4(12568, 26732, 31166) },
+                            { AOM_CDF4(8052, 20720, 27733) },
+                            { AOM_CDF4(4336, 12192, 18396) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } } },
+                      { { { { AOM_CDF4(7062, 16472, 22319) },
+                            { AOM_CDF4(24538, 32261, 32674) },
+                            { AOM_CDF4(13675, 28041, 31779) },
+                            { AOM_CDF4(8590, 20674, 27631) },
+                            { AOM_CDF4(5685, 14675, 22013) },
+                            { AOM_CDF4(3655, 9898, 15731) },
+                            { AOM_CDF4(26493, 32418, 32658) },
+                            { AOM_CDF4(16376, 29342, 32090) },
+                            { AOM_CDF4(10594, 22649, 28970) },
+                            { AOM_CDF4(8176, 17170, 24303) },
+                            { AOM_CDF4(5605, 12694, 19139) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(23888, 31902, 32542) },
+                            { AOM_CDF4(18612, 29687, 31987) },
+                            { AOM_CDF4(16245, 24852, 29249) },
+                            { AOM_CDF4(15765, 22608, 27559) },
+                            { AOM_CDF4(19895, 24699, 27510) },
+                            { AOM_CDF4(28401, 32212, 32457) },
+                            { AOM_CDF4(15274, 27825, 30980) },
+                            { AOM_CDF4(9364, 18128, 24332) },
+                            { AOM_CDF4(2283, 8193, 15082) },
+                            { AOM_CDF4(1228, 3972, 7881) },
+                            { AOM_CDF4(29455, 32469, 32620) },
+                            { AOM_CDF4(17981, 28245, 31388) },
+                            { AOM_CDF4(10921, 20098, 26240) },
+                            { AOM_CDF4(3743, 11829, 18657) },
+                            { AOM_CDF4(2374, 9593, 15715) },
+                            { AOM_CDF4(31068, 32466, 32635) },
+                            { AOM_CDF4(20321, 29572, 31971) },
+                            { AOM_CDF4(10771, 20255, 27119) },
+                            { AOM_CDF4(2795, 10410, 17361) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(9320, 22102, 27840) },
+                            { AOM_CDF4(27057, 32464, 32724) },
+                            { AOM_CDF4(16331, 30268, 32309) },
+                            { AOM_CDF4(10319, 23935, 29720) },
+                            { AOM_CDF4(6189, 16448, 24106) },
+                            { AOM_CDF4(3589, 10884, 18808) },
+                            { AOM_CDF4(29026, 32624, 32748) },
+                            { AOM_CDF4(19226, 31507, 32587) },
+                            { AOM_CDF4(12692, 26921, 31203) },
+                            { AOM_CDF4(7049, 19532, 27635) },
+                            { AOM_CDF4(7727, 15669, 23252) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(28056, 32625, 32748) },
+                            { AOM_CDF4(22383, 32075, 32669) },
+                            { AOM_CDF4(15417, 27098, 31749) },
+                            { AOM_CDF4(18127, 26493, 27190) },
+                            { AOM_CDF4(5461, 16384, 21845) },
+                            { AOM_CDF4(27982, 32091, 32584) },
+                            { AOM_CDF4(19045, 29868, 31972) },
+                            { AOM_CDF4(10397, 22266, 27932) },
+                            { AOM_CDF4(5990, 13697, 21500) },
+                            { AOM_CDF4(1792, 6912, 15104) },
+                            { AOM_CDF4(28198, 32501, 32718) },
+                            { AOM_CDF4(21534, 31521, 32569) },
+                            { AOM_CDF4(11109, 25217, 30017) },
+                            { AOM_CDF4(5671, 15124, 26151) },
+                            { AOM_CDF4(4681, 14043, 18725) },
+                            { AOM_CDF4(28688, 32580, 32741) },
+                            { AOM_CDF4(22576, 32079, 32661) },
+                            { AOM_CDF4(10627, 22141, 28340) },
+                            { AOM_CDF4(9362, 14043, 28087) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(7754, 16948, 22142) },
+                            { AOM_CDF4(25670, 32330, 32691) },
+                            { AOM_CDF4(15663, 29225, 31994) },
+                            { AOM_CDF4(9878, 23288, 29158) },
+                            { AOM_CDF4(6419, 17088, 24336) },
+                            { AOM_CDF4(3859, 11003, 17039) },
+                            { AOM_CDF4(27562, 32595, 32725) },
+                            { AOM_CDF4(17575, 30588, 32399) },
+                            { AOM_CDF4(10819, 24838, 30309) },
+                            { AOM_CDF4(7124, 18686, 25916) },
+                            { AOM_CDF4(4479, 12688, 19340) },
+                            { AOM_CDF4(28385, 32476, 32673) },
+                            { AOM_CDF4(15306, 29005, 31938) },
+                            { AOM_CDF4(8937, 21615, 28322) },
+                            { AOM_CDF4(5982, 15603, 22786) },
+                            { AOM_CDF4(3620, 10267, 16136) },
+                            { AOM_CDF4(27280, 32464, 32667) },
+                            { AOM_CDF4(15607, 29160, 32004) },
+                            { AOM_CDF4(9091, 22135, 28740) },
+                            { AOM_CDF4(6232, 16632, 24020) },
+                            { AOM_CDF4(4047, 11377, 17672) },
+                            { AOM_CDF4(29220, 32630, 32718) },
+                            { AOM_CDF4(19650, 31220, 32462) },
+                            { AOM_CDF4(13050, 26312, 30827) },
+                            { AOM_CDF4(9228, 20870, 27468) },
+                            { AOM_CDF4(6146, 15149, 21971) },
+                            { AOM_CDF4(30169, 32481, 32623) },
+                            { AOM_CDF4(17212, 29311, 31554) },
+                            { AOM_CDF4(9911, 21311, 26882) },
+                            { AOM_CDF4(4487, 13314, 20372) },
+                            { AOM_CDF4(2570, 7772, 12889) },
+                            { AOM_CDF4(30924, 32613, 32708) },
+                            { AOM_CDF4(19490, 30206, 32107) },
+                            { AOM_CDF4(11232, 23998, 29276) },
+                            { AOM_CDF4(6769, 17955, 25035) },
+                            { AOM_CDF4(4398, 12623, 19214) },
+                            { AOM_CDF4(30609, 32627, 32722) },
+                            { AOM_CDF4(19370, 30582, 32287) },
+                            { AOM_CDF4(10457, 23619, 29409) },
+                            { AOM_CDF4(6443, 17637, 24834) },
+                            { AOM_CDF4(4645, 13236, 20106) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(8626, 20271, 26216) },
+                            { AOM_CDF4(26707, 32406, 32711) },
+                            { AOM_CDF4(16999, 30329, 32286) },
+                            { AOM_CDF4(11445, 25123, 30286) },
+                            { AOM_CDF4(6411, 18828, 25601) },
+                            { AOM_CDF4(6801, 12458, 20248) },
+                            { AOM_CDF4(29918, 32682, 32748) },
+                            { AOM_CDF4(20649, 31739, 32618) },
+                            { AOM_CDF4(12879, 27773, 31581) },
+                            { AOM_CDF4(7896, 21751, 28244) },
+                            { AOM_CDF4(5260, 14870, 23698) },
+                            { AOM_CDF4(29252, 32593, 32731) },
+                            { AOM_CDF4(17072, 30460, 32294) },
+                            { AOM_CDF4(10653, 24143, 29365) },
+                            { AOM_CDF4(6536, 17490, 23983) },
+                            { AOM_CDF4(4929, 13170, 20085) },
+                            { AOM_CDF4(28137, 32518, 32715) },
+                            { AOM_CDF4(18171, 30784, 32407) },
+                            { AOM_CDF4(11437, 25436, 30459) },
+                            { AOM_CDF4(7252, 18534, 26176) },
+                            { AOM_CDF4(4126, 13353, 20978) },
+                            { AOM_CDF4(31162, 32726, 32748) },
+                            { AOM_CDF4(23017, 32222, 32701) },
+                            { AOM_CDF4(15629, 29233, 32046) },
+                            { AOM_CDF4(9387, 22621, 29480) },
+                            { AOM_CDF4(6922, 17616, 25010) },
+                            { AOM_CDF4(28838, 32265, 32614) },
+                            { AOM_CDF4(19701, 30206, 31920) },
+                            { AOM_CDF4(11214, 22410, 27933) },
+                            { AOM_CDF4(5320, 14177, 23034) },
+                            { AOM_CDF4(5049, 12881, 17827) },
+                            { AOM_CDF4(27484, 32471, 32734) },
+                            { AOM_CDF4(21076, 31526, 32561) },
+                            { AOM_CDF4(12707, 26303, 31211) },
+                            { AOM_CDF4(8169, 21722, 28219) },
+                            { AOM_CDF4(6045, 19406, 27042) },
+                            { AOM_CDF4(27753, 32572, 32745) },
+                            { AOM_CDF4(20832, 31878, 32653) },
+                            { AOM_CDF4(13250, 27356, 31674) },
+                            { AOM_CDF4(7718, 21508, 29858) },
+                            { AOM_CDF4(7209, 18350, 25559) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(7876, 16901, 21741) },
+                            { AOM_CDF4(24001, 31898, 32625) },
+                            { AOM_CDF4(14529, 27959, 31451) },
+                            { AOM_CDF4(8273, 20818, 27258) },
+                            { AOM_CDF4(5278, 14673, 21510) },
+                            { AOM_CDF4(2983, 8843, 14039) },
+                            { AOM_CDF4(28016, 32574, 32732) },
+                            { AOM_CDF4(17471, 30306, 32301) },
+                            { AOM_CDF4(10224, 24063, 29728) },
+                            { AOM_CDF4(6602, 17954, 25052) },
+                            { AOM_CDF4(4002, 11585, 17759) },
+                            { AOM_CDF4(30190, 32634, 32739) },
+                            { AOM_CDF4(17497, 30282, 32270) },
+                            { AOM_CDF4(10229, 23729, 29538) },
+                            { AOM_CDF4(6344, 17211, 24440) },
+                            { AOM_CDF4(3849, 11189, 17108) },
+                            { AOM_CDF4(28570, 32583, 32726) },
+                            { AOM_CDF4(17521, 30161, 32238) },
+                            { AOM_CDF4(10153, 23565, 29378) },
+                            { AOM_CDF4(6455, 17341, 24443) },
+                            { AOM_CDF4(3907, 11042, 17024) },
+                            { AOM_CDF4(30689, 32715, 32748) },
+                            { AOM_CDF4(21546, 31840, 32610) },
+                            { AOM_CDF4(13547, 27581, 31459) },
+                            { AOM_CDF4(8912, 21757, 28309) },
+                            { AOM_CDF4(5548, 15080, 22046) },
+                            { AOM_CDF4(30783, 32540, 32685) },
+                            { AOM_CDF4(17540, 29528, 31668) },
+                            { AOM_CDF4(10160, 21468, 26783) },
+                            { AOM_CDF4(4724, 13393, 20054) },
+                            { AOM_CDF4(2702, 8174, 13102) },
+                            { AOM_CDF4(31648, 32686, 32742) },
+                            { AOM_CDF4(20954, 31094, 32337) },
+                            { AOM_CDF4(12420, 25698, 30179) },
+                            { AOM_CDF4(7304, 19320, 26248) },
+                            { AOM_CDF4(4366, 12261, 18864) },
+                            { AOM_CDF4(31581, 32723, 32748) },
+                            { AOM_CDF4(21373, 31586, 32525) },
+                            { AOM_CDF4(12744, 26625, 30885) },
+                            { AOM_CDF4(7431, 20322, 26950) },
+                            { AOM_CDF4(4692, 13323, 20111) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(7833, 18369, 24095) },
+                            { AOM_CDF4(26650, 32273, 32702) },
+                            { AOM_CDF4(16371, 29961, 32191) },
+                            { AOM_CDF4(11055, 24082, 29629) },
+                            { AOM_CDF4(6892, 18644, 25400) },
+                            { AOM_CDF4(5006, 13057, 19240) },
+                            { AOM_CDF4(29834, 32666, 32748) },
+                            { AOM_CDF4(19577, 31335, 32570) },
+                            { AOM_CDF4(12253, 26509, 31122) },
+                            { AOM_CDF4(7991, 20772, 27711) },
+                            { AOM_CDF4(5677, 15910, 23059) },
+                            { AOM_CDF4(30109, 32532, 32720) },
+                            { AOM_CDF4(16747, 30166, 32252) },
+                            { AOM_CDF4(10134, 23542, 29184) },
+                            { AOM_CDF4(5791, 16176, 23556) },
+                            { AOM_CDF4(4362, 10414, 17284) },
+                            { AOM_CDF4(29492, 32626, 32748) },
+                            { AOM_CDF4(19894, 31402, 32525) },
+                            { AOM_CDF4(12942, 27071, 30869) },
+                            { AOM_CDF4(8346, 21216, 27405) },
+                            { AOM_CDF4(6572, 17087, 23859) },
+                            { AOM_CDF4(32035, 32735, 32748) },
+                            { AOM_CDF4(22957, 31838, 32618) },
+                            { AOM_CDF4(14724, 28572, 31772) },
+                            { AOM_CDF4(10364, 23999, 29553) },
+                            { AOM_CDF4(7004, 18433, 25655) },
+                            { AOM_CDF4(27528, 32277, 32681) },
+                            { AOM_CDF4(16959, 31171, 32096) },
+                            { AOM_CDF4(10486, 23593, 27962) },
+                            { AOM_CDF4(8192, 16384, 23211) },
+                            { AOM_CDF4(8937, 17873, 20852) },
+                            { AOM_CDF4(27715, 32002, 32615) },
+                            { AOM_CDF4(15073, 29491, 31676) },
+                            { AOM_CDF4(11264, 24576, 28672) },
+                            { AOM_CDF4(2341, 18725, 23406) },
+                            { AOM_CDF4(7282, 18204, 25486) },
+                            { AOM_CDF4(28547, 32213, 32657) },
+                            { AOM_CDF4(20788, 29773, 32239) },
+                            { AOM_CDF4(6780, 21469, 30508) },
+                            { AOM_CDF4(5958, 14895, 23831) },
+                            { AOM_CDF4(16384, 21845, 27307) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(5992, 14304, 19765) },
+                            { AOM_CDF4(22612, 31238, 32456) },
+                            { AOM_CDF4(13456, 27162, 31087) },
+                            { AOM_CDF4(8001, 20062, 26504) },
+                            { AOM_CDF4(5168, 14105, 20764) },
+                            { AOM_CDF4(2632, 7771, 12385) },
+                            { AOM_CDF4(27034, 32344, 32709) },
+                            { AOM_CDF4(15850, 29415, 31997) },
+                            { AOM_CDF4(9494, 22776, 28841) },
+                            { AOM_CDF4(6151, 16830, 23969) },
+                            { AOM_CDF4(3461, 10039, 15722) },
+                            { AOM_CDF4(30134, 32569, 32731) },
+                            { AOM_CDF4(15638, 29422, 31945) },
+                            { AOM_CDF4(9150, 21865, 28218) },
+                            { AOM_CDF4(5647, 15719, 22676) },
+                            { AOM_CDF4(3402, 9772, 15477) },
+                            { AOM_CDF4(28530, 32586, 32735) },
+                            { AOM_CDF4(17139, 30298, 32292) },
+                            { AOM_CDF4(10200, 24039, 29685) },
+                            { AOM_CDF4(6419, 17674, 24786) },
+                            { AOM_CDF4(3544, 10225, 15824) },
+                            { AOM_CDF4(31333, 32726, 32748) },
+                            { AOM_CDF4(20618, 31487, 32544) },
+                            { AOM_CDF4(12901, 27217, 31232) },
+                            { AOM_CDF4(8624, 21734, 28171) },
+                            { AOM_CDF4(5104, 14191, 20748) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(11206, 21090, 26561) },
+                            { AOM_CDF4(28759, 32279, 32671) },
+                            { AOM_CDF4(14171, 27952, 31569) },
+                            { AOM_CDF4(9743, 22907, 29141) },
+                            { AOM_CDF4(6871, 17886, 24868) },
+                            { AOM_CDF4(4960, 13152, 19315) },
+                            { AOM_CDF4(31077, 32661, 32748) },
+                            { AOM_CDF4(19400, 31195, 32515) },
+                            { AOM_CDF4(12752, 26858, 31040) },
+                            { AOM_CDF4(8370, 22098, 28591) },
+                            { AOM_CDF4(5457, 15373, 22298) },
+                            { AOM_CDF4(31697, 32706, 32748) },
+                            { AOM_CDF4(17860, 30657, 32333) },
+                            { AOM_CDF4(12510, 24812, 29261) },
+                            { AOM_CDF4(6180, 19124, 24722) },
+                            { AOM_CDF4(5041, 13548, 17959) },
+                            { AOM_CDF4(31552, 32716, 32748) },
+                            { AOM_CDF4(21908, 31769, 32623) },
+                            { AOM_CDF4(14470, 28201, 31565) },
+                            { AOM_CDF4(9493, 22982, 28608) },
+                            { AOM_CDF4(6858, 17240, 24137) },
+                            { AOM_CDF4(32543, 32752, 32756) },
+                            { AOM_CDF4(24286, 32097, 32666) },
+                            { AOM_CDF4(15958, 29217, 32024) },
+                            { AOM_CDF4(10207, 24234, 29958) },
+                            { AOM_CDF4(6929, 18305, 25652) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } },
+                        { { { AOM_CDF4(4137, 10847, 15682) },
+                            { AOM_CDF4(17824, 27001, 30058) },
+                            { AOM_CDF4(10204, 22796, 28291) },
+                            { AOM_CDF4(6076, 15935, 22125) },
+                            { AOM_CDF4(3852, 10937, 16816) },
+                            { AOM_CDF4(2252, 6324, 10131) },
+                            { AOM_CDF4(25840, 32016, 32662) },
+                            { AOM_CDF4(15109, 28268, 31531) },
+                            { AOM_CDF4(9385, 22231, 28340) },
+                            { AOM_CDF4(6082, 16672, 23479) },
+                            { AOM_CDF4(3318, 9427, 14681) },
+                            { AOM_CDF4(30594, 32574, 32718) },
+                            { AOM_CDF4(16836, 29552, 31859) },
+                            { AOM_CDF4(9556, 22542, 28356) },
+                            { AOM_CDF4(6305, 16725, 23540) },
+                            { AOM_CDF4(3376, 9895, 15184) },
+                            { AOM_CDF4(29383, 32617, 32745) },
+                            { AOM_CDF4(18891, 30809, 32401) },
+                            { AOM_CDF4(11688, 25942, 30687) },
+                            { AOM_CDF4(7468, 19469, 26651) },
+                            { AOM_CDF4(3909, 11358, 17012) },
+                            { AOM_CDF4(31564, 32736, 32748) },
+                            { AOM_CDF4(20906, 31611, 32600) },
+                            { AOM_CDF4(13191, 27621, 31537) },
+                            { AOM_CDF4(8768, 22029, 28676) },
+                            { AOM_CDF4(5079, 14109, 20906) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } },
+                          { { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) },
+                            { AOM_CDF4(8192, 16384, 24576) } } } } };
+
+static const aom_cdf_prob av1_default_coeff_base_eob_multi_cdfs
+    [TOKEN_CDF_Q_CTXS][TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS_EOB][CDF_SIZE(
+        NUM_BASE_LEVELS + 1)] = { { { { { AOM_CDF3(17837, 29055) },
+                                        { AOM_CDF3(29600, 31446) },
+                                        { AOM_CDF3(30844, 31878) },
+                                        { AOM_CDF3(24926, 28948) } },
+                                      { { AOM_CDF3(21365, 30026) },
+                                        { AOM_CDF3(30512, 32423) },
+                                        { AOM_CDF3(31658, 32621) },
+                                        { AOM_CDF3(29630, 31881) } } },
+                                    { { { AOM_CDF3(5717, 26477) },
+                                        { AOM_CDF3(30491, 31703) },
+                                        { AOM_CDF3(31550, 32158) },
+                                        { AOM_CDF3(29648, 31491) } },
+                                      { { AOM_CDF3(12608, 27820) },
+                                        { AOM_CDF3(30680, 32225) },
+                                        { AOM_CDF3(30809, 32335) },
+                                        { AOM_CDF3(31299, 32423) } } },
+                                    { { { AOM_CDF3(1786, 12612) },
+                                        { AOM_CDF3(30663, 31625) },
+                                        { AOM_CDF3(32339, 32468) },
+                                        { AOM_CDF3(31148, 31833) } },
+                                      { { AOM_CDF3(18857, 23865) },
+                                        { AOM_CDF3(31428, 32428) },
+                                        { AOM_CDF3(31744, 32373) },
+                                        { AOM_CDF3(31775, 32526) } } },
+                                    { { { AOM_CDF3(1787, 2532) },
+                                        { AOM_CDF3(30832, 31662) },
+                                        { AOM_CDF3(31824, 32682) },
+                                        { AOM_CDF3(32133, 32569) } },
+                                      { { AOM_CDF3(13751, 22235) },
+                                        { AOM_CDF3(32089, 32409) },
+                                        { AOM_CDF3(27084, 27920) },
+                                        { AOM_CDF3(29291, 32594) } } },
+                                    { { { AOM_CDF3(1725, 3449) },
+                                        { AOM_CDF3(31102, 31935) },
+                                        { AOM_CDF3(32457, 32613) },
+                                        { AOM_CDF3(32412, 32649) } },
+                                      { { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) } } } },
+                                  { { { { AOM_CDF3(17560, 29888) },
+                                        { AOM_CDF3(29671, 31549) },
+                                        { AOM_CDF3(31007, 32056) },
+                                        { AOM_CDF3(27286, 30006) } },
+                                      { { AOM_CDF3(26594, 31212) },
+                                        { AOM_CDF3(31208, 32582) },
+                                        { AOM_CDF3(31835, 32637) },
+                                        { AOM_CDF3(30595, 32206) } } },
+                                    { { { AOM_CDF3(15239, 29932) },
+                                        { AOM_CDF3(31315, 32095) },
+                                        { AOM_CDF3(32130, 32434) },
+                                        { AOM_CDF3(30864, 31996) } },
+                                      { { AOM_CDF3(26279, 30968) },
+                                        { AOM_CDF3(31142, 32495) },
+                                        { AOM_CDF3(31713, 32540) },
+                                        { AOM_CDF3(31929, 32594) } } },
+                                    { { { AOM_CDF3(2644, 25198) },
+                                        { AOM_CDF3(32038, 32451) },
+                                        { AOM_CDF3(32639, 32695) },
+                                        { AOM_CDF3(32166, 32518) } },
+                                      { { AOM_CDF3(17187, 27668) },
+                                        { AOM_CDF3(31714, 32550) },
+                                        { AOM_CDF3(32283, 32678) },
+                                        { AOM_CDF3(31930, 32563) } } },
+                                    { { { AOM_CDF3(1044, 2257) },
+                                        { AOM_CDF3(30755, 31923) },
+                                        { AOM_CDF3(32208, 32693) },
+                                        { AOM_CDF3(32244, 32615) } },
+                                      { { AOM_CDF3(21317, 26207) },
+                                        { AOM_CDF3(29133, 30868) },
+                                        { AOM_CDF3(29311, 31231) },
+                                        { AOM_CDF3(29657, 31087) } } },
+                                    { { { AOM_CDF3(478, 1834) },
+                                        { AOM_CDF3(31005, 31987) },
+                                        { AOM_CDF3(32317, 32724) },
+                                        { AOM_CDF3(30865, 32648) } },
+                                      { { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) } } } },
+                                  { { { { AOM_CDF3(20092, 30774) },
+                                        { AOM_CDF3(30695, 32020) },
+                                        { AOM_CDF3(31131, 32103) },
+                                        { AOM_CDF3(28666, 30870) } },
+                                      { { AOM_CDF3(27258, 31095) },
+                                        { AOM_CDF3(31804, 32623) },
+                                        { AOM_CDF3(31763, 32528) },
+                                        { AOM_CDF3(31438, 32506) } } },
+                                    { { { AOM_CDF3(18049, 30489) },
+                                        { AOM_CDF3(31706, 32286) },
+                                        { AOM_CDF3(32163, 32473) },
+                                        { AOM_CDF3(31550, 32184) } },
+                                      { { AOM_CDF3(27116, 30842) },
+                                        { AOM_CDF3(31971, 32598) },
+                                        { AOM_CDF3(32088, 32576) },
+                                        { AOM_CDF3(32067, 32664) } } },
+                                    { { { AOM_CDF3(12854, 29093) },
+                                        { AOM_CDF3(32272, 32558) },
+                                        { AOM_CDF3(32667, 32729) },
+                                        { AOM_CDF3(32306, 32585) } },
+                                      { { AOM_CDF3(25476, 30366) },
+                                        { AOM_CDF3(32169, 32687) },
+                                        { AOM_CDF3(32479, 32689) },
+                                        { AOM_CDF3(31673, 32634) } } },
+                                    { { { AOM_CDF3(2809, 19301) },
+                                        { AOM_CDF3(32205, 32622) },
+                                        { AOM_CDF3(32338, 32730) },
+                                        { AOM_CDF3(31786, 32616) } },
+                                      { { AOM_CDF3(22737, 29105) },
+                                        { AOM_CDF3(30810, 32362) },
+                                        { AOM_CDF3(30014, 32627) },
+                                        { AOM_CDF3(30528, 32574) } } },
+                                    { { { AOM_CDF3(935, 3382) },
+                                        { AOM_CDF3(30789, 31909) },
+                                        { AOM_CDF3(32466, 32756) },
+                                        { AOM_CDF3(30860, 32513) } },
+                                      { { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) } } } },
+                                  { { { { AOM_CDF3(22497, 31198) },
+                                        { AOM_CDF3(31715, 32495) },
+                                        { AOM_CDF3(31606, 32337) },
+                                        { AOM_CDF3(30388, 31990) } },
+                                      { { AOM_CDF3(27877, 31584) },
+                                        { AOM_CDF3(32170, 32728) },
+                                        { AOM_CDF3(32155, 32688) },
+                                        { AOM_CDF3(32219, 32702) } } },
+                                    { { { AOM_CDF3(21457, 31043) },
+                                        { AOM_CDF3(31951, 32483) },
+                                        { AOM_CDF3(32153, 32562) },
+                                        { AOM_CDF3(31473, 32215) } },
+                                      { { AOM_CDF3(27558, 31151) },
+                                        { AOM_CDF3(32020, 32640) },
+                                        { AOM_CDF3(32097, 32575) },
+                                        { AOM_CDF3(32242, 32719) } } },
+                                    { { { AOM_CDF3(19980, 30591) },
+                                        { AOM_CDF3(32219, 32597) },
+                                        { AOM_CDF3(32581, 32706) },
+                                        { AOM_CDF3(31803, 32287) } },
+                                      { { AOM_CDF3(26473, 30507) },
+                                        { AOM_CDF3(32431, 32723) },
+                                        { AOM_CDF3(32196, 32611) },
+                                        { AOM_CDF3(31588, 32528) } } },
+                                    { { { AOM_CDF3(24647, 30463) },
+                                        { AOM_CDF3(32412, 32695) },
+                                        { AOM_CDF3(32468, 32720) },
+                                        { AOM_CDF3(31269, 32523) } },
+                                      { { AOM_CDF3(28482, 31505) },
+                                        { AOM_CDF3(32152, 32701) },
+                                        { AOM_CDF3(31732, 32598) },
+                                        { AOM_CDF3(31767, 32712) } } },
+                                    { { { AOM_CDF3(12358, 24977) },
+                                        { AOM_CDF3(31331, 32385) },
+                                        { AOM_CDF3(32634, 32756) },
+                                        { AOM_CDF3(30411, 32548) } },
+                                      { { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) },
+                                        { AOM_CDF3(10923, 21845) } } } } };
+
+#endif  // AOM_AV1_COMMON_TOKEN_CDFS_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.c
new file mode 100644
index 0000000000..263d3eaf40
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.c
@@ -0,0 +1,458 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.h"
+
+const int8_t av1_coeff_band_4x4[16] = { 0, 1, 2,  3,  4,  5,  6,  7,
+                                        8, 9, 10, 11, 12, 13, 14, 15 };
+
+const int8_t av1_coeff_band_8x8[64] = {
+  0,  1,  2,  2,  3,  3,  4,  4,  5,  6,  2,  2,  3,  3,  4,  4,
+  7,  7,  8,  8,  9,  9,  10, 10, 7,  7,  8,  8,  9,  9,  10, 10,
+  11, 11, 12, 12, 13, 13, 14, 14, 11, 11, 12, 12, 13, 13, 14, 14,
+  15, 15, 16, 16, 17, 17, 18, 18, 15, 15, 16, 16, 17, 17, 18, 18,
+};
+
+const int8_t av1_coeff_band_16x16[256] = {
+  0,  1,  4,  4,  7,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9,  2,  3,  4,
+  4,  7,  7,  7,  7,  8,  8,  8,  8,  9,  9,  9,  9,  5,  5,  6,  6,  7,  7,
+  7,  7,  8,  8,  8,  8,  9,  9,  9,  9,  5,  5,  6,  6,  7,  7,  7,  7,  8,
+  8,  8,  8,  9,  9,  9,  9,  10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12,
+  13, 13, 13, 13, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13,
+  13, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 10, 10,
+  10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15,
+  15, 15, 15, 16, 16, 16, 16, 17, 17, 17, 17, 14, 14, 14, 14, 15, 15, 15, 15,
+  16, 16, 16, 16, 17, 17, 17, 17, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16,
+  16, 17, 17, 17, 17, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 17, 17,
+  17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 18,
+  18, 18, 18, 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 18, 18, 18, 18,
+  19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 18, 18, 18, 18, 19, 19, 19,
+  19, 20, 20, 20, 20, 21, 21, 21, 21,
+};
+
+const int8_t av1_coeff_band_32x32[1024] = {
+  0,  1,  4,  4,  7,  7,  7,  7,  10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11,
+  11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 2,  3,  4,  4,  7,  7,
+  7,  7,  10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 12,
+  12, 12, 12, 12, 12, 12, 12, 5,  5,  6,  6,  7,  7,  7,  7,  10, 10, 10, 10,
+  10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12,
+  12, 5,  5,  6,  6,  7,  7,  7,  7,  10, 10, 10, 10, 10, 10, 10, 10, 11, 11,
+  11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 8,  8,  8,  8,  9,
+  9,  9,  9,  10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11,
+  12, 12, 12, 12, 12, 12, 12, 12, 8,  8,  8,  8,  9,  9,  9,  9,  10, 10, 10,
+  10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12,
+  12, 12, 8,  8,  8,  8,  9,  9,  9,  9,  10, 10, 10, 10, 10, 10, 10, 10, 11,
+  11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 8,  8,  8,  8,
+  9,  9,  9,  9,  10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11,
+  11, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14,
+  14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16,
+  16, 16, 16, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14,
+  15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 13, 13, 13,
+  13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15,
+  15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 13, 13, 13, 13, 13, 13, 13, 13, 14,
+  14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16,
+  16, 16, 16, 16, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14,
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 13, 13,
+  13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15,
+  15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 13, 13, 13, 13, 13, 13, 13, 13,
+  14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16,
+  16, 16, 16, 16, 16, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14,
+  14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17,
+  17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+  19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 17, 17, 17, 17, 17, 17, 17,
+  17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20,
+  20, 20, 20, 20, 20, 20, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18,
+  18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20,
+  17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19,
+  19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 17, 17, 17, 17, 17, 17,
+  17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20,
+  20, 20, 20, 20, 20, 20, 20, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18,
+  18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20,
+  20, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19,
+  19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 17, 17, 17, 17, 17,
+  17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19,
+  20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22,
+  22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24,
+  24, 24, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23,
+  23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 21, 21, 21, 21,
+  21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23,
+  23, 24, 24, 24, 24, 24, 24, 24, 24, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22,
+  22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24,
+  24, 24, 24, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+  23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 21, 21, 21,
+  21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23,
+  23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 21, 21, 21, 21, 21, 21, 21, 21, 22,
+  22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24,
+  24, 24, 24, 24, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22,
+  22, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24,
+};
+
+// The ctx offset table when TX is TX_CLASS_2D.
+// TX col and row indices are clamped to 4
+
+const int8_t av1_nz_map_ctx_offset_4x4[16] = {
+  0, 1, 6, 6, 1, 6, 6, 21, 6, 6, 21, 21, 6, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_8x8[64] = {
+  0,  1,  6,  6,  21, 21, 21, 21, 1,  6,  6,  21, 21, 21, 21, 21,
+  6,  6,  21, 21, 21, 21, 21, 21, 6,  21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_16x16[256] = {
+  0,  1,  6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 1,  6,  6,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 6,  6,  21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 6,  21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_32x32[1024] = {
+  0,  1,  6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 1,  6,  6,  21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_8x4[32] = {
+  0,  16, 6,  6,  21, 21, 21, 21, 16, 16, 6,  21, 21, 21, 21, 21,
+  16, 16, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_8x16[128] = {
+  0,  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 6,  6,  21,
+  21, 21, 21, 21, 21, 6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_16x8[128] = {
+  0,  16, 6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 6,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_16x32[512] = {
+  0,  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 6,  6,  21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 6,  21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_32x16[512] = {
+  0,  16, 6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 6,  21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_32x64[1024] = {
+  0,  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+  11, 11, 11, 11, 11, 11, 11, 6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_64x32[1024] = {
+  0,  16, 6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 6,  21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16,
+  16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_4x16[64] = {
+  0,  11, 11, 11, 11, 11, 11, 11, 6,  6,  21, 21, 6,  21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_16x4[64] = {
+  0,  16, 6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  16, 16, 6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_8x32[256] = {
+  0,  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 6,  6,  21,
+  21, 21, 21, 21, 21, 6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t av1_nz_map_ctx_offset_32x8[256] = {
+  0,  16, 6,  6,  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 6,  21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 16, 16, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 16, 16, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+  21, 21, 21, 21, 21, 21, 21, 21, 21,
+};
+
+const int8_t *av1_nz_map_ctx_offset[19] = {
+  av1_nz_map_ctx_offset_4x4,    // TX_4x4
+  av1_nz_map_ctx_offset_8x8,    // TX_8x8
+  av1_nz_map_ctx_offset_16x16,  // TX_16x16
+  av1_nz_map_ctx_offset_32x32,  // TX_32x32
+  av1_nz_map_ctx_offset_32x32,  // TX_32x32
+  av1_nz_map_ctx_offset_4x16,   // TX_4x8
+  av1_nz_map_ctx_offset_8x4,    // TX_8x4
+  av1_nz_map_ctx_offset_8x32,   // TX_8x16
+  av1_nz_map_ctx_offset_16x8,   // TX_16x8
+  av1_nz_map_ctx_offset_16x32,  // TX_16x32
+  av1_nz_map_ctx_offset_32x16,  // TX_32x16
+  av1_nz_map_ctx_offset_32x64,  // TX_32x64
+  av1_nz_map_ctx_offset_64x32,  // TX_64x32
+  av1_nz_map_ctx_offset_4x16,   // TX_4x16
+  av1_nz_map_ctx_offset_16x4,   // TX_16x4
+  av1_nz_map_ctx_offset_8x32,   // TX_8x32
+  av1_nz_map_ctx_offset_32x8,   // TX_32x8
+  av1_nz_map_ctx_offset_16x32,  // TX_16x64
+  av1_nz_map_ctx_offset_64x32,  // TX_64x16
+};
+
+const int16_t av1_eob_group_start[12] = { 0,  1,  2,  3,   5,   9,
+                                          17, 33, 65, 129, 257, 513 };
+const int16_t av1_eob_offset_bits[12] = { 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.h
new file mode 100644
index 0000000000..cfa49fd04c
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.h
@@ -0,0 +1,442 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_TXB_COMMON_H_
+#define AOM_AV1_COMMON_TXB_COMMON_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+
+extern const int16_t av1_eob_group_start[12];
+extern const int16_t av1_eob_offset_bits[12];
+
+extern const int8_t av1_coeff_band_4x4[16];
+
+extern const int8_t av1_coeff_band_8x8[64];
+
+extern const int8_t av1_coeff_band_16x16[256];
+
+extern const int8_t av1_coeff_band_32x32[1024];
+
+extern const int8_t *av1_nz_map_ctx_offset[TX_SIZES_ALL];
+
+typedef struct txb_ctx {
+  int txb_skip_ctx;
+  int dc_sign_ctx;
+} TXB_CTX;
+
+static const int base_level_count_to_index[13] = {
+  0, 0, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
+};
+
+static const TX_CLASS tx_type_to_class[TX_TYPES] = {
+  TX_CLASS_2D,     // DCT_DCT
+  TX_CLASS_2D,     // ADST_DCT
+  TX_CLASS_2D,     // DCT_ADST
+  TX_CLASS_2D,     // ADST_ADST
+  TX_CLASS_2D,     // FLIPADST_DCT
+  TX_CLASS_2D,     // DCT_FLIPADST
+  TX_CLASS_2D,     // FLIPADST_FLIPADST
+  TX_CLASS_2D,     // ADST_FLIPADST
+  TX_CLASS_2D,     // FLIPADST_ADST
+  TX_CLASS_2D,     // IDTX
+  TX_CLASS_VERT,   // V_DCT
+  TX_CLASS_HORIZ,  // H_DCT
+  TX_CLASS_VERT,   // V_ADST
+  TX_CLASS_HORIZ,  // H_ADST
+  TX_CLASS_VERT,   // V_FLIPADST
+  TX_CLASS_HORIZ,  // H_FLIPADST
+};
+
+static INLINE int get_txb_bwl(TX_SIZE tx_size) {
+  tx_size = av1_get_adjusted_tx_size(tx_size);
+  return tx_size_wide_log2[tx_size];
+}
+
+static INLINE int get_txb_wide(TX_SIZE tx_size) {
+  tx_size = av1_get_adjusted_tx_size(tx_size);
+  return tx_size_wide[tx_size];
+}
+
+static INLINE int get_txb_high(TX_SIZE tx_size) {
+  tx_size = av1_get_adjusted_tx_size(tx_size);
+  return tx_size_high[tx_size];
+}
+
+static INLINE uint8_t *set_levels(uint8_t *const levels_buf, const int width) {
+  return levels_buf + TX_PAD_TOP * (width + TX_PAD_HOR);
+}
+
+static INLINE int get_padded_idx(const int idx, const int bwl) {
+  return idx + ((idx >> bwl) << TX_PAD_HOR_LOG2);
+}
+
+static INLINE int get_base_ctx_from_count_mag(int row, int col, int count,
+                                              int sig_mag) {
+  const int ctx = base_level_count_to_index[count];
+  int ctx_idx = -1;
+
+  if (row == 0 && col == 0) {
+    if (sig_mag >= 2) return ctx_idx = 0;
+    if (sig_mag == 1) {
+      if (count >= 2)
+        ctx_idx = 1;
+      else
+        ctx_idx = 2;
+
+      return ctx_idx;
+    }
+
+    ctx_idx = 3 + ctx;
+    assert(ctx_idx <= 6);
+    return ctx_idx;
+  } else if (row == 0) {
+    if (sig_mag >= 2) return ctx_idx = 6;
+    if (sig_mag == 1) {
+      if (count >= 2)
+        ctx_idx = 7;
+      else
+        ctx_idx = 8;
+      return ctx_idx;
+    }
+
+    ctx_idx = 9 + ctx;
+    assert(ctx_idx <= 11);
+    return ctx_idx;
+  } else if (col == 0) {
+    if (sig_mag >= 2) return ctx_idx = 12;
+    if (sig_mag == 1) {
+      if (count >= 2)
+        ctx_idx = 13;
+      else
+        ctx_idx = 14;
+
+      return ctx_idx;
+    }
+
+    ctx_idx = 15 + ctx;
+    assert(ctx_idx <= 17);
+    // TODO(angiebird): turn this on once the optimization is finalized
+    // assert(ctx_idx < 28);
+  } else {
+    if (sig_mag >= 2) return ctx_idx = 18;
+    if (sig_mag == 1) {
+      if (count >= 2)
+        ctx_idx = 19;
+      else
+        ctx_idx = 20;
+      return ctx_idx;
+    }
+
+    ctx_idx = 21 + ctx;
+
+    assert(ctx_idx <= 24);
+  }
+  return ctx_idx;
+}
+
+static INLINE int get_br_ctx_2d(const uint8_t *const levels,
+                                const int c,  // raster order
+                                const int bwl) {
+  assert(c > 0);
+  const int row = c >> bwl;
+  const int col = c - (row << bwl);
+  const int stride = (1 << bwl) + TX_PAD_HOR;
+  const int pos = row * stride + col;
+  int mag = AOMMIN(levels[pos + 1], MAX_BASE_BR_RANGE) +
+            AOMMIN(levels[pos + stride], MAX_BASE_BR_RANGE) +
+            AOMMIN(levels[pos + 1 + stride], MAX_BASE_BR_RANGE);
+  mag = AOMMIN((mag + 1) >> 1, 6);
+  //((row | col) < 2) is equivalent to ((row < 2) && (col < 2))
+  if ((row | col) < 2) return mag + 7;
+  return mag + 14;
+}
+
+static AOM_FORCE_INLINE int get_br_ctx_eob(const int c,  // raster order
+                                           const int bwl,
+                                           const TX_CLASS tx_class) {
+  const int row = c >> bwl;
+  const int col = c - (row << bwl);
+  if (c == 0) return 0;
+  if ((tx_class == TX_CLASS_2D && row < 2 && col < 2) ||
+      (tx_class == TX_CLASS_HORIZ && col == 0) ||
+      (tx_class == TX_CLASS_VERT && row == 0))
+    return 7;
+  return 14;
+}
+
+static AOM_FORCE_INLINE int get_br_ctx(const uint8_t *const levels,
+                                       const int c,  // raster order
+                                       const int bwl, const TX_CLASS tx_class) {
+  const int row = c >> bwl;
+  const int col = c - (row << bwl);
+  const int stride = (1 << bwl) + TX_PAD_HOR;
+  const int pos = row * stride + col;
+  int mag = levels[pos + 1];
+  mag += levels[pos + stride];
+  switch (tx_class) {
+    case TX_CLASS_2D:
+      mag += levels[pos + stride + 1];
+      mag = AOMMIN((mag + 1) >> 1, 6);
+      if (c == 0) return mag;
+      if ((row < 2) && (col < 2)) return mag + 7;
+      break;
+    case TX_CLASS_HORIZ:
+      mag += levels[pos + 2];
+      mag = AOMMIN((mag + 1) >> 1, 6);
+      if (c == 0) return mag;
+      if (col == 0) return mag + 7;
+      break;
+    case TX_CLASS_VERT:
+      mag += levels[pos + (stride << 1)];
+      mag = AOMMIN((mag + 1) >> 1, 6);
+      if (c == 0) return mag;
+      if (row == 0) return mag + 7;
+      break;
+    default: break;
+  }
+
+  return mag + 14;
+}
+
+static const uint8_t clip_max3[256] = {
+  0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+};
+
+static AOM_FORCE_INLINE int get_nz_mag(const uint8_t *const levels,
+                                       const int bwl, const TX_CLASS tx_class) {
+  int mag;
+
+  // Note: AOMMIN(level, 3) is useless for decoder since level < 3.
+  mag = clip_max3[levels[1]];                         // { 0, 1 }
+  mag += clip_max3[levels[(1 << bwl) + TX_PAD_HOR]];  // { 1, 0 }
+
+  if (tx_class == TX_CLASS_2D) {
+    mag += clip_max3[levels[(1 << bwl) + TX_PAD_HOR + 1]];          // { 1, 1 }
+    mag += clip_max3[levels[2]];                                    // { 0, 2 }
+    mag += clip_max3[levels[(2 << bwl) + (2 << TX_PAD_HOR_LOG2)]];  // { 2, 0 }
+  } else if (tx_class == TX_CLASS_VERT) {
+    mag += clip_max3[levels[(2 << bwl) + (2 << TX_PAD_HOR_LOG2)]];  // { 2, 0 }
+    mag += clip_max3[levels[(3 << bwl) + (3 << TX_PAD_HOR_LOG2)]];  // { 3, 0 }
+    mag += clip_max3[levels[(4 << bwl) + (4 << TX_PAD_HOR_LOG2)]];  // { 4, 0 }
+  } else {
+    mag += clip_max3[levels[2]];  // { 0, 2 }
+    mag += clip_max3[levels[3]];  // { 0, 3 }
+    mag += clip_max3[levels[4]];  // { 0, 4 }
+  }
+
+  return mag;
+}
+
+#define NZ_MAP_CTX_0 SIG_COEF_CONTEXTS_2D
+#define NZ_MAP_CTX_5 (NZ_MAP_CTX_0 + 5)
+#define NZ_MAP_CTX_10 (NZ_MAP_CTX_0 + 10)
+
+static const int nz_map_ctx_offset_1d[32] = {
+  NZ_MAP_CTX_0,  NZ_MAP_CTX_5,  NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10,
+  NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10,
+  NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10,
+  NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10,
+  NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10,
+  NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10, NZ_MAP_CTX_10,
+  NZ_MAP_CTX_10, NZ_MAP_CTX_10,
+};
+
+static AOM_FORCE_INLINE int get_nz_map_ctx_from_stats(
+    const int stats,
+    const int coeff_idx,  // raster order
+    const int bwl, const TX_SIZE tx_size, const TX_CLASS tx_class) {
+  // tx_class == 0(TX_CLASS_2D)
+  if ((tx_class | coeff_idx) == 0) return 0;
+  int ctx = (stats + 1) >> 1;
+  ctx = AOMMIN(ctx, 4);
+  switch (tx_class) {
+    case TX_CLASS_2D: {
+      // This is the algorithm to generate av1_nz_map_ctx_offset[][]
+      //   const int width = tx_size_wide[tx_size];
+      //   const int height = tx_size_high[tx_size];
+      //   if (width < height) {
+      //     if (row < 2) return 11 + ctx;
+      //   } else if (width > height) {
+      //     if (col < 2) return 16 + ctx;
+      //   }
+      //   if (row + col < 2) return ctx + 1;
+      //   if (row + col < 4) return 5 + ctx + 1;
+      //   return 21 + ctx;
+      return ctx + av1_nz_map_ctx_offset[tx_size][coeff_idx];
+    }
+    case TX_CLASS_HORIZ: {
+      const int row = coeff_idx >> bwl;
+      const int col = coeff_idx - (row << bwl);
+      return ctx + nz_map_ctx_offset_1d[col];
+    }
+    case TX_CLASS_VERT: {
+      const int row = coeff_idx >> bwl;
+      return ctx + nz_map_ctx_offset_1d[row];
+    }
+    default: break;
+  }
+  return 0;
+}
+
+typedef aom_cdf_prob (*base_cdf_arr)[CDF_SIZE(4)];
+typedef aom_cdf_prob (*br_cdf_arr)[CDF_SIZE(BR_CDF_SIZE)];
+
+static INLINE int get_lower_levels_ctx_eob(int bwl, int height, int scan_idx) {
+  if (scan_idx == 0) return 0;
+  if (scan_idx <= (height << bwl) / 8) return 1;
+  if (scan_idx <= (height << bwl) / 4) return 2;
+  return 3;
+}
+
+static INLINE int get_lower_levels_ctx_2d(const uint8_t *levels, int coeff_idx,
+                                          int bwl, TX_SIZE tx_size) {
+  assert(coeff_idx > 0);
+  int mag;
+  // Note: AOMMIN(level, 3) is useless for decoder since level < 3.
+  levels = levels + get_padded_idx(coeff_idx, bwl);
+  mag = AOMMIN(levels[1], 3);                                     // { 0, 1 }
+  mag += AOMMIN(levels[(1 << bwl) + TX_PAD_HOR], 3);              // { 1, 0 }
+  mag += AOMMIN(levels[(1 << bwl) + TX_PAD_HOR + 1], 3);          // { 1, 1 }
+  mag += AOMMIN(levels[2], 3);                                    // { 0, 2 }
+  mag += AOMMIN(levels[(2 << bwl) + (2 << TX_PAD_HOR_LOG2)], 3);  // { 2, 0 }
+
+  const int ctx = AOMMIN((mag + 1) >> 1, 4);
+  return ctx + av1_nz_map_ctx_offset[tx_size][coeff_idx];
+}
+static AOM_FORCE_INLINE int get_lower_levels_ctx(const uint8_t *levels,
+                                                 int coeff_idx, int bwl,
+                                                 TX_SIZE tx_size,
+                                                 TX_CLASS tx_class) {
+  const int stats =
+      get_nz_mag(levels + get_padded_idx(coeff_idx, bwl), bwl, tx_class);
+  return get_nz_map_ctx_from_stats(stats, coeff_idx, bwl, tx_size, tx_class);
+}
+
+static INLINE int get_lower_levels_ctx_general(int is_last, int scan_idx,
+                                               int bwl, int height,
+                                               const uint8_t *levels,
+                                               int coeff_idx, TX_SIZE tx_size,
+                                               TX_CLASS tx_class) {
+  if (is_last) {
+    if (scan_idx == 0) return 0;
+    if (scan_idx <= (height << bwl) >> 3) return 1;
+    if (scan_idx <= (height << bwl) >> 2) return 2;
+    return 3;
+  }
+  return get_lower_levels_ctx(levels, coeff_idx, bwl, tx_size, tx_class);
+}
+
+static INLINE void set_dc_sign(int *cul_level, int dc_val) {
+  if (dc_val < 0)
+    *cul_level |= 1 << COEFF_CONTEXT_BITS;
+  else if (dc_val > 0)
+    *cul_level += 2 << COEFF_CONTEXT_BITS;
+}
+
+static INLINE void get_txb_ctx(const BLOCK_SIZE plane_bsize,
+                               const TX_SIZE tx_size, const int plane,
+                               const ENTROPY_CONTEXT *const a,
+                               const ENTROPY_CONTEXT *const l,
+                               TXB_CTX *const txb_ctx) {
+#define MAX_TX_SIZE_UNIT 16
+  static const int8_t signs[3] = { 0, -1, 1 };
+  static const int8_t dc_sign_contexts[4 * MAX_TX_SIZE_UNIT + 1] = {
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+  };
+  const int txb_w_unit = tx_size_wide_unit[tx_size];
+  const int txb_h_unit = tx_size_high_unit[tx_size];
+  int dc_sign = 0;
+  int k = 0;
+
+  do {
+    const unsigned int sign = ((uint8_t)a[k]) >> COEFF_CONTEXT_BITS;
+    assert(sign <= 2);
+    dc_sign += signs[sign];
+  } while (++k < txb_w_unit);
+
+  k = 0;
+  do {
+    const unsigned int sign = ((uint8_t)l[k]) >> COEFF_CONTEXT_BITS;
+    assert(sign <= 2);
+    dc_sign += signs[sign];
+  } while (++k < txb_h_unit);
+
+  txb_ctx->dc_sign_ctx = dc_sign_contexts[dc_sign + 2 * MAX_TX_SIZE_UNIT];
+
+  if (plane == 0) {
+    if (plane_bsize == txsize_to_bsize[tx_size]) {
+      txb_ctx->txb_skip_ctx = 0;
+    } else {
+      // This is the algorithm to generate table skip_contexts[top][left].
+      //    const int max = AOMMIN(top | left, 4);
+      //    const int min = AOMMIN(AOMMIN(top, left), 4);
+      //    if (!max)
+      //      txb_skip_ctx = 1;
+      //    else if (!min)
+      //      txb_skip_ctx = 2 + (max > 3);
+      //    else if (max <= 3)
+      //      txb_skip_ctx = 4;
+      //    else if (min <= 3)
+      //      txb_skip_ctx = 5;
+      //    else
+      //      txb_skip_ctx = 6;
+      static const uint8_t skip_contexts[5][5] = { { 1, 2, 2, 2, 3 },
+                                                   { 2, 4, 4, 4, 5 },
+                                                   { 2, 4, 4, 4, 5 },
+                                                   { 2, 4, 4, 4, 5 },
+                                                   { 3, 5, 5, 5, 6 } };
+      // For top and left, we only care about which of the following three
+      // categories they belong to: { 0 }, { 1, 2, 3 }, or { 4, 5, ... }. The
+      // spec calculates top and left with the Max() function. We can calculate
+      // an approximate max with bitwise OR because the real max and the
+      // approximate max belong to the same category.
+      int top = 0;
+      int left = 0;
+
+      k = 0;
+      do {
+        top |= a[k];
+      } while (++k < txb_w_unit);
+      top &= COEFF_CONTEXT_MASK;
+      top = AOMMIN(top, 4);
+
+      k = 0;
+      do {
+        left |= l[k];
+      } while (++k < txb_h_unit);
+      left &= COEFF_CONTEXT_MASK;
+      left = AOMMIN(left, 4);
+
+      txb_ctx->txb_skip_ctx = skip_contexts[top][left];
+    }
+  } else {
+    const int ctx_base = get_entropy_context(tx_size, a, l);
+    const int ctx_offset = (num_pels_log2_lookup[plane_bsize] >
+                            num_pels_log2_lookup[txsize_to_bsize[tx_size]])
+                               ? 10
+                               : 7;
+    txb_ctx->txb_skip_ctx = ctx_base + ctx_offset;
+  }
+#undef MAX_TX_SIZE_UNIT
+}
+
+#endif  // AOM_AV1_COMMON_TXB_COMMON_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.c b/pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.c
new file mode 100644
index 0000000000..c83ebb14ce
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.c
@@ -0,0 +1,1073 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <math.h>
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/scale.h"
+
+// For warping, we really use a 6-tap filter, but we do blocks of 8 pixels
+// at a time. The zoom/rotation/shear in the model are applied to the
+// "fractional" position of each pixel, which therefore varies within
+// [-1, 2) * WARPEDPIXEL_PREC_SHIFTS.
+// We need an extra 2 taps to fit this in, for a total of 8 taps.
+/* clang-format off */
+const int16_t av1_warped_filter[WARPEDPIXEL_PREC_SHIFTS * 3 + 1][8] = {
+#if WARPEDPIXEL_PREC_BITS == 6
+  // [-1, 0)
+  { 0,   0, 127,   1,   0, 0, 0, 0 }, { 0, - 1, 127,   2,   0, 0, 0, 0 },
+  { 1, - 3, 127,   4, - 1, 0, 0, 0 }, { 1, - 4, 126,   6, - 2, 1, 0, 0 },
+  { 1, - 5, 126,   8, - 3, 1, 0, 0 }, { 1, - 6, 125,  11, - 4, 1, 0, 0 },
+  { 1, - 7, 124,  13, - 4, 1, 0, 0 }, { 2, - 8, 123,  15, - 5, 1, 0, 0 },
+  { 2, - 9, 122,  18, - 6, 1, 0, 0 }, { 2, -10, 121,  20, - 6, 1, 0, 0 },
+  { 2, -11, 120,  22, - 7, 2, 0, 0 }, { 2, -12, 119,  25, - 8, 2, 0, 0 },
+  { 3, -13, 117,  27, - 8, 2, 0, 0 }, { 3, -13, 116,  29, - 9, 2, 0, 0 },
+  { 3, -14, 114,  32, -10, 3, 0, 0 }, { 3, -15, 113,  35, -10, 2, 0, 0 },
+  { 3, -15, 111,  37, -11, 3, 0, 0 }, { 3, -16, 109,  40, -11, 3, 0, 0 },
+  { 3, -16, 108,  42, -12, 3, 0, 0 }, { 4, -17, 106,  45, -13, 3, 0, 0 },
+  { 4, -17, 104,  47, -13, 3, 0, 0 }, { 4, -17, 102,  50, -14, 3, 0, 0 },
+  { 4, -17, 100,  52, -14, 3, 0, 0 }, { 4, -18,  98,  55, -15, 4, 0, 0 },
+  { 4, -18,  96,  58, -15, 3, 0, 0 }, { 4, -18,  94,  60, -16, 4, 0, 0 },
+  { 4, -18,  91,  63, -16, 4, 0, 0 }, { 4, -18,  89,  65, -16, 4, 0, 0 },
+  { 4, -18,  87,  68, -17, 4, 0, 0 }, { 4, -18,  85,  70, -17, 4, 0, 0 },
+  { 4, -18,  82,  73, -17, 4, 0, 0 }, { 4, -18,  80,  75, -17, 4, 0, 0 },
+  { 4, -18,  78,  78, -18, 4, 0, 0 }, { 4, -17,  75,  80, -18, 4, 0, 0 },
+  { 4, -17,  73,  82, -18, 4, 0, 0 }, { 4, -17,  70,  85, -18, 4, 0, 0 },
+  { 4, -17,  68,  87, -18, 4, 0, 0 }, { 4, -16,  65,  89, -18, 4, 0, 0 },
+  { 4, -16,  63,  91, -18, 4, 0, 0 }, { 4, -16,  60,  94, -18, 4, 0, 0 },
+  { 3, -15,  58,  96, -18, 4, 0, 0 }, { 4, -15,  55,  98, -18, 4, 0, 0 },
+  { 3, -14,  52, 100, -17, 4, 0, 0 }, { 3, -14,  50, 102, -17, 4, 0, 0 },
+  { 3, -13,  47, 104, -17, 4, 0, 0 }, { 3, -13,  45, 106, -17, 4, 0, 0 },
+  { 3, -12,  42, 108, -16, 3, 0, 0 }, { 3, -11,  40, 109, -16, 3, 0, 0 },
+  { 3, -11,  37, 111, -15, 3, 0, 0 }, { 2, -10,  35, 113, -15, 3, 0, 0 },
+  { 3, -10,  32, 114, -14, 3, 0, 0 }, { 2, - 9,  29, 116, -13, 3, 0, 0 },
+  { 2, - 8,  27, 117, -13, 3, 0, 0 }, { 2, - 8,  25, 119, -12, 2, 0, 0 },
+  { 2, - 7,  22, 120, -11, 2, 0, 0 }, { 1, - 6,  20, 121, -10, 2, 0, 0 },
+  { 1, - 6,  18, 122, - 9, 2, 0, 0 }, { 1, - 5,  15, 123, - 8, 2, 0, 0 },
+  { 1, - 4,  13, 124, - 7, 1, 0, 0 }, { 1, - 4,  11, 125, - 6, 1, 0, 0 },
+  { 1, - 3,   8, 126, - 5, 1, 0, 0 }, { 1, - 2,   6, 126, - 4, 1, 0, 0 },
+  { 0, - 1,   4, 127, - 3, 1, 0, 0 }, { 0,   0,   2, 127, - 1, 0, 0, 0 },
+
+  // [0, 1)
+  { 0,  0,   0, 127,   1,   0,  0,  0}, { 0,  0,  -1, 127,   2,   0,  0,  0},
+  { 0,  1,  -3, 127,   4,  -2,  1,  0}, { 0,  1,  -5, 127,   6,  -2,  1,  0},
+  { 0,  2,  -6, 126,   8,  -3,  1,  0}, {-1,  2,  -7, 126,  11,  -4,  2, -1},
+  {-1,  3,  -8, 125,  13,  -5,  2, -1}, {-1,  3, -10, 124,  16,  -6,  3, -1},
+  {-1,  4, -11, 123,  18,  -7,  3, -1}, {-1,  4, -12, 122,  20,  -7,  3, -1},
+  {-1,  4, -13, 121,  23,  -8,  3, -1}, {-2,  5, -14, 120,  25,  -9,  4, -1},
+  {-1,  5, -15, 119,  27, -10,  4, -1}, {-1,  5, -16, 118,  30, -11,  4, -1},
+  {-2,  6, -17, 116,  33, -12,  5, -1}, {-2,  6, -17, 114,  35, -12,  5, -1},
+  {-2,  6, -18, 113,  38, -13,  5, -1}, {-2,  7, -19, 111,  41, -14,  6, -2},
+  {-2,  7, -19, 110,  43, -15,  6, -2}, {-2,  7, -20, 108,  46, -15,  6, -2},
+  {-2,  7, -20, 106,  49, -16,  6, -2}, {-2,  7, -21, 104,  51, -16,  7, -2},
+  {-2,  7, -21, 102,  54, -17,  7, -2}, {-2,  8, -21, 100,  56, -18,  7, -2},
+  {-2,  8, -22,  98,  59, -18,  7, -2}, {-2,  8, -22,  96,  62, -19,  7, -2},
+  {-2,  8, -22,  94,  64, -19,  7, -2}, {-2,  8, -22,  91,  67, -20,  8, -2},
+  {-2,  8, -22,  89,  69, -20,  8, -2}, {-2,  8, -22,  87,  72, -21,  8, -2},
+  {-2,  8, -21,  84,  74, -21,  8, -2}, {-2,  8, -22,  82,  77, -21,  8, -2},
+  {-2,  8, -21,  79,  79, -21,  8, -2}, {-2,  8, -21,  77,  82, -22,  8, -2},
+  {-2,  8, -21,  74,  84, -21,  8, -2}, {-2,  8, -21,  72,  87, -22,  8, -2},
+  {-2,  8, -20,  69,  89, -22,  8, -2}, {-2,  8, -20,  67,  91, -22,  8, -2},
+  {-2,  7, -19,  64,  94, -22,  8, -2}, {-2,  7, -19,  62,  96, -22,  8, -2},
+  {-2,  7, -18,  59,  98, -22,  8, -2}, {-2,  7, -18,  56, 100, -21,  8, -2},
+  {-2,  7, -17,  54, 102, -21,  7, -2}, {-2,  7, -16,  51, 104, -21,  7, -2},
+  {-2,  6, -16,  49, 106, -20,  7, -2}, {-2,  6, -15,  46, 108, -20,  7, -2},
+  {-2,  6, -15,  43, 110, -19,  7, -2}, {-2,  6, -14,  41, 111, -19,  7, -2},
+  {-1,  5, -13,  38, 113, -18,  6, -2}, {-1,  5, -12,  35, 114, -17,  6, -2},
+  {-1,  5, -12,  33, 116, -17,  6, -2}, {-1,  4, -11,  30, 118, -16,  5, -1},
+  {-1,  4, -10,  27, 119, -15,  5, -1}, {-1,  4,  -9,  25, 120, -14,  5, -2},
+  {-1,  3,  -8,  23, 121, -13,  4, -1}, {-1,  3,  -7,  20, 122, -12,  4, -1},
+  {-1,  3,  -7,  18, 123, -11,  4, -1}, {-1,  3,  -6,  16, 124, -10,  3, -1},
+  {-1,  2,  -5,  13, 125,  -8,  3, -1}, {-1,  2,  -4,  11, 126,  -7,  2, -1},
+  { 0,  1,  -3,   8, 126,  -6,  2,  0}, { 0,  1,  -2,   6, 127,  -5,  1,  0},
+  { 0,  1,  -2,   4, 127,  -3,  1,  0}, { 0,  0,   0,   2, 127,  -1,  0,  0},
+
+  // [1, 2)
+  { 0, 0, 0,   1, 127,   0,   0, 0 }, { 0, 0, 0, - 1, 127,   2,   0, 0 },
+  { 0, 0, 1, - 3, 127,   4, - 1, 0 }, { 0, 0, 1, - 4, 126,   6, - 2, 1 },
+  { 0, 0, 1, - 5, 126,   8, - 3, 1 }, { 0, 0, 1, - 6, 125,  11, - 4, 1 },
+  { 0, 0, 1, - 7, 124,  13, - 4, 1 }, { 0, 0, 2, - 8, 123,  15, - 5, 1 },
+  { 0, 0, 2, - 9, 122,  18, - 6, 1 }, { 0, 0, 2, -10, 121,  20, - 6, 1 },
+  { 0, 0, 2, -11, 120,  22, - 7, 2 }, { 0, 0, 2, -12, 119,  25, - 8, 2 },
+  { 0, 0, 3, -13, 117,  27, - 8, 2 }, { 0, 0, 3, -13, 116,  29, - 9, 2 },
+  { 0, 0, 3, -14, 114,  32, -10, 3 }, { 0, 0, 3, -15, 113,  35, -10, 2 },
+  { 0, 0, 3, -15, 111,  37, -11, 3 }, { 0, 0, 3, -16, 109,  40, -11, 3 },
+  { 0, 0, 3, -16, 108,  42, -12, 3 }, { 0, 0, 4, -17, 106,  45, -13, 3 },
+  { 0, 0, 4, -17, 104,  47, -13, 3 }, { 0, 0, 4, -17, 102,  50, -14, 3 },
+  { 0, 0, 4, -17, 100,  52, -14, 3 }, { 0, 0, 4, -18,  98,  55, -15, 4 },
+  { 0, 0, 4, -18,  96,  58, -15, 3 }, { 0, 0, 4, -18,  94,  60, -16, 4 },
+  { 0, 0, 4, -18,  91,  63, -16, 4 }, { 0, 0, 4, -18,  89,  65, -16, 4 },
+  { 0, 0, 4, -18,  87,  68, -17, 4 }, { 0, 0, 4, -18,  85,  70, -17, 4 },
+  { 0, 0, 4, -18,  82,  73, -17, 4 }, { 0, 0, 4, -18,  80,  75, -17, 4 },
+  { 0, 0, 4, -18,  78,  78, -18, 4 }, { 0, 0, 4, -17,  75,  80, -18, 4 },
+  { 0, 0, 4, -17,  73,  82, -18, 4 }, { 0, 0, 4, -17,  70,  85, -18, 4 },
+  { 0, 0, 4, -17,  68,  87, -18, 4 }, { 0, 0, 4, -16,  65,  89, -18, 4 },
+  { 0, 0, 4, -16,  63,  91, -18, 4 }, { 0, 0, 4, -16,  60,  94, -18, 4 },
+  { 0, 0, 3, -15,  58,  96, -18, 4 }, { 0, 0, 4, -15,  55,  98, -18, 4 },
+  { 0, 0, 3, -14,  52, 100, -17, 4 }, { 0, 0, 3, -14,  50, 102, -17, 4 },
+  { 0, 0, 3, -13,  47, 104, -17, 4 }, { 0, 0, 3, -13,  45, 106, -17, 4 },
+  { 0, 0, 3, -12,  42, 108, -16, 3 }, { 0, 0, 3, -11,  40, 109, -16, 3 },
+  { 0, 0, 3, -11,  37, 111, -15, 3 }, { 0, 0, 2, -10,  35, 113, -15, 3 },
+  { 0, 0, 3, -10,  32, 114, -14, 3 }, { 0, 0, 2, - 9,  29, 116, -13, 3 },
+  { 0, 0, 2, - 8,  27, 117, -13, 3 }, { 0, 0, 2, - 8,  25, 119, -12, 2 },
+  { 0, 0, 2, - 7,  22, 120, -11, 2 }, { 0, 0, 1, - 6,  20, 121, -10, 2 },
+  { 0, 0, 1, - 6,  18, 122, - 9, 2 }, { 0, 0, 1, - 5,  15, 123, - 8, 2 },
+  { 0, 0, 1, - 4,  13, 124, - 7, 1 }, { 0, 0, 1, - 4,  11, 125, - 6, 1 },
+  { 0, 0, 1, - 3,   8, 126, - 5, 1 }, { 0, 0, 1, - 2,   6, 126, - 4, 1 },
+  { 0, 0, 0, - 1,   4, 127, - 3, 1 }, { 0, 0, 0,   0,   2, 127, - 1, 0 },
+  // dummy (replicate row index 191)
+  { 0, 0, 0,   0,   2, 127, - 1, 0 },
+
+#elif WARPEDPIXEL_PREC_BITS == 5
+  // [-1, 0)
+  {0,   0, 127,   1,   0, 0, 0, 0}, {1,  -3, 127,   4,  -1, 0, 0, 0},
+  {1,  -5, 126,   8,  -3, 1, 0, 0}, {1,  -7, 124,  13,  -4, 1, 0, 0},
+  {2,  -9, 122,  18,  -6, 1, 0, 0}, {2, -11, 120,  22,  -7, 2, 0, 0},
+  {3, -13, 117,  27,  -8, 2, 0, 0}, {3, -14, 114,  32, -10, 3, 0, 0},
+  {3, -15, 111,  37, -11, 3, 0, 0}, {3, -16, 108,  42, -12, 3, 0, 0},
+  {4, -17, 104,  47, -13, 3, 0, 0}, {4, -17, 100,  52, -14, 3, 0, 0},
+  {4, -18,  96,  58, -15, 3, 0, 0}, {4, -18,  91,  63, -16, 4, 0, 0},
+  {4, -18,  87,  68, -17, 4, 0, 0}, {4, -18,  82,  73, -17, 4, 0, 0},
+  {4, -18,  78,  78, -18, 4, 0, 0}, {4, -17,  73,  82, -18, 4, 0, 0},
+  {4, -17,  68,  87, -18, 4, 0, 0}, {4, -16,  63,  91, -18, 4, 0, 0},
+  {3, -15,  58,  96, -18, 4, 0, 0}, {3, -14,  52, 100, -17, 4, 0, 0},
+  {3, -13,  47, 104, -17, 4, 0, 0}, {3, -12,  42, 108, -16, 3, 0, 0},
+  {3, -11,  37, 111, -15, 3, 0, 0}, {3, -10,  32, 114, -14, 3, 0, 0},
+  {2,  -8,  27, 117, -13, 3, 0, 0}, {2,  -7,  22, 120, -11, 2, 0, 0},
+  {1,  -6,  18, 122,  -9, 2, 0, 0}, {1,  -4,  13, 124,  -7, 1, 0, 0},
+  {1,  -3,   8, 126,  -5, 1, 0, 0}, {0,  -1,   4, 127,  -3, 1, 0, 0},
+  // [0, 1)
+  { 0,  0,   0, 127,   1,   0,   0,  0}, { 0,  1,  -3, 127,   4,  -2,   1,  0},
+  { 0,  2,  -6, 126,   8,  -3,   1,  0}, {-1,  3,  -8, 125,  13,  -5,   2, -1},
+  {-1,  4, -11, 123,  18,  -7,   3, -1}, {-1,  4, -13, 121,  23,  -8,   3, -1},
+  {-1,  5, -15, 119,  27, -10,   4, -1}, {-2,  6, -17, 116,  33, -12,   5, -1},
+  {-2,  6, -18, 113,  38, -13,   5, -1}, {-2,  7, -19, 110,  43, -15,   6, -2},
+  {-2,  7, -20, 106,  49, -16,   6, -2}, {-2,  7, -21, 102,  54, -17,   7, -2},
+  {-2,  8, -22,  98,  59, -18,   7, -2}, {-2,  8, -22,  94,  64, -19,   7, -2},
+  {-2,  8, -22,  89,  69, -20,   8, -2}, {-2,  8, -21,  84,  74, -21,   8, -2},
+  {-2,  8, -21,  79,  79, -21,   8, -2}, {-2,  8, -21,  74,  84, -21,   8, -2},
+  {-2,  8, -20,  69,  89, -22,   8, -2}, {-2,  7, -19,  64,  94, -22,   8, -2},
+  {-2,  7, -18,  59,  98, -22,   8, -2}, {-2,  7, -17,  54, 102, -21,   7, -2},
+  {-2,  6, -16,  49, 106, -20,   7, -2}, {-2,  6, -15,  43, 110, -19,   7, -2},
+  {-1,  5, -13,  38, 113, -18,   6, -2}, {-1,  5, -12,  33, 116, -17,   6, -2},
+  {-1,  4, -10,  27, 119, -15,   5, -1}, {-1,  3,  -8,  23, 121, -13,   4, -1},
+  {-1,  3,  -7,  18, 123, -11,   4, -1}, {-1,  2,  -5,  13, 125,  -8,   3, -1},
+  { 0,  1,  -3,   8, 126,  -6,   2,  0}, { 0,  1,  -2,   4, 127,  -3,   1,  0},
+  // [1, 2)
+  {0, 0, 0,   1, 127,   0,   0, 0}, {0, 0, 1,  -3, 127,   4,  -1, 0},
+  {0, 0, 1,  -5, 126,   8,  -3, 1}, {0, 0, 1,  -7, 124,  13,  -4, 1},
+  {0, 0, 2,  -9, 122,  18,  -6, 1}, {0, 0, 2, -11, 120,  22,  -7, 2},
+  {0, 0, 3, -13, 117,  27,  -8, 2}, {0, 0, 3, -14, 114,  32, -10, 3},
+  {0, 0, 3, -15, 111,  37, -11, 3}, {0, 0, 3, -16, 108,  42, -12, 3},
+  {0, 0, 4, -17, 104,  47, -13, 3}, {0, 0, 4, -17, 100,  52, -14, 3},
+  {0, 0, 4, -18,  96,  58, -15, 3}, {0, 0, 4, -18,  91,  63, -16, 4},
+  {0, 0, 4, -18,  87,  68, -17, 4}, {0, 0, 4, -18,  82,  73, -17, 4},
+  {0, 0, 4, -18,  78,  78, -18, 4}, {0, 0, 4, -17,  73,  82, -18, 4},
+  {0, 0, 4, -17,  68,  87, -18, 4}, {0, 0, 4, -16,  63,  91, -18, 4},
+  {0, 0, 3, -15,  58,  96, -18, 4}, {0, 0, 3, -14,  52, 100, -17, 4},
+  {0, 0, 3, -13,  47, 104, -17, 4}, {0, 0, 3, -12,  42, 108, -16, 3},
+  {0, 0, 3, -11,  37, 111, -15, 3}, {0, 0, 3, -10,  32, 114, -14, 3},
+  {0, 0, 2,  -8,  27, 117, -13, 3}, {0, 0, 2,  -7,  22, 120, -11, 2},
+  {0, 0, 1,  -6,  18, 122,  -9, 2}, {0, 0, 1,  -4,  13, 124,  -7, 1},
+  {0, 0, 1,  -3,   8, 126,  -5, 1}, {0, 0, 0,  -1,   4, 127,  -3, 1},
+  // dummy (replicate row index 95)
+  {0, 0, 0,  -1,   4, 127,  -3, 1},
+
+#endif  // WARPEDPIXEL_PREC_BITS == 6
+};
+
+/* clang-format on */
+
+#define DIV_LUT_PREC_BITS 14
+#define DIV_LUT_BITS 8
+#define DIV_LUT_NUM (1 << DIV_LUT_BITS)
+
+static const uint16_t div_lut[DIV_LUT_NUM + 1] = {
+  16384, 16320, 16257, 16194, 16132, 16070, 16009, 15948, 15888, 15828, 15768,
+  15709, 15650, 15592, 15534, 15477, 15420, 15364, 15308, 15252, 15197, 15142,
+  15087, 15033, 14980, 14926, 14873, 14821, 14769, 14717, 14665, 14614, 14564,
+  14513, 14463, 14413, 14364, 14315, 14266, 14218, 14170, 14122, 14075, 14028,
+  13981, 13935, 13888, 13843, 13797, 13752, 13707, 13662, 13618, 13574, 13530,
+  13487, 13443, 13400, 13358, 13315, 13273, 13231, 13190, 13148, 13107, 13066,
+  13026, 12985, 12945, 12906, 12866, 12827, 12788, 12749, 12710, 12672, 12633,
+  12596, 12558, 12520, 12483, 12446, 12409, 12373, 12336, 12300, 12264, 12228,
+  12193, 12157, 12122, 12087, 12053, 12018, 11984, 11950, 11916, 11882, 11848,
+  11815, 11782, 11749, 11716, 11683, 11651, 11619, 11586, 11555, 11523, 11491,
+  11460, 11429, 11398, 11367, 11336, 11305, 11275, 11245, 11215, 11185, 11155,
+  11125, 11096, 11067, 11038, 11009, 10980, 10951, 10923, 10894, 10866, 10838,
+  10810, 10782, 10755, 10727, 10700, 10673, 10645, 10618, 10592, 10565, 10538,
+  10512, 10486, 10460, 10434, 10408, 10382, 10356, 10331, 10305, 10280, 10255,
+  10230, 10205, 10180, 10156, 10131, 10107, 10082, 10058, 10034, 10010, 9986,
+  9963,  9939,  9916,  9892,  9869,  9846,  9823,  9800,  9777,  9754,  9732,
+  9709,  9687,  9664,  9642,  9620,  9598,  9576,  9554,  9533,  9511,  9489,
+  9468,  9447,  9425,  9404,  9383,  9362,  9341,  9321,  9300,  9279,  9259,
+  9239,  9218,  9198,  9178,  9158,  9138,  9118,  9098,  9079,  9059,  9039,
+  9020,  9001,  8981,  8962,  8943,  8924,  8905,  8886,  8867,  8849,  8830,
+  8812,  8793,  8775,  8756,  8738,  8720,  8702,  8684,  8666,  8648,  8630,
+  8613,  8595,  8577,  8560,  8542,  8525,  8508,  8490,  8473,  8456,  8439,
+  8422,  8405,  8389,  8372,  8355,  8339,  8322,  8306,  8289,  8273,  8257,
+  8240,  8224,  8208,  8192,
+};
+
+// Decomposes a divisor D such that 1/D = y/2^shift, where y is returned
+// at precision of DIV_LUT_PREC_BITS along with the shift.
+static int16_t resolve_divisor_64(uint64_t D, int16_t *shift) {
+  int64_t f;
+  *shift = (int16_t)((D >> 32) ? get_msb((unsigned int)(D >> 32)) + 32
+                               : get_msb((unsigned int)D));
+  // e is obtained from D after resetting the most significant 1 bit.
+  const int64_t e = D - ((uint64_t)1 << *shift);
+  // Get the most significant DIV_LUT_BITS (8) bits of e into f
+  if (*shift > DIV_LUT_BITS)
+    f = ROUND_POWER_OF_TWO_64(e, *shift - DIV_LUT_BITS);
+  else
+    f = e << (DIV_LUT_BITS - *shift);
+  assert(f <= DIV_LUT_NUM);
+  *shift += DIV_LUT_PREC_BITS;
+  // Use f as lookup into the precomputed table of multipliers
+  return div_lut[f];
+}
+
+static int16_t resolve_divisor_32(uint32_t D, int16_t *shift) {
+  int32_t f;
+  *shift = get_msb(D);
+  // e is obtained from D after resetting the most significant 1 bit.
+  const int32_t e = D - ((uint32_t)1 << *shift);
+  // Get the most significant DIV_LUT_BITS (8) bits of e into f
+  if (*shift > DIV_LUT_BITS)
+    f = ROUND_POWER_OF_TWO(e, *shift - DIV_LUT_BITS);
+  else
+    f = e << (DIV_LUT_BITS - *shift);
+  assert(f <= DIV_LUT_NUM);
+  *shift += DIV_LUT_PREC_BITS;
+  // Use f as lookup into the precomputed table of multipliers
+  return div_lut[f];
+}
+
+static int is_affine_valid(const WarpedMotionParams *const wm) {
+  const int32_t *mat = wm->wmmat;
+  return (mat[2] > 0);
+}
+
+static int is_affine_shear_allowed(int16_t alpha, int16_t beta, int16_t gamma,
+                                   int16_t delta) {
+  if ((4 * abs(alpha) + 7 * abs(beta) >= (1 << WARPEDMODEL_PREC_BITS)) ||
+      (4 * abs(gamma) + 4 * abs(delta) >= (1 << WARPEDMODEL_PREC_BITS)))
+    return 0;
+  else
+    return 1;
+}
+
+// Returns 1 on success or 0 on an invalid affine set
+int av1_get_shear_params(WarpedMotionParams *wm) {
+  const int32_t *mat = wm->wmmat;
+  if (!is_affine_valid(wm)) return 0;
+  wm->alpha =
+      clamp(mat[2] - (1 << WARPEDMODEL_PREC_BITS), INT16_MIN, INT16_MAX);
+  wm->beta = clamp(mat[3], INT16_MIN, INT16_MAX);
+  int16_t shift;
+  int16_t y = resolve_divisor_32(abs(mat[2]), &shift) * (mat[2] < 0 ? -1 : 1);
+  int64_t v = ((int64_t)mat[4] * (1 << WARPEDMODEL_PREC_BITS)) * y;
+  wm->gamma =
+      clamp((int)ROUND_POWER_OF_TWO_SIGNED_64(v, shift), INT16_MIN, INT16_MAX);
+  v = ((int64_t)mat[3] * mat[4]) * y;
+  wm->delta = clamp(mat[5] - (int)ROUND_POWER_OF_TWO_SIGNED_64(v, shift) -
+                        (1 << WARPEDMODEL_PREC_BITS),
+                    INT16_MIN, INT16_MAX);
+
+  wm->alpha = ROUND_POWER_OF_TWO_SIGNED(wm->alpha, WARP_PARAM_REDUCE_BITS) *
+              (1 << WARP_PARAM_REDUCE_BITS);
+  wm->beta = ROUND_POWER_OF_TWO_SIGNED(wm->beta, WARP_PARAM_REDUCE_BITS) *
+             (1 << WARP_PARAM_REDUCE_BITS);
+  wm->gamma = ROUND_POWER_OF_TWO_SIGNED(wm->gamma, WARP_PARAM_REDUCE_BITS) *
+              (1 << WARP_PARAM_REDUCE_BITS);
+  wm->delta = ROUND_POWER_OF_TWO_SIGNED(wm->delta, WARP_PARAM_REDUCE_BITS) *
+              (1 << WARP_PARAM_REDUCE_BITS);
+
+  if (!is_affine_shear_allowed(wm->alpha, wm->beta, wm->gamma, wm->delta))
+    return 0;
+
+  return 1;
+}
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static INLINE int highbd_error_measure(int err, int bd) {
+  const int b = bd - 8;
+  const int bmask = (1 << b) - 1;
+  const int v = (1 << b);
+  err = abs(err);
+  const int e1 = err >> b;
+  const int e2 = err & bmask;
+  return error_measure_lut[255 + e1] * (v - e2) +
+         error_measure_lut[256 + e1] * e2;
+}
+
+/* Note: For an explanation of the warp algorithm, and some notes on bit widths
+    for hardware implementations, see the comments above av1_warp_affine_c
+*/
+void av1_highbd_warp_affine_c(const int32_t *mat, const uint16_t *ref,
+                              int width, int height, int stride, uint16_t *pred,
+                              int p_col, int p_row, int p_width, int p_height,
+                              int p_stride, int subsampling_x,
+                              int subsampling_y, int bd,
+                              ConvolveParams *conv_params, int16_t alpha,
+                              int16_t beta, int16_t gamma, int16_t delta) {
+  int32_t tmp[15 * 8];
+  const int reduce_bits_horiz =
+      conv_params->round_0 +
+      AOMMAX(bd + FILTER_BITS - conv_params->round_0 - 14, 0);
+  const int reduce_bits_vert = conv_params->is_compound
+                                   ? conv_params->round_1
+                                   : 2 * FILTER_BITS - reduce_bits_horiz;
+  const int max_bits_horiz = bd + FILTER_BITS + 1 - reduce_bits_horiz;
+  const int offset_bits_horiz = bd + FILTER_BITS - 1;
+  const int offset_bits_vert = bd + 2 * FILTER_BITS - reduce_bits_horiz;
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  (void)max_bits_horiz;
+  assert(IMPLIES(conv_params->is_compound, conv_params->dst != NULL));
+
+  for (int i = p_row; i < p_row + p_height; i += 8) {
+    for (int j = p_col; j < p_col + p_width; j += 8) {
+      // Calculate the center of this 8x8 block,
+      // project to luma coordinates (if in a subsampled chroma plane),
+      // apply the affine transformation,
+      // then convert back to the original coordinates (if necessary)
+      const int32_t src_x = (j + 4) << subsampling_x;
+      const int32_t src_y = (i + 4) << subsampling_y;
+      const int32_t dst_x = mat[2] * src_x + mat[3] * src_y + mat[0];
+      const int32_t dst_y = mat[4] * src_x + mat[5] * src_y + mat[1];
+      const int32_t x4 = dst_x >> subsampling_x;
+      const int32_t y4 = dst_y >> subsampling_y;
+
+      const int32_t ix4 = x4 >> WARPEDMODEL_PREC_BITS;
+      int32_t sx4 = x4 & ((1 << WARPEDMODEL_PREC_BITS) - 1);
+      const int32_t iy4 = y4 >> WARPEDMODEL_PREC_BITS;
+      int32_t sy4 = y4 & ((1 << WARPEDMODEL_PREC_BITS) - 1);
+
+      sx4 += alpha * (-4) + beta * (-4);
+      sy4 += gamma * (-4) + delta * (-4);
+
+      sx4 &= ~((1 << WARP_PARAM_REDUCE_BITS) - 1);
+      sy4 &= ~((1 << WARP_PARAM_REDUCE_BITS) - 1);
+
+      // Horizontal filter
+      for (int k = -7; k < 8; ++k) {
+        const int iy = clamp(iy4 + k, 0, height - 1);
+
+        int sx = sx4 + beta * (k + 4);
+        for (int l = -4; l < 4; ++l) {
+          int ix = ix4 + l - 3;
+          const int offs = ROUND_POWER_OF_TWO(sx, WARPEDDIFF_PREC_BITS) +
+                           WARPEDPIXEL_PREC_SHIFTS;
+          assert(offs >= 0 && offs <= WARPEDPIXEL_PREC_SHIFTS * 3);
+          const int16_t *coeffs = av1_warped_filter[offs];
+
+          int32_t sum = 1 << offset_bits_horiz;
+          for (int m = 0; m < 8; ++m) {
+            const int sample_x = clamp(ix + m, 0, width - 1);
+            sum += ref[iy * stride + sample_x] * coeffs[m];
+          }
+          sum = ROUND_POWER_OF_TWO(sum, reduce_bits_horiz);
+          assert(0 <= sum && sum < (1 << max_bits_horiz));
+          tmp[(k + 7) * 8 + (l + 4)] = sum;
+          sx += alpha;
+        }
+      }
+
+      // Vertical filter
+      for (int k = -4; k < AOMMIN(4, p_row + p_height - i - 4); ++k) {
+        int sy = sy4 + delta * (k + 4);
+        for (int l = -4; l < AOMMIN(4, p_col + p_width - j - 4); ++l) {
+          const int offs = ROUND_POWER_OF_TWO(sy, WARPEDDIFF_PREC_BITS) +
+                           WARPEDPIXEL_PREC_SHIFTS;
+          assert(offs >= 0 && offs <= WARPEDPIXEL_PREC_SHIFTS * 3);
+          const int16_t *coeffs = av1_warped_filter[offs];
+
+          int32_t sum = 1 << offset_bits_vert;
+          for (int m = 0; m < 8; ++m) {
+            sum += tmp[(k + m + 4) * 8 + (l + 4)] * coeffs[m];
+          }
+
+          if (conv_params->is_compound) {
+            CONV_BUF_TYPE *p =
+                &conv_params
+                     ->dst[(i - p_row + k + 4) * conv_params->dst_stride +
+                           (j - p_col + l + 4)];
+            sum = ROUND_POWER_OF_TWO(sum, reduce_bits_vert);
+            if (conv_params->do_average) {
+              uint16_t *dst16 =
+                  &pred[(i - p_row + k + 4) * p_stride + (j - p_col + l + 4)];
+              int32_t tmp32 = *p;
+              if (conv_params->use_dist_wtd_comp_avg) {
+                tmp32 = tmp32 * conv_params->fwd_offset +
+                        sum * conv_params->bck_offset;
+                tmp32 = tmp32 >> DIST_PRECISION_BITS;
+              } else {
+                tmp32 += sum;
+                tmp32 = tmp32 >> 1;
+              }
+              tmp32 = tmp32 - (1 << (offset_bits - conv_params->round_1)) -
+                      (1 << (offset_bits - conv_params->round_1 - 1));
+              *dst16 =
+                  clip_pixel_highbd(ROUND_POWER_OF_TWO(tmp32, round_bits), bd);
+            } else {
+              *p = sum;
+            }
+          } else {
+            uint16_t *p =
+                &pred[(i - p_row + k + 4) * p_stride + (j - p_col + l + 4)];
+            sum = ROUND_POWER_OF_TWO(sum, reduce_bits_vert);
+            assert(0 <= sum && sum < (1 << (bd + 2)));
+            *p = clip_pixel_highbd(sum - (1 << (bd - 1)) - (1 << bd), bd);
+          }
+          sy += gamma;
+        }
+      }
+    }
+  }
+}
+
+void highbd_warp_plane(WarpedMotionParams *wm, const uint16_t *const ref,
+                       int width, int height, int stride, uint16_t *const pred,
+                       int p_col, int p_row, int p_width, int p_height,
+                       int p_stride, int subsampling_x, int subsampling_y,
+                       int bd, ConvolveParams *conv_params) {
+  assert(wm->wmtype <= AFFINE);
+  if (wm->wmtype == ROTZOOM) {
+    wm->wmmat[5] = wm->wmmat[2];
+    wm->wmmat[4] = -wm->wmmat[3];
+  }
+  const int32_t *const mat = wm->wmmat;
+  const int16_t alpha = wm->alpha;
+  const int16_t beta = wm->beta;
+  const int16_t gamma = wm->gamma;
+  const int16_t delta = wm->delta;
+
+  av1_highbd_warp_affine(mat, ref, width, height, stride, pred, p_col, p_row,
+                         p_width, p_height, p_stride, subsampling_x,
+                         subsampling_y, bd, conv_params, alpha, beta, gamma,
+                         delta);
+}
+
+int64_t av1_calc_highbd_frame_error(const uint16_t *const ref, int stride,
+                                    const uint16_t *const dst, int p_width,
+                                    int p_height, int p_stride, int bd) {
+  int64_t sum_error = 0;
+  for (int i = 0; i < p_height; ++i) {
+    for (int j = 0; j < p_width; ++j) {
+      sum_error +=
+          highbd_error_measure(dst[j + i * p_stride] - ref[j + i * stride], bd);
+    }
+  }
+  return sum_error;
+}
+
+static int64_t highbd_segmented_frame_error(
+    const uint16_t *const ref, int stride, const uint16_t *const dst,
+    int p_width, int p_height, int p_stride, int bd, uint8_t *segment_map,
+    int segment_map_stride) {
+  int patch_w, patch_h;
+  const int error_bsize_w = AOMMIN(p_width, WARP_ERROR_BLOCK);
+  const int error_bsize_h = AOMMIN(p_height, WARP_ERROR_BLOCK);
+  int64_t sum_error = 0;
+  for (int i = 0; i < p_height; i += WARP_ERROR_BLOCK) {
+    for (int j = 0; j < p_width; j += WARP_ERROR_BLOCK) {
+      int seg_x = j >> WARP_ERROR_BLOCK_LOG;
+      int seg_y = i >> WARP_ERROR_BLOCK_LOG;
+      // Only compute the error if this block contains inliers from the motion
+      // model
+      if (!segment_map[seg_y * segment_map_stride + seg_x]) continue;
+
+      // avoid computing error into the frame padding
+      patch_w = AOMMIN(error_bsize_w, p_width - j);
+      patch_h = AOMMIN(error_bsize_h, p_height - i);
+      sum_error += av1_calc_highbd_frame_error(ref + j + i * stride, stride,
+                                               dst + j + i * p_stride, patch_w,
+                                               patch_h, p_stride, bd);
+    }
+  }
+  return sum_error;
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+/* The warp filter for ROTZOOM and AFFINE models works as follows:
+   * Split the input into 8x8 blocks
+   * For each block, project the point (4, 4) within the block, to get the
+     overall block position. Split into integer and fractional coordinates,
+     maintaining full WARPEDMODEL precision
+   * Filter horizontally: Generate 15 rows of 8 pixels each. Each pixel gets a
+     variable horizontal offset. This means that, while the rows of the
+     intermediate buffer align with the rows of the *reference* image, the
+     columns align with the columns of the *destination* image.
+   * Filter vertically: Generate the output block (up to 8x8 pixels, but if the
+     destination is too small we crop the output at this stage). Each pixel has
+     a variable vertical offset, so that the resulting rows are aligned with
+     the rows of the destination image.
+
+   To accomplish these alignments, we factor the warp matrix as a
+   product of two shear / asymmetric zoom matrices:
+   / a b \  = /   1       0    \ * / 1+alpha  beta \
+   \ c d /    \ gamma  1+delta /   \    0      1   /
+   where a, b, c, d are wmmat[2], wmmat[3], wmmat[4], wmmat[5] respectively.
+   The horizontal shear (with alpha and beta) is applied first,
+   then the vertical shear (with gamma and delta) is applied second.
+
+   The only limitation is that, to fit this in a fixed 8-tap filter size,
+   the fractional pixel offsets must be at most +-1. Since the horizontal filter
+   generates 15 rows of 8 columns, and the initial point we project is at (4, 4)
+   within the block, the parameters must satisfy
+   4 * |alpha| + 7 * |beta| <= 1   and   4 * |gamma| + 4 * |delta| <= 1
+   for this filter to be applicable.
+
+   Note: This function assumes that the caller has done all of the relevant
+   checks, ie. that we have a ROTZOOM or AFFINE model, that wm[4] and wm[5]
+   are set appropriately (if using a ROTZOOM model), and that alpha, beta,
+   gamma, delta are all in range.
+
+   TODO(david.barker): Maybe support scaled references?
+*/
+/* A note on hardware implementation:
+    The warp filter is intended to be implementable using the same hardware as
+    the high-precision convolve filters from the loop-restoration and
+    convolve-round experiments.
+
+    For a single filter stage, considering all of the coefficient sets for the
+    warp filter and the regular convolution filter, an input in the range
+    [0, 2^k - 1] is mapped into the range [-56 * (2^k - 1), 184 * (2^k - 1)]
+    before rounding.
+
+    Allowing for some changes to the filter coefficient sets, call the range
+    [-64 * 2^k, 192 * 2^k]. Then, if we initialize the accumulator to 64 * 2^k,
+    we can replace this by the range [0, 256 * 2^k], which can be stored in an
+    unsigned value with 8 + k bits.
+
+    This allows the derivation of the appropriate bit widths and offsets for
+    the various intermediate values: If
+
+    F := FILTER_BITS = 7 (or else the above ranges need adjusting)
+         So a *single* filter stage maps a k-bit input to a (k + F + 1)-bit
+         intermediate value.
+    H := ROUND0_BITS
+    V := VERSHEAR_REDUCE_PREC_BITS
+    (and note that we must have H + V = 2*F for the output to have the same
+     scale as the input)
+
+    then we end up with the following offsets and ranges:
+    Horizontal filter: Apply an offset of 1 << (bd + F - 1), sum fits into a
+                       uint{bd + F + 1}
+    After rounding: The values stored in 'tmp' fit into a uint{bd + F + 1 - H}.
+    Vertical filter: Apply an offset of 1 << (bd + 2*F - H), sum fits into a
+                     uint{bd + 2*F + 2 - H}
+    After rounding: The final value, before undoing the offset, fits into a
+                    uint{bd + 2}.
+
+    Then we need to undo the offsets before clamping to a pixel. Note that,
+    if we do this at the end, the amount to subtract is actually independent
+    of H and V:
+
+    offset to subtract = (1 << ((bd + F - 1) - H + F - V)) +
+                         (1 << ((bd + 2*F - H) - V))
+                      == (1 << (bd - 1)) + (1 << bd)
+
+    This allows us to entirely avoid clamping in both the warp filter and
+    the convolve-round experiment. As of the time of writing, the Wiener filter
+    from loop-restoration can encode a central coefficient up to 216, which
+    leads to a maximum value of about 282 * 2^k after applying the offset.
+    So in that case we still need to clamp.
+*/
+void av1_warp_affine_c(const int32_t *mat, const uint8_t *ref, int width,
+                       int height, int stride, uint8_t *pred, int p_col,
+                       int p_row, int p_width, int p_height, int p_stride,
+                       int subsampling_x, int subsampling_y,
+                       ConvolveParams *conv_params, int16_t alpha, int16_t beta,
+                       int16_t gamma, int16_t delta) {
+  int32_t tmp[15 * 8];
+  const int bd = 8;
+  const int reduce_bits_horiz = conv_params->round_0;
+  const int reduce_bits_vert = conv_params->is_compound
+                                   ? conv_params->round_1
+                                   : 2 * FILTER_BITS - reduce_bits_horiz;
+  const int max_bits_horiz = bd + FILTER_BITS + 1 - reduce_bits_horiz;
+  const int offset_bits_horiz = bd + FILTER_BITS - 1;
+  const int offset_bits_vert = bd + 2 * FILTER_BITS - reduce_bits_horiz;
+  const int round_bits =
+      2 * FILTER_BITS - conv_params->round_0 - conv_params->round_1;
+  const int offset_bits = bd + 2 * FILTER_BITS - conv_params->round_0;
+  (void)max_bits_horiz;
+  assert(IMPLIES(conv_params->is_compound, conv_params->dst != NULL));
+  assert(IMPLIES(conv_params->do_average, conv_params->is_compound));
+
+  for (int i = p_row; i < p_row + p_height; i += 8) {
+    for (int j = p_col; j < p_col + p_width; j += 8) {
+      // Calculate the center of this 8x8 block,
+      // project to luma coordinates (if in a subsampled chroma plane),
+      // apply the affine transformation,
+      // then convert back to the original coordinates (if necessary)
+      const int32_t src_x = (j + 4) << subsampling_x;
+      const int32_t src_y = (i + 4) << subsampling_y;
+      const int32_t dst_x = mat[2] * src_x + mat[3] * src_y + mat[0];
+      const int32_t dst_y = mat[4] * src_x + mat[5] * src_y + mat[1];
+      const int32_t x4 = dst_x >> subsampling_x;
+      const int32_t y4 = dst_y >> subsampling_y;
+
+      int32_t ix4 = x4 >> WARPEDMODEL_PREC_BITS;
+      int32_t sx4 = x4 & ((1 << WARPEDMODEL_PREC_BITS) - 1);
+      int32_t iy4 = y4 >> WARPEDMODEL_PREC_BITS;
+      int32_t sy4 = y4 & ((1 << WARPEDMODEL_PREC_BITS) - 1);
+
+      sx4 += alpha * (-4) + beta * (-4);
+      sy4 += gamma * (-4) + delta * (-4);
+
+      sx4 &= ~((1 << WARP_PARAM_REDUCE_BITS) - 1);
+      sy4 &= ~((1 << WARP_PARAM_REDUCE_BITS) - 1);
+
+      // Horizontal filter
+      for (int k = -7; k < 8; ++k) {
+        // Clamp to top/bottom edge of the frame
+        const int iy = clamp(iy4 + k, 0, height - 1);
+
+        int sx = sx4 + beta * (k + 4);
+
+        for (int l = -4; l < 4; ++l) {
+          int ix = ix4 + l - 3;
+          // At this point, sx = sx4 + alpha * l + beta * k
+          const int offs = ROUND_POWER_OF_TWO(sx, WARPEDDIFF_PREC_BITS) +
+                           WARPEDPIXEL_PREC_SHIFTS;
+          assert(offs >= 0 && offs <= WARPEDPIXEL_PREC_SHIFTS * 3);
+          const int16_t *coeffs = av1_warped_filter[offs];
+
+          int32_t sum = 1 << offset_bits_horiz;
+          for (int m = 0; m < 8; ++m) {
+            // Clamp to left/right edge of the frame
+            const int sample_x = clamp(ix + m, 0, width - 1);
+
+            sum += ref[iy * stride + sample_x] * coeffs[m];
+          }
+          sum = ROUND_POWER_OF_TWO(sum, reduce_bits_horiz);
+          assert(0 <= sum && sum < (1 << max_bits_horiz));
+          tmp[(k + 7) * 8 + (l + 4)] = sum;
+          sx += alpha;
+        }
+      }
+
+      // Vertical filter
+      for (int k = -4; k < AOMMIN(4, p_row + p_height - i - 4); ++k) {
+        int sy = sy4 + delta * (k + 4);
+        for (int l = -4; l < AOMMIN(4, p_col + p_width - j - 4); ++l) {
+          // At this point, sy = sy4 + gamma * l + delta * k
+          const int offs = ROUND_POWER_OF_TWO(sy, WARPEDDIFF_PREC_BITS) +
+                           WARPEDPIXEL_PREC_SHIFTS;
+          assert(offs >= 0 && offs <= WARPEDPIXEL_PREC_SHIFTS * 3);
+          const int16_t *coeffs = av1_warped_filter[offs];
+
+          int32_t sum = 1 << offset_bits_vert;
+          for (int m = 0; m < 8; ++m) {
+            sum += tmp[(k + m + 4) * 8 + (l + 4)] * coeffs[m];
+          }
+
+          if (conv_params->is_compound) {
+            CONV_BUF_TYPE *p =
+                &conv_params
+                     ->dst[(i - p_row + k + 4) * conv_params->dst_stride +
+                           (j - p_col + l + 4)];
+            sum = ROUND_POWER_OF_TWO(sum, reduce_bits_vert);
+            if (conv_params->do_average) {
+              uint8_t *dst8 =
+                  &pred[(i - p_row + k + 4) * p_stride + (j - p_col + l + 4)];
+              int32_t tmp32 = *p;
+              if (conv_params->use_dist_wtd_comp_avg) {
+                tmp32 = tmp32 * conv_params->fwd_offset +
+                        sum * conv_params->bck_offset;
+                tmp32 = tmp32 >> DIST_PRECISION_BITS;
+              } else {
+                tmp32 += sum;
+                tmp32 = tmp32 >> 1;
+              }
+              tmp32 = tmp32 - (1 << (offset_bits - conv_params->round_1)) -
+                      (1 << (offset_bits - conv_params->round_1 - 1));
+              *dst8 = clip_pixel(ROUND_POWER_OF_TWO(tmp32, round_bits));
+            } else {
+              *p = sum;
+            }
+          } else {
+            uint8_t *p =
+                &pred[(i - p_row + k + 4) * p_stride + (j - p_col + l + 4)];
+            sum = ROUND_POWER_OF_TWO(sum, reduce_bits_vert);
+            assert(0 <= sum && sum < (1 << (bd + 2)));
+            *p = clip_pixel(sum - (1 << (bd - 1)) - (1 << bd));
+          }
+          sy += gamma;
+        }
+      }
+    }
+  }
+}
+
+void warp_plane(WarpedMotionParams *wm, const uint8_t *const ref, int width,
+                int height, int stride, uint8_t *pred, int p_col, int p_row,
+                int p_width, int p_height, int p_stride, int subsampling_x,
+                int subsampling_y, ConvolveParams *conv_params) {
+  assert(wm->wmtype <= AFFINE);
+  if (wm->wmtype == ROTZOOM) {
+    wm->wmmat[5] = wm->wmmat[2];
+    wm->wmmat[4] = -wm->wmmat[3];
+  }
+  const int32_t *const mat = wm->wmmat;
+  const int16_t alpha = wm->alpha;
+  const int16_t beta = wm->beta;
+  const int16_t gamma = wm->gamma;
+  const int16_t delta = wm->delta;
+  av1_warp_affine(mat, ref, width, height, stride, pred, p_col, p_row, p_width,
+                  p_height, p_stride, subsampling_x, subsampling_y, conv_params,
+                  alpha, beta, gamma, delta);
+}
+
+int64_t av1_calc_frame_error_c(const uint8_t *const ref, int stride,
+                               const uint8_t *const dst, int p_width,
+                               int p_height, int p_stride) {
+  int64_t sum_error = 0;
+  for (int i = 0; i < p_height; ++i) {
+    for (int j = 0; j < p_width; ++j) {
+      sum_error +=
+          (int64_t)error_measure(dst[j + i * p_stride] - ref[j + i * stride]);
+    }
+  }
+  return sum_error;
+}
+
+static int64_t segmented_frame_error(const uint8_t *const ref, int stride,
+                                     const uint8_t *const dst, int p_width,
+                                     int p_height, int p_stride,
+                                     uint8_t *segment_map,
+                                     int segment_map_stride) {
+  int patch_w, patch_h;
+  const int error_bsize_w = AOMMIN(p_width, WARP_ERROR_BLOCK);
+  const int error_bsize_h = AOMMIN(p_height, WARP_ERROR_BLOCK);
+  int64_t sum_error = 0;
+  for (int i = 0; i < p_height; i += WARP_ERROR_BLOCK) {
+    for (int j = 0; j < p_width; j += WARP_ERROR_BLOCK) {
+      int seg_x = j >> WARP_ERROR_BLOCK_LOG;
+      int seg_y = i >> WARP_ERROR_BLOCK_LOG;
+      // Only compute the error if this block contains inliers from the motion
+      // model
+      if (!segment_map[seg_y * segment_map_stride + seg_x]) continue;
+
+      // avoid computing error into the frame padding
+      patch_w = AOMMIN(error_bsize_w, p_width - j);
+      patch_h = AOMMIN(error_bsize_h, p_height - i);
+      sum_error += av1_calc_frame_error(ref + j + i * stride, stride,
+                                        dst + j + i * p_stride, patch_w,
+                                        patch_h, p_stride);
+    }
+  }
+  return sum_error;
+}
+
+int64_t av1_frame_error(int use_hbd, int bd, const uint8_t *ref, int stride,
+                        uint8_t *dst, int p_width, int p_height, int p_stride) {
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (use_hbd) {
+    return av1_calc_highbd_frame_error(CONVERT_TO_SHORTPTR(ref), stride,
+                                       CONVERT_TO_SHORTPTR(dst), p_width,
+                                       p_height, p_stride, bd);
+  }
+#endif
+  (void)use_hbd;
+  (void)bd;
+  return av1_calc_frame_error(ref, stride, dst, p_width, p_height, p_stride);
+}
+
+int64_t av1_segmented_frame_error(int use_hbd, int bd, const uint8_t *ref,
+                                  int stride, uint8_t *dst, int p_width,
+                                  int p_height, int p_stride,
+                                  uint8_t *segment_map,
+                                  int segment_map_stride) {
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (use_hbd) {
+    return highbd_segmented_frame_error(
+        CONVERT_TO_SHORTPTR(ref), stride, CONVERT_TO_SHORTPTR(dst), p_width,
+        p_height, p_stride, bd, segment_map, segment_map_stride);
+  }
+#endif
+  (void)use_hbd;
+  (void)bd;
+  return segmented_frame_error(ref, stride, dst, p_width, p_height, p_stride,
+                               segment_map, segment_map_stride);
+}
+
+void av1_warp_plane(WarpedMotionParams *wm, int use_hbd, int bd,
+                    const uint8_t *ref, int width, int height, int stride,
+                    uint8_t *pred, int p_col, int p_row, int p_width,
+                    int p_height, int p_stride, int subsampling_x,
+                    int subsampling_y, ConvolveParams *conv_params) {
+#if CONFIG_AV1_HIGHBITDEPTH
+  if (use_hbd)
+    highbd_warp_plane(wm, CONVERT_TO_SHORTPTR(ref), width, height, stride,
+                      CONVERT_TO_SHORTPTR(pred), p_col, p_row, p_width,
+                      p_height, p_stride, subsampling_x, subsampling_y, bd,
+                      conv_params);
+  else
+    warp_plane(wm, ref, width, height, stride, pred, p_col, p_row, p_width,
+               p_height, p_stride, subsampling_x, subsampling_y, conv_params);
+#else
+  (void)use_hbd;
+  (void)bd;
+  warp_plane(wm, ref, width, height, stride, pred, p_col, p_row, p_width,
+             p_height, p_stride, subsampling_x, subsampling_y, conv_params);
+#endif
+}
+
+#define LS_MV_MAX 256  // max mv in 1/8-pel
+// Use LS_STEP = 8 so that 2 less bits needed for A, Bx, By.
+#define LS_STEP 8
+
+// Assuming LS_MV_MAX is < MAX_SB_SIZE * 8,
+// the precision needed is:
+//   (MAX_SB_SIZE_LOG2 + 3) [for sx * sx magnitude] +
+//   (MAX_SB_SIZE_LOG2 + 4) [for sx * dx magnitude] +
+//   1 [for sign] +
+//   LEAST_SQUARES_SAMPLES_MAX_BITS
+//        [for adding up to LEAST_SQUARES_SAMPLES_MAX samples]
+// The value is 23
+#define LS_MAT_RANGE_BITS \
+  ((MAX_SB_SIZE_LOG2 + 4) * 2 + LEAST_SQUARES_SAMPLES_MAX_BITS)
+
+// Bit-depth reduction from the full-range
+#define LS_MAT_DOWN_BITS 2
+
+// bits range of A, Bx and By after downshifting
+#define LS_MAT_BITS (LS_MAT_RANGE_BITS - LS_MAT_DOWN_BITS)
+#define LS_MAT_MIN (-(1 << (LS_MAT_BITS - 1)))
+#define LS_MAT_MAX ((1 << (LS_MAT_BITS - 1)) - 1)
+
+// By setting LS_STEP = 8, the least 2 bits of every elements in A, Bx, By are
+// 0. So, we can reduce LS_MAT_RANGE_BITS(2) bits here.
+#define LS_SQUARE(a)                                          \
+  (((a) * (a)*4 + (a)*4 * LS_STEP + LS_STEP * LS_STEP * 2) >> \
+   (2 + LS_MAT_DOWN_BITS))
+#define LS_PRODUCT1(a, b)                                           \
+  (((a) * (b)*4 + ((a) + (b)) * 2 * LS_STEP + LS_STEP * LS_STEP) >> \
+   (2 + LS_MAT_DOWN_BITS))
+#define LS_PRODUCT2(a, b)                                               \
+  (((a) * (b)*4 + ((a) + (b)) * 2 * LS_STEP + LS_STEP * LS_STEP * 2) >> \
+   (2 + LS_MAT_DOWN_BITS))
+
+#define USE_LIMITED_PREC_MULT 0
+
+#if USE_LIMITED_PREC_MULT
+
+#define MUL_PREC_BITS 16
+static uint16_t resolve_multiplier_64(uint64_t D, int16_t *shift) {
+  int msb = 0;
+  uint16_t mult = 0;
+  *shift = 0;
+  if (D != 0) {
+    msb = (int16_t)((D >> 32) ? get_msb((unsigned int)(D >> 32)) + 32
+                              : get_msb((unsigned int)D));
+    if (msb >= MUL_PREC_BITS) {
+      mult = (uint16_t)ROUND_POWER_OF_TWO_64(D, msb + 1 - MUL_PREC_BITS);
+      *shift = msb + 1 - MUL_PREC_BITS;
+    } else {
+      mult = (uint16_t)D;
+      *shift = 0;
+    }
+  }
+  return mult;
+}
+
+static int32_t get_mult_shift_ndiag(int64_t Px, int16_t iDet, int shift) {
+  int32_t ret;
+  int16_t mshift;
+  uint16_t Mul = resolve_multiplier_64(llabs(Px), &mshift);
+  int32_t v = (int32_t)Mul * (int32_t)iDet * (Px < 0 ? -1 : 1);
+  shift -= mshift;
+  if (shift > 0) {
+    return (int32_t)clamp(ROUND_POWER_OF_TWO_SIGNED(v, shift),
+                          -WARPEDMODEL_NONDIAGAFFINE_CLAMP + 1,
+                          WARPEDMODEL_NONDIAGAFFINE_CLAMP - 1);
+  } else {
+    return (int32_t)clamp(v * (1 << (-shift)),
+                          -WARPEDMODEL_NONDIAGAFFINE_CLAMP + 1,
+                          WARPEDMODEL_NONDIAGAFFINE_CLAMP - 1);
+  }
+  return ret;
+}
+
+static int32_t get_mult_shift_diag(int64_t Px, int16_t iDet, int shift) {
+  int16_t mshift;
+  uint16_t Mul = resolve_multiplier_64(llabs(Px), &mshift);
+  int32_t v = (int32_t)Mul * (int32_t)iDet * (Px < 0 ? -1 : 1);
+  shift -= mshift;
+  if (shift > 0) {
+    return (int32_t)clamp(
+        ROUND_POWER_OF_TWO_SIGNED(v, shift),
+        (1 << WARPEDMODEL_PREC_BITS) - WARPEDMODEL_NONDIAGAFFINE_CLAMP + 1,
+        (1 << WARPEDMODEL_PREC_BITS) + WARPEDMODEL_NONDIAGAFFINE_CLAMP - 1);
+  } else {
+    return (int32_t)clamp(
+        v * (1 << (-shift)),
+        (1 << WARPEDMODEL_PREC_BITS) - WARPEDMODEL_NONDIAGAFFINE_CLAMP + 1,
+        (1 << WARPEDMODEL_PREC_BITS) + WARPEDMODEL_NONDIAGAFFINE_CLAMP - 1);
+  }
+}
+
+#else
+
+static int32_t get_mult_shift_ndiag(int64_t Px, int16_t iDet, int shift) {
+  int64_t v = Px * (int64_t)iDet;
+  return (int32_t)clamp64(ROUND_POWER_OF_TWO_SIGNED_64(v, shift),
+                          -WARPEDMODEL_NONDIAGAFFINE_CLAMP + 1,
+                          WARPEDMODEL_NONDIAGAFFINE_CLAMP - 1);
+}
+
+static int32_t get_mult_shift_diag(int64_t Px, int16_t iDet, int shift) {
+  int64_t v = Px * (int64_t)iDet;
+  return (int32_t)clamp64(
+      ROUND_POWER_OF_TWO_SIGNED_64(v, shift),
+      (1 << WARPEDMODEL_PREC_BITS) - WARPEDMODEL_NONDIAGAFFINE_CLAMP + 1,
+      (1 << WARPEDMODEL_PREC_BITS) + WARPEDMODEL_NONDIAGAFFINE_CLAMP - 1);
+}
+#endif  // USE_LIMITED_PREC_MULT
+
+static int find_affine_int(int np, const int *pts1, const int *pts2,
+                           BLOCK_SIZE bsize, int mvy, int mvx,
+                           WarpedMotionParams *wm, int mi_row, int mi_col) {
+  int32_t A[2][2] = { { 0, 0 }, { 0, 0 } };
+  int32_t Bx[2] = { 0, 0 };
+  int32_t By[2] = { 0, 0 };
+
+  const int bw = block_size_wide[bsize];
+  const int bh = block_size_high[bsize];
+  const int rsuy = bh / 2 - 1;
+  const int rsux = bw / 2 - 1;
+  const int suy = rsuy * 8;
+  const int sux = rsux * 8;
+  const int duy = suy + mvy;
+  const int dux = sux + mvx;
+
+  // Assume the center pixel of the block has exactly the same motion vector
+  // as transmitted for the block. First shift the origin of the source
+  // points to the block center, and the origin of the destination points to
+  // the block center added to the motion vector transmitted.
+  // Let (xi, yi) denote the source points and (xi', yi') denote destination
+  // points after origin shfifting, for i = 0, 1, 2, .... n-1.
+  // Then if  P = [x0, y0,
+  //               x1, y1
+  //               x2, y1,
+  //                ....
+  //              ]
+  //          q = [x0', x1', x2', ... ]'
+  //          r = [y0', y1', y2', ... ]'
+  // the least squares problems that need to be solved are:
+  //          [h1, h2]' = inv(P'P)P'q and
+  //          [h3, h4]' = inv(P'P)P'r
+  // where the affine transformation is given by:
+  //          x' = h1.x + h2.y
+  //          y' = h3.x + h4.y
+  //
+  // The loop below computes: A = P'P, Bx = P'q, By = P'r
+  // We need to just compute inv(A).Bx and inv(A).By for the solutions.
+  // Contribution from neighbor block
+  for (int i = 0; i < np; i++) {
+    const int dx = pts2[i * 2] - dux;
+    const int dy = pts2[i * 2 + 1] - duy;
+    const int sx = pts1[i * 2] - sux;
+    const int sy = pts1[i * 2 + 1] - suy;
+    // (TODO)yunqing: This comparison wouldn't be necessary if the sample
+    // selection is done in find_samples(). Also, global offset can be removed
+    // while collecting samples.
+    if (abs(sx - dx) < LS_MV_MAX && abs(sy - dy) < LS_MV_MAX) {
+      A[0][0] += LS_SQUARE(sx);
+      A[0][1] += LS_PRODUCT1(sx, sy);
+      A[1][1] += LS_SQUARE(sy);
+      Bx[0] += LS_PRODUCT2(sx, dx);
+      Bx[1] += LS_PRODUCT1(sy, dx);
+      By[0] += LS_PRODUCT1(sx, dy);
+      By[1] += LS_PRODUCT2(sy, dy);
+    }
+  }
+
+  // Just for debugging, and can be removed later.
+  assert(A[0][0] >= LS_MAT_MIN && A[0][0] <= LS_MAT_MAX);
+  assert(A[0][1] >= LS_MAT_MIN && A[0][1] <= LS_MAT_MAX);
+  assert(A[1][1] >= LS_MAT_MIN && A[1][1] <= LS_MAT_MAX);
+  assert(Bx[0] >= LS_MAT_MIN && Bx[0] <= LS_MAT_MAX);
+  assert(Bx[1] >= LS_MAT_MIN && Bx[1] <= LS_MAT_MAX);
+  assert(By[0] >= LS_MAT_MIN && By[0] <= LS_MAT_MAX);
+  assert(By[1] >= LS_MAT_MIN && By[1] <= LS_MAT_MAX);
+
+  // Compute Determinant of A
+  const int64_t Det = (int64_t)A[0][0] * A[1][1] - (int64_t)A[0][1] * A[0][1];
+  if (Det == 0) return 1;
+
+  int16_t shift;
+  int16_t iDet = resolve_divisor_64(llabs(Det), &shift) * (Det < 0 ? -1 : 1);
+  shift -= WARPEDMODEL_PREC_BITS;
+  if (shift < 0) {
+    iDet <<= (-shift);
+    shift = 0;
+  }
+
+  int64_t Px[2], Py[2];
+  // These divided by the Det, are the least squares solutions
+  Px[0] = (int64_t)A[1][1] * Bx[0] - (int64_t)A[0][1] * Bx[1];
+  Px[1] = -(int64_t)A[0][1] * Bx[0] + (int64_t)A[0][0] * Bx[1];
+  Py[0] = (int64_t)A[1][1] * By[0] - (int64_t)A[0][1] * By[1];
+  Py[1] = -(int64_t)A[0][1] * By[0] + (int64_t)A[0][0] * By[1];
+
+  wm->wmmat[2] = get_mult_shift_diag(Px[0], iDet, shift);
+  wm->wmmat[3] = get_mult_shift_ndiag(Px[1], iDet, shift);
+  wm->wmmat[4] = get_mult_shift_ndiag(Py[0], iDet, shift);
+  wm->wmmat[5] = get_mult_shift_diag(Py[1], iDet, shift);
+
+  const int isuy = (mi_row * MI_SIZE + rsuy);
+  const int isux = (mi_col * MI_SIZE + rsux);
+  // Note: In the vx, vy expressions below, the max value of each of the
+  // 2nd and 3rd terms are (2^16 - 1) * (2^13 - 1). That leaves enough room
+  // for the first term so that the overall sum in the worst case fits
+  // within 32 bits overall.
+  const int32_t vx = mvx * (1 << (WARPEDMODEL_PREC_BITS - 3)) -
+                     (isux * (wm->wmmat[2] - (1 << WARPEDMODEL_PREC_BITS)) +
+                      isuy * wm->wmmat[3]);
+  const int32_t vy = mvy * (1 << (WARPEDMODEL_PREC_BITS - 3)) -
+                     (isux * wm->wmmat[4] +
+                      isuy * (wm->wmmat[5] - (1 << WARPEDMODEL_PREC_BITS)));
+  wm->wmmat[0] =
+      clamp(vx, -WARPEDMODEL_TRANS_CLAMP, WARPEDMODEL_TRANS_CLAMP - 1);
+  wm->wmmat[1] =
+      clamp(vy, -WARPEDMODEL_TRANS_CLAMP, WARPEDMODEL_TRANS_CLAMP - 1);
+
+  wm->wmmat[6] = wm->wmmat[7] = 0;
+  return 0;
+}
+
+int av1_find_projection(int np, const int *pts1, const int *pts2,
+                        BLOCK_SIZE bsize, int mvy, int mvx,
+                        WarpedMotionParams *wm_params, int mi_row, int mi_col) {
+  assert(wm_params->wmtype == AFFINE);
+
+  if (find_affine_int(np, pts1, pts2, bsize, mvy, mvx, wm_params, mi_row,
+                      mi_col))
+    return 1;
+
+  // check compatibility with the fast warp filter
+  if (!av1_get_shear_params(wm_params)) return 1;
+
+  return 0;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.h b/pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.h
new file mode 100644
index 0000000000..aa7966b13a
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_COMMON_WARPED_MOTION_H_
+#define AOM_AV1_COMMON_WARPED_MOTION_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <math.h>
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mv.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.h"
+
+#define MAX_PARAMDIM 9
+#define LEAST_SQUARES_SAMPLES_MAX_BITS 3
+#define LEAST_SQUARES_SAMPLES_MAX (1 << LEAST_SQUARES_SAMPLES_MAX_BITS)
+#define SAMPLES_ARRAY_SIZE (LEAST_SQUARES_SAMPLES_MAX * 2)
+#define WARPED_MOTION_DEBUG 0
+#define DEFAULT_WMTYPE AFFINE
+#define WARP_ERROR_BLOCK_LOG 5
+#define WARP_ERROR_BLOCK (1 << WARP_ERROR_BLOCK_LOG)
+
+extern const int16_t av1_warped_filter[WARPEDPIXEL_PREC_SHIFTS * 3 + 1][8];
+
+DECLARE_ALIGNED(8, extern const int8_t,
+                av1_filter_8bit[WARPEDPIXEL_PREC_SHIFTS * 3 + 1][8]);
+
+/* clang-format off */
+static const int error_measure_lut[512] = {
+    // pow 0.7
+    16384, 16339, 16294, 16249, 16204, 16158, 16113, 16068,
+    16022, 15977, 15932, 15886, 15840, 15795, 15749, 15703,
+    15657, 15612, 15566, 15520, 15474, 15427, 15381, 15335,
+    15289, 15242, 15196, 15149, 15103, 15056, 15010, 14963,
+    14916, 14869, 14822, 14775, 14728, 14681, 14634, 14587,
+    14539, 14492, 14445, 14397, 14350, 14302, 14254, 14206,
+    14159, 14111, 14063, 14015, 13967, 13918, 13870, 13822,
+    13773, 13725, 13676, 13628, 13579, 13530, 13481, 13432,
+    13383, 13334, 13285, 13236, 13187, 13137, 13088, 13038,
+    12988, 12939, 12889, 12839, 12789, 12739, 12689, 12639,
+    12588, 12538, 12487, 12437, 12386, 12335, 12285, 12234,
+    12183, 12132, 12080, 12029, 11978, 11926, 11875, 11823,
+    11771, 11719, 11667, 11615, 11563, 11511, 11458, 11406,
+    11353, 11301, 11248, 11195, 11142, 11089, 11036, 10982,
+    10929, 10875, 10822, 10768, 10714, 10660, 10606, 10552,
+    10497, 10443, 10388, 10333, 10279, 10224, 10168, 10113,
+    10058, 10002,  9947,  9891,  9835,  9779,  9723,  9666,
+    9610, 9553, 9497, 9440, 9383, 9326, 9268, 9211,
+    9153, 9095, 9037, 8979, 8921, 8862, 8804, 8745,
+    8686, 8627, 8568, 8508, 8449, 8389, 8329, 8269,
+    8208, 8148, 8087, 8026, 7965, 7903, 7842, 7780,
+    7718, 7656, 7593, 7531, 7468, 7405, 7341, 7278,
+    7214, 7150, 7086, 7021, 6956, 6891, 6826, 6760,
+    6695, 6628, 6562, 6495, 6428, 6361, 6293, 6225,
+    6157, 6089, 6020, 5950, 5881, 5811, 5741, 5670,
+    5599, 5527, 5456, 5383, 5311, 5237, 5164, 5090,
+    5015, 4941, 4865, 4789, 4713, 4636, 4558, 4480,
+    4401, 4322, 4242, 4162, 4080, 3998, 3916, 3832,
+    3748, 3663, 3577, 3490, 3402, 3314, 3224, 3133,
+    3041, 2948, 2854, 2758, 2661, 2562, 2461, 2359,
+    2255, 2148, 2040, 1929, 1815, 1698, 1577, 1452,
+    1323, 1187, 1045,  894,  731,  550,  339,    0,
+    339,  550,  731,  894, 1045, 1187, 1323, 1452,
+    1577, 1698, 1815, 1929, 2040, 2148, 2255, 2359,
+    2461, 2562, 2661, 2758, 2854, 2948, 3041, 3133,
+    3224, 3314, 3402, 3490, 3577, 3663, 3748, 3832,
+    3916, 3998, 4080, 4162, 4242, 4322, 4401, 4480,
+    4558, 4636, 4713, 4789, 4865, 4941, 5015, 5090,
+    5164, 5237, 5311, 5383, 5456, 5527, 5599, 5670,
+    5741, 5811, 5881, 5950, 6020, 6089, 6157, 6225,
+    6293, 6361, 6428, 6495, 6562, 6628, 6695, 6760,
+    6826, 6891, 6956, 7021, 7086, 7150, 7214, 7278,
+    7341, 7405, 7468, 7531, 7593, 7656, 7718, 7780,
+    7842, 7903, 7965, 8026, 8087, 8148, 8208, 8269,
+    8329, 8389, 8449, 8508, 8568, 8627, 8686, 8745,
+    8804, 8862, 8921, 8979, 9037, 9095, 9153, 9211,
+    9268, 9326, 9383, 9440, 9497, 9553, 9610, 9666,
+    9723,  9779,  9835,  9891,  9947, 10002, 10058, 10113,
+    10168, 10224, 10279, 10333, 10388, 10443, 10497, 10552,
+    10606, 10660, 10714, 10768, 10822, 10875, 10929, 10982,
+    11036, 11089, 11142, 11195, 11248, 11301, 11353, 11406,
+    11458, 11511, 11563, 11615, 11667, 11719, 11771, 11823,
+    11875, 11926, 11978, 12029, 12080, 12132, 12183, 12234,
+    12285, 12335, 12386, 12437, 12487, 12538, 12588, 12639,
+    12689, 12739, 12789, 12839, 12889, 12939, 12988, 13038,
+    13088, 13137, 13187, 13236, 13285, 13334, 13383, 13432,
+    13481, 13530, 13579, 13628, 13676, 13725, 13773, 13822,
+    13870, 13918, 13967, 14015, 14063, 14111, 14159, 14206,
+    14254, 14302, 14350, 14397, 14445, 14492, 14539, 14587,
+    14634, 14681, 14728, 14775, 14822, 14869, 14916, 14963,
+    15010, 15056, 15103, 15149, 15196, 15242, 15289, 15335,
+    15381, 15427, 15474, 15520, 15566, 15612, 15657, 15703,
+    15749, 15795, 15840, 15886, 15932, 15977, 16022, 16068,
+    16113, 16158, 16204, 16249, 16294, 16339, 16384, 16384,
+};
+/* clang-format on */
+
+static const uint8_t warp_pad_left[14][16] = {
+  { 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+  { 2, 2, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+  { 3, 3, 3, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+  { 4, 4, 4, 4, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+  { 5, 5, 5, 5, 5, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+  { 6, 6, 6, 6, 6, 6, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+  { 7, 7, 7, 7, 7, 7, 7, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+  { 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 10, 11, 12, 13, 14, 15 },
+  { 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, 11, 12, 13, 14, 15 },
+  { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 12, 13, 14, 15 },
+  { 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 13, 14, 15 },
+  { 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 14, 15 },
+  { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 15 },
+  { 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15 },
+};
+
+static const uint8_t warp_pad_right[14][16] = {
+  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14 },
+  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 13, 13 },
+  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 12, 12, 12 },
+  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 11, 11, 11, 11 },
+  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10, 10, 10 },
+  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9 },
+  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 8, 8, 8, 8, 8, 8 },
+  { 0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7 },
+  { 0, 1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 },
+  { 0, 1, 2, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 },
+  { 0, 1, 2, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 },
+  { 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
+  { 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
+  { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }
+};
+
+static INLINE int error_measure(int err) {
+  return error_measure_lut[255 + err];
+}
+
+// Returns the error between the frame described by 'ref' and the frame
+// described by 'dst'.
+int64_t av1_frame_error(int use_hbd, int bd, const uint8_t *ref, int stride,
+                        uint8_t *dst, int p_width, int p_height, int p_stride);
+
+int64_t av1_segmented_frame_error(int use_hbd, int bd, const uint8_t *ref,
+                                  int stride, uint8_t *dst, int p_width,
+                                  int p_height, int p_stride,
+                                  uint8_t *segment_map, int segment_map_stride);
+
+int64_t av1_calc_highbd_frame_error(const uint16_t *const ref, int stride,
+                                    const uint16_t *const dst, int p_width,
+                                    int p_height, int p_stride, int bd);
+
+void highbd_warp_plane(WarpedMotionParams *wm, const uint16_t *const ref,
+                       int width, int height, int stride, uint16_t *const pred,
+                       int p_col, int p_row, int p_width, int p_height,
+                       int p_stride, int subsampling_x, int subsampling_y,
+                       int bd, ConvolveParams *conv_params);
+
+void warp_plane(WarpedMotionParams *wm, const uint8_t *const ref, int width,
+                int height, int stride, uint8_t *pred, int p_col, int p_row,
+                int p_width, int p_height, int p_stride, int subsampling_x,
+                int subsampling_y, ConvolveParams *conv_params);
+
+void av1_warp_plane(WarpedMotionParams *wm, int use_hbd, int bd,
+                    const uint8_t *ref, int width, int height, int stride,
+                    uint8_t *pred, int p_col, int p_row, int p_width,
+                    int p_height, int p_stride, int subsampling_x,
+                    int subsampling_y, ConvolveParams *conv_params);
+
+int av1_find_projection(int np, const int *pts1, const int *pts2,
+                        BLOCK_SIZE bsize, int mvy, int mvx,
+                        WarpedMotionParams *wm_params, int mi_row, int mi_col);
+
+int av1_get_shear_params(WarpedMotionParams *wm);
+#endif  // AOM_AV1_COMMON_WARPED_MOTION_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.c b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.c
new file mode 100644
index 0000000000..9c82fcf823
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.c
@@ -0,0 +1,5355 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include <stddef.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/binary_codes_reader.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_timer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h"
+
+#if CONFIG_BITSTREAM_DEBUG || CONFIG_MISMATCH_DEBUG
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/debug_util.h"
+#endif  // CONFIG_BITSTREAM_DEBUG || CONFIG_MISMATCH_DEBUG
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cdef.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.h"
+#if CONFIG_INSPECTION
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/inspection.h"
+#endif
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/frame_buffers.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/idct.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/resize.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/tile_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/obmc.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodetxb.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.h"
+
+#define ACCT_STR __func__
+
+#define AOM_MIN_THREADS_PER_TILE 1
+#define AOM_MAX_THREADS_PER_TILE 2
+
+// This is needed by ext_tile related unit tests.
+#define EXT_TILE_DEBUG 1
+#define MC_TEMP_BUF_PELS                       \
+  (((MAX_SB_SIZE)*2 + (AOM_INTERP_EXTEND)*2) * \
+   ((MAX_SB_SIZE)*2 + (AOM_INTERP_EXTEND)*2))
+
+// Checks that the remaining bits start with a 1 and ends with 0s.
+// It consumes an additional byte, if already byte aligned before the check.
+int av1_check_trailing_bits(AV1Decoder *pbi, struct aom_read_bit_buffer *rb) {
+  AV1_COMMON *const cm = &pbi->common;
+  // bit_offset is set to 0 (mod 8) when the reader is already byte aligned
+  int bits_before_alignment = 8 - rb->bit_offset % 8;
+  int trailing = aom_rb_read_literal(rb, bits_before_alignment);
+  if (trailing != (1 << (bits_before_alignment - 1))) {
+    cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+    return -1;
+  }
+  return 0;
+}
+
+// Use only_chroma = 1 to only set the chroma planes
+static AOM_INLINE void set_planes_to_neutral_grey(
+    const SequenceHeader *const seq_params, const YV12_BUFFER_CONFIG *const buf,
+    int only_chroma) {
+  if (seq_params->use_highbitdepth) {
+    const int val = 1 << (seq_params->bit_depth - 1);
+    for (int plane = only_chroma; plane < MAX_MB_PLANE; plane++) {
+      const int is_uv = plane > 0;
+      uint16_t *const base = CONVERT_TO_SHORTPTR(buf->buffers[plane]);
+      // Set the first row to neutral grey. Then copy the first row to all
+      // subsequent rows.
+      if (buf->crop_heights[is_uv] > 0) {
+        aom_memset16(base, val, buf->crop_widths[is_uv]);
+        for (int row_idx = 1; row_idx < buf->crop_heights[is_uv]; row_idx++) {
+          memcpy(&base[row_idx * buf->strides[is_uv]], base,
+                 sizeof(*base) * buf->crop_widths[is_uv]);
+        }
+      }
+    }
+  } else {
+    for (int plane = only_chroma; plane < MAX_MB_PLANE; plane++) {
+      const int is_uv = plane > 0;
+      for (int row_idx = 0; row_idx < buf->crop_heights[is_uv]; row_idx++) {
+        memset(&buf->buffers[plane][row_idx * buf->uv_stride], 1 << 7,
+               buf->crop_widths[is_uv]);
+      }
+    }
+  }
+}
+
+#if !CONFIG_REALTIME_ONLY
+static AOM_INLINE void loop_restoration_read_sb_coeffs(
+    const AV1_COMMON *const cm, MACROBLOCKD *xd, aom_reader *const r, int plane,
+    int runit_idx);
+#endif
+
+static int read_is_valid(const uint8_t *start, size_t len, const uint8_t *end) {
+  return len != 0 && len <= (size_t)(end - start);
+}
+
+static TX_MODE read_tx_mode(struct aom_read_bit_buffer *rb,
+                            int coded_lossless) {
+  if (coded_lossless) return ONLY_4X4;
+  return aom_rb_read_bit(rb) ? TX_MODE_SELECT : TX_MODE_LARGEST;
+}
+
+static REFERENCE_MODE read_frame_reference_mode(
+    const AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
+  if (frame_is_intra_only(cm)) {
+    return SINGLE_REFERENCE;
+  } else {
+    return aom_rb_read_bit(rb) ? REFERENCE_MODE_SELECT : SINGLE_REFERENCE;
+  }
+}
+
+static AOM_INLINE void inverse_transform_block(DecoderCodingBlock *dcb,
+                                               int plane, const TX_TYPE tx_type,
+                                               const TX_SIZE tx_size,
+                                               uint8_t *dst, int stride,
+                                               int reduced_tx_set) {
+  tran_low_t *const dqcoeff = dcb->dqcoeff_block[plane] + dcb->cb_offset[plane];
+  eob_info *eob_data = dcb->eob_data[plane] + dcb->txb_offset[plane];
+  uint16_t scan_line = eob_data->max_scan_line;
+  uint16_t eob = eob_data->eob;
+  av1_inverse_transform_block(&dcb->xd, dqcoeff, plane, tx_type, tx_size, dst,
+                              stride, eob, reduced_tx_set);
+  memset(dqcoeff, 0, (scan_line + 1) * sizeof(dqcoeff[0]));
+}
+
+static AOM_INLINE void read_coeffs_tx_intra_block(
+    const AV1_COMMON *const cm, DecoderCodingBlock *dcb, aom_reader *const r,
+    const int plane, const int row, const int col, const TX_SIZE tx_size) {
+  MB_MODE_INFO *mbmi = dcb->xd.mi[0];
+  if (!mbmi->skip_txfm) {
+#if TXCOEFF_TIMER
+    struct aom_usec_timer timer;
+    aom_usec_timer_start(&timer);
+#endif
+    av1_read_coeffs_txb_facade(cm, dcb, r, plane, row, col, tx_size);
+#if TXCOEFF_TIMER
+    aom_usec_timer_mark(&timer);
+    const int64_t elapsed_time = aom_usec_timer_elapsed(&timer);
+    cm->txcoeff_timer += elapsed_time;
+    ++cm->txb_count;
+#endif
+  }
+}
+
+static AOM_INLINE void decode_block_void(const AV1_COMMON *const cm,
+                                         DecoderCodingBlock *dcb,
+                                         aom_reader *const r, const int plane,
+                                         const int row, const int col,
+                                         const TX_SIZE tx_size) {
+  (void)cm;
+  (void)dcb;
+  (void)r;
+  (void)plane;
+  (void)row;
+  (void)col;
+  (void)tx_size;
+}
+
+static AOM_INLINE void predict_inter_block_void(AV1_COMMON *const cm,
+                                                DecoderCodingBlock *dcb,
+                                                BLOCK_SIZE bsize) {
+  (void)cm;
+  (void)dcb;
+  (void)bsize;
+}
+
+static AOM_INLINE void cfl_store_inter_block_void(AV1_COMMON *const cm,
+                                                  MACROBLOCKD *const xd) {
+  (void)cm;
+  (void)xd;
+}
+
+static AOM_INLINE void predict_and_reconstruct_intra_block(
+    const AV1_COMMON *const cm, DecoderCodingBlock *dcb, aom_reader *const r,
+    const int plane, const int row, const int col, const TX_SIZE tx_size) {
+  (void)r;
+  MACROBLOCKD *const xd = &dcb->xd;
+  MB_MODE_INFO *mbmi = xd->mi[0];
+  PLANE_TYPE plane_type = get_plane_type(plane);
+
+  av1_predict_intra_block_facade(cm, xd, plane, col, row, tx_size);
+
+  if (!mbmi->skip_txfm) {
+    eob_info *eob_data = dcb->eob_data[plane] + dcb->txb_offset[plane];
+    if (eob_data->eob) {
+      const bool reduced_tx_set_used = cm->features.reduced_tx_set_used;
+      // tx_type was read out in av1_read_coeffs_txb.
+      const TX_TYPE tx_type = av1_get_tx_type(xd, plane_type, row, col, tx_size,
+                                              reduced_tx_set_used);
+      struct macroblockd_plane *const pd = &xd->plane[plane];
+      uint8_t *dst = &pd->dst.buf[(row * pd->dst.stride + col) << MI_SIZE_LOG2];
+      inverse_transform_block(dcb, plane, tx_type, tx_size, dst, pd->dst.stride,
+                              reduced_tx_set_used);
+    }
+  }
+  if (plane == AOM_PLANE_Y && store_cfl_required(cm, xd)) {
+    cfl_store_tx(xd, row, col, tx_size, mbmi->bsize);
+  }
+}
+
+static AOM_INLINE void inverse_transform_inter_block(
+    const AV1_COMMON *const cm, DecoderCodingBlock *dcb, aom_reader *const r,
+    const int plane, const int blk_row, const int blk_col,
+    const TX_SIZE tx_size) {
+  (void)r;
+  MACROBLOCKD *const xd = &dcb->xd;
+  PLANE_TYPE plane_type = get_plane_type(plane);
+  const struct macroblockd_plane *const pd = &xd->plane[plane];
+  const bool reduced_tx_set_used = cm->features.reduced_tx_set_used;
+  // tx_type was read out in av1_read_coeffs_txb.
+  const TX_TYPE tx_type = av1_get_tx_type(xd, plane_type, blk_row, blk_col,
+                                          tx_size, reduced_tx_set_used);
+
+  uint8_t *dst =
+      &pd->dst.buf[(blk_row * pd->dst.stride + blk_col) << MI_SIZE_LOG2];
+  inverse_transform_block(dcb, plane, tx_type, tx_size, dst, pd->dst.stride,
+                          reduced_tx_set_used);
+#if CONFIG_MISMATCH_DEBUG
+  int pixel_c, pixel_r;
+  BLOCK_SIZE bsize = txsize_to_bsize[tx_size];
+  int blk_w = block_size_wide[bsize];
+  int blk_h = block_size_high[bsize];
+  const int mi_row = -xd->mb_to_top_edge >> (3 + MI_SIZE_LOG2);
+  const int mi_col = -xd->mb_to_left_edge >> (3 + MI_SIZE_LOG2);
+  mi_to_pixel_loc(&pixel_c, &pixel_r, mi_col, mi_row, blk_col, blk_row,
+                  pd->subsampling_x, pd->subsampling_y);
+  mismatch_check_block_tx(dst, pd->dst.stride, cm->current_frame.order_hint,
+                          plane, pixel_c, pixel_r, blk_w, blk_h,
+                          xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH);
+#endif
+}
+
+static AOM_INLINE void set_cb_buffer_offsets(DecoderCodingBlock *dcb,
+                                             TX_SIZE tx_size, int plane) {
+  dcb->cb_offset[plane] += tx_size_wide[tx_size] * tx_size_high[tx_size];
+  dcb->txb_offset[plane] =
+      dcb->cb_offset[plane] / (TX_SIZE_W_MIN * TX_SIZE_H_MIN);
+}
+
+static AOM_INLINE void decode_reconstruct_tx(
+    AV1_COMMON *cm, ThreadData *const td, aom_reader *r,
+    MB_MODE_INFO *const mbmi, int plane, BLOCK_SIZE plane_bsize, int blk_row,
+    int blk_col, int block, TX_SIZE tx_size, int *eob_total) {
+  DecoderCodingBlock *const dcb = &td->dcb;
+  MACROBLOCKD *const xd = &dcb->xd;
+  const struct macroblockd_plane *const pd = &xd->plane[plane];
+  const TX_SIZE plane_tx_size =
+      plane ? av1_get_max_uv_txsize(mbmi->bsize, pd->subsampling_x,
+                                    pd->subsampling_y)
+            : mbmi->inter_tx_size[av1_get_txb_size_index(plane_bsize, blk_row,
+                                                         blk_col)];
+  // Scale to match transform block unit.
+  const int max_blocks_high = max_block_high(xd, plane_bsize, plane);
+  const int max_blocks_wide = max_block_wide(xd, plane_bsize, plane);
+
+  if (blk_row >= max_blocks_high || blk_col >= max_blocks_wide) return;
+
+  if (tx_size == plane_tx_size || plane) {
+    td->read_coeffs_tx_inter_block_visit(cm, dcb, r, plane, blk_row, blk_col,
+                                         tx_size);
+
+    td->inverse_tx_inter_block_visit(cm, dcb, r, plane, blk_row, blk_col,
+                                     tx_size);
+    eob_info *eob_data = dcb->eob_data[plane] + dcb->txb_offset[plane];
+    *eob_total += eob_data->eob;
+    set_cb_buffer_offsets(dcb, tx_size, plane);
+  } else {
+    const TX_SIZE sub_txs = sub_tx_size_map[tx_size];
+    assert(IMPLIES(tx_size <= TX_4X4, sub_txs == tx_size));
+    assert(IMPLIES(tx_size > TX_4X4, sub_txs < tx_size));
+    const int bsw = tx_size_wide_unit[sub_txs];
+    const int bsh = tx_size_high_unit[sub_txs];
+    const int sub_step = bsw * bsh;
+
+    assert(bsw > 0 && bsh > 0);
+
+    for (int row = 0; row < tx_size_high_unit[tx_size]; row += bsh) {
+      for (int col = 0; col < tx_size_wide_unit[tx_size]; col += bsw) {
+        const int offsetr = blk_row + row;
+        const int offsetc = blk_col + col;
+
+        if (offsetr >= max_blocks_high || offsetc >= max_blocks_wide) continue;
+
+        decode_reconstruct_tx(cm, td, r, mbmi, plane, plane_bsize, offsetr,
+                              offsetc, block, sub_txs, eob_total);
+        block += sub_step;
+      }
+    }
+  }
+}
+
+static AOM_INLINE void set_offsets(AV1_COMMON *const cm, MACROBLOCKD *const xd,
+                                   BLOCK_SIZE bsize, int mi_row, int mi_col,
+                                   int bw, int bh, int x_mis, int y_mis) {
+  const int num_planes = av1_num_planes(cm);
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+  const TileInfo *const tile = &xd->tile;
+
+  set_mi_offsets(mi_params, xd, mi_row, mi_col);
+  xd->mi[0]->bsize = bsize;
+#if CONFIG_RD_DEBUG
+  xd->mi[0]->mi_row = mi_row;
+  xd->mi[0]->mi_col = mi_col;
+#endif
+
+  assert(x_mis && y_mis);
+  for (int x = 1; x < x_mis; ++x) xd->mi[x] = xd->mi[0];
+  int idx = mi_params->mi_stride;
+  for (int y = 1; y < y_mis; ++y) {
+    memcpy(&xd->mi[idx], &xd->mi[0], x_mis * sizeof(xd->mi[0]));
+    idx += mi_params->mi_stride;
+  }
+
+  set_plane_n4(xd, bw, bh, num_planes);
+  set_entropy_context(xd, mi_row, mi_col, num_planes);
+
+  // Distance of Mb to the various image edges. These are specified to 8th pel
+  // as they are always compared to values that are in 1/8th pel units
+  set_mi_row_col(xd, tile, mi_row, bh, mi_col, bw, mi_params->mi_rows,
+                 mi_params->mi_cols);
+
+  av1_setup_dst_planes(xd->plane, bsize, &cm->cur_frame->buf, mi_row, mi_col, 0,
+                       num_planes);
+}
+
+static AOM_INLINE void decode_mbmi_block(AV1Decoder *const pbi,
+                                         DecoderCodingBlock *dcb, int mi_row,
+                                         int mi_col, aom_reader *r,
+                                         PARTITION_TYPE partition,
+                                         BLOCK_SIZE bsize) {
+  AV1_COMMON *const cm = &pbi->common;
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  const int bw = mi_size_wide[bsize];
+  const int bh = mi_size_high[bsize];
+  const int x_mis = AOMMIN(bw, cm->mi_params.mi_cols - mi_col);
+  const int y_mis = AOMMIN(bh, cm->mi_params.mi_rows - mi_row);
+  MACROBLOCKD *const xd = &dcb->xd;
+
+#if CONFIG_ACCOUNTING
+  aom_accounting_set_context(&pbi->accounting, mi_col, mi_row);
+#endif
+  set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, y_mis);
+  xd->mi[0]->partition = partition;
+  av1_read_mode_info(pbi, dcb, r, x_mis, y_mis);
+  if (bsize >= BLOCK_8X8 &&
+      (seq_params->subsampling_x || seq_params->subsampling_y)) {
+    const BLOCK_SIZE uv_subsize =
+        ss_size_lookup[bsize][seq_params->subsampling_x]
+                      [seq_params->subsampling_y];
+    if (uv_subsize == BLOCK_INVALID)
+      aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
+                         "Invalid block size.");
+  }
+}
+
+typedef struct PadBlock {
+  int x0;
+  int x1;
+  int y0;
+  int y1;
+} PadBlock;
+
+#if CONFIG_AV1_HIGHBITDEPTH
+static AOM_INLINE void highbd_build_mc_border(const uint8_t *src8,
+                                              int src_stride, uint8_t *dst8,
+                                              int dst_stride, int x, int y,
+                                              int b_w, int b_h, int w, int h) {
+  // Get a pointer to the start of the real data for this row.
+  const uint16_t *src = CONVERT_TO_SHORTPTR(src8);
+  uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
+  const uint16_t *ref_row = src - x - y * src_stride;
+
+  if (y >= h)
+    ref_row += (h - 1) * src_stride;
+  else if (y > 0)
+    ref_row += y * src_stride;
+
+  do {
+    int right = 0, copy;
+    int left = x < 0 ? -x : 0;
+
+    if (left > b_w) left = b_w;
+
+    if (x + b_w > w) right = x + b_w - w;
+
+    if (right > b_w) right = b_w;
+
+    copy = b_w - left - right;
+
+    if (left) aom_memset16(dst, ref_row[0], left);
+
+    if (copy) memcpy(dst + left, ref_row + x + left, copy * sizeof(uint16_t));
+
+    if (right) aom_memset16(dst + left + copy, ref_row[w - 1], right);
+
+    dst += dst_stride;
+    ++y;
+
+    if (y > 0 && y < h) ref_row += src_stride;
+  } while (--b_h);
+}
+#endif  // CONFIG_AV1_HIGHBITDEPTH
+
+static AOM_INLINE void build_mc_border(const uint8_t *src, int src_stride,
+                                       uint8_t *dst, int dst_stride, int x,
+                                       int y, int b_w, int b_h, int w, int h) {
+  // Get a pointer to the start of the real data for this row.
+  const uint8_t *ref_row = src - x - y * src_stride;
+
+  if (y >= h)
+    ref_row += (h - 1) * src_stride;
+  else if (y > 0)
+    ref_row += y * src_stride;
+
+  do {
+    int right = 0, copy;
+    int left = x < 0 ? -x : 0;
+
+    if (left > b_w) left = b_w;
+
+    if (x + b_w > w) right = x + b_w - w;
+
+    if (right > b_w) right = b_w;
+
+    copy = b_w - left - right;
+
+    if (left) memset(dst, ref_row[0], left);
+
+    if (copy) memcpy(dst + left, ref_row + x + left, copy);
+
+    if (right) memset(dst + left + copy, ref_row[w - 1], right);
+
+    dst += dst_stride;
+    ++y;
+
+    if (y > 0 && y < h) ref_row += src_stride;
+  } while (--b_h);
+}
+
+static INLINE int update_extend_mc_border_params(
+    const struct scale_factors *const sf, struct buf_2d *const pre_buf,
+    MV32 scaled_mv, PadBlock *block, int subpel_x_mv, int subpel_y_mv,
+    int do_warp, int is_intrabc, int *x_pad, int *y_pad) {
+  const int is_scaled = av1_is_scaled(sf);
+  // Get reference width and height.
+  int frame_width = pre_buf->width;
+  int frame_height = pre_buf->height;
+
+  // Do border extension if there is motion or
+  // width/height is not a multiple of 8 pixels.
+  if ((!is_intrabc) && (!do_warp) &&
+      (is_scaled || scaled_mv.col || scaled_mv.row || (frame_width & 0x7) ||
+       (frame_height & 0x7))) {
+    if (subpel_x_mv || (sf->x_step_q4 != SUBPEL_SHIFTS)) {
+      block->x0 -= AOM_INTERP_EXTEND - 1;
+      block->x1 += AOM_INTERP_EXTEND;
+      *x_pad = 1;
+    }
+
+    if (subpel_y_mv || (sf->y_step_q4 != SUBPEL_SHIFTS)) {
+      block->y0 -= AOM_INTERP_EXTEND - 1;
+      block->y1 += AOM_INTERP_EXTEND;
+      *y_pad = 1;
+    }
+
+    // Skip border extension if block is inside the frame.
+    if (block->x0 < 0 || block->x1 > frame_width - 1 || block->y0 < 0 ||
+        block->y1 > frame_height - 1) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+static INLINE void extend_mc_border(const struct scale_factors *const sf,
+                                    struct buf_2d *const pre_buf,
+                                    MV32 scaled_mv, PadBlock block,
+                                    int subpel_x_mv, int subpel_y_mv,
+                                    int do_warp, int is_intrabc, int highbd,
+                                    uint8_t *mc_buf, uint8_t **pre,
+                                    int *src_stride) {
+  int x_pad = 0, y_pad = 0;
+  if (update_extend_mc_border_params(sf, pre_buf, scaled_mv, &block,
+                                     subpel_x_mv, subpel_y_mv, do_warp,
+                                     is_intrabc, &x_pad, &y_pad)) {
+    // Get reference block pointer.
+    const uint8_t *const buf_ptr =
+        pre_buf->buf0 + block.y0 * pre_buf->stride + block.x0;
+    int buf_stride = pre_buf->stride;
+    const int b_w = block.x1 - block.x0;
+    const int b_h = block.y1 - block.y0;
+
+#if CONFIG_AV1_HIGHBITDEPTH
+    // Extend the border.
+    if (highbd) {
+      highbd_build_mc_border(buf_ptr, buf_stride, mc_buf, b_w, block.x0,
+                             block.y0, b_w, b_h, pre_buf->width,
+                             pre_buf->height);
+    } else {
+      build_mc_border(buf_ptr, buf_stride, mc_buf, b_w, block.x0, block.y0, b_w,
+                      b_h, pre_buf->width, pre_buf->height);
+    }
+#else
+    (void)highbd;
+    build_mc_border(buf_ptr, buf_stride, mc_buf, b_w, block.x0, block.y0, b_w,
+                    b_h, pre_buf->width, pre_buf->height);
+#endif
+    *src_stride = b_w;
+    *pre = mc_buf + y_pad * (AOM_INTERP_EXTEND - 1) * b_w +
+           x_pad * (AOM_INTERP_EXTEND - 1);
+  }
+}
+
+static void dec_calc_subpel_params(const MV *const src_mv,
+                                   InterPredParams *const inter_pred_params,
+                                   const MACROBLOCKD *const xd, int mi_x,
+                                   int mi_y, uint8_t **pre,
+                                   SubpelParams *subpel_params, int *src_stride,
+                                   PadBlock *block, MV32 *scaled_mv,
+                                   int *subpel_x_mv, int *subpel_y_mv) {
+  const struct scale_factors *sf = inter_pred_params->scale_factors;
+  struct buf_2d *pre_buf = &inter_pred_params->ref_frame_buf;
+  const int bw = inter_pred_params->block_width;
+  const int bh = inter_pred_params->block_height;
+  const int is_scaled = av1_is_scaled(sf);
+  if (is_scaled) {
+    int ssx = inter_pred_params->subsampling_x;
+    int ssy = inter_pred_params->subsampling_y;
+    int orig_pos_y = inter_pred_params->pix_row << SUBPEL_BITS;
+    orig_pos_y += src_mv->row * (1 << (1 - ssy));
+    int orig_pos_x = inter_pred_params->pix_col << SUBPEL_BITS;
+    orig_pos_x += src_mv->col * (1 << (1 - ssx));
+    int pos_y = sf->scale_value_y(orig_pos_y, sf);
+    int pos_x = sf->scale_value_x(orig_pos_x, sf);
+    pos_x += SCALE_EXTRA_OFF;
+    pos_y += SCALE_EXTRA_OFF;
+
+    const int top = -AOM_LEFT_TOP_MARGIN_SCALED(ssy);
+    const int left = -AOM_LEFT_TOP_MARGIN_SCALED(ssx);
+    const int bottom = (pre_buf->height + AOM_INTERP_EXTEND)
+                       << SCALE_SUBPEL_BITS;
+    const int right = (pre_buf->width + AOM_INTERP_EXTEND) << SCALE_SUBPEL_BITS;
+    pos_y = clamp(pos_y, top, bottom);
+    pos_x = clamp(pos_x, left, right);
+
+    subpel_params->subpel_x = pos_x & SCALE_SUBPEL_MASK;
+    subpel_params->subpel_y = pos_y & SCALE_SUBPEL_MASK;
+    subpel_params->xs = sf->x_step_q4;
+    subpel_params->ys = sf->y_step_q4;
+
+    // Get reference block top left coordinate.
+    block->x0 = pos_x >> SCALE_SUBPEL_BITS;
+    block->y0 = pos_y >> SCALE_SUBPEL_BITS;
+
+    // Get reference block bottom right coordinate.
+    block->x1 =
+        ((pos_x + (bw - 1) * subpel_params->xs) >> SCALE_SUBPEL_BITS) + 1;
+    block->y1 =
+        ((pos_y + (bh - 1) * subpel_params->ys) >> SCALE_SUBPEL_BITS) + 1;
+
+    MV temp_mv;
+    temp_mv = clamp_mv_to_umv_border_sb(xd, src_mv, bw, bh,
+                                        inter_pred_params->subsampling_x,
+                                        inter_pred_params->subsampling_y);
+    *scaled_mv = av1_scale_mv(&temp_mv, mi_x, mi_y, sf);
+    scaled_mv->row += SCALE_EXTRA_OFF;
+    scaled_mv->col += SCALE_EXTRA_OFF;
+
+    *subpel_x_mv = scaled_mv->col & SCALE_SUBPEL_MASK;
+    *subpel_y_mv = scaled_mv->row & SCALE_SUBPEL_MASK;
+  } else {
+    // Get block position in current frame.
+    int pos_x = inter_pred_params->pix_col << SUBPEL_BITS;
+    int pos_y = inter_pred_params->pix_row << SUBPEL_BITS;
+
+    const MV mv_q4 = clamp_mv_to_umv_border_sb(
+        xd, src_mv, bw, bh, inter_pred_params->subsampling_x,
+        inter_pred_params->subsampling_y);
+    subpel_params->xs = subpel_params->ys = SCALE_SUBPEL_SHIFTS;
+    subpel_params->subpel_x = (mv_q4.col & SUBPEL_MASK) << SCALE_EXTRA_BITS;
+    subpel_params->subpel_y = (mv_q4.row & SUBPEL_MASK) << SCALE_EXTRA_BITS;
+
+    // Get reference block top left coordinate.
+    pos_x += mv_q4.col;
+    pos_y += mv_q4.row;
+    block->x0 = pos_x >> SUBPEL_BITS;
+    block->y0 = pos_y >> SUBPEL_BITS;
+
+    // Get reference block bottom right coordinate.
+    block->x1 = (pos_x >> SUBPEL_BITS) + (bw - 1) + 1;
+    block->y1 = (pos_y >> SUBPEL_BITS) + (bh - 1) + 1;
+
+    scaled_mv->row = mv_q4.row;
+    scaled_mv->col = mv_q4.col;
+    *subpel_x_mv = scaled_mv->col & SUBPEL_MASK;
+    *subpel_y_mv = scaled_mv->row & SUBPEL_MASK;
+  }
+  *pre = pre_buf->buf0 + block->y0 * pre_buf->stride + block->x0;
+  *src_stride = pre_buf->stride;
+}
+
+static void dec_calc_subpel_params_and_extend(
+    const MV *const src_mv, InterPredParams *const inter_pred_params,
+    MACROBLOCKD *const xd, int mi_x, int mi_y, int ref, uint8_t **mc_buf,
+    uint8_t **pre, SubpelParams *subpel_params, int *src_stride) {
+  PadBlock block;
+  MV32 scaled_mv;
+  int subpel_x_mv, subpel_y_mv;
+  dec_calc_subpel_params(src_mv, inter_pred_params, xd, mi_x, mi_y, pre,
+                         subpel_params, src_stride, &block, &scaled_mv,
+                         &subpel_x_mv, &subpel_y_mv);
+  extend_mc_border(
+      inter_pred_params->scale_factors, &inter_pred_params->ref_frame_buf,
+      scaled_mv, block, subpel_x_mv, subpel_y_mv,
+      inter_pred_params->mode == WARP_PRED, inter_pred_params->is_intrabc,
+      inter_pred_params->use_hbd_buf, mc_buf[ref], pre, src_stride);
+}
+
+static void dec_build_inter_predictors(const AV1_COMMON *cm,
+                                       DecoderCodingBlock *dcb, int plane,
+                                       const MB_MODE_INFO *mi,
+                                       int build_for_obmc, int bw, int bh,
+                                       int mi_x, int mi_y) {
+  av1_build_inter_predictors(cm, &dcb->xd, plane, mi, build_for_obmc, bw, bh,
+                             mi_x, mi_y, dcb->mc_buf,
+                             dec_calc_subpel_params_and_extend);
+}
+
+static AOM_INLINE void dec_build_inter_predictor(const AV1_COMMON *cm,
+                                                 DecoderCodingBlock *dcb,
+                                                 int mi_row, int mi_col,
+                                                 BLOCK_SIZE bsize) {
+  MACROBLOCKD *const xd = &dcb->xd;
+  const int num_planes = av1_num_planes(cm);
+  for (int plane = 0; plane < num_planes; ++plane) {
+    if (plane && !xd->is_chroma_ref) break;
+    const int mi_x = mi_col * MI_SIZE;
+    const int mi_y = mi_row * MI_SIZE;
+    dec_build_inter_predictors(cm, dcb, plane, xd->mi[0], 0,
+                               xd->plane[plane].width, xd->plane[plane].height,
+                               mi_x, mi_y);
+    if (is_interintra_pred(xd->mi[0])) {
+      BUFFER_SET ctx = { { xd->plane[0].dst.buf, xd->plane[1].dst.buf,
+                           xd->plane[2].dst.buf },
+                         { xd->plane[0].dst.stride, xd->plane[1].dst.stride,
+                           xd->plane[2].dst.stride } };
+      av1_build_interintra_predictor(cm, xd, xd->plane[plane].dst.buf,
+                                     xd->plane[plane].dst.stride, &ctx, plane,
+                                     bsize);
+    }
+  }
+}
+
+static INLINE void dec_build_prediction_by_above_pred(
+    MACROBLOCKD *const xd, int rel_mi_row, int rel_mi_col, uint8_t op_mi_size,
+    int dir, MB_MODE_INFO *above_mbmi, void *fun_ctxt, const int num_planes) {
+  struct build_prediction_ctxt *ctxt = (struct build_prediction_ctxt *)fun_ctxt;
+  const int above_mi_col = xd->mi_col + rel_mi_col;
+  int mi_x, mi_y;
+  MB_MODE_INFO backup_mbmi = *above_mbmi;
+
+  (void)rel_mi_row;
+  (void)dir;
+
+  av1_setup_build_prediction_by_above_pred(xd, rel_mi_col, op_mi_size,
+                                           &backup_mbmi, ctxt, num_planes);
+  mi_x = above_mi_col << MI_SIZE_LOG2;
+  mi_y = xd->mi_row << MI_SIZE_LOG2;
+
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+
+  for (int j = 0; j < num_planes; ++j) {
+    const struct macroblockd_plane *pd = &xd->plane[j];
+    int bw = (op_mi_size * MI_SIZE) >> pd->subsampling_x;
+    int bh = clamp(block_size_high[bsize] >> (pd->subsampling_y + 1), 4,
+                   block_size_high[BLOCK_64X64] >> (pd->subsampling_y + 1));
+
+    if (av1_skip_u4x4_pred_in_obmc(bsize, pd, 0)) continue;
+    dec_build_inter_predictors(ctxt->cm, (DecoderCodingBlock *)ctxt->dcb, j,
+                               &backup_mbmi, 1, bw, bh, mi_x, mi_y);
+  }
+}
+
+static AOM_INLINE void dec_build_prediction_by_above_preds(
+    const AV1_COMMON *cm, DecoderCodingBlock *dcb,
+    uint8_t *tmp_buf[MAX_MB_PLANE], int tmp_width[MAX_MB_PLANE],
+    int tmp_height[MAX_MB_PLANE], int tmp_stride[MAX_MB_PLANE]) {
+  MACROBLOCKD *const xd = &dcb->xd;
+  if (!xd->up_available) return;
+
+  // Adjust mb_to_bottom_edge to have the correct value for the OBMC
+  // prediction block. This is half the height of the original block,
+  // except for 128-wide blocks, where we only use a height of 32.
+  const int this_height = xd->height * MI_SIZE;
+  const int pred_height = AOMMIN(this_height / 2, 32);
+  xd->mb_to_bottom_edge += GET_MV_SUBPEL(this_height - pred_height);
+  struct build_prediction_ctxt ctxt = {
+    cm, tmp_buf, tmp_width, tmp_height, tmp_stride, xd->mb_to_right_edge, dcb
+  };
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+  foreach_overlappable_nb_above(cm, xd,
+                                max_neighbor_obmc[mi_size_wide_log2[bsize]],
+                                dec_build_prediction_by_above_pred, &ctxt);
+
+  xd->mb_to_left_edge = -GET_MV_SUBPEL(xd->mi_col * MI_SIZE);
+  xd->mb_to_right_edge = ctxt.mb_to_far_edge;
+  xd->mb_to_bottom_edge -= GET_MV_SUBPEL(this_height - pred_height);
+}
+
+static INLINE void dec_build_prediction_by_left_pred(
+    MACROBLOCKD *const xd, int rel_mi_row, int rel_mi_col, uint8_t op_mi_size,
+    int dir, MB_MODE_INFO *left_mbmi, void *fun_ctxt, const int num_planes) {
+  struct build_prediction_ctxt *ctxt = (struct build_prediction_ctxt *)fun_ctxt;
+  const int left_mi_row = xd->mi_row + rel_mi_row;
+  int mi_x, mi_y;
+  MB_MODE_INFO backup_mbmi = *left_mbmi;
+
+  (void)rel_mi_col;
+  (void)dir;
+
+  av1_setup_build_prediction_by_left_pred(xd, rel_mi_row, op_mi_size,
+                                          &backup_mbmi, ctxt, num_planes);
+  mi_x = xd->mi_col << MI_SIZE_LOG2;
+  mi_y = left_mi_row << MI_SIZE_LOG2;
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+
+  for (int j = 0; j < num_planes; ++j) {
+    const struct macroblockd_plane *pd = &xd->plane[j];
+    int bw = clamp(block_size_wide[bsize] >> (pd->subsampling_x + 1), 4,
+                   block_size_wide[BLOCK_64X64] >> (pd->subsampling_x + 1));
+    int bh = (op_mi_size << MI_SIZE_LOG2) >> pd->subsampling_y;
+
+    if (av1_skip_u4x4_pred_in_obmc(bsize, pd, 1)) continue;
+    dec_build_inter_predictors(ctxt->cm, (DecoderCodingBlock *)ctxt->dcb, j,
+                               &backup_mbmi, 1, bw, bh, mi_x, mi_y);
+  }
+}
+
+static AOM_INLINE void dec_build_prediction_by_left_preds(
+    const AV1_COMMON *cm, DecoderCodingBlock *dcb,
+    uint8_t *tmp_buf[MAX_MB_PLANE], int tmp_width[MAX_MB_PLANE],
+    int tmp_height[MAX_MB_PLANE], int tmp_stride[MAX_MB_PLANE]) {
+  MACROBLOCKD *const xd = &dcb->xd;
+  if (!xd->left_available) return;
+
+  // Adjust mb_to_right_edge to have the correct value for the OBMC
+  // prediction block. This is half the width of the original block,
+  // except for 128-wide blocks, where we only use a width of 32.
+  const int this_width = xd->width * MI_SIZE;
+  const int pred_width = AOMMIN(this_width / 2, 32);
+  xd->mb_to_right_edge += GET_MV_SUBPEL(this_width - pred_width);
+
+  struct build_prediction_ctxt ctxt = {
+    cm, tmp_buf, tmp_width, tmp_height, tmp_stride, xd->mb_to_bottom_edge, dcb
+  };
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+  foreach_overlappable_nb_left(cm, xd,
+                               max_neighbor_obmc[mi_size_high_log2[bsize]],
+                               dec_build_prediction_by_left_pred, &ctxt);
+
+  xd->mb_to_top_edge = -GET_MV_SUBPEL(xd->mi_row * MI_SIZE);
+  xd->mb_to_right_edge -= GET_MV_SUBPEL(this_width - pred_width);
+  xd->mb_to_bottom_edge = ctxt.mb_to_far_edge;
+}
+
+static AOM_INLINE void dec_build_obmc_inter_predictors_sb(
+    const AV1_COMMON *cm, DecoderCodingBlock *dcb) {
+  const int num_planes = av1_num_planes(cm);
+  uint8_t *dst_buf1[MAX_MB_PLANE], *dst_buf2[MAX_MB_PLANE];
+  int dst_stride1[MAX_MB_PLANE] = { MAX_SB_SIZE, MAX_SB_SIZE, MAX_SB_SIZE };
+  int dst_stride2[MAX_MB_PLANE] = { MAX_SB_SIZE, MAX_SB_SIZE, MAX_SB_SIZE };
+  int dst_width1[MAX_MB_PLANE] = { MAX_SB_SIZE, MAX_SB_SIZE, MAX_SB_SIZE };
+  int dst_width2[MAX_MB_PLANE] = { MAX_SB_SIZE, MAX_SB_SIZE, MAX_SB_SIZE };
+  int dst_height1[MAX_MB_PLANE] = { MAX_SB_SIZE, MAX_SB_SIZE, MAX_SB_SIZE };
+  int dst_height2[MAX_MB_PLANE] = { MAX_SB_SIZE, MAX_SB_SIZE, MAX_SB_SIZE };
+
+  MACROBLOCKD *const xd = &dcb->xd;
+  av1_setup_obmc_dst_bufs(xd, dst_buf1, dst_buf2);
+
+  dec_build_prediction_by_above_preds(cm, dcb, dst_buf1, dst_width1,
+                                      dst_height1, dst_stride1);
+  dec_build_prediction_by_left_preds(cm, dcb, dst_buf2, dst_width2, dst_height2,
+                                     dst_stride2);
+  const int mi_row = xd->mi_row;
+  const int mi_col = xd->mi_col;
+  av1_setup_dst_planes(xd->plane, xd->mi[0]->bsize, &cm->cur_frame->buf, mi_row,
+                       mi_col, 0, num_planes);
+  av1_build_obmc_inter_prediction(cm, xd, dst_buf1, dst_stride1, dst_buf2,
+                                  dst_stride2);
+}
+
+static AOM_INLINE void cfl_store_inter_block(AV1_COMMON *const cm,
+                                             MACROBLOCKD *const xd) {
+  MB_MODE_INFO *mbmi = xd->mi[0];
+  if (store_cfl_required(cm, xd)) {
+    cfl_store_block(xd, mbmi->bsize, mbmi->tx_size);
+  }
+}
+
+static AOM_INLINE void predict_inter_block(AV1_COMMON *const cm,
+                                           DecoderCodingBlock *dcb,
+                                           BLOCK_SIZE bsize) {
+  MACROBLOCKD *const xd = &dcb->xd;
+  MB_MODE_INFO *mbmi = xd->mi[0];
+  const int num_planes = av1_num_planes(cm);
+  const int mi_row = xd->mi_row;
+  const int mi_col = xd->mi_col;
+  for (int ref = 0; ref < 1 + has_second_ref(mbmi); ++ref) {
+    const MV_REFERENCE_FRAME frame = mbmi->ref_frame[ref];
+    if (frame < LAST_FRAME) {
+      assert(is_intrabc_block(mbmi));
+      assert(frame == INTRA_FRAME);
+      assert(ref == 0);
+    } else {
+      const RefCntBuffer *ref_buf = get_ref_frame_buf(cm, frame);
+      const struct scale_factors *ref_scale_factors =
+          get_ref_scale_factors_const(cm, frame);
+
+      xd->block_ref_scale_factors[ref] = ref_scale_factors;
+      av1_setup_pre_planes(xd, ref, &ref_buf->buf, mi_row, mi_col,
+                           ref_scale_factors, num_planes);
+    }
+  }
+
+  dec_build_inter_predictor(cm, dcb, mi_row, mi_col, bsize);
+  if (mbmi->motion_mode == OBMC_CAUSAL) {
+    dec_build_obmc_inter_predictors_sb(cm, dcb);
+  }
+#if CONFIG_MISMATCH_DEBUG
+  for (int plane = 0; plane < num_planes; ++plane) {
+    const struct macroblockd_plane *pd = &xd->plane[plane];
+    int pixel_c, pixel_r;
+    mi_to_pixel_loc(&pixel_c, &pixel_r, mi_col, mi_row, 0, 0, pd->subsampling_x,
+                    pd->subsampling_y);
+    if (!is_chroma_reference(mi_row, mi_col, bsize, pd->subsampling_x,
+                             pd->subsampling_y))
+      continue;
+    mismatch_check_block_pre(pd->dst.buf, pd->dst.stride,
+                             cm->current_frame.order_hint, plane, pixel_c,
+                             pixel_r, pd->width, pd->height,
+                             xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH);
+  }
+#endif
+}
+
+static AOM_INLINE void set_color_index_map_offset(MACROBLOCKD *const xd,
+                                                  int plane, aom_reader *r) {
+  (void)r;
+  Av1ColorMapParam params;
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  av1_get_block_dimensions(mbmi->bsize, plane, xd, &params.plane_width,
+                           &params.plane_height, NULL, NULL);
+  xd->color_index_map_offset[plane] += params.plane_width * params.plane_height;
+}
+
+static AOM_INLINE void decode_token_recon_block(AV1Decoder *const pbi,
+                                                ThreadData *const td,
+                                                aom_reader *r,
+                                                BLOCK_SIZE bsize) {
+  AV1_COMMON *const cm = &pbi->common;
+  DecoderCodingBlock *const dcb = &td->dcb;
+  MACROBLOCKD *const xd = &dcb->xd;
+  const int num_planes = av1_num_planes(cm);
+  MB_MODE_INFO *mbmi = xd->mi[0];
+
+  if (!is_inter_block(mbmi)) {
+    int row, col;
+    assert(bsize == get_plane_block_size(bsize, xd->plane[0].subsampling_x,
+                                         xd->plane[0].subsampling_y));
+    const int max_blocks_wide = max_block_wide(xd, bsize, 0);
+    const int max_blocks_high = max_block_high(xd, bsize, 0);
+    const BLOCK_SIZE max_unit_bsize = BLOCK_64X64;
+    int mu_blocks_wide = mi_size_wide[max_unit_bsize];
+    int mu_blocks_high = mi_size_high[max_unit_bsize];
+    mu_blocks_wide = AOMMIN(max_blocks_wide, mu_blocks_wide);
+    mu_blocks_high = AOMMIN(max_blocks_high, mu_blocks_high);
+
+    for (row = 0; row < max_blocks_high; row += mu_blocks_high) {
+      for (col = 0; col < max_blocks_wide; col += mu_blocks_wide) {
+        for (int plane = 0; plane < num_planes; ++plane) {
+          if (plane && !xd->is_chroma_ref) break;
+          const struct macroblockd_plane *const pd = &xd->plane[plane];
+          const TX_SIZE tx_size = av1_get_tx_size(plane, xd);
+          const int stepr = tx_size_high_unit[tx_size];
+          const int stepc = tx_size_wide_unit[tx_size];
+
+          const int unit_height = ROUND_POWER_OF_TWO(
+              AOMMIN(mu_blocks_high + row, max_blocks_high), pd->subsampling_y);
+          const int unit_width = ROUND_POWER_OF_TWO(
+              AOMMIN(mu_blocks_wide + col, max_blocks_wide), pd->subsampling_x);
+
+          for (int blk_row = row >> pd->subsampling_y; blk_row < unit_height;
+               blk_row += stepr) {
+            for (int blk_col = col >> pd->subsampling_x; blk_col < unit_width;
+                 blk_col += stepc) {
+              td->read_coeffs_tx_intra_block_visit(cm, dcb, r, plane, blk_row,
+                                                   blk_col, tx_size);
+              td->predict_and_recon_intra_block_visit(
+                  cm, dcb, r, plane, blk_row, blk_col, tx_size);
+              set_cb_buffer_offsets(dcb, tx_size, plane);
+            }
+          }
+        }
+      }
+    }
+  } else {
+    td->predict_inter_block_visit(cm, dcb, bsize);
+    // Reconstruction
+    if (!mbmi->skip_txfm) {
+      int eobtotal = 0;
+
+      const int max_blocks_wide = max_block_wide(xd, bsize, 0);
+      const int max_blocks_high = max_block_high(xd, bsize, 0);
+      int row, col;
+
+      const BLOCK_SIZE max_unit_bsize = BLOCK_64X64;
+      assert(max_unit_bsize ==
+             get_plane_block_size(BLOCK_64X64, xd->plane[0].subsampling_x,
+                                  xd->plane[0].subsampling_y));
+      int mu_blocks_wide = mi_size_wide[max_unit_bsize];
+      int mu_blocks_high = mi_size_high[max_unit_bsize];
+
+      mu_blocks_wide = AOMMIN(max_blocks_wide, mu_blocks_wide);
+      mu_blocks_high = AOMMIN(max_blocks_high, mu_blocks_high);
+
+      for (row = 0; row < max_blocks_high; row += mu_blocks_high) {
+        for (col = 0; col < max_blocks_wide; col += mu_blocks_wide) {
+          for (int plane = 0; plane < num_planes; ++plane) {
+            if (plane && !xd->is_chroma_ref) break;
+            const struct macroblockd_plane *const pd = &xd->plane[plane];
+            const int ss_x = pd->subsampling_x;
+            const int ss_y = pd->subsampling_y;
+            const BLOCK_SIZE plane_bsize =
+                get_plane_block_size(bsize, ss_x, ss_y);
+            const TX_SIZE max_tx_size =
+                get_vartx_max_txsize(xd, plane_bsize, plane);
+            const int bh_var_tx = tx_size_high_unit[max_tx_size];
+            const int bw_var_tx = tx_size_wide_unit[max_tx_size];
+            int block = 0;
+            int step =
+                tx_size_wide_unit[max_tx_size] * tx_size_high_unit[max_tx_size];
+            int blk_row, blk_col;
+            const int unit_height = ROUND_POWER_OF_TWO(
+                AOMMIN(mu_blocks_high + row, max_blocks_high), ss_y);
+            const int unit_width = ROUND_POWER_OF_TWO(
+                AOMMIN(mu_blocks_wide + col, max_blocks_wide), ss_x);
+
+            for (blk_row = row >> ss_y; blk_row < unit_height;
+                 blk_row += bh_var_tx) {
+              for (blk_col = col >> ss_x; blk_col < unit_width;
+                   blk_col += bw_var_tx) {
+                decode_reconstruct_tx(cm, td, r, mbmi, plane, plane_bsize,
+                                      blk_row, blk_col, block, max_tx_size,
+                                      &eobtotal);
+                block += step;
+              }
+            }
+          }
+        }
+      }
+    }
+    td->cfl_store_inter_block_visit(cm, xd);
+  }
+
+  av1_visit_palette(pbi, xd, r, set_color_index_map_offset);
+}
+
+static AOM_INLINE void set_inter_tx_size(MB_MODE_INFO *mbmi, int stride_log2,
+                                         int tx_w_log2, int tx_h_log2,
+                                         int min_txs, int split_size, int txs,
+                                         int blk_row, int blk_col) {
+  for (int idy = 0; idy < tx_size_high_unit[split_size];
+       idy += tx_size_high_unit[min_txs]) {
+    for (int idx = 0; idx < tx_size_wide_unit[split_size];
+         idx += tx_size_wide_unit[min_txs]) {
+      const int index = (((blk_row + idy) >> tx_h_log2) << stride_log2) +
+                        ((blk_col + idx) >> tx_w_log2);
+      mbmi->inter_tx_size[index] = txs;
+    }
+  }
+}
+
+static AOM_INLINE void read_tx_size_vartx(MACROBLOCKD *xd, MB_MODE_INFO *mbmi,
+                                          TX_SIZE tx_size, int depth,
+#if CONFIG_LPF_MASK
+                                          AV1_COMMON *cm, int mi_row,
+                                          int mi_col, int store_bitmask,
+#endif
+                                          int blk_row, int blk_col,
+                                          aom_reader *r) {
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  int is_split = 0;
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  const int max_blocks_high = max_block_high(xd, bsize, 0);
+  const int max_blocks_wide = max_block_wide(xd, bsize, 0);
+  if (blk_row >= max_blocks_high || blk_col >= max_blocks_wide) return;
+  assert(tx_size > TX_4X4);
+  TX_SIZE txs = max_txsize_rect_lookup[bsize];
+  for (int level = 0; level < MAX_VARTX_DEPTH - 1; ++level)
+    txs = sub_tx_size_map[txs];
+  const int tx_w_log2 = tx_size_wide_log2[txs] - MI_SIZE_LOG2;
+  const int tx_h_log2 = tx_size_high_log2[txs] - MI_SIZE_LOG2;
+  const int bw_log2 = mi_size_wide_log2[bsize];
+  const int stride_log2 = bw_log2 - tx_w_log2;
+
+  if (depth == MAX_VARTX_DEPTH) {
+    set_inter_tx_size(mbmi, stride_log2, tx_w_log2, tx_h_log2, txs, tx_size,
+                      tx_size, blk_row, blk_col);
+    mbmi->tx_size = tx_size;
+    txfm_partition_update(xd->above_txfm_context + blk_col,
+                          xd->left_txfm_context + blk_row, tx_size, tx_size);
+    return;
+  }
+
+  const int ctx = txfm_partition_context(xd->above_txfm_context + blk_col,
+                                         xd->left_txfm_context + blk_row,
+                                         mbmi->bsize, tx_size);
+  is_split = aom_read_symbol(r, ec_ctx->txfm_partition_cdf[ctx], 2, ACCT_STR);
+
+  if (is_split) {
+    const TX_SIZE sub_txs = sub_tx_size_map[tx_size];
+    const int bsw = tx_size_wide_unit[sub_txs];
+    const int bsh = tx_size_high_unit[sub_txs];
+
+    if (sub_txs == TX_4X4) {
+      set_inter_tx_size(mbmi, stride_log2, tx_w_log2, tx_h_log2, txs, tx_size,
+                        sub_txs, blk_row, blk_col);
+      mbmi->tx_size = sub_txs;
+      txfm_partition_update(xd->above_txfm_context + blk_col,
+                            xd->left_txfm_context + blk_row, sub_txs, tx_size);
+#if CONFIG_LPF_MASK
+      if (store_bitmask) {
+        av1_store_bitmask_vartx(cm, mi_row + blk_row, mi_col + blk_col,
+                                txsize_to_bsize[tx_size], TX_4X4, mbmi);
+      }
+#endif
+      return;
+    }
+#if CONFIG_LPF_MASK
+    if (depth + 1 == MAX_VARTX_DEPTH && store_bitmask) {
+      av1_store_bitmask_vartx(cm, mi_row + blk_row, mi_col + blk_col,
+                              txsize_to_bsize[tx_size], sub_txs, mbmi);
+      store_bitmask = 0;
+    }
+#endif
+
+    assert(bsw > 0 && bsh > 0);
+    for (int row = 0; row < tx_size_high_unit[tx_size]; row += bsh) {
+      for (int col = 0; col < tx_size_wide_unit[tx_size]; col += bsw) {
+        int offsetr = blk_row + row;
+        int offsetc = blk_col + col;
+        read_tx_size_vartx(xd, mbmi, sub_txs, depth + 1,
+#if CONFIG_LPF_MASK
+                           cm, mi_row, mi_col, store_bitmask,
+#endif
+                           offsetr, offsetc, r);
+      }
+    }
+  } else {
+    set_inter_tx_size(mbmi, stride_log2, tx_w_log2, tx_h_log2, txs, tx_size,
+                      tx_size, blk_row, blk_col);
+    mbmi->tx_size = tx_size;
+    txfm_partition_update(xd->above_txfm_context + blk_col,
+                          xd->left_txfm_context + blk_row, tx_size, tx_size);
+#if CONFIG_LPF_MASK
+    if (store_bitmask) {
+      av1_store_bitmask_vartx(cm, mi_row + blk_row, mi_col + blk_col,
+                              txsize_to_bsize[tx_size], tx_size, mbmi);
+    }
+#endif
+  }
+}
+
+static TX_SIZE read_selected_tx_size(const MACROBLOCKD *const xd,
+                                     aom_reader *r) {
+  // TODO(debargha): Clean up the logic here. This function should only
+  // be called for intra.
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+  const int32_t tx_size_cat = bsize_to_tx_size_cat(bsize);
+  const int max_depths = bsize_to_max_depth(bsize);
+  const int ctx = get_tx_size_context(xd);
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  const int depth = aom_read_symbol(r, ec_ctx->tx_size_cdf[tx_size_cat][ctx],
+                                    max_depths + 1, ACCT_STR);
+  assert(depth >= 0 && depth <= max_depths);
+  const TX_SIZE tx_size = depth_to_tx_size(depth, bsize);
+  return tx_size;
+}
+
+static TX_SIZE read_tx_size(const MACROBLOCKD *const xd, TX_MODE tx_mode,
+                            int is_inter, int allow_select_inter,
+                            aom_reader *r) {
+  const BLOCK_SIZE bsize = xd->mi[0]->bsize;
+  if (xd->lossless[xd->mi[0]->segment_id]) return TX_4X4;
+
+  if (block_signals_txsize(bsize)) {
+    if ((!is_inter || allow_select_inter) && tx_mode == TX_MODE_SELECT) {
+      const TX_SIZE coded_tx_size = read_selected_tx_size(xd, r);
+      return coded_tx_size;
+    } else {
+      return tx_size_from_tx_mode(bsize, tx_mode);
+    }
+  } else {
+    assert(IMPLIES(tx_mode == ONLY_4X4, bsize == BLOCK_4X4));
+    return max_txsize_rect_lookup[bsize];
+  }
+}
+
+static AOM_INLINE void parse_decode_block(AV1Decoder *const pbi,
+                                          ThreadData *const td, int mi_row,
+                                          int mi_col, aom_reader *r,
+                                          PARTITION_TYPE partition,
+                                          BLOCK_SIZE bsize) {
+  DecoderCodingBlock *const dcb = &td->dcb;
+  MACROBLOCKD *const xd = &dcb->xd;
+  decode_mbmi_block(pbi, dcb, mi_row, mi_col, r, partition, bsize);
+
+  av1_visit_palette(pbi, xd, r, av1_decode_palette_tokens);
+
+  AV1_COMMON *cm = &pbi->common;
+  const int num_planes = av1_num_planes(cm);
+  MB_MODE_INFO *mbmi = xd->mi[0];
+  int inter_block_tx = is_inter_block(mbmi) || is_intrabc_block(mbmi);
+  if (cm->features.tx_mode == TX_MODE_SELECT && block_signals_txsize(bsize) &&
+      !mbmi->skip_txfm && inter_block_tx && !xd->lossless[mbmi->segment_id]) {
+    const TX_SIZE max_tx_size = max_txsize_rect_lookup[bsize];
+    const int bh = tx_size_high_unit[max_tx_size];
+    const int bw = tx_size_wide_unit[max_tx_size];
+    const int width = mi_size_wide[bsize];
+    const int height = mi_size_high[bsize];
+
+    for (int idy = 0; idy < height; idy += bh)
+      for (int idx = 0; idx < width; idx += bw)
+        read_tx_size_vartx(xd, mbmi, max_tx_size, 0,
+#if CONFIG_LPF_MASK
+                           cm, mi_row, mi_col, 1,
+#endif
+                           idy, idx, r);
+  } else {
+    mbmi->tx_size = read_tx_size(xd, cm->features.tx_mode, inter_block_tx,
+                                 !mbmi->skip_txfm, r);
+    if (inter_block_tx)
+      memset(mbmi->inter_tx_size, mbmi->tx_size, sizeof(mbmi->inter_tx_size));
+    set_txfm_ctxs(mbmi->tx_size, xd->width, xd->height,
+                  mbmi->skip_txfm && is_inter_block(mbmi), xd);
+#if CONFIG_LPF_MASK
+    const int w = mi_size_wide[bsize];
+    const int h = mi_size_high[bsize];
+    if (w <= mi_size_wide[BLOCK_64X64] && h <= mi_size_high[BLOCK_64X64]) {
+      av1_store_bitmask_univariant_tx(cm, mi_row, mi_col, bsize, mbmi);
+    } else {
+      for (int row = 0; row < h; row += mi_size_high[BLOCK_64X64]) {
+        for (int col = 0; col < w; col += mi_size_wide[BLOCK_64X64]) {
+          av1_store_bitmask_univariant_tx(cm, mi_row + row, mi_col + col,
+                                          BLOCK_64X64, mbmi);
+        }
+      }
+    }
+#endif
+  }
+#if CONFIG_LPF_MASK
+  const int w = mi_size_wide[bsize];
+  const int h = mi_size_high[bsize];
+  if (w <= mi_size_wide[BLOCK_64X64] && h <= mi_size_high[BLOCK_64X64]) {
+    av1_store_bitmask_other_info(cm, mi_row, mi_col, bsize, mbmi, 1, 1);
+  } else {
+    for (int row = 0; row < h; row += mi_size_high[BLOCK_64X64]) {
+      for (int col = 0; col < w; col += mi_size_wide[BLOCK_64X64]) {
+        av1_store_bitmask_other_info(cm, mi_row + row, mi_col + col,
+                                     BLOCK_64X64, mbmi, row == 0, col == 0);
+      }
+    }
+  }
+#endif
+
+  if (cm->delta_q_info.delta_q_present_flag) {
+    for (int i = 0; i < MAX_SEGMENTS; i++) {
+      const int current_qindex =
+          av1_get_qindex(&cm->seg, i, xd->current_base_qindex);
+      const CommonQuantParams *const quant_params = &cm->quant_params;
+      for (int j = 0; j < num_planes; ++j) {
+        const int dc_delta_q = j == 0 ? quant_params->y_dc_delta_q
+                                      : (j == 1 ? quant_params->u_dc_delta_q
+                                                : quant_params->v_dc_delta_q);
+        const int ac_delta_q = j == 0 ? 0
+                                      : (j == 1 ? quant_params->u_ac_delta_q
+                                                : quant_params->v_ac_delta_q);
+        xd->plane[j].seg_dequant_QTX[i][0] = av1_dc_quant_QTX(
+            current_qindex, dc_delta_q, cm->seq_params.bit_depth);
+        xd->plane[j].seg_dequant_QTX[i][1] = av1_ac_quant_QTX(
+            current_qindex, ac_delta_q, cm->seq_params.bit_depth);
+      }
+    }
+  }
+  if (mbmi->skip_txfm) av1_reset_entropy_context(xd, bsize, num_planes);
+
+  decode_token_recon_block(pbi, td, r, bsize);
+}
+
+static AOM_INLINE void set_offsets_for_pred_and_recon(AV1Decoder *const pbi,
+                                                      ThreadData *const td,
+                                                      int mi_row, int mi_col,
+                                                      BLOCK_SIZE bsize) {
+  AV1_COMMON *const cm = &pbi->common;
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+  DecoderCodingBlock *const dcb = &td->dcb;
+  MACROBLOCKD *const xd = &dcb->xd;
+  const int bw = mi_size_wide[bsize];
+  const int bh = mi_size_high[bsize];
+  const int num_planes = av1_num_planes(cm);
+
+  const int offset = mi_row * mi_params->mi_stride + mi_col;
+  const TileInfo *const tile = &xd->tile;
+
+  xd->mi = mi_params->mi_grid_base + offset;
+  xd->tx_type_map =
+      &mi_params->tx_type_map[mi_row * mi_params->mi_stride + mi_col];
+  xd->tx_type_map_stride = mi_params->mi_stride;
+
+  set_plane_n4(xd, bw, bh, num_planes);
+
+  // Distance of Mb to the various image edges. These are specified to 8th pel
+  // as they are always compared to values that are in 1/8th pel units
+  set_mi_row_col(xd, tile, mi_row, bh, mi_col, bw, mi_params->mi_rows,
+                 mi_params->mi_cols);
+
+  av1_setup_dst_planes(xd->plane, bsize, &cm->cur_frame->buf, mi_row, mi_col, 0,
+                       num_planes);
+}
+
+static AOM_INLINE void decode_block(AV1Decoder *const pbi, ThreadData *const td,
+                                    int mi_row, int mi_col, aom_reader *r,
+                                    PARTITION_TYPE partition,
+                                    BLOCK_SIZE bsize) {
+  (void)partition;
+  set_offsets_for_pred_and_recon(pbi, td, mi_row, mi_col, bsize);
+  decode_token_recon_block(pbi, td, r, bsize);
+}
+
+static PARTITION_TYPE read_partition(MACROBLOCKD *xd, int mi_row, int mi_col,
+                                     aom_reader *r, int has_rows, int has_cols,
+                                     BLOCK_SIZE bsize) {
+  const int ctx = partition_plane_context(xd, mi_row, mi_col, bsize);
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+
+  if (!has_rows && !has_cols) return PARTITION_SPLIT;
+
+  assert(ctx >= 0);
+  aom_cdf_prob *partition_cdf = ec_ctx->partition_cdf[ctx];
+  if (has_rows && has_cols) {
+    return (PARTITION_TYPE)aom_read_symbol(
+        r, partition_cdf, partition_cdf_length(bsize), ACCT_STR);
+  } else if (!has_rows && has_cols) {
+    assert(bsize > BLOCK_8X8);
+    aom_cdf_prob cdf[2];
+    partition_gather_vert_alike(cdf, partition_cdf, bsize);
+    assert(cdf[1] == AOM_ICDF(CDF_PROB_TOP));
+    return aom_read_cdf(r, cdf, 2, ACCT_STR) ? PARTITION_SPLIT : PARTITION_HORZ;
+  } else {
+    assert(has_rows && !has_cols);
+    assert(bsize > BLOCK_8X8);
+    aom_cdf_prob cdf[2];
+    partition_gather_horz_alike(cdf, partition_cdf, bsize);
+    assert(cdf[1] == AOM_ICDF(CDF_PROB_TOP));
+    return aom_read_cdf(r, cdf, 2, ACCT_STR) ? PARTITION_SPLIT : PARTITION_VERT;
+  }
+}
+
+// TODO(slavarnway): eliminate bsize and subsize in future commits
+static AOM_INLINE void decode_partition(AV1Decoder *const pbi,
+                                        ThreadData *const td, int mi_row,
+                                        int mi_col, aom_reader *reader,
+                                        BLOCK_SIZE bsize,
+                                        int parse_decode_flag) {
+  assert(bsize < BLOCK_SIZES_ALL);
+  AV1_COMMON *const cm = &pbi->common;
+  DecoderCodingBlock *const dcb = &td->dcb;
+  MACROBLOCKD *const xd = &dcb->xd;
+  const int bw = mi_size_wide[bsize];
+  const int hbs = bw >> 1;
+  PARTITION_TYPE partition;
+  BLOCK_SIZE subsize;
+  const int quarter_step = bw / 4;
+  BLOCK_SIZE bsize2 = get_partition_subsize(bsize, PARTITION_SPLIT);
+  const int has_rows = (mi_row + hbs) < cm->mi_params.mi_rows;
+  const int has_cols = (mi_col + hbs) < cm->mi_params.mi_cols;
+
+  if (mi_row >= cm->mi_params.mi_rows || mi_col >= cm->mi_params.mi_cols)
+    return;
+
+  // parse_decode_flag takes the following values :
+  // 01 - do parse only
+  // 10 - do decode only
+  // 11 - do parse and decode
+  static const block_visitor_fn_t block_visit[4] = { NULL, parse_decode_block,
+                                                     decode_block,
+                                                     parse_decode_block };
+
+  if (parse_decode_flag & 1) {
+#if !CONFIG_REALTIME_ONLY
+    const int num_planes = av1_num_planes(cm);
+    for (int plane = 0; plane < num_planes; ++plane) {
+      int rcol0, rcol1, rrow0, rrow1;
+      if (av1_loop_restoration_corners_in_sb(cm, plane, mi_row, mi_col, bsize,
+                                             &rcol0, &rcol1, &rrow0, &rrow1)) {
+        const int rstride = cm->rst_info[plane].horz_units_per_tile;
+        for (int rrow = rrow0; rrow < rrow1; ++rrow) {
+          for (int rcol = rcol0; rcol < rcol1; ++rcol) {
+            const int runit_idx = rcol + rrow * rstride;
+            loop_restoration_read_sb_coeffs(cm, xd, reader, plane, runit_idx);
+          }
+        }
+      }
+    }
+#endif
+
+    partition = (bsize < BLOCK_8X8) ? PARTITION_NONE
+                                    : read_partition(xd, mi_row, mi_col, reader,
+                                                     has_rows, has_cols, bsize);
+  } else {
+    partition = get_partition(cm, mi_row, mi_col, bsize);
+  }
+  subsize = get_partition_subsize(bsize, partition);
+  if (subsize == BLOCK_INVALID) {
+    aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
+                       "Partition is invalid for block size %dx%d",
+                       block_size_wide[bsize], block_size_high[bsize]);
+  }
+  // Check the bitstream is conformant: if there is subsampling on the
+  // chroma planes, subsize must subsample to a valid block size.
+  const struct macroblockd_plane *const pd_u = &xd->plane[1];
+  if (get_plane_block_size(subsize, pd_u->subsampling_x, pd_u->subsampling_y) ==
+      BLOCK_INVALID) {
+    aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
+                       "Block size %dx%d invalid with this subsampling mode",
+                       block_size_wide[subsize], block_size_high[subsize]);
+  }
+
+#define DEC_BLOCK_STX_ARG
+#define DEC_BLOCK_EPT_ARG partition,
+#define DEC_BLOCK(db_r, db_c, db_subsize)                                  \
+  block_visit[parse_decode_flag](pbi, td, DEC_BLOCK_STX_ARG(db_r), (db_c), \
+                                 reader, DEC_BLOCK_EPT_ARG(db_subsize))
+#define DEC_PARTITION(db_r, db_c, db_subsize)                        \
+  decode_partition(pbi, td, DEC_BLOCK_STX_ARG(db_r), (db_c), reader, \
+                   (db_subsize), parse_decode_flag)
+
+  switch (partition) {
+    case PARTITION_NONE: DEC_BLOCK(mi_row, mi_col, subsize); break;
+    case PARTITION_HORZ:
+      DEC_BLOCK(mi_row, mi_col, subsize);
+      if (has_rows) DEC_BLOCK(mi_row + hbs, mi_col, subsize);
+      break;
+    case PARTITION_VERT:
+      DEC_BLOCK(mi_row, mi_col, subsize);
+      if (has_cols) DEC_BLOCK(mi_row, mi_col + hbs, subsize);
+      break;
+    case PARTITION_SPLIT:
+      DEC_PARTITION(mi_row, mi_col, subsize);
+      DEC_PARTITION(mi_row, mi_col + hbs, subsize);
+      DEC_PARTITION(mi_row + hbs, mi_col, subsize);
+      DEC_PARTITION(mi_row + hbs, mi_col + hbs, subsize);
+      break;
+    case PARTITION_HORZ_A:
+      DEC_BLOCK(mi_row, mi_col, bsize2);
+      DEC_BLOCK(mi_row, mi_col + hbs, bsize2);
+      DEC_BLOCK(mi_row + hbs, mi_col, subsize);
+      break;
+    case PARTITION_HORZ_B:
+      DEC_BLOCK(mi_row, mi_col, subsize);
+      DEC_BLOCK(mi_row + hbs, mi_col, bsize2);
+      DEC_BLOCK(mi_row + hbs, mi_col + hbs, bsize2);
+      break;
+    case PARTITION_VERT_A:
+      DEC_BLOCK(mi_row, mi_col, bsize2);
+      DEC_BLOCK(mi_row + hbs, mi_col, bsize2);
+      DEC_BLOCK(mi_row, mi_col + hbs, subsize);
+      break;
+    case PARTITION_VERT_B:
+      DEC_BLOCK(mi_row, mi_col, subsize);
+      DEC_BLOCK(mi_row, mi_col + hbs, bsize2);
+      DEC_BLOCK(mi_row + hbs, mi_col + hbs, bsize2);
+      break;
+    case PARTITION_HORZ_4:
+      for (int i = 0; i < 4; ++i) {
+        int this_mi_row = mi_row + i * quarter_step;
+        if (i > 0 && this_mi_row >= cm->mi_params.mi_rows) break;
+        DEC_BLOCK(this_mi_row, mi_col, subsize);
+      }
+      break;
+    case PARTITION_VERT_4:
+      for (int i = 0; i < 4; ++i) {
+        int this_mi_col = mi_col + i * quarter_step;
+        if (i > 0 && this_mi_col >= cm->mi_params.mi_cols) break;
+        DEC_BLOCK(mi_row, this_mi_col, subsize);
+      }
+      break;
+    default: assert(0 && "Invalid partition type");
+  }
+
+#undef DEC_PARTITION
+#undef DEC_BLOCK
+#undef DEC_BLOCK_EPT_ARG
+#undef DEC_BLOCK_STX_ARG
+
+  if (parse_decode_flag & 1)
+    update_ext_partition_context(xd, mi_row, mi_col, subsize, bsize, partition);
+}
+
+static AOM_INLINE void setup_bool_decoder(
+    const uint8_t *data, const uint8_t *data_end, const size_t read_size,
+    struct aom_internal_error_info *error_info, aom_reader *r,
+    uint8_t allow_update_cdf) {
+  // Validate the calculated partition length. If the buffer
+  // described by the partition can't be fully read, then restrict
+  // it to the portion that can be (for EC mode) or throw an error.
+  if (!read_is_valid(data, read_size, data_end))
+    aom_internal_error(error_info, AOM_CODEC_CORRUPT_FRAME,
+                       "Truncated packet or corrupt tile length");
+
+  if (aom_reader_init(r, data, read_size))
+    aom_internal_error(error_info, AOM_CODEC_MEM_ERROR,
+                       "Failed to allocate bool decoder %d", 1);
+
+  r->allow_update_cdf = allow_update_cdf;
+}
+
+static AOM_INLINE void setup_segmentation(AV1_COMMON *const cm,
+                                          struct aom_read_bit_buffer *rb) {
+  struct segmentation *const seg = &cm->seg;
+
+  seg->update_map = 0;
+  seg->update_data = 0;
+  seg->temporal_update = 0;
+
+  seg->enabled = aom_rb_read_bit(rb);
+  if (!seg->enabled) {
+    if (cm->cur_frame->seg_map) {
+      memset(cm->cur_frame->seg_map, 0,
+             (cm->cur_frame->mi_rows * cm->cur_frame->mi_cols));
+    }
+
+    memset(seg, 0, sizeof(*seg));
+    segfeatures_copy(&cm->cur_frame->seg, seg);
+    return;
+  }
+  if (cm->seg.enabled && cm->prev_frame &&
+      (cm->mi_params.mi_rows == cm->prev_frame->mi_rows) &&
+      (cm->mi_params.mi_cols == cm->prev_frame->mi_cols)) {
+    cm->last_frame_seg_map = cm->prev_frame->seg_map;
+  } else {
+    cm->last_frame_seg_map = NULL;
+  }
+  // Read update flags
+  if (cm->features.primary_ref_frame == PRIMARY_REF_NONE) {
+    // These frames can't use previous frames, so must signal map + features
+    seg->update_map = 1;
+    seg->temporal_update = 0;
+    seg->update_data = 1;
+  } else {
+    seg->update_map = aom_rb_read_bit(rb);
+    if (seg->update_map) {
+      seg->temporal_update = aom_rb_read_bit(rb);
+    } else {
+      seg->temporal_update = 0;
+    }
+    seg->update_data = aom_rb_read_bit(rb);
+  }
+
+  // Segmentation data update
+  if (seg->update_data) {
+    av1_clearall_segfeatures(seg);
+
+    for (int i = 0; i < MAX_SEGMENTS; i++) {
+      for (int j = 0; j < SEG_LVL_MAX; j++) {
+        int data = 0;
+        const int feature_enabled = aom_rb_read_bit(rb);
+        if (feature_enabled) {
+          av1_enable_segfeature(seg, i, j);
+
+          const int data_max = av1_seg_feature_data_max(j);
+          const int data_min = -data_max;
+          const int ubits = get_unsigned_bits(data_max);
+
+          if (av1_is_segfeature_signed(j)) {
+            data = aom_rb_read_inv_signed_literal(rb, ubits);
+          } else {
+            data = aom_rb_read_literal(rb, ubits);
+          }
+
+          data = clamp(data, data_min, data_max);
+        }
+        av1_set_segdata(seg, i, j, data);
+      }
+    }
+    av1_calculate_segdata(seg);
+  } else if (cm->prev_frame) {
+    segfeatures_copy(seg, &cm->prev_frame->seg);
+  }
+  segfeatures_copy(&cm->cur_frame->seg, seg);
+}
+
+static AOM_INLINE void decode_restoration_mode(AV1_COMMON *cm,
+                                               struct aom_read_bit_buffer *rb) {
+  assert(!cm->features.all_lossless);
+  const int num_planes = av1_num_planes(cm);
+  if (cm->features.allow_intrabc) return;
+  int all_none = 1, chroma_none = 1;
+  for (int p = 0; p < num_planes; ++p) {
+    RestorationInfo *rsi = &cm->rst_info[p];
+    if (aom_rb_read_bit(rb)) {
+      rsi->frame_restoration_type =
+          aom_rb_read_bit(rb) ? RESTORE_SGRPROJ : RESTORE_WIENER;
+    } else {
+      rsi->frame_restoration_type =
+          aom_rb_read_bit(rb) ? RESTORE_SWITCHABLE : RESTORE_NONE;
+    }
+    if (rsi->frame_restoration_type != RESTORE_NONE) {
+      all_none = 0;
+      chroma_none &= p == 0;
+    }
+  }
+  if (!all_none) {
+    assert(cm->seq_params.sb_size == BLOCK_64X64 ||
+           cm->seq_params.sb_size == BLOCK_128X128);
+    const int sb_size = cm->seq_params.sb_size == BLOCK_128X128 ? 128 : 64;
+
+    for (int p = 0; p < num_planes; ++p)
+      cm->rst_info[p].restoration_unit_size = sb_size;
+
+    RestorationInfo *rsi = &cm->rst_info[0];
+
+    if (sb_size == 64) {
+      rsi->restoration_unit_size <<= aom_rb_read_bit(rb);
+    }
+    if (rsi->restoration_unit_size > 64) {
+      rsi->restoration_unit_size <<= aom_rb_read_bit(rb);
+    }
+  } else {
+    const int size = RESTORATION_UNITSIZE_MAX;
+    for (int p = 0; p < num_planes; ++p)
+      cm->rst_info[p].restoration_unit_size = size;
+  }
+
+  if (num_planes > 1) {
+    int s = AOMMIN(cm->seq_params.subsampling_x, cm->seq_params.subsampling_y);
+    if (s && !chroma_none) {
+      cm->rst_info[1].restoration_unit_size =
+          cm->rst_info[0].restoration_unit_size >> (aom_rb_read_bit(rb) * s);
+    } else {
+      cm->rst_info[1].restoration_unit_size =
+          cm->rst_info[0].restoration_unit_size;
+    }
+    cm->rst_info[2].restoration_unit_size =
+        cm->rst_info[1].restoration_unit_size;
+  }
+}
+
+#if !CONFIG_REALTIME_ONLY
+static AOM_INLINE void read_wiener_filter(int wiener_win,
+                                          WienerInfo *wiener_info,
+                                          WienerInfo *ref_wiener_info,
+                                          aom_reader *rb) {
+  memset(wiener_info->vfilter, 0, sizeof(wiener_info->vfilter));
+  memset(wiener_info->hfilter, 0, sizeof(wiener_info->hfilter));
+
+  if (wiener_win == WIENER_WIN)
+    wiener_info->vfilter[0] = wiener_info->vfilter[WIENER_WIN - 1] =
+        aom_read_primitive_refsubexpfin(
+            rb, WIENER_FILT_TAP0_MAXV - WIENER_FILT_TAP0_MINV + 1,
+            WIENER_FILT_TAP0_SUBEXP_K,
+            ref_wiener_info->vfilter[0] - WIENER_FILT_TAP0_MINV, ACCT_STR) +
+        WIENER_FILT_TAP0_MINV;
+  else
+    wiener_info->vfilter[0] = wiener_info->vfilter[WIENER_WIN - 1] = 0;
+  wiener_info->vfilter[1] = wiener_info->vfilter[WIENER_WIN - 2] =
+      aom_read_primitive_refsubexpfin(
+          rb, WIENER_FILT_TAP1_MAXV - WIENER_FILT_TAP1_MINV + 1,
+          WIENER_FILT_TAP1_SUBEXP_K,
+          ref_wiener_info->vfilter[1] - WIENER_FILT_TAP1_MINV, ACCT_STR) +
+      WIENER_FILT_TAP1_MINV;
+  wiener_info->vfilter[2] = wiener_info->vfilter[WIENER_WIN - 3] =
+      aom_read_primitive_refsubexpfin(
+          rb, WIENER_FILT_TAP2_MAXV - WIENER_FILT_TAP2_MINV + 1,
+          WIENER_FILT_TAP2_SUBEXP_K,
+          ref_wiener_info->vfilter[2] - WIENER_FILT_TAP2_MINV, ACCT_STR) +
+      WIENER_FILT_TAP2_MINV;
+  // The central element has an implicit +WIENER_FILT_STEP
+  wiener_info->vfilter[WIENER_HALFWIN] =
+      -2 * (wiener_info->vfilter[0] + wiener_info->vfilter[1] +
+            wiener_info->vfilter[2]);
+
+  if (wiener_win == WIENER_WIN)
+    wiener_info->hfilter[0] = wiener_info->hfilter[WIENER_WIN - 1] =
+        aom_read_primitive_refsubexpfin(
+            rb, WIENER_FILT_TAP0_MAXV - WIENER_FILT_TAP0_MINV + 1,
+            WIENER_FILT_TAP0_SUBEXP_K,
+            ref_wiener_info->hfilter[0] - WIENER_FILT_TAP0_MINV, ACCT_STR) +
+        WIENER_FILT_TAP0_MINV;
+  else
+    wiener_info->hfilter[0] = wiener_info->hfilter[WIENER_WIN - 1] = 0;
+  wiener_info->hfilter[1] = wiener_info->hfilter[WIENER_WIN - 2] =
+      aom_read_primitive_refsubexpfin(
+          rb, WIENER_FILT_TAP1_MAXV - WIENER_FILT_TAP1_MINV + 1,
+          WIENER_FILT_TAP1_SUBEXP_K,
+          ref_wiener_info->hfilter[1] - WIENER_FILT_TAP1_MINV, ACCT_STR) +
+      WIENER_FILT_TAP1_MINV;
+  wiener_info->hfilter[2] = wiener_info->hfilter[WIENER_WIN - 3] =
+      aom_read_primitive_refsubexpfin(
+          rb, WIENER_FILT_TAP2_MAXV - WIENER_FILT_TAP2_MINV + 1,
+          WIENER_FILT_TAP2_SUBEXP_K,
+          ref_wiener_info->hfilter[2] - WIENER_FILT_TAP2_MINV, ACCT_STR) +
+      WIENER_FILT_TAP2_MINV;
+  // The central element has an implicit +WIENER_FILT_STEP
+  wiener_info->hfilter[WIENER_HALFWIN] =
+      -2 * (wiener_info->hfilter[0] + wiener_info->hfilter[1] +
+            wiener_info->hfilter[2]);
+  memcpy(ref_wiener_info, wiener_info, sizeof(*wiener_info));
+}
+
+static AOM_INLINE void read_sgrproj_filter(SgrprojInfo *sgrproj_info,
+                                           SgrprojInfo *ref_sgrproj_info,
+                                           aom_reader *rb) {
+  sgrproj_info->ep = aom_read_literal(rb, SGRPROJ_PARAMS_BITS, ACCT_STR);
+  const sgr_params_type *params = &av1_sgr_params[sgrproj_info->ep];
+
+  if (params->r[0] == 0) {
+    sgrproj_info->xqd[0] = 0;
+    sgrproj_info->xqd[1] =
+        aom_read_primitive_refsubexpfin(
+            rb, SGRPROJ_PRJ_MAX1 - SGRPROJ_PRJ_MIN1 + 1, SGRPROJ_PRJ_SUBEXP_K,
+            ref_sgrproj_info->xqd[1] - SGRPROJ_PRJ_MIN1, ACCT_STR) +
+        SGRPROJ_PRJ_MIN1;
+  } else if (params->r[1] == 0) {
+    sgrproj_info->xqd[0] =
+        aom_read_primitive_refsubexpfin(
+            rb, SGRPROJ_PRJ_MAX0 - SGRPROJ_PRJ_MIN0 + 1, SGRPROJ_PRJ_SUBEXP_K,
+            ref_sgrproj_info->xqd[0] - SGRPROJ_PRJ_MIN0, ACCT_STR) +
+        SGRPROJ_PRJ_MIN0;
+    sgrproj_info->xqd[1] = clamp((1 << SGRPROJ_PRJ_BITS) - sgrproj_info->xqd[0],
+                                 SGRPROJ_PRJ_MIN1, SGRPROJ_PRJ_MAX1);
+  } else {
+    sgrproj_info->xqd[0] =
+        aom_read_primitive_refsubexpfin(
+            rb, SGRPROJ_PRJ_MAX0 - SGRPROJ_PRJ_MIN0 + 1, SGRPROJ_PRJ_SUBEXP_K,
+            ref_sgrproj_info->xqd[0] - SGRPROJ_PRJ_MIN0, ACCT_STR) +
+        SGRPROJ_PRJ_MIN0;
+    sgrproj_info->xqd[1] =
+        aom_read_primitive_refsubexpfin(
+            rb, SGRPROJ_PRJ_MAX1 - SGRPROJ_PRJ_MIN1 + 1, SGRPROJ_PRJ_SUBEXP_K,
+            ref_sgrproj_info->xqd[1] - SGRPROJ_PRJ_MIN1, ACCT_STR) +
+        SGRPROJ_PRJ_MIN1;
+  }
+
+  memcpy(ref_sgrproj_info, sgrproj_info, sizeof(*sgrproj_info));
+}
+
+static AOM_INLINE void loop_restoration_read_sb_coeffs(
+    const AV1_COMMON *const cm, MACROBLOCKD *xd, aom_reader *const r, int plane,
+    int runit_idx) {
+  const RestorationInfo *rsi = &cm->rst_info[plane];
+  RestorationUnitInfo *rui = &rsi->unit_info[runit_idx];
+  assert(rsi->frame_restoration_type != RESTORE_NONE);
+
+  assert(!cm->features.all_lossless);
+
+  const int wiener_win = (plane > 0) ? WIENER_WIN_CHROMA : WIENER_WIN;
+  WienerInfo *wiener_info = xd->wiener_info + plane;
+  SgrprojInfo *sgrproj_info = xd->sgrproj_info + plane;
+
+  if (rsi->frame_restoration_type == RESTORE_SWITCHABLE) {
+    rui->restoration_type =
+        aom_read_symbol(r, xd->tile_ctx->switchable_restore_cdf,
+                        RESTORE_SWITCHABLE_TYPES, ACCT_STR);
+    switch (rui->restoration_type) {
+      case RESTORE_WIENER:
+        read_wiener_filter(wiener_win, &rui->wiener_info, wiener_info, r);
+        break;
+      case RESTORE_SGRPROJ:
+        read_sgrproj_filter(&rui->sgrproj_info, sgrproj_info, r);
+        break;
+      default: assert(rui->restoration_type == RESTORE_NONE); break;
+    }
+  } else if (rsi->frame_restoration_type == RESTORE_WIENER) {
+    if (aom_read_symbol(r, xd->tile_ctx->wiener_restore_cdf, 2, ACCT_STR)) {
+      rui->restoration_type = RESTORE_WIENER;
+      read_wiener_filter(wiener_win, &rui->wiener_info, wiener_info, r);
+    } else {
+      rui->restoration_type = RESTORE_NONE;
+    }
+  } else if (rsi->frame_restoration_type == RESTORE_SGRPROJ) {
+    if (aom_read_symbol(r, xd->tile_ctx->sgrproj_restore_cdf, 2, ACCT_STR)) {
+      rui->restoration_type = RESTORE_SGRPROJ;
+      read_sgrproj_filter(&rui->sgrproj_info, sgrproj_info, r);
+    } else {
+      rui->restoration_type = RESTORE_NONE;
+    }
+  }
+}
+#endif  // !CONFIG_REALTIME_ONLY
+
+static AOM_INLINE void setup_loopfilter(AV1_COMMON *cm,
+                                        struct aom_read_bit_buffer *rb) {
+  const int num_planes = av1_num_planes(cm);
+  struct loopfilter *lf = &cm->lf;
+
+  if (cm->features.allow_intrabc || cm->features.coded_lossless) {
+    // write default deltas to frame buffer
+    av1_set_default_ref_deltas(cm->cur_frame->ref_deltas);
+    av1_set_default_mode_deltas(cm->cur_frame->mode_deltas);
+    return;
+  }
+  assert(!cm->features.coded_lossless);
+  if (cm->prev_frame) {
+    // write deltas to frame buffer
+    memcpy(lf->ref_deltas, cm->prev_frame->ref_deltas, REF_FRAMES);
+    memcpy(lf->mode_deltas, cm->prev_frame->mode_deltas, MAX_MODE_LF_DELTAS);
+  } else {
+    av1_set_default_ref_deltas(lf->ref_deltas);
+    av1_set_default_mode_deltas(lf->mode_deltas);
+  }
+  lf->filter_level[0] = aom_rb_read_literal(rb, 6);
+  lf->filter_level[1] = aom_rb_read_literal(rb, 6);
+  if (num_planes > 1) {
+    if (lf->filter_level[0] || lf->filter_level[1]) {
+      lf->filter_level_u = aom_rb_read_literal(rb, 6);
+      lf->filter_level_v = aom_rb_read_literal(rb, 6);
+    }
+  }
+  lf->sharpness_level = aom_rb_read_literal(rb, 3);
+
+  // Read in loop filter deltas applied at the MB level based on mode or ref
+  // frame.
+  lf->mode_ref_delta_update = 0;
+
+  lf->mode_ref_delta_enabled = aom_rb_read_bit(rb);
+  if (lf->mode_ref_delta_enabled) {
+    lf->mode_ref_delta_update = aom_rb_read_bit(rb);
+    if (lf->mode_ref_delta_update) {
+      for (int i = 0; i < REF_FRAMES; i++)
+        if (aom_rb_read_bit(rb))
+          lf->ref_deltas[i] = aom_rb_read_inv_signed_literal(rb, 6);
+
+      for (int i = 0; i < MAX_MODE_LF_DELTAS; i++)
+        if (aom_rb_read_bit(rb))
+          lf->mode_deltas[i] = aom_rb_read_inv_signed_literal(rb, 6);
+    }
+  }
+
+  // write deltas to frame buffer
+  memcpy(cm->cur_frame->ref_deltas, lf->ref_deltas, REF_FRAMES);
+  memcpy(cm->cur_frame->mode_deltas, lf->mode_deltas, MAX_MODE_LF_DELTAS);
+}
+
+static AOM_INLINE void setup_cdef(AV1_COMMON *cm,
+                                  struct aom_read_bit_buffer *rb) {
+  const int num_planes = av1_num_planes(cm);
+  CdefInfo *const cdef_info = &cm->cdef_info;
+
+  if (cm->features.allow_intrabc) return;
+  cdef_info->cdef_damping = aom_rb_read_literal(rb, 2) + 3;
+  cdef_info->cdef_bits = aom_rb_read_literal(rb, 2);
+  cdef_info->nb_cdef_strengths = 1 << cdef_info->cdef_bits;
+  for (int i = 0; i < cdef_info->nb_cdef_strengths; i++) {
+    cdef_info->cdef_strengths[i] = aom_rb_read_literal(rb, CDEF_STRENGTH_BITS);
+    cdef_info->cdef_uv_strengths[i] =
+        num_planes > 1 ? aom_rb_read_literal(rb, CDEF_STRENGTH_BITS) : 0;
+  }
+}
+
+static INLINE int read_delta_q(struct aom_read_bit_buffer *rb) {
+  return aom_rb_read_bit(rb) ? aom_rb_read_inv_signed_literal(rb, 6) : 0;
+}
+
+static AOM_INLINE void setup_quantization(CommonQuantParams *quant_params,
+                                          int num_planes,
+                                          bool separate_uv_delta_q,
+                                          struct aom_read_bit_buffer *rb) {
+  quant_params->base_qindex = aom_rb_read_literal(rb, QINDEX_BITS);
+  quant_params->y_dc_delta_q = read_delta_q(rb);
+  if (num_planes > 1) {
+    int diff_uv_delta = 0;
+    if (separate_uv_delta_q) diff_uv_delta = aom_rb_read_bit(rb);
+    quant_params->u_dc_delta_q = read_delta_q(rb);
+    quant_params->u_ac_delta_q = read_delta_q(rb);
+    if (diff_uv_delta) {
+      quant_params->v_dc_delta_q = read_delta_q(rb);
+      quant_params->v_ac_delta_q = read_delta_q(rb);
+    } else {
+      quant_params->v_dc_delta_q = quant_params->u_dc_delta_q;
+      quant_params->v_ac_delta_q = quant_params->u_ac_delta_q;
+    }
+  } else {
+    quant_params->u_dc_delta_q = 0;
+    quant_params->u_ac_delta_q = 0;
+    quant_params->v_dc_delta_q = 0;
+    quant_params->v_ac_delta_q = 0;
+  }
+  quant_params->using_qmatrix = aom_rb_read_bit(rb);
+  if (quant_params->using_qmatrix) {
+    quant_params->qmatrix_level_y = aom_rb_read_literal(rb, QM_LEVEL_BITS);
+    quant_params->qmatrix_level_u = aom_rb_read_literal(rb, QM_LEVEL_BITS);
+    if (!separate_uv_delta_q)
+      quant_params->qmatrix_level_v = quant_params->qmatrix_level_u;
+    else
+      quant_params->qmatrix_level_v = aom_rb_read_literal(rb, QM_LEVEL_BITS);
+  } else {
+    quant_params->qmatrix_level_y = 0;
+    quant_params->qmatrix_level_u = 0;
+    quant_params->qmatrix_level_v = 0;
+  }
+}
+
+// Build y/uv dequant values based on segmentation.
+static AOM_INLINE void setup_segmentation_dequant(AV1_COMMON *const cm,
+                                                  MACROBLOCKD *const xd) {
+  const int bit_depth = cm->seq_params.bit_depth;
+  // When segmentation is disabled, only the first value is used.  The
+  // remaining are don't cares.
+  const int max_segments = cm->seg.enabled ? MAX_SEGMENTS : 1;
+  CommonQuantParams *const quant_params = &cm->quant_params;
+  for (int i = 0; i < max_segments; ++i) {
+    const int qindex = xd->qindex[i];
+    quant_params->y_dequant_QTX[i][0] =
+        av1_dc_quant_QTX(qindex, quant_params->y_dc_delta_q, bit_depth);
+    quant_params->y_dequant_QTX[i][1] = av1_ac_quant_QTX(qindex, 0, bit_depth);
+    quant_params->u_dequant_QTX[i][0] =
+        av1_dc_quant_QTX(qindex, quant_params->u_dc_delta_q, bit_depth);
+    quant_params->u_dequant_QTX[i][1] =
+        av1_ac_quant_QTX(qindex, quant_params->u_ac_delta_q, bit_depth);
+    quant_params->v_dequant_QTX[i][0] =
+        av1_dc_quant_QTX(qindex, quant_params->v_dc_delta_q, bit_depth);
+    quant_params->v_dequant_QTX[i][1] =
+        av1_ac_quant_QTX(qindex, quant_params->v_ac_delta_q, bit_depth);
+    const int use_qmatrix = av1_use_qmatrix(quant_params, xd, i);
+    // NB: depends on base index so there is only 1 set per frame
+    // No quant weighting when lossless or signalled not using QM
+    const int qmlevel_y =
+        use_qmatrix ? quant_params->qmatrix_level_y : NUM_QM_LEVELS - 1;
+    for (int j = 0; j < TX_SIZES_ALL; ++j) {
+      quant_params->y_iqmatrix[i][j] =
+          av1_iqmatrix(quant_params, qmlevel_y, AOM_PLANE_Y, j);
+    }
+    const int qmlevel_u =
+        use_qmatrix ? quant_params->qmatrix_level_u : NUM_QM_LEVELS - 1;
+    for (int j = 0; j < TX_SIZES_ALL; ++j) {
+      quant_params->u_iqmatrix[i][j] =
+          av1_iqmatrix(quant_params, qmlevel_u, AOM_PLANE_U, j);
+    }
+    const int qmlevel_v =
+        use_qmatrix ? quant_params->qmatrix_level_v : NUM_QM_LEVELS - 1;
+    for (int j = 0; j < TX_SIZES_ALL; ++j) {
+      quant_params->v_iqmatrix[i][j] =
+          av1_iqmatrix(quant_params, qmlevel_v, AOM_PLANE_V, j);
+    }
+  }
+}
+
+static InterpFilter read_frame_interp_filter(struct aom_read_bit_buffer *rb) {
+  return aom_rb_read_bit(rb) ? SWITCHABLE
+                             : aom_rb_read_literal(rb, LOG_SWITCHABLE_FILTERS);
+}
+
+static AOM_INLINE void setup_render_size(AV1_COMMON *cm,
+                                         struct aom_read_bit_buffer *rb) {
+  cm->render_width = cm->superres_upscaled_width;
+  cm->render_height = cm->superres_upscaled_height;
+  if (aom_rb_read_bit(rb))
+    av1_read_frame_size(rb, 16, 16, &cm->render_width, &cm->render_height);
+}
+
+// TODO(afergs): make "struct aom_read_bit_buffer *const rb"?
+static AOM_INLINE void setup_superres(AV1_COMMON *const cm,
+                                      struct aom_read_bit_buffer *rb,
+                                      int *width, int *height) {
+  cm->superres_upscaled_width = *width;
+  cm->superres_upscaled_height = *height;
+
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  if (!seq_params->enable_superres) return;
+
+  if (aom_rb_read_bit(rb)) {
+    cm->superres_scale_denominator =
+        (uint8_t)aom_rb_read_literal(rb, SUPERRES_SCALE_BITS);
+    cm->superres_scale_denominator += SUPERRES_SCALE_DENOMINATOR_MIN;
+    // Don't edit cm->width or cm->height directly, or the buffers won't get
+    // resized correctly
+    av1_calculate_scaled_superres_size(width, height,
+                                       cm->superres_scale_denominator);
+  } else {
+    // 1:1 scaling - ie. no scaling, scale not provided
+    cm->superres_scale_denominator = SCALE_NUMERATOR;
+  }
+}
+
+static AOM_INLINE void resize_context_buffers(AV1_COMMON *cm, int width,
+                                              int height) {
+#if CONFIG_SIZE_LIMIT
+  if (width > DECODE_WIDTH_LIMIT || height > DECODE_HEIGHT_LIMIT)
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Dimensions of %dx%d beyond allowed size of %dx%d.",
+                       width, height, DECODE_WIDTH_LIMIT, DECODE_HEIGHT_LIMIT);
+#endif
+  if (cm->width != width || cm->height != height) {
+    const int new_mi_rows =
+        ALIGN_POWER_OF_TWO(height, MI_SIZE_LOG2) >> MI_SIZE_LOG2;
+    const int new_mi_cols =
+        ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2) >> MI_SIZE_LOG2;
+
+    // Allocations in av1_alloc_context_buffers() depend on individual
+    // dimensions as well as the overall size.
+    if (new_mi_cols > cm->mi_params.mi_cols ||
+        new_mi_rows > cm->mi_params.mi_rows) {
+      if (av1_alloc_context_buffers(cm, width, height)) {
+        // The cm->mi_* values have been cleared and any existing context
+        // buffers have been freed. Clear cm->width and cm->height to be
+        // consistent and to force a realloc next time.
+        cm->width = 0;
+        cm->height = 0;
+        aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                           "Failed to allocate context buffers");
+      }
+    } else {
+      cm->mi_params.set_mb_mi(&cm->mi_params, width, height);
+    }
+    av1_init_mi_buffers(&cm->mi_params);
+    cm->width = width;
+    cm->height = height;
+  }
+
+  ensure_mv_buffer(cm->cur_frame, cm);
+  cm->cur_frame->width = cm->width;
+  cm->cur_frame->height = cm->height;
+}
+
+static AOM_INLINE void setup_buffer_pool(AV1_COMMON *cm) {
+  BufferPool *const pool = cm->buffer_pool;
+  const SequenceHeader *const seq_params = &cm->seq_params;
+
+  lock_buffer_pool(pool);
+  if (aom_realloc_frame_buffer(
+          &cm->cur_frame->buf, cm->width, cm->height, seq_params->subsampling_x,
+          seq_params->subsampling_y, seq_params->use_highbitdepth,
+          AOM_DEC_BORDER_IN_PIXELS, cm->features.byte_alignment,
+          &cm->cur_frame->raw_frame_buffer, pool->get_fb_cb, pool->cb_priv)) {
+    unlock_buffer_pool(pool);
+    aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                       "Failed to allocate frame buffer");
+  }
+  unlock_buffer_pool(pool);
+
+  cm->cur_frame->buf.bit_depth = (unsigned int)seq_params->bit_depth;
+  cm->cur_frame->buf.color_primaries = seq_params->color_primaries;
+  cm->cur_frame->buf.transfer_characteristics =
+      seq_params->transfer_characteristics;
+  cm->cur_frame->buf.matrix_coefficients = seq_params->matrix_coefficients;
+  cm->cur_frame->buf.monochrome = seq_params->monochrome;
+  cm->cur_frame->buf.chroma_sample_position =
+      seq_params->chroma_sample_position;
+  cm->cur_frame->buf.color_range = seq_params->color_range;
+  cm->cur_frame->buf.render_width = cm->render_width;
+  cm->cur_frame->buf.render_height = cm->render_height;
+}
+
+static AOM_INLINE void setup_frame_size(AV1_COMMON *cm,
+                                        int frame_size_override_flag,
+                                        struct aom_read_bit_buffer *rb) {
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  int width, height;
+
+  if (frame_size_override_flag) {
+    int num_bits_width = seq_params->num_bits_width;
+    int num_bits_height = seq_params->num_bits_height;
+    av1_read_frame_size(rb, num_bits_width, num_bits_height, &width, &height);
+    if (width > seq_params->max_frame_width ||
+        height > seq_params->max_frame_height) {
+      aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                         "Frame dimensions are larger than the maximum values");
+    }
+  } else {
+    width = seq_params->max_frame_width;
+    height = seq_params->max_frame_height;
+  }
+
+  setup_superres(cm, rb, &width, &height);
+  resize_context_buffers(cm, width, height);
+  setup_render_size(cm, rb);
+  setup_buffer_pool(cm);
+}
+
+static AOM_INLINE void setup_sb_size(SequenceHeader *seq_params,
+                                     struct aom_read_bit_buffer *rb) {
+  set_sb_size(seq_params, aom_rb_read_bit(rb) ? BLOCK_128X128 : BLOCK_64X64);
+}
+
+static INLINE int valid_ref_frame_img_fmt(aom_bit_depth_t ref_bit_depth,
+                                          int ref_xss, int ref_yss,
+                                          aom_bit_depth_t this_bit_depth,
+                                          int this_xss, int this_yss) {
+  return ref_bit_depth == this_bit_depth && ref_xss == this_xss &&
+         ref_yss == this_yss;
+}
+
+static AOM_INLINE void setup_frame_size_with_refs(
+    AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
+  int width, height;
+  int found = 0;
+  int has_valid_ref_frame = 0;
+  for (int i = LAST_FRAME; i <= ALTREF_FRAME; ++i) {
+    if (aom_rb_read_bit(rb)) {
+      const RefCntBuffer *const ref_buf = get_ref_frame_buf(cm, i);
+      // This will never be NULL in a normal stream, as streams are required to
+      // have a shown keyframe before any inter frames, which would refresh all
+      // the reference buffers. However, it might be null if we're starting in
+      // the middle of a stream, and static analysis will error if we don't do
+      // a null check here.
+      if (ref_buf == NULL) {
+        aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                           "Invalid condition: invalid reference buffer");
+      } else {
+        const YV12_BUFFER_CONFIG *const buf = &ref_buf->buf;
+        width = buf->y_crop_width;
+        height = buf->y_crop_height;
+        cm->render_width = buf->render_width;
+        cm->render_height = buf->render_height;
+        setup_superres(cm, rb, &width, &height);
+        resize_context_buffers(cm, width, height);
+        found = 1;
+        break;
+      }
+    }
+  }
+
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  if (!found) {
+    int num_bits_width = seq_params->num_bits_width;
+    int num_bits_height = seq_params->num_bits_height;
+
+    av1_read_frame_size(rb, num_bits_width, num_bits_height, &width, &height);
+    setup_superres(cm, rb, &width, &height);
+    resize_context_buffers(cm, width, height);
+    setup_render_size(cm, rb);
+  }
+
+  if (width <= 0 || height <= 0)
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Invalid frame size");
+
+  // Check to make sure at least one of frames that this frame references
+  // has valid dimensions.
+  for (int i = LAST_FRAME; i <= ALTREF_FRAME; ++i) {
+    const RefCntBuffer *const ref_frame = get_ref_frame_buf(cm, i);
+    has_valid_ref_frame |=
+        valid_ref_frame_size(ref_frame->buf.y_crop_width,
+                             ref_frame->buf.y_crop_height, width, height);
+  }
+  if (!has_valid_ref_frame)
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Referenced frame has invalid size");
+  for (int i = LAST_FRAME; i <= ALTREF_FRAME; ++i) {
+    const RefCntBuffer *const ref_frame = get_ref_frame_buf(cm, i);
+    if (!valid_ref_frame_img_fmt(
+            ref_frame->buf.bit_depth, ref_frame->buf.subsampling_x,
+            ref_frame->buf.subsampling_y, seq_params->bit_depth,
+            seq_params->subsampling_x, seq_params->subsampling_y))
+      aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                         "Referenced frame has incompatible color format");
+  }
+  setup_buffer_pool(cm);
+}
+
+// Same function as av1_read_uniform but reading from uncompresses header wb
+static int rb_read_uniform(struct aom_read_bit_buffer *const rb, int n) {
+  const int l = get_unsigned_bits(n);
+  const int m = (1 << l) - n;
+  const int v = aom_rb_read_literal(rb, l - 1);
+  assert(l != 0);
+  if (v < m)
+    return v;
+  else
+    return (v << 1) - m + aom_rb_read_bit(rb);
+}
+
+static AOM_INLINE void read_tile_info_max_tile(
+    AV1_COMMON *const cm, struct aom_read_bit_buffer *const rb) {
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  CommonTileParams *const tiles = &cm->tiles;
+  int width_mi =
+      ALIGN_POWER_OF_TWO(cm->mi_params.mi_cols, seq_params->mib_size_log2);
+  int height_mi =
+      ALIGN_POWER_OF_TWO(cm->mi_params.mi_rows, seq_params->mib_size_log2);
+  int width_sb = width_mi >> seq_params->mib_size_log2;
+  int height_sb = height_mi >> seq_params->mib_size_log2;
+
+  av1_get_tile_limits(cm);
+  tiles->uniform_spacing = aom_rb_read_bit(rb);
+
+  // Read tile columns
+  if (tiles->uniform_spacing) {
+    tiles->log2_cols = tiles->min_log2_cols;
+    while (tiles->log2_cols < tiles->max_log2_cols) {
+      if (!aom_rb_read_bit(rb)) {
+        break;
+      }
+      tiles->log2_cols++;
+    }
+  } else {
+    int i;
+    int start_sb;
+    for (i = 0, start_sb = 0; width_sb > 0 && i < MAX_TILE_COLS; i++) {
+      const int size_sb =
+          1 + rb_read_uniform(rb, AOMMIN(width_sb, tiles->max_width_sb));
+      tiles->col_start_sb[i] = start_sb;
+      start_sb += size_sb;
+      width_sb -= size_sb;
+    }
+    tiles->cols = i;
+    tiles->col_start_sb[i] = start_sb + width_sb;
+  }
+  av1_calculate_tile_cols(seq_params, cm->mi_params.mi_rows,
+                          cm->mi_params.mi_cols, tiles);
+
+  // Read tile rows
+  if (tiles->uniform_spacing) {
+    tiles->log2_rows = tiles->min_log2_rows;
+    while (tiles->log2_rows < tiles->max_log2_rows) {
+      if (!aom_rb_read_bit(rb)) {
+        break;
+      }
+      tiles->log2_rows++;
+    }
+  } else {
+    int i;
+    int start_sb;
+    for (i = 0, start_sb = 0; height_sb > 0 && i < MAX_TILE_ROWS; i++) {
+      const int size_sb =
+          1 + rb_read_uniform(rb, AOMMIN(height_sb, tiles->max_height_sb));
+      tiles->row_start_sb[i] = start_sb;
+      start_sb += size_sb;
+      height_sb -= size_sb;
+    }
+    tiles->rows = i;
+    tiles->row_start_sb[i] = start_sb + height_sb;
+  }
+  av1_calculate_tile_rows(seq_params, cm->mi_params.mi_rows, tiles);
+}
+
+void av1_set_single_tile_decoding_mode(AV1_COMMON *const cm) {
+  cm->tiles.single_tile_decoding = 0;
+  if (cm->tiles.large_scale) {
+    struct loopfilter *lf = &cm->lf;
+    RestorationInfo *const rst_info = cm->rst_info;
+    const CdefInfo *const cdef_info = &cm->cdef_info;
+
+    // Figure out single_tile_decoding by loopfilter_level.
+    const int no_loopfilter = !(lf->filter_level[0] || lf->filter_level[1]);
+    const int no_cdef = cdef_info->cdef_bits == 0 &&
+                        cdef_info->cdef_strengths[0] == 0 &&
+                        cdef_info->cdef_uv_strengths[0] == 0;
+    const int no_restoration =
+        rst_info[0].frame_restoration_type == RESTORE_NONE &&
+        rst_info[1].frame_restoration_type == RESTORE_NONE &&
+        rst_info[2].frame_restoration_type == RESTORE_NONE;
+    assert(IMPLIES(cm->features.coded_lossless, no_loopfilter && no_cdef));
+    assert(IMPLIES(cm->features.all_lossless, no_restoration));
+    cm->tiles.single_tile_decoding = no_loopfilter && no_cdef && no_restoration;
+  }
+}
+
+static AOM_INLINE void read_tile_info(AV1Decoder *const pbi,
+                                      struct aom_read_bit_buffer *const rb) {
+  AV1_COMMON *const cm = &pbi->common;
+
+  read_tile_info_max_tile(cm, rb);
+
+  pbi->context_update_tile_id = 0;
+  if (cm->tiles.rows * cm->tiles.cols > 1) {
+    // tile to use for cdf update
+    pbi->context_update_tile_id =
+        aom_rb_read_literal(rb, cm->tiles.log2_rows + cm->tiles.log2_cols);
+    if (pbi->context_update_tile_id >= cm->tiles.rows * cm->tiles.cols) {
+      aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                         "Invalid context_update_tile_id");
+    }
+    // tile size magnitude
+    pbi->tile_size_bytes = aom_rb_read_literal(rb, 2) + 1;
+  }
+}
+
+#if EXT_TILE_DEBUG
+static AOM_INLINE void read_ext_tile_info(
+    AV1Decoder *const pbi, struct aom_read_bit_buffer *const rb) {
+  AV1_COMMON *const cm = &pbi->common;
+
+  // This information is stored as a separate byte.
+  int mod = rb->bit_offset % CHAR_BIT;
+  if (mod > 0) aom_rb_read_literal(rb, CHAR_BIT - mod);
+  assert(rb->bit_offset % CHAR_BIT == 0);
+
+  if (cm->tiles.cols * cm->tiles.rows > 1) {
+    // Read the number of bytes used to store tile size
+    pbi->tile_col_size_bytes = aom_rb_read_literal(rb, 2) + 1;
+    pbi->tile_size_bytes = aom_rb_read_literal(rb, 2) + 1;
+  }
+}
+#endif  // EXT_TILE_DEBUG
+
+static size_t mem_get_varsize(const uint8_t *src, int sz) {
+  switch (sz) {
+    case 1: return src[0];
+    case 2: return mem_get_le16(src);
+    case 3: return mem_get_le24(src);
+    case 4: return mem_get_le32(src);
+    default: assert(0 && "Invalid size"); return -1;
+  }
+}
+
+#if EXT_TILE_DEBUG
+// Reads the next tile returning its size and adjusting '*data' accordingly
+// based on 'is_last'. On return, '*data' is updated to point to the end of the
+// raw tile buffer in the bit stream.
+static AOM_INLINE void get_ls_tile_buffer(
+    const uint8_t *const data_end, struct aom_internal_error_info *error_info,
+    const uint8_t **data, TileBufferDec (*const tile_buffers)[MAX_TILE_COLS],
+    int tile_size_bytes, int col, int row, int tile_copy_mode) {
+  size_t size;
+
+  size_t copy_size = 0;
+  const uint8_t *copy_data = NULL;
+
+  if (!read_is_valid(*data, tile_size_bytes, data_end))
+    aom_internal_error(error_info, AOM_CODEC_CORRUPT_FRAME,
+                       "Truncated packet or corrupt tile length");
+  size = mem_get_varsize(*data, tile_size_bytes);
+
+  // If tile_copy_mode = 1, then the top bit of the tile header indicates copy
+  // mode.
+  if (tile_copy_mode && (size >> (tile_size_bytes * 8 - 1)) == 1) {
+    // The remaining bits in the top byte signal the row offset
+    int offset = (size >> (tile_size_bytes - 1) * 8) & 0x7f;
+
+    // Currently, only use tiles in same column as reference tiles.
+    copy_data = tile_buffers[row - offset][col].data;
+    copy_size = tile_buffers[row - offset][col].size;
+    size = 0;
+  } else {
+    size += AV1_MIN_TILE_SIZE_BYTES;
+  }
+
+  *data += tile_size_bytes;
+
+  if (size > (size_t)(data_end - *data))
+    aom_internal_error(error_info, AOM_CODEC_CORRUPT_FRAME,
+                       "Truncated packet or corrupt tile size");
+
+  if (size > 0) {
+    tile_buffers[row][col].data = *data;
+    tile_buffers[row][col].size = size;
+  } else {
+    tile_buffers[row][col].data = copy_data;
+    tile_buffers[row][col].size = copy_size;
+  }
+
+  *data += size;
+}
+
+// Returns the end of the last tile buffer
+// (tile_buffers[cm->tiles.rows - 1][cm->tiles.cols - 1]).
+static const uint8_t *get_ls_tile_buffers(
+    AV1Decoder *pbi, const uint8_t *data, const uint8_t *data_end,
+    TileBufferDec (*const tile_buffers)[MAX_TILE_COLS]) {
+  AV1_COMMON *const cm = &pbi->common;
+  const int tile_cols = cm->tiles.cols;
+  const int tile_rows = cm->tiles.rows;
+  const int have_tiles = tile_cols * tile_rows > 1;
+  const uint8_t *raw_data_end;  // The end of the last tile buffer
+
+  if (!have_tiles) {
+    const size_t tile_size = data_end - data;
+    tile_buffers[0][0].data = data;
+    tile_buffers[0][0].size = tile_size;
+    raw_data_end = NULL;
+  } else {
+    // We locate only the tile buffers that are required, which are the ones
+    // specified by pbi->dec_tile_col and pbi->dec_tile_row. Also, we always
+    // need the last (bottom right) tile buffer, as we need to know where the
+    // end of the compressed frame buffer is for proper superframe decoding.
+
+    const uint8_t *tile_col_data_end[MAX_TILE_COLS] = { NULL };
+    const uint8_t *const data_start = data;
+
+    const int dec_tile_row = AOMMIN(pbi->dec_tile_row, tile_rows);
+    const int single_row = pbi->dec_tile_row >= 0;
+    const int tile_rows_start = single_row ? dec_tile_row : 0;
+    const int tile_rows_end = single_row ? tile_rows_start + 1 : tile_rows;
+    const int dec_tile_col = AOMMIN(pbi->dec_tile_col, tile_cols);
+    const int single_col = pbi->dec_tile_col >= 0;
+    const int tile_cols_start = single_col ? dec_tile_col : 0;
+    const int tile_cols_end = single_col ? tile_cols_start + 1 : tile_cols;
+
+    const int tile_col_size_bytes = pbi->tile_col_size_bytes;
+    const int tile_size_bytes = pbi->tile_size_bytes;
+    int tile_width, tile_height;
+    av1_get_uniform_tile_size(cm, &tile_width, &tile_height);
+    const int tile_copy_mode =
+        ((AOMMAX(tile_width, tile_height) << MI_SIZE_LOG2) <= 256) ? 1 : 0;
+    // Read tile column sizes for all columns (we need the last tile buffer)
+    for (int c = 0; c < tile_cols; ++c) {
+      const int is_last = c == tile_cols - 1;
+      size_t tile_col_size;
+
+      if (!is_last) {
+        tile_col_size = mem_get_varsize(data, tile_col_size_bytes);
+        data += tile_col_size_bytes;
+        tile_col_data_end[c] = data + tile_col_size;
+      } else {
+        tile_col_size = data_end - data;
+        tile_col_data_end[c] = data_end;
+      }
+      data += tile_col_size;
+    }
+
+    data = data_start;
+
+    // Read the required tile sizes.
+    for (int c = tile_cols_start; c < tile_cols_end; ++c) {
+      const int is_last = c == tile_cols - 1;
+
+      if (c > 0) data = tile_col_data_end[c - 1];
+
+      if (!is_last) data += tile_col_size_bytes;
+
+      // Get the whole of the last column, otherwise stop at the required tile.
+      for (int r = 0; r < (is_last ? tile_rows : tile_rows_end); ++r) {
+        get_ls_tile_buffer(tile_col_data_end[c], &pbi->common.error, &data,
+                           tile_buffers, tile_size_bytes, c, r, tile_copy_mode);
+      }
+    }
+
+    // If we have not read the last column, then read it to get the last tile.
+    if (tile_cols_end != tile_cols) {
+      const int c = tile_cols - 1;
+
+      data = tile_col_data_end[c - 1];
+
+      for (int r = 0; r < tile_rows; ++r) {
+        get_ls_tile_buffer(tile_col_data_end[c], &pbi->common.error, &data,
+                           tile_buffers, tile_size_bytes, c, r, tile_copy_mode);
+      }
+    }
+    raw_data_end = data;
+  }
+  return raw_data_end;
+}
+#endif  // EXT_TILE_DEBUG
+
+static const uint8_t *get_ls_single_tile_buffer(
+    AV1Decoder *pbi, const uint8_t *data,
+    TileBufferDec (*const tile_buffers)[MAX_TILE_COLS]) {
+  assert(pbi->dec_tile_row >= 0 && pbi->dec_tile_col >= 0);
+  tile_buffers[pbi->dec_tile_row][pbi->dec_tile_col].data = data;
+  tile_buffers[pbi->dec_tile_row][pbi->dec_tile_col].size =
+      (size_t)pbi->coded_tile_data_size;
+  return data + pbi->coded_tile_data_size;
+}
+
+// Reads the next tile returning its size and adjusting '*data' accordingly
+// based on 'is_last'.
+static AOM_INLINE void get_tile_buffer(
+    const uint8_t *const data_end, const int tile_size_bytes, int is_last,
+    struct aom_internal_error_info *error_info, const uint8_t **data,
+    TileBufferDec *const buf) {
+  size_t size;
+
+  if (!is_last) {
+    if (!read_is_valid(*data, tile_size_bytes, data_end))
+      aom_internal_error(error_info, AOM_CODEC_CORRUPT_FRAME,
+                         "Not enough data to read tile size");
+
+    size = mem_get_varsize(*data, tile_size_bytes) + AV1_MIN_TILE_SIZE_BYTES;
+    *data += tile_size_bytes;
+
+    if (size > (size_t)(data_end - *data))
+      aom_internal_error(error_info, AOM_CODEC_CORRUPT_FRAME,
+                         "Truncated packet or corrupt tile size");
+  } else {
+    size = data_end - *data;
+  }
+
+  buf->data = *data;
+  buf->size = size;
+
+  *data += size;
+}
+
+static AOM_INLINE void get_tile_buffers(
+    AV1Decoder *pbi, const uint8_t *data, const uint8_t *data_end,
+    TileBufferDec (*const tile_buffers)[MAX_TILE_COLS], int start_tile,
+    int end_tile) {
+  AV1_COMMON *const cm = &pbi->common;
+  const int tile_cols = cm->tiles.cols;
+  const int tile_rows = cm->tiles.rows;
+  int tc = 0;
+
+  for (int r = 0; r < tile_rows; ++r) {
+    for (int c = 0; c < tile_cols; ++c, ++tc) {
+      TileBufferDec *const buf = &tile_buffers[r][c];
+
+      const int is_last = (tc == end_tile);
+      const size_t hdr_offset = 0;
+
+      if (tc < start_tile || tc > end_tile) continue;
+
+      if (data + hdr_offset >= data_end)
+        aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                           "Data ended before all tiles were read.");
+      data += hdr_offset;
+      get_tile_buffer(data_end, pbi->tile_size_bytes, is_last,
+                      &pbi->common.error, &data, buf);
+    }
+  }
+}
+
+static AOM_INLINE void set_cb_buffer(AV1Decoder *pbi, DecoderCodingBlock *dcb,
+                                     CB_BUFFER *cb_buffer_base,
+                                     const int num_planes, int mi_row,
+                                     int mi_col) {
+  AV1_COMMON *const cm = &pbi->common;
+  int mib_size_log2 = cm->seq_params.mib_size_log2;
+  int stride = (cm->mi_params.mi_cols >> mib_size_log2) + 1;
+  int offset = (mi_row >> mib_size_log2) * stride + (mi_col >> mib_size_log2);
+  CB_BUFFER *cb_buffer = cb_buffer_base + offset;
+
+  for (int plane = 0; plane < num_planes; ++plane) {
+    dcb->dqcoeff_block[plane] = cb_buffer->dqcoeff[plane];
+    dcb->eob_data[plane] = cb_buffer->eob_data[plane];
+    dcb->cb_offset[plane] = 0;
+    dcb->txb_offset[plane] = 0;
+  }
+  MACROBLOCKD *const xd = &dcb->xd;
+  xd->plane[0].color_index_map = cb_buffer->color_index_map[0];
+  xd->plane[1].color_index_map = cb_buffer->color_index_map[1];
+  xd->color_index_map_offset[0] = 0;
+  xd->color_index_map_offset[1] = 0;
+}
+
+static AOM_INLINE void decoder_alloc_tile_data(AV1Decoder *pbi,
+                                               const int n_tiles) {
+  AV1_COMMON *const cm = &pbi->common;
+  aom_free(pbi->tile_data);
+  CHECK_MEM_ERROR(cm, pbi->tile_data,
+                  aom_memalign(32, n_tiles * sizeof(*pbi->tile_data)));
+  pbi->allocated_tiles = n_tiles;
+  for (int i = 0; i < n_tiles; i++) {
+    TileDataDec *const tile_data = pbi->tile_data + i;
+    av1_zero(tile_data->dec_row_mt_sync);
+  }
+  pbi->allocated_row_mt_sync_rows = 0;
+}
+
+// Set up nsync by width.
+static INLINE int get_sync_range(int width) {
+// nsync numbers are picked by testing.
+#if 0
+  if (width < 640)
+    return 1;
+  else if (width <= 1280)
+    return 2;
+  else if (width <= 4096)
+    return 4;
+  else
+    return 8;
+#else
+  (void)width;
+#endif
+  return 1;
+}
+
+// Allocate memory for decoder row synchronization
+static AOM_INLINE void dec_row_mt_alloc(AV1DecRowMTSync *dec_row_mt_sync,
+                                        AV1_COMMON *cm, int rows) {
+  dec_row_mt_sync->allocated_sb_rows = rows;
+#if CONFIG_MULTITHREAD
+  {
+    int i;
+
+    CHECK_MEM_ERROR(cm, dec_row_mt_sync->mutex_,
+                    aom_malloc(sizeof(*(dec_row_mt_sync->mutex_)) * rows));
+    if (dec_row_mt_sync->mutex_) {
+      for (i = 0; i < rows; ++i) {
+        pthread_mutex_init(&dec_row_mt_sync->mutex_[i], NULL);
+      }
+    }
+
+    CHECK_MEM_ERROR(cm, dec_row_mt_sync->cond_,
+                    aom_malloc(sizeof(*(dec_row_mt_sync->cond_)) * rows));
+    if (dec_row_mt_sync->cond_) {
+      for (i = 0; i < rows; ++i) {
+        pthread_cond_init(&dec_row_mt_sync->cond_[i], NULL);
+      }
+    }
+  }
+#endif  // CONFIG_MULTITHREAD
+
+  CHECK_MEM_ERROR(cm, dec_row_mt_sync->cur_sb_col,
+                  aom_malloc(sizeof(*(dec_row_mt_sync->cur_sb_col)) * rows));
+
+  // Set up nsync.
+  dec_row_mt_sync->sync_range = get_sync_range(cm->width);
+}
+
+// Deallocate decoder row synchronization related mutex and data
+void av1_dec_row_mt_dealloc(AV1DecRowMTSync *dec_row_mt_sync) {
+  if (dec_row_mt_sync != NULL) {
+#if CONFIG_MULTITHREAD
+    int i;
+    if (dec_row_mt_sync->mutex_ != NULL) {
+      for (i = 0; i < dec_row_mt_sync->allocated_sb_rows; ++i) {
+        pthread_mutex_destroy(&dec_row_mt_sync->mutex_[i]);
+      }
+      aom_free(dec_row_mt_sync->mutex_);
+    }
+    if (dec_row_mt_sync->cond_ != NULL) {
+      for (i = 0; i < dec_row_mt_sync->allocated_sb_rows; ++i) {
+        pthread_cond_destroy(&dec_row_mt_sync->cond_[i]);
+      }
+      aom_free(dec_row_mt_sync->cond_);
+    }
+#endif  // CONFIG_MULTITHREAD
+    aom_free(dec_row_mt_sync->cur_sb_col);
+
+    // clear the structure as the source of this call may be a resize in which
+    // case this call will be followed by an _alloc() which may fail.
+    av1_zero(*dec_row_mt_sync);
+  }
+}
+
+static INLINE void sync_read(AV1DecRowMTSync *const dec_row_mt_sync, int r,
+                             int c) {
+#if CONFIG_MULTITHREAD
+  const int nsync = dec_row_mt_sync->sync_range;
+
+  if (r && !(c & (nsync - 1))) {
+    pthread_mutex_t *const mutex = &dec_row_mt_sync->mutex_[r - 1];
+    pthread_mutex_lock(mutex);
+
+    while (c > dec_row_mt_sync->cur_sb_col[r - 1] - nsync) {
+      pthread_cond_wait(&dec_row_mt_sync->cond_[r - 1], mutex);
+    }
+    pthread_mutex_unlock(mutex);
+  }
+#else
+  (void)dec_row_mt_sync;
+  (void)r;
+  (void)c;
+#endif  // CONFIG_MULTITHREAD
+}
+
+static INLINE void sync_write(AV1DecRowMTSync *const dec_row_mt_sync, int r,
+                              int c, const int sb_cols) {
+#if CONFIG_MULTITHREAD
+  const int nsync = dec_row_mt_sync->sync_range;
+  int cur;
+  int sig = 1;
+
+  if (c < sb_cols - 1) {
+    cur = c;
+    if (c % nsync) sig = 0;
+  } else {
+    cur = sb_cols + nsync;
+  }
+
+  if (sig) {
+    pthread_mutex_lock(&dec_row_mt_sync->mutex_[r]);
+
+    dec_row_mt_sync->cur_sb_col[r] = cur;
+
+    pthread_cond_signal(&dec_row_mt_sync->cond_[r]);
+    pthread_mutex_unlock(&dec_row_mt_sync->mutex_[r]);
+  }
+#else
+  (void)dec_row_mt_sync;
+  (void)r;
+  (void)c;
+  (void)sb_cols;
+#endif  // CONFIG_MULTITHREAD
+}
+
+static AOM_INLINE void decode_tile_sb_row(AV1Decoder *pbi, ThreadData *const td,
+                                          TileInfo tile_info,
+                                          const int mi_row) {
+  AV1_COMMON *const cm = &pbi->common;
+  const int num_planes = av1_num_planes(cm);
+  TileDataDec *const tile_data =
+      pbi->tile_data + tile_info.tile_row * cm->tiles.cols + tile_info.tile_col;
+  const int sb_cols_in_tile = av1_get_sb_cols_in_tile(cm, tile_info);
+  const int sb_row_in_tile =
+      (mi_row - tile_info.mi_row_start) >> cm->seq_params.mib_size_log2;
+  int sb_col_in_tile = 0;
+
+  for (int mi_col = tile_info.mi_col_start; mi_col < tile_info.mi_col_end;
+       mi_col += cm->seq_params.mib_size, sb_col_in_tile++) {
+    set_cb_buffer(pbi, &td->dcb, pbi->cb_buffer_base, num_planes, mi_row,
+                  mi_col);
+
+    sync_read(&tile_data->dec_row_mt_sync, sb_row_in_tile, sb_col_in_tile);
+
+    // Decoding of the super-block
+    decode_partition(pbi, td, mi_row, mi_col, td->bit_reader,
+                     cm->seq_params.sb_size, 0x2);
+
+    sync_write(&tile_data->dec_row_mt_sync, sb_row_in_tile, sb_col_in_tile,
+               sb_cols_in_tile);
+  }
+}
+
+static int check_trailing_bits_after_symbol_coder(aom_reader *r) {
+  if (aom_reader_has_overflowed(r)) return -1;
+
+  uint32_t nb_bits = aom_reader_tell(r);
+  uint32_t nb_bytes = (nb_bits + 7) >> 3;
+  const uint8_t *p = aom_reader_find_begin(r) + nb_bytes;
+
+  // aom_reader_tell() returns 1 for a newly initialized decoder, and the
+  // return value only increases as values are decoded. So nb_bits > 0, and
+  // thus p > p_begin. Therefore accessing p[-1] is safe.
+  uint8_t last_byte = p[-1];
+  uint8_t pattern = 128 >> ((nb_bits - 1) & 7);
+  if ((last_byte & (2 * pattern - 1)) != pattern) return -1;
+
+  // Make sure that all padding bytes are zero as required by the spec.
+  const uint8_t *p_end = aom_reader_find_end(r);
+  while (p < p_end) {
+    if (*p != 0) return -1;
+    p++;
+  }
+  return 0;
+}
+
+static AOM_INLINE void set_decode_func_pointers(ThreadData *td,
+                                                int parse_decode_flag) {
+  td->read_coeffs_tx_intra_block_visit = decode_block_void;
+  td->predict_and_recon_intra_block_visit = decode_block_void;
+  td->read_coeffs_tx_inter_block_visit = decode_block_void;
+  td->inverse_tx_inter_block_visit = decode_block_void;
+  td->predict_inter_block_visit = predict_inter_block_void;
+  td->cfl_store_inter_block_visit = cfl_store_inter_block_void;
+
+  if (parse_decode_flag & 0x1) {
+    td->read_coeffs_tx_intra_block_visit = read_coeffs_tx_intra_block;
+    td->read_coeffs_tx_inter_block_visit = av1_read_coeffs_txb_facade;
+  }
+  if (parse_decode_flag & 0x2) {
+    td->predict_and_recon_intra_block_visit =
+        predict_and_reconstruct_intra_block;
+    td->inverse_tx_inter_block_visit = inverse_transform_inter_block;
+    td->predict_inter_block_visit = predict_inter_block;
+    td->cfl_store_inter_block_visit = cfl_store_inter_block;
+  }
+}
+
+static AOM_INLINE void decode_tile(AV1Decoder *pbi, ThreadData *const td,
+                                   int tile_row, int tile_col) {
+  TileInfo tile_info;
+
+  AV1_COMMON *const cm = &pbi->common;
+  const int num_planes = av1_num_planes(cm);
+
+  av1_tile_set_row(&tile_info, cm, tile_row);
+  av1_tile_set_col(&tile_info, cm, tile_col);
+  DecoderCodingBlock *const dcb = &td->dcb;
+  MACROBLOCKD *const xd = &dcb->xd;
+
+  av1_zero_above_context(cm, xd, tile_info.mi_col_start, tile_info.mi_col_end,
+                         tile_row);
+  av1_reset_loop_filter_delta(xd, num_planes);
+  av1_reset_loop_restoration(xd, num_planes);
+
+  for (int mi_row = tile_info.mi_row_start; mi_row < tile_info.mi_row_end;
+       mi_row += cm->seq_params.mib_size) {
+    av1_zero_left_context(xd);
+
+    for (int mi_col = tile_info.mi_col_start; mi_col < tile_info.mi_col_end;
+         mi_col += cm->seq_params.mib_size) {
+      set_cb_buffer(pbi, dcb, &td->cb_buffer_base, num_planes, 0, 0);
+
+      // Bit-stream parsing and decoding of the superblock
+      decode_partition(pbi, td, mi_row, mi_col, td->bit_reader,
+                       cm->seq_params.sb_size, 0x3);
+
+      if (aom_reader_has_overflowed(td->bit_reader)) {
+        aom_merge_corrupted_flag(&dcb->corrupted, 1);
+        return;
+      }
+    }
+  }
+
+  int corrupted =
+      (check_trailing_bits_after_symbol_coder(td->bit_reader)) ? 1 : 0;
+  aom_merge_corrupted_flag(&dcb->corrupted, corrupted);
+}
+
+static const uint8_t *decode_tiles(AV1Decoder *pbi, const uint8_t *data,
+                                   const uint8_t *data_end, int start_tile,
+                                   int end_tile) {
+  AV1_COMMON *const cm = &pbi->common;
+  ThreadData *const td = &pbi->td;
+  CommonTileParams *const tiles = &cm->tiles;
+  const int tile_cols = tiles->cols;
+  const int tile_rows = tiles->rows;
+  const int n_tiles = tile_cols * tile_rows;
+  TileBufferDec(*const tile_buffers)[MAX_TILE_COLS] = pbi->tile_buffers;
+  const int dec_tile_row = AOMMIN(pbi->dec_tile_row, tile_rows);
+  const int single_row = pbi->dec_tile_row >= 0;
+  const int dec_tile_col = AOMMIN(pbi->dec_tile_col, tile_cols);
+  const int single_col = pbi->dec_tile_col >= 0;
+  int tile_rows_start;
+  int tile_rows_end;
+  int tile_cols_start;
+  int tile_cols_end;
+  int inv_col_order;
+  int inv_row_order;
+  int tile_row, tile_col;
+  uint8_t allow_update_cdf;
+  const uint8_t *raw_data_end = NULL;
+
+  if (tiles->large_scale) {
+    tile_rows_start = single_row ? dec_tile_row : 0;
+    tile_rows_end = single_row ? dec_tile_row + 1 : tile_rows;
+    tile_cols_start = single_col ? dec_tile_col : 0;
+    tile_cols_end = single_col ? tile_cols_start + 1 : tile_cols;
+    inv_col_order = pbi->inv_tile_order && !single_col;
+    inv_row_order = pbi->inv_tile_order && !single_row;
+    allow_update_cdf = 0;
+  } else {
+    tile_rows_start = 0;
+    tile_rows_end = tile_rows;
+    tile_cols_start = 0;
+    tile_cols_end = tile_cols;
+    inv_col_order = pbi->inv_tile_order;
+    inv_row_order = pbi->inv_tile_order;
+    allow_update_cdf = 1;
+  }
+
+  // No tiles to decode.
+  if (tile_rows_end <= tile_rows_start || tile_cols_end <= tile_cols_start ||
+      // First tile is larger than end_tile.
+      tile_rows_start * tiles->cols + tile_cols_start > end_tile ||
+      // Last tile is smaller than start_tile.
+      (tile_rows_end - 1) * tiles->cols + tile_cols_end - 1 < start_tile)
+    return data;
+
+  allow_update_cdf = allow_update_cdf && !cm->features.disable_cdf_update;
+
+  assert(tile_rows <= MAX_TILE_ROWS);
+  assert(tile_cols <= MAX_TILE_COLS);
+
+#if EXT_TILE_DEBUG
+  if (tiles->large_scale && !pbi->ext_tile_debug)
+    raw_data_end = get_ls_single_tile_buffer(pbi, data, tile_buffers);
+  else if (tiles->large_scale && pbi->ext_tile_debug)
+    raw_data_end = get_ls_tile_buffers(pbi, data, data_end, tile_buffers);
+  else
+#endif  // EXT_TILE_DEBUG
+    get_tile_buffers(pbi, data, data_end, tile_buffers, start_tile, end_tile);
+
+  if (pbi->tile_data == NULL || n_tiles != pbi->allocated_tiles) {
+    decoder_alloc_tile_data(pbi, n_tiles);
+  }
+#if CONFIG_ACCOUNTING
+  if (pbi->acct_enabled) {
+    aom_accounting_reset(&pbi->accounting);
+  }
+#endif
+
+  set_decode_func_pointers(&pbi->td, 0x3);
+
+  // Load all tile information into thread_data.
+  td->dcb = pbi->dcb;
+
+  td->dcb.corrupted = 0;
+  td->dcb.mc_buf[0] = td->mc_buf[0];
+  td->dcb.mc_buf[1] = td->mc_buf[1];
+  td->dcb.xd.tmp_conv_dst = td->tmp_conv_dst;
+  for (int j = 0; j < 2; ++j) {
+    td->dcb.xd.tmp_obmc_bufs[j] = td->tmp_obmc_bufs[j];
+  }
+
+  for (tile_row = tile_rows_start; tile_row < tile_rows_end; ++tile_row) {
+    const int row = inv_row_order ? tile_rows - 1 - tile_row : tile_row;
+
+    for (tile_col = tile_cols_start; tile_col < tile_cols_end; ++tile_col) {
+      const int col = inv_col_order ? tile_cols - 1 - tile_col : tile_col;
+      TileDataDec *const tile_data = pbi->tile_data + row * tiles->cols + col;
+      const TileBufferDec *const tile_bs_buf = &tile_buffers[row][col];
+
+      if (row * tiles->cols + col < start_tile ||
+          row * tiles->cols + col > end_tile)
+        continue;
+
+      td->bit_reader = &tile_data->bit_reader;
+      av1_zero(td->cb_buffer_base.dqcoeff);
+      av1_tile_init(&td->dcb.xd.tile, cm, row, col);
+      td->dcb.xd.current_base_qindex = cm->quant_params.base_qindex;
+      setup_bool_decoder(tile_bs_buf->data, data_end, tile_bs_buf->size,
+                         &cm->error, td->bit_reader, allow_update_cdf);
+#if CONFIG_ACCOUNTING
+      if (pbi->acct_enabled) {
+        td->bit_reader->accounting = &pbi->accounting;
+        td->bit_reader->accounting->last_tell_frac =
+            aom_reader_tell_frac(td->bit_reader);
+      } else {
+        td->bit_reader->accounting = NULL;
+      }
+#endif
+      av1_init_macroblockd(cm, &td->dcb.xd);
+      av1_init_above_context(&cm->above_contexts, av1_num_planes(cm), row,
+                             &td->dcb.xd);
+
+      // Initialise the tile context from the frame context
+      tile_data->tctx = *cm->fc;
+      td->dcb.xd.tile_ctx = &tile_data->tctx;
+
+      // decode tile
+      decode_tile(pbi, td, row, col);
+      aom_merge_corrupted_flag(&pbi->dcb.corrupted, td->dcb.corrupted);
+      if (pbi->dcb.corrupted)
+        aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                           "Failed to decode tile data");
+    }
+  }
+
+  if (tiles->large_scale) {
+    if (n_tiles == 1) {
+      // Find the end of the single tile buffer
+      return aom_reader_find_end(&pbi->tile_data->bit_reader);
+    }
+    // Return the end of the last tile buffer
+    return raw_data_end;
+  }
+  TileDataDec *const tile_data = pbi->tile_data + end_tile;
+
+  return aom_reader_find_end(&tile_data->bit_reader);
+}
+
+static TileJobsDec *get_dec_job_info(AV1DecTileMT *tile_mt_info) {
+  TileJobsDec *cur_job_info = NULL;
+#if CONFIG_MULTITHREAD
+  pthread_mutex_lock(tile_mt_info->job_mutex);
+
+  if (tile_mt_info->jobs_dequeued < tile_mt_info->jobs_enqueued) {
+    cur_job_info = tile_mt_info->job_queue + tile_mt_info->jobs_dequeued;
+    tile_mt_info->jobs_dequeued++;
+  }
+
+  pthread_mutex_unlock(tile_mt_info->job_mutex);
+#else
+  (void)tile_mt_info;
+#endif
+  return cur_job_info;
+}
+
+static AOM_INLINE void tile_worker_hook_init(
+    AV1Decoder *const pbi, DecWorkerData *const thread_data,
+    const TileBufferDec *const tile_buffer, TileDataDec *const tile_data,
+    uint8_t allow_update_cdf) {
+  AV1_COMMON *cm = &pbi->common;
+  ThreadData *const td = thread_data->td;
+  int tile_row = tile_data->tile_info.tile_row;
+  int tile_col = tile_data->tile_info.tile_col;
+
+  td->bit_reader = &tile_data->bit_reader;
+  av1_zero(td->cb_buffer_base.dqcoeff);
+
+  MACROBLOCKD *const xd = &td->dcb.xd;
+  av1_tile_init(&xd->tile, cm, tile_row, tile_col);
+  xd->current_base_qindex = cm->quant_params.base_qindex;
+  setup_bool_decoder(tile_buffer->data, thread_data->data_end,
+                     tile_buffer->size, &thread_data->error_info,
+                     td->bit_reader, allow_update_cdf);
+#if CONFIG_ACCOUNTING
+  if (pbi->acct_enabled) {
+    td->bit_reader->accounting = &pbi->accounting;
+    td->bit_reader->accounting->last_tell_frac =
+        aom_reader_tell_frac(td->bit_reader);
+  } else {
+    td->bit_reader->accounting = NULL;
+  }
+#endif
+  av1_init_macroblockd(cm, xd);
+  xd->error_info = &thread_data->error_info;
+  av1_init_above_context(&cm->above_contexts, av1_num_planes(cm), tile_row, xd);
+
+  // Initialise the tile context from the frame context
+  tile_data->tctx = *cm->fc;
+  xd->tile_ctx = &tile_data->tctx;
+#if CONFIG_ACCOUNTING
+  if (pbi->acct_enabled) {
+    tile_data->bit_reader.accounting->last_tell_frac =
+        aom_reader_tell_frac(&tile_data->bit_reader);
+  }
+#endif
+}
+
+static int tile_worker_hook(void *arg1, void *arg2) {
+  DecWorkerData *const thread_data = (DecWorkerData *)arg1;
+  AV1Decoder *const pbi = (AV1Decoder *)arg2;
+  AV1_COMMON *cm = &pbi->common;
+  ThreadData *const td = thread_data->td;
+  uint8_t allow_update_cdf;
+
+  // The jmp_buf is valid only for the duration of the function that calls
+  // setjmp(). Therefore, this function must reset the 'setjmp' field to 0
+  // before it returns.
+  if (setjmp(thread_data->error_info.jmp)) {
+    thread_data->error_info.setjmp = 0;
+    thread_data->td->dcb.corrupted = 1;
+    return 0;
+  }
+  thread_data->error_info.setjmp = 1;
+
+  allow_update_cdf = cm->tiles.large_scale ? 0 : 1;
+  allow_update_cdf = allow_update_cdf && !cm->features.disable_cdf_update;
+
+  set_decode_func_pointers(td, 0x3);
+
+  assert(cm->tiles.cols > 0);
+  while (!td->dcb.corrupted) {
+    TileJobsDec *cur_job_info = get_dec_job_info(&pbi->tile_mt_info);
+
+    if (cur_job_info != NULL) {
+      const TileBufferDec *const tile_buffer = cur_job_info->tile_buffer;
+      TileDataDec *const tile_data = cur_job_info->tile_data;
+      tile_worker_hook_init(pbi, thread_data, tile_buffer, tile_data,
+                            allow_update_cdf);
+      // decode tile
+      int tile_row = tile_data->tile_info.tile_row;
+      int tile_col = tile_data->tile_info.tile_col;
+      decode_tile(pbi, td, tile_row, tile_col);
+    } else {
+      break;
+    }
+  }
+  thread_data->error_info.setjmp = 0;
+  return !td->dcb.corrupted;
+}
+
+static INLINE int get_max_row_mt_workers_per_tile(AV1_COMMON *cm,
+                                                  TileInfo tile) {
+  // NOTE: Currently value of max workers is calculated based
+  // on the parse and decode time. As per the theoretical estimate
+  // when percentage of parse time is equal to percentage of decode
+  // time, number of workers needed to parse + decode a tile can not
+  // exceed more than 2.
+  // TODO(any): Modify this value if parsing is optimized in future.
+  int sb_rows = av1_get_sb_rows_in_tile(cm, tile);
+  int max_workers =
+      sb_rows == 1 ? AOM_MIN_THREADS_PER_TILE : AOM_MAX_THREADS_PER_TILE;
+  return max_workers;
+}
+
+// The caller must hold pbi->row_mt_mutex_ when calling this function.
+// Returns 1 if either the next job is stored in *next_job_info or 1 is stored
+// in *end_of_frame.
+// NOTE: The caller waits on pbi->row_mt_cond_ if this function returns 0.
+// The return value of this function depends on the following variables:
+// - frame_row_mt_info->mi_rows_parse_done
+// - frame_row_mt_info->mi_rows_decode_started
+// - frame_row_mt_info->row_mt_exit
+// Therefore we may need to signal or broadcast pbi->row_mt_cond_ if any of
+// these variables is modified.
+static int get_next_job_info(AV1Decoder *const pbi,
+                             AV1DecRowMTJobInfo *next_job_info,
+                             int *end_of_frame) {
+  AV1_COMMON *cm = &pbi->common;
+  TileDataDec *tile_data;
+  AV1DecRowMTSync *dec_row_mt_sync;
+  AV1DecRowMTInfo *frame_row_mt_info = &pbi->frame_row_mt_info;
+  TileInfo tile_info;
+  const int tile_rows_start = frame_row_mt_info->tile_rows_start;
+  const int tile_rows_end = frame_row_mt_info->tile_rows_end;
+  const int tile_cols_start = frame_row_mt_info->tile_cols_start;
+  const int tile_cols_end = frame_row_mt_info->tile_cols_end;
+  const int start_tile = frame_row_mt_info->start_tile;
+  const int end_tile = frame_row_mt_info->end_tile;
+  const int sb_mi_size = mi_size_wide[cm->seq_params.sb_size];
+  int num_mis_to_decode, num_threads_working;
+  int num_mis_waiting_for_decode;
+  int min_threads_working = INT_MAX;
+  int max_mis_to_decode = 0;
+  int tile_row_idx, tile_col_idx;
+  int tile_row = -1;
+  int tile_col = -1;
+
+  memset(next_job_info, 0, sizeof(*next_job_info));
+
+  // Frame decode is completed or error is encountered.
+  *end_of_frame = (frame_row_mt_info->mi_rows_decode_started ==
+                   frame_row_mt_info->mi_rows_to_decode) ||
+                  (frame_row_mt_info->row_mt_exit == 1);
+  if (*end_of_frame) {
+    return 1;
+  }
+
+  // Decoding cannot start as bit-stream parsing is not complete.
+  assert(frame_row_mt_info->mi_rows_parse_done >=
+         frame_row_mt_info->mi_rows_decode_started);
+  if (frame_row_mt_info->mi_rows_parse_done ==
+      frame_row_mt_info->mi_rows_decode_started)
+    return 0;
+
+  // Choose the tile to decode.
+  for (tile_row_idx = tile_rows_start; tile_row_idx < tile_rows_end;
+       ++tile_row_idx) {
+    for (tile_col_idx = tile_cols_start; tile_col_idx < tile_cols_end;
+         ++tile_col_idx) {
+      if (tile_row_idx * cm->tiles.cols + tile_col_idx < start_tile ||
+          tile_row_idx * cm->tiles.cols + tile_col_idx > end_tile)
+        continue;
+
+      tile_data = pbi->tile_data + tile_row_idx * cm->tiles.cols + tile_col_idx;
+      dec_row_mt_sync = &tile_data->dec_row_mt_sync;
+
+      num_threads_working = dec_row_mt_sync->num_threads_working;
+      num_mis_waiting_for_decode = (dec_row_mt_sync->mi_rows_parse_done -
+                                    dec_row_mt_sync->mi_rows_decode_started) *
+                                   dec_row_mt_sync->mi_cols;
+      num_mis_to_decode =
+          (dec_row_mt_sync->mi_rows - dec_row_mt_sync->mi_rows_decode_started) *
+          dec_row_mt_sync->mi_cols;
+
+      assert(num_mis_to_decode >= num_mis_waiting_for_decode);
+
+      // Pick the tile which has minimum number of threads working on it.
+      if (num_mis_waiting_for_decode > 0) {
+        if (num_threads_working < min_threads_working) {
+          min_threads_working = num_threads_working;
+          max_mis_to_decode = 0;
+        }
+        if (num_threads_working == min_threads_working &&
+            num_mis_to_decode > max_mis_to_decode &&
+            num_threads_working <
+                get_max_row_mt_workers_per_tile(cm, tile_data->tile_info)) {
+          max_mis_to_decode = num_mis_to_decode;
+          tile_row = tile_row_idx;
+          tile_col = tile_col_idx;
+        }
+      }
+    }
+  }
+  // No job found to process
+  if (tile_row == -1 || tile_col == -1) return 0;
+
+  tile_data = pbi->tile_data + tile_row * cm->tiles.cols + tile_col;
+  tile_info = tile_data->tile_info;
+  dec_row_mt_sync = &tile_data->dec_row_mt_sync;
+
+  next_job_info->tile_row = tile_row;
+  next_job_info->tile_col = tile_col;
+  next_job_info->mi_row =
+      dec_row_mt_sync->mi_rows_decode_started + tile_info.mi_row_start;
+
+  dec_row_mt_sync->num_threads_working++;
+  dec_row_mt_sync->mi_rows_decode_started += sb_mi_size;
+  frame_row_mt_info->mi_rows_decode_started += sb_mi_size;
+  assert(frame_row_mt_info->mi_rows_parse_done >=
+         frame_row_mt_info->mi_rows_decode_started);
+#if CONFIG_MULTITHREAD
+  if (frame_row_mt_info->mi_rows_decode_started ==
+      frame_row_mt_info->mi_rows_to_decode) {
+    pthread_cond_broadcast(pbi->row_mt_cond_);
+  }
+#endif
+
+  return 1;
+}
+
+static INLINE void signal_parse_sb_row_done(AV1Decoder *const pbi,
+                                            TileDataDec *const tile_data,
+                                            const int sb_mi_size) {
+  AV1DecRowMTInfo *frame_row_mt_info = &pbi->frame_row_mt_info;
+#if CONFIG_MULTITHREAD
+  pthread_mutex_lock(pbi->row_mt_mutex_);
+#endif
+  assert(frame_row_mt_info->mi_rows_parse_done >=
+         frame_row_mt_info->mi_rows_decode_started);
+  tile_data->dec_row_mt_sync.mi_rows_parse_done += sb_mi_size;
+  frame_row_mt_info->mi_rows_parse_done += sb_mi_size;
+#if CONFIG_MULTITHREAD
+  // A new decode job is available. Wake up one worker thread to handle the
+  // new decode job.
+  // NOTE: This assumes we bump mi_rows_parse_done and mi_rows_decode_started
+  // by the same increment (sb_mi_size).
+  pthread_cond_signal(pbi->row_mt_cond_);
+  pthread_mutex_unlock(pbi->row_mt_mutex_);
+#endif
+}
+
+// This function is very similar to decode_tile(). It would be good to figure
+// out how to share code.
+static AOM_INLINE void parse_tile_row_mt(AV1Decoder *pbi, ThreadData *const td,
+                                         TileDataDec *const tile_data) {
+  AV1_COMMON *const cm = &pbi->common;
+  const int sb_mi_size = mi_size_wide[cm->seq_params.sb_size];
+  const int num_planes = av1_num_planes(cm);
+  TileInfo tile_info = tile_data->tile_info;
+  int tile_row = tile_info.tile_row;
+  DecoderCodingBlock *const dcb = &td->dcb;
+  MACROBLOCKD *const xd = &dcb->xd;
+
+  av1_zero_above_context(cm, xd, tile_info.mi_col_start, tile_info.mi_col_end,
+                         tile_row);
+  av1_reset_loop_filter_delta(xd, num_planes);
+  av1_reset_loop_restoration(xd, num_planes);
+
+  for (int mi_row = tile_info.mi_row_start; mi_row < tile_info.mi_row_end;
+       mi_row += cm->seq_params.mib_size) {
+    av1_zero_left_context(xd);
+
+    for (int mi_col = tile_info.mi_col_start; mi_col < tile_info.mi_col_end;
+         mi_col += cm->seq_params.mib_size) {
+      set_cb_buffer(pbi, dcb, pbi->cb_buffer_base, num_planes, mi_row, mi_col);
+
+      // Bit-stream parsing of the superblock
+      decode_partition(pbi, td, mi_row, mi_col, td->bit_reader,
+                       cm->seq_params.sb_size, 0x1);
+
+      if (aom_reader_has_overflowed(td->bit_reader)) {
+        aom_merge_corrupted_flag(&dcb->corrupted, 1);
+        return;
+      }
+    }
+    signal_parse_sb_row_done(pbi, tile_data, sb_mi_size);
+  }
+
+  int corrupted =
+      (check_trailing_bits_after_symbol_coder(td->bit_reader)) ? 1 : 0;
+  aom_merge_corrupted_flag(&dcb->corrupted, corrupted);
+}
+
+static int row_mt_worker_hook(void *arg1, void *arg2) {
+  DecWorkerData *const thread_data = (DecWorkerData *)arg1;
+  AV1Decoder *const pbi = (AV1Decoder *)arg2;
+  AV1_COMMON *cm = &pbi->common;
+  ThreadData *const td = thread_data->td;
+  uint8_t allow_update_cdf;
+  AV1DecRowMTInfo *frame_row_mt_info = &pbi->frame_row_mt_info;
+  td->dcb.corrupted = 0;
+
+  // The jmp_buf is valid only for the duration of the function that calls
+  // setjmp(). Therefore, this function must reset the 'setjmp' field to 0
+  // before it returns.
+  if (setjmp(thread_data->error_info.jmp)) {
+    thread_data->error_info.setjmp = 0;
+    thread_data->td->dcb.corrupted = 1;
+#if CONFIG_MULTITHREAD
+    pthread_mutex_lock(pbi->row_mt_mutex_);
+#endif
+    frame_row_mt_info->row_mt_exit = 1;
+#if CONFIG_MULTITHREAD
+    pthread_cond_broadcast(pbi->row_mt_cond_);
+    pthread_mutex_unlock(pbi->row_mt_mutex_);
+#endif
+    return 0;
+  }
+  thread_data->error_info.setjmp = 1;
+
+  allow_update_cdf = cm->tiles.large_scale ? 0 : 1;
+  allow_update_cdf = allow_update_cdf && !cm->features.disable_cdf_update;
+
+  set_decode_func_pointers(td, 0x1);
+
+  assert(cm->tiles.cols > 0);
+  while (!td->dcb.corrupted) {
+    TileJobsDec *cur_job_info = get_dec_job_info(&pbi->tile_mt_info);
+
+    if (cur_job_info != NULL) {
+      const TileBufferDec *const tile_buffer = cur_job_info->tile_buffer;
+      TileDataDec *const tile_data = cur_job_info->tile_data;
+      tile_worker_hook_init(pbi, thread_data, tile_buffer, tile_data,
+                            allow_update_cdf);
+#if CONFIG_MULTITHREAD
+      pthread_mutex_lock(pbi->row_mt_mutex_);
+#endif
+      tile_data->dec_row_mt_sync.num_threads_working++;
+#if CONFIG_MULTITHREAD
+      pthread_mutex_unlock(pbi->row_mt_mutex_);
+#endif
+      // decode tile
+      parse_tile_row_mt(pbi, td, tile_data);
+#if CONFIG_MULTITHREAD
+      pthread_mutex_lock(pbi->row_mt_mutex_);
+#endif
+      tile_data->dec_row_mt_sync.num_threads_working--;
+#if CONFIG_MULTITHREAD
+      pthread_mutex_unlock(pbi->row_mt_mutex_);
+#endif
+    } else {
+      break;
+    }
+  }
+
+  if (td->dcb.corrupted) {
+    thread_data->error_info.setjmp = 0;
+#if CONFIG_MULTITHREAD
+    pthread_mutex_lock(pbi->row_mt_mutex_);
+#endif
+    frame_row_mt_info->row_mt_exit = 1;
+#if CONFIG_MULTITHREAD
+    pthread_cond_broadcast(pbi->row_mt_cond_);
+    pthread_mutex_unlock(pbi->row_mt_mutex_);
+#endif
+    return 0;
+  }
+
+  set_decode_func_pointers(td, 0x2);
+
+  while (1) {
+    AV1DecRowMTJobInfo next_job_info;
+    int end_of_frame = 0;
+
+#if CONFIG_MULTITHREAD
+    pthread_mutex_lock(pbi->row_mt_mutex_);
+#endif
+    while (!get_next_job_info(pbi, &next_job_info, &end_of_frame)) {
+#if CONFIG_MULTITHREAD
+      pthread_cond_wait(pbi->row_mt_cond_, pbi->row_mt_mutex_);
+#endif
+    }
+#if CONFIG_MULTITHREAD
+    pthread_mutex_unlock(pbi->row_mt_mutex_);
+#endif
+
+    if (end_of_frame) break;
+
+    int tile_row = next_job_info.tile_row;
+    int tile_col = next_job_info.tile_col;
+    int mi_row = next_job_info.mi_row;
+
+    TileDataDec *tile_data =
+        pbi->tile_data + tile_row * cm->tiles.cols + tile_col;
+    AV1DecRowMTSync *dec_row_mt_sync = &tile_data->dec_row_mt_sync;
+    TileInfo tile_info = tile_data->tile_info;
+
+    av1_tile_init(&td->dcb.xd.tile, cm, tile_row, tile_col);
+    av1_init_macroblockd(cm, &td->dcb.xd);
+    td->dcb.xd.error_info = &thread_data->error_info;
+
+    decode_tile_sb_row(pbi, td, tile_info, mi_row);
+
+#if CONFIG_MULTITHREAD
+    pthread_mutex_lock(pbi->row_mt_mutex_);
+#endif
+    dec_row_mt_sync->num_threads_working--;
+#if CONFIG_MULTITHREAD
+    pthread_mutex_unlock(pbi->row_mt_mutex_);
+#endif
+  }
+  thread_data->error_info.setjmp = 0;
+  return !td->dcb.corrupted;
+}
+
+// sorts in descending order
+static int compare_tile_buffers(const void *a, const void *b) {
+  const TileJobsDec *const buf1 = (const TileJobsDec *)a;
+  const TileJobsDec *const buf2 = (const TileJobsDec *)b;
+  return (((int)buf2->tile_buffer->size) - ((int)buf1->tile_buffer->size));
+}
+
+static AOM_INLINE void enqueue_tile_jobs(AV1Decoder *pbi, AV1_COMMON *cm,
+                                         int tile_rows_start, int tile_rows_end,
+                                         int tile_cols_start, int tile_cols_end,
+                                         int start_tile, int end_tile) {
+  AV1DecTileMT *tile_mt_info = &pbi->tile_mt_info;
+  TileJobsDec *tile_job_queue = tile_mt_info->job_queue;
+  tile_mt_info->jobs_enqueued = 0;
+  tile_mt_info->jobs_dequeued = 0;
+
+  for (int row = tile_rows_start; row < tile_rows_end; row++) {
+    for (int col = tile_cols_start; col < tile_cols_end; col++) {
+      if (row * cm->tiles.cols + col < start_tile ||
+          row * cm->tiles.cols + col > end_tile)
+        continue;
+      tile_job_queue->tile_buffer = &pbi->tile_buffers[row][col];
+      tile_job_queue->tile_data = pbi->tile_data + row * cm->tiles.cols + col;
+      tile_job_queue++;
+      tile_mt_info->jobs_enqueued++;
+    }
+  }
+}
+
+static AOM_INLINE void alloc_dec_jobs(AV1DecTileMT *tile_mt_info,
+                                      AV1_COMMON *cm, int tile_rows,
+                                      int tile_cols) {
+  tile_mt_info->alloc_tile_rows = tile_rows;
+  tile_mt_info->alloc_tile_cols = tile_cols;
+  int num_tiles = tile_rows * tile_cols;
+#if CONFIG_MULTITHREAD
+  {
+    CHECK_MEM_ERROR(cm, tile_mt_info->job_mutex,
+                    aom_malloc(sizeof(*tile_mt_info->job_mutex) * num_tiles));
+
+    for (int i = 0; i < num_tiles; i++) {
+      pthread_mutex_init(&tile_mt_info->job_mutex[i], NULL);
+    }
+  }
+#endif
+  CHECK_MEM_ERROR(cm, tile_mt_info->job_queue,
+                  aom_malloc(sizeof(*tile_mt_info->job_queue) * num_tiles));
+}
+
+void av1_free_mc_tmp_buf(ThreadData *thread_data) {
+  int ref;
+  for (ref = 0; ref < 2; ref++) {
+    if (thread_data->mc_buf_use_highbd)
+      aom_free(CONVERT_TO_SHORTPTR(thread_data->mc_buf[ref]));
+    else
+      aom_free(thread_data->mc_buf[ref]);
+    thread_data->mc_buf[ref] = NULL;
+  }
+  thread_data->mc_buf_size = 0;
+  thread_data->mc_buf_use_highbd = 0;
+
+  aom_free(thread_data->tmp_conv_dst);
+  thread_data->tmp_conv_dst = NULL;
+  for (int i = 0; i < 2; ++i) {
+    aom_free(thread_data->tmp_obmc_bufs[i]);
+    thread_data->tmp_obmc_bufs[i] = NULL;
+  }
+}
+
+static AOM_INLINE void allocate_mc_tmp_buf(AV1_COMMON *const cm,
+                                           ThreadData *thread_data,
+                                           int buf_size, int use_highbd) {
+  for (int ref = 0; ref < 2; ref++) {
+    // The mc_buf/hbd_mc_buf must be zeroed to fix a intermittent valgrind error
+    // 'Conditional jump or move depends on uninitialised value' from the loop
+    // filter. Uninitialized reads in convolve function (e.g. horiz_4tap path in
+    // av1_convolve_2d_sr_avx2()) from mc_buf/hbd_mc_buf are seen to be the
+    // potential reason for this issue.
+    if (use_highbd) {
+      uint16_t *hbd_mc_buf;
+      CHECK_MEM_ERROR(cm, hbd_mc_buf, (uint16_t *)aom_memalign(16, buf_size));
+      memset(hbd_mc_buf, 0, buf_size);
+      thread_data->mc_buf[ref] = CONVERT_TO_BYTEPTR(hbd_mc_buf);
+    } else {
+      CHECK_MEM_ERROR(cm, thread_data->mc_buf[ref],
+                      (uint8_t *)aom_memalign(16, buf_size));
+      memset(thread_data->mc_buf[ref], 0, buf_size);
+    }
+  }
+  thread_data->mc_buf_size = buf_size;
+  thread_data->mc_buf_use_highbd = use_highbd;
+
+  CHECK_MEM_ERROR(cm, thread_data->tmp_conv_dst,
+                  aom_memalign(32, MAX_SB_SIZE * MAX_SB_SIZE *
+                                       sizeof(*thread_data->tmp_conv_dst)));
+  for (int i = 0; i < 2; ++i) {
+    CHECK_MEM_ERROR(
+        cm, thread_data->tmp_obmc_bufs[i],
+        aom_memalign(16, 2 * MAX_MB_PLANE * MAX_SB_SQUARE *
+                             sizeof(*thread_data->tmp_obmc_bufs[i])));
+  }
+}
+
+static AOM_INLINE void reset_dec_workers(AV1Decoder *pbi,
+                                         AVxWorkerHook worker_hook,
+                                         int num_workers) {
+  const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+
+  // Reset tile decoding hook
+  for (int worker_idx = 0; worker_idx < num_workers; ++worker_idx) {
+    AVxWorker *const worker = &pbi->tile_workers[worker_idx];
+    DecWorkerData *const thread_data = pbi->thread_data + worker_idx;
+    thread_data->td->dcb = pbi->dcb;
+    thread_data->td->dcb.corrupted = 0;
+    thread_data->td->dcb.mc_buf[0] = thread_data->td->mc_buf[0];
+    thread_data->td->dcb.mc_buf[1] = thread_data->td->mc_buf[1];
+    thread_data->td->dcb.xd.tmp_conv_dst = thread_data->td->tmp_conv_dst;
+    for (int j = 0; j < 2; ++j) {
+      thread_data->td->dcb.xd.tmp_obmc_bufs[j] =
+          thread_data->td->tmp_obmc_bufs[j];
+    }
+    winterface->sync(worker);
+
+    worker->hook = worker_hook;
+    worker->data1 = thread_data;
+    worker->data2 = pbi;
+  }
+#if CONFIG_ACCOUNTING
+  if (pbi->acct_enabled) {
+    aom_accounting_reset(&pbi->accounting);
+  }
+#endif
+}
+
+static AOM_INLINE void launch_dec_workers(AV1Decoder *pbi,
+                                          const uint8_t *data_end,
+                                          int num_workers) {
+  const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+
+  for (int worker_idx = num_workers - 1; worker_idx >= 0; --worker_idx) {
+    AVxWorker *const worker = &pbi->tile_workers[worker_idx];
+    DecWorkerData *const thread_data = (DecWorkerData *)worker->data1;
+
+    thread_data->data_end = data_end;
+
+    worker->had_error = 0;
+    if (worker_idx == 0) {
+      winterface->execute(worker);
+    } else {
+      winterface->launch(worker);
+    }
+  }
+}
+
+static AOM_INLINE void sync_dec_workers(AV1Decoder *pbi, int num_workers) {
+  const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+  int corrupted = 0;
+
+  for (int worker_idx = num_workers; worker_idx > 0; --worker_idx) {
+    AVxWorker *const worker = &pbi->tile_workers[worker_idx - 1];
+    aom_merge_corrupted_flag(&corrupted, !winterface->sync(worker));
+  }
+
+  pbi->dcb.corrupted = corrupted;
+}
+
+static AOM_INLINE void decode_mt_init(AV1Decoder *pbi) {
+  AV1_COMMON *const cm = &pbi->common;
+  const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+  int worker_idx;
+
+  // Create workers and thread_data
+  if (pbi->num_workers == 0) {
+    const int num_threads = pbi->max_threads;
+    CHECK_MEM_ERROR(cm, pbi->tile_workers,
+                    aom_malloc(num_threads * sizeof(*pbi->tile_workers)));
+    CHECK_MEM_ERROR(cm, pbi->thread_data,
+                    aom_malloc(num_threads * sizeof(*pbi->thread_data)));
+
+    for (worker_idx = 0; worker_idx < num_threads; ++worker_idx) {
+      AVxWorker *const worker = &pbi->tile_workers[worker_idx];
+      DecWorkerData *const thread_data = pbi->thread_data + worker_idx;
+      ++pbi->num_workers;
+
+      winterface->init(worker);
+      worker->thread_name = "aom tile worker";
+      if (worker_idx != 0 && !winterface->reset(worker)) {
+        aom_internal_error(&cm->error, AOM_CODEC_ERROR,
+                           "Tile decoder thread creation failed");
+      }
+
+      if (worker_idx != 0) {
+        // Allocate thread data.
+        CHECK_MEM_ERROR(cm, thread_data->td,
+                        aom_memalign(32, sizeof(*thread_data->td)));
+        av1_zero(*thread_data->td);
+      } else {
+        // Main thread acts as a worker and uses the thread data in pbi
+        thread_data->td = &pbi->td;
+      }
+      thread_data->error_info.error_code = AOM_CODEC_OK;
+      thread_data->error_info.setjmp = 0;
+    }
+  }
+  const int use_highbd = cm->seq_params.use_highbitdepth;
+  const int buf_size = MC_TEMP_BUF_PELS << use_highbd;
+  for (worker_idx = 1; worker_idx < pbi->max_threads; ++worker_idx) {
+    DecWorkerData *const thread_data = pbi->thread_data + worker_idx;
+    if (thread_data->td->mc_buf_size != buf_size) {
+      av1_free_mc_tmp_buf(thread_data->td);
+      allocate_mc_tmp_buf(cm, thread_data->td, buf_size, use_highbd);
+    }
+  }
+}
+
+static AOM_INLINE void tile_mt_queue(AV1Decoder *pbi, int tile_cols,
+                                     int tile_rows, int tile_rows_start,
+                                     int tile_rows_end, int tile_cols_start,
+                                     int tile_cols_end, int start_tile,
+                                     int end_tile) {
+  AV1_COMMON *const cm = &pbi->common;
+  if (pbi->tile_mt_info.alloc_tile_cols != tile_cols ||
+      pbi->tile_mt_info.alloc_tile_rows != tile_rows) {
+    av1_dealloc_dec_jobs(&pbi->tile_mt_info);
+    alloc_dec_jobs(&pbi->tile_mt_info, cm, tile_rows, tile_cols);
+  }
+  enqueue_tile_jobs(pbi, cm, tile_rows_start, tile_rows_end, tile_cols_start,
+                    tile_cols_end, start_tile, end_tile);
+  qsort(pbi->tile_mt_info.job_queue, pbi->tile_mt_info.jobs_enqueued,
+        sizeof(pbi->tile_mt_info.job_queue[0]), compare_tile_buffers);
+}
+
+static const uint8_t *decode_tiles_mt(AV1Decoder *pbi, const uint8_t *data,
+                                      const uint8_t *data_end, int start_tile,
+                                      int end_tile) {
+  AV1_COMMON *const cm = &pbi->common;
+  CommonTileParams *const tiles = &cm->tiles;
+  const int tile_cols = tiles->cols;
+  const int tile_rows = tiles->rows;
+  const int n_tiles = tile_cols * tile_rows;
+  TileBufferDec(*const tile_buffers)[MAX_TILE_COLS] = pbi->tile_buffers;
+  const int dec_tile_row = AOMMIN(pbi->dec_tile_row, tile_rows);
+  const int single_row = pbi->dec_tile_row >= 0;
+  const int dec_tile_col = AOMMIN(pbi->dec_tile_col, tile_cols);
+  const int single_col = pbi->dec_tile_col >= 0;
+  int tile_rows_start;
+  int tile_rows_end;
+  int tile_cols_start;
+  int tile_cols_end;
+  int tile_count_tg;
+  int num_workers;
+  const uint8_t *raw_data_end = NULL;
+
+  if (tiles->large_scale) {
+    tile_rows_start = single_row ? dec_tile_row : 0;
+    tile_rows_end = single_row ? dec_tile_row + 1 : tile_rows;
+    tile_cols_start = single_col ? dec_tile_col : 0;
+    tile_cols_end = single_col ? tile_cols_start + 1 : tile_cols;
+  } else {
+    tile_rows_start = 0;
+    tile_rows_end = tile_rows;
+    tile_cols_start = 0;
+    tile_cols_end = tile_cols;
+  }
+  tile_count_tg = end_tile - start_tile + 1;
+  num_workers = AOMMIN(pbi->max_threads, tile_count_tg);
+
+  // No tiles to decode.
+  if (tile_rows_end <= tile_rows_start || tile_cols_end <= tile_cols_start ||
+      // First tile is larger than end_tile.
+      tile_rows_start * tile_cols + tile_cols_start > end_tile ||
+      // Last tile is smaller than start_tile.
+      (tile_rows_end - 1) * tile_cols + tile_cols_end - 1 < start_tile)
+    return data;
+
+  assert(tile_rows <= MAX_TILE_ROWS);
+  assert(tile_cols <= MAX_TILE_COLS);
+  assert(tile_count_tg > 0);
+  assert(num_workers > 0);
+  assert(start_tile <= end_tile);
+  assert(start_tile >= 0 && end_tile < n_tiles);
+
+  decode_mt_init(pbi);
+
+  // get tile size in tile group
+#if EXT_TILE_DEBUG
+  if (tiles->large_scale) assert(pbi->ext_tile_debug == 1);
+  if (tiles->large_scale)
+    raw_data_end = get_ls_tile_buffers(pbi, data, data_end, tile_buffers);
+  else
+#endif  // EXT_TILE_DEBUG
+    get_tile_buffers(pbi, data, data_end, tile_buffers, start_tile, end_tile);
+
+  if (pbi->tile_data == NULL || n_tiles != pbi->allocated_tiles) {
+    decoder_alloc_tile_data(pbi, n_tiles);
+  }
+
+  for (int row = 0; row < tile_rows; row++) {
+    for (int col = 0; col < tile_cols; col++) {
+      TileDataDec *tile_data = pbi->tile_data + row * tiles->cols + col;
+      av1_tile_init(&tile_data->tile_info, cm, row, col);
+    }
+  }
+
+  tile_mt_queue(pbi, tile_cols, tile_rows, tile_rows_start, tile_rows_end,
+                tile_cols_start, tile_cols_end, start_tile, end_tile);
+
+  reset_dec_workers(pbi, tile_worker_hook, num_workers);
+  launch_dec_workers(pbi, data_end, num_workers);
+  sync_dec_workers(pbi, num_workers);
+
+  if (pbi->dcb.corrupted)
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Failed to decode tile data");
+
+  if (tiles->large_scale) {
+    if (n_tiles == 1) {
+      // Find the end of the single tile buffer
+      return aom_reader_find_end(&pbi->tile_data->bit_reader);
+    }
+    // Return the end of the last tile buffer
+    return raw_data_end;
+  }
+  TileDataDec *const tile_data = pbi->tile_data + end_tile;
+
+  return aom_reader_find_end(&tile_data->bit_reader);
+}
+
+static AOM_INLINE void dec_alloc_cb_buf(AV1Decoder *pbi) {
+  AV1_COMMON *const cm = &pbi->common;
+  int size = ((cm->mi_params.mi_rows >> cm->seq_params.mib_size_log2) + 1) *
+             ((cm->mi_params.mi_cols >> cm->seq_params.mib_size_log2) + 1);
+
+  if (pbi->cb_buffer_alloc_size < size) {
+    av1_dec_free_cb_buf(pbi);
+    CHECK_MEM_ERROR(cm, pbi->cb_buffer_base,
+                    aom_memalign(32, sizeof(*pbi->cb_buffer_base) * size));
+    memset(pbi->cb_buffer_base, 0, sizeof(*pbi->cb_buffer_base) * size);
+    pbi->cb_buffer_alloc_size = size;
+  }
+}
+
+static AOM_INLINE void row_mt_frame_init(AV1Decoder *pbi, int tile_rows_start,
+                                         int tile_rows_end, int tile_cols_start,
+                                         int tile_cols_end, int start_tile,
+                                         int end_tile, int max_sb_rows) {
+  AV1_COMMON *const cm = &pbi->common;
+  AV1DecRowMTInfo *frame_row_mt_info = &pbi->frame_row_mt_info;
+
+  frame_row_mt_info->tile_rows_start = tile_rows_start;
+  frame_row_mt_info->tile_rows_end = tile_rows_end;
+  frame_row_mt_info->tile_cols_start = tile_cols_start;
+  frame_row_mt_info->tile_cols_end = tile_cols_end;
+  frame_row_mt_info->start_tile = start_tile;
+  frame_row_mt_info->end_tile = end_tile;
+  frame_row_mt_info->mi_rows_to_decode = 0;
+  frame_row_mt_info->mi_rows_parse_done = 0;
+  frame_row_mt_info->mi_rows_decode_started = 0;
+  frame_row_mt_info->row_mt_exit = 0;
+
+  for (int tile_row = tile_rows_start; tile_row < tile_rows_end; ++tile_row) {
+    for (int tile_col = tile_cols_start; tile_col < tile_cols_end; ++tile_col) {
+      if (tile_row * cm->tiles.cols + tile_col < start_tile ||
+          tile_row * cm->tiles.cols + tile_col > end_tile)
+        continue;
+
+      TileDataDec *const tile_data =
+          pbi->tile_data + tile_row * cm->tiles.cols + tile_col;
+      TileInfo tile_info = tile_data->tile_info;
+
+      tile_data->dec_row_mt_sync.mi_rows_parse_done = 0;
+      tile_data->dec_row_mt_sync.mi_rows_decode_started = 0;
+      tile_data->dec_row_mt_sync.num_threads_working = 0;
+      tile_data->dec_row_mt_sync.mi_rows =
+          ALIGN_POWER_OF_TWO(tile_info.mi_row_end - tile_info.mi_row_start,
+                             cm->seq_params.mib_size_log2);
+      tile_data->dec_row_mt_sync.mi_cols =
+          ALIGN_POWER_OF_TWO(tile_info.mi_col_end - tile_info.mi_col_start,
+                             cm->seq_params.mib_size_log2);
+
+      frame_row_mt_info->mi_rows_to_decode +=
+          tile_data->dec_row_mt_sync.mi_rows;
+
+      // Initialize cur_sb_col to -1 for all SB rows.
+      memset(tile_data->dec_row_mt_sync.cur_sb_col, -1,
+             sizeof(*tile_data->dec_row_mt_sync.cur_sb_col) * max_sb_rows);
+    }
+  }
+
+#if CONFIG_MULTITHREAD
+  if (pbi->row_mt_mutex_ == NULL) {
+    CHECK_MEM_ERROR(cm, pbi->row_mt_mutex_,
+                    aom_malloc(sizeof(*(pbi->row_mt_mutex_))));
+    if (pbi->row_mt_mutex_) {
+      pthread_mutex_init(pbi->row_mt_mutex_, NULL);
+    }
+  }
+
+  if (pbi->row_mt_cond_ == NULL) {
+    CHECK_MEM_ERROR(cm, pbi->row_mt_cond_,
+                    aom_malloc(sizeof(*(pbi->row_mt_cond_))));
+    if (pbi->row_mt_cond_) {
+      pthread_cond_init(pbi->row_mt_cond_, NULL);
+    }
+  }
+#endif
+}
+
+static const uint8_t *decode_tiles_row_mt(AV1Decoder *pbi, const uint8_t *data,
+                                          const uint8_t *data_end,
+                                          int start_tile, int end_tile) {
+  AV1_COMMON *const cm = &pbi->common;
+  CommonTileParams *const tiles = &cm->tiles;
+  const int tile_cols = tiles->cols;
+  const int tile_rows = tiles->rows;
+  const int n_tiles = tile_cols * tile_rows;
+  TileBufferDec(*const tile_buffers)[MAX_TILE_COLS] = pbi->tile_buffers;
+  const int dec_tile_row = AOMMIN(pbi->dec_tile_row, tile_rows);
+  const int single_row = pbi->dec_tile_row >= 0;
+  const int dec_tile_col = AOMMIN(pbi->dec_tile_col, tile_cols);
+  const int single_col = pbi->dec_tile_col >= 0;
+  int tile_rows_start;
+  int tile_rows_end;
+  int tile_cols_start;
+  int tile_cols_end;
+  int tile_count_tg;
+  int num_workers = 0;
+  int max_threads;
+  const uint8_t *raw_data_end = NULL;
+  int max_sb_rows = 0;
+
+  if (tiles->large_scale) {
+    tile_rows_start = single_row ? dec_tile_row : 0;
+    tile_rows_end = single_row ? dec_tile_row + 1 : tile_rows;
+    tile_cols_start = single_col ? dec_tile_col : 0;
+    tile_cols_end = single_col ? tile_cols_start + 1 : tile_cols;
+  } else {
+    tile_rows_start = 0;
+    tile_rows_end = tile_rows;
+    tile_cols_start = 0;
+    tile_cols_end = tile_cols;
+  }
+  tile_count_tg = end_tile - start_tile + 1;
+  max_threads = pbi->max_threads;
+
+  // No tiles to decode.
+  if (tile_rows_end <= tile_rows_start || tile_cols_end <= tile_cols_start ||
+      // First tile is larger than end_tile.
+      tile_rows_start * tile_cols + tile_cols_start > end_tile ||
+      // Last tile is smaller than start_tile.
+      (tile_rows_end - 1) * tile_cols + tile_cols_end - 1 < start_tile)
+    return data;
+
+  assert(tile_rows <= MAX_TILE_ROWS);
+  assert(tile_cols <= MAX_TILE_COLS);
+  assert(tile_count_tg > 0);
+  assert(max_threads > 0);
+  assert(start_tile <= end_tile);
+  assert(start_tile >= 0 && end_tile < n_tiles);
+
+  (void)tile_count_tg;
+
+  decode_mt_init(pbi);
+
+  // get tile size in tile group
+#if EXT_TILE_DEBUG
+  if (tiles->large_scale) assert(pbi->ext_tile_debug == 1);
+  if (tiles->large_scale)
+    raw_data_end = get_ls_tile_buffers(pbi, data, data_end, tile_buffers);
+  else
+#endif  // EXT_TILE_DEBUG
+    get_tile_buffers(pbi, data, data_end, tile_buffers, start_tile, end_tile);
+
+  if (pbi->tile_data == NULL || n_tiles != pbi->allocated_tiles) {
+    if (pbi->tile_data != NULL) {
+      for (int i = 0; i < pbi->allocated_tiles; i++) {
+        TileDataDec *const tile_data = pbi->tile_data + i;
+        av1_dec_row_mt_dealloc(&tile_data->dec_row_mt_sync);
+      }
+    }
+    decoder_alloc_tile_data(pbi, n_tiles);
+  }
+
+  for (int row = 0; row < tile_rows; row++) {
+    for (int col = 0; col < tile_cols; col++) {
+      TileDataDec *tile_data = pbi->tile_data + row * tiles->cols + col;
+      av1_tile_init(&tile_data->tile_info, cm, row, col);
+
+      max_sb_rows = AOMMAX(max_sb_rows,
+                           av1_get_sb_rows_in_tile(cm, tile_data->tile_info));
+      num_workers += get_max_row_mt_workers_per_tile(cm, tile_data->tile_info);
+    }
+  }
+  num_workers = AOMMIN(num_workers, max_threads);
+
+  if (pbi->allocated_row_mt_sync_rows != max_sb_rows) {
+    for (int i = 0; i < n_tiles; ++i) {
+      TileDataDec *const tile_data = pbi->tile_data + i;
+      av1_dec_row_mt_dealloc(&tile_data->dec_row_mt_sync);
+      dec_row_mt_alloc(&tile_data->dec_row_mt_sync, cm, max_sb_rows);
+    }
+    pbi->allocated_row_mt_sync_rows = max_sb_rows;
+  }
+
+  tile_mt_queue(pbi, tile_cols, tile_rows, tile_rows_start, tile_rows_end,
+                tile_cols_start, tile_cols_end, start_tile, end_tile);
+
+  dec_alloc_cb_buf(pbi);
+
+  row_mt_frame_init(pbi, tile_rows_start, tile_rows_end, tile_cols_start,
+                    tile_cols_end, start_tile, end_tile, max_sb_rows);
+
+  reset_dec_workers(pbi, row_mt_worker_hook, num_workers);
+  launch_dec_workers(pbi, data_end, num_workers);
+  sync_dec_workers(pbi, num_workers);
+
+  if (pbi->dcb.corrupted)
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Failed to decode tile data");
+
+  if (tiles->large_scale) {
+    if (n_tiles == 1) {
+      // Find the end of the single tile buffer
+      return aom_reader_find_end(&pbi->tile_data->bit_reader);
+    }
+    // Return the end of the last tile buffer
+    return raw_data_end;
+  }
+  TileDataDec *const tile_data = pbi->tile_data + end_tile;
+
+  return aom_reader_find_end(&tile_data->bit_reader);
+}
+
+static AOM_INLINE void error_handler(void *data) {
+  AV1_COMMON *const cm = (AV1_COMMON *)data;
+  aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME, "Truncated packet");
+}
+
+// Reads the high_bitdepth and twelve_bit fields in color_config() and sets
+// seq_params->bit_depth based on the values of those fields and
+// seq_params->profile. Reports errors by calling rb->error_handler() or
+// aom_internal_error().
+static AOM_INLINE void read_bitdepth(
+    struct aom_read_bit_buffer *rb, SequenceHeader *seq_params,
+    struct aom_internal_error_info *error_info) {
+  const int high_bitdepth = aom_rb_read_bit(rb);
+  if (seq_params->profile == PROFILE_2 && high_bitdepth) {
+    const int twelve_bit = aom_rb_read_bit(rb);
+    seq_params->bit_depth = twelve_bit ? AOM_BITS_12 : AOM_BITS_10;
+  } else if (seq_params->profile <= PROFILE_2) {
+    seq_params->bit_depth = high_bitdepth ? AOM_BITS_10 : AOM_BITS_8;
+  } else {
+    aom_internal_error(error_info, AOM_CODEC_UNSUP_BITSTREAM,
+                       "Unsupported profile/bit-depth combination");
+  }
+#if !CONFIG_AV1_HIGHBITDEPTH
+  if (seq_params->bit_depth > AOM_BITS_8) {
+    aom_internal_error(error_info, AOM_CODEC_UNSUP_BITSTREAM,
+                       "Bit-depth %d not supported", seq_params->bit_depth);
+  }
+#endif
+}
+
+void av1_read_film_grain_params(AV1_COMMON *cm,
+                                struct aom_read_bit_buffer *rb) {
+  aom_film_grain_t *pars = &cm->film_grain_params;
+  const SequenceHeader *const seq_params = &cm->seq_params;
+
+  pars->apply_grain = aom_rb_read_bit(rb);
+  if (!pars->apply_grain) {
+    memset(pars, 0, sizeof(*pars));
+    return;
+  }
+
+  pars->random_seed = aom_rb_read_literal(rb, 16);
+  if (cm->current_frame.frame_type == INTER_FRAME)
+    pars->update_parameters = aom_rb_read_bit(rb);
+  else
+    pars->update_parameters = 1;
+
+  pars->bit_depth = seq_params->bit_depth;
+
+  if (!pars->update_parameters) {
+    // inherit parameters from a previous reference frame
+    int film_grain_params_ref_idx = aom_rb_read_literal(rb, 3);
+    // Section 6.8.20: It is a requirement of bitstream conformance that
+    // film_grain_params_ref_idx is equal to ref_frame_idx[ j ] for some value
+    // of j in the range 0 to REFS_PER_FRAME - 1.
+    int found = 0;
+    for (int i = 0; i < INTER_REFS_PER_FRAME; ++i) {
+      if (film_grain_params_ref_idx == cm->remapped_ref_idx[i]) {
+        found = 1;
+        break;
+      }
+    }
+    if (!found) {
+      aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                         "Invalid film grain reference idx %d. ref_frame_idx = "
+                         "{%d, %d, %d, %d, %d, %d, %d}",
+                         film_grain_params_ref_idx, cm->remapped_ref_idx[0],
+                         cm->remapped_ref_idx[1], cm->remapped_ref_idx[2],
+                         cm->remapped_ref_idx[3], cm->remapped_ref_idx[4],
+                         cm->remapped_ref_idx[5], cm->remapped_ref_idx[6]);
+    }
+    RefCntBuffer *const buf = cm->ref_frame_map[film_grain_params_ref_idx];
+    if (buf == NULL) {
+      aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                         "Invalid Film grain reference idx");
+    }
+    if (!buf->film_grain_params_present) {
+      aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                         "Film grain reference parameters not available");
+    }
+    uint16_t random_seed = pars->random_seed;
+    *pars = buf->film_grain_params;   // inherit paramaters
+    pars->random_seed = random_seed;  // with new random seed
+    return;
+  }
+
+  // Scaling functions parameters
+  pars->num_y_points = aom_rb_read_literal(rb, 4);  // max 14
+  if (pars->num_y_points > 14)
+    aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                       "Number of points for film grain luma scaling function "
+                       "exceeds the maximum value.");
+  for (int i = 0; i < pars->num_y_points; i++) {
+    pars->scaling_points_y[i][0] = aom_rb_read_literal(rb, 8);
+    if (i && pars->scaling_points_y[i - 1][0] >= pars->scaling_points_y[i][0])
+      aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                         "First coordinate of the scaling function points "
+                         "shall be increasing.");
+    pars->scaling_points_y[i][1] = aom_rb_read_literal(rb, 8);
+  }
+
+  if (!seq_params->monochrome)
+    pars->chroma_scaling_from_luma = aom_rb_read_bit(rb);
+  else
+    pars->chroma_scaling_from_luma = 0;
+
+  if (seq_params->monochrome || pars->chroma_scaling_from_luma ||
+      ((seq_params->subsampling_x == 1) && (seq_params->subsampling_y == 1) &&
+       (pars->num_y_points == 0))) {
+    pars->num_cb_points = 0;
+    pars->num_cr_points = 0;
+  } else {
+    pars->num_cb_points = aom_rb_read_literal(rb, 4);  // max 10
+    if (pars->num_cb_points > 10)
+      aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                         "Number of points for film grain cb scaling function "
+                         "exceeds the maximum value.");
+    for (int i = 0; i < pars->num_cb_points; i++) {
+      pars->scaling_points_cb[i][0] = aom_rb_read_literal(rb, 8);
+      if (i &&
+          pars->scaling_points_cb[i - 1][0] >= pars->scaling_points_cb[i][0])
+        aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                           "First coordinate of the scaling function points "
+                           "shall be increasing.");
+      pars->scaling_points_cb[i][1] = aom_rb_read_literal(rb, 8);
+    }
+
+    pars->num_cr_points = aom_rb_read_literal(rb, 4);  // max 10
+    if (pars->num_cr_points > 10)
+      aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                         "Number of points for film grain cr scaling function "
+                         "exceeds the maximum value.");
+    for (int i = 0; i < pars->num_cr_points; i++) {
+      pars->scaling_points_cr[i][0] = aom_rb_read_literal(rb, 8);
+      if (i &&
+          pars->scaling_points_cr[i - 1][0] >= pars->scaling_points_cr[i][0])
+        aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                           "First coordinate of the scaling function points "
+                           "shall be increasing.");
+      pars->scaling_points_cr[i][1] = aom_rb_read_literal(rb, 8);
+    }
+
+    if ((seq_params->subsampling_x == 1) && (seq_params->subsampling_y == 1) &&
+        (((pars->num_cb_points == 0) && (pars->num_cr_points != 0)) ||
+         ((pars->num_cb_points != 0) && (pars->num_cr_points == 0))))
+      aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                         "In YCbCr 4:2:0, film grain shall be applied "
+                         "to both chroma components or neither.");
+  }
+
+  pars->scaling_shift = aom_rb_read_literal(rb, 2) + 8;  // 8 + value
+
+  // AR coefficients
+  // Only sent if the corresponsing scaling function has
+  // more than 0 points
+
+  pars->ar_coeff_lag = aom_rb_read_literal(rb, 2);
+
+  int num_pos_luma = 2 * pars->ar_coeff_lag * (pars->ar_coeff_lag + 1);
+  int num_pos_chroma = num_pos_luma;
+  if (pars->num_y_points > 0) ++num_pos_chroma;
+
+  if (pars->num_y_points)
+    for (int i = 0; i < num_pos_luma; i++)
+      pars->ar_coeffs_y[i] = aom_rb_read_literal(rb, 8) - 128;
+
+  if (pars->num_cb_points || pars->chroma_scaling_from_luma)
+    for (int i = 0; i < num_pos_chroma; i++)
+      pars->ar_coeffs_cb[i] = aom_rb_read_literal(rb, 8) - 128;
+
+  if (pars->num_cr_points || pars->chroma_scaling_from_luma)
+    for (int i = 0; i < num_pos_chroma; i++)
+      pars->ar_coeffs_cr[i] = aom_rb_read_literal(rb, 8) - 128;
+
+  pars->ar_coeff_shift = aom_rb_read_literal(rb, 2) + 6;  // 6 + value
+
+  pars->grain_scale_shift = aom_rb_read_literal(rb, 2);
+
+  if (pars->num_cb_points) {
+    pars->cb_mult = aom_rb_read_literal(rb, 8);
+    pars->cb_luma_mult = aom_rb_read_literal(rb, 8);
+    pars->cb_offset = aom_rb_read_literal(rb, 9);
+  }
+
+  if (pars->num_cr_points) {
+    pars->cr_mult = aom_rb_read_literal(rb, 8);
+    pars->cr_luma_mult = aom_rb_read_literal(rb, 8);
+    pars->cr_offset = aom_rb_read_literal(rb, 9);
+  }
+
+  pars->overlap_flag = aom_rb_read_bit(rb);
+
+  pars->clip_to_restricted_range = aom_rb_read_bit(rb);
+}
+
+static AOM_INLINE void read_film_grain(AV1_COMMON *cm,
+                                       struct aom_read_bit_buffer *rb) {
+  if (cm->seq_params.film_grain_params_present &&
+      (cm->show_frame || cm->showable_frame)) {
+    av1_read_film_grain_params(cm, rb);
+  } else {
+    memset(&cm->film_grain_params, 0, sizeof(cm->film_grain_params));
+  }
+  cm->film_grain_params.bit_depth = cm->seq_params.bit_depth;
+  memcpy(&cm->cur_frame->film_grain_params, &cm->film_grain_params,
+         sizeof(aom_film_grain_t));
+}
+
+void av1_read_color_config(struct aom_read_bit_buffer *rb,
+                           int allow_lowbitdepth, SequenceHeader *seq_params,
+                           struct aom_internal_error_info *error_info) {
+  read_bitdepth(rb, seq_params, error_info);
+
+  seq_params->use_highbitdepth =
+      seq_params->bit_depth > AOM_BITS_8 || !allow_lowbitdepth;
+  // monochrome bit (not needed for PROFILE_1)
+  const int is_monochrome =
+      seq_params->profile != PROFILE_1 ? aom_rb_read_bit(rb) : 0;
+  seq_params->monochrome = is_monochrome;
+  int color_description_present_flag = aom_rb_read_bit(rb);
+  if (color_description_present_flag) {
+    seq_params->color_primaries = aom_rb_read_literal(rb, 8);
+    seq_params->transfer_characteristics = aom_rb_read_literal(rb, 8);
+    seq_params->matrix_coefficients = aom_rb_read_literal(rb, 8);
+  } else {
+    seq_params->color_primaries = AOM_CICP_CP_UNSPECIFIED;
+    seq_params->transfer_characteristics = AOM_CICP_TC_UNSPECIFIED;
+    seq_params->matrix_coefficients = AOM_CICP_MC_UNSPECIFIED;
+  }
+  if (is_monochrome) {
+    // [16,235] (including xvycc) vs [0,255] range
+    seq_params->color_range = aom_rb_read_bit(rb);
+    seq_params->subsampling_y = seq_params->subsampling_x = 1;
+    seq_params->chroma_sample_position = AOM_CSP_UNKNOWN;
+    seq_params->separate_uv_delta_q = 0;
+    return;
+  }
+  if (seq_params->color_primaries == AOM_CICP_CP_BT_709 &&
+      seq_params->transfer_characteristics == AOM_CICP_TC_SRGB &&
+      seq_params->matrix_coefficients == AOM_CICP_MC_IDENTITY) {
+    seq_params->subsampling_y = seq_params->subsampling_x = 0;
+    seq_params->color_range = 1;  // assume full color-range
+    if (!(seq_params->profile == PROFILE_1 ||
+          (seq_params->profile == PROFILE_2 &&
+           seq_params->bit_depth == AOM_BITS_12))) {
+      aom_internal_error(
+          error_info, AOM_CODEC_UNSUP_BITSTREAM,
+          "sRGB colorspace not compatible with specified profile");
+    }
+  } else {
+    // [16,235] (including xvycc) vs [0,255] range
+    seq_params->color_range = aom_rb_read_bit(rb);
+    if (seq_params->profile == PROFILE_0) {
+      // 420 only
+      seq_params->subsampling_x = seq_params->subsampling_y = 1;
+    } else if (seq_params->profile == PROFILE_1) {
+      // 444 only
+      seq_params->subsampling_x = seq_params->subsampling_y = 0;
+    } else {
+      assert(seq_params->profile == PROFILE_2);
+      if (seq_params->bit_depth == AOM_BITS_12) {
+        seq_params->subsampling_x = aom_rb_read_bit(rb);
+        if (seq_params->subsampling_x)
+          seq_params->subsampling_y = aom_rb_read_bit(rb);  // 422 or 420
+        else
+          seq_params->subsampling_y = 0;  // 444
+      } else {
+        // 422
+        seq_params->subsampling_x = 1;
+        seq_params->subsampling_y = 0;
+      }
+    }
+    if (seq_params->matrix_coefficients == AOM_CICP_MC_IDENTITY &&
+        (seq_params->subsampling_x || seq_params->subsampling_y)) {
+      aom_internal_error(
+          error_info, AOM_CODEC_UNSUP_BITSTREAM,
+          "Identity CICP Matrix incompatible with non 4:4:4 color sampling");
+    }
+    if (seq_params->subsampling_x && seq_params->subsampling_y) {
+      seq_params->chroma_sample_position = aom_rb_read_literal(rb, 2);
+    }
+  }
+  seq_params->separate_uv_delta_q = aom_rb_read_bit(rb);
+}
+
+void av1_read_timing_info_header(aom_timing_info_t *timing_info,
+                                 struct aom_internal_error_info *error,
+                                 struct aom_read_bit_buffer *rb) {
+  timing_info->num_units_in_display_tick =
+      aom_rb_read_unsigned_literal(rb,
+                                   32);  // Number of units in a display tick
+  timing_info->time_scale = aom_rb_read_unsigned_literal(rb, 32);  // Time scale
+  if (timing_info->num_units_in_display_tick == 0 ||
+      timing_info->time_scale == 0) {
+    aom_internal_error(
+        error, AOM_CODEC_UNSUP_BITSTREAM,
+        "num_units_in_display_tick and time_scale must be greater than 0.");
+  }
+  timing_info->equal_picture_interval =
+      aom_rb_read_bit(rb);  // Equal picture interval bit
+  if (timing_info->equal_picture_interval) {
+    const uint32_t num_ticks_per_picture_minus_1 = aom_rb_read_uvlc(rb);
+    if (num_ticks_per_picture_minus_1 == UINT32_MAX) {
+      aom_internal_error(
+          error, AOM_CODEC_UNSUP_BITSTREAM,
+          "num_ticks_per_picture_minus_1 cannot be (1 << 32) - 1.");
+    }
+    timing_info->num_ticks_per_picture = num_ticks_per_picture_minus_1 + 1;
+  }
+}
+
+void av1_read_decoder_model_info(aom_dec_model_info_t *decoder_model_info,
+                                 struct aom_read_bit_buffer *rb) {
+  decoder_model_info->encoder_decoder_buffer_delay_length =
+      aom_rb_read_literal(rb, 5) + 1;
+  decoder_model_info->num_units_in_decoding_tick =
+      aom_rb_read_unsigned_literal(rb,
+                                   32);  // Number of units in a decoding tick
+  decoder_model_info->buffer_removal_time_length =
+      aom_rb_read_literal(rb, 5) + 1;
+  decoder_model_info->frame_presentation_time_length =
+      aom_rb_read_literal(rb, 5) + 1;
+}
+
+void av1_read_op_parameters_info(aom_dec_model_op_parameters_t *op_params,
+                                 int buffer_delay_length,
+                                 struct aom_read_bit_buffer *rb) {
+  op_params->decoder_buffer_delay =
+      aom_rb_read_unsigned_literal(rb, buffer_delay_length);
+  op_params->encoder_buffer_delay =
+      aom_rb_read_unsigned_literal(rb, buffer_delay_length);
+  op_params->low_delay_mode_flag = aom_rb_read_bit(rb);
+}
+
+static AOM_INLINE void read_temporal_point_info(
+    AV1_COMMON *const cm, struct aom_read_bit_buffer *rb) {
+  cm->frame_presentation_time = aom_rb_read_unsigned_literal(
+      rb, cm->seq_params.decoder_model_info.frame_presentation_time_length);
+}
+
+void av1_read_sequence_header(AV1_COMMON *cm, struct aom_read_bit_buffer *rb,
+                              SequenceHeader *seq_params) {
+  const int num_bits_width = aom_rb_read_literal(rb, 4) + 1;
+  const int num_bits_height = aom_rb_read_literal(rb, 4) + 1;
+  const int max_frame_width = aom_rb_read_literal(rb, num_bits_width) + 1;
+  const int max_frame_height = aom_rb_read_literal(rb, num_bits_height) + 1;
+
+  seq_params->num_bits_width = num_bits_width;
+  seq_params->num_bits_height = num_bits_height;
+  seq_params->max_frame_width = max_frame_width;
+  seq_params->max_frame_height = max_frame_height;
+
+  if (seq_params->reduced_still_picture_hdr) {
+    seq_params->frame_id_numbers_present_flag = 0;
+  } else {
+    seq_params->frame_id_numbers_present_flag = aom_rb_read_bit(rb);
+  }
+  if (seq_params->frame_id_numbers_present_flag) {
+    // We must always have delta_frame_id_length < frame_id_length,
+    // in order for a frame to be referenced with a unique delta.
+    // Avoid wasting bits by using a coding that enforces this restriction.
+    seq_params->delta_frame_id_length = aom_rb_read_literal(rb, 4) + 2;
+    seq_params->frame_id_length =
+        aom_rb_read_literal(rb, 3) + seq_params->delta_frame_id_length + 1;
+    if (seq_params->frame_id_length > 16)
+      aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                         "Invalid frame_id_length");
+  }
+
+  setup_sb_size(seq_params, rb);
+
+  seq_params->enable_filter_intra = aom_rb_read_bit(rb);
+  seq_params->enable_intra_edge_filter = aom_rb_read_bit(rb);
+
+  if (seq_params->reduced_still_picture_hdr) {
+    seq_params->enable_interintra_compound = 0;
+    seq_params->enable_masked_compound = 0;
+    seq_params->enable_warped_motion = 0;
+    seq_params->enable_dual_filter = 0;
+    seq_params->order_hint_info.enable_order_hint = 0;
+    seq_params->order_hint_info.enable_dist_wtd_comp = 0;
+    seq_params->order_hint_info.enable_ref_frame_mvs = 0;
+    seq_params->force_screen_content_tools = 2;  // SELECT_SCREEN_CONTENT_TOOLS
+    seq_params->force_integer_mv = 2;            // SELECT_INTEGER_MV
+    seq_params->order_hint_info.order_hint_bits_minus_1 = -1;
+  } else {
+    seq_params->enable_interintra_compound = aom_rb_read_bit(rb);
+    seq_params->enable_masked_compound = aom_rb_read_bit(rb);
+    seq_params->enable_warped_motion = aom_rb_read_bit(rb);
+    seq_params->enable_dual_filter = aom_rb_read_bit(rb);
+
+    seq_params->order_hint_info.enable_order_hint = aom_rb_read_bit(rb);
+    seq_params->order_hint_info.enable_dist_wtd_comp =
+        seq_params->order_hint_info.enable_order_hint ? aom_rb_read_bit(rb) : 0;
+    seq_params->order_hint_info.enable_ref_frame_mvs =
+        seq_params->order_hint_info.enable_order_hint ? aom_rb_read_bit(rb) : 0;
+
+    if (aom_rb_read_bit(rb)) {
+      seq_params->force_screen_content_tools =
+          2;  // SELECT_SCREEN_CONTENT_TOOLS
+    } else {
+      seq_params->force_screen_content_tools = aom_rb_read_bit(rb);
+    }
+
+    if (seq_params->force_screen_content_tools > 0) {
+      if (aom_rb_read_bit(rb)) {
+        seq_params->force_integer_mv = 2;  // SELECT_INTEGER_MV
+      } else {
+        seq_params->force_integer_mv = aom_rb_read_bit(rb);
+      }
+    } else {
+      seq_params->force_integer_mv = 2;  // SELECT_INTEGER_MV
+    }
+    seq_params->order_hint_info.order_hint_bits_minus_1 =
+        seq_params->order_hint_info.enable_order_hint
+            ? aom_rb_read_literal(rb, 3)
+            : -1;
+  }
+
+  seq_params->enable_superres = aom_rb_read_bit(rb);
+  seq_params->enable_cdef = aom_rb_read_bit(rb);
+  seq_params->enable_restoration = aom_rb_read_bit(rb);
+}
+
+static int read_global_motion_params(WarpedMotionParams *params,
+                                     const WarpedMotionParams *ref_params,
+                                     struct aom_read_bit_buffer *rb,
+                                     int allow_hp) {
+  TransformationType type = aom_rb_read_bit(rb);
+  if (type != IDENTITY) {
+    if (aom_rb_read_bit(rb))
+      type = ROTZOOM;
+    else
+      type = aom_rb_read_bit(rb) ? TRANSLATION : AFFINE;
+  }
+
+  *params = default_warp_params;
+  params->wmtype = type;
+
+  if (type >= ROTZOOM) {
+    params->wmmat[2] = aom_rb_read_signed_primitive_refsubexpfin(
+                           rb, GM_ALPHA_MAX + 1, SUBEXPFIN_K,
+                           (ref_params->wmmat[2] >> GM_ALPHA_PREC_DIFF) -
+                               (1 << GM_ALPHA_PREC_BITS)) *
+                           GM_ALPHA_DECODE_FACTOR +
+                       (1 << WARPEDMODEL_PREC_BITS);
+    params->wmmat[3] = aom_rb_read_signed_primitive_refsubexpfin(
+                           rb, GM_ALPHA_MAX + 1, SUBEXPFIN_K,
+                           (ref_params->wmmat[3] >> GM_ALPHA_PREC_DIFF)) *
+                       GM_ALPHA_DECODE_FACTOR;
+  }
+
+  if (type >= AFFINE) {
+    params->wmmat[4] = aom_rb_read_signed_primitive_refsubexpfin(
+                           rb, GM_ALPHA_MAX + 1, SUBEXPFIN_K,
+                           (ref_params->wmmat[4] >> GM_ALPHA_PREC_DIFF)) *
+                       GM_ALPHA_DECODE_FACTOR;
+    params->wmmat[5] = aom_rb_read_signed_primitive_refsubexpfin(
+                           rb, GM_ALPHA_MAX + 1, SUBEXPFIN_K,
+                           (ref_params->wmmat[5] >> GM_ALPHA_PREC_DIFF) -
+                               (1 << GM_ALPHA_PREC_BITS)) *
+                           GM_ALPHA_DECODE_FACTOR +
+                       (1 << WARPEDMODEL_PREC_BITS);
+  } else {
+    params->wmmat[4] = -params->wmmat[3];
+    params->wmmat[5] = params->wmmat[2];
+  }
+
+  if (type >= TRANSLATION) {
+    const int trans_bits = (type == TRANSLATION)
+                               ? GM_ABS_TRANS_ONLY_BITS - !allow_hp
+                               : GM_ABS_TRANS_BITS;
+    const int trans_dec_factor =
+        (type == TRANSLATION) ? GM_TRANS_ONLY_DECODE_FACTOR * (1 << !allow_hp)
+                              : GM_TRANS_DECODE_FACTOR;
+    const int trans_prec_diff = (type == TRANSLATION)
+                                    ? GM_TRANS_ONLY_PREC_DIFF + !allow_hp
+                                    : GM_TRANS_PREC_DIFF;
+    params->wmmat[0] = aom_rb_read_signed_primitive_refsubexpfin(
+                           rb, (1 << trans_bits) + 1, SUBEXPFIN_K,
+                           (ref_params->wmmat[0] >> trans_prec_diff)) *
+                       trans_dec_factor;
+    params->wmmat[1] = aom_rb_read_signed_primitive_refsubexpfin(
+                           rb, (1 << trans_bits) + 1, SUBEXPFIN_K,
+                           (ref_params->wmmat[1] >> trans_prec_diff)) *
+                       trans_dec_factor;
+  }
+
+#if !CONFIG_REALTIME_ONLY
+  // For realtime only build, warped motion is disabled, so this section is not
+  // needed.
+  if (params->wmtype <= AFFINE) {
+    int good_shear_params = av1_get_shear_params(params);
+    if (!good_shear_params) return 0;
+  }
+#endif
+
+  return 1;
+}
+
+static AOM_INLINE void read_global_motion(AV1_COMMON *cm,
+                                          struct aom_read_bit_buffer *rb) {
+  for (int frame = LAST_FRAME; frame <= ALTREF_FRAME; ++frame) {
+    const WarpedMotionParams *ref_params =
+        cm->prev_frame ? &cm->prev_frame->global_motion[frame]
+                       : &default_warp_params;
+    int good_params =
+        read_global_motion_params(&cm->global_motion[frame], ref_params, rb,
+                                  cm->features.allow_high_precision_mv);
+    if (!good_params) {
+#if WARPED_MOTION_DEBUG
+      printf("Warning: unexpected global motion shear params from aomenc\n");
+#endif
+      cm->global_motion[frame].invalid = 1;
+    }
+
+    // TODO(sarahparker, debargha): The logic in the commented out code below
+    // does not work currently and causes mismatches when resize is on. Fix it
+    // before turning the optimization back on.
+    /*
+    YV12_BUFFER_CONFIG *ref_buf = get_ref_frame(cm, frame);
+    if (cm->width == ref_buf->y_crop_width &&
+        cm->height == ref_buf->y_crop_height) {
+      read_global_motion_params(&cm->global_motion[frame],
+                                &cm->prev_frame->global_motion[frame], rb,
+                                cm->features.allow_high_precision_mv);
+    } else {
+      cm->global_motion[frame] = default_warp_params;
+    }
+    */
+    /*
+    printf("Dec Ref %d [%d/%d]: %d %d %d %d\n",
+           frame, cm->current_frame.frame_number, cm->show_frame,
+           cm->global_motion[frame].wmmat[0],
+           cm->global_motion[frame].wmmat[1],
+           cm->global_motion[frame].wmmat[2],
+           cm->global_motion[frame].wmmat[3]);
+           */
+  }
+  memcpy(cm->cur_frame->global_motion, cm->global_motion,
+         REF_FRAMES * sizeof(WarpedMotionParams));
+}
+
+// Release the references to the frame buffers in cm->ref_frame_map and reset
+// all elements of cm->ref_frame_map to NULL.
+static AOM_INLINE void reset_ref_frame_map(AV1_COMMON *const cm) {
+  BufferPool *const pool = cm->buffer_pool;
+
+  for (int i = 0; i < REF_FRAMES; i++) {
+    decrease_ref_count(cm->ref_frame_map[i], pool);
+    cm->ref_frame_map[i] = NULL;
+  }
+}
+
+// If the refresh_frame_flags bitmask is set, update reference frame id values
+// and mark frames as valid for reference.
+static AOM_INLINE void update_ref_frame_id(AV1Decoder *const pbi) {
+  AV1_COMMON *const cm = &pbi->common;
+  int refresh_frame_flags = cm->current_frame.refresh_frame_flags;
+  for (int i = 0; i < REF_FRAMES; i++) {
+    if ((refresh_frame_flags >> i) & 1) {
+      cm->ref_frame_id[i] = cm->current_frame_id;
+      pbi->valid_for_referencing[i] = 1;
+    }
+  }
+}
+
+static AOM_INLINE void show_existing_frame_reset(AV1Decoder *const pbi,
+                                                 int existing_frame_idx) {
+  AV1_COMMON *const cm = &pbi->common;
+
+  assert(cm->show_existing_frame);
+
+  cm->current_frame.frame_type = KEY_FRAME;
+
+  cm->current_frame.refresh_frame_flags = (1 << REF_FRAMES) - 1;
+
+  for (int i = 0; i < INTER_REFS_PER_FRAME; ++i) {
+    cm->remapped_ref_idx[i] = INVALID_IDX;
+  }
+
+  if (pbi->need_resync) {
+    reset_ref_frame_map(cm);
+    pbi->need_resync = 0;
+  }
+
+  // Note that the displayed frame must be valid for referencing in order to
+  // have been selected.
+  cm->current_frame_id = cm->ref_frame_id[existing_frame_idx];
+  update_ref_frame_id(pbi);
+
+  cm->features.refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED;
+}
+
+static INLINE void reset_frame_buffers(AV1_COMMON *cm) {
+  RefCntBuffer *const frame_bufs = cm->buffer_pool->frame_bufs;
+  int i;
+
+  lock_buffer_pool(cm->buffer_pool);
+  reset_ref_frame_map(cm);
+  assert(cm->cur_frame->ref_count == 1);
+  for (i = 0; i < FRAME_BUFFERS; ++i) {
+    // Reset all unreferenced frame buffers. We can also reset cm->cur_frame
+    // because we are the sole owner of cm->cur_frame.
+    if (frame_bufs[i].ref_count > 0 && &frame_bufs[i] != cm->cur_frame) {
+      continue;
+    }
+    frame_bufs[i].order_hint = 0;
+    av1_zero(frame_bufs[i].ref_order_hints);
+  }
+  av1_zero_unused_internal_frame_buffers(&cm->buffer_pool->int_frame_buffers);
+  unlock_buffer_pool(cm->buffer_pool);
+}
+
+// On success, returns 0. On failure, calls aom_internal_error and does not
+// return.
+static int read_uncompressed_header(AV1Decoder *pbi,
+                                    struct aom_read_bit_buffer *rb) {
+  AV1_COMMON *const cm = &pbi->common;
+  const SequenceHeader *const seq_params = &cm->seq_params;
+  CurrentFrame *const current_frame = &cm->current_frame;
+  FeatureFlags *const features = &cm->features;
+  MACROBLOCKD *const xd = &pbi->dcb.xd;
+  BufferPool *const pool = cm->buffer_pool;
+  RefCntBuffer *const frame_bufs = pool->frame_bufs;
+  aom_s_frame_info *sframe_info = &pbi->sframe_info;
+  sframe_info->is_s_frame = 0;
+  sframe_info->is_s_frame_at_altref = 0;
+
+  if (!pbi->sequence_header_ready) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "No sequence header");
+  }
+
+  if (seq_params->reduced_still_picture_hdr) {
+    cm->show_existing_frame = 0;
+    cm->show_frame = 1;
+    current_frame->frame_type = KEY_FRAME;
+    if (pbi->sequence_header_changed) {
+      // This is the start of a new coded video sequence.
+      pbi->sequence_header_changed = 0;
+      pbi->decoding_first_frame = 1;
+      reset_frame_buffers(cm);
+    }
+    features->error_resilient_mode = 1;
+  } else {
+    cm->show_existing_frame = aom_rb_read_bit(rb);
+    pbi->reset_decoder_state = 0;
+
+    if (cm->show_existing_frame) {
+      if (pbi->sequence_header_changed) {
+        aom_internal_error(
+            &cm->error, AOM_CODEC_CORRUPT_FRAME,
+            "New sequence header starts with a show_existing_frame.");
+      }
+      // Show an existing frame directly.
+      const int existing_frame_idx = aom_rb_read_literal(rb, 3);
+      RefCntBuffer *const frame_to_show = cm->ref_frame_map[existing_frame_idx];
+      if (frame_to_show == NULL) {
+        aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                           "Buffer does not contain a decoded frame");
+      }
+      if (seq_params->decoder_model_info_present_flag &&
+          seq_params->timing_info.equal_picture_interval == 0) {
+        read_temporal_point_info(cm, rb);
+      }
+      if (seq_params->frame_id_numbers_present_flag) {
+        int frame_id_length = seq_params->frame_id_length;
+        int display_frame_id = aom_rb_read_literal(rb, frame_id_length);
+        /* Compare display_frame_id with ref_frame_id and check valid for
+         * referencing */
+        if (display_frame_id != cm->ref_frame_id[existing_frame_idx] ||
+            pbi->valid_for_referencing[existing_frame_idx] == 0)
+          aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                             "Reference buffer frame ID mismatch");
+      }
+      lock_buffer_pool(pool);
+      assert(frame_to_show->ref_count > 0);
+      // cm->cur_frame should be the buffer referenced by the return value
+      // of the get_free_fb() call in assign_cur_frame_new_fb() (called by
+      // av1_receive_compressed_data()), so the ref_count should be 1.
+      assert(cm->cur_frame->ref_count == 1);
+      // assign_frame_buffer_p() decrements ref_count directly rather than
+      // call decrease_ref_count(). If cm->cur_frame->raw_frame_buffer has
+      // already been allocated, it will not be released by
+      // assign_frame_buffer_p()!
+      assert(!cm->cur_frame->raw_frame_buffer.data);
+      assign_frame_buffer_p(&cm->cur_frame, frame_to_show);
+      pbi->reset_decoder_state = frame_to_show->frame_type == KEY_FRAME;
+      unlock_buffer_pool(pool);
+
+      cm->lf.filter_level[0] = 0;
+      cm->lf.filter_level[1] = 0;
+      cm->show_frame = 1;
+
+      // Section 6.8.2: It is a requirement of bitstream conformance that when
+      // show_existing_frame is used to show a previous frame, that the value
+      // of showable_frame for the previous frame was equal to 1.
+      if (!frame_to_show->showable_frame) {
+        aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                           "Buffer does not contain a showable frame");
+      }
+      // Section 6.8.2: It is a requirement of bitstream conformance that when
+      // show_existing_frame is used to show a previous frame with
+      // RefFrameType[ frame_to_show_map_idx ] equal to KEY_FRAME, that the
+      // frame is output via the show_existing_frame mechanism at most once.
+      if (pbi->reset_decoder_state) frame_to_show->showable_frame = 0;
+
+      cm->film_grain_params = frame_to_show->film_grain_params;
+
+      if (pbi->reset_decoder_state) {
+        show_existing_frame_reset(pbi, existing_frame_idx);
+      } else {
+        current_frame->refresh_frame_flags = 0;
+      }
+
+      return 0;
+    }
+
+    current_frame->frame_type = (FRAME_TYPE)aom_rb_read_literal(rb, 2);
+    if (pbi->sequence_header_changed) {
+      if (current_frame->frame_type == KEY_FRAME) {
+        // This is the start of a new coded video sequence.
+        pbi->sequence_header_changed = 0;
+        pbi->decoding_first_frame = 1;
+        reset_frame_buffers(cm);
+      } else {
+        aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                           "Sequence header has changed without a keyframe.");
+      }
+    }
+
+    cm->show_frame = aom_rb_read_bit(rb);
+    if (cm->show_frame == 0) pbi->is_arf_frame_present = 1;
+    if (cm->show_frame == 0 && cm->current_frame.frame_type == KEY_FRAME)
+      pbi->is_fwd_kf_present = 1;
+    if (cm->current_frame.frame_type == S_FRAME) {
+      sframe_info->is_s_frame = 1;
+      sframe_info->is_s_frame_at_altref = cm->show_frame ? 0 : 1;
+    }
+    if (seq_params->still_picture &&
+        (current_frame->frame_type != KEY_FRAME || !cm->show_frame)) {
+      aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                         "Still pictures must be coded as shown keyframes");
+    }
+    cm->showable_frame = current_frame->frame_type != KEY_FRAME;
+    if (cm->show_frame) {
+      if (seq_params->decoder_model_info_present_flag &&
+          seq_params->timing_info.equal_picture_interval == 0)
+        read_temporal_point_info(cm, rb);
+    } else {
+      // See if this frame can be used as show_existing_frame in future
+      cm->showable_frame = aom_rb_read_bit(rb);
+    }
+    cm->cur_frame->showable_frame = cm->showable_frame;
+    features->error_resilient_mode =
+        frame_is_sframe(cm) ||
+                (current_frame->frame_type == KEY_FRAME && cm->show_frame)
+            ? 1
+            : aom_rb_read_bit(rb);
+  }
+
+  if (current_frame->frame_type == KEY_FRAME && cm->show_frame) {
+    /* All frames need to be marked as not valid for referencing */
+    for (int i = 0; i < REF_FRAMES; i++) {
+      pbi->valid_for_referencing[i] = 0;
+    }
+  }
+  features->disable_cdf_update = aom_rb_read_bit(rb);
+  if (seq_params->force_screen_content_tools == 2) {
+    features->allow_screen_content_tools = aom_rb_read_bit(rb);
+  } else {
+    features->allow_screen_content_tools =
+        seq_params->force_screen_content_tools;
+  }
+
+  if (features->allow_screen_content_tools) {
+    if (seq_params->force_integer_mv == 2) {
+      features->cur_frame_force_integer_mv = aom_rb_read_bit(rb);
+    } else {
+      features->cur_frame_force_integer_mv = seq_params->force_integer_mv;
+    }
+  } else {
+    features->cur_frame_force_integer_mv = 0;
+  }
+
+  int frame_size_override_flag = 0;
+  features->allow_intrabc = 0;
+  features->primary_ref_frame = PRIMARY_REF_NONE;
+
+  if (!seq_params->reduced_still_picture_hdr) {
+    if (seq_params->frame_id_numbers_present_flag) {
+      int frame_id_length = seq_params->frame_id_length;
+      int diff_len = seq_params->delta_frame_id_length;
+      int prev_frame_id = 0;
+      int have_prev_frame_id =
+          !pbi->decoding_first_frame &&
+          !(current_frame->frame_type == KEY_FRAME && cm->show_frame);
+      if (have_prev_frame_id) {
+        prev_frame_id = cm->current_frame_id;
+      }
+      cm->current_frame_id = aom_rb_read_literal(rb, frame_id_length);
+
+      if (have_prev_frame_id) {
+        int diff_frame_id;
+        if (cm->current_frame_id > prev_frame_id) {
+          diff_frame_id = cm->current_frame_id - prev_frame_id;
+        } else {
+          diff_frame_id =
+              (1 << frame_id_length) + cm->current_frame_id - prev_frame_id;
+        }
+        /* Check current_frame_id for conformance */
+        if (prev_frame_id == cm->current_frame_id ||
+            diff_frame_id >= (1 << (frame_id_length - 1))) {
+          aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                             "Invalid value of current_frame_id");
+        }
+      }
+      /* Check if some frames need to be marked as not valid for referencing */
+      for (int i = 0; i < REF_FRAMES; i++) {
+        if (cm->current_frame_id - (1 << diff_len) > 0) {
+          if (cm->ref_frame_id[i] > cm->current_frame_id ||
+              cm->ref_frame_id[i] < cm->current_frame_id - (1 << diff_len))
+            pbi->valid_for_referencing[i] = 0;
+        } else {
+          if (cm->ref_frame_id[i] > cm->current_frame_id &&
+              cm->ref_frame_id[i] < (1 << frame_id_length) +
+                                        cm->current_frame_id - (1 << diff_len))
+            pbi->valid_for_referencing[i] = 0;
+        }
+      }
+    }
+
+    frame_size_override_flag = frame_is_sframe(cm) ? 1 : aom_rb_read_bit(rb);
+
+    current_frame->order_hint = aom_rb_read_literal(
+        rb, seq_params->order_hint_info.order_hint_bits_minus_1 + 1);
+    current_frame->frame_number = current_frame->order_hint;
+
+    if (!features->error_resilient_mode && !frame_is_intra_only(cm)) {
+      features->primary_ref_frame = aom_rb_read_literal(rb, PRIMARY_REF_BITS);
+    }
+  }
+
+  if (seq_params->decoder_model_info_present_flag) {
+    cm->buffer_removal_time_present = aom_rb_read_bit(rb);
+    if (cm->buffer_removal_time_present) {
+      for (int op_num = 0;
+           op_num < seq_params->operating_points_cnt_minus_1 + 1; op_num++) {
+        if (seq_params->op_params[op_num].decoder_model_param_present_flag) {
+          if ((((seq_params->operating_point_idc[op_num] >>
+                 cm->temporal_layer_id) &
+                0x1) &&
+               ((seq_params->operating_point_idc[op_num] >>
+                 (cm->spatial_layer_id + 8)) &
+                0x1)) ||
+              seq_params->operating_point_idc[op_num] == 0) {
+            cm->buffer_removal_times[op_num] = aom_rb_read_unsigned_literal(
+                rb, seq_params->decoder_model_info.buffer_removal_time_length);
+          } else {
+            cm->buffer_removal_times[op_num] = 0;
+          }
+        } else {
+          cm->buffer_removal_times[op_num] = 0;
+        }
+      }
+    }
+  }
+  if (current_frame->frame_type == KEY_FRAME) {
+    if (!cm->show_frame) {  // unshown keyframe (forward keyframe)
+      current_frame->refresh_frame_flags = aom_rb_read_literal(rb, REF_FRAMES);
+    } else {  // shown keyframe
+      current_frame->refresh_frame_flags = (1 << REF_FRAMES) - 1;
+    }
+
+    for (int i = 0; i < INTER_REFS_PER_FRAME; ++i) {
+      cm->remapped_ref_idx[i] = INVALID_IDX;
+    }
+    if (pbi->need_resync) {
+      reset_ref_frame_map(cm);
+      pbi->need_resync = 0;
+    }
+  } else {
+    if (current_frame->frame_type == INTRA_ONLY_FRAME) {
+      current_frame->refresh_frame_flags = aom_rb_read_literal(rb, REF_FRAMES);
+      if (current_frame->refresh_frame_flags == 0xFF) {
+        aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                           "Intra only frames cannot have refresh flags 0xFF");
+      }
+      if (pbi->need_resync) {
+        reset_ref_frame_map(cm);
+        pbi->need_resync = 0;
+      }
+    } else if (pbi->need_resync != 1) { /* Skip if need resync */
+      current_frame->refresh_frame_flags =
+          frame_is_sframe(cm) ? 0xFF : aom_rb_read_literal(rb, REF_FRAMES);
+    }
+  }
+
+  if (!frame_is_intra_only(cm) || current_frame->refresh_frame_flags != 0xFF) {
+    // Read all ref frame order hints if error_resilient_mode == 1
+    if (features->error_resilient_mode &&
+        seq_params->order_hint_info.enable_order_hint) {
+      for (int ref_idx = 0; ref_idx < REF_FRAMES; ref_idx++) {
+        // Read order hint from bit stream
+        unsigned int order_hint = aom_rb_read_literal(
+            rb, seq_params->order_hint_info.order_hint_bits_minus_1 + 1);
+        // Get buffer
+        RefCntBuffer *buf = cm->ref_frame_map[ref_idx];
+        if (buf == NULL || order_hint != buf->order_hint) {
+          if (buf != NULL) {
+            lock_buffer_pool(pool);
+            decrease_ref_count(buf, pool);
+            unlock_buffer_pool(pool);
+            cm->ref_frame_map[ref_idx] = NULL;
+          }
+          // If no corresponding buffer exists, allocate a new buffer with all
+          // pixels set to neutral grey.
+          int buf_idx = get_free_fb(cm);
+          if (buf_idx == INVALID_IDX) {
+            aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                               "Unable to find free frame buffer");
+          }
+          buf = &frame_bufs[buf_idx];
+          lock_buffer_pool(pool);
+          if (aom_realloc_frame_buffer(
+                  &buf->buf, seq_params->max_frame_width,
+                  seq_params->max_frame_height, seq_params->subsampling_x,
+                  seq_params->subsampling_y, seq_params->use_highbitdepth,
+                  AOM_BORDER_IN_PIXELS, features->byte_alignment,
+                  &buf->raw_frame_buffer, pool->get_fb_cb, pool->cb_priv)) {
+            decrease_ref_count(buf, pool);
+            unlock_buffer_pool(pool);
+            aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                               "Failed to allocate frame buffer");
+          }
+          unlock_buffer_pool(pool);
+          // According to the specification, valid bitstreams are required to
+          // never use missing reference frames so the filling process for
+          // missing frames is not normatively defined and RefValid for missing
+          // frames is set to 0.
+
+          // To make libaom more robust when the bitstream has been corrupted
+          // by the loss of some frames of data, this code adds a neutral grey
+          // buffer in place of missing frames, i.e.
+          //
+          set_planes_to_neutral_grey(seq_params, &buf->buf, 0);
+          //
+          // and allows the frames to be used for referencing, i.e.
+          //
+          pbi->valid_for_referencing[ref_idx] = 1;
+          //
+          // Please note such behavior is not normative and other decoders may
+          // use a different approach.
+          cm->ref_frame_map[ref_idx] = buf;
+          buf->order_hint = order_hint;
+        }
+      }
+    }
+  }
+
+  if (current_frame->frame_type == KEY_FRAME) {
+    setup_frame_size(cm, frame_size_override_flag, rb);
+
+    if (features->allow_screen_content_tools && !av1_superres_scaled(cm))
+      features->allow_intrabc = aom_rb_read_bit(rb);
+    features->allow_ref_frame_mvs = 0;
+    cm->prev_frame = NULL;
+  } else {
+    features->allow_ref_frame_mvs = 0;
+
+    if (current_frame->frame_type == INTRA_ONLY_FRAME) {
+      cm->cur_frame->film_grain_params_present =
+          seq_params->film_grain_params_present;
+      setup_frame_size(cm, frame_size_override_flag, rb);
+      if (features->allow_screen_content_tools && !av1_superres_scaled(cm))
+        features->allow_intrabc = aom_rb_read_bit(rb);
+
+    } else if (pbi->need_resync != 1) { /* Skip if need resync */
+      int frame_refs_short_signaling = 0;
+      // Frame refs short signaling is off when error resilient mode is on.
+      if (seq_params->order_hint_info.enable_order_hint)
+        frame_refs_short_signaling = aom_rb_read_bit(rb);
+
+      if (frame_refs_short_signaling) {
+        // == LAST_FRAME ==
+        const int lst_ref = aom_rb_read_literal(rb, REF_FRAMES_LOG2);
+        const RefCntBuffer *const lst_buf = cm->ref_frame_map[lst_ref];
+
+        // == GOLDEN_FRAME ==
+        const int gld_ref = aom_rb_read_literal(rb, REF_FRAMES_LOG2);
+        const RefCntBuffer *const gld_buf = cm->ref_frame_map[gld_ref];
+
+        // Most of the time, streams start with a keyframe. In that case,
+        // ref_frame_map will have been filled in at that point and will not
+        // contain any NULLs. However, streams are explicitly allowed to start
+        // with an intra-only frame, so long as they don't then signal a
+        // reference to a slot that hasn't been set yet. That's what we are
+        // checking here.
+        if (lst_buf == NULL)
+          aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                             "Inter frame requests nonexistent reference");
+        if (gld_buf == NULL)
+          aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                             "Inter frame requests nonexistent reference");
+
+        av1_set_frame_refs(cm, cm->remapped_ref_idx, lst_ref, gld_ref);
+      }
+
+      for (int i = 0; i < INTER_REFS_PER_FRAME; ++i) {
+        int ref = 0;
+        if (!frame_refs_short_signaling) {
+          ref = aom_rb_read_literal(rb, REF_FRAMES_LOG2);
+
+          // Most of the time, streams start with a keyframe. In that case,
+          // ref_frame_map will have been filled in at that point and will not
+          // contain any NULLs. However, streams are explicitly allowed to start
+          // with an intra-only frame, so long as they don't then signal a
+          // reference to a slot that hasn't been set yet. That's what we are
+          // checking here.
+          if (cm->ref_frame_map[ref] == NULL)
+            aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                               "Inter frame requests nonexistent reference");
+          cm->remapped_ref_idx[i] = ref;
+        } else {
+          ref = cm->remapped_ref_idx[i];
+        }
+        // Check valid for referencing
+        if (pbi->valid_for_referencing[ref] == 0)
+          aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                             "Reference frame not valid for referencing");
+
+        cm->ref_frame_sign_bias[LAST_FRAME + i] = 0;
+
+        if (seq_params->frame_id_numbers_present_flag) {
+          int frame_id_length = seq_params->frame_id_length;
+          int diff_len = seq_params->delta_frame_id_length;
+          int delta_frame_id_minus_1 = aom_rb_read_literal(rb, diff_len);
+          int ref_frame_id =
+              ((cm->current_frame_id - (delta_frame_id_minus_1 + 1) +
+                (1 << frame_id_length)) %
+               (1 << frame_id_length));
+          // Compare values derived from delta_frame_id_minus_1 and
+          // refresh_frame_flags.
+          if (ref_frame_id != cm->ref_frame_id[ref])
+            aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                               "Reference buffer frame ID mismatch");
+        }
+      }
+
+      if (!features->error_resilient_mode && frame_size_override_flag) {
+        setup_frame_size_with_refs(cm, rb);
+      } else {
+        setup_frame_size(cm, frame_size_override_flag, rb);
+      }
+
+      if (features->cur_frame_force_integer_mv) {
+        features->allow_high_precision_mv = 0;
+      } else {
+        features->allow_high_precision_mv = aom_rb_read_bit(rb);
+      }
+      features->interp_filter = read_frame_interp_filter(rb);
+      features->switchable_motion_mode = aom_rb_read_bit(rb);
+    }
+
+    cm->prev_frame = get_primary_ref_frame_buf(cm);
+    if (features->primary_ref_frame != PRIMARY_REF_NONE &&
+        get_primary_ref_frame_buf(cm) == NULL) {
+      aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                         "Reference frame containing this frame's initial "
+                         "frame context is unavailable.");
+    }
+
+    if (!(current_frame->frame_type == INTRA_ONLY_FRAME) &&
+        pbi->need_resync != 1) {
+      if (frame_might_allow_ref_frame_mvs(cm))
+        features->allow_ref_frame_mvs = aom_rb_read_bit(rb);
+      else
+        features->allow_ref_frame_mvs = 0;
+
+      for (int i = LAST_FRAME; i <= ALTREF_FRAME; ++i) {
+        const RefCntBuffer *const ref_buf = get_ref_frame_buf(cm, i);
+        struct scale_factors *const ref_scale_factors =
+            get_ref_scale_factors(cm, i);
+        av1_setup_scale_factors_for_frame(
+            ref_scale_factors, ref_buf->buf.y_crop_width,
+            ref_buf->buf.y_crop_height, cm->width, cm->height);
+        if ((!av1_is_valid_scale(ref_scale_factors)))
+          aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                             "Reference frame has invalid dimensions");
+      }
+    }
+  }
+
+  av1_setup_frame_buf_refs(cm);
+
+  av1_setup_frame_sign_bias(cm);
+
+  cm->cur_frame->frame_type = current_frame->frame_type;
+
+  update_ref_frame_id(pbi);
+
+  const int might_bwd_adapt = !(seq_params->reduced_still_picture_hdr) &&
+                              !(features->disable_cdf_update);
+  if (might_bwd_adapt) {
+    features->refresh_frame_context = aom_rb_read_bit(rb)
+                                          ? REFRESH_FRAME_CONTEXT_DISABLED
+                                          : REFRESH_FRAME_CONTEXT_BACKWARD;
+  } else {
+    features->refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED;
+  }
+
+  cm->cur_frame->buf.bit_depth = seq_params->bit_depth;
+  cm->cur_frame->buf.color_primaries = seq_params->color_primaries;
+  cm->cur_frame->buf.transfer_characteristics =
+      seq_params->transfer_characteristics;
+  cm->cur_frame->buf.matrix_coefficients = seq_params->matrix_coefficients;
+  cm->cur_frame->buf.monochrome = seq_params->monochrome;
+  cm->cur_frame->buf.chroma_sample_position =
+      seq_params->chroma_sample_position;
+  cm->cur_frame->buf.color_range = seq_params->color_range;
+  cm->cur_frame->buf.render_width = cm->render_width;
+  cm->cur_frame->buf.render_height = cm->render_height;
+
+  if (pbi->need_resync) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Keyframe / intra-only frame required to reset decoder"
+                       " state");
+  }
+
+  if (features->allow_intrabc) {
+    // Set parameters corresponding to no filtering.
+    struct loopfilter *lf = &cm->lf;
+    lf->filter_level[0] = 0;
+    lf->filter_level[1] = 0;
+    cm->cdef_info.cdef_bits = 0;
+    cm->cdef_info.cdef_strengths[0] = 0;
+    cm->cdef_info.nb_cdef_strengths = 1;
+    cm->cdef_info.cdef_uv_strengths[0] = 0;
+    cm->rst_info[0].frame_restoration_type = RESTORE_NONE;
+    cm->rst_info[1].frame_restoration_type = RESTORE_NONE;
+    cm->rst_info[2].frame_restoration_type = RESTORE_NONE;
+  }
+
+  read_tile_info(pbi, rb);
+  if (!av1_is_min_tile_width_satisfied(cm)) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Minimum tile width requirement not satisfied");
+  }
+
+  CommonQuantParams *const quant_params = &cm->quant_params;
+  setup_quantization(quant_params, av1_num_planes(cm),
+                     cm->seq_params.separate_uv_delta_q, rb);
+  xd->bd = (int)seq_params->bit_depth;
+
+  CommonContexts *const above_contexts = &cm->above_contexts;
+  if (above_contexts->num_planes < av1_num_planes(cm) ||
+      above_contexts->num_mi_cols < cm->mi_params.mi_cols ||
+      above_contexts->num_tile_rows < cm->tiles.rows) {
+    av1_free_above_context_buffers(above_contexts);
+    if (av1_alloc_above_context_buffers(above_contexts, cm->tiles.rows,
+                                        cm->mi_params.mi_cols,
+                                        av1_num_planes(cm))) {
+      aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                         "Failed to allocate context buffers");
+    }
+  }
+
+  if (features->primary_ref_frame == PRIMARY_REF_NONE) {
+    av1_setup_past_independence(cm);
+  }
+
+  setup_segmentation(cm, rb);
+
+  cm->delta_q_info.delta_q_res = 1;
+  cm->delta_q_info.delta_lf_res = 1;
+  cm->delta_q_info.delta_lf_present_flag = 0;
+  cm->delta_q_info.delta_lf_multi = 0;
+  cm->delta_q_info.delta_q_present_flag =
+      quant_params->base_qindex > 0 ? aom_rb_read_bit(rb) : 0;
+  if (cm->delta_q_info.delta_q_present_flag) {
+    xd->current_base_qindex = quant_params->base_qindex;
+    cm->delta_q_info.delta_q_res = 1 << aom_rb_read_literal(rb, 2);
+    if (!features->allow_intrabc)
+      cm->delta_q_info.delta_lf_present_flag = aom_rb_read_bit(rb);
+    if (cm->delta_q_info.delta_lf_present_flag) {
+      cm->delta_q_info.delta_lf_res = 1 << aom_rb_read_literal(rb, 2);
+      cm->delta_q_info.delta_lf_multi = aom_rb_read_bit(rb);
+      av1_reset_loop_filter_delta(xd, av1_num_planes(cm));
+    }
+  }
+
+  xd->cur_frame_force_integer_mv = features->cur_frame_force_integer_mv;
+
+  for (int i = 0; i < MAX_SEGMENTS; ++i) {
+    const int qindex = av1_get_qindex(&cm->seg, i, quant_params->base_qindex);
+    xd->lossless[i] =
+        qindex == 0 && quant_params->y_dc_delta_q == 0 &&
+        quant_params->u_dc_delta_q == 0 && quant_params->u_ac_delta_q == 0 &&
+        quant_params->v_dc_delta_q == 0 && quant_params->v_ac_delta_q == 0;
+    xd->qindex[i] = qindex;
+  }
+  features->coded_lossless = is_coded_lossless(cm, xd);
+  features->all_lossless = features->coded_lossless && !av1_superres_scaled(cm);
+  setup_segmentation_dequant(cm, xd);
+  if (features->coded_lossless) {
+    cm->lf.filter_level[0] = 0;
+    cm->lf.filter_level[1] = 0;
+  }
+  if (features->coded_lossless || !seq_params->enable_cdef) {
+    cm->cdef_info.cdef_bits = 0;
+    cm->cdef_info.cdef_strengths[0] = 0;
+    cm->cdef_info.cdef_uv_strengths[0] = 0;
+  }
+  if (features->all_lossless || !seq_params->enable_restoration) {
+    cm->rst_info[0].frame_restoration_type = RESTORE_NONE;
+    cm->rst_info[1].frame_restoration_type = RESTORE_NONE;
+    cm->rst_info[2].frame_restoration_type = RESTORE_NONE;
+  }
+  setup_loopfilter(cm, rb);
+
+  if (!features->coded_lossless && seq_params->enable_cdef) {
+    setup_cdef(cm, rb);
+  }
+  if (!features->all_lossless && seq_params->enable_restoration) {
+    decode_restoration_mode(cm, rb);
+  }
+
+  features->tx_mode = read_tx_mode(rb, features->coded_lossless);
+  current_frame->reference_mode = read_frame_reference_mode(cm, rb);
+
+  av1_setup_skip_mode_allowed(cm);
+  current_frame->skip_mode_info.skip_mode_flag =
+      current_frame->skip_mode_info.skip_mode_allowed ? aom_rb_read_bit(rb) : 0;
+
+  if (frame_might_allow_warped_motion(cm))
+    features->allow_warped_motion = aom_rb_read_bit(rb);
+  else
+    features->allow_warped_motion = 0;
+
+  features->reduced_tx_set_used = aom_rb_read_bit(rb);
+
+  if (features->allow_ref_frame_mvs && !frame_might_allow_ref_frame_mvs(cm)) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Frame wrongly requests reference frame MVs");
+  }
+
+  if (!frame_is_intra_only(cm)) read_global_motion(cm, rb);
+
+  cm->cur_frame->film_grain_params_present =
+      seq_params->film_grain_params_present;
+  read_film_grain(cm, rb);
+
+#if EXT_TILE_DEBUG
+  if (pbi->ext_tile_debug && cm->tiles.large_scale) {
+    read_ext_tile_info(pbi, rb);
+    av1_set_single_tile_decoding_mode(cm);
+  }
+#endif  // EXT_TILE_DEBUG
+  return 0;
+}
+
+struct aom_read_bit_buffer *av1_init_read_bit_buffer(
+    AV1Decoder *pbi, struct aom_read_bit_buffer *rb, const uint8_t *data,
+    const uint8_t *data_end) {
+  rb->bit_offset = 0;
+  rb->error_handler = error_handler;
+  rb->error_handler_data = &pbi->common;
+  rb->bit_buffer = data;
+  rb->bit_buffer_end = data_end;
+  return rb;
+}
+
+void av1_read_frame_size(struct aom_read_bit_buffer *rb, int num_bits_width,
+                         int num_bits_height, int *width, int *height) {
+  *width = aom_rb_read_literal(rb, num_bits_width) + 1;
+  *height = aom_rb_read_literal(rb, num_bits_height) + 1;
+}
+
+BITSTREAM_PROFILE av1_read_profile(struct aom_read_bit_buffer *rb) {
+  int profile = aom_rb_read_literal(rb, PROFILE_BITS);
+  return (BITSTREAM_PROFILE)profile;
+}
+
+#if !CONFIG_REALTIME_ONLY
+static AOM_INLINE void superres_post_decode(AV1Decoder *pbi) {
+  AV1_COMMON *const cm = &pbi->common;
+  BufferPool *const pool = cm->buffer_pool;
+
+  if (!av1_superres_scaled(cm)) return;
+  assert(!cm->features.all_lossless);
+
+  av1_superres_upscale(cm, pool);
+}
+#endif
+
+uint32_t av1_decode_frame_headers_and_setup(AV1Decoder *pbi,
+                                            struct aom_read_bit_buffer *rb,
+                                            int trailing_bits_present) {
+  AV1_COMMON *const cm = &pbi->common;
+  const int num_planes = av1_num_planes(cm);
+  MACROBLOCKD *const xd = &pbi->dcb.xd;
+
+#if CONFIG_BITSTREAM_DEBUG
+  aom_bitstream_queue_set_frame_read(cm->current_frame.order_hint * 2 +
+                                     cm->show_frame);
+#endif
+#if CONFIG_MISMATCH_DEBUG
+  mismatch_move_frame_idx_r();
+#endif
+
+  for (int i = LAST_FRAME; i <= ALTREF_FRAME; ++i) {
+    cm->global_motion[i] = default_warp_params;
+    cm->cur_frame->global_motion[i] = default_warp_params;
+  }
+  xd->global_motion = cm->global_motion;
+
+  read_uncompressed_header(pbi, rb);
+
+  if (trailing_bits_present) av1_check_trailing_bits(pbi, rb);
+
+  if (!cm->tiles.single_tile_decoding &&
+      (pbi->dec_tile_row >= 0 || pbi->dec_tile_col >= 0)) {
+    pbi->dec_tile_row = -1;
+    pbi->dec_tile_col = -1;
+  }
+
+  const uint32_t uncomp_hdr_size =
+      (uint32_t)aom_rb_bytes_read(rb);  // Size of the uncompressed header
+  YV12_BUFFER_CONFIG *new_fb = &cm->cur_frame->buf;
+  xd->cur_buf = new_fb;
+  if (av1_allow_intrabc(cm)) {
+    av1_setup_scale_factors_for_frame(
+        &cm->sf_identity, xd->cur_buf->y_crop_width, xd->cur_buf->y_crop_height,
+        xd->cur_buf->y_crop_width, xd->cur_buf->y_crop_height);
+  }
+
+  // Showing a frame directly.
+  if (cm->show_existing_frame) {
+    if (pbi->reset_decoder_state) {
+      // Use the default frame context values.
+      *cm->fc = *cm->default_frame_context;
+      if (!cm->fc->initialized)
+        aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                           "Uninitialized entropy context.");
+    }
+    return uncomp_hdr_size;
+  }
+
+  cm->mi_params.setup_mi(&cm->mi_params);
+
+  av1_setup_motion_field(cm);
+
+  av1_setup_block_planes(xd, cm->seq_params.subsampling_x,
+                         cm->seq_params.subsampling_y, num_planes);
+  if (cm->features.primary_ref_frame == PRIMARY_REF_NONE) {
+    // use the default frame context values
+    *cm->fc = *cm->default_frame_context;
+  } else {
+    *cm->fc = get_primary_ref_frame_buf(cm)->frame_context;
+  }
+  if (!cm->fc->initialized)
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Uninitialized entropy context.");
+
+  pbi->dcb.corrupted = 0;
+  return uncomp_hdr_size;
+}
+
+// Once-per-frame initialization
+static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {
+  AV1_COMMON *const cm = &pbi->common;
+
+#if !CONFIG_REALTIME_ONLY
+  if (cm->rst_info[0].frame_restoration_type != RESTORE_NONE ||
+      cm->rst_info[1].frame_restoration_type != RESTORE_NONE ||
+      cm->rst_info[2].frame_restoration_type != RESTORE_NONE) {
+    av1_alloc_restoration_buffers(cm);
+  }
+#endif
+  const int use_highbd = cm->seq_params.use_highbitdepth;
+  const int buf_size = MC_TEMP_BUF_PELS << use_highbd;
+  if (pbi->td.mc_buf_size != buf_size) {
+    av1_free_mc_tmp_buf(&pbi->td);
+    allocate_mc_tmp_buf(cm, &pbi->td, buf_size, use_highbd);
+  }
+}
+
+void av1_decode_tg_tiles_and_wrapup(AV1Decoder *pbi, const uint8_t *data,
+                                    const uint8_t *data_end,
+                                    const uint8_t **p_data_end, int start_tile,
+                                    int end_tile, int initialize_flag) {
+  AV1_COMMON *const cm = &pbi->common;
+  CommonTileParams *const tiles = &cm->tiles;
+  MACROBLOCKD *const xd = &pbi->dcb.xd;
+  const int tile_count_tg = end_tile - start_tile + 1;
+
+  if (initialize_flag) setup_frame_info(pbi);
+  const int num_planes = av1_num_planes(cm);
+#if CONFIG_LPF_MASK
+  av1_loop_filter_frame_init(cm, 0, num_planes);
+#endif
+
+  if (pbi->max_threads > 1 && !(tiles->large_scale && !pbi->ext_tile_debug) &&
+      pbi->row_mt)
+    *p_data_end =
+        decode_tiles_row_mt(pbi, data, data_end, start_tile, end_tile);
+  else if (pbi->max_threads > 1 && tile_count_tg > 1 &&
+           !(tiles->large_scale && !pbi->ext_tile_debug))
+    *p_data_end = decode_tiles_mt(pbi, data, data_end, start_tile, end_tile);
+  else
+    *p_data_end = decode_tiles(pbi, data, data_end, start_tile, end_tile);
+
+  // If the bit stream is monochrome, set the U and V buffers to a constant.
+  if (num_planes < 3) {
+    set_planes_to_neutral_grey(&cm->seq_params, xd->cur_buf, 1);
+  }
+
+  if (end_tile != tiles->rows * tiles->cols - 1) {
+    return;
+  }
+
+  if (!cm->features.allow_intrabc && !tiles->single_tile_decoding) {
+    if (cm->lf.filter_level[0] || cm->lf.filter_level[1]) {
+      if (pbi->num_workers > 1) {
+        av1_loop_filter_frame_mt(
+            &cm->cur_frame->buf, cm, &pbi->dcb.xd, 0, num_planes, 0,
+#if CONFIG_LPF_MASK
+            1,
+#endif
+            pbi->tile_workers, pbi->num_workers, &pbi->lf_row_sync);
+      } else {
+        av1_loop_filter_frame(&cm->cur_frame->buf, cm, &pbi->dcb.xd,
+#if CONFIG_LPF_MASK
+                              1,
+#endif
+                              0, num_planes, 0);
+      }
+    }
+
+    const int do_cdef =
+        !pbi->skip_loop_filter && !cm->features.coded_lossless &&
+        (cm->cdef_info.cdef_bits || cm->cdef_info.cdef_strengths[0] ||
+         cm->cdef_info.cdef_uv_strengths[0]);
+    const int do_superres = av1_superres_scaled(cm);
+    const int optimized_loop_restoration = !do_cdef && !do_superres;
+
+#if !CONFIG_REALTIME_ONLY
+    const int do_loop_restoration =
+        cm->rst_info[0].frame_restoration_type != RESTORE_NONE ||
+        cm->rst_info[1].frame_restoration_type != RESTORE_NONE ||
+        cm->rst_info[2].frame_restoration_type != RESTORE_NONE;
+    if (!optimized_loop_restoration) {
+      if (do_loop_restoration)
+        av1_loop_restoration_save_boundary_lines(&pbi->common.cur_frame->buf,
+                                                 cm, 0);
+
+      if (do_cdef) {
+        av1_cdef_frame(&pbi->common.cur_frame->buf, cm, &pbi->dcb.xd);
+      }
+
+      superres_post_decode(pbi);
+
+      if (do_loop_restoration) {
+        av1_loop_restoration_save_boundary_lines(&pbi->common.cur_frame->buf,
+                                                 cm, 1);
+        if (pbi->num_workers > 1) {
+          av1_loop_restoration_filter_frame_mt(
+              (YV12_BUFFER_CONFIG *)xd->cur_buf, cm, optimized_loop_restoration,
+              pbi->tile_workers, pbi->num_workers, &pbi->lr_row_sync,
+              &pbi->lr_ctxt);
+        } else {
+          av1_loop_restoration_filter_frame((YV12_BUFFER_CONFIG *)xd->cur_buf,
+                                            cm, optimized_loop_restoration,
+                                            &pbi->lr_ctxt);
+        }
+      }
+    } else {
+      // In no cdef and no superres case. Provide an optimized version of
+      // loop_restoration_filter.
+      if (do_loop_restoration) {
+        if (pbi->num_workers > 1) {
+          av1_loop_restoration_filter_frame_mt(
+              (YV12_BUFFER_CONFIG *)xd->cur_buf, cm, optimized_loop_restoration,
+              pbi->tile_workers, pbi->num_workers, &pbi->lr_row_sync,
+              &pbi->lr_ctxt);
+        } else {
+          av1_loop_restoration_filter_frame((YV12_BUFFER_CONFIG *)xd->cur_buf,
+                                            cm, optimized_loop_restoration,
+                                            &pbi->lr_ctxt);
+        }
+      }
+    }
+#else
+    if (!optimized_loop_restoration) {
+      if (do_cdef) {
+        av1_cdef_frame(&pbi->common.cur_frame->buf, cm, &pbi->dcb.xd);
+      }
+    }
+#endif  // !CONFIG_REALTIME_ONLY
+  }
+#if CONFIG_LPF_MASK
+  av1_zero_array(cm->lf.lfm, cm->lf.lfm_num);
+#endif
+
+  if (!pbi->dcb.corrupted) {
+    if (cm->features.refresh_frame_context == REFRESH_FRAME_CONTEXT_BACKWARD) {
+      assert(pbi->context_update_tile_id < pbi->allocated_tiles);
+      *cm->fc = pbi->tile_data[pbi->context_update_tile_id].tctx;
+      av1_reset_cdf_symbol_counters(cm->fc);
+    }
+  } else {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Decode failed. Frame data is corrupted.");
+  }
+
+#if CONFIG_INSPECTION
+  if (pbi->inspect_cb != NULL) {
+    (*pbi->inspect_cb)(pbi, pbi->inspect_ctx);
+  }
+#endif
+
+  // Non frame parallel update frame context here.
+  if (!tiles->large_scale) {
+    cm->cur_frame->frame_context = *cm->fc;
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.h b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.h
new file mode 100644
index 0000000000..46ae475ff5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_DECODER_DECODEFRAME_H_
+#define AOM_AV1_DECODER_DECODEFRAME_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct AV1Decoder;
+struct aom_read_bit_buffer;
+struct ThreadData;
+
+// Reads the middle part of the sequence header OBU (from
+// frame_width_bits_minus_1 to enable_restoration) into seq_params.
+// Reports errors by calling rb->error_handler() or aom_internal_error().
+void av1_read_sequence_header(AV1_COMMON *cm, struct aom_read_bit_buffer *rb,
+                              SequenceHeader *seq_params);
+
+void av1_read_frame_size(struct aom_read_bit_buffer *rb, int num_bits_width,
+                         int num_bits_height, int *width, int *height);
+BITSTREAM_PROFILE av1_read_profile(struct aom_read_bit_buffer *rb);
+
+// Returns 0 on success. Sets pbi->common.error.error_code and returns -1 on
+// failure.
+int av1_check_trailing_bits(struct AV1Decoder *pbi,
+                            struct aom_read_bit_buffer *rb);
+
+// On success, returns the frame header size. On failure, calls
+// aom_internal_error and does not return.
+uint32_t av1_decode_frame_headers_and_setup(struct AV1Decoder *pbi,
+                                            struct aom_read_bit_buffer *rb,
+                                            int trailing_bits_present);
+
+void av1_decode_tg_tiles_and_wrapup(struct AV1Decoder *pbi, const uint8_t *data,
+                                    const uint8_t *data_end,
+                                    const uint8_t **p_data_end, int start_tile,
+                                    int end_tile, int initialize_flag);
+
+// Implements the color_config() function in the spec. Reports errors by
+// calling rb->error_handler() or aom_internal_error().
+void av1_read_color_config(struct aom_read_bit_buffer *rb,
+                           int allow_lowbitdepth, SequenceHeader *seq_params,
+                           struct aom_internal_error_info *error_info);
+
+// Implements the timing_info() function in the spec. Reports errors by calling
+// rb->error_handler() or aom_internal_error().
+void av1_read_timing_info_header(aom_timing_info_t *timing_info,
+                                 struct aom_internal_error_info *error,
+                                 struct aom_read_bit_buffer *rb);
+
+// Implements the decoder_model_info() function in the spec. Reports errors by
+// calling rb->error_handler().
+void av1_read_decoder_model_info(aom_dec_model_info_t *decoder_model_info,
+                                 struct aom_read_bit_buffer *rb);
+
+// Implements the operating_parameters_info() function in the spec. Reports
+// errors by calling rb->error_handler().
+void av1_read_op_parameters_info(aom_dec_model_op_parameters_t *op_params,
+                                 int buffer_delay_length,
+                                 struct aom_read_bit_buffer *rb);
+
+struct aom_read_bit_buffer *av1_init_read_bit_buffer(
+    struct AV1Decoder *pbi, struct aom_read_bit_buffer *rb, const uint8_t *data,
+    const uint8_t *data_end);
+
+void av1_free_mc_tmp_buf(struct ThreadData *thread_data);
+
+void av1_set_single_tile_decoding_mode(AV1_COMMON *const cm);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_DECODER_DECODEFRAME_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.c b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.c
new file mode 100644
index 0000000000..2b370b65e3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.c
@@ -0,0 +1,1583 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/cfl.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymode.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropymv.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/mvref_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/pred_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/seg_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/warped_motion.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+
+#define ACCT_STR __func__
+
+#define DEC_MISMATCH_DEBUG 0
+
+static PREDICTION_MODE read_intra_mode(aom_reader *r, aom_cdf_prob *cdf) {
+  return (PREDICTION_MODE)aom_read_symbol(r, cdf, INTRA_MODES, ACCT_STR);
+}
+
+static void read_cdef(AV1_COMMON *cm, aom_reader *r, MACROBLOCKD *const xd) {
+  const int skip_txfm = xd->mi[0]->skip_txfm;
+  if (cm->features.coded_lossless) return;
+  if (cm->features.allow_intrabc) {
+    assert(cm->cdef_info.cdef_bits == 0);
+    return;
+  }
+
+  // At the start of a superblock, mark that we haven't yet read CDEF strengths
+  // for any of the CDEF units contained in this superblock.
+  const int sb_mask = (cm->seq_params.mib_size - 1);
+  const int mi_row_in_sb = (xd->mi_row & sb_mask);
+  const int mi_col_in_sb = (xd->mi_col & sb_mask);
+  if (mi_row_in_sb == 0 && mi_col_in_sb == 0) {
+    xd->cdef_transmitted[0] = xd->cdef_transmitted[1] =
+        xd->cdef_transmitted[2] = xd->cdef_transmitted[3] = false;
+  }
+
+  // CDEF unit size is 64x64 irrespective of the superblock size.
+  const int cdef_size = 1 << (6 - MI_SIZE_LOG2);
+
+  // Find index of this CDEF unit in this superblock.
+  const int index_mask = cdef_size;
+  const int cdef_unit_row_in_sb = ((xd->mi_row & index_mask) != 0);
+  const int cdef_unit_col_in_sb = ((xd->mi_col & index_mask) != 0);
+  const int index = (cm->seq_params.sb_size == BLOCK_128X128)
+                        ? cdef_unit_col_in_sb + 2 * cdef_unit_row_in_sb
+                        : 0;
+
+  // Read CDEF strength from the first non-skip coding block in this CDEF unit.
+  if (!xd->cdef_transmitted[index] && !skip_txfm) {
+    // CDEF strength for this CDEF unit needs to be read into the MB_MODE_INFO
+    // of the 1st block in this CDEF unit.
+    const int first_block_mask = ~(cdef_size - 1);
+    CommonModeInfoParams *const mi_params = &cm->mi_params;
+    const int grid_idx =
+        get_mi_grid_idx(mi_params, xd->mi_row & first_block_mask,
+                        xd->mi_col & first_block_mask);
+    MB_MODE_INFO *const mbmi = mi_params->mi_grid_base[grid_idx];
+    mbmi->cdef_strength =
+        aom_read_literal(r, cm->cdef_info.cdef_bits, ACCT_STR);
+    xd->cdef_transmitted[index] = true;
+  }
+}
+
+static int read_delta_qindex(AV1_COMMON *cm, const MACROBLOCKD *xd,
+                             aom_reader *r, MB_MODE_INFO *const mbmi) {
+  int sign, abs, reduced_delta_qindex = 0;
+  BLOCK_SIZE bsize = mbmi->bsize;
+  const int b_col = xd->mi_col & (cm->seq_params.mib_size - 1);
+  const int b_row = xd->mi_row & (cm->seq_params.mib_size - 1);
+  const int read_delta_q_flag = (b_col == 0 && b_row == 0);
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+
+  if ((bsize != cm->seq_params.sb_size || mbmi->skip_txfm == 0) &&
+      read_delta_q_flag) {
+    abs = aom_read_symbol(r, ec_ctx->delta_q_cdf, DELTA_Q_PROBS + 1, ACCT_STR);
+    const int smallval = (abs < DELTA_Q_SMALL);
+
+    if (!smallval) {
+      const int rem_bits = aom_read_literal(r, 3, ACCT_STR) + 1;
+      const int thr = (1 << rem_bits) + 1;
+      abs = aom_read_literal(r, rem_bits, ACCT_STR) + thr;
+    }
+
+    if (abs) {
+      sign = aom_read_bit(r, ACCT_STR);
+    } else {
+      sign = 1;
+    }
+
+    reduced_delta_qindex = sign ? -abs : abs;
+  }
+  return reduced_delta_qindex;
+}
+static int read_delta_lflevel(const AV1_COMMON *const cm, aom_reader *r,
+                              aom_cdf_prob *const cdf,
+                              const MB_MODE_INFO *const mbmi, int mi_col,
+                              int mi_row) {
+  int reduced_delta_lflevel = 0;
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  const int b_col = mi_col & (cm->seq_params.mib_size - 1);
+  const int b_row = mi_row & (cm->seq_params.mib_size - 1);
+  const int read_delta_lf_flag = (b_col == 0 && b_row == 0);
+
+  if ((bsize != cm->seq_params.sb_size || mbmi->skip_txfm == 0) &&
+      read_delta_lf_flag) {
+    int abs = aom_read_symbol(r, cdf, DELTA_LF_PROBS + 1, ACCT_STR);
+    const int smallval = (abs < DELTA_LF_SMALL);
+    if (!smallval) {
+      const int rem_bits = aom_read_literal(r, 3, ACCT_STR) + 1;
+      const int thr = (1 << rem_bits) + 1;
+      abs = aom_read_literal(r, rem_bits, ACCT_STR) + thr;
+    }
+    const int sign = abs ? aom_read_bit(r, ACCT_STR) : 1;
+    reduced_delta_lflevel = sign ? -abs : abs;
+  }
+  return reduced_delta_lflevel;
+}
+
+static UV_PREDICTION_MODE read_intra_mode_uv(FRAME_CONTEXT *ec_ctx,
+                                             aom_reader *r,
+                                             CFL_ALLOWED_TYPE cfl_allowed,
+                                             PREDICTION_MODE y_mode) {
+  const UV_PREDICTION_MODE uv_mode =
+      aom_read_symbol(r, ec_ctx->uv_mode_cdf[cfl_allowed][y_mode],
+                      UV_INTRA_MODES - !cfl_allowed, ACCT_STR);
+  return uv_mode;
+}
+
+static uint8_t read_cfl_alphas(FRAME_CONTEXT *const ec_ctx, aom_reader *r,
+                               int8_t *signs_out) {
+  const int8_t joint_sign =
+      aom_read_symbol(r, ec_ctx->cfl_sign_cdf, CFL_JOINT_SIGNS, "cfl:signs");
+  uint8_t idx = 0;
+  // Magnitudes are only coded for nonzero values
+  if (CFL_SIGN_U(joint_sign) != CFL_SIGN_ZERO) {
+    aom_cdf_prob *cdf_u = ec_ctx->cfl_alpha_cdf[CFL_CONTEXT_U(joint_sign)];
+    idx = (uint8_t)aom_read_symbol(r, cdf_u, CFL_ALPHABET_SIZE, "cfl:alpha_u")
+          << CFL_ALPHABET_SIZE_LOG2;
+  }
+  if (CFL_SIGN_V(joint_sign) != CFL_SIGN_ZERO) {
+    aom_cdf_prob *cdf_v = ec_ctx->cfl_alpha_cdf[CFL_CONTEXT_V(joint_sign)];
+    idx += (uint8_t)aom_read_symbol(r, cdf_v, CFL_ALPHABET_SIZE, "cfl:alpha_v");
+  }
+  *signs_out = joint_sign;
+  return idx;
+}
+
+static INTERINTRA_MODE read_interintra_mode(MACROBLOCKD *xd, aom_reader *r,
+                                            int size_group) {
+  const INTERINTRA_MODE ii_mode = (INTERINTRA_MODE)aom_read_symbol(
+      r, xd->tile_ctx->interintra_mode_cdf[size_group], INTERINTRA_MODES,
+      ACCT_STR);
+  return ii_mode;
+}
+
+static PREDICTION_MODE read_inter_mode(FRAME_CONTEXT *ec_ctx, aom_reader *r,
+                                       int16_t ctx) {
+  int16_t mode_ctx = ctx & NEWMV_CTX_MASK;
+  int is_newmv, is_zeromv, is_refmv;
+  is_newmv = aom_read_symbol(r, ec_ctx->newmv_cdf[mode_ctx], 2, ACCT_STR) == 0;
+  if (is_newmv) return NEWMV;
+
+  mode_ctx = (ctx >> GLOBALMV_OFFSET) & GLOBALMV_CTX_MASK;
+  is_zeromv =
+      aom_read_symbol(r, ec_ctx->zeromv_cdf[mode_ctx], 2, ACCT_STR) == 0;
+  if (is_zeromv) return GLOBALMV;
+
+  mode_ctx = (ctx >> REFMV_OFFSET) & REFMV_CTX_MASK;
+  is_refmv = aom_read_symbol(r, ec_ctx->refmv_cdf[mode_ctx], 2, ACCT_STR) == 0;
+  if (is_refmv)
+    return NEARESTMV;
+  else
+    return NEARMV;
+}
+
+static void read_drl_idx(FRAME_CONTEXT *ec_ctx, DecoderCodingBlock *dcb,
+                         MB_MODE_INFO *mbmi, aom_reader *r) {
+  MACROBLOCKD *const xd = &dcb->xd;
+  uint8_t ref_frame_type = av1_ref_frame_type(mbmi->ref_frame);
+  mbmi->ref_mv_idx = 0;
+  if (mbmi->mode == NEWMV || mbmi->mode == NEW_NEWMV) {
+    for (int idx = 0; idx < 2; ++idx) {
+      if (dcb->ref_mv_count[ref_frame_type] > idx + 1) {
+        uint8_t drl_ctx = av1_drl_ctx(xd->weight[ref_frame_type], idx);
+        int drl_idx = aom_read_symbol(r, ec_ctx->drl_cdf[drl_ctx], 2, ACCT_STR);
+        mbmi->ref_mv_idx = idx + drl_idx;
+        if (!drl_idx) return;
+      }
+    }
+  }
+  if (have_nearmv_in_inter_mode(mbmi->mode)) {
+    // Offset the NEARESTMV mode.
+    // TODO(jingning): Unify the two syntax decoding loops after the NEARESTMV
+    // mode is factored in.
+    for (int idx = 1; idx < 3; ++idx) {
+      if (dcb->ref_mv_count[ref_frame_type] > idx + 1) {
+        uint8_t drl_ctx = av1_drl_ctx(xd->weight[ref_frame_type], idx);
+        int drl_idx = aom_read_symbol(r, ec_ctx->drl_cdf[drl_ctx], 2, ACCT_STR);
+        mbmi->ref_mv_idx = idx + drl_idx - 1;
+        if (!drl_idx) return;
+      }
+    }
+  }
+}
+
+static MOTION_MODE read_motion_mode(AV1_COMMON *cm, MACROBLOCKD *xd,
+                                    MB_MODE_INFO *mbmi, aom_reader *r) {
+  if (cm->features.switchable_motion_mode == 0) return SIMPLE_TRANSLATION;
+  if (mbmi->skip_mode) return SIMPLE_TRANSLATION;
+
+  const MOTION_MODE last_motion_mode_allowed = motion_mode_allowed(
+      xd->global_motion, xd, mbmi, cm->features.allow_warped_motion);
+  int motion_mode;
+
+  if (last_motion_mode_allowed == SIMPLE_TRANSLATION) return SIMPLE_TRANSLATION;
+
+  if (last_motion_mode_allowed == OBMC_CAUSAL) {
+    motion_mode =
+        aom_read_symbol(r, xd->tile_ctx->obmc_cdf[mbmi->bsize], 2, ACCT_STR);
+    return (MOTION_MODE)(SIMPLE_TRANSLATION + motion_mode);
+  } else {
+    motion_mode = aom_read_symbol(r, xd->tile_ctx->motion_mode_cdf[mbmi->bsize],
+                                  MOTION_MODES, ACCT_STR);
+    return (MOTION_MODE)(SIMPLE_TRANSLATION + motion_mode);
+  }
+}
+
+static PREDICTION_MODE read_inter_compound_mode(MACROBLOCKD *xd, aom_reader *r,
+                                                int16_t ctx) {
+  const int mode =
+      aom_read_symbol(r, xd->tile_ctx->inter_compound_mode_cdf[ctx],
+                      INTER_COMPOUND_MODES, ACCT_STR);
+  assert(is_inter_compound_mode(NEAREST_NEARESTMV + mode));
+  return NEAREST_NEARESTMV + mode;
+}
+
+int av1_neg_deinterleave(int diff, int ref, int max) {
+  if (!ref) return diff;
+  if (ref >= (max - 1)) return max - diff - 1;
+  if (2 * ref < max) {
+    if (diff <= 2 * ref) {
+      if (diff & 1)
+        return ref + ((diff + 1) >> 1);
+      else
+        return ref - (diff >> 1);
+    }
+    return diff;
+  } else {
+    if (diff <= 2 * (max - ref - 1)) {
+      if (diff & 1)
+        return ref + ((diff + 1) >> 1);
+      else
+        return ref - (diff >> 1);
+    }
+    return max - (diff + 1);
+  }
+}
+
+static int read_segment_id(AV1_COMMON *const cm, const MACROBLOCKD *const xd,
+                           aom_reader *r, int skip) {
+  int cdf_num;
+  const int pred = av1_get_spatial_seg_pred(cm, xd, &cdf_num);
+  if (skip) return pred;
+
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  struct segmentation *const seg = &cm->seg;
+  struct segmentation_probs *const segp = &ec_ctx->seg;
+  aom_cdf_prob *pred_cdf = segp->spatial_pred_seg_cdf[cdf_num];
+  const int coded_id = aom_read_symbol(r, pred_cdf, MAX_SEGMENTS, ACCT_STR);
+  const int segment_id =
+      av1_neg_deinterleave(coded_id, pred, seg->last_active_segid + 1);
+
+  if (segment_id < 0 || segment_id > seg->last_active_segid) {
+    aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
+                       "Corrupted segment_ids");
+  }
+  return segment_id;
+}
+
+static int dec_get_segment_id(const AV1_COMMON *cm, const uint8_t *segment_ids,
+                              int mi_offset, int x_mis, int y_mis) {
+  int segment_id = INT_MAX;
+
+  for (int y = 0; y < y_mis; y++)
+    for (int x = 0; x < x_mis; x++)
+      segment_id = AOMMIN(
+          segment_id, segment_ids[mi_offset + y * cm->mi_params.mi_cols + x]);
+
+  assert(segment_id >= 0 && segment_id < MAX_SEGMENTS);
+  return segment_id;
+}
+
+static void set_segment_id(AV1_COMMON *cm, int mi_offset, int x_mis, int y_mis,
+                           int segment_id) {
+  assert(segment_id >= 0 && segment_id < MAX_SEGMENTS);
+
+  for (int y = 0; y < y_mis; y++)
+    for (int x = 0; x < x_mis; x++)
+      cm->cur_frame->seg_map[mi_offset + y * cm->mi_params.mi_cols + x] =
+          segment_id;
+}
+
+static int read_intra_segment_id(AV1_COMMON *const cm,
+                                 const MACROBLOCKD *const xd, int bsize,
+                                 aom_reader *r, int skip) {
+  struct segmentation *const seg = &cm->seg;
+  if (!seg->enabled) return 0;  // Default for disabled segmentation
+  assert(seg->update_map && !seg->temporal_update);
+
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+  const int mi_row = xd->mi_row;
+  const int mi_col = xd->mi_col;
+  const int mi_offset = mi_row * mi_params->mi_cols + mi_col;
+  const int bw = mi_size_wide[bsize];
+  const int bh = mi_size_high[bsize];
+  const int x_mis = AOMMIN(mi_params->mi_cols - mi_col, bw);
+  const int y_mis = AOMMIN(mi_params->mi_rows - mi_row, bh);
+  const int segment_id = read_segment_id(cm, xd, r, skip);
+  set_segment_id(cm, mi_offset, x_mis, y_mis, segment_id);
+  return segment_id;
+}
+
+static void copy_segment_id(const CommonModeInfoParams *const mi_params,
+                            const uint8_t *last_segment_ids,
+                            uint8_t *current_segment_ids, int mi_offset,
+                            int x_mis, int y_mis) {
+  for (int y = 0; y < y_mis; y++)
+    for (int x = 0; x < x_mis; x++)
+      current_segment_ids[mi_offset + y * mi_params->mi_cols + x] =
+          last_segment_ids
+              ? last_segment_ids[mi_offset + y * mi_params->mi_cols + x]
+              : 0;
+}
+
+static int get_predicted_segment_id(AV1_COMMON *const cm, int mi_offset,
+                                    int x_mis, int y_mis) {
+  return cm->last_frame_seg_map ? dec_get_segment_id(cm, cm->last_frame_seg_map,
+                                                     mi_offset, x_mis, y_mis)
+                                : 0;
+}
+
+static int read_inter_segment_id(AV1_COMMON *const cm, MACROBLOCKD *const xd,
+                                 int preskip, aom_reader *r) {
+  struct segmentation *const seg = &cm->seg;
+  const CommonModeInfoParams *const mi_params = &cm->mi_params;
+  MB_MODE_INFO *const mbmi = xd->mi[0];
+  const int mi_row = xd->mi_row;
+  const int mi_col = xd->mi_col;
+  const int mi_offset = mi_row * mi_params->mi_cols + mi_col;
+  const int bw = mi_size_wide[mbmi->bsize];
+  const int bh = mi_size_high[mbmi->bsize];
+
+  // TODO(slavarnway): move x_mis, y_mis into xd ?????
+  const int x_mis = AOMMIN(mi_params->mi_cols - mi_col, bw);
+  const int y_mis = AOMMIN(mi_params->mi_rows - mi_row, bh);
+
+  if (!seg->enabled) return 0;  // Default for disabled segmentation
+
+  if (!seg->update_map) {
+    copy_segment_id(mi_params, cm->last_frame_seg_map, cm->cur_frame->seg_map,
+                    mi_offset, x_mis, y_mis);
+    return get_predicted_segment_id(cm, mi_offset, x_mis, y_mis);
+  }
+
+  int segment_id;
+  if (preskip) {
+    if (!seg->segid_preskip) return 0;
+  } else {
+    if (mbmi->skip_txfm) {
+      if (seg->temporal_update) {
+        mbmi->seg_id_predicted = 0;
+      }
+      segment_id = read_segment_id(cm, xd, r, 1);
+      set_segment_id(cm, mi_offset, x_mis, y_mis, segment_id);
+      return segment_id;
+    }
+  }
+
+  if (seg->temporal_update) {
+    const int ctx = av1_get_pred_context_seg_id(xd);
+    FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+    struct segmentation_probs *const segp = &ec_ctx->seg;
+    aom_cdf_prob *pred_cdf = segp->pred_cdf[ctx];
+    mbmi->seg_id_predicted = aom_read_symbol(r, pred_cdf, 2, ACCT_STR);
+    if (mbmi->seg_id_predicted) {
+      segment_id = get_predicted_segment_id(cm, mi_offset, x_mis, y_mis);
+    } else {
+      segment_id = read_segment_id(cm, xd, r, 0);
+    }
+  } else {
+    segment_id = read_segment_id(cm, xd, r, 0);
+  }
+  set_segment_id(cm, mi_offset, x_mis, y_mis, segment_id);
+  return segment_id;
+}
+
+static int read_skip_mode(AV1_COMMON *cm, const MACROBLOCKD *xd, int segment_id,
+                          aom_reader *r) {
+  if (!cm->current_frame.skip_mode_info.skip_mode_flag) return 0;
+
+  if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP)) {
+    return 0;
+  }
+
+  if (!is_comp_ref_allowed(xd->mi[0]->bsize)) return 0;
+
+  if (segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME) ||
+      segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)) {
+    // These features imply single-reference mode, while skip mode implies
+    // compound reference. Hence, the two are mutually exclusive.
+    // In other words, skip_mode is implicitly 0 here.
+    return 0;
+  }
+
+  const int ctx = av1_get_skip_mode_context(xd);
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  const int skip_mode =
+      aom_read_symbol(r, ec_ctx->skip_mode_cdfs[ctx], 2, ACCT_STR);
+  return skip_mode;
+}
+
+static int read_skip_txfm(AV1_COMMON *cm, const MACROBLOCKD *xd, int segment_id,
+                          aom_reader *r) {
+  if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP)) {
+    return 1;
+  } else {
+    const int ctx = av1_get_skip_txfm_context(xd);
+    FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+    const int skip_txfm =
+        aom_read_symbol(r, ec_ctx->skip_txfm_cdfs[ctx], 2, ACCT_STR);
+    return skip_txfm;
+  }
+}
+
+// Merge the sorted list of cached colors(cached_colors[0...n_cached_colors-1])
+// and the sorted list of transmitted colors(colors[n_cached_colors...n-1]) into
+// one single sorted list(colors[...]).
+static void merge_colors(uint16_t *colors, uint16_t *cached_colors,
+                         int n_colors, int n_cached_colors) {
+  if (n_cached_colors == 0) return;
+  int cache_idx = 0, trans_idx = n_cached_colors;
+  for (int i = 0; i < n_colors; ++i) {
+    if (cache_idx < n_cached_colors &&
+        (trans_idx >= n_colors ||
+         cached_colors[cache_idx] <= colors[trans_idx])) {
+      colors[i] = cached_colors[cache_idx++];
+    } else {
+      assert(trans_idx < n_colors);
+      colors[i] = colors[trans_idx++];
+    }
+  }
+}
+
+static void read_palette_colors_y(MACROBLOCKD *const xd, int bit_depth,
+                                  PALETTE_MODE_INFO *const pmi, aom_reader *r) {
+  uint16_t color_cache[2 * PALETTE_MAX_SIZE];
+  uint16_t cached_colors[PALETTE_MAX_SIZE];
+  const int n_cache = av1_get_palette_cache(xd, 0, color_cache);
+  const int n = pmi->palette_size[0];
+  int idx = 0;
+  for (int i = 0; i < n_cache && idx < n; ++i)
+    if (aom_read_bit(r, ACCT_STR)) cached_colors[idx++] = color_cache[i];
+  if (idx < n) {
+    const int n_cached_colors = idx;
+    pmi->palette_colors[idx++] = aom_read_literal(r, bit_depth, ACCT_STR);
+    if (idx < n) {
+      const int min_bits = bit_depth - 3;
+      int bits = min_bits + aom_read_literal(r, 2, ACCT_STR);
+      int range = (1 << bit_depth) - pmi->palette_colors[idx - 1] - 1;
+      for (; idx < n; ++idx) {
+        assert(range >= 0);
+        const int delta = aom_read_literal(r, bits, ACCT_STR) + 1;
+        pmi->palette_colors[idx] = clamp(pmi->palette_colors[idx - 1] + delta,
+                                         0, (1 << bit_depth) - 1);
+        range -= (pmi->palette_colors[idx] - pmi->palette_colors[idx - 1]);
+        bits = AOMMIN(bits, av1_ceil_log2(range));
+      }
+    }
+    merge_colors(pmi->palette_colors, cached_colors, n, n_cached_colors);
+  } else {
+    memcpy(pmi->palette_colors, cached_colors, n * sizeof(cached_colors[0]));
+  }
+}
+
+static void read_palette_colors_uv(MACROBLOCKD *const xd, int bit_depth,
+                                   PALETTE_MODE_INFO *const pmi,
+                                   aom_reader *r) {
+  const int n = pmi->palette_size[1];
+  // U channel colors.
+  uint16_t color_cache[2 * PALETTE_MAX_SIZE];
+  uint16_t cached_colors[PALETTE_MAX_SIZE];
+  const int n_cache = av1_get_palette_cache(xd, 1, color_cache);
+  int idx = 0;
+  for (int i = 0; i < n_cache && idx < n; ++i)
+    if (aom_read_bit(r, ACCT_STR)) cached_colors[idx++] = color_cache[i];
+  if (idx < n) {
+    const int n_cached_colors = idx;
+    idx += PALETTE_MAX_SIZE;
+    pmi->palette_colors[idx++] = aom_read_literal(r, bit_depth, ACCT_STR);
+    if (idx < PALETTE_MAX_SIZE + n) {
+      const int min_bits = bit_depth - 3;
+      int bits = min_bits + aom_read_literal(r, 2, ACCT_STR);
+      int range = (1 << bit_depth) - pmi->palette_colors[idx - 1];
+      for (; idx < PALETTE_MAX_SIZE + n; ++idx) {
+        assert(range >= 0);
+        const int delta = aom_read_literal(r, bits, ACCT_STR);
+        pmi->palette_colors[idx] = clamp(pmi->palette_colors[idx - 1] + delta,
+                                         0, (1 << bit_depth) - 1);
+        range -= (pmi->palette_colors[idx] - pmi->palette_colors[idx - 1]);
+        bits = AOMMIN(bits, av1_ceil_log2(range));
+      }
+    }
+    merge_colors(pmi->palette_colors + PALETTE_MAX_SIZE, cached_colors, n,
+                 n_cached_colors);
+  } else {
+    memcpy(pmi->palette_colors + PALETTE_MAX_SIZE, cached_colors,
+           n * sizeof(cached_colors[0]));
+  }
+
+  // V channel colors.
+  if (aom_read_bit(r, ACCT_STR)) {  // Delta encoding.
+    const int min_bits_v = bit_depth - 4;
+    const int max_val = 1 << bit_depth;
+    int bits = min_bits_v + aom_read_literal(r, 2, ACCT_STR);
+    pmi->palette_colors[2 * PALETTE_MAX_SIZE] =
+        aom_read_literal(r, bit_depth, ACCT_STR);
+    for (int i = 1; i < n; ++i) {
+      int delta = aom_read_literal(r, bits, ACCT_STR);
+      if (delta && aom_read_bit(r, ACCT_STR)) delta = -delta;
+      int val = (int)pmi->palette_colors[2 * PALETTE_MAX_SIZE + i - 1] + delta;
+      if (val < 0) val += max_val;
+      if (val >= max_val) val -= max_val;
+      pmi->palette_colors[2 * PALETTE_MAX_SIZE + i] = val;
+    }
+  } else {
+    for (int i = 0; i < n; ++i) {
+      pmi->palette_colors[2 * PALETTE_MAX_SIZE + i] =
+          aom_read_literal(r, bit_depth, ACCT_STR);
+    }
+  }
+}
+
+static void read_palette_mode_info(AV1_COMMON *const cm, MACROBLOCKD *const xd,
+                                   aom_reader *r) {
+  const int num_planes = av1_num_planes(cm);
+  MB_MODE_INFO *const mbmi = xd->mi[0];
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  assert(av1_allow_palette(cm->features.allow_screen_content_tools, bsize));
+  PALETTE_MODE_INFO *const pmi = &mbmi->palette_mode_info;
+  const int bsize_ctx = av1_get_palette_bsize_ctx(bsize);
+
+  if (mbmi->mode == DC_PRED) {
+    const int palette_mode_ctx = av1_get_palette_mode_ctx(xd);
+    const int modev = aom_read_symbol(
+        r, xd->tile_ctx->palette_y_mode_cdf[bsize_ctx][palette_mode_ctx], 2,
+        ACCT_STR);
+    if (modev) {
+      pmi->palette_size[0] =
+          aom_read_symbol(r, xd->tile_ctx->palette_y_size_cdf[bsize_ctx],
+                          PALETTE_SIZES, ACCT_STR) +
+          2;
+      read_palette_colors_y(xd, cm->seq_params.bit_depth, pmi, r);
+    }
+  }
+  if (num_planes > 1 && mbmi->uv_mode == UV_DC_PRED && xd->is_chroma_ref) {
+    const int palette_uv_mode_ctx = (pmi->palette_size[0] > 0);
+    const int modev = aom_read_symbol(
+        r, xd->tile_ctx->palette_uv_mode_cdf[palette_uv_mode_ctx], 2, ACCT_STR);
+    if (modev) {
+      pmi->palette_size[1] =
+          aom_read_symbol(r, xd->tile_ctx->palette_uv_size_cdf[bsize_ctx],
+                          PALETTE_SIZES, ACCT_STR) +
+          2;
+      read_palette_colors_uv(xd, cm->seq_params.bit_depth, pmi, r);
+    }
+  }
+}
+
+static int read_angle_delta(aom_reader *r, aom_cdf_prob *cdf) {
+  const int sym = aom_read_symbol(r, cdf, 2 * MAX_ANGLE_DELTA + 1, ACCT_STR);
+  return sym - MAX_ANGLE_DELTA;
+}
+
+static void read_filter_intra_mode_info(const AV1_COMMON *const cm,
+                                        MACROBLOCKD *const xd, aom_reader *r) {
+  MB_MODE_INFO *const mbmi = xd->mi[0];
+  FILTER_INTRA_MODE_INFO *filter_intra_mode_info =
+      &mbmi->filter_intra_mode_info;
+
+  if (av1_filter_intra_allowed(cm, mbmi)) {
+    filter_intra_mode_info->use_filter_intra = aom_read_symbol(
+        r, xd->tile_ctx->filter_intra_cdfs[mbmi->bsize], 2, ACCT_STR);
+    if (filter_intra_mode_info->use_filter_intra) {
+      filter_intra_mode_info->filter_intra_mode = aom_read_symbol(
+          r, xd->tile_ctx->filter_intra_mode_cdf, FILTER_INTRA_MODES, ACCT_STR);
+    }
+  } else {
+    filter_intra_mode_info->use_filter_intra = 0;
+  }
+}
+
+void av1_read_tx_type(const AV1_COMMON *const cm, MACROBLOCKD *xd, int blk_row,
+                      int blk_col, TX_SIZE tx_size, aom_reader *r) {
+  MB_MODE_INFO *mbmi = xd->mi[0];
+  uint8_t *tx_type =
+      &xd->tx_type_map[blk_row * xd->tx_type_map_stride + blk_col];
+  *tx_type = DCT_DCT;
+
+  // No need to read transform type if block is skipped.
+  if (mbmi->skip_txfm ||
+      segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP))
+    return;
+
+  // No need to read transform type for lossless mode(qindex==0).
+  const int qindex = xd->qindex[mbmi->segment_id];
+  if (qindex == 0) return;
+
+  const int inter_block = is_inter_block(mbmi);
+  if (get_ext_tx_types(tx_size, inter_block, cm->features.reduced_tx_set_used) >
+      1) {
+    const TxSetType tx_set_type = av1_get_ext_tx_set_type(
+        tx_size, inter_block, cm->features.reduced_tx_set_used);
+    const int eset =
+        get_ext_tx_set(tx_size, inter_block, cm->features.reduced_tx_set_used);
+    // eset == 0 should correspond to a set with only DCT_DCT and
+    // there is no need to read the tx_type
+    assert(eset != 0);
+
+    const TX_SIZE square_tx_size = txsize_sqr_map[tx_size];
+    FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+    if (inter_block) {
+      *tx_type = av1_ext_tx_inv[tx_set_type][aom_read_symbol(
+          r, ec_ctx->inter_ext_tx_cdf[eset][square_tx_size],
+          av1_num_ext_tx_set[tx_set_type], ACCT_STR)];
+    } else {
+      const PREDICTION_MODE intra_mode =
+          mbmi->filter_intra_mode_info.use_filter_intra
+              ? fimode_to_intradir[mbmi->filter_intra_mode_info
+                                       .filter_intra_mode]
+              : mbmi->mode;
+      *tx_type = av1_ext_tx_inv[tx_set_type][aom_read_symbol(
+          r, ec_ctx->intra_ext_tx_cdf[eset][square_tx_size][intra_mode],
+          av1_num_ext_tx_set[tx_set_type], ACCT_STR)];
+    }
+  }
+}
+
+static INLINE void read_mv(aom_reader *r, MV *mv, const MV *ref,
+                           nmv_context *ctx, MvSubpelPrecision precision);
+
+static INLINE int is_mv_valid(const MV *mv);
+
+static INLINE int assign_dv(AV1_COMMON *cm, MACROBLOCKD *xd, int_mv *mv,
+                            const int_mv *ref_mv, int mi_row, int mi_col,
+                            BLOCK_SIZE bsize, aom_reader *r) {
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  read_mv(r, &mv->as_mv, &ref_mv->as_mv, &ec_ctx->ndvc, MV_SUBPEL_NONE);
+  // DV should not have sub-pel.
+  assert((mv->as_mv.col & 7) == 0);
+  assert((mv->as_mv.row & 7) == 0);
+  mv->as_mv.col = (mv->as_mv.col >> 3) * 8;
+  mv->as_mv.row = (mv->as_mv.row >> 3) * 8;
+  int valid = is_mv_valid(&mv->as_mv) &&
+              av1_is_dv_valid(mv->as_mv, cm, xd, mi_row, mi_col, bsize,
+                              cm->seq_params.mib_size_log2);
+  return valid;
+}
+
+static void read_intrabc_info(AV1_COMMON *const cm, DecoderCodingBlock *dcb,
+                              aom_reader *r) {
+  MACROBLOCKD *const xd = &dcb->xd;
+  MB_MODE_INFO *const mbmi = xd->mi[0];
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  mbmi->use_intrabc = aom_read_symbol(r, ec_ctx->intrabc_cdf, 2, ACCT_STR);
+  if (mbmi->use_intrabc) {
+    BLOCK_SIZE bsize = mbmi->bsize;
+    mbmi->mode = DC_PRED;
+    mbmi->uv_mode = UV_DC_PRED;
+    mbmi->interp_filters = av1_broadcast_interp_filter(BILINEAR);
+    mbmi->motion_mode = SIMPLE_TRANSLATION;
+
+    int16_t inter_mode_ctx[MODE_CTX_REF_FRAMES];
+    int_mv ref_mvs[INTRA_FRAME + 1][MAX_MV_REF_CANDIDATES];
+
+    av1_find_mv_refs(cm, xd, mbmi, INTRA_FRAME, dcb->ref_mv_count,
+                     xd->ref_mv_stack, xd->weight, ref_mvs, /*global_mvs=*/NULL,
+                     inter_mode_ctx);
+
+    int_mv nearestmv, nearmv;
+
+    av1_find_best_ref_mvs(0, ref_mvs[INTRA_FRAME], &nearestmv, &nearmv, 0);
+    int_mv dv_ref = nearestmv.as_int == 0 ? nearmv : nearestmv;
+    if (dv_ref.as_int == 0)
+      av1_find_ref_dv(&dv_ref, &xd->tile, cm->seq_params.mib_size, xd->mi_row);
+    // Ref DV should not have sub-pel.
+    int valid_dv = (dv_ref.as_mv.col & 7) == 0 && (dv_ref.as_mv.row & 7) == 0;
+    dv_ref.as_mv.col = (dv_ref.as_mv.col >> 3) * 8;
+    dv_ref.as_mv.row = (dv_ref.as_mv.row >> 3) * 8;
+    valid_dv = valid_dv && assign_dv(cm, xd, &mbmi->mv[0], &dv_ref, xd->mi_row,
+                                     xd->mi_col, bsize, r);
+    if (!valid_dv) {
+      // Intra bc motion vectors are not valid - signal corrupt frame
+      aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
+                         "Invalid intrabc dv");
+    }
+  }
+}
+
+// If delta q is present, reads delta_q index.
+// Also reads delta_q loop filter levels, if present.
+static void read_delta_q_params(AV1_COMMON *const cm, MACROBLOCKD *const xd,
+                                aom_reader *r) {
+  DeltaQInfo *const delta_q_info = &cm->delta_q_info;
+
+  if (delta_q_info->delta_q_present_flag) {
+    MB_MODE_INFO *const mbmi = xd->mi[0];
+    xd->current_base_qindex +=
+        read_delta_qindex(cm, xd, r, mbmi) * delta_q_info->delta_q_res;
+    /* Normative: Clamp to [1,MAXQ] to not interfere with lossless mode */
+    xd->current_base_qindex = clamp(xd->current_base_qindex, 1, MAXQ);
+    FRAME_CONTEXT *const ec_ctx = xd->tile_ctx;
+    if (delta_q_info->delta_lf_present_flag) {
+      const int mi_row = xd->mi_row;
+      const int mi_col = xd->mi_col;
+      if (delta_q_info->delta_lf_multi) {
+        const int frame_lf_count =
+            av1_num_planes(cm) > 1 ? FRAME_LF_COUNT : FRAME_LF_COUNT - 2;
+        for (int lf_id = 0; lf_id < frame_lf_count; ++lf_id) {
+          const int tmp_lvl =
+              xd->delta_lf[lf_id] +
+              read_delta_lflevel(cm, r, ec_ctx->delta_lf_multi_cdf[lf_id], mbmi,
+                                 mi_col, mi_row) *
+                  delta_q_info->delta_lf_res;
+          mbmi->delta_lf[lf_id] = xd->delta_lf[lf_id] =
+              clamp(tmp_lvl, -MAX_LOOP_FILTER, MAX_LOOP_FILTER);
+        }
+      } else {
+        const int tmp_lvl = xd->delta_lf_from_base +
+                            read_delta_lflevel(cm, r, ec_ctx->delta_lf_cdf,
+                                               mbmi, mi_col, mi_row) *
+                                delta_q_info->delta_lf_res;
+        mbmi->delta_lf_from_base = xd->delta_lf_from_base =
+            clamp(tmp_lvl, -MAX_LOOP_FILTER, MAX_LOOP_FILTER);
+      }
+    }
+  }
+}
+
+static void read_intra_frame_mode_info(AV1_COMMON *const cm,
+                                       DecoderCodingBlock *dcb, aom_reader *r) {
+  MACROBLOCKD *const xd = &dcb->xd;
+  MB_MODE_INFO *const mbmi = xd->mi[0];
+  const MB_MODE_INFO *above_mi = xd->above_mbmi;
+  const MB_MODE_INFO *left_mi = xd->left_mbmi;
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  struct segmentation *const seg = &cm->seg;
+
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+
+  if (seg->segid_preskip)
+    mbmi->segment_id = read_intra_segment_id(cm, xd, bsize, r, 0);
+
+  mbmi->skip_txfm = read_skip_txfm(cm, xd, mbmi->segment_id, r);
+
+  if (!seg->segid_preskip)
+    mbmi->segment_id = read_intra_segment_id(cm, xd, bsize, r, mbmi->skip_txfm);
+
+  read_cdef(cm, r, xd);
+
+  read_delta_q_params(cm, xd, r);
+
+  mbmi->current_qindex = xd->current_base_qindex;
+
+  mbmi->ref_frame[0] = INTRA_FRAME;
+  mbmi->ref_frame[1] = NONE_FRAME;
+  mbmi->palette_mode_info.palette_size[0] = 0;
+  mbmi->palette_mode_info.palette_size[1] = 0;
+  mbmi->filter_intra_mode_info.use_filter_intra = 0;
+
+  const int mi_row = xd->mi_row;
+  const int mi_col = xd->mi_col;
+  xd->above_txfm_context = cm->above_contexts.txfm[xd->tile.tile_row] + mi_col;
+  xd->left_txfm_context =
+      xd->left_txfm_context_buffer + (mi_row & MAX_MIB_MASK);
+
+  if (av1_allow_intrabc(cm)) {
+    read_intrabc_info(cm, dcb, r);
+    if (is_intrabc_block(mbmi)) return;
+  }
+
+  mbmi->mode = read_intra_mode(r, get_y_mode_cdf(ec_ctx, above_mi, left_mi));
+
+  const int use_angle_delta = av1_use_angle_delta(bsize);
+  mbmi->angle_delta[PLANE_TYPE_Y] =
+      (use_angle_delta && av1_is_directional_mode(mbmi->mode))
+          ? read_angle_delta(r, ec_ctx->angle_delta_cdf[mbmi->mode - V_PRED])
+          : 0;
+
+  if (!cm->seq_params.monochrome && xd->is_chroma_ref) {
+    mbmi->uv_mode =
+        read_intra_mode_uv(ec_ctx, r, is_cfl_allowed(xd), mbmi->mode);
+    if (mbmi->uv_mode == UV_CFL_PRED) {
+      mbmi->cfl_alpha_idx = read_cfl_alphas(ec_ctx, r, &mbmi->cfl_alpha_signs);
+    }
+    mbmi->angle_delta[PLANE_TYPE_UV] =
+        (use_angle_delta && av1_is_directional_mode(get_uv_mode(mbmi->uv_mode)))
+            ? read_angle_delta(r,
+                               ec_ctx->angle_delta_cdf[mbmi->uv_mode - V_PRED])
+            : 0;
+  } else {
+    // Avoid decoding angle_info if there is is no chroma prediction
+    mbmi->uv_mode = UV_DC_PRED;
+  }
+  xd->cfl.store_y = store_cfl_required(cm, xd);
+
+  if (av1_allow_palette(cm->features.allow_screen_content_tools, bsize))
+    read_palette_mode_info(cm, xd, r);
+
+  read_filter_intra_mode_info(cm, xd, r);
+}
+
+static int read_mv_component(aom_reader *r, nmv_component *mvcomp,
+                             int use_subpel, int usehp) {
+  int mag, d, fr, hp;
+  const int sign = aom_read_symbol(r, mvcomp->sign_cdf, 2, ACCT_STR);
+  const int mv_class =
+      aom_read_symbol(r, mvcomp->classes_cdf, MV_CLASSES, ACCT_STR);
+  const int class0 = mv_class == MV_CLASS_0;
+
+  // Integer part
+  if (class0) {
+    d = aom_read_symbol(r, mvcomp->class0_cdf, CLASS0_SIZE, ACCT_STR);
+    mag = 0;
+  } else {
+    const int n = mv_class + CLASS0_BITS - 1;  // number of bits
+    d = 0;
+    for (int i = 0; i < n; ++i)
+      d |= aom_read_symbol(r, mvcomp->bits_cdf[i], 2, ACCT_STR) << i;
+    mag = CLASS0_SIZE << (mv_class + 2);
+  }
+
+  if (use_subpel) {
+    // Fractional part
+    fr = aom_read_symbol(r, class0 ? mvcomp->class0_fp_cdf[d] : mvcomp->fp_cdf,
+                         MV_FP_SIZE, ACCT_STR);
+
+    // High precision part (if hp is not used, the default value of the hp is 1)
+    hp = usehp ? aom_read_symbol(
+                     r, class0 ? mvcomp->class0_hp_cdf : mvcomp->hp_cdf, 2,
+                     ACCT_STR)
+               : 1;
+  } else {
+    fr = 3;
+    hp = 1;
+  }
+
+  // Result
+  mag += ((d << 3) | (fr << 1) | hp) + 1;
+  return sign ? -mag : mag;
+}
+
+static INLINE void read_mv(aom_reader *r, MV *mv, const MV *ref,
+                           nmv_context *ctx, MvSubpelPrecision precision) {
+  MV diff = kZeroMv;
+  const MV_JOINT_TYPE joint_type =
+      (MV_JOINT_TYPE)aom_read_symbol(r, ctx->joints_cdf, MV_JOINTS, ACCT_STR);
+
+  if (mv_joint_vertical(joint_type))
+    diff.row = read_mv_component(r, &ctx->comps[0], precision > MV_SUBPEL_NONE,
+                                 precision > MV_SUBPEL_LOW_PRECISION);
+
+  if (mv_joint_horizontal(joint_type))
+    diff.col = read_mv_component(r, &ctx->comps[1], precision > MV_SUBPEL_NONE,
+                                 precision > MV_SUBPEL_LOW_PRECISION);
+
+  mv->row = ref->row + diff.row;
+  mv->col = ref->col + diff.col;
+}
+
+static REFERENCE_MODE read_block_reference_mode(AV1_COMMON *cm,
+                                                const MACROBLOCKD *xd,
+                                                aom_reader *r) {
+  if (!is_comp_ref_allowed(xd->mi[0]->bsize)) return SINGLE_REFERENCE;
+  if (cm->current_frame.reference_mode == REFERENCE_MODE_SELECT) {
+    const int ctx = av1_get_reference_mode_context(xd);
+    const REFERENCE_MODE mode = (REFERENCE_MODE)aom_read_symbol(
+        r, xd->tile_ctx->comp_inter_cdf[ctx], 2, ACCT_STR);
+    return mode;  // SINGLE_REFERENCE or COMPOUND_REFERENCE
+  } else {
+    assert(cm->current_frame.reference_mode == SINGLE_REFERENCE);
+    return cm->current_frame.reference_mode;
+  }
+}
+
+#define READ_REF_BIT(pname) \
+  aom_read_symbol(r, av1_get_pred_cdf_##pname(xd), 2, ACCT_STR)
+
+static COMP_REFERENCE_TYPE read_comp_reference_type(const MACROBLOCKD *xd,
+                                                    aom_reader *r) {
+  const int ctx = av1_get_comp_reference_type_context(xd);
+  const COMP_REFERENCE_TYPE comp_ref_type =
+      (COMP_REFERENCE_TYPE)aom_read_symbol(
+          r, xd->tile_ctx->comp_ref_type_cdf[ctx], 2, ACCT_STR);
+  return comp_ref_type;  // UNIDIR_COMP_REFERENCE or BIDIR_COMP_REFERENCE
+}
+
+static void set_ref_frames_for_skip_mode(AV1_COMMON *const cm,
+                                         MV_REFERENCE_FRAME ref_frame[2]) {
+  ref_frame[0] = LAST_FRAME + cm->current_frame.skip_mode_info.ref_frame_idx_0;
+  ref_frame[1] = LAST_FRAME + cm->current_frame.skip_mode_info.ref_frame_idx_1;
+}
+
+// Read the referncence frame
+static void read_ref_frames(AV1_COMMON *const cm, MACROBLOCKD *const xd,
+                            aom_reader *r, int segment_id,
+                            MV_REFERENCE_FRAME ref_frame[2]) {
+  if (xd->mi[0]->skip_mode) {
+    set_ref_frames_for_skip_mode(cm, ref_frame);
+    return;
+  }
+
+  if (segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {
+    ref_frame[0] = (MV_REFERENCE_FRAME)get_segdata(&cm->seg, segment_id,
+                                                   SEG_LVL_REF_FRAME);
+    ref_frame[1] = NONE_FRAME;
+  } else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP) ||
+             segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)) {
+    ref_frame[0] = LAST_FRAME;
+    ref_frame[1] = NONE_FRAME;
+  } else {
+    const REFERENCE_MODE mode = read_block_reference_mode(cm, xd, r);
+
+    if (mode == COMPOUND_REFERENCE) {
+      const COMP_REFERENCE_TYPE comp_ref_type = read_comp_reference_type(xd, r);
+
+      if (comp_ref_type == UNIDIR_COMP_REFERENCE) {
+        const int bit = READ_REF_BIT(uni_comp_ref_p);
+        if (bit) {
+          ref_frame[0] = BWDREF_FRAME;
+          ref_frame[1] = ALTREF_FRAME;
+        } else {
+          const int bit1 = READ_REF_BIT(uni_comp_ref_p1);
+          if (bit1) {
+            const int bit2 = READ_REF_BIT(uni_comp_ref_p2);
+            if (bit2) {
+              ref_frame[0] = LAST_FRAME;
+              ref_frame[1] = GOLDEN_FRAME;
+            } else {
+              ref_frame[0] = LAST_FRAME;
+              ref_frame[1] = LAST3_FRAME;
+            }
+          } else {
+            ref_frame[0] = LAST_FRAME;
+            ref_frame[1] = LAST2_FRAME;
+          }
+        }
+
+        return;
+      }
+
+      assert(comp_ref_type == BIDIR_COMP_REFERENCE);
+
+      const int idx = 1;
+      const int bit = READ_REF_BIT(comp_ref_p);
+      // Decode forward references.
+      if (!bit) {
+        const int bit1 = READ_REF_BIT(comp_ref_p1);
+        ref_frame[!idx] = bit1 ? LAST2_FRAME : LAST_FRAME;
+      } else {
+        const int bit2 = READ_REF_BIT(comp_ref_p2);
+        ref_frame[!idx] = bit2 ? GOLDEN_FRAME : LAST3_FRAME;
+      }
+
+      // Decode backward references.
+      const int bit_bwd = READ_REF_BIT(comp_bwdref_p);
+      if (!bit_bwd) {
+        const int bit1_bwd = READ_REF_BIT(comp_bwdref_p1);
+        ref_frame[idx] = bit1_bwd ? ALTREF2_FRAME : BWDREF_FRAME;
+      } else {
+        ref_frame[idx] = ALTREF_FRAME;
+      }
+    } else if (mode == SINGLE_REFERENCE) {
+      const int bit0 = READ_REF_BIT(single_ref_p1);
+      if (bit0) {
+        const int bit1 = READ_REF_BIT(single_ref_p2);
+        if (!bit1) {
+          const int bit5 = READ_REF_BIT(single_ref_p6);
+          ref_frame[0] = bit5 ? ALTREF2_FRAME : BWDREF_FRAME;
+        } else {
+          ref_frame[0] = ALTREF_FRAME;
+        }
+      } else {
+        const int bit2 = READ_REF_BIT(single_ref_p3);
+        if (bit2) {
+          const int bit4 = READ_REF_BIT(single_ref_p5);
+          ref_frame[0] = bit4 ? GOLDEN_FRAME : LAST3_FRAME;
+        } else {
+          const int bit3 = READ_REF_BIT(single_ref_p4);
+          ref_frame[0] = bit3 ? LAST2_FRAME : LAST_FRAME;
+        }
+      }
+
+      ref_frame[1] = NONE_FRAME;
+    } else {
+      assert(0 && "Invalid prediction mode.");
+    }
+  }
+}
+
+static INLINE void read_mb_interp_filter(const MACROBLOCKD *const xd,
+                                         InterpFilter interp_filter,
+                                         bool enable_dual_filter,
+                                         MB_MODE_INFO *const mbmi,
+                                         aom_reader *r) {
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+
+  if (!av1_is_interp_needed(xd)) {
+    set_default_interp_filters(mbmi, interp_filter);
+    return;
+  }
+
+  if (interp_filter != SWITCHABLE) {
+    mbmi->interp_filters = av1_broadcast_interp_filter(interp_filter);
+  } else {
+    InterpFilter ref0_filter[2] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
+    for (int dir = 0; dir < 2; ++dir) {
+      const int ctx = av1_get_pred_context_switchable_interp(xd, dir);
+      ref0_filter[dir] = (InterpFilter)aom_read_symbol(
+          r, ec_ctx->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS, ACCT_STR);
+      if (!enable_dual_filter) {
+        ref0_filter[1] = ref0_filter[0];
+        break;
+      }
+    }
+    // The index system works as: (0, 1) -> (vertical, horizontal) filter types
+    mbmi->interp_filters.as_filters.x_filter = ref0_filter[1];
+    mbmi->interp_filters.as_filters.y_filter = ref0_filter[0];
+  }
+}
+
+static void read_intra_block_mode_info(AV1_COMMON *const cm,
+                                       MACROBLOCKD *const xd,
+                                       MB_MODE_INFO *const mbmi,
+                                       aom_reader *r) {
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  const int use_angle_delta = av1_use_angle_delta(bsize);
+
+  mbmi->ref_frame[0] = INTRA_FRAME;
+  mbmi->ref_frame[1] = NONE_FRAME;
+
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+
+  mbmi->mode = read_intra_mode(r, ec_ctx->y_mode_cdf[size_group_lookup[bsize]]);
+
+  mbmi->angle_delta[PLANE_TYPE_Y] =
+      use_angle_delta && av1_is_directional_mode(mbmi->mode)
+          ? read_angle_delta(r, ec_ctx->angle_delta_cdf[mbmi->mode - V_PRED])
+          : 0;
+  if (!cm->seq_params.monochrome && xd->is_chroma_ref) {
+    mbmi->uv_mode =
+        read_intra_mode_uv(ec_ctx, r, is_cfl_allowed(xd), mbmi->mode);
+    if (mbmi->uv_mode == UV_CFL_PRED) {
+      mbmi->cfl_alpha_idx =
+          read_cfl_alphas(xd->tile_ctx, r, &mbmi->cfl_alpha_signs);
+    }
+    mbmi->angle_delta[PLANE_TYPE_UV] =
+        use_angle_delta && av1_is_directional_mode(get_uv_mode(mbmi->uv_mode))
+            ? read_angle_delta(r,
+                               ec_ctx->angle_delta_cdf[mbmi->uv_mode - V_PRED])
+            : 0;
+  } else {
+    // Avoid decoding angle_info if there is is no chroma prediction
+    mbmi->uv_mode = UV_DC_PRED;
+  }
+  xd->cfl.store_y = store_cfl_required(cm, xd);
+
+  mbmi->palette_mode_info.palette_size[0] = 0;
+  mbmi->palette_mode_info.palette_size[1] = 0;
+  if (av1_allow_palette(cm->features.allow_screen_content_tools, bsize))
+    read_palette_mode_info(cm, xd, r);
+
+  read_filter_intra_mode_info(cm, xd, r);
+}
+
+static INLINE int is_mv_valid(const MV *mv) {
+  return mv->row > MV_LOW && mv->row < MV_UPP && mv->col > MV_LOW &&
+         mv->col < MV_UPP;
+}
+
+static INLINE int assign_mv(AV1_COMMON *cm, MACROBLOCKD *xd,
+                            PREDICTION_MODE mode,
+                            MV_REFERENCE_FRAME ref_frame[2], int_mv mv[2],
+                            int_mv ref_mv[2], int_mv nearest_mv[2],
+                            int_mv near_mv[2], int is_compound, int allow_hp,
+                            aom_reader *r) {
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  MB_MODE_INFO *mbmi = xd->mi[0];
+  BLOCK_SIZE bsize = mbmi->bsize;
+  FeatureFlags *const features = &cm->features;
+  if (features->cur_frame_force_integer_mv) {
+    allow_hp = MV_SUBPEL_NONE;
+  }
+  switch (mode) {
+    case NEWMV: {
+      nmv_context *const nmvc = &ec_ctx->nmvc;
+      read_mv(r, &mv[0].as_mv, &ref_mv[0].as_mv, nmvc, allow_hp);
+      break;
+    }
+    case NEARESTMV: {
+      mv[0].as_int = nearest_mv[0].as_int;
+      break;
+    }
+    case NEARMV: {
+      mv[0].as_int = near_mv[0].as_int;
+      break;
+    }
+    case GLOBALMV: {
+      mv[0].as_int = gm_get_motion_vector(&cm->global_motion[ref_frame[0]],
+                                          features->allow_high_precision_mv,
+                                          bsize, xd->mi_col, xd->mi_row,
+                                          features->cur_frame_force_integer_mv)
+                         .as_int;
+      break;
+    }
+    case NEW_NEWMV: {
+      assert(is_compound);
+      for (int i = 0; i < 2; ++i) {
+        nmv_context *const nmvc = &ec_ctx->nmvc;
+        read_mv(r, &mv[i].as_mv, &ref_mv[i].as_mv, nmvc, allow_hp);
+      }
+      break;
+    }
+    case NEAREST_NEARESTMV: {
+      assert(is_compound);
+      mv[0].as_int = nearest_mv[0].as_int;
+      mv[1].as_int = nearest_mv[1].as_int;
+      break;
+    }
+    case NEAR_NEARMV: {
+      assert(is_compound);
+      mv[0].as_int = near_mv[0].as_int;
+      mv[1].as_int = near_mv[1].as_int;
+      break;
+    }
+    case NEW_NEARESTMV: {
+      nmv_context *const nmvc = &ec_ctx->nmvc;
+      read_mv(r, &mv[0].as_mv, &ref_mv[0].as_mv, nmvc, allow_hp);
+      assert(is_compound);
+      mv[1].as_int = nearest_mv[1].as_int;
+      break;
+    }
+    case NEAREST_NEWMV: {
+      nmv_context *const nmvc = &ec_ctx->nmvc;
+      mv[0].as_int = nearest_mv[0].as_int;
+      read_mv(r, &mv[1].as_mv, &ref_mv[1].as_mv, nmvc, allow_hp);
+      assert(is_compound);
+      break;
+    }
+    case NEAR_NEWMV: {
+      nmv_context *const nmvc = &ec_ctx->nmvc;
+      mv[0].as_int = near_mv[0].as_int;
+      read_mv(r, &mv[1].as_mv, &ref_mv[1].as_mv, nmvc, allow_hp);
+      assert(is_compound);
+      break;
+    }
+    case NEW_NEARMV: {
+      nmv_context *const nmvc = &ec_ctx->nmvc;
+      read_mv(r, &mv[0].as_mv, &ref_mv[0].as_mv, nmvc, allow_hp);
+      assert(is_compound);
+      mv[1].as_int = near_mv[1].as_int;
+      break;
+    }
+    case GLOBAL_GLOBALMV: {
+      assert(is_compound);
+      mv[0].as_int = gm_get_motion_vector(&cm->global_motion[ref_frame[0]],
+                                          features->allow_high_precision_mv,
+                                          bsize, xd->mi_col, xd->mi_row,
+                                          features->cur_frame_force_integer_mv)
+                         .as_int;
+      mv[1].as_int = gm_get_motion_vector(&cm->global_motion[ref_frame[1]],
+                                          features->allow_high_precision_mv,
+                                          bsize, xd->mi_col, xd->mi_row,
+                                          features->cur_frame_force_integer_mv)
+                         .as_int;
+      break;
+    }
+    default: { return 0; }
+  }
+
+  int ret = is_mv_valid(&mv[0].as_mv);
+  if (is_compound) {
+    ret = ret && is_mv_valid(&mv[1].as_mv);
+  }
+  return ret;
+}
+
+static int read_is_inter_block(AV1_COMMON *const cm, MACROBLOCKD *const xd,
+                               int segment_id, aom_reader *r) {
+  if (segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {
+    const int frame = get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME);
+    if (frame < LAST_FRAME) return 0;
+    return frame != INTRA_FRAME;
+  }
+  if (segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV)) {
+    return 1;
+  }
+  const int ctx = av1_get_intra_inter_context(xd);
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  const int is_inter =
+      aom_read_symbol(r, ec_ctx->intra_inter_cdf[ctx], 2, ACCT_STR);
+  return is_inter;
+}
+
+#if DEC_MISMATCH_DEBUG
+static void dec_dump_logs(AV1_COMMON *cm, MB_MODE_INFO *const mbmi, int mi_row,
+                          int mi_col, int16_t mode_ctx) {
+  int_mv mv[2] = { { 0 } };
+  for (int ref = 0; ref < 1 + has_second_ref(mbmi); ++ref)
+    mv[ref].as_mv = mbmi->mv[ref].as_mv;
+
+  const int16_t newmv_ctx = mode_ctx & NEWMV_CTX_MASK;
+  int16_t zeromv_ctx = -1;
+  int16_t refmv_ctx = -1;
+  if (mbmi->mode != NEWMV) {
+    zeromv_ctx = (mode_ctx >> GLOBALMV_OFFSET) & GLOBALMV_CTX_MASK;
+    if (mbmi->mode != GLOBALMV)
+      refmv_ctx = (mode_ctx >> REFMV_OFFSET) & REFMV_CTX_MASK;
+  }
+
+#define FRAME_TO_CHECK 11
+  if (cm->current_frame.frame_number == FRAME_TO_CHECK && cm->show_frame == 1) {
+    printf(
+        "=== DECODER ===: "
+        "Frame=%d, (mi_row,mi_col)=(%d,%d), skip_mode=%d, mode=%d, bsize=%d, "
+        "show_frame=%d, mv[0]=(%d,%d), mv[1]=(%d,%d), ref[0]=%d, "
+        "ref[1]=%d, motion_mode=%d, mode_ctx=%d, "
+        "newmv_ctx=%d, zeromv_ctx=%d, refmv_ctx=%d, tx_size=%d\n",
+        cm->current_frame.frame_number, mi_row, mi_col, mbmi->skip_mode,
+        mbmi->mode, mbmi->sb_type, cm->show_frame, mv[0].as_mv.row,
+        mv[0].as_mv.col, mv[1].as_mv.row, mv[1].as_mv.col, mbmi->ref_frame[0],
+        mbmi->ref_frame[1], mbmi->motion_mode, mode_ctx, newmv_ctx, zeromv_ctx,
+        refmv_ctx, mbmi->tx_size);
+  }
+}
+#endif  // DEC_MISMATCH_DEBUG
+
+static void read_inter_block_mode_info(AV1Decoder *const pbi,
+                                       DecoderCodingBlock *dcb,
+                                       MB_MODE_INFO *const mbmi,
+                                       aom_reader *r) {
+  AV1_COMMON *const cm = &pbi->common;
+  FeatureFlags *const features = &cm->features;
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  const int allow_hp = features->allow_high_precision_mv;
+  int_mv nearestmv[2], nearmv[2];
+  int_mv ref_mvs[MODE_CTX_REF_FRAMES][MAX_MV_REF_CANDIDATES] = { { { 0 } } };
+  int16_t inter_mode_ctx[MODE_CTX_REF_FRAMES];
+  int pts[SAMPLES_ARRAY_SIZE], pts_inref[SAMPLES_ARRAY_SIZE];
+  MACROBLOCKD *const xd = &dcb->xd;
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+
+  mbmi->uv_mode = UV_DC_PRED;
+  mbmi->palette_mode_info.palette_size[0] = 0;
+  mbmi->palette_mode_info.palette_size[1] = 0;
+
+  av1_collect_neighbors_ref_counts(xd);
+
+  read_ref_frames(cm, xd, r, mbmi->segment_id, mbmi->ref_frame);
+  const int is_compound = has_second_ref(mbmi);
+
+  const MV_REFERENCE_FRAME ref_frame = av1_ref_frame_type(mbmi->ref_frame);
+  av1_find_mv_refs(cm, xd, mbmi, ref_frame, dcb->ref_mv_count, xd->ref_mv_stack,
+                   xd->weight, ref_mvs, /*global_mvs=*/NULL, inter_mode_ctx);
+
+  mbmi->ref_mv_idx = 0;
+
+  if (mbmi->skip_mode) {
+    assert(is_compound);
+    mbmi->mode = NEAREST_NEARESTMV;
+  } else {
+    if (segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP) ||
+        segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_GLOBALMV)) {
+      mbmi->mode = GLOBALMV;
+    } else {
+      const int mode_ctx =
+          av1_mode_context_analyzer(inter_mode_ctx, mbmi->ref_frame);
+      if (is_compound)
+        mbmi->mode = read_inter_compound_mode(xd, r, mode_ctx);
+      else
+        mbmi->mode = read_inter_mode(ec_ctx, r, mode_ctx);
+      if (mbmi->mode == NEWMV || mbmi->mode == NEW_NEWMV ||
+          have_nearmv_in_inter_mode(mbmi->mode))
+        read_drl_idx(ec_ctx, dcb, mbmi, r);
+    }
+  }
+
+  if (is_compound != is_inter_compound_mode(mbmi->mode)) {
+    aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
+                       "Prediction mode %d invalid with ref frame %d %d",
+                       mbmi->mode, mbmi->ref_frame[0], mbmi->ref_frame[1]);
+  }
+
+  if (!is_compound && mbmi->mode != GLOBALMV) {
+    av1_find_best_ref_mvs(allow_hp, ref_mvs[mbmi->ref_frame[0]], &nearestmv[0],
+                          &nearmv[0], features->cur_frame_force_integer_mv);
+  }
+
+  if (is_compound && mbmi->mode != GLOBAL_GLOBALMV) {
+    const int ref_mv_idx = mbmi->ref_mv_idx + 1;
+    nearestmv[0] = xd->ref_mv_stack[ref_frame][0].this_mv;
+    nearestmv[1] = xd->ref_mv_stack[ref_frame][0].comp_mv;
+    nearmv[0] = xd->ref_mv_stack[ref_frame][ref_mv_idx].this_mv;
+    nearmv[1] = xd->ref_mv_stack[ref_frame][ref_mv_idx].comp_mv;
+    lower_mv_precision(&nearestmv[0].as_mv, allow_hp,
+                       features->cur_frame_force_integer_mv);
+    lower_mv_precision(&nearestmv[1].as_mv, allow_hp,
+                       features->cur_frame_force_integer_mv);
+    lower_mv_precision(&nearmv[0].as_mv, allow_hp,
+                       features->cur_frame_force_integer_mv);
+    lower_mv_precision(&nearmv[1].as_mv, allow_hp,
+                       features->cur_frame_force_integer_mv);
+  } else if (mbmi->ref_mv_idx > 0 && mbmi->mode == NEARMV) {
+    nearmv[0] =
+        xd->ref_mv_stack[mbmi->ref_frame[0]][1 + mbmi->ref_mv_idx].this_mv;
+  }
+
+  int_mv ref_mv[2] = { nearestmv[0], nearestmv[1] };
+
+  if (is_compound) {
+    int ref_mv_idx = mbmi->ref_mv_idx;
+    // Special case: NEAR_NEWMV and NEW_NEARMV modes use
+    // 1 + mbmi->ref_mv_idx (like NEARMV) instead of
+    // mbmi->ref_mv_idx (like NEWMV)
+    if (mbmi->mode == NEAR_NEWMV || mbmi->mode == NEW_NEARMV)
+      ref_mv_idx = 1 + mbmi->ref_mv_idx;
+
+    // TODO(jingning, yunqing): Do we need a lower_mv_precision() call here?
+    if (compound_ref0_mode(mbmi->mode) == NEWMV)
+      ref_mv[0] = xd->ref_mv_stack[ref_frame][ref_mv_idx].this_mv;
+
+    if (compound_ref1_mode(mbmi->mode) == NEWMV)
+      ref_mv[1] = xd->ref_mv_stack[ref_frame][ref_mv_idx].comp_mv;
+  } else {
+    if (mbmi->mode == NEWMV) {
+      if (dcb->ref_mv_count[ref_frame] > 1)
+        ref_mv[0] = xd->ref_mv_stack[ref_frame][mbmi->ref_mv_idx].this_mv;
+    }
+  }
+
+  if (mbmi->skip_mode) assert(mbmi->mode == NEAREST_NEARESTMV);
+
+  const int mv_corrupted_flag =
+      !assign_mv(cm, xd, mbmi->mode, mbmi->ref_frame, mbmi->mv, ref_mv,
+                 nearestmv, nearmv, is_compound, allow_hp, r);
+  aom_merge_corrupted_flag(&dcb->corrupted, mv_corrupted_flag);
+
+  mbmi->use_wedge_interintra = 0;
+  if (cm->seq_params.enable_interintra_compound && !mbmi->skip_mode &&
+      is_interintra_allowed(mbmi)) {
+    const int bsize_group = size_group_lookup[bsize];
+    const int interintra =
+        aom_read_symbol(r, ec_ctx->interintra_cdf[bsize_group], 2, ACCT_STR);
+    assert(mbmi->ref_frame[1] == NONE_FRAME);
+    if (interintra) {
+      const INTERINTRA_MODE interintra_mode =
+          read_interintra_mode(xd, r, bsize_group);
+      mbmi->ref_frame[1] = INTRA_FRAME;
+      mbmi->interintra_mode = interintra_mode;
+      mbmi->angle_delta[PLANE_TYPE_Y] = 0;
+      mbmi->angle_delta[PLANE_TYPE_UV] = 0;
+      mbmi->filter_intra_mode_info.use_filter_intra = 0;
+      if (av1_is_wedge_used(bsize)) {
+        mbmi->use_wedge_interintra = aom_read_symbol(
+            r, ec_ctx->wedge_interintra_cdf[bsize], 2, ACCT_STR);
+        if (mbmi->use_wedge_interintra) {
+          mbmi->interintra_wedge_index = (int8_t)aom_read_symbol(
+              r, ec_ctx->wedge_idx_cdf[bsize], MAX_WEDGE_TYPES, ACCT_STR);
+        }
+      }
+    }
+  }
+
+  for (int ref = 0; ref < 1 + has_second_ref(mbmi); ++ref) {
+    const MV_REFERENCE_FRAME frame = mbmi->ref_frame[ref];
+    xd->block_ref_scale_factors[ref] = get_ref_scale_factors_const(cm, frame);
+  }
+
+  mbmi->motion_mode = SIMPLE_TRANSLATION;
+  if (is_motion_variation_allowed_bsize(mbmi->bsize) && !mbmi->skip_mode &&
+      !has_second_ref(mbmi)) {
+    mbmi->num_proj_ref = av1_findSamples(cm, xd, pts, pts_inref);
+  }
+  av1_count_overlappable_neighbors(cm, xd);
+
+  if (mbmi->ref_frame[1] != INTRA_FRAME)
+    mbmi->motion_mode = read_motion_mode(cm, xd, mbmi, r);
+
+  // init
+  mbmi->comp_group_idx = 0;
+  mbmi->compound_idx = 1;
+  mbmi->interinter_comp.type = COMPOUND_AVERAGE;
+
+  if (has_second_ref(mbmi) && !mbmi->skip_mode) {
+    // Read idx to indicate current compound inter prediction mode group
+    const int masked_compound_used = is_any_masked_compound_used(bsize) &&
+                                     cm->seq_params.enable_masked_compound;
+
+    if (masked_compound_used) {
+      const int ctx_comp_group_idx = get_comp_group_idx_context(xd);
+      mbmi->comp_group_idx = (uint8_t)aom_read_symbol(
+          r, ec_ctx->comp_group_idx_cdf[ctx_comp_group_idx], 2, ACCT_STR);
+    }
+
+    if (mbmi->comp_group_idx == 0) {
+      if (cm->seq_params.order_hint_info.enable_dist_wtd_comp) {
+        const int comp_index_ctx = get_comp_index_context(cm, xd);
+        mbmi->compound_idx = (uint8_t)aom_read_symbol(
+            r, ec_ctx->compound_index_cdf[comp_index_ctx], 2, ACCT_STR);
+        mbmi->interinter_comp.type =
+            mbmi->compound_idx ? COMPOUND_AVERAGE : COMPOUND_DISTWTD;
+      } else {
+        // Distance-weighted compound is disabled, so always use average
+        mbmi->compound_idx = 1;
+        mbmi->interinter_comp.type = COMPOUND_AVERAGE;
+      }
+    } else {
+      assert(cm->current_frame.reference_mode != SINGLE_REFERENCE &&
+             is_inter_compound_mode(mbmi->mode) &&
+             mbmi->motion_mode == SIMPLE_TRANSLATION);
+      assert(masked_compound_used);
+
+      // compound_diffwtd, wedge
+      if (is_interinter_compound_used(COMPOUND_WEDGE, bsize)) {
+        mbmi->interinter_comp.type =
+            COMPOUND_WEDGE + aom_read_symbol(r,
+                                             ec_ctx->compound_type_cdf[bsize],
+                                             MASKED_COMPOUND_TYPES, ACCT_STR);
+      } else {
+        mbmi->interinter_comp.type = COMPOUND_DIFFWTD;
+      }
+
+      if (mbmi->interinter_comp.type == COMPOUND_WEDGE) {
+        assert(is_interinter_compound_used(COMPOUND_WEDGE, bsize));
+        mbmi->interinter_comp.wedge_index = (int8_t)aom_read_symbol(
+            r, ec_ctx->wedge_idx_cdf[bsize], MAX_WEDGE_TYPES, ACCT_STR);
+        mbmi->interinter_comp.wedge_sign = (int8_t)aom_read_bit(r, ACCT_STR);
+      } else {
+        assert(mbmi->interinter_comp.type == COMPOUND_DIFFWTD);
+        mbmi->interinter_comp.mask_type =
+            aom_read_literal(r, MAX_DIFFWTD_MASK_BITS, ACCT_STR);
+      }
+    }
+  }
+
+  read_mb_interp_filter(xd, features->interp_filter,
+                        cm->seq_params.enable_dual_filter, mbmi, r);
+
+#if !CONFIG_REALTIME_ONLY
+  if (mbmi->motion_mode == WARPED_CAUSAL) {
+    const int mi_row = xd->mi_row;
+    const int mi_col = xd->mi_col;
+    mbmi->wm_params.wmtype = DEFAULT_WMTYPE;
+    mbmi->wm_params.invalid = 0;
+
+    if (mbmi->num_proj_ref > 1) {
+      mbmi->num_proj_ref = av1_selectSamples(&mbmi->mv[0].as_mv, pts, pts_inref,
+                                             mbmi->num_proj_ref, bsize);
+    }
+
+    if (av1_find_projection(mbmi->num_proj_ref, pts, pts_inref, bsize,
+                            mbmi->mv[0].as_mv.row, mbmi->mv[0].as_mv.col,
+                            &mbmi->wm_params, mi_row, mi_col)) {
+#if WARPED_MOTION_DEBUG
+      printf("Warning: unexpected warped model from aomenc\n");
+#endif
+      mbmi->wm_params.invalid = 1;
+    }
+  }
+#endif
+
+  xd->cfl.store_y = store_cfl_required(cm, xd);
+
+#if DEC_MISMATCH_DEBUG
+  dec_dump_logs(cm, mi, mi_row, mi_col, mode_ctx);
+#endif  // DEC_MISMATCH_DEBUG
+}
+
+static void read_inter_frame_mode_info(AV1Decoder *const pbi,
+                                       DecoderCodingBlock *dcb, aom_reader *r) {
+  AV1_COMMON *const cm = &pbi->common;
+  MACROBLOCKD *const xd = &dcb->xd;
+  MB_MODE_INFO *const mbmi = xd->mi[0];
+  int inter_block = 1;
+
+  mbmi->mv[0].as_int = 0;
+  mbmi->mv[1].as_int = 0;
+  mbmi->segment_id = read_inter_segment_id(cm, xd, 1, r);
+
+  mbmi->skip_mode = read_skip_mode(cm, xd, mbmi->segment_id, r);
+
+  if (mbmi->skip_mode)
+    mbmi->skip_txfm = 1;
+  else
+    mbmi->skip_txfm = read_skip_txfm(cm, xd, mbmi->segment_id, r);
+
+  if (!cm->seg.segid_preskip)
+    mbmi->segment_id = read_inter_segment_id(cm, xd, 0, r);
+
+  read_cdef(cm, r, xd);
+
+  read_delta_q_params(cm, xd, r);
+
+  if (!mbmi->skip_mode)
+    inter_block = read_is_inter_block(cm, xd, mbmi->segment_id, r);
+
+  mbmi->current_qindex = xd->current_base_qindex;
+
+  xd->above_txfm_context =
+      cm->above_contexts.txfm[xd->tile.tile_row] + xd->mi_col;
+  xd->left_txfm_context =
+      xd->left_txfm_context_buffer + (xd->mi_row & MAX_MIB_MASK);
+
+  if (inter_block)
+    read_inter_block_mode_info(pbi, dcb, mbmi, r);
+  else
+    read_intra_block_mode_info(cm, xd, mbmi, r);
+}
+
+static void intra_copy_frame_mvs(AV1_COMMON *const cm, int mi_row, int mi_col,
+                                 int x_mis, int y_mis) {
+  const int frame_mvs_stride = ROUND_POWER_OF_TWO(cm->mi_params.mi_cols, 1);
+  MV_REF *frame_mvs =
+      cm->cur_frame->mvs + (mi_row >> 1) * frame_mvs_stride + (mi_col >> 1);
+  x_mis = ROUND_POWER_OF_TWO(x_mis, 1);
+  y_mis = ROUND_POWER_OF_TWO(y_mis, 1);
+
+  for (int h = 0; h < y_mis; h++) {
+    MV_REF *mv = frame_mvs;
+    for (int w = 0; w < x_mis; w++) {
+      mv->ref_frame = NONE_FRAME;
+      mv++;
+    }
+    frame_mvs += frame_mvs_stride;
+  }
+}
+
+void av1_read_mode_info(AV1Decoder *const pbi, DecoderCodingBlock *dcb,
+                        aom_reader *r, int x_mis, int y_mis) {
+  AV1_COMMON *const cm = &pbi->common;
+  MACROBLOCKD *const xd = &dcb->xd;
+  MB_MODE_INFO *const mi = xd->mi[0];
+  mi->use_intrabc = 0;
+
+  if (frame_is_intra_only(cm)) {
+    read_intra_frame_mode_info(cm, dcb, r);
+    if (cm->seq_params.order_hint_info.enable_ref_frame_mvs)
+      intra_copy_frame_mvs(cm, xd->mi_row, xd->mi_col, x_mis, y_mis);
+  } else {
+    read_inter_frame_mode_info(pbi, dcb, r);
+    if (cm->seq_params.order_hint_info.enable_ref_frame_mvs)
+      av1_copy_frame_mvs(cm, mi, xd->mi_row, xd->mi_col, x_mis, y_mis);
+  }
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.h b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.h
new file mode 100644
index 0000000000..305d5d66ea
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_DECODER_DECODEMV_H_
+#define AOM_AV1_DECODER_DECODEMV_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void av1_read_mode_info(AV1Decoder *const pbi, DecoderCodingBlock *dcb,
+                        aom_reader *r, int x_mis, int y_mis);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+void av1_read_tx_type(const AV1_COMMON *const cm, MACROBLOCKD *xd, int blk_row,
+                      int blk_col, TX_SIZE tx_size, aom_reader *r);
+
+#endif  // AOM_AV1_DECODER_DECODEMV_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.c b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.c
new file mode 100644
index 0000000000..4a43013711
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.c
@@ -0,0 +1,543 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/system_state.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_once.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/aom_timer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/aom_scale.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/alloccommon.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_loopfilter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconinter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/reconintra.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.h"
+
+static void initialize_dec(void) {
+  av1_rtcd();
+  aom_dsp_rtcd();
+  aom_scale_rtcd();
+  av1_init_intra_predictors();
+  av1_init_wedge_masks();
+}
+
+static void dec_set_mb_mi(CommonModeInfoParams *mi_params, int width,
+                          int height) {
+  // Ensure that the decoded width and height are both multiples of
+  // 8 luma pixels (note: this may only be a multiple of 4 chroma pixels if
+  // subsampling is used).
+  // This simplifies the implementation of various experiments,
+  // eg. cdef, which operates on units of 8x8 luma pixels.
+  const int aligned_width = ALIGN_POWER_OF_TWO(width, 3);
+  const int aligned_height = ALIGN_POWER_OF_TWO(height, 3);
+
+  mi_params->mi_cols = aligned_width >> MI_SIZE_LOG2;
+  mi_params->mi_rows = aligned_height >> MI_SIZE_LOG2;
+  mi_params->mi_stride = calc_mi_size(mi_params->mi_cols);
+
+  mi_params->mb_cols = (mi_params->mi_cols + 2) >> 2;
+  mi_params->mb_rows = (mi_params->mi_rows + 2) >> 2;
+  mi_params->MBs = mi_params->mb_rows * mi_params->mb_cols;
+
+  mi_params->mi_alloc_bsize = BLOCK_4X4;
+  mi_params->mi_alloc_stride = mi_params->mi_stride;
+
+  assert(mi_size_wide[mi_params->mi_alloc_bsize] ==
+         mi_size_high[mi_params->mi_alloc_bsize]);
+
+#if CONFIG_LPF_MASK
+  av1_alloc_loop_filter_mask(mi_params);
+#endif
+}
+
+static void dec_setup_mi(CommonModeInfoParams *mi_params) {
+  const int mi_grid_size =
+      mi_params->mi_stride * calc_mi_size(mi_params->mi_rows);
+  memset(mi_params->mi_grid_base, 0,
+         mi_grid_size * sizeof(*mi_params->mi_grid_base));
+}
+
+static void dec_free_mi(CommonModeInfoParams *mi_params) {
+  aom_free(mi_params->mi_alloc);
+  mi_params->mi_alloc = NULL;
+  aom_free(mi_params->mi_grid_base);
+  mi_params->mi_grid_base = NULL;
+  mi_params->mi_alloc_size = 0;
+  aom_free(mi_params->tx_type_map);
+  mi_params->tx_type_map = NULL;
+}
+
+AV1Decoder *av1_decoder_create(BufferPool *const pool) {
+  AV1Decoder *volatile const pbi = aom_memalign(32, sizeof(*pbi));
+  if (!pbi) return NULL;
+  av1_zero(*pbi);
+
+  AV1_COMMON *volatile const cm = &pbi->common;
+
+  // The jmp_buf is valid only for the duration of the function that calls
+  // setjmp(). Therefore, this function must reset the 'setjmp' field to 0
+  // before it returns.
+  if (setjmp(cm->error.jmp)) {
+    cm->error.setjmp = 0;
+    av1_decoder_remove(pbi);
+    return NULL;
+  }
+
+  cm->error.setjmp = 1;
+
+  CHECK_MEM_ERROR(cm, cm->fc,
+                  (FRAME_CONTEXT *)aom_memalign(32, sizeof(*cm->fc)));
+  CHECK_MEM_ERROR(
+      cm, cm->default_frame_context,
+      (FRAME_CONTEXT *)aom_memalign(32, sizeof(*cm->default_frame_context)));
+  memset(cm->fc, 0, sizeof(*cm->fc));
+  memset(cm->default_frame_context, 0, sizeof(*cm->default_frame_context));
+
+  pbi->need_resync = 1;
+  aom_once(initialize_dec);
+
+  // Initialize the references to not point to any frame buffers.
+  for (int i = 0; i < REF_FRAMES; i++) {
+    cm->ref_frame_map[i] = NULL;
+  }
+
+  cm->current_frame.frame_number = 0;
+  pbi->decoding_first_frame = 1;
+  pbi->common.buffer_pool = pool;
+
+  cm->seq_params.bit_depth = AOM_BITS_8;
+
+  cm->mi_params.free_mi = dec_free_mi;
+  cm->mi_params.setup_mi = dec_setup_mi;
+  cm->mi_params.set_mb_mi = dec_set_mb_mi;
+
+  av1_loop_filter_init(cm);
+
+  av1_qm_init(&cm->quant_params, av1_num_planes(cm));
+#if !CONFIG_REALTIME_ONLY
+  av1_loop_restoration_precal();
+#endif
+#if CONFIG_ACCOUNTING
+  pbi->acct_enabled = 1;
+  aom_accounting_init(&pbi->accounting);
+#endif
+
+  cm->error.setjmp = 0;
+
+  aom_get_worker_interface()->init(&pbi->lf_worker);
+  pbi->lf_worker.thread_name = "aom lf worker";
+
+  return pbi;
+}
+
+void av1_dealloc_dec_jobs(struct AV1DecTileMTData *tile_mt_info) {
+  if (tile_mt_info != NULL) {
+#if CONFIG_MULTITHREAD
+    if (tile_mt_info->job_mutex != NULL) {
+      pthread_mutex_destroy(tile_mt_info->job_mutex);
+      aom_free(tile_mt_info->job_mutex);
+    }
+#endif
+    aom_free(tile_mt_info->job_queue);
+    // clear the structure as the source of this call may be a resize in which
+    // case this call will be followed by an _alloc() which may fail.
+    av1_zero(*tile_mt_info);
+  }
+}
+
+void av1_dec_free_cb_buf(AV1Decoder *pbi) {
+  aom_free(pbi->cb_buffer_base);
+  pbi->cb_buffer_base = NULL;
+  pbi->cb_buffer_alloc_size = 0;
+}
+
+void av1_decoder_remove(AV1Decoder *pbi) {
+  int i;
+
+  if (!pbi) return;
+
+  // Free the tile list output buffer.
+  aom_free_frame_buffer(&pbi->tile_list_outbuf);
+
+  aom_get_worker_interface()->end(&pbi->lf_worker);
+  aom_free(pbi->lf_worker.data1);
+
+  if (pbi->thread_data) {
+    for (int worker_idx = 1; worker_idx < pbi->max_threads; worker_idx++) {
+      DecWorkerData *const thread_data = pbi->thread_data + worker_idx;
+      av1_free_mc_tmp_buf(thread_data->td);
+      aom_free(thread_data->td);
+    }
+    aom_free(pbi->thread_data);
+  }
+
+  for (i = 0; i < pbi->num_workers; ++i) {
+    AVxWorker *const worker = &pbi->tile_workers[i];
+    aom_get_worker_interface()->end(worker);
+  }
+#if CONFIG_MULTITHREAD
+  if (pbi->row_mt_mutex_ != NULL) {
+    pthread_mutex_destroy(pbi->row_mt_mutex_);
+    aom_free(pbi->row_mt_mutex_);
+  }
+  if (pbi->row_mt_cond_ != NULL) {
+    pthread_cond_destroy(pbi->row_mt_cond_);
+    aom_free(pbi->row_mt_cond_);
+  }
+#endif
+  for (i = 0; i < pbi->allocated_tiles; i++) {
+    TileDataDec *const tile_data = pbi->tile_data + i;
+    av1_dec_row_mt_dealloc(&tile_data->dec_row_mt_sync);
+  }
+  aom_free(pbi->tile_data);
+  aom_free(pbi->tile_workers);
+
+  if (pbi->num_workers > 0) {
+    av1_loop_filter_dealloc(&pbi->lf_row_sync);
+#if !CONFIG_REALTIME_ONLY
+    av1_loop_restoration_dealloc(&pbi->lr_row_sync, pbi->num_workers);
+#endif
+    av1_dealloc_dec_jobs(&pbi->tile_mt_info);
+  }
+
+  av1_dec_free_cb_buf(pbi);
+#if CONFIG_ACCOUNTING
+  aom_accounting_clear(&pbi->accounting);
+#endif
+  av1_free_mc_tmp_buf(&pbi->td);
+  aom_img_metadata_array_free(pbi->metadata);
+  aom_free(pbi);
+}
+
+void av1_visit_palette(AV1Decoder *const pbi, MACROBLOCKD *const xd,
+                       aom_reader *r, palette_visitor_fn_t visit) {
+  if (!is_inter_block(xd->mi[0])) {
+    for (int plane = 0; plane < AOMMIN(2, av1_num_planes(&pbi->common));
+         ++plane) {
+      if (plane == 0 || xd->is_chroma_ref) {
+        if (xd->mi[0]->palette_mode_info.palette_size[plane])
+          visit(xd, plane, r);
+      } else {
+        assert(xd->mi[0]->palette_mode_info.palette_size[plane] == 0);
+      }
+    }
+  }
+}
+
+static int equal_dimensions(const YV12_BUFFER_CONFIG *a,
+                            const YV12_BUFFER_CONFIG *b) {
+  return a->y_height == b->y_height && a->y_width == b->y_width &&
+         a->uv_height == b->uv_height && a->uv_width == b->uv_width;
+}
+
+aom_codec_err_t av1_copy_reference_dec(AV1Decoder *pbi, int idx,
+                                       YV12_BUFFER_CONFIG *sd) {
+  AV1_COMMON *cm = &pbi->common;
+  const int num_planes = av1_num_planes(cm);
+
+  const YV12_BUFFER_CONFIG *const cfg = get_ref_frame(cm, idx);
+  if (cfg == NULL) {
+    aom_internal_error(&cm->error, AOM_CODEC_ERROR, "No reference frame");
+    return AOM_CODEC_ERROR;
+  }
+  if (!equal_dimensions(cfg, sd))
+    aom_internal_error(&cm->error, AOM_CODEC_ERROR,
+                       "Incorrect buffer dimensions");
+  else
+    aom_yv12_copy_frame(cfg, sd, num_planes);
+
+  return cm->error.error_code;
+}
+
+static int equal_dimensions_and_border(const YV12_BUFFER_CONFIG *a,
+                                       const YV12_BUFFER_CONFIG *b) {
+  return a->y_height == b->y_height && a->y_width == b->y_width &&
+         a->uv_height == b->uv_height && a->uv_width == b->uv_width &&
+         a->y_stride == b->y_stride && a->uv_stride == b->uv_stride &&
+         a->border == b->border &&
+         (a->flags & YV12_FLAG_HIGHBITDEPTH) ==
+             (b->flags & YV12_FLAG_HIGHBITDEPTH);
+}
+
+aom_codec_err_t av1_set_reference_dec(AV1_COMMON *cm, int idx,
+                                      int use_external_ref,
+                                      YV12_BUFFER_CONFIG *sd) {
+  const int num_planes = av1_num_planes(cm);
+  YV12_BUFFER_CONFIG *ref_buf = NULL;
+
+  // Get the destination reference buffer.
+  ref_buf = get_ref_frame(cm, idx);
+
+  if (ref_buf == NULL) {
+    aom_internal_error(&cm->error, AOM_CODEC_ERROR, "No reference frame");
+    return AOM_CODEC_ERROR;
+  }
+
+  if (!use_external_ref) {
+    if (!equal_dimensions(ref_buf, sd)) {
+      aom_internal_error(&cm->error, AOM_CODEC_ERROR,
+                         "Incorrect buffer dimensions");
+    } else {
+      // Overwrite the reference frame buffer.
+      aom_yv12_copy_frame(sd, ref_buf, num_planes);
+    }
+  } else {
+    if (!equal_dimensions_and_border(ref_buf, sd)) {
+      aom_internal_error(&cm->error, AOM_CODEC_ERROR,
+                         "Incorrect buffer dimensions");
+    } else {
+      // Overwrite the reference frame buffer pointers.
+      // Once we no longer need the external reference buffer, these pointers
+      // are restored.
+      ref_buf->store_buf_adr[0] = ref_buf->y_buffer;
+      ref_buf->store_buf_adr[1] = ref_buf->u_buffer;
+      ref_buf->store_buf_adr[2] = ref_buf->v_buffer;
+      ref_buf->y_buffer = sd->y_buffer;
+      ref_buf->u_buffer = sd->u_buffer;
+      ref_buf->v_buffer = sd->v_buffer;
+      ref_buf->use_external_reference_buffers = 1;
+    }
+  }
+
+  return cm->error.error_code;
+}
+
+aom_codec_err_t av1_copy_new_frame_dec(AV1_COMMON *cm,
+                                       YV12_BUFFER_CONFIG *new_frame,
+                                       YV12_BUFFER_CONFIG *sd) {
+  const int num_planes = av1_num_planes(cm);
+
+  if (!equal_dimensions_and_border(new_frame, sd))
+    aom_internal_error(&cm->error, AOM_CODEC_ERROR,
+                       "Incorrect buffer dimensions");
+  else
+    aom_yv12_copy_frame(new_frame, sd, num_planes);
+
+  return cm->error.error_code;
+}
+
+static void release_current_frame(AV1Decoder *pbi) {
+  AV1_COMMON *const cm = &pbi->common;
+  BufferPool *const pool = cm->buffer_pool;
+
+  cm->cur_frame->buf.corrupted = 1;
+  lock_buffer_pool(pool);
+  decrease_ref_count(cm->cur_frame, pool);
+  unlock_buffer_pool(pool);
+  cm->cur_frame = NULL;
+}
+
+// If any buffer updating is signaled it should be done here.
+// Consumes a reference to cm->cur_frame.
+//
+// This functions returns void. It reports failure by setting
+// cm->error.error_code.
+static void update_frame_buffers(AV1Decoder *pbi, int frame_decoded) {
+  int ref_index = 0, mask;
+  AV1_COMMON *const cm = &pbi->common;
+  BufferPool *const pool = cm->buffer_pool;
+
+  if (frame_decoded) {
+    lock_buffer_pool(pool);
+
+    // In ext-tile decoding, the camera frame header is only decoded once. So,
+    // we don't update the references here.
+    if (!pbi->camera_frame_header_ready) {
+      // The following for loop needs to release the reference stored in
+      // cm->ref_frame_map[ref_index] before storing a reference to
+      // cm->cur_frame in cm->ref_frame_map[ref_index].
+      for (mask = cm->current_frame.refresh_frame_flags; mask; mask >>= 1) {
+        if (mask & 1) {
+          decrease_ref_count(cm->ref_frame_map[ref_index], pool);
+          cm->ref_frame_map[ref_index] = cm->cur_frame;
+          ++cm->cur_frame->ref_count;
+        }
+        ++ref_index;
+      }
+    }
+
+    if (cm->show_existing_frame || cm->show_frame) {
+      if (pbi->output_all_layers) {
+        // Append this frame to the output queue
+        if (pbi->num_output_frames >= MAX_NUM_SPATIAL_LAYERS) {
+          // We can't store the new frame anywhere, so drop it and return an
+          // error
+          cm->cur_frame->buf.corrupted = 1;
+          decrease_ref_count(cm->cur_frame, pool);
+          cm->error.error_code = AOM_CODEC_UNSUP_BITSTREAM;
+        } else {
+          pbi->output_frames[pbi->num_output_frames] = cm->cur_frame;
+          pbi->num_output_frames++;
+        }
+      } else {
+        // Replace any existing output frame
+        assert(pbi->num_output_frames == 0 || pbi->num_output_frames == 1);
+        if (pbi->num_output_frames > 0) {
+          decrease_ref_count(pbi->output_frames[0], pool);
+        }
+        pbi->output_frames[0] = cm->cur_frame;
+        pbi->num_output_frames = 1;
+      }
+    } else {
+      decrease_ref_count(cm->cur_frame, pool);
+    }
+
+    unlock_buffer_pool(pool);
+  } else {
+    // Nothing was decoded, so just drop this frame buffer
+    lock_buffer_pool(pool);
+    decrease_ref_count(cm->cur_frame, pool);
+    unlock_buffer_pool(pool);
+  }
+  cm->cur_frame = NULL;
+
+  if (!pbi->camera_frame_header_ready) {
+    // Invalidate these references until the next frame starts.
+    for (ref_index = 0; ref_index < INTER_REFS_PER_FRAME; ref_index++) {
+      cm->remapped_ref_idx[ref_index] = INVALID_IDX;
+    }
+  }
+}
+
+int av1_receive_compressed_data(AV1Decoder *pbi, size_t size,
+                                const uint8_t **psource) {
+  AV1_COMMON *volatile const cm = &pbi->common;
+  const uint8_t *source = *psource;
+  cm->error.error_code = AOM_CODEC_OK;
+  cm->error.has_detail = 0;
+
+  if (size == 0) {
+    // This is used to signal that we are missing frames.
+    // We do not know if the missing frame(s) was supposed to update
+    // any of the reference buffers, but we act conservative and
+    // mark only the last buffer as corrupted.
+    //
+    // TODO(jkoleszar): Error concealment is undefined and non-normative
+    // at this point, but if it becomes so, [0] may not always be the correct
+    // thing to do here.
+    RefCntBuffer *ref_buf = get_ref_frame_buf(cm, LAST_FRAME);
+    if (ref_buf != NULL) ref_buf->buf.corrupted = 1;
+  }
+
+  if (assign_cur_frame_new_fb(cm) == NULL) {
+    cm->error.error_code = AOM_CODEC_MEM_ERROR;
+    return 1;
+  }
+
+  // The jmp_buf is valid only for the duration of the function that calls
+  // setjmp(). Therefore, this function must reset the 'setjmp' field to 0
+  // before it returns.
+  if (setjmp(cm->error.jmp)) {
+    const AVxWorkerInterface *const winterface = aom_get_worker_interface();
+    int i;
+
+    cm->error.setjmp = 0;
+
+    // Synchronize all threads immediately as a subsequent decode call may
+    // cause a resize invalidating some allocations.
+    winterface->sync(&pbi->lf_worker);
+    for (i = 0; i < pbi->num_workers; ++i) {
+      winterface->sync(&pbi->tile_workers[i]);
+    }
+
+    release_current_frame(pbi);
+    aom_clear_system_state();
+    return -1;
+  }
+
+  cm->error.setjmp = 1;
+
+  int frame_decoded =
+      aom_decode_frame_from_obus(pbi, source, source + size, psource);
+
+  if (frame_decoded < 0) {
+    assert(cm->error.error_code != AOM_CODEC_OK);
+    release_current_frame(pbi);
+    cm->error.setjmp = 0;
+    return 1;
+  }
+
+#if TXCOEFF_TIMER
+  cm->cum_txcoeff_timer += cm->txcoeff_timer;
+  fprintf(stderr,
+          "txb coeff block number: %d, frame time: %ld, cum time %ld in us\n",
+          cm->txb_count, cm->txcoeff_timer, cm->cum_txcoeff_timer);
+  cm->txcoeff_timer = 0;
+  cm->txb_count = 0;
+#endif
+
+  // Note: At this point, this function holds a reference to cm->cur_frame
+  // in the buffer pool. This reference is consumed by update_frame_buffers().
+  update_frame_buffers(pbi, frame_decoded);
+
+  if (frame_decoded) {
+    pbi->decoding_first_frame = 0;
+  }
+
+  if (cm->error.error_code != AOM_CODEC_OK) {
+    cm->error.setjmp = 0;
+    return 1;
+  }
+
+  aom_clear_system_state();
+
+  if (!cm->show_existing_frame) {
+    if (cm->seg.enabled) {
+      if (cm->prev_frame &&
+          (cm->mi_params.mi_rows == cm->prev_frame->mi_rows) &&
+          (cm->mi_params.mi_cols == cm->prev_frame->mi_cols)) {
+        cm->last_frame_seg_map = cm->prev_frame->seg_map;
+      } else {
+        cm->last_frame_seg_map = NULL;
+      }
+    }
+  }
+
+  // Update progress in frame parallel decode.
+  cm->error.setjmp = 0;
+
+  return 0;
+}
+
+// Get the frame at a particular index in the output queue
+int av1_get_raw_frame(AV1Decoder *pbi, size_t index, YV12_BUFFER_CONFIG **sd,
+                      aom_film_grain_t **grain_params) {
+  if (index >= pbi->num_output_frames) return -1;
+  *sd = &pbi->output_frames[index]->buf;
+  *grain_params = &pbi->output_frames[index]->film_grain_params;
+  aom_clear_system_state();
+  return 0;
+}
+
+// Get the highest-spatial-layer output
+// TODO(david.barker): What should this do?
+int av1_get_frame_to_show(AV1Decoder *pbi, YV12_BUFFER_CONFIG *frame) {
+  if (pbi->num_output_frames == 0) return -1;
+
+  *frame = pbi->output_frames[pbi->num_output_frames - 1]->buf;
+  return 0;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h
new file mode 100644
index 0000000000..ac7b3d255e
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h
@@ -0,0 +1,413 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_DECODER_DECODER_H_
+#define AOM_AV1_DECODER_DECODER_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_scale/yv12config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_common_int.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/thread_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/dthread.h"
+#if CONFIG_ACCOUNTING
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/accounting.h"
+#endif
+#if CONFIG_INSPECTION
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/inspection.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * \brief Contains coding block data required by the decoder.
+ *
+ * This includes:
+ * - Coding block info that is common between encoder and decoder.
+ * - Other coding block info only needed by the decoder.
+ * Contrast this with a similar struct MACROBLOCK on encoder side.
+ * This data is also common between ThreadData and AV1Decoder structs.
+ */
+typedef struct DecoderCodingBlock {
+  /*!
+   * Coding block info that is common between encoder and decoder.
+   */
+  DECLARE_ALIGNED(32, MACROBLOCKD, xd);
+  /*!
+   * True if the at least one of the coding blocks decoded was corrupted.
+   */
+  int corrupted;
+  /*!
+   * Pointer to 'mc_buf' inside 'pbi->td' (single-threaded decoding) or
+   * 'pbi->thread_data[i].td' (multi-threaded decoding).
+   */
+  uint8_t *mc_buf[2];
+  /*!
+   * Pointer to 'dqcoeff' inside 'td->cb_buffer_base' or 'pbi->cb_buffer_base'
+   * with appropriate offset for the current superblock, for each plane.
+   */
+  tran_low_t *dqcoeff_block[MAX_MB_PLANE];
+  /*!
+   * cb_offset[p] is the offset into the dqcoeff_block[p] for the current coding
+   * block, for each plane 'p'.
+   */
+  uint16_t cb_offset[MAX_MB_PLANE];
+  /*!
+   * Pointer to 'eob_data' inside 'td->cb_buffer_base' or 'pbi->cb_buffer_base'
+   * with appropriate offset for the current superblock, for each plane.
+   */
+  eob_info *eob_data[MAX_MB_PLANE];
+  /*!
+   * txb_offset[p] is the offset into the eob_data[p] for the current coding
+   * block, for each plane 'p'.
+   */
+  uint16_t txb_offset[MAX_MB_PLANE];
+  /*!
+   * ref_mv_count[i] specifies the number of number of motion vector candidates
+   * in xd->ref_mv_stack[i].
+   */
+  uint8_t ref_mv_count[MODE_CTX_REF_FRAMES];
+} DecoderCodingBlock;
+
+/*!\cond */
+
+typedef void (*decode_block_visitor_fn_t)(const AV1_COMMON *const cm,
+                                          DecoderCodingBlock *dcb,
+                                          aom_reader *const r, const int plane,
+                                          const int row, const int col,
+                                          const TX_SIZE tx_size);
+
+typedef void (*predict_inter_block_visitor_fn_t)(AV1_COMMON *const cm,
+                                                 DecoderCodingBlock *dcb,
+                                                 BLOCK_SIZE bsize);
+
+typedef void (*cfl_store_inter_block_visitor_fn_t)(AV1_COMMON *const cm,
+                                                   MACROBLOCKD *const xd);
+
+typedef struct ThreadData {
+  DecoderCodingBlock dcb;
+
+  // Coding block buffer for the current superblock.
+  // Used only for single-threaded decoding and multi-threaded decoding with
+  // row_mt == 1 cases.
+  // See also: similar buffer in 'AV1Decoder'.
+  CB_BUFFER cb_buffer_base;
+
+  aom_reader *bit_reader;
+
+  // Motion compensation buffer used to get a prediction buffer with extended
+  // borders. One buffer for each of the two possible references.
+  uint8_t *mc_buf[2];
+  // Allocated size of 'mc_buf'.
+  int32_t mc_buf_size;
+  // If true, the pointers in 'mc_buf' were converted from highbd pointers.
+  int mc_buf_use_highbd;  // Boolean: whether the byte pointers stored in
+                          // mc_buf were converted from highbd pointers.
+
+  CONV_BUF_TYPE *tmp_conv_dst;
+  uint8_t *tmp_obmc_bufs[2];
+
+  decode_block_visitor_fn_t read_coeffs_tx_intra_block_visit;
+  decode_block_visitor_fn_t predict_and_recon_intra_block_visit;
+  decode_block_visitor_fn_t read_coeffs_tx_inter_block_visit;
+  decode_block_visitor_fn_t inverse_tx_inter_block_visit;
+  predict_inter_block_visitor_fn_t predict_inter_block_visit;
+  cfl_store_inter_block_visitor_fn_t cfl_store_inter_block_visit;
+} ThreadData;
+
+typedef struct AV1DecRowMTJobInfo {
+  int tile_row;
+  int tile_col;
+  int mi_row;
+} AV1DecRowMTJobInfo;
+
+typedef struct AV1DecRowMTSyncData {
+#if CONFIG_MULTITHREAD
+  pthread_mutex_t *mutex_;
+  pthread_cond_t *cond_;
+#endif
+  int allocated_sb_rows;
+  int *cur_sb_col;
+  int sync_range;
+  int mi_rows;
+  int mi_cols;
+  int mi_rows_parse_done;
+  int mi_rows_decode_started;
+  int num_threads_working;
+} AV1DecRowMTSync;
+
+typedef struct AV1DecRowMTInfo {
+  int tile_rows_start;
+  int tile_rows_end;
+  int tile_cols_start;
+  int tile_cols_end;
+  int start_tile;
+  int end_tile;
+  int mi_rows_to_decode;
+
+  // Invariant:
+  //   mi_rows_parse_done >= mi_rows_decode_started.
+  // mi_rows_parse_done and mi_rows_decode_started are both initialized to 0.
+  // mi_rows_parse_done is incremented freely. mi_rows_decode_started may only
+  // be incremented to catch up with mi_rows_parse_done but is not allowed to
+  // surpass mi_rows_parse_done.
+  //
+  // When mi_rows_decode_started reaches mi_rows_to_decode, there are no more
+  // decode jobs.
+
+  // Indicates the progress of the bit-stream parsing of superblocks.
+  // Initialized to 0. Incremented by sb_mi_size when parse sb row is done.
+  int mi_rows_parse_done;
+  // Indicates the progress of the decoding of superblocks.
+  // Initialized to 0. Incremented by sb_mi_size when decode sb row is started.
+  int mi_rows_decode_started;
+  // Boolean: Initialized to 0 (false). Set to 1 (true) on error to abort
+  // decoding.
+  int row_mt_exit;
+} AV1DecRowMTInfo;
+
+typedef struct TileDataDec {
+  TileInfo tile_info;
+  aom_reader bit_reader;
+  DECLARE_ALIGNED(16, FRAME_CONTEXT, tctx);
+  AV1DecRowMTSync dec_row_mt_sync;
+} TileDataDec;
+
+typedef struct TileBufferDec {
+  const uint8_t *data;
+  size_t size;
+} TileBufferDec;
+
+typedef struct DataBuffer {
+  const uint8_t *data;
+  size_t size;
+} DataBuffer;
+
+typedef struct EXTERNAL_REFERENCES {
+  YV12_BUFFER_CONFIG refs[MAX_EXTERNAL_REFERENCES];
+  int num;
+} EXTERNAL_REFERENCES;
+
+typedef struct TileJobsDec {
+  TileBufferDec *tile_buffer;
+  TileDataDec *tile_data;
+} TileJobsDec;
+
+typedef struct AV1DecTileMTData {
+#if CONFIG_MULTITHREAD
+  pthread_mutex_t *job_mutex;
+#endif
+  TileJobsDec *job_queue;
+  int jobs_enqueued;
+  int jobs_dequeued;
+  int alloc_tile_rows;
+  int alloc_tile_cols;
+} AV1DecTileMT;
+
+typedef struct AV1Decoder {
+  DecoderCodingBlock dcb;
+
+  DECLARE_ALIGNED(32, AV1_COMMON, common);
+
+  AVxWorker lf_worker;
+  AV1LfSync lf_row_sync;
+  AV1LrSync lr_row_sync;
+  AV1LrStruct lr_ctxt;
+  AVxWorker *tile_workers;
+  int num_workers;
+  DecWorkerData *thread_data;
+  ThreadData td;
+  TileDataDec *tile_data;
+  int allocated_tiles;
+
+  TileBufferDec tile_buffers[MAX_TILE_ROWS][MAX_TILE_COLS];
+  AV1DecTileMT tile_mt_info;
+
+  // Each time the decoder is called, we expect to receive a full temporal unit.
+  // This can contain up to one shown frame per spatial layer in the current
+  // operating point (note that some layers may be entirely omitted).
+  // If the 'output_all_layers' option is true, we save all of these shown
+  // frames so that they can be returned to the application. If the
+  // 'output_all_layers' option is false, then we only output one image per
+  // temporal unit.
+  //
+  // Note: The saved buffers are released at the start of the next time the
+  // application calls aom_codec_decode().
+  int output_all_layers;
+  RefCntBuffer *output_frames[MAX_NUM_SPATIAL_LAYERS];
+  size_t num_output_frames;  // How many frames are queued up so far?
+
+  // In order to properly support random-access decoding, we need
+  // to behave slightly differently for the very first frame we decode.
+  // So we track whether this is the first frame or not.
+  int decoding_first_frame;
+
+  int allow_lowbitdepth;
+  int max_threads;
+  int inv_tile_order;
+  int need_resync;  // wait for key/intra-only frame.
+  int reset_decoder_state;
+
+  int tile_size_bytes;
+  int tile_col_size_bytes;
+  int dec_tile_row, dec_tile_col;  // always -1 for non-VR tile encoding
+#if CONFIG_ACCOUNTING
+  int acct_enabled;
+  Accounting accounting;
+#endif
+  int sequence_header_ready;
+  int sequence_header_changed;
+#if CONFIG_INSPECTION
+  aom_inspect_cb inspect_cb;
+  void *inspect_ctx;
+#endif
+  int operating_point;
+  int current_operating_point;
+  int seen_frame_header;
+  // The expected start_tile (tg_start syntax element) of the next tile group.
+  int next_start_tile;
+
+  // State if the camera frame header is already decoded while
+  // large_scale_tile = 1.
+  int camera_frame_header_ready;
+  size_t frame_header_size;
+  DataBuffer obu_size_hdr;
+  int output_frame_width_in_tiles_minus_1;
+  int output_frame_height_in_tiles_minus_1;
+  int tile_count_minus_1;
+  uint32_t coded_tile_data_size;
+  unsigned int ext_tile_debug;  // for ext-tile software debug & testing
+
+  // Decoder has 3 modes of operation:
+  // (1) Single-threaded decoding.
+  // (2) Multi-threaded decoding with each tile decoded in parallel.
+  // (3) In addition to (2), each thread decodes 1 superblock row in parallel.
+  // row_mt = 1 triggers mode (3) above, while row_mt = 0, will trigger mode (1)
+  // or (2) depending on 'max_threads'.
+  unsigned int row_mt;
+
+  EXTERNAL_REFERENCES ext_refs;
+  YV12_BUFFER_CONFIG tile_list_outbuf;
+
+  // Coding block buffer for the current frame.
+  // Allocated and used only for multi-threaded decoding with 'row_mt == 0'.
+  // See also: similar buffer in 'ThreadData' struct.
+  CB_BUFFER *cb_buffer_base;
+  // Allocated size of 'cb_buffer_base'. Currently same as the number of
+  // superblocks in the coded frame.
+  int cb_buffer_alloc_size;
+
+  int allocated_row_mt_sync_rows;
+
+#if CONFIG_MULTITHREAD
+  pthread_mutex_t *row_mt_mutex_;
+  pthread_cond_t *row_mt_cond_;
+#endif
+
+  AV1DecRowMTInfo frame_row_mt_info;
+  aom_metadata_array_t *metadata;
+
+  int context_update_tile_id;
+  int skip_loop_filter;
+  int skip_film_grain;
+  int is_annexb;
+  int valid_for_referencing[REF_FRAMES];
+  int is_fwd_kf_present;
+  int is_arf_frame_present;
+  int num_tile_groups;
+  aom_s_frame_info sframe_info;
+} AV1Decoder;
+
+// Returns 0 on success. Sets pbi->common.error.error_code to a nonzero error
+// code and returns a nonzero value on failure.
+int av1_receive_compressed_data(struct AV1Decoder *pbi, size_t size,
+                                const uint8_t **psource);
+
+// Get the frame at a particular index in the output queue
+int av1_get_raw_frame(AV1Decoder *pbi, size_t index, YV12_BUFFER_CONFIG **sd,
+                      aom_film_grain_t **grain_params);
+
+int av1_get_frame_to_show(struct AV1Decoder *pbi, YV12_BUFFER_CONFIG *frame);
+
+aom_codec_err_t av1_copy_reference_dec(struct AV1Decoder *pbi, int idx,
+                                       YV12_BUFFER_CONFIG *sd);
+
+aom_codec_err_t av1_set_reference_dec(AV1_COMMON *cm, int idx,
+                                      int use_external_ref,
+                                      YV12_BUFFER_CONFIG *sd);
+aom_codec_err_t av1_copy_new_frame_dec(AV1_COMMON *cm,
+                                       YV12_BUFFER_CONFIG *new_frame,
+                                       YV12_BUFFER_CONFIG *sd);
+
+struct AV1Decoder *av1_decoder_create(BufferPool *const pool);
+
+void av1_decoder_remove(struct AV1Decoder *pbi);
+void av1_dealloc_dec_jobs(struct AV1DecTileMTData *tile_mt_info);
+
+void av1_dec_row_mt_dealloc(AV1DecRowMTSync *dec_row_mt_sync);
+
+void av1_dec_free_cb_buf(AV1Decoder *pbi);
+
+static INLINE void decrease_ref_count(RefCntBuffer *const buf,
+                                      BufferPool *const pool) {
+  if (buf != NULL) {
+    --buf->ref_count;
+    // Reference counts should never become negative. If this assertion fails,
+    // there is a bug in our reference count management.
+    assert(buf->ref_count >= 0);
+    // A worker may only get a free framebuffer index when calling get_free_fb.
+    // But the raw frame buffer is not set up until we finish decoding header.
+    // So if any error happens during decoding header, frame_bufs[idx] will not
+    // have a valid raw frame buffer.
+    if (buf->ref_count == 0 && buf->raw_frame_buffer.data) {
+      pool->release_fb_cb(pool->cb_priv, &buf->raw_frame_buffer);
+      buf->raw_frame_buffer.data = NULL;
+      buf->raw_frame_buffer.size = 0;
+      buf->raw_frame_buffer.priv = NULL;
+    }
+  }
+}
+
+#define ACCT_STR __func__
+static INLINE int av1_read_uniform(aom_reader *r, int n) {
+  const int l = get_unsigned_bits(n);
+  const int m = (1 << l) - n;
+  const int v = aom_read_literal(r, l - 1, ACCT_STR);
+  assert(l != 0);
+  if (v < m)
+    return v;
+  else
+    return (v << 1) - m + aom_read_literal(r, 1, ACCT_STR);
+}
+
+typedef void (*palette_visitor_fn_t)(MACROBLOCKD *const xd, int plane,
+                                     aom_reader *r);
+
+void av1_visit_palette(AV1Decoder *const pbi, MACROBLOCKD *const xd,
+                       aom_reader *r, palette_visitor_fn_t visit);
+
+typedef void (*block_visitor_fn_t)(AV1Decoder *const pbi, ThreadData *const td,
+                                   int mi_row, int mi_col, aom_reader *r,
+                                   PARTITION_TYPE partition, BLOCK_SIZE bsize);
+
+/*!\endcond */
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_DECODER_DECODER_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodetxb.c b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodetxb.c
new file mode 100644
index 0000000000..3061c3c5e2
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodetxb.c
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodetxb.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/idct.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/scan.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/txb_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodemv.h"
+
+#define ACCT_STR __func__
+
+static int read_golomb(MACROBLOCKD *xd, aom_reader *r) {
+  int x = 1;
+  int length = 0;
+  int i = 0;
+
+  while (!i) {
+    i = aom_read_bit(r, ACCT_STR);
+    ++length;
+    if (length > 20) {
+      aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
+                         "Invalid length in read_golomb");
+      break;
+    }
+  }
+
+  for (i = 0; i < length - 1; ++i) {
+    x <<= 1;
+    x += aom_read_bit(r, ACCT_STR);
+  }
+
+  return x - 1;
+}
+
+static INLINE int rec_eob_pos(const int eob_token, const int extra) {
+  int eob = av1_eob_group_start[eob_token];
+  if (eob > 2) {
+    eob += extra;
+  }
+  return eob;
+}
+
+static INLINE int get_dqv(const int16_t *dequant, int coeff_idx,
+                          const qm_val_t *iqmatrix) {
+  int dqv = dequant[!!coeff_idx];
+  if (iqmatrix != NULL)
+    dqv =
+        ((iqmatrix[coeff_idx] * dqv) + (1 << (AOM_QM_BITS - 1))) >> AOM_QM_BITS;
+  return dqv;
+}
+
+static INLINE void read_coeffs_reverse_2d(aom_reader *r, TX_SIZE tx_size,
+                                          int start_si, int end_si,
+                                          const int16_t *scan, int bwl,
+                                          uint8_t *levels,
+                                          base_cdf_arr base_cdf,
+                                          br_cdf_arr br_cdf) {
+  for (int c = end_si; c >= start_si; --c) {
+    const int pos = scan[c];
+    const int coeff_ctx = get_lower_levels_ctx_2d(levels, pos, bwl, tx_size);
+    const int nsymbs = 4;
+    int level = aom_read_symbol(r, base_cdf[coeff_ctx], nsymbs, ACCT_STR);
+    if (level > NUM_BASE_LEVELS) {
+      const int br_ctx = get_br_ctx_2d(levels, pos, bwl);
+      aom_cdf_prob *cdf = br_cdf[br_ctx];
+      for (int idx = 0; idx < COEFF_BASE_RANGE; idx += BR_CDF_SIZE - 1) {
+        const int k = aom_read_symbol(r, cdf, BR_CDF_SIZE, ACCT_STR);
+        level += k;
+        if (k < BR_CDF_SIZE - 1) break;
+      }
+    }
+    levels[get_padded_idx(pos, bwl)] = level;
+  }
+}
+
+static INLINE void read_coeffs_reverse(aom_reader *r, TX_SIZE tx_size,
+                                       TX_CLASS tx_class, int start_si,
+                                       int end_si, const int16_t *scan, int bwl,
+                                       uint8_t *levels, base_cdf_arr base_cdf,
+                                       br_cdf_arr br_cdf) {
+  for (int c = end_si; c >= start_si; --c) {
+    const int pos = scan[c];
+    const int coeff_ctx =
+        get_lower_levels_ctx(levels, pos, bwl, tx_size, tx_class);
+    const int nsymbs = 4;
+    int level = aom_read_symbol(r, base_cdf[coeff_ctx], nsymbs, ACCT_STR);
+    if (level > NUM_BASE_LEVELS) {
+      const int br_ctx = get_br_ctx(levels, pos, bwl, tx_class);
+      aom_cdf_prob *cdf = br_cdf[br_ctx];
+      for (int idx = 0; idx < COEFF_BASE_RANGE; idx += BR_CDF_SIZE - 1) {
+        const int k = aom_read_symbol(r, cdf, BR_CDF_SIZE, ACCT_STR);
+        level += k;
+        if (k < BR_CDF_SIZE - 1) break;
+      }
+    }
+    levels[get_padded_idx(pos, bwl)] = level;
+  }
+}
+
+uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, DecoderCodingBlock *dcb,
+                            aom_reader *const r, const int blk_row,
+                            const int blk_col, const int plane,
+                            const TXB_CTX *const txb_ctx,
+                            const TX_SIZE tx_size) {
+  MACROBLOCKD *const xd = &dcb->xd;
+  FRAME_CONTEXT *const ec_ctx = xd->tile_ctx;
+  const int32_t max_value = (1 << (7 + xd->bd)) - 1;
+  const int32_t min_value = -(1 << (7 + xd->bd));
+  const TX_SIZE txs_ctx = get_txsize_entropy_ctx(tx_size);
+  const PLANE_TYPE plane_type = get_plane_type(plane);
+  MB_MODE_INFO *const mbmi = xd->mi[0];
+  struct macroblockd_plane *const pd = &xd->plane[plane];
+  const int16_t *const dequant = pd->seg_dequant_QTX[mbmi->segment_id];
+  tran_low_t *const tcoeffs = dcb->dqcoeff_block[plane] + dcb->cb_offset[plane];
+  const int shift = av1_get_tx_scale(tx_size);
+  const int bwl = get_txb_bwl(tx_size);
+  const int width = get_txb_wide(tx_size);
+  const int height = get_txb_high(tx_size);
+  int cul_level = 0;
+  int dc_val = 0;
+  uint8_t levels_buf[TX_PAD_2D];
+  uint8_t *const levels = set_levels(levels_buf, width);
+  const int all_zero = aom_read_symbol(
+      r, ec_ctx->txb_skip_cdf[txs_ctx][txb_ctx->txb_skip_ctx], 2, ACCT_STR);
+  eob_info *eob_data = dcb->eob_data[plane] + dcb->txb_offset[plane];
+  uint16_t *const eob = &(eob_data->eob);
+  uint16_t *const max_scan_line = &(eob_data->max_scan_line);
+  *max_scan_line = 0;
+  *eob = 0;
+
+#if CONFIG_INSPECTION
+  if (plane == 0) {
+    const int txk_type_idx =
+        av1_get_txk_type_index(mbmi->bsize, blk_row, blk_col);
+    mbmi->tx_skip[txk_type_idx] = all_zero;
+  }
+#endif
+
+  if (all_zero) {
+    *max_scan_line = 0;
+    if (plane == 0) {
+      xd->tx_type_map[blk_row * xd->tx_type_map_stride + blk_col] = DCT_DCT;
+    }
+    return 0;
+  }
+
+  if (plane == AOM_PLANE_Y) {
+    // only y plane's tx_type is transmitted
+    av1_read_tx_type(cm, xd, blk_row, blk_col, tx_size, r);
+  }
+  const TX_TYPE tx_type =
+      av1_get_tx_type(xd, plane_type, blk_row, blk_col, tx_size,
+                      cm->features.reduced_tx_set_used);
+  const TX_CLASS tx_class = tx_type_to_class[tx_type];
+  const qm_val_t *iqmatrix =
+      av1_get_iqmatrix(&cm->quant_params, xd, plane, tx_size, tx_type);
+  const SCAN_ORDER *const scan_order = get_scan(tx_size, tx_type);
+  const int16_t *const scan = scan_order->scan;
+  int eob_extra = 0;
+  int eob_pt = 1;
+
+  const int eob_multi_size = txsize_log2_minus4[tx_size];
+  const int eob_multi_ctx = (tx_class == TX_CLASS_2D) ? 0 : 1;
+  switch (eob_multi_size) {
+    case 0:
+      eob_pt =
+          aom_read_symbol(r, ec_ctx->eob_flag_cdf16[plane_type][eob_multi_ctx],
+                          5, ACCT_STR) +
+          1;
+      break;
+    case 1:
+      eob_pt =
+          aom_read_symbol(r, ec_ctx->eob_flag_cdf32[plane_type][eob_multi_ctx],
+                          6, ACCT_STR) +
+          1;
+      break;
+    case 2:
+      eob_pt =
+          aom_read_symbol(r, ec_ctx->eob_flag_cdf64[plane_type][eob_multi_ctx],
+                          7, ACCT_STR) +
+          1;
+      break;
+    case 3:
+      eob_pt =
+          aom_read_symbol(r, ec_ctx->eob_flag_cdf128[plane_type][eob_multi_ctx],
+                          8, ACCT_STR) +
+          1;
+      break;
+    case 4:
+      eob_pt =
+          aom_read_symbol(r, ec_ctx->eob_flag_cdf256[plane_type][eob_multi_ctx],
+                          9, ACCT_STR) +
+          1;
+      break;
+    case 5:
+      eob_pt =
+          aom_read_symbol(r, ec_ctx->eob_flag_cdf512[plane_type][eob_multi_ctx],
+                          10, ACCT_STR) +
+          1;
+      break;
+    case 6:
+    default:
+      eob_pt = aom_read_symbol(
+                   r, ec_ctx->eob_flag_cdf1024[plane_type][eob_multi_ctx], 11,
+                   ACCT_STR) +
+               1;
+      break;
+  }
+
+  const int eob_offset_bits = av1_eob_offset_bits[eob_pt];
+  if (eob_offset_bits > 0) {
+    const int eob_ctx = eob_pt - 3;
+    int bit = aom_read_symbol(
+        r, ec_ctx->eob_extra_cdf[txs_ctx][plane_type][eob_ctx], 2, ACCT_STR);
+    if (bit) {
+      eob_extra += (1 << (eob_offset_bits - 1));
+    }
+
+    for (int i = 1; i < eob_offset_bits; i++) {
+      bit = aom_read_bit(r, ACCT_STR);
+      if (bit) {
+        eob_extra += (1 << (eob_offset_bits - 1 - i));
+      }
+    }
+  }
+  *eob = rec_eob_pos(eob_pt, eob_extra);
+
+  if (*eob > 1) {
+    memset(levels_buf, 0,
+           sizeof(*levels_buf) *
+               ((width + TX_PAD_HOR) * (height + TX_PAD_VER) + TX_PAD_END));
+  }
+
+  {
+    // Read the non-zero coefficient with scan index eob-1
+    // TODO(angiebird): Put this into a function
+    const int c = *eob - 1;
+    const int pos = scan[c];
+    const int coeff_ctx = get_lower_levels_ctx_eob(bwl, height, c);
+    const int nsymbs = 3;
+    aom_cdf_prob *cdf =
+        ec_ctx->coeff_base_eob_cdf[txs_ctx][plane_type][coeff_ctx];
+    int level = aom_read_symbol(r, cdf, nsymbs, ACCT_STR) + 1;
+    if (level > NUM_BASE_LEVELS) {
+      const int br_ctx = get_br_ctx_eob(pos, bwl, tx_class);
+      cdf = ec_ctx->coeff_br_cdf[AOMMIN(txs_ctx, TX_32X32)][plane_type][br_ctx];
+      for (int idx = 0; idx < COEFF_BASE_RANGE; idx += BR_CDF_SIZE - 1) {
+        const int k = aom_read_symbol(r, cdf, BR_CDF_SIZE, ACCT_STR);
+        level += k;
+        if (k < BR_CDF_SIZE - 1) break;
+      }
+    }
+    levels[get_padded_idx(pos, bwl)] = level;
+  }
+  if (*eob > 1) {
+    base_cdf_arr base_cdf = ec_ctx->coeff_base_cdf[txs_ctx][plane_type];
+    br_cdf_arr br_cdf =
+        ec_ctx->coeff_br_cdf[AOMMIN(txs_ctx, TX_32X32)][plane_type];
+    if (tx_class == TX_CLASS_2D) {
+      read_coeffs_reverse_2d(r, tx_size, 1, *eob - 1 - 1, scan, bwl, levels,
+                             base_cdf, br_cdf);
+      read_coeffs_reverse(r, tx_size, tx_class, 0, 0, scan, bwl, levels,
+                          base_cdf, br_cdf);
+    } else {
+      read_coeffs_reverse(r, tx_size, tx_class, 0, *eob - 1 - 1, scan, bwl,
+                          levels, base_cdf, br_cdf);
+    }
+  }
+
+  for (int c = 0; c < *eob; ++c) {
+    const int pos = scan[c];
+    uint8_t sign;
+    tran_low_t level = levels[get_padded_idx(pos, bwl)];
+    if (level) {
+      *max_scan_line = AOMMAX(*max_scan_line, pos);
+      if (c == 0) {
+        const int dc_sign_ctx = txb_ctx->dc_sign_ctx;
+        sign = aom_read_symbol(r, ec_ctx->dc_sign_cdf[plane_type][dc_sign_ctx],
+                               2, ACCT_STR);
+      } else {
+        sign = aom_read_bit(r, ACCT_STR);
+      }
+      if (level >= MAX_BASE_BR_RANGE) {
+        level += read_golomb(xd, r);
+      }
+
+      if (c == 0) dc_val = sign ? -level : level;
+
+      // Bitmasking to clamp level to valid range:
+      //   The valid range for 8/10/12 bit vdieo is at most 14/16/18 bit
+      level &= 0xfffff;
+      cul_level += level;
+      tran_low_t dq_coeff;
+      // Bitmasking to clamp dq_coeff to valid range:
+      //   The valid range for 8/10/12 bit video is at most 17/19/21 bit
+      dq_coeff = (tran_low_t)(
+          (int64_t)level * get_dqv(dequant, scan[c], iqmatrix) & 0xffffff);
+      dq_coeff = dq_coeff >> shift;
+      if (sign) {
+        dq_coeff = -dq_coeff;
+      }
+      tcoeffs[pos] = clamp(dq_coeff, min_value, max_value);
+    }
+  }
+
+  cul_level = AOMMIN(COEFF_CONTEXT_MASK, cul_level);
+
+  // DC value
+  set_dc_sign(&cul_level, dc_val);
+
+  return cul_level;
+}
+
+void av1_read_coeffs_txb_facade(const AV1_COMMON *const cm,
+                                DecoderCodingBlock *dcb, aom_reader *const r,
+                                const int plane, const int row, const int col,
+                                const TX_SIZE tx_size) {
+#if TXCOEFF_TIMER
+  struct aom_usec_timer timer;
+  aom_usec_timer_start(&timer);
+#endif
+  MACROBLOCKD *const xd = &dcb->xd;
+  MB_MODE_INFO *const mbmi = xd->mi[0];
+  struct macroblockd_plane *const pd = &xd->plane[plane];
+
+  const BLOCK_SIZE bsize = mbmi->bsize;
+  assert(bsize < BLOCK_SIZES_ALL);
+  const BLOCK_SIZE plane_bsize =
+      get_plane_block_size(bsize, pd->subsampling_x, pd->subsampling_y);
+
+  TXB_CTX txb_ctx;
+  get_txb_ctx(plane_bsize, tx_size, plane, pd->above_entropy_context + col,
+              pd->left_entropy_context + row, &txb_ctx);
+  const uint8_t cul_level =
+      av1_read_coeffs_txb(cm, dcb, r, row, col, plane, &txb_ctx, tx_size);
+  av1_set_entropy_contexts(xd, pd, plane, plane_bsize, tx_size, cul_level, col,
+                           row);
+
+  if (is_inter_block(mbmi)) {
+    const PLANE_TYPE plane_type = get_plane_type(plane);
+    // tx_type will be read out in av1_read_coeffs_txb_facade
+    const TX_TYPE tx_type = av1_get_tx_type(xd, plane_type, row, col, tx_size,
+                                            cm->features.reduced_tx_set_used);
+
+    if (plane == 0) {
+      const int txw = tx_size_wide_unit[tx_size];
+      const int txh = tx_size_high_unit[tx_size];
+      // The 16x16 unit is due to the constraint from tx_64x64 which sets the
+      // maximum tx size for chroma as 32x32. Coupled with 4x1 transform block
+      // size, the constraint takes effect in 32x16 / 16x32 size too. To solve
+      // the intricacy, cover all the 16x16 units inside a 64 level transform.
+      if (txw == tx_size_wide_unit[TX_64X64] ||
+          txh == tx_size_high_unit[TX_64X64]) {
+        const int tx_unit = tx_size_wide_unit[TX_16X16];
+        const int stride = xd->tx_type_map_stride;
+        for (int idy = 0; idy < txh; idy += tx_unit) {
+          for (int idx = 0; idx < txw; idx += tx_unit) {
+            xd->tx_type_map[(row + idy) * stride + col + idx] = tx_type;
+          }
+        }
+      }
+    }
+  }
+
+#if TXCOEFF_TIMER
+  aom_usec_timer_mark(&timer);
+  const int64_t elapsed_time = aom_usec_timer_elapsed(&timer);
+  cm->txcoeff_timer += elapsed_time;
+  ++cm->txb_count;
+#endif
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodetxb.h b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodetxb.h
new file mode 100644
index 0000000000..79f0e225f1
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodetxb.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_DECODER_DECODETXB_H_
+#define AOM_AV1_DECODER_DECODETXB_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+
+struct aom_reader;
+struct AV1Common;
+struct DecoderCodingBlock;
+struct txb_ctx;
+
+uint8_t av1_read_coeffs_txb(const struct AV1Common *const cm,
+                            struct DecoderCodingBlock *dcb,
+                            struct aom_reader *const r, const int blk_row,
+                            const int blk_col, const int plane,
+                            const struct txb_ctx *const txb_ctx,
+                            const TX_SIZE tx_size);
+
+void av1_read_coeffs_txb_facade(const struct AV1Common *const cm,
+                                struct DecoderCodingBlock *dcb,
+                                struct aom_reader *const r, const int plane,
+                                const int row, const int col,
+                                const TX_SIZE tx_size);
+#endif  // AOM_AV1_DECODER_DECODETXB_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.c b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.c
new file mode 100644
index 0000000000..de684bc5a4
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_mem/aom_mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.h"
+
+#define ACCT_STR __func__
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/entropy.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/idct.h"
+
+static void decode_color_map_tokens(Av1ColorMapParam *param, aom_reader *r) {
+  uint8_t color_order[PALETTE_MAX_SIZE];
+  const int n = param->n_colors;
+  uint8_t *const color_map = param->color_map;
+  MapCdf color_map_cdf = param->map_cdf;
+  int plane_block_width = param->plane_width;
+  int plane_block_height = param->plane_height;
+  int rows = param->rows;
+  int cols = param->cols;
+
+  // The first color index.
+  color_map[0] = av1_read_uniform(r, n);
+  assert(color_map[0] < n);
+
+  // Run wavefront on the palette map index decoding.
+  for (int i = 1; i < rows + cols - 1; ++i) {
+    for (int j = AOMMIN(i, cols - 1); j >= AOMMAX(0, i - rows + 1); --j) {
+      const int color_ctx = av1_get_palette_color_index_context(
+          color_map, plane_block_width, (i - j), j, n, color_order, NULL);
+      const int color_idx = aom_read_symbol(
+          r, color_map_cdf[n - PALETTE_MIN_SIZE][color_ctx], n, ACCT_STR);
+      assert(color_idx >= 0 && color_idx < n);
+      color_map[(i - j) * plane_block_width + j] = color_order[color_idx];
+    }
+  }
+  // Copy last column to extra columns.
+  if (cols < plane_block_width) {
+    for (int i = 0; i < rows; ++i) {
+      memset(color_map + i * plane_block_width + cols,
+             color_map[i * plane_block_width + cols - 1],
+             (plane_block_width - cols));
+    }
+  }
+  // Copy last row to extra rows.
+  for (int i = rows; i < plane_block_height; ++i) {
+    memcpy(color_map + i * plane_block_width,
+           color_map + (rows - 1) * plane_block_width, plane_block_width);
+  }
+}
+
+void av1_decode_palette_tokens(MACROBLOCKD *const xd, int plane,
+                               aom_reader *r) {
+  assert(plane == 0 || plane == 1);
+  Av1ColorMapParam params;
+  params.color_map =
+      xd->plane[plane].color_index_map + xd->color_index_map_offset[plane];
+  params.map_cdf = plane ? xd->tile_ctx->palette_uv_color_index_cdf
+                         : xd->tile_ctx->palette_y_color_index_cdf;
+  const MB_MODE_INFO *const mbmi = xd->mi[0];
+  params.n_colors = mbmi->palette_mode_info.palette_size[plane];
+  av1_get_block_dimensions(mbmi->bsize, plane, xd, &params.plane_width,
+                           &params.plane_height, &params.rows, &params.cols);
+  decode_color_map_tokens(&params, r);
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.h b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.h
new file mode 100644
index 0000000000..e8be1063d3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/detokenize.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_DECODER_DETOKENIZE_H_
+#define AOM_AV1_DECODER_DETOKENIZE_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/scan.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void av1_decode_palette_tokens(MACROBLOCKD *const xd, int plane, aom_reader *r);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+#endif  // AOM_AV1_DECODER_DETOKENIZE_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/dthread.h b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/dthread.h
new file mode 100644
index 0000000000..9a7bff4d76
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/dthread.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_DECODER_DTHREAD_H_
+#define AOM_AV1_DECODER_DTHREAD_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_util/aom_thread.h"
+#include "pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct AV1Common;
+struct AV1Decoder;
+struct ThreadData;
+
+typedef struct DecWorkerData {
+  struct ThreadData *td;
+  const uint8_t *data_end;
+  struct aom_internal_error_info error_info;
+} DecWorkerData;
+
+// WorkerData for the FrameWorker thread. It contains all the information of
+// the worker and decode structures for decoding a frame.
+typedef struct FrameWorkerData {
+  struct AV1Decoder *pbi;
+  const uint8_t *data;
+  const uint8_t *data_end;
+  size_t data_size;
+  void *user_priv;
+  int received_frame;
+  int frame_context_ready;  // Current frame's context is ready to read.
+  int frame_decoded;        // Finished decoding current frame.
+} FrameWorkerData;
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AV1_DECODER_DTHREAD_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.c b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.c
new file mode 100644
index 0000000000..a3ef7f7cf3
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.c
@@ -0,0 +1,1098 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <assert.h>
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/bitreader_buffer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_ports/mem_ops.h"
+
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/obu_util.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/timing.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decodeframe.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.h"
+
+aom_codec_err_t aom_get_num_layers_from_operating_point_idc(
+    int operating_point_idc, unsigned int *number_spatial_layers,
+    unsigned int *number_temporal_layers) {
+  // derive number of spatial/temporal layers from operating_point_idc
+
+  if (!number_spatial_layers || !number_temporal_layers)
+    return AOM_CODEC_INVALID_PARAM;
+
+  if (operating_point_idc == 0) {
+    *number_temporal_layers = 1;
+    *number_spatial_layers = 1;
+  } else {
+    *number_spatial_layers = 0;
+    *number_temporal_layers = 0;
+    for (int j = 0; j < MAX_NUM_SPATIAL_LAYERS; j++) {
+      *number_spatial_layers +=
+          (operating_point_idc >> (j + MAX_NUM_TEMPORAL_LAYERS)) & 0x1;
+    }
+    for (int j = 0; j < MAX_NUM_TEMPORAL_LAYERS; j++) {
+      *number_temporal_layers += (operating_point_idc >> j) & 0x1;
+    }
+  }
+
+  return AOM_CODEC_OK;
+}
+
+static int is_obu_in_current_operating_point(AV1Decoder *pbi,
+                                             const ObuHeader *obu_header) {
+  if (!pbi->current_operating_point || !obu_header->has_extension) {
+    return 1;
+  }
+
+  if ((pbi->current_operating_point >> obu_header->temporal_layer_id) & 0x1 &&
+      (pbi->current_operating_point >> (obu_header->spatial_layer_id + 8)) &
+          0x1) {
+    return 1;
+  }
+  return 0;
+}
+
+static int byte_alignment(AV1_COMMON *const cm,
+                          struct aom_read_bit_buffer *const rb) {
+  while (rb->bit_offset & 7) {
+    if (aom_rb_read_bit(rb)) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static uint32_t read_temporal_delimiter_obu() { return 0; }
+
+// Returns a boolean that indicates success.
+static int read_bitstream_level(AV1_LEVEL *seq_level_idx,
+                                struct aom_read_bit_buffer *rb) {
+  *seq_level_idx = aom_rb_read_literal(rb, LEVEL_BITS);
+  if (!is_valid_seq_level_idx(*seq_level_idx)) return 0;
+  return 1;
+}
+
+// Returns whether two sequence headers are consistent with each other.
+// Note that the 'op_params' field is not compared per Section 7.5 in the spec:
+//   Within a particular coded video sequence, the contents of
+//   sequence_header_obu must be bit-identical each time the sequence header
+//   appears except for the contents of operating_parameters_info.
+static int are_seq_headers_consistent(const SequenceHeader *seq_params_old,
+                                      const SequenceHeader *seq_params_new) {
+  return !memcmp(seq_params_old, seq_params_new,
+                 offsetof(SequenceHeader, op_params));
+}
+
+// On success, sets pbi->sequence_header_ready to 1 and returns the number of
+// bytes read from 'rb'.
+// On failure, sets pbi->common.error.error_code and returns 0.
+static uint32_t read_sequence_header_obu(AV1Decoder *pbi,
+                                         struct aom_read_bit_buffer *rb) {
+  AV1_COMMON *const cm = &pbi->common;
+  const uint32_t saved_bit_offset = rb->bit_offset;
+
+  // Verify rb has been configured to report errors.
+  assert(rb->error_handler);
+
+  // Use a local variable to store the information as we decode. At the end,
+  // if no errors have occurred, cm->seq_params is updated.
+  SequenceHeader sh = cm->seq_params;
+  SequenceHeader *const seq_params = &sh;
+
+  seq_params->profile = av1_read_profile(rb);
+  if (seq_params->profile > CONFIG_MAX_DECODE_PROFILE) {
+    cm->error.error_code = AOM_CODEC_UNSUP_BITSTREAM;
+    return 0;
+  }
+
+  // Still picture or not
+  seq_params->still_picture = aom_rb_read_bit(rb);
+  seq_params->reduced_still_picture_hdr = aom_rb_read_bit(rb);
+  // Video must have reduced_still_picture_hdr = 0
+  if (!seq_params->still_picture && seq_params->reduced_still_picture_hdr) {
+    cm->error.error_code = AOM_CODEC_UNSUP_BITSTREAM;
+    return 0;
+  }
+
+  if (seq_params->reduced_still_picture_hdr) {
+    seq_params->timing_info_present = 0;
+    seq_params->decoder_model_info_present_flag = 0;
+    seq_params->display_model_info_present_flag = 0;
+    seq_params->operating_points_cnt_minus_1 = 0;
+    seq_params->operating_point_idc[0] = 0;
+    if (!read_bitstream_level(&seq_params->seq_level_idx[0], rb)) {
+      cm->error.error_code = AOM_CODEC_UNSUP_BITSTREAM;
+      return 0;
+    }
+    seq_params->tier[0] = 0;
+    seq_params->op_params[0].decoder_model_param_present_flag = 0;
+    seq_params->op_params[0].display_model_param_present_flag = 0;
+  } else {
+    seq_params->timing_info_present = aom_rb_read_bit(rb);
+    if (seq_params->timing_info_present) {
+      av1_read_timing_info_header(&seq_params->timing_info, &cm->error, rb);
+
+      seq_params->decoder_model_info_present_flag = aom_rb_read_bit(rb);
+      if (seq_params->decoder_model_info_present_flag)
+        av1_read_decoder_model_info(&seq_params->decoder_model_info, rb);
+    } else {
+      seq_params->decoder_model_info_present_flag = 0;
+    }
+    seq_params->display_model_info_present_flag = aom_rb_read_bit(rb);
+    seq_params->operating_points_cnt_minus_1 =
+        aom_rb_read_literal(rb, OP_POINTS_CNT_MINUS_1_BITS);
+    for (int i = 0; i < seq_params->operating_points_cnt_minus_1 + 1; i++) {
+      seq_params->operating_point_idc[i] =
+          aom_rb_read_literal(rb, OP_POINTS_IDC_BITS);
+      if (!read_bitstream_level(&seq_params->seq_level_idx[i], rb)) {
+        cm->error.error_code = AOM_CODEC_UNSUP_BITSTREAM;
+        return 0;
+      }
+      // This is the seq_level_idx[i] > 7 check in the spec. seq_level_idx 7
+      // is equivalent to level 3.3.
+      if (seq_params->seq_level_idx[i] >= SEQ_LEVEL_4_0)
+        seq_params->tier[i] = aom_rb_read_bit(rb);
+      else
+        seq_params->tier[i] = 0;
+      if (seq_params->decoder_model_info_present_flag) {
+        seq_params->op_params[i].decoder_model_param_present_flag =
+            aom_rb_read_bit(rb);
+        if (seq_params->op_params[i].decoder_model_param_present_flag)
+          av1_read_op_parameters_info(&seq_params->op_params[i],
+                                      seq_params->decoder_model_info
+                                          .encoder_decoder_buffer_delay_length,
+                                      rb);
+      } else {
+        seq_params->op_params[i].decoder_model_param_present_flag = 0;
+      }
+      if (seq_params->timing_info_present &&
+          (seq_params->timing_info.equal_picture_interval ||
+           seq_params->op_params[i].decoder_model_param_present_flag)) {
+        seq_params->op_params[i].bitrate = av1_max_level_bitrate(
+            seq_params->profile, seq_params->seq_level_idx[i],
+            seq_params->tier[i]);
+        // Level with seq_level_idx = 31 returns a high "dummy" bitrate to pass
+        // the check
+        if (seq_params->op_params[i].bitrate == 0)
+          aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                             "AV1 does not support this combination of "
+                             "profile, level, and tier.");
+        // Buffer size in bits/s is bitrate in bits/s * 1 s
+        seq_params->op_params[i].buffer_size = seq_params->op_params[i].bitrate;
+      }
+      if (seq_params->timing_info_present &&
+          seq_params->timing_info.equal_picture_interval &&
+          !seq_params->op_params[i].decoder_model_param_present_flag) {
+        // When the decoder_model_parameters are not sent for this op, set
+        // the default ones that can be used with the resource availability mode
+        seq_params->op_params[i].decoder_buffer_delay = 70000;
+        seq_params->op_params[i].encoder_buffer_delay = 20000;
+        seq_params->op_params[i].low_delay_mode_flag = 0;
+      }
+
+      if (seq_params->display_model_info_present_flag) {
+        seq_params->op_params[i].display_model_param_present_flag =
+            aom_rb_read_bit(rb);
+        if (seq_params->op_params[i].display_model_param_present_flag) {
+          seq_params->op_params[i].initial_display_delay =
+              aom_rb_read_literal(rb, 4) + 1;
+          if (seq_params->op_params[i].initial_display_delay > 10)
+            aom_internal_error(
+                &cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                "AV1 does not support more than 10 decoded frames delay");
+        } else {
+          seq_params->op_params[i].initial_display_delay = 10;
+        }
+      } else {
+        seq_params->op_params[i].display_model_param_present_flag = 0;
+        seq_params->op_params[i].initial_display_delay = 10;
+      }
+    }
+  }
+  // This decoder supports all levels.  Choose operating point provided by
+  // external means
+  int operating_point = pbi->operating_point;
+  if (operating_point < 0 ||
+      operating_point > seq_params->operating_points_cnt_minus_1)
+    operating_point = 0;
+  pbi->current_operating_point =
+      seq_params->operating_point_idc[operating_point];
+  if (aom_get_num_layers_from_operating_point_idc(
+          pbi->current_operating_point, &cm->number_spatial_layers,
+          &cm->number_temporal_layers) != AOM_CODEC_OK) {
+    cm->error.error_code = AOM_CODEC_ERROR;
+    return 0;
+  }
+
+  av1_read_sequence_header(cm, rb, seq_params);
+
+  av1_read_color_config(rb, pbi->allow_lowbitdepth, seq_params, &cm->error);
+  if (!(seq_params->subsampling_x == 0 && seq_params->subsampling_y == 0) &&
+      !(seq_params->subsampling_x == 1 && seq_params->subsampling_y == 1) &&
+      !(seq_params->subsampling_x == 1 && seq_params->subsampling_y == 0)) {
+    aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+                       "Only 4:4:4, 4:2:2 and 4:2:0 are currently supported, "
+                       "%d %d subsampling is not supported.\n",
+                       seq_params->subsampling_x, seq_params->subsampling_y);
+  }
+
+  seq_params->film_grain_params_present = aom_rb_read_bit(rb);
+
+  if (av1_check_trailing_bits(pbi, rb) != 0) {
+    // cm->error.error_code is already set.
+    return 0;
+  }
+
+  // If a sequence header has been decoded before, we check if the new
+  // one is consistent with the old one.
+  if (pbi->sequence_header_ready) {
+    if (!are_seq_headers_consistent(&cm->seq_params, seq_params))
+      pbi->sequence_header_changed = 1;
+  }
+
+  cm->seq_params = *seq_params;
+  pbi->sequence_header_ready = 1;
+
+  return ((rb->bit_offset - saved_bit_offset + 7) >> 3);
+}
+
+// On success, returns the frame header size. On failure, calls
+// aom_internal_error and does not return. If show existing frame,
+// also marks the data processing to end after the frame header.
+static uint32_t read_frame_header_obu(AV1Decoder *pbi,
+                                      struct aom_read_bit_buffer *rb,
+                                      const uint8_t *data,
+                                      const uint8_t **p_data_end,
+                                      int trailing_bits_present) {
+  const uint32_t hdr_size =
+      av1_decode_frame_headers_and_setup(pbi, rb, trailing_bits_present);
+  const AV1_COMMON *cm = &pbi->common;
+  if (cm->show_existing_frame) {
+    *p_data_end = data + hdr_size;
+  }
+  return hdr_size;
+}
+
+// On success, returns the tile group header size. On failure, calls
+// aom_internal_error() and returns -1.
+static int32_t read_tile_group_header(AV1Decoder *pbi,
+                                      struct aom_read_bit_buffer *rb,
+                                      int *start_tile, int *end_tile,
+                                      int tile_start_implicit) {
+  AV1_COMMON *const cm = &pbi->common;
+  CommonTileParams *const tiles = &cm->tiles;
+  uint32_t saved_bit_offset = rb->bit_offset;
+  int tile_start_and_end_present_flag = 0;
+  const int num_tiles = tiles->rows * tiles->cols;
+
+  if (!tiles->large_scale && num_tiles > 1) {
+    tile_start_and_end_present_flag = aom_rb_read_bit(rb);
+    if (tile_start_implicit && tile_start_and_end_present_flag) {
+      aom_internal_error(
+          &cm->error, AOM_CODEC_UNSUP_BITSTREAM,
+          "For OBU_FRAME type obu tile_start_and_end_present_flag must be 0");
+      return -1;
+    }
+  }
+  if (tiles->large_scale || num_tiles == 1 ||
+      !tile_start_and_end_present_flag) {
+    *start_tile = 0;
+    *end_tile = num_tiles - 1;
+  } else {
+    int tile_bits = tiles->log2_rows + tiles->log2_cols;
+    *start_tile = aom_rb_read_literal(rb, tile_bits);
+    *end_tile = aom_rb_read_literal(rb, tile_bits);
+  }
+  if (*start_tile != pbi->next_start_tile) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "tg_start (%d) must be equal to %d", *start_tile,
+                       pbi->next_start_tile);
+    return -1;
+  }
+  if (*start_tile > *end_tile) {
+    aom_internal_error(
+        &cm->error, AOM_CODEC_CORRUPT_FRAME,
+        "tg_end (%d) must be greater than or equal to tg_start (%d)", *end_tile,
+        *start_tile);
+    return -1;
+  }
+  if (*end_tile >= num_tiles) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "tg_end (%d) must be less than NumTiles (%d)", *end_tile,
+                       num_tiles);
+    return -1;
+  }
+  pbi->next_start_tile = (*end_tile == num_tiles - 1) ? 0 : *end_tile + 1;
+
+  return ((rb->bit_offset - saved_bit_offset + 7) >> 3);
+}
+
+// On success, returns the tile group OBU size. On failure, sets
+// pbi->common.error.error_code and returns 0.
+static uint32_t read_one_tile_group_obu(
+    AV1Decoder *pbi, struct aom_read_bit_buffer *rb, int is_first_tg,
+    const uint8_t *data, const uint8_t *data_end, const uint8_t **p_data_end,
+    int *is_last_tg, int tile_start_implicit) {
+  AV1_COMMON *const cm = &pbi->common;
+  int start_tile, end_tile;
+  int32_t header_size, tg_payload_size;
+
+  assert((rb->bit_offset & 7) == 0);
+  assert(rb->bit_buffer + aom_rb_bytes_read(rb) == data);
+
+  header_size = read_tile_group_header(pbi, rb, &start_tile, &end_tile,
+                                       tile_start_implicit);
+  if (header_size == -1 || byte_alignment(cm, rb)) return 0;
+  data += header_size;
+  av1_decode_tg_tiles_and_wrapup(pbi, data, data_end, p_data_end, start_tile,
+                                 end_tile, is_first_tg);
+
+  tg_payload_size = (uint32_t)(*p_data_end - data);
+
+  *is_last_tg = end_tile == cm->tiles.rows * cm->tiles.cols - 1;
+  return header_size + tg_payload_size;
+}
+
+static void alloc_tile_list_buffer(AV1Decoder *pbi) {
+  // The resolution of the output frame is read out from the bitstream. The data
+  // are stored in the order of Y plane, U plane and V plane. As an example, for
+  // image format 4:2:0, the output frame of U plane and V plane is 1/4 of the
+  // output frame.
+  AV1_COMMON *const cm = &pbi->common;
+  int tile_width, tile_height;
+  av1_get_uniform_tile_size(cm, &tile_width, &tile_height);
+  const int tile_width_in_pixels = tile_width * MI_SIZE;
+  const int tile_height_in_pixels = tile_height * MI_SIZE;
+  const int output_frame_width =
+      (pbi->output_frame_width_in_tiles_minus_1 + 1) * tile_width_in_pixels;
+  const int output_frame_height =
+      (pbi->output_frame_height_in_tiles_minus_1 + 1) * tile_height_in_pixels;
+  // The output frame is used to store the decoded tile list. The decoded tile
+  // list has to fit into 1 output frame.
+  assert((pbi->tile_count_minus_1 + 1) <=
+         (pbi->output_frame_width_in_tiles_minus_1 + 1) *
+             (pbi->output_frame_height_in_tiles_minus_1 + 1));
+
+  // Allocate the tile list output buffer.
+  // Note: if cm->seq_params.use_highbitdepth is 1 and cm->seq_params.bit_depth
+  // is 8, we could allocate less memory, namely, 8 bits/pixel.
+  if (aom_alloc_frame_buffer(&pbi->tile_list_outbuf, output_frame_width,
+                             output_frame_height, cm->seq_params.subsampling_x,
+                             cm->seq_params.subsampling_y,
+                             (cm->seq_params.use_highbitdepth &&
+                              (cm->seq_params.bit_depth > AOM_BITS_8)),
+                             0, cm->features.byte_alignment))
+    aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                       "Failed to allocate the tile list output buffer");
+}
+
+static void yv12_tile_copy(const YV12_BUFFER_CONFIG *src, int hstart1,
+                           int hend1, int vstart1, int vend1,
+                           YV12_BUFFER_CONFIG *dst, int hstart2, int vstart2,
+                           int plane) {
+  const int src_stride = (plane > 0) ? src->strides[1] : src->strides[0];
+  const int dst_stride = (plane > 0) ? dst->strides[1] : dst->strides[0];
+  int row, col;
+
+  assert(src->flags & YV12_FLAG_HIGHBITDEPTH);
+  assert(!(dst->flags & YV12_FLAG_HIGHBITDEPTH));
+
+  const uint16_t *src16 =
+      CONVERT_TO_SHORTPTR(src->buffers[plane] + vstart1 * src_stride + hstart1);
+  uint8_t *dst8 = dst->buffers[plane] + vstart2 * dst_stride + hstart2;
+
+  for (row = vstart1; row < vend1; ++row) {
+    for (col = 0; col < (hend1 - hstart1); ++col) *dst8++ = (uint8_t)(*src16++);
+    src16 += src_stride - (hend1 - hstart1);
+    dst8 += dst_stride - (hend1 - hstart1);
+  }
+  return;
+}
+
+static void copy_decoded_tile_to_tile_list_buffer(AV1Decoder *pbi,
+                                                  int tile_idx) {
+  AV1_COMMON *const cm = &pbi->common;
+  int tile_width, tile_height;
+  av1_get_uniform_tile_size(cm, &tile_width, &tile_height);
+  const int tile_width_in_pixels = tile_width * MI_SIZE;
+  const int tile_height_in_pixels = tile_height * MI_SIZE;
+  const int ssy = cm->seq_params.subsampling_y;
+  const int ssx = cm->seq_params.subsampling_x;
+  const int num_planes = av1_num_planes(cm);
+
+  YV12_BUFFER_CONFIG *cur_frame = &cm->cur_frame->buf;
+  const int tr = tile_idx / (pbi->output_frame_width_in_tiles_minus_1 + 1);
+  const int tc = tile_idx % (pbi->output_frame_width_in_tiles_minus_1 + 1);
+  int plane;
+
+  // Copy decoded tile to the tile list output buffer.
+  for (plane = 0; plane < num_planes; ++plane) {
+    const int shift_x = plane > 0 ? ssx : 0;
+    const int shift_y = plane > 0 ? ssy : 0;
+    const int h = tile_height_in_pixels >> shift_y;
+    const int w = tile_width_in_pixels >> shift_x;
+
+    // src offset
+    int vstart1 = pbi->dec_tile_row * h;
+    int vend1 = vstart1 + h;
+    int hstart1 = pbi->dec_tile_col * w;
+    int hend1 = hstart1 + w;
+    // dst offset
+    int vstart2 = tr * h;
+    int hstart2 = tc * w;
+
+    if (cm->seq_params.use_highbitdepth &&
+        cm->seq_params.bit_depth == AOM_BITS_8) {
+      yv12_tile_copy(cur_frame, hstart1, hend1, vstart1, vend1,
+                     &pbi->tile_list_outbuf, hstart2, vstart2, plane);
+    } else {
+      switch (plane) {
+        case 0:
+          aom_yv12_partial_copy_y(cur_frame, hstart1, hend1, vstart1, vend1,
+                                  &pbi->tile_list_outbuf, hstart2, vstart2);
+          break;
+        case 1:
+          aom_yv12_partial_copy_u(cur_frame, hstart1, hend1, vstart1, vend1,
+                                  &pbi->tile_list_outbuf, hstart2, vstart2);
+          break;
+        case 2:
+          aom_yv12_partial_copy_v(cur_frame, hstart1, hend1, vstart1, vend1,
+                                  &pbi->tile_list_outbuf, hstart2, vstart2);
+          break;
+        default: assert(0);
+      }
+    }
+  }
+}
+
+// Only called while large_scale_tile = 1.
+//
+// On success, returns the tile list OBU size. On failure, sets
+// pbi->common.error.error_code and returns 0.
+static uint32_t read_and_decode_one_tile_list(AV1Decoder *pbi,
+                                              struct aom_read_bit_buffer *rb,
+                                              const uint8_t *data,
+                                              const uint8_t *data_end,
+                                              const uint8_t **p_data_end,
+                                              int *frame_decoding_finished) {
+  AV1_COMMON *const cm = &pbi->common;
+  uint32_t tile_list_payload_size = 0;
+  const int num_tiles = cm->tiles.cols * cm->tiles.rows;
+  const int start_tile = 0;
+  const int end_tile = num_tiles - 1;
+  int i = 0;
+
+  // Process the tile list info.
+  pbi->output_frame_width_in_tiles_minus_1 = aom_rb_read_literal(rb, 8);
+  pbi->output_frame_height_in_tiles_minus_1 = aom_rb_read_literal(rb, 8);
+  pbi->tile_count_minus_1 = aom_rb_read_literal(rb, 16);
+  if (pbi->tile_count_minus_1 > MAX_TILES - 1) {
+    cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+    return 0;
+  }
+
+  // Allocate output frame buffer for the tile list.
+  alloc_tile_list_buffer(pbi);
+
+  uint32_t tile_list_info_bytes = 4;
+  tile_list_payload_size += tile_list_info_bytes;
+  data += tile_list_info_bytes;
+
+  int tile_idx = 0;
+  for (i = 0; i <= pbi->tile_count_minus_1; i++) {
+    // Process 1 tile.
+    // Reset the bit reader.
+    rb->bit_offset = 0;
+    rb->bit_buffer = data;
+
+    // Read out the tile info.
+    uint32_t tile_info_bytes = 5;
+    // Set reference for each tile.
+    int ref_idx = aom_rb_read_literal(rb, 8);
+    if (ref_idx >= MAX_EXTERNAL_REFERENCES) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return 0;
+    }
+    av1_set_reference_dec(cm, cm->remapped_ref_idx[0], 1,
+                          &pbi->ext_refs.refs[ref_idx]);
+
+    pbi->dec_tile_row = aom_rb_read_literal(rb, 8);
+    pbi->dec_tile_col = aom_rb_read_literal(rb, 8);
+    if (pbi->dec_tile_row < 0 || pbi->dec_tile_col < 0 ||
+        pbi->dec_tile_row >= cm->tiles.rows ||
+        pbi->dec_tile_col >= cm->tiles.cols) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return 0;
+    }
+
+    pbi->coded_tile_data_size = aom_rb_read_literal(rb, 16) + 1;
+    data += tile_info_bytes;
+    if ((size_t)(data_end - data) < pbi->coded_tile_data_size) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return 0;
+    }
+
+    av1_decode_tg_tiles_and_wrapup(pbi, data, data + pbi->coded_tile_data_size,
+                                   p_data_end, start_tile, end_tile, 0);
+    uint32_t tile_payload_size = (uint32_t)(*p_data_end - data);
+
+    tile_list_payload_size += tile_info_bytes + tile_payload_size;
+
+    // Update data ptr for next tile decoding.
+    data = *p_data_end;
+    assert(data <= data_end);
+
+    // Copy the decoded tile to the tile list output buffer.
+    copy_decoded_tile_to_tile_list_buffer(pbi, tile_idx);
+    tile_idx++;
+  }
+
+  *frame_decoding_finished = 1;
+  return tile_list_payload_size;
+}
+
+// Returns the last nonzero byte index in 'data'. If there is no nonzero byte in
+// 'data', returns -1.
+static int get_last_nonzero_byte_index(const uint8_t *data, size_t sz) {
+  // Scan backward and return on the first nonzero byte.
+  int i = (int)sz - 1;
+  while (i >= 0 && data[i] == 0) {
+    --i;
+  }
+  return i;
+}
+
+// Allocates metadata that was read and adds it to the decoders metadata array.
+static void alloc_read_metadata(AV1Decoder *const pbi,
+                                OBU_METADATA_TYPE metadata_type,
+                                const uint8_t *data, size_t sz,
+                                aom_metadata_insert_flags_t insert_flag) {
+  AV1_COMMON *const cm = &pbi->common;
+  if (!pbi->metadata) {
+    pbi->metadata = aom_img_metadata_array_alloc(0);
+    if (!pbi->metadata) {
+      aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                         "Failed to allocate metadata array");
+    }
+  }
+  aom_metadata_t *metadata =
+      aom_img_metadata_alloc(metadata_type, data, sz, insert_flag);
+  if (!metadata) {
+    aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                       "Error allocating metadata");
+  }
+  aom_metadata_t **metadata_array =
+      (aom_metadata_t **)realloc(pbi->metadata->metadata_array,
+                                 (pbi->metadata->sz + 1) * sizeof(metadata));
+  if (!metadata_array) {
+    aom_img_metadata_free(metadata);
+    aom_internal_error(&cm->error, AOM_CODEC_MEM_ERROR,
+                       "Error growing metadata array");
+  }
+  pbi->metadata->metadata_array = metadata_array;
+  pbi->metadata->metadata_array[pbi->metadata->sz] = metadata;
+  pbi->metadata->sz++;
+}
+
+// On failure, calls aom_internal_error() and does not return.
+static void read_metadata_itut_t35(AV1Decoder *const pbi, const uint8_t *data,
+                                   size_t sz) {
+  AV1_COMMON *const cm = &pbi->common;
+  if (sz == 0) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "itu_t_t35_country_code is missing");
+  }
+  int country_code_size = 1;
+  if (*data == 0xFF) {
+    if (sz == 1) {
+      aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                         "itu_t_t35_country_code_extension_byte is missing");
+    }
+    ++country_code_size;
+  }
+  int end_index = get_last_nonzero_byte_index(data, sz);
+  if (end_index < country_code_size) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "No trailing bits found in ITU-T T.35 metadata OBU");
+  }
+  // itu_t_t35_payload_bytes is byte aligned. Section 6.7.2 of the spec says:
+  //   itu_t_t35_payload_bytes shall be bytes containing data registered as
+  //   specified in Recommendation ITU-T T.35.
+  // Therefore the first trailing byte should be 0x80.
+  if (data[end_index] != 0x80) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "The last nonzero byte of the ITU-T T.35 metadata OBU "
+                       "is 0x%02x, should be 0x80.",
+                       data[end_index]);
+  }
+  alloc_read_metadata(pbi, OBU_METADATA_TYPE_ITUT_T35, data, end_index,
+                      AOM_MIF_ANY_FRAME);
+}
+
+// On success, returns the number of bytes read from 'data'. On failure, calls
+// aom_internal_error() and does not return.
+static size_t read_metadata_hdr_cll(AV1Decoder *const pbi, const uint8_t *data,
+                                    size_t sz) {
+  const size_t kHdrCllPayloadSize = 4;
+  AV1_COMMON *const cm = &pbi->common;
+  if (sz < kHdrCllPayloadSize) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Incorrect HDR CLL metadata payload size");
+  }
+  alloc_read_metadata(pbi, OBU_METADATA_TYPE_HDR_CLL, data, kHdrCllPayloadSize,
+                      AOM_MIF_ANY_FRAME);
+  return kHdrCllPayloadSize;
+}
+
+// On success, returns the number of bytes read from 'data'. On failure, calls
+// aom_internal_error() and does not return.
+static size_t read_metadata_hdr_mdcv(AV1Decoder *const pbi, const uint8_t *data,
+                                     size_t sz) {
+  const size_t kMdcvPayloadSize = 24;
+  AV1_COMMON *const cm = &pbi->common;
+  if (sz < kMdcvPayloadSize) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Incorrect HDR MDCV metadata payload size");
+  }
+  alloc_read_metadata(pbi, OBU_METADATA_TYPE_HDR_MDCV, data, kMdcvPayloadSize,
+                      AOM_MIF_ANY_FRAME);
+  return kMdcvPayloadSize;
+}
+
+static void scalability_structure(struct aom_read_bit_buffer *rb) {
+  const int spatial_layers_cnt_minus_1 = aom_rb_read_literal(rb, 2);
+  const int spatial_layer_dimensions_present_flag = aom_rb_read_bit(rb);
+  const int spatial_layer_description_present_flag = aom_rb_read_bit(rb);
+  const int temporal_group_description_present_flag = aom_rb_read_bit(rb);
+  // scalability_structure_reserved_3bits must be set to zero and be ignored by
+  // decoders.
+  aom_rb_read_literal(rb, 3);
+
+  if (spatial_layer_dimensions_present_flag) {
+    for (int i = 0; i <= spatial_layers_cnt_minus_1; i++) {
+      aom_rb_read_literal(rb, 16);
+      aom_rb_read_literal(rb, 16);
+    }
+  }
+  if (spatial_layer_description_present_flag) {
+    for (int i = 0; i <= spatial_layers_cnt_minus_1; i++) {
+      aom_rb_read_literal(rb, 8);
+    }
+  }
+  if (temporal_group_description_present_flag) {
+    const int temporal_group_size = aom_rb_read_literal(rb, 8);
+    for (int i = 0; i < temporal_group_size; i++) {
+      aom_rb_read_literal(rb, 3);
+      aom_rb_read_bit(rb);
+      aom_rb_read_bit(rb);
+      const int temporal_group_ref_cnt = aom_rb_read_literal(rb, 3);
+      for (int j = 0; j < temporal_group_ref_cnt; j++) {
+        aom_rb_read_literal(rb, 8);
+      }
+    }
+  }
+}
+
+static void read_metadata_scalability(struct aom_read_bit_buffer *rb) {
+  const int scalability_mode_idc = aom_rb_read_literal(rb, 8);
+  if (scalability_mode_idc == SCALABILITY_SS) {
+    scalability_structure(rb);
+  }
+}
+
+static void read_metadata_timecode(struct aom_read_bit_buffer *rb) {
+  aom_rb_read_literal(rb, 5);  // counting_type f(5)
+  const int full_timestamp_flag =
+      aom_rb_read_bit(rb);     // full_timestamp_flag f(1)
+  aom_rb_read_bit(rb);         // discontinuity_flag (f1)
+  aom_rb_read_bit(rb);         // cnt_dropped_flag f(1)
+  aom_rb_read_literal(rb, 9);  // n_frames f(9)
+  if (full_timestamp_flag) {
+    aom_rb_read_literal(rb, 6);  // seconds_value f(6)
+    aom_rb_read_literal(rb, 6);  // minutes_value f(6)
+    aom_rb_read_literal(rb, 5);  // hours_value f(5)
+  } else {
+    const int seconds_flag = aom_rb_read_bit(rb);  // seconds_flag f(1)
+    if (seconds_flag) {
+      aom_rb_read_literal(rb, 6);                    // seconds_value f(6)
+      const int minutes_flag = aom_rb_read_bit(rb);  // minutes_flag f(1)
+      if (minutes_flag) {
+        aom_rb_read_literal(rb, 6);                  // minutes_value f(6)
+        const int hours_flag = aom_rb_read_bit(rb);  // hours_flag f(1)
+        if (hours_flag) {
+          aom_rb_read_literal(rb, 5);  // hours_value f(5)
+        }
+      }
+    }
+  }
+  // time_offset_length f(5)
+  const int time_offset_length = aom_rb_read_literal(rb, 5);
+  if (time_offset_length) {
+    // time_offset_value f(time_offset_length)
+    aom_rb_read_literal(rb, time_offset_length);
+  }
+}
+
+// Returns the last nonzero byte in 'data'. If there is no nonzero byte in
+// 'data', returns 0.
+//
+// Call this function to check the following requirement in the spec:
+//   This implies that when any payload data is present for this OBU type, at
+//   least one byte of the payload data (including the trailing bit) shall not
+//   be equal to 0.
+static uint8_t get_last_nonzero_byte(const uint8_t *data, size_t sz) {
+  // Scan backward and return on the first nonzero byte.
+  size_t i = sz;
+  while (i != 0) {
+    --i;
+    if (data[i] != 0) return data[i];
+  }
+  return 0;
+}
+
+// Checks the metadata for correct syntax but ignores the parsed metadata.
+//
+// On success, returns the number of bytes read from 'data'. On failure, sets
+// pbi->common.error.error_code and returns 0, or calls aom_internal_error()
+// and does not return.
+static size_t read_metadata(AV1Decoder *pbi, const uint8_t *data, size_t sz) {
+  AV1_COMMON *const cm = &pbi->common;
+  size_t type_length;
+  uint64_t type_value;
+  if (aom_uleb_decode(data, sz, &type_value, &type_length) < 0) {
+    cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+    return 0;
+  }
+  const OBU_METADATA_TYPE metadata_type = (OBU_METADATA_TYPE)type_value;
+  if (metadata_type == 0 || metadata_type >= 6) {
+    // If metadata_type is reserved for future use or a user private value,
+    // ignore the entire OBU and just check trailing bits.
+    if (get_last_nonzero_byte(data + type_length, sz - type_length) == 0) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return 0;
+    }
+    return sz;
+  }
+  if (metadata_type == OBU_METADATA_TYPE_ITUT_T35) {
+    // read_metadata_itut_t35() checks trailing bits.
+    read_metadata_itut_t35(pbi, data + type_length, sz - type_length);
+    return sz;
+  } else if (metadata_type == OBU_METADATA_TYPE_HDR_CLL) {
+    size_t bytes_read =
+        type_length +
+        read_metadata_hdr_cll(pbi, data + type_length, sz - type_length);
+    if (get_last_nonzero_byte(data + bytes_read, sz - bytes_read) != 0x80) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return 0;
+    }
+    return sz;
+  } else if (metadata_type == OBU_METADATA_TYPE_HDR_MDCV) {
+    size_t bytes_read =
+        type_length +
+        read_metadata_hdr_mdcv(pbi, data + type_length, sz - type_length);
+    if (get_last_nonzero_byte(data + bytes_read, sz - bytes_read) != 0x80) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return 0;
+    }
+    return sz;
+  }
+
+  struct aom_read_bit_buffer rb;
+  av1_init_read_bit_buffer(pbi, &rb, data + type_length, data + sz);
+  if (metadata_type == OBU_METADATA_TYPE_SCALABILITY) {
+    read_metadata_scalability(&rb);
+  } else {
+    assert(metadata_type == OBU_METADATA_TYPE_TIMECODE);
+    read_metadata_timecode(&rb);
+  }
+  if (av1_check_trailing_bits(pbi, &rb) != 0) {
+    // cm->error.error_code is already set.
+    return 0;
+  }
+  assert((rb.bit_offset & 7) == 0);
+  return type_length + (rb.bit_offset >> 3);
+}
+
+// On success, returns 'sz'. On failure, sets pbi->common.error.error_code and
+// returns 0.
+static size_t read_padding(AV1_COMMON *const cm, const uint8_t *data,
+                           size_t sz) {
+  // The spec allows a padding OBU to be header-only (i.e., obu_size = 0). So
+  // check trailing bits only if sz > 0.
+  if (sz > 0) {
+    // The payload of a padding OBU is byte aligned. Therefore the first
+    // trailing byte should be 0x80. See https://crbug.com/aomedia/2393.
+    const uint8_t last_nonzero_byte = get_last_nonzero_byte(data, sz);
+    if (last_nonzero_byte != 0x80) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return 0;
+    }
+  }
+  return sz;
+}
+
+// On success, returns a boolean that indicates whether the decoding of the
+// current frame is finished. On failure, sets cm->error.error_code and
+// returns -1.
+int aom_decode_frame_from_obus(struct AV1Decoder *pbi, const uint8_t *data,
+                               const uint8_t *data_end,
+                               const uint8_t **p_data_end) {
+  AV1_COMMON *const cm = &pbi->common;
+  int frame_decoding_finished = 0;
+  int is_first_tg_obu_received = 1;
+  // Whenever pbi->seen_frame_header is set to 1, frame_header is set to the
+  // beginning of the frame_header_obu and frame_header_size is set to its
+  // size. This allows us to check if a redundant frame_header_obu is a copy
+  // of the previous frame_header_obu.
+  //
+  // Initialize frame_header to a dummy nonnull pointer, otherwise the Clang
+  // Static Analyzer in clang 7.0.1 will falsely warn that a null pointer is
+  // passed as an argument to a 'nonnull' parameter of memcmp(). The initial
+  // value will not be used.
+  const uint8_t *frame_header = data;
+  uint32_t frame_header_size = 0;
+  ObuHeader obu_header;
+  memset(&obu_header, 0, sizeof(obu_header));
+  pbi->seen_frame_header = 0;
+  pbi->next_start_tile = 0;
+  pbi->num_tile_groups = 0;
+
+  if (data_end < data) {
+    cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+    return -1;
+  }
+
+  // Reset pbi->camera_frame_header_ready to 0 if cm->tiles.large_scale = 0.
+  if (!cm->tiles.large_scale) pbi->camera_frame_header_ready = 0;
+
+  // decode frame as a series of OBUs
+  while (!frame_decoding_finished && cm->error.error_code == AOM_CODEC_OK) {
+    struct aom_read_bit_buffer rb;
+    size_t payload_size = 0;
+    size_t decoded_payload_size = 0;
+    size_t obu_payload_offset = 0;
+    size_t bytes_read = 0;
+    const size_t bytes_available = data_end - data;
+
+    if (bytes_available == 0 && !pbi->seen_frame_header) {
+      *p_data_end = data;
+      cm->error.error_code = AOM_CODEC_OK;
+      break;
+    }
+
+    aom_codec_err_t status =
+        aom_read_obu_header_and_size(data, bytes_available, pbi->is_annexb,
+                                     &obu_header, &payload_size, &bytes_read);
+
+    if (status != AOM_CODEC_OK) {
+      cm->error.error_code = status;
+      return -1;
+    }
+
+    // Record obu size header information.
+    pbi->obu_size_hdr.data = data + obu_header.size;
+    pbi->obu_size_hdr.size = bytes_read - obu_header.size;
+
+    // Note: aom_read_obu_header_and_size() takes care of checking that this
+    // doesn't cause 'data' to advance past 'data_end'.
+    data += bytes_read;
+
+    if ((size_t)(data_end - data) < payload_size) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return -1;
+    }
+
+    cm->temporal_layer_id = obu_header.temporal_layer_id;
+    cm->spatial_layer_id = obu_header.spatial_layer_id;
+
+    if (obu_header.type != OBU_TEMPORAL_DELIMITER &&
+        obu_header.type != OBU_SEQUENCE_HEADER) {
+      // don't decode obu if it's not in current operating mode
+      if (!is_obu_in_current_operating_point(pbi, &obu_header)) {
+        data += payload_size;
+        continue;
+      }
+    }
+
+    av1_init_read_bit_buffer(pbi, &rb, data, data + payload_size);
+
+    switch (obu_header.type) {
+      case OBU_TEMPORAL_DELIMITER:
+        decoded_payload_size = read_temporal_delimiter_obu();
+        if (pbi->seen_frame_header) {
+          // A new temporal unit has started, but the frame in the previous
+          // temporal unit is incomplete.
+          cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+          return -1;
+        }
+        break;
+      case OBU_SEQUENCE_HEADER:
+        decoded_payload_size = read_sequence_header_obu(pbi, &rb);
+        if (cm->error.error_code != AOM_CODEC_OK) return -1;
+        // The sequence header should not change in the middle of a frame.
+        if (pbi->sequence_header_changed && pbi->seen_frame_header) {
+          cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+          return -1;
+        }
+        break;
+      case OBU_FRAME_HEADER:
+      case OBU_REDUNDANT_FRAME_HEADER:
+      case OBU_FRAME:
+        if (obu_header.type == OBU_REDUNDANT_FRAME_HEADER) {
+          if (!pbi->seen_frame_header) {
+            cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+            return -1;
+          }
+        } else {
+          // OBU_FRAME_HEADER or OBU_FRAME.
+          if (pbi->seen_frame_header) {
+            cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+            return -1;
+          }
+        }
+        // Only decode first frame header received
+        if (!pbi->seen_frame_header ||
+            (cm->tiles.large_scale && !pbi->camera_frame_header_ready)) {
+          frame_header_size = read_frame_header_obu(
+              pbi, &rb, data, p_data_end, obu_header.type != OBU_FRAME);
+          frame_header = data;
+          pbi->seen_frame_header = 1;
+          if (!pbi->ext_tile_debug && cm->tiles.large_scale)
+            pbi->camera_frame_header_ready = 1;
+        } else {
+          // Verify that the frame_header_obu is identical to the original
+          // frame_header_obu.
+          if (frame_header_size > payload_size ||
+              memcmp(data, frame_header, frame_header_size) != 0) {
+            cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+            return -1;
+          }
+          assert(rb.bit_offset == 0);
+          rb.bit_offset = 8 * frame_header_size;
+        }
+
+        decoded_payload_size = frame_header_size;
+        pbi->frame_header_size = frame_header_size;
+
+        if (cm->show_existing_frame) {
+          if (obu_header.type == OBU_FRAME) {
+            cm->error.error_code = AOM_CODEC_UNSUP_BITSTREAM;
+            return -1;
+          }
+          frame_decoding_finished = 1;
+          pbi->seen_frame_header = 0;
+          break;
+        }
+
+        // In large scale tile coding, decode the common camera frame header
+        // before any tile list OBU.
+        if (!pbi->ext_tile_debug && pbi->camera_frame_header_ready) {
+          frame_decoding_finished = 1;
+          // Skip the rest of the frame data.
+          decoded_payload_size = payload_size;
+          // Update data_end.
+          *p_data_end = data_end;
+          break;
+        }
+
+        if (obu_header.type != OBU_FRAME) break;
+        obu_payload_offset = frame_header_size;
+        // Byte align the reader before reading the tile group.
+        // byte_alignment() has set cm->error.error_code if it returns -1.
+        if (byte_alignment(cm, &rb)) return -1;
+        AOM_FALLTHROUGH_INTENDED;  // fall through to read tile group.
+      case OBU_TILE_GROUP:
+        if (!pbi->seen_frame_header) {
+          cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+          return -1;
+        }
+        if (obu_payload_offset > payload_size) {
+          cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+          return -1;
+        }
+        decoded_payload_size += read_one_tile_group_obu(
+            pbi, &rb, is_first_tg_obu_received, data + obu_payload_offset,
+            data + payload_size, p_data_end, &frame_decoding_finished,
+            obu_header.type == OBU_FRAME);
+        if (cm->error.error_code != AOM_CODEC_OK) return -1;
+        is_first_tg_obu_received = 0;
+        if (frame_decoding_finished) {
+          pbi->seen_frame_header = 0;
+          pbi->next_start_tile = 0;
+        }
+        pbi->num_tile_groups++;
+        break;
+      case OBU_METADATA:
+        decoded_payload_size = read_metadata(pbi, data, payload_size);
+        if (cm->error.error_code != AOM_CODEC_OK) return -1;
+        break;
+      case OBU_TILE_LIST:
+        if (CONFIG_NORMAL_TILE_MODE) {
+          cm->error.error_code = AOM_CODEC_UNSUP_BITSTREAM;
+          return -1;
+        }
+
+        // This OBU type is purely for the large scale tile coding mode.
+        // The common camera frame header has to be already decoded.
+        if (!pbi->camera_frame_header_ready) {
+          cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+          return -1;
+        }
+
+        cm->tiles.large_scale = 1;
+        av1_set_single_tile_decoding_mode(cm);
+        decoded_payload_size =
+            read_and_decode_one_tile_list(pbi, &rb, data, data + payload_size,
+                                          p_data_end, &frame_decoding_finished);
+        if (cm->error.error_code != AOM_CODEC_OK) return -1;
+        break;
+      case OBU_PADDING:
+        decoded_payload_size = read_padding(cm, data, payload_size);
+        if (cm->error.error_code != AOM_CODEC_OK) return -1;
+        break;
+      default:
+        // Skip unrecognized OBUs
+        if (payload_size > 0 &&
+            get_last_nonzero_byte(data, payload_size) == 0) {
+          cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+          return -1;
+        }
+        decoded_payload_size = payload_size;
+        break;
+    }
+
+    // Check that the signalled OBU size matches the actual amount of data read
+    if (decoded_payload_size > payload_size) {
+      cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+      return -1;
+    }
+
+    // If there are extra padding bytes, they should all be zero
+    while (decoded_payload_size < payload_size) {
+      uint8_t padding_byte = data[decoded_payload_size++];
+      if (padding_byte != 0) {
+        cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+        return -1;
+      }
+    }
+
+    data += payload_size;
+  }
+
+  if (cm->error.error_code != AOM_CODEC_OK) return -1;
+  return frame_decoding_finished;
+}
diff --git a/pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.h b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.h
new file mode 100644
index 0000000000..5eeaf1d567
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/av1/decoder/obu.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_AV1_DECODER_OBU_H_
+#define AOM_AV1_DECODER_OBU_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_codec.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/decoder/decoder.h"
+
+// Try to decode one frame from a buffer.
+// Returns 1 if we decoded a frame,
+//         0 if we didn't decode a frame but that's okay
+//           (eg, if there was a frame but we skipped it),
+//     or -1 on error
+int aom_decode_frame_from_obus(struct AV1Decoder *pbi, const uint8_t *data,
+                               const uint8_t *data_end,
+                               const uint8_t **p_data_end);
+
+aom_codec_err_t aom_get_num_layers_from_operating_point_idc(
+    int operating_point_idc, unsigned int *number_spatial_layers,
+    unsigned int *number_temporal_layers);
+
+#endif  // AOM_AV1_DECODER_OBU_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/config/aom_config.h b/pxr/imaging/plugin/hioAvif/aom/config/aom_config.h
new file mode 100644
index 0000000000..e6b09b39a2
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/config/aom_config.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2023, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+#ifndef AOM_CONFIG_H_
+#define AOM_CONFIG_H_
+#define ARCH_ARM 0
+#define ARCH_MIPS 0
+#define ARCH_PPC 0
+#define ARCH_X86 0
+#define ARCH_X86_64 0
+#define CONFIG_ACCOUNTING 0
+#define CONFIG_ANALYZER 0
+#define CONFIG_AV1_DECODER 1
+#define CONFIG_AV1_ENCODER 0
+#define CONFIG_AV1_HIGHBITDEPTH 1
+#define CONFIG_AV1_TEMPORAL_DENOISING 1
+#define CONFIG_BIG_ENDIAN 0
+#define CONFIG_BITSTREAM_DEBUG 0
+#define CONFIG_COEFFICIENT_RANGE_CHECKING 0
+#define CONFIG_COLLECT_COMPONENT_TIMING 0
+#define CONFIG_COLLECT_PARTITION_STATS 0
+#define CONFIG_COLLECT_RD_STATS 0
+#define CONFIG_DEBUG 0
+#define CONFIG_DENOISE 1
+#define CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 1
+#define CONFIG_DIST_8X8 0
+#define CONFIG_ENTROPY_STATS 0
+#define CONFIG_EXCLUDE_SIMD_MISMATCH 0
+#define CONFIG_GCC 1
+#define CONFIG_GCOV 0
+#define CONFIG_GPROF 0
+#define CONFIG_INSPECTION 0
+#define CONFIG_INTERNAL_STATS 0
+#define CONFIG_INTER_STATS_ONLY 0
+#define CONFIG_LIBYUV 1
+#define CONFIG_LPF_MASK 0
+#define CONFIG_MAX_DECODE_PROFILE 2
+#define CONFIG_MISMATCH_DEBUG 0
+#define CONFIG_MULTITHREAD 1
+#define CONFIG_NN_V2 0
+#define CONFIG_NORMAL_TILE_MODE 0
+#define CONFIG_OPTICAL_FLOW_API 0
+#define CONFIG_OS_SUPPORT 1
+#define CONFIG_PIC 0
+#define CONFIG_RD_DEBUG 0
+#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_RT_ML_PARTITIONING 0
+#define CONFIG_RUNTIME_CPU_DETECT 1
+#define CONFIG_SHARED 0
+#define CONFIG_SHARP_SETTINGS 0
+#define CONFIG_SIZE_LIMIT 0
+#define CONFIG_SPATIAL_RESAMPLING 1
+#define CONFIG_SPEED_STATS 0
+#define CONFIG_TUNE_VMAF 0
+#define CONFIG_USE_VMAF_RC 0
+#define CONFIG_WEBM_IO 1
+#define DECODE_HEIGHT_LIMIT 0
+#define DECODE_WIDTH_LIMIT 0
+#define FORCE_HIGHBITDEPTH_DECODING 0
+#define HAVE_AVX 0
+#define HAVE_AVX2 0
+#define HAVE_DSPR2 0
+#define HAVE_FEXCEPT 0
+#define HAVE_MIPS32 0
+#define HAVE_MIPS64 0
+#define HAVE_MMX 0
+#define HAVE_MSA 0
+#define HAVE_NEON 0
+#if defined(_WIN32) && !defined(__MINGW32__)
+#define HAVE_PTHREAD_H 0
+#else
+#define HAVE_PTHREAD_H 1
+#endif
+#define HAVE_SSE 0
+#define HAVE_SSE2 0
+#define HAVE_SSE3 0
+#define HAVE_SSE4_1 0
+#define HAVE_SSE4_2 0
+#define HAVE_SSSE3 0
+#define HAVE_UNISTD_H 1
+#define HAVE_VSX 0
+#define HAVE_WXWIDGETS 0
+#define INLINE inline
+#endif  // AOM_CONFIG_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h b/pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h
new file mode 100644
index 0000000000..a615c44707
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/config/aom_dsp_rtcd.h
@@ -0,0 +1,4780 @@
+// This file is generated. Do not edit.
+#ifndef AOM_DSP_RTCD_H_
+#define AOM_DSP_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+/*
+ * DSP
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/aom_dsp_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/blockd.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+unsigned int aom_avg_4x4_c(const uint8_t *, int p);
+#define aom_avg_4x4 aom_avg_4x4_c
+
+unsigned int aom_avg_8x8_c(const uint8_t *, int p);
+#define aom_avg_8x8 aom_avg_8x8_c
+
+void aom_blend_a64_hmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h);
+#define aom_blend_a64_hmask aom_blend_a64_hmask_c
+
+void aom_blend_a64_mask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int w, int h, int subw, int subh);
+#define aom_blend_a64_mask aom_blend_a64_mask_c
+
+void aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h);
+#define aom_blend_a64_vmask aom_blend_a64_vmask_c
+
+void aom_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride);
+#define aom_comp_avg_pred aom_comp_avg_pred_c
+
+void aom_comp_avg_upsampled_pred_c(MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
+                                                   const MV *const mv, uint8_t *comp_pred, const uint8_t *pred, int width,
+                                                   int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref,
+                                                   int ref_stride, int subpel_search);
+#define aom_comp_avg_upsampled_pred aom_comp_avg_upsampled_pred_c
+
+void aom_comp_mask_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask);
+#define aom_comp_mask_pred aom_comp_mask_pred_c
+
+void aom_comp_mask_upsampled_pred_c(MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
+                                                       const MV *const mv, uint8_t *comp_pred, const uint8_t *pred, int width,
+                                                       int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref,
+                                                       int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask,
+                                                       int subpel_search);
+#define aom_comp_mask_upsampled_pred aom_comp_mask_upsampled_pred_c
+
+void aom_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+#define aom_convolve8 aom_convolve8_c
+
+void aom_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+#define aom_convolve8_horiz aom_convolve8_horiz_c
+
+void aom_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+#define aom_convolve8_vert aom_convolve8_vert_c
+
+void aom_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, int w, int h);
+#define aom_convolve_copy aom_convolve_copy_c
+
+void aom_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_16x16 aom_dc_128_predictor_16x16_c
+
+void aom_dc_128_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_16x32 aom_dc_128_predictor_16x32_c
+
+void aom_dc_128_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_16x4 aom_dc_128_predictor_16x4_c
+
+void aom_dc_128_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_16x64 aom_dc_128_predictor_16x64_c
+
+void aom_dc_128_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_16x8 aom_dc_128_predictor_16x8_c
+
+void aom_dc_128_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_2x2 aom_dc_128_predictor_2x2_c
+
+void aom_dc_128_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_32x16 aom_dc_128_predictor_32x16_c
+
+void aom_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_32x32 aom_dc_128_predictor_32x32_c
+
+void aom_dc_128_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_32x64 aom_dc_128_predictor_32x64_c
+
+void aom_dc_128_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_32x8 aom_dc_128_predictor_32x8_c
+
+void aom_dc_128_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_4x16 aom_dc_128_predictor_4x16_c
+
+void aom_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_4x4 aom_dc_128_predictor_4x4_c
+
+void aom_dc_128_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_4x8 aom_dc_128_predictor_4x8_c
+
+void aom_dc_128_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_64x16 aom_dc_128_predictor_64x16_c
+
+void aom_dc_128_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_64x32 aom_dc_128_predictor_64x32_c
+
+void aom_dc_128_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_64x64 aom_dc_128_predictor_64x64_c
+
+void aom_dc_128_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_8x16 aom_dc_128_predictor_8x16_c
+
+void aom_dc_128_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_8x32 aom_dc_128_predictor_8x32_c
+
+void aom_dc_128_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_8x4 aom_dc_128_predictor_8x4_c
+
+void aom_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_128_predictor_8x8 aom_dc_128_predictor_8x8_c
+
+void aom_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_16x16 aom_dc_left_predictor_16x16_c
+
+void aom_dc_left_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_16x32 aom_dc_left_predictor_16x32_c
+
+void aom_dc_left_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_16x4 aom_dc_left_predictor_16x4_c
+
+void aom_dc_left_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_16x64 aom_dc_left_predictor_16x64_c
+
+void aom_dc_left_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_16x8 aom_dc_left_predictor_16x8_c
+
+void aom_dc_left_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_2x2 aom_dc_left_predictor_2x2_c
+
+void aom_dc_left_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_32x16 aom_dc_left_predictor_32x16_c
+
+void aom_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_32x32 aom_dc_left_predictor_32x32_c
+
+void aom_dc_left_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_32x64 aom_dc_left_predictor_32x64_c
+
+void aom_dc_left_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_32x8 aom_dc_left_predictor_32x8_c
+
+void aom_dc_left_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_4x16 aom_dc_left_predictor_4x16_c
+
+void aom_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_4x4 aom_dc_left_predictor_4x4_c
+
+void aom_dc_left_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_4x8 aom_dc_left_predictor_4x8_c
+
+void aom_dc_left_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_64x16 aom_dc_left_predictor_64x16_c
+
+void aom_dc_left_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_64x32 aom_dc_left_predictor_64x32_c
+
+void aom_dc_left_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_64x64 aom_dc_left_predictor_64x64_c
+
+void aom_dc_left_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_8x16 aom_dc_left_predictor_8x16_c
+
+void aom_dc_left_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_8x32 aom_dc_left_predictor_8x32_c
+
+void aom_dc_left_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_8x4 aom_dc_left_predictor_8x4_c
+
+void aom_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_left_predictor_8x8 aom_dc_left_predictor_8x8_c
+
+void aom_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_16x16 aom_dc_predictor_16x16_c
+
+void aom_dc_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_16x32 aom_dc_predictor_16x32_c
+
+void aom_dc_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_16x4 aom_dc_predictor_16x4_c
+
+void aom_dc_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_16x64 aom_dc_predictor_16x64_c
+
+void aom_dc_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_16x8 aom_dc_predictor_16x8_c
+
+void aom_dc_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_2x2 aom_dc_predictor_2x2_c
+
+void aom_dc_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_32x16 aom_dc_predictor_32x16_c
+
+void aom_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_32x32 aom_dc_predictor_32x32_c
+
+void aom_dc_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_32x64 aom_dc_predictor_32x64_c
+
+void aom_dc_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_32x8 aom_dc_predictor_32x8_c
+
+void aom_dc_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_4x16 aom_dc_predictor_4x16_c
+
+void aom_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_4x4 aom_dc_predictor_4x4_c
+
+void aom_dc_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_4x8 aom_dc_predictor_4x8_c
+
+void aom_dc_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_64x16 aom_dc_predictor_64x16_c
+
+void aom_dc_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_64x32 aom_dc_predictor_64x32_c
+
+void aom_dc_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_64x64 aom_dc_predictor_64x64_c
+
+void aom_dc_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_8x16 aom_dc_predictor_8x16_c
+
+void aom_dc_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_8x32 aom_dc_predictor_8x32_c
+
+void aom_dc_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_8x4 aom_dc_predictor_8x4_c
+
+void aom_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_predictor_8x8 aom_dc_predictor_8x8_c
+
+void aom_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_16x16 aom_dc_top_predictor_16x16_c
+
+void aom_dc_top_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_16x32 aom_dc_top_predictor_16x32_c
+
+void aom_dc_top_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_16x4 aom_dc_top_predictor_16x4_c
+
+void aom_dc_top_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_16x64 aom_dc_top_predictor_16x64_c
+
+void aom_dc_top_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_16x8 aom_dc_top_predictor_16x8_c
+
+void aom_dc_top_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_2x2 aom_dc_top_predictor_2x2_c
+
+void aom_dc_top_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_32x16 aom_dc_top_predictor_32x16_c
+
+void aom_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_32x32 aom_dc_top_predictor_32x32_c
+
+void aom_dc_top_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_32x64 aom_dc_top_predictor_32x64_c
+
+void aom_dc_top_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_32x8 aom_dc_top_predictor_32x8_c
+
+void aom_dc_top_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_4x16 aom_dc_top_predictor_4x16_c
+
+void aom_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_4x4 aom_dc_top_predictor_4x4_c
+
+void aom_dc_top_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_4x8 aom_dc_top_predictor_4x8_c
+
+void aom_dc_top_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_64x16 aom_dc_top_predictor_64x16_c
+
+void aom_dc_top_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_64x32 aom_dc_top_predictor_64x32_c
+
+void aom_dc_top_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_64x64 aom_dc_top_predictor_64x64_c
+
+void aom_dc_top_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_8x16 aom_dc_top_predictor_8x16_c
+
+void aom_dc_top_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_8x32 aom_dc_top_predictor_8x32_c
+
+void aom_dc_top_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_8x4 aom_dc_top_predictor_8x4_c
+
+void aom_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_dc_top_predictor_8x8 aom_dc_top_predictor_8x8_c
+
+void aom_dist_wtd_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_comp_avg_pred aom_dist_wtd_comp_avg_pred_c
+
+void aom_dist_wtd_comp_avg_upsampled_pred_c(MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
+                                                       const MV *const mv, uint8_t *comp_pred, const uint8_t *pred, int width,
+                                                       int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref,
+                                                       int ref_stride, const DIST_WTD_COMP_PARAMS *jcp_param, int subpel_search);
+#define aom_dist_wtd_comp_avg_upsampled_pred aom_dist_wtd_comp_avg_upsampled_pred_c
+
+unsigned int aom_dist_wtd_sad128x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad128x128_avg aom_dist_wtd_sad128x128_avg_c
+
+unsigned int aom_dist_wtd_sad128x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad128x64_avg aom_dist_wtd_sad128x64_avg_c
+
+unsigned int aom_dist_wtd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad16x16_avg aom_dist_wtd_sad16x16_avg_c
+
+unsigned int aom_dist_wtd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad16x32_avg aom_dist_wtd_sad16x32_avg_c
+
+unsigned int aom_dist_wtd_sad16x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad16x4_avg aom_dist_wtd_sad16x4_avg_c
+
+unsigned int aom_dist_wtd_sad16x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad16x64_avg aom_dist_wtd_sad16x64_avg_c
+
+unsigned int aom_dist_wtd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad16x8_avg aom_dist_wtd_sad16x8_avg_c
+
+unsigned int aom_dist_wtd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad32x16_avg aom_dist_wtd_sad32x16_avg_c
+
+unsigned int aom_dist_wtd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad32x32_avg aom_dist_wtd_sad32x32_avg_c
+
+unsigned int aom_dist_wtd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad32x64_avg aom_dist_wtd_sad32x64_avg_c
+
+unsigned int aom_dist_wtd_sad32x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad32x8_avg aom_dist_wtd_sad32x8_avg_c
+
+unsigned int aom_dist_wtd_sad4x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad4x16_avg aom_dist_wtd_sad4x16_avg_c
+
+unsigned int aom_dist_wtd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad4x4_avg aom_dist_wtd_sad4x4_avg_c
+
+unsigned int aom_dist_wtd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad4x8_avg aom_dist_wtd_sad4x8_avg_c
+
+unsigned int aom_dist_wtd_sad64x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad64x128_avg aom_dist_wtd_sad64x128_avg_c
+
+unsigned int aom_dist_wtd_sad64x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad64x16_avg aom_dist_wtd_sad64x16_avg_c
+
+unsigned int aom_dist_wtd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad64x32_avg aom_dist_wtd_sad64x32_avg_c
+
+unsigned int aom_dist_wtd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad64x64_avg aom_dist_wtd_sad64x64_avg_c
+
+unsigned int aom_dist_wtd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad8x16_avg aom_dist_wtd_sad8x16_avg_c
+
+unsigned int aom_dist_wtd_sad8x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad8x32_avg aom_dist_wtd_sad8x32_avg_c
+
+unsigned int aom_dist_wtd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad8x4_avg aom_dist_wtd_sad8x4_avg_c
+
+unsigned int aom_dist_wtd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sad8x8_avg aom_dist_wtd_sad8x8_avg_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance128x128 aom_dist_wtd_sub_pixel_avg_variance128x128_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance128x64 aom_dist_wtd_sub_pixel_avg_variance128x64_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance16x16 aom_dist_wtd_sub_pixel_avg_variance16x16_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance16x32 aom_dist_wtd_sub_pixel_avg_variance16x32_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance16x4 aom_dist_wtd_sub_pixel_avg_variance16x4_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance16x64 aom_dist_wtd_sub_pixel_avg_variance16x64_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance16x8 aom_dist_wtd_sub_pixel_avg_variance16x8_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance32x16 aom_dist_wtd_sub_pixel_avg_variance32x16_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance32x32 aom_dist_wtd_sub_pixel_avg_variance32x32_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance32x64 aom_dist_wtd_sub_pixel_avg_variance32x64_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance32x8 aom_dist_wtd_sub_pixel_avg_variance32x8_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance4x16 aom_dist_wtd_sub_pixel_avg_variance4x16_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance4x4 aom_dist_wtd_sub_pixel_avg_variance4x4_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance4x8 aom_dist_wtd_sub_pixel_avg_variance4x8_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance64x128 aom_dist_wtd_sub_pixel_avg_variance64x128_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance64x16 aom_dist_wtd_sub_pixel_avg_variance64x16_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance64x32 aom_dist_wtd_sub_pixel_avg_variance64x32_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance64x64 aom_dist_wtd_sub_pixel_avg_variance64x64_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance8x16 aom_dist_wtd_sub_pixel_avg_variance8x16_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance8x32 aom_dist_wtd_sub_pixel_avg_variance8x32_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance8x4 aom_dist_wtd_sub_pixel_avg_variance8x4_c
+
+uint32_t aom_dist_wtd_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_dist_wtd_sub_pixel_avg_variance8x8 aom_dist_wtd_sub_pixel_avg_variance8x8_c
+
+void aom_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride);
+#define aom_fdct4x4 aom_fdct4x4_c
+
+void aom_fdct4x4_lp_c(const int16_t *input, int16_t *output, int stride);
+#define aom_fdct4x4_lp aom_fdct4x4_lp_c
+
+void aom_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride);
+#define aom_fdct8x8 aom_fdct8x8_c
+
+void aom_fft16x16_float_c(const float *input, float *temp, float *output);
+#define aom_fft16x16_float aom_fft16x16_float_c
+
+void aom_fft2x2_float_c(const float *input, float *temp, float *output);
+#define aom_fft2x2_float aom_fft2x2_float_c
+
+void aom_fft32x32_float_c(const float *input, float *temp, float *output);
+#define aom_fft32x32_float aom_fft32x32_float_c
+
+void aom_fft4x4_float_c(const float *input, float *temp, float *output);
+#define aom_fft4x4_float aom_fft4x4_float_c
+
+void aom_fft8x8_float_c(const float *input, float *temp, float *output);
+#define aom_fft8x8_float aom_fft8x8_float_c
+
+void aom_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define aom_get16x16var aom_get16x16var_c
+
+unsigned int aom_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride);
+#define aom_get4x4sse_cs aom_get4x4sse_cs_c
+
+void aom_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define aom_get8x8var aom_get8x8var_c
+
+void aom_get_blk_sse_sum_c(const int16_t *data, int stride, int bw, int bh, int *x_sum, int64_t *x2_sum);
+#define aom_get_blk_sse_sum aom_get_blk_sse_sum_c
+
+unsigned int aom_get_mb_ss_c(const int16_t *);
+#define aom_get_mb_ss aom_get_mb_ss_c
+
+void aom_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_16x16 aom_h_predictor_16x16_c
+
+void aom_h_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_16x32 aom_h_predictor_16x32_c
+
+void aom_h_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_16x4 aom_h_predictor_16x4_c
+
+void aom_h_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_16x64 aom_h_predictor_16x64_c
+
+void aom_h_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_16x8 aom_h_predictor_16x8_c
+
+void aom_h_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_2x2 aom_h_predictor_2x2_c
+
+void aom_h_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_32x16 aom_h_predictor_32x16_c
+
+void aom_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_32x32 aom_h_predictor_32x32_c
+
+void aom_h_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_32x64 aom_h_predictor_32x64_c
+
+void aom_h_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_32x8 aom_h_predictor_32x8_c
+
+void aom_h_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_4x16 aom_h_predictor_4x16_c
+
+void aom_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_4x4 aom_h_predictor_4x4_c
+
+void aom_h_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_4x8 aom_h_predictor_4x8_c
+
+void aom_h_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_64x16 aom_h_predictor_64x16_c
+
+void aom_h_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_64x32 aom_h_predictor_64x32_c
+
+void aom_h_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_64x64 aom_h_predictor_64x64_c
+
+void aom_h_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_8x16 aom_h_predictor_8x16_c
+
+void aom_h_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_8x32 aom_h_predictor_8x32_c
+
+void aom_h_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_8x4 aom_h_predictor_8x4_c
+
+void aom_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_h_predictor_8x8 aom_h_predictor_8x8_c
+
+void aom_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, tran_low_t *coeff);
+#define aom_hadamard_16x16 aom_hadamard_16x16_c
+
+void aom_hadamard_32x32_c(const int16_t *src_diff, ptrdiff_t src_stride, tran_low_t *coeff);
+#define aom_hadamard_32x32 aom_hadamard_32x32_c
+
+void aom_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, tran_low_t *coeff);
+#define aom_hadamard_8x8 aom_hadamard_8x8_c
+
+void aom_hadamard_lp_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff);
+#define aom_hadamard_lp_16x16 aom_hadamard_lp_16x16_c
+
+void aom_hadamard_lp_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff);
+#define aom_hadamard_lp_8x8 aom_hadamard_lp_8x8_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128 aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x128_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64 aom_highbd_10_dist_wtd_sub_pixel_avg_variance128x64_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16 aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x16_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32 aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x32_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4 aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x4_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64 aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x64_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8 aom_highbd_10_dist_wtd_sub_pixel_avg_variance16x8_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16 aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x16_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32 aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x32_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64 aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x64_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8 aom_highbd_10_dist_wtd_sub_pixel_avg_variance32x8_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16 aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x16_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4 aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x4_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8 aom_highbd_10_dist_wtd_sub_pixel_avg_variance4x8_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128 aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x128_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16 aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x16_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32 aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x32_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64 aom_highbd_10_dist_wtd_sub_pixel_avg_variance64x64_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16 aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x16_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32 aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x32_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4 aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x4_c
+
+uint32_t aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8 aom_highbd_10_dist_wtd_sub_pixel_avg_variance8x8_c
+
+void aom_highbd_10_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define aom_highbd_10_get16x16var aom_highbd_10_get16x16var_c
+
+void aom_highbd_10_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define aom_highbd_10_get8x8var aom_highbd_10_get8x8var_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance128x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance128x128 aom_highbd_10_masked_sub_pixel_variance128x128_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance128x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance128x64 aom_highbd_10_masked_sub_pixel_variance128x64_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance16x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance16x16 aom_highbd_10_masked_sub_pixel_variance16x16_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance16x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance16x32 aom_highbd_10_masked_sub_pixel_variance16x32_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance16x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance16x4 aom_highbd_10_masked_sub_pixel_variance16x4_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance16x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance16x64 aom_highbd_10_masked_sub_pixel_variance16x64_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance16x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance16x8 aom_highbd_10_masked_sub_pixel_variance16x8_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance32x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance32x16 aom_highbd_10_masked_sub_pixel_variance32x16_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance32x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance32x32 aom_highbd_10_masked_sub_pixel_variance32x32_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance32x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance32x64 aom_highbd_10_masked_sub_pixel_variance32x64_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance32x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance32x8 aom_highbd_10_masked_sub_pixel_variance32x8_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance4x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance4x16 aom_highbd_10_masked_sub_pixel_variance4x16_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance4x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance4x4 aom_highbd_10_masked_sub_pixel_variance4x4_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance4x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance4x8 aom_highbd_10_masked_sub_pixel_variance4x8_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance64x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance64x128 aom_highbd_10_masked_sub_pixel_variance64x128_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance64x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance64x16 aom_highbd_10_masked_sub_pixel_variance64x16_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance64x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance64x32 aom_highbd_10_masked_sub_pixel_variance64x32_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance64x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance64x64 aom_highbd_10_masked_sub_pixel_variance64x64_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance8x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance8x16 aom_highbd_10_masked_sub_pixel_variance8x16_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance8x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance8x32 aom_highbd_10_masked_sub_pixel_variance8x32_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance8x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance8x4 aom_highbd_10_masked_sub_pixel_variance8x4_c
+
+unsigned int aom_highbd_10_masked_sub_pixel_variance8x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_10_masked_sub_pixel_variance8x8 aom_highbd_10_masked_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_10_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_10_mse16x16 aom_highbd_10_mse16x16_c
+
+unsigned int aom_highbd_10_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_10_mse16x8 aom_highbd_10_mse16x8_c
+
+unsigned int aom_highbd_10_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_10_mse8x16 aom_highbd_10_mse8x16_c
+
+unsigned int aom_highbd_10_mse8x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_10_mse8x8 aom_highbd_10_mse8x8_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance128x128_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance128x128 aom_highbd_10_obmc_sub_pixel_variance128x128_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance128x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance128x64 aom_highbd_10_obmc_sub_pixel_variance128x64_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance16x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance16x16 aom_highbd_10_obmc_sub_pixel_variance16x16_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance16x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance16x32 aom_highbd_10_obmc_sub_pixel_variance16x32_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance16x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance16x4 aom_highbd_10_obmc_sub_pixel_variance16x4_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance16x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance16x64 aom_highbd_10_obmc_sub_pixel_variance16x64_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance16x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance16x8 aom_highbd_10_obmc_sub_pixel_variance16x8_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance32x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance32x16 aom_highbd_10_obmc_sub_pixel_variance32x16_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance32x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance32x32 aom_highbd_10_obmc_sub_pixel_variance32x32_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance32x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance32x64 aom_highbd_10_obmc_sub_pixel_variance32x64_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance32x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance32x8 aom_highbd_10_obmc_sub_pixel_variance32x8_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance4x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance4x16 aom_highbd_10_obmc_sub_pixel_variance4x16_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance4x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance4x4 aom_highbd_10_obmc_sub_pixel_variance4x4_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance4x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance4x8 aom_highbd_10_obmc_sub_pixel_variance4x8_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance64x128_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance64x128 aom_highbd_10_obmc_sub_pixel_variance64x128_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance64x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance64x16 aom_highbd_10_obmc_sub_pixel_variance64x16_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance64x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance64x32 aom_highbd_10_obmc_sub_pixel_variance64x32_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance64x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance64x64 aom_highbd_10_obmc_sub_pixel_variance64x64_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance8x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance8x16 aom_highbd_10_obmc_sub_pixel_variance8x16_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance8x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance8x32 aom_highbd_10_obmc_sub_pixel_variance8x32_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance8x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance8x4 aom_highbd_10_obmc_sub_pixel_variance8x4_c
+
+unsigned int aom_highbd_10_obmc_sub_pixel_variance8x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_sub_pixel_variance8x8 aom_highbd_10_obmc_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_10_obmc_variance128x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance128x128 aom_highbd_10_obmc_variance128x128_c
+
+unsigned int aom_highbd_10_obmc_variance128x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance128x64 aom_highbd_10_obmc_variance128x64_c
+
+unsigned int aom_highbd_10_obmc_variance16x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance16x16 aom_highbd_10_obmc_variance16x16_c
+
+unsigned int aom_highbd_10_obmc_variance16x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance16x32 aom_highbd_10_obmc_variance16x32_c
+
+unsigned int aom_highbd_10_obmc_variance16x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance16x4 aom_highbd_10_obmc_variance16x4_c
+
+unsigned int aom_highbd_10_obmc_variance16x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance16x64 aom_highbd_10_obmc_variance16x64_c
+
+unsigned int aom_highbd_10_obmc_variance16x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance16x8 aom_highbd_10_obmc_variance16x8_c
+
+unsigned int aom_highbd_10_obmc_variance32x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance32x16 aom_highbd_10_obmc_variance32x16_c
+
+unsigned int aom_highbd_10_obmc_variance32x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance32x32 aom_highbd_10_obmc_variance32x32_c
+
+unsigned int aom_highbd_10_obmc_variance32x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance32x64 aom_highbd_10_obmc_variance32x64_c
+
+unsigned int aom_highbd_10_obmc_variance32x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance32x8 aom_highbd_10_obmc_variance32x8_c
+
+unsigned int aom_highbd_10_obmc_variance4x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance4x16 aom_highbd_10_obmc_variance4x16_c
+
+unsigned int aom_highbd_10_obmc_variance4x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance4x4 aom_highbd_10_obmc_variance4x4_c
+
+unsigned int aom_highbd_10_obmc_variance4x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance4x8 aom_highbd_10_obmc_variance4x8_c
+
+unsigned int aom_highbd_10_obmc_variance64x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance64x128 aom_highbd_10_obmc_variance64x128_c
+
+unsigned int aom_highbd_10_obmc_variance64x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance64x16 aom_highbd_10_obmc_variance64x16_c
+
+unsigned int aom_highbd_10_obmc_variance64x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance64x32 aom_highbd_10_obmc_variance64x32_c
+
+unsigned int aom_highbd_10_obmc_variance64x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance64x64 aom_highbd_10_obmc_variance64x64_c
+
+unsigned int aom_highbd_10_obmc_variance8x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance8x16 aom_highbd_10_obmc_variance8x16_c
+
+unsigned int aom_highbd_10_obmc_variance8x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance8x32 aom_highbd_10_obmc_variance8x32_c
+
+unsigned int aom_highbd_10_obmc_variance8x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance8x4 aom_highbd_10_obmc_variance8x4_c
+
+unsigned int aom_highbd_10_obmc_variance8x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_10_obmc_variance8x8 aom_highbd_10_obmc_variance8x8_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance128x128 aom_highbd_10_sub_pixel_avg_variance128x128_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance128x64 aom_highbd_10_sub_pixel_avg_variance128x64_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance16x16 aom_highbd_10_sub_pixel_avg_variance16x16_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance16x32 aom_highbd_10_sub_pixel_avg_variance16x32_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance16x4 aom_highbd_10_sub_pixel_avg_variance16x4_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance16x64 aom_highbd_10_sub_pixel_avg_variance16x64_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance16x8 aom_highbd_10_sub_pixel_avg_variance16x8_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance32x16 aom_highbd_10_sub_pixel_avg_variance32x16_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance32x32 aom_highbd_10_sub_pixel_avg_variance32x32_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance32x64 aom_highbd_10_sub_pixel_avg_variance32x64_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance32x8 aom_highbd_10_sub_pixel_avg_variance32x8_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance4x16 aom_highbd_10_sub_pixel_avg_variance4x16_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance4x4 aom_highbd_10_sub_pixel_avg_variance4x4_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance4x8 aom_highbd_10_sub_pixel_avg_variance4x8_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance64x128 aom_highbd_10_sub_pixel_avg_variance64x128_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance64x16 aom_highbd_10_sub_pixel_avg_variance64x16_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance64x32 aom_highbd_10_sub_pixel_avg_variance64x32_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance64x64 aom_highbd_10_sub_pixel_avg_variance64x64_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance8x16 aom_highbd_10_sub_pixel_avg_variance8x16_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance8x32 aom_highbd_10_sub_pixel_avg_variance8x32_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance8x4 aom_highbd_10_sub_pixel_avg_variance8x4_c
+
+uint32_t aom_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_10_sub_pixel_avg_variance8x8 aom_highbd_10_sub_pixel_avg_variance8x8_c
+
+uint32_t aom_highbd_10_sub_pixel_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance128x128 aom_highbd_10_sub_pixel_variance128x128_c
+
+uint32_t aom_highbd_10_sub_pixel_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance128x64 aom_highbd_10_sub_pixel_variance128x64_c
+
+uint32_t aom_highbd_10_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance16x16 aom_highbd_10_sub_pixel_variance16x16_c
+
+uint32_t aom_highbd_10_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance16x32 aom_highbd_10_sub_pixel_variance16x32_c
+
+uint32_t aom_highbd_10_sub_pixel_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance16x4 aom_highbd_10_sub_pixel_variance16x4_c
+
+uint32_t aom_highbd_10_sub_pixel_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance16x64 aom_highbd_10_sub_pixel_variance16x64_c
+
+uint32_t aom_highbd_10_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance16x8 aom_highbd_10_sub_pixel_variance16x8_c
+
+uint32_t aom_highbd_10_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance32x16 aom_highbd_10_sub_pixel_variance32x16_c
+
+uint32_t aom_highbd_10_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance32x32 aom_highbd_10_sub_pixel_variance32x32_c
+
+uint32_t aom_highbd_10_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance32x64 aom_highbd_10_sub_pixel_variance32x64_c
+
+uint32_t aom_highbd_10_sub_pixel_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance32x8 aom_highbd_10_sub_pixel_variance32x8_c
+
+uint32_t aom_highbd_10_sub_pixel_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance4x16 aom_highbd_10_sub_pixel_variance4x16_c
+
+uint32_t aom_highbd_10_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance4x4 aom_highbd_10_sub_pixel_variance4x4_c
+
+uint32_t aom_highbd_10_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance4x8 aom_highbd_10_sub_pixel_variance4x8_c
+
+uint32_t aom_highbd_10_sub_pixel_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance64x128 aom_highbd_10_sub_pixel_variance64x128_c
+
+uint32_t aom_highbd_10_sub_pixel_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance64x16 aom_highbd_10_sub_pixel_variance64x16_c
+
+uint32_t aom_highbd_10_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance64x32 aom_highbd_10_sub_pixel_variance64x32_c
+
+uint32_t aom_highbd_10_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance64x64 aom_highbd_10_sub_pixel_variance64x64_c
+
+uint32_t aom_highbd_10_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance8x16 aom_highbd_10_sub_pixel_variance8x16_c
+
+uint32_t aom_highbd_10_sub_pixel_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance8x32 aom_highbd_10_sub_pixel_variance8x32_c
+
+uint32_t aom_highbd_10_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance8x4 aom_highbd_10_sub_pixel_variance8x4_c
+
+uint32_t aom_highbd_10_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_sub_pixel_variance8x8 aom_highbd_10_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_10_variance128x128_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance128x128 aom_highbd_10_variance128x128_c
+
+unsigned int aom_highbd_10_variance128x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance128x64 aom_highbd_10_variance128x64_c
+
+unsigned int aom_highbd_10_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance16x16 aom_highbd_10_variance16x16_c
+
+unsigned int aom_highbd_10_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance16x32 aom_highbd_10_variance16x32_c
+
+unsigned int aom_highbd_10_variance16x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_variance16x4 aom_highbd_10_variance16x4_c
+
+unsigned int aom_highbd_10_variance16x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_variance16x64 aom_highbd_10_variance16x64_c
+
+unsigned int aom_highbd_10_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance16x8 aom_highbd_10_variance16x8_c
+
+unsigned int aom_highbd_10_variance2x2_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance2x2 aom_highbd_10_variance2x2_c
+
+unsigned int aom_highbd_10_variance2x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance2x4 aom_highbd_10_variance2x4_c
+
+unsigned int aom_highbd_10_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance32x16 aom_highbd_10_variance32x16_c
+
+unsigned int aom_highbd_10_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance32x32 aom_highbd_10_variance32x32_c
+
+unsigned int aom_highbd_10_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance32x64 aom_highbd_10_variance32x64_c
+
+unsigned int aom_highbd_10_variance32x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_variance32x8 aom_highbd_10_variance32x8_c
+
+unsigned int aom_highbd_10_variance4x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_variance4x16 aom_highbd_10_variance4x16_c
+
+unsigned int aom_highbd_10_variance4x2_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance4x2 aom_highbd_10_variance4x2_c
+
+unsigned int aom_highbd_10_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance4x4 aom_highbd_10_variance4x4_c
+
+unsigned int aom_highbd_10_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance4x8 aom_highbd_10_variance4x8_c
+
+unsigned int aom_highbd_10_variance64x128_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance64x128 aom_highbd_10_variance64x128_c
+
+unsigned int aom_highbd_10_variance64x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_variance64x16 aom_highbd_10_variance64x16_c
+
+unsigned int aom_highbd_10_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance64x32 aom_highbd_10_variance64x32_c
+
+unsigned int aom_highbd_10_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance64x64 aom_highbd_10_variance64x64_c
+
+unsigned int aom_highbd_10_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance8x16 aom_highbd_10_variance8x16_c
+
+unsigned int aom_highbd_10_variance8x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_10_variance8x32 aom_highbd_10_variance8x32_c
+
+unsigned int aom_highbd_10_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance8x4 aom_highbd_10_variance8x4_c
+
+unsigned int aom_highbd_10_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_10_variance8x8 aom_highbd_10_variance8x8_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128 aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x128_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64 aom_highbd_12_dist_wtd_sub_pixel_avg_variance128x64_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16 aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x16_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32 aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x32_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4 aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x4_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64 aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x64_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8 aom_highbd_12_dist_wtd_sub_pixel_avg_variance16x8_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16 aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x16_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32 aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x32_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64 aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x64_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8 aom_highbd_12_dist_wtd_sub_pixel_avg_variance32x8_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16 aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x16_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4 aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x4_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8 aom_highbd_12_dist_wtd_sub_pixel_avg_variance4x8_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128 aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x128_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16 aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x16_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32 aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x32_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64 aom_highbd_12_dist_wtd_sub_pixel_avg_variance64x64_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16 aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x16_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32 aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x32_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4 aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x4_c
+
+uint32_t aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8 aom_highbd_12_dist_wtd_sub_pixel_avg_variance8x8_c
+
+void aom_highbd_12_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define aom_highbd_12_get16x16var aom_highbd_12_get16x16var_c
+
+void aom_highbd_12_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define aom_highbd_12_get8x8var aom_highbd_12_get8x8var_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance128x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance128x128 aom_highbd_12_masked_sub_pixel_variance128x128_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance128x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance128x64 aom_highbd_12_masked_sub_pixel_variance128x64_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance16x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance16x16 aom_highbd_12_masked_sub_pixel_variance16x16_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance16x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance16x32 aom_highbd_12_masked_sub_pixel_variance16x32_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance16x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance16x4 aom_highbd_12_masked_sub_pixel_variance16x4_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance16x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance16x64 aom_highbd_12_masked_sub_pixel_variance16x64_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance16x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance16x8 aom_highbd_12_masked_sub_pixel_variance16x8_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance32x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance32x16 aom_highbd_12_masked_sub_pixel_variance32x16_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance32x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance32x32 aom_highbd_12_masked_sub_pixel_variance32x32_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance32x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance32x64 aom_highbd_12_masked_sub_pixel_variance32x64_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance32x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance32x8 aom_highbd_12_masked_sub_pixel_variance32x8_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance4x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance4x16 aom_highbd_12_masked_sub_pixel_variance4x16_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance4x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance4x4 aom_highbd_12_masked_sub_pixel_variance4x4_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance4x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance4x8 aom_highbd_12_masked_sub_pixel_variance4x8_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance64x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance64x128 aom_highbd_12_masked_sub_pixel_variance64x128_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance64x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance64x16 aom_highbd_12_masked_sub_pixel_variance64x16_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance64x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance64x32 aom_highbd_12_masked_sub_pixel_variance64x32_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance64x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance64x64 aom_highbd_12_masked_sub_pixel_variance64x64_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance8x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance8x16 aom_highbd_12_masked_sub_pixel_variance8x16_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance8x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance8x32 aom_highbd_12_masked_sub_pixel_variance8x32_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance8x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance8x4 aom_highbd_12_masked_sub_pixel_variance8x4_c
+
+unsigned int aom_highbd_12_masked_sub_pixel_variance8x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_12_masked_sub_pixel_variance8x8 aom_highbd_12_masked_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_12_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_12_mse16x16 aom_highbd_12_mse16x16_c
+
+unsigned int aom_highbd_12_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_12_mse16x8 aom_highbd_12_mse16x8_c
+
+unsigned int aom_highbd_12_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_12_mse8x16 aom_highbd_12_mse8x16_c
+
+unsigned int aom_highbd_12_mse8x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_12_mse8x8 aom_highbd_12_mse8x8_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance128x128_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance128x128 aom_highbd_12_obmc_sub_pixel_variance128x128_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance128x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance128x64 aom_highbd_12_obmc_sub_pixel_variance128x64_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance16x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance16x16 aom_highbd_12_obmc_sub_pixel_variance16x16_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance16x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance16x32 aom_highbd_12_obmc_sub_pixel_variance16x32_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance16x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance16x4 aom_highbd_12_obmc_sub_pixel_variance16x4_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance16x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance16x64 aom_highbd_12_obmc_sub_pixel_variance16x64_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance16x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance16x8 aom_highbd_12_obmc_sub_pixel_variance16x8_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance32x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance32x16 aom_highbd_12_obmc_sub_pixel_variance32x16_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance32x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance32x32 aom_highbd_12_obmc_sub_pixel_variance32x32_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance32x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance32x64 aom_highbd_12_obmc_sub_pixel_variance32x64_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance32x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance32x8 aom_highbd_12_obmc_sub_pixel_variance32x8_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance4x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance4x16 aom_highbd_12_obmc_sub_pixel_variance4x16_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance4x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance4x4 aom_highbd_12_obmc_sub_pixel_variance4x4_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance4x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance4x8 aom_highbd_12_obmc_sub_pixel_variance4x8_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance64x128_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance64x128 aom_highbd_12_obmc_sub_pixel_variance64x128_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance64x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance64x16 aom_highbd_12_obmc_sub_pixel_variance64x16_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance64x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance64x32 aom_highbd_12_obmc_sub_pixel_variance64x32_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance64x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance64x64 aom_highbd_12_obmc_sub_pixel_variance64x64_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance8x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance8x16 aom_highbd_12_obmc_sub_pixel_variance8x16_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance8x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance8x32 aom_highbd_12_obmc_sub_pixel_variance8x32_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance8x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance8x4 aom_highbd_12_obmc_sub_pixel_variance8x4_c
+
+unsigned int aom_highbd_12_obmc_sub_pixel_variance8x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_sub_pixel_variance8x8 aom_highbd_12_obmc_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_12_obmc_variance128x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance128x128 aom_highbd_12_obmc_variance128x128_c
+
+unsigned int aom_highbd_12_obmc_variance128x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance128x64 aom_highbd_12_obmc_variance128x64_c
+
+unsigned int aom_highbd_12_obmc_variance16x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance16x16 aom_highbd_12_obmc_variance16x16_c
+
+unsigned int aom_highbd_12_obmc_variance16x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance16x32 aom_highbd_12_obmc_variance16x32_c
+
+unsigned int aom_highbd_12_obmc_variance16x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance16x4 aom_highbd_12_obmc_variance16x4_c
+
+unsigned int aom_highbd_12_obmc_variance16x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance16x64 aom_highbd_12_obmc_variance16x64_c
+
+unsigned int aom_highbd_12_obmc_variance16x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance16x8 aom_highbd_12_obmc_variance16x8_c
+
+unsigned int aom_highbd_12_obmc_variance32x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance32x16 aom_highbd_12_obmc_variance32x16_c
+
+unsigned int aom_highbd_12_obmc_variance32x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance32x32 aom_highbd_12_obmc_variance32x32_c
+
+unsigned int aom_highbd_12_obmc_variance32x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance32x64 aom_highbd_12_obmc_variance32x64_c
+
+unsigned int aom_highbd_12_obmc_variance32x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance32x8 aom_highbd_12_obmc_variance32x8_c
+
+unsigned int aom_highbd_12_obmc_variance4x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance4x16 aom_highbd_12_obmc_variance4x16_c
+
+unsigned int aom_highbd_12_obmc_variance4x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance4x4 aom_highbd_12_obmc_variance4x4_c
+
+unsigned int aom_highbd_12_obmc_variance4x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance4x8 aom_highbd_12_obmc_variance4x8_c
+
+unsigned int aom_highbd_12_obmc_variance64x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance64x128 aom_highbd_12_obmc_variance64x128_c
+
+unsigned int aom_highbd_12_obmc_variance64x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance64x16 aom_highbd_12_obmc_variance64x16_c
+
+unsigned int aom_highbd_12_obmc_variance64x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance64x32 aom_highbd_12_obmc_variance64x32_c
+
+unsigned int aom_highbd_12_obmc_variance64x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance64x64 aom_highbd_12_obmc_variance64x64_c
+
+unsigned int aom_highbd_12_obmc_variance8x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance8x16 aom_highbd_12_obmc_variance8x16_c
+
+unsigned int aom_highbd_12_obmc_variance8x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance8x32 aom_highbd_12_obmc_variance8x32_c
+
+unsigned int aom_highbd_12_obmc_variance8x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance8x4 aom_highbd_12_obmc_variance8x4_c
+
+unsigned int aom_highbd_12_obmc_variance8x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_12_obmc_variance8x8 aom_highbd_12_obmc_variance8x8_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance128x128 aom_highbd_12_sub_pixel_avg_variance128x128_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance128x64 aom_highbd_12_sub_pixel_avg_variance128x64_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance16x16 aom_highbd_12_sub_pixel_avg_variance16x16_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance16x32 aom_highbd_12_sub_pixel_avg_variance16x32_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance16x4 aom_highbd_12_sub_pixel_avg_variance16x4_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance16x64 aom_highbd_12_sub_pixel_avg_variance16x64_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance16x8 aom_highbd_12_sub_pixel_avg_variance16x8_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance32x16 aom_highbd_12_sub_pixel_avg_variance32x16_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance32x32 aom_highbd_12_sub_pixel_avg_variance32x32_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance32x64 aom_highbd_12_sub_pixel_avg_variance32x64_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance32x8 aom_highbd_12_sub_pixel_avg_variance32x8_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance4x16 aom_highbd_12_sub_pixel_avg_variance4x16_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance4x4 aom_highbd_12_sub_pixel_avg_variance4x4_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance4x8 aom_highbd_12_sub_pixel_avg_variance4x8_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance64x128 aom_highbd_12_sub_pixel_avg_variance64x128_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance64x16 aom_highbd_12_sub_pixel_avg_variance64x16_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance64x32 aom_highbd_12_sub_pixel_avg_variance64x32_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance64x64 aom_highbd_12_sub_pixel_avg_variance64x64_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance8x16 aom_highbd_12_sub_pixel_avg_variance8x16_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance8x32 aom_highbd_12_sub_pixel_avg_variance8x32_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance8x4 aom_highbd_12_sub_pixel_avg_variance8x4_c
+
+uint32_t aom_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_12_sub_pixel_avg_variance8x8 aom_highbd_12_sub_pixel_avg_variance8x8_c
+
+uint32_t aom_highbd_12_sub_pixel_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance128x128 aom_highbd_12_sub_pixel_variance128x128_c
+
+uint32_t aom_highbd_12_sub_pixel_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance128x64 aom_highbd_12_sub_pixel_variance128x64_c
+
+uint32_t aom_highbd_12_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance16x16 aom_highbd_12_sub_pixel_variance16x16_c
+
+uint32_t aom_highbd_12_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance16x32 aom_highbd_12_sub_pixel_variance16x32_c
+
+uint32_t aom_highbd_12_sub_pixel_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance16x4 aom_highbd_12_sub_pixel_variance16x4_c
+
+uint32_t aom_highbd_12_sub_pixel_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance16x64 aom_highbd_12_sub_pixel_variance16x64_c
+
+uint32_t aom_highbd_12_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance16x8 aom_highbd_12_sub_pixel_variance16x8_c
+
+uint32_t aom_highbd_12_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance32x16 aom_highbd_12_sub_pixel_variance32x16_c
+
+uint32_t aom_highbd_12_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance32x32 aom_highbd_12_sub_pixel_variance32x32_c
+
+uint32_t aom_highbd_12_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance32x64 aom_highbd_12_sub_pixel_variance32x64_c
+
+uint32_t aom_highbd_12_sub_pixel_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance32x8 aom_highbd_12_sub_pixel_variance32x8_c
+
+uint32_t aom_highbd_12_sub_pixel_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance4x16 aom_highbd_12_sub_pixel_variance4x16_c
+
+uint32_t aom_highbd_12_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance4x4 aom_highbd_12_sub_pixel_variance4x4_c
+
+uint32_t aom_highbd_12_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance4x8 aom_highbd_12_sub_pixel_variance4x8_c
+
+uint32_t aom_highbd_12_sub_pixel_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance64x128 aom_highbd_12_sub_pixel_variance64x128_c
+
+uint32_t aom_highbd_12_sub_pixel_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance64x16 aom_highbd_12_sub_pixel_variance64x16_c
+
+uint32_t aom_highbd_12_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance64x32 aom_highbd_12_sub_pixel_variance64x32_c
+
+uint32_t aom_highbd_12_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance64x64 aom_highbd_12_sub_pixel_variance64x64_c
+
+uint32_t aom_highbd_12_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance8x16 aom_highbd_12_sub_pixel_variance8x16_c
+
+uint32_t aom_highbd_12_sub_pixel_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance8x32 aom_highbd_12_sub_pixel_variance8x32_c
+
+uint32_t aom_highbd_12_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance8x4 aom_highbd_12_sub_pixel_variance8x4_c
+
+uint32_t aom_highbd_12_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_sub_pixel_variance8x8 aom_highbd_12_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_12_variance128x128_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance128x128 aom_highbd_12_variance128x128_c
+
+unsigned int aom_highbd_12_variance128x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance128x64 aom_highbd_12_variance128x64_c
+
+unsigned int aom_highbd_12_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance16x16 aom_highbd_12_variance16x16_c
+
+unsigned int aom_highbd_12_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance16x32 aom_highbd_12_variance16x32_c
+
+unsigned int aom_highbd_12_variance16x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_variance16x4 aom_highbd_12_variance16x4_c
+
+unsigned int aom_highbd_12_variance16x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_variance16x64 aom_highbd_12_variance16x64_c
+
+unsigned int aom_highbd_12_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance16x8 aom_highbd_12_variance16x8_c
+
+unsigned int aom_highbd_12_variance2x2_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance2x2 aom_highbd_12_variance2x2_c
+
+unsigned int aom_highbd_12_variance2x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance2x4 aom_highbd_12_variance2x4_c
+
+unsigned int aom_highbd_12_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance32x16 aom_highbd_12_variance32x16_c
+
+unsigned int aom_highbd_12_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance32x32 aom_highbd_12_variance32x32_c
+
+unsigned int aom_highbd_12_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance32x64 aom_highbd_12_variance32x64_c
+
+unsigned int aom_highbd_12_variance32x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_variance32x8 aom_highbd_12_variance32x8_c
+
+unsigned int aom_highbd_12_variance4x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_variance4x16 aom_highbd_12_variance4x16_c
+
+unsigned int aom_highbd_12_variance4x2_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance4x2 aom_highbd_12_variance4x2_c
+
+unsigned int aom_highbd_12_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance4x4 aom_highbd_12_variance4x4_c
+
+unsigned int aom_highbd_12_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance4x8 aom_highbd_12_variance4x8_c
+
+unsigned int aom_highbd_12_variance64x128_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance64x128 aom_highbd_12_variance64x128_c
+
+unsigned int aom_highbd_12_variance64x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_variance64x16 aom_highbd_12_variance64x16_c
+
+unsigned int aom_highbd_12_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance64x32 aom_highbd_12_variance64x32_c
+
+unsigned int aom_highbd_12_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance64x64 aom_highbd_12_variance64x64_c
+
+unsigned int aom_highbd_12_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance8x16 aom_highbd_12_variance8x16_c
+
+unsigned int aom_highbd_12_variance8x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_12_variance8x32 aom_highbd_12_variance8x32_c
+
+unsigned int aom_highbd_12_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance8x4 aom_highbd_12_variance8x4_c
+
+unsigned int aom_highbd_12_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_12_variance8x8 aom_highbd_12_variance8x8_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128 aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x128_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64 aom_highbd_8_dist_wtd_sub_pixel_avg_variance128x64_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16 aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x16_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32 aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x32_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4 aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x4_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64 aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x64_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8 aom_highbd_8_dist_wtd_sub_pixel_avg_variance16x8_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16 aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x16_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32 aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x32_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64 aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x64_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8 aom_highbd_8_dist_wtd_sub_pixel_avg_variance32x8_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16 aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x16_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4 aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x4_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8 aom_highbd_8_dist_wtd_sub_pixel_avg_variance4x8_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128 aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x128_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16 aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x16_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32 aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x32_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64 aom_highbd_8_dist_wtd_sub_pixel_avg_variance64x64_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16 aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x16_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32 aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x32_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4 aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x4_c
+
+uint32_t aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8 aom_highbd_8_dist_wtd_sub_pixel_avg_variance8x8_c
+
+void aom_highbd_8_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define aom_highbd_8_get16x16var aom_highbd_8_get16x16var_c
+
+void aom_highbd_8_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define aom_highbd_8_get8x8var aom_highbd_8_get8x8var_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance128x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance128x128 aom_highbd_8_masked_sub_pixel_variance128x128_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance128x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance128x64 aom_highbd_8_masked_sub_pixel_variance128x64_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance16x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance16x16 aom_highbd_8_masked_sub_pixel_variance16x16_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance16x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance16x32 aom_highbd_8_masked_sub_pixel_variance16x32_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance16x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance16x4 aom_highbd_8_masked_sub_pixel_variance16x4_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance16x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance16x64 aom_highbd_8_masked_sub_pixel_variance16x64_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance16x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance16x8 aom_highbd_8_masked_sub_pixel_variance16x8_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance32x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance32x16 aom_highbd_8_masked_sub_pixel_variance32x16_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance32x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance32x32 aom_highbd_8_masked_sub_pixel_variance32x32_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance32x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance32x64 aom_highbd_8_masked_sub_pixel_variance32x64_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance32x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance32x8 aom_highbd_8_masked_sub_pixel_variance32x8_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance4x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance4x16 aom_highbd_8_masked_sub_pixel_variance4x16_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance4x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance4x4 aom_highbd_8_masked_sub_pixel_variance4x4_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance4x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance4x8 aom_highbd_8_masked_sub_pixel_variance4x8_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance64x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance64x128 aom_highbd_8_masked_sub_pixel_variance64x128_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance64x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance64x16 aom_highbd_8_masked_sub_pixel_variance64x16_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance64x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance64x32 aom_highbd_8_masked_sub_pixel_variance64x32_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance64x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance64x64 aom_highbd_8_masked_sub_pixel_variance64x64_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance8x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance8x16 aom_highbd_8_masked_sub_pixel_variance8x16_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance8x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance8x32 aom_highbd_8_masked_sub_pixel_variance8x32_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance8x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance8x4 aom_highbd_8_masked_sub_pixel_variance8x4_c
+
+unsigned int aom_highbd_8_masked_sub_pixel_variance8x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_highbd_8_masked_sub_pixel_variance8x8 aom_highbd_8_masked_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_8_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_8_mse16x16 aom_highbd_8_mse16x16_c
+
+unsigned int aom_highbd_8_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_8_mse16x8 aom_highbd_8_mse16x8_c
+
+unsigned int aom_highbd_8_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_8_mse8x16 aom_highbd_8_mse8x16_c
+
+unsigned int aom_highbd_8_mse8x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_highbd_8_mse8x8 aom_highbd_8_mse8x8_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance128x128 aom_highbd_8_sub_pixel_avg_variance128x128_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance128x64 aom_highbd_8_sub_pixel_avg_variance128x64_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance16x16 aom_highbd_8_sub_pixel_avg_variance16x16_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance16x32 aom_highbd_8_sub_pixel_avg_variance16x32_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance16x4 aom_highbd_8_sub_pixel_avg_variance16x4_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance16x64 aom_highbd_8_sub_pixel_avg_variance16x64_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance16x8 aom_highbd_8_sub_pixel_avg_variance16x8_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance32x16 aom_highbd_8_sub_pixel_avg_variance32x16_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance32x32 aom_highbd_8_sub_pixel_avg_variance32x32_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance32x64 aom_highbd_8_sub_pixel_avg_variance32x64_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance32x8 aom_highbd_8_sub_pixel_avg_variance32x8_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance4x16 aom_highbd_8_sub_pixel_avg_variance4x16_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance4x4 aom_highbd_8_sub_pixel_avg_variance4x4_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance4x8 aom_highbd_8_sub_pixel_avg_variance4x8_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance64x128 aom_highbd_8_sub_pixel_avg_variance64x128_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance64x16 aom_highbd_8_sub_pixel_avg_variance64x16_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance64x32 aom_highbd_8_sub_pixel_avg_variance64x32_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance64x64 aom_highbd_8_sub_pixel_avg_variance64x64_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance8x16 aom_highbd_8_sub_pixel_avg_variance8x16_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance8x32 aom_highbd_8_sub_pixel_avg_variance8x32_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance8x4 aom_highbd_8_sub_pixel_avg_variance8x4_c
+
+uint32_t aom_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_highbd_8_sub_pixel_avg_variance8x8 aom_highbd_8_sub_pixel_avg_variance8x8_c
+
+uint32_t aom_highbd_8_sub_pixel_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance128x128 aom_highbd_8_sub_pixel_variance128x128_c
+
+uint32_t aom_highbd_8_sub_pixel_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance128x64 aom_highbd_8_sub_pixel_variance128x64_c
+
+uint32_t aom_highbd_8_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance16x16 aom_highbd_8_sub_pixel_variance16x16_c
+
+uint32_t aom_highbd_8_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance16x32 aom_highbd_8_sub_pixel_variance16x32_c
+
+uint32_t aom_highbd_8_sub_pixel_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance16x4 aom_highbd_8_sub_pixel_variance16x4_c
+
+uint32_t aom_highbd_8_sub_pixel_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance16x64 aom_highbd_8_sub_pixel_variance16x64_c
+
+uint32_t aom_highbd_8_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance16x8 aom_highbd_8_sub_pixel_variance16x8_c
+
+uint32_t aom_highbd_8_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance32x16 aom_highbd_8_sub_pixel_variance32x16_c
+
+uint32_t aom_highbd_8_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance32x32 aom_highbd_8_sub_pixel_variance32x32_c
+
+uint32_t aom_highbd_8_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance32x64 aom_highbd_8_sub_pixel_variance32x64_c
+
+uint32_t aom_highbd_8_sub_pixel_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance32x8 aom_highbd_8_sub_pixel_variance32x8_c
+
+uint32_t aom_highbd_8_sub_pixel_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance4x16 aom_highbd_8_sub_pixel_variance4x16_c
+
+uint32_t aom_highbd_8_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance4x4 aom_highbd_8_sub_pixel_variance4x4_c
+
+uint32_t aom_highbd_8_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance4x8 aom_highbd_8_sub_pixel_variance4x8_c
+
+uint32_t aom_highbd_8_sub_pixel_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance64x128 aom_highbd_8_sub_pixel_variance64x128_c
+
+uint32_t aom_highbd_8_sub_pixel_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance64x16 aom_highbd_8_sub_pixel_variance64x16_c
+
+uint32_t aom_highbd_8_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance64x32 aom_highbd_8_sub_pixel_variance64x32_c
+
+uint32_t aom_highbd_8_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance64x64 aom_highbd_8_sub_pixel_variance64x64_c
+
+uint32_t aom_highbd_8_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance8x16 aom_highbd_8_sub_pixel_variance8x16_c
+
+uint32_t aom_highbd_8_sub_pixel_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance8x32 aom_highbd_8_sub_pixel_variance8x32_c
+
+uint32_t aom_highbd_8_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance8x4 aom_highbd_8_sub_pixel_variance8x4_c
+
+uint32_t aom_highbd_8_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_sub_pixel_variance8x8 aom_highbd_8_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_8_variance128x128_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance128x128 aom_highbd_8_variance128x128_c
+
+unsigned int aom_highbd_8_variance128x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance128x64 aom_highbd_8_variance128x64_c
+
+unsigned int aom_highbd_8_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance16x16 aom_highbd_8_variance16x16_c
+
+unsigned int aom_highbd_8_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance16x32 aom_highbd_8_variance16x32_c
+
+unsigned int aom_highbd_8_variance16x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_variance16x4 aom_highbd_8_variance16x4_c
+
+unsigned int aom_highbd_8_variance16x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_variance16x64 aom_highbd_8_variance16x64_c
+
+unsigned int aom_highbd_8_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance16x8 aom_highbd_8_variance16x8_c
+
+unsigned int aom_highbd_8_variance2x2_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance2x2 aom_highbd_8_variance2x2_c
+
+unsigned int aom_highbd_8_variance2x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance2x4 aom_highbd_8_variance2x4_c
+
+unsigned int aom_highbd_8_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance32x16 aom_highbd_8_variance32x16_c
+
+unsigned int aom_highbd_8_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance32x32 aom_highbd_8_variance32x32_c
+
+unsigned int aom_highbd_8_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance32x64 aom_highbd_8_variance32x64_c
+
+unsigned int aom_highbd_8_variance32x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_variance32x8 aom_highbd_8_variance32x8_c
+
+unsigned int aom_highbd_8_variance4x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_variance4x16 aom_highbd_8_variance4x16_c
+
+unsigned int aom_highbd_8_variance4x2_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance4x2 aom_highbd_8_variance4x2_c
+
+unsigned int aom_highbd_8_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance4x4 aom_highbd_8_variance4x4_c
+
+unsigned int aom_highbd_8_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance4x8 aom_highbd_8_variance4x8_c
+
+unsigned int aom_highbd_8_variance64x128_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance64x128 aom_highbd_8_variance64x128_c
+
+unsigned int aom_highbd_8_variance64x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_variance64x16 aom_highbd_8_variance64x16_c
+
+unsigned int aom_highbd_8_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance64x32 aom_highbd_8_variance64x32_c
+
+unsigned int aom_highbd_8_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance64x64 aom_highbd_8_variance64x64_c
+
+unsigned int aom_highbd_8_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance8x16 aom_highbd_8_variance8x16_c
+
+unsigned int aom_highbd_8_variance8x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_highbd_8_variance8x32 aom_highbd_8_variance8x32_c
+
+unsigned int aom_highbd_8_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance8x4 aom_highbd_8_variance8x4_c
+
+unsigned int aom_highbd_8_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_highbd_8_variance8x8 aom_highbd_8_variance8x8_c
+
+unsigned int aom_highbd_avg_4x4_c(const uint8_t *, int p);
+#define aom_highbd_avg_4x4 aom_highbd_avg_4x4_c
+
+unsigned int aom_highbd_avg_8x8_c(const uint8_t *, int p);
+#define aom_highbd_avg_8x8 aom_highbd_avg_8x8_c
+
+void aom_highbd_blend_a64_d16_mask_c(uint8_t *dst, uint32_t dst_stride, const CONV_BUF_TYPE *src0, uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int w, int h, int subw, int subh, ConvolveParams *conv_params, const int bd);
+#define aom_highbd_blend_a64_d16_mask aom_highbd_blend_a64_d16_mask_c
+
+void aom_highbd_blend_a64_hmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h, int bd);
+#define aom_highbd_blend_a64_hmask aom_highbd_blend_a64_hmask_c
+
+void aom_highbd_blend_a64_mask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int w, int h, int subw, int subh, int bd);
+#define aom_highbd_blend_a64_mask aom_highbd_blend_a64_mask_c
+
+void aom_highbd_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h, int bd);
+#define aom_highbd_blend_a64_vmask aom_highbd_blend_a64_vmask_c
+
+void aom_highbd_comp_avg_pred_c(uint8_t *comp_pred8, const uint8_t *pred8, int width, int height, const uint8_t *ref8, int ref_stride);
+#define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c
+
+void aom_highbd_comp_avg_upsampled_pred_c(MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
+                                                            const MV *const mv, uint8_t *comp_pred8, const uint8_t *pred8, int width,
+                                                            int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref8, int ref_stride, int bd, int subpel_search);
+#define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c
+
+void aom_highbd_comp_mask_pred_c(uint8_t *comp_pred, const uint8_t *pred8, int width, int height, const uint8_t *ref8, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask);
+#define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c
+
+void aom_highbd_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bd);
+#define aom_highbd_convolve8_horiz aom_highbd_convolve8_horiz_c
+
+void aom_highbd_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bd);
+#define aom_highbd_convolve8_vert aom_highbd_convolve8_vert_c
+
+void aom_highbd_convolve_copy_c(const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, int w, int h);
+#define aom_highbd_convolve_copy aom_highbd_convolve_copy_c
+
+void aom_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c
+
+void aom_highbd_dc_128_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c
+
+void aom_highbd_dc_128_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_16x4 aom_highbd_dc_128_predictor_16x4_c
+
+void aom_highbd_dc_128_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_16x64 aom_highbd_dc_128_predictor_16x64_c
+
+void aom_highbd_dc_128_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c
+
+void aom_highbd_dc_128_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c
+
+void aom_highbd_dc_128_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c
+
+void aom_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c
+
+void aom_highbd_dc_128_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_32x64 aom_highbd_dc_128_predictor_32x64_c
+
+void aom_highbd_dc_128_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_32x8 aom_highbd_dc_128_predictor_32x8_c
+
+void aom_highbd_dc_128_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_4x16 aom_highbd_dc_128_predictor_4x16_c
+
+void aom_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c
+
+void aom_highbd_dc_128_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c
+
+void aom_highbd_dc_128_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_64x16 aom_highbd_dc_128_predictor_64x16_c
+
+void aom_highbd_dc_128_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_64x32 aom_highbd_dc_128_predictor_64x32_c
+
+void aom_highbd_dc_128_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_64x64 aom_highbd_dc_128_predictor_64x64_c
+
+void aom_highbd_dc_128_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c
+
+void aom_highbd_dc_128_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_8x32 aom_highbd_dc_128_predictor_8x32_c
+
+void aom_highbd_dc_128_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c
+
+void aom_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c
+
+void aom_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c
+
+void aom_highbd_dc_left_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c
+
+void aom_highbd_dc_left_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_16x4 aom_highbd_dc_left_predictor_16x4_c
+
+void aom_highbd_dc_left_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_16x64 aom_highbd_dc_left_predictor_16x64_c
+
+void aom_highbd_dc_left_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c
+
+void aom_highbd_dc_left_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c
+
+void aom_highbd_dc_left_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c
+
+void aom_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c
+
+void aom_highbd_dc_left_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_32x64 aom_highbd_dc_left_predictor_32x64_c
+
+void aom_highbd_dc_left_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_32x8 aom_highbd_dc_left_predictor_32x8_c
+
+void aom_highbd_dc_left_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_4x16 aom_highbd_dc_left_predictor_4x16_c
+
+void aom_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c
+
+void aom_highbd_dc_left_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c
+
+void aom_highbd_dc_left_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_64x16 aom_highbd_dc_left_predictor_64x16_c
+
+void aom_highbd_dc_left_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_64x32 aom_highbd_dc_left_predictor_64x32_c
+
+void aom_highbd_dc_left_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_64x64 aom_highbd_dc_left_predictor_64x64_c
+
+void aom_highbd_dc_left_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c
+
+void aom_highbd_dc_left_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_8x32 aom_highbd_dc_left_predictor_8x32_c
+
+void aom_highbd_dc_left_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c
+
+void aom_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c
+
+void aom_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_c
+
+void aom_highbd_dc_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c
+
+void aom_highbd_dc_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_16x4 aom_highbd_dc_predictor_16x4_c
+
+void aom_highbd_dc_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_16x64 aom_highbd_dc_predictor_16x64_c
+
+void aom_highbd_dc_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c
+
+void aom_highbd_dc_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c
+
+void aom_highbd_dc_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c
+
+void aom_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_c
+
+void aom_highbd_dc_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_32x64 aom_highbd_dc_predictor_32x64_c
+
+void aom_highbd_dc_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_32x8 aom_highbd_dc_predictor_32x8_c
+
+void aom_highbd_dc_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_4x16 aom_highbd_dc_predictor_4x16_c
+
+void aom_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_c
+
+void aom_highbd_dc_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c
+
+void aom_highbd_dc_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_64x16 aom_highbd_dc_predictor_64x16_c
+
+void aom_highbd_dc_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_64x32 aom_highbd_dc_predictor_64x32_c
+
+void aom_highbd_dc_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
+
+void aom_highbd_dc_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c
+
+void aom_highbd_dc_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_8x32 aom_highbd_dc_predictor_8x32_c
+
+void aom_highbd_dc_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c
+
+void aom_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_c
+
+void aom_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c
+
+void aom_highbd_dc_top_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c
+
+void aom_highbd_dc_top_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_16x4 aom_highbd_dc_top_predictor_16x4_c
+
+void aom_highbd_dc_top_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_16x64 aom_highbd_dc_top_predictor_16x64_c
+
+void aom_highbd_dc_top_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c
+
+void aom_highbd_dc_top_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c
+
+void aom_highbd_dc_top_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c
+
+void aom_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c
+
+void aom_highbd_dc_top_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_32x64 aom_highbd_dc_top_predictor_32x64_c
+
+void aom_highbd_dc_top_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_32x8 aom_highbd_dc_top_predictor_32x8_c
+
+void aom_highbd_dc_top_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_4x16 aom_highbd_dc_top_predictor_4x16_c
+
+void aom_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c
+
+void aom_highbd_dc_top_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c
+
+void aom_highbd_dc_top_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_64x16 aom_highbd_dc_top_predictor_64x16_c
+
+void aom_highbd_dc_top_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_64x32 aom_highbd_dc_top_predictor_64x32_c
+
+void aom_highbd_dc_top_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_64x64 aom_highbd_dc_top_predictor_64x64_c
+
+void aom_highbd_dc_top_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c
+
+void aom_highbd_dc_top_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_8x32 aom_highbd_dc_top_predictor_8x32_c
+
+void aom_highbd_dc_top_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c
+
+void aom_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c
+
+void aom_highbd_dist_wtd_comp_avg_pred_c(uint8_t *comp_pred8, const uint8_t *pred8, int width, int height, const uint8_t *ref8, int ref_stride, const DIST_WTD_COMP_PARAMS *jcp_param);
+#define aom_highbd_dist_wtd_comp_avg_pred aom_highbd_dist_wtd_comp_avg_pred_c
+
+void aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
+                                                                const MV *const mv, uint8_t *comp_pred8, const uint8_t *pred8, int width,
+                                                                int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref8,
+                                                                int ref_stride, int bd, const DIST_WTD_COMP_PARAMS *jcp_param, int subpel_search);
+#define aom_highbd_dist_wtd_comp_avg_upsampled_pred aom_highbd_dist_wtd_comp_avg_upsampled_pred_c
+
+unsigned int aom_highbd_dist_wtd_sad128x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad128x128_avg aom_highbd_dist_wtd_sad128x128_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad128x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad128x64_avg aom_highbd_dist_wtd_sad128x64_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad16x16_avg aom_highbd_dist_wtd_sad16x16_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad16x32_avg aom_highbd_dist_wtd_sad16x32_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad16x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad16x4_avg aom_highbd_dist_wtd_sad16x4_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad16x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad16x64_avg aom_highbd_dist_wtd_sad16x64_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad16x8_avg aom_highbd_dist_wtd_sad16x8_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad32x16_avg aom_highbd_dist_wtd_sad32x16_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad32x32_avg aom_highbd_dist_wtd_sad32x32_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad32x64_avg aom_highbd_dist_wtd_sad32x64_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad32x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad32x8_avg aom_highbd_dist_wtd_sad32x8_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad4x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad4x16_avg aom_highbd_dist_wtd_sad4x16_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad4x4_avg aom_highbd_dist_wtd_sad4x4_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad4x8_avg aom_highbd_dist_wtd_sad4x8_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad64x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad64x128_avg aom_highbd_dist_wtd_sad64x128_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad64x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad64x16_avg aom_highbd_dist_wtd_sad64x16_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad64x32_avg aom_highbd_dist_wtd_sad64x32_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad64x64_avg aom_highbd_dist_wtd_sad64x64_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad8x16_avg aom_highbd_dist_wtd_sad8x16_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad8x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad8x32_avg aom_highbd_dist_wtd_sad8x32_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad8x4_avg aom_highbd_dist_wtd_sad8x4_avg_c
+
+unsigned int aom_highbd_dist_wtd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred, const DIST_WTD_COMP_PARAMS* jcp_param);
+#define aom_highbd_dist_wtd_sad8x8_avg aom_highbd_dist_wtd_sad8x8_avg_c
+
+void aom_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride);
+#define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c
+
+void aom_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c
+
+void aom_highbd_h_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c
+
+void aom_highbd_h_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_16x4 aom_highbd_h_predictor_16x4_c
+
+void aom_highbd_h_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_16x64 aom_highbd_h_predictor_16x64_c
+
+void aom_highbd_h_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c
+
+void aom_highbd_h_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c
+
+void aom_highbd_h_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c
+
+void aom_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c
+
+void aom_highbd_h_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_32x64 aom_highbd_h_predictor_32x64_c
+
+void aom_highbd_h_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_32x8 aom_highbd_h_predictor_32x8_c
+
+void aom_highbd_h_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_4x16 aom_highbd_h_predictor_4x16_c
+
+void aom_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c
+
+void aom_highbd_h_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c
+
+void aom_highbd_h_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_64x16 aom_highbd_h_predictor_64x16_c
+
+void aom_highbd_h_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_64x32 aom_highbd_h_predictor_64x32_c
+
+void aom_highbd_h_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_64x64 aom_highbd_h_predictor_64x64_c
+
+void aom_highbd_h_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c
+
+void aom_highbd_h_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_8x32 aom_highbd_h_predictor_8x32_c
+
+void aom_highbd_h_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c
+
+void aom_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c
+
+void aom_highbd_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, tran_low_t *coeff);
+#define aom_highbd_hadamard_16x16 aom_highbd_hadamard_16x16_c
+
+void aom_highbd_hadamard_32x32_c(const int16_t *src_diff, ptrdiff_t src_stride, tran_low_t *coeff);
+#define aom_highbd_hadamard_32x32 aom_highbd_hadamard_32x32_c
+
+void aom_highbd_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, tran_low_t *coeff);
+#define aom_highbd_hadamard_8x8 aom_highbd_hadamard_8x8_c
+
+void aom_highbd_lpf_horizontal_14_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd);
+#define aom_highbd_lpf_horizontal_14 aom_highbd_lpf_horizontal_14_c
+
+void aom_highbd_lpf_horizontal_14_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1,int bd);
+#define aom_highbd_lpf_horizontal_14_dual aom_highbd_lpf_horizontal_14_dual_c
+
+void aom_highbd_lpf_horizontal_4_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd);
+#define aom_highbd_lpf_horizontal_4 aom_highbd_lpf_horizontal_4_c
+
+void aom_highbd_lpf_horizontal_4_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd);
+#define aom_highbd_lpf_horizontal_4_dual aom_highbd_lpf_horizontal_4_dual_c
+
+void aom_highbd_lpf_horizontal_6_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd);
+#define aom_highbd_lpf_horizontal_6 aom_highbd_lpf_horizontal_6_c
+
+void aom_highbd_lpf_horizontal_6_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd);
+#define aom_highbd_lpf_horizontal_6_dual aom_highbd_lpf_horizontal_6_dual_c
+
+void aom_highbd_lpf_horizontal_8_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd);
+#define aom_highbd_lpf_horizontal_8 aom_highbd_lpf_horizontal_8_c
+
+void aom_highbd_lpf_horizontal_8_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd);
+#define aom_highbd_lpf_horizontal_8_dual aom_highbd_lpf_horizontal_8_dual_c
+
+void aom_highbd_lpf_vertical_14_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd);
+#define aom_highbd_lpf_vertical_14 aom_highbd_lpf_vertical_14_c
+
+void aom_highbd_lpf_vertical_14_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd);
+#define aom_highbd_lpf_vertical_14_dual aom_highbd_lpf_vertical_14_dual_c
+
+void aom_highbd_lpf_vertical_4_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd);
+#define aom_highbd_lpf_vertical_4 aom_highbd_lpf_vertical_4_c
+
+void aom_highbd_lpf_vertical_4_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd);
+#define aom_highbd_lpf_vertical_4_dual aom_highbd_lpf_vertical_4_dual_c
+
+void aom_highbd_lpf_vertical_6_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd);
+#define aom_highbd_lpf_vertical_6 aom_highbd_lpf_vertical_6_c
+
+void aom_highbd_lpf_vertical_6_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd);
+#define aom_highbd_lpf_vertical_6_dual aom_highbd_lpf_vertical_6_dual_c
+
+void aom_highbd_lpf_vertical_8_c(uint16_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int bd);
+#define aom_highbd_lpf_vertical_8 aom_highbd_lpf_vertical_8_c
+
+void aom_highbd_lpf_vertical_8_dual_c(uint16_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1, int bd);
+#define aom_highbd_lpf_vertical_8_dual aom_highbd_lpf_vertical_8_dual_c
+
+unsigned int aom_highbd_masked_sad128x128_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad128x128 aom_highbd_masked_sad128x128_c
+
+unsigned int aom_highbd_masked_sad128x64_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad128x64 aom_highbd_masked_sad128x64_c
+
+unsigned int aom_highbd_masked_sad16x16_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad16x16 aom_highbd_masked_sad16x16_c
+
+unsigned int aom_highbd_masked_sad16x32_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad16x32 aom_highbd_masked_sad16x32_c
+
+unsigned int aom_highbd_masked_sad16x4_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad16x4 aom_highbd_masked_sad16x4_c
+
+unsigned int aom_highbd_masked_sad16x64_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad16x64 aom_highbd_masked_sad16x64_c
+
+unsigned int aom_highbd_masked_sad16x8_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad16x8 aom_highbd_masked_sad16x8_c
+
+unsigned int aom_highbd_masked_sad32x16_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad32x16 aom_highbd_masked_sad32x16_c
+
+unsigned int aom_highbd_masked_sad32x32_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad32x32 aom_highbd_masked_sad32x32_c
+
+unsigned int aom_highbd_masked_sad32x64_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad32x64 aom_highbd_masked_sad32x64_c
+
+unsigned int aom_highbd_masked_sad32x8_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad32x8 aom_highbd_masked_sad32x8_c
+
+unsigned int aom_highbd_masked_sad4x16_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad4x16 aom_highbd_masked_sad4x16_c
+
+unsigned int aom_highbd_masked_sad4x4_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad4x4 aom_highbd_masked_sad4x4_c
+
+unsigned int aom_highbd_masked_sad4x8_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad4x8 aom_highbd_masked_sad4x8_c
+
+unsigned int aom_highbd_masked_sad64x128_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad64x128 aom_highbd_masked_sad64x128_c
+
+unsigned int aom_highbd_masked_sad64x16_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad64x16 aom_highbd_masked_sad64x16_c
+
+unsigned int aom_highbd_masked_sad64x32_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad64x32 aom_highbd_masked_sad64x32_c
+
+unsigned int aom_highbd_masked_sad64x64_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad64x64 aom_highbd_masked_sad64x64_c
+
+unsigned int aom_highbd_masked_sad8x16_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad8x16 aom_highbd_masked_sad8x16_c
+
+unsigned int aom_highbd_masked_sad8x32_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad8x32 aom_highbd_masked_sad8x32_c
+
+unsigned int aom_highbd_masked_sad8x4_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad8x4 aom_highbd_masked_sad8x4_c
+
+unsigned int aom_highbd_masked_sad8x8_c(const uint8_t *src8, int src_stride, const uint8_t *ref8, int ref_stride, const uint8_t *second_pred8, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_highbd_masked_sad8x8 aom_highbd_masked_sad8x8_c
+
+void aom_highbd_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max);
+#define aom_highbd_minmax_8x8 aom_highbd_minmax_8x8_c
+
+unsigned int aom_highbd_obmc_sad128x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad128x128 aom_highbd_obmc_sad128x128_c
+
+unsigned int aom_highbd_obmc_sad128x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad128x64 aom_highbd_obmc_sad128x64_c
+
+unsigned int aom_highbd_obmc_sad16x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad16x16 aom_highbd_obmc_sad16x16_c
+
+unsigned int aom_highbd_obmc_sad16x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad16x32 aom_highbd_obmc_sad16x32_c
+
+unsigned int aom_highbd_obmc_sad16x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad16x4 aom_highbd_obmc_sad16x4_c
+
+unsigned int aom_highbd_obmc_sad16x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad16x64 aom_highbd_obmc_sad16x64_c
+
+unsigned int aom_highbd_obmc_sad16x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad16x8 aom_highbd_obmc_sad16x8_c
+
+unsigned int aom_highbd_obmc_sad32x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad32x16 aom_highbd_obmc_sad32x16_c
+
+unsigned int aom_highbd_obmc_sad32x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad32x32 aom_highbd_obmc_sad32x32_c
+
+unsigned int aom_highbd_obmc_sad32x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad32x64 aom_highbd_obmc_sad32x64_c
+
+unsigned int aom_highbd_obmc_sad32x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad32x8 aom_highbd_obmc_sad32x8_c
+
+unsigned int aom_highbd_obmc_sad4x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad4x16 aom_highbd_obmc_sad4x16_c
+
+unsigned int aom_highbd_obmc_sad4x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad4x4 aom_highbd_obmc_sad4x4_c
+
+unsigned int aom_highbd_obmc_sad4x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad4x8 aom_highbd_obmc_sad4x8_c
+
+unsigned int aom_highbd_obmc_sad64x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad64x128 aom_highbd_obmc_sad64x128_c
+
+unsigned int aom_highbd_obmc_sad64x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad64x16 aom_highbd_obmc_sad64x16_c
+
+unsigned int aom_highbd_obmc_sad64x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad64x32 aom_highbd_obmc_sad64x32_c
+
+unsigned int aom_highbd_obmc_sad64x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad64x64 aom_highbd_obmc_sad64x64_c
+
+unsigned int aom_highbd_obmc_sad8x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad8x16 aom_highbd_obmc_sad8x16_c
+
+unsigned int aom_highbd_obmc_sad8x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad8x32 aom_highbd_obmc_sad8x32_c
+
+unsigned int aom_highbd_obmc_sad8x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad8x4 aom_highbd_obmc_sad8x4_c
+
+unsigned int aom_highbd_obmc_sad8x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_highbd_obmc_sad8x8 aom_highbd_obmc_sad8x8_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance128x128_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance128x128 aom_highbd_obmc_sub_pixel_variance128x128_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance128x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance128x64 aom_highbd_obmc_sub_pixel_variance128x64_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance16x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance16x16 aom_highbd_obmc_sub_pixel_variance16x16_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance16x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance16x32 aom_highbd_obmc_sub_pixel_variance16x32_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance16x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance16x4 aom_highbd_obmc_sub_pixel_variance16x4_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance16x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance16x64 aom_highbd_obmc_sub_pixel_variance16x64_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance16x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance16x8 aom_highbd_obmc_sub_pixel_variance16x8_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance32x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance32x16 aom_highbd_obmc_sub_pixel_variance32x16_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance32x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance32x32 aom_highbd_obmc_sub_pixel_variance32x32_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance32x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance32x64 aom_highbd_obmc_sub_pixel_variance32x64_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance32x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance32x8 aom_highbd_obmc_sub_pixel_variance32x8_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance4x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance4x16 aom_highbd_obmc_sub_pixel_variance4x16_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance4x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance4x4 aom_highbd_obmc_sub_pixel_variance4x4_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance4x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance4x8 aom_highbd_obmc_sub_pixel_variance4x8_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance64x128_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance64x128 aom_highbd_obmc_sub_pixel_variance64x128_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance64x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance64x16 aom_highbd_obmc_sub_pixel_variance64x16_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance64x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance64x32 aom_highbd_obmc_sub_pixel_variance64x32_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance64x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance64x64 aom_highbd_obmc_sub_pixel_variance64x64_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance8x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance8x16 aom_highbd_obmc_sub_pixel_variance8x16_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance8x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance8x32 aom_highbd_obmc_sub_pixel_variance8x32_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance8x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance8x4 aom_highbd_obmc_sub_pixel_variance8x4_c
+
+unsigned int aom_highbd_obmc_sub_pixel_variance8x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_sub_pixel_variance8x8 aom_highbd_obmc_sub_pixel_variance8x8_c
+
+unsigned int aom_highbd_obmc_variance128x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance128x128 aom_highbd_obmc_variance128x128_c
+
+unsigned int aom_highbd_obmc_variance128x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance128x64 aom_highbd_obmc_variance128x64_c
+
+unsigned int aom_highbd_obmc_variance16x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance16x16 aom_highbd_obmc_variance16x16_c
+
+unsigned int aom_highbd_obmc_variance16x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance16x32 aom_highbd_obmc_variance16x32_c
+
+unsigned int aom_highbd_obmc_variance16x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance16x4 aom_highbd_obmc_variance16x4_c
+
+unsigned int aom_highbd_obmc_variance16x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance16x64 aom_highbd_obmc_variance16x64_c
+
+unsigned int aom_highbd_obmc_variance16x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance16x8 aom_highbd_obmc_variance16x8_c
+
+unsigned int aom_highbd_obmc_variance32x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance32x16 aom_highbd_obmc_variance32x16_c
+
+unsigned int aom_highbd_obmc_variance32x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance32x32 aom_highbd_obmc_variance32x32_c
+
+unsigned int aom_highbd_obmc_variance32x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance32x64 aom_highbd_obmc_variance32x64_c
+
+unsigned int aom_highbd_obmc_variance32x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance32x8 aom_highbd_obmc_variance32x8_c
+
+unsigned int aom_highbd_obmc_variance4x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance4x16 aom_highbd_obmc_variance4x16_c
+
+unsigned int aom_highbd_obmc_variance4x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance4x4 aom_highbd_obmc_variance4x4_c
+
+unsigned int aom_highbd_obmc_variance4x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance4x8 aom_highbd_obmc_variance4x8_c
+
+unsigned int aom_highbd_obmc_variance64x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance64x128 aom_highbd_obmc_variance64x128_c
+
+unsigned int aom_highbd_obmc_variance64x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance64x16 aom_highbd_obmc_variance64x16_c
+
+unsigned int aom_highbd_obmc_variance64x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance64x32 aom_highbd_obmc_variance64x32_c
+
+unsigned int aom_highbd_obmc_variance64x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance64x64 aom_highbd_obmc_variance64x64_c
+
+unsigned int aom_highbd_obmc_variance8x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance8x16 aom_highbd_obmc_variance8x16_c
+
+unsigned int aom_highbd_obmc_variance8x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance8x32 aom_highbd_obmc_variance8x32_c
+
+unsigned int aom_highbd_obmc_variance8x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance8x4 aom_highbd_obmc_variance8x4_c
+
+unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_highbd_obmc_variance8x8 aom_highbd_obmc_variance8x8_c
+
+void aom_highbd_paeth_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c
+
+void aom_highbd_paeth_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c
+
+void aom_highbd_paeth_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_16x4 aom_highbd_paeth_predictor_16x4_c
+
+void aom_highbd_paeth_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_16x64 aom_highbd_paeth_predictor_16x64_c
+
+void aom_highbd_paeth_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c
+
+void aom_highbd_paeth_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c
+
+void aom_highbd_paeth_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c
+
+void aom_highbd_paeth_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c
+
+void aom_highbd_paeth_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_32x64 aom_highbd_paeth_predictor_32x64_c
+
+void aom_highbd_paeth_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_32x8 aom_highbd_paeth_predictor_32x8_c
+
+void aom_highbd_paeth_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_4x16 aom_highbd_paeth_predictor_4x16_c
+
+void aom_highbd_paeth_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c
+
+void aom_highbd_paeth_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c
+
+void aom_highbd_paeth_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_64x16 aom_highbd_paeth_predictor_64x16_c
+
+void aom_highbd_paeth_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_64x32 aom_highbd_paeth_predictor_64x32_c
+
+void aom_highbd_paeth_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_64x64 aom_highbd_paeth_predictor_64x64_c
+
+void aom_highbd_paeth_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c
+
+void aom_highbd_paeth_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_8x32 aom_highbd_paeth_predictor_8x32_c
+
+void aom_highbd_paeth_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c
+
+void aom_highbd_paeth_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c
+
+void aom_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_highbd_quantize_b aom_highbd_quantize_b_c
+
+void aom_highbd_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_highbd_quantize_b_32x32 aom_highbd_quantize_b_32x32_c
+
+void aom_highbd_quantize_b_32x32_adaptive_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_highbd_quantize_b_32x32_adaptive aom_highbd_quantize_b_32x32_adaptive_c
+
+void aom_highbd_quantize_b_64x64_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_highbd_quantize_b_64x64 aom_highbd_quantize_b_64x64_c
+
+void aom_highbd_quantize_b_64x64_adaptive_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_highbd_quantize_b_64x64_adaptive aom_highbd_quantize_b_64x64_adaptive_c
+
+void aom_highbd_quantize_b_adaptive_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_highbd_quantize_b_adaptive aom_highbd_quantize_b_adaptive_c
+
+unsigned int aom_highbd_sad128x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad128x128 aom_highbd_sad128x128_c
+
+unsigned int aom_highbd_sad128x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad128x128_avg aom_highbd_sad128x128_avg_c
+
+void aom_highbd_sad128x128x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad128x128x4d aom_highbd_sad128x128x4d_c
+
+unsigned int aom_highbd_sad128x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad128x64 aom_highbd_sad128x64_c
+
+unsigned int aom_highbd_sad128x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad128x64_avg aom_highbd_sad128x64_avg_c
+
+void aom_highbd_sad128x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad128x64x4d aom_highbd_sad128x64x4d_c
+
+unsigned int aom_highbd_sad16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad16x16 aom_highbd_sad16x16_c
+
+unsigned int aom_highbd_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad16x16_avg aom_highbd_sad16x16_avg_c
+
+void aom_highbd_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad16x16x4d aom_highbd_sad16x16x4d_c
+
+unsigned int aom_highbd_sad16x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad16x32 aom_highbd_sad16x32_c
+
+unsigned int aom_highbd_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad16x32_avg aom_highbd_sad16x32_avg_c
+
+void aom_highbd_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad16x32x4d aom_highbd_sad16x32x4d_c
+
+unsigned int aom_highbd_sad16x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad16x4 aom_highbd_sad16x4_c
+
+unsigned int aom_highbd_sad16x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad16x4_avg aom_highbd_sad16x4_avg_c
+
+void aom_highbd_sad16x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad16x4x4d aom_highbd_sad16x4x4d_c
+
+unsigned int aom_highbd_sad16x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad16x64 aom_highbd_sad16x64_c
+
+unsigned int aom_highbd_sad16x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad16x64_avg aom_highbd_sad16x64_avg_c
+
+void aom_highbd_sad16x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad16x64x4d aom_highbd_sad16x64x4d_c
+
+unsigned int aom_highbd_sad16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad16x8 aom_highbd_sad16x8_c
+
+unsigned int aom_highbd_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad16x8_avg aom_highbd_sad16x8_avg_c
+
+void aom_highbd_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad16x8x4d aom_highbd_sad16x8x4d_c
+
+unsigned int aom_highbd_sad32x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad32x16 aom_highbd_sad32x16_c
+
+unsigned int aom_highbd_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad32x16_avg aom_highbd_sad32x16_avg_c
+
+void aom_highbd_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad32x16x4d aom_highbd_sad32x16x4d_c
+
+unsigned int aom_highbd_sad32x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad32x32 aom_highbd_sad32x32_c
+
+unsigned int aom_highbd_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad32x32_avg aom_highbd_sad32x32_avg_c
+
+void aom_highbd_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad32x32x4d aom_highbd_sad32x32x4d_c
+
+unsigned int aom_highbd_sad32x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad32x64 aom_highbd_sad32x64_c
+
+unsigned int aom_highbd_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad32x64_avg aom_highbd_sad32x64_avg_c
+
+void aom_highbd_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad32x64x4d aom_highbd_sad32x64x4d_c
+
+unsigned int aom_highbd_sad32x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad32x8 aom_highbd_sad32x8_c
+
+unsigned int aom_highbd_sad32x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad32x8_avg aom_highbd_sad32x8_avg_c
+
+void aom_highbd_sad32x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad32x8x4d aom_highbd_sad32x8x4d_c
+
+unsigned int aom_highbd_sad4x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad4x16 aom_highbd_sad4x16_c
+
+unsigned int aom_highbd_sad4x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad4x16_avg aom_highbd_sad4x16_avg_c
+
+void aom_highbd_sad4x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad4x16x4d aom_highbd_sad4x16x4d_c
+
+unsigned int aom_highbd_sad4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad4x4 aom_highbd_sad4x4_c
+
+unsigned int aom_highbd_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad4x4_avg aom_highbd_sad4x4_avg_c
+
+void aom_highbd_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad4x4x4d aom_highbd_sad4x4x4d_c
+
+unsigned int aom_highbd_sad4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad4x8 aom_highbd_sad4x8_c
+
+unsigned int aom_highbd_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad4x8_avg aom_highbd_sad4x8_avg_c
+
+void aom_highbd_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad4x8x4d aom_highbd_sad4x8x4d_c
+
+unsigned int aom_highbd_sad64x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad64x128 aom_highbd_sad64x128_c
+
+unsigned int aom_highbd_sad64x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad64x128_avg aom_highbd_sad64x128_avg_c
+
+void aom_highbd_sad64x128x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad64x128x4d aom_highbd_sad64x128x4d_c
+
+unsigned int aom_highbd_sad64x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad64x16 aom_highbd_sad64x16_c
+
+unsigned int aom_highbd_sad64x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad64x16_avg aom_highbd_sad64x16_avg_c
+
+void aom_highbd_sad64x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad64x16x4d aom_highbd_sad64x16x4d_c
+
+unsigned int aom_highbd_sad64x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad64x32 aom_highbd_sad64x32_c
+
+unsigned int aom_highbd_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad64x32_avg aom_highbd_sad64x32_avg_c
+
+void aom_highbd_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad64x32x4d aom_highbd_sad64x32x4d_c
+
+unsigned int aom_highbd_sad64x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad64x64 aom_highbd_sad64x64_c
+
+unsigned int aom_highbd_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad64x64_avg aom_highbd_sad64x64_avg_c
+
+void aom_highbd_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad64x64x4d aom_highbd_sad64x64x4d_c
+
+unsigned int aom_highbd_sad8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad8x16 aom_highbd_sad8x16_c
+
+unsigned int aom_highbd_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad8x16_avg aom_highbd_sad8x16_avg_c
+
+void aom_highbd_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad8x16x4d aom_highbd_sad8x16x4d_c
+
+unsigned int aom_highbd_sad8x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad8x32 aom_highbd_sad8x32_c
+
+unsigned int aom_highbd_sad8x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad8x32_avg aom_highbd_sad8x32_avg_c
+
+void aom_highbd_sad8x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad8x32x4d aom_highbd_sad8x32x4d_c
+
+unsigned int aom_highbd_sad8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad8x4 aom_highbd_sad8x4_c
+
+unsigned int aom_highbd_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad8x4_avg aom_highbd_sad8x4_avg_c
+
+void aom_highbd_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad8x4x4d aom_highbd_sad8x4x4d_c
+
+unsigned int aom_highbd_sad8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad8x8 aom_highbd_sad8x8_c
+
+unsigned int aom_highbd_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_highbd_sad8x8_avg aom_highbd_sad8x8_avg_c
+
+void aom_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad8x8x4d aom_highbd_sad8x8x4d_c
+
+unsigned int aom_highbd_sad_skip_128x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_128x128 aom_highbd_sad_skip_128x128_c
+
+void aom_highbd_sad_skip_128x128x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_128x128x4d aom_highbd_sad_skip_128x128x4d_c
+
+unsigned int aom_highbd_sad_skip_128x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_128x64 aom_highbd_sad_skip_128x64_c
+
+void aom_highbd_sad_skip_128x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_128x64x4d aom_highbd_sad_skip_128x64x4d_c
+
+unsigned int aom_highbd_sad_skip_16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_16x16 aom_highbd_sad_skip_16x16_c
+
+void aom_highbd_sad_skip_16x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_16x16x4d aom_highbd_sad_skip_16x16x4d_c
+
+unsigned int aom_highbd_sad_skip_16x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_16x32 aom_highbd_sad_skip_16x32_c
+
+void aom_highbd_sad_skip_16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_16x32x4d aom_highbd_sad_skip_16x32x4d_c
+
+unsigned int aom_highbd_sad_skip_16x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_16x4 aom_highbd_sad_skip_16x4_c
+
+void aom_highbd_sad_skip_16x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_16x4x4d aom_highbd_sad_skip_16x4x4d_c
+
+unsigned int aom_highbd_sad_skip_16x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_16x64 aom_highbd_sad_skip_16x64_c
+
+void aom_highbd_sad_skip_16x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_16x64x4d aom_highbd_sad_skip_16x64x4d_c
+
+unsigned int aom_highbd_sad_skip_16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_16x8 aom_highbd_sad_skip_16x8_c
+
+void aom_highbd_sad_skip_16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_16x8x4d aom_highbd_sad_skip_16x8x4d_c
+
+unsigned int aom_highbd_sad_skip_32x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_32x16 aom_highbd_sad_skip_32x16_c
+
+void aom_highbd_sad_skip_32x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_32x16x4d aom_highbd_sad_skip_32x16x4d_c
+
+unsigned int aom_highbd_sad_skip_32x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_32x32 aom_highbd_sad_skip_32x32_c
+
+void aom_highbd_sad_skip_32x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_32x32x4d aom_highbd_sad_skip_32x32x4d_c
+
+unsigned int aom_highbd_sad_skip_32x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_32x64 aom_highbd_sad_skip_32x64_c
+
+void aom_highbd_sad_skip_32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_32x64x4d aom_highbd_sad_skip_32x64x4d_c
+
+unsigned int aom_highbd_sad_skip_32x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_32x8 aom_highbd_sad_skip_32x8_c
+
+void aom_highbd_sad_skip_32x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_32x8x4d aom_highbd_sad_skip_32x8x4d_c
+
+unsigned int aom_highbd_sad_skip_4x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_4x16 aom_highbd_sad_skip_4x16_c
+
+void aom_highbd_sad_skip_4x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_4x16x4d aom_highbd_sad_skip_4x16x4d_c
+
+unsigned int aom_highbd_sad_skip_4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_4x4 aom_highbd_sad_skip_4x4_c
+
+void aom_highbd_sad_skip_4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_4x4x4d aom_highbd_sad_skip_4x4x4d_c
+
+unsigned int aom_highbd_sad_skip_4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_4x8 aom_highbd_sad_skip_4x8_c
+
+void aom_highbd_sad_skip_4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_4x8x4d aom_highbd_sad_skip_4x8x4d_c
+
+unsigned int aom_highbd_sad_skip_64x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_64x128 aom_highbd_sad_skip_64x128_c
+
+void aom_highbd_sad_skip_64x128x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_64x128x4d aom_highbd_sad_skip_64x128x4d_c
+
+unsigned int aom_highbd_sad_skip_64x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_64x16 aom_highbd_sad_skip_64x16_c
+
+void aom_highbd_sad_skip_64x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_64x16x4d aom_highbd_sad_skip_64x16x4d_c
+
+unsigned int aom_highbd_sad_skip_64x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_64x32 aom_highbd_sad_skip_64x32_c
+
+void aom_highbd_sad_skip_64x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_64x32x4d aom_highbd_sad_skip_64x32x4d_c
+
+unsigned int aom_highbd_sad_skip_64x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_64x64 aom_highbd_sad_skip_64x64_c
+
+void aom_highbd_sad_skip_64x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_64x64x4d aom_highbd_sad_skip_64x64x4d_c
+
+unsigned int aom_highbd_sad_skip_8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_8x16 aom_highbd_sad_skip_8x16_c
+
+void aom_highbd_sad_skip_8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_8x16x4d aom_highbd_sad_skip_8x16x4d_c
+
+unsigned int aom_highbd_sad_skip_8x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_8x32 aom_highbd_sad_skip_8x32_c
+
+void aom_highbd_sad_skip_8x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_8x32x4d aom_highbd_sad_skip_8x32x4d_c
+
+unsigned int aom_highbd_sad_skip_8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_8x4 aom_highbd_sad_skip_8x4_c
+
+void aom_highbd_sad_skip_8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_8x4x4d aom_highbd_sad_skip_8x4x4d_c
+
+unsigned int aom_highbd_sad_skip_8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_highbd_sad_skip_8x8 aom_highbd_sad_skip_8x8_c
+
+void aom_highbd_sad_skip_8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_highbd_sad_skip_8x8x4d aom_highbd_sad_skip_8x8x4d_c
+
+void aom_highbd_smooth_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_16x16 aom_highbd_smooth_h_predictor_16x16_c
+
+void aom_highbd_smooth_h_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_16x32 aom_highbd_smooth_h_predictor_16x32_c
+
+void aom_highbd_smooth_h_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_16x4 aom_highbd_smooth_h_predictor_16x4_c
+
+void aom_highbd_smooth_h_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_16x64 aom_highbd_smooth_h_predictor_16x64_c
+
+void aom_highbd_smooth_h_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c
+
+void aom_highbd_smooth_h_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c
+
+void aom_highbd_smooth_h_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_32x16 aom_highbd_smooth_h_predictor_32x16_c
+
+void aom_highbd_smooth_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_32x32 aom_highbd_smooth_h_predictor_32x32_c
+
+void aom_highbd_smooth_h_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_32x64 aom_highbd_smooth_h_predictor_32x64_c
+
+void aom_highbd_smooth_h_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_32x8 aom_highbd_smooth_h_predictor_32x8_c
+
+void aom_highbd_smooth_h_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_4x16 aom_highbd_smooth_h_predictor_4x16_c
+
+void aom_highbd_smooth_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c
+
+void aom_highbd_smooth_h_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c
+
+void aom_highbd_smooth_h_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_64x16 aom_highbd_smooth_h_predictor_64x16_c
+
+void aom_highbd_smooth_h_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_64x32 aom_highbd_smooth_h_predictor_64x32_c
+
+void aom_highbd_smooth_h_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_64x64 aom_highbd_smooth_h_predictor_64x64_c
+
+void aom_highbd_smooth_h_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c
+
+void aom_highbd_smooth_h_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_8x32 aom_highbd_smooth_h_predictor_8x32_c
+
+void aom_highbd_smooth_h_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c
+
+void aom_highbd_smooth_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c
+
+void aom_highbd_smooth_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c
+
+void aom_highbd_smooth_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c
+
+void aom_highbd_smooth_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_16x4 aom_highbd_smooth_predictor_16x4_c
+
+void aom_highbd_smooth_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_16x64 aom_highbd_smooth_predictor_16x64_c
+
+void aom_highbd_smooth_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c
+
+void aom_highbd_smooth_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c
+
+void aom_highbd_smooth_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c
+
+void aom_highbd_smooth_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c
+
+void aom_highbd_smooth_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_32x64 aom_highbd_smooth_predictor_32x64_c
+
+void aom_highbd_smooth_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_32x8 aom_highbd_smooth_predictor_32x8_c
+
+void aom_highbd_smooth_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_4x16 aom_highbd_smooth_predictor_4x16_c
+
+void aom_highbd_smooth_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c
+
+void aom_highbd_smooth_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c
+
+void aom_highbd_smooth_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_64x16 aom_highbd_smooth_predictor_64x16_c
+
+void aom_highbd_smooth_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_64x32 aom_highbd_smooth_predictor_64x32_c
+
+void aom_highbd_smooth_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_64x64 aom_highbd_smooth_predictor_64x64_c
+
+void aom_highbd_smooth_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c
+
+void aom_highbd_smooth_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_8x32 aom_highbd_smooth_predictor_8x32_c
+
+void aom_highbd_smooth_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c
+
+void aom_highbd_smooth_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c
+
+void aom_highbd_smooth_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_16x16 aom_highbd_smooth_v_predictor_16x16_c
+
+void aom_highbd_smooth_v_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_16x32 aom_highbd_smooth_v_predictor_16x32_c
+
+void aom_highbd_smooth_v_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_16x4 aom_highbd_smooth_v_predictor_16x4_c
+
+void aom_highbd_smooth_v_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_16x64 aom_highbd_smooth_v_predictor_16x64_c
+
+void aom_highbd_smooth_v_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c
+
+void aom_highbd_smooth_v_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c
+
+void aom_highbd_smooth_v_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_32x16 aom_highbd_smooth_v_predictor_32x16_c
+
+void aom_highbd_smooth_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_32x32 aom_highbd_smooth_v_predictor_32x32_c
+
+void aom_highbd_smooth_v_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_32x64 aom_highbd_smooth_v_predictor_32x64_c
+
+void aom_highbd_smooth_v_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_32x8 aom_highbd_smooth_v_predictor_32x8_c
+
+void aom_highbd_smooth_v_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_4x16 aom_highbd_smooth_v_predictor_4x16_c
+
+void aom_highbd_smooth_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c
+
+void aom_highbd_smooth_v_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c
+
+void aom_highbd_smooth_v_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_64x16 aom_highbd_smooth_v_predictor_64x16_c
+
+void aom_highbd_smooth_v_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_64x32 aom_highbd_smooth_v_predictor_64x32_c
+
+void aom_highbd_smooth_v_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_64x64 aom_highbd_smooth_v_predictor_64x64_c
+
+void aom_highbd_smooth_v_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c
+
+void aom_highbd_smooth_v_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_8x32 aom_highbd_smooth_v_predictor_8x32_c
+
+void aom_highbd_smooth_v_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c
+
+void aom_highbd_smooth_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c
+
+int64_t aom_highbd_sse_c(const uint8_t *a8, int a_stride, const uint8_t *b8,int b_stride, int width, int height);
+#define aom_highbd_sse aom_highbd_sse_c
+
+void aom_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride, int bd);
+#define aom_highbd_subtract_block aom_highbd_subtract_block_c
+
+void aom_highbd_upsampled_pred_c(MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
+                                                   const MV *const mv, uint8_t *comp_pred8, int width, int height, int subpel_x_q3,
+                                                   int subpel_y_q3, const uint8_t *ref8, int ref_stride, int bd, int subpel_search);
+#define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c
+
+void aom_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c
+
+void aom_highbd_v_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c
+
+void aom_highbd_v_predictor_16x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_16x4 aom_highbd_v_predictor_16x4_c
+
+void aom_highbd_v_predictor_16x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_16x64 aom_highbd_v_predictor_16x64_c
+
+void aom_highbd_v_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c
+
+void aom_highbd_v_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c
+
+void aom_highbd_v_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c
+
+void aom_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c
+
+void aom_highbd_v_predictor_32x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_32x64 aom_highbd_v_predictor_32x64_c
+
+void aom_highbd_v_predictor_32x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_32x8 aom_highbd_v_predictor_32x8_c
+
+void aom_highbd_v_predictor_4x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_4x16 aom_highbd_v_predictor_4x16_c
+
+void aom_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c
+
+void aom_highbd_v_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c
+
+void aom_highbd_v_predictor_64x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_64x16 aom_highbd_v_predictor_64x16_c
+
+void aom_highbd_v_predictor_64x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_64x32 aom_highbd_v_predictor_64x32_c
+
+void aom_highbd_v_predictor_64x64_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_64x64 aom_highbd_v_predictor_64x64_c
+
+void aom_highbd_v_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c
+
+void aom_highbd_v_predictor_8x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_8x32 aom_highbd_v_predictor_8x32_c
+
+void aom_highbd_v_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c
+
+void aom_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd);
+#define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c
+
+void aom_ifft16x16_float_c(const float *input, float *temp, float *output);
+#define aom_ifft16x16_float aom_ifft16x16_float_c
+
+void aom_ifft2x2_float_c(const float *input, float *temp, float *output);
+#define aom_ifft2x2_float aom_ifft2x2_float_c
+
+void aom_ifft32x32_float_c(const float *input, float *temp, float *output);
+#define aom_ifft32x32_float aom_ifft32x32_float_c
+
+void aom_ifft4x4_float_c(const float *input, float *temp, float *output);
+#define aom_ifft4x4_float aom_ifft4x4_float_c
+
+void aom_ifft8x8_float_c(const float *input, float *temp, float *output);
+#define aom_ifft8x8_float aom_ifft8x8_float_c
+
+int16_t aom_int_pro_col_c(const uint8_t *ref, const int width);
+#define aom_int_pro_col aom_int_pro_col_c
+
+void aom_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height);
+#define aom_int_pro_row aom_int_pro_row_c
+
+void aom_lowbd_blend_a64_d16_mask_c(uint8_t *dst, uint32_t dst_stride, const CONV_BUF_TYPE *src0, uint32_t src0_stride, const CONV_BUF_TYPE *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int w, int h, int subw, int subh, ConvolveParams *conv_params);
+#define aom_lowbd_blend_a64_d16_mask aom_lowbd_blend_a64_d16_mask_c
+
+void aom_lpf_horizontal_14_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define aom_lpf_horizontal_14 aom_lpf_horizontal_14_c
+
+void aom_lpf_horizontal_14_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define aom_lpf_horizontal_14_dual aom_lpf_horizontal_14_dual_c
+
+void aom_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define aom_lpf_horizontal_4 aom_lpf_horizontal_4_c
+
+void aom_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define aom_lpf_horizontal_4_dual aom_lpf_horizontal_4_dual_c
+
+void aom_lpf_horizontal_6_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define aom_lpf_horizontal_6 aom_lpf_horizontal_6_c
+
+void aom_lpf_horizontal_6_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define aom_lpf_horizontal_6_dual aom_lpf_horizontal_6_dual_c
+
+void aom_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define aom_lpf_horizontal_8 aom_lpf_horizontal_8_c
+
+void aom_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define aom_lpf_horizontal_8_dual aom_lpf_horizontal_8_dual_c
+
+void aom_lpf_vertical_14_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define aom_lpf_vertical_14 aom_lpf_vertical_14_c
+
+void aom_lpf_vertical_14_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define aom_lpf_vertical_14_dual aom_lpf_vertical_14_dual_c
+
+void aom_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define aom_lpf_vertical_4 aom_lpf_vertical_4_c
+
+void aom_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define aom_lpf_vertical_4_dual aom_lpf_vertical_4_dual_c
+
+void aom_lpf_vertical_6_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define aom_lpf_vertical_6 aom_lpf_vertical_6_c
+
+void aom_lpf_vertical_6_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define aom_lpf_vertical_6_dual aom_lpf_vertical_6_dual_c
+
+void aom_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define aom_lpf_vertical_8 aom_lpf_vertical_8_c
+
+void aom_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define aom_lpf_vertical_8_dual aom_lpf_vertical_8_dual_c
+
+unsigned int aom_masked_sad128x128_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad128x128 aom_masked_sad128x128_c
+
+void aom_masked_sad128x128x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad128x128x4d aom_masked_sad128x128x4d_c
+
+unsigned int aom_masked_sad128x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad128x64 aom_masked_sad128x64_c
+
+void aom_masked_sad128x64x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad128x64x4d aom_masked_sad128x64x4d_c
+
+unsigned int aom_masked_sad16x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad16x16 aom_masked_sad16x16_c
+
+void aom_masked_sad16x16x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad16x16x4d aom_masked_sad16x16x4d_c
+
+unsigned int aom_masked_sad16x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad16x32 aom_masked_sad16x32_c
+
+void aom_masked_sad16x32x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad16x32x4d aom_masked_sad16x32x4d_c
+
+unsigned int aom_masked_sad16x4_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad16x4 aom_masked_sad16x4_c
+
+void aom_masked_sad16x4x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad16x4x4d aom_masked_sad16x4x4d_c
+
+unsigned int aom_masked_sad16x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad16x64 aom_masked_sad16x64_c
+
+void aom_masked_sad16x64x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad16x64x4d aom_masked_sad16x64x4d_c
+
+unsigned int aom_masked_sad16x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad16x8 aom_masked_sad16x8_c
+
+void aom_masked_sad16x8x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad16x8x4d aom_masked_sad16x8x4d_c
+
+unsigned int aom_masked_sad32x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad32x16 aom_masked_sad32x16_c
+
+void aom_masked_sad32x16x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad32x16x4d aom_masked_sad32x16x4d_c
+
+unsigned int aom_masked_sad32x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad32x32 aom_masked_sad32x32_c
+
+void aom_masked_sad32x32x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad32x32x4d aom_masked_sad32x32x4d_c
+
+unsigned int aom_masked_sad32x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad32x64 aom_masked_sad32x64_c
+
+void aom_masked_sad32x64x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad32x64x4d aom_masked_sad32x64x4d_c
+
+unsigned int aom_masked_sad32x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad32x8 aom_masked_sad32x8_c
+
+void aom_masked_sad32x8x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad32x8x4d aom_masked_sad32x8x4d_c
+
+unsigned int aom_masked_sad4x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad4x16 aom_masked_sad4x16_c
+
+void aom_masked_sad4x16x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad4x16x4d aom_masked_sad4x16x4d_c
+
+unsigned int aom_masked_sad4x4_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad4x4 aom_masked_sad4x4_c
+
+void aom_masked_sad4x4x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad4x4x4d aom_masked_sad4x4x4d_c
+
+unsigned int aom_masked_sad4x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad4x8 aom_masked_sad4x8_c
+
+void aom_masked_sad4x8x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad4x8x4d aom_masked_sad4x8x4d_c
+
+unsigned int aom_masked_sad64x128_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad64x128 aom_masked_sad64x128_c
+
+void aom_masked_sad64x128x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad64x128x4d aom_masked_sad64x128x4d_c
+
+unsigned int aom_masked_sad64x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad64x16 aom_masked_sad64x16_c
+
+void aom_masked_sad64x16x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad64x16x4d aom_masked_sad64x16x4d_c
+
+unsigned int aom_masked_sad64x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad64x32 aom_masked_sad64x32_c
+
+void aom_masked_sad64x32x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad64x32x4d aom_masked_sad64x32x4d_c
+
+unsigned int aom_masked_sad64x64_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad64x64 aom_masked_sad64x64_c
+
+void aom_masked_sad64x64x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad64x64x4d aom_masked_sad64x64x4d_c
+
+unsigned int aom_masked_sad8x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad8x16 aom_masked_sad8x16_c
+
+void aom_masked_sad8x16x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad8x16x4d aom_masked_sad8x16x4d_c
+
+unsigned int aom_masked_sad8x32_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad8x32 aom_masked_sad8x32_c
+
+void aom_masked_sad8x32x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad8x32x4d aom_masked_sad8x32x4d_c
+
+unsigned int aom_masked_sad8x4_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad8x4 aom_masked_sad8x4_c
+
+void aom_masked_sad8x4x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad8x4x4d aom_masked_sad8x4x4d_c
+
+unsigned int aom_masked_sad8x8_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask);
+#define aom_masked_sad8x8 aom_masked_sad8x8_c
+
+void aom_masked_sad8x8x4d_c(const uint8_t *src, int src_stride, const uint8_t *ref[], int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned sads[]);
+#define aom_masked_sad8x8x4d aom_masked_sad8x8x4d_c
+
+unsigned int aom_masked_sub_pixel_variance128x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance128x128 aom_masked_sub_pixel_variance128x128_c
+
+unsigned int aom_masked_sub_pixel_variance128x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance128x64 aom_masked_sub_pixel_variance128x64_c
+
+unsigned int aom_masked_sub_pixel_variance16x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance16x16 aom_masked_sub_pixel_variance16x16_c
+
+unsigned int aom_masked_sub_pixel_variance16x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance16x32 aom_masked_sub_pixel_variance16x32_c
+
+unsigned int aom_masked_sub_pixel_variance16x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance16x4 aom_masked_sub_pixel_variance16x4_c
+
+unsigned int aom_masked_sub_pixel_variance16x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance16x64 aom_masked_sub_pixel_variance16x64_c
+
+unsigned int aom_masked_sub_pixel_variance16x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance16x8 aom_masked_sub_pixel_variance16x8_c
+
+unsigned int aom_masked_sub_pixel_variance32x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance32x16 aom_masked_sub_pixel_variance32x16_c
+
+unsigned int aom_masked_sub_pixel_variance32x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance32x32 aom_masked_sub_pixel_variance32x32_c
+
+unsigned int aom_masked_sub_pixel_variance32x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance32x64 aom_masked_sub_pixel_variance32x64_c
+
+unsigned int aom_masked_sub_pixel_variance32x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance32x8 aom_masked_sub_pixel_variance32x8_c
+
+unsigned int aom_masked_sub_pixel_variance4x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance4x16 aom_masked_sub_pixel_variance4x16_c
+
+unsigned int aom_masked_sub_pixel_variance4x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance4x4 aom_masked_sub_pixel_variance4x4_c
+
+unsigned int aom_masked_sub_pixel_variance4x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance4x8 aom_masked_sub_pixel_variance4x8_c
+
+unsigned int aom_masked_sub_pixel_variance64x128_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance64x128 aom_masked_sub_pixel_variance64x128_c
+
+unsigned int aom_masked_sub_pixel_variance64x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance64x16 aom_masked_sub_pixel_variance64x16_c
+
+unsigned int aom_masked_sub_pixel_variance64x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance64x32 aom_masked_sub_pixel_variance64x32_c
+
+unsigned int aom_masked_sub_pixel_variance64x64_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance64x64 aom_masked_sub_pixel_variance64x64_c
+
+unsigned int aom_masked_sub_pixel_variance8x16_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance8x16 aom_masked_sub_pixel_variance8x16_c
+
+unsigned int aom_masked_sub_pixel_variance8x32_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance8x32 aom_masked_sub_pixel_variance8x32_c
+
+unsigned int aom_masked_sub_pixel_variance8x4_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance8x4 aom_masked_sub_pixel_variance8x4_c
+
+unsigned int aom_masked_sub_pixel_variance8x8_c(const uint8_t *src, int src_stride, int xoffset, int yoffset, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask, unsigned int *sse);
+#define aom_masked_sub_pixel_variance8x8 aom_masked_sub_pixel_variance8x8_c
+
+void aom_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max);
+#define aom_minmax_8x8 aom_minmax_8x8_c
+
+unsigned int aom_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_mse16x16 aom_mse16x16_c
+
+unsigned int aom_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_mse16x8 aom_mse16x8_c
+
+unsigned int aom_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_mse8x16 aom_mse8x16_c
+
+unsigned int aom_mse8x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define aom_mse8x8 aom_mse8x8_c
+
+uint64_t aom_mse_wxh_16bit_c(uint8_t *dst, int dstride,uint16_t *src, int sstride, int w, int h);
+#define aom_mse_wxh_16bit aom_mse_wxh_16bit_c
+
+uint64_t aom_mse_wxh_16bit_highbd_c(uint16_t *dst, int dstride,uint16_t *src, int sstride, int w, int h);
+#define aom_mse_wxh_16bit_highbd aom_mse_wxh_16bit_highbd_c
+
+unsigned int aom_obmc_sad128x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad128x128 aom_obmc_sad128x128_c
+
+unsigned int aom_obmc_sad128x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad128x64 aom_obmc_sad128x64_c
+
+unsigned int aom_obmc_sad16x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad16x16 aom_obmc_sad16x16_c
+
+unsigned int aom_obmc_sad16x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad16x32 aom_obmc_sad16x32_c
+
+unsigned int aom_obmc_sad16x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad16x4 aom_obmc_sad16x4_c
+
+unsigned int aom_obmc_sad16x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad16x64 aom_obmc_sad16x64_c
+
+unsigned int aom_obmc_sad16x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad16x8 aom_obmc_sad16x8_c
+
+unsigned int aom_obmc_sad32x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad32x16 aom_obmc_sad32x16_c
+
+unsigned int aom_obmc_sad32x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad32x32 aom_obmc_sad32x32_c
+
+unsigned int aom_obmc_sad32x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad32x64 aom_obmc_sad32x64_c
+
+unsigned int aom_obmc_sad32x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad32x8 aom_obmc_sad32x8_c
+
+unsigned int aom_obmc_sad4x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad4x16 aom_obmc_sad4x16_c
+
+unsigned int aom_obmc_sad4x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad4x4 aom_obmc_sad4x4_c
+
+unsigned int aom_obmc_sad4x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad4x8 aom_obmc_sad4x8_c
+
+unsigned int aom_obmc_sad64x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad64x128 aom_obmc_sad64x128_c
+
+unsigned int aom_obmc_sad64x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad64x16 aom_obmc_sad64x16_c
+
+unsigned int aom_obmc_sad64x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad64x32 aom_obmc_sad64x32_c
+
+unsigned int aom_obmc_sad64x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad64x64 aom_obmc_sad64x64_c
+
+unsigned int aom_obmc_sad8x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad8x16 aom_obmc_sad8x16_c
+
+unsigned int aom_obmc_sad8x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad8x32 aom_obmc_sad8x32_c
+
+unsigned int aom_obmc_sad8x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad8x4 aom_obmc_sad8x4_c
+
+unsigned int aom_obmc_sad8x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask);
+#define aom_obmc_sad8x8 aom_obmc_sad8x8_c
+
+unsigned int aom_obmc_sub_pixel_variance128x128_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance128x128 aom_obmc_sub_pixel_variance128x128_c
+
+unsigned int aom_obmc_sub_pixel_variance128x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance128x64 aom_obmc_sub_pixel_variance128x64_c
+
+unsigned int aom_obmc_sub_pixel_variance16x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance16x16 aom_obmc_sub_pixel_variance16x16_c
+
+unsigned int aom_obmc_sub_pixel_variance16x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance16x32 aom_obmc_sub_pixel_variance16x32_c
+
+unsigned int aom_obmc_sub_pixel_variance16x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance16x4 aom_obmc_sub_pixel_variance16x4_c
+
+unsigned int aom_obmc_sub_pixel_variance16x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance16x64 aom_obmc_sub_pixel_variance16x64_c
+
+unsigned int aom_obmc_sub_pixel_variance16x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance16x8 aom_obmc_sub_pixel_variance16x8_c
+
+unsigned int aom_obmc_sub_pixel_variance32x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance32x16 aom_obmc_sub_pixel_variance32x16_c
+
+unsigned int aom_obmc_sub_pixel_variance32x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance32x32 aom_obmc_sub_pixel_variance32x32_c
+
+unsigned int aom_obmc_sub_pixel_variance32x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance32x64 aom_obmc_sub_pixel_variance32x64_c
+
+unsigned int aom_obmc_sub_pixel_variance32x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance32x8 aom_obmc_sub_pixel_variance32x8_c
+
+unsigned int aom_obmc_sub_pixel_variance4x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance4x16 aom_obmc_sub_pixel_variance4x16_c
+
+unsigned int aom_obmc_sub_pixel_variance4x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance4x4 aom_obmc_sub_pixel_variance4x4_c
+
+unsigned int aom_obmc_sub_pixel_variance4x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance4x8 aom_obmc_sub_pixel_variance4x8_c
+
+unsigned int aom_obmc_sub_pixel_variance64x128_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance64x128 aom_obmc_sub_pixel_variance64x128_c
+
+unsigned int aom_obmc_sub_pixel_variance64x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance64x16 aom_obmc_sub_pixel_variance64x16_c
+
+unsigned int aom_obmc_sub_pixel_variance64x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance64x32 aom_obmc_sub_pixel_variance64x32_c
+
+unsigned int aom_obmc_sub_pixel_variance64x64_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance64x64 aom_obmc_sub_pixel_variance64x64_c
+
+unsigned int aom_obmc_sub_pixel_variance8x16_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance8x16 aom_obmc_sub_pixel_variance8x16_c
+
+unsigned int aom_obmc_sub_pixel_variance8x32_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance8x32 aom_obmc_sub_pixel_variance8x32_c
+
+unsigned int aom_obmc_sub_pixel_variance8x4_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance8x4 aom_obmc_sub_pixel_variance8x4_c
+
+unsigned int aom_obmc_sub_pixel_variance8x8_c(const uint8_t *pre, int pre_stride, int xoffset, int yoffset, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_sub_pixel_variance8x8 aom_obmc_sub_pixel_variance8x8_c
+
+unsigned int aom_obmc_variance128x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance128x128 aom_obmc_variance128x128_c
+
+unsigned int aom_obmc_variance128x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance128x64 aom_obmc_variance128x64_c
+
+unsigned int aom_obmc_variance16x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance16x16 aom_obmc_variance16x16_c
+
+unsigned int aom_obmc_variance16x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance16x32 aom_obmc_variance16x32_c
+
+unsigned int aom_obmc_variance16x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance16x4 aom_obmc_variance16x4_c
+
+unsigned int aom_obmc_variance16x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance16x64 aom_obmc_variance16x64_c
+
+unsigned int aom_obmc_variance16x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance16x8 aom_obmc_variance16x8_c
+
+unsigned int aom_obmc_variance32x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance32x16 aom_obmc_variance32x16_c
+
+unsigned int aom_obmc_variance32x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance32x32 aom_obmc_variance32x32_c
+
+unsigned int aom_obmc_variance32x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance32x64 aom_obmc_variance32x64_c
+
+unsigned int aom_obmc_variance32x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance32x8 aom_obmc_variance32x8_c
+
+unsigned int aom_obmc_variance4x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance4x16 aom_obmc_variance4x16_c
+
+unsigned int aom_obmc_variance4x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance4x4 aom_obmc_variance4x4_c
+
+unsigned int aom_obmc_variance4x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance4x8 aom_obmc_variance4x8_c
+
+unsigned int aom_obmc_variance64x128_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance64x128 aom_obmc_variance64x128_c
+
+unsigned int aom_obmc_variance64x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance64x16 aom_obmc_variance64x16_c
+
+unsigned int aom_obmc_variance64x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance64x32 aom_obmc_variance64x32_c
+
+unsigned int aom_obmc_variance64x64_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance64x64 aom_obmc_variance64x64_c
+
+unsigned int aom_obmc_variance8x16_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance8x16 aom_obmc_variance8x16_c
+
+unsigned int aom_obmc_variance8x32_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance8x32 aom_obmc_variance8x32_c
+
+unsigned int aom_obmc_variance8x4_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance8x4 aom_obmc_variance8x4_c
+
+unsigned int aom_obmc_variance8x8_c(const uint8_t *pre, int pre_stride, const int32_t *wsrc, const int32_t *mask, unsigned int *sse);
+#define aom_obmc_variance8x8 aom_obmc_variance8x8_c
+
+void aom_paeth_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_16x16 aom_paeth_predictor_16x16_c
+
+void aom_paeth_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_16x32 aom_paeth_predictor_16x32_c
+
+void aom_paeth_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_16x4 aom_paeth_predictor_16x4_c
+
+void aom_paeth_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_16x64 aom_paeth_predictor_16x64_c
+
+void aom_paeth_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_16x8 aom_paeth_predictor_16x8_c
+
+void aom_paeth_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_2x2 aom_paeth_predictor_2x2_c
+
+void aom_paeth_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_32x16 aom_paeth_predictor_32x16_c
+
+void aom_paeth_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_32x32 aom_paeth_predictor_32x32_c
+
+void aom_paeth_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_32x64 aom_paeth_predictor_32x64_c
+
+void aom_paeth_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_32x8 aom_paeth_predictor_32x8_c
+
+void aom_paeth_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_4x16 aom_paeth_predictor_4x16_c
+
+void aom_paeth_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_4x4 aom_paeth_predictor_4x4_c
+
+void aom_paeth_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_4x8 aom_paeth_predictor_4x8_c
+
+void aom_paeth_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_64x16 aom_paeth_predictor_64x16_c
+
+void aom_paeth_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_64x32 aom_paeth_predictor_64x32_c
+
+void aom_paeth_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_64x64 aom_paeth_predictor_64x64_c
+
+void aom_paeth_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_8x16 aom_paeth_predictor_8x16_c
+
+void aom_paeth_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_8x32 aom_paeth_predictor_8x32_c
+
+void aom_paeth_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_8x4 aom_paeth_predictor_8x4_c
+
+void aom_paeth_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_paeth_predictor_8x8 aom_paeth_predictor_8x8_c
+
+void aom_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_quantize_b aom_quantize_b_c
+
+void aom_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_quantize_b_32x32 aom_quantize_b_32x32_c
+
+void aom_quantize_b_32x32_adaptive_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_quantize_b_32x32_adaptive aom_quantize_b_32x32_adaptive_c
+
+void aom_quantize_b_64x64_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_quantize_b_64x64 aom_quantize_b_64x64_c
+
+void aom_quantize_b_64x64_adaptive_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_quantize_b_64x64_adaptive aom_quantize_b_64x64_adaptive_c
+
+void aom_quantize_b_adaptive_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define aom_quantize_b_adaptive aom_quantize_b_adaptive_c
+
+unsigned int aom_sad128x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad128x128 aom_sad128x128_c
+
+unsigned int aom_sad128x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad128x128_avg aom_sad128x128_avg_c
+
+void aom_sad128x128x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad128x128x4d aom_sad128x128x4d_c
+
+void aom_sad128x128x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad128x128x4d_avg aom_sad128x128x4d_avg_c
+
+unsigned int aom_sad128x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad128x64 aom_sad128x64_c
+
+unsigned int aom_sad128x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad128x64_avg aom_sad128x64_avg_c
+
+void aom_sad128x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad128x64x4d aom_sad128x64x4d_c
+
+void aom_sad128x64x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad128x64x4d_avg aom_sad128x64x4d_avg_c
+
+unsigned int aom_sad128xh_c(const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height);
+#define aom_sad128xh aom_sad128xh_c
+
+unsigned int aom_sad16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad16x16 aom_sad16x16_c
+
+unsigned int aom_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad16x16_avg aom_sad16x16_avg_c
+
+void aom_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad16x16x4d aom_sad16x16x4d_c
+
+void aom_sad16x16x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad16x16x4d_avg aom_sad16x16x4d_avg_c
+
+unsigned int aom_sad16x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad16x32 aom_sad16x32_c
+
+unsigned int aom_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad16x32_avg aom_sad16x32_avg_c
+
+void aom_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad16x32x4d aom_sad16x32x4d_c
+
+void aom_sad16x32x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad16x32x4d_avg aom_sad16x32x4d_avg_c
+
+unsigned int aom_sad16x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad16x4 aom_sad16x4_c
+
+unsigned int aom_sad16x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad16x4_avg aom_sad16x4_avg_c
+
+void aom_sad16x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad16x4x4d aom_sad16x4x4d_c
+
+void aom_sad16x4x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad16x4x4d_avg aom_sad16x4x4d_avg_c
+
+unsigned int aom_sad16x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad16x64 aom_sad16x64_c
+
+unsigned int aom_sad16x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad16x64_avg aom_sad16x64_avg_c
+
+void aom_sad16x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad16x64x4d aom_sad16x64x4d_c
+
+void aom_sad16x64x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad16x64x4d_avg aom_sad16x64x4d_avg_c
+
+unsigned int aom_sad16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad16x8 aom_sad16x8_c
+
+unsigned int aom_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad16x8_avg aom_sad16x8_avg_c
+
+void aom_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad16x8x4d aom_sad16x8x4d_c
+
+void aom_sad16x8x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad16x8x4d_avg aom_sad16x8x4d_avg_c
+
+unsigned int aom_sad16xh_c(const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height);
+#define aom_sad16xh aom_sad16xh_c
+
+unsigned int aom_sad32x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad32x16 aom_sad32x16_c
+
+unsigned int aom_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad32x16_avg aom_sad32x16_avg_c
+
+void aom_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad32x16x4d aom_sad32x16x4d_c
+
+void aom_sad32x16x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad32x16x4d_avg aom_sad32x16x4d_avg_c
+
+unsigned int aom_sad32x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad32x32 aom_sad32x32_c
+
+unsigned int aom_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad32x32_avg aom_sad32x32_avg_c
+
+void aom_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad32x32x4d aom_sad32x32x4d_c
+
+void aom_sad32x32x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad32x32x4d_avg aom_sad32x32x4d_avg_c
+
+unsigned int aom_sad32x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad32x64 aom_sad32x64_c
+
+unsigned int aom_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad32x64_avg aom_sad32x64_avg_c
+
+void aom_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad32x64x4d aom_sad32x64x4d_c
+
+void aom_sad32x64x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad32x64x4d_avg aom_sad32x64x4d_avg_c
+
+unsigned int aom_sad32x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad32x8 aom_sad32x8_c
+
+unsigned int aom_sad32x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad32x8_avg aom_sad32x8_avg_c
+
+void aom_sad32x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad32x8x4d aom_sad32x8x4d_c
+
+void aom_sad32x8x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad32x8x4d_avg aom_sad32x8x4d_avg_c
+
+unsigned int aom_sad32xh_c(const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height);
+#define aom_sad32xh aom_sad32xh_c
+
+unsigned int aom_sad4x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad4x16 aom_sad4x16_c
+
+unsigned int aom_sad4x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad4x16_avg aom_sad4x16_avg_c
+
+void aom_sad4x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad4x16x4d aom_sad4x16x4d_c
+
+void aom_sad4x16x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad4x16x4d_avg aom_sad4x16x4d_avg_c
+
+unsigned int aom_sad4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad4x4 aom_sad4x4_c
+
+unsigned int aom_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad4x4_avg aom_sad4x4_avg_c
+
+void aom_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad4x4x4d aom_sad4x4x4d_c
+
+void aom_sad4x4x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad4x4x4d_avg aom_sad4x4x4d_avg_c
+
+unsigned int aom_sad4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad4x8 aom_sad4x8_c
+
+unsigned int aom_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad4x8_avg aom_sad4x8_avg_c
+
+void aom_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad4x8x4d aom_sad4x8x4d_c
+
+void aom_sad4x8x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad4x8x4d_avg aom_sad4x8x4d_avg_c
+
+unsigned int aom_sad4xh_c(const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height);
+#define aom_sad4xh aom_sad4xh_c
+
+unsigned int aom_sad64x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad64x128 aom_sad64x128_c
+
+unsigned int aom_sad64x128_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad64x128_avg aom_sad64x128_avg_c
+
+void aom_sad64x128x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad64x128x4d aom_sad64x128x4d_c
+
+void aom_sad64x128x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad64x128x4d_avg aom_sad64x128x4d_avg_c
+
+unsigned int aom_sad64x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad64x16 aom_sad64x16_c
+
+unsigned int aom_sad64x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad64x16_avg aom_sad64x16_avg_c
+
+void aom_sad64x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad64x16x4d aom_sad64x16x4d_c
+
+void aom_sad64x16x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad64x16x4d_avg aom_sad64x16x4d_avg_c
+
+unsigned int aom_sad64x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad64x32 aom_sad64x32_c
+
+unsigned int aom_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad64x32_avg aom_sad64x32_avg_c
+
+void aom_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad64x32x4d aom_sad64x32x4d_c
+
+void aom_sad64x32x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad64x32x4d_avg aom_sad64x32x4d_avg_c
+
+unsigned int aom_sad64x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad64x64 aom_sad64x64_c
+
+unsigned int aom_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad64x64_avg aom_sad64x64_avg_c
+
+void aom_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad64x64x4d aom_sad64x64x4d_c
+
+void aom_sad64x64x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad64x64x4d_avg aom_sad64x64x4d_avg_c
+
+unsigned int aom_sad64xh_c(const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height);
+#define aom_sad64xh aom_sad64xh_c
+
+unsigned int aom_sad8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad8x16 aom_sad8x16_c
+
+unsigned int aom_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad8x16_avg aom_sad8x16_avg_c
+
+void aom_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad8x16x4d aom_sad8x16x4d_c
+
+void aom_sad8x16x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad8x16x4d_avg aom_sad8x16x4d_avg_c
+
+unsigned int aom_sad8x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad8x32 aom_sad8x32_c
+
+unsigned int aom_sad8x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad8x32_avg aom_sad8x32_avg_c
+
+void aom_sad8x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad8x32x4d aom_sad8x32x4d_c
+
+void aom_sad8x32x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad8x32x4d_avg aom_sad8x32x4d_avg_c
+
+unsigned int aom_sad8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad8x4 aom_sad8x4_c
+
+unsigned int aom_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad8x4_avg aom_sad8x4_avg_c
+
+void aom_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad8x4x4d aom_sad8x4x4d_c
+
+void aom_sad8x4x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad8x4x4d_avg aom_sad8x4x4d_avg_c
+
+unsigned int aom_sad8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad8x8 aom_sad8x8_c
+
+unsigned int aom_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define aom_sad8x8_avg aom_sad8x8_avg_c
+
+void aom_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad8x8x4d aom_sad8x8x4d_c
+
+void aom_sad8x8x4d_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, const uint8_t *second_pred, uint32_t *sad_array);
+#define aom_sad8x8x4d_avg aom_sad8x8x4d_avg_c
+
+unsigned int aom_sad8xh_c(const uint8_t *a, int a_stride, const uint8_t *b, int b_stride, int width, int height);
+#define aom_sad8xh aom_sad8xh_c
+
+unsigned int aom_sad_skip_128x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_128x128 aom_sad_skip_128x128_c
+
+void aom_sad_skip_128x128x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_128x128x4d aom_sad_skip_128x128x4d_c
+
+unsigned int aom_sad_skip_128x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_128x64 aom_sad_skip_128x64_c
+
+void aom_sad_skip_128x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_128x64x4d aom_sad_skip_128x64x4d_c
+
+unsigned int aom_sad_skip_16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_16x16 aom_sad_skip_16x16_c
+
+void aom_sad_skip_16x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_16x16x4d aom_sad_skip_16x16x4d_c
+
+unsigned int aom_sad_skip_16x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_16x32 aom_sad_skip_16x32_c
+
+void aom_sad_skip_16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_16x32x4d aom_sad_skip_16x32x4d_c
+
+unsigned int aom_sad_skip_16x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_16x4 aom_sad_skip_16x4_c
+
+void aom_sad_skip_16x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_16x4x4d aom_sad_skip_16x4x4d_c
+
+unsigned int aom_sad_skip_16x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_16x64 aom_sad_skip_16x64_c
+
+void aom_sad_skip_16x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_16x64x4d aom_sad_skip_16x64x4d_c
+
+unsigned int aom_sad_skip_16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_16x8 aom_sad_skip_16x8_c
+
+void aom_sad_skip_16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_16x8x4d aom_sad_skip_16x8x4d_c
+
+unsigned int aom_sad_skip_32x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_32x16 aom_sad_skip_32x16_c
+
+void aom_sad_skip_32x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_32x16x4d aom_sad_skip_32x16x4d_c
+
+unsigned int aom_sad_skip_32x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_32x32 aom_sad_skip_32x32_c
+
+void aom_sad_skip_32x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_32x32x4d aom_sad_skip_32x32x4d_c
+
+unsigned int aom_sad_skip_32x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_32x64 aom_sad_skip_32x64_c
+
+void aom_sad_skip_32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_32x64x4d aom_sad_skip_32x64x4d_c
+
+unsigned int aom_sad_skip_32x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_32x8 aom_sad_skip_32x8_c
+
+void aom_sad_skip_32x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_32x8x4d aom_sad_skip_32x8x4d_c
+
+unsigned int aom_sad_skip_4x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_4x16 aom_sad_skip_4x16_c
+
+void aom_sad_skip_4x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_4x16x4d aom_sad_skip_4x16x4d_c
+
+unsigned int aom_sad_skip_4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_4x4 aom_sad_skip_4x4_c
+
+void aom_sad_skip_4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_4x4x4d aom_sad_skip_4x4x4d_c
+
+unsigned int aom_sad_skip_4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_4x8 aom_sad_skip_4x8_c
+
+void aom_sad_skip_4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_4x8x4d aom_sad_skip_4x8x4d_c
+
+unsigned int aom_sad_skip_64x128_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_64x128 aom_sad_skip_64x128_c
+
+void aom_sad_skip_64x128x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_64x128x4d aom_sad_skip_64x128x4d_c
+
+unsigned int aom_sad_skip_64x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_64x16 aom_sad_skip_64x16_c
+
+void aom_sad_skip_64x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_64x16x4d aom_sad_skip_64x16x4d_c
+
+unsigned int aom_sad_skip_64x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_64x32 aom_sad_skip_64x32_c
+
+void aom_sad_skip_64x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_64x32x4d aom_sad_skip_64x32x4d_c
+
+unsigned int aom_sad_skip_64x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_64x64 aom_sad_skip_64x64_c
+
+void aom_sad_skip_64x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_64x64x4d aom_sad_skip_64x64x4d_c
+
+unsigned int aom_sad_skip_8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_8x16 aom_sad_skip_8x16_c
+
+void aom_sad_skip_8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_8x16x4d aom_sad_skip_8x16x4d_c
+
+unsigned int aom_sad_skip_8x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_8x32 aom_sad_skip_8x32_c
+
+void aom_sad_skip_8x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_8x32x4d aom_sad_skip_8x32x4d_c
+
+unsigned int aom_sad_skip_8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_8x4 aom_sad_skip_8x4_c
+
+void aom_sad_skip_8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_8x4x4d aom_sad_skip_8x4x4d_c
+
+unsigned int aom_sad_skip_8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+#define aom_sad_skip_8x8 aom_sad_skip_8x8_c
+
+void aom_sad_skip_8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array);
+#define aom_sad_skip_8x8x4d aom_sad_skip_8x8x4d_c
+
+int aom_satd_c(const tran_low_t *coeff, int length);
+#define aom_satd aom_satd_c
+
+int aom_satd_lp_c(const int16_t *coeff, int length);
+#define aom_satd_lp aom_satd_lp_c
+
+void aom_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+#define aom_scaled_2d aom_scaled_2d_c
+
+void aom_smooth_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_16x16 aom_smooth_h_predictor_16x16_c
+
+void aom_smooth_h_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_16x32 aom_smooth_h_predictor_16x32_c
+
+void aom_smooth_h_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_16x4 aom_smooth_h_predictor_16x4_c
+
+void aom_smooth_h_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_16x64 aom_smooth_h_predictor_16x64_c
+
+void aom_smooth_h_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_16x8 aom_smooth_h_predictor_16x8_c
+
+void aom_smooth_h_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_2x2 aom_smooth_h_predictor_2x2_c
+
+void aom_smooth_h_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_32x16 aom_smooth_h_predictor_32x16_c
+
+void aom_smooth_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_32x32 aom_smooth_h_predictor_32x32_c
+
+void aom_smooth_h_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_32x64 aom_smooth_h_predictor_32x64_c
+
+void aom_smooth_h_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_32x8 aom_smooth_h_predictor_32x8_c
+
+void aom_smooth_h_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_4x16 aom_smooth_h_predictor_4x16_c
+
+void aom_smooth_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_4x4 aom_smooth_h_predictor_4x4_c
+
+void aom_smooth_h_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_4x8 aom_smooth_h_predictor_4x8_c
+
+void aom_smooth_h_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_64x16 aom_smooth_h_predictor_64x16_c
+
+void aom_smooth_h_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_64x32 aom_smooth_h_predictor_64x32_c
+
+void aom_smooth_h_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_64x64 aom_smooth_h_predictor_64x64_c
+
+void aom_smooth_h_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_8x16 aom_smooth_h_predictor_8x16_c
+
+void aom_smooth_h_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_8x32 aom_smooth_h_predictor_8x32_c
+
+void aom_smooth_h_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_8x4 aom_smooth_h_predictor_8x4_c
+
+void aom_smooth_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_h_predictor_8x8 aom_smooth_h_predictor_8x8_c
+
+void aom_smooth_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_16x16 aom_smooth_predictor_16x16_c
+
+void aom_smooth_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_16x32 aom_smooth_predictor_16x32_c
+
+void aom_smooth_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_16x4 aom_smooth_predictor_16x4_c
+
+void aom_smooth_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_16x64 aom_smooth_predictor_16x64_c
+
+void aom_smooth_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_16x8 aom_smooth_predictor_16x8_c
+
+void aom_smooth_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_2x2 aom_smooth_predictor_2x2_c
+
+void aom_smooth_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_32x16 aom_smooth_predictor_32x16_c
+
+void aom_smooth_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_32x32 aom_smooth_predictor_32x32_c
+
+void aom_smooth_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_32x64 aom_smooth_predictor_32x64_c
+
+void aom_smooth_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_32x8 aom_smooth_predictor_32x8_c
+
+void aom_smooth_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_4x16 aom_smooth_predictor_4x16_c
+
+void aom_smooth_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_4x4 aom_smooth_predictor_4x4_c
+
+void aom_smooth_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_4x8 aom_smooth_predictor_4x8_c
+
+void aom_smooth_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_64x16 aom_smooth_predictor_64x16_c
+
+void aom_smooth_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_64x32 aom_smooth_predictor_64x32_c
+
+void aom_smooth_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_64x64 aom_smooth_predictor_64x64_c
+
+void aom_smooth_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_8x16 aom_smooth_predictor_8x16_c
+
+void aom_smooth_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_8x32 aom_smooth_predictor_8x32_c
+
+void aom_smooth_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_8x4 aom_smooth_predictor_8x4_c
+
+void aom_smooth_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_predictor_8x8 aom_smooth_predictor_8x8_c
+
+void aom_smooth_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_16x16 aom_smooth_v_predictor_16x16_c
+
+void aom_smooth_v_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_16x32 aom_smooth_v_predictor_16x32_c
+
+void aom_smooth_v_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_16x4 aom_smooth_v_predictor_16x4_c
+
+void aom_smooth_v_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_16x64 aom_smooth_v_predictor_16x64_c
+
+void aom_smooth_v_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_16x8 aom_smooth_v_predictor_16x8_c
+
+void aom_smooth_v_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_2x2 aom_smooth_v_predictor_2x2_c
+
+void aom_smooth_v_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_32x16 aom_smooth_v_predictor_32x16_c
+
+void aom_smooth_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_32x32 aom_smooth_v_predictor_32x32_c
+
+void aom_smooth_v_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_32x64 aom_smooth_v_predictor_32x64_c
+
+void aom_smooth_v_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_32x8 aom_smooth_v_predictor_32x8_c
+
+void aom_smooth_v_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_4x16 aom_smooth_v_predictor_4x16_c
+
+void aom_smooth_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_4x4 aom_smooth_v_predictor_4x4_c
+
+void aom_smooth_v_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_4x8 aom_smooth_v_predictor_4x8_c
+
+void aom_smooth_v_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_64x16 aom_smooth_v_predictor_64x16_c
+
+void aom_smooth_v_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_64x32 aom_smooth_v_predictor_64x32_c
+
+void aom_smooth_v_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_64x64 aom_smooth_v_predictor_64x64_c
+
+void aom_smooth_v_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_8x16 aom_smooth_v_predictor_8x16_c
+
+void aom_smooth_v_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_8x32 aom_smooth_v_predictor_8x32_c
+
+void aom_smooth_v_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_8x4 aom_smooth_v_predictor_8x4_c
+
+void aom_smooth_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_smooth_v_predictor_8x8 aom_smooth_v_predictor_8x8_c
+
+int64_t aom_sse_c(const uint8_t *a, int a_stride, const uint8_t *b,int b_stride, int width, int height);
+#define aom_sse aom_sse_c
+
+uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance128x128 aom_sub_pixel_avg_variance128x128_c
+
+uint32_t aom_sub_pixel_avg_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance128x64 aom_sub_pixel_avg_variance128x64_c
+
+uint32_t aom_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance16x16 aom_sub_pixel_avg_variance16x16_c
+
+uint32_t aom_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance16x32 aom_sub_pixel_avg_variance16x32_c
+
+uint32_t aom_sub_pixel_avg_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance16x4 aom_sub_pixel_avg_variance16x4_c
+
+uint32_t aom_sub_pixel_avg_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance16x64 aom_sub_pixel_avg_variance16x64_c
+
+uint32_t aom_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance16x8 aom_sub_pixel_avg_variance16x8_c
+
+uint32_t aom_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance32x16 aom_sub_pixel_avg_variance32x16_c
+
+uint32_t aom_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance32x32 aom_sub_pixel_avg_variance32x32_c
+
+uint32_t aom_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance32x64 aom_sub_pixel_avg_variance32x64_c
+
+uint32_t aom_sub_pixel_avg_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance32x8 aom_sub_pixel_avg_variance32x8_c
+
+uint32_t aom_sub_pixel_avg_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance4x16 aom_sub_pixel_avg_variance4x16_c
+
+uint32_t aom_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance4x4 aom_sub_pixel_avg_variance4x4_c
+
+uint32_t aom_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance4x8 aom_sub_pixel_avg_variance4x8_c
+
+uint32_t aom_sub_pixel_avg_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance64x128 aom_sub_pixel_avg_variance64x128_c
+
+uint32_t aom_sub_pixel_avg_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance64x16 aom_sub_pixel_avg_variance64x16_c
+
+uint32_t aom_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance64x32 aom_sub_pixel_avg_variance64x32_c
+
+uint32_t aom_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance64x64 aom_sub_pixel_avg_variance64x64_c
+
+uint32_t aom_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance8x16 aom_sub_pixel_avg_variance8x16_c
+
+uint32_t aom_sub_pixel_avg_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance8x32 aom_sub_pixel_avg_variance8x32_c
+
+uint32_t aom_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance8x4 aom_sub_pixel_avg_variance8x4_c
+
+uint32_t aom_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
+#define aom_sub_pixel_avg_variance8x8 aom_sub_pixel_avg_variance8x8_c
+
+uint32_t aom_sub_pixel_variance128x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance128x128 aom_sub_pixel_variance128x128_c
+
+uint32_t aom_sub_pixel_variance128x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance128x64 aom_sub_pixel_variance128x64_c
+
+uint32_t aom_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance16x16 aom_sub_pixel_variance16x16_c
+
+uint32_t aom_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance16x32 aom_sub_pixel_variance16x32_c
+
+uint32_t aom_sub_pixel_variance16x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance16x4 aom_sub_pixel_variance16x4_c
+
+uint32_t aom_sub_pixel_variance16x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance16x64 aom_sub_pixel_variance16x64_c
+
+uint32_t aom_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance16x8 aom_sub_pixel_variance16x8_c
+
+uint32_t aom_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance32x16 aom_sub_pixel_variance32x16_c
+
+uint32_t aom_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance32x32 aom_sub_pixel_variance32x32_c
+
+uint32_t aom_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance32x64 aom_sub_pixel_variance32x64_c
+
+uint32_t aom_sub_pixel_variance32x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance32x8 aom_sub_pixel_variance32x8_c
+
+uint32_t aom_sub_pixel_variance4x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance4x16 aom_sub_pixel_variance4x16_c
+
+uint32_t aom_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance4x4 aom_sub_pixel_variance4x4_c
+
+uint32_t aom_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance4x8 aom_sub_pixel_variance4x8_c
+
+uint32_t aom_sub_pixel_variance64x128_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance64x128 aom_sub_pixel_variance64x128_c
+
+uint32_t aom_sub_pixel_variance64x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance64x16 aom_sub_pixel_variance64x16_c
+
+uint32_t aom_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance64x32 aom_sub_pixel_variance64x32_c
+
+uint32_t aom_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance64x64 aom_sub_pixel_variance64x64_c
+
+uint32_t aom_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance8x16 aom_sub_pixel_variance8x16_c
+
+uint32_t aom_sub_pixel_variance8x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance8x32 aom_sub_pixel_variance8x32_c
+
+uint32_t aom_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance8x4 aom_sub_pixel_variance8x4_c
+
+uint32_t aom_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
+#define aom_sub_pixel_variance8x8 aom_sub_pixel_variance8x8_c
+
+void aom_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
+#define aom_subtract_block aom_subtract_block_c
+
+uint64_t aom_sum_squares_2d_i16_c(const int16_t *src, int stride, int width, int height);
+#define aom_sum_squares_2d_i16 aom_sum_squares_2d_i16_c
+
+uint64_t aom_sum_squares_i16_c(const int16_t *src, uint32_t N);
+#define aom_sum_squares_i16 aom_sum_squares_i16_c
+
+uint64_t aom_sum_sse_2d_i16_c(const int16_t *src, int src_stride, int width, int height, int *sum);
+#define aom_sum_sse_2d_i16 aom_sum_sse_2d_i16_c
+
+void aom_upsampled_pred_c(MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
+                                          const MV *const mv, uint8_t *comp_pred, int width, int height, int subpel_x_q3,
+                                          int subpel_y_q3, const uint8_t *ref, int ref_stride, int subpel_search);
+#define aom_upsampled_pred aom_upsampled_pred_c
+
+void aom_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_16x16 aom_v_predictor_16x16_c
+
+void aom_v_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_16x32 aom_v_predictor_16x32_c
+
+void aom_v_predictor_16x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_16x4 aom_v_predictor_16x4_c
+
+void aom_v_predictor_16x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_16x64 aom_v_predictor_16x64_c
+
+void aom_v_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_16x8 aom_v_predictor_16x8_c
+
+void aom_v_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_2x2 aom_v_predictor_2x2_c
+
+void aom_v_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_32x16 aom_v_predictor_32x16_c
+
+void aom_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_32x32 aom_v_predictor_32x32_c
+
+void aom_v_predictor_32x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_32x64 aom_v_predictor_32x64_c
+
+void aom_v_predictor_32x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_32x8 aom_v_predictor_32x8_c
+
+void aom_v_predictor_4x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_4x16 aom_v_predictor_4x16_c
+
+void aom_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_4x4 aom_v_predictor_4x4_c
+
+void aom_v_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_4x8 aom_v_predictor_4x8_c
+
+void aom_v_predictor_64x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_64x16 aom_v_predictor_64x16_c
+
+void aom_v_predictor_64x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_64x32 aom_v_predictor_64x32_c
+
+void aom_v_predictor_64x64_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_64x64 aom_v_predictor_64x64_c
+
+void aom_v_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_8x16 aom_v_predictor_8x16_c
+
+void aom_v_predictor_8x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_8x32 aom_v_predictor_8x32_c
+
+void aom_v_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_8x4 aom_v_predictor_8x4_c
+
+void aom_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define aom_v_predictor_8x8 aom_v_predictor_8x8_c
+
+uint64_t aom_var_2d_u16_c(uint8_t *src, int src_stride, int width, int height);
+#define aom_var_2d_u16 aom_var_2d_u16_c
+
+uint64_t aom_var_2d_u8_c(uint8_t *src, int src_stride, int width, int height);
+#define aom_var_2d_u8 aom_var_2d_u8_c
+
+unsigned int aom_variance128x128_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance128x128 aom_variance128x128_c
+
+unsigned int aom_variance128x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance128x64 aom_variance128x64_c
+
+unsigned int aom_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance16x16 aom_variance16x16_c
+
+unsigned int aom_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance16x32 aom_variance16x32_c
+
+unsigned int aom_variance16x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance16x4 aom_variance16x4_c
+
+unsigned int aom_variance16x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance16x64 aom_variance16x64_c
+
+unsigned int aom_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance16x8 aom_variance16x8_c
+
+unsigned int aom_variance2x2_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance2x2 aom_variance2x2_c
+
+unsigned int aom_variance2x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance2x4 aom_variance2x4_c
+
+unsigned int aom_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance32x16 aom_variance32x16_c
+
+unsigned int aom_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance32x32 aom_variance32x32_c
+
+unsigned int aom_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance32x64 aom_variance32x64_c
+
+unsigned int aom_variance32x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance32x8 aom_variance32x8_c
+
+unsigned int aom_variance4x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance4x16 aom_variance4x16_c
+
+unsigned int aom_variance4x2_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance4x2 aom_variance4x2_c
+
+unsigned int aom_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance4x4 aom_variance4x4_c
+
+unsigned int aom_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance4x8 aom_variance4x8_c
+
+unsigned int aom_variance64x128_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance64x128 aom_variance64x128_c
+
+unsigned int aom_variance64x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance64x16 aom_variance64x16_c
+
+unsigned int aom_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance64x32 aom_variance64x32_c
+
+unsigned int aom_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance64x64 aom_variance64x64_c
+
+unsigned int aom_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance8x16 aom_variance8x16_c
+
+unsigned int aom_variance8x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance8x32 aom_variance8x32_c
+
+unsigned int aom_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance8x4 aom_variance8x4_c
+
+unsigned int aom_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define aom_variance8x8 aom_variance8x8_c
+
+int aom_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl);
+#define aom_vector_var aom_vector_var_c
+
+void aom_dsp_rtcd(void);
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#ifdef RTCD_C
+static void setup_rtcd_internal(void)
+{
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h b/pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h
new file mode 100644
index 0000000000..d93b3cddad
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/config/aom_scale_rtcd.h
@@ -0,0 +1,97 @@
+// This file is generated. Do not edit.
+#ifndef AOM_SCALE_RTCD_H_
+#define AOM_SCALE_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+struct yv12_buffer_config;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void aom_extend_frame_borders_c(struct yv12_buffer_config *ybf, const int num_planes);
+#define aom_extend_frame_borders aom_extend_frame_borders_c
+
+void aom_extend_frame_borders_y_c(struct yv12_buffer_config *ybf);
+#define aom_extend_frame_borders_y aom_extend_frame_borders_y_c
+
+void aom_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf, const int num_planes);
+#define aom_extend_frame_inner_borders aom_extend_frame_inner_borders_c
+
+void aom_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define aom_horizontal_line_2_1_scale aom_horizontal_line_2_1_scale_c
+
+void aom_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define aom_horizontal_line_5_3_scale aom_horizontal_line_5_3_scale_c
+
+void aom_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define aom_horizontal_line_5_4_scale aom_horizontal_line_5_4_scale_c
+
+void aom_vertical_band_2_1_scale_c(unsigned char *source, int src_pitch, unsigned char *dest, int dest_pitch, unsigned int dest_width);
+#define aom_vertical_band_2_1_scale aom_vertical_band_2_1_scale_c
+
+void aom_vertical_band_2_1_scale_i_c(unsigned char *source, int src_pitch, unsigned char *dest, int dest_pitch, unsigned int dest_width);
+#define aom_vertical_band_2_1_scale_i aom_vertical_band_2_1_scale_i_c
+
+void aom_vertical_band_5_3_scale_c(unsigned char *source, int src_pitch, unsigned char *dest, int dest_pitch, unsigned int dest_width);
+#define aom_vertical_band_5_3_scale aom_vertical_band_5_3_scale_c
+
+void aom_vertical_band_5_4_scale_c(unsigned char *source, int src_pitch, unsigned char *dest, int dest_pitch, unsigned int dest_width);
+#define aom_vertical_band_5_4_scale aom_vertical_band_5_4_scale_c
+
+void aom_yv12_copy_frame_c(const struct yv12_buffer_config *src_bc, struct yv12_buffer_config *dst_bc, const int num_planes);
+#define aom_yv12_copy_frame aom_yv12_copy_frame_c
+
+void aom_yv12_copy_u_c(const struct yv12_buffer_config *src_bc, struct yv12_buffer_config *dst_bc);
+#define aom_yv12_copy_u aom_yv12_copy_u_c
+
+void aom_yv12_copy_v_c(const struct yv12_buffer_config *src_bc, struct yv12_buffer_config *dst_bc);
+#define aom_yv12_copy_v aom_yv12_copy_v_c
+
+void aom_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
+#define aom_yv12_copy_y aom_yv12_copy_y_c
+
+void aom_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf, const int num_planes);
+#define aom_yv12_extend_frame_borders aom_yv12_extend_frame_borders_c
+
+void aom_yv12_partial_coloc_copy_u_c(const struct yv12_buffer_config *src_bc, struct yv12_buffer_config *dst_bc, int hstart, int hend, int vstart, int vend);
+#define aom_yv12_partial_coloc_copy_u aom_yv12_partial_coloc_copy_u_c
+
+void aom_yv12_partial_coloc_copy_v_c(const struct yv12_buffer_config *src_bc, struct yv12_buffer_config *dst_bc, int hstart, int hend, int vstart, int vend);
+#define aom_yv12_partial_coloc_copy_v aom_yv12_partial_coloc_copy_v_c
+
+void aom_yv12_partial_coloc_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc, int hstart, int hend, int vstart, int vend);
+#define aom_yv12_partial_coloc_copy_y aom_yv12_partial_coloc_copy_y_c
+
+void aom_yv12_partial_copy_u_c(const struct yv12_buffer_config *src_bc, int hstart1, int hend1, int vstart1, int vend1, struct yv12_buffer_config *dst_bc, int hstart2, int vstart2);
+#define aom_yv12_partial_copy_u aom_yv12_partial_copy_u_c
+
+void aom_yv12_partial_copy_v_c(const struct yv12_buffer_config *src_bc, int hstart1, int hend1, int vstart1, int vend1, struct yv12_buffer_config *dst_bc, int hstart2, int vstart2);
+#define aom_yv12_partial_copy_v aom_yv12_partial_copy_v_c
+
+void aom_yv12_partial_copy_y_c(const struct yv12_buffer_config *src_ybc, int hstart1, int hend1, int vstart1, int vend1, struct yv12_buffer_config *dst_ybc, int hstart2, int vstart2);
+#define aom_yv12_partial_copy_y aom_yv12_partial_copy_y_c
+
+int aom_yv12_realloc_with_new_border_c(struct yv12_buffer_config *ybf, int new_border, int byte_alignment, int num_planes);
+#define aom_yv12_realloc_with_new_border aom_yv12_realloc_with_new_border_c
+
+void aom_scale_rtcd(void);
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#ifdef RTCD_C
+static void setup_rtcd_internal(void)
+{
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/aom/config/aom_version.h b/pxr/imaging/plugin/hioAvif/aom/config/aom_version.h
new file mode 100644
index 0000000000..44bb0ef41a
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/config/aom_version.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2023, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#define VERSION_MAJOR 3
+#define VERSION_MINOR 0
+#define VERSION_PATCH 0
+#define VERSION_EXTRA ""
+#define VERSION_PACKED \
+  ((VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | (VERSION_PATCH))
+#define VERSION_STRING_NOSP "3.0.0"
+#define VERSION_STRING " 3.0.0"
diff --git a/pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h b/pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h
new file mode 100644
index 0000000000..3a9a4f3ff5
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/config/av1_rtcd.h
@@ -0,0 +1,569 @@
+// This file is generated. Do not edit.
+#ifndef AV1_RTCD_H_
+#define AV1_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+/*
+ * AV1
+ */
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_integer.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_dsp/txfm_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/enums.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/quant_common.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/filter.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/convolve.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/av1_txfm.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/odintrin.h"
+#include "pxr/imaging/plugin/hioAvif/aom/av1/common/restoration.h"
+
+struct macroblockd;
+
+/* Encoder forward decls */
+struct macroblock;
+struct txfm_param;
+struct aom_variance_vtable;
+struct search_site_config;
+struct yv12_buffer_config;
+struct NN_CONFIG;
+typedef struct NN_CONFIG NN_CONFIG;
+
+enum { NONE, RELU, SOFTSIGN, SIGMOID } UENUM1BYTE(ACTIVATION);
+#if CONFIG_NN_V2
+enum { SOFTMAX_CROSS_ENTROPY } UENUM1BYTE(LOSS);
+struct NN_CONFIG_V2;
+typedef struct NN_CONFIG_V2 NN_CONFIG_V2;
+struct FC_LAYER;
+typedef struct FC_LAYER FC_LAYER;
+#endif  // CONFIG_NN_V2
+
+struct CNN_CONFIG;
+typedef struct CNN_CONFIG CNN_CONFIG;
+struct CNN_LAYER_CONFIG;
+typedef struct CNN_LAYER_CONFIG CNN_LAYER_CONFIG;
+struct CNN_THREAD_DATA;
+typedef struct CNN_THREAD_DATA CNN_THREAD_DATA;
+struct CNN_BRANCH_CONFIG;
+typedef struct CNN_BRANCH_CONFIG CNN_BRANCH_CONFIG;
+struct CNN_MULTI_OUT;
+typedef struct CNN_MULTI_OUT CNN_MULTI_OUT;
+
+/* Function pointers return by CfL functions */
+typedef void (*cfl_subsample_lbd_fn)(const uint8_t *input, int input_stride,
+                                     uint16_t *output_q3);
+
+#if CONFIG_AV1_HIGHBITDEPTH
+typedef void (*cfl_subsample_hbd_fn)(const uint16_t *input, int input_stride,
+                                     uint16_t *output_q3);
+
+typedef void (*cfl_predict_hbd_fn)(const int16_t *src, uint16_t *dst,
+                                   int dst_stride, int alpha_q3, int bd);
+#endif
+
+typedef void (*cfl_subtract_average_fn)(const uint16_t *src, int16_t *dst);
+
+typedef void (*cfl_predict_lbd_fn)(const int16_t *src, uint8_t *dst,
+                                   int dst_stride, int alpha_q3);
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void aom_quantize_b_helper_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t *qm_ptr, const qm_val_t *iqm_ptr, const int log_scale);
+#define aom_quantize_b_helper aom_quantize_b_helper_c
+
+void av1_apply_selfguided_restoration_c(const uint8_t *dat, int width, int height, int stride, int eps, const int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf, int bit_depth, int highbd);
+#define av1_apply_selfguided_restoration av1_apply_selfguided_restoration_c
+
+void av1_apply_temporal_filter_c(const struct yv12_buffer_config *ref_frame, const struct macroblockd *mbd, const BLOCK_SIZE block_size, const int mb_row, const int mb_col, const int num_planes, const double *noise_levels, const MV *subblock_mvs, const int *subblock_mses, const int q_factor, const int filter_strength, const uint8_t *pred, uint32_t *accum, uint16_t *count);
+#define av1_apply_temporal_filter av1_apply_temporal_filter_c
+
+int64_t av1_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+#define av1_block_error av1_block_error_c
+
+int64_t av1_block_error_lp_c(const int16_t *coeff, const int16_t *dqcoeff, intptr_t block_size);
+#define av1_block_error_lp av1_block_error_lp_c
+
+void av1_build_compound_diffwtd_mask_c(uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const uint8_t *src0, int src0_stride, const uint8_t *src1, int src1_stride, int h, int w);
+#define av1_build_compound_diffwtd_mask av1_build_compound_diffwtd_mask_c
+
+void av1_build_compound_diffwtd_mask_d16_c(uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const CONV_BUF_TYPE *src0, int src0_stride, const CONV_BUF_TYPE *src1, int src1_stride, int h, int w, ConvolveParams *conv_params, int bd);
+#define av1_build_compound_diffwtd_mask_d16 av1_build_compound_diffwtd_mask_d16_c
+
+void av1_build_compound_diffwtd_mask_highbd_c(uint8_t *mask, DIFFWTD_MASK_TYPE mask_type, const uint8_t *src0, int src0_stride, const uint8_t *src1, int src1_stride, int h, int w, int bd);
+#define av1_build_compound_diffwtd_mask_highbd av1_build_compound_diffwtd_mask_highbd_c
+
+int64_t av1_calc_frame_error_c(const uint8_t *const ref, int stride, const uint8_t *const dst, int p_width, int p_height, int p_stride);
+#define av1_calc_frame_error av1_calc_frame_error_c
+
+void av1_calc_indices_dim1_c(const int *data, const int *centroids, uint8_t *indices, int n, int k);
+#define av1_calc_indices_dim1 av1_calc_indices_dim1_c
+
+void av1_calc_indices_dim2_c(const int *data, const int *centroids, uint8_t *indices, int n, int k);
+#define av1_calc_indices_dim2 av1_calc_indices_dim2_c
+
+void av1_calc_proj_params_c( const uint8_t *src8, int width, int height, int src_stride, const uint8_t *dat8, int dat_stride, int32_t *flt0, int flt0_stride, int32_t *flt1, int flt1_stride, int64_t H[2][2], int64_t C[2], const sgr_params_type *params);
+#define av1_calc_proj_params av1_calc_proj_params_c
+
+void av1_calc_proj_params_high_bd_c( const uint8_t *src8, int width, int height, int src_stride, const uint8_t *dat8, int dat_stride, int32_t *flt0, int flt0_stride, int32_t *flt1, int flt1_stride, int64_t H[2][2], int64_t C[2], const sgr_params_type *params);
+#define av1_calc_proj_params_high_bd av1_calc_proj_params_high_bd_c
+
+void av1_cnn_activate_c( float **input, int channels, int width, int height, int stride, ACTIVATION layer_activation);
+#define av1_cnn_activate av1_cnn_activate_c
+
+void av1_cnn_add_c( float **input, int channels, int width, int height, int stride, const float **add);
+#define av1_cnn_add av1_cnn_add_c
+
+void av1_cnn_batchnorm_c(float **image, int channels, int width, int height, int stride, const float *gamma, const float *beta, const float *mean, const float *std);
+#define av1_cnn_batchnorm av1_cnn_batchnorm_c
+
+void av1_cnn_convolve_no_maxpool_padding_valid_c( const float **input, int in_width, int in_height, int in_stride, const CNN_LAYER_CONFIG *layer_config, float **output, int out_stride, int start_idx, int cstep, int channel_step);
+#define av1_cnn_convolve_no_maxpool_padding_valid av1_cnn_convolve_no_maxpool_padding_valid_c
+
+void av1_cnn_deconvolve_c( const float **input, int in_width, int in_height, int in_stride, const CNN_LAYER_CONFIG *layer_config, float **output, int out_stride);
+#define av1_cnn_deconvolve av1_cnn_deconvolve_c
+
+void av1_cnn_predict_c( const float **input, int in_width, int in_height, int in_stride, const CNN_CONFIG *cnn_config, const CNN_THREAD_DATA *thread_data, CNN_MULTI_OUT *output_struct);
+#define av1_cnn_predict av1_cnn_predict_c
+
+double av1_compute_cross_correlation_c(unsigned char *im1, int stride1, int x1, int y1, unsigned char *im2, int stride2, int x2, int y2);
+#define av1_compute_cross_correlation av1_compute_cross_correlation_c
+
+void av1_compute_stats_c(int wiener_win, const uint8_t *dgd8, const uint8_t *src8, int h_start, int h_end, int v_start, int v_end, int dgd_stride, int src_stride, int64_t *M, int64_t *H);
+#define av1_compute_stats av1_compute_stats_c
+
+void av1_compute_stats_highbd_c(int wiener_win, const uint8_t *dgd8, const uint8_t *src8, int h_start, int h_end, int v_start, int v_end, int dgd_stride, int src_stride, int64_t *M, int64_t *H, aom_bit_depth_t bit_depth);
+#define av1_compute_stats_highbd av1_compute_stats_highbd_c
+
+void av1_convolve_2d_scale_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_qn, const int x_step_qn, const int subpel_y_qn, const int y_step_qn, ConvolveParams *conv_params);
+#define av1_convolve_2d_scale av1_convolve_2d_scale_c
+
+void av1_convolve_2d_sr_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_qn, const int subpel_y_qn, ConvolveParams *conv_params);
+#define av1_convolve_2d_sr av1_convolve_2d_sr_c
+
+void av1_convolve_horiz_rs_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const int16_t *x_filters, int x0_qn, int x_step_qn);
+#define av1_convolve_horiz_rs av1_convolve_horiz_rs_c
+
+void av1_convolve_x_sr_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const int subpel_x_qn, ConvolveParams *conv_params);
+#define av1_convolve_x_sr av1_convolve_x_sr_c
+
+void av1_convolve_y_sr_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn);
+#define av1_convolve_y_sr av1_convolve_y_sr_c
+
+int av1_denoiser_filter_c(const uint8_t *sig, int sig_stride, const uint8_t *mc_avg, int mc_avg_stride, uint8_t *avg, int avg_stride, int increase_denoising, BLOCK_SIZE bs, int motion_magnitude);
+#define av1_denoiser_filter av1_denoiser_filter_c
+
+void av1_dist_wtd_convolve_2d_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_qn, const int subpel_y_qn, ConvolveParams *conv_params);
+#define av1_dist_wtd_convolve_2d av1_dist_wtd_convolve_2d_c
+
+void av1_dist_wtd_convolve_2d_copy_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, ConvolveParams *conv_params);
+#define av1_dist_wtd_convolve_2d_copy av1_dist_wtd_convolve_2d_copy_c
+
+void av1_dist_wtd_convolve_x_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const int subpel_x_qn, ConvolveParams *conv_params);
+#define av1_dist_wtd_convolve_x av1_dist_wtd_convolve_x_c
+
+void av1_dist_wtd_convolve_y_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
+#define av1_dist_wtd_convolve_y av1_dist_wtd_convolve_y_c
+
+void av1_dr_prediction_z1_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh, const uint8_t *above, const uint8_t *left, int upsample_above, int dx, int dy);
+#define av1_dr_prediction_z1 av1_dr_prediction_z1_c
+
+void av1_dr_prediction_z2_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh, const uint8_t *above, const uint8_t *left, int upsample_above, int upsample_left, int dx, int dy);
+#define av1_dr_prediction_z2 av1_dr_prediction_z2_c
+
+void av1_dr_prediction_z3_c(uint8_t *dst, ptrdiff_t stride, int bw, int bh, const uint8_t *above, const uint8_t *left, int upsample_left, int dx, int dy);
+#define av1_dr_prediction_z3 av1_dr_prediction_z3_c
+
+void av1_filter_intra_edge_c(uint8_t *p, int sz, int strength);
+#define av1_filter_intra_edge av1_filter_intra_edge_c
+
+void av1_filter_intra_edge_high_c(uint16_t *p, int sz, int strength);
+#define av1_filter_intra_edge_high av1_filter_intra_edge_high_c
+
+void av1_filter_intra_predictor_c(uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size, const uint8_t *above, const uint8_t *left, int mode);
+#define av1_filter_intra_predictor av1_filter_intra_predictor_c
+
+void av1_fwd_txfm2d_16x16_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_16x16 av1_fwd_txfm2d_16x16_c
+
+void av1_fwd_txfm2d_16x32_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_16x32 av1_fwd_txfm2d_16x32_c
+
+void av1_fwd_txfm2d_16x4_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_16x4 av1_fwd_txfm2d_16x4_c
+
+void av1_fwd_txfm2d_16x64_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_16x64 av1_fwd_txfm2d_16x64_c
+
+void av1_fwd_txfm2d_16x8_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_16x8 av1_fwd_txfm2d_16x8_c
+
+void av1_fwd_txfm2d_32x16_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_32x16 av1_fwd_txfm2d_32x16_c
+
+void av1_fwd_txfm2d_32x32_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_32x32 av1_fwd_txfm2d_32x32_c
+
+void av1_fwd_txfm2d_32x64_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_32x64 av1_fwd_txfm2d_32x64_c
+
+void av1_fwd_txfm2d_32x8_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_32x8 av1_fwd_txfm2d_32x8_c
+
+void av1_fwd_txfm2d_4x16_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_4x16 av1_fwd_txfm2d_4x16_c
+
+void av1_fwd_txfm2d_4x4_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_4x4 av1_fwd_txfm2d_4x4_c
+
+void av1_fwd_txfm2d_4x8_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_4x8 av1_fwd_txfm2d_4x8_c
+
+void av1_fwd_txfm2d_64x16_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_64x16 av1_fwd_txfm2d_64x16_c
+
+void av1_fwd_txfm2d_64x32_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_64x32 av1_fwd_txfm2d_64x32_c
+
+void av1_fwd_txfm2d_64x64_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_64x64 av1_fwd_txfm2d_64x64_c
+
+void av1_fwd_txfm2d_8x16_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_8x16 av1_fwd_txfm2d_8x16_c
+
+void av1_fwd_txfm2d_8x32_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_8x32 av1_fwd_txfm2d_8x32_c
+
+void av1_fwd_txfm2d_8x4_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_8x4 av1_fwd_txfm2d_8x4_c
+
+void av1_fwd_txfm2d_8x8_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_fwd_txfm2d_8x8 av1_fwd_txfm2d_8x8_c
+
+void av1_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
+#define av1_fwht4x4 av1_fwht4x4_c
+
+uint32_t av1_get_crc32c_value_c(void *crc_calculator, uint8_t *p, size_t length);
+#define av1_get_crc32c_value av1_get_crc32c_value_c
+
+void av1_get_horver_correlation_full_c( const int16_t *diff, int stride, int w, int h, float *hcorr, float *vcorr);
+#define av1_get_horver_correlation_full av1_get_horver_correlation_full_c
+
+void av1_get_nz_map_contexts_c(const uint8_t *const levels, const int16_t *const scan, const uint16_t eob, const TX_SIZE tx_size, const TX_CLASS tx_class, int8_t *const coeff_contexts);
+#define av1_get_nz_map_contexts av1_get_nz_map_contexts_c
+
+void av1_highbd_apply_temporal_filter_c(const struct yv12_buffer_config *ref_frame, const struct macroblockd *mbd, const BLOCK_SIZE block_size, const int mb_row, const int mb_col, const int num_planes, const double *noise_levels, const MV *subblock_mvs, const int *subblock_mses, const int q_factor, const int filter_strength, const uint8_t *pred, uint32_t *accum, uint16_t *count);
+#define av1_highbd_apply_temporal_filter av1_highbd_apply_temporal_filter_c
+
+int64_t av1_highbd_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz, int bd);
+#define av1_highbd_block_error av1_highbd_block_error_c
+
+void av1_highbd_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps);
+#define av1_highbd_convolve8 av1_highbd_convolve8_c
+
+void av1_highbd_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps);
+#define av1_highbd_convolve8_horiz av1_highbd_convolve8_horiz_c
+
+void av1_highbd_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps);
+#define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c
+
+void av1_highbd_convolve_2d_scale_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_qn, const int x_step_qn, const int subpel_y_qn, const int y_step_qn, ConvolveParams *conv_params, int bd);
+#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c
+
+void av1_highbd_convolve_2d_sr_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_qn, const int subpel_y_qn, ConvolveParams *conv_params, int bd);
+#define av1_highbd_convolve_2d_sr av1_highbd_convolve_2d_sr_c
+
+void av1_highbd_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps);
+#define av1_highbd_convolve_avg av1_highbd_convolve_avg_c
+
+void av1_highbd_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps);
+#define av1_highbd_convolve_copy av1_highbd_convolve_copy_c
+
+void av1_highbd_convolve_horiz_rs_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const int16_t *x_filters, int x0_qn, int x_step_qn, int bd);
+#define av1_highbd_convolve_horiz_rs av1_highbd_convolve_horiz_rs_c
+
+void av1_highbd_convolve_x_sr_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const int subpel_x_qn, ConvolveParams *conv_params, int bd);
+#define av1_highbd_convolve_x_sr av1_highbd_convolve_x_sr_c
+
+void av1_highbd_convolve_y_sr_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, int bd);
+#define av1_highbd_convolve_y_sr av1_highbd_convolve_y_sr_c
+
+void av1_highbd_dist_wtd_convolve_2d_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const InterpFilterParams *filter_params_y, const int subpel_x_qn, const int subpel_y_qn, ConvolveParams *conv_params, int bd);
+#define av1_highbd_dist_wtd_convolve_2d av1_highbd_dist_wtd_convolve_2d_c
+
+void av1_highbd_dist_wtd_convolve_2d_copy_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, ConvolveParams *conv_params, int bd);
+#define av1_highbd_dist_wtd_convolve_2d_copy av1_highbd_dist_wtd_convolve_2d_copy_c
+
+void av1_highbd_dist_wtd_convolve_x_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_x, const int subpel_x_qn, ConvolveParams *conv_params, int bd);
+#define av1_highbd_dist_wtd_convolve_x av1_highbd_dist_wtd_convolve_x_c
+
+void av1_highbd_dist_wtd_convolve_y_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params, int bd);
+#define av1_highbd_dist_wtd_convolve_y av1_highbd_dist_wtd_convolve_y_c
+
+void av1_highbd_dr_prediction_z1_c(uint16_t *dst, ptrdiff_t stride, int bw, int bh, const uint16_t *above, const uint16_t *left, int upsample_above, int dx, int dy, int bd);
+#define av1_highbd_dr_prediction_z1 av1_highbd_dr_prediction_z1_c
+
+void av1_highbd_dr_prediction_z2_c(uint16_t *dst, ptrdiff_t stride, int bw, int bh, const uint16_t *above, const uint16_t *left, int upsample_above, int upsample_left, int dx, int dy, int bd);
+#define av1_highbd_dr_prediction_z2 av1_highbd_dr_prediction_z2_c
+
+void av1_highbd_dr_prediction_z3_c(uint16_t *dst, ptrdiff_t stride, int bw, int bh, const uint16_t *above, const uint16_t *left, int upsample_left, int dx, int dy, int bd);
+#define av1_highbd_dr_prediction_z3 av1_highbd_dr_prediction_z3_c
+
+void av1_highbd_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
+#define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c
+
+void av1_highbd_inv_txfm_add_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add av1_highbd_inv_txfm_add_c
+
+void av1_highbd_inv_txfm_add_16x32_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_16x32 av1_highbd_inv_txfm_add_16x32_c
+
+void av1_highbd_inv_txfm_add_16x4_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_16x4 av1_highbd_inv_txfm_add_16x4_c
+
+void av1_highbd_inv_txfm_add_16x64_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_16x64 av1_highbd_inv_txfm_add_16x64_c
+
+void av1_highbd_inv_txfm_add_16x8_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_16x8 av1_highbd_inv_txfm_add_16x8_c
+
+void av1_highbd_inv_txfm_add_32x16_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_32x16 av1_highbd_inv_txfm_add_32x16_c
+
+void av1_highbd_inv_txfm_add_32x32_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_32x32 av1_highbd_inv_txfm_add_32x32_c
+
+void av1_highbd_inv_txfm_add_32x64_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_32x64 av1_highbd_inv_txfm_add_32x64_c
+
+void av1_highbd_inv_txfm_add_32x8_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_32x8 av1_highbd_inv_txfm_add_32x8_c
+
+void av1_highbd_inv_txfm_add_4x16_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_4x16 av1_highbd_inv_txfm_add_4x16_c
+
+void av1_highbd_inv_txfm_add_4x4_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_4x4 av1_highbd_inv_txfm_add_4x4_c
+
+void av1_highbd_inv_txfm_add_4x8_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_4x8 av1_highbd_inv_txfm_add_4x8_c
+
+void av1_highbd_inv_txfm_add_64x16_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_64x16 av1_highbd_inv_txfm_add_64x16_c
+
+void av1_highbd_inv_txfm_add_64x32_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_64x32 av1_highbd_inv_txfm_add_64x32_c
+
+void av1_highbd_inv_txfm_add_64x64_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_64x64 av1_highbd_inv_txfm_add_64x64_c
+
+void av1_highbd_inv_txfm_add_8x16_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_8x16 av1_highbd_inv_txfm_add_8x16_c
+
+void av1_highbd_inv_txfm_add_8x32_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_8x32 av1_highbd_inv_txfm_add_8x32_c
+
+void av1_highbd_inv_txfm_add_8x4_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_8x4 av1_highbd_inv_txfm_add_8x4_c
+
+void av1_highbd_inv_txfm_add_8x8_c(const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param);
+#define av1_highbd_inv_txfm_add_8x8 av1_highbd_inv_txfm_add_8x8_c
+
+void av1_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd);
+#define av1_highbd_iwht4x4_16_add av1_highbd_iwht4x4_16_add_c
+
+void av1_highbd_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd);
+#define av1_highbd_iwht4x4_1_add av1_highbd_iwht4x4_1_add_c
+
+int64_t av1_highbd_pixel_proj_error_c( const uint8_t *src8, int width, int height, int src_stride, const uint8_t *dat8, int dat_stride, int32_t *flt0, int flt0_stride, int32_t *flt1, int flt1_stride, int xq[2], const sgr_params_type *params);
+#define av1_highbd_pixel_proj_error av1_highbd_pixel_proj_error_c
+
+void av1_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, int log_scale);
+#define av1_highbd_quantize_fp av1_highbd_quantize_fp_c
+
+void av1_highbd_warp_affine_c(const int32_t *mat, const uint16_t *ref, int width, int height, int stride, uint16_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, int bd, ConvolveParams *conv_params, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta);
+#define av1_highbd_warp_affine av1_highbd_warp_affine_c
+
+void av1_highbd_wiener_convolve_add_src_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, const ConvolveParams *conv_params, int bd);
+#define av1_highbd_wiener_convolve_add_src av1_highbd_wiener_convolve_add_src_c
+
+void av1_inv_txfm2d_add_16x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_16x16 av1_inv_txfm2d_add_16x16_c
+
+void av1_inv_txfm2d_add_16x32_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_16x32 av1_inv_txfm2d_add_16x32_c
+
+void av1_inv_txfm2d_add_16x4_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_16x4 av1_inv_txfm2d_add_16x4_c
+
+void av1_inv_txfm2d_add_16x64_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_16x64 av1_inv_txfm2d_add_16x64_c
+
+void av1_inv_txfm2d_add_16x8_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_16x8 av1_inv_txfm2d_add_16x8_c
+
+void av1_inv_txfm2d_add_32x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_32x16 av1_inv_txfm2d_add_32x16_c
+
+void av1_inv_txfm2d_add_32x32_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_32x32 av1_inv_txfm2d_add_32x32_c
+
+void av1_inv_txfm2d_add_32x64_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_32x64 av1_inv_txfm2d_add_32x64_c
+
+void av1_inv_txfm2d_add_32x8_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_32x8 av1_inv_txfm2d_add_32x8_c
+
+void av1_inv_txfm2d_add_4x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_4x16 av1_inv_txfm2d_add_4x16_c
+
+void av1_inv_txfm2d_add_4x4_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_4x4 av1_inv_txfm2d_add_4x4_c
+
+void av1_inv_txfm2d_add_4x8_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_4x8 av1_inv_txfm2d_add_4x8_c
+
+void av1_inv_txfm2d_add_64x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_64x16 av1_inv_txfm2d_add_64x16_c
+
+void av1_inv_txfm2d_add_64x32_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_64x32 av1_inv_txfm2d_add_64x32_c
+
+void av1_inv_txfm2d_add_64x64_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_64x64 av1_inv_txfm2d_add_64x64_c
+
+void av1_inv_txfm2d_add_8x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_8x16 av1_inv_txfm2d_add_8x16_c
+
+void av1_inv_txfm2d_add_8x32_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_8x32 av1_inv_txfm2d_add_8x32_c
+
+void av1_inv_txfm2d_add_8x4_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_8x4 av1_inv_txfm2d_add_8x4_c
+
+void av1_inv_txfm2d_add_8x8_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd);
+#define av1_inv_txfm2d_add_8x8 av1_inv_txfm2d_add_8x8_c
+
+void av1_inv_txfm_add_c(const tran_low_t *dqcoeff, uint8_t *dst, int stride, const TxfmParam *txfm_param);
+#define av1_inv_txfm_add av1_inv_txfm_add_c
+
+void av1_lowbd_fwd_txfm_c(const int16_t *src_diff, tran_low_t *coeff, int diff_stride, TxfmParam *txfm_param);
+#define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_c
+
+int64_t av1_lowbd_pixel_proj_error_c( const uint8_t *src8, int width, int height, int src_stride, const uint8_t *dat8, int dat_stride, int32_t *flt0, int flt0_stride, int32_t *flt1, int flt1_stride, int xq[2], const sgr_params_type *params);
+#define av1_lowbd_pixel_proj_error av1_lowbd_pixel_proj_error_c
+
+void av1_nn_predict_c( const float *input_nodes, const NN_CONFIG *const nn_config, int reduce_prec, float *const output);
+#define av1_nn_predict av1_nn_predict_c
+
+void av1_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t * qm_ptr, const qm_val_t * iqm_ptr, int log_scale);
+#define av1_quantize_b av1_quantize_b_c
+
+void av1_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define av1_quantize_fp av1_quantize_fp_c
+
+void av1_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define av1_quantize_fp_32x32 av1_quantize_fp_32x32_c
+
+void av1_quantize_fp_64x64_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define av1_quantize_fp_64x64 av1_quantize_fp_64x64_c
+
+void av1_quantize_lp_c(const int16_t *coeff_ptr, intptr_t n_coeffs, const int16_t *round_ptr, const int16_t *quant_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan);
+#define av1_quantize_lp av1_quantize_lp_c
+
+void av1_resize_and_extend_frame_c(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, const InterpFilter filter, const int phase, const int num_planes);
+#define av1_resize_and_extend_frame av1_resize_and_extend_frame_c
+
+void av1_round_shift_array_c(int32_t *arr, int size, int bit);
+#define av1_round_shift_array av1_round_shift_array_c
+
+int av1_selfguided_restoration_c(const uint8_t *dgd8, int width, int height,
+                                  int dgd_stride, int32_t *flt0, int32_t *flt1, int flt_stride,
+                                  int sgr_params_idx, int bit_depth, int highbd);
+#define av1_selfguided_restoration av1_selfguided_restoration_c
+
+void av1_txb_init_levels_c(const tran_low_t *const coeff, const int width, const int height, uint8_t *const levels);
+#define av1_txb_init_levels av1_txb_init_levels_c
+
+void av1_upsample_intra_edge_c(uint8_t *p, int sz);
+#define av1_upsample_intra_edge av1_upsample_intra_edge_c
+
+void av1_upsample_intra_edge_high_c(uint16_t *p, int sz, int bd);
+#define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c
+
+void av1_warp_affine_c(const int32_t *mat, const uint8_t *ref, int width, int height, int stride, uint8_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, ConvolveParams *conv_params, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta);
+#define av1_warp_affine av1_warp_affine_c
+
+void av1_wedge_compute_delta_squares_c(int16_t *d, const int16_t *a, const int16_t *b, int N);
+#define av1_wedge_compute_delta_squares av1_wedge_compute_delta_squares_c
+
+int8_t av1_wedge_sign_from_residuals_c(const int16_t *ds, const uint8_t *m, int N, int64_t limit);
+#define av1_wedge_sign_from_residuals av1_wedge_sign_from_residuals_c
+
+uint64_t av1_wedge_sse_from_residuals_c(const int16_t *r1, const int16_t *d, const uint8_t *m, int N);
+#define av1_wedge_sse_from_residuals av1_wedge_sse_from_residuals_c
+
+void av1_wiener_convolve_add_src_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, const ConvolveParams *conv_params);
+#define av1_wiener_convolve_add_src av1_wiener_convolve_add_src_c
+
+void cdef_copy_rect8_16bit_to_16bit_c(uint16_t *dst, int dstride, const uint16_t *src, int sstride, int v, int h);
+#define cdef_copy_rect8_16bit_to_16bit cdef_copy_rect8_16bit_to_16bit_c
+
+void cdef_copy_rect8_8bit_to_16bit_c(uint16_t *dst, int dstride, const uint8_t *src, int sstride, int v, int h);
+#define cdef_copy_rect8_8bit_to_16bit cdef_copy_rect8_8bit_to_16bit_c
+
+void cdef_filter_block_c(uint8_t *dst8, uint16_t *dst16, int dstride, const uint16_t *in, int pri_strength, int sec_strength, int dir, int pri_damping, int sec_damping, int bsize, int coeff_shift);
+#define cdef_filter_block cdef_filter_block_c
+
+int cdef_find_dir_c(const uint16_t *img, int stride, int32_t *var, int coeff_shift);
+#define cdef_find_dir cdef_find_dir_c
+
+cfl_subsample_hbd_fn cfl_get_luma_subsampling_420_hbd_c(TX_SIZE tx_size);
+#define cfl_get_luma_subsampling_420_hbd cfl_get_luma_subsampling_420_hbd_c
+
+cfl_subsample_lbd_fn cfl_get_luma_subsampling_420_lbd_c(TX_SIZE tx_size);
+#define cfl_get_luma_subsampling_420_lbd cfl_get_luma_subsampling_420_lbd_c
+
+cfl_subsample_hbd_fn cfl_get_luma_subsampling_422_hbd_c(TX_SIZE tx_size);
+#define cfl_get_luma_subsampling_422_hbd cfl_get_luma_subsampling_422_hbd_c
+
+cfl_subsample_lbd_fn cfl_get_luma_subsampling_422_lbd_c(TX_SIZE tx_size);
+#define cfl_get_luma_subsampling_422_lbd cfl_get_luma_subsampling_422_lbd_c
+
+cfl_subsample_hbd_fn cfl_get_luma_subsampling_444_hbd_c(TX_SIZE tx_size);
+#define cfl_get_luma_subsampling_444_hbd cfl_get_luma_subsampling_444_hbd_c
+
+cfl_subsample_lbd_fn cfl_get_luma_subsampling_444_lbd_c(TX_SIZE tx_size);
+#define cfl_get_luma_subsampling_444_lbd cfl_get_luma_subsampling_444_lbd_c
+
+cfl_predict_hbd_fn cfl_get_predict_hbd_fn_c(TX_SIZE tx_size);
+#define cfl_get_predict_hbd_fn cfl_get_predict_hbd_fn_c
+
+cfl_predict_lbd_fn cfl_get_predict_lbd_fn_c(TX_SIZE tx_size);
+#define cfl_get_predict_lbd_fn cfl_get_predict_lbd_fn_c
+
+cfl_subtract_average_fn cfl_get_subtract_average_fn_c(TX_SIZE tx_size);
+#define cfl_get_subtract_average_fn cfl_get_subtract_average_fn_c
+
+void av1_rtcd(void);
+
+#include "pxr/imaging/plugin/hioAvif/aom/config/aom_config.h"
+
+#ifdef RTCD_C
+static void setup_rtcd_internal(void)
+{
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff --git a/pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h b/pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h
new file mode 100644
index 0000000000..4a4efbc9c6
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/internal/aom_codec_internal.h
@@ -0,0 +1,395 @@
+/*
+ * Copyright (c) 2016, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\file
+ * \brief Describes the decoder algorithm interface for algorithm
+ *        implementations.
+ *
+ * This file defines the private structures and data types that are only
+ * relevant to implementing an algorithm, as opposed to using it.
+ *
+ * To create a decoder algorithm class, an interface structure is put
+ * into the global namespace:
+ *     <pre>
+ *     my_codec.c:
+ *       aom_codec_iface_t my_codec = {
+ *           "My Codec v1.0",
+ *           AOM_CODEC_ALG_ABI_VERSION,
+ *           ...
+ *       };
+ *     </pre>
+ *
+ * An application instantiates a specific decoder instance by using
+ * aom_codec_dec_init() and a pointer to the algorithm's interface structure:
+ *     <pre>
+ *     my_app.c:
+ *       extern aom_codec_iface_t my_codec;
+ *       {
+ *           aom_codec_ctx_t algo;
+ *           int threads = 4;
+ *           aom_codec_dec_cfg_t cfg = { threads, 0, 0, 1 };
+ *           res = aom_codec_dec_init(&algo, &my_codec, &cfg, 0);
+ *       }
+ *     </pre>
+ *
+ * Once initialized, the instance is managed using other functions from
+ * the aom_codec_* family.
+ */
+#ifndef AOM_AOM_INTERNAL_AOM_CODEC_INTERNAL_H_
+#define AOM_AOM_INTERNAL_AOM_CODEC_INTERNAL_H_
+#include "pxr/imaging/plugin/hioAvif/aom/aom_decoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/aom_encoder.h"
+#include "pxr/imaging/plugin/hioAvif/aom/internal/common/args_helper.h"
+#include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!\brief Current ABI version number
+ *
+ * \internal
+ * If this file is altered in any way that changes the ABI, this value
+ * must be bumped.  Examples include, but are not limited to, changing
+ * types, removing or reassigning enums, adding/removing/rearranging
+ * fields to structures
+ */
+#define AOM_CODEC_INTERNAL_ABI_VERSION (7) /**<\hideinitializer*/
+
+typedef struct aom_codec_alg_priv aom_codec_alg_priv_t;
+
+/*!\brief init function pointer prototype
+ *
+ * Performs algorithm-specific initialization of the decoder context. This
+ * function is called by aom_codec_dec_init() and aom_codec_enc_init(), so
+ * plugins implementing this interface may trust the input parameters to be
+ * properly initialized.
+ *
+ * \param[in] ctx   Pointer to this instance's context
+ * \retval #AOM_CODEC_OK
+ *     The input stream was recognized and decoder initialized.
+ * \retval #AOM_CODEC_MEM_ERROR
+ *     Memory operation failed.
+ */
+typedef aom_codec_err_t (*aom_codec_init_fn_t)(aom_codec_ctx_t *ctx);
+
+/*!\brief destroy function pointer prototype
+ *
+ * Performs algorithm-specific destruction of the decoder context. This
+ * function is called by the generic aom_codec_destroy() wrapper function,
+ * so plugins implementing this interface may trust the input parameters
+ * to be properly initialized.
+ *
+ * \param[in] ctx   Pointer to this instance's context
+ * \retval #AOM_CODEC_OK
+ *     The input stream was recognized and decoder initialized.
+ * \retval #AOM_CODEC_MEM_ERROR
+ *     Memory operation failed.
+ */
+typedef aom_codec_err_t (*aom_codec_destroy_fn_t)(aom_codec_alg_priv_t *ctx);
+
+/*!\brief parse stream info function pointer prototype
+ *
+ * Performs high level parsing of the bitstream. This function is called by the
+ * generic aom_codec_peek_stream_info() wrapper function, so plugins
+ * implementing this interface may trust the input parameters to be properly
+ * initialized.
+ *
+ * \param[in]      data    Pointer to a block of data to parse
+ * \param[in]      data_sz Size of the data buffer
+ * \param[in,out]  si      Pointer to stream info to update. The is_annexb
+ *                         member \ref MUST be properly initialized. This
+ *                         function sets the rest of the members.
+ *
+ * \retval #AOM_CODEC_OK
+ *     Bitstream is parsable and stream information updated
+ */
+typedef aom_codec_err_t (*aom_codec_peek_si_fn_t)(const uint8_t *data,
+                                                  size_t data_sz,
+                                                  aom_codec_stream_info_t *si);
+
+/*!\brief Return information about the current stream.
+ *
+ * Returns information about the stream that has been parsed during decoding.
+ *
+ * \param[in]      ctx     Pointer to this instance's context
+ * \param[in,out]  si      Pointer to stream info to update
+ *
+ * \retval #AOM_CODEC_OK
+ *     Bitstream is parsable and stream information updated
+ */
+typedef aom_codec_err_t (*aom_codec_get_si_fn_t)(aom_codec_alg_priv_t *ctx,
+                                                 aom_codec_stream_info_t *si);
+
+/*!\brief control function pointer prototype
+ *
+ * This function is used to exchange algorithm specific data with the decoder
+ * instance. This can be used to implement features specific to a particular
+ * algorithm.
+ *
+ * This function is called by the generic aom_codec_control() wrapper
+ * function, so plugins implementing this interface may trust the input
+ * parameters to be properly initialized. However,  this interface does not
+ * provide type safety for the exchanged data or assign meanings to the
+ * control IDs. Those details should be specified in the algorithm's
+ * header file. In particular, the ctrl_id parameter is guaranteed to exist
+ * in the algorithm's control mapping table, and the data parameter may be NULL.
+ *
+ *
+ * \param[in]     ctx              Pointer to this instance's context
+ * \param[in]     ctrl_id          Algorithm specific control identifier
+ * \param[in,out] data             Data to exchange with algorithm instance.
+ *
+ * \retval #AOM_CODEC_OK
+ *     The internal state data was deserialized.
+ */
+typedef aom_codec_err_t (*aom_codec_control_fn_t)(aom_codec_alg_priv_t *ctx,
+                                                  va_list ap);
+
+/*!\brief codec option setter function pointer prototype
+ * This function is used to set a codec option using a key (option name) & value
+ * pair.
+ *
+ * \param[in]     ctx              Pointer to this instance's context
+ * \param[in]     name             A string of the option's name (key)
+ * \param[in]     value            A string of the value to be set to
+ *
+ * \retval #AOM_CODEC_OK
+ *     The option is successfully set to the value
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     The data was not valid.
+ */
+typedef aom_codec_err_t (*aom_codec_set_option_fn_t)(aom_codec_alg_priv_t *ctx,
+                                                     const char *name,
+                                                     const char *value);
+
+/*!\brief control function pointer mapping
+ *
+ * This structure stores the mapping between control identifiers and
+ * implementing functions. Each algorithm provides a list of these
+ * mappings. This list is searched by the aom_codec_control()
+ * function to determine which function to invoke. The special
+ * value defined by CTRL_MAP_END is used to indicate end-of-list, and must be
+ * present. It can be tested with the at_ctrl_map_end function. Note that
+ * ctrl_id values \ref MUST be non-zero.
+ */
+typedef const struct aom_codec_ctrl_fn_map {
+  int ctrl_id;
+  aom_codec_control_fn_t fn;
+} aom_codec_ctrl_fn_map_t;
+
+#define CTRL_MAP_END \
+  { 0, NULL }
+
+static AOM_INLINE int at_ctrl_map_end(aom_codec_ctrl_fn_map_t *e) {
+  return e->ctrl_id == 0 && e->fn == NULL;
+}
+
+/*!\brief decode data function pointer prototype
+ *
+ * Processes a buffer of coded data. This function is called by the generic
+ * aom_codec_decode() wrapper function, so plugins implementing this interface
+ * may trust the input parameters to be properly initialized.
+ *
+ * \param[in] ctx          Pointer to this instance's context
+ * \param[in] data         Pointer to this block of new coded data.
+ * \param[in] data_sz      Size of the coded data, in bytes.
+ *
+ * \return Returns #AOM_CODEC_OK if the coded data was processed completely
+ *         and future pictures can be decoded without error. Otherwise,
+ *         see the descriptions of the other error codes in ::aom_codec_err_t
+ *         for recoverability capabilities.
+ */
+typedef aom_codec_err_t (*aom_codec_decode_fn_t)(aom_codec_alg_priv_t *ctx,
+                                                 const uint8_t *data,
+                                                 size_t data_sz,
+                                                 void *user_priv);
+
+/*!\brief Decoded frames iterator
+ *
+ * Iterates over a list of the frames available for display. The iterator
+ * storage should be initialized to NULL to start the iteration. Iteration is
+ * complete when this function returns NULL.
+ *
+ * The list of available frames becomes valid upon completion of the
+ * aom_codec_decode call, and remains valid until the next call to
+ * aom_codec_decode.
+ *
+ * \param[in]     ctx      Pointer to this instance's context
+ * \param[in out] iter     Iterator storage, initialized to NULL
+ *
+ * \return Returns a pointer to an image, if one is ready for display. Frames
+ *         produced will always be in PTS (presentation time stamp) order.
+ */
+typedef aom_image_t *(*aom_codec_get_frame_fn_t)(aom_codec_alg_priv_t *ctx,
+                                                 aom_codec_iter_t *iter);
+
+/*!\brief Pass in external frame buffers for the decoder to use.
+ *
+ * Registers functions to be called when libaom needs a frame buffer
+ * to decode the current frame and a function to be called when libaom does
+ * not internally reference the frame buffer. This set function must
+ * be called before the first call to decode or libaom will assume the
+ * default behavior of allocating frame buffers internally.
+ *
+ * \param[in] ctx          Pointer to this instance's context
+ * \param[in] cb_get       Pointer to the get callback function
+ * \param[in] cb_release   Pointer to the release callback function
+ * \param[in] cb_priv      Callback's private data
+ *
+ * \retval #AOM_CODEC_OK
+ *     External frame buffers will be used by libaom.
+ * \retval #AOM_CODEC_INVALID_PARAM
+ *     One or more of the callbacks were NULL.
+ * \retval #AOM_CODEC_ERROR
+ *     Decoder context not initialized, or algorithm not capable of
+ *     using external frame buffers.
+ *
+ * \note
+ * When decoding AV1, the application may be required to pass in at least
+ * #AOM_MAXIMUM_WORK_BUFFERS external frame
+ * buffers.
+ */
+typedef aom_codec_err_t (*aom_codec_set_fb_fn_t)(
+    aom_codec_alg_priv_t *ctx, aom_get_frame_buffer_cb_fn_t cb_get,
+    aom_release_frame_buffer_cb_fn_t cb_release, void *cb_priv);
+
+typedef aom_codec_err_t (*aom_codec_encode_fn_t)(aom_codec_alg_priv_t *ctx,
+                                                 const aom_image_t *img,
+                                                 aom_codec_pts_t pts,
+                                                 unsigned long duration,
+                                                 aom_enc_frame_flags_t flags);
+typedef const aom_codec_cx_pkt_t *(*aom_codec_get_cx_data_fn_t)(
+    aom_codec_alg_priv_t *ctx, aom_codec_iter_t *iter);
+
+typedef aom_codec_err_t (*aom_codec_enc_config_set_fn_t)(
+    aom_codec_alg_priv_t *ctx, const aom_codec_enc_cfg_t *cfg);
+typedef aom_fixed_buf_t *(*aom_codec_get_global_headers_fn_t)(
+    aom_codec_alg_priv_t *ctx);
+
+typedef aom_image_t *(*aom_codec_get_preview_frame_fn_t)(
+    aom_codec_alg_priv_t *ctx);
+
+/*!\brief Decoder algorithm interface interface
+ *
+ * All decoders \ref MUST expose a variable of this type.
+ */
+struct aom_codec_iface {
+  const char *name;                   /**< Identification String  */
+  int abi_version;                    /**< Implemented ABI version */
+  aom_codec_caps_t caps;              /**< Decoder capabilities */
+  aom_codec_init_fn_t init;           /**< \copydoc ::aom_codec_init_fn_t */
+  aom_codec_destroy_fn_t destroy;     /**< \copydoc ::aom_codec_destroy_fn_t */
+  aom_codec_ctrl_fn_map_t *ctrl_maps; /**< \copydoc ::aom_codec_ctrl_fn_map_t */
+  struct aom_codec_dec_iface {
+    aom_codec_peek_si_fn_t peek_si; /**< \copydoc ::aom_codec_peek_si_fn_t */
+    aom_codec_get_si_fn_t get_si;   /**< \copydoc ::aom_codec_get_si_fn_t */
+    aom_codec_decode_fn_t decode;   /**< \copydoc ::aom_codec_decode_fn_t */
+    aom_codec_get_frame_fn_t
+        get_frame;                   /**< \copydoc ::aom_codec_get_frame_fn_t */
+    aom_codec_set_fb_fn_t set_fb_fn; /**< \copydoc ::aom_codec_set_fb_fn_t */
+  } dec;
+  struct aom_codec_enc_iface {
+    int cfg_count;
+    const aom_codec_enc_cfg_t *cfgs; /**< \copydoc ::aom_codec_enc_cfg_t */
+    aom_codec_encode_fn_t encode;    /**< \copydoc ::aom_codec_encode_fn_t */
+    aom_codec_get_cx_data_fn_t
+        get_cx_data; /**< \copydoc ::aom_codec_get_cx_data_fn_t */
+    aom_codec_enc_config_set_fn_t
+        cfg_set; /**< \copydoc ::aom_codec_enc_config_set_fn_t */
+    aom_codec_get_global_headers_fn_t
+        get_glob_hdrs; /**< \copydoc ::aom_codec_get_global_headers_fn_t */
+    aom_codec_get_preview_frame_fn_t
+        get_preview; /**< \copydoc ::aom_codec_get_preview_frame_fn_t */
+  } enc;
+  aom_codec_set_option_fn_t set_option;
+};
+
+/*!\brief Instance private storage
+ *
+ * This structure is allocated by the algorithm's init function. It can be
+ * extended in one of two ways. First, a second, algorithm specific structure
+ * can be allocated and the priv member pointed to it. Alternatively, this
+ * structure can be made the first member of the algorithm specific structure,
+ * and the pointer cast to the proper type.
+ */
+struct aom_codec_priv {
+  const char *err_detail;
+  aom_codec_flags_t init_flags;
+  struct {
+    aom_fixed_buf_t cx_data_dst_buf;
+    unsigned int cx_data_pad_before;
+    unsigned int cx_data_pad_after;
+    aom_codec_cx_pkt_t cx_data_pkt;
+  } enc;
+};
+
+#define CAST(id, arg) va_arg((arg), aom_codec_control_type_##id)
+
+/* Internal Utility Functions
+ *
+ * The following functions are intended to be used inside algorithms as
+ * utilities for manipulating aom_codec_* data structures.
+ */
+struct aom_codec_pkt_list {
+  unsigned int cnt;
+  unsigned int max;
+  struct aom_codec_cx_pkt pkts[1];
+};
+
+#define aom_codec_pkt_list_decl(n)     \
+  union {                              \
+    struct aom_codec_pkt_list head;    \
+    struct {                           \
+      struct aom_codec_pkt_list head;  \
+      struct aom_codec_cx_pkt pkts[n]; \
+    } alloc;                           \
+  }
+
+#define aom_codec_pkt_list_init(m) \
+  (m)->alloc.head.cnt = 0,         \
+  (m)->alloc.head.max = sizeof((m)->alloc.pkts) / sizeof((m)->alloc.pkts[0])
+
+int aom_codec_pkt_list_add(struct aom_codec_pkt_list *,
+                           const struct aom_codec_cx_pkt *);
+
+const aom_codec_cx_pkt_t *aom_codec_pkt_list_get(
+    struct aom_codec_pkt_list *list, aom_codec_iter_t *iter);
+
+#include <stdio.h>
+#include <setjmp.h>
+
+struct aom_internal_error_info {
+  aom_codec_err_t error_code;
+  int has_detail;
+  char detail[ARG_ERR_MSG_MAX_LEN];
+  int setjmp;  // Boolean: whether 'jmp' is valid.
+  jmp_buf jmp;
+};
+
+#define CLANG_ANALYZER_NORETURN
+#if defined(__has_feature)
+#if __has_feature(attribute_analyzer_noreturn)
+#undef CLANG_ANALYZER_NORETURN
+#define CLANG_ANALYZER_NORETURN __attribute__((analyzer_noreturn))
+#endif
+#endif
+
+void aom_internal_error(struct aom_internal_error_info *info,
+                        aom_codec_err_t error, const char *fmt,
+                        ...) CLANG_ANALYZER_NORETURN;
+
+void aom_merge_corrupted_flag(int *corrupted, int value);
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_INTERNAL_AOM_CODEC_INTERNAL_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/internal/aom_image_internal.h b/pxr/imaging/plugin/hioAvif/aom/internal/aom_image_internal.h
new file mode 100644
index 0000000000..91aff8efda
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/internal/aom_image_internal.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2019, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+/*!\file
+ * \brief Describes the internal functions associated with the aom image
+ * descriptor.
+ *
+ */
+#ifndef AOM_AOM_INTERNAL_AOM_IMAGE_INTERNAL_H_
+#define AOM_AOM_INTERNAL_AOM_IMAGE_INTERNAL_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_image.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!\brief Array of aom_metadata structs for an image. */
+struct aom_metadata_array {
+  size_t sz;                       /* Number of metadata structs in the list */
+  aom_metadata_t **metadata_array; /* Array of metadata structs */
+};
+
+/*!\brief Alloc memory for aom_metadata_array struct.
+ *
+ * Allocate memory for aom_metadata_array struct.
+ * If sz is 0 the aom_metadata_array struct's internal buffer list will be
+ * NULL, but the aom_metadata_array struct itself will still be allocated.
+ * Returns a pointer to the allocated struct or NULL on failure.
+ *
+ * \param[in]    sz       Size of internal metadata list buffer
+ */
+aom_metadata_array_t *aom_img_metadata_array_alloc(size_t sz);
+
+/*!\brief Free metadata array struct.
+ *
+ * Free metadata array struct and all metadata structs inside.
+ *
+ * \param[in]    arr       Metadata array struct pointer
+ */
+void aom_img_metadata_array_free(aom_metadata_array_t *arr);
+
+typedef void *(*aom_alloc_img_data_cb_fn_t)(void *priv, size_t size);
+
+/*!\brief Open a descriptor, allocating storage for the underlying image by
+ * using the provided callback function.
+ *
+ * Returns a descriptor for storing an image of the given format. The storage
+ * for the image is allocated by using the provided callback function. Unlike
+ * aom_img_alloc(), the returned descriptor does not own the storage for the
+ * image. The caller is responsible for freeing the storage for the image.
+ *
+ * Note: If the callback function is invoked and succeeds,
+ * aom_img_alloc_with_cb() is guaranteed to succeed. Therefore, if
+ * aom_img_alloc_with_cb() fails, the caller is assured that no storage was
+ * allocated.
+ *
+ * \param[in]    img       Pointer to storage for descriptor. If this parameter
+ *                         is NULL, the storage for the descriptor will be
+ *                         allocated on the heap.
+ * \param[in]    fmt       Format for the image
+ * \param[in]    d_w       Width of the image
+ * \param[in]    d_h       Height of the image
+ * \param[in]    align     Alignment, in bytes, of the image buffer and
+ *                         each row in the image (stride).
+ * \param[in]    alloc_cb  Callback function used to allocate storage for the
+ *                         image.
+ * \param[in]    cb_priv   The first argument ('priv') for the callback
+ *                         function.
+ *
+ * \return Returns a pointer to the initialized image descriptor. If the img
+ *         parameter is non-null, the value of the img parameter will be
+ *         returned.
+ */
+aom_image_t *aom_img_alloc_with_cb(aom_image_t *img, aom_img_fmt_t fmt,
+                                   unsigned int d_w, unsigned int d_h,
+                                   unsigned int align,
+                                   aom_alloc_img_data_cb_fn_t alloc_cb,
+                                   void *cb_priv);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_AOM_INTERNAL_AOM_IMAGE_INTERNAL_H_
diff --git a/pxr/imaging/plugin/hioAvif/aom/internal/common/args_helper.h b/pxr/imaging/plugin/hioAvif/aom/internal/common/args_helper.h
new file mode 100644
index 0000000000..1001fab56a
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/aom/internal/common/args_helper.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2020, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#ifndef AOM_COMMON_ARGS_HELPER_H_
+#define AOM_COMMON_ARGS_HELPER_H_
+
+#include "pxr/imaging/plugin/hioAvif/aom/aom_encoder.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Maximum length of the error messages for the helper functions.
+#define ARG_ERR_MSG_MAX_LEN 200
+
+struct arg {
+  char **argv;
+  const char *name;
+  const char *val;
+  unsigned int argv_step;
+  const struct arg_def *def;
+};
+
+struct arg_enum_list {
+  const char *name;
+  int val;
+};
+#define ARG_ENUM_LIST_END \
+  { 0 }
+
+typedef struct arg_def {
+  const char *short_name;
+  const char *long_name;
+  int has_val;  //  0: The argument must not have a value.
+                //  1: The argument must have a value.
+                // -1: The argument may or may not have a value.
+  const char *desc;
+  const struct arg_enum_list *enums;
+} arg_def_t;
+#define ARG_DEF(s, l, v, d) \
+  { s, l, v, d, NULL }
+#define ARG_DEF_ENUM(s, l, v, d, e) \
+  { s, l, v, d, e }
+#define ARG_DEF_LIST_END \
+  { 0 }
+
+struct arg arg_init(char **argv);
+
+/*
+ * The helper functions below all take an optional parameter err_msg for
+ * error reporting. When err_msg is not NULL (must point to a buffer
+ * which is at least ARG_ERR_MSG_MAX_LEN bytes long), a related error message is
+ * stored in it if an error occurs. It will be set to an empty string if no
+ * error occurs.
+ */
+int arg_match_helper(struct arg *arg_, const struct arg_def *def, char **argv,
+                     char *err_msg);
+unsigned int arg_parse_uint_helper(const struct arg *arg, char *err_msg);
+int arg_parse_int_helper(const struct arg *arg, char *err_msg);
+struct aom_rational arg_parse_rational_helper(const struct arg *arg,
+                                              char *err_msg);
+int arg_parse_enum_helper(const struct arg *arg, char *err_msg);
+int arg_parse_enum_or_int_helper(const struct arg *arg, char *err_msg);
+int arg_parse_list_helper(const struct arg *arg, int *list, int n,
+                          char *err_msg);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // AOM_COMMON_ARGS_HELPER_H_
diff --git a/pxr/imaging/plugin/hioAvif/pch.h b/pxr/imaging/plugin/hioAvif/pch.h
new file mode 100644
index 0000000000..113572a751
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/pch.h
@@ -0,0 +1,62 @@
+//
+// Copyright 2017 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+// WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
+//
+
+#define TF_MAX_ARITY 7
+#include "pxr/pxr.h"
+#include "pxr/base/arch/defines.h"
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
+#endif
+#include <algorithm>
+#include <any>
+#include <atomic>
+#include <cinttypes>
+#include <cmath>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <functional>
+#include <initializer_list>
+#include <iosfwd>
+#include <iterator>
+#include <limits>
+#include <list>
+#include <locale>
+#include <map>
+#include <math.h>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string>
+#include <sys/types.h>
+#include <tuple>
+#include <type_traits>
+#include <typeindex>
+#include <typeinfo>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/functional/hash.hpp>
+#include <boost/python/object_fwd.hpp>
+#include <boost/python/object_operators.hpp>
+#if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
+#undef tolower
+#undef toupper
+#endif
+#endif // PXR_PYTHON_SUPPORT_ENABLED
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include "pxr/base/tf/pySafePython.h"
+#endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/plugin/hioAvif/plugInfo.json b/pxr/imaging/plugin/hioAvif/plugInfo.json
new file mode 100644
index 0000000000..48a804099a
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/plugInfo.json
@@ -0,0 +1,20 @@
+{
+    "Plugins": [
+        {
+            "Info": {
+                "Types": {
+                   "Hio_AVIFImage" : {
+                        "bases": ["HioImage"],
+                        "imageTypes": ["avif"],
+                        "precedence": 30
+                    }
+                }
+            },
+            "LibraryPath": "@PLUG_INFO_LIBRARY_PATH@",
+            "Name": "hioAvif",
+            "ResourcePath": "@PLUG_INFO_RESOURCE_PATH@",
+            "Root": "@PLUG_INFO_ROOT@",
+            "Type": "library"
+        }
+    ]
+}
diff --git a/pxr/imaging/plugin/hioAvif/testenv/testHioAvif.cpp b/pxr/imaging/plugin/hioAvif/testenv/testHioAvif.cpp
new file mode 100644
index 0000000000..06238db0e7
--- /dev/null
+++ b/pxr/imaging/plugin/hioAvif/testenv/testHioAvif.cpp
@@ -0,0 +1,152 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/pxr.h"
+#include "pxr/base/gf/half.h"
+#include "pxr/base/plug/plugin.h"
+#include "pxr/base/plug/registry.h"
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/imaging/hio/image.h"
+#include <array>
+#include <mutex>
+#include <fstream>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+int
+main(int argc, char *argv[])
+{
+    // check existence of the png and avif plugins which are required for this
+    // test.
+    {
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.png"));
+        TF_AXIOM(HioImage::IsSupportedImageFile("dummy.avif"));
+    }
+    
+    // To enable running the test within xcode, where a cwd cannot be set, for
+    // running, we allow an optional argument to specify the root path for the 
+    // test assets. If there is an argument, use it as the root path for the 
+    // test assets.
+    std::string rootPath = argc > 1 ? argv[1] : ".";
+    // if the argument doesn't end with a slash, add one
+    if (rootPath.back() != '/') {
+        rootPath += "/";
+    }
+    
+    std::string csGrayPng = rootPath + "cs-gray-7f7f7f.png";
+    std::string csGrayAvif = rootPath + "cs-gray-7f7f7f.avif";
+
+    // test that the files exist at the specified paths
+    {
+        std::ifstream pngFile(csGrayPng);
+        TF_AXIOM(pngFile.good());
+        std::ifstream avifFile(csGrayAvif);
+        TF_AXIOM(avifFile.good());
+    }
+
+    int width = 0;
+    int height = 0;
+    HioImage::StorageSpec pngSpec;
+    std::vector<unsigned char> pngReadback;
+    {
+        // fetch basic information about the png to be compared with the avif
+        std::string path = csGrayPng;
+        HioImageSharedPtr image = HioImage::OpenForReading(path);
+        if (!TF_VERIFY(image)) {
+            return 1;
+        }
+
+        width = image->GetWidth();
+        height = image->GetHeight();
+        TF_VERIFY(width > 0 && height > 0);
+        pngReadback.resize(width * height * 4);
+        pngSpec.width = width;
+        pngSpec.height = height;
+        pngSpec.format = image->GetFormat();
+        pngSpec.flipped = false;
+        pngSpec.data = pngReadback.data();
+        TF_VERIFY(image->Read(pngSpec));
+
+        // this write back is for a visual check, not directly used by the test
+        std::string filename = "pngTestWriteback.png";
+        HioImageSharedPtr writePngImage = HioImage::OpenForWriting(filename);
+        TF_VERIFY(writePngImage);
+        writePngImage->Write(pngSpec);
+    }
+
+    {
+        // fetch basic information about the avif
+        std::string path = csGrayAvif;
+        HioImageSharedPtr image = HioImage::OpenForReading(path);
+        TF_VERIFY(image);
+        TF_VERIFY(image->GetWidth() == width);
+        TF_VERIFY(image->GetHeight() == height);
+        TF_VERIFY(image->GetFormat() == HioFormatFloat16Vec4);
+
+        HioImage::StorageSpec avifSpec;
+        avifSpec.width = width;
+        avifSpec.height = height;
+        avifSpec.format = image->GetFormat(); // f16v4 is native
+        std::vector<unsigned char> readback(width * height * sizeof(uint16_t) * 4);
+        avifSpec.data = readback.data();
+        TF_VERIFY(image->Read(avifSpec));
+        {
+            // this write back is for a visual check, not directly used by the test
+            std::string filename = "avifTestWriteback16.exr";
+            HioImageSharedPtr exrimage = HioImage::OpenForWriting(filename);
+            TF_AXIOM(exrimage);
+            TF_AXIOM(exrimage->Write(avifSpec));
+        }
+
+        HioImage::StorageSpec avifSpecF32;
+        avifSpecF32.width = width;
+        avifSpecF32.height = height;
+        avifSpecF32.format = HioFormatFloat32Vec4;
+        std::vector<unsigned char> readbackf32(width * height * sizeof(float) * 4);
+        avifSpecF32.data = readbackf32.data();
+        TF_VERIFY(image->Read(avifSpecF32));
+        {
+            // this write back is for a visual check, not directly used by the test
+            std::string filename = "avifTestWriteback32.exr";
+            HioImageSharedPtr exrimage = HioImage::OpenForWriting(filename);
+            TF_AXIOM(exrimage);
+            TF_AXIOM(exrimage->Write(avifSpecF32));
+        }
+
+        // compare the pixel data of the read avif image and the reference png.
+        uint8_t* pngData = reinterpret_cast<uint8_t*>(pngSpec.data);
+        GfHalf* avifData = reinterpret_cast<GfHalf*>(avifSpec.data);
+        float* avif32Data = reinterpret_cast<float*>(readbackf32.data());
+        for (int y = 0; y < height; ++y) {
+            for (int x = 0; x < width; ++x) {
+                // fairly loose tolerance as this test is using a 2.2 gamma
+                // approximation for the srgb transfer function, which is good
+                // enough to know whether the png and avif data match or not.
+                const float tol = 0.01f;
+                float pngValueR = pow(pngData[(y*width+x) * 3 + 0] / 255.0f, 2.2f);
+                float pngValueG = pow(pngData[(y*width+x) * 3 + 1] / 255.0f, 2.2f);
+                float pngValueB = pow(pngData[(y*width+x) * 3 + 2] / 255.0f, 2.2f);
+                float avifValueR = avifData[(y*width+x) * 4 + 0];
+                float avifValueG = avifData[(y*width+x) * 4 + 1];
+                float avifValueB = avifData[(y*width+x) * 4 + 2];
+                float avif32ValueR = avif32Data[(y*width+x) * 4 + 0];
+                float avif32ValueG = avif32Data[(y*width+x) * 4 + 1];
+                float avif32ValueB = avif32Data[(y*width+x) * 4 + 2];
+                //printf("(%d, %d): %f %f %f / %f %f %f\n", x, y,
+                //       pngValueR, pngValueG, pngValueB,
+                //       avifValueR, avifValueG, avifValueB);
+                TF_AXIOM(fabs(pngValueR - avifValueR) < tol);
+                TF_AXIOM(fabs(pngValueG - avifValueG) < tol);
+                TF_AXIOM(fabs(pngValueB - avifValueB) < tol);
+                TF_AXIOM(fabs(pngValueR - avif32ValueR) < tol);
+                TF_AXIOM(fabs(pngValueG - avif32ValueG) < tol);
+                TF_AXIOM(fabs(pngValueB - avif32ValueB) < tol);
+            }
+        }
+    }
+
+    printf("OK\n");
+    return 0;
+}
diff --git a/pxr/imaging/plugin/hioAvif/testenv/testHioAvif/cs-gray-7f7f7f.avif b/pxr/imaging/plugin/hioAvif/testenv/testHioAvif/cs-gray-7f7f7f.avif
new file mode 100644
index 0000000000..7eb2d5ce68
Binary files /dev/null and b/pxr/imaging/plugin/hioAvif/testenv/testHioAvif/cs-gray-7f7f7f.avif differ
diff --git a/pxr/imaging/plugin/hioAvif/testenv/testHioAvif/cs-gray-7f7f7f.png b/pxr/imaging/plugin/hioAvif/testenv/testHioAvif/cs-gray-7f7f7f.png
new file mode 100644
index 0000000000..802d799c15
Binary files /dev/null and b/pxr/imaging/plugin/hioAvif/testenv/testHioAvif/cs-gray-7f7f7f.png differ
diff --git a/pxr/imaging/plugin/hioOiio/metadata.cpp b/pxr/imaging/plugin/hioOiio/metadata.cpp
index e59861c6fa..938ce06c60 100644
--- a/pxr/imaging/plugin/hioOiio/metadata.cpp
+++ b/pxr/imaging/plugin/hioOiio/metadata.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/imaging/plugin/hioOiio/oiioImage.cpp b/pxr/imaging/plugin/hioOiio/oiioImage.cpp
index 4c94fdc047..c3dffcce77 100644
--- a/pxr/imaging/plugin/hioOiio/oiioImage.cpp
+++ b/pxr/imaging/plugin/hioOiio/oiioImage.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hio/image.h"
 #include "pxr/imaging/hio/types.h"
@@ -52,13 +35,13 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 OIIO_NAMESPACE_USING
 
-// _ioProxySupportedExtensions is a list of hardcoded file extensions that 
-// support ioProxy. Although OIIO has an api call for checking whether or 
-// not a file type supports ioProxy, version 2.0.9 does not include this 
+// _ioProxySupportedExtensions is a list of hardcoded file extensions that
+// support ioProxy. Although OIIO has an api call for checking whether or
+// not a file type supports ioProxy, version 2.0.9 does not include this
 // for EXR's, even though EXR's support ioProxy. This issue was fixed in
-// commit 7677d498b599295fa8277d050ef994efbd297b55. Thus, for now we check 
-// whether or not a file extension is included in our hardcoded list of 
-// extensions we know to support ioProxy. 
+// commit 7677d498b599295fa8277d050ef994efbd297b55. Thus, for now we check
+// whether or not a file extension is included in our hardcoded list of
+// extensions we know to support ioProxy.
 TF_MAKE_STATIC_DATA(std::vector<std::string>, _ioProxySupportedExtensions)
 {
     _ioProxySupportedExtensions->push_back("exr");
@@ -83,7 +66,7 @@ class HioOIIO_Image : public HioImage
 
     bool IsColorSpaceSRGB() const override;
 
-    bool GetMetadata(TfToken const & key, 
+    bool GetMetadata(TfToken const & key,
                              VtValue * value) const override;
     bool GetSamplerMetadata(HioAddressDimension pname,
                             HioAddressMode * param) const override;
@@ -100,7 +83,7 @@ class HioOIIO_Image : public HioImage
 
 protected:
     bool _OpenForReading(std::string const & filename, int subimage,
-                                 int mip, 
+                                 int mip,
                                  HioImage::SourceColorSpace sourceColorSpace,
                                  bool suppressErrors) override;
     bool _OpenForWriting(std::string const & filename) override;
@@ -110,9 +93,9 @@ class HioOIIO_Image : public HioImage
 #if OIIO_VERSION >= 20003
     cspan<unsigned char> _GenerateBufferCSpan(
         const std::shared_ptr<const char>& buffer,
-        int bufferSize) const;
+        size_t bufferSize) const;
 #endif
-    bool _CanUseIOProxyForExtension(std::string extension, 
+    bool _CanUseIOProxyForExtension(std::string extension,
                                     const ImageSpec &config) const;
     std::string _filename;
     int _subimage;
@@ -154,7 +137,7 @@ _GetHioFormatFromImageData(unsigned int nchannels, TypeDesc typedesc,
                 case TypeDesc::HALF:
                     return HioFormatFloat16;
                 case TypeDesc::FLOAT:
-                    return HioFormatFloat32;                
+                    return HioFormatFloat32;
             }
         case 2:
             switch (typedesc.basetype) {
@@ -176,7 +159,7 @@ _GetHioFormatFromImageData(unsigned int nchannels, TypeDesc typedesc,
                 case TypeDesc::HALF:
                     return HioFormatFloat16Vec2;
                 case TypeDesc::FLOAT:
-                    return HioFormatFloat32Vec2;             
+                    return HioFormatFloat32Vec2;
             }
         case 3:
             switch (typedesc.basetype) {
@@ -198,7 +181,7 @@ _GetHioFormatFromImageData(unsigned int nchannels, TypeDesc typedesc,
                 case TypeDesc::HALF:
                     return HioFormatFloat16Vec3;
                 case TypeDesc::FLOAT:
-                    return HioFormatFloat32Vec3;             
+                    return HioFormatFloat32Vec3;
             }
         case 4:
             switch (typedesc.basetype) {
@@ -220,7 +203,7 @@ _GetHioFormatFromImageData(unsigned int nchannels, TypeDesc typedesc,
                 case TypeDesc::HALF:
                     return HioFormatFloat16Vec4;
                 case TypeDesc::FLOAT:
-                    return HioFormatFloat32Vec4;             
+                    return HioFormatFloat32Vec4;
             }
         default:
             TF_CODING_ERROR("Unsupported type");
@@ -228,7 +211,7 @@ _GetHioFormatFromImageData(unsigned int nchannels, TypeDesc typedesc,
     }
 }
 /// Converts an HioFormat into its OpenImageIO component type equivalent.
-// XXX does not support conversions for:HioFormatBC6FloatVec3, 
+// XXX does not support conversions for:HioFormatBC6FloatVec3,
 // HioFormatBC6UFloatVec3, HioFormatBC7UNorm8Vec4, or HioFormatBC7UNorm8Vec4srgb
 static TypeDesc
 _GetOIIOBaseType(HioFormat hioFormat)
@@ -284,7 +267,7 @@ _GetOIIOBaseType(HioFormat hioFormat)
     }
 }
 
-// For compatability with Ice/Imr we transmogrify some matrix metadata
+// For compatibility with Ice/Imr we transmogrify some matrix metadata
 static std::string
 _TranslateMetadataKey(std::string const & metadataKey, bool *convertMatrixTypes)
 {
@@ -462,7 +445,7 @@ HioOIIO_Image::IsColorSpaceSRGB() const
 {
     if (_sourceColorSpace == HioImage::SRGB) {
         return true;
-    } 
+    }
     if (_sourceColorSpace == HioImage::Raw) {
         return false;
     }
@@ -539,7 +522,7 @@ HioOIIO_Image::GetNumMipLevels() const
     return 1;
 }
 
-std::string 
+std::string
 HioOIIO_Image::_GetFilenameExtension() const
 {
     std::string fileExtension = ArGetResolver().GetExtension(_filename);
@@ -549,9 +532,9 @@ HioOIIO_Image::_GetFilenameExtension() const
 #if OIIO_VERSION >= 20003
 cspan<unsigned char>
 HioOIIO_Image::_GenerateBufferCSpan(const std::shared_ptr<const char>& buffer,
-                                    int bufferSize) const
+                                    size_t bufferSize) const
 {
-    const char* bufferPtr = buffer.get(); 
+    const char* bufferPtr = buffer.get();
     const unsigned char* bufferPtrUnsigned = (const unsigned char *) bufferPtr;
     cspan<unsigned char> bufferCSpan(bufferPtrUnsigned, bufferSize);
     return bufferCSpan;
@@ -562,8 +545,8 @@ bool
 HioOIIO_Image::_CanUseIOProxyForExtension(std::string extension,
                                           const ImageSpec & config) const
 {
-    if (std::find(_ioProxySupportedExtensions->begin(), 
-                  _ioProxySupportedExtensions->end(), 
+    if (std::find(_ioProxySupportedExtensions->begin(),
+                  _ioProxySupportedExtensions->end(),
                   extension)
             != _ioProxySupportedExtensions->end()) {
         return true;
@@ -585,20 +568,20 @@ HioOIIO_Image::_CanUseIOProxyForExtension(std::string extension,
 /* virtual */
 bool
 HioOIIO_Image::_OpenForReading(std::string const & filename, int subimage,
-                               int mip, 
+                               int mip,
                                HioImage::SourceColorSpace sourceColorSpace,
                                bool suppressErrors)
 {
     _filename = filename;
     _subimage = subimage;
-    _miplevel = mip;    
+    _miplevel = mip;
     _sourceColorSpace = sourceColorSpace;
     _imagespec = ImageSpec();
 
 #if OIIO_VERSION >= 20003
     std::shared_ptr<ArAsset> asset = ArGetResolver().OpenAsset(
         ArResolvedPath(_filename));
-    if (!asset) { 
+    if (!asset) {
         return false;
     }
 
@@ -660,7 +643,7 @@ HioOIIO_Image::ReadCropped(int const cropTop,
 #if OIIO_VERSION >= 20003
     std::shared_ptr<ArAsset> asset = ArGetResolver().OpenAsset(
         ArResolvedPath(_filename));
-    if (!asset) { 
+    if (!asset) {
         return false;
     }
 
@@ -670,7 +653,7 @@ HioOIIO_Image::ReadCropped(int const cropTop,
     }
 
     size_t bufferSize = asset->GetSize();
-    
+
     Filesystem::IOMemReader memreader(_GenerateBufferCSpan(buffer, bufferSize));
     void *ptr = &memreader;
     ImageSpec config;
@@ -696,6 +679,13 @@ HioOIIO_Image::ReadCropped(int const cropTop,
 
 #endif
 
+    // Creation may fail when the file does not exist or is too large.
+    if (!imageInput)
+    {
+        TF_RUNTIME_ERROR("Failed to open image file \"%s\"", _filename.c_str());
+        return false;
+    }
+
     //// seek subimage
     ImageSpec spec = imageInput->spec();
     if (!imageInput->seek_subimage(_subimage, _miplevel, spec)){
@@ -703,45 +693,61 @@ HioOIIO_Image::ReadCropped(int const cropTop,
         TF_CODING_ERROR("Unable to seek subimage");
         return false;
     }
-   
-    int strideLength = imageInput->spec().width * 
-                       imageInput->spec().pixel_bytes();
-    int readStride = (storage.flipped)? 
-                     (-strideLength) : (strideLength);
-    int size = imageInput->spec().height * strideLength;
+
+    // NOTE: For values that refer to buffer sizes (in bytes),
+    // we use the size_t type. Operations with the int type
+    // may overflow INT_MAX, which can be less than SIZE_MAX.
+    size_t strideLength = imageInput->spec().width *
+                          imageInput->spec().pixel_bytes();
+    size_t readStride = (storage.flipped) ?
+                        (-strideLength) : (strideLength);
+    size_t size = imageInput->spec().height * strideLength;
 
     std::unique_ptr<uint8_t[]>pixelData(new uint8_t[size]);
     unsigned char *pixels = pixelData.get();
-    void *start = (storage.flipped)? 
+    void *start = (storage.flipped)?
                   (pixels + size - strideLength) : (pixels);
 
     // Read Image into pixels, flipping upon load so that
     // origin is at lower left corner
     // If needed, convert double precision images to float
+    bool res = false;
     if (imageInput->spec().format == TypeDesc::DOUBLE) {
-        imageInput->read_image(TypeDesc::FLOAT,
-                               start,
-                               AutoStride,
-                               readStride,
-                               AutoStride);
+        res = imageInput->read_image(TypeDesc::FLOAT,
+            start,
+            AutoStride,
+            readStride,
+            AutoStride);
     } else{
-        imageInput->read_image(imageInput->spec().format,
-                         start,
-                         AutoStride,
-                         readStride,
-                         AutoStride);
-    }
-    
-    imageInput->close();
-    
+        res = imageInput->read_image(imageInput->spec().format,
+            start,
+            AutoStride,
+            readStride,
+            AutoStride);
+    }
+
+    if (!res)
+    {
+        TF_RUNTIME_ERROR("Failed to read image pixel from \"%s\", error = %s",
+                         _filename.c_str(), imageInput->geterror().c_str());
+        return false;
+    }
+
+    if (!imageInput->close())
+    {
+        TF_RUNTIME_ERROR("Failed to close image file \"%s\", error = %s",
+                         _filename.c_str(), imageInput->geterror().c_str());
+        return false;
+    }
+
     // Construct ImageBuf that wraps around allocated pixels memory
-    ImageBuf imagebuf =ImageBuf(imageInput->spec(), pixels);
+    ImageBuf imagebuf = ImageBuf(imageInput->spec(), pixels);
     ImageBuf *image = &imagebuf;
 
     // Convert color images to linear (unless they are sRGB)
     // (Currently unimplemented, requires OpenColorIO support from OpenImageIO)
 
-    // Crop 
+    // Crop
     ImageBuf cropped;
     if (cropTop || cropBottom || cropLeft || cropRight) {
         ImageBufAlgo::cut(cropped, *image,
@@ -752,7 +758,7 @@ HioOIIO_Image::ReadCropped(int const cropTop,
 
     // Reformat
     ImageBuf scaled;
-    if (image->spec().width != storage.width || 
+    if (image->spec().width != storage.width ||
         image->spec().height != storage.height) {
         ImageBufAlgo::resample(scaled, *image, /*interpolate=*/false,
                 ROI(0, storage.width, 0, storage.height));
diff --git a/pxr/imaging/plugin/hioOiio/pch.h b/pxr/imaging/plugin/hioOiio/pch.h
index 9a7e85a6c4..9ae8a66bd3 100644
--- a/pxr/imaging/plugin/hioOiio/pch.h
+++ b/pxr/imaging/plugin/hioOiio/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -27,40 +10,13 @@
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
-#if defined(ARCH_OS_DARWIN)
-#include <glob.h>
-#include <limits.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <unistd.h>
-#include <mach/mach_time.h>
-#endif
 #if defined(ARCH_OS_LINUX)
-#include <glob.h>
-#include <limits.h>
-#include <sys/param.h>
-#include <sys/statfs.h>
 #include <unistd.h>
-#include <x86intrin.h>
-#endif
-#if defined(ARCH_OS_WINDOWS)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <Windows.h>
-#include <intrin.h>
-#include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
-#include <cassert>
-#include <cfloat>
 #include <cinttypes>
-#include <climits>
 #include <cmath>
 #include <cstdarg>
 #include <cstddef>
@@ -68,12 +24,9 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <deque>
-#include <fcntl.h>
 #include <functional>
 #include <initializer_list>
 #include <iosfwd>
-#include <iostream>
 #include <iterator>
 #include <limits>
 #include <list>
@@ -81,134 +34,33 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
-#include <new>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string>
-#include <sys/stat.h>
 #include <sys/types.h>
-#include <thread>
 #include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
-#include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
+#include <OpenImageIO/filesystem.h>
+#include <OpenImageIO/imagebuf.h>
+#include <OpenImageIO/imagebufalgo.h>
+#include <OpenImageIO/imageio.h>
+#include <OpenImageIO/typedesc.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/python/bases.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/converter/from_python.hpp>
-#include <boost/python/converter/registered.hpp>
-#include <boost/python/converter/registrations.hpp>
-#include <boost/python/converter/registry.hpp>
-#include <boost/python/converter/rvalue_from_python_data.hpp>
-#include <boost/python/converter/to_python_function_type.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/def_visitor.hpp>
-#include <boost/python/default_call_policies.hpp>
-#include <boost/python/dict.hpp>
-#include <boost/python/errors.hpp>
-#include <boost/python/extract.hpp>
-#include <boost/python/handle.hpp>
-#include <boost/python/implicit.hpp>
-#include <boost/python/list.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/object.hpp>
-#include <boost/python/object/iterator.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
-#include <boost/python/operators.hpp>
-#include <boost/python/overloads.hpp>
-#include <boost/python/raw_function.hpp>
-#include <boost/python/refcount.hpp>
-#include <boost/python/scope.hpp>
-#include <boost/python/to_python_converter.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/type_id.hpp>
 #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
 #undef tolower
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
-#include <tbb/blocked_range.h>
-#include <tbb/cache_aligned_allocator.h>
-#include <tbb/concurrent_queue.h>
-#include <tbb/enumerable_thread_specific.h>
-#include <tbb/parallel_for.h>
-#include <tbb/parallel_for_each.h>
-#include <tbb/spin_mutex.h>
-#include <tbb/spin_rw_mutex.h>
-#include <tbb/task.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/imaging/pxOsd/__init__.py b/pxr/imaging/pxOsd/__init__.py
index 82063057fc..ec4ae1f04b 100644
--- a/pxr/imaging/pxOsd/__init__.py
+++ b/pxr/imaging/pxOsd/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 Pixar OSD implementation.
diff --git a/pxr/imaging/pxOsd/api.h b/pxr/imaging/pxOsd/api.h
index 1066f8b2dd..19146a71bc 100644
--- a/pxr/imaging/pxOsd/api.h
+++ b/pxr/imaging/pxOsd/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PX_OSD_API_H
 #define PXR_IMAGING_PX_OSD_API_H
diff --git a/pxr/imaging/pxOsd/meshTopology.cpp b/pxr/imaging/pxOsd/meshTopology.cpp
index 6e9283a51d..c37631f3fb 100644
--- a/pxr/imaging/pxOsd/meshTopology.cpp
+++ b/pxr/imaging/pxOsd/meshTopology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file pxOsd/meshTopology.h
diff --git a/pxr/imaging/pxOsd/meshTopology.h b/pxr/imaging/pxOsd/meshTopology.h
index bc628a769c..c905b884d4 100644
--- a/pxr/imaging/pxOsd/meshTopology.h
+++ b/pxr/imaging/pxOsd/meshTopology.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PX_OSD_MESH_TOPOLOGY_H
 #define PXR_IMAGING_PX_OSD_MESH_TOPOLOGY_H
diff --git a/pxr/imaging/pxOsd/meshTopologyValidation.cpp b/pxr/imaging/pxOsd/meshTopologyValidation.cpp
index b9ab958473..a91603e899 100644
--- a/pxr/imaging/pxOsd/meshTopologyValidation.cpp
+++ b/pxr/imaging/pxOsd/meshTopologyValidation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 
diff --git a/pxr/imaging/pxOsd/meshTopologyValidation.h b/pxr/imaging/pxOsd/meshTopologyValidation.h
index 29364edd1c..a6f5f05d14 100644
--- a/pxr/imaging/pxOsd/meshTopologyValidation.h
+++ b/pxr/imaging/pxOsd/meshTopologyValidation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 
diff --git a/pxr/imaging/pxOsd/module.cpp b/pxr/imaging/pxOsd/module.cpp
index 15e4a25584..db0a99bcd5 100644
--- a/pxr/imaging/pxOsd/module.cpp
+++ b/pxr/imaging/pxOsd/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/imaging/pxOsd/moduleDeps.cpp b/pxr/imaging/pxOsd/moduleDeps.cpp
index 0553b90c81..13eef05697 100644
--- a/pxr/imaging/pxOsd/moduleDeps.cpp
+++ b/pxr/imaging/pxOsd/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/imaging/pxOsd/pch.h b/pxr/imaging/pxOsd/pch.h
index c7bbe82037..f2f9a0753b 100644
--- a/pxr/imaging/pxOsd/pch.h
+++ b/pxr/imaging/pxOsd/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,12 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -55,7 +39,6 @@
 #include <cstring>
 #include <deque>
 #include <functional>
-#include <initializer_list>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -64,15 +47,16 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -80,72 +64,32 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/class.hpp>
+#include <boost/python/converter/from_python.hpp>
+#include <boost/python/converter/registered.hpp>
+#include <boost/python/converter/rvalue_from_python_data.hpp>
 #include <boost/python/copy_const_reference.hpp>
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
 #include <boost/python/handle.hpp>
+#include <boost/python/iterator.hpp>
+#include <boost/python/list.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
 #include <boost/python/operators.hpp>
+#include <boost/python/refcount.hpp>
+#include <boost/python/scope.hpp>
+#include <boost/python/to_python_converter.hpp>
+#include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
 #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
 #undef tolower
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
 #include <opensubdiv/far/topologyRefiner.h>
 #include <opensubdiv/far/topologyRefinerFactory.h>
 #include <tbb/cache_aligned_allocator.h>
diff --git a/pxr/imaging/pxOsd/refinerFactory.cpp b/pxr/imaging/pxOsd/refinerFactory.cpp
index 0bbac6af84..e287c04028 100644
--- a/pxr/imaging/pxOsd/refinerFactory.cpp
+++ b/pxr/imaging/pxOsd/refinerFactory.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file pxOsd/refinerFactory.cpp
diff --git a/pxr/imaging/pxOsd/refinerFactory.h b/pxr/imaging/pxOsd/refinerFactory.h
index 96fbc952a3..cc134d0a10 100644
--- a/pxr/imaging/pxOsd/refinerFactory.h
+++ b/pxr/imaging/pxOsd/refinerFactory.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PX_OSD_REFINER_FACTORY_H
 #define PXR_IMAGING_PX_OSD_REFINER_FACTORY_H
diff --git a/pxr/imaging/pxOsd/subdivTags.cpp b/pxr/imaging/pxOsd/subdivTags.cpp
index 82cd2e5c9e..3bf8bce223 100644
--- a/pxr/imaging/pxOsd/subdivTags.cpp
+++ b/pxr/imaging/pxOsd/subdivTags.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file pxOsd/subdivTags.h
diff --git a/pxr/imaging/pxOsd/subdivTags.h b/pxr/imaging/pxOsd/subdivTags.h
index b2dfebcfa8..4481b63c74 100644
--- a/pxr/imaging/pxOsd/subdivTags.h
+++ b/pxr/imaging/pxOsd/subdivTags.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PX_OSD_SUBDIV_TAGS_H
 #define PXR_IMAGING_PX_OSD_SUBDIV_TAGS_H
diff --git a/pxr/imaging/pxOsd/tokens.cpp b/pxr/imaging/pxOsd/tokens.cpp
index af01fa5968..7608965af7 100644
--- a/pxr/imaging/pxOsd/tokens.cpp
+++ b/pxr/imaging/pxOsd/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file pxOsd/tokens.cpp
diff --git a/pxr/imaging/pxOsd/tokens.h b/pxr/imaging/pxOsd/tokens.h
index 51eb9f5678..f7f15ac3b5 100644
--- a/pxr/imaging/pxOsd/tokens.h
+++ b/pxr/imaging/pxOsd/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_IMAGING_PX_OSD_TOKENS_H
 #define PXR_IMAGING_PX_OSD_TOKENS_H
diff --git a/pxr/imaging/pxOsd/wrapMeshTopology.cpp b/pxr/imaging/pxOsd/wrapMeshTopology.cpp
index dd4c9f52f0..bc14457c40 100644
--- a/pxr/imaging/pxOsd/wrapMeshTopology.cpp
+++ b/pxr/imaging/pxOsd/wrapMeshTopology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/pxOsd/meshTopology.h"
 
diff --git a/pxr/imaging/pxOsd/wrapMeshTopologyValidation.cpp b/pxr/imaging/pxOsd/wrapMeshTopologyValidation.cpp
index 01699ed460..ce5c13db4c 100644
--- a/pxr/imaging/pxOsd/wrapMeshTopologyValidation.cpp
+++ b/pxr/imaging/pxOsd/wrapMeshTopologyValidation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/pxOsd/meshTopology.h"
diff --git a/pxr/imaging/pxOsd/wrapSubdivTags.cpp b/pxr/imaging/pxOsd/wrapSubdivTags.cpp
index f351b3b05f..147e9ab531 100644
--- a/pxr/imaging/pxOsd/wrapSubdivTags.cpp
+++ b/pxr/imaging/pxOsd/wrapSubdivTags.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/pxOsd/subdivTags.h"
 
diff --git a/pxr/imaging/pxOsd/wrapTokens.cpp b/pxr/imaging/pxOsd/wrapTokens.cpp
index e078c80a68..5af672698d 100644
--- a/pxr/imaging/pxOsd/wrapTokens.cpp
+++ b/pxr/imaging/pxOsd/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/imaging/pxOsd/tokens.h"
diff --git a/pxr/usd/ar/CMakeLists.txt b/pxr/usd/ar/CMakeLists.txt
index a81652b409..fcf1aa4489 100644
--- a/pxr/usd/ar/CMakeLists.txt
+++ b/pxr/usd/ar/CMakeLists.txt
@@ -9,9 +9,11 @@ pxr_library(ar
         plug
         vt
         ${Boost_PYTHON_LIBRARY}
+        ${TBB_tbb_LIBRARY}
 
     INCLUDE_DIRS
         ${Boost_INCLUDE_DIRS}
+        ${TBB_INCLUDE_DIRS}
 
     PUBLIC_CLASSES
         asset
diff --git a/pxr/usd/ar/__init__.py b/pxr/usd/ar/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/ar/__init__.py
+++ b/pxr/usd/ar/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/ar/api.h b/pxr/usd/ar/api.h
index 36bb481cfd..2d38b3d7f7 100644
--- a/pxr/usd/ar/api.h
+++ b/pxr/usd/ar/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_API_H
 #define PXR_USD_AR_API_H
diff --git a/pxr/usd/ar/ar.h b/pxr/usd/ar/ar.h
index 9bff09219b..50f6b7b43a 100644
--- a/pxr/usd/ar/ar.h
+++ b/pxr/usd/ar/ar.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_AR_H
 #define PXR_USD_AR_AR_H
diff --git a/pxr/usd/ar/asset.cpp b/pxr/usd/ar/asset.cpp
index 1e0d9cf6ee..b33861f344 100644
--- a/pxr/usd/ar/asset.cpp
+++ b/pxr/usd/ar/asset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/asset.h"
diff --git a/pxr/usd/ar/asset.h b/pxr/usd/ar/asset.h
index 08ca0bb7ac..07afa039f1 100644
--- a/pxr/usd/ar/asset.h
+++ b/pxr/usd/ar/asset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_ASSET_H
 #define PXR_USD_AR_ASSET_H
diff --git a/pxr/usd/ar/assetInfo.cpp b/pxr/usd/ar/assetInfo.cpp
index de13ee6e1f..c462c4daf6 100644
--- a/pxr/usd/ar/assetInfo.cpp
+++ b/pxr/usd/ar/assetInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/assetInfo.h b/pxr/usd/ar/assetInfo.h
index 0130890f71..f04af88380 100644
--- a/pxr/usd/ar/assetInfo.h
+++ b/pxr/usd/ar/assetInfo.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_ASSET_INFO_H
 #define PXR_USD_AR_ASSET_INFO_H
diff --git a/pxr/usd/ar/debugCodes.cpp b/pxr/usd/ar/debugCodes.cpp
index 5526aa5623..53d4beab3d 100644
--- a/pxr/usd/ar/debugCodes.cpp
+++ b/pxr/usd/ar/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/debugCodes.h b/pxr/usd/ar/debugCodes.h
index 9e95e14ab2..de5be5bbd8 100644
--- a/pxr/usd/ar/debugCodes.h
+++ b/pxr/usd/ar/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_DEBUG_CODES_H
 #define PXR_USD_AR_DEBUG_CODES_H
diff --git a/pxr/usd/ar/defaultResolver.cpp b/pxr/usd/ar/defaultResolver.cpp
index 85c6f75441..fdc5790347 100644
--- a/pxr/usd/ar/defaultResolver.cpp
+++ b/pxr/usd/ar/defaultResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/defaultResolver.h b/pxr/usd/ar/defaultResolver.h
index 8fbc334d0b..5361614fc3 100644
--- a/pxr/usd/ar/defaultResolver.h
+++ b/pxr/usd/ar/defaultResolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_DEFAULT_RESOLVER_H
 #define PXR_USD_AR_DEFAULT_RESOLVER_H
diff --git a/pxr/usd/ar/defaultResolverContext.cpp b/pxr/usd/ar/defaultResolverContext.cpp
index cfdd15e5c4..7de2d996a1 100644
--- a/pxr/usd/ar/defaultResolverContext.cpp
+++ b/pxr/usd/ar/defaultResolverContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/defaultResolverContext.h"
diff --git a/pxr/usd/ar/defaultResolverContext.h b/pxr/usd/ar/defaultResolverContext.h
index 7fbe1a4226..ab61fe4dd5 100644
--- a/pxr/usd/ar/defaultResolverContext.h
+++ b/pxr/usd/ar/defaultResolverContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_DEFAULT_RESOLVER_CONTEXT_H
 #define PXR_USD_AR_DEFAULT_RESOLVER_CONTEXT_H
diff --git a/pxr/usd/ar/definePackageResolver.cpp b/pxr/usd/ar/definePackageResolver.cpp
index 214cd05f55..94d24c8fec 100644
--- a/pxr/usd/ar/definePackageResolver.cpp
+++ b/pxr/usd/ar/definePackageResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/definePackageResolver.h"
diff --git a/pxr/usd/ar/definePackageResolver.h b/pxr/usd/ar/definePackageResolver.h
index c7fde1d4e7..5dca09f901 100644
--- a/pxr/usd/ar/definePackageResolver.h
+++ b/pxr/usd/ar/definePackageResolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_DEFINE_PACKAGE_RESOLVER_H
 #define PXR_USD_AR_DEFINE_PACKAGE_RESOLVER_H
diff --git a/pxr/usd/ar/defineResolver.cpp b/pxr/usd/ar/defineResolver.cpp
index 1f839be38a..0c4e761b03 100644
--- a/pxr/usd/ar/defineResolver.cpp
+++ b/pxr/usd/ar/defineResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/defineResolver.h"
diff --git a/pxr/usd/ar/defineResolver.h b/pxr/usd/ar/defineResolver.h
index 937b97e43e..d114da85d8 100644
--- a/pxr/usd/ar/defineResolver.h
+++ b/pxr/usd/ar/defineResolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_DEFINE_RESOLVER_H
 #define PXR_USD_AR_DEFINE_RESOLVER_H
diff --git a/pxr/usd/ar/defineResolverContext.h b/pxr/usd/ar/defineResolverContext.h
index 052f6fb793..09452bf1e9 100644
--- a/pxr/usd/ar/defineResolverContext.h
+++ b/pxr/usd/ar/defineResolverContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_DEFINE_RESOLVER_CONTEXT_H
 #define PXR_USD_AR_DEFINE_RESOLVER_CONTEXT_H
diff --git a/pxr/usd/ar/filesystemAsset.cpp b/pxr/usd/ar/filesystemAsset.cpp
index f9aa0fe332..0a0fbf63ca 100644
--- a/pxr/usd/ar/filesystemAsset.cpp
+++ b/pxr/usd/ar/filesystemAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/filesystemAsset.h"
diff --git a/pxr/usd/ar/filesystemAsset.h b/pxr/usd/ar/filesystemAsset.h
index fb721708f3..0c4794d1c2 100644
--- a/pxr/usd/ar/filesystemAsset.h
+++ b/pxr/usd/ar/filesystemAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_USD_AR_FILESYSTEM_ASSET_H
 #define PXR_USD_AR_FILESYSTEM_ASSET_H
 
diff --git a/pxr/usd/ar/filesystemWritableAsset.cpp b/pxr/usd/ar/filesystemWritableAsset.cpp
index 2cf1cb4a23..2ff8cfb5b1 100644
--- a/pxr/usd/ar/filesystemWritableAsset.cpp
+++ b/pxr/usd/ar/filesystemWritableAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/filesystemWritableAsset.h b/pxr/usd/ar/filesystemWritableAsset.h
index a5daa124a7..26b455d0a5 100644
--- a/pxr/usd/ar/filesystemWritableAsset.h
+++ b/pxr/usd/ar/filesystemWritableAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_USD_AR_FILESYSTEM_WRITABLE_ASSET_H
 #define PXR_USD_AR_FILESYSTEM_WRITABLE_ASSET_H
 
diff --git a/pxr/usd/ar/inMemoryAsset.cpp b/pxr/usd/ar/inMemoryAsset.cpp
index f5555cd79a..477eab2d61 100644
--- a/pxr/usd/ar/inMemoryAsset.cpp
+++ b/pxr/usd/ar/inMemoryAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/usd/ar/inMemoryAsset.h"
 
diff --git a/pxr/usd/ar/inMemoryAsset.h b/pxr/usd/ar/inMemoryAsset.h
index 0a377b7d97..8ab00754e5 100644
--- a/pxr/usd/ar/inMemoryAsset.h
+++ b/pxr/usd/ar/inMemoryAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_USD_AR_IN_MEMORY_ASSET_H
 #define PXR_USD_AR_IN_MEMORY_ASSET_H
 
diff --git a/pxr/usd/ar/module.cpp b/pxr/usd/ar/module.cpp
index ca83f33fdc..86ba4c27a7 100644
--- a/pxr/usd/ar/module.cpp
+++ b/pxr/usd/ar/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/moduleDeps.cpp b/pxr/usd/ar/moduleDeps.cpp
index 976618cdd6..e88e72f294 100644
--- a/pxr/usd/ar/moduleDeps.cpp
+++ b/pxr/usd/ar/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/ar/notice.cpp b/pxr/usd/ar/notice.cpp
index 6c46342183..751d440aab 100644
--- a/pxr/usd/ar/notice.cpp
+++ b/pxr/usd/ar/notice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/notice.h b/pxr/usd/ar/notice.h
index c250d4b2c9..fced5d0287 100644
--- a/pxr/usd/ar/notice.h
+++ b/pxr/usd/ar/notice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_NOTICE_H
 #define PXR_USD_AR_NOTICE_H
diff --git a/pxr/usd/ar/packageResolver.cpp b/pxr/usd/ar/packageResolver.cpp
index 74f76d7fbf..0e1a99eedc 100644
--- a/pxr/usd/ar/packageResolver.cpp
+++ b/pxr/usd/ar/packageResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/packageResolver.h b/pxr/usd/ar/packageResolver.h
index 0fad4bb6ec..62b406096b 100644
--- a/pxr/usd/ar/packageResolver.h
+++ b/pxr/usd/ar/packageResolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_PACKAGE_RESOLVER_H
 #define PXR_USD_AR_PACKAGE_RESOLVER_H
diff --git a/pxr/usd/ar/packageUtils.cpp b/pxr/usd/ar/packageUtils.cpp
index ed3df295fe..35d04b19c4 100644
--- a/pxr/usd/ar/packageUtils.cpp
+++ b/pxr/usd/ar/packageUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/packageUtils.h b/pxr/usd/ar/packageUtils.h
index a880124768..46eab3df71 100644
--- a/pxr/usd/ar/packageUtils.h
+++ b/pxr/usd/ar/packageUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_PACKAGE_UTILS_H
 #define PXR_USD_AR_PACKAGE_UTILS_H
diff --git a/pxr/usd/ar/pch.h b/pxr/usd/ar/pch.h
index b3333376f4..e48509d138 100644
--- a/pxr/usd/ar/pch.h
+++ b/pxr/usd/ar/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,13 +31,13 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -77,15 +60,19 @@
 #include <math.h>
 #include <memory>
 #include <mutex>
+#include <new>
+#include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
+#include <string_view>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -93,49 +80,18 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/none.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/noncopyable.hpp>
+#include <boost/python/bases.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
+#include <boost/python/def_visitor.hpp>
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
 #include <boost/python/handle.hpp>
+#include <boost/python/implicit.hpp>
 #include <boost/python/list.hpp>
+#include <boost/python/make_constructor.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
@@ -144,6 +100,7 @@
 #include <boost/python/reference_existing_object.hpp>
 #include <boost/python/return_by_value.hpp>
 #include <boost/python/return_value_policy.hpp>
+#include <boost/python/scope.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
@@ -152,21 +109,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_left_shift.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/spin_rw_mutex.h>
diff --git a/pxr/usd/ar/pyResolverContext.cpp b/pxr/usd/ar/pyResolverContext.cpp
index de99a9d7e3..a9241bbb97 100644
--- a/pxr/usd/ar/pyResolverContext.cpp
+++ b/pxr/usd/ar/pyResolverContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/pyResolverContext.h b/pxr/usd/ar/pyResolverContext.h
index 37180c08da..dc746dee58 100644
--- a/pxr/usd/ar/pyResolverContext.h
+++ b/pxr/usd/ar/pyResolverContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_PY_RESOLVER_CONTEXT_H
 #define PXR_USD_AR_PY_RESOLVER_CONTEXT_H
diff --git a/pxr/usd/ar/resolvedPath.cpp b/pxr/usd/ar/resolvedPath.cpp
index 77f486e956..6e690586a6 100644
--- a/pxr/usd/ar/resolvedPath.cpp
+++ b/pxr/usd/ar/resolvedPath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/resolvedPath.h b/pxr/usd/ar/resolvedPath.h
index e69993a6d3..c71785a8d1 100644
--- a/pxr/usd/ar/resolvedPath.h
+++ b/pxr/usd/ar/resolvedPath.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_RESOLVED_PATH_H
 #define PXR_USD_AR_RESOLVED_PATH_H
diff --git a/pxr/usd/ar/resolver.cpp b/pxr/usd/ar/resolver.cpp
index 3485ccd009..a902291098 100644
--- a/pxr/usd/ar/resolver.cpp
+++ b/pxr/usd/ar/resolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/asset.h"
@@ -88,12 +71,6 @@ TF_DEFINE_ENV_SETTING(
     PXR_AR_DISABLE_PLUGIN_URI_RESOLVERS, false,
     "Disables plugin URI/IRI resolver implementations.");
 
-TF_DEFINE_ENV_SETTING(
-    PXR_AR_DISABLE_STRICT_SCHEME_VALIDATION, false,
-    "Disables strict validation for URI/IRI schemes. In future releases, "
-    "strict validation will be enforced."
-);
-
 static TfStaticData<std::string> _preferredResolver;
 
 void
@@ -1178,32 +1155,19 @@ class _DispatchingResolver final
                         uriScheme.c_str(), 
                         (*existingResolver)->GetType().GetTypeName().c_str());
                 }
+                else if (const auto validation =
+                            _ValidateResourceIdentifierScheme(uriScheme);
+                         !validation.first) {
+                    TF_WARN(
+                        "ArGetResolver(): '%s' for '%s' is not a valid "
+                        "resource identifier scheme: %s. Paths with this "
+                        "prefix will be handled by other resolvers.",
+                        uriScheme.c_str(),
+                        resolverInfo.type.GetTypeName().c_str(),
+                        validation.second.c_str());
+                }
                 else {
-                    const auto validation =
-                        _ValidateResourceIdentifierScheme(uriScheme);
-                    if (validation.first) {
-                        uriSchemes.push_back(uriScheme);
-                    }
-                    else if (TfGetEnvSetting(
-                                PXR_AR_DISABLE_STRICT_SCHEME_VALIDATION)){
-                        uriSchemes.push_back(uriScheme);
-                        TF_WARN("'%s' for '%s' is not a valid "
-                                "resource identifier scheme and "
-                                "will be restricted in future releases: %s",
-                                 uriScheme.c_str(),
-                                 resolverInfo.type.GetTypeName().c_str(),
-                                 validation.second.c_str());
-                    } else{
-                        TF_WARN(
-                            "'%s' for '%s' is not a valid resource identifier "
-                            "scheme: %s. Paths with this prefix will be "
-                            "handled by other resolvers. Set "
-                            "PXR_AR_DISABLE_STRICT_SCHEME_VALIDATION to "
-                            "disable strict scheme validation.",
-                            uriScheme.c_str(),
-                            resolverInfo.type.GetTypeName().c_str(),
-                            validation.second.c_str());
-                    }
+                    uriSchemes.push_back(uriScheme);
                 }
             }
 
diff --git a/pxr/usd/ar/resolver.h b/pxr/usd/ar/resolver.h
index 014630865c..96a36d81a6 100644
--- a/pxr/usd/ar/resolver.h
+++ b/pxr/usd/ar/resolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_RESOLVER_H
 #define PXR_USD_AR_RESOLVER_H
diff --git a/pxr/usd/ar/resolverContext.cpp b/pxr/usd/ar/resolverContext.cpp
index 323b1022d8..d3802831ff 100644
--- a/pxr/usd/ar/resolverContext.cpp
+++ b/pxr/usd/ar/resolverContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/resolverContext.h b/pxr/usd/ar/resolverContext.h
index 2da4813cc1..cd4547d06a 100644
--- a/pxr/usd/ar/resolverContext.h
+++ b/pxr/usd/ar/resolverContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_RESOLVER_CONTEXT_H
 #define PXR_USD_AR_RESOLVER_CONTEXT_H
diff --git a/pxr/usd/ar/resolverContextBinder.cpp b/pxr/usd/ar/resolverContextBinder.cpp
index 547acce24b..bc57508175 100644
--- a/pxr/usd/ar/resolverContextBinder.cpp
+++ b/pxr/usd/ar/resolverContextBinder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/resolverContextBinder.h b/pxr/usd/ar/resolverContextBinder.h
index b1fd34ad05..ec403a9cb8 100644
--- a/pxr/usd/ar/resolverContextBinder.h
+++ b/pxr/usd/ar/resolverContextBinder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_RESOLVER_CONTEXT_BINDER_H
 #define PXR_USD_AR_RESOLVER_CONTEXT_BINDER_H
diff --git a/pxr/usd/ar/resolverScopedCache.cpp b/pxr/usd/ar/resolverScopedCache.cpp
index 2a7106da0e..f07c9772e5 100644
--- a/pxr/usd/ar/resolverScopedCache.cpp
+++ b/pxr/usd/ar/resolverScopedCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/resolverScopedCache.h b/pxr/usd/ar/resolverScopedCache.h
index 9647fac2ae..b22bf4b24a 100644
--- a/pxr/usd/ar/resolverScopedCache.h
+++ b/pxr/usd/ar/resolverScopedCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_RESOLVER_SCOPED_CACHE_H
 #define PXR_USD_AR_RESOLVER_SCOPED_CACHE_H
diff --git a/pxr/usd/ar/testenv/TestArAdvancedAPI_plugin.cpp b/pxr/usd/ar/testenv/TestArAdvancedAPI_plugin.cpp
index 311c8c78d5..a617e26c7d 100644
--- a/pxr/usd/ar/testenv/TestArAdvancedAPI_plugin.cpp
+++ b/pxr/usd/ar/testenv/TestArAdvancedAPI_plugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/testenv/TestArOptionalImplementation_plugin.cpp b/pxr/usd/ar/testenv/TestArOptionalImplementation_plugin.cpp
index 1e81c8a8fb..9fba4c50e9 100644
--- a/pxr/usd/ar/testenv/TestArOptionalImplementation_plugin.cpp
+++ b/pxr/usd/ar/testenv/TestArOptionalImplementation_plugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/testenv/TestArPackageResolver_plugin.cpp b/pxr/usd/ar/testenv/TestArPackageResolver_plugin.cpp
index 74de304474..bee5f1ee20 100644
--- a/pxr/usd/ar/testenv/TestArPackageResolver_plugin.cpp
+++ b/pxr/usd/ar/testenv/TestArPackageResolver_plugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/testenv/TestArURIResolver_plugin.cpp b/pxr/usd/ar/testenv/TestArURIResolver_plugin.cpp
index 2517881172..d129885d9e 100644
--- a/pxr/usd/ar/testenv/TestArURIResolver_plugin.cpp
+++ b/pxr/usd/ar/testenv/TestArURIResolver_plugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/testenv/TestArURIResolver_plugin.h b/pxr/usd/ar/testenv/TestArURIResolver_plugin.h
index 5b0f480e53..3049240dd6 100644
--- a/pxr/usd/ar/testenv/TestArURIResolver_plugin.h
+++ b/pxr/usd/ar/testenv/TestArURIResolver_plugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/testenv/testArAdvancedAPI.py b/pxr/usd/ar/testenv/testArAdvancedAPI.py
index 4973e4c423..d36693d6fa 100644
--- a/pxr/usd/ar/testenv/testArAdvancedAPI.py
+++ b/pxr/usd/ar/testenv/testArAdvancedAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import os
diff --git a/pxr/usd/ar/testenv/testArAssetInfo.py b/pxr/usd/ar/testenv/testArAssetInfo.py
index 28dbc7632d..540da5ebd4 100644
--- a/pxr/usd/ar/testenv/testArAssetInfo.py
+++ b/pxr/usd/ar/testenv/testArAssetInfo.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import unittest
 
diff --git a/pxr/usd/ar/testenv/testArDefaultResolver.cpp b/pxr/usd/ar/testenv/testArDefaultResolver.cpp
index aa32b926f6..59b0fb7f3e 100644
--- a/pxr/usd/ar/testenv/testArDefaultResolver.cpp
+++ b/pxr/usd/ar/testenv/testArDefaultResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/testenv/testArDefaultResolver.py b/pxr/usd/ar/testenv/testArDefaultResolver.py
index 609ee0f700..31e607a4ed 100644
--- a/pxr/usd/ar/testenv/testArDefaultResolver.py
+++ b/pxr/usd/ar/testenv/testArDefaultResolver.py
@@ -2,28 +2,12 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import os
 import pathlib
+import sys
 from pxr import Ar, Tf
 
 import unittest
@@ -37,11 +21,9 @@ def assertPathsEqual(self, path1, path2):
         path1 = str(path1)
         path2 = str(path2)
 
-        # Flip backslashes to forward slashes and make sure path case doesn't
-        # cause test failures to accommodate platform differences. We don't use
-        # os.path.normpath since that might fix up other differences we'd want
-        # to catch in these tests.
-        self.assertEqual(os.path.normcase(path1), os.path.normcase(path2))
+        # Flip backslashes to forward slashes to accommodate platform
+        # differences. 
+        self.assertEqual(os.path.normpath(path1), os.path.normpath(path2))
 
     def _CreateEmptyTestFile(self, path):
         dir = os.path.dirname(path)
@@ -103,6 +85,16 @@ def _RP(path = None):
         self.assertPathsEqual(
             '/dir/AbsolutePath.txt',
             r.CreateIdentifier('/dir/.//AbsolutePath.txt', _RP('subdir/A.txt')))
+        
+        # Windows is case insensitive so ensuring that the drive letter of the 
+        # resulting identifier matches that of the original input path.
+        if sys.platform == "win32":
+            self.assertPathsEqual(
+                'C:\dir\AbsolutePath.txt',
+                r.CreateIdentifier('C:/dir/AbsolutePath.txt'))
+            self.assertPathsEqual(
+                'c:\dir\AbsolutePath.txt',
+                r.CreateIdentifier('c:/dir/AbsolutePath.txt'))
 
         # The identifier for a file-relative path (i.e. a relative path
         # starting with "./" or "../" is obtained by anchoring that path
@@ -164,6 +156,16 @@ def _RP(path = None):
             '/dir/AbsolutePath.txt',
             r.CreateIdentifierForNewAsset(
                 '/dir/.//AbsolutePath.txt', _RP('subdir/A.txt')))
+        
+        # Windows is case insensitive so ensuring that the drive letter of the 
+        # resulting identifier matches that of the original input path.
+        if sys.platform == "win32":
+            self.assertPathsEqual(
+                'C:\dir\AbsolutePath.txt',
+                r.CreateIdentifier('C:/dir/AbsolutePath.txt'))
+            self.assertPathsEqual(
+                'c:\dir\AbsolutePath.txt',
+                r.CreateIdentifier('c:/dir/AbsolutePath.txt'))
 
         # The identifier for a relative path (file-relative or search-relative)
         # will always be the anchored absolute path.
diff --git a/pxr/usd/ar/testenv/testArNotice.cpp b/pxr/usd/ar/testenv/testArNotice.cpp
index 3e401771f2..327a4657d4 100644
--- a/pxr/usd/ar/testenv/testArNotice.cpp
+++ b/pxr/usd/ar/testenv/testArNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/testenv/testArOptionalImplementation.py b/pxr/usd/ar/testenv/testArOptionalImplementation.py
index 806e9b135f..189ab235ed 100644
--- a/pxr/usd/ar/testenv/testArOptionalImplementation.py
+++ b/pxr/usd/ar/testenv/testArOptionalImplementation.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import argparse
 import os
diff --git a/pxr/usd/ar/testenv/testArPackageUtils.py b/pxr/usd/ar/testenv/testArPackageUtils.py
index 7e9441f0eb..fd9195ad52 100644
--- a/pxr/usd/ar/testenv/testArPackageUtils.py
+++ b/pxr/usd/ar/testenv/testArPackageUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import unittest
 
diff --git a/pxr/usd/ar/testenv/testArResolvedPath.py b/pxr/usd/ar/testenv/testArResolvedPath.py
index f043c4b222..a9adb4b4cd 100644
--- a/pxr/usd/ar/testenv/testArResolvedPath.py
+++ b/pxr/usd/ar/testenv/testArResolvedPath.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import unittest
 
diff --git a/pxr/usd/ar/testenv/testArResolverContext.cpp b/pxr/usd/ar/testenv/testArResolverContext.cpp
index d31d1759c2..8920fa93a2 100644
--- a/pxr/usd/ar/testenv/testArResolverContext.cpp
+++ b/pxr/usd/ar/testenv/testArResolverContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/ar.h"
diff --git a/pxr/usd/ar/testenv/testArResolverContext.py b/pxr/usd/ar/testenv/testArResolverContext.py
index 2229e8741c..64a07538f2 100644
--- a/pxr/usd/ar/testenv/testArResolverContext.py
+++ b/pxr/usd/ar/testenv/testArResolverContext.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Ar
 
diff --git a/pxr/usd/ar/testenv/testArThreadedAssetCreation.cpp b/pxr/usd/ar/testenv/testArThreadedAssetCreation.cpp
index 8844d056d4..5278bd7832 100644
--- a/pxr/usd/ar/testenv/testArThreadedAssetCreation.cpp
+++ b/pxr/usd/ar/testenv/testArThreadedAssetCreation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/testenv/testArTimestamp.py b/pxr/usd/ar/testenv/testArTimestamp.py
index 1ba83ca275..18802002bb 100644
--- a/pxr/usd/ar/testenv/testArTimestamp.py
+++ b/pxr/usd/ar/testenv/testArTimestamp.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import math
 import unittest
diff --git a/pxr/usd/ar/testenv/testArURIResolver.cpp b/pxr/usd/ar/testenv/testArURIResolver.cpp
index 36d783cec7..57882d3a56 100644
--- a/pxr/usd/ar/testenv/testArURIResolver.cpp
+++ b/pxr/usd/ar/testenv/testArURIResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/testenv/testArURIResolver.py b/pxr/usd/ar/testenv/testArURIResolver.py
index f001128518..b66b32eb50 100644
--- a/pxr/usd/ar/testenv/testArURIResolver.py
+++ b/pxr/usd/ar/testenv/testArURIResolver.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import os
 import unittest
@@ -104,21 +87,10 @@ def test_InvalidScheme(self):
         invalid_utf8_path = "test-π-utf8:/abc.xyz"
         invalid_numeric_prefix_path = "113-test:/abc.xyz"
         invalid_colon_path = "other:test:/abc.xyz"
-        if Tf.GetEnvSetting("PXR_AR_DISABLE_STRICT_SCHEME_VALIDATION"):
-            self.assertEqual(resolver.Resolve(invalid_underbar_path),
-                             invalid_underbar_path)
-            self.assertEqual(resolver.Resolve(invalid_utf8_path),
-                             invalid_utf8_path)
-            self.assertEqual(resolver.Resolve(invalid_numeric_prefix_path),
-                             invalid_numeric_prefix_path)
-            # Even when strict scheme validation mode is disabled
-            # schemes with colons in them may fail to resolve
-            self.assertFalse(resolver.Resolve(invalid_colon_path))
-        else:
-            self.assertFalse(resolver.Resolve(invalid_underbar_path))
-            self.assertFalse(resolver.Resolve(invalid_utf8_path))
-            self.assertFalse(resolver.Resolve(invalid_numeric_prefix_path))
-            self.assertFalse(resolver.Resolve(invalid_colon_path))
+        self.assertFalse(resolver.Resolve(invalid_underbar_path))
+        self.assertFalse(resolver.Resolve(invalid_utf8_path))
+        self.assertFalse(resolver.Resolve(invalid_numeric_prefix_path))
+        self.assertFalse(resolver.Resolve(invalid_colon_path))
 
     def testGetRegisteredURISchemes(self):
         "Tests that all URI schemes for discovered plugins are returned"
diff --git a/pxr/usd/ar/threadLocalScopedCache.h b/pxr/usd/ar/threadLocalScopedCache.h
index 46b5c84b7a..cb1ea61828 100644
--- a/pxr/usd/ar/threadLocalScopedCache.h
+++ b/pxr/usd/ar/threadLocalScopedCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_THREAD_LOCAL_SCOPED_CACHE_H
 #define PXR_USD_AR_THREAD_LOCAL_SCOPED_CACHE_H
diff --git a/pxr/usd/ar/timestamp.cpp b/pxr/usd/ar/timestamp.cpp
index d5f5354f48..b90dcd5153 100644
--- a/pxr/usd/ar/timestamp.cpp
+++ b/pxr/usd/ar/timestamp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/timestamp.h b/pxr/usd/ar/timestamp.h
index 490336ddb1..c06541dd58 100644
--- a/pxr/usd/ar/timestamp.h
+++ b/pxr/usd/ar/timestamp.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_TIMESTAMP_H
 #define PXR_USD_AR_TIMESTAMP_H
diff --git a/pxr/usd/ar/wrapAssetInfo.cpp b/pxr/usd/ar/wrapAssetInfo.cpp
index dc45ef43a2..0bdf1c3f2c 100644
--- a/pxr/usd/ar/wrapAssetInfo.cpp
+++ b/pxr/usd/ar/wrapAssetInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/wrapDefaultResolver.cpp b/pxr/usd/ar/wrapDefaultResolver.cpp
index 592d9a94ac..2c10fd4c86 100644
--- a/pxr/usd/ar/wrapDefaultResolver.cpp
+++ b/pxr/usd/ar/wrapDefaultResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/ar/wrapDefaultResolverContext.cpp b/pxr/usd/ar/wrapDefaultResolverContext.cpp
index 4ab2a012e3..fd8f45d162 100644
--- a/pxr/usd/ar/wrapDefaultResolverContext.cpp
+++ b/pxr/usd/ar/wrapDefaultResolverContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/operators.hpp>
diff --git a/pxr/usd/ar/wrapNotice.cpp b/pxr/usd/ar/wrapNotice.cpp
index b61c9061aa..64a64574e1 100644
--- a/pxr/usd/ar/wrapNotice.cpp
+++ b/pxr/usd/ar/wrapNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/wrapPackageUtils.cpp b/pxr/usd/ar/wrapPackageUtils.cpp
index 407e231792..6e58cc9fed 100644
--- a/pxr/usd/ar/wrapPackageUtils.cpp
+++ b/pxr/usd/ar/wrapPackageUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ar/wrapResolvedPath.cpp b/pxr/usd/ar/wrapResolvedPath.cpp
index 546e26e2d2..80135ee889 100644
--- a/pxr/usd/ar/wrapResolvedPath.cpp
+++ b/pxr/usd/ar/wrapResolvedPath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/wrapResolver.cpp b/pxr/usd/ar/wrapResolver.cpp
index 4f3330d524..d4b071d3b1 100644
--- a/pxr/usd/ar/wrapResolver.cpp
+++ b/pxr/usd/ar/wrapResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
diff --git a/pxr/usd/ar/wrapResolverContext.cpp b/pxr/usd/ar/wrapResolverContext.cpp
index 1bc4da9f39..146de23ce6 100644
--- a/pxr/usd/ar/wrapResolverContext.cpp
+++ b/pxr/usd/ar/wrapResolverContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
diff --git a/pxr/usd/ar/wrapResolverContextBinder.cpp b/pxr/usd/ar/wrapResolverContextBinder.cpp
index 234cccb8e3..00e17f8b91 100644
--- a/pxr/usd/ar/wrapResolverContextBinder.cpp
+++ b/pxr/usd/ar/wrapResolverContextBinder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/object.hpp>
diff --git a/pxr/usd/ar/wrapResolverScopedCache.cpp b/pxr/usd/ar/wrapResolverScopedCache.cpp
index 9c47e71189..50a31e2522 100644
--- a/pxr/usd/ar/wrapResolverScopedCache.cpp
+++ b/pxr/usd/ar/wrapResolverScopedCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/object.hpp>
diff --git a/pxr/usd/ar/wrapTimestamp.cpp b/pxr/usd/ar/wrapTimestamp.cpp
index 1de788e7ff..5d67f3d4a9 100644
--- a/pxr/usd/ar/wrapTimestamp.cpp
+++ b/pxr/usd/ar/wrapTimestamp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/ar/writableAsset.cpp b/pxr/usd/ar/writableAsset.cpp
index bcd7545905..5cae952952 100644
--- a/pxr/usd/ar/writableAsset.cpp
+++ b/pxr/usd/ar/writableAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ar/writableAsset.h"
diff --git a/pxr/usd/ar/writableAsset.h b/pxr/usd/ar/writableAsset.h
index 0f241e1012..f42a741e53 100644
--- a/pxr/usd/ar/writableAsset.h
+++ b/pxr/usd/ar/writableAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_AR_WRITABLE_ASSET_H
 #define PXR_USD_AR_WRITABLE_ASSET_H
diff --git a/pxr/usd/bin/sdfdump/sdfdump.cpp b/pxr/usd/bin/sdfdump/sdfdump.cpp
index 224cdfa38b..f9f27b4ae4 100644
--- a/pxr/usd/bin/sdfdump/sdfdump.cpp
+++ b/pxr/usd/bin/sdfdump/sdfdump.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/attributes.h"
diff --git a/pxr/usd/bin/sdffilter/sdffilter.cpp b/pxr/usd/bin/sdffilter/sdffilter.cpp
index ed0d5b5aa9..eb1aff0d82 100644
--- a/pxr/usd/bin/sdffilter/sdffilter.cpp
+++ b/pxr/usd/bin/sdffilter/sdffilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/attributes.h"
diff --git a/pxr/usd/bin/usdcat/usdcat.cpp b/pxr/usd/bin/usdcat/usdcat.cpp
index 21ef6c7690..df1084a4e9 100644
--- a/pxr/usd/bin/usdcat/usdcat.cpp
+++ b/pxr/usd/bin/usdcat/usdcat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Apple
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/bin/usdchecker/usdchecker.py b/pxr/usd/bin/usdchecker/usdchecker.py
index afc2b1a7e2..db75e826c2 100644
--- a/pxr/usd/bin/usdchecker/usdchecker.py
+++ b/pxr/usd/bin/usdchecker/usdchecker.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 import argparse
diff --git a/pxr/usd/bin/usdcompress/usdcompress.py b/pxr/usd/bin/usdcompress/usdcompress.py
index a1735fa4e3..109cd4dead 100644
--- a/pxr/usd/bin/usdcompress/usdcompress.py
+++ b/pxr/usd/bin/usdcompress/usdcompress.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Google LLC
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=range-builtin-not-iterating
 
diff --git a/pxr/usd/bin/usddiff/usddiff.py b/pxr/usd/bin/usddiff/usddiff.py
index ba6426416c..8f91396ec1 100644
--- a/pxr/usd/bin/usddiff/usddiff.py
+++ b/pxr/usd/bin/usddiff/usddiff.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 import difflib, os, sys
diff --git a/pxr/usd/bin/usddumpcrate/usddumpcrate.py b/pxr/usd/bin/usddumpcrate/usddumpcrate.py
index d9d28cdcbd..bd406801f1 100644
--- a/pxr/usd/bin/usddumpcrate/usddumpcrate.py
+++ b/pxr/usd/bin/usddumpcrate/usddumpcrate.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 import argparse, sys, os
diff --git a/pxr/usd/bin/usdedit/usdedit.py b/pxr/usd/bin/usdedit/usdedit.py
index 0cf5e333c6..8164269019 100644
--- a/pxr/usd/bin/usdedit/usdedit.py
+++ b/pxr/usd/bin/usdedit/usdedit.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usd/bin/usdfixbrokenpixarschemas/usdfixbrokenpixarschemas.py b/pxr/usd/bin/usdfixbrokenpixarschemas/usdfixbrokenpixarschemas.py
index 53a980a1c8..8088530f80 100644
--- a/pxr/usd/bin/usdfixbrokenpixarschemas/usdfixbrokenpixarschemas.py
+++ b/pxr/usd/bin/usdfixbrokenpixarschemas/usdfixbrokenpixarschemas.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import os
diff --git a/pxr/usd/bin/usdgenschemafromsdr/usdgenschemafromsdr.py b/pxr/usd/bin/usdgenschemafromsdr/usdgenschemafromsdr.py
index fa7ef52324..f3c1f2dce0 100644
--- a/pxr/usd/bin/usdgenschemafromsdr/usdgenschemafromsdr.py
+++ b/pxr/usd/bin/usdgenschemafromsdr/usdgenschemafromsdr.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 This script generates dynamic schema.usda, generatedSchema.usda and
diff --git a/pxr/usd/bin/usdresolve/usdresolve.py b/pxr/usd/bin/usdresolve/usdresolve.py
index 830ba25205..0e80724fef 100644
--- a/pxr/usd/bin/usdresolve/usdresolve.py
+++ b/pxr/usd/bin/usdresolve/usdresolve.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usd/bin/usdstitch/usdstitch.py b/pxr/usd/bin/usdstitch/usdstitch.py
index 0971009f96..70d922f4f1 100644
--- a/pxr/usd/bin/usdstitch/usdstitch.py
+++ b/pxr/usd/bin/usdstitch/usdstitch.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usd/bin/usdstitchclips/usdstitchclips.py b/pxr/usd/bin/usdstitchclips/usdstitchclips.py
index a0f1a43926..10e8c2e071 100644
--- a/pxr/usd/bin/usdstitchclips/usdstitchclips.py
+++ b/pxr/usd/bin/usdstitchclips/usdstitchclips.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usd/bin/usdtree/usdtree.cpp b/pxr/usd/bin/usdtree/usdtree.cpp
index d085bac346..48f137db1f 100644
--- a/pxr/usd/bin/usdtree/usdtree.cpp
+++ b/pxr/usd/bin/usdtree/usdtree.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Apple
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/bin/usdzip/usdzip.py b/pxr/usd/bin/usdzip/usdzip.py
index 9fca292123..739bf2473f 100644
--- a/pxr/usd/bin/usdzip/usdzip.py
+++ b/pxr/usd/bin/usdzip/usdzip.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 import argparse
diff --git a/pxr/usd/kind/__init__.py b/pxr/usd/kind/__init__.py
index 241e3014e9..f3e0d38e42 100644
--- a/pxr/usd/kind/__init__.py
+++ b/pxr/usd/kind/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """Python bindings for libKind"""
 
diff --git a/pxr/usd/kind/api.h b/pxr/usd/kind/api.h
index b86018e5f0..f9a529ebda 100644
--- a/pxr/usd/kind/api.h
+++ b/pxr/usd/kind/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_KIND_API_H
 #define PXR_USD_KIND_API_H
diff --git a/pxr/usd/kind/module.cpp b/pxr/usd/kind/module.cpp
index 5fe0048be7..585994da35 100644
--- a/pxr/usd/kind/module.cpp
+++ b/pxr/usd/kind/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/kind/moduleDeps.cpp b/pxr/usd/kind/moduleDeps.cpp
index 8666ceb9ca..9b9016951d 100644
--- a/pxr/usd/kind/moduleDeps.cpp
+++ b/pxr/usd/kind/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/kind/pch.h b/pxr/usd/kind/pch.h
index bcf46042e7..362819d63c 100644
--- a/pxr/usd/kind/pch.h
+++ b/pxr/usd/kind/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -27,16 +10,11 @@
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
-#if defined(ARCH_OS_WINDOWS)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -47,7 +25,6 @@
 #include <cstring>
 #include <deque>
 #include <functional>
-#include <initializer_list>
 #include <iosfwd>
 #include <iterator>
 #include <list>
@@ -60,9 +37,9 @@
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
+#include <thread>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -70,38 +47,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -132,16 +77,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/kind/registry.cpp b/pxr/usd/kind/registry.cpp
index 2f5fc1fcb2..b95572a997 100644
--- a/pxr/usd/kind/registry.cpp
+++ b/pxr/usd/kind/registry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/kind/registry.h b/pxr/usd/kind/registry.h
index d2ddbae3f0..dec8b6f970 100644
--- a/pxr/usd/kind/registry.h
+++ b/pxr/usd/kind/registry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_KIND_REGISTRY_H
 #define PXR_USD_KIND_REGISTRY_H
diff --git a/pxr/usd/kind/testenv/testKindRegistry.py b/pxr/usd/kind/testenv/testKindRegistry.py
index 49b8ef7bd6..d45cd75a27 100644
--- a/pxr/usd/kind/testenv/testKindRegistry.py
+++ b/pxr/usd/kind/testenv/testKindRegistry.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Gf, Tf, Kind, Plug
 import os, unittest, shutil
diff --git a/pxr/usd/kind/testenv/testKindRegistry/lib/python/__init__.py b/pxr/usd/kind/testenv/testKindRegistry/lib/python/__init__.py
index 075530a57f..65cb9ef4e5 100644
--- a/pxr/usd/kind/testenv/testKindRegistry/lib/python/__init__.py
+++ b/pxr/usd/kind/testenv/testKindRegistry/lib/python/__init__.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2017 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 from pxr import Plug, Tf
 
 class TestPlugPythonDerived1(Plug._TestPlugBase1):
diff --git a/pxr/usd/kind/wrapRegistry.cpp b/pxr/usd/kind/wrapRegistry.cpp
index 5dd38aca37..90e2ab4720 100644
--- a/pxr/usd/kind/wrapRegistry.cpp
+++ b/pxr/usd/kind/wrapRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/kind/wrapTokens.cpp b/pxr/usd/kind/wrapTokens.cpp
index 0e3a564777..385dbfcd5f 100644
--- a/pxr/usd/kind/wrapTokens.cpp
+++ b/pxr/usd/kind/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/__init__.py b/pxr/usd/ndr/__init__.py
index 4895223ee1..51bfed2f1c 100644
--- a/pxr/usd/ndr/__init__.py
+++ b/pxr/usd/ndr/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 """Python bindings for libNdr"""
diff --git a/pxr/usd/ndr/api.h b/pxr/usd/ndr/api.h
index f902bcd63f..564e7dfc2d 100644
--- a/pxr/usd/ndr/api.h
+++ b/pxr/usd/ndr/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_NDR_API_H
 #define PXR_USD_NDR_API_H
diff --git a/pxr/usd/ndr/debugCodes.cpp b/pxr/usd/ndr/debugCodes.cpp
index b2e44a1bb8..130b14006c 100644
--- a/pxr/usd/ndr/debugCodes.cpp
+++ b/pxr/usd/ndr/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ndr/debugCodes.h"
diff --git a/pxr/usd/ndr/debugCodes.h b/pxr/usd/ndr/debugCodes.h
index 285297dac0..19d02eca16 100644
--- a/pxr/usd/ndr/debugCodes.h
+++ b/pxr/usd/ndr/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_NDR_DEBUG_CODES_H
 #define PXR_USD_NDR_DEBUG_CODES_H
diff --git a/pxr/usd/ndr/declare.cpp b/pxr/usd/ndr/declare.cpp
index 548eb1f35e..019120b65c 100644
--- a/pxr/usd/ndr/declare.cpp
+++ b/pxr/usd/ndr/declare.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/ndr/declare.h"
diff --git a/pxr/usd/ndr/declare.h b/pxr/usd/ndr/declare.h
index cbb6aeb4e3..3cdbeda547 100644
--- a/pxr/usd/ndr/declare.h
+++ b/pxr/usd/ndr/declare.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_DECLARE_H
diff --git a/pxr/usd/ndr/discoveryPlugin.cpp b/pxr/usd/ndr/discoveryPlugin.cpp
index 992365d598..db8509da01 100644
--- a/pxr/usd/ndr/discoveryPlugin.cpp
+++ b/pxr/usd/ndr/discoveryPlugin.cpp
@@ -1,24 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/ndr/discoveryPlugin.h"
diff --git a/pxr/usd/ndr/discoveryPlugin.h b/pxr/usd/ndr/discoveryPlugin.h
index f22323ca8a..16b1d6f0f3 100644
--- a/pxr/usd/ndr/discoveryPlugin.h
+++ b/pxr/usd/ndr/discoveryPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_DISCOVERY_PLUGIN_H
diff --git a/pxr/usd/ndr/filesystemDiscovery.cpp b/pxr/usd/ndr/filesystemDiscovery.cpp
index 9726cc0e82..7d0ca4ecb3 100644
--- a/pxr/usd/ndr/filesystemDiscovery.cpp
+++ b/pxr/usd/ndr/filesystemDiscovery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/arch/fileSystem.h"
diff --git a/pxr/usd/ndr/filesystemDiscovery.h b/pxr/usd/ndr/filesystemDiscovery.h
index 48f0599844..4d96d8deca 100644
--- a/pxr/usd/ndr/filesystemDiscovery.h
+++ b/pxr/usd/ndr/filesystemDiscovery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_FILESYSTEM_DISCOVERY_H
diff --git a/pxr/usd/ndr/filesystemDiscoveryHelpers.cpp b/pxr/usd/ndr/filesystemDiscoveryHelpers.cpp
index 55b98f02c3..131f4eb49a 100644
--- a/pxr/usd/ndr/filesystemDiscoveryHelpers.cpp
+++ b/pxr/usd/ndr/filesystemDiscoveryHelpers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/fileUtils.h"
diff --git a/pxr/usd/ndr/filesystemDiscoveryHelpers.h b/pxr/usd/ndr/filesystemDiscoveryHelpers.h
index 884c1f4026..8c19910580 100644
--- a/pxr/usd/ndr/filesystemDiscoveryHelpers.h
+++ b/pxr/usd/ndr/filesystemDiscoveryHelpers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_FILESYSTEM_DISCOVERY_HELPERS_H
diff --git a/pxr/usd/ndr/module.cpp b/pxr/usd/ndr/module.cpp
index 53639821fc..323f82d8e3 100644
--- a/pxr/usd/ndr/module.cpp
+++ b/pxr/usd/ndr/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/moduleDeps.cpp b/pxr/usd/ndr/moduleDeps.cpp
index 9bf776406c..c7db7876d7 100644
--- a/pxr/usd/ndr/moduleDeps.cpp
+++ b/pxr/usd/ndr/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/ndr/node.cpp b/pxr/usd/ndr/node.cpp
index 6d2befd0a8..10f9528ad0 100644
--- a/pxr/usd/ndr/node.cpp
+++ b/pxr/usd/ndr/node.cpp
@@ -1,24 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/node.h b/pxr/usd/ndr/node.h
index 01f7012430..8cd7286118 100644
--- a/pxr/usd/ndr/node.h
+++ b/pxr/usd/ndr/node.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_NODE_H
diff --git a/pxr/usd/ndr/nodeDiscoveryResult.h b/pxr/usd/ndr/nodeDiscoveryResult.h
index 30d5ff7ecb..62cafe5f58 100644
--- a/pxr/usd/ndr/nodeDiscoveryResult.h
+++ b/pxr/usd/ndr/nodeDiscoveryResult.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_NODE_DISCOVERY_RESULT_H
diff --git a/pxr/usd/ndr/parserPlugin.cpp b/pxr/usd/ndr/parserPlugin.cpp
index 6d494e50d7..0aa69c81b4 100644
--- a/pxr/usd/ndr/parserPlugin.cpp
+++ b/pxr/usd/ndr/parserPlugin.cpp
@@ -1,24 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/ndr/parserPlugin.h"
diff --git a/pxr/usd/ndr/parserPlugin.h b/pxr/usd/ndr/parserPlugin.h
index 25cb652a80..52afd5b2f4 100644
--- a/pxr/usd/ndr/parserPlugin.h
+++ b/pxr/usd/ndr/parserPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_PARSER_PLUGIN_H
diff --git a/pxr/usd/ndr/pch.h b/pxr/usd/ndr/pch.h
index 897ad796bf..87e23778e2 100644
--- a/pxr/usd/ndr/pch.h
+++ b/pxr/usd/ndr/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,14 +31,16 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
+#include <cctype>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -78,6 +63,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -86,6 +73,8 @@
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -93,57 +82,8 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/function.hpp>
 #include <boost/python.hpp>
 #include <boost/python/call.hpp>
 #include <boost/python/class.hpp>
@@ -182,31 +122,18 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_queue.h>
+#include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_for_each.h>
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
+#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/ndr/property.cpp b/pxr/usd/ndr/property.cpp
index a2803c1314..4a05df3207 100644
--- a/pxr/usd/ndr/property.cpp
+++ b/pxr/usd/ndr/property.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/property.h b/pxr/usd/ndr/property.h
index c8d1b26a13..07cf9af208 100644
--- a/pxr/usd/ndr/property.h
+++ b/pxr/usd/ndr/property.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_PROPERTY_H
diff --git a/pxr/usd/ndr/registry.cpp b/pxr/usd/ndr/registry.cpp
index 53f3591771..2b8df80b94 100644
--- a/pxr/usd/ndr/registry.cpp
+++ b/pxr/usd/ndr/registry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/registry.h b/pxr/usd/ndr/registry.h
index a704a50890..89fcafeb66 100644
--- a/pxr/usd/ndr/registry.h
+++ b/pxr/usd/ndr/registry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_NDR_REGISTRY_H
diff --git a/pxr/usd/ndr/testenv/testNdrFilesystemDiscovery.py b/pxr/usd/ndr/testenv/testNdrFilesystemDiscovery.py
index 81e01e77fe..6b780a6a4b 100644
--- a/pxr/usd/ndr/testenv/testNdrFilesystemDiscovery.py
+++ b/pxr/usd/ndr/testenv/testNdrFilesystemDiscovery.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os
 import unittest
diff --git a/pxr/usd/ndr/testenv/testNdrVersion.py b/pxr/usd/ndr/testenv/testNdrVersion.py
index 7b7a92bbcb..0a68c9ada4 100644
--- a/pxr/usd/ndr/testenv/testNdrVersion.py
+++ b/pxr/usd/ndr/testenv/testNdrVersion.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Ndr
 import unittest
diff --git a/pxr/usd/ndr/wrapDeclare.cpp b/pxr/usd/ndr/wrapDeclare.cpp
index caa0560426..581e37402a 100644
--- a/pxr/usd/ndr/wrapDeclare.cpp
+++ b/pxr/usd/ndr/wrapDeclare.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/wrapDiscoveryPlugin.cpp b/pxr/usd/ndr/wrapDiscoveryPlugin.cpp
index af9e16d14b..4a5ca99c4b 100644
--- a/pxr/usd/ndr/wrapDiscoveryPlugin.cpp
+++ b/pxr/usd/ndr/wrapDiscoveryPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/wrapFilesystemDiscovery.cpp b/pxr/usd/ndr/wrapFilesystemDiscovery.cpp
index 0e0ef39f14..b106d5f349 100644
--- a/pxr/usd/ndr/wrapFilesystemDiscovery.cpp
+++ b/pxr/usd/ndr/wrapFilesystemDiscovery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/wrapFilesystemDiscoveryHelpers.cpp b/pxr/usd/ndr/wrapFilesystemDiscoveryHelpers.cpp
index 24462e1b2f..7c10dc3df7 100644
--- a/pxr/usd/ndr/wrapFilesystemDiscoveryHelpers.cpp
+++ b/pxr/usd/ndr/wrapFilesystemDiscoveryHelpers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/wrapNode.cpp b/pxr/usd/ndr/wrapNode.cpp
index 01c60b900b..d13a0a866a 100644
--- a/pxr/usd/ndr/wrapNode.cpp
+++ b/pxr/usd/ndr/wrapNode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/wrapNodeDiscoveryResult.cpp b/pxr/usd/ndr/wrapNodeDiscoveryResult.cpp
index 61671987a2..7dab9a4542 100644
--- a/pxr/usd/ndr/wrapNodeDiscoveryResult.cpp
+++ b/pxr/usd/ndr/wrapNodeDiscoveryResult.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/wrapProperty.cpp b/pxr/usd/ndr/wrapProperty.cpp
index f567fe0d3b..8e1bae7158 100644
--- a/pxr/usd/ndr/wrapProperty.cpp
+++ b/pxr/usd/ndr/wrapProperty.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/ndr/wrapRegistry.cpp b/pxr/usd/ndr/wrapRegistry.cpp
index 6559a710fb..4bc5b02e3d 100644
--- a/pxr/usd/ndr/wrapRegistry.cpp
+++ b/pxr/usd/ndr/wrapRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/CMakeLists.txt b/pxr/usd/pcp/CMakeLists.txt
index 6fe1337ada..2626e6022c 100644
--- a/pxr/usd/pcp/CMakeLists.txt
+++ b/pxr/usd/pcp/CMakeLists.txt
@@ -34,6 +34,7 @@ pxr_library(pcp
         expressionVariablesSource
         instanceKey
         iterator
+        layerRelocatesEditBuilder
         layerStack
         layerStackIdentifier
         mapExpression
@@ -79,6 +80,7 @@ pxr_library(pcp
         wrapExpressionVariablesSource.cpp
         wrapInstanceKey.cpp
         wrapPrimIndex.cpp
+        wrapLayerRelocatesEditBuilder.cpp
         wrapLayerStack.cpp
         wrapLayerStackIdentifier.cpp
         wrapMapExpression.cpp
@@ -117,6 +119,7 @@ pxr_test_scripts(
     testenv/testPcpRegressionBugs_bug90706.py
     testenv/testPcpRegressionBugs_bug92955.py
     testenv/testPcpRegressionBugs_bug101300.py
+    testenv/testPcpLayerRelocatesEditBuilder.py
     testenv/testPcpResolvedPathChange.py
     testenv/testPcpStreamingLayerReload.py
     testenv/testPcpCompositionResults.py
@@ -374,6 +377,11 @@ pxr_install_test_dir(
     DEST testPcpMuseum_BasicRelocateToAnimInterface
 )
 
+pxr_install_test_dir(
+    SRC testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv
+    DEST testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim
+)
+
 pxr_install_test_dir(
     SRC testenv/testPcpMuseum_BasicInherits.testenv
     DEST testPcpMuseum_BasicInherits
@@ -529,6 +537,11 @@ pxr_install_test_dir(
     DEST testPcpMuseum_RelocatePrimsWithSameName
 )
 
+pxr_install_test_dir(
+    SRC testenv/testPcpMuseum_RelocateToNone.testenv
+    DEST testPcpMuseum_RelocateToNone
+)
+
 pxr_install_test_dir(
     SRC testenv/testPcpMuseum_SpecializesAndAncestralArcs.testenv
     DEST testPcpMuseum_SpecializesAndAncestralArcs
@@ -689,6 +702,11 @@ pxr_install_test_dir(
     DEST testPcpMuseum_TrickyInheritsAndRelocates5
 )
 
+pxr_install_test_dir(
+    SRC testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv
+    DEST testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim
+)
+
 pxr_install_test_dir(
     SRC testenv/testPcpMuseum_TrickyInheritsInVariants.testenv
     DEST testPcpMuseum_TrickyInheritsInVariants
@@ -969,11 +987,26 @@ pxr_install_test_dir(
     DEST testPcpMuseum_ErrorInvalidConflictingRelocates
 )
 
+pxr_install_test_dir(
+    SRC testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv
+    DEST testPcpMuseum_ErrorInvalidReferenceToRelocationSource
+)
+
 pxr_install_test_dir(
     SRC testenv/testPcpMuseum_ErrorRelocateWithVariantSelection.testenv
     DEST testPcpMuseum_ErrorRelocateWithVariantSelection
 )
 
+pxr_install_test_dir(
+    SRC testenv/testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior.testenv
+    DEST testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior
+)
+
+pxr_install_test_dir(
+    SRC testenv/testPcpMuseum_VariantSpecializesAndReference.testenv
+    DEST testPcpMuseum_VariantSpecializesAndReference
+)
+
 pxr_register_test(testPcpMuseum_BasicInstancing
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd BasicInstancing/root.sdf"
@@ -1052,6 +1085,13 @@ pxr_register_test(testPcpMuseum_BasicRelocateToAnimInterface
     DIFF_COMPARE compositionResults_BasicRelocateToAnimInterface.txt 
 )
 
+pxr_register_test(testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd --errorFile compositionErrors_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt BasicRelocateToAnimInterfaceAsNewRootPrim/root.sdf" 
+    STDOUT_REDIRECT compositionResults_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt
+    DIFF_COMPARE compositionResults_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt compositionErrors_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt
+)
+
 pxr_register_test(testPcpMuseum_BasicInherits
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd --errorFile compositionErrors_BasicInherits.txt BasicInherits/root.sdf" 
@@ -1274,11 +1314,17 @@ pxr_register_test(testPcpMuseum_RelativePathReferences
 
 pxr_register_test(testPcpMuseum_RelocatePrimsWithSameName
     PYTHON
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd RelocatePrimsWithSameName/root.sdf" 
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd --errorFile compositionErrors_RelocatePrimsWithSameName.txt RelocatePrimsWithSameName/root.sdf" 
     STDOUT_REDIRECT compositionResults_RelocatePrimsWithSameName.txt
-    DIFF_COMPARE compositionResults_RelocatePrimsWithSameName.txt 
+    DIFF_COMPARE compositionResults_RelocatePrimsWithSameName.txt compositionErrors_RelocatePrimsWithSameName.txt
 )
 
+pxr_register_test(testPcpMuseum_RelocateToNone
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd --errorFile compositionErrors_RelocateToNone_usd.txt RelocateToNone/root.sdf" 
+    STDOUT_REDIRECT compositionResults_RelocateToNone_usd.txt
+    DIFF_COMPARE compositionResults_RelocateToNone_usd.txt compositionErrors_RelocateToNone_usd.txt
+)
 pxr_register_test(testPcpMuseum_SpecializesAndAncestralArcs
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd SpecializesAndAncestralArcs/root.sdf" 
@@ -1529,6 +1575,13 @@ pxr_register_test(testPcpMuseum_TrickyInheritsAndRelocates5
     DIFF_COMPARE compositionResults_TrickyInheritsAndRelocates5.txt 
 )
 
+pxr_register_test(testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd  --errorFile compositionErrors_TrickyInheritsAndRelocatesToNewRootPrim.txt TrickyInheritsAndRelocatesToNewRootPrim/root.sdf" 
+    STDOUT_REDIRECT compositionResults_TrickyInheritsAndRelocatesToNewRootPrim.txt
+    DIFF_COMPARE compositionResults_TrickyInheritsAndRelocatesToNewRootPrim.txt compositionErrors_TrickyInheritsAndRelocatesToNewRootPrim.txt
+)
+
 pxr_register_test(testPcpMuseum_TrickyInheritsInVariants
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd TrickyInheritsInVariants/root.sdf" 
@@ -1860,9 +1913,9 @@ pxr_register_test(testPcpMuseum_ErrorInconsistentProperties
 
 pxr_register_test(testPcpMuseum_ErrorInvalidInstanceTargetPath
     PYTHON
-    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd --errorFile compositionErrors_ErrorInvalidInstanceTargetPath.txt ErrorInvalidInstanceTargetPath/root.sdf" 
-    STDOUT_REDIRECT compositionResults_ErrorInvalidInstanceTargetPath.txt
-    DIFF_COMPARE compositionResults_ErrorInvalidInstanceTargetPath.txt compositionErrors_ErrorInvalidInstanceTargetPath.txt
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd --errorFile compositionErrors_ErrorInvalidInstanceTargetPath_usd.txt ErrorInvalidInstanceTargetPath/root.sdf" 
+    STDOUT_REDIRECT compositionResults_ErrorInvalidInstanceTargetPath_usd.txt
+    DIFF_COMPARE compositionResults_ErrorInvalidInstanceTargetPath_usd.txt compositionErrors_ErrorInvalidInstanceTargetPath_usd.txt
 )
 
 pxr_register_test(testPcpMuseum_ErrorInvalidPreRelocateTargetPath
@@ -1921,6 +1974,13 @@ if (NOT WIN32)
     )
 endif()
 
+pxr_register_test(testPcpMuseum_ErrorInvalidReferenceToRelocationSource
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd --errorFile compositionErrors_ErrorInvalidReferenceToRelocationSource.txt ErrorInvalidReferenceToRelocationSource/root.sdf" 
+    STDOUT_REDIRECT compositionResults_ErrorInvalidReferenceToRelocationSource.txt
+    DIFF_COMPARE compositionResults_ErrorInvalidReferenceToRelocationSource.txt compositionErrors_ErrorInvalidReferenceToRelocationSource.txt
+)
+
 pxr_register_test(testPcpMuseum_ErrorRelocateWithVariantSelection
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd --errorFile compositionErrors_ErrorRelocateWithVariantSelection.txt ErrorRelocateWithVariantSelection/root.sdf" 
@@ -1930,6 +1990,20 @@ pxr_register_test(testPcpMuseum_ErrorRelocateWithVariantSelection
         SDF_SCHEMA_PROHIBIT_INVALID_VARIANT_SELECTIONS=0
 )
 
+pxr_register_test(testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd VariantSpecializesAndReferenceSurprisingBehavior/root.sdf" 
+    STDOUT_REDIRECT compositionResults_VariantSpecializesAndReferenceSurprisingBehavior.txt
+    DIFF_COMPARE compositionResults_VariantSpecializesAndReferenceSurprisingBehavior.txt
+)
+
+pxr_register_test(testPcpMuseum_VariantSpecializesAndReference
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpCompositionResults --usd VariantSpecializesAndReference/root.sdf" 
+    STDOUT_REDIRECT compositionResults_VariantSpecializesAndReference.txt
+    DIFF_COMPARE compositionResults_VariantSpecializesAndReference.txt
+)
+
 pxr_register_test(testPcpIterator
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpIterator"
     DIFF_COMPARE iteration_results.txt
@@ -2128,3 +2202,9 @@ pxr_register_test(testPcpOwner
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpOwner"
     EXPECTED_RETURN_CODE 0
 )
+
+pxr_register_test(testPcpLayerRelocatesEditBuilder
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testPcpLayerRelocatesEditBuilder"
+    EXPECTED_RETURN_CODE 0
+)
diff --git a/pxr/usd/pcp/__init__.py b/pxr/usd/pcp/__init__.py
index d294c9e974..f6780d193d 100644
--- a/pxr/usd/pcp/__init__.py
+++ b/pxr/usd/pcp/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/pcp/api.h b/pxr/usd/pcp/api.h
index 3080ae86e1..0468578d55 100644
--- a/pxr/usd/pcp/api.h
+++ b/pxr/usd/pcp/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_API_H
 #define PXR_USD_PCP_API_H
diff --git a/pxr/usd/pcp/arc.cpp b/pxr/usd/pcp/arc.cpp
index b11555530c..44aa015a8a 100644
--- a/pxr/usd/pcp/arc.cpp
+++ b/pxr/usd/pcp/arc.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/pcp/arc.h"
diff --git a/pxr/usd/pcp/arc.h b/pxr/usd/pcp/arc.h
index d096e591d0..ee3fcf1615 100644
--- a/pxr/usd/pcp/arc.h
+++ b/pxr/usd/pcp/arc.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_ARC_H
 #define PXR_USD_PCP_ARC_H
diff --git a/pxr/usd/pcp/cache.cpp b/pxr/usd/pcp/cache.cpp
index e7587d218c..0a9e1f63c6 100644
--- a/pxr/usd/pcp/cache.cpp
+++ b/pxr/usd/pcp/cache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/cache.h b/pxr/usd/pcp/cache.h
index a1ca7e6e8b..abcf316e22 100644
--- a/pxr/usd/pcp/cache.h
+++ b/pxr/usd/pcp/cache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_CACHE_H
 #define PXR_USD_PCP_CACHE_H
diff --git a/pxr/usd/pcp/changes.cpp b/pxr/usd/pcp/changes.cpp
index d57c31d2ae..b7657a4872 100644
--- a/pxr/usd/pcp/changes.cpp
+++ b/pxr/usd/pcp/changes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file Changes.cpp
 
@@ -2204,32 +2187,35 @@ _DeterminePathsAffectedByRelocationChanges( const SdfRelocatesMap & oldMap,
                                             const SdfRelocatesMap & newMap,
                                             SdfPathSet *affectedPaths )
 {
-    TF_FOR_ALL(path, oldMap) {
-        SdfRelocatesMap::const_iterator i = newMap.find(path->first);
-        if (i == newMap.end() || i->second != path->second) {
-            // This entry in oldMap does not exist in newMap, or
+    // Look through the old map looking for entries with the same source in
+    // the new map.
+    for (const auto &[oldSourcePath, oldTargetPath] : oldMap) {
+        const SdfPath *newTargetPath = TfMapLookupPtr(newMap, oldSourcePath);
+        if (!newTargetPath) {
+            // This source does not exist in newMap
+            affectedPaths->insert(oldSourcePath);
+            affectedPaths->insert(oldTargetPath);
+        } else if (*newTargetPath != oldTargetPath) {
             // newMap relocates this to a different path.
-            // Record the affected paths.
-            affectedPaths->insert(path->first);
-            affectedPaths->insert(path->second);
-            if (i != newMap.end()) {
-                affectedPaths->insert(i->second);
-            }
+            affectedPaths->insert(oldTargetPath);
+            affectedPaths->insert(*newTargetPath);
         }
     }
-    TF_FOR_ALL(path, newMap) {
-        SdfRelocatesMap::const_iterator i = oldMap.find(path->first);
-        if (i == oldMap.end() || i->second != path->second) {
-            // This entry in newMap does not exist in oldMap, or
-            // oldMap relocated this to a different path.
-            // Record the affected paths.
-            affectedPaths->insert(path->first);
-            affectedPaths->insert(path->second);
-            if (i != oldMap.end()) {
-                affectedPaths->insert(i->second);
-            }
+
+    // We only have to look for sources that exist in the new map but do not 
+    // exist in the old map as we have covered sources that exist in both
+    // already.
+    for (const auto &[newSourcePath, newTargetPath] : newMap) {
+        if (oldMap.find(newSourcePath) == oldMap.end()) {
+            // This entry in newMap does not exist in oldMap
+            affectedPaths->insert(newSourcePath);
+            affectedPaths->insert(newTargetPath);
         }
     }
+
+    // Target paths can be empty so just make sure we don't include the empty
+    // path as affected.
+    affectedPaths->erase(SdfPath::EmptyPath());
 }
 
 // Handle changes to relocations.  This requires:
@@ -2287,8 +2273,8 @@ PcpChanges::_DidChangeLayerStackRelocations(
         // Compare the old and new relocations to determine which
         // paths (in this layer stack) are affected.
         _DeterminePathsAffectedByRelocationChanges(
-            layerStack->GetRelocatesSourceToTarget(),
-            changes.newRelocatesSourceToTarget,
+            layerStack->GetIncrementalRelocatesSourceToTarget(),
+            changes.newIncrementalRelocatesSourceToTarget,
             &changes.pathsAffectedByRelocationChanges);
     }
 
diff --git a/pxr/usd/pcp/changes.h b/pxr/usd/pcp/changes.h
index d55a7d483d..dbcd081f64 100644
--- a/pxr/usd/pcp/changes.h
+++ b/pxr/usd/pcp/changes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_CHANGES_H
 #define PXR_USD_PCP_CHANGES_H
diff --git a/pxr/usd/pcp/composeSite.cpp b/pxr/usd/pcp/composeSite.cpp
index e739bfdef3..1d717f1bed 100644
--- a/pxr/usd/pcp/composeSite.cpp
+++ b/pxr/usd/pcp/composeSite.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -79,14 +62,14 @@ _PcpComposeSiteReferencesOrPayloads(
     PcpLayerStackRefPtr const &layerStack,
     SdfPath const &path,
     std::vector<RefOrPayloadType> *result,
-    PcpSourceArcInfoVector *info,
+    PcpArcInfoVector *info,
     std::unordered_set<std::string> *exprVarDependencies,
     PcpErrorVector *errors)
 {
     // Sdf provides no convenient way to annotate each element of the result.
     // So we use a map from element value to its annotation, which in this
-    // case is a PcpSourceArcInfo.
-    std::map<RefOrPayloadType, PcpSourceArcInfo> infoMap;
+    // case is a PcpArcInfo.
+    std::map<RefOrPayloadType, PcpArcInfo> infoMap;
 
     const SdfLayerRefPtrVector& layers = layerStack->GetLayers();
     SdfListOp<RefOrPayloadType> curListOp;
@@ -145,7 +128,7 @@ _PcpComposeSiteReferencesOrPayloads(
                 infoMap[result] = {
                     layer,
                     layerOffset ? *layerOffset : SdfLayerOffset(),
-                    std::move(authoredAssetPath)
+                    std::move(authoredAssetPath),
                 };
                 return result;
             });
@@ -154,8 +137,10 @@ _PcpComposeSiteReferencesOrPayloads(
     // Fill in info.
     info->clear();
     info->reserve(result->size());
-    for (auto const &ref: *result) {
-        info->push_back(infoMap[ref]);
+    for (size_t i = 0; i < result->size(); i++) {
+        auto &infoStruct = infoMap[(*result)[i]];
+        infoStruct.arcNum = i;
+        info->push_back(std::move(infoStruct));
     }
 }
 
@@ -164,7 +149,7 @@ PcpComposeSiteReferences(
     PcpLayerStackRefPtr const &layerStack,
     SdfPath const &path,
     SdfReferenceVector *result,
-    PcpSourceArcInfoVector *info,
+    PcpArcInfoVector *info,
     std::unordered_set<std::string> *stageVarDependencies,
     PcpErrorVector *errors)
 {
@@ -178,7 +163,7 @@ PcpComposeSitePayloads(
     PcpLayerStackRefPtr const &layerStack,
     SdfPath const &path,
     SdfPayloadVector *result,
-    PcpSourceArcInfoVector *info,
+    PcpArcInfoVector *info,
     std::unordered_set<std::string> *stageVarDependencies,
     PcpErrorVector *errors)
 {
@@ -262,12 +247,12 @@ _ComposeSiteListOpWithSourceInfo(const PcpLayerStackRefPtr &layerStack,
                                  const SdfPath &path,
                                  const TfToken &field,
                                  std::vector<ResultType> *result,
-                                 PcpSourceArcInfoVector *info)
+                                 PcpArcInfoVector *info)
 {
     // Map of result value to source arc info. The same value may appear in 
     // multiple layers' list ops. This lets us make sure we find the strongest
     // layer that added the value.
-    std::map<ResultType, PcpSourceArcInfo> infoMap;
+    std::map<ResultType, PcpArcInfo> infoMap;
 
     SdfListOp<ResultType> listOp;
     TF_REVERSE_FOR_ALL(layer, layerStack->GetLayers()) {
@@ -277,7 +262,7 @@ _ComposeSiteListOpWithSourceInfo(const PcpLayerStackRefPtr &layerStack,
                 {
                     // Just store the layer in the source arc info for the 
                     // result. We don't need the other data.
-                    infoMap[path].layer = *layer;
+                    infoMap[path].sourceLayer = *layer;
                     return path;
                 });
         }
@@ -285,15 +270,17 @@ _ComposeSiteListOpWithSourceInfo(const PcpLayerStackRefPtr &layerStack,
 
     // Construct the parallel array of source info to results.
     info->reserve(result->size());
-    for (const ResultType &path: *result) {
-        info->push_back(infoMap[path]);
+    for (size_t i = 0; i < result->size(); i++) {
+        auto &infoStruct = infoMap[(*result)[i]];
+        infoStruct.arcNum = i;
+        info->push_back(std::move(infoStruct));
     }
 }
 
 void
 PcpComposeSiteInherits( const PcpLayerStackRefPtr &layerStack,
                         const SdfPath &path, SdfPathVector *result,
-                        PcpSourceArcInfoVector *info )
+                        PcpArcInfoVector *info )
 {
     static const TfToken field = SdfFieldKeys->InheritPaths;
     _ComposeSiteListOpWithSourceInfo(layerStack, path, field, result, info);
@@ -316,7 +303,7 @@ PcpComposeSiteInherits( const PcpLayerStackRefPtr &layerStack,
 void
 PcpComposeSiteSpecializes(const PcpLayerStackRefPtr &layerStack,
                           const SdfPath &path, SdfPathVector *result,
-                          PcpSourceArcInfoVector *info )
+                          PcpArcInfoVector *info )
 {
     static const TfToken field = SdfFieldKeys->Specializes;
     _ComposeSiteListOpWithSourceInfo(layerStack, path, field, result, info);
@@ -341,7 +328,7 @@ void
 PcpComposeSiteVariantSets(PcpLayerStackRefPtr const &layerStack,
                           SdfPath const &path,
                           std::vector<std::string> *result,
-                          PcpSourceArcInfoVector *info)
+                          PcpArcInfoVector *info)
 {
     static const TfToken field = SdfFieldKeys->VariantSetNames;
     _ComposeSiteListOpWithSourceInfo(layerStack, path, field, result, info);
diff --git a/pxr/usd/pcp/composeSite.h b/pxr/usd/pcp/composeSite.h
index c47409036a..67fb1947d1 100644
--- a/pxr/usd/pcp/composeSite.h
+++ b/pxr/usd/pcp/composeSite.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_COMPOSE_SITE_H
 #define PXR_USD_PCP_COMPOSE_SITE_H
@@ -72,20 +55,21 @@ TF_DECLARE_WEAK_AND_REF_PTRS(PcpLayerStack);
 
 class PcpLayerStackSite;
 
-/// \struct PcpSourceArcInfo
+/// \struct PcpArcInfo
 ///
-/// Information about the source of the target of an arc.
-/// All arcs have a layer that the arc comes from. References and payloads 
+/// Helper information about an arc. All arcs have a 
+/// layer that the arc comes from. References and payloads 
 /// supply an authored asset path as well.
 ///
-struct PcpSourceArcInfo {
-    SdfLayerHandle layer;
-    SdfLayerOffset layerStackOffset;
+struct PcpArcInfo {
+    SdfLayerHandle sourceLayer;
+    SdfLayerOffset sourceLayerStackOffset;
     std::string authoredAssetPath;
+    int arcNum;
 };
 
 /// A vector of reference or payload arc information.
-typedef std::vector<PcpSourceArcInfo> PcpSourceArcInfoVector;
+typedef std::vector<PcpArcInfo> PcpArcInfoVector;
 
 /// References
 PCP_API
@@ -94,7 +78,7 @@ PcpComposeSiteReferences(
     PcpLayerStackRefPtr const &layerStack,
     SdfPath const &path,
     SdfReferenceVector *result,
-    PcpSourceArcInfoVector *info,
+    PcpArcInfoVector *info,
     std::unordered_set<std::string> *exprVarDependencies,
     PcpErrorVector *errors);
 
@@ -103,7 +87,7 @@ PcpComposeSiteReferences(
     PcpLayerStackRefPtr const &layerStack,
     SdfPath const &path,
     SdfReferenceVector *result,
-    PcpSourceArcInfoVector *info)
+    PcpArcInfoVector *info)
 {
     return PcpComposeSiteReferences(
         layerStack, path, result, info, nullptr , nullptr);
@@ -113,7 +97,7 @@ inline void
 PcpComposeSiteReferences(
     PcpNodeRef const &node,
     SdfReferenceVector *result,
-    PcpSourceArcInfoVector *info,
+    PcpArcInfoVector *info,
     std::unordered_set<std::string> *exprVarDependencies,
     PcpErrorVector *errors)
 {
@@ -126,7 +110,7 @@ inline void
 PcpComposeSiteReferences(
     PcpNodeRef const &node,
     SdfReferenceVector *result,
-    PcpSourceArcInfoVector *info)
+    PcpArcInfoVector *info)
 {
     return PcpComposeSiteReferences(
         node.GetLayerStack(), node.GetPath(), result, info, nullptr, nullptr);
@@ -139,7 +123,7 @@ PcpComposeSitePayloads(
     PcpLayerStackRefPtr const &layerStack,
     SdfPath const &path,
     SdfPayloadVector *result,
-    PcpSourceArcInfoVector *info,
+    PcpArcInfoVector *info,
     std::unordered_set<std::string> *exprVarDependencies,
     PcpErrorVector *errors);
 
@@ -148,7 +132,7 @@ PcpComposeSitePayloads(
     PcpLayerStackRefPtr const &layerStack,
     SdfPath const &path,
     SdfPayloadVector *result,
-    PcpSourceArcInfoVector *info)
+    PcpArcInfoVector *info)
 {
     return PcpComposeSitePayloads(
         layerStack, path, result, info, nullptr, nullptr);
@@ -158,7 +142,7 @@ inline void
 PcpComposeSitePayloads(
     PcpNodeRef const &node,
     SdfPayloadVector *result,
-    PcpSourceArcInfoVector *info,
+    PcpArcInfoVector *info,
     std::unordered_set<std::string> *exprVarDependencies,
     PcpErrorVector *errors)
 {
@@ -171,7 +155,7 @@ inline void
 PcpComposeSitePayloads(
     PcpNodeRef const &node,
     SdfPayloadVector *result,
-    PcpSourceArcInfoVector *info)
+    PcpArcInfoVector *info)
 {
     return PcpComposeSitePayloads(
         node.GetLayerStack(), node.GetPath(), result, info, nullptr, nullptr);
@@ -244,7 +228,7 @@ PCP_API
 void
 PcpComposeSiteInherits(PcpLayerStackRefPtr const &layerStack,
                        SdfPath const &path, SdfPathVector *result,
-                       PcpSourceArcInfoVector *info);
+                       PcpArcInfoVector *info);
 
 PCP_API
 void
@@ -262,7 +246,7 @@ PCP_API
 void
 PcpComposeSiteSpecializes(PcpLayerStackRefPtr const &layerStack,
                           SdfPath const &path, SdfPathVector *result,
-                          PcpSourceArcInfoVector *info);
+                          PcpArcInfoVector *info);
 
 PCP_API
 void
@@ -282,7 +266,7 @@ void
 PcpComposeSiteVariantSets(PcpLayerStackRefPtr const &layerStack,
                           SdfPath const &path,
                           std::vector<std::string> *result,
-                          PcpSourceArcInfoVector *info);
+                          PcpArcInfoVector *info);
 
 PCP_API
 void
diff --git a/pxr/usd/pcp/debugCodes.cpp b/pxr/usd/pcp/debugCodes.cpp
index 9b35da2b56..104d55c756 100644
--- a/pxr/usd/pcp/debugCodes.cpp
+++ b/pxr/usd/pcp/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/debugCodes.h b/pxr/usd/pcp/debugCodes.h
index 6dd6896802..8a7c3a3e2e 100644
--- a/pxr/usd/pcp/debugCodes.h
+++ b/pxr/usd/pcp/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_DEBUG_CODES_H
 #define PXR_USD_PCP_DEBUG_CODES_H
diff --git a/pxr/usd/pcp/dependencies.cpp b/pxr/usd/pcp/dependencies.cpp
index 5c05556edd..0a516fb8be 100644
--- a/pxr/usd/pcp/dependencies.cpp
+++ b/pxr/usd/pcp/dependencies.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/dependencies.h b/pxr/usd/pcp/dependencies.h
index 989dd44c57..7fb5a021b4 100644
--- a/pxr/usd/pcp/dependencies.h
+++ b/pxr/usd/pcp/dependencies.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_DEPENDENCIES_H
 #define PXR_USD_PCP_DEPENDENCIES_H
diff --git a/pxr/usd/pcp/dependency.cpp b/pxr/usd/pcp/dependency.cpp
index e56e75fb2f..896688eb87 100644
--- a/pxr/usd/pcp/dependency.cpp
+++ b/pxr/usd/pcp/dependency.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file Dependency.cpp
 
diff --git a/pxr/usd/pcp/dependency.h b/pxr/usd/pcp/dependency.h
index e08865db9c..72c9f87b66 100644
--- a/pxr/usd/pcp/dependency.h
+++ b/pxr/usd/pcp/dependency.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_DEPENDENCY_H
 #define PXR_USD_PCP_DEPENDENCY_H
diff --git a/pxr/usd/pcp/diagnostic.cpp b/pxr/usd/pcp/diagnostic.cpp
index 9f5f9363fa..dd427299bf 100644
--- a/pxr/usd/pcp/diagnostic.cpp
+++ b/pxr/usd/pcp/diagnostic.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/diagnostic.h b/pxr/usd/pcp/diagnostic.h
index e917fc7276..7ce1d8eea5 100644
--- a/pxr/usd/pcp/diagnostic.h
+++ b/pxr/usd/pcp/diagnostic.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_DIAGNOSTIC_H
 #define PXR_USD_PCP_DIAGNOSTIC_H
diff --git a/pxr/usd/pcp/dynamicFileFormatContext.cpp b/pxr/usd/pcp/dynamicFileFormatContext.cpp
index eefa0b987d..1b50ccd383 100644
--- a/pxr/usd/pcp/dynamicFileFormatContext.cpp
+++ b/pxr/usd/pcp/dynamicFileFormatContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -27,6 +10,7 @@
 #include "pxr/usd/pcp/layerStack.h"
 #include "pxr/usd/pcp/node_Iterator.h"
 #include "pxr/usd/pcp/primIndex_StackFrame.h"
+#include "pxr/usd/pcp/strengthOrdering.h"
 #include "pxr/usd/pcp/utils.h"
 #include "pxr/usd/sdf/layer.h"
 #include "pxr/base/vt/value.h"
@@ -75,6 +59,9 @@ class PcpDynamicFileFormatContext::_ComposeValueHelper
         bool strongestOpinionOnly = true)
         : _iterator(context->_parentNode, context->_previousStackFrame)
         , _strongestOpinionOnly(strongestOpinionOnly)
+        , _parent(context->_parentNode)
+        , _pathInNode(context->_pathInNode)
+        , _arcNum(context->_arcNum)
     {
     }
 
@@ -106,7 +93,16 @@ class PcpDynamicFileFormatContext::_ComposeValueHelper
             }
         }
 
+        const bool isParent = node == _parent;
         TF_FOR_ALL(childNode, Pcp_GetChildrenRange(node)) {
+            // If this is the parent, check if each of its children
+            // is weaker than the future node
+            if (isParent) {
+                if (PcpCompareSiblingPayloadNodeStrength(
+                    _parent, _arcNum, *childNode) == -1) {
+                    return true;
+                }
+            }
             // Map the path in this node to the next child node, also applying
             // any variant selections represented by the child node.
             SdfPath pathInChildNode = 
@@ -132,7 +128,8 @@ class PcpDynamicFileFormatContext::_ComposeValueHelper
             }
         }
 
-        return false;
+        // Do not look for opinions from nodes weaker than the parent.
+        return isParent;
     };
 
     // Recursively composes opinions from ancestors of the parent node and 
@@ -145,8 +142,8 @@ class PcpDynamicFileFormatContext::_ComposeValueHelper
         const ComposeFunc &composeFunc)
     {
         return _ComposeOpinionFromAncestors(
-            _iterator.node, _iterator.node.GetPath(),
-            propName, fieldName, composeFunc);
+            _iterator.node, _pathInNode.IsEmpty() ? _iterator.node.GetPath() : 
+            _pathInNode,  propName, fieldName, composeFunc);
     }
 
     template <typename ComposeFunc>
@@ -192,14 +189,21 @@ class PcpDynamicFileFormatContext::_ComposeValueHelper
     PcpPrimIndex_StackFrameIterator _iterator;
     bool _strongestOpinionOnly;
     bool _foundValue {false};
+    PcpNodeRef _parent;
+    SdfPath _pathInNode;
+    int _arcNum;
 };
 
 PcpDynamicFileFormatContext::PcpDynamicFileFormatContext(
     const PcpNodeRef &parentNode, 
+    const SdfPath &pathInNode,
+    int arcNum,
     PcpPrimIndex_StackFrame *previousStackFrame,
     TfToken::Set *composedFieldNames,
     TfToken::Set *composedAttributeNames)
     : _parentNode(parentNode)
+    , _pathInNode(pathInNode)
+    , _arcNum(arcNum)
     , _previousStackFrame(previousStackFrame)
     , _composedFieldNames(composedFieldNames)
     , _composedAttributeNames(composedAttributeNames)
@@ -328,12 +332,15 @@ PcpDynamicFileFormatContext::ComposeAttributeDefaultValue(
 // be used by prim indexing.
 PcpDynamicFileFormatContext
 Pcp_CreateDynamicFileFormatContext(const PcpNodeRef &parentNode, 
+                                   const SdfPath &ancestralPath,
+                                   int arcNum,
                                    PcpPrimIndex_StackFrame *previousFrame,
                                    TfToken::Set *composedFieldNames,
                                    TfToken::Set *composedAttributeNames)
 {
     return PcpDynamicFileFormatContext(
-        parentNode, previousFrame, composedFieldNames, composedAttributeNames);
+        parentNode, ancestralPath, arcNum, previousFrame, composedFieldNames, 
+        composedAttributeNames);
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/pcp/dynamicFileFormatContext.h b/pxr/usd/pcp/dynamicFileFormatContext.h
index 16c45b4554..fe0bddf41f 100644
--- a/pxr/usd/pcp/dynamicFileFormatContext.h
+++ b/pxr/usd/pcp/dynamicFileFormatContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_DYNAMIC_FILE_FORMAT_CONTEXT_H
 #define PXR_USD_PCP_DYNAMIC_FILE_FORMAT_CONTEXT_H
@@ -84,13 +67,15 @@ class PcpDynamicFileFormatContext
     /// ComposeValueStack are called on for dependency tracking.
     PcpDynamicFileFormatContext(
         const PcpNodeRef &parentNode, 
+        const SdfPath &pathInNode,
+        int arcNum,
         PcpPrimIndex_StackFrame *previousFrame,
         TfToken::Set *composedFieldNames,
         TfToken::Set *composedAttributeNames);
 
     /// Access to private constructor. Should only be called by prim indexing.
     friend PcpDynamicFileFormatContext Pcp_CreateDynamicFileFormatContext(
-        const PcpNodeRef &, PcpPrimIndex_StackFrame *, 
+        const PcpNodeRef &, const SdfPath&, int, PcpPrimIndex_StackFrame *, 
         TfToken::Set *, TfToken::Set *);
 
     /// Returns whether the given \p field is allowed to be used to generate
@@ -101,6 +86,8 @@ class PcpDynamicFileFormatContext
 
 private:
     PcpNodeRef _parentNode;
+    SdfPath _pathInNode;
+    int _arcNum;
     PcpPrimIndex_StackFrame *_previousStackFrame;
 
     // Cached names of fields that had values composed by this context.
diff --git a/pxr/usd/pcp/dynamicFileFormatDependencyData.cpp b/pxr/usd/pcp/dynamicFileFormatDependencyData.cpp
index 922f380bd1..4fa7a8bb6a 100644
--- a/pxr/usd/pcp/dynamicFileFormatDependencyData.cpp
+++ b/pxr/usd/pcp/dynamicFileFormatDependencyData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/dynamicFileFormatDependencyData.h b/pxr/usd/pcp/dynamicFileFormatDependencyData.h
index 2c5427b6f2..455f7ad0ec 100644
--- a/pxr/usd/pcp/dynamicFileFormatDependencyData.h
+++ b/pxr/usd/pcp/dynamicFileFormatDependencyData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_DYNAMIC_FILE_FORMAT_DEPENDENCY_DATA_H
 #define PXR_USD_PCP_DYNAMIC_FILE_FORMAT_DEPENDENCY_DATA_H
diff --git a/pxr/usd/pcp/dynamicFileFormatInterface.cpp b/pxr/usd/pcp/dynamicFileFormatInterface.cpp
index 57b59bcb08..c43cc369ae 100644
--- a/pxr/usd/pcp/dynamicFileFormatInterface.cpp
+++ b/pxr/usd/pcp/dynamicFileFormatInterface.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/dynamicFileFormatInterface.h b/pxr/usd/pcp/dynamicFileFormatInterface.h
index 38af716024..c16d70819e 100644
--- a/pxr/usd/pcp/dynamicFileFormatInterface.h
+++ b/pxr/usd/pcp/dynamicFileFormatInterface.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_DYNAMIC_FILE_FORMAT_INTERFACE_H
 #define PXR_USD_PCP_DYNAMIC_FILE_FORMAT_INTERFACE_H
diff --git a/pxr/usd/pcp/errors.cpp b/pxr/usd/pcp/errors.cpp
index 00c72c84c7..65c6a991f8 100644
--- a/pxr/usd/pcp/errors.cpp
+++ b/pxr/usd/pcp/errors.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -207,6 +190,59 @@ PcpErrorArcPermissionDenied::ToString() const
 
 ///////////////////////////////////////////////////////////////////////////////
 
+PcpErrorArcToProhibitedChildPtr
+PcpErrorArcToProhibitedChild::New()
+{
+    return PcpErrorArcToProhibitedChildPtr(
+        new PcpErrorArcToProhibitedChild);
+}
+
+PcpErrorArcToProhibitedChild::PcpErrorArcToProhibitedChild() :
+    PcpErrorBase(PcpErrorType_ArcToProhibitedChild)
+{
+}
+
+PcpErrorArcToProhibitedChild::
+~PcpErrorArcToProhibitedChild()
+{
+}
+
+// virtual
+std::string
+PcpErrorArcToProhibitedChild::ToString() const
+{
+    std::string msg = TfStringPrintf("%s\nCANNOT ", TfStringify(site).c_str());
+    switch(arcType) {
+    case PcpArcTypeInherit:
+        msg += "inherit from:\n";
+        break;
+    case PcpArcTypeRelocate:
+        msg += "be relocated from:\n";
+        break;
+    case PcpArcTypeVariant:
+        msg += "use variant:\n";
+        break;
+    case PcpArcTypeReference:
+        msg += "reference:\n";
+        break;
+    case PcpArcTypePayload:
+        msg += "get payload from:\n";
+        break;
+    default:
+        msg += "refer to:\n";
+        break;
+    }   
+    msg += TfStringPrintf("%s\nwhich is a prohibited child of its parent "
+        "because it would require allowing opinions from the source of a "
+        "relocation at %s.", 
+        TfStringify(targetSite).c_str(),
+        TfStringify(relocationSourceSite).c_str());
+
+    return msg;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 PcpErrorCapacityExceededPtr
 PcpErrorCapacityExceeded::New(PcpErrorType errorType)
 {
diff --git a/pxr/usd/pcp/errors.h b/pxr/usd/pcp/errors.h
index 54443cf26c..3cbb6d101f 100644
--- a/pxr/usd/pcp/errors.h
+++ b/pxr/usd/pcp/errors.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_ERRORS_H
 #define PXR_USD_PCP_ERRORS_H
@@ -45,6 +28,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 enum PcpErrorType {
     PcpErrorType_ArcCycle,
     PcpErrorType_ArcPermissionDenied,
+    PcpErrorType_ArcToProhibitedChild,
     PcpErrorType_IndexCapacityExceeded,
     PcpErrorType_ArcCapacityExceeded,
     PcpErrorType_ArcNamespaceDepthCapacityExceeded,
@@ -166,6 +150,42 @@ class PcpErrorArcPermissionDenied : public PcpErrorBase {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+// Forward declarations:
+class PcpErrorArcToProhibitedChild;
+typedef std::shared_ptr<PcpErrorArcToProhibitedChild> 
+    PcpErrorArcToProhibitedChildPtr;
+
+/// \class PcpErrorArcToProhibitedChild
+///
+/// Arcs that were not made between PcpNodes because the target is a prohibited
+/// child prim of its parent due to relocations.
+///
+class PcpErrorArcToProhibitedChild : public PcpErrorBase {
+public:
+    /// Returns a new error object.
+    static PcpErrorArcToProhibitedChildPtr New();
+    /// Destructor.
+    PCP_API ~PcpErrorArcToProhibitedChild() override;
+    /// Converts error to string message.
+    PCP_API std::string ToString() const override;
+    
+    /// The site where the invalid arc was expressed.
+    PcpSite site;
+    /// The target site of the invalid arc which is a prohibited child.
+    PcpSite targetSite;
+    /// The site of the node under targetSite that is a relocation source in its
+    /// layer stack.
+    PcpSite relocationSourceSite;
+    /// The type of arc.
+    PcpArcType arcType;
+    
+private:
+    /// Constructor is private. Use New() instead.
+    PcpErrorArcToProhibitedChild();
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
 // Forward declarations:
 class PcpErrorCapacityExceeded;
 typedef std::shared_ptr<PcpErrorCapacityExceeded> PcpErrorCapacityExceededPtr;
diff --git a/pxr/usd/pcp/expressionVariables.cpp b/pxr/usd/pcp/expressionVariables.cpp
index 7d9faa3811..e79aced15c 100644
--- a/pxr/usd/pcp/expressionVariables.cpp
+++ b/pxr/usd/pcp/expressionVariables.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/pcp/expressionVariables.h"
diff --git a/pxr/usd/pcp/expressionVariables.h b/pxr/usd/pcp/expressionVariables.h
index a5a3554bcb..fdc23d77f1 100644
--- a/pxr/usd/pcp/expressionVariables.h
+++ b/pxr/usd/pcp/expressionVariables.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_EXPRESSION_VARIABLES_H
 #define PXR_USD_PCP_EXPRESSION_VARIABLES_H
diff --git a/pxr/usd/pcp/expressionVariablesDependencyData.cpp b/pxr/usd/pcp/expressionVariablesDependencyData.cpp
index b1670d02ec..0772c09ec2 100644
--- a/pxr/usd/pcp/expressionVariablesDependencyData.cpp
+++ b/pxr/usd/pcp/expressionVariablesDependencyData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/pcp/expressionVariablesDependencyData.h"
diff --git a/pxr/usd/pcp/expressionVariablesDependencyData.h b/pxr/usd/pcp/expressionVariablesDependencyData.h
index e350963950..a69a1c8475 100644
--- a/pxr/usd/pcp/expressionVariablesDependencyData.h
+++ b/pxr/usd/pcp/expressionVariablesDependencyData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_EXPRESSION_VARIABLES_DEPENDENCY_DATA_H
 #define PXR_USD_PCP_EXPRESSION_VARIABLES_DEPENDENCY_DATA_H
diff --git a/pxr/usd/pcp/expressionVariablesSource.cpp b/pxr/usd/pcp/expressionVariablesSource.cpp
index f7d9a1a3e9..91b644db20 100644
--- a/pxr/usd/pcp/expressionVariablesSource.cpp
+++ b/pxr/usd/pcp/expressionVariablesSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/pcp/expressionVariablesSource.h"
diff --git a/pxr/usd/pcp/expressionVariablesSource.h b/pxr/usd/pcp/expressionVariablesSource.h
index f85cb94121..b4d78fbe5f 100644
--- a/pxr/usd/pcp/expressionVariablesSource.h
+++ b/pxr/usd/pcp/expressionVariablesSource.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_EXPRESSION_VARIABLES_SOURCE_H
 #define PXR_USD_PCP_EXPRESSION_VARIABLES_SOURCE_H
diff --git a/pxr/usd/pcp/instanceKey.cpp b/pxr/usd/pcp/instanceKey.cpp
index f73fb587d2..9cc663cbbc 100644
--- a/pxr/usd/pcp/instanceKey.cpp
+++ b/pxr/usd/pcp/instanceKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/instanceKey.h b/pxr/usd/pcp/instanceKey.h
index ec05701ea9..21bb4656bf 100644
--- a/pxr/usd/pcp/instanceKey.h
+++ b/pxr/usd/pcp/instanceKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_INSTANCE_KEY_H
 #define PXR_USD_PCP_INSTANCE_KEY_H
diff --git a/pxr/usd/pcp/instancing.cpp b/pxr/usd/pcp/instancing.cpp
index 4717fed2a1..17ece2adde 100644
--- a/pxr/usd/pcp/instancing.cpp
+++ b/pxr/usd/pcp/instancing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/pcp/instancing.h"
diff --git a/pxr/usd/pcp/instancing.h b/pxr/usd/pcp/instancing.h
index fdc31ccf50..b345b8edac 100644
--- a/pxr/usd/pcp/instancing.h
+++ b/pxr/usd/pcp/instancing.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_INSTANCING_H
 #define PXR_USD_PCP_INSTANCING_H
diff --git a/pxr/usd/pcp/iterator.cpp b/pxr/usd/pcp/iterator.cpp
index f5bd95c9bb..12acedc5a0 100644
--- a/pxr/usd/pcp/iterator.cpp
+++ b/pxr/usd/pcp/iterator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/iterator.h b/pxr/usd/pcp/iterator.h
index 6681fa057b..eaee977786 100644
--- a/pxr/usd/pcp/iterator.h
+++ b/pxr/usd/pcp/iterator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_ITERATOR_H
 #define PXR_USD_PCP_ITERATOR_H
diff --git a/pxr/usd/pcp/layerRelocatesEditBuilder.cpp b/pxr/usd/pcp/layerRelocatesEditBuilder.cpp
new file mode 100644
index 0000000000..f96dab0e1e
--- /dev/null
+++ b/pxr/usd/pcp/layerRelocatesEditBuilder.cpp
@@ -0,0 +1,466 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "pxr/pxr.h"
+#include "pxr/usd/pcp/layerRelocatesEditBuilder.h"
+#include "pxr/usd/pcp/layerStack.h"
+#include "pxr/usd/sdf/layer.h"
+
+#include <unordered_set>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+PcpLayerRelocatesEditBuilder::PcpLayerRelocatesEditBuilder(
+    const PcpLayerStackPtr &layerStack,
+    const SdfLayerHandle &addNewRelocatesLayer)
+{
+    if (!layerStack) {
+        TF_CODING_ERROR("No layer stack provided to relocates edit builder.");
+        return;
+    }
+
+    // If a layer for adding new relocates is not specified we use the layer 
+    // stack's root layer for any new relocates.
+    const SdfLayerHandle newRelocatesLayer =  addNewRelocatesLayer ? 
+        addNewRelocatesLayer : layerStack->GetIdentifier().rootLayer;
+
+    if (!layerStack->HasLayer(newRelocatesLayer)) {
+        TF_CODING_ERROR("The layer for adding new relocates does not belong to "
+            "the layer stack.");
+        return;
+    }
+
+    // Get the authored layer relocates for each layer in the layer stack so we
+    // can keep track of all the layer metadata edits that would need to be 
+    // performed to udpate the layer stack's relocates.
+    for (const auto &layer: layerStack->GetLayers()) {
+
+        SdfRelocates layerRelocates;
+        const bool layerHasRelocates = layer->HasField(
+            SdfPath::AbsoluteRootPath(), SdfFieldKeys->LayerRelocates, 
+            &layerRelocates);
+ 
+        // We skip layers that dont have any relocates unless the layer is
+        // the layer specified for adding new relocates.
+        if (layer == newRelocatesLayer) {
+            // If this layer is where new relocates will be added, store 
+            // what its index will be so we can find it later.
+            _editForNewRelocatesIndex = _layerRelocatesEdits.size();
+        } else if (!layerHasRelocates) {
+            continue;
+        }
+
+        _layerRelocatesEdits.emplace_back(layer, std::move(layerRelocates));
+    }
+
+    if (!TF_VERIFY(_editForNewRelocatesIndex < _layerRelocatesEdits.size())) {
+        // Clear layer relocates if we fail this verify to simplify other 
+        // checks.
+        _layerRelocatesEdits.clear();
+    }
+
+    // Build and cache the relocates map immediately from layer stack layers
+    // so we can collect any relocates errors in the current layer stack. We
+    // update the layers edits to remove the error causing relocates here so 
+    // that even if no new relocates are added, applying the current edits 
+    // will produce a layer stack with no relocates errors.
+    SdfRelocatesMap relocatesMap;
+    PcpErrorVector errors;
+    Pcp_BuildRelocateMap(_layerRelocatesEdits, &relocatesMap, &errors);
+    _relocatesMap = std::move(relocatesMap);
+
+    // Note that this only has to be done once in the constructor as all calls
+    // to Relocate will maintain relocates edits that produce no errors.
+    _RemoveRelocatesWithErrors(errors);
+}
+
+void 
+PcpLayerRelocatesEditBuilder::_RemoveRelocatesWithErrors(
+    const PcpErrorVector &errors)
+{
+    using PathSet = std::unordered_set<SdfPath, TfHash>;
+    using RelocateSet = std::unordered_set<SdfRelocate, TfHash>;
+    using LayerToRelocateSetMap = std::map<SdfLayerHandle, RelocateSet>;
+
+    if (errors.empty()) {
+        return;
+    }
+
+    PathSet relocateSourcePathsToDelete;
+    LayerToRelocateSetMap relocatesToDeletePerLayer;
+
+    // There are a few different types of relocation errors. The type determines
+    // how we handle fixing the error.
+    for (const auto &error : errors) {
+        if (error->errorType == PcpErrorType_InvalidAuthoredRelocation) {
+            // Authored relocation errors are for relocate entries that will
+            // always be invalid in any context. These relocates are marked
+            // to be deleted from their layers.
+            const auto *err =
+                static_cast<const PcpErrorInvalidAuthoredRelocation *>(
+                    error.get());
+            relocatesToDeletePerLayer[err->layer].emplace(
+                err->sourcePath, err->targetPath);
+        } else if (error->errorType == PcpErrorType_InvalidConflictingRelocation) {
+            // A conflicting relocate is invalid in the context of other 
+            // relocates. To clear these we have to remove any relocate that 
+            // uses source path from any layer. This is to ensure that deleting
+            // the invalid relocate from one layer will not make a relocate with
+            // same source from different layer (that could potentially be 
+            // valid) now pop through, changing the value of the computed 
+            // relocates map.
+            const auto *err =
+                static_cast<const PcpErrorInvalidConflictingRelocation *>(
+                    error.get());
+            relocateSourcePathsToDelete.insert(err->sourcePath);
+        } else if (error->errorType == PcpErrorType_InvalidSameTargetRelocations) {
+            // Invalid same target relocate errors are similar to the 
+            // conflicting relocate error, except it instead holds multiple 
+            // source paths. We have to remove all relocates using all sources
+            // in the error for the same reason as the conflicting relocate
+            // error case.
+            const PcpErrorInvalidSameTargetRelocations *err =
+                static_cast<const PcpErrorInvalidSameTargetRelocations *>(
+                    error.get());
+            for (const auto &source : err->sources) {
+                relocateSourcePathsToDelete.insert(source.sourcePath);
+            }
+        } else {
+            TF_CODING_ERROR("Unexpected error type: %s", 
+            TfStringify(TfEnum(error->errorType)).c_str());
+        };
+    }
+
+    // If there are any relocates to delete from individual layers, we do that 
+    // first.
+    if (!relocatesToDeletePerLayer.empty()) {
+        for (auto &[layer, relocates] : _layerRelocatesEdits ) {
+            // Skip if there are no relocates to delete for this layer
+            const RelocateSet *relocatesToDelete = 
+                TfMapLookupPtr(relocatesToDeletePerLayer, layer);
+            if (!relocatesToDelete) {
+                continue;
+            }
+
+            // Otherwise mark that this layer has relocates changes and remove
+            // the invalid relocates from the edited value.
+            _layersWithRelocatesChanges.insert(layer);
+            relocates.erase(
+                std::remove_if(relocates.begin(), relocates.end(),
+                    [&](const auto &relocate) { 
+                        return relocatesToDelete->count(relocate);
+                    }),
+                relocates.end());
+        }
+    }
+
+    // If there any relocate sources to delete, do those now too.
+    if (!relocateSourcePathsToDelete.empty()) {
+        for (auto &[layer, relocates] : _layerRelocatesEdits ) {
+            // Remove any relocate entries in relocates value that use as source
+            // path that needs to be deleted.
+            const auto eraseIt = 
+                std::remove_if(relocates.begin(), relocates.end(),
+                    [&](const auto &relocate) { 
+                        return relocateSourcePathsToDelete.count(relocate.first);
+                    });
+            // If we removed entries, erase them and mark the layer as having
+            // changes.
+            if (eraseIt != relocates.end()) {
+                _layersWithRelocatesChanges.insert(layer);
+                relocates.erase(eraseIt, relocates.end());
+            }
+        }
+    }
+}
+
+const SdfRelocatesMap &
+PcpLayerRelocatesEditBuilder::GetEditedRelocatesMap() const {
+    // Only rebuild the map if needed.
+    if (!_relocatesMap) {
+        SdfRelocatesMap relocatesMap;
+        PcpErrorVector errors;
+        Pcp_BuildRelocateMap(_layerRelocatesEdits, &relocatesMap, &errors);
+        // The layer relocates edits are maintained such that they never produce
+        // errors when used to build a relocates map for the layer stack. 
+        // Verify that here to catch any possible mistakes in maintaining this
+        // invariant.
+        TF_VERIFY(errors.empty());
+        _relocatesMap = std::move(relocatesMap);       
+    }
+    return *_relocatesMap;
+}
+
+template <typename... Args>
+static void _PrintToWhyNot(
+    std::string *whyNot,
+    const SdfPath &source, const SdfPath &target,
+    const char *format, Args... args)
+{
+    if (!whyNot) {
+        return;
+    }
+    *whyNot = 
+        TfStringPrintf("Cannot relocate <%s> to <%s>: ",
+            source.GetText(), target.GetText()) +
+        TfStringPrintf(format, args...);
+}
+
+static bool 
+_ValidateAgainstExistingRelocate(
+    const SdfPath &newSource, const SdfPath &newTarget,
+    const SdfPath &existingSource, const SdfPath &existingTarget,
+    std::string *whyNot)
+{
+    // Cannot relocate a descendant of a path that is already the source 
+    // of an existing relocate.
+    if (newSource.HasPrefix(existingSource)) {
+        _PrintToWhyNot(whyNot, newSource, newTarget,
+            "A relocate from <%s> to <%s> already exists; neither the "
+            "source <%s> nor any of its descendants can be relocated again "
+            "using their original paths.", 
+            existingSource.GetText(),
+            existingTarget.GetText(),
+            existingSource.GetText());
+        return false;
+    }
+
+    // If the target is empty, we're good after validating the source path.
+    if (newTarget.IsEmpty()) {
+        return true;
+    }
+
+    // Cannot relocate to an existing relocate's target again. E.g. if a 
+    // relocate from <A> -> <B> already exists, we cannot add a relocate 
+    // from <C> -> <B>.
+    if (newTarget == existingTarget) {
+        _PrintToWhyNot(whyNot, newSource, newTarget,
+            "A relocate from <%s> to <%s> already exists and the same "
+            "target cannot be relocated to again.", 
+            existingSource.GetText(),
+            existingTarget.GetText());
+        return false;
+    }
+
+    // The target of a relocate cannot be a prim, or a descendant of a prim,
+    // that has been itself relocated with one notable exception: a 
+    // directly relocated prim can be relocated back to its immediate 
+    // source effectively deleting the relocate.
+    //
+    // So, for example, if /A/B is relocated to /A/C, no other prim except 
+    // /A/C can be relocated to /A/B or any descendant path of /A/B as the 
+    // namespace hierarchy starting at /A/B is a tombstone. But /A/C itself
+    // can be relocated back to /A/B which has the effect of "unrelocating"
+    // /A/B.
+    if (newTarget.HasPrefix(existingSource)) {
+        if (newTarget != existingSource) {
+            _PrintToWhyNot(whyNot, newSource, newTarget,
+                "Cannot relocate a prim to be a descendant of <%s> which "
+                "is already relocated to <%s>.", 
+                existingSource.GetText(),
+                existingTarget.GetText());
+            return false;
+        } 
+
+        if (newSource != existingTarget) {
+            _PrintToWhyNot(whyNot, newSource, newTarget,
+                "The target of the relocate is the same as the source of "
+                "an existing relocate from <%s> to <%s>; the only prim "
+                "that can be relocated to <%s> is the existing relocate's "
+                "target <%s>, which will remove the relocate.", 
+                existingSource.GetText(),
+                existingTarget.GetText(),
+                existingSource.GetText(),
+                existingTarget.GetText());
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void 
+PcpLayerRelocatesEditBuilder::_UpdateExistingRelocates(
+    const SdfPath &source, const SdfPath &target)
+{
+    // For each layer with relocates entries update all of them that need to 
+    // have their source or target paths ancestrally relocated by the new 
+    // relocate.
+    for (auto &[layer, relocates] : _layerRelocatesEdits ) {
+        
+        for (auto &[existingSource, existingTarget] : relocates) {
+            // If the existing relocate source would be ancestrally relocated by
+            // the new relocate, apply the relocate to it.
+            if (existingSource.HasPrefix(source)) {
+                existingSource = 
+                    existingSource.ReplacePrefix(source, target);
+                _layersWithRelocatesChanges.insert(layer);
+            }
+            // If the existing target source would be ancestrally relocated by
+            // the new relocate, apply the relocate to it.
+            if (existingTarget.HasPrefix(source)) {
+                existingTarget = 
+                    existingTarget.ReplacePrefix(source, target);
+                _layersWithRelocatesChanges.insert(layer);
+            }
+        }
+
+        // Applying the new relocate to the existing relocates can cause any 
+        // number of them to map a source path to itself, making them redundant
+        // no-ops. These cases are effectively a relocate delete so we remove
+        // these relocates from the layer's relocates list.
+        relocates.erase(
+            std::remove_if(relocates.begin(), relocates.end(),
+                [](const auto &relocate) { 
+                    return relocate.first == relocate.second;
+                }),
+            relocates.end());
+    }
+}
+
+bool
+PcpLayerRelocatesEditBuilder::Relocate(
+    const SdfPath &newSource, 
+    const SdfPath &newTarget, 
+    std::string *whyNot)
+{
+    if (_layerRelocatesEdits.empty()) {
+        TF_CODING_ERROR("Relocates edit builder is invalid");
+        return false;
+    }
+
+    // Validate the that this source and target pair is a valid relocate period.
+    std::string reason;
+    if (!Pcp_IsValidRelocatesEntry(newSource, newTarget, &reason)) {
+        _PrintToWhyNot(whyNot, newSource, newTarget, "%s", reason.c_str());
+        return false;
+    }
+
+    // Validate that we can add this relocate given all the current relocates on
+    // the layer stack. This loop will also determine whether the new relocate 
+    // entry needs to be added or if only updates to existing relocates are 
+    // needed.
+    bool addNewRelocate = true;
+    for (auto &existingRelocate : GetEditedRelocatesMap()) {
+        const SdfPath &existingSource = existingRelocate.first;
+        const SdfPath &existingTarget = existingRelocate.second;
+
+        if (!_ValidateAgainstExistingRelocate(
+                newSource, newTarget, existingSource, existingTarget, whyNot)) {
+            return false;
+        }
+
+        // We will add a new relocate entry unless the new relocate is moving 
+        // an existing relocate's target. In that case we only want to update
+        // the existing relocate to use the new target path.
+        // E.g. We already already have a relocate from </Root/A> -> </Root/B> 
+        // and we go to add a new relocate from </Root/B> -> </Root/C>. In this
+        // case the existing relocate will be changed to </Root/A> -> </Root/C>
+        // and we cannot add </Root/B> -> </Root/C> itself as that would be a
+        // conflict with the existing relocate (both would have the same target)
+        if (newSource == existingTarget) {
+            addNewRelocate = false;
+        }
+    }
+
+    // One last validation: if this would result in adding a new relocate entry
+    // we have to make sure the source is not a root prim as that is invalid in
+    // the layer stack. We can't filter out root prim sources before this point
+    // as we allow root prims that are already targets of relocates to be 
+    // re-relocated through this method.
+    if (addNewRelocate && newSource.IsRootPrimPath()) {
+        _PrintToWhyNot(whyNot, newSource, newTarget,
+            "Adding a relocate from <%s> would result in a root prim "
+            "being relocated.", newSource.GetText());
+        return false;
+    }
+
+    // Update existing relocates to account for how this new relocation will 
+    // change their paths.
+    _UpdateExistingRelocates(newSource, newTarget);
+
+    // Always add the new relocate after updating existing relocates so we don't
+    // end up updating it to be relocated by itself.
+    if (addNewRelocate) {
+        // New relocates entries added to a specified layer for for this 
+        // builder.
+        LayerRelocatesEdit &layerRelocatesEdit = 
+            _layerRelocatesEdits[_editForNewRelocatesIndex];
+        layerRelocatesEdit.second.emplace_back(newSource, newTarget);
+        _layersWithRelocatesChanges.insert(layerRelocatesEdit.first);
+    }
+
+    // The relocate was added successfully so the relocates map will need to be
+    // recomputed the next time it's needed.
+    _relocatesMap.reset();
+
+    return true;
+}
+
+bool 
+PcpLayerRelocatesEditBuilder::RemoveRelocate(
+    const SdfPath &sourcePath,
+    std::string *whyNot)
+{
+    const auto &relocatesMap = GetEditedRelocatesMap();
+    auto it = relocatesMap.find(sourcePath);
+    if (it == relocatesMap.end()) {
+        if (whyNot) {
+            *whyNot = TfStringPrintf("Cannot remove relocate for source path "
+                "<%s>: No relocate with the source path found.",
+                sourcePath.GetText());
+            return false;
+        }
+    }
+
+    const SdfPath &targetPath = it->second;
+    if (targetPath.IsEmpty()) {
+        // If this the target path of the existing relocate is empty, we had a
+        // "deletion" relocate. To remove it we just have to delete any 
+        // relocates entries in any layer that use the source path.
+        for (auto &[layer, relocates] : _layerRelocatesEdits ) {
+            auto removeIt = std::remove_if(relocates.begin(), relocates.end(),
+                [&](const auto &relocate) { 
+                    return relocate.first == sourcePath;
+                });
+            if (removeIt != relocates.end()) {
+                _layersWithRelocatesChanges.insert(layer);
+                relocates.erase(removeIt, relocates.end());
+            }
+        }
+    } else {
+        // Update existing relocates as if we have relocated the target path 
+        // back to the source path in order to account for how removing this
+        // relocation will change their paths. Note that this call will handle
+        // removing the existing relocate itself. Also note that we do not have
+        // to do any validation of the source and target paths as their presence
+        // in the relocates map already assures the validity of this call.
+        _UpdateExistingRelocates(targetPath, sourcePath);
+    }
+
+    // The relocates were updated so the relocates map will need to be
+    // recomputed the next time it's needed.
+    _relocatesMap.reset();
+
+    return true;
+}
+
+PcpLayerRelocatesEditBuilder::LayerRelocatesEdits
+PcpLayerRelocatesEditBuilder::GetEdits() const
+{
+    std::vector<PcpLayerRelocatesEditBuilder::LayerRelocatesEdit> result;
+    result.reserve(_layersWithRelocatesChanges.size());
+    for (const auto &edit : _layerRelocatesEdits) {
+        // Filter out layers that won't have changes to their original 
+        // relocates values.
+        if (_layersWithRelocatesChanges.count(edit.first)) {
+            result.push_back(edit);
+        }
+    }
+    return result;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/pcp/layerRelocatesEditBuilder.h b/pxr/usd/pcp/layerRelocatesEditBuilder.h
new file mode 100644
index 0000000000..8c1c23e634
--- /dev/null
+++ b/pxr/usd/pcp/layerRelocatesEditBuilder.h
@@ -0,0 +1,198 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_USD_PCP_LAYER_RELOCATES_EDIT_BUILDER_H
+#define PXR_USD_PCP_LAYER_RELOCATES_EDIT_BUILDER_H
+
+/// \file pcp/layerRelocatesEditBuilder.h
+
+#include "pxr/pxr.h"
+#include "pxr/usd/pcp/api.h"
+#include "pxr/usd/pcp/errors.h"
+#include "pxr/usd/sdf/declareHandles.h"
+#include "pxr/usd/sdf/path.h"
+#include "pxr/usd/sdf/types.h"
+#include "pxr/base/tf/declarePtrs.h"
+
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+SDF_DECLARE_HANDLES(SdfLayer);
+TF_DECLARE_WEAK_PTRS(PcpLayerStack);
+
+/// \class PcpLayerRelocatesEditBuilder
+/// 
+/// Utility class for building up a map of valid relocates and producing
+/// the layer metadata edits that can be performed to set these relocates on a 
+/// layer stack.
+///
+/// This class must be constructed from an existing PcpLayerStack which will
+/// initialize the edit builder with the layer stack's current relocates. Then 
+/// Relocate can be called any number of times to build a validly formatted map 
+/// of edited relocates. This can then be asked for a list of layer metadata
+/// edits that need to be performed to update the layer stack to have the edited
+/// relocates.
+/// 
+/// This class is not stateful in regards to the layer stack or its layers. In
+/// other words, the provided layer stack is only used to initialize the 
+/// existing relocates and to get which layers should be the layers to edit.
+/// This does not listen to any change notifications for the layers or the layer
+/// stack or the PcpCache that built it. This is class is meant to be 
+/// transiently used to build up a set of edits to perform on layers and then 
+/// discarded.
+class PcpLayerRelocatesEditBuilder {
+public:
+
+    /// Constructor that initializes the relocates map from the given 
+    /// \p layerStack. 
+    ///
+    /// If \p addNewRelocatesLayer is provided, it must be a layer in the given 
+    /// layer stack and any new relocates map entries created by calls to
+    /// Relocate will be added as part of the edit for that layer. If 
+    /// \p addNewRelocatesLayer is not provided, then the layer stack's root 
+    /// layer will be used as the target edit location for new relocates.
+    ///
+    PCP_API
+    PcpLayerRelocatesEditBuilder(
+        const PcpLayerStackPtr &layerStack,
+        const SdfLayerHandle &addNewRelocatesLayer = nullptr);
+
+    /// Updates the relocates map and layer edits so that \p sourcePath is moved
+    /// to \p targetPath in the edited relocates.
+    ///
+    /// Returns true if the relocate can be performed given the source and 
+    /// target and current relocates map. Returns false and populates \p whyNot,
+    /// (if it's not nullptr) with the reason why if the relocate cannot be
+    /// performed.
+    ///
+    /// The edited relocates map will always conform to the relocates format 
+    /// that is considered valid by the layer stack population and will 
+    /// therefore not produce relocation errors when set as the layer stack's 
+    /// authored relocates. Maintaining this format means that calling Relocate 
+    /// can a cause a combination of different effects on the relocates map 
+    /// depending the existing relocates at the time. These effects can include
+    /// adding a new relocate entry, updating paths in existing entries, and 
+    /// deleting existing entries. The following examples demonstrate many of 
+    /// these behaviors.
+    /// 
+    /// Example 1:
+    /// Existing relocates:
+    ///   - </Root/A> -> </Root/B>
+    /// Relocate(</Root/C>, </Root/D>) 
+    ///   - Just adds a new relocate
+    /// Result relocates:
+    ///   - </Root/A> -> </Root/B>
+    ///   - </Root/C> -> </Root/D>
+    ///
+    /// Example 2:
+    /// Existing relocates:
+    ///   - </Root/A> -> </Root/B>
+    /// Relocate(</Root/B>, </Root/C>) 
+    ///   - Updates existing relocate to point to </Root/C>
+    /// Result relocates:
+    ///   - </Root/A> -> </Root/C>
+    ///
+    /// Example 3:
+    /// Existing relocates:
+    ///   - </Root/A/Y> -> </Root/B/Y>
+    ///   - </Root/A/X> -> </Root/B/X>
+    /// Relocate(</Root/A>, </Root/B>) 
+    ///   - Adds a new relocate but removes the existing relocates which become
+    ///     redundant with their parents relocated.
+    /// Result relocates:
+    ///   - </Root/A> -> </Root/B>
+    ///
+    /// Example 4:
+    /// Existing relocates:
+    ///   - </Root/A/B> -> </Root/A/C>
+    ///   - </Root/A/D> -> </Root/D>
+    ///   - </Root/E> -> </Root/A/E>
+    /// Relocate(</Root/A>, </Root/Z>) 
+    ///   - Adds a new relocate and updates any existing relocates so that
+    ///     their source and target paths are ancestrally relocated by the new
+    ///     relocate.
+    /// Result relocates:
+    ///   - </Root/A> -> </Root/Z>
+    ///   - </Root/Z/B> -> </Root/Z/C>
+    ///   - </Root/Z/D> -> </Root/D>
+    ///   - </Root/E> -> </Root/Z/E>
+    ///
+    /// Example 5:
+    /// Existing relocates:
+    ///   - </Root/A> -> </Root/B>
+    /// Relocate(</Root/B>, </Root/A>) 
+    ///   - Deletes the relocate that has been moved back to its original 
+    ///     source. This is equivalent to calling RemoveRelocate(</Root/A>)
+    /// Result relocates:
+    ///   - none
+    ///
+    PCP_API
+    bool Relocate(
+        const SdfPath &sourcePath, 
+        const SdfPath &targetPath, 
+        std::string *whyNot = nullptr);
+
+    /// Updates the relocates map and layer edits so that the relocate with 
+    /// \p sourcePath is removed from the edited relocates.
+    ///
+    /// Returns true if a relocate with the given source path exists in the
+    /// current relocates map and can be removed. Returns false and populates
+    /// \p whyNot, (if it's not nullptr) with the reason why if not.
+    ///
+    /// Like the Relocate method, calling this function will maintain the 
+    /// validity of relocates map and may update or delete other existing
+    /// relocates entries, in addition to the entry with the input source path,
+    /// to do so.
+    /// 
+    PCP_API
+    bool RemoveRelocate(
+        const SdfPath &sourcePath,
+        std::string *whyNot = nullptr);
+
+    /// An edit is a layer and an SdfRelocates value to set in the layer's 
+    /// 'layerRelocates' metatdata.
+    using LayerRelocatesEdit = std::pair<SdfLayerHandle, SdfRelocates>;
+
+    /// List of relocates edits to perform on all layers.
+    using LayerRelocatesEdits = std::vector<LayerRelocatesEdit>;
+
+    /// Returns a list of edits to perform on the layers of the layer stack this
+    /// builder was initialized with that will update the layer stack to have
+    /// the relocates returned by GetEditedRelocatesMap.
+    ///
+    /// The format of each edit is a pair consisting of a layer and an 
+    /// SdfRelocates value. To perform each edit, set the 'layerRelocates' 
+    /// field in the layer's metadata to be the new relocates value.
+    /// For example:
+    /// \code
+    /// for (const auto &[layer, relocates] : relocatesEditBuilder.GetEdits()) {
+    ///     layer->SetRelocates(relocates);
+    /// }
+    /// \endcode
+    PCP_API
+    LayerRelocatesEdits GetEdits() const;
+
+    /// Returns a map of relocates composed from the edited layer relocates. 
+    PCP_API
+    const SdfRelocatesMap &GetEditedRelocatesMap() const;
+
+private:
+    void _UpdateExistingRelocates(
+        const SdfPath &source, const SdfPath &target);
+
+    void _RemoveRelocatesWithErrors(const PcpErrorVector &errors);
+
+    mutable std::optional<SdfRelocatesMap> _relocatesMap;
+
+    LayerRelocatesEdits _layerRelocatesEdits;
+    SdfLayerHandleSet _layersWithRelocatesChanges;
+    size_t _editForNewRelocatesIndex = ~0;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_USD_PCP_LAYER_RELOCATES_EDIT_BUILDER_H
diff --git a/pxr/usd/pcp/layerStack.cpp b/pxr/usd/pcp/layerStack.cpp
index be3f2902d1..fc16312f7b 100644
--- a/pxr/usd/pcp/layerStack.cpp
+++ b/pxr/usd/pcp/layerStack.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // \file LayerStack.cpp
 
@@ -184,19 +167,19 @@ _ApplyOwnedSublayerOrder(
     }
 }
 
-namespace {
-
-// Checks if the source and target paths constitute a valid relocates. This
-// validation is not context specific, i.e. if this returns false, the 
-// combination of sourse and target paths is always invalid in any layer.
-static bool
-_IsValidRelocatesEntry(
+bool
+Pcp_IsValidRelocatesEntry(
     const SdfPath &source, const SdfPath &target, std::string *errorMessage) 
 {
     auto isValidPathFn = [&](SdfPath const& path) {
         // The SdfSchema should already enforce that these are valid paths for 
         // relocates, however we still double-check here to avoid problematic 
         // results under composition.
+        if (!path.IsAbsolutePath()) {
+            *errorMessage = "Relocates must use absolute paths.";
+            return false;
+        }
+
         if (!path.IsPrimPath()) {
             // Prim variant selection paths are not prim paths, but it's more
             // important to report the that the variant selection is the issue
@@ -214,18 +197,28 @@ _IsValidRelocatesEntry(
             return false;
         }
 
-        // This is not enforced by the Sdf Schema but is still not allowed
-        if (path.IsRootPrimPath()) {
-            *errorMessage = 
-                "Root prims cannot be the source or target of a relocate.";
-            return false;
-        }
-
         return true;
     };
 
-    // The source and target must be valid relocates paths.
-    if (!isValidPathFn(source) || !isValidPathFn(target)) {
+    // Source paths cannot be empty though targets can.
+    if (source.IsEmpty()) {
+        *errorMessage = "Relocates source paths cannot be empty.";
+        return false;
+    }
+
+    // The source must be a valid prim path.
+    if (!isValidPathFn(source)) {
+        return false;
+    }
+
+    // Empty target paths are allowed and if the target is empty, we're done.
+    if (target.IsEmpty()) {
+        return true;
+    }
+
+    // Otherwise the target must be a valid prim path and we have to validate
+    // it against the source.
+    if (!isValidPathFn(target)) {
         return false;
     }
 
@@ -247,26 +240,19 @@ _IsValidRelocatesEntry(
         return false;
     }
 
-    if (source.GetCommonPrefix(target).IsAbsoluteRootPath()) {
-        *errorMessage = 
-            "Prims cannot be relocated to be a descendant of a different "
-            "root prim.";
-        return false;
-    }
-
     return true;
 }
 
+namespace {
+
 // Helper class for Pcp_ComputeRelocationsForLayerStack for gathering and 
 // validating relocates for a layer stack.
 class Pcp_ComputeRelocationsForLayerStackWorkspace {
     
 public:
 
-    Pcp_ComputeRelocationsForLayerStackWorkspace(
-        const PcpLayerStack *layerStack) :
-        _layerStack(layerStack) {};
-
+    Pcp_ComputeRelocationsForLayerStackWorkspace() = default;
+    
     // Public members; running Compute on the workspace populates these
     
     // Value type for the map of processed relocates, which will map authored
@@ -310,11 +296,14 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
     // Computes all the relocates populating the public members of this 
     // workspace.
     void 
-    Compute() 
+    Compute(const PcpLayerStack &layerStack) 
     {
         TRACE_FUNCTION();
 
-        const SdfLayerRefPtrVector & layers = _layerStack->GetLayers();
+        _layerStack = &layerStack;
+        _isUsd = layerStack.IsUsd();
+
+        const SdfLayerRefPtrVector & layers = layerStack.GetLayers();
 
         // Compose the authored relocations from each layer.
         for (const SdfLayerRefPtr &layer : layers) {
@@ -329,6 +318,31 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
         for (auto &mapEntry : processedRelocates) {
             _ComputeSourceOriginForTargetIfNeeded(&mapEntry);
         }
+
+        _ConformLegacyRelocates();
+    }
+
+    void 
+    Compute(const std::vector<std::pair<SdfLayerHandle, SdfRelocates>> &layerRelocates) 
+    {
+        TRACE_FUNCTION();
+
+        _layerStack = nullptr;
+        _isUsd = true;
+
+        // Compose the authored relocations from each layer.
+        for (const auto &[layer, relocates] : layerRelocates) {
+            _CollectRelocates(layer, SdfPath::AbsoluteRootPath(), relocates);
+        }
+
+        _ValidateAndRemoveConflictingRelocates();
+
+        // Compute the source origin for each valid relocate. This function may
+        // recurse for ancestral opinions so this will only compute each if 
+        // necessary.
+        for (auto &mapEntry : processedRelocates) {
+            _ComputeSourceOriginForTargetIfNeeded(&mapEntry);
+        }
     }
 
 private:
@@ -349,7 +363,7 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
         // layer metadata relocates usurp any relocates otherwise authored on
         // prims so we skip the full traversal of namespace for relocates if 
         // we found layer metadata or are in USD mode.
-        if (_CollectLayerRelocates(layer) || _layerStack->IsUsd()) {
+        if (_CollectLayerRelocates(layer) || _isUsd) {
             return;
         }
 
@@ -380,6 +394,29 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
         }
     }
 
+    // Pcp_IsValidRelocatesEntry is used for validating relocates both when 
+    // composing and when attempting to edit relocates. We have additional
+    // restrictions when composing relocates.
+    static bool 
+    _IsValidRelocatesEntryForComposing(
+        const SdfPath &source, const SdfPath &target, std::string *errorMessage)
+    {
+        if (!Pcp_IsValidRelocatesEntry(source, target, errorMessage)) {
+            return false;
+        }
+
+        // Root prims are never allowed to be the source of a relocate as their 
+        // parent is the pseudoroot which can never have composition arcs. The 
+        // target can be a root prim however.
+        if (source.IsRootPrimPath()) {
+            *errorMessage = 
+                "Root prims cannot be the source of a relocate.";
+            return false;
+        }
+
+        return true;
+    }
+
     template <class RelocatesType>
     void
     _CollectRelocates(
@@ -399,7 +436,8 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
             // Validate the relocate in context of just itself and add to
             // the processed relocates or log an error.
             std::string errorMessage;
-            if (_IsValidRelocatesEntry(source, target, &errorMessage)) {
+            if (_IsValidRelocatesEntryForComposing(
+                    source, target, &errorMessage)) {
                 // It's not an error for this to fail to be added; it just 
                 // means a stronger relocate for the source path as been 
                 // added already.
@@ -409,10 +447,7 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
             } else {
                 PcpErrorInvalidAuthoredRelocationPtr err = 
                     PcpErrorInvalidAuthoredRelocation::New();
-                err->rootSite = PcpSite(
-                    _layerStack->GetIdentifier(), 
-                    SdfPath::AbsoluteRootPath());
-
+                err->rootSite = _GetErrorRootSite();
                 err->layer = layer;
                 err->owningPath = primPath;
                 err->sourcePath = std::move(source);
@@ -453,6 +488,114 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
         return true;
     }
 
+    // XXX: There are non-USD use cases that rely on the fact that we 
+    // allowed the source of relocates statement to be expressed as either
+    // a fully unrelocated path or a partially or fully relocated path (due
+    // to ancestral relocates). For example if a relocate from 
+    // /Prim/Foo -> /Prim/Bar exists, a rename of Foo's child prim A could
+    // expressed as either 
+    //      /Prim/Foo/A -> /Prim/Bar/B
+    //   or /Prim/Bar/A -> /Prim/Bar/B
+    //
+    // In USD relocates, this would only be expressable using the latter 
+    // /Prim/Bar/A -> /Prim/Bar/B. Furthermore, an upcoming change will 
+    // actually cause /Prim/Foo/A -> /Prim/Bar/B to have a completely 
+    // different meaning and composition result than relocating from 
+    // /Prim/Bar/A. So in order to maintain legacy behavior when these 
+    // changes come online, we need to to convert unrelocated source paths
+    // to be instead the "most ancestrally relocated" source path here.
+    //
+    // This behavior is not meant to be long-term; this a placeholder 
+    // solution until we can update existing assets to conform to USD
+    // relocates requirements. At that point we'll remove this legacy 
+    // behavior.
+    void
+    _ConformLegacyRelocates()
+    {
+        if (_isUsd || !TfGetEnvSetting(PCP_ENABLE_LEGACY_RELOCATES_BEHAVIOR)) {
+            return;
+        }
+
+        TRACE_FUNCTION();
+
+        // We're building a list of relocation source path that need be updated
+        // which means they will moved in the map.
+        std::vector<std::pair<SdfPath, SdfPath>> relocateSourcesToMove;
+
+        for (const auto &[source, reloInfo] : processedRelocates) {
+
+            // We're looking at the computed source origin of each relocate as 
+            // that will be consistent regardless of the how the authored 
+            // relocate is represented. And we start with the parent path of
+            // the origin source as we want closest relocate that moves our 
+            // origin source path that isn't this relocate itself.
+            const SdfPath sourceOriginParent = 
+                reloInfo.computedSourceOrigin.GetParentPath();
+
+            // Find the best match relocate by looking for another relocate with 
+            // the longest computed origin source path that is a prefix of this
+            // relocate's computed origin source path
+            auto bestMatchIt = processedRelocates.end();
+            size_t bestMatchElementCount = 0;
+            for (auto otherRelocateIt = processedRelocates.begin();
+                    otherRelocateIt != processedRelocates.end();
+                    ++otherRelocateIt) {
+                const SdfPath &anotherSourceOriginPath = 
+                    otherRelocateIt->second.computedSourceOrigin;
+                const size_t elementCount = 
+                    anotherSourceOriginPath.GetPathElementCount();
+                if (elementCount > bestMatchElementCount &&
+                        sourceOriginParent.HasPrefix(anotherSourceOriginPath)) {
+                    bestMatchIt = otherRelocateIt;
+                    bestMatchElementCount = elementCount;
+                }
+            }
+            if (bestMatchIt == processedRelocates.end()) {
+                continue;
+            }
+
+            // Apply the best match relocate to the computed origin source path
+            // to get the most relocated source path. If this doesn't match
+            // the actual source path then this relocate needs to be updated.
+            SdfPath mostRelocatedSource = 
+                reloInfo.computedSourceOrigin.ReplacePrefix(
+                    bestMatchIt->second.computedSourceOrigin, 
+                    bestMatchIt->second.targetPath);
+            if (mostRelocatedSource != source) {
+                relocateSourcesToMove.emplace_back(
+                    source, std::move(mostRelocatedSource));
+            }
+        }
+
+        // With all relocates processed we can update the necessary source paths
+        // to conform to "most relocated".
+        for (auto &[oldSource, newSource] : relocateSourcesToMove) {
+            auto oldIt = processedRelocates.find(oldSource);
+            if (auto [it, success] = processedRelocates.emplace(
+                    newSource, std::move(oldIt->second));
+                    !success && it->second.targetPath != oldIt->second.targetPath) {
+                // It's possible that this could fail since different authored 
+                // relocate sources can represent the same "most relocated" 
+                // source path. Legacy relocates didn't use to correct for this
+                // at all meaning it was possible to relocate a prim to multiple
+                // locations if authored incorrectly. This was never intended 
+                // and is impossible in the updated layer relocates. So while 
+                // we're still supporting legacy relocates, we'll just warn when
+                // this occurs (instead of a proper error) and use the first
+                // relocate to have claimed this source path.
+                TF_WARN("Couldn't conform relocate from %s to %s to use the "
+                    "correct source path %s because a relocate from %s to %s "
+                    "already exists. This relocate will be ignored.",
+                    oldIt->first.GetText(),
+                    oldIt->second.targetPath.GetText(),
+                    newSource.GetText(),
+                    it->first.GetText(),
+                    it->second.targetPath.GetText());
+            }
+            processedRelocates.erase(oldIt);
+        }       
+    }
+
     // Run after all authored relocates are collected from all layers; validates
     // that relocates are valid in the context of all other relocates in the
     // layer stack and removes any that are not. This also populates the target
@@ -465,76 +608,63 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
 
         TRACE_FUNCTION();
 
-        // XXX: There are some non-USD use cases that rely on the fact that
-        // we validate and reject these conflicting relocates in Pcp. We 
-        // will update these cases to conform in the future, but the work to
-        // do so is non-trivial, so for now we need to allow these cases to 
-        // still work.
-        if (!_layerStack->IsUsd() && 
-                TfGetEnvSetting(PCP_ENABLE_LEGACY_RELOCATES_BEHAVIOR)) {
-            // Even though we're not further validating relocates here, we 
-            // need to populate the target path to relocates map.
-            for (auto &authoredRelocatesEntry : processedRelocates) {
-                const SdfPath &targetPath = 
-                    authoredRelocatesEntry.second.targetPath;                        
-                auto [it, inserted] = targetPathToProcessedRelocateMap.emplace(
-                    targetPath, &authoredRelocatesEntry);
-                // With the legacy behavior you can end up with the erroneous behavior
-                // of more than one source mapping to the same target. We need to at 
-                // least make this consistent by making sure we choose the 
-                // lexicographically greater source when we have a target conflict.
-                if (!inserted && authoredRelocatesEntry.first > it->second->first) {
-                    it->second = &authoredRelocatesEntry;
-                }
-            }
-            return;
-        }
-
         for (auto &relocatesEntry : processedRelocates) {
             const SdfPath &sourcePath = relocatesEntry.first;                        
             const SdfPath &targetPath = relocatesEntry.second.targetPath;                        
 
-            std::string whyNot;
-            // If we can't add this relocate to the "by target" map, we have
-            // a duplicate target error.
-            if (auto [it, success] = targetPathToProcessedRelocateMap.emplace(
-                    targetPath, &relocatesEntry); !success) {
-                auto *&existingAuthoredRelocatesEntry = it->second;
-
-                // Always add this relocate entry as an error. If this function
-                // returns true, it's adding the error for this target for the
-                // first time so add the existing relocate entry to the error
-                // as well in that case.
-                if (_LogInvalidSameTargetRelocates(relocatesEntry)) {
-                    _LogInvalidSameTargetRelocates(
-                        *existingAuthoredRelocatesEntry);
+            if (!targetPath.IsEmpty()) {
+                // If we can't add this relocate to the "by target" map, we have
+                // a duplicate target error.
+                if (auto [it, success] = targetPathToProcessedRelocateMap.emplace(
+                        targetPath, &relocatesEntry); !success) {
+                    auto *&existingAuthoredRelocatesEntry = it->second;
+
+                    // Always add this relocate entry as an error. If this function
+                    // returns true, it's adding the error for this target for the
+                    // first time so add the existing relocate entry to the error
+                    // as well in that case.
+                    if (_LogInvalidSameTargetRelocates(relocatesEntry)) {
+                        _LogInvalidSameTargetRelocates(
+                            *existingAuthoredRelocatesEntry);
+                    }
                 }
             }
 
-            // If the target can be found as a source path of any of our 
-            // relocates, then both relocates are invalid.
-            if (auto it = processedRelocates.find(targetPath); 
-                    it != processedRelocates.end()) {
-                _LogInvalidConflictingRelocate(
-                    relocatesEntry,
-                    *it,
-                    ConflictReason::TargetIsConflictSource);
-                _LogInvalidConflictingRelocate(
-                    *it,
-                    relocatesEntry,
-                    ConflictReason::SourceIsConflictTarget);           
+            // XXX: There are some non-USD use cases that rely on the fact that
+            // we validate and reject these conflicting relocates in Pcp. We 
+            // will update these cases to conform in the future, but the work to
+            // do so is non-trivial, so for now we need to allow these cases to 
+            // still work.
+            if (!_isUsd && TfGetEnvSetting(PCP_ENABLE_LEGACY_RELOCATES_BEHAVIOR)) {
+                continue;
             }
 
-            // The target of a relocate must be a fully relocated path which we
-            // enforce by making sure that it cannot itself be ancestrally 
-            // relocated by any other relocates in the layer stack.
-            for (SdfPath pathToCheck = targetPath.GetParentPath();
-                    !pathToCheck.IsRootPrimPath(); 
-                    pathToCheck = pathToCheck.GetParentPath()) {
-                if (auto it = processedRelocates.find(pathToCheck); 
+            if (!targetPath.IsEmpty()) {
+                // If the target can be found as a source path of any of our 
+                // relocates, then both relocates are invalid.
+                if (auto it = processedRelocates.find(targetPath); 
                         it != processedRelocates.end()) {
-                    _LogInvalidConflictingRelocate(relocatesEntry, *it,
-                        ConflictReason::TargetIsConflictSourceDescendant);
+                    _LogInvalidConflictingRelocate(
+                        relocatesEntry,
+                        *it,
+                        ConflictReason::TargetIsConflictSource);
+                    _LogInvalidConflictingRelocate(
+                        *it,
+                        relocatesEntry,
+                        ConflictReason::SourceIsConflictTarget);           
+                }
+
+                // The target of a relocate must be a fully relocated path which we
+                // enforce by making sure that it cannot itself be ancestrally 
+                // relocated by any other relocates in the layer stack.
+                for (SdfPath pathToCheck = targetPath.GetParentPath();
+                        !pathToCheck.IsAbsoluteRootPath(); 
+                        pathToCheck = pathToCheck.GetParentPath()) {
+                    if (auto it = processedRelocates.find(pathToCheck); 
+                            it != processedRelocates.end()) {
+                        _LogInvalidConflictingRelocate(relocatesEntry, *it,
+                            ConflictReason::TargetIsConflictSourceDescendant);
+                    }
                 }
             }
 
@@ -687,8 +817,7 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
         // Add the error for this relocate
         PcpErrorInvalidConflictingRelocationPtr err = 
             PcpErrorInvalidConflictingRelocation::New();
-        err->rootSite = PcpSite(
-            _layerStack->GetIdentifier(), SdfPath::AbsoluteRootPath());
+        err->rootSite = _GetErrorRootSite();
 
         err->layer = entry.second.owningSite.layer;
         err->owningPath = entry.second.owningSite.path;
@@ -737,7 +866,16 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
         return createNewError;
     }
 
-    const PcpLayerStack *_layerStack;
+    PcpSite _GetErrorRootSite() const
+    {
+        return PcpSite(
+            _layerStack ? _layerStack->GetIdentifier() : PcpLayerStackIdentifier(), 
+            SdfPath::AbsoluteRootPath());
+    }
+
+    const PcpLayerStack *_layerStack = nullptr;
+    bool _isUsd = true;
+
     std::vector<PcpErrorInvalidConflictingRelocationPtr>
         _invalidConflictingRelocates;
     std::map<SdfPath, PcpErrorInvalidSameTargetRelocationsPtr> 
@@ -746,6 +884,25 @@ class Pcp_ComputeRelocationsForLayerStackWorkspace {
 
 }; // end anonymous namespace
 
+void
+Pcp_BuildRelocateMap(
+    const std::vector<std::pair<SdfLayerHandle, SdfRelocates>> &layerRelocates,
+    SdfRelocatesMap *relocatesMap,
+    PcpErrorVector *errors)
+{
+    Pcp_ComputeRelocationsForLayerStackWorkspace ws;
+    ws.Compute(layerRelocates);
+
+    relocatesMap->clear();
+    for (const auto &[source, reloInfo] : ws.processedRelocates) {
+        (*relocatesMap)[source] = reloInfo.targetPath;
+    }
+
+    if (errors) {
+        *errors = std::move(ws.errors);
+    }
+}
+
 void
 Pcp_ComputeRelocationsForLayerStack(
     const PcpLayerStack &layerStack,
@@ -760,46 +917,11 @@ Pcp_ComputeRelocationsForLayerStack(
 
     // Use the workspace helper to compute and validate the full set of 
     // relocates on the layer stack.
-    Pcp_ComputeRelocationsForLayerStackWorkspace ws(&layerStack);
-    ws.Compute();
-
-    // Use the processed relocates to populate the bi-directional mapping of all
-    // the relocates maps.
-    if (TfGetEnvSetting(PCP_ENABLE_LEGACY_RELOCATES_BEHAVIOR)) {
-        for (const auto &[source, reloInfo] : ws.processedRelocates) {
-            incrementalRelocatesSourceToTarget->emplace(
-                source, reloInfo.targetPath);
-            // XXX: With the legacy behavior you can end up with the erroneous 
-            // behavior of more than one source mapping to the same target. We 
-            // need to at least make this consistent by making sure we choose 
-            // the lexicographically greater source when we have a target conflict.
-            auto [it, inserted] = incrementalRelocatesTargetToSource->emplace(
-                reloInfo.targetPath, source);
-            if (!inserted && source > it->second) {
-                it->second = source;
-            }
-
-            relocatesTargetToSource->emplace(
-                reloInfo.targetPath, reloInfo.computedSourceOrigin);
-            relocatesSourceToTarget->emplace(
-                reloInfo.computedSourceOrigin, reloInfo.targetPath);
-        }       
-    } else {
-        for (const auto &[source, reloInfo] : ws.processedRelocates) {
-            incrementalRelocatesSourceToTarget->emplace(
-                source, reloInfo.targetPath);
-            incrementalRelocatesTargetToSource->emplace(
-                reloInfo.targetPath, source);
-
-            relocatesTargetToSource->emplace(
-                reloInfo.targetPath, reloInfo.computedSourceOrigin);
-            relocatesSourceToTarget->emplace(
-                reloInfo.computedSourceOrigin, reloInfo.targetPath);
-        }       
-    }
+    Pcp_ComputeRelocationsForLayerStackWorkspace ws;
+    ws.Compute(layerStack);
 
     // Take any encountered errors.
-    if (errors) {
+    if (errors && !ws.errors.empty()) {
         if (errors->empty()) {
             *errors = std::move(ws.errors);
         } else {
@@ -810,6 +932,24 @@ Pcp_ComputeRelocationsForLayerStack(
         }
     }
 
+    if (ws.processedRelocates.empty()) {
+        return;
+    }
+
+    // Use the processed relocates to populate the bi-directional mapping of all
+    // the relocates maps.
+    for (const auto &[source, reloInfo] : ws.processedRelocates) {
+        incrementalRelocatesSourceToTarget->emplace(
+            source, reloInfo.targetPath);
+        incrementalRelocatesTargetToSource->emplace(
+            reloInfo.targetPath, source);
+
+        relocatesTargetToSource->emplace(
+            reloInfo.targetPath, reloInfo.computedSourceOrigin);
+        relocatesSourceToTarget->emplace(
+            reloInfo.computedSourceOrigin, reloInfo.targetPath);
+    }       
+
     // Take the list of prim paths with relocates.
     relocatesPrimPaths->assign(
         std::make_move_iterator(ws.allPrimPathsWithAuthoredRelocates.begin()), 
@@ -834,8 +974,12 @@ _FilterRelocationsForPath(const PcpLayerStack& layerStack,
     for (SdfRelocatesMap::const_iterator
          i = relocates.lower_bound(path), n = relocates.end();
          (i != n) && (i->first.HasPrefix(path)); ++i) {
-        siteRelocates.insert(*i);
-        seenTargets.insert(i->second);
+        // Skip relocates to empty targets. We don't want to prevent these paths
+        // from mapping through the node.
+        if (!i->second.IsEmpty()) {
+            siteRelocates.insert(*i);
+            seenTargets.insert(i->second);
+        }
     }
 
     const SdfRelocatesMap& incrementalRelocates = 
@@ -845,9 +989,10 @@ _FilterRelocationsForPath(const PcpLayerStack& layerStack,
          n = incrementalRelocates.end();
          (i != n) && (i->first.HasPrefix(path)); ++i) {
 
-        if (seenTargets.find(i->second) == seenTargets.end()) {
+        // Skip relocates to empty targets. We don't want to prevent these paths
+        // from mapping through the node.
+        if (!i->second.IsEmpty() && seenTargets.insert(i->second).second) {
             siteRelocates.insert(*i);
-            seenTargets.insert(i->second);
         }
     }
 
diff --git a/pxr/usd/pcp/layerStack.h b/pxr/usd/pcp/layerStack.h
index 76bb98f0ec..8ae318b2ba 100644
--- a/pxr/usd/pcp/layerStack.h
+++ b/pxr/usd/pcp/layerStack.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_LAYER_STACK_H
 #define PXR_USD_PCP_LAYER_STACK_H
@@ -355,6 +338,21 @@ std::ostream& operator<<(std::ostream&, const PcpLayerStackPtr&);
 PCP_API
 std::ostream& operator<<(std::ostream&, const PcpLayerStackRefPtr&);
 
+/// Checks if the source and target paths constitute a valid relocates. This
+/// validation is not context specific, i.e. if this returns false, the 
+/// combination of source and target paths is always invalid for any attempted
+/// relocation.
+bool
+Pcp_IsValidRelocatesEntry(
+    const SdfPath &source, const SdfPath &target, std::string *errorMessage);
+
+/// Builds a relocates map from a list of layer and SdfRelocates value pairs.
+void
+Pcp_BuildRelocateMap(
+    const std::vector<std::pair<SdfLayerHandle, SdfRelocates>> &layerRelocates,
+    SdfRelocatesMap *relocatesMap,
+    PcpErrorVector *errors);
+
 /// Compose the relocation arcs in the given stack of layers,
 /// putting the results into the given sourceToTarget and targetToSource
 /// maps.
diff --git a/pxr/usd/pcp/layerStackIdentifier.cpp b/pxr/usd/pcp/layerStackIdentifier.cpp
index 0b8a7f5129..f7ed6a6742 100644
--- a/pxr/usd/pcp/layerStackIdentifier.cpp
+++ b/pxr/usd/pcp/layerStackIdentifier.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file LayerStackIdentifier.cpp
 
diff --git a/pxr/usd/pcp/layerStackIdentifier.h b/pxr/usd/pcp/layerStackIdentifier.h
index a13c6e5397..d2c223323d 100644
--- a/pxr/usd/pcp/layerStackIdentifier.h
+++ b/pxr/usd/pcp/layerStackIdentifier.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_LAYER_STACK_IDENTIFIER_H
 #define PXR_USD_PCP_LAYER_STACK_IDENTIFIER_H
diff --git a/pxr/usd/pcp/layerStackRegistry.cpp b/pxr/usd/pcp/layerStackRegistry.cpp
index 2dd6cdaeec..ef155cf219 100644
--- a/pxr/usd/pcp/layerStackRegistry.cpp
+++ b/pxr/usd/pcp/layerStackRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file LayerStackRegistry.cpp
 
diff --git a/pxr/usd/pcp/layerStackRegistry.h b/pxr/usd/pcp/layerStackRegistry.h
index 3adbf4d0a2..924fc68f49 100644
--- a/pxr/usd/pcp/layerStackRegistry.h
+++ b/pxr/usd/pcp/layerStackRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_LAYER_STACK_REGISTRY_H
 #define PXR_USD_PCP_LAYER_STACK_REGISTRY_H
diff --git a/pxr/usd/pcp/mapExpression.cpp b/pxr/usd/pcp/mapExpression.cpp
index 6326f7b658..4d0422fe5c 100644
--- a/pxr/usd/pcp/mapExpression.cpp
+++ b/pxr/usd/pcp/mapExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -238,7 +221,7 @@ PcpMapExpression::_Node::New( _Op op_,
         // Check for existing instance to re-use
         _NodeMap::accessor accessor;
         if (_nodeRegistry->map.insert(accessor, key) ||
-            accessor->second->_refCount.fetch_and_increment() == 0) {
+            accessor->second->_refCount.fetch_add(1) == 0) {
             // Either there was no node in the table, or there was but it had
             // begun dying (another client dropped its refcount to 0).  We have
             // to create a new node in the table.  When the client that is
@@ -388,7 +371,7 @@ TfDelegatedCountIncrement(PcpMapExpression::_Node* p)
 void
 TfDelegatedCountDecrement(PcpMapExpression::_Node* p) noexcept
 {
-    if (p->_refCount.fetch_and_decrement() == 1)
+    if (p->_refCount.fetch_sub(1) == 1)
         delete p;
 }
 
diff --git a/pxr/usd/pcp/mapExpression.h b/pxr/usd/pcp/mapExpression.h
index f977eb43db..773ec135ab 100644
--- a/pxr/usd/pcp/mapExpression.h
+++ b/pxr/usd/pcp/mapExpression.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_MAP_EXPRESSION_H
 #define PXR_USD_PCP_MAP_EXPRESSION_H
@@ -30,7 +13,6 @@
 
 #include "pxr/base/tf/delegatedCountPtr.h"
 
-#include <tbb/atomic.h>
 #include <tbb/spin_mutex.h>
 
 #include <atomic>
@@ -269,7 +251,7 @@ class PcpMapExpression
         struct _NodeMap;
         static TfStaticData<_NodeMap> _nodeRegistry;
 
-        mutable tbb::atomic<int> _refCount;
+        mutable std::atomic<int> _refCount;
         mutable Value _cachedValue;
         mutable std::set<_Node*> _dependentExpressions;
         Value _valueForVariable;
diff --git a/pxr/usd/pcp/mapFunction.cpp b/pxr/usd/pcp/mapFunction.cpp
index 0e3867ea30..5a7059b671 100644
--- a/pxr/usd/pcp/mapFunction.cpp
+++ b/pxr/usd/pcp/mapFunction.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -38,28 +21,54 @@
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
-    // Order PathPairs using FastLessThan.
-    struct _PathPairOrder
+
+// Order PathPairs using element count and FastLessThan.
+struct _PathPairOrder
+{
+    bool operator()(const PcpMapFunction::PathPair &lhs,
+                    const PcpMapFunction::PathPair &rhs) {
+        // First order paths by element count which allows to us to be 
+        // more efficient in finding the best path match in the source to
+        // target direction. This also makes sure that "root identity" 
+        // elements appear first.
+        if (lhs.first.GetPathElementCount() != rhs.first.GetPathElementCount()) {
+            return lhs.first.GetPathElementCount() < 
+                rhs.first.GetPathElementCount();
+        }
+
+        // Otherwise, the path sourece path elememnt count is the same so
+        // use the arbitrary fast less than.
+        SdfPath::FastLessThan less;
+        return less(lhs.first, rhs.first) ||
+            (lhs.first == rhs.first && less(lhs.second, rhs.second));
+    }
+};
+
+// Comparator for lower bounding source paths in a _PathPairOrder ordered
+// container.
+struct _PathPairOrderSourceLowerBound
+{   
+    bool operator()(const PcpMapFunction::PathPair &lhs,
+                    const SdfPath &rhs) {
+        return _PathLessThan(lhs.first, rhs);
+    }
+
+    bool operator()(const SdfPath &lhs,
+                    const PcpMapFunction::PathPair &rhs) {
+        return _PathLessThan(lhs, rhs.first);
+    }
+private:
+    bool _PathLessThan(const SdfPath &lhs, const SdfPath &rhs)
     {
-        bool operator()(const PcpMapFunction::PathPair &lhs,
-                        const PcpMapFunction::PathPair &rhs) {
-            SdfPath::FastLessThan less;
-            // We need to ensure that "root identity" elements appear first
-            // ('/' -> '/') so we special-case those.
-            SdfPath const &absRoot = SdfPath::AbsoluteRootPath();
-            if (lhs == rhs) {
-                return false;
-            }
-            if (lhs.first == absRoot && lhs.second == absRoot) {
-                return true;
-            }
-            if (rhs.first == absRoot && rhs.second == absRoot) {
-                return false;
-            }
-            return less(lhs.first, rhs.first) ||
-                (lhs.first == rhs.first && less(lhs.second, rhs.second));
+        if (lhs.GetPathElementCount() != rhs.GetPathElementCount()) {
+            return lhs.GetPathElementCount() < rhs.GetPathElementCount();
         }
-    };
+
+        SdfPath::FastLessThan less;
+        return less(lhs, rhs);
+    }
+};
+
 };
 
 PcpMapFunction::PcpMapFunction(PathPair const *begin,
@@ -71,12 +80,204 @@ PcpMapFunction::PcpMapFunction(PathPair const *begin,
 {
 }
 
+// Finds the map entry whose source best matches the given path, i.e. the entry
+// with the longest source path that is a prefix of the path. minElementCount 
+// is used to only look for entries where the source path has at least that many 
+// elements.
+template <class PairIter>
+static PairIter
+_GetBestSourceMatch(
+    const SdfPath &path, const PairIter &begin, const PairIter &end, 
+    size_t minElementCount = 0)
+{   
+    // Path pairs are ordered such that source path length (i.e. element count)
+    // is  non-decreasing. So we start looking for the best match at the last
+    // path pair whose source length does not exceed the length of the path 
+    // we're matching.
+    PairIter i = std::upper_bound(begin, end, path.GetPathElementCount(),
+        [](size_t pathLen, const auto &pathPair) {
+            return pathLen < pathPair.first.GetPathElementCount();
+        });
+
+    // Iterate over path pairs in reverse as the matching pair with the greatest
+    // source length will be the best match.
+    for (; i != begin;) {
+        --i;
+        const SdfPath &source = i->first;
+        // Opimization if we know the minimum element count (see 
+        // _HasBetterTargetMatch). No match if we've reached source paths
+        // shorter than the minimum.
+        if (source.GetPathElementCount() < minElementCount) {
+            return end;
+        }
+        // If we found a match, this is the best match because of source path
+        // length ordering.
+        if (path.HasPrefix(source)) {
+            return i;
+        }
+    }
+
+    return end;
+}
+
+// Finds the map entry whose target best matches the given path, i.e. the entry
+// with the longest target path that is a prefix of the path. minElementCount 
+// is used to only look for entries where the target path has at least that many 
+// elements.
+template <class PairIter>
+static PairIter
+_GetBestTargetMatch(
+    const SdfPath &path, const PairIter &begin, const PairIter &end, 
+    size_t minElementCount = 0)
+{
+    // While path pair entries are ordered by nondecreasing source path length,
+    // we can't simultaneously make the same true for target paths. Thus we have
+    // to look at every entry comparing path length and checking for a target 
+    // path match.
+    PairIter bestIter = end;
+    size_t bestElementCount = minElementCount;
+    for (PairIter i=begin; i != end; ++i) {
+        const SdfPath &target = i->second;
+        const size_t count = target.GetPathElementCount();
+        if (count >= bestElementCount && path.HasPrefix(target)) {
+            bestElementCount = count;
+            bestIter = i;
+        }
+    }
+    return bestIter;
+}
+
+// Returns true if there's a map entry that matches the given target path better
+// than the given bestSourceMatch which has already been determined to be the best
+// entry for mapping a certain source path to that target path. If invert is 
+// true, we swap the meaning of source and target paths.
+template <class PairIter>
+static bool
+_HasBetterTargetMatch(
+    const SdfPath &targetPath, const PairIter &begin, const PairIter &end, 
+    const PairIter &bestSourceMatch, bool invert = false)
+{
+    // For a target match to be "better" than the "best source match" the 
+    // matching entry's target would have to be longer than the target of the
+    // current best match.
+    const size_t minElementCount = bestSourceMatch == end ? 0 :
+        (invert ? bestSourceMatch->first : bestSourceMatch->second)
+            .GetPathElementCount();
+    PairIter bestTargetMatch = invert ?
+        _GetBestSourceMatch(targetPath, begin, end, minElementCount) :
+        _GetBestTargetMatch(targetPath, begin, end, minElementCount);
+    return bestTargetMatch != end && bestTargetMatch != bestSourceMatch;
+}
+
+template <class PairIter>
+static bool
+_IsRedundant(const PairIter &entry, const PairIter &begin, const PairIter &end)
+{
+    const SdfPath &entrySource = entry->first;
+    const SdfPath &entryTarget = entry->second;
+
+    const bool isBlock = entryTarget.IsEmpty();
+
+    // A map block is redundant if the source path already wouldn't map without
+    // the block.
+    if (isBlock) {
+        // Find the best matching map entry that affects this source path,
+        // ignoring the effect of this block. Note that we find this using the
+        // entry source's parent path as the mapping that affects its parent is
+        // what this block is blocking from affecting the source.
+        PairIter bestSourceMatch = 
+            _GetBestSourceMatch(entrySource.GetParentPath(), begin, end);
+
+        // If there is no other mapping that affects the source path or the
+        // other mapping is a block itself, then this block is redundant.
+        if (bestSourceMatch == end || bestSourceMatch->second.IsEmpty()) {
+            return true;
+        }
+
+        // Even though we found a relevant mapping for the source path, the
+        // path may still not map without the block if the one-to-one 
+        // bidirectional mapping requirement isn't met (see _Map)
+        //
+        // Map the block's source path to the what its target path would be if
+        // not blocked
+        const SdfPath targetPath = entrySource.ReplacePrefix(
+            bestSourceMatch->first, bestSourceMatch->second);
+
+        // If we find a better mapping inverse than the source to target mapping
+        // then the source will fail to map without block and the block is 
+        // redundant.
+        return _HasBetterTargetMatch(targetPath, begin, end, bestSourceMatch);
+    }
+
+    // Otherwise we have a normal path mapping entry. This will be redundant
+    // if the best matching ancestor mapping would cause the source path to 
+    // map to the entry target path
+
+    // Early out, the entry can't be redundant if it renames the source when it
+    // is mapped.
+    if (entrySource.GetNameToken() != entryTarget.GetNameToken()) {
+        return false;
+    }
+
+    // Find the best matching map entry that affects this source path,
+    // ignoring the effect of this entry. Note that we find this using the
+    // entry source's parent path as the mapping that affects its parent is
+    // what would affect this source without this entry.
+    PairIter bestSourceMatch = 
+        _GetBestSourceMatch(entrySource.GetParentPath(), begin, end);
+
+    // If there is no other mapping that affects the source path or the
+    // other mapping is a block, then this entry cannot be redundant.
+    if (bestSourceMatch == end || bestSourceMatch->second.IsEmpty()) {
+        return false;
+    }
+
+    // We still need to check that this entry doesn't map the source differently
+    // than the other mapping. 
+    
+    // Early out; if the best match would map the source path to a different 
+    // namespace depth than the entry does, then entry cannot be redundant.
+    if ((entryTarget.GetPathElementCount() - 
+            bestSourceMatch->second.GetPathElementCount()) !=
+        (entrySource.GetPathElementCount() - 
+            bestSourceMatch->first.GetPathElementCount())) {
+        return false;
+    }
+
+    // This loop here is the equivalent of checking whether 
+    // entrySource.ReplacePrefix(bestSourceMatch->first, bestSourceMatch->second)
+    // results in the same path as entryTarget and returning false if it does
+    // not.
+    SdfPath sourceAncestorPath = entrySource.GetParentPath();
+    SdfPath targetAncestorPath = entryTarget.GetParentPath();
+    while(sourceAncestorPath != bestSourceMatch->first) {
+        if (sourceAncestorPath.GetNameToken() != 
+                targetAncestorPath.GetNameToken()) {
+            return false;
+        }
+        sourceAncestorPath = sourceAncestorPath.GetParentPath();
+        targetAncestorPath = targetAncestorPath.GetParentPath();
+    }
+    if (bestSourceMatch->second != targetAncestorPath) {
+        return false;
+    }
+
+    // It's still possible that map entry we matched does not actually map our 
+    // path if there's a better inverse mapping for our target (see _Map). 
+    // In this case, this entry will not be redundant. Note again that we use
+    // the parent path to exclude this entry itself.
+    return !_HasBetterTargetMatch(
+        entryTarget.GetParentPath(), begin, end, bestSourceMatch);
+}
+
 // Canonicalize pairs in-place by removing all redundant entries.  Redundant
 // entries are those which can be removed without changing the semantics of the
 // correspondence.  Note that this function modifies both the content of `begin`
 // and `end` as well as the *value* of `begin` and `end` to produce the
 // resulting range.  Return true if there's a root identity mapping ('/' ->
-// '/').  It will not appear in the resulting \p vec.
+// '/').  It will not appear in the resulting \p vec. Also note that the entries
+// in the range must be in sorted in _PathPairOrder before this function is 
+// called.
 template <class PairIter>
 static bool
 _Canonicalize(PairIter &begin, PairIter &end)
@@ -84,61 +285,24 @@ _Canonicalize(PairIter &begin, PairIter &end)
     TRACE_FUNCTION();
 
     for (PairIter i = begin; i != end; /* increment below */) {
-        bool redundant = false;
-
-        // Check for trivial dupes before doing further work.
-        for (PairIter j = begin; j != i; ++j) {
-            if (*i == *j) {
-                redundant = true;
-                break;
-            }
-        }
 
-        // Find the closest enclosing mapping.  If the trailing name
-        // components do not match, this pair cannot be redundant.
-        if (!redundant && i->first.GetNameToken() == i->second.GetNameToken()) {
-            // The tail component matches.  Walk up the prefixes.
-            for (SdfPath source = i->first, target = i->second;
-                 !source.IsEmpty() && !target.IsEmpty()
-                 && !redundant;
-                 source = source.GetParentPath(),
-                 target = target.GetParentPath())
-            {
-                // Check for a redundant mapping.
-                for (PairIter j = begin; j != end; ++j)
-                {
-                    // *j makes *i redundant if *j maps source to target.
-                    if (i != j && j->first == source && j->second == target) {
-                        // Found the closest enclosing mapping, *j.
-                        // It means *i is the same as *j plus the addition
-                        // of an identical series of path components on both
-                        // the source and target sides -- which we verified
-                        // as we peeled off trailing path components to get
-                        // here.
-                        redundant = true;
-                        break;
-                    }
-                }
-                if (source.GetNameToken() != target.GetNameToken()) {
-                    // The trailing name components do not match,
-                    // so this pair cannot be redundant.
-                    break;
-                }
+        if (_IsRedundant(i, begin, end)) {
+            // Entries are already sorted so move all subsequent entries down
+            // one to erase this item. Note that while this is potentially 
+            // O(n^2), in practice it's more efficient to keep the entries 
+            // sorted for _IsRedundant checks than it is to make the erase 
+            // efficient as we're guaranteed to call _IsRedundant on every
+            // entry but very few entries will actually be redundant and require
+            // erasure.
+            for (PairIter j = i; j != end - 1; ++j) {
+                *j = std::move(*(j+1));
             }
-        }
-
-        if (redundant) {
-            // Entries are not sorted yet so swap to back for O(1) erase.
-            std::swap(*i, *(end-1));
             --end;
         } else {
             ++i;
         }
     }
 
-    // Final sort to canonical order.
-    std::sort(begin, end, _PathPairOrder());
-
     bool hasRootIdentity = false;
     if (begin != end) {
         auto const &absroot = SdfPath::AbsoluteRootPath();
@@ -178,25 +342,25 @@ PcpMapFunction::Create(const PathMap &sourceToTarget,
             return PcpMapFunction();
         }
     }
-    TF_FOR_ALL(i, sourceToTarget) {
+    for (const auto &[source, target] : sourceToTarget) {
         // Source and target paths must be prim paths, because mappings
         // are used on arcs and arcs are only expressed between prims.
         //
-        // They also must not contain variant selections.  Variant
-        // selections are purely an aspect of addressing layer opinion
-        // storage.  They are *not* an aspect of composed scene namespace.
-        //
         // This is a coding error, because a PcpError should have been
         // emitted about these conditions before getting to this point.
-
-        const SdfPath & source = i->first;
-        const SdfPath & target = i->second;
-        if (!source.IsAbsolutePath() ||
-            !(source.IsAbsoluteRootOrPrimPath() ||
-              source.IsPrimVariantSelectionPath()) ||
-            !target.IsAbsolutePath() ||
-            !(target.IsAbsoluteRootOrPrimPath() ||
-              target.IsPrimVariantSelectionPath())) {
+        //
+        // Additionally, the target path may be empty which is used to indicate
+        // that a source path cannot be mapped. This is used to "block" the 
+        // mapping of paths that would otherwise translate across a mapping
+        // of one of its ancestor paths.
+        auto isValidMapPath = [](const SdfPath &path) {
+            return path.IsAbsolutePath() && 
+                (path.IsAbsoluteRootOrPrimPath() ||
+                 path.IsPrimVariantSelectionPath());
+        };
+
+        if (!isValidMapPath(source) ||
+            !(target.IsEmpty() || isValidMapPath(target))) {
             TF_CODING_ERROR("The mapping of '%s' to '%s' is invalid.",
                             source.GetText(), target.GetText());
             return PcpMapFunction();
@@ -205,6 +369,9 @@ PcpMapFunction::Create(const PathMap &sourceToTarget,
 
     PathPairVector vec(sourceToTarget.begin(), sourceToTarget.end());
     PathPair *begin = vec.data(), *end = vec.data() + vec.size();
+    // XXX: This would be unnecessary if we used _PathPairOrder as the 
+    // comparator input PathMap.
+    std::sort(begin, end, _PathPairOrder());
     bool hasRootIdentity = _Canonicalize(begin, end);
     return PcpMapFunction(begin, end, offset, hasRootIdentity);
 }
@@ -291,39 +458,34 @@ _Map(const SdfPath& path,
     //      of doing that, but some path translation issues make that
     //      infeasible for now.
 
+    const PcpMapFunction::PathPair *begin = pairs;
+    const PcpMapFunction::PathPair *end = begin + numPairs;
+ 
     // Find longest prefix that has a mapping;
     // this represents the most-specific mapping to apply.
-    int bestIndex = -1;
-    size_t bestElemCount = 0;
-    for (int i=0; i < numPairs; ++i) {
-        const SdfPath &source = invert? pairs[i].second : pairs[i].first;
-        const size_t count = source.GetPathElementCount();
-        if (count >= bestElemCount && path.HasPrefix(source)) {
-            bestElemCount = count;
-            bestIndex = i;
-        }
-    }
-    if (bestIndex == -1 && !hasRootIdentity) {
-        // No mapping found.
-        return SdfPath();
-    }
+    const PcpMapFunction::PathPair *bestMatch = invert ?
+        _GetBestTargetMatch(path, begin, end) :
+        _GetBestSourceMatch(path, begin, end);
 
     SdfPath result;
-    const SdfPath &target = bestIndex == -1 ? SdfPath::AbsoluteRootPath() :
-        invert? pairs[bestIndex].first : pairs[bestIndex].second;
-    if (bestIndex != -1) {
-        const SdfPath &source =
-            invert? pairs[bestIndex].second : pairs[bestIndex].first;
-        result =
-            path.ReplacePrefix(source, target, /* fixTargetPaths = */ false);
-        if (result.IsEmpty()) {
-            return result;
+    // size_t minTargetElementCount = 0;
+    if (bestMatch == end) {
+        if (hasRootIdentity) {
+            // Use the root identity.
+            result = path;
         }
+    } else if (invert) {
+        result = path.ReplacePrefix(bestMatch->second, bestMatch->first, 
+            /* fixTargetPaths = */ false);
+    } else {
+        result = path.ReplacePrefix(bestMatch->first, bestMatch->second, 
+            /* fixTargetPaths = */ false);
+    }
+
+    if (result.IsEmpty()) {
+        // No mapping or a blocked mapping found.
+        return result;
     }
-    else {
-        // Use the root identity.
-        result = path;
-    }        
 
     // To maintain the bijection, we need to check if the mapped path
     // would translate back to the original path. For instance, given
@@ -359,21 +521,13 @@ _Map(const SdfPath& path,
     //      expensive though, possibly O(n^2) where n is the number of
     //      paths in the mapping.
     //
-
-    // Optimistically assume the same mapping will be the best;
-    // we can skip even considering any mapping that is shorter.
-    bestElemCount = target.GetPathElementCount();
-    for (int i=0; i < numPairs; ++i) {
-        if (i == bestIndex) {
-            continue;
-        }
-        const SdfPath &target = invert? pairs[i].first : pairs[i].second;
-        const size_t count = target.GetPathElementCount();
-        if (count > bestElemCount && result.HasPrefix(target)) {
-            // There is a more-specific reverse mapping for this path.
-            return SdfPath();
-        }
+    // We know that the best match will match for the inverse mapping fo the 
+    // target, but there may be a better (closer) inverse match. If there is,
+    // then we can't map this path one-to-one bidirectionally.
+    if (_HasBetterTargetMatch(result, begin, end, bestMatch, invert)) {
+        return SdfPath();
     }
+
     return result;
 }
 
@@ -474,26 +628,35 @@ PcpMapFunction::_MapPathExpressionImpl(
         }
     };
     
-    auto mapPattern =
-        [&stack, &map, &unmappedPatterns](PathPattern const &pattern) {
-        SdfPath mapped = map(pattern.GetPrefix());
-        // If the prefix path is outside the domain, push the Nothing()
-        // subexpression.
-        if (mapped.IsEmpty()) {
-            if (unmappedPatterns) {
-                unmappedPatterns->push_back(pattern);
-            }
-            stack.push_back(SdfPathExpression::Nothing());
+    auto mapPattern = [&stack, &map,
+                       &unmappedPatterns](PathPattern const &pattern) {
+        // If the pattern starts with '//' we persist it unchanged, as we deem
+        // the intent to be "search everything" regardless of context.  This is
+        // as opposed to any kind of non-speculative prefix, which refers to a
+        // specific prim or property in the originating context.
+        if (pattern.HasLeadingStretch()) {
+            stack.push_back(PathExpr::MakeAtom(pattern));
         }
-        // Otherwise push the mapped pattern.
         else {
-            PathPattern mappedPattern(pattern);
-            mappedPattern.SetPrefix(mapped);
-            stack.push_back(PathExpr::MakeAtom(mappedPattern));
+            SdfPath mapped = map(pattern.GetPrefix());
+            // If the prefix path is outside the domain, push the Nothing()
+            // subexpression.
+            if (mapped.IsEmpty()) {
+                if (unmappedPatterns) {
+                    unmappedPatterns->push_back(pattern);
+                }
+                stack.push_back(SdfPathExpression::Nothing());
+            }
+            // Otherwise push the mapped pattern.
+            else {
+                PathPattern mappedPattern(pattern);
+                mappedPattern.SetPrefix(mapped);
+                stack.push_back(PathExpr::MakeAtom(mappedPattern));
+            }
         }
     };
 
-    // Walk the expression to map.
+    // Walk the expression and map it.
     pathExpr.Walk(logic, mapRef, mapPattern);
     return stack.empty() ? SdfPathExpression {} : stack.back();
 }
@@ -532,49 +695,59 @@ PcpMapFunction::Compose(const PcpMapFunction &inner) const
     // of first applying inner, then this function.  Build a list
     // of all of the (source,target) path pairs that result.
 
-    // Apply outer function to the output range of inner.
-    const _Data& data_inner = inner._data;
-    for (PathPair pair: data_inner) {
-        pair.second = MapSourceToTarget(pair.second);
-        if (!pair.second.IsEmpty()) {
-            if (std::find(scratchBegin, scratch, pair) == scratch) {
-                *scratch++ = std::move(pair);
-            }
-        }
+    // The composed result will have the root identity if and only if both
+    // the inner and outer functions have the root identity. Add this first 
+    // because it'll be first in the sort order.
+    if (HasRootIdentity() && inner.HasRootIdentity()) {
+        PathPair &scratchPair = *scratch++;
+        scratchPair.first = SdfPath::AbsoluteRootPath();
+        scratchPair.second = SdfPath::AbsoluteRootPath();
     }
-    // If inner has a root identity, map that too.
-    if (inner.HasRootIdentity()) {
-        PathPair pair;
-        pair.first = SdfPath::AbsoluteRootPath();
-        pair.second = MapSourceToTarget(SdfPath::AbsoluteRootPath());
-        if (!pair.second.IsEmpty()) {
-            if (std::find(scratchBegin, scratch, pair) == scratch) {
-                *scratch++ = std::move(pair);
-            }
-        }
+
+    // Then apply outer function to the output range of inner. 
+    const _Data& data_inner = inner._data;
+    for (const PathPair &pair: data_inner) {
+        PathPair &scratchPair = *scratch++;
+        scratchPair.first = pair.first;
+        scratchPair.second = MapSourceToTarget(pair.second);
     }
-                                               
 
-    // Apply the inverse of inner to the domain of this function.
+    // This contents of scratch, as of now, will have been automatically sorted
+    // as the inner function's source paths were already unique in the correct
+    // order. The entries we add after this will not be sorted so we need to
+    // keep track of the sorted range.
+    PathPair *scratchSortedEnd = scratch;
+
+    // Then apply the inverse of inner to the domain of this function.
     const _Data& data_outer = _data;
-    for (PathPair pair: data_outer) {
-        pair.first = inner.MapTargetToSource(pair.first);
-        if (!pair.first.IsEmpty()) {
-            if (std::find(scratchBegin, scratch, pair) == scratch) {
-                *scratch++ = std::move(pair);
-            }
+    for (const PathPair &pair: data_outer) {
+        SdfPath source = inner.MapTargetToSource(pair.first);
+        if (source.IsEmpty()) {
+            continue;
         }
-    }
-    // If outer has a root identity, map that too.
-    if (HasRootIdentity()) {
-        PathPair pair;
-        pair.first = inner.MapTargetToSource(SdfPath::AbsoluteRootPath());
-        pair.second = SdfPath::AbsoluteRootPath();
-        if (!pair.first.IsEmpty()) {
-            if (std::find(scratchBegin, scratch, pair) == scratch) {
-                *scratch++ = std::move(pair);
-            }
+
+        // See if this entry's source was already added when we mapped the inner 
+        // function's range through the outer so that we don't add it again. We
+        // do NOT have to check for repeats within the sources we've mapped
+        // through this loop as the map function is guaranteed to not map 
+        // different targets to the same source.
+        if (std::binary_search(scratchBegin, scratchSortedEnd, source, 
+                _PathPairOrderSourceLowerBound())) {
+            continue;
         }
+        
+        PathPair &scratchPair = *scratch++;
+        scratchPair.first = std::move(source);
+        scratchPair.second = pair.second;
+    }
+
+    // The scratch may be at least partially sorted. Finish the final sorting
+    // of the entire range if necessary as it must be fully sorted before 
+    // we call _Canonicalize.
+    if (scratchSortedEnd != scratch) {
+        std::sort(scratchSortedEnd, scratch, _PathPairOrder());
+        std::inplace_merge(scratchBegin, scratchSortedEnd, scratch, 
+                           _PathPairOrder());
     }
 
     bool hasRootIdentity = _Canonicalize(scratchBegin, scratch);
@@ -603,6 +776,8 @@ PcpMapFunction::GetInverse() const
     PathPair const
         *begin = targetToSource.data(),
         *end = targetToSource.data() + targetToSource.size();
+    // Sort the entries to match the source path ordering requirement.
+    std::sort(targetToSource.begin(), targetToSource.end(), _PathPairOrder());
     return PcpMapFunction(
         begin, end, _offset.GetInverse(), _data.hasRootIdentity);
 }
diff --git a/pxr/usd/pcp/mapFunction.h b/pxr/usd/pcp/mapFunction.h
index 4b2f3034bb..72d83547c9 100644
--- a/pxr/usd/pcp/mapFunction.h
+++ b/pxr/usd/pcp/mapFunction.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_MAP_FUNCTION_H
 #define PXR_USD_PCP_MAP_FUNCTION_H
diff --git a/pxr/usd/pcp/module.cpp b/pxr/usd/pcp/module.cpp
index 3068bf38ae..98ab06d032 100644
--- a/pxr/usd/pcp/module.cpp
+++ b/pxr/usd/pcp/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -34,6 +17,7 @@ TF_WRAP_MODULE
     TF_WRAP( Cache );
     TF_WRAP( Errors );
     TF_WRAP( InstanceKey );
+    TF_WRAP( LayerRelocatesEditBuilder );
 
     TF_WRAP( ExpressionVariablesSource ); // Required by LayerStackIdentifier
     TF_WRAP( LayerStackIdentifier );
diff --git a/pxr/usd/pcp/moduleDeps.cpp b/pxr/usd/pcp/moduleDeps.cpp
index 4fc24d232b..198ed51bb0 100644
--- a/pxr/usd/pcp/moduleDeps.cpp
+++ b/pxr/usd/pcp/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/pcp/namespaceEdits.cpp b/pxr/usd/pcp/namespaceEdits.cpp
index 2122d8050a..eae53058b0 100644
--- a/pxr/usd/pcp/namespaceEdits.cpp
+++ b/pxr/usd/pcp/namespaceEdits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/namespaceEdits.h b/pxr/usd/pcp/namespaceEdits.h
index fdea59ca6c..80c3dccc7d 100644
--- a/pxr/usd/pcp/namespaceEdits.h
+++ b/pxr/usd/pcp/namespaceEdits.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_NAMESPACE_EDITS_H
 #define PXR_USD_PCP_NAMESPACE_EDITS_H
diff --git a/pxr/usd/pcp/node.cpp b/pxr/usd/pcp/node.cpp
index 2bdbd75317..74b2ca78d8 100644
--- a/pxr/usd/pcp/node.cpp
+++ b/pxr/usd/pcp/node.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/node.h b/pxr/usd/pcp/node.h
index 96244ace25..f7028a864b 100644
--- a/pxr/usd/pcp/node.h
+++ b/pxr/usd/pcp/node.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_NODE_H
 #define PXR_USD_PCP_NODE_H
diff --git a/pxr/usd/pcp/node_Iterator.cpp b/pxr/usd/pcp/node_Iterator.cpp
index d2caab4e68..616e37c0e5 100644
--- a/pxr/usd/pcp/node_Iterator.cpp
+++ b/pxr/usd/pcp/node_Iterator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file Node_Iterator.cpp
 
diff --git a/pxr/usd/pcp/node_Iterator.h b/pxr/usd/pcp/node_Iterator.h
index de7d6c453d..fb292964e5 100644
--- a/pxr/usd/pcp/node_Iterator.h
+++ b/pxr/usd/pcp/node_Iterator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_NODE_ITERATOR_H
 #define PXR_USD_PCP_NODE_ITERATOR_H
diff --git a/pxr/usd/pcp/pathTranslation.cpp b/pxr/usd/pcp/pathTranslation.cpp
index be445052b4..437d391705 100644
--- a/pxr/usd/pcp/pathTranslation.cpp
+++ b/pxr/usd/pcp/pathTranslation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/pathTranslation.h b/pxr/usd/pcp/pathTranslation.h
index cb57d76e7c..61c9d8219d 100644
--- a/pxr/usd/pcp/pathTranslation.h
+++ b/pxr/usd/pcp/pathTranslation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_PATH_TRANSLATION_H
 #define PXR_USD_PCP_PATH_TRANSLATION_H
diff --git a/pxr/usd/pcp/pch.h b/pxr/usd/pcp/pch.h
index a7180637dd..7e987f2817 100644
--- a/pxr/usd/pcp/pch.h
+++ b/pxr/usd/pcp/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,12 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -68,6 +52,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
 #include <sstream>
@@ -77,6 +63,7 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -84,63 +71,8 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/bind.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/noncopyable.hpp>
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/converter/from_python.hpp>
@@ -166,6 +98,8 @@
 #include <boost/python/operators.hpp>
 #include <boost/python/raw_function.hpp>
 #include <boost/python/refcount.hpp>
+#include <boost/python/return_by_value.hpp>
+#include <boost/python/return_value_policy.hpp>
 #include <boost/python/scope.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
@@ -175,26 +109,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_left_shift.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
@@ -208,6 +122,7 @@
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
 #include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/pcp/primIndex.cpp b/pxr/usd/pcp/primIndex.cpp
index e2d7fc0024..e845b56e6e 100644
--- a/pxr/usd/pcp/primIndex.cpp
+++ b/pxr/usd/pcp/primIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -373,6 +356,44 @@ PcpPrimIndex::GetSelectionAppliedForVariantSet(
     return std::string();
 }
 
+PcpNodeRef 
+PcpPrimIndex::AddChildPrimIndex(const PcpArc &arcToParent,
+                                PcpPrimIndex &&childPrimIndex,
+                                PcpErrorBasePtr *error)
+{
+    PcpNodeRef parent = arcToParent.parent;
+    PcpNodeRef newNode = parent.InsertChildSubgraph(childPrimIndex.GetGraph(), 
+                                                    arcToParent, error);
+    if (!newNode) {
+        return newNode;
+    }
+
+    if (childPrimIndex.GetGraph()->HasPayloads()) {
+        parent.GetOwningGraph()->SetHasPayloads(true);
+    }
+
+    // update parentOutput's primIndex errors with child PrimIndex's errors
+    if (!childPrimIndex._localErrors) {
+        return newNode;
+    }
+
+    if (!_localErrors) {
+        //Instantiate and move childPrimIndex's localErrors to _localErrors.
+        _localErrors = std::move(childPrimIndex._localErrors);
+        return newNode;
+    }
+
+    auto startLocalErrorsItr = 
+        std::make_move_iterator(childPrimIndex._localErrors->begin());
+    auto endLocalErrorsItr = 
+        std::make_move_iterator(childPrimIndex._localErrors->end());
+    // Inserting moved elements into _localErrors
+    _localErrors->insert(_localErrors->end(), startLocalErrorsItr, 
+                         endLocalErrorsItr);
+
+    return newNode;
+}
+
 ////////////////////////////////////////////////////////////////////////
 
 template <class T>
@@ -407,17 +428,13 @@ PcpPrimIndexOutputs::Append(PcpPrimIndexOutputs&& childOutputs,
                             const PcpArc& arcToParent,
                             PcpErrorBasePtr *error)
 {
-    PcpNodeRef parent = arcToParent.parent;
-    PcpNodeRef newNode = parent.InsertChildSubgraph(
-        childOutputs.primIndex.GetGraph(), arcToParent, error);
+    PcpNodeRef newNode = primIndex.AddChildPrimIndex(
+        arcToParent, std::move(childOutputs.primIndex), error);
+
     if (!newNode) {
         return newNode;
     }
 
-    if (childOutputs.primIndex.GetGraph()->HasPayloads()) {
-        parent.GetOwningGraph()->SetHasPayloads(true);
-    }
-
     dynamicFileFormatDependency.AppendDependencyData(
         std::move(childOutputs.dynamicFileFormatDependency));
 
@@ -459,7 +476,7 @@ Pcp_BuildPrimIndex(
     const PcpLayerStackSite & rootSite,
     int ancestorRecursionDepth,
     bool evaluateImpliedSpecializes,
-    bool evaluateVariants,
+    bool evaluateVariantsAndDynamicPayloads,
     bool rootNodeShouldContributeSpecs,
     PcpPrimIndex_StackFrame *previousFrame,
     const PcpPrimIndexInputs& inputs,
@@ -663,7 +680,12 @@ enum _ArcFlags {
 inline static size_t
 _ScanArcs(PcpNodeRef const& node)
 {
+    if (!node.CanContributeSpecs()) {
+        return 0;
+    }
+
     size_t arcs = 0;
+
     // Relocates mappings are defined for an entire layer stack so if the node's
     // layer stack has any relocates we have to check for relocates on this 
     // node.
@@ -674,8 +696,7 @@ _ScanArcs(PcpNodeRef const& node)
     // If the node does not have specs or cannot contribute specs,
     // we can avoid even enqueueing certain kinds of tasks that will
     // end up being no-ops.
-    const bool contributesSpecs = node.HasSpecs() && node.CanContributeSpecs();
-    if (!contributesSpecs) {
+    if (!node.HasSpecs()) {
         return arcs;
     }
 
@@ -705,15 +726,16 @@ _ScanArcs(PcpNodeRef const& node)
 }
 
 // Scan all ancestors of the site represented by this node for the
-// presence of any variant arcs. See _ScanArcs for more details.
+// presence of any payload or variant arcs. 
+// See _ScanArcs for more details.
 inline static size_t
-_ScanAncestralVariantArcs(PcpNodeRef const& node)
+_ScanAncestralArcs(PcpNodeRef const& node)
 {
     if (node.GetPath().IsAbsoluteRootPath()) {
         return 0;
     }
 
-    // Since this function is specific to *ancestral* variants, we
+    // Since this function is specific to *ancestral* arcs, we
     // start at the parent of this node's path and walk up until we
     // are under the depth at which this node was restricted from
     // contributing opinions.
@@ -729,17 +751,22 @@ _ScanAncestralVariantArcs(PcpNodeRef const& node)
         }
     }
 
+    size_t arcs = 0;
     PcpLayerStackRefPtr const& layerStack = node.GetLayerStack();
     for (; !path.IsAbsoluteRootPath(); path = path.GetParentPath()) {
         for (SdfLayerRefPtr const& layer : layerStack->GetLayers()) {
+            if (layer->HasField(path, SdfFieldKeys->Payload)) {
+                arcs |= _ArcFlagPayloads;
+            }
+
             if (layer->HasField(path, SdfFieldKeys->VariantSetNames)) {
-                return _ArcFlagVariants;
+                arcs |= _ArcFlagVariants;
             }
         }
     }
 
-    return 0;
-}    
+    return arcs;
+}  
 
 ////////////////////////////////////////////////////////////////////////
 
@@ -752,7 +779,7 @@ struct Task {
         EvalNodeRelocations,
         EvalImpliedRelocations,
         EvalNodeReferences,
-        EvalNodePayload,
+        EvalNodePayloads,
         EvalNodeInherits,
         EvalImpliedClasses,
         EvalNodeSpecializes,
@@ -774,6 +801,8 @@ struct Task {
         EvalNodeAncestralVariantFallback,
         EvalNodeAncestralVariantNoneFound,
 
+        EvalNodeAncestralDynamicPayloads,
+
         EvalImpliedSpecializes,
 
         EvalNodeVariantSets,
@@ -781,6 +810,8 @@ struct Task {
         EvalNodeVariantFallback,
         EvalNodeVariantNoneFound,
 
+        EvalNodeDynamicPayloads,
+
         EvalUnresolvedPrimPathError,
         None
     };
@@ -795,8 +826,9 @@ struct Task {
             // Node strength order is costly to compute, so avoid it for
             // arcs with order-independent results.
             switch (a.type) {
-            case EvalNodePayload:
-                // Payloads can have dynamic file format arguments that depend 
+            case EvalNodeAncestralDynamicPayloads:
+            case EvalNodeDynamicPayloads:
+                // Dynamic payloads have file format arguments that depend 
                 // on non-local information, so we must process these in 
                 // strength order.
                 return PcpCompareNodeStrength(a.node, b.node) == 1;
@@ -931,7 +963,7 @@ TF_REGISTRY_FUNCTION(TfEnum) {
     TF_ADD_ENUM_NAME(Task::EvalNodeRelocations);
     TF_ADD_ENUM_NAME(Task::EvalImpliedRelocations);
     TF_ADD_ENUM_NAME(Task::EvalNodeReferences);
-    TF_ADD_ENUM_NAME(Task::EvalNodePayload);
+    TF_ADD_ENUM_NAME(Task::EvalNodePayloads);
     TF_ADD_ENUM_NAME(Task::EvalNodeInherits);
     TF_ADD_ENUM_NAME(Task::EvalImpliedClasses);
     TF_ADD_ENUM_NAME(Task::EvalNodeSpecializes);
@@ -944,6 +976,8 @@ TF_REGISTRY_FUNCTION(TfEnum) {
     TF_ADD_ENUM_NAME(Task::EvalNodeVariantAuthored);
     TF_ADD_ENUM_NAME(Task::EvalNodeVariantFallback);
     TF_ADD_ENUM_NAME(Task::EvalNodeVariantNoneFound);
+    TF_ADD_ENUM_NAME(Task::EvalNodeAncestralDynamicPayloads);
+    TF_ADD_ENUM_NAME(Task::EvalNodeDynamicPayloads);
     TF_ADD_ENUM_NAME(Task::EvalUnresolvedPrimPathError);
     TF_ADD_ENUM_NAME(Task::None);
 }
@@ -971,7 +1005,7 @@ TF_REGISTRY_FUNCTION(TfEnum) {
 //   before proceeding to references/variants/payloads so that we gather
 //   as much information as available before deciding those arcs.
 //
-// - We only want to process a payload when there is nothing else
+// - We only want to process a dynamic payload when there is nothing else
 //   left to do.  Again, this is to ensure that we have discovered
 //   any opinions which may affect the payload arc, including
 //   those inside variants.
@@ -1030,7 +1064,7 @@ struct Pcp_PrimIndexer
     std::optional<_VariantTraversalCaches> variantTraversalCache;
 
     const bool evaluateImpliedSpecializes;
-    const bool evaluateVariants;
+    const bool evaluateVariantsAndDynamicPayloads;
 
 #ifdef PCP_DIAGNOSTIC_VALIDATION
     /// Diagnostic helper to make sure we don't revisit sites.
@@ -1050,7 +1084,7 @@ struct Pcp_PrimIndexer
         , outputs(outputs_)
         , previousFrame(previousFrame_)
         , evaluateImpliedSpecializes(evaluateImpliedSpecializes_)
-        , evaluateVariants(evaluateVariants_)
+        , evaluateVariantsAndDynamicPayloads(evaluateVariants_)
     {
     }
 
@@ -1126,11 +1160,12 @@ struct Pcp_PrimIndexer
 
     // Map the payload inclusion path for the given node's path to the root of 
     // the final prim index being computed.
-    SdfPath MapNodePathToPayloadInclusionPath(PcpNodeRef const& node) const {
+    SdfPath MapNodePathToPayloadInclusionPath(PcpNodeRef const& node, 
+                                              SdfPath const& path) const {
         // First, map the node's path to the payload inclusion path for the root
         // of the prim index it's in.
         SdfPath p = _MapPathToNodeRootPayloadInclusionPath(node,
-            node.GetPath().StripAllVariantSelections());
+            path.StripAllVariantSelections());
 
         // If we're in a recursive prim indexing call, we need to map the
         // path across stack frames.
@@ -1196,7 +1231,7 @@ struct Pcp_PrimIndexer
         bool skipTasksForExpressedArcs,
         bool skipCompletedNodesForImpliedSpecializes,
         bool evaluateUnresolvedPrimPathErrors,
-        bool evaluateAncestralVariants,
+        bool evaluateAncestralVariantsAndDynamicPayloads,
         bool isUsd) 
     {
 #ifdef PCP_DIAGNOSTIC_VALIDATION
@@ -1211,7 +1246,7 @@ struct Pcp_PrimIndexer
                 skipTasksForExpressedArcs, 
                 skipCompletedNodesForImpliedSpecializes,
                 evaluateUnresolvedPrimPathErrors,
-                evaluateAncestralVariants,
+                evaluateAncestralVariantsAndDynamicPayloads,
                 isUsd);
         }
 
@@ -1235,17 +1270,36 @@ struct Pcp_PrimIndexer
         if (skipCompletedNodesForImpliedSpecializes) {
             // In this case, we only need to add tasks that come after 
             // implied specializes.
-            if (evaluateVariants && (arcMask & _ArcFlagVariants)) {
-                AddTask(Task(Task::Type::EvalNodeVariantSets, n));
+            if (evaluateVariantsAndDynamicPayloads) {
+                if (arcMask & _ArcFlagVariants) {
+                    AddTask(Task(Task::Type::EvalNodeVariantSets, n));
+                }
+
+                if (arcMask & _ArcFlagPayloads) {
+                    AddTask(Task(Task::Type::EvalNodeDynamicPayloads, n));
+                }
             }
         } else {
-            if (evaluateVariants && (arcMask & _ArcFlagVariants)) {
-                AddTask(Task(Task::Type::EvalNodeVariantSets, n));
+            if (evaluateVariantsAndDynamicPayloads) {
+                if (arcMask & _ArcFlagVariants) {
+                    AddTask(Task(Task::Type::EvalNodeVariantSets, n));
+                }
+
+                if (arcMask & _ArcFlagPayloads) {
+                    AddTask(Task(Task::Type::EvalNodeDynamicPayloads, n));
+                }
             }
 
-            if (evaluateAncestralVariants &&
-                _ScanAncestralVariantArcs(n) & _ArcFlagVariants) {
-                AddTask(Task(Task::Type::EvalNodeAncestralVariantSets, n));
+            if (evaluateAncestralVariantsAndDynamicPayloads) {
+                const size_t ancestralArcMask = _ScanAncestralArcs(n);
+
+                if (ancestralArcMask & _ArcFlagPayloads) {
+                    AddTask(Task(Task::Type::EvalNodeAncestralDynamicPayloads, n));
+                }
+
+                if (ancestralArcMask & _ArcFlagVariants) {
+                    AddTask(Task(Task::Type::EvalNodeAncestralVariantSets, n));
+                }
             }
 
             if (!skipTasksForExpressedArcs) {
@@ -1263,7 +1317,7 @@ struct Pcp_PrimIndexer
                     AddTask(Task(Task::Type::EvalNodeInherits, n));
                 }
                 if (arcMask & _ArcFlagPayloads) {
-                    AddTask(Task(Task::Type::EvalNodePayload, n));
+                    AddTask(Task(Task::Type::EvalNodePayloads, n));
                 }
                 if (arcMask & _ArcFlagReferences) {
                     AddTask(Task(Task::Type::EvalNodeReferences, n));
@@ -1284,7 +1338,7 @@ struct Pcp_PrimIndexer
             /*skipTasksForExpressedArcs=*/false,
             /*skipCompletedNodesForImpliedSpecializes=*/false,
             /*evaluateUnresolvedPrimPathErrors=*/false,
-            /*evaluateAncestralVariants=*/false,
+            /*evaluateAncestralVariantsAndDynamicPayloads=*/false,
             /*isUsd=*/inputs.usd);
     }
 
@@ -1292,7 +1346,7 @@ struct Pcp_PrimIndexer
         const PcpNodeRef& n, 
         bool skipTasksForExpressedArcs,
         bool skipCompletedNodesForImpliedSpecializes,
-        bool evaluateAncestralVariants) {
+        bool evaluateAncestralVariantsAndDynamicPayloads) {
 
         // Any time we add an edge to the graph, we may need to update
         // implied class edges.
@@ -1347,7 +1401,7 @@ struct Pcp_PrimIndexer
             skipTasksForExpressedArcs, 
             skipCompletedNodesForImpliedSpecializes,
             evaluateUnresolvedPrimPathErrors,
-            evaluateAncestralVariants,
+            evaluateAncestralVariantsAndDynamicPayloads,
             inputs.usd);
 
         _DebugPrintTasks("After AddTasksForNode");
@@ -1746,23 +1800,6 @@ _AddArc(
         }
     }
 
-    // Local opinions are not allowed at the source of a relocation (or below). 
-    // This is colloquially known as the "salted earth" policy. We enforce 
-    // this policy here to ensure we examine all arcs as they're being added.
-    // Optimizations:
-    // - We only need to do this for non-root prims because root prims can't
-    //   be relocated. This is indicated by the includeAncestralOpinions flag.
-    if (opts.directNodeShouldContributeSpecs && opts.includeAncestralOpinions &&
-            site.layerStack->HasRelocates()) {
-        const SdfRelocatesMap & layerStackRelocates =
-            site.layerStack->GetRelocatesSourceToTarget();
-        SdfRelocatesMap::const_iterator
-            i = layerStackRelocates.lower_bound( site.path );
-        if (i != layerStackRelocates.end() && i->first.HasPrefix(site.path)) {
-            opts.directNodeShouldContributeSpecs = false;
-        }
-    }
-
     // Set up the arc.
     PcpArc newArc;
     newArc.type = arcType;
@@ -1845,7 +1882,11 @@ _AddArc(
         // for that after inserting the source index into our index. That
         // way, the variant evaluation process will have enough context
         // to decide what the strongest variant selection is.
-        const bool evaluateVariants = false;
+        // 
+        // The same logic applies to dynamic payloads in that we delay
+        // composing dynamic file format arguments to be sure we 
+        // consider opinions for those arguments from stronger sites.
+        const bool evaluateVariantsAndDynamicPayloads = false;
 
         // Provide a linkage across recursive calls to the indexer.
         PcpPrimIndex_StackFrame
@@ -1857,7 +1898,7 @@ _AddArc(
                             indexer->rootSite,
                             indexer->ancestorRecursionDepth,
                             evaluateImpliedSpecializes,
-                            evaluateVariants,
+                            evaluateVariantsAndDynamicPayloads,
                             opts.directNodeShouldContributeSpecs,
                             &frame,
                             indexer->inputs,
@@ -1893,15 +1934,16 @@ _AddArc(
     // variants we need to consider those as well.
     opts.skipTasksForExpressedArcs |= opts.includeAncestralOpinions;
 
-    const bool evaluateAncestralVariants =
-        indexer->evaluateVariants && opts.includeAncestralOpinions;
+    const bool evaluateAncestralVariantsAndDynamicPayloads =
+        indexer->evaluateVariantsAndDynamicPayloads && 
+        opts.includeAncestralOpinions;
 
     // Enqueue tasks to evaluate the new nodes.
     indexer->AddTasksForNode(
         newNode, 
         opts.skipTasksForExpressedArcs,
         opts.skipImpliedSpecializesCompletedNodes,
-        evaluateAncestralVariants);
+        evaluateAncestralVariantsAndDynamicPayloads);
 
     // If the arc targets a site that is itself private, issue an error.
     if (newNode.GetPermission() == SdfPermissionPrivate) {
@@ -1966,16 +2008,38 @@ _AddArc(
 static SdfPath
 _GetDefaultPrimPath(SdfLayerHandle const &layer)
 {
-    TfToken target = layer->GetDefaultPrim();
-    return SdfPath::IsValidIdentifier(target) ?
-        SdfPath::AbsoluteRootPath().AppendChild(target) : SdfPath();
+    return layer->GetDefaultPrimAsPath();
 }
 
 // Declare helper function for creating PcpDynamicFileFormatContext, 
 // implemented in dynamicFileFormatContext.cpp
 PcpDynamicFileFormatContext
-Pcp_CreateDynamicFileFormatContext(
-    const PcpNodeRef &, PcpPrimIndex_StackFrame *, TfToken::Set *, TfToken::Set *);
+Pcp_CreateDynamicFileFormatContext(const PcpNodeRef &, const SdfPath&, 
+                                   int arcNum, PcpPrimIndex_StackFrame *, 
+                                   TfToken::Set *, TfToken::Set *);
+
+// Determine whether the current payload at assetPath is
+// static or dynamic.
+static PcpDynamicFileFormatInterface* _GetDynamicFileFormat(
+                                        const SdfPayload& payload,
+                                        const std::string& fileFormatTarget) {
+    const std::string& assetPath = payload.GetAssetPath();
+    PcpDynamicFileFormatInterface *dynamicFileFormat = nullptr;
+    
+    if (!assetPath.empty()) {
+        SdfFileFormatConstPtr fileFormat = SdfFileFormat::FindByExtension(
+            SdfFileFormat::GetFileExtension(assetPath),
+            fileFormatTarget);
+        if (fileFormat) {
+            dynamicFileFormat = 
+                const_cast<PcpDynamicFileFormatInterface*>(
+                    dynamic_cast<const PcpDynamicFileFormatInterface *>(
+                    get_pointer(fileFormat)));
+        }
+    }
+
+    return dynamicFileFormat;
+}
 
 // Generates dynamic file format arguments for a payload's asset path if the 
 // asset's file format supports it.
@@ -1983,45 +2047,46 @@ static void
 _ComposeFieldsForFileFormatArguments(const PcpNodeRef &node,
                                      const Pcp_PrimIndexer &indexer,
                                      const SdfPayload &payload,
+                                     const SdfPath &nodePathAtIntroduction,
+                                     int arcNum,
                                      SdfLayer::FileFormatArguments *args)
 {
-    SdfFileFormatConstPtr fileFormat = SdfFileFormat::FindByExtension(
-        SdfFileFormat::GetFileExtension(payload.GetAssetPath()),
-        indexer.inputs.fileFormatTarget);
-    if (!fileFormat) {
+    const PcpDynamicFileFormatInterface *dynamicFileFormat = 
+        _GetDynamicFileFormat(payload, indexer.inputs.fileFormatTarget);
+
+    if (!dynamicFileFormat) {
         return;
     }
-    if (const PcpDynamicFileFormatInterface *dynamicFileFormat = 
-            dynamic_cast<const PcpDynamicFileFormatInterface *>(
-                get_pointer(fileFormat))) {
-        // Create the context for composing the prim fields from the current 
-        // state of the index. This context will also populate a list of the
-        // fields that it composed for dependency tracking
-        TfToken::Set composedFieldNames;
-        TfToken::Set composedAttributeNames;
-        PcpDynamicFileFormatContext context = Pcp_CreateDynamicFileFormatContext(
-            node, indexer.previousFrame, &composedFieldNames, &composedAttributeNames);
-        // Ask the file format to generate dynamic file format arguments for 
-        // the asset in this context.
-        VtValue dependencyContextData;
-        dynamicFileFormat->ComposeFieldsForFileFormatArguments(
-            payload.GetAssetPath(), context, args, &dependencyContextData);
-
-        // Add this dependency context to dynamic file format dependency object.
-        indexer.outputs->dynamicFileFormatDependency.AddDependencyContext(
-            dynamicFileFormat, std::move(dependencyContextData), 
+
+    // Create the context for composing the prim fields from the current 
+    // state of the index. This context will also populate a list of the
+    // fields that it composed for dependency tracking
+    TfToken::Set composedFieldNames;
+    TfToken::Set composedAttributeNames;
+    PcpDynamicFileFormatContext context = Pcp_CreateDynamicFileFormatContext(
+        node, nodePathAtIntroduction, arcNum, indexer.previousFrame, 
+        &composedFieldNames, &composedAttributeNames);
+    // Ask the file format to generate dynamic file format arguments for 
+    // the asset in this context.
+    VtValue dependencyContextData;
+    dynamicFileFormat->ComposeFieldsForFileFormatArguments(
+        payload.GetAssetPath(), context, args, &dependencyContextData);
+
+    // Add this dependency context to dynamic file format dependency object.
+    indexer.outputs->dynamicFileFormatDependency.AddDependencyContext(
+        dynamicFileFormat, std::move(dependencyContextData), 
             std::move(composedFieldNames), std::move(composedAttributeNames));
-    }
 }
 
-static bool
+static void
 _ComposeFieldsForFileFormatArguments(const PcpNodeRef &node,
                                      const Pcp_PrimIndexer &indexer,
                                      const SdfReference &ref,
+                                     const SdfPath &nodePathAtIntroduction,
+                                     int arcNum,
                                      SdfLayer::FileFormatArguments *args)
 {
     // References don't support dynamic file format arguments.
-    return false;
 }
 
 // Reference and payload arcs are composed in essentially the same way. 
@@ -2030,15 +2095,16 @@ static void
 _EvalRefOrPayloadArcs(PcpNodeRef node, 
                       Pcp_PrimIndexer *indexer,
                       const std::vector<RefOrPayloadType> &arcs,
-                      const PcpSourceArcInfoVector &infoVec)
+                      const PcpArcInfoVector &infoVec,
+                      SdfPath nodePathAtIntroduction)
 {
     // This loop will be adding arcs and therefore can grow the node
     // storage vector, so we need to avoid holding any references
     // into that storage outside the loop.
-    for (size_t arcNum=0; arcNum < arcs.size(); ++arcNum) {
-        const RefOrPayloadType & refOrPayload = arcs[arcNum];
-        const PcpSourceArcInfo& info = infoVec[arcNum];
-        const SdfLayerHandle & srcLayer = info.layer;
+    for (size_t i=0; i < arcs.size(); ++i) {
+        const RefOrPayloadType & refOrPayload = arcs[i];
+        const PcpArcInfo& info = infoVec[i];
+        const SdfLayerHandle & srcLayer = info.sourceLayer;
         SdfLayerOffset layerOffset = refOrPayload.GetLayerOffset();
 
         PCP_INDEXING_MSG(
@@ -2084,7 +2150,7 @@ _EvalRefOrPayloadArcs(PcpNodeRef node,
         } else {
             // Apply the layer stack offset for the introducing layer to the 
             // reference or payload's layer offset.
-            layerOffset = info.layerStackOffset * layerOffset;
+            layerOffset = info.sourceLayerStackOffset * layerOffset;
         }
 
         // Go no further if we've found any problems.
@@ -2122,7 +2188,9 @@ _EvalRefOrPayloadArcs(PcpNodeRef node,
             // Compose any file format arguments that may come from the asset
             // file format if it's dynamic.
             _ComposeFieldsForFileFormatArguments(
-                node, *indexer, refOrPayload, &args);
+                        node, *indexer, refOrPayload, 
+                        nodePathAtIntroduction, info.arcNum, 
+                        &args);
             Pcp_GetArgumentsForFileFormatTarget(
                 refOrPayload.GetAssetPath(), 
                 indexer->inputs.fileFormatTarget, &args);
@@ -2259,9 +2327,13 @@ _EvalRefOrPayloadArcs(PcpNodeRef node,
         }
 
         // Final prim path to use.
-        SdfPath const &primPath = defaultPrimPath.IsEmpty() ? 
+        SdfPath primPath = defaultPrimPath.IsEmpty() ? 
             refOrPayload.GetPrimPath() : defaultPrimPath;
 
+        if (nodePathAtIntroduction != node.GetPath()) {
+            primPath = node.GetPath().ReplacePrefix(nodePathAtIntroduction, primPath);
+        }
+
         // The mapping for a reference (or payload) arc makes the source
         // and target map to each other.  Paths outside these will not map,
         // except for the case of internal references.
@@ -2281,12 +2353,16 @@ _EvalRefOrPayloadArcs(PcpNodeRef node,
         // not a root prim.
         opts.includeAncestralOpinions = !primPath.IsRootPrimPath();
 
+        const int namespaceDepth = PcpNode_GetNonVariantPathElementCount( 
+            nodePathAtIntroduction);
+
         _AddArc(indexer, ARC_TYPE,
                 /* parent = */ node,
                 /* origin = */ node,
                 PcpLayerStackSite( layerStack, primPath ),
                 mapExpr,
-                /* arcSiblingNum = */ arcNum,
+                info.arcNum,
+                namespaceDepth,
                 opts);
     }
 }
@@ -2306,7 +2382,7 @@ _EvalNodeReferences(
 
     // Compose value for local references.
     SdfReferenceVector refArcs;
-    PcpSourceArcInfoVector refInfo;
+    PcpArcInfoVector refInfo;
     std::unordered_set<std::string> exprVarDependencies;
     PcpErrorVector errors;
     PcpComposeSiteReferences(
@@ -2325,7 +2401,7 @@ _EvalNodeReferences(
 
     // Add each reference arc.
     _EvalRefOrPayloadArcs<SdfReference, PcpArcTypeReference>(
-        node, indexer, refArcs, refInfo);
+        node, indexer, refArcs, refInfo, node.GetPath());
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -2334,7 +2410,9 @@ _EvalNodeReferences(
 static void
 _EvalNodePayloads(
     const PcpNodeRef& node, 
-    Pcp_PrimIndexer *indexer)
+    Pcp_PrimIndexer *indexer,
+    Task::Type payloadType,
+    const SdfPath& nodePathAtIntroduction)
 {
     PCP_INDEXING_PHASE(
         indexer, node, "Evaluating payload for %s", 
@@ -2346,11 +2424,12 @@ _EvalNodePayloads(
 
     // Compose value for local payloads.
     SdfPayloadVector payloadArcs;
-    PcpSourceArcInfoVector payloadInfo;
+    PcpArcInfoVector payloadInfo;
     std::unordered_set<std::string> exprVarDependencies;
     PcpErrorVector errors;
-    PcpComposeSitePayloads(
-        node, &payloadArcs, &payloadInfo, &exprVarDependencies, &errors);
+
+    PcpComposeSitePayloads(node.GetLayerStack(), nodePathAtIntroduction, 
+            &payloadArcs, &payloadInfo, &exprVarDependencies, &errors);
 
     if (!exprVarDependencies.empty()) {
         indexer->outputs->expressionVariablesDependency.AddDependencies(
@@ -2368,12 +2447,14 @@ _EvalNodePayloads(
     }
 
     PCP_INDEXING_MSG(
-        indexer, node, "Found payload for node %s", node.GetPath().GetText());
+        indexer, node, "Found payload for node %s", nodePathAtIntroduction.GetText());
 
     // Mark that this prim index contains a payload.
     // However, only process the payload if it's been requested.
     PcpPrimIndex* index = &indexer->outputs->primIndex;
-    index->GetGraph()->SetHasPayloads(true);
+    if (nodePathAtIntroduction == node.GetPath()) {
+        index->GetGraph()->SetHasPayloads(true);
+    }
 
     const PcpPrimIndexInputs::PayloadSet* includedPayloads = 
         indexer->inputs.includedPayloads;
@@ -2387,6 +2468,32 @@ _EvalNodePayloads(
         return;
     }
 
+    // Payload type is expected to be either EvalNodeDynamicPayloads 
+    // (keepDynamicPayloads = true), which means evaluate dynamic payloads and 
+    // ignore static payloads, or EvalNodePayloads (keepDynamicPayloads = false), 
+    // which means to evaluate static payloads and ignore dynamic payloads.
+    const bool keepDynamicPayloads = 
+        (payloadType == Task::Type::EvalNodeDynamicPayloads);
+
+    auto payloadIt = payloadArcs.begin();
+    auto infoIt = payloadInfo.begin();
+
+    // Pre-process payload vector to only include arcs of type payloadType,
+    // which is either EvalNodePayloads or EvalNodeDynamicPayloads.
+    while (payloadIt != payloadArcs.end()) {
+        const bool isDynamicPayload = _GetDynamicFileFormat(
+            *payloadIt, indexer->inputs.fileFormatTarget);
+
+        if (isDynamicPayload == keepDynamicPayloads) {
+            ++payloadIt;
+            ++infoIt;
+        }
+        else {
+            payloadIt = payloadArcs.erase(payloadIt);
+            infoIt = payloadInfo.erase(infoIt);
+        }
+    }
+
     bool composePayload = false;
 
     // Compute the payload inclusion path that governs whether we should
@@ -2394,7 +2501,8 @@ _EvalNodePayloads(
     // to the root namespace. In particular, this handles the case where
     // we're computing ancestral payloads as part of a recursive prim index
     // computation.
-    SdfPath const path = indexer->MapNodePathToPayloadInclusionPath(node);
+    SdfPath const path = indexer->MapNodePathToPayloadInclusionPath(node, 
+        nodePathAtIntroduction);
 
     if (path.IsEmpty()) {
         // If the path mapping failed, it means there is no path in the
@@ -2422,7 +2530,18 @@ _EvalNodePayloads(
         // the payload to </D>, this payload is NOT automatically included as it
         // is a direct arc from the subroot reference arc and can be included or
         // excluded via including/excluding </E>
-        composePayload = true;
+
+        // Include the payloads using the current node's path.
+        _EvalRefOrPayloadArcs<SdfPayload, PcpArcTypePayload>(
+            node, indexer, payloadArcs, payloadInfo, node.GetPath());
+
+        // We need to evaluate dynamic payloads for this node at the end of the
+        // current prim index and cannot wait until the top level index as we
+        // do with non-subroot reference cases.
+        if (payloadType == Task::Type::EvalNodePayloads) {
+            indexer->AddTask(Task(Task::Type::EvalNodeDynamicPayloads, node));
+        }
+        return;
     }
     else if (auto const &pred = indexer->inputs.includePayloadPredicate) {
         // If there's a payload predicate, we invoke that to decide whether
@@ -2450,7 +2569,7 @@ _EvalNodePayloads(
     }
 
     _EvalRefOrPayloadArcs<SdfPayload, PcpArcTypePayload>(
-        node, indexer, payloadArcs, payloadInfo);
+        node, indexer, payloadArcs, payloadInfo, nodePathAtIntroduction);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -2510,9 +2629,19 @@ _EvalUnresolvedPrimPathError(
 
     if (!_PrimSpecExistsUnderNodeAtIntroduction(node, indexer)) {
         const PcpNodeRef parentNode = node.GetParentNode();
-        const SdfPath parentNodePath = 
+        SdfPath parentNodePath = 
             node.GetMapToParent().MapSourceToTarget(pathAtIntroduction);
 
+        // Map the node path at introduction to the parent node, also applying
+        // any variant selections from the parent path.
+        if (const SdfPath parentPath = parentNode.GetPath();
+                parentPath.ContainsPrimVariantSelection()) {
+
+            parentNodePath = parentNodePath.ReplacePrefix(
+                parentPath.StripAllVariantSelections(),
+                parentPath);
+        }
+
         PcpErrorUnresolvedPrimPathPtr err = PcpErrorUnresolvedPrimPath::New();
         err->rootSite = PcpSite(node.GetRootNode().GetSite());
         err->site = PcpSite(parentNode.GetLayerStack(), parentNodePath);
@@ -2520,7 +2649,7 @@ _EvalUnresolvedPrimPathError(
         err->unresolvedPath = pathAtIntroduction;
 
         err->sourceLayer = [&]() {
-            PcpSourceArcInfoVector srcInfo;
+            PcpArcInfoVector srcInfo;
             switch (node.GetArcType()) {
                 case PcpArcTypeReference: {
                     SdfReferenceVector unused;
@@ -2547,7 +2676,7 @@ _EvalUnresolvedPrimPathError(
             const size_t arcNum =
                 static_cast<size_t>(node.GetSiblingNumAtOrigin());
             return TF_VERIFY(arcNum < srcInfo.size()) ? 
-                srcInfo[arcNum].layer : SdfLayerHandle();
+                srcInfo[arcNum].sourceLayer : SdfLayerHandle();
         }();
 
         err->arcType = node.GetArcType();
@@ -2560,10 +2689,10 @@ _EvalUnresolvedPrimPathError(
 
 static void
 _ElideSubtree(
-    const Pcp_PrimIndexer& indexer,
-    PcpNodeRef node)
+    PcpNodeRef node,
+    bool cull)
 {
-    if (indexer.inputs.cull) {
+    if (cull) {
         node.SetCulled(true);
     }
     else {
@@ -2581,7 +2710,7 @@ _ElideSubtree(
     node.SetSpecContributionRestrictedDepth(1);
 
     TF_FOR_ALL(child, Pcp_GetChildrenRange(node)) {
-        _ElideSubtree(indexer, *child);
+        _ElideSubtree(*child, cull);
     }
 }
 
@@ -2608,7 +2737,7 @@ _ElideRelocatedSubtrees(
                 layerStack->GetIncrementalRelocatesSourceToTarget();
             if (relocatesSrcToTarget.find(childNode.GetPath()) !=
                 relocatesSrcToTarget.end()) {
-                _ElideSubtree(indexer, childNode);
+                _ElideSubtree(childNode, indexer.inputs.cull);
                 continue;
             }
         }
@@ -2719,7 +2848,7 @@ _EvalNodeRelocations(
             break;
         };
 
-        _ElideSubtree(*indexer, child);
+        _ElideSubtree(child, indexer->inputs.cull);
 
         PCP_INDEXING_UPDATE(
             indexer, child, 
@@ -3843,17 +3972,17 @@ _EvalImpliedSpecializes(
 // Variants
 
 static bool
-_NodeCanContributeToVariant(
+_NodeCanContributeAncestralOpinions(
     const PcpNodeRef& node,
-    const SdfPath& vsetPath)
+    const SdfPath& ancestralPath)
 {
-    // This node can contribute opinions to variant sets at vsetPath
+    // This node can contribute opinions to sites at ancestralPath
     // if there were no restrictions to opinions from this node OR
     // if the restriction to opinions occurred at a site that was
-    // deeper in namespace than vsetPath.
+    // deeper in namespace than ancestralPath.
     const size_t restrictionDepth = node.GetSpecContributionRestrictedDepth();
     return restrictionDepth == 0 ||
-        restrictionDepth > vsetPath.GetPathElementCount();
+        restrictionDepth > ancestralPath.GetPathElementCount();
 }
 
 static bool
@@ -3967,7 +4096,7 @@ _ComposeVariantSelectionAcrossNodes(
             continue;
         }
 
-        if (!_NodeCanContributeToVariant(node, pathInNode)) {
+        if (!_NodeCanContributeAncestralOpinions(node, pathInNode)) {
             continue;
         }
 
@@ -4326,6 +4455,32 @@ _EvalNodeVariantSets(
         node, node.GetPath(), indexer, /* isAncestral = */ false);
 }
 
+static void
+_EvalNodeAncestralDynamicPayloads(
+    const PcpNodeRef& node,
+    Pcp_PrimIndexer *indexer)
+{
+    PCP_INDEXING_PHASE(
+        indexer, node,
+        "Evaluating ancestral dynamic payloads at %s", 
+        Pcp_FormatSite(node.GetSite()).c_str());
+
+    for (SdfPath path = node.GetPath().GetParentPath();
+         !path.IsAbsoluteRootPath(); path = path.GetParentPath()) {
+        if (!_NodeCanContributeAncestralOpinions(node, path)) {
+            continue;
+        }
+
+        // path is either a prim path or a prim variant selection path.
+        // Enqueue tasks to evaluate payloads if we find any
+        // payloads at that path.
+        TF_VERIFY(path.IsPrimOrPrimVariantSelectionPath());
+
+        _EvalNodePayloads(
+            node, indexer, Task::Type::EvalNodeDynamicPayloads, path);
+    }
+}
+
 static void
 _EvalNodeAncestralVariantSets(
     const PcpNodeRef& node,
@@ -4339,7 +4494,7 @@ _EvalNodeAncestralVariantSets(
     for (SdfPath path = node.GetPath().GetParentPath();
          !path.IsAbsoluteRootPath(); path = path.GetParentPath()) {
 
-        if (!_NodeCanContributeToVariant(node, path)) {
+        if (!_NodeCanContributeAncestralOpinions(node, path)) {
             continue;
         }
 
@@ -4374,7 +4529,7 @@ _EvalNodeAuthoredVariant(
         vset.c_str(),
         Pcp_FormatSite(node.GetLayerStack(), vsetPath).c_str());
 
-    if (!_NodeCanContributeToVariant(node, vsetPath)) {
+    if (!_NodeCanContributeAncestralOpinions(node, vsetPath)) {
         return;
     }
 
@@ -4448,7 +4603,7 @@ _EvalNodeFallbackVariant(
         vset.c_str(),
         Pcp_FormatSite(node.GetLayerStack(), vsetPath).c_str());
 
-    if (!_NodeCanContributeToVariant(node, vsetPath)) {
+    if (!_NodeCanContributeAncestralOpinions(node, vsetPath)) {
         return;
     }
 
@@ -4654,11 +4809,11 @@ _ComputedAssetPathWouldCreateDifferentNode(
 }
 
 template <PcpArcType RefOrPayload>
-auto _GetSourceArcs(const PcpNodeRef& node, PcpSourceArcInfoVector* info);
+auto _GetSourceArcs(const PcpNodeRef& node, PcpArcInfoVector* info);
 
 template <>
 auto _GetSourceArcs<PcpArcTypeReference>(
-    const PcpNodeRef& node, PcpSourceArcInfoVector* info)
+    const PcpNodeRef& node, PcpArcInfoVector* info)
 {
     SdfReferenceVector refs;
     PcpComposeSiteReferences(node, &refs, info);
@@ -4667,7 +4822,7 @@ auto _GetSourceArcs<PcpArcTypeReference>(
 
 template <>
 auto _GetSourceArcs<PcpArcTypePayload>(
-    const PcpNodeRef& node, PcpSourceArcInfoVector* info)
+    const PcpNodeRef& node, PcpArcInfoVector* info)
 {
     SdfPayloadVector payloads;
     PcpComposeSitePayloads(node, &payloads, info);
@@ -4684,7 +4839,7 @@ _NeedToRecomputeDueToAssetPathChange(
 {
     auto arcRange = _GetDirectChildRange(node, RefOrPayload);
     if (arcRange.first != arcRange.second) {
-        PcpSourceArcInfoVector sourceInfo;
+        PcpArcInfoVector sourceInfo;
         const auto sourceArcs = _GetSourceArcs<RefOrPayload>(node, &sourceInfo);
         TF_VERIFY(sourceArcs.size() == sourceInfo.size());
 
@@ -5014,7 +5169,7 @@ _BuildInitialPrimIndexFromAncestor(
     int ancestorRecursionDepth,
     PcpPrimIndex_StackFrame *previousFrame,
     bool evaluateImpliedSpecializes,
-    bool evaluateVariants,
+    bool evaluateVariantsAndDynamicPayloads,
     bool rootNodeShouldContributeSpecs,
     const PcpPrimIndexInputs& inputs,
     PcpPrimIndexOutputs* outputs)
@@ -5059,7 +5214,7 @@ _BuildInitialPrimIndexFromAncestor(
         Pcp_BuildPrimIndex(parentSite, parentSite,
                            ancestorRecursionDepth+1,
                            evaluateImpliedSpecializes,
-                           evaluateVariants,
+                           evaluateVariantsAndDynamicPayloads,
                            /* rootNodeShouldContributeSpecs = */ true,
                            previousFrame, inputs, outputs);
 
@@ -5110,13 +5265,88 @@ _BuildInitialPrimIndexFromAncestor(
         "Adjusted ancestral index for %s", site.path.GetName().c_str());
 }
 
+// Recursively composes whether the node's site is a prohibited child of its
+// namespace parent due to being the source of a relocate. Our "salted earth"
+// policy indicates that if the source of a relocation can never be a valid 
+// child of its parent even when that parent (or any of its ancestors) is 
+// included via some arc in another prim index. Thus why we have to traverse
+// the whole prim index graph to see if the prim path is prohibited by any of
+// the contributing nodes.
+static bool
+_ComposeIsProhibitedPrimChild(Pcp_PrimIndexer *indexer)
+{
+    const PcpNodeRef rootNode = indexer->outputs->primIndex.GetRootNode();
+
+    auto range = PcpNodeRef_PrivateSubtreeConstRange(rootNode);
+    for (auto iter = range.begin(); iter != range.end(); ++iter) {
+        if (iter->IsCulled()) {
+            iter.PruneChildren();
+            continue;
+        }
+
+        const PcpNodeRef &node = *iter;
+        const PcpLayerStackRefPtr &layerStack = node.GetLayerStack();
+        if (node.IsInert() || !layerStack->HasRelocates()) {
+            continue;
+        }
+
+        // We look for the node path in its layer stack's relocation sources.
+        // The node belongs to a prohibited prim child if we find it.
+        const SdfRelocatesMap & relocatesSourceToTarget =
+            layerStack->GetIncrementalRelocatesSourceToTarget();
+        if (relocatesSourceToTarget.find(node.GetPath()) != 
+                relocatesSourceToTarget.end()) {
+            // Report a composition error if this prohibited prim index was
+            // meant to be the target of a composition arc.
+            if (indexer->previousFrame) {
+                PcpErrorArcToProhibitedChildPtr err = 
+                    PcpErrorArcToProhibitedChild::New();
+                err->rootSite = indexer->rootSite;
+                err->site = indexer->previousFrame->parentNode.GetSite();
+                err->targetSite = indexer->previousFrame->requestedSite;
+                err->relocationSourceSite = node.GetSite();
+                err->arcType = indexer->previousFrame->arcToParent->type;
+                indexer->RecordError(err);
+            }
+
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Force culls all nodes from the output prim index if would be prohibited as
+// a namespace child of its parent due to the relocation source salted earth
+// policy.
+static bool
+_ElidePrimIndexIfProhibited(Pcp_PrimIndexer *indexer)
+{   
+    TRACE_FUNCTION();
+
+    // Otherwise traverse the prim index graph to see if any node site is
+    // a prohibited child of its parent.
+    if (_ComposeIsProhibitedPrimChild(indexer)) {
+        // We set the root node as inert and force cull all the children as they
+        // are not meant to be part of this prim index.
+        PcpNodeRef rootNode = indexer->outputs->primIndex.GetRootNode();
+        rootNode.SetInert(true);
+        TF_FOR_ALL(child, Pcp_GetChildrenRange(rootNode)) {
+            _ElideSubtree(*child, /* cull = */ true);
+        }
+        return true;
+    }
+
+    return false;
+}
+
 static void
 Pcp_BuildPrimIndex(
     const PcpLayerStackSite & site,
     const PcpLayerStackSite& rootSite,
     int ancestorRecursionDepth,
     bool evaluateImpliedSpecializes,
-    bool evaluateVariants,
+    bool evaluateVariantsAndDynamicPayloads,
     bool rootNodeShouldContributeSpecs,
     PcpPrimIndex_StackFrame *previousFrame,
     const PcpPrimIndexInputs& inputs,
@@ -5146,7 +5376,13 @@ Pcp_BuildPrimIndex(
         // Optimization: Since no composition arcs can live on the
         // pseudo-root, we can return early.
         return;
-    } else if (site.path.IsPrimVariantSelectionPath()) {
+    } 
+    
+    Pcp_PrimIndexer indexer(inputs, outputs, rootSite, ancestorRecursionDepth,
+                            previousFrame, evaluateImpliedSpecializes,
+                            evaluateVariantsAndDynamicPayloads);
+
+    if (site.path.IsPrimVariantSelectionPath()) {
         // For variant selection paths, unlike regular prim paths, we do not
         // recurse on the parent to obtain ancestral opinions. This is
         // because variant arcs are evaluated in the process of evaluating
@@ -5164,15 +5400,32 @@ Pcp_BuildPrimIndex(
         // contribute opinions to this child.
         _BuildInitialPrimIndexFromAncestor(
             site, rootSite, ancestorRecursionDepth, previousFrame,
-            evaluateImpliedSpecializes, evaluateVariants,
+            evaluateImpliedSpecializes, evaluateVariantsAndDynamicPayloads,
             rootNodeShouldContributeSpecs,
             inputs, outputs);
+
+        // At this point the prim index contains only the ancestral arcs that 
+        // contribute to this path. Any of these nodes could represent a path in
+        // its layer stack that has been relocated to another path. And if that
+        // is the case, we need to employ the salted earth policy and cull all
+        // opinions from this prim index.
+        // 
+        // Note that if we are building a prim index for a relocation node, it's
+        // guaranteed that the root node of the graph is the source of a 
+        // relocation, but the root node is also guaranteed to be inert so that
+        // won't mark the prim index as prohibited. But this will catch the 
+        // cases where the another arc below the relocation might be the source
+        // of a different relocates causing it, and therefore the prim index 
+        // we're building for a relocation arc, to be be prohibited.
+        if (_ElidePrimIndexIfProhibited(&indexer)) {
+            // If the prim index is prohibited, there will be no nodes 
+            // contributing opinions we won't have any tasks to process and can
+            // just return.
+            return;
+        }
     }
 
     // Initialize the task list.
-    Pcp_PrimIndexer indexer(inputs, outputs, rootSite, ancestorRecursionDepth,
-                            previousFrame, evaluateImpliedSpecializes,
-                            evaluateVariants);
     indexer.AddTasksForRootNode(outputs->primIndex.GetRootNode());
 
     // Process task list.
@@ -5189,8 +5442,16 @@ Pcp_BuildPrimIndex(
         case Task::Type::EvalNodeReferences:
             _EvalNodeReferences(task.node, &indexer);
             break;
-        case Task::Type::EvalNodePayload:
-            _EvalNodePayloads(task.node, &indexer);
+        case Task::Type::EvalNodeAncestralDynamicPayloads:
+            _EvalNodeAncestralDynamicPayloads(task.node, &indexer);
+            break;
+        case Task::Type::EvalNodeDynamicPayloads:
+            _EvalNodePayloads(task.node, &indexer, 
+                Task::Type::EvalNodeDynamicPayloads, task.node.GetPath());
+            break;
+        case Task::Type::EvalNodePayloads:
+            _EvalNodePayloads(task.node, &indexer, 
+                Task::Type::EvalNodePayloads, task.node.GetPath());
             break;
         case Task::Type::EvalNodeInherits:
             _EvalNodeInherits(task.node, &indexer);
@@ -5277,7 +5538,7 @@ PcpComputePrimIndex(
     Pcp_BuildPrimIndex(site, site,
                        /* ancestorRecursionDepth = */ 0,
                        /* evaluateImpliedSpecializes = */ true,
-                       /* evaluateVariants = */ true,
+                       /* evaluateVariantsAndDynamicPayloads = */ true,
                        /* rootNodeShouldContributeSpecs = */ true,
                        /* previousFrame = */ NULL,
                        inputs, outputs);
@@ -5336,6 +5597,10 @@ _ComposePrimChildNamesAtNode(
     PcpTokenSet *nameSet,
     PcpTokenSet *prohibitedNameSet)
 {
+    if (!node.CanContributeSpecs()) {
+        return;
+    }
+
     if (node.GetLayerStack()->HasRelocates()) {
         // Apply relocations from just this layer stack.
         // Classify them into three groups:  names to add, remove, or replace.
@@ -5454,12 +5719,10 @@ _ComposePrimChildNamesAtNode(
     }
 
     // Compose the site's local names over the current result.
-    if (node.CanContributeSpecs()) {
-        PcpComposeSiteChildNames(
-            node.GetLayerStack()->GetLayers(), node.GetPath(), 
-            SdfChildrenKeys->PrimChildren, nameOrder, nameSet,
-            &SdfFieldKeys->PrimOrder);
-    }
+    PcpComposeSiteChildNames(
+        node.GetLayerStack()->GetLayers(), node.GetPath(), 
+        SdfChildrenKeys->PrimChildren, nameOrder, nameSet,
+        &SdfFieldKeys->PrimOrder);
 
     // Post-conditions, for debugging.
     // Disabled by default to avoid extra overhead.
diff --git a/pxr/usd/pcp/primIndex.h b/pxr/usd/pcp/primIndex.h
index 5d0f13decb..6b31c7da48 100644
--- a/pxr/usd/pcp/primIndex.h
+++ b/pxr/usd/pcp/primIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_PRIM_INDEX_H
 #define PXR_USD_PCP_PRIM_INDEX_H
@@ -112,6 +95,19 @@ class PcpPrimIndex
         _graph = graph;
     }
 
+    /// Add the nodes in \p childPrimIndex to this prim index; \p arcToParent
+    /// specifies the node in this prim index where the root node of \p
+    /// childPrimIndex will be added, along with other information about the
+    /// composition arc connecting the two prim indexes.
+    ///
+    /// Return the node in this prim index corresponding to the root node
+    /// of \p childPrimIndex.
+    ///
+    PcpNodeRef AddChildPrimIndex(
+        const PcpArc &arcToParent, 
+        PcpPrimIndex &&childPrimIndex,
+        PcpErrorBasePtr *error);
+
     const PcpPrimIndex_GraphRefPtr &GetGraph() const {
         return _graph;
     }
diff --git a/pxr/usd/pcp/primIndex_Graph.cpp b/pxr/usd/pcp/primIndex_Graph.cpp
index 8095018f65..4ae967d559 100644
--- a/pxr/usd/pcp/primIndex_Graph.cpp
+++ b/pxr/usd/pcp/primIndex_Graph.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/primIndex_Graph.h b/pxr/usd/pcp/primIndex_Graph.h
index 0cadf001f4..160cd7457f 100644
--- a/pxr/usd/pcp/primIndex_Graph.h
+++ b/pxr/usd/pcp/primIndex_Graph.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_PRIM_INDEX_GRAPH_H
 #define PXR_USD_PCP_PRIM_INDEX_GRAPH_H
diff --git a/pxr/usd/pcp/primIndex_StackFrame.cpp b/pxr/usd/pcp/primIndex_StackFrame.cpp
index 064028754f..5fc385a138 100644
--- a/pxr/usd/pcp/primIndex_StackFrame.cpp
+++ b/pxr/usd/pcp/primIndex_StackFrame.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/pcp/primIndex_StackFrame.h"
diff --git a/pxr/usd/pcp/primIndex_StackFrame.h b/pxr/usd/pcp/primIndex_StackFrame.h
index e11b684e4c..68ad3966bd 100644
--- a/pxr/usd/pcp/primIndex_StackFrame.h
+++ b/pxr/usd/pcp/primIndex_StackFrame.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_PRIM_INDEX_STACK_FRAME_H
 #define PXR_USD_PCP_PRIM_INDEX_STACK_FRAME_H
diff --git a/pxr/usd/pcp/propertyIndex.cpp b/pxr/usd/pcp/propertyIndex.cpp
index b304275c12..b7cddbad45 100644
--- a/pxr/usd/pcp/propertyIndex.cpp
+++ b/pxr/usd/pcp/propertyIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/propertyIndex.h b/pxr/usd/pcp/propertyIndex.h
index a25b84a8e4..38aaa3e7f5 100644
--- a/pxr/usd/pcp/propertyIndex.h
+++ b/pxr/usd/pcp/propertyIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_PROPERTY_INDEX_H
 #define PXR_USD_PCP_PROPERTY_INDEX_H
diff --git a/pxr/usd/pcp/pyUtils.cpp b/pxr/usd/pcp/pyUtils.cpp
index 5237d9976f..e468a2c6f6 100644
--- a/pxr/usd/pcp/pyUtils.cpp
+++ b/pxr/usd/pcp/pyUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/pyUtils.h b/pxr/usd/pcp/pyUtils.h
index b2e4438680..3c88869faa 100644
--- a/pxr/usd/pcp/pyUtils.h
+++ b/pxr/usd/pcp/pyUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_PY_UTILS_H
 #define PXR_USD_PCP_PY_UTILS_H
diff --git a/pxr/usd/pcp/site.cpp b/pxr/usd/pcp/site.cpp
index 11a3f79827..a4086ba17f 100644
--- a/pxr/usd/pcp/site.cpp
+++ b/pxr/usd/pcp/site.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/site.h b/pxr/usd/pcp/site.h
index caf122cc41..112b5bc0ee 100644
--- a/pxr/usd/pcp/site.h
+++ b/pxr/usd/pcp/site.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_SITE_H
 #define PXR_USD_PCP_SITE_H
diff --git a/pxr/usd/pcp/statistics.cpp b/pxr/usd/pcp/statistics.cpp
index d3eeb5543d..e229be056f 100644
--- a/pxr/usd/pcp/statistics.cpp
+++ b/pxr/usd/pcp/statistics.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/statistics.h b/pxr/usd/pcp/statistics.h
index 434383f572..85297c2cba 100644
--- a/pxr/usd/pcp/statistics.h
+++ b/pxr/usd/pcp/statistics.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_STATISTICS_H
 #define PXR_USD_PCP_STATISTICS_H
diff --git a/pxr/usd/pcp/strengthOrdering.cpp b/pxr/usd/pcp/strengthOrdering.cpp
index 0fd7f78c98..ed7dd92248 100644
--- a/pxr/usd/pcp/strengthOrdering.cpp
+++ b/pxr/usd/pcp/strengthOrdering.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -393,4 +376,36 @@ PcpCompareNodeStrength(
     return _CompareNodeStrength(a, aNodes, b, bNodes);
 }
 
+int
+PcpCompareSiblingPayloadNodeStrength(const PcpNodeRef& payloadParent, 
+    int payloadArcNum, const PcpNodeRef& siblingNode) {
+    if (payloadParent != siblingNode.GetParentNode()) {
+        TF_CODING_ERROR("Nodes are not siblings");
+        return 0;
+    }
+
+    // ArcType.
+    // We rely on the enum values being in strength order.
+    if (PcpArcTypePayload < siblingNode.GetArcType())
+        return -1;
+    if (PcpArcTypePayload > siblingNode.GetArcType())
+        return 1;
+
+    // Origin namespace depth.
+    // Higher values (deeper opinions) are stronger.
+    if (payloadParent.GetNamespaceDepth() > siblingNode.GetNamespaceDepth())
+        return -1;
+    if (payloadParent.GetNamespaceDepth() < siblingNode.GetNamespaceDepth())
+        return 1;
+
+    // Origin sibling arc number.
+    // Lower numbers are stronger.
+    if (payloadArcNum < siblingNode.GetSiblingNumAtOrigin())
+        return -1;
+    if (payloadArcNum > siblingNode.GetSiblingNumAtOrigin())
+        return 1;
+
+    return 0;
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/pcp/strengthOrdering.h b/pxr/usd/pcp/strengthOrdering.h
index 8f7ba2b334..8ac98e90ac 100644
--- a/pxr/usd/pcp/strengthOrdering.h
+++ b/pxr/usd/pcp/strengthOrdering.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_STRENGTH_ORDERING_H
 #define PXR_USD_PCP_STRENGTH_ORDERING_H
@@ -52,6 +35,18 @@ PCP_API
 int
 PcpCompareNodeStrength(const PcpNodeRef& a, const PcpNodeRef& b);
 
+/// Compares the strength of a payload node with arcSiblingNum \p payloadArcNum
+/// to a sibling node \p siblingNode. These nodes must be siblings:  
+/// it is a coding error if \p siblingNode 's parent node is not \p payloadParent.
+///
+/// Returns -1 if the payload node is stronger than siblingNode,
+///          0 if the payload node is equivalent to siblingNode,
+///          1 if the payload node is weaker than siblingNode
+PCP_API
+int
+PcpCompareSiblingPayloadNodeStrength(const PcpNodeRef& payloadParent, 
+    int payloadArcNum, const PcpNodeRef& siblingNode);
+
 PXR_NAMESPACE_CLOSE_SCOPE
 
 #endif // PXR_USD_PCP_STRENGTH_ORDERING_H
diff --git a/pxr/usd/pcp/targetIndex.cpp b/pxr/usd/pcp/targetIndex.cpp
index 9520ba5c8b..ffe45a4d03 100644
--- a/pxr/usd/pcp/targetIndex.cpp
+++ b/pxr/usd/pcp/targetIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -243,6 +226,13 @@ _TargetIsPermitted(
     const SdfPath owningPrimInRootNS = connectionPathInRootNS.GetPrimPath();
     const PcpPrimIndex& owningPrimIndex = context.GetTargetObjectPrimIndex();
 
+    // If the root node of the prim index is inert, the prim index is an 
+    // invalid prim, typically because it is or is under the source of a 
+    // relocation and is therefore prohibited.
+    if (owningPrimIndex.GetRootNode().IsInert()) {
+        return InvalidTarget;
+    }
+
     // Search for the node for the owning prim where the connection was
     // authored. 
     const SdfPath owningPrimInNodeNS = connectionPathInNodeNS.GetPrimPath();
diff --git a/pxr/usd/pcp/targetIndex.h b/pxr/usd/pcp/targetIndex.h
index 26ddb7a21e..02b427db0d 100644
--- a/pxr/usd/pcp/targetIndex.h
+++ b/pxr/usd/pcp/targetIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_TARGET_INDEX_H
 #define PXR_USD_PCP_TARGET_INDEX_H
diff --git a/pxr/usd/pcp/testenv/TestPcpDynamicFileFormatPlugin.cpp b/pxr/usd/pcp/testenv/TestPcpDynamicFileFormatPlugin.cpp
index 3c44f017b2..e7db370170 100644
--- a/pxr/usd/pcp/testenv/TestPcpDynamicFileFormatPlugin.cpp
+++ b/pxr/usd/pcp/testenv/TestPcpDynamicFileFormatPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/envSetting.h"
@@ -578,6 +561,8 @@ Test_PcpDynamicFileFormatPlugin_FileFormat::ComposeFieldsForFileFormatArguments(
         if (depth < 1) {
             return;
         }
+        (*args)[Test_PcpDynamicFileFormatPlugin_FileFormatTokens->Depth] = 
+        TfStringify(depth);
     }
     int num = 0;
     if (_ExtractArg(Test_PcpDynamicFileFormatPlugin_FileFormatTokens->Num, 
@@ -585,11 +570,9 @@ Test_PcpDynamicFileFormatPlugin_FileFormat::ComposeFieldsForFileFormatArguments(
         if (num < 1) {
             return;
         }
-    }
-    (*args)[Test_PcpDynamicFileFormatPlugin_FileFormatTokens->Depth] = 
-        TfStringify(depth);
-    (*args)[Test_PcpDynamicFileFormatPlugin_FileFormatTokens->Num] = 
+        (*args)[Test_PcpDynamicFileFormatPlugin_FileFormatTokens->Num] = 
         TfStringify(num);
+    }
 
     // Compose the radius and height metadata and add them as well.
     double radius = 10.0;
diff --git a/pxr/usd/pcp/testenv/TestPcpStreamingLayerReload.cpp b/pxr/usd/pcp/testenv/TestPcpStreamingLayerReload.cpp
index fa6712c0e0..0fba5ccade 100644
--- a/pxr/usd/pcp/testenv/TestPcpStreamingLayerReload.cpp
+++ b/pxr/usd/pcp/testenv/TestPcpStreamingLayerReload.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/staticTokens.h"
diff --git a/pxr/usd/pcp/testenv/testPcpCache.py b/pxr/usd/pcp/testenv/testPcpCache.py
index 802c844546..6eb7f19b2b 100644
--- a/pxr/usd/pcp/testenv/testPcpCache.py
+++ b/pxr/usd/pcp/testenv/testPcpCache.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Pcp, Tf
 import unittest, os
diff --git a/pxr/usd/pcp/testenv/testPcpChanges.py b/pxr/usd/pcp/testenv/testPcpChanges.py
index 4e4a0b1241..a3da4c2010 100644
--- a/pxr/usd/pcp/testenv/testPcpChanges.py
+++ b/pxr/usd/pcp/testenv/testPcpChanges.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Pcp, Tf
 import unittest
@@ -983,5 +966,492 @@ def test_ChangesToCulledAncestralNodes(self):
             self.assertEqual(cp.GetPrimChanges(),
                              ['/FSToyCarA/Looks/PaintedWood_PaintedYellow'])
 
+    def test_AddMuteRemoveSublayerWithRelocates(self):
+        """Tests that adding/muting/removing sublayers that only define layer 
+           relocates will invalidate affected cached prim indexes."""
+
+        # Start with simple setup. Root layer has one prim that references 
+        # a simple hierarchy in ref layer
+        refLayer = Sdf.Layer.CreateAnonymous()
+        refLayer.ImportFromString(
+            '''#sdf 1.4.32
+                def "Ref" {
+                    def "A" {
+                        def "B" {
+                            def "C" {
+                            }                         
+                        }
+                    }
+                }''')
+
+        rootLayer = Sdf.Layer.CreateAnonymous()
+        rootLayer.ImportFromString(
+            '''#sdf 1.4.32
+                def "Root" (
+                    references = @''' + refLayer.identifier + '''@</Ref>
+                ) {}''')
+
+        # Create the PcpCache
+        layerStackId = Pcp.LayerStackIdentifier(rootLayer)
+        cache = Pcp.Cache(layerStackId, usd=True)
+
+        from contextlib import contextmanager
+        @contextmanager
+        def _VerifyChanges(primIndexPaths):
+            # Verify that we have a computed prim index for all expected paths
+            # beforehand
+            for path in primIndexPaths:
+                self.assertTrue(cache.FindPrimIndex(path))
+            try:
+                yield
+            finally:
+                for path in primIndexPaths:
+                    self.assertFalse(cache.FindPrimIndex(path))
+
+        # Verify computed prim indexes for initial setup
+
+        # /Root has child 'A'
+        pi, err = cache.ComputePrimIndex('/Root')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['A'], []))
+
+        # /Root/A has child 'B'
+        pi, err = cache.ComputePrimIndex('/Root/A')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['B'], []))
+
+        # /Root/A/B has child 'C'
+        pi, err = cache.ComputePrimIndex('/Root/A/B')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['C'], []))
+
+        # Create a layer whose only contents is a relocate from /Root/A to
+        # /Root/Foo.
+        subLayer1 = Sdf.Layer.CreateAnonymous()
+        subLayer1.ImportFromString(
+            '''#sdf 1.4.32
+                (
+                    relocates = {
+                        </Root/A> : </Root/Foo>
+                    }
+                )''')
+        self.assertFalse(subLayer1.empty)
+
+        # Add this layer as sublayer of root and verify all our previously
+        # cached prim indices have been invalidated.
+        with _VerifyChanges(['/Root', '/Root/A', '/Root/A/B']):
+            with Pcp._TestChangeProcessor(cache) as cp:
+                rootLayer.subLayerPaths = [subLayer1.identifier]
+                self.assertEqual(cp.GetSignificantChanges(), ['/'])
+
+        # Verify computed prim indexes with new relocates
+
+        # /Root has child 'Foo' and prohibits child 'A'
+        pi, err = cache.ComputePrimIndex('/Root')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['Foo'], ['A']))
+
+        # '/Root/Foo' has child 'B'
+        pi, err = cache.ComputePrimIndex('/Root/Foo')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['B'], []))
+
+        # '/Root/Foo/B' has child 'C'
+        pi, err = cache.ComputePrimIndex('/Root/Foo/B')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['C'], []))
+
+        # Create another new layer whose only contents is a relocate from 
+        # /Root/Foo/B to /Root/Foo/Bar.
+        subLayer2 = Sdf.Layer.CreateAnonymous()
+        subLayer2.ImportFromString(
+            '''#sdf 1.4.32
+                (
+                    relocates = {
+                        </Root/Foo/B> : </Root/Foo/Bar>
+                    }
+                )''')
+        self.assertFalse(subLayer2.empty)
+
+        # Add this layer as an additional sublayer of root and verify all our 
+        # previously cached prim indices have been invalidated.
+        with _VerifyChanges(['/Root', '/Root/Foo', '/Root/Foo/B']):
+            with Pcp._TestChangeProcessor(cache) as cp:
+                rootLayer.subLayerPaths = [
+                    subLayer1.identifier, subLayer2.identifier]
+                self.assertEqual(cp.GetSignificantChanges(), ['/'])
+
+        # Verify computed prim indexes with new relocates
+
+        # /Root has child 'Foo' and prohibits child 'A'
+        pi, err = cache.ComputePrimIndex('/Root')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['Foo'], ['A']))
+
+        # '/Root/Foo' has child 'Bar' and prohibits child 'B'
+        pi, err = cache.ComputePrimIndex('/Root/Foo')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['Bar'], ['B']))
+
+        # '/Root/Foo/Bar' has child 'C'
+        pi, err = cache.ComputePrimIndex('/Root/Foo/Bar')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['C'], []))
+
+        # Request muting of sublayer 2 and verify all our 
+        # previously cached prim indices have been invalidated.
+        with _VerifyChanges(['/Root', '/Root/Foo', '/Root/Foo/Bar']):
+            cache.RequestLayerMuting([subLayer2.identifier], [])
+
+        # Computed prim indexes and children will be back to the same as before
+        # we added sublayer 2
+        pi, err = cache.ComputePrimIndex('/Root')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['Foo'], ['A']))
+
+        pi, err = cache.ComputePrimIndex('/Root/Foo')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['B'], []))
+
+        pi, err = cache.ComputePrimIndex('/Root/Foo/B')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['C'], []))
+
+        # Request unmuting of sublayer 2 and verify all our 
+        # previously cached prim indices have been invalidated.
+        with _VerifyChanges(['/Root', '/Root/Foo', '/Root/Foo/B']):
+            cache.RequestLayerMuting([],[subLayer2.identifier])
+
+        # Computed prim indexes and children will be restored to the same as 
+        # before we muted sublayer 2
+        pi, err = cache.ComputePrimIndex('/Root')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['Foo'], ['A']))
+
+        pi, err = cache.ComputePrimIndex('/Root/Foo')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['Bar'], ['B']))
+
+        pi, err = cache.ComputePrimIndex('/Root/Foo/Bar')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['C'], []))
+
+        # Delete both sublayers from the root prim
+        with _VerifyChanges(['/Root', '/Root/Foo', '/Root/Foo/Bar']):
+            with Pcp._TestChangeProcessor(cache) as cp:
+                rootLayer.subLayerPaths = []
+                self.assertEqual(cp.GetSignificantChanges(), ['/'])
+
+        # Verify computed prim indexes are back to the initial setup
+        pi, err = cache.ComputePrimIndex('/Root')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['A'], []))
+
+        pi, err = cache.ComputePrimIndex('/Root/A')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['B'], []))
+
+        pi, err = cache.ComputePrimIndex('/Root/A/B')
+        self.assertFalse(len(err))
+        self.assertEqual(pi.ComputePrimChildNames(), (['C'], []))
+
+    def test_RelocatesMapFunctionChanges(self):
+        """Tests that adding/removing relocates correctly updates map functions
+        in reference nodes that are needed for target path mapping. Also tests
+        the behavior related to what prim indexes get invalidate when these
+        relocates are edited."""
+
+        # Test layer setup: /Root prim in root layer references /Ref prim in
+        # ref layer which references /Model prim in ref layer 2. /Model has 
+        # some descendants we can relocate.
+        # Also /OtherRoot prim in root layer references /OtherRef in ref
+        # ref layer which references the same /Model in ref layer 2. Nothing
+        # in /OtherRoot will be relocated but is present to demonstrate
+        # the specific cache invalidation effects when relocates are added
+        # for the first time.
+        modelLayer = Sdf.Layer.CreateAnonymous()
+        modelLayer.ImportFromString('''#sdf 1.4.32
+            def "Model" {
+                def "PreRelo" {
+                    def "PreReloChild" {
+                    }
+                }
+            }''')
+
+        refLayer = Sdf.Layer.CreateAnonymous()
+        refLayer.ImportFromString('''#sdf 1.4.32
+            def "Ref" (
+                references = @''' + modelLayer.identifier + '''@</Model>
+            ) {}
+            
+            def "OtherRef" (
+                references = @''' + modelLayer.identifier + '''@</Model>
+            ) {}
+            ''')
+
+        rootLayer = Sdf.Layer.CreateAnonymous()
+        rootLayer.ImportFromString('''#sdf 1.4.32
+            def "Root" (
+                references = @''' + refLayer.identifier + '''@</Ref>
+            ) {}
+            
+            def "OtherRoot" (
+                references = @''' + refLayer.identifier + '''@</OtherRef>
+            ) {}
+            ''')
+
+        # Create the cache for the root layer.
+        layerStackId = Pcp.LayerStackIdentifier(rootLayer)
+        cache = Pcp.Cache(layerStackId, usd=True)
+
+        # Helper function that finds cached prim indexes or computes a new prim
+        # index for every prim in the namespace hierarchy. Then it verifies that
+        # found and computed prim index paths match the paths we expected to be
+        # found and computed. The end result is every prim in the namespace 
+        # hierarchy will have a cached prim index when this is complete.
+        def _FindOrComputeAllPrimIndexes(
+                expectedFoundPaths, expectedComputedPaths):
+            foundPaths = []
+            computedPaths = []
+
+            def _FindOrComputeRecursive(path):
+                pi = cache.FindPrimIndex(path)
+                if pi:
+                    foundPaths.append(path)
+                else:
+                    pi, err = cache.ComputePrimIndex(path)
+                    self.assertFalse(err)
+                    computedPaths.append(path)
+                # Whether found or computed the prim index will be cache for this
+                # path.
+                self.assertTrue(cache.FindPrimIndex(path))
+
+                # Compute children of this path and recurse
+                childNames, prohibitedChildNames = pi.ComputePrimChildNames()
+                for child in childNames:
+                    childPath = path.AppendChild(child)
+                    _FindOrComputeRecursive(childPath)
+
+            _FindOrComputeRecursive(Sdf.Path.absoluteRootPath)
+
+            self.assertEqual(foundPaths, expectedFoundPaths)
+            self.assertEqual(computedPaths, expectedComputedPaths)
+
+        # Helper for verifying the map to parent functions on the two reference
+        # nodes in computed prim index for /Root evaluate to the expected 
+        # mappings. The prim index graph for /Root in this test should always be:
+        # 
+        # @rootLayer@</Root> --ref--> @refLayer@</Ref> --ref--> @modelLayer@</Model>
+        #      
+        def _VerifyRootPrimIndexRefNodeMapToParentFunctions(refNode1Map, refNode2Map):
+            pi = cache.FindPrimIndex('/Root')
+            self.assertTrue(pi)
+            refNode1 = pi.rootNode.children[0]
+            refNode2 = refNode1.children[0]
+            self.assertEqual(refNode1.mapToParent.Evaluate(),
+                             Pcp.MapFunction(refNode1Map))
+            self.assertEqual(refNode2.mapToParent.Evaluate(),
+                             Pcp.MapFunction(refNode2Map))
+
+        # Helper for setting a layer's relocates metadata to a new value with
+        # change processing and verifying the expected paths are logged as 
+        # significant changes, removing their prim indexes from the cache
+        def _SetRelocatesAndVerify(layer, relocates, expectedSignificantChanges):
+            with Pcp._TestChangeProcessor(cache) as cp:
+                if relocates is None:
+                    layer.ClearRelocates()
+                else:
+                    layer.relocates = relocates
+                # Relocates changes will only produce significant changes and
+                # no prim or spec changes.
+                self.assertEqual(cp.GetSignificantChanges(),
+                                 expectedSignificantChanges)
+                self.assertFalse(cp.GetPrimChanges())
+                self.assertFalse(cp.GetSpecChanges())
+
+            for path in expectedSignificantChanges:
+                self.assertFalse(cache.FindPrimIndex(path))
+
+        # To start, compute all prim indexes with no relocates
+        _FindOrComputeAllPrimIndexes(
+            expectedFoundPaths = [],
+            expectedComputedPaths = [
+                '/', '/Root', '/Root/PreRelo', '/Root/PreRelo/PreReloChild', 
+                '/OtherRoot', '/OtherRoot/PreRelo', '/OtherRoot/PreRelo/PreReloChild'])
+
+        # Without relocates, both of /Root's refence nodes' map to parent 
+        # functions are the single arc mapping from referencee to referencer
+        _VerifyRootPrimIndexRefNodeMapToParentFunctions(
+            refNode1Map = { '/Ref': '/Root' },
+            refNode2Map = { '/Model': '/Ref' })
+
+        # First case: we'll add relocates to the root layer.
+
+        # Relocate /Root/PreRelo to /Root/Relocated in the root layer.
+        #
+        # Because this is the first relocate added to this layer stack, 
+        # this causes a significant change to the entire hierarchy starting from
+        # the pseudoroot. This is because we don't store map expression 
+        # variables when there are no relocates for a layer stack to avoid the
+        # memory cost of tracking these in caches that never have relocates. The
+        # trade off is we pay a resync cost, and subsequently the memory cost, 
+        # on the first edit that introduces relocates.
+        _SetRelocatesAndVerify(
+            layer = rootLayer, 
+            relocates = [('/Root/PreRelo', '/Root/Relocated')], 
+            expectedSignificantChanges = ['/'])
+        # All prim indexes have to be recomputed but now /Root/PreRelo is 
+        # renamed to /Root/Relocated.
+        _FindOrComputeAllPrimIndexes(
+            expectedFoundPaths = [],
+            expectedComputedPaths = [
+                '/', '/Root', '/Root/Relocated', '/Root/Relocated/PreReloChild', 
+                '/OtherRoot', '/OtherRoot/PreRelo', '/OtherRoot/PreRelo/PreReloChild'])
+        # /Root's first reference node's map to parent function now includes the 
+        # relocation mapping (for target and connection path mapping).
+        _VerifyRootPrimIndexRefNodeMapToParentFunctions(
+            refNode1Map = { 
+                '/Ref': '/Root', 
+                '/Ref/PreRelo': '/Root/Relocated' },
+            refNode2Map = { '/Model': '/Ref' })
+
+        # Now add an additional relocate /Root/Relocated/PreReloChild to 
+        # /Root/Relocated/RelocatedChild in the root layer.
+        #
+        # This time, because we already had relocates on the root layer, 
+        # we only have significant changes on the relocated prim's prior
+        # path and new path.
+        _SetRelocatesAndVerify(
+            layer = rootLayer, 
+            relocates = [
+                ('/Root/PreRelo', '/Root/Relocated'),
+                ('/Root/Relocated/PreReloChild', '/Root/Relocated/RelocatedChild')], 
+            expectedSignificantChanges = [
+                '/Root/Relocated/PreReloChild', '/Root/Relocated/RelocatedChild'])
+        # Likewise, all prim indexes except /Root/Relocated/PreReloChild should
+        # be found in the cache and we need to compute the prim index at the 
+        # new path /Root/Relocated/RelocatedChild
+        _FindOrComputeAllPrimIndexes(
+            expectedFoundPaths = [
+                '/', '/Root', '/Root/Relocated', 
+                '/OtherRoot', '/OtherRoot/PreRelo', '/OtherRoot/PreRelo/PreReloChild'],
+            expectedComputedPaths = ['/Root/Relocated/RelocatedChild'])
+        # /Root's first reference node's map to parent function now includes 
+        # both relocation mappings.
+        _VerifyRootPrimIndexRefNodeMapToParentFunctions(
+            refNode1Map = { 
+                '/Ref': '/Root', 
+                '/Ref/PreRelo': '/Root/Relocated', 
+                '/Ref/PreRelo/PreReloChild': '/Root/Relocated/RelocatedChild' },
+            refNode2Map = { '/Model': '/Ref' })
+            
+        # Now clear all relocates on the root layer
+        #
+        # Just like when we added the first relocate to this layer stack,
+        # deleting all relocates from the layer stack also causes a 
+        # significant change to the whole hierarchy starting at the pseudoroot.
+        # This is the reciprocal of adding the first relocate and regains the 
+        # memory no longer needed for tracking relocates. But the trade off 
+        # again is a full resync.
+        _SetRelocatesAndVerify(
+            layer = rootLayer, 
+            relocates = None, 
+            expectedSignificantChanges = ['/'])
+        _FindOrComputeAllPrimIndexes(
+            expectedFoundPaths = [],
+            expectedComputedPaths = [
+                '/', '/Root', '/Root/PreRelo', '/Root/PreRelo/PreReloChild', 
+                '/OtherRoot', '/OtherRoot/PreRelo', '/OtherRoot/PreRelo/PreReloChild'
+            ])
+        # The reference nodes' map functions return to their original functions
+        # without relocation mappings.
+        _VerifyRootPrimIndexRefNodeMapToParentFunctions(
+            refNode1Map = { '/Ref': '/Root' },
+            refNode2Map = { '/Model': '/Ref' })
+
+        # Second case: we'll add relocates to the first ref layer.
+
+        # Relocate /Ref/PreRelo to /Ref/Relocated in the ref layer.
+        #
+        # This is the first relocate added to the reference's layer stack, 
+        # so this causes a significant change to any prim index in our cache
+        # that depends on the ref layer. In this cache, that is the prim at
+        # /Root AND the prim at /OtherRoot even though only /Root is 
+        # actually affected by the relocates.
+        _SetRelocatesAndVerify(
+            layer = refLayer, 
+            relocates = [('/Ref/PreRelo', '/Ref/Relocated')], 
+            expectedSignificantChanges = ['/OtherRoot', '/Root'])
+        # The pseudoroot prim index does not have to be recomputed, however all
+        # prim indexes have to be recomputed since both root level prims were 
+        # invalidated. Also /Root/PreRelo is renamed to /Root/Relocated as it
+        # is now relocated across the reference.
+        _FindOrComputeAllPrimIndexes(
+            expectedFoundPaths = ['/'],
+            expectedComputedPaths = [
+                '/Root', '/Root/Relocated', '/Root/Relocated/PreReloChild', 
+                '/OtherRoot', '/OtherRoot/PreRelo', '/OtherRoot/PreRelo/PreReloChild'
+            ])
+        # /Root's second reference node's map to parent function now includes 
+        # the relocation mapping from the ref layer.
+        _VerifyRootPrimIndexRefNodeMapToParentFunctions(
+            refNode1Map = { '/Ref': '/Root' },
+            refNode2Map = {
+                '/Model': '/Ref',
+                '/Model/PreRelo': '/Ref/Relocated' })
+
+        # Now add an additional relocate /Ref/Relocated/PreReloChild to 
+        # /Ref/Relocated/RelocatedChild in the ref layer.
+        #
+        # This time, because we already had relocates on the ref layer, 
+        # we only have significant changes on the prim indexes with dependencies
+        # on relocated prim's prior path and new path.
+        _SetRelocatesAndVerify(
+            layer = refLayer, 
+            relocates = [
+                ('/Ref/PreRelo', '/Ref/Relocated'),
+                ('/Ref/Relocated/PreReloChild', '/Ref/Relocated/RelocatedChild')], 
+            expectedSignificantChanges = [
+                '/Root/Relocated/PreReloChild', '/Root/Relocated/RelocatedChild'])
+        # Likewise, all prim indexes except /Root/Relocated/PreReloChild should
+        # be found in the cache and we need to compute the prim index at the 
+        # new path /Root/Relocated/RelocatedChild
+        _FindOrComputeAllPrimIndexes(
+            expectedFoundPaths = [
+                '/', '/Root', '/Root/Relocated', 
+                '/OtherRoot', '/OtherRoot/PreRelo', '/OtherRoot/PreRelo/PreReloChild'],
+            expectedComputedPaths = ['/Root/Relocated/RelocatedChild'])
+        # /Root's second reference node's map to parent function now includes 
+        # both relocation mappings.
+        _VerifyRootPrimIndexRefNodeMapToParentFunctions(
+            refNode1Map = { '/Ref': '/Root' },
+            refNode2Map = { 
+                '/Model': '/Ref',
+                '/Model/PreRelo': '/Ref/Relocated',
+                '/Model/PreRelo/PreReloChild': '/Ref/Relocated/RelocatedChild'})
+
+        # Now set the relocates to explicitly empty on the ref layer (which is
+        # different than clearing the relocates metadata).
+        #
+        # Just like clearing the relocates on the root layer, making relocates
+        # explicitly empty has the same effect where we need to resync 
+        # everything that depends on any paths in the ref layer which again 
+        # is /Root and /OtherRoot.
+        _SetRelocatesAndVerify(
+            layer = refLayer, 
+            relocates = [], 
+            expectedSignificantChanges = ['/OtherRoot', '/Root'])
+        _FindOrComputeAllPrimIndexes(
+            expectedFoundPaths = ['/'],
+            expectedComputedPaths = [
+                '/Root', '/Root/PreRelo', '/Root/PreRelo/PreReloChild', 
+                '/OtherRoot', '/OtherRoot/PreRelo', '/OtherRoot/PreRelo/PreReloChild'])
+        # The reference nodes' map functions return to their original functions
+        # without relocation mappings.
+        _VerifyRootPrimIndexRefNodeMapToParentFunctions(
+            refNode1Map = { '/Ref': '/Root' },
+            refNode2Map = { '/Model': '/Ref' }
+        )
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/pxr/usd/pcp/testenv/testPcpCompositionResults.py b/pxr/usd/pcp/testenv/testPcpCompositionResults.py
index 36a5cccb61..d9d485383a 100644
--- a/pxr/usd/pcp/testenv/testPcpCompositionResults.py
+++ b/pxr/usd/pcp/testenv/testPcpCompositionResults.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # This script is a simple driver for the PCP level of the composition
 # algorithm.  Given the inputs (currently just a root layer), it
@@ -180,10 +163,6 @@ def WalkNodes(node):
         assert pcpCache.FindPrimIndex(primPath) is not None
         errors += primIndexErrors
 
-        primStack = primIndex.primStack
-        if len(primStack) == 0:
-            continue
-
         print('-'*72)
         print('Results for composing <%s>' % (primPath))
 
@@ -259,7 +238,7 @@ def WalkNodes(node):
                     deletedTargetPathsMap[propPath] = deletedPaths
 
         print('\nPrim Stack:')
-        for primSpec in primStack:
+        for primSpec in primIndex.primStack:
             # Determine a short form of the spec's layer's path.
             layerLabel = GetLayerLabel(primSpec.layer)
             print('    %-20s %s' % (layerLabel, primSpec.path))
diff --git a/pxr/usd/pcp/testenv/testPcpDependencies.py b/pxr/usd/pcp/testenv/testPcpDependencies.py
index 3143784ee8..9fa31bc858 100644
--- a/pxr/usd/pcp/testenv/testPcpDependencies.py
+++ b/pxr/usd/pcp/testenv/testPcpDependencies.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 '''
 This test exercises the Pcp dependency API in specific scenarios
diff --git a/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.py b/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.py
index dfffc54c8b..e13637b4c8 100644
--- a/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.py
+++ b/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
@@ -303,7 +286,7 @@ def test_BasicRead(self):
         rootLayer = Sdf.Layer.FindOrOpen(rootLayerFile)
         self.assertTrue(rootLayer)
         cache = self._CreatePcpCache(rootLayer)
-                                        
+
         # Payloads for /RootCone - depth = 4, num = 3 : produces 40 payloads                                        
         payloads = self._GeneratePrimIndexPaths("/RootCone", 4, 3, 40)
         cache.RequestPayloads(payloads,[])
@@ -333,9 +316,11 @@ def test_BasicRead(self):
 
         print("test_BasicRead Success!\n")
 
-    def test_Variants(self):
+    def test_PayloadsInVariants(self):
         # Test dynamic payloads and arguments authored in variants.
 
+        print("\ntest_PayloadsInVariants start\n")
+
         rootLayerFile = 'root.sdf'
         rootLayer = Sdf.Layer.FindOrOpen(rootLayerFile)
         self.assertTrue(rootLayer)
@@ -349,6 +334,8 @@ def test_Variants(self):
         self._ComputeAndVerifyDynamicPayloads(cache, payloads, 
              ["TestPcp_depth", "TestPcp_height", "TestPcp_num", "TestPcp_radius"])
 
+        print("\ntest_PayloadsInVariants Success!\n")
+
     def test_NestedVariants(self):
         # Exercise a scenario with nested variants, dynamic payloads and
         # references to those constructs that don't resolve as expected.
@@ -383,7 +370,142 @@ def test_NestedVariants(self):
 
         print("\ntest_NestedVariants success!\n")
 
+    def test_InheritsAndVariants(self):
+        # Test that all inherits and variants can contribute
+        # opinions to parameters for dynamic payloads
+
+        print("\ntest_InheritsAndVariants start\n")
+
+        rootLayerFile = 'root.sdf'
+        rootLayer = Sdf.Layer.FindOrOpen(rootLayerFile)
+        self.assertTrue(rootLayer)
+        cache = self._CreatePcpCache(rootLayer)
+
+        # Inherits
+
+        payloads = self._GeneratePrimIndexPaths("/Inherits", 2, 3, 4)
+        cache.RequestPayloads(payloads, [])
+
+        self._ComputeAndVerifyDynamicPayloads(cache, payloads, 
+             ["TestPcp_depth", "TestPcp_height", "TestPcp_num", "TestPcp_radius"])
+        
+        # Verify that layers for each dynamic depth were generated and opened.
+        dynamicLayerFileName = "cone.testpcpdynamic"
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"2", "TestPcp_num":"3", "TestPcp_radius":"50"})))
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"1", "TestPcp_height":"3", "TestPcp_num":"3", "TestPcp_radius":"25"
+                 })))
+
+        # Variants
+
+        payloads = self._GeneratePrimIndexPaths("/VariantWithParams", 2, 3, 4)
+        cache.RequestPayloads(payloads, [])
+
+        self._ComputeAndVerifyDynamicPayloads(cache, payloads, 
+             ["TestPcp_depth", "TestPcp_height", "TestPcp_num", "TestPcp_radius"])
+        
+        # Verify that layers for each dynamic depth were generated and opened.
+        dynamicLayerFileName = "cone.testpcpdynamic"
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"2", "TestPcp_num":"3", "TestPcp_radius":"20"})))
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"1", "TestPcp_height":"3", "TestPcp_num":"3", "TestPcp_radius":"10"
+                 })))
+  
+        print("\ntest_InheritsAndVariants Success!\n")
+        
+    def test_WeakerOpinions(self):
+        # Test that opinions from weaker nodes do not
+        # affect parameters for stronger dynamic payloads
+    
+        print("\ntest_WeakerOpinions start\n")
+
+        rootLayerFile = 'root.sdf'
+        rootLayer = Sdf.Layer.FindOrOpen(rootLayerFile)
+        self.assertTrue(rootLayer)
+        cache = self._CreatePcpCache(rootLayer)
+
+        # Specializes arcs are weaker than payloads, and should not
+        # affect parameters for dynamic payloads
+        payloads = self._GeneratePrimIndexPaths("/Specializes", 3, 1, 3)
+        cache.RequestPayloads(payloads, [])
+
+        self._ComputeAndVerifyDynamicPayloads(cache, payloads, 
+             ["TestPcp_depth", "TestPcp_height", "TestPcp_num", "TestPcp_radius"])
+        
+        # Verify that layers for each dynamic depth were generated and opened.
+        dynamicLayerFileName = "cone.testpcpdynamic"
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"3", "TestPcp_radius":"50"})))
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"2", "TestPcp_height":"3", "TestPcp_num":"1", "TestPcp_radius":"25"
+                 })))
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"1", "TestPcp_height":"3", "TestPcp_num":"1", "TestPcp_radius":"12.5"
+                 })))
+
+        # Weaker siblings of the parent node should not
+        # affect parameters either
+        payloads = self._GeneratePrimIndexPaths("/WeakerParentSibling", 2, 3, 4)
+        cache.RequestPayloads(payloads, [])
+
+        self._ComputeAndVerifyDynamicPayloads(cache, payloads, 
+             ["TestPcp_depth", "TestPcp_height", "TestPcp_num", "TestPcp_radius"])
+        
+        dynamicLayerFileName = "cone.testpcpdynamic"
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"2", "TestPcp_num":"3"})))
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"1", "TestPcp_height":"3", "TestPcp_num":"3", "TestPcp_radius":"1.5"
+                 })))
+
+        print("\ntest_WeakerOpinions Success!\n")
+
+    def test_SiblingPayloads(self):
+        # Test that weaker regular sibling payloads do not affect
+        # parameters for stronger dynamic payloads and that
+        # stronger sibling payloads do
+
+        print("\ntest_SiblingPayloads start\n")
+        
+        rootLayerFile = 'root.sdf'
+        rootLayer = Sdf.Layer.FindOrOpen(rootLayerFile)
+        self.assertTrue(rootLayer)
+        cache = self._CreatePcpCache(rootLayer)
+
+        # /SiblingPayloads overrides the TestPcp_depth and TestPcp_num values that are
+        # originally defined in params.sdf.
+        payloads = self._GeneratePrimIndexPaths("/SiblingPayloads", 2, 3, 4)
+        cache.RequestPayloads(payloads, [])
+
+        self._ComputeAndVerifyDynamicPayloads(cache, payloads, 
+             ["TestPcp_depth", "TestPcp_height", "TestPcp_num", "TestPcp_radius"])
+        
+        # Verify that layers for each dynamic depth were generated and opened.
+        dynamicLayerFileName = "sphere.testpcpdynamic"
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"2", "TestPcp_num":"3"})))
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth":"1", "TestPcp_height":"3", "TestPcp_num":"3", "TestPcp_radius":"1.5"
+                 })))
+
+        print("\ntest_SiblingPayloads Success!\n")
+
     def test_AncestralPayloads(self):
+        print("\ntest_AncestralPayloads start\n")
+        
         # Test that loading a dynamic payload when composing ancestral
         # opinions picks up the right arguments.
 
@@ -408,12 +530,16 @@ def test_AncestralPayloads(self):
                                    "TestPcp_radius" : "50" })
              .GetPrimAtPath("/Root/Xform__3_2"))
             in pi.primStack)
+        
+        print("\ntest_AncestralPayloads Success!\n")
 
     def test_AncestralPayloads2(self):
         # Similar to test_AncestralPayloads but adds a non-internal reference
         # arc to further exercise path translation logic during argument
         # composition.
 
+        print("\ntest_AncestralPayloads2 start\n")
+
         rootLayer = Sdf.Layer.CreateAnonymous()
         rootLayer.ImportFromString("""
         #sdf 1.4.32
@@ -446,11 +572,46 @@ def "Root" (
                                    "TestPcp_radius" : "50" })
              .GetPrimAtPath("/Root/Xform__3_2"))
             in pi.primStack)
+        
+        print("\ntest_AncestralPayloads2 Success!\n")
+
+    def test_AncestralPayloads3(self):
+        # Test that evaluating ancestral payloads at the end works
+
+        print("\ntest_AncestralPayloads3 start\n")
+
+        # Create a PcpCache for root.sdf. Has a dynamic root prim /RootCone
+        rootLayerFile = 'root.sdf'
+        rootLayer = Sdf.Layer.FindOrOpen(rootLayerFile)
+        self.assertTrue(rootLayer)
+        cache = self._CreatePcpCache(rootLayer)
+
+        cache.RequestPayloads(["/World/Sets/MySet"],[])
+
+        pi, err = cache.ComputePrimIndex("/World/Sets/MySet/Group1/Subgroup/Relocated")
+        self.assertFalse(err)
+
+        dynamicLayerFileName = "cone.testpcpdynamic"
+        self.assertTrue(Sdf.Layer.Find(Sdf.Layer.CreateIdentifier(
+                dynamicLayerFileName,
+                {"TestPcp_depth": "4",  "TestPcp_num":"4", 
+                 "TestPcp_radius":"50"})))
+                                        
+        self.assertTrue(
+            Sdf.Layer.Find("cone.testpcpdynamic", 
+                            args={ "TestPcp_depth" : "4",
+                                   "TestPcp_num" : "4",
+                                   "TestPcp_radius" : "50" })
+             .GetPrimAtPath("/Root/Xform__3_3"))
+        
+        print("\ntest_AncestralPayloads3 Success!\n")
 
     def test_AncestralPayloadsAndVariants(self):
         # Test that loading a dynamic payload when composing ancestral
         # opinions within variants picks up the right arguments.
 
+        print("\ntest_AncestralPayloadsAndVariants start\n")
+
         rootLayerFile = 'root.sdf'
         rootLayer = Sdf.Layer.FindOrOpen(rootLayerFile)
         self.assertTrue(rootLayer)
@@ -472,6 +633,8 @@ def test_AncestralPayloadsAndVariants(self):
                                    "TestPcp_radius" : "50" })
              .GetPrimAtPath("/Root/Xform__4_3"))
             in pi.primStack)
+        
+        print("\ntest_AncestralPayloadsAndVariants Success!\n")
 
     def test_Changes(self):
         # Change processing behavior can be different for Pcp caches in USD mode
diff --git a/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/params.sdf b/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/params.sdf
index 5158228e58..232e62da77 100644
--- a/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/params.sdf
+++ b/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/params.sdf
@@ -24,3 +24,40 @@ def "Params" (
 
     double Pl2:TestPcp_height = 5
 }
+
+def "Params1" (
+    TestPcp_depth = 2
+    TestPcp_num = 3
+    )
+{
+    int TestPcp_depth = 2
+    int TestPcp_num = 3
+}
+
+def "Params2" (
+    TestPcp_depth = 3
+    TestPcp_radius = 50
+    )
+{
+    int TestPcp_depth = 3
+    double TestPcp_radius = 50
+}
+
+def "Params3" (
+    TestPcp_num = 3
+    variants = {
+        string dynamicVariant = "even"
+    }
+    prepend variantSets = "dynamicVariant"
+)
+{
+    int TestPcp_num = 3
+    variantSet "dynamicVariant" = {
+    "odd" (TestPcp_depth = 3) {
+      int TestPcp_depth = 3
+    }
+    "even" (TestPcp_depth = 2) {
+      int TestPcp_depth = 2
+    }
+  }
+}
diff --git a/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/payload.sdf b/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/payload.sdf
index aae1a9e145..b9ef0ed473 100644
--- a/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/payload.sdf
+++ b/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/payload.sdf
@@ -75,4 +75,14 @@ def "PayloadWithNestedVariants" (
             }
         }
     }
+}
+
+# Opinions from /Params1 should be used when opening the dynamic payload,
+# while those from /Params2 should not.
+def "PayloadSiblings" (
+payload = [@./params.sdf@</Params1>,
+           @sphere.testpcpdynamic@,
+           @./params.sdf@</Params2>]
+)
+{
 }
\ No newline at end of file
diff --git a/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/root.sdf b/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/root.sdf
index 5a30803955..29fc5106c0 100644
--- a/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/root.sdf
+++ b/pxr/usd/pcp/testenv/testPcpDynamicFileFormatPlugin.testenv/root.sdf
@@ -1,4 +1,7 @@
 #sdf 1.4.32
+(
+    relocates = {</World/Sets/MySet/Group1/Model>: </World/Sets/MySet/Group1/Subgroup/Relocated>}
+)
 
 def "RootCone" (
 references = [@./params.sdf@</Params>, @./payload.sdf@</PayloadCone>]
@@ -77,4 +80,89 @@ def "ReferenceAndNestedVariants" (
 )
 {
     double TestPcp_height = 120.0
-}
\ No newline at end of file
+}
+
+def "SiblingPayloads" (
+    references = [@./payload.sdf@</PayloadSiblings>]){}
+
+def "VariantWithParams" (
+    TestPcp_radius = 20
+    references = [@./params.sdf@</Params3>]
+    payload = @cone.testpcpdynamic@
+)
+{
+    double TestPcp_radius = 20
+}
+
+def "ParamRef" (
+    references = @./params.sdf@</Params1>
+){}
+
+def "Specializes" (
+    specializes = </ParamRef>
+    references = [@./params.sdf@</Params2>, @./payload.sdf@</PayloadCone>]
+){}
+
+def "Inherits" (
+    inherits = </ParamRef>
+    references = [@./params.sdf@</Params2>, @./payload.sdf@</PayloadCone>]
+){}
+
+def "WeakerParentSibling" (
+    references = [@./params.sdf@</Params1>,
+                  @./payload.sdf@</PayloadCone>,
+                  @./params.sdf@</Params2>]
+){}
+
+def "World" (
+)
+{
+    def "Sets"(
+    )
+    {
+        def "MySet"
+        (
+            references = </Set>
+            variants = {string x = "a"}
+        )
+        {
+            over "Group1" (
+            ) 
+            {
+                def "Subgroup"()
+                {
+
+                }
+            }
+
+        }
+    }
+}
+
+def "Set"
+(
+    variantSets = "x"
+)
+{
+    variantSet "x" = {
+       "a" (
+           TestPcp_num = 4
+           references = [@./params.sdf@</Params>, @./payload.sdf@</PayloadCone>]
+       )
+       {
+           int TestPcp_num = 4
+       }
+    }
+
+    def "Group1"
+    (
+        
+    )
+    {
+        def "Model"
+        () {
+
+        }
+
+    }
+}
diff --git a/pxr/usd/pcp/testenv/testPcpExpressionComposition.py b/pxr/usd/pcp/testenv/testPcpExpressionComposition.py
index e4e8f5adcf..ac6111ee5d 100644
--- a/pxr/usd/pcp/testenv/testPcpExpressionComposition.py
+++ b/pxr/usd/pcp/testenv/testPcpExpressionComposition.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/pcp/testenv/testPcpExpressionVariables.py b/pxr/usd/pcp/testenv/testPcpExpressionVariables.py
index f8f83e5d26..1482ce1dd1 100644
--- a/pxr/usd/pcp/testenv/testPcpExpressionVariables.py
+++ b/pxr/usd/pcp/testenv/testPcpExpressionVariables.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/pcp/testenv/testPcpExpressionVariablesSource.py b/pxr/usd/pcp/testenv/testPcpExpressionVariablesSource.py
index 25c1ed0fb4..1a00ba6812 100644
--- a/pxr/usd/pcp/testenv/testPcpExpressionVariablesSource.py
+++ b/pxr/usd/pcp/testenv/testPcpExpressionVariablesSource.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/pcp/testenv/testPcpHardToReach.cpp b/pxr/usd/pcp/testenv/testPcpHardToReach.cpp
index 48f19d8080..f35753f5e8 100644
--- a/pxr/usd/pcp/testenv/testPcpHardToReach.cpp
+++ b/pxr/usd/pcp/testenv/testPcpHardToReach.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/pcp/cache.h"
diff --git a/pxr/usd/pcp/testenv/testPcpInstanceKey.py b/pxr/usd/pcp/testenv/testPcpInstanceKey.py
index 1304df5d2d..d5131f6d62 100644
--- a/pxr/usd/pcp/testenv/testPcpInstanceKey.py
+++ b/pxr/usd/pcp/testenv/testPcpInstanceKey.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/pcp/testenv/testPcpIterator.cpp b/pxr/usd/pcp/testenv/testPcpIterator.cpp
index 67b1d32512..ab6688b7ed 100644
--- a/pxr/usd/pcp/testenv/testPcpIterator.cpp
+++ b/pxr/usd/pcp/testenv/testPcpIterator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/testenv/testPcpLayerMuting.py b/pxr/usd/pcp/testenv/testPcpLayerMuting.py
index a9d26e1d89..76f50eee5e 100644
--- a/pxr/usd/pcp/testenv/testPcpLayerMuting.py
+++ b/pxr/usd/pcp/testenv/testPcpLayerMuting.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Pcp, Tf
 import os, unittest
diff --git a/pxr/usd/pcp/testenv/testPcpLayerRelocatesEditBuilder.py b/pxr/usd/pcp/testenv/testPcpLayerRelocatesEditBuilder.py
new file mode 100644
index 0000000000..55264391c0
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpLayerRelocatesEditBuilder.py
@@ -0,0 +1,1233 @@
+#!/pxrpythonsubst
+#
+# Copyright 2024 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+
+import unittest
+
+from pxr import Pcp, Sdf, Tf
+
+def _FormatPath(pathInput):
+    return Sdf.Path(pathInput) if pathInput else Sdf.Path()
+
+# Converts a string -> string dictionary into an Sdf.Path -> Sdf.Path 
+# dictionary for easier expected value comparison.
+def _FormatRelocatesDict(relocatesDict):
+    return {_FormatPath(k) : _FormatPath(v) for k, v in relocatesDict.items()}
+
+# Converts a (string, string) tuple list into (Sdf.Path, Sdf.Path) tuples
+# for easiser expected valued comparison.
+def _FormatRelocatesTupleList(relocatesList):
+    return [(_FormatPath(k), _FormatPath(v)) for k, v in relocatesList]
+
+class TestPcpLayerRelocatesEditBuilder(unittest.TestCase):
+
+
+    # Adds a relocate to the edit builder that we expect to succeed and verifies
+    # that we end up with the expected relocates map.
+    def _AddRelocateAndVerify(self, builder, source, target, expectedRelocates):
+        self.assertTrue(
+            builder.Relocate(_FormatPath(source), _FormatPath(target)))
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+                         _FormatRelocatesDict(expectedRelocates))
+
+    # Removes a relocate by source path from the edit builder, which we expect
+    # to succeed, and verifies that we end up with the expected relocates map.
+    def _RemoveRelocateAndVerify(self, builder, source, expectedRelocates):
+        self.assertTrue(builder.RemoveRelocate(_FormatPath(source)))
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+                         _FormatRelocatesDict(expectedRelocates))
+
+    # Attempts to add a relocate to the builder that we expect to fail and
+    # verifies that adding it fails with the expected "why not" message.
+    def _VerifyInvalidRelocate(self, builder, source, target, expectedWhyNot):
+        initialRelocates = builder.GetEditedRelocatesMap()
+        initialEdits = builder.GetEdits()
+        result = builder.Relocate(_FormatPath(source), _FormatPath(target))
+        self.assertFalse(result)
+        self.assertEqual(result.whyNot, expectedWhyNot)
+        # Also verify that the relocates map and edits were not changed at all.
+        self.assertEqual(builder.GetEditedRelocatesMap(), initialRelocates)
+        self.assertEqual(builder.GetEdits(), initialEdits)
+
+    # Attempts to remove a relocate by source from the builder that, which we
+    # expect to fail, and verifies that removing it fails with the expected
+    # "why not" message.
+    def _VerifyInvalidRemoveRelocate(self, builder, source, expectedWhyNot):
+        initialRelocates = builder.GetEditedRelocatesMap()
+        initialEdits = builder.GetEdits()
+        result = builder.RemoveRelocate(_FormatPath(source))
+        self.assertFalse(result)
+        self.assertEqual(result.whyNot, expectedWhyNot)
+        # Also verify that the relocates map and edits were not changed at all.
+        self.assertEqual(builder.GetEditedRelocatesMap(), initialRelocates)
+        self.assertEqual(builder.GetEdits(), initialEdits)
+
+    # Creates the new empty layers, layer stack, and pcp cache for testing. 
+    # The root layer stack of the returned cache will consist of a root layer
+    # with two sublayers and will have a session layer.
+    def _CreateTestLayersAndPcpCache(self):
+        subLayer1 = Sdf.Layer.CreateAnonymous()
+        subLayer2 = Sdf.Layer.CreateAnonymous()
+        rootLayer = Sdf.Layer.CreateAnonymous()
+        rootLayer.subLayerPaths = [subLayer1.identifier, subLayer2.identifier]
+        sessionLayer = Sdf.Layer.CreateAnonymous()
+ 
+        # Create the PcpCache
+        layerStackId = Pcp.LayerStackIdentifier(rootLayer, sessionLayer)
+        cache = Pcp.Cache(layerStackId, usd=True)
+
+        # Call ComputeLayerStack before return so that cache.layerStack is 
+        # populated.
+        cache.ComputeLayerStack(layerStackId)
+        return cache
+        
+    # Verifies the edits builder's GetEdits() returns the expected layer 
+    # relocates edits.
+    def _VerifyExpectedEdits(self, builder, expectedEdits):
+        formattedExpectedEdits = [
+            (layer, _FormatRelocatesTupleList(relocates))
+                for layer, relocates in expectedEdits]
+        self.assertEqual(builder.GetEdits(), formattedExpectedEdits)
+
+    # Helper for applying relocates edits to layers making sure they are change
+    # processed by the cache.
+    def _ApplyEdits(self, cache, layerAndRelocatesPairs):
+        with Pcp._TestChangeProcessor(cache):
+            with Sdf.ChangeBlock():
+                for layer, relocates in layerAndRelocatesPairs:
+                    layer.relocates = relocates
+
+    # Verifies the the edits builder returns the expected edits, applies these
+    # edits, and then verifies the layer stack relocates match the builder's 
+    # relocates map.
+    def _ApplyAndVerifyExpectedEdits(self, builder, cache, expectedEdits):
+        self._VerifyExpectedEdits(builder, expectedEdits)
+        self._ApplyEdits(cache, builder.GetEdits())
+        self.assertEqual(cache.layerStack.incrementalRelocatesSourceToTarget, 
+                         builder.GetEditedRelocatesMap())
+
+    def test_InvalidAuthoredRelocates(self):
+        """Tests trying to add relocates that will always be invalid via the 
+            PcpRelocatesEditBuilder"""
+        
+        # New layer stack and edit builder. Starts with no relocates.
+        cache = self._CreateTestLayersAndPcpCache()
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), {})
+
+        # All of these relocates will fail to add because they are never valid
+        # source and target path configurations for relocates.
+        self._VerifyInvalidRelocate(builder, "/Root/A", "/Root/A",
+            "Cannot relocate </Root/A> to </Root/A>: The target of a relocate "
+            "cannot be the same as its source.")
+        self._VerifyInvalidRelocate(builder, "/Root/A", "/Root/A/B",
+            "Cannot relocate </Root/A> to </Root/A/B>: The target of a "
+            "relocate cannot be a descendant of its source.")
+        self._VerifyInvalidRelocate(builder, "/Root/A/B", "/Root/A",
+            "Cannot relocate </Root/A/B> to </Root/A>: The target of a "
+            "relocate cannot be an ancestor of its source.")
+        self._VerifyInvalidRelocate(builder, "/Root/A", "/Root",
+            "Cannot relocate </Root/A> to </Root>: The target of a "
+            "relocate cannot be an ancestor of its source.")
+        self._VerifyInvalidRelocate(builder, "/Root", "/Root/A",
+            "Cannot relocate </Root> to </Root/A>: The target of a "
+            "relocate cannot be a descendant of its source.")
+        self._VerifyInvalidRelocate(builder, "/Root", "/OtherRoot/Root",
+            "Cannot relocate </Root> to </OtherRoot/Root>: Adding a relocate "
+            "from </Root> would result in a root prim being relocated.")
+        self._VerifyInvalidRelocate(builder, "Root/A", "/Root/B",
+            "Cannot relocate <Root/A> to </Root/B>: Relocates must use "
+            "absolute paths.")
+        self._VerifyInvalidRelocate(builder, "/Root/A", "Root/B",
+            "Cannot relocate </Root/A> to <Root/B>: Relocates must use "
+            "absolute paths.")
+        self._VerifyInvalidRelocate(builder, "/Root/A.prop1", "/Root/A.prop2",
+            "Cannot relocate </Root/A.prop1> to </Root/A.prop2>: Only prims "
+            "can be relocated.")
+        self._VerifyInvalidRelocate(builder, "/Root/A{v=x}B", "/Root/C",
+            "Cannot relocate </Root/A{v=x}B> to </Root/C>: Relocates cannot "
+            "have any variant selections.")
+        self._VerifyInvalidRelocate(builder, "/Root/A/B", "/Root/A{v=x}",
+            "Cannot relocate </Root/A/B> to </Root/A{v=x}>: Relocates cannot "
+            "have any variant selections.")
+
+        # Each of above calls verifies the relocates map remained the same 
+        # (empty). Also verify that no layer edits are produced by builder.
+        self.assertEqual(builder.GetEdits(), [])
+
+    def test_BasicRelocateBuilding(self):
+        """Tests the standard behaviors of calling Relocate(source, target) on
+           an edits builder and the expected relocates maps that result."""
+
+        # New layer stack and edit builder. Starts with no relocates.
+        cache = self._CreateTestLayersAndPcpCache()
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), {})
+
+        # Steps:
+        #   1) Relocate /Root/A -> /Root/C
+        #   2) Relocate /Root/B -> /Root/C
+        # Result: The second relocate will fail because /Root/C is already the 
+        # target of a relocate from step 1.
+        self._AddRelocateAndVerify(builder, "/Root/A", "/Root/C",
+            {"/Root/A" : "/Root/C"})
+        self._VerifyInvalidRelocate(builder, "/Root/B", "/Root/C",
+            "Cannot relocate </Root/B> to </Root/C>: A relocate from </Root/A> "
+            "to </Root/C> already exists and the same target cannot be "
+            "relocated to again.")
+        # Remove the relocate. Remove only works using the source path /Root/A;
+        # we cannot remove via the target path /Root/C.
+        self._VerifyInvalidRemoveRelocate(builder, "/Root/C",
+            "Cannot remove relocate for source path </Root/C>: No relocate "
+            "with the source path found.")
+        self._RemoveRelocateAndVerify(builder, "/Root/A",
+            {})
+
+        # Steps: 
+        #   1) Relocate /Root/B -> /Root/C
+        #   2) Relocate /Root/A -> /Root/B
+        # Result: The second fails because /Root/B has been relocated away 
+        # making it no longer a valid target prim path.
+        self._AddRelocateAndVerify(builder, "/Root/B", "/Root/C",
+            {"/Root/B" : "/Root/C"})
+        self._VerifyInvalidRelocate(builder, "/Root/A", "/Root/B",
+            "Cannot relocate </Root/A> to </Root/B>: The target of the "
+            "relocate is the same as the source of an existing relocate from "
+            "</Root/B> to </Root/C>; the only prim that can be relocated to "
+            "</Root/B> is the existing relocate's target </Root/C>, which "
+            "will remove the relocate.")
+        # We can relocate /Root/C back to /Root/B to delete the relocate
+        self._AddRelocateAndVerify(builder, "/Root/C", "/Root/B",
+            {})
+
+        # Steps: 
+        #   1) Relocate /Root/A -> /Root/B
+        #   2) Relocate /Root/B -> /Root/C 
+        # Result: The second will be successful and will update the relocate 
+        # to be from /Root/A -> /Root/C, leaving /Root/B out of the equation.
+        self._AddRelocateAndVerify(builder, "/Root/A", "/Root/B",
+            {"/Root/A" : "/Root/B"})
+        self._AddRelocateAndVerify(builder, "/Root/B", "/Root/C",
+            {"/Root/A" : "/Root/C"})
+        # Relocate target /Root/C back to source /Root/A to delete the relocate.
+        self._AddRelocateAndVerify(builder, "/Root/C", "/Root/A",
+            {})
+
+        # Steps:
+        #   1) Relocate /Root/A -> /Root/B 
+        #   2) Relocate /Root/A -> /Root/C 
+        # Result: The second relocate will replace the original relocate. This
+        # is because of how we relocate map source paths making this exactly
+        # equivalent to the /Root/A -> /Root/B, /Root/B -> /Root/C case.
+        self._AddRelocateAndVerify(builder, "/Root/A", "/Root/B",
+            {"/Root/A" : "/Root/B"})
+        self._AddRelocateAndVerify(builder, "/Root/B", "/Root/C",
+            {"/Root/A" : "/Root/C"})
+        # Remove the relocate.
+        self._RemoveRelocateAndVerify(builder, "/Root/A",
+            {})
+
+        # Steps:
+        #   1) Relocate /Root/A/C -> /Root/B/C
+        #   2) Relocate /Root/A/D -> /Root/B/D
+        #   3) Relocate /Root/A -> /Root/B
+        # Result: The third relocate subsumes the previous two as it makes them
+        # redundant
+        self._AddRelocateAndVerify(builder, "/Root/A/C", "/Root/B/C",
+            {"/Root/A/C" : "/Root/B/C"})
+        self._AddRelocateAndVerify(builder, "/Root/A/D", "/Root/B/D",
+            {"/Root/A/C" : "/Root/B/C",
+             "/Root/A/D" : "/Root/B/D"})
+        self._AddRelocateAndVerify(builder, "/Root/A", "/Root/B",
+            {"/Root/A" : "/Root/B"})
+        # Relocate /Root/B back to /Root/A. This also deletes the relocate. Note
+        # that this does NOT revive the previous relocates from the first two
+        # steps.
+        self._AddRelocateAndVerify(builder, "/Root/B", "/Root/A",
+            {})
+
+        # Steps:
+        #   1) Relocate /Root/A/C -> /Root/B/C
+        #   2) Relocate /Root/A/D -> /Root/B/D
+        #   3) Relocate /Root/A -> /Root/F
+        # Result: The third relocate udpates the previous two relocates' sources
+        self._AddRelocateAndVerify(builder, "/Root/A/C", "/Root/B/C",
+            {"/Root/A/C" : "/Root/B/C"})
+        self._AddRelocateAndVerify(builder, "/Root/A/D", "/Root/B/D",
+            {"/Root/A/C" : "/Root/B/C",
+             "/Root/A/D" : "/Root/B/D"})
+        self._AddRelocateAndVerify(builder, "/Root/A", "/Root/F",
+            {"/Root/A" : "/Root/F",
+             "/Root/F/C" : "/Root/B/C",
+             "/Root/F/D" : "/Root/B/D"})
+        #   4) Relocate /Root/B -> /Root/F
+        #   5) Relocate /Root/B -> /Root/A
+        #   6) Relocate /Root/A -> /Root/B
+        # Result: Steps 4 and 5 will both fail because of invalid targets that
+        # are already relocation sources or target. 
+        # Step 6 succeeds with the resulting /Root/F -> /Root/B mapping 
+        # subsuming the updated children relocates.
+        self._VerifyInvalidRelocate(builder, "/Root/B", "/Root/F",
+            "Cannot relocate </Root/B> to </Root/F>: A relocate from </Root/A> "
+            "to </Root/F> already exists and the same target cannot be "
+            "relocated to again.")
+        self._VerifyInvalidRelocate(builder, "/Root/B", "/Root/A",
+            "Cannot relocate </Root/B> to </Root/A>: The target of the "
+            "relocate is the same as the source of an existing relocate from "
+            "</Root/A> to </Root/F>; the only prim that can be relocated to "
+            "</Root/A> is the existing relocate's target </Root/F>, which "
+            "will remove the relocate.")
+        self._AddRelocateAndVerify(builder, "/Root/F", "/Root/B",
+            {"/Root/A" : "/Root/B"})
+        # Remove the relocate.
+        self._RemoveRelocateAndVerify(builder, "/Root/A",
+            {})
+
+        # Steps:
+        #   1) Relocate /Root/A/C -> /Root/B/C
+        #   2) Relocate /Root/A/D -> /Root/B/D
+        #   3) Relocate /Root/B -> /Root/F
+        # Result: The third relocate udpates the previous two relocates' targets
+        self._AddRelocateAndVerify(builder, "/Root/A/C", "/Root/B/C",
+            {"/Root/A/C" : "/Root/B/C"})
+        self._AddRelocateAndVerify(builder, "/Root/A/D", "/Root/B/D",
+            {"/Root/A/C" : "/Root/B/C",
+             "/Root/A/D" : "/Root/B/D"})
+        self._AddRelocateAndVerify(builder, "/Root/B", "/Root/F",
+            {"/Root/B" : "/Root/F",
+             "/Root/A/C" : "/Root/F/C",
+             "/Root/A/D" : "/Root/F/D"})
+        #   4) Relocate /Root/F -> /Root/A
+        # Result: This one is tricky to reason about. Relocating /Root/F to 
+        # /Root/A is valid under all the conditions we enforce about sources and
+        # targets and existing relocates. And since existing relocate targets 
+        # have /Root/F as a prefix, we update those targets with the relocated
+        # path. Thus we'd end up with:
+        #   /Root/B -> /Root/A
+        #   /Root/A/C -> /Root/A/C
+        #   /Root/A/D -> /Root/A/D
+        # As we can see, the last two map the source paths back to themselves.
+        # Thus we've deleted the child relocates by mapping their relocated 
+        # parent back their original source.
+        self._AddRelocateAndVerify(builder, "/Root/F", "/Root/A",
+            {"/Root/B" : "/Root/A"})
+        # Remove the last relocate.
+        self._RemoveRelocateAndVerify(builder, "/Root/B",
+            {})
+
+        # Steps:
+        #   1) Relocate /Root/A/C -> /Root/B/C
+        #   2) Relocate /Root/A/D -> /Root/B/D
+        #   3) Relocate /Root/B -> /Root/A
+        # Result: This is just like the previous case with the third step 
+        # skipped. Relocating the children relocated parent back to their own
+        # source parent ends up deleting the child relocates while adding the
+        # inverse relocate for the parent path.
+        self._AddRelocateAndVerify(builder, "/Root/A/C", "/Root/B/C",
+            {"/Root/A/C" : "/Root/B/C"})
+        self._AddRelocateAndVerify(builder, "/Root/A/D", "/Root/B/D",
+            {"/Root/A/C" : "/Root/B/C",
+             "/Root/A/D" : "/Root/B/D"})
+        self._AddRelocateAndVerify(builder, "/Root/B", "/Root/A",
+            {"/Root/B" : "/Root/A"})
+        # Relocate the relocate.
+        self._RemoveRelocateAndVerify(builder, "/Root/B",
+            {})
+
+        # Steps:
+        #   1) Relocate /A -> /B
+        #   2) Relocate /Root/A -> /A
+        #   3) Relocate /A -> /B
+        # Result: The first attempt at relocating /A to /B will fail because /A
+        # is a root prim. The second relocate succeeds as we allow a non-root
+        # prim to be relocated to become a root prim. After that relocating 
+        # /A to /B will succeed as it results in only changing the path that the 
+        # relocated non-root prim is moved to.
+        self._VerifyInvalidRelocate(builder, "/A", "/B",
+            "Cannot relocate </A> to </B>: Adding a relocate from </A> would "
+            "result in a root prim being relocated.")
+        self._AddRelocateAndVerify(builder, "/Root/A", "/A",
+            {"/Root/A" : "/A"})
+        self._AddRelocateAndVerify(builder, "/A", "/B",
+            {"/Root/A" : "/B"})
+        # Relocate target /B back to source /Root/A to delete the relocate, 
+        # which works because it adjusts (deletes) an existing relocate and
+        # wouldn't introduce an actual relocate from a root prim.
+        self._AddRelocateAndVerify(builder, "/B", "/Root/A",
+            {})
+
+        # Steps:
+        #   1) Relocate /Root/A -> /OtherRoot/A
+        #   2) Relocate /OtherRoot/A/B -> /Root/B
+        #   3) Relocate /OtherRoot -> /Root
+        # Result: The first two relocates succeed as relocating prims to be
+        # descendants of a different root prim is perfectly valid. The third
+        # relocate will fail because even though relocating /OtherRoot would
+        # update existing relocates, it would still have to add a new relocate
+        # from /OtherRoot to /Root and that is not allowed.
+        self._AddRelocateAndVerify(builder, "/Root/A", "/OtherRoot/A",
+            {"/Root/A" : "/OtherRoot/A"})
+        self._AddRelocateAndVerify(builder, "/OtherRoot/A/B", "/Root/B",
+            {"/Root/A" : "/OtherRoot/A",
+             "/OtherRoot/A/B" : "/Root/B"})
+        self._VerifyInvalidRelocate(builder, "/OtherRoot", "/Root",
+            "Cannot relocate </OtherRoot> to </Root>: Adding a relocate from "
+            "</OtherRoot> would result in a root prim being relocated.")
+        # Remove the /Root/A relocate. This updates the source path of the 
+        # remaining relocate to be /Root/A/B instead of /OtherRoot/A/B to account
+        # for the fact that /Root/A/B is no longer ancestrally relocated by the 
+        # /Root/A to /OtherRoot/A relocate.
+        self._RemoveRelocateAndVerify(builder, "/Root/A",
+            {"/Root/A/B" : "/Root/B"})
+        # Remove the /Root/A/B relocate.    
+        self._RemoveRelocateAndVerify(builder, "/Root/A/B",
+            {})
+
+    def test_HierarchyRelocates(self):
+
+        # New layer stack and edit builder. Starts with no relocates.
+        cache = self._CreateTestLayersAndPcpCache()
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), {})
+
+        # This example will assume we're working with a prim hierarchy:
+        # /World
+        #  | /Root
+        #  |  | /A
+        #  |  |  | /C
+        #  |  |  |  | /E
+        #  |  |  |  | /F
+        #  |  |  | /D
+        #  |  |  |  | /E
+        #  |  |  |  | /F
+        #  |  | /B
+        #  |  |  | /C
+        #  |  |  |  | /E
+        #  |  |  |  | /F
+        #  |  |  | /D
+        #  |  |  |  | /E
+        #  |  |  |  | /F
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+
+        # Bottom up renaming of the entire namespace under /World/Root/A to have
+        # prefix "New"
+
+        # Rename leaf prims
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/C/E", "/World/Root/A/C/NewE", 
+            {"/World/Root/A/C/E" : "/World/Root/A/C/NewE"})
+        self._AddRelocateAndVerify(builder,
+            "/World/Root/A/C/F", "/World/Root/A/C/NewF", 
+            {"/World/Root/A/C/E" : "/World/Root/A/C/NewE",
+             "/World/Root/A/C/F" : "/World/Root/A/C/NewF"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/D/E", "/World/Root/A/D/NewE", 
+            {"/World/Root/A/C/E" : "/World/Root/A/C/NewE",
+             "/World/Root/A/C/F" : "/World/Root/A/C/NewF",
+             "/World/Root/A/D/E" : "/World/Root/A/D/NewE"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/D/F", "/World/Root/A/D/NewF", 
+            {"/World/Root/A/C/E" : "/World/Root/A/C/NewE",
+             "/World/Root/A/C/F" : "/World/Root/A/C/NewF",
+             "/World/Root/A/D/E" : "/World/Root/A/D/NewE",
+             "/World/Root/A/D/F" : "/World/Root/A/D/NewF"})
+
+        # Rename leaf prim parents. These update the existing leaf prim 
+        # relocates.
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/C", "/World/Root/A/NewC", 
+            {"/World/Root/A/C" : "/World/Root/A/NewC",
+             "/World/Root/A/NewC/E" : "/World/Root/A/NewC/NewE",
+             "/World/Root/A/NewC/F" : "/World/Root/A/NewC/NewF",
+             "/World/Root/A/D/E" : "/World/Root/A/D/NewE",
+             "/World/Root/A/D/F" : "/World/Root/A/D/NewF"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/D", "/World/Root/A/NewD", 
+            {"/World/Root/A/C" : "/World/Root/A/NewC",
+             "/World/Root/A/NewC/E" : "/World/Root/A/NewC/NewE",
+             "/World/Root/A/NewC/F" : "/World/Root/A/NewC/NewF",
+             "/World/Root/A/D" : "/World/Root/A/NewD",
+             "/World/Root/A/NewD/E" : "/World/Root/A/NewD/NewE",
+             "/World/Root/A/NewD/F" : "/World/Root/A/NewD/NewF"})
+
+        # Rename /World/Root/A. Updates all the existing relocates.
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A", "/World/Root/NewA", 
+            {"/World/Root/A" : "/World/Root/NewA",
+             "/World/Root/NewA/C" : "/World/Root/NewA/NewC",
+             "/World/Root/NewA/NewC/E" : "/World/Root/NewA/NewC/NewE",
+             "/World/Root/NewA/NewC/F" : "/World/Root/NewA/NewC/NewF",
+             "/World/Root/NewA/D" : "/World/Root/NewA/NewD",
+             "/World/Root/NewA/NewD/E" : "/World/Root/NewA/NewD/NewE",
+             "/World/Root/NewA/NewD/F" : "/World/Root/NewA/NewD/NewF"})
+
+        # This example demonstrates reparenting prim hierarchy starting at 
+        # /World/Root/A to be a child of /World/NewRoot instead of /World/Root. 
+        # We can do this easily with a relocate from /World/Root/A to 
+        # /World/NewRoot/A but we're going to do the move bottom to demonstrate
+        # the behaviors where we can subsume existing relocates.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+
+        # So first add a relocate for each leaf prim to the final reparented 
+        # location. We end up with a relocate entry per prim.
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/C/E", "/World/NewRoot/A/C/E", 
+            {"/World/Root/A/C/E" : "/World/NewRoot/A/C/E"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/C/F", "/World/NewRoot/A/C/F", 
+            {"/World/Root/A/C/E" : "/World/NewRoot/A/C/E",
+             "/World/Root/A/C/F" : "/World/NewRoot/A/C/F"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/D/E", "/World/NewRoot/A/D/E", 
+            {"/World/Root/A/C/E" : "/World/NewRoot/A/C/E",
+             "/World/Root/A/C/F" : "/World/NewRoot/A/C/F",
+             "/World/Root/A/D/E" : "/World/NewRoot/A/D/E"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/D/F", "/World/NewRoot/A/D/F", 
+            {"/World/Root/A/C/E" : "/World/NewRoot/A/C/E",
+             "/World/Root/A/C/F" : "/World/NewRoot/A/C/F",
+             "/World/Root/A/D/E" : "/World/NewRoot/A/D/E",
+             "/World/Root/A/D/F" : "/World/NewRoot/A/D/F"})
+
+        # Now add relocates for the leaf parent prims. Since the parent path 
+        # relocates would map the leaf prims paths to the exact same locations 
+        # as the existing leaf relocates, the parent relocates will subsume the
+        # existing leaf relocates.
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/C", "/World/NewRoot/A/C", 
+            {"/World/Root/A/C" : "/World/NewRoot/A/C", # subsumes the existing descendant relocates
+             "/World/Root/A/D/E" : "/World/NewRoot/A/D/E",
+             "/World/Root/A/D/F" : "/World/NewRoot/A/D/F"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A/D", "/World/NewRoot/A/D", 
+            {"/World/Root/A/C" : "/World/NewRoot/A/C",
+             "/World/Root/A/D" : "/World/NewRoot/A/D"}) # subsumes the existing descendant relocates
+
+        # Now add a relocate for the next parent up which is the root of subtree
+        # /World/Root/A. This subsumes the descendant relocates again leaving us
+        # with a single relocate for the entire subtree.
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/A", "/World/NewRoot/A", 
+            {"/World/Root/A" : "/World/NewRoot/A"})
+
+        # Now we'll do a similar thing moving an entire hierarchy starting at 
+        # /World/Root/B to be at /World/NewRoot/B instead. We'll start with the
+        # leaf prims here again too.
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/B/C/E", "/World/NewRoot/B/C/E", 
+            {"/World/Root/A" : "/World/NewRoot/A",
+             "/World/Root/B/C/E" : "/World/NewRoot/B/C/E"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/B/C/F", "/World/NewRoot/B/C/F", 
+            {"/World/Root/A" : "/World/NewRoot/A",
+             "/World/Root/B/C/E" : "/World/NewRoot/B/C/E",
+             "/World/Root/B/C/F" : "/World/NewRoot/B/C/F"})
+        self._AddRelocateAndVerify(builder,
+            "/World/Root/B/D/E", "/World/NewRoot/B/D/E", 
+            {"/World/Root/A" : "/World/NewRoot/A",
+             "/World/Root/B/C/E" : "/World/NewRoot/B/C/E",
+             "/World/Root/B/C/F" : "/World/NewRoot/B/C/F",
+             "/World/Root/B/D/E" : "/World/NewRoot/B/D/E"})
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/B/D/F", "/World/NewRoot/B/D/F", 
+            {"/World/Root/A" : "/World/NewRoot/A",
+             "/World/Root/B/C/E" : "/World/NewRoot/B/C/E",
+             "/World/Root/B/C/F" : "/World/NewRoot/B/C/F",
+             "/World/Root/B/D/E" : "/World/NewRoot/B/D/E",
+             "/World/Root/B/D/F" : "/World/NewRoot/B/D/F"})
+
+        # Now instead of moving the parents of the leaf prims, we'll just skip 
+        # that step and move the root of the subtree /World/Root/B. This 
+        # subsumes the leaf prim relocates just like if we had moved their 
+        # parent paths directly.
+        self._AddRelocateAndVerify(builder, 
+            "/World/Root/B", "/World/NewRoot/B", 
+            {"/World/Root/A" : "/World/NewRoot/A",
+             "/World/Root/B" : "/World/NewRoot/B"})
+        
+    def test_RelocateToNone(self):
+        """Tesst using relocates to empty path aka relocates to delete."""
+
+        # New layer stack and edit builder. Starts with no relocates.
+        cache = self._CreateTestLayersAndPcpCache()
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), {})
+
+        # Basic relocate to empty.        
+        self._AddRelocateAndVerify(builder, "/Root/A", "",
+            {"/Root/A" : ""})
+        self._AddRelocateAndVerify(builder, "/Root/B/C", "",
+            {"/Root/A" : "",
+             "/Root/B/C" : ""})
+        
+        # Relocating a prim to none subsumes existing relocates for any of its
+        # descendants. 
+        self._AddRelocateAndVerify(builder, "/Root/B", "",
+            {"/Root/A" : "",
+             "/Root/B" : ""}) # subsumes the </Root/B/C> to <> relocate
+
+        # Add a standard relocate for the next cases.
+        self._AddRelocateAndVerify(builder, "/Root/C", "/Foo",
+            {"/Root/A" : "",
+             "/Root/B" : "",
+             "/Root/C" : "/Foo"})
+        
+        # Still invalid to relocate an existing relocate source (or any of its
+        # descendants) again even if the target is none.
+        self._VerifyInvalidRelocate(builder, "/Root/C", "",
+            "Cannot relocate </Root/C> to <>: A relocate from </Root/C> to "
+            "</Foo> already exists; neither the source </Root/C> nor any of "
+            "its descendants can be relocated again using their original "
+            "paths.")
+        self._VerifyInvalidRelocate(builder, "/Root/C/Child", "",
+            "Cannot relocate </Root/C/Child> to <>: A relocate from </Root/C> "
+            "to </Foo> already exists; neither the source </Root/C> nor any of "
+            "its descendants can be relocated again using their original "
+            "paths.")
+        
+        # Relocating a child of a post-relocation path to none just adds a new
+        # relocate
+        self._AddRelocateAndVerify(builder, "/Foo/Bar", "",
+            {"/Root/A" : "",
+             "/Root/B" : "",
+             "/Root/C" : "/Foo",
+             "/Foo/Bar" : ""})
+        # Relocating post-relocation path /Foo to none updates the existing
+        # relocate from </Root/C> to </Foo> to be </Root/C> to <>. But it also
+        # subsumes the relocate from </Foo/Bar> to <> since </Root/C> to <> 
+        # now still deletes the prims that were previously relocated to </Foo>
+        # and therefore </Foo/Bar>
+        self._AddRelocateAndVerify(builder, "/Foo", "",
+            {"/Root/A" : "",
+             "/Root/B" : "",
+             "/Root/C" : ""})
+
+        # Add another standard relocate to a path a little deeper in namesspace.
+        self._AddRelocateAndVerify(builder, "/Root/D", "/Root/Foo/Bar",
+            {"/Root/A" : "",
+             "/Root/B" : "",
+             "/Root/C" : "",
+             "/Root/D" : "/Root/Foo/Bar"})
+        # Relocate an ancestor of the existing target path to none. This updates
+        # the existing relocate from </Root/D> to </Root/Foo/Bar> to be 
+        # </Root/D> to <> as the effect of deleting a parent prim is all 
+        # descendants are deleted. Also adds </Root/Foo> to <> as a new 
+        # relocate.
+        self._AddRelocateAndVerify(builder, "/Root/Foo", "",
+            {"/Root/A" : "",
+             "/Root/B" : "",
+             "/Root/C" : "",
+             "/Root/D" : "",
+             "/Root/Foo" : ""})
+
+        # Relocate source path can never be empty; only target paths can be. 
+        # Thus the Relocate method cannot be used to remove relocates to none.
+        self._VerifyInvalidRelocate(builder, "", "/Root/A",
+            "Cannot relocate <> to </Root/A>: Relocates source paths cannot be "
+            "empty.")
+        # RemoveRelocate can remove relocates to none by their source paths.
+        self._RemoveRelocateAndVerify(builder, "/Root/A",
+            {"/Root/B" : "",
+             "/Root/C" : "",
+             "/Root/D" : "",
+             "/Root/Foo" : ""})
+        self._RemoveRelocateAndVerify(builder, "/Root/C",
+            {"/Root/B" : "",
+             "/Root/D" : "",
+             "/Root/Foo" : ""})
+
+        # RemoveRelocate can only be called on actual existing source paths.
+        # Calling it on a non-relocated ancestor path of other relocates (to try
+        # to remove them all at once) will fail.
+        self._VerifyInvalidRemoveRelocate(builder, "/Root",
+            "Cannot remove relocate for source path </Root>: No relocate "
+            "with the source path found.")
+
+    def test_SingleLayerRelocatesUpdates(self):
+        """Tests using the relocates builder to create and perform edits on 
+           just one layer."""
+
+        # New layer stack and edit builder. Starts with no relocates.
+        cache = self._CreateTestLayersAndPcpCache()
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), {})
+
+        # Root layer is layers[1] since the layer stack has a session layer.
+        rootLayer = cache.layerStack.layers[1]
+
+        # Add some simple relocates to prims that don't overlap in namespace.
+
+        # Add a renaming relocate
+        self._AddRelocateAndVerify(builder, "/Root/A", "/Root/B", 
+            {"/Root/A" : "/Root/B"}) # added new relocate
+        # Add a reparenting relocate.
+        self._AddRelocateAndVerify(builder, "/Root/C", "/Root/D/C", 
+            {"/Root/A" : "/Root/B",
+             "/Root/C" : "/Root/D/C"}) #added new relocate
+        # Add a rename and reparent relocate.
+        self._AddRelocateAndVerify(builder, "/Root/E/F", "/Root/G", 
+            {"/Root/A" : "/Root/B",
+             "/Root/C" : "/Root/D/C",
+             "/Root/E/F" : "/Root/G"}) #added new relocate
+
+        # Verify the built layer edits and apply them to the layer stack. The
+        # edits are all to the root layer. The edit builder was created 
+        # without a specified "new relocates" layer which means all new 
+        # relocates should be added to the root layer.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (rootLayer, 
+                [("/Root/A", "/Root/B"),
+                 ("/Root/C", "/Root/D/C"),
+                 ("/Root/E/F", "/Root/G")])])
+
+        # Create a new edit builder for the layer stack. It now starts with 
+        # the relocates we set on the layer stack. The edits still start empty
+        # because we haven't added any.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+            _FormatRelocatesDict(
+                {"/Root/A" : "/Root/B",
+                 "/Root/C" : "/Root/D/C",
+                 "/Root/E/F" : "/Root/G"}))
+        self.assertEqual(builder.GetEdits(), [])
+
+        # We'll now add relocates that affect children of the prims we already
+        # relocated.
+
+        # Add a relocate that renames a child of /Root/A named "H" to be named
+        # "I". With /Root/A relocated to /Root/B, /Root/A/H will end up 
+        # relocated to /Root/B/I
+        #
+        # We'll start with what we can't do; we cannot use /Root/A/I as a target 
+        # path as anything under /Root/A is already relocated away and can never
+        # be a target path.
+        self._VerifyInvalidRelocate(builder, "/Root/B/H", "/Root/A/I",
+            "Cannot relocate </Root/B/H> to </Root/A/I>: Cannot relocate a "
+            "prim to be a descendant of </Root/A> which is already relocated "
+            "to </Root/B>.")
+        # Nor can we use /Root/A/H as a source path because /Root/A has been
+        # relocated away.
+        self._VerifyInvalidRelocate(builder, "/Root/A/H", "/Root/B/I",
+            "Cannot relocate </Root/A/H> to </Root/B/I>: A relocate from "
+            "</Root/A> to </Root/B> already exists; neither the source "
+            "</Root/A> nor any of its descendants can be relocated again using "
+            "their original paths.")
+
+        # The target of the relocate must be the final relocated target path
+        # /Root/B/I and the source path must be the relocated source path 
+        # /Root/B/H.
+        self._AddRelocateAndVerify(builder, "/Root/B/H", "/Root/B/I", 
+            {"/Root/A" : "/Root/B",
+             "/Root/B/H" : "/Root/B/I", # added new child relocate
+             "/Root/C" : "/Root/D/C",
+             "/Root/E/F" : "/Root/G"})
+
+        # Add a relocate that moves a child of /Root/C named "J" to be parented
+        # under /Root/G which has itself been relocated from /Root/E/F. The 
+        # final relocated path of "J" will be /Root/G/J
+        #
+        # First, we cannot use /Root/E/F/J as a target path as anything under 
+        # /Root/E/F is already relocated away and can never be a target path.
+        self._VerifyInvalidRelocate(builder, "/Root/D/C/J", "/Root/E/F/J",
+            "Cannot relocate </Root/D/C/J> to </Root/E/F/J>: Cannot relocate a "
+            "prim to be a descendant of </Root/E/F> which is already relocated "
+            "to </Root/G>.")
+        # Nor can we use the pre-relocation source path of /Root/C/J 
+        self._VerifyInvalidRelocate(builder, "/Root/C/J", "/Root/G/J",
+            "Cannot relocate </Root/C/J> to </Root/G/J>: A relocate from "
+            "</Root/C> to </Root/D/C> already exists; neither the source "
+            "</Root/C> nor any of its descendants can be relocated again using "
+            "their original paths.")
+
+        # The target of the relocate must use final relocated target path
+        # /Root/G/J and the relocated source path /Root/D/C/J.
+        self._AddRelocateAndVerify(builder, "/Root/D/C/J", "/Root/G/J", 
+            {"/Root/A" : "/Root/B",
+             "/Root/B/H" : "/Root/B/I",
+             "/Root/C" : "/Root/D/C",
+             "/Root/E/F" : "/Root/G",
+             "/Root/D/C/J" : "/Root/G/J"}) # added new relocate
+
+        # Verify the built layer edits and apply them to the layer stack. The
+        # edits are all to the root layer in the layer stack. Note that the
+        # edit contains ALL the relocates, not just the new ones, as this map is
+        # value of the relocates field that needs to be set in the layer 
+        # metadata.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (rootLayer, 
+                [("/Root/A", "/Root/B"),
+                 ("/Root/C", "/Root/D/C"),
+                 ("/Root/E/F", "/Root/G"),
+                 ("/Root/B/H", "/Root/B/I"),
+                 ("/Root/D/C/J", "/Root/G/J")])])
+
+        # Create a new edit builder for the layer stack again. It starts with 
+        # all the relocates we set on the layer stack with the edits still 
+        # empty.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+            _FormatRelocatesDict(
+                {"/Root/A" : "/Root/B",
+                 "/Root/B/H" : "/Root/B/I",
+                 "/Root/C" : "/Root/D/C",
+                 "/Root/E/F" : "/Root/G",
+                 "/Root/D/C/J" : "/Root/G/J"}))
+        self.assertEqual(builder.GetEdits(), [])
+
+        # These next test examples will not cause new relocates to be added but
+        # will update the existing relocates to remap them.        
+
+        # Reparent the prim /Root/B to be /Root/New/B. Because /Root/B is 
+        # already a target of a relocate from /Root/A, this will just update
+        # existing relocates paths to account for the new reparent without 
+        # adding a new entry
+        self._AddRelocateAndVerify(builder, "/Root/B", "/Root/New/B", 
+            {"/Root/A" : "/Root/New/B", # existing target is updated
+             "/Root/New/B/H" : "/Root/New/B/I", # existing source and target are updated
+             "/Root/C" : "/Root/D/C",
+             "/Root/E/F" : "/Root/G",
+             "/Root/D/C/J" : "/Root/G/J"})
+        # Reparent the prim /Root/D/C to be /Root/New/C. Because /Root/D/C is 
+        # already a target of a relocate from /Root/C, this will just update
+        # existing relocates paths to account for the new reparent without 
+        # adding a new entry
+        self._AddRelocateAndVerify(builder, "/Root/D/C", "/Root/New/C", 
+            {"/Root/A" : "/Root/New/B",
+             "/Root/New/B/H" : "/Root/New/B/I",
+             "/Root/C" : "/Root/New/C", # existing target is updated
+             "/Root/E/F" : "/Root/G",
+             "/Root/New/C/J" : "/Root/G/J"}) # existing source is updated
+        # Reparent and rename the prim /Root/G to be /Root/New/F. Because 
+        # /Root/G is already a target of a relocate from /Root/E/F, this will 
+        # just update existing relocates paths to account for the new reparent
+        # without adding a new entry
+        self._AddRelocateAndVerify(builder, "/Root/G", "/Root/New/F", 
+            {"/Root/A" : "/Root/New/B",
+             "/Root/New/B/H" : "/Root/New/B/I",
+             "/Root/C" : "/Root/New/C",
+             "/Root/E/F" : "/Root/New/F", # existing target is updated
+             "/Root/New/C/J" : "/Root/New/F/J"}) # existing target is updated
+
+        # Verify the built layer edits and apply them to the layer stack. The
+        # edits are all to the root layer in the layer stack.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (cache.layerStack.layers[1], 
+                [("/Root/A", "/Root/New/B"),
+                 ("/Root/C", "/Root/New/C"),
+                 ("/Root/E/F", "/Root/New/F"),
+                 ("/Root/New/B/H", "/Root/New/B/I"),
+                 ("/Root/New/C/J", "/Root/New/F/J")])])
+
+        # Create a new edit builder for the layer stack again. It starts with 
+        # all the relocates we set on the layer stack with the edits still 
+        # empty.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+            _FormatRelocatesDict(
+                {"/Root/A" : "/Root/New/B",
+                 "/Root/New/B/H" : "/Root/New/B/I",
+                 "/Root/C" : "/Root/New/C",
+                 "/Root/E/F" : "/Root/New/F",
+                 "/Root/New/C/J" : "/Root/New/F/J"}))
+        self.assertEqual(builder.GetEdits(), [])
+
+        # These next test examples are similar to the previous ones and will
+        # update the existing relocates to remap them. The difference here is
+        # that we'll use origin source paths to add the relocates.
+
+        # Reparent and rename the relocated /Root/New/B to be /Root/OldB. Since
+        # /Root/New/B is already a target of a relocate from /Root/A, this will
+        # just update existing relocates paths to account for the new prim move
+        # without adding a new entry
+        self._AddRelocateAndVerify(builder, "/Root/New/B", "/Root/OldB", 
+            {"/Root/A" : "/Root/OldB", # existing target is updated
+             "/Root/OldB/H" : "/Root/OldB/I", # existing source and target are updated
+             "/Root/C" : "/Root/New/C",
+             "/Root/E/F" : "/Root/New/F",
+             "/Root/New/C/J" : "/Root/New/F/J"})
+        # Reparent the relocated prim /Root/New/C to be /Root/OldD/C. Since 
+        # /Root/New/C is already a target of a relocate from /Root/C, this will
+        # just update existing relocates paths to account for the new prim move
+        # without adding a new entry
+        self._AddRelocateAndVerify(builder, "/Root/New/C", "/Root/OldD/C", 
+            {"/Root/A" : "/Root/OldB",
+             "/Root/OldB/H" : "/Root/OldB/I",
+             "/Root/C" : "/Root/OldD/C", # existing target is updated
+             "/Root/E/F" : "/Root/New/F",
+             "/Root/OldD/C/J" : "/Root/New/F/J"}) # existing source is updated
+        # Reparent and rename the relocated prim /Root/New/F to be /Root/OldG. 
+        # Since /Root/New/F is already a target of a relocate from /Root/E/F, 
+        # this will just update existing relocates paths to account for the new
+        # prim move without adding a new entry
+        self._AddRelocateAndVerify(builder, "/Root/New/F", "/Root/OldG", 
+            {"/Root/A" : "/Root/OldB",
+             "/Root/OldB/H" : "/Root/OldB/I",
+             "/Root/C" : "/Root/OldD/C",
+             "/Root/E/F" : "/Root/OldG", # existing target is updated
+             "/Root/OldD/C/J" : "/Root/OldG/J"}) # existing target is updated
+
+        # Verify the built layer edits and apply them to the layer stack. The
+        # edits are all to layer[1], the root in the layer stack. Note that the
+        # edit contains ALL the relocates, not just the new ones, as this map is
+        # value of the relocates field that needs to be set in the layer 
+        # metadata.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (cache.layerStack.layers[1], 
+                [("/Root/A", "/Root/OldB"),
+                 ("/Root/C", "/Root/OldD/C"),
+                 ("/Root/E/F", "/Root/OldG"),
+                 ("/Root/OldB/H", "/Root/OldB/I"),
+                 ("/Root/OldD/C/J", "/Root/OldG/J")])])
+        
+        # Add some relocates to none
+        self._AddRelocateAndVerify(builder, "/Root/ToDelete", "", 
+            {"/Root/A" : "/Root/OldB",
+             "/Root/OldB/H" : "/Root/OldB/I",
+             "/Root/C" : "/Root/OldD/C",
+             "/Root/E/F" : "/Root/OldG",
+             "/Root/OldD/C/J" : "/Root/OldG/J",
+             "/Root/ToDelete" : ""}) # added new relocate
+        self._AddRelocateAndVerify(builder, "/Root/OldB", "", 
+            {"/Root/A" : "", # existing target is updated
+             # this relocate was deleted "/Root/OldB/H" : "/Root/OldB/I",
+             "/Root/C" : "/Root/OldD/C",
+             "/Root/E/F" : "/Root/OldG",
+             "/Root/OldD/C/J" : "/Root/OldG/J",
+             "/Root/ToDelete" : ""})
+
+        # Verify the built layer edits with relocates to none and apply them to
+        # the layer stack. The edits are all to layer[1], the root in the layer
+        # stack.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (cache.layerStack.layers[1], 
+                [("/Root/A", ""),
+                 ("/Root/C", "/Root/OldD/C"),
+                 ("/Root/E/F", "/Root/OldG"),
+                 ("/Root/OldD/C/J", "/Root/OldG/J"),
+                 ("/Root/ToDelete", "")])])
+
+    def test_MultipleLayerRelocatesEdits(self):
+
+        # New layer stack. It has four layers: a session layer and a root layer
+        # with two sublayers
+        cache = self._CreateTestLayersAndPcpCache()
+        sessionLayer = cache.layerStack.layers[0]
+        rootLayer = cache.layerStack.layers[1]
+        sub1Layer = cache.layerStack.layers[2]
+        sub2Layer = cache.layerStack.layers[3]
+
+        # Create a builder for the layer stack with no "add relocates" layer. 
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+
+        # Add some relocates
+        self._AddRelocateAndVerify(builder, "/Root/A/B", "/Root/B",
+            {"/Root/A/B" : "/Root/B"})
+        self._AddRelocateAndVerify(builder, "/Root/A/C", "/Root/C",
+            {"/Root/A/B" : "/Root/B",
+             "/Root/A/C" : "/Root/C"})
+
+        # Verify edits are for the root layer since the builder did not specify
+        # a particular layer.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (rootLayer, 
+                [("/Root/A/B", "/Root/B"),
+                 ("/Root/A/C", "/Root/C")])])
+
+        # Create a new builder that specifies new relocates should be added
+        # to sublayer 1.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack, sub1Layer)
+
+        # Add some new relocates that don't require any updates to existing 
+        # relocates.
+        self._AddRelocateAndVerify(builder, "/Root/A/D", "/Root/D",
+            {"/Root/A/B" : "/Root/B",
+             "/Root/A/C" : "/Root/C",
+             "/Root/A/D" : "/Root/D"})
+        self._AddRelocateAndVerify(builder, "/Root/A/E", "/Root/E",
+            {"/Root/A/B" : "/Root/B",
+             "/Root/A/C" : "/Root/C",
+             "/Root/A/D" : "/Root/D",
+             "/Root/A/E" : "/Root/E"})
+
+        # Verify edits are only for the new relocates and are only to be applied
+        # sublayer 1.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (sub1Layer, 
+                [("/Root/A/D", "/Root/D"),
+                 ("/Root/A/E", "/Root/E")])])
+
+        # Create a new builder that specifies new relocates should be added
+        # to the session layer.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack, sessionLayer)
+
+        # Add one new relocate that doesn't require any updates to existing 
+        # relocates.
+        self._AddRelocateAndVerify(builder, "/Root/A/F", "/Root/F",
+            {"/Root/A/B" : "/Root/B",
+             "/Root/A/C" : "/Root/C",
+             "/Root/A/D" : "/Root/D",
+             "/Root/A/E" : "/Root/E",
+             "/Root/A/F" : "/Root/F"})
+        # Add another new relocate that ends up just changing an existing 
+        # relocate's target path.
+        self._AddRelocateAndVerify(builder, "/Root/C", "/Root/F/C",
+            {"/Root/A/B" : "/Root/B",
+             "/Root/A/C" : "/Root/F/C", # updated relocate target path
+             "/Root/A/D" : "/Root/D",
+             "/Root/A/E" : "/Root/E",
+             "/Root/A/F" : "/Root/F"})
+
+        # Verify that we have two layer edits:
+        # 1. The new relocate is added to the session layer.
+        # 2. The updated relocate target path is an update to the authored 
+        #    relocates in the root layer where it was originally authored.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (sessionLayer, 
+                [("/Root/A/F", "/Root/F")]),
+            (rootLayer, 
+                [("/Root/A/B", "/Root/B"),
+                 ("/Root/A/C", "/Root/F/C")])])
+        
+        # For the next example, first copy the root layer relocates to 
+        # sublayer2 before creating a new builder that will add new relocates
+        # to the root layer. Copying relocates to sublayer2 did not change the
+        # layer stack's relocates since they are redundant.
+        self._ApplyEdits(cache, [(sub2Layer, rootLayer.relocates)])
+        self.assertEqual(sub2Layer.relocates, 
+                         [("/Root/A/B", "/Root/B"),
+                          ("/Root/A/C", "/Root/F/C")])
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack, rootLayer)
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+            _FormatRelocatesDict(
+                {"/Root/A/B" : "/Root/B",
+                 "/Root/A/C" : "/Root/F/C",
+                 "/Root/A/D" : "/Root/D",
+                 "/Root/A/E" : "/Root/E",
+                 "/Root/A/F" : "/Root/F"}))
+
+        # Add a relocate that updates an existing relocate that is authored in
+        # the root layer (and redundantly in sublayer2)
+        self._AddRelocateAndVerify(builder, "/Root/B", "/Root/A/G/B",
+            {"/Root/A/B" : "/Root/A/G/B", # updated relocate
+             "/Root/A/C" : "/Root/F/C",
+             "/Root/A/D" : "/Root/D",
+             "/Root/A/E" : "/Root/E",
+             "/Root/A/F" : "/Root/F"}) 
+        # Add another relocate that is added as new relocate and updates the
+        # previously just updated relocate.
+        self._AddRelocateAndVerify(builder, "/Root/A/G", "/Root/G",
+            {"/Root/A/B" : "/Root/G/B", # updated relocate
+             "/Root/A/C" : "/Root/F/C",
+             "/Root/A/D" : "/Root/D",
+             "/Root/A/E" : "/Root/E",
+             "/Root/A/F" : "/Root/F",
+             "/Root/A/G" : "/Root/G"}) # new relocate
+
+        # Verify that the layer edits update both the relocates metadata in 
+        # root layer and sublayer2 since the udpated relocate is authored in
+        # both. However the new relocate entry is only added to the root layer's
+        # relocates.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (rootLayer, 
+                [("/Root/A/B", "/Root/G/B"),
+                 ("/Root/A/C", "/Root/F/C"),
+                 ("/Root/A/G", "/Root/G")]),
+            (sub2Layer, 
+                [("/Root/A/B", "/Root/G/B"),
+                 ("/Root/A/C", "/Root/F/C")])])
+        
+        # Remove the relocate from /Root/A/C
+        self._RemoveRelocateAndVerify(builder, "/Root/A/C",
+            {"/Root/A/B" : "/Root/G/B",
+             "/Root/A/D" : "/Root/D",
+             "/Root/A/E" : "/Root/E",
+             "/Root/A/F" : "/Root/F",
+             "/Root/A/G" : "/Root/G"})
+
+        # Verify that the layer edits remove the /Root/A/C relocate in both the
+        # root layer and sublayer2 since the entry existed in both.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (rootLayer, 
+                [("/Root/A/B", "/Root/G/B"),
+                 ("/Root/A/G", "/Root/G")]),
+            (sub2Layer, 
+                [("/Root/A/B", "/Root/G/B")])])
+
+    def test_ExistingRelocatesErrors(self):
+
+        # New layer stack. It has four layers: a session layer and a root layer
+        # with two sublayers
+        cache = self._CreateTestLayersAndPcpCache()
+        sessionLayer = cache.layerStack.layers[0]
+        rootLayer = cache.layerStack.layers[1]
+        sub1Layer = cache.layerStack.layers[2]
+        sub2Layer = cache.layerStack.layers[3]
+
+        # Add relocates to our layers where some the relocates will be invalid
+        # for multiple reasons and will be rejected as error's from the layer
+        # stack's relocates.
+        self._ApplyEdits(cache, [
+            (rootLayer, [
+                ('/World', '/NewWorld'), # invalid authored relocate
+                ('/Root/A', '/Root/B'),
+                ('/Root/X', '/Root/Y'), # target is another's source
+                ('/Root/RootTarget', '/Root/SameTarget')]), # same target               
+            (sub1Layer, [
+                ('/Root/C', '/Root/D'),
+                ('/Root/C/Foo', '/Root/D/Bar'), # source is child of relocate source
+                ('/Root/Y', '/Root/Z'), # source is another's target
+                ('/Root/Sub1Target', '/Root/SameTarget')]), # same target
+            (sub2Layer, [
+                ('/Root/B', '/Root/B/C'), # invalid authored relocate
+                ('/Root/E', '/Root/F'),
+                ('/Root/Sub2Target', '/Root/SameTarget')]), # same target
+        ])
+        # Verify the layer stack's relocates are only the valid relocates above.
+        self.assertEqual(cache.layerStack.incrementalRelocatesSourceToTarget,
+            _FormatRelocatesDict({
+                "/Root/A" : "/Root/B",
+                "/Root/C" : "/Root/D",
+                "/Root/E" : "/Root/F",
+            }))
+
+        # Create an edit builder for the layer stack. It's relocates map will
+        # be the same as the layer stack's to start.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+            _FormatRelocatesDict({
+                "/Root/A" : "/Root/B",
+                "/Root/C" : "/Root/D",
+                "/Root/E" : "/Root/F",
+            }))
+
+        # In this case the builder WILL start with suggested edits that would
+        # remove the invalide relocates from the layers that have them. Applying
+        # these edits clean up the layer relocates to have no errors.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (rootLayer, [
+                ('/Root/A', '/Root/B')]),
+            (sub1Layer, [
+                ('/Root/C', '/Root/D')]),
+            (sub2Layer, [
+                ('/Root/E', '/Root/F')])])
+
+        # Reset the relocates on the root layer and sublayer 2 to empty and add
+        # a bunch of valid relocates to sublayer 1
+        self._ApplyEdits(cache, [
+            (rootLayer, []),
+            (sub1Layer, [
+                ('/Root/A', '/Root/B'),
+                ('/Root/C', '/Root/B/C'),
+                ('/Root/D', '/Root/B/D'),
+                ('/Root/F', '/Root/B/C/G'),
+                ('/Root/E', '/Root/B/D/G')]),
+            (sub2Layer, []),
+        ])
+        # Assert all the sublayer 1 relocates are present in the layer stack.
+        self.assertEqual(cache.layerStack.incrementalRelocatesSourceToTarget,
+            _FormatRelocatesDict({
+                '/Root/A' : '/Root/B',
+                '/Root/C' : '/Root/B/C',
+                '/Root/D' : '/Root/B/D',
+                '/Root/F' : '/Root/B/C/G',
+                '/Root/E' : '/Root/B/D/G'
+            }))
+        # A relocate builder starts with these relocates and produces no 
+        # edits to start with.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+            _FormatRelocatesDict({
+                '/Root/A' : '/Root/B',
+                '/Root/C' : '/Root/B/C',
+                '/Root/D' : '/Root/B/D',
+                '/Root/F' : '/Root/B/C/G',
+                '/Root/E' : '/Root/B/D/G'
+            }))
+        self.assertEqual(builder.GetEdits(), [])
+
+        # Now update sublayer 2 to have a bunch of relocates using the same 
+        # source paths as our existing relocates, but with all these being 
+        # invalid relocates.
+        self._ApplyEdits(cache, [
+            (sub2Layer, [
+                ('/Root/A', '/Root/A/B'), # invalid authored relocate
+                ('/Root/C', '/Root/D'), # target is another's source
+                ('/Root/D', '/Root/E'), # source is another's target
+                ('/Root/F', '/Root/G'), # same target
+                ('/Root/E', '/Root/G')]), # same target
+        ])
+        # Because sublayer 2 is weaker and sublayer has a relocate for each of
+        # these paths, the valid sublayer 1 relocates are all stronger and will
+        # produce the same relocates in the layer stack as before.
+        self.assertEqual(cache.layerStack.incrementalRelocatesSourceToTarget,
+            _FormatRelocatesDict({
+                '/Root/A' : '/Root/B',
+                '/Root/C' : '/Root/B/C',
+                '/Root/D' : '/Root/B/D',
+                '/Root/F' : '/Root/B/C/G',
+                '/Root/E' : '/Root/B/D/G'
+            }))
+        # An edit builder starts with same relocates as well. However, because
+        # sublayer 2 has an invalid authored relocate, the builder will start
+        # with edits that remove this (and only this) invalid relocates from
+        # sublayer 2. The other relocates would only be invalid if they were the
+        # strongest opinion so we leave those relocates intact.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+            _FormatRelocatesDict({
+                '/Root/A' : '/Root/B',
+                '/Root/C' : '/Root/B/C',
+                '/Root/D' : '/Root/B/D',
+                '/Root/F' : '/Root/B/C/G',
+                '/Root/E' : '/Root/B/D/G'
+            }))
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (sub2Layer, [
+                ('/Root/C', '/Root/D'),
+                ('/Root/D', '/Root/E'),
+                ('/Root/F', '/Root/G'),
+                ('/Root/E', '/Root/G')])])
+
+        # Now update the root layer to have the same invalid relocates as we 
+        # set on sublayer 2 before.
+        self._ApplyEdits(cache, [
+            (rootLayer, [
+                ('/Root/A', '/Root/A/B'), # invalid authored relocate
+                ('/Root/C', '/Root/D'), # target is another's source
+                ('/Root/D', '/Root/E'), # source is another's target
+                ('/Root/F', '/Root/G'), # same target
+                ('/Root/E', '/Root/G')]), # same target
+        ])
+        # Because root layer 1 is stronger, it's relocates will win over 
+        # sublayer 1 making these relocates invalid. The only exception is 
+        # invalid authored relocate /Root/A -> /Root/A/B which is ignored when
+        # processing root layer as it will never be valid in any context. 
+        # Ignoring this relocate allows the relocate of /Root/A -> /Root/B on 
+        # sublayer 1 to come through so only that relocate is present on the 
+        # layer stack.
+        self.assertEqual(cache.layerStack.incrementalRelocatesSourceToTarget,
+            _FormatRelocatesDict({
+                "/Root/A" : "/Root/B",
+            }))
+        # An edit builder on the layer stack produces the same valid relocates.
+        builder = Pcp.LayerRelocatesEditBuilder(cache.layerStack)
+        self.assertEqual(builder.GetEditedRelocatesMap(), 
+            _FormatRelocatesDict({
+                "/Root/A" : "/Root/B",
+            }))
+        # This time the initial edits produced remove all relocates in ALL 
+        # layers that use a source path of the invalid relocates from the root
+        # layer. This is necessary to make sure that removing the invalid 
+        # relocates from the root layer doesn't expose opinions from the weaker
+        # layers that could change the relocates mapping of the layer stack.
+        self._ApplyAndVerifyExpectedEdits(builder, cache, [
+            (rootLayer, []),
+            (sub1Layer, [
+                ('/Root/A', '/Root/B')]),
+            (sub2Layer, [])])
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/pxr/usd/pcp/testenv/testPcpMapExpression.cpp b/pxr/usd/pcp/testenv/testPcpMapExpression.cpp
index 363f5c34de..7c0b59609b 100644
--- a/pxr/usd/pcp/testenv/testPcpMapExpression.cpp
+++ b/pxr/usd/pcp/testenv/testPcpMapExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/testenv/testPcpMapFunction.py b/pxr/usd/pcp/testenv/testPcpMapFunction.py
index f403bf8381..54db76ee13 100644
--- a/pxr/usd/pcp/testenv/testPcpMapFunction.py
+++ b/pxr/usd/pcp/testenv/testPcpMapFunction.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Pcp
 import unittest
@@ -32,214 +15,483 @@
     Sdf.Path('/a/b/c')
     ]
 
-testMapFuncs = []
-
-# Test null function
-null = Pcp.MapFunction()
-testMapFuncs.append(null)
-assert null.isNull
-assert not null.isIdentity
-assert not null.isIdentityPathMapping
-assert null.timeOffset == Sdf.LayerOffset()
-for path in testPaths:
-    assert null.MapSourceToTarget( path ).isEmpty
-
-# Test identity function
-identity = Pcp.MapFunction.Identity()
-testMapFuncs.append(identity)
-assert not identity.isNull
-assert identity.isIdentity
-assert identity.isIdentityPathMapping
-assert identity.timeOffset == Sdf.LayerOffset()
-for path in testPaths:
-    assert identity.MapSourceToTarget( path ) == path
-
-# Test identity path mapping with non-identity offset
-identityPathMapping = Pcp.MapFunction(Pcp.MapFunction.IdentityPathMap(),
-                                      Sdf.LayerOffset(scale=10.0))
-testMapFuncs.append(identityPathMapping)
-assert not identityPathMapping.isNull
-assert not identityPathMapping.isIdentity
-assert identityPathMapping.isIdentityPathMapping
-assert identityPathMapping.timeOffset == Sdf.LayerOffset(scale=10.0)
-for path in testPaths:
-    assert identityPathMapping.MapSourceToTarget( path ) == path
-
-# Test a simple mapping, simulating a referenced model instance.
-m = Pcp.MapFunction({'/Model': '/Model_1'})
-testMapFuncs.append(m)
-assert not m.isNull
-assert not m.isIdentity
-assert not m.isIdentityPathMapping
-assert m.MapSourceToTarget('/').isEmpty
-assert m.MapSourceToTarget('/Model') == Sdf.Path('/Model_1')
-assert m.MapSourceToTarget('/Model/anim') == Sdf.Path('/Model_1/anim')
-assert m.MapSourceToTarget('/Model_1').isEmpty
-assert m.MapSourceToTarget('/Model_1/anim').isEmpty
-assert m.MapTargetToSource('/').isEmpty
-assert m.MapTargetToSource('/Model').isEmpty
-assert m.MapTargetToSource('/Model/anim').isEmpty
-assert m.MapTargetToSource('/Model_1') == Sdf.Path('/Model')
-assert m.MapTargetToSource('/Model_1/anim') == Sdf.Path('/Model/anim')
-
-# Mapping functions do not affect nested target paths.
-assert (m.MapTargetToSource('/Model_1.x[/Model_1.y]') ==
-    Sdf.Path('/Model.x[/Model_1.y]'))
-assert (m.MapSourceToTarget('/Model.x[/Model.y]') ==
-    Sdf.Path('/Model_1.x[/Model.y]'))
-
-# Test a mapping representing a nested rig reference.
-m2 = Pcp.MapFunction({'/CharRig': '/Model/Rig'})
-testMapFuncs.append(m2)
-assert not m2.isNull
-assert not m2.isIdentity
-assert not m2.isIdentityPathMapping
-assert m2.MapSourceToTarget('/').isEmpty
-assert m2.MapSourceToTarget('/CharRig') == Sdf.Path('/Model/Rig')
-assert m2.MapSourceToTarget('/CharRig/rig') == Sdf.Path('/Model/Rig/rig')
-assert m2.MapSourceToTarget('/Model').isEmpty
-assert m2.MapSourceToTarget('/Model/Rig').isEmpty
-assert m2.MapSourceToTarget('/Model/Rig/rig').isEmpty
-assert m2.MapTargetToSource('/').isEmpty
-assert m2.MapTargetToSource('/CharRig').isEmpty
-assert m2.MapTargetToSource('/CharRig/rig').isEmpty
-assert m2.MapTargetToSource('/Model').isEmpty
-assert m2.MapTargetToSource('/Model/Rig') == Sdf.Path('/CharRig')
-assert m2.MapTargetToSource('/Model/Rig/rig') == Sdf.Path('/CharRig/rig')
-
-# Test composing the previous two map functions.
-m3 = m.Compose(m2)
-testMapFuncs.append(m3)
-assert not m3.isNull
-assert not m3.isIdentity
-assert not m3.isIdentityPathMapping
-assert m3.MapSourceToTarget('/').isEmpty
-assert m3.MapSourceToTarget('/CharRig') == Sdf.Path('/Model_1/Rig')
-assert m3.MapSourceToTarget('/CharRig/rig') == Sdf.Path('/Model_1/Rig/rig')
-assert m3.MapSourceToTarget('/Model').isEmpty
-assert m3.MapSourceToTarget('/Model/Rig').isEmpty
-assert m3.MapSourceToTarget('/Model/Rig/rig').isEmpty
-assert m3.MapSourceToTarget('/Model_1').isEmpty
-assert m3.MapSourceToTarget('/Model_1/Rig').isEmpty
-assert m3.MapSourceToTarget('/Model_1/Rig/rig').isEmpty
-assert m3.MapTargetToSource('/').isEmpty
-assert m3.MapTargetToSource('/CharRig').isEmpty
-assert m3.MapTargetToSource('/CharRig/rig').isEmpty
-assert m3.MapTargetToSource('/Model').isEmpty
-assert m3.MapTargetToSource('/Model/Rig').isEmpty
-assert m3.MapTargetToSource('/Model/Rig/rig').isEmpty
-assert m3.MapTargetToSource('/Model_1').isEmpty
-assert m3.MapTargetToSource('/Model_1/Rig') == Sdf.Path('/CharRig')
-assert m3.MapTargetToSource('/Model_1/Rig/rig') == Sdf.Path('/CharRig/rig')
-
-# Test a chain of composed mappings that simulates an inherit of
-# a local class, along with some relocations:
-#
-# - M_1 is an instance of the model, M
-# - M/Rig/Inst is an instance of the local class M/Rig/Class
-# - M/Rig/Inst/Scope is an anim scope relocated to M/Anim/Scope
-#
-m4 = \
-    Pcp.MapFunction( {'/M': '/M_1'} ).Compose(
-    Pcp.MapFunction( {'/M/Rig/Inst/Scope': '/M/Anim/Scope'} ).Compose(
-    Pcp.MapFunction( {'/M/Rig/Class': '/M/Rig/Inst'} ).Compose(
-    Pcp.MapFunction( {'/M_1': '/M'} )
-    )))
-testMapFuncs.append(m4)
-
-# The composed result should map opinions from the model instance's
-# rig class scope, to the relocated anim scope.
-expected = Pcp.MapFunction({'/M_1/Rig/Class/Scope': '/M_1/Anim/Scope'})
-assert m4 == expected
-assert (m4.MapSourceToTarget(
-    Sdf.Path('/M_1/Rig/Class/Scope/x')) == Sdf.Path('/M_1/Anim/Scope/x'))
-assert (m4.MapTargetToSource(
-    Sdf.Path('/M_1/Anim/Scope/x')) == Sdf.Path('/M_1/Rig/Class/Scope/x'))
-
-# Test layer offsets
-offset1 = Sdf.LayerOffset(offset=0.0, scale=2.0)
-offset2 = Sdf.LayerOffset(offset=10.0, scale=1.0)
-m5 = Pcp.MapFunction({'/':'/'}, offset1)
-m6 = Pcp.MapFunction({'/':'/'}, offset2)
-
-assert m5.timeOffset == offset1
-assert m6.timeOffset == offset2
-assert m5.Compose(m6).timeOffset == (offset1 * offset2)
-assert m5.ComposeOffset(m6.timeOffset).timeOffset == (offset1 * offset2)
-
-testMapFuncs.append(m5)
-testMapFuncs.append(m6)
-
-# Test composing map functions that should produce identity mappings.
-m1 = Pcp.MapFunction({'/':'/', '/a':'/b'})
-m2 = Pcp.MapFunction({'/':'/', '/b':'/a'})
-assert m1.Compose(m2) == Pcp.MapFunction.Identity()
-assert m2.Compose(m1) == Pcp.MapFunction.Identity()
-
-# Test equality/inequality
-for i in range(len(testMapFuncs)):
-    for j in range(len(testMapFuncs)):
-        if i == j:
-            assert testMapFuncs[i] == testMapFuncs[j]
-        else:
-            assert testMapFuncs[i] != testMapFuncs[j]
-
-# Test repr
-for m in testMapFuncs:
-    assert eval(repr(m)) == m
-
-# Composing any function with identity should return itself.
-for mapFunc in testMapFuncs:
-    assert mapFunc.Compose(identity) == mapFunc
-    assert identity.Compose(mapFunc) == mapFunc
-
-# Composing a function that has an identity offset with a null function 
-# should return null. 
-# Composing a function that has an offset with a null function 
-# should just return that offset.
-for mapFunc in testMapFuncs:
-    if mapFunc.timeOffset.IsIdentity():
-        assert mapFunc.Compose(null) == null
-        assert null.Compose(mapFunc) == null
-    else:
-        assert mapFunc.Compose(null) == Pcp.MapFunction({}, mapFunc.timeOffset)
-        assert null.Compose(mapFunc) == Pcp.MapFunction({}, mapFunc.timeOffset)
-
-# Test map function canonicalization.
-assert (Pcp.MapFunction({})
-    == Pcp.MapFunction({}))
-assert (Pcp.MapFunction({'/A':'/A'})
-    == Pcp.MapFunction({'/A':'/A'}))
-assert (Pcp.MapFunction({'/':'/', '/A':'/A'})
-    == Pcp.MapFunction({'/':'/'}))
-assert (Pcp.MapFunction({'/A':'/B', '/A/X': '/B/X', '/A/X/Y1':'/B/X/Y2'}) ==
-    Pcp.MapFunction({'/A':'/B', '/A/X/Y1':'/B/X/Y2'}))
-
-# Test case for bug 74847.
-def TestBug74847():
-    m = Pcp.MapFunction({'/A': '/A/B'})
-    assert m.MapSourceToTarget('/A/B') == Sdf.Path('/A/B/B')
-    assert m.MapTargetToSource('/A/B/B') == Sdf.Path('/A/B')
-
-TestBug74847()
-
-# Test case for bug 112645. See also TrickyInheritsAndRelocates3 test
-# in testPcpMuseum.
-def TestBug112645():
-    f1 = Pcp.MapFunction(
-        {'/GuitarRig':'/GuitarRigX',
-         '/GuitarRig/Rig/StringsRig/_Class_StringRig/String':
-             '/GuitarRigX/Anim/Strings/String1'})
-
-    f2 = Pcp.MapFunction(
-        {'/StringsRig/String1Rig/String' :
-             '/GuitarRig/Anim/Strings/String1',
-         '/StringsRig' :
-             '/GuitarRig/Rig/StringsRig'})
-
-    assert f1.Compose(f2) == Pcp.MapFunction({
+class TestPcpMapFunction(unittest.TestCase):
+
+    def test_Null(self):
+        # Test null function
+        null = Pcp.MapFunction()
+        self.assertTrue(null.isNull)
+        self.assertFalse(null.isIdentity)
+        self.assertFalse(null.isIdentityPathMapping)
+        self.assertEqual(null.timeOffset, Sdf.LayerOffset())
+        for path in testPaths:
+            self.assertTrue(null.MapSourceToTarget( path ).isEmpty)
+
+    def test_Identity(self):
+        # Test identity function
+        identity = Pcp.MapFunction.Identity()
+        self.assertFalse(identity.isNull)
+        self.assertTrue(identity.isIdentity)
+        self.assertTrue(identity.isIdentityPathMapping)
+        self.assertEqual(identity.timeOffset, Sdf.LayerOffset())
+        for path in testPaths:
+            self.assertEqual(identity.MapSourceToTarget(path), path)
+
+        # Test identity path mapping with non-identity offset
+        identityPathMapping = Pcp.MapFunction(Pcp.MapFunction.IdentityPathMap(),
+                                              Sdf.LayerOffset(scale=10.0))
+        self.assertFalse(identityPathMapping.isNull)
+        self.assertFalse(identityPathMapping.isIdentity)
+        self.assertTrue(identityPathMapping.isIdentityPathMapping)
+        self.assertEqual(identityPathMapping.timeOffset,
+                         Sdf.LayerOffset(scale=10.0))
+        for path in testPaths:
+            self.assertEqual(identityPathMapping.MapSourceToTarget(path), path)
+
+    def test_Simple(self):
+        # Test a simple mapping, simulating a referenced model instance.
+        m = Pcp.MapFunction({'/Model': '/Model_1'})
+        self.assertFalse(m.isNull)
+        self.assertFalse(m.isIdentity)
+        self.assertFalse(m.isIdentityPathMapping)
+        self.assertTrue(m.MapSourceToTarget('/').isEmpty)
+        self.assertEqual(m.MapSourceToTarget('/Model'), Sdf.Path('/Model_1'))
+        self.assertEqual(
+            m.MapSourceToTarget('/Model/anim'), Sdf.Path('/Model_1/anim'))
+        self.assertTrue(m.MapSourceToTarget('/Model_1').isEmpty)
+        self.assertTrue(m.MapSourceToTarget('/Model_1/anim').isEmpty)
+        self.assertTrue(m.MapTargetToSource('/').isEmpty)
+        self.assertTrue(m.MapTargetToSource('/Model').isEmpty)
+        self.assertTrue(m.MapTargetToSource('/Model/anim').isEmpty)
+        self.assertEqual(m.MapTargetToSource('/Model_1'), Sdf.Path('/Model'))
+        self.assertEqual(
+            m.MapTargetToSource('/Model_1/anim'), Sdf.Path('/Model/anim'))
+
+        # Mapping functions do not affect nested target paths.
+        self.assertEqual(m.MapTargetToSource('/Model_1.x[/Model_1.y]'),
+                         Sdf.Path('/Model.x[/Model_1.y]'))
+        self.assertEqual(m.MapSourceToTarget('/Model.x[/Model.y]'),
+                         Sdf.Path('/Model_1.x[/Model.y]'))
+
+    def test_NestedRef(self):
+        # Test a mapping representing a nested rig reference.
+        m2 = Pcp.MapFunction({'/CharRig': '/Model/Rig'})
+        self.assertFalse(m2.isNull)
+        self.assertFalse(m2.isIdentity)
+        self.assertFalse(m2.isIdentityPathMapping)
+        self.assertTrue(m2.MapSourceToTarget('/').isEmpty)
+        self.assertEqual(m2.MapSourceToTarget('/CharRig'),
+                         Sdf.Path('/Model/Rig'))
+        self.assertEqual(m2.MapSourceToTarget('/CharRig/rig'),
+                         Sdf.Path('/Model/Rig/rig'))
+        self.assertTrue(m2.MapSourceToTarget('/Model').isEmpty)
+        self.assertTrue(m2.MapSourceToTarget('/Model/Rig').isEmpty)
+        self.assertTrue(m2.MapSourceToTarget('/Model/Rig/rig').isEmpty)
+        self.assertTrue(m2.MapTargetToSource('/').isEmpty)
+        self.assertTrue(m2.MapTargetToSource('/CharRig').isEmpty)
+        self.assertTrue(m2.MapTargetToSource('/CharRig/rig').isEmpty)
+        self.assertTrue(m2.MapTargetToSource('/Model').isEmpty)
+        self.assertEqual(m2.MapTargetToSource('/Model/Rig'),
+                         Sdf.Path('/CharRig'))
+        self.assertEqual(m2.MapTargetToSource('/Model/Rig/rig'),
+                         Sdf.Path('/CharRig/rig'))
+
+    def test_Composition(self):
+        # Test composing two map functions.
+        m = Pcp.MapFunction({'/Model': '/Model_1'})
+        m2 = Pcp.MapFunction({'/CharRig': '/Model/Rig'})
+        m3 = m.Compose(m2)
+        self.assertFalse(m3.isNull)
+        self.assertFalse(m3.isIdentity)
+        self.assertFalse(m3.isIdentityPathMapping)
+        self.assertTrue(m3.MapSourceToTarget('/').isEmpty)
+        self.assertEqual(m3.MapSourceToTarget('/CharRig'),
+                         Sdf.Path('/Model_1/Rig'))
+        self.assertEqual(m3.MapSourceToTarget('/CharRig/rig'), 
+                         Sdf.Path('/Model_1/Rig/rig'))
+        self.assertTrue(m3.MapSourceToTarget('/Model').isEmpty)
+        self.assertTrue(m3.MapSourceToTarget('/Model/Rig').isEmpty)
+        self.assertTrue(m3.MapSourceToTarget('/Model/Rig/rig').isEmpty)
+        self.assertTrue(m3.MapSourceToTarget('/Model_1').isEmpty)
+        self.assertTrue(m3.MapSourceToTarget('/Model_1/Rig').isEmpty)
+        self.assertTrue(m3.MapSourceToTarget('/Model_1/Rig/rig').isEmpty)
+        self.assertTrue(m3.MapTargetToSource('/').isEmpty)
+        self.assertTrue(m3.MapTargetToSource('/CharRig').isEmpty)
+        self.assertTrue(m3.MapTargetToSource('/CharRig/rig').isEmpty)
+        self.assertTrue(m3.MapTargetToSource('/Model').isEmpty)
+        self.assertTrue(m3.MapTargetToSource('/Model/Rig').isEmpty)
+        self.assertTrue(m3.MapTargetToSource('/Model/Rig/rig').isEmpty)
+        self.assertTrue(m3.MapTargetToSource('/Model_1').isEmpty)
+        self.assertEqual(m3.MapTargetToSource('/Model_1/Rig'),
+                         Sdf.Path('/CharRig'))
+        self.assertEqual(m3.MapTargetToSource('/Model_1/Rig/rig'),
+                         Sdf.Path('/CharRig/rig'))
+        # Test composing map functions that should produce identity mappings.
+        m1 = Pcp.MapFunction({'/':'/', '/a':'/b'})
+        m2 = Pcp.MapFunction({'/':'/', '/b':'/a'})
+        self.assertEqual(m1.Compose(m2), Pcp.MapFunction.Identity())
+        self.assertEqual(m2.Compose(m1), Pcp.MapFunction.Identity())
+
+    def test_InheritRelocateChain(self):
+        # Test a chain of composed mappings that simulates an inherit of
+        # a local class, along with some relocations:
+        #
+        # - M_1 is an instance of the model, M
+        # - M/Rig/Inst is an instance of the local class M/Rig/Class
+        # - M/Rig/Inst/Scope is an anim scope relocated to M/Anim/Scope
+        #
+        m4 = Pcp.MapFunction({'/M': '/M_1'} ).Compose(
+            Pcp.MapFunction( {'/M/Rig/Inst/Scope': '/M/Anim/Scope'} ).Compose(
+                Pcp.MapFunction( {'/M/Rig/Class': '/M/Rig/Inst'} ).Compose(
+                    Pcp.MapFunction( {'/M_1': '/M'} ))))
+
+        # The composed result should map opinions from the model instance's
+        # rig class scope, to the relocated anim scope.
+        expected = Pcp.MapFunction({'/M_1/Rig/Class/Scope': '/M_1/Anim/Scope'})
+        self.assertEqual(m4, expected)
+        self.assertTrue(m4.MapSourceToTarget(
+            Sdf.Path('/M_1/Rig/Class/Scope/x')) == Sdf.Path('/M_1/Anim/Scope/x'))
+        self.assertTrue(m4.MapTargetToSource(
+            Sdf.Path('/M_1/Anim/Scope/x')) == Sdf.Path('/M_1/Rig/Class/Scope/x'))
+
+    def test_LayerOffsets(self):
+        # Test layer offsets
+        offset1 = Sdf.LayerOffset(offset=0.0, scale=2.0)
+        offset2 = Sdf.LayerOffset(offset=10.0, scale=1.0)
+        m5 = Pcp.MapFunction({'/':'/'}, offset1)
+        m6 = Pcp.MapFunction({'/':'/'}, offset2)
+
+        self.assertEqual(m5.timeOffset, offset1)
+        self.assertEqual(m6.timeOffset, offset2)
+        self.assertEqual(m5.Compose(m6).timeOffset, (offset1 * offset2))
+        self.assertEqual(m5.ComposeOffset(m6.timeOffset).timeOffset, (offset1 * offset2))
+
+    def test_Basics(self):
+        testMapFuncs = [
+            Pcp.MapFunction(),
+            Pcp.MapFunction.Identity(),
+            Pcp.MapFunction(Pcp.MapFunction.IdentityPathMap(),
+                            Sdf.LayerOffset(scale=10.0)),
+            Pcp.MapFunction({'/Model': '/Model_1'}),
+            Pcp.MapFunction({'/CharRig': '/Model/Rig'}),
+            Pcp.MapFunction({'/Model': '/Model_1'}).Compose(
+                Pcp.MapFunction({'/CharRig': '/Model/Rig'})),
+            Pcp.MapFunction({'/M': '/M_1'} ).Compose(
+                Pcp.MapFunction(
+                    {'/M/Rig/Inst/Scope': '/M/Anim/Scope'} ).Compose(
+                        Pcp.MapFunction(
+                            {'/M/Rig/Class': '/M/Rig/Inst'} ).Compose(
+                                Pcp.MapFunction( {'/M_1': '/M'} )))),
+            Pcp.MapFunction({'/':'/'}, Sdf.LayerOffset(offset=0.0, scale=2.0)),
+            Pcp.MapFunction({'/':'/'}, Sdf.LayerOffset(offset=10.0, scale=1.0))
+        ]
+        
+        # Test equality/inequality
+        for i in range(len(testMapFuncs)):
+            for j in range(len(testMapFuncs)):
+                if i == j:
+                    self.assertEqual(testMapFuncs[i], testMapFuncs[j])
+                else:
+                    self.assertNotEqual(testMapFuncs[i], testMapFuncs[j])
+
+        # Test repr
+        for m in testMapFuncs:
+            self.assertEqual(eval(repr(m)), m)
+
+        # Composing any function with identity should return itself.
+        identity = Pcp.MapFunction.Identity()
+        for mapFunc in testMapFuncs:
+            self.assertEqual(mapFunc.Compose(identity), mapFunc)
+            self.assertEqual(identity.Compose(mapFunc), mapFunc)
+
+        # Composing a function that has an identity offset with a null function 
+        # should return null. 
+        # Composing a function that has an offset with a null function 
+        # should just return that offset.
+        for mapFunc in testMapFuncs:
+            null = Pcp.MapFunction()
+            if mapFunc.timeOffset.IsIdentity():
+                self.assertEqual(mapFunc.Compose(null), null)
+                self.assertEqual(null.Compose(mapFunc), null)
+            else:
+                self.assertEqual(mapFunc.Compose(null),
+                                 Pcp.MapFunction({}, mapFunc.timeOffset))
+                self.assertEqual(null.Compose(mapFunc),
+                                 Pcp.MapFunction({}, mapFunc.timeOffset))
+
+    # Test map functions with explicit block.
+    def test_MapFunctionsWithBlocks(self):
+
+        # Function is identity mapping with an explicit block of /Model
+        f = Pcp.MapFunction({
+            '/' : '/',
+            '/Model' : Sdf.Path()
+        })
+
+        # Non /Model paths map to themselves in both directions.
+        self.assertEqual(f.MapSourceToTarget('/foo'), '/foo')
+        self.assertEqual(f.MapTargetToSource('/foo'), '/foo')
+        self.assertEqual(f.MapSourceToTarget('/foo/bar'), '/foo/bar')
+        self.assertEqual(f.MapTargetToSource('/foo/bar'), '/foo/bar')
+        # Any paths at or under /Model do not map in either direction.
+        self.assertEqual(f.MapSourceToTarget('/Model'), Sdf.Path())
+        self.assertEqual(f.MapTargetToSource('/Model'), Sdf.Path())
+        self.assertEqual(f.MapSourceToTarget('/Model/Bar'), Sdf.Path())
+        self.assertEqual(f.MapTargetToSource('/Model/Bar'), Sdf.Path())
+
+        # Function renames /CharRig, blocks /CharRig/Rig, and moves 
+        # /CharRig/Rig/Anim
+        f = Pcp.MapFunction({
+            '/CharRig' : '/Char',
+            '/CharRig/Rig' : Sdf.Path(),
+            '/CharRig/Rig/Anim' : '/Char/Anim'
+        })
+
+        # CharRig and its descendants (besides Rig) forward map to /Char
+        self.assertEqual(f.MapSourceToTarget('/CharRig'), '/Char')
+        self.assertEqual(f.MapSourceToTarget('/CharRig/Foo'), '/Char/Foo')
+        # /CharRig/Rig and its descendants (besides Anim) do not forward map
+        self.assertEqual(f.MapSourceToTarget('/CharRig/Rig'), '')
+        self.assertEqual(f.MapSourceToTarget('/CharRig/Rig/Foo'), '')
+        # /CharRig/Rig/Anim and its descendants forward map to /Char/Anim
+        self.assertEqual(f.MapSourceToTarget('/CharRig/Rig/Anim'), '/Char/Anim')
+        self.assertEqual(f.MapSourceToTarget('/CharRig/Rig/Anim/Foo'), 
+                         '/Char/Anim/Foo')
+
+        # Reverse mapping /Char to /CharRig works.
+        self.assertEqual(f.MapTargetToSource('/Char'), '/CharRig')
+        self.assertEqual(f.MapTargetToSource('/Char/Foo'), '/CharRig/Foo')
+        # Reverse mapping of /Char/Rig fails as the block prevents any paths
+        # from forward mapping to /Char/Rig.
+        self.assertEqual(f.MapTargetToSource('/Char/Rig'), '')
+        self.assertEqual(f.MapTargetToSource('/Char/Rig/Foo'), '')
+        self.assertEqual(f.MapTargetToSource('/Char/Rig/Anim'), '')
+        # Reverse mapping from /Char/Anim to /CharRig/Rig/Anim works.
+        self.assertEqual(f.MapTargetToSource('/Char/Anim'), '/CharRig/Rig/Anim')
+        self.assertEqual(f.MapTargetToSource('/Char/Anim/Foo'), 
+                         '/CharRig/Rig/Anim/Foo')
+
+    def test_Canonicalization(self):
+        # Test map function canonicalization.
+        self.assertEqual(Pcp.MapFunction({}).sourceToTargetMap, {})
+        self.assertEqual(Pcp.MapFunction({'/A':'/A'}).sourceToTargetMap,
+                         {Sdf.Path('/A') : Sdf.Path('/A')})
+
+        # / -> / makes /A -> /A redundant but not /A -> /B        
+        self.assertEqual(Pcp.MapFunction({'/':'/', '/A':'/A'}).sourceToTargetMap,
+                         {Sdf.Path('/') : Sdf.Path('/')})
+        self.assertEqual(Pcp.MapFunction({'/':'/', '/A':'/B'}).sourceToTargetMap,
+                         {Sdf.Path('/') : Sdf.Path('/'),
+                          Sdf.Path('/A') : Sdf.Path('/B')})
+        
+        # /A -> /B makes /A/X -> /B/X redundant, but /A/X/Y1 -> /B/X/Y2 is not
+        # redundant.
+        self.assertEqual(Pcp.MapFunction({'/A':'/B', 
+                                          '/A/X':'/B/X', 
+                                          '/A/X/Y1':'/B/X/Y2'}).sourceToTargetMap,
+                         {Sdf.Path('/A') : Sdf.Path('/B'), 
+                          Sdf.Path('/A/X/Y1') : Sdf.Path('/B/X/Y2')})
+        
+        # /A -> /B makes /A/X1/C -> /B/X1/C redundant
+        self.assertEqual(Pcp.MapFunction({'/A':'/B', 
+                                          '/A/X1/C':'/B/X1/C'}).sourceToTargetMap,
+                         {Sdf.Path('/A') : Sdf.Path('/B')})
+        # But adding /A/X1 -> /B/X2 makes /A/X1/C -> /B/X1/C no longer redundant
+        # as it is a closer ancestor mapping than /A -> /B
+        self.assertEqual(Pcp.MapFunction({'/A':'/B', 
+                                          '/A/X1':'/B/X2', 
+                                          '/A/X1/C':'/B/X1/C'}).sourceToTargetMap,
+                         {Sdf.Path('/A') : Sdf.Path('/B'), 
+                          Sdf.Path('/A/X1') : Sdf.Path('/B/X2'), 
+                          Sdf.Path('/A/X1/C') : Sdf.Path('/B/X1/C')})
+
+        # Mapping /A -> empty with no other mappings is redundant as there are 
+        # no mappings to begin with.
+        self.assertEqual(Pcp.MapFunction({'/A': ''}).sourceToTargetMap, {})
+        # But adding the identity mapping does make /A -> empty relevant to 
+        # unmap the mapping of /A
+        self.assertEqual(Pcp.MapFunction({'/': '/', '/A': ''}).sourceToTargetMap,
+                         {Sdf.Path('/') : Sdf.Path('/'),
+                          Sdf.Path('/A') : Sdf.Path()})
+        
+        # /A/B -> /A/B is not redundant even in the face of / -> / as the 
+        # unmapping of its closer ancestor, /A -> empty, makes it relevant.
+        self.assertEqual(Pcp.MapFunction({'/': '/', 
+                                          '/A': '',
+                                          '/A/B': '/A/B'}).sourceToTargetMap,
+                         {Sdf.Path('/') : Sdf.Path('/'),
+                          Sdf.Path('/A') : Sdf.Path(),
+                          Sdf.Path('/A/B') : Sdf.Path('/A/B')})
+        
+        # The empty mappings of descendants of /A are redundant because /A
+        # is already unmapped.
+        self.assertEqual(Pcp.MapFunction({'/': '/', 
+                                          '/A': '',
+                                          '/A/B/C': '',
+                                          '/A/D': ''}).sourceToTargetMap,
+                         {Sdf.Path('/') : Sdf.Path('/'),
+                          Sdf.Path('/A') : Sdf.Path()})
+        # But adding a mapping of /A/B -> /A/B now makes the /A/B/C -> empty
+        # map relevant. /A/D -> empty is still redundant since its closest
+        # ancestor is /A.
+        self.assertEqual(Pcp.MapFunction({'/': '/', 
+                                          '/A': '',
+                                          '/A/B': '/A/B',
+                                          '/A/B/C': '',
+                                          '/A/D': ''}).sourceToTargetMap,
+                         {Sdf.Path('/') : Sdf.Path('/'),
+                          Sdf.Path('/A') : Sdf.Path(),
+                          Sdf.Path('/A/B') : Sdf.Path('/A/B'),
+                          Sdf.Path('/A/B/C') : Sdf.Path()})
+
+        # The mapping of /B/C/E -> /A/C/E is redundant because of /B -> /A.
+        self.assertEqual(Pcp.MapFunction({'/B': '/A', 
+                                          '/B/C/E': '/A/C/E'}).sourceToTargetMap,
+                         {Sdf.Path('/B') : Sdf.Path('/A')})
+        # But adding an intermediary mapping of /B/C -> /C makes 
+        # /B/C/E -> /A/C/E no longer redundant.
+        self.assertEqual(Pcp.MapFunction({'/B': '/A', 
+                                          '/B/C': '/C',
+                                          '/B/C/E': '/A/C/E'}).sourceToTargetMap,
+                         {Sdf.Path('/B') : Sdf.Path('/A'),
+                          Sdf.Path('/B/C') : Sdf.Path('/C'),
+                          Sdf.Path('/B/C/E') : Sdf.Path('/A/C/E')})
+
+        # Create the inverses of both above mappings. Note that the /C - /B/C
+        # mapping makes /A/C/E -> /B/C/E not redundant because of how it affects
+        # inverses of these functions.
+        self.assertEqual(Pcp.MapFunction({'/A': '/B', 
+                                          '/A/C/E': '/B/C/E'}).sourceToTargetMap,
+                         {Sdf.Path('/A') : Sdf.Path('/B')})
+        self.assertEqual(Pcp.MapFunction({'/A': '/B', 
+                                          '/C': '/B/C',
+                                          '/A/C/E': '/B/C/E'}).sourceToTargetMap,
+                         {Sdf.Path('/A') : Sdf.Path('/B'),
+                          Sdf.Path('/A/C/E') : Sdf.Path('/B/C/E'),
+                          Sdf.Path('/C') : Sdf.Path('/B/C')})
+
+        # The /Bar -> empty mapping is redundant because /Bar is already not 
+        # mappable because it breaks bijection (/Bar would forward map to /Bar 
+        # but would inverse map to /Foo).
+        self.assertEqual(Pcp.MapFunction({'/': '/',
+                                          '/Foo': '/Bar',
+                                          '/Bar': ''}).sourceToTargetMap,
+                         {Sdf.Path('/'): Sdf.Path('/'),
+                          Sdf.Path('/Foo'): Sdf.Path('/Bar')})
+
+    # Test case for bug 74847.
+    def test_Bug74847(self):
+        m = Pcp.MapFunction({'/A': '/A/B'})
+        self.assertEqual(m.MapSourceToTarget('/A/B'), Sdf.Path('/A/B/B'))
+        self.assertEqual(m.MapTargetToSource('/A/B/B'), Sdf.Path('/A/B'))
+
+    # Test case for bug 112645. See also TrickyInheritsAndRelocates3 test
+    # in testPcpMuseum.
+    def test_Bug112645(self):
+        f1 = Pcp.MapFunction(
+            {'/GuitarRig':'/GuitarRigX',
+             '/GuitarRig/Rig/StringsRig/_Class_StringRig/String':
+                '/GuitarRigX/Anim/Strings/String1'})
+
+        f2 = Pcp.MapFunction(
+            {'/StringsRig/String1Rig/String' :
+                '/GuitarRig/Anim/Strings/String1',
+             '/StringsRig' :
+                 '/GuitarRig/Rig/StringsRig'})
+
+        self.assertEqual(f1.Compose(f2), Pcp.MapFunction({
             '/StringsRig':'/GuitarRigX/Rig/StringsRig',
+            '/StringsRig/String1Rig/String':'',
             '/StringsRig/_Class_StringRig/String':
-                '/GuitarRigX/Anim/Strings/String1'})
+                '/GuitarRigX/Anim/Strings/String1'}))
+
+    # Test for a bug where the composed map function of two map functions would
+    # not produce the same MapSourceToTarget(path) results as passing the path
+    # through the two map functions individually.
+    def test_BugComposedMapFunction(self):
+
+        # The first map function maps /PathRig to a target path and also maps
+        # a /PathRig/Path (a child of /PathRig) to a path that is not a descendant 
+        # of its parent's mapped target.
+        f1 = Pcp.MapFunction({
+            '/PathRig' : '/CharRig/Rig/PathRig',
+            '/PathRig/Path' : '/Path'
+        })
+
+        # The second map function is maps an ancestor of one entry's target in the
+        # first map function but does not map both.
+        f2 = Pcp.MapFunction({
+            '/CharRig' : '/Model'
+        })
+
+        # Compose the map functions for the equivalent of mapping f2(f1(path))
+        fComposed = f2.Compose(f1)
+
+        # Verify the resulting composed function.
+        self.assertEqual(fComposed, Pcp.MapFunction({
+            '/PathRig' : '/Model/Rig/PathRig',
+            '/PathRig/Path' : Sdf.Path()
+        }))
+
+        # Verifies that calling the composed map function on a path produces the
+        # same result as calling its composing map functions in sequence on the 
+        # the same path
+        def _VerifyComposedFunctionMapsSourceToTargetTheSame(
+                sourcePath, targetPath):
+            # The composed functions MapSourceToTarget will produce the same path
+            # as calling f1.MapSourceToTarget followed by f2.MapSourceToTarget
+            self.assertEqual(
+                fComposed.MapSourceToTarget(sourcePath), 
+                targetPath)
+            self.assertEqual(
+                f2.MapSourceToTarget(f1.MapSourceToTarget(sourcePath)), 
+                targetPath)
+
+        def _VerifyComposedFunctionMapsTargetToSourceTheSame(
+                targetPath, sourcePath):
+            # For MapTargetToSource, it's inverted. The composed 
+            # MapTargetToSource is the same as calling f2.MapTargetToSource 
+            # followed by f1.MapTargetToSource
+            self.assertEqual(
+                fComposed.MapTargetToSource(targetPath), 
+                sourcePath)
+            self.assertEqual(
+                f1.MapTargetToSource(f2.MapTargetToSource(targetPath)),
+                sourcePath)
+
+        # Verify path that fails to map in f1.
+        _VerifyComposedFunctionMapsSourceToTargetTheSame('/Bogus', '')
+        _VerifyComposedFunctionMapsTargetToSourceTheSame('/Bogus', '')
+
+        # Verify path that is the first direct source in f1. This will map
+        _VerifyComposedFunctionMapsSourceToTargetTheSame(
+            '/PathRig', '/Model/Rig/PathRig')
+        _VerifyComposedFunctionMapsTargetToSourceTheSame(
+            '/Model/Rig/PathRig', '/PathRig')
+
+        # Verify path that is a child of the first direct source 
+        _VerifyComposedFunctionMapsSourceToTargetTheSame(
+            '/PathRig/Rig', '/Model/Rig/PathRig/Rig')
+        _VerifyComposedFunctionMapsTargetToSourceTheSame(
+            '/Model/Rig/PathRig/Rig', '/PathRig/Rig')
+
+        # Verify path that is the second direct source in f1 will fail to map
+        # across f2 and therefore will also fail to map across the composed
+        # function.
+        _VerifyComposedFunctionMapsSourceToTargetTheSame('/PathRig/Path', '')
+
+        # Verify target path that can inverse map across f2 but fails to inverse
+        # map across f1 will also fail to inverse map across the composed
+        # function.
+        _VerifyComposedFunctionMapsTargetToSourceTheSame(
+            '/Model/Rig/PathRig/Path', '')
+
+    def test_PathExpression(self):
+        # Test mapping path expressions.
+        m = Pcp.MapFunction({'/Model': '/Model_1'})
+        pe = Sdf.PathExpression('//{shiny} /Model/Tee /Outside/the/model')
+        mappedPe = m.MapSourceToTarget(pe)
+        self.assertEqual(mappedPe, Sdf.PathExpression('//{shiny} /Model_1/Tee'))
 
-TestBug112645()
+if __name__ == "__main__":
+    unittest.main()
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/charRig.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/charRig.sdf
new file mode 100644
index 0000000000..739ff28534
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/charRig.sdf
@@ -0,0 +1,42 @@
+#sdf 1.4.32
+(
+    relocates = {
+        </CharRig/Rig/PathRig/Path>: </Path>,
+        </Path/Anim>: </Path/AnimScope>,
+    }
+)
+
+over "Path" (
+    doc = """This path prim is relocated out from the PathRig into a new root prim
+        that is referenced separately."""
+)
+{
+    over "AnimScope"
+    {
+        custom double track
+    }
+}
+
+
+def Prim "CharRig"
+{
+    def Scope "Anim"
+    {
+    }
+
+    def Scope "Rig"
+    {
+        def Scope "PathRig" (
+            add references = @./pathRig.sdf@</PathRig>
+        )
+        {
+            rel relationshipToPathAvar2 = [<Path/Anim.track>] (
+                doc = """This relationship target will map across the reference from
+                    root.sdf</Model>, unlike the relationship in pathRig, because the
+                    relocates only affect target paths that are brought in from the 
+                    reference to pathRig, not paths that are authored locally in this
+                    layer."""
+            )
+        }
+    }
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/pathRig.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/pathRig.sdf
new file mode 100644
index 0000000000..bf396fddf7
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/pathRig.sdf
@@ -0,0 +1,20 @@
+#sdf 1.4.32
+
+def Prim "PathRig"
+{
+    def Path "Path"
+    {
+        def Scope "Anim"
+        {
+            custom double track
+        }
+    }
+
+    rel relationshipToPathAvar = <Path/Anim.track> (
+        doc = """This relationship target will be mapped and relocated in
+            charRig to point to /Path/AnimScope.track. However this will
+            fail to map all the way up through the reference from 
+            root.sdf</Model> because it is outside of the reference prim
+            hierarchy precisely because of charRig's relocates."""
+    )
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/root.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/root.sdf
new file mode 100644
index 0000000000..c2a9d3af74
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/BasicRelocateToAnimInterfaceAsNewRootPrim/root.sdf
@@ -0,0 +1,43 @@
+#sdf 1.4.32
+(
+    """
+    This is an altered version of testPcpMuseum_BasicRelocateToAnimInterface
+    where the Path anim scope in charRig is relocated completely out of the 
+    rig into a new root prim. This requires that the relocated /Path scope 
+    needs be separated referenced under the Anim scope here. The composition
+    results are almost the same as testPcpMuseum_BasicRelocateToAnimInterface
+    with the notable exception that relationship targets specified in pathRig and
+    charRig to the /Path scope don't map across the reference in the same way.
+    """
+)
+
+def "Model" (
+    add references = @./charRig.sdf@</CharRig>
+)
+{
+    over "Anim"
+    {
+        over "Path" (
+            add references = @./charRig.sdf@</Path>
+        )
+        {
+            over "AnimScope"
+            {
+                custom double track
+            }
+        }
+    }
+
+    over "Rig"
+    {
+        over "PathRig"
+        {
+            over "Path" (
+                doc = "This is a prohibited location in namespace due to the relocation.  This opinion should be skipped over!"
+            )
+            {
+                custom double track
+            }
+        }
+    }
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionErrors_BasicRelocateToAnimInterfaceAsNewRootPrim.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionErrors_BasicRelocateToAnimInterfaceAsNewRootPrim.txt
new file mode 100644
index 0000000000..3208d0faae
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionErrors_BasicRelocateToAnimInterfaceAsNewRootPrim.txt
@@ -0,0 +1,6 @@
+------------------------------------------------------------------------
+Errors while composing </Model/Rig/PathRig>
+
+The relationship target </PathRig/Path/Anim.track> from </PathRig.relationshipToPathAvar> in layer @BasicRelocateToAnimInterfaceAsNewRootPrim/pathRig.sdf@ refers to a path outside the scope of the reference from </CharRig/Rig/PathRig>.  Ignoring.
+The relationship target </CharRig/Rig/PathRig/Path/Anim.track> from </CharRig/Rig/PathRig.relationshipToPathAvar2> in layer @BasicRelocateToAnimInterfaceAsNewRootPrim/charRig.sdf@ is invalid.  This may be because the path is the pre-relocated source path of a relocated prim.  Ignoring.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionErrors_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionErrors_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt
new file mode 100644
index 0000000000..f32d6c9ee0
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionErrors_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt
@@ -0,0 +1,5 @@
+------------------------------------------------------------------------
+Errors while composing </Model/Rig/PathRig>
+
+The relationship target </PathRig/Path/Anim.track> from </PathRig.relationshipToPathAvar> in layer @BasicRelocateToAnimInterfaceAsNewRootPrim/pathRig.sdf@ refers to a path outside the scope of the reference from </CharRig/Rig/PathRig>.  Ignoring.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionResults_BasicRelocateToAnimInterfaceAsNewRootPrim.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionResults_BasicRelocateToAnimInterfaceAsNewRootPrim.txt
new file mode 100644
index 0000000000..828dbf55dd
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionResults_BasicRelocateToAnimInterfaceAsNewRootPrim.txt
@@ -0,0 +1,87 @@
+Loading @BasicRelocateToAnimInterfaceAsNewRootPrim/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </Model>
+
+Prim Stack:
+    root.sdf             /Model
+    charRig.sdf          /CharRig
+
+Child names:
+     ['Anim', 'Rig']
+
+------------------------------------------------------------------------
+Results for composing </Model/Anim>
+
+Prim Stack:
+    root.sdf             /Model/Anim
+    charRig.sdf          /CharRig/Anim
+
+Child names:
+     ['Path']
+
+------------------------------------------------------------------------
+Results for composing </Model/Anim/Path>
+
+Prim Stack:
+    root.sdf             /Model/Anim/Path
+    charRig.sdf          /Path
+    pathRig.sdf          /PathRig/Path
+
+Child names:
+     ['AnimScope']
+
+Prohibited child names:
+     ['Anim']
+
+------------------------------------------------------------------------
+Results for composing </Model/Anim/Path/AnimScope>
+
+Prim Stack:
+    root.sdf             /Model/Anim/Path/AnimScope
+    charRig.sdf          /Path/AnimScope
+    pathRig.sdf          /PathRig/Path/Anim
+
+Property names:
+     ['track']
+
+Property stacks:
+/Model/Anim/Path/AnimScope.track:
+    root.sdf             /Model/Anim/Path/AnimScope.track
+    charRig.sdf          /Path/AnimScope.track
+    pathRig.sdf          /PathRig/Path/Anim.track
+
+------------------------------------------------------------------------
+Results for composing </Model/Rig>
+
+Prim Stack:
+    root.sdf             /Model/Rig
+    charRig.sdf          /CharRig/Rig
+
+Child names:
+     ['PathRig']
+
+------------------------------------------------------------------------
+Results for composing </Model/Rig/PathRig>
+
+Prim Stack:
+    root.sdf             /Model/Rig/PathRig
+    charRig.sdf          /CharRig/Rig/PathRig
+    pathRig.sdf          /PathRig
+
+Prohibited child names:
+     ['Path']
+
+Property names:
+     ['relationshipToPathAvar', 'relationshipToPathAvar2']
+
+Property stacks:
+/Model/Rig/PathRig.relationshipToPathAvar:
+    pathRig.sdf          /PathRig.relationshipToPathAvar
+/Model/Rig/PathRig.relationshipToPathAvar2:
+    charRig.sdf          /CharRig/Rig/PathRig.relationshipToPathAvar2
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionResults_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionResults_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt
new file mode 100644
index 0000000000..71fff9fe54
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_BasicRelocateToAnimInterfaceAsNewRootPrim.testenv/baseline/compositionResults_BasicRelocateToAnimInterfaceAsNewRootPrim_usd.txt
@@ -0,0 +1,91 @@
+Loading @BasicRelocateToAnimInterfaceAsNewRootPrim/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </Model>
+
+Prim Stack:
+    root.sdf             /Model
+    charRig.sdf          /CharRig
+
+Child names:
+     ['Anim', 'Rig']
+
+------------------------------------------------------------------------
+Results for composing </Model/Anim>
+
+Prim Stack:
+    root.sdf             /Model/Anim
+    charRig.sdf          /CharRig/Anim
+
+Child names:
+     ['Path']
+
+------------------------------------------------------------------------
+Results for composing </Model/Anim/Path>
+
+Prim Stack:
+    root.sdf             /Model/Anim/Path
+    charRig.sdf          /Path
+    pathRig.sdf          /PathRig/Path
+
+Child names:
+     ['AnimScope']
+
+Prohibited child names:
+     ['Anim']
+
+------------------------------------------------------------------------
+Results for composing </Model/Anim/Path/AnimScope>
+
+Prim Stack:
+    root.sdf             /Model/Anim/Path/AnimScope
+    charRig.sdf          /Path/AnimScope
+    pathRig.sdf          /PathRig/Path/Anim
+
+Property names:
+     ['track']
+
+Property stacks:
+/Model/Anim/Path/AnimScope.track:
+    root.sdf             /Model/Anim/Path/AnimScope.track
+    charRig.sdf          /Path/AnimScope.track
+    pathRig.sdf          /PathRig/Path/Anim.track
+
+------------------------------------------------------------------------
+Results for composing </Model/Rig>
+
+Prim Stack:
+    root.sdf             /Model/Rig
+    charRig.sdf          /CharRig/Rig
+
+Child names:
+     ['PathRig']
+
+------------------------------------------------------------------------
+Results for composing </Model/Rig/PathRig>
+
+Prim Stack:
+    root.sdf             /Model/Rig/PathRig
+    charRig.sdf          /CharRig/Rig/PathRig
+    pathRig.sdf          /PathRig
+
+Prohibited child names:
+     ['Path']
+
+Property names:
+     ['relationshipToPathAvar', 'relationshipToPathAvar2']
+
+Property stacks:
+/Model/Rig/PathRig.relationshipToPathAvar:
+    pathRig.sdf          /PathRig.relationshipToPathAvar
+/Model/Rig/PathRig.relationshipToPathAvar2:
+    charRig.sdf          /CharRig/Rig/PathRig.relationshipToPathAvar2
+
+Relationship targets:
+/Model/Rig/PathRig.relationshipToPathAvar2:
+    /Model/Rig/PathRig/Path/Anim.track
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle.txt
index 44b5316cba..833ed0117f 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionErrors_ErrorArcCycle.txt
@@ -84,6 +84,17 @@ CANNOT inherit from:
 @ErrorArcCycle/root.sdf@</InheritOfChild/Child>
 
 
+------------------------------------------------------------------------
+Errors while composing </RelocatedInheritOfChild/Object>
+
+Cycle detected:
+@ErrorArcCycle/root.sdf@</RelocatedInheritOfChild/Object>
+is relocated from:
+@ErrorArcCycle/root.sdf@</RelocatedInheritOfChild/Child>
+which CANNOT inherit from:
+@ErrorArcCycle/root.sdf@</RelocatedInheritOfChild/Child/Class>
+
+
 ------------------------------------------------------------------------
 Errors while composing </RelocatedInheritOfChild/Child>
 
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionResults_ErrorArcCycle.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionResults_ErrorArcCycle.txt
index 8c1f46cca0..c88f49e091 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionResults_ErrorArcCycle.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorArcCycle.testenv/baseline/compositionResults_ErrorArcCycle.txt
@@ -165,6 +165,11 @@ Prim Stack:
 Child names:
      ['Object', 'Child']
 
+------------------------------------------------------------------------
+Results for composing </RelocatedInheritOfChild/Object>
+
+Prim Stack:
+
 ------------------------------------------------------------------------
 Results for composing </RelocatedInheritOfChild/Child>
 
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/ErrorInvalidAuthoredRelocates/root.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/ErrorInvalidAuthoredRelocates/root.sdf
index 95c538fb28..8220ebf77c 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/ErrorInvalidAuthoredRelocates/root.sdf
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/ErrorInvalidAuthoredRelocates/root.sdf
@@ -10,9 +10,7 @@
         </Model_1/Instance/Test>: </Model_1/Instance/Test>, 
         </Model_2/Instance/Test>: </Model_2/Instance>, 
         </Model_3/Instance>: </Model_3/Instance/Test>, 
-        </Model_4/Instance/Test>: </Model_3/Test>, 
-        </Model_5>: </Model_4/Model_5>, 
-        </Model_5/Instance/Test>: </Test>
+        </Model_4>: </Model_5>, 
     }
 )
 
@@ -82,8 +80,7 @@ def "Model_3" (
     }
 }
 
-# This case exercises a relocation that would move the prim to be a 
-# descendant of a different root prim. 
+# This case exercises a relocation that would move from a root prim. 
 # This is a composition error and the relocation is ignored.
 #
 def "Model_4" (
@@ -104,25 +101,3 @@ def "Model_4" (
         }
     }
 }
-
-# This case exercises a relocations that would move to or from root prims. 
-# These are composition errors and the relocations are ignored.
-#
-def "Model_5" (
-    add references = @./model.sdf@</Model>
-)
-{
-    over "LocalClass"
-    {
-        def Scope "Test"
-        {
-        }
-    }
-
-    over "Instance" 
-    {
-        over "Test"
-        {
-        }
-    }
-}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/baseline/compositionErrors_ErrorInvalidAuthoredRelocates.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/baseline/compositionErrors_ErrorInvalidAuthoredRelocates.txt
index 019bf88df8..cf433bebfb 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/baseline/compositionErrors_ErrorInvalidAuthoredRelocates.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/baseline/compositionErrors_ErrorInvalidAuthoredRelocates.txt
@@ -4,7 +4,5 @@ Errors while computing Layer Stack
 Relocation from </Model_1/Instance/Test> to </Model_1/Instance/Test> authored at @ErrorInvalidAuthoredRelocates/root.sdf@</> is invalid and will be ignored: The target of a relocate cannot be the same as its source.
 Relocation from </Model_2/Instance/Test> to </Model_2/Instance> authored at @ErrorInvalidAuthoredRelocates/root.sdf@</> is invalid and will be ignored: The target of a relocate cannot be an ancestor of its source.
 Relocation from </Model_3/Instance> to </Model_3/Instance/Test> authored at @ErrorInvalidAuthoredRelocates/root.sdf@</> is invalid and will be ignored: The target of a relocate cannot be a descendant of its source.
-Relocation from </Model_4/Instance/Test> to </Model_3/Test> authored at @ErrorInvalidAuthoredRelocates/root.sdf@</> is invalid and will be ignored: Prims cannot be relocated to be a descendant of a different root prim.
-Relocation from </Model_5> to </Model_4/Model_5> authored at @ErrorInvalidAuthoredRelocates/root.sdf@</> is invalid and will be ignored: Root prims cannot be the source or target of a relocate.
-Relocation from </Model_5/Instance/Test> to </Test> authored at @ErrorInvalidAuthoredRelocates/root.sdf@</> is invalid and will be ignored: Root prims cannot be the source or target of a relocate.
+Relocation from </Model_4> to </Model_5> authored at @ErrorInvalidAuthoredRelocates/root.sdf@</> is invalid and will be ignored: Root prims cannot be the source of a relocate.
 
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/baseline/compositionResults_ErrorInvalidAuthoredRelocates.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/baseline/compositionResults_ErrorInvalidAuthoredRelocates.txt
index 1f5c10ceaa..26c9240d22 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/baseline/compositionResults_ErrorInvalidAuthoredRelocates.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidAuthoredRelocates.testenv/baseline/compositionResults_ErrorInvalidAuthoredRelocates.txt
@@ -184,48 +184,3 @@ Prim Stack:
     root.sdf             /Model_4/Instance/Test
     root.sdf             /Model_4/LocalClass/Test
 
-------------------------------------------------------------------------
-Results for composing </Model_5>
-
-Prim Stack:
-    root.sdf             /Model_5
-    model.sdf            /Model
-
-Child names:
-     ['LocalClass', 'Instance']
-
-------------------------------------------------------------------------
-Results for composing </Model_5/LocalClass>
-
-Prim Stack:
-    root.sdf             /Model_5/LocalClass
-    model.sdf            /Model/LocalClass
-
-Child names:
-     ['Test']
-
-------------------------------------------------------------------------
-Results for composing </Model_5/LocalClass/Test>
-
-Prim Stack:
-    root.sdf             /Model_5/LocalClass/Test
-
-------------------------------------------------------------------------
-Results for composing </Model_5/Instance>
-
-Prim Stack:
-    root.sdf             /Model_5/Instance
-    root.sdf             /Model_5/LocalClass
-    model.sdf            /Model/Instance
-    model.sdf            /Model/LocalClass
-
-Child names:
-     ['Test']
-
-------------------------------------------------------------------------
-Results for composing </Model_5/Instance/Test>
-
-Prim Stack:
-    root.sdf             /Model_5/Instance/Test
-    root.sdf             /Model_5/LocalClass/Test
-
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/ErrorInvalidConflictingRelocates/model.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/ErrorInvalidConflictingRelocates/model.sdf
index 76bd672150..1c8bc60f90 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/ErrorInvalidConflictingRelocates/model.sdf
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/ErrorInvalidConflictingRelocates/model.sdf
@@ -24,3 +24,22 @@ def Prim "Model"
     	}
     }
 }
+
+def Prim "OtherModel" 
+{
+    def Prim "A" 
+    {
+        def Prim "B"
+        {
+            def Prim "C" 
+            {
+                def Prim "D" 
+                {
+                    def Prim "E" 
+                    {
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/ErrorInvalidConflictingRelocates/root.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/ErrorInvalidConflictingRelocates/root.sdf
index abe673879c..4c9c5160a8 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/ErrorInvalidConflictingRelocates/root.sdf
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/ErrorInvalidConflictingRelocates/root.sdf
@@ -9,15 +9,29 @@
     relocates = {
         </Model_1/Instance/ClassChild>: </Model_1/Instance/Test>, 
         </Model_1/Instance/InstanceChild>: </Model_1/Instance/Test>, 
+
         </Model_2/Instance/InstanceChild>: </Model_2/Test>, 
         </Model_2/Test>: </Model_2/Instance/Test>, 
+
         </Model_3/Instance/ClassChild>: </Model_3/Instance/Test>, 
         </Model_3/Instance/InstanceChild>: </Model_3/Test>, 
         </Model_3/Test>: </Model_3/Instance/Test>, 
+
         </Model_4/Instance/InstanceChild>: </Model_4/Test>, 
         </Model_4/Instance/InstanceChild/InstanceGrandChild>: </Model_4/Test/Child>, 
+
         </Model_5/Instance/ClassChild>: </Model_5/Instance/InstanceChild/ClassChild>, 
-        </Model_5/Instance/InstanceChild>: </Model_5/Test>
+        </Model_5/Instance/InstanceChild>: </Model_5/Test>,
+
+        </OtherModel_1/A> : </OtherModel_1/W>,
+        </OtherModel_1/W/B> : </OtherModel_1/W/X>,
+        </OtherModel_1/A/B/C> : </OtherModel_1/W/X/Y>,
+        </OtherModel_1/W/X/Y/D> : </OtherModel_1/W/X/Y/Z>,
+        </OtherModel_1/A/B/C/D/E> : </OtherModel_1/W/X/Y/Z/Foo>,
+
+        </OtherModel_2/A> : </OtherModel_2/W>,
+        </OtherModel_2/W/B> : </OtherModel_2/J>,
+        </OtherModel_2/A/B> : </OtherModel_2/K>,
     }
 )
 
@@ -26,7 +40,7 @@
 # and both are ignored.
 #
 def "Model_1" (
-    add references = @./model.sdf@</Model>
+    references = @./model.sdf@</Model>
 )
 {
     over "LocalClass"
@@ -49,7 +63,7 @@ def "Model_1" (
 # for both relocates and both are ignored.
 #
 def "Model_2" (
-    add references = @./model.sdf@</Model>
+    references = @./model.sdf@</Model>
 )
 {
     over "LocalClass"
@@ -74,7 +88,7 @@ def "Model_2" (
 # found and reported.
 #
 def "Model_3" (
-    add references = @./model.sdf@</Model>
+    references = @./model.sdf@</Model>
 )
 {
     over "LocalClass"
@@ -96,7 +110,7 @@ def "Model_3" (
 # former relocate will report an error and be ignored.
 #
 def "Model_4" (
-    add references = @./model.sdf@</Model>
+    references = @./model.sdf@</Model>
 )
 {
     over "LocalClass"
@@ -118,7 +132,7 @@ def "Model_4" (
 # former relocate will report an error and be ignored.
 #
 def "Model_5" (
-    add references = @./model.sdf@</Model>
+    references = @./model.sdf@</Model>
 )
 {
     over "LocalClass"
@@ -134,3 +148,29 @@ def "Model_5" (
         }
     }
 }
+
+# This case exercises relocates on individual prims down a namespace 
+# hierarchy using alternating "most relocated" source paths and 
+# "original source" source paths. Relocates using original source paths
+# are rejected when a "more relocated" path exists. But legacy relocates
+# allow this to work. This case is to demonstrate these behavior 
+# differences.
+def "OtherModel_1" (
+    references = @./model.sdf@</OtherModel>
+)
+{
+}
+
+# This case exercises two different relocates on where their source paths
+# are an ancestrally relocated and that path's "original source" path.
+# The relocate with the original source path is an error and is rejected.
+# But legacy relocates don't automatically reject original source paths and
+# ends up processing two different relocates from the same effective source
+# path (just represented differently) This case is to demonstrate that legacy
+# relocates still chooses a single relocate for shared source though it 
+# doesn't log an official error.
+def "OtherModel_2" (
+    references = @./model.sdf@</OtherModel>
+)
+{
+}
\ No newline at end of file
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionErrors_ErrorInvalidConflictingRelocates.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionErrors_ErrorInvalidConflictingRelocates.txt
index 7a15b47b17..a5dc62b926 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionErrors_ErrorInvalidConflictingRelocates.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionErrors_ErrorInvalidConflictingRelocates.txt
@@ -9,4 +9,8 @@ Relocation from </Model_3/Instance/InstanceChild> to </Model_3/Test> authored at
 Relocation from </Model_3/Test> to </Model_3/Instance/Test> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> conflicts with another relocation from </Model_3/Instance/InstanceChild> to </Model_3/Test> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> and will be ignored: The source of a relocate cannot be the target of another relocate in the same layer stack.
 Relocation from </Model_4/Instance/InstanceChild/InstanceGrandChild> to </Model_4/Test/Child> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> conflicts with another relocation from </Model_4/Instance/InstanceChild> to </Model_4/Test> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> and will be ignored: The source of a relocate cannot be a descendant of the source of another relocate.
 Relocation from </Model_5/Instance/ClassChild> to </Model_5/Instance/InstanceChild/ClassChild> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> conflicts with another relocation from </Model_5/Instance/InstanceChild> to </Model_5/Test> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> and will be ignored: The target of a relocate cannot be a descendant of the source of another relocate.
+Relocation from </OtherModel_1/A/B/C> to </OtherModel_1/W/X/Y> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> conflicts with another relocation from </OtherModel_1/A> to </OtherModel_1/W> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> and will be ignored: The source of a relocate cannot be a descendant of the source of another relocate.
+Relocation from </OtherModel_1/A/B/C/D/E> to </OtherModel_1/W/X/Y/Z/Foo> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> conflicts with another relocation from </OtherModel_1/A> to </OtherModel_1/W> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> and will be ignored: The source of a relocate cannot be a descendant of the source of another relocate.
+Relocation from </OtherModel_1/A/B/C/D/E> to </OtherModel_1/W/X/Y/Z/Foo> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> conflicts with another relocation from </OtherModel_1/A/B/C> to </OtherModel_1/W/X/Y> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> and will be ignored: The source of a relocate cannot be a descendant of the source of another relocate.
+Relocation from </OtherModel_2/A/B> to </OtherModel_2/K> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> conflicts with another relocation from </OtherModel_2/A> to </OtherModel_2/W> authored at @ErrorInvalidConflictingRelocates/root.sdf@</> and will be ignored: The source of a relocate cannot be a descendant of the source of another relocate.
 
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionErrors_ErrorInvalidConflictingRelocates_Legacy.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionErrors_ErrorInvalidConflictingRelocates_Legacy.txt
new file mode 100644
index 0000000000..72b89297c6
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionErrors_ErrorInvalidConflictingRelocates_Legacy.txt
@@ -0,0 +1,6 @@
+------------------------------------------------------------------------
+Errors while computing Layer Stack
+
+The path </Model_1/Instance/Test> is the target of multiple relocations from different sources. The following relocates to this target are invalid and will be ignored: relocation from </Model_1/Instance/ClassChild> authored at @ErrorInvalidConflictingRelocates/root.sdf@</>; relocation from </Model_1/Instance/InstanceChild> authored at @ErrorInvalidConflictingRelocates/root.sdf@</>.
+The path </Model_3/Instance/Test> is the target of multiple relocations from different sources. The following relocates to this target are invalid and will be ignored: relocation from </Model_3/Instance/ClassChild> authored at @ErrorInvalidConflictingRelocates/root.sdf@</>; relocation from </Model_3/Test> authored at @ErrorInvalidConflictingRelocates/root.sdf@</>.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionResults_ErrorInvalidConflictingRelocates.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionResults_ErrorInvalidConflictingRelocates.txt
index dbe3208408..eba9a3662a 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionResults_ErrorInvalidConflictingRelocates.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionResults_ErrorInvalidConflictingRelocates.txt
@@ -460,3 +460,116 @@ Results for composing </Model_5/Test/InstanceGrandChild>
 Prim Stack:
     model.sdf            /Model/Instance/InstanceChild/InstanceGrandChild
 
+------------------------------------------------------------------------
+Results for composing </OtherModel_1>
+
+Prim Stack:
+    root.sdf             /OtherModel_1
+    model.sdf            /OtherModel
+
+Child names:
+     ['W']
+
+Prohibited child names:
+     ['A']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W>
+
+Prim Stack:
+    model.sdf            /OtherModel/A
+
+Child names:
+     ['X']
+
+Prohibited child names:
+     ['B']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W/X>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B
+
+Child names:
+     ['C']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W/X/C>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C
+
+Child names:
+     ['D']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W/X/C/D>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C/D
+
+Child names:
+     ['E']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W/X/C/D/E>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C/D/E
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2>
+
+Prim Stack:
+    root.sdf             /OtherModel_2
+    model.sdf            /OtherModel
+
+Child names:
+     ['W', 'J']
+
+Prohibited child names:
+     ['A']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/W>
+
+Prim Stack:
+    model.sdf            /OtherModel/A
+
+Prohibited child names:
+     ['B']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/J>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B
+
+Child names:
+     ['C']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/J/C>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C
+
+Child names:
+     ['D']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/J/C/D>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C/D
+
+Child names:
+     ['E']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/J/C/D/E>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C/D/E
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionResults_ErrorInvalidConflictingRelocates_Legacy.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionResults_ErrorInvalidConflictingRelocates_Legacy.txt
index e97f207d61..b4e00d6e00 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionResults_ErrorInvalidConflictingRelocates_Legacy.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidConflictingRelocates.testenv/baseline/compositionResults_ErrorInvalidConflictingRelocates_Legacy.txt
@@ -55,27 +55,45 @@ Prim Stack:
     model.sdf            /Model/LocalClass
 
 Child names:
-     ['Test']
+     ['ClassChild', 'InstanceChild', 'Test']
 
-Prohibited child names:
-     ['ClassChild', 'InstanceChild']
+------------------------------------------------------------------------
+Results for composing </Model_1/Instance/ClassChild>
+
+Prim Stack:
+    model.sdf            /Model/LocalClass/ClassChild
+
+Child names:
+     ['ClassGrandChild']
 
 ------------------------------------------------------------------------
-Results for composing </Model_1/Instance/Test>
+Results for composing </Model_1/Instance/ClassChild/ClassGrandChild>
+
+Prim Stack:
+    model.sdf            /Model/LocalClass/ClassChild/ClassGrandChild
+
+------------------------------------------------------------------------
+Results for composing </Model_1/Instance/InstanceChild>
 
 Prim Stack:
-    root.sdf             /Model_1/Instance/Test
     model.sdf            /Model/Instance/InstanceChild
 
 Child names:
      ['InstanceGrandChild']
 
 ------------------------------------------------------------------------
-Results for composing </Model_1/Instance/Test/InstanceGrandChild>
+Results for composing </Model_1/Instance/InstanceChild/InstanceGrandChild>
 
 Prim Stack:
     model.sdf            /Model/Instance/InstanceChild/InstanceGrandChild
 
+------------------------------------------------------------------------
+Results for composing </Model_1/Instance/Test>
+
+Prim Stack:
+    root.sdf             /Model_1/Instance/Test
+    root.sdf             /Model_1/LocalClass/Test
+
 ------------------------------------------------------------------------
 Results for composing </Model_2>
 
@@ -164,10 +182,7 @@ Prim Stack:
     model.sdf            /Model
 
 Child names:
-     ['LocalClass', 'Instance']
-
-Prohibited child names:
-     ['Test']
+     ['LocalClass', 'Instance', 'Test']
 
 ------------------------------------------------------------------------
 Results for composing </Model_3/LocalClass>
@@ -210,16 +225,47 @@ Prim Stack:
     model.sdf            /Model/LocalClass
 
 Child names:
-     ['Test']
+     ['ClassChild', 'Test']
 
 Prohibited child names:
-     ['ClassChild', 'InstanceChild']
+     ['InstanceChild']
+
+------------------------------------------------------------------------
+Results for composing </Model_3/Instance/ClassChild>
+
+Prim Stack:
+    model.sdf            /Model/LocalClass/ClassChild
+
+Child names:
+     ['ClassGrandChild']
+
+------------------------------------------------------------------------
+Results for composing </Model_3/Instance/ClassChild/ClassGrandChild>
+
+Prim Stack:
+    model.sdf            /Model/LocalClass/ClassChild/ClassGrandChild
 
 ------------------------------------------------------------------------
 Results for composing </Model_3/Instance/Test>
 
 Prim Stack:
     root.sdf             /Model_3/Instance/Test
+    root.sdf             /Model_3/LocalClass/Test
+
+------------------------------------------------------------------------
+Results for composing </Model_3/Test>
+
+Prim Stack:
+    model.sdf            /Model/Instance/InstanceChild
+
+Child names:
+     ['InstanceGrandChild']
+
+------------------------------------------------------------------------
+Results for composing </Model_3/Test/InstanceGrandChild>
+
+Prim Stack:
+    model.sdf            /Model/Instance/InstanceChild/InstanceGrandChild
 
 ------------------------------------------------------------------------
 Results for composing </Model_4>
@@ -387,7 +433,7 @@ Prim Stack:
     model.sdf            /Model/Instance/InstanceChild
 
 Child names:
-     ['InstanceGrandChild', 'ClassChild']
+     ['InstanceGrandChild']
 
 ------------------------------------------------------------------------
 Results for composing </Model_5/Test/InstanceGrandChild>
@@ -396,17 +442,124 @@ Prim Stack:
     model.sdf            /Model/Instance/InstanceChild/InstanceGrandChild
 
 ------------------------------------------------------------------------
-Results for composing </Model_5/Test/ClassChild>
+Results for composing </OtherModel_1>
 
 Prim Stack:
-    model.sdf            /Model/LocalClass/ClassChild
+    root.sdf             /OtherModel_1
+    model.sdf            /OtherModel
 
 Child names:
-     ['ClassGrandChild']
+     ['W']
+
+Prohibited child names:
+     ['A']
 
 ------------------------------------------------------------------------
-Results for composing </Model_5/Test/ClassChild/ClassGrandChild>
+Results for composing </OtherModel_1/W>
 
 Prim Stack:
-    model.sdf            /Model/LocalClass/ClassChild/ClassGrandChild
+    model.sdf            /OtherModel/A
+
+Child names:
+     ['X']
+
+Prohibited child names:
+     ['B']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W/X>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B
+
+Child names:
+     ['Y']
+
+Prohibited child names:
+     ['C']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W/X/Y>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C
+
+Child names:
+     ['Z']
+
+Prohibited child names:
+     ['D']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W/X/Y/Z>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C/D
+
+Child names:
+     ['Foo']
+
+Prohibited child names:
+     ['E']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_1/W/X/Y/Z/Foo>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C/D/E
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2>
+
+Prim Stack:
+    root.sdf             /OtherModel_2
+    model.sdf            /OtherModel
+
+Child names:
+     ['W', 'J']
+
+Prohibited child names:
+     ['A']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/W>
+
+Prim Stack:
+    model.sdf            /OtherModel/A
+
+Prohibited child names:
+     ['B']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/J>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B
+
+Child names:
+     ['C']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/J/C>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C
+
+Child names:
+     ['D']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/J/C/D>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C/D
+
+Child names:
+     ['E']
+
+------------------------------------------------------------------------
+Results for composing </OtherModel_2/J/C/D/E>
+
+Prim Stack:
+    model.sdf            /OtherModel/A/B/C/D/E
 
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionErrors_ErrorInvalidInstanceTargetPath.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionErrors_ErrorInvalidInstanceTargetPath.txt
index 064d00a4a1..8050f72f37 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionErrors_ErrorInvalidInstanceTargetPath.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionErrors_ErrorInvalidInstanceTargetPath.txt
@@ -13,22 +13,12 @@ The attribute connection </ConnectionToLocalClass/Instance_2.y> from </Connectio
 ------------------------------------------------------------------------
 Errors while composing </FaceRig/BrowRig/LBrow/BrowInnUDPosBrowInnUDNeg_sculpt>
 
-Cycle detected:
-@ErrorInvalidInstanceTargetPath/root.sdf@</FaceRig/BrowRig/Anim/LBrow>
-CANNOT inherit from:
-@ErrorInvalidInstanceTargetPath/root.sdf@</FaceRig/BrowRig/Anim/LBrow>
-
 The attribute connection </BrowRig/Anim/RBrow.InnUD> from </BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount> in layer @ErrorInvalidInstanceTargetPath/ref.sdf@ is authored in a class but refers to an instance of that class.  Ignoring.
-The attribute connection </BrowRig/Anim/LBrow.InnUD> from </BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount> in layer @ErrorInvalidInstanceTargetPath/ref.sdf@ is authored in a class but refers to an instance of that class.  Ignoring.
+The attribute connection </BrowRig/Anim/LBrow.InnUD> from </BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount> in layer @ErrorInvalidInstanceTargetPath/ref.sdf@ is invalid.  This may be because the path is the pre-relocated source path of a relocated prim.  Ignoring.
 
 ------------------------------------------------------------------------
 Errors while composing </FaceRig/BrowRig/RBrow/BrowInnUDPosBrowInnUDNeg_sculpt>
 
-Cycle detected:
-@ErrorInvalidInstanceTargetPath/root.sdf@</FaceRig/BrowRig/Anim/RBrow>
-CANNOT inherit from:
-@ErrorInvalidInstanceTargetPath/root.sdf@</FaceRig/BrowRig/Anim/RBrow>
-
-The attribute connection </BrowRig/Anim/RBrow.InnUD> from </BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount> in layer @ErrorInvalidInstanceTargetPath/ref.sdf@ is authored in a class but refers to an instance of that class.  Ignoring.
+The attribute connection </BrowRig/Anim/RBrow.InnUD> from </BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount> in layer @ErrorInvalidInstanceTargetPath/ref.sdf@ is invalid.  This may be because the path is the pre-relocated source path of a relocated prim.  Ignoring.
 The attribute connection </BrowRig/Anim/LBrow.InnUD> from </BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount> in layer @ErrorInvalidInstanceTargetPath/ref.sdf@ is authored in a class but refers to an instance of that class.  Ignoring.
 
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionErrors_ErrorInvalidInstanceTargetPath_usd.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionErrors_ErrorInvalidInstanceTargetPath_usd.txt
new file mode 100644
index 0000000000..c54a3b56c8
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionErrors_ErrorInvalidInstanceTargetPath_usd.txt
@@ -0,0 +1,22 @@
+------------------------------------------------------------------------
+Errors while composing </ConnectionToLocalClass/Instance_1>
+
+The attribute connection </ConnectionToLocalClass/Instance_1.y> from </ConnectionToLocalClass/LocalClass.x> in layer @ErrorInvalidInstanceTargetPath/root.sdf@ refers to a path outside the scope of the inherit from </ConnectionToLocalClass/Instance_1>.  Ignoring.
+The attribute connection </ConnectionToLocalClass/Instance_2.y> from </ConnectionToLocalClass/LocalClass.x> in layer @ErrorInvalidInstanceTargetPath/root.sdf@ is authored in a class but refers to an instance of that class.  Ignoring.
+
+------------------------------------------------------------------------
+Errors while composing </ConnectionToLocalClass/Instance_2>
+
+The attribute connection </ConnectionToLocalClass/Instance_1.y> from </ConnectionToLocalClass/LocalClass.x> in layer @ErrorInvalidInstanceTargetPath/root.sdf@ is authored in a class but refers to an instance of that class.  Ignoring.
+The attribute connection </ConnectionToLocalClass/Instance_2.y> from </ConnectionToLocalClass/LocalClass.x> in layer @ErrorInvalidInstanceTargetPath/root.sdf@ refers to a path outside the scope of the inherit from </ConnectionToLocalClass/Instance_2>.  Ignoring.
+
+------------------------------------------------------------------------
+Errors while composing </FaceRig/BrowRig/LBrow/BrowInnUDPosBrowInnUDNeg_sculpt>
+
+The attribute connection </BrowRig/Anim/RBrow.InnUD> from </BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount> in layer @ErrorInvalidInstanceTargetPath/ref.sdf@ is authored in a class but refers to an instance of that class.  Ignoring.
+
+------------------------------------------------------------------------
+Errors while composing </FaceRig/BrowRig/RBrow/BrowInnUDPosBrowInnUDNeg_sculpt>
+
+The attribute connection </BrowRig/Anim/LBrow.InnUD> from </BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount> in layer @ErrorInvalidInstanceTargetPath/ref.sdf@ is authored in a class but refers to an instance of that class.  Ignoring.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionResults_ErrorInvalidInstanceTargetPath_usd.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionResults_ErrorInvalidInstanceTargetPath_usd.txt
new file mode 100644
index 0000000000..9f715762f5
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidInstanceTargetPath.testenv/baseline/compositionResults_ErrorInvalidInstanceTargetPath_usd.txt
@@ -0,0 +1,248 @@
+Loading @ErrorInvalidInstanceTargetPath/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </ConnectionToLocalClass>
+
+Prim Stack:
+    root.sdf             /ConnectionToLocalClass
+
+Child names:
+     ['LocalClass', 'Instance_1', 'Instance_2']
+
+------------------------------------------------------------------------
+Results for composing </ConnectionToLocalClass/LocalClass>
+
+Prim Stack:
+    root.sdf             /ConnectionToLocalClass/LocalClass
+
+Property names:
+     ['x', 'y']
+
+Property stacks:
+/ConnectionToLocalClass/LocalClass.x:
+    root.sdf             /ConnectionToLocalClass/LocalClass.x
+/ConnectionToLocalClass/LocalClass.y:
+    root.sdf             /ConnectionToLocalClass/LocalClass.y
+
+Attribute connections:
+/ConnectionToLocalClass/LocalClass.x:
+    /ConnectionToLocalClass/Instance_1.y
+    /ConnectionToLocalClass/Instance_2.y
+
+------------------------------------------------------------------------
+Results for composing </ConnectionToLocalClass/Instance_1>
+
+Prim Stack:
+    root.sdf             /ConnectionToLocalClass/Instance_1
+    root.sdf             /ConnectionToLocalClass/LocalClass
+
+Property names:
+     ['x', 'y']
+
+Property stacks:
+/ConnectionToLocalClass/Instance_1.x:
+    root.sdf             /ConnectionToLocalClass/LocalClass.x
+/ConnectionToLocalClass/Instance_1.y:
+    root.sdf             /ConnectionToLocalClass/LocalClass.y
+
+------------------------------------------------------------------------
+Results for composing </ConnectionToLocalClass/Instance_2>
+
+Prim Stack:
+    root.sdf             /ConnectionToLocalClass/Instance_2
+    root.sdf             /ConnectionToLocalClass/LocalClass
+
+Property names:
+     ['x', 'y']
+
+Property stacks:
+/ConnectionToLocalClass/Instance_2.x:
+    root.sdf             /ConnectionToLocalClass/LocalClass.x
+/ConnectionToLocalClass/Instance_2.y:
+    root.sdf             /ConnectionToLocalClass/LocalClass.y
+
+------------------------------------------------------------------------
+Results for composing </FaceRig>
+
+Prim Stack:
+    root.sdf             /FaceRig
+
+Child names:
+     ['BrowRig', 'Anim']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig>
+
+Prim Stack:
+    root.sdf             /FaceRig/BrowRig
+    ref.sdf              /BrowRig
+
+Child names:
+     ['SymBrow', 'LBrow', 'RBrow', 'Anim']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/SymBrow>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow
+
+Child names:
+     ['BrowInnUDPosBrowInnUDNeg_sculpt', 'Anim']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt
+
+Property names:
+     ['amount']
+
+Property stacks:
+/FaceRig/BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount:
+    ref.sdf              /BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount
+
+Attribute connections:
+/FaceRig/BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount:
+    /FaceRig/Anim/Face/Eyes/RBrow.InnUD
+    /FaceRig/Anim/Face/Eyes/LBrow.InnUD
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/SymBrow/Anim>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/Anim
+
+Child names:
+     ['Brow']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/SymBrow/Anim/Brow>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/Anim/Brow
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/LBrow>
+
+Prim Stack:
+    ref.sdf              /BrowRig/LBrow
+    ref.sdf              /BrowRig/SymBrow
+
+Child names:
+     ['BrowInnUDPosBrowInnUDNeg_sculpt', 'Anim']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/LBrow/BrowInnUDPosBrowInnUDNeg_sculpt>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt
+
+Property names:
+     ['amount']
+
+Property stacks:
+/FaceRig/BrowRig/LBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount:
+    ref.sdf              /BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount
+
+Attribute connections:
+/FaceRig/BrowRig/LBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount:
+    /FaceRig/BrowRig/Anim/LBrow.InnUD
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/LBrow/Anim>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/Anim
+
+Prohibited child names:
+     ['Brow']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/RBrow>
+
+Prim Stack:
+    ref.sdf              /BrowRig/RBrow
+    ref.sdf              /BrowRig/SymBrow
+
+Child names:
+     ['BrowInnUDPosBrowInnUDNeg_sculpt', 'Anim']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/RBrow/BrowInnUDPosBrowInnUDNeg_sculpt>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt
+
+Property names:
+     ['amount']
+
+Property stacks:
+/FaceRig/BrowRig/RBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount:
+    ref.sdf              /BrowRig/SymBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount
+
+Attribute connections:
+/FaceRig/BrowRig/RBrow/BrowInnUDPosBrowInnUDNeg_sculpt.amount:
+    /FaceRig/BrowRig/Anim/RBrow.InnUD
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/RBrow/Anim>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/Anim
+
+Prohibited child names:
+     ['Brow']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/BrowRig/Anim>
+
+Prim Stack:
+    ref.sdf              /BrowRig/Anim
+
+Prohibited child names:
+     ['LBrow', 'RBrow']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/Anim>
+
+Prim Stack:
+    root.sdf             /FaceRig/Anim
+
+Child names:
+     ['Face']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/Anim/Face>
+
+Prim Stack:
+    root.sdf             /FaceRig/Anim/Face
+
+Child names:
+     ['Eyes']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/Anim/Face/Eyes>
+
+Prim Stack:
+    root.sdf             /FaceRig/Anim/Face/Eyes
+
+Child names:
+     ['LBrow', 'RBrow']
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/Anim/Face/Eyes/LBrow>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/Anim/Brow
+
+------------------------------------------------------------------------
+Results for composing </FaceRig/Anim/Face/Eyes/RBrow>
+
+Prim Stack:
+    ref.sdf              /BrowRig/SymBrow/Anim/Brow
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/char.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/char.sdf
new file mode 100644
index 0000000000..93fe4f2af6
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/char.sdf
@@ -0,0 +1,35 @@
+#sdf 1.4.32
+(
+    relocates = {
+        </Char/PreRelo>: </Char/Relocated>, 
+    }
+)
+
+def "Char" (
+    references = @model.sdf@</Model>
+) 
+{
+    over "Relocated" 
+    (
+        doc = """Valid opinion at post-relocation path"""
+    )
+    {
+        def "RelocatedChild" 
+        {
+        }
+    }
+
+
+    over "PreRelo" 
+    (
+        doc = """Invalid opinion at pre-relocation path"""
+    )
+    {
+        def "PreReloChild" 
+        {
+        }
+    }
+    
+}
+
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/model.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/model.sdf
new file mode 100644
index 0000000000..14858f9b99
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/model.sdf
@@ -0,0 +1,11 @@
+#sdf 1.4.32
+
+def "Model" 
+{
+    def "PreRelo"
+    {
+        def "ModelChild"
+        {
+        }
+    }
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/root.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/root.sdf
new file mode 100644
index 0000000000..1412561e52
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/ErrorInvalidReferenceToRelocationSource/root.sdf
@@ -0,0 +1,51 @@
+#sdf 1.4.32
+(
+    """
+    These cases exercise invalid reference and relocation arcs to prim
+    paths that are prohibited for being the source of a relocation.
+    """
+
+    relocates = {
+        </ReferencedChar/Relocated>: </Good_ReloOfRelocated>, 
+        </ReferencedChar/PreRelo>: </Bad_ReloOfPreRelo>, 
+    }
+)
+
+def "Good_RefToRelocated" (
+	doc = """Reference to post-relocation prim is allowed"""
+    references = @char.sdf@</Char/Relocated>
+)
+{
+}
+
+def "Good_RefToChildOfRelocated" (
+	doc = """Reference to a child of post-relocation prim is allowed"""
+    references = @char.sdf@</Char/Relocated/ModelChild>
+)
+{
+}
+
+def "Bad_RefToPreRelo" (
+	doc = """Reference to pre-relocation prim is invalid"""
+    references = @char.sdf@</Char/PreRelo>
+)
+{
+}
+
+def "Bad_RefToChildOfPreRelo" (
+	doc = """Reference to a child of pre-relocation prim is invalid"""
+    references = @char.sdf@</Char/PreRelo/ModelChild>
+)
+{
+}
+
+def "ReferencedChar" (
+    doc = """Reference to /Char for testing local relocations of pre 
+        and post relocation children. The relocates in this layer 
+        try to relocate the reference's relocated child, 'Relocated',
+        and its pre-relocation child 'PreRelo'. The former succeeds
+        while the latter emits a composition error."""
+    references = @char.sdf@</Char>
+)
+{
+}
\ No newline at end of file
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/baseline/compositionErrors_ErrorInvalidReferenceToRelocationSource.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/baseline/compositionErrors_ErrorInvalidReferenceToRelocationSource.txt
new file mode 100644
index 0000000000..976558d5ac
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/baseline/compositionErrors_ErrorInvalidReferenceToRelocationSource.txt
@@ -0,0 +1,39 @@
+------------------------------------------------------------------------
+Errors while composing </Bad_ReloOfPreRelo>
+
+@ErrorInvalidReferenceToRelocationSource/root.sdf@</Bad_ReloOfPreRelo>
+CANNOT be relocated from:
+@ErrorInvalidReferenceToRelocationSource/root.sdf@</ReferencedChar/PreRelo>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @ErrorInvalidReferenceToRelocationSource/char.sdf@</Char/PreRelo>.
+
+------------------------------------------------------------------------
+Errors while composing </Good_ReloOfRelocated>
+
+The layer @ErrorInvalidReferenceToRelocationSource/char.sdf@ has an invalid opinion at the relocation source path </Char/PreRelo>, which will be ignored.
+
+------------------------------------------------------------------------
+Errors while composing </Good_RefToRelocated>
+
+The layer @ErrorInvalidReferenceToRelocationSource/char.sdf@ has an invalid opinion at the relocation source path </Char/PreRelo>, which will be ignored.
+
+------------------------------------------------------------------------
+Errors while composing </Good_RefToChildOfRelocated>
+
+The layer @ErrorInvalidReferenceToRelocationSource/char.sdf@ has an invalid opinion at the relocation source path </Char/PreRelo>, which will be ignored.
+
+------------------------------------------------------------------------
+Errors while composing </Bad_RefToPreRelo>
+
+@ErrorInvalidReferenceToRelocationSource/root.sdf@</Bad_RefToPreRelo>
+CANNOT reference:
+@ErrorInvalidReferenceToRelocationSource/char.sdf@</Char/PreRelo>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @ErrorInvalidReferenceToRelocationSource/char.sdf@</Char/PreRelo>.
+
+------------------------------------------------------------------------
+Errors while composing </Bad_RefToChildOfPreRelo>
+
+@ErrorInvalidReferenceToRelocationSource/root.sdf@</Bad_RefToChildOfPreRelo>
+CANNOT reference:
+@ErrorInvalidReferenceToRelocationSource/char.sdf@</Char/PreRelo/ModelChild>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @ErrorInvalidReferenceToRelocationSource/char.sdf@</Char/PreRelo>.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/baseline/compositionResults_ErrorInvalidReferenceToRelocationSource.txt b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/baseline/compositionResults_ErrorInvalidReferenceToRelocationSource.txt
new file mode 100644
index 0000000000..5c3beee105
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_ErrorInvalidReferenceToRelocationSource.testenv/baseline/compositionResults_ErrorInvalidReferenceToRelocationSource.txt
@@ -0,0 +1,86 @@
+Loading @ErrorInvalidReferenceToRelocationSource/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </Bad_ReloOfPreRelo>
+
+Prim Stack:
+
+------------------------------------------------------------------------
+Results for composing </Good_ReloOfRelocated>
+
+Prim Stack:
+    char.sdf             /Char/Relocated
+    model.sdf            /Model/PreRelo
+
+Child names:
+     ['ModelChild', 'RelocatedChild']
+
+------------------------------------------------------------------------
+Results for composing </Good_ReloOfRelocated/ModelChild>
+
+Prim Stack:
+    model.sdf            /Model/PreRelo/ModelChild
+
+------------------------------------------------------------------------
+Results for composing </Good_ReloOfRelocated/RelocatedChild>
+
+Prim Stack:
+    char.sdf             /Char/Relocated/RelocatedChild
+
+------------------------------------------------------------------------
+Results for composing </Good_RefToRelocated>
+
+Prim Stack:
+    root.sdf             /Good_RefToRelocated
+    char.sdf             /Char/Relocated
+    model.sdf            /Model/PreRelo
+
+Child names:
+     ['ModelChild', 'RelocatedChild']
+
+------------------------------------------------------------------------
+Results for composing </Good_RefToRelocated/ModelChild>
+
+Prim Stack:
+    model.sdf            /Model/PreRelo/ModelChild
+
+------------------------------------------------------------------------
+Results for composing </Good_RefToRelocated/RelocatedChild>
+
+Prim Stack:
+    char.sdf             /Char/Relocated/RelocatedChild
+
+------------------------------------------------------------------------
+Results for composing </Good_RefToChildOfRelocated>
+
+Prim Stack:
+    root.sdf             /Good_RefToChildOfRelocated
+    model.sdf            /Model/PreRelo/ModelChild
+
+------------------------------------------------------------------------
+Results for composing </Bad_RefToPreRelo>
+
+Prim Stack:
+    root.sdf             /Bad_RefToPreRelo
+
+------------------------------------------------------------------------
+Results for composing </Bad_RefToChildOfPreRelo>
+
+Prim Stack:
+    root.sdf             /Bad_RefToChildOfPreRelo
+
+------------------------------------------------------------------------
+Results for composing </ReferencedChar>
+
+Prim Stack:
+    root.sdf             /ReferencedChar
+    char.sdf             /Char
+    model.sdf            /Model
+
+Prohibited child names:
+     ['PreRelo', 'Relocated']
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_PayloadsAndAncestralArcs3.testenv/baseline/compositionResults_PayloadsAndAncestralArcs3_refpayloadsonly.txt b/pxr/usd/pcp/testenv/testPcpMuseum_PayloadsAndAncestralArcs3.testenv/baseline/compositionResults_PayloadsAndAncestralArcs3_refpayloadsonly.txt
index f63a114ea0..fc7ca72d08 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_PayloadsAndAncestralArcs3.testenv/baseline/compositionResults_PayloadsAndAncestralArcs3_refpayloadsonly.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_PayloadsAndAncestralArcs3.testenv/baseline/compositionResults_PayloadsAndAncestralArcs3_refpayloadsonly.txt
@@ -60,6 +60,11 @@ Prim Stack:
 Child names:
      ['Anim']
 
+------------------------------------------------------------------------
+Results for composing </PayloadedModel/Test/Anim>
+
+Prim Stack:
+
 ------------------------------------------------------------------------
 Results for composing </InternalReferencePayloadedModel>
 
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_RelocatePrimsWithSameName.testenv/baseline/compositionErrors_RelocatePrimsWithSameName.txt b/pxr/usd/pcp/testenv/testPcpMuseum_RelocatePrimsWithSameName.testenv/baseline/compositionErrors_RelocatePrimsWithSameName.txt
new file mode 100644
index 0000000000..380839be7e
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_RelocatePrimsWithSameName.testenv/baseline/compositionErrors_RelocatePrimsWithSameName.txt
@@ -0,0 +1,8 @@
+------------------------------------------------------------------------
+Errors while composing </ChainedReferences/Child_1>
+
+@RelocatePrimsWithSameName/root.sdf@</ChainedReferences/Child_1>
+CANNOT be relocated from:
+@RelocatePrimsWithSameName/root.sdf@</ChainedReferences/Child>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @RelocatePrimsWithSameName/root.sdf@</ChainedRef_2/Child>.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_RelocatePrimsWithSameName.testenv/baseline/compositionResults_RelocatePrimsWithSameName.txt b/pxr/usd/pcp/testenv/testPcpMuseum_RelocatePrimsWithSameName.testenv/baseline/compositionResults_RelocatePrimsWithSameName.txt
index 567f761635..82f2c51525 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_RelocatePrimsWithSameName.testenv/baseline/compositionResults_RelocatePrimsWithSameName.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_RelocatePrimsWithSameName.testenv/baseline/compositionResults_RelocatePrimsWithSameName.txt
@@ -109,7 +109,6 @@ Prim Stack:
 Results for composing </ChainedReferences/Child_1>
 
 Prim Stack:
-    root.sdf             /ChainedRef_1/Child
 
 ------------------------------------------------------------------------
 Results for composing </ChainedRef_1>
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/RelocateToNone/model.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/RelocateToNone/model.sdf
new file mode 100644
index 0000000000..5e65f29d68
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/RelocateToNone/model.sdf
@@ -0,0 +1,36 @@
+#sdf 1.4.32
+
+def "Model" 
+{
+    def "ToBeDeleted"
+    {
+        def "Child"
+        {
+        }
+    }
+
+    def "ToBeRelocated"
+    {
+        def "Child"
+        {
+        }
+
+        def "ToBeDeletedChild"
+        {
+        }
+    }
+
+    rel relationship1 = </Model/ToBeDeleted/Child> (
+        doc = """This relationship target will be invalid in root.sdf
+            when ToBeDeleted is deleted via relocation"""
+    )
+    rel relationship2 = </Model/ToBeRelocated/Child> (
+        doc = """This relationship target will be valid and remapped in
+            root.sdf when ToBeRelocated is relocated to Relocated"""
+    )
+    rel relationship3 = </Model/ToBeRelocated/ToBeDeletedChild> (
+        doc = """This relationship target will be invalid in root.sdf
+            when its mapped path Relocated/ToBeDeletedChild is deleted
+            via relocation"""
+    )
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/RelocateToNone/root.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/RelocateToNone/root.sdf
new file mode 100644
index 0000000000..f07ab7c11c
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/RelocateToNone/root.sdf
@@ -0,0 +1,78 @@
+#sdf 1.4.32
+(
+    """
+    These cases exercise deleting prims via relocation.
+    """
+
+    relocates = {
+        </Char/ToBeDeleted>: <>, 
+        </Char/ToBeRelocated>: </Char/Relocated>, 
+        </Char/Relocated/ToBeDeletedChild>: <>, 
+    }
+)
+
+def "Char" (
+    references = @model.sdf@</Model>
+) 
+{
+    over "ToBeDeleted" 
+    (
+        doc = """Invalid opinion at deleted via relocation path"""
+    )
+    {
+    }
+
+    over "Relocated" (
+        doc = """Valid opinion at relocated path"""
+    )
+    {
+        over "Child" (
+            doc = """Valid opinion at child of relocated path"""
+        )
+        {
+        }
+
+        over "ToBeDeletedChild" 
+        (
+            doc = """Invalid opinion at deleted via relocation path"""
+        )
+        {
+        }
+    }
+}
+
+def "Good_SubrootRefToRelocated" (
+    doc = """Reference to post-relocation prim is valid"""
+    references = </Char/Relocated>
+)
+{
+}
+
+def "Good_SubrootRefToRelocatedChild" (
+    doc = """Reference to post-relocation prim child is valid"""
+    references = </Char/Relocated/Child>
+)
+{
+}
+
+def "Bad_SubrootRefToDeleted" (
+    doc = """Reference to deleted via relocation prim is invalid"""
+    references = </Char/ToBeDeleted>
+)
+{
+}
+
+def "Bad_SubrootRefToPreRelocated" (
+    doc = """Reference to pre-relocation prim is invalid"""
+    references = </Char/ToBeRelocated>
+)
+{
+}
+
+def "Bad_SubrootRefToDeletedRelocatedChild" (
+    doc = """Reference to post-relocation prim child that has been
+        deleted via relocation prim is invalid"""
+    references = </Char/Relocated/ToBeDeletedChild>
+)
+{
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionErrors_RelocateToNone.txt b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionErrors_RelocateToNone.txt
new file mode 100644
index 0000000000..edab361d9e
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionErrors_RelocateToNone.txt
@@ -0,0 +1,30 @@
+------------------------------------------------------------------------
+Errors while composing </Char>
+
+The relationship target </Model/ToBeDeleted/Child> from </Model.relationship1> in layer @RelocateToNone/model.sdf@ is invalid.  This may be because the path is the pre-relocated source path of a relocated prim.  Ignoring.
+The relationship target </Model/ToBeRelocated/ToBeDeletedChild> from </Model.relationship3> in layer @RelocateToNone/model.sdf@ is invalid.  This may be because the path is the pre-relocated source path of a relocated prim.  Ignoring.
+
+------------------------------------------------------------------------
+Errors while composing </Bad_SubrootRefToDeleted>
+
+@RelocateToNone/root.sdf@</Bad_SubrootRefToDeleted>
+CANNOT reference:
+@RelocateToNone/root.sdf@</Char/ToBeDeleted>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @RelocateToNone/root.sdf@</Char/ToBeDeleted>.
+
+------------------------------------------------------------------------
+Errors while composing </Bad_SubrootRefToPreRelocated>
+
+@RelocateToNone/root.sdf@</Bad_SubrootRefToPreRelocated>
+CANNOT reference:
+@RelocateToNone/root.sdf@</Char/ToBeRelocated>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @RelocateToNone/root.sdf@</Char/ToBeRelocated>.
+
+------------------------------------------------------------------------
+Errors while composing </Bad_SubrootRefToDeletedRelocatedChild>
+
+@RelocateToNone/root.sdf@</Bad_SubrootRefToDeletedRelocatedChild>
+CANNOT reference:
+@RelocateToNone/root.sdf@</Char/Relocated/ToBeDeletedChild>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @RelocateToNone/root.sdf@</Char/Relocated/ToBeDeletedChild>.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionErrors_RelocateToNone_usd.txt b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionErrors_RelocateToNone_usd.txt
new file mode 100644
index 0000000000..ca8862ebde
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionErrors_RelocateToNone_usd.txt
@@ -0,0 +1,24 @@
+------------------------------------------------------------------------
+Errors while composing </Bad_SubrootRefToDeleted>
+
+@RelocateToNone/root.sdf@</Bad_SubrootRefToDeleted>
+CANNOT reference:
+@RelocateToNone/root.sdf@</Char/ToBeDeleted>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @RelocateToNone/root.sdf@</Char/ToBeDeleted>.
+
+------------------------------------------------------------------------
+Errors while composing </Bad_SubrootRefToPreRelocated>
+
+@RelocateToNone/root.sdf@</Bad_SubrootRefToPreRelocated>
+CANNOT reference:
+@RelocateToNone/root.sdf@</Char/ToBeRelocated>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @RelocateToNone/root.sdf@</Char/ToBeRelocated>.
+
+------------------------------------------------------------------------
+Errors while composing </Bad_SubrootRefToDeletedRelocatedChild>
+
+@RelocateToNone/root.sdf@</Bad_SubrootRefToDeletedRelocatedChild>
+CANNOT reference:
+@RelocateToNone/root.sdf@</Char/Relocated/ToBeDeletedChild>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @RelocateToNone/root.sdf@</Char/Relocated/ToBeDeletedChild>.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionResults_RelocateToNone.txt b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionResults_RelocateToNone.txt
new file mode 100644
index 0000000000..fee6ac31e5
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionResults_RelocateToNone.txt
@@ -0,0 +1,101 @@
+Loading @RelocateToNone/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </Char>
+
+Prim Stack:
+    root.sdf             /Char
+    model.sdf            /Model
+
+Child names:
+     ['Relocated']
+
+Prohibited child names:
+     ['ToBeDeleted', 'ToBeRelocated']
+
+Property names:
+     ['relationship1', 'relationship2', 'relationship3']
+
+Property stacks:
+/Char.relationship1:
+    model.sdf            /Model.relationship1
+/Char.relationship2:
+    model.sdf            /Model.relationship2
+/Char.relationship3:
+    model.sdf            /Model.relationship3
+
+Relationship targets:
+/Char.relationship2:
+    /Char/Relocated/Child
+
+------------------------------------------------------------------------
+Results for composing </Char/Relocated>
+
+Prim Stack:
+    root.sdf             /Char/Relocated
+    model.sdf            /Model/ToBeRelocated
+
+Child names:
+     ['Child']
+
+Prohibited child names:
+     ['ToBeDeletedChild']
+
+------------------------------------------------------------------------
+Results for composing </Char/Relocated/Child>
+
+Prim Stack:
+    root.sdf             /Char/Relocated/Child
+    model.sdf            /Model/ToBeRelocated/Child
+
+------------------------------------------------------------------------
+Results for composing </Good_SubrootRefToRelocated>
+
+Prim Stack:
+    root.sdf             /Good_SubrootRefToRelocated
+    root.sdf             /Char/Relocated
+    model.sdf            /Model/ToBeRelocated
+
+Child names:
+     ['Child']
+
+Prohibited child names:
+     ['ToBeDeletedChild']
+
+------------------------------------------------------------------------
+Results for composing </Good_SubrootRefToRelocated/Child>
+
+Prim Stack:
+    root.sdf             /Char/Relocated/Child
+    model.sdf            /Model/ToBeRelocated/Child
+
+------------------------------------------------------------------------
+Results for composing </Good_SubrootRefToRelocatedChild>
+
+Prim Stack:
+    root.sdf             /Good_SubrootRefToRelocatedChild
+    root.sdf             /Char/Relocated/Child
+    model.sdf            /Model/ToBeRelocated/Child
+
+------------------------------------------------------------------------
+Results for composing </Bad_SubrootRefToDeleted>
+
+Prim Stack:
+    root.sdf             /Bad_SubrootRefToDeleted
+
+------------------------------------------------------------------------
+Results for composing </Bad_SubrootRefToPreRelocated>
+
+Prim Stack:
+    root.sdf             /Bad_SubrootRefToPreRelocated
+
+------------------------------------------------------------------------
+Results for composing </Bad_SubrootRefToDeletedRelocatedChild>
+
+Prim Stack:
+    root.sdf             /Bad_SubrootRefToDeletedRelocatedChild
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionResults_RelocateToNone_usd.txt b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionResults_RelocateToNone_usd.txt
new file mode 100644
index 0000000000..208d9e3237
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_RelocateToNone.testenv/baseline/compositionResults_RelocateToNone_usd.txt
@@ -0,0 +1,105 @@
+Loading @RelocateToNone/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </Char>
+
+Prim Stack:
+    root.sdf             /Char
+    model.sdf            /Model
+
+Child names:
+     ['Relocated']
+
+Prohibited child names:
+     ['ToBeDeleted', 'ToBeRelocated']
+
+Property names:
+     ['relationship1', 'relationship2', 'relationship3']
+
+Property stacks:
+/Char.relationship1:
+    model.sdf            /Model.relationship1
+/Char.relationship2:
+    model.sdf            /Model.relationship2
+/Char.relationship3:
+    model.sdf            /Model.relationship3
+
+Relationship targets:
+/Char.relationship1:
+    /Char/ToBeDeleted/Child
+/Char.relationship2:
+    /Char/Relocated/Child
+/Char.relationship3:
+    /Char/Relocated/ToBeDeletedChild
+
+------------------------------------------------------------------------
+Results for composing </Char/Relocated>
+
+Prim Stack:
+    root.sdf             /Char/Relocated
+    model.sdf            /Model/ToBeRelocated
+
+Child names:
+     ['Child']
+
+Prohibited child names:
+     ['ToBeDeletedChild']
+
+------------------------------------------------------------------------
+Results for composing </Char/Relocated/Child>
+
+Prim Stack:
+    root.sdf             /Char/Relocated/Child
+    model.sdf            /Model/ToBeRelocated/Child
+
+------------------------------------------------------------------------
+Results for composing </Good_SubrootRefToRelocated>
+
+Prim Stack:
+    root.sdf             /Good_SubrootRefToRelocated
+    root.sdf             /Char/Relocated
+    model.sdf            /Model/ToBeRelocated
+
+Child names:
+     ['Child']
+
+Prohibited child names:
+     ['ToBeDeletedChild']
+
+------------------------------------------------------------------------
+Results for composing </Good_SubrootRefToRelocated/Child>
+
+Prim Stack:
+    root.sdf             /Char/Relocated/Child
+    model.sdf            /Model/ToBeRelocated/Child
+
+------------------------------------------------------------------------
+Results for composing </Good_SubrootRefToRelocatedChild>
+
+Prim Stack:
+    root.sdf             /Good_SubrootRefToRelocatedChild
+    root.sdf             /Char/Relocated/Child
+    model.sdf            /Model/ToBeRelocated/Child
+
+------------------------------------------------------------------------
+Results for composing </Bad_SubrootRefToDeleted>
+
+Prim Stack:
+    root.sdf             /Bad_SubrootRefToDeleted
+
+------------------------------------------------------------------------
+Results for composing </Bad_SubrootRefToPreRelocated>
+
+Prim Stack:
+    root.sdf             /Bad_SubrootRefToPreRelocated
+
+------------------------------------------------------------------------
+Results for composing </Bad_SubrootRefToDeletedRelocatedChild>
+
+Prim Stack:
+    root.sdf             /Bad_SubrootRefToDeletedRelocatedChild
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates.txt
index e962dfae0a..97e8bb800f 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionErrors_TrickyInheritsAndRelocates.txt
@@ -24,3 +24,11 @@ Errors while composing </Rig/Anim/RigInstance>
 
 The layer @TrickyInheritsAndRelocates/root.sdf@ has an invalid opinion at the relocation source path </Rig/RigClass>, which will be ignored.
 
+------------------------------------------------------------------------
+Errors while composing </Rig/Anim/BadRigInstance>
+
+@TrickyInheritsAndRelocates/root.sdf@</Rig/Anim/BadRigInstance>
+CANNOT inherit from:
+@TrickyInheritsAndRelocates/root.sdf@</Rig/RigClass>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @TrickyInheritsAndRelocates/root.sdf@</Rig/RigClass>.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionResults_TrickyInheritsAndRelocates.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionResults_TrickyInheritsAndRelocates.txt
index ed02ed8fa1..2159fa5d0f 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionResults_TrickyInheritsAndRelocates.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocates.testenv/baseline/compositionResults_TrickyInheritsAndRelocates.txt
@@ -135,5 +135,4 @@ Results for composing </Rig/Anim/BadRigInstance>
 
 Prim Stack:
     root.sdf             /Rig/Anim/BadRigInstance
-    rig.sdf              /Rig/RigClass
 
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/group.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/group.sdf
new file mode 100644
index 0000000000..33a02cfbeb
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/group.sdf
@@ -0,0 +1,10 @@
+#sdf 1.4.32
+
+def Scope "Group"
+{
+    def "Model" (
+        add references = @./model.sdf@</Model>
+    )
+    {
+    }
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/model.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/model.sdf
new file mode 100644
index 0000000000..1956eac1d8
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/model.sdf
@@ -0,0 +1,20 @@
+#sdf 1.4.32
+
+def Model "Model"
+{
+    class Scope "A"
+    {
+    }
+
+    class Scope "B" (
+        add inherits = </Model/A>
+    )
+    {
+    }
+
+    def Scope "Scope" (
+        add inherits = </Model/B>
+    )
+    {
+    }
+}
\ No newline at end of file
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/rig.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/rig.sdf
new file mode 100644
index 0000000000..155e201dcf
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/rig.sdf
@@ -0,0 +1,8 @@
+#sdf 1.4.32
+
+def Scope "Rig"
+{
+    class Scope "RigClass"
+    {
+    }
+}
\ No newline at end of file
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/root.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/root.sdf
new file mode 100644
index 0000000000..f030f1c0fd
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/TrickyInheritsAndRelocatesToNewRootPrim/root.sdf
@@ -0,0 +1,76 @@
+#sdf 1.4.32
+(
+    """
+    This museum case is a copy of testPcpMuseum_TrickyInheritsAndRelocates
+    changed to have the relocates move the prims to be new root level prims.
+    The composition results are almost identical the composition for
+    testPcpMuseum_TrickyInheritsAndRelocates.
+    """
+    relocates = {
+        </Group/Model>: </Model_Renamed>, 
+        </Rig/RigClass>: </RigClass>
+    }
+)
+
+reorder rootPrims = ["Group", "Model_Renamed", "Rig", "RigClass"]
+
+def Scope "Group" (
+    add references = @./group.sdf@</Group>
+)
+{
+    over "Model"
+    {
+        over "A"
+        {
+            custom string a_src = "bad"
+        }
+
+        over "B"
+        {
+            custom string b_src = "bad"
+        }
+    }
+}
+
+over "Model_Renamed"
+{
+    over "A"
+    {
+        custom string a_target = "good"
+    }
+
+    over "B"
+    {
+        custom string b_target = "good"
+    }
+}
+
+def Scope "Rig" (
+    add references = @./rig.sdf@</Rig>
+)
+{
+    over "RigClass"
+    {
+        custom string r_src = "bad"
+    }
+
+    def Scope "Anim"
+    {
+        def Scope "RigInstance" (
+            add inherits = </RigClass>
+        )
+        {
+        }
+
+        def Scope "BadRigInstance" (
+            add inherits = </Rig/RigClass>
+        )
+        {
+        }
+    }
+}
+
+over "RigClass"
+{
+    custom string r_target = "good"
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/baseline/compositionErrors_TrickyInheritsAndRelocatesToNewRootPrim.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/baseline/compositionErrors_TrickyInheritsAndRelocatesToNewRootPrim.txt
new file mode 100644
index 0000000000..deb73eaee7
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/baseline/compositionErrors_TrickyInheritsAndRelocatesToNewRootPrim.txt
@@ -0,0 +1,34 @@
+------------------------------------------------------------------------
+Errors while composing </Model_Renamed>
+
+The layer @TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@ has an invalid opinion at the relocation source path </Group/Model>, which will be ignored.
+
+------------------------------------------------------------------------
+Errors while composing </Model_Renamed/B>
+
+The layer @TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@ has an invalid opinion at the relocation source path </Group/Model>, which will be ignored.
+
+------------------------------------------------------------------------
+Errors while composing </Model_Renamed/Scope>
+
+The layer @TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@ has an invalid opinion at the relocation source path </Group/Model>, which will be ignored.
+The layer @TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@ has an invalid opinion at the relocation source path </Group/Model>, which will be ignored.
+
+------------------------------------------------------------------------
+Errors while composing </Rig/Anim/RigInstance>
+
+The layer @TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@ has an invalid opinion at the relocation source path </Rig/RigClass>, which will be ignored.
+
+------------------------------------------------------------------------
+Errors while composing </Rig/Anim/BadRigInstance>
+
+@TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@</Rig/Anim/BadRigInstance>
+CANNOT inherit from:
+@TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@</Rig/RigClass>
+which is a prohibited child of its parent because it would require allowing opinions from the source of a relocation at @TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@</Rig/RigClass>.
+
+------------------------------------------------------------------------
+Errors while composing </RigClass>
+
+The layer @TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@ has an invalid opinion at the relocation source path </Rig/RigClass>, which will be ignored.
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/baseline/compositionResults_TrickyInheritsAndRelocatesToNewRootPrim.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/baseline/compositionResults_TrickyInheritsAndRelocatesToNewRootPrim.txt
new file mode 100644
index 0000000000..82d77dbcf3
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyInheritsAndRelocatesToNewRootPrim.testenv/baseline/compositionResults_TrickyInheritsAndRelocatesToNewRootPrim.txt
@@ -0,0 +1,135 @@
+Loading @TrickyInheritsAndRelocatesToNewRootPrim/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </Group>
+
+Prim Stack:
+    root.sdf             /Group
+    group.sdf            /Group
+
+Prohibited child names:
+     ['Model']
+
+------------------------------------------------------------------------
+Results for composing </Model_Renamed>
+
+Prim Stack:
+    root.sdf             /Model_Renamed
+    group.sdf            /Group/Model
+    model.sdf            /Model
+
+Child names:
+     ['A', 'B', 'Scope']
+
+------------------------------------------------------------------------
+Results for composing </Model_Renamed/A>
+
+Prim Stack:
+    root.sdf             /Model_Renamed/A
+    model.sdf            /Model/A
+
+Property names:
+     ['a_target']
+
+Property stacks:
+/Model_Renamed/A.a_target:
+    root.sdf             /Model_Renamed/A.a_target
+
+------------------------------------------------------------------------
+Results for composing </Model_Renamed/B>
+
+Prim Stack:
+    root.sdf             /Model_Renamed/B
+    root.sdf             /Model_Renamed/A
+    model.sdf            /Model/B
+    model.sdf            /Model/A
+
+Property names:
+     ['a_target', 'b_target']
+
+Property stacks:
+/Model_Renamed/B.a_target:
+    root.sdf             /Model_Renamed/A.a_target
+/Model_Renamed/B.b_target:
+    root.sdf             /Model_Renamed/B.b_target
+
+------------------------------------------------------------------------
+Results for composing </Model_Renamed/Scope>
+
+Prim Stack:
+    root.sdf             /Model_Renamed/B
+    root.sdf             /Model_Renamed/A
+    model.sdf            /Model/Scope
+    model.sdf            /Model/B
+    model.sdf            /Model/A
+
+Property names:
+     ['a_target', 'b_target']
+
+Property stacks:
+/Model_Renamed/Scope.a_target:
+    root.sdf             /Model_Renamed/A.a_target
+/Model_Renamed/Scope.b_target:
+    root.sdf             /Model_Renamed/B.b_target
+
+------------------------------------------------------------------------
+Results for composing </Rig>
+
+Prim Stack:
+    root.sdf             /Rig
+    rig.sdf              /Rig
+
+Child names:
+     ['Anim']
+
+Prohibited child names:
+     ['RigClass']
+
+------------------------------------------------------------------------
+Results for composing </Rig/Anim>
+
+Prim Stack:
+    root.sdf             /Rig/Anim
+
+Child names:
+     ['RigInstance', 'BadRigInstance']
+
+------------------------------------------------------------------------
+Results for composing </Rig/Anim/RigInstance>
+
+Prim Stack:
+    root.sdf             /Rig/Anim/RigInstance
+    root.sdf             /RigClass
+    rig.sdf              /Rig/RigClass
+
+Property names:
+     ['r_target']
+
+Property stacks:
+/Rig/Anim/RigInstance.r_target:
+    root.sdf             /RigClass.r_target
+
+------------------------------------------------------------------------
+Results for composing </Rig/Anim/BadRigInstance>
+
+Prim Stack:
+    root.sdf             /Rig/Anim/BadRigInstance
+
+------------------------------------------------------------------------
+Results for composing </RigClass>
+
+Prim Stack:
+    root.sdf             /RigClass
+    rig.sdf              /Rig/RigClass
+
+Property names:
+     ['r_target']
+
+Property stacks:
+/RigClass.r_target:
+    root.sdf             /RigClass.r_target
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant.txt b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant.txt
index e7e4a2d480..1e2d587c79 100644
--- a/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant.txt
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_TrickyRelocationOfPrimFromVariant.testenv/baseline/compositionResults_TrickyRelocationOfPrimFromVariant.txt
@@ -66,3 +66,8 @@ Prim Stack:
 Child names:
      ['Tail']
 
+------------------------------------------------------------------------
+Results for composing </Char2/Anim/Tail>
+
+Prim Stack:
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReference.testenv/VariantSpecializesAndReference/root.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReference.testenv/VariantSpecializesAndReference/root.sdf
new file mode 100644
index 0000000000..34f819ac09
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReference.testenv/VariantSpecializesAndReference/root.sdf
@@ -0,0 +1,65 @@
+#sdf 1.4.32
+(
+    """
+    In this example, the prim /Model sets its 'shadingVariant' variantSet
+    selection to be 'New_Shading_Variant'.
+    The prim spec /New_Shading_Variant/Material_Child has a 'specializes' arc to
+    /New_Shading_Variant/Material.  
+
+    This example demonstrates the expected behavior. When
+    /Model/Material_Child is composed, the prim spec at
+    /New_Shading_Variant/Material is stronger than 
+    /Model_defaultShadingVariant/Material:
+
+    Results for composing </Model/Material_Child>
+
+    Prim Stack:
+        root.sdf             /New_Shading_Variant/Material_Child
+        root.sdf             /New_Shading_Variant/Material
+        root.sdf             /Model_defaultShadingVariant/Material
+    """
+)
+
+over "Model_defaultShadingVariant"
+{
+    def Material "Material"
+    {
+        int myInt = 0 
+    }
+    
+}
+
+def Xform "Model" (
+    variants = {
+        string shadingVariant = "New_Shading_Variant"
+    }
+    add variantSets = "shadingVariant"
+)
+{
+    variantSet "shadingVariant" = {
+        "New_Shading_Variant" (
+            add references = </New_Shading_Variant>
+        ) {
+
+        }
+        "default" {
+
+        }
+    }
+}
+
+over "New_Shading_Variant" (
+    prepend references = </Model_defaultShadingVariant>
+)
+{
+    def Material "Material_Child" (
+        specializes = </New_Shading_Variant/Material>
+    )
+    {
+    }
+
+    over "Material"
+    {
+        int myInt = 1
+    }
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReference.testenv/baseline/compositionResults_VariantSpecializesAndReference.txt b/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReference.testenv/baseline/compositionResults_VariantSpecializesAndReference.txt
new file mode 100644
index 0000000000..b0c54ef9fa
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReference.testenv/baseline/compositionResults_VariantSpecializesAndReference.txt
@@ -0,0 +1,115 @@
+Loading @VariantSpecializesAndReference/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </Model_defaultShadingVariant>
+
+Prim Stack:
+    root.sdf             /Model_defaultShadingVariant
+
+Child names:
+     ['Material']
+
+------------------------------------------------------------------------
+Results for composing </Model_defaultShadingVariant/Material>
+
+Prim Stack:
+    root.sdf             /Model_defaultShadingVariant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/Model_defaultShadingVariant/Material.myInt:
+    root.sdf             /Model_defaultShadingVariant/Material.myInt
+
+------------------------------------------------------------------------
+Results for composing </Model>
+
+Prim Stack:
+    root.sdf             /Model
+    root.sdf             /Model{shadingVariant=New_Shading_Variant}
+    root.sdf             /New_Shading_Variant
+    root.sdf             /Model_defaultShadingVariant
+
+Variant Selections:
+    {shadingVariant = New_Shading_Variant}
+
+Child names:
+     ['Material', 'Material_Child']
+
+------------------------------------------------------------------------
+Results for composing </Model/Material>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant/Material
+    root.sdf             /Model_defaultShadingVariant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/Model/Material.myInt:
+    root.sdf             /New_Shading_Variant/Material.myInt
+    root.sdf             /Model_defaultShadingVariant/Material.myInt
+
+------------------------------------------------------------------------
+Results for composing </Model/Material_Child>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant/Material_Child
+    root.sdf             /New_Shading_Variant/Material
+    root.sdf             /Model_defaultShadingVariant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/Model/Material_Child.myInt:
+    root.sdf             /New_Shading_Variant/Material.myInt
+    root.sdf             /Model_defaultShadingVariant/Material.myInt
+
+------------------------------------------------------------------------
+Results for composing </New_Shading_Variant>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant
+    root.sdf             /Model_defaultShadingVariant
+
+Child names:
+     ['Material', 'Material_Child']
+
+------------------------------------------------------------------------
+Results for composing </New_Shading_Variant/Material>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant/Material
+    root.sdf             /Model_defaultShadingVariant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/New_Shading_Variant/Material.myInt:
+    root.sdf             /New_Shading_Variant/Material.myInt
+    root.sdf             /Model_defaultShadingVariant/Material.myInt
+
+------------------------------------------------------------------------
+Results for composing </New_Shading_Variant/Material_Child>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant/Material_Child
+    root.sdf             /New_Shading_Variant/Material
+    root.sdf             /Model_defaultShadingVariant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/New_Shading_Variant/Material_Child.myInt:
+    root.sdf             /New_Shading_Variant/Material.myInt
+    root.sdf             /Model_defaultShadingVariant/Material.myInt
+
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior.testenv/VariantSpecializesAndReferenceSurprisingBehavior/root.sdf b/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior.testenv/VariantSpecializesAndReferenceSurprisingBehavior/root.sdf
new file mode 100644
index 0000000000..f194d4ffc6
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior.testenv/VariantSpecializesAndReferenceSurprisingBehavior/root.sdf
@@ -0,0 +1,63 @@
+#sdf 1.4.32
+(
+    """
+    In this example, the prim /Model sets its 'shadingVariant' variantSet
+    selection to be 'New_Shading_Variant'.
+    The prim spec /New_Shading_Variant/Material_Child has a 'specializes' arc to
+    /New_Shading_Variant/Material.  
+
+    The surprising behavior is that when /Model/Material_Child is composed,
+    the prim spec at /Model_defaultShadingVariant/Material is stronger than 
+    /New_Shading_Variant/Material:
+
+    Results for composing </Model/Material_Child>
+
+    Prim Stack:
+        root.sdf             /New_Shading_Variant/Material_Child
+        root.sdf             /Model_defaultShadingVariant/Material
+        root.sdf             /New_Shading_Variant/Material
+    """
+)
+
+over "Model_defaultShadingVariant"
+{
+    def Material "Material"
+    {
+        int myInt = 0 
+    }
+    
+}
+
+def Xform "Model" (
+    prepend references = </Model_defaultShadingVariant>
+    variants = {
+        string shadingVariant = "New_Shading_Variant"
+    }
+    add variantSets = "shadingVariant"
+)
+{
+    variantSet "shadingVariant" = {
+        "New_Shading_Variant" (
+            add references = </New_Shading_Variant>
+        ) {
+
+        }
+        "default" {
+
+        }
+    }
+}
+
+over "New_Shading_Variant"
+{
+    def Material "Material_Child" (
+        specializes = </New_Shading_Variant/Material>
+    )
+    {
+    }
+
+    over "Material"
+    {
+        int myInt = 1
+    }
+}
diff --git a/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior.testenv/baseline/compositionResults_VariantSpecializesAndReferenceSurprisingBehavior.txt b/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior.testenv/baseline/compositionResults_VariantSpecializesAndReferenceSurprisingBehavior.txt
new file mode 100644
index 0000000000..08831fdd8c
--- /dev/null
+++ b/pxr/usd/pcp/testenv/testPcpMuseum_VariantSpecializesAndReferenceSurprisingBehavior.testenv/baseline/compositionResults_VariantSpecializesAndReferenceSurprisingBehavior.txt
@@ -0,0 +1,110 @@
+Loading @VariantSpecializesAndReferenceSurprisingBehavior/root.sdf@
+
+------------------------------------------------------------------------
+Layer Stack:
+     root.sdf
+
+------------------------------------------------------------------------
+Results for composing </Model_defaultShadingVariant>
+
+Prim Stack:
+    root.sdf             /Model_defaultShadingVariant
+
+Child names:
+     ['Material']
+
+------------------------------------------------------------------------
+Results for composing </Model_defaultShadingVariant/Material>
+
+Prim Stack:
+    root.sdf             /Model_defaultShadingVariant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/Model_defaultShadingVariant/Material.myInt:
+    root.sdf             /Model_defaultShadingVariant/Material.myInt
+
+------------------------------------------------------------------------
+Results for composing </Model>
+
+Prim Stack:
+    root.sdf             /Model
+    root.sdf             /Model{shadingVariant=New_Shading_Variant}
+    root.sdf             /New_Shading_Variant
+    root.sdf             /Model_defaultShadingVariant
+
+Variant Selections:
+    {shadingVariant = New_Shading_Variant}
+
+Child names:
+     ['Material', 'Material_Child']
+
+------------------------------------------------------------------------
+Results for composing </Model/Material>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant/Material
+    root.sdf             /Model_defaultShadingVariant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/Model/Material.myInt:
+    root.sdf             /New_Shading_Variant/Material.myInt
+    root.sdf             /Model_defaultShadingVariant/Material.myInt
+
+------------------------------------------------------------------------
+Results for composing </Model/Material_Child>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant/Material_Child
+    root.sdf             /Model_defaultShadingVariant/Material
+    root.sdf             /New_Shading_Variant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/Model/Material_Child.myInt:
+    root.sdf             /Model_defaultShadingVariant/Material.myInt
+    root.sdf             /New_Shading_Variant/Material.myInt
+
+------------------------------------------------------------------------
+Results for composing </New_Shading_Variant>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant
+
+Child names:
+     ['Material_Child', 'Material']
+
+------------------------------------------------------------------------
+Results for composing </New_Shading_Variant/Material_Child>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant/Material_Child
+    root.sdf             /New_Shading_Variant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/New_Shading_Variant/Material_Child.myInt:
+    root.sdf             /New_Shading_Variant/Material.myInt
+
+------------------------------------------------------------------------
+Results for composing </New_Shading_Variant/Material>
+
+Prim Stack:
+    root.sdf             /New_Shading_Variant/Material
+
+Property names:
+     ['myInt']
+
+Property stacks:
+/New_Shading_Variant/Material.myInt:
+    root.sdf             /New_Shading_Variant/Material.myInt
+
diff --git a/pxr/usd/pcp/testenv/testPcpOwner.py b/pxr/usd/pcp/testenv/testPcpOwner.py
index 06894fada3..f07c898039 100644
--- a/pxr/usd/pcp/testenv/testPcpOwner.py
+++ b/pxr/usd/pcp/testenv/testPcpOwner.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 from pxr import Tf, Pcp, Sdf
diff --git a/pxr/usd/pcp/testenv/testPcpPathTranslation.py b/pxr/usd/pcp/testenv/testPcpPathTranslation.py
index 05d2d5fbf6..ea09f6698c 100644
--- a/pxr/usd/pcp/testenv/testPcpPathTranslation.py
+++ b/pxr/usd/pcp/testenv/testPcpPathTranslation.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 from pxr import Sdf, Tf, Pcp
diff --git a/pxr/usd/pcp/testenv/testPcpPathTranslation_HardToReach.cpp b/pxr/usd/pcp/testenv/testPcpPathTranslation_HardToReach.cpp
index c92df919b8..7d473f28c5 100644
--- a/pxr/usd/pcp/testenv/testPcpPathTranslation_HardToReach.cpp
+++ b/pxr/usd/pcp/testenv/testPcpPathTranslation_HardToReach.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/testenv/testPcpPrimIndex.py b/pxr/usd/pcp/testenv/testPcpPrimIndex.py
index f32d03798d..3f5aed0afe 100644
--- a/pxr/usd/pcp/testenv/testPcpPrimIndex.py
+++ b/pxr/usd/pcp/testenv/testPcpPrimIndex.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
@@ -965,6 +948,35 @@ def "Root" (
                 ]
             ])
 
+    def test_RecursivePrimIndexComputationLocalErrors(self):
+        """Test to make sure recursive primIndex computation correctly stores 
+        composition errors"""
+        rootLayer = Sdf.Layer.CreateAnonymous()
+        rootLayer.ImportFromString('''
+        #sdf 1.4.32
+
+        def "Main" (
+        )
+        {
+            def "First" (
+                prepend references = </Main/Second>
+            )
+            {
+            }
+
+            def "Second" (
+                prepend references = </Main/First>
+            )
+            {
+            }
+        }
+        '''.strip())
+        pcp = Pcp.Cache(Pcp.LayerStackIdentifier(rootLayer))
+        pi, errs = pcp.ComputePrimIndex('/Main/First')
+        self.assertEqual(len(errs), 1)
+        self.assertEqual(len(errs), len(pi.localErrors))
+        self.assertEqual(str(errs[0]), str(pi.localErrors[0]))
+
     def test_TestInvalidPcpNodeRef(self):
         """Test to ensure that a invalid PcpNodeRef will return false
             when cast to a bool"""
@@ -972,6 +984,39 @@ def test_TestInvalidPcpNodeRef(self):
         nullPcpNodeRef =  Pcp._GetInvalidPcpNode()
         self.assertFalse(bool(nullPcpNodeRef))
 
+    def test_UnresolvedPrimPathError_Variants(self):
+        """Test to ensure unresolved prim path errors are handles correctly
+            when the node path includes a variant selection"""
+        rootLayer = Sdf.Layer.CreateAnonymous()
+        rootLayer.ImportFromString('''
+        #sdf 1.4.32
+
+        def "scene" (
+            prepend variantSets = "MatVars1"
+            variants = {
+                string "MatVars1" = "red"
+            }
+        )
+        {
+            variantSet "MatVars1" = {
+                "red" {
+                    over "Cubes_materials"
+                    {
+                        over "TexTarget" (
+                            prepend references = </scene/Cubes_materials/red>
+                        )
+                        {
+                        }
+                    }
+                }
+            }
+        }
+        '''.strip())
+
+        pcp = Pcp.Cache(Pcp.LayerStackIdentifier(rootLayer))
+        _, errs = pcp.ComputePrimIndex('/scene/Cubes_materials/TexTarget')
+        self.assertEqual(len(errs), 1)
+        self.assertTrue('Unresolved reference prim path' in str(errs[0]))
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug101300.py b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug101300.py
index c599c10731..6a9dcf8232 100644
--- a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug101300.py
+++ b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug101300.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # Regression test for bug 101300. This bug was due to PcpLayerStack not
 # recomputing its relocation tables when a prim that supplies 
diff --git a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug70951.py b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug70951.py
index c6e0cade56..45c70ba9d2 100644
--- a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug70951.py
+++ b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug70951.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # Regression test case for bug 70951. Adding inert prim specs was not
 # properly updating the 'hasSpecs' field on the associated node in the
diff --git a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug82180.py b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug82180.py
index 43cd6d42f2..1ac99e5816 100644
--- a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug82180.py
+++ b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug82180.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # Regression test for bug 82180. The ultimate cause of that bug was
 # PcpLayerStack erroneously blowing its relocations when an insignificant
diff --git a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug90508.py b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug90508.py
index 11bb12b908..9e132002ef 100644
--- a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug90508.py
+++ b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug90508.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # Regression test for bug 90508. This bug was due to PcpCache incorrectly
 # evicting prim indexes for all descendent prims when processing a change
diff --git a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug90706.py b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug90706.py
index 54eb0cd250..32e8a16382 100644
--- a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug90706.py
+++ b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug90706.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # Regression test for bug 90706. Adding a new prim spec
 # within a variant that's being used by a prim index should
diff --git a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug92827.testenv/baseline/compositionResults_bug92827.txt b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug92827.testenv/baseline/compositionResults_bug92827.txt
index 65cbb38804..8e78b8dd9a 100644
--- a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug92827.testenv/baseline/compositionResults_bug92827.txt
+++ b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug92827.testenv/baseline/compositionResults_bug92827.txt
@@ -13,6 +13,11 @@ Prim Stack:
 Child names:
      ['B', 'Class', 'Other']
 
+------------------------------------------------------------------------
+Results for composing </Rig/B>
+
+Prim Stack:
+
 ------------------------------------------------------------------------
 Results for composing </Rig/Class>
 
diff --git a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug92955.py b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug92955.py
index 23772a6d5f..cd2dadfba7 100644
--- a/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug92955.py
+++ b/pxr/usd/pcp/testenv/testPcpRegressionBugs_bug92955.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # Regression test for bug 92955.  Removing a class should not cause
 # unrelated spooky sites to be flushed.
diff --git a/pxr/usd/pcp/testenv/testPcpResolvedPathChange.py b/pxr/usd/pcp/testenv/testPcpResolvedPathChange.py
index 71a987cfd4..5a8a6e5d6a 100644
--- a/pxr/usd/pcp/testenv/testPcpResolvedPathChange.py
+++ b/pxr/usd/pcp/testenv/testPcpResolvedPathChange.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import contextlib
 import os
diff --git a/pxr/usd/pcp/testenv/testPcpStreamingLayerReload.py b/pxr/usd/pcp/testenv/testPcpStreamingLayerReload.py
index fe74bc5b54..c517ddb194 100644
--- a/pxr/usd/pcp/testenv/testPcpStreamingLayerReload.py
+++ b/pxr/usd/pcp/testenv/testPcpStreamingLayerReload.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/pcp/traversalCache.h b/pxr/usd/pcp/traversalCache.h
index db621d6d32..51448c622c 100644
--- a/pxr/usd/pcp/traversalCache.h
+++ b/pxr/usd/pcp/traversalCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_TRAVERSAL_CACHE_H
 #define PXR_USD_PCP_TRAVERSAL_CACHE_H
diff --git a/pxr/usd/pcp/types.cpp b/pxr/usd/pcp/types.cpp
index 479cf36781..2faacbef85 100644
--- a/pxr/usd/pcp/types.cpp
+++ b/pxr/usd/pcp/types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/types.h b/pxr/usd/pcp/types.h
index f2a5db5c24..3cdb0b5ad0 100644
--- a/pxr/usd/pcp/types.h
+++ b/pxr/usd/pcp/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_TYPES_H
 #define PXR_USD_PCP_TYPES_H
diff --git a/pxr/usd/pcp/utils.cpp b/pxr/usd/pcp/utils.cpp
index ceebc39f08..229626abfa 100644
--- a/pxr/usd/pcp/utils.cpp
+++ b/pxr/usd/pcp/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Pcp/Utils.cpp
diff --git a/pxr/usd/pcp/utils.h b/pxr/usd/pcp/utils.h
index 1ca22790e6..4e45144eb0 100644
--- a/pxr/usd/pcp/utils.h
+++ b/pxr/usd/pcp/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PCP_UTILS_H
 #define PXR_USD_PCP_UTILS_H
diff --git a/pxr/usd/pcp/wrapCache.cpp b/pxr/usd/pcp/wrapCache.cpp
index 2fddbf114b..251b44c821 100644
--- a/pxr/usd/pcp/wrapCache.cpp
+++ b/pxr/usd/pcp/wrapCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapDependency.cpp b/pxr/usd/pcp/wrapDependency.cpp
index 631ffe4e10..6b02e620bc 100644
--- a/pxr/usd/pcp/wrapDependency.cpp
+++ b/pxr/usd/pcp/wrapDependency.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapDynamicFileFormatDependencyData.cpp b/pxr/usd/pcp/wrapDynamicFileFormatDependencyData.cpp
index 3c12396685..297ccde3ee 100644
--- a/pxr/usd/pcp/wrapDynamicFileFormatDependencyData.cpp
+++ b/pxr/usd/pcp/wrapDynamicFileFormatDependencyData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapErrors.cpp b/pxr/usd/pcp/wrapErrors.cpp
index 556d8a0bcb..ec7d0a39cb 100644
--- a/pxr/usd/pcp/wrapErrors.cpp
+++ b/pxr/usd/pcp/wrapErrors.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -42,6 +25,11 @@ static TfEnum _GetErrorType(PcpErrorBasePtr const& err)
     return err->errorType;
 }
 
+static PcpSite _GetRootSite(PcpErrorBasePtr const& err)
+{
+    return err->rootSite;
+}
+
 void 
 wrapErrors()
 {    
@@ -57,6 +45,7 @@ wrapErrors()
     class_<PcpErrorBase, boost::noncopyable, PcpErrorBasePtr>
         ("ErrorBase", "", no_init)
         .add_property("errorType", _GetErrorType)
+        .add_property("rootSite", _GetRootSite)
         .def("__str__", &PcpErrorBase::ToString)
         ;
 
@@ -79,6 +68,11 @@ wrapErrors()
         ("ErrorArcPermissionDenied", "", no_init)
         ;
 
+    class_<PcpErrorArcToProhibitedChild, bases<PcpErrorBase>,
+        PcpErrorArcToProhibitedChildPtr>
+        ("ErrorArcToProhibitedChild", "", no_init)
+        ;
+
     class_<PcpErrorCapacityExceeded, bases<PcpErrorBase>,
         PcpErrorCapacityExceededPtr >
         ("ErrorCapacityExceeded", "", no_init)
diff --git a/pxr/usd/pcp/wrapExpressionVariables.cpp b/pxr/usd/pcp/wrapExpressionVariables.cpp
index c1b8d9b8cc..57273ba1cb 100644
--- a/pxr/usd/pcp/wrapExpressionVariables.cpp
+++ b/pxr/usd/pcp/wrapExpressionVariables.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/pcp/expressionVariables.h"
diff --git a/pxr/usd/pcp/wrapExpressionVariablesSource.cpp b/pxr/usd/pcp/wrapExpressionVariablesSource.cpp
index d3a11f64e4..4abe13dcb5 100644
--- a/pxr/usd/pcp/wrapExpressionVariablesSource.cpp
+++ b/pxr/usd/pcp/wrapExpressionVariablesSource.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/pcp/wrapInstanceKey.cpp b/pxr/usd/pcp/wrapInstanceKey.cpp
index a523c05038..d4b03454a5 100644
--- a/pxr/usd/pcp/wrapInstanceKey.cpp
+++ b/pxr/usd/pcp/wrapInstanceKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapLayerRelocatesEditBuilder.cpp b/pxr/usd/pcp/wrapLayerRelocatesEditBuilder.cpp
new file mode 100644
index 0000000000..d710fabbf9
--- /dev/null
+++ b/pxr/usd/pcp/wrapLayerRelocatesEditBuilder.cpp
@@ -0,0 +1,72 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/usd/pcp/layerRelocatesEditBuilder.h"
+#include "pxr/base/tf/pyAnnotatedBoolResult.h"
+#include "pxr/base/tf/pyContainerConversions.h"
+#include "pxr/base/tf/pyResultConversions.h"
+
+#include <boost/python.hpp>
+
+using namespace boost::python;
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+namespace {
+
+struct Pcp_LayerRelocatesEditBuilderRelocateResult :
+    public TfPyAnnotatedBoolResult<std::string>
+{
+    Pcp_LayerRelocatesEditBuilderRelocateResult(bool val, const std::string &msg) :
+        TfPyAnnotatedBoolResult<std::string>(val, std::move(msg)) {}
+};
+
+Pcp_LayerRelocatesEditBuilderRelocateResult
+_Relocate(PcpLayerRelocatesEditBuilder &self, 
+    const SdfPath &source, const SdfPath &target)
+{
+    std::string whyNot;
+    bool result = self.Relocate(source, target, &whyNot);
+    return Pcp_LayerRelocatesEditBuilderRelocateResult(result, whyNot);
+}
+
+Pcp_LayerRelocatesEditBuilderRelocateResult
+_RemoveRelocate(PcpLayerRelocatesEditBuilder &self, 
+    const SdfPath &source)
+{
+    std::string whyNot;
+    bool result = self.RemoveRelocate(source, &whyNot);
+    return Pcp_LayerRelocatesEditBuilderRelocateResult(result, whyNot);
+}
+
+} // anonymous namespace 
+
+void wrapLayerRelocatesEditBuilder()
+{
+    Pcp_LayerRelocatesEditBuilderRelocateResult
+        ::Wrap<Pcp_LayerRelocatesEditBuilderRelocateResult>(
+            "_LayerRelocatesEditBuilderRelocateResult", "whyNot");
+
+    class_<PcpLayerRelocatesEditBuilder, boost::noncopyable>(
+        "LayerRelocatesEditBuilder", no_init)
+        .def(init<const PcpLayerStackPtr &>())
+        .def(init<const PcpLayerStackPtr &, const SdfLayerHandle &>())
+        .def("Relocate", &_Relocate)
+        .def("RemoveRelocate", &_RemoveRelocate)
+        .def("GetEditedRelocatesMap",
+             &PcpLayerRelocatesEditBuilder::GetEditedRelocatesMap,
+             return_value_policy<return_by_value>())
+        .def("GetEdits",
+             &PcpLayerRelocatesEditBuilder::GetEdits,
+             return_value_policy<TfPySequenceToList>())
+        ;
+
+    to_python_converter<PcpLayerRelocatesEditBuilder::LayerRelocatesEdit, 
+        TfPyContainerConversions::to_tuple<
+            PcpLayerRelocatesEditBuilder::LayerRelocatesEdit>>();
+}
diff --git a/pxr/usd/pcp/wrapLayerStack.cpp b/pxr/usd/pcp/wrapLayerStack.cpp
index 0d0c4bf5e5..0224ece825 100644
--- a/pxr/usd/pcp/wrapLayerStack.cpp
+++ b/pxr/usd/pcp/wrapLayerStack.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapLayerStackIdentifier.cpp b/pxr/usd/pcp/wrapLayerStackIdentifier.cpp
index 4e3b2d1091..da309700e0 100644
--- a/pxr/usd/pcp/wrapLayerStackIdentifier.cpp
+++ b/pxr/usd/pcp/wrapLayerStackIdentifier.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapLayerStackIdentifier.cpp
 
diff --git a/pxr/usd/pcp/wrapMapExpression.cpp b/pxr/usd/pcp/wrapMapExpression.cpp
index 00998d1599..e2a9aec953 100644
--- a/pxr/usd/pcp/wrapMapExpression.cpp
+++ b/pxr/usd/pcp/wrapMapExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python.hpp>
 
diff --git a/pxr/usd/pcp/wrapMapFunction.cpp b/pxr/usd/pcp/wrapMapFunction.cpp
index f76326fdd4..397fa57c16 100644
--- a/pxr/usd/pcp/wrapMapFunction.cpp
+++ b/pxr/usd/pcp/wrapMapFunction.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapNode.cpp b/pxr/usd/pcp/wrapNode.cpp
index 4bd448ea50..2a5cfc9ed8 100644
--- a/pxr/usd/pcp/wrapNode.cpp
+++ b/pxr/usd/pcp/wrapNode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapPathTranslation.cpp b/pxr/usd/pcp/wrapPathTranslation.cpp
index ed7d721601..0178e1b225 100644
--- a/pxr/usd/pcp/wrapPathTranslation.cpp
+++ b/pxr/usd/pcp/wrapPathTranslation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapPrimIndex.cpp b/pxr/usd/pcp/wrapPrimIndex.cpp
index 5ae0ea14c2..221d41268f 100644
--- a/pxr/usd/pcp/wrapPrimIndex.cpp
+++ b/pxr/usd/pcp/wrapPrimIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapPropertyIndex.cpp b/pxr/usd/pcp/wrapPropertyIndex.cpp
index 8946cf10a2..4c1112d458 100644
--- a/pxr/usd/pcp/wrapPropertyIndex.cpp
+++ b/pxr/usd/pcp/wrapPropertyIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapSite.cpp b/pxr/usd/pcp/wrapSite.cpp
index 344795527f..e7f43556c6 100644
--- a/pxr/usd/pcp/wrapSite.cpp
+++ b/pxr/usd/pcp/wrapSite.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapTestChangeProcessor.cpp b/pxr/usd/pcp/wrapTestChangeProcessor.cpp
index ebd5572ee9..307d9f8230 100644
--- a/pxr/usd/pcp/wrapTestChangeProcessor.cpp
+++ b/pxr/usd/pcp/wrapTestChangeProcessor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/pcp/wrapTypes.cpp b/pxr/usd/pcp/wrapTypes.cpp
index 1fce4d46f2..b91fd2bd38 100644
--- a/pxr/usd/pcp/wrapTypes.cpp
+++ b/pxr/usd/pcp/wrapTypes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/plugin/sdrOsl/__init__.py b/pxr/usd/plugin/sdrOsl/__init__.py
index 85c7173035..5e0d06a196 100644
--- a/pxr/usd/plugin/sdrOsl/__init__.py
+++ b/pxr/usd/plugin/sdrOsl/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/plugin/sdrOsl/api.h b/pxr/usd/plugin/sdrOsl/api.h
index 46f8dc518b..cd81d0e51a 100644
--- a/pxr/usd/plugin/sdrOsl/api.h
+++ b/pxr/usd/plugin/sdrOsl/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PLUGIN_SDR_OSL_API_H
 #define PXR_USD_PLUGIN_SDR_OSL_API_H
diff --git a/pxr/usd/plugin/sdrOsl/module.cpp b/pxr/usd/plugin/sdrOsl/module.cpp
index db6714e8d3..97b7449584 100644
--- a/pxr/usd/plugin/sdrOsl/module.cpp
+++ b/pxr/usd/plugin/sdrOsl/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/plugin/sdrOsl/moduleDeps.cpp b/pxr/usd/plugin/sdrOsl/moduleDeps.cpp
index 9316a18676..8aa2918554 100644
--- a/pxr/usd/plugin/sdrOsl/moduleDeps.cpp
+++ b/pxr/usd/plugin/sdrOsl/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/plugin/sdrOsl/oslParser.cpp b/pxr/usd/plugin/sdrOsl/oslParser.cpp
index 6f187d62ac..3d765b2b5b 100644
--- a/pxr/usd/plugin/sdrOsl/oslParser.cpp
+++ b/pxr/usd/plugin/sdrOsl/oslParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/gf/vec2f.h"
diff --git a/pxr/usd/plugin/sdrOsl/oslParser.h b/pxr/usd/plugin/sdrOsl/oslParser.h
index 980e53fc68..46734ef6de 100644
--- a/pxr/usd/plugin/sdrOsl/oslParser.h
+++ b/pxr/usd/plugin/sdrOsl/oslParser.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_SDR_OSL_OSL_PARSER_H
diff --git a/pxr/usd/plugin/sdrOsl/pch.h b/pxr/usd/plugin/sdrOsl/pch.h
index f1a725cd6d..d10a719f4b 100644
--- a/pxr/usd/plugin/sdrOsl/pch.h
+++ b/pxr/usd/plugin/sdrOsl/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -55,20 +38,20 @@
 #include <cstring>
 #include <deque>
 #include <functional>
-#include <initializer_list>
 #include <iosfwd>
+#include <iterator>
 #include <limits>
 #include <list>
 #include <locale>
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
+#include <new>
+#include <numeric>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
 #include <tuple>
@@ -80,42 +63,6 @@
 #include <utility>
 #include <vector>
 #include <OSL/oslquery.h>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/dict.hpp>
@@ -127,17 +74,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/plugin/sdrOsl/testenv/testOslParser.py b/pxr/usd/plugin/sdrOsl/testenv/testOslParser.py
index 8010636e31..49a14c3703 100644
--- a/pxr/usd/plugin/sdrOsl/testenv/testOslParser.py
+++ b/pxr/usd/plugin/sdrOsl/testenv/testOslParser.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os
 import unittest
diff --git a/pxr/usd/plugin/sdrOsl/wrapOslParser.cpp b/pxr/usd/plugin/sdrOsl/wrapOslParser.cpp
index f371ea64ea..bc6ef1a287 100644
--- a/pxr/usd/plugin/sdrOsl/wrapOslParser.cpp
+++ b/pxr/usd/plugin/sdrOsl/wrapOslParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/plugin/usdAbc/__init__.py b/pxr/usd/plugin/usdAbc/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/plugin/usdAbc/__init__.py
+++ b/pxr/usd/plugin/usdAbc/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/plugin/usdAbc/alembicData.cpp b/pxr/usd/plugin/usdAbc/alembicData.cpp
index d65eeea839..2bb5551d72 100644
--- a/pxr/usd/plugin/usdAbc/alembicData.cpp
+++ b/pxr/usd/plugin/usdAbc/alembicData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file alembicData.cpp
 
diff --git a/pxr/usd/plugin/usdAbc/alembicData.h b/pxr/usd/plugin/usdAbc/alembicData.h
index 0988bb8c3c..856fa52e4a 100644
--- a/pxr/usd/plugin/usdAbc/alembicData.h
+++ b/pxr/usd/plugin/usdAbc/alembicData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PLUGIN_USD_ABC_ALEMBIC_DATA_H
 #define PXR_USD_PLUGIN_USD_ABC_ALEMBIC_DATA_H
diff --git a/pxr/usd/plugin/usdAbc/alembicFileFormat.cpp b/pxr/usd/plugin/usdAbc/alembicFileFormat.cpp
index 7267a7d41c..8df07270db 100644
--- a/pxr/usd/plugin/usdAbc/alembicFileFormat.cpp
+++ b/pxr/usd/plugin/usdAbc/alembicFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/plugin/usdAbc/alembicFileFormat.h"
diff --git a/pxr/usd/plugin/usdAbc/alembicFileFormat.h b/pxr/usd/plugin/usdAbc/alembicFileFormat.h
index f62cbb143d..e8257a07a8 100644
--- a/pxr/usd/plugin/usdAbc/alembicFileFormat.h
+++ b/pxr/usd/plugin/usdAbc/alembicFileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PLUGIN_USD_ABC_ALEMBIC_FILE_FORMAT_H
 #define PXR_USD_PLUGIN_USD_ABC_ALEMBIC_FILE_FORMAT_H
diff --git a/pxr/usd/plugin/usdAbc/alembicReader.cpp b/pxr/usd/plugin/usdAbc/alembicReader.cpp
index a712d4a82b..7f3d28ce3c 100644
--- a/pxr/usd/plugin/usdAbc/alembicReader.cpp
+++ b/pxr/usd/plugin/usdAbc/alembicReader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016-2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file alembicReader.cpp
 
diff --git a/pxr/usd/plugin/usdAbc/alembicReader.h b/pxr/usd/plugin/usdAbc/alembicReader.h
index e1dec840d7..be2e8c9d63 100644
--- a/pxr/usd/plugin/usdAbc/alembicReader.h
+++ b/pxr/usd/plugin/usdAbc/alembicReader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PLUGIN_USD_ABC_ALEMBIC_READER_H
 #define PXR_USD_PLUGIN_USD_ABC_ALEMBIC_READER_H
diff --git a/pxr/usd/plugin/usdAbc/alembicTest.cpp b/pxr/usd/plugin/usdAbc/alembicTest.cpp
index 9aa26a396c..9ec995ccfe 100644
--- a/pxr/usd/plugin/usdAbc/alembicTest.cpp
+++ b/pxr/usd/plugin/usdAbc/alembicTest.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/plugin/usdAbc/alembicTest.h"
diff --git a/pxr/usd/plugin/usdAbc/alembicTest.h b/pxr/usd/plugin/usdAbc/alembicTest.h
index b1ea00258f..82d37c96ee 100644
--- a/pxr/usd/plugin/usdAbc/alembicTest.h
+++ b/pxr/usd/plugin/usdAbc/alembicTest.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PLUGIN_USD_ABC_ALEMBIC_TEST_H
 #define PXR_USD_PLUGIN_USD_ABC_ALEMBIC_TEST_H
diff --git a/pxr/usd/plugin/usdAbc/alembicUtil.cpp b/pxr/usd/plugin/usdAbc/alembicUtil.cpp
index 7265fae3b6..f47b7dcaba 100644
--- a/pxr/usd/plugin/usdAbc/alembicUtil.cpp
+++ b/pxr/usd/plugin/usdAbc/alembicUtil.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file alembicUtil.cpp
 
diff --git a/pxr/usd/plugin/usdAbc/alembicUtil.h b/pxr/usd/plugin/usdAbc/alembicUtil.h
index 6d84c66999..6edd66bcfe 100644
--- a/pxr/usd/plugin/usdAbc/alembicUtil.h
+++ b/pxr/usd/plugin/usdAbc/alembicUtil.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016-2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PLUGIN_USD_ABC_ALEMBIC_UTIL_H
 #define PXR_USD_PLUGIN_USD_ABC_ALEMBIC_UTIL_H
diff --git a/pxr/usd/plugin/usdAbc/alembicWriter.cpp b/pxr/usd/plugin/usdAbc/alembicWriter.cpp
index 8f36cf9d11..a377d7f8f1 100644
--- a/pxr/usd/plugin/usdAbc/alembicWriter.cpp
+++ b/pxr/usd/plugin/usdAbc/alembicWriter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016-2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file alembicWriter.cpp
 
diff --git a/pxr/usd/plugin/usdAbc/alembicWriter.h b/pxr/usd/plugin/usdAbc/alembicWriter.h
index 1fa58c9177..4628e9e34e 100644
--- a/pxr/usd/plugin/usdAbc/alembicWriter.h
+++ b/pxr/usd/plugin/usdAbc/alembicWriter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PLUGIN_USD_ABC_ALEMBIC_WRITER_H
 #define PXR_USD_PLUGIN_USD_ABC_ALEMBIC_WRITER_H
diff --git a/pxr/usd/plugin/usdAbc/api.h b/pxr/usd/plugin/usdAbc/api.h
index 6645bb338b..8c1ef63dfc 100644
--- a/pxr/usd/plugin/usdAbc/api.h
+++ b/pxr/usd/plugin/usdAbc/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_PLUGIN_USD_ABC_API_H
 #define PXR_USD_PLUGIN_USD_ABC_API_H
diff --git a/pxr/usd/plugin/usdAbc/module.cpp b/pxr/usd/plugin/usdAbc/module.cpp
index d9457565e4..b72ca40ef7 100644
--- a/pxr/usd/plugin/usdAbc/module.cpp
+++ b/pxr/usd/plugin/usdAbc/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/plugin/usdAbc/moduleDeps.cpp b/pxr/usd/plugin/usdAbc/moduleDeps.cpp
index 0eee7d1400..75dacb148f 100644
--- a/pxr/usd/plugin/usdAbc/moduleDeps.cpp
+++ b/pxr/usd/plugin/usdAbc/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/plugin/usdAbc/pch.h b/pxr/usd/plugin/usdAbc/pch.h
index f5c7e6fb6c..7dcdb4422f 100644
--- a/pxr/usd/plugin/usdAbc/pch.h
+++ b/pxr/usd/plugin/usdAbc/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,13 +31,13 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -81,6 +64,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
 #include <sstream>
@@ -91,12 +76,14 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
 #include <Alembic/Abc/ArchiveInfo.h>
 #include <Alembic/Abc/IArchive.h>
@@ -108,6 +95,7 @@
 #include <Alembic/Abc/OArchive.h>
 #include <Alembic/Abc/OObject.h>
 #include <Alembic/AbcCoreAbstract/Foundation.h>
+#include <Alembic/AbcCoreFactory/IFactory.h>
 #include <Alembic/AbcCoreOgawa/All.h>
 #include <Alembic/AbcGeom/GeometryScope.h>
 #include <Alembic/AbcGeom/ICamera.h>
@@ -124,54 +112,6 @@
 #include <Alembic/AbcGeom/OXform.h>
 #include <Alembic/AbcGeom/SchemaInfoDeclarations.h>
 #include <Alembic/AbcGeom/Visibility.h>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/assign.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/def.hpp>
 #include <boost/python/dict.hpp>
@@ -187,27 +127,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_left_shift.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -215,7 +137,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcAlembicData.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcAlembicData.py
index 67434ceb2b..3340157c58 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcAlembicData.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcAlembicData.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Sdf, Usd, Vt, Gf, Tf, UsdAbc
 import sys, os, tempfile, unittest
 
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcBugs.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcBugs.py
index d6da9b8c2f..1d32bb5c74 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcBugs.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcBugs.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdAbc
 import unittest
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcCamera.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcCamera.py
index 14c9eea413..3d1fdb6e86 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcCamera.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcCamera.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdGeom, UsdAbc, UsdUtils, Gf
 import unittest
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionBasisCurves.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionBasisCurves.py
index aca69d8e11..d87936e6bb 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionBasisCurves.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionBasisCurves.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionHermiteCurves.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionHermiteCurves.py
index fadd44baff..d209cebbea 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionHermiteCurves.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionHermiteCurves.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionSubdiv.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionSubdiv.py
index f6157043b8..a235844a27 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionSubdiv.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcConversionSubdiv.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdAbc, UsdGeom, Gf
 import unittest
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcFaceset.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcFaceset.py
index 9530ba33e0..383ef7cdfa 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcFaceset.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcFaceset.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdAbc, UsdGeom, Gf
 import unittest
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcIndexedProperties.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcIndexedProperties.py
index 354275dbba..ef81654484 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcIndexedProperties.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcIndexedProperties.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdAbc
 import unittest, os
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcInstancing.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcInstancing.py
index f615a84ab3..5f4be4bedc 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcInstancing.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcInstancing.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdAbc
 import unittest, os
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcIsConstant.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcIsConstant.py
index b6e74eb97f..f284ff8e33 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcIsConstant.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcIsConstant.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Usd, UsdGeom
 import unittest
 
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcP_OldEncoding.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcP_OldEncoding.py
index 56db11c277..fed87f9119 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcP_OldEncoding.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcP_OldEncoding.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Usd, UsdGeom, Gf, Vt
 import unittest
 
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcSDFArguments.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcSDFArguments.py
index a3a53fb68c..794665e252 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcSDFArguments.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcSDFArguments.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Usd, UsdGeom
 import unittest
 
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcUvReadWrite.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcUvReadWrite.py
index c105c5a4c1..7a5c23b4f1 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcUvReadWrite.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcUvReadWrite.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Usd, UsdAbc, UsdGeom
 import tempfile, unittest
 
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcUvReadWrite_OldEncoding.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcUvReadWrite_OldEncoding.py
index e162546acd..4137001b48 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcUvReadWrite_OldEncoding.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcUvReadWrite_OldEncoding.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Usd, UsdAbc, UsdGeom
 import tempfile, unittest
 
diff --git a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcXformPrimCollapsing.py b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcXformPrimCollapsing.py
index 88c8e40cb5..d360de4206 100644
--- a/pxr/usd/plugin/usdAbc/testenv/testUsdAbcXformPrimCollapsing.py
+++ b/pxr/usd/plugin/usdAbc/testenv/testUsdAbcXformPrimCollapsing.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd
 from pxr import UsdGeom
diff --git a/pxr/usd/plugin/usdAbc/wrapAlembicTest.cpp b/pxr/usd/plugin/usdAbc/wrapAlembicTest.cpp
index 8f0328dfbd..31a5862c0b 100644
--- a/pxr/usd/plugin/usdAbc/wrapAlembicTest.cpp
+++ b/pxr/usd/plugin/usdAbc/wrapAlembicTest.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/plugin/usdDraco/__init__.py b/pxr/usd/plugin/usdDraco/__init__.py
index 362927c080..9e37da7762 100644
--- a/pxr/usd/plugin/usdDraco/__init__.py
+++ b/pxr/usd/plugin/usdDraco/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/plugin/usdDraco/attributeDescriptor.cpp b/pxr/usd/plugin/usdDraco/attributeDescriptor.cpp
index f5566ed7bb..b15fbc9b88 100644
--- a/pxr/usd/plugin/usdDraco/attributeDescriptor.cpp
+++ b/pxr/usd/plugin/usdDraco/attributeDescriptor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "attributeDescriptor.h"
diff --git a/pxr/usd/plugin/usdDraco/attributeDescriptor.h b/pxr/usd/plugin/usdDraco/attributeDescriptor.h
index 964888aeeb..35f22ea8f3 100644
--- a/pxr/usd/plugin/usdDraco/attributeDescriptor.h
+++ b/pxr/usd/plugin/usdDraco/attributeDescriptor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_ATTRIBUTE_DESCRIPTOR_H
diff --git a/pxr/usd/plugin/usdDraco/attributeFactory.cpp b/pxr/usd/plugin/usdDraco/attributeFactory.cpp
index 2a3560c07b..c7f47fb25c 100644
--- a/pxr/usd/plugin/usdDraco/attributeFactory.cpp
+++ b/pxr/usd/plugin/usdDraco/attributeFactory.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "attributeFactory.h"
diff --git a/pxr/usd/plugin/usdDraco/attributeFactory.h b/pxr/usd/plugin/usdDraco/attributeFactory.h
index 6de11846e5..d6d57a8847 100644
--- a/pxr/usd/plugin/usdDraco/attributeFactory.h
+++ b/pxr/usd/plugin/usdDraco/attributeFactory.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_ATTRIBUTE_FACTORY_H
diff --git a/pxr/usd/plugin/usdDraco/exportAttribute.h b/pxr/usd/plugin/usdDraco/exportAttribute.h
index 9e3905e628..7a94b378ed 100644
--- a/pxr/usd/plugin/usdDraco/exportAttribute.h
+++ b/pxr/usd/plugin/usdDraco/exportAttribute.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_EXPORT_ATTRIBUTE_H
diff --git a/pxr/usd/plugin/usdDraco/exportTranslator.cpp b/pxr/usd/plugin/usdDraco/exportTranslator.cpp
index b5f5ba72f5..529f4854d2 100644
--- a/pxr/usd/plugin/usdDraco/exportTranslator.cpp
+++ b/pxr/usd/plugin/usdDraco/exportTranslator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "attributeDescriptor.h"
diff --git a/pxr/usd/plugin/usdDraco/exportTranslator.h b/pxr/usd/plugin/usdDraco/exportTranslator.h
index 2957b4ca9a..b002b4603a 100644
--- a/pxr/usd/plugin/usdDraco/exportTranslator.h
+++ b/pxr/usd/plugin/usdDraco/exportTranslator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_EXPORT_TRANSLATOR_H
diff --git a/pxr/usd/plugin/usdDraco/fileFormat.cpp b/pxr/usd/plugin/usdDraco/fileFormat.cpp
index 55899b581a..790420db26 100644
--- a/pxr/usd/plugin/usdDraco/fileFormat.cpp
+++ b/pxr/usd/plugin/usdDraco/fileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "fileFormat.h"
diff --git a/pxr/usd/plugin/usdDraco/fileFormat.h b/pxr/usd/plugin/usdDraco/fileFormat.h
index aa64022c06..c6e419017a 100644
--- a/pxr/usd/plugin/usdDraco/fileFormat.h
+++ b/pxr/usd/plugin/usdDraco/fileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_FILE_FORMAT_H
diff --git a/pxr/usd/plugin/usdDraco/flag.h b/pxr/usd/plugin/usdDraco/flag.h
index 62317570e1..d3f1acc5b8 100644
--- a/pxr/usd/plugin/usdDraco/flag.h
+++ b/pxr/usd/plugin/usdDraco/flag.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_FLAG_H
diff --git a/pxr/usd/plugin/usdDraco/importAttribute.h b/pxr/usd/plugin/usdDraco/importAttribute.h
index fcc55b2eaa..e2e9e653dd 100644
--- a/pxr/usd/plugin/usdDraco/importAttribute.h
+++ b/pxr/usd/plugin/usdDraco/importAttribute.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_IMPORT_ATTRIBUTE_H
diff --git a/pxr/usd/plugin/usdDraco/importTranslator.cpp b/pxr/usd/plugin/usdDraco/importTranslator.cpp
index 81348a4554..504084d2a4 100644
--- a/pxr/usd/plugin/usdDraco/importTranslator.cpp
+++ b/pxr/usd/plugin/usdDraco/importTranslator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "importTranslator.h"
diff --git a/pxr/usd/plugin/usdDraco/importTranslator.h b/pxr/usd/plugin/usdDraco/importTranslator.h
index 7025aa43b3..789d74e3ab 100644
--- a/pxr/usd/plugin/usdDraco/importTranslator.h
+++ b/pxr/usd/plugin/usdDraco/importTranslator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_IMPORT_TRANSLATOR_H
diff --git a/pxr/usd/plugin/usdDraco/module.cpp b/pxr/usd/plugin/usdDraco/module.cpp
index 725c5ed5ca..041401e3f9 100644
--- a/pxr/usd/plugin/usdDraco/module.cpp
+++ b/pxr/usd/plugin/usdDraco/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/plugin/usdDraco/moduleDeps.cpp b/pxr/usd/plugin/usdDraco/moduleDeps.cpp
index 161ab63f8f..088737c878 100644
--- a/pxr/usd/plugin/usdDraco/moduleDeps.cpp
+++ b/pxr/usd/plugin/usdDraco/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/plugin/usdDraco/pch.h b/pxr/usd/plugin/usdDraco/pch.h
index aff99924d4..75f23d1712 100644
--- a/pxr/usd/plugin/usdDraco/pch.h
+++ b/pxr/usd/plugin/usdDraco/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -68,8 +51,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -78,60 +62,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/def.hpp>
 #include <boost/python/dict.hpp>
@@ -147,30 +86,14 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
 #include <draco/compression/decode.h>
 #include <draco/compression/encode.h>
+#include <draco/core/macros.h>
 #include <draco/mesh/mesh.h>
 #include <draco/mesh/mesh_misc_functions.h>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -178,7 +101,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/plugin/usdDraco/wrapDraco.cpp b/pxr/usd/plugin/usdDraco/wrapDraco.cpp
index cfb2788e0d..27766fe6e7 100644
--- a/pxr/usd/plugin/usdDraco/wrapDraco.cpp
+++ b/pxr/usd/plugin/usdDraco/wrapDraco.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "writer.h"
diff --git a/pxr/usd/plugin/usdDraco/writer.cpp b/pxr/usd/plugin/usdDraco/writer.cpp
index b13dfd630f..2bc9d20047 100644
--- a/pxr/usd/plugin/usdDraco/writer.cpp
+++ b/pxr/usd/plugin/usdDraco/writer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "exportTranslator.h"
diff --git a/pxr/usd/plugin/usdDraco/writer.h b/pxr/usd/plugin/usdDraco/writer.h
index 9e9fd924df..2ceabca472 100644
--- a/pxr/usd/plugin/usdDraco/writer.h
+++ b/pxr/usd/plugin/usdDraco/writer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Google LLC
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_PLUGIN_USD_DRACO_WRITER_H
diff --git a/pxr/usd/sdf/CMakeLists.txt b/pxr/usd/sdf/CMakeLists.txt
index c4c76c96d1..b7fc0afc1c 100644
--- a/pxr/usd/sdf/CMakeLists.txt
+++ b/pxr/usd/sdf/CMakeLists.txt
@@ -6,14 +6,17 @@ pxr_library(sdf
         arch
         tf
         gf
+        pegtl
         trace
         vt
         work
         ar
         ${Boost_PYTHON_LIBRARY}
+        ${TBB_tbb_LIBRARY}
 
     INCLUDE_DIRS
         ${Boost_INCLUDE_DIRS}
+        ${TBB_INCLUDE_DIRS}
 
     PUBLIC_CLASSES
         abstractData
@@ -51,6 +54,7 @@ pxr_library(sdf
         pathExpression
         pathExpressionEval
         pathNode
+        pathPattern
         pathTable
         payload
         pool
@@ -94,8 +98,8 @@ pxr_library(sdf
         api.h
         accessorHelpers.h
         declareSpec.h
-        invoke.hpp
         layerHints.h
+        pathPatternParser.h
         predicateExpressionParser.h
         predicateProgram.h
         schemaTypeRegistration.h
@@ -152,6 +156,7 @@ pxr_library(sdf
         wrapOpaqueValue.cpp
         wrapPath.cpp
         wrapPathExpression.cpp
+        wrapPathPattern.cpp
         wrapPayload.cpp
         wrapPredicateExpression.cpp
         wrapPredicateFunctionResult.cpp
diff --git a/pxr/usd/sdf/__init__.py b/pxr/usd/sdf/__init__.py
index a60b822189..9d07ac61f5 100644
--- a/pxr/usd/sdf/__init__.py
+++ b/pxr/usd/sdf/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/sdf/abstractData.cpp b/pxr/usd/sdf/abstractData.cpp
index 816cbf7657..4670ba1d3d 100644
--- a/pxr/usd/sdf/abstractData.cpp
+++ b/pxr/usd/sdf/abstractData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/abstractData.h"
diff --git a/pxr/usd/sdf/abstractData.h b/pxr/usd/sdf/abstractData.h
index 493d4c3ab0..fb5e23e235 100644
--- a/pxr/usd/sdf/abstractData.h
+++ b/pxr/usd/sdf/abstractData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_ABSTRACT_DATA_H
 #define PXR_USD_SDF_ABSTRACT_DATA_H
diff --git a/pxr/usd/sdf/accessorHelpers.h b/pxr/usd/sdf/accessorHelpers.h
index c11b260fe2..8d879996e4 100644
--- a/pxr/usd/sdf/accessorHelpers.h
+++ b/pxr/usd/sdf/accessorHelpers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_ACCESSOR_HELPERS_H
 #define PXR_USD_SDF_ACCESSOR_HELPERS_H
diff --git a/pxr/usd/sdf/allowed.cpp b/pxr/usd/sdf/allowed.cpp
index cc122e8acb..43cab846a7 100644
--- a/pxr/usd/sdf/allowed.cpp
+++ b/pxr/usd/sdf/allowed.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file Allowed.cpp
 
diff --git a/pxr/usd/sdf/allowed.h b/pxr/usd/sdf/allowed.h
index 10977bd7a2..0cc0bcd072 100644
--- a/pxr/usd/sdf/allowed.h
+++ b/pxr/usd/sdf/allowed.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_ALLOWED_H
 #define PXR_USD_SDF_ALLOWED_H
diff --git a/pxr/usd/sdf/api.h b/pxr/usd/sdf/api.h
index 8400c4d857..2bc13e3c05 100644
--- a/pxr/usd/sdf/api.h
+++ b/pxr/usd/sdf/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_API_H
 #define PXR_USD_SDF_API_H
diff --git a/pxr/usd/sdf/assetPath.cpp b/pxr/usd/sdf/assetPath.cpp
index 071e5a9a08..67d71e6cb5 100644
--- a/pxr/usd/sdf/assetPath.cpp
+++ b/pxr/usd/sdf/assetPath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/assetPath.h"
diff --git a/pxr/usd/sdf/assetPath.h b/pxr/usd/sdf/assetPath.h
index 05a00072fa..4477e048e0 100644
--- a/pxr/usd/sdf/assetPath.h
+++ b/pxr/usd/sdf/assetPath.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_ASSET_PATH_H
 #define PXR_USD_SDF_ASSET_PATH_H
diff --git a/pxr/usd/sdf/assetPathResolver.cpp b/pxr/usd/sdf/assetPathResolver.cpp
index 80b9892b9a..9cef5cafac 100644
--- a/pxr/usd/sdf/assetPathResolver.cpp
+++ b/pxr/usd/sdf/assetPathResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Sdf/AssetPathResolver.cpp
diff --git a/pxr/usd/sdf/assetPathResolver.h b/pxr/usd/sdf/assetPathResolver.h
index ff5f4868a9..eee3624c8f 100644
--- a/pxr/usd/sdf/assetPathResolver.h
+++ b/pxr/usd/sdf/assetPathResolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_ASSET_PATH_RESOLVER_H
 #define PXR_USD_SDF_ASSET_PATH_RESOLVER_H
diff --git a/pxr/usd/sdf/attributeSpec.cpp b/pxr/usd/sdf/attributeSpec.cpp
index f54d0b0620..85c27c4310 100644
--- a/pxr/usd/sdf/attributeSpec.cpp
+++ b/pxr/usd/sdf/attributeSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file AttributeSpec.cpp
 
diff --git a/pxr/usd/sdf/attributeSpec.h b/pxr/usd/sdf/attributeSpec.h
index 6f37ba73ff..d34d22cf7d 100644
--- a/pxr/usd/sdf/attributeSpec.h
+++ b/pxr/usd/sdf/attributeSpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_ATTRIBUTE_SPEC_H
 #define PXR_USD_SDF_ATTRIBUTE_SPEC_H
diff --git a/pxr/usd/sdf/changeBlock.cpp b/pxr/usd/sdf/changeBlock.cpp
index 4b52505745..c21a1ddca0 100644
--- a/pxr/usd/sdf/changeBlock.cpp
+++ b/pxr/usd/sdf/changeBlock.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/changeBlock.h b/pxr/usd/sdf/changeBlock.h
index 8d8c272a35..1e314beafd 100644
--- a/pxr/usd/sdf/changeBlock.h
+++ b/pxr/usd/sdf/changeBlock.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CHANGE_BLOCK_H
 #define PXR_USD_SDF_CHANGE_BLOCK_H
diff --git a/pxr/usd/sdf/changeList.cpp b/pxr/usd/sdf/changeList.cpp
index 9167765f78..4138d49f0d 100644
--- a/pxr/usd/sdf/changeList.cpp
+++ b/pxr/usd/sdf/changeList.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/changeList.h b/pxr/usd/sdf/changeList.h
index 99c77088c5..4e07718656 100644
--- a/pxr/usd/sdf/changeList.h
+++ b/pxr/usd/sdf/changeList.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CHANGE_LIST_H
 #define PXR_USD_SDF_CHANGE_LIST_H
diff --git a/pxr/usd/sdf/changeManager.cpp b/pxr/usd/sdf/changeManager.cpp
index 7ea592d04b..8d34e6e181 100644
--- a/pxr/usd/sdf/changeManager.cpp
+++ b/pxr/usd/sdf/changeManager.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -34,7 +17,7 @@
 #include "pxr/base/tf/instantiateSingleton.h"
 #include "pxr/base/tf/stackTrace.h"
 
-#include <tbb/atomic.h>
+#include <atomic>
 
 using std::string;
 using std::vector;
@@ -150,9 +133,9 @@ Sdf_ChangeManager::_ProcessRemoveIfInert(_Data *data)
     TF_VERIFY(data->outermostBlock);
 }
 
-static tbb::atomic<size_t> &
+static std::atomic<size_t> &
 _InitChangeSerialNumber() {
-    static tbb::atomic<size_t> value;
+    static std::atomic<size_t> value;
     value = 1;
     return value;
 }
@@ -191,8 +174,8 @@ Sdf_ChangeManager::_SendNotices(_Data *data)
     }
 
     // Obtain a serial number for this round of change processing.
-    static tbb::atomic<size_t> &changeSerialNumber = _InitChangeSerialNumber();
-    size_t serialNumber = changeSerialNumber.fetch_and_increment();
+    static std::atomic<size_t> &changeSerialNumber = _InitChangeSerialNumber();
+    size_t serialNumber = changeSerialNumber.fetch_add(1);
 
     // Send global notice.
     SdfNotice::LayersDidChange(changes, serialNumber).Send();
diff --git a/pxr/usd/sdf/changeManager.h b/pxr/usd/sdf/changeManager.h
index 42789d7085..ab193e75e6 100644
--- a/pxr/usd/sdf/changeManager.h
+++ b/pxr/usd/sdf/changeManager.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CHANGE_MANAGER_H
 #define PXR_USD_SDF_CHANGE_MANAGER_H
diff --git a/pxr/usd/sdf/children.cpp b/pxr/usd/sdf/children.cpp
index 8a5b3b61f5..55eb4a9747 100644
--- a/pxr/usd/sdf/children.cpp
+++ b/pxr/usd/sdf/children.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/children.h b/pxr/usd/sdf/children.h
index d5434c1d1b..668cb52834 100644
--- a/pxr/usd/sdf/children.h
+++ b/pxr/usd/sdf/children.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CHILDREN_H
 #define PXR_USD_SDF_CHILDREN_H
diff --git a/pxr/usd/sdf/childrenPolicies.cpp b/pxr/usd/sdf/childrenPolicies.cpp
index cba4baa6d7..41c834f16a 100644
--- a/pxr/usd/sdf/childrenPolicies.cpp
+++ b/pxr/usd/sdf/childrenPolicies.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/sdf/childrenPolicies.h"
diff --git a/pxr/usd/sdf/childrenPolicies.h b/pxr/usd/sdf/childrenPolicies.h
index 57fefb710b..b13d852035 100644
--- a/pxr/usd/sdf/childrenPolicies.h
+++ b/pxr/usd/sdf/childrenPolicies.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CHILDREN_POLICIES_H
 #define PXR_USD_SDF_CHILDREN_POLICIES_H
diff --git a/pxr/usd/sdf/childrenProxy.cpp b/pxr/usd/sdf/childrenProxy.cpp
index 57aa6db094..94d2d19de8 100644
--- a/pxr/usd/sdf/childrenProxy.cpp
+++ b/pxr/usd/sdf/childrenProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file ChildrenProxy.cpp
 
diff --git a/pxr/usd/sdf/childrenProxy.h b/pxr/usd/sdf/childrenProxy.h
index 651d1ed082..f51552853d 100644
--- a/pxr/usd/sdf/childrenProxy.h
+++ b/pxr/usd/sdf/childrenProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CHILDREN_PROXY_H
 #define PXR_USD_SDF_CHILDREN_PROXY_H
diff --git a/pxr/usd/sdf/childrenUtils.cpp b/pxr/usd/sdf/childrenUtils.cpp
index 55e00ade84..3024c42557 100644
--- a/pxr/usd/sdf/childrenUtils.cpp
+++ b/pxr/usd/sdf/childrenUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file ChildrenUtils.cpp
 
diff --git a/pxr/usd/sdf/childrenUtils.h b/pxr/usd/sdf/childrenUtils.h
index 60f6f9d46f..1f216ccb15 100644
--- a/pxr/usd/sdf/childrenUtils.h
+++ b/pxr/usd/sdf/childrenUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CHILDREN_UTILS_H
 #define PXR_USD_SDF_CHILDREN_UTILS_H
diff --git a/pxr/usd/sdf/childrenView.cpp b/pxr/usd/sdf/childrenView.cpp
index cf5b87cea6..b954aefbee 100644
--- a/pxr/usd/sdf/childrenView.cpp
+++ b/pxr/usd/sdf/childrenView.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file ChildrenView.cpp
 
diff --git a/pxr/usd/sdf/childrenView.h b/pxr/usd/sdf/childrenView.h
index 0990fee688..85f84626d7 100644
--- a/pxr/usd/sdf/childrenView.h
+++ b/pxr/usd/sdf/childrenView.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CHILDREN_VIEW_H
 #define PXR_USD_SDF_CHILDREN_VIEW_H
diff --git a/pxr/usd/sdf/cleanupEnabler.cpp b/pxr/usd/sdf/cleanupEnabler.cpp
index b849bd9c62..530ea3ecf2 100644
--- a/pxr/usd/sdf/cleanupEnabler.cpp
+++ b/pxr/usd/sdf/cleanupEnabler.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/cleanupEnabler.h"
diff --git a/pxr/usd/sdf/cleanupEnabler.h b/pxr/usd/sdf/cleanupEnabler.h
index e947db77c4..06875b2957 100644
--- a/pxr/usd/sdf/cleanupEnabler.h
+++ b/pxr/usd/sdf/cleanupEnabler.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CLEANUP_ENABLER_H
 #define PXR_USD_SDF_CLEANUP_ENABLER_H
diff --git a/pxr/usd/sdf/cleanupTracker.cpp b/pxr/usd/sdf/cleanupTracker.cpp
index fa5c345c5c..7ec665863c 100644
--- a/pxr/usd/sdf/cleanupTracker.cpp
+++ b/pxr/usd/sdf/cleanupTracker.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/cleanupTracker.h"
diff --git a/pxr/usd/sdf/cleanupTracker.h b/pxr/usd/sdf/cleanupTracker.h
index 185aab28ce..6044cc9f4c 100644
--- a/pxr/usd/sdf/cleanupTracker.h
+++ b/pxr/usd/sdf/cleanupTracker.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CLEANUP_TRACKER_H
 #define PXR_USD_SDF_CLEANUP_TRACKER_H
diff --git a/pxr/usd/sdf/connectionListEditor.cpp b/pxr/usd/sdf/connectionListEditor.cpp
index 7c5337421b..c6195eede7 100644
--- a/pxr/usd/sdf/connectionListEditor.cpp
+++ b/pxr/usd/sdf/connectionListEditor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/connectionListEditor.h"
diff --git a/pxr/usd/sdf/connectionListEditor.h b/pxr/usd/sdf/connectionListEditor.h
index e1b5decf03..404ba0442e 100644
--- a/pxr/usd/sdf/connectionListEditor.h
+++ b/pxr/usd/sdf/connectionListEditor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_CONNECTION_LIST_EDITOR_H
 #define PXR_USD_SDF_CONNECTION_LIST_EDITOR_H
diff --git a/pxr/usd/sdf/copyUtils.cpp b/pxr/usd/sdf/copyUtils.cpp
index 3a01d9b3b7..c82e892a1a 100644
--- a/pxr/usd/sdf/copyUtils.cpp
+++ b/pxr/usd/sdf/copyUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/copyUtils.h"
diff --git a/pxr/usd/sdf/copyUtils.h b/pxr/usd/sdf/copyUtils.h
index d4ae81f6c0..552185d3d3 100644
--- a/pxr/usd/sdf/copyUtils.h
+++ b/pxr/usd/sdf/copyUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_COPY_UTILS_H
 #define PXR_USD_SDF_COPY_UTILS_H
diff --git a/pxr/usd/sdf/data.cpp b/pxr/usd/sdf/data.cpp
index fdd74e2e3a..ba2dda3c80 100644
--- a/pxr/usd/sdf/data.cpp
+++ b/pxr/usd/sdf/data.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/data.h b/pxr/usd/sdf/data.h
index 96ffc7104d..59abefa603 100644
--- a/pxr/usd/sdf/data.h
+++ b/pxr/usd/sdf/data.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_DATA_H
 #define PXR_USD_SDF_DATA_H
diff --git a/pxr/usd/sdf/debugCodes.cpp b/pxr/usd/sdf/debugCodes.cpp
index 8ade0d52a3..036e2f250c 100644
--- a/pxr/usd/sdf/debugCodes.cpp
+++ b/pxr/usd/sdf/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/debugCodes.h"
diff --git a/pxr/usd/sdf/debugCodes.h b/pxr/usd/sdf/debugCodes.h
index 42ec367e99..9e9240bb85 100644
--- a/pxr/usd/sdf/debugCodes.h
+++ b/pxr/usd/sdf/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_DEBUG_CODES_H
 #define PXR_USD_SDF_DEBUG_CODES_H
diff --git a/pxr/usd/sdf/declareHandles.cpp b/pxr/usd/sdf/declareHandles.cpp
index 49db4b8431..fc7008d776 100644
--- a/pxr/usd/sdf/declareHandles.cpp
+++ b/pxr/usd/sdf/declareHandles.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/declareHandles.h b/pxr/usd/sdf/declareHandles.h
index 2d3c86d682..a58d758b72 100644
--- a/pxr/usd/sdf/declareHandles.h
+++ b/pxr/usd/sdf/declareHandles.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_DECLARE_HANDLES_H
 #define PXR_USD_SDF_DECLARE_HANDLES_H
diff --git a/pxr/usd/sdf/declareSpec.h b/pxr/usd/sdf/declareSpec.h
index dedd8133c6..e12442b5fd 100644
--- a/pxr/usd/sdf/declareSpec.h
+++ b/pxr/usd/sdf/declareSpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_DECLARE_SPEC_H
 #define PXR_USD_SDF_DECLARE_SPEC_H
diff --git a/pxr/usd/sdf/fileFormat.cpp b/pxr/usd/sdf/fileFormat.cpp
index d5cbe18f41..9170c58ab0 100644
--- a/pxr/usd/sdf/fileFormat.cpp
+++ b/pxr/usd/sdf/fileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Sdf/fileFormat.cpp
diff --git a/pxr/usd/sdf/fileFormat.h b/pxr/usd/sdf/fileFormat.h
index a35f999d44..cec63c4423 100644
--- a/pxr/usd/sdf/fileFormat.h
+++ b/pxr/usd/sdf/fileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_FILE_FORMAT_H
 #define PXR_USD_SDF_FILE_FORMAT_H
diff --git a/pxr/usd/sdf/fileFormatRegistry.cpp b/pxr/usd/sdf/fileFormatRegistry.cpp
index d78713d4a2..14976e881e 100644
--- a/pxr/usd/sdf/fileFormatRegistry.cpp
+++ b/pxr/usd/sdf/fileFormatRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Sdf/fileFormatRegistry.cpp
diff --git a/pxr/usd/sdf/fileFormatRegistry.h b/pxr/usd/sdf/fileFormatRegistry.h
index e0d422c0ed..d298731866 100644
--- a/pxr/usd/sdf/fileFormatRegistry.h
+++ b/pxr/usd/sdf/fileFormatRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_FILE_FORMAT_REGISTRY_H
 #define PXR_USD_SDF_FILE_FORMAT_REGISTRY_H
diff --git a/pxr/usd/sdf/fileIO.cpp b/pxr/usd/sdf/fileIO.cpp
index 97279b41f2..74ad2dbaf9 100644
--- a/pxr/usd/sdf/fileIO.cpp
+++ b/pxr/usd/sdf/fileIO.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file sdf/fileIO.cpp
diff --git a/pxr/usd/sdf/fileIO.h b/pxr/usd/sdf/fileIO.h
index 1c05f11be7..00fae21ece 100644
--- a/pxr/usd/sdf/fileIO.h
+++ b/pxr/usd/sdf/fileIO.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_FILE_IO_H
 #define PXR_USD_SDF_FILE_IO_H
diff --git a/pxr/usd/sdf/fileIO_Common.cpp b/pxr/usd/sdf/fileIO_Common.cpp
index aef25670ff..aacedddccd 100644
--- a/pxr/usd/sdf/fileIO_Common.cpp
+++ b/pxr/usd/sdf/fileIO_Common.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 //
 // FileIO_Common.cpp
diff --git a/pxr/usd/sdf/fileIO_Common.h b/pxr/usd/sdf/fileIO_Common.h
index 5cb64d07ca..8eb7196636 100644
--- a/pxr/usd/sdf/fileIO_Common.h
+++ b/pxr/usd/sdf/fileIO_Common.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_FILE_IO_COMMON_H
 #define PXR_USD_SDF_FILE_IO_COMMON_H
diff --git a/pxr/usd/sdf/identity.cpp b/pxr/usd/sdf/identity.cpp
index 19b010c194..bfe04b98ed 100644
--- a/pxr/usd/sdf/identity.cpp
+++ b/pxr/usd/sdf/identity.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/identity.h b/pxr/usd/sdf/identity.h
index a956221403..338c2bca94 100644
--- a/pxr/usd/sdf/identity.h
+++ b/pxr/usd/sdf/identity.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_IDENTITY_H
 #define PXR_USD_SDF_IDENTITY_H
diff --git a/pxr/usd/sdf/instantiatePool.h b/pxr/usd/sdf/instantiatePool.h
index 749b2d11ef..c89a33d8cd 100644
--- a/pxr/usd/sdf/instantiatePool.h
+++ b/pxr/usd/sdf/instantiatePool.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /*
  * This header is not meant to be included in a .h file.
diff --git a/pxr/usd/sdf/invoke.hpp b/pxr/usd/sdf/invoke.hpp
deleted file mode 100644
index b39e9ffe52..0000000000
--- a/pxr/usd/sdf/invoke.hpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * This file is part of the "https://github.com/blackmatov/invoke.hpp"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2023, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#pragma once
-
-#include <tuple>
-#include <utility>
-#include <functional>
-#include <type_traits>
-
-#define INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(...) \
-    noexcept(noexcept(__VA_ARGS__)) -> decltype (__VA_ARGS__) { return __VA_ARGS__; }
-
-#include "pxr/pxr.h"
-
-PXR_NAMESPACE_OPEN_SCOPE
-
-//
-// void_t
-//
-
-namespace invoke_hpp
-{
-    namespace impl
-    {
-        template < typename... Args >
-        struct make_void {
-            using type = void;
-        };
-    }
-
-    template < typename... Args >
-    using void_t = typename impl::make_void<Args...>::type;
-}
-
-//
-// integer_sequence
-//
-
-namespace invoke_hpp
-{
-    template < typename T, T... Ints >
-    struct integer_sequence {
-        using value_type = T;
-        static constexpr std::size_t size() noexcept { return sizeof...(Ints); }
-    };
-
-    template < std::size_t... Ints >
-    using index_sequence = integer_sequence<std::size_t, Ints...>;
-
-    namespace impl
-    {
-        template < typename T, std::size_t N, T... Ints >
-        struct make_integer_sequence_impl
-        : make_integer_sequence_impl<T, N - 1, N - 1, Ints...> {};
-
-        template < typename T, T... Ints >
-        struct make_integer_sequence_impl<T, 0, Ints...>
-        : integer_sequence<T, Ints...> {};
-    }
-
-    template < typename T, std::size_t N >
-    using make_integer_sequence = impl::make_integer_sequence_impl<T, N>;
-
-    template < std::size_t N >
-    using make_index_sequence = make_integer_sequence<std::size_t, N>;
-
-    template < typename... Ts >
-    using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-}
-
-//
-// is_reference_wrapper
-//
-
-namespace invoke_hpp
-{
-    namespace impl
-    {
-        template < typename T >
-        struct is_reference_wrapper_impl
-        : std::false_type {};
-
-        template < typename U >
-        struct is_reference_wrapper_impl<std::reference_wrapper<U>>
-        : std::true_type {};
-    }
-
-    template < typename T >
-    struct is_reference_wrapper
-    : impl::is_reference_wrapper_impl<typename std::remove_cv<T>::type> {};
-}
-
-//
-// invoke
-//
-
-namespace invoke_hpp
-{
-    namespace impl
-    {
-        //
-        // invoke_member_object_impl
-        //
-
-        template
-        <
-            typename Base, typename F, typename Derived,
-            typename std::enable_if<std::is_base_of<Base, typename std::decay<Derived>::type>::value, int>::type = 0
-        >
-        constexpr auto invoke_member_object_impl(F Base::* f, Derived&& ref)
-        INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-            std::forward<Derived>(ref).*f)
-
-        template
-        <
-            typename Base, typename F, typename RefWrap,
-            typename std::enable_if<is_reference_wrapper<typename std::decay<RefWrap>::type>::value, int>::type = 0
-        >
-        constexpr auto invoke_member_object_impl(F Base::* f, RefWrap&& ref)
-        INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-            ref.get().*f)
-
-        template
-        <
-            typename Base, typename F, typename Pointer,
-            typename std::enable_if<
-                !std::is_base_of<Base, typename std::decay<Pointer>::type>::value &&
-                !is_reference_wrapper<typename std::decay<Pointer>::type>::value
-            , int>::type = 0
-        >
-        constexpr auto invoke_member_object_impl(F Base::* f, Pointer&& ptr)
-        INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-            (*std::forward<Pointer>(ptr)).*f)
-
-        //
-        // invoke_member_function_impl
-        //
-
-        template
-        <
-            typename Base, typename F, typename Derived, typename... Args,
-            typename std::enable_if<std::is_base_of<Base, typename std::decay<Derived>::type>::value, int>::type = 0
-        >
-        constexpr auto invoke_member_function_impl(F Base::* f, Derived&& ref, Args&&... args)
-        INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-            (std::forward<Derived>(ref).*f)(std::forward<Args>(args)...))
-
-        template
-        <
-            typename Base, typename F, typename RefWrap, typename... Args,
-            typename std::enable_if<is_reference_wrapper<typename std::decay<RefWrap>::type>::value, int>::type = 0
-        >
-        constexpr auto invoke_member_function_impl(F Base::* f, RefWrap&& ref, Args&&... args)
-        INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-            (ref.get().*f)(std::forward<Args>(args)...))
-
-        template
-        <
-            typename Base, typename F, typename Pointer, typename... Args,
-            typename std::enable_if<
-                !std::is_base_of<Base, typename std::decay<Pointer>::type>::value &&
-                !is_reference_wrapper<typename std::decay<Pointer>::type>::value
-            , int>::type = 0
-        >
-        constexpr auto invoke_member_function_impl(F Base::* f, Pointer&& ptr, Args&&... args)
-        INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-            ((*std::forward<Pointer>(ptr)).*f)(std::forward<Args>(args)...))
-    }
-
-    template
-    <
-        typename F, typename... Args,
-        typename std::enable_if<!std::is_member_pointer<typename std::decay<F>::type>::value, int>::type = 0
-    >
-    constexpr auto invoke(F&& f, Args&&... args)
-    INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-        std::forward<F>(f)(std::forward<Args>(args)...))
-
-    template
-    <
-        typename F, typename T,
-        typename std::enable_if<std::is_member_object_pointer<typename std::decay<F>::type>::value, int>::type = 0
-    >
-    constexpr auto invoke(F&& f, T&& t)
-    INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-        impl::invoke_member_object_impl(std::forward<F>(f), std::forward<T>(t)))
-
-    template
-    <
-        typename F, typename... Args,
-        typename std::enable_if<std::is_member_function_pointer<typename std::decay<F>::type>::value, int>::type = 0
-    >
-    constexpr auto invoke(F&& f, Args&&... args)
-    INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-        impl::invoke_member_function_impl(std::forward<F>(f), std::forward<Args>(args)...))
-}
-
-//
-// invoke_result
-//
-
-namespace invoke_hpp
-{
-    namespace impl
-    {
-        struct invoke_result_impl_tag {};
-
-        template < typename Void, typename F, typename... Args >
-        struct invoke_result_impl {};
-
-        template < typename F, typename... Args >
-        struct invoke_result_impl<void_t<invoke_result_impl_tag, decltype(invoke_hpp::invoke(std::declval<F>(), std::declval<Args>()...))>, F, Args...> {
-            using type = decltype(invoke_hpp::invoke(std::declval<F>(), std::declval<Args>()...));
-        };
-    }
-
-    template < typename F, typename... Args >
-    struct invoke_result
-    : impl::invoke_result_impl<void, F, Args...> {};
-
-    template < typename F, typename... Args >
-    using invoke_result_t = typename invoke_result<F, Args...>::type;
-}
-
-//
-// is_invocable
-//
-
-namespace invoke_hpp
-{
-    namespace impl
-    {
-        struct is_invocable_r_impl_tag {};
-
-        template < typename Void, typename R, typename F, typename... Args >
-        struct is_invocable_r_impl
-        : std::false_type {};
-
-        template < typename R, typename F, typename... Args >
-        struct is_invocable_r_impl<void_t<is_invocable_r_impl_tag, invoke_result_t<F, Args...>>, R, F, Args...>
-        : std::conditional<
-            std::is_void<R>::value,
-            std::true_type,
-            std::is_convertible<invoke_result_t<F, Args...>, R>>::type {};
-    }
-
-    template < typename R, typename F, typename... Args >
-    struct is_invocable_r
-    : impl::is_invocable_r_impl<void, R, F, Args...> {};
-
-    template < typename F, typename... Args >
-    using is_invocable = is_invocable_r<void, F, Args...>;
-}
-
-//
-// apply
-//
-
-namespace invoke_hpp
-{
-    namespace impl
-    {
-        template < typename F, typename Tuple, std::size_t... I >
-        constexpr auto apply_impl(F&& f, Tuple&& args, index_sequence<I...>)
-        INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-            invoke_hpp::invoke(
-                std::forward<F>(f),
-                std::get<I>(std::forward<Tuple>(args))...))
-    }
-
-    template < typename F, typename Tuple >
-    constexpr auto apply(F&& f, Tuple&& args)
-    INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN(
-        impl::apply_impl(
-            std::forward<F>(f),
-            std::forward<Tuple>(args),
-            make_index_sequence<std::tuple_size<typename std::decay<Tuple>::type>::value>()))
-}
-
-#undef INVOKE_HPP_NOEXCEPT_DECLTYPE_RETURN
-
-PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/sdf/layer.cpp b/pxr/usd/sdf/layer.cpp
index f938908774..b1a12e583e 100644
--- a/pxr/usd/sdf/layer.cpp
+++ b/pxr/usd/sdf/layer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Sdf/layer.cpp
@@ -1597,6 +1580,21 @@ SdfLayer::GetDefaultPrim() const
     return _GetValue<TfToken>(SdfFieldKeys->DefaultPrim);
 }
 
+SdfPath
+SdfLayer::GetDefaultPrimAsPath() const
+{
+    std::string pathString = 
+        _GetValue<TfToken>(SdfFieldKeys->DefaultPrim).GetString();
+    SdfPath path = SdfPath::IsValidPathString(pathString)
+        ? SdfPath(pathString)
+        : SdfPath();
+    return path.IsPrimPath()
+        ? path.IsAbsolutePath()
+            ? path
+            : path.MakeAbsolutePath(SdfPath::AbsoluteRootPath())
+        : SdfPath();
+}
+
 void
 SdfLayer::ClearDefaultPrim()
 {
@@ -3065,9 +3063,10 @@ SdfLayer::IsEmpty() const
     // XXX: What about documentation/frames?  I don't
     // think these get composed or exposed through composition, so I don't think
     // they matter for the sake of this query.
-    return GetRootPrims().empty()  && 
+    return GetRootPrims().empty() && 
         GetRootPrimOrder().empty() && 
-        GetSubLayerPaths().empty();
+        GetSubLayerPaths().empty() &&
+        GetRelocates().empty();
 }
 
 bool
@@ -3971,7 +3970,12 @@ SdfLayer::_SetData(const SdfAbstractDataPtr &newData,
                 if (!specDefinition->IsRequiredField(*field))
                     _PrimSetField(path, *field, VtValue());
             }
-            _PrimDeleteSpec(*i, _IsInertSubtree(*i));
+
+            // Since we are deleting bottom up, we should only ever be
+            // considering prims which do not have children to determine
+            // inertness
+            _PrimDeleteSpec(*i, _IsInert(*i, true /*ignoreChildren*/, 
+                  true /* requiredFieldOnlyPropertiesAreInert */));
         }
     }
 
diff --git a/pxr/usd/sdf/layer.h b/pxr/usd/sdf/layer.h
index e21bb3f100..1f11f49f39 100644
--- a/pxr/usd/sdf/layer.h
+++ b/pxr/usd/sdf/layer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LAYER_H
 #define PXR_USD_SDF_LAYER_H
@@ -836,18 +819,31 @@ class SdfLayer
     void SetComment(const std::string &comment);
     
     /// Return the defaultPrim metadata for this layer.  This field
-    /// indicates the name of which root prim should be targeted by a reference
-    /// or payload to this layer that doesn't specify a prim path.
+    /// indicates the name or path of which prim should be targeted by a
+    /// reference or payload to this layer that doesn't specify a prim path.
     ///
     /// The default value is the empty token.
     SDF_API
     TfToken GetDefaultPrim() const;
 
-    /// Set the default prim metadata for this layer.  The root prim with this
-    /// name will be targeted by a reference or a payload to this layer that
-    /// doesn't specify a prim path.  Note that this must be a root prim
-    /// <b>name</b> not a path.  E.g. "rootPrim" rather than "/rootPrim".  See
-    /// GetDefaultPrim().
+    /// Return this layer's default prim metadata interpreted as an absolute 
+    /// prim path regardless of whether it was authored as a root prim name or a
+    /// prim path. For example, if the authored default prim value is 
+    /// "rootPrim", return </rootPrim>. If the authored default prim value is 
+    /// "/path/to/non/root/prim", return </path/to/non/root/prim>. If the 
+    /// authored default prim value cannot be interpreted as a prim path, 
+    /// return the empty SdfPath.
+    ///
+    /// The default value is an empty path.
+    SDF_API
+    SdfPath GetDefaultPrimAsPath() const;
+
+    /// Set the default prim metadata for this layer.  The prim at this path
+    /// will be targeted by a reference or a payload to this layer that doesn't 
+    /// specify a prim path.
+    /// Note that this can be a name if it refers to a root prim, or a path to
+    /// any prim in this layer. E.g. "rootPrim", "/path/to/non/root/prim" or
+    /// "/rootPrim".  See GetDefaultPrim().
     SDF_API
     void SetDefaultPrim(const TfToken &name);
 
diff --git a/pxr/usd/sdf/layerHints.h b/pxr/usd/sdf/layerHints.h
index 44554d0b38..d96c8ba662 100644
--- a/pxr/usd/sdf/layerHints.h
+++ b/pxr/usd/sdf/layerHints.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LAYER_HINTS_H
 #define PXR_USD_SDF_LAYER_HINTS_H
diff --git a/pxr/usd/sdf/layerOffset.cpp b/pxr/usd/sdf/layerOffset.cpp
index 8bc5d73980..edad0d581c 100644
--- a/pxr/usd/sdf/layerOffset.cpp
+++ b/pxr/usd/sdf/layerOffset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// LayerOffset.cpp
diff --git a/pxr/usd/sdf/layerOffset.h b/pxr/usd/sdf/layerOffset.h
index c21ad9802b..a789f5ed65 100644
--- a/pxr/usd/sdf/layerOffset.h
+++ b/pxr/usd/sdf/layerOffset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LAYER_OFFSET_H
 #define PXR_USD_SDF_LAYER_OFFSET_H
diff --git a/pxr/usd/sdf/layerRegistry.cpp b/pxr/usd/sdf/layerRegistry.cpp
index dd507ae449..2d6e5c28b5 100644
--- a/pxr/usd/sdf/layerRegistry.cpp
+++ b/pxr/usd/sdf/layerRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Sdf/LayerRegistry.cpp
diff --git a/pxr/usd/sdf/layerRegistry.h b/pxr/usd/sdf/layerRegistry.h
index 4c616bc4e8..fb507875ec 100644
--- a/pxr/usd/sdf/layerRegistry.h
+++ b/pxr/usd/sdf/layerRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LAYER_REGISTRY_H
 #define PXR_USD_SDF_LAYER_REGISTRY_H
diff --git a/pxr/usd/sdf/layerStateDelegate.cpp b/pxr/usd/sdf/layerStateDelegate.cpp
index 48647721d2..8e76da8e74 100644
--- a/pxr/usd/sdf/layerStateDelegate.cpp
+++ b/pxr/usd/sdf/layerStateDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/layerStateDelegate.h b/pxr/usd/sdf/layerStateDelegate.h
index e1d5bf90fb..a5a52b5df5 100644
--- a/pxr/usd/sdf/layerStateDelegate.h
+++ b/pxr/usd/sdf/layerStateDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LAYER_STATE_DELEGATE_H
 #define PXR_USD_SDF_LAYER_STATE_DELEGATE_H
diff --git a/pxr/usd/sdf/layerTree.cpp b/pxr/usd/sdf/layerTree.cpp
index 87e59fd3f2..51874f916b 100644
--- a/pxr/usd/sdf/layerTree.cpp
+++ b/pxr/usd/sdf/layerTree.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file LayerTree.cpp
 
diff --git a/pxr/usd/sdf/layerTree.h b/pxr/usd/sdf/layerTree.h
index 9f127a1208..bb27b2ecbf 100644
--- a/pxr/usd/sdf/layerTree.h
+++ b/pxr/usd/sdf/layerTree.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LAYER_TREE_H
 #define PXR_USD_SDF_LAYER_TREE_H
diff --git a/pxr/usd/sdf/layerUtils.cpp b/pxr/usd/sdf/layerUtils.cpp
index 57f6df4214..828e948e5f 100644
--- a/pxr/usd/sdf/layerUtils.cpp
+++ b/pxr/usd/sdf/layerUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file sdf/layerUtils.cpp
diff --git a/pxr/usd/sdf/layerUtils.h b/pxr/usd/sdf/layerUtils.h
index e0d2fd4e77..17893823c3 100644
--- a/pxr/usd/sdf/layerUtils.h
+++ b/pxr/usd/sdf/layerUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LAYER_UTILS_H
 #define PXR_USD_SDF_LAYER_UTILS_H
diff --git a/pxr/usd/sdf/listEditor.cpp b/pxr/usd/sdf/listEditor.cpp
index be5531b177..9b3d5f9e5c 100644
--- a/pxr/usd/sdf/listEditor.cpp
+++ b/pxr/usd/sdf/listEditor.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/sdf/listEditor.h"
diff --git a/pxr/usd/sdf/listEditor.h b/pxr/usd/sdf/listEditor.h
index f7a636e625..4127769f36 100644
--- a/pxr/usd/sdf/listEditor.h
+++ b/pxr/usd/sdf/listEditor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LIST_EDITOR_H
 #define PXR_USD_SDF_LIST_EDITOR_H
diff --git a/pxr/usd/sdf/listEditorProxy.cpp b/pxr/usd/sdf/listEditorProxy.cpp
index 8ebda381c0..e18be7d04c 100644
--- a/pxr/usd/sdf/listEditorProxy.cpp
+++ b/pxr/usd/sdf/listEditorProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file ListEditorProxy.cpp
 
diff --git a/pxr/usd/sdf/listEditorProxy.h b/pxr/usd/sdf/listEditorProxy.h
index 5f0f223349..20931281bd 100644
--- a/pxr/usd/sdf/listEditorProxy.h
+++ b/pxr/usd/sdf/listEditorProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LIST_EDITOR_PROXY_H
 #define PXR_USD_SDF_LIST_EDITOR_PROXY_H
diff --git a/pxr/usd/sdf/listOp.cpp b/pxr/usd/sdf/listOp.cpp
index 9a2d4b9472..8a31c5adb4 100644
--- a/pxr/usd/sdf/listOp.cpp
+++ b/pxr/usd/sdf/listOp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/listOp.h b/pxr/usd/sdf/listOp.h
index 01824396d0..19b24e087c 100644
--- a/pxr/usd/sdf/listOp.h
+++ b/pxr/usd/sdf/listOp.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LIST_OP_H
 #define PXR_USD_SDF_LIST_OP_H
diff --git a/pxr/usd/sdf/listOpListEditor.cpp b/pxr/usd/sdf/listOpListEditor.cpp
index 405b1f76e0..aa4401de0b 100644
--- a/pxr/usd/sdf/listOpListEditor.cpp
+++ b/pxr/usd/sdf/listOpListEditor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/sdf/listOpListEditor.h"
 
diff --git a/pxr/usd/sdf/listOpListEditor.h b/pxr/usd/sdf/listOpListEditor.h
index 218d675d18..3e1a3740b6 100644
--- a/pxr/usd/sdf/listOpListEditor.h
+++ b/pxr/usd/sdf/listOpListEditor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LIST_OP_LIST_EDITOR_H
 #define PXR_USD_SDF_LIST_OP_LIST_EDITOR_H
diff --git a/pxr/usd/sdf/listProxy.cpp b/pxr/usd/sdf/listProxy.cpp
index 2aa4febd0c..88b2ae10f0 100644
--- a/pxr/usd/sdf/listProxy.cpp
+++ b/pxr/usd/sdf/listProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file ListProxy.cpp
 
diff --git a/pxr/usd/sdf/listProxy.h b/pxr/usd/sdf/listProxy.h
index 913617bbe8..895aa9ee63 100644
--- a/pxr/usd/sdf/listProxy.h
+++ b/pxr/usd/sdf/listProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_LIST_PROXY_H
 #define PXR_USD_SDF_LIST_PROXY_H
@@ -58,6 +41,10 @@ class SdfListProxy {
     typedef typename TypePolicy::value_type value_type;
     typedef std::vector<value_type> value_vector_type;
 
+    /// Returned from \ref Find when a value could not be located in the
+    /// list of operations. 
+    static const size_t invalidIndex = -1;
+
 private:
     // Proxies an item in a list editor list.
     class _ItemProxy {
@@ -600,9 +587,11 @@ class SdfListProxy {
         return (_Validate() ? _listEditor->Count(_op, value) : 0);
     }
 
+    /// Returns the index of \p value in the list of operations.  If \p value
+    /// is not found, then \ref invalidIndex is returned instead.
     size_t Find(const value_type& value) const
     {
-        return (_Validate() ? _listEditor->Find(_op, value) : size_t(-1));
+        return (_Validate() ? _listEditor->Find(_op, value) : invalidIndex);
     }
 
     void Insert(int index, const value_type& value)
@@ -616,7 +605,7 @@ class SdfListProxy {
     void Remove(const value_type& value)
     {
         size_t index = Find(value);
-        if (index != size_t(-1)) {
+        if (index != invalidIndex) {
             Erase(index);
         }
         else {
diff --git a/pxr/usd/sdf/mapEditProxy.cpp b/pxr/usd/sdf/mapEditProxy.cpp
index 5011473ebb..a63abca734 100644
--- a/pxr/usd/sdf/mapEditProxy.cpp
+++ b/pxr/usd/sdf/mapEditProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file MapEditProxy.cpp
 
diff --git a/pxr/usd/sdf/mapEditProxy.h b/pxr/usd/sdf/mapEditProxy.h
index fcd5f7d3eb..60344c359f 100644
--- a/pxr/usd/sdf/mapEditProxy.h
+++ b/pxr/usd/sdf/mapEditProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_MAP_EDIT_PROXY_H
 #define PXR_USD_SDF_MAP_EDIT_PROXY_H
diff --git a/pxr/usd/sdf/mapEditor.cpp b/pxr/usd/sdf/mapEditor.cpp
index b37ab857c6..410942cec7 100644
--- a/pxr/usd/sdf/mapEditor.cpp
+++ b/pxr/usd/sdf/mapEditor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/mapEditor.h b/pxr/usd/sdf/mapEditor.h
index 161a81581c..c807890916 100644
--- a/pxr/usd/sdf/mapEditor.h
+++ b/pxr/usd/sdf/mapEditor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_MAP_EDITOR_H
 #define PXR_USD_SDF_MAP_EDITOR_H
diff --git a/pxr/usd/sdf/module.cpp b/pxr/usd/sdf/module.cpp
index 3df9a7612e..e04898f6bf 100644
--- a/pxr/usd/sdf/module.cpp
+++ b/pxr/usd/sdf/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -45,7 +28,8 @@ TF_WRAP_MODULE
     TF_WRAP( OpaqueValue );
     TF_WRAP( Path );
     TF_WRAP( PredicateExpression );
-    TF_WRAP( PathExpression ); // needs PredicateExpression for default args.
+    TF_WRAP( PathPattern );
+    TF_WRAP( PathExpression ); // needs PathPattern & PredicateExpression.
     TF_WRAP( Payload );
     TF_WRAP( PredicateFunctionResult );
     TF_WRAP( Reference );
diff --git a/pxr/usd/sdf/moduleDeps.cpp b/pxr/usd/sdf/moduleDeps.cpp
index f741db332f..636883c719 100644
--- a/pxr/usd/sdf/moduleDeps.cpp
+++ b/pxr/usd/sdf/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -38,6 +21,7 @@ TF_REGISTRY_FUNCTION(TfScriptModuleLoader) {
         TfToken("ar"),
         TfToken("arch"),
         TfToken("gf"),
+        TfToken("pegtl"),
         TfToken("plug"),
         TfToken("tf"),
         TfToken("trace"),
diff --git a/pxr/usd/sdf/namespaceEdit.cpp b/pxr/usd/sdf/namespaceEdit.cpp
index daa08a7c47..67a4ffb993 100644
--- a/pxr/usd/sdf/namespaceEdit.cpp
+++ b/pxr/usd/sdf/namespaceEdit.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file namespaceEdit.cpp
 
diff --git a/pxr/usd/sdf/namespaceEdit.h b/pxr/usd/sdf/namespaceEdit.h
index 04ed4910c0..31d7ddafe8 100644
--- a/pxr/usd/sdf/namespaceEdit.h
+++ b/pxr/usd/sdf/namespaceEdit.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_NAMESPACE_EDIT_H
 #define PXR_USD_SDF_NAMESPACE_EDIT_H
diff --git a/pxr/usd/sdf/notice.cpp b/pxr/usd/sdf/notice.cpp
index d15f010b52..640b1c2d0d 100644
--- a/pxr/usd/sdf/notice.cpp
+++ b/pxr/usd/sdf/notice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/notice.h b/pxr/usd/sdf/notice.h
index 2cdda8a7b0..14fd2e182a 100644
--- a/pxr/usd/sdf/notice.h
+++ b/pxr/usd/sdf/notice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_NOTICE_H
 #define PXR_USD_SDF_NOTICE_H
diff --git a/pxr/usd/sdf/opaqueValue.cpp b/pxr/usd/sdf/opaqueValue.cpp
index a83aab40ef..edfcd39492 100644
--- a/pxr/usd/sdf/opaqueValue.cpp
+++ b/pxr/usd/sdf/opaqueValue.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/sdf/opaqueValue.h"
 
diff --git a/pxr/usd/sdf/opaqueValue.h b/pxr/usd/sdf/opaqueValue.h
index d642b6c7a3..ccb0b2250b 100644
--- a/pxr/usd/sdf/opaqueValue.h
+++ b/pxr/usd/sdf/opaqueValue.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_OPAQUE_VALUE_H
 #define PXR_USD_SDF_OPAQUE_VALUE_H
diff --git a/pxr/usd/sdf/parserHelpers.cpp b/pxr/usd/sdf/parserHelpers.cpp
index fe8f593eb1..6c78f58979 100644
--- a/pxr/usd/sdf/parserHelpers.cpp
+++ b/pxr/usd/sdf/parserHelpers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -66,7 +49,7 @@ using std::vector;
     if (index + count > vars.size()) {                                     \
         TF_CODING_ERROR("Not enough values to parse value of type %s",     \
                         name);                                             \
-        throw boost::bad_get();                                            \
+        throw std::bad_variant_access();                                            \
     }
 
 inline void
@@ -306,7 +289,7 @@ inline void
 MakeScalarValueImpl(
     SdfOpaqueValue *out, vector<Value> const &vars, size_t &index) {
     TF_CODING_ERROR("Found authored opinion for opaque attribute");
-    throw boost::bad_get();
+    throw std::bad_variant_access();
 }
 
 template <typename T>
@@ -318,7 +301,7 @@ MakeScalarValueTemplate(vector<unsigned int> const &,
     size_t origIndex = index;
     try {
         MakeScalarValueImpl(&t, vars, index);
-    } catch (const boost::bad_get &) {
+    } catch (const std::bad_variant_access &) {
         *errStrPtr = TfStringPrintf("Failed to parse value (at sub-part %zd "
                                     "if there are multiple parts)",
                                     (index - origIndex) - 1);
@@ -347,7 +330,7 @@ MakeShapedValueTemplate(vector<unsigned int> const &shape,
             MakeScalarValueImpl(&(*i), vars, index);
             shapeIndex++;
         }
-    } catch (const boost::bad_get &) {
+    } catch (const std::bad_variant_access &) {
         *errStrPtr = TfStringPrintf("Failed to parse at element %zd "
                                     "(at sub-part %zd if there are "
                                     "multiple parts)", shapeIndex,
diff --git a/pxr/usd/sdf/parserHelpers.h b/pxr/usd/sdf/parserHelpers.h
index 53a0eb7084..ec169d736c 100644
--- a/pxr/usd/sdf/parserHelpers.h
+++ b/pxr/usd/sdf/parserHelpers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PARSER_HELPERS_H
 #define PXR_USD_SDF_PARSER_HELPERS_H
@@ -31,8 +14,6 @@
 #include "pxr/base/gf/numericCast.h"
 #include "pxr/base/vt/value.h"
 
-#include <boost/variant/get.hpp>
-
 #include <functional>
 #include <limits>
 #include <string>
@@ -68,8 +49,8 @@ struct _GetImpl
 
 ////////////////////////////////////////////////////////////////////////
 // _GetImpl<T> for integral type T.  Convert finite doubles by static_cast,
-// throw bad_get for non-finite doubles.  Throw bad_get for out-of-range
-// integral values.
+// throw bad_variant_access for non-finite doubles.  Throw bad_variant_access
+// for out-of-range integral values.
 template <class T>
 struct _GetImpl<
     T, std::enable_if_t<std::is_integral<T>::value>>
@@ -80,9 +61,9 @@ struct _GetImpl<
         return std::visit(*this, variant);
     }
 
-    // Fallback case: throw bad_get.
+    // Fallback case: throw bad_variant_access.
     template <class Held>
-    T operator()(Held held) { throw boost::bad_get(); }
+    T operator()(Held held) { throw std::bad_variant_access(); }
 
     // Attempt to cast unsigned and signed int64_t.
     T operator()(uint64_t in) { return _Cast(in); }
@@ -92,7 +73,7 @@ struct _GetImpl<
     T operator()(double in) {
         if (std::isfinite(in))
             return _Cast(in);
-        throw boost::bad_get();
+        throw std::bad_variant_access();
     }
 
 private:
@@ -101,7 +82,7 @@ struct _GetImpl<
         try {
             return GfNumericCast<T>(in).value();
         } catch (const std::bad_optional_access &) {
-            throw boost::bad_get();
+            throw std::bad_variant_access();
         }
     }
 };
@@ -121,9 +102,9 @@ struct _GetImpl<
         return std::visit(*this, variant);
     }
 
-    // Fallback case: throw bad_get.
+    // Fallback case: throw bad_variant_access.
     template <class Held>
-    T operator()(Held held) { throw boost::bad_get(); }
+    T operator()(Held held) { throw std::bad_variant_access(); }
 
     // For numeric types, attempt to cast.
     T operator()(uint64_t in) { return _Cast(in); }
@@ -143,7 +124,7 @@ struct _GetImpl<
             return -std::numeric_limits<T>::infinity();
         if (str == "nan")
             return std::numeric_limits<T>::quiet_NaN();
-        throw boost::bad_get();
+        throw std::bad_variant_access();
     }
 
     template <class In>
@@ -151,7 +132,7 @@ struct _GetImpl<
         try {
             return GfNumericCast<T>(in).value();
         } catch (const std::bad_optional_access &) {
-            throw boost::bad_get();
+            throw std::bad_variant_access();
         }
     }
 };
@@ -159,7 +140,8 @@ struct _GetImpl<
 
 ////////////////////////////////////////////////////////////////////////
 
-// Get an asset path: converts string to asset path, otherwise throw bad_get.
+// Get an asset path: converts string to asset path, otherwise throw
+// bad_variant_access.
 template <>
 struct _GetImpl<SdfAssetPath>
 {
@@ -174,7 +156,7 @@ struct _GetImpl<SdfAssetPath>
 
 // Get a bool.  Numbers are considered true if nonzero, false otherwise.
 // Strings and tokens get parsed via Sdf_BoolFromString.  Otherwise throw
-// bad_get.
+// bad_variant_access.
 template <>
 struct _GetImpl<bool>
 {
@@ -189,7 +171,7 @@ struct _GetImpl<bool>
         bool parseOK = false;
         bool result = Sdf_BoolFromString(str, &parseOK);
         if (!parseOK)
-            throw boost::bad_get();
+            throw std::bad_variant_access();
         return result;
     }
 
@@ -203,10 +185,10 @@ struct _GetImpl<bool>
         return val != static_cast<Number>(0);
     }
 
-    // For anything else, throw bad_get().
+    // For anything else, throw bad_variant_access().
     template <class T>
     std::enable_if_t<!std::is_arithmetic<T>::value, bool>
-    operator()(T) { throw boost::bad_get(); }
+    operator()(T) { throw std::bad_variant_access(); }
 };
 
 // A parser value.  This is used as the fundamental value object in the text
@@ -223,8 +205,9 @@ struct _GetImpl<bool>
 // to call Get<float>() on a Value that's holding an integral type, a double, or
 // a string if that string's value is one of 'inf', '-inf', or 'nan'.  Similarly
 // Get<bool>() works on numbers and strings like 'yes', 'no', 'on', 'off',
-// 'true', 'false'.  If a Get<T>() call fails, it throws boost::bad_get, which
-// the parser responds to and raises a parse error.
+// 'true', 'false'.  If a Get<T>() call fails, it throws
+// std::bad_variant_access, which the parser responds to and raises a parse
+// error.
 //
 // The lexer constructs Value objects from input tokens.  It creates them to
 // retain all the input information possible.  For example, negative integers
@@ -266,13 +249,13 @@ struct Value
     
     // Attempt to get a value of type T from this Value, applying appropriate
     // conversions.  If this value cannot be converted to T, throw
-    // boost::bad_get.
+    // std::bad_variant_access.
     template <class T>
     typename _GetImpl<T>::ResultType Get() const {
         try {
             return _GetImpl<T>().Visit(_variant);
         } catch (std::bad_variant_access& e) {
-            throw boost::bad_get();
+            throw std::bad_variant_access();
         }
     }
 
diff --git a/pxr/usd/sdf/parserValueContext.cpp b/pxr/usd/sdf/parserValueContext.cpp
index 864df22c99..7cab031025 100644
--- a/pxr/usd/sdf/parserValueContext.cpp
+++ b/pxr/usd/sdf/parserValueContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/parserValueContext.h b/pxr/usd/sdf/parserValueContext.h
index e813df876b..01631ffb12 100644
--- a/pxr/usd/sdf/parserValueContext.h
+++ b/pxr/usd/sdf/parserValueContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PARSER_VALUE_CONTEXT_H
 #define PXR_USD_SDF_PARSER_VALUE_CONTEXT_H
diff --git a/pxr/usd/sdf/path.cpp b/pxr/usd/sdf/path.cpp
index b07ab3787d..7ac424c475 100644
--- a/pxr/usd/sdf/path.cpp
+++ b/pxr/usd/sdf/path.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/path.h"
@@ -393,25 +376,38 @@ SdfPath::GetPrefixes(SdfPathVector *prefixes) const
 void
 SdfPath::GetPrefixes(SdfPathVector *prefixes, size_t numPrefixes) const
 {
-    Sdf_PathNode const *prop = _propPart.get();
-    Sdf_PathNode const *prim = _primPart.get();
-
     const size_t elemCount = GetPathElementCount();
     if (numPrefixes == 0 || numPrefixes > elemCount) {
         numPrefixes = elemCount;
     }
-
     prefixes->resize(numPrefixes);
+    GetPrefixes(TfSpan<SdfPath>(*prefixes));
+}
+
+TfSpan<SdfPath>
+SdfPath::GetPrefixes(TfSpan<SdfPath> prefixes) const
+{
+    // We can fill up to prefixes.size() elements.
+    size_t numPrefixes = std::min(prefixes.size(), GetPathElementCount());
+    // If we are not filling the whole span, cut it to the subspan we will fill.
+    if (numPrefixes < prefixes.size()) {
+        prefixes = prefixes.first(numPrefixes);
+    }
+    
+    Sdf_PathNode const *prim = _primPart.get();
+    Sdf_PathNode const *prop = _propPart.get();
 
-    SdfPathVector::reverse_iterator iter = prefixes->rbegin();
+    TfSpan<SdfPath>::reverse_iterator iter = prefixes.rbegin();
     for (; prop && numPrefixes; --numPrefixes) {
         *iter++ = SdfPath(prim, prop);
         prop = prop->GetParentNode();
     }
-    for (; prim && numPrefixes; --numPrefixes) {
+    // no need to check 'prim' in the loop since we range-checked above.
+    for (; numPrefixes; --numPrefixes) {
         *iter++ = SdfPath(prim, nullptr);
         prim = prim->GetParentNode();
     }
+    return prefixes;
 }
 
 SdfPathAncestorsRange
diff --git a/pxr/usd/sdf/path.h b/pxr/usd/sdf/path.h
index 8ff326a0f0..494c744ef6 100644
--- a/pxr/usd/sdf/path.h
+++ b/pxr/usd/sdf/path.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PATH_H
 #define PXR_USD_SDF_PATH_H
@@ -30,6 +13,7 @@
 #include "pxr/usd/sdf/tokens.h"
 #include "pxr/base/arch/defines.h"
 #include "pxr/base/tf/delegatedCountPtr.h"
+#include "pxr/base/tf/span.h"
 #include "pxr/base/tf/stl.h"
 #include "pxr/base/tf/token.h"
 #include "pxr/base/vt/traits.h"
@@ -505,6 +489,20 @@ class SdfPath
     /// number of this path's prefixes, fill all prefixes.
     SDF_API void GetPrefixes(SdfPathVector *prefixes, size_t numPrefixes) const;
 
+    /// Fill \p prefixes with up to \p prefixes.size() prefixes of this path.
+    /// Return the subspan of prefixes filled.
+    ///
+    /// Prefixes are filled in order of shortest to longest.  The path itself is
+    /// always included as the last prefix.  If \p prefixes is not large enough
+    /// to contain all prefixes, the shortest prefixes are omitted.  If \p
+    /// prefixes is larger than the number of prefixes filled, return the
+    /// subspan filled by calling TfSpan::first() with the number of filled
+    /// prefixes.  Note that if the prefix order does not need to be from
+    /// shortest to longest, it can be more efficient to use
+    /// GetAncestorsRange(), which produces an equivalent set of paths, ordered
+    /// from longest to shortest.
+    SDF_API TfSpan<SdfPath> GetPrefixes(TfSpan<SdfPath> prefixes) const;
+
     /// Return a range for iterating over the ancestors of this path.
     ///
     /// The range provides iteration over the prefixes of a path, ordered
diff --git a/pxr/usd/sdf/pathExpression.cpp b/pxr/usd/sdf/pathExpression.cpp
index faefcce7fa..91189011da 100644
--- a/pxr/usd/sdf/pathExpression.cpp
+++ b/pxr/usd/sdf/pathExpression.cpp
@@ -1,30 +1,14 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/predicateExpression.h"
 #include "pxr/usd/sdf/pathExpression.h"
+#include "pxr/usd/sdf/pathPatternParser.h"
 
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/type.h"
@@ -130,7 +114,13 @@ SdfPathExpression::MakeComplement(SdfPathExpression &&right)
         ret._ops = std::move(right._ops);
         ret._refs = std::move(right._refs);
         ret._patterns = std::move(right._patterns);
-        ret._ops.push_back(Complement);
+        // Complement of complement cancels.
+        if (ret._ops.back() == Complement) {
+            ret._ops.pop_back();
+        }
+        else {
+            ret._ops.push_back(Complement);
+        }
     }
     return ret;
 }
@@ -454,162 +444,6 @@ SdfPathExpression::GetText() const
     return result;
 }
 
-////////////////////////////////////////////////////////////////////////
-// PathPattern
-
-SdfPathExpression::PathPattern::PathPattern()
-    : _prefix(SdfPath::ReflexiveRelativePath())
-    , _isProperty(false)
-{
-}
-
-static inline bool
-IsLiteralProperty(std::string const &text)
-{
-    return SdfPath::IsValidNamespacedIdentifier(text);
-}
-
-static inline bool
-IsLiteralPrim(std::string const &text)
-{
-    return SdfPath::IsValidIdentifier(text);
-}
-
-void
-SdfPathExpression::PathPattern::AppendChild(std::string const &text)
-{
-    return AppendChild(text, {});
-}
-
-void
-SdfPathExpression::PathPattern
-::AppendChild(std::string const &text,
-              SdfPredicateExpression const &predExpr)
-{
-    return AppendChild(text, SdfPredicateExpression(predExpr));
-}
-
-void
-SdfPathExpression::PathPattern::AppendChild(std::string const &text,
-                                            SdfPredicateExpression &&predExpr)
-{
-    if (_isProperty) {
-        TF_WARN("Cannot append child '%s' to property path expression '%s'",
-                text.c_str(), GetText().c_str());
-        return;
-    }
-                
-    bool isLiteral = IsLiteralPrim(text);
-    if ((isLiteral || text == "..") && !predExpr && _components.empty()) {
-        _prefix = _prefix.AppendChild(TfToken(text));
-    }
-    else {
-        int predIndex = -1;
-        if (predExpr) {
-            predIndex = static_cast<int>(_predExprs.size());
-            _predExprs.push_back(std::move(predExpr));
-        }
-        _components.push_back({ text, predIndex, isLiteral });
-    }
-}
-
-void
-SdfPathExpression::PathPattern::AppendProperty(std::string const &text)
-{
-    return AppendProperty(text, {});
-}
-
-void
-SdfPathExpression::PathPattern::AppendProperty(std::string const &text,
-                                SdfPredicateExpression const &predExpr)
-{
-    return AppendProperty(text, SdfPredicateExpression(predExpr));
-}
-
-void
-SdfPathExpression::PathPattern::AppendProperty(std::string const &text,
-                                SdfPredicateExpression &&predExpr)
-{
-    bool isLiteral = IsLiteralProperty(text);
-    if (isLiteral && !predExpr && _components.empty()) {
-        _prefix = _prefix.AppendProperty(TfToken(text));
-    }
-    else {
-        int predIndex = -1;
-        if (predExpr) {
-            predIndex = static_cast<int>(_predExprs.size());
-            _predExprs.push_back(std::move(predExpr));
-        }
-        _components.push_back({ text, predIndex, isLiteral });
-    }
-    _isProperty = true;
-}
-
-void
-SdfPathExpression::PathPattern::SetPrefix(SdfPath &&p)
-{
-    // If we have any components at all, then p must be a prim path or the
-    // absolute root path.  Otherwise it can be a prim or prim property path.
-    if (!_components.empty()) {
-        if (!p.IsAbsoluteRootOrPrimPath()) {
-            TF_WARN("Path patterns with match components require "
-                    "prim paths or the absolute root path ('/') as a prefix: "
-                    "<%s> -- ignoring.", p.GetAsString().c_str());
-            return;
-        }
-    }
-    else {
-        if (!(p.IsAbsoluteRootOrPrimPath() || p.IsPrimPropertyPath())) { 
-            TF_WARN("Path pattern prefixes must be prim paths or prim-property "
-                    "paths: <%s> -- ignoring.", p.GetAsString().c_str());
-            return;
-        }
-    }
-    _prefix = std::move(p);
-    if (_components.empty()) {
-        _isProperty = _prefix.IsPrimPropertyPath();
-    }
-}
-
-std::string
-SdfPathExpression::PathPattern::GetText() const
-{
-    std::string result;
-
-    if (_prefix == SdfPath::ReflexiveRelativePath()) {
-        if (_components.empty() || _components.front().IsStretch()) {
-            // If components is empty, or first component is a stretch, then we
-            // emit a leading '.', otherwise nothing.
-            result = ".";
-        }
-    }
-    else {
-        result = _prefix.GetAsString();
-    }
-
-    const bool prefixIsAbsRoot = _prefix == SdfPath::AbsoluteRootPath();
-    for (size_t i = 0, end = _components.size(); i != end; ++i) {
-        if (_components[i].text.empty() &&
-            _components[i].predicateIndex == -1) {
-            result += (i == 0 && prefixIsAbsRoot) ? "/" : "//";
-            continue;
-        }
-        if (!result.empty() && result.back() != '/') {
-            if ((i + 1 == end) && _isProperty) {
-                result.push_back('.');
-            } else {
-                result.push_back('/');
-            }
-        }
-        result += _components[i].text;
-        if (_components[i].predicateIndex != -1) {
-            result += "{" + _predExprs[
-                _components[i].predicateIndex].GetText() + "}";
-        }
-    }
-    return result;
-}
-
 std::ostream &
 operator<<(std::ostream &out, SdfPathExpression const &expr)
 {
@@ -618,16 +452,6 @@ operator<<(std::ostream &out, SdfPathExpression const &expr)
 
 ////////////////////////////////////////////////////////////////////////
 // Parsing code.
-
-class Sdf_PathPatternBuilder
-{
-public:
-    SdfPathExpression::PathPattern pattern;
-
-    std::string curElemText;
-    SdfPredicateExpression curPredExpr;
-};
-
 struct Sdf_PathExprBuilder
 {
     Sdf_PathExprBuilder() { OpenGroup(); }
@@ -638,9 +462,8 @@ struct Sdf_PathExprBuilder
         _stacks.back().PushExpressionRef(std::move(path), std::move(name));
     }
 
-    void PushPattern() {
-        _stacks.back().PushPattern(std::move(_patternBuilder.pattern));
-        _patternBuilder = Sdf_PathPatternBuilder();
+    void PushPattern(SdfPathPattern &&pattern) {
+        _stacks.back().PushPattern(std::move(pattern));
     }
 
     void OpenGroup() { _stacks.emplace_back(); }
@@ -657,10 +480,6 @@ struct Sdf_PathExprBuilder
         return result;
     }
 
-    Sdf_PathPatternBuilder &GetPatternBuilder() {
-        return _patternBuilder;
-    }
-
 private:
     struct _Stack {
 
@@ -679,7 +498,7 @@ struct Sdf_PathExprBuilder
                     
         }
 
-        void PushPattern(SdfPathExpression::PathPattern &&pattern) {
+        void PushPattern(SdfPathPattern &&pattern) {
             exprStack.push_back(
                 SdfPathExpression::MakeAtom(std::move(pattern)));
         }
@@ -726,182 +545,25 @@ struct Sdf_PathExprBuilder
     };
 
     std::vector<_Stack> _stacks;
-
-    Sdf_PathPatternBuilder _patternBuilder;
 };
 
-
-
 ////////////////////////////////////////////////////////////////////////
 // Path expression grammar
 
 namespace {
 
-using namespace tao::TAO_PEGTL_NAMESPACE;
-
-////////////////////////////////////////////////////////////////////////
-// Path patterns with predicates.
-struct PathPatStretch : two<'/'> {};
-struct PathPatSep : sor<PathPatStretch, one<'/'>> {};
-
-struct EmbeddedPredExpr : disable<PredExpr> {};
-
-struct BracedPredExpr
-    : if_must<one<'{'>, OptSpaced<EmbeddedPredExpr>, one<'}'>> {};
-
-struct PrimPathWildCard :
-    seq<
-    plus<sor<identifier_other, one<'?','*'>>>,
-    opt<one<'['>,plus<sor<identifier_other, one<'[',']','!','-','?','*'>>>>
-    > {};
-
-struct PropPathWildCard :
-    seq<
-    plus<sor<identifier_other, one<':','?','*'>>>,
-    opt<one<'['>,plus<sor<identifier_other, one<':','[',']','!','-','?','*'>>>>
-    > {};
-
-struct PrimPathPatternElemText : PrimPathWildCard {};
-struct PropPathPatternElemText : PropPathWildCard {};
+using namespace PXR_PEGTL_NAMESPACE;
 
-struct PrimPathPatternElem
-    : if_then_else<PrimPathPatternElemText, opt<BracedPredExpr>,
-                   BracedPredExpr> {};
+template <class Rule, class Sep>
+using LookaheadList = seq<Rule, star<at<Sep, Rule>, Sep, Rule>>;
 
-struct PropPathPatternElem
-    : if_then_else<PropPathPatternElemText, opt<BracedPredExpr>,
-                   BracedPredExpr> {};
-
-struct PathPatternElems
-    : seq<LookaheadList<PrimPathPatternElem, PathPatSep>,
-          opt<PathPatStretch>,
-          opt_must<one<'.'>, PropPathPatternElem>> {};
-
-struct AbsPathPattern : seq<PathPatSep, opt<PathPatternElems>> {};
+template <class Rule> using OptSpaced = pad<Rule, blank>;
 
+////////////////////////////////////////////////////////////////////////
+// Expression references.
 struct DotDot : two<'.'> {};
 struct DotDots : list<DotDot, one<'/'>> {};
 
-struct ReflexiveRelative : one<'.'> {};
-
-struct AbsoluteStart : at<one<'/'>> {};
-
-struct PathPattern :
-    sor<
-    if_must<AbsoluteStart, AbsPathPattern>,
-    seq<DotDots, if_then_else<PathPatSep, opt<PathPatternElems>, success>>,
-    PathPatternElems,
-    seq<ReflexiveRelative, opt<PathPatStretch, opt<PathPatternElems>>>
-    >
-{};
-
-// Actions /////////////////////////////////////////////////////////////
-
-template <class Rule>
-struct PathExprAction : nothing<Rule> {};
-
-template <>
-struct PathExprAction<AbsoluteStart>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        builder.GetPatternBuilder().pattern.SetPrefix(
-            SdfPath::AbsoluteRootPath());
-    }
-};
-
-template <>
-struct PathExprAction<PathPatStretch>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        // '//' appends a component representing arbitrary elements.
-        builder.GetPatternBuilder().pattern.AppendChild(std::string());
-    }
-};
-
-template <>
-struct PathExprAction<EmbeddedPredExpr>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        builder.GetPatternBuilder().curPredExpr =
-            SdfPredicateExpression(in.string());
-    }
-};
-
-template <>
-struct PathExprAction<PrimPathPatternElemText>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        builder.GetPatternBuilder().curElemText = in.string();
-    }
-};
-
-template <>
-struct PathExprAction<PropPathPatternElemText>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        builder.GetPatternBuilder().curElemText = in.string();
-    }
-};
-
-template <>
-struct PathExprAction<PrimPathPatternElem>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        auto &pb = builder.GetPatternBuilder();
-        pb.pattern.AppendChild(pb.curElemText, pb.curPredExpr);
-        pb.curElemText.clear();
-        pb.curPredExpr = SdfPredicateExpression();
-    }
-};
-
-template <>
-struct PathExprAction<PropPathPatternElem>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        auto &pb = builder.GetPatternBuilder();
-        pb.pattern.AppendProperty(pb.curElemText, pb.curPredExpr);
-        pb.curElemText.clear();
-        pb.curPredExpr = SdfPredicateExpression();
-    }
-};
-
-template <>
-struct PathExprAction<ReflexiveRelative>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        builder.GetPatternBuilder().pattern.SetPrefix(
-            SdfPath::ReflexiveRelativePath());
-    }
-};
-
-template <>
-struct PathExprAction<DotDot>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        builder.GetPatternBuilder().pattern.AppendChild("..");
-    }
-};
-
-template <>
-struct PathExprAction<PathPattern>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        builder.PushPattern();
-    }
-};
-
-////////////////////////////////////////////////////////////////////////
-// Expression references.
 struct ExpressionRefName : seq<one<':'>, identifier> {};
 
 struct ExpressionRefPathAndName :
@@ -924,28 +586,6 @@ struct ExpressionReference : sor<
     seq<one<'%'>, ExpressionRefPath>
     > {};
 
-// Actions /////////////////////////////////////////////////////////////
-
-template <>
-struct PathExprAction<WeakerRef>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        builder.PushExpressionRef(SdfPath(), "_");
-    }
-};
-
-template <>
-struct PathExprAction<ExpressionRefPath>
-{
-    template <class Input>
-    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
-        std::string pathPart = TfStringGetBeforeSuffix(in.string(), ':');
-        builder.PushExpressionRef(
-            pathPart.empty() ? SdfPath() : SdfPath(pathPart),
-            TfStringGetSuffix(in.string(), ':'));
-    }
-};
 
 ////////////////////////////////////////////////////////////////////////
 // Path exprs.
@@ -958,7 +598,7 @@ struct PathExprCloseGroup : one<')'> {};
 struct PathExprAtom
     : sor<
     ExpressionReference,
-    PathPattern,
+    SdfPathPatternParser::PathPattern,
     if_must<PathExprOpenGroup, OptSpaced<PathExpr>, PathExprCloseGroup>
     >
 {};
@@ -979,6 +619,31 @@ struct PathOperator : sor<OptSpaced<PathSetUnion>,
 struct PathExpr : LookaheadList<PathFactor, PathOperator> {};
 
 ////////////////////////////////////////////////////////////////////////
+// Actions /////////////////////////////////////////////////////////////
+
+template <class Rule>
+struct PathExprAction : nothing<Rule> {};
+
+template <>
+struct PathExprAction<WeakerRef>
+{
+    template <class Input>
+    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
+        builder.PushExpressionRef(SdfPath(), "_");
+    }
+};
+
+template <>
+struct PathExprAction<ExpressionRefPath>
+{
+    template <class Input>
+    static void apply(Input const &in, Sdf_PathExprBuilder &builder) {
+        std::string pathPart = TfStringGetBeforeSuffix(in.string(), ':');
+        builder.PushExpressionRef(
+            pathPart.empty() ? SdfPath() : SdfPath(pathPart),
+            TfStringGetSuffix(in.string(), ':'));
+    }
+};
 
 template <SdfPathExpression::Op op>
 struct PathExprOpAction
@@ -1018,12 +683,28 @@ struct PathExprAction<PathExprCloseGroup>
     }
 };
 
+// This rule dispatches to the PathPatternAction to build the pattern, then we
+// can consume it in the 'success' member function.
+template <>
+struct PathExprAction<SdfPathPatternParser::PathPattern>
+    : change_action_and_states<
+    SdfPathPatternActions::PathPatternAction,
+    SdfPathPatternActions::PatternBuilder>
+{
+    template <class Input>
+    static void success(Input const &,
+                        SdfPathPatternActions::PatternBuilder &patternBuilder,
+                        Sdf_PathExprBuilder &builder) {
+        builder.PushPattern(std::move(patternBuilder.pattern));
+    }
+};
+
 } // anon
 
 ////////////////////////////////////////////////////////////////////////
 // Parsing drivers.
 
-bool
+static bool
 ParsePathExpression(std::string const &inputStr,
                     std::string const &parseContext,
                     SdfPathExpression *expr,
@@ -1031,7 +712,7 @@ ParsePathExpression(std::string const &inputStr,
 {
     Sdf_PathExprBuilder builder;
     try {
-        parse<must<PathExpr, eolf>, PathExprAction/*, tracer*/>(
+        parse<must<pad<PathExpr, blank>, eolf>, PathExprAction>(
             string_input<> { inputStr,
                 parseContext.empty() ? "<input>" : parseContext.c_str()
             }, builder);
@@ -1043,7 +724,7 @@ ParsePathExpression(std::string const &inputStr,
         std::string errMsg = err.what();
         errMsg += " -- ";
         bool first = true;
-        for (position const &p: err.positions) {
+        for (position const &p: err.positions()) {
             if (!first) {
                 errMsg += ", ";
             }
diff --git a/pxr/usd/sdf/pathExpression.h b/pxr/usd/sdf/pathExpression.h
index 2a08ae663c..fb931360ed 100644
--- a/pxr/usd/sdf/pathExpression.h
+++ b/pxr/usd/sdf/pathExpression.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PATH_EXPRESSION_H
 #define PXR_USD_SDF_PATH_EXPRESSION_H
@@ -27,7 +10,7 @@
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/api.h"
 #include "pxr/usd/sdf/path.h"
-#include "pxr/usd/sdf/predicateExpression.h"
+#include "pxr/usd/sdf/pathPattern.h"
 #include "pxr/base/tf/hash.h"
 
 #include <iosfwd>
@@ -41,8 +24,8 @@ PXR_NAMESPACE_OPEN_SCOPE
 /// \class SdfPathExpression
 ///
 /// Objects of this class represent a logical expression syntax tree consisting
-/// of SdfPath matching patterns (with optionally embedded predicate
-/// expressions) joined by the set-algebraic operators `+` (union), `&`
+/// of SdfPathPattern s, (with optionally embedded predicate expressions), and
+/// Expression References joined by the set-algebraic operators `+` (union), `&`
 /// (intersection), `-` (difference), `~` (complement) and an implied-union
 /// operator represented by two subexpressions joined by whitespace.
 ///
@@ -71,178 +54,8 @@ PXR_NAMESPACE_OPEN_SCOPE
 class SdfPathExpression
 {
 public:
-    /// \class PathPattern
-    ///
-    /// Objects of this class represent SdfPath matching patterns, consisting of
-    /// an SdfPath prefix followed by a sequence of components, which may
-    /// contain wildcards and optional embedded predicate expressions (see
-    /// SdfPredicateExpression).
-    class PathPattern
-    {
-    public:
-        /// Construct the empty pattern whose bool-conversion operator returns
-        /// false.
-        SDF_API
-        PathPattern();
-
-        /// A component represents a pattern matching component past the initial
-        /// SdfPath prefix.  A component's text can contain wildcard characters,
-        /// and if the component references a predicate expression, its
-        /// predicateIndex indicates which one in the owning PathPattern's list
-        /// of expressions.  A component whose text is empty represents an
-        /// "arbitrary levels of hierarchy" element (the //) in a path pattern.
-        struct Component {
-            bool IsStretch() const {
-                return predicateIndex == -1 && text.empty();
-            }
-
-            std::string text;
-            int predicateIndex = -1;
-            bool isLiteral = false;
-
-            friend bool operator==(Component const &l, Component const &r) {
-                return std::tie(l.text, l.predicateIndex, l.isLiteral) ==
-                    std::tie(r.text, r.predicateIndex, r.isLiteral);
-            }
-            
-            friend bool operator!=(Component const &l, Component const &r) {
-                return !(l == r);
-            }
-
-            template <class HashState>
-            friend void TfHashAppend(HashState &h, Component const &c) {
-                h.Append(c.text, c.predicateIndex, c.isLiteral);
-            }
-
-            friend void swap(Component &l, Component &r) {
-                auto lt = std::tie(l.text, l.predicateIndex, l.isLiteral);
-                auto rt = std::tie(r.text, r.predicateIndex, r.isLiteral);
-                swap(lt, rt);
-            }
-        };
-
-        /// Append a prim child component to this pattern, with optional
-        /// predicate expression \p predExpr.  If this pattern does not yet
-        /// contain any wildcards or components with predicate expressions, and
-        /// the input text does not contain wildcards, and \p predExpr is empty,
-        /// then append a child component to this pattern's prefix path (see
-        /// GetPrefix()).  Otherwise append this component to the sequence of
-        /// components.
-        SDF_API
-        void AppendChild(std::string const &text,
-                         SdfPredicateExpression &&predExpr);
-        /// \overload
-        SDF_API
-        void AppendChild(std::string const &text,
-                         SdfPredicateExpression const &predExpr);
-        /// \overload
-        SDF_API
-        void AppendChild(std::string const &text);
-
-        /// Append a prim property component to this pattern, with optional
-        /// predicate expression \p predExpr.  If this pattern does not yet
-        /// contain any wildcards or components with predicate expressions, and
-        /// the input text does not contain wildcards, and \p predExpr is empty,
-        /// then append a property component to this pattern's prefix path (see
-        /// GetPrefix()). Otherwise append this component to the sequence of
-        /// components.
-        SDF_API
-        void AppendProperty(std::string const &text,
-                            SdfPredicateExpression &&predExpr);
-        /// \overload
-        SDF_API
-        void AppendProperty(std::string const &text,
-                            SdfPredicateExpression const &predExpr);
-        /// \overload
-        SDF_API
-        void AppendProperty(std::string const &text);
-
-        /// Return this pattern's non-speculative prefix (leading path
-        /// components with no wildcards and no predicates).
-        SdfPath const &GetPrefix() const & {
-            return _prefix;
-        }
-
-        /// \overload
-        SdfPath GetPrefix() && {
-            return std::move(_prefix);
-        }
-
-        /// Set this pattern's non-speculative prefix (leading path
-        /// components with no wildcards and no predicates).
-        SDF_API
-        void SetPrefix(SdfPath &&p);
-
-        /// \overload
-        void SetPrefix(SdfPath const &p) {
-            SetPrefix(SdfPath(p));
-        }
-
-        /// Return the string representation of this pattern.
-        SDF_API
-        std::string GetText() const;
-
-        std::vector<Component> const &GetComponents() const & {
-            return _components;
-        }
-        
-        std::vector<Component> GetComponents() && {
-            return _components;
-        }
-
-        std::vector<SdfPredicateExpression> const &
-        GetPredicateExprs() const & {
-            return _predExprs;
-        }
-        
-        std::vector<SdfPredicateExpression>
-        GetPredicateExprs() && {
-            return _predExprs;
-        }
-
-        bool IsProperty() const {
-            return _isProperty;
-        }
-
-        /// Return true if this pattern is not empty, false if it is.
-        explicit operator bool() const {
-            return !_prefix.IsEmpty();
-        }
-
-    private:
-        template <class HashState>
-        friend void TfHashAppend(HashState &h, PathPattern const &pat) {
-            h.Append(pat._prefix, pat._components,
-                     pat._predExprs, pat._isProperty);
-        }
-
-        friend bool
-        operator==(PathPattern const &l, PathPattern const &r) {
-            return std::tie(l._prefix, l._components,
-                            l._predExprs, l._isProperty) ==
-                   std::tie(r._prefix, r._components,
-                            r._predExprs, r._isProperty);
-        }
-
-        friend bool
-        operator!=(PathPattern const &l, PathPattern const &r) {
-            return !(l == r);
-        }
-
-        friend void swap(PathPattern &l, PathPattern &r) {
-            auto lt = std::tie(
-                l._prefix, l._components, l._predExprs, l._isProperty);
-            auto rt = std::tie(
-                r._prefix, r._components, r._predExprs, r._isProperty);
-            swap(lt, rt);
-        }
-        
-        SdfPath _prefix;
-        std::vector<Component> _components;
-        std::vector<SdfPredicateExpression> _predExprs;
-        bool _isProperty;
-    };
-
+    using PathPattern = SdfPathPattern;
+    
     /// \class ExpressionReference
     ///
     /// Objects of this class represent references to other path expressions,
@@ -380,6 +193,18 @@ class SdfPathExpression
         return MakeAtom(PathPattern(pattern));
     }
 
+    /// Produce a new expression that matches \p path exactly.
+    static SdfPathExpression
+    MakeAtom(SdfPath const &path) {
+        return MakeAtom(PathPattern(path));
+    }
+
+    /// \overload
+    static SdfPathExpression
+    MakeAtom(SdfPath &&path) {
+        return MakeAtom(PathPattern(path));
+    }
+
     /// Walk this expression's syntax tree in depth-first order, calling \p
     /// pattern with the current PathPattern when one is encountered, \p ref
     /// with the current ExpressionReference when one is encountered, and \p
diff --git a/pxr/usd/sdf/pathExpressionEval.cpp b/pxr/usd/sdf/pathExpressionEval.cpp
index 91a2c19a8e..8c2238696d 100644
--- a/pxr/usd/sdf/pathExpressionEval.cpp
+++ b/pxr/usd/sdf/pathExpressionEval.cpp
@@ -1,31 +1,15 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/pathExpressionEval.h"
 
 #include "pxr/base/tf/errorMark.h"
+#include "pxr/base/tf/ostreamMethods.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -94,6 +78,8 @@ Sdf_PathExpressionEvalBase::_EvalExpr(
             break;
         case And:
         case Or: {
+            DEBUG_MSG("- %s (lhs = %s)\n",
+                      *opIter == And ? "And" : "Or", result ? "true" : "false");
             const bool decidingValue = *opIter != And;
             // If the And/Or result is already the deciding value,
             // short-circuit.  Otherwise the result is the rhs, so continue.
@@ -105,8 +91,8 @@ Sdf_PathExpressionEvalBase::_EvalExpr(
             }
         }
             break;
-        case Open: ++nest; break;
-        case Close: --nest; break;
+        case Open: DEBUG_MSG("- Open\n"); ++nest; break;
+        case Close: DEBUG_MSG("- Close\n"); --nest; break;
         };
     }
     return result;
@@ -120,7 +106,7 @@ _PatternImplBase::_Init(
 {
     // Build a matcher.
     _prefix = pattern.GetPrefix();
-    _isProperty = pattern.IsProperty();
+    // _matchObjType set below.
     _stretchBegin = false;
     _stretchEnd = false;
     auto const &predicateExprs = pattern.GetPredicateExprs();
@@ -176,6 +162,29 @@ _PatternImplBase::_Init(
         }
         _segments.back().end = _components.size();
     }
+
+    // Set the object types this pattern can match.  If the pattern isn't
+    // explicitly a property, then it can match only prims if the final
+    // component's text is not empty.  That is, patterns like '/foo//' or '//'
+    // or '/predicate//{test}' can match either prims or properties, but
+    // patterns like '/foo//bar', '//baz{test}', '/foo/[Bb]' can only match
+    // prims.
+    if (pattern.IsProperty()) {
+        // The pattern demands a property.
+        _matchObjType = _MatchPropOnly;
+    }
+    else if (_stretchEnd ||
+             (!_components.empty() && _components.back().type == ExplicitName &&
+              _explicitNames[_components.back().patternIndex].empty())) {
+        // Trailing stretch, or last component has empty text means this can
+        // match both prims & properties.
+        _matchObjType = _MatchPrimOrProp;
+    }
+    else {
+        // No trailing stretch, and the final component requires a prim
+        // name/regex match means this pattern can only match prims.
+        _matchObjType = _MatchPrimOnly;
+    }
 }
 
 SdfPredicateFunctionResult
@@ -212,11 +221,17 @@ _PatternImplBase::_Match(
                   Stringify(result));
         return result;
     }
-    if (_isProperty && !path.IsPrimPropertyPath()) {
-        DEBUG_MSG("pattern demands a property; <%s> is not -> varying false\n",
-                  path.GetAsString().c_str());
+    const bool isPrimPropertyPath = path.IsPrimPropertyPath();
+    if (_matchObjType == _MatchPropOnly && !isPrimPropertyPath) {
+        DEBUG_MSG("pattern demands a property; <%s> is a prim path -> "
+                  "varying false\n", path.GetAsString().c_str());
         return Result::MakeVarying(false);
     }
+    if (_matchObjType == _MatchPrimOnly && isPrimPropertyPath) {
+        DEBUG_MSG("pattern demands a prim; <%s> is a property path -> "
+                  "constant false\n", path.GetAsString().c_str());
+        return Result::MakeConstant(false);
+    }
 
     // If this pattern has no components, it matches if it is the same as the
     // prefix, or if it has the prefix if there's a stretch following.
@@ -239,12 +254,23 @@ _PatternImplBase::_Match(
                   path.GetAsString().c_str());
         return Result::MakeConstant(false);
     }
+    // If the pattern has components then the path must be longer than the
+    // prefix, otherwise those components have nothing to match.
+    else if (path.GetPathElementCount() == _prefix.GetPathElementCount()) {
+        DEBUG_MSG("path matches prefix but pattern requires additional "
+                  "components -> varying false\n");
+        return Result::MakeVarying(false);
+    }
 
     // Split the path into prefixes but skip any covered by _prefix.
     // XXX:TODO Plumb-in caller-supplied vector for reuse by GetPrefixes().
     SdfPathVector prefixes;
     path.GetPrefixes(
         &prefixes, path.GetPathElementCount() - _prefix.GetPathElementCount());
+
+    DEBUG_MSG("Examining paths not covered by pattern prefix <%s>:\n    %s\n",
+              _prefix.GetAsString().c_str(),
+              TfStringify(prefixes).c_str());
     
     SdfPathVector::const_iterator matchLoc = prefixes.begin();
     const SdfPathVector::const_iterator matchEnd = prefixes.end();
@@ -357,9 +383,9 @@ _PatternImplBase::_Match(
         // First segment must match at the beginning.
         if (!_stretchBegin && segment.StartsAt(0)) {
             const Result result = checkMatch(segment, matchLoc);
+            DEBUG_MSG("segment %smatch at start -> %s\n",
+                      result ? "" : "does not ", Stringify(result));
             if (!result) {
-                DEBUG_MSG("segment does not match at start -> %s\n",
-                          Stringify(result));
                 return result;
             }
             matchLoc += segment.GetSize();
@@ -375,9 +401,9 @@ _PatternImplBase::_Match(
         else if (!_stretchEnd && segment.EndsAt(componentsSize)) {
             const Result result =
                 checkMatch(segment, matchEnd - segment.GetSize());
+            DEBUG_MSG("segment %smatch at end -> %s\n",
+                      result ? "" : "does not ", Stringify(result));
             if (!result) {
-                DEBUG_MSG("segment does not match at end -> %s\n",
-                          Stringify(result));
                 return result;
             }
             matchLoc = matchEnd;
@@ -388,9 +414,9 @@ _PatternImplBase::_Match(
             // components we have remaining to match against.
             const Result result =
                 searchMatch(segment, matchLoc, matchEnd - numComponentsLeft);
+            DEBUG_MSG("found %smatch in interior -> %s\n",
+                      result ? "" : "no ", Stringify(result));
             if (!result) {
-                DEBUG_MSG("found no match in interior -> %s\n",
-                          Stringify(result));
                 return result;
             }
             matchLoc += segment.GetSize();
@@ -461,14 +487,19 @@ ::_PatternImplBase::_Next(
         return Result::MakeVarying(false);
     }
 
-    // If this pattern demands a property path then we can early-out if the path
-    // in question is not a property path.  Otherwise this path may or may not
-    // match properties.
-    if (_isProperty && !path.IsPrimPropertyPath()) {
+    // If this pattern demands a either a prim or a property path then we can
+    // early-out if the path in question is not the required type.
+    const bool isPrimPropertyPath = path.IsPrimPropertyPath();
+    if (_matchObjType == _MatchPropOnly && !isPrimPropertyPath) {
         DEBUG_MSG("_Next(<%s>) isn't a property path -> varying false\n",
                   path.GetAsString().c_str());
         return Result::MakeVarying(false);
     }
+    if (_matchObjType == _MatchPrimOnly && isPrimPropertyPath) {
+        DEBUG_MSG("_Next(<%s>) isn't a prim path -> constant false\n",
+                  path.GetAsString().c_str());
+        return Result::MakeConstant(false);
+    }
 
     // If this pattern has no components, it matches if there's a stretch or if
     // it is the same length as the prefix (which means it is identical to the
diff --git a/pxr/usd/sdf/pathExpressionEval.h b/pxr/usd/sdf/pathExpressionEval.h
index b950768128..e7ebb2ca6e 100644
--- a/pxr/usd/sdf/pathExpressionEval.h
+++ b/pxr/usd/sdf/pathExpressionEval.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PATH_EXPRESSION_EVAL_H
 #define PXR_USD_SDF_PATH_EXPRESSION_EVAL_H
@@ -151,7 +134,10 @@ class Sdf_PathExpressionEvalBase
 
         bool _stretchBegin;
         bool _stretchEnd;
-        bool _isProperty; // true if this pattern matches only properties.
+        enum : uint8_t {
+            // The kind of objects this pattern is capable of matching.
+            _MatchPrimOrProp, _MatchPrimOnly, _MatchPropOnly
+        } _matchObjType;
     };
 
 
diff --git a/pxr/usd/sdf/pathNode.cpp b/pxr/usd/sdf/pathNode.cpp
index 4402c33b5f..6a26affbf2 100644
--- a/pxr/usd/sdf/pathNode.cpp
+++ b/pxr/usd/sdf/pathNode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/pathNode.h b/pxr/usd/sdf/pathNode.h
index 4582e9f5de..b96cacadc1 100644
--- a/pxr/usd/sdf/pathNode.h
+++ b/pxr/usd/sdf/pathNode.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PATH_NODE_H
 #define PXR_USD_SDF_PATH_NODE_H
diff --git a/pxr/usd/sdf/pathParser.cpp b/pxr/usd/sdf/pathParser.cpp
index 1fac7fc949..ec3e150136 100644
--- a/pxr/usd/sdf/pathParser.cpp
+++ b/pxr/usd/sdf/pathParser.cpp
@@ -1,32 +1,15 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/pathParser.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-using namespace tao::TAO_PEGTL_NAMESPACE;
+using namespace PXR_PEGTL_NAMESPACE;
 
 namespace Sdf_PathParser {
 
diff --git a/pxr/usd/sdf/pathParser.h b/pxr/usd/sdf/pathParser.h
index d4ae61eae9..972ae4d84b 100644
--- a/pxr/usd/sdf/pathParser.h
+++ b/pxr/usd/sdf/pathParser.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PATH_PARSER_H
 #define PXR_USD_SDF_PATH_PARSER_H
@@ -29,7 +12,7 @@
 #include "pxr/base/tf/unicodeUtils.h"
 #include "pxr/usd/sdf/path.h"
 
-#include "pxr/base/tf/pxrPEGTL/pegtl.h"
+#include "pxr/base/pegtl/pegtl.hpp"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -38,7 +21,7 @@ Sdf_ParsePath(std::string const &pathStr, SdfPath *path, std::string *errMsg);
 
 namespace Sdf_PathParser {
 
-namespace PEGTL_NS = tao::TAO_PEGTL_NAMESPACE;
+namespace PEGTL_NS = PXR_PEGTL_NAMESPACE;
 
 ////////////////////////////////////////////////////////////////////////
 // Helper rules for parsing UTF8 content
@@ -51,7 +34,7 @@ struct XidStart
         {
             // peek at the next character in the input
             // if the size is not 0, it was a valid code point
-            auto utf8_char = tao::TAO_PEGTL_NAMESPACE::internal::peek_utf8::peek(in);
+            auto utf8_char = PEGTL_NS::internal::peek_utf8::peek(in);
             if (utf8_char.size != 0)
             {
                 // valid utf8_char, data has the code point
@@ -77,7 +60,7 @@ struct XidContinue
         {
             // peek at the next character in the input
             // if the size is not 0, it was a valid code point
-            auto utf8_char = tao::TAO_PEGTL_NAMESPACE::internal::peek_utf8::peek(in);
+            auto utf8_char = PEGTL_NS::internal::peek_utf8::peek(in);
             if (utf8_char.size != 0)
             {
                 // valid utf8_char, data has the code point
@@ -166,7 +149,7 @@ struct BracketPath : PEGTL_NS::if_must<TargetPathOpen, TargPath, TargetPathClose
 
 struct RelationalAttributeName : PropertyName {};
 
-struct MapperKW : TAO_PEGTL_KEYWORD("mapper") {};
+struct MapperKW : PXR_PEGTL_KEYWORD("mapper") {};
 
 struct MapperArg : PEGTL_NS::identifier {};
 
@@ -174,7 +157,7 @@ struct MapperPathSeq : PEGTL_NS::if_must<
     PEGTL_NS::seq<Dot, MapperKW>, BracketPath<MapperPath>,
     PEGTL_NS::opt<Dot, MapperArg>> {};
 
-struct Expression : TAO_PEGTL_KEYWORD("expression") {};
+struct Expression : PXR_PEGTL_KEYWORD("expression") {};
 
 struct RelAttrSeq : PEGTL_NS::if_must<
     PEGTL_NS::one<'.'>, RelationalAttributeName,
@@ -242,4 +225,4 @@ struct Action : PEGTL_NS::nothing<Rule> {};
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_USD_SDF_PATH_PARSER_H
\ No newline at end of file
+#endif // PXR_USD_SDF_PATH_PARSER_H
diff --git a/pxr/usd/sdf/pathPattern.cpp b/pxr/usd/sdf/pathPattern.cpp
new file mode 100644
index 0000000000..0c22d85ec8
--- /dev/null
+++ b/pxr/usd/sdf/pathPattern.cpp
@@ -0,0 +1,338 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/usd/sdf/predicateExpression.h"
+#include "pxr/usd/sdf/pathPattern.h"
+
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/base/tf/type.h"
+#include "pxr/base/vt/array.h"
+#include "pxr/base/vt/value.h"
+
+#include "predicateExpressionParser.h"
+
+#include <memory>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+SdfPathPattern::SdfPathPattern()
+    : _isProperty(false)
+{
+}
+
+SdfPathPattern::SdfPathPattern(SdfPath &&prefix)
+{
+    SetPrefix(std::move(prefix));
+}
+
+SdfPathPattern::SdfPathPattern(SdfPath const &prefix)
+    : SdfPathPattern(SdfPath(prefix))
+{
+}
+
+// private ctor, does no validation.
+SdfPathPattern::SdfPathPattern(SdfPath prefix,
+                               std::vector<Component> &&components,
+                               std::vector<SdfPredicateExpression> &&predExprs,
+                               bool isProperty)
+    : _prefix(std::move(prefix))
+    , _components(std::move(components))
+    , _predExprs(std::move(predExprs))
+    , _isProperty(isProperty)
+{
+}
+
+SdfPathPattern const &
+SdfPathPattern::Everything()
+{
+    static SdfPathPattern const *theEverything =
+        new SdfPathPattern(SdfPath::AbsoluteRootPath(), {{}}, {}, false);
+    return *theEverything;
+}
+
+SdfPathPattern const &
+SdfPathPattern::EveryDescendant()
+{
+    static SdfPathPattern const *theEveryDescendant =
+        new SdfPathPattern(SdfPath::ReflexiveRelativePath(), {{}}, {}, false);
+    return *theEveryDescendant;
+}
+
+static inline bool
+IsLiteralProperty(std::string const &text)
+{
+    return SdfPath::IsValidNamespacedIdentifier(text);
+}
+
+static inline bool
+IsLiteralPrim(std::string const &text)
+{
+    return SdfPath::IsValidIdentifier(text);
+}
+
+bool
+SdfPathPattern::CanAppendChild(std::string const &text,
+                               SdfPredicateExpression const &predExpr,
+                               std::string *reason) const
+{
+    auto setReason = [reason](auto ...args) {
+        if (reason) { *reason = TfStringPrintf(args...); }
+    };
+    
+    if (_isProperty) {
+        setReason("Cannot append child '%s' to a property path pattern '%s'",
+                  text.c_str(), GetText().c_str());
+        return false;
+    }
+
+    if (text.empty() && !predExpr && HasTrailingStretch()) {
+        setReason("Cannot append stretch to a path pattern that has trailing "
+                  "stretch '%s'", GetText().c_str());
+        return false;
+    }
+
+    return true;
+}
+
+SdfPathPattern &
+SdfPathPattern::AppendChild(std::string const &text)
+{
+    return AppendChild(text, {});
+}
+
+SdfPathPattern &
+SdfPathPattern::AppendChild(std::string const &text,
+                            SdfPredicateExpression const &predExpr)
+{
+    return AppendChild(text, SdfPredicateExpression(predExpr));
+}
+
+
+SdfPathPattern &
+SdfPathPattern::AppendChild(std::string const &text,
+                            SdfPredicateExpression &&predExpr)
+{
+    std::string reason;
+    if (!CanAppendChild(text, predExpr, &reason)) {
+        TF_WARN(reason);
+        return *this;
+    }
+                
+    if (_prefix.IsEmpty()) {
+        _prefix = SdfPath::ReflexiveRelativePath();
+    }
+    
+    bool isLiteral = IsLiteralPrim(text);
+    if ((isLiteral || text == "..") && !predExpr && _components.empty()) {
+        _prefix = _prefix.AppendChild(TfToken(text));
+    }
+    else {
+        int predIndex = -1;
+        if (predExpr) {
+            predIndex = static_cast<int>(_predExprs.size());
+            _predExprs.push_back(std::move(predExpr));
+        }
+        _components.push_back({ text, predIndex, isLiteral });
+    }
+    return *this;
+}
+
+SdfPathPattern &
+SdfPathPattern::AppendStretchIfPossible() {
+    if (CanAppendChild({})) {
+        AppendChild({});
+    }
+    return *this;
+}
+
+bool
+SdfPathPattern::HasLeadingStretch() const
+{
+    return GetPrefix().IsAbsoluteRootPath() &&
+        !_components.empty() && _components.front().IsStretch();
+}
+
+bool
+SdfPathPattern::HasTrailingStretch() const
+{
+    return !_isProperty &&
+        !_components.empty() && _components.back().IsStretch();
+}
+
+SdfPathPattern &
+SdfPathPattern::RemoveTrailingStretch()
+{
+    if (HasTrailingStretch()) {
+        // We don't have to do all the other work that RemoveTrailingComponent()
+        // has to do, since a stretch component doesn't have a predicate, and
+        // cannot be a property pattern.
+        _components.pop_back();
+    }
+    return *this;
+}
+
+SdfPathPattern &
+SdfPathPattern::RemoveTrailingComponent()
+{
+    if (!_components.empty()) {
+        // If this component has a predicate, it must be the last one.
+        const int predIndex = _components.back().predicateIndex;
+        if (predIndex >= 0) {
+            if (TF_VERIFY(
+                    static_cast<size_t>(predIndex) == _predExprs.size()-1)) {
+                _predExprs.pop_back();
+            }
+        }
+        // If this pattern identified a property, it no longer will.
+        if (_isProperty) {
+            _isProperty = false;
+        }
+        // Remove the final component.
+        _components.pop_back();
+    }
+    return *this;
+}
+
+bool
+SdfPathPattern::CanAppendProperty(std::string const &text,
+                                  SdfPredicateExpression const &predExpr,
+                                  std::string *reason) const
+{
+    auto setReason = [reason](auto ...args) {
+        if (reason) { *reason = TfStringPrintf(args...); }
+    };
+    
+    if (_isProperty) {
+        setReason("Cannot append additional property '%s' to property path "
+                  "pattern '%s'", text.c_str(), GetText().c_str());
+        return false;
+    }
+
+    if (text.empty() && !predExpr) {
+        setReason("Cannot append empty property element to path pattern '%s'",
+                  GetText().c_str());
+        return false;
+    }
+
+    return true;
+}
+
+SdfPathPattern &
+SdfPathPattern::AppendProperty(std::string const &text)
+{
+    return AppendProperty(text, {});
+}
+
+SdfPathPattern &
+SdfPathPattern::AppendProperty(std::string const &text,
+                               SdfPredicateExpression const &predExpr)
+{
+    return AppendProperty(text, SdfPredicateExpression(predExpr));
+}
+
+SdfPathPattern &
+SdfPathPattern::AppendProperty(std::string const &text,
+                               SdfPredicateExpression &&predExpr)
+{
+    std::string reason;
+    if (!CanAppendProperty(text, predExpr, &reason)) {
+        TF_WARN(reason);
+        return *this;
+    }
+
+    if (_prefix.IsEmpty()) {
+        _prefix = SdfPath::ReflexiveRelativePath();
+    }
+
+    bool isLiteral = IsLiteralProperty(text);
+    if (isLiteral && !predExpr && _components.empty()) {
+        _prefix = _prefix.AppendProperty(TfToken(text));
+    }
+    else {
+        // If this path ends with a stretch component, we have to append a
+        // wildcard prim child component first.  That is, AppendProperty('/x//',
+        // 'foo') -> '/x//*.foo'.
+        if (HasTrailingStretch()) {
+            AppendChild("*");
+        }
+        int predIndex = -1;
+        if (predExpr) {
+            predIndex = static_cast<int>(_predExprs.size());
+            _predExprs.push_back(std::move(predExpr));
+        }
+        _components.push_back({ text, predIndex, isLiteral });
+    }
+    _isProperty = true;
+    return *this;
+}
+
+SdfPathPattern &
+SdfPathPattern::SetPrefix(SdfPath &&p)
+{
+    // If we have any components at all, then p must be a prim path or the
+    // absolute root path.  Otherwise it can be a prim or prim property path.
+    if (!_components.empty()) {
+        if (!p.IsAbsoluteRootOrPrimPath()) {
+            TF_WARN("Path patterns with match components require "
+                    "prim paths or the absolute root path ('/') as a prefix: "
+                    "<%s> -- ignoring.", p.GetAsString().c_str());
+            return *this;
+        }
+    }
+    else {
+        if (!(p.IsAbsoluteRootOrPrimPath() || p.IsPrimPropertyPath())) { 
+            TF_WARN("Path pattern prefixes must be prim paths or prim-property "
+                    "paths: <%s> -- ignoring.", p.GetAsString().c_str());
+            return *this;
+        }
+    }
+    _prefix = std::move(p);
+    if (_components.empty()) {
+        _isProperty = _prefix.IsPrimPropertyPath();
+    }
+    return *this;
+}
+
+std::string
+SdfPathPattern::GetText() const
+{
+    std::string result;
+
+    if (_prefix == SdfPath::ReflexiveRelativePath()) {
+        if (_components.empty() || _components.front().IsStretch()) {
+            // If components is empty, or first component is a stretch, then we
+            // emit a leading '.', otherwise nothing.
+            result = ".";
+        }
+    }
+    else {
+        result = _prefix.GetAsString();
+    }
+
+    const bool prefixIsAbsRoot = _prefix == SdfPath::AbsoluteRootPath();
+    for (size_t i = 0, end = _components.size(); i != end; ++i) {
+        if (_components[i].IsStretch()) {
+            result += (i == 0 && prefixIsAbsRoot) ? "/" : "//";
+            continue;
+        }
+        if ((i + 1 == end) && _isProperty) {
+            result.push_back('.');
+        }
+        else if (!result.empty() && result.back() != '/') {
+            result.push_back('/');
+        }
+        result += _components[i].text;
+        if (_components[i].predicateIndex != -1) {
+            result += "{" + _predExprs[
+                _components[i].predicateIndex].GetText() + "}";
+        }
+    }
+    return result;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/sdf/pathPattern.h b/pxr/usd/sdf/pathPattern.h
new file mode 100644
index 0000000000..7011e0c18a
--- /dev/null
+++ b/pxr/usd/sdf/pathPattern.h
@@ -0,0 +1,295 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_USD_SDF_PATH_PATTERN_H
+#define PXR_USD_SDF_PATH_PATTERN_H
+
+#include "pxr/pxr.h"
+#include "pxr/usd/sdf/api.h"
+#include "pxr/usd/sdf/path.h"
+#include "pxr/usd/sdf/predicateExpression.h"
+#include "pxr/base/tf/hash.h"
+
+#include <iosfwd>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class SdfPathPattern
+///
+/// Objects of this class represent SdfPath matching patterns, consisting of
+/// an SdfPath prefix followed by a sequence of components, which may
+/// contain wildcards and optional embedded predicate expressions (see
+/// SdfPredicateExpression).
+class SdfPathPattern
+{
+public:
+    /// Construct the empty pattern whose bool-conversion operator returns
+    /// false.
+    SDF_API
+    SdfPathPattern();
+
+    /// Construct a SdfPathPattern with the \p prefix path.
+    SDF_API
+    explicit SdfPathPattern(SdfPath const &prefix);
+    
+    /// Construct a SdfPathPattern with the \p prefix path.
+    SDF_API
+    explicit SdfPathPattern(SdfPath &&prefix);
+
+    /// Return the pattern "//" which matches all paths.
+    SDF_API
+    static SdfPathPattern const &Everything();
+
+    /// Return the pattern ".//" which matches all paths descendant to an anchor
+    /// path.
+    SDF_API
+    static SdfPathPattern const &EveryDescendant();
+
+    /// Return a default constructed SdfPathPattern that matches nothing.
+    static SdfPathPattern Nothing() {
+        return {};
+    }
+
+    /// A component represents a pattern matching component past the initial
+    /// SdfPath prefix.  A component's text can contain wildcard characters, and
+    /// if the component references a predicate expression, its predicateIndex
+    /// indicates which one in the owning SdfPathPattern's list of expressions.
+    /// A component that returns true for IsStretch() represents an "arbitrary
+    /// levels of hierarchy" element (the "//") in a path pattern.
+    struct Component {
+        bool IsStretch() const {
+            return predicateIndex == -1 && text.empty();
+        }
+
+        std::string text;
+        int predicateIndex = -1;
+        bool isLiteral = false;
+
+        friend bool operator==(Component const &l, Component const &r) {
+            return std::tie(l.text, l.predicateIndex, l.isLiteral) ==
+                std::tie(r.text, r.predicateIndex, r.isLiteral);
+        }
+        
+        friend bool operator!=(Component const &l, Component const &r) {
+            return !(l == r);
+        }
+
+        template <class HashState>
+        friend void TfHashAppend(HashState &h, Component const &c) {
+            h.Append(c.text, c.predicateIndex, c.isLiteral);
+        }
+
+        friend void swap(Component &l, Component &r) {
+            auto lt = std::tie(l.text, l.predicateIndex, l.isLiteral);
+            auto rt = std::tie(r.text, r.predicateIndex, r.isLiteral);
+            swap(lt, rt);
+        }
+    };
+
+    /// Return true if it is valid to append the child element \p text to this
+    /// pattern.  If not, and \p reason is not nullptr, set it to an explanatory
+    /// reason why not.
+    bool CanAppendChild(std::string const &text,
+                        std::string *reason = nullptr) const {
+        return CanAppendChild(text, {}, reason);
+    }
+
+    /// Return true if it is valid to append the child element \p text and \p
+    /// predExpr to this pattern.  If not, and \p reason is not nullptr, set it
+    /// to an explanatory reason why not.
+    SDF_API
+    bool CanAppendChild(std::string const &text,
+                        SdfPredicateExpression const &predExpr,
+                        std::string *reason = nullptr) const;
+
+    /// Append a prim child component to this pattern, with optional
+    /// predicate expression \p predExpr.  If this pattern does not yet
+    /// contain any wildcards or components with predicate expressions, and
+    /// the input text does not contain wildcards, and \p predExpr is empty,
+    /// then append a child component to this pattern's prefix path (see
+    /// GetPrefix()).  Otherwise append this component to the sequence of
+    /// components.  Return *this.
+    SDF_API
+    SdfPathPattern &AppendChild(std::string const &text,
+                                SdfPredicateExpression &&predExpr);
+    /// \overload
+    SDF_API
+    SdfPathPattern &AppendChild(std::string const &text,
+                                SdfPredicateExpression const &predExpr);
+    /// \overload
+    SDF_API
+    SdfPathPattern &AppendChild(std::string const &text);
+
+    /// Return true if it is valid to append the property element \p text to
+    /// this pattern.  If not, and \p reason is not nullptr, set it to an
+    /// explanatory reason why not.
+    bool CanAppendProperty(std::string const &text,
+                           std::string *reason = nullptr) const {
+        return CanAppendProperty(text, {}, reason);
+    }
+
+    /// Return true if it is valid to append the property element \p text and \p
+    /// predExpr to this pattern.  If not, and \p reason is not nullptr, set it
+    /// to an explanatory reason why not.
+    SDF_API
+    bool CanAppendProperty(std::string const &text,
+                           SdfPredicateExpression const &predExpr,
+                           std::string *reason = nullptr) const;
+
+    /// Append a prim property component to this pattern, with optional
+    /// predicate expression \p predExpr.  If this pattern does not yet
+    /// contain any wildcards or components with predicate expressions, and
+    /// the input text does not contain wildcards, and \p predExpr is empty,
+    /// then append a property component to this pattern's prefix path (see
+    /// GetPrefix()). Otherwise append this component to the sequence of
+    /// components.  Return *this.
+    SDF_API
+    SdfPathPattern &AppendProperty(std::string const &text,
+                                   SdfPredicateExpression &&predExpr);
+    /// \overload
+    SDF_API
+    SdfPathPattern &AppendProperty(std::string const &text,
+                                   SdfPredicateExpression const &predExpr);
+    /// \overload
+    SDF_API
+    SdfPathPattern &AppendProperty(std::string const &text);
+
+    /// Return this pattern's non-speculative prefix (leading path
+    /// components with no wildcards and no predicates).
+    SdfPath const &GetPrefix() const & {
+        return _prefix;
+    }
+
+    /// \overload
+    SdfPath GetPrefix() && {
+        return std::move(_prefix);
+    }
+
+    /// Set this pattern's non-speculative prefix (leading path
+    /// components with no wildcards and no predicates).  Return *this.
+    SDF_API
+    SdfPathPattern &SetPrefix(SdfPath &&p);
+
+    /// \overload
+    SdfPathPattern &SetPrefix(SdfPath const &p) {
+        return SetPrefix(SdfPath(p));
+    }
+
+    /// Return true if this pattern's prefix is the absolute root path and and
+    /// its first component is a stretch component -- that is, the pattern
+    /// starts with `//`, false otherwise.
+    SDF_API
+    bool HasLeadingStretch() const;
+
+    /// Return true if this pattern ends with a stretch component: `//`, false
+    /// otherwise.
+    SDF_API
+    bool HasTrailingStretch() const;
+
+    /// Append a stretch component (i.e. `//`) to this pattern if it's possible
+    /// to do so.  Otherwise do nothing.  It is not possible to append a stretch
+    /// component to a pattern that already ends in a stretch component, or a
+    /// pattern that identifies a property.  Return *this.
+    SDF_API
+    SdfPathPattern &AppendStretchIfPossible();
+
+    /// Remove trailing stretch from this pattern if it has trailing stretch.
+    /// Otherwise do nothing.  Return *this.  See HasTrailingStretch().
+    SDF_API
+    SdfPathPattern &RemoveTrailingStretch();
+
+    /// If this pattern has components, remove the final component.  Otherwise
+    /// do nothing.  Return *this.  To inspect and modify the prefix path, use
+    /// GetPrefix(), SetPrefix().
+    SDF_API
+    SdfPathPattern &RemoveTrailingComponent();
+
+    /// Return the string representation of this pattern.
+    SDF_API
+    std::string GetText() const;
+
+    /// Return this pattern's components that follow its non-speculative prefix
+    /// path.
+    std::vector<Component> const &GetComponents() const & {
+        return _components;
+    }
+
+    /// \overload
+    std::vector<Component> GetComponents() && {
+        return std::move(_components);
+    }
+
+    /// Return the predicate expressions used by this pattern.  These are
+    /// indexed by a Component's predicateIndex member, if it is not -1.
+    std::vector<SdfPredicateExpression> const &
+    GetPredicateExprs() const & {
+        return _predExprs;
+    }
+
+    /// \overload
+    std::vector<SdfPredicateExpression>
+    GetPredicateExprs() && {
+        return std::move(_predExprs);
+    }
+
+    /// Return true if this pattern identifies properties exclusively, false
+    /// otherwise.
+    bool IsProperty() const {
+        return _isProperty;
+    }
+
+    /// Return true if this pattern is not empty, false if it is.
+    explicit operator bool() const {
+        return !_prefix.IsEmpty();
+    }
+
+private:
+    SdfPathPattern(SdfPath prefix,
+                   std::vector<Component> &&components,
+                   std::vector<SdfPredicateExpression> &&predExprs,
+                   bool isProperty);
+    
+    template <class HashState>
+    friend void TfHashAppend(HashState &h, SdfPathPattern const &pat) {
+        h.Append(pat._prefix, pat._components,
+                 pat._predExprs, pat._isProperty);
+    }
+
+    friend bool
+    operator==(SdfPathPattern const &l, SdfPathPattern const &r) {
+        return std::tie(l._prefix, l._components,
+                        l._predExprs, l._isProperty) ==
+               std::tie(r._prefix, r._components,
+                        r._predExprs, r._isProperty);
+    }
+
+    friend bool
+    operator!=(SdfPathPattern const &l, SdfPathPattern const &r) {
+        return !(l == r);
+    }
+
+    friend void swap(SdfPathPattern &l, SdfPathPattern &r) {
+        auto lt = std::tie(
+            l._prefix, l._components, l._predExprs, l._isProperty);
+        auto rt = std::tie(
+            r._prefix, r._components, r._predExprs, r._isProperty);
+        swap(lt, rt);
+    }
+    
+    SdfPath _prefix;
+    std::vector<Component> _components;
+    std::vector<SdfPredicateExpression> _predExprs;
+    bool _isProperty;
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_USD_SDF_PATH_PATTERN_H
diff --git a/pxr/usd/sdf/pathPatternParser.h b/pxr/usd/sdf/pathPatternParser.h
new file mode 100644
index 0000000000..0d930999c3
--- /dev/null
+++ b/pxr/usd/sdf/pathPatternParser.h
@@ -0,0 +1,207 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef PXR_USD_SDF_PATH_PATTERN_PARSER_H
+#define PXR_USD_SDF_PATH_PATTERN_PARSER_H
+
+#include "pxr/pxr.h"
+
+#include "pxr/usd/sdf/predicateExpressionParser.h"
+#include "pxr/base/pegtl/pegtl.hpp"
+
+#include <memory>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+namespace SdfPathPatternParser {
+
+using namespace PXR_PEGTL_NAMESPACE;
+
+template <class Rule, class Sep>
+using LookaheadList = seq<Rule, star<at<Sep, Rule>, Sep, Rule>>;
+
+template <class Rule> using OptSpaced = pad<Rule, blank>;
+
+////////////////////////////////////////////////////////////////////////
+// Path patterns with predicates.
+struct PathPatStretch : two<'/'> {};
+struct PathPatSep : sor<PathPatStretch, one<'/'>> {};
+
+struct BracedPredExpr
+    : if_must<one<'{'>,
+              OptSpaced<SdfPredicateExpressionParser::PredExpr>,
+              one<'}'>> {};
+
+struct PrimPathWildCard :
+    seq<
+    plus<sor<identifier_other, one<'?','*'>>>,
+    opt<one<'['>,plus<sor<identifier_other, one<'[',']','!','-','?','*'>>>>
+    > {};
+
+struct PropPathWildCard :
+    seq<
+    plus<sor<identifier_other, one<':','?','*'>>>,
+    opt<one<'['>,plus<sor<identifier_other, one<':','[',']','!','-','?','*'>>>>
+    > {};
+
+struct PrimPathPatternElemText : PrimPathWildCard {};
+struct PropPathPatternElemText : PropPathWildCard {};
+
+struct PrimPathPatternElem
+    : if_then_else<PrimPathPatternElemText, opt<BracedPredExpr>,
+                   BracedPredExpr> {};
+
+struct PropPathPatternElem
+    : if_then_else<PropPathPatternElemText, opt<BracedPredExpr>,
+                   BracedPredExpr> {};
+
+struct PathPatternElems
+    : seq<LookaheadList<PrimPathPatternElem, PathPatSep>,
+          if_must_else<one<'.'>, PropPathPatternElem, opt<PathPatStretch>>> {};
+
+struct AbsPathPattern : seq<PathPatSep, opt<PathPatternElems>> {};
+
+struct DotDot : two<'.'> {};
+struct DotDots : list<DotDot, one<'/'>> {};
+
+struct ReflexiveRelative : one<'.'> {};
+
+struct AbsoluteStart : at<one<'/'>> {};
+
+struct PathPattern :
+    sor<
+    if_must<AbsoluteStart, AbsPathPattern>,
+    seq<DotDots, if_then_else<PathPatSep, opt<PathPatternElems>, success>>,
+    PathPatternElems,
+    seq<ReflexiveRelative, opt<PathPatStretch, opt<PathPatternElems>>>
+    >
+{};
+
+} // SdfPathPatternParser
+
+
+namespace SdfPathPatternActions {
+
+using namespace PXR_PEGTL_NAMESPACE;
+
+using namespace SdfPathPatternParser;
+
+// Actions /////////////////////////////////////////////////////////////
+
+struct PatternBuilder
+{
+    // The final resulting pattern winds up here.
+    SdfPathPattern pattern;
+
+    // These are used during parsing.
+    std::string curElemText;
+    SdfPredicateExpression curPredExpr;
+};
+
+
+template <class Rule>
+struct PathPatternAction : nothing<Rule> {};
+
+template <>
+struct PathPatternAction<AbsoluteStart>
+{
+    template <class Input>
+    static void apply(Input const &in, PatternBuilder &builder) {
+        builder.pattern.SetPrefix(SdfPath::AbsoluteRootPath());
+    }
+};
+
+template <>
+struct PathPatternAction<PathPatStretch>
+{
+    template <class Input>
+    static void apply(Input const &in, PatternBuilder &builder) {
+        // '//' appends a component representing arbitrary hierarchy.
+        TF_VERIFY(builder.pattern.AppendStretchIfPossible());
+    }
+};
+
+// Change action & state to the PredicateExpressionParser so it can parse &
+// build a predicate expression for us.
+template <>
+struct PathPatternAction<SdfPredicateExpressionParser::PredExpr>
+    : change_action_and_states<SdfPredicateExpressionParser::PredAction,
+                               SdfPredicateExprBuilder>
+{
+    template <class Input>
+    static void success(Input const &in,
+                        SdfPredicateExprBuilder &predExprBuilder,
+                        PatternBuilder &builder) {
+        builder.curPredExpr = predExprBuilder.Finish();
+    }
+};
+
+template <>
+struct PathPatternAction<PrimPathPatternElemText>
+{
+    template <class Input>
+    static void apply(Input const &in, PatternBuilder &builder) {
+        builder.curElemText = in.string();
+    }
+};
+
+template <>
+struct PathPatternAction<PropPathPatternElemText>
+{
+    template <class Input>
+    static void apply(Input const &in, PatternBuilder &builder) {
+        builder.curElemText = in.string();
+    }
+};
+
+template <>
+struct PathPatternAction<PrimPathPatternElem>
+{
+    template <class Input>
+    static void apply(Input const &in, PatternBuilder &builder) {
+        builder.pattern.AppendChild(builder.curElemText, builder.curPredExpr);
+        builder.curElemText.clear();
+        builder.curPredExpr = SdfPredicateExpression();
+    }
+};
+
+template <>
+struct PathPatternAction<PropPathPatternElem>
+{
+    template <class Input>
+    static void apply(Input const &in, PatternBuilder &builder) {
+        builder.pattern.AppendProperty(builder.curElemText,
+                                       builder.curPredExpr);
+        builder.curElemText.clear();
+        builder.curPredExpr = SdfPredicateExpression();
+    }
+};
+
+template <>
+struct PathPatternAction<ReflexiveRelative>
+{
+    template <class Input>
+    static void apply(Input const &in, PatternBuilder &builder) {
+        builder.pattern.SetPrefix(SdfPath::ReflexiveRelativePath());
+    }
+};
+
+template <>
+struct PathPatternAction<DotDot>
+{
+    template <class Input>
+    static void apply(Input const &in, PatternBuilder &builder) {
+        builder.pattern.AppendChild("..");
+    }
+};
+
+} // SdfPathPatternActions
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_USD_SDF_PATH_PATTERN_PARSER_H
+
diff --git a/pxr/usd/sdf/pathTable.cpp b/pxr/usd/sdf/pathTable.cpp
index 320a4ccbfb..708198a40a 100644
--- a/pxr/usd/sdf/pathTable.cpp
+++ b/pxr/usd/sdf/pathTable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/pathTable.h b/pxr/usd/sdf/pathTable.h
index 008400c96c..86e863bb96 100644
--- a/pxr/usd/sdf/pathTable.h
+++ b/pxr/usd/sdf/pathTable.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PATH_TABLE_H
 #define PXR_USD_SDF_PATH_TABLE_H
diff --git a/pxr/usd/sdf/payload.cpp b/pxr/usd/sdf/payload.cpp
index a2e0c15841..d16608df01 100644
--- a/pxr/usd/sdf/payload.cpp
+++ b/pxr/usd/sdf/payload.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Payload.cpp
 //
diff --git a/pxr/usd/sdf/payload.h b/pxr/usd/sdf/payload.h
index b30616c4f3..c4bfd1f4c8 100644
--- a/pxr/usd/sdf/payload.h
+++ b/pxr/usd/sdf/payload.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PAYLOAD_H
 #define PXR_USD_SDF_PAYLOAD_H
diff --git a/pxr/usd/sdf/pch.h b/pxr/usd/sdf/pch.h
index 0728ebe683..8776157f2b 100644
--- a/pxr/usd/sdf/pch.h
+++ b/pxr/usd/sdf/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,12 +31,17 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <cctype>
+#include <cfloat>
 #include <cinttypes>
 #include <climits>
 #include <cmath>
@@ -66,9 +54,11 @@
 #include <ctime>
 #include <deque>
 #include <fcntl.h>
+#include <float.h>
 #include <fstream>
 #include <functional>
 #include <initializer_list>
+#include <iomanip>
 #include <iosfwd>
 #include <iostream>
 #include <iterator>
@@ -81,6 +71,7 @@
 #include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
 #include <sstream>
@@ -89,78 +80,22 @@
 #include <stdexcept>
 #include <stdint.h>
 #include <string>
+#include <string_view>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/assign.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/enum_params.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/if.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repeat.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/ptr_container/ptr_map.hpp>
-#include <boost/ptr_container/ptr_set.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/function.hpp>
+#include <boost/mpl/vector.hpp>
 #include <boost/python.hpp>
 #include <boost/python/bases.hpp>
 #include <boost/python/call.hpp>
@@ -198,8 +133,11 @@
 #include <boost/python/return_arg.hpp>
 #include <boost/python/return_by_value.hpp>
 #include <boost/python/scope.hpp>
+#include <boost/python/signature.hpp>
 #include <boost/python/slice.hpp>
+#include <boost/python/stl_iterator.hpp>
 #include <boost/python/str.hpp>
+#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
@@ -208,24 +146,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/has_left_shift.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
@@ -238,6 +158,8 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
+#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/sdf/pool.cpp b/pxr/usd/sdf/pool.cpp
index 0b43794b7f..8fd1432151 100644
--- a/pxr/usd/sdf/pool.cpp
+++ b/pxr/usd/sdf/pool.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/pool.h b/pxr/usd/sdf/pool.h
index a803d32d48..8e6f6c8d84 100644
--- a/pxr/usd/sdf/pool.h
+++ b/pxr/usd/sdf/pool.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_POOL_H
 #define PXR_USD_SDF_POOL_H
diff --git a/pxr/usd/sdf/predicateExpression.cpp b/pxr/usd/sdf/predicateExpression.cpp
index ab56183c95..a96cbbd13e 100644
--- a/pxr/usd/sdf/predicateExpression.cpp
+++ b/pxr/usd/sdf/predicateExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -255,13 +238,13 @@ operator<<(std::ostream &out, SdfPredicateExpression const &expr)
 SdfPredicateExpression::SdfPredicateExpression(
     std::string const &input, std::string const &context)
 {
-    using namespace tao::TAO_PEGTL_NAMESPACE;
+    using namespace PXR_PEGTL_NAMESPACE;
 
-    Analyze<PredExpr>();
     try {
         SdfPredicateExprBuilder builder;
         // Uncomment the 'tracer' bit below for debugging.
-        parse<must<seq<PredExpr, eolf>>, PredAction/*, tracer*/>(
+        parse<must<seq<SdfPredicateExpressionParser::PredExpr, eolf>>,
+              SdfPredicateExpressionParser::PredAction/*, tracer*/>(
             string_input<> {
                 input, context.empty() ? "<input>" : context.c_str()
             }, builder);
@@ -272,7 +255,7 @@ SdfPredicateExpression::SdfPredicateExpression(
         std::string errMsg = err.what();
         errMsg += " -- ";
         bool first = true;
-        for (position const &p: err.positions) {
+        for (position const &p: err.positions()) {
             if (!first) {
                 errMsg += ", ";
             }
diff --git a/pxr/usd/sdf/predicateExpression.h b/pxr/usd/sdf/predicateExpression.h
index 622d7a0281..71223652ad 100644
--- a/pxr/usd/sdf/predicateExpression.h
+++ b/pxr/usd/sdf/predicateExpression.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PREDICATE_EXPRESSION_H
 #define PXR_USD_SDF_PREDICATE_EXPRESSION_H
diff --git a/pxr/usd/sdf/predicateExpressionParser.h b/pxr/usd/sdf/predicateExpressionParser.h
index 4c532436bf..8255983ffa 100644
--- a/pxr/usd/sdf/predicateExpressionParser.h
+++ b/pxr/usd/sdf/predicateExpressionParser.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_SDF_PREDICATE_EXPRESSION_PARSER_H
@@ -31,7 +14,7 @@
 #include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/vt/value.h"
 
-#include "pxr/base/tf/pxrPEGTL/pegtl.h"
+#include "pxr/base/pegtl/pegtl.hpp"
 
 #include <memory>
 
@@ -160,9 +143,9 @@ struct SdfPredicateExprBuilder
 ////////////////////////////////////////////////////////////////////////
 // Grammar.
 
-namespace {
+namespace SdfPredicateExpressionParser {
 
-using namespace tao::TAO_PEGTL_NAMESPACE;
+using namespace PXR_PEGTL_NAMESPACE;
 
 template <class Rule, class Sep>
 using LookaheadList = seq<Rule, star<at<Sep, Rule>, Sep, Rule>>;
@@ -401,15 +384,6 @@ template <> struct PredAction<PredParenCall>
 template <> struct PredAction<PredColonCall>
     : PredCallAction<SdfPredicateExpression::FnCall::ColonCall> {};
 
-template <class Grammar>
-static void Analyze() {
-    static const size_t numIssues = analyze<Grammar>();
-    if (numIssues) {
-        TF_FATAL_ERROR("%zu issues found in '%s'", numIssues,
-                       TF_FUNC_NAME().c_str());
-    }
-}
-
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/sdf/predicateLibrary.cpp b/pxr/usd/sdf/predicateLibrary.cpp
index 68c7c23d01..d7117b6998 100644
--- a/pxr/usd/sdf/predicateLibrary.cpp
+++ b/pxr/usd/sdf/predicateLibrary.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/predicateLibrary.h b/pxr/usd/sdf/predicateLibrary.h
index 3070732439..4c07ae12f4 100644
--- a/pxr/usd/sdf/predicateLibrary.h
+++ b/pxr/usd/sdf/predicateLibrary.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PREDICATE_LIBRARY_H
 #define PXR_USD_SDF_PREDICATE_LIBRARY_H
@@ -33,7 +16,6 @@
 #include "pxr/base/vt/value.h"
 
 #include "pxr/usd/sdf/predicateExpression.h"
-#include "pxr/usd/sdf/invoke.hpp"
 
 #include <initializer_list>
 #include <memory>
@@ -653,10 +635,9 @@ class SdfPredicateLibrary
                 std::integral_constant<bool, TakesArbitraryArgs> {},
                 args, boundArgs, typedArgs);
             return [typedArgs, fn](DomainType const &obj) {
-                // invoke fn with obj & typedArgs. (std::apply in '17).
                 return SdfPredicateFunctionResult {
-                    invoke_hpp::apply(fn, std::tuple_cat(
-                                          std::make_tuple(obj), typedArgs))
+                    std::apply(fn, 
+                        std::tuple_cat(std::make_tuple(obj), typedArgs))
                 };
             };
         }
diff --git a/pxr/usd/sdf/predicateProgram.h b/pxr/usd/sdf/predicateProgram.h
index 4fb8ee3881..02ec25cbd6 100644
--- a/pxr/usd/sdf/predicateProgram.h
+++ b/pxr/usd/sdf/predicateProgram.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PREDICATE_PROGRAM_H
 #define PXR_USD_SDF_PREDICATE_PROGRAM_H
@@ -33,7 +16,6 @@
 
 #include "pxr/usd/sdf/predicateExpression.h"
 #include "pxr/usd/sdf/predicateLibrary.h"
-#include "pxr/usd/sdf/invoke.hpp"
 
 #include <initializer_list>
 #include <memory>
diff --git a/pxr/usd/sdf/primSpec.cpp b/pxr/usd/sdf/primSpec.cpp
index 86a383ef4b..a23de69c62 100644
--- a/pxr/usd/sdf/primSpec.cpp
+++ b/pxr/usd/sdf/primSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file PrimSpec.cpp
 
diff --git a/pxr/usd/sdf/primSpec.h b/pxr/usd/sdf/primSpec.h
index 7dd4af65c9..b4f243eaa1 100644
--- a/pxr/usd/sdf/primSpec.h
+++ b/pxr/usd/sdf/primSpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PRIM_SPEC_H
 #define PXR_USD_SDF_PRIM_SPEC_H
diff --git a/pxr/usd/sdf/propertySpec.cpp b/pxr/usd/sdf/propertySpec.cpp
index c6ee26f181..4276c6403a 100644
--- a/pxr/usd/sdf/propertySpec.cpp
+++ b/pxr/usd/sdf/propertySpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/propertySpec.h b/pxr/usd/sdf/propertySpec.h
index 7eba83edc5..cee3948d93 100644
--- a/pxr/usd/sdf/propertySpec.h
+++ b/pxr/usd/sdf/propertySpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PROPERTY_SPEC_H
 #define PXR_USD_SDF_PROPERTY_SPEC_H
diff --git a/pxr/usd/sdf/proxyPolicies.cpp b/pxr/usd/sdf/proxyPolicies.cpp
index 7db7215fac..a5b9455543 100644
--- a/pxr/usd/sdf/proxyPolicies.cpp
+++ b/pxr/usd/sdf/proxyPolicies.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file ProxyPolicies.cpp
 
diff --git a/pxr/usd/sdf/proxyPolicies.h b/pxr/usd/sdf/proxyPolicies.h
index 35c6aecd55..e6d465790f 100644
--- a/pxr/usd/sdf/proxyPolicies.h
+++ b/pxr/usd/sdf/proxyPolicies.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PROXY_POLICIES_H
 #define PXR_USD_SDF_PROXY_POLICIES_H
diff --git a/pxr/usd/sdf/proxyTypes.cpp b/pxr/usd/sdf/proxyTypes.cpp
index cad4eb55fe..5a000cd464 100644
--- a/pxr/usd/sdf/proxyTypes.cpp
+++ b/pxr/usd/sdf/proxyTypes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Types.cpp
 //
diff --git a/pxr/usd/sdf/proxyTypes.h b/pxr/usd/sdf/proxyTypes.h
index 7974c0ef52..69553a5e95 100644
--- a/pxr/usd/sdf/proxyTypes.h
+++ b/pxr/usd/sdf/proxyTypes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PROXY_TYPES_H
 #define PXR_USD_SDF_PROXY_TYPES_H
diff --git a/pxr/usd/sdf/pseudoRootSpec.cpp b/pxr/usd/sdf/pseudoRootSpec.cpp
index dfc79c49b4..faf4a6a4cf 100644
--- a/pxr/usd/sdf/pseudoRootSpec.cpp
+++ b/pxr/usd/sdf/pseudoRootSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file PseudoRootSpec.cpp
 
diff --git a/pxr/usd/sdf/pseudoRootSpec.h b/pxr/usd/sdf/pseudoRootSpec.h
index 320ed33ff2..2b9d55c36e 100644
--- a/pxr/usd/sdf/pseudoRootSpec.h
+++ b/pxr/usd/sdf/pseudoRootSpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PSEUDO_ROOT_SPEC_H
 #define PXR_USD_SDF_PSEUDO_ROOT_SPEC_H
diff --git a/pxr/usd/sdf/pyChildrenProxy.cpp b/pxr/usd/sdf/pyChildrenProxy.cpp
index 02207a8f83..47b7785504 100644
--- a/pxr/usd/sdf/pyChildrenProxy.cpp
+++ b/pxr/usd/sdf/pyChildrenProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file PyChildrenProxy.cpp
 
diff --git a/pxr/usd/sdf/pyChildrenProxy.h b/pxr/usd/sdf/pyChildrenProxy.h
index 5b13a9825c..0ad8e9be42 100644
--- a/pxr/usd/sdf/pyChildrenProxy.h
+++ b/pxr/usd/sdf/pyChildrenProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PY_CHILDREN_PROXY_H
 #define PXR_USD_SDF_PY_CHILDREN_PROXY_H
diff --git a/pxr/usd/sdf/pyChildrenView.cpp b/pxr/usd/sdf/pyChildrenView.cpp
index 6d2ee78943..31ed1ff657 100644
--- a/pxr/usd/sdf/pyChildrenView.cpp
+++ b/pxr/usd/sdf/pyChildrenView.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file PyChildrenView.cpp
 #include "pxr/usd/sdf/pyChildrenView.h"
diff --git a/pxr/usd/sdf/pyChildrenView.h b/pxr/usd/sdf/pyChildrenView.h
index c52ca7cb6a..b817bee01f 100644
--- a/pxr/usd/sdf/pyChildrenView.h
+++ b/pxr/usd/sdf/pyChildrenView.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PY_CHILDREN_VIEW_H
 #define PXR_USD_SDF_PY_CHILDREN_VIEW_H
diff --git a/pxr/usd/sdf/pyListEditorProxy.cpp b/pxr/usd/sdf/pyListEditorProxy.cpp
index eab9c848ba..8adceb5f2a 100644
--- a/pxr/usd/sdf/pyListEditorProxy.cpp
+++ b/pxr/usd/sdf/pyListEditorProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file PyListEditorProxy.cpp
 
diff --git a/pxr/usd/sdf/pyListEditorProxy.h b/pxr/usd/sdf/pyListEditorProxy.h
index 738eacc7b8..13d39645ec 100644
--- a/pxr/usd/sdf/pyListEditorProxy.h
+++ b/pxr/usd/sdf/pyListEditorProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PY_LIST_EDITOR_PROXY_H
 #define PXR_USD_SDF_PY_LIST_EDITOR_PROXY_H
diff --git a/pxr/usd/sdf/pyListOp.cpp b/pxr/usd/sdf/pyListOp.cpp
index df1c0d3caa..a0a83fda0d 100644
--- a/pxr/usd/sdf/pyListOp.cpp
+++ b/pxr/usd/sdf/pyListOp.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/sdf/pyListOp.h"
diff --git a/pxr/usd/sdf/pyListOp.h b/pxr/usd/sdf/pyListOp.h
index aab9017f5d..66170b7db0 100644
--- a/pxr/usd/sdf/pyListOp.h
+++ b/pxr/usd/sdf/pyListOp.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PY_LIST_OP_H
 #define PXR_USD_SDF_PY_LIST_OP_H
diff --git a/pxr/usd/sdf/pyListProxy.cpp b/pxr/usd/sdf/pyListProxy.cpp
index 9bcb42a2c4..aa34c7bfd8 100644
--- a/pxr/usd/sdf/pyListProxy.cpp
+++ b/pxr/usd/sdf/pyListProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file PyListProxy.cpp
 
diff --git a/pxr/usd/sdf/pyListProxy.h b/pxr/usd/sdf/pyListProxy.h
index afffe7ddb7..d8d3620192 100644
--- a/pxr/usd/sdf/pyListProxy.h
+++ b/pxr/usd/sdf/pyListProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PY_LIST_PROXY_H
 #define PXR_USD_SDF_PY_LIST_PROXY_H
@@ -81,6 +64,7 @@ class SdfPyWrapListProxy {
             .def("ApplyList", &Type::ApplyList)
             .def("ApplyEditsToList", &This::_ApplyEditsToList)
             .add_property("expired", &This::_IsExpired)
+            .add_static_property("invalidIndex", &This::_GetInvalidIndex)
             .def(self == self)
             .def(self != self)
             .def(self <  self)
@@ -234,13 +218,24 @@ class SdfPyWrapListProxy {
         }
     }
 
+    static int _GetInvalidIndex()
+    {
+        // Note that SdfListProxy::Find returns an unsigned value, however the 
+        // wrapped class returns -1 in the event that a value could not be found
+        // in the list of operations.
+        return -1;
+    }
+
     static int _FindIndex(const Type& x, const value_type& value)
     {
         if (x._Validate()) {
-            return static_cast<int>(x.Find(value));
+            const size_t index = x.Find(value);
+            return index == Type::invalidIndex 
+                ? _GetInvalidIndex() 
+                : static_cast<int>(index); 
         }
         else {
-            return -1;
+            return _GetInvalidIndex();
         }
     }
 
diff --git a/pxr/usd/sdf/pyMapEditProxy.cpp b/pxr/usd/sdf/pyMapEditProxy.cpp
index 7585cd3d6c..7eaf69cdfc 100644
--- a/pxr/usd/sdf/pyMapEditProxy.cpp
+++ b/pxr/usd/sdf/pyMapEditProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file PyMapEditProxy.cpp
 
diff --git a/pxr/usd/sdf/pyMapEditProxy.h b/pxr/usd/sdf/pyMapEditProxy.h
index 62fe3c0520..566ede3a87 100644
--- a/pxr/usd/sdf/pyMapEditProxy.h
+++ b/pxr/usd/sdf/pyMapEditProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PY_MAP_EDIT_PROXY_H
 #define PXR_USD_SDF_PY_MAP_EDIT_PROXY_H
diff --git a/pxr/usd/sdf/pySpec.cpp b/pxr/usd/sdf/pySpec.cpp
index f66e88f59b..98ed665bb9 100644
--- a/pxr/usd/sdf/pySpec.cpp
+++ b/pxr/usd/sdf/pySpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file PySpec.cpp
 
diff --git a/pxr/usd/sdf/pySpec.h b/pxr/usd/sdf/pySpec.h
index bd35de8fc9..306d67233f 100644
--- a/pxr/usd/sdf/pySpec.h
+++ b/pxr/usd/sdf/pySpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_USD_SDF_PY_SPEC_H
 #define PXR_USD_SDF_PY_SPEC_H
diff --git a/pxr/usd/sdf/pyUtils.cpp b/pxr/usd/sdf/pyUtils.cpp
index 654f9c01e0..4a869a5bd4 100644
--- a/pxr/usd/sdf/pyUtils.cpp
+++ b/pxr/usd/sdf/pyUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/pyUtils.h b/pxr/usd/sdf/pyUtils.h
index 4106cd6835..7f439e5887 100644
--- a/pxr/usd/sdf/pyUtils.h
+++ b/pxr/usd/sdf/pyUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_PY_UTILS_H
 #define PXR_USD_SDF_PY_UTILS_H
diff --git a/pxr/usd/sdf/reference.cpp b/pxr/usd/sdf/reference.cpp
index 4d1f3f4e8a..82040f1e32 100644
--- a/pxr/usd/sdf/reference.cpp
+++ b/pxr/usd/sdf/reference.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Reference.cpp
 //
diff --git a/pxr/usd/sdf/reference.h b/pxr/usd/sdf/reference.h
index 7824ea7e1b..2e0810148c 100644
--- a/pxr/usd/sdf/reference.h
+++ b/pxr/usd/sdf/reference.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_REFERENCE_H
 #define PXR_USD_SDF_REFERENCE_H
diff --git a/pxr/usd/sdf/relationshipSpec.cpp b/pxr/usd/sdf/relationshipSpec.cpp
index 888487ef1e..66546418fa 100644
--- a/pxr/usd/sdf/relationshipSpec.cpp
+++ b/pxr/usd/sdf/relationshipSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file RelationshipSpec.cpp
 
diff --git a/pxr/usd/sdf/relationshipSpec.h b/pxr/usd/sdf/relationshipSpec.h
index 62e675b784..36f5f8a804 100644
--- a/pxr/usd/sdf/relationshipSpec.h
+++ b/pxr/usd/sdf/relationshipSpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_RELATIONSHIP_SPEC_H
 #define PXR_USD_SDF_RELATIONSHIP_SPEC_H
diff --git a/pxr/usd/sdf/schema.cpp b/pxr/usd/sdf/schema.cpp
index e5e98f2a73..ac37301847 100644
--- a/pxr/usd/sdf/schema.cpp
+++ b/pxr/usd/sdf/schema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -394,7 +377,8 @@ SDF_VALIDATE_WRAPPER(InheritPath, SdfPath);
 SDF_VALIDATE_WRAPPER(Payload, SdfPayload);
 SDF_VALIDATE_WRAPPER(Reference, SdfReference);
 SDF_VALIDATE_WRAPPER(RelationshipTargetPath, SdfPath);
-SDF_VALIDATE_WRAPPER(RelocatesPath, SdfPath);
+SDF_VALIDATE_WRAPPER(RelocatesSourcePath, SdfPath);
+SDF_VALIDATE_WRAPPER(RelocatesTargetPath, SdfPath);
 SDF_VALIDATE_WRAPPER(Relocate, SdfRelocate);
 SDF_VALIDATE_WRAPPER(SpecializesPath, SdfPath);
 SDF_VALIDATE_WRAPPER(SubLayer, std::string);
@@ -788,8 +772,8 @@ SdfSchemaBase::_RegisterStandardFields()
     _DoRegisterField(SdfFieldKeys->LayerRelocates, SdfRelocates())
         .ListValueValidator(&_ValidateRelocate);
     _DoRegisterField(SdfFieldKeys->Relocates, SdfRelocatesMap())
-        .MapKeyValidator(&_ValidateRelocatesPath)
-        .MapValueValidator(&_ValidateRelocatesPath);
+        .MapKeyValidator(&_ValidateRelocatesSourcePath)
+        .MapValueValidator(&_ValidateRelocatesTargetPath);
     _DoRegisterField(SdfFieldKeys->Specifier, SdfSpecifierOver);
     _DoRegisterField(SdfFieldKeys->StartFrame, 0.0);
     _DoRegisterField(SdfFieldKeys->StartTimeCode, 0.0);
@@ -1343,7 +1327,7 @@ SdfSchemaBase::IsValidVariantSelection(const std::string& sel)
 }
 
 SdfAllowed 
-SdfSchemaBase::IsValidRelocatesPath(const SdfPath& path)
+SdfSchemaBase::IsValidRelocatesSourcePath(const SdfPath& path)
 {
     if (_PathContainsProhibitedVariantSelection(path)) {
         return SdfAllowed("Relocate paths cannot contain "
@@ -1357,13 +1341,25 @@ SdfSchemaBase::IsValidRelocatesPath(const SdfPath& path)
     return true;
 }
 
+SdfAllowed 
+SdfSchemaBase::IsValidRelocatesTargetPath(const SdfPath& path)
+{
+    // Relocates target paths are allowed to be empty but source paths are not.
+    if (path.IsEmpty()) {
+        return true;
+    }
+    return IsValidRelocatesSourcePath(path);
+}
+
 SdfAllowed 
 SdfSchemaBase::IsValidRelocate(const SdfRelocate &relocate)
 {
-    if (SdfAllowed isValid = IsValidRelocatesPath(relocate.first); !isValid) {
+    if (SdfAllowed isValid = IsValidRelocatesSourcePath(relocate.first);
+            !isValid) {
         return isValid;
     }
-    if (SdfAllowed isValid = IsValidRelocatesPath(relocate.second); !isValid) {
+    if (SdfAllowed isValid = IsValidRelocatesTargetPath(relocate.second);
+            !isValid) {
         return isValid;
     }
 
diff --git a/pxr/usd/sdf/schema.h b/pxr/usd/sdf/schema.h
index 3f4ce64a1b..63571b5d70 100644
--- a/pxr/usd/sdf/schema.h
+++ b/pxr/usd/sdf/schema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_SCHEMA_H
 #define PXR_USD_SDF_SCHEMA_H
@@ -307,7 +290,9 @@ class SdfSchemaBase : public TfWeakBase {
     SDF_API 
     static SdfAllowed IsValidRelationshipTargetPath(const SdfPath& path);
     SDF_API 
-    static SdfAllowed IsValidRelocatesPath(const SdfPath& path);
+    static SdfAllowed IsValidRelocatesSourcePath(const SdfPath& path);
+    SDF_API 
+    static SdfAllowed IsValidRelocatesTargetPath(const SdfPath& path);
     SDF_API 
     static SdfAllowed IsValidRelocate(const SdfRelocate& relocate);
     SDF_API 
diff --git a/pxr/usd/sdf/schemaTypeRegistration.h b/pxr/usd/sdf/schemaTypeRegistration.h
index 3c662fb9c0..74c6ab29bf 100644
--- a/pxr/usd/sdf/schemaTypeRegistration.h
+++ b/pxr/usd/sdf/schemaTypeRegistration.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_SCHEMA_TYPE_REGISTRATION_H
 #define PXR_USD_SDF_SCHEMA_TYPE_REGISTRATION_H
diff --git a/pxr/usd/sdf/sdfGenAsciiParsers.py b/pxr/usd/sdf/sdfGenAsciiParsers.py
index 653b66b5dd..d41dff04b8 100644
--- a/pxr/usd/sdf/sdfGenAsciiParsers.py
+++ b/pxr/usd/sdf/sdfGenAsciiParsers.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # A script for generating the ascii parser files for Sdf.
 # This takes the flex and bison sources in Sdf and generates C++
@@ -145,25 +128,8 @@ def _runBisonAndFlexCommands(configuration):
     "//"
     , "// Copyright 2016 Pixar"
     , "//"
-    , "// Licensed under the Apache License, Version 2.0 (the \"Apache License\")"
-    , "// with the following modification; you may not use this file except in"
-    , "// compliance with the Apache License and the following modification to it:"
-    , "// Section 6. Trademarks. is deleted and replaced with:"
-    , "//"
-    , "// 6. Trademarks. This License does not grant permission to use the trade"
-    , "//    names, trademarks, service marks, or product names of the Licensor"
-    , "//    and its affiliates, except as required to comply with Section 4(c) of"
-    , "//    the License and to reproduce the content of the NOTICE file."
-    , "//"
-    , "// You may obtain a copy of the Apache License at"
-    , "//"
-    , "//     http://www.apache.org/licenses/LICENSE-2.0"
-    , "//"
-    , "// Unless required by applicable law or agreed to in writing, software"
-    , "// distributed under the Apache License with the above modification is"
-    , "// distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
-    , "// KIND, either express or implied. See the Apache License for the specific"
-    , "// language governing permissions and limitations under the Apache License."
+    , "// Licensed under the terms set forth in the LICENSE.txt file available at"
+    , "// https://openusd.org/license."
     , "//\n"])
 
     for generatedFile in generatedFiles:
diff --git a/pxr/usd/sdf/site.cpp b/pxr/usd/sdf/site.cpp
index a9fc13d737..9ed17ee071 100644
--- a/pxr/usd/sdf/site.cpp
+++ b/pxr/usd/sdf/site.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/sdf/site.h"
diff --git a/pxr/usd/sdf/site.h b/pxr/usd/sdf/site.h
index c2d1b40464..382fc0224f 100644
--- a/pxr/usd/sdf/site.h
+++ b/pxr/usd/sdf/site.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_SITE_H
 #define PXR_USD_SDF_SITE_H
diff --git a/pxr/usd/sdf/siteUtils.cpp b/pxr/usd/sdf/siteUtils.cpp
index cd7cebb831..c7b3394cf9 100644
--- a/pxr/usd/sdf/siteUtils.cpp
+++ b/pxr/usd/sdf/siteUtils.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/sdf/siteUtils.h"
diff --git a/pxr/usd/sdf/siteUtils.h b/pxr/usd/sdf/siteUtils.h
index b5258a5f56..390d43934a 100644
--- a/pxr/usd/sdf/siteUtils.h
+++ b/pxr/usd/sdf/siteUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_SITE_UTILS_H
 #define PXR_USD_SDF_SITE_UTILS_H
diff --git a/pxr/usd/sdf/spec.cpp b/pxr/usd/sdf/spec.cpp
index 564db2bc18..79197374e9 100644
--- a/pxr/usd/sdf/spec.cpp
+++ b/pxr/usd/sdf/spec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/spec.h b/pxr/usd/sdf/spec.h
index cacc871fc2..1488cb79ea 100644
--- a/pxr/usd/sdf/spec.h
+++ b/pxr/usd/sdf/spec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_SPEC_H
 #define PXR_USD_SDF_SPEC_H
diff --git a/pxr/usd/sdf/specType.cpp b/pxr/usd/sdf/specType.cpp
index 37b3057633..f8f7a439e7 100644
--- a/pxr/usd/sdf/specType.cpp
+++ b/pxr/usd/sdf/specType.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file SpecType.cpp
 
diff --git a/pxr/usd/sdf/specType.h b/pxr/usd/sdf/specType.h
index 61f652ea3b..77962294ac 100644
--- a/pxr/usd/sdf/specType.h
+++ b/pxr/usd/sdf/specType.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_SPEC_TYPE_H
 #define PXR_USD_SDF_SPEC_TYPE_H
diff --git a/pxr/usd/sdf/subLayerListEditor.cpp b/pxr/usd/sdf/subLayerListEditor.cpp
index 85a0bc8167..f3d3d217ab 100644
--- a/pxr/usd/sdf/subLayerListEditor.cpp
+++ b/pxr/usd/sdf/subLayerListEditor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file SubLayerListEditor.cpp
 
diff --git a/pxr/usd/sdf/subLayerListEditor.h b/pxr/usd/sdf/subLayerListEditor.h
index 4bba4acaf6..32b250664c 100644
--- a/pxr/usd/sdf/subLayerListEditor.h
+++ b/pxr/usd/sdf/subLayerListEditor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_SUB_LAYER_LIST_EDITOR_H
 #define PXR_USD_SDF_SUB_LAYER_LIST_EDITOR_H
diff --git a/pxr/usd/sdf/testenv/TestSdfFileFormatCapabilities.cpp b/pxr/usd/sdf/testenv/TestSdfFileFormatCapabilities.cpp
index e25f7541bf..643c0e918b 100644
--- a/pxr/usd/sdf/testenv/TestSdfFileFormatCapabilities.cpp
+++ b/pxr/usd/sdf/testenv/TestSdfFileFormatCapabilities.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/staticTokens.h"
diff --git a/pxr/usd/sdf/testenv/TestSdfNoAssetFileFormat.cpp b/pxr/usd/sdf/testenv/TestSdfNoAssetFileFormat.cpp
index a8737f2b97..62ead4b071 100644
--- a/pxr/usd/sdf/testenv/TestSdfNoAssetFileFormat.cpp
+++ b/pxr/usd/sdf/testenv/TestSdfNoAssetFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/staticTokens.h"
diff --git a/pxr/usd/sdf/testenv/TestSdfResolver.cpp b/pxr/usd/sdf/testenv/TestSdfResolver.cpp
index 264ce49646..fe5ac8a522 100644
--- a/pxr/usd/sdf/testenv/TestSdfResolver.cpp
+++ b/pxr/usd/sdf/testenv/TestSdfResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/sdf/testenv/TestSdfStreamingFileFormat.cpp b/pxr/usd/sdf/testenv/TestSdfStreamingFileFormat.cpp
index 56ed9bd4a7..9acc37ec97 100644
--- a/pxr/usd/sdf/testenv/TestSdfStreamingFileFormat.cpp
+++ b/pxr/usd/sdf/testenv/TestSdfStreamingFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/sdf/testenv/TestSdfTargetFileFormat.cpp b/pxr/usd/sdf/testenv/TestSdfTargetFileFormat.cpp
index bcc6a340dd..eb4239d848 100644
--- a/pxr/usd/sdf/testenv/TestSdfTargetFileFormat.cpp
+++ b/pxr/usd/sdf/testenv/TestSdfTargetFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/staticTokens.h"
diff --git a/pxr/usd/sdf/testenv/testSdfAssetPath.py b/pxr/usd/sdf/testenv/testSdfAssetPath.py
index 1d9b4f9726..c0221aef8e 100644
--- a/pxr/usd/sdf/testenv/testSdfAssetPath.py
+++ b/pxr/usd/sdf/testenv/testSdfAssetPath.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/sdf/testenv/testSdfAttribute.py b/pxr/usd/sdf/testenv/testSdfAttribute.py
index d09017ed60..8704f09e25 100644
--- a/pxr/usd/sdf/testenv/testSdfAttribute.py
+++ b/pxr/usd/sdf/testenv/testSdfAttribute.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=range-builtin-not-iterating
 
diff --git a/pxr/usd/sdf/testenv/testSdfAttributeBlocking.cpp b/pxr/usd/sdf/testenv/testSdfAttributeBlocking.cpp
index 6c7675343d..8e44964776 100644
--- a/pxr/usd/sdf/testenv/testSdfAttributeBlocking.cpp
+++ b/pxr/usd/sdf/testenv/testSdfAttributeBlocking.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include <string>
diff --git a/pxr/usd/sdf/testenv/testSdfAttributeBlocking.py b/pxr/usd/sdf/testenv/testSdfAttributeBlocking.py
index a38f6ed736..623ec1b203 100644
--- a/pxr/usd/sdf/testenv/testSdfAttributeBlocking.py
+++ b/pxr/usd/sdf/testenv/testSdfAttributeBlocking.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 import unittest
diff --git a/pxr/usd/sdf/testenv/testSdfBatchNamespaceEdit.py b/pxr/usd/sdf/testenv/testSdfBatchNamespaceEdit.py
index 6a9c05827c..acdd6ba3dd 100644
--- a/pxr/usd/sdf/testenv/testSdfBatchNamespaceEdit.py
+++ b/pxr/usd/sdf/testenv/testSdfBatchNamespaceEdit.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/sdf/testenv/testSdfColorConfig.py b/pxr/usd/sdf/testenv/testSdfColorConfig.py
index 21b2dac7fb..727249a7fc 100644
--- a/pxr/usd/sdf/testenv/testSdfColorConfig.py
+++ b/pxr/usd/sdf/testenv/testSdfColorConfig.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 import unittest
diff --git a/pxr/usd/sdf/testenv/testSdfCopyUtils.py b/pxr/usd/sdf/testenv/testSdfCopyUtils.py
index 6a2b452fc7..aad2266746 100644
--- a/pxr/usd/sdf/testenv/testSdfCopyUtils.py
+++ b/pxr/usd/sdf/testenv/testSdfCopyUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 import textwrap, unittest
diff --git a/pxr/usd/sdf/testenv/testSdfCustomLayerData.py b/pxr/usd/sdf/testenv/testSdfCustomLayerData.py
index 80bd67db5f..98cf0938d0 100644
--- a/pxr/usd/sdf/testenv/testSdfCustomLayerData.py
+++ b/pxr/usd/sdf/testenv/testSdfCustomLayerData.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 import unittest
diff --git a/pxr/usd/sdf/testenv/testSdfDetachedLayer.py b/pxr/usd/sdf/testenv/testSdfDetachedLayer.py
index a80428b625..e8f079eeed 100644
--- a/pxr/usd/sdf/testenv/testSdfDetachedLayer.py
+++ b/pxr/usd/sdf/testenv/testSdfDetachedLayer.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, unittest
 
diff --git a/pxr/usd/sdf/testenv/testSdfFileFormat.py b/pxr/usd/sdf/testenv/testSdfFileFormat.py
index d33488f58e..1b8badd6a1 100644
--- a/pxr/usd/sdf/testenv/testSdfFileFormat.py
+++ b/pxr/usd/sdf/testenv/testSdfFileFormat.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/sdf/testenv/testSdfFileFormatCapabilities.py b/pxr/usd/sdf/testenv/testSdfFileFormatCapabilities.py
index 3f912e1c8a..144da3f920 100644
--- a/pxr/usd/sdf/testenv/testSdfFileFormatCapabilities.py
+++ b/pxr/usd/sdf/testenv/testSdfFileFormatCapabilities.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 import os, tempfile, unittest
diff --git a/pxr/usd/sdf/testenv/testSdfHardToReach.cpp b/pxr/usd/sdf/testenv/testSdfHardToReach.cpp
index f9a07fd008..7184497337 100644
--- a/pxr/usd/sdf/testenv/testSdfHardToReach.cpp
+++ b/pxr/usd/sdf/testenv/testSdfHardToReach.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/attributeSpec.h"
@@ -115,6 +98,36 @@ _TestSdfLayerTimeSampleValueType()
     TF_AXIOM(vtValue.UncheckedGet<double>() == 4.0);
 }
 
+static void
+_TestSdfLayerTransferContentsEmptyLayer()
+{
+    // Tests that setting data on non empty layers properly cleans up all
+    // specs in that layer without the use of SdfLayer::_IsInertSubtree
+    const char* layerStr = 
+    R"(#sdf 1.4.32
+    def "Root"{
+        def "Node1" (
+            prepend variantSets = "testVariants"
+            variants = { string testVariants = "option1" }
+        )
+        {
+            variantSet "testVariants" = {
+                "option1" {
+                    def "VariantChild" {}
+                }
+            }
+            def "Node1Child" {}
+        }
+    })";
+
+    SdfLayerRefPtr srcLayer = SdfLayer::CreateAnonymous();
+    srcLayer->ImportFromString(layerStr);
+    TF_AXIOM(!srcLayer->IsEmpty());
+    
+    srcLayer->TransferContent(SdfLayer::CreateAnonymous());
+    TF_AXIOM(srcLayer->IsEmpty());
+}
+
 static void
 _TestSdfLayerTransferContents()
 {
@@ -467,13 +480,23 @@ _TestSdfSchemaPathValidation()
     TF_AXIOM(!schema.IsValidReference(SdfReference("a.sdf", 
                                                    SdfPath("/A{x=y}B"))));
 
-    TF_AXIOM(schema.IsValidRelocatesPath(SdfPath("A")));
-    TF_AXIOM(schema.IsValidRelocatesPath(SdfPath("/A")));
-    TF_AXIOM(schema.IsValidRelocatesPath(SdfPath("/A/B")));
-    TF_AXIOM(!schema.IsValidRelocatesPath(SdfPath()));
-    TF_AXIOM(!schema.IsValidRelocatesPath(SdfPath("/A.a")));
-    TF_AXIOM(!schema.IsValidRelocatesPath(SdfPath("/A{x=y}")));
-    TF_AXIOM(!schema.IsValidRelocatesPath(SdfPath("/A{x=y}B")));
+    TF_AXIOM(schema.IsValidRelocatesSourcePath(SdfPath("A")));
+    TF_AXIOM(schema.IsValidRelocatesSourcePath(SdfPath("/A")));
+    TF_AXIOM(schema.IsValidRelocatesSourcePath(SdfPath("/A/B")));
+    TF_AXIOM(!schema.IsValidRelocatesSourcePath(SdfPath()));
+    TF_AXIOM(!schema.IsValidRelocatesSourcePath(SdfPath("/A.a")));
+    TF_AXIOM(!schema.IsValidRelocatesSourcePath(SdfPath("/A{x=y}")));
+    TF_AXIOM(!schema.IsValidRelocatesSourcePath(SdfPath("/A{x=y}B")));
+
+    // IsValidRelocatesTargetPath is the same as IsValidRelocatesSourcePath
+    // except that the empty path is allowed for target paths.
+    TF_AXIOM(schema.IsValidRelocatesTargetPath(SdfPath("A")));
+    TF_AXIOM(schema.IsValidRelocatesTargetPath(SdfPath("/A")));
+    TF_AXIOM(schema.IsValidRelocatesTargetPath(SdfPath("/A/B")));
+    TF_AXIOM(schema.IsValidRelocatesTargetPath(SdfPath()));
+    TF_AXIOM(!schema.IsValidRelocatesTargetPath(SdfPath("/A.a")));
+    TF_AXIOM(!schema.IsValidRelocatesTargetPath(SdfPath("/A{x=y}")));
+    TF_AXIOM(!schema.IsValidRelocatesTargetPath(SdfPath("/A{x=y}B")));
 }
 
 static void 
@@ -525,6 +548,7 @@ main(int argc, char **argv)
     _TestSdfLayerDictKeyOps();
     _TestSdfLayerTimeSampleValueType();
     _TestSdfLayerTransferContents();
+    _TestSdfLayerTransferContentsEmptyLayer();
     _TestSdfRelationshipTargetSpecEdits();
     _TestSdfPathFindLongestPrefix();
     _TestSdfFpsAndTcps();
diff --git a/pxr/usd/sdf/testenv/testSdfLayer.py b/pxr/usd/sdf/testenv/testSdfLayer.py
index 965ad144ef..af75b00a5e 100644
--- a/pxr/usd/sdf/testenv/testSdfLayer.py
+++ b/pxr/usd/sdf/testenv/testSdfLayer.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, platform, itertools, sys, unittest
 
@@ -930,6 +913,37 @@ def test_OpenCloseThreadSafety(self):
                 completed = sum(1 if f.result() else 0 for f in
                                 concurrent.futures.as_completed(futures))
             self.assertEqual(completed, OPENS)
+    
+    def test_DefaultPrim(self):
+        layer = Sdf.Layer.CreateAnonymous()
+        
+        # Set defaultPrim
+        layer.defaultPrim = '/foo'
+        self.assertEqual(layer.GetDefaultPrimAsPath(), '/foo')
+
+        # Set the defaultPrim by name, should return path
+        layer.defaultPrim = 'bar'
+        Sdf.CreatePrimInLayer(layer, '/bar')
+        self.assertEqual(layer.GetDefaultPrimAsPath(), '/bar')
+
+        # Set sub-root prims as default, should return path
+        layer.defaultPrim = 'foo/bar'
+        Sdf.CreatePrimInLayer(layer, '/foo/bar')
+        self.assertEqual(layer.GetDefaultPrimAsPath(), '/foo/bar')
+
+        # Set invalid prim path as default, should return empty path
+        layer.defaultPrim = 'foo.bar'
+        self.assertEqual(layer.GetDefaultPrimAsPath(), '')
+        # Set invalid path as default, should return empty path
+        layer.defaultPrim = '//'
+        self.assertEqual(layer.GetDefaultPrimAsPath(), '')
+        layer.defaultPrim = ''
+        self.assertEqual(layer.GetDefaultPrimAsPath(), '')
+
+        # Try layer-level authoring API.
+        self.assertTrue(layer.HasDefaultPrim())
+        layer.ClearDefaultPrim()
+        self.assertFalse(layer.HasDefaultPrim())
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/pxr/usd/sdf/testenv/testSdfLayerHints.cpp b/pxr/usd/sdf/testenv/testSdfLayerHints.cpp
index 694cfcd868..4fc5ebb5e0 100644
--- a/pxr/usd/sdf/testenv/testSdfLayerHints.cpp
+++ b/pxr/usd/sdf/testenv/testSdfLayerHints.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/sdf/testenv/testSdfLayerMuting.py b/pxr/usd/sdf/testenv/testSdfLayerMuting.py
index 2c83f7ad16..bcd82132fd 100644
--- a/pxr/usd/sdf/testenv/testSdfLayerMuting.py
+++ b/pxr/usd/sdf/testenv/testSdfLayerMuting.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 import unittest
diff --git a/pxr/usd/sdf/testenv/testSdfListOp.py b/pxr/usd/sdf/testenv/testSdfListOp.py
index 2a44e5ca86..9cec8858ff 100644
--- a/pxr/usd/sdf/testenv/testSdfListOp.py
+++ b/pxr/usd/sdf/testenv/testSdfListOp.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 import unittest, itertools
diff --git a/pxr/usd/sdf/testenv/testSdfMetaDataPlugInfo.cpp b/pxr/usd/sdf/testenv/testSdfMetaDataPlugInfo.cpp
index 52f7b83398..d371d1b677 100644
--- a/pxr/usd/sdf/testenv/testSdfMetaDataPlugInfo.cpp
+++ b/pxr/usd/sdf/testenv/testSdfMetaDataPlugInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/sdf/testenv/testSdfParsing.py b/pxr/usd/sdf/testenv/testSdfParsing.py
index 42e7deb4c4..cdf573ea5f 100644
--- a/pxr/usd/sdf/testenv/testSdfParsing.py
+++ b/pxr/usd/sdf/testenv/testSdfParsing.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # This tests a set of sample sdf files that are either expected to load
 # successfully, or to emit warnings.  Files with _bad_ in the name are
diff --git a/pxr/usd/sdf/testenv/testSdfParsing.testenv/139_relocates_metadata.sdf b/pxr/usd/sdf/testenv/testSdfParsing.testenv/139_relocates_metadata.sdf
index 6dbd61f7c0..6a21c2b5e0 100644
--- a/pxr/usd/sdf/testenv/testSdfParsing.testenv/139_relocates_metadata.sdf
+++ b/pxr/usd/sdf/testenv/testSdfParsing.testenv/139_relocates_metadata.sdf
@@ -6,7 +6,8 @@
     relocates = {
         </source> : </target>, 
         </absolute> : <some/nested/relative/path>,
-        <relative/path> : <some/other/relative/path>
+        <relative/path> : <some/other/relative/path>,
+        <to/delete> : <>
     }
 )
 
@@ -16,7 +17,8 @@ def MfScope "TestPrim" (
     relocates = {
         </source> : </target>, 
         </absolute> : <some/nested/relative/path>,
-        <relative/path> : <some/other/relative/path>
+        <relative/path> : <some/other/relative/path>,
+        <to/delete> : <>
     }
 )
 {
diff --git a/pxr/usd/sdf/testenv/testSdfParsing.testenv/baseline/139_relocates_metadata.sdf b/pxr/usd/sdf/testenv/testSdfParsing.testenv/baseline/139_relocates_metadata.sdf
index d42bec4a55..a69b0c3846 100644
--- a/pxr/usd/sdf/testenv/testSdfParsing.testenv/baseline/139_relocates_metadata.sdf
+++ b/pxr/usd/sdf/testenv/testSdfParsing.testenv/baseline/139_relocates_metadata.sdf
@@ -5,7 +5,8 @@
     relocates = {
         </source>: </target>, 
         </absolute>: </some/nested/relative/path>, 
-        </relative/path>: </some/other/relative/path>
+        </relative/path>: </some/other/relative/path>, 
+        </to/delete>: <>
     }
 )
 
@@ -13,7 +14,8 @@ def MfScope "TestPrim" (
     relocates = {
         <../absolute>: <some/nested/relative/path>, 
         <../source>: <../target>, 
-        <relative/path>: <some/other/relative/path>
+        <relative/path>: <some/other/relative/path>, 
+        <to/delete>: <>
     }
 )
 {
diff --git a/pxr/usd/sdf/testenv/testSdfPath.py b/pxr/usd/sdf/testenv/testSdfPath.py
index 9d1589e89a..ebcf6cdc52 100644
--- a/pxr/usd/sdf/testenv/testSdfPath.py
+++ b/pxr/usd/sdf/testenv/testSdfPath.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/sdf/testenv/testSdfPath2.py b/pxr/usd/sdf/testenv/testSdfPath2.py
index 3964c6f286..bbbb16048b 100644
--- a/pxr/usd/sdf/testenv/testSdfPath2.py
+++ b/pxr/usd/sdf/testenv/testSdfPath2.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, traceback, unittest
 from pxr import Sdf, Tf
diff --git a/pxr/usd/sdf/testenv/testSdfPath2Construct.py b/pxr/usd/sdf/testenv/testSdfPath2Construct.py
index 16077b7220..55913ed082 100644
--- a/pxr/usd/sdf/testenv/testSdfPath2Construct.py
+++ b/pxr/usd/sdf/testenv/testSdfPath2Construct.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, traceback, unittest
 from pxr import Sdf
diff --git a/pxr/usd/sdf/testenv/testSdfPathExpression.cpp b/pxr/usd/sdf/testenv/testSdfPathExpression.cpp
index 35c44c1c09..0bd2714163 100644
--- a/pxr/usd/sdf/testenv/testSdfPathExpression.cpp
+++ b/pxr/usd/sdf/testenv/testSdfPathExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/errorMark.h"
@@ -27,6 +10,7 @@
 #include "pxr/usd/sdf/path.h"
 #include "pxr/usd/sdf/pathExpression.h"
 #include "pxr/usd/sdf/pathExpressionEval.h"
+#include "pxr/usd/sdf/pathPattern.h"
 #include "pxr/usd/sdf/predicateLibrary.h"
 
 PXR_NAMESPACE_USING_DIRECTIVE
@@ -68,6 +52,16 @@ struct MatchEval {
 static void
 TestBasics()
 {
+    {
+        // Allow leading & trailing whitespace.
+        TF_AXIOM(SdfPathExpression("  /foo//bar").GetText() == "/foo//bar");
+        TF_AXIOM(SdfPathExpression("  /foo//bar ").GetText() == "/foo//bar");
+        TF_AXIOM(SdfPathExpression("/foo//bar ").GetText() == "/foo//bar");
+        TF_AXIOM(SdfPathExpression("  /foo /bar").GetText() == "/foo /bar");
+        TF_AXIOM(SdfPathExpression("  /foo /bar ").GetText() == "/foo /bar");
+        TF_AXIOM(SdfPathExpression("/foo /bar ").GetText() == "/foo /bar");
+    }
+    
     {
         auto eval = MatchEval { SdfPathExpression("/foo//bar") };
         
@@ -77,8 +71,19 @@ TestBasics()
         TF_AXIOM(!eval.Match(SdfPath("/foo/x/y/z/bar/baz")));
         TF_AXIOM(!eval.Match(SdfPath("/foo/x/y/z/bar.baz")));
         TF_AXIOM(!eval.Match(SdfPath("/foo/x/y/z/bar.baz:buz")));
+        TF_AXIOM(!eval.Match(SdfPath("/foo.bar")));
+        TF_AXIOM(!eval.Match(SdfPath("/foo/x/y/z.bar")));
     }
     
+    {
+        auto eval = MatchEval { SdfPathExpression("/foo/bar/*") };
+        
+        TF_AXIOM(!eval.Match(SdfPath("/foo/bar"))); 
+        TF_AXIOM(eval.Match(SdfPath("/foo/bar/x")));
+        TF_AXIOM(eval.Match(SdfPath("/foo/bar/y")));
+        TF_AXIOM(!eval.Match(SdfPath("/foo/bar/x/y")));
+    }
+
     {
         auto eval = MatchEval { SdfPathExpression("//foo/bar/baz/qux/quux") };
         
@@ -447,6 +452,65 @@ TestSearch()
 
 }
 
+static void
+TestPathPattern()
+{
+    SdfPathPattern pat;
+
+    TF_AXIOM(!pat);
+    TF_AXIOM(!pat.HasTrailingStretch());
+    TF_AXIOM(pat.GetPrefix().IsEmpty());
+    TF_AXIOM(pat.CanAppendChild({})); // Can append stretch.
+    TF_AXIOM(pat.AppendChild({}));
+    TF_AXIOM(pat == SdfPathPattern::EveryDescendant());
+    TF_AXIOM(pat.HasTrailingStretch());
+    TF_AXIOM(pat.GetPrefix() == SdfPath::ReflexiveRelativePath());
+    TF_AXIOM(!pat.HasLeadingStretch());
+
+    // Set prefix to '/', should become Everything().
+    pat.SetPrefix(SdfPath::AbsoluteRootPath());
+    TF_AXIOM(pat == SdfPathPattern::Everything());
+    TF_AXIOM(pat.HasLeadingStretch());
+    TF_AXIOM(pat.HasTrailingStretch());
+
+    // Remove trailing stretch, should become just '/'
+    pat.RemoveTrailingStretch();
+    TF_AXIOM(!pat.HasLeadingStretch());
+    TF_AXIOM(!pat.HasTrailingStretch());
+    TF_AXIOM(pat.GetPrefix() == SdfPath::AbsoluteRootPath());
+    TF_AXIOM(pat.GetComponents().empty());
+
+    // Add some components.
+    pat.AppendChild("foo").AppendChild("bar").AppendChild("baz");
+    // This should have modified the prefix path, rather than appending matching
+    // components.
+    TF_AXIOM(pat.GetPrefix() == SdfPath("/foo/bar/baz"));
+
+    pat.AppendStretchIfPossible().AppendProperty("prop");
+
+    // Appending a property to a pattern with trailing stretch has to append a
+    // prim wildcard '*'.
+    TF_AXIOM(pat.IsProperty());
+    TF_AXIOM(pat.GetComponents().size() == 3);
+    TF_AXIOM(pat.GetComponents()[0].text.empty());
+    TF_AXIOM(pat.GetComponents()[1].text == "*");
+    TF_AXIOM(pat.GetComponents()[2].text == "prop");
+
+    TF_AXIOM(pat.GetText() == "/foo/bar/baz//*.prop");
+
+    // Can't append children or properties to property patterns.
+    TF_AXIOM(!pat.CanAppendChild("foo"));
+    TF_AXIOM(!pat.CanAppendProperty("foo"));
+
+    pat.RemoveTrailingComponent();
+    TF_AXIOM(pat.GetText() == "/foo/bar/baz//*");
+    pat.RemoveTrailingComponent();
+    TF_AXIOM(pat.GetText() == "/foo/bar/baz//");
+    pat.RemoveTrailingComponent();
+    TF_AXIOM(pat.GetText() == "/foo/bar/baz");
+    pat.RemoveTrailingComponent(); // No more trailing components, only prefix.
+    TF_AXIOM(pat.GetText() == "/foo/bar/baz");
+}
 
 static void
 TestErrors()
@@ -482,6 +546,7 @@ main(int argc, char **argv)
 {
     TestBasics();
     TestSearch();
+    TestPathPattern();
     TestErrors();
     
     printf(">>> Test SUCCEEDED\n");
diff --git a/pxr/usd/sdf/testenv/testSdfPathExpression.py b/pxr/usd/sdf/testenv/testSdfPathExpression.py
index fd70271516..2995e73936 100644
--- a/pxr/usd/sdf/testenv/testSdfPathExpression.py
+++ b/pxr/usd/sdf/testenv/testSdfPathExpression.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2024 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Tf
 import sys, unittest
@@ -42,6 +25,34 @@ def test_Basics(self):
         self.assertEqual(pe, Sdf.PathExpression(''))
         self.assertFalse(pe)
 
+        # Leading & trailing whitespace.
+        self.assertEqual(
+            Sdf.PathExpression("  /foo//bar").GetText(), "/foo//bar")
+        self.assertEqual(
+            Sdf.PathExpression("  /foo//bar ").GetText(), "/foo//bar")
+        self.assertEqual(
+            Sdf.PathExpression("/foo//bar ").GetText(), "/foo//bar")
+        self.assertEqual(
+            Sdf.PathExpression("  /foo /bar").GetText(), "/foo /bar")
+        self.assertEqual(
+            Sdf.PathExpression("  /foo /bar ").GetText(), "/foo /bar")
+        self.assertEqual(
+            Sdf.PathExpression("/foo /bar ").GetText(), "/foo /bar")
+
+        # Complement of complement should cancel.
+        self.assertEqual(
+            Sdf.PathExpression('~(~a)'), Sdf.PathExpression('a'))
+        self.assertEqual(
+            Sdf.PathExpression('~(~(~a))'), Sdf.PathExpression('~a'))
+        self.assertEqual(
+            Sdf.PathExpression('~(~(~(~a)))'), Sdf.PathExpression('a'))
+        self.assertEqual(
+            Sdf.PathExpression('// - a'), Sdf.PathExpression('~a'))
+        self.assertEqual(
+            Sdf.PathExpression('~(// - a)'), Sdf.PathExpression('a'))
+        self.assertEqual(
+            Sdf.PathExpression('~(// - ~a)'), Sdf.PathExpression('~a'))
+
     def test_Matching(self):
 
         evl = MatchEval('/foo/bar/*') 
@@ -307,5 +318,56 @@ def test_SceneDescription(self):
         # Should have been made absolute:
         self.assertEqual(attr.default, Sdf.PathExpression("/prim/child"))
 
+    def test_PathPattern(self):
+        self.assertIs(Sdf.PathPattern, Sdf.PathExpression.PathPattern)
+        
+        pat = Sdf.PathPattern()
+        self.assertFalse(pat)
+        self.assertFalse(pat.HasTrailingStretch())
+        self.assertTrue(pat.GetPrefix().isEmpty)
+        self.assertTrue(pat.CanAppendChild(''))
+        self.assertTrue(pat.AppendChild(''))
+        self.assertEqual(pat, Sdf.PathPattern.EveryDescendant())
+        self.assertTrue(pat.HasTrailingStretch())
+        self.assertEqual(pat.GetPrefix(), Sdf.Path.reflexiveRelativePath)
+        self.assertFalse(pat.HasLeadingStretch())
+
+        # Set prefix to '/', should become Everything().
+        pat.SetPrefix(Sdf.Path.absoluteRootPath)
+        self.assertEqual(pat, Sdf.PathPattern.Everything())
+        self.assertTrue(pat.HasLeadingStretch())
+        self.assertTrue(pat.HasTrailingStretch())
+
+        # Remove trailing stretch, should become just '/'
+        pat.RemoveTrailingStretch()
+        self.assertFalse(pat.HasLeadingStretch())
+        self.assertFalse(pat.HasTrailingStretch())
+        self.assertEqual(pat.GetPrefix(), Sdf.Path.absoluteRootPath)
+
+        # Add some components.
+        pat.AppendChild("foo").AppendChild("bar").AppendChild("baz")
+        # This should have modified the prefix path, rather than appending
+        # matching components.
+        self.assertEqual(pat.GetPrefix(), Sdf.Path("/foo/bar/baz"))
+
+        # Appending a property to a pattern with trailing stretch has to append
+        # a prim wildcard '*'.
+        pat.AppendStretchIfPossible().AppendProperty("prop")
+        self.assertTrue(pat.IsProperty())
+        self.assertEqual(pat.GetText(), "/foo/bar/baz//*.prop")
+
+        # Can't append children or properties to property patterns.
+        self.assertFalse(pat.CanAppendChild("foo"))
+        self.assertFalse(pat.CanAppendProperty("foo"))
+
+        pat.RemoveTrailingComponent()
+        self.assertEqual(pat.GetText(), "/foo/bar/baz//*")
+        pat.RemoveTrailingComponent()
+        self.assertEqual(pat.GetText(), "/foo/bar/baz//")
+        pat.RemoveTrailingComponent()
+        self.assertEqual(pat.GetText(), "/foo/bar/baz")
+        pat.RemoveTrailingComponent() # No more components, only prefix.
+        self.assertEqual(pat.GetText(), "/foo/bar/baz")
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/pxr/usd/sdf/testenv/testSdfPathParser.cpp b/pxr/usd/sdf/testenv/testSdfPathParser.cpp
index 30abbf7e8f..3b9a9f3f8d 100644
--- a/pxr/usd/sdf/testenv/testSdfPathParser.cpp
+++ b/pxr/usd/sdf/testenv/testSdfPathParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <iostream>
 #include <cassert>
diff --git a/pxr/usd/sdf/testenv/testSdfPathTable.cpp b/pxr/usd/sdf/testenv/testSdfPathTable.cpp
index 32c380ad90..8b06cb8b06 100644
--- a/pxr/usd/sdf/testenv/testSdfPathTable.cpp
+++ b/pxr/usd/sdf/testenv/testSdfPathTable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/pathTable.h"
diff --git a/pxr/usd/sdf/testenv/testSdfPathThreading.cpp b/pxr/usd/sdf/testenv/testSdfPathThreading.cpp
index 143ff40edc..9f1d9209fe 100644
--- a/pxr/usd/sdf/testenv/testSdfPathThreading.cpp
+++ b/pxr/usd/sdf/testenv/testSdfPathThreading.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/path.h"
diff --git a/pxr/usd/sdf/testenv/testSdfPayload.py b/pxr/usd/sdf/testenv/testSdfPayload.py
index a1a61a17dd..2fc0ecbabe 100644
--- a/pxr/usd/sdf/testenv/testSdfPayload.py
+++ b/pxr/usd/sdf/testenv/testSdfPayload.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=zip-builtin-not-iterating
 
diff --git a/pxr/usd/sdf/testenv/testSdfPredicateExpression.cpp b/pxr/usd/sdf/testenv/testSdfPredicateExpression.cpp
index 5dbe9b7c99..46205c9149 100644
--- a/pxr/usd/sdf/testenv/testSdfPredicateExpression.cpp
+++ b/pxr/usd/sdf/testenv/testSdfPredicateExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/regex.h"
diff --git a/pxr/usd/sdf/testenv/testSdfPrim.py b/pxr/usd/sdf/testenv/testSdfPrim.py
index 4082a07252..d071be5eae 100644
--- a/pxr/usd/sdf/testenv/testSdfPrim.py
+++ b/pxr/usd/sdf/testenv/testSdfPrim.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/sdf/testenv/testSdfReference.py b/pxr/usd/sdf/testenv/testSdfReference.py
index 1526f9d631..65ae870bc7 100644
--- a/pxr/usd/sdf/testenv/testSdfReference.py
+++ b/pxr/usd/sdf/testenv/testSdfReference.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/sdf/testenv/testSdfRelocates.py b/pxr/usd/sdf/testenv/testSdfRelocates.py
index 02642d771f..9386680a88 100644
--- a/pxr/usd/sdf/testenv/testSdfRelocates.py
+++ b/pxr/usd/sdf/testenv/testSdfRelocates.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2024 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 import unittest
@@ -137,12 +120,14 @@ def test_LayerRelocates(self):
         layer.relocates = [
              ("/Root/source2", "/Root/target2"),
              ("/Root/source1", "/Root/target1"),
-             ("/Root/source3", "/Root/target3")]
+             ("/Root/source3", "/Root/target3"),
+             ("/Root/sourceToDelete", Sdf.Path())]
         self.assertTrue(layer.HasRelocates())
         self.assertEqual(layer.relocates, 
             [("/Root/source2", "/Root/target2"),
              ("/Root/source1", "/Root/target1"),
-             ("/Root/source3", "/Root/target3")])
+             ("/Root/source3", "/Root/target3"),
+             ("/Root/sourceToDelete", Sdf.Path())])
 
         # Write layer; relocates are written as layer metadata when the layer 
         # is written.
@@ -151,7 +136,8 @@ def test_LayerRelocates(self):
     relocates = {
         </Root/source2>: </Root/target2>, 
         </Root/source1>: </Root/target1>, 
-        </Root/source3>: </Root/target3>
+        </Root/source3>: </Root/target3>, 
+        </Root/sourceToDelete>: <>
     }
 )
 
@@ -169,7 +155,8 @@ def Scope "Root"
         self.assertFalse(("/Root/source2", "/Root/target2") in layer.relocates)
         self.assertEqual(layer.relocates, 
             [(Sdf.Path('/Root/source1'), Sdf.Path('/Root/target1')), 
-             (Sdf.Path('/Root/source3'), Sdf.Path('/Root/target3'))])
+             (Sdf.Path('/Root/source3'), Sdf.Path('/Root/target3')),
+             (Sdf.Path('/Root/sourceToDelete'), Sdf.Path())])
 
         # Add a single new relocate
         newRelocates = layer.relocates
@@ -180,6 +167,7 @@ def Scope "Root"
         self.assertEqual(layer.relocates, 
             [(Sdf.Path('/Root/source1'), Sdf.Path('/Root/target1')), 
              (Sdf.Path('/Root/source3'), Sdf.Path('/Root/target3')),
+             (Sdf.Path('/Root/sourceToDelete'), Sdf.Path()),
              (Sdf.Path('/Root/source4'), Sdf.Path('/Root/target4'))])
 
         # Overwrite an existing relocate
@@ -192,6 +180,7 @@ def Scope "Root"
         self.assertEqual(layer.relocates, 
             [(Sdf.Path('/Root/source1'), Sdf.Path('/Root/targetFoo')), 
              (Sdf.Path('/Root/source3'), Sdf.Path('/Root/target3')),
+             (Sdf.Path('/Root/sourceToDelete'), Sdf.Path()),
              (Sdf.Path('/Root/source4'), Sdf.Path('/Root/target4'))])
 
         # Clear all relocates
diff --git a/pxr/usd/sdf/testenv/testSdfSpecHash.py b/pxr/usd/sdf/testenv/testSdfSpecHash.py
index 56a4a2e332..e6a09c2824 100644
--- a/pxr/usd/sdf/testenv/testSdfSpecHash.py
+++ b/pxr/usd/sdf/testenv/testSdfSpecHash.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Sdf
diff --git a/pxr/usd/sdf/testenv/testSdfTimeCode.py b/pxr/usd/sdf/testenv/testSdfTimeCode.py
index 128034e69f..43991a0f8f 100644
--- a/pxr/usd/sdf/testenv/testSdfTimeCode.py
+++ b/pxr/usd/sdf/testenv/testSdfTimeCode.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import division
 from pxr import Sdf, Tf
diff --git a/pxr/usd/sdf/testenv/testSdfTimeSamples.py b/pxr/usd/sdf/testenv/testSdfTimeSamples.py
index 3903a647bc..409b714283 100644
--- a/pxr/usd/sdf/testenv/testSdfTimeSamples.py
+++ b/pxr/usd/sdf/testenv/testSdfTimeSamples.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 from pxr import Sdf
diff --git a/pxr/usd/sdf/testenv/testSdfTypes.py b/pxr/usd/sdf/testenv/testSdfTypes.py
index 6ef801861b..69949df359 100644
--- a/pxr/usd/sdf/testenv/testSdfTypes.py
+++ b/pxr/usd/sdf/testenv/testSdfTypes.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Vt, Gf, Tf
 import unittest
diff --git a/pxr/usd/sdf/testenv/testSdfVariableExpression.py b/pxr/usd/sdf/testenv/testSdfVariableExpression.py
index 722da1476b..d4e66233b4 100644
--- a/pxr/usd/sdf/testenv/testSdfVariableExpression.py
+++ b/pxr/usd/sdf/testenv/testSdfVariableExpression.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Vt
 import unittest
diff --git a/pxr/usd/sdf/testenv/testSdfVariants.py b/pxr/usd/sdf/testenv/testSdfVariants.py
index a15973fb72..b5efae2649 100644
--- a/pxr/usd/sdf/testenv/testSdfVariants.py
+++ b/pxr/usd/sdf/testenv/testSdfVariants.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 from pxr import Sdf, Tf
diff --git a/pxr/usd/sdf/textFileFormat.cpp b/pxr/usd/sdf/textFileFormat.cpp
index e503001c4e..5fa14ed7f9 100644
--- a/pxr/usd/sdf/textFileFormat.cpp
+++ b/pxr/usd/sdf/textFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Sdf/textFileFormat.cpp
diff --git a/pxr/usd/sdf/textFileFormat.h b/pxr/usd/sdf/textFileFormat.h
index bf99d9e658..ad5d29f5bd 100644
--- a/pxr/usd/sdf/textFileFormat.h
+++ b/pxr/usd/sdf/textFileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_TEXT_FILE_FORMAT_H
 #define PXR_USD_SDF_TEXT_FILE_FORMAT_H
diff --git a/pxr/usd/sdf/textFileFormat.lex.cpp b/pxr/usd/sdf/textFileFormat.lex.cpp
index 7e7234d21c..1fe2842525 100644
--- a/pxr/usd/sdf/textFileFormat.lex.cpp
+++ b/pxr/usd/sdf/textFileFormat.lex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #line 2 "pxr/usd/sdf/textFileFormat.lex.cpp"
 
@@ -4802,25 +4785,8 @@ static yyconst flex_int32_t yy_ec[256] =
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -4867,7 +4833,7 @@ PXR_NAMESPACE_USING_DIRECTIVE
   */
 /* States */
 
-#line 4848 "pxr/usd/sdf/textFileFormat.lex.cpp"
+#line 4831 "pxr/usd/sdf/textFileFormat.lex.cpp"
 
 #define INITIAL 0
 #define SLASHTERIX_COMMENT 1
@@ -5132,13 +5098,13 @@ YY_DECL
 		}
 
 	{
-#line 98 "pxr/usd/sdf/textFileFormat.ll"
+#line 81 "pxr/usd/sdf/textFileFormat.ll"
 
 
     /* skip over whitespace and comments */
     /* handle the first line # comment specially, since it contains the
        magic token */
-#line 5119 "pxr/usd/sdf/textFileFormat.lex.cpp"
+#line 5102 "pxr/usd/sdf/textFileFormat.lex.cpp"
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
@@ -5185,12 +5151,12 @@ YY_DECL
 
 case 1:
 YY_RULE_SETUP
-#line 103 "pxr/usd/sdf/textFileFormat.ll"
+#line 86 "pxr/usd/sdf/textFileFormat.ll"
 {}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 104 "pxr/usd/sdf/textFileFormat.ll"
+#line 87 "pxr/usd/sdf/textFileFormat.ll"
 {
         if (yyextra->sdfLineNo == 1) {
             (*yylval_param) = std::string(yytext, yyleng);
@@ -5200,23 +5166,23 @@ YY_RULE_SETUP
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 110 "pxr/usd/sdf/textFileFormat.ll"
+#line 93 "pxr/usd/sdf/textFileFormat.ll"
 {}
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 111 "pxr/usd/sdf/textFileFormat.ll"
+#line 94 "pxr/usd/sdf/textFileFormat.ll"
 BEGIN SLASHTERIX_COMMENT ;
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 112 "pxr/usd/sdf/textFileFormat.ll"
+#line 95 "pxr/usd/sdf/textFileFormat.ll"
 ;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 113 "pxr/usd/sdf/textFileFormat.ll"
+#line 96 "pxr/usd/sdf/textFileFormat.ll"
 BEGIN INITIAL ;
 	YY_BREAK
 /* newline is returned as TOK_NL
@@ -5226,7 +5192,7 @@ BEGIN INITIAL ;
 case 7:
 /* rule 7 can match eol */
 YY_RULE_SETUP
-#line 119 "pxr/usd/sdf/textFileFormat.ll"
+#line 102 "pxr/usd/sdf/textFileFormat.ll"
 {
         yyextra->sdfLineNo++;
         return TOK_NL;
@@ -5236,213 +5202,213 @@ YY_RULE_SETUP
        can make use of it. */
 case 8:
 YY_RULE_SETUP
-#line 126 "pxr/usd/sdf/textFileFormat.ll"
+#line 109 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_ADD; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 127 "pxr/usd/sdf/textFileFormat.ll"
+#line 110 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_APPEND; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 128 "pxr/usd/sdf/textFileFormat.ll"
+#line 111 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_CLASS; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 129 "pxr/usd/sdf/textFileFormat.ll"
+#line 112 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_CONFIG; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 130 "pxr/usd/sdf/textFileFormat.ll"
+#line 113 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_CONNECT; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 131 "pxr/usd/sdf/textFileFormat.ll"
+#line 114 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_CUSTOM; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 132 "pxr/usd/sdf/textFileFormat.ll"
+#line 115 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_CUSTOMDATA; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 133 "pxr/usd/sdf/textFileFormat.ll"
+#line 116 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_DEFAULT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 134 "pxr/usd/sdf/textFileFormat.ll"
+#line 117 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_DEF; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 135 "pxr/usd/sdf/textFileFormat.ll"
+#line 118 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_DELETE; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 136 "pxr/usd/sdf/textFileFormat.ll"
+#line 119 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_DICTIONARY; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 137 "pxr/usd/sdf/textFileFormat.ll"
+#line 120 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_DISPLAYUNIT; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 138 "pxr/usd/sdf/textFileFormat.ll"
+#line 121 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_DOC; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 139 "pxr/usd/sdf/textFileFormat.ll"
+#line 122 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_INHERITS; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 140 "pxr/usd/sdf/textFileFormat.ll"
+#line 123 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_KIND; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 141 "pxr/usd/sdf/textFileFormat.ll"
+#line 124 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_NAMECHILDREN; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 142 "pxr/usd/sdf/textFileFormat.ll"
+#line 125 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_NONE; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 143 "pxr/usd/sdf/textFileFormat.ll"
+#line 126 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_OFFSET; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 144 "pxr/usd/sdf/textFileFormat.ll"
+#line 127 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_OVER; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 145 "pxr/usd/sdf/textFileFormat.ll"
+#line 128 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_PAYLOAD; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 146 "pxr/usd/sdf/textFileFormat.ll"
+#line 129 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_PERMISSION; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 147 "pxr/usd/sdf/textFileFormat.ll"
+#line 130 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_PREFIX_SUBSTITUTIONS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 148 "pxr/usd/sdf/textFileFormat.ll"
+#line 131 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_PREPEND; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 149 "pxr/usd/sdf/textFileFormat.ll"
+#line 132 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_PROPERTIES; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 150 "pxr/usd/sdf/textFileFormat.ll"
+#line 133 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_REFERENCES; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 151 "pxr/usd/sdf/textFileFormat.ll"
+#line 134 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_RELOCATES; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 152 "pxr/usd/sdf/textFileFormat.ll"
+#line 135 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_REL; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 153 "pxr/usd/sdf/textFileFormat.ll"
+#line 136 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_REORDER; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 154 "pxr/usd/sdf/textFileFormat.ll"
+#line 137 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_ROOTPRIMS; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 155 "pxr/usd/sdf/textFileFormat.ll"
+#line 138 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_SCALE; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 156 "pxr/usd/sdf/textFileFormat.ll"
+#line 139 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_SUBLAYERS; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 157 "pxr/usd/sdf/textFileFormat.ll"
+#line 140 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_SUFFIX_SUBSTITUTIONS; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 158 "pxr/usd/sdf/textFileFormat.ll"
+#line 141 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_SPECIALIZES; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 159 "pxr/usd/sdf/textFileFormat.ll"
+#line 142 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_SYMMETRYARGUMENTS; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 160 "pxr/usd/sdf/textFileFormat.ll"
+#line 143 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_SYMMETRYFUNCTION; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 161 "pxr/usd/sdf/textFileFormat.ll"
+#line 144 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_TIME_SAMPLES; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 162 "pxr/usd/sdf/textFileFormat.ll"
+#line 145 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_UNIFORM; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 163 "pxr/usd/sdf/textFileFormat.ll"
+#line 146 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_VARIANTSET; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 164 "pxr/usd/sdf/textFileFormat.ll"
+#line 147 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_VARIANTSETS; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 165 "pxr/usd/sdf/textFileFormat.ll"
+#line 148 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_VARIANTS; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 166 "pxr/usd/sdf/textFileFormat.ll"
+#line 149 "pxr/usd/sdf/textFileFormat.ll"
 { (*yylval_param) = std::string(yytext, yyleng); return TOK_VARYING; }
 	YY_BREAK
 /* unquoted C++ namespaced identifier -- see bug 10775 */
 case 49:
 YY_RULE_SETUP
-#line 169 "pxr/usd/sdf/textFileFormat.ll"
+#line 152 "pxr/usd/sdf/textFileFormat.ll"
 {
         (*yylval_param) = std::string(yytext, yyleng);
         return TOK_CXX_NAMESPACED_IDENTIFIER;
@@ -5466,7 +5432,7 @@ YY_RULE_SETUP
   */
 case 50:
 YY_RULE_SETUP
-#line 190 "pxr/usd/sdf/textFileFormat.ll"
+#line 173 "pxr/usd/sdf/textFileFormat.ll"
 {
     std::string matched = std::string(yytext, yyleng);
 
@@ -5487,7 +5453,7 @@ YY_RULE_SETUP
   */
 case 51:
 YY_RULE_SETUP
-#line 208 "pxr/usd/sdf/textFileFormat.ll"
+#line 191 "pxr/usd/sdf/textFileFormat.ll"
 {
     std::string matched = std::string(yytext, yyleng);
 
@@ -5504,7 +5470,7 @@ YY_RULE_SETUP
 /* scene paths */
 case 52:
 YY_RULE_SETUP
-#line 222 "pxr/usd/sdf/textFileFormat.ll"
+#line 205 "pxr/usd/sdf/textFileFormat.ll"
 {
         (*yylval_param) = Sdf_EvalQuotedString(yytext, yyleng, 1);
         return TOK_PATHREF;
@@ -5513,7 +5479,7 @@ YY_RULE_SETUP
 /* Single '@'-delimited asset references */
 case 53:
 YY_RULE_SETUP
-#line 228 "pxr/usd/sdf/textFileFormat.ll"
+#line 211 "pxr/usd/sdf/textFileFormat.ll"
 {
         TfErrorMark m;
         (*yylval_param) = 
@@ -5524,7 +5490,7 @@ YY_RULE_SETUP
 /* Triple '@'-delimited asset references. */
 case 54:
 YY_RULE_SETUP
-#line 236 "pxr/usd/sdf/textFileFormat.ll"
+#line 219 "pxr/usd/sdf/textFileFormat.ll"
 {
         TfErrorMark m;
         (*yylval_param) = 
@@ -5537,10 +5503,10 @@ YY_RULE_SETUP
        them from the beginning of triply-quoted strings.
        Ex: "Foo \"foo\"" */
 case 55:
-#line 248 "pxr/usd/sdf/textFileFormat.ll"
+#line 231 "pxr/usd/sdf/textFileFormat.ll"
 case 56:
 YY_RULE_SETUP
-#line 248 "pxr/usd/sdf/textFileFormat.ll"
+#line 231 "pxr/usd/sdf/textFileFormat.ll"
 {  /* " //<- unfreak out coloring code */
         (*yylval_param) = Sdf_EvalQuotedString(yytext, yyleng, 1);
         return TOK_STRING;
@@ -5555,7 +5521,7 @@ YY_LINENO_REWIND_TO(yy_bp + 2);
 yyg->yy_c_buf_p = yy_cp = yy_bp + 2;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 255 "pxr/usd/sdf/textFileFormat.ll"
+#line 238 "pxr/usd/sdf/textFileFormat.ll"
 {  /* ' // <- keep syntax coloring from freaking out */
         (*yylval_param) = std::string();
         return TOK_STRING;
@@ -5568,7 +5534,7 @@ YY_LINENO_REWIND_TO(yy_bp + 2);
 yyg->yy_c_buf_p = yy_cp = yy_bp + 2;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 259 "pxr/usd/sdf/textFileFormat.ll"
+#line 242 "pxr/usd/sdf/textFileFormat.ll"
 {
         (*yylval_param) = std::string();
         return TOK_STRING;
@@ -5578,11 +5544,11 @@ YY_RULE_SETUP
        Ex: """A\n\"B\"\nC""" */
 case 59:
 /* rule 59 can match eol */
-#line 267 "pxr/usd/sdf/textFileFormat.ll"
+#line 250 "pxr/usd/sdf/textFileFormat.ll"
 case 60:
 /* rule 60 can match eol */
 YY_RULE_SETUP
-#line 267 "pxr/usd/sdf/textFileFormat.ll"
+#line 250 "pxr/usd/sdf/textFileFormat.ll"
 {  /* " //<- unfreak out coloring code */
 
         unsigned int numlines = 0;
@@ -5596,7 +5562,7 @@ YY_RULE_SETUP
      * don't know at this point what the final stored type will be. */
 case 61:
 YY_RULE_SETUP
-#line 278 "pxr/usd/sdf/textFileFormat.ll"
+#line 261 "pxr/usd/sdf/textFileFormat.ll"
 {
         (*yylval_param) = double(-0.0);
         return TOK_NUMBER;
@@ -5605,7 +5571,7 @@ YY_RULE_SETUP
 /* Positive integers: store as uint64_t if in range, otherwise double. */
 case 62:
 YY_RULE_SETUP
-#line 284 "pxr/usd/sdf/textFileFormat.ll"
+#line 267 "pxr/usd/sdf/textFileFormat.ll"
 {
         bool outOfRange = false;
         (*yylval_param) = TfStringToUInt64(yytext, &outOfRange);
@@ -5624,7 +5590,7 @@ YY_RULE_SETUP
 /* Negative integers: store as long. */
 case 63:
 YY_RULE_SETUP
-#line 300 "pxr/usd/sdf/textFileFormat.ll"
+#line 283 "pxr/usd/sdf/textFileFormat.ll"
 {
         bool outOfRange = false;
         (*yylval_param) = TfStringToInt64(yytext, &outOfRange);
@@ -5642,10 +5608,10 @@ YY_RULE_SETUP
 	YY_BREAK
 /* Numbers with decimal places or exponents: store as double. */
 case 64:
-#line 317 "pxr/usd/sdf/textFileFormat.ll"
+#line 300 "pxr/usd/sdf/textFileFormat.ll"
 case 65:
 YY_RULE_SETUP
-#line 317 "pxr/usd/sdf/textFileFormat.ll"
+#line 300 "pxr/usd/sdf/textFileFormat.ll"
 {
         (*yylval_param) = TfStringToDouble(yytext);
         return TOK_NUMBER;
@@ -5657,7 +5623,7 @@ YY_RULE_SETUP
      * identifiers. */
 case 66:
 YY_RULE_SETUP
-#line 326 "pxr/usd/sdf/textFileFormat.ll"
+#line 309 "pxr/usd/sdf/textFileFormat.ll"
 {
         (*yylval_param) = -std::numeric_limits<double>::infinity();
         return TOK_NUMBER;
@@ -5668,7 +5634,7 @@ YY_RULE_SETUP
      */
 case 67:
 YY_RULE_SETUP
-#line 334 "pxr/usd/sdf/textFileFormat.ll"
+#line 317 "pxr/usd/sdf/textFileFormat.ll"
 {
         return yytext[0];
     }
@@ -5679,17 +5645,17 @@ YY_RULE_SETUP
      */
 case 68:
 YY_RULE_SETUP
-#line 342 "pxr/usd/sdf/textFileFormat.ll"
+#line 325 "pxr/usd/sdf/textFileFormat.ll"
 {
         return TOK_SYNTAX_ERROR;
     }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 346 "pxr/usd/sdf/textFileFormat.ll"
+#line 329 "pxr/usd/sdf/textFileFormat.ll"
 ECHO;
 	YY_BREAK
-#line 5670 "pxr/usd/sdf/textFileFormat.lex.cpp"
+#line 5653 "pxr/usd/sdf/textFileFormat.lex.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(SLASHTERIX_COMMENT):
 	yyterminate();
@@ -6807,7 +6773,7 @@ void textFileFormatYyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 346 "pxr/usd/sdf/textFileFormat.ll"
+#line 329 "pxr/usd/sdf/textFileFormat.ll"
 
 
 
diff --git a/pxr/usd/sdf/textFileFormat.ll b/pxr/usd/sdf/textFileFormat.ll
index fa032f101b..c84d583718 100644
--- a/pxr/usd/sdf/textFileFormat.ll
+++ b/pxr/usd/sdf/textFileFormat.ll
@@ -2,25 +2,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/textFileFormat.tab.cpp b/pxr/usd/sdf/textFileFormat.tab.cpp
index 29879c74ec..31aa154d76 100644
--- a/pxr/usd/sdf/textFileFormat.tab.cpp
+++ b/pxr/usd/sdf/textFileFormat.tab.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 /* A Bison parser, made by GNU Bison 2.4.1.  */
@@ -99,7 +82,7 @@
 /* Copy the first part of user declarations.  */
 
 /* Line 189 of yacc.c  */
-#line 25 "pxr/usd/sdf/textFileFormat.yy"
+#line 8 "pxr/usd/sdf/textFileFormat.yy"
 
 
 #include "pxr/pxr.h"
@@ -131,9 +114,6 @@
 #include "pxr/base/gf/matrix4d.h"
 #include "pxr/base/tf/mallocTag.h"
 
-#include <boost/optional.hpp>
-#include <boost/variant.hpp>
-
 #include <functional>
 #include <sstream>
 #include <string>
@@ -146,7 +126,6 @@
 PXR_NAMESPACE_USING_DIRECTIVE
 
 using Sdf_ParserHelpers::Value;
-using boost::get;
 
 //--------------------------------------------------------------------
 // Helper macros/functions for handling errors
@@ -671,32 +650,40 @@ _RelocatesAdd(const Value& arg1, const Value& arg2,
               Sdf_TextParserContext *context)
 {
     const std::string& srcStr    = arg1.Get<std::string>();
-    const std::string& targetStr = arg2.Get<std::string>();
-
     SdfPath srcPath(srcStr);
-    SdfPath targetPath(targetStr);
 
-    if (!SdfSchema::IsValidRelocatesPath(srcPath)) {
+    if (!SdfSchema::IsValidRelocatesSourcePath(srcPath)) {
         Err(context, "'%s' is not a valid relocates path",
             srcStr.c_str());
         return;
     }
-    if (!SdfSchema::IsValidRelocatesPath(targetPath)) {
-        Err(context, "'%s' is not a valid relocates path",
-            targetStr.c_str());
-        return;
-    }
 
-    // The relocates map is expected to only hold absolute paths. The
-    // SdRelocatesMapProxy ensures that all paths are made absolute when
-    // editing, but since we're bypassing that proxy and setting the map
-    // directly into the underlying SdfData, we need to explicitly absolutize
-    // paths here.
+    // The relocates map is expected to only hold absolute paths.
     srcPath = srcPath.MakeAbsolutePath(context->path);
-    targetPath = targetPath.MakeAbsolutePath(context->path);
 
-    context->relocatesParsing.emplace_back(
-        std::move(srcPath), std::move(targetPath));
+    const std::string& targetStr = arg2.Get<std::string>();
+    if (targetStr.empty()) {
+        context->relocatesParsing.emplace_back(
+            std::move(srcPath), SdfPath());
+    } else {
+        SdfPath targetPath(targetStr);
+
+        // Target paths can be empty but the string must be explicitly empty
+        // which we would've caught in the if statement. An empty path here 
+        // indicates a malformed path which is never valid.
+        if (targetPath.IsEmpty() || 
+                !SdfSchema::IsValidRelocatesTargetPath(targetPath)) {
+            Err(context, "'%s' is not a valid relocates path",
+                targetStr.c_str());
+            return;
+        }
+
+        // The relocates map is expected to only hold absolute paths.
+        targetPath = targetPath.MakeAbsolutePath(context->path);
+
+        context->relocatesParsing.emplace_back(
+            std::move(srcPath), std::move(targetPath));
+    }
 
     context->layerHints.mightHaveRelocates = true;
 }
@@ -1325,7 +1312,7 @@ _GenericMetadataEnd(SdfSpecType specType, Sdf_TextParserContext *context)
 
 
 /* Line 189 of yacc.c  */
-#line 1306 "pxr/usd/sdf/textFileFormat.tab.cpp"
+#line 1310 "pxr/usd/sdf/textFileFormat.tab.cpp"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -1422,7 +1409,7 @@ typedef int YYSTYPE;
 
 
 /* Line 264 of yacc.c  */
-#line 1403 "pxr/usd/sdf/textFileFormat.tab.cpp"
+#line 1407 "pxr/usd/sdf/textFileFormat.tab.cpp"
 
 #ifdef short
 # undef short
@@ -1899,54 +1886,54 @@ static const yytype_int16 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,  1323,  1323,  1326,  1327,  1328,  1329,  1330,  1331,  1332,
-    1333,  1334,  1335,  1336,  1337,  1338,  1339,  1340,  1341,  1342,
-    1343,  1344,  1345,  1346,  1347,  1348,  1349,  1350,  1351,  1352,
-    1353,  1354,  1355,  1356,  1357,  1358,  1359,  1360,  1361,  1362,
-    1363,  1364,  1365,  1366,  1367,  1368,  1376,  1377,  1388,  1388,
-    1400,  1406,  1418,  1419,  1423,  1424,  1428,  1432,  1437,  1437,
-    1446,  1446,  1452,  1452,  1458,  1458,  1464,  1464,  1470,  1470,
-    1478,  1485,  1493,  1497,  1498,  1512,  1513,  1517,  1525,  1532,
-    1534,  1538,  1539,  1543,  1547,  1554,  1555,  1563,  1563,  1567,
-    1567,  1571,  1571,  1575,  1575,  1579,  1579,  1583,  1583,  1587,
-    1597,  1598,  1605,  1605,  1665,  1666,  1670,  1671,  1675,  1676,
-    1680,  1681,  1682,  1686,  1691,  1691,  1700,  1700,  1706,  1706,
-    1712,  1712,  1718,  1718,  1724,  1724,  1732,  1739,  1746,  1753,
-    1753,  1760,  1760,  1767,  1767,  1774,  1774,  1781,  1781,  1788,
-    1788,  1796,  1796,  1801,  1801,  1806,  1806,  1811,  1811,  1816,
-    1816,  1821,  1821,  1827,  1827,  1832,  1832,  1837,  1837,  1842,
-    1842,  1847,  1847,  1852,  1852,  1858,  1858,  1865,  1865,  1872,
-    1872,  1879,  1879,  1886,  1886,  1893,  1893,  1902,  1913,  1917,
-    1921,  1925,  1929,  1933,  1937,  1943,  1948,  1955,  1963,  1972,
-    1973,  1974,  1975,  1979,  1980,  1984,  1996,  1996,  2019,  2021,
-    2022,  2026,  2027,  2031,  2035,  2036,  2037,  2038,  2042,  2043,
-    2047,  2060,  2060,  2084,  2086,  2087,  2091,  2092,  2096,  2097,
-    2101,  2102,  2103,  2104,  2108,  2109,  2113,  2119,  2120,  2121,
-    2122,  2126,  2127,  2131,  2137,  2140,  2142,  2146,  2147,  2151,
-    2157,  2158,  2162,  2163,  2167,  2175,  2176,  2180,  2181,  2185,
-    2186,  2187,  2188,  2189,  2193,  2193,  2227,  2228,  2232,  2232,
-    2275,  2284,  2297,  2298,  2306,  2309,  2318,  2324,  2327,  2333,
-    2337,  2343,  2350,  2343,  2361,  2369,  2361,  2380,  2380,  2388,
-    2388,  2396,  2396,  2404,  2404,  2412,  2412,  2420,  2420,  2431,
-    2431,  2443,  2444,  2445,  2446,  2454,  2455,  2456,  2457,  2461,
-    2462,  2466,  2476,  2476,  2481,  2483,  2487,  2488,  2492,  2492,
-    2499,  2511,  2513,  2514,  2518,  2519,  2523,  2524,  2525,  2529,
-    2534,  2534,  2543,  2543,  2549,  2549,  2555,  2555,  2561,  2561,
-    2567,  2567,  2575,  2582,  2589,  2597,  2602,  2609,  2611,  2615,
-    2618,  2628,  2628,  2636,  2638,  2642,  2643,  2647,  2650,  2658,
-    2659,  2663,  2664,  2668,  2674,  2684,  2684,  2692,  2694,  2698,
-    2699,  2703,  2716,  2722,  2732,  2736,  2737,  2750,  2753,  2756,
-    2759,  2770,  2776,  2779,  2782,  2787,  2800,  2800,  2809,  2813,
-    2814,  2818,  2819,  2820,  2828,  2828,  2835,  2839,  2840,  2844,
-    2845,  2853,  2857,  2861,  2865,  2872,  2872,  2884,  2899,  2899,
-    2909,  2909,  2917,  2917,  2925,  2925,  2933,  2933,  2942,  2942,
-    2950,  2957,  2958,  2961,  2963,  2964,  2968,  2969,  2973,  2974,
-    2975,  2979,  2984,  2984,  2993,  2993,  2999,  2999,  3005,  3005,
-    3011,  3011,  3017,  3017,  3025,  3032,  3040,  3045,  3052,  3054,
-    3058,  3059,  3062,  3065,  3069,  3070,  3074,  3084,  3087,  3091,
-    3097,  3108,  3109,  3115,  3116,  3117,  3122,  3123,  3128,  3129,
-    3132,  3134,  3138,  3139,  3143,  3144,  3148,  3151,  3153,  3157,
-    3158
+       0,  1310,  1310,  1313,  1314,  1315,  1316,  1317,  1318,  1319,
+    1320,  1321,  1322,  1323,  1324,  1325,  1326,  1327,  1328,  1329,
+    1330,  1331,  1332,  1333,  1334,  1335,  1336,  1337,  1338,  1339,
+    1340,  1341,  1342,  1343,  1344,  1345,  1346,  1347,  1348,  1349,
+    1350,  1351,  1352,  1353,  1354,  1355,  1363,  1364,  1375,  1375,
+    1387,  1393,  1405,  1406,  1410,  1411,  1415,  1419,  1424,  1424,
+    1433,  1433,  1439,  1439,  1445,  1445,  1451,  1451,  1457,  1457,
+    1465,  1472,  1480,  1484,  1485,  1499,  1500,  1504,  1512,  1519,
+    1521,  1525,  1526,  1530,  1534,  1541,  1542,  1550,  1550,  1554,
+    1554,  1558,  1558,  1562,  1562,  1566,  1566,  1570,  1570,  1574,
+    1584,  1585,  1592,  1592,  1652,  1653,  1657,  1658,  1662,  1663,
+    1667,  1668,  1669,  1673,  1678,  1678,  1687,  1687,  1693,  1693,
+    1699,  1699,  1705,  1705,  1711,  1711,  1719,  1726,  1733,  1740,
+    1740,  1747,  1747,  1754,  1754,  1761,  1761,  1768,  1768,  1775,
+    1775,  1783,  1783,  1788,  1788,  1793,  1793,  1798,  1798,  1803,
+    1803,  1808,  1808,  1814,  1814,  1819,  1819,  1824,  1824,  1829,
+    1829,  1834,  1834,  1839,  1839,  1845,  1845,  1852,  1852,  1859,
+    1859,  1866,  1866,  1873,  1873,  1880,  1880,  1889,  1900,  1904,
+    1908,  1912,  1916,  1920,  1924,  1930,  1935,  1942,  1950,  1959,
+    1960,  1961,  1962,  1966,  1967,  1971,  1983,  1983,  2006,  2008,
+    2009,  2013,  2014,  2018,  2022,  2023,  2024,  2025,  2029,  2030,
+    2034,  2047,  2047,  2071,  2073,  2074,  2078,  2079,  2083,  2084,
+    2088,  2089,  2090,  2091,  2095,  2096,  2100,  2106,  2107,  2108,
+    2109,  2113,  2114,  2118,  2124,  2127,  2129,  2133,  2134,  2138,
+    2144,  2145,  2149,  2150,  2154,  2162,  2163,  2167,  2168,  2172,
+    2173,  2174,  2175,  2176,  2180,  2180,  2214,  2215,  2219,  2219,
+    2262,  2271,  2284,  2285,  2293,  2296,  2305,  2311,  2314,  2320,
+    2324,  2330,  2337,  2330,  2348,  2356,  2348,  2367,  2367,  2375,
+    2375,  2383,  2383,  2391,  2391,  2399,  2399,  2407,  2407,  2418,
+    2418,  2430,  2431,  2432,  2433,  2441,  2442,  2443,  2444,  2448,
+    2449,  2453,  2463,  2463,  2468,  2470,  2474,  2475,  2479,  2479,
+    2486,  2498,  2500,  2501,  2505,  2506,  2510,  2511,  2512,  2516,
+    2521,  2521,  2530,  2530,  2536,  2536,  2542,  2542,  2548,  2548,
+    2554,  2554,  2562,  2569,  2576,  2584,  2589,  2596,  2598,  2602,
+    2605,  2615,  2615,  2623,  2625,  2629,  2630,  2634,  2637,  2645,
+    2646,  2650,  2651,  2655,  2661,  2671,  2671,  2679,  2681,  2685,
+    2686,  2690,  2703,  2709,  2719,  2723,  2724,  2737,  2740,  2743,
+    2746,  2757,  2763,  2766,  2769,  2774,  2787,  2787,  2796,  2800,
+    2801,  2805,  2806,  2807,  2815,  2815,  2822,  2826,  2827,  2831,
+    2832,  2840,  2844,  2848,  2852,  2859,  2859,  2871,  2886,  2886,
+    2896,  2896,  2904,  2904,  2912,  2912,  2920,  2920,  2929,  2929,
+    2937,  2944,  2945,  2948,  2950,  2951,  2955,  2956,  2960,  2961,
+    2962,  2966,  2971,  2971,  2980,  2980,  2986,  2986,  2992,  2992,
+    2998,  2998,  3004,  3004,  3012,  3019,  3027,  3032,  3039,  3041,
+    3045,  3046,  3049,  3052,  3056,  3057,  3061,  3071,  3074,  3078,
+    3084,  3095,  3096,  3102,  3103,  3104,  3109,  3110,  3115,  3116,
+    3119,  3121,  3125,  3126,  3130,  3131,  3135,  3138,  3140,  3144,
+    3145
 };
 #endif
 
@@ -3507,7 +3494,7 @@ YYSTYPE yylval;
         case 47:
 
 /* Line 1455 of yacc.c  */
-#line 1377 "pxr/usd/sdf/textFileFormat.yy"
+#line 1364 "pxr/usd/sdf/textFileFormat.yy"
     {
 
         // Store the names of the root prims.
@@ -3521,7 +3508,7 @@ YYSTYPE yylval;
   case 48:
 
 /* Line 1455 of yacc.c  */
-#line 1388 "pxr/usd/sdf/textFileFormat.yy"
+#line 1375 "pxr/usd/sdf/textFileFormat.yy"
     {
             _MatchMagicIdentifier((yyvsp[(1) - (1)]), context);
             context->nameChildrenStack.push_back(std::vector<TfToken>());
@@ -3536,7 +3523,7 @@ YYSTYPE yylval;
   case 50:
 
 /* Line 1455 of yacc.c  */
-#line 1400 "pxr/usd/sdf/textFileFormat.yy"
+#line 1387 "pxr/usd/sdf/textFileFormat.yy"
     {
             // If we're only reading metadata and we got here, 
             // we're done.
@@ -3548,7 +3535,7 @@ YYSTYPE yylval;
   case 51:
 
 /* Line 1455 of yacc.c  */
-#line 1406 "pxr/usd/sdf/textFileFormat.yy"
+#line 1393 "pxr/usd/sdf/textFileFormat.yy"
     {
             // Abort if error after layer metadata.
             ABORT_IF_ERROR(context->seenError);
@@ -3563,7 +3550,7 @@ YYSTYPE yylval;
   case 57:
 
 /* Line 1455 of yacc.c  */
-#line 1432 "pxr/usd/sdf/textFileFormat.yy"
+#line 1419 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Comment, 
@@ -3574,7 +3561,7 @@ YYSTYPE yylval;
   case 58:
 
 /* Line 1455 of yacc.c  */
-#line 1437 "pxr/usd/sdf/textFileFormat.yy"
+#line 1424 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(1) - (1)]), SdfSpecTypePseudoRoot, context);
         ;}
@@ -3583,7 +3570,7 @@ YYSTYPE yylval;
   case 59:
 
 /* Line 1455 of yacc.c  */
-#line 1439 "pxr/usd/sdf/textFileFormat.yy"
+#line 1426 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePseudoRoot, context);
         ;}
@@ -3592,7 +3579,7 @@ YYSTYPE yylval;
   case 60:
 
 /* Line 1455 of yacc.c  */
-#line 1446 "pxr/usd/sdf/textFileFormat.yy"
+#line 1433 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePseudoRoot, context);
             context->listOpType = SdfListOpTypeDeleted;
@@ -3602,7 +3589,7 @@ YYSTYPE yylval;
   case 61:
 
 /* Line 1455 of yacc.c  */
-#line 1449 "pxr/usd/sdf/textFileFormat.yy"
+#line 1436 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePseudoRoot, context);
         ;}
@@ -3611,7 +3598,7 @@ YYSTYPE yylval;
   case 62:
 
 /* Line 1455 of yacc.c  */
-#line 1452 "pxr/usd/sdf/textFileFormat.yy"
+#line 1439 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePseudoRoot, context);
             context->listOpType = SdfListOpTypeAdded;
@@ -3621,7 +3608,7 @@ YYSTYPE yylval;
   case 63:
 
 /* Line 1455 of yacc.c  */
-#line 1455 "pxr/usd/sdf/textFileFormat.yy"
+#line 1442 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePseudoRoot, context);
         ;}
@@ -3630,7 +3617,7 @@ YYSTYPE yylval;
   case 64:
 
 /* Line 1455 of yacc.c  */
-#line 1458 "pxr/usd/sdf/textFileFormat.yy"
+#line 1445 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePseudoRoot, context);
             context->listOpType = SdfListOpTypePrepended;
@@ -3640,7 +3627,7 @@ YYSTYPE yylval;
   case 65:
 
 /* Line 1455 of yacc.c  */
-#line 1461 "pxr/usd/sdf/textFileFormat.yy"
+#line 1448 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePseudoRoot, context);
         ;}
@@ -3649,7 +3636,7 @@ YYSTYPE yylval;
   case 66:
 
 /* Line 1455 of yacc.c  */
-#line 1464 "pxr/usd/sdf/textFileFormat.yy"
+#line 1451 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePseudoRoot, context);
             context->listOpType = SdfListOpTypeAppended;
@@ -3659,7 +3646,7 @@ YYSTYPE yylval;
   case 67:
 
 /* Line 1455 of yacc.c  */
-#line 1467 "pxr/usd/sdf/textFileFormat.yy"
+#line 1454 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePseudoRoot, context);
         ;}
@@ -3668,7 +3655,7 @@ YYSTYPE yylval;
   case 68:
 
 /* Line 1455 of yacc.c  */
-#line 1470 "pxr/usd/sdf/textFileFormat.yy"
+#line 1457 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePseudoRoot, context);
             context->listOpType = SdfListOpTypeOrdered;
@@ -3678,7 +3665,7 @@ YYSTYPE yylval;
   case 69:
 
 /* Line 1455 of yacc.c  */
-#line 1473 "pxr/usd/sdf/textFileFormat.yy"
+#line 1460 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePseudoRoot, context);
         ;}
@@ -3687,7 +3674,7 @@ YYSTYPE yylval;
   case 70:
 
 /* Line 1455 of yacc.c  */
-#line 1478 "pxr/usd/sdf/textFileFormat.yy"
+#line 1465 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Documentation, 
@@ -3698,7 +3685,7 @@ YYSTYPE yylval;
   case 71:
 
 /* Line 1455 of yacc.c  */
-#line 1485 "pxr/usd/sdf/textFileFormat.yy"
+#line 1472 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->LayerRelocates,
@@ -3710,7 +3697,7 @@ YYSTYPE yylval;
   case 74:
 
 /* Line 1455 of yacc.c  */
-#line 1498 "pxr/usd/sdf/textFileFormat.yy"
+#line 1485 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 SdfPath::AbsoluteRootPath(), SdfFieldKeys->SubLayers, 
@@ -3727,7 +3714,7 @@ YYSTYPE yylval;
   case 77:
 
 /* Line 1455 of yacc.c  */
-#line 1517 "pxr/usd/sdf/textFileFormat.yy"
+#line 1504 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->subLayerPaths.push_back(context->layerRefPath);
             context->subLayerOffsets.push_back(context->layerRefOffset);
@@ -3738,7 +3725,7 @@ YYSTYPE yylval;
   case 78:
 
 /* Line 1455 of yacc.c  */
-#line 1525 "pxr/usd/sdf/textFileFormat.yy"
+#line 1512 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = (yyvsp[(1) - (1)]).Get<std::string>();
             context->layerRefOffset = SdfLayerOffset();
@@ -3749,7 +3736,7 @@ YYSTYPE yylval;
   case 83:
 
 /* Line 1455 of yacc.c  */
-#line 1543 "pxr/usd/sdf/textFileFormat.yy"
+#line 1530 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefOffset.SetOffset( (yyvsp[(3) - (3)]).Get<double>() );
             ABORT_IF_ERROR(context->seenError);
@@ -3759,7 +3746,7 @@ YYSTYPE yylval;
   case 84:
 
 /* Line 1455 of yacc.c  */
-#line 1547 "pxr/usd/sdf/textFileFormat.yy"
+#line 1534 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefOffset.SetScale( (yyvsp[(3) - (3)]).Get<double>() );
             ABORT_IF_ERROR(context->seenError);
@@ -3769,7 +3756,7 @@ YYSTYPE yylval;
   case 87:
 
 /* Line 1455 of yacc.c  */
-#line 1563 "pxr/usd/sdf/textFileFormat.yy"
+#line 1550 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specifier = SdfSpecifierDef;
             context->typeName = TfToken();
@@ -3779,7 +3766,7 @@ YYSTYPE yylval;
   case 89:
 
 /* Line 1455 of yacc.c  */
-#line 1567 "pxr/usd/sdf/textFileFormat.yy"
+#line 1554 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specifier = SdfSpecifierDef;
             context->typeName = TfToken((yyvsp[(2) - (2)]).Get<std::string>());
@@ -3789,7 +3776,7 @@ YYSTYPE yylval;
   case 91:
 
 /* Line 1455 of yacc.c  */
-#line 1571 "pxr/usd/sdf/textFileFormat.yy"
+#line 1558 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specifier = SdfSpecifierClass;
             context->typeName = TfToken();
@@ -3799,7 +3786,7 @@ YYSTYPE yylval;
   case 93:
 
 /* Line 1455 of yacc.c  */
-#line 1575 "pxr/usd/sdf/textFileFormat.yy"
+#line 1562 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specifier = SdfSpecifierClass;
             context->typeName = TfToken((yyvsp[(2) - (2)]).Get<std::string>());
@@ -3809,7 +3796,7 @@ YYSTYPE yylval;
   case 95:
 
 /* Line 1455 of yacc.c  */
-#line 1579 "pxr/usd/sdf/textFileFormat.yy"
+#line 1566 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specifier = SdfSpecifierOver;
             context->typeName = TfToken();
@@ -3819,7 +3806,7 @@ YYSTYPE yylval;
   case 97:
 
 /* Line 1455 of yacc.c  */
-#line 1583 "pxr/usd/sdf/textFileFormat.yy"
+#line 1570 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specifier = SdfSpecifierOver;
             context->typeName = TfToken((yyvsp[(2) - (2)]).Get<std::string>());
@@ -3829,7 +3816,7 @@ YYSTYPE yylval;
   case 99:
 
 /* Line 1455 of yacc.c  */
-#line 1587 "pxr/usd/sdf/textFileFormat.yy"
+#line 1574 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->PrimOrder, 
@@ -3841,14 +3828,14 @@ YYSTYPE yylval;
   case 100:
 
 /* Line 1455 of yacc.c  */
-#line 1597 "pxr/usd/sdf/textFileFormat.yy"
+#line 1584 "pxr/usd/sdf/textFileFormat.yy"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
   case 101:
 
 /* Line 1455 of yacc.c  */
-#line 1598 "pxr/usd/sdf/textFileFormat.yy"
+#line 1585 "pxr/usd/sdf/textFileFormat.yy"
     { 
             (yyval) = std::string( (yyvsp[(1) - (3)]).Get<std::string>() + '.'
                     + (yyvsp[(3) - (3)]).Get<std::string>() ); 
@@ -3858,7 +3845,7 @@ YYSTYPE yylval;
   case 102:
 
 /* Line 1455 of yacc.c  */
-#line 1605 "pxr/usd/sdf/textFileFormat.yy"
+#line 1592 "pxr/usd/sdf/textFileFormat.yy"
     {
             TfToken name((yyvsp[(1) - (1)]).Get<std::string>());
             if (!SdfPath::IsValidIdentifier(name)) {
@@ -3894,7 +3881,7 @@ YYSTYPE yylval;
   case 103:
 
 /* Line 1455 of yacc.c  */
-#line 1638 "pxr/usd/sdf/textFileFormat.yy"
+#line 1625 "pxr/usd/sdf/textFileFormat.yy"
     {
             // Store the names of our children
             if (!context->nameChildrenStack.back().empty()) {
@@ -3922,7 +3909,7 @@ YYSTYPE yylval;
   case 113:
 
 /* Line 1455 of yacc.c  */
-#line 1686 "pxr/usd/sdf/textFileFormat.yy"
+#line 1673 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Comment, 
@@ -3933,7 +3920,7 @@ YYSTYPE yylval;
   case 114:
 
 /* Line 1455 of yacc.c  */
-#line 1691 "pxr/usd/sdf/textFileFormat.yy"
+#line 1678 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(1) - (1)]), SdfSpecTypePrim, context);
         ;}
@@ -3942,7 +3929,7 @@ YYSTYPE yylval;
   case 115:
 
 /* Line 1455 of yacc.c  */
-#line 1693 "pxr/usd/sdf/textFileFormat.yy"
+#line 1680 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePrim, context);
         ;}
@@ -3951,7 +3938,7 @@ YYSTYPE yylval;
   case 116:
 
 /* Line 1455 of yacc.c  */
-#line 1700 "pxr/usd/sdf/textFileFormat.yy"
+#line 1687 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePrim, context);
             context->listOpType = SdfListOpTypeDeleted;
@@ -3961,7 +3948,7 @@ YYSTYPE yylval;
   case 117:
 
 /* Line 1455 of yacc.c  */
-#line 1703 "pxr/usd/sdf/textFileFormat.yy"
+#line 1690 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePrim, context);
         ;}
@@ -3970,7 +3957,7 @@ YYSTYPE yylval;
   case 118:
 
 /* Line 1455 of yacc.c  */
-#line 1706 "pxr/usd/sdf/textFileFormat.yy"
+#line 1693 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePrim, context);
             context->listOpType = SdfListOpTypeAdded;
@@ -3980,7 +3967,7 @@ YYSTYPE yylval;
   case 119:
 
 /* Line 1455 of yacc.c  */
-#line 1709 "pxr/usd/sdf/textFileFormat.yy"
+#line 1696 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePrim, context);
         ;}
@@ -3989,7 +3976,7 @@ YYSTYPE yylval;
   case 120:
 
 /* Line 1455 of yacc.c  */
-#line 1712 "pxr/usd/sdf/textFileFormat.yy"
+#line 1699 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePrim, context);
             context->listOpType = SdfListOpTypePrepended;
@@ -3999,7 +3986,7 @@ YYSTYPE yylval;
   case 121:
 
 /* Line 1455 of yacc.c  */
-#line 1715 "pxr/usd/sdf/textFileFormat.yy"
+#line 1702 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePrim, context);
         ;}
@@ -4008,7 +3995,7 @@ YYSTYPE yylval;
   case 122:
 
 /* Line 1455 of yacc.c  */
-#line 1718 "pxr/usd/sdf/textFileFormat.yy"
+#line 1705 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePrim, context);
             context->listOpType = SdfListOpTypeAppended;
@@ -4018,7 +4005,7 @@ YYSTYPE yylval;
   case 123:
 
 /* Line 1455 of yacc.c  */
-#line 1721 "pxr/usd/sdf/textFileFormat.yy"
+#line 1708 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePrim, context);
         ;}
@@ -4027,7 +4014,7 @@ YYSTYPE yylval;
   case 124:
 
 /* Line 1455 of yacc.c  */
-#line 1724 "pxr/usd/sdf/textFileFormat.yy"
+#line 1711 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypePrim, context);
             context->listOpType = SdfListOpTypeOrdered;
@@ -4037,7 +4024,7 @@ YYSTYPE yylval;
   case 125:
 
 /* Line 1455 of yacc.c  */
-#line 1727 "pxr/usd/sdf/textFileFormat.yy"
+#line 1714 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypePrim, context);
         ;}
@@ -4046,7 +4033,7 @@ YYSTYPE yylval;
   case 126:
 
 /* Line 1455 of yacc.c  */
-#line 1732 "pxr/usd/sdf/textFileFormat.yy"
+#line 1719 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Documentation, 
@@ -4057,7 +4044,7 @@ YYSTYPE yylval;
   case 127:
 
 /* Line 1455 of yacc.c  */
-#line 1739 "pxr/usd/sdf/textFileFormat.yy"
+#line 1726 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Kind, 
@@ -4068,7 +4055,7 @@ YYSTYPE yylval;
   case 128:
 
 /* Line 1455 of yacc.c  */
-#line 1746 "pxr/usd/sdf/textFileFormat.yy"
+#line 1733 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Permission, 
@@ -4080,7 +4067,7 @@ YYSTYPE yylval;
   case 129:
 
 /* Line 1455 of yacc.c  */
-#line 1753 "pxr/usd/sdf/textFileFormat.yy"
+#line 1740 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4091,7 +4078,7 @@ YYSTYPE yylval;
   case 130:
 
 /* Line 1455 of yacc.c  */
-#line 1757 "pxr/usd/sdf/textFileFormat.yy"
+#line 1744 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetPayloadListItems(SdfListOpTypeExplicit, context);
         ;}
@@ -4100,7 +4087,7 @@ YYSTYPE yylval;
   case 131:
 
 /* Line 1455 of yacc.c  */
-#line 1760 "pxr/usd/sdf/textFileFormat.yy"
+#line 1747 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4111,7 +4098,7 @@ YYSTYPE yylval;
   case 132:
 
 /* Line 1455 of yacc.c  */
-#line 1764 "pxr/usd/sdf/textFileFormat.yy"
+#line 1751 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetPayloadListItems(SdfListOpTypeDeleted, context);
         ;}
@@ -4120,7 +4107,7 @@ YYSTYPE yylval;
   case 133:
 
 /* Line 1455 of yacc.c  */
-#line 1767 "pxr/usd/sdf/textFileFormat.yy"
+#line 1754 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4131,7 +4118,7 @@ YYSTYPE yylval;
   case 134:
 
 /* Line 1455 of yacc.c  */
-#line 1771 "pxr/usd/sdf/textFileFormat.yy"
+#line 1758 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetPayloadListItems(SdfListOpTypeAdded, context);
         ;}
@@ -4140,7 +4127,7 @@ YYSTYPE yylval;
   case 135:
 
 /* Line 1455 of yacc.c  */
-#line 1774 "pxr/usd/sdf/textFileFormat.yy"
+#line 1761 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4151,7 +4138,7 @@ YYSTYPE yylval;
   case 136:
 
 /* Line 1455 of yacc.c  */
-#line 1778 "pxr/usd/sdf/textFileFormat.yy"
+#line 1765 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetPayloadListItems(SdfListOpTypePrepended, context);
         ;}
@@ -4160,7 +4147,7 @@ YYSTYPE yylval;
   case 137:
 
 /* Line 1455 of yacc.c  */
-#line 1781 "pxr/usd/sdf/textFileFormat.yy"
+#line 1768 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4171,7 +4158,7 @@ YYSTYPE yylval;
   case 138:
 
 /* Line 1455 of yacc.c  */
-#line 1785 "pxr/usd/sdf/textFileFormat.yy"
+#line 1772 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetPayloadListItems(SdfListOpTypeAppended, context);
         ;}
@@ -4180,7 +4167,7 @@ YYSTYPE yylval;
   case 139:
 
 /* Line 1455 of yacc.c  */
-#line 1788 "pxr/usd/sdf/textFileFormat.yy"
+#line 1775 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4191,7 +4178,7 @@ YYSTYPE yylval;
   case 140:
 
 /* Line 1455 of yacc.c  */
-#line 1792 "pxr/usd/sdf/textFileFormat.yy"
+#line 1779 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetPayloadListItems(SdfListOpTypeOrdered, context);
         ;}
@@ -4200,7 +4187,7 @@ YYSTYPE yylval;
   case 141:
 
 /* Line 1455 of yacc.c  */
-#line 1796 "pxr/usd/sdf/textFileFormat.yy"
+#line 1783 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->inheritParsingTargetPaths.clear();
         ;}
@@ -4209,7 +4196,7 @@ YYSTYPE yylval;
   case 142:
 
 /* Line 1455 of yacc.c  */
-#line 1798 "pxr/usd/sdf/textFileFormat.yy"
+#line 1785 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetInheritListItems(SdfListOpTypeExplicit, context);
         ;}
@@ -4218,7 +4205,7 @@ YYSTYPE yylval;
   case 143:
 
 /* Line 1455 of yacc.c  */
-#line 1801 "pxr/usd/sdf/textFileFormat.yy"
+#line 1788 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->inheritParsingTargetPaths.clear();
         ;}
@@ -4227,7 +4214,7 @@ YYSTYPE yylval;
   case 144:
 
 /* Line 1455 of yacc.c  */
-#line 1803 "pxr/usd/sdf/textFileFormat.yy"
+#line 1790 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetInheritListItems(SdfListOpTypeDeleted, context);
         ;}
@@ -4236,7 +4223,7 @@ YYSTYPE yylval;
   case 145:
 
 /* Line 1455 of yacc.c  */
-#line 1806 "pxr/usd/sdf/textFileFormat.yy"
+#line 1793 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->inheritParsingTargetPaths.clear();
         ;}
@@ -4245,7 +4232,7 @@ YYSTYPE yylval;
   case 146:
 
 /* Line 1455 of yacc.c  */
-#line 1808 "pxr/usd/sdf/textFileFormat.yy"
+#line 1795 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetInheritListItems(SdfListOpTypeAdded, context);
         ;}
@@ -4254,7 +4241,7 @@ YYSTYPE yylval;
   case 147:
 
 /* Line 1455 of yacc.c  */
-#line 1811 "pxr/usd/sdf/textFileFormat.yy"
+#line 1798 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->inheritParsingTargetPaths.clear();
         ;}
@@ -4263,7 +4250,7 @@ YYSTYPE yylval;
   case 148:
 
 /* Line 1455 of yacc.c  */
-#line 1813 "pxr/usd/sdf/textFileFormat.yy"
+#line 1800 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetInheritListItems(SdfListOpTypePrepended, context);
         ;}
@@ -4272,7 +4259,7 @@ YYSTYPE yylval;
   case 149:
 
 /* Line 1455 of yacc.c  */
-#line 1816 "pxr/usd/sdf/textFileFormat.yy"
+#line 1803 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->inheritParsingTargetPaths.clear();
         ;}
@@ -4281,7 +4268,7 @@ YYSTYPE yylval;
   case 150:
 
 /* Line 1455 of yacc.c  */
-#line 1818 "pxr/usd/sdf/textFileFormat.yy"
+#line 1805 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetInheritListItems(SdfListOpTypeAppended, context);
         ;}
@@ -4290,7 +4277,7 @@ YYSTYPE yylval;
   case 151:
 
 /* Line 1455 of yacc.c  */
-#line 1821 "pxr/usd/sdf/textFileFormat.yy"
+#line 1808 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->inheritParsingTargetPaths.clear();
         ;}
@@ -4299,7 +4286,7 @@ YYSTYPE yylval;
   case 152:
 
 /* Line 1455 of yacc.c  */
-#line 1823 "pxr/usd/sdf/textFileFormat.yy"
+#line 1810 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetInheritListItems(SdfListOpTypeOrdered, context);
         ;}
@@ -4308,7 +4295,7 @@ YYSTYPE yylval;
   case 153:
 
 /* Line 1455 of yacc.c  */
-#line 1827 "pxr/usd/sdf/textFileFormat.yy"
+#line 1814 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specializesParsingTargetPaths.clear();
         ;}
@@ -4317,7 +4304,7 @@ YYSTYPE yylval;
   case 154:
 
 /* Line 1455 of yacc.c  */
-#line 1829 "pxr/usd/sdf/textFileFormat.yy"
+#line 1816 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetSpecializesListItems(SdfListOpTypeExplicit, context);
         ;}
@@ -4326,7 +4313,7 @@ YYSTYPE yylval;
   case 155:
 
 /* Line 1455 of yacc.c  */
-#line 1832 "pxr/usd/sdf/textFileFormat.yy"
+#line 1819 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specializesParsingTargetPaths.clear();
         ;}
@@ -4335,7 +4322,7 @@ YYSTYPE yylval;
   case 156:
 
 /* Line 1455 of yacc.c  */
-#line 1834 "pxr/usd/sdf/textFileFormat.yy"
+#line 1821 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetSpecializesListItems(SdfListOpTypeDeleted, context);
         ;}
@@ -4344,7 +4331,7 @@ YYSTYPE yylval;
   case 157:
 
 /* Line 1455 of yacc.c  */
-#line 1837 "pxr/usd/sdf/textFileFormat.yy"
+#line 1824 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specializesParsingTargetPaths.clear();
         ;}
@@ -4353,7 +4340,7 @@ YYSTYPE yylval;
   case 158:
 
 /* Line 1455 of yacc.c  */
-#line 1839 "pxr/usd/sdf/textFileFormat.yy"
+#line 1826 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetSpecializesListItems(SdfListOpTypeAdded, context);
         ;}
@@ -4362,7 +4349,7 @@ YYSTYPE yylval;
   case 159:
 
 /* Line 1455 of yacc.c  */
-#line 1842 "pxr/usd/sdf/textFileFormat.yy"
+#line 1829 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specializesParsingTargetPaths.clear();
         ;}
@@ -4371,7 +4358,7 @@ YYSTYPE yylval;
   case 160:
 
 /* Line 1455 of yacc.c  */
-#line 1844 "pxr/usd/sdf/textFileFormat.yy"
+#line 1831 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetSpecializesListItems(SdfListOpTypePrepended, context);
         ;}
@@ -4380,7 +4367,7 @@ YYSTYPE yylval;
   case 161:
 
 /* Line 1455 of yacc.c  */
-#line 1847 "pxr/usd/sdf/textFileFormat.yy"
+#line 1834 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specializesParsingTargetPaths.clear();
         ;}
@@ -4389,7 +4376,7 @@ YYSTYPE yylval;
   case 162:
 
 /* Line 1455 of yacc.c  */
-#line 1849 "pxr/usd/sdf/textFileFormat.yy"
+#line 1836 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetSpecializesListItems(SdfListOpTypeAppended, context);
         ;}
@@ -4398,7 +4385,7 @@ YYSTYPE yylval;
   case 163:
 
 /* Line 1455 of yacc.c  */
-#line 1852 "pxr/usd/sdf/textFileFormat.yy"
+#line 1839 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->specializesParsingTargetPaths.clear();
         ;}
@@ -4407,7 +4394,7 @@ YYSTYPE yylval;
   case 164:
 
 /* Line 1455 of yacc.c  */
-#line 1854 "pxr/usd/sdf/textFileFormat.yy"
+#line 1841 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetSpecializesListItems(SdfListOpTypeOrdered, context);
         ;}
@@ -4416,7 +4403,7 @@ YYSTYPE yylval;
   case 165:
 
 /* Line 1455 of yacc.c  */
-#line 1858 "pxr/usd/sdf/textFileFormat.yy"
+#line 1845 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4427,7 +4414,7 @@ YYSTYPE yylval;
   case 166:
 
 /* Line 1455 of yacc.c  */
-#line 1862 "pxr/usd/sdf/textFileFormat.yy"
+#line 1849 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetReferenceListItems(SdfListOpTypeExplicit, context);
         ;}
@@ -4436,7 +4423,7 @@ YYSTYPE yylval;
   case 167:
 
 /* Line 1455 of yacc.c  */
-#line 1865 "pxr/usd/sdf/textFileFormat.yy"
+#line 1852 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4447,7 +4434,7 @@ YYSTYPE yylval;
   case 168:
 
 /* Line 1455 of yacc.c  */
-#line 1869 "pxr/usd/sdf/textFileFormat.yy"
+#line 1856 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetReferenceListItems(SdfListOpTypeDeleted, context);
         ;}
@@ -4456,7 +4443,7 @@ YYSTYPE yylval;
   case 169:
 
 /* Line 1455 of yacc.c  */
-#line 1872 "pxr/usd/sdf/textFileFormat.yy"
+#line 1859 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4467,7 +4454,7 @@ YYSTYPE yylval;
   case 170:
 
 /* Line 1455 of yacc.c  */
-#line 1876 "pxr/usd/sdf/textFileFormat.yy"
+#line 1863 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetReferenceListItems(SdfListOpTypeAdded, context);
         ;}
@@ -4476,7 +4463,7 @@ YYSTYPE yylval;
   case 171:
 
 /* Line 1455 of yacc.c  */
-#line 1879 "pxr/usd/sdf/textFileFormat.yy"
+#line 1866 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4487,7 +4474,7 @@ YYSTYPE yylval;
   case 172:
 
 /* Line 1455 of yacc.c  */
-#line 1883 "pxr/usd/sdf/textFileFormat.yy"
+#line 1870 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetReferenceListItems(SdfListOpTypePrepended, context);
         ;}
@@ -4496,7 +4483,7 @@ YYSTYPE yylval;
   case 173:
 
 /* Line 1455 of yacc.c  */
-#line 1886 "pxr/usd/sdf/textFileFormat.yy"
+#line 1873 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4507,7 +4494,7 @@ YYSTYPE yylval;
   case 174:
 
 /* Line 1455 of yacc.c  */
-#line 1890 "pxr/usd/sdf/textFileFormat.yy"
+#line 1877 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetReferenceListItems(SdfListOpTypeAppended, context);
         ;}
@@ -4516,7 +4503,7 @@ YYSTYPE yylval;
   case 175:
 
 /* Line 1455 of yacc.c  */
-#line 1893 "pxr/usd/sdf/textFileFormat.yy"
+#line 1880 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->layerRefPath = std::string();
             context->savedPath = SdfPath();
@@ -4527,7 +4514,7 @@ YYSTYPE yylval;
   case 176:
 
 /* Line 1455 of yacc.c  */
-#line 1897 "pxr/usd/sdf/textFileFormat.yy"
+#line 1884 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetReferenceListItems(SdfListOpTypeOrdered, context);
         ;}
@@ -4536,7 +4523,7 @@ YYSTYPE yylval;
   case 177:
 
 /* Line 1455 of yacc.c  */
-#line 1902 "pxr/usd/sdf/textFileFormat.yy"
+#line 1889 "pxr/usd/sdf/textFileFormat.yy"
     {
             SdfRelocatesMap relocatesParsingMap(
                 std::make_move_iterator(context->relocatesParsing.begin()),
@@ -4551,7 +4538,7 @@ YYSTYPE yylval;
   case 178:
 
 /* Line 1455 of yacc.c  */
-#line 1913 "pxr/usd/sdf/textFileFormat.yy"
+#line 1900 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetVariantSelection(context);
         ;}
@@ -4560,7 +4547,7 @@ YYSTYPE yylval;
   case 179:
 
 /* Line 1455 of yacc.c  */
-#line 1917 "pxr/usd/sdf/textFileFormat.yy"
+#line 1904 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetVariantSetNamesListItems(SdfListOpTypeExplicit, context); 
             context->nameVector.clear();
@@ -4570,7 +4557,7 @@ YYSTYPE yylval;
   case 180:
 
 /* Line 1455 of yacc.c  */
-#line 1921 "pxr/usd/sdf/textFileFormat.yy"
+#line 1908 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetVariantSetNamesListItems(SdfListOpTypeDeleted, context);
             context->nameVector.clear();
@@ -4580,7 +4567,7 @@ YYSTYPE yylval;
   case 181:
 
 /* Line 1455 of yacc.c  */
-#line 1925 "pxr/usd/sdf/textFileFormat.yy"
+#line 1912 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetVariantSetNamesListItems(SdfListOpTypeAdded, context);
             context->nameVector.clear();
@@ -4590,7 +4577,7 @@ YYSTYPE yylval;
   case 182:
 
 /* Line 1455 of yacc.c  */
-#line 1929 "pxr/usd/sdf/textFileFormat.yy"
+#line 1916 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetVariantSetNamesListItems(SdfListOpTypePrepended, context);
             context->nameVector.clear();
@@ -4600,7 +4587,7 @@ YYSTYPE yylval;
   case 183:
 
 /* Line 1455 of yacc.c  */
-#line 1933 "pxr/usd/sdf/textFileFormat.yy"
+#line 1920 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetVariantSetNamesListItems(SdfListOpTypeAppended, context);
             context->nameVector.clear();
@@ -4610,7 +4597,7 @@ YYSTYPE yylval;
   case 184:
 
 /* Line 1455 of yacc.c  */
-#line 1937 "pxr/usd/sdf/textFileFormat.yy"
+#line 1924 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimSetVariantSetNamesListItems(SdfListOpTypeOrdered, context);
             context->nameVector.clear();
@@ -4620,7 +4607,7 @@ YYSTYPE yylval;
   case 185:
 
 /* Line 1455 of yacc.c  */
-#line 1943 "pxr/usd/sdf/textFileFormat.yy"
+#line 1930 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->SymmetryFunction, 
@@ -4631,7 +4618,7 @@ YYSTYPE yylval;
   case 186:
 
 /* Line 1455 of yacc.c  */
-#line 1948 "pxr/usd/sdf/textFileFormat.yy"
+#line 1935 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->SymmetryFunction, 
@@ -4642,7 +4629,7 @@ YYSTYPE yylval;
   case 187:
 
 /* Line 1455 of yacc.c  */
-#line 1955 "pxr/usd/sdf/textFileFormat.yy"
+#line 1942 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->PrefixSubstitutions, 
@@ -4654,7 +4641,7 @@ YYSTYPE yylval;
   case 188:
 
 /* Line 1455 of yacc.c  */
-#line 1963 "pxr/usd/sdf/textFileFormat.yy"
+#line 1950 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->SuffixSubstitutions, 
@@ -4666,7 +4653,7 @@ YYSTYPE yylval;
   case 195:
 
 /* Line 1455 of yacc.c  */
-#line 1984 "pxr/usd/sdf/textFileFormat.yy"
+#line 1971 "pxr/usd/sdf/textFileFormat.yy"
     {
         if (context->layerRefPath.empty()) {
             Err(context, "Payload asset path must not be empty. If this "
@@ -4684,7 +4671,7 @@ YYSTYPE yylval;
   case 196:
 
 /* Line 1455 of yacc.c  */
-#line 1996 "pxr/usd/sdf/textFileFormat.yy"
+#line 1983 "pxr/usd/sdf/textFileFormat.yy"
     {
         // Internal payloads do not begin with an asset path so there's
         // no layer_ref rule, but we need to make sure we reset state the
@@ -4698,7 +4685,7 @@ YYSTYPE yylval;
   case 197:
 
 /* Line 1455 of yacc.c  */
-#line 2004 "pxr/usd/sdf/textFileFormat.yy"
+#line 1991 "pxr/usd/sdf/textFileFormat.yy"
     {
         if (!(yyvsp[(1) - (3)]).Get<std::string>().empty()) {
            _PathSetPrim((yyvsp[(1) - (3)]), context);
@@ -4717,7 +4704,7 @@ YYSTYPE yylval;
   case 210:
 
 /* Line 1455 of yacc.c  */
-#line 2047 "pxr/usd/sdf/textFileFormat.yy"
+#line 2034 "pxr/usd/sdf/textFileFormat.yy"
     {
         if (context->layerRefPath.empty()) {
             Err(context, "Reference asset path must not be empty. If this "
@@ -4736,7 +4723,7 @@ YYSTYPE yylval;
   case 211:
 
 /* Line 1455 of yacc.c  */
-#line 2060 "pxr/usd/sdf/textFileFormat.yy"
+#line 2047 "pxr/usd/sdf/textFileFormat.yy"
     {
         // Internal references do not begin with an asset path so there's
         // no layer_ref rule, but we need to make sure we reset state the
@@ -4750,7 +4737,7 @@ YYSTYPE yylval;
   case 212:
 
 /* Line 1455 of yacc.c  */
-#line 2068 "pxr/usd/sdf/textFileFormat.yy"
+#line 2055 "pxr/usd/sdf/textFileFormat.yy"
     {
         if (!(yyvsp[(1) - (3)]).Get<std::string>().empty()) {
            _PathSetPrim((yyvsp[(1) - (3)]), context);
@@ -4770,7 +4757,7 @@ YYSTYPE yylval;
   case 226:
 
 /* Line 1455 of yacc.c  */
-#line 2113 "pxr/usd/sdf/textFileFormat.yy"
+#line 2100 "pxr/usd/sdf/textFileFormat.yy"
     {
         _InheritAppendPath(context);
         ;}
@@ -4779,7 +4766,7 @@ YYSTYPE yylval;
   case 233:
 
 /* Line 1455 of yacc.c  */
-#line 2131 "pxr/usd/sdf/textFileFormat.yy"
+#line 2118 "pxr/usd/sdf/textFileFormat.yy"
     {
         _SpecializesAppendPath(context);
         ;}
@@ -4788,7 +4775,7 @@ YYSTYPE yylval;
   case 239:
 
 /* Line 1455 of yacc.c  */
-#line 2151 "pxr/usd/sdf/textFileFormat.yy"
+#line 2138 "pxr/usd/sdf/textFileFormat.yy"
     {
             _RelocatesAdd((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), context);
         ;}
@@ -4797,7 +4784,7 @@ YYSTYPE yylval;
   case 244:
 
 /* Line 1455 of yacc.c  */
-#line 2167 "pxr/usd/sdf/textFileFormat.yy"
+#line 2154 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->nameVector.push_back(TfToken((yyvsp[(1) - (1)]).Get<std::string>()));
         ;}
@@ -4806,28 +4793,28 @@ YYSTYPE yylval;
   case 249:
 
 /* Line 1455 of yacc.c  */
-#line 2185 "pxr/usd/sdf/textFileFormat.yy"
+#line 2172 "pxr/usd/sdf/textFileFormat.yy"
     {;}
     break;
 
   case 250:
 
 /* Line 1455 of yacc.c  */
-#line 2186 "pxr/usd/sdf/textFileFormat.yy"
+#line 2173 "pxr/usd/sdf/textFileFormat.yy"
     {;}
     break;
 
   case 251:
 
 /* Line 1455 of yacc.c  */
-#line 2187 "pxr/usd/sdf/textFileFormat.yy"
+#line 2174 "pxr/usd/sdf/textFileFormat.yy"
     {;}
     break;
 
   case 254:
 
 /* Line 1455 of yacc.c  */
-#line 2193 "pxr/usd/sdf/textFileFormat.yy"
+#line 2180 "pxr/usd/sdf/textFileFormat.yy"
     {
         const std::string name = (yyvsp[(2) - (2)]).Get<std::string>();
         ERROR_IF_NOT_ALLOWED(context, SdfSchema::IsValidVariantIdentifier(name));
@@ -4842,7 +4829,7 @@ YYSTYPE yylval;
   case 255:
 
 /* Line 1455 of yacc.c  */
-#line 2201 "pxr/usd/sdf/textFileFormat.yy"
+#line 2188 "pxr/usd/sdf/textFileFormat.yy"
     {
 
         SdfPath variantSetPath = context->path;
@@ -4871,7 +4858,7 @@ YYSTYPE yylval;
   case 258:
 
 /* Line 1455 of yacc.c  */
-#line 2232 "pxr/usd/sdf/textFileFormat.yy"
+#line 2219 "pxr/usd/sdf/textFileFormat.yy"
     {
         const std::string variantName = (yyvsp[(1) - (1)]).Get<std::string>();
         ERROR_IF_NOT_ALLOWED(
@@ -4898,7 +4885,7 @@ YYSTYPE yylval;
   case 259:
 
 /* Line 1455 of yacc.c  */
-#line 2252 "pxr/usd/sdf/textFileFormat.yy"
+#line 2239 "pxr/usd/sdf/textFileFormat.yy"
     {
         // Store the names of the prims and properties defined in this variant.
         if (!context->nameChildrenStack.back().empty()) {
@@ -4924,7 +4911,7 @@ YYSTYPE yylval;
   case 260:
 
 /* Line 1455 of yacc.c  */
-#line 2275 "pxr/usd/sdf/textFileFormat.yy"
+#line 2262 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->PrimOrder, 
@@ -4936,7 +4923,7 @@ YYSTYPE yylval;
   case 261:
 
 /* Line 1455 of yacc.c  */
-#line 2284 "pxr/usd/sdf/textFileFormat.yy"
+#line 2271 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->PropertyOrder, 
@@ -4948,7 +4935,7 @@ YYSTYPE yylval;
   case 264:
 
 /* Line 1455 of yacc.c  */
-#line 2306 "pxr/usd/sdf/textFileFormat.yy"
+#line 2293 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->variability = VtValue(SdfVariabilityUniform);
     ;}
@@ -4957,7 +4944,7 @@ YYSTYPE yylval;
   case 265:
 
 /* Line 1455 of yacc.c  */
-#line 2309 "pxr/usd/sdf/textFileFormat.yy"
+#line 2296 "pxr/usd/sdf/textFileFormat.yy"
     {
         // Convert legacy "config" variability to SdfVariabilityUniform.
         // This value was never officially used in USD but we handle
@@ -4969,7 +4956,7 @@ YYSTYPE yylval;
   case 266:
 
 /* Line 1455 of yacc.c  */
-#line 2318 "pxr/usd/sdf/textFileFormat.yy"
+#line 2305 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->assoc = VtValue();
     ;}
@@ -4978,7 +4965,7 @@ YYSTYPE yylval;
   case 267:
 
 /* Line 1455 of yacc.c  */
-#line 2324 "pxr/usd/sdf/textFileFormat.yy"
+#line 2311 "pxr/usd/sdf/textFileFormat.yy"
     {
         _SetupValue((yyvsp[(1) - (1)]).Get<std::string>(), context);
     ;}
@@ -4987,7 +4974,7 @@ YYSTYPE yylval;
   case 268:
 
 /* Line 1455 of yacc.c  */
-#line 2327 "pxr/usd/sdf/textFileFormat.yy"
+#line 2314 "pxr/usd/sdf/textFileFormat.yy"
     {
         _SetupValue(std::string((yyvsp[(1) - (3)]).Get<std::string>() + "[]"), context);
     ;}
@@ -4996,7 +4983,7 @@ YYSTYPE yylval;
   case 269:
 
 /* Line 1455 of yacc.c  */
-#line 2333 "pxr/usd/sdf/textFileFormat.yy"
+#line 2320 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->variability = VtValue();
         context->custom = false;
@@ -5006,7 +4993,7 @@ YYSTYPE yylval;
   case 270:
 
 /* Line 1455 of yacc.c  */
-#line 2337 "pxr/usd/sdf/textFileFormat.yy"
+#line 2324 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->custom = false;
     ;}
@@ -5015,7 +5002,7 @@ YYSTYPE yylval;
   case 271:
 
 /* Line 1455 of yacc.c  */
-#line 2343 "pxr/usd/sdf/textFileFormat.yy"
+#line 2330 "pxr/usd/sdf/textFileFormat.yy"
     {
         _PrimInitAttribute((yyvsp[(2) - (2)]), context);
 
@@ -5028,7 +5015,7 @@ YYSTYPE yylval;
   case 272:
 
 /* Line 1455 of yacc.c  */
-#line 2350 "pxr/usd/sdf/textFileFormat.yy"
+#line 2337 "pxr/usd/sdf/textFileFormat.yy"
     {
         if (!context->values.valueTypeIsValid) {
             context->values.StopRecordingString();
@@ -5039,7 +5026,7 @@ YYSTYPE yylval;
   case 273:
 
 /* Line 1455 of yacc.c  */
-#line 2355 "pxr/usd/sdf/textFileFormat.yy"
+#line 2342 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->path = context->path.GetParentPath();
     ;}
@@ -5048,7 +5035,7 @@ YYSTYPE yylval;
   case 274:
 
 /* Line 1455 of yacc.c  */
-#line 2361 "pxr/usd/sdf/textFileFormat.yy"
+#line 2348 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->custom = true;
         _PrimInitAttribute((yyvsp[(3) - (3)]), context);
@@ -5062,7 +5049,7 @@ YYSTYPE yylval;
   case 275:
 
 /* Line 1455 of yacc.c  */
-#line 2369 "pxr/usd/sdf/textFileFormat.yy"
+#line 2356 "pxr/usd/sdf/textFileFormat.yy"
     {
         if (!context->values.valueTypeIsValid) {
             context->values.StopRecordingString();
@@ -5073,7 +5060,7 @@ YYSTYPE yylval;
   case 276:
 
 /* Line 1455 of yacc.c  */
-#line 2374 "pxr/usd/sdf/textFileFormat.yy"
+#line 2361 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->path = context->path.GetParentPath();
     ;}
@@ -5082,7 +5069,7 @@ YYSTYPE yylval;
   case 277:
 
 /* Line 1455 of yacc.c  */
-#line 2380 "pxr/usd/sdf/textFileFormat.yy"
+#line 2367 "pxr/usd/sdf/textFileFormat.yy"
     {
         _PrimInitAttribute((yyvsp[(2) - (5)]), context);
         context->connParsingTargetPaths.clear();
@@ -5093,7 +5080,7 @@ YYSTYPE yylval;
   case 278:
 
 /* Line 1455 of yacc.c  */
-#line 2384 "pxr/usd/sdf/textFileFormat.yy"
+#line 2371 "pxr/usd/sdf/textFileFormat.yy"
     {
         _AttributeSetConnectionTargetsList(SdfListOpTypeExplicit, context);
         context->path = context->path.GetParentPath();
@@ -5103,7 +5090,7 @@ YYSTYPE yylval;
   case 279:
 
 /* Line 1455 of yacc.c  */
-#line 2388 "pxr/usd/sdf/textFileFormat.yy"
+#line 2375 "pxr/usd/sdf/textFileFormat.yy"
     {
         _PrimInitAttribute((yyvsp[(3) - (6)]), context);
         context->connParsingTargetPaths.clear();
@@ -5114,7 +5101,7 @@ YYSTYPE yylval;
   case 280:
 
 /* Line 1455 of yacc.c  */
-#line 2392 "pxr/usd/sdf/textFileFormat.yy"
+#line 2379 "pxr/usd/sdf/textFileFormat.yy"
     {
         _AttributeSetConnectionTargetsList(SdfListOpTypeAdded, context);
         context->path = context->path.GetParentPath();
@@ -5124,7 +5111,7 @@ YYSTYPE yylval;
   case 281:
 
 /* Line 1455 of yacc.c  */
-#line 2396 "pxr/usd/sdf/textFileFormat.yy"
+#line 2383 "pxr/usd/sdf/textFileFormat.yy"
     {
         _PrimInitAttribute((yyvsp[(3) - (6)]), context);
         context->connParsingTargetPaths.clear();
@@ -5135,7 +5122,7 @@ YYSTYPE yylval;
   case 282:
 
 /* Line 1455 of yacc.c  */
-#line 2400 "pxr/usd/sdf/textFileFormat.yy"
+#line 2387 "pxr/usd/sdf/textFileFormat.yy"
     {
         _AttributeSetConnectionTargetsList(SdfListOpTypePrepended, context);
         context->path = context->path.GetParentPath();
@@ -5145,7 +5132,7 @@ YYSTYPE yylval;
   case 283:
 
 /* Line 1455 of yacc.c  */
-#line 2404 "pxr/usd/sdf/textFileFormat.yy"
+#line 2391 "pxr/usd/sdf/textFileFormat.yy"
     {
         _PrimInitAttribute((yyvsp[(3) - (6)]), context);
         context->connParsingTargetPaths.clear();
@@ -5156,7 +5143,7 @@ YYSTYPE yylval;
   case 284:
 
 /* Line 1455 of yacc.c  */
-#line 2408 "pxr/usd/sdf/textFileFormat.yy"
+#line 2395 "pxr/usd/sdf/textFileFormat.yy"
     {
         _AttributeSetConnectionTargetsList(SdfListOpTypeAppended, context);
         context->path = context->path.GetParentPath();
@@ -5166,7 +5153,7 @@ YYSTYPE yylval;
   case 285:
 
 /* Line 1455 of yacc.c  */
-#line 2412 "pxr/usd/sdf/textFileFormat.yy"
+#line 2399 "pxr/usd/sdf/textFileFormat.yy"
     {
         _PrimInitAttribute((yyvsp[(3) - (6)]), context);
         context->connParsingTargetPaths.clear();
@@ -5177,7 +5164,7 @@ YYSTYPE yylval;
   case 286:
 
 /* Line 1455 of yacc.c  */
-#line 2416 "pxr/usd/sdf/textFileFormat.yy"
+#line 2403 "pxr/usd/sdf/textFileFormat.yy"
     {
         _AttributeSetConnectionTargetsList(SdfListOpTypeDeleted, context);
         context->path = context->path.GetParentPath();
@@ -5187,7 +5174,7 @@ YYSTYPE yylval;
   case 287:
 
 /* Line 1455 of yacc.c  */
-#line 2420 "pxr/usd/sdf/textFileFormat.yy"
+#line 2407 "pxr/usd/sdf/textFileFormat.yy"
     {
         _PrimInitAttribute((yyvsp[(3) - (6)]), context);
         context->connParsingTargetPaths.clear();
@@ -5198,7 +5185,7 @@ YYSTYPE yylval;
   case 288:
 
 /* Line 1455 of yacc.c  */
-#line 2424 "pxr/usd/sdf/textFileFormat.yy"
+#line 2411 "pxr/usd/sdf/textFileFormat.yy"
     {
         _AttributeSetConnectionTargetsList(SdfListOpTypeOrdered, context);
         context->path = context->path.GetParentPath();
@@ -5208,7 +5195,7 @@ YYSTYPE yylval;
   case 289:
 
 /* Line 1455 of yacc.c  */
-#line 2431 "pxr/usd/sdf/textFileFormat.yy"
+#line 2418 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitAttribute((yyvsp[(2) - (5)]), context);
         ;}
@@ -5217,7 +5204,7 @@ YYSTYPE yylval;
   case 290:
 
 /* Line 1455 of yacc.c  */
-#line 2434 "pxr/usd/sdf/textFileFormat.yy"
+#line 2421 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->TimeSamples,
@@ -5229,7 +5216,7 @@ YYSTYPE yylval;
   case 301:
 
 /* Line 1455 of yacc.c  */
-#line 2466 "pxr/usd/sdf/textFileFormat.yy"
+#line 2453 "pxr/usd/sdf/textFileFormat.yy"
     {
             _AttributeAppendConnectionPath(context);
         ;}
@@ -5238,7 +5225,7 @@ YYSTYPE yylval;
   case 302:
 
 /* Line 1455 of yacc.c  */
-#line 2476 "pxr/usd/sdf/textFileFormat.yy"
+#line 2463 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->timeSamples = SdfTimeSampleMap();
     ;}
@@ -5247,7 +5234,7 @@ YYSTYPE yylval;
   case 308:
 
 /* Line 1455 of yacc.c  */
-#line 2492 "pxr/usd/sdf/textFileFormat.yy"
+#line 2479 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->timeSampleTime = (yyvsp[(1) - (2)]).Get<double>();
     ;}
@@ -5256,7 +5243,7 @@ YYSTYPE yylval;
   case 309:
 
 /* Line 1455 of yacc.c  */
-#line 2495 "pxr/usd/sdf/textFileFormat.yy"
+#line 2482 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->timeSamples[ context->timeSampleTime ] = context->currentValue;
     ;}
@@ -5265,7 +5252,7 @@ YYSTYPE yylval;
   case 310:
 
 /* Line 1455 of yacc.c  */
-#line 2499 "pxr/usd/sdf/textFileFormat.yy"
+#line 2486 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->timeSampleTime = (yyvsp[(1) - (3)]).Get<double>();
         context->timeSamples[ context->timeSampleTime ] 
@@ -5276,7 +5263,7 @@ YYSTYPE yylval;
   case 319:
 
 /* Line 1455 of yacc.c  */
-#line 2529 "pxr/usd/sdf/textFileFormat.yy"
+#line 2516 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Comment,
@@ -5287,7 +5274,7 @@ YYSTYPE yylval;
   case 320:
 
 /* Line 1455 of yacc.c  */
-#line 2534 "pxr/usd/sdf/textFileFormat.yy"
+#line 2521 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(1) - (1)]), SdfSpecTypeAttribute, context);
         ;}
@@ -5296,7 +5283,7 @@ YYSTYPE yylval;
   case 321:
 
 /* Line 1455 of yacc.c  */
-#line 2536 "pxr/usd/sdf/textFileFormat.yy"
+#line 2523 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeAttribute, context);
         ;}
@@ -5305,7 +5292,7 @@ YYSTYPE yylval;
   case 322:
 
 /* Line 1455 of yacc.c  */
-#line 2543 "pxr/usd/sdf/textFileFormat.yy"
+#line 2530 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeAttribute, context);
             context->listOpType = SdfListOpTypeDeleted;
@@ -5315,7 +5302,7 @@ YYSTYPE yylval;
   case 323:
 
 /* Line 1455 of yacc.c  */
-#line 2546 "pxr/usd/sdf/textFileFormat.yy"
+#line 2533 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeAttribute, context);
         ;}
@@ -5324,7 +5311,7 @@ YYSTYPE yylval;
   case 324:
 
 /* Line 1455 of yacc.c  */
-#line 2549 "pxr/usd/sdf/textFileFormat.yy"
+#line 2536 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeAttribute, context);
             context->listOpType = SdfListOpTypeAdded;
@@ -5334,7 +5321,7 @@ YYSTYPE yylval;
   case 325:
 
 /* Line 1455 of yacc.c  */
-#line 2552 "pxr/usd/sdf/textFileFormat.yy"
+#line 2539 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeAttribute, context);
         ;}
@@ -5343,7 +5330,7 @@ YYSTYPE yylval;
   case 326:
 
 /* Line 1455 of yacc.c  */
-#line 2555 "pxr/usd/sdf/textFileFormat.yy"
+#line 2542 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeAttribute, context);
             context->listOpType = SdfListOpTypePrepended;
@@ -5353,7 +5340,7 @@ YYSTYPE yylval;
   case 327:
 
 /* Line 1455 of yacc.c  */
-#line 2558 "pxr/usd/sdf/textFileFormat.yy"
+#line 2545 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeAttribute, context);
         ;}
@@ -5362,7 +5349,7 @@ YYSTYPE yylval;
   case 328:
 
 /* Line 1455 of yacc.c  */
-#line 2561 "pxr/usd/sdf/textFileFormat.yy"
+#line 2548 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeAttribute, context);
             context->listOpType = SdfListOpTypeAppended;
@@ -5372,7 +5359,7 @@ YYSTYPE yylval;
   case 329:
 
 /* Line 1455 of yacc.c  */
-#line 2564 "pxr/usd/sdf/textFileFormat.yy"
+#line 2551 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeAttribute, context);
         ;}
@@ -5381,7 +5368,7 @@ YYSTYPE yylval;
   case 330:
 
 /* Line 1455 of yacc.c  */
-#line 2567 "pxr/usd/sdf/textFileFormat.yy"
+#line 2554 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeAttribute, context);
             context->listOpType = SdfListOpTypeOrdered;
@@ -5391,7 +5378,7 @@ YYSTYPE yylval;
   case 331:
 
 /* Line 1455 of yacc.c  */
-#line 2570 "pxr/usd/sdf/textFileFormat.yy"
+#line 2557 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeAttribute, context);
         ;}
@@ -5400,7 +5387,7 @@ YYSTYPE yylval;
   case 332:
 
 /* Line 1455 of yacc.c  */
-#line 2575 "pxr/usd/sdf/textFileFormat.yy"
+#line 2562 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Documentation,
@@ -5411,7 +5398,7 @@ YYSTYPE yylval;
   case 333:
 
 /* Line 1455 of yacc.c  */
-#line 2582 "pxr/usd/sdf/textFileFormat.yy"
+#line 2569 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Permission,
@@ -5423,7 +5410,7 @@ YYSTYPE yylval;
   case 334:
 
 /* Line 1455 of yacc.c  */
-#line 2589 "pxr/usd/sdf/textFileFormat.yy"
+#line 2576 "pxr/usd/sdf/textFileFormat.yy"
     {
              _SetField(
                  context->path, SdfFieldKeys->DisplayUnit,
@@ -5435,7 +5422,7 @@ YYSTYPE yylval;
   case 335:
 
 /* Line 1455 of yacc.c  */
-#line 2597 "pxr/usd/sdf/textFileFormat.yy"
+#line 2584 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->SymmetryFunction,
@@ -5446,7 +5433,7 @@ YYSTYPE yylval;
   case 336:
 
 /* Line 1455 of yacc.c  */
-#line 2602 "pxr/usd/sdf/textFileFormat.yy"
+#line 2589 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->SymmetryFunction,
@@ -5457,7 +5444,7 @@ YYSTYPE yylval;
   case 339:
 
 /* Line 1455 of yacc.c  */
-#line 2615 "pxr/usd/sdf/textFileFormat.yy"
+#line 2602 "pxr/usd/sdf/textFileFormat.yy"
     {
         _SetDefault(context->path, context->currentValue, context);
     ;}
@@ -5466,7 +5453,7 @@ YYSTYPE yylval;
   case 340:
 
 /* Line 1455 of yacc.c  */
-#line 2618 "pxr/usd/sdf/textFileFormat.yy"
+#line 2605 "pxr/usd/sdf/textFileFormat.yy"
     {
         _SetDefault(context->path, VtValue(SdfValueBlock()), context);
     ;}
@@ -5475,7 +5462,7 @@ YYSTYPE yylval;
   case 341:
 
 /* Line 1455 of yacc.c  */
-#line 2628 "pxr/usd/sdf/textFileFormat.yy"
+#line 2615 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryBegin(context);
         ;}
@@ -5484,7 +5471,7 @@ YYSTYPE yylval;
   case 342:
 
 /* Line 1455 of yacc.c  */
-#line 2631 "pxr/usd/sdf/textFileFormat.yy"
+#line 2618 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryEnd(context);
         ;}
@@ -5493,7 +5480,7 @@ YYSTYPE yylval;
   case 347:
 
 /* Line 1455 of yacc.c  */
-#line 2647 "pxr/usd/sdf/textFileFormat.yy"
+#line 2634 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryInsertValue((yyvsp[(2) - (4)]), context);
         ;}
@@ -5502,7 +5489,7 @@ YYSTYPE yylval;
   case 348:
 
 /* Line 1455 of yacc.c  */
-#line 2650 "pxr/usd/sdf/textFileFormat.yy"
+#line 2637 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryInsertDictionary((yyvsp[(2) - (4)]), context);
         ;}
@@ -5511,7 +5498,7 @@ YYSTYPE yylval;
   case 353:
 
 /* Line 1455 of yacc.c  */
-#line 2668 "pxr/usd/sdf/textFileFormat.yy"
+#line 2655 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryInitScalarFactory((yyvsp[(1) - (1)]), context);
     ;}
@@ -5520,7 +5507,7 @@ YYSTYPE yylval;
   case 354:
 
 /* Line 1455 of yacc.c  */
-#line 2674 "pxr/usd/sdf/textFileFormat.yy"
+#line 2661 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryInitShapedFactory((yyvsp[(1) - (3)]), context);
     ;}
@@ -5529,7 +5516,7 @@ YYSTYPE yylval;
   case 355:
 
 /* Line 1455 of yacc.c  */
-#line 2684 "pxr/usd/sdf/textFileFormat.yy"
+#line 2671 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryBegin(context);
         ;}
@@ -5538,7 +5525,7 @@ YYSTYPE yylval;
   case 356:
 
 /* Line 1455 of yacc.c  */
-#line 2687 "pxr/usd/sdf/textFileFormat.yy"
+#line 2674 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryEnd(context);
         ;}
@@ -5547,7 +5534,7 @@ YYSTYPE yylval;
   case 361:
 
 /* Line 1455 of yacc.c  */
-#line 2703 "pxr/usd/sdf/textFileFormat.yy"
+#line 2690 "pxr/usd/sdf/textFileFormat.yy"
     {
             _DictionaryInitScalarFactory(Value(std::string("string")), context);
             _ValueAppendAtomic((yyvsp[(3) - (3)]), context);
@@ -5559,7 +5546,7 @@ YYSTYPE yylval;
   case 362:
 
 /* Line 1455 of yacc.c  */
-#line 2716 "pxr/usd/sdf/textFileFormat.yy"
+#line 2703 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->currentValue = VtValue();
         if (context->values.IsRecordingString()) {
@@ -5571,7 +5558,7 @@ YYSTYPE yylval;
   case 363:
 
 /* Line 1455 of yacc.c  */
-#line 2722 "pxr/usd/sdf/textFileFormat.yy"
+#line 2709 "pxr/usd/sdf/textFileFormat.yy"
     {
         _ValueSetList(context);
     ;}
@@ -5580,7 +5567,7 @@ YYSTYPE yylval;
   case 364:
 
 /* Line 1455 of yacc.c  */
-#line 2732 "pxr/usd/sdf/textFileFormat.yy"
+#line 2719 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->currentValue.Swap(context->currentDictionaries[0]);
             context->currentDictionaries[0].clear();
@@ -5590,7 +5577,7 @@ YYSTYPE yylval;
   case 366:
 
 /* Line 1455 of yacc.c  */
-#line 2737 "pxr/usd/sdf/textFileFormat.yy"
+#line 2724 "pxr/usd/sdf/textFileFormat.yy"
     {
             // This is only here to allow 'None' metadata values for
             // an explicit list operation on an SdfListOp-valued field.
@@ -5606,7 +5593,7 @@ YYSTYPE yylval;
   case 367:
 
 /* Line 1455 of yacc.c  */
-#line 2750 "pxr/usd/sdf/textFileFormat.yy"
+#line 2737 "pxr/usd/sdf/textFileFormat.yy"
     {
             _ValueSetAtomic(context);
         ;}
@@ -5615,7 +5602,7 @@ YYSTYPE yylval;
   case 368:
 
 /* Line 1455 of yacc.c  */
-#line 2753 "pxr/usd/sdf/textFileFormat.yy"
+#line 2740 "pxr/usd/sdf/textFileFormat.yy"
     {
             _ValueSetTuple(context);
         ;}
@@ -5624,7 +5611,7 @@ YYSTYPE yylval;
   case 369:
 
 /* Line 1455 of yacc.c  */
-#line 2756 "pxr/usd/sdf/textFileFormat.yy"
+#line 2743 "pxr/usd/sdf/textFileFormat.yy"
     {
             _ValueSetList(context);
         ;}
@@ -5633,7 +5620,7 @@ YYSTYPE yylval;
   case 370:
 
 /* Line 1455 of yacc.c  */
-#line 2759 "pxr/usd/sdf/textFileFormat.yy"
+#line 2746 "pxr/usd/sdf/textFileFormat.yy"
     {
             // Set the recorded string on the ParserValueContext. Normally
             // 'values' is able to keep track of the parsed string, but in this
@@ -5650,7 +5637,7 @@ YYSTYPE yylval;
   case 371:
 
 /* Line 1455 of yacc.c  */
-#line 2770 "pxr/usd/sdf/textFileFormat.yy"
+#line 2757 "pxr/usd/sdf/textFileFormat.yy"
     {
             _ValueSetCurrentToSdfPath((yyvsp[(1) - (1)]), context);
         ;}
@@ -5659,7 +5646,7 @@ YYSTYPE yylval;
   case 372:
 
 /* Line 1455 of yacc.c  */
-#line 2776 "pxr/usd/sdf/textFileFormat.yy"
+#line 2763 "pxr/usd/sdf/textFileFormat.yy"
     {
             _ValueAppendAtomic((yyvsp[(1) - (1)]), context);
         ;}
@@ -5668,7 +5655,7 @@ YYSTYPE yylval;
   case 373:
 
 /* Line 1455 of yacc.c  */
-#line 2779 "pxr/usd/sdf/textFileFormat.yy"
+#line 2766 "pxr/usd/sdf/textFileFormat.yy"
     {
             _ValueAppendAtomic((yyvsp[(1) - (1)]), context);
         ;}
@@ -5677,7 +5664,7 @@ YYSTYPE yylval;
   case 374:
 
 /* Line 1455 of yacc.c  */
-#line 2782 "pxr/usd/sdf/textFileFormat.yy"
+#line 2769 "pxr/usd/sdf/textFileFormat.yy"
     {
             // The ParserValueContext needs identifiers to be stored as TfToken
             // instead of std::string to be able to distinguish between them.
@@ -5688,7 +5675,7 @@ YYSTYPE yylval;
   case 375:
 
 /* Line 1455 of yacc.c  */
-#line 2787 "pxr/usd/sdf/textFileFormat.yy"
+#line 2774 "pxr/usd/sdf/textFileFormat.yy"
     {
             // The ParserValueContext needs asset paths to be stored as
             // SdfAssetPath instead of std::string to be able to distinguish
@@ -5700,7 +5687,7 @@ YYSTYPE yylval;
   case 376:
 
 /* Line 1455 of yacc.c  */
-#line 2800 "pxr/usd/sdf/textFileFormat.yy"
+#line 2787 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->values.BeginList();
         ;}
@@ -5709,7 +5696,7 @@ YYSTYPE yylval;
   case 377:
 
 /* Line 1455 of yacc.c  */
-#line 2803 "pxr/usd/sdf/textFileFormat.yy"
+#line 2790 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->values.EndList();
         ;}
@@ -5718,7 +5705,7 @@ YYSTYPE yylval;
   case 384:
 
 /* Line 1455 of yacc.c  */
-#line 2828 "pxr/usd/sdf/textFileFormat.yy"
+#line 2815 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->values.BeginTuple();
         ;}
@@ -5727,7 +5714,7 @@ YYSTYPE yylval;
   case 385:
 
 /* Line 1455 of yacc.c  */
-#line 2830 "pxr/usd/sdf/textFileFormat.yy"
+#line 2817 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->values.EndTuple();
         ;}
@@ -5736,7 +5723,7 @@ YYSTYPE yylval;
   case 391:
 
 /* Line 1455 of yacc.c  */
-#line 2853 "pxr/usd/sdf/textFileFormat.yy"
+#line 2840 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->custom = false;
         context->variability = VtValue(SdfVariabilityUniform);
@@ -5746,7 +5733,7 @@ YYSTYPE yylval;
   case 392:
 
 /* Line 1455 of yacc.c  */
-#line 2857 "pxr/usd/sdf/textFileFormat.yy"
+#line 2844 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->custom = true;
         context->variability = VtValue(SdfVariabilityUniform);
@@ -5756,7 +5743,7 @@ YYSTYPE yylval;
   case 393:
 
 /* Line 1455 of yacc.c  */
-#line 2861 "pxr/usd/sdf/textFileFormat.yy"
+#line 2848 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->custom = true;
         context->variability = VtValue(SdfVariabilityVarying);
@@ -5766,7 +5753,7 @@ YYSTYPE yylval;
   case 394:
 
 /* Line 1455 of yacc.c  */
-#line 2865 "pxr/usd/sdf/textFileFormat.yy"
+#line 2852 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->custom = false;
         context->variability = VtValue(SdfVariabilityVarying);
@@ -5776,7 +5763,7 @@ YYSTYPE yylval;
   case 395:
 
 /* Line 1455 of yacc.c  */
-#line 2872 "pxr/usd/sdf/textFileFormat.yy"
+#line 2859 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitRelationship((yyvsp[(2) - (5)]), context); 
         ;}
@@ -5785,7 +5772,7 @@ YYSTYPE yylval;
   case 396:
 
 /* Line 1455 of yacc.c  */
-#line 2875 "pxr/usd/sdf/textFileFormat.yy"
+#line 2862 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->TimeSamples,
@@ -5797,7 +5784,7 @@ YYSTYPE yylval;
   case 397:
 
 /* Line 1455 of yacc.c  */
-#line 2884 "pxr/usd/sdf/textFileFormat.yy"
+#line 2871 "pxr/usd/sdf/textFileFormat.yy"
     { 
             _PrimInitRelationship((yyvsp[(2) - (6)]), context);
 
@@ -5815,7 +5802,7 @@ YYSTYPE yylval;
   case 398:
 
 /* Line 1455 of yacc.c  */
-#line 2899 "pxr/usd/sdf/textFileFormat.yy"
+#line 2886 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitRelationship((yyvsp[(2) - (2)]), context);
             context->relParsingAllowTargetData = true;
@@ -5825,7 +5812,7 @@ YYSTYPE yylval;
   case 399:
 
 /* Line 1455 of yacc.c  */
-#line 2904 "pxr/usd/sdf/textFileFormat.yy"
+#line 2891 "pxr/usd/sdf/textFileFormat.yy"
     {
             _RelationshipSetTargetsList(SdfListOpTypeExplicit, context);
             _PrimEndRelationship(context);
@@ -5835,7 +5822,7 @@ YYSTYPE yylval;
   case 400:
 
 /* Line 1455 of yacc.c  */
-#line 2909 "pxr/usd/sdf/textFileFormat.yy"
+#line 2896 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitRelationship((yyvsp[(3) - (3)]), context);
         ;}
@@ -5844,7 +5831,7 @@ YYSTYPE yylval;
   case 401:
 
 /* Line 1455 of yacc.c  */
-#line 2912 "pxr/usd/sdf/textFileFormat.yy"
+#line 2899 "pxr/usd/sdf/textFileFormat.yy"
     {
             _RelationshipSetTargetsList(SdfListOpTypeDeleted, context); 
             _PrimEndRelationship(context);
@@ -5854,7 +5841,7 @@ YYSTYPE yylval;
   case 402:
 
 /* Line 1455 of yacc.c  */
-#line 2917 "pxr/usd/sdf/textFileFormat.yy"
+#line 2904 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitRelationship((yyvsp[(3) - (3)]), context);
             context->relParsingAllowTargetData = true;
@@ -5864,7 +5851,7 @@ YYSTYPE yylval;
   case 403:
 
 /* Line 1455 of yacc.c  */
-#line 2921 "pxr/usd/sdf/textFileFormat.yy"
+#line 2908 "pxr/usd/sdf/textFileFormat.yy"
     {
             _RelationshipSetTargetsList(SdfListOpTypeAdded, context);
             _PrimEndRelationship(context);
@@ -5874,7 +5861,7 @@ YYSTYPE yylval;
   case 404:
 
 /* Line 1455 of yacc.c  */
-#line 2925 "pxr/usd/sdf/textFileFormat.yy"
+#line 2912 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitRelationship((yyvsp[(3) - (3)]), context);
             context->relParsingAllowTargetData = true;
@@ -5884,7 +5871,7 @@ YYSTYPE yylval;
   case 405:
 
 /* Line 1455 of yacc.c  */
-#line 2929 "pxr/usd/sdf/textFileFormat.yy"
+#line 2916 "pxr/usd/sdf/textFileFormat.yy"
     {
             _RelationshipSetTargetsList(SdfListOpTypePrepended, context);
             _PrimEndRelationship(context);
@@ -5894,7 +5881,7 @@ YYSTYPE yylval;
   case 406:
 
 /* Line 1455 of yacc.c  */
-#line 2933 "pxr/usd/sdf/textFileFormat.yy"
+#line 2920 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitRelationship((yyvsp[(3) - (3)]), context);
             context->relParsingAllowTargetData = true;
@@ -5904,7 +5891,7 @@ YYSTYPE yylval;
   case 407:
 
 /* Line 1455 of yacc.c  */
-#line 2937 "pxr/usd/sdf/textFileFormat.yy"
+#line 2924 "pxr/usd/sdf/textFileFormat.yy"
     {
             _RelationshipSetTargetsList(SdfListOpTypeAppended, context);
             _PrimEndRelationship(context);
@@ -5914,7 +5901,7 @@ YYSTYPE yylval;
   case 408:
 
 /* Line 1455 of yacc.c  */
-#line 2942 "pxr/usd/sdf/textFileFormat.yy"
+#line 2929 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitRelationship((yyvsp[(3) - (3)]), context);
         ;}
@@ -5923,7 +5910,7 @@ YYSTYPE yylval;
   case 409:
 
 /* Line 1455 of yacc.c  */
-#line 2945 "pxr/usd/sdf/textFileFormat.yy"
+#line 2932 "pxr/usd/sdf/textFileFormat.yy"
     {
             _RelationshipSetTargetsList(SdfListOpTypeOrdered, context);
             _PrimEndRelationship(context);
@@ -5933,7 +5920,7 @@ YYSTYPE yylval;
   case 410:
 
 /* Line 1455 of yacc.c  */
-#line 2950 "pxr/usd/sdf/textFileFormat.yy"
+#line 2937 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PrimInitRelationship((yyvsp[(2) - (5)]), context);
             context->relParsingAllowTargetData = true;
@@ -5946,7 +5933,7 @@ YYSTYPE yylval;
   case 421:
 
 /* Line 1455 of yacc.c  */
-#line 2979 "pxr/usd/sdf/textFileFormat.yy"
+#line 2966 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Comment,
@@ -5957,7 +5944,7 @@ YYSTYPE yylval;
   case 422:
 
 /* Line 1455 of yacc.c  */
-#line 2984 "pxr/usd/sdf/textFileFormat.yy"
+#line 2971 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(1) - (1)]), SdfSpecTypeRelationship, context);
         ;}
@@ -5966,7 +5953,7 @@ YYSTYPE yylval;
   case 423:
 
 /* Line 1455 of yacc.c  */
-#line 2986 "pxr/usd/sdf/textFileFormat.yy"
+#line 2973 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeRelationship, context);
         ;}
@@ -5975,7 +5962,7 @@ YYSTYPE yylval;
   case 424:
 
 /* Line 1455 of yacc.c  */
-#line 2993 "pxr/usd/sdf/textFileFormat.yy"
+#line 2980 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeRelationship, context);
             context->listOpType = SdfListOpTypeDeleted;
@@ -5985,7 +5972,7 @@ YYSTYPE yylval;
   case 425:
 
 /* Line 1455 of yacc.c  */
-#line 2996 "pxr/usd/sdf/textFileFormat.yy"
+#line 2983 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeRelationship, context);
         ;}
@@ -5994,7 +5981,7 @@ YYSTYPE yylval;
   case 426:
 
 /* Line 1455 of yacc.c  */
-#line 2999 "pxr/usd/sdf/textFileFormat.yy"
+#line 2986 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeRelationship, context);
             context->listOpType = SdfListOpTypeAdded;
@@ -6004,7 +5991,7 @@ YYSTYPE yylval;
   case 427:
 
 /* Line 1455 of yacc.c  */
-#line 3002 "pxr/usd/sdf/textFileFormat.yy"
+#line 2989 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeRelationship, context);
         ;}
@@ -6013,7 +6000,7 @@ YYSTYPE yylval;
   case 428:
 
 /* Line 1455 of yacc.c  */
-#line 3005 "pxr/usd/sdf/textFileFormat.yy"
+#line 2992 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeRelationship, context);
             context->listOpType = SdfListOpTypePrepended;
@@ -6023,7 +6010,7 @@ YYSTYPE yylval;
   case 429:
 
 /* Line 1455 of yacc.c  */
-#line 3008 "pxr/usd/sdf/textFileFormat.yy"
+#line 2995 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeRelationship, context);
         ;}
@@ -6032,7 +6019,7 @@ YYSTYPE yylval;
   case 430:
 
 /* Line 1455 of yacc.c  */
-#line 3011 "pxr/usd/sdf/textFileFormat.yy"
+#line 2998 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeRelationship, context);
             context->listOpType = SdfListOpTypeAppended;
@@ -6042,7 +6029,7 @@ YYSTYPE yylval;
   case 431:
 
 /* Line 1455 of yacc.c  */
-#line 3014 "pxr/usd/sdf/textFileFormat.yy"
+#line 3001 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeRelationship, context);
         ;}
@@ -6051,7 +6038,7 @@ YYSTYPE yylval;
   case 432:
 
 /* Line 1455 of yacc.c  */
-#line 3017 "pxr/usd/sdf/textFileFormat.yy"
+#line 3004 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataStart((yyvsp[(2) - (2)]), SdfSpecTypeRelationship, context);
             context->listOpType = SdfListOpTypeOrdered;
@@ -6061,7 +6048,7 @@ YYSTYPE yylval;
   case 433:
 
 /* Line 1455 of yacc.c  */
-#line 3020 "pxr/usd/sdf/textFileFormat.yy"
+#line 3007 "pxr/usd/sdf/textFileFormat.yy"
     {
             _GenericMetadataEnd(SdfSpecTypeRelationship, context);
         ;}
@@ -6070,7 +6057,7 @@ YYSTYPE yylval;
   case 434:
 
 /* Line 1455 of yacc.c  */
-#line 3025 "pxr/usd/sdf/textFileFormat.yy"
+#line 3012 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Documentation,
@@ -6081,7 +6068,7 @@ YYSTYPE yylval;
   case 435:
 
 /* Line 1455 of yacc.c  */
-#line 3032 "pxr/usd/sdf/textFileFormat.yy"
+#line 3019 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->Permission,
@@ -6093,7 +6080,7 @@ YYSTYPE yylval;
   case 436:
 
 /* Line 1455 of yacc.c  */
-#line 3040 "pxr/usd/sdf/textFileFormat.yy"
+#line 3027 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->SymmetryFunction,
@@ -6104,7 +6091,7 @@ YYSTYPE yylval;
   case 437:
 
 /* Line 1455 of yacc.c  */
-#line 3045 "pxr/usd/sdf/textFileFormat.yy"
+#line 3032 "pxr/usd/sdf/textFileFormat.yy"
     {
             _SetField(
                 context->path, SdfFieldKeys->SymmetryFunction, 
@@ -6115,7 +6102,7 @@ YYSTYPE yylval;
   case 441:
 
 /* Line 1455 of yacc.c  */
-#line 3059 "pxr/usd/sdf/textFileFormat.yy"
+#line 3046 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->relParsingTargetPaths = SdfPathVector();
         ;}
@@ -6124,7 +6111,7 @@ YYSTYPE yylval;
   case 442:
 
 /* Line 1455 of yacc.c  */
-#line 3062 "pxr/usd/sdf/textFileFormat.yy"
+#line 3049 "pxr/usd/sdf/textFileFormat.yy"
     {
             context->relParsingTargetPaths = SdfPathVector();
         ;}
@@ -6133,7 +6120,7 @@ YYSTYPE yylval;
   case 446:
 
 /* Line 1455 of yacc.c  */
-#line 3074 "pxr/usd/sdf/textFileFormat.yy"
+#line 3061 "pxr/usd/sdf/textFileFormat.yy"
     {
             _RelationshipAppendTargetPath((yyvsp[(1) - (1)]), context);
         ;}
@@ -6142,7 +6129,7 @@ YYSTYPE yylval;
   case 447:
 
 /* Line 1455 of yacc.c  */
-#line 3084 "pxr/usd/sdf/textFileFormat.yy"
+#line 3071 "pxr/usd/sdf/textFileFormat.yy"
     {
         context->savedPath = SdfPath();
     ;}
@@ -6151,7 +6138,7 @@ YYSTYPE yylval;
   case 449:
 
 /* Line 1455 of yacc.c  */
-#line 3091 "pxr/usd/sdf/textFileFormat.yy"
+#line 3078 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PathSetPrim((yyvsp[(1) - (1)]), context);
         ;}
@@ -6160,7 +6147,7 @@ YYSTYPE yylval;
   case 450:
 
 /* Line 1455 of yacc.c  */
-#line 3097 "pxr/usd/sdf/textFileFormat.yy"
+#line 3084 "pxr/usd/sdf/textFileFormat.yy"
     {
             _PathSetPrimOrPropertyScenePath((yyvsp[(1) - (1)]), context);
         ;}
@@ -6169,14 +6156,14 @@ YYSTYPE yylval;
   case 459:
 
 /* Line 1455 of yacc.c  */
-#line 3129 "pxr/usd/sdf/textFileFormat.yy"
+#line 3116 "pxr/usd/sdf/textFileFormat.yy"
     { (yyval) = (yyvsp[(1) - (1)]); ;}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 6157 "pxr/usd/sdf/textFileFormat.tab.cpp"
+#line 6161 "pxr/usd/sdf/textFileFormat.tab.cpp"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -6388,7 +6375,7 @@ YYSTYPE yylval;
 
 
 /* Line 1675 of yacc.c  */
-#line 3161 "pxr/usd/sdf/textFileFormat.yy"
+#line 3148 "pxr/usd/sdf/textFileFormat.yy"
 
 
 //--------------------------------------------------------------------
@@ -6560,8 +6547,8 @@ Sdf_ParseLayer(
                 TRACE_SCOPE("textFileFormatYyParse");
                 status = textFileFormatYyparse(&context);
                 *hints = context.layerHints;
-            } catch (boost::bad_get const &) {
-                TF_CODING_ERROR("Bad boost:get<T>() in layer parser.");
+            } catch (std::bad_variant_access const &) {
+                TF_CODING_ERROR("Bad variant access in layer parser.");
                 Err(&context, "Internal layer parser error.");
             }
         }
@@ -6610,8 +6597,8 @@ Sdf_ParseLayerFromString(
         TRACE_SCOPE("textFileFormatYyParse");
         status = textFileFormatYyparse(&context);
         *hints = context.layerHints;
-    } catch (boost::bad_get const &) {
-        TF_CODING_ERROR("Bad boost:get<T>() in layer parser.");
+    } catch (std::bad_variant_access const &) {
+        TF_CODING_ERROR("Bad variant access in layer parser.");
         Err(&context, "Internal layer parser error.");
     }
 
diff --git a/pxr/usd/sdf/textFileFormat.tab.h b/pxr/usd/sdf/textFileFormat.tab.h
index 483afff046..76b5f29426 100644
--- a/pxr/usd/sdf/textFileFormat.tab.h
+++ b/pxr/usd/sdf/textFileFormat.tab.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 /* A Bison parser, made by GNU Bison 2.4.1.  */
diff --git a/pxr/usd/sdf/textFileFormat.yy b/pxr/usd/sdf/textFileFormat.yy
index 0897851536..135e12cec0 100644
--- a/pxr/usd/sdf/textFileFormat.yy
+++ b/pxr/usd/sdf/textFileFormat.yy
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 %{
@@ -53,9 +36,6 @@
 #include "pxr/base/gf/matrix4d.h"
 #include "pxr/base/tf/mallocTag.h"
 
-#include <boost/optional.hpp>
-#include <boost/variant.hpp>
-
 #include <functional>
 #include <sstream>
 #include <string>
@@ -68,7 +48,6 @@
 PXR_NAMESPACE_USING_DIRECTIVE
 
 using Sdf_ParserHelpers::Value;
-using boost::get;
 
 //--------------------------------------------------------------------
 // Helper macros/functions for handling errors
@@ -593,32 +572,40 @@ _RelocatesAdd(const Value& arg1, const Value& arg2,
               Sdf_TextParserContext *context)
 {
     const std::string& srcStr    = arg1.Get<std::string>();
-    const std::string& targetStr = arg2.Get<std::string>();
-
     SdfPath srcPath(srcStr);
-    SdfPath targetPath(targetStr);
 
-    if (!SdfSchema::IsValidRelocatesPath(srcPath)) {
+    if (!SdfSchema::IsValidRelocatesSourcePath(srcPath)) {
         Err(context, "'%s' is not a valid relocates path",
             srcStr.c_str());
         return;
     }
-    if (!SdfSchema::IsValidRelocatesPath(targetPath)) {
-        Err(context, "'%s' is not a valid relocates path",
-            targetStr.c_str());
-        return;
-    }
 
-    // The relocates map is expected to only hold absolute paths. The
-    // SdRelocatesMapProxy ensures that all paths are made absolute when
-    // editing, but since we're bypassing that proxy and setting the map
-    // directly into the underlying SdfData, we need to explicitly absolutize
-    // paths here.
+    // The relocates map is expected to only hold absolute paths.
     srcPath = srcPath.MakeAbsolutePath(context->path);
-    targetPath = targetPath.MakeAbsolutePath(context->path);
 
-    context->relocatesParsing.emplace_back(
-        std::move(srcPath), std::move(targetPath));
+    const std::string& targetStr = arg2.Get<std::string>();
+    if (targetStr.empty()) {
+        context->relocatesParsing.emplace_back(
+            std::move(srcPath), SdfPath());
+    } else {
+        SdfPath targetPath(targetStr);
+
+        // Target paths can be empty but the string must be explicitly empty
+        // which we would've caught in the if statement. An empty path here 
+        // indicates a malformed path which is never valid.
+        if (targetPath.IsEmpty() || 
+                !SdfSchema::IsValidRelocatesTargetPath(targetPath)) {
+            Err(context, "'%s' is not a valid relocates path",
+                targetStr.c_str());
+            return;
+        }
+
+        // The relocates map is expected to only hold absolute paths.
+        targetPath = targetPath.MakeAbsolutePath(context->path);
+
+        context->relocatesParsing.emplace_back(
+            std::move(srcPath), std::move(targetPath));
+    }
 
     context->layerHints.mightHaveRelocates = true;
 }
@@ -3329,8 +3316,8 @@ Sdf_ParseLayer(
                 TRACE_SCOPE("textFileFormatYyParse");
                 status = textFileFormatYyparse(&context);
                 *hints = context.layerHints;
-            } catch (boost::bad_get const &) {
-                TF_CODING_ERROR("Bad boost:get<T>() in layer parser.");
+            } catch (std::bad_variant_access const &) {
+                TF_CODING_ERROR("Bad variant access in layer parser.");
                 Err(&context, "Internal layer parser error.");
             }
         }
@@ -3379,8 +3366,8 @@ Sdf_ParseLayerFromString(
         TRACE_SCOPE("textFileFormatYyParse");
         status = textFileFormatYyparse(&context);
         *hints = context.layerHints;
-    } catch (boost::bad_get const &) {
-        TF_CODING_ERROR("Bad boost:get<T>() in layer parser.");
+    } catch (std::bad_variant_access const &) {
+        TF_CODING_ERROR("Bad variant access in layer parser.");
         Err(&context, "Internal layer parser error.");
     }
 
diff --git a/pxr/usd/sdf/textParserContext.cpp b/pxr/usd/sdf/textParserContext.cpp
index 910af207e8..008ed724ba 100644
--- a/pxr/usd/sdf/textParserContext.cpp
+++ b/pxr/usd/sdf/textParserContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/textParserContext.h b/pxr/usd/sdf/textParserContext.h
index 7ecedd4db9..bffd14fa65 100644
--- a/pxr/usd/sdf/textParserContext.h
+++ b/pxr/usd/sdf/textParserContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_TEXT_PARSER_CONTEXT_H
 #define PXR_USD_SDF_TEXT_PARSER_CONTEXT_H
@@ -83,7 +66,7 @@ class Sdf_TextParserContext {
     // have data like relational attributes.
     bool relParsingAllowTargetData;
     // relationship target paths that will be saved in a list op
-    // (use a boost::optional to track whether we have seen an opinion at all.)
+    // (use a std::optional to track whether we have seen an opinion at all.)
     std::optional<SdfPathVector> relParsingTargetPaths;
     // relationship target paths that will be appended to the relationship's
     // list of target children.
diff --git a/pxr/usd/sdf/textParserHelpers.cpp b/pxr/usd/sdf/textParserHelpers.cpp
index a29aa5256c..493a6e3898 100644
--- a/pxr/usd/sdf/textParserHelpers.cpp
+++ b/pxr/usd/sdf/textParserHelpers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/sdf/textParserHelpers.h"
@@ -353,32 +336,41 @@ _RelocatesAdd(const Sdf_ParserHelpers::Value& arg1, const Sdf_ParserHelpers::Val
               Sdf_TextParserContext *context)
 {
     const std::string& srcStr    = arg1.Get<std::string>();
-    const std::string& targetStr = arg2.Get<std::string>();
-
     SdfPath srcPath(srcStr);
-    SdfPath targetPath(targetStr);
 
-    if (!SdfSchema::IsValidRelocatesPath(srcPath)) {
+    if (!SdfSchema::IsValidRelocatesSourcePath(srcPath)) {
         SDF_TEXTFILEFORMATPARSER_ERR(context, "'%s' is not a valid relocates path",
             srcStr.c_str());
         return;
     }
-    if (!SdfSchema::IsValidRelocatesPath(targetPath)) {
-        SDF_TEXTFILEFORMATPARSER_ERR(context, "'%s' is not a valid relocates path",
-            targetStr.c_str());
-        return;
-    }
 
-    // The relocates map is expected to only hold absolute paths. The
-    // SdRelocatesMapProxy ensures that all paths are made absolute when
-    // editing, but since we're bypassing that proxy and setting the map
-    // directly into the underlying SdfData, we need to explicitly absolutize
-    // paths here.
+    // The relocates map is expected to only hold absolute paths.
     srcPath = srcPath.MakeAbsolutePath(context->path);
-    targetPath = targetPath.MakeAbsolutePath(context->path);
 
-    context->relocatesParsing.emplace_back(
-        std::move(srcPath), std::move(targetPath));
+    const std::string& targetStr = arg2.Get<std::string>();
+
+    if (targetStr.empty()) {
+        context->relocatesParsing.emplace_back(
+            std::move(srcPath), SdfPath());
+    } else {
+        SdfPath targetPath(targetStr);
+
+        // Target paths can be empty but the string must be explicitly empty
+        // which we would've caught in the if statement. An empty path here 
+        // indicates a malformed path which is never valid.
+        if (targetPath.IsEmpty() || 
+                !SdfSchema::IsValidRelocatesTargetPath(targetPath)) {
+            SDF_TEXTFILEFORMATPARSER_ERR(context, "'%s' is not a valid "
+                "relocates path", targetStr.c_str());
+            return;
+        }
+
+        // The relocates map is expected to only hold absolute paths.
+        targetPath = targetPath.MakeAbsolutePath(context->path);
+
+        context->relocatesParsing.emplace_back(
+            std::move(srcPath), std::move(targetPath));
+    }
 
     context->layerHints.mightHaveRelocates = true;
 }
diff --git a/pxr/usd/sdf/textParserHelpers.h b/pxr/usd/sdf/textParserHelpers.h
index 8331c5f047..5ff9bacc7f 100644
--- a/pxr/usd/sdf/textParserHelpers.h
+++ b/pxr/usd/sdf/textParserHelpers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_SDF_TEXT_PARSER_HELPERS_H
diff --git a/pxr/usd/sdf/timeCode.cpp b/pxr/usd/sdf/timeCode.cpp
index 2f14d7a2c5..53d618d4b9 100644
--- a/pxr/usd/sdf/timeCode.cpp
+++ b/pxr/usd/sdf/timeCode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/timeCode.h"
diff --git a/pxr/usd/sdf/timeCode.h b/pxr/usd/sdf/timeCode.h
index f4a605f3fc..33c41ab3a6 100644
--- a/pxr/usd/sdf/timeCode.h
+++ b/pxr/usd/sdf/timeCode.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_TIME_CODE_H
 #define PXR_USD_SDF_TIME_CODE_H
diff --git a/pxr/usd/sdf/tokens.cpp b/pxr/usd/sdf/tokens.cpp
index dea19b065c..16c64aa16c 100644
--- a/pxr/usd/sdf/tokens.cpp
+++ b/pxr/usd/sdf/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/tokens.h b/pxr/usd/sdf/tokens.h
index 60fc1b5ca3..3709ecf6f6 100644
--- a/pxr/usd/sdf/tokens.h
+++ b/pxr/usd/sdf/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_TOKENS_H
 #define PXR_USD_SDF_TOKENS_H
diff --git a/pxr/usd/sdf/types.cpp b/pxr/usd/sdf/types.cpp
index 24c50f1052..712245fd5a 100644
--- a/pxr/usd/sdf/types.cpp
+++ b/pxr/usd/sdf/types.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Types.cpp
 
diff --git a/pxr/usd/sdf/types.h b/pxr/usd/sdf/types.h
index a908a798cb..0218c23abd 100644
--- a/pxr/usd/sdf/types.h
+++ b/pxr/usd/sdf/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_TYPES_H
 #define PXR_USD_SDF_TYPES_H
diff --git a/pxr/usd/sdf/valueTypeName.cpp b/pxr/usd/sdf/valueTypeName.cpp
index 28dfefc4b1..5b804ef36b 100644
--- a/pxr/usd/sdf/valueTypeName.cpp
+++ b/pxr/usd/sdf/valueTypeName.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/valueTypeName.h b/pxr/usd/sdf/valueTypeName.h
index fbb173aebd..20dcbf02f5 100644
--- a/pxr/usd/sdf/valueTypeName.h
+++ b/pxr/usd/sdf/valueTypeName.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VALUE_TYPE_NAME_H
 #define PXR_USD_SDF_VALUE_TYPE_NAME_H
diff --git a/pxr/usd/sdf/valueTypePrivate.h b/pxr/usd/sdf/valueTypePrivate.h
index bffb343341..466facb4aa 100644
--- a/pxr/usd/sdf/valueTypePrivate.h
+++ b/pxr/usd/sdf/valueTypePrivate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VALUE_TYPE_PRIVATE_H
 #define PXR_USD_SDF_VALUE_TYPE_PRIVATE_H
diff --git a/pxr/usd/sdf/valueTypeRegistry.cpp b/pxr/usd/sdf/valueTypeRegistry.cpp
index cdb58cb20e..6ca2d80f0f 100644
--- a/pxr/usd/sdf/valueTypeRegistry.cpp
+++ b/pxr/usd/sdf/valueTypeRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/valueTypeRegistry.h b/pxr/usd/sdf/valueTypeRegistry.h
index da9da4d420..54a3037f40 100644
--- a/pxr/usd/sdf/valueTypeRegistry.h
+++ b/pxr/usd/sdf/valueTypeRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VALUE_TYPE_REGISTRY_H
 #define PXR_USD_SDF_VALUE_TYPE_REGISTRY_H
diff --git a/pxr/usd/sdf/variableExpression.cpp b/pxr/usd/sdf/variableExpression.cpp
index d0cd77f9e7..8ff5afbb12 100644
--- a/pxr/usd/sdf/variableExpression.cpp
+++ b/pxr/usd/sdf/variableExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/variableExpression.h"
diff --git a/pxr/usd/sdf/variableExpression.h b/pxr/usd/sdf/variableExpression.h
index 356438edfd..533c3f5812 100644
--- a/pxr/usd/sdf/variableExpression.h
+++ b/pxr/usd/sdf/variableExpression.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VARIABLE_EXPRESSION
 #define PXR_USD_SDF_VARIABLE_EXPRESSION
diff --git a/pxr/usd/sdf/variableExpressionImpl.cpp b/pxr/usd/sdf/variableExpressionImpl.cpp
index 82deafbb10..d7e9e40b7a 100644
--- a/pxr/usd/sdf/variableExpressionImpl.cpp
+++ b/pxr/usd/sdf/variableExpressionImpl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/variableExpressionImpl.h"
diff --git a/pxr/usd/sdf/variableExpressionImpl.h b/pxr/usd/sdf/variableExpressionImpl.h
index bae112b5a8..0c4a258e7f 100644
--- a/pxr/usd/sdf/variableExpressionImpl.h
+++ b/pxr/usd/sdf/variableExpressionImpl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VARIABLE_EXPRESSION_IMPL_H
 #define PXR_USD_SDF_VARIABLE_EXPRESSION_IMPL_H
diff --git a/pxr/usd/sdf/variableExpressionParser.cpp b/pxr/usd/sdf/variableExpressionParser.cpp
index 1be031b382..11fa8f96a8 100644
--- a/pxr/usd/sdf/variableExpressionParser.cpp
+++ b/pxr/usd/sdf/variableExpressionParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/variableExpressionParser.h"
@@ -27,12 +10,13 @@
 #include "pxr/usd/sdf/debugCodes.h"
 #include "pxr/usd/sdf/variableExpressionImpl.h"
 
-#include "pxr/base/tf/pxrPEGTL/pegtl.h"
+#include "pxr/base/pegtl/pegtl.hpp"
+#include "pxr/base/pegtl/pegtl/contrib/trace.hpp"
 #include "pxr/base/tf/stringUtils.h"
 
 #include <tuple>
 
-using namespace tao::TAO_PEGTL_NAMESPACE;
+using namespace PXR_PEGTL_NAMESPACE;
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -305,6 +289,7 @@ class ParserContext
 // Parser utilities -----------------------------------------------
 
 template <typename Input>
+[[noreturn]]
 void _ThrowParseError(const Input& in, const std::string& msg)
 {
     // XXX: 
@@ -316,8 +301,7 @@ void _ThrowParseError(const Input& in, const std::string& msg)
     // pegtl 3.x adds API to parse_error to decompose the error message,
     // so we could use that later.
 
-    // throw parse_error(errorMsg, in); 
-    throw parse_error(msg, std::vector<position>{ in.position() });
+    throw parse_error(msg, in); 
 }
 
 // Parser grammar -----------------------------------------------
@@ -444,15 +428,15 @@ struct Integer
 // for users working in those languages while writing expressions.
 struct BooleanTrue
     : sor<
-        TAO_PEGTL_KEYWORD("True"),
-        TAO_PEGTL_KEYWORD("true")
+        PXR_PEGTL_KEYWORD("True"),
+        PXR_PEGTL_KEYWORD("true")
     >
 {};
 
 struct BooleanFalse
     : sor<
-        TAO_PEGTL_KEYWORD("False"),
-        TAO_PEGTL_KEYWORD("false")
+        PXR_PEGTL_KEYWORD("False"),
+        PXR_PEGTL_KEYWORD("false")
     >
 {};
 
@@ -467,8 +451,8 @@ struct Boolean
 
 struct None
     : sor<
-        TAO_PEGTL_KEYWORD("None"),
-        TAO_PEGTL_KEYWORD("none")
+        PXR_PEGTL_KEYWORD("None"),
+        PXR_PEGTL_KEYWORD("none")
     >
 {};
 
@@ -761,7 +745,7 @@ struct Errors
     static const std::string errorMsg;
 
     template <typename Input, typename... States>
-    static void raise(const Input& in, States&&...)
+    [[noreturn]] static void raise(const Input& in, States&&...)
     {
         _ThrowParseError(in, errorMsg);
     }
@@ -797,7 +781,7 @@ MATCH_ERROR(SingleQuotedString::End, R"(Missing ending "'")");
 Sdf_VariableExpressionParserResult
 Sdf_ParseVariableExpression(const std::string& expr)
 {
-    namespace pegtl = tao::TAO_PEGTL_NAMESPACE;
+    namespace pegtl = PXR_PEGTL_NAMESPACE;
 
     ParserContext context;
 
@@ -806,8 +790,7 @@ Sdf_ParseVariableExpression(const std::string& expr)
     try {
         const bool parseSuccess =
             TfDebug::IsEnabled(SDF_VARIABLE_EXPRESSION_PARSING) ?
-            pegtl::parse<Expression, Action, 
-                         pegtl::trace<Errors>::control>(in, context) :
+            pegtl::standard_trace<Expression, Action, Errors>(in, context) :
             pegtl::parse<Expression, Action, Errors>(in, context);
         
         if (!parseSuccess) {
@@ -820,10 +803,10 @@ Sdf_ParseVariableExpression(const std::string& expr)
 
             // XXX: "at character" is probably incorrect if the expression
             // contains Unicode strings?
-            { TfStringPrintf("%s at character %zu", 
-                e.what(), 
-                e.positions.empty() ? 
-                    expr.size() : e.positions.front().byte_in_line) }
+            { TfStringPrintf("%s at character %zu",
+                             std::string(e.message()).c_str(),
+                             e.positions().empty()
+                             ? expr.size() : e.positions().front().column-1) }
         };
      }
 
diff --git a/pxr/usd/sdf/variableExpressionParser.h b/pxr/usd/sdf/variableExpressionParser.h
index 2d102a4567..77b387fca6 100644
--- a/pxr/usd/sdf/variableExpressionParser.h
+++ b/pxr/usd/sdf/variableExpressionParser.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VARIABLE_EXPRESSION_PARSER_H
 #define PXR_USD_SDF_VARIABLE_EXPRESSION_PARSER_H
diff --git a/pxr/usd/sdf/variantSetSpec.cpp b/pxr/usd/sdf/variantSetSpec.cpp
index 5d17c2a7cf..a8ea3a485e 100644
--- a/pxr/usd/sdf/variantSetSpec.cpp
+++ b/pxr/usd/sdf/variantSetSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file VariantSetSpec.cpp
 
diff --git a/pxr/usd/sdf/variantSetSpec.h b/pxr/usd/sdf/variantSetSpec.h
index 06be842d2f..32f017bc18 100644
--- a/pxr/usd/sdf/variantSetSpec.h
+++ b/pxr/usd/sdf/variantSetSpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VARIANT_SET_SPEC_H
 #define PXR_USD_SDF_VARIANT_SET_SPEC_H
diff --git a/pxr/usd/sdf/variantSpec.cpp b/pxr/usd/sdf/variantSpec.cpp
index 32b7843888..55fe538c43 100644
--- a/pxr/usd/sdf/variantSpec.cpp
+++ b/pxr/usd/sdf/variantSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file VariantSpec.cpp
 
diff --git a/pxr/usd/sdf/variantSpec.h b/pxr/usd/sdf/variantSpec.h
index c3eb620fb7..87e5be412d 100644
--- a/pxr/usd/sdf/variantSpec.h
+++ b/pxr/usd/sdf/variantSpec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VARIANT_SPEC_H
 #define PXR_USD_SDF_VARIANT_SPEC_H
diff --git a/pxr/usd/sdf/vectorListEditor.cpp b/pxr/usd/sdf/vectorListEditor.cpp
index 7ef77f3148..ab8222131f 100644
--- a/pxr/usd/sdf/vectorListEditor.cpp
+++ b/pxr/usd/sdf/vectorListEditor.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/sdf/vectorListEditor.h"
diff --git a/pxr/usd/sdf/vectorListEditor.h b/pxr/usd/sdf/vectorListEditor.h
index 012b08193e..2403175b00 100644
--- a/pxr/usd/sdf/vectorListEditor.h
+++ b/pxr/usd/sdf/vectorListEditor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDF_VECTOR_LIST_EDITOR_H
 #define PXR_USD_SDF_VECTOR_LIST_EDITOR_H
diff --git a/pxr/usd/sdf/wrapArrayAssetPath.cpp b/pxr/usd/sdf/wrapArrayAssetPath.cpp
index 65af3d2537..a73602f820 100644
--- a/pxr/usd/sdf/wrapArrayAssetPath.cpp
+++ b/pxr/usd/sdf/wrapArrayAssetPath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/assetPath.h"
diff --git a/pxr/usd/sdf/wrapArrayPath.cpp b/pxr/usd/sdf/wrapArrayPath.cpp
index 289aa92572..91b19804fe 100644
--- a/pxr/usd/sdf/wrapArrayPath.cpp
+++ b/pxr/usd/sdf/wrapArrayPath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/path.h"
diff --git a/pxr/usd/sdf/wrapArrayTimeCode.cpp b/pxr/usd/sdf/wrapArrayTimeCode.cpp
index 7785d1f47f..85a38cf75d 100644
--- a/pxr/usd/sdf/wrapArrayTimeCode.cpp
+++ b/pxr/usd/sdf/wrapArrayTimeCode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/timeCode.h"
diff --git a/pxr/usd/sdf/wrapAssetPath.cpp b/pxr/usd/sdf/wrapAssetPath.cpp
index 02c7df7ce2..e0223f11a4 100644
--- a/pxr/usd/sdf/wrapAssetPath.cpp
+++ b/pxr/usd/sdf/wrapAssetPath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/assetPath.h"
diff --git a/pxr/usd/sdf/wrapAttributeSpec.cpp b/pxr/usd/sdf/wrapAttributeSpec.cpp
index a03a518321..1da39df9d5 100644
--- a/pxr/usd/sdf/wrapAttributeSpec.cpp
+++ b/pxr/usd/sdf/wrapAttributeSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapAttributeSpec.cpp
 
diff --git a/pxr/usd/sdf/wrapChangeBlock.cpp b/pxr/usd/sdf/wrapChangeBlock.cpp
index 1d86a7aab5..1a23a6c3af 100644
--- a/pxr/usd/sdf/wrapChangeBlock.cpp
+++ b/pxr/usd/sdf/wrapChangeBlock.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/changeBlock.h"
diff --git a/pxr/usd/sdf/wrapCleanupEnabler.cpp b/pxr/usd/sdf/wrapCleanupEnabler.cpp
index d95b80c67c..b576b8e453 100644
--- a/pxr/usd/sdf/wrapCleanupEnabler.cpp
+++ b/pxr/usd/sdf/wrapCleanupEnabler.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapCopyUtils.cpp b/pxr/usd/sdf/wrapCopyUtils.cpp
index 98f85f8c96..428508f5f7 100644
--- a/pxr/usd/sdf/wrapCopyUtils.cpp
+++ b/pxr/usd/sdf/wrapCopyUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/def.hpp>
 #include <boost/python/tuple.hpp>
diff --git a/pxr/usd/sdf/wrapFileFormat.cpp b/pxr/usd/sdf/wrapFileFormat.cpp
index 0aaf060c67..6e368335c3 100644
--- a/pxr/usd/sdf/wrapFileFormat.cpp
+++ b/pxr/usd/sdf/wrapFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Sdf/wrapFileFormat.cpp
diff --git a/pxr/usd/sdf/wrapLayer.cpp b/pxr/usd/sdf/wrapLayer.cpp
index fa8f95942c..bf071794ff 100644
--- a/pxr/usd/sdf/wrapLayer.cpp
+++ b/pxr/usd/sdf/wrapLayer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapLayer.cpp
 
@@ -732,6 +715,8 @@ void wrapLayer()
                       &This::GetDefaultPrim,
                       &This::SetDefaultPrim,
                       "The layer's default reference target token.")
+        .def("GetDefaultPrimAsPath",
+             &This::GetDefaultPrimAsPath)
         .def("HasDefaultPrim",
              &This::HasDefaultPrim)
         .def("ClearDefaultPrim",
diff --git a/pxr/usd/sdf/wrapLayerOffset.cpp b/pxr/usd/sdf/wrapLayerOffset.cpp
index aaba976f6d..a5990e2e63 100644
--- a/pxr/usd/sdf/wrapLayerOffset.cpp
+++ b/pxr/usd/sdf/wrapLayerOffset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapLayerTree.cpp b/pxr/usd/sdf/wrapLayerTree.cpp
index 09a5ea127f..b05dc4227b 100644
--- a/pxr/usd/sdf/wrapLayerTree.cpp
+++ b/pxr/usd/sdf/wrapLayerTree.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapNamespaceEdit.cpp b/pxr/usd/sdf/wrapNamespaceEdit.cpp
index 2eab495914..d2bf0eecc8 100644
--- a/pxr/usd/sdf/wrapNamespaceEdit.cpp
+++ b/pxr/usd/sdf/wrapNamespaceEdit.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapNamespaceEdit.cpp
 
diff --git a/pxr/usd/sdf/wrapNotice.cpp b/pxr/usd/sdf/wrapNotice.cpp
index 40a48e8123..e915bea072 100644
--- a/pxr/usd/sdf/wrapNotice.cpp
+++ b/pxr/usd/sdf/wrapNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file Sdf/wrapNotice.cpp
diff --git a/pxr/usd/sdf/wrapOpaqueValue.cpp b/pxr/usd/sdf/wrapOpaqueValue.cpp
index 01948baefa..5e0be91ed9 100644
--- a/pxr/usd/sdf/wrapOpaqueValue.cpp
+++ b/pxr/usd/sdf/wrapOpaqueValue.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/sdf/opaqueValue.h"
diff --git a/pxr/usd/sdf/wrapPath.cpp b/pxr/usd/sdf/wrapPath.cpp
index 1b0f873300..e715cd0959 100644
--- a/pxr/usd/sdf/wrapPath.cpp
+++ b/pxr/usd/sdf/wrapPath.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapPathExpression.cpp b/pxr/usd/sdf/wrapPathExpression.cpp
index 1fbead4a0b..aad0155034 100644
--- a/pxr/usd/sdf/wrapPathExpression.cpp
+++ b/pxr/usd/sdf/wrapPathExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -29,6 +12,7 @@
 #include "pxr/base/vt/valueFromPython.h"
 #include "pxr/base/tf/pyEnum.h"
 #include "pxr/base/tf/pyFunction.h"
+#include "pxr/base/tf/pyUtils.h"
 
 #include "pxr/usd/sdf/pathExpression.h"
 #include "pxr/usd/sdf/pathExpressionEval.h"
@@ -42,9 +26,6 @@
 #include <string>
 
 using namespace boost::python;
-using std::pair;
-using std::string;
-using std::vector;
 
 PXR_NAMESPACE_USING_DIRECTIVE
 
@@ -63,17 +44,6 @@ _Repr(SdfPathExpression const &self) {
     }
 }
 
-static std::string
-_PatternRepr(SdfPathExpression::PathPattern const &self) {
-    if (!self) {
-        return TF_PY_REPR_PREFIX + "PathExpression.PathPattern()";
-    }
-    else {
-        return std::string(TF_PY_REPR_PREFIX + "PathExpression.PathPattern(")
-            + TfPyRepr(self.GetText()) + ")";
-    }
-}
-
 namespace {
 
 struct _PathIdentity {
@@ -164,6 +134,10 @@ void wrapPathExpression()
              }, (arg("op"), arg("left"), arg("right")))
         .staticmethod("MakeOp")
 
+        .def("MakeAtom",
+             +[](SdfPath const &path) {
+                 return PathExpr::MakeAtom(path);
+             }, arg("path"))
         .def("MakeAtom",
              +[](PathExpr::ExpressionReference const &ref) {
                  return PathExpr::MakeAtom(ref);
@@ -229,34 +203,8 @@ void wrapPathExpression()
 
     TfPyWrapEnum<PathExpr::Op>();
 
-    class_<PathPattern>("PathPattern")
-        .def("AppendChild",
-             +[](PathPattern &self, std::string text,
-                 SdfPredicateExpression const &predExpr) {
-                 self.AppendChild(text, predExpr);
-             }, (arg("text"), arg("predExpr")=SdfPredicateExpression()))
-        .def("AppendProperty",
-             +[](PathPattern &self, std::string text,
-                 SdfPredicateExpression const &predExpr) {
-                 self.AppendProperty(text, predExpr);
-             }, (arg("text"), arg("predExpr")=SdfPredicateExpression()))
-        .def("GetPrefix",
-             +[](PathPattern const &self) {
-                 return self.GetPrefix();
-             }, return_value_policy<return_by_value>())
-        .def("SetPrefix",
-             +[](PathPattern &self, SdfPath const &prefix) {
-                 self.SetPrefix(prefix);
-             }, (arg("prefix")))
-        .def("GetText", &PathPattern::GetText)
-        .def("__bool__", &PathPattern::operator bool)
-        .def("__repr__", &_PatternRepr)
-        .def("__hash__", +[](PathPattern const &p) { return TfHash{}(p); })
-        .def(self == self)
-        .def(self != self)
-        ;
-    VtValueFromPython<PathPattern>();
-
+    s.attr("PathPattern") = TfPyGetClassObject<SdfPathPattern>();
+    
     class_<ExpressionReference>("ExpressionReference")
         .def_readwrite("path", &ExpressionReference::path)
         .def_readwrite("name", &ExpressionReference::name)
diff --git a/pxr/usd/sdf/wrapPathPattern.cpp b/pxr/usd/sdf/wrapPathPattern.cpp
new file mode 100644
index 0000000000..ef814e60a3
--- /dev/null
+++ b/pxr/usd/sdf/wrapPathPattern.cpp
@@ -0,0 +1,126 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+
+#include "pxr/base/tf/pySignatureExt.h" // wrap lvalue-ref-qualified mem fns.
+
+#include "pxr/base/vt/valueFromPython.h"
+#include "pxr/base/tf/pyAnnotatedBoolResult.h"
+#include "pxr/base/tf/pyEnum.h"
+#include "pxr/base/tf/pyFunction.h"
+
+#include "pxr/usd/sdf/pathPattern.h"
+
+#include <boost/python/class.hpp>
+#include <boost/python/def.hpp>
+#include <boost/python/return_arg.hpp>
+#include <boost/python/scope.hpp>
+
+#include <mutex>
+#include <string>
+
+using namespace boost::python;
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+static std::string
+_Repr(SdfPathPattern const &self) {
+    if (!self) {
+        return TF_PY_REPR_PREFIX + "PathPattern()";
+    }
+    else {
+        return std::string(TF_PY_REPR_PREFIX + "PathPattern(")
+            + TfPyRepr(self.GetText()) + ")";
+    }
+}
+
+struct Sdf_PathPatternCanAppendResult
+    : public TfPyAnnotatedBoolResult<std::string>
+{
+    Sdf_PathPatternCanAppendResult(bool val, std::string const &msg) :
+        TfPyAnnotatedBoolResult<std::string>(val, msg) {}
+};
+
+static
+Sdf_PathPatternCanAppendResult
+_CanAppendChild(SdfPathPattern const &self, std::string const &text)
+{
+    std::string errMsg;
+    bool valid = self.CanAppendChild(text, &errMsg);
+    return Sdf_PathPatternCanAppendResult(valid, errMsg);
+}
+
+static
+Sdf_PathPatternCanAppendResult
+_CanAppendProperty(SdfPathPattern const &self, std::string const &text)
+{
+    std::string errMsg;
+    bool valid = self.CanAppendProperty(text, &errMsg);
+    return Sdf_PathPatternCanAppendResult(valid, errMsg);
+}
+
+void wrapPathPattern()
+{
+    class_<SdfPathPattern>("PathPattern")
+        .def(init<SdfPath>(arg("prefix")))
+        .def("Everything", SdfPathPattern::Everything,
+             return_value_policy<return_by_value>())
+        .staticmethod("Everything")
+        .def("EveryDescendant", SdfPathPattern::EveryDescendant,
+            return_value_policy<return_by_value>())
+        .staticmethod("EveryDescendant")
+        .def("Nothing", SdfPathPattern::Nothing,
+            return_value_policy<return_by_value>())
+        .staticmethod("Nothing")
+        .def("CanAppendChild", _CanAppendChild, arg("text"))
+        .def("AppendChild",
+             +[](SdfPathPattern &self, std::string text,
+                 SdfPredicateExpression const &predExpr) {
+                 self.AppendChild(text, predExpr);
+             }, (arg("text"), arg("predExpr")=SdfPredicateExpression()),
+             return_self<>())
+        .def("CanAppendProperty", _CanAppendProperty, arg("text"))
+        .def("AppendProperty",
+             +[](SdfPathPattern &self, std::string text,
+                 SdfPredicateExpression const &predExpr) {
+                 self.AppendProperty(text, predExpr);
+             }, (arg("text"), arg("predExpr")=SdfPredicateExpression()),
+             return_self<>())
+        .def("GetPrefix",
+             +[](SdfPathPattern const &self) {
+                 return self.GetPrefix();
+             }, return_value_policy<return_by_value>())
+        .def("SetPrefix",
+             +[](SdfPathPattern &self, SdfPath const &prefix) {
+                 self.SetPrefix(prefix);
+             }, (arg("prefix")), return_self<>())
+        .def("HasLeadingStretch", &SdfPathPattern::HasLeadingStretch)
+        .def("HasTrailingStretch", &SdfPathPattern::HasTrailingStretch)
+        .def("AppendStretchIfPossible",
+             &SdfPathPattern::AppendStretchIfPossible,
+             return_self<>())
+        .def("RemoveTrailingStretch",
+             &SdfPathPattern::RemoveTrailingStretch,
+             return_self<>())
+        .def("RemoveTrailingComponent",
+             &SdfPathPattern::RemoveTrailingComponent,
+             return_self<>())
+        .def("GetText", &SdfPathPattern::GetText)
+        .def("IsProperty", &SdfPathPattern::IsProperty)
+        .def("__bool__", &SdfPathPattern::operator bool)
+        .def("__repr__", &_Repr)
+        .def("__hash__", +[](SdfPathPattern const &p) { return TfHash{}(p); })
+        .def(self == self)
+        .def(self != self)
+        ;
+    VtValueFromPython<SdfPathPattern>();
+
+    Sdf_PathPatternCanAppendResult::
+        Wrap<Sdf_PathPatternCanAppendResult>("_PathPatternCanAppendResult",
+                                             "reason");
+}
diff --git a/pxr/usd/sdf/wrapPayload.cpp b/pxr/usd/sdf/wrapPayload.cpp
index f886141c99..8254a49a87 100644
--- a/pxr/usd/sdf/wrapPayload.cpp
+++ b/pxr/usd/sdf/wrapPayload.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapPredicateExpression.cpp b/pxr/usd/sdf/wrapPredicateExpression.cpp
index c3e95e8515..07779dae9d 100644
--- a/pxr/usd/sdf/wrapPredicateExpression.cpp
+++ b/pxr/usd/sdf/wrapPredicateExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapPredicateFunctionResult.cpp b/pxr/usd/sdf/wrapPredicateFunctionResult.cpp
index b54cea9625..ec14304928 100644
--- a/pxr/usd/sdf/wrapPredicateFunctionResult.cpp
+++ b/pxr/usd/sdf/wrapPredicateFunctionResult.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapPrimSpec.cpp b/pxr/usd/sdf/wrapPrimSpec.cpp
index ffae821481..8abae505d3 100644
--- a/pxr/usd/sdf/wrapPrimSpec.cpp
+++ b/pxr/usd/sdf/wrapPrimSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapPrimSpec.cpp
 
diff --git a/pxr/usd/sdf/wrapPropertySpec.cpp b/pxr/usd/sdf/wrapPropertySpec.cpp
index ec367e3122..50d247cac3 100644
--- a/pxr/usd/sdf/wrapPropertySpec.cpp
+++ b/pxr/usd/sdf/wrapPropertySpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapPropertySpec.cpp
 
diff --git a/pxr/usd/sdf/wrapPseudoRootSpec.cpp b/pxr/usd/sdf/wrapPseudoRootSpec.cpp
index 8e40ac41ee..24d819bb00 100644
--- a/pxr/usd/sdf/wrapPseudoRootSpec.cpp
+++ b/pxr/usd/sdf/wrapPseudoRootSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapPseudoRootSpec.cpp
 
diff --git a/pxr/usd/sdf/wrapReference.cpp b/pxr/usd/sdf/wrapReference.cpp
index d6fd551c99..ec80de7dc7 100644
--- a/pxr/usd/sdf/wrapReference.cpp
+++ b/pxr/usd/sdf/wrapReference.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapRelationshipSpec.cpp b/pxr/usd/sdf/wrapRelationshipSpec.cpp
index b00cf14299..9416761b71 100644
--- a/pxr/usd/sdf/wrapRelationshipSpec.cpp
+++ b/pxr/usd/sdf/wrapRelationshipSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapRelationshipSpec.cpp
 
diff --git a/pxr/usd/sdf/wrapSpec.cpp b/pxr/usd/sdf/wrapSpec.cpp
index 79a4892403..ccdb18b015 100644
--- a/pxr/usd/sdf/wrapSpec.cpp
+++ b/pxr/usd/sdf/wrapSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapSpec.cpp
 
diff --git a/pxr/usd/sdf/wrapTimeCode.cpp b/pxr/usd/sdf/wrapTimeCode.cpp
index 66e3eff172..012d08272a 100644
--- a/pxr/usd/sdf/wrapTimeCode.cpp
+++ b/pxr/usd/sdf/wrapTimeCode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdf/timeCode.h"
diff --git a/pxr/usd/sdf/wrapTypes.cpp b/pxr/usd/sdf/wrapTypes.cpp
index 5832fb8c49..f0f3629e77 100644
--- a/pxr/usd/sdf/wrapTypes.cpp
+++ b/pxr/usd/sdf/wrapTypes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapValueTypeName.cpp b/pxr/usd/sdf/wrapValueTypeName.cpp
index 8f0e6f686d..3d25141357 100644
--- a/pxr/usd/sdf/wrapValueTypeName.cpp
+++ b/pxr/usd/sdf/wrapValueTypeName.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdf/wrapVariableExpression.cpp b/pxr/usd/sdf/wrapVariableExpression.cpp
index 529dd9df0b..a9eade2d73 100644
--- a/pxr/usd/sdf/wrapVariableExpression.cpp
+++ b/pxr/usd/sdf/wrapVariableExpression.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/sdf/wrapVariantSetSpec.cpp b/pxr/usd/sdf/wrapVariantSetSpec.cpp
index 3fa5ff9ab6..082f4e82b0 100644
--- a/pxr/usd/sdf/wrapVariantSetSpec.cpp
+++ b/pxr/usd/sdf/wrapVariantSetSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapVariantSetSpec.cpp
 
diff --git a/pxr/usd/sdf/wrapVariantSpec.cpp b/pxr/usd/sdf/wrapVariantSpec.cpp
index 96a24152fc..ae44ba2000 100644
--- a/pxr/usd/sdf/wrapVariantSpec.cpp
+++ b/pxr/usd/sdf/wrapVariantSpec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapVariantSpec.cpp
 
diff --git a/pxr/usd/sdr/__init__.py b/pxr/usd/sdr/__init__.py
index 0f6e80982a..2e3bdef0da 100644
--- a/pxr/usd/sdr/__init__.py
+++ b/pxr/usd/sdr/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 """Python bindings for libSdr"""
diff --git a/pxr/usd/sdr/api.h b/pxr/usd/sdr/api.h
index f044073da7..9631812c54 100644
--- a/pxr/usd/sdr/api.h
+++ b/pxr/usd/sdr/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDR_API_H
 #define PXR_USD_SDR_API_H
diff --git a/pxr/usd/sdr/debugCodes.cpp b/pxr/usd/sdr/debugCodes.cpp
index be727b1760..1bffb58d27 100644
--- a/pxr/usd/sdr/debugCodes.cpp
+++ b/pxr/usd/sdr/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/sdr/debugCodes.h"
diff --git a/pxr/usd/sdr/debugCodes.h b/pxr/usd/sdr/debugCodes.h
index 42a4bf9369..2f761839bc 100644
--- a/pxr/usd/sdr/debugCodes.h
+++ b/pxr/usd/sdr/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDR_DEBUG_CODES_H
 #define PXR_USD_SDR_DEBUG_CODES_H
diff --git a/pxr/usd/sdr/declare.h b/pxr/usd/sdr/declare.h
index ed844a3d1f..4bdbb8ad32 100644
--- a/pxr/usd/sdr/declare.h
+++ b/pxr/usd/sdr/declare.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_SDR_DECLARE_H
 #define PXR_USD_SDR_DECLARE_H
diff --git a/pxr/usd/sdr/module.cpp b/pxr/usd/sdr/module.cpp
index ae56d10711..f33d05ca87 100644
--- a/pxr/usd/sdr/module.cpp
+++ b/pxr/usd/sdr/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdr/moduleDeps.cpp b/pxr/usd/sdr/moduleDeps.cpp
index 6c1484508f..af36c7d5dd 100644
--- a/pxr/usd/sdr/moduleDeps.cpp
+++ b/pxr/usd/sdr/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/sdr/pch.h b/pxr/usd/sdr/pch.h
index b4edc214fc..0932de9f31 100644
--- a/pxr/usd/sdr/pch.h
+++ b/pxr/usd/sdr/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -67,6 +50,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -74,6 +59,8 @@
 #include <stdint.h>
 #include <string>
 #include <sys/types.h>
+#include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -81,49 +68,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -156,23 +100,8 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_queue.h>
 #include <tbb/spin_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
diff --git a/pxr/usd/sdr/registry.cpp b/pxr/usd/sdr/registry.cpp
index ff4e8685ed..5c2d118e6b 100644
--- a/pxr/usd/sdr/registry.cpp
+++ b/pxr/usd/sdr/registry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/base/tf/instantiateSingleton.h"
 #include "pxr/usd/sdr/registry.h"
diff --git a/pxr/usd/sdr/registry.h b/pxr/usd/sdr/registry.h
index 81ab719ab9..faafb62a6d 100644
--- a/pxr/usd/sdr/registry.h
+++ b/pxr/usd/sdr/registry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_SDR_REGISTRY_H
diff --git a/pxr/usd/sdr/shaderMetadataHelpers.cpp b/pxr/usd/sdr/shaderMetadataHelpers.cpp
index 5e3b8dc74e..f76c425dcb 100644
--- a/pxr/usd/sdr/shaderMetadataHelpers.cpp
+++ b/pxr/usd/sdr/shaderMetadataHelpers.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/staticTokens.h"
diff --git a/pxr/usd/sdr/shaderMetadataHelpers.h b/pxr/usd/sdr/shaderMetadataHelpers.h
index 0ed3274a94..6ee6e71d1c 100644
--- a/pxr/usd/sdr/shaderMetadataHelpers.h
+++ b/pxr/usd/sdr/shaderMetadataHelpers.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_SDR_SHADER_METADATA_HELPERS_H
diff --git a/pxr/usd/sdr/shaderNode.cpp b/pxr/usd/sdr/shaderNode.cpp
index 00a7429956..6fcc9aeeb2 100644
--- a/pxr/usd/sdr/shaderNode.cpp
+++ b/pxr/usd/sdr/shaderNode.cpp
@@ -1,35 +1,19 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
 #include "pxr/base/tf/refPtr.h"
 #include "pxr/usd/ndr/debugCodes.h"
+#include "pxr/usd/sdf/valueTypeName.h"
 #include "pxr/usd/sdr/shaderMetadataHelpers.h"
 #include "pxr/usd/sdr/shaderNode.h"
 #include "pxr/usd/sdr/shaderProperty.h"
 
 #include <algorithm>
-#include <unordered_set>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -250,6 +234,47 @@ SdrShaderNode::GetAllVstructNames() const
     return NdrTokenVec(vstructs.begin(), vstructs.end());
 }
 
+/* static */
+SdrShaderNode::ComplianceResults
+SdrShaderNode::CheckPropertyCompliance(
+    const std::vector<SdrShaderNodeConstPtr> &shaderNodes)
+{
+    std::unordered_map<TfToken, SdrShaderPropertyConstPtr, TfToken::HashFunctor>
+        propertyMap;
+    SdrShaderNode::ComplianceResults result;
+    for (SdrShaderNodeConstPtr shaderNode : shaderNodes) {
+        for (const TfToken &propName : shaderNode->GetInputNames()) {
+            if (SdrShaderPropertyConstPtr sdrProp = 
+                 shaderNode->GetShaderInput(propName)) {
+                auto propIt = propertyMap.find(propName);
+                if (propIt == propertyMap.end()) {
+                    // insert property
+                    propertyMap.emplace(propName, sdrProp);
+                } else {
+                    // property already found, lets check for compliance
+                    if (propIt->second->GetTypeAsSdfType() != 
+                            sdrProp->GetTypeAsSdfType() ||
+                        propIt->second->GetDefaultValue() !=
+                            sdrProp->GetDefaultValue() ||
+                        propIt->second->GetDefaultValueAsSdfType() !=
+                            sdrProp->GetDefaultValueAsSdfType()) {
+                        auto resultIt = result.find(propName);
+                        if (resultIt == result.end()) {
+                            result.emplace(propName, 
+                                           std::vector<NdrIdentifier>{
+                                               shaderNode->GetIdentifier()});
+                        } else {
+                            resultIt->second.push_back(
+                                shaderNode->GetIdentifier());
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return result;
+}
+
 void
 SdrShaderNode::_InitializePrimvars()
 {
diff --git a/pxr/usd/sdr/shaderNode.h b/pxr/usd/sdr/shaderNode.h
index e5be467b99..4ef0f8ff5b 100644
--- a/pxr/usd/sdr/shaderNode.h
+++ b/pxr/usd/sdr/shaderNode.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_SDR_SHADER_NODE_H
@@ -33,6 +16,8 @@
 #include "pxr/usd/ndr/node.h"
 #include "pxr/usd/sdr/declare.h"
 
+#include <unordered_map>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 // Note: Metadata keys that are generated by parsers should start with
@@ -218,6 +203,26 @@ class SdrShaderNode : public NdrNode
 
     /// @}
 
+    // Stores the result of the compliance check of property names to
+    // sdrShaderNodeIdentifiers
+    using ComplianceResults = std::unordered_map<TfToken,
+                              std::vector<NdrIdentifier>, 
+                              TfToken::HashFunctor>;
+
+    /// This method checks if same named properties of \p shaderNodes are
+    /// compatible with each other.
+    ///
+    /// Checks if the same name properties have matching types and default
+    /// values. In order to determine if same name properties from different
+    /// shader nodes are compliant, we assume that the first shaderNode in the 
+    /// list providing this property is authoritative, and other nodes differing
+    /// wrt this property are non-compliant. A map of property names and their 
+    /// respective shaderNodes are stored in the map. An empty map returned 
+    /// represents no compliance issues.
+    SDR_API
+    static
+    ComplianceResults CheckPropertyCompliance(
+        const std::vector<SdrShaderNodeConstPtr> &shaderNodes);
 
     /// \cond
     /// Hide from the API.
diff --git a/pxr/usd/sdr/shaderParserTestUtils.py b/pxr/usd/sdr/shaderParserTestUtils.py
index cdb0c454e9..dc57761cad 100644
--- a/pxr/usd/sdr/shaderParserTestUtils.py
+++ b/pxr/usd/sdr/shaderParserTestUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 """
 Common utilities that shader-based parser plugins can use in their tests.
diff --git a/pxr/usd/sdr/shaderProperty.cpp b/pxr/usd/sdr/shaderProperty.cpp
index 57d72599e6..9aaa5ed8c3 100644
--- a/pxr/usd/sdr/shaderProperty.cpp
+++ b/pxr/usd/sdr/shaderProperty.cpp
@@ -1,24 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdr/shaderProperty.h b/pxr/usd/sdr/shaderProperty.h
index 1ff04c63c8..017bb4417a 100644
--- a/pxr/usd/sdr/shaderProperty.h
+++ b/pxr/usd/sdr/shaderProperty.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_SDR_SHADER_PROPERTY_H
diff --git a/pxr/usd/sdr/testenv/TestSdrRegistry_argsParserPlugin.cpp b/pxr/usd/sdr/testenv/TestSdrRegistry_argsParserPlugin.cpp
index a9fed207c7..7e7edc875f 100644
--- a/pxr/usd/sdr/testenv/TestSdrRegistry_argsParserPlugin.cpp
+++ b/pxr/usd/sdr/testenv/TestSdrRegistry_argsParserPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ndr/parserPlugin.h"
diff --git a/pxr/usd/sdr/testenv/TestSdrRegistry_discoveryPlugin.cpp b/pxr/usd/sdr/testenv/TestSdrRegistry_discoveryPlugin.cpp
index e632d2e20d..af40777ecd 100644
--- a/pxr/usd/sdr/testenv/TestSdrRegistry_discoveryPlugin.cpp
+++ b/pxr/usd/sdr/testenv/TestSdrRegistry_discoveryPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/ndr/discoveryPlugin.h"
diff --git a/pxr/usd/sdr/testenv/TestSdrRegistry_oslParserPlugin.cpp b/pxr/usd/sdr/testenv/TestSdrRegistry_oslParserPlugin.cpp
index 0d50459579..30ff649908 100644
--- a/pxr/usd/sdr/testenv/TestSdrRegistry_oslParserPlugin.cpp
+++ b/pxr/usd/sdr/testenv/TestSdrRegistry_oslParserPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/gf/vec2f.h"
diff --git a/pxr/usd/sdr/testenv/testSdrRegistry.py b/pxr/usd/sdr/testenv/testSdrRegistry.py
index 304c0d2456..c09d127e2b 100644
--- a/pxr/usd/sdr/testenv/testSdrRegistry.py
+++ b/pxr/usd/sdr/testenv/testSdrRegistry.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from __future__ import print_function
 
 from pxr import Plug
diff --git a/pxr/usd/sdr/wrapRegistry.cpp b/pxr/usd/sdr/wrapRegistry.cpp
index 73dca9487e..bb5b3ffe2a 100644
--- a/pxr/usd/sdr/wrapRegistry.cpp
+++ b/pxr/usd/sdr/wrapRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdr/wrapShaderNode.cpp b/pxr/usd/sdr/wrapShaderNode.cpp
index bab89c1a3e..1d4c032e6f 100644
--- a/pxr/usd/sdr/wrapShaderNode.cpp
+++ b/pxr/usd/sdr/wrapShaderNode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/sdr/wrapShaderProperty.cpp b/pxr/usd/sdr/wrapShaderProperty.cpp
index e47c0d4216..a32cc16462 100644
--- a/pxr/usd/sdr/wrapShaderProperty.cpp
+++ b/pxr/usd/sdr/wrapShaderProperty.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/CMakeLists.txt b/pxr/usd/usd/CMakeLists.txt
index 912bcc4f57..fd86e90856 100644
--- a/pxr/usd/usd/CMakeLists.txt
+++ b/pxr/usd/usd/CMakeLists.txt
@@ -67,6 +67,10 @@ pxr_library(usd
         timeCode
         tokens
         typed
+        validator
+        validatorTokens
+        validationError
+        validationRegistry
         usdFileFormat
         usdaFileFormat
         usdcFileFormat
@@ -103,6 +107,9 @@ pxr_library(usd
         wrapUtils.h
         testenv/TestUsdResolverChangedResolver.h
 
+    CPPFILES
+        coreValidators.cpp
+
     PYTHON_CPPFILES
         moduleDeps.cpp
 
@@ -250,6 +257,7 @@ pxr_test_scripts(
     testenv/testUsdResolveTargetPy.py
     testenv/testUsdSchemaBasePy.py
     testenv/testUsdSchemaRegistry.py
+    testenv/testUsdSchemaRegistryThreadedInit.py
     testenv/testUsdSchemaVersioning.py
     testenv/testUsdSpecializes.py
     testenv/testUsdStage.py
@@ -459,6 +467,22 @@ pxr_build_test(testUsdUsdzResolver
         testenv/testUsdUsdzResolver.cpp
 )
 
+pxr_build_test(testUsdValidator
+    LIBRARIES
+        tf
+        usd
+    CPPFILES
+        testenv/testUsdValidator.cpp
+)
+
+pxr_build_test(testUsdValidationRegistry
+    LIBRARIES
+        tf
+        usd
+    CPPFILES
+        testenv/testUsdValidationRegistry.cpp
+)
+
 pxr_build_test(testUsdZipFile_CPP
     LIBRARIES
         ar
@@ -724,6 +748,11 @@ pxr_install_test_dir(
     DEST testUsdUsdzResolver
 )
 
+pxr_install_test_dir(
+    SRC testenv/testUsdValidationRegistry
+    DEST testUsdValidationRegistry
+)
+
 pxr_install_test_dir(
     SRC testenv/testUsdZipFile.testenv
     DEST testUsdZipFile
@@ -969,6 +998,16 @@ pxr_register_test(testUsdMetadataCpp
     EXPECTED_RETURN_CODE 0
 )
 
+pxr_register_test(testUsdValidator
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdValidator"
+    EXPECTED_RETURN_CODE 0
+)
+
+pxr_register_test(testUsdValidationRegistry
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdValidationRegistry"
+    EXPECTED_RETURN_CODE 0
+)
+
 # This test relies on a plugin built specifically for this test.
 # The build system currently doesn't support this for static library
 # builds, so we only enable this test on shared library builds.
@@ -1203,6 +1242,12 @@ pxr_register_test(testUsdSchemaRegistryCpp
     EXPECTED_RETURN_CODE 0
 )
 
+pxr_register_test(testUsdSchemaRegistryThreadedInit
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdSchemaRegistryThreadedInit"
+    EXPECTED_RETURN_CODE 0
+)
+
 pxr_register_test(testUsdSchemaVersioning
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdSchemaVersioning"
diff --git a/pxr/usd/usd/__init__.py b/pxr/usd/usd/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/usd/__init__.py
+++ b/pxr/usd/usd/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usd/api.h b/pxr/usd/usd/api.h
index 831f45354d..c0ec49bc77 100644
--- a/pxr/usd/usd/api.h
+++ b/pxr/usd/usd/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USD_API_H
 #define USD_API_H
diff --git a/pxr/usd/usd/apiSchemaBase.cpp b/pxr/usd/usd/apiSchemaBase.cpp
index dba0323159..285c819e12 100644
--- a/pxr/usd/usd/apiSchemaBase.cpp
+++ b/pxr/usd/usd/apiSchemaBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/apiSchemaBase.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/apiSchemaBase.h b/pxr/usd/usd/apiSchemaBase.h
index c364a07b6e..408c987806 100644
--- a/pxr/usd/usd/apiSchemaBase.h
+++ b/pxr/usd/usd/apiSchemaBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USD_GENERATED_APISCHEMABASE_H
 #define USD_GENERATED_APISCHEMABASE_H
@@ -88,8 +71,7 @@ class SdfAssetPath;
 /// explicit bool conversion operator. Examples of applied API schemas include
 /// UsdCollectionAPI, UsdGeomModelAPI and UsdGeomMotionAPI
 /// 
-/// \anchor UsdAPISchemaBase_SingleVsMultipleApply
-/// \name Single vs. Multiple Apply API Schemas
+/// \subsection usd_apischemabase_single_vs_multiple_apply Single vs. Multiple Apply API Schemas
 /// 
 /// Applied API schemas can further be classified into single-apply and 
 /// multiple-apply API schemas. As the name suggests, a single-apply API schema 
diff --git a/pxr/usd/usd/attribute.cpp b/pxr/usd/usd/attribute.cpp
index 269630db16..948babd531 100644
--- a/pxr/usd/usd/attribute.cpp
+++ b/pxr/usd/usd/attribute.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/attribute.h"
diff --git a/pxr/usd/usd/attribute.h b/pxr/usd/usd/attribute.h
index 198346a0e7..d416708cbc 100644
--- a/pxr/usd/usd/attribute.h
+++ b/pxr/usd/usd/attribute.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_ATTRIBUTE_H
 #define PXR_USD_USD_ATTRIBUTE_H
diff --git a/pxr/usd/usd/attributeQuery.cpp b/pxr/usd/usd/attributeQuery.cpp
index 0112d6d3ad..dc63926f24 100644
--- a/pxr/usd/usd/attributeQuery.cpp
+++ b/pxr/usd/usd/attributeQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/attributeQuery.h"
diff --git a/pxr/usd/usd/attributeQuery.h b/pxr/usd/usd/attributeQuery.h
index 28cbe4b970..f784a996f6 100644
--- a/pxr/usd/usd/attributeQuery.h
+++ b/pxr/usd/usd/attributeQuery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_ATTRIBUTE_QUERY_H
 #define PXR_USD_USD_ATTRIBUTE_QUERY_H
diff --git a/pxr/usd/usd/clip.cpp b/pxr/usd/usd/clip.cpp
index 8a06996674..dba584d784 100644
--- a/pxr/usd/usd/clip.cpp
+++ b/pxr/usd/usd/clip.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/common.h"
diff --git a/pxr/usd/usd/clip.h b/pxr/usd/usd/clip.h
index e76dc80d0e..3cbfbe4005 100644
--- a/pxr/usd/usd/clip.h
+++ b/pxr/usd/usd/clip.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_CLIP_H
 #define PXR_USD_USD_CLIP_H
diff --git a/pxr/usd/usd/clipCache.cpp b/pxr/usd/usd/clipCache.cpp
index c582e1d8be..611c944870 100644
--- a/pxr/usd/usd/clipCache.cpp
+++ b/pxr/usd/usd/clipCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/clipCache.h"
@@ -218,10 +201,9 @@ Usd_ClipCache::PopulateClipsForPrim(
     const bool primHasClips = !allClips.empty();
     if (primHasClips) {
         TRACE_SCOPE("Usd_ClipCache::PopulateClipsForPrim (primHasClips)");
-        tbb::mutex::scoped_lock lock;
-        if (_concurrentPopulationContext) {
-            lock.acquire(_concurrentPopulationContext->_mutex);
-        }
+        std::unique_lock<std::mutex> lock = (_concurrentPopulationContext) ?
+            std::unique_lock<std::mutex>(_concurrentPopulationContext->_mutex) :
+            std::unique_lock<std::mutex>();
 
         // Find nearest ancestor with clips specified.
         const std::vector<Usd_ClipSetRefPtr>* ancestralClips = nullptr;
@@ -260,10 +242,10 @@ Usd_ClipCache::PopulateClipsForPrim(
 SdfLayerHandleSet
 Usd_ClipCache::GetUsedLayers() const
 {
-    tbb::mutex::scoped_lock lock;
-    if (_concurrentPopulationContext) {
-        lock.acquire(_concurrentPopulationContext->_mutex);
-    }
+    std::unique_lock<std::mutex> lock = (_concurrentPopulationContext) ?
+            std::unique_lock<std::mutex>(_concurrentPopulationContext->_mutex) :
+            std::unique_lock<std::mutex>();
+            
     SdfLayerHandleSet layers;
     for (_ClipTable::iterator::value_type const &clipsListIter : _table){
         for (Usd_ClipSetRefPtr const &clipSet : clipsListIter.second){
@@ -342,10 +324,9 @@ const std::vector<Usd_ClipSetRefPtr>&
 Usd_ClipCache::GetClipsForPrim(const SdfPath& path) const
 {
     TRACE_FUNCTION();
-    tbb::mutex::scoped_lock lock;
-    if (_concurrentPopulationContext) {
-        lock.acquire(_concurrentPopulationContext->_mutex);
-    }
+    std::unique_lock<std::mutex> lock = (_concurrentPopulationContext) ?
+        std::unique_lock<std::mutex>(_concurrentPopulationContext->_mutex) :
+        std::unique_lock<std::mutex>();
     return _GetClipsForPrim_NoLock(path);
 }
 
diff --git a/pxr/usd/usd/clipCache.h b/pxr/usd/usd/clipCache.h
index 2bff0833aa..6492120eb4 100644
--- a/pxr/usd/usd/clipCache.h
+++ b/pxr/usd/usd/clipCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_CLIP_CACHE_H
 #define PXR_USD_USD_CLIP_CACHE_H
@@ -30,7 +13,7 @@
 #include "pxr/usd/usd/clipSet.h"
 #include "pxr/usd/sdf/pathTable.h"
 
-#include <tbb/mutex.h>
+#include <mutex>
 #include <vector>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -61,7 +44,7 @@ class Usd_ClipCache
         explicit ConcurrentPopulationContext(Usd_ClipCache &cache);
         ~ConcurrentPopulationContext();
         Usd_ClipCache &_cache;
-        tbb::mutex _mutex;
+        std::mutex _mutex;
     };
 
     /// Populate the cache with clips for \p prim. Returns true if clips
diff --git a/pxr/usd/usd/clipSet.cpp b/pxr/usd/usd/clipSet.cpp
index a9ed48d6e5..1c03f3b4c0 100644
--- a/pxr/usd/usd/clipSet.cpp
+++ b/pxr/usd/usd/clipSet.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/clipSet.h"
diff --git a/pxr/usd/usd/clipSet.h b/pxr/usd/usd/clipSet.h
index 84e46f774c..1a162658ea 100644
--- a/pxr/usd/usd/clipSet.h
+++ b/pxr/usd/usd/clipSet.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_CLIP_SET_H
 #define PXR_USD_USD_CLIP_SET_H
diff --git a/pxr/usd/usd/clipSetDefinition.cpp b/pxr/usd/usd/clipSetDefinition.cpp
index c8041eec44..572e6c01e4 100644
--- a/pxr/usd/usd/clipSetDefinition.cpp
+++ b/pxr/usd/usd/clipSetDefinition.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/clipSetDefinition.h"
diff --git a/pxr/usd/usd/clipSetDefinition.h b/pxr/usd/usd/clipSetDefinition.h
index 274d2e837b..dc166fa3bd 100644
--- a/pxr/usd/usd/clipSetDefinition.h
+++ b/pxr/usd/usd/clipSetDefinition.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_CLIP_SET_DEFINITION_H
 #define PXR_USD_USD_CLIP_SET_DEFINITION_H
diff --git a/pxr/usd/usd/clipsAPI.cpp b/pxr/usd/usd/clipsAPI.cpp
index 98a5021ef4..a87a9e55af 100644
--- a/pxr/usd/usd/clipsAPI.cpp
+++ b/pxr/usd/usd/clipsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/clipsAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/clipsAPI.h b/pxr/usd/usd/clipsAPI.h
index 7efecc4227..257739226e 100644
--- a/pxr/usd/usd/clipsAPI.h
+++ b/pxr/usd/usd/clipsAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USD_GENERATED_CLIPSAPI_H
 #define USD_GENERATED_CLIPSAPI_H
diff --git a/pxr/usd/usd/codegenTemplates/api.h b/pxr/usd/usd/codegenTemplates/api.h
index eb2adac23f..f466848f42 100644
--- a/pxr/usd/usd/codegenTemplates/api.h
+++ b/pxr/usd/usd/codegenTemplates/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef {{ Upper(libraryName) }}_API_H
 #define {{ Upper(libraryName) }}_API_H
diff --git a/pxr/usd/usd/codegenTemplates/schemaClass.cpp b/pxr/usd/usd/codegenTemplates/schemaClass.cpp
index 487484a55b..885c8a05ec 100644
--- a/pxr/usd/usd/codegenTemplates/schemaClass.cpp
+++ b/pxr/usd/usd/codegenTemplates/schemaClass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "{{ libraryPath }}/{{ cls.GetHeaderFile() }}"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -28,10 +11,6 @@
 #include "pxr/usd/sdf/types.h"
 #include "pxr/usd/sdf/assetPath.h"
 
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
-#include "pxr/base/tf/staticTokens.h"
-
-{% endif %}
 {% if useExportAPI %}
 {{ namespaceOpen }}
 
@@ -52,13 +31,6 @@ TF_REGISTRY_FUNCTION(TfType)
 {% endif %}
 }
 
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
-TF_DEFINE_PRIVATE_TOKENS(
-    _schemaTokens,
-    ({{ cls.propertyNamespacePrefix }})
-);
-
-{% endif %}
 /* virtual */
 {{ cls.cppClassName }}::~{{ cls.cppClassName }}()
 {
@@ -73,10 +45,10 @@ TF_DEFINE_PRIVATE_TOKENS(
         TF_CODING_ERROR("Invalid stage");
         return {{ cls.cppClassName }}();
     }
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
     TfToken name;
     if (!Is{{ cls.usdPrimTypeName }}Path(path, &name)) {
-        TF_CODING_ERROR("Invalid {{ cls.propertyNamespacePrefix }} path <%s>.", path.GetText());
+        TF_CODING_ERROR("Invalid {{ cls.propertyNamespace.prefix }} path <%s>.", path.GetText());
         return {{ cls.cppClassName }}();
     }
     return {{ cls.cppClassName }}(stage->GetPrimAtPath(path.GetPrimPath()), name);
@@ -123,7 +95,7 @@ std::vector<{{ cls.cppClassName }}>
         stage->DefinePrim(path, usdPrimTypeName));
 }
 {% endif %}
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
 
 /* static */
 bool 
@@ -167,9 +139,9 @@ bool
     }
 
     if (tokens.size() >= 2
-        && tokens[0] == _schemaTokens->{{ cls.propertyNamespacePrefix }}) {
+        && tokens[0] == {{ tokensPrefix }}Tokens->{{ cls.propertyNamespace.token }}) {
         *name = TfToken(propertyName.substr(
-            _schemaTokens->{{ cls.propertyNamespacePrefix }}.GetString().size() + 1));
+           {{ tokensPrefix }}Tokens->{{ cls.propertyNamespace.token }}.GetString().size() + 1));
         return true;
     }
 
@@ -244,7 +216,7 @@ const TfType &
 {
     return _GetStaticTfType();
 }
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
 
 /// Returns the property name prefixed with the correct namespace prefix, which
 /// is composed of the the API's propertyNamespacePrefix metadata and the
@@ -265,7 +237,7 @@ _GetNamespacedPropertyName(const TfToken instanceName, const TfToken propName)
 UsdAttribute
 {{ cls.cppClassName }}::Get{{ Proper(attr.apiName) }}Attr() const
 {
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
     return GetPrim().GetAttribute(
         _GetNamespacedPropertyName(
             GetName(),
@@ -279,7 +251,7 @@ UsdAttribute
 UsdAttribute
 {{ cls.cppClassName }}::Create{{ Proper(attr.apiName) }}Attr(VtValue const &defaultValue, bool writeSparsely) const
 {
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
     return UsdSchemaBase::_CreateAttr(
                        _GetNamespacedPropertyName(
                             GetName(),
@@ -304,7 +276,7 @@ UsdAttribute
 UsdRelationship
 {{ cls.cppClassName }}::Get{{ Proper(rel.apiName) }}Rel() const
 {
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
     return GetPrim().GetRelationship(
         _GetNamespacedPropertyName(
             GetName(),
@@ -318,7 +290,7 @@ UsdRelationship
 UsdRelationship
 {{ cls.cppClassName }}::Create{{ Proper(rel.apiName) }}Rel() const
 {
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
     return GetPrim().CreateRelationship(
                        _GetNamespacedPropertyName(
                            GetName(),
diff --git a/pxr/usd/usd/codegenTemplates/schemaClass.h b/pxr/usd/usd/codegenTemplates/schemaClass.h
index 2e1134d8da..528d792452 100644
--- a/pxr/usd/usd/codegenTemplates/schemaClass.h
+++ b/pxr/usd/usd/codegenTemplates/schemaClass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef {{ Upper(libraryName) }}_GENERATED_{{ Upper(cls.className) }}_H
 #define {{ Upper(libraryName) }}_GENERATED_{{ Upper(cls.className) }}_H
@@ -88,7 +71,7 @@ class {{ cls.cppClassName }} : public {{ cls.parentCppClassName }}
     /// {{ cls.cppClassName }}::Get(
     ///    prim.GetStage(),
     ///    prim.GetPath().AppendProperty(
-    ///        "{{ cls.propertyNamespacePrefix }}:name"));
+    ///        "{{ cls.propertyNamespace.prefix }}:name"));
     ///
     /// for a \em valid \p prim, but will not immediately throw an error for
     /// an invalid \p prim
@@ -161,9 +144,9 @@ class {{ cls.cppClassName }} : public {{ cls.parentCppClassName }}
     /// Return a {{ cls.cppClassName }} holding the prim adhering to this
     /// schema at \p path on \p stage.  If no prim exists at \p path on
     /// \p stage, or if the prim at that path does not adhere to this schema,
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
     /// return an invalid schema object.  \p path must be of the format
-    /// <path>.{{ cls.propertyNamespacePrefix }}:name .
+    /// <path>.{{ cls.propertyNamespace.prefix }}:name .
     ///
     /// This is shorthand for the following:
     ///
@@ -234,7 +217,7 @@ class {{ cls.cppClassName }} : public {{ cls.parentCppClassName }}
     static {{ cls.cppClassName }}
     Define(const UsdStagePtr &stage, const SdfPath &path);
 {% endif %}
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
     /// Checks if the given name \p baseName is the base name of a property
     /// of {{ cls.usdPrimTypeName }}.
     {% if useExportAPI -%}
diff --git a/pxr/usd/usd/codegenTemplates/tokens.cpp b/pxr/usd/usd/codegenTemplates/tokens.cpp
index 89f63a58c9..682034115f 100644
--- a/pxr/usd/usd/codegenTemplates/tokens.cpp
+++ b/pxr/usd/usd/codegenTemplates/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "{{ libraryPath }}/tokens.h"
 
diff --git a/pxr/usd/usd/codegenTemplates/tokens.h b/pxr/usd/usd/codegenTemplates/tokens.h
index 732d0bdae3..e0896efda7 100644
--- a/pxr/usd/usd/codegenTemplates/tokens.h
+++ b/pxr/usd/usd/codegenTemplates/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef {{ Upper(tokensPrefix) }}_TOKENS_H
 #define {{ Upper(tokensPrefix) }}_TOKENS_H
diff --git a/pxr/usd/usd/codegenTemplates/wrapSchemaClass.cpp b/pxr/usd/usd/codegenTemplates/wrapSchemaClass.cpp
index 642180f815..9c566163a1 100644
--- a/pxr/usd/usd/codegenTemplates/wrapSchemaClass.cpp
+++ b/pxr/usd/usd/codegenTemplates/wrapSchemaClass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "{{ libraryPath }}/{{ cls.GetHeaderFile() }}"
 #include "pxr/usd/usd/schemaBase.h"
@@ -66,7 +49,7 @@ _Create{{ Proper(attr.apiName) }}Attr({{ cls.cppClassName }} &self,
 }
 {% endif %}
 {% endfor %}
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
 
 static bool _WrapIs{{ cls.usdPrimTypeName }}Path(const SdfPath &path) {
     TfToken collectionName;
@@ -254,7 +237,7 @@ void wrap{{ cls.cppClassName }}()
              &This::Create{{ Proper(rel.apiName) }}Rel)
 {% endif %}
 {% endfor %}
-{% if cls.isMultipleApply and cls.propertyNamespacePrefix %}
+{% if cls.isMultipleApply and cls.propertyNamespace %}
         .def("Is{{ cls.usdPrimTypeName }}Path", _WrapIs{{ cls.usdPrimTypeName }}Path)
             .staticmethod("Is{{ cls.usdPrimTypeName }}Path")
 {% endif %}
diff --git a/pxr/usd/usd/codegenTemplates/wrapTokens.cpp b/pxr/usd/usd/codegenTemplates/wrapTokens.cpp
index 7d54d47032..035d22dcad 100644
--- a/pxr/usd/usd/codegenTemplates/wrapTokens.cpp
+++ b/pxr/usd/usd/codegenTemplates/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/collectionAPI.cpp b/pxr/usd/usd/collectionAPI.cpp
index 61706b4193..63bee84507 100644
--- a/pxr/usd/usd/collectionAPI.cpp
+++ b/pxr/usd/usd/collectionAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/collectionAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -28,8 +11,6 @@
 #include "pxr/usd/sdf/types.h"
 #include "pxr/usd/sdf/assetPath.h"
 
-#include "pxr/base/tf/staticTokens.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 // Register the schema with the TfType system.
@@ -40,11 +21,6 @@ TF_REGISTRY_FUNCTION(TfType)
     
 }
 
-TF_DEFINE_PRIVATE_TOKENS(
-    _schemaTokens,
-    (collection)
-);
-
 /* virtual */
 UsdCollectionAPI::~UsdCollectionAPI()
 {
@@ -131,9 +107,9 @@ UsdCollectionAPI::IsCollectionAPIPath(
     }
 
     if (tokens.size() >= 2
-        && tokens[0] == _schemaTokens->collection) {
+        && tokens[0] == UsdTokens->collection) {
         *name = TfToken(propertyName.substr(
-            _schemaTokens->collection.GetString().size() + 1));
+           UsdTokens->collection.GetString().size() + 1));
         return true;
     }
 
diff --git a/pxr/usd/usd/collectionAPI.h b/pxr/usd/usd/collectionAPI.h
index 0393847a83..b040c604d6 100644
--- a/pxr/usd/usd/collectionAPI.h
+++ b/pxr/usd/usd/collectionAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USD_GENERATED_COLLECTIONAPI_H
 #define USD_GENERATED_COLLECTIONAPI_H
@@ -58,95 +41,137 @@ class SdfAssetPath;
 
 /// \class UsdCollectionAPI
 ///
-/// This is a general purpose API schema, used to describe a 
-/// collection of heterogeneous objects within the scene. "Objects" here may be 
-/// prims or properties belonging to prims or other collections. It's an add-on 
-/// schema that can be applied many times to a prim with different collection 
-/// names. 
+/// A general purpose API schema used to describe a collection of prims
+/// and properties within a scene. This API schema can be applied to a prim
+/// multiple times with different instance names to define several collections
+/// on a single prim.
+/// 
+/// A collection's membership is specified one of two ways. The first way uses
+/// the built-in relationships `includes` and `excludes`, and the attribute
+/// `includeRoot` to determine membership. The second way is termed a
+/// pattern-based collection, and uses the built-in attribute
+/// `membershipExpression` to determine membership. Here we will refer to
+/// collections using `includes`, `excludes` and `includeRoot` as being in
+/// *relationship-mode* and those using the `membershipExpression` as being in
+/// *expression-mode*.
 /// 
-/// A collection allows an enumeration of a set of paths to include and a 
-/// set of paths to exclude.  Whether the descendants of an included
-/// path are members of a collection are decided by its expansion rule
-/// (see below).  If the collection excludes paths that are not descendents
-/// of included paths, the collection implicitly includes the root path
-/// &lt;/&gt;.  If such a collection also includes paths that are not
-/// descendants of the excluded paths, it is considered invalid, since
-/// the intention is ambiguous.
+/// A collection is determined to be in *relationship-mode* when either or both
+/// of its `includes` and `excludes` relationships have valid targets, or the
+/// `includeRoot` attribute is set `true`.  In this case, the pattern-based
+/// `membershipExpression` attribute is ignored.  Otherwise, the collection is
+/// in *expression-mode* and the `membershipExpression` attribute applies.
 /// 
-/// All the properties authored by the schema are namespaced under
-/// "collection:". The given name of the collection provides additional 
-/// namespacing for the various per-collection properties, which include the 
-/// following:
+/// In *relationship-mode* the `includes` and `excludes` relationships specify
+/// the collection members as a set of paths to include and a set of paths to
+/// exclude.  Whether or not the descendants of an included path belong to a
+/// collection is decided by its expansion rule (see below).  If the collection
+/// excludes paths that are not descendent to included paths, the collection
+/// implicitly includes the root path `</>`.  If such a collection also
+/// includes paths that are not descendent to the excluded paths, it is
+/// considered invalid since the intent is ambiguous.
+/// 
+/// In *expression-mode*, the pattern-based `membershipExpression` attribute is
+/// used with the `expansionRule` attribute to determine collection membership.
+/// See the detailed descriptions of the built-in properties below for more
+/// details.
+/// 
+/// \section usd_collectionapi_properties Collection API Properties
+/// 
+/// The built-in properties for this schema are in the `collection:instanceName`
+/// namespace, where `instanceName` is the user-provided applied API schema
+/// instance name.
 /// 
-/// <ul><li><b>uniform token collection:<i>collectionName</i>:expansionRule</b> - 
-/// specified how the paths that are included in the collection must be expanded 
-/// to determine its members. Possible values include:
 /// <ul>
-/// <li><b>explicitOnly</b> - only paths in the includes rel targets and not 
-/// in the excludes rel targets belong to the collection.
+/// <li>`uniform token collection:instanceName:expansionRule` - in
+/// *relationship-mode*, specifies how to expand the `includes` and `excludes`
+/// relationship targets to determine the collection's members.  In
+/// *expression-mode*, specifies how matching scene objects against the
+/// `membershipExpression` proceeds.  Possible values include:
+/// <ul>
+/// <li>`expandPrims` - in *relationship-mode*, all the prims descendent
+/// to the `includes` relationship targets (and not descendent to `excludes`
+/// relationship targets) belong to the collection.  Any `includes`-targeted
+/// property paths also belong to the collection. This is the default
+/// behavior. In *expression-mode*, the functions
+/// UsdComputeIncludedObjectsFromCollection() and
+/// UsdComputeIncludedPathsFromCollection() only test prims against the
+/// `membershipExpression` to determine membership.
 /// </li>
-/// <li><b>expandPrims</b> - all the prims at or below the includes rel-
-/// targets (and not under the excludes rel-targets) belong to the 
-/// collection.  Any property paths included in the collection would, of 
-/// course, also be honored. This is the default behavior as it satisfies 
-/// most use cases.
+/// <li>`expandPrimsAndProperties` - like `expandPrims`, but in
+/// *relationship-mode*, all properties on all included prims also belong to
+/// the collection. In *expression-mode*, the functions
+/// UsdComputeIncludedObjectsFromCollection() and
+/// UsdComputeIncludedPathsFromCollection() test both prims and
+/// properties against the `membershipExpression` to determine membership.
 /// </li>
-/// <li><b>expandPrimsAndProperties</b> - like expandPrims, but also 
-/// includes all properties on all matched prims.  We're still not quite 
-/// sure what the use cases are for this, but you can use it to capture a 
-/// whole lot of UsdObjects very concisely.
+/// <li>`explicitOnly` - in *relationship-mode*, only paths in the
+/// `includes` relationship targets and not those in the `excludes`
+/// relationship targets belong to the collection. Does not apply to
+/// *expression-mode*. If set in *expression-mode*, the functions
+/// UsdComputeIncludedObjectsFromCollection() and
+/// UsdComputeIncludedPathsFromCollection() return no results.
 /// </li>
 /// </ul>
 /// </li>
-/// <li><b>bool collection:<i>collectionName</i>:includeRoot</b> - boolean
-/// attribute indicating whether the pseudo-root path &lt;/&gt; should
-/// be counted as one of the included target paths.  The fallback is false.
-/// This separate attribute is required because relationships cannot
-/// directly target the root.  When expansionRule is explicitOnly, this
-/// attribute is ignored.
-/// <li><b>rel collection:<i>collectionName</i>:includes</b> - specifies a list 
-/// of targets that are included in the collection. This can target prims or 
-/// properties directly. A collection can insert the rules of another
-/// collection by making its <i>includes</i> relationship target the
-/// <b>collection:{collectionName}</b> property on the owning prim of the
-/// collection to be included (see UsdCollectionAPI::GetCollectionAttr).
-/// It is important to note that including another collection does not
-/// guarantee the contents of that collection will be in the final collection;
-/// instead, the rules are merged.  This means, for example, an exclude
-/// entry may exclude a portion of the included collection.
-/// When a collection includes one or more collections, the order in which 
-/// targets are added to the includes relationship may become significant, if 
-/// there are conflicting opinions about the same path. Targets that are added 
-/// later are considered to be stronger than earlier targets for the same path.
-/// </li>
-/// <li><b>rel collection:<i>collectionName</i>:excludes</b> - specifies a list 
-/// of targets that are excluded below the <b>included</b> paths in this 
-/// collection. This can target prims or properties directly, but <b>cannot
-/// target another collection</b>. This is to keep the membership determining 
-/// logic simple, efficient and easier to reason about. Finally, it is invalid 
-/// for a collection to exclude paths that are not included in it. The presence
-/// of such "orphaned" excluded paths will not affect the set of paths included 
-/// in the collection, but may affect the performance of querying membership of 
-/// a path in the collection (see UsdCollectionAPI::MembershipQuery::IsPathIncluded) 
-/// or of enumerating the objects belonging to the collection (see 
-/// UsdCollectionAPI::GetIncludedObjects).
-/// </li>
-/// <li><b>uniform opaque collection:<i>collectionName</i></b> - opaque 
+/// 
+/// <li>`bool collection:instanceName:includeRoot` - boolean attribute
+/// indicating whether the pseudo-root path `</>` should be counted as one
+/// of the included target paths in *relationship-mode*. This separate attribute
+/// is required because relationships cannot directly target the root. When
+/// `expansionRule` is `explicitOnly`, this attribute is ignored. The fallback
+/// value is false. When set to `true`, this collection is in
+/// *relationship-mode*. This attribute is ignored in *expression-mode*.  </li>
+/// 
+/// <li>`rel collection:instanceName:includes` - in *relationship-mode*,
+/// specifies a list of targets that are included in the collection. This can
+/// target prims or properties directly. A collection can insert the rules of
+/// another collection by making its `includes` relationship target the
+/// `collection:otherInstanceName` property from the collection to be included
+/// (see UsdCollectionAPI::GetCollectionAttr).  Note that including another
+/// collection does not guarantee the contents of that collection will be in the
+/// final collection; instead, the rules are merged.  This means, for example,
+/// an exclude entry may exclude a portion of the included collection.  When a
+/// collection includes one or more collections, the order in which targets are
+/// added to the includes relationship may become significant, if there are
+/// conflicting opinions about the same path. Targets that are added later are
+/// considered to be stronger than earlier targets for the same path.  This
+/// relationship is ignored in *expression-mode*.</li>
+/// 
+/// <li>`rel collection:instanceName:excludes` - in *relationship-mode*,
+/// specifies a list of targets that are excluded below the <b>included</b>
+/// paths in this collection. This can target prims or properties directly, but
+/// <b>cannot target another collection</b>. This is to keep the membership
+/// determining logic simple, efficient and easier to reason about. Finally, it
+/// is invalid for a collection to exclude paths that are not included in
+/// it. The presence of such "orphaned" excluded paths will not affect the set
+/// of paths included in the collection, but may affect the performance of
+/// querying membership of a path in the collection (see
+/// UsdCollectionMembershipQuery::IsPathIncluded) or of enumerating the
+/// objects belonging to the collection (see
+/// UsdCollectionAPI::ComputeIncludedObjects).  This relationship is ignored in
+/// *expression-mode*.</li>
+/// 
+/// <li>`uniform opaque collection:instanceName` - opaque
 /// attribute (meaning it can never have a value) that represents the collection
-/// for the purpose of allowing another collection to include it. When this
-/// property is targeted by another collection's <i>includes</i> relationship,
-/// the rules of this collection will be inserted into the rules of the collection
-/// that includes it.
-/// </li></ul>
+/// for the purpose of allowing another collection to include it in
+/// *relationship-mode*. When this property is targeted by another collection's
+/// `includes` relationship, the rules of this collection will be inserted
+/// into the rules of the collection that includes it.</li>
 /// 
-/// <b>Implicit inclusion</b>
+/// <li>`uniform pathExpression collection:instanceName:membershipExpression` -
+/// in *expression-mode*, defines the SdfPathExpression used to test
+/// objects for collection membership.</li>
+/// 
+/// </ul>
+/// 
+/// \subsection usd_collectionapi_implicit_inclusion Implicit Inclusion
 /// 
 /// In some scenarios it is useful to express a collection that includes
-/// everything except certain paths.  To support this, a collection
-/// that has an exclude that is not a descendent of any include
-/// will include the root path &lt;/&gt;.
+/// everything except certain paths.  To support this, a *relationship-mode*
+/// collection that has an exclude that is not descendent to any include will
+/// include the root path `</>`.
 /// 
-/// <b>Creating collections in C++</b>
+/// \section usd_collectionapi_creating_cpp Creating Collections in C++
 /// 
 /// \snippet examples_usd.cpp ApplyCollections
 /// 
@@ -348,7 +373,7 @@ class UsdCollectionAPI : public UsdAPISchemaBase
     // INCLUDEROOT 
     // --------------------------------------------------------------------- //
     /// Boolean attribute indicating whether the pseudo-root
-    /// path &lt;/&gt; should be counted as one of the included target
+    /// path `</>` should be counted as one of the included target
     /// paths.  The fallback is false.  This separate attribute is
     /// required because relationships cannot directly target the root.
     ///
@@ -573,8 +598,6 @@ class UsdCollectionAPI : public UsdAPISchemaBase
         const UsdStageWeakPtr &stage,
         const Usd_PrimFlagsPredicate &pred=UsdPrimDefaultPredicate);
 
-    /// @}
-
     /// \anchor UsdCollectionAPI_AuthoringAPI
     /// \name Collection Authoring API
     /// 
diff --git a/pxr/usd/usd/collectionMembershipQuery.cpp b/pxr/usd/usd/collectionMembershipQuery.cpp
index e1a2421028..e826b6857b 100644
--- a/pxr/usd/usd/collectionMembershipQuery.cpp
+++ b/pxr/usd/usd/collectionMembershipQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/collectionMembershipQuery.h"
 #include "pxr/usd/usd/collectionPredicateLibrary.h"
@@ -129,6 +112,17 @@ _ComputeIncludedImpl(
             } else if (UsdPrim prim = stage->GetPrimAtPath(path)) {
 
                 UsdPrimRange range(prim, pred);
+                // If this prim is the stage's pseudo-root, increment the
+                // range's begin iterator to skip it.  This happens when the
+                // collection has 'includeRoot' set to include '/'.  This fixup
+                // is necessary since the below test of query.IsPathIncluded()
+                // will return false for '/' since only prims and properties can
+                // be included, but that will thwart the remainder of the
+                // iteration descendant to '/'.
+                if (prim == stage->GetPseudoRoot()) {
+                    range.increment_begin();
+                }
+                
                 auto iter = range.begin();
                 for (; iter != range.end() ; ++iter) {
                     const UsdPrim &descendantPrim = *iter;
@@ -406,8 +400,12 @@ Usd_CollectionMembershipQueryBase::_IsPathIncludedByRuleMap(
                         *expansionRule = UsdTokens->exclude;
                     }
                     return false;
-                } else if ((i->second == UsdTokens->expandPrimsAndProperties) ||
-                           (i->second == UsdTokens->explicitOnly && p == path)){
+                }
+                // If there is a property path directly in the map, then it is
+                // considered included even if the rule is expandPrims.
+                else if (p.IsPropertyPath() ||
+                         (i->second == UsdTokens->expandPrimsAndProperties) ||
+                         (i->second == UsdTokens->explicitOnly && p == path)) {
                     if (expansionRule) {
                         *expansionRule = i->second;
                     }
@@ -503,4 +501,203 @@ Usd_CollectionMembershipQueryBase::_Hash::operator()(
     return TfHash::Combine(entries, q._topExpansionRule);
 }
 
+
+SdfPathExpression
+UsdComputePathExpressionFromCollectionMembershipQueryRuleMap(
+    Usd_CollectionMembershipQueryBase::PathExpansionRuleMap const &ruleMap)
+{
+    // Shorthand to increase readability.
+    using Expr = SdfPathExpression;
+
+    // If there are no rules, we don't match anything.
+    if (ruleMap.empty()) {
+        return Expr::Nothing();
+    }
+
+    // Use an enum instead of tokens to avoid TfToken refcounting locally.
+    enum Rule { ExpandPrims, ExpandPrimsAndProps, Exclude, ExplicitOnly };
+    auto tokenToRule = [](TfToken const &token) {
+        if (token == UsdTokens->expandPrims) { return ExpandPrims; }
+        if (token == UsdTokens->
+            expandPrimsAndProperties) { return ExpandPrimsAndProps; }
+        if (token == UsdTokens->exclude) { return Exclude; }
+        return ExplicitOnly;
+    };
+
+    // Build a lexicographically ordered list of entries to process.  This
+    // ensures that we will see ancestor paths prior to descendant paths.
+    //
+    // During this process we also collect any explictOnly prim paths, and all
+    // property paths separately.  These can all be treated as ExplicitOnly
+    // entries, either included or excluded.  We combine these with the final
+    // expression at the end, in such a way that they are evaluated first, since
+    // they are the fastest to evaluate.
+    using Entry = std::pair<SdfPath, Rule>;
+    std::vector<Entry> entries;
+    entries.reserve(ruleMap.size());
+
+    // These subexpressions track explicitly included or excluded single-path
+    // rules.  They are both just union chains, like '/foo /bar /baz' etc.
+    Expr explicitIncludes, explicitExcludes;
+    auto addUnion = [](Expr &expr, SdfPath const &path) {
+        expr = Expr::MakeOp(Expr::ImpliedUnion,
+                            std::move(expr), Expr::MakeAtom(path));
+    };
+
+    for (auto const &[path, ruleToken]: ruleMap) {
+        Rule rule = tokenToRule(ruleToken);
+        // Collect explicit-only rules separately.
+        if (rule == ExplicitOnly) {
+            addUnion(explicitIncludes, path);
+        }
+        // Property paths can always be treated as explicit since they don't
+        // have descendant prims/properties.
+        else if (!path.IsAbsoluteRootOrPrimPath()) {
+            addUnion(
+                rule == Exclude ? explicitExcludes : explicitIncludes, path);
+        }
+        // Other rules for prim-like paths are handled by the shift/reduce
+        // builder.
+        else {
+            TF_AXIOM(path.IsAbsoluteRootOrPrimPath());
+            entries.emplace_back(path, rule);
+        }
+    }
+    std::sort(entries.begin(), entries.end());
+
+    // Build the expression shift-reduce style, merging the most descendant
+    // expressions into ancestral expressions.
+    
+    // Each stack entry contains the path for this rule as 'self', its
+    // accumulated subexpression thus far (incorporating descendant rules), and
+    // finally the rule for this path.
+    struct StackEntry {
+        StackEntry(SdfPath const &self_, Rule rule_)
+            : StackEntry(SdfPath(self_), rule_) {}
+        StackEntry(SdfPath &&self_, Rule rule_)
+            : self(std::move(self_)), rule(rule_) {
+            // Note that this cannot be a property path.  Those are handled in
+            // explicitIncludes/Excludes.
+            TF_AXIOM(self.IsAbsoluteRootOrPrimPath());
+
+            // If this is an exclude of the absolute root path, our expression
+            // is just Nothing.
+            if (self.IsAbsoluteRootPath() && rule == Exclude) {
+                return;
+            }
+            // Otherwise build the initial expression for this path's rule,
+            // starting with the path itself.
+            Expr::PathPattern pattern(self);
+            pattern.AppendChild({}); // tack on '//'
+            expr = Expr::MakeAtom(std::move(pattern));
+            // If the rule is ExpandPrims (not properties) subtract properties.
+            if (rule == ExpandPrims) {
+                static Expr const &allPropsExpr = *(new Expr("//*.*"));
+                expr = Expr::MakeOp(Expr::Difference,
+                                    std::move(expr), Expr{allPropsExpr});
+            }
+            // Finally, to get correct precedence, we insert a weaker reference
+            // '%_' on the left hand side joined with the operator for our rule.
+            // So for an include it's like '%_ /self//' and for an exclude it's
+            // like '%_ - /self//'.  The parent will compose this expression
+            // over its own as the weaker reference to insert in the correct
+            // spot.  But if this rule is for the absolute root, we do not
+            // include a weaker reference since it's the final rule.
+            if (!self.IsAbsoluteRootPath()) {
+                expr = Expr::MakeOp(
+                    rule == Exclude ? Expr::Difference : Expr::Union,
+                    Expr::WeakerRef(), std::move(expr));
+            }
+        }
+        SdfPath self;
+        Expr expr;
+        Rule rule;
+    };
+    std::vector<StackEntry> stack;
+
+    // Helper function to reduce the stack top (back()) into the next
+    // (ancestral) stack entry by merging its accumulated expression into the
+    // ancestor, reducing the stack size by one. If the stack is not empty,
+    // return the empty expression.  If the stack has only one element, return
+    // the final expression and leave the stack empty.
+    auto reduce = [](std::vector<StackEntry> &stack) {
+        Expr topExpr = std::move(stack.back().expr);
+        stack.pop_back();
+        // If the stack is empty, return the final expression.
+        if (stack.empty()) {
+            return topExpr;
+        }
+        // Otherwise combine into the next entry by composing the oldTop's
+        // expression over the newTop's -- replacing the oldTop's weaker
+        // reference '%_' with the newTop's expression.
+        StackEntry &newTop = stack.back();
+        newTop.expr = topExpr.ComposeOver(newTop.expr);
+        // Return empty since the expression is not yet complete.
+        topExpr = {};
+        return topExpr;
+    };
+    
+    // For uniformity we want the stack top to always be '/'.  If the first
+    // entry in 'entries' is not '/', it means that '/' is implicitly excluded,
+    // so in that case we push an exclude of '/' manually.  Otherwise the loop
+    // over entries below will push the '/' on its first iteration.  If entries
+    // is empty here, it means that all paths were explicit and there are no
+    // other rules.
+    if (!entries.empty() && !entries.front().first.IsAbsoluteRootPath()) {
+        stack.emplace_back(SdfPath::AbsoluteRootPath(), Exclude);
+    }
+
+    // Process each entry in lexicographical order, which ensures we process
+    // ancestors prior to descendants.
+    for (Entry &curEntry: entries) {
+        // Reduce the stack until we find an ancestor of 'curEntry'.  Note that
+        // this loop will never reduce stack to empty() -- it is only possibly
+        // empty the first time through.
+        while (!stack.empty() && !curEntry.first.HasPrefix(stack.back().self)) {
+            reduce(stack);
+        }
+        // Push/shift this new descendant, unless it is redundant.  The rule map
+        // computation sometimes produces redundant entries, like
+        // excludes=[/foo, /foo/bar].  So skip this entry if it is subsumed by
+        // the stack top.  This is true when top=exclude and cur=exclude, or
+        // when top=expandPrims and cur=expandPrims, or when
+        // top=expandPrimsAndProps and cur!=exclude.
+        if (!stack.empty()) {
+            Rule topRule = stack.back().rule, curRule = curEntry.second;
+            if ((topRule == Exclude && curRule == Exclude) ||
+                (topRule == ExpandPrims && curRule == ExpandPrims) ||
+                (topRule == ExpandPrimsAndProps && curRule != Exclude)) {
+                // This entry is redundant with the stack top, so skip it.  Any
+                // descendant entries of this curEntry will still be processed.
+                continue;
+            }
+        }
+        // Push new descendant.
+        stack.emplace_back(std::move(curEntry.first), curEntry.second);
+    }
+    
+    // Reduce the remainder of the stack to complete building the expression.
+    Expr result;
+    while (!stack.empty()) {
+        result = reduce(stack);
+    }
+
+    // Put it all together.  The overall final form of the expression is:
+    //
+    // (incl_1 + ... + incl_N) + (~(excl_1 + ... + excl_N) & result)
+    //  ~~~~~~~~~~~~~~~~~~~~~       ~~~~~~~~~~~~~~~~~~~~~
+    //  ^ explicitIncludes ^        ^ explicitExcludes ^
+    //
+    // Where 'result' is the previously shift/reduce-computed expression dealing
+    // with hierarchical include/exclude rules, and 'incl/excl_1..N' are the
+    // explicit includes & excludes.
+
+    return Expr::MakeOp(Expr::ImpliedUnion,
+                        std::move(explicitIncludes),
+                        Expr::MakeOp(Expr::Intersection,
+                                     Expr::MakeComplement(
+                                         std::move(explicitExcludes)),
+                                     std::move(result)));
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/usd/collectionMembershipQuery.h b/pxr/usd/usd/collectionMembershipQuery.h
index 64b375d1cf..c36943e58d 100644
--- a/pxr/usd/usd/collectionMembershipQuery.h
+++ b/pxr/usd/usd/collectionMembershipQuery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_COLLECTION_MEMBERSHIP_QUERY_H
 #define PXR_USD_USD_COLLECTION_MEMBERSHIP_QUERY_H
@@ -113,10 +96,10 @@ class Usd_CollectionMembershipQueryBase
 
     /// Returns a set of paths for all collections that were included in the
     /// collection from which this Usd_CollectionMembershipQueryBase object was
-    /// computed. This set is recursive, so collections that were included
-    /// by other collections will be part of this set. The collection from
-    /// which this Usd_CollectionMembershipQueryBase object was computed is *not*
-    /// part of this set.
+    /// computed. This set is recursive, so collections that were included by
+    /// other collections will be part of this set. The collection from which
+    /// this Usd_CollectionMembershipQueryBase object was computed is *not* part
+    /// of this set.
     const SdfPathSet& GetIncludedCollections() const {
         return _includedCollections;
     }
@@ -168,6 +151,13 @@ class Usd_CollectionMembershipQueryBase
     bool _hasExcludes=false;
 };
 
+/// Compute an SdfPathExpression that matches the same paths as \p ruleMap.  The
+/// resulting SdfPathExpression is always complete (see
+/// SdfPathExpression::IsComplete()) and never contains predicates.
+USD_API
+SdfPathExpression
+UsdComputePathExpressionFromCollectionMembershipQueryRuleMap(
+    Usd_CollectionMembershipQueryBase::PathExpansionRuleMap const &ruleMap);
 
 // -------------------------------------------------------------------------- //
 // UsdCollectionMembershipQuery                                               //
@@ -310,10 +300,10 @@ class Usd_CollectionMembershipQuery : public Usd_CollectionMembershipQueryBase
         // compare equal to each other.  This is because the evaluator objects
         // run code, and there's no good way to determine equivalence.
         return _topExpansionRule == rhs._topExpansionRule &&
-        _hasExcludes == rhs._hasExcludes &&
-        _pathExpansionRuleMap == rhs._pathExpansionRuleMap &&
-        _includedCollections == rhs._includedCollections &&
-        _exprEval.IsEmpty() == rhs._exprEval.IsEmpty();
+            _hasExcludes == rhs._hasExcludes &&
+            _pathExpansionRuleMap == rhs._pathExpansionRuleMap &&
+            _includedCollections == rhs._includedCollections &&
+            _exprEval.IsEmpty() == rhs._exprEval.IsEmpty();
         ;
     }
 
diff --git a/pxr/usd/usd/collectionPredicateLibrary.cpp b/pxr/usd/usd/collectionPredicateLibrary.cpp
index 7bd018e868..ef1c9da4fb 100644
--- a/pxr/usd/usd/collectionPredicateLibrary.cpp
+++ b/pxr/usd/usd/collectionPredicateLibrary.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/collectionPredicateLibrary.h"
 #include "pxr/usd/usd/variantSets.h"
diff --git a/pxr/usd/usd/collectionPredicateLibrary.h b/pxr/usd/usd/collectionPredicateLibrary.h
index ce4191df02..b114d2b057 100644
--- a/pxr/usd/usd/collectionPredicateLibrary.h
+++ b/pxr/usd/usd/collectionPredicateLibrary.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_COLLECTION_PREDICATE_LIBRARY_H
 #define PXR_USD_USD_COLLECTION_PREDICATE_LIBRARY_H
diff --git a/pxr/usd/usd/common.cpp b/pxr/usd/usd/common.cpp
index 9d86e5931e..d6470cea07 100644
--- a/pxr/usd/usd/common.cpp
+++ b/pxr/usd/usd/common.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/common.h b/pxr/usd/usd/common.h
index 3b2d8110ca..b4c6dc79a4 100644
--- a/pxr/usd/usd/common.h
+++ b/pxr/usd/usd/common.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_COMMON_H
 #define PXR_USD_USD_COMMON_H
diff --git a/pxr/usd/usd/coreValidators.cpp b/pxr/usd/usd/coreValidators.cpp
new file mode 100644
index 0000000000..b9f9ceec2e
--- /dev/null
+++ b/pxr/usd/usd/coreValidators.cpp
@@ -0,0 +1,37 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usd/usd/validationError.h"
+#include "pxr/usd/usd/validationRegistry.h"
+#include "pxr/usd/usd/validatorTokens.h"
+#include "pxr/usd/usd/validator.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_REGISTRY_FUNCTION(UsdValidationRegistry)
+{
+    const UsdValidateStageTaskFn stageTaskFn = 
+        [](const UsdStagePtr &usdStage) {
+            UsdValidationErrorVector errors;
+            const PcpErrorVector pcpErrors = usdStage->GetCompositionErrors();
+            errors.reserve(pcpErrors.size());
+            for (const PcpErrorBasePtr &pcpError : pcpErrors) {
+                UsdValidationErrorSites errorSites = {
+                    UsdValidationErrorSite(usdStage, pcpError->rootSite.path)};
+                errors.emplace_back(UsdValidationErrorType::Error, 
+                                    std::move(errorSites), 
+                                    pcpError->ToString());
+            }
+            return errors;
+        };
+
+    UsdValidationRegistry &registry = UsdValidationRegistry::GetInstance();
+    registry.RegisterPluginValidator(
+        UsdValidatorNameTokens->compositionErrorTest, stageTaskFn);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/usd/crateData.cpp b/pxr/usd/usd/crateData.cpp
index 00fb643b87..b05b547d22 100644
--- a/pxr/usd/usd/crateData.cpp
+++ b/pxr/usd/usd/crateData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/crateData.h"
@@ -801,7 +784,7 @@ class Usd_CrateDataImpl
                 liveFieldSets[FieldSetIndex(fsBegin-fieldSets.begin())];
                     
             dispatcher.Run(
-                [this, fsBegin, fsEnd, &fields, &fieldValuePairs]() mutable {
+                [this, fsBegin, fsEnd, &fields, &fieldValuePairs]()  {
                     try{
                         // XXX Won't need first two tags when bug #132031 is
                         // addressed
@@ -809,8 +792,8 @@ class Usd_CrateDataImpl
                             "Usd", "Usd_CrateDataImpl::Open", "field data");
                         auto &pairs = fieldValuePairs.GetMutable();
                         pairs.resize(fsEnd-fsBegin);
-                        for (size_t i = 0; fsBegin != fsEnd; ++fsBegin, ++i) {
-                            auto const &field = fields[fsBegin->value];
+                        for (size_t i = 0; i < size_t(std::distance(fsBegin,fsEnd)); ++i) {
+                            auto const &field = fields[fsBegin[i].value];
                             pairs[i].first = 
                                 _crateFile->GetToken(field.tokenIndex);
                             pairs[i].second = _UnpackForField(field.valueRep);
diff --git a/pxr/usd/usd/crateData.h b/pxr/usd/usd/crateData.h
index c86c2cdd93..1c86bf4158 100644
--- a/pxr/usd/usd/crateData.h
+++ b/pxr/usd/usd/crateData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_CRATE_DATA_H
 #define PXR_USD_USD_CRATE_DATA_H
diff --git a/pxr/usd/usd/crateDataTypes.h b/pxr/usd/usd/crateDataTypes.h
index ab22cf26cb..343db777a2 100644
--- a/pxr/usd/usd/crateDataTypes.h
+++ b/pxr/usd/usd/crateDataTypes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // Note that changing any of the enum value numbers will break backward
 // compatibility.  Adding additional types will not.
diff --git a/pxr/usd/usd/crateFile.cpp b/pxr/usd/usd/crateFile.cpp
index 5dfd9d4512..a66f654a5f 100644
--- a/pxr/usd/usd/crateFile.cpp
+++ b/pxr/usd/usd/crateFile.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -3647,13 +3630,14 @@ CrateFile::_ReadPathsImpl(Reader reader,
                 auto siblingOffset = reader.template Read<int64_t>();
                 dispatcher.Run(
                     [this, reader,
-                     siblingOffset, &dispatcher, parentPath]() mutable {
+                     siblingOffset, &dispatcher, parentPath]() {
                         // XXX Remove these tags when bug #132031 is addressed
                         TfAutoMallocTag tag(
                             "Usd", "Usd_CrateDataImpl::Open",
                             "Usd_CrateFile::CrateFile::Open", "_ReadPaths");
-                        reader.Seek(siblingOffset);
-                        _ReadPathsImpl<Header>(reader, dispatcher, parentPath);
+                        auto readerCopy = reader;
+                        readerCopy.Seek(siblingOffset);
+                        _ReadPathsImpl<Header>(readerCopy, dispatcher, parentPath);
                     });
             }
             // Have a child (may have also had a sibling). Reset parent path.
@@ -3783,7 +3767,7 @@ CrateFile::_BuildDecompressedPathsImpl(
 #endif
                 dispatcher.Run(
                     [this, &pathIndexes, &elementTokenIndexes, &jumps,
-                     siblingIndex, &dispatcher, parentPath]() mutable {
+                     siblingIndex, &dispatcher, parentPath]()  {
                         // XXX Remove these tags when bug #132031 is addressed
                         TfAutoMallocTag tag(
                             "Usd", "Usd_CrateDataImpl::Open",
diff --git a/pxr/usd/usd/crateFile.h b/pxr/usd/usd/crateFile.h
index 84dca91cd6..81cad78029 100644
--- a/pxr/usd/usd/crateFile.h
+++ b/pxr/usd/usd/crateFile.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_CRATE_FILE_H
 #define PXR_USD_USD_CRATE_FILE_H
@@ -348,12 +331,15 @@ class CrateFile
                 bool operator!=(ZeroCopySource const &other) const {
                     return !(*this == other);
                 }
-                friend size_t tbb_hasher(ZeroCopySource const &z) {
-                    return TfHash::Combine(
-                        reinterpret_cast<uintptr_t>(z._addr),
-                        z._numBytes
-                    );
-                }
+
+                struct Hash {
+                    inline size_t operator()(const ZeroCopySource& z) const {
+                        return TfHash::Combine(
+                            reinterpret_cast<uintptr_t>(z._addr),
+                            z._numBytes
+                        );
+                    }
+                };
                 
                 // Return true if the refcount is nonzero.
                 bool IsInUse() const { return _refCount; }
@@ -421,7 +407,8 @@ class CrateFile
             ArchConstFileMapping _mapping;
             char const *_start;
             int64_t _length;
-            tbb::concurrent_unordered_set<ZeroCopySource> _outstandingRanges;
+            tbb::concurrent_unordered_set<ZeroCopySource,
+                ZeroCopySource::Hash> _outstandingRanges;
         };
 
     public:
diff --git a/pxr/usd/usd/crateInfo.cpp b/pxr/usd/usd/crateInfo.cpp
index e5cfee75a2..e3b22c2311 100644
--- a/pxr/usd/usd/crateInfo.cpp
+++ b/pxr/usd/usd/crateInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/crateInfo.h"
diff --git a/pxr/usd/usd/crateInfo.h b/pxr/usd/usd/crateInfo.h
index d58e7aa6f9..3be43d24a7 100644
--- a/pxr/usd/usd/crateInfo.h
+++ b/pxr/usd/usd/crateInfo.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_CRATE_INFO_H
 #define PXR_USD_USD_CRATE_INFO_H
diff --git a/pxr/usd/usd/crateValueInliners.h b/pxr/usd/usd/crateValueInliners.h
index a5a96ae934..8b8fb7df44 100644
--- a/pxr/usd/usd/crateValueInliners.h
+++ b/pxr/usd/usd/crateValueInliners.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_CRATE_VALUE_INLINERS_H
 #define PXR_USD_USD_CRATE_VALUE_INLINERS_H
diff --git a/pxr/usd/usd/debugCodes.cpp b/pxr/usd/usd/debugCodes.cpp
index 3421c98703..30e6119a0c 100644
--- a/pxr/usd/usd/debugCodes.cpp
+++ b/pxr/usd/usd/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/debugCodes.h"
@@ -40,10 +23,6 @@ TF_REGISTRY_FUNCTION(TfDebug)
         "USD clip details");
     TF_DEBUG_ENVIRONMENT_SYMBOL(USD_COMPOSITION, 
         "USD composition details");
-    TF_DEBUG_ENVIRONMENT_SYMBOL(USD_DATA_BD, 
-        "USD BD file format traces");
-    TF_DEBUG_ENVIRONMENT_SYMBOL(USD_DATA_BD_TRY, 
-        "USD BD call traces. Prints names, errors and results.");
     TF_DEBUG_ENVIRONMENT_SYMBOL(USD_INSTANCING, 
         "USD instancing diagnostics");
     TF_DEBUG_ENVIRONMENT_SYMBOL(USD_PATH_RESOLUTION, 
diff --git a/pxr/usd/usd/debugCodes.h b/pxr/usd/usd/debugCodes.h
index 9eb970cfcb..4c7aa43b36 100644
--- a/pxr/usd/usd/debugCodes.h
+++ b/pxr/usd/usd/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_DEBUG_CODES_H
 #define PXR_USD_USD_DEBUG_CODES_H
@@ -35,8 +18,6 @@ TF_DEBUG_CODES(
     USD_CHANGES,
     USD_CLIPS,
     USD_COMPOSITION,
-    USD_DATA_BD,
-    USD_DATA_BD_TRY,
     USD_INSTANCING,
     USD_PATH_RESOLUTION,
     USD_PAYLOADS,
diff --git a/pxr/usd/usd/editContext.cpp b/pxr/usd/usd/editContext.cpp
index c1d7e7a7a4..fa19c15fc9 100644
--- a/pxr/usd/usd/editContext.cpp
+++ b/pxr/usd/usd/editContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/editContext.h"
diff --git a/pxr/usd/usd/editContext.h b/pxr/usd/usd/editContext.h
index 47803d3385..de09d1b4f7 100644
--- a/pxr/usd/usd/editContext.h
+++ b/pxr/usd/usd/editContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_EDIT_CONTEXT_H
 #define PXR_USD_USD_EDIT_CONTEXT_H
diff --git a/pxr/usd/usd/editTarget.cpp b/pxr/usd/usd/editTarget.cpp
index dbae28f8c4..a1f677b8ab 100644
--- a/pxr/usd/usd/editTarget.cpp
+++ b/pxr/usd/usd/editTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/editTarget.h"
diff --git a/pxr/usd/usd/editTarget.h b/pxr/usd/usd/editTarget.h
index f6a8ccbf50..1e4f8eb45f 100644
--- a/pxr/usd/usd/editTarget.h
+++ b/pxr/usd/usd/editTarget.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_EDIT_TARGET_H
 #define PXR_USD_USD_EDIT_TARGET_H
diff --git a/pxr/usd/usd/errors.cpp b/pxr/usd/usd/errors.cpp
index cdb462d5e8..6036c8cc5b 100644
--- a/pxr/usd/usd/errors.cpp
+++ b/pxr/usd/usd/errors.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/errors.h b/pxr/usd/usd/errors.h
index 33fe0d83b1..9ab756ef7e 100644
--- a/pxr/usd/usd/errors.h
+++ b/pxr/usd/usd/errors.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_ERRORS_H
 #define PXR_USD_USD_ERRORS_H
diff --git a/pxr/usd/usd/examples_usd.cpp b/pxr/usd/usd/examples_usd.cpp
index 86c755ea4b..aceae0fb82 100644
--- a/pxr/usd/usd/examples_usd.cpp
+++ b/pxr/usd/usd/examples_usd.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/collectionAPI.h"
diff --git a/pxr/usd/usd/flattenUtils.cpp b/pxr/usd/usd/flattenUtils.cpp
index 7c2ea098dc..c0025bc174 100644
--- a/pxr/usd/usd/flattenUtils.cpp
+++ b/pxr/usd/usd/flattenUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/flattenUtils.h"
diff --git a/pxr/usd/usd/flattenUtils.h b/pxr/usd/usd/flattenUtils.h
index 75bf434181..64fbc99af2 100644
--- a/pxr/usd/usd/flattenUtils.h
+++ b/pxr/usd/usd/flattenUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_FLATTEN_UTILS_H
 #define PXR_USD_USD_FLATTEN_UTILS_H
diff --git a/pxr/usd/usd/generatedSchema.usda b/pxr/usd/usd/generatedSchema.usda
index 3ed639f02b..f3e0510255 100644
--- a/pxr/usd/usd/generatedSchema.usda
+++ b/pxr/usd/usd/generatedSchema.usda
@@ -52,8 +52,7 @@ class "APISchemaBase" (
     explicit bool conversion operator. Examples of applied API schemas include
     UsdCollectionAPI, UsdGeomModelAPI and UsdGeomMotionAPI
 
-    \\anchor UsdAPISchemaBase_SingleVsMultipleApply
-    \\name Single vs. Multiple Apply API Schemas
+    \\subsection usd_apischemabase_single_vs_multiple_apply Single vs. Multiple Apply API Schemas
     
     Applied API schemas can further be classified into single-apply and 
     multiple-apply API schemas. As the name suggests, a single-apply API schema 
@@ -103,95 +102,137 @@ class "ModelAPI" (
 }
 
 class "CollectionAPI" (
-    doc = """ This is a general purpose API schema, used to describe a 
-    collection of heterogeneous objects within the scene. \"Objects\" here may be 
-    prims or properties belonging to prims or other collections. It's an add-on 
-    schema that can be applied many times to a prim with different collection 
-    names. 
+    doc = """A general purpose API schema used to describe a collection of prims
+    and properties within a scene. This API schema can be applied to a prim
+    multiple times with different instance names to define several collections
+    on a single prim.
 
-    A collection allows an enumeration of a set of paths to include and a 
-    set of paths to exclude.  Whether the descendants of an included
-    path are members of a collection are decided by its expansion rule
-    (see below).  If the collection excludes paths that are not descendents
-    of included paths, the collection implicitly includes the root path
-    &lt;/&gt;.  If such a collection also includes paths that are not
-    descendants of the excluded paths, it is considered invalid, since
-    the intention is ambiguous.
+    A collection's membership is specified one of two ways. The first way uses
+    the built-in relationships `includes` and `excludes`, and the attribute
+    `includeRoot` to determine membership. The second way is termed a
+    pattern-based collection, and uses the built-in attribute
+    `membershipExpression` to determine membership. Here we will refer to
+    collections using `includes`, `excludes` and `includeRoot` as being in
+    *relationship-mode* and those using the `membershipExpression` as being in
+    *expression-mode*.
 
-    All the properties authored by the schema are namespaced under
-    \"collection:\". The given name of the collection provides additional 
-    namespacing for the various per-collection properties, which include the 
-    following:
+    A collection is determined to be in *relationship-mode* when either or both
+    of its `includes` and `excludes` relationships have valid targets, or the
+    `includeRoot` attribute is set `true`.  In this case, the pattern-based
+    `membershipExpression` attribute is ignored.  Otherwise, the collection is
+    in *expression-mode* and the `membershipExpression` attribute applies.
 
-    <ul><li><b>uniform token collection:<i>collectionName</i>:expansionRule</b> - 
-    specified how the paths that are included in the collection must be expanded 
-    to determine its members. Possible values include:
+    In *relationship-mode* the `includes` and `excludes` relationships specify
+    the collection members as a set of paths to include and a set of paths to
+    exclude.  Whether or not the descendants of an included path belong to a
+    collection is decided by its expansion rule (see below).  If the collection
+    excludes paths that are not descendent to included paths, the collection
+    implicitly includes the root path `</>`.  If such a collection also
+    includes paths that are not descendent to the excluded paths, it is
+    considered invalid since the intent is ambiguous.
+
+    In *expression-mode*, the pattern-based `membershipExpression` attribute is
+    used with the `expansionRule` attribute to determine collection membership.
+    See the detailed descriptions of the built-in properties below for more
+    details.
+
+    Collection API Properties
+
+    The built-in properties for this schema are in the `collection:instanceName`
+    namespace, where `instanceName` is the user-provided applied API schema
+    instance name.
+
+    <ul>
+    <li>`uniform token collection:instanceName:expansionRule` - in
+    *relationship-mode*, specifies how to expand the `includes` and `excludes`
+    relationship targets to determine the collection's members.  In
+    *expression-mode*, specifies how matching scene objects against the
+    `membershipExpression` proceeds.  Possible values include:
         <ul>
-        <li><b>explicitOnly</b> - only paths in the includes rel targets and not 
-        in the excludes rel targets belong to the collection.
+        <li>`expandPrims` - in *relationship-mode*, all the prims descendent
+        to the `includes` relationship targets (and not descendent to `excludes`
+        relationship targets) belong to the collection.  Any `includes`-targeted
+        property paths also belong to the collection. This is the default
+        behavior. In *expression-mode*, the functions
+        UsdComputeIncludedObjectsFromCollection() and
+        UsdComputeIncludedPathsFromCollection() only test prims against the
+        `membershipExpression` to determine membership.
         </li>
-        <li><b>expandPrims</b> - all the prims at or below the includes rel-
-        targets (and not under the excludes rel-targets) belong to the 
-        collection.  Any property paths included in the collection would, of 
-        course, also be honored. This is the default behavior as it satisfies 
-        most use cases.
+        <li>`expandPrimsAndProperties` - like `expandPrims`, but in
+        *relationship-mode*, all properties on all included prims also belong to
+        the collection. In *expression-mode*, the functions
+        UsdComputeIncludedObjectsFromCollection() and
+        UsdComputeIncludedPathsFromCollection() test both prims and
+        properties against the `membershipExpression` to determine membership.
         </li>
-        <li><b>expandPrimsAndProperties</b> - like expandPrims, but also 
-        includes all properties on all matched prims.  We're still not quite 
-        sure what the use cases are for this, but you can use it to capture a 
-        whole lot of UsdObjects very concisely.
+        <li>`explicitOnly` - in *relationship-mode*, only paths in the
+        `includes` relationship targets and not those in the `excludes`
+        relationship targets belong to the collection. Does not apply to
+        *expression-mode*. If set in *expression-mode*, the functions
+        UsdComputeIncludedObjectsFromCollection() and
+        UsdComputeIncludedPathsFromCollection() return no results.
         </li>
         </ul>
-    </li>
-    <li><b>bool collection:<i>collectionName</i>:includeRoot</b> - boolean
-    attribute indicating whether the pseudo-root path &lt;/&gt; should
-    be counted as one of the included target paths.  The fallback is false.
-    This separate attribute is required because relationships cannot
-    directly target the root.  When expansionRule is explicitOnly, this
-    attribute is ignored.
-    <li><b>rel collection:<i>collectionName</i>:includes</b> - specifies a list 
-    of targets that are included in the collection. This can target prims or 
-    properties directly. A collection can insert the rules of another
-    collection by making its <i>includes</i> relationship target the
-    <b>collection:{collectionName}</b> property on the owning prim of the
-    collection to be included (see UsdCollectionAPI::GetCollectionAttr).
-    It is important to note that including another collection does not
-    guarantee the contents of that collection will be in the final collection;
-    instead, the rules are merged.  This means, for example, an exclude
-    entry may exclude a portion of the included collection.
-    When a collection includes one or more collections, the order in which 
-    targets are added to the includes relationship may become significant, if 
-    there are conflicting opinions about the same path. Targets that are added 
-    later are considered to be stronger than earlier targets for the same path.
-    </li>
-    <li><b>rel collection:<i>collectionName</i>:excludes</b> - specifies a list 
-    of targets that are excluded below the <b>included</b> paths in this 
-    collection. This can target prims or properties directly, but <b>cannot
-    target another collection</b>. This is to keep the membership determining 
-    logic simple, efficient and easier to reason about. Finally, it is invalid 
-    for a collection to exclude paths that are not included in it. The presence
-    of such \"orphaned\" excluded paths will not affect the set of paths included 
-    in the collection, but may affect the performance of querying membership of 
-    a path in the collection (see UsdCollectionAPI::MembershipQuery::IsPathIncluded) 
-    or of enumerating the objects belonging to the collection (see 
-    UsdCollectionAPI::GetIncludedObjects).
-    </li>
-    <li><b>uniform opaque collection:<i>collectionName</i></b> - opaque 
+        </li>
+
+    <li>`bool collection:instanceName:includeRoot` - boolean attribute
+    indicating whether the pseudo-root path `</>` should be counted as one
+    of the included target paths in *relationship-mode*. This separate attribute
+    is required because relationships cannot directly target the root. When
+    `expansionRule` is `explicitOnly`, this attribute is ignored. The fallback
+    value is false. When set to `true`, this collection is in
+    *relationship-mode*. This attribute is ignored in *expression-mode*.  </li>
+
+    <li>`rel collection:instanceName:includes` - in *relationship-mode*,
+    specifies a list of targets that are included in the collection. This can
+    target prims or properties directly. A collection can insert the rules of
+    another collection by making its `includes` relationship target the
+    `collection:otherInstanceName` property from the collection to be included
+    (see UsdCollectionAPI::GetCollectionAttr).  Note that including another
+    collection does not guarantee the contents of that collection will be in the
+    final collection; instead, the rules are merged.  This means, for example,
+    an exclude entry may exclude a portion of the included collection.  When a
+    collection includes one or more collections, the order in which targets are
+    added to the includes relationship may become significant, if there are
+    conflicting opinions about the same path. Targets that are added later are
+    considered to be stronger than earlier targets for the same path.  This
+    relationship is ignored in *expression-mode*.</li>
+
+    <li>`rel collection:instanceName:excludes` - in *relationship-mode*,
+    specifies a list of targets that are excluded below the <b>included</b>
+    paths in this collection. This can target prims or properties directly, but
+    <b>cannot target another collection</b>. This is to keep the membership
+    determining logic simple, efficient and easier to reason about. Finally, it
+    is invalid for a collection to exclude paths that are not included in
+    it. The presence of such \"orphaned\" excluded paths will not affect the set
+    of paths included in the collection, but may affect the performance of
+    querying membership of a path in the collection (see
+    UsdCollectionMembershipQuery::IsPathIncluded) or of enumerating the
+    objects belonging to the collection (see
+    UsdCollectionAPI::ComputeIncludedObjects).  This relationship is ignored in
+    *expression-mode*.</li>
+
+    <li>`uniform opaque collection:instanceName` - opaque
     attribute (meaning it can never have a value) that represents the collection
-    for the purpose of allowing another collection to include it. When this
-    property is targeted by another collection's <i>includes</i> relationship,
-    the rules of this collection will be inserted into the rules of the collection
-    that includes it.
-    </li></ul>
+    for the purpose of allowing another collection to include it in
+    *relationship-mode*. When this property is targeted by another collection's
+    `includes` relationship, the rules of this collection will be inserted
+    into the rules of the collection that includes it.</li>
+
+    <li>`uniform pathExpression collection:instanceName:membershipExpression` -
+    in *expression-mode*, defines the SdfPathExpression used to test
+    objects for collection membership.</li>
+
+    </ul>
 
-    <b>Implicit inclusion</b>
+    \\subsection usd_collectionapi_implicit_inclusion Implicit Inclusion
 
     In some scenarios it is useful to express a collection that includes
-    everything except certain paths.  To support this, a collection
-    that has an exclude that is not a descendent of any include
-    will include the root path &lt;/&gt;.
+    everything except certain paths.  To support this, a *relationship-mode*
+    collection that has an exclude that is not descendent to any include will
+    include the root path `</>`.
 
-    <b>Creating collections in C++</b>
+    Creating Collections in C++
     
     \\snippet examples_usd.cpp ApplyCollections
     """
@@ -226,7 +267,7 @@ class "CollectionAPI" (
     )
     uniform bool collection:__INSTANCE_NAME__:includeRoot (
         doc = """Boolean attribute indicating whether the pseudo-root
-        path &lt;/&gt; should be counted as one of the included target
+        path `</>` should be counted as one of the included target
         paths.  The fallback is false.  This separate attribute is
         required because relationships cannot directly target the root."""
     )
diff --git a/pxr/usd/usd/inherits.cpp b/pxr/usd/usd/inherits.cpp
index 62f56fa863..e4496d24e8 100644
--- a/pxr/usd/usd/inherits.cpp
+++ b/pxr/usd/usd/inherits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/common.h"
diff --git a/pxr/usd/usd/inherits.h b/pxr/usd/usd/inherits.h
index e5b617e190..8f88090368 100644
--- a/pxr/usd/usd/inherits.h
+++ b/pxr/usd/usd/inherits.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_INHERITS_H
 #define PXR_USD_USD_INHERITS_H
diff --git a/pxr/usd/usd/instanceCache.cpp b/pxr/usd/usd/instanceCache.cpp
index cf4dbbd6ac..1d9b603440 100644
--- a/pxr/usd/usd/instanceCache.cpp
+++ b/pxr/usd/usd/instanceCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/instanceCache.h"
diff --git a/pxr/usd/usd/instanceCache.h b/pxr/usd/usd/instanceCache.h
index 4b7c948de2..3f32e74c0c 100644
--- a/pxr/usd/usd/instanceCache.h
+++ b/pxr/usd/usd/instanceCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_INSTANCE_CACHE_H
 #define PXR_USD_USD_INSTANCE_CACHE_H
diff --git a/pxr/usd/usd/instanceKey.cpp b/pxr/usd/usd/instanceKey.cpp
index 51a045a8b8..1ffdc3e8ae 100644
--- a/pxr/usd/usd/instanceKey.cpp
+++ b/pxr/usd/usd/instanceKey.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/instanceKey.h"
diff --git a/pxr/usd/usd/instanceKey.h b/pxr/usd/usd/instanceKey.h
index 8887717c30..a79802702b 100644
--- a/pxr/usd/usd/instanceKey.h
+++ b/pxr/usd/usd/instanceKey.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_INSTANCE_KEY_H
 #define PXR_USD_USD_INSTANCE_KEY_H
diff --git a/pxr/usd/usd/integerCoding.cpp b/pxr/usd/usd/integerCoding.cpp
index 28716aac76..95d8304d0d 100644
--- a/pxr/usd/usd/integerCoding.cpp
+++ b/pxr/usd/usd/integerCoding.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/diagnostic.h"
diff --git a/pxr/usd/usd/integerCoding.h b/pxr/usd/usd/integerCoding.h
index 9da1554862..2e04af3150 100644
--- a/pxr/usd/usd/integerCoding.h
+++ b/pxr/usd/usd/integerCoding.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_INTEGER_CODING_H
 #define PXR_USD_USD_INTEGER_CODING_H
diff --git a/pxr/usd/usd/interpolation.cpp b/pxr/usd/usd/interpolation.cpp
index 6272b5cfc6..96dbea51bf 100644
--- a/pxr/usd/usd/interpolation.cpp
+++ b/pxr/usd/usd/interpolation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/interpolation.h"
diff --git a/pxr/usd/usd/interpolation.h b/pxr/usd/usd/interpolation.h
index 8f4c507c75..412dc8923d 100644
--- a/pxr/usd/usd/interpolation.h
+++ b/pxr/usd/usd/interpolation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_INTERPOLATION_H
 #define PXR_USD_USD_INTERPOLATION_H
diff --git a/pxr/usd/usd/interpolators.cpp b/pxr/usd/usd/interpolators.cpp
index 5e8e0f5ee2..774f5c84e5 100644
--- a/pxr/usd/usd/interpolators.cpp
+++ b/pxr/usd/usd/interpolators.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/interpolators.h"
diff --git a/pxr/usd/usd/interpolators.h b/pxr/usd/usd/interpolators.h
index 41e7c80c63..6cdb15f350 100644
--- a/pxr/usd/usd/interpolators.h
+++ b/pxr/usd/usd/interpolators.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_INTERPOLATORS_H
 #define PXR_USD_USD_INTERPOLATORS_H
diff --git a/pxr/usd/usd/listEditImpl.h b/pxr/usd/usd/listEditImpl.h
index 4f3e1ec455..eead67cafc 100644
--- a/pxr/usd/usd/listEditImpl.h
+++ b/pxr/usd/usd/listEditImpl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_LIST_EDIT_IMPL_H
 #define PXR_USD_USD_LIST_EDIT_IMPL_H
diff --git a/pxr/usd/usd/modelAPI.cpp b/pxr/usd/usd/modelAPI.cpp
index ad6470342e..da03dd125b 100644
--- a/pxr/usd/usd/modelAPI.cpp
+++ b/pxr/usd/usd/modelAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/modelAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/modelAPI.h b/pxr/usd/usd/modelAPI.h
index a71e643dae..3b87d5aa8e 100644
--- a/pxr/usd/usd/modelAPI.h
+++ b/pxr/usd/usd/modelAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USD_GENERATED_MODELAPI_H
 #define USD_GENERATED_MODELAPI_H
diff --git a/pxr/usd/usd/module.cpp b/pxr/usd/usd/module.cpp
index b7586cec11..b984549688 100644
--- a/pxr/usd/usd/module.cpp
+++ b/pxr/usd/usd/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usd/moduleDeps.cpp b/pxr/usd/usd/moduleDeps.cpp
index 7b33cd54ba..1a3632da7a 100644
--- a/pxr/usd/usd/moduleDeps.cpp
+++ b/pxr/usd/usd/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usd/namespaceEditor.cpp b/pxr/usd/usd/namespaceEditor.cpp
index 5438021a2b..ff2187a4df 100644
--- a/pxr/usd/usd/namespaceEditor.cpp
+++ b/pxr/usd/usd/namespaceEditor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/namespaceEditor.h"
@@ -295,6 +278,22 @@ UsdNamespaceEditor::UsdNamespaceEditor(const UsdStageRefPtr &stage)
 {    
 }
 
+UsdNamespaceEditor::UsdNamespaceEditor(
+    const UsdStageRefPtr &stage, 
+    EditOptions &&editOptions) 
+    : _stage(stage)
+    , _editOptions(std::move(editOptions))
+{    
+}
+
+UsdNamespaceEditor::UsdNamespaceEditor(
+    const UsdStageRefPtr &stage, 
+    const EditOptions &editOptions)
+    : _stage(stage)
+    , _editOptions(editOptions)
+{
+}
+
 bool 
 UsdNamespaceEditor::DeletePrimAtPath(
     const SdfPath &path)
@@ -561,31 +560,35 @@ class UsdNamespaceEditor::_EditProcessor {
     // Creates a processed edit from an edit description.
     static UsdNamespaceEditor::_ProcessedEdit ProcessEdit(
         const UsdStageRefPtr &stage,
-        const UsdNamespaceEditor::_EditDescription &editDesc);
+        const UsdNamespaceEditor::_EditDescription &editDesc,
+        const UsdNamespaceEditor::EditOptions &editOptions);
 
 private:
-    static void _ProcessPrimEditRequiresRelocates(
-        const _EditDescription &editDesc,
-        const PcpPrimIndex &primIndex,
-        const PcpNodeRef &nodeForEditTarget,
+    _EditProcessor(
+        const UsdStageRefPtr &stage,
+        const UsdNamespaceEditor::_EditDescription &editDesc,
+        const UsdNamespaceEditor::EditOptions &editOptions,
         _ProcessedEdit *processedEdit);
 
-    static void _ProcessPropEditRequiresRelocates(
-        const _EditDescription &editDesc,
-        const PcpPrimIndex &primIndex,
-        const PcpNodeRef &nodeForEditTarget,
-        _ProcessedEdit *processedEdit);
+    bool _ProcessNewPath();
 
-    static void _GatherLayersToEdit(
-        const _EditDescription &editDesc,
-        const UsdEditTarget &editTarget,
-        const PcpPrimIndex &primIndex,
-        _ProcessedEdit *processedEdit);
+    void _ProcessPrimEditRequiresRelocates(
+        const PcpPrimIndex &primIndex);
 
-    static void _GatherTargetListOpEdits(
-        const UsdStageRefPtr &stage,
-        const _EditDescription &editDesc,
-        _ProcessedEdit *processedEdit);
+    void _ProcessPropEditRequiresRelocates(
+        const PcpPrimIndex &primIndex);
+
+    void _GatherLayersToEdit();
+
+    void _GatherTargetListOpEdits();
+    
+    const UsdStageRefPtr & _stage;
+    const UsdNamespaceEditor::_EditDescription & _editDesc;
+    const UsdEditTarget &_editTarget;
+    const UsdNamespaceEditor::EditOptions & _editOptions;
+    _ProcessedEdit *_processedEdit;
+
+    PcpNodeRef _nodeForEditTarget;
 };
 
 void 
@@ -598,7 +601,7 @@ UsdNamespaceEditor::_ProcessEditsIfNeeded() const
         return;
     }
     _processedEdit = UsdNamespaceEditor::_EditProcessor::ProcessEdit(
-        _stage, _editDescription);
+        _stage, _editDescription, _editOptions);
 }
 
 static 
@@ -744,153 +747,242 @@ _IsValidNewParentPath(
 UsdNamespaceEditor::_ProcessedEdit 
 UsdNamespaceEditor::_EditProcessor::ProcessEdit(
     const UsdStageRefPtr &stage,
-    const _EditDescription &editDesc)
+    const _EditDescription &editDesc,
+    const EditOptions &editOptions)
 {
     _ProcessedEdit processedEdit;
+    _EditProcessor(stage, editDesc, editOptions, &processedEdit);
+    return processedEdit;
+}
 
+UsdNamespaceEditor::_EditProcessor::_EditProcessor(
+    const UsdStageRefPtr &stage,
+    const UsdNamespaceEditor::_EditDescription &editDesc,
+    const UsdNamespaceEditor::EditOptions &editOptions,
+    _ProcessedEdit *processedEdit)
+    : _stage(stage)
+    , _editDesc(editDesc)
+    , _editTarget(stage->GetEditTarget())
+    , _editOptions(editOptions)
+    , _processedEdit(processedEdit)
+{
     if (editDesc.editType == _EditType::Invalid) {
-        processedEdit.errors.push_back("There are no valid edits to perform");
-        return processedEdit;
+        _processedEdit->errors.push_back("There are no valid edits to perform");
+        return;
     }
 
     // Add the edit to the processed SdfBatchNamespaceEdit. We use the index of
     // "Same" specifically so renames don't move the object (it has no effect
     // for any edits other than rename)
-    processedEdit.edits.Add(
+    _processedEdit->edits.Add(
         editDesc.oldPath, editDesc.newPath, SdfNamespaceEdit::Same);
 
     // Validate whether the stage has the prim or property at the original path
     // that can be namespace edited.
-    const UsdPrim prim = stage->GetPrimAtPath(editDesc.oldPath.GetPrimPath());
+    const UsdPrim prim = stage->GetPrimAtPath(_editDesc.oldPath.GetPrimPath());
     std::string error;
     if (editDesc.IsPropertyEdit()) {
-        if (!_IsValidPropertyToEdit(prim, editDesc.oldPath.GetNameToken(), &error)) {
-            processedEdit.errors.push_back(std::move(error));
-            return processedEdit;
+        if (!_IsValidPropertyToEdit(prim, _editDesc.oldPath.GetNameToken(), &error)) {
+            _processedEdit->errors.push_back(std::move(error));
+            return;
         }
     } else if (!_IsValidPrimToEdit(prim, &error)) {
-        processedEdit.errors.push_back(std::move(error));
-        return processedEdit;
+        _processedEdit->errors.push_back(std::move(error));
+        return;
+    }
+
+    const PcpPrimIndex &primIndex = prim.GetPrimIndex();
+    // XXX: To start, we're only going to perform namespace edit operations 
+    // using the root layer stack. This will be updated to support edit targets
+    // as a later task.
+    _nodeForEditTarget = primIndex.GetRootNode();
+
+    if (!_ProcessNewPath()) {
+        return;
+    }
+
+    if (_editDesc.IsPropertyEdit()) {
+        // Determine if editing the path would require relocates.
+        _ProcessPropEditRequiresRelocates(primIndex);
+    } else {
+        // Determine if editing the path would require relocates.
+        _ProcessPrimEditRequiresRelocates(primIndex);
+    }
+
+    // Gather all layers with contributing specs to the old path that will need
+    // to be edited when the edits are applied.
+    _GatherLayersToEdit();
+
+    // Gather all the edits that need to be made to target path listOps in 
+    // property specs in order to "fix up" properties that have connections or 
+    // relationship targets targeting the namespace edited object.
+    _GatherTargetListOpEdits();
+}
+
+bool
+UsdNamespaceEditor::_EditProcessor::_ProcessNewPath()
+{
+    // Empty path is a delete so the new path is automatically valid.
+    if (_editDesc.newPath.IsEmpty()) {
+        return true;
     }
 
     // For move edits we'll have a new path; verify that the stage doesn't 
     // already have an object at that path.
-    if (!editDesc.newPath.IsEmpty() && 
-            stage->GetObjectAtPath(editDesc.newPath)) {
-        processedEdit.errors.push_back("An object already exists at the new path");
-        return processedEdit;
+    if (_stage->GetObjectAtPath(_editDesc.newPath)) {
+        _processedEdit->errors.push_back(
+            "An object already exists at the new path");
+        return false;
     }
 
     // For reparenting we have additional behaviors and validation to perform.
-    if (editDesc.editType == _EditType::Reparent) {
+    if (_editDesc.editType == _EditType::Reparent) {
         // For each layer we edit, we may need to create new overs for the new 
         // parent path and delete inert ancestor overs after moving a prim or 
         // property from its original parent, so add this info to the processed 
         // edit.
-        processedEdit.createParentSpecIfNeededPath = 
-            editDesc.newPath.GetParentPath();
-        processedEdit.removeInertAncestorOvers = true;
+        _processedEdit->createParentSpecIfNeededPath = 
+            _editDesc.newPath.GetParentPath();
+        _processedEdit->removeInertAncestorOvers = true;
 
         // Validate that the stage does have a prim at the new parent path to 
         // reparent to.
         std::string whyNot;
-        if (!_IsValidNewParentPath(stage, editDesc.oldPath, 
-                processedEdit.createParentSpecIfNeededPath, &whyNot)) {
-            processedEdit.errors.push_back(std::move(whyNot));
-            return processedEdit;
+        if (!_IsValidNewParentPath(_stage, _editDesc.oldPath, 
+                _processedEdit->createParentSpecIfNeededPath, &whyNot)) {
+            _processedEdit->errors.push_back(std::move(whyNot));
+            return false;
         }
     }
 
-    // Gather all layers with contributing specs to the old path that will need
-    // to be edited when the edits are applied. This will also determine if the
-    // edit requires relocates.
-    _GatherLayersToEdit(
-        editDesc, 
-        stage->GetEditTarget(), 
-        prim.GetPrimIndex(), 
-        &processedEdit);
-
-    // At the point in which this function is called, the prim must exist on the
-    // stage. So if we didn't find any specs to edit, then we must've found 
-    // specs across a composition arc that requires relocates. Verifying this
-    // as a sanity check.
-    if (processedEdit.layersToEdit.empty()) {
-        TF_VERIFY(processedEdit.requiresRelocates);
-        return processedEdit;
+    // For property edits we're done at this point.
+    if (_editDesc.IsPropertyEdit()) {
+        return true;
     }
 
-    // Gather all the edits that need to be made to target path listOps in 
-    // property specs in order to "fix up" properties that have connections or 
-    // relationship targets targeting the namespace edited object.
-    _GatherTargetListOpEdits(stage, editDesc, &processedEdit);
+    // For prim moves, we need to check whether the new path is prohibited 
+    // because of relocates.
+    // The parent prim will be able to tell us if the child name that we're
+    // moving and/or renaming this to is prohibited.
+    UsdPrim newParentPrim = _stage->GetPrimAtPath(
+        _editDesc.newPath.GetParentPath());
+    if (!newParentPrim) {
+        TF_CODING_ERROR("Parent prim at path %s does not exist",
+            _editDesc.newPath.GetParentPath().GetText());
+        return false;
+    }
 
-    return processedEdit;
+    // XXX: We compute the prohibited children from the parent prim
+    // index. Given that the prohibited children are always composed
+    // with the actual child names, we could cache this when the 
+    // stage is populated and exposed the prohibited children in API on 
+    // UsdPrim. But for now we'll compose them as needed when processing
+    // namespace edits.
+    const PcpPrimIndex &newParentPrimIndex = newParentPrim.GetPrimIndex();
+    TfTokenVector childNames;
+    PcpTokenSet prohibitedChildren;
+    newParentPrimIndex.ComputePrimChildNames(
+        &childNames, &prohibitedChildren);
+
+    // If the parent does not prohibit a child with our name, we're good, 
+    // otherwise we can't move the prim to the new path.
+    if (prohibitedChildren.count(_editDesc.newPath.GetNameToken()) == 0) {
+        return true;
+    }
+
+    // But there is one exception! If this layer stack has a relocation from the
+    // new path to the old path, then we are allowed to move the prim back to
+    // its original location by removing the relocation.
+    const SdfRelocatesMap &localRelocates =
+        _nodeForEditTarget.GetLayerStack()->GetIncrementalRelocatesSourceToTarget();
+    const auto foundIt = localRelocates.find(_editDesc.newPath);
+    if (foundIt != localRelocates.end() && foundIt->second == _editDesc.oldPath) {
+        return true;
+    }
+
+    _processedEdit->errors.push_back("The new path is a prohibited child of "
+        "its parent path because of existing relocates.");
+    return false;
 }
 
-/*static*/
 void 
 UsdNamespaceEditor::_EditProcessor::_ProcessPrimEditRequiresRelocates(
-    const _EditDescription &editDesc,
-    const PcpPrimIndex &primIndex,
-    const PcpNodeRef &nodeForEditTarget,
-    _ProcessedEdit *processedEdit)
+    const PcpPrimIndex &primIndex)
 {
-    // Check to see if there are any contributing specs that would require 
-    // relocates. These are specs that would continue to be mapped to the 
-    // same path across the edit target's node even after all specs are edited
-    // in its layer stack.
-    const auto range = nodeForEditTarget.GetChildrenRange();
-    for (const auto &child : range) {
-        // If a child node is a direct arc, we can skip it and its entire 
-        // subtree as all the specs at or below this node are mapped to the 
-        // prim path (whatever it may be) through this child node.
-        if (!child.IsDueToAncestor()) {
-            continue;
+    const bool requiresRelocatesAuthoring = [&](){
+        // First check: if the path that is being moved or deleted is already
+        // the target of a relocation in the local layer stack, then the 
+        // local layer relocates will need to be updated to perform the edit
+        // operation.
+        const SdfRelocatesMap &targetToSourceRelocates =
+            _nodeForEditTarget.GetLayerStack()
+                ->GetIncrementalRelocatesTargetToSource();
+        if (targetToSourceRelocates.count(_editDesc.oldPath)) {
+            return true;
         }
 
-        // Since the child node is an ancestral arc, the mapping of specs across
-        // the child node is not affected by the path of this prim itself and
-        // will continue to map to the original path after the edit. So if there
-        // are any specs in the child's subtree, then this edit will require
-        // relocates
-        PcpNodeRange subtreeRange = primIndex.GetNodeSubtreeRange(child);
-        for (const PcpNodeRef &subtreeNode : subtreeRange) {
-            // A node has contributing specs if it has specs and is not inert.
-            if (subtreeNode.HasSpecs() && !subtreeNode.IsInert()) {
-                processedEdit->requiresRelocates = true;
-
-                // Relocates support is not implemented yet so it's currently an
-                // error if the edit requires it..
-                if (editDesc.editType == _EditType::Delete) {
-                    // "Relocates" means deactivating the prim in the deletion 
-                    // case.
-                    processedEdit->errors.push_back("The prim to delete must "
-                        "be deactivated rather than deleted since it composes "
-                        "opinions introduced by ancestral composition arcs; "
-                        "deletion via deactivation is not yet supported");
-                } else {
-                    processedEdit->errors.push_back("The prim to move requires "
-                        "authoring relocates since it composes opinions "
-                        "introduced by ancestral composition arcs; authoring "
-                        "relocates is not yet supported");
+        // Check to see if there are any contributing specs that would require 
+        // relocates. These are specs that would continue to be mapped to the 
+        // same path across the edit target's node even after all specs are 
+        // edited in its layer stack.
+        const auto range = _nodeForEditTarget.GetChildrenRange();
+        for (const auto &child : range) {
+            // If a child node is a direct arc, we can skip it and its entire 
+            // subtree as all the specs at or below this node are mapped to the 
+            // prim path (whatever it may be) through this child node.
+            if (!child.IsDueToAncestor()) {
+                continue;
+            }
+
+            // Since the child node is an ancestral arc, the mapping of specs 
+            // across the child node is not affected by the path of this prim 
+            // itself and will continue to map to the original path after the
+            // edit. So if there are any specs in the child's subtree, then this
+            // edit will require relocates
+            PcpNodeRange subtreeRange = primIndex.GetNodeSubtreeRange(child);
+            for (const PcpNodeRef &subtreeNode : subtreeRange) {
+                // A node has contributing specs if it has specs and is not 
+                // inert.
+                if (subtreeNode.HasSpecs() && !subtreeNode.IsInert()) {
+                    return true;
                 }
-    
-                // Once we've determined the edits require relocates, we're done.
-                return;
             }
         }
+
+        return false;
+    }();
+
+    if (!requiresRelocatesAuthoring) {
+        return;
     }
+
+    // If relocates authoring is not allowed, log an error and return; we
+    // won't be able to apply this edit.
+    if (!_editOptions.allowRelocatesAuthoring) {
+        _processedEdit->errors.push_back("The prim to edit requires "
+            "authoring relocates since it composes opinions "
+            "introduced by ancestral composition arcs; relocates "
+            "authoring must be enabled to perform this edit");
+        return;
+    }
+
+    // Otherwise, use the relocates builder to get all the relocates metadata
+    // that needs to be authored in each layer to move old path to new path.
+    PcpLayerRelocatesEditBuilder builder(
+        _nodeForEditTarget.GetLayerStack(), _editTarget.GetLayer());
+    std::string error;
+    if (!builder.Relocate(_editDesc.oldPath, _editDesc.newPath, &error)) {
+        TF_CODING_ERROR("Cannot get relocates edits because: %s", 
+            error.c_str());                       
+    }
+    _processedEdit->relocatesEdits = builder.GetEdits();
 }
 
-/*static*/
 void 
 UsdNamespaceEditor::_EditProcessor::_ProcessPropEditRequiresRelocates(
-    const _EditDescription &editDesc,
-    const PcpPrimIndex &primIndex,
-    const PcpNodeRef &nodeForEditTarget,
-    _ProcessedEdit *processedEdit)
+    const PcpPrimIndex &primIndex)
 {
-    const TfToken &propName = editDesc.oldPath.GetNameToken();
+    const TfToken &propName = _editDesc.oldPath.GetNameToken();
 
     // Check to see if there are any contributing specs that would require 
     // relocates. These are specs that would continue to be mapped to the 
@@ -901,7 +993,8 @@ UsdNamespaceEditor::_EditProcessor::_ProcessPropEditRequiresRelocates(
     // properties since properties don't define composition arcs. So we look
     // for property specs in every node under the edit target node as those 
     // can't be namespace edited without relocates.
-    PcpNodeRange subtreeRange = primIndex.GetNodeSubtreeRange(nodeForEditTarget);
+    PcpNodeRange subtreeRange = 
+        primIndex.GetNodeSubtreeRange(_nodeForEditTarget);
 
     // Skip the node itself; we want to check its descendants.
     ++subtreeRange.first;
@@ -936,58 +1029,35 @@ UsdNamespaceEditor::_EditProcessor::_ProcessPropEditRequiresRelocates(
 
         // If we found a property spec, the edit requires relocates.
         if (hasPropertySpecs) {
-            processedEdit->requiresRelocates = true;
-
-            // Relocates support is not implemented yet so it's currently an 
+            // There is no plan to support relocates for properties so it's an 
             // error if the edit requires it.
-            if (editDesc.editType == _EditType::Delete) {
-                // "Relocates" means deactivating the property in the deletion 
-                // case.
-                processedEdit->errors.push_back("The property to delete must "
-                    "be deactivated rather than deleted since it composes "
-                    "opinions introduced by ancestral composition arcs; "
-                    "deletion via deactivation is not yet supported");
-            } else {
-                processedEdit->errors.push_back("The property to move requires "
-                    "authoring relocates since it composes opinions "
-                    "introduced by ancestral composition arcs; authoring "
-                    "relocates is not supported for properties");
-            }
-
-            // Once we've determined the edits require relocates, we're done.
+            _processedEdit->errors.push_back("The property to edit requires "
+                "authoring relocates since it composes opinions "
+                "introduced by ancestral composition arcs; authoring "
+                "relocates is not supported for properties");
             return;
         }
     }
 }
 
-/*static*/
 void 
-UsdNamespaceEditor::_EditProcessor::_GatherLayersToEdit(
-    const _EditDescription &editDesc,
-    const UsdEditTarget &editTarget,
-    const PcpPrimIndex &primIndex,
-    _ProcessedEdit *processedEdit)
+UsdNamespaceEditor::_EditProcessor::_GatherLayersToEdit()
 {
-    // XXX: To start, we're only going to perform namespace edit operations 
-    // using the root layer stack. This will be updated to support edit targets
-    // as a later task.
-    const PcpNodeRef nodeForEditTarget = primIndex.GetRootNode();
-    
     // Get all the layers in the layer stack where the edits will be performed.
     const SdfLayerRefPtrVector &layers = 
-        nodeForEditTarget.GetLayerStack()->GetLayers();
+        _nodeForEditTarget.GetLayerStack()->GetLayers();
 
     // Until we support edit targets, verify that the stage's current edit 
     // target maps to the prim's local opinions in the root layer stack.
-    if (!editTarget.GetMapFunction().IsIdentityPathMapping()) {
-        processedEdit->errors.push_back("Edit targets that map paths across "
+    if (!_editTarget.GetMapFunction().IsIdentityPathMapping()) {
+        _processedEdit->errors.push_back("Edit targets that map paths across "
             "composition arcs are not currently supported for namespace "
             "editing");
         return;
     }
-    if (std::find(layers.begin(), layers.end(), editTarget.GetLayer()) 
+    if (std::find(layers.begin(), layers.end(), _editTarget.GetLayer()) 
             == layers.end()) {
-        processedEdit->errors.push_back("Edit targets with layers outside of "
+        _processedEdit->errors.push_back("Edit targets with layers outside of "
             "the root layer stack are not currently supported for namespace "
             "editing");
         return;
@@ -996,54 +1066,42 @@ UsdNamespaceEditor::_EditProcessor::_GatherLayersToEdit(
     // Collect every prim spec that exists for this prim path in the layer 
     // stack's layers.
     for (const SdfLayerRefPtr &layer : layers) {
-        if (layer->HasSpec(editDesc.oldPath)) {
-            processedEdit->layersToEdit.push_back(layer);
+        if (layer->HasSpec(_editDesc.oldPath)) {
+            _processedEdit->layersToEdit.push_back(layer);
         }
     }
 
-    // Determine if editing the path would require relocates.
-    if (editDesc.IsPropertyEdit()) {
-        _ProcessPropEditRequiresRelocates(
-            editDesc, primIndex, nodeForEditTarget, processedEdit);
-    } else {
-        _ProcessPrimEditRequiresRelocates(
-            editDesc, primIndex, nodeForEditTarget, processedEdit);
-    }
-
     // Validate whether the necessary spec edits can actually be performed on
     // each layer that needs to be edited.
-    for (const auto &layer : processedEdit->layersToEdit) {
+    for (const auto &layer : _processedEdit->layersToEdit) {
         // The layer itself needs to be editable  
         if (!layer->PermissionToEdit()) {
-            processedEdit->errors.push_back(TfStringPrintf("The spec @%s@<%s> "
+            _processedEdit->errors.push_back(TfStringPrintf("The spec @%s@<%s> "
                 "cannot be edited because the layer is not editable",
                 layer->GetIdentifier().c_str(),
-                editDesc.oldPath.GetText()));
+                _editDesc.oldPath.GetText()));
         }
         // If we're moving an object to a new path, the layer cannot have a
         // spec already at the new path.
-        if (!editDesc.newPath.IsEmpty() && layer->HasSpec(editDesc.newPath)) {
-            processedEdit->errors.push_back(TfStringPrintf("The spec @%s@<%s> "
+        if (!_editDesc.newPath.IsEmpty() && layer->HasSpec(_editDesc.newPath)) {
+            _processedEdit->errors.push_back(TfStringPrintf("The spec @%s@<%s> "
                 "cannot be moved to <%s> because a spec already exists at "
                 "the new path",
                 layer->GetIdentifier().c_str(),
-                editDesc.oldPath.GetText(),
-                editDesc.newPath.GetText()));
+                _editDesc.oldPath.GetText(),
+                _editDesc.newPath.GetText()));
         }
     }
 }
 
 void 
-UsdNamespaceEditor::_EditProcessor::_GatherTargetListOpEdits(
-    const UsdStageRefPtr &stage,
-    const _EditDescription &editDesc,
-    _ProcessedEdit *processedEdit)
+UsdNamespaceEditor::_EditProcessor::_GatherTargetListOpEdits()
 {
     // Gather all the dependencies from stage namespace path to properties with 
     // relationship targets or attributes connections that depend on that 
     // namespace path.
     _TargetingPropertyDependencies deps =
-         _TargetingPropertyDependencyCollector::GetDependencies(stage);
+         _TargetingPropertyDependencyCollector::GetDependencies(_stage);
 
     // With all the target path dependencies we need to determine which 
     // targeting properties are affected by this particular edit. If the edit 
@@ -1053,7 +1111,7 @@ UsdNamespaceEditor::_EditProcessor::_GatherTargetListOpEdits(
     SdfPathSet propPathsWithAffectedTargets;
     const auto range = 
         deps.targetedPathToTargetingPropertiesPathTable.FindSubtreeRange(
-            editDesc.oldPath);
+            _editDesc.oldPath);
     for (auto it = range.first; it != range.second; ++it) {
         const SdfPathVector &propPaths = it->second;
         propPathsWithAffectedTargets.insert(propPaths.begin(), propPaths.end());
@@ -1097,29 +1155,36 @@ UsdNamespaceEditor::_EditProcessor::_GatherTargetListOpEdits(
                     }
                     // If the path doesn't start with the old path, it is not 
                     // affected and returned unmodified.
-                    if (!path.HasPrefix(editDesc.oldPath)) {
+                    if (!path.HasPrefix(_editDesc.oldPath)) {
                         return std::optional<SdfPath>(path);
                     }
                     // Otherwise we found an affected path. If we've deleted
                     // the old path, delete this target item.
-                    if (editDesc.newPath.IsEmpty()) {
+                    if (_editDesc.newPath.IsEmpty()) {
                         return std::optional<SdfPath>();
                     }
                     // Otherwise update the path of this target item for the 
                     // new path.
                     return std::optional<SdfPath>(
-                        path.ReplacePrefix(editDesc.oldPath, editDesc.newPath));
+                        path.ReplacePrefix(_editDesc.oldPath, _editDesc.newPath));
                 }))
             {
                 // If the target list op was modified, add the edit we need
                 // to perform for this spec in the processed edit.
-                processedEdit->targetPathListOpEdits.push_back(
+                _processedEdit->targetPathListOpEdits.push_back(
                     {specInfo.layer->GetPropertyAtPath(specInfo.path),
                      specInfo.fieldName, 
                      std::move(targetListOp)});
             }
         }
 
+        // If we added relocates for this edit already, then the target paths
+        // authored across composition arcs will also be mapped by the
+        // relocation. 
+        if (!_processedEdit->relocatesEdits.empty()) {
+            continue;
+        }
+
         // For target paths that are contributed by specs that originate across
         // arcs below the root node, we can't edit these specs directly. 
         // Instead we'd need relocates to map these paths. In this case we find
@@ -1149,7 +1214,7 @@ UsdNamespaceEditor::_EditProcessor::_GatherTargetListOpEdits(
                     // affected by the namespace edit; we don't care about these 
                     // either.
                     if (translatedPath.IsEmpty() ||
-                        !translatedPath.HasPrefix(editDesc.oldPath)) {
+                        !translatedPath.HasPrefix(_editDesc.oldPath)) {
                         return std::optional<SdfPath>();
                     }
                     return std::optional<SdfPath>(translatedPath);
@@ -1160,16 +1225,19 @@ UsdNamespaceEditor::_EditProcessor::_GatherTargetListOpEdits(
         // list op error in the processed edit.
         if (!targetsRequireRelocates.empty()) {
             const bool isAttribute = 
-                stage->GetObjectAtPath(propertyPath).Is<UsdAttribute>();
-            processedEdit->targetPathListOpErrors.push_back(TfStringPrintf(
-                "The %s at '%s' has the following %s paths [%s] which require "
-                "authoring relocates to be retargeted because they are "
-                "introduced by opinions from composition arcs; authoring "
-                "relocates is not yet supported",
+                _stage->GetObjectAtPath(propertyPath).Is<UsdAttribute>();
+            _processedEdit->targetPathListOpErrors.push_back(TfStringPrintf(
+                "Fixing the %s paths %s for the %s at '%s' would require "
+                "'%s'to be relocated but we do not introduce relocates for %s.",
+                isAttribute ? "connection" : "relationship",
+                TfStringify(targetsRequireRelocates).c_str(),
                 isAttribute ? "attribute" : "relationship",
                 propertyPath.GetText(),
-                isAttribute ? "connection" : "relationship target",
-                TfStringify(targetsRequireRelocates).c_str()));
+                _editDesc.oldPath.GetText(),
+                _editDesc.IsPropertyEdit() ? 
+                    "properties ever" :
+                    "prims that do not have opinions across composition arcs"
+                ));
         }
     }
 }
@@ -1254,6 +1322,11 @@ UsdNamespaceEditor::_ProcessedEdit::Apply()
         }
     }
 
+    // Set any necessary relocates.
+    for (const auto &[layer, relocatesValue] : relocatesEdits) {
+        layer->SetRelocates(relocatesValue);
+    }
+
     // Perform any target path listOp fixups necessary now that the namespace 
     // edits have been successfully performed.
     for (const TargetPathListOpEdit &edit : targetPathListOpEdits) {
@@ -1268,8 +1341,8 @@ UsdNamespaceEditor::_ProcessedEdit::Apply()
     // Errors in fixing up targets do not prevent us from applying namespace
     // edits, but we report them as warnings.
     if (!targetPathListOpErrors.empty()) {
-        TF_WARN("The follow target path or connections could not be "
-            "updated for the namespace edit: %s",
+        TF_WARN("Failed to update the following targets and/or connections for "
+            "the namespace edit: %s",
             _GetErrorString(targetPathListOpErrors).c_str());
     }
 
diff --git a/pxr/usd/usd/namespaceEditor.h b/pxr/usd/usd/namespaceEditor.h
index aa79e28ad8..25a7e56beb 100644
--- a/pxr/usd/usd/namespaceEditor.h
+++ b/pxr/usd/usd/namespaceEditor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_NAMESPACE_EDITOR_H
 #define PXR_USD_USD_NAMESPACE_EDITOR_H
@@ -30,6 +13,7 @@
 #include "pxr/usd/usd/api.h"
 #include "pxr/usd/usd/common.h"
 #include "pxr/usd/usd/stage.h"
+#include "pxr/usd/pcp/layerRelocatesEditBuilder.h"
 #include "pxr/usd/sdf/namespaceEdit.h"
 
 
@@ -43,9 +27,31 @@ PXR_NAMESPACE_OPEN_SCOPE
 class UsdNamespaceEditor 
 {
 public:
+    /// Structure for holding the options for how the namespace editor will
+    /// behave when trying to perform edits.
+    struct EditOptions {
+
+        /// Whether the namespace editor will allow the authoring of relocates
+        /// in order to perform edits that would otherwise not be possible 
+        /// because of opinions across composition arcs. By default this is set
+        /// to true. If set to false the namespace editor will consider edits
+        /// that require relocates as errors and will not apply the edit.
+        bool allowRelocatesAuthoring = true;
+    };
+
     USD_API
     explicit UsdNamespaceEditor(const UsdStageRefPtr &stage);
 
+    USD_API
+    UsdNamespaceEditor(
+        const UsdStageRefPtr &stage, 
+        EditOptions &&editOptions);
+
+    USD_API
+    UsdNamespaceEditor(
+        const UsdStageRefPtr &stage, 
+        const EditOptions &editOptions);
+
     /// Adds an edit operation to delete the composed prim at the given \p path 
     /// from this namespace editor's stage.
     ///
@@ -245,6 +251,10 @@ class UsdNamespaceEditor
         // namespace edit applied.
         SdfLayerHandleVector layersToEdit;
 
+        // The list of relocates edits that need to be made to layers in order
+        // to relocate a prim.
+        PcpLayerRelocatesEditBuilder::LayerRelocatesEdits relocatesEdits;
+
         // Layer edits that need to be performed to update connection and 
         // relationship targets of other properties in order to keep them 
         // targeting the same object after applying this processed edit.
@@ -278,9 +288,6 @@ class UsdNamespaceEditor
         // removed from its parent spec in a layer.
         bool removeInertAncestorOvers = false;
 
-        // Whether the edit would require relocates (or deactivation for delete)
-        bool requiresRelocates = false;
-
         // Applies this processed edit, performing the individual edits 
         // necessary to each layer that needs to be updated.
         bool Apply();
@@ -314,6 +321,7 @@ class UsdNamespaceEditor
     class _EditProcessor;
 
     UsdStageRefPtr _stage;
+    EditOptions _editOptions;
     _EditDescription _editDescription;
     mutable std::optional<_ProcessedEdit> _processedEdit;   
 };
diff --git a/pxr/usd/usd/notice.cpp b/pxr/usd/usd/notice.cpp
index 52319e7424..b2f0deb822 100644
--- a/pxr/usd/usd/notice.cpp
+++ b/pxr/usd/usd/notice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/notice.h"
@@ -56,13 +39,13 @@ UsdNotice::StageNotice::StageNotice(const UsdStageWeakPtr& stage) :
 {
 }
 
-UsdNotice::StageNotice::~StageNotice() {}
+UsdNotice::StageNotice::~StageNotice() = default;
 
-UsdNotice::StageContentsChanged::~StageContentsChanged() {}
+UsdNotice::StageContentsChanged::~StageContentsChanged() = default;
 
-UsdNotice::StageEditTargetChanged::~StageEditTargetChanged() {}
+UsdNotice::StageEditTargetChanged::~StageEditTargetChanged() = default;
 
-UsdNotice::LayerMutingChanged::~LayerMutingChanged() {}
+UsdNotice::LayerMutingChanged::~LayerMutingChanged() = default;
 
 TfTokenVector 
 UsdNotice::ObjectsChanged::PathRange::const_iterator::GetChangedFields() const
diff --git a/pxr/usd/usd/notice.h b/pxr/usd/usd/notice.h
index b375e76602..395beb39e5 100644
--- a/pxr/usd/usd/notice.h
+++ b/pxr/usd/usd/notice.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_NOTICE_H
 #define PXR_USD_USD_NOTICE_H
@@ -49,7 +32,7 @@ class UsdNotice {
         USD_API
         StageNotice(const UsdStageWeakPtr &stage);
         USD_API
-        virtual ~StageNotice();
+        ~StageNotice() override;
 
         /// Return the stage associated with this notice.
         const UsdStageWeakPtr &GetStage() const { return _stage; }
@@ -74,7 +57,7 @@ class UsdNotice {
     public:
         explicit StageContentsChanged(const UsdStageWeakPtr& stage)
             : StageNotice(stage) {}
-        USD_API virtual ~StageContentsChanged();
+        USD_API ~StageContentsChanged() override;
     };
 
     /// \class ObjectsChanged
@@ -145,7 +128,7 @@ class UsdNotice {
                        const _PathsToChangesMap *resyncChanges);
 
     public:
-        USD_API virtual ~ObjectsChanged();
+        USD_API ~ObjectsChanged() override;
 
         /// Return true if \p obj was possibly affected by the layer changes
         /// that generated this notice.  This is the case if either the object
@@ -394,7 +377,7 @@ class UsdNotice {
     public:
         explicit StageEditTargetChanged(const UsdStageWeakPtr &stage)
             : StageNotice(stage) {}
-        USD_API virtual ~StageEditTargetChanged();
+        USD_API ~StageEditTargetChanged() override;
     };
 
     /// \class LayerMutingChanged
@@ -420,7 +403,7 @@ class UsdNotice {
              _mutedLayers(mutedLayers),
              _unMutedLayers(unmutedLayers) {}
 
-        USD_API virtual ~LayerMutingChanged();
+        USD_API ~LayerMutingChanged() override;
 
         /// Returns the identifier of the layers that were muted.
         ///
diff --git a/pxr/usd/usd/object.cpp b/pxr/usd/usd/object.cpp
index 185a1f6730..dd632a3b47 100644
--- a/pxr/usd/usd/object.cpp
+++ b/pxr/usd/usd/object.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/object.h"
diff --git a/pxr/usd/usd/object.h b/pxr/usd/usd/object.h
index 96f2fee0de..7b754e39c2 100644
--- a/pxr/usd/usd/object.h
+++ b/pxr/usd/usd/object.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_OBJECT_H
 #define PXR_USD_USD_OBJECT_H
diff --git a/pxr/usd/usd/payloads.cpp b/pxr/usd/usd/payloads.cpp
index e4ad1de245..6a614c1d34 100644
--- a/pxr/usd/usd/payloads.cpp
+++ b/pxr/usd/usd/payloads.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/common.h"
diff --git a/pxr/usd/usd/payloads.h b/pxr/usd/usd/payloads.h
index 642e523b15..132a99ab82 100644
--- a/pxr/usd/usd/payloads.h
+++ b/pxr/usd/usd/payloads.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PAYLOADS_H
 #define PXR_USD_USD_PAYLOADS_H
diff --git a/pxr/usd/usd/pch.h b/pxr/usd/usd/pch.h
index d360999d4b..3a260bb324 100644
--- a/pxr/usd/usd/pch.h
+++ b/pxr/usd/usd/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,15 +31,17 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
+#include <cctype>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -67,6 +52,7 @@
 #include <cstring>
 #include <ctime>
 #include <deque>
+#include <exception>
 #include <fcntl.h>
 #include <float.h>
 #include <functional>
@@ -82,8 +68,11 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
+#include <shared_mutex>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
@@ -99,71 +88,11 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/container/flat_map.hpp>
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/multi_index/global_fun.hpp>
-#include <boost/multi_index/hashed_index.hpp>
-#include <boost/multi_index/identity.hpp>
-#include <boost/multi_index/member.hpp>
-#include <boost/multi_index_container.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/if.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/bases.hpp>
 #include <boost/python/call.hpp>
@@ -194,6 +123,7 @@
 #include <boost/python/raw_function.hpp>
 #include <boost/python/refcount.hpp>
 #include <boost/python/return_arg.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/return_value_policy.hpp>
 #include <boost/python/scope.hpp>
 #include <boost/python/to_python_converter.hpp>
@@ -204,30 +134,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/begin.hpp>
-#include <boost/range/end.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_left_shift.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/utility/in_place_factory.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
@@ -242,6 +148,7 @@
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
 #include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usd/plugInfo.json b/pxr/usd/usd/plugInfo.json
index 4705fbe0cf..016a8898c3 100644
--- a/pxr/usd/usd/plugInfo.json
+++ b/pxr/usd/usd/plugInfo.json
@@ -144,6 +144,14 @@
                             "usdz"
                         ]
                     }
+                }, 
+                "Validators": {
+                    "CompositionErrorTest": {
+                        "doc": "Validator aims at providing all composition errors, which were generated while composing the stage."
+                    }, 
+                    "keywords": [
+                        "UsdCoreValidators"
+                    ]
                 }
             }, 
             "LibraryPath": "@PLUG_INFO_LIBRARY_PATH@", 
diff --git a/pxr/usd/usd/prim.cpp b/pxr/usd/usd/prim.cpp
index 5ac2940075..688775f675 100644
--- a/pxr/usd/usd/prim.cpp
+++ b/pxr/usd/usd/prim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/prim.h"
diff --git a/pxr/usd/usd/prim.h b/pxr/usd/usd/prim.h
index d44770e59c..69ebb130df 100644
--- a/pxr/usd/usd/prim.h
+++ b/pxr/usd/usd/prim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_H
 #define PXR_USD_USD_PRIM_H
diff --git a/pxr/usd/usd/primCompositionQuery.cpp b/pxr/usd/usd/primCompositionQuery.cpp
index 9a3391c4b8..793345f7d7 100644
--- a/pxr/usd/usd/primCompositionQuery.cpp
+++ b/pxr/usd/usd/primCompositionQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primCompositionQuery.h"
@@ -82,7 +65,7 @@ template <class ResultType>
 using _PcpComposeFunc = void (*)(PcpLayerStackRefPtr const &,
                                  SdfPath const &, 
                                  std::vector<ResultType> *,
-                                 PcpSourceArcInfoVector *);
+                                 PcpArcInfoVector *);
 
 // Helper for getting the corresponding list entry and arc source info from
 // the composed list op of an arc introducing node for all list op types.
@@ -91,12 +74,12 @@ static
 bool
 _GetIntroducingComposeInfo(const UsdPrimCompositionQueryArc &arc,
                            _PcpComposeFunc<ResultType> composeFunc, 
-                           PcpSourceArcInfo *arcInfo,
+                           PcpArcInfo *arcInfo,
                            ResultType *entry)
 {
     // Run the Pcp compose func to get the parallel vectors of composed list
     // entries and arc source info.
-    PcpSourceArcInfoVector info;
+    PcpArcInfoVector info;
     std::vector<ResultType> result;
     composeFunc(arc.GetIntroducingNode().GetLayerStack(), 
                 arc.GetIntroducingPrimPath(), 
@@ -177,7 +160,7 @@ UsdPrimCompositionQueryArc::GetIntroducingLayer() const
     // The arc source info returned by the various Pcp compose functions for 
     // list op fields will hold the layer whose prim spec adds this arc to the
     // list. Just need to call the correct function for each arc type.
-    PcpSourceArcInfo info;
+    PcpArcInfo info;
     bool foundInfo = false;
     switch (_node.GetArcType()) {
     case PcpArcTypeReference:
@@ -204,7 +187,7 @@ UsdPrimCompositionQueryArc::GetIntroducingLayer() const
         break;
     }
     if (foundInfo) {
-        return info.layer;
+        return info.sourceLayer;
     }
     // Empty layer for root arc and unsupported arc types.
     return SdfLayerHandle();
@@ -229,9 +212,9 @@ UsdPrimCompositionQueryArc::GetIntroducingPrimPath() const
 static
 SdfPrimSpecHandle
 _GetIntroducingPrimSpec(const UsdPrimCompositionQueryArc &arc, 
-                        const PcpSourceArcInfo &info)
+                        const PcpArcInfo &info)
 {
-    return info.layer->GetPrimAtPath(arc.GetIntroducingPrimPath());
+    return info.sourceLayer->GetPrimAtPath(arc.GetIntroducingPrimPath());
 }
 
 bool
@@ -245,7 +228,7 @@ UsdPrimCompositionQueryArc::GetIntroducingListEditor(
     }
 
     // Compose the references on the introducing node.
-    PcpSourceArcInfo info;
+    PcpArcInfo info;
     if (!_GetIntroducingComposeInfo<SdfReference>(
         *this, &PcpComposeSiteReferences, &info, ref)) {
         return false;
@@ -270,7 +253,7 @@ UsdPrimCompositionQueryArc::GetIntroducingListEditor(
     }
 
     // Compose the payloads on the introducing node.
-    PcpSourceArcInfo info;
+    PcpArcInfo info;
     if (!_GetIntroducingComposeInfo<SdfPayload>(
         *this, &PcpComposeSitePayloads, &info, payload)) {
         return false;
@@ -296,7 +279,7 @@ UsdPrimCompositionQueryArc::GetIntroducingListEditor(
         return false;
     }
 
-    PcpSourceArcInfo info;
+    PcpArcInfo info;
     if (GetArcType() == PcpArcTypeInherit) {
         // Compose the inherit paths on the introducing node.
         if (!_GetIntroducingComposeInfo<SdfPath>(
@@ -329,7 +312,7 @@ UsdPrimCompositionQueryArc::GetIntroducingListEditor(
     }
 
     // Compose the variant set names on the introducing node.
-    PcpSourceArcInfo info;
+    PcpArcInfo info;
     if (!_GetIntroducingComposeInfo<std::string>(
         *this, &PcpComposeSiteVariantSets, &info, name)) {
         return false;
diff --git a/pxr/usd/usd/primCompositionQuery.h b/pxr/usd/usd/primCompositionQuery.h
index 240e388ddb..11764418d5 100644
--- a/pxr/usd/usd/primCompositionQuery.h
+++ b/pxr/usd/usd/primCompositionQuery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_COMPOSITION_QUERY_H
 #define PXR_USD_USD_PRIM_COMPOSITION_QUERY_H
diff --git a/pxr/usd/usd/primData.cpp b/pxr/usd/usd/primData.cpp
index e1ce385b9f..ee2250176b 100644
--- a/pxr/usd/usd/primData.cpp
+++ b/pxr/usd/usd/primData.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/prim.h"
diff --git a/pxr/usd/usd/primData.h b/pxr/usd/usd/primData.h
index 0a42d009ca..04c9591d6a 100644
--- a/pxr/usd/usd/primData.h
+++ b/pxr/usd/usd/primData.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_DATA_H
 #define PXR_USD_USD_PRIM_DATA_H
diff --git a/pxr/usd/usd/primDataHandle.cpp b/pxr/usd/usd/primDataHandle.cpp
index 3361ed435a..f11a3ca2ad 100644
--- a/pxr/usd/usd/primDataHandle.cpp
+++ b/pxr/usd/usd/primDataHandle.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primDataHandle.h"
diff --git a/pxr/usd/usd/primDataHandle.h b/pxr/usd/usd/primDataHandle.h
index 9ae7120fe7..366eaac680 100644
--- a/pxr/usd/usd/primDataHandle.h
+++ b/pxr/usd/usd/primDataHandle.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_DATA_HANDLE_H
 #define PXR_USD_USD_PRIM_DATA_HANDLE_H
diff --git a/pxr/usd/usd/primDefinition.cpp b/pxr/usd/usd/primDefinition.cpp
index 5b360af17a..6432d3895c 100644
--- a/pxr/usd/usd/primDefinition.cpp
+++ b/pxr/usd/usd/primDefinition.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primDefinition.h"
@@ -809,7 +792,16 @@ UsdPrimDefinition::Property::GetVariability() const {
 std::string 
 UsdPrimDefinition::Property::GetDocumentation() const {
     std::string docString;
-    _layerAndPath->HasField(SdfFieldKeys->Documentation, &docString);
+    static const TfToken schemaUserDocBriefToken("userDocBrief");
+
+    // Try to get "userDocBrief" doc from property metadata
+    if (! _layerAndPath->HasFieldDictKey(
+             SdfFieldKeys->CustomData,
+             schemaUserDocBriefToken,
+             &docString)) {
+         // For now, fall back to using the "documentation" metadata if present
+         _layerAndPath->HasField(SdfFieldKeys->Documentation, &docString);
+    }
     return docString;
 }
 
diff --git a/pxr/usd/usd/primDefinition.h b/pxr/usd/usd/primDefinition.h
index 7afb08851a..39e99bbab9 100644
--- a/pxr/usd/usd/primDefinition.h
+++ b/pxr/usd/usd/primDefinition.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_DEFINITION_H
 #define PXR_USD_USD_PRIM_DEFINITION_H
diff --git a/pxr/usd/usd/primFlags.cpp b/pxr/usd/usd/primFlags.cpp
index c7ebc04320..1bbc662e59 100644
--- a/pxr/usd/usd/primFlags.cpp
+++ b/pxr/usd/usd/primFlags.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primFlags.h"
diff --git a/pxr/usd/usd/primFlags.h b/pxr/usd/usd/primFlags.h
index f1fd3d30be..efb1b2cd01 100644
--- a/pxr/usd/usd/primFlags.h
+++ b/pxr/usd/usd/primFlags.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_FLAGS_H
 #define PXR_USD_USD_PRIM_FLAGS_H
diff --git a/pxr/usd/usd/primRange.cpp b/pxr/usd/usd/primRange.cpp
index 8a5b9b315e..fbb78ca298 100644
--- a/pxr/usd/usd/primRange.cpp
+++ b/pxr/usd/usd/primRange.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primRange.h"
diff --git a/pxr/usd/usd/primRange.h b/pxr/usd/usd/primRange.h
index 3aae0c862c..95dba1aa9f 100644
--- a/pxr/usd/usd/primRange.h
+++ b/pxr/usd/usd/primRange.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_RANGE_H
 #define PXR_USD_USD_PRIM_RANGE_H
diff --git a/pxr/usd/usd/primTypeInfo.cpp b/pxr/usd/usd/primTypeInfo.cpp
index 78631090f0..2bdc27f13d 100644
--- a/pxr/usd/usd/primTypeInfo.cpp
+++ b/pxr/usd/usd/primTypeInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primTypeInfo.h"
diff --git a/pxr/usd/usd/primTypeInfo.h b/pxr/usd/usd/primTypeInfo.h
index 1d69ab748e..061632f81b 100644
--- a/pxr/usd/usd/primTypeInfo.h
+++ b/pxr/usd/usd/primTypeInfo.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_TYPE_INFO_H
 #define PXR_USD_USD_PRIM_TYPE_INFO_H
diff --git a/pxr/usd/usd/primTypeInfoCache.cpp b/pxr/usd/usd/primTypeInfoCache.cpp
index 49760e3a5d..449dd7f869 100644
--- a/pxr/usd/usd/primTypeInfoCache.cpp
+++ b/pxr/usd/usd/primTypeInfoCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primTypeInfoCache.h"
diff --git a/pxr/usd/usd/primTypeInfoCache.h b/pxr/usd/usd/primTypeInfoCache.h
index 6bd0e488fc..b6ab2cc10d 100644
--- a/pxr/usd/usd/primTypeInfoCache.h
+++ b/pxr/usd/usd/primTypeInfoCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PRIM_TYPE_INFO_CACHE_H
 #define PXR_USD_USD_PRIM_TYPE_INFO_CACHE_H
diff --git a/pxr/usd/usd/property.cpp b/pxr/usd/usd/property.cpp
index bcddf4616d..53faae508c 100644
--- a/pxr/usd/usd/property.cpp
+++ b/pxr/usd/usd/property.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/property.h"
diff --git a/pxr/usd/usd/property.h b/pxr/usd/usd/property.h
index 06d9d4e677..2633b500b9 100644
--- a/pxr/usd/usd/property.h
+++ b/pxr/usd/usd/property.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PROPERTY_H
 #define PXR_USD_USD_PROPERTY_H
diff --git a/pxr/usd/usd/pyConversions.cpp b/pxr/usd/usd/pyConversions.cpp
index a7d78883ed..570e438f52 100644
--- a/pxr/usd/usd/pyConversions.cpp
+++ b/pxr/usd/usd/pyConversions.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/pyConversions.h"
diff --git a/pxr/usd/usd/pyConversions.h b/pxr/usd/usd/pyConversions.h
index 2831418ad3..05280a891b 100644
--- a/pxr/usd/usd/pyConversions.h
+++ b/pxr/usd/usd/pyConversions.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PY_CONVERSIONS_H
 #define PXR_USD_USD_PY_CONVERSIONS_H
diff --git a/pxr/usd/usd/pyEditContext.cpp b/pxr/usd/usd/pyEditContext.cpp
index 87b2f11e5c..4baf3547f0 100644
--- a/pxr/usd/usd/pyEditContext.cpp
+++ b/pxr/usd/usd/pyEditContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/usd/pyEditContext.h"
diff --git a/pxr/usd/usd/pyEditContext.h b/pxr/usd/usd/pyEditContext.h
index 7cbd29bebe..9ba3eed2b5 100644
--- a/pxr/usd/usd/pyEditContext.h
+++ b/pxr/usd/usd/pyEditContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PY_EDIT_CONTEXT_H
 #define PXR_USD_USD_PY_EDIT_CONTEXT_H
diff --git a/pxr/usd/usd/references.cpp b/pxr/usd/usd/references.cpp
index ce2f94041b..6a9dd96d94 100644
--- a/pxr/usd/usd/references.cpp
+++ b/pxr/usd/usd/references.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/common.h"
diff --git a/pxr/usd/usd/references.h b/pxr/usd/usd/references.h
index f07ac82438..5006659ed5 100644
--- a/pxr/usd/usd/references.h
+++ b/pxr/usd/usd/references.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_REFERENCES_H
 #define PXR_USD_USD_REFERENCES_H
diff --git a/pxr/usd/usd/relationship.cpp b/pxr/usd/usd/relationship.cpp
index b79f19077f..a9bc5e8d8c 100644
--- a/pxr/usd/usd/relationship.cpp
+++ b/pxr/usd/usd/relationship.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/common.h"
diff --git a/pxr/usd/usd/relationship.h b/pxr/usd/usd/relationship.h
index a1256c2caa..8e75b0fcd1 100644
--- a/pxr/usd/usd/relationship.h
+++ b/pxr/usd/usd/relationship.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_RELATIONSHIP_H
 #define PXR_USD_USD_RELATIONSHIP_H
diff --git a/pxr/usd/usd/resolveInfo.cpp b/pxr/usd/usd/resolveInfo.cpp
index 7c63b9fb9f..a62f39ec95 100644
--- a/pxr/usd/usd/resolveInfo.cpp
+++ b/pxr/usd/usd/resolveInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/resolveInfo.h"
diff --git a/pxr/usd/usd/resolveInfo.h b/pxr/usd/usd/resolveInfo.h
index ac77da04b7..13a331d1f8 100644
--- a/pxr/usd/usd/resolveInfo.h
+++ b/pxr/usd/usd/resolveInfo.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_RESOLVE_INFO_H
 #define PXR_USD_USD_RESOLVE_INFO_H
diff --git a/pxr/usd/usd/resolveTarget.cpp b/pxr/usd/usd/resolveTarget.cpp
index d2e662f2f0..cdd117b713 100644
--- a/pxr/usd/usd/resolveTarget.cpp
+++ b/pxr/usd/usd/resolveTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/resolveTarget.h"
diff --git a/pxr/usd/usd/resolveTarget.h b/pxr/usd/usd/resolveTarget.h
index 2208edbb70..b5fa0fab01 100644
--- a/pxr/usd/usd/resolveTarget.h
+++ b/pxr/usd/usd/resolveTarget.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_RESOLVE_TARGET_H
 #define PXR_USD_USD_RESOLVE_TARGET_H
diff --git a/pxr/usd/usd/resolver.cpp b/pxr/usd/usd/resolver.cpp
index ba7b3b0860..7826a01630 100644
--- a/pxr/usd/usd/resolver.cpp
+++ b/pxr/usd/usd/resolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/resolver.h"
diff --git a/pxr/usd/usd/resolver.h b/pxr/usd/usd/resolver.h
index 15203c0a8d..6946935912 100644
--- a/pxr/usd/usd/resolver.h
+++ b/pxr/usd/usd/resolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_RESOLVER_H
 #define PXR_USD_USD_RESOLVER_H
diff --git a/pxr/usd/usd/schema.usda b/pxr/usd/usd/schema.usda
index f9947dddd6..e1029b6c7a 100644
--- a/pxr/usd/usd/schema.usda
+++ b/pxr/usd/usd/schema.usda
@@ -82,8 +82,7 @@ class "APISchemaBase"
     explicit bool conversion operator. Examples of applied API schemas include
     UsdCollectionAPI, UsdGeomModelAPI and UsdGeomMotionAPI
 
-    \\anchor UsdAPISchemaBase_SingleVsMultipleApply
-    \\name Single vs. Multiple Apply API Schemas
+    \\subsection usd_apischemabase_single_vs_multiple_apply Single vs. Multiple Apply API Schemas
     
     Applied API schemas can further be classified into single-apply and 
     multiple-apply API schemas. As the name suggests, a single-apply API schema 
@@ -143,95 +142,137 @@ class "ModelAPI"
 class "CollectionAPI"
 (
     inherits = </APISchemaBase>
-    doc = """ This is a general purpose API schema, used to describe a 
-    collection of heterogeneous objects within the scene. "Objects" here may be 
-    prims or properties belonging to prims or other collections. It's an add-on 
-    schema that can be applied many times to a prim with different collection 
-    names. 
-
-    A collection allows an enumeration of a set of paths to include and a 
-    set of paths to exclude.  Whether the descendants of an included
-    path are members of a collection are decided by its expansion rule
-    (see below).  If the collection excludes paths that are not descendents
-    of included paths, the collection implicitly includes the root path
-    &lt;/&gt;.  If such a collection also includes paths that are not
-    descendants of the excluded paths, it is considered invalid, since
-    the intention is ambiguous.
-
-    All the properties authored by the schema are namespaced under
-    "collection:". The given name of the collection provides additional 
-    namespacing for the various per-collection properties, which include the 
-    following:
-
-    <ul><li><b>uniform token collection:<i>collectionName</i>:expansionRule</b> - 
-    specified how the paths that are included in the collection must be expanded 
-    to determine its members. Possible values include:
+    doc = """A general purpose API schema used to describe a collection of prims
+    and properties within a scene. This API schema can be applied to a prim
+    multiple times with different instance names to define several collections
+    on a single prim.
+
+    A collection's membership is specified one of two ways. The first way uses
+    the built-in relationships `includes` and `excludes`, and the attribute
+    `includeRoot` to determine membership. The second way is termed a
+    pattern-based collection, and uses the built-in attribute
+    `membershipExpression` to determine membership. Here we will refer to
+    collections using `includes`, `excludes` and `includeRoot` as being in
+    *relationship-mode* and those using the `membershipExpression` as being in
+    *expression-mode*.
+
+    A collection is determined to be in *relationship-mode* when either or both
+    of its `includes` and `excludes` relationships have valid targets, or the
+    `includeRoot` attribute is set `true`.  In this case, the pattern-based
+    `membershipExpression` attribute is ignored.  Otherwise, the collection is
+    in *expression-mode* and the `membershipExpression` attribute applies.
+
+    In *relationship-mode* the `includes` and `excludes` relationships specify
+    the collection members as a set of paths to include and a set of paths to
+    exclude.  Whether or not the descendants of an included path belong to a
+    collection is decided by its expansion rule (see below).  If the collection
+    excludes paths that are not descendent to included paths, the collection
+    implicitly includes the root path `</>`.  If such a collection also
+    includes paths that are not descendent to the excluded paths, it is
+    considered invalid since the intent is ambiguous.
+
+    In *expression-mode*, the pattern-based `membershipExpression` attribute is
+    used with the `expansionRule` attribute to determine collection membership.
+    See the detailed descriptions of the built-in properties below for more
+    details.
+
+    \\section usd_collectionapi_properties Collection API Properties
+
+    The built-in properties for this schema are in the `collection:instanceName`
+    namespace, where `instanceName` is the user-provided applied API schema
+    instance name.
+
+    <ul>
+    <li>`uniform token collection:instanceName:expansionRule` - in
+    *relationship-mode*, specifies how to expand the `includes` and `excludes`
+    relationship targets to determine the collection's members.  In
+    *expression-mode*, specifies how matching scene objects against the
+    `membershipExpression` proceeds.  Possible values include:
         <ul>
-        <li><b>explicitOnly</b> - only paths in the includes rel targets and not 
-        in the excludes rel targets belong to the collection.
+        <li>`expandPrims` - in *relationship-mode*, all the prims descendent
+        to the `includes` relationship targets (and not descendent to `excludes`
+        relationship targets) belong to the collection.  Any `includes`-targeted
+        property paths also belong to the collection. This is the default
+        behavior. In *expression-mode*, the functions
+        UsdComputeIncludedObjectsFromCollection() and
+        UsdComputeIncludedPathsFromCollection() only test prims against the
+        `membershipExpression` to determine membership.
         </li>
-        <li><b>expandPrims</b> - all the prims at or below the includes rel-
-        targets (and not under the excludes rel-targets) belong to the 
-        collection.  Any property paths included in the collection would, of 
-        course, also be honored. This is the default behavior as it satisfies 
-        most use cases.
+        <li>`expandPrimsAndProperties` - like `expandPrims`, but in
+        *relationship-mode*, all properties on all included prims also belong to
+        the collection. In *expression-mode*, the functions
+        UsdComputeIncludedObjectsFromCollection() and
+        UsdComputeIncludedPathsFromCollection() test both prims and
+        properties against the `membershipExpression` to determine membership.
         </li>
-        <li><b>expandPrimsAndProperties</b> - like expandPrims, but also 
-        includes all properties on all matched prims.  We're still not quite 
-        sure what the use cases are for this, but you can use it to capture a 
-        whole lot of UsdObjects very concisely.
+        <li>`explicitOnly` - in *relationship-mode*, only paths in the
+        `includes` relationship targets and not those in the `excludes`
+        relationship targets belong to the collection. Does not apply to
+        *expression-mode*. If set in *expression-mode*, the functions
+        UsdComputeIncludedObjectsFromCollection() and
+        UsdComputeIncludedPathsFromCollection() return no results.
         </li>
         </ul>
-    </li>
-    <li><b>bool collection:<i>collectionName</i>:includeRoot</b> - boolean
-    attribute indicating whether the pseudo-root path &lt;/&gt; should
-    be counted as one of the included target paths.  The fallback is false.
-    This separate attribute is required because relationships cannot
-    directly target the root.  When expansionRule is explicitOnly, this
-    attribute is ignored.
-    <li><b>rel collection:<i>collectionName</i>:includes</b> - specifies a list 
-    of targets that are included in the collection. This can target prims or 
-    properties directly. A collection can insert the rules of another
-    collection by making its <i>includes</i> relationship target the
-    <b>collection:{collectionName}</b> property on the owning prim of the
-    collection to be included (see UsdCollectionAPI::GetCollectionAttr).
-    It is important to note that including another collection does not
-    guarantee the contents of that collection will be in the final collection;
-    instead, the rules are merged.  This means, for example, an exclude
-    entry may exclude a portion of the included collection.
-    When a collection includes one or more collections, the order in which 
-    targets are added to the includes relationship may become significant, if 
-    there are conflicting opinions about the same path. Targets that are added 
-    later are considered to be stronger than earlier targets for the same path.
-    </li>
-    <li><b>rel collection:<i>collectionName</i>:excludes</b> - specifies a list 
-    of targets that are excluded below the <b>included</b> paths in this 
-    collection. This can target prims or properties directly, but <b>cannot
-    target another collection</b>. This is to keep the membership determining 
-    logic simple, efficient and easier to reason about. Finally, it is invalid 
-    for a collection to exclude paths that are not included in it. The presence
-    of such "orphaned" excluded paths will not affect the set of paths included 
-    in the collection, but may affect the performance of querying membership of 
-    a path in the collection (see UsdCollectionAPI::MembershipQuery::IsPathIncluded) 
-    or of enumerating the objects belonging to the collection (see 
-    UsdCollectionAPI::GetIncludedObjects).
-    </li>
-    <li><b>uniform opaque collection:<i>collectionName</i></b> - opaque 
+        </li>
+
+    <li>`bool collection:instanceName:includeRoot` - boolean attribute
+    indicating whether the pseudo-root path `</>` should be counted as one
+    of the included target paths in *relationship-mode*. This separate attribute
+    is required because relationships cannot directly target the root. When
+    `expansionRule` is `explicitOnly`, this attribute is ignored. The fallback
+    value is false. When set to `true`, this collection is in
+    *relationship-mode*. This attribute is ignored in *expression-mode*.  </li>
+
+    <li>`rel collection:instanceName:includes` - in *relationship-mode*,
+    specifies a list of targets that are included in the collection. This can
+    target prims or properties directly. A collection can insert the rules of
+    another collection by making its `includes` relationship target the
+    `collection:otherInstanceName` property from the collection to be included
+    (see UsdCollectionAPI::GetCollectionAttr).  Note that including another
+    collection does not guarantee the contents of that collection will be in the
+    final collection; instead, the rules are merged.  This means, for example,
+    an exclude entry may exclude a portion of the included collection.  When a
+    collection includes one or more collections, the order in which targets are
+    added to the includes relationship may become significant, if there are
+    conflicting opinions about the same path. Targets that are added later are
+    considered to be stronger than earlier targets for the same path.  This
+    relationship is ignored in *expression-mode*.</li>
+
+    <li>`rel collection:instanceName:excludes` - in *relationship-mode*,
+    specifies a list of targets that are excluded below the <b>included</b>
+    paths in this collection. This can target prims or properties directly, but
+    <b>cannot target another collection</b>. This is to keep the membership
+    determining logic simple, efficient and easier to reason about. Finally, it
+    is invalid for a collection to exclude paths that are not included in
+    it. The presence of such "orphaned" excluded paths will not affect the set
+    of paths included in the collection, but may affect the performance of
+    querying membership of a path in the collection (see
+    UsdCollectionMembershipQuery::IsPathIncluded) or of enumerating the
+    objects belonging to the collection (see
+    UsdCollectionAPI::ComputeIncludedObjects).  This relationship is ignored in
+    *expression-mode*.</li>
+
+    <li>`uniform opaque collection:instanceName` - opaque
     attribute (meaning it can never have a value) that represents the collection
-    for the purpose of allowing another collection to include it. When this
-    property is targeted by another collection's <i>includes</i> relationship,
-    the rules of this collection will be inserted into the rules of the collection
-    that includes it.
-    </li></ul>
+    for the purpose of allowing another collection to include it in
+    *relationship-mode*. When this property is targeted by another collection's
+    `includes` relationship, the rules of this collection will be inserted
+    into the rules of the collection that includes it.</li>
+
+    <li>`uniform pathExpression collection:instanceName:membershipExpression` -
+    in *expression-mode*, defines the SdfPathExpression used to test
+    objects for collection membership.</li>
+
+    </ul>
 
-    <b>Implicit inclusion</b>
+    \\subsection usd_collectionapi_implicit_inclusion Implicit Inclusion
 
     In some scenarios it is useful to express a collection that includes
-    everything except certain paths.  To support this, a collection
-    that has an exclude that is not a descendent of any include
-    will include the root path &lt;/&gt;.
+    everything except certain paths.  To support this, a *relationship-mode*
+    collection that has an exclude that is not descendent to any include will
+    include the root path `</>`.
 
-    <b>Creating collections in C++</b>
+    \\section usd_collectionapi_creating_cpp Creating Collections in C++
     
     \\snippet examples_usd.cpp ApplyCollections
     """
@@ -265,7 +306,7 @@ class "CollectionAPI"
     )
     uniform bool includeRoot (
         doc = """Boolean attribute indicating whether the pseudo-root
-        path &lt;/&gt; should be counted as one of the included target
+        path `</>` should be counted as one of the included target
         paths.  The fallback is false.  This separate attribute is
         required because relationships cannot directly target the root."""
     )
diff --git a/pxr/usd/usd/schemaBase.cpp b/pxr/usd/usd/schemaBase.cpp
index a74e4299fb..de0554b59b 100644
--- a/pxr/usd/usd/schemaBase.cpp
+++ b/pxr/usd/usd/schemaBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/schemaBase.h b/pxr/usd/usd/schemaBase.h
index e454d58ebe..5d1ae2e5fe 100644
--- a/pxr/usd/usd/schemaBase.h
+++ b/pxr/usd/usd/schemaBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SCHEMA_BASE_H
 #define PXR_USD_USD_SCHEMA_BASE_H
diff --git a/pxr/usd/usd/schemaRegistry.cpp b/pxr/usd/usd/schemaRegistry.cpp
index e712824595..f57a4019a6 100644
--- a/pxr/usd/usd/schemaRegistry.cpp
+++ b/pxr/usd/usd/schemaRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/schemaRegistry.h b/pxr/usd/usd/schemaRegistry.h
index d6418900ac..6566dfcdf1 100644
--- a/pxr/usd/usd/schemaRegistry.h
+++ b/pxr/usd/usd/schemaRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SCHEMA_REGISTRY_H
 #define PXR_USD_USD_SCHEMA_REGISTRY_H
diff --git a/pxr/usd/usd/shared.cpp b/pxr/usd/usd/shared.cpp
index b7e832e43f..aa14f1d407 100644
--- a/pxr/usd/usd/shared.cpp
+++ b/pxr/usd/usd/shared.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/shared.h"
diff --git a/pxr/usd/usd/shared.h b/pxr/usd/usd/shared.h
index 3369c0555f..4c8c8ec4d0 100644
--- a/pxr/usd/usd/shared.h
+++ b/pxr/usd/usd/shared.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHARED_H
 #define PXR_USD_USD_SHARED_H
diff --git a/pxr/usd/usd/specializes.cpp b/pxr/usd/usd/specializes.cpp
index 997cabe23a..4641aef8e6 100644
--- a/pxr/usd/usd/specializes.cpp
+++ b/pxr/usd/usd/specializes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/common.h"
diff --git a/pxr/usd/usd/specializes.h b/pxr/usd/usd/specializes.h
index 4807ebca38..f021500c8e 100644
--- a/pxr/usd/usd/specializes.h
+++ b/pxr/usd/usd/specializes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SPECIALIZES_H
 #define PXR_USD_USD_SPECIALIZES_H
diff --git a/pxr/usd/usd/stage.cpp b/pxr/usd/usd/stage.cpp
index a6cfe51fc8..2f99cc693c 100644
--- a/pxr/usd/usd/stage.cpp
+++ b/pxr/usd/usd/stage.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/stage.h"
@@ -343,20 +326,29 @@ _MapPathExpressionToPrim(
     
     auto mapPattern =
         [&stack, &map, &unmappedPatterns](PathPattern const &pattern) {
-        SdfPath mapped = map(pattern.GetPrefix());
-        // If the prefix path is outside the domain, push the Nothing()
-        // subexpression.
-        if (mapped.IsEmpty()) {
-            if (unmappedPatterns) {
-                unmappedPatterns->push_back(pattern);
-            }
-            stack.push_back(SdfPathExpression::Nothing());
+        // If the pattern starts with '//' we persist it unchanged, as we deem
+        // the intent to be "search everything" regardless of context.  This is
+        // as opposed to any kind of non-speculative prefix, which refers to a
+        // specific prim or property in the originating context.
+        if (pattern.HasLeadingStretch()) {
+            stack.push_back(SdfPathExpression::MakeAtom(pattern));
         }
-        // Otherwise push the mapped pattern.
         else {
-            PathPattern mappedPattern(pattern);
-            mappedPattern.SetPrefix(mapped);
-            stack.push_back(PathExpr::MakeAtom(mappedPattern));
+            SdfPath mapped = map(pattern.GetPrefix());
+            // If the prefix path is outside the domain, push the Nothing()
+            // subexpression.
+            if (mapped.IsEmpty()) {
+                if (unmappedPatterns) {
+                    unmappedPatterns->push_back(pattern);
+                }
+                stack.push_back(SdfPathExpression::Nothing());
+            }
+            // Otherwise push the mapped pattern.
+            else {
+                PathPattern mappedPattern(pattern);
+                mappedPattern.SetPrefix(mapped);
+                stack.push_back(PathExpr::MakeAtom(mappedPattern));
+            }
         }
     };
 
@@ -2118,16 +2110,20 @@ UsdStage::GetPseudoRoot() const
 UsdPrim
 UsdStage::GetDefaultPrim() const
 {
-    TfToken name = GetRootLayer()->GetDefaultPrim();
-    return SdfPath::IsValidIdentifier(name)
-        ? GetPrimAtPath(SdfPath::AbsoluteRootPath().AppendChild(name))
-        : UsdPrim();
+    SdfPath path = GetRootLayer()->GetDefaultPrimAsPath();
+    return path.IsEmpty() 
+        ? UsdPrim()
+        : GetPrimAtPath(path);
 }
 
 void
 UsdStage::SetDefaultPrim(const UsdPrim &prim)
 {
-    GetRootLayer()->SetDefaultPrim(prim.GetName());
+    if (prim){
+        prim.GetParent() == GetPseudoRoot()
+            ? GetRootLayer()->SetDefaultPrim(prim.GetName())
+            : GetRootLayer()->SetDefaultPrim(prim.GetPath().GetAsToken());
+    }
 }
 
 void
@@ -3880,6 +3876,27 @@ UsdStage::GetPathResolverContext() const
     return _GetPcpCache()->GetLayerStackIdentifier().pathResolverContext;
 }
 
+PcpErrorVector 
+UsdStage::GetCompositionErrors() const
+{
+    PcpErrorVector errors;
+
+    auto _ExtractErrorsFromPrimIndices = [&errors](
+        const PcpPrimIndex &primIndex) {
+            const PcpErrorVector &localErrors = primIndex.GetLocalErrors();
+            errors.insert(errors.end(), localErrors.begin(), localErrors.end());
+    };
+    _GetPcpCache()->ForEachPrimIndex(_ExtractErrorsFromPrimIndices);
+
+    auto _ExtractErrorsFromPcpLayerStack = [&errors](
+        const PcpLayerStackPtr layerStackPtr) {
+            const PcpErrorVector &localErrors = layerStackPtr->GetLocalErrors();
+            errors.insert(errors.end(), localErrors.begin(), localErrors.end());
+    };
+    _GetPcpCache()->ForEachLayerStack(_ExtractErrorsFromPcpLayerStack);
+    return errors;
+}
+
 SdfLayerHandleVector
 UsdStage::GetLayerStack(bool includeSessionLayers) const
 {
@@ -9501,7 +9518,7 @@ double
 UsdStage::GetEndTimeCode() const
 {
     // Look for 'endTimeCode' first. If it is not available, then look for 
-    // the deprecated field 'startFrame'.
+    // the deprecated field 'endFrame'.
     const SdfLayerConstHandle sessionLayer = GetSessionLayer();
     if (sessionLayer) {
         if (sessionLayer->HasEndTimeCode())
diff --git a/pxr/usd/usd/stage.h b/pxr/usd/usd/stage.h
index a1d0a991fe..5b0a9f94da 100644
--- a/pxr/usd/usd/stage.h
+++ b/pxr/usd/usd/stage.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_STAGE_H
 #define PXR_USD_USD_STAGE_H
@@ -727,22 +710,27 @@ class UsdStage : public TfRefBase, public TfWeakBase {
     USD_API
     UsdPrim GetPseudoRoot() const;
 
-    /// Return the root UsdPrim on this stage whose name is the root layer's
+    /// Return the UsdPrim on this stage whose path is the root layer's
     /// defaultPrim metadata's value.  Return an invalid prim if there is no
     /// such prim or if the root layer's defaultPrim metadata is unset or is not
-    /// a valid prim name.  Note that this function only examines this stage's
-    /// rootLayer.  It does not consider sublayers of the rootLayer.  See also
-    /// SdfLayer::GetDefaultPrim().
+    /// a valid prim path.  Note that this function will return the prim on the 
+    /// stage whose path is the root layer's GetDefaultPrimAsPath() if that path
+    /// is not empty and a prim at that path exists on the stage. 
+    /// See also SdfLayer::GetDefaultPrimAsPath().
     USD_API
     UsdPrim GetDefaultPrim() const;
 
-    /// Set the default prim layer metadata in this stage's root layer.  This is
-    /// shorthand for:
+    /// Set the default prim layer metadata in this stage's root layer. This
+    /// is shorthand for:
     /// \code
     /// stage->GetRootLayer()->SetDefaultPrim(prim.GetName());
     /// \endcode
-    /// Note that this function always authors to the stage's root layer.  To
-    /// author to a different layer, use the SdfLayer::SetDefaultPrim() API.
+    /// If prim is a root prim, otherwise
+    /// \code
+    /// stage->GetRootLayer()->SetDefaultPrim(prim.GetPath().GetAsToken());
+    /// \endcode
+    /// Note that this function always authors to the stage's root layer.
+    /// To author to a different layer, use the SdfLayer::SetDefaultPrim() API.
     USD_API
     void SetDefaultPrim(const UsdPrim &prim);
     
@@ -1014,7 +1002,11 @@ class UsdStage : public TfRefBase, public TfWeakBase {
     std::string
     ResolveIdentifierToEditTarget(std::string const &identifier) const;
 
-    /// Return this stage's local layers in strong-to-weak order.  If
+    /// Return a PcpErrorVector containing all composition errors encountered 
+    /// when composing the prims and layer stacks on this stage.
+    USD_API
+    PcpErrorVector GetCompositionErrors() const;
+
     /// \a includeSessionLayers is true, return the linearized strong-to-weak
     /// sublayers rooted at the stage's session layer followed by the linearized
     /// strong-to-weak sublayers rooted at this stage's root layer.  If
diff --git a/pxr/usd/usd/stageCache.cpp b/pxr/usd/usd/stageCache.cpp
index edaafbd7f9..b38c265bac 100644
--- a/pxr/usd/usd/stageCache.cpp
+++ b/pxr/usd/usd/stageCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/stageCache.h"
diff --git a/pxr/usd/usd/stageCache.h b/pxr/usd/usd/stageCache.h
index 09c91a8ffd..28b29a76f4 100644
--- a/pxr/usd/usd/stageCache.h
+++ b/pxr/usd/usd/stageCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_STAGE_CACHE_H
 #define PXR_USD_USD_STAGE_CACHE_H
diff --git a/pxr/usd/usd/stageCacheContext.cpp b/pxr/usd/usd/stageCacheContext.cpp
index 80599ab6df..b88cab402e 100644
--- a/pxr/usd/usd/stageCacheContext.cpp
+++ b/pxr/usd/usd/stageCacheContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/stageCacheContext.h"
diff --git a/pxr/usd/usd/stageCacheContext.h b/pxr/usd/usd/stageCacheContext.h
index efa17fe093..7bbf266a85 100644
--- a/pxr/usd/usd/stageCacheContext.h
+++ b/pxr/usd/usd/stageCacheContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_STAGE_CACHE_CONTEXT_H
 #define PXR_USD_USD_STAGE_CACHE_CONTEXT_H
diff --git a/pxr/usd/usd/stageLoadRules.cpp b/pxr/usd/usd/stageLoadRules.cpp
index 7ee24a709e..44f052f069 100644
--- a/pxr/usd/usd/stageLoadRules.cpp
+++ b/pxr/usd/usd/stageLoadRules.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/stageLoadRules.h"
diff --git a/pxr/usd/usd/stageLoadRules.h b/pxr/usd/usd/stageLoadRules.h
index 2a641ec264..502338f8d4 100644
--- a/pxr/usd/usd/stageLoadRules.h
+++ b/pxr/usd/usd/stageLoadRules.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_USD_STAGE_LOAD_RULES_H
diff --git a/pxr/usd/usd/stagePopulationMask.cpp b/pxr/usd/usd/stagePopulationMask.cpp
index 0d67c0b5ba..2e720f3c53 100644
--- a/pxr/usd/usd/stagePopulationMask.cpp
+++ b/pxr/usd/usd/stagePopulationMask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/stagePopulationMask.h"
diff --git a/pxr/usd/usd/stagePopulationMask.h b/pxr/usd/usd/stagePopulationMask.h
index 02f50111d6..56e45bb7a9 100644
--- a/pxr/usd/usd/stagePopulationMask.h
+++ b/pxr/usd/usd/stagePopulationMask.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_STAGE_POPULATION_MASK_H
 #define PXR_USD_USD_STAGE_POPULATION_MASK_H
diff --git a/pxr/usd/usd/testenv/TestUsdProceduralExternalAssetsFileFormatPlugin.cpp b/pxr/usd/usd/testenv/TestUsdProceduralExternalAssetsFileFormatPlugin.cpp
index af3b411351..4f1be0272c 100644
--- a/pxr/usd/usd/testenv/TestUsdProceduralExternalAssetsFileFormatPlugin.cpp
+++ b/pxr/usd/usd/testenv/TestUsdProceduralExternalAssetsFileFormatPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usd/testenv/TestUsdResolverChangedResolver.cpp b/pxr/usd/usd/testenv/TestUsdResolverChangedResolver.cpp
index defe4827a3..588c80e7f3 100644
--- a/pxr/usd/usd/testenv/TestUsdResolverChangedResolver.cpp
+++ b/pxr/usd/usd/testenv/TestUsdResolverChangedResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usd/testenv/TestUsdResolverChangedResolver.h b/pxr/usd/usd/testenv/TestUsdResolverChangedResolver.h
index 370e78a47b..6658fb8469 100644
--- a/pxr/usd/usd/testenv/TestUsdResolverChangedResolver.h
+++ b/pxr/usd/usd/testenv/TestUsdResolverChangedResolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_TEST_USD_RESOLVER_CHANGED_RESOLVER_H
 #define PXR_USD_USD_TEST_USD_RESOLVER_CHANGED_RESOLVER_H
diff --git a/pxr/usd/usd/testenv/testUsdAppliedAPISchemas.py b/pxr/usd/usd/testenv/testUsdAppliedAPISchemas.py
index b65e3bcecd..4a9ba6f9bd 100644
--- a/pxr/usd/usd/testenv/testUsdAppliedAPISchemas.py
+++ b/pxr/usd/usd/testenv/testUsdAppliedAPISchemas.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, unittest
 from pxr import Plug, Sdf, Usd, Vt, Tf, Gf
diff --git a/pxr/usd/usd/testenv/testUsdAttributeBlocking.cpp b/pxr/usd/usd/testenv/testUsdAttributeBlocking.cpp
index e8de695cf9..6018e41871 100644
--- a/pxr/usd/usd/testenv/testUsdAttributeBlocking.cpp
+++ b/pxr/usd/usd/testenv/testUsdAttributeBlocking.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdAttributeBlocking.py b/pxr/usd/usd/testenv/testUsdAttributeBlocking.py
index 10f7c6381b..a4c5a58601 100644
--- a/pxr/usd/usd/testenv/testUsdAttributeBlocking.py
+++ b/pxr/usd/usd/testenv/testUsdAttributeBlocking.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd 
 
diff --git a/pxr/usd/usd/testenv/testUsdAttributeConnections.py b/pxr/usd/usd/testenv/testUsdAttributeConnections.py
index 17af6dc6e8..9f379a8396 100644
--- a/pxr/usd/usd/testenv/testUsdAttributeConnections.py
+++ b/pxr/usd/usd/testenv/testUsdAttributeConnections.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Sdf, Tf, Usd
diff --git a/pxr/usd/usd/testenv/testUsdAttributeInterpolationCpp.cpp b/pxr/usd/usd/testenv/testUsdAttributeInterpolationCpp.cpp
index 73fe0b05f1..0f86f1d7d2 100644
--- a/pxr/usd/usd/testenv/testUsdAttributeInterpolationCpp.cpp
+++ b/pxr/usd/usd/testenv/testUsdAttributeInterpolationCpp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdAttributeQuery.py b/pxr/usd/usd/testenv/testUsdAttributeQuery.py
index 366aae65a1..0c2a958360 100644
--- a/pxr/usd/usd/testenv/testUsdAttributeQuery.py
+++ b/pxr/usd/usd/testenv/testUsdAttributeQuery.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import contextlib
 import unittest
diff --git a/pxr/usd/usd/testenv/testUsdBug119633.py b/pxr/usd/usd/testenv/testUsdBug119633.py
index f75967b0b1..299f1fbec2 100644
--- a/pxr/usd/usd/testenv/testUsdBug119633.py
+++ b/pxr/usd/usd/testenv/testUsdBug119633.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdBug141491.py b/pxr/usd/usd/testenv/testUsdBug141491.py
index 1f825c808a..bc208751f5 100644
--- a/pxr/usd/usd/testenv/testUsdBug141491.py
+++ b/pxr/usd/usd/testenv/testUsdBug141491.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdBugs.py b/pxr/usd/usd/testenv/testUsdBugs.py
index 7d68c5cb32..630438261a 100644
--- a/pxr/usd/usd/testenv/testUsdBugs.py
+++ b/pxr/usd/usd/testenv/testUsdBugs.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import division
 
diff --git a/pxr/usd/usd/testenv/testUsdChangeProcessing.py b/pxr/usd/usd/testenv/testUsdChangeProcessing.py
index 8a9fd34e60..0d04c8cf85 100644
--- a/pxr/usd/usd/testenv/testUsdChangeProcessing.py
+++ b/pxr/usd/usd/testenv/testUsdChangeProcessing.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdClasses.py b/pxr/usd/usd/testenv/testUsdClasses.py
index 3df422cf75..7eea527b9c 100644
--- a/pxr/usd/usd/testenv/testUsdClasses.py
+++ b/pxr/usd/usd/testenv/testUsdClasses.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, Tf
 import unittest
diff --git a/pxr/usd/usd/testenv/testUsdCollectionAPI.py b/pxr/usd/usd/testenv/testUsdCollectionAPI.py
index a623dff4cb..8e321bacd2 100644
--- a/pxr/usd/usd/testenv/testUsdCollectionAPI.py
+++ b/pxr/usd/usd/testenv/testUsdCollectionAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=dict-keys-not-iterating
 
@@ -57,6 +40,45 @@ def tearDown(self):
         stage.Reload()
         pass
 
+    def checkQuery(self, mquery, stage, verbose=False):
+        # Cross-check the mquery between ComputeIncludedPathsFromCollection(),
+        # IsPathIncluded(), and the expression produced by
+        # ComputePathExpressionFromCollectionMembershipQueryRuleMap().
+
+        # Compute includes from the membership query.
+        includes = set(Usd.ComputeIncludedPathsFromCollection(
+            query=mquery, stage=stage))
+        
+        # Fetch all paths from the stage, then cross-check.
+        allPaths = set()
+        for prim in stage.Traverse():
+            allPaths.add(prim.GetPath())
+            allPaths.update([prop.GetPath() for prop in prim.GetProperties()])
+
+        # Check all paths with query.IsPathIncluded() API.
+        for path in allPaths:
+            if path in includes:
+                self.assertTrue(mquery.IsPathIncluded(path),
+                                msg='query should include {}'.format(path))
+            else:
+                self.assertFalse(mquery.IsPathIncluded(path),
+                                 msg='query should exclude {}'.format(path))
+
+        # Get path expression.
+        pathExpr = \
+            Usd.ComputePathExpressionFromCollectionMembershipQueryRuleMap(
+                mquery.GetAsPathExpansionRuleMap())
+
+        # Check all paths against expression Match() API.
+        matchEval = Sdf._MakeBasicMatchEval(pathExpr.GetText())
+        for path in allPaths:
+            if path in includes:
+                self.assertTrue(matchEval.Match(path),
+                                msg='expr should match {}'.format(path))
+            else:
+                self.assertFalse(matchEval.Match(path),
+                                 msg='expr should not match {}'.format(path))
+
     def test_AuthorCollections(self):
         # ----------------------------------------------------------
         # Test an explicitOnly collection.
@@ -104,6 +126,7 @@ def test_AuthorCollections(self):
         explicitColl.GetIncludesRel().AddTarget(cone.GetPath())
 
         explicitCollMquery = explicitColl.ComputeMembershipQuery()
+        self.checkQuery(explicitCollMquery, stage)
 
         explicitCollIncObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 explicitCollMquery, stage)
@@ -125,6 +148,7 @@ def test_AuthorCollections(self):
         # We have to recompute the membership map if we add or remove 
         # includes/excludes targets.
         explicitCollMquery = explicitColl.ComputeMembershipQuery()
+        self.checkQuery(explicitCollMquery, stage)
 
         # Ensure that the cone is excluded.
         self.assertFalse(explicitCollMquery.IsPathIncluded(cone.GetPath()))
@@ -137,6 +161,7 @@ def test_AuthorCollections(self):
                 "testExpandPrimsColl")
         expandPrimsColl.CreateIncludesRel().AddTarget(geom.GetPath())
         expandPrimsCollMquery = expandPrimsColl.ComputeMembershipQuery()
+        self.checkQuery(expandPrimsCollMquery, stage)
         
         expandPrimCollIncObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 expandPrimsCollMquery, stage)
@@ -155,6 +180,7 @@ def test_AuthorCollections(self):
             Sdf.Path("/Collection/Materials/Plastic"))
 
         expandPrimsCollMquery = expandPrimsColl.ComputeMembershipQuery()
+        self.checkQuery(expandPrimsCollMquery, stage)
         expandPrimCollIncObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 expandPrimsCollMquery, stage, Usd.TraverseInstanceProxies())
         self.assertEqual(len(expandPrimCollIncObjects), 4)
@@ -171,6 +197,7 @@ def test_AuthorCollections(self):
         expandPrimsAndPropertiesColl.CreateIncludesRel().AddTarget(
                 shapes.GetPath())
         expandPnPCollMquery = expandPrimsAndPropertiesColl.ComputeMembershipQuery()
+        self.checkQuery(expandPnPCollMquery, stage)
         expandPnPCollObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 expandPnPCollMquery, stage)
 
@@ -192,6 +219,7 @@ def test_AuthorCollections(self):
             explicitColl.GetCollectionPath())
 
         combinedMquery = combinedColl.ComputeMembershipQuery()
+        self.checkQuery(combinedMquery, stage)
 
         combinedCollIncObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 combinedMquery, stage)
@@ -205,9 +233,10 @@ def test_AuthorCollections(self):
         # exludes "Shapes", but is weaker than the "expandPrimsAndProperties" 
         # collection.
         combinedColl.CreateIncludesRel().AddTarget(
-            expandPrimsColl.GetCollectionPath(), position=Usd.ListPositionBackOfAppendList)
+            expandPrimsColl.GetCollectionPath(),
+            position=Usd.ListPositionBackOfAppendList)
         combinedMquery = combinedColl.ComputeMembershipQuery()
-        
+        self.checkQuery(combinedMquery, stage)
         combinedCollIncObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 combinedMquery, stage)
 
@@ -229,6 +258,7 @@ def test_testIncludeAndExcludePath(self):
         self.assertTrue(geomCollection.ExcludePath(sphere.GetPath()))
 
         query = geomCollection.ComputeMembershipQuery()
+        self.checkQuery(query, stage)
         self.assertTrue(query.IsPathIncluded(cylinder.GetPath()))
         self.assertTrue(query.IsPathIncluded(cube.GetPath()))
         self.assertFalse(query.IsPathIncluded(sphere.GetPath()))
@@ -245,6 +275,7 @@ def test_testIncludeAndExcludePath(self):
         # Every time we call IncludePath() or ExcludePath(), we must recompute 
         # the MembershipQuery object.
         query = geomCollection.ComputeMembershipQuery()
+        self.checkQuery(query, stage)
         self.assertFalse(query.IsPathIncluded(sphere.GetPath()))
         self.assertFalse(query.IsPathIncluded(hemiSphere1.GetPath()))
         self.assertTrue(query.IsPathIncluded(hemiSphere2.GetPath()))
@@ -253,6 +284,7 @@ def test_testIncludeAndExcludePath(self):
         self.assertTrue(geomCollection.IncludePath(sphere.GetPath()))
 
         query = geomCollection.ComputeMembershipQuery()
+        self.checkQuery(query, stage)
         self.assertTrue(query.IsPathIncluded(sphere.GetPath()))
         self.assertTrue(query.IsPathIncluded(hemiSphere1.GetPath()))
         self.assertTrue(query.IsPathIncluded(hemiSphere2.GetPath()))
@@ -268,6 +300,7 @@ def test_testIncludeAndExcludePath(self):
         includeRootTest.IncludePath('/')
         includeRootTest.ExcludePath(geom.GetPath())
         query = includeRootTest.ComputeMembershipQuery()
+        self.checkQuery(query, stage)
         self.assertTrue(query.IsPathIncluded(testPrim.GetPath()))
         self.assertFalse(query.IsPathIncluded(geom.GetPath()))
         self.assertFalse(query.IsPathIncluded(box.GetPath()))
@@ -276,6 +309,7 @@ def test_testIncludeAndExcludePath(self):
         # a path under the excluded Geom scope.
         includeRootTest.IncludePath(box.GetPath())
         query = includeRootTest.ComputeMembershipQuery()
+        self.checkQuery(query, stage)
         self.assertTrue(query.IsPathIncluded(testPrim.GetPath()))
         self.assertFalse(query.IsPathIncluded(geom.GetPath()))
         self.assertTrue(query.IsPathIncluded(box.GetPath()))
@@ -312,6 +346,7 @@ def test_testReadCollection(self):
             leafGeom.GetIncludesRel().GetPath()))
 
         leafGeomMquery = leafGeom.ComputeMembershipQuery()
+        self.checkQuery(leafGeomMquery, stage)
         self.assertEqual(leafGeomMquery.GetIncludedCollections(), [])
         self.assertEqual(
             len(Usd.CollectionAPI.ComputeIncludedObjects(leafGeomMquery,
@@ -330,6 +365,7 @@ def test_testReadCollection(self):
         allGeom = Usd.CollectionAPI(testPrim, "allGeom")
         (valid, reason) = allGeom.Validate()
         allGeomMquery = allGeom.ComputeMembershipQuery()
+        self.checkQuery(allGeomMquery, stage)
         self.assertEqual(allGeomMquery.GetIncludedCollections(), [])
         self.assertEqual(len(Usd.CollectionAPI.ComputeIncludedObjects(
                 allGeomMquery,stage)), 9)
@@ -342,6 +378,7 @@ def test_testReadCollection(self):
         allGeomProperties = Usd.CollectionAPI(testPrim, "allGeomProperties")
         (valid, reason) = allGeomProperties.Validate()
         allGeomPropertiesMquery = allGeomProperties.ComputeMembershipQuery()
+        self.checkQuery(allGeomPropertiesMquery, stage)
         self.assertEqual(allGeomPropertiesMquery.GetIncludedCollections(), [])
         self.assertEqual(len(Usd.CollectionAPI.ComputeIncludedObjects(
                 allGeomPropertiesMquery, stage)), 33)
@@ -350,6 +387,7 @@ def test_testReadCollection(self):
         (valid, reason) = hasRels.Validate()
         self.assertTrue(valid)
         hasRelsMquery = hasRels.ComputeMembershipQuery()
+        self.checkQuery(hasRelsMquery, stage)
         self.assertEqual(hasRelsMquery.GetIncludedCollections(), [])
         incObjects = Usd.CollectionAPI.ComputeIncludedObjects(hasRelsMquery, stage)
         for obj in incObjects: 
@@ -359,6 +397,7 @@ def test_testReadCollection(self):
         (valid, reason) = hasInstanceProxy.Validate()
         self.assertTrue(valid)
         hasInstanceProxyMquery = hasInstanceProxy.ComputeMembershipQuery()
+        self.checkQuery(hasInstanceProxyMquery, stage)
         self.assertEqual(hasInstanceProxyMquery.GetIncludedCollections(), [])
         incObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 hasInstanceProxyMquery, stage)
@@ -371,6 +410,7 @@ def test_testReadCollection(self):
         (valid, reason) = coneProperties.Validate()
         self.assertTrue(valid)
         conePropertiesMquery = coneProperties.ComputeMembershipQuery()
+        self.checkQuery(conePropertiesMquery, stage)
         self.assertEqual(conePropertiesMquery.GetIncludedCollections(), [])
         incObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 conePropertiesMquery, stage)
@@ -382,6 +422,7 @@ def test_testReadCollection(self):
         (valid, reason) = includesCollection.Validate()
         self.assertTrue(valid)
         includesCollectionMquery = includesCollection.ComputeMembershipQuery()
+        self.checkQuery(includesCollectionMquery, stage)
         self.assertEqual(
             set(includesCollectionMquery.GetIncludedCollections()),
             set([Sdf.Path("/CollectionTest/Geom/Shapes.collection:allShapes")]))
@@ -396,6 +437,7 @@ def test_testReadCollection(self):
         self.assertTrue(valid)
         includesNestedCollectionMquery = \
             includesNestedCollection.ComputeMembershipQuery()
+        self.checkQuery(includesNestedCollectionMquery, stage)
         self.assertEqual(
             set(includesNestedCollectionMquery.GetIncludedCollections()),
             set([Sdf.Path("/CollectionTest/Geom/Shapes.collection:allShapes"),
@@ -405,6 +447,7 @@ def test_testReadCollection(self):
         (valid, reason) = excludeInstanceGeom.Validate()
         self.assertTrue(valid)
         excludeInstanceGeomMquery = excludeInstanceGeom.ComputeMembershipQuery()
+        self.checkQuery(excludeInstanceGeomMquery, stage)
         self.assertEqual(excludeInstanceGeomMquery.GetIncludedCollections(), [])
         incObjects = Usd.CollectionAPI.ComputeIncludedObjects(
                 excludeInstanceGeomMquery, stage)
@@ -458,6 +501,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryA = collectionA.ComputeMembershipQuery()
+        self.checkQuery(mqueryA, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryA, stage)), 0)
         self.assertEqual(mqueryA.GetIncludedCollections(),
                          [collectionB.GetCollectionPath(),
@@ -467,6 +511,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryB = collectionB.ComputeMembershipQuery()
+        self.checkQuery(mqueryB, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryB, stage)), 0)
         self.assertEqual(mqueryB.GetIncludedCollections(),
                          [collectionA.GetCollectionPath(),
@@ -476,6 +521,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryC = collectionC.ComputeMembershipQuery()
+        self.checkQuery(mqueryC, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryC, stage)), 0)
         self.assertEqual(mqueryC.GetIncludedCollections(),
                          [collectionA.GetCollectionPath(),
@@ -486,6 +532,7 @@ def test_CircularDependency(self):
         collectionA.CreateIncludesRel().AddTarget(
             collectionD.GetCollectionPath())
         mqueryA = collectionA.ComputeMembershipQuery()
+        self.checkQuery(mqueryA, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryA, stage)), 9)
         self.assertEqual(mqueryA.GetIncludedCollections(),
                          [collectionB.GetCollectionPath(),
@@ -493,6 +540,7 @@ def test_CircularDependency(self):
                           collectionD.GetCollectionPath()])
 
         mqueryB = collectionB.ComputeMembershipQuery()
+        self.checkQuery(mqueryB, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryB, stage)), 9)
         self.assertEqual(mqueryB.GetIncludedCollections(),
                          [collectionA.GetCollectionPath(),
@@ -500,6 +548,7 @@ def test_CircularDependency(self):
                           collectionD.GetCollectionPath()])
 
         mqueryC = collectionC.ComputeMembershipQuery()
+        self.checkQuery(mqueryC, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryC, stage)), 9)
         self.assertEqual(mqueryC.GetIncludedCollections(),
                          [collectionA.GetCollectionPath(),
@@ -518,6 +567,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryA = collectionA.ComputeMembershipQuery()
+        self.checkQuery(mqueryA, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryA, stage)), 0)
         self.assertEqual(mqueryA.GetIncludedCollections(),
                          [collectionB.GetCollectionPath(),
@@ -527,6 +577,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryB = collectionB.ComputeMembershipQuery()
+        self.checkQuery(mqueryB, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryB, stage)), 0)
         self.assertEqual(mqueryB.GetIncludedCollections(),
                          [collectionC.GetCollectionPath()])
@@ -535,6 +586,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryC = collectionC.ComputeMembershipQuery()
+        self.checkQuery(mqueryC, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryC, stage)), 0)
         self.assertEqual(mqueryC.GetIncludedCollections(),
                          [collectionB.GetCollectionPath()])
@@ -548,6 +600,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryA = collectionA.ComputeMembershipQuery()
+        self.checkQuery(mqueryA, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryA, stage)), 0)
         self.assertEqual(mqueryA.GetIncludedCollections(),
                          [collectionB.GetCollectionPath()])
@@ -556,6 +609,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryB = collectionB.ComputeMembershipQuery()
+        self.checkQuery(mqueryB, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryB, stage)), 0)
         self.assertEqual(mqueryB.GetIncludedCollections(), 
                          [])
@@ -569,6 +623,7 @@ def test_CircularDependency(self):
         self.assertFalse(valid)
         self.assertTrue('circular' in reason)
         mqueryA = collectionA.ComputeMembershipQuery()
+        self.checkQuery(mqueryA, stage)
         self.assertEqual(len(ComputeIncObjs(mqueryA, stage)), 0)
         self.assertEqual(mqueryA.GetIncludedCollections(),
                          [])
@@ -599,11 +654,13 @@ def test_CollectionEquivalence(self):
         collections = Usd.CollectionAPI.GetAll(testPrim)
         self.assertTrue(len(collections) > 1)
 
-        # Each of their membership queries should be equal to itself,
-        # and unequal to the others.  Same for their hashes -- although
-        # note that the hashes are not, in general, guaranteed to be
-        # distinct due to the pigeonhole principle.
+        # Each of their membership queries should be equal to itself, and
+        # unequal to the others.  Same for their hashes -- although note that
+        # the hashes are not, in general, guaranteed to be distinct due to the
+        # pigeonhole principle.  Queries that do not use the rule map (i.e. they
+        # use a membershipExpression) do not compare or hash equal.
         mqueries = [c.ComputeMembershipQuery() for c in collections]
+        mqueries = [q for q in mqueries if q.UsesPathExpansionRuleMap()]
         for i in range(len(mqueries)):
             for j in range(i, len(mqueries)):
                 if i == j:
@@ -690,6 +747,55 @@ def test_ExplicitOnlyAndIncludeRoot(self):
         self.assertEqual(
             Usd.ComputeIncludedPathsFromCollection(query, stage), [])
 
+    def test_MembershipExpressions(self):
+        withMembershipExpr = Usd.CollectionAPI.Get(
+            testPrim, 'withMembershipExpr')
+
+        query = withMembershipExpr.ComputeMembershipQuery()
+        self.assertFalse(query.UsesPathExpansionRuleMap())
+
+        self.assertEqual(
+            Usd.ComputeIncludedPathsFromCollection(query, stage),
+            [Sdf.Path('/CollectionTest/Geom/Box'),
+             Sdf.Path('/CollectionTest/Geom/Shapes/Cone'),
+             Sdf.Path('/CollectionTest/Geom/Shapes/Cube'),
+             Sdf.Path('/CollectionTest/Geom/Shapes/Cylinder'),
+             Sdf.Path('/CollectionTest/Geom/Shapes/Sphere/Hemisphere1'),
+             Sdf.Path('/CollectionTest/Geom/Shapes/Sphere/Hemisphere2')])
+
+        # Test ResolveCompleteMembershipExpression.
+        self.assertEqual(
+            withMembershipExpr.ResolveCompleteMembershipExpression(),
+            Sdf.PathExpression("/CollectionTest/Geom//C* //{model} //Box "
+                               "/CollectionTest/Geom/Shapes//H*"))
+
+        expressionRef = Usd.CollectionAPI.Get(
+            testPrim, 'expressionRef') 
+        query = expressionRef.ComputeMembershipQuery()
+        self.assertFalse(query.UsesPathExpansionRuleMap())
+        self.assertEqual(
+            Usd.ComputeIncludedPathsFromCollection(query, stage),
+            [Sdf.Path('/CollectionTest/Geom/Shapes/Sphere/Hemisphere1'),
+             Sdf.Path('/CollectionTest/Geom/Shapes/Sphere/Hemisphere2')])
+
+        # Test that `//` leading exprs translate across references.
+        srcStage = Usd.Stage.CreateInMemory()
+        dstStage = Usd.Stage.CreateInMemory()
+
+        src = srcStage.DefinePrim('/src')
+        dst = dstStage.DefinePrim('/dst')
+
+        dstCapi = Usd.CollectionAPI.Apply(dst, 'testRef')
+        dstCapi.GetMembershipExpressionAttr().Set(Sdf.PathExpression('//'))
+        
+        src.GetReferences().AddReference(
+            dstStage.GetRootLayer().identifier, '/dst')
+
+        srcCapi = Usd.CollectionAPI.Get(src, 'testRef')
+        self.assertTrue(srcCapi)
+        self.assertEqual(srcCapi.GetMembershipExpressionAttr().Get(),
+                         Sdf.PathExpression('//'))
+
     def test_HashMembershipQuery(self):
         self.assertEqual(
             hash(Usd.UsdCollectionMembershipQuery()),
diff --git a/pxr/usd/usd/testenv/testUsdCollectionAPI/Test.usda b/pxr/usd/usd/testenv/testUsdCollectionAPI/Test.usda
index 2883220dec..56c02a714e 100644
--- a/pxr/usd/usd/testenv/testUsdCollectionAPI/Test.usda
+++ b/pxr/usd/usd/testenv/testUsdCollectionAPI/Test.usda
@@ -7,7 +7,7 @@
 
 def "CollectionTest" (
     kind = "prop"
-    prepend apiSchemas = ["CollectionAPI:leafGeom", "CollectionAPI:allGeom", "CollectionAPI:allGeomProperties", "CollectionAPI:hasRelationships", "CollectionAPI:hasInstanceProxy", "CollectionAPI:coneProperties", "CollectionAPI:includesCollection", "CollectionAPI:includesNestedCollection", "CollectionAPI:excludeInstanceGeom", "CollectionAPI:invalidExpansionRule", "CollectionAPI:invalidExcludesExplicitOnly", "CollectionAPI:invalidExcludesExpandPrims", "CollectionAPI:invalidTopLevelRules"]
+    prepend apiSchemas = ["CollectionAPI:leafGeom", "CollectionAPI:allGeom", "CollectionAPI:allGeomProperties", "CollectionAPI:hasRelationships", "CollectionAPI:hasInstanceProxy", "CollectionAPI:coneProperties", "CollectionAPI:includesCollection", "CollectionAPI:includesNestedCollection", "CollectionAPI:excludeInstanceGeom", "CollectionAPI:invalidExpansionRule", "CollectionAPI:invalidExcludesExplicitOnly", "CollectionAPI:invalidExcludesExpandPrims", "CollectionAPI:invalidTopLevelRules", "CollectionAPI:withMembershipExpr", "CollectionAPI:expressionRef"]
 )
 {
     # simple explicit collection
@@ -105,6 +105,10 @@ def "CollectionTest" (
     uniform token collection:explicitOnlyAndIncludeRoot:expansionRule = "explicitOnly"
     uniform bool collection:explicitOnlyAndIncludeRoot:includeRoot = true
 
+    pathExpression collection:withMembershipExpr:membershipExpression = "/CollectionTest/Geom//C* //{model} //Box %:expressionRef"
+
+    pathExpression collection:expressionRef:membershipExpression = "/CollectionTest/Geom/Shapes//H*"    
+    
     def "Geom" (
         prepend apiSchemas = ["CollectionAPI:allGeom"]
     )
diff --git a/pxr/usd/usd/testenv/testUsdCratePayloadConversionFromVersion07.py b/pxr/usd/usd/testenv/testUsdCratePayloadConversionFromVersion07.py
index 02ac9dcc5f..5f68277986 100644
--- a/pxr/usd/usd/testenv/testUsdCratePayloadConversionFromVersion07.py
+++ b/pxr/usd/usd/testenv/testUsdCratePayloadConversionFromVersion07.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest, shutil
 from pxr import Sdf, Usd
diff --git a/pxr/usd/usd/testenv/testUsdCrateRelocates.py b/pxr/usd/usd/testenv/testUsdCrateRelocates.py
index 3c1acd960f..52d05722ff 100644
--- a/pxr/usd/usd/testenv/testUsdCrateRelocates.py
+++ b/pxr/usd/usd/testenv/testUsdCrateRelocates.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2024 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest, shutil
 from pxr import Sdf, Usd
diff --git a/pxr/usd/usd/testenv/testUsdCreateAttributeCpp.cpp b/pxr/usd/usd/testenv/testUsdCreateAttributeCpp.cpp
index 020b171ba7..e487a1dd02 100644
--- a/pxr/usd/usd/testenv/testUsdCreateAttributeCpp.cpp
+++ b/pxr/usd/usd/testenv/testUsdCreateAttributeCpp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdCreateProperties.py b/pxr/usd/usd/testenv/testUsdCreateProperties.py
index 203853d535..48124a7acc 100644
--- a/pxr/usd/usd/testenv/testUsdCreateProperties.py
+++ b/pxr/usd/usd/testenv/testUsdCreateProperties.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=map-builtin-not-iterating
 
diff --git a/pxr/usd/usd/testenv/testUsdDataFormats.py b/pxr/usd/usd/testenv/testUsdDataFormats.py
index 2389ea2bf1..7795f1102a 100644
--- a/pxr/usd/usd/testenv/testUsdDataFormats.py
+++ b/pxr/usd/usd/testenv/testUsdDataFormats.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdEditTarget.py b/pxr/usd/usd/testenv/testUsdEditTarget.py
index 28ce0609ee..bbe3e609a8 100644
--- a/pxr/usd/usd/testenv/testUsdEditTarget.py
+++ b/pxr/usd/usd/testenv/testUsdEditTarget.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, sys, unittest
 from pxr import Gf, Tf, Sdf, Pcp, Usd
diff --git a/pxr/usd/usd/testenv/testUsdErrors.py b/pxr/usd/usd/testenv/testUsdErrors.py
index cded3ba162..1794ac007e 100644
--- a/pxr/usd/usd/testenv/testUsdErrors.py
+++ b/pxr/usd/usd/testenv/testUsdErrors.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 import sys, os, unittest
diff --git a/pxr/usd/usd/testenv/testUsdExternalAssetDependencies.py b/pxr/usd/usd/testenv/testUsdExternalAssetDependencies.py
index fb6806ddd4..bebaaa84da 100644
--- a/pxr/usd/usd/testenv/testUsdExternalAssetDependencies.py
+++ b/pxr/usd/usd/testenv/testUsdExternalAssetDependencies.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdFallbackPrimTypes.py b/pxr/usd/usd/testenv/testUsdFallbackPrimTypes.py
index 56e8e69ea7..c40e99a22b 100644
--- a/pxr/usd/usd/testenv/testUsdFallbackPrimTypes.py
+++ b/pxr/usd/usd/testenv/testUsdFallbackPrimTypes.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, unittest
 from pxr import Plug, Sdf, Usd, Vt, Tf
diff --git a/pxr/usd/usd/testenv/testUsdFileFormats.py b/pxr/usd/usd/testenv/testUsdFileFormats.py
index 5a5559bdc3..9b82883d8b 100644
--- a/pxr/usd/usd/testenv/testUsdFileFormats.py
+++ b/pxr/usd/usd/testenv/testUsdFileFormats.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import shutil, os, unittest
 from pxr import Sdf, Usd, Tf
diff --git a/pxr/usd/usd/testenv/testUsdFlatten.py b/pxr/usd/usd/testenv/testUsdFlatten.py
index 9b86b93ebd..ad440e9b2f 100644
--- a/pxr/usd/usd/testenv/testUsdFlatten.py
+++ b/pxr/usd/usd/testenv/testUsdFlatten.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=range-builtin-not-iterating
 
diff --git a/pxr/usd/usd/testenv/testUsdFlatten2.py b/pxr/usd/usd/testenv/testUsdFlatten2.py
index d60f966a3d..dd83ff9c94 100644
--- a/pxr/usd/usd/testenv/testUsdFlatten2.py
+++ b/pxr/usd/usd/testenv/testUsdFlatten2.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdFlattenLayerStack.py b/pxr/usd/usd/testenv/testUsdFlattenLayerStack.py
index fd95bdcf02..ced51a010d 100644
--- a/pxr/usd/usd/testenv/testUsdFlattenLayerStack.py
+++ b/pxr/usd/usd/testenv/testUsdFlattenLayerStack.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdFlattenProperties.py b/pxr/usd/usd/testenv/testUsdFlattenProperties.py
index 29f584b3c6..947822625a 100644
--- a/pxr/usd/usd/testenv/testUsdFlattenProperties.py
+++ b/pxr/usd/usd/testenv/testUsdFlattenProperties.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, unittest
 from pxr import Usd, Sdf, Tf, Plug
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/api.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/api.h
index 816f5a9fa2..3e803a9c9c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/api.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_API_H
 #define USDCONTRIVED_API_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/base.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/base.cpp
index eaa8f68a0a..dfe05f5429 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/base.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/base.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/base.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/base.h
index ccb1a07086..7e9b6bbd75 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/base.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/base.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_BASE_H
 #define USDCONTRIVED_GENERATED_BASE_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derived.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derived.cpp
index cffb49f3f3..6e24be010a 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derived.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derived.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/derived.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derived.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derived.h
index 7c19e75b71..87032e05d7 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derived.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derived.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_DERIVED_H
 #define USDCONTRIVED_GENERATED_DERIVED_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derivedNonAppliedAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derivedNonAppliedAPI.cpp
index 4463b5e60a..c7cc8e6c5f 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derivedNonAppliedAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derivedNonAppliedAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/derivedNonAppliedAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derivedNonAppliedAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derivedNonAppliedAPI.h
index 14a3ea3e5d..deeaaac0a8 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derivedNonAppliedAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/derivedNonAppliedAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_DERIVEDNONAPPLIEDAPI_H
 #define USDCONTRIVED_GENERATED_DERIVEDNONAPPLIEDAPI_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/emptyMultipleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/emptyMultipleApplyAPI.cpp
index 01b8182ff6..dcfad1cd55 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/emptyMultipleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/emptyMultipleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/emptyMultipleApplyAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/emptyMultipleApplyAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/emptyMultipleApplyAPI.h
index f40a92dc97..e027889f54 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/emptyMultipleApplyAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/emptyMultipleApplyAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_EMPTYMULTIPLEAPPLYAPI_H
 #define USDCONTRIVED_GENERATED_EMPTYMULTIPLEAPPLYAPI_H
@@ -65,7 +48,7 @@ class UsdContrivedEmptyMultipleApplyAPI : public UsdAPISchemaBase
     /// UsdContrivedEmptyMultipleApplyAPI::Get(
     ///    prim.GetStage(),
     ///    prim.GetPath().AppendProperty(
-    ///        "None:name"));
+    ///        ":name"));
     ///
     /// for a \em valid \p prim, but will not immediately throw an error for
     /// an invalid \p prim
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI.cpp
index 71a2560534..6a524be824 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/multipleApplyAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -28,8 +11,6 @@
 #include "pxr/usd/sdf/types.h"
 #include "pxr/usd/sdf/assetPath.h"
 
-#include "pxr/base/tf/staticTokens.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 // Register the schema with the TfType system.
@@ -40,11 +21,6 @@ TF_REGISTRY_FUNCTION(TfType)
     
 }
 
-TF_DEFINE_PRIVATE_TOKENS(
-    _schemaTokens,
-    (test)
-);
-
 /* virtual */
 UsdContrivedMultipleApplyAPI::~UsdContrivedMultipleApplyAPI()
 {
@@ -125,9 +101,9 @@ UsdContrivedMultipleApplyAPI::IsMultipleApplyAPIPath(
     }
 
     if (tokens.size() >= 2
-        && tokens[0] == _schemaTokens->test) {
+        && tokens[0] == UsdContrivedTokens->test) {
         *name = TfToken(propertyName.substr(
-            _schemaTokens->test.GetString().size() + 1));
+           UsdContrivedTokens->test.GetString().size() + 1));
         return true;
     }
 
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI.h
index 3f5d10182a..5de1fa9c60 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_MULTIPLEAPPLYAPI_H
 #define USDCONTRIVED_GENERATED_MULTIPLEAPPLYAPI_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI_1.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI_1.cpp
index 50f7a2e244..cec6f6e56a 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI_1.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/multipleApplyAPI_1.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -28,8 +11,6 @@
 #include "pxr/usd/sdf/types.h"
 #include "pxr/usd/sdf/assetPath.h"
 
-#include "pxr/base/tf/staticTokens.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 // Register the schema with the TfType system.
@@ -40,11 +21,6 @@ TF_REGISTRY_FUNCTION(TfType)
     
 }
 
-TF_DEFINE_PRIVATE_TOKENS(
-    _schemaTokens,
-    (testNewVersion)
-);
-
 /* virtual */
 UsdContrivedMultipleApplyAPI_1::~UsdContrivedMultipleApplyAPI_1()
 {
@@ -123,9 +99,9 @@ UsdContrivedMultipleApplyAPI_1::IsMultipleApplyAPI_1Path(
     }
 
     if (tokens.size() >= 2
-        && tokens[0] == _schemaTokens->testNewVersion) {
+        && tokens[0] == UsdContrivedTokens->testNewVersion) {
         *name = TfToken(propertyName.substr(
-            _schemaTokens->testNewVersion.GetString().size() + 1));
+           UsdContrivedTokens->testNewVersion.GetString().size() + 1));
         return true;
     }
 
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI_1.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI_1.h
index 3125aecce7..f7564713f8 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI_1.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/multipleApplyAPI_1.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_MULTIPLEAPPLYAPI_1_H
 #define USDCONTRIVED_GENERATED_MULTIPLEAPPLYAPI_1_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/nonAppliedAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/nonAppliedAPI.cpp
index a0c0f1eb51..a19a23596b 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/nonAppliedAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/nonAppliedAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/nonAppliedAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/nonAppliedAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/nonAppliedAPI.h
index 18ce3e7bb5..95c1a8d786 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/nonAppliedAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/nonAppliedAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_NONAPPLIEDAPI_H
 #define USDCONTRIVED_GENERATED_NONAPPLIEDAPI_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/publicMultipleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/publicMultipleApplyAPI.cpp
index 3bec69482b..2cecdb73a4 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/publicMultipleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/publicMultipleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/publicMultipleApplyAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -28,8 +11,6 @@
 #include "pxr/usd/sdf/types.h"
 #include "pxr/usd/sdf/assetPath.h"
 
-#include "pxr/base/tf/staticTokens.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 // Register the schema with the TfType system.
@@ -40,11 +21,6 @@ TF_REGISTRY_FUNCTION(TfType)
     
 }
 
-TF_DEFINE_PRIVATE_TOKENS(
-    _schemaTokens,
-    (testo)
-);
-
 /* virtual */
 UsdContrivedPublicMultipleApplyAPI::~UsdContrivedPublicMultipleApplyAPI()
 {
@@ -125,9 +101,9 @@ UsdContrivedPublicMultipleApplyAPI::IsPublicMultipleApplyAPIPath(
     }
 
     if (tokens.size() >= 2
-        && tokens[0] == _schemaTokens->testo) {
+        && tokens[0] == UsdContrivedTokens->testo) {
         *name = TfToken(propertyName.substr(
-            _schemaTokens->testo.GetString().size() + 1));
+           UsdContrivedTokens->testo.GetString().size() + 1));
         return true;
     }
 
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/publicMultipleApplyAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/publicMultipleApplyAPI.h
index 0535090dfc..5a9be34e63 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/publicMultipleApplyAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/publicMultipleApplyAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_PUBLICMULTIPLEAPPLYAPI_H
 #define USDCONTRIVED_GENERATED_PUBLICMULTIPLEAPPLYAPI_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI.cpp
index e6d0b59d53..aec11134a5 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI.h
index 184fb27360..b65eb53c3c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_H
 #define USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI_1.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI_1.cpp
index 1eb3a01591..0c898ae8e8 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI_1.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI_1.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI_1.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI_1.h
index 3be7b0cd60..4105a9972c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI_1.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/singleApplyAPI_1.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_1_H
 #define USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_1_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman.cpp
index 70122fc5aa..5aa07a82dd 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/testHairman.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman.h
index ac3779bff4..ffc4414a71 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_TESTHAIRMAN_H
 #define USDCONTRIVED_GENERATED_TESTHAIRMAN_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman_1.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman_1.cpp
index 4ed3d35ddb..ba485aa98c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman_1.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/testHairman_1.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman_1.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman_1.h
index cc37f852dc..cc517f7c49 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman_1.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testHairman_1.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_TESTHAIRMAN_1_H
 #define USDCONTRIVED_GENERATED_TESTHAIRMAN_1_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testNoVersion0_2.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testNoVersion0_2.cpp
index 92dd43e8bf..506fbc1a8b 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testNoVersion0_2.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testNoVersion0_2.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/testNoVersion0_2.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testNoVersion0_2.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testNoVersion0_2.h
index 750f690197..8ba1141a45 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testNoVersion0_2.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/testNoVersion0_2.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_TESTNOVERSION0_2_H
 #define USDCONTRIVED_GENERATED_TESTNOVERSION0_2_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/tokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/tokens.cpp
index 6ad91e530f..15c2541c23 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/tokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/tokens.h"
 
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/tokens.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/tokens.h
index de1d0c6974..be293e0378 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/tokens.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_TOKENS_H
 #define USDCONTRIVED_TOKENS_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapBase.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapBase.cpp
index 7b87a94a51..2850d93782 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapBase.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapDerived.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapDerived.cpp
index 8b677f311d..ffeae95c67 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapDerived.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapDerived.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/derived.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapDerivedNonAppliedAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapDerivedNonAppliedAPI.cpp
index e65bd8b046..c4d1a5574a 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapDerivedNonAppliedAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapDerivedNonAppliedAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/derivedNonAppliedAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapEmptyMultipleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapEmptyMultipleApplyAPI.cpp
index f5bf9b6ce1..f79904bf18 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapEmptyMultipleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapEmptyMultipleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/emptyMultipleApplyAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapMultipleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapMultipleApplyAPI.cpp
index 8c38ac2104..6351223adf 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapMultipleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapMultipleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/multipleApplyAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapMultipleApplyAPI_1.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapMultipleApplyAPI_1.cpp
index 9745005480..91285961c9 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapMultipleApplyAPI_1.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapMultipleApplyAPI_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/multipleApplyAPI_1.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapNonAppliedAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapNonAppliedAPI.cpp
index 0bf5e9b913..12396ae0cc 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapNonAppliedAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapNonAppliedAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/nonAppliedAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapPublicMultipleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapPublicMultipleApplyAPI.cpp
index e619187dd6..82a8e7680f 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapPublicMultipleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapPublicMultipleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/publicMultipleApplyAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapSingleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapSingleApplyAPI.cpp
index 7710701187..aed479a91f 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapSingleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapSingleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapSingleApplyAPI_1.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapSingleApplyAPI_1.cpp
index 04b40a0273..b090be89f4 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapSingleApplyAPI_1.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapSingleApplyAPI_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI_1.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestHairman.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestHairman.cpp
index 29212093d7..066dca36bd 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestHairman.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestHairman.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/testHairman.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestHairman_1.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestHairman_1.cpp
index 8b7afac01c..2b464c1f0b 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestHairman_1.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestHairman_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/testHairman_1.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestNoVersion0_2.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestNoVersion0_2.cpp
index 48ca01d98f..2f828518a8 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestNoVersion0_2.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTestNoVersion0_2.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/testNoVersion0_2.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTokens.cpp
index 504b0b1ee8..60abefd25e 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/basic/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/api.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/api.h
index 816f5a9fa2..3e803a9c9c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/api.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_API_H
 #define USDCONTRIVED_API_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/base.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/base.cpp
index 55c98e1f45..c64e7969e5 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/base.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/base.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/base.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/base.h
index 3e61debfb3..6246b5b0f8 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/base.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/base.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_BASE_H
 #define USDCONTRIVED_GENERATED_BASE_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/singleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/singleApplyAPI.cpp
index ada18ef34c..126e885d15 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/singleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/singleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/singleApplyAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/singleApplyAPI.h
index c5f53e2036..0914c973b1 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/singleApplyAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/singleApplyAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_H
 #define USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/tokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/tokens.cpp
index aab8dd9c5f..eb64580601 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/tokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/tokens.h"
 
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/tokens.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/tokens.h
index d9918bf8ae..33f6d5aaa4 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/tokens.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_TOKENS_H
 #define USDCONTRIVED_TOKENS_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapBase.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapBase.cpp
index a1a7c8cec0..3a33606334 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapBase.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapSingleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapSingleApplyAPI.cpp
index 7ddb8a4744..d2179cbf67 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapSingleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapSingleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapTokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapTokens.cpp
index cb31301ef8..4cfd9d6a22 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapTokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/headerTerminatorString/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/api.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/api.h
index 816f5a9fa2..3e803a9c9c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/api.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_API_H
 #define USDCONTRIVED_API_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/base.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/base.cpp
index c6172cb44b..0b8f659fcf 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/base.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/base.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/base.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/base.h
index 2491850c26..ddd2b9aaae 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/base.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/base.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_BASE_H
 #define USDCONTRIVED_GENERATED_BASE_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/singleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/singleApplyAPI.cpp
index fcc2c62b60..8fa3d43ffe 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/singleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/singleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/singleApplyAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/singleApplyAPI.h
index e9ef506ff2..5921cabffb 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/singleApplyAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/singleApplyAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_H
 #define USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/tokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/tokens.cpp
index 05cf44903d..741938fc6f 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/tokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/tokens.h"
 
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/tokens.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/tokens.h
index 9ba1b236f8..99b00e012e 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/tokens.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_TOKENS_H
 #define USDCONTRIVED_TOKENS_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapBase.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapBase.cpp
index 0c24dddf78..ac4ce26588 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapBase.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapSingleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapSingleApplyAPI.cpp
index 45a000772a..9c5fb1b191 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapSingleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapSingleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapTokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapTokens.cpp
index 9adde2d2b8..12893f0c25 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapTokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/namespace/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/api.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/api.h
index 816f5a9fa2..3e803a9c9c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/api.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_API_H
 #define USDCONTRIVED_API_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/base.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/base.cpp
index 13e6265d5c..3f81022a2d 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/base.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/base.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/base.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/base.h
index fc37891698..91bb2c5275 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/base.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/base.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_BASE_H
 #define USDCONTRIVED_GENERATED_BASE_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/singleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/singleApplyAPI.cpp
index a987a6c406..766535ef74 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/singleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/singleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/singleApplyAPI.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/singleApplyAPI.h
index b9e44731eb..cad8f5347f 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/singleApplyAPI.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/singleApplyAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_H
 #define USDCONTRIVED_GENERATED_SINGLEAPPLYAPI_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/tokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/tokens.cpp
index f1852161da..26fadc4d24 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/tokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/tokens.h"
 
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/tokens.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/tokens.h
index 9e8be3e39e..2d73f237cb 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/tokens.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_TOKENS_H
 #define USDCONTRIVED_TOKENS_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapBase.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapBase.cpp
index 1d9150ef56..1c58ec4d19 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapBase.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapSingleApplyAPI.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapSingleApplyAPI.cpp
index 3109fce3cb..2326a1f354 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapSingleApplyAPI.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapSingleApplyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/singleApplyAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapTokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapTokens.cpp
index c62c88e663..917102007c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapTokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/nestedNamespace/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/api.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/api.h
index 816f5a9fa2..3e803a9c9c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/api.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_API_H
 #define USDCONTRIVED_API_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/base.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/base.cpp
index 55c98e1f45..c64e7969e5 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/base.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/base.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/base.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/base.h
index 5271a2306d..94dadfee45 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/base.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/base.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_GENERATED_BASE_H
 #define USDCONTRIVED_GENERATED_BASE_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/tokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/tokens.cpp
index e8fa2b2c97..28623332dc 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/tokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/tokens.h"
 
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/tokens.h b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/tokens.h
index 2bcc11c7e2..b4c3e4b90c 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/tokens.h
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDCONTRIVED_TOKENS_H
 #define USDCONTRIVED_TOKENS_H
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/wrapBase.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/wrapBase.cpp
index a1a7c8cec0..3a33606334 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/wrapBase.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/wrapBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdContrived/base.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/wrapTokens.cpp b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/wrapTokens.cpp
index 306e0d0b81..e7b2c75414 100644
--- a/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/wrapTokens.cpp
+++ b/pxr/usd/usd/testenv/testUsdGenSchema/baseline/useLiteralIdentifier/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/testenv/testUsdHardToReach.cpp b/pxr/usd/usd/testenv/testUsdHardToReach.cpp
index 53c43775f0..5bc042aa7d 100644
--- a/pxr/usd/usd/testenv/testUsdHardToReach.cpp
+++ b/pxr/usd/usd/testenv/testUsdHardToReach.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdInherits.py b/pxr/usd/usd/testenv/testUsdInherits.py
index af229ab3a7..79b89928e1 100644
--- a/pxr/usd/usd/testenv/testUsdInherits.py
+++ b/pxr/usd/usd/testenv/testUsdInherits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 from pxr import Usd, Pcp, Sdf, Tf
diff --git a/pxr/usd/usd/testenv/testUsdInstanceProxy.py b/pxr/usd/usd/testenv/testUsdInstanceProxy.py
index 6657d4b943..94721899a7 100644
--- a/pxr/usd/usd/testenv/testUsdInstanceProxy.py
+++ b/pxr/usd/usd/testenv/testUsdInstanceProxy.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Tf, Usd
 import unittest
@@ -404,6 +387,51 @@ def _ValidateAttributeValue(attrPath, expectedValue):
         _ValidateAttributeValue(
             attrPath = '/World/sets/Set_2/Prop_2/geom.x', expectedValue = 1.0)
 
+        _ValidateAttributeValue(
+            attrPath = '/World/sets/Set_1/Prop_1/geom.pathExpr',
+            expectedValue = Sdf.PathExpression(
+                '//foo /World/sets/Set_1/Prop_1/anim//*bar'))
+        _ValidateAttributeValue(
+            attrPath = '/World/sets/Set_1/Prop_2/geom.pathExpr',
+            expectedValue = Sdf.PathExpression(
+                '//foo /World/sets/Set_1/Prop_2/anim//*bar'))
+        _ValidateAttributeValue(
+            attrPath = '/World/sets/Set_2/Prop_1/geom.pathExpr',
+            expectedValue = Sdf.PathExpression(
+                '//foo /World/sets/Set_2/Prop_1/anim//*bar'))
+        _ValidateAttributeValue(
+            attrPath = '/World/sets/Set_2/Prop_2/geom.pathExpr',
+            expectedValue = Sdf.PathExpression(
+                '//foo /World/sets/Set_2/Prop_2/anim//*bar'))
+
+        # Check that the pathExpr attribute values in prototypes also map.
+        def _ValidatePathExprAttrInPrototype(attrPath, expectedPattern):
+            import re
+            attrPath = Sdf.Path(attrPath)
+            proxyPrim = s.GetPrimAtPath(attrPath.GetPrimPath())
+            self._ValidateInstanceProxy(attrPath.GetPrimPath(), proxyPrim)
+
+            protoPrim = proxyPrim.GetPrimInPrototype()
+            attr = protoPrim.GetAttribute(attrPath.name)
+            self.assertTrue(attr)
+            self.assertTrue(re.match(expectedPattern, attr.Get().GetText()),
+                            msg=attr.Get().GetText() + ' did not match ' +
+                            expectedPattern)
+
+        pattern = r'//foo /__Prototype_\d+/anim//\*bar'
+        _ValidatePathExprAttrInPrototype(
+            attrPath = '/World/sets/Set_1/Prop_1/geom.pathExpr',
+            expectedPattern = pattern)
+        _ValidatePathExprAttrInPrototype(
+            attrPath = '/World/sets/Set_1/Prop_2/geom.pathExpr',
+            expectedPattern = pattern)
+        _ValidatePathExprAttrInPrototype(
+            attrPath = '/World/sets/Set_2/Prop_1/geom.pathExpr',
+            expectedPattern = pattern)
+        _ValidatePathExprAttrInPrototype(
+            attrPath = '/World/sets/Set_2/Prop_2/geom.pathExpr',
+            expectedPattern = pattern)
+
     def test_GetRelationshipTargets(self):
         s = Usd.Stage.Open('rels/root.usda')
 
diff --git a/pxr/usd/usd/testenv/testUsdInstanceProxy/nested/prop.usda b/pxr/usd/usd/testenv/testUsdInstanceProxy/nested/prop.usda
index 856e41f731..c19c6be90e 100644
--- a/pxr/usd/usd/testenv/testUsdInstanceProxy/nested/prop.usda
+++ b/pxr/usd/usd/testenv/testUsdInstanceProxy/nested/prop.usda
@@ -6,6 +6,7 @@ def Scope "Prop"
     {
         double x = 1.0
         rel y
+        pathExpression pathExpr = "//foo ../anim//*bar"
     }
 
     def Scope "anim"
diff --git a/pxr/usd/usd/testenv/testUsdInstancing.py b/pxr/usd/usd/testenv/testUsdInstancing.py
index aee2344fd3..8c5c129c37 100644
--- a/pxr/usd/usd/testenv/testUsdInstancing.py
+++ b/pxr/usd/usd/testenv/testUsdInstancing.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # NOTE: 
 # Because Usd does not guarantee a stable assignment of
diff --git a/pxr/usd/usd/testenv/testUsdInstancingCpp.cpp b/pxr/usd/usd/testenv/testUsdInstancingCpp.cpp
index 1f270ce0b7..dff30d6750 100644
--- a/pxr/usd/usd/testenv/testUsdInstancingCpp.cpp
+++ b/pxr/usd/usd/testenv/testUsdInstancingCpp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/pcp/primIndex.h"
diff --git a/pxr/usd/usd/testenv/testUsdIntegerCoding.cpp b/pxr/usd/usd/testenv/testUsdIntegerCoding.cpp
index 8577fad530..deba9f2e1e 100644
--- a/pxr/usd/usd/testenv/testUsdIntegerCoding.cpp
+++ b/pxr/usd/usd/testenv/testUsdIntegerCoding.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdLoadUnloadDeepNestedInstancing.py b/pxr/usd/usd/testenv/testUsdLoadUnloadDeepNestedInstancing.py
index 8ffb746714..d2980c9e9b 100644
--- a/pxr/usd/usd/testenv/testUsdLoadUnloadDeepNestedInstancing.py
+++ b/pxr/usd/usd/testenv/testUsdLoadUnloadDeepNestedInstancing.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 
 # Test to ensure loading and unloading of large nested instance paths, do not
diff --git a/pxr/usd/usd/testenv/testUsdMetadata.cpp b/pxr/usd/usd/testenv/testUsdMetadata.cpp
index 7099398280..43f41e226e 100644
--- a/pxr/usd/usd/testenv/testUsdMetadata.cpp
+++ b/pxr/usd/usd/testenv/testUsdMetadata.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdMetadata.py b/pxr/usd/usd/testenv/testUsdMetadata.py
index 10a9f8011b..aa2f836f95 100644
--- a/pxr/usd/usd/testenv/testUsdMetadata.py
+++ b/pxr/usd/usd/testenv/testUsdMetadata.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdModel.py b/pxr/usd/usd/testenv/testUsdModel.py
index f07f16caa0..69765ec416 100644
--- a/pxr/usd/usd/testenv/testUsdModel.py
+++ b/pxr/usd/usd/testenv/testUsdModel.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 from pxr import Usd, Sdf, Kind
diff --git a/pxr/usd/usd/testenv/testUsdNamespaceEditor.py b/pxr/usd/usd/testenv/testUsdNamespaceEditor.py
index 027fe8b119..98629ade6a 100644
--- a/pxr/usd/usd/testenv/testUsdNamespaceEditor.py
+++ b/pxr/usd/usd/testenv/testUsdNamespaceEditor.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Sdf, Usd, Tf, Plug
@@ -917,7 +900,7 @@ def _VerifyCannotApplyMovePrimAtPath(path, newPath, expectedMessage):
         # identifier regardless of platform
         def getFormattedCwd():
             drive, tail = os.path.splitdrive(os.getcwd())
-            return drive.lower() + tail.replace('\\', '/')
+            return drive + tail.replace('\\', '/')
 
         # Cannot delete or rename /C (there are no valid reparent targets for 
         # /C on this stage currently regardless of layer permission)
@@ -1143,19 +1126,16 @@ def _VerifyCanMovePrimAtPath(primPath, newPrimPath):
         nonInstancePrim = _VerifyCanDeletePrimAtPath("/NonInstancePrim")
 
         # But we can't delete any of the children of the instance prims as they
-        # are proxies from the prototype. We also can't delete a child of the 
-        # non-instance prim but for a different reason as it is defined across a
-        # reference and we don't yet support deactivation as delete.
+        # are proxies from the prototype. 
         _VerifyCannotApplyDeletePrim(instance1.GetChild("B"), 
             "The prim to edit is a prototype proxy descendant of an instance "
             "prim")
         _VerifyCannotApplyDeletePrim(instance2.GetChild("B"), 
             "The prim to edit is a prototype proxy descendant of an instance "
             "prim")
-        _VerifyCannotApplyDeletePrim(nonInstancePrim.GetChild("B"), 
-            "The prim to delete must be deactivated rather than deleted since "
-            "it composes opinions introduced by ancestral composition arcs; "
-            "deletion via deactivation is not yet supported")
+        # We can delete a child of the non-instance prim but only if relocates
+        # authoring is allowed as it is defined across a reference.
+        _VerifyCanDeletePrimAtPath("/NonInstancePrim/B")
 
         # Like with delete, we can rename any of the instance and non-instance 
         # prims (as long as the new name is valid).
@@ -1165,19 +1145,18 @@ def _VerifyCanMovePrimAtPath(primPath, newPrimPath):
             "/NonInstancePrim", "/NewNonInstancePrim")
 
         # And just like with delete, we can't rename any of the children of the 
-        # instance prims because they are proxies into the prototype. The 
-        # non-instanced prim can't be renamed because relocates aren't supported
-        # yet.
+        # instance prims because they are proxies into the prototype.
         _VerifyCannotApplyRenamePrim(instance1.GetChild("B"), "NewB", 
             "The prim to edit is a prototype proxy descendant of an instance "
             "prim")
         _VerifyCannotApplyRenamePrim(instance2.GetChild("B"), "NewB", 
             "The prim to edit is a prototype proxy descendant of an instance "
             "prim")
-        _VerifyCannotApplyRenamePrim(nonInstancePrim.GetChild("B"), "NewB", 
-            "The prim to move requires authoring relocates since it composes "
-            "opinions introduced by ancestral composition arcs; authoring "
-            "relocates is not yet supported")
+        # But we can rename a child of the non-instance prim but only if 
+        # relocates authoring is allowed as it is defined across a reference.
+        _VerifyCanMovePrimAtPath(
+            "/NonInstancePrim/B", "/NonInstancePrim/NewB")
+
 
         # We can reparent an instance prim under a non-instance prim
         instance1 = _VerifyCanMovePrimAtPath(
@@ -1225,16 +1204,15 @@ def _VerifyCanMovePrimAtPath(primPath, newPrimPath):
         _VerifyCannotApplyReparentPrim(nonInstancePrim, prototypePrim.GetChild("B"), 
             "The new parent prim belongs to a prototype prim")
 
-    def test_EditPrimsWithCompositionArcs(self):
-        """Tests namespace edit operations on prims with specs that contribute
-        opinions across composition arcs.
-        """
+    def _RunEditPrimsWithCompositionArcs(self, allowRelocatesAuthoring):
 
         # This stage has few variety of composition arcs on the root prims.
         stage = Usd.Stage.Open("composition_arcs/root.usda")
         self.assertTrue(stage)
 
-        editor = Usd.NamespaceEditor(stage)
+        editOptions = Usd.NamespaceEditor.EditOptions()
+        editOptions.allowRelocatesAuthoring = allowRelocatesAuthoring
+        editor = Usd.NamespaceEditor(stage, editOptions)
 
         # Helper functions for testing prims that we expect to be able to 
         # successfully edit.
@@ -1342,15 +1320,12 @@ def _VerifyCannotApplyMovePrimAtPath(primPath, newPrimPath, expectedMessage):
 
         # Helper to verify that the prim cannot be deleted nor moved.
         def _VerifyCannotEditPrimAtPath(primPath):
-            _VerifyCannotApplyDeletePrimAtPath(primPath,
-                "The prim to delete must be deactivated rather than deleted "
-                "since it composes opinions introduced by ancestral "
-                "composition arcs; deletion via deactivation is not yet "
-                "supported")
-            _VerifyCannotApplyMovePrimAtPath(primPath, "/Foo",
-                "The prim to move requires authoring relocates since it "
-                "composes opinions introduced by ancestral composition arcs; "
-                "authoring relocates is not yet supported")
+            expectedMessage = "The prim to edit requires authoring relocates " \
+                "since it composes opinions introduced by ancestral " \
+                "composition arcs; relocates authoring must be enabled to " \
+                "perform this edit"
+            _VerifyCannotApplyDeletePrimAtPath(primPath, expectedMessage)
+            _VerifyCannotApplyMovePrimAtPath(primPath, "/Foo", expectedMessage)
 
         # A prim with a direct reference to another prim can be edited.
         _VerifyCanEditPrimAtPath("/PrimWithReference")
@@ -1358,9 +1333,14 @@ def _VerifyCannotEditPrimAtPath(primPath):
         # But children of the prim which were defined across the reference 
         # (i.e. brought in by an ancestral reference) cannot be edited without
         # relocates.
-        _VerifyCannotEditPrimAtPath("/PrimWithReference/ClassChild")
-        _VerifyCannotEditPrimAtPath("/PrimWithReference/B")
-        _VerifyCannotEditPrimAtPath("/PrimWithReference/B/A")
+        if allowRelocatesAuthoring:
+            _VerifyCanEditPrimAtPath("/PrimWithReference/ClassChild")
+            _VerifyCanEditPrimAtPath("/PrimWithReference/B")
+            _VerifyCanEditPrimAtPath("/PrimWithReference/B/A")
+        else:
+            _VerifyCannotEditPrimAtPath("/PrimWithReference/ClassChild")
+            _VerifyCannotEditPrimAtPath("/PrimWithReference/B")
+            _VerifyCannotEditPrimAtPath("/PrimWithReference/B/A")
 
         # But a child prim that was added entirely in the root layer stack, even
         # though its parent is defined across the reference, can still be edited
@@ -1370,7 +1350,10 @@ def _VerifyCannotEditPrimAtPath(primPath):
         # A prim with a subroot prim reference behaves the same way as a prim
         # with a root prim reference.
         _VerifyCanEditPrimAtPath("/PrimWithSubrootReference")
-        _VerifyCannotEditPrimAtPath("/PrimWithSubrootReference/A")
+        if allowRelocatesAuthoring:
+            _VerifyCanEditPrimAtPath("/PrimWithSubrootReference/A")
+        else:
+            _VerifyCannotEditPrimAtPath("/PrimWithSubrootReference/A")
         _VerifyCanEditPrimAtPath("/PrimWithSubrootReference/A/A_Root_Child")
 
         # A prim with a variant selection can be edited given the variant is 
@@ -1379,14 +1362,223 @@ def _VerifyCannotEditPrimAtPath(primPath):
 
         # But children of the prim which were defined across the reference 
         # within the selected variant cannot be edited without relocates.
-        _VerifyCannotEditPrimAtPath("/PrimWithVariant/ClassChild")
-        _VerifyCannotEditPrimAtPath("/PrimWithVariant/B")
-        _VerifyCannotEditPrimAtPath("/PrimWithVariant/B/A")
+        if allowRelocatesAuthoring:
+            _VerifyCanEditPrimAtPath("/PrimWithVariant/ClassChild")
+            _VerifyCanEditPrimAtPath("/PrimWithVariant/B")
+            _VerifyCanEditPrimAtPath("/PrimWithVariant/B/A")
+        else:
+            _VerifyCannotEditPrimAtPath("/PrimWithVariant/ClassChild")
+            _VerifyCannotEditPrimAtPath("/PrimWithVariant/B")
+            _VerifyCannotEditPrimAtPath("/PrimWithVariant/B/A")
 
         # But also a child defined fully in the root layer stack but inside
         # the variant self still cannot be edited without relocates or edit 
         # target support as it has specs across an ancestral variant arc.
-        _VerifyCannotEditPrimAtPath("/PrimWithVariant/V1_Root_Child")
+        if allowRelocatesAuthoring:
+            _VerifyCanEditPrimAtPath("/PrimWithVariant/V1_Root_Child")
+        else:
+            _VerifyCannotEditPrimAtPath("/PrimWithVariant/V1_Root_Child")
+
+    def test_EditPrimsWithCompositionArcs(self):
+        """Tests namespace edit operations on prims with specs that contribute
+        opinions across composition arcs.
+        """
+        
+        self._RunEditPrimsWithCompositionArcs(allowRelocatesAuthoring=True)
+        self._RunEditPrimsWithCompositionArcs(allowRelocatesAuthoring=False)
+
+    def test_RelocatesAndProhibitedChildren(self):
+        """Tests how relocates and prohibited children affect allowed namespace
+        edits."""
+        
+        # Layer with a prim with two children
+        ref2Layer = Sdf.Layer.CreateAnonymous("ref2.usda")
+        ref2Layer.ImportFromString('''#usda 1.0
+                                   
+            def "Ref2Prim" 
+            {
+                def MadeUpTypeName_2 "ChildInRef2"
+                {
+                    float a = 2.5
+                }
+                
+                def MadeUpTypeName_1 "Child" {
+                    int foo = 3
+                }
+            }
+            ''')
+
+        # Layer with a prim that references the above layer and relocates
+        # one the prim's children (with over opinions.)
+        ref1Layer = Sdf.Layer.CreateAnonymous("ref1.usda")
+        ref1Layer.ImportFromString('''#usda 1.0
+            (
+                relocates = {
+                    </Ref1Prim/ChildInRef2> : </Ref1Prim/RelocatedFromRef2>
+                }
+            )
+
+            def "Ref1Prim" (
+                references = @''' + ref2Layer.identifier + '''@</Ref2Prim>
+            ) {
+                over "RelocatedFromRef2" {
+                    string b = "hello"
+                }
+            }
+            ''')
+
+        # Root layer with a prim that references the above layer
+        rootLayer = Sdf.Layer.CreateAnonymous("root.usda")
+        rootLayer .ImportFromString('''#usda 1.0
+
+            def "PrimWithReference" (
+                references = @''' + ref1Layer.identifier + '''@</Ref1Prim>
+            ) {
+                over "Child" {
+                    int bar = 5
+                }
+                
+                def "RootChild" {
+                }
+            }
+            ''')
+
+        # Create our test stage and namespace editor which allows relocates (by
+        # default).
+        stage = Usd.Stage.Open(rootLayer)
+        editor = Usd.NamespaceEditor(stage)
+
+        # Helper for verifying the contents on the composed 
+        # /PrimWithReference/Child as we move it around. Tested on the initial
+        # prim
+        def _VerifyChildContents(prim):
+            self.assertEqual(prim.GetTypeName(), "MadeUpTypeName_1")
+            self.assertEqual(prim.GetPropertyNames(),
+                ["bar", "foo"])
+            self.assertEqual(prim.GetAttribute("foo").Get(), 3)
+            self.assertEqual(prim.GetAttribute("bar").Get(), 5)
+        _VerifyChildContents(stage.GetPrimAtPath('/PrimWithReference/Child'))
+
+        # Helper for verifying the contents on the composed 
+        # /PrimWithReference/RelocatedFromRef2 as we move it around. Tested on
+        # the initial prim
+        def _VerifyRelocatedFromRef2Contents(prim):
+            self.assertEqual(prim.GetTypeName(), "MadeUpTypeName_2")
+            self.assertEqual(prim.GetPropertyNames(),
+                ["a", "b"])
+            self.assertEqual(prim.GetAttribute("a").Get(), 2.5)
+            self.assertEqual(prim.GetAttribute("b").Get(), "hello")
+        _VerifyRelocatedFromRef2Contents(
+            stage.GetPrimAtPath('/PrimWithReference/RelocatedFromRef2'))
+
+        # Performs and verifies the move of the prim at primPath to newPrimPath.
+        # Runs to the given verifyContentsFunc to confirm the composed prim was
+        # indeed moved in its entirety
+        def _VerifyCanMovePrimAtPath(primPath, newPrimPath, verifyContentsFunc):
+            # Verify the initial prim exists has the expected contents.
+            prim = stage.GetPrimAtPath(primPath)
+            self.assertTrue(prim)
+            verifyContentsFunc(prim)
+
+            # Verify the new path does not exist.
+            self.assertFalse(stage.GetPrimAtPath(newPrimPath))
+
+            # Apply the move edit.
+            self.assertTrue(editor.MovePrimAtPath(primPath, newPrimPath))
+            self.assertTrue(editor.CanApplyEdits())
+            self.assertTrue(editor.ApplyEdits())
+
+            # Verify that no prim exists at the original path.
+            self.assertFalse(stage.GetPrimAtPath(primPath))
+
+            # Verify the prim does exist at the new path and has the expected
+            # contents
+            newPrim = stage.GetPrimAtPath(newPrimPath)
+            self.assertTrue(newPrim)
+            verifyContentsFunc(newPrim)
+
+        # Verifies that the prim at primPath cannot be moved to newPrimPath
+        # because the new path is a prohibited child of its parent
+        def _VerifyCannotApplyMovePrimAtPath(primPath, newPrimPath):
+            # Verify the prim actually exists first
+            prim = stage.GetPrimAtPath(primPath)
+            self.assertTrue(prim)
+
+            # Verify that we cannot move the prim for the expected reason
+            self.assertTrue(editor.MovePrimAtPath(primPath, newPrimPath))
+            self._VerifyFalseResult(editor.CanApplyEdits(), 
+                'The new path is a prohibited child of its parent path because '
+                'of existing relocates.')
+            with self.assertRaises(Tf.ErrorException):
+                editor.ApplyEdits()
+   
+        # We can move a child prim from across a reference with local relocates.
+        self.assertEqual(rootLayer.relocates, [])
+        _VerifyCanMovePrimAtPath(
+            '/PrimWithReference/Child', '/MovedChild', _VerifyChildContents)
+        self.assertEqual(rootLayer.relocates, [
+            (Sdf.Path('/PrimWithReference/Child'), Sdf.Path('/MovedChild'))
+            ])
+
+        # We cannot move a different prim to the now empty pre-relocation path
+        # even though there is no prim there. This is because relocation
+        # tombstones do not allow a prim to exist at this path.
+        _VerifyCannotApplyMovePrimAtPath(
+            '/PrimWithReference/RootChild', '/PrimWithReference/Child')
+
+        # We can move the moved prim again to another loacation. This updates 
+        # the relocation.
+        _VerifyCanMovePrimAtPath(
+            '/MovedChild', '/RenamedMovedChild', _VerifyChildContents)
+        self.assertEqual(rootLayer.relocates, [
+            (Sdf.Path('/PrimWithReference/Child'), Sdf.Path('/RenamedMovedChild'))
+            ])
+
+        # And we can move the locally relocated prim back to its original path.
+        # This is the only prim that be moved to this tombstone location and is
+        # accomplished by removing the local relocate.
+        _VerifyCanMovePrimAtPath(
+            '/RenamedMovedChild', '/PrimWithReference/Child',
+            _VerifyChildContents)
+        self.assertEqual(rootLayer.relocates, [])
+
+        # Now try a prim that has been relocated within the reference itself. 
+        # This prim can still be moved in the local layer stack using local
+        # relocates.
+        _VerifyCanMovePrimAtPath(
+            '/PrimWithReference/RelocatedFromRef2', '/MovedRelocatedFromRef2',
+             _VerifyRelocatedFromRef2Contents)
+        self.assertEqual(rootLayer.relocates, [
+            (Sdf.Path('/PrimWithReference/RelocatedFromRef2'), 
+                Sdf.Path('/MovedRelocatedFromRef2'))
+            ])
+
+        # We cannnot move a different prim to the now empty pre-relocation path.
+        _VerifyCannotApplyMovePrimAtPath(
+            '/PrimWithReference/RootChild', 
+            '/PrimWithReference/RelocatedFromRef2')
+
+        # We also cannot move a prim into a location that would be the path of
+        # RelocatedFromRef2 if it were not relocated in the reference layer
+        # itself (namely ChildInRef2). This is because pre-relocation 
+        # tombstones are propagated through composition arcs.    
+        _VerifyCannotApplyMovePrimAtPath(
+            '/PrimWithReference/RootChild', '/PrimWithReference/ChildInRef2')
+
+        # We can move the locally relocated prim back to its original 
+        # path within the local layer stack, RelocatedFromRef2, because we
+        # can undo that relocation locally.
+        _VerifyCanMovePrimAtPath(
+            '/MovedRelocatedFromRef2', '/PrimWithReference/RelocatedFromRef2',
+            _VerifyRelocatedFromRef2Contents)
+        self.assertEqual(rootLayer.relocates, [])
+
+        # But we cannot move this prim back to it's pre-relocation path from 
+        # within the reference as we can't undo the reference's relocates in the
+        # local layer stack.
+        _VerifyCannotApplyMovePrimAtPath(
+            '/PrimWithReference/RelocatedFromRef2', 
+            '/PrimWithReference/ChildInRef2')
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/pxr/usd/usd/testenv/testUsdNamespaceEditorProperties.py b/pxr/usd/usd/testenv/testUsdNamespaceEditorProperties.py
index 609d21d904..bac351f157 100644
--- a/pxr/usd/usd/testenv/testUsdNamespaceEditorProperties.py
+++ b/pxr/usd/usd/testenv/testUsdNamespaceEditorProperties.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Sdf, Usd, Tf, Plug
@@ -829,7 +812,7 @@ def _VerifyCannotApplyMovePropertyAtPath(path, newPath, expectedMessage):
             # identifier regardless of platform
             def getFormattedCwd():
                 drive, tail = os.path.splitdrive(os.getcwd())
-                return drive.lower() + tail.replace('\\', '/')
+                return drive + tail.replace('\\', '/')
 
             uneditableLayerMessage = (
                 "The spec @{cwd}/basic/sub_1.usda@<{propPath}> cannot be "
@@ -1198,19 +1181,14 @@ def _VerifyCanMovePropertyAtPath(propPath, newPropPath):
         # necessitating relocates as opposed to any requirements related to
         # instancing.
         def _VerifyCannotEditPropertyWithoutRelocates(prop):
-            _VerifyCannotApplyDeleteProperty(prop, 
-                "The property to delete must be deactivated rather than "
-                "deleted since it composes opinions introduced by ancestral "
-                "composition arcs; deletion via deactivation is not yet "
-                "supported")
-            _VerifyCannotApplyRenameProperty(prop, "New_Attr", 
-                "The property to move requires authoring relocates since it "
-                "composes opinions introduced by ancestral composition arcs; "
-                "authoring relocates is not supported for properties")
+            expectedMessage = "The property to edit requires authoring " \
+                "relocates since it composes opinions introduced by " \
+                "ancestral composition arcs; authoring relocates is not " \
+                "supported for properties"
+            _VerifyCannotApplyDeleteProperty(prop, expectedMessage)
+            _VerifyCannotApplyRenameProperty(prop, "New_Attr", expectedMessage)
             _VerifyCannotApplyReparentProperty(prop, basicRootPrim, 
-                "The property to move requires authoring relocates since it "
-                "composes opinions introduced by ancestral composition arcs; "
-                "authoring relocates is not supported for properties")
+                                               expectedMessage)
 
         # Open the stage and get the prims to test.
         stage, instance1, instance2, nonInstancePrim, prototypePrim = \
@@ -1467,19 +1445,15 @@ def _VerifyCannotEditPropertyAtPath(propPath):
             reparentedPropPath = \
                 Sdf.Path("/BasicRootPrim").AppendProperty(propPath.name)
 
-            _VerifyCannotApplyDeletePropertyAtPath(propPath,
-                "The property to delete must be deactivated rather than "
-                "deleted since it composes opinions introduced by ancestral "
-                "composition arcs; deletion via deactivation is not yet "
-                "supported")
-            _VerifyCannotApplyMovePropertyAtPath(propPath, renamedPropPath,
-                "The property to move requires authoring relocates since it "
-                "composes opinions introduced by ancestral composition arcs; "
-                "authoring relocates is not supported for properties")
-            _VerifyCannotApplyMovePropertyAtPath(propPath, reparentedPropPath,
-                "The property to move requires authoring relocates since it "
-                "composes opinions introduced by ancestral composition arcs; "
-                "authoring relocates is not supported for properties")
+            expectedMessage = "The property to edit requires authoring " \
+                "relocates since it composes opinions introduced by " \
+                "ancestral composition arcs; authoring relocates is not " \
+                "supported for properties"
+            _VerifyCannotApplyDeletePropertyAtPath(propPath, expectedMessage)
+            _VerifyCannotApplyMovePropertyAtPath(propPath, renamedPropPath, 
+                                                 expectedMessage)
+            _VerifyCannotApplyMovePropertyAtPath(propPath, reparentedPropPath, 
+                                                 expectedMessage)
 
         # /PrimWithReference has a direct reference to @ref.usda@</ReferencePrim>
 
diff --git a/pxr/usd/usd/testenv/testUsdNamespaceEditorTargetPathFixup.py b/pxr/usd/usd/testenv/testUsdNamespaceEditorTargetPathFixup.py
index 9acc5174e9..f408ff1ee5 100644
--- a/pxr/usd/usd/testenv/testUsdNamespaceEditorTargetPathFixup.py
+++ b/pxr/usd/usd/testenv/testUsdNamespaceEditorTargetPathFixup.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Sdf, Usd, Tf, Plug
@@ -2338,5 +2321,244 @@ def test_ReparentPropertyWithTargets(self):
                 }
             })
 
+    def test_TargetsFromCompositionArcs(self):
+
+        # Setup: Layer to be referenced with prims that have relationship and 
+        # attributes with targets and connections. /Model/A has targets to 
+        # /Model/B (which exists). /Model/B has targets to /Model/A (which 
+        # exists) and /Model/C (which does NOT exists but will speculatively 
+        # map to a prim in the root layer that will exist.)
+        refLayer = Sdf.Layer.CreateAnonymous("ref.usda")
+        refLayer.ImportFromString('''#usda 1.0
+            def "Model" 
+            {
+                def "A"
+                {
+                    rel a_rel = [</Model/B>]
+                    int a_attr
+                    int a_attr.connect = [</Model/B.b_attr>]
+                }
+                
+                def "B"
+                {
+                    rel b_rel = [</Model/A>, </Model/C>]
+                    int b_attr
+                    int b_attr.connect = [</Model/A.a_attr>, </Model/C.c_attr>]
+                }
+            }
+        ''')
+
+        # Root layer which references the above. Defines /Root/C which has 
+        # targets to A and B (brought in by the reference) and is also the 
+        # prim that is speculatively targeted by /Model/B. Also provides an
+        # over to A that adds targets to /Root/C.
+        rootLayer = Sdf.Layer.CreateAnonymous("root.usda")
+        rootLayer.ImportFromString('''#usda 1.0
+            def "Root" (
+                references = @''' + refLayer.identifier + '''@</Model>
+            )
+            {
+                def "C"
+                {
+                    rel c_rel = [</Root/A>, </Root/B>]
+                    int c_attr
+                    int c_attr.connect = [</Root/A.a_attr>, </Root/B.b_attr>]
+                }
+
+                over "A"
+                {
+                    append rel a_rel = [</Root/C>]
+                    append int a_attr.connect = [</Root/C.c_attr>]
+                }
+            }
+        ''')
+
+        # Create a stage and editor.
+        stage = Usd.Stage.Open(rootLayer)
+        editor = Usd.NamespaceEditor(stage)
+
+        # Verify initial prims
+        self.assertEqual(stage.GetPrimAtPath("/Root").GetChildrenNames(), 
+                         ["A", "B", "C"])
+        # Verify no relocates
+        self.assertEqual(rootLayer.relocates, [])
+
+        # /Root/A properties target B and C 
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/A.a_rel").GetTargets(),
+            ["/Root/B", "/Root/C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/A.a_attr").GetConnections(),
+            ["/Root/B.b_attr", "/Root/C.c_attr"])
+
+        # /Root/B properties target A and C 
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/B.b_rel").GetTargets(),
+            ["/Root/A", "/Root/C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/B.b_attr").GetConnections(),
+            ["/Root/A.a_attr", "/Root/C.c_attr"])
+
+        # /Root/C properties target A and B
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/C.c_rel").GetTargets(),
+            ["/Root/A", "/Root/B"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/C.c_attr").GetConnections(),
+            ["/Root/A.a_attr", "/Root/B.b_attr"])
+
+        # Rename /Root/A to Moved_A
+        self.assertTrue(editor.MovePrimAtPath("/Root/A", "/Root/Moved_A"))
+        self.assertTrue(editor.ApplyEdits())
+
+        # Verify the prim was renamed.
+        self.assertEqual(stage.GetPrimAtPath("/Root").GetChildrenNames(), 
+                         ["Moved_A", "B", "C"])
+        # Verify A was relocated.
+        self.assertEqual(rootLayer.relocates, [("/Root/A", "/Root/Moved_A")])
+
+        # Moved_A has the same targets as before the rename.
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/Moved_A.a_rel").GetTargets(),
+            ["/Root/B", "/Root/C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/Moved_A.a_attr").GetConnections(),
+            ["/Root/B.b_attr", "/Root/C.c_attr"])
+
+        # /Root/B properties have been updated to target Moved_A
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/B.b_rel").GetTargets(),
+            ["/Root/Moved_A", "/Root/C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/B.b_attr").GetConnections(),
+            ["/Root/Moved_A.a_attr", "/Root/C.c_attr"])
+
+        # /Root/C properties have been updated to target Moved_A
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/C.c_rel").GetTargets(),
+            ["/Root/Moved_A", "/Root/B"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/C.c_attr").GetConnections(),
+            ["/Root/Moved_A.a_attr", "/Root/B.b_attr"])
+
+        # Rename /Root/B to Moved_B
+        self.assertTrue(editor.MovePrimAtPath("/Root/B", "/Root/Moved_B"))
+        self.assertTrue(editor.ApplyEdits())
+
+        # Verify that B is now also renamed.
+        self.assertEqual(stage.GetPrimAtPath("/Root").GetChildrenNames(), 
+                         ["Moved_A", "Moved_B", "C"])
+        # Verify B is now also relocated.
+        self.assertEqual(rootLayer.relocates, [
+            ("/Root/A", "/Root/Moved_A"),
+            ("/Root/B", "/Root/Moved_B")])
+
+        # /Root/Moved_A properties have been updated to target Moved_B
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/Moved_A.a_rel").GetTargets(),
+            ["/Root/Moved_B", "/Root/C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/Moved_A.a_attr").GetConnections(),
+            ["/Root/Moved_B.b_attr", "/Root/C.c_attr"])
+
+        # Moved_B has the same targets as before the rename.
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/Moved_B.b_rel").GetTargets(),
+            ["/Root/Moved_A", "/Root/C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/Moved_B.b_attr").GetConnections(),
+            ["/Root/Moved_A.a_attr", "/Root/C.c_attr"])
+
+        # /Root/Moved_C properties have been updated to target Moved_B
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/C.c_rel").GetTargets(),
+            ["/Root/Moved_A", "/Root/Moved_B"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/C.c_attr").GetConnections(),
+            ["/Root/Moved_A.a_attr", "/Root/Moved_B.b_attr"])
+
+        # Rename /Root/C to Moved_C
+        self.assertTrue(editor.MovePrimAtPath("/Root/C", "/Root/Moved_C"))
+        self.assertTrue(editor.ApplyEdits())
+
+        # Verify that C is now also renamed.
+        self.assertEqual(stage.GetPrimAtPath("/Root").GetChildrenNames(), 
+                         ["Moved_A", "Moved_B", "Moved_C"])
+        # Verify that the relocates haven't changed as moving /Root/C does not
+        # require relocates.
+        self.assertEqual(rootLayer.relocates, [
+            ("/Root/A", "/Root/Moved_A"),
+            ("/Root/B", "/Root/Moved_B")])
+
+        # /Root/Moved_A properties have been updated to target Moved_C because
+        # the opinions that target C are in the root layer and can be edited.
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/Moved_A.a_rel").GetTargets(),
+            ["/Root/Moved_B", "/Root/Moved_C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/Moved_A.a_attr").GetConnections(),
+            ["/Root/Moved_B.b_attr", "/Root/Moved_C.c_attr"])
+
+        # /Root/Moved_B properties have NOT been updated to target Moved_C 
+        # because these opinions are in the reference and /Root/C cannot be
+        # relocated as it has no opinions across the reference itself.
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/Moved_B.b_rel").GetTargets(),
+            ["/Root/Moved_A", "/Root/C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/Moved_B.b_attr").GetConnections(),
+            ["/Root/Moved_A.a_attr", "/Root/C.c_attr"])
+
+        # Moved_C has the same targets as before the rename.
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/Moved_C.c_rel").GetTargets(),
+            ["/Root/Moved_A", "/Root/Moved_B"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/Moved_C.c_attr").GetConnections(),
+            ["/Root/Moved_A.a_attr", "/Root/Moved_B.b_attr"])
+
+        # Delete /Root/Moved_A
+        self.assertTrue(editor.DeletePrimAtPath("/Root/Moved_A"))
+        self.assertTrue(editor.ApplyEdits())
+
+        # Verify Moved_A is no longer a prim
+        self.assertEqual(stage.GetPrimAtPath("/Root").GetChildrenNames(), 
+                         ["Moved_B", "Moved_C"])
+        # Verify the relocates have been updates so /Root/A now maps to empty
+        self.assertEqual(rootLayer.relocates, [
+            ("/Root/A", Sdf.Path()), 
+            ("/Root/B", "/Root/Moved_B")])
+
+        # /Root/Moved_B properties have been updated but instead of 
+        # /Root/Moved_A being removed from its targets, it has returned to 
+        # using the unrelocated path of /Root/A. This is because Pcp doesn't 
+        # removed composed targets that have been relocated.
+        # 
+        # XXX: This really should remove the deleted targets to /Root/A but we
+        # don't currently add the mapping to empty in the map function for 
+        # /Root/A. This is because the PcpTargetIndex computation uses the
+        # map function to map the target path and it will produce a composition
+        # error if the path is not mappable. An unmappable target path that is
+        # due to a "relocate to delete" should not be an error, but any other 
+        # case where it's not mappable is an error. Unfortunately, we don't have
+        # an easy way of distinguishing between these two cases in the target
+        # index so for now we have to let deleted prims map to avoid false 
+        # errors in the presence of a relocate to delete.
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/Moved_B.b_rel").GetTargets(),
+            ["/Root/A", "/Root/C"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/Moved_B.b_attr").GetConnections(),
+            ["/Root/A.a_attr", "/Root/C.c_attr"])
+
+        # /Root/Moved_C, on the other hand, does have targets to Moved_A removed
+        # because the opinions are local to the root layer.
+        self.assertEqual(
+            stage.GetRelationshipAtPath("/Root/Moved_C.c_rel").GetTargets(),
+            ["/Root/Moved_B"])
+        self.assertEqual(
+            stage.GetAttributeAtPath("/Root/Moved_C.c_attr").GetConnections(),
+            ["/Root/Moved_B.b_attr"])
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/pxr/usd/usd/testenv/testUsdNotices.py b/pxr/usd/usd/testenv/testUsdNotices.py
index b59d603497..2e85ad0316 100644
--- a/pxr/usd/usd/testenv/testUsdNotices.py
+++ b/pxr/usd/usd/testenv/testUsdNotices.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import contextlib, os, platform, sys, unittest
 from pxr import Ar,Sdf,Usd,Tf
diff --git a/pxr/usd/usd/testenv/testUsdOpaqueAttributes.py b/pxr/usd/usd/testenv/testUsdOpaqueAttributes.py
index 9f2002628c..3c7bfe8095 100644
--- a/pxr/usd/usd/testenv/testUsdOpaqueAttributes.py
+++ b/pxr/usd/usd/testenv/testUsdOpaqueAttributes.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdPathExpressionAttrs.py b/pxr/usd/usd/testenv/testUsdPathExpressionAttrs.py
index 8a4974ab19..afa7461b50 100644
--- a/pxr/usd/usd/testenv/testUsdPathExpressionAttrs.py
+++ b/pxr/usd/usd/testenv/testUsdPathExpressionAttrs.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, Vt, Sdf, Tf
 import unittest
@@ -89,5 +72,26 @@ def test_BasicPathTranslation(self):
                          Sdf.PathExpression(
                              '/srcPrim/srcChild /srcPrim/refChild'))
 
+    def test_BasicPathTranslation2(self):
+        # Test that `//` leading exprs translate across references *and* across
+        # the prototype-to-instance path mapping, which uses a different
+        # mechanism from PcpMapFunction.
+        stage = Usd.Stage.CreateInMemory()
+        stage2 = Usd.Stage.CreateInMemory()
+
+        src = stage.DefinePrim('/src')
+        dst = stage2.DefinePrim('/dst')
+
+        dstCapi = Usd.CollectionAPI.Apply(dst, 'testRef')
+        dstCapi.GetMembershipExpressionAttr().Set(Sdf.PathExpression('//'))
+
+        src.GetReferences().AddReference(
+            stage2.GetRootLayer().identifier, '/dst')
+
+        srcCapi = Usd.CollectionAPI.Get(src, 'testRef')
+        self.assertEqual(srcCapi.GetMembershipExpressionAttr().Get(),
+                         Sdf.PathExpression('//'))
+
+        
 if __name__ == '__main__':
     unittest.main()
diff --git a/pxr/usd/usd/testenv/testUsdPayloads.py b/pxr/usd/usd/testenv/testUsdPayloads.py
index 1121bf2d71..67c9539ff3 100644
--- a/pxr/usd/usd/testenv/testUsdPayloads.py
+++ b/pxr/usd/usd/testenv/testUsdPayloads.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdPrimCompositionQuery.py b/pxr/usd/usd/testenv/testUsdPrimCompositionQuery.py
index f4d0e4065c..4469b43c38 100644
--- a/pxr/usd/usd/testenv/testUsdPrimCompositionQuery.py
+++ b/pxr/usd/usd/testenv/testUsdPrimCompositionQuery.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 import os, sys, unittest
diff --git a/pxr/usd/usd/testenv/testUsdPrimFlagsPredicate.py b/pxr/usd/usd/testenv/testUsdPrimFlagsPredicate.py
index 7abb8bd71a..9ef2066ccb 100644
--- a/pxr/usd/usd/testenv/testUsdPrimFlagsPredicate.py
+++ b/pxr/usd/usd/testenv/testUsdPrimFlagsPredicate.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 from pxr import Usd, Tf
diff --git a/pxr/usd/usd/testenv/testUsdPrimGetDescendants.cpp b/pxr/usd/usd/testenv/testUsdPrimGetDescendants.cpp
index 0c44cdda9f..bb7e0adc6d 100644
--- a/pxr/usd/usd/testenv/testUsdPrimGetDescendants.cpp
+++ b/pxr/usd/usd/testenv/testUsdPrimGetDescendants.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdPrimRange.py b/pxr/usd/usd/testenv/testUsdPrimRange.py
index 6635dd0514..24bba2010d 100644
--- a/pxr/usd/usd/testenv/testUsdPrimRange.py
+++ b/pxr/usd/usd/testenv/testUsdPrimRange.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=map-builtin-not-iterating
 
diff --git a/pxr/usd/usd/testenv/testUsdPrims.py b/pxr/usd/usd/testenv/testUsdPrims.py
index 4fb1415395..8916ac821e 100644
--- a/pxr/usd/usd/testenv/testUsdPrims.py
+++ b/pxr/usd/usd/testenv/testUsdPrims.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
@@ -810,12 +793,14 @@ def test_DefaultPrim(self):
             barPrim = s.OverridePrim('/bar')
             assert s.GetDefaultPrim() == barPrim
 
-            # Try error cases.
+            # Set sub-root prims as default, should pick it up
             s.GetRootLayer().defaultPrim = 'foo/bar'
             assert not s.GetDefaultPrim()
-            s.OverridePrim('/foo/bar')
-            assert not s.GetDefaultPrim()
-            s.defaultPrim = ''
+            fooBarPrim = s.OverridePrim('/foo/bar')
+            assert s.GetDefaultPrim() == fooBarPrim
+            
+            # Try error cases
+            s.GetRootLayer().defaultPrim = ''
             assert not s.GetDefaultPrim()
 
             # Try stage-level authoring API.
diff --git a/pxr/usd/usd/testenv/testUsdReadOutOfBounds.py b/pxr/usd/usd/testenv/testUsdReadOutOfBounds.py
index 924c1a6847..c5b7df40fb 100644
--- a/pxr/usd/usd/testenv/testUsdReadOutOfBounds.py
+++ b/pxr/usd/usd/testenv/testUsdReadOutOfBounds.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, unittest
 from pxr import Usd, Tf
diff --git a/pxr/usd/usd/testenv/testUsdReferences.py b/pxr/usd/usd/testenv/testUsdReferences.py
index 975c3eddab..1173b24cc6 100644
--- a/pxr/usd/usd/testenv/testUsdReferences.py
+++ b/pxr/usd/usd/testenv/testUsdReferences.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Sdf,Pcp,Usd,Tf
diff --git a/pxr/usd/usd/testenv/testUsdRelationships.py b/pxr/usd/usd/testenv/testUsdRelationships.py
index 2fa5765489..c57eff6f49 100644
--- a/pxr/usd/usd/testenv/testUsdRelationships.py
+++ b/pxr/usd/usd/testenv/testUsdRelationships.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Sdf, Tf, Usd
diff --git a/pxr/usd/usd/testenv/testUsdResolveTarget.cpp b/pxr/usd/usd/testenv/testUsdResolveTarget.cpp
index ab0654b852..aeae8cccfa 100644
--- a/pxr/usd/usd/testenv/testUsdResolveTarget.cpp
+++ b/pxr/usd/usd/testenv/testUsdResolveTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdResolveTargetPy.py b/pxr/usd/usd/testenv/testUsdResolveTargetPy.py
index 11eaa13e25..0a595967c7 100644
--- a/pxr/usd/usd/testenv/testUsdResolveTargetPy.py
+++ b/pxr/usd/usd/testenv/testUsdResolveTargetPy.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 from pxr import Sdf, Usd
diff --git a/pxr/usd/usd/testenv/testUsdResolverChanged.cpp b/pxr/usd/usd/testenv/testUsdResolverChanged.cpp
index 8af871d701..f7ae66bd49 100644
--- a/pxr/usd/usd/testenv/testUsdResolverChanged.cpp
+++ b/pxr/usd/usd/testenv/testUsdResolverChanged.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usd/testenv/testUsdSchemaBase.cpp b/pxr/usd/usd/testenv/testUsdSchemaBase.cpp
index 3186890366..d26c52c911 100644
--- a/pxr/usd/usd/testenv/testUsdSchemaBase.cpp
+++ b/pxr/usd/usd/testenv/testUsdSchemaBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdSchemaBasePy.py b/pxr/usd/usd/testenv/testUsdSchemaBasePy.py
index 15aa3f60f2..560b2a6272 100644
--- a/pxr/usd/usd/testenv/testUsdSchemaBasePy.py
+++ b/pxr/usd/usd/testenv/testUsdSchemaBasePy.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Gf, Tf, Sdf, Usd, Vt
 import unittest, math
diff --git a/pxr/usd/usd/testenv/testUsdSchemaRegistry.py b/pxr/usd/usd/testenv/testUsdSchemaRegistry.py
index e3b48f7a46..34974aecda 100644
--- a/pxr/usd/usd/testenv/testUsdSchemaRegistry.py
+++ b/pxr/usd/usd/testenv/testUsdSchemaRegistry.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, unittest
 from pxr import Plug, Usd, Sdf, Vt, Tf
@@ -59,7 +42,7 @@ def test_PrimMetadata(self):
             "testDictionaryMetadata", "value"), 2)
 
         self.assertEqual(primDef.GetDocumentation(),
-                         "Testing documentation metadata")
+                         "Testing brief user doc for schema class")
 
     def test_AttributeMetadata(self):
         primDef = Usd.SchemaRegistry().FindConcretePrimDefinition(
@@ -114,9 +97,9 @@ def test_AttributeMetadata(self):
         self.assertEqual(attrDef.GetMetadata("documentation"),
                          "Testing documentation metadata")
         self.assertEqual(attrDef.GetDocumentation(),
-                         "Testing documentation metadata")
+                         "Testing brief user doc for schema attr")
         self.assertEqual(primDef.GetPropertyDocumentation("testAttr"),
-                         "Testing documentation metadata")
+                         "Testing brief user doc for schema attr")
 
         # Dictionary metadata can be gotten by whole value as well as queried
         # for individual keys in the metadata value.
@@ -193,9 +176,9 @@ def test_RelationshipMetadata(self):
         self.assertEqual(relDef.GetMetadata("documentation"),
                          "Testing documentation metadata")
         self.assertEqual(relDef.GetDocumentation(),
-                         "Testing documentation metadata")
-        self.assertEqual(primDef.GetPropertyDocumentation("testAttr"),
-                         "Testing documentation metadata")
+                         "Testing brief user doc for schema rel")
+        self.assertEqual(primDef.GetPropertyDocumentation("testRel"),
+                         "Testing brief user doc for schema rel")
 
         # Dictionary metadata can be gotten by whole value as well as queried
         # for individual keys in the metadata value.
@@ -597,7 +580,9 @@ def _VerifyExpectedPrimData(layer, path, expectedPrimFields,
                 "hidden" : True,
                 "testCustomMetadata" : "garply",
                 "testDictionaryMetadata" : {"name" : "bar", "value" : 3},
-                "variability" : Sdf.VariabilityVarying
+                "variability" : Sdf.VariabilityVarying,
+                "customData" : 
+                {"userDocBrief" : "Testing brief user doc for schema attr"}
             },
             "testRel" : {
                 "custom" : False,
@@ -607,7 +592,9 @@ def _VerifyExpectedPrimData(layer, path, expectedPrimFields,
                 "hidden" : True,
                 "testCustomMetadata" : "garply",
                 "testDictionaryMetadata" : {"name" : "baz", "value" : 5},
-                "variability" : Sdf.VariabilityUniform
+                "variability" : Sdf.VariabilityUniform,
+                "customData" : 
+                {"userDocBrief" : "Testing brief user doc for schema rel"}
             }
         }
 
diff --git a/pxr/usd/usd/testenv/testUsdSchemaRegistry/resources/generatedSchema.usda b/pxr/usd/usd/testenv/testUsdSchemaRegistry/resources/generatedSchema.usda
index ef51f19f7a..48c57fc35f 100644
--- a/pxr/usd/usd/testenv/testUsdSchemaRegistry/resources/generatedSchema.usda
+++ b/pxr/usd/usd/testenv/testUsdSchemaRegistry/resources/generatedSchema.usda
@@ -10,6 +10,9 @@ class "AbstractTest" (
 {
     string testAttr = "foo" (
         allowedTokens = ["bar", "baz"]
+        customData = {
+            string userDocBrief = "Testing brief user doc for schema attr"
+        }
         displayGroup = "Display Group"
         displayName = "Display Name"
         doc = "Testing documentation metadata"
@@ -23,6 +26,9 @@ class "AbstractTest" (
 }
 
 class MetadataTest "MetadataTest" (
+    customData = {
+        string userDocBrief = "Testing brief user doc for schema class"
+    }
     doc = "Testing documentation metadata"
     hidden = true
     testCustomMetadata = "garply"
@@ -34,6 +40,9 @@ class MetadataTest "MetadataTest" (
 {
     string testAttr = "foo" (
         allowedTokens = ["bar", "baz"]
+        customData = {
+            string userDocBrief = "Testing brief user doc for schema attr"
+        }
         displayGroup = "Display Group"
         displayName = "Display Name"
         doc = "Testing documentation metadata"
@@ -45,6 +54,9 @@ class MetadataTest "MetadataTest" (
         }
     )
     rel testRel (
+        customData = {
+            string userDocBrief = "Testing brief user doc for schema rel"
+        }
         displayGroup = "Display Group"
         displayName = "Display Name"
         doc = "Testing documentation metadata"
diff --git a/pxr/usd/usd/testenv/testUsdSchemaRegistry/resources/schema.usda b/pxr/usd/usd/testenv/testUsdSchemaRegistry/resources/schema.usda
index e777270c63..8626921ed6 100644
--- a/pxr/usd/usd/testenv/testUsdSchemaRegistry/resources/schema.usda
+++ b/pxr/usd/usd/testenv/testUsdSchemaRegistry/resources/schema.usda
@@ -34,6 +34,9 @@ class "AbstractTest" (
             string name = "bar"
             int value = 3
         }
+        customData = {
+            string userDocBrief = """Testing brief user doc for schema attr"""
+        }          
     )
 }
 
@@ -46,6 +49,9 @@ class MetadataTest "MetadataTest" (
         string name = "foo"
         int value = 2
     }
+    customData = {
+        string userDocBrief = """Testing brief user doc for schema class"""
+    }    
 )
 {
     rel testRel (
@@ -57,6 +63,9 @@ class MetadataTest "MetadataTest" (
         testDictionaryMetadata = {
             string name = "baz"
             int value = 5
-        }
+        }      
+        customData = {
+            string userDocBrief = """Testing brief user doc for schema rel"""
+        }          
     )
 }
diff --git a/pxr/usd/usd/testenv/testUsdSchemaRegistryCpp.cpp b/pxr/usd/usd/testenv/testUsdSchemaRegistryCpp.cpp
index d83f789736..d6b4867b5a 100644
--- a/pxr/usd/usd/testenv/testUsdSchemaRegistryCpp.cpp
+++ b/pxr/usd/usd/testenv/testUsdSchemaRegistryCpp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdSchemaRegistryThreadedInit.py b/pxr/usd/usd/testenv/testUsdSchemaRegistryThreadedInit.py
new file mode 100644
index 0000000000..e02f31104e
--- /dev/null
+++ b/pxr/usd/usd/testenv/testUsdSchemaRegistryThreadedInit.py
@@ -0,0 +1,24 @@
+#!/pxrpythonsubst
+#
+# Copyright 2024 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+
+import unittest, threading
+
+from pxr import Usd
+
+class TestUsdSchemaRegistryThreadedInit(unittest.TestCase):
+    def test_ThreadedInit(self):
+        threads = []
+        for i in range(2):
+            thread = threading.Thread(target=lambda: Usd.SchemaRegistry())
+            thread.start()
+            threads.append(thread)
+
+        for thread in threads:
+            thread.join()
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/pxr/usd/usd/testenv/testUsdSchemaVersioning.py b/pxr/usd/usd/testenv/testUsdSchemaVersioning.py
index d05e34359f..c9d2b7dbf1 100644
--- a/pxr/usd/usd/testenv/testUsdSchemaVersioning.py
+++ b/pxr/usd/usd/testenv/testUsdSchemaVersioning.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, unittest
 from pxr import Plug, Usd, Tf
diff --git a/pxr/usd/usd/testenv/testUsdSpecializes.py b/pxr/usd/usd/testenv/testUsdSpecializes.py
index 256860a8fe..b5d58e803a 100644
--- a/pxr/usd/usd/testenv/testUsdSpecializes.py
+++ b/pxr/usd/usd/testenv/testUsdSpecializes.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 from pxr import Usd, Pcp, Sdf, Tf
diff --git a/pxr/usd/usd/testenv/testUsdStage.py b/pxr/usd/usd/testenv/testUsdStage.py
index d4e1f11761..3fa99ae6db 100644
--- a/pxr/usd/usd/testenv/testUsdStage.py
+++ b/pxr/usd/usd/testenv/testUsdStage.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Sdf,Usd,Tf
@@ -446,6 +429,70 @@ def test_BadGetPrimAtPath(self):
             # Should get an invalid prim if passed an empty path
             assert(not s.GetPrimAtPath(Sdf.Path.emptyPath))
 
+    def test_StageCompositionErrors(self):
+        layer = Sdf.Layer.CreateAnonymous('.usda')
+        layer.ImportFromString('''
+        #usda 1.0
+        (
+            subLayers = [
+                @missingLayer.usda@
+            ]
+        )
+
+        def "World"
+        {
+            def "Inst1" (
+                instanceable = true
+                prepend references = </Main>
+            )
+            {
+            }
+            def "Inst2" (
+                instanceable = true
+                prepend references = </Main>
+            )
+            {
+            }
+        }
+
+        def "Main" (
+        )
+        {
+            def "First" (
+                add references = </Main/Second>
+            )
+            {
+            }
+
+            def "Second" (
+                add references = </Main/First>
+            )
+            {
+            }
+        }'''.strip())
+        s = Usd.Stage.Open(layer.identifier)
+        errors = s.GetCompositionErrors()
+        # Make sure composition errors are always in a specific order, to test
+        # the error types below
+        errors = sorted(errors, key=lambda error: error.rootSite.path)
+        self.assertEqual(len(errors), 5)
+        
+        # Find out whats the source path for the instances, for which errors
+        # will be reported.
+        srcPrimPath = s.GetPrototypes()[0]._GetSourcePrimIndex().rootNode.path
+        
+        from pxr import Pcp
+        expectedErrors = [ (Pcp.ErrorType_InvalidSublayerPath, "/"),
+                               (Pcp.ErrorType_ArcCycle, "/Main/First"),
+                               (Pcp.ErrorType_ArcCycle, "/Main/Second"),
+                               (Pcp.ErrorType_ArcCycle, 
+                                srcPrimPath.AppendChild("First").pathString),
+                               (Pcp.ErrorType_ArcCycle, 
+                                srcPrimPath.AppendChild("Second").pathString) ]
+        for i in range(5):
+            self.assertEqual(expectedErrors[i][0], errors[i].errorType)
+            self.assertEqual(expectedErrors[i][1], errors[i].rootSite.path)
+
     def test_GetAtPath(self):
         for fmt in allFormats:
             s = Usd.Stage.CreateInMemory('GetAtPath.'+fmt)
diff --git a/pxr/usd/usd/testenv/testUsdStageCache.py b/pxr/usd/usd/testenv/testUsdStageCache.py
index 57e5436b30..9d7263b515 100644
--- a/pxr/usd/usd/testenv/testUsdStageCache.py
+++ b/pxr/usd/usd/testenv/testUsdStageCache.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Sdf,Usd,Tf,Ar
diff --git a/pxr/usd/usd/testenv/testUsdStageDefaultResolver.py b/pxr/usd/usd/testenv/testUsdStageDefaultResolver.py
index 4aacaff62a..006c89f9de 100644
--- a/pxr/usd/usd/testenv/testUsdStageDefaultResolver.py
+++ b/pxr/usd/usd/testenv/testUsdStageDefaultResolver.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2024 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/usd/testenv/testUsdStageLoadUnload.py b/pxr/usd/usd/testenv/testUsdStageLoadUnload.py
index cfab32d7b8..a9478fef61 100644
--- a/pxr/usd/usd/testenv/testUsdStageLoadUnload.py
+++ b/pxr/usd/usd/testenv/testUsdStageLoadUnload.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdStageNoPython.cpp b/pxr/usd/usd/testenv/testUsdStageNoPython.cpp
index 9ac807fabc..de381cf3ae 100644
--- a/pxr/usd/usd/testenv/testUsdStageNoPython.cpp
+++ b/pxr/usd/usd/testenv/testUsdStageNoPython.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 
diff --git a/pxr/usd/usd/testenv/testUsdStageNotification.cpp b/pxr/usd/usd/testenv/testUsdStageNotification.cpp
index 1e23eceb77..4f450ceffe 100644
--- a/pxr/usd/usd/testenv/testUsdStageNotification.cpp
+++ b/pxr/usd/usd/testenv/testUsdStageNotification.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdStagePopulationMasks.py b/pxr/usd/usd/testenv/testUsdStagePopulationMasks.py
index ffc68cbd08..ae908b5bf9 100644
--- a/pxr/usd/usd/testenv/testUsdStagePopulationMasks.py
+++ b/pxr/usd/usd/testenv/testUsdStagePopulationMasks.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 from pxr import Usd, Sdf, Tf
diff --git a/pxr/usd/usd/testenv/testUsdStageThreading.cpp b/pxr/usd/usd/testenv/testUsdStageThreading.cpp
index b4dabedafa..362c742812 100644
--- a/pxr/usd/usd/testenv/testUsdStageThreading.cpp
+++ b/pxr/usd/usd/testenv/testUsdStageThreading.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usd/testenv/testUsdTemplatedIO.cpp b/pxr/usd/usd/testenv/testUsdTemplatedIO.cpp
index 36627b15ce..1c276573b2 100644
--- a/pxr/usd/usd/testenv/testUsdTemplatedIO.cpp
+++ b/pxr/usd/usd/testenv/testUsdTemplatedIO.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdThreadedAuthoring.cpp b/pxr/usd/usd/testenv/testUsdThreadedAuthoring.cpp
index be233a0d3e..6f1a1fbad2 100644
--- a/pxr/usd/usd/testenv/testUsdThreadedAuthoring.cpp
+++ b/pxr/usd/usd/testenv/testUsdThreadedAuthoring.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdTimeCodeRepr.py b/pxr/usd/usd/testenv/testUsdTimeCodeRepr.py
index a0387e87e4..9b7945dd98 100644
--- a/pxr/usd/usd/testenv/testUsdTimeCodeRepr.py
+++ b/pxr/usd/usd/testenv/testUsdTimeCodeRepr.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd,Sdf
 
diff --git a/pxr/usd/usd/testenv/testUsdTimeCodeStream.cpp b/pxr/usd/usd/testenv/testUsdTimeCodeStream.cpp
index 8710037f02..1c2597070c 100644
--- a/pxr/usd/usd/testenv/testUsdTimeCodeStream.cpp
+++ b/pxr/usd/usd/testenv/testUsdTimeCodeStream.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdTimeOffsets.py b/pxr/usd/usd/testenv/testUsdTimeOffsets.py
index 34cd4e2eb6..711f6a14be 100644
--- a/pxr/usd/usd/testenv/testUsdTimeOffsets.py
+++ b/pxr/usd/usd/testenv/testUsdTimeOffsets.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 from __future__ import division
diff --git a/pxr/usd/usd/testenv/testUsdTimeSamples.py b/pxr/usd/usd/testenv/testUsdTimeSamples.py
index 59c994a073..4ad1b75fa9 100644
--- a/pxr/usd/usd/testenv/testUsdTimeSamples.py
+++ b/pxr/usd/usd/testenv/testUsdTimeSamples.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdTimeValueAuthoring.cpp b/pxr/usd/usd/testenv/testUsdTimeValueAuthoring.cpp
index 4bcc2c69d4..49bf01a5ae 100644
--- a/pxr/usd/usd/testenv/testUsdTimeValueAuthoring.cpp
+++ b/pxr/usd/usd/testenv/testUsdTimeValueAuthoring.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdTimeValueAuthoring.py b/pxr/usd/usd/testenv/testUsdTimeValueAuthoring.py
index 9a1ff434af..87aca46bc9 100644
--- a/pxr/usd/usd/testenv/testUsdTimeValueAuthoring.py
+++ b/pxr/usd/usd/testenv/testUsdTimeValueAuthoring.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Sdf, Usd, Tf, Plug
diff --git a/pxr/usd/usd/testenv/testUsdUsdzFileFormat.py b/pxr/usd/usd/testenv/testUsdUsdzFileFormat.py
index 5d7cdc2d4b..1f6b44700d 100644
--- a/pxr/usd/usd/testenv/testUsdUsdzFileFormat.py
+++ b/pxr/usd/usd/testenv/testUsdUsdzFileFormat.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/usd/testenv/testUsdUsdzResolver.cpp b/pxr/usd/usd/testenv/testUsdUsdzResolver.cpp
index aa9db7649a..de7a09e1e8 100644
--- a/pxr/usd/usd/testenv/testUsdUsdzResolver.cpp
+++ b/pxr/usd/usd/testenv/testUsdUsdzResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/testenv/testUsdValidationRegistry.cpp b/pxr/usd/usd/testenv/testUsdValidationRegistry.cpp
new file mode 100644
index 0000000000..fd7db260c2
--- /dev/null
+++ b/pxr/usd/usd/testenv/testUsdValidationRegistry.cpp
@@ -0,0 +1,325 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/usd/usd/validationRegistry.h"
+#include "pxr/usd/usd/validationError.h"
+#include "pxr/usd/usd/validatorTokens.h"
+#include "pxr/usd/usd/validator.h"
+#include "pxr/base/arch/systemInfo.h"
+#include "pxr/base/plug/registry.h"
+#include "pxr/base/tf/errorMark.h"
+#include "pxr/base/tf/registryManager.h"
+#include "pxr/base/tf/token.h"
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+TF_REGISTRY_FUNCTION(UsdValidationRegistry)
+{
+    UsdValidationRegistry& registry = UsdValidationRegistry::GetInstance();
+
+    {
+        const TfToken validatorName("testValidationPlugin:TestValidator1");
+        const UsdValidateStageTaskFn stageTaskFn = [](
+            const UsdStagePtr & usdStage)
+        {
+            return UsdValidationErrorVector{
+                    UsdValidationError(UsdValidationErrorType::Error, 
+                                      {UsdValidationErrorSite(usdStage, 
+                                                              SdfPath("/"))},
+                                      "This is an error on the stage")};
+        };
+
+        // Register the validator
+        TfErrorMark m;
+        registry.RegisterPluginValidator(validatorName, stageTaskFn);
+        TF_AXIOM(m.IsClean());
+    }
+    {
+        const TfToken validatorName("testValidationPlugin:TestValidator2");
+        const UsdValidatePrimTaskFn primTaskFn = [](const UsdPrim & /*prim*/)
+        {
+            return UsdValidationErrorVector{};
+        };
+
+        // Register the validator
+        TfErrorMark m;
+        registry.RegisterPluginValidator(validatorName, primTaskFn);
+        TF_AXIOM(m.IsClean());
+    }
+    {
+        const TfToken validatorName("testValidationPlugin:TestValidator3");
+        const UsdValidatePrimTaskFn primTaskFn = [](const UsdPrim & /*prim*/)
+            {
+                return UsdValidationErrorVector{};
+            };
+
+        // Register the validator
+        TfErrorMark m;
+        registry.RegisterPluginValidator(validatorName, primTaskFn);
+        TF_AXIOM(m.IsClean());
+    }
+    {
+        const TfToken suiteName("testValidationPlugin:TestValidatorSuite");
+        const std::vector<const UsdValidator*> containedValidators =
+            registry.GetOrLoadValidatorsByName(
+                {TfToken("testValidationPlugin:TestValidator1"),
+                 TfToken("testValidationPlugin:TestValidator2")});
+        TfErrorMark m;
+        registry.RegisterPluginValidatorSuite(suiteName, containedValidators);
+        TF_AXIOM(m.IsClean());
+    }
+    {
+        const TfToken validatorName("testValidationPlugin:FailedValidator");
+        const UsdValidateStageTaskFn stageTaskFn = [](
+            const UsdStagePtr & /*stage*/)
+        {
+            return UsdValidationErrorVector{};
+        };
+
+        // Register the validator
+        TfErrorMark m;
+        registry.RegisterPluginValidator(validatorName, stageTaskFn);
+        TF_AXIOM(!m.IsClean());
+    }
+    {
+        const TfToken suiteName("testValidationPlugin:FailedValidatorSuite");
+        const std::vector<const UsdValidator*> containedValidators =
+            registry.GetOrLoadValidatorsByName(
+                {TfToken("testValidationPlugin:TestValidator2"),
+                 TfToken("testValidationPlugin:TestValidator1")});
+        TfErrorMark m;
+        registry.RegisterPluginValidatorSuite(suiteName, containedValidators);
+        TF_AXIOM(!m.IsClean());
+    }
+    {
+        const TfToken suiteName("testValidationPlugin:FailedValidatorSuite2");
+        const std::vector<const UsdValidator*> containedValidators =
+            registry.GetOrLoadValidatorsByName(
+                {TfToken("testValidationPlugin:TestValidator2")});
+        TfErrorMark m;
+        registry.RegisterPluginValidatorSuite(suiteName, containedValidators);
+        TF_AXIOM(!m.IsClean());
+    }
+}
+
+void TestUsdValidationRegistry()
+{
+    UsdValidationRegistry &registry = UsdValidationRegistry::GetInstance();
+
+    {
+        UsdValidatorMetadata metadata;
+
+        TF_AXIOM(registry.GetValidatorMetadata(
+            TfToken("testValidationPlugin:TestValidator1"), &metadata));
+        const TfTokenVector expectedKeywords = {
+            TfToken("IncludedInAll"),
+            TfToken("SomeKeyword1") };
+        TF_AXIOM(metadata.keywords == expectedKeywords);
+        const std::string expectedDoc = "TestValidator1 for keywords metadata "
+                                         "parsing";
+        TF_AXIOM(metadata.doc == expectedDoc);
+        TF_AXIOM(!metadata.isSuite);
+
+        // Actually go and call validate on this and inspect the Error.
+        const UsdValidator* const validator = 
+            registry.GetOrLoadValidatorByName(metadata.name);
+        TF_AXIOM(validator);
+        UsdStageRefPtr usdStage = UsdStage::CreateInMemory();
+        const UsdValidationErrorVector errors = validator->Validate(usdStage);
+        TF_AXIOM(errors.size() == 1);
+        TF_AXIOM(!errors[0].HasNoError());
+        TF_AXIOM(errors[0].GetType() == UsdValidationErrorType::Error);
+        TF_AXIOM(errors[0].GetValidator() == validator);
+        const UsdValidationErrorSites &errorSites = errors[0].GetSites();
+        TF_AXIOM(errorSites.size() == 1);
+        TF_AXIOM(!errorSites[0].IsValidSpecInLayer());
+        TF_AXIOM(errorSites[0].IsPrim());
+        TF_AXIOM(!errorSites[0].IsProperty());
+
+        // TestValidator1 has a StageTaskFn, try giving it a layer or a prim, it
+        // must return a no error.
+        TF_AXIOM(validator->Validate(usdStage->GetPseudoRoot()).empty());
+        TF_AXIOM(validator->Validate(usdStage->GetRootLayer()).empty());
+    }
+    {
+        UsdValidatorMetadataVector metadata =
+            registry.GetValidatorMetadataForSchemaType(
+                TfToken("SomePrimType"));
+        TF_AXIOM(metadata.size() == 4);
+        TfTokenVector expectedValue({
+            TfToken("testValidationPlugin:FailedValidator"),
+            TfToken("testValidationPlugin:FailedValidatorSuite"),
+            TfToken("testValidationPlugin:TestValidator2"),
+            TfToken("testValidationPlugin:TestValidator3")
+        });
+        TF_AXIOM(TfTokenVector({metadata[0].name, metadata[1].name,
+            metadata[2].name, metadata[3].name}) == expectedValue);
+    }
+    {
+        UsdValidatorMetadataVector metadata =
+            registry.GetValidatorMetadataForKeyword(
+                TfToken("SomeKeyword1"));
+        TF_AXIOM(metadata.size() == 2);
+        TfTokenVector expectedValue({
+            TfToken("testValidationPlugin:TestValidator1"),
+            TfToken("testValidationPlugin:TestValidator3")
+        });
+        TF_AXIOM(TfTokenVector({metadata[0].name, metadata[1].name}) == 
+                 expectedValue);
+        TF_AXIOM(!metadata[0].isSuite);
+        TF_AXIOM(!metadata[1].isSuite);
+    }
+    {
+        const UsdValidatorSuite* suiteValidator = 
+            registry.GetOrLoadValidatorSuiteByName(
+                TfToken("testValidationPlugin:TestValidatorSuite"));
+        const UsdValidatorMetadata &metadata = suiteValidator->GetMetadata();
+        TF_AXIOM(metadata.name == TfToken(
+             "testValidationPlugin:TestValidatorSuite"));
+        TF_AXIOM(metadata.isSuite);
+        TF_AXIOM(metadata.doc == "Suite of TestValidator1 and TestValidator2");
+        TF_AXIOM(metadata.keywords.size() == 2);
+        TF_AXIOM(metadata.keywords == TfTokenVector({
+            TfToken("IncludedInAll"), TfToken("SuiteValidator")}));
+        const std::vector<const UsdValidator*> containedValidators =
+            suiteValidator->GetContainedValidators();
+        {
+            const UsdValidatorMetadata &vm = 
+                containedValidators[0]->GetMetadata();
+            TF_AXIOM(vm.name == TfToken("testValidationPlugin:TestValidator1"));
+            TF_AXIOM(vm.keywords.size() == 2);
+            TF_AXIOM(vm.keywords == TfTokenVector({
+                TfToken("IncludedInAll"), TfToken("SomeKeyword1")}));
+            TF_AXIOM(vm.schemaTypes.empty());
+        }
+        {
+            const UsdValidatorMetadata &vm = 
+                containedValidators[1]->GetMetadata();
+            TF_AXIOM(vm.name == TfToken("testValidationPlugin:TestValidator2"));
+            TF_AXIOM(vm.keywords.size() == 1);
+            TF_AXIOM(vm.keywords[0] == TfToken("IncludedInAll"));
+            TF_AXIOM(vm.schemaTypes.size() == 2);
+            TF_AXIOM(vm.schemaTypes == TfTokenVector({
+                TfToken("SomePrimType"), TfToken("SomeAPISchema")}));
+        }
+    }
+    {
+        // Try to retrieve a failed validator (stageTask for validator which
+        // provides schemaTypes
+        const UsdValidator* validator = registry.GetOrLoadValidatorByName(
+            TfToken("testValidationPlugin:FailedValidator"));
+        TF_AXIOM(!validator);
+    }
+    {
+        // Try to retrieve a failed validator suite (stageTask for a contained 
+        // validator but suite provides schemaTypes
+        const UsdValidatorSuite* suite = registry.GetOrLoadValidatorSuiteByName(
+            TfToken("testValidationPlugin:FailedValidatorSuite"));
+        TF_AXIOM(!suite);
+    }
+    {
+        // The following test keeps track of all the available validators within
+        // UsdCoreValidators keyword, hence as new validators are added under
+        // this keyword this unit test will have to be updated.
+        const UsdValidatorMetadataVector coreValidatorMetadata =
+            registry.GetValidatorMetadataForKeyword(
+                UsdValidatorKeywordTokens->UsdCoreValidators);
+        TF_AXIOM(coreValidatorMetadata.size() == 1);
+        const std::vector<TfToken> expectedValidatorNames = 
+            {UsdValidatorNameTokens->compositionErrorTest};
+
+        for (size_t index = 0; index < coreValidatorMetadata.size(); ++index) {
+            TF_AXIOM(coreValidatorMetadata[index].name == 
+                 expectedValidatorNames[index]);
+        }
+    }
+    {
+        // test to make sure CompositionErrorTest validator provided in the core
+        // usd plugin works correctly by reporting all the composition errors,
+        // error sites and appropriate messages pertaining to these errors.
+        const UsdValidator* const compositionErrorValidator =
+            registry.GetOrLoadValidatorByName(
+                UsdValidatorNameTokens->compositionErrorTest);
+        TF_AXIOM(compositionErrorValidator);
+        
+        static const std::string layerContents = 
+            R"usda(#usda 1.0
+            (
+                subLayers = [
+                    @missingLayer.usda@
+                ]
+            )
+            def "World"
+            {
+                def "Inst1" (
+                    instanceable = true
+                    prepend references = </Main>
+                )
+                {
+                }
+                def "Inst2" (
+                    instanceable = true
+                    prepend references = </Main>
+                )
+                {
+                }
+            }
+            def "Main"
+            {
+                def "First" (
+                    add references = </Main/Second>
+                )
+                {
+                }
+                def "Second" (
+                    add references = </Main/First>
+                )
+                {
+                }
+            }
+        )usda";
+        SdfLayerRefPtr layer = SdfLayer::CreateAnonymous(".usda");
+        layer->ImportFromString(layerContents);
+        UsdStageRefPtr usdStage = UsdStage::Open(layer);
+
+        // Get expected list of composition errors from the stage.
+        const PcpErrorVector expectedPcpErrors = 
+            usdStage->GetCompositionErrors();
+        TF_AXIOM(expectedPcpErrors.size() == 5);
+
+        // Get wrapped validation errors from our compositionErrorValidator
+        UsdValidationErrorVector errors = 
+            compositionErrorValidator->Validate(usdStage);
+        TF_AXIOM(errors.size() == 5);
+
+        // Lets make sure pcpErrors and validationErrors match
+        for (size_t index = 0; index < errors.size(); ++index) {
+            TF_AXIOM(errors[index].GetValidator() == compositionErrorValidator);
+            TF_AXIOM(errors[index].GetMessage() == 
+                     expectedPcpErrors[index]->ToString());
+            TF_AXIOM(errors[index].GetSites().size() == 1);
+            TF_AXIOM(errors[index].GetSites().size() == 1);
+            TF_AXIOM(errors[index].GetSites()[0].IsValid());
+            TF_AXIOM(errors[index].GetSites()[0].IsPrim());
+            TF_AXIOM(errors[index].GetSites()[0].GetPrim().GetPath() ==
+                     expectedPcpErrors[index]->rootSite.path);
+        }
+    }
+}
+
+int 
+main()
+{
+    // Register the test plugin
+    const std::string testDir = ArchGetCwd();
+    TF_AXIOM(!PlugRegistry::GetInstance().RegisterPlugins(testDir).empty());
+    
+    TestUsdValidationRegistry();
+
+    printf("OK\n");
+}
diff --git a/pxr/usd/usd/testenv/testUsdValidationRegistry/plugInfo.json b/pxr/usd/usd/testenv/testUsdValidationRegistry/plugInfo.json
new file mode 100644
index 0000000000..e5b343bc12
--- /dev/null
+++ b/pxr/usd/usd/testenv/testUsdValidationRegistry/plugInfo.json
@@ -0,0 +1,45 @@
+{
+    "Plugins": [
+        {
+            "Type": "resource",
+            "Name": "testValidationPlugin",
+            "Info": {
+                "Validators": {
+                    "keywords": ["IncludedInAll"],
+                    "FailedValidator": {
+                        "doc": "Won't get registered, as schemaType provided, but primTask not provided",
+                        "schemaTypes": ["SomePrimType"]
+                    },
+                    "FailedValidatorSuite": {
+                        "doc": "Won't get registered, as contained validators will not comply",
+                        "schemaTypes": ["SomePrimType", "SomeAPISchema"]
+                    },
+                    "FailedValidatorSuite2": {
+                        "doc": "Won't get registered, as contained validators will not comply",
+                        "schemaTypes": ["SomeOtherPrimType"]
+                    },
+                    "TestValidator1": {
+                        "doc": "TestValidator1 for keywords metadata parsing",
+                        "keywords": ["SomeKeyword1"],
+                        "isSuite": false
+                    },
+                    "TestValidator2": {
+                        "doc": "TestValidator2 for schemaType metadata parsing",
+                        "schemaTypes": ["SomePrimType", "SomeAPISchema"],
+                        "someBogusMetadta": "Doesn't get parsed"
+                    },
+                    "TestValidator3": {
+                        "doc": "TestValidator3 for schemaType metadata parsing",
+                        "schemaTypes": ["SomePrimType"],
+                        "keywords": ["SomeKeyword1"]
+                    },
+                    "TestValidatorSuite": {
+                        "doc": "Suite of TestValidator1 and TestValidator2",
+                        "keywords": ["SuiteValidator"],
+                        "isSuite": true
+                    }
+                }
+            }
+        }
+    ]
+}
diff --git a/pxr/usd/usd/testenv/testUsdValidator.cpp b/pxr/usd/usd/testenv/testUsdValidator.cpp
new file mode 100644
index 0000000000..030dc81bc2
--- /dev/null
+++ b/pxr/usd/usd/testenv/testUsdValidator.cpp
@@ -0,0 +1,140 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/usd/sdf/layer.h"
+#include "pxr/usd/usd/validator.h"
+#include "pxr/usd/usd/validationError.h"
+
+#include <iostream>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+static
+void TestSimpleValidator()
+{
+    // Note that these are just to test the validator -> taskFn -> Error 
+    // pipeline, validators should ideally be registered with the 
+    // UsdValidationRegistry.
+    //
+    // Simple LayerValidator
+    UsdValidateLayerTaskFn validateLayerTaskFn = 
+        [](const SdfLayerHandle& layer) {
+        return UsdValidationErrorVector{UsdValidationError()};
+    };
+    UsdValidatorMetadata metadata;
+    metadata.name = TfToken("TestSimpleLayerValidator");
+    metadata.doc = "This is a test.";
+    metadata.isSuite = false;
+    UsdValidator layerValidator = UsdValidator(metadata, validateLayerTaskFn);
+    SdfLayerRefPtr testLayer = SdfLayer::CreateAnonymous();
+    {
+        UsdValidationErrorVector errors = layerValidator.Validate(testLayer);
+        TF_AXIOM(errors.size() == 1);
+        TF_AXIOM(errors[0].HasNoError());
+        TF_AXIOM(errors[0].GetSites().empty());
+        TF_AXIOM(errors[0].GetValidator() == &layerValidator);
+    }
+    // Use the LayerValidator to validate a prim!!
+    // Note that this validator has no UsdValidatePrimTaskFn!
+    UsdStageRefPtr usdStage2 = UsdStage::CreateInMemory();
+    const UsdPrim prim = usdStage2->GetPseudoRoot();
+    {
+        TF_AXIOM(layerValidator.Validate(prim).empty());
+    }
+
+    // Simple StageValidator
+    UsdValidateStageTaskFn validateStageTaskFn = 
+        [](const UsdStageRefPtr &usdStage) {
+            return UsdValidationErrorVector{
+                UsdValidationError(UsdValidationErrorType::Error, 
+                                   {UsdValidationErrorSite(usdStage, 
+                                                           SdfPath("/"))},
+                                   "This is an error on the stage")};
+    };
+    metadata.name = TfToken("TestSimpleStageValidator");
+    UsdValidator stageValidator = UsdValidator(metadata, validateStageTaskFn);
+    UsdStageRefPtr usdStage = UsdStage::CreateInMemory();
+    {
+        UsdValidationErrorVector errors = stageValidator.Validate(usdStage);
+        TF_AXIOM(errors.size() == 1);
+        TF_AXIOM(!errors[0].HasNoError());
+        TF_AXIOM(errors[0].GetType() == UsdValidationErrorType::Error);
+        TF_AXIOM(errors[0].GetValidator() == &stageValidator);
+        const UsdValidationErrorSites &errorSites = errors[0].GetSites();
+        TF_AXIOM(errorSites.size() == 1);
+        TF_AXIOM(!errorSites[0].IsValidSpecInLayer());
+        TF_AXIOM(errorSites[0].IsPrim());
+        TF_AXIOM(!errorSites[0].IsProperty());
+    }
+    // Use the StageValidator to validate a layer
+    // Note that this validator has no UsdValidateLayerTaskFn
+    {
+        TF_AXIOM(stageValidator.Validate(testLayer).empty());
+    }
+    // Create a stage using the layer and validate the stage now!
+    UsdStageRefPtr usdStageFromLayer = UsdStage::Open(testLayer);
+    {
+        UsdValidationErrorVector errors = 
+            stageValidator.Validate(usdStageFromLayer);
+        TF_AXIOM(errors.size() == 1);
+        TF_AXIOM(!errors[0].HasNoError());
+        TF_AXIOM(errors[0].GetType() == UsdValidationErrorType::Error);
+        TF_AXIOM(errors[0].GetValidator() == &stageValidator);
+        const UsdValidationErrorSites &errorSites = errors[0].GetSites();
+        TF_AXIOM(errorSites.size() == 1);
+        TF_AXIOM(!errorSites[0].IsValidSpecInLayer());
+        TF_AXIOM(errorSites[0].IsPrim());
+        TF_AXIOM(!errorSites[0].IsProperty());
+    }
+
+    // Simple SchemaTypeValidator
+    UsdValidatePrimTaskFn validatePrimTaskFn = [](const UsdPrim &usdPrim) {
+        return UsdValidationErrorVector{
+            UsdValidationError(UsdValidationErrorType::Error, 
+                               {UsdValidationErrorSite(usdPrim.GetStage(), 
+                                                       usdPrim.GetPath())},
+                               "This is an error on the stage")};
+    };
+    metadata.name = TfToken("TestSimplePrimValidator");
+    metadata.schemaTypes = {TfToken("MadeUpPrimType")};
+    UsdValidator schemaTypeValidator = UsdValidator(metadata, 
+                                                    validatePrimTaskFn);
+    {
+        UsdValidationErrorVector errors = schemaTypeValidator.Validate(prim);
+        TF_AXIOM(errors.size() == 1);
+        TF_AXIOM(!errors[0].HasNoError());
+        TF_AXIOM(errors[0].GetType() == UsdValidationErrorType::Error);
+        TF_AXIOM(errors[0].GetValidator() == &schemaTypeValidator);
+        const UsdValidationErrorSites &errorSites = errors[0].GetSites();
+        TF_AXIOM(errorSites.size() == 1);
+        TF_AXIOM(!errorSites[0].IsValidSpecInLayer());
+        TF_AXIOM(errorSites[0].IsPrim());
+        TF_AXIOM(!errorSites[0].IsProperty());
+    }
+
+    // Simple ValidatorSuite
+    metadata.name = TfToken("TestValidatorSuite");
+    metadata.doc = "This is a test.";
+    metadata.schemaTypes = {};
+    metadata.isSuite = true;
+    UsdValidatorSuite validatorSuite = UsdValidatorSuite(metadata, 
+                                         { 
+                                            &layerValidator, 
+                                            &stageValidator, 
+                                            &schemaTypeValidator
+                                         });
+    TF_AXIOM(validatorSuite.GetContainedValidators().size() == 3);
+}
+
+int 
+main()
+{
+    TestSimpleValidator();
+
+    std::cout << "OK\n";
+}
diff --git a/pxr/usd/usd/testenv/testUsdValueClips.py b/pxr/usd/usd/testenv/testUsdValueClips.py
index 9ed7d1e772..982a110116 100644
--- a/pxr/usd/usd/testenv/testUsdValueClips.py
+++ b/pxr/usd/usd/testenv/testUsdValueClips.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import contextlib
 import os
diff --git a/pxr/usd/usd/testenv/testUsdVariantEditing.py b/pxr/usd/usd/testenv/testUsdVariantEditing.py
index be4831d052..09f4a066d1 100644
--- a/pxr/usd/usd/testenv/testUsdVariantEditing.py
+++ b/pxr/usd/usd/testenv/testUsdVariantEditing.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usd/testenv/testUsdVariantFallbacks.py b/pxr/usd/usd/testenv/testUsdVariantFallbacks.py
index 6d392a3234..099f2aa60e 100644
--- a/pxr/usd/usd/testenv/testUsdVariantFallbacks.py
+++ b/pxr/usd/usd/testenv/testUsdVariantFallbacks.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os, sys, unittest
 from pxr import Gf, Sdf, Usd, Plug
diff --git a/pxr/usd/usd/testenv/testUsdVariants.py b/pxr/usd/usd/testenv/testUsdVariants.py
index 90901d8c8b..0759931064 100644
--- a/pxr/usd/usd/testenv/testUsdVariants.py
+++ b/pxr/usd/usd/testenv/testUsdVariants.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Sdf, Usd, Tf
diff --git a/pxr/usd/usd/testenv/testUsdZipFile.cpp b/pxr/usd/usd/testenv/testUsdZipFile.cpp
index 4bd265fa2d..9ed6db4702 100644
--- a/pxr/usd/usd/testenv/testUsdZipFile.cpp
+++ b/pxr/usd/usd/testenv/testUsdZipFile.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
@@ -62,8 +45,8 @@ TestIterators()
         UsdZipFile::Iterator i = zipFile.begin(), e = zipFile.end();
         TF_AXIOM(std::distance(i, e) == 4);
 
-        TF_AXIOM(*i == "a.txt"); // Test operator*
-        TF_AXIOM(strcmp(i->c_str(), "a.txt") == 0); // Test operator->
+        TF_AXIOM(*i == "a.test"); // Test operator*
+        TF_AXIOM(strcmp(i->c_str(), "a.test") == 0); // Test operator->
         TF_AXIOM(i == std::next(zipFile.begin(), 0));
         TF_AXIOM(i != std::next(zipFile.begin(), 1));
         TF_AXIOM(i != std::next(zipFile.begin(), 2));
diff --git a/pxr/usd/usd/testenv/testUsdZipFile.py b/pxr/usd/usd/testenv/testUsdZipFile.py
index f674f0bdd7..227d775c93 100644
--- a/pxr/usd/usd/testenv/testUsdZipFile.py
+++ b/pxr/usd/usd/testenv/testUsdZipFile.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os
 import unittest
@@ -51,7 +34,7 @@ def test_Reader(self):
         zf = Usd.ZipFile.Open("test_reader.usdz")
         self.assertTrue(zf)
         self.assertEqual(
-            zf.GetFileNames(), ["a.txt", "b.png", "sub/c.png", "sub/d.txt"])
+            zf.GetFileNames(), ["a.test", "b.png", "sub/c.png", "sub/d.txt"])
 
         self.assertIsNone(zf.GetFile("nonexistent.txt"))
         self.assertIsNone(zf.GetFileInfo("nonexistent.txt"))
@@ -62,15 +45,15 @@ def test_Reader(self):
         # translations applied.
         fixLineEndings = True
 
-        fileInfo = zf.GetFileInfo("a.txt")
+        fileInfo = zf.GetFileInfo("a.test")
         self.assertEqual(fileInfo.dataOffset, 64)
-        self.assertEqual(fileInfo.size, 82)
-        self.assertEqual(fileInfo.uncompressedSize, 82)
-        self.assertEqual(fileInfo.crc, 3011207731)
+        self.assertEqual(fileInfo.size, 83)
+        self.assertEqual(fileInfo.uncompressedSize, 83)
+        self.assertEqual(fileInfo.crc, 2187659876)
         self.assertEqual(fileInfo.compressionMethod, 0)
         self.assertFalse(fileInfo.encrypted)
         self._ValidateSourceAndZippedFile(
-            "src/a.txt", zf, "a.txt", fixLineEndings)
+            "src/a.test", zf, "a.test", fixLineEndings)
 
         fileInfo = zf.GetFileInfo("b.png")
         self.assertEqual(fileInfo.dataOffset, 192)
@@ -112,8 +95,8 @@ def test_Writer(self):
             # writer or the writer is destroyed.
             self.assertFalse(os.path.isfile("test_writer.usdz"))
             
-            addedFile = zfw.AddFile("src/a.txt")
-            self.assertEqual(addedFile, "src/a.txt")
+            addedFile = zfw.AddFile("src/a.test")
+            self.assertEqual(addedFile, "src/a.test")
 
             addedFile = zfw.AddFile("src/b.png", "b.png")
             self.assertEqual(addedFile, "b.png")
@@ -122,7 +105,7 @@ def test_Writer(self):
         
         # Verify that the zip file can be read by Usd.ZipFile.
         zf = Usd.ZipFile.Open("test_writer.usdz")
-        self.assertEqual(zf.GetFileNames(), ["src/a.txt", "b.png"])
+        self.assertEqual(zf.GetFileNames(), ["src/a.test", "b.png"])
 
         # Since we're writing files into a .usdz and then extracting
         # and comparing them to the original file, we don't need to
@@ -132,11 +115,11 @@ def test_Writer(self):
         def _GetFileSize(file):
             return os.stat(file).st_size
 
-        fileInfo = zf.GetFileInfo("src/a.txt")
+        fileInfo = zf.GetFileInfo("src/a.test")
         self.assertEqual(fileInfo.dataOffset, 64)
-        self.assertEqual(fileInfo.size, _GetFileSize("src/a.txt"))
-        self.assertEqual(fileInfo.uncompressedSize, _GetFileSize("src/a.txt"))
-        self.assertEqual(fileInfo.crc, 3011207731)
+        self.assertEqual(fileInfo.size, _GetFileSize("src/a.test"))
+        self.assertEqual(fileInfo.uncompressedSize, _GetFileSize("src/a.test"))
+        self.assertEqual(fileInfo.crc, 2187659876)
         self.assertEqual(fileInfo.compressionMethod, 0)
         self.assertFalse(fileInfo.encrypted)
 
@@ -149,7 +132,7 @@ def _GetFileSize(file):
         self.assertFalse(fileInfo.encrypted)
 
         self._ValidateSourceAndZippedFile(
-            "src/a.txt", zf, "src/a.txt", dontFixLineEndings)
+            "src/a.test", zf, "src/a.test", dontFixLineEndings)
         self._ValidateSourceAndZippedFile("src/b.png", zf, "b.png")
 
         # Verify that the data offset for all files in the archive are
@@ -160,11 +143,11 @@ def _GetFileSize(file):
         # Verify that zip file can be read by third-party zip libraries
         # (in this case, Python's zip module)
         zf = zipfile.ZipFile("test_writer.usdz")
-        self.assertEqual(zf.namelist(), ["src/a.txt", "b.png"])
+        self.assertEqual(zf.namelist(), ["src/a.test", "b.png"])
         self.assertIsNone(zf.testzip())
 
         self._ValidateSourceAndZippedFile(
-            "src/a.txt", zf, "src/a.txt", dontFixLineEndings)
+            "src/a.test", zf, "src/a.test", dontFixLineEndings)
         self._ValidateSourceAndZippedFile("src/b.png", zf, "b.png")
 
     def test_WriterAlignment(self):
diff --git a/pxr/usd/usd/testenv/testUsdZipFile.testenv/src/a.test b/pxr/usd/usd/testenv/testUsdZipFile.testenv/src/a.test
new file mode 100644
index 0000000000..cfa7f89f4e
--- /dev/null
+++ b/pxr/usd/usd/testenv/testUsdZipFile.testenv/src/a.test
@@ -0,0 +1,4 @@
+This is a file named a.test. It is used for a test.
+
+It has multiple lines in it.
+
diff --git a/pxr/usd/usd/testenv/testUsdZipFile.testenv/src/a.txt b/pxr/usd/usd/testenv/testUsdZipFile.testenv/src/a.txt
deleted file mode 100644
index 8ecf459291..0000000000
--- a/pxr/usd/usd/testenv/testUsdZipFile.testenv/src/a.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a file named a.txt. It is used for a test.
-
-It has multiple lines in it.
-
diff --git a/pxr/usd/usd/testenv/testUsdZipFile.testenv/test_reader.usdz b/pxr/usd/usd/testenv/testUsdZipFile.testenv/test_reader.usdz
index 1f41706206..04b3721d93 100644
Binary files a/pxr/usd/usd/testenv/testUsdZipFile.testenv/test_reader.usdz and b/pxr/usd/usd/testenv/testUsdZipFile.testenv/test_reader.usdz differ
diff --git a/pxr/usd/usd/timeCode.cpp b/pxr/usd/usd/timeCode.cpp
index 91ae723ebb..ed070215bb 100644
--- a/pxr/usd/usd/timeCode.cpp
+++ b/pxr/usd/usd/timeCode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/timeCode.h"
diff --git a/pxr/usd/usd/timeCode.h b/pxr/usd/usd/timeCode.h
index c96c161aa3..6efcc39398 100644
--- a/pxr/usd/usd/timeCode.h
+++ b/pxr/usd/usd/timeCode.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_TIME_CODE_H
 #define PXR_USD_USD_TIME_CODE_H
diff --git a/pxr/usd/usd/tokens.cpp b/pxr/usd/usd/tokens.cpp
index f0c2fec1cf..4b69074aac 100644
--- a/pxr/usd/usd/tokens.cpp
+++ b/pxr/usd/usd/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/tokens.h"
 
diff --git a/pxr/usd/usd/tokens.h b/pxr/usd/usd/tokens.h
index 6c2a2dc0b3..67f9282fbf 100644
--- a/pxr/usd/usd/tokens.h
+++ b/pxr/usd/usd/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USD_TOKENS_H
 #define USD_TOKENS_H
diff --git a/pxr/usd/usd/typed.cpp b/pxr/usd/usd/typed.cpp
index a58cb115fb..231f27e9b6 100644
--- a/pxr/usd/usd/typed.cpp
+++ b/pxr/usd/usd/typed.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/typed.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/typed.h b/pxr/usd/usd/typed.h
index 938c75e698..a6ca1540d9 100644
--- a/pxr/usd/usd/typed.h
+++ b/pxr/usd/usd/typed.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USD_GENERATED_TYPED_H
 #define USD_GENERATED_TYPED_H
diff --git a/pxr/usd/usd/usdFileFormat.cpp b/pxr/usd/usd/usdFileFormat.cpp
index 1b54aabf8e..b3863b449e 100644
--- a/pxr/usd/usd/usdFileFormat.cpp
+++ b/pxr/usd/usd/usdFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/usdFileFormat.h"
diff --git a/pxr/usd/usd/usdFileFormat.h b/pxr/usd/usd/usdFileFormat.h
index 64b119522b..0eb141fac3 100644
--- a/pxr/usd/usd/usdFileFormat.h
+++ b/pxr/usd/usd/usdFileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_USD_FILE_FORMAT_H
 #define PXR_USD_USD_USD_FILE_FORMAT_H
diff --git a/pxr/usd/usd/usdGenSchema.py b/pxr/usd/usd/usdGenSchema.py
index b79d8440f0..9502b1c7b1 100644
--- a/pxr/usd/usd/usdGenSchema.py
+++ b/pxr/usd/usd/usdGenSchema.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """
 This script generates C++ classes and supporting Python code for USD Schemata.
@@ -41,6 +24,7 @@
 """
 
 from __future__ import print_function
+import dataclasses
 import sys, os, re, inspect
 import keyword
 from argparse import ArgumentParser
@@ -124,6 +108,10 @@ def SetQuiet(self, quiet):
 INSTANCE_NAME_PLACEHOLDER = \
     Usd.SchemaRegistry.MakeMultipleApplyNameTemplate("", "")
 
+# Custom metadata tokens for user doc
+USERDOC_BRIEF = "userDocBrief"
+USERDOC_FULL = "userDoc"
+
 #------------------------------------------------------------------------------#
 # Parsed Objects                                                               #
 #------------------------------------------------------------------------------#
@@ -293,14 +281,14 @@ def _CamelCase(aString):
 Token = namedtuple('Token', ['id', 'value', 'desc'])
 
 def _GetNameAndGeneratedSchemaPropNameForPropInfo(sdfPropName, classInfo):
-    if classInfo.propertyNamespacePrefix:
+    if classInfo.propertyNamespace:
         # A property namespace prefix will only exist for multiple apply API
         # schemas and is used to create the instanceable namespace prefix 
         # prepended to all its properties. We prepend this instanceable 
         # prefix to the raw name here.
         generatedSchemaPropName = \
             Usd.SchemaRegistry.MakeMultipleApplyNameTemplate(
-                classInfo.propertyNamespacePrefix, sdfPropName)
+                classInfo.propertyNamespace.prefix, sdfPropName)
         # Since the property info's name is used to create the identifier 
         # used for tokens and such, we make it from the instanced property 
         # name with the instance name placeholder replaced with 
@@ -480,6 +468,17 @@ def _InheritsOwnFamily(p):
         p.GetPath().name)
     return family in allInheritedFamilies
 
+@dataclasses.dataclass
+class MultiApplyPropertyNamespace:
+    prefix : str
+    token : str
+
+    @classmethod
+    def Create(cls, prefix, useLiteralIdentifier):
+        return cls(prefix, _MakeValidToken(prefix, useLiteralIdentifier)) \
+               if prefix else None
+
+
 class ClassInfo(object):
     def __init__(self, usdPrim, sdfPrim, useLiteralIdentifier=False):
         # First validate proper class naming...
@@ -601,8 +600,10 @@ def __init__(self, usdPrim, sdfPrim, useLiteralIdentifier=False):
                 not self.isAPISchemaBase and not self.isTypedBase
         self.apiSchemaType = self.customData.get(API_SCHEMA_TYPE, 
                 SINGLE_APPLY if self.isApi else None)
-        self.propertyNamespacePrefix = \
-            self.customData.get(PROPERTY_NAMESPACE_PREFIX)
+        self.propertyNamespace = MultiApplyPropertyNamespace.Create(
+            self.customData.get(PROPERTY_NAMESPACE_PREFIX),
+            useLiteralIdentifier
+        )
         self.apiAutoApply = self.customData.get(API_AUTO_APPLY)
         self.apiCanOnlyApply = self.customData.get(API_CAN_ONLY_APPLY)
         self.apiAllowedInstanceNames = self.customData.get(
@@ -616,7 +617,7 @@ def __init__(self, usdPrim, sdfPrim, useLiteralIdentifier=False):
                 sdfPrim.path)
 
         if self.apiSchemaType != MULTIPLE_APPLY:
-            if self.propertyNamespacePrefix:
+            if self.propertyNamespace:
                 raise _GetSchemaDefException(
                     "%s should only be used as a customData field on "
                     "multiple-apply API schemas." % PROPERTY_NAMESPACE_PREFIX,
@@ -795,7 +796,7 @@ def _MakeMultipleApplySchemaNameTemplate(apiSchemaName):
 # use the USD prim because we need to know all override properties for the 
 # flattened schema class, so this will include any overrides provided purely 
 # through inheritance.
-def _GetAPISchemaOverridePropertyNames(usdPrim, propertyNamespacePrefix):
+def _GetAPISchemaOverridePropertyNames(usdPrim, propertyNamespace):
     apiSchemaOverridePropertyNames = []
 
     for usdProp in usdPrim.GetProperties():
@@ -845,9 +846,9 @@ def _GetAPISchemaOverridePropertyNames(usdPrim, propertyNamespacePrefix):
         # schemas. If so, the property names need to be converted into their
         # template names to match the properties that will be in the 
         # generatedSchema.
-        if propertyNamespacePrefix:
+        if propertyNamespace:
             propName = Usd.SchemaRegistry.MakeMultipleApplyNameTemplate(
-                propertyNamespacePrefix, propName)
+                propertyNamespace.prefix, propName)
 
         # Add the property name to the list.
         apiSchemaOverridePropertyNames.append(propName)
@@ -880,13 +881,13 @@ def ParseUsd(usdFilePath):
         # make sure that if we have a multiple-apply schema with a property
         # namespace prefix that the prim actually has some properties
         if classInfo.apiSchemaType == MULTIPLE_APPLY:
-            if classInfo.propertyNamespacePrefix and \
+            if classInfo.propertyNamespace and \
                 len(sdfPrim.properties) == 0:
                     raise _GetSchemaDefException(
                         "Multiple-apply schemas that have the "
                         "propertyNamespacePrefix metadata fields must have at "
                         "least one property", sdfPrim.path)
-            if not classInfo.propertyNamespacePrefix and \
+            if not classInfo.propertyNamespace and \
                 not len(sdfPrim.properties) == 0:
                     raise _GetSchemaDefException(
                         "Multiple-apply schemas that do not"
@@ -967,7 +968,7 @@ def ParseUsd(usdFilePath):
         # schemas.
         classInfo.apiSchemaOverridePropertyNames = \
             _GetAPISchemaOverridePropertyNames(
-                usdPrim, classInfo.propertyNamespacePrefix)
+                usdPrim, classInfo.propertyNamespace)
     
     for classInfo in classes:
         # If this is an applied API schema that does not inherit from 
@@ -1265,9 +1266,9 @@ def GatherTokens(classes, libName, libTokens,
 
         # Add property namespace prefix token for multiple-apply API
         # schema to token set
-        if cls.propertyNamespacePrefix:
-            _AddToken(tokenDict, cls.tokens, cls.propertyNamespacePrefix,
-                      cls.propertyNamespacePrefix,
+        if cls.propertyNamespace:
+            _AddToken(tokenDict, cls.tokens, cls.propertyNamespace.token,
+                      cls.propertyNamespace.prefix,
                       "Property namespace prefix for the %s schema." \
                               % cls.cppClassName, True)
 
@@ -1607,6 +1608,55 @@ def _RenamePropertiesWithInstanceablePrefix(usdPrim):
     for name in originalPropNames:
         usdPrim.RemoveProperty(name)
 
+def _GetUserDocForSchemaObj(obj, userDocSchemaObj):
+    """
+    Find brief user doc for a schema object, in either the specifically authored
+    user doc info in userDocSchemaObj, or the schema obj itself.
+    Returns brief user doc string, or None if no reasonable brief user doc found
+    """
+    # Start by looking at userDocSchemaObj for USERDOC_BRIEF customData
+    if userDocSchemaObj is not None and USERDOC_BRIEF in userDocSchemaObj.GetCustomData():
+        return userDocSchemaObj.GetCustomData().get(USERDOC_BRIEF)
+    else:
+        # See if USERDOC_BRIEF exists on schema object's custom data
+        return obj.customData.get(USERDOC_BRIEF)
+
+def _UpdateUserDocForRegistry(filePath, flatLayer):
+    """
+    Find the best source for "brief" user doc for the schema and apply it
+    This is only done for the schema registry, and not for codegen
+    """
+    briefDict = {}
+    # Load <schema path>/userDoc/schemaUserDoc.usda if it exists
+    userDocSchemaFile = os.path.join(os.path.dirname(os.path.abspath(filePath)),
+     "userDoc", "schemaUserDoc.usda")
+    userDocStage = None
+    if (os.path.isfile(userDocSchemaFile) and os.access(userDocSchemaFile, os.R_OK)):
+        userDocStage = Usd.Stage.Open(userDocSchemaFile)        
+    # Walk through flattened schema stage and look for same-path classes in 
+    # userDocStage if available, to get the appropriate brief user doc
+    for cls in flatLayer.rootPrims:
+        # Ignore GLOBAL 
+        if cls.name == "GLOBAL":
+            continue
+        if userDocStage is not None:
+            userDocCls = userDocStage.GetPrimAtPath(cls.path)
+        else:
+            userDocCls = None
+        briefUserDoc = _GetUserDocForSchemaObj(cls, userDocCls)
+        if briefUserDoc is not None:
+            briefDict[cls.path] = briefUserDoc
+        # Look for property user doc
+        for clsProp in cls.properties:
+            if userDocCls is not None:
+                userDocClsProp = userDocCls.GetPropertyAtPath(clsProp.path)
+            else:
+                userDocClsProp = None
+            briefUserDoc = _GetUserDocForSchemaObj(clsProp, userDocClsProp)
+            if briefUserDoc is not None:
+                briefDict[clsProp.path] = briefUserDoc
+    return briefDict
+
 def GenerateRegistry(codeGenPath, filePath, classes, validate, env):
 
     # Get the flattened layer to work with.
@@ -1617,6 +1667,11 @@ def GenerateRegistry(codeGenPath, filePath, classes, validate, env):
     # lower-level schema modules.  We hop back up to the UsdStage API to do
     # so because it is more convenient for these kinds of operations.
     flatStage = Usd.Stage.Open(flatLayer)
+
+    # Gather schema class and property brief user doc if found.
+    # Do this here, before we strip out customData.
+    briefDict = _UpdateUserDocForRegistry(filePath, flatLayer)
+
     pathsToDelete = []
     primsToKeep = {cls.usdPrimTypeName : cls for cls in classes}
     if not flatStage.RemovePrim('/GLOBAL'):
@@ -1690,6 +1745,19 @@ def GenerateRegistry(codeGenPath, filePath, classes, validate, env):
             p.SetCustomDataByKey('apiSchemaOverridePropertyNames',
                                  Vt.TokenArray(apiSchemaOverridePropertyNames))
 
+        # Set user doc brief strings in class and property customData if
+        # authored, using the path-based dictionary we set in the call to 
+        # _UpdateUserDocForRegistry above. Note that we need to do this after 
+        # clearing other custom data.
+        workPathStr = p.GetPath()
+        if workPathStr in briefDict:
+            p.SetCustomDataByKey(USERDOC_BRIEF, briefDict[workPathStr])
+        for myproperty in p.GetAuthoredProperties():
+            workPathStr = myproperty.GetPath()
+            if workPathStr in briefDict:
+                myproperty.SetCustomDataByKey(USERDOC_BRIEF,
+                 briefDict[workPathStr])
+
     for p in pathsToDelete:
         flatStage.RemovePrim(p)
         
@@ -1849,7 +1917,7 @@ def InitializeResolver():
         libTokens, \
         skipCodeGen, \
         classes = ParseUsd(schemaPath)
-        
+
         if args.validate:
             Print('Validation on, any diffs found will cause failure.')
 
diff --git a/pxr/usd/usd/usdaFileFormat.cpp b/pxr/usd/usd/usdaFileFormat.cpp
index 1dca2ad157..4518c81f7c 100644
--- a/pxr/usd/usd/usdaFileFormat.cpp
+++ b/pxr/usd/usd/usdaFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/usdaFileFormat.h"
diff --git a/pxr/usd/usd/usdaFileFormat.h b/pxr/usd/usd/usdaFileFormat.h
index ea7e135ada..83f2f118e6 100644
--- a/pxr/usd/usd/usdaFileFormat.h
+++ b/pxr/usd/usd/usdaFileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_USDA_FILE_FORMAT_H
 #define PXR_USD_USD_USDA_FILE_FORMAT_H
diff --git a/pxr/usd/usd/usdcFileFormat.cpp b/pxr/usd/usd/usdcFileFormat.cpp
index 6b7980e351..bb7f31b7fd 100644
--- a/pxr/usd/usd/usdcFileFormat.cpp
+++ b/pxr/usd/usd/usdcFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/usdcFileFormat.h"
diff --git a/pxr/usd/usd/usdcFileFormat.h b/pxr/usd/usd/usdcFileFormat.h
index a7f046875c..137c5d550b 100644
--- a/pxr/usd/usd/usdcFileFormat.h
+++ b/pxr/usd/usd/usdcFileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_USDC_FILE_FORMAT_H
 #define PXR_USD_USD_USDC_FILE_FORMAT_H
diff --git a/pxr/usd/usd/usdzFileFormat.cpp b/pxr/usd/usd/usdzFileFormat.cpp
index f323775c86..fd923befcb 100644
--- a/pxr/usd/usd/usdzFileFormat.cpp
+++ b/pxr/usd/usd/usdzFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/usdaFileFormat.h"
diff --git a/pxr/usd/usd/usdzFileFormat.h b/pxr/usd/usd/usdzFileFormat.h
index 5d09c9e768..650e162991 100644
--- a/pxr/usd/usd/usdzFileFormat.h
+++ b/pxr/usd/usd/usdzFileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_USDZ_FILE_FORMAT_H
 #define PXR_USD_USD_USDZ_FILE_FORMAT_H
diff --git a/pxr/usd/usd/usdzResolver.cpp b/pxr/usd/usd/usdzResolver.cpp
index ffdf492d3a..27ac9cb287 100644
--- a/pxr/usd/usd/usdzResolver.cpp
+++ b/pxr/usd/usd/usdzResolver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usd/usdzResolver.h b/pxr/usd/usd/usdzResolver.h
index 3c991a72dd..b3a3b40652 100644
--- a/pxr/usd/usd/usdzResolver.h
+++ b/pxr/usd/usd/usdzResolver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_USDZ_RESOLVER_H
 #define PXR_USD_USD_USDZ_RESOLVER_H
diff --git a/pxr/usd/usd/validationError.cpp b/pxr/usd/usd/validationError.cpp
new file mode 100644
index 0000000000..a3a78f19a7
--- /dev/null
+++ b/pxr/usd/usd/validationError.cpp
@@ -0,0 +1,69 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usd/usd/validationError.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+UsdValidationErrorSite::UsdValidationErrorSite(
+    const SdfLayerHandle &layer, const SdfPath &objectPath) :
+        _layer(layer), _objectPath(objectPath)
+{
+}
+
+UsdValidationErrorSite::UsdValidationErrorSite(const UsdStagePtr &usdStage, 
+                     const SdfPath &objectPath, 
+                     const SdfLayerHandle &layer) :
+    _usdStage(usdStage), _layer(layer), _objectPath(objectPath)
+{
+}
+
+UsdValidationError::UsdValidationError() : 
+    _errorType(UsdValidationErrorType::None)
+{
+    _validator = nullptr;
+}
+
+UsdValidationError::UsdValidationError(const UsdValidationErrorType &type,
+                                   const UsdValidationErrorSites &errorSites,
+                                   const std::string &errorMsg) :
+    _errorType(type), _errorSites(errorSites), _errorMsg(errorMsg)
+{
+    _validator = nullptr;
+}
+
+std::string
+UsdValidationError::GetErrorAsString() const
+{
+    std::string errorTypeAsString;
+    switch(_errorType) {
+        case UsdValidationErrorType::None:
+            return _errorMsg;
+            break;
+        case UsdValidationErrorType::Error:
+            errorTypeAsString = "Error";
+            break;
+        case UsdValidationErrorType::Warn:
+            errorTypeAsString = "Warn";
+            break;
+        case UsdValidationErrorType::Info:
+            errorTypeAsString = "Info";
+            break;
+    }
+
+    const std::string separator = ": ";
+    return errorTypeAsString + separator + _errorMsg;
+}
+
+void
+UsdValidationError::_SetValidator(const UsdValidator *validator)
+{
+    _validator = validator;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
diff --git a/pxr/usd/usd/validationError.h b/pxr/usd/usd/validationError.h
new file mode 100644
index 0000000000..95005f09aa
--- /dev/null
+++ b/pxr/usd/usd/validationError.h
@@ -0,0 +1,308 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef PXR_USD_USD_VALIDATION_ERROR_H
+#define PXR_USD_USD_VALIDATION_ERROR_H
+
+#include "pxr/pxr.h"
+#include "pxr/usd/sdf/path.h"
+#include "pxr/usd/usd/stage.h"
+#include "pxr/usd/usd/property.h"
+
+#include <string>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class UsdPrim;
+class UsdValidator;
+
+/// \class UsdValidationErrorType
+///
+/// UsdValidationErrorType reflects severity of a validation error, which can
+/// then be reported appropriately to the users.
+///
+/// None: No Error.
+/// Error: Associates the UsdValidationErrorType with an actual Error reported
+///        by the validation task.
+/// Warn: Associates the UsdValidationErrorType with a less severe situation and
+///       hence reported as warning by the validation task.
+/// Info: Associates the UsdValidationErrorType with information which needs to
+///       be reported to the users by the validation task.
+enum class UsdValidationErrorType {
+    None = 0,
+    Error,
+    Warn,
+    Info
+};
+
+/// \class UsdValidationErrorSite
+///
+/// UsdValidationErrorSite is important information available from a
+/// ValidationError, which annotates the site where the Error was reported by a
+/// validation task. 
+///
+/// An Error could be reported in a SdfLayer (in layer metadata, for example), 
+/// or a UsdStage (in stage metadata, for example) or a Prim within a stage, or 
+/// a property of a prim.
+struct UsdValidationErrorSite
+{
+public:
+    UsdValidationErrorSite() = default;
+
+    /// Initialize an UsdValidationErrorSite using a \p layer and an
+    /// \p objectPath.
+    ///
+    /// Object Path here could be a prim or a property spec path.
+    /// 
+    /// Note that to identify a layer metadata, objectPath can be set as the
+    /// pseudoRoot.
+    USD_API
+    UsdValidationErrorSite(const SdfLayerHandle &layer,
+                                    const SdfPath &objectPath);
+
+    /// Initialize an UsdValidationErrorSite using a \p usdStage and an \p
+    /// objectPath.
+    ///
+    /// An option \p layer can also be provided to provide information about a
+    /// specific layer the erroring \p objectPath is found in the property
+    /// stack.
+    ///
+    /// Object Path here could be a prim path or a property path.
+    /// Note that to identify stage's root layer metadata, objectPath can be set
+    /// as the pseudoRoot.
+    USD_API
+    UsdValidationErrorSite(const UsdStagePtr &usdStage, 
+                           const SdfPath &objectPath,
+                           const SdfLayerHandle &layer=SdfLayerHandle());
+
+    /// Returns true if UsdValidationErrorSite instance can either point to a
+    /// prim or property spec in a layer or a prim or property on a stage.
+    bool IsValid() const 
+    {
+        return IsValidSpecInLayer() || IsPrim() || IsProperty();
+    }
+
+    /// Returns true if the objectPath and layer represent a spec in the layer;
+    /// false otherwise.
+    bool IsValidSpecInLayer() const 
+    {
+        if (!_layer || _objectPath.IsEmpty()) {
+            return false;
+        }
+        return _layer->HasSpec(_objectPath);
+    }
+
+    /// Returns true if UsdValidationErrorSite represents a prim on a stage,
+    /// false otherwise.
+    bool IsPrim() const
+    {
+        return GetPrim().IsValid();
+    }
+
+    /// Returns true if UsdValidationErrorSite represents a property on a stage,
+    /// false otherwise.
+    bool IsProperty() const
+    {
+        return GetProperty().IsValid();
+    }
+
+    /// Returns the SdfPropertySpecHandle associated with this
+    /// ValidationErrorSite's layer and objectPath.
+    ///
+    /// Returns an invalid SdfPropertySpecHandle if no valid property spec is
+    /// found, or when UsdValidationErrorSite instance doesn't have a
+    /// layer.
+    const SdfPropertySpecHandle GetPropertySpec() const
+    {
+        if (!_layer) {
+            return SdfPropertySpecHandle();
+        }
+        return _layer->GetPropertyAtPath(_objectPath);
+    }
+
+    /// Returns the SdfPrimSpecHandle associated with this ValidationErrorSite's
+    /// layer and objectPath.
+    ///
+    /// Returns an invalid SdfPrimSpecHandle if no valid prim spec is found, or 
+    /// when UsdValidationErrorSite instance doesn't have a layer.
+    const SdfPrimSpecHandle GetPrimSpec() const
+    {
+        if (!_layer) {
+            return SdfPrimSpecHandle();
+        }
+        return _layer->GetPrimAtPath(_objectPath);
+    }
+
+    /// Returns the SdfLayerHandle associated with this UsdValidatorErrorSite
+    const SdfLayerHandle& GetLayer() const
+    {
+        return _layer;
+    }
+
+    /// Returns the UsdStage associated with this UsdValidationErrorSite;
+    /// nullptr othewrise.
+    const UsdStagePtr& GetStage() const
+    {
+        return _usdStage;
+    }
+
+    /// Returns UsdPrim associated with this UsdValidationErrorSite, that is
+    /// when UsdStage is present and objectPath represents a prim path on this
+    /// stage; if not, an invalid prim is returned.
+    UsdPrim GetPrim() const
+    {
+        if (_usdStage) {
+            return _usdStage->GetPrimAtPath(_objectPath);
+        }
+        return UsdPrim();
+    }
+
+    /// Returns UsdProperty associated with this UsdValidationErrorSite, that is
+    /// when UsdStage is present and objectPath represents a property path on
+    /// this stage; if not, an invalid property is returned.
+    UsdProperty GetProperty() const
+    {
+        if (_usdStage) {
+            return _usdStage->GetPropertyAtPath(_objectPath);
+        }
+        return UsdProperty();
+    }
+
+    /// Returns true if \p other UsdValidationErrorSite has same valued members
+    /// as this UsdValidationErrorSite, false otherwise.
+    bool operator==(const UsdValidationErrorSite& other) const {
+        return (_layer == other._layer) &&
+               (_usdStage == other._usdStage) &&
+               (_objectPath == other._objectPath);
+    }
+
+    /// Returns false if \p other UsdValidationErrorSite has same valued members
+    /// as this UsdValidationErrorSite, true otherwise.
+    bool operator!=(const UsdValidationErrorSite& other) const {
+        return !(*this == other);
+    }
+
+private:
+    UsdStagePtr _usdStage;
+    SdfLayerHandle _layer;
+    SdfPath _objectPath;
+
+}; // UsdValidationErrorSite
+
+using UsdValidationErrorSites = std::vector<UsdValidationErrorSite>;
+
+/// \class UsdValidationError
+///
+/// UsdValidationError is an entity returned by a validation task, which is
+/// associated with a UsdValidator.
+///
+/// A UsdValidationError instance contains important information, like:
+///
+/// - UsdValidationErrorType - severity of an error, 
+///
+/// - UsdValidationErrorSites - on what sites validationError was reported by a 
+///                          validation task, 
+///
+/// - Message - Message governing more information associated with the error. Such
+///           a message is provided by the validator writer, when providing
+///           implementation for the validation task function.
+/// 
+/// UsdValidationError instances will be stored in the UsdValidationContext
+/// responsible for executing a set of UsdValidators.
+///
+class UsdValidationError {
+public:
+    /// A default constructed UsdValidationError signifies no error.
+    USD_API
+    UsdValidationError();
+
+    /// Instantiate a ValidationError by providing its \p errorType, \p
+    /// errorSites and an \p errorMsg.
+    USD_API
+    UsdValidationError(const UsdValidationErrorType &errorType, 
+                       const UsdValidationErrorSites &errorSites, 
+                       const std::string &errorMsg);
+
+    bool operator==(const UsdValidationError& other) const {
+        return (_errorType == other._errorType) &&
+               (_errorSites == other._errorSites) &&
+               (_errorMsg == other._errorMsg) &&
+               (_validator == other._validator);
+    }
+
+    bool operator!=(const UsdValidationError& other) const {
+        return !(*this == other);
+    }
+
+    /// Returns the UsdValidationErrorType associated with this
+    /// UsdValidationError
+    UsdValidationErrorType GetType() const
+    {
+        return _errorType;
+    }
+
+    /// Returns the UsdValidationErrorSite associated with this
+    /// UsdValidationError
+    const UsdValidationErrorSites& GetSites() const
+    {
+        return _errorSites;
+    }
+
+    /// Returns the UsdValidator that reported this error.
+    ///
+    /// This will return nullptr if there is no UsdValidator associated with
+    /// this error. This will never be nullptr for validation errors returned 
+    /// from calls to UsdValidator::Validate.
+    const UsdValidator* GetValidator() const
+    {
+        return _validator;
+    }
+
+    /// Returns the message associated with this UsdValidationError
+    const std::string& GetMessage() const
+    {
+        return _errorMsg;
+    }
+
+    /// Returns UsdValidationErrorType and ErrorMessage concatenated as a string
+    USD_API
+    std::string GetErrorAsString() const;
+
+    /// Returns true if UsdValidationErrorType is UsdValidationErrorType::None,
+    /// false otherwise
+    bool HasNoError() const {
+      return _errorType == UsdValidationErrorType::None;
+    }
+
+private:
+    // UsdValidatorError holds a pointer to the UsdValidator that generated it, so
+    // we need to provide friend access to allow the necessary mutation.
+    friend class UsdValidator;
+
+    // Used by UsdValidator::Validate methods to embed itself to the reported
+    // errors.
+    void _SetValidator(const UsdValidator *validator);
+
+    // _validator is set when ValidationError is generated via a 
+    // UsdValidator::Validate() call.
+    const UsdValidator *_validator;
+
+    // These data members should not be modified other than during
+    // initialization by the validate task functions.
+    UsdValidationErrorType _errorType;
+    UsdValidationErrorSites _errorSites;
+    std::string _errorMsg;
+
+    // TODO:(Subsequent iterations)
+    // - VtValue of a random value the error wants to propagate down to the
+    // fixer
+    
+}; // UsdValidationError
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_USD_USD_VALIDATION_ERROR_H
diff --git a/pxr/usd/usd/validationRegistry.cpp b/pxr/usd/usd/validationRegistry.cpp
new file mode 100644
index 0000000000..d6249346bf
--- /dev/null
+++ b/pxr/usd/usd/validationRegistry.cpp
@@ -0,0 +1,787 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usd/usd/validationRegistry.h"
+
+#include "pxr/base/tf/instantiateSingleton.h"
+#include "pxr/base/tf/registryManager.h"
+#include "pxr/base/plug/plugin.h"
+#include "pxr/base/plug/registry.h"
+#include "pxr/base/tf/token.h"
+
+#include <algorithm>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_INSTANTIATE_SINGLETON(UsdValidationRegistry);
+
+TF_DEFINE_PRIVATE_TOKENS(_tokens,
+    ((PluginValidatorsKey, "Validators"))
+    ((Keywords, "keywords"))
+    ((Doc, "doc"))
+    ((SchemaTypes, "schemaTypes"))
+    ((IsSuite, "isSuite"))
+    ((PluginValidatorNameDelimiter, ":"))
+);
+
+
+
+UsdValidationRegistry::UsdValidationRegistry()
+{
+    // Do any plugin processing before subscription starts.
+    _PopulateMetadataFromPlugInfo();
+    TfSingleton<UsdValidationRegistry>::SetInstanceConstructed(*this);
+    TfRegistryManager::GetInstance().SubscribeTo<UsdValidationRegistry>();
+}
+
+// Helper to return a TfTokenVector from a json string array
+static TfTokenVector
+_FillTokenVector(const JsValue &value)
+{
+    TfTokenVector tokens;
+    const auto arr = value.GetArrayOf<std::string>();
+    tokens.reserve(arr.size());
+    for (const auto &a : arr) {
+        tokens.emplace_back(a);
+    }
+    return tokens;
+}
+
+// Helper to return common keywords associated with all validators in plugInfo
+static TfTokenVector
+_ParseStringArrayValue(const JsObject &object, const TfToken &token,
+                       const TfToken &validatorName = TfToken())
+{
+    const std::string &errorStrTemplate = 
+        "Expected array of strings for " + token.GetString() + " metadata";
+    const std::string &errorStr = validatorName.IsEmpty() ?
+        errorStrTemplate : 
+        errorStrTemplate + " for validator " + validatorName.GetString();
+    if (const JsValue * const value = TfMapLookupPtr(object, token)) {
+        if (!value->IsArrayOf<std::string>()) {
+            TF_RUNTIME_ERROR("%s", errorStr.c_str());
+            return TfTokenVector{};
+        }
+        return _FillTokenVector(*value);
+    }
+    return TfTokenVector{};
+}
+
+void 
+UsdValidationRegistry::_PopulateMetadataFromPlugInfo()
+{
+    const PlugPluginPtrVector &plugins =
+        PlugRegistry::GetInstance().GetAllPlugins();
+
+    auto _GetKey = [](const JsObject &dict, const std::string &key,
+                      JsObject *value) {
+        const JsObject::const_iterator i = dict.find(key);
+        if (i != dict.end() && i->second.IsObject()) {
+            *value = i->second.GetJsObject();
+            return true;
+        }
+        return false;
+    };
+
+    for(const PlugPluginPtr &plugin : plugins) {
+        JsObject validators;
+        const JsObject &plugMetadata = plugin->GetMetadata();
+
+        // No Validators in plugInfo, continue
+        if (!_GetKey(plugMetadata, _tokens->PluginValidatorsKey, &validators)) {
+            continue;
+        }
+
+        const TfTokenVector keywords = 
+            _ParseStringArrayValue(validators,
+                                   _tokens->Keywords);
+        
+        const TfToken pluginName = TfToken(plugin->GetName());
+        TfTokenVector validatorNames;
+        // Parse all validator names and respective plugMetadata
+        for (const auto &validatorEntry : validators) {
+            // Skip keywords, move to validator entries
+            if (validatorEntry.first == _tokens->Keywords) {
+                continue;
+            }
+            const TfToken validatorName(validatorEntry.first);
+            JsObject validatorDict;
+            if (!_GetKey(validators, validatorName, &validatorDict)) {
+                TF_RUNTIME_ERROR("Expected dict for validator '%s'",
+                                 validatorName.GetText());
+                continue;
+            }
+
+            const JsValue * const doc = 
+                TfMapLookupPtr(validatorDict, _tokens->Doc);
+            if (!doc || !doc->IsString() || doc->GetString().empty()) {
+                TF_RUNTIME_ERROR("Missing or invalid or empty doc string "
+                                 "metadata for '%s' validator",
+                                 validatorName.GetText());
+                continue;
+            }
+
+            UsdValidatorMetadata metadata;
+
+            metadata.pluginPtr = plugin;
+            // prefix pluginName to validatorName to make these plugin
+            // validator's metadata.name unique
+            metadata.name = TfToken(TfStringJoin(
+                std::vector<std::string>{pluginName.GetString(), 
+                                         validatorName.GetString()},
+                _tokens->PluginValidatorNameDelimiter.GetText()));
+            validatorNames.push_back(metadata.name);
+
+            metadata.doc = doc->GetString();
+
+            metadata.schemaTypes = 
+                _ParseStringArrayValue(validatorDict, _tokens->SchemaTypes,
+                                       metadata.name);
+            
+            metadata.keywords = keywords;
+            const TfTokenVector &localKeywords = 
+                _ParseStringArrayValue(validatorDict, _tokens->Keywords,
+                                       metadata.name);
+            metadata.keywords.reserve(
+                metadata.keywords.size() + localKeywords.size());
+            metadata.keywords.insert(metadata.keywords.end(), 
+                                     localKeywords.begin(), 
+                                     localKeywords.end());
+            
+            if (const JsValue * const isSuite = 
+                TfMapLookupPtr(validatorDict, _tokens->IsSuite)) {
+                if (!isSuite->IsBool()) {
+                    TF_RUNTIME_ERROR("Expected bool for isSuite for validator "
+                                     "'%s'", metadata.name.GetText());
+                } else {
+                    metadata.isSuite = isSuite->GetBool();
+                }
+            } else {
+                metadata.isSuite = false;
+            }
+
+            // we need no protection of shared resource here, because this
+            // member function is only called from within the constructor, and
+            // that's guaranteed to run only once by TfSingleton initialization.
+            _AddValidatorMetadata(metadata);
+        }
+        if (!validatorNames.empty()) {
+            _pluginNameToValidatorNames.emplace(plugin->GetName(), 
+                                                validatorNames);
+        }
+    }
+}
+
+void 
+UsdValidationRegistry::RegisterPluginValidator(
+    const TfToken &validatorName, const UsdValidateLayerTaskFn &layerTaskFn)
+{
+    _RegisterPluginValidator<UsdValidateLayerTaskFn>(
+            validatorName, layerTaskFn);
+}
+
+void
+UsdValidationRegistry::RegisterPluginValidator(
+    const TfToken &validatorName, const UsdValidateStageTaskFn &stageTaskFn)
+{
+    _RegisterPluginValidator<UsdValidateStageTaskFn>(
+            validatorName, stageTaskFn);
+}
+
+void
+UsdValidationRegistry::RegisterPluginValidator(
+    const TfToken &validatorName, const UsdValidatePrimTaskFn &primTaskFn)
+{
+    _RegisterPluginValidator<UsdValidatePrimTaskFn>(
+            validatorName, primTaskFn);
+}
+
+template<typename ValidateTaskFn>
+void
+UsdValidationRegistry::_RegisterPluginValidator(const TfToken &validatorName, 
+                                                const ValidateTaskFn &taskFn)
+{
+    static_assert(std::is_same_v<ValidateTaskFn, UsdValidateLayerTaskFn> ||
+                  std::is_same_v<ValidateTaskFn, UsdValidateStageTaskFn> ||
+                  std::is_same_v<ValidateTaskFn, UsdValidatePrimTaskFn>,
+                  "template parameter must be UsdValidateLayerTaskFn," 
+                  "UsdValidateStageTaskFn, or UsdValidatePrimTaskFn");
+
+    UsdValidatorMetadata metadata;
+    if (!GetValidatorMetadata(validatorName, &metadata)) {
+        // if this validatorName is from a plugin, which it should be since
+        // this API is only for registering validators which are defined
+        // in plugInfo, then we should have parsed its metadata already,
+        // and if it's not found that means it's not coming from a plugInfo,
+        // so bail out.
+        TF_CODING_ERROR(
+            "Validator metadata missing for '%s', validator registered "
+            "using this API must be defined in the plugInfo.json",
+            validatorName.GetText());
+        return;
+    }
+
+    _RegisterValidator(metadata, taskFn, /* addMetadata */ false);
+}
+
+void
+UsdValidationRegistry::RegisterValidator(
+    const UsdValidatorMetadata &metadata, 
+    const UsdValidateLayerTaskFn &layerTaskFn)
+{
+    _RegisterValidator(metadata, layerTaskFn);
+}
+
+void
+UsdValidationRegistry::RegisterValidator(
+    const UsdValidatorMetadata &metadata, 
+    const UsdValidateStageTaskFn &stageTaskFn)
+{
+    _RegisterValidator(metadata, stageTaskFn);
+}
+
+void
+UsdValidationRegistry::RegisterValidator(
+    const UsdValidatorMetadata &metadata, 
+    const UsdValidatePrimTaskFn &primTaskFn)
+{
+    _RegisterValidator(metadata, primTaskFn);
+}
+
+template<typename ValidateTaskFn>
+void
+UsdValidationRegistry::_RegisterValidator(const UsdValidatorMetadata &metadata, 
+    const ValidateTaskFn &taskFn, bool addMetadata)
+{
+    static_assert(std::is_same_v<ValidateTaskFn, UsdValidateLayerTaskFn> ||
+                  std::is_same_v<ValidateTaskFn, UsdValidateStageTaskFn> ||
+                  std::is_same_v<ValidateTaskFn, UsdValidatePrimTaskFn>,
+                  "template parameter must be UsdValidateLayerTaskFn," 
+                  "UsdValidateStageTaskFn, or UsdValidatePrimTaskFn");
+
+    static constexpr bool isPrimTaskFn = 
+        std::is_same<ValidateTaskFn, UsdValidatePrimTaskFn>::value;
+    if (!_CheckMetadata(metadata, isPrimTaskFn)) {
+        return;
+    }
+
+    {
+        // Lock for writing validators.
+        std::unique_lock lock(_mutex);
+        if (_validators.find(metadata.name) != _validators.end()) {
+            TF_CODING_ERROR(
+                "Validator '%s' already registered with the "
+                "UsdValidationRegistry", metadata.name.GetText());
+            return;
+        }
+
+        // Note in case validator metadata needs to be added and there is
+        // contention only the first validator's (which is being added)
+        // metadata will be added.
+        if (addMetadata) {
+            // Following call to _AddValidatorMetadata is protected by the lock
+            // above.
+            if (!_AddValidatorMetadata(metadata)) {
+                TF_CODING_ERROR(
+                    "Metadata already added for a UsdValidatorSuite with the "
+                    "same name '%s'.", metadata.name.GetText());
+                return;
+            }
+        }
+
+        std::unique_ptr<UsdValidator> validator =
+            std::make_unique<UsdValidator>(metadata, taskFn);
+        if (!_validators.emplace(metadata.name, std::move(validator)).second) {
+            TF_CODING_ERROR(
+                "Validator with name '%s' already exists, failed to register "
+                "it again.", metadata.name.GetText());
+        }
+    }
+}
+
+bool
+UsdValidationRegistry::HasValidator(const TfToken &validatorName) const
+{
+    std::shared_lock lock(_mutex);
+    return _validators.find(validatorName) != _validators.end();
+}
+
+std::vector<const UsdValidator*> 
+UsdValidationRegistry::GetOrLoadAllValidators()
+{
+    const TfTokenVector &validatorNames = [&]() {
+            TfTokenVector result;
+            std::shared_lock lock(_mutex);
+            result.reserve(_validatorNameToMetadata.size());
+
+            // Ensure _validatorNameToMetadata is accessed as a const; This will
+            // ensure multiple threads can safely read from 
+            // _validatorNameToMetadata without risking data races, as const
+            // begin / end overloads will be invoked below.
+            for (const auto &entry : std::as_const(_validatorNameToMetadata)) {
+                if (!entry.second.isSuite) {
+                    result.push_back(entry.first);
+                }
+            }
+            return result;
+        }();
+
+    return GetOrLoadValidatorsByName(validatorNames);
+}
+
+const UsdValidator*
+UsdValidationRegistry::GetOrLoadValidatorByName(const TfToken &validatorName)
+{
+    auto _GetValidator = [&](const TfToken &name) -> const UsdValidator* {
+        std::shared_lock lock(_mutex);
+        // Ensure _validators is accessed as a const; This will ensure multiple
+        // threads can safely read from _validators without risking data races,
+        // as const find overload will be invoked below.
+        const auto &validatorItr = std::as_const(_validators).find(name);
+        if (validatorItr != _validators.cend()) {
+            return validatorItr->second.get();
+        }
+        return nullptr;
+    };
+
+    if (const UsdValidator *const validator = _GetValidator(validatorName)) {
+        return validator;
+    }
+    
+    UsdValidatorMetadata metadata;
+    if (!GetValidatorMetadata(validatorName, &metadata)) {
+        // No validatorMetadata found corresponding to this validatorName
+        return nullptr;
+    }
+
+    // If metadata was found but validator was not found / loaded, that implies
+    // this validator must be plugin provided.
+    TF_VERIFY(metadata.pluginPtr);
+
+    if (metadata.pluginPtr->Load()) {
+        // Plugin was loaded, lets look again.
+        return _GetValidator(validatorName);
+    }
+
+    return nullptr;
+}
+
+std::vector<const UsdValidator*>
+UsdValidationRegistry::GetOrLoadValidatorsByName(
+    const TfTokenVector &validatorNames)
+{
+    std::vector<const UsdValidator*> validators;
+    validators.reserve(validatorNames.size());
+
+    for (const TfToken &validatorName : validatorNames) {
+        const UsdValidator *validator = GetOrLoadValidatorByName(validatorName);
+        // If validator is nullptr, that means the validatorName was not found
+        // in the registry and it failed to register, in which case appropriate
+        // coding error would have been reported.
+        if (validator) {
+            validators.push_back(validator);
+        }
+    }
+    return validators;
+}
+
+void
+UsdValidationRegistry::RegisterPluginValidatorSuite(
+    const TfToken &suiteName, 
+    const std::vector<const UsdValidator*> &containedValidators)
+{
+    UsdValidatorMetadata metadata;
+    if (!GetValidatorMetadata(suiteName, &metadata)) {
+        // if this suiteName is from a plugin, which it should be since
+        // this API is only for registering validators which are defined
+        // in plugInfo, then we should have parsed its metadata already,
+        // and if it's not found that means it's not coming from a plugInfo,
+        // so bail out.
+        TF_CODING_ERROR(
+            "Validator Suite metadata missing for '%s', validator registered "
+            "using this API must be defined in the plugInfo.json",
+            suiteName.GetText());
+        return;
+    }
+    _RegisterValidatorSuite(metadata, containedValidators, 
+                                   /* addMetadata */ false);
+}
+
+void
+UsdValidationRegistry::RegisterValidatorSuite(
+    const UsdValidatorMetadata &metadata, 
+    const std::vector<const UsdValidator*> &containedValidators)
+{
+    _RegisterValidatorSuite(metadata, containedValidators);
+}
+
+void
+UsdValidationRegistry::_RegisterValidatorSuite(
+    const UsdValidatorMetadata &metadata,
+    const std::vector<const UsdValidator*> &containedValidators,
+    bool addMetadata)
+{
+    if (!_CheckMetadata(metadata, /* checkForPrimTask */ false, 
+                        /* expectSuite */ true)) {
+        return;
+    }
+
+    // Make sure containedValidators are conforming if suite has schemaTypes.
+    // That is, validators have PrimTaskFn, otherwise, do not register this
+    // validator. And contained validators's schemaType is a subset of Suite's
+    // schemaTypes metadata.
+    if (!metadata.schemaTypes.empty()) {
+        for(const UsdValidator *const validator : containedValidators) {
+            if (!validator) {
+                // Possible clients try to register a validator which is
+                // invalid/nullptr
+                TF_CODING_ERROR(
+                    "Validator Suite '%s' not registered, one of the contained "
+                    "validator is invalid.",
+                    metadata.name.GetText());
+                return;
+            }
+            if (!validator->_GetValidatePrimTask()) {
+                TF_CODING_ERROR(
+                    "ValidatorSuite '%s' cannot be registered, as it provides "
+                    "schemaTypes, but at least one of its contained validator "
+                    "'%s' does not provide a UsdValidatePrimTaskFn", 
+                    metadata.name.GetText(), 
+                    validator->GetMetadata().name.GetText());
+                return;
+            }
+            // We also need to make sure the contained validator's schemaTypes 
+            // is a subset of validatorSuite's schemaTypes
+            // NB: The size of the vectors here should be small.
+            for (const TfToken& schemaType : 
+                validator->GetMetadata().schemaTypes) {
+                if (std::find(metadata.schemaTypes.begin(),
+                              metadata.schemaTypes.end(), schemaType) ==
+                    metadata.schemaTypes.end()) {
+                    TF_CODING_ERROR(
+                        "schemaType '%s' provided by a contained validator "
+                        "'%s' is not in schemaTypes for '%s' validator suite",
+                        schemaType.GetText(), 
+                        validator->GetMetadata().name.GetText(),
+                        metadata.name.GetText());
+                    return;
+                }
+            }
+        }
+    }
+
+    {
+        // Lock for writing validatorSuites 
+        std::unique_lock lock(_mutex);
+        if (_validatorSuites.find(metadata.name) != 
+            _validatorSuites.end()) {
+            TF_CODING_ERROR(
+                "ValidatorSuite '%s' already registered with the "
+                "UsdValidationRegistry", metadata.name.GetText());
+            return;
+        }
+
+        // Note in case validator metadata needs to be added and there is
+        // contention only the first validator's (which is being added)
+        // metadata will be added.
+        if (addMetadata) {
+            // Following call to _AddValidatorMetadata is protected by the lock
+            // above.
+            if (!_AddValidatorMetadata(metadata)) {
+                TF_CODING_ERROR(
+                    "Metadata already added for a UsdValidator with the same "
+                    "name '%s'.", metadata.name.GetText());
+                return;
+            }
+        }
+
+        std::unique_ptr<UsdValidatorSuite> validatorSuite =
+            std::make_unique<UsdValidatorSuite>(metadata, containedValidators);
+        if (!_validatorSuites.emplace(metadata.name, 
+                                            std::move(validatorSuite)).second) {
+            TF_CODING_ERROR(
+                "Suite with name '%s' already exists, failed to register it "
+                "again.", metadata.name.GetText());
+        }
+    }
+}
+
+bool
+UsdValidationRegistry::HasValidatorSuite(const TfToken &suiteName) const
+{
+    std::shared_lock lock(_mutex);
+    return _validatorSuites.find(suiteName) != _validatorSuites.end();
+}
+
+std::vector<const UsdValidatorSuite*> 
+UsdValidationRegistry::GetOrLoadAllValidatorSuites()
+{
+
+    const TfTokenVector suiteNames = [&]() {
+            TfTokenVector result;
+            std::shared_lock lock(_mutex);
+            result.reserve(_validatorNameToMetadata.size());
+            // Ensure _validatorNameToMetadata is accessed as a const; This will
+            // ensure multiple threads can safely read from 
+            // _validatorNameToMetadata without risking data races, as const
+            // begin / end overloads will be invoked below.
+            for (const auto &entry : std::as_const(_validatorNameToMetadata)) {
+                if (entry.second.isSuite) {
+                    result.push_back(entry.first);
+                }
+            }
+            return result;
+        }();
+    
+    std::vector<const UsdValidatorSuite*> suites;
+    suites.reserve(suiteNames.size());
+    for (const auto& suiteName : suiteNames) {
+        const UsdValidatorSuite* suite = 
+            GetOrLoadValidatorSuiteByName(suiteName);
+        if (suite) {
+            suites.push_back(suite);
+        }
+    }
+    return suites;
+}
+
+const UsdValidatorSuite*
+UsdValidationRegistry::GetOrLoadValidatorSuiteByName(
+    const TfToken &suiteName)
+{
+    auto _GetValidatorSuite = [&](const TfToken &name) 
+            -> const UsdValidatorSuite* {
+        std::shared_lock lock(_mutex);
+        // Ensure _validatorSuites is accessed as a const; This will ensure 
+        // multiple threads can safely read from _validatorSuites without 
+        // risking data races, as const find overload will be invoked below.
+        const auto& validatorSuiteItr = std::as_const(_validatorSuites).find(name);
+        if (validatorSuiteItr != _validatorSuites.cend()) {
+            return validatorSuiteItr->second.get();
+        }
+        return nullptr;
+    };
+
+    if (const UsdValidatorSuite *const suite = _GetValidatorSuite(suiteName)) {
+        return suite;
+    }
+
+    UsdValidatorMetadata metadata;
+    if (!GetValidatorMetadata(suiteName, &metadata)) {
+        // No validatorMetadata found corresponding to this suiteName
+        return nullptr;
+    }
+
+    // If metadata was found but suite was not found / loaded, that implies
+    // this suite must be plugin provided.
+    TF_VERIFY(metadata.pluginPtr);
+
+    if (metadata.pluginPtr->Load()) {
+        return _GetValidatorSuite(suiteName);
+        // Plugin was loaded, lets look again.
+    }
+
+    return nullptr;
+}
+
+std::vector<const UsdValidatorSuite*>
+UsdValidationRegistry::GetOrLoadValidatorSuitesByName(
+    const TfTokenVector &suiteNames)
+{
+    std::vector<const UsdValidatorSuite*> suites;
+    suites.reserve(suiteNames.size());
+
+    for (const TfToken &suiteName : suiteNames) {
+        const UsdValidatorSuite *suite = GetOrLoadValidatorSuiteByName(suiteName);
+        // if suite is nullptr, that means suiteName was not found in the
+        // registry and it failed to register, in which case appropriate coding
+        // error would have been reported.
+        if (suite) {
+            suites.push_back(suite);
+        }
+    }
+    return suites;
+}
+
+bool
+UsdValidationRegistry::GetValidatorMetadata(
+    const TfToken &name, 
+    UsdValidatorMetadata *metadata) const 
+{
+    std::shared_lock lock(_mutex);
+    const auto& validatorNameToMetadataItr = 
+        _validatorNameToMetadata.find(name);
+    if (validatorNameToMetadataItr == _validatorNameToMetadata.end()) {
+        return false;
+    }
+    *metadata = validatorNameToMetadataItr->second;
+    return true;
+}
+
+UsdValidatorMetadataVector
+UsdValidationRegistry::GetAllValidatorMetadata() const
+{
+    UsdValidatorMetadataVector result;
+    std::shared_lock lock(_mutex);
+    result.reserve(_validatorNameToMetadata.size());
+    for (const auto &entry : _validatorNameToMetadata) {
+        result.push_back(entry.second);
+    }
+    return result;
+}
+
+UsdValidatorMetadataVector
+UsdValidationRegistry::GetValidatorMetadataForPlugin(
+    const TfToken &pluginName) const
+{
+    return GetValidatorMetadataForPlugins({pluginName});
+}
+
+UsdValidatorMetadataVector
+UsdValidationRegistry::GetValidatorMetadataForKeyword(
+    const TfToken &keyword) const
+{
+    return GetValidatorMetadataForKeywords({keyword});
+}
+
+UsdValidatorMetadataVector
+UsdValidationRegistry::GetValidatorMetadataForSchemaType(
+    const TfToken &schemaType) const
+{
+    return GetValidatorMetadataForSchemaTypes({schemaType});
+}
+
+UsdValidatorMetadataVector
+UsdValidationRegistry::GetValidatorMetadataForPlugins(
+    const TfTokenVector &pluginNames) const
+{
+    // Since the _pluginNameToValidatorNames is created during registry
+    // initialization this method is inherently thread safe, as
+    // _pluginNameToValidatorNames is already populated and never updated.
+    return _GetValidatorMetadataForToken(_pluginNameToValidatorNames, 
+                                         pluginNames);
+}
+
+UsdValidatorMetadataVector
+UsdValidationRegistry::GetValidatorMetadataForKeywords(
+    const TfTokenVector &keywords) const
+{
+    std::shared_lock lock(_mutex);
+    return _GetValidatorMetadataForToken(_keywordToValidatorNames, keywords);
+}
+
+UsdValidatorMetadataVector
+UsdValidationRegistry::GetValidatorMetadataForSchemaTypes(
+    const TfTokenVector &schemaTypes) const
+{
+    std::shared_lock lock(_mutex);
+    return _GetValidatorMetadataForToken(_schemaTypeToValidatorNames, 
+                                         schemaTypes);
+}
+
+UsdValidatorMetadataVector
+UsdValidationRegistry::_GetValidatorMetadataForToken(
+    const _TokenToValidatorNamesMap &tokenToValidatorNames,
+    const TfTokenVector &tokens) const
+{
+    UsdValidatorMetadataVector result;
+    for (const TfToken &token : tokens) {
+        const auto &itr = tokenToValidatorNames.find(token);
+        if (itr == tokenToValidatorNames.end()) {
+            continue;
+        }
+        std::shared_lock lock(_mutex);
+        for (const TfToken &validatorName : itr->second) {
+            // If we have a validatorName in tokenToValidatorNames, we
+            // must have a validatorMetadata for this validatorName, because
+            // that's how these are added in _AddValidatorMetadata
+            const auto &nameToMetadataItr = 
+                _validatorNameToMetadata.find(validatorName);
+            TF_VERIFY(nameToMetadataItr != _validatorNameToMetadata.end());
+            result.push_back(nameToMetadataItr->second);
+        }
+    }
+    return result;
+}
+
+bool
+UsdValidationRegistry::_AddValidatorMetadata(
+    const UsdValidatorMetadata &metadata)
+{
+    const bool didAddValidatorMetadata = [&]()
+        {
+            return _validatorNameToMetadata.emplace(
+                metadata.name, metadata).second;
+        }();
+
+    if (didAddValidatorMetadata) {
+        // Callers are required to hold a lock on `_mutex`, so 
+        // _schemaTypeToValidatorNames and _keywordToValidatorNames are 
+        // protected here.
+        _UpdateValidatorNamesMappings(_schemaTypeToValidatorNames,
+                                      metadata.name, metadata.schemaTypes);
+        _UpdateValidatorNamesMappings(_keywordToValidatorNames,
+                                      metadata.name, metadata.keywords);
+    }
+    return didAddValidatorMetadata;
+}
+
+/* static */
+bool
+UsdValidationRegistry::_CheckMetadata(
+    const UsdValidatorMetadata &metadata, 
+    bool checkForPrimTask, 
+    bool expectSuite)
+{
+    // return false if we are trying to register a validator which is
+    // associated with schemaTypes, and testing task is not
+    // UsdValidatePrimTaskFn!
+    if (!checkForPrimTask && !metadata.schemaTypes.empty()) {
+        TF_CODING_ERROR(
+            "Invalid metadata for ('%s') validator. Can not provide "
+            "schemaTypes metadata when registering a "
+            "UsdValidateLayerTaskFn or UsdValidateStageTaskFn validator.", 
+            metadata.name.GetText());
+        return false;
+    }
+
+    // Return false if isSuite metadata is set, but we are dealing with a
+    // UsdValidator, similarly returns false if isSuite metadata is not set, but
+    // we are dealing with a UsdValidatorSuite.
+    if (metadata.isSuite != expectSuite) {
+        TF_CODING_ERROR(
+            "Invalid metadata for '%s' validator. Incompatible isSuite "
+            "metadata set. Expected '%d', but '%d' provided.",
+            metadata.name.GetText(), expectSuite, metadata.isSuite);
+        return false;
+    }
+    return true;
+}
+
+/* static */
+void
+UsdValidationRegistry::_UpdateValidatorNamesMappings(
+    _TokenToValidatorNamesMap &tokenMap,
+    const TfToken &validatorName,
+    const TfTokenVector &tokens)
+{
+    for (const TfToken &token : tokens) {
+        if (tokenMap.find(token) == tokenMap.end()) {
+            tokenMap.emplace(token, TfTokenVector{validatorName});
+        } else {
+            // Since this method is only called from the
+            // _PopulateMetadataFromPlugInfo, its guaranteed that
+            // validatorNames will be unique in this vector.
+            tokenMap[token].push_back(validatorName);
+        }
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/usd/validationRegistry.h b/pxr/usd/usd/validationRegistry.h
new file mode 100644
index 0000000000..46739f0a66
--- /dev/null
+++ b/pxr/usd/usd/validationRegistry.h
@@ -0,0 +1,585 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_USD_USD_VALIDATION_REGISTRY_H
+#define PXR_USD_USD_VALIDATION_REGISTRY_H
+
+#include "pxr/pxr.h"
+#include "pxr/usd/usd/api.h"
+#include "pxr/usd/usd/validator.h"
+#include "pxr/base/tf/singleton.h"
+
+#include <shared_mutex>
+#include <memory>
+#include <unordered_map>
+
+/// \file
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class UsdValidationRegistry
+///
+/// UsdValidationRegistry manages and provides access to UsdValidator /
+/// UsdValidatorSuite for USD Validation.
+///
+/// UsdValidationRegistry is a singleton class, which serves as a central
+/// registry to hold / own all validators and validatorSuites by their names.
+/// Both Core USD and client-provided validators are registered with the
+/// registry. Validators can be registered and retrieved dynamically, supporting
+/// complex validation scenarios across different modules or plugins.
+///
+/// Clients of USD can register validators either via plugin infrastructure,
+/// which results in lazy loading of the validators, or explicitly register
+/// validators in their code via appropriate APIs.
+///
+/// As discussed in UsdValidator, validators are associated with
+/// UsdValidateLayerTaskFn, UsdValidateStageTaskFn or UsdValidatePrimTaskFn,
+/// which govern how a layer, stage or a prim needs to be validated.
+/// UsdValidator / UsdValidatorSuite also have metadata, which can either be
+/// provided in the plugInfo.json when registering the validators via plugin
+/// mechanism, or by providing metadata field when registering validators.
+///
+/// Example of registering a validator named "StageMetadataValidator" with 
+/// doc metadata using plufInfo.json:
+///
+/// \code
+/// {
+///     "Plugins": [
+///     {
+///         "Info": {
+///             "Name": "usd"
+///             "LibraryPath": "@PLUG_INFO_LIBRARY_PATH",
+///             ....
+///             ....
+///             ....
+///             "Validators": {
+///                 "keywords" : ["UsdCoreValidators"],
+///                 ...
+///                 "StageMetadataValidator": {
+///                     "doc": "Validates stage metadata."
+///                 },
+///                 ...
+///                 ...
+///                 ...
+///             }
+///         }
+///     } ]
+/// }
+/// \endcode
+///
+/// The above example can then be registered in the plugin:
+///
+/// ```cpp
+/// TF_REGISTRY_FUNCTION(UsdValidationRegistry)
+/// {
+///     UsdValidationRegistry& registry = UsdValidationRegistry::GetInstance();
+///     const TfToken validatorName("usd:StageMetadataValidator");
+///     const UsdValidateStageTaskFn stageTaskFn = 
+///         [](const UsdStagePtr &usdStage) {
+///             UsdValidationErrorVector errors;
+///             if (!usdStage->GetDefaultPrim()) {
+///                 errors.emplace_back(UsdValidationErrorType::Error,
+///                     {UsdValidationErrorSite(usdStage, SdfPath("/"))}, 
+///                     "Stage has missing or invalid defaultPrim.");
+///             }
+///             if (!usdStage->HasAuthoredMetadata(
+///                     UsdGeomTokens->metersPerUnit)) {
+///                 errors.emplace_back(UsdValidationErrorType::Error,
+///                     {UsdValidationErrorSite(usdStage, SdfPath("/"))},
+///                     "Stage does not specify its linear scale in "
+///                     "metersPerUnit.");
+///             }
+///             if (!usdStage->HasAuthoredMetadata(
+///                     UsdGeomTokens->upAxis)) {
+///                 errors.emplace_back(UsdValidationErrorType::Error,
+///                     {UsdValidationErrorSite(usdStage, SdfPath("/"))},
+///                     "Stage does not specify an upAxis.");
+///             }
+///             return errors;
+///         };
+///     registry.RegisterValidator(validatorName, stageTaskFn);
+/// }
+/// ```
+///
+/// Clients can also register validators by explicitly providing
+/// UsdValidatorMetadata, instead of relying on plugInfo.json for the same.
+/// Though its recommended to use appropriate APIs when validator metadata is
+/// being provided in the plugInfo.json.
+///
+/// Example of validator registration by explicitly providing metadata, when its
+/// not available in the plugInfo.json:
+///
+/// ```cpp
+/// {
+///     UsdValidationRegistry& registry = UsdValidationRegistry::GetInstance();
+///     const UsdValidatorMetadata &metadata = GetMetadataToBeRegistered();
+///     const UsdValidateLayerTaskFn &layerTask = GetLayerTaskForValidator();
+///     registry.RegisterValidator(metadata, layerTask);
+/// }
+/// ```
+///
+/// Usage:
+///
+/// As shown above, UsdValidator or UsdValidatorSuite can be registered using
+/// specific metadata or names, and retrieved by their name. The registry also
+/// provides functionality to check the existence of a validator / suite, load
+/// validators / suites dynamically if they are not in the registry.
+///
+/// Clients can also retrieve metadata for validators associated with a
+/// specific plugin, keywords or schemaTypes, this can help clients filter out
+/// relevant validators they need to validate their context / scene.
+///
+/// Note that this class is designed to be thread-safe:
+/// Querying of validator metadata, registering new validator (hence mutating
+/// the registry) or retrieving previously registered validator are designed to
+/// be thread-safe.
+///
+/// \sa UsdValidator
+/// \sa UsdValidatorSuite
+class UsdValidationRegistry
+{
+    UsdValidationRegistry(const UsdValidationRegistry&) = delete;
+    UsdValidationRegistry& operator=(const UsdValidationRegistry&) = delete;
+public:
+    USD_API
+    static UsdValidationRegistry& GetInstance() {
+        return TfSingleton<UsdValidationRegistry>::GetInstance();
+    }
+
+    /// Register UsdValidator defined in a plugin using \p validatorName and 
+    /// \p layerTaskFn with the UsdValidationRegistry.
+    ///
+    /// Here \p validatorName should include the name of the plugin the
+    /// validator belongs to, delimited by ":".
+    ///
+    /// Note calling RegisterPluginValidator with a validatorName which is
+    /// already registered will result in a coding error. HasValidator can be
+    /// used to determine if a validator is already registered and associated
+    /// with validatorName.
+    ///
+    /// Also note any other failure to register a validator results in a coding 
+    /// error.
+    ///
+    /// \sa HasValidator
+    USD_API
+    void RegisterPluginValidator(const TfToken &validatorName,
+                           const UsdValidateLayerTaskFn &layerTaskFn);
+
+    /// Register UsdValidator defined in a plugin using \p validatorName and 
+    /// \p stageTaskFn with the UsdValidationRegistry.
+    ///
+    /// Here \p validatorName should include the name of the plugin the
+    /// validator belongs to, delimited by ":".
+    ///
+    /// Note calling RegisterPluginValidator with a validatorName which is
+    /// already registered will result in a coding error. HasValidator can be
+    /// used to determine if a validator is already registered and associated
+    /// with validatorName.
+    ///
+    /// Also note any other failure to register a validator results in a coding 
+    /// error.
+    ///
+    /// \sa HasValidator
+    USD_API
+    void RegisterPluginValidator(const TfToken &validatorName,
+                           const UsdValidateStageTaskFn &stageTaskFn);
+
+    /// Register UsdValidator defined in a plugin using \p validatorName and 
+    /// \p primTaskFn with the UsdValidationRegistry.
+    ///
+    /// Here \p validatorName should include the name of the plugin the
+    /// validator belongs to, delimited by ":".
+    ///
+    /// Note calling RegisterPluginValidator with a validatorName which is
+    /// already registered will result in a coding error. HasValidator can be
+    /// used to determine if a validator is already registered and associated
+    /// with validatorName.
+    ///
+    /// Also note any other failure to register a validator results in a coding 
+    /// error.
+    ///
+    /// \sa HasValidator
+    USD_API
+    void RegisterPluginValidator(const TfToken &validatorName,
+                           const UsdValidatePrimTaskFn &primTaskFn);
+
+    /// Register UsdValidator using \p metadata and \p layerTaskFn
+    /// with the UsdValidationRegistry.
+    ///
+    /// Clients can explicitly provide validator metadata, which is then used to 
+    /// register a validator and associate it with name metadata. The metadata
+    /// here is not specified in a plugInfo.
+    ///
+    /// Note calling RegisterValidator with a validator name which is already
+    /// registered will result in a coding error. HasValidator can be used to
+    /// determine if a validator is already registered and associated with
+    /// validatorName.
+    ///
+    /// Also note any other failure to register a validator results in a coding 
+    /// error.
+    ///
+    /// \sa HasValidator
+    USD_API
+    void RegisterValidator(const UsdValidatorMetadata &metadata,
+                           const UsdValidateLayerTaskFn &layerTaskFn);
+
+    /// Register UsdValidator using \p metadata and \p stageTaskFn
+    /// with the UsdValidationRegistry.
+    ///
+    /// Clients can explicitly provide validator metadata, which is then used to 
+    /// register a validator and associate it with name metadata. The metadata
+    /// here is not specified in a plugInfo.
+    ///
+    /// Note calling RegisterValidator with a validator name which is already
+    /// registered will result in a coding error. HasValidator can be used to
+    /// determine if a validator is already registered and associated with
+    /// validatorName.
+    ///
+    /// Also note any other failure to register a validator results in a coding 
+    /// error.
+    ///
+    /// \sa HasValidator
+    USD_API
+    void RegisterValidator(const UsdValidatorMetadata &metadata,
+                           const UsdValidateStageTaskFn &stageTaskFn);
+
+    /// Register UsdValidator using \p metadata and \p primTaskFn
+    /// with the UsdValidationRegistry.
+    ///
+    /// Clients can explicitly provide validator metadata, which is then used to 
+    /// register a validator and associate it with name metadata. The metadata
+    /// here is not specified in a plugInfo.
+    ///
+    /// Note calling RegisterValidator with a validator name which is already
+    /// registered will result in a coding error. HasValidator can be used to
+    /// determine if a validator is already registered and associated with
+    /// validatorName.
+    ///
+    /// Also note any other failure to register a validator results in a coding 
+    /// error.
+    ///
+    /// \sa HasValidator
+    USD_API
+    void RegisterValidator(const UsdValidatorMetadata &metadata,
+                           const UsdValidatePrimTaskFn &primTaskFn);
+
+    /// Register UsdValidatorSuite defined in a plugin using
+    /// \p validatorSuiteName and \p containedValidators with the
+    /// UsdValidationRegistry.
+    ///
+    /// Here \p validatorSuiteName should include the name of the plugin the
+    /// validator belongs to, delimited by ":".
+    ///
+    /// Note UsdValidatorMetadata::isSuite must be set to true in the plugInfo,
+    /// else the validatorSuite will not be registered.
+    ///
+    /// Note calling RegisterPluginValidatorSuite with a validatorSuiteName
+    /// which is already registered will result in a coding error.
+    /// HasValidatorSuite can be used to determine if a validator is already
+    /// registered and associated with validatorName.
+    ///
+    /// Also note any other failure to register a validator results in a coding 
+    /// error.
+    ///
+    /// \sa HasValidatorSuite
+    USD_API
+    void RegisterPluginValidatorSuite(const TfToken &validatorSuiteName, 
+                                      const std::vector<const UsdValidator*>& 
+                                          containedValidators);
+
+    /// Register UsdValidatorSuite using \p metadata and
+    /// \p containedValidators with the UsdValidationRegistry.
+    ///
+    /// Clients can explicitly provide validator metadata, which is then used to 
+    /// register a suite and associate it with name metadata. The metadata
+    /// here is not specified in a plugInfo.
+    /// 
+    /// Note UsdValidatorMetadata::isSuite must be set to true in the plugInfo,
+    /// else the validatorSuite will not be registered.
+    ///
+    /// Note calling RegisterPluginValidatorSuite with a validatorSuiteName
+    /// which is already registered will result in a coding error.
+    /// HasValidatorSuite can be used to determine if a validator is already
+    /// registered and associated with validatorName.
+    ///
+    /// Also note any other failure to register a validator results in a coding 
+    /// error.
+    ///
+    /// \sa HasValidatorSuite
+    USD_API
+    void RegisterValidatorSuite(const UsdValidatorMetadata &metadata,
+                                const std::vector<const UsdValidator*>&
+                                    containedValidators);
+
+    /// Return true if a UsdValidator is registered with the name \p
+    /// validatorName; false otherwise.
+    bool HasValidator(const TfToken &validatorName) const;
+
+    /// Return true if a UsdValidatorSuite is registered with the name \p
+    /// validatorSuiteName; false otherwise.
+    bool HasValidatorSuite(const TfToken &suiteName) const;
+
+    /// Returns a vector of const pointer to UsdValidator corresponding to all
+    /// validators registered in the UsdValidationRegistry.
+    ///
+    /// If a validator is not found in the registry, this method will load
+    /// appropriate plugins, if the validator is made available via a plugin.
+    ///
+    /// Note that this call will load in many plugins which provide a
+    /// UsdValidator, if not already loaded. Also note that returned validators
+    /// will only include validators defined in plugins or any explicitly
+    /// registered validators before this call.
+    USD_API
+    std::vector<const UsdValidator*> GetOrLoadAllValidators();
+
+    /// Returns a const pointer to UsdValidator if \p validatorName is found in
+    /// the registry.
+    ///
+    /// If a validator is not found in the registry, this method will load
+    /// appropriate plugins, if the validator is made available via a plugin.
+    ///
+    /// Returns a nullptr if no validator is found.
+    USD_API
+    const UsdValidator* GetOrLoadValidatorByName(const TfToken &validatorName);
+
+    /// Returns a vector of const pointer to UsdValidator corresponding to 
+    /// \p validatorNames found in the registry.
+    ///
+    /// If a validator is not found in the registry, this method will load
+    /// appropriate plugins, if the validator is made available via a plugin.
+    ///
+    /// Size of returned vector might be less than the size of the input
+    /// validatorNames, in case of missing validators.
+    USD_API
+    std::vector<const UsdValidator*> 
+    GetOrLoadValidatorsByName(const TfTokenVector &validatorNames);
+
+    /// Returns a vector of const pointer to UsdValidatorSuite corresponding to 
+    /// all validator suites registered in the UsdValidationRegistry.
+    ///
+    /// If a suite is not found in the registry, this method will load
+    /// appropriate plugins, if the suite is made available via a plugin.
+    ///
+    /// Note that this call might load in many plugins which provide a
+    /// UsdValidatorSuite, if not already loaded. Also note that returned suites 
+    /// will only include suites defined in plugins or any explicitly registered
+    /// suites before this call.
+    USD_API
+    std::vector<const UsdValidatorSuite*> GetOrLoadAllValidatorSuites();
+
+    /// Returns a const pointer to UsdValidatorSuite if \p suiteName
+    /// is found in the registry.
+    ///
+    /// If a suite is not found in the registry, this method will load
+    /// appropriate plugins, if the suite is made available via a plugin.
+    ///
+    /// Returns a nullptr if no validator is found.
+    USD_API
+    const UsdValidatorSuite* GetOrLoadValidatorSuiteByName(
+        const TfToken &suiteName);
+
+    /// Returns a vector of const pointer to UsdValidatorSuite corresponding to
+    /// \p suiteNames found in the registry.
+    ///
+    /// If a suite is not found in the registry, this method will load
+    /// appropriate plugins, if the suite is made available via a plugin.
+    ///
+    /// Size of returned vector might be less than the size of the input
+    /// suiteNames, in case of missing validators.
+    USD_API
+    std::vector<const UsdValidatorSuite*> 
+    GetOrLoadValidatorSuitesByName(const TfTokenVector &suiteNames);
+
+    /// Returns true if metadata is found in the _validatorNameToMetadata for
+    /// a validator/suite name, false otherwise.
+    ///
+    /// \p metadata parameter is used as an out parameter here.
+    USD_API
+    bool GetValidatorMetadata(const TfToken &name, 
+                              UsdValidatorMetadata *metadata) const;
+
+    /// Return vector of all UsdValidatorMetadata known to the registry 
+    USD_API
+    UsdValidatorMetadataVector GetAllValidatorMetadata() const;
+
+    /// Returns vector of UsdValidatorMetadata associated with the Validators
+    /// which belong to the \p pluginName.
+    ///
+    /// This API can be used to curate a vector of validator metadata, that 
+    /// clients may want to load and use in their validation context.
+    ///
+    /// Note that this method does not result in any plugins to be loaded.
+    USD_API
+    UsdValidatorMetadataVector GetValidatorMetadataForPlugin(
+        const TfToken &pluginName) const;
+
+    /// Returns vector of UsdValidatorMetadata associated with the Validators 
+    /// which has the \p keyword.
+    ///
+    /// This API can be used to curate a vector of validator metadata, that 
+    /// clients may want to load and use in their validation context.
+    ///
+    /// Note that this method does not result in any plugins to be loaded.
+    USD_API
+    UsdValidatorMetadataVector GetValidatorMetadataForKeyword(
+        const TfToken &keyword) const;
+
+    /// Returns vector of UsdValidatorMetadata associated with the Validators 
+    /// which has the \p schemaType.
+    ///
+    /// This API can be used to curate a vector of validator metadata, that 
+    /// clients may want to load and use in their validation context.
+    ///
+    /// Note that this method does not result in any plugins to be loaded.
+    USD_API
+    UsdValidatorMetadataVector GetValidatorMetadataForSchemaType(
+        const TfToken &schemaType) const;
+
+    /// Returns vector of UsdValidatorMetadata associated with the Validators 
+    /// which belong to the \p pluginNames.
+    ///
+    /// The returned vector is a union of all UsdValidatorMetadata associated
+    /// with the plugins.
+    ///
+    /// This API can be used to curate a vector of validator metadata, that 
+    /// clients may want to load and use in their validation context.
+    ///
+    /// Note that this method does not result in any plugins to be loaded.
+    USD_API
+    UsdValidatorMetadataVector GetValidatorMetadataForPlugins(
+        const TfTokenVector &pluginNames) const;
+
+    /// Returns vector of UsdValidatorMetadata associated with the Validators 
+    /// which has at least one of the \p keywords.
+    ///
+    /// The returned vector is a union of all UsdValidatorMetadata associated
+    /// with the keywords.
+    ///
+    /// This API can be used to curate a vector of validator metadata, that 
+    /// clients may want to load and use in their validation context.
+    ///
+    /// Note that this method does not result in any plugins to be loaded.
+    USD_API
+    UsdValidatorMetadataVector GetValidatorMetadataForKeywords(
+        const TfTokenVector &keywords) const;
+
+    /// Returns vector of UsdValidatorMetadata associated with the Validators 
+    /// which has at least one of the \p schameTypes.
+    ///
+    /// The returned vector is a union of all UsdValidatorMetadata associated
+    /// with the schemaTypes.
+    ///
+    /// This API can be used to curate a vector of validator metadata, that 
+    /// clients may want to load and use in their validation context.
+    ///
+    /// Note that this method does not result in any plugins to be loaded.
+    USD_API
+    UsdValidatorMetadataVector GetValidatorMetadataForSchemaTypes(
+        const TfTokenVector &schemaTypes) const;
+
+private:
+    friend class TfSingleton<UsdValidationRegistry>;
+
+    UsdValidationRegistry();
+
+    // Initialize _validatorNameToMetadata, _keywordToValidatorNames and
+    // _schemaTypeToValidatorNames by parsing all plugInfo.json, find all 
+    // Validators.
+    void _PopulateMetadataFromPlugInfo();
+
+    // Templated method to register validator, called by appropriate
+    // RegisterValidator methods, providing UsdValidateLayerTaskFn,
+    // UsdValidateStageTaskFn or UsdValidatePrimTaskFn.
+    template<typename ValidateTaskFn>
+    void _RegisterPluginValidator(const TfToken &validatorName, 
+        const ValidateTaskFn &taskFn);
+
+    // Overloaded templated _RegisterValidator, where metadata is explicitly
+    // provided. 
+    template<typename ValidateTaskFn>
+    void _RegisterValidator(const UsdValidatorMetadata &metadata, 
+        const ValidateTaskFn &taskFn, bool addMetadata = true);
+
+    void _RegisterValidatorSuite(const UsdValidatorMetadata &metadata,
+        const std::vector<const UsdValidator*>& containedValidators, 
+        bool addMetadata = true);
+
+    // makes sure metadata provided is legal
+    // checkForPrimTask parameter is used to determine if schemaTypes metadata
+    // is provided and if the task being registered for the validator is
+    // UsdValidatePrimTaskFn.
+    // expectSuite parameter is used to determine if the isSuite metadata is
+    // appropriately set (for UsdValidatorSuite) or not (for UsdValidator).
+    static
+    bool _CheckMetadata(const UsdValidatorMetadata &metadata,
+            bool checkForPrimTask, bool expectSuite = false);
+
+    // Add validator metadata to _validatorNameToMetadata, also updates
+    // _schemaTypeToValidatorNames and _keywordToValidatorNames, for easy access
+    // to what validators are linked to specific schemaTypes or keywords.
+    // _mutex must be acquired before calling this method.
+    bool _AddValidatorMetadata(const UsdValidatorMetadata &metadata);
+    
+    using _ValidatorNameToValidatorMap = 
+        std::unordered_map<TfToken, std::unique_ptr<UsdValidator>, 
+            TfToken::HashFunctor>;
+    using _ValidatorSuiteNameToValidatorSuiteMap = 
+        std::unordered_map<TfToken, std::unique_ptr<UsdValidatorSuite>,
+            TfToken::HashFunctor>;
+    using _ValidatorNameToMetadataMap =
+        std::unordered_map<TfToken, UsdValidatorMetadata, TfToken::HashFunctor>;
+    using _TokenToValidatorNamesMap =
+        std::unordered_map<TfToken, TfTokenVector, TfToken::HashFunctor>;
+
+    // Helper to query 
+    UsdValidatorMetadataVector _GetValidatorMetadataForToken(
+        const _TokenToValidatorNamesMap &tokenToValidatorNames,
+        const TfTokenVector &tokens) const;
+
+    // Helper to populate _keywordToValidatorNames and
+    // _schemaTypeToValidatorNames
+    // _mutex must be acquired before calling this method.
+    static
+    void _UpdateValidatorNamesMappings(_TokenToValidatorNamesMap &tokenMap, 
+        const TfToken &validatorName, const TfTokenVector &tokens);
+
+    // Main datastructure which holds validatorName to 
+    // std::unique_ptr<UsdValidator>
+    _ValidatorNameToValidatorMap _validators;
+    // Main datastructure which holds suiteName to 
+    // std::unique_ptr<UsdValidatorSuite>
+    _ValidatorSuiteNameToValidatorSuiteMap _validatorSuites;
+
+    // ValidatorName to ValidatorMetadata map
+    _ValidatorNameToMetadataMap _validatorNameToMetadata;
+
+    // Following 3 are helper data structures to easy lookup for Validators,
+    // when queried for keywords, schemaType or pluginName.
+
+    // This map stores the mapping from keyword to validator names. It may get
+    // updated as validators can be registered dynamically outside of the plugin
+    // infrastructure.
+    _TokenToValidatorNamesMap _keywordToValidatorNames;
+
+    // This map stores the mapping from schemaTypes to validator names. It may
+    // get updated as validators can be registered dynamically outside of the
+    // plugin infrastructure.
+    _TokenToValidatorNamesMap _schemaTypeToValidatorNames;
+
+    // This map stores the mapping from plugin names to validator names.
+    // It is populated during the initialization of UsdValidationRegistry
+    // and remains constant thereafter.
+    _TokenToValidatorNamesMap _pluginNameToValidatorNames;
+
+    // Mutex to protect access to all data members.
+    mutable std::shared_mutex _mutex;
+};
+
+USD_API_TEMPLATE_CLASS(TfSingleton<UsdValidationRegistry>);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_USD_USD_VALIDATION_REGISTRY_H
diff --git a/pxr/usd/usd/validator.cpp b/pxr/usd/usd/validator.cpp
new file mode 100644
index 0000000000..e70b48c49d
--- /dev/null
+++ b/pxr/usd/usd/validator.cpp
@@ -0,0 +1,103 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usd/usd/validator.h"
+#include "pxr/usd/usd/validationError.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+UsdValidator::UsdValidator(const UsdValidatorMetadata& metadata) :
+    _metadata(metadata)
+{
+}
+
+UsdValidator::UsdValidator(const UsdValidatorMetadata& metadata,
+                           const UsdValidateLayerTaskFn& validateLayerTaskFn) :
+    _metadata(metadata), _validateTaskFn(validateLayerTaskFn)
+{
+}
+
+UsdValidator::UsdValidator(const UsdValidatorMetadata& metadata,
+                           const UsdValidateStageTaskFn& validateStageTaskFn) :
+    _metadata(metadata), _validateTaskFn(validateStageTaskFn)
+{
+}
+
+UsdValidator::UsdValidator(const UsdValidatorMetadata& metadata,
+                           const UsdValidatePrimTaskFn& validatePrimTaskFn) :
+    _metadata(metadata), _validateTaskFn(validatePrimTaskFn)
+{
+}
+
+const UsdValidateLayerTaskFn*
+UsdValidator::_GetValidateLayerTask() const
+{
+    return std::get_if<UsdValidateLayerTaskFn>(&_validateTaskFn);
+}
+
+const UsdValidateStageTaskFn*
+UsdValidator::_GetValidateStageTask() const
+{
+    return std::get_if<UsdValidateStageTaskFn>(&_validateTaskFn);
+}
+
+const UsdValidatePrimTaskFn*
+UsdValidator::_GetValidatePrimTask() const
+{
+    return std::get_if<UsdValidatePrimTaskFn>(&_validateTaskFn);
+}
+
+UsdValidationErrorVector
+UsdValidator::Validate(const SdfLayerHandle &layer) const
+{
+    const UsdValidateLayerTaskFn *layerTaskFn = _GetValidateLayerTask();
+    if (layerTaskFn) {
+        UsdValidationErrorVector errors = (*layerTaskFn)(layer);
+        for (UsdValidationError &error : errors) {
+            error._SetValidator(this);
+        }
+        return errors;
+    }
+    return {};
+}
+
+UsdValidationErrorVector
+UsdValidator::Validate(const UsdStagePtr &usdStage) const
+{
+    const UsdValidateStageTaskFn *stageTaskFn = _GetValidateStageTask();
+    if (stageTaskFn) {
+        UsdValidationErrorVector errors = (*stageTaskFn)(usdStage);
+        for (UsdValidationError &error : errors) {
+            error._SetValidator(this);
+        }
+        return errors;
+    }
+    return {};
+}
+
+UsdValidationErrorVector
+UsdValidator::Validate(const UsdPrim &usdPrim) const
+{
+    const UsdValidatePrimTaskFn *primTaskFn = _GetValidatePrimTask();
+    if (primTaskFn) {
+        UsdValidationErrorVector errors = (*primTaskFn)(usdPrim);
+        for (UsdValidationError &error : errors) {
+            error._SetValidator(this);
+        }
+        return errors;
+    }
+    return {};
+}
+
+UsdValidatorSuite::UsdValidatorSuite(const UsdValidatorMetadata& metadata,
+                         const std::vector<const UsdValidator*>& validators) :
+    _metadata(metadata), _containedValidators(validators)
+{
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
diff --git a/pxr/usd/usd/validator.h b/pxr/usd/usd/validator.h
new file mode 100644
index 0000000000..921c6a4e23
--- /dev/null
+++ b/pxr/usd/usd/validator.h
@@ -0,0 +1,268 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_USD_USD_VALIDATOR_H
+#define PXR_USD_USD_VALIDATOR_H
+
+/// \file
+
+#include "pxr/pxr.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/usd/usd/api.h"
+#include "pxr/usd/usd/stage.h"
+
+#include <functional>
+#include <variant>
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class UsdValidationError;
+using UsdValidationErrorVector = std::vector<UsdValidationError>;
+class UsdPrim;
+
+/// \class UsdValidatorMetadata
+///
+/// A structure which describes metadata for a UsdValidator.
+///
+/// The metadata values are populated from the plugInfo.json associated with a
+/// validator's plugin. PlugInfo can provide the following validator metadata:
+///
+/// - name: A required field. This metadatum stores the validator name. For
+/// validators defined in a plugin, the name must be a fully qualified name 
+/// which includes the pluginName as well, separated by ":". This ensures,
+/// plugin provided validator names are guaranteed to be unique.
+/// - pluginPtr: Pointer to the plugin where a plugin based validator is defined.
+/// nullptr for a non-plugin based validator.
+/// - keywords: Keywords associated with this validator. 
+/// - doc: Doc string explaining the purpose of the validator. 
+/// - schemaTypes: If the validator is associated with specific schemaTypes.
+/// - isSuite: If the validator represents a suite of validators.
+///
+struct UsdValidatorMetadata
+{
+    /// Name of the validator.
+    ///
+    /// For plugin provided validators, this is prefixed with the pluginName,
+    /// like "pluginName:testName" in order to uniquely identify these plugin
+    /// provided validators.
+    ///
+    /// This is a mandatory field for a ValidatorMetadata.
+    TfToken name;
+
+    /// Pointer to the plugin to which a plugin based validator belongs. 
+    ///
+    /// For non-plugin based validator, pluginPtr is nullptr.
+    PlugPluginPtr pluginPtr;
+    
+    /// list of keywords extracted for this test from the plugInfo.json
+    TfTokenVector keywords;
+
+    /// doc string extracted from plugInfo.json
+    /// This is a mandatory field for a ValidatorMetadata.
+    std::string doc;
+
+    /// list of schemaTypes names this test applies to, extracted from
+    /// plugInfo.json
+    TfTokenVector schemaTypes;
+
+    /// whether this test represents a test suite or not
+    bool isSuite;
+}; // UsdValidatorMetadata
+
+using UsdValidatorMetadataVector = std::vector<UsdValidatorMetadata>;
+
+// TODO:
+// - TimeCode (Range), leaving right now for brevity. Will introduce in
+// subsequent iterations.
+//
+//
+
+/// \defgroup UsdValidateTaskFn_group Validating Task Functions
+///
+/// UsdValidateLayerTaskFn, UsdValidateStageTaskFn and UsdValidatePrimTaskFn
+/// represent the callbacks associated with each validator's validation logic.
+///
+/// Clients must provide implementation for these in their respective plugin
+/// registration code.
+/// @{
+
+/// UsdValidateLayerTaskFn: Validation logic operating on a given SdfLayerHandle
+using UsdValidateLayerTaskFn = std::function<UsdValidationErrorVector(
+    const SdfLayerHandle&)>;
+/// UsdValidateStageTaskFn: Validation logic operating on a given UsdStage
+using UsdValidateStageTaskFn = std::function<UsdValidationErrorVector(
+    const UsdStagePtr&)>;
+/// UsdValidatePrimTaskFn: Validation logic operating on a given UsdPrim
+using UsdValidatePrimTaskFn = std::function<UsdValidationErrorVector(
+    const UsdPrim&)>;
+
+/// @}
+
+/// \class UsdValidator
+///
+/// UsdValidator is a class describing a single test.
+///
+/// An instance of UsdValidator is created when plugins are loaded and tests are
+/// registered and cached in the UsdValidationRegistry.  UsdValidator can
+/// consist of any one of the 3 testing tasks: LayerTestingTask,
+/// StageTestingTask or PrimTestingTask, which correspond to testing the given
+/// SdfLayer, an entire UsdStage or a UsdPrim respectively. UsdValidator
+/// instances are immutable and non-copyable.
+///
+class UsdValidator
+{
+public:
+    /// Instantiate a UsdValidator which has no validation logic implementation.
+    /// This is primarily used by UsdValidatorSuite.
+    USD_API
+    explicit UsdValidator(const UsdValidatorMetadata &metadata);
+
+    UsdValidator(const UsdValidator &other) = delete;
+    UsdValidator &operator=(const UsdValidator&) = delete;
+
+    UsdValidator(UsdValidator &&other) noexcept = default;
+    UsdValidator& operator=(UsdValidator&&) noexcept = default;
+
+    /// Instantiate a UsdValidator which has its validation logic implemented by
+    /// a UsdValidateLayerTaskFn. 
+    USD_API
+    UsdValidator(const UsdValidatorMetadata &metadata,
+                 const UsdValidateLayerTaskFn &validateLayerTaskFn);
+
+    /// Instantiate a UsdValidator which has its validation logic implemented by
+    /// a UsdValidateStageTaskFn.
+    USD_API
+    UsdValidator(const UsdValidatorMetadata &metadata,
+                 const UsdValidateStageTaskFn &validateStageTaskFn);
+
+    /// Instantiate a UsdValidator which has its validation logic implemented by
+    /// a UsdValidatePrimTaskFn.
+    USD_API
+    UsdValidator(const UsdValidatorMetadata &metadata,
+                 const UsdValidatePrimTaskFn &validatePrimTaskFn);
+
+    /// Return metadata associated with this Validator.
+    const UsdValidatorMetadata& GetMetadata() const &
+    {
+        return _metadata;
+    }
+
+    /// Return metadata associated with this validator by-value.
+    UsdValidatorMetadata GetMetadata() &&
+    {
+        return std::move(_metadata);
+    }
+
+    /// Run validation on the given \p layer by executing the contained
+    /// validateTaskFn and returns UsdValidationErrorVector.
+    ///
+    /// If this Validator doesn't provide a UsdValidateLayerTaskFn, then an
+    /// empty vector is returned, which signifies no error.
+    USD_API
+    UsdValidationErrorVector Validate(const SdfLayerHandle &layer) const;
+
+    /// Run validation on the given \p usdStage by executing the contained
+    /// validateTaskFn and returns UsdValidationErrorVector.
+    ///
+    /// If this Validator doesn't provide a UsdValidateStageTaskFn, then an
+    /// empty vector is returned, which signifies no error.
+    USD_API
+    UsdValidationErrorVector Validate(const UsdStagePtr &usdStage) const;
+
+    /// Run validation on the given \p usdPrim by executing the contained
+    /// validateTaskFn and returns UsdValidationErrorVector.
+    ///
+    /// If this Validator doesn't provide a UsdValidatePrimTaskFn, then an
+    /// empty vector is returned, which signifies no error.
+    USD_API
+    UsdValidationErrorVector Validate(const UsdPrim& usdPrim) const;
+
+private:
+    // To make sure registry can query task types on a validator.
+    // Registry needs access to _GetValidatorPrimTasks, in order to determine if
+    // the contained validators in a suite, which provides schemaTypes metadata
+    // are compliant.
+    friend class UsdValidationRegistry;
+
+    UsdValidatorMetadata _metadata;
+    std::variant<UsdValidateLayerTaskFn, 
+                 UsdValidateStageTaskFn,
+                 UsdValidatePrimTaskFn> _validateTaskFn;
+
+    // Return UsdValidateLayerTaskFn if provided by the validator, else a
+    // nullptr.
+    const UsdValidateLayerTaskFn* _GetValidateLayerTask() const;
+
+    // Return UsdValidateStageTaskFn if provided by the validator, else a
+    // nullptr.
+    const UsdValidateStageTaskFn* _GetValidateStageTask() const;
+
+    // Return UsdValidatePrimTaskFn if provided by the validator, else a
+    // nullptr.
+    const UsdValidatePrimTaskFn* _GetValidatePrimTask() const;
+
+}; // UsdValidator
+
+/// \class UsdValidatorSuite
+///
+/// UsdValidatorSuite acts like a suite for a collection of tests, which
+/// clients can use to bundle all tests relevant to test their concepts.
+///
+/// If client failed to provide isSuite metadata for a UsdValidatorSuite
+/// instance then the validatorSuite will not be registered, and client will
+/// appropriately be warned.
+class UsdValidatorSuite
+{
+public:
+    /// Instantiate UsdValidatorSuite using \p metadata and a vector of \p
+    /// validators.
+    USD_API
+    UsdValidatorSuite(const UsdValidatorMetadata &metadata,
+                      const std::vector<const UsdValidator*>& validators);
+
+    UsdValidatorSuite(UsdValidatorSuite &&other) noexcept = default;
+
+    UsdValidatorSuite& operator=(UsdValidatorSuite&&) noexcept = default;
+
+    /// Returns a vector of const UsdValidator pointers, which make this
+    /// UsdValidatorSuite. Note that the validators are guaranteed to be valid,
+    /// since their lifetime is managed by the UsdValidationRegistry, which has
+    /// a higher scope than individual validators. 
+    const std::vector<const UsdValidator*>& GetContainedValidators() const &
+    {
+        return _containedValidators;
+    }
+
+    /// Returns a vector of const UsdValidator pointers, which make this
+    /// UsdValidatorSuite. Note that the validators are guaranteed to be valid,
+    /// since their lifetime is managed by the UsdValidationRegistry, which has
+    /// a higher scope than individual validators. 
+    std::vector<const UsdValidator*> GetContainedValidators() &&
+    {
+        return std::move(_containedValidators);
+    }
+
+    /// Return metadata associated with this validator.
+    const UsdValidatorMetadata& GetMetadata() const &
+    {
+        return _metadata;
+    }
+
+    /// Return metadata associated with this validator.
+    UsdValidatorMetadata GetMetadata() &&
+    {
+        return std::move(_metadata);
+    }
+
+private:
+    UsdValidatorMetadata _metadata;
+    std::vector<const UsdValidator*> _containedValidators;
+}; // UsdValidatorSuite
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_USD_USD_VALIDATOR_H
diff --git a/pxr/usd/usd/validatorTokens.cpp b/pxr/usd/usd/validatorTokens.cpp
new file mode 100644
index 0000000000..1a8bb9b70c
--- /dev/null
+++ b/pxr/usd/usd/validatorTokens.cpp
@@ -0,0 +1,16 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usd/usd/validatorTokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(UsdValidatorNameTokens, USD_VALIDATOR_NAMES_TOKENS);
+TF_DEFINE_PUBLIC_TOKENS(UsdValidatorKeywordTokens, 
+                        USD_VALIDATOR_KEYWORD_TOKENS);
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/usd/validatorTokens.h b/pxr/usd/usd/validatorTokens.h
new file mode 100644
index 0000000000..edd43cdca7
--- /dev/null
+++ b/pxr/usd/usd/validatorTokens.h
@@ -0,0 +1,40 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef USD_VALIDATOR_TOKENS_H
+#define USD_VALIDATOR_TOKENS_H
+
+/// \file usd/validatorTokens.h
+
+#include "pxr/pxr.h"
+#include "pxr/usd/usd/api.h"
+#include "pxr/base/tf/staticTokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#define USD_VALIDATOR_NAME_TOKENS                   \
+    ((compositionErrorTest, "usd:CompositionErrorTest"))
+
+#define USD_VALIDATOR_KEYWORD_TOKENS                \
+    (UsdCoreValidators)
+
+/// Tokens representing validator names. Note that for plugin provided
+/// validators, the names must be prefixed by usd:, which is the name of
+/// the usd plugin.
+TF_DECLARE_PUBLIC_TOKENS(UsdValidatorNameTokens, USD_API, 
+                         USD_VALIDATOR_NAME_TOKENS);
+
+/// Tokens representing keywords associated with any validator in the usd
+/// plugin. Cliends can use this to inspect validators contained within a
+/// specific keywords, or use these to be added as keywords to any new
+/// validator.
+TF_DECLARE_PUBLIC_TOKENS(UsdValidatorKeywordTokens, USD_API, 
+                         USD_VALIDATOR_KEYWORD_TOKENS);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/pxr/usd/usd/valueUtils.cpp b/pxr/usd/usd/valueUtils.cpp
index 6ca0f4d4ad..f34bf01850 100644
--- a/pxr/usd/usd/valueUtils.cpp
+++ b/pxr/usd/usd/valueUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/usd/valueUtils.h"
diff --git a/pxr/usd/usd/valueUtils.h b/pxr/usd/usd/valueUtils.h
index 164f380641..62fcb90c39 100644
--- a/pxr/usd/usd/valueUtils.h
+++ b/pxr/usd/usd/valueUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_VALUE_UTILS_H
 #define PXR_USD_USD_VALUE_UTILS_H
diff --git a/pxr/usd/usd/variantSets.cpp b/pxr/usd/usd/variantSets.cpp
index a66646f6f4..027f0d008c 100644
--- a/pxr/usd/usd/variantSets.cpp
+++ b/pxr/usd/usd/variantSets.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/variantSets.h"
diff --git a/pxr/usd/usd/variantSets.h b/pxr/usd/usd/variantSets.h
index 8cfe8aab20..e714433b7e 100644
--- a/pxr/usd/usd/variantSets.h
+++ b/pxr/usd/usd/variantSets.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_VARIANT_SETS_H
 #define PXR_USD_USD_VARIANT_SETS_H
diff --git a/pxr/usd/usd/wrapAPISchemaBase.cpp b/pxr/usd/usd/wrapAPISchemaBase.cpp
index 5aabb2aa12..05e30a48d3 100644
--- a/pxr/usd/usd/wrapAPISchemaBase.cpp
+++ b/pxr/usd/usd/wrapAPISchemaBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/apiSchemaBase.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/wrapAttribute.cpp b/pxr/usd/usd/wrapAttribute.cpp
index 591b948630..09253fb342 100644
--- a/pxr/usd/usd/wrapAttribute.cpp
+++ b/pxr/usd/usd/wrapAttribute.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/attribute.h"
diff --git a/pxr/usd/usd/wrapAttributeQuery.cpp b/pxr/usd/usd/wrapAttributeQuery.cpp
index a3dac7a0f0..cbb31c3c7d 100644
--- a/pxr/usd/usd/wrapAttributeQuery.cpp
+++ b/pxr/usd/usd/wrapAttributeQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/attributeQuery.h"
diff --git a/pxr/usd/usd/wrapClipsAPI.cpp b/pxr/usd/usd/wrapClipsAPI.cpp
index e66d5673cb..47918b334e 100644
--- a/pxr/usd/usd/wrapClipsAPI.cpp
+++ b/pxr/usd/usd/wrapClipsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/clipsAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/wrapCollectionAPI.cpp b/pxr/usd/usd/wrapCollectionAPI.cpp
index 3eacfc7fff..5c328e111b 100644
--- a/pxr/usd/usd/wrapCollectionAPI.cpp
+++ b/pxr/usd/usd/wrapCollectionAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/collectionAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
@@ -284,6 +267,10 @@ WRAP_CUSTOM {
              (arg("prim"), arg("collectionName")))
             .staticmethod("GetNamedCollectionPath")
 
+        .def("ResolveCompleteMembershipExpression",
+             (SdfPathExpression (This::*)() const)
+             &This::ResolveCompleteMembershipExpression)
+
         .def("IsSchemaPropertyBaseName", &This::IsSchemaPropertyBaseName,
             arg("baseName"))
             .staticmethod("IsSchemaPropertyBaseName")
diff --git a/pxr/usd/usd/wrapCollectionMembershipQuery.cpp b/pxr/usd/usd/wrapCollectionMembershipQuery.cpp
index 6c0badb9c2..9d7c53f0f2 100644
--- a/pxr/usd/usd/wrapCollectionMembershipQuery.cpp
+++ b/pxr/usd/usd/wrapCollectionMembershipQuery.cpp
@@ -1,28 +1,12 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/collectionMembershipQuery.h"
 
+#include "pxr/base/tf/pyContainerConversions.h"
 #include "pxr/base/tf/pyResultConversions.h"
 #include "pxr/usd/usd/object.h"
 
@@ -49,6 +33,50 @@ static bool _WrapIsPathIncluded_2(
     return query.IsPathIncluded(path, parentExpansionRule);
 }
 
+struct _PathExpansionRuleMapFromPython
+{
+    using RuleMap = Usd_CollectionMembershipQueryBase::PathExpansionRuleMap;
+    
+    _PathExpansionRuleMapFromPython() {
+        converter::registry::insert(
+            &convertible, &construct, type_id<RuleMap>());
+    }
+    
+    static PyObject *convert(PyObject *p, RuleMap *result) {
+        if (!PyDict_Check(p)) {
+            return nullptr;
+        }
+        Py_ssize_t pos = 0;
+        PyObject *pyKey = nullptr, *pyVal = nullptr;
+        while (PyDict_Next(p, &pos, &pyKey, &pyVal)) {
+            extract<SdfPath> keyProxy(pyKey);
+            extract<TfToken> valProxy(pyVal);
+            if (!keyProxy.check() || !valProxy.check()) {
+                return nullptr;
+            }
+            object pVal(handle<>(borrowed(pyVal)));
+            if (result) {
+                (*result)[keyProxy()] = valProxy();
+            }
+        }
+        return p;
+    }
+
+    static void *convertible(PyObject *p) {
+        return convert(p, nullptr);
+    }
+
+    static void construct(PyObject *source,
+                          converter::rvalue_from_python_stage1_data *data) {
+        void *storage = (
+            (converter::rvalue_from_python_storage<RuleMap>*)
+            data)->storage.bytes;
+        new (storage) RuleMap;
+        data->convertible = storage;
+        convert(source, (RuleMap *)storage);
+    }
+};
+
 } // anonymous namespace
 
 void
@@ -66,6 +94,10 @@ wrapUsdCollectionMembershipQuery()
          arg("predicate")=UsdPrimDefaultPredicate),
         return_value_policy<TfPySequenceToList>());
 
+    def("ComputePathExpressionFromCollectionMembershipQueryRuleMap",
+        UsdComputePathExpressionFromCollectionMembershipQueryRuleMap,
+        arg("ruleMap"));
+
     class_<UsdCollectionMembershipQuery>("UsdCollectionMembershipQuery")
         .def("IsPathIncluded", _WrapIsPathIncluded_1, arg("path"))
         .def("IsPathIncluded", _WrapIsPathIncluded_2, 
@@ -77,10 +109,18 @@ wrapUsdCollectionMembershipQuery()
         .def("GetIncludedCollections",
              &UsdCollectionMembershipQuery::GetIncludedCollections,
              return_value_policy<TfPySequenceToList>())
+        .def("UsesPathExpansionRuleMap",
+             &UsdCollectionMembershipQuery::UsesPathExpansionRuleMap)
         .def("__hash__", &UsdCollectionMembershipQuery::GetHash)
         .def(self == self)
         .def(self != self)
         ;
+
+    // from-python conversion from PathExpansionRuleMap.
+    TfPyContainerConversions::from_python_tuple_pair<
+        Usd_CollectionMembershipQueryBase::PathExpansionRuleMap::value_type>();
+
+    _PathExpansionRuleMapFromPython();
 }
 
 
diff --git a/pxr/usd/usd/wrapCommon.cpp b/pxr/usd/usd/wrapCommon.cpp
index b038b32ce1..76720529ff 100644
--- a/pxr/usd/usd/wrapCommon.cpp
+++ b/pxr/usd/usd/wrapCommon.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/common.h"
diff --git a/pxr/usd/usd/wrapCrateInfo.cpp b/pxr/usd/usd/wrapCrateInfo.cpp
index c8133f8db1..34431a112e 100644
--- a/pxr/usd/usd/wrapCrateInfo.cpp
+++ b/pxr/usd/usd/wrapCrateInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/crateInfo.h"
diff --git a/pxr/usd/usd/wrapEditContext.cpp b/pxr/usd/usd/wrapEditContext.cpp
index cf36f7faf0..fca7237dc9 100644
--- a/pxr/usd/usd/wrapEditContext.cpp
+++ b/pxr/usd/usd/wrapEditContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/editContext.h"
diff --git a/pxr/usd/usd/wrapEditTarget.cpp b/pxr/usd/usd/wrapEditTarget.cpp
index 5a4f35ae4c..d2d06e9fb0 100644
--- a/pxr/usd/usd/wrapEditTarget.cpp
+++ b/pxr/usd/usd/wrapEditTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/editTarget.h"
diff --git a/pxr/usd/usd/wrapFlattenUtils.cpp b/pxr/usd/usd/wrapFlattenUtils.cpp
index 4deb7b6230..16dca01482 100644
--- a/pxr/usd/usd/wrapFlattenUtils.cpp
+++ b/pxr/usd/usd/wrapFlattenUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/pragmas.h"
diff --git a/pxr/usd/usd/wrapInherits.cpp b/pxr/usd/usd/wrapInherits.cpp
index 208b552dc3..cd1f0d7a5f 100644
--- a/pxr/usd/usd/wrapInherits.cpp
+++ b/pxr/usd/usd/wrapInherits.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/inherits.h"
diff --git a/pxr/usd/usd/wrapInterpolation.cpp b/pxr/usd/usd/wrapInterpolation.cpp
index b02e18865a..f0943563fd 100644
--- a/pxr/usd/usd/wrapInterpolation.cpp
+++ b/pxr/usd/usd/wrapInterpolation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/interpolation.h"
diff --git a/pxr/usd/usd/wrapModelAPI.cpp b/pxr/usd/usd/wrapModelAPI.cpp
index e18af10a9e..2c5aa9e7d2 100644
--- a/pxr/usd/usd/wrapModelAPI.cpp
+++ b/pxr/usd/usd/wrapModelAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/modelAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/wrapNamespaceEditor.cpp b/pxr/usd/usd/wrapNamespaceEditor.cpp
index 6a6aa799ff..1eefc06511 100644
--- a/pxr/usd/usd/wrapNamespaceEditor.cpp
+++ b/pxr/usd/usd/wrapNamespaceEditor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/namespaceEditor.h"
@@ -72,6 +55,7 @@ void wrapUsdNamespaceEditor()
 
     scope s = class_<This>("NamespaceEditor", no_init)
         .def(init<const UsdStagePtr &>())
+        .def(init<const UsdStagePtr &, const This::EditOptions &>())
 
         .def("DeletePrimAtPath", &This::DeletePrimAtPath)
         .def("MovePrimAtPath", &This::MovePrimAtPath)
@@ -100,4 +84,11 @@ void wrapUsdNamespaceEditor()
         .def("ApplyEdits", &This::ApplyEdits)
         .def("CanApplyEdits", &_CanApplyEdits)
     ;
+
+    class_<This::EditOptions>("EditOptions")
+        .def(init<>())
+        .add_property("allowRelocatesAuthoring", 
+            &This::EditOptions::allowRelocatesAuthoring, 
+            &This::EditOptions::allowRelocatesAuthoring)
+    ;
 }
diff --git a/pxr/usd/usd/wrapNotice.cpp b/pxr/usd/usd/wrapNotice.cpp
index 70104dbcd9..39b439bebb 100644
--- a/pxr/usd/usd/wrapNotice.cpp
+++ b/pxr/usd/usd/wrapNotice.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/notice.h"
diff --git a/pxr/usd/usd/wrapObject.cpp b/pxr/usd/usd/wrapObject.cpp
index 0102619bf9..08864bc352 100644
--- a/pxr/usd/usd/wrapObject.cpp
+++ b/pxr/usd/usd/wrapObject.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/object.h"
diff --git a/pxr/usd/usd/wrapPayloads.cpp b/pxr/usd/usd/wrapPayloads.cpp
index 86feab3e6d..49d0d82fc7 100644
--- a/pxr/usd/usd/wrapPayloads.cpp
+++ b/pxr/usd/usd/wrapPayloads.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/payloads.h"
diff --git a/pxr/usd/usd/wrapPrim.cpp b/pxr/usd/usd/wrapPrim.cpp
index 39983a6585..0f510c2ad0 100644
--- a/pxr/usd/usd/wrapPrim.cpp
+++ b/pxr/usd/usd/wrapPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/prim.h"
diff --git a/pxr/usd/usd/wrapPrimCompositionQuery.cpp b/pxr/usd/usd/wrapPrimCompositionQuery.cpp
index 2dbc0104c2..318fdec7d4 100644
--- a/pxr/usd/usd/wrapPrimCompositionQuery.cpp
+++ b/pxr/usd/usd/wrapPrimCompositionQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primCompositionQuery.h"
diff --git a/pxr/usd/usd/wrapPrimDefinition.cpp b/pxr/usd/usd/wrapPrimDefinition.cpp
index 787b56cc9f..9d5d80ab50 100644
--- a/pxr/usd/usd/wrapPrimDefinition.cpp
+++ b/pxr/usd/usd/wrapPrimDefinition.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primDefinition.h"
diff --git a/pxr/usd/usd/wrapPrimFlags.cpp b/pxr/usd/usd/wrapPrimFlags.cpp
index 7c0b3e9380..d5ed198c2a 100644
--- a/pxr/usd/usd/wrapPrimFlags.cpp
+++ b/pxr/usd/usd/wrapPrimFlags.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/hash.h"
diff --git a/pxr/usd/usd/wrapPrimRange.cpp b/pxr/usd/usd/wrapPrimRange.cpp
index e2e9a59030..e8136382b4 100644
--- a/pxr/usd/usd/wrapPrimRange.cpp
+++ b/pxr/usd/usd/wrapPrimRange.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primRange.h"
diff --git a/pxr/usd/usd/wrapPrimTypeInfo.cpp b/pxr/usd/usd/wrapPrimTypeInfo.cpp
index d5109ce4e1..7fae8e7ae3 100644
--- a/pxr/usd/usd/wrapPrimTypeInfo.cpp
+++ b/pxr/usd/usd/wrapPrimTypeInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/primTypeInfo.h"
diff --git a/pxr/usd/usd/wrapProperty.cpp b/pxr/usd/usd/wrapProperty.cpp
index 2c3d8b9a87..543acde8f9 100644
--- a/pxr/usd/usd/wrapProperty.cpp
+++ b/pxr/usd/usd/wrapProperty.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/property.h"
diff --git a/pxr/usd/usd/wrapReferences.cpp b/pxr/usd/usd/wrapReferences.cpp
index 433a131498..37df7c8619 100644
--- a/pxr/usd/usd/wrapReferences.cpp
+++ b/pxr/usd/usd/wrapReferences.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/references.h"
diff --git a/pxr/usd/usd/wrapRelationship.cpp b/pxr/usd/usd/wrapRelationship.cpp
index 4c5e3ae227..78302c069e 100644
--- a/pxr/usd/usd/wrapRelationship.cpp
+++ b/pxr/usd/usd/wrapRelationship.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/relationship.h"
diff --git a/pxr/usd/usd/wrapResolveInfo.cpp b/pxr/usd/usd/wrapResolveInfo.cpp
index 415c3dd7bf..bff9e4db4b 100644
--- a/pxr/usd/usd/wrapResolveInfo.cpp
+++ b/pxr/usd/usd/wrapResolveInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/resolveInfo.h"
diff --git a/pxr/usd/usd/wrapResolveTarget.cpp b/pxr/usd/usd/wrapResolveTarget.cpp
index 4e94e9d4d7..75aa92b0d8 100644
--- a/pxr/usd/usd/wrapResolveTarget.cpp
+++ b/pxr/usd/usd/wrapResolveTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/resolveTarget.h"
diff --git a/pxr/usd/usd/wrapSchemaBase.cpp b/pxr/usd/usd/wrapSchemaBase.cpp
index 19645ca1d9..713b36a74f 100644
--- a/pxr/usd/usd/wrapSchemaBase.cpp
+++ b/pxr/usd/usd/wrapSchemaBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/wrapSchemaRegistry.cpp b/pxr/usd/usd/wrapSchemaRegistry.cpp
index d8a5e01669..2444c0ab82 100644
--- a/pxr/usd/usd/wrapSchemaRegistry.cpp
+++ b/pxr/usd/usd/wrapSchemaRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usd/wrapSpecializes.cpp b/pxr/usd/usd/wrapSpecializes.cpp
index fe59e937e2..19450ef10f 100644
--- a/pxr/usd/usd/wrapSpecializes.cpp
+++ b/pxr/usd/usd/wrapSpecializes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/specializes.h"
diff --git a/pxr/usd/usd/wrapStage.cpp b/pxr/usd/usd/wrapStage.cpp
index 8ec54bdfa5..215746d3a8 100644
--- a/pxr/usd/usd/wrapStage.cpp
+++ b/pxr/usd/usd/wrapStage.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/attribute.h"
@@ -483,6 +466,8 @@ void wrapUsdStage()
         .def("GetPathResolverContext", &UsdStage::GetPathResolverContext)
         .def("ResolveIdentifierToEditTarget",
              &UsdStage::ResolveIdentifierToEditTarget, arg("identifier"))
+        .def("GetCompositionErrors", &UsdStage::GetCompositionErrors,
+             return_value_policy<TfPySequenceToList>())
         .def("GetLayerStack", &UsdStage::GetLayerStack,
              arg("includeSessionLayers")=true,
              return_value_policy<TfPySequenceToList>())
diff --git a/pxr/usd/usd/wrapStageCache.cpp b/pxr/usd/usd/wrapStageCache.cpp
index bae1a158d2..139278716c 100644
--- a/pxr/usd/usd/wrapStageCache.cpp
+++ b/pxr/usd/usd/wrapStageCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/stageCache.h"
diff --git a/pxr/usd/usd/wrapStageCacheContext.cpp b/pxr/usd/usd/wrapStageCacheContext.cpp
index 47ede49a3c..33f16c5c44 100644
--- a/pxr/usd/usd/wrapStageCacheContext.cpp
+++ b/pxr/usd/usd/wrapStageCacheContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/stageCacheContext.h"
diff --git a/pxr/usd/usd/wrapStageLoadRules.cpp b/pxr/usd/usd/wrapStageLoadRules.cpp
index a627b2c455..6fe5a2779b 100644
--- a/pxr/usd/usd/wrapStageLoadRules.cpp
+++ b/pxr/usd/usd/wrapStageLoadRules.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/wrapStagePopulationMask.cpp b/pxr/usd/usd/wrapStagePopulationMask.cpp
index b2765ad590..a75e903c68 100644
--- a/pxr/usd/usd/wrapStagePopulationMask.cpp
+++ b/pxr/usd/usd/wrapStagePopulationMask.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/wrapTimeCode.cpp b/pxr/usd/usd/wrapTimeCode.cpp
index 9332e05bea..4080655fc2 100644
--- a/pxr/usd/usd/wrapTimeCode.cpp
+++ b/pxr/usd/usd/wrapTimeCode.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/timeCode.h"
diff --git a/pxr/usd/usd/wrapTokens.cpp b/pxr/usd/usd/wrapTokens.cpp
index 53e4f12d74..e0c405f861 100644
--- a/pxr/usd/usd/wrapTokens.cpp
+++ b/pxr/usd/usd/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usd/wrapTyped.cpp b/pxr/usd/usd/wrapTyped.cpp
index 4e5f64cad5..b78a06cec7 100644
--- a/pxr/usd/usd/wrapTyped.cpp
+++ b/pxr/usd/usd/wrapTyped.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usd/typed.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usd/wrapUsdFileFormat.cpp b/pxr/usd/usd/wrapUsdFileFormat.cpp
index 1cb485aa71..affa0fe880 100644
--- a/pxr/usd/usd/wrapUsdFileFormat.cpp
+++ b/pxr/usd/usd/wrapUsdFileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usd/wrapUtils.cpp b/pxr/usd/usd/wrapUtils.cpp
index aad721a747..06175dc4c7 100644
--- a/pxr/usd/usd/wrapUtils.cpp
+++ b/pxr/usd/usd/wrapUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/wrapUtils.h"
diff --git a/pxr/usd/usd/wrapUtils.h b/pxr/usd/usd/wrapUtils.h
index e12200c887..b2bed0da53 100644
--- a/pxr/usd/usd/wrapUtils.h
+++ b/pxr/usd/usd/wrapUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_WRAP_UTILS_H
 #define PXR_USD_USD_WRAP_UTILS_H
diff --git a/pxr/usd/usd/wrapVariantSets.cpp b/pxr/usd/usd/wrapVariantSets.cpp
index 2567e88199..2125b5e40e 100644
--- a/pxr/usd/usd/wrapVariantSets.cpp
+++ b/pxr/usd/usd/wrapVariantSets.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/variantSets.h"
diff --git a/pxr/usd/usd/wrapVersion.cpp b/pxr/usd/usd/wrapVersion.cpp
index bdf207efdf..6393e6fd2c 100644
--- a/pxr/usd/usd/wrapVersion.cpp
+++ b/pxr/usd/usd/wrapVersion.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usd/wrapZipFile.cpp b/pxr/usd/usd/wrapZipFile.cpp
index 1ccf930b48..425aea43fa 100644
--- a/pxr/usd/usd/wrapZipFile.cpp
+++ b/pxr/usd/usd/wrapZipFile.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usd/zipFile.cpp b/pxr/usd/usd/zipFile.cpp
index 2edff69165..6f616cc9a9 100644
--- a/pxr/usd/usd/zipFile.cpp
+++ b/pxr/usd/usd/zipFile.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usd/zipFile.h"
diff --git a/pxr/usd/usd/zipFile.h b/pxr/usd/usd/zipFile.h
index 5e56ccd49b..4356be7ecb 100644
--- a/pxr/usd/usd/zipFile.h
+++ b/pxr/usd/usd/zipFile.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_ZIP_FILE_H
 #define PXR_USD_USD_ZIP_FILE_H
diff --git a/pxr/usd/usdGeom/__init__.py b/pxr/usd/usdGeom/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/usdGeom/__init__.py
+++ b/pxr/usd/usdGeom/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdGeom/api.h b/pxr/usd/usdGeom/api.h
index 7c13f813ee..c9f29e4e7f 100644
--- a/pxr/usd/usdGeom/api.h
+++ b/pxr/usd/usdGeom/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_API_H
 #define USDGEOM_API_H
diff --git a/pxr/usd/usdGeom/basisCurves.cpp b/pxr/usd/usdGeom/basisCurves.cpp
index a5f76c2250..01023132f5 100644
--- a/pxr/usd/usdGeom/basisCurves.cpp
+++ b/pxr/usd/usdGeom/basisCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/basisCurves.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -349,4 +332,94 @@ UsdGeomBasisCurves::ComputeVertexDataSize(
     return _ComputeVertexDataSize(curveVertexCounts);
 }
 
+VtIntArray
+UsdGeomBasisCurves::ComputeSegmentCounts(
+        const UsdTimeCode& timeCode) const
+{
+    VtIntArray curveVertexCounts;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
+    if (!GetCurveVertexCountsAttr().Get(&curveVertexCounts, timeCode)) {
+        TF_WARN("CurveVertexCounts could not be read from prim, " 
+            "cannot compute segment counts.");
+        return VtIntArray();
+    }
+
+    TfToken type;
+    if (!GetTypeAttr().Get(&type, timeCode)) {
+        TF_WARN("Curve type could not be read from prim, " 
+            "cannot compute segment counts.");
+        return VtIntArray();
+    }
+
+    TfToken wrap;
+    if (!GetWrapAttr().Get(&wrap, timeCode)) {
+        TF_WARN("Curve wrap could not be read from prim, " 
+            "cannot compute segment counts.");
+        return VtIntArray();
+    }
+
+    TfToken basis;
+    if (!GetBasisAttr().Get(&basis, timeCode)) {
+        TF_WARN("Curve basis could not be read from prim, " 
+            "cannot compute segment counts.");
+        return VtIntArray();
+    }
+
+    VtIntArray segmentCounts(curveVertexCounts.size());
+    bool isValid = false;
+
+    if (type == UsdGeomTokens->linear) {
+        if (wrap == UsdGeomTokens->periodic) {
+            // Linear and periodic
+            segmentCounts = curveVertexCounts;
+            isValid = true;
+        } else if (wrap == UsdGeomTokens->nonperiodic || 
+                wrap == UsdGeomTokens->pinned) {
+            // Linear and nonperiodic/pinned
+            std::transform(curveVertexCounts.cbegin(), curveVertexCounts.cend(), 
+                segmentCounts.begin(), [](int n) { return n - 1; });
+            isValid = true;
+        }
+    } else if (type == UsdGeomTokens->cubic) {
+        if (basis == UsdGeomTokens->bezier) {
+            constexpr int vstep = 3;
+            if (wrap == UsdGeomTokens->periodic) {
+                // Cubic, bezier, periodic
+                std::transform(curveVertexCounts.cbegin(), curveVertexCounts.cend(), 
+                    segmentCounts.begin(), [vstep](int n) { return n / vstep; });
+                isValid = true;
+            } else if (wrap == UsdGeomTokens->nonperiodic || 
+                    wrap == UsdGeomTokens->pinned) {
+                // Cubic, bezier, nonperiodic/pinned
+                std::transform(curveVertexCounts.cbegin(), curveVertexCounts.cend(), 
+                    segmentCounts.begin(), [vstep](int n) { return (n - 4) / vstep + 1; });
+                isValid = true;
+            }
+        } else if (basis == UsdGeomTokens->bspline ||
+                basis == UsdGeomTokens->catmullRom) {
+            if (wrap == UsdGeomTokens->periodic) {
+                // Cubic, bspline/catmullRom, periodic
+                segmentCounts = curveVertexCounts;
+                isValid = true;
+            } else if (wrap == UsdGeomTokens->nonperiodic) {
+                // Cubic, bspline/catmullRom, nonperiodic
+                std::transform(curveVertexCounts.cbegin(), curveVertexCounts.cend(), 
+                    segmentCounts.begin(), [](int n) { return n - 3; });
+                isValid = true;
+            } else if (wrap == UsdGeomTokens->pinned) {
+                // Cubic, bspline/catmullRom, pinned
+                std::transform(curveVertexCounts.cbegin(), curveVertexCounts.cend(), 
+                    segmentCounts.begin(), [](int n) { return n - 1; });
+                isValid = true;
+            }
+        }
+    }
+
+    if (!isValid) {
+        TF_WARN("Invalid type, wrap, or basis.");
+        return VtIntArray();
+    }
+
+    return segmentCounts;
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/usdGeom/basisCurves.h b/pxr/usd/usdGeom/basisCurves.h
index d9cc4dd6ca..14ffcea0db 100644
--- a/pxr/usd/usdGeom/basisCurves.h
+++ b/pxr/usd/usdGeom/basisCurves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_BASISCURVES_H
 #define USDGEOM_GENERATED_BASISCURVES_H
@@ -483,6 +466,11 @@ class UsdGeomBasisCurves : public UsdGeomCurves
     USDGEOM_API
     size_t ComputeVertexDataSize(const UsdTimeCode& timeCode) const;
 
+    /// Computes the segment counts of the curves based on their vertex counts
+    /// from the \c curveVertexCounts attribute.
+    USDGEOM_API
+    VtIntArray ComputeSegmentCounts(const UsdTimeCode& timeCode) const;
+
     /// \}
 };
 
diff --git a/pxr/usd/usdGeom/bboxCache.cpp b/pxr/usd/usdGeom/bboxCache.cpp
index 2e52ddaa4b..363e08e07f 100644
--- a/pxr/usd/usdGeom/bboxCache.cpp
+++ b/pxr/usd/usdGeom/bboxCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/bboxCache.h"
@@ -46,6 +29,7 @@
 
 #include <tbb/enumerable_thread_specific.h>
 #include <algorithm>
+#include <atomic>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -99,11 +83,11 @@ class UsdGeomBBoxCache::_BBoxTask {
     explicit operator bool() const {
         return _owner;
     }
-    void operator()() {
+    void operator()() const {
         // Do not save state here; all state should be accumulated externally.
-        _owner->_ResolvePrim(this, _primContext, _inverseComponentCtm);
+        _owner->_ResolvePrim(const_cast<_BBoxTask const *>(this), _primContext, _inverseComponentCtm);
     }
-    _ThreadXformCache* GetXformCaches() { return _xfCaches; }
+    _ThreadXformCache* GetXformCaches() const { return _xfCaches; }
 };
 
 // -------------------------------------------------------------------------- //
@@ -124,11 +108,24 @@ class UsdGeomBBoxCache::_PrototypeBBoxResolver
 
     struct _PrototypeTask
     {
-        _PrototypeTask() : numDependencies(0) { }
+        _PrototypeTask()
+            : numDependencies(0) { }
+
+        _PrototypeTask(const _PrototypeTask &other)
+            : dependentPrototypes(other.dependentPrototypes)
+        {
+            numDependencies.store(other.numDependencies.load());
+        }
+
+        _PrototypeTask(_PrototypeTask &&other)
+            : dependentPrototypes(std::move(other.dependentPrototypes))
+        {
+            numDependencies.store(other.numDependencies.load());
+        }
 
         // Number of dependencies -- prototype prims that must be resolved
         // before this prototype can be resolved.
-        tbb::atomic<size_t> numDependencies;
+        std::atomic<size_t> numDependencies;
 
         // List of prototype prims that depend on this prototype.
         std::vector<_PrimContext> dependentPrototypes;
@@ -220,7 +217,7 @@ class UsdGeomBBoxCache::_PrototypeBBoxResolver
             _PrototypeTask& dependentPrototypeData =
                 prototypeTasks->find(dependentPrototype)->second;
             if (dependentPrototypeData.numDependencies
-                .fetch_and_decrement() == 1){
+                .fetch_sub(1) == 1){
                 dispatcher->Run(
                     &_PrototypeBBoxResolver::_ExecuteTaskForPrototype,
                     this, dependentPrototype, prototypeTasks, xfCaches,
@@ -1169,7 +1166,7 @@ UsdGeomBBoxCache::_GetBBoxFromExtentsHint(
 }
 
 void
-UsdGeomBBoxCache::_ResolvePrim(_BBoxTask* task,
+UsdGeomBBoxCache::_ResolvePrim(const _BBoxTask* task,
                                const _PrimContext &primContext,
                                const GfMatrix4d &inverseComponentCtm)
 {
@@ -1525,4 +1522,3 @@ UsdGeomBBoxCache::_PrimContext::ToString() const {
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
-
diff --git a/pxr/usd/usdGeom/bboxCache.h b/pxr/usd/usdGeom/bboxCache.h
index 1fef245c8a..a3d0e7957f 100644
--- a/pxr/usd/usdGeom/bboxCache.h
+++ b/pxr/usd/usdGeom/bboxCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_BBOX_CACHE_H
 #define PXR_USD_USD_GEOM_BBOX_CACHE_H
@@ -470,7 +453,7 @@ class UsdGeomBBoxCache
     //
     // \p inverseComponentCtm is used to combine all the child bboxes in
     // component-relative space.
-    void _ResolvePrim(_BBoxTask* task,
+    void _ResolvePrim(const _BBoxTask* task,
                       const _PrimContext& prim,
                       const GfMatrix4d &inverseComponentCtm);
 
diff --git a/pxr/usd/usdGeom/boundable.cpp b/pxr/usd/usdGeom/boundable.cpp
index 7f029dd27d..f3ec8b085c 100644
--- a/pxr/usd/usdGeom/boundable.cpp
+++ b/pxr/usd/usdGeom/boundable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/boundable.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/boundable.h b/pxr/usd/usdGeom/boundable.h
index 3abbfe329b..74a07085c8 100644
--- a/pxr/usd/usdGeom/boundable.h
+++ b/pxr/usd/usdGeom/boundable.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_BOUNDABLE_H
 #define USDGEOM_GENERATED_BOUNDABLE_H
diff --git a/pxr/usd/usdGeom/boundableComputeExtent.cpp b/pxr/usd/usdGeom/boundableComputeExtent.cpp
index d30db5aac4..b6faddb864 100644
--- a/pxr/usd/usdGeom/boundableComputeExtent.cpp
+++ b/pxr/usd/usdGeom/boundableComputeExtent.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdGeom/boundableComputeExtent.h b/pxr/usd/usdGeom/boundableComputeExtent.h
index e0f6384b3e..4d80db5d0d 100644
--- a/pxr/usd/usdGeom/boundableComputeExtent.h
+++ b/pxr/usd/usdGeom/boundableComputeExtent.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_BOUNDABLE_COMPUTE_EXTENT_H
 #define PXR_USD_USD_GEOM_BOUNDABLE_COMPUTE_EXTENT_H
diff --git a/pxr/usd/usdGeom/camera.cpp b/pxr/usd/usdGeom/camera.cpp
index a5910e7cd0..643fafa25e 100644
--- a/pxr/usd/usdGeom/camera.cpp
+++ b/pxr/usd/usdGeom/camera.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/camera.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/camera.h b/pxr/usd/usdGeom/camera.h
index 4835663ad7..e718a10b89 100644
--- a/pxr/usd/usdGeom/camera.h
+++ b/pxr/usd/usdGeom/camera.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_CAMERA_H
 #define USDGEOM_GENERATED_CAMERA_H
diff --git a/pxr/usd/usdGeom/capsule.cpp b/pxr/usd/usdGeom/capsule.cpp
index 1b639af573..79c3a39591 100644
--- a/pxr/usd/usdGeom/capsule.cpp
+++ b/pxr/usd/usdGeom/capsule.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/capsule.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/capsule.h b/pxr/usd/usdGeom/capsule.h
index 12f93034d6..acd2b0a0ea 100644
--- a/pxr/usd/usdGeom/capsule.h
+++ b/pxr/usd/usdGeom/capsule.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_CAPSULE_H
 #define USDGEOM_GENERATED_CAPSULE_H
diff --git a/pxr/usd/usdGeom/capsule_1.cpp b/pxr/usd/usdGeom/capsule_1.cpp
index f649b879ba..2aeecce384 100644
--- a/pxr/usd/usdGeom/capsule_1.cpp
+++ b/pxr/usd/usdGeom/capsule_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/capsule_1.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/capsule_1.h b/pxr/usd/usdGeom/capsule_1.h
index cb9226d145..e8dca3379d 100644
--- a/pxr/usd/usdGeom/capsule_1.h
+++ b/pxr/usd/usdGeom/capsule_1.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_CAPSULE_1_H
 #define USDGEOM_GENERATED_CAPSULE_1_H
diff --git a/pxr/usd/usdGeom/cone.cpp b/pxr/usd/usdGeom/cone.cpp
index 75449c3d25..befa596899 100644
--- a/pxr/usd/usdGeom/cone.cpp
+++ b/pxr/usd/usdGeom/cone.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/cone.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/cone.h b/pxr/usd/usdGeom/cone.h
index bd7ebeacc2..967fe3fbdb 100644
--- a/pxr/usd/usdGeom/cone.h
+++ b/pxr/usd/usdGeom/cone.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_CONE_H
 #define USDGEOM_GENERATED_CONE_H
diff --git a/pxr/usd/usdGeom/constraintTarget.cpp b/pxr/usd/usdGeom/constraintTarget.cpp
index ad765bb39a..24388815a6 100644
--- a/pxr/usd/usdGeom/constraintTarget.cpp
+++ b/pxr/usd/usdGeom/constraintTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/constraintTarget.h"
diff --git a/pxr/usd/usdGeom/constraintTarget.h b/pxr/usd/usdGeom/constraintTarget.h
index e04487f7a5..df0f52cbbc 100644
--- a/pxr/usd/usdGeom/constraintTarget.h
+++ b/pxr/usd/usdGeom/constraintTarget.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_CONSTRAINT_TARGET_H
 #define PXR_USD_USD_GEOM_CONSTRAINT_TARGET_H
diff --git a/pxr/usd/usdGeom/cube.cpp b/pxr/usd/usdGeom/cube.cpp
index bb58e355b4..37ddf72ec8 100644
--- a/pxr/usd/usdGeom/cube.cpp
+++ b/pxr/usd/usdGeom/cube.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/cube.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/cube.h b/pxr/usd/usdGeom/cube.h
index c29f92b9e9..43abdd7b71 100644
--- a/pxr/usd/usdGeom/cube.h
+++ b/pxr/usd/usdGeom/cube.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_CUBE_H
 #define USDGEOM_GENERATED_CUBE_H
diff --git a/pxr/usd/usdGeom/curves.cpp b/pxr/usd/usdGeom/curves.cpp
index 03c615539b..0774a05b59 100644
--- a/pxr/usd/usdGeom/curves.cpp
+++ b/pxr/usd/usdGeom/curves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/curves.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/curves.h b/pxr/usd/usdGeom/curves.h
index 6be1687378..b10b15832b 100644
--- a/pxr/usd/usdGeom/curves.h
+++ b/pxr/usd/usdGeom/curves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_CURVES_H
 #define USDGEOM_GENERATED_CURVES_H
diff --git a/pxr/usd/usdGeom/cylinder.cpp b/pxr/usd/usdGeom/cylinder.cpp
index c0b7d6b3bf..104d29cf05 100644
--- a/pxr/usd/usdGeom/cylinder.cpp
+++ b/pxr/usd/usdGeom/cylinder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/cylinder.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/cylinder.h b/pxr/usd/usdGeom/cylinder.h
index 345925402a..245eae10ee 100644
--- a/pxr/usd/usdGeom/cylinder.h
+++ b/pxr/usd/usdGeom/cylinder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_CYLINDER_H
 #define USDGEOM_GENERATED_CYLINDER_H
diff --git a/pxr/usd/usdGeom/cylinder_1.cpp b/pxr/usd/usdGeom/cylinder_1.cpp
index 76364f3675..0626a2fc08 100644
--- a/pxr/usd/usdGeom/cylinder_1.cpp
+++ b/pxr/usd/usdGeom/cylinder_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/cylinder_1.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/cylinder_1.h b/pxr/usd/usdGeom/cylinder_1.h
index 41c5ce189b..4cca3a7dab 100644
--- a/pxr/usd/usdGeom/cylinder_1.h
+++ b/pxr/usd/usdGeom/cylinder_1.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_CYLINDER_1_H
 #define USDGEOM_GENERATED_CYLINDER_1_H
diff --git a/pxr/usd/usdGeom/debugCodes.cpp b/pxr/usd/usdGeom/debugCodes.cpp
index cd15c12ca1..baaeb8304d 100644
--- a/pxr/usd/usdGeom/debugCodes.cpp
+++ b/pxr/usd/usdGeom/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/debugCodes.h"
diff --git a/pxr/usd/usdGeom/debugCodes.h b/pxr/usd/usdGeom/debugCodes.h
index 9c44f5e343..c5680f394c 100644
--- a/pxr/usd/usdGeom/debugCodes.h
+++ b/pxr/usd/usdGeom/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_DEBUG_CODES_H
 #define PXR_USD_USD_GEOM_DEBUG_CODES_H
diff --git a/pxr/usd/usdGeom/examples_usdGeom.cpp b/pxr/usd/usdGeom/examples_usdGeom.cpp
index eecad94b55..40813cbb00 100644
--- a/pxr/usd/usdGeom/examples_usdGeom.cpp
+++ b/pxr/usd/usdGeom/examples_usdGeom.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/xformable.h"
diff --git a/pxr/usd/usdGeom/gprim.cpp b/pxr/usd/usdGeom/gprim.cpp
index 1a5f1ffc8e..2596fdb229 100644
--- a/pxr/usd/usdGeom/gprim.cpp
+++ b/pxr/usd/usdGeom/gprim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/gprim.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/gprim.h b/pxr/usd/usdGeom/gprim.h
index 866dc30323..f96eb06dad 100644
--- a/pxr/usd/usdGeom/gprim.h
+++ b/pxr/usd/usdGeom/gprim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_GPRIM_H
 #define USDGEOM_GENERATED_GPRIM_H
diff --git a/pxr/usd/usdGeom/hermiteCurves.cpp b/pxr/usd/usdGeom/hermiteCurves.cpp
index affc935686..26db525f18 100644
--- a/pxr/usd/usdGeom/hermiteCurves.cpp
+++ b/pxr/usd/usdGeom/hermiteCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/hermiteCurves.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/hermiteCurves.h b/pxr/usd/usdGeom/hermiteCurves.h
index a09ea502e8..466fbc6afd 100644
--- a/pxr/usd/usdGeom/hermiteCurves.h
+++ b/pxr/usd/usdGeom/hermiteCurves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_HERMITECURVES_H
 #define USDGEOM_GENERATED_HERMITECURVES_H
diff --git a/pxr/usd/usdGeom/imageable.cpp b/pxr/usd/usdGeom/imageable.cpp
index 05799ee6a9..a6fbd67171 100644
--- a/pxr/usd/usdGeom/imageable.cpp
+++ b/pxr/usd/usdGeom/imageable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/imageable.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/imageable.h b/pxr/usd/usdGeom/imageable.h
index a4f191c9b7..4ee9276f79 100644
--- a/pxr/usd/usdGeom/imageable.h
+++ b/pxr/usd/usdGeom/imageable.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_IMAGEABLE_H
 #define USDGEOM_GENERATED_IMAGEABLE_H
diff --git a/pxr/usd/usdGeom/mesh.cpp b/pxr/usd/usdGeom/mesh.cpp
index ea7f2a1d61..501f299429 100644
--- a/pxr/usd/usdGeom/mesh.cpp
+++ b/pxr/usd/usdGeom/mesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/mesh.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/mesh.h b/pxr/usd/usdGeom/mesh.h
index 2e108648e4..55bf3f27c4 100644
--- a/pxr/usd/usdGeom/mesh.h
+++ b/pxr/usd/usdGeom/mesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_MESH_H
 #define USDGEOM_GENERATED_MESH_H
diff --git a/pxr/usd/usdGeom/metrics.cpp b/pxr/usd/usdGeom/metrics.cpp
index 866a86ebae..2056a4c61f 100644
--- a/pxr/usd/usdGeom/metrics.cpp
+++ b/pxr/usd/usdGeom/metrics.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/metrics.h"
diff --git a/pxr/usd/usdGeom/metrics.h b/pxr/usd/usdGeom/metrics.h
index 6e86d63c16..fecceaced5 100644
--- a/pxr/usd/usdGeom/metrics.h
+++ b/pxr/usd/usdGeom/metrics.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_METRICS_H
 #define PXR_USD_USD_GEOM_METRICS_H
diff --git a/pxr/usd/usdGeom/modelAPI.cpp b/pxr/usd/usdGeom/modelAPI.cpp
index 22646cde2e..7266d41ed3 100644
--- a/pxr/usd/usdGeom/modelAPI.cpp
+++ b/pxr/usd/usdGeom/modelAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/modelAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/modelAPI.h b/pxr/usd/usdGeom/modelAPI.h
index cc0ae522a1..5321bc8671 100644
--- a/pxr/usd/usdGeom/modelAPI.h
+++ b/pxr/usd/usdGeom/modelAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_MODELAPI_H
 #define USDGEOM_GENERATED_MODELAPI_H
diff --git a/pxr/usd/usdGeom/module.cpp b/pxr/usd/usdGeom/module.cpp
index 97b766fdcd..360fff2909 100644
--- a/pxr/usd/usdGeom/module.cpp
+++ b/pxr/usd/usdGeom/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdGeom/moduleDeps.cpp b/pxr/usd/usdGeom/moduleDeps.cpp
index 331a574462..188cc440ab 100644
--- a/pxr/usd/usdGeom/moduleDeps.cpp
+++ b/pxr/usd/usdGeom/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdGeom/motionAPI.cpp b/pxr/usd/usdGeom/motionAPI.cpp
index 2758b1613e..72866226c6 100644
--- a/pxr/usd/usdGeom/motionAPI.cpp
+++ b/pxr/usd/usdGeom/motionAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/motionAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/motionAPI.h b/pxr/usd/usdGeom/motionAPI.h
index a82ac6c7cf..da4c9bb908 100644
--- a/pxr/usd/usdGeom/motionAPI.h
+++ b/pxr/usd/usdGeom/motionAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_MOTIONAPI_H
 #define USDGEOM_GENERATED_MOTIONAPI_H
diff --git a/pxr/usd/usdGeom/nurbsCurves.cpp b/pxr/usd/usdGeom/nurbsCurves.cpp
index 87a592be1d..dcd006f7b0 100644
--- a/pxr/usd/usdGeom/nurbsCurves.cpp
+++ b/pxr/usd/usdGeom/nurbsCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/nurbsCurves.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/nurbsCurves.h b/pxr/usd/usdGeom/nurbsCurves.h
index adac636e7e..e64fff7764 100644
--- a/pxr/usd/usdGeom/nurbsCurves.h
+++ b/pxr/usd/usdGeom/nurbsCurves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_NURBSCURVES_H
 #define USDGEOM_GENERATED_NURBSCURVES_H
diff --git a/pxr/usd/usdGeom/nurbsPatch.cpp b/pxr/usd/usdGeom/nurbsPatch.cpp
index a130e66488..c6e87e854b 100644
--- a/pxr/usd/usdGeom/nurbsPatch.cpp
+++ b/pxr/usd/usdGeom/nurbsPatch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/nurbsPatch.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/nurbsPatch.h b/pxr/usd/usdGeom/nurbsPatch.h
index 765a4becbd..de0c84fb55 100644
--- a/pxr/usd/usdGeom/nurbsPatch.h
+++ b/pxr/usd/usdGeom/nurbsPatch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_NURBSPATCH_H
 #define USDGEOM_GENERATED_NURBSPATCH_H
diff --git a/pxr/usd/usdGeom/pch.h b/pxr/usd/usdGeom/pch.h
index 824c5b0f93..731c1501c5 100644
--- a/pxr/usd/usdGeom/pch.h
+++ b/pxr/usd/usdGeom/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -70,6 +53,7 @@
 #include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -78,60 +62,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -151,6 +90,7 @@
 #include <boost/python/object_operators.hpp>
 #include <boost/python/operators.hpp>
 #include <boost/python/refcount.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/scope.hpp>
 #include <boost/python/stl_iterator.hpp>
 #include <boost/python/to_python_converter.hpp>
@@ -161,29 +101,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -196,6 +116,7 @@
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
 #include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdGeom/plane.cpp b/pxr/usd/usdGeom/plane.cpp
index bd5cfe898f..10f199ed91 100644
--- a/pxr/usd/usdGeom/plane.cpp
+++ b/pxr/usd/usdGeom/plane.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/plane.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/plane.h b/pxr/usd/usdGeom/plane.h
index dd3675c9f1..009ec463b7 100644
--- a/pxr/usd/usdGeom/plane.h
+++ b/pxr/usd/usdGeom/plane.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_PLANE_H
 #define USDGEOM_GENERATED_PLANE_H
diff --git a/pxr/usd/usdGeom/pointBased.cpp b/pxr/usd/usdGeom/pointBased.cpp
index 2b95c7d8e4..a45cb07435 100644
--- a/pxr/usd/usdGeom/pointBased.cpp
+++ b/pxr/usd/usdGeom/pointBased.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/pointBased.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/pointBased.h b/pxr/usd/usdGeom/pointBased.h
index 7dfee8d21f..9f1d1cb9d2 100644
--- a/pxr/usd/usdGeom/pointBased.h
+++ b/pxr/usd/usdGeom/pointBased.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_POINTBASED_H
 #define USDGEOM_GENERATED_POINTBASED_H
diff --git a/pxr/usd/usdGeom/pointInstancer.cpp b/pxr/usd/usdGeom/pointInstancer.cpp
index 36d4f1609a..c3b6ac4e57 100644
--- a/pxr/usd/usdGeom/pointInstancer.cpp
+++ b/pxr/usd/usdGeom/pointInstancer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/pointInstancer.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/pointInstancer.h b/pxr/usd/usdGeom/pointInstancer.h
index 04832946ef..2ce27043de 100644
--- a/pxr/usd/usdGeom/pointInstancer.h
+++ b/pxr/usd/usdGeom/pointInstancer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_POINTINSTANCER_H
 #define USDGEOM_GENERATED_POINTINSTANCER_H
diff --git a/pxr/usd/usdGeom/points.cpp b/pxr/usd/usdGeom/points.cpp
index ee4cb9dd82..1dc14690b9 100644
--- a/pxr/usd/usdGeom/points.cpp
+++ b/pxr/usd/usdGeom/points.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/points.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/points.h b/pxr/usd/usdGeom/points.h
index 3ea4bee144..8e4bd19765 100644
--- a/pxr/usd/usdGeom/points.h
+++ b/pxr/usd/usdGeom/points.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_POINTS_H
 #define USDGEOM_GENERATED_POINTS_H
diff --git a/pxr/usd/usdGeom/primvar.cpp b/pxr/usd/usdGeom/primvar.cpp
index 83151aa672..1c253f2ebd 100644
--- a/pxr/usd/usdGeom/primvar.cpp
+++ b/pxr/usd/usdGeom/primvar.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/primvar.h"
diff --git a/pxr/usd/usdGeom/primvar.h b/pxr/usd/usdGeom/primvar.h
index 87709e8e55..05a3c983b1 100644
--- a/pxr/usd/usdGeom/primvar.h
+++ b/pxr/usd/usdGeom/primvar.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_PRIMVAR_H
 #define PXR_USD_USD_GEOM_PRIMVAR_H
diff --git a/pxr/usd/usdGeom/primvarsAPI.cpp b/pxr/usd/usdGeom/primvarsAPI.cpp
index 8cdd5841c7..129477cb53 100644
--- a/pxr/usd/usdGeom/primvarsAPI.cpp
+++ b/pxr/usd/usdGeom/primvarsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/primvarsAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/primvarsAPI.h b/pxr/usd/usdGeom/primvarsAPI.h
index b64802d167..366f88d6e7 100644
--- a/pxr/usd/usdGeom/primvarsAPI.h
+++ b/pxr/usd/usdGeom/primvarsAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_PRIMVARSAPI_H
 #define USDGEOM_GENERATED_PRIMVARSAPI_H
diff --git a/pxr/usd/usdGeom/samplingUtils.cpp b/pxr/usd/usdGeom/samplingUtils.cpp
index 52c1590739..0ac5bb6e53 100644
--- a/pxr/usd/usdGeom/samplingUtils.cpp
+++ b/pxr/usd/usdGeom/samplingUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/samplingUtils.h"
 #include "pxr/usd/usdGeom/motionAPI.h"
diff --git a/pxr/usd/usdGeom/samplingUtils.h b/pxr/usd/usdGeom/samplingUtils.h
index cea6ea9a6d..0681cd5035 100644
--- a/pxr/usd/usdGeom/samplingUtils.h
+++ b/pxr/usd/usdGeom/samplingUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_SAMPLING_UTILS_H
 #define PXR_USD_USD_GEOM_SAMPLING_UTILS_H
diff --git a/pxr/usd/usdGeom/scope.cpp b/pxr/usd/usdGeom/scope.cpp
index e0823e6c8b..f81f130463 100644
--- a/pxr/usd/usdGeom/scope.cpp
+++ b/pxr/usd/usdGeom/scope.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/scope.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/scope.h b/pxr/usd/usdGeom/scope.h
index 0fadea64c8..9ed927c544 100644
--- a/pxr/usd/usdGeom/scope.h
+++ b/pxr/usd/usdGeom/scope.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_SCOPE_H
 #define USDGEOM_GENERATED_SCOPE_H
diff --git a/pxr/usd/usdGeom/sphere.cpp b/pxr/usd/usdGeom/sphere.cpp
index 6be168aa7c..6b77063260 100644
--- a/pxr/usd/usdGeom/sphere.cpp
+++ b/pxr/usd/usdGeom/sphere.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/sphere.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/sphere.h b/pxr/usd/usdGeom/sphere.h
index 46cb60e536..daf230595d 100644
--- a/pxr/usd/usdGeom/sphere.h
+++ b/pxr/usd/usdGeom/sphere.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_SPHERE_H
 #define USDGEOM_GENERATED_SPHERE_H
diff --git a/pxr/usd/usdGeom/subset.cpp b/pxr/usd/usdGeom/subset.cpp
index 08d6d79911..95c1921df9 100644
--- a/pxr/usd/usdGeom/subset.cpp
+++ b/pxr/usd/usdGeom/subset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/subset.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/subset.h b/pxr/usd/usdGeom/subset.h
index 0be9f08e52..76fd8b07c9 100644
--- a/pxr/usd/usdGeom/subset.h
+++ b/pxr/usd/usdGeom/subset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_SUBSET_H
 #define USDGEOM_GENERATED_SUBSET_H
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomBBoxCache.py b/pxr/usd/usdGeom/testenv/testUsdGeomBBoxCache.py
index d952dce422..fd68131a6c 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomBBoxCache.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomBBoxCache.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomBasisCurves.py b/pxr/usd/usdGeom/testenv/testUsdGeomBasisCurves.py
index 412a24918a..f11f675107 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomBasisCurves.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomBasisCurves.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Usd, UsdGeom
@@ -77,5 +60,23 @@ def test_ComputeCurveCount(self):
             self.assertEqual(invalid.ComputeCurveCount(
                 Usd.TimeCode.EarliestTime()), 0)
 
+    def test_ComputeSegmentCount(self):
+        stage = Usd.Stage.Open('basisCurves.usda')
+        data = [
+            (UsdGeom.BasisCurves.Get(stage, '/LinearNonperiodic'), [1, 2, 1, 4]),
+            (UsdGeom.BasisCurves.Get(stage, '/LinearPeriodic'), [3, 7]),
+            (UsdGeom.BasisCurves.Get(stage, '/CubicNonperiodicBezier'), [1, 2, 3, 1, 2]),
+            (UsdGeom.BasisCurves.Get(stage, '/CubicNonperiodicBspline'), [2, 1, 3, 4]),
+            (UsdGeom.BasisCurves.Get(stage, '/CubicPeriodicBezier'), [2, 3, 2]),
+            (UsdGeom.BasisCurves.Get(stage, '/CubicPeriodicBspline'), [6, 9, 6]),
+            (UsdGeom.BasisCurves.Get(stage, '/CubicPinnedCatmullRom'), [1, 2, 1, 4]),
+            (UsdGeom.BasisCurves.Get(stage, '/CubicPinnedBezier'), [1, 2, 3, 1, 2])
+        ]
+
+        for curve, curveSegmentCounts in data:
+            self.assertEqual(
+                curve.ComputeSegmentCounts(Usd.TimeCode.EarliestTime()), 
+                curveSegmentCounts)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomBasisCurves/basisCurves.usda b/pxr/usd/usdGeom/testenv/testUsdGeomBasisCurves/basisCurves.usda
index 210d0976c5..cb4d7e294c 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomBasisCurves/basisCurves.usda
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomBasisCurves/basisCurves.usda
@@ -41,3 +41,65 @@ def BasisCurves "TimeSampledAndDefaultVertexCounts"
         1: [4, 4, 4, 4, 4]
     }
 }
+
+def BasisCurves "LinearNonperiodic"
+{
+    uniform token type = "linear"
+    uniform token wrap = "nonperiodic"
+    int[] curveVertexCounts = [2, 3, 2, 5]
+}
+
+def BasisCurves "LinearPeriodic"
+{
+    uniform token type = "linear"
+    uniform token wrap = "periodic"
+    int[] curveVertexCounts = [3, 7]
+}
+
+def BasisCurves "CubicNonperiodicBezier"
+{
+    uniform token type = "cubic"
+    uniform token wrap = "nonperiodic"
+    uniform token basis = "bezier"
+    int[] curveVertexCounts = [4, 7, 10, 4, 7]
+}
+
+def BasisCurves "CubicNonperiodicBspline"
+{
+    uniform token type = "cubic"
+    uniform token wrap = "nonperiodic"
+    uniform token basis = "bspline"
+    int[] curveVertexCounts = [5, 4, 6, 7]
+}
+
+def BasisCurves "CubicPeriodicBezier"
+{
+    uniform token type = "cubic"
+    uniform token wrap = "periodic"
+    uniform token basis = "bezier"
+    int[] curveVertexCounts = [6, 9, 6]
+}
+
+def BasisCurves "CubicPeriodicBspline"
+{
+    uniform token type = "cubic"
+    uniform token wrap = "periodic"
+    uniform token basis = "bspline"
+    int[] curveVertexCounts = [6, 9, 6]
+}
+
+def BasisCurves "CubicPinnedCatmullRom"
+{
+    uniform token type = "cubic"
+    uniform token wrap = "pinned"
+    uniform token basis = "catmullRom"
+    int[] curveVertexCounts = [2, 3, 2, 5]
+}
+
+def BasisCurves "CubicPinnedBezier"
+{
+    uniform token type = "cubic"
+    uniform token wrap = "pinned"
+    uniform token basis = "bezier"
+    int[] curveVertexCounts = [4, 7, 10, 4, 7]
+}
\ No newline at end of file
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomCamera.py b/pxr/usd/usdGeom/testenv/testUsdGeomCamera.py
index 75a864ef26..dcebde5f47 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomCamera.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomCamera.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Gf, Usd, UsdGeom, Sdf, Tf
 import unittest, math
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomComputeAtTime.py b/pxr/usd/usdGeom/testenv/testUsdGeomComputeAtTime.py
index baf5731e60..c1d324e22b 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomComputeAtTime.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomComputeAtTime.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomConstraintTarget.py b/pxr/usd/usdGeom/testenv/testUsdGeomConstraintTarget.py
index bb9d18c0c6..3ab8e137f1 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomConstraintTarget.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomConstraintTarget.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Gf, Usd, UsdGeom, Sdf, Tf
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomConsts.py b/pxr/usd/usdGeom/testenv/testUsdGeomConsts.py
index 5324f780de..729a2b5eff 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomConsts.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomConsts.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Sdf, Usd, UsdGeom
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomCreateAttribute.cpp b/pxr/usd/usdGeom/testenv/testUsdGeomCreateAttribute.cpp
index b595ad838c..6b0b6cfe04 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomCreateAttribute.cpp
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomCreateAttribute.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomCurves.py b/pxr/usd/usdGeom/testenv/testUsdGeomCurves.py
index accd867d4c..1d5652dc42 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomCurves.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomCurves.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomExtentFromPlugins.py b/pxr/usd/usdGeom/testenv/testUsdGeomExtentFromPlugins.py
index 0402c40a9b..864093160d 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomExtentFromPlugins.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomExtentFromPlugins.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Gf, Vt, Usd, UsdGeom
 import unittest
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomExtentTransform.py b/pxr/usd/usdGeom/testenv/testUsdGeomExtentTransform.py
index cfc8d91466..9636049e61 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomExtentTransform.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomExtentTransform.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomHasAPI.cpp b/pxr/usd/usdGeom/testenv/testUsdGeomHasAPI.cpp
index 519028b528..495f7a35a5 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomHasAPI.cpp
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomHasAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomHermiteCurves.py b/pxr/usd/usdGeom/testenv/testUsdGeomHermiteCurves.py
index 3a4dc7ad65..8d8d03110e 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomHermiteCurves.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomHermiteCurves.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomImageable.py b/pxr/usd/usdGeom/testenv/testUsdGeomImageable.py
index 59ac05839d..70094d2c7b 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomImageable.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomImageable.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdGeom
 import unittest
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomIsA.cpp b/pxr/usd/usdGeom/testenv/testUsdGeomIsA.cpp
index 24cdaa59be..b1a401338b 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomIsA.cpp
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomIsA.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomMesh.py b/pxr/usd/usdGeom/testenv/testUsdGeomMesh.py
index 1f3516d42d..8a5fb7afd5 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomMesh.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomMesh.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdGeom, Vt
 import unittest
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomMetrics.py b/pxr/usd/usdGeom/testenv/testUsdGeomMetrics.py
index ccc95d25e0..dc6f175a0a 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomMetrics.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomMetrics.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Tf, Usd, UsdGeom
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomMotionAPI.py b/pxr/usd/usdGeom/testenv/testUsdGeomMotionAPI.py
index 085ce56624..0f027e5cba 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomMotionAPI.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomMotionAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Usd, UsdGeom, Sdf, Tf
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomNoPlugLoad.py b/pxr/usd/usdGeom/testenv/testUsdGeomNoPlugLoad.py
index a2f84f000c..d9d3197619 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomNoPlugLoad.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomNoPlugLoad.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # This test explicitly does *not* load usdGeom.  We're testing that core Usd
 # functionality will work using only information loaded from usdGeom's
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomPointInstancer.py b/pxr/usd/usdGeom/testenv/testUsdGeomPointInstancer.py
index d4fdc317d4..17050d17ff 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomPointInstancer.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomPointInstancer.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=range-builtin-not-iterating
 
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomPoints.py b/pxr/usd/usdGeom/testenv/testUsdGeomPoints.py
index 350f6f5659..3b29f61616 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomPoints.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomPoints.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Usd, UsdGeom
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomPrimvar.py b/pxr/usd/usdGeom/testenv/testUsdGeomPrimvar.py
index 8109f620f9..6a0996a7f1 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomPrimvar.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomPrimvar.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Gf, Usd, UsdGeom, Sdf, Tf, Vt
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomPurposeVisibility.py b/pxr/usd/usdGeom/testenv/testUsdGeomPurposeVisibility.py
index dce4d1c73d..096a253eb9 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomPurposeVisibility.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomPurposeVisibility.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomSchemata.py b/pxr/usd/usdGeom/testenv/testUsdGeomSchemata.py
index 7ee185402f..c707c54ccc 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomSchemata.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomSchemata.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=map-builtin-not-iterating
 
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomSubset.py b/pxr/usd/usdGeom/testenv/testUsdGeomSubset.py
index 8c2beab1ec..249eebe9f0 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomSubset.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomSubset.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # pylint: disable=range-builtin-not-iterating
 
@@ -30,7 +13,8 @@
 import unittest
 
 class testUsdGeomSubset(unittest.TestCase):
-    def _ValidateFamily(self, geom, elementType, familyName, expectedIsValid):
+    def _ValidateFamily(self, geom, elementType, familyName, 
+                        expectedIsValid, expectedReasons=""):
         (valid, reason) = UsdGeom.Subset.ValidateFamily(
             geom, elementType, familyName=familyName)
         if expectedIsValid:
@@ -42,6 +26,8 @@ def _ValidateFamily(self, geom, elementType, familyName, expectedIsValid):
                 (familyName, reason))
             self.assertFalse(valid)
             self.assertTrue(len(reason) > 0)
+            for expectedReason in expectedReasons:
+                self.assertTrue(expectedReason in reason)
 
     def _TestSubsetValidity(self, geom, varyingGeom, nullGeom, elementType):
         prefix = elementType + "_"
@@ -52,24 +38,50 @@ def _TestSubsetValidity(self, geom, varyingGeom, nullGeom, elementType):
         for familyName in validFamilies:
             self._ValidateFamily(geom, elementType, prefix+familyName, True)
 
-        invalidFamilies = ['invalidIndices', 'badPartition1', 'badPartition2',
-                           'badPartition3', 'invalidNonOverlapping',
-                           'invalidUnrestricted', 'onlyNegativeIndices',
-                           'emptyIndicesAtAllTimes']
-        for familyName in invalidFamilies:
-            self._ValidateFamily(geom, elementType, prefix+familyName, False)
+        if elementType == UsdGeom.Tokens.edge:
+            invalidFamilies = [ 
+                ('invalidIndices',  ["does not exist on the parent prim",
+                                     "Indices attribute has an odd number of elements",
+                                     "Found one or more indices that are less than 0"]), 
+                ('badPartition1',   ["does not match the element count",
+                                     "does not exist on the parent prim"]), 
+                ('badPartition2',   ["does not match the element count"]),
+                ('badPartition3',   ["Found duplicate edge"]), 
+                ('invalidNonOverlapping',   ["Found duplicate edge"]),
+                ('invalidUnrestricted',     ["does not exist on the parent prim",
+                                             "Found one or more indices that are less than 0"]), 
+                ('onlyNegativeIndices',     ["Found one or more indices that are less than 0",
+                                             "does not exist on the parent prim"]),
+                ('emptyIndicesAtAllTimes',  ["No indices in family at any time"])]
+        else:
+            invalidFamilies = [
+                ('invalidIndices',  ["Found one or more indices that are greater than the element count",
+                                     "Found one or more indices that are less than 0"]), 
+                ('badPartition1',   ["does not match the element count",
+                                     "Found one or more indices that are greater than the element count"]), 
+                ('badPartition2',   ["does not match the element count"]),
+                ('badPartition3',   ["Found duplicate index"]), 
+                ('invalidNonOverlapping',   ["Found duplicate index"]),
+                ('invalidUnrestricted',     ["Found one or more indices that are greater than the element count",
+                                             "Found one or more indices that are less than 0"]), 
+                ('onlyNegativeIndices',     ["Found one or more indices that are less than 0"]),
+                ('emptyIndicesAtAllTimes',  ["No indices in family at any time"])]
+
+        for familyName, reasons in invalidFamilies:
+            self._ValidateFamily(geom, elementType, prefix+familyName, False, reasons)
 
         validFamilies = ['validPartition']
         for familyName in validFamilies:
             self._ValidateFamily(varyingGeom, elementType, prefix+familyName, True)
 
-        invalidFamilies = ['invalidNoDefaultTimeElements']
-        for familyName in invalidFamilies:
-            self._ValidateFamily(varyingGeom, elementType, prefix+familyName, False)
+        invalidFamilies = [('invalidNoDefaultTimeElements', ["has no elements"])]
+        for familyName, reasons in invalidFamilies:
+            self._ValidateFamily(varyingGeom, elementType, prefix+familyName, False, reasons)
 
-        invalidFamilies = ['emptyIndicesAtAllTimes', 'invalidPartition']
-        for familyName in invalidFamilies:
-            self._ValidateFamily(nullGeom, elementType, prefix+familyName, False)
+        invalidFamilies = [('emptyIndicesAtAllTimes', ["No indices in family at any time"]), 
+                           ('invalidPartition', ["Unable to determine element count at earliest time"])]
+        for familyName, reasons in invalidFamilies:
+            self._ValidateFamily(nullGeom, elementType, prefix+familyName, False, reasons)
 
     def _TestSubsetRetrieval(self, geom, elementType, familyName):
         prefix = elementType + "_"
@@ -227,10 +239,9 @@ def test_CreateGeomSubset(self):
         self.assertEqual(UsdGeom.Subset.GetFamilyType(geom, 'testFamily'), 
                          UsdGeom.Tokens.partition)
 
-        (valid, reason) = UsdGeom.Subset.ValidateFamily(geom, 
-                UsdGeom.Tokens.face, 'testFamily')
-        self.assertFalse(valid)
-        
+        self._ValidateFamily(geom, 
+                UsdGeom.Tokens.face, 'testFamily', False, ["does not match the element count"])
+
         unassignedIndices = UsdGeom.Subset.GetUnassignedIndices(geom,
                                     UsdGeom.Tokens.face, 'testFamily')
         self.assertEqual(unassignedIndices, Vt.IntArray(range(3, 16)))
@@ -264,9 +275,7 @@ def test_CreateGeomSubset(self):
             familyType=UsdGeom.Tokens.partition)
         self.assertEqual(len(testSubsets), 2)
 
-        (valid, reason) = UsdGeom.Subset.ValidateFamily(geom,
-            UsdGeom.Tokens.face, familyName='testFamily')
-        self.assertTrue(valid)
+        self._ValidateFamily(geom, UsdGeom.Tokens.face, 'testFamily', True)
         
         # Check total count.
         allGeomSubsets = UsdGeom.Subset.GetAllGeomSubsets(
@@ -303,9 +312,8 @@ def test_PointInstancer(self):
         self.assertEqual(UsdGeom.Tokens.partition, 
             UsdGeom.Subset.GetFamilyType(geom, 'materialBind'))
 
-        (valid, reason) = UsdGeom.Subset.ValidateFamily(geom, 
-            UsdGeom.Tokens.face, familyName='materialBind')
-        self.assertTrue(valid)
+        self._ValidateFamily(geom, 
+            UsdGeom.Tokens.face, 'materialBind', True)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomTetMesh.py b/pxr/usd/usdGeom/testenv/testUsdGeomTetMesh.py
index 54a0e2e42f..b9b42e9a0b 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomTetMesh.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomTetMesh.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Usd, UsdGeom, Vt, Gf
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomTypeRegistry.py b/pxr/usd/usdGeom/testenv/testUsdGeomTypeRegistry.py
index 6d040ccd21..5a6f86d5ff 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomTypeRegistry.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomTypeRegistry.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys
 import unittest
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomXformCache.cpp b/pxr/usd/usdGeom/testenv/testUsdGeomXformCache.cpp
index 7df950d1a7..dfeee107bb 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomXformCache.cpp
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomXformCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomXformCommonAPI.py b/pxr/usd/usdGeom/testenv/testUsdGeomXformCommonAPI.py
index 59930885df..4f3f559e4c 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomXformCommonAPI.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomXformCommonAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Gf, Tf, Usd, UsdGeom, Vt
 import unittest, math
diff --git a/pxr/usd/usdGeom/testenv/testUsdGeomXformable.py b/pxr/usd/usdGeom/testenv/testUsdGeomXformable.py
index 6e5abfbaae..883beef043 100644
--- a/pxr/usd/usdGeom/testenv/testUsdGeomXformable.py
+++ b/pxr/usd/usdGeom/testenv/testUsdGeomXformable.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Gf, Tf, Sdf, Usd, UsdGeom, Vt
 import unittest, math
diff --git a/pxr/usd/usdGeom/tetMesh.cpp b/pxr/usd/usdGeom/tetMesh.cpp
index 0abe2d0e27..d2a3ed883f 100644
--- a/pxr/usd/usdGeom/tetMesh.cpp
+++ b/pxr/usd/usdGeom/tetMesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/tetMesh.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -227,10 +210,8 @@ struct _Vec3iCmp
     }
 };
 
-}
-
 VtVec3iArray
-UsdGeomTetMesh::ComputeSurfaceFaces(const VtVec4iArray &tetVertexIndices)
+_ComputeSurfaceFaces(const VtVec4iArray &tetVertexIndices)
 {
 
     // The surface faces are made of triangles that are not shared between
@@ -298,6 +279,7 @@ UsdGeomTetMesh::ComputeSurfaceFaces(const VtVec4iArray &tetVertexIndices)
     return result;
 }
 
+}
 
 bool UsdGeomTetMesh::ComputeSurfaceFaces(const UsdGeomTetMesh& tetMesh,
                                          VtVec3iArray* surfaceFaceIndices,
@@ -312,7 +294,7 @@ bool UsdGeomTetMesh::ComputeSurfaceFaces(const UsdGeomTetMesh& tetMesh,
     VtVec4iArray tetVertexIndices;
     tetVertexIndicesAttr.Get(&tetVertexIndices, timeCode);
     
-    *surfaceFaceIndices = ComputeSurfaceFaces(tetVertexIndices);
+    *surfaceFaceIndices = _ComputeSurfaceFaces(tetVertexIndices);
     return true;
 }
 
diff --git a/pxr/usd/usdGeom/tetMesh.h b/pxr/usd/usdGeom/tetMesh.h
index e6dc539fe1..fb00ff3c7d 100644
--- a/pxr/usd/usdGeom/tetMesh.h
+++ b/pxr/usd/usdGeom/tetMesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_TETMESH_H
 #define USDGEOM_GENERATED_TETMESH_H
@@ -253,10 +236,6 @@ class UsdGeomTetMesh : public UsdGeomPointBased
                                     VtVec3iArray* surfaceFaceIndices,
                                     const UsdTimeCode timeCode = UsdTimeCode::Default()); 
 
-    USDGEOM_API
-    static VtVec3iArray ComputeSurfaceFaces(
-        const VtVec4iArray &tetVertexIndices);
-
     /// FindInvertedElements is used to determine if the tetMesh has inverted 
     /// tetrahedral elements at the given time code. Inverted elements are 
     /// determined wrt. the "orientation" attribute of the UsdGeomTetMesh and
diff --git a/pxr/usd/usdGeom/tokens.cpp b/pxr/usd/usdGeom/tokens.cpp
index 343a05b2b6..7d09e44604 100644
--- a/pxr/usd/usdGeom/tokens.cpp
+++ b/pxr/usd/usdGeom/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/tokens.h"
 
diff --git a/pxr/usd/usdGeom/tokens.h b/pxr/usd/usdGeom/tokens.h
index 6f90a61dce..96e4d648de 100644
--- a/pxr/usd/usdGeom/tokens.h
+++ b/pxr/usd/usdGeom/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_TOKENS_H
 #define USDGEOM_TOKENS_H
diff --git a/pxr/usd/usdGeom/visibilityAPI.cpp b/pxr/usd/usdGeom/visibilityAPI.cpp
index 83516c4e4d..93c4859a0b 100644
--- a/pxr/usd/usdGeom/visibilityAPI.cpp
+++ b/pxr/usd/usdGeom/visibilityAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/visibilityAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/visibilityAPI.h b/pxr/usd/usdGeom/visibilityAPI.h
index b8a229286d..4602c10b48 100644
--- a/pxr/usd/usdGeom/visibilityAPI.h
+++ b/pxr/usd/usdGeom/visibilityAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_VISIBILITYAPI_H
 #define USDGEOM_GENERATED_VISIBILITYAPI_H
diff --git a/pxr/usd/usdGeom/wrapBBoxCache.cpp b/pxr/usd/usdGeom/wrapBBoxCache.cpp
index 28f3af4870..2df3d253ff 100644
--- a/pxr/usd/usdGeom/wrapBBoxCache.cpp
+++ b/pxr/usd/usdGeom/wrapBBoxCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/bboxCache.h"
diff --git a/pxr/usd/usdGeom/wrapBasisCurves.cpp b/pxr/usd/usdGeom/wrapBasisCurves.cpp
index 95a0b9b241..303e3f60e7 100644
--- a/pxr/usd/usdGeom/wrapBasisCurves.cpp
+++ b/pxr/usd/usdGeom/wrapBasisCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/basisCurves.h"
 #include "pxr/usd/usd/schemaBase.h"
@@ -180,6 +163,7 @@ WRAP_CUSTOM {
         .def("ComputeUniformDataSize", &This::ComputeUniformDataSize)
         .def("ComputeVaryingDataSize", &This::ComputeVaryingDataSize)
         .def("ComputeVertexDataSize", &This::ComputeVertexDataSize)
+        .def("ComputeSegmentCounts", &This::ComputeSegmentCounts)
     ;
 }
 
diff --git a/pxr/usd/usdGeom/wrapBoundable.cpp b/pxr/usd/usdGeom/wrapBoundable.cpp
index f5144052b9..da8a12c7ba 100644
--- a/pxr/usd/usdGeom/wrapBoundable.cpp
+++ b/pxr/usd/usdGeom/wrapBoundable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/boundable.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapCamera.cpp b/pxr/usd/usdGeom/wrapCamera.cpp
index 95b66635bf..1c9b7d5982 100644
--- a/pxr/usd/usdGeom/wrapCamera.cpp
+++ b/pxr/usd/usdGeom/wrapCamera.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/camera.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapCapsule.cpp b/pxr/usd/usdGeom/wrapCapsule.cpp
index 826813fe38..7152878eb3 100644
--- a/pxr/usd/usdGeom/wrapCapsule.cpp
+++ b/pxr/usd/usdGeom/wrapCapsule.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/capsule.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapCapsule_1.cpp b/pxr/usd/usdGeom/wrapCapsule_1.cpp
index fb6b9bcc15..1f55bf0468 100644
--- a/pxr/usd/usdGeom/wrapCapsule_1.cpp
+++ b/pxr/usd/usdGeom/wrapCapsule_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/capsule_1.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapCone.cpp b/pxr/usd/usdGeom/wrapCone.cpp
index a87259e499..76ef3d4611 100644
--- a/pxr/usd/usdGeom/wrapCone.cpp
+++ b/pxr/usd/usdGeom/wrapCone.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/cone.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapConstraintTarget.cpp b/pxr/usd/usdGeom/wrapConstraintTarget.cpp
index 358f25921a..3d201bcc1f 100644
--- a/pxr/usd/usdGeom/wrapConstraintTarget.cpp
+++ b/pxr/usd/usdGeom/wrapConstraintTarget.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/constraintTarget.h"
diff --git a/pxr/usd/usdGeom/wrapCube.cpp b/pxr/usd/usdGeom/wrapCube.cpp
index ab2bd1ca42..1378eb323c 100644
--- a/pxr/usd/usdGeom/wrapCube.cpp
+++ b/pxr/usd/usdGeom/wrapCube.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/cube.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapCurves.cpp b/pxr/usd/usdGeom/wrapCurves.cpp
index 2ae1a884ed..b5f8ffe2bb 100644
--- a/pxr/usd/usdGeom/wrapCurves.cpp
+++ b/pxr/usd/usdGeom/wrapCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/curves.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapCylinder.cpp b/pxr/usd/usdGeom/wrapCylinder.cpp
index 63744d0f07..51b34bb18e 100644
--- a/pxr/usd/usdGeom/wrapCylinder.cpp
+++ b/pxr/usd/usdGeom/wrapCylinder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/cylinder.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapCylinder_1.cpp b/pxr/usd/usdGeom/wrapCylinder_1.cpp
index 893d275269..7eb648c416 100644
--- a/pxr/usd/usdGeom/wrapCylinder_1.cpp
+++ b/pxr/usd/usdGeom/wrapCylinder_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/cylinder_1.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapGprim.cpp b/pxr/usd/usdGeom/wrapGprim.cpp
index 98ff9f3f1c..1025747a01 100644
--- a/pxr/usd/usdGeom/wrapGprim.cpp
+++ b/pxr/usd/usdGeom/wrapGprim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/gprim.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapHermiteCurves.cpp b/pxr/usd/usdGeom/wrapHermiteCurves.cpp
index 8334dbaed0..524ca6a66b 100644
--- a/pxr/usd/usdGeom/wrapHermiteCurves.cpp
+++ b/pxr/usd/usdGeom/wrapHermiteCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/hermiteCurves.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapImageable.cpp b/pxr/usd/usdGeom/wrapImageable.cpp
index 2d6d42216a..4ffbee51ee 100644
--- a/pxr/usd/usdGeom/wrapImageable.cpp
+++ b/pxr/usd/usdGeom/wrapImageable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/imageable.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapMesh.cpp b/pxr/usd/usdGeom/wrapMesh.cpp
index f6e8054c62..465575202f 100644
--- a/pxr/usd/usdGeom/wrapMesh.cpp
+++ b/pxr/usd/usdGeom/wrapMesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/mesh.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapMetrics.cpp b/pxr/usd/usdGeom/wrapMetrics.cpp
index dd94092df1..81f68fe34f 100644
--- a/pxr/usd/usdGeom/wrapMetrics.cpp
+++ b/pxr/usd/usdGeom/wrapMetrics.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/metrics.h"
diff --git a/pxr/usd/usdGeom/wrapModelAPI.cpp b/pxr/usd/usdGeom/wrapModelAPI.cpp
index 0773afb905..06472aac8d 100644
--- a/pxr/usd/usdGeom/wrapModelAPI.cpp
+++ b/pxr/usd/usdGeom/wrapModelAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/modelAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapMotionAPI.cpp b/pxr/usd/usdGeom/wrapMotionAPI.cpp
index ce7c213c3d..99d0c4f34b 100644
--- a/pxr/usd/usdGeom/wrapMotionAPI.cpp
+++ b/pxr/usd/usdGeom/wrapMotionAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/motionAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapNurbsCurves.cpp b/pxr/usd/usdGeom/wrapNurbsCurves.cpp
index fb174b53ce..567ae08e96 100644
--- a/pxr/usd/usdGeom/wrapNurbsCurves.cpp
+++ b/pxr/usd/usdGeom/wrapNurbsCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/nurbsCurves.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapNurbsPatch.cpp b/pxr/usd/usdGeom/wrapNurbsPatch.cpp
index 2a323c9ac3..08bc06f192 100644
--- a/pxr/usd/usdGeom/wrapNurbsPatch.cpp
+++ b/pxr/usd/usdGeom/wrapNurbsPatch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/nurbsPatch.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapPlane.cpp b/pxr/usd/usdGeom/wrapPlane.cpp
index 80c0974e98..651c94bd67 100644
--- a/pxr/usd/usdGeom/wrapPlane.cpp
+++ b/pxr/usd/usdGeom/wrapPlane.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/plane.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapPointBased.cpp b/pxr/usd/usdGeom/wrapPointBased.cpp
index 8c8c9f83ef..04d3fe9fcf 100644
--- a/pxr/usd/usdGeom/wrapPointBased.cpp
+++ b/pxr/usd/usdGeom/wrapPointBased.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/pointBased.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapPointInstancer.cpp b/pxr/usd/usdGeom/wrapPointInstancer.cpp
index 55b434729a..876d9431b3 100644
--- a/pxr/usd/usdGeom/wrapPointInstancer.cpp
+++ b/pxr/usd/usdGeom/wrapPointInstancer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/pointInstancer.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapPoints.cpp b/pxr/usd/usdGeom/wrapPoints.cpp
index 522b334a3a..788847208c 100644
--- a/pxr/usd/usdGeom/wrapPoints.cpp
+++ b/pxr/usd/usdGeom/wrapPoints.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/points.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapPrimvar.cpp b/pxr/usd/usdGeom/wrapPrimvar.cpp
index d3f9720d8f..2680a12f0f 100644
--- a/pxr/usd/usdGeom/wrapPrimvar.cpp
+++ b/pxr/usd/usdGeom/wrapPrimvar.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/primvar.h"
diff --git a/pxr/usd/usdGeom/wrapPrimvarsAPI.cpp b/pxr/usd/usdGeom/wrapPrimvarsAPI.cpp
index be23fd64f7..9ce1349c02 100644
--- a/pxr/usd/usdGeom/wrapPrimvarsAPI.cpp
+++ b/pxr/usd/usdGeom/wrapPrimvarsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/primvarsAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapScope.cpp b/pxr/usd/usdGeom/wrapScope.cpp
index 1e27cf79dc..8c4eb464dc 100644
--- a/pxr/usd/usdGeom/wrapScope.cpp
+++ b/pxr/usd/usdGeom/wrapScope.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/scope.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapSphere.cpp b/pxr/usd/usdGeom/wrapSphere.cpp
index efa1209959..81402266fb 100644
--- a/pxr/usd/usdGeom/wrapSphere.cpp
+++ b/pxr/usd/usdGeom/wrapSphere.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/sphere.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapSubset.cpp b/pxr/usd/usdGeom/wrapSubset.cpp
index eee5a60a1d..e1bba6300f 100644
--- a/pxr/usd/usdGeom/wrapSubset.cpp
+++ b/pxr/usd/usdGeom/wrapSubset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/subset.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapTetMesh.cpp b/pxr/usd/usdGeom/wrapTetMesh.cpp
index 07ddae6cf8..3dbd684726 100644
--- a/pxr/usd/usdGeom/wrapTetMesh.cpp
+++ b/pxr/usd/usdGeom/wrapTetMesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/tetMesh.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapTokens.cpp b/pxr/usd/usdGeom/wrapTokens.cpp
index b07f9a429b..e2fec5b804 100644
--- a/pxr/usd/usdGeom/wrapTokens.cpp
+++ b/pxr/usd/usdGeom/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdGeom/wrapVisibilityAPI.cpp b/pxr/usd/usdGeom/wrapVisibilityAPI.cpp
index 4b68644195..a9ae3d9d48 100644
--- a/pxr/usd/usdGeom/wrapVisibilityAPI.cpp
+++ b/pxr/usd/usdGeom/wrapVisibilityAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/visibilityAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapXform.cpp b/pxr/usd/usdGeom/wrapXform.cpp
index fa1699b9f1..d211f94dc5 100644
--- a/pxr/usd/usdGeom/wrapXform.cpp
+++ b/pxr/usd/usdGeom/wrapXform.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/xform.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapXformCache.cpp b/pxr/usd/usdGeom/wrapXformCache.cpp
index 43a494cc87..30cca55f7c 100644
--- a/pxr/usd/usdGeom/wrapXformCache.cpp
+++ b/pxr/usd/usdGeom/wrapXformCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/xformCache.h"
diff --git a/pxr/usd/usdGeom/wrapXformCommonAPI.cpp b/pxr/usd/usdGeom/wrapXformCommonAPI.cpp
index 7be5e3c9d6..8bc00facf5 100644
--- a/pxr/usd/usdGeom/wrapXformCommonAPI.cpp
+++ b/pxr/usd/usdGeom/wrapXformCommonAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/xformCommonAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/wrapXformOp.cpp b/pxr/usd/usdGeom/wrapXformOp.cpp
index cc260e8f8d..bdfc6b97d2 100644
--- a/pxr/usd/usdGeom/wrapXformOp.cpp
+++ b/pxr/usd/usdGeom/wrapXformOp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/xformOp.h"
diff --git a/pxr/usd/usdGeom/wrapXformable.cpp b/pxr/usd/usdGeom/wrapXformable.cpp
index 374c3022a3..fc82508785 100644
--- a/pxr/usd/usdGeom/wrapXformable.cpp
+++ b/pxr/usd/usdGeom/wrapXformable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/xformable.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdGeom/xform.cpp b/pxr/usd/usdGeom/xform.cpp
index c5afd04a18..a90162ed43 100644
--- a/pxr/usd/usdGeom/xform.cpp
+++ b/pxr/usd/usdGeom/xform.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/xform.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/xform.h b/pxr/usd/usdGeom/xform.h
index 26f784ff53..c4269de806 100644
--- a/pxr/usd/usdGeom/xform.h
+++ b/pxr/usd/usdGeom/xform.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_XFORM_H
 #define USDGEOM_GENERATED_XFORM_H
diff --git a/pxr/usd/usdGeom/xformCache.cpp b/pxr/usd/usdGeom/xformCache.cpp
index fa907dacf5..84e116263b 100644
--- a/pxr/usd/usdGeom/xformCache.cpp
+++ b/pxr/usd/usdGeom/xformCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/xformCache.h"
diff --git a/pxr/usd/usdGeom/xformCache.h b/pxr/usd/usdGeom/xformCache.h
index 4520bf018e..a14ff2e1ed 100644
--- a/pxr/usd/usdGeom/xformCache.h
+++ b/pxr/usd/usdGeom/xformCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_XFORM_CACHE_H
 #define PXR_USD_USD_GEOM_XFORM_CACHE_H
diff --git a/pxr/usd/usdGeom/xformCommonAPI.cpp b/pxr/usd/usdGeom/xformCommonAPI.cpp
index 006b7571ca..52fccd4eb8 100644
--- a/pxr/usd/usdGeom/xformCommonAPI.cpp
+++ b/pxr/usd/usdGeom/xformCommonAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/xformCommonAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/xformCommonAPI.h b/pxr/usd/usdGeom/xformCommonAPI.h
index eae2a1ffb1..d00d81b26f 100644
--- a/pxr/usd/usdGeom/xformCommonAPI.h
+++ b/pxr/usd/usdGeom/xformCommonAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_XFORMCOMMONAPI_H
 #define USDGEOM_GENERATED_XFORMCOMMONAPI_H
diff --git a/pxr/usd/usdGeom/xformOp.cpp b/pxr/usd/usdGeom/xformOp.cpp
index 1a459a4583..b7b3958432 100644
--- a/pxr/usd/usdGeom/xformOp.cpp
+++ b/pxr/usd/usdGeom/xformOp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdGeom/xformOp.h"
diff --git a/pxr/usd/usdGeom/xformOp.h b/pxr/usd/usdGeom/xformOp.h
index 73de4f4740..6a31f39376 100644
--- a/pxr/usd/usdGeom/xformOp.h
+++ b/pxr/usd/usdGeom/xformOp.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_GEOM_XFORM_OP_H
 #define PXR_USD_USD_GEOM_XFORM_OP_H
diff --git a/pxr/usd/usdGeom/xformable.cpp b/pxr/usd/usdGeom/xformable.cpp
index 3405d25473..4b04e5bda0 100644
--- a/pxr/usd/usdGeom/xformable.cpp
+++ b/pxr/usd/usdGeom/xformable.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdGeom/xformable.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdGeom/xformable.h b/pxr/usd/usdGeom/xformable.h
index 5fc188d1cb..b558aadfd6 100644
--- a/pxr/usd/usdGeom/xformable.h
+++ b/pxr/usd/usdGeom/xformable.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDGEOM_GENERATED_XFORMABLE_H
 #define USDGEOM_GENERATED_XFORMABLE_H
diff --git a/pxr/usd/usdHydra/__init__.py b/pxr/usd/usdHydra/__init__.py
index 71d85c6b0e..1fadb021f2 100644
--- a/pxr/usd/usdHydra/__init__.py
+++ b/pxr/usd/usdHydra/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdHydra/api.h b/pxr/usd/usdHydra/api.h
index de5eb2ce12..d13d5703d0 100644
--- a/pxr/usd/usdHydra/api.h
+++ b/pxr/usd/usdHydra/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDHYDRA_API_H
 #define USDHYDRA_API_H
diff --git a/pxr/usd/usdHydra/discoveryPlugin.cpp b/pxr/usd/usdHydra/discoveryPlugin.cpp
index bb412bddcf..a75e801211 100644
--- a/pxr/usd/usdHydra/discoveryPlugin.cpp
+++ b/pxr/usd/usdHydra/discoveryPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdHydra/discoveryPlugin.h"
 
diff --git a/pxr/usd/usdHydra/discoveryPlugin.h b/pxr/usd/usdHydra/discoveryPlugin.h
index fba93db42b..e4bdd64faa 100644
--- a/pxr/usd/usdHydra/discoveryPlugin.h
+++ b/pxr/usd/usdHydra/discoveryPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_HYDRA_DISCOVERY_PLUGIN_H
 #define PXR_USD_USD_HYDRA_DISCOVERY_PLUGIN_H
diff --git a/pxr/usd/usdHydra/generativeProceduralAPI.cpp b/pxr/usd/usdHydra/generativeProceduralAPI.cpp
index 5c68d11141..36026e319a 100644
--- a/pxr/usd/usdHydra/generativeProceduralAPI.cpp
+++ b/pxr/usd/usdHydra/generativeProceduralAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdHydra/generativeProceduralAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdHydra/generativeProceduralAPI.h b/pxr/usd/usdHydra/generativeProceduralAPI.h
index 773470fff0..f361e402d8 100644
--- a/pxr/usd/usdHydra/generativeProceduralAPI.h
+++ b/pxr/usd/usdHydra/generativeProceduralAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDHYDRA_GENERATED_GENERATIVEPROCEDURALAPI_H
 #define USDHYDRA_GENERATED_GENERATIVEPROCEDURALAPI_H
diff --git a/pxr/usd/usdHydra/module.cpp b/pxr/usd/usdHydra/module.cpp
index 44ee939bbf..6172103b41 100644
--- a/pxr/usd/usdHydra/module.cpp
+++ b/pxr/usd/usdHydra/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdHydra/moduleDeps.cpp b/pxr/usd/usdHydra/moduleDeps.cpp
index 8028308654..a605f0e099 100644
--- a/pxr/usd/usdHydra/moduleDeps.cpp
+++ b/pxr/usd/usdHydra/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdHydra/pch.h b/pxr/usd/usdHydra/pch.h
index 5ba9df4c20..e62a1c609e 100644
--- a/pxr/usd/usdHydra/pch.h
+++ b/pxr/usd/usdHydra/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cinttypes>
@@ -68,6 +51,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -76,6 +61,7 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -83,87 +69,31 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/python.hpp>
 #include <boost/python/class.hpp>
+#include <boost/python/def_visitor.hpp>
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
 #include <boost/python/handle.hpp>
+#include <boost/python/list.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
+#include <boost/python/operators.hpp>
+#include <boost/python/return_by_value.hpp>
+#include <boost/python/to_python_converter.hpp>
+#include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
 #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
 #undef tolower
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -171,7 +101,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdHydra/shaders/empty.glslfx b/pxr/usd/usdHydra/shaders/empty.glslfx
index ffe586e9c1..cc20f4fd1a 100644
--- a/pxr/usd/usdHydra/shaders/empty.glslfx
+++ b/pxr/usd/usdHydra/shaders/empty.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usd/usdHydra/tokens.cpp b/pxr/usd/usdHydra/tokens.cpp
index 80fa1a10ed..6f256a33e6 100644
--- a/pxr/usd/usdHydra/tokens.cpp
+++ b/pxr/usd/usdHydra/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdHydra/tokens.h"
 
diff --git a/pxr/usd/usdHydra/tokens.h b/pxr/usd/usdHydra/tokens.h
index 4b465a7f72..97204f1e01 100644
--- a/pxr/usd/usdHydra/tokens.h
+++ b/pxr/usd/usdHydra/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDHYDRA_TOKENS_H
 #define USDHYDRA_TOKENS_H
diff --git a/pxr/usd/usdHydra/wrapGenerativeProceduralAPI.cpp b/pxr/usd/usdHydra/wrapGenerativeProceduralAPI.cpp
index a9a13ff2bf..c31d9c5524 100644
--- a/pxr/usd/usdHydra/wrapGenerativeProceduralAPI.cpp
+++ b/pxr/usd/usdHydra/wrapGenerativeProceduralAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdHydra/generativeProceduralAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdHydra/wrapTokens.cpp b/pxr/usd/usdHydra/wrapTokens.cpp
index 8d4f629cbb..c8f7fa2e4a 100644
--- a/pxr/usd/usdHydra/wrapTokens.cpp
+++ b/pxr/usd/usdHydra/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdLux/__init__.py b/pxr/usd/usdLux/__init__.py
index 71d85c6b0e..1fadb021f2 100644
--- a/pxr/usd/usdLux/__init__.py
+++ b/pxr/usd/usdLux/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdLux/api.h b/pxr/usd/usdLux/api.h
index 0d91698feb..028511e770 100644
--- a/pxr/usd/usdLux/api.h
+++ b/pxr/usd/usdLux/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_API_H
 #define USDLUX_API_H
diff --git a/pxr/usd/usdLux/blackbody.cpp b/pxr/usd/usdLux/blackbody.cpp
index 05cf21ceb7..3b1b0bd04f 100644
--- a/pxr/usd/usdLux/blackbody.cpp
+++ b/pxr/usd/usdLux/blackbody.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/blackbody.h"
 #include "pxr/base/gf/math.h"
diff --git a/pxr/usd/usdLux/blackbody.h b/pxr/usd/usdLux/blackbody.h
index 2c7aa177c8..34e14f8596 100644
--- a/pxr/usd/usdLux/blackbody.h
+++ b/pxr/usd/usdLux/blackbody.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_LUX_BLACKBODY_H
 #define PXR_USD_USD_LUX_BLACKBODY_H
diff --git a/pxr/usd/usdLux/boundableLightBase.cpp b/pxr/usd/usdLux/boundableLightBase.cpp
index 9b5b0af0ad..f1ba90cdb9 100644
--- a/pxr/usd/usdLux/boundableLightBase.cpp
+++ b/pxr/usd/usdLux/boundableLightBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/boundableLightBase.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/boundableLightBase.h b/pxr/usd/usdLux/boundableLightBase.h
index 9177de300e..f48f2d11f5 100644
--- a/pxr/usd/usdLux/boundableLightBase.h
+++ b/pxr/usd/usdLux/boundableLightBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_BOUNDABLELIGHTBASE_H
 #define USDLUX_GENERATED_BOUNDABLELIGHTBASE_H
diff --git a/pxr/usd/usdLux/cylinderLight.cpp b/pxr/usd/usdLux/cylinderLight.cpp
index ef4fbfd003..9de2f0d388 100644
--- a/pxr/usd/usdLux/cylinderLight.cpp
+++ b/pxr/usd/usdLux/cylinderLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/cylinderLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/cylinderLight.h b/pxr/usd/usdLux/cylinderLight.h
index 5590cefb6e..5c257f4655 100644
--- a/pxr/usd/usdLux/cylinderLight.h
+++ b/pxr/usd/usdLux/cylinderLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_CYLINDERLIGHT_H
 #define USDLUX_GENERATED_CYLINDERLIGHT_H
diff --git a/pxr/usd/usdLux/discoveryPlugin.cpp b/pxr/usd/usdLux/discoveryPlugin.cpp
index a1a5c5d7ba..2374c0e6a6 100644
--- a/pxr/usd/usdLux/discoveryPlugin.cpp
+++ b/pxr/usd/usdLux/discoveryPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/discoveryPlugin.h"
 
diff --git a/pxr/usd/usdLux/discoveryPlugin.h b/pxr/usd/usdLux/discoveryPlugin.h
index 114ae13bfc..4b186dd4df 100644
--- a/pxr/usd/usdLux/discoveryPlugin.h
+++ b/pxr/usd/usdLux/discoveryPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USDLUX_DISCOVERY_PLUGIN_H
 #define PXR_USD_USDLUX_DISCOVERY_PLUGIN_H
diff --git a/pxr/usd/usdLux/diskLight.cpp b/pxr/usd/usdLux/diskLight.cpp
index 3a5eb0afbe..79ba9b0dec 100644
--- a/pxr/usd/usdLux/diskLight.cpp
+++ b/pxr/usd/usdLux/diskLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/diskLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/diskLight.h b/pxr/usd/usdLux/diskLight.h
index 30569d4eb0..5c9faa0177 100644
--- a/pxr/usd/usdLux/diskLight.h
+++ b/pxr/usd/usdLux/diskLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_DISKLIGHT_H
 #define USDLUX_GENERATED_DISKLIGHT_H
diff --git a/pxr/usd/usdLux/distantLight.cpp b/pxr/usd/usdLux/distantLight.cpp
index 1a4f544148..65fdb73979 100644
--- a/pxr/usd/usdLux/distantLight.cpp
+++ b/pxr/usd/usdLux/distantLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/distantLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/distantLight.h b/pxr/usd/usdLux/distantLight.h
index 8d04b68af9..d89d005cca 100644
--- a/pxr/usd/usdLux/distantLight.h
+++ b/pxr/usd/usdLux/distantLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_DISTANTLIGHT_H
 #define USDLUX_GENERATED_DISTANTLIGHT_H
diff --git a/pxr/usd/usdLux/domeLight.cpp b/pxr/usd/usdLux/domeLight.cpp
index 8de0328d22..9b7a23a85a 100644
--- a/pxr/usd/usdLux/domeLight.cpp
+++ b/pxr/usd/usdLux/domeLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/domeLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/domeLight.h b/pxr/usd/usdLux/domeLight.h
index 39215025cb..39bd7e10ca 100644
--- a/pxr/usd/usdLux/domeLight.h
+++ b/pxr/usd/usdLux/domeLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_DOMELIGHT_H
 #define USDLUX_GENERATED_DOMELIGHT_H
diff --git a/pxr/usd/usdLux/domeLight_1.cpp b/pxr/usd/usdLux/domeLight_1.cpp
index 89cccf36d3..b543a7eb97 100644
--- a/pxr/usd/usdLux/domeLight_1.cpp
+++ b/pxr/usd/usdLux/domeLight_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/domeLight_1.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/domeLight_1.h b/pxr/usd/usdLux/domeLight_1.h
index 86c649d894..c0dd7af47d 100644
--- a/pxr/usd/usdLux/domeLight_1.h
+++ b/pxr/usd/usdLux/domeLight_1.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_DOMELIGHT_1_H
 #define USDLUX_GENERATED_DOMELIGHT_1_H
diff --git a/pxr/usd/usdLux/geometryLight.cpp b/pxr/usd/usdLux/geometryLight.cpp
index 3981eb25fa..75b20ebc1f 100644
--- a/pxr/usd/usdLux/geometryLight.cpp
+++ b/pxr/usd/usdLux/geometryLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/geometryLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/geometryLight.h b/pxr/usd/usdLux/geometryLight.h
index d1cb380118..c0952d4d6b 100644
--- a/pxr/usd/usdLux/geometryLight.h
+++ b/pxr/usd/usdLux/geometryLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_GEOMETRYLIGHT_H
 #define USDLUX_GENERATED_GEOMETRYLIGHT_H
diff --git a/pxr/usd/usdLux/lightAPI.cpp b/pxr/usd/usdLux/lightAPI.cpp
index 57b5e49cda..3feaf0b117 100644
--- a/pxr/usd/usdLux/lightAPI.cpp
+++ b/pxr/usd/usdLux/lightAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/lightAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/lightAPI.h b/pxr/usd/usdLux/lightAPI.h
index 1ea31f3fba..457d12aae5 100644
--- a/pxr/usd/usdLux/lightAPI.h
+++ b/pxr/usd/usdLux/lightAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_LIGHTAPI_H
 #define USDLUX_GENERATED_LIGHTAPI_H
diff --git a/pxr/usd/usdLux/lightDefParser.cpp b/pxr/usd/usdLux/lightDefParser.cpp
index e790474882..7d030af228 100644
--- a/pxr/usd/usdLux/lightDefParser.cpp
+++ b/pxr/usd/usdLux/lightDefParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/lightDefParser.h"
 
diff --git a/pxr/usd/usdLux/lightDefParser.h b/pxr/usd/usdLux/lightDefParser.h
index 7bfca8d187..28eca2b03d 100644
--- a/pxr/usd/usdLux/lightDefParser.h
+++ b/pxr/usd/usdLux/lightDefParser.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_LUX_LIGHT_DEF_PARSER_H
 #define PXR_USD_USD_LUX_LIGHT_DEF_PARSER_H
diff --git a/pxr/usd/usdLux/lightFilter.cpp b/pxr/usd/usdLux/lightFilter.cpp
index 7b30de3354..5364c5b84b 100644
--- a/pxr/usd/usdLux/lightFilter.cpp
+++ b/pxr/usd/usdLux/lightFilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/lightFilter.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/lightFilter.h b/pxr/usd/usdLux/lightFilter.h
index a52317e115..ce5f057f4b 100644
--- a/pxr/usd/usdLux/lightFilter.h
+++ b/pxr/usd/usdLux/lightFilter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_LIGHTFILTER_H
 #define USDLUX_GENERATED_LIGHTFILTER_H
diff --git a/pxr/usd/usdLux/lightListAPI.cpp b/pxr/usd/usdLux/lightListAPI.cpp
index 8523971c68..207bdc272f 100644
--- a/pxr/usd/usdLux/lightListAPI.cpp
+++ b/pxr/usd/usdLux/lightListAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/lightListAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/lightListAPI.h b/pxr/usd/usdLux/lightListAPI.h
index 7b55f61022..b07d0e790e 100644
--- a/pxr/usd/usdLux/lightListAPI.h
+++ b/pxr/usd/usdLux/lightListAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_LIGHTLISTAPI_H
 #define USDLUX_GENERATED_LIGHTLISTAPI_H
diff --git a/pxr/usd/usdLux/listAPI.cpp b/pxr/usd/usdLux/listAPI.cpp
index 4f98f6f655..2e860768cd 100644
--- a/pxr/usd/usdLux/listAPI.cpp
+++ b/pxr/usd/usdLux/listAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/listAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/listAPI.h b/pxr/usd/usdLux/listAPI.h
index 0ac13b84d4..46b67a52cd 100644
--- a/pxr/usd/usdLux/listAPI.h
+++ b/pxr/usd/usdLux/listAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_LISTAPI_H
 #define USDLUX_GENERATED_LISTAPI_H
diff --git a/pxr/usd/usdLux/meshLightAPI.cpp b/pxr/usd/usdLux/meshLightAPI.cpp
index b71f57ea27..eb4efb1e38 100644
--- a/pxr/usd/usdLux/meshLightAPI.cpp
+++ b/pxr/usd/usdLux/meshLightAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/meshLightAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/meshLightAPI.h b/pxr/usd/usdLux/meshLightAPI.h
index 8bbb5abb51..144683370d 100644
--- a/pxr/usd/usdLux/meshLightAPI.h
+++ b/pxr/usd/usdLux/meshLightAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_MESHLIGHTAPI_H
 #define USDLUX_GENERATED_MESHLIGHTAPI_H
diff --git a/pxr/usd/usdLux/module.cpp b/pxr/usd/usdLux/module.cpp
index 615e6d2e36..2479ecaa30 100644
--- a/pxr/usd/usdLux/module.cpp
+++ b/pxr/usd/usdLux/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdLux/blackbody.h"
diff --git a/pxr/usd/usdLux/moduleDeps.cpp b/pxr/usd/usdLux/moduleDeps.cpp
index 9bee400a2d..ce3bae2190 100644
--- a/pxr/usd/usdLux/moduleDeps.cpp
+++ b/pxr/usd/usdLux/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdLux/nonboundableLightBase.cpp b/pxr/usd/usdLux/nonboundableLightBase.cpp
index 94f8aec2b6..9e2c9b1764 100644
--- a/pxr/usd/usdLux/nonboundableLightBase.cpp
+++ b/pxr/usd/usdLux/nonboundableLightBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/nonboundableLightBase.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/nonboundableLightBase.h b/pxr/usd/usdLux/nonboundableLightBase.h
index 2d9a23dfe6..d0cd9fe840 100644
--- a/pxr/usd/usdLux/nonboundableLightBase.h
+++ b/pxr/usd/usdLux/nonboundableLightBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_NONBOUNDABLELIGHTBASE_H
 #define USDLUX_GENERATED_NONBOUNDABLELIGHTBASE_H
diff --git a/pxr/usd/usdLux/pch.h b/pxr/usd/usdLux/pch.h
index 8fe34cb954..4b1e8f8001 100644
--- a/pxr/usd/usdLux/pch.h
+++ b/pxr/usd/usdLux/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -69,6 +52,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,60 +62,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -149,6 +89,7 @@
 #include <boost/python/object_operators.hpp>
 #include <boost/python/operators.hpp>
 #include <boost/python/refcount.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/scope.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
@@ -158,27 +99,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -186,7 +109,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdLux/pluginLight.cpp b/pxr/usd/usdLux/pluginLight.cpp
index 218b7a8345..1ab84197c5 100644
--- a/pxr/usd/usdLux/pluginLight.cpp
+++ b/pxr/usd/usdLux/pluginLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/pluginLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/pluginLight.h b/pxr/usd/usdLux/pluginLight.h
index 4c70804dc8..ae738cadd4 100644
--- a/pxr/usd/usdLux/pluginLight.h
+++ b/pxr/usd/usdLux/pluginLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_PLUGINLIGHT_H
 #define USDLUX_GENERATED_PLUGINLIGHT_H
diff --git a/pxr/usd/usdLux/pluginLightFilter.cpp b/pxr/usd/usdLux/pluginLightFilter.cpp
index 8686cd12fa..3953b0834b 100644
--- a/pxr/usd/usdLux/pluginLightFilter.cpp
+++ b/pxr/usd/usdLux/pluginLightFilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/pluginLightFilter.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/pluginLightFilter.h b/pxr/usd/usdLux/pluginLightFilter.h
index 8e2a0557f9..5dae8407fc 100644
--- a/pxr/usd/usdLux/pluginLightFilter.h
+++ b/pxr/usd/usdLux/pluginLightFilter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_PLUGINLIGHTFILTER_H
 #define USDLUX_GENERATED_PLUGINLIGHTFILTER_H
diff --git a/pxr/usd/usdLux/portalLight.cpp b/pxr/usd/usdLux/portalLight.cpp
index afc43bd7a7..198d8c3bd3 100644
--- a/pxr/usd/usdLux/portalLight.cpp
+++ b/pxr/usd/usdLux/portalLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/portalLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/portalLight.h b/pxr/usd/usdLux/portalLight.h
index 7a349f9f3e..094def6f3d 100644
--- a/pxr/usd/usdLux/portalLight.h
+++ b/pxr/usd/usdLux/portalLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_PORTALLIGHT_H
 #define USDLUX_GENERATED_PORTALLIGHT_H
diff --git a/pxr/usd/usdLux/rectLight.cpp b/pxr/usd/usdLux/rectLight.cpp
index 4e369bee4e..e211c6b98d 100644
--- a/pxr/usd/usdLux/rectLight.cpp
+++ b/pxr/usd/usdLux/rectLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/rectLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/rectLight.h b/pxr/usd/usdLux/rectLight.h
index 3c42040a0a..377c2678e9 100644
--- a/pxr/usd/usdLux/rectLight.h
+++ b/pxr/usd/usdLux/rectLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_RECTLIGHT_H
 #define USDLUX_GENERATED_RECTLIGHT_H
diff --git a/pxr/usd/usdLux/shadowAPI.cpp b/pxr/usd/usdLux/shadowAPI.cpp
index 8875c3b6b8..dbbf9b26ec 100644
--- a/pxr/usd/usdLux/shadowAPI.cpp
+++ b/pxr/usd/usdLux/shadowAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/shadowAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/shadowAPI.h b/pxr/usd/usdLux/shadowAPI.h
index efb6b25a98..06e4242b84 100644
--- a/pxr/usd/usdLux/shadowAPI.h
+++ b/pxr/usd/usdLux/shadowAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_SHADOWAPI_H
 #define USDLUX_GENERATED_SHADOWAPI_H
diff --git a/pxr/usd/usdLux/shapingAPI.cpp b/pxr/usd/usdLux/shapingAPI.cpp
index e495221855..3ef1d623fd 100644
--- a/pxr/usd/usdLux/shapingAPI.cpp
+++ b/pxr/usd/usdLux/shapingAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/shapingAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/shapingAPI.h b/pxr/usd/usdLux/shapingAPI.h
index adda4fb904..5c7304eac1 100644
--- a/pxr/usd/usdLux/shapingAPI.h
+++ b/pxr/usd/usdLux/shapingAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_SHAPINGAPI_H
 #define USDLUX_GENERATED_SHAPINGAPI_H
diff --git a/pxr/usd/usdLux/sphereLight.cpp b/pxr/usd/usdLux/sphereLight.cpp
index f7669e1ad1..6af5f6fe0c 100644
--- a/pxr/usd/usdLux/sphereLight.cpp
+++ b/pxr/usd/usdLux/sphereLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/sphereLight.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/sphereLight.h b/pxr/usd/usdLux/sphereLight.h
index e17d52ea6c..e39ccbbeda 100644
--- a/pxr/usd/usdLux/sphereLight.h
+++ b/pxr/usd/usdLux/sphereLight.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_SPHERELIGHT_H
 #define USDLUX_GENERATED_SPHERELIGHT_H
diff --git a/pxr/usd/usdLux/testenv/testUsdLuxLight.py b/pxr/usd/usdLux/testenv/testUsdLuxLight.py
index 67cde135e8..91e33e96c5 100644
--- a/pxr/usd/usdLux/testenv/testUsdLuxLight.py
+++ b/pxr/usd/usdLux/testenv/testUsdLuxLight.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdLux/testenv/testUsdLuxLightListAPI.py b/pxr/usd/usdLux/testenv/testUsdLuxLightListAPI.py
index 0ea48011a2..9d6fcffdc1 100644
--- a/pxr/usd/usdLux/testenv/testUsdLuxLightListAPI.py
+++ b/pxr/usd/usdLux/testenv/testUsdLuxLightListAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdGeom, UsdLux, Vt, Sdf
 import unittest
diff --git a/pxr/usd/usdLux/testenv/testUsdLuxLinkingAPI.py b/pxr/usd/usdLux/testenv/testUsdLuxLinkingAPI.py
index 5ca23cad50..0830785a8c 100644
--- a/pxr/usd/usdLux/testenv/testUsdLuxLinkingAPI.py
+++ b/pxr/usd/usdLux/testenv/testUsdLuxLinkingAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdGeom, UsdLux, Vt, Sdf
 import unittest
diff --git a/pxr/usd/usdLux/tokens.cpp b/pxr/usd/usdLux/tokens.cpp
index dbada86c2c..9ec0a18cac 100644
--- a/pxr/usd/usdLux/tokens.cpp
+++ b/pxr/usd/usdLux/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/tokens.h"
 
diff --git a/pxr/usd/usdLux/tokens.h b/pxr/usd/usdLux/tokens.h
index 865a77cea5..fa09f3c256 100644
--- a/pxr/usd/usdLux/tokens.h
+++ b/pxr/usd/usdLux/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_TOKENS_H
 #define USDLUX_TOKENS_H
diff --git a/pxr/usd/usdLux/volumeLightAPI.cpp b/pxr/usd/usdLux/volumeLightAPI.cpp
index 476653ac20..04c9f603fc 100644
--- a/pxr/usd/usdLux/volumeLightAPI.cpp
+++ b/pxr/usd/usdLux/volumeLightAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/volumeLightAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdLux/volumeLightAPI.h b/pxr/usd/usdLux/volumeLightAPI.h
index e66070fcdd..3c8812e55d 100644
--- a/pxr/usd/usdLux/volumeLightAPI.h
+++ b/pxr/usd/usdLux/volumeLightAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDLUX_GENERATED_VOLUMELIGHTAPI_H
 #define USDLUX_GENERATED_VOLUMELIGHTAPI_H
diff --git a/pxr/usd/usdLux/wrapBoundableLightBase.cpp b/pxr/usd/usdLux/wrapBoundableLightBase.cpp
index 1fe522ad65..3be67948cb 100644
--- a/pxr/usd/usdLux/wrapBoundableLightBase.cpp
+++ b/pxr/usd/usdLux/wrapBoundableLightBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/boundableLightBase.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapCylinderLight.cpp b/pxr/usd/usdLux/wrapCylinderLight.cpp
index 8d7c7f0525..f887c4c568 100644
--- a/pxr/usd/usdLux/wrapCylinderLight.cpp
+++ b/pxr/usd/usdLux/wrapCylinderLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/cylinderLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapDiskLight.cpp b/pxr/usd/usdLux/wrapDiskLight.cpp
index 76296e6c91..efa4e905de 100644
--- a/pxr/usd/usdLux/wrapDiskLight.cpp
+++ b/pxr/usd/usdLux/wrapDiskLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/diskLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapDistantLight.cpp b/pxr/usd/usdLux/wrapDistantLight.cpp
index acd6c62c90..235855e907 100644
--- a/pxr/usd/usdLux/wrapDistantLight.cpp
+++ b/pxr/usd/usdLux/wrapDistantLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/distantLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapDomeLight.cpp b/pxr/usd/usdLux/wrapDomeLight.cpp
index 8479d530ba..025316e446 100644
--- a/pxr/usd/usdLux/wrapDomeLight.cpp
+++ b/pxr/usd/usdLux/wrapDomeLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/domeLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapDomeLight_1.cpp b/pxr/usd/usdLux/wrapDomeLight_1.cpp
index 59460105e5..bf79258d41 100644
--- a/pxr/usd/usdLux/wrapDomeLight_1.cpp
+++ b/pxr/usd/usdLux/wrapDomeLight_1.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/domeLight_1.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapGeometryLight.cpp b/pxr/usd/usdLux/wrapGeometryLight.cpp
index 169c3cc9c6..8eea077a22 100644
--- a/pxr/usd/usdLux/wrapGeometryLight.cpp
+++ b/pxr/usd/usdLux/wrapGeometryLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/geometryLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapLightAPI.cpp b/pxr/usd/usdLux/wrapLightAPI.cpp
index 4b1ce738ae..910d681226 100644
--- a/pxr/usd/usdLux/wrapLightAPI.cpp
+++ b/pxr/usd/usdLux/wrapLightAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/lightAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapLightFilter.cpp b/pxr/usd/usdLux/wrapLightFilter.cpp
index b008a7f90a..cd57290b18 100644
--- a/pxr/usd/usdLux/wrapLightFilter.cpp
+++ b/pxr/usd/usdLux/wrapLightFilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/lightFilter.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapLightListAPI.cpp b/pxr/usd/usdLux/wrapLightListAPI.cpp
index cdf9d61ea8..893c98f582 100644
--- a/pxr/usd/usdLux/wrapLightListAPI.cpp
+++ b/pxr/usd/usdLux/wrapLightListAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/lightListAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapListAPI.cpp b/pxr/usd/usdLux/wrapListAPI.cpp
index ad00789d27..6dbd020531 100644
--- a/pxr/usd/usdLux/wrapListAPI.cpp
+++ b/pxr/usd/usdLux/wrapListAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/listAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapMeshLightAPI.cpp b/pxr/usd/usdLux/wrapMeshLightAPI.cpp
index dd2cb7f9ff..29106da301 100644
--- a/pxr/usd/usdLux/wrapMeshLightAPI.cpp
+++ b/pxr/usd/usdLux/wrapMeshLightAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/meshLightAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapNonboundableLightBase.cpp b/pxr/usd/usdLux/wrapNonboundableLightBase.cpp
index 898b0fae86..73282af967 100644
--- a/pxr/usd/usdLux/wrapNonboundableLightBase.cpp
+++ b/pxr/usd/usdLux/wrapNonboundableLightBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/nonboundableLightBase.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapPluginLight.cpp b/pxr/usd/usdLux/wrapPluginLight.cpp
index 5632703964..ee1bdfee01 100644
--- a/pxr/usd/usdLux/wrapPluginLight.cpp
+++ b/pxr/usd/usdLux/wrapPluginLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/pluginLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapPluginLightFilter.cpp b/pxr/usd/usdLux/wrapPluginLightFilter.cpp
index ab561ab5e8..e2b4840789 100644
--- a/pxr/usd/usdLux/wrapPluginLightFilter.cpp
+++ b/pxr/usd/usdLux/wrapPluginLightFilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/pluginLightFilter.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapPortalLight.cpp b/pxr/usd/usdLux/wrapPortalLight.cpp
index c3ae9333fb..5ba12b2a4c 100644
--- a/pxr/usd/usdLux/wrapPortalLight.cpp
+++ b/pxr/usd/usdLux/wrapPortalLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/portalLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapRectLight.cpp b/pxr/usd/usdLux/wrapRectLight.cpp
index dc1d482d4d..ae510e20e0 100644
--- a/pxr/usd/usdLux/wrapRectLight.cpp
+++ b/pxr/usd/usdLux/wrapRectLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/rectLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapShadowAPI.cpp b/pxr/usd/usdLux/wrapShadowAPI.cpp
index 7f25b8eaae..286c27efb5 100644
--- a/pxr/usd/usdLux/wrapShadowAPI.cpp
+++ b/pxr/usd/usdLux/wrapShadowAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/shadowAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapShapingAPI.cpp b/pxr/usd/usdLux/wrapShapingAPI.cpp
index c8738b0804..13ab2f6434 100644
--- a/pxr/usd/usdLux/wrapShapingAPI.cpp
+++ b/pxr/usd/usdLux/wrapShapingAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/shapingAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapSphereLight.cpp b/pxr/usd/usdLux/wrapSphereLight.cpp
index cd0b7c2620..3f332c9806 100644
--- a/pxr/usd/usdLux/wrapSphereLight.cpp
+++ b/pxr/usd/usdLux/wrapSphereLight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/sphereLight.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdLux/wrapTokens.cpp b/pxr/usd/usdLux/wrapTokens.cpp
index 4428da276f..ddbc3393bc 100644
--- a/pxr/usd/usdLux/wrapTokens.cpp
+++ b/pxr/usd/usdLux/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdLux/wrapVolumeLightAPI.cpp b/pxr/usd/usdLux/wrapVolumeLightAPI.cpp
index 6b9e04b6db..179cc8ea20 100644
--- a/pxr/usd/usdLux/wrapVolumeLightAPI.cpp
+++ b/pxr/usd/usdLux/wrapVolumeLightAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdLux/volumeLightAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdMedia/__init__.py b/pxr/usd/usdMedia/__init__.py
index 8c0dabcdfb..3ad26ffd3c 100644
--- a/pxr/usd/usdMedia/__init__.py
+++ b/pxr/usd/usdMedia/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdMedia/api.h b/pxr/usd/usdMedia/api.h
index b3fc79755b..952e8c7947 100644
--- a/pxr/usd/usdMedia/api.h
+++ b/pxr/usd/usdMedia/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDMEDIA_API_H
 #define USDMEDIA_API_H
diff --git a/pxr/usd/usdMedia/assetPreviewsAPI.cpp b/pxr/usd/usdMedia/assetPreviewsAPI.cpp
index 0c715d065d..db28499bc0 100644
--- a/pxr/usd/usdMedia/assetPreviewsAPI.cpp
+++ b/pxr/usd/usdMedia/assetPreviewsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdMedia/assetPreviewsAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -210,13 +193,12 @@ UsdMediaAssetPreviewsAPI::GetAssetDefaultPreviews(const SdfLayerHandle &layer)
         return UsdMediaAssetPreviewsAPI();
     }
     
-    TfToken defaultPrimName = layer->GetDefaultPrim();
-    if (defaultPrimName.IsEmpty()) {
+    SdfPath defaultPrimPath = layer->GetDefaultPrimAsPath();
+    if (defaultPrimPath.IsEmpty()) {
         return UsdMediaAssetPreviewsAPI();
     }
     
     static const TfToken noSuchPrim("__No_Such_Prim__");
-    SdfPath defaultPrimPath = SdfPath::AbsoluteRootPath().AppendChild(defaultPrimName);
     // Technique to limit population to a maximum depth
     SdfPath maskPath = defaultPrimPath.AppendChild(noSuchPrim);
     UsdStagePopulationMask   mask({ maskPath });
diff --git a/pxr/usd/usdMedia/assetPreviewsAPI.h b/pxr/usd/usdMedia/assetPreviewsAPI.h
index f4330ab07b..855f89af24 100644
--- a/pxr/usd/usdMedia/assetPreviewsAPI.h
+++ b/pxr/usd/usdMedia/assetPreviewsAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDMEDIA_GENERATED_ASSETPREVIEWSAPI_H
 #define USDMEDIA_GENERATED_ASSETPREVIEWSAPI_H
diff --git a/pxr/usd/usdMedia/module.cpp b/pxr/usd/usdMedia/module.cpp
index 32b60317c4..926972e471 100644
--- a/pxr/usd/usdMedia/module.cpp
+++ b/pxr/usd/usdMedia/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdMedia/moduleDeps.cpp b/pxr/usd/usdMedia/moduleDeps.cpp
index 89505df7a9..7af27823ab 100644
--- a/pxr/usd/usdMedia/moduleDeps.cpp
+++ b/pxr/usd/usdMedia/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdMedia/pch.h b/pxr/usd/usdMedia/pch.h
index 7802ec3e2d..cd2273423e 100644
--- a/pxr/usd/usdMedia/pch.h
+++ b/pxr/usd/usdMedia/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -67,8 +50,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,60 +61,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -143,6 +82,8 @@
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
+#include <boost/python/operators.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
@@ -151,27 +92,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -179,7 +102,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdMedia/spatialAudio.cpp b/pxr/usd/usdMedia/spatialAudio.cpp
index 8dc0fa8002..637bfc5ff6 100644
--- a/pxr/usd/usdMedia/spatialAudio.cpp
+++ b/pxr/usd/usdMedia/spatialAudio.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdMedia/spatialAudio.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdMedia/spatialAudio.h b/pxr/usd/usdMedia/spatialAudio.h
index 81bf2740cc..e4ffea3ba7 100644
--- a/pxr/usd/usdMedia/spatialAudio.h
+++ b/pxr/usd/usdMedia/spatialAudio.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDMEDIA_GENERATED_SPATIALAUDIO_H
 #define USDMEDIA_GENERATED_SPATIALAUDIO_H
diff --git a/pxr/usd/usdMedia/testenv/testUsdMediaAssetPreviewsAPI.py b/pxr/usd/usdMedia/testenv/testUsdMediaAssetPreviewsAPI.py
index badb5bbaa3..21ea36bf52 100644
--- a/pxr/usd/usdMedia/testenv/testUsdMediaAssetPreviewsAPI.py
+++ b/pxr/usd/usdMedia/testenv/testUsdMediaAssetPreviewsAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdGeom, UsdMedia
 import unittest
diff --git a/pxr/usd/usdMedia/testenv/testUsdMediaSpatialAudio.py b/pxr/usd/usdMedia/testenv/testUsdMediaSpatialAudio.py
index b648b5e48c..e5534fa151 100644
--- a/pxr/usd/usdMedia/testenv/testUsdMediaSpatialAudio.py
+++ b/pxr/usd/usdMedia/testenv/testUsdMediaSpatialAudio.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdMedia
 import unittest, math
diff --git a/pxr/usd/usdMedia/tokens.cpp b/pxr/usd/usdMedia/tokens.cpp
index b1ca1804e1..b53b1ae1bd 100644
--- a/pxr/usd/usdMedia/tokens.cpp
+++ b/pxr/usd/usdMedia/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdMedia/tokens.h"
 
diff --git a/pxr/usd/usdMedia/tokens.h b/pxr/usd/usdMedia/tokens.h
index 19ac17031c..da1e6f0c30 100644
--- a/pxr/usd/usdMedia/tokens.h
+++ b/pxr/usd/usdMedia/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDMEDIA_TOKENS_H
 #define USDMEDIA_TOKENS_H
diff --git a/pxr/usd/usdMedia/wrapAssetPreviewsAPI.cpp b/pxr/usd/usdMedia/wrapAssetPreviewsAPI.cpp
index 76bd7f1166..848d1b65a1 100644
--- a/pxr/usd/usdMedia/wrapAssetPreviewsAPI.cpp
+++ b/pxr/usd/usdMedia/wrapAssetPreviewsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdMedia/assetPreviewsAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdMedia/wrapSpatialAudio.cpp b/pxr/usd/usdMedia/wrapSpatialAudio.cpp
index d77440133d..344d445e6b 100644
--- a/pxr/usd/usdMedia/wrapSpatialAudio.cpp
+++ b/pxr/usd/usdMedia/wrapSpatialAudio.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdMedia/spatialAudio.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdMedia/wrapTokens.cpp b/pxr/usd/usdMedia/wrapTokens.cpp
index 9abe918d4b..2b7cce3dad 100644
--- a/pxr/usd/usdMedia/wrapTokens.cpp
+++ b/pxr/usd/usdMedia/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdMtlx/__init__.py b/pxr/usd/usdMtlx/__init__.py
index 85c7173035..5e0d06a196 100644
--- a/pxr/usd/usdMtlx/__init__.py
+++ b/pxr/usd/usdMtlx/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdMtlx/api.h b/pxr/usd/usdMtlx/api.h
index 49d63b982a..5d78afee19 100644
--- a/pxr/usd/usdMtlx/api.h
+++ b/pxr/usd/usdMtlx/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USDMTLX_API_H
 #define PXR_USD_USDMTLX_API_H
diff --git a/pxr/usd/usdMtlx/backdoor.cpp b/pxr/usd/usdMtlx/backdoor.cpp
index 6f11215777..e0223a7a2d 100644
--- a/pxr/usd/usdMtlx/backdoor.cpp
+++ b/pxr/usd/usdMtlx/backdoor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdMtlx/backdoor.h b/pxr/usd/usdMtlx/backdoor.h
index 84a34c4a61..a121364d6b 100644
--- a/pxr/usd/usdMtlx/backdoor.h
+++ b/pxr/usd/usdMtlx/backdoor.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USDMTLX_BACKDOOR_H
 #define PXR_USD_USDMTLX_BACKDOOR_H
diff --git a/pxr/usd/usdMtlx/debugCodes.cpp b/pxr/usd/usdMtlx/debugCodes.cpp
index fe74fca908..05a00aa44b 100644
--- a/pxr/usd/usdMtlx/debugCodes.cpp
+++ b/pxr/usd/usdMtlx/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdMtlx/debugCodes.h"
diff --git a/pxr/usd/usdMtlx/debugCodes.h b/pxr/usd/usdMtlx/debugCodes.h
index acf94cb0e6..7bc5369fb1 100644
--- a/pxr/usd/usdMtlx/debugCodes.h
+++ b/pxr/usd/usdMtlx/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USDMTLX_DEBUG_CODES_H
 #define PXR_USD_USDMTLX_DEBUG_CODES_H
diff --git a/pxr/usd/usdMtlx/discovery.cpp b/pxr/usd/usdMtlx/discovery.cpp
index 439b790e73..8ae7a95943 100644
--- a/pxr/usd/usdMtlx/discovery.cpp
+++ b/pxr/usd/usdMtlx/discovery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdMtlx/utils.h"
diff --git a/pxr/usd/usdMtlx/fileFormat.cpp b/pxr/usd/usdMtlx/fileFormat.cpp
index f23265cfa1..5c1125a2c1 100644
--- a/pxr/usd/usdMtlx/fileFormat.cpp
+++ b/pxr/usd/usdMtlx/fileFormat.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdMtlx/fileFormat.h"
diff --git a/pxr/usd/usdMtlx/fileFormat.h b/pxr/usd/usdMtlx/fileFormat.h
index 76273de305..7a324b6a79 100644
--- a/pxr/usd/usdMtlx/fileFormat.h
+++ b/pxr/usd/usdMtlx/fileFormat.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USDMTLX_FILE_FORMAT_H
 #define PXR_USD_USDMTLX_FILE_FORMAT_H
diff --git a/pxr/usd/usdMtlx/module.cpp b/pxr/usd/usdMtlx/module.cpp
index 956e1ea672..e9ba5c0f06 100644
--- a/pxr/usd/usdMtlx/module.cpp
+++ b/pxr/usd/usdMtlx/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdMtlx/moduleDeps.cpp b/pxr/usd/usdMtlx/moduleDeps.cpp
index d93fa8116b..c29310dcba 100644
--- a/pxr/usd/usdMtlx/moduleDeps.cpp
+++ b/pxr/usd/usdMtlx/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdMtlx/parser.cpp b/pxr/usd/usdMtlx/parser.cpp
index d635b3c15f..d01b76a53f 100644
--- a/pxr/usd/usdMtlx/parser.cpp
+++ b/pxr/usd/usdMtlx/parser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdMtlx/utils.h"
@@ -400,9 +383,10 @@ ParseMetadata(
 {
     const auto& value = element->getAttribute(attribute);
     if (!value.empty()) {
-        // Change the 'texture2d' role for stdlib MaterialX Texture nodes
-        // to 'texture' for Sdr.
-        if (key == SdrNodeMetadata->Role && value == "texture2d") {
+        // Change the 'texture2d' and 'texture3d' roles for stdlib MaterialX 
+        // Texture nodes to 'texture' for Sdr.
+        if (key == SdrNodeMetadata->Role && 
+            (value == "texture2d" || value == "texture3d")) {
             builder->metadata[key] = "texture";
         }
         else {
diff --git a/pxr/usd/usdMtlx/pch.h b/pxr/usd/usdMtlx/pch.h
index 5eba44e7ed..ee438b747c 100644
--- a/pxr/usd/usdMtlx/pch.h
+++ b/pxr/usd/usdMtlx/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,13 +31,14 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cctype>
@@ -80,8 +64,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -91,68 +76,21 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
 #include <MaterialXCore/Document.h>
+#include <MaterialXCore/Util.h>
+#include <MaterialXFormat/Util.h>
 #include <MaterialXFormat/XmlIo.h>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
+#endif // PXR_MATERIALX_SUPPORT_ENABLED
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
@@ -176,25 +114,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_unordered_set.h>
@@ -203,7 +125,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdMtlx/reader.cpp b/pxr/usd/usdMtlx/reader.cpp
index 2376223016..473a359ced 100644
--- a/pxr/usd/usdMtlx/reader.cpp
+++ b/pxr/usd/usdMtlx/reader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018-2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdMtlx/debugCodes.h"
@@ -1520,7 +1503,8 @@ _Context::AddShaderNode(const mx::ConstNodePtr& mtlxShaderNode)
             _FindMatchingNodeDef(mtlxShaderNode,
                                  mtlxShaderNode->getCategory(),
                                  UsdMtlxGetVersion(mtlxShaderNode),
-                                 mtlxShaderNode->getTarget());
+                                 mtlxShaderNode->getTarget(),
+                                 mtlxShaderNode);
     }
     auto shaderId = _GetShaderId(mtlxNodeDef);
     if (shaderId.IsEmpty()) {
diff --git a/pxr/usd/usdMtlx/reader.h b/pxr/usd/usdMtlx/reader.h
index f98755e4c1..d742732caf 100644
--- a/pxr/usd/usdMtlx/reader.h
+++ b/pxr/usd/usdMtlx/reader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USDMTLX_READER_H
 #define PXR_USD_USDMTLX_READER_H
diff --git a/pxr/usd/usdMtlx/testenv/testUsdMtlxDiscovery.py b/pxr/usd/usdMtlx/testenv/testUsdMtlxDiscovery.py
index 3d3037931c..dce2baf1b2 100644
--- a/pxr/usd/usdMtlx/testenv/testUsdMtlxDiscovery.py
+++ b/pxr/usd/usdMtlx/testenv/testUsdMtlxDiscovery.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os
 os.environ['PXR_MTLX_PLUGIN_SEARCH_PATHS'] = os.getcwd()
diff --git a/pxr/usd/usdMtlx/testenv/testUsdMtlxFileFormat.py b/pxr/usd/usdMtlx/testenv/testUsdMtlxFileFormat.py
index 26cc7a4b67..8a7ac58a24 100644
--- a/pxr/usd/usdMtlx/testenv/testUsdMtlxFileFormat.py
+++ b/pxr/usd/usdMtlx/testenv/testUsdMtlxFileFormat.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 from pxr import Ar, Tf, Sdf, Usd, UsdMtlx, UsdShade
diff --git a/pxr/usd/usdMtlx/testenv/testUsdMtlxParser.py b/pxr/usd/usdMtlx/testenv/testUsdMtlxParser.py
index fc6f8d02dd..ddbfb2ce2c 100644
--- a/pxr/usd/usdMtlx/testenv/testUsdMtlxParser.py
+++ b/pxr/usd/usdMtlx/testenv/testUsdMtlxParser.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import os
 os.environ['PXR_MTLX_STDLIB_SEARCH_PATHS'] = os.getcwd()
diff --git a/pxr/usd/usdMtlx/utils.cpp b/pxr/usd/usdMtlx/utils.cpp
index 44ddcd2284..9d02f42af8 100644
--- a/pxr/usd/usdMtlx/utils.cpp
+++ b/pxr/usd/usdMtlx/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdMtlx/utils.h"
diff --git a/pxr/usd/usdMtlx/utils.h b/pxr/usd/usdMtlx/utils.h
index 11095ffd46..5d89893ee8 100644
--- a/pxr/usd/usdMtlx/utils.h
+++ b/pxr/usd/usdMtlx/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_USDMTLX_UTILS_H
diff --git a/pxr/usd/usdMtlx/wrapBackdoor.cpp b/pxr/usd/usdMtlx/wrapBackdoor.cpp
index 65e0a0411d..29722a48f0 100644
--- a/pxr/usd/usdMtlx/wrapBackdoor.cpp
+++ b/pxr/usd/usdMtlx/wrapBackdoor.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdPhysics/__init__.py b/pxr/usd/usdPhysics/__init__.py
index 71de432ec8..4bcde7b5f4 100644
--- a/pxr/usd/usdPhysics/__init__.py
+++ b/pxr/usd/usdPhysics/__init__.py
@@ -7,25 +7,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdPhysics/api.h b/pxr/usd/usdPhysics/api.h
index 737645ea58..4bccaf0bda 100644
--- a/pxr/usd/usdPhysics/api.h
+++ b/pxr/usd/usdPhysics/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_API_H
 #define USDPHYSICS_API_H
diff --git a/pxr/usd/usdPhysics/articulationRootAPI.cpp b/pxr/usd/usdPhysics/articulationRootAPI.cpp
index 98d939cd53..13dba394e7 100644
--- a/pxr/usd/usdPhysics/articulationRootAPI.cpp
+++ b/pxr/usd/usdPhysics/articulationRootAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/articulationRootAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/articulationRootAPI.h b/pxr/usd/usdPhysics/articulationRootAPI.h
index 2ad5daceb4..9e263768d5 100644
--- a/pxr/usd/usdPhysics/articulationRootAPI.h
+++ b/pxr/usd/usdPhysics/articulationRootAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_ARTICULATIONROOTAPI_H
 #define USDPHYSICS_GENERATED_ARTICULATIONROOTAPI_H
diff --git a/pxr/usd/usdPhysics/collisionAPI.cpp b/pxr/usd/usdPhysics/collisionAPI.cpp
index 2e3319b07b..ae5c7471e7 100644
--- a/pxr/usd/usdPhysics/collisionAPI.cpp
+++ b/pxr/usd/usdPhysics/collisionAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/collisionAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/collisionAPI.h b/pxr/usd/usdPhysics/collisionAPI.h
index a6e260bb77..51e1316801 100644
--- a/pxr/usd/usdPhysics/collisionAPI.h
+++ b/pxr/usd/usdPhysics/collisionAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_COLLISIONAPI_H
 #define USDPHYSICS_GENERATED_COLLISIONAPI_H
diff --git a/pxr/usd/usdPhysics/collisionGroup.cpp b/pxr/usd/usdPhysics/collisionGroup.cpp
index ecf2b9040a..c82b830ae6 100644
--- a/pxr/usd/usdPhysics/collisionGroup.cpp
+++ b/pxr/usd/usdPhysics/collisionGroup.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/collisionGroup.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/collisionGroup.h b/pxr/usd/usdPhysics/collisionGroup.h
index abab12127d..e6d180282d 100644
--- a/pxr/usd/usdPhysics/collisionGroup.h
+++ b/pxr/usd/usdPhysics/collisionGroup.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_COLLISIONGROUP_H
 #define USDPHYSICS_GENERATED_COLLISIONGROUP_H
diff --git a/pxr/usd/usdPhysics/distanceJoint.cpp b/pxr/usd/usdPhysics/distanceJoint.cpp
index 2842e3e972..fe90120d9c 100644
--- a/pxr/usd/usdPhysics/distanceJoint.cpp
+++ b/pxr/usd/usdPhysics/distanceJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/distanceJoint.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/distanceJoint.h b/pxr/usd/usdPhysics/distanceJoint.h
index 4a3f53151b..7987a6eec4 100644
--- a/pxr/usd/usdPhysics/distanceJoint.h
+++ b/pxr/usd/usdPhysics/distanceJoint.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_DISTANCEJOINT_H
 #define USDPHYSICS_GENERATED_DISTANCEJOINT_H
diff --git a/pxr/usd/usdPhysics/driveAPI.cpp b/pxr/usd/usdPhysics/driveAPI.cpp
index 26f7c78b7b..597f02894d 100644
--- a/pxr/usd/usdPhysics/driveAPI.cpp
+++ b/pxr/usd/usdPhysics/driveAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/driveAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -28,8 +11,6 @@
 #include "pxr/usd/sdf/types.h"
 #include "pxr/usd/sdf/assetPath.h"
 
-#include "pxr/base/tf/staticTokens.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 // Register the schema with the TfType system.
@@ -40,11 +21,6 @@ TF_REGISTRY_FUNCTION(TfType)
     
 }
 
-TF_DEFINE_PRIVATE_TOKENS(
-    _schemaTokens,
-    (drive)
-);
-
 /* virtual */
 UsdPhysicsDriveAPI::~UsdPhysicsDriveAPI()
 {
@@ -131,9 +107,9 @@ UsdPhysicsDriveAPI::IsPhysicsDriveAPIPath(
     }
 
     if (tokens.size() >= 2
-        && tokens[0] == _schemaTokens->drive) {
+        && tokens[0] == UsdPhysicsTokens->drive) {
         *name = TfToken(propertyName.substr(
-            _schemaTokens->drive.GetString().size() + 1));
+           UsdPhysicsTokens->drive.GetString().size() + 1));
         return true;
     }
 
diff --git a/pxr/usd/usdPhysics/driveAPI.h b/pxr/usd/usdPhysics/driveAPI.h
index 205de77798..694e42670f 100644
--- a/pxr/usd/usdPhysics/driveAPI.h
+++ b/pxr/usd/usdPhysics/driveAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_DRIVEAPI_H
 #define USDPHYSICS_GENERATED_DRIVEAPI_H
diff --git a/pxr/usd/usdPhysics/filteredPairsAPI.cpp b/pxr/usd/usdPhysics/filteredPairsAPI.cpp
index a353942e7b..2364e8fefe 100644
--- a/pxr/usd/usdPhysics/filteredPairsAPI.cpp
+++ b/pxr/usd/usdPhysics/filteredPairsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/filteredPairsAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/filteredPairsAPI.h b/pxr/usd/usdPhysics/filteredPairsAPI.h
index e2ec7d7f13..4d4e26fdaa 100644
--- a/pxr/usd/usdPhysics/filteredPairsAPI.h
+++ b/pxr/usd/usdPhysics/filteredPairsAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_FILTEREDPAIRSAPI_H
 #define USDPHYSICS_GENERATED_FILTEREDPAIRSAPI_H
diff --git a/pxr/usd/usdPhysics/fixedJoint.cpp b/pxr/usd/usdPhysics/fixedJoint.cpp
index a9a0632404..bcd4f2a3a8 100644
--- a/pxr/usd/usdPhysics/fixedJoint.cpp
+++ b/pxr/usd/usdPhysics/fixedJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/fixedJoint.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/fixedJoint.h b/pxr/usd/usdPhysics/fixedJoint.h
index a26e4d3d8a..12d0e83f0b 100644
--- a/pxr/usd/usdPhysics/fixedJoint.h
+++ b/pxr/usd/usdPhysics/fixedJoint.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_FIXEDJOINT_H
 #define USDPHYSICS_GENERATED_FIXEDJOINT_H
diff --git a/pxr/usd/usdPhysics/joint.cpp b/pxr/usd/usdPhysics/joint.cpp
index e5dafca95b..cdd514d87d 100644
--- a/pxr/usd/usdPhysics/joint.cpp
+++ b/pxr/usd/usdPhysics/joint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/joint.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/joint.h b/pxr/usd/usdPhysics/joint.h
index 24d4a1271f..1f6a61d723 100644
--- a/pxr/usd/usdPhysics/joint.h
+++ b/pxr/usd/usdPhysics/joint.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_JOINT_H
 #define USDPHYSICS_GENERATED_JOINT_H
diff --git a/pxr/usd/usdPhysics/limitAPI.cpp b/pxr/usd/usdPhysics/limitAPI.cpp
index 836487b575..4783c7e167 100644
--- a/pxr/usd/usdPhysics/limitAPI.cpp
+++ b/pxr/usd/usdPhysics/limitAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/limitAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -28,8 +11,6 @@
 #include "pxr/usd/sdf/types.h"
 #include "pxr/usd/sdf/assetPath.h"
 
-#include "pxr/base/tf/staticTokens.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 // Register the schema with the TfType system.
@@ -40,11 +21,6 @@ TF_REGISTRY_FUNCTION(TfType)
     
 }
 
-TF_DEFINE_PRIVATE_TOKENS(
-    _schemaTokens,
-    (limit)
-);
-
 /* virtual */
 UsdPhysicsLimitAPI::~UsdPhysicsLimitAPI()
 {
@@ -123,9 +99,9 @@ UsdPhysicsLimitAPI::IsPhysicsLimitAPIPath(
     }
 
     if (tokens.size() >= 2
-        && tokens[0] == _schemaTokens->limit) {
+        && tokens[0] == UsdPhysicsTokens->limit) {
         *name = TfToken(propertyName.substr(
-            _schemaTokens->limit.GetString().size() + 1));
+           UsdPhysicsTokens->limit.GetString().size() + 1));
         return true;
     }
 
diff --git a/pxr/usd/usdPhysics/limitAPI.h b/pxr/usd/usdPhysics/limitAPI.h
index 174012ee07..dd4d72bfd7 100644
--- a/pxr/usd/usdPhysics/limitAPI.h
+++ b/pxr/usd/usdPhysics/limitAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_LIMITAPI_H
 #define USDPHYSICS_GENERATED_LIMITAPI_H
diff --git a/pxr/usd/usdPhysics/massAPI.cpp b/pxr/usd/usdPhysics/massAPI.cpp
index a0a937e961..e971bcb349 100644
--- a/pxr/usd/usdPhysics/massAPI.cpp
+++ b/pxr/usd/usdPhysics/massAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/massAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/massAPI.h b/pxr/usd/usdPhysics/massAPI.h
index 32b819b5db..2a17e5c077 100644
--- a/pxr/usd/usdPhysics/massAPI.h
+++ b/pxr/usd/usdPhysics/massAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_MASSAPI_H
 #define USDPHYSICS_GENERATED_MASSAPI_H
diff --git a/pxr/usd/usdPhysics/massProperties.h b/pxr/usd/usdPhysics/massProperties.h
index ed297f4228..63f8e437ac 100644
--- a/pxr/usd/usdPhysics/massProperties.h
+++ b/pxr/usd/usdPhysics/massProperties.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_MASS_PROPERTIES_H
 #define PXR_USD_USD_MASS_PROPERTIES_H
diff --git a/pxr/usd/usdPhysics/materialAPI.cpp b/pxr/usd/usdPhysics/materialAPI.cpp
index 1fffc6e227..7564770b0a 100644
--- a/pxr/usd/usdPhysics/materialAPI.cpp
+++ b/pxr/usd/usdPhysics/materialAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/materialAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/materialAPI.h b/pxr/usd/usdPhysics/materialAPI.h
index 4f5abaad00..235549518f 100644
--- a/pxr/usd/usdPhysics/materialAPI.h
+++ b/pxr/usd/usdPhysics/materialAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_MATERIALAPI_H
 #define USDPHYSICS_GENERATED_MATERIALAPI_H
diff --git a/pxr/usd/usdPhysics/meshCollisionAPI.cpp b/pxr/usd/usdPhysics/meshCollisionAPI.cpp
index 9168f40338..0113235d67 100644
--- a/pxr/usd/usdPhysics/meshCollisionAPI.cpp
+++ b/pxr/usd/usdPhysics/meshCollisionAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/meshCollisionAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/meshCollisionAPI.h b/pxr/usd/usdPhysics/meshCollisionAPI.h
index 4223d562d5..a022eb92d1 100644
--- a/pxr/usd/usdPhysics/meshCollisionAPI.h
+++ b/pxr/usd/usdPhysics/meshCollisionAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_MESHCOLLISIONAPI_H
 #define USDPHYSICS_GENERATED_MESHCOLLISIONAPI_H
diff --git a/pxr/usd/usdPhysics/metrics.cpp b/pxr/usd/usdPhysics/metrics.cpp
index f23a3c099b..13e012bc85 100644
--- a/pxr/usd/usdPhysics/metrics.cpp
+++ b/pxr/usd/usdPhysics/metrics.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdPhysics/metrics.h b/pxr/usd/usdPhysics/metrics.h
index 69de3c6834..5284f07a6d 100644
--- a/pxr/usd/usdPhysics/metrics.h
+++ b/pxr/usd/usdPhysics/metrics.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_PHYSICS_METRICS_H
 #define PXR_USD_USD_PHYSICS_METRICS_H
diff --git a/pxr/usd/usdPhysics/module.cpp b/pxr/usd/usdPhysics/module.cpp
index 42e8bffd65..e3222be248 100644
--- a/pxr/usd/usdPhysics/module.cpp
+++ b/pxr/usd/usdPhysics/module.cpp
@@ -7,25 +7,8 @@ Copyright (c) 2018, NVIDIA CORPORATION
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "boost/python.hpp"
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdPhysics/moduleDeps.cpp b/pxr/usd/usdPhysics/moduleDeps.cpp
index c6b98846ac..863356ac8e 100644
--- a/pxr/usd/usdPhysics/moduleDeps.cpp
+++ b/pxr/usd/usdPhysics/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdPhysics/pch.h b/pxr/usd/usdPhysics/pch.h
index 824c5b0f93..eefb76388e 100644
--- a/pxr/usd/usdPhysics/pch.h
+++ b/pxr/usd/usdPhysics/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -67,9 +50,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -78,81 +61,37 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/function.hpp>
 #include <boost/python.hpp>
+#include <boost/python/call.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/converter/from_python.hpp>
 #include <boost/python/converter/registered.hpp>
 #include <boost/python/converter/rvalue_from_python_data.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/def_visitor.hpp>
+#include <boost/python/default_call_policies.hpp>
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
 #include <boost/python/handle.hpp>
-#include <boost/python/implicit.hpp>
 #include <boost/python/list.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
 #include <boost/python/operators.hpp>
-#include <boost/python/refcount.hpp>
-#include <boost/python/scope.hpp>
-#include <boost/python/stl_iterator.hpp>
+#include <boost/python/return_by_value.hpp>
+#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
@@ -161,41 +100,18 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
+#include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
-#include <tbb/parallel_for.h>
-#include <tbb/parallel_for_each.h>
-#include <tbb/parallel_reduce.h>
-#include <tbb/queuing_rw_mutex.h>
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdPhysics/prismaticJoint.cpp b/pxr/usd/usdPhysics/prismaticJoint.cpp
index c1cce977ad..2a2cf19efb 100644
--- a/pxr/usd/usdPhysics/prismaticJoint.cpp
+++ b/pxr/usd/usdPhysics/prismaticJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/prismaticJoint.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/prismaticJoint.h b/pxr/usd/usdPhysics/prismaticJoint.h
index 1840763e46..61e2a9fc8c 100644
--- a/pxr/usd/usdPhysics/prismaticJoint.h
+++ b/pxr/usd/usdPhysics/prismaticJoint.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_PRISMATICJOINT_H
 #define USDPHYSICS_GENERATED_PRISMATICJOINT_H
diff --git a/pxr/usd/usdPhysics/revoluteJoint.cpp b/pxr/usd/usdPhysics/revoluteJoint.cpp
index 6e52276e60..62ff838dd2 100644
--- a/pxr/usd/usdPhysics/revoluteJoint.cpp
+++ b/pxr/usd/usdPhysics/revoluteJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/revoluteJoint.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/revoluteJoint.h b/pxr/usd/usdPhysics/revoluteJoint.h
index 247a4430b0..9bdb95ac0c 100644
--- a/pxr/usd/usdPhysics/revoluteJoint.h
+++ b/pxr/usd/usdPhysics/revoluteJoint.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_REVOLUTEJOINT_H
 #define USDPHYSICS_GENERATED_REVOLUTEJOINT_H
diff --git a/pxr/usd/usdPhysics/rigidBodyAPI.cpp b/pxr/usd/usdPhysics/rigidBodyAPI.cpp
index c715a15a23..e75998d187 100644
--- a/pxr/usd/usdPhysics/rigidBodyAPI.cpp
+++ b/pxr/usd/usdPhysics/rigidBodyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/rigidBodyAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/rigidBodyAPI.h b/pxr/usd/usdPhysics/rigidBodyAPI.h
index e5cf30a539..48efa6719c 100644
--- a/pxr/usd/usdPhysics/rigidBodyAPI.h
+++ b/pxr/usd/usdPhysics/rigidBodyAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_RIGIDBODYAPI_H
 #define USDPHYSICS_GENERATED_RIGIDBODYAPI_H
diff --git a/pxr/usd/usdPhysics/scene.cpp b/pxr/usd/usdPhysics/scene.cpp
index 19dea7ae6f..46a562ee34 100644
--- a/pxr/usd/usdPhysics/scene.cpp
+++ b/pxr/usd/usdPhysics/scene.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/scene.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/scene.h b/pxr/usd/usdPhysics/scene.h
index a5ccfb1261..60c8eb5bf8 100644
--- a/pxr/usd/usdPhysics/scene.h
+++ b/pxr/usd/usdPhysics/scene.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_SCENE_H
 #define USDPHYSICS_GENERATED_SCENE_H
diff --git a/pxr/usd/usdPhysics/sphericalJoint.cpp b/pxr/usd/usdPhysics/sphericalJoint.cpp
index 4942f20ff0..560cdccdd0 100644
--- a/pxr/usd/usdPhysics/sphericalJoint.cpp
+++ b/pxr/usd/usdPhysics/sphericalJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/sphericalJoint.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdPhysics/sphericalJoint.h b/pxr/usd/usdPhysics/sphericalJoint.h
index ece2e02df9..7d4a9f371f 100644
--- a/pxr/usd/usdPhysics/sphericalJoint.h
+++ b/pxr/usd/usdPhysics/sphericalJoint.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_GENERATED_SPHERICALJOINT_H
 #define USDPHYSICS_GENERATED_SPHERICALJOINT_H
diff --git a/pxr/usd/usdPhysics/testenv/testUsdPhysicsCollisionGroupAPI.py b/pxr/usd/usdPhysics/testenv/testUsdPhysicsCollisionGroupAPI.py
index 6beb4497f2..2f1fa3aafb 100644
--- a/pxr/usd/usdPhysics/testenv/testUsdPhysicsCollisionGroupAPI.py
+++ b/pxr/usd/usdPhysics/testenv/testUsdPhysicsCollisionGroupAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Tf, Usd, Sdf, UsdGeom, UsdShade, Gf, UsdPhysics
diff --git a/pxr/usd/usdPhysics/testenv/testUsdPhysicsMetrics.py b/pxr/usd/usdPhysics/testenv/testUsdPhysicsMetrics.py
index e781687793..e7d0178b3e 100644
--- a/pxr/usd/usdPhysics/testenv/testUsdPhysicsMetrics.py
+++ b/pxr/usd/usdPhysics/testenv/testUsdPhysicsMetrics.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Tf, Usd, UsdPhysics
diff --git a/pxr/usd/usdPhysics/testenv/testUsdPhysicsRigidBodyAPI.py b/pxr/usd/usdPhysics/testenv/testUsdPhysicsRigidBodyAPI.py
index 781bbbb9c4..f1a4157dce 100644
--- a/pxr/usd/usdPhysics/testenv/testUsdPhysicsRigidBodyAPI.py
+++ b/pxr/usd/usdPhysics/testenv/testUsdPhysicsRigidBodyAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdPhysics/tokens.cpp b/pxr/usd/usdPhysics/tokens.cpp
index c8452ccb7e..28479d5279 100644
--- a/pxr/usd/usdPhysics/tokens.cpp
+++ b/pxr/usd/usdPhysics/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/tokens.h"
 
diff --git a/pxr/usd/usdPhysics/tokens.h b/pxr/usd/usdPhysics/tokens.h
index 7aab4cabc8..f14e435e1e 100644
--- a/pxr/usd/usdPhysics/tokens.h
+++ b/pxr/usd/usdPhysics/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPHYSICS_TOKENS_H
 #define USDPHYSICS_TOKENS_H
diff --git a/pxr/usd/usdPhysics/wrapArticulationRootAPI.cpp b/pxr/usd/usdPhysics/wrapArticulationRootAPI.cpp
index 2a6af90629..ec948bfffe 100644
--- a/pxr/usd/usdPhysics/wrapArticulationRootAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapArticulationRootAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/articulationRootAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapCollisionAPI.cpp b/pxr/usd/usdPhysics/wrapCollisionAPI.cpp
index 14ffd63d24..5b1c37c13e 100644
--- a/pxr/usd/usdPhysics/wrapCollisionAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapCollisionAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/collisionAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapCollisionGroup.cpp b/pxr/usd/usdPhysics/wrapCollisionGroup.cpp
index 0e8f273a67..01d98a907a 100644
--- a/pxr/usd/usdPhysics/wrapCollisionGroup.cpp
+++ b/pxr/usd/usdPhysics/wrapCollisionGroup.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/collisionGroup.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapDistanceJoint.cpp b/pxr/usd/usdPhysics/wrapDistanceJoint.cpp
index 2706183bb0..07d967a352 100644
--- a/pxr/usd/usdPhysics/wrapDistanceJoint.cpp
+++ b/pxr/usd/usdPhysics/wrapDistanceJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/distanceJoint.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapDriveAPI.cpp b/pxr/usd/usdPhysics/wrapDriveAPI.cpp
index b23200972f..95fa8d99a8 100644
--- a/pxr/usd/usdPhysics/wrapDriveAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapDriveAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/driveAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapFilteredPairsAPI.cpp b/pxr/usd/usdPhysics/wrapFilteredPairsAPI.cpp
index bafcdc7e0a..5bed19b960 100644
--- a/pxr/usd/usdPhysics/wrapFilteredPairsAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapFilteredPairsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/filteredPairsAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapFixedJoint.cpp b/pxr/usd/usdPhysics/wrapFixedJoint.cpp
index c66aa79a1f..97c9d88c44 100644
--- a/pxr/usd/usdPhysics/wrapFixedJoint.cpp
+++ b/pxr/usd/usdPhysics/wrapFixedJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/fixedJoint.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapJoint.cpp b/pxr/usd/usdPhysics/wrapJoint.cpp
index bfd32b05dc..00a80bbe06 100644
--- a/pxr/usd/usdPhysics/wrapJoint.cpp
+++ b/pxr/usd/usdPhysics/wrapJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/joint.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapLimitAPI.cpp b/pxr/usd/usdPhysics/wrapLimitAPI.cpp
index ce271fb937..2a68640b45 100644
--- a/pxr/usd/usdPhysics/wrapLimitAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapLimitAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/limitAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapMassAPI.cpp b/pxr/usd/usdPhysics/wrapMassAPI.cpp
index dbd89621b5..06f5f1dcbe 100644
--- a/pxr/usd/usdPhysics/wrapMassAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapMassAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/massAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapMaterialAPI.cpp b/pxr/usd/usdPhysics/wrapMaterialAPI.cpp
index 8f59d4d0f0..1c03777b36 100644
--- a/pxr/usd/usdPhysics/wrapMaterialAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapMaterialAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/materialAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapMeshCollisionAPI.cpp b/pxr/usd/usdPhysics/wrapMeshCollisionAPI.cpp
index 0b03d816b2..fd760aa8a2 100644
--- a/pxr/usd/usdPhysics/wrapMeshCollisionAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapMeshCollisionAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/meshCollisionAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapMetrics.cpp b/pxr/usd/usdPhysics/wrapMetrics.cpp
index 6e87722384..bbe11a2296 100644
--- a/pxr/usd/usdPhysics/wrapMetrics.cpp
+++ b/pxr/usd/usdPhysics/wrapMetrics.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdPhysics/metrics.h"
diff --git a/pxr/usd/usdPhysics/wrapPrismaticJoint.cpp b/pxr/usd/usdPhysics/wrapPrismaticJoint.cpp
index d51de7c8a3..317e4d9590 100644
--- a/pxr/usd/usdPhysics/wrapPrismaticJoint.cpp
+++ b/pxr/usd/usdPhysics/wrapPrismaticJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/prismaticJoint.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapRevoluteJoint.cpp b/pxr/usd/usdPhysics/wrapRevoluteJoint.cpp
index a84d96b2b1..7fe298d6b9 100644
--- a/pxr/usd/usdPhysics/wrapRevoluteJoint.cpp
+++ b/pxr/usd/usdPhysics/wrapRevoluteJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/revoluteJoint.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapRigidBodyAPI.cpp b/pxr/usd/usdPhysics/wrapRigidBodyAPI.cpp
index 8935d152e9..3dec5f6ebe 100644
--- a/pxr/usd/usdPhysics/wrapRigidBodyAPI.cpp
+++ b/pxr/usd/usdPhysics/wrapRigidBodyAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/rigidBodyAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapScene.cpp b/pxr/usd/usdPhysics/wrapScene.cpp
index 5e575ece65..703de38d5b 100644
--- a/pxr/usd/usdPhysics/wrapScene.cpp
+++ b/pxr/usd/usdPhysics/wrapScene.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/scene.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapSphericalJoint.cpp b/pxr/usd/usdPhysics/wrapSphericalJoint.cpp
index 41fdc553ed..cade87a0d3 100644
--- a/pxr/usd/usdPhysics/wrapSphericalJoint.cpp
+++ b/pxr/usd/usdPhysics/wrapSphericalJoint.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdPhysics/sphericalJoint.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdPhysics/wrapTokens.cpp b/pxr/usd/usdPhysics/wrapTokens.cpp
index e5f2e720e5..5b89894e87 100644
--- a/pxr/usd/usdPhysics/wrapTokens.cpp
+++ b/pxr/usd/usdPhysics/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdProc/__init__.py b/pxr/usd/usdProc/__init__.py
index f18c7c0369..6758dd3cc1 100644
--- a/pxr/usd/usdProc/__init__.py
+++ b/pxr/usd/usdProc/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdProc/api.h b/pxr/usd/usdProc/api.h
index bd6f224995..c32030a778 100644
--- a/pxr/usd/usdProc/api.h
+++ b/pxr/usd/usdProc/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPROC_API_H
 #define USDPROC_API_H
diff --git a/pxr/usd/usdProc/generativeProcedural.cpp b/pxr/usd/usdProc/generativeProcedural.cpp
index d4b62f14c1..92eb48e568 100644
--- a/pxr/usd/usdProc/generativeProcedural.cpp
+++ b/pxr/usd/usdProc/generativeProcedural.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdProc/generativeProcedural.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdProc/generativeProcedural.h b/pxr/usd/usdProc/generativeProcedural.h
index 246ac90bf9..912104ad0d 100644
--- a/pxr/usd/usdProc/generativeProcedural.h
+++ b/pxr/usd/usdProc/generativeProcedural.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPROC_GENERATED_GENERATIVEPROCEDURAL_H
 #define USDPROC_GENERATED_GENERATIVEPROCEDURAL_H
diff --git a/pxr/usd/usdProc/module.cpp b/pxr/usd/usdProc/module.cpp
index c4ffc61956..60917ac2cb 100644
--- a/pxr/usd/usdProc/module.cpp
+++ b/pxr/usd/usdProc/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdProc/moduleDeps.cpp b/pxr/usd/usdProc/moduleDeps.cpp
index 3b15c20d95..4dfd2ef278 100644
--- a/pxr/usd/usdProc/moduleDeps.cpp
+++ b/pxr/usd/usdProc/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdProc/pch.h b/pxr/usd/usdProc/pch.h
index f40455a1ca..f8e8af37dd 100644
--- a/pxr/usd/usdProc/pch.h
+++ b/pxr/usd/usdProc/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,9 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-
+#include <Windows.h>
+#include <intrin.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -56,7 +42,6 @@
 #include <float.h>
 #include <functional>
 #include <initializer_list>
-#include <intrin.h>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -65,9 +50,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -76,58 +61,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -148,25 +90,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -174,6 +100,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdProc/tokens.cpp b/pxr/usd/usdProc/tokens.cpp
index 171ee6211b..15995b159b 100644
--- a/pxr/usd/usdProc/tokens.cpp
+++ b/pxr/usd/usdProc/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdProc/tokens.h"
 
diff --git a/pxr/usd/usdProc/tokens.h b/pxr/usd/usdProc/tokens.h
index 97e15d61bf..f06ce409e3 100644
--- a/pxr/usd/usdProc/tokens.h
+++ b/pxr/usd/usdProc/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDPROC_TOKENS_H
 #define USDPROC_TOKENS_H
diff --git a/pxr/usd/usdProc/wrapGenerativeProcedural.cpp b/pxr/usd/usdProc/wrapGenerativeProcedural.cpp
index be5f2de1fd..3d32eda776 100644
--- a/pxr/usd/usdProc/wrapGenerativeProcedural.cpp
+++ b/pxr/usd/usdProc/wrapGenerativeProcedural.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdProc/generativeProcedural.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdProc/wrapTokens.cpp b/pxr/usd/usdProc/wrapTokens.cpp
index 68816f7955..8e51b7a072 100644
--- a/pxr/usd/usdProc/wrapTokens.cpp
+++ b/pxr/usd/usdProc/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdRender/__init__.py b/pxr/usd/usdRender/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/usdRender/__init__.py
+++ b/pxr/usd/usdRender/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdRender/api.h b/pxr/usd/usdRender/api.h
index 90b962dd08..479fdae09b 100644
--- a/pxr/usd/usdRender/api.h
+++ b/pxr/usd/usdRender/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRENDER_API_H
 #define USDRENDER_API_H
diff --git a/pxr/usd/usdRender/denoisePass.cpp b/pxr/usd/usdRender/denoisePass.cpp
index 62de6fa579..652af858e9 100644
--- a/pxr/usd/usdRender/denoisePass.cpp
+++ b/pxr/usd/usdRender/denoisePass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/denoisePass.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRender/denoisePass.h b/pxr/usd/usdRender/denoisePass.h
index 3c140d90c1..26cde762c5 100644
--- a/pxr/usd/usdRender/denoisePass.h
+++ b/pxr/usd/usdRender/denoisePass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRENDER_GENERATED_DENOISEPASS_H
 #define USDRENDER_GENERATED_DENOISEPASS_H
diff --git a/pxr/usd/usdRender/generatedSchema.usda b/pxr/usd/usdRender/generatedSchema.usda
index fbf3a671bc..781b67b7e9 100644
--- a/pxr/usd/usdRender/generatedSchema.usda
+++ b/pxr/usd/usdRender/generatedSchema.usda
@@ -375,11 +375,18 @@ class RenderProduct "RenderProduct" (
         filesystem or other storage, in the desired location."""
     )
     uniform token productType = "raster" (
-        doc = '''The type of output to produce.
-        The default, "raster", indicates a 2D image.
-
-        \\note In the future, UsdRender may define additional product
-        types.'''
+        allowedTokens = ["raster", "deepRaster"]
+        doc = """The type of output to produce; allowed values are ones most 
+        renderers should be able to support.
+        Renderers that support custom output types are encouraged to supply an 
+        applied API schema that will add an `token myRenderContext:productType`
+        attribute (e.g. `token ri:productType`), which will override this
+        attribute's value for that renderer. 
+
+        - \"raster\": This is the default type and indicates a 2D raster image of
+          pixels.
+        - \"deepRaster\": Indicates a deep image that contains multiple samples
+          per pixel at varying depths."""
     )
     uniform int2 resolution = (2048, 1080) (
         doc = """The image pixel resolution, corresponding to the
@@ -388,26 +395,36 @@ class RenderProduct "RenderProduct" (
 }
 
 class RenderPass "RenderPass" (
-    apiSchemas = ["CollectionAPI:renderVisibility"]
+    apiSchemas = ["CollectionAPI:renderVisibility", "CollectionAPI:prune"]
     customData = {
         token[] apiSchemaOverridePropertyNames = ["collection:renderVisibility:includeRoot"]
     }
-    doc = """A RenderPass prim encapsulates the necessary information
-    to generate multipass renders.  It houses properties for generating
-    dependencies and the necessary commands to run to generate renders, as 
-    well as visibility controls for the scene.  While RenderSettings
-    describes the information needed to generate images from a single 
-    invocation of a renderer, RenderPass describes the additional information
-    needed to generate a time varying set of images.
+    doc = """A RenderPass prim encapsulates necessary information
+    to generate multi-pass renders.  In a multi-pass render, multiple
+    invocations (\"passes\") of the rendering process are used to
+    generate products using potentially distinct configurations of the
+    stage and renderer.
+
+    UsdRenderPass houses properties for generating dependencies and
+    the necessary commands to run to generate renders, as well as
+    visibility and pruning controls for the scene.
+
+    Whereas UsdRenderSettings describes information about the rendering
+    process itself (such as path-tracing parameters), UsdRenderPass
+    describes information to configure the scene contents and to
+    invoke the renderer as part of a render job that produces a
+    time-varying sequence of images.
 
     There are two consumers of RenderPass prims - a runtime executable that
     generates images from usdRender prims, and pipeline specific code that
     translates between usdRender prims and the pipeline's resource scheduling
     software.  We'll refer to the latter as 'job submission code'.
 
+    The name of the prim is used as the pass's name.
+
     \\anchor usdRender_renderVisibility
-    The objects that are relevant to the render is specified via the 
-    renderVisibility collection (UsdCollectionAPI) and can be accessed via 
+    The set of objects visible in the render is specified via the 
+    renderVisibility collection (UsdCollectionAPI), which can be accessed via 
     GetRenderVisibilityCollectionAPI(). This collection has includeRoot set to 
     true so that all objects participate in the render by default. To render 
     only a specific set of objects, there are two options. One is to modify the 
@@ -416,7 +433,35 @@ class RenderPass "RenderPass" (
     false and explicitly include the desired objects. These are complementary 
     approaches that may each be preferable depending on the scenario.
 
-    The name of the prim is used as the pass's name.
+    In addition, UsdCollectionAPI offers a membershipExpression attribute
+    providing a pattern-based description of the collection.  To use
+    membershipExpression, includeRoot should be overridden to false.
+
+    Note that prims for which UsdGeomImageable::ComputeEffectiveVisibility()
+    returns \"invisible\" cannot be overridden back to a visible state
+    via renderVisibility.  Conceptually, render passes may be used to
+    partition scene contents across multiple images rendered from the
+    scene; they are not intended to restore parts of the scene that
+    had been marked invisible.
+
+    In addition, renderVisibility only applies to renderable contents
+    of the scene itself, such as geometry and lights; it does not apply
+    to objects associated with the render settings, such as image
+    post-processing filters, even when UsdGeomVisibilityAPI may apply.
+
+    \\anchor usdRender_pruning
+    The prune collection specifies a collection of objects to be removed
+    (\"pruned\") from the scene prior to rendering.  Whereas visibility
+    may be implemented by the renderer as a lightweight attribute
+    that is relatively cheap to toggle during interactive workflows,
+    pruning entirely removes the objects from the renderer's
+    extracted representation of the scene. This can provide a greater
+    runtime cost savings for batch rendering, with the tradeoff that
+    interactively modifying the prune collection is likely to be more
+    expensive than toggling visibility. In addition, some renderers
+    may not support visibility of certain kinds of scene objects or in
+    certain conditions; in these cases, pruning offers a guaranteed way
+    to remove such objects from the scene.
     """
 )
 {
diff --git a/pxr/usd/usdRender/module.cpp b/pxr/usd/usdRender/module.cpp
index b83cd76161..a06fc1819d 100644
--- a/pxr/usd/usdRender/module.cpp
+++ b/pxr/usd/usdRender/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdRender/moduleDeps.cpp b/pxr/usd/usdRender/moduleDeps.cpp
index 4a4351780a..ed3794a647 100644
--- a/pxr/usd/usdRender/moduleDeps.cpp
+++ b/pxr/usd/usdRender/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdRender/pass.cpp b/pxr/usd/usdRender/pass.cpp
index fad7e5db88..3f9ecef158 100644
--- a/pxr/usd/usdRender/pass.cpp
+++ b/pxr/usd/usdRender/pass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/pass.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRender/pass.h b/pxr/usd/usdRender/pass.h
index 0d28cdc388..e56a829066 100644
--- a/pxr/usd/usdRender/pass.h
+++ b/pxr/usd/usdRender/pass.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRENDER_GENERATED_PASS_H
 #define USDRENDER_GENERATED_PASS_H
@@ -54,22 +37,32 @@ class SdfAssetPath;
 
 /// \class UsdRenderPass
 ///
-/// A RenderPass prim encapsulates the necessary information
-/// to generate multipass renders.  It houses properties for generating
-/// dependencies and the necessary commands to run to generate renders, as 
-/// well as visibility controls for the scene.  While RenderSettings
-/// describes the information needed to generate images from a single 
-/// invocation of a renderer, RenderPass describes the additional information
-/// needed to generate a time varying set of images.
+/// A RenderPass prim encapsulates necessary information
+/// to generate multi-pass renders.  In a multi-pass render, multiple
+/// invocations ("passes") of the rendering process are used to
+/// generate products using potentially distinct configurations of the
+/// stage and renderer.
+/// 
+/// UsdRenderPass houses properties for generating dependencies and
+/// the necessary commands to run to generate renders, as well as
+/// visibility and pruning controls for the scene.
+/// 
+/// Whereas UsdRenderSettings describes information about the rendering
+/// process itself (such as path-tracing parameters), UsdRenderPass
+/// describes information to configure the scene contents and to
+/// invoke the renderer as part of a render job that produces a
+/// time-varying sequence of images.
 /// 
 /// There are two consumers of RenderPass prims - a runtime executable that
 /// generates images from usdRender prims, and pipeline specific code that
 /// translates between usdRender prims and the pipeline's resource scheduling
 /// software.  We'll refer to the latter as 'job submission code'.
 /// 
+/// The name of the prim is used as the pass's name.
+/// 
 /// \anchor usdRender_renderVisibility
-/// The objects that are relevant to the render is specified via the 
-/// renderVisibility collection (UsdCollectionAPI) and can be accessed via 
+/// The set of objects visible in the render is specified via the 
+/// renderVisibility collection (UsdCollectionAPI), which can be accessed via 
 /// GetRenderVisibilityCollectionAPI(). This collection has includeRoot set to 
 /// true so that all objects participate in the render by default. To render 
 /// only a specific set of objects, there are two options. One is to modify the 
@@ -78,7 +71,35 @@ class SdfAssetPath;
 /// false and explicitly include the desired objects. These are complementary 
 /// approaches that may each be preferable depending on the scenario.
 /// 
-/// The name of the prim is used as the pass's name.
+/// In addition, UsdCollectionAPI offers a membershipExpression attribute
+/// providing a pattern-based description of the collection.  To use
+/// membershipExpression, includeRoot should be overridden to false.
+/// 
+/// Note that prims for which UsdGeomImageable::ComputeEffectiveVisibility()
+/// returns "invisible" cannot be overridden back to a visible state
+/// via renderVisibility.  Conceptually, render passes may be used to
+/// partition scene contents across multiple images rendered from the
+/// scene; they are not intended to restore parts of the scene that
+/// had been marked invisible.
+/// 
+/// In addition, renderVisibility only applies to renderable contents
+/// of the scene itself, such as geometry and lights; it does not apply
+/// to objects associated with the render settings, such as image
+/// post-processing filters, even when UsdGeomVisibilityAPI may apply.
+/// 
+/// \anchor usdRender_pruning
+/// The prune collection specifies a collection of objects to be removed
+/// ("pruned") from the scene prior to rendering.  Whereas visibility
+/// may be implemented by the renderer as a lightweight attribute
+/// that is relatively cheap to toggle during interactive workflows,
+/// pruning entirely removes the objects from the renderer's
+/// extracted representation of the scene. This can provide a greater
+/// runtime cost savings for batch rendering, with the tradeoff that
+/// interactively modifying the prune collection is likely to be more
+/// expensive than toggling visibility. In addition, some renderers
+/// may not support visibility of certain kinds of scene objects or in
+/// certain conditions; in these cases, pruning offers a guaranteed way
+/// to remove such objects from the scene.
 /// 
 ///
 /// For any described attribute \em Fallback \em Value or \em Allowed \em Values below
diff --git a/pxr/usd/usdRender/pch.h b/pxr/usd/usdRender/pch.h
index 7802ec3e2d..af51fc4fd6 100644
--- a/pxr/usd/usdRender/pch.h
+++ b/pxr/usd/usdRender/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,12 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -67,8 +51,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,60 +62,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -151,27 +91,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -179,7 +101,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdRender/product.cpp b/pxr/usd/usdRender/product.cpp
index 3477a856cc..357327cbc8 100644
--- a/pxr/usd/usdRender/product.cpp
+++ b/pxr/usd/usdRender/product.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/product.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRender/product.h b/pxr/usd/usdRender/product.h
index 9b9ef9c3ce..841e3eba31 100644
--- a/pxr/usd/usdRender/product.h
+++ b/pxr/usd/usdRender/product.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRENDER_GENERATED_PRODUCT_H
 #define USDRENDER_GENERATED_PRODUCT_H
@@ -168,11 +151,17 @@ class UsdRenderProduct : public UsdRenderSettingsBase
     // --------------------------------------------------------------------- //
     // PRODUCTTYPE 
     // --------------------------------------------------------------------- //
-    /// The type of output to produce.
-    /// The default, "raster", indicates a 2D image.
+    /// The type of output to produce; allowed values are ones most 
+    /// renderers should be able to support.
+    /// Renderers that support custom output types are encouraged to supply an 
+    /// applied API schema that will add an `token myRenderContext:productType`
+    /// attribute (e.g. `token ri:productType`), which will override this
+    /// attribute's value for that renderer. 
     /// 
-    /// \note In the future, UsdRender may define additional product
-    /// types.
+    /// - "raster": This is the default type and indicates a 2D raster image of
+    /// pixels.
+    /// - "deepRaster": Indicates a deep image that contains multiple samples
+    /// per pixel at varying depths.
     ///
     /// | ||
     /// | -- | -- |
@@ -180,6 +169,7 @@ class UsdRenderProduct : public UsdRenderSettingsBase
     /// | C++ Type | TfToken |
     /// | \ref Usd_Datatypes "Usd Type" | SdfValueTypeNames->Token |
     /// | \ref SdfVariability "Variability" | SdfVariabilityUniform |
+    /// | \ref UsdRenderTokens "Allowed Values" | raster, deepRaster |
     USDRENDER_API
     UsdAttribute GetProductTypeAttr() const;
 
diff --git a/pxr/usd/usdRender/schema.usda b/pxr/usd/usdRender/schema.usda
index 37428cfb30..7f0fddfa55 100644
--- a/pxr/usd/usdRender/schema.usda
+++ b/pxr/usd/usdRender/schema.usda
@@ -229,20 +229,21 @@ class RenderProduct "RenderProduct" (
     """
     customData = {
          string className = "Product"
-         dictionary schemaTokens = {
-            dictionary raster = {
-                string doc = """RenderProduct productType value that
-                indicates a 2D raster image of pixels."""
-            }
-         }
     }
 ) {
     uniform token productType = "raster" (
-        doc = """The type of output to produce.
-        The default, "raster", indicates a 2D image.
+        allowedTokens = ["raster", "deepRaster"]
+        doc = """The type of output to produce; allowed values are ones most 
+        renderers should be able to support.
+        Renderers that support custom output types are encouraged to supply an 
+        applied API schema that will add an `token myRenderContext:productType`
+        attribute (e.g. `token ri:productType`), which will override this
+        attribute's value for that renderer. 
 
-        \\note In the future, UsdRender may define additional product
-        types."""
+        - "raster": This is the default type and indicates a 2D raster image of
+          pixels.
+        - "deepRaster": Indicates a deep image that contains multiple samples
+          per pixel at varying depths."""
     )
     token productName = "" (
         doc = """Specifies the name that the output/display driver
@@ -261,22 +262,32 @@ class RenderProduct "RenderProduct" (
 
 class RenderPass "RenderPass" (
     inherits = </Typed>
-    doc = """A RenderPass prim encapsulates the necessary information
-    to generate multipass renders.  It houses properties for generating
-    dependencies and the necessary commands to run to generate renders, as 
-    well as visibility controls for the scene.  While RenderSettings
-    describes the information needed to generate images from a single 
-    invocation of a renderer, RenderPass describes the additional information
-    needed to generate a time varying set of images.
+    doc = """A RenderPass prim encapsulates necessary information
+    to generate multi-pass renders.  In a multi-pass render, multiple
+    invocations ("passes") of the rendering process are used to
+    generate products using potentially distinct configurations of the
+    stage and renderer.
+
+    UsdRenderPass houses properties for generating dependencies and
+    the necessary commands to run to generate renders, as well as
+    visibility and pruning controls for the scene.
+
+    Whereas UsdRenderSettings describes information about the rendering
+    process itself (such as path-tracing parameters), UsdRenderPass
+    describes information to configure the scene contents and to
+    invoke the renderer as part of a render job that produces a
+    time-varying sequence of images.
 
     There are two consumers of RenderPass prims - a runtime executable that
     generates images from usdRender prims, and pipeline specific code that
     translates between usdRender prims and the pipeline's resource scheduling
     software.  We'll refer to the latter as 'job submission code'.
 
+    The name of the prim is used as the pass's name.
+
     \\anchor usdRender_renderVisibility
-    The objects that are relevant to the render is specified via the 
-    renderVisibility collection (UsdCollectionAPI) and can be accessed via 
+    The set of objects visible in the render is specified via the 
+    renderVisibility collection (UsdCollectionAPI), which can be accessed via 
     GetRenderVisibilityCollectionAPI(). This collection has includeRoot set to 
     true so that all objects participate in the render by default. To render 
     only a specific set of objects, there are two options. One is to modify the 
@@ -285,14 +296,42 @@ class RenderPass "RenderPass" (
     false and explicitly include the desired objects. These are complementary 
     approaches that may each be preferable depending on the scenario.
 
-    The name of the prim is used as the pass's name.
+    In addition, UsdCollectionAPI offers a membershipExpression attribute
+    providing a pattern-based description of the collection.  To use
+    membershipExpression, includeRoot should be overridden to false.
+
+    Note that prims for which UsdGeomImageable::ComputeEffectiveVisibility()
+    returns "invisible" cannot be overridden back to a visible state
+    via renderVisibility.  Conceptually, render passes may be used to
+    partition scene contents across multiple images rendered from the
+    scene; they are not intended to restore parts of the scene that
+    had been marked invisible.
+
+    In addition, renderVisibility only applies to renderable contents
+    of the scene itself, such as geometry and lights; it does not apply
+    to objects associated with the render settings, such as image
+    post-processing filters, even when UsdGeomVisibilityAPI may apply.
+
+    \\anchor usdRender_pruning
+    The prune collection specifies a collection of objects to be removed
+    ("pruned") from the scene prior to rendering.  Whereas visibility
+    may be implemented by the renderer as a lightweight attribute
+    that is relatively cheap to toggle during interactive workflows,
+    pruning entirely removes the objects from the renderer's
+    extracted representation of the scene. This can provide a greater
+    runtime cost savings for batch rendering, with the tradeoff that
+    interactively modifying the prune collection is likely to be more
+    expensive than toggling visibility. In addition, some renderers
+    may not support visibility of certain kinds of scene objects or in
+    certain conditions; in these cases, pruning offers a guaranteed way
+    to remove such objects from the scene.
     """
     customData = {
          string className = "Pass"
          string extraIncludes = """
 #include "pxr/usd/usd/collectionAPI.h" """
     }
-    prepend apiSchemas = ["CollectionAPI:renderVisibility"]
+    prepend apiSchemas = ["CollectionAPI:renderVisibility", "CollectionAPI:prune"]
 ) {
     uniform token passType (
         doc = """A string used to categorize differently structured 
diff --git a/pxr/usd/usdRender/settings.cpp b/pxr/usd/usdRender/settings.cpp
index 449f86ae76..473887ee8a 100644
--- a/pxr/usd/usdRender/settings.cpp
+++ b/pxr/usd/usdRender/settings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/settings.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRender/settings.h b/pxr/usd/usdRender/settings.h
index a361f8868b..a05f375fad 100644
--- a/pxr/usd/usdRender/settings.h
+++ b/pxr/usd/usdRender/settings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRENDER_GENERATED_SETTINGS_H
 #define USDRENDER_GENERATED_SETTINGS_H
diff --git a/pxr/usd/usdRender/settingsBase.cpp b/pxr/usd/usdRender/settingsBase.cpp
index 6ba677c039..7edbab61bb 100644
--- a/pxr/usd/usdRender/settingsBase.cpp
+++ b/pxr/usd/usdRender/settingsBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/settingsBase.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRender/settingsBase.h b/pxr/usd/usdRender/settingsBase.h
index 82b40e2e7a..883651523d 100644
--- a/pxr/usd/usdRender/settingsBase.h
+++ b/pxr/usd/usdRender/settingsBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRENDER_GENERATED_SETTINGSBASE_H
 #define USDRENDER_GENERATED_SETTINGSBASE_H
diff --git a/pxr/usd/usdRender/spec.cpp b/pxr/usd/usdRender/spec.cpp
index a3e72bbafe..11b1e3adca 100644
--- a/pxr/usd/usdRender/spec.cpp
+++ b/pxr/usd/usdRender/spec.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/spec.h"
 #include "pxr/usd/usdRender/settings.h"
diff --git a/pxr/usd/usdRender/spec.h b/pxr/usd/usdRender/spec.h
index 2fbc7d73e2..48bf554380 100644
--- a/pxr/usd/usdRender/spec.h
+++ b/pxr/usd/usdRender/spec.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_RENDER_SPEC_H
 #define PXR_USD_USD_RENDER_SPEC_H
diff --git a/pxr/usd/usdRender/tokens.cpp b/pxr/usd/usdRender/tokens.cpp
index 7a41b4b9b2..c6d9b3b286 100644
--- a/pxr/usd/usdRender/tokens.cpp
+++ b/pxr/usd/usdRender/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/tokens.h"
 
@@ -37,6 +20,7 @@ UsdRenderTokensType::UsdRenderTokensType() :
     cropAperture("cropAperture", TfToken::Immortal),
     dataType("dataType", TfToken::Immortal),
     dataWindowNDC("dataWindowNDC", TfToken::Immortal),
+    deepRaster("deepRaster", TfToken::Immortal),
     denoiseEnable("denoise:enable", TfToken::Immortal),
     denoisePass("denoise:pass", TfToken::Immortal),
     disableDepthOfField("disableDepthOfField", TfToken::Immortal),
@@ -85,6 +69,7 @@ UsdRenderTokensType::UsdRenderTokensType() :
         cropAperture,
         dataType,
         dataWindowNDC,
+        deepRaster,
         denoiseEnable,
         denoisePass,
         disableDepthOfField,
diff --git a/pxr/usd/usdRender/tokens.h b/pxr/usd/usdRender/tokens.h
index 0b59575707..86994164ab 100644
--- a/pxr/usd/usdRender/tokens.h
+++ b/pxr/usd/usdRender/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRENDER_TOKENS_H
 #define USDRENDER_TOKENS_H
@@ -106,6 +89,10 @@ struct UsdRenderTokensType {
     /// 
     /// UsdRenderSettingsBase
     const TfToken dataWindowNDC;
+    /// \brief "deepRaster"
+    /// 
+    /// Possible value for UsdRenderProduct::GetProductTypeAttr()
+    const TfToken deepRaster;
     /// \brief "denoise:enable"
     /// 
     /// UsdRenderPass
@@ -192,7 +179,7 @@ struct UsdRenderTokensType {
     const TfToken productType;
     /// \brief "raster"
     /// 
-    /// Fallback value for UsdRenderProduct::GetProductTypeAttr(), RenderProduct productType value that indicates a 2D raster image of pixels.
+    /// Fallback value for UsdRenderProduct::GetProductTypeAttr()
     const TfToken raster;
     /// \brief "raw"
     /// 
diff --git a/pxr/usd/usdRender/var.cpp b/pxr/usd/usdRender/var.cpp
index c12d4c3798..eaabed9503 100644
--- a/pxr/usd/usdRender/var.cpp
+++ b/pxr/usd/usdRender/var.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/var.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRender/var.h b/pxr/usd/usdRender/var.h
index 8f700cf4ec..847ce4a8da 100644
--- a/pxr/usd/usdRender/var.h
+++ b/pxr/usd/usdRender/var.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRENDER_GENERATED_VAR_H
 #define USDRENDER_GENERATED_VAR_H
diff --git a/pxr/usd/usdRender/wrapDenoisePass.cpp b/pxr/usd/usdRender/wrapDenoisePass.cpp
index 4dc6294017..bbee508165 100644
--- a/pxr/usd/usdRender/wrapDenoisePass.cpp
+++ b/pxr/usd/usdRender/wrapDenoisePass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/denoisePass.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRender/wrapPass.cpp b/pxr/usd/usdRender/wrapPass.cpp
index 49b431a4dd..8ae83beff5 100644
--- a/pxr/usd/usdRender/wrapPass.cpp
+++ b/pxr/usd/usdRender/wrapPass.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/pass.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRender/wrapProduct.cpp b/pxr/usd/usdRender/wrapProduct.cpp
index 119bb0487d..bb33cb3bf8 100644
--- a/pxr/usd/usdRender/wrapProduct.cpp
+++ b/pxr/usd/usdRender/wrapProduct.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/product.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRender/wrapSettings.cpp b/pxr/usd/usdRender/wrapSettings.cpp
index d4d86d712f..2ccda3ff97 100644
--- a/pxr/usd/usdRender/wrapSettings.cpp
+++ b/pxr/usd/usdRender/wrapSettings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/settings.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRender/wrapSettingsBase.cpp b/pxr/usd/usdRender/wrapSettingsBase.cpp
index f1c1b93af7..81fe107ae6 100644
--- a/pxr/usd/usdRender/wrapSettingsBase.cpp
+++ b/pxr/usd/usdRender/wrapSettingsBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/settingsBase.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRender/wrapTokens.cpp b/pxr/usd/usdRender/wrapTokens.cpp
index 2cd4d730be..fa7cda3889 100644
--- a/pxr/usd/usdRender/wrapTokens.cpp
+++ b/pxr/usd/usdRender/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
@@ -75,6 +58,7 @@ void wrapUsdRenderTokens()
     _AddToken(cls, "cropAperture", UsdRenderTokens->cropAperture);
     _AddToken(cls, "dataType", UsdRenderTokens->dataType);
     _AddToken(cls, "dataWindowNDC", UsdRenderTokens->dataWindowNDC);
+    _AddToken(cls, "deepRaster", UsdRenderTokens->deepRaster);
     _AddToken(cls, "denoiseEnable", UsdRenderTokens->denoiseEnable);
     _AddToken(cls, "denoisePass", UsdRenderTokens->denoisePass);
     _AddToken(cls, "disableDepthOfField", UsdRenderTokens->disableDepthOfField);
diff --git a/pxr/usd/usdRender/wrapVar.cpp b/pxr/usd/usdRender/wrapVar.cpp
index 38fed1bdad..b4fb5a8668 100644
--- a/pxr/usd/usdRender/wrapVar.cpp
+++ b/pxr/usd/usdRender/wrapVar.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRender/var.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRi/__init__.py b/pxr/usd/usdRi/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/usdRi/__init__.py
+++ b/pxr/usd/usdRi/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdRi/api.h b/pxr/usd/usdRi/api.h
index 1908d742d9..4fe90d1c15 100644
--- a/pxr/usd/usdRi/api.h
+++ b/pxr/usd/usdRi/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRI_API_H
 #define USDRI_API_H
diff --git a/pxr/usd/usdRi/materialAPI.cpp b/pxr/usd/usdRi/materialAPI.cpp
index 6876fca0c3..8cd2287ecf 100644
--- a/pxr/usd/usdRi/materialAPI.cpp
+++ b/pxr/usd/usdRi/materialAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/materialAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRi/materialAPI.h b/pxr/usd/usdRi/materialAPI.h
index d7c4eca6ff..2d9c15e31c 100644
--- a/pxr/usd/usdRi/materialAPI.h
+++ b/pxr/usd/usdRi/materialAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRI_GENERATED_MATERIALAPI_H
 #define USDRI_GENERATED_MATERIALAPI_H
diff --git a/pxr/usd/usdRi/module.cpp b/pxr/usd/usdRi/module.cpp
index 21377d484f..51a177cd75 100644
--- a/pxr/usd/usdRi/module.cpp
+++ b/pxr/usd/usdRi/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdRi/moduleDeps.cpp b/pxr/usd/usdRi/moduleDeps.cpp
index 901e2f7f9e..8c6f4d8c3a 100644
--- a/pxr/usd/usdRi/moduleDeps.cpp
+++ b/pxr/usd/usdRi/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdRi/pch.h b/pxr/usd/usdRi/pch.h
index 905d2a1236..2c939b9801 100644
--- a/pxr/usd/usdRi/pch.h
+++ b/pxr/usd/usdRi/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -67,8 +50,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,60 +61,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -144,6 +83,7 @@
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
+#include <boost/python/operators.hpp>
 #include <boost/python/return_by_value.hpp>
 #include <boost/python/return_value_policy.hpp>
 #include <boost/python/to_python_converter.hpp>
@@ -154,27 +94,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -182,7 +104,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdRi/renderPassAPI.cpp b/pxr/usd/usdRi/renderPassAPI.cpp
index df29b107f6..c657623cf8 100644
--- a/pxr/usd/usdRi/renderPassAPI.cpp
+++ b/pxr/usd/usdRi/renderPassAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/renderPassAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRi/renderPassAPI.h b/pxr/usd/usdRi/renderPassAPI.h
index 1ab45741f8..db2ccf1af1 100644
--- a/pxr/usd/usdRi/renderPassAPI.h
+++ b/pxr/usd/usdRi/renderPassAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRI_GENERATED_RENDERPASSAPI_H
 #define USDRI_GENERATED_RENDERPASSAPI_H
diff --git a/pxr/usd/usdRi/rmanUtilities.cpp b/pxr/usd/usdRi/rmanUtilities.cpp
index b757e6cf29..77993dfb10 100644
--- a/pxr/usd/usdRi/rmanUtilities.cpp
+++ b/pxr/usd/usdRi/rmanUtilities.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdRi/rmanUtilities.h"
diff --git a/pxr/usd/usdRi/rmanUtilities.h b/pxr/usd/usdRi/rmanUtilities.h
index c453323f9f..a7abd2cf67 100644
--- a/pxr/usd/usdRi/rmanUtilities.h
+++ b/pxr/usd/usdRi/rmanUtilities.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_RI_RMAN_UTILITIES_H
 #define PXR_USD_USD_RI_RMAN_UTILITIES_H
diff --git a/pxr/usd/usdRi/splineAPI.cpp b/pxr/usd/usdRi/splineAPI.cpp
index d01f03e760..99c707779d 100644
--- a/pxr/usd/usdRi/splineAPI.cpp
+++ b/pxr/usd/usdRi/splineAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/splineAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRi/splineAPI.h b/pxr/usd/usdRi/splineAPI.h
index 3ec3bfbb36..4ebcbf649f 100644
--- a/pxr/usd/usdRi/splineAPI.h
+++ b/pxr/usd/usdRi/splineAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRI_GENERATED_SPLINEAPI_H
 #define USDRI_GENERATED_SPLINEAPI_H
diff --git a/pxr/usd/usdRi/statementsAPI.cpp b/pxr/usd/usdRi/statementsAPI.cpp
index 7e6c793e36..473c817f11 100644
--- a/pxr/usd/usdRi/statementsAPI.cpp
+++ b/pxr/usd/usdRi/statementsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/statementsAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdRi/statementsAPI.h b/pxr/usd/usdRi/statementsAPI.h
index 4517c85783..1bf32276fe 100644
--- a/pxr/usd/usdRi/statementsAPI.h
+++ b/pxr/usd/usdRi/statementsAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRI_GENERATED_STATEMENTSAPI_H
 #define USDRI_GENERATED_STATEMENTSAPI_H
diff --git a/pxr/usd/usdRi/testenv/testUsdRiSchemata.py b/pxr/usd/usdRi/testenv/testUsdRiSchemata.py
index a3cb6010b7..def694971c 100644
--- a/pxr/usd/usdRi/testenv/testUsdRiSchemata.py
+++ b/pxr/usd/usdRi/testenv/testUsdRiSchemata.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usd/usdRi/testenv/testUsdRiSplineAPI.py b/pxr/usd/usdRi/testenv/testUsdRiSplineAPI.py
index 1f3b559319..da9ad3f402 100644
--- a/pxr/usd/usdRi/testenv/testUsdRiSplineAPI.py
+++ b/pxr/usd/usdRi/testenv/testUsdRiSplineAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Sdf, Usd, UsdLux, UsdRi
diff --git a/pxr/usd/usdRi/testenv/testUsdRiUtilities.py b/pxr/usd/usdRi/testenv/testUsdRiUtilities.py
index 6209a0b8ab..1ecbe1ebfa 100644
--- a/pxr/usd/usdRi/testenv/testUsdRiUtilities.py
+++ b/pxr/usd/usdRi/testenv/testUsdRiUtilities.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import unittest
diff --git a/pxr/usd/usdRi/tokens.cpp b/pxr/usd/usdRi/tokens.cpp
index b412c90ae2..03d036a920 100644
--- a/pxr/usd/usdRi/tokens.cpp
+++ b/pxr/usd/usdRi/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/tokens.h"
 
diff --git a/pxr/usd/usdRi/tokens.h b/pxr/usd/usdRi/tokens.h
index 1d083dd27f..dbfb2d2529 100644
--- a/pxr/usd/usdRi/tokens.h
+++ b/pxr/usd/usdRi/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDRI_TOKENS_H
 #define USDRI_TOKENS_H
diff --git a/pxr/usd/usdRi/typeUtils.cpp b/pxr/usd/usdRi/typeUtils.cpp
index 164467cd4c..fd870fa963 100644
--- a/pxr/usd/usdRi/typeUtils.cpp
+++ b/pxr/usd/usdRi/typeUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "typeUtils.h"
diff --git a/pxr/usd/usdRi/typeUtils.h b/pxr/usd/usdRi/typeUtils.h
index c1352dff57..a4f1239a22 100644
--- a/pxr/usd/usdRi/typeUtils.h
+++ b/pxr/usd/usdRi/typeUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_RI_TYPE_UTILS_H
 #define PXR_USD_USD_RI_TYPE_UTILS_H
diff --git a/pxr/usd/usdRi/wrapMaterialAPI.cpp b/pxr/usd/usdRi/wrapMaterialAPI.cpp
index ed3acdad69..efc8c1e20f 100644
--- a/pxr/usd/usdRi/wrapMaterialAPI.cpp
+++ b/pxr/usd/usdRi/wrapMaterialAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/materialAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRi/wrapRenderPassAPI.cpp b/pxr/usd/usdRi/wrapRenderPassAPI.cpp
index d1f1786ffb..4d47460359 100644
--- a/pxr/usd/usdRi/wrapRenderPassAPI.cpp
+++ b/pxr/usd/usdRi/wrapRenderPassAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/renderPassAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRi/wrapRmanUtilities.cpp b/pxr/usd/usdRi/wrapRmanUtilities.cpp
index dd928393ac..159b974ecf 100644
--- a/pxr/usd/usdRi/wrapRmanUtilities.cpp
+++ b/pxr/usd/usdRi/wrapRmanUtilities.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdRi/wrapSplineAPI.cpp b/pxr/usd/usdRi/wrapSplineAPI.cpp
index 9541e19027..e7566214c8 100644
--- a/pxr/usd/usdRi/wrapSplineAPI.cpp
+++ b/pxr/usd/usdRi/wrapSplineAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/splineAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRi/wrapStatementsAPI.cpp b/pxr/usd/usdRi/wrapStatementsAPI.cpp
index 0f7ebc5bf5..2edf264820 100644
--- a/pxr/usd/usdRi/wrapStatementsAPI.cpp
+++ b/pxr/usd/usdRi/wrapStatementsAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdRi/statementsAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdRi/wrapTokens.cpp b/pxr/usd/usdRi/wrapTokens.cpp
index f5afcab2f5..20f82a9977 100644
--- a/pxr/usd/usdRi/wrapTokens.cpp
+++ b/pxr/usd/usdRi/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdShade/CMakeLists.txt b/pxr/usd/usdShade/CMakeLists.txt
index 9c714f0820..e389098ac2 100644
--- a/pxr/usd/usdShade/CMakeLists.txt
+++ b/pxr/usd/usdShade/CMakeLists.txt
@@ -11,6 +11,10 @@ pxr_library(usdShade
         sdr
         usd
         usdGeom
+        ${TBB_tbb_LIBRARY}
+    
+    INCLUDE_DIRS
+        ${TBB_INCLUDE_DIRS}
 
     PUBLIC_CLASSES
         connectableAPI
@@ -26,6 +30,7 @@ pxr_library(usdShade
         shaderDefUtils
         nodeGraph
         tokens
+        validatorTokens
         udimUtils
         utils
 
@@ -33,6 +38,9 @@ pxr_library(usdShade
         api.h
         types.h
 
+    CPPFILES
+        validators.cpp
+
     PYTHON_CPPFILES
         moduleDeps.cpp
 
@@ -75,6 +83,16 @@ pxr_build_test(testUsdShadeHasConnectableAPI
         testenv/testUsdShadeHasConnectableAPI.cpp
 )
 
+pxr_build_test(testUsdShadeValidators
+    LIBRARIES
+        sdr
+        tf
+        usd
+        usdShade
+    CPPFILES
+        testenv/testUsdShadeValidators.cpp
+)
+
 pxr_test_scripts(
     testenv/testUsdShadeBinding.py
     testenv/testUsdShadeConnectability.py
@@ -151,6 +169,11 @@ pxr_install_test_dir(
     DEST testUsdShadeUdimUtils
 )
 
+pxr_install_test_dir(
+    SRC testenv/testUsdShadeValidators
+    DEST testUsdShadeValidators
+)
+
 pxr_register_test(testUsdShadeBinding
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdShadeBinding"
@@ -260,3 +283,9 @@ pxr_register_test(testUsdShadeUdimUtils
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdShadeUdimUtils"
     EXPECTED_RETURN_CODE 0
 )
+
+pxr_register_test(testUsdShadeValidators
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdShadeValidators"
+    EXPECTED_RETURN_CODE 0
+)
+
diff --git a/pxr/usd/usdShade/__init__.py b/pxr/usd/usdShade/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/usdShade/__init__.py
+++ b/pxr/usd/usdShade/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdShade/api.h b/pxr/usd/usdShade/api.h
index d57ef8b3e8..640b95552c 100644
--- a/pxr/usd/usdShade/api.h
+++ b/pxr/usd/usdShade/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_API_H
 #define USDSHADE_API_H
diff --git a/pxr/usd/usdShade/connectableAPI.cpp b/pxr/usd/usdShade/connectableAPI.cpp
index d95c1da9eb..8f25664888 100644
--- a/pxr/usd/usdShade/connectableAPI.cpp
+++ b/pxr/usd/usdShade/connectableAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/connectableAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdShade/connectableAPI.h b/pxr/usd/usdShade/connectableAPI.h
index 6f024561d4..78a66644af 100644
--- a/pxr/usd/usdShade/connectableAPI.h
+++ b/pxr/usd/usdShade/connectableAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_GENERATED_CONNECTABLEAPI_H
 #define USDSHADE_GENERATED_CONNECTABLEAPI_H
diff --git a/pxr/usd/usdShade/connectableAPIBehavior.cpp b/pxr/usd/usdShade/connectableAPIBehavior.cpp
index a08bd808bb..ceaf613773 100644
--- a/pxr/usd/usdShade/connectableAPIBehavior.cpp
+++ b/pxr/usd/usdShade/connectableAPIBehavior.cpp
@@ -1,23 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdShade/connectableAPIBehavior.h b/pxr/usd/usdShade/connectableAPIBehavior.h
index ce1c3fd0db..a5e42031e5 100644
--- a/pxr/usd/usdShade/connectableAPIBehavior.h
+++ b/pxr/usd/usdShade/connectableAPIBehavior.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHADE_CONNECTABLE_BEHAVIOR_H
 #define PXR_USD_USD_SHADE_CONNECTABLE_BEHAVIOR_H
diff --git a/pxr/usd/usdShade/coordSysAPI.cpp b/pxr/usd/usdShade/coordSysAPI.cpp
index 6780de7018..1113bc83ad 100644
--- a/pxr/usd/usdShade/coordSysAPI.cpp
+++ b/pxr/usd/usdShade/coordSysAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/coordSysAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
@@ -28,8 +11,6 @@
 #include "pxr/usd/sdf/types.h"
 #include "pxr/usd/sdf/assetPath.h"
 
-#include "pxr/base/tf/staticTokens.h"
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 // Register the schema with the TfType system.
@@ -40,11 +21,6 @@ TF_REGISTRY_FUNCTION(TfType)
     
 }
 
-TF_DEFINE_PRIVATE_TOKENS(
-    _schemaTokens,
-    (coordSys)
-);
-
 /* virtual */
 UsdShadeCoordSysAPI::~UsdShadeCoordSysAPI()
 {
@@ -121,9 +97,9 @@ UsdShadeCoordSysAPI::IsCoordSysAPIPath(
     }
 
     if (tokens.size() >= 2
-        && tokens[0] == _schemaTokens->coordSys) {
+        && tokens[0] == UsdShadeTokens->coordSys) {
         *name = TfToken(propertyName.substr(
-            _schemaTokens->coordSys.GetString().size() + 1));
+           UsdShadeTokens->coordSys.GetString().size() + 1));
         return true;
     }
 
@@ -332,7 +308,7 @@ UsdShadeCoordSysAPI::GetLocalBindings() const
     }
 
     for (const UsdProperty &prop:
-         GetPrim().GetAuthoredPropertiesInNamespace(_schemaTokens->coordSys)) {
+         GetPrim().GetAuthoredPropertiesInNamespace(UsdShadeTokens->coordSys)) {
         if (UsdRelationship rel = prop.As<UsdRelationship>()) {
             targets.clear();
             if (rel.GetForwardedTargets(&targets) && !targets.empty()) {
@@ -449,7 +425,7 @@ UsdShadeCoordSysAPI::FindBindingsWithInheritance() const
     for (UsdPrim prim = GetPrim(); prim; prim = prim.GetParent()) {
         SdfPathVector targets;
         for (UsdProperty prop : prim.GetAuthoredPropertiesInNamespace(
-                    _schemaTokens->coordSys)) {
+                    UsdShadeTokens->coordSys)) {
             if (UsdRelationship rel = prop.As<UsdRelationship>()) {
                 // Check if name is already bound; skip if bound.
                 bool nameIsAlreadyBound = false;
@@ -542,7 +518,7 @@ UsdShadeCoordSysAPI::HasLocalBindings() const
     }
 
     for (const UsdProperty &prop:
-         GetPrim().GetAuthoredPropertiesInNamespace(_schemaTokens->coordSys)) {
+         GetPrim().GetAuthoredPropertiesInNamespace(UsdShadeTokens->coordSys)) {
         if (UsdRelationship rel = prop.As<UsdRelationship>()) {
             if (rel) {
                 if (checker == 2) {
@@ -711,7 +687,7 @@ UsdShadeCoordSysAPI::BlockBinding() const
 TfToken
 UsdShadeCoordSysAPI::GetCoordSysRelationshipName(const std::string &name)
 {
-    return TfToken(_schemaTokens->coordSys.GetString() + ":" + name);
+    return TfToken(UsdShadeTokens->coordSys.GetString() + ":" + name);
 }
 
 /* static */
diff --git a/pxr/usd/usdShade/coordSysAPI.h b/pxr/usd/usdShade/coordSysAPI.h
index a8b89ab013..6c35e485a4 100644
--- a/pxr/usd/usdShade/coordSysAPI.h
+++ b/pxr/usd/usdShade/coordSysAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_GENERATED_COORDSYSAPI_H
 #define USDSHADE_GENERATED_COORDSYSAPI_H
diff --git a/pxr/usd/usdShade/input.cpp b/pxr/usd/usdShade/input.cpp
index f924157204..e66ebd8ca9 100644
--- a/pxr/usd/usdShade/input.cpp
+++ b/pxr/usd/usdShade/input.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdShade/input.h"
diff --git a/pxr/usd/usdShade/input.h b/pxr/usd/usdShade/input.h
index 97a7003ecc..c41d24d05c 100644
--- a/pxr/usd/usdShade/input.h
+++ b/pxr/usd/usdShade/input.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHADE_INPUT_H
 #define PXR_USD_USD_SHADE_INPUT_H
diff --git a/pxr/usd/usdShade/material.cpp b/pxr/usd/usdShade/material.cpp
index 4bce2cbeb7..58e16fc584 100644
--- a/pxr/usd/usdShade/material.cpp
+++ b/pxr/usd/usdShade/material.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/material.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdShade/material.h b/pxr/usd/usdShade/material.h
index 1c1f750e82..502f95cc54 100644
--- a/pxr/usd/usdShade/material.h
+++ b/pxr/usd/usdShade/material.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_GENERATED_MATERIAL_H
 #define USDSHADE_GENERATED_MATERIAL_H
diff --git a/pxr/usd/usdShade/materialBindingAPI.cpp b/pxr/usd/usdShade/materialBindingAPI.cpp
index 51b331c167..cb311f0509 100644
--- a/pxr/usd/usdShade/materialBindingAPI.cpp
+++ b/pxr/usd/usdShade/materialBindingAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/materialBindingAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdShade/materialBindingAPI.h b/pxr/usd/usdShade/materialBindingAPI.h
index fa5459ca7c..2a6b54c743 100644
--- a/pxr/usd/usdShade/materialBindingAPI.h
+++ b/pxr/usd/usdShade/materialBindingAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_GENERATED_MATERIALBINDINGAPI_H
 #define USDSHADE_GENERATED_MATERIALBINDINGAPI_H
diff --git a/pxr/usd/usdShade/module.cpp b/pxr/usd/usdShade/module.cpp
index a52625a1c6..d26c4f47c9 100644
--- a/pxr/usd/usdShade/module.cpp
+++ b/pxr/usd/usdShade/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdShade/moduleDeps.cpp b/pxr/usd/usdShade/moduleDeps.cpp
index 1a5b5f3a2c..976877aee8 100644
--- a/pxr/usd/usdShade/moduleDeps.cpp
+++ b/pxr/usd/usdShade/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdShade/nodeDefAPI.cpp b/pxr/usd/usdShade/nodeDefAPI.cpp
index 043b84d708..d5264306c8 100644
--- a/pxr/usd/usdShade/nodeDefAPI.cpp
+++ b/pxr/usd/usdShade/nodeDefAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/nodeDefAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdShade/nodeDefAPI.h b/pxr/usd/usdShade/nodeDefAPI.h
index ad93c72b4b..1e87203678 100644
--- a/pxr/usd/usdShade/nodeDefAPI.h
+++ b/pxr/usd/usdShade/nodeDefAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_GENERATED_NODEDEFAPI_H
 #define USDSHADE_GENERATED_NODEDEFAPI_H
diff --git a/pxr/usd/usdShade/nodeGraph.cpp b/pxr/usd/usdShade/nodeGraph.cpp
index bdb3e0c342..cb832065c8 100644
--- a/pxr/usd/usdShade/nodeGraph.cpp
+++ b/pxr/usd/usdShade/nodeGraph.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/nodeGraph.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdShade/nodeGraph.h b/pxr/usd/usdShade/nodeGraph.h
index edfcb5907a..d7e3a493b9 100644
--- a/pxr/usd/usdShade/nodeGraph.h
+++ b/pxr/usd/usdShade/nodeGraph.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_GENERATED_NODEGRAPH_H
 #define USDSHADE_GENERATED_NODEGRAPH_H
diff --git a/pxr/usd/usdShade/output.cpp b/pxr/usd/usdShade/output.cpp
index 295f5e9711..8c9d10aa5e 100644
--- a/pxr/usd/usdShade/output.cpp
+++ b/pxr/usd/usdShade/output.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdShade/output.h"
diff --git a/pxr/usd/usdShade/output.h b/pxr/usd/usdShade/output.h
index 0d5a15d035..1146ed39fd 100644
--- a/pxr/usd/usdShade/output.h
+++ b/pxr/usd/usdShade/output.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHADE_OUTPUT_H
 #define PXR_USD_USD_SHADE_OUTPUT_H
diff --git a/pxr/usd/usdShade/pch.h b/pxr/usd/usdShade/pch.h
index 698ab0ca65..c6e0a1ba12 100644
--- a/pxr/usd/usdShade/pch.h
+++ b/pxr/usd/usdShade/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -28,9 +11,19 @@
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
 #if defined(ARCH_OS_DARWIN)
+#include <glob.h>
+#include <limits.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <unistd.h>
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <glob.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/statfs.h>
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +31,13 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <io.h>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cctype>
@@ -57,6 +51,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <deque>
+#include <fcntl.h>
 #include <float.h>
 #include <functional>
 #include <initializer_list>
@@ -70,6 +65,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,63 +74,18 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -150,6 +102,7 @@
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
 #include <boost/python/operators.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/return_internal_reference.hpp>
 #include <boost/python/scope.hpp>
 #include <boost/python/to_python_converter.hpp>
@@ -160,28 +113,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_unordered_set.h>
@@ -189,10 +123,11 @@
 #include <tbb/enumerable_thread_specific.h>
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_for_each.h>
+#include <tbb/queuing_rw_mutex.h>
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdShade/plugInfo.json b/pxr/usd/usdShade/plugInfo.json
index 5e91885371..f2377e4117 100644
--- a/pxr/usd/usdShade/plugInfo.json
+++ b/pxr/usd/usdShade/plugInfo.json
@@ -126,6 +126,17 @@
                         ], 
                         "displayName": "USD-based shader definition parser plugin"
                     }
+                }, 
+                "Validators": {
+                    "ShaderSdrCompliance": {
+                        "doc": "Shader prim's input types must be conforming to their appropriate sdf types in the respective sdr shader.", 
+                        "schemaTypes": [
+                            "UsdShadeShader"
+                        ]
+                    }, 
+                    "keywords": [
+                        "UsdShadeValidators"
+                    ]
                 }
             }, 
             "LibraryPath": "@PLUG_INFO_LIBRARY_PATH@", 
diff --git a/pxr/usd/usdShade/shader.cpp b/pxr/usd/usdShade/shader.cpp
index 79ef2e4cc5..16702dd9e4 100644
--- a/pxr/usd/usdShade/shader.cpp
+++ b/pxr/usd/usdShade/shader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/shader.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdShade/shader.h b/pxr/usd/usdShade/shader.h
index d94fa7a3c7..d7a9badd57 100644
--- a/pxr/usd/usdShade/shader.h
+++ b/pxr/usd/usdShade/shader.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_GENERATED_SHADER_H
 #define USDSHADE_GENERATED_SHADER_H
diff --git a/pxr/usd/usdShade/shaderDefParser.cpp b/pxr/usd/usdShade/shaderDefParser.cpp
index 69fc1a0bf7..b7d3c89090 100644
--- a/pxr/usd/usdShade/shaderDefParser.cpp
+++ b/pxr/usd/usdShade/shaderDefParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/shaderDefParser.h"
 
diff --git a/pxr/usd/usdShade/shaderDefParser.h b/pxr/usd/usdShade/shaderDefParser.h
index 80a0a27845..5ddd78ee96 100644
--- a/pxr/usd/usdShade/shaderDefParser.h
+++ b/pxr/usd/usdShade/shaderDefParser.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHADE_SHADER_DEF_PARSER_H
 #define PXR_USD_USD_SHADE_SHADER_DEF_PARSER_H
diff --git a/pxr/usd/usdShade/shaderDefUtils.cpp b/pxr/usd/usdShade/shaderDefUtils.cpp
index 4e39c172b6..01c936ec29 100644
--- a/pxr/usd/usdShade/shaderDefUtils.cpp
+++ b/pxr/usd/usdShade/shaderDefUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/shaderDefUtils.h"
 
diff --git a/pxr/usd/usdShade/shaderDefUtils.h b/pxr/usd/usdShade/shaderDefUtils.h
index 2322ab5634..6c970bbcb3 100644
--- a/pxr/usd/usdShade/shaderDefUtils.h
+++ b/pxr/usd/usdShade/shaderDefUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHADE_SHADER_DEF_UTILS_H
 #define PXR_USD_USD_SHADE_SHADER_DEF_UTILS_H
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeBinding.py b/pxr/usd/usdShade/testenv/testUsdShadeBinding.py
index 6b4338e7e4..60fe21821d 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeBinding.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeBinding.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeConnectability.py b/pxr/usd/usdShade/testenv/testUsdShadeConnectability.py
index 0534ad7bb5..68f87c6223 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeConnectability.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeConnectability.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdShade
 import unittest
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeConnectableAPIBehavior.py b/pxr/usd/usdShade/testenv/testUsdShadeConnectableAPIBehavior.py
index d1411f1767..e006e9fe96 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeConnectableAPIBehavior.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeConnectableAPIBehavior.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Plug, Sdf, Usd, UsdShade, Tf
 import os, unittest
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeCoordSysAPI.py b/pxr/usd/usdShade/testenv/testUsdShadeCoordSysAPI.py
index e6ae639954..f41b3f28dd 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeCoordSysAPI.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeCoordSysAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Usd, UsdShade, UsdGeom, Sdf, Tf
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeCoordSysAPIDeprecated.py b/pxr/usd/usdShade/testenv/testUsdShadeCoordSysAPIDeprecated.py
index 0b9d72171f..840a66cfa7 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeCoordSysAPIDeprecated.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeCoordSysAPIDeprecated.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, unittest
 from pxr import Usd, UsdShade, UsdGeom, Sdf, Tf
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeGetValueProducingAttribute.py b/pxr/usd/usdShade/testenv/testUsdShadeGetValueProducingAttribute.py
index 3eae89aa11..7f37f9b0d0 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeGetValueProducingAttribute.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeGetValueProducingAttribute.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeHasConnectableAPI.cpp b/pxr/usd/usdShade/testenv/testUsdShadeHasConnectableAPI.cpp
index ff1f805472..bd9d6757ec 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeHasConnectableAPI.cpp
+++ b/pxr/usd/usdShade/testenv/testUsdShadeHasConnectableAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/usdGeom/sphere.h"
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeInterfaceInputConsumers.py b/pxr/usd/usdShade/testenv/testUsdShadeInterfaceInputConsumers.py
index c3edf96050..3c600ef3e2 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeInterfaceInputConsumers.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeInterfaceInputConsumers.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdShade
 import unittest
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeMaterialAuthoring.py b/pxr/usd/usdShade/testenv/testUsdShadeMaterialAuthoring.py
index a4ed10c009..02434ab7b1 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeMaterialAuthoring.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeMaterialAuthoring.py
@@ -2,25 +2,8 @@
 #                                                                              
 # Copyright 2017 Pixar                                                         
 #                                                                              
-# Licensed under the Apache License, Version 2.0 (the "Apache License")        
-# with the following modification; you may not use this file except in         
-# compliance with the Apache License and the following modification to it:     
-# Section 6. Trademarks. is deleted and replaced with:                         
-#                                                                              
-# 6. Trademarks. This License does not grant permission to use the trade       
-#    names, trademarks, service marks, or product names of the Licensor        
-#    and its affiliates, except as required to comply with Section 4(c) of     
-#    the License and to reproduce the content of the NOTICE file.              
-#                                                                              
-# You may obtain a copy of the Apache License at                               
-#                                                                              
-#     http://www.apache.org/licenses/LICENSE-2.0                               
-#                                                                              
-# Unless required by applicable law or agreed to in writing, software          
-# distributed under the Apache License with the above modification is          
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY     
-# KIND, either express or implied. See the Apache License for the specific     
-# language governing permissions and limitations under the Apache License. 
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdGeom, UsdShade
 import unittest
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeMaterialBaseMaterial.py b/pxr/usd/usdShade/testenv/testUsdShadeMaterialBaseMaterial.py
index c2639f0a2c..192c89f4cc 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeMaterialBaseMaterial.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeMaterialBaseMaterial.py
@@ -2,25 +2,8 @@
 #                                                                              
 # Copyright 2017 Pixar                                                         
 #                                                                              
-# Licensed under the Apache License, Version 2.0 (the "Apache License")        
-# with the following modification; you may not use this file except in         
-# compliance with the Apache License and the following modification to it:     
-# Section 6. Trademarks. is deleted and replaced with:                         
-#                                                                              
-# 6. Trademarks. This License does not grant permission to use the trade       
-#    names, trademarks, service marks, or product names of the Licensor        
-#    and its affiliates, except as required to comply with Section 4(c) of     
-#    the License and to reproduce the content of the NOTICE file.              
-#                                                                              
-# You may obtain a copy of the Apache License at                               
-#                                                                              
-#     http://www.apache.org/licenses/LICENSE-2.0                               
-#                                                                              
-# Unless required by applicable law or agreed to in writing, software          
-# distributed under the Apache License with the above modification is          
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY     
-# KIND, either express or implied. See the Apache License for the specific     
-# language governing permissions and limitations under the Apache License. 
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeMaterialBindFaceSubset.py b/pxr/usd/usdShade/testenv/testUsdShadeMaterialBindFaceSubset.py
index 0d8e972ca0..6778833d1a 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeMaterialBindFaceSubset.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeMaterialBindFaceSubset.py
@@ -2,25 +2,8 @@
 #                                                                              
 # Copyright 2017 Pixar                                                         
 #                                                                              
-# Licensed under the Apache License, Version 2.0 (the "Apache License")        
-# with the following modification; you may not use this file except in         
-# compliance with the Apache License and the following modification to it:     
-# Section 6. Trademarks. is deleted and replaced with:                         
-#                                                                              
-# 6. Trademarks. This License does not grant permission to use the trade       
-#    names, trademarks, service marks, or product names of the Licensor        
-#    and its affiliates, except as required to comply with Section 4(c) of     
-#    the License and to reproduce the content of the NOTICE file.              
-#                                                                              
-# You may obtain a copy of the Apache License at                               
-#                                                                              
-#     http://www.apache.org/licenses/LICENSE-2.0                               
-#                                                                              
-# Unless required by applicable law or agreed to in writing, software          
-# distributed under the Apache License with the above modification is          
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY     
-# KIND, either express or implied. See the Apache License for the specific     
-# language governing permissions and limitations under the Apache License. 
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdGeom, UsdShade, Vt
 import unittest
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeMaterialBinding.py b/pxr/usd/usdShade/testenv/testUsdShadeMaterialBinding.py
index 464d4a31ec..e977d6d2d5 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeMaterialBinding.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeMaterialBinding.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdShade
 import unittest    
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeMaterialOutputs.py b/pxr/usd/usdShade/testenv/testUsdShadeMaterialOutputs.py
index f6e17ceb59..f71a1dc109 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeMaterialOutputs.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeMaterialOutputs.py
@@ -2,25 +2,8 @@
 #                                                                                   
 # Copyright 2018 Pixar                                                              
 #                                                                                   
-# Licensed under the Apache License, Version 2.0 (the "Apache License")             
-# with the following modification; you may not use this file except in              
-# compliance with the Apache License and the following modification to it:          
-# Section 6. Trademarks. is deleted and replaced with:                              
-#                                                                                   
-# 6. Trademarks. This License does not grant permission to use the trade            
-#    names, trademarks, service marks, or product names of the Licensor             
-#    and its affiliates, except as required to comply with Section 4(c) of          
-#    the License and to reproduce the content of the NOTICE file.                   
-#                                                                                   
-# You may obtain a copy of the Apache License at                                    
-#                                                                                   
-#     http://www.apache.org/licenses/LICENSE-2.0                                    
-#                                                                                   
-# Unless required by applicable law or agreed to in writing, software               
-# distributed under the Apache License with the above modification is               
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY          
-# KIND, either express or implied. See the Apache License for the specific          
-# language governing permissions and limitations under the Apache License. 
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdShade
 import os, unittest
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeMaterialSpecializesBaseComposition.py b/pxr/usd/usdShade/testenv/testUsdShadeMaterialSpecializesBaseComposition.py
index 6f32887538..e45270f7a2 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeMaterialSpecializesBaseComposition.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeMaterialSpecializesBaseComposition.py
@@ -2,25 +2,8 @@
 #                                                                                   
 # Copyright 2017 Pixar                                                              
 #                                                                                   
-# Licensed under the Apache License, Version 2.0 (the "Apache License")             
-# with the following modification; you may not use this file except in              
-# compliance with the Apache License and the following modification to it:          
-# Section 6. Trademarks. is deleted and replaced with:                              
-#                                                                                   
-# 6. Trademarks. This License does not grant permission to use the trade            
-#    names, trademarks, service marks, or product names of the Licensor             
-#    and its affiliates, except as required to comply with Section 4(c) of          
-#    the License and to reproduce the content of the NOTICE file.                   
-#                                                                                   
-# You may obtain a copy of the Apache License at                                    
-#                                                                                   
-#     http://www.apache.org/licenses/LICENSE-2.0                                    
-#                                                                                   
-# Unless required by applicable law or agreed to in writing, software               
-# distributed under the Apache License with the above modification is               
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY          
-# KIND, either express or implied. See the Apache License for the specific          
-# language governing permissions and limitations under the Apache License. 
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdShade
 import os, unittest
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeNodeGraphs.py b/pxr/usd/usdShade/testenv/testUsdShadeNodeGraphs.py
index de988b894d..2b063f8eea 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeNodeGraphs.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeNodeGraphs.py
@@ -2,25 +2,8 @@
 #                                                                                   
 # Copyright 2017 Pixar                                                              
 #                                                                                   
-# Licensed under the Apache License, Version 2.0 (the "Apache License")             
-# with the following modification; you may not use this file except in              
-# compliance with the Apache License and the following modification to it:          
-# Section 6. Trademarks. is deleted and replaced with:                              
-#                                                                                   
-# 6. Trademarks. This License does not grant permission to use the trade            
-#    names, trademarks, service marks, or product names of the Licensor             
-#    and its affiliates, except as required to comply with Section 4(c) of          
-#    the License and to reproduce the content of the NOTICE file.                   
-#                                                                                   
-# You may obtain a copy of the Apache License at                                    
-#                                                                                   
-#     http://www.apache.org/licenses/LICENSE-2.0                                    
-#                                                                                   
-# Unless required by applicable law or agreed to in writing, software               
-# distributed under the Apache License with the above modification is               
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY          
-# KIND, either express or implied. See the Apache License for the specific          
-# language governing permissions and limitations under the Apache License. 
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf, Usd, UsdShade
 import unittest
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeShaderDef.py b/pxr/usd/usdShade/testenv/testUsdShadeShaderDef.py
index 443c98687c..10d726f78a 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeShaderDef.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeShaderDef.py
@@ -2,25 +2,8 @@
 #                                                                                   
 # Copyright 2017 Pixar                                                              
 #                                                                                   
-# Licensed under the Apache License, Version 2.0 (the "Apache License")             
-# with the following modification; you may not use this file except in              
-# compliance with the Apache License and the following modification to it:          
-# Section 6. Trademarks. is deleted and replaced with:                              
-#                                                                                   
-# 6. Trademarks. This License does not grant permission to use the trade            
-#    names, trademarks, service marks, or product names of the Licensor             
-#    and its affiliates, except as required to comply with Section 4(c) of          
-#    the License and to reproduce the content of the NOTICE file.                   
-#                                                                                   
-# You may obtain a copy of the Apache License at                                    
-#                                                                                   
-#     http://www.apache.org/licenses/LICENSE-2.0                                    
-#                                                                                   
-# Unless required by applicable law or agreed to in writing, software               
-# distributed under the Apache License with the above modification is               
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY          
-# KIND, either express or implied. See the Apache License for the specific          
-# language governing permissions and limitations under the Apache License. 
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Ndr, Sdf, Sdr, Usd, UsdShade
 from pxr.Sdr import shaderParserTestUtils as utils
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeShaderDef/TestShaderPropertiesNode.glslfx b/pxr/usd/usdShade/testenv/testUsdShadeShaderDef/TestShaderPropertiesNode.glslfx
index ffa8923b0c..7a9fb0a0cb 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeShaderDef/TestShaderPropertiesNode.glslfx
+++ b/pxr/usd/usdShade/testenv/testUsdShadeShaderDef/TestShaderPropertiesNode.glslfx
@@ -1,5 +1,11 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
 // TestShaderPropertiesNode
 
 -- configuration
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeShaders.py b/pxr/usd/usdShade/testenv/testUsdShadeShaders.py
index fff851d855..7158706b02 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeShaders.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeShaders.py
@@ -2,25 +2,8 @@
 #                                                                                   
 # Copyright 2017 Pixar                                                              
 #                                                                                   
-# Licensed under the Apache License, Version 2.0 (the "Apache License")             
-# with the following modification; you may not use this file except in              
-# compliance with the Apache License and the following modification to it:          
-# Section 6. Trademarks. is deleted and replaced with:                              
-#                                                                                   
-# 6. Trademarks. This License does not grant permission to use the trade            
-#    names, trademarks, service marks, or product names of the Licensor             
-#    and its affiliates, except as required to comply with Section 4(c) of          
-#    the License and to reproduce the content of the NOTICE file.                   
-#                                                                                   
-# You may obtain a copy of the Apache License at                                    
-#                                                                                   
-#     http://www.apache.org/licenses/LICENSE-2.0                                    
-#                                                                                   
-# Unless required by applicable law or agreed to in writing, software               
-# distributed under the Apache License with the above modification is               
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY          
-# KIND, either express or implied. See the Apache License for the specific          
-# language governing permissions and limitations under the Apache License. 
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeUdimUtils.py b/pxr/usd/usdShade/testenv/testUsdShadeUdimUtils.py
index b45b27f365..52a9f03a6a 100644
--- a/pxr/usd/usdShade/testenv/testUsdShadeUdimUtils.py
+++ b/pxr/usd/usdShade/testenv/testUsdShadeUdimUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import UsdShade, Sdf
 import os
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeValidators.cpp b/pxr/usd/usdShade/testenv/testUsdShadeValidators.cpp
new file mode 100644
index 0000000000..9306ae9da9
--- /dev/null
+++ b/pxr/usd/usdShade/testenv/testUsdShadeValidators.cpp
@@ -0,0 +1,128 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/usd/sdr/registry.h"
+#include "pxr/usd/usd/validationRegistry.h"
+#include "pxr/usd/usd/validationError.h"
+#include "pxr/usd/usd/validator.h"
+#include "pxr/usd/usdShade/shader.h"
+#include "pxr/usd/usdShade/shaderDefUtils.h"
+#include "pxr/usd/usdShade/validatorTokens.h"
+
+#include <algorithm>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+void
+TestUsdShadeValidators()
+{
+    // This should be updated with every new validators added with
+    // UsdShadeValidators keyword.
+    UsdValidationRegistry &registry = UsdValidationRegistry::GetInstance();
+    UsdValidatorMetadataVector metadata = 
+        registry.GetValidatorMetadataForKeyword(
+            UsdShadeValidatorKeywordTokens->UsdShadeValidators);
+    // Since other validators can be can registered with a UsdShadeValidators
+    // keyword, our validators registered in usdShade are a subset of the entire
+    // set.
+    std::set<TfToken> validatorMetadataNameSet;
+    for (const UsdValidatorMetadata &metadata : metadata) {
+        validatorMetadataNameSet.insert(metadata.name);
+    }
+
+    const std::set<TfToken> expectedValidatorNames = 
+            {UsdShadeValidatorNameTokens->shaderSdrCompliance};
+
+    TF_AXIOM(std::includes(validatorMetadataNameSet.begin(), 
+                           validatorMetadataNameSet.end(), 
+                           expectedValidatorNames.begin(), 
+                           expectedValidatorNames.end()));
+}
+
+void 
+TestUsdShadeShaderPropertyCompliance()
+{
+    // Need to setup our test shader in sdrRegistry first
+    UsdStageRefPtr shaderDefStage = UsdStage::Open("./shaderDefs.usda");
+    UsdShadeShader shaderDef =
+        UsdShadeShader::Get(shaderDefStage, SdfPath("/TestShaderNode"));
+    SdrRegistry::GetInstance().AddDiscoveryResult(
+        UsdShadeShaderDefUtils::GetNodeDiscoveryResults(
+            shaderDef, shaderDefStage->GetRootLayer()->GetRealPath())[0]);
+
+    // Now lets test our ShaderProperty validator
+    UsdValidationRegistry &registry = UsdValidationRegistry::GetInstance();
+    const UsdValidator *validator = registry.GetOrLoadValidatorByName(
+        UsdShadeValidatorNameTokens->shaderSdrCompliance);
+    TF_AXIOM(validator);
+
+    static const std::string layerContents =
+        R"usda(#usda 1.0
+               def Shader "Test"
+               {
+                    uniform token info:id = "TestShaderNode"
+                    int inputs:inputInt = 2
+                    float inputs:inputFloat = 2.0
+                    float3 inputs:inputColor = (2.0, 3.0, 4.0)
+                    token outputs:surface
+               }
+               def Shader "Bogus"
+               {
+                    uniform token info:id = "Bogus"
+               })usda";
+    SdfLayerRefPtr layer = SdfLayer::CreateAnonymous(".usda");
+    layer->ImportFromString(layerContents);
+    UsdStageRefPtr usdStage = UsdStage::Open(layer);
+    TF_AXIOM(usdStage);
+
+    {
+        const UsdPrim usdPrim = usdStage->GetPrimAtPath(
+            SdfPath("/Test"));
+
+        UsdValidationErrorVector errors = validator->Validate(usdPrim);
+
+        TF_AXIOM(errors.size() == 1);
+        TF_AXIOM(errors[0].GetType() == UsdValidationErrorType::Error);
+        TF_AXIOM(errors[0].GetSites().size() == 1);
+        TF_AXIOM(errors[0].GetSites()[0].IsValid());
+        TF_AXIOM(errors[0].GetSites()[0].IsProperty());
+        TF_AXIOM(errors[0].GetSites()[0].GetProperty().GetPath() == 
+                 SdfPath("/Test.inputs:inputColor"));
+        const std::string expectedErrorMsg = "Incorrect type for "
+            "/Test.inputs:inputColor. Expected 'color3f'; "
+            "got 'float3'.";
+        TF_AXIOM(errors[0].GetMessage() == expectedErrorMsg);
+    }
+
+    {
+        const UsdPrim usdPrim = usdStage->GetPrimAtPath(
+            SdfPath("/Bogus"));
+
+        UsdValidationErrorVector errors = validator->Validate(usdPrim);
+        TF_AXIOM(errors.size() == 1);
+        TF_AXIOM(errors[0].GetType() == UsdValidationErrorType::Error);
+        TF_AXIOM(errors[0].GetSites().size() == 1);
+        TF_AXIOM(errors[0].GetSites()[0].IsValid());
+        TF_AXIOM(errors[0].GetSites()[0].IsProperty());
+        TF_AXIOM(errors[0].GetSites()[0].GetProperty().GetPath() == 
+                 SdfPath("/Bogus.info:id"));
+        const std::string expectedErrorMsg = "shaderId 'Bogus' specified on "
+            "shader prim </Bogus> not found in sdrRegistry.";
+        TF_AXIOM(errors[0].GetMessage() == expectedErrorMsg);
+    }
+}
+
+int
+main()
+{
+    TestUsdShadeValidators();
+    TestUsdShadeShaderPropertyCompliance();
+    printf("OK\n");
+    return EXIT_SUCCESS;
+};
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeValidators/TestShader.glslfx b/pxr/usd/usdShade/testenv/testUsdShadeValidators/TestShader.glslfx
new file mode 100644
index 0000000000..bc799c33f3
--- /dev/null
+++ b/pxr/usd/usdShade/testenv/testUsdShadeValidators/TestShader.glslfx
@@ -0,0 +1,19 @@
+-- glslfx version 0.1
+
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+// TestShader
+
+-- configuration
+{
+    "techniques": {
+        "default": {
+        }
+    }
+}
+
+-- This file is intentionally empty.
diff --git a/pxr/usd/usdShade/testenv/testUsdShadeValidators/shaderDefs.usda b/pxr/usd/usdShade/testenv/testUsdShadeValidators/shaderDefs.usda
new file mode 100644
index 0000000000..0600e47a84
--- /dev/null
+++ b/pxr/usd/usdShade/testenv/testUsdShadeValidators/shaderDefs.usda
@@ -0,0 +1,14 @@
+#usda 1.0
+
+def Shader "TestShaderNode" (
+    doc = "This node is used for testing UsdShadeValidator test"
+)
+{
+    uniform asset info:glslfx:sourceAsset = @./TestShader.glslfx@
+    uniform token info:id = "TestShaderNode"
+    uniform token info:implementationSource = "sourceAsset"
+    int inputs:inputInt = 1
+    string inputs:inputString = "foo"
+    float inputs:inputFloat = 1.0
+    color3f inputs:inputColor = (1.0, 1.0, 1.0)
+}
diff --git a/pxr/usd/usdShade/tokens.cpp b/pxr/usd/usdShade/tokens.cpp
index f2a5e7504b..bce1b64525 100644
--- a/pxr/usd/usdShade/tokens.cpp
+++ b/pxr/usd/usdShade/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/tokens.h"
 
diff --git a/pxr/usd/usdShade/tokens.h b/pxr/usd/usdShade/tokens.h
index 8b26d92182..807f47558a 100644
--- a/pxr/usd/usdShade/tokens.h
+++ b/pxr/usd/usdShade/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSHADE_TOKENS_H
 #define USDSHADE_TOKENS_H
diff --git a/pxr/usd/usdShade/types.h b/pxr/usd/usdShade/types.h
index 4d98595b70..122b42c600 100644
--- a/pxr/usd/usdShade/types.h
+++ b/pxr/usd/usdShade/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHADE_TYPES_H
 #define PXR_USD_USD_SHADE_TYPES_H
diff --git a/pxr/usd/usdShade/udimUtils.cpp b/pxr/usd/usdShade/udimUtils.cpp
index 08c1cd33a4..951068ea9a 100644
--- a/pxr/usd/usdShade/udimUtils.cpp
+++ b/pxr/usd/usdShade/udimUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pathUtils.h"
diff --git a/pxr/usd/usdShade/udimUtils.h b/pxr/usd/usdShade/udimUtils.h
index 224323af44..8b808536fe 100644
--- a/pxr/usd/usdShade/udimUtils.h
+++ b/pxr/usd/usdShade/udimUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHADE_UDIM_UTILS_H
 #define PXR_USD_USD_SHADE_UDIM_UTILS_H
diff --git a/pxr/usd/usdShade/utils.cpp b/pxr/usd/usdShade/utils.cpp
index 2aed8da669..446b0119e4 100644
--- a/pxr/usd/usdShade/utils.cpp
+++ b/pxr/usd/usdShade/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdShade/utils.h"
diff --git a/pxr/usd/usdShade/utils.h b/pxr/usd/usdShade/utils.h
index a9acdac476..aa8214610b 100644
--- a/pxr/usd/usdShade/utils.h
+++ b/pxr/usd/usdShade/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SHADE_UTILS_H
 #define PXR_USD_USD_SHADE_UTILS_H
diff --git a/pxr/usd/usdShade/validatorTokens.cpp b/pxr/usd/usdShade/validatorTokens.cpp
new file mode 100644
index 0000000000..fd32d4243b
--- /dev/null
+++ b/pxr/usd/usdShade/validatorTokens.cpp
@@ -0,0 +1,17 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usd/usdShade/validatorTokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(UsdShadeValidatorNameTokens, 
+                        USD_SHADE_VALIDATOR_NAME_TOKENS);
+TF_DEFINE_PUBLIC_TOKENS(UsdShadeValidatorKeywordTokens, 
+                        USD_SHADE_VALIDATOR_KEYWORD_TOKENS);
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/usdShade/validatorTokens.h b/pxr/usd/usdShade/validatorTokens.h
new file mode 100644
index 0000000000..2720aaaa6a
--- /dev/null
+++ b/pxr/usd/usdShade/validatorTokens.h
@@ -0,0 +1,42 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef USDSHADE_VALIDATOR_TOKENS_H
+#define USDSHADE_VALIDATOR_TOKENS_H
+
+/// \file
+
+#include "pxr/pxr.h"
+#include "pxr/usd/usdShade/api.h"
+#include "pxr/base/tf/staticTokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#define USD_SHADE_VALIDATOR_NAME_TOKENS                   \
+    ((shaderSdrCompliance, "usdShade:ShaderSdrCompliance"))
+
+#define USD_SHADE_VALIDATOR_KEYWORD_TOKENS                \
+    (UsdShadeValidators)
+
+///\def 
+/// Tokens representing validator names. Note that for plugin provided
+/// validators, the names must be prefixed by usdShade:, which is the name of
+/// the usdShade plugin.
+TF_DECLARE_PUBLIC_TOKENS(UsdShadeValidatorNameTokens, USDSHADE_API, 
+                         USD_SHADE_VALIDATOR_NAME_TOKENS);
+
+///\def 
+/// Tokens representing keywords associated with any validator in the usdShade
+/// plugin. Cliends can use this to inspect validators contained within a
+/// specific keywords, or use these to be added as keywords to any new
+/// validator.
+TF_DECLARE_PUBLIC_TOKENS(UsdShadeValidatorKeywordTokens, USDSHADE_API, 
+                         USD_SHADE_VALIDATOR_KEYWORD_TOKENS);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/pxr/usd/usdShade/validators.cpp b/pxr/usd/usdShade/validators.cpp
new file mode 100644
index 0000000000..295c5beb0d
--- /dev/null
+++ b/pxr/usd/usdShade/validators.cpp
@@ -0,0 +1,204 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/usd/usd/prim.h"
+#include "pxr/usd/usd/schemaRegistry.h"
+#include "pxr/usd/usd/validationError.h"
+#include "pxr/usd/usd/validationRegistry.h"
+#include "pxr/usd/usd/validator.h"
+#include "pxr/usd/sdr/registry.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/tf/stringUtils.h"
+#include "pxr/usd/usdShade/shader.h"
+#include "pxr/usd/usdShade/validatorTokens.h"
+
+#include <algorithm>
+#include <unordered_map>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+static
+UsdValidationErrorVector
+_ShaderPropertyTypeConformance(const UsdPrim &usdPrim)
+{
+    if (!(usdPrim && usdPrim.IsInFamily<UsdShadeShader>(
+        UsdSchemaRegistry::VersionPolicy::All))) {
+        return {};
+    }
+    UsdShadeShader shader(usdPrim);
+    if (!shader) {
+        return {};
+    }
+
+    const TfTokenVector expectedImplSource =
+        {UsdShadeTokens->id, UsdShadeTokens->sourceAsset, 
+            UsdShadeTokens->sourceCode};
+
+    const TfToken implSource = shader.GetImplementationSource();
+    if (std::find(expectedImplSource.begin(), expectedImplSource.end(),
+                  implSource) == expectedImplSource.end()) {
+        const UsdValidationErrorSites implSourceErrorSite = {
+            UsdValidationErrorSite(
+                usdPrim.GetStage(), 
+                shader.GetImplementationSourceAttr().GetPath()) };
+        return {UsdValidationError(UsdValidationErrorType::Error, 
+                            implSourceErrorSite,
+                            TfStringPrintf("Shader <%s> has invalid "
+                                           "implementation source '%s'.", 
+                                           usdPrim.GetPath().GetText(), 
+                                           implSource.GetText()))};
+    }
+
+    const std::vector<std::string> sourceTypes = shader.GetSourceTypes();
+    if (sourceTypes.empty() && implSource != UsdShadeTokens->id) {
+        const UsdValidationErrorSites primErrorSite = {
+            UsdValidationErrorSite(usdPrim.GetStage(), 
+                                   usdPrim.GetPath()) };
+        return {UsdValidationError(
+            UsdValidationErrorType::Error, 
+            primErrorSite, 
+            TfStringPrintf("Shader <%s> has no sourceType.", 
+                           usdPrim.GetPath().GetText()))};
+    }
+
+    UsdValidationErrorVector errors;
+    std::unordered_map<TfToken, SdrShaderPropertyConstPtr,
+        TfToken::HashFunctor> propNameToPropertyMap;
+    if (sourceTypes.empty() && implSource == UsdShadeTokens->id) {
+        TfToken shaderId;
+        if (shader.GetShaderId(&shaderId)) {
+            // Single shaderNode, just emplace all properties, no need to find
+            // anything.
+            if (SdrShaderNodeConstPtr sdrShaderNode = 
+                SdrRegistry::GetInstance().GetShaderNodeByIdentifier(
+                    shaderId)) {
+                for (const TfToken &propName : sdrShaderNode->GetInputNames()) {
+                    if (const SdrShaderPropertyConstPtr sdrProp =
+                        sdrShaderNode->GetShaderInput(propName)) {
+                        propNameToPropertyMap.emplace(propName, sdrProp);
+                    }
+                }
+            } else {
+                const UsdValidationErrorSites shaderIdErrorSite = {
+                    UsdValidationErrorSite(usdPrim.GetStage(), 
+                                           shader.GetIdAttr().GetPath()) };
+                return {UsdValidationError(
+                    UsdValidationErrorType::Error,
+                    shaderIdErrorSite,
+                    TfStringPrintf("shaderId '%s' specified on shader prim "
+                                   "<%s> not found in sdrRegistry.",
+                                   shaderId.GetText(), 
+                                   usdPrim.GetPath().GetText()))};
+            }
+        }
+    } else {
+        // Use the SdrShaderNode::CheckPropertyCompliance to find if these do 
+        // not match, then report a ValidationError as a warning, since asset 
+        // authors have no control on fixing the shaders.
+        std::vector<SdrShaderNodeConstPtr> shaderNodesFromSourceTypes;
+
+        // We need to gather all unique inputs from all sdrShaderNodes queried
+        // using multiple sourceTypes.
+        for (const auto& sourceType : sourceTypes) {
+            if (SdrShaderNodeConstPtr sdrShaderNode = 
+                shader.GetShaderNodeForSourceType(TfToken(sourceType))) {
+                shaderNodesFromSourceTypes.push_back(sdrShaderNode);
+
+                for (const TfToken &propName : sdrShaderNode->GetInputNames()) {
+                    // Check if property has already been added to the map.
+                    if (propNameToPropertyMap.find(propName) == 
+                        propNameToPropertyMap.end()) {
+                        if (const SdrShaderPropertyConstPtr sdrProp =
+                            sdrShaderNode->GetShaderInput(propName)) {
+                            propNameToPropertyMap.emplace(propName, sdrProp);
+                        }
+                    }
+                }
+            } else {
+                UsdValidationErrorSites sourceTypeSites;
+                for (const auto& sourceTypeProp : 
+                         usdPrim.GetPropertiesInNamespace(
+                             SdfPath::JoinIdentifier("info", sourceType))) {
+                    sourceTypeSites.emplace_back(usdPrim.GetStage(), 
+                                                 sourceTypeProp.GetPath());
+                }
+                errors.emplace_back(
+                    UsdValidationErrorType::Error,
+                    sourceTypeSites,
+                    TfStringPrintf("sourceType '%s' specified on shader prim "
+                                   "<%s> not found in sdrRegistry.",
+                                   sourceType.c_str(), 
+                                   usdPrim.GetPath().GetText()));
+            }
+        }
+        SdrShaderNode::ComplianceResults sdrShaderComplianceResults = 
+            SdrShaderNode::CheckPropertyCompliance(shaderNodesFromSourceTypes);
+        const UsdValidationErrorSites sdrWarnSite = {
+                UsdValidationErrorSite(usdPrim.GetStage(), usdPrim.GetPath())
+            };
+        for (const auto& entry : sdrShaderComplianceResults) {
+            // need this for getting the error message!
+            std::vector<std::string> shaderNames;
+            shaderNames.reserve(entry.second.size());
+            for (const auto& shaderName : entry.second) {
+                shaderNames.push_back(shaderName.GetString());
+            }
+            errors.emplace_back(
+                UsdValidationErrorType::Warn, sdrWarnSite,
+                TfStringPrintf("Shader nodes '%s' have incompatible property "
+                               "'%s'.", TfStringJoin(shaderNames).c_str(), 
+                                   entry.first.GetText()));
+        }
+    }
+
+    // Get ground truth data about inputName to types from sdrNode
+    const auto sdrPropnameToSdfType = [&propNameToPropertyMap]() {
+        std::unordered_map<TfToken, SdfValueTypeName, TfToken::HashFunctor> map;
+        for (const auto& prop : propNameToPropertyMap) {
+            map.emplace(prop.first, prop.second->GetTypeAsSdfType().first);
+        }
+        return map;
+    }();
+
+    // Compare ground truth data with the inputs on UsdShadeShader prim
+    for (const UsdShadeInput &input : shader.GetInputs(false)) {
+        const TfToken baseName = input.GetBaseName();
+        if (sdrPropnameToSdfType.find(baseName) != 
+                sdrPropnameToSdfType.end()) {
+            const SdfValueTypeName &expectedSdrInputType = 
+                sdrPropnameToSdfType.at(baseName);
+            const SdfValueTypeName usdInputType = input.GetTypeName();
+            if (usdInputType != expectedSdrInputType) {
+                const UsdValidationErrorSites inputErrorSite = {
+                        UsdValidationErrorSite(usdPrim.GetStage(),
+                                               input.GetAttr().GetPath())
+                    };
+                errors.emplace_back(
+                    UsdValidationErrorType::Error,
+                    inputErrorSite,
+                    TfStringPrintf("Incorrect type for %s. "
+                                   "Expected '%s'; got '%s'.",
+                                   input.GetAttr().GetPath().GetText(),
+                                   expectedSdrInputType.GetAsToken().GetText(),
+                                   usdInputType.GetAsToken().GetText()));
+            }
+        }
+    }
+    return errors;
+}
+
+TF_REGISTRY_FUNCTION(UsdValidationRegistry)
+{
+    UsdValidationRegistry &registry = UsdValidationRegistry::GetInstance();
+
+    registry.RegisterPluginValidator(
+        UsdShadeValidatorNameTokens->shaderSdrCompliance, 
+        _ShaderPropertyTypeConformance);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usd/usdShade/wrapConnectableAPI.cpp b/pxr/usd/usdShade/wrapConnectableAPI.cpp
index 77dec046bd..ddb8d09c27 100644
--- a/pxr/usd/usdShade/wrapConnectableAPI.cpp
+++ b/pxr/usd/usdShade/wrapConnectableAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/connectableAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdShade/wrapCoordSysAPI.cpp b/pxr/usd/usdShade/wrapCoordSysAPI.cpp
index 45c6f66a17..aca46d704b 100644
--- a/pxr/usd/usdShade/wrapCoordSysAPI.cpp
+++ b/pxr/usd/usdShade/wrapCoordSysAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/coordSysAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdShade/wrapInput.cpp b/pxr/usd/usdShade/wrapInput.cpp
index 980f85de75..b0f7b99b0d 100644
--- a/pxr/usd/usdShade/wrapInput.cpp
+++ b/pxr/usd/usdShade/wrapInput.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/input.h"
 #include "pxr/usd/usdShade/output.h"
diff --git a/pxr/usd/usdShade/wrapMaterial.cpp b/pxr/usd/usdShade/wrapMaterial.cpp
index 1349590c0d..cd0a5277b3 100644
--- a/pxr/usd/usdShade/wrapMaterial.cpp
+++ b/pxr/usd/usdShade/wrapMaterial.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/material.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdShade/wrapMaterialBindingAPI.cpp b/pxr/usd/usdShade/wrapMaterialBindingAPI.cpp
index 1a2e596bdd..c2c464c91f 100644
--- a/pxr/usd/usdShade/wrapMaterialBindingAPI.cpp
+++ b/pxr/usd/usdShade/wrapMaterialBindingAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/materialBindingAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdShade/wrapNodeDefAPI.cpp b/pxr/usd/usdShade/wrapNodeDefAPI.cpp
index 7e972d4611..6c2df3ed3b 100644
--- a/pxr/usd/usdShade/wrapNodeDefAPI.cpp
+++ b/pxr/usd/usdShade/wrapNodeDefAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/nodeDefAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdShade/wrapNodeGraph.cpp b/pxr/usd/usdShade/wrapNodeGraph.cpp
index 4f65b2081d..c8437a88a6 100644
--- a/pxr/usd/usdShade/wrapNodeGraph.cpp
+++ b/pxr/usd/usdShade/wrapNodeGraph.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/nodeGraph.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdShade/wrapOutput.cpp b/pxr/usd/usdShade/wrapOutput.cpp
index 050ca13127..a690d06c30 100644
--- a/pxr/usd/usdShade/wrapOutput.cpp
+++ b/pxr/usd/usdShade/wrapOutput.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdShade/output.h"
diff --git a/pxr/usd/usdShade/wrapShader.cpp b/pxr/usd/usdShade/wrapShader.cpp
index eb17d1e59d..14dcfb7c6a 100644
--- a/pxr/usd/usdShade/wrapShader.cpp
+++ b/pxr/usd/usdShade/wrapShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdShade/shader.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdShade/wrapShaderDefParser.cpp b/pxr/usd/usdShade/wrapShaderDefParser.cpp
index 92d003e4cd..4804a47de8 100644
--- a/pxr/usd/usdShade/wrapShaderDefParser.cpp
+++ b/pxr/usd/usdShade/wrapShaderDefParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdShade/wrapShaderDefUtils.cpp b/pxr/usd/usdShade/wrapShaderDefUtils.cpp
index 83e48bf729..bbec8b8567 100644
--- a/pxr/usd/usdShade/wrapShaderDefUtils.cpp
+++ b/pxr/usd/usdShade/wrapShaderDefUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdShade/wrapTokens.cpp b/pxr/usd/usdShade/wrapTokens.cpp
index e30109f72f..d8c6da61b0 100644
--- a/pxr/usd/usdShade/wrapTokens.cpp
+++ b/pxr/usd/usdShade/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdShade/wrapTypes.cpp b/pxr/usd/usdShade/wrapTypes.cpp
index 1b1f2b7aee..40d66c4686 100644
--- a/pxr/usd/usdShade/wrapTypes.cpp
+++ b/pxr/usd/usdShade/wrapTypes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdShade/wrapUdimUtils.cpp b/pxr/usd/usdShade/wrapUdimUtils.cpp
index a951a1bea4..d0895b5e5a 100644
--- a/pxr/usd/usdShade/wrapUdimUtils.cpp
+++ b/pxr/usd/usdShade/wrapUdimUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdShade/wrapUtils.cpp b/pxr/usd/usdShade/wrapUtils.cpp
index 299c70a49c..8e86388d29 100644
--- a/pxr/usd/usdShade/wrapUtils.cpp
+++ b/pxr/usd/usdShade/wrapUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdSkel/__init__.py b/pxr/usd/usdSkel/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/usdSkel/__init__.py
+++ b/pxr/usd/usdSkel/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdSkel/animMapper.cpp b/pxr/usd/usdSkel/animMapper.cpp
index e4b33cb4d4..85003772c0 100644
--- a/pxr/usd/usdSkel/animMapper.cpp
+++ b/pxr/usd/usdSkel/animMapper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/animMapper.h"
 
diff --git a/pxr/usd/usdSkel/animMapper.h b/pxr/usd/usdSkel/animMapper.h
index 09c905b507..f6e4a15c8b 100644
--- a/pxr/usd/usdSkel/animMapper.h
+++ b/pxr/usd/usdSkel/animMapper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_ANIM_MAPPER_H
 #define PXR_USD_USD_SKEL_ANIM_MAPPER_H
diff --git a/pxr/usd/usdSkel/animQuery.cpp b/pxr/usd/usdSkel/animQuery.cpp
index 37413006e4..878a738f9f 100644
--- a/pxr/usd/usdSkel/animQuery.cpp
+++ b/pxr/usd/usdSkel/animQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/animQuery.h"
 
diff --git a/pxr/usd/usdSkel/animQuery.h b/pxr/usd/usdSkel/animQuery.h
index d8ad9d7025..e0798b8734 100644
--- a/pxr/usd/usdSkel/animQuery.h
+++ b/pxr/usd/usdSkel/animQuery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_ANIM_QUERY_H
 #define PXR_USD_USD_SKEL_ANIM_QUERY_H
diff --git a/pxr/usd/usdSkel/animQueryImpl.cpp b/pxr/usd/usdSkel/animQueryImpl.cpp
index 2f3dab1342..480049828c 100644
--- a/pxr/usd/usdSkel/animQueryImpl.cpp
+++ b/pxr/usd/usdSkel/animQueryImpl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/animQueryImpl.h"
 
diff --git a/pxr/usd/usdSkel/animQueryImpl.h b/pxr/usd/usdSkel/animQueryImpl.h
index f62326ca49..a7183c4f74 100644
--- a/pxr/usd/usdSkel/animQueryImpl.h
+++ b/pxr/usd/usdSkel/animQueryImpl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_ANIM_QUERY_IMPL_H
 #define PXR_USD_USD_SKEL_ANIM_QUERY_IMPL_H
diff --git a/pxr/usd/usdSkel/animation.cpp b/pxr/usd/usdSkel/animation.cpp
index e4414b3bb0..1b102951e6 100644
--- a/pxr/usd/usdSkel/animation.cpp
+++ b/pxr/usd/usdSkel/animation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/animation.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdSkel/animation.h b/pxr/usd/usdSkel/animation.h
index e25c87ab2c..fa3826debf 100644
--- a/pxr/usd/usdSkel/animation.h
+++ b/pxr/usd/usdSkel/animation.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSKEL_GENERATED_ANIMATION_H
 #define USDSKEL_GENERATED_ANIMATION_H
diff --git a/pxr/usd/usdSkel/api.h b/pxr/usd/usdSkel/api.h
index 9e87b48e66..e59fd92f22 100644
--- a/pxr/usd/usdSkel/api.h
+++ b/pxr/usd/usdSkel/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSKEL_API_H
 #define USDSKEL_API_H
diff --git a/pxr/usd/usdSkel/bakeSkinning.cpp b/pxr/usd/usdSkel/bakeSkinning.cpp
index be816de0fc..e87e11b963 100644
--- a/pxr/usd/usdSkel/bakeSkinning.cpp
+++ b/pxr/usd/usdSkel/bakeSkinning.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/bakeSkinning.h"
 
diff --git a/pxr/usd/usdSkel/bakeSkinning.h b/pxr/usd/usdSkel/bakeSkinning.h
index b75eac1ccb..c05002d429 100644
--- a/pxr/usd/usdSkel/bakeSkinning.h
+++ b/pxr/usd/usdSkel/bakeSkinning.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_BAKE_SKINNING_H
 #define PXR_USD_USD_SKEL_BAKE_SKINNING_H
diff --git a/pxr/usd/usdSkel/binding.h b/pxr/usd/usdSkel/binding.h
index cc2dad091c..8192e82241 100644
--- a/pxr/usd/usdSkel/binding.h
+++ b/pxr/usd/usdSkel/binding.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_BINDING_H
 #define PXR_USD_USD_SKEL_BINDING_H
diff --git a/pxr/usd/usdSkel/bindingAPI.cpp b/pxr/usd/usdSkel/bindingAPI.cpp
index 14a42ec57f..d163d3773f 100644
--- a/pxr/usd/usdSkel/bindingAPI.cpp
+++ b/pxr/usd/usdSkel/bindingAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/bindingAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdSkel/bindingAPI.h b/pxr/usd/usdSkel/bindingAPI.h
index c650b52149..ffc229f965 100644
--- a/pxr/usd/usdSkel/bindingAPI.h
+++ b/pxr/usd/usdSkel/bindingAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSKEL_GENERATED_BINDINGAPI_H
 #define USDSKEL_GENERATED_BINDINGAPI_H
diff --git a/pxr/usd/usdSkel/blendShape.cpp b/pxr/usd/usdSkel/blendShape.cpp
index d89678ce91..47a304fe2f 100644
--- a/pxr/usd/usdSkel/blendShape.cpp
+++ b/pxr/usd/usdSkel/blendShape.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/blendShape.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdSkel/blendShape.h b/pxr/usd/usdSkel/blendShape.h
index 59ade491d7..8e83910e70 100644
--- a/pxr/usd/usdSkel/blendShape.h
+++ b/pxr/usd/usdSkel/blendShape.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSKEL_GENERATED_BLENDSHAPE_H
 #define USDSKEL_GENERATED_BLENDSHAPE_H
diff --git a/pxr/usd/usdSkel/blendShapeQuery.cpp b/pxr/usd/usdSkel/blendShapeQuery.cpp
index b129d90716..e855cd234f 100644
--- a/pxr/usd/usdSkel/blendShapeQuery.cpp
+++ b/pxr/usd/usdSkel/blendShapeQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/blendShapeQuery.h"
 
diff --git a/pxr/usd/usdSkel/blendShapeQuery.h b/pxr/usd/usdSkel/blendShapeQuery.h
index ae98c23fdf..28b07dfe2f 100644
--- a/pxr/usd/usdSkel/blendShapeQuery.h
+++ b/pxr/usd/usdSkel/blendShapeQuery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_BLEND_SHAPE_QUERY_H
 #define PXR_USD_USD_SKEL_BLEND_SHAPE_QUERY_H
diff --git a/pxr/usd/usdSkel/cache.cpp b/pxr/usd/usdSkel/cache.cpp
index c5fe3aa522..46feb4e42c 100644
--- a/pxr/usd/usdSkel/cache.cpp
+++ b/pxr/usd/usdSkel/cache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/cache.h"
 
diff --git a/pxr/usd/usdSkel/cache.h b/pxr/usd/usdSkel/cache.h
index 099b045a97..25f89f0aec 100644
--- a/pxr/usd/usdSkel/cache.h
+++ b/pxr/usd/usdSkel/cache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_CACHE_H
 #define PXR_USD_USD_SKEL_CACHE_H
diff --git a/pxr/usd/usdSkel/cacheImpl.cpp b/pxr/usd/usdSkel/cacheImpl.cpp
index fb782c1113..5188527c0f 100644
--- a/pxr/usd/usdSkel/cacheImpl.cpp
+++ b/pxr/usd/usdSkel/cacheImpl.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/cacheImpl.h"
 
diff --git a/pxr/usd/usdSkel/cacheImpl.h b/pxr/usd/usdSkel/cacheImpl.h
index c0fae44935..aee6fac44b 100644
--- a/pxr/usd/usdSkel/cacheImpl.h
+++ b/pxr/usd/usdSkel/cacheImpl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_CACHE_IMPL_H
 #define PXR_USD_USD_SKEL_CACHE_IMPL_H
diff --git a/pxr/usd/usdSkel/debugCodes.cpp b/pxr/usd/usdSkel/debugCodes.cpp
index 3c54fc4e16..d134ecd39e 100644
--- a/pxr/usd/usdSkel/debugCodes.cpp
+++ b/pxr/usd/usdSkel/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/debugCodes.h"
 
diff --git a/pxr/usd/usdSkel/debugCodes.h b/pxr/usd/usdSkel/debugCodes.h
index d759e5cbec..affb48357e 100644
--- a/pxr/usd/usdSkel/debugCodes.h
+++ b/pxr/usd/usdSkel/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_DEBUG_CODES_H
 #define PXR_USD_USD_SKEL_DEBUG_CODES_H
diff --git a/pxr/usd/usdSkel/inbetweenShape.cpp b/pxr/usd/usdSkel/inbetweenShape.cpp
index 53ea9abfc4..ec6884091b 100644
--- a/pxr/usd/usdSkel/inbetweenShape.cpp
+++ b/pxr/usd/usdSkel/inbetweenShape.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdSkel/inbetweenShape.h"
diff --git a/pxr/usd/usdSkel/inbetweenShape.h b/pxr/usd/usdSkel/inbetweenShape.h
index 5534333ae3..566941de2a 100644
--- a/pxr/usd/usdSkel/inbetweenShape.h
+++ b/pxr/usd/usdSkel/inbetweenShape.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_INBETWEEN_SHAPE_H
 #define PXR_USD_USD_SKEL_INBETWEEN_SHAPE_H
diff --git a/pxr/usd/usdSkel/module.cpp b/pxr/usd/usdSkel/module.cpp
index 679ac2dc2a..2292758dfe 100644
--- a/pxr/usd/usdSkel/module.cpp
+++ b/pxr/usd/usdSkel/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdSkel/moduleDeps.cpp b/pxr/usd/usdSkel/moduleDeps.cpp
index 0dc56e2b02..fdae869dde 100644
--- a/pxr/usd/usdSkel/moduleDeps.cpp
+++ b/pxr/usd/usdSkel/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdSkel/pch.h b/pxr/usd/usdSkel/pch.h
index a4205ac46d..052c6a520b 100644
--- a/pxr/usd/usdSkel/pch.h
+++ b/pxr/usd/usdSkel/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -67,9 +50,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -78,60 +61,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -151,6 +89,8 @@
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
+#include <boost/python/operators.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
@@ -159,30 +99,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -193,7 +112,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdSkel/root.cpp b/pxr/usd/usdSkel/root.cpp
index e2bd2ddf08..6827c2ed47 100644
--- a/pxr/usd/usdSkel/root.cpp
+++ b/pxr/usd/usdSkel/root.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/root.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdSkel/root.h b/pxr/usd/usdSkel/root.h
index f601fbc3d0..5dbc4f7dce 100644
--- a/pxr/usd/usdSkel/root.h
+++ b/pxr/usd/usdSkel/root.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSKEL_GENERATED_ROOT_H
 #define USDSKEL_GENERATED_ROOT_H
diff --git a/pxr/usd/usdSkel/skelDefinition.cpp b/pxr/usd/usdSkel/skelDefinition.cpp
index 84777591aa..29fa40ab0d 100644
--- a/pxr/usd/usdSkel/skelDefinition.cpp
+++ b/pxr/usd/usdSkel/skelDefinition.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/skelDefinition.h"
 
diff --git a/pxr/usd/usdSkel/skelDefinition.h b/pxr/usd/usdSkel/skelDefinition.h
index 9c76cca12c..076c209d37 100644
--- a/pxr/usd/usdSkel/skelDefinition.h
+++ b/pxr/usd/usdSkel/skelDefinition.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_SKEL_DEFINITION_H
 #define PXR_USD_USD_SKEL_SKEL_DEFINITION_H
diff --git a/pxr/usd/usdSkel/skeleton.cpp b/pxr/usd/usdSkel/skeleton.cpp
index bfc098fe33..ca6cf18127 100644
--- a/pxr/usd/usdSkel/skeleton.cpp
+++ b/pxr/usd/usdSkel/skeleton.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/skeleton.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdSkel/skeleton.h b/pxr/usd/usdSkel/skeleton.h
index 28f818fd6f..ef94c8569c 100644
--- a/pxr/usd/usdSkel/skeleton.h
+++ b/pxr/usd/usdSkel/skeleton.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSKEL_GENERATED_SKELETON_H
 #define USDSKEL_GENERATED_SKELETON_H
diff --git a/pxr/usd/usdSkel/skeletonQuery.cpp b/pxr/usd/usdSkel/skeletonQuery.cpp
index 0aa768220e..470445e410 100644
--- a/pxr/usd/usdSkel/skeletonQuery.cpp
+++ b/pxr/usd/usdSkel/skeletonQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/skeletonQuery.h"
 
diff --git a/pxr/usd/usdSkel/skeletonQuery.h b/pxr/usd/usdSkel/skeletonQuery.h
index 3f9d3038f7..a70075b608 100644
--- a/pxr/usd/usdSkel/skeletonQuery.h
+++ b/pxr/usd/usdSkel/skeletonQuery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_SKELETON_QUERY_H
 #define PXR_USD_USD_SKEL_SKELETON_QUERY_H
diff --git a/pxr/usd/usdSkel/skinningQuery.cpp b/pxr/usd/usdSkel/skinningQuery.cpp
index a191f8ac12..ddf255ee45 100644
--- a/pxr/usd/usdSkel/skinningQuery.cpp
+++ b/pxr/usd/usdSkel/skinningQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/skinningQuery.h"
 
diff --git a/pxr/usd/usdSkel/skinningQuery.h b/pxr/usd/usdSkel/skinningQuery.h
index 91b5105ff0..165b7d5de8 100644
--- a/pxr/usd/usdSkel/skinningQuery.h
+++ b/pxr/usd/usdSkel/skinningQuery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_SKINNING_QUERY_H
 #define PXR_USD_USD_SKEL_SKINNING_QUERY_H
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelAnimMapper.py b/pxr/usd/usdSkel/testenv/testUsdSkelAnimMapper.py
index e2ccf30bbf..85af2254f2 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelAnimMapper.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelAnimMapper.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import UsdSkel, Vt, Sdf, Tf
 import unittest
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelAnimQuery.py b/pxr/usd/usdSkel/testenv/testUsdSkelAnimQuery.py
index 1a36a40059..37fda4f04f 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelAnimQuery.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelAnimQuery.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdSkel, Gf, Sdf, Tf, Vt
 import unittest, random
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelBakeSkinning.py b/pxr/usd/usdSkel/testenv/testUsdSkelBakeSkinning.py
index 4728dea6c7..b6b4c8a450 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelBakeSkinning.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelBakeSkinning.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Gf, Usd, UsdSkel
 import unittest
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelBindingAPI.py b/pxr/usd/usdSkel/testenv/testUsdSkelBindingAPI.py
index 64ea78fbd7..77e8beb329 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelBindingAPI.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelBindingAPI.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdSkel, UsdGeom, Vt, Sdf
 import unittest
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelBlendShape.py b/pxr/usd/usdSkel/testenv/testUsdSkelBlendShape.py
index 49d10dc52e..a3a12e6556 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelBlendShape.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelBlendShape.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdSkel, Gf, Vt
 import unittest
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelCache.py b/pxr/usd/usdSkel/testenv/testUsdSkelCache.py
index e611876def..e39aa74b03 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelCache.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelCache.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdSkel, UsdGeom, Vt, Sdf
 import unittest
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelRoot.py b/pxr/usd/usdSkel/testenv/testUsdSkelRoot.py
index bf25cc95a8..7f4d2536bc 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelRoot.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelRoot.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Usd, UsdSkel, UsdGeom
 import unittest
 
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelSkeletonQuery.py b/pxr/usd/usdSkel/testenv/testUsdSkelSkeletonQuery.py
index 6f74173d3f..08b1f79049 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelSkeletonQuery.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelSkeletonQuery.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdGeom, UsdSkel, Gf, Vt
 import unittest, random
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelSkinningQuery.py b/pxr/usd/usdSkel/testenv/testUsdSkelSkinningQuery.py
index f9c4abd1db..d76bf5afa2 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelSkinningQuery.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelSkinningQuery.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdSkel, UsdGeom, Vt, Sdf
 import unittest
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelTopology.py b/pxr/usd/usdSkel/testenv/testUsdSkelTopology.py
index 1227eedde2..08f87f1c9d 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelTopology.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelTopology.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd, UsdSkel, Vt, Sdf
 import unittest
diff --git a/pxr/usd/usdSkel/testenv/testUsdSkelUtils.py b/pxr/usd/usdSkel/testenv/testUsdSkelUtils.py
index 544d3593d9..a3f9c5daa1 100644
--- a/pxr/usd/usdSkel/testenv/testUsdSkelUtils.py
+++ b/pxr/usd/usdSkel/testenv/testUsdSkelUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdSkel/tokens.cpp b/pxr/usd/usdSkel/tokens.cpp
index c35c975fbc..333712c757 100644
--- a/pxr/usd/usdSkel/tokens.cpp
+++ b/pxr/usd/usdSkel/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/tokens.h"
 
diff --git a/pxr/usd/usdSkel/tokens.h b/pxr/usd/usdSkel/tokens.h
index aaa99386c1..c263997d48 100644
--- a/pxr/usd/usdSkel/tokens.h
+++ b/pxr/usd/usdSkel/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDSKEL_TOKENS_H
 #define USDSKEL_TOKENS_H
diff --git a/pxr/usd/usdSkel/topology.cpp b/pxr/usd/usdSkel/topology.cpp
index 7c9fc718c9..ef3d80c5dc 100644
--- a/pxr/usd/usdSkel/topology.cpp
+++ b/pxr/usd/usdSkel/topology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/topology.h"
 
diff --git a/pxr/usd/usdSkel/topology.h b/pxr/usd/usdSkel/topology.h
index f39a5d7a6e..93cbbf884f 100644
--- a/pxr/usd/usdSkel/topology.h
+++ b/pxr/usd/usdSkel/topology.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_TOPOLOGY_H
 #define PXR_USD_USD_SKEL_TOPOLOGY_H
diff --git a/pxr/usd/usdSkel/utils.cpp b/pxr/usd/usdSkel/utils.cpp
index d81e87a8a8..f40dca0318 100644
--- a/pxr/usd/usdSkel/utils.cpp
+++ b/pxr/usd/usdSkel/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/utils.h"
 
diff --git a/pxr/usd/usdSkel/utils.h b/pxr/usd/usdSkel/utils.h
index ece3e6ddbc..04919a0a9b 100644
--- a/pxr/usd/usdSkel/utils.h
+++ b/pxr/usd/usdSkel/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_SKEL_UTILS_H
 #define PXR_USD_USD_SKEL_UTILS_H
diff --git a/pxr/usd/usdSkel/wrapAnimMapper.cpp b/pxr/usd/usdSkel/wrapAnimMapper.cpp
index ab09677da3..6201aec9cd 100644
--- a/pxr/usd/usdSkel/wrapAnimMapper.cpp
+++ b/pxr/usd/usdSkel/wrapAnimMapper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/animMapper.h"
 
diff --git a/pxr/usd/usdSkel/wrapAnimQuery.cpp b/pxr/usd/usdSkel/wrapAnimQuery.cpp
index 4ccca9fec3..3de961fca9 100644
--- a/pxr/usd/usdSkel/wrapAnimQuery.cpp
+++ b/pxr/usd/usdSkel/wrapAnimQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/animQuery.h"
 
diff --git a/pxr/usd/usdSkel/wrapAnimation.cpp b/pxr/usd/usdSkel/wrapAnimation.cpp
index 5e6c5fbde0..350a9683d6 100644
--- a/pxr/usd/usdSkel/wrapAnimation.cpp
+++ b/pxr/usd/usdSkel/wrapAnimation.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/animation.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdSkel/wrapBakeSkinning.cpp b/pxr/usd/usdSkel/wrapBakeSkinning.cpp
index b2937a5f76..bbd83fe3ba 100644
--- a/pxr/usd/usdSkel/wrapBakeSkinning.cpp
+++ b/pxr/usd/usdSkel/wrapBakeSkinning.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/bakeSkinning.h"
 
diff --git a/pxr/usd/usdSkel/wrapBinding.cpp b/pxr/usd/usdSkel/wrapBinding.cpp
index b1540a2212..39c0d0e74b 100644
--- a/pxr/usd/usdSkel/wrapBinding.cpp
+++ b/pxr/usd/usdSkel/wrapBinding.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/binding.h"
 
diff --git a/pxr/usd/usdSkel/wrapBindingAPI.cpp b/pxr/usd/usdSkel/wrapBindingAPI.cpp
index 864fbfe53c..53d710f14f 100644
--- a/pxr/usd/usdSkel/wrapBindingAPI.cpp
+++ b/pxr/usd/usdSkel/wrapBindingAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/bindingAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdSkel/wrapBlendShape.cpp b/pxr/usd/usdSkel/wrapBlendShape.cpp
index 7c98d49ccc..ee31c616ba 100644
--- a/pxr/usd/usdSkel/wrapBlendShape.cpp
+++ b/pxr/usd/usdSkel/wrapBlendShape.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/blendShape.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdSkel/wrapBlendShapeQuery.cpp b/pxr/usd/usdSkel/wrapBlendShapeQuery.cpp
index 6edc219bb7..fc3664838f 100644
--- a/pxr/usd/usdSkel/wrapBlendShapeQuery.cpp
+++ b/pxr/usd/usdSkel/wrapBlendShapeQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/blendShapeQuery.h"
 
diff --git a/pxr/usd/usdSkel/wrapCache.cpp b/pxr/usd/usdSkel/wrapCache.cpp
index 04c5466a85..d21fe92a5e 100644
--- a/pxr/usd/usdSkel/wrapCache.cpp
+++ b/pxr/usd/usdSkel/wrapCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/cache.h"
 
diff --git a/pxr/usd/usdSkel/wrapInbetweenShape.cpp b/pxr/usd/usdSkel/wrapInbetweenShape.cpp
index 518bf9f134..448cec2da3 100644
--- a/pxr/usd/usdSkel/wrapInbetweenShape.cpp
+++ b/pxr/usd/usdSkel/wrapInbetweenShape.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/inbetweenShape.h"
 
diff --git a/pxr/usd/usdSkel/wrapRoot.cpp b/pxr/usd/usdSkel/wrapRoot.cpp
index 3d10faf7c5..60eabb8766 100644
--- a/pxr/usd/usdSkel/wrapRoot.cpp
+++ b/pxr/usd/usdSkel/wrapRoot.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/root.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdSkel/wrapSkeleton.cpp b/pxr/usd/usdSkel/wrapSkeleton.cpp
index 3b4392ac53..d2d6c79bb4 100644
--- a/pxr/usd/usdSkel/wrapSkeleton.cpp
+++ b/pxr/usd/usdSkel/wrapSkeleton.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/skeleton.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdSkel/wrapSkeletonQuery.cpp b/pxr/usd/usdSkel/wrapSkeletonQuery.cpp
index bd0f978cdf..6e85af50f8 100644
--- a/pxr/usd/usdSkel/wrapSkeletonQuery.cpp
+++ b/pxr/usd/usdSkel/wrapSkeletonQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/skeletonQuery.h"
 
diff --git a/pxr/usd/usdSkel/wrapSkinningQuery.cpp b/pxr/usd/usdSkel/wrapSkinningQuery.cpp
index 913256978e..fb2d54e5af 100644
--- a/pxr/usd/usdSkel/wrapSkinningQuery.cpp
+++ b/pxr/usd/usdSkel/wrapSkinningQuery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/skinningQuery.h"
 
diff --git a/pxr/usd/usdSkel/wrapTokens.cpp b/pxr/usd/usdSkel/wrapTokens.cpp
index a052b6a65c..23caa62093 100644
--- a/pxr/usd/usdSkel/wrapTokens.cpp
+++ b/pxr/usd/usdSkel/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdSkel/wrapTopology.cpp b/pxr/usd/usdSkel/wrapTopology.cpp
index b691a65f4e..1938d1a23b 100644
--- a/pxr/usd/usdSkel/wrapTopology.cpp
+++ b/pxr/usd/usdSkel/wrapTopology.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/topology.h"
 
diff --git a/pxr/usd/usdSkel/wrapUtils.cpp b/pxr/usd/usdSkel/wrapUtils.cpp
index be97b8c4d0..1e936d055f 100644
--- a/pxr/usd/usdSkel/wrapUtils.cpp
+++ b/pxr/usd/usdSkel/wrapUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdSkel/utils.h"
 
diff --git a/pxr/usd/usdUI/__init__.py b/pxr/usd/usdUI/__init__.py
index 21792ee990..d830462be1 100644
--- a/pxr/usd/usdUI/__init__.py
+++ b/pxr/usd/usdUI/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdUI/api.h b/pxr/usd/usdUI/api.h
index 1dcbb2c9fd..4dc3e37eba 100644
--- a/pxr/usd/usdUI/api.h
+++ b/pxr/usd/usdUI/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDUI_API_H
 #define USDUI_API_H
diff --git a/pxr/usd/usdUI/backdrop.cpp b/pxr/usd/usdUI/backdrop.cpp
index 88b858798d..bf6914fd88 100644
--- a/pxr/usd/usdUI/backdrop.cpp
+++ b/pxr/usd/usdUI/backdrop.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdUI/backdrop.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdUI/backdrop.h b/pxr/usd/usdUI/backdrop.h
index f86efffdea..7ed3ea2733 100644
--- a/pxr/usd/usdUI/backdrop.h
+++ b/pxr/usd/usdUI/backdrop.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDUI_GENERATED_BACKDROP_H
 #define USDUI_GENERATED_BACKDROP_H
diff --git a/pxr/usd/usdUI/module.cpp b/pxr/usd/usdUI/module.cpp
index e5871875ef..9bc1bccfa8 100644
--- a/pxr/usd/usdUI/module.cpp
+++ b/pxr/usd/usdUI/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdUI/moduleDeps.cpp b/pxr/usd/usdUI/moduleDeps.cpp
index 7314f31938..1d9f3b900c 100644
--- a/pxr/usd/usdUI/moduleDeps.cpp
+++ b/pxr/usd/usdUI/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdUI/nodeGraphNodeAPI.cpp b/pxr/usd/usdUI/nodeGraphNodeAPI.cpp
index 96d2088b8f..c795c493ff 100644
--- a/pxr/usd/usdUI/nodeGraphNodeAPI.cpp
+++ b/pxr/usd/usdUI/nodeGraphNodeAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdUI/nodeGraphNodeAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdUI/nodeGraphNodeAPI.h b/pxr/usd/usdUI/nodeGraphNodeAPI.h
index b1e0ebe5ad..6aed8ffcd7 100644
--- a/pxr/usd/usdUI/nodeGraphNodeAPI.h
+++ b/pxr/usd/usdUI/nodeGraphNodeAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDUI_GENERATED_NODEGRAPHNODEAPI_H
 #define USDUI_GENERATED_NODEGRAPHNODEAPI_H
diff --git a/pxr/usd/usdUI/pch.h b/pxr/usd/usdUI/pch.h
index 47666439a2..3b58a92a35 100644
--- a/pxr/usd/usdUI/pch.h
+++ b/pxr/usd/usdUI/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cinttypes>
@@ -66,8 +49,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -76,6 +60,7 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -83,53 +68,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -142,6 +80,8 @@
 #include <boost/python/object.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
+#include <boost/python/operators.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/to_python_converter.hpp>
 #include <boost/python/tuple.hpp>
 #include <boost/python/type_id.hpp>
@@ -150,26 +90,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -177,7 +100,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdUI/sceneGraphPrimAPI.cpp b/pxr/usd/usdUI/sceneGraphPrimAPI.cpp
index 7b7dc1b8c5..7f9dbff523 100644
--- a/pxr/usd/usdUI/sceneGraphPrimAPI.cpp
+++ b/pxr/usd/usdUI/sceneGraphPrimAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdUI/sceneGraphPrimAPI.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdUI/sceneGraphPrimAPI.h b/pxr/usd/usdUI/sceneGraphPrimAPI.h
index 57d745bde2..bf1e1772b2 100644
--- a/pxr/usd/usdUI/sceneGraphPrimAPI.h
+++ b/pxr/usd/usdUI/sceneGraphPrimAPI.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDUI_GENERATED_SCENEGRAPHPRIMAPI_H
 #define USDUI_GENERATED_SCENEGRAPHPRIMAPI_H
diff --git a/pxr/usd/usdUI/testenv/testUsdUIBackdrop.py b/pxr/usd/usdUI/testenv/testUsdUIBackdrop.py
index d7cc3d6ad2..c8681fa7fd 100644
--- a/pxr/usd/usdUI/testenv/testUsdUIBackdrop.py
+++ b/pxr/usd/usdUI/testenv/testUsdUIBackdrop.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd, UsdUI
diff --git a/pxr/usd/usdUI/testenv/testUsdUINodeGraphNode.py b/pxr/usd/usdUI/testenv/testUsdUINodeGraphNode.py
index 6050c1a094..d2d8fc8053 100644
--- a/pxr/usd/usdUI/testenv/testUsdUINodeGraphNode.py
+++ b/pxr/usd/usdUI/testenv/testUsdUINodeGraphNode.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd, UsdUI, Gf
diff --git a/pxr/usd/usdUI/testenv/testUsdUISceneGraphPrim.py b/pxr/usd/usdUI/testenv/testUsdUISceneGraphPrim.py
index b76dbc0902..fcb6f85b39 100644
--- a/pxr/usd/usdUI/testenv/testUsdUISceneGraphPrim.py
+++ b/pxr/usd/usdUI/testenv/testUsdUISceneGraphPrim.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd, UsdUI
diff --git a/pxr/usd/usdUI/tokens.cpp b/pxr/usd/usdUI/tokens.cpp
index 01a3427bd5..0290a50b41 100644
--- a/pxr/usd/usdUI/tokens.cpp
+++ b/pxr/usd/usdUI/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdUI/tokens.h"
 
diff --git a/pxr/usd/usdUI/tokens.h b/pxr/usd/usdUI/tokens.h
index 776d10c905..b3d80f18fc 100644
--- a/pxr/usd/usdUI/tokens.h
+++ b/pxr/usd/usdUI/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDUI_TOKENS_H
 #define USDUI_TOKENS_H
diff --git a/pxr/usd/usdUI/wrapBackdrop.cpp b/pxr/usd/usdUI/wrapBackdrop.cpp
index 7f22ad6357..8740c92393 100644
--- a/pxr/usd/usdUI/wrapBackdrop.cpp
+++ b/pxr/usd/usdUI/wrapBackdrop.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdUI/backdrop.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdUI/wrapNodeGraphNodeAPI.cpp b/pxr/usd/usdUI/wrapNodeGraphNodeAPI.cpp
index e6a9f7ab10..c859abda45 100644
--- a/pxr/usd/usdUI/wrapNodeGraphNodeAPI.cpp
+++ b/pxr/usd/usdUI/wrapNodeGraphNodeAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdUI/nodeGraphNodeAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdUI/wrapSceneGraphPrimAPI.cpp b/pxr/usd/usdUI/wrapSceneGraphPrimAPI.cpp
index 01bf18e419..d73962e12e 100644
--- a/pxr/usd/usdUI/wrapSceneGraphPrimAPI.cpp
+++ b/pxr/usd/usdUI/wrapSceneGraphPrimAPI.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdUI/sceneGraphPrimAPI.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdUI/wrapTokens.cpp b/pxr/usd/usdUI/wrapTokens.cpp
index a76ae31e6f..9db2eaa5ed 100644
--- a/pxr/usd/usdUI/wrapTokens.cpp
+++ b/pxr/usd/usdUI/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdUtils/CMakeLists.txt b/pxr/usd/usdUtils/CMakeLists.txt
index 6f6d6f8124..65c96bd366 100644
--- a/pxr/usd/usdUtils/CMakeLists.txt
+++ b/pxr/usd/usdUtils/CMakeLists.txt
@@ -11,9 +11,12 @@ pxr_library(usdUtils
         usdGeom
         usdShade
         ${Boost_PYTHON_LIBRARY}
+        ${TBB_tbb_LIBRARY}
 
     INCLUDE_DIRS
         ${Boost_INCLUDE_DIRS}
+        ${TBB_INCLUDE_DIRS}
+
 
     PUBLIC_CLASSES
         authoring
@@ -595,7 +598,7 @@ pxr_register_test(testUsdUtilsLocalizeAssetUdims
 pxr_register_test(testUsdUtilsModifyAssetPaths
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsModifyAssetPaths layer.usda modified.usda"
-    DIFF_COMPARE modified.usda duplicates.usda removal.usda ref_layer_mod.usda ref_unmodified.usda
+    DIFF_COMPARE modified.usda duplicates.usda removal.usda removal_preserve_length.usda ref_layer_mod.usda ref_unmodified.usda
     EXPECTED_RETURN_CODE 0
 )
 
diff --git a/pxr/usd/usdUtils/__init__.py b/pxr/usd/usdUtils/__init__.py
index e5b6a14401..c664c1ac80 100644
--- a/pxr/usd/usdUtils/__init__.py
+++ b/pxr/usd/usdUtils/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdUtils/api.h b/pxr/usd/usdUtils/api.h
index b8afd9554d..6004804053 100644
--- a/pxr/usd/usdUtils/api.h
+++ b/pxr/usd/usdUtils/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_API_H
 #define PXR_USD_USD_UTILS_API_H
diff --git a/pxr/usd/usdUtils/assetLocalization.cpp b/pxr/usd/usdUtils/assetLocalization.cpp
index 7a3e4c0209..1df66c4fdb 100644
--- a/pxr/usd/usdUtils/assetLocalization.cpp
+++ b/pxr/usd/usdUtils/assetLocalization.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file usdUtils/assetLocalization.cpp
@@ -477,17 +460,15 @@ UsdUtils_LocalizationContext::_ProcessAssetValue(
         auto assetPath = val.UncheckedGet<SdfAssetPath>();
         const std::string& rawAssetPath = assetPath.GetAssetPath();
 
-        if (!rawAssetPath.empty()) {
-            const std::vector<std::string> dependencies = 
-                _GetDependencies(layer, rawAssetPath);
+        const std::vector<std::string> dependencies = 
+            _GetDependencies(layer, rawAssetPath);
 
-            const std::vector<std::string> processedDeps = 
-                _delegate->ProcessValuePath(
-                        layer, keyPath, rawAssetPath, dependencies);
-            
-            _EnqueueDependency(layer, rawAssetPath);
-            _EnqueueDependencies(layer, processedDeps);
-        }
+        const std::vector<std::string> processedDeps = 
+            _delegate->ProcessValuePath(
+                    layer, keyPath, rawAssetPath, dependencies);
+        
+        _EnqueueDependency(layer, rawAssetPath);
+        _EnqueueDependencies(layer, processedDeps);
     } else if (val.IsHolding<VtArray<SdfAssetPath>>()) {
         const VtArray<SdfAssetPath>& originalArray = 
             val.UncheckedGet< VtArray<SdfAssetPath> >();
@@ -499,17 +480,15 @@ UsdUtils_LocalizationContext::_ProcessAssetValue(
 
         for (const SdfAssetPath& assetPath : originalArray) {                
             const std::string& rawAssetPath = assetPath.GetAssetPath();
-            if (!rawAssetPath.empty()) {
-                const std::vector<std::string> dependencies = 
-                    _GetDependencies(layer, rawAssetPath);
+            const std::vector<std::string> dependencies = 
+                _GetDependencies(layer, rawAssetPath);
 
-                const std::vector<std::string> processedDeps = 
-                    _delegate->ProcessValuePathArrayElement(
-                            layer, keyPath, rawAssetPath, dependencies);
-                
-                _EnqueueDependency(layer, rawAssetPath);
-                _EnqueueDependencies(layer, processedDeps);
-            }
+            const std::vector<std::string> processedDeps = 
+                _delegate->ProcessValuePathArrayElement(
+                        layer, keyPath, rawAssetPath, dependencies);
+            
+            _EnqueueDependency(layer, rawAssetPath);
+            _EnqueueDependencies(layer, processedDeps);
         }
 
         _delegate->EndProcessingValuePathArray(layer, keyPath);
diff --git a/pxr/usd/usdUtils/assetLocalization.h b/pxr/usd/usdUtils/assetLocalization.h
index ff2204c46e..4150879698 100644
--- a/pxr/usd/usdUtils/assetLocalization.h
+++ b/pxr/usd/usdUtils/assetLocalization.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_ASSET_LOCALIZATION_H
 #define PXR_USD_USD_UTILS_ASSET_LOCALIZATION_H
diff --git a/pxr/usd/usdUtils/assetLocalizationDelegate.cpp b/pxr/usd/usdUtils/assetLocalizationDelegate.cpp
index 2459913f21..8495271b37 100644
--- a/pxr/usd/usdUtils/assetLocalizationDelegate.cpp
+++ b/pxr/usd/usdUtils/assetLocalizationDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file usdUtils/assetLocalizationDelegate.cpp
@@ -235,6 +218,10 @@ UsdUtils_WritableLocalizationDelegate::ProcessValuePath(
     const std::string &authoredPath,
     const std::vector<std::string> &dependencies)
 {
+    if (authoredPath.empty()) {
+        return {};
+    }
+
     UsdUtilsDependencyInfo depInfo = {authoredPath, dependencies};
     UsdUtilsDependencyInfo info = _pathCache.GetProcessedInfo(
         layer, depInfo, UsdUtils_DependencyType::Reference);
@@ -271,9 +258,15 @@ UsdUtils_WritableLocalizationDelegate::ProcessValuePathArrayElement(
         return _AllDependenciesForInfo(info);
     }
     else {
+        // We don't want to remove empty paths from arrays. They may be
+        // meaningful, for example in primvar attributes that need to be
+        // a certain length.
+        if (_keepEmptyPathsInArrays) {
+            _currentPathArray.emplace_back(SdfAssetPath());
+        }
+
         return {};
     }
-    
 }
 
 void 
@@ -576,6 +569,10 @@ UsdUtils_ReadOnlyLocalizationDelegate::ProcessValuePath(
     const std::string &authoredPath,
     const std::vector<std::string> &dependencies)
 {
+    if (authoredPath.empty()) {
+        return {};
+    }
+
     return _AllDependenciesForInfo(_pathCache.GetProcessedInfo(layer, 
         {authoredPath, dependencies}, UsdUtils_DependencyType::Reference));
 }
@@ -587,6 +584,12 @@ UsdUtils_ReadOnlyLocalizationDelegate::ProcessValuePathArrayElement(
     const std::string &authoredPath,
     const std::vector<std::string> &dependencies)
 {    
+    // We may get passed an empty authored path if an array has some
+    // explicitly empty elements.
+    if (authoredPath.empty()) {
+        return {};
+    }
+
     return _AllDependenciesForInfo(_pathCache.GetProcessedInfo(layer, 
         {authoredPath, dependencies}, UsdUtils_DependencyType::Reference));
 }
diff --git a/pxr/usd/usdUtils/assetLocalizationDelegate.h b/pxr/usd/usdUtils/assetLocalizationDelegate.h
index 75e0069504..4a36dcb48e 100644
--- a/pxr/usd/usdUtils/assetLocalizationDelegate.h
+++ b/pxr/usd/usdUtils/assetLocalizationDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_ASSET_LOCALIZATION_DELEGATE_H
 #define PXR_USD_USD_UTILS_ASSET_LOCALIZATION_DELEGATE_H
@@ -214,6 +197,16 @@ class UsdUtils_WritableLocalizationDelegate
         _editLayersInPlace = editLayersInPlace;
     }
 
+    // Controls whether empty asset paths are kept in arrays.
+    // If the value is false, paths that are empty after processing are
+    // removed from the layer.  Setting this to true will write empty asset
+    // paths into the array so that it's length remains unchanged after
+    // processing.
+    inline void SetKeepEmptyPathsInArrays(bool keep)
+    {
+        _keepEmptyPathsInArrays = keep;
+    }
+
     // Returns the layer that was used for writing the passed in layer.
     // Note that if _editLayersInPlace is true, or there were no edits to
     // the particular layer, the passed in value will be returned.
@@ -260,6 +253,8 @@ class UsdUtils_WritableLocalizationDelegate
 
     bool _editLayersInPlace = false;
 
+    bool _keepEmptyPathsInArrays = false;
+
     // Maps source layer identifiers to their anonymous writable copies.
     std::map<SdfLayerRefPtr, SdfLayerRefPtr> _layerCopyMap;
 };
diff --git a/pxr/usd/usdUtils/assetLocalizationPackage.cpp b/pxr/usd/usdUtils/assetLocalizationPackage.cpp
index 38ef4a97e4..9a803d4843 100644
--- a/pxr/usd/usdUtils/assetLocalizationPackage.cpp
+++ b/pxr/usd/usdUtils/assetLocalizationPackage.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/assetLocalizationPackage.h b/pxr/usd/usdUtils/assetLocalizationPackage.h
index c9b2db4c0d..e7b7124441 100644
--- a/pxr/usd/usdUtils/assetLocalizationPackage.h
+++ b/pxr/usd/usdUtils/assetLocalizationPackage.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_ASSET_LOCALIZATION_PACKAGE
 #define PXR_USD_USD_UTILS_ASSET_LOCALIZATION_PACKAGE
diff --git a/pxr/usd/usdUtils/authoring.cpp b/pxr/usd/usdUtils/authoring.cpp
index b80b20c525..b9c445e860 100644
--- a/pxr/usd/usdUtils/authoring.cpp
+++ b/pxr/usd/usdUtils/authoring.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/authoring.h"
diff --git a/pxr/usd/usdUtils/authoring.h b/pxr/usd/usdUtils/authoring.h
index c1626f5e8e..8064cd50f6 100644
--- a/pxr/usd/usdUtils/authoring.h
+++ b/pxr/usd/usdUtils/authoring.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_AUTHORING_H
 #define PXR_USD_USD_UTILS_AUTHORING_H
diff --git a/pxr/usd/usdUtils/coalescingDiagnosticDelegate.cpp b/pxr/usd/usdUtils/coalescingDiagnosticDelegate.cpp
index 83868f0c84..43b417ac9d 100644
--- a/pxr/usd/usdUtils/coalescingDiagnosticDelegate.cpp
+++ b/pxr/usd/usdUtils/coalescingDiagnosticDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/coalescingDiagnosticDelegate.h b/pxr/usd/usdUtils/coalescingDiagnosticDelegate.h
index d9ebc1b79f..9de0d483a9 100644
--- a/pxr/usd/usdUtils/coalescingDiagnosticDelegate.h
+++ b/pxr/usd/usdUtils/coalescingDiagnosticDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_COALESCING_DIAGNOSTIC_DELEGATE_H
 #define PXR_USD_USD_UTILS_COALESCING_DIAGNOSTIC_DELEGATE_H
diff --git a/pxr/usd/usdUtils/complianceChecker.py b/pxr/usd/usdUtils/complianceChecker.py
index 22ecebd6e1..60370b9110 100644
--- a/pxr/usd/usdUtils/complianceChecker.py
+++ b/pxr/usd/usdUtils/complianceChecker.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.cpp b/pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.cpp
index 2153f552dd..a66b44b640 100644
--- a/pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.cpp
+++ b/pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.h"
diff --git a/pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.h b/pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.h
index aed259021f..b76da5448c 100644
--- a/pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.h
+++ b/pxr/usd/usdUtils/conditionalAbortDiagnosticDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_CONDITIONAL_ABORT_DIAGNOSTIC_DELEGATE_H
 #define PXR_USD_USD_UTILS_CONDITIONAL_ABORT_DIAGNOSTIC_DELEGATE_H
diff --git a/pxr/usd/usdUtils/constantsGroup.py b/pxr/usd/usdUtils/constantsGroup.py
index efa833684a..d8030b1025 100644
--- a/pxr/usd/usdUtils/constantsGroup.py
+++ b/pxr/usd/usdUtils/constantsGroup.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 """A module for creating groups of constants. This is similar to the enum
diff --git a/pxr/usd/usdUtils/debugCodes.cpp b/pxr/usd/usdUtils/debugCodes.cpp
index 6363a3f49c..644965967c 100644
--- a/pxr/usd/usdUtils/debugCodes.cpp
+++ b/pxr/usd/usdUtils/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/debugCodes.h"
diff --git a/pxr/usd/usdUtils/debugCodes.h b/pxr/usd/usdUtils/debugCodes.h
index 8858992d58..85f417fd8e 100644
--- a/pxr/usd/usdUtils/debugCodes.h
+++ b/pxr/usd/usdUtils/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_DEBUG_CODES_H
 #define PXR_USD_USD_UTILS_DEBUG_CODES_H
diff --git a/pxr/usd/usdUtils/dependencies.cpp b/pxr/usd/usdUtils/dependencies.cpp
index 04b90b9997..56c92f8e60 100644
--- a/pxr/usd/usdUtils/dependencies.cpp
+++ b/pxr/usd/usdUtils/dependencies.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file usdUtils/dependencies.cpp
@@ -204,7 +187,8 @@ UsdUtilsComputeAllDependencies(
 void 
 UsdUtilsModifyAssetPaths(
     const SdfLayerHandle& layer,
-    const UsdUtilsModifyAssetPathFn& modifyFn)
+    const UsdUtilsModifyAssetPathFn& modifyFn,
+    bool keepEmptyPathsInArrays)
 {
     auto processingFunc = 
         [&modifyFn](const SdfLayerRefPtr&, 
@@ -219,6 +203,9 @@ UsdUtilsModifyAssetPaths(
     UsdUtils_LocalizationContext context(&delegate);
     delegate.SetEditLayersInPlace(true);
     context.SetRecurseLayerDependencies(false);
+
+    delegate.SetKeepEmptyPathsInArrays(keepEmptyPathsInArrays);
+
     context.Process(layer);
 }
 
diff --git a/pxr/usd/usdUtils/dependencies.h b/pxr/usd/usdUtils/dependencies.h
index c187847705..648dbffed4 100644
--- a/pxr/usd/usdUtils/dependencies.h
+++ b/pxr/usd/usdUtils/dependencies.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_DEPENDENCIES_H
 #define PXR_USD_USD_UTILS_DEPENDENCIES_H
@@ -99,7 +82,10 @@ using UsdUtilsModifyAssetPathFn = std::function<std::string(
 
 /// Helper function that visits every asset path in \c layer, calls \c modifyFn
 /// and replaces the value with the return value of \c modifyFn.  This modifies
-/// \c layer in place.
+/// \c layer in place. If the \c keepEmptyPathsInArrays parameter is true, empty 
+/// asset paths will be written in into arrays even if \c modifyFn returns an 
+/// empty string.  This functionality is useful in cases where arrays are 
+/// expected to have a specific length or such values may be meaningful.
 ///
 /// This can be useful in preparing a layer for consumption in contexts that do
 /// not have access to the ArResolver for which the layer's asset paths were
@@ -108,7 +94,8 @@ using UsdUtilsModifyAssetPathFn = std::function<std::string(
 USDUTILS_API
 void UsdUtilsModifyAssetPaths(
     const SdfLayerHandle& layer,
-    const UsdUtilsModifyAssetPathFn& modifyFn);
+    const UsdUtilsModifyAssetPathFn& modifyFn,
+    bool keepEmptyPathsInArrays = false);
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
diff --git a/pxr/usd/usdUtils/fixBrokenPixarSchemas.py b/pxr/usd/usdUtils/fixBrokenPixarSchemas.py
index 564d934912..3d2716a6cd 100644
--- a/pxr/usd/usdUtils/fixBrokenPixarSchemas.py
+++ b/pxr/usd/usdUtils/fixBrokenPixarSchemas.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 class FixBrokenPixarSchemas(object):
diff --git a/pxr/usd/usdUtils/flattenLayerStack.cpp b/pxr/usd/usdUtils/flattenLayerStack.cpp
index 140a658d86..85b780e743 100644
--- a/pxr/usd/usdUtils/flattenLayerStack.cpp
+++ b/pxr/usd/usdUtils/flattenLayerStack.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/flattenLayerStack.h"
diff --git a/pxr/usd/usdUtils/flattenLayerStack.h b/pxr/usd/usdUtils/flattenLayerStack.h
index e276e8241c..47f12c3a91 100644
--- a/pxr/usd/usdUtils/flattenLayerStack.h
+++ b/pxr/usd/usdUtils/flattenLayerStack.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_FLATTEN_LAYER_STACK_H
 #define PXR_USD_USD_UTILS_FLATTEN_LAYER_STACK_H
diff --git a/pxr/usd/usdUtils/introspection.cpp b/pxr/usd/usdUtils/introspection.cpp
index a3fbf55b5b..b46acb1034 100644
--- a/pxr/usd/usdUtils/introspection.cpp
+++ b/pxr/usd/usdUtils/introspection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/introspection.h"
diff --git a/pxr/usd/usdUtils/introspection.h b/pxr/usd/usdUtils/introspection.h
index 9d405e9d63..396fbb9cf6 100644
--- a/pxr/usd/usdUtils/introspection.h
+++ b/pxr/usd/usdUtils/introspection.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_INTROSPECTION_H
 #define PXR_USD_USD_UTILS_INTROSPECTION_H
diff --git a/pxr/usd/usdUtils/localizeAsset.cpp b/pxr/usd/usdUtils/localizeAsset.cpp
index b8ee50de0a..eca0281e56 100644
--- a/pxr/usd/usdUtils/localizeAsset.cpp
+++ b/pxr/usd/usdUtils/localizeAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file usdUtils/localizeAsset.cpp
diff --git a/pxr/usd/usdUtils/localizeAsset.h b/pxr/usd/usdUtils/localizeAsset.h
index 7035efa40b..e301db2305 100644
--- a/pxr/usd/usdUtils/localizeAsset.h
+++ b/pxr/usd/usdUtils/localizeAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/module.cpp b/pxr/usd/usdUtils/module.cpp
index e70742f664..510f24dc7f 100644
--- a/pxr/usd/usdUtils/module.cpp
+++ b/pxr/usd/usdUtils/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdUtils/moduleDeps.cpp b/pxr/usd/usdUtils/moduleDeps.cpp
index 955f1ac818..20ae1b826c 100644
--- a/pxr/usd/usdUtils/moduleDeps.cpp
+++ b/pxr/usd/usdUtils/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdUtils/pch.h b/pxr/usd/usdUtils/pch.h
index 3a108ee5ef..fe66fce103 100644
--- a/pxr/usd/usdUtils/pch.h
+++ b/pxr/usd/usdUtils/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -48,13 +31,14 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cinttypes>
@@ -65,6 +49,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <deque>
 #include <fcntl.h>
 #include <float.h>
@@ -81,6 +66,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
 #include <sstream>
@@ -100,63 +87,8 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/function.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/get_pointer.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/enum.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/function.hpp>
 #include <boost/python.hpp>
 #include <boost/python/call.hpp>
 #include <boost/python/class.hpp>
@@ -185,6 +117,7 @@
 #include <boost/python/raw_function.hpp>
 #include <boost/python/refcount.hpp>
 #include <boost/python/return_arg.hpp>
+#include <boost/python/return_by_value.hpp>
 #include <boost/python/return_value_policy.hpp>
 #include <boost/python/scope.hpp>
 #include <boost/python/to_python_converter.hpp>
@@ -196,28 +129,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_abstract.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -228,7 +142,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdUtils/pipeline.cpp b/pxr/usd/usdUtils/pipeline.cpp
index 99d5950dc6..48b2261651 100644
--- a/pxr/usd/usdUtils/pipeline.cpp
+++ b/pxr/usd/usdUtils/pipeline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/pipeline.h"
diff --git a/pxr/usd/usdUtils/pipeline.h b/pxr/usd/usdUtils/pipeline.h
index 03ca5635cb..daced31a7c 100644
--- a/pxr/usd/usdUtils/pipeline.h
+++ b/pxr/usd/usdUtils/pipeline.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_PIPELINE_H
 #define PXR_USD_USD_UTILS_PIPELINE_H
diff --git a/pxr/usd/usdUtils/registeredVariantSet.cpp b/pxr/usd/usdUtils/registeredVariantSet.cpp
index ef5577b9eb..3bcfc23472 100644
--- a/pxr/usd/usdUtils/registeredVariantSet.cpp
+++ b/pxr/usd/usdUtils/registeredVariantSet.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdUtils/registeredVariantSet.h"
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/registeredVariantSet.h b/pxr/usd/usdUtils/registeredVariantSet.h
index 7070a1c1d2..e6b91f3a27 100644
--- a/pxr/usd/usdUtils/registeredVariantSet.h
+++ b/pxr/usd/usdUtils/registeredVariantSet.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_REGISTERED_VARIANT_SET_H
 #define PXR_USD_USD_UTILS_REGISTERED_VARIANT_SET_H
diff --git a/pxr/usd/usdUtils/sparseValueWriter.cpp b/pxr/usd/usdUtils/sparseValueWriter.cpp
index 0616d68121..7ccb23005e 100644
--- a/pxr/usd/usdUtils/sparseValueWriter.cpp
+++ b/pxr/usd/usdUtils/sparseValueWriter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usd/usdUtils/sparseValueWriter.h"
diff --git a/pxr/usd/usdUtils/sparseValueWriter.h b/pxr/usd/usdUtils/sparseValueWriter.h
index 233df2a9c9..e9036927f7 100644
--- a/pxr/usd/usdUtils/sparseValueWriter.h
+++ b/pxr/usd/usdUtils/sparseValueWriter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_SPARSE_VALUE_WRITER_H
 #define PXR_USD_USD_UTILS_SPARSE_VALUE_WRITER_H
diff --git a/pxr/usd/usdUtils/stageCache.cpp b/pxr/usd/usdUtils/stageCache.cpp
index f802095326..5f2d58cbaa 100644
--- a/pxr/usd/usdUtils/stageCache.cpp
+++ b/pxr/usd/usdUtils/stageCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/stageCache.h"
diff --git a/pxr/usd/usdUtils/stageCache.h b/pxr/usd/usdUtils/stageCache.h
index 3d2cdf939e..c5ccbccaaf 100644
--- a/pxr/usd/usdUtils/stageCache.h
+++ b/pxr/usd/usdUtils/stageCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_STAGE_CACHE_H
 #define PXR_USD_USD_UTILS_STAGE_CACHE_H
diff --git a/pxr/usd/usdUtils/stitch.cpp b/pxr/usd/usdUtils/stitch.cpp
index 13957b68a7..13d1420aa5 100644
--- a/pxr/usd/usdUtils/stitch.cpp
+++ b/pxr/usd/usdUtils/stitch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/stitch.h"
diff --git a/pxr/usd/usdUtils/stitch.h b/pxr/usd/usdUtils/stitch.h
index daa80bb7d9..dadb2a9b4d 100644
--- a/pxr/usd/usdUtils/stitch.h
+++ b/pxr/usd/usdUtils/stitch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_STITCH_H
 #define PXR_USD_USD_UTILS_STITCH_H
diff --git a/pxr/usd/usdUtils/stitchClips.cpp b/pxr/usd/usdUtils/stitchClips.cpp
index 06ef6c3e61..bf4c9c9ad0 100644
--- a/pxr/usd/usdUtils/stitchClips.cpp
+++ b/pxr/usd/usdUtils/stitchClips.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/stitchClips.h"
diff --git a/pxr/usd/usdUtils/stitchClips.h b/pxr/usd/usdUtils/stitchClips.h
index ecd3c913e1..4f2d125d18 100644
--- a/pxr/usd/usdUtils/stitchClips.h
+++ b/pxr/usd/usdUtils/stitchClips.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_STITCH_CLIPS_H
 #define PXR_USD_USD_UTILS_STITCH_CLIPS_H
diff --git a/pxr/usd/usdUtils/testenv/TestUsdUtilsDependenciesCustomResolver_plugin.cpp b/pxr/usd/usdUtils/testenv/TestUsdUtilsDependenciesCustomResolver_plugin.cpp
index 95dd43eace..3eb0b9071e 100644
--- a/pxr/usd/usdUtils/testenv/TestUsdUtilsDependenciesCustomResolver_plugin.cpp
+++ b/pxr/usd/usdUtils/testenv/TestUsdUtilsDependenciesCustomResolver_plugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsAuthoring.py b/pxr/usd/usdUtils/testenv/testUsdUtilsAuthoring.py
index 9663fc0708..17bb05f1d7 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsAuthoring.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsAuthoring.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import UsdUtils, Sdf, Usd
 import unittest
 
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsCoalescingDiagnosticDelegate.cpp b/pxr/usd/usdUtils/testenv/testUsdUtilsCoalescingDiagnosticDelegate.cpp
index 0f5be4654e..ce3cc6a270 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsCoalescingDiagnosticDelegate.cpp
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsCoalescingDiagnosticDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsCoalescingDiagnosticDelegate.py b/pxr/usd/usdUtils/testenv/testUsdUtilsCoalescingDiagnosticDelegate.py
index 27c7ddb197..20985fd69d 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsCoalescingDiagnosticDelegate.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsCoalescingDiagnosticDelegate.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf, Sdf, UsdUtils
@@ -29,7 +12,7 @@
 def _genWarning():
     Tf.Warn('.')
 
-EXPECTED_LINE_NO   = 30 
+EXPECTED_LINE_NO   = 13
 EXPECTED_FUNC_NAME = '__main__._genWarning'
 
 delegate = UsdUtils.CoalescingDiagnosticDelegate()
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsConditionalAbortDiagnosticDelegate.py b/pxr/usd/usdUtils/testenv/testUsdUtilsConditionalAbortDiagnosticDelegate.py
index 280be42bc4..18dc40954a 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsConditionalAbortDiagnosticDelegate.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsConditionalAbortDiagnosticDelegate.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 from pxr import Tf, UsdUtils
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsConstantsGroup.py b/pxr/usd/usdUtils/testenv/testUsdUtilsConstantsGroup.py
index 20c6b39fe0..6a681292aa 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsConstantsGroup.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsConstantsGroup.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import sys
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsCreateNewUsdzPackage.py b/pxr/usd/usdUtils/testenv/testUsdUtilsCreateNewUsdzPackage.py
index 7dd24957a3..066da6d69f 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsCreateNewUsdzPackage.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsCreateNewUsdzPackage.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 from pxr import Ar, Sdf, Usd, UsdUtils
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsDependencies.py b/pxr/usd/usdUtils/testenv/testUsdUtilsDependencies.py
index 8a71c73507..93d7bb39b0 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsDependencies.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsDependencies.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Ar, UsdUtils, Sdf, Usd
 from pathlib import Path
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsDependenciesCustomResolver.py b/pxr/usd/usdUtils/testenv/testUsdUtilsDependenciesCustomResolver.py
index 5ee30a738e..75bdb17871 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsDependenciesCustomResolver.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsDependenciesCustomResolver.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Ar, Plug, Sdf, Usd, UsdUtils
 
 import os, shutil, unittest
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsDependencyExtractor.py b/pxr/usd/usdUtils/testenv/testUsdUtilsDependencyExtractor.py
index dfa17b98c3..95a9e27320 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsDependencyExtractor.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsDependencyExtractor.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from __future__ import print_function
 from pxr import UsdUtils, Sdf
 import argparse, contextlib, sys, os
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsFlattenLayerStack.py b/pxr/usd/usdUtils/testenv/testUsdUtilsFlattenLayerStack.py
index e4c1409912..97aefe7c6b 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsFlattenLayerStack.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsFlattenLayerStack.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsIntrospection.py b/pxr/usd/usdUtils/testenv/testUsdUtilsIntrospection.py
index 078a067efc..8c1a6b5149 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsIntrospection.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsIntrospection.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import UsdUtils
 import unittest
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsLocalizeAsset.py b/pxr/usd/usdUtils/testenv/testUsdUtilsLocalizeAsset.py
index 03f7da7fbe..2d64f23d6b 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsLocalizeAsset.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsLocalizeAsset.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Ar, Sdf, Usd, UsdUtils
 
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsModifyAssetPaths.py b/pxr/usd/usdUtils/testenv/testUsdUtilsModifyAssetPaths.py
index 96866107f0..e1e06b2621 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsModifyAssetPaths.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsModifyAssetPaths.py
@@ -2,31 +2,14 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import UsdUtils
 from pxr import Sdf
 
-def Test(usdFile, outFile, fn):
+def Test(usdFile, outFile, fn, keepEmptyPathsInArrays = False):
     layer = Sdf.Layer.FindOrOpen(usdFile)
-    UsdUtils.ModifyAssetPaths(layer, fn)
+    UsdUtils.ModifyAssetPaths(layer, fn, keepEmptyPathsInArrays)
     layer.Export(outFile)
 
 def TestBasic():
@@ -58,6 +41,17 @@ def fn(s):
 
 TestRemoval()
 
+def TestRemovalPreserveLength():
+    # Tests behavior when modify callback returns empty asset
+    # paths and preserve array length is enabled.
+    def fn(s):
+        return ''
+        
+    Test('layer.usda', 'removal_preserve_length.usda', fn, 
+         keepEmptyPathsInArrays=True)
+
+TestRemovalPreserveLength()
+
 def TestDoesNotRecurseDeps():
     # Tests reference paths are not traversed during asset path modification
     def fn(s):
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsModifyAssetPaths/baseline/removal_preserve_length.usda b/pxr/usd/usdUtils/testenv/testUsdUtilsModifyAssetPaths/baseline/removal_preserve_length.usda
new file mode 100644
index 0000000000..1462e85a62
--- /dev/null
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsModifyAssetPaths/baseline/removal_preserve_length.usda
@@ -0,0 +1,47 @@
+#usda 1.0
+
+def Xform "Model" (
+    assetInfo = {
+        asset[] payloadAssetDependencies = [@@, @@]
+    }
+    customData = {
+        dictionary d = {
+            asset[] bar = [@@, @@]
+        }
+        dictionary emptyDict = {
+        }
+    }
+    payload = None
+    references = None
+)
+{
+    asset[] bar = [@@, @@]
+    asset[] emptyArr = []
+    asset foo (
+        customData = {
+            asset[] bar = [@@, @@]
+        }
+    )
+    asset[] varBar.timeSamples = {
+        1: [@@, @@],
+        2: [@@, @@],
+    }
+    asset varFoo
+}
+
+def Xform "Variants" (
+    add variantSets = "standin"
+)
+{
+    variantSet "standin" = {
+        "render" {
+            asset foo
+
+        }
+    }
+}
+
+def "PrependPayload"
+{
+}
+
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsPipeline.py b/pxr/usd/usdUtils/testenv/testUsdUtilsPipeline.py
index 6df911a69f..ed8efebc71 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsPipeline.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsPipeline.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import UsdUtils, Sdf
 import unittest
 
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsSparseValueWriter.py b/pxr/usd/usdUtils/testenv/testUsdUtilsSparseValueWriter.py
index 6e89b580de..4cf23d0b36 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsSparseValueWriter.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsSparseValueWriter.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import division
 from pxr import UsdUtils, Usd, Sdf, UsdGeom, Gf, Tf
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsStageCache.py b/pxr/usd/usdUtils/testenv/testUsdUtilsStageCache.py
index 8eba390220..770255b9f0 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsStageCache.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsStageCache.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import UsdUtils, Sdf, Usd
 import unittest
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsStitch.cpp b/pxr/usd/usdUtils/testenv/testUsdUtilsStitch.cpp
index 7f122e5093..22d6ae1f19 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsStitch.cpp
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsStitch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsStitch.py b/pxr/usd/usdUtils/testenv/testUsdUtilsStitch.py
index ff0d7e2cc4..b7212abed5 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsStitch.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsStitch.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Tf, Sdf, UsdUtils
 import unittest
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsStitchClips.py b/pxr/usd/usdUtils/testenv/testUsdUtilsStitchClips.py
index 7b1cd5796e..0178d8615c 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsStitchClips.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsStitchClips.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from __future__ import print_function
 
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsTimeCodeRange.cpp b/pxr/usd/usdUtils/testenv/testUsdUtilsTimeCodeRange.cpp
index 2e858579b2..27eb4ebcec 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsTimeCodeRange.cpp
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsTimeCodeRange.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsTimeCodeRange.py b/pxr/usd/usdUtils/testenv/testUsdUtilsTimeCodeRange.py
index ca995536a3..89f6c32d37 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsTimeCodeRange.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsTimeCodeRange.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Gf
 from pxr import Tf
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsUpdateSchemaWithSdrNode.py b/pxr/usd/usdUtils/testenv/testUsdUtilsUpdateSchemaWithSdrNode.py
index 053f794b23..48853c3f15 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsUpdateSchemaWithSdrNode.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsUpdateSchemaWithSdrNode.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import UsdUtils, Sdf, Usd, Sdr, UsdShade, Tf, Plug
 import os, sys
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsUpdateSchemaWithSdrNode/testDummy.glslfx b/pxr/usd/usdUtils/testenv/testUsdUtilsUpdateSchemaWithSdrNode/testDummy.glslfx
index ffa8923b0c..e792ce9b80 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsUpdateSchemaWithSdrNode/testDummy.glslfx
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsUpdateSchemaWithSdrNode/testDummy.glslfx
@@ -1,5 +1,11 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
 // TestShaderPropertiesNode
 
 -- configuration
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsUsdzUtils.py b/pxr/usd/usdUtils/testenv/testUsdUtilsUsdzUtils.py
index 5bc5cfa6b1..3cd2fd2efe 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsUsdzUtils.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsUsdzUtils.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Ar, Sdf, Usd, UsdUtils
 import os
 import unittest
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsUserProcessingFunc.py b/pxr/usd/usdUtils/testenv/testUsdUtilsUserProcessingFunc.py
index 98e9da7f28..c7c062db6d 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsUserProcessingFunc.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsUserProcessingFunc.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Ar, Sdf, Tf, Usd, UsdUtils
 import os, sys, shutil, tempfile, unittest
diff --git a/pxr/usd/usdUtils/testenv/testUsdUtilsVarSelsSessionLayer.py b/pxr/usd/usdUtils/testenv/testUsdUtilsVarSelsSessionLayer.py
index e544c7bb37..5229436d96 100644
--- a/pxr/usd/usdUtils/testenv/testUsdUtilsVarSelsSessionLayer.py
+++ b/pxr/usd/usdUtils/testenv/testUsdUtilsVarSelsSessionLayer.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import UsdUtils, Sdf
 import unittest
 
diff --git a/pxr/usd/usdUtils/timeCodeRange.cpp b/pxr/usd/usdUtils/timeCodeRange.cpp
index 81fbd8dee7..bb2e11f0d4 100644
--- a/pxr/usd/usdUtils/timeCodeRange.cpp
+++ b/pxr/usd/usdUtils/timeCodeRange.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/timeCodeRange.h"
diff --git a/pxr/usd/usdUtils/timeCodeRange.h b/pxr/usd/usdUtils/timeCodeRange.h
index e4fa67b4c6..c7795274d4 100644
--- a/pxr/usd/usdUtils/timeCodeRange.h
+++ b/pxr/usd/usdUtils/timeCodeRange.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_TIME_CODE_RANGE_H
 #define PXR_USD_USD_UTILS_TIME_CODE_RANGE_H
diff --git a/pxr/usd/usdUtils/toolPaths.py b/pxr/usd/usdUtils/toolPaths.py
index 9adf45ec13..daf47e8ab2 100644
--- a/pxr/usd/usdUtils/toolPaths.py
+++ b/pxr/usd/usdUtils/toolPaths.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 import os
 import platform
diff --git a/pxr/usd/usdUtils/updateSchemaWithSdrNode.py b/pxr/usd/usdUtils/updateSchemaWithSdrNode.py
index 5e28fb8d25..2c085bef80 100644
--- a/pxr/usd/usdUtils/updateSchemaWithSdrNode.py
+++ b/pxr/usd/usdUtils/updateSchemaWithSdrNode.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf, Sdf, Sdr, Usd, UsdShade, Vt
diff --git a/pxr/usd/usdUtils/usdzPackage.cpp b/pxr/usd/usdUtils/usdzPackage.cpp
index 0e7b09c40e..f53cb45153 100644
--- a/pxr/usd/usdUtils/usdzPackage.cpp
+++ b/pxr/usd/usdUtils/usdzPackage.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file usdUtils/usdzPackage.cpp
diff --git a/pxr/usd/usdUtils/usdzPackage.h b/pxr/usd/usdUtils/usdzPackage.h
index c3b7462a3c..d9d766fd91 100644
--- a/pxr/usd/usdUtils/usdzPackage.h
+++ b/pxr/usd/usdUtils/usdzPackage.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_USD_UTILS_USDZ_PACKAGE_H
 #define PXR_USD_USD_UTILS_USDZ_PACKAGE_H
diff --git a/pxr/usd/usdUtils/usdzUtils.py b/pxr/usd/usdUtils/usdzUtils.py
index 1cc41e88a6..91544ad34b 100644
--- a/pxr/usd/usdUtils/usdzUtils.py
+++ b/pxr/usd/usdUtils/usdzUtils.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # - method to extract usdz package contents to a given location
diff --git a/pxr/usd/usdUtils/userProcessingFunc.h b/pxr/usd/usdUtils/userProcessingFunc.h
index 9c732f7a45..89f73b0a10 100644
--- a/pxr/usd/usdUtils/userProcessingFunc.h
+++ b/pxr/usd/usdUtils/userProcessingFunc.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_USD_UTILS_USER_PROCESSING_FUNC
diff --git a/pxr/usd/usdUtils/wrapAuthoring.cpp b/pxr/usd/usdUtils/wrapAuthoring.cpp
index 84a99d058c..7ccb3269a6 100644
--- a/pxr/usd/usdUtils/wrapAuthoring.cpp
+++ b/pxr/usd/usdUtils/wrapAuthoring.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include <boost/python/def.hpp>
diff --git a/pxr/usd/usdUtils/wrapCoalescingDiagnosticDelegate.cpp b/pxr/usd/usdUtils/wrapCoalescingDiagnosticDelegate.cpp
index 766c01c7af..4e90d4cb64 100644
--- a/pxr/usd/usdUtils/wrapCoalescingDiagnosticDelegate.cpp
+++ b/pxr/usd/usdUtils/wrapCoalescingDiagnosticDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/wrapConditionalAbortDiagnosticDelegate.cpp b/pxr/usd/usdUtils/wrapConditionalAbortDiagnosticDelegate.cpp
index 7ecb191bbe..667aa5a84b 100644
--- a/pxr/usd/usdUtils/wrapConditionalAbortDiagnosticDelegate.cpp
+++ b/pxr/usd/usdUtils/wrapConditionalAbortDiagnosticDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/wrapDependencies.cpp b/pxr/usd/usdUtils/wrapDependencies.cpp
index 1b62068d1c..4732c2d138 100644
--- a/pxr/usd/usdUtils/wrapDependencies.cpp
+++ b/pxr/usd/usdUtils/wrapDependencies.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ///
 /// \file usdUtils/wrapDependencies.cpp
@@ -104,6 +87,8 @@ void wrapDependencies()
     using Py_UsdUtilsModifyAssetPathFn = std::string(const std::string&);
     TfPyFunctionFromPython<Py_UsdUtilsModifyAssetPathFn>();
     bp::def("ModifyAssetPaths", &UsdUtilsModifyAssetPaths,
-        (bp::arg("layer"), bp::arg("modifyFn")));
+            (bp::arg("layer"), 
+             bp::arg("modifyFn"), 
+             bp::arg("keepEmptyPathsInArrays") = false));
 
 }
diff --git a/pxr/usd/usdUtils/wrapFlattenLayerStack.cpp b/pxr/usd/usdUtils/wrapFlattenLayerStack.cpp
index 7002b8603c..b5c568710c 100644
--- a/pxr/usd/usdUtils/wrapFlattenLayerStack.cpp
+++ b/pxr/usd/usdUtils/wrapFlattenLayerStack.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include <boost/python/def.hpp>
diff --git a/pxr/usd/usdUtils/wrapIntrospection.cpp b/pxr/usd/usdUtils/wrapIntrospection.cpp
index 25e68f3a5c..effeaf7d81 100644
--- a/pxr/usd/usdUtils/wrapIntrospection.cpp
+++ b/pxr/usd/usdUtils/wrapIntrospection.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include <boost/python/def.hpp>
diff --git a/pxr/usd/usdUtils/wrapLocalizeAsset.cpp b/pxr/usd/usdUtils/wrapLocalizeAsset.cpp
index 727a2c281d..c737fdb0b1 100644
--- a/pxr/usd/usdUtils/wrapLocalizeAsset.cpp
+++ b/pxr/usd/usdUtils/wrapLocalizeAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdUtils/wrapPipeline.cpp b/pxr/usd/usdUtils/wrapPipeline.cpp
index 5c3f113270..25cc38c654 100644
--- a/pxr/usd/usdUtils/wrapPipeline.cpp
+++ b/pxr/usd/usdUtils/wrapPipeline.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include <boost/python/def.hpp>
diff --git a/pxr/usd/usdUtils/wrapRegisteredVariantSet.cpp b/pxr/usd/usdUtils/wrapRegisteredVariantSet.cpp
index 03d2f90e9e..be67481ce2 100644
--- a/pxr/usd/usdUtils/wrapRegisteredVariantSet.cpp
+++ b/pxr/usd/usdUtils/wrapRegisteredVariantSet.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include <boost/python/def.hpp>
diff --git a/pxr/usd/usdUtils/wrapSparseValueWriter.cpp b/pxr/usd/usdUtils/wrapSparseValueWriter.cpp
index f925dc3be6..ddfebad531 100644
--- a/pxr/usd/usdUtils/wrapSparseValueWriter.cpp
+++ b/pxr/usd/usdUtils/wrapSparseValueWriter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usd/usdUtils/wrapStageCache.cpp b/pxr/usd/usdUtils/wrapStageCache.cpp
index 107fa55111..9e86d616b3 100644
--- a/pxr/usd/usdUtils/wrapStageCache.cpp
+++ b/pxr/usd/usdUtils/wrapStageCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include <boost/python/def.hpp>
diff --git a/pxr/usd/usdUtils/wrapStitch.cpp b/pxr/usd/usdUtils/wrapStitch.cpp
index 2374d49e14..21461ff704 100644
--- a/pxr/usd/usdUtils/wrapStitch.cpp
+++ b/pxr/usd/usdUtils/wrapStitch.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapStitch.cpp
 
diff --git a/pxr/usd/usdUtils/wrapStitchClips.cpp b/pxr/usd/usdUtils/wrapStitchClips.cpp
index c2d7c77982..7011936924 100644
--- a/pxr/usd/usdUtils/wrapStitchClips.cpp
+++ b/pxr/usd/usdUtils/wrapStitchClips.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 /// \file wrapStitchClips.cpp
 
diff --git a/pxr/usd/usdUtils/wrapTimeCodeRange.cpp b/pxr/usd/usdUtils/wrapTimeCodeRange.cpp
index 121e5bb1c0..f8aa203008 100644
--- a/pxr/usd/usdUtils/wrapTimeCodeRange.cpp
+++ b/pxr/usd/usdUtils/wrapTimeCodeRange.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usd/usdUtils/timeCodeRange.h"
diff --git a/pxr/usd/usdUtils/wrapUserProcessingFunc.cpp b/pxr/usd/usdUtils/wrapUserProcessingFunc.cpp
index 1053326c35..8f73ca3eb4 100644
--- a/pxr/usd/usdUtils/wrapUserProcessingFunc.cpp
+++ b/pxr/usd/usdUtils/wrapUserProcessingFunc.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usd/usdVol/__init__.py b/pxr/usd/usdVol/__init__.py
index 85c7173035..5e0d06a196 100644
--- a/pxr/usd/usdVol/__init__.py
+++ b/pxr/usd/usdVol/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usd/usdVol/api.h b/pxr/usd/usdVol/api.h
index c21ad89a39..da844e3011 100644
--- a/pxr/usd/usdVol/api.h
+++ b/pxr/usd/usdVol/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDVOL_API_H
 #define USDVOL_API_H
diff --git a/pxr/usd/usdVol/field3DAsset.cpp b/pxr/usd/usdVol/field3DAsset.cpp
index ffdb67d18a..7a029f6948 100644
--- a/pxr/usd/usdVol/field3DAsset.cpp
+++ b/pxr/usd/usdVol/field3DAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/field3DAsset.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdVol/field3DAsset.h b/pxr/usd/usdVol/field3DAsset.h
index c780557f2c..32002f1ec3 100644
--- a/pxr/usd/usdVol/field3DAsset.h
+++ b/pxr/usd/usdVol/field3DAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDVOL_GENERATED_FIELD3DASSET_H
 #define USDVOL_GENERATED_FIELD3DASSET_H
diff --git a/pxr/usd/usdVol/fieldAsset.cpp b/pxr/usd/usdVol/fieldAsset.cpp
index ed0e081e7b..5e6be28d98 100644
--- a/pxr/usd/usdVol/fieldAsset.cpp
+++ b/pxr/usd/usdVol/fieldAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/fieldAsset.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdVol/fieldAsset.h b/pxr/usd/usdVol/fieldAsset.h
index 8b8c83ed98..1524df8731 100644
--- a/pxr/usd/usdVol/fieldAsset.h
+++ b/pxr/usd/usdVol/fieldAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDVOL_GENERATED_FIELDASSET_H
 #define USDVOL_GENERATED_FIELDASSET_H
diff --git a/pxr/usd/usdVol/fieldBase.cpp b/pxr/usd/usdVol/fieldBase.cpp
index 809ee71cc4..dcfe8f3330 100644
--- a/pxr/usd/usdVol/fieldBase.cpp
+++ b/pxr/usd/usdVol/fieldBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/fieldBase.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdVol/fieldBase.h b/pxr/usd/usdVol/fieldBase.h
index db5aea3816..328d8ea7f1 100644
--- a/pxr/usd/usdVol/fieldBase.h
+++ b/pxr/usd/usdVol/fieldBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDVOL_GENERATED_FIELDBASE_H
 #define USDVOL_GENERATED_FIELDBASE_H
diff --git a/pxr/usd/usdVol/generatedSchema.usda b/pxr/usd/usdVol/generatedSchema.usda
index 44ef8062b4..5cc4c50102 100644
--- a/pxr/usd/usdVol/generatedSchema.usda
+++ b/pxr/usd/usdVol/generatedSchema.usda
@@ -4,6 +4,10 @@
 )
 
 class Volume "Volume" (
+    customData = {
+        string userDocBrief = """A renderable volume containing one or more
+volumetric data fields, used to represent a volume effect such as smoke or fire."""
+    }
     doc = """A renderable volume primitive. A volume is made up of any number
              of FieldBase primitives bound together in this volume. Each
              FieldBase primitive is specified as a relationship with a
@@ -136,6 +140,9 @@ class Volume "Volume" (
 }
 
 class "FieldBase" (
+    customData = {
+        string userDocBrief = "The base schema class for volume field primitives."
+    }
     doc = "Base class for field primitives."
 )
 {
@@ -193,10 +200,18 @@ class "FieldBase" (
 }
 
 class "FieldAsset" (
+    customData = {
+        string userDocBrief = """The base schema class for volume field 
+primitives defined by an external file."""
+    }
     doc = "Base class for field primitives defined by an external file."
 )
 {
     token fieldDataType (
+        customData = {
+            string userDocBrief = """Token used to indicate the data type of an
+individual field"""
+        }
         doc = """Token which is used to indicate the data type of an
                  individual field. Authors use this to tell consumers more
                  about the field without opening the file on disk. The list of 
@@ -204,16 +219,27 @@ class "FieldAsset" (
                  A missing value is considered an error."""
     )
     int fieldIndex (
+        customData = {
+            string userDocBrief = """Optional attribute that stores an index used 
+to disambiguate between fields with the same name."""
+        }
         doc = """A file can contain multiple fields with the same
                  name. This optional attribute is an index used to
                  disambiguate between these multiple fields with the same
                  name."""
     )
     token fieldName (
+        customData = {
+            string userDocBrief = """Name of an individual field within the file 
+specified by the filePath attribute."""
+        }
         doc = """Name of an individual field within the file specified by
                  the filePath attribute."""
     )
     asset filePath (
+        customData = {
+            string userDocBrief = "An asset path attribute that points to a file on disk."
+        }
         doc = """An asset path attribute that points to a file on disk.
                  For each supported file format, a separate FieldAsset
                  subclass is required. 
@@ -256,6 +282,10 @@ class "FieldAsset" (
     )
     token vectorDataRoleHint = "None" (
         allowedTokens = ["None", "Point", "Normal", "Vector", "Color"]
+        customData = {
+            string userDocBrief = """Optional token used to indicate the role of 
+a vector valued field."""
+        }
         doc = """Optional token which is used to indicate the role of a vector
                  valued field. This can drive the data type in which fields
                  are made available in a renderer or whether the vector values 
@@ -284,12 +314,19 @@ class "FieldAsset" (
 }
 
 class Field3DAsset "Field3DAsset" (
+    customData = {
+        string userDocBrief = "Field3D field primitive."
+    }
     doc = """Field3D field primitive. The FieldAsset filePath attribute must
              specify a file in the Field3D format on disk."""
 )
 {
     token fieldDataType (
         allowedTokens = ["half", "float", "double", "half3", "float3", "double3"]
+        customData = {
+            string userDocBrief = """Token used to indicate the data type of an
+individual field."""
+        }
         doc = """Token which is used to indicate the data type of an
                  individual field. Authors use this to tell consumers more
                  about the field without opening the file on disk. The list of 
@@ -297,21 +334,36 @@ class Field3DAsset "Field3DAsset" (
                  volumes."""
     )
     int fieldIndex (
+        customData = {
+            string userDocBrief = """Optional attribute that stores an index used 
+to disambiguate between fields with the same name."""
+        }
         doc = """A file can contain multiple fields with the same
                  name. This optional attribute is an index used to
                  disambiguate between these multiple fields with the same
                  name."""
     )
     token fieldName (
+        customData = {
+            string userDocBrief = """Name of an individual field within the file 
+specified by the filePath attribute."""
+        }
         doc = """Name of an individual field within the file specified by
                  the filePath attribute."""
     )
     token fieldPurpose (
+        customData = {
+            string userDocBrief = """Optional token used to indicate the purpose or 
+grouping of an individual field."""
+        }
         doc = """Optional token which can be used to indicate the purpose or 
                  grouping of an individual field. Clients which consume Field3D 
                  files should treat this as the Field3D field name."""
     )
     asset filePath (
+        customData = {
+            string userDocBrief = "An asset path attribute that points to a file on disk."
+        }
         doc = """An asset path attribute that points to a file on disk.
                  For each supported file format, a separate FieldAsset
                  subclass is required. 
@@ -354,6 +406,10 @@ class Field3DAsset "Field3DAsset" (
     )
     token vectorDataRoleHint = "None" (
         allowedTokens = ["None", "Point", "Normal", "Vector", "Color"]
+        customData = {
+            string userDocBrief = """Optional token used to indicate the role of 
+a vector valued field."""
+        }
         doc = """Optional token which is used to indicate the role of a vector
                  valued field. This can drive the data type in which fields
                  are made available in a renderer or whether the vector values 
@@ -382,12 +438,19 @@ class Field3DAsset "Field3DAsset" (
 }
 
 class OpenVDBAsset "OpenVDBAsset" (
+    customData = {
+        string userDocBrief = "OpenVDB field primitive."
+    }
     doc = """OpenVDB field primitive. The FieldAsset filePath attribute must
              specify a file in the OpenVDB format on disk."""
 )
 {
     token fieldClass (
         allowedTokens = ["levelSet", "fogVolume", "staggered", "unknown"]
+        customData = {
+            string userDocBrief = """Optional token used to indicate the class of
+an individual grid."""
+        }
         doc = """Optional token which can be used to indicate the class of
                  an individual grid. This is a mapping to openvdb::GridClass
                  where the values are GRID_LEVEL_SET, GRID_FOG_VOLUME, 
@@ -395,6 +458,10 @@ class OpenVDBAsset "OpenVDBAsset" (
     )
     token fieldDataType (
         allowedTokens = ["half", "float", "double", "int", "uint", "int64", "half2", "float2", "double2", "int2", "half3", "float3", "double3", "int3", "matrix3d", "matrix4d", "quatd", "bool", "mask", "string"]
+        customData = {
+            string userDocBrief = """Token used to indicate the data type of an
+individual field."""
+        }
         doc = """Token which is used to indicate the data type of an
                  individual field. Authors use this to tell consumers more
                  about the field without opening the file on disk. The list of 
@@ -402,16 +469,27 @@ class OpenVDBAsset "OpenVDBAsset" (
                  volumes."""
     )
     int fieldIndex (
+        customData = {
+            string userDocBrief = """Optional attribute that stores an index used 
+to disambiguate between fields with the same name."""
+        }
         doc = """A file can contain multiple fields with the same
                  name. This optional attribute is an index used to
                  disambiguate between these multiple fields with the same
                  name."""
     )
     token fieldName (
+        customData = {
+            string userDocBrief = """Name of an individual field within the file 
+specified by the filePath attribute."""
+        }
         doc = """Name of an individual field within the file specified by
                  the filePath attribute."""
     )
     asset filePath (
+        customData = {
+            string userDocBrief = "An asset path attribute that points to a file on disk."
+        }
         doc = """An asset path attribute that points to a file on disk.
                  For each supported file format, a separate FieldAsset
                  subclass is required. 
@@ -454,6 +532,10 @@ class OpenVDBAsset "OpenVDBAsset" (
     )
     token vectorDataRoleHint = "None" (
         allowedTokens = ["None", "Point", "Normal", "Vector", "Color"]
+        customData = {
+            string userDocBrief = """Optional token used to indicate the role of 
+a vector valued field."""
+        }
         doc = """Optional token which is used to indicate the role of a vector
                  valued field. This can drive the data type in which fields
                  are made available in a renderer or whether the vector values 
diff --git a/pxr/usd/usdVol/module.cpp b/pxr/usd/usdVol/module.cpp
index e1310e87da..36d3bbb3b8 100644
--- a/pxr/usd/usdVol/module.cpp
+++ b/pxr/usd/usdVol/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usd/usdVol/moduleDeps.cpp b/pxr/usd/usdVol/moduleDeps.cpp
index 5c165dd329..7aa7d7199e 100644
--- a/pxr/usd/usdVol/moduleDeps.cpp
+++ b/pxr/usd/usdVol/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usd/usdVol/openVDBAsset.cpp b/pxr/usd/usdVol/openVDBAsset.cpp
index 37a5d7dfe7..1f26a1859d 100644
--- a/pxr/usd/usdVol/openVDBAsset.cpp
+++ b/pxr/usd/usdVol/openVDBAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/openVDBAsset.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdVol/openVDBAsset.h b/pxr/usd/usdVol/openVDBAsset.h
index 7a929b1091..8cd7ec9df8 100644
--- a/pxr/usd/usdVol/openVDBAsset.h
+++ b/pxr/usd/usdVol/openVDBAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDVOL_GENERATED_OPENVDBASSET_H
 #define USDVOL_GENERATED_OPENVDBASSET_H
diff --git a/pxr/usd/usdVol/pch.h b/pxr/usd/usdVol/pch.h
index 7802ec3e2d..f8e8af37dd 100644
--- a/pxr/usd/usdVol/pch.h
+++ b/pxr/usd/usdVol/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -67,8 +50,9 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,60 +61,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -151,27 +90,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -179,7 +100,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usd/usdVol/testenv/testUsdVolVolume.py b/pxr/usd/usdVol/testenv/testUsdVolVolume.py
index 61a1bf0848..dcc9888f22 100644
--- a/pxr/usd/usdVol/testenv/testUsdVolVolume.py
+++ b/pxr/usd/usdVol/testenv/testUsdVolVolume.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import sys, os, unittest
 from pxr import Usd, UsdGeom, UsdVol, Sdf
diff --git a/pxr/usd/usdVol/tokens.cpp b/pxr/usd/usdVol/tokens.cpp
index 5430b0ed94..9754c06fb5 100644
--- a/pxr/usd/usdVol/tokens.cpp
+++ b/pxr/usd/usdVol/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/tokens.h"
 
diff --git a/pxr/usd/usdVol/tokens.h b/pxr/usd/usdVol/tokens.h
index 642ca91f2c..6c7da7fae1 100644
--- a/pxr/usd/usdVol/tokens.h
+++ b/pxr/usd/usdVol/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDVOL_TOKENS_H
 #define USDVOL_TOKENS_H
diff --git a/pxr/usd/usdVol/userDoc/overview.md b/pxr/usd/usdVol/userDoc/overview.md
new file mode 100644
index 0000000000..b56e08ddd2
--- /dev/null
+++ b/pxr/usd/usdVol/userDoc/overview.md
@@ -0,0 +1,148 @@
+# Overview
+
+The UsdVol schema domain contains schemas for working with volumes and
+volumetric data. Volumes encapsulate fields of discretized volumetric data, 
+where the data can potentially be sparse or time-varying. Volumes can be used 
+to represent effects like smoke or fire. 
+
+The volumetric data referenced by Volumes can be contained in OpenVDB or Field3D
+assets. UsdVol can also be extended to support other volume formats or sources.
+
+The following screenshot shows a Volume with density fields that point to 
+OpenVDB assets.
+
+![Example screenshot](volExample.png)
+
+(usdVol_working_with_volumes)=
+## Working With Volumes
+
+A Volume prim represents a renderable volume, such as a fog or fire effect.
+
+Volumes contain volumetric data represented as relationships to prims that
+have a FieldBase-derived schema applied. Each field relationship is specified 
+as a relationship with a namespace prefix of "field". The relationship names,
+such as "density", are used by the renderer to associate individual fields with 
+the named input parameters on a volume shader.
+
+For example, the following Volume defines a field relationship to an OpenVDB
+asset. The field relationship name specifies that the OpenVDB asset contains
+data that the renderer and volume shader should use for the density of the
+volume. The Volume also has a material binding to a Material (not defined in 
+this example).
+
+```{code-block} usda
+def Volume "Volume" (
+    prepend apiSchemas = ["MaterialBindingAPI"]
+)
+{
+    custom rel field:density = </Volume/densityVDB>
+    uniform token purpose = "render"
+    double3 xformOp:scale = (1, 1, 1)
+    double3 xformOp:translate = (0, -3, 0)
+    token[] xformOpOrder = ["xformOp:translate", "xformOp:scale"]
+    rel material:binding = </Materials/VolumeMaterial>    
+
+    def OpenVDBAsset "densityVDB"
+    {
+        token fieldName = "density"
+        asset filePath = @/vdbdata/smoke_plume.101.vdb@,
+        }
+    }
+}
+
+```
+
+Volume additionally inherits from GPrim and inherits GPrim and Imageable
+schema properties for rendering, and supports using primvars to bind data
+to the USD Material/Shader pipeline during rendering. In the above example, 
+the bound material, :usda:`</Materials/VolumeMaterial>`, would have a volume 
+shader as a terminal node in the Material's shader network, and you would 
+provide primvars to bind Volume or GPrim data to that shader to control how 
+your Volume is rendered. Note that Hydra uses a fallback volume material if
+your Volume doesn't have a material binding.
+
+```{admonition} Volume Use Cases 
+:class: note
+
+Because Volume inherits from GPrim, it is primarily intended to
+be used for renderable/imageable volumes. However, UsdVol Volume prims could
+be used for "non-renderable" use cases such as encapsulating volumetric data 
+used for simulations, depending on your workflow.
+```
+
+(usdVol_working_with_fields)=
+## Working With Fields
+
+UsdVol provides a several abstract schemas that other field schemas inherit 
+from, including FieldBase (the base schema class for all field schemas) and 
+FieldAsset (the base schema class for schemas that represent a field asset with 
+volumetric data stored outside the layer, e.g. in a file asset). In practice, 
+you'll use FieldAsset-derived schemas, such as OpenVDBAsset or Field3DAsset, 
+to work with volumetric data of a specific format.
+
+### Making Fields Child Prims of Volumes
+
+A general best practice is to make your Field prims children of the containing
+Volume prim. This helps organize things in your USD scene, making the Fields
+easy to find and reference. Also, the grid extracted from a Field prim is 
+positioned in world space by the local-to-world transformation of the Field 
+prim, plus, in the case of prims with Field-Asset derived schemas, any 
+transformation contained in the external asset encoding. By making 
+the Field prim a child of a Volume, re-positioning the Volume will automatically 
+move all its child Field prims along with it.
+
+```{admonition} Using Fields in Multiple Volumes
+:class: note
+
+While it is recommended, it is not required to have Field prims be children of
+Volume prims. If you have a use-case where need to use the same Field prim
+for multiple Volumes, you may find it helpful organizationally to not have the
+Field prim as a child of any Volume prim. 
+```
+
+(usdVol_using_animated_field_data)=
+### Using Animated Field Data
+
+Volumetric data is often animated. For Volumes with FieldAsset-derived Fields, 
+animation is represented by setting time samples on the filePath attribute.
+The following example sets time samples in a OpenVDBAsset field to different
+VDB assets:
+
+```{code}
+def Volume "wisp"
+{
+    float3[] extent = [(-57, -91, -44), (57, 31, -23)]
+
+    rel field:density = </wisp/density>
+
+    def OpenVDBAsset "density"
+    {
+        asset filePath.timeSamples = {
+            101: @./wisp_01.101.vdb@,
+            102: @./wisp_01.102.vdb@,
+            103: @./wisp_01.103.vdb@,
+            104: @./wisp_01.104.vdb@,
+        }
+        token fieldName = "density"
+    }
+}
+```
+
+(usdVol_understanding_fieldname)=
+### Understanding `fieldName` and the Field's Relationship Name 
+
+FieldAsset-derived fields provide a `fieldName` attribute that is used to 
+identify the name of a field in the Field's asset. In an OpenVDB asset, this 
+might be the name of a grid in a VDB file. A Volume also provides a way to
+specify the "name" for a field, via the 
+{ref}`relationships grouped inside the 'field' namespace <Volume>`, but 
+this name is not tied to the asset data. Instead, a Volume defines fields using 
+names appropriate for the Volume and/or rendering pipeline. Additionally, being 
+able to define a field name at the Volume level lets you re-use Field prims for 
+multiple volume fields if needed.
+
+For example, you might have a situation where your Volume needs a "velocity" 
+field for the purposes of shader parameters, but you have an OpenVDB asset with 
+a grid named "vel". You would specify a `field:velocity` relationship in your
+Volume prim to the OpenVDBAsset that references the desired VDB data with a
+"vel" fieldName.
diff --git a/pxr/usd/usdVol/userDoc/schemaUserDoc.usda b/pxr/usd/usdVol/userDoc/schemaUserDoc.usda
new file mode 100644
index 0000000000..604154c63f
--- /dev/null
+++ b/pxr/usd/usdVol/userDoc/schemaUserDoc.usda
@@ -0,0 +1,302 @@
+#usda 1.0
+(
+    subLayers = [
+        # Sublayer "parent" user doc to get user doc for inherited properties.
+        #@usdGeom/userDoc/schemaUserDoc.usda@        
+        # Sublayer domain schema.usda to get proper schema inheritance structure 
+        # and property fallback values. User doc is added as overs to schema 
+        # class metadata. 
+        @../schema.usda@
+    ]
+)
+
+over "GLOBAL" (
+    customData = {
+        string libraryName = "usdVol"
+        string userDocTitle = "Volumes"
+    }
+)
+{
+}
+ 
+over Volume "Volume" (
+    customData = {
+        string userDocBrief = """A renderable volume containing one or more
+volumetric data fields, used to represent a volume effect such as smoke or fire."""
+        string userDoc = """A renderable volume containing one or more
+volumetric data fields, used to represent a volume effect such as smoke or fire.
+
+Volume inherits from GPrim and inherits GPrim and Imageable schema properties,
+so volumes are transformable, renderable, can have a material binding, etc.
+
+Volume also contains any number of volumetric fields, specified via 
+relationships to FieldBase-derived primitives using a namespace prefix of 
+"field". The relationship names, such as "density", are used by the renderer to 
+associate individual fields with the named input parameters on a volume shader.
+
+For example, the following Volume defines a field relationship to an 
+OpenVDBField asset. The field relationship name specifies that the OpenVDB asset 
+contains data that the renderer and volume shader should use to render the 
+optical density ("extinction") of the volume.
+
+```{code-block} usda
+def Volume "Volume" (
+)
+{
+    custom rel field:extinction = </Volume/densityVDB>
+    uniform token purpose = "render"
+
+    def OpenVDBAsset "densityVDB"
+    {
+        token fieldName = "density"
+        asset filePath = @/vdbdata/smoke_plume.101.vdb@,
+        }
+    }
+}
+
+```
+
+See {ref}`usdVol_working_with_volumes` for best practices when working with
+Volumes.
+"""
+    }
+)
+{
+}
+
+over "FieldBase" (
+    customData = {
+        string userDocBrief = """The base schema class for volume field primitives."""
+        string userDoc = """FieldBase is an abstract schema that acts as the
+base class for all UsdVol field schemas. If you need to extend UsdVol with your
+own custom Field schemas, your Field schemas should directly or indirectly
+inherit from FieldBase.
+
+```{admonition} Don't Create FieldBase Prims Directly
+:class: note
+
+As FieldBase is an abstract schema, in practice you will most likely use one
+of the various derived field schemas when creating new field prims, such as 
+OpenVDBAsset or Field3DAsset.
+```
+"""
+    }    
+)
+{
+}
+
+over "FieldAsset" (
+    customData = {
+        string userDocBrief = """The base schema class for volume field 
+primitives defined by an external file."""
+        string userDoc = """FieldAsset is an abstract schema (that inherits
+from {ref}`FieldBase`) that represents a volumetric field
+where the volumetric data is stored outside the layer, e.g. in a file asset.
+It is used as a base class for schemas that reference specific volume data
+asset types, such as OpenVDB data. 
+
+If you need to extend UsdVol with your own custom file-based field schemas, 
+your custom schemas should inherit from FieldAsset.
+
+```{admonition} Create Prims Using FieldAsset-derived Schemas
+:class: note
+
+Like FieldBase, FieldAsset is an abstract schema. In practice you will most
+likely create prims using one of the field schemas that inherit from FieldAsset,
+such as OpenVDBAsset or Field3DAsset.
+```
+"""
+    }
+)
+{
+    asset filePath (
+        customData = {
+            string userDocBrief = """An asset path attribute that points to a file on disk."""
+            string userDoc = """An asset path attribute that points to a file on disk.
+
+The asset pointed to by filePath must be a file type that the FieldAsset-derived
+schema supports. For example, for OpenVDBAsset, the file type must be an 
+OpenVDB (.vdb) file. For Field3DAsset, the file type must be a Field3D (.f3d)
+file.
+
+This attribute's value can be animated over time, as most
+volume asset formats represent just a single timeSample of
+a volume. However, it does not, at this time, support
+any pattern substitutions like \"$F\". 
+
+See {ref}`usdVol_using_animated_field_data` for an example of using `filePath`
+to refer to animated volumetric data.
+"""
+            }
+    )
+    token fieldName (
+        customData = {
+            string userDocBrief = """Name of an individual field within the file 
+specified by the filePath attribute."""
+            string userDoc = """Represents the name of an individual field within
+a FieldAsset asset file. 
+
+A FieldAsset file asset may contain multiple fields in a single asset file. This 
+attribute specifies the name of field **within** the asset file. For example, an 
+OpenVDB file asset might have multiple named Grids, such as "density", 
+"temperature", etc. `fieldName` would specify one of the named Grids in the 
+OpenVDB file asset.
+
+Note that a Volume also provides a way to specify the "name" for a field, via 
+the field relationship. This name is not associated with asset data and is used 
+by the Volume for organizing fields for the rendering pipeline. See
+{ref}`usdVol_understanding_fieldname` for more details on how the field's 
+relationship name differs from `fieldName`.
+"""
+        }
+    )
+    int fieldIndex (
+        customData = {
+            string userDocBrief = """Optional attribute that stores an index used 
+to disambiguate between fields with the same name."""
+            string userDoc = """The index of a field within a FieldAsset asset
+file. This attribute is optional.
+
+An asset file can contain multiple fields with the same name. This optional 
+attribute is an index used to disambiguate between multiple fields with the same 
+name. For example, in an OpenVDB file asset, there might be two Grids named 
+"density". A `fieldIndex` of 0 would specify that this Field refers to the first 
+"density" Grid.
+"""
+        }
+    )
+    token fieldDataType (
+        customData = {
+            string userDocBrief = """Token used to indicate the data type of an
+individual field"""
+            string userDoc = """The data type of a field, such as "float".
+
+Use this attribute to tell consumers more about the field without requiring the 
+consumer access the asset file directly. The list of allowed tokens is specified 
+with the specific asset type. A missing value is considered an error."""
+        }
+    )
+    token vectorDataRoleHint (
+        customData = {
+            string userDocBrief = """Optional token used to indicate the role of 
+a vector valued field."""
+            string userDoc = """Specifies the role of a vector valued field,
+such as "Color". This can drive the data type in which fields are made available 
+in a renderer or whether the vector values are to be transformed. This attribute 
+is optional.
+
+This token can drive the data type in which fields are made available in a 
+renderer or whether the vector values are to be transformed. Allowed tokens 
+include `None`, `Point`, `Normal`, `Vector`, and `Color`.
+"""
+        }
+    )
+}
+ 
+over Field3DAsset "Field3DAsset" (
+    customData = {
+        string userDocBrief = """Field3D field primitive."""
+        string userDoc = """A Field representing a Field3D volume field. See
+the [Field3D github repo](https://github.com/imageworks/Field3D/tree/master)
+for more information on Field3D.
+
+An example Field3DAsset referencing a single density field in a .f3d file:
+
+```{code-block} usda
+def Field3DAsset "densityField3D"
+{
+    token fieldDataType = "float"
+    token fieldName = "density"
+    token fieldPurpose = "cluster_0"
+    asset filePath.timeSamples = {
+        1: @/f3ddata/Volumes_Cumulus01_Puff01M.1.f3d@,
+    }
+}
+```
+
+The FieldAsset `filePath` attribute must specify a file in the Field3D (.f3d) 
+format on disk.
+"""
+    }
+)
+{
+    token fieldDataType (
+        customData = {
+            string userDocBrief = """Token used to indicate the data type of an
+individual field."""
+            string userDoc = """The data type of a field, such as "float".
+
+Use this attribute to tell consumers more about the field without requiring the 
+consumer access the asset file directly. The list of allowed tokens reflects the 
+available choices for Field3D. 
+"""
+        }
+    )
+    token fieldPurpose (
+        customData = {
+            string userDocBrief = """Optional token used to indicate the purpose or 
+grouping of an individual field."""
+            string userDoc = """Specifies the purpose or grouping of an 
+individual field. Clients which consume Field3D files should treat this as the 
+Field3D field *name*. This attribute is optional.
+"""
+        }
+    )
+}
+ 
+over OpenVDBAsset "OpenVDBAsset" (
+    customData = {
+        string userDocBrief = """OpenVDB field primitive."""
+        string userDoc = """A Field representing an OpenVDB volume grid. See
+the [OpenVDB website](https://www.openvdb.org/documentation/doxygen/index.html)
+for more information on OpenVDB.
+
+An example OpenVDBAsset referencing a single density field in a .vdb file:
+
+```{code-block} usda
+def OpenVDBAsset "densityVDB"
+{
+    token fieldDataType = "float"
+    int fieldIndex.timeSamples = {
+        10: 0,
+    }
+    token fieldName = "density"
+    asset filePath.timeSamples = {
+        10: @/vdb_test_data/grids.vdb@,
+    }
+}
+
+```
+
+The FieldAsset `filePath` attribute must specify a file in the OpenVDB (.vdb) 
+format on disk.
+"""
+    }
+)
+{
+    token fieldDataType (
+        customData = {
+            string userDocBrief = """Token used to indicate the data type of an
+individual field."""
+            string userDoc = """The data type of a field, such as "float".
+
+Use this attribute to tell consumers more about the field without requiring the 
+consumer access the asset file directly. The list of allowed tokens reflects the 
+available choices for OpenVDB volumes. 
+"""
+        }
+    )
+    token fieldClass (
+        customData = {
+            string userDocBrief = """Optional token used to indicate the class of
+an individual grid."""
+            string userDoc = """Represents the class of an individual grid.
+This attribute is optional.
+
+This is a mapping to OpenVDB's openvdb::GridClass where the values are 
+`GRID_LEVEL_SET`, `GRID_FOG_VOLUME`, `GRID_STAGGERED`, and `GRID_UNKNOWN`.
+"""
+        }
+    )
+}
+
diff --git a/pxr/usd/usdVol/userDoc/volExample.png b/pxr/usd/usdVol/userDoc/volExample.png
new file mode 100644
index 0000000000..1bd4ba06de
Binary files /dev/null and b/pxr/usd/usdVol/userDoc/volExample.png differ
diff --git a/pxr/usd/usdVol/volume.cpp b/pxr/usd/usdVol/volume.cpp
index 330ed30872..c0e8ed93aa 100644
--- a/pxr/usd/usdVol/volume.cpp
+++ b/pxr/usd/usdVol/volume.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/volume.h"
 #include "pxr/usd/usd/schemaRegistry.h"
diff --git a/pxr/usd/usdVol/volume.h b/pxr/usd/usdVol/volume.h
index e1c93979f4..3ef96889fc 100644
--- a/pxr/usd/usdVol/volume.h
+++ b/pxr/usd/usdVol/volume.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef USDVOL_GENERATED_VOLUME_H
 #define USDVOL_GENERATED_VOLUME_H
diff --git a/pxr/usd/usdVol/wrapField3DAsset.cpp b/pxr/usd/usdVol/wrapField3DAsset.cpp
index 5cad5fa0c4..faf89124ad 100644
--- a/pxr/usd/usdVol/wrapField3DAsset.cpp
+++ b/pxr/usd/usdVol/wrapField3DAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/field3DAsset.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdVol/wrapFieldAsset.cpp b/pxr/usd/usdVol/wrapFieldAsset.cpp
index b60159f65b..c0195b8ca6 100644
--- a/pxr/usd/usdVol/wrapFieldAsset.cpp
+++ b/pxr/usd/usdVol/wrapFieldAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/fieldAsset.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdVol/wrapFieldBase.cpp b/pxr/usd/usdVol/wrapFieldBase.cpp
index 23bbb4dd64..c9e3b462c2 100644
--- a/pxr/usd/usdVol/wrapFieldBase.cpp
+++ b/pxr/usd/usdVol/wrapFieldBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/fieldBase.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdVol/wrapOpenVDBAsset.cpp b/pxr/usd/usdVol/wrapOpenVDBAsset.cpp
index 057de7c3c4..39c5283bb3 100644
--- a/pxr/usd/usdVol/wrapOpenVDBAsset.cpp
+++ b/pxr/usd/usdVol/wrapOpenVDBAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/openVDBAsset.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usd/usdVol/wrapTokens.cpp b/pxr/usd/usdVol/wrapTokens.cpp
index d6521e759e..94975a4404 100644
--- a/pxr/usd/usdVol/wrapTokens.cpp
+++ b/pxr/usd/usdVol/wrapTokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // GENERATED FILE.  DO NOT EDIT.
 #include <boost/python/class.hpp>
diff --git a/pxr/usd/usdVol/wrapVolume.cpp b/pxr/usd/usdVol/wrapVolume.cpp
index 409434c532..53ed4c33a2 100644
--- a/pxr/usd/usdVol/wrapVolume.cpp
+++ b/pxr/usd/usdVol/wrapVolume.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usd/usdVol/volume.h"
 #include "pxr/usd/usd/schemaBase.h"
diff --git a/pxr/usdImaging/bin/testusdview/CMakeLists.txt b/pxr/usdImaging/bin/testusdview/CMakeLists.txt
index 529df06436..84f90d310a 100644
--- a/pxr/usdImaging/bin/testusdview/CMakeLists.txt
+++ b/pxr/usdImaging/bin/testusdview/CMakeLists.txt
@@ -283,6 +283,16 @@ pxr_install_test_dir(
     DEST testUsdviewLights_yup
 )
 
+pxr_install_test_dir(
+    SRC testenv/testUsdviewSceneLights
+    DEST testUsdviewSceneLights
+)
+
+pxr_install_test_dir(
+    SRC testenv/testUsdviewSceneLights
+    DEST testUsdviewSceneLights_Delegate
+)
+
 pxr_install_test_dir(
     SRC testenv/testUsdviewLightVisibility
     DEST testUsdviewLightVisibility
@@ -719,6 +729,48 @@ pxr_register_test(testUsdviewLights_yup
     EXPECTED_RETURN_CODE 0
 )
 
+pxr_register_test(testUsdviewSceneLights
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewSceneLights.py test.usda"
+    IMAGE_DIFF_COMPARE
+        camera_noScene_GL.png
+        camera_scene_GL.png
+        domeVis_noScene_GL.png
+        domeVis_scene_GL.png
+        domeInvis_noScene_GL.png
+        domeInvis_scene_GL.png
+        sceneLights_GL.png
+        sceneLights_edit_GL.png
+        noLights_GL.png
+    FAIL 0.05
+    FAIL_PERCENT 0.03
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=1
+)
+
+pxr_register_test(testUsdviewSceneLights_Delegate
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewSceneLights.py test.usda"
+    IMAGE_DIFF_COMPARE
+        camera_noScene_GL.png
+        camera_scene_GL.png
+        domeVis_noScene_GL.png
+        domeVis_scene_GL.png
+        domeInvis_noScene_GL.png
+        domeInvis_scene_GL.png
+        sceneLights_GL.png
+        sceneLights_edit_GL.png
+        noLights_GL.png
+    FAIL 0.05
+    FAIL_PERCENT 0.03
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=0
+)
+
 pxr_register_test(testUsdviewLightVisibility
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLightVisibility.py test.usda"
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAdditive/shader1.glslfx b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAdditive/shader1.glslfx
index dd8dfbcc7e..93f4ee9048 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAdditive/shader1.glslfx
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAdditive/shader1.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAdditive/testUsdviewAdditive.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAdditive/testUsdviewAdditive.py
index 92d5821a14..e80bce7ab0 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAdditive/testUsdviewAdditive.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAdditive/testUsdviewAdditive.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def _modifySettings(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAlive/testAlive.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAlive/testAlive.py
index 4bd676555d..2c1e1f81ba 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAlive/testAlive.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAlive/testAlive.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def testUsdviewInputFunction(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAlive/testUsdviewAliveSetup.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAlive/testUsdviewAliveSetup.py
index 3dd6443b9c..79d412e286 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAlive/testUsdviewAliveSetup.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAlive/testUsdviewAliveSetup.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 from pxr import Usd, UsdGeom
 
 s = Usd.Stage.CreateInMemory()
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAnimatedBounds/testUsdviewAnimatedBounds.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAnimatedBounds/testUsdviewAnimatedBounds.py
index 64d3af83e9..73cd224fbf 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAnimatedBounds/testUsdviewAnimatedBounds.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewAnimatedBounds/testUsdviewAnimatedBounds.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 NUM_TIME_SAMPLES = 3
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewBackgroundColor/testUsdviewBackgroundColor.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewBackgroundColor/testUsdviewBackgroundColor.py
index 4f130e74d1..5037cb19f8 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewBackgroundColor/testUsdviewBackgroundColor.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewBackgroundColor/testUsdviewBackgroundColor.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view.
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewCameraMaskMode/testUsdviewCameraMaskMode.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewCameraMaskMode/testUsdviewCameraMaskMode.py
index 5096f6fc1e..8c2ce25be1 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewCameraMaskMode/testUsdviewCameraMaskMode.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewCameraMaskMode/testUsdviewCameraMaskMode.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Usdviewq.qt import QtWidgets
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/testUsdviewClippingPlanes.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/testUsdviewClippingPlanes.py
index 14fee698f4..c4240fd862 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/testUsdviewClippingPlanes.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/testUsdviewClippingPlanes.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Gf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewColorManagement/testUsdviewColorManagement.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewColorManagement/testUsdviewColorManagement.py
index 76c9c5accf..392e995bbd 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewColorManagement/testUsdviewColorManagement.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewColorManagement/testUsdviewColorManagement.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # The OCIO env var is set to the test.ocio config in the test directory before
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewComplexity/testUsdviewComplexity.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewComplexity/testUsdviewComplexity.py
index 2a1d055c97..cfe8fa5759 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewComplexity/testUsdviewComplexity.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewComplexity/testUsdviewComplexity.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.UsdAppUtils.complexityArgs import RefinementComplexities
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDeactivate/testUsdviewDeactivate.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDeactivate/testUsdviewDeactivate.py
index fc86e78aa6..255e339d20 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDeactivate/testUsdviewDeactivate.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDeactivate/testUsdviewDeactivate.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultFontFamily/testUsdviewDefaultFontFamily.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultFontFamily/testUsdviewDefaultFontFamily.py
index b8885671c6..4dbc19745a 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultFontFamily/testUsdviewDefaultFontFamily.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultFontFamily/testUsdviewDefaultFontFamily.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Usdviewq.qt import QtWidgets
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/testUsdviewDefaultMaterial.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/testUsdviewDefaultMaterial.py
index 5597058e8f..b3af6cda90 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/testUsdviewDefaultMaterial.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/testUsdviewDefaultMaterial.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Set all light settings and refresh the view.
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_1.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_1.py
index 6b10f80655..420dc24212 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_1.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_1.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def testUsdviewInputFunction(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_2.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_2.py
index 800082cab9..e558d2acf2 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_2.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_2.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def testUsdviewInputFunction(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_3.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_3.py
index 84ce0687e5..2a76283cf8 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_3.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_3.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def testUsdviewInputFunction(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_4.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_4.py
index cd80617954..0a844e2a19 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_4.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDetachedLayers/testDetachedLayers_4.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def testUsdviewInputFunction(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/firstFilter.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/firstFilter.png
index fcd52822ee..a56b6a4bb7 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/firstFilter.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/firstFilter.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/multiFilters1.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/multiFilters1.png
index 6537bd9739..6f5ae36cd1 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/multiFilters1.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/multiFilters1.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/multiFilters2.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/multiFilters2.png
index 0be3877ff9..c5585a2875 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/multiFilters2.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/multiFilters2.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/secondFilter.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/secondFilter.png
index 7f74731818..5586aea437 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/secondFilter.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/secondFilter.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/secondFilter_modified.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/secondFilter_modified.png
index 2390bd36ec..708f465969 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/secondFilter_modified.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/baseline/secondFilter_modified.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/testUsdviewDisplayFilterEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/testUsdviewDisplayFilterEdits.py
index d67c34f316..02e28affc1 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/testUsdviewDisplayFilterEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDisplayFilterEdits/testUsdviewDisplayFilterEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import UsdShade, Gf
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewEmbreeRenderer/testUsdviewEmbreeRenderer.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewEmbreeRenderer/testUsdviewEmbreeRenderer.py
index 6db153267b..8b567258fd 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewEmbreeRenderer/testUsdviewEmbreeRenderer.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewEmbreeRenderer/testUsdviewEmbreeRenderer.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def _modifySettings(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewExpressionVariableEdits/testUsdviewExpressionVariableEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewExpressionVariableEdits/testUsdviewExpressionVariableEdits.py
index f7faa34381..6302d7a1c5 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewExpressionVariableEdits/testUsdviewExpressionVariableEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewExpressionVariableEdits/testUsdviewExpressionVariableEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view, and enable autoClip
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFieldOfView/testUsdviewFieldOfView.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFieldOfView/testUsdviewFieldOfView.py
index 3b9983fe28..78789eba49 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFieldOfView/testUsdviewFieldOfView.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFieldOfView/testUsdviewFieldOfView.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view.
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/test.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/test.py
index 2988ad08b7..13d79eb2ce 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/test.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/test.py
@@ -1,2 +1,8 @@
+#
+# Copyright 2016 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 from __future__ import print_function
 print("hello I am a python file")
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/testInvalidFileArg.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/testInvalidFileArg.py
index c2b150a35f..e231f6c9b2 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/testInvalidFileArg.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/testInvalidFileArg.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def testUsdviewInputFunction(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/testValidFileArg.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/testValidFileArg.py
index cf6c8c910f..532c1341be 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/testValidFileArg.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFileArguments/testValidFileArg.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def testUsdviewInputFunction(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFrameSelection/testUsdviewFrameSelection.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFrameSelection/testUsdviewFrameSelection.py
index 939a4f0da9..9723fd3949 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFrameSelection/testUsdviewFrameSelection.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFrameSelection/testUsdviewFrameSelection.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Usdviewq.qt import QtWidgets
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCamera/testUsdviewFreeCamera.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCamera/testUsdviewFreeCamera.py
index 4d4727c1cc..e1e42be7b6 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCamera/testUsdviewFreeCamera.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCamera/testUsdviewFreeCamera.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Usdviewq.freeCamera import FreeCamera
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCameraAspect/testUsdviewFreeCameraAspect.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCameraAspect/testUsdviewFreeCameraAspect.py
index 1495f7480f..29f2e8f0c3 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCameraAspect/testUsdviewFreeCameraAspect.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCameraAspect/testUsdviewFreeCameraAspect.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view.
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInfGeom/testUsdviewInfGeom.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInfGeom/testUsdviewInfGeom.py
index 4bb9e61ac2..3119b1379d 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInfGeom/testUsdviewInfGeom.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInfGeom/testUsdviewInfGeom.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Usdviewq.common import Usd, UsdGeom
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInstancingEdits/testUsdviewInstancingEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInstancingEdits/testUsdviewInstancingEdits.py
index fa89b814b8..73fbed5d03 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInstancingEdits/testUsdviewInstancingEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInstancingEdits/testUsdviewInstancingEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Usdviewq.qt import QtWidgets
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/directLighting.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/directLighting.png
index 9950e18f56..2cd61d4d2a 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/directLighting.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/directLighting.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/directLighting_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/directLighting_sphereAsMesh.png
index b5ca5338c8..2c584ff19a 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/directLighting_sphereAsMesh.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/directLighting_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer.png
index 0da1f1faeb..70b7a346ac 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_modified.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_modified.png
index b3fc6daa07..248a197f2a 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_modified.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_modified.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_modified_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_modified_sphereAsMesh.png
index 049b7f3f73..c3124c71e2 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_modified_sphereAsMesh.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_modified_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_sphereAsMesh.png
index 93d99a113e..398f46af1d 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_sphereAsMesh.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/baseline/pathTracer_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/testUsdviewIntegratorEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/testUsdviewIntegratorEdits.py
index 115c875e85..f4040f80ac 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/testUsdviewIntegratorEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewIntegratorEdits/testUsdviewIntegratorEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import UsdShade
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInterpreterNoRender/testUsdviewInterpreterNoRender.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInterpreterNoRender/testUsdviewInterpreterNoRender.py
index d41c412ddf..f63a37630f 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInterpreterNoRender/testUsdviewInterpreterNoRender.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInterpreterNoRender/testUsdviewInterpreterNoRender.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Leaving these in for future debugging
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/testUsdviewLightVisibility.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/testUsdviewLightVisibility.py
index bed3e8ae28..9c02b8a06c 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/testUsdviewLightVisibility.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/testUsdviewLightVisibility.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/testUsdviewVaryLightVisibility.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/testUsdviewVaryLightVisibility.py
index 6ce0969efa..4f748bdda9 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/testUsdviewVaryLightVisibility.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/testUsdviewVaryLightVisibility.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/testUsdviewLights.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/testUsdviewLights.py
index ecba6e7d90..2a9ba67ccd 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/testUsdviewLights.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/testUsdviewLights.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view.
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/testUsdviewLightsYup.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/testUsdviewLightsYup.py
index a374a03e51..deb57c6255 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/testUsdviewLightsYup.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/testUsdviewLightsYup.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view.
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightsPrman/testUsdviewLightsPrman.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightsPrman/testUsdviewLightsPrman.py
index 505d80686f..899ac1587d 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightsPrman/testUsdviewLightsPrman.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightsPrman/testUsdviewLightsPrman.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view.
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPlugin/__init__.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPlugin/__init__.py
index 27e626d492..29f0f46ec1 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPlugin/__init__.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPlugin/__init__.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 from __future__ import print_function
 
 from pxr import Tf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginChained/__init__.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginChained/__init__.py
index 7f41710249..19bd330448 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginChained/__init__.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginChained/__init__.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 from __future__ import print_function
 
 from pxr import Tf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginDuplicateCommand/__init__.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginDuplicateCommand/__init__.py
index c790c540d8..d4f4ae2509 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginDuplicateCommand/__init__.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginDuplicateCommand/__init__.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 from __future__ import print_function
 
 from pxr import Tf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginMissingContainer/__init__.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginMissingContainer/__init__.py
index b571979940..789d06ce43 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginMissingContainer/__init__.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginMissingContainer/__init__.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 from __future__ import print_function
 
 from pxr import Tf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginMultipleContainers/__init__.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginMultipleContainers/__init__.py
index 1877018771..f8d07dd15c 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginMultipleContainers/__init__.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/plugins/extraPluginMultipleContainers/__init__.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 from __future__ import print_function
 
 from pxr import Tf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_alive.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_alive.py
index a6258975ee..176a0e44b3 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_alive.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_alive.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import os, sys
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_chained.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_chained.py
index 70548391ea..eb63970241 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_chained.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_chained.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import os, sys
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_duplicateCommand.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_duplicateCommand.py
index bd2027eefe..9ae7a044cb 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_duplicateCommand.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_duplicateCommand.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import os, sys
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_missingContainer.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_missingContainer.py
index 341c8d6708..293a5ec62a 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_missingContainer.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_missingContainer.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import os, sys
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_multipleContainers.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_multipleContainers.py
index 1dbba2733c..16f2642cc8 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_multipleContainers.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLoadPlugins/testUsdviewLoadPlugins_multipleContainers.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import os, sys
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMaterialEdits/testUsdviewMaterialEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMaterialEdits/testUsdviewMaterialEdits.py
index 20f43a2f9d..332a5b072a 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMaterialEdits/testUsdviewMaterialEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMaterialEdits/testUsdviewMaterialEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import UsdShade
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMeshBounds/testUsdviewMeshBounds.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMeshBounds/testUsdviewMeshBounds.py
index 4059e272ed..54498cb8d9 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMeshBounds/testUsdviewMeshBounds.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMeshBounds/testUsdviewMeshBounds.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr.Usdviewq.qt import QtWidgets
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMetadatatabSelect/testUsdviewMetadatatabSelect.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMetadatatabSelect/testUsdviewMetadatatabSelect.py
index bbcfe584c1..ea225d73e7 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMetadatatabSelect/testUsdviewMetadatatabSelect.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewMetadatatabSelect/testUsdviewMetadatatabSelect.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 def _testSelectionChangeScrollPosition(appController):
     # A test to ensure changing the selection in the metadata
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewNavigationKeys/testUsdviewNavigationKeys.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewNavigationKeys/testUsdviewNavigationKeys.py
index 1fc946798e..d3547cd3a0 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewNavigationKeys/testUsdviewNavigationKeys.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewNavigationKeys/testUsdviewNavigationKeys.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Leaving these in for future debugging
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewNoPlugins/testUsdviewNoPlugins.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewNoPlugins/testUsdviewNoPlugins.py
index 53864b95f2..caa72dea14 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewNoPlugins/testUsdviewNoPlugins.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewNoPlugins/testUsdviewNoPlugins.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def _testBasic(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewOIT/shader1.glslfx b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewOIT/shader1.glslfx
index c6f325e79e..33b25d7437 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewOIT/shader1.glslfx
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewOIT/shader1.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewOIT/testUsdviewOIT.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewOIT/testUsdviewOIT.py
index f8df0d56f8..151a3e1a4f 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewOIT/testUsdviewOIT.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewOIT/testUsdviewOIT.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def _modifySettings(appController):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPickMode/testUsdviewPickMode.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPickMode/testUsdviewPickMode.py
index 3813e84ae4..97f73b767c 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPickMode/testUsdviewPickMode.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPickMode/testUsdviewPickMode.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Sdf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPointInstancerVariant/testUsdviewPointInstancerVariant.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPointInstancerVariant/testUsdviewPointInstancerVariant.py
index b01fdd23db..82bea4033d 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPointInstancerVariant/testUsdviewPointInstancerVariant.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPointInstancerVariant/testUsdviewPointInstancerVariant.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import UsdShade, Gf
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPointWidths/testUsdviewPointWidths.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPointWidths/testUsdviewPointWidths.py
index 7e657a6799..a15287788b 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPointWidths/testUsdviewPointWidths.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPointWidths/testUsdviewPointWidths.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimPathBar/testUsdviewPrimPathBar.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimPathBar/testUsdviewPrimPathBar.py
index 31ff0ceda8..3093de0719 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimPathBar/testUsdviewPrimPathBar.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimPathBar/testUsdviewPrimPathBar.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Sdf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimSearch/testUsdviewPrimSearch.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimSearch/testUsdviewPrimSearch.py
index 4043d631e2..9502a8fa52 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimSearch/testUsdviewPrimSearch.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimSearch/testUsdviewPrimSearch.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def _assertSelectedPrim(appController, primName):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimTreeExpansion/testUsdviewPrimTreeExpansion.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimTreeExpansion/testUsdviewPrimTreeExpansion.py
index 5a7d5f4b5a..060c0c247c 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimTreeExpansion/testUsdviewPrimTreeExpansion.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimTreeExpansion/testUsdviewPrimTreeExpansion.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # positions and names of our variants
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimvarEdits/testUsdviewPrimvarEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimvarEdits/testUsdviewPrimvarEdits.py
index 440e35002b..1bbdeda69c 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimvarEdits/testUsdviewPrimvarEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPrimvarEdits/testUsdviewPrimvarEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPropertySearch/testUsdviewPropertySearch.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPropertySearch/testUsdviewPropertySearch.py
index f53de91463..5d6b51f7ec 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPropertySearch/testUsdviewPropertySearch.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewPropertySearch/testUsdviewPropertySearch.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def _assertSelectedProp(appController, propName):
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewReloadReopen/testUsdviewReloadReopen.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewReloadReopen/testUsdviewReloadReopen.py
index eac2b9f42e..63a4ecb3c6 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewReloadReopen/testUsdviewReloadReopen.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewReloadReopen/testUsdviewReloadReopen.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr.Usdviewq.qt import QtWidgets
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderMode/testUsdviewRenderMode.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderMode/testUsdviewRenderMode.py
index 951b43aede..590a42000d 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderMode/testUsdviewRenderMode.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderMode/testUsdviewRenderMode.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Sdf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/basline/DofDisabled.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/basline/DofDisabled.png
index 47eb30a3d3..366d87aa16 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/basline/DofDisabled.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/basline/DofDisabled.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/basline/DofEnabled.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/basline/DofEnabled.png
index 42242d3fae..6e1fc8bd2c 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/basline/DofEnabled.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/basline/DofEnabled.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/testUsdviewRenderSettingsEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/testUsdviewRenderSettingsEdits.py
index 8aed29236d..237d2600a2 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/testUsdviewRenderSettingsEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderSettingsEdits/testUsdviewRenderSettingsEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import UsdShade
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleAndDisplayFilters/baseline/displayOnly.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleAndDisplayFilters/baseline/displayOnly.png
index 7d3c2ad034..1432d56cbc 100644
Binary files a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleAndDisplayFilters/baseline/displayOnly.png and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleAndDisplayFilters/baseline/displayOnly.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleAndDisplayFilters/testUsdviewSampleAndDisplayFilters.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleAndDisplayFilters/testUsdviewSampleAndDisplayFilters.py
index af1acfd4b5..33b6bdc401 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleAndDisplayFilters/testUsdviewSampleAndDisplayFilters.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleAndDisplayFilters/testUsdviewSampleAndDisplayFilters.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import UsdShade
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleFilterEdits/testUsdviewSampleFilterEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleFilterEdits/testUsdviewSampleFilterEdits.py
index 4c3bb74f33..eff3f1a9fd 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleFilterEdits/testUsdviewSampleFilterEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSampleFilterEdits/testUsdviewSampleFilterEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import UsdShade
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_GL.png
new file mode 100644
index 0000000000..ccc5ea1e25
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_Prman.png
new file mode 100644
index 0000000000..9874e95b48
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..30c8e50931
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_noScene_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_GL.png
new file mode 100644
index 0000000000..7968b7315a
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_Prman.png
new file mode 100644
index 0000000000..1ff0eac38f
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..5e4b735fb7
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/camera_scene_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_GL.png
new file mode 100644
index 0000000000..87aa1f8b76
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_Prman.png
new file mode 100644
index 0000000000..c00f22e518
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..b1f4b4b03a
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_noScene_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_GL.png
new file mode 100644
index 0000000000..2aa60c2a96
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_Prman.png
new file mode 100644
index 0000000000..7c525129fc
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..ad4ce88696
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeInvis_scene_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_GL.png
new file mode 100644
index 0000000000..51d7472024
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_Prman.png
new file mode 100644
index 0000000000..f0fa12e509
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..021069ff5d
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_noScene_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_GL.png
new file mode 100644
index 0000000000..6433d0cbe0
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_Prman.png
new file mode 100644
index 0000000000..ce04d8b787
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..6dc7f59f24
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/domeVis_scene_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_GL.png
new file mode 100644
index 0000000000..8c6e35c29d
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_Prman.png
new file mode 100644
index 0000000000..97e98d3f0e
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..ce54def4da
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/noLights_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_GL.png
new file mode 100644
index 0000000000..b0984d424e
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_Prman.png
new file mode 100644
index 0000000000..4ffb8413d8
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..1f10f5bbc9
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_GL.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_GL.png
new file mode 100644
index 0000000000..d8a78cc74e
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_GL.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_Prman.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_Prman.png
new file mode 100644
index 0000000000..970763f347
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_Prman.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_Prman_sphereAsMesh.png b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_Prman_sphereAsMesh.png
new file mode 100644
index 0000000000..694b2a693a
Binary files /dev/null and b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/baseline/sceneLights_edit_Prman_sphereAsMesh.png differ
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/test.usda
new file mode 100644
index 0000000000..7270ee92b5
--- /dev/null
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/test.usda
@@ -0,0 +1,26 @@
+#usda 1.0
+(
+    upAxis = "Z"
+)
+
+def Scope "World"
+{
+    def Sphere "Sphere" (
+        prepend apiSchemas = ["MaterialBindingAPI"]
+    )
+    {
+        color3f[] primvars:displayColor = [(0.1, 0.5, 0.5)]
+        double radius = 0.5
+    }
+}
+
+def Scope "Lights" 
+{
+    def SphereLight "light1"
+    {
+        color3f inputs:color = (1, 1, 1)
+        float inputs:intensity = 20
+        double3 xformOp:translate = (3, -3, 0)
+        uniform token[] xformOpOrder = ["xformOp:translate"]
+    }
+}
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/testUsdviewSceneLights.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/testUsdviewSceneLights.py
new file mode 100644
index 0000000000..1d8f867467
--- /dev/null
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSceneLights/testUsdviewSceneLights.py
@@ -0,0 +1,119 @@
+#!/pxrpythonsubst
+#
+# Copyright 2024 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+
+# Remove any unwanted visuals from the view.
+def _modifySettings(appController):
+    appController._dataModel.viewSettings.showBBoxes = False
+    appController._dataModel.viewSettings.showHUD = False
+
+# Set builtin light settings and refresh the view.
+def _setBuiltinLights(appController, cameraLight, domeLight, domeCamVis):
+    appController._ui.actionAmbient_Only.setChecked(cameraLight)
+    appController._ambientOnlyClicked(cameraLight)
+
+    appController._ui.actionDomeLight.setChecked(domeLight)
+    appController._onDomeLightClicked(domeLight)
+
+    appController._ui.actionDomeLightTexturesVisible.setChecked(domeCamVis)
+    appController._onDomeLightTexturesVisibleClicked(domeCamVis)
+
+# Set SceneLights enabled or disabled and refresh the view
+def _setSceneLights(appController, sceneLightsEnabled):
+    appController._ui.actionEnable_Scene_Lights.setChecked(sceneLightsEnabled)
+    appController._toggleEnableSceneLights()
+
+def _getRendererAppendedImageName(appController, filename):
+    rendererName = appController._stageView.rendererDisplayName
+    imageName = filename + "_" + rendererName + ".png"
+    print(" -", imageName)
+    return imageName
+
+
+# Test the camera light with scene lights disabled 
+def _testCameraLight(appController):
+    _setBuiltinLights(appController, True, False, False)
+    _setSceneLights(appController, False)
+    filename = _getRendererAppendedImageName(appController, "camera_noScene")
+    appController._takeShot(filename, waitForConvergence=True)
+
+# Test the camera light with scene lights enabled 
+def _testCamera_SceneLight(appController):
+    _setBuiltinLights(appController, True, False, False)
+    _setSceneLights(appController, True)
+    filename = _getRendererAppendedImageName(appController, "camera_scene")
+    appController._takeShot(filename, waitForConvergence=True)
+
+# Test dome light with scene lights disabled
+def _testDomeVis(appController):
+    _setBuiltinLights(appController, False, True, True)
+    _setSceneLights(appController, False)
+    filename = _getRendererAppendedImageName(appController, "domeVis_noScene")
+    appController._takeShot(filename, waitForConvergence=True)
+
+# Test dome light with scene lights disabled
+def _testDomeVis_SceneLight(appController):
+    _setBuiltinLights(appController, False, True, True)
+    _setSceneLights(appController, True)
+    filename = _getRendererAppendedImageName(appController, "domeVis_scene")
+    appController._takeShot(filename, waitForConvergence=True)
+
+# Test dome light with scene lights disabled
+def _testDomeInvis(appController):
+    _setBuiltinLights(appController, False, True, False)
+    _setSceneLights(appController, False)
+    filename = _getRendererAppendedImageName(appController, "domeInvis_noScene")
+    appController._takeShot(filename, waitForConvergence=True)
+
+# Test dome light with scene lights disabled
+def _testDomeInvis_SceneLight(appController):
+    _setBuiltinLights(appController, False, True, False)
+    _setSceneLights(appController, True)
+    filename = _getRendererAppendedImageName(appController, "domeInvis_scene")
+    appController._takeShot(filename, waitForConvergence=True)
+
+# Test scene lights with out any built in lights 
+def _testSceneLights(appController):
+    _setBuiltinLights(appController, False, False, False)
+    _setSceneLights(appController, True)
+    filename = _getRendererAppendedImageName(appController, "sceneLights")
+    appController._takeShot(filename, waitForConvergence=True)
+
+    # Edit the light color of the scene light
+    s = appController._dataModel.stage
+    l = s.GetSessionLayer()
+    s.SetEditTarget(l)
+    light = s.GetPrimAtPath('/Lights/light1')
+    light.GetAttribute('inputs:color').Set((1,0,0))
+    filename = _getRendererAppendedImageName(appController, "sceneLights_edit")
+    appController._takeShot(filename, waitForConvergence=True)
+    
+# Test no built in or scene lights 
+def _testNoLights(appController):
+    _setBuiltinLights(appController, False, False, False)
+    _setSceneLights(appController, False)
+    filename = _getRendererAppendedImageName(appController, "noLights")
+    appController._takeShot(filename, waitForConvergence=True)
+
+
+# Test that lights work properly in usdview.
+def testUsdviewInputFunction(appController):
+    _modifySettings(appController)
+
+    # Builtin Camera light with and without scene lights
+    _testCameraLight(appController)
+    _testCamera_SceneLight(appController)
+
+    # Builtin Dome light (camera Vis and invis) with and without scene lights 
+    _testDomeVis_SceneLight(appController)
+    _testDomeVis(appController)
+    _testDomeInvis(appController)
+    _testDomeInvis_SceneLight(appController)
+
+    # no builtin lights with and without scene lights
+    _testSceneLights(appController)
+    _testNoLights(appController)
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSelectionHighlighting/testUsdviewSelectionHighlighting.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSelectionHighlighting/testUsdviewSelectionHighlighting.py
index 399ce7d49c..4b21330f0f 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSelectionHighlighting/testUsdviewSelectionHighlighting.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSelectionHighlighting/testUsdviewSelectionHighlighting.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Sdf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewShaderEdits/testUsdviewShaderEdits.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewShaderEdits/testUsdviewShaderEdits.py
index dfa7018dbe..d438258eee 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewShaderEdits/testUsdviewShaderEdits.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewShaderEdits/testUsdviewShaderEdits.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import UsdShade
 from pxr import Sdf
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSkinning/testUsdviewSkinning.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSkinning/testUsdviewSkinning.py
index d972f44c66..9fdec6884b 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSkinning/testUsdviewSkinning.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSkinning/testUsdviewSkinning.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewTimeSamples/testUsdviewTimeSamples.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewTimeSamples/testUsdviewTimeSamples.py
index ad982aec71..c72702eb12 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewTimeSamples/testUsdviewTimeSamples.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewTimeSamples/testUsdviewTimeSamples.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 NUM_TIME_SAMPLES = 6
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testUsdviewUpAxis_yUp.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testUsdviewUpAxis_yUp.py
index 9738de3172..fdd847192e 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testUsdviewUpAxis_yUp.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testUsdviewUpAxis_yUp.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view, and enable autoClip
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testUsdviewUpAxis_zUp.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testUsdviewUpAxis_zUp.py
index 94802a099d..287530052c 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testUsdviewUpAxis_zUp.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testUsdviewUpAxis_zUp.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Remove any unwanted visuals from the view, and enable autoClip
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewVariantSelection/testUsdviewVariantSelection.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewVariantSelection/testUsdviewVariantSelection.py
index f45b008db8..ca523e1a1f 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewVariantSelection/testUsdviewVariantSelection.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewVariantSelection/testUsdviewVariantSelection.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr.Usdviewq.qt import QtWidgets
 
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback.py
index f3878e5548..35df767244 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 from __future__ import print_function
 def testUsdviewInputFunction(mw):
     print('callback')
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_1.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_1.py
index 21317afa41..4fcbcd6f91 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_1.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_1.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 # Invalid because we don't match the expected args
 def testUsdviewInputFunction(mw, mw1):
     return 5
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_2.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_2.py
index d9030c336d..249d7d4c92 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_2.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_2.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 # Invalid because we don't match the callback name 
 def testUsdviewInputFunction_(mw):
     return 5
diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_3.py b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_3.py
index 4950c1a3fb..75e772fd17 100644
--- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_3.py
+++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewWrapper/testCallback_Invalid_3.py
@@ -1,3 +1,9 @@
+#
+# Copyright 2018 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
 # Invalid because we have default args 
 def testUsdviewInputFunction(mw=None):
     return 5
diff --git a/pxr/usdImaging/bin/testusdview/testusdview.py b/pxr/usdImaging/bin/testusdview/testusdview.py
index 04ffa8bbcb..8240ee2e48 100644
--- a/pxr/usdImaging/bin/testusdview/testusdview.py
+++ b/pxr/usdImaging/bin/testusdview/testusdview.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # This is a wrapper around Usdview's launcher code to allow injection of a 
@@ -45,26 +28,24 @@ def RegisterOptions(self, parser):
                             help="The test script to run after loading. "
                                  "This script must expect to take a single")
 
-    def Run(self):
-        parser = argparse.ArgumentParser(prog=sys.argv[0],
-                                         description=self.GetHelpDescription())
-        self.RegisterOptions(parser)
-        super(TestUsdView, self).RegisterPositionals(parser)
+    def ParseOptions(self, parser):
         arg_parse_result = super(TestUsdView, self).ParseOptions(parser)
 
         # We always set --defaultsettings to ensure a consistent test 
         # environment for our test scripts.
         arg_parse_result.defaultSettings = True
-        super(TestUsdView, self).ValidateOptions(arg_parse_result)
-        
-        self.__LaunchProcess(arg_parse_result)
+        return arg_parse_result
 
-    def __LaunchProcess(self, arg_parse_result):
-        callBack = self._ValidateTestFile(arg_parse_result.testScript)
-        (app, appController) = (
-            super(TestUsdView, self).LaunchPreamble(
-                arg_parse_result, overrideMaxSamples = False))
+    def OverrideMaxSamples(self):
+        return False
 
+    def LaunchPreamble(self, arg_parse_result):
+        # Load the test script. This must be done before the creation
+        # of the AppController in the base class' LaunchPreamble.
+        self._LoadTestFile(arg_parse_result.testScript)
+        return super(TestUsdView, self).LaunchPreamble(arg_parse_result)
+
+    def LaunchProcess(self, arg_parse_result, app, appController):
         # Set a fixed size on the stage view so that any image tests get a
         # consistent resolution - but only if we've created a viewer
         if appController._stageView:
@@ -72,19 +53,19 @@ def __LaunchProcess(self, arg_parse_result):
 
         # Process initial loading events
         app.processEvents()
-        callBack(appController)
+        self.callBack(appController)
         # Process event triggered by the callbacks
         app.processEvents()
         # Trigger application shutdown.
         app.instance().closeAllWindows()
-        return
 
     # Verify that we have a valid file as input, and it contains
     # our expected entry point for testing.
     #
-    # Upon success, this will return the callback to be called after
-    # launching Usdview and doing the initial load pass
-    def _ValidateTestFile(self, filePath):
+    # Upon success, this will set the callback to be called after
+    # launching Usdview and doing the initial load pass into
+    # self.callBack.
+    def _LoadTestFile(self, filePath):
         if not os.path.exists(filePath):
             sys.stderr.write('Invalid file supplied, does not exist: {}\n'
                 .format(filePath))
@@ -107,8 +88,8 @@ def _ValidateTestFile(self, filePath):
         with open(filePath) as inputFile:
             code = compile(inputFile.read(), filePath, 'exec')
             exec(code, localVars)
-        callBack = localVars.get(TEST_USD_VIEW_CALLBACK_IDENT)
-        if not callBack:
+        self.callBack = localVars.get(TEST_USD_VIEW_CALLBACK_IDENT)
+        if not self.callBack:
             sys.stderr.write('Invalid file supplied, must contain a function of '
                              'the signature' + TEST_USD_VIEW_CALLBACK_IDENT +
                              '(appController): {}\n'.format(filePath))
@@ -120,16 +101,13 @@ def _ValidateTestFile(self, filePath):
                     'Error: %s')
 
         (args, varargs, keywords, defaults, _, _, _) = \
-                                           inspect.getfullargspec(callBack)
+                                           inspect.getfullargspec(self.callBack)
 
         assert not varargs, errorMsg % 'Varargs are disallowed'
         assert not keywords, errorMsg % 'Kwargs are disallowed'
         assert not defaults, errorMsg % 'Defaults are disallowed'
         assert len(args) == 1, errorMsg % 'Incorrect number of args (1 expected)'
 
-        return callBack
-
-
 # Monkey patch AppController to add helper test interface methods
 
 def _processEvents(self, iterations=10, waitForConvergence=False):
diff --git a/pxr/usdImaging/bin/usdBakeMtlx/__init__.py b/pxr/usdImaging/bin/usdBakeMtlx/__init__.py
index f18c7c0369..6758dd3cc1 100644
--- a/pxr/usdImaging/bin/usdBakeMtlx/__init__.py
+++ b/pxr/usdImaging/bin/usdBakeMtlx/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usdImaging/bin/usdBakeMtlx/api.h b/pxr/usdImaging/bin/usdBakeMtlx/api.h
index b9d746b5a1..88d47d2eca 100644
--- a/pxr/usdImaging/bin/usdBakeMtlx/api.h
+++ b/pxr/usdImaging/bin/usdBakeMtlx/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_BAKE_MTLX_API_H
 #define PXR_USD_IMAGING_USD_BAKE_MTLX_API_H
diff --git a/pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.cpp b/pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.cpp
index 0748a13468..e2f7da905c 100644
--- a/pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.cpp
+++ b/pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.h"
 
diff --git a/pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.h b/pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.h
index b0f8f54922..54f617fa14 100644
--- a/pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.h
+++ b/pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_BIN_USD_BAKE_MTLX_BAKE_MATERIALX_H
diff --git a/pxr/usdImaging/bin/usdBakeMtlx/module.cpp b/pxr/usdImaging/bin/usdBakeMtlx/module.cpp
index 4e4fb4e6ce..8f5f9f9528 100644
--- a/pxr/usdImaging/bin/usdBakeMtlx/module.cpp
+++ b/pxr/usdImaging/bin/usdBakeMtlx/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usdImaging/bin/usdBakeMtlx/moduleDeps.cpp b/pxr/usdImaging/bin/usdBakeMtlx/moduleDeps.cpp
index b65f3f4bc7..d96189c24f 100644
--- a/pxr/usdImaging/bin/usdBakeMtlx/moduleDeps.cpp
+++ b/pxr/usdImaging/bin/usdBakeMtlx/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/bin/usdBakeMtlx/usdBakeMaterialX.py b/pxr/usdImaging/bin/usdBakeMtlx/usdBakeMaterialX.py
index 7751c3a3a1..7bb1c87430 100644
--- a/pxr/usdImaging/bin/usdBakeMtlx/usdBakeMaterialX.py
+++ b/pxr/usdImaging/bin/usdBakeMtlx/usdBakeMaterialX.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usdImaging/bin/usdBakeMtlx/wrapBakeMaterialX.cpp b/pxr/usdImaging/bin/usdBakeMtlx/wrapBakeMaterialX.cpp
index 82d4c3f117..8989321558 100644
--- a/pxr/usdImaging/bin/usdBakeMtlx/wrapBakeMaterialX.cpp
+++ b/pxr/usdImaging/bin/usdBakeMtlx/wrapBakeMaterialX.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/bin/usdBakeMtlx/bakeMaterialX.h"
diff --git a/pxr/usdImaging/bin/usdrecord/CMakeLists.txt b/pxr/usdImaging/bin/usdrecord/CMakeLists.txt
index d8189e88a2..9feb1f4ea6 100644
--- a/pxr/usdImaging/bin/usdrecord/CMakeLists.txt
+++ b/pxr/usdImaging/bin/usdrecord/CMakeLists.txt
@@ -59,6 +59,36 @@ pxr_install_test_dir(
     DEST testUsdRecordSmallObject
 )
 
+pxr_install_test_dir(
+    SRC testenv/MotionBlurTest
+    DEST testUsdRecordMotionBlur
+)
+
+# Versions of the the above tests using the new stage scene index
+pxr_install_test_dir(
+    SRC testenv/RecordTest
+    DEST testUsdRecordSingleFrame_SceneIndex
+)
+
+pxr_install_test_dir(
+    SRC testenv/RecordTest
+    DEST testUsdRecordMultipleFrames_SceneIndex
+)
+
+pxr_install_test_dir(
+    SRC testenv/RecordTest
+    DEST testUsdRecordSessionLayer_SceneIndex
+)
+
+pxr_install_test_dir(
+    SRC testenv/SmallObjectTest
+    DEST testUsdRecordSmallObject_SceneIndex
+)
+
+pxr_install_test_dir(
+    SRC testenv/MotionBlurTest
+    DEST testUsdRecordMotionBlur_SceneIndex
+)
 
 pxr_register_test(testUsdRecordSingleFrame
     PYTHON
@@ -138,7 +168,7 @@ pxr_register_test(testUsdRecordSessionLayer
 
 pxr_register_test(testUsdRecordSmallObject
     PYTHON
-    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord test.usda out.png"
+    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord --enableDomeLightVisibility test.usda out.png"
     IMAGE_DIFF_COMPARE
         out.png
     FAIL 0.5
@@ -149,3 +179,138 @@ pxr_register_test(testUsdRecordSmallObject
     TESTENV testUsdRecordSmallObject
 )
 
+# XXX: Temporarily disable test due to intermittent failures
+# if (PXR_BUILD_PRMAN_PLUGIN)
+#     pxr_register_test(testUsdRecordMotionBlur
+#         PYTHON
+#         COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord motionBlur.usda motionBlur.exr -cam /first_cam -r Prman"
+#         IMAGE_DIFF_COMPARE
+#             motionBlur.exr
+#         FAIL 0.5
+#         FAIL_PERCENT 0.005
+#         WARN 0.05
+#         WARN_PERCENT 0.0075
+#         EXPECTED_RETURN_CODE 0
+#         TESTENV testUsdRecordMotionBlur
+#         ENV
+#             RMANTREE=${RENDERMAN_LOCATION}
+#     )
+# endif()
+
+
+# Versions of the the above tests using the new stage scene index
+pxr_register_test(testUsdRecordSingleFrame_SceneIndex
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord AnimCube.usda AnimCube.1.png"
+    IMAGE_DIFF_COMPARE
+        AnimCube.1.png
+    FAIL 0.5
+    FAIL_PERCENT 0.005
+    WARN 0.05
+    WARN_PERCENT 0.0075
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdRecordSingleFrame_SceneIndex
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
+)
+
+pxr_register_test(testUsdRecordMultipleFrames_SceneIndex
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord AnimCube.usda AnimCube.#.png --frames 1,5,10"
+    IMAGE_DIFF_COMPARE
+        AnimCube.1.png
+        AnimCube.5.png
+        AnimCube.10.png
+    FAIL 0.5
+    FAIL_PERCENT 0.005
+    WARN 0.05
+    WARN_PERCENT 0.0075
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdRecordMultipleFrames_SceneIndex
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
+)
+    
+if (PXR_BUILD_PRMAN_PLUGIN OR PXR_BUILD_EMBREE_PLUGIN)
+    pxr_register_test(testUsdRecordSingleFrame_SceneIndex_NoGpu
+        PYTHON
+        COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord --disableGpu AnimCube.usda AnimCubeNoGpu.1.png"
+        IMAGE_DIFF_COMPARE
+            AnimCubeNoGpu.1.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.0075
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdRecordSingleFrame_SceneIndex
+        ENV
+            USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
+            RMANTREE=${RENDERMAN_LOCATION}
+    )
+    pxr_register_test(testUsdRecordMultipleFrames_SceneIndex_NoGpu
+        PYTHON
+        COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord AnimCube.usda --disableGpu AnimCubeNoGpu.#.png --frames 1,5,10"
+        IMAGE_DIFF_COMPARE
+            AnimCubeNoGpu.1.png
+            AnimCubeNoGpu.5.png
+            AnimCubeNoGpu.10.png
+        FAIL 0.5
+        FAIL_PERCENT 0.005
+        WARN 0.05
+        WARN_PERCENT 0.0075
+        EXPECTED_RETURN_CODE 0
+        TESTENV testUsdRecordMultipleFrames_SceneIndex
+        ENV
+            USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
+            RMANTREE=${RENDERMAN_LOCATION}
+    )
+endif()
+
+pxr_register_test(testUsdRecordSessionLayer_SceneIndex
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord --sessionLayer overrideDisplayColor.usda AnimCube.usda AnimCube_overrides.1.png"
+    IMAGE_DIFF_COMPARE
+        AnimCube_overrides.1.png
+    FAIL 0.5
+    FAIL_PERCENT 0.005
+    WARN 0.05
+    WARN_PERCENT 0.0075
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdRecordSessionLayer_SceneIndex
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
+)
+
+pxr_register_test(testUsdRecordSmallObject_SceneIndex
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord --enableDomeLightVisibility test.usda out.png"
+    IMAGE_DIFF_COMPARE
+        out.png
+    FAIL 0.5
+    FAIL_PERCENT 0.005
+    WARN 0.05
+    WARN_PERCENT 0.0075
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdRecordSmallObject_SceneIndex
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
+)
+
+# XXX: Temporarily disable test due to intermittent failures
+# if (PXR_BUILD_PRMAN_PLUGIN)
+#     pxr_register_test(testUsdRecordMotionBlur_SceneIndex
+#         PYTHON
+#         COMMAND "${CMAKE_INSTALL_PREFIX}/bin/usdrecord motionBlur.usda motionBlur_SI.exr -cam /first_cam -r Prman"
+#         IMAGE_DIFF_COMPARE
+#             motionBlur_SI.exr
+#         FAIL 0.5
+#         FAIL_PERCENT 0.005
+#         WARN 0.05
+#         WARN_PERCENT 0.0075
+#         EXPECTED_RETURN_CODE 0
+#         TESTENV testUsdRecordMotionBlur
+#         ENV
+#             USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
+#             RMANTREE=${RENDERMAN_LOCATION}
+#     )
+# endif()
diff --git a/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur.1.exr b/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur.1.exr
deleted file mode 100644
index dc22662b48..0000000000
Binary files a/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur.1.exr and /dev/null differ
diff --git a/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur.exr b/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur.exr
new file mode 100644
index 0000000000..a0afe302fb
Binary files /dev/null and b/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur.exr differ
diff --git a/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur_SI.1.exr b/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur_SI.1.exr
deleted file mode 100644
index 31ea787e2e..0000000000
Binary files a/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur_SI.1.exr and /dev/null differ
diff --git a/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur_SI.exr b/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur_SI.exr
new file mode 100644
index 0000000000..646adf2b72
Binary files /dev/null and b/pxr/usdImaging/bin/usdrecord/testenv/MotionBlurTest/baseline/motionBlur_SI.exr differ
diff --git a/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.1.png b/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.1.png
index 0c4f4cc51b..87431544a4 100644
Binary files a/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.1.png and b/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.1.png differ
diff --git a/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.10.png b/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.10.png
index 614780f38e..041ad14b63 100644
Binary files a/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.10.png and b/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.10.png differ
diff --git a/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.5.png b/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.5.png
index b219739d64..2b61ad8da1 100644
Binary files a/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.5.png and b/pxr/usdImaging/bin/usdrecord/testenv/RecordTest/baseline/AnimCubeNoGpu.5.png differ
diff --git a/pxr/usdImaging/bin/usdrecord/usdrecord.py b/pxr/usdImaging/bin/usdrecord/usdrecord.py
index e3ff537af5..f45f7839ee 100644
--- a/pxr/usdImaging/bin/usdrecord/usdrecord.py
+++ b/pxr/usdImaging/bin/usdrecord/usdrecord.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd
@@ -95,7 +78,7 @@ def _SetupOpenGLContext(width=100, height=100):
 
     return glWidget
 
-def main():
+def main() -> int:
     programName = os.path.basename(sys.argv[0])
     parser = argparse.ArgumentParser(prog=programName,
         description='Generates images from a USD file')
@@ -163,6 +146,13 @@ def main():
             'Width of the output image. The height will be computed from this '
             'value and the camera\'s aspect ratio (default=%(default)s)'))
 
+    parser.add_argument('--enableDomeLightVisibility', action='store_true',
+        dest='domeLightVisibility',
+        help=('Show the dome light background in the rendered output.  '
+            'If this option is not included and there is a dome light in '
+            'the stage, the IBL from it will be used for lighting but not '
+            'drawn into the background.'))
+
     parser.add_argument('--renderPassPrimPath', '-rp', action='store', 
         type=str, dest='rpPrimPath', 
         help=(
@@ -185,9 +175,6 @@ def main():
 
     args = parser.parse_args()
 
-    UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args,
-        frameFormatArgName='outputImagePath')
-
     args.imageWidth = max(args.imageWidth, 1)
 
     purposes = args.purposes.replace(',', ' ').split()
@@ -223,6 +210,9 @@ def main():
         _Err('Could not open USD stage: %s' % args.usdFilePath)
         return 1
 
+    UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args, usdStage,
+        frameFormatArgName='outputImagePath')
+
     # Get the camera at the given path (or with the given name).
     usdCamera = UsdAppUtils.GetCameraAtPath(usdStage, args.camera)
 
@@ -266,30 +256,36 @@ def main():
 
     # Initialize FrameRecorder 
     frameRecorder = UsdAppUtils.FrameRecorder(
-        rendererPluginId, args.gpuEnabled, args.rsPrimPath)
+        rendererPluginId, args.gpuEnabled)
+    if args.rpPrimPath:
+        frameRecorder.SetActiveRenderPassPrimPath(args.rpPrimPath)
+    if args.rsPrimPath:
+        frameRecorder.SetActiveRenderSettingsPrimPath(args.rsPrimPath)
     frameRecorder.SetImageWidth(args.imageWidth)
     frameRecorder.SetComplexity(args.complexity.value)
     frameRecorder.SetCameraLightEnabled(args.cameraLightEnabled)
     frameRecorder.SetColorCorrectionMode(args.colorCorrectionMode)
     frameRecorder.SetIncludedPurposes(purposes)
+    frameRecorder.SetDomeLightVisibility(args.domeLightVisibility)
 
     _Msg('Camera: %s' % usdCamera.GetPath().pathString)
     _Msg('Renderer plugin: %s' % frameRecorder.GetCurrentRendererId())
 
     for timeCode in args.frames:
-        _Msg('Recording time code: %s' % timeCode)
-        outputImagePath = args.outputImagePath.format(frame=timeCode.GetValue())
+        _Msg('Recording time code: %f' % timeCode)
+        outputImagePath = args.outputImagePath.format(frame=timeCode)
         try:
             frameRecorder.Record(usdStage, usdCamera, timeCode, outputImagePath)
         except Tf.ErrorException as e:
 
             _Err("Recording aborted due to the following failure at time code "
                  "{0}: {1}".format(timeCode, str(e)))
-            break
+            return 1
 
     # Release our reference to the frame recorder so it can be deleted before
     # the Qt stuff.
     frameRecorder = None
+    return 0
 
 
 if __name__ == '__main__':
diff --git a/pxr/usdImaging/bin/usdview/usdview.py b/pxr/usdImaging/bin/usdview/usdview.py
index 55480e80c8..3d4275fd1c 100644
--- a/pxr/usdImaging/bin/usdview/usdview.py
+++ b/pxr/usdImaging/bin/usdview/usdview.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usdImaging/plugin/sdrGlslfx/__init__.py b/pxr/usdImaging/plugin/sdrGlslfx/__init__.py
index 2cf52faa84..b795ede8bd 100644
--- a/pxr/usdImaging/plugin/sdrGlslfx/__init__.py
+++ b/pxr/usdImaging/plugin/sdrGlslfx/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # This file makes this module importable from python, which avoids a warning 
diff --git a/pxr/usdImaging/plugin/sdrGlslfx/moduleDeps.cpp b/pxr/usdImaging/plugin/sdrGlslfx/moduleDeps.cpp
index 2e52c460f1..b118260148 100644
--- a/pxr/usdImaging/plugin/sdrGlslfx/moduleDeps.cpp
+++ b/pxr/usdImaging/plugin/sdrGlslfx/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.cpp b/pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.cpp
index c68c360633..095fa06ce6 100644
--- a/pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.cpp
+++ b/pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.h"
 
diff --git a/pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.h b/pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.h
index 18136466a9..3430e2a4e8 100644
--- a/pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.h
+++ b/pxr/usdImaging/plugin/sdrGlslfx/parserPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef SDRGLSLFX_PARSER_PLUGIN_H
 #define SDRGLSLFX_PARSER_PLUGIN_H
diff --git a/pxr/usdImaging/plugin/sdrGlslfx/pch.h b/pxr/usdImaging/plugin/sdrGlslfx/pch.h
index 43da5ee7ac..98a88ac977 100644
--- a/pxr/usdImaging/plugin/sdrGlslfx/pch.h
+++ b/pxr/usdImaging/plugin/sdrGlslfx/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -27,16 +10,11 @@
 #define TF_MAX_ARITY 7
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
-#if defined(ARCH_OS_WINDOWS)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <cinttypes>
 #include <cmath>
@@ -49,20 +27,21 @@
 #include <functional>
 #include <initializer_list>
 #include <iosfwd>
+#include <iterator>
 #include <limits>
 #include <list>
 #include <locale>
 #include <map>
 #include <math.h>
 #include <memory>
-#include <mutex>
+#include <new>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <sys/types.h>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -70,42 +49,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/dict.hpp>
 #include <boost/python/object_fwd.hpp>
@@ -115,18 +58,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/scoped_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/enable_if.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/plugin/usdShaders/__init__.py b/pxr/usdImaging/plugin/usdShaders/__init__.py
index 2fac052247..cb2b1682df 100644
--- a/pxr/usdImaging/plugin/usdShaders/__init__.py
+++ b/pxr/usdImaging/plugin/usdShaders/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # This file makes this module importable from python, which avoids a warning 
diff --git a/pxr/usdImaging/plugin/usdShaders/discoveryPlugin.cpp b/pxr/usdImaging/plugin/usdShaders/discoveryPlugin.cpp
index 302b8d3bfe..a975410070 100644
--- a/pxr/usdImaging/plugin/usdShaders/discoveryPlugin.cpp
+++ b/pxr/usdImaging/plugin/usdShaders/discoveryPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/plugin/usdShaders/discoveryPlugin.h"
 
diff --git a/pxr/usdImaging/plugin/usdShaders/discoveryPlugin.h b/pxr/usdImaging/plugin/usdShaders/discoveryPlugin.h
index bcb25aa957..85659ce71c 100644
--- a/pxr/usdImaging/plugin/usdShaders/discoveryPlugin.h
+++ b/pxr/usdImaging/plugin/usdShaders/discoveryPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_PLUGIN_USD_SHADERS_DISCOVERY_PLUGIN_H
 #define PXR_USD_IMAGING_PLUGIN_USD_SHADERS_DISCOVERY_PLUGIN_H
diff --git a/pxr/usdImaging/plugin/usdShaders/moduleDeps.cpp b/pxr/usdImaging/plugin/usdShaders/moduleDeps.cpp
index 4c6a4da0ce..e258543788 100644
--- a/pxr/usdImaging/plugin/usdShaders/moduleDeps.cpp
+++ b/pxr/usdImaging/plugin/usdShaders/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/plugin/usdShaders/pch.h b/pxr/usdImaging/plugin/usdShaders/pch.h
index 2037e25b8b..846e6028f0 100644
--- a/pxr/usdImaging/plugin/usdShaders/pch.h
+++ b/pxr/usdImaging/plugin/usdShaders/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cinttypes>
@@ -68,6 +51,8 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -76,6 +61,7 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -83,53 +69,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
@@ -143,25 +82,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -169,7 +92,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/plugin/usdShaders/shaders/previewSurface.glslfx b/pxr/usdImaging/plugin/usdShaders/shaders/previewSurface.glslfx
index 717f06ba7d..2d048a6c2b 100644
--- a/pxr/usdImaging/plugin/usdShaders/shaders/previewSurface.glslfx
+++ b/pxr/usdImaging/plugin/usdShaders/shaders/previewSurface.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #import $TOOLS/hdSt/shaders/surfaceHelpers.glslfx
diff --git a/pxr/usdImaging/plugin/usdShaders/shaders/primvarReader.glslfx b/pxr/usdImaging/plugin/usdShaders/shaders/primvarReader.glslfx
index ffe586e9c1..cc20f4fd1a 100644
--- a/pxr/usdImaging/plugin/usdShaders/shaders/primvarReader.glslfx
+++ b/pxr/usdImaging/plugin/usdShaders/shaders/primvarReader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/plugin/usdShaders/shaders/transform2d.glslfx b/pxr/usdImaging/plugin/usdShaders/shaders/transform2d.glslfx
index 64cffe4bf7..ef78f864f6 100644
--- a/pxr/usdImaging/plugin/usdShaders/shaders/transform2d.glslfx
+++ b/pxr/usdImaging/plugin/usdShaders/shaders/transform2d.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/plugin/usdShaders/shaders/uvTexture.glslfx b/pxr/usdImaging/plugin/usdShaders/shaders/uvTexture.glslfx
index ffe586e9c1..cc20f4fd1a 100644
--- a/pxr/usdImaging/plugin/usdShaders/shaders/uvTexture.glslfx
+++ b/pxr/usdImaging/plugin/usdShaders/shaders/uvTexture.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdAppUtils/CMakeLists.txt b/pxr/usdImaging/usdAppUtils/CMakeLists.txt
index 2d8ccb94f1..dbeef54efd 100644
--- a/pxr/usdImaging/usdAppUtils/CMakeLists.txt
+++ b/pxr/usdImaging/usdAppUtils/CMakeLists.txt
@@ -66,6 +66,11 @@ pxr_register_test(testUsdAppUtilsCamera
     EXPECTED_RETURN_CODE 0
 )
 
+
+pxr_install_test_dir(
+    SRC testenv/CmdlineArgsTest
+    DEST testUsdAppUtilsCmdlineArgs
+)
 pxr_register_test(testUsdAppUtilsCmdlineArgs
     PYTHON
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdAppUtilsCmdlineArgs"
diff --git a/pxr/usdImaging/usdAppUtils/__init__.py b/pxr/usdImaging/usdAppUtils/__init__.py
index 6c8ed60689..588ca33911 100644
--- a/pxr/usdImaging/usdAppUtils/__init__.py
+++ b/pxr/usdImaging/usdAppUtils/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Tf
diff --git a/pxr/usdImaging/usdAppUtils/api.h b/pxr/usdImaging/usdAppUtils/api.h
index 7dd6b7e6e4..2a96183b58 100644
--- a/pxr/usdImaging/usdAppUtils/api.h
+++ b/pxr/usdImaging/usdAppUtils/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_APP_UTILS_API_H
 #define PXR_USD_IMAGING_USD_APP_UTILS_API_H
diff --git a/pxr/usdImaging/usdAppUtils/camera.cpp b/pxr/usdImaging/usdAppUtils/camera.cpp
index 0b7bf7924d..089761929c 100644
--- a/pxr/usdImaging/usdAppUtils/camera.cpp
+++ b/pxr/usdImaging/usdAppUtils/camera.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usdImaging/usdAppUtils/camera.h"
diff --git a/pxr/usdImaging/usdAppUtils/camera.h b/pxr/usdImaging/usdAppUtils/camera.h
index 4381354c92..4b755a233e 100644
--- a/pxr/usdImaging/usdAppUtils/camera.h
+++ b/pxr/usdImaging/usdAppUtils/camera.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_APP_UTILS_CAMERA_H
 #define PXR_USD_IMAGING_USD_APP_UTILS_CAMERA_H
diff --git a/pxr/usdImaging/usdAppUtils/cameraArgs.py b/pxr/usdImaging/usdAppUtils/cameraArgs.py
index eb7983220f..fe74b5b710 100644
--- a/pxr/usdImaging/usdAppUtils/cameraArgs.py
+++ b/pxr/usdImaging/usdAppUtils/cameraArgs.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def AddCmdlineArgs(argsParser, defaultValue=None, altHelpText=''):
diff --git a/pxr/usdImaging/usdAppUtils/colorArgs.py b/pxr/usdImaging/usdAppUtils/colorArgs.py
index 4a648ea07d..2146a5e1d5 100644
--- a/pxr/usdImaging/usdAppUtils/colorArgs.py
+++ b/pxr/usdImaging/usdAppUtils/colorArgs.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def AddCmdlineArgs(argsParser, defaultValue='sRGB', altHelpText=''):
diff --git a/pxr/usdImaging/usdAppUtils/complexityArgs.py b/pxr/usdImaging/usdAppUtils/complexityArgs.py
index 2f0093302e..16099fa529 100644
--- a/pxr/usdImaging/usdAppUtils/complexityArgs.py
+++ b/pxr/usdImaging/usdAppUtils/complexityArgs.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 class RefinementComplexities(object):
diff --git a/pxr/usdImaging/usdAppUtils/frameRecorder.cpp b/pxr/usdImaging/usdAppUtils/frameRecorder.cpp
index 9474f4bedb..4fd4b5b8c6 100644
--- a/pxr/usdImaging/usdAppUtils/frameRecorder.cpp
+++ b/pxr/usdImaging/usdAppUtils/frameRecorder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdAppUtils/frameRecorder.h"
@@ -52,15 +35,14 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 UsdAppUtilsFrameRecorder::UsdAppUtilsFrameRecorder(
     const TfToken& rendererPluginId,
-    bool gpuEnabled, 
-    const SdfPath& renderSettingsPrimPath) :
+    bool gpuEnabled) :
     _imagingEngine(HdDriver(), rendererPluginId, gpuEnabled),
     _imageWidth(960u),
     _complexity(1.0f),
     _colorCorrectionMode(HdxColorCorrectionTokens->disabled),
     _purposes({UsdGeomTokens->default_, UsdGeomTokens->proxy}),
-    _renderSettingsPrimPath(renderSettingsPrimPath),
-    _cameraLightEnabled(true)
+    _cameraLightEnabled(true),
+    _domeLightsVisible(false)
 {
     // Disable presentation to avoid the need to create an OpenGL context when
     // using other graphics APIs such as Metal and Vulkan.
@@ -69,10 +51,23 @@ UsdAppUtilsFrameRecorder::UsdAppUtilsFrameRecorder(
     // Set the interactive to be false on the HdRenderSettingsMap 
     _imagingEngine.SetRendererSetting(
         HdRenderSettingsTokens->enableInteractive, VtValue(false));
+}
 
-    // Set the Active RenderSettings Prim path when not empty.
-    if (!renderSettingsPrimPath.IsEmpty()) {
-        _imagingEngine.SetActiveRenderSettingsPrimPath(renderSettingsPrimPath);
+void
+UsdAppUtilsFrameRecorder::SetActiveRenderSettingsPrimPath(SdfPath const& path)
+{
+    _renderSettingsPrimPath = path;
+    if (!_renderSettingsPrimPath.IsEmpty()) {
+        _imagingEngine.SetActiveRenderSettingsPrimPath(_renderSettingsPrimPath);
+    }
+}
+
+void 
+UsdAppUtilsFrameRecorder::SetActiveRenderPassPrimPath(SdfPath const& path)
+{
+    _renderPassPrimPath = path;
+    if (!_renderPassPrimPath.IsEmpty()) {
+        _imagingEngine.SetActiveRenderPassPrimPath(_renderPassPrimPath);
     }
 }
 
@@ -103,6 +98,12 @@ UsdAppUtilsFrameRecorder::SetCameraLightEnabled(bool cameraLightEnabled)
     _cameraLightEnabled = cameraLightEnabled;
 }
 
+void
+UsdAppUtilsFrameRecorder::SetDomeLightVisibility(bool domeLightsVisible)
+{
+    _domeLightsVisible = domeLightsVisible;
+}
+
 void
 UsdAppUtilsFrameRecorder::SetIncludedPurposes(const TfTokenVector& purposes) 
 {
@@ -410,6 +411,7 @@ UsdAppUtilsFrameRecorder::Record(
         const GfVec3d &cameraPos = frustum.GetPosition();
         GlfSimpleLight cameraLight(
             GfVec4f(cameraPos[0], cameraPos[1], cameraPos[2], 1.0f));
+        cameraLight.SetTransform(frustum.ComputeViewInverse());
         cameraLight.SetAmbient(SCENE_AMBIENT);
         lights.push_back(cameraLight);
     }
@@ -424,6 +426,10 @@ UsdAppUtilsFrameRecorder::Record(
 
     _imagingEngine.SetLightingState(lights, material, SCENE_AMBIENT);
 
+    _imagingEngine.SetRendererSetting(
+        HdRenderSettingsTokens->domeLightCameraVisibility,
+        VtValue(_domeLightsVisible));
+
     UsdImagingGLRenderParams renderParams;
     renderParams.frame = timeCode;
     renderParams.complexity = _complexity;
diff --git a/pxr/usdImaging/usdAppUtils/frameRecorder.h b/pxr/usdImaging/usdAppUtils/frameRecorder.h
index f9e08453eb..d5dd1bc0d5 100644
--- a/pxr/usdImaging/usdAppUtils/frameRecorder.h
+++ b/pxr/usdImaging/usdAppUtils/frameRecorder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_APP_UTILS_FRAME_RECORDER_H
 #define PXR_USD_IMAGING_USD_APP_UTILS_FRAME_RECORDER_H
@@ -62,16 +45,10 @@ class UsdAppUtilsFrameRecorder
     /// plugin will be chosen depending on the value of \p gpuEnabled.
     /// The \p gpuEnabled argument determines if the UsdAppUtilsFrameRecorder
     /// instance will allow Hydra to use the GPU to produce images.
-    /// The \p renderSettingsPrimPath argument is used to set the active 
-    /// render settings prim path in Hydra.
-    /// The \p defaultLights argument determines if the
-    /// UsdAppUtilsFrameRecorder will add a default set of lights,
-    /// in addition to any present in the scene.
     USDAPPUTILS_API
     UsdAppUtilsFrameRecorder(
         const TfToken& rendererPluginId = TfToken(),
-        bool gpuEnabled = true,
-        const SdfPath& renderSettingsPrimPath = SdfPath());
+        bool gpuEnabled = true);
 
     /// Gets the ID of the Hydra renderer plugin that will be used for
     /// recording.
@@ -92,6 +69,20 @@ class UsdAppUtilsFrameRecorder
         return succeeded;
     }
 
+    /// Sets the path to the render pass prim to use.
+    ///
+    /// \note If there is a render settings prim designated by the
+    /// render pass prim via renderSource, it must also be set
+    /// with SetActiveRenderSettingsPrimPath().
+    USDAPPUTILS_API
+    void SetActiveRenderPassPrimPath(SdfPath const& path);
+
+    /// Sets the path to the render settings prim to use.
+    ///
+    /// \see SetActiveRenderPassPrimPath()
+    USDAPPUTILS_API
+    void SetActiveRenderSettingsPrimPath(SdfPath const& path);
+
     /// Sets the width of the recorded image.
     ///
     /// The height of the recorded image will be computed using this value and
@@ -126,6 +117,13 @@ class UsdAppUtilsFrameRecorder
     USDAPPUTILS_API
     void SetCameraLightEnabled(bool cameraLightEnabled);
 
+    /// Sets the camera visibility of dome lights.
+    ///
+    /// When on, dome light textures will be drawn to the background as if
+    /// mapped onto a sphere infinitely far away.
+    USDAPPUTILS_API
+    void SetDomeLightVisibility(bool domeLightsVisible);
+
     /// Sets the UsdGeomImageable purposes to be used for rendering
     ///
     /// We will __always__ include "default" purpose, and by default,
@@ -164,8 +162,10 @@ class UsdAppUtilsFrameRecorder
     float _complexity;
     TfToken _colorCorrectionMode;
     TfTokenVector _purposes;
+    SdfPath _renderPassPrimPath;
     SdfPath _renderSettingsPrimPath;
     bool _cameraLightEnabled;
+    bool _domeLightsVisible;
 };
 
 
diff --git a/pxr/usdImaging/usdAppUtils/framesArgs.py b/pxr/usdImaging/usdAppUtils/framesArgs.py
index ea41a4bd29..5b9da05ddf 100644
--- a/pxr/usdImaging/usdAppUtils/framesArgs.py
+++ b/pxr/usdImaging/usdAppUtils/framesArgs.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def _GetFloatStringPrecision(floatString):
@@ -83,7 +66,7 @@ def __init__(self, frameSpec):
     def __iter__(self):
         for timeCodeRange in self._timeCodeRanges:
             for timeCode in timeCodeRange:
-                yield timeCode
+                yield timeCode.GetValue()
 
     @property
     def minFloatPrecision(self):
@@ -97,11 +80,12 @@ def AddCmdlineArgs(argsParser, altDefaultTimeHelpText='', altFramesHelpText=''):
     The resulting 'frames' argument will be an iterable of UsdTimeCodes.
 
     If no command-line arguments are given, 'frames' will be a list containing
-    only Usd.TimeCode.EarliestTime(). If '--defaultTime' is given, 'frames'
-    will be a list containing only Usd.TimeCode.Default(). Otherwise,
-    '--frames' must be given a FrameSpec (or a comma-separated list of
-    multiple FrameSpecs), and 'frames' will be a FrameSpecIterator which when
-    iterated will yield the time codes specified by the FrameSpec(s).
+    the startTimeCode from the usdStage, using UsdStage::GetStartTimeCode(). 
+    If '--defaultTime' is given, 'frames' will be a list containing only 
+    Usd.TimeCode.Default(). Otherwise, '--frames' must be given a FrameSpec (or 
+    a comma-separated list of multiple FrameSpecs), and 'frames' will be a 
+    FrameSpecIterator which when iterated will yield the time codes specified 
+    by the FrameSpec(s) as floats.
     """
     timeGroup = argsParser.add_mutually_exclusive_group()
 
@@ -109,7 +93,8 @@ def AddCmdlineArgs(argsParser, altDefaultTimeHelpText='', altFramesHelpText=''):
     if not helpText:
         helpText = (
             'explicitly operate at the Default time code (the default '
-            'behavior is to operate at the Earliest time code)')
+            'behavior is to operate at the startTimeCode authored on the '
+            'UsdStage which defaults to 0.0)')
     timeGroup.add_argument('--defaultTime', '-d', action='store_true',
         dest='defaultTime', help=helpText)
 
@@ -205,7 +190,7 @@ def ConvertFramePlaceholderToFloatSpec(frameFormat):
 
     return frameFormat.replace(placeholder, floatSpec)
 
-def ValidateCmdlineArgs(argsParser, args, frameFormatArgName=None):
+def ValidateCmdlineArgs(argsParser, args, usdStage, frameFormatArgName=None):
     """
     Validates the frame-related arguments in args parsed by argsParser.
 
@@ -262,8 +247,8 @@ def ValidateCmdlineArgs(argsParser, args, frameFormatArgName=None):
                 'when not operating on a frame range.' % frameFormatArgName)
 
         if args.defaultTime:
-            args.frames = [Usd.TimeCode.Default()]
+            args.frames = [Usd.TimeCode.Default().GetValue()]
         else:
-            args.frames = [Usd.TimeCode.EarliestTime()]
+            args.frames = [usdStage.GetStartTimeCode()]
 
     return args
diff --git a/pxr/usdImaging/usdAppUtils/module.cpp b/pxr/usdImaging/usdAppUtils/module.cpp
index dfe1d6883f..fd9c9299f7 100644
--- a/pxr/usdImaging/usdAppUtils/module.cpp
+++ b/pxr/usdImaging/usdAppUtils/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usdImaging/usdAppUtils/moduleDeps.cpp b/pxr/usdImaging/usdAppUtils/moduleDeps.cpp
index cd1fe41811..5e237ee76d 100644
--- a/pxr/usdImaging/usdAppUtils/moduleDeps.cpp
+++ b/pxr/usdImaging/usdAppUtils/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdAppUtils/pch.h b/pxr/usdImaging/usdAppUtils/pch.h
index 70b9602d5e..f33d34d8b0 100644
--- a/pxr/usdImaging/usdAppUtils/pch.h
+++ b/pxr/usdImaging/usdAppUtils/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -28,9 +11,19 @@
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
 #if defined(ARCH_OS_DARWIN)
+#include <glob.h>
+#include <limits.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <unistd.h>
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <glob.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/statfs.h>
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -40,11 +33,12 @@
 
 #include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <io.h>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -57,6 +51,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <deque>
+#include <fcntl.h>
 #include <float.h>
 #include <functional>
 #include <initializer_list>
@@ -70,69 +65,28 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -151,30 +105,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_set.h>
 #include <tbb/concurrent_vector.h>
@@ -182,7 +115,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/usdAppUtils/rendererArgs.py b/pxr/usdImaging/usdAppUtils/rendererArgs.py
index 453fab532d..5d2ed960db 100644
--- a/pxr/usdImaging/usdAppUtils/rendererArgs.py
+++ b/pxr/usdImaging/usdAppUtils/rendererArgs.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 def GetAllPluginArguments():
diff --git a/pxr/usdImaging/usdAppUtils/testenv/CmdlineArgsTest/noTimeCode.usda b/pxr/usdImaging/usdAppUtils/testenv/CmdlineArgsTest/noTimeCode.usda
new file mode 100644
index 0000000000..bcbddd6a87
--- /dev/null
+++ b/pxr/usdImaging/usdAppUtils/testenv/CmdlineArgsTest/noTimeCode.usda
@@ -0,0 +1,5 @@
+#usda 1.0
+
+def Sphere "Sphere" 
+{
+}
\ No newline at end of file
diff --git a/pxr/usdImaging/usdAppUtils/testenv/CmdlineArgsTest/startTimeCode.usda b/pxr/usdImaging/usdAppUtils/testenv/CmdlineArgsTest/startTimeCode.usda
new file mode 100644
index 0000000000..85f5318f82
--- /dev/null
+++ b/pxr/usdImaging/usdAppUtils/testenv/CmdlineArgsTest/startTimeCode.usda
@@ -0,0 +1,8 @@
+#usda 1.0
+(
+    startTimeCode = 5.0
+)
+
+def Sphere "Sphere" 
+{
+}
\ No newline at end of file
diff --git a/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsCamera.py b/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsCamera.py
index 4b095ce9bf..e9a1560540 100644
--- a/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsCamera.py
+++ b/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsCamera.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 from pxr import Tf
diff --git a/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsCmdlineArgs.py b/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsCmdlineArgs.py
index c9fe5610c4..d386535a8b 100644
--- a/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsCmdlineArgs.py
+++ b/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsCmdlineArgs.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Sdf
 from pxr import Usd
@@ -45,6 +28,8 @@ class TestUsdAppUtilsCmdlineArgs(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls._progName = os.path.basename(sys.argv[0])
+        cls._noTimeCodeStage = Usd.Stage.Open(os.path.abspath('noTimeCode.usda'))
+        cls._startTimeCodeStage = Usd.Stage.Open(os.path.abspath('startTimeCode.usda'))
 
     def setUp(self):
         self._parser = argparse.ArgumentParser(prog=self._progName)
@@ -151,19 +136,28 @@ def testFramesCmdlineArgs(self):
         UsdAppUtils.framesArgs.AddCmdlineArgs(self._parser)
 
         args = self._parser.parse_args([])
-        UsdAppUtils.framesArgs.ValidateCmdlineArgs(self._parser, args)
-        self.assertEqual(args.frames, [Usd.TimeCode.EarliestTime()])
+        UsdAppUtils.framesArgs.ValidateCmdlineArgs(
+            self._parser, args, self._noTimeCodeStage)
+        self.assertEqual(args.frames, [0.0])
+
+        args = self._parser.parse_args([])
+        UsdAppUtils.framesArgs.ValidateCmdlineArgs(
+            self._parser, args, self._startTimeCodeStage)
+        self.assertEqual(args.frames, [5.0])
 
         args = self._parser.parse_args(['--defaultTime'])
-        UsdAppUtils.framesArgs.ValidateCmdlineArgs(self._parser, args)
+        UsdAppUtils.framesArgs.ValidateCmdlineArgs(
+            self._parser, args, self._noTimeCodeStage)
         self.assertEqual(args.frames, [Usd.TimeCode.Default()])
 
         args = self._parser.parse_args(['--d'])
-        UsdAppUtils.framesArgs.ValidateCmdlineArgs(self._parser, args)
+        UsdAppUtils.framesArgs.ValidateCmdlineArgs(
+            self._parser, args, self._noTimeCodeStage)
         self.assertEqual(args.frames, [Usd.TimeCode.Default()])
 
         args = self._parser.parse_args(['--frames', '1:4'])
-        UsdAppUtils.framesArgs.ValidateCmdlineArgs(self._parser, args)
+        UsdAppUtils.framesArgs.ValidateCmdlineArgs(
+            self._parser, args, self._noTimeCodeStage)
         self.assertEqual(type(args.frames),
             UsdAppUtils.framesArgs.FrameSpecIterator)
         self.assertEqual(list(args.frames),
@@ -173,7 +167,8 @@ def testFramesCmdlineArgs(self):
              Usd.TimeCode(4.0)])
 
         args = self._parser.parse_args(['-f', '11,13:15x2,17'])
-        UsdAppUtils.framesArgs.ValidateCmdlineArgs(self._parser, args)
+        UsdAppUtils.framesArgs.ValidateCmdlineArgs(
+            self._parser, args, self._noTimeCodeStage)
         self.assertEqual(type(args.frames),
             UsdAppUtils.framesArgs.FrameSpecIterator)
         self.assertEqual(list(args.frames),
@@ -189,13 +184,13 @@ def testFramesCmdlineArgs(self):
         parser.add_argument('outputImagePath', action='store', type=str,
             help='output image path')
         args = parser.parse_args(['test_image.#.png', '--frames', '1:4'])
-        UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args,
-            frameFormatArgName='outputImagePath')
+        UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args, 
+            self._noTimeCodeStage, frameFormatArgName='outputImagePath')
         self.assertEqual(args.outputImagePath, 'test_image.{frame:01.0f}.png')
 
         args = parser.parse_args(['test_image.###.#.png', '--frames', '1:4'])
-        UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args,
-            frameFormatArgName='outputImagePath')
+        UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args, 
+            self._noTimeCodeStage, frameFormatArgName='outputImagePath')
         self.assertEqual(args.outputImagePath, 'test_image.{frame:05.1f}.png')
 
         # Test that an error is raised if the frame format arg does not contain
@@ -207,7 +202,7 @@ def testFramesCmdlineArgs(self):
         args = parser.parse_args(['test_image.png', '--frames', '1:4'])
         with self.assertRaises(ValueError):
             UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args,
-                frameFormatArgName='outputImagePath')
+                self._noTimeCodeStage, frameFormatArgName='outputImagePath')
 
         # Test that an error is raised if the frame format arg does contain
         # a frame placeholder but no frames are given.
@@ -218,12 +213,12 @@ def testFramesCmdlineArgs(self):
         args = parser.parse_args(['test_image.#.png'])
         with self.assertRaises(ValueError):
             UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args,
-                frameFormatArgName='outputImagePath')
+                self._noTimeCodeStage, frameFormatArgName='outputImagePath')
 
         args = parser.parse_args(['test_image.#.png', '--defaultTime'])
         with self.assertRaises(ValueError):
             UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args,
-                frameFormatArgName='outputImagePath')
+                self._noTimeCodeStage, frameFormatArgName='outputImagePath')
 
         # Tests that an error is raised if the floating point precision
         # specified in the frame format arg is less than the minimum floating
@@ -235,12 +230,12 @@ def testFramesCmdlineArgs(self):
         args = parser.parse_args(['test_image.#.png', '--frames', '1:4x0.1'])
         with self.assertRaises(ValueError):
             UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args,
-                frameFormatArgName='outputImagePath')
+                self._noTimeCodeStage, frameFormatArgName='outputImagePath')
         args = parser.parse_args(['test_image.#.##.png', '--frames',
             '101:105x0.1,106:109x0.125,110:114x0.25'])
         with self.assertRaises(ValueError):
             UsdAppUtils.framesArgs.ValidateCmdlineArgs(parser, args,
-                frameFormatArgName='outputImagePath')
+                self._noTimeCodeStage, frameFormatArgName='outputImagePath')
 
     def testRendererCmdlineArgs(self):
         """
diff --git a/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsComplexity.py b/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsComplexity.py
index ad821fd1d0..7e47b6a665 100644
--- a/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsComplexity.py
+++ b/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsComplexity.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr.UsdAppUtils import complexityArgs
 
diff --git a/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsFrameRecorder.py b/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsFrameRecorder.py
index 4ad5f8fc31..665fef8e7a 100644
--- a/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsFrameRecorder.py
+++ b/pxr/usdImaging/usdAppUtils/testenv/testUsdAppUtilsFrameRecorder.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 from pxr import Usd
 from pxr import UsdAppUtils
@@ -96,7 +79,7 @@ def testRecordSingleFrame(self):
         outputImagePath = os.path.abspath('AnimCube.png')
         self.assertTrue(
             self._frameRecorder.Record(self._stage, self._usdCamera,
-                Usd.TimeCode.EarliestTime(), outputImagePath))
+                self._stage.GetStartTimeCode(), outputImagePath))
 
     def testRecordMultipleFrames(self):
         """
@@ -110,7 +93,7 @@ def testRecordMultipleFrames(self):
         for timeCode in frameSpecIter:
             self.assertTrue(
                 self._frameRecorder.Record(self._stage, self._usdCamera,
-                    timeCode, outputImagePath.format(frame=timeCode.GetValue())))
+                    timeCode, outputImagePath.format(frame=timeCode)))
 
 
 if __name__ == "__main__":
diff --git a/pxr/usdImaging/usdAppUtils/wrapCamera.cpp b/pxr/usdImaging/usdAppUtils/wrapCamera.cpp
index 9268c7ac62..76350f55e8 100644
--- a/pxr/usdImaging/usdAppUtils/wrapCamera.cpp
+++ b/pxr/usdImaging/usdAppUtils/wrapCamera.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usdImaging/usdAppUtils/camera.h"
diff --git a/pxr/usdImaging/usdAppUtils/wrapFrameRecorder.cpp b/pxr/usdImaging/usdAppUtils/wrapFrameRecorder.cpp
index 7e854ea9ac..7d859c89f1 100644
--- a/pxr/usdImaging/usdAppUtils/wrapFrameRecorder.cpp
+++ b/pxr/usdImaging/usdAppUtils/wrapFrameRecorder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usdImaging/usdAppUtils/frameRecorder.h"
@@ -42,14 +25,18 @@ wrapFrameRecorder()
 
     scope s = class_<This, boost::noncopyable>("FrameRecorder")
         .def(init<>())
-        .def(init<const TfToken&, bool, const SdfPath&>(
+        .def(init<const TfToken&, bool>(
             (arg("rendererPluginId") = TfToken(), 
-             arg("gpuEnabled") = true,
-             arg("renderSettingsPrimPath") = SdfPath())))
+             arg("gpuEnabled") = true)))
         .def("GetCurrentRendererId", &This::GetCurrentRendererId)
+        .def("SetActiveRenderPassPrimPath",
+            &This::SetActiveRenderPassPrimPath)
+        .def("SetActiveRenderSettingsPrimPath",
+            &This::SetActiveRenderSettingsPrimPath)
         .def("SetRendererPlugin", &This::SetRendererPlugin)
         .def("SetImageWidth", &This::SetImageWidth)
         .def("SetCameraLightEnabled", &This::SetCameraLightEnabled)
+        .def("SetDomeLightVisibility", &This::SetDomeLightVisibility)
         .def("SetComplexity", &This::SetComplexity)
         .def("SetColorCorrectionMode", &This::SetColorCorrectionMode)
         .def("SetIncludedPurposes", &This::SetIncludedPurposes,
diff --git a/pxr/usdImaging/usdImaging/CMakeLists.txt b/pxr/usdImaging/usdImaging/CMakeLists.txt
index 55d4e146b4..e26a07a6e5 100644
--- a/pxr/usdImaging/usdImaging/CMakeLists.txt
+++ b/pxr/usdImaging/usdImaging/CMakeLists.txt
@@ -39,6 +39,7 @@ pxr_library(usdImaging
         dataSourceBasisCurves
         dataSourceCamera
         dataSourceGprim
+        dataSourceMapped
         dataSourceMaterial
         dataSourceMesh
         dataSourceNurbsCurves
@@ -123,6 +124,7 @@ pxr_library(usdImaging
         usdRenderSettingsSchema
         usdRenderVarSchema
         rectLightAdapter
+        renderPassAdapter
         renderProductAdapter
         renderSettingsAdapter
         renderSettingsFlatteningSceneIndex
@@ -146,7 +148,6 @@ pxr_library(usdImaging
 
     PUBLIC_HEADERS
         api.h
-        dataSourceSchemaBased.h
         types.h
         unitTestHelper.h
         version.h
diff --git a/pxr/usdImaging/usdImaging/adapterManager.cpp b/pxr/usdImaging/usdImaging/adapterManager.cpp
index c4e91a127e..ea62b1017d 100644
--- a/pxr/usdImaging/usdImaging/adapterManager.cpp
+++ b/pxr/usdImaging/usdImaging/adapterManager.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/adapterManager.h"
 
diff --git a/pxr/usdImaging/usdImaging/adapterManager.h b/pxr/usdImaging/usdImaging/adapterManager.h
index 74ffd1342d..2d963c0195 100644
--- a/pxr/usdImaging/usdImaging/adapterManager.h
+++ b/pxr/usdImaging/usdImaging/adapterManager.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_ADAPTER_MANAGER_H
 #define PXR_USD_IMAGING_USD_IMAGING_ADAPTER_MANAGER_H
diff --git a/pxr/usdImaging/usdImaging/adapterRegistry.cpp b/pxr/usdImaging/usdImaging/adapterRegistry.cpp
index 30930cb3d4..46f25d86de 100644
--- a/pxr/usdImaging/usdImaging/adapterRegistry.cpp
+++ b/pxr/usdImaging/usdImaging/adapterRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/adapterRegistry.h"
 
diff --git a/pxr/usdImaging/usdImaging/adapterRegistry.h b/pxr/usdImaging/usdImaging/adapterRegistry.h
index 532343af4d..c4c8348fa7 100644
--- a/pxr/usdImaging/usdImaging/adapterRegistry.h
+++ b/pxr/usdImaging/usdImaging/adapterRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_ADAPTER_REGISTRY_H
 #define PXR_USD_IMAGING_USD_IMAGING_ADAPTER_REGISTRY_H
diff --git a/pxr/usdImaging/usdImaging/api.h b/pxr/usdImaging/usdImaging/api.h
index a29f567e06..c592a827cb 100644
--- a/pxr/usdImaging/usdImaging/api.h
+++ b/pxr/usdImaging/usdImaging/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_API_H
 #define PXR_USD_IMAGING_USD_IMAGING_API_H
diff --git a/pxr/usdImaging/usdImaging/apiSchemaAdapter.cpp b/pxr/usdImaging/usdImaging/apiSchemaAdapter.cpp
index 175958b2cd..5d7e3c75e2 100644
--- a/pxr/usdImaging/usdImaging/apiSchemaAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/apiSchemaAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/apiSchemaAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/apiSchemaAdapter.h b/pxr/usdImaging/usdImaging/apiSchemaAdapter.h
index 81ea89314d..24965fcbb4 100644
--- a/pxr/usdImaging/usdImaging/apiSchemaAdapter.h
+++ b/pxr/usdImaging/usdImaging/apiSchemaAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_API_SCHEMA_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_API_SCHEMA_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/basisCurvesAdapter.cpp b/pxr/usdImaging/usdImaging/basisCurvesAdapter.cpp
index f98e34b8d6..b6b430fc42 100644
--- a/pxr/usdImaging/usdImaging/basisCurvesAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/basisCurvesAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/basisCurvesAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/basisCurvesAdapter.h b/pxr/usdImaging/usdImaging/basisCurvesAdapter.h
index e7dafb2fa1..717bb07f12 100644
--- a/pxr/usdImaging/usdImaging/basisCurvesAdapter.h
+++ b/pxr/usdImaging/usdImaging/basisCurvesAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_BASIS_CURVES_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_BASIS_CURVES_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/cameraAdapter.cpp b/pxr/usdImaging/usdImaging/cameraAdapter.cpp
index 939893e4bd..10f96e0026 100644
--- a/pxr/usdImaging/usdImaging/cameraAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/cameraAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/cameraAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/cameraAdapter.h b/pxr/usdImaging/usdImaging/cameraAdapter.h
index 0b1a5a46fe..308b9798cc 100644
--- a/pxr/usdImaging/usdImaging/cameraAdapter.h
+++ b/pxr/usdImaging/usdImaging/cameraAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_CAMERA_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_CAMERA_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/capsuleAdapter.cpp b/pxr/usdImaging/usdImaging/capsuleAdapter.cpp
index ccd163857c..4e6665cf18 100644
--- a/pxr/usdImaging/usdImaging/capsuleAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/capsuleAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/capsuleAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/capsuleAdapter.h b/pxr/usdImaging/usdImaging/capsuleAdapter.h
index 5ee30d18f8..58b896e81c 100644
--- a/pxr/usdImaging/usdImaging/capsuleAdapter.h
+++ b/pxr/usdImaging/usdImaging/capsuleAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_CAPSULE_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_CAPSULE_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/collectionAPIAdapter.cpp b/pxr/usdImaging/usdImaging/collectionAPIAdapter.cpp
index b2baeb8a96..594457fd24 100644
--- a/pxr/usdImaging/usdImaging/collectionAPIAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/collectionAPIAdapter.cpp
@@ -1,45 +1,22 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/collectionAPIAdapter.h"
 #include "pxr/usdImaging/usdImaging/dataSourceAttribute.h"
 
 #include "pxr/usd/usd/collectionAPI.h"
+#include "pxr/usd/usd/collectionMembershipQuery.h"
+
+#include "pxr/imaging/hd/collectionsSchema.h"
 #include "pxr/imaging/hd/retainedDataSource.h"
 
 #include "pxr/base/tf/stringUtils.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-TF_DEFINE_PRIVATE_TOKENS(
-    _tokens,
-    (usdCollections)
-    (includes)
-    (excludes)
-    (expansionRule)
-    (includeRoot)
-);
-
 TF_REGISTRY_FUNCTION(TfType)
 {
     typedef UsdImagingCollectionAPIAdapter Adapter;
@@ -57,77 +34,47 @@ class _CollectionContainerDataSource : public HdContainerDataSource
 public:
     HD_DECLARE_DATASOURCE(_CollectionContainerDataSource);
 
-    _CollectionContainerDataSource(const UsdCollectionAPI &api,
-        const UsdImagingDataSourceStageGlobals &stageGlobals)
+    _CollectionContainerDataSource(const UsdCollectionAPI &api)
     : _api(api)
-    , _stageGlobals(stageGlobals){
-    }
+    {}
 
     TfTokenVector GetNames() override {
-        TfTokenVector result;
-        result.reserve(4);
-
-        if (_api.GetExpansionRuleAttr()) {
-            result.push_back(_tokens->expansionRule);
-        }
-
-        if (_api.GetIncludeRootAttr()) {
-            result.push_back(_tokens->includeRoot);
-        }
-
-        if (_api.GetIncludesRel()) {
-            result.push_back(_tokens->includes);
-        }
-
-        if (_api.GetExcludesRel()) {
-            result.push_back(_tokens->excludes);
-        }
-
-        return result;
+        static TfTokenVector names =
+            { HdCollectionSchemaTokens->membershipExpression };
+        return names;
     }
 
     HdDataSourceBaseHandle Get(const TfToken &name) override {
-        if (name == _tokens->expansionRule) {
-            if (UsdAttribute attr = _api.GetExpansionRuleAttr()) {
-                return UsdImagingDataSourceAttributeNew(attr, _stageGlobals);
-            }
-        } else if (name == _tokens->includeRoot) {
-             if (UsdAttribute attr = _api.GetIncludeRootAttr()) {
-                // not intended to be time-varying so not providing a 
-                // path/locator.
-                return UsdImagingDataSourceAttributeNew(attr, _stageGlobals);
-            }
-        } else if (name == _tokens->includes) {
-            if (UsdRelationship rel = _api.GetIncludesRel()) {
-                return _BuildRelationshipDataSource(rel);
-            }
-        } else if (name == _tokens->excludes) {
-            if (UsdRelationship rel = _api.GetExcludesRel()) {
-                return _BuildRelationshipDataSource(rel);
-            }
+        if (name == HdCollectionSchemaTokens->membershipExpression) {
+            return
+                HdRetainedTypedSampledDataSource<SdfPathExpression>::New(
+                    _ComputePathExpressionFromCollection(_api));
         }
 
         return nullptr;
     }
 
 private:
-
-    HdDataSourceBaseHandle _BuildRelationshipDataSource(
-            const UsdRelationship &rel) {
-
-        SdfPathVector targets;
-        rel.GetForwardedTargets(&targets);
-        if (targets.empty()) {
-            return nullptr;
+    static SdfPathExpression
+    _ComputePathExpressionFromCollection(
+        const UsdCollectionAPI &api)
+    {
+        // A collection can be either rule-based (includes, excludes, ..)
+        // or path-expression-based.
+        // Construct a query object to determine the flavor.
+        const UsdCollectionMembershipQuery query = api.ComputeMembershipQuery();
+
+        if (query.UsesPathExpansionRuleMap()) {
+            const auto &ruleMap = query.GetAsPathExpansionRuleMap();
+            return
+                UsdComputePathExpressionFromCollectionMembershipQueryRuleMap(
+                    ruleMap);
         }
-        VtArray<SdfPath> targetArray(targets.begin(), targets.end());
-        return HdRetainedTypedSampledDataSource<VtArray<SdfPath>>::New(
-            targetArray);
+        
+        return api.ResolveCompleteMembershipExpression();
     }
 
-
     UsdCollectionAPI _api;
-    const UsdImagingDataSourceStageGlobals &_stageGlobals;
 };
 
 HD_DECLARE_DATASOURCE_HANDLES(_CollectionContainerDataSource);
@@ -141,11 +88,9 @@ class _CollectionsContainerDataSource : public HdContainerDataSource
 
     _CollectionsContainerDataSource(
         const UsdPrim &prim,
-        const TfToken &name,
-        const UsdImagingDataSourceStageGlobals &stageGlobals
-    ) : _api(prim, name)
-    , _stageGlobals(stageGlobals) {
-    }
+        const TfToken &name)
+    : _api(prim, name)
+    {}
 
     TfTokenVector GetNames() override {
         return {_api.GetName()};
@@ -153,14 +98,13 @@ class _CollectionsContainerDataSource : public HdContainerDataSource
 
     HdDataSourceBaseHandle Get(const TfToken &name) override {
         if (name == _api.GetName()) {
-            return _CollectionContainerDataSource::New(_api, _stageGlobals);
+            return _CollectionContainerDataSource::New(_api);
         }
         return nullptr;
     }
 
 private:
     UsdCollectionAPI _api;
-    const UsdImagingDataSourceStageGlobals &_stageGlobals;
 };
 
 HD_DECLARE_DATASOURCE_HANDLES(_CollectionsContainerDataSource);
@@ -180,10 +124,11 @@ UsdImagingCollectionAPIAdapter::GetImagingSubprimData(
         return nullptr;
     }
 
+    // Note: When multiple collections are present, we'll overlay the containers
+    //       and thus aggregate the individual collection's.
     return HdRetainedContainerDataSource::New(
-        _tokens->usdCollections,
-        _CollectionsContainerDataSource::New(
-            prim, appliedInstanceName, stageGlobals)
+        HdCollectionsSchemaTokens->collections,
+        _CollectionsContainerDataSource::New(prim, appliedInstanceName)
     );
 }
 
@@ -205,7 +150,7 @@ UsdImagingCollectionAPIAdapter::InvalidateImagingSubprim(
     for (const TfToken &propertyName : properties) {
         if (TfStringStartsWith(propertyName.GetString(), prefix)) {
             return HdDataSourceLocator(
-                _tokens->usdCollections, appliedInstanceName);
+                HdCollectionsSchemaTokens->collections, appliedInstanceName);
         }
     }
 
diff --git a/pxr/usdImaging/usdImaging/collectionAPIAdapter.h b/pxr/usdImaging/usdImaging/collectionAPIAdapter.h
index 205a6f5657..1b28aea785 100644
--- a/pxr/usdImaging/usdImaging/collectionAPIAdapter.h
+++ b/pxr/usdImaging/usdImaging/collectionAPIAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_COLLECTION_API_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_COLLECTION_API_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/collectionCache.cpp b/pxr/usdImaging/usdImaging/collectionCache.cpp
index 0529e2001e..950bbf7478 100644
--- a/pxr/usdImaging/usdImaging/collectionCache.cpp
+++ b/pxr/usdImaging/usdImaging/collectionCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/collectionCache.h"
 #include "pxr/usdImaging/usdImaging/debugCodes.h"
diff --git a/pxr/usdImaging/usdImaging/collectionCache.h b/pxr/usdImaging/usdImaging/collectionCache.h
index b80e256fad..a977470a74 100644
--- a/pxr/usdImaging/usdImaging/collectionCache.h
+++ b/pxr/usdImaging/usdImaging/collectionCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_COLLECTION_CACHE_H
 #define PXR_USD_IMAGING_USD_IMAGING_COLLECTION_CACHE_H
diff --git a/pxr/usdImaging/usdImaging/collectionMaterialBindingSchema.cpp b/pxr/usdImaging/usdImaging/collectionMaterialBindingSchema.cpp
index a6cc062384..a241277c8a 100644
--- a/pxr/usdImaging/usdImaging/collectionMaterialBindingSchema.cpp
+++ b/pxr/usdImaging/usdImaging/collectionMaterialBindingSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/collectionMaterialBindingSchema.h b/pxr/usdImaging/usdImaging/collectionMaterialBindingSchema.h
index 0bf42f45f8..cf3c644011 100644
--- a/pxr/usdImaging/usdImaging/collectionMaterialBindingSchema.h
+++ b/pxr/usdImaging/usdImaging/collectionMaterialBindingSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/collectionMaterialBindingsSchema.cpp b/pxr/usdImaging/usdImaging/collectionMaterialBindingsSchema.cpp
index d8ddb73dac..103c4a2664 100644
--- a/pxr/usdImaging/usdImaging/collectionMaterialBindingsSchema.cpp
+++ b/pxr/usdImaging/usdImaging/collectionMaterialBindingsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/collectionMaterialBindingsSchema.h b/pxr/usdImaging/usdImaging/collectionMaterialBindingsSchema.h
index 8c55a15cfc..7844bcb7ce 100644
--- a/pxr/usdImaging/usdImaging/collectionMaterialBindingsSchema.h
+++ b/pxr/usdImaging/usdImaging/collectionMaterialBindingsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/coneAdapter.cpp b/pxr/usdImaging/usdImaging/coneAdapter.cpp
index ab63d843e1..8dd8049bb5 100644
--- a/pxr/usdImaging/usdImaging/coneAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/coneAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/coneAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/coneAdapter.h b/pxr/usdImaging/usdImaging/coneAdapter.h
index 3cd000ebbf..2e1ebf9be6 100644
--- a/pxr/usdImaging/usdImaging/coneAdapter.h
+++ b/pxr/usdImaging/usdImaging/coneAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_CONE_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_CONE_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/coordSysAPIAdapter.cpp b/pxr/usdImaging/usdImaging/coordSysAPIAdapter.cpp
index 2341ca01b0..c47f9ec3d5 100644
--- a/pxr/usdImaging/usdImaging/coordSysAPIAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/coordSysAPIAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/coordSysAPIAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/coordSysAPIAdapter.h b/pxr/usdImaging/usdImaging/coordSysAPIAdapter.h
index 6d65916e12..076de54208 100644
--- a/pxr/usdImaging/usdImaging/coordSysAPIAdapter.h
+++ b/pxr/usdImaging/usdImaging/coordSysAPIAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_COORD_SYS_API_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_COORD_SYS_API_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/coordSysAdapter.cpp b/pxr/usdImaging/usdImaging/coordSysAdapter.cpp
index d8768a3db0..f7ff1c8f1f 100644
--- a/pxr/usdImaging/usdImaging/coordSysAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/coordSysAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/coordSysAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/coordSysAdapter.h b/pxr/usdImaging/usdImaging/coordSysAdapter.h
index 24d80fc249..f25ced75d1 100644
--- a/pxr/usdImaging/usdImaging/coordSysAdapter.h
+++ b/pxr/usdImaging/usdImaging/coordSysAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_COORD_SYS_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_COORD_SYS_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/cubeAdapter.cpp b/pxr/usdImaging/usdImaging/cubeAdapter.cpp
index 1959447aba..5bf73630a3 100644
--- a/pxr/usdImaging/usdImaging/cubeAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/cubeAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/cubeAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/cubeAdapter.h b/pxr/usdImaging/usdImaging/cubeAdapter.h
index 3fee9dfca3..514768a9b7 100644
--- a/pxr/usdImaging/usdImaging/cubeAdapter.h
+++ b/pxr/usdImaging/usdImaging/cubeAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_CUBE_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_CUBE_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/cylinderAdapter.cpp b/pxr/usdImaging/usdImaging/cylinderAdapter.cpp
index 24ef710143..31579c6ec0 100644
--- a/pxr/usdImaging/usdImaging/cylinderAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/cylinderAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/cylinderAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/cylinderAdapter.h b/pxr/usdImaging/usdImaging/cylinderAdapter.h
index 60ae4f1235..22f77817cb 100644
--- a/pxr/usdImaging/usdImaging/cylinderAdapter.h
+++ b/pxr/usdImaging/usdImaging/cylinderAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_CYLINDER_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_CYLINDER_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/cylinderLightAdapter.cpp b/pxr/usdImaging/usdImaging/cylinderLightAdapter.cpp
index 6de4fa5983..2c6b364eda 100644
--- a/pxr/usdImaging/usdImaging/cylinderLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/cylinderLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/cylinderLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
@@ -42,6 +25,24 @@ UsdImagingCylinderLightAdapter::~UsdImagingCylinderLightAdapter()
 {
 }
 
+TfTokenVector
+UsdImagingCylinderLightAdapter::GetImagingSubprims(UsdPrim const& prim)
+{
+    return { TfToken() };
+}
+
+TfToken
+UsdImagingCylinderLightAdapter::GetImagingSubprimType(
+    UsdPrim const& prim,
+    TfToken const& subprim)
+{
+    if (subprim.IsEmpty()) {
+        return HdPrimTypeTokens->cylinderLight;
+    }
+
+    return TfToken();
+}
+
 bool
 UsdImagingCylinderLightAdapter::IsSupported(UsdImagingIndexProxy const* index) const
 {
diff --git a/pxr/usdImaging/usdImaging/cylinderLightAdapter.h b/pxr/usdImaging/usdImaging/cylinderLightAdapter.h
index a74e0897f2..74dbda5852 100644
--- a/pxr/usdImaging/usdImaging/cylinderLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/cylinderLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_CYLINDER_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_CYLINDER_LIGHT_ADAPTER_H
@@ -50,6 +33,19 @@ class UsdImagingCylinderLightAdapter : public UsdImagingLightAdapter {
     USDIMAGING_API
     virtual ~UsdImagingCylinderLightAdapter();
 
+    // ---------------------------------------------------------------------- //
+    /// \name Scene Index Support
+    // ---------------------------------------------------------------------- //
+
+    USDIMAGING_API
+    TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;
+
+    USDIMAGING_API
+    TfToken GetImagingSubprimType(UsdPrim const& prim, TfToken const& subprim)
+        override;
+
+    // ---------------------------------------------------------------------- //
+
     USDIMAGING_API
     virtual SdfPath Populate(UsdPrim const& prim,
                      UsdImagingIndexProxy* index,
diff --git a/pxr/usdImaging/usdImaging/dataSourceAttribute.cpp b/pxr/usdImaging/usdImaging/dataSourceAttribute.cpp
index e522972fc1..c76768566b 100644
--- a/pxr/usdImaging/usdImaging/dataSourceAttribute.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceAttribute.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceAttribute.h"
 
diff --git a/pxr/usdImaging/usdImaging/dataSourceAttribute.h b/pxr/usdImaging/usdImaging/dataSourceAttribute.h
index 91eb6f1be5..112ae89819 100644
--- a/pxr/usdImaging/usdImaging/dataSourceAttribute.h
+++ b/pxr/usdImaging/usdImaging/dataSourceAttribute.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_ATTRIBUTE_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_ATTRIBUTE_H
@@ -31,6 +14,8 @@
 #include "pxr/imaging/hd/dataSource.h"
 #include "pxr/imaging/hd/dataSourceTypeDefs.h"
 
+#include <algorithm>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /// \class UsdImagingDataSourceAttribute<T>
@@ -83,14 +68,32 @@ class UsdImagingDataSourceAttribute : public HdTypedSampledDataSource<T>
             time.GetValue() + startTime,
             time.GetValue() + endTime);
         std::vector<double> timeSamples;
+    
+        // Start with the times that fall within the interval
         _usdAttrQuery.GetTimeSamplesInInterval(interval, &timeSamples);
-
-        // Add boundary timesamples, if necessary.
-        if (timeSamples.empty() || timeSamples[0] > interval.GetMin()) {
-            timeSamples.insert(timeSamples.begin(), interval.GetMin());
+        // Add bracketing sample times for the leading and trailing edges of the
+        // interval.
+        double first, ignore, last;
+        bool hasFirst, hasLast;
+        // If hasFirst/hasLast comes back false for an edge, or if both the left and
+        // right bracketing times for the edge are the same, it means there's no
+        // bracketing sample time anywhere beyond that edge, so we fall back to the
+        // interval's edge.
+        _usdAttrQuery.GetBracketingTimeSamples(interval.GetMin(), &first, &ignore, &hasFirst);
+        if (!hasFirst || first == ignore) {
+            first = interval.GetMin();
+        }
+        _usdAttrQuery.GetBracketingTimeSamples(interval.GetMax(), &ignore, &last, &hasLast);
+        if (!hasLast || last == ignore ) {
+            last = interval.GetMax();
+        }
+        // Add the bracketing sample times only if they actually fall outside the
+        // interval. This maintains ordering and uniqueness.
+        if (timeSamples.empty() || first < timeSamples.front()) {
+            timeSamples.insert(timeSamples.begin(), first);    
         }
-        if (timeSamples.back() < interval.GetMax()) {
-            timeSamples.push_back(interval.GetMax());
+        if (last > timeSamples.back()) {
+            timeSamples.insert(timeSamples.end(), last);
         }
 
         // We need to convert the time array because usd uses double and
@@ -100,7 +103,7 @@ class UsdImagingDataSourceAttribute : public HdTypedSampledDataSource<T>
             (*outSampleTimes)[i] = timeSamples[i] - time.GetValue();
         }
 
-        return true;
+        return outSampleTimes->size() > 1;
     }
 
 private:
diff --git a/pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.cpp b/pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.cpp
index 6ca2ba454d..df6862a78e 100644
--- a/pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.h"
 
diff --git a/pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.h b/pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.h
index 6f5a4c6e29..404c1b669b 100644
--- a/pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.h
+++ b/pxr/usdImaging/usdImaging/dataSourceAttributeColorSpace.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_ATTRIBUTE_COLORSPACE_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_ATTRIBUTE_COLORSPACE_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceBasisCurves.cpp b/pxr/usdImaging/usdImaging/dataSourceBasisCurves.cpp
index 1e5263ddb3..13437a6165 100644
--- a/pxr/usdImaging/usdImaging/dataSourceBasisCurves.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceBasisCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceBasisCurves.h"
 #include "pxr/usdImaging/usdImaging/dataSourcePrimvars.h"
diff --git a/pxr/usdImaging/usdImaging/dataSourceBasisCurves.h b/pxr/usdImaging/usdImaging/dataSourceBasisCurves.h
index e1197368b1..36a09fcd23 100644
--- a/pxr/usdImaging/usdImaging/dataSourceBasisCurves.h
+++ b/pxr/usdImaging/usdImaging/dataSourceBasisCurves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_BASISCURVES_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_BASISCURVES_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceCamera.cpp b/pxr/usdImaging/usdImaging/dataSourceCamera.cpp
index 5ae96824dd..0f96d88448 100644
--- a/pxr/usdImaging/usdImaging/dataSourceCamera.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceCamera.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceCamera.h"
 #include "pxr/usdImaging/usdImaging/dataSourceAttribute.h"
diff --git a/pxr/usdImaging/usdImaging/dataSourceCamera.h b/pxr/usdImaging/usdImaging/dataSourceCamera.h
index 450be4ad14..6b2e5938f0 100644
--- a/pxr/usdImaging/usdImaging/dataSourceCamera.h
+++ b/pxr/usdImaging/usdImaging/dataSourceCamera.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_CAMERA_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceGprim.cpp b/pxr/usdImaging/usdImaging/dataSourceGprim.cpp
index 281d85e5a1..6742c6af18 100644
--- a/pxr/usdImaging/usdImaging/dataSourceGprim.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceGprim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceGprim.h"
 
diff --git a/pxr/usdImaging/usdImaging/dataSourceGprim.h b/pxr/usdImaging/usdImaging/dataSourceGprim.h
index 0731b4daee..9d2ede6a00 100644
--- a/pxr/usdImaging/usdImaging/dataSourceGprim.h
+++ b/pxr/usdImaging/usdImaging/dataSourceGprim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_GPRIM_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_GPRIM_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceImplicits-Impl.h b/pxr/usdImaging/usdImaging/dataSourceImplicits-Impl.h
index 325610e73c..f15307a59f 100644
--- a/pxr/usdImaging/usdImaging/dataSourceImplicits-Impl.h
+++ b/pxr/usdImaging/usdImaging/dataSourceImplicits-Impl.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_IMPLICITS_IMPL_H
@@ -27,33 +10,10 @@
 
 #include "pxr/usdImaging/usdImaging/dataSourceGprim.h"
 #include "pxr/usdImaging/usdImaging/dataSourceStageGlobals.h"
-#include "pxr/usdImaging/usdImaging/dataSourceSchemaBased.h"
+#include "pxr/usdImaging/usdImaging/dataSourceMapped.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-template<typename HdSchemaType>
-struct UsdImagingImplicitsSchemaTranslator
-{
-    static
-    TfToken
-    UsdAttributeNameToHdName(const TfToken &name)
-    {
-        // Skip extent since this is already dealt with
-        // in UsdImagingDataSourcePrim::Get. 
-        if (name == UsdGeomTokens->extent) {
-            return TfToken();
-        }
-        return name;
-    }
-
-    static
-    HdDataSourceLocator
-    GetContainerLocator()
-    {
-        return HdSchemaType::GetDefaultLocator();
-    }
-};
-
 /// \class UsdImagingDataSourceImplicitsPrim
 ///
 /// A prim data source for a cube, ...
@@ -69,16 +29,17 @@ class UsdImagingDataSourceImplicitsPrim : public UsdImagingDataSourceGprim
 
     TfTokenVector GetNames() override {
         TfTokenVector result = UsdImagingDataSourceGprim::GetNames();
-        result.push_back(_GetLocatorToken());
+        result.push_back(HdSchemaType::GetSchemaToken());
         return result;
 
     }
     HdDataSourceBaseHandle Get(const TfToken &name) override {
-        if (name == _GetLocatorToken()) {
+        if (name == HdSchemaType::GetSchemaToken()) {
             return
-                _DataSource::New(
+                UsdImagingDataSourceMapped::New(
+                    _GetUsdPrim(),
                     _GetSceneIndexPath(),
-                    UsdSchemaType(_GetUsdPrim()),
+                    _GetMappings(),
                     _GetStageGlobals());
         }
 
@@ -92,8 +53,8 @@ class UsdImagingDataSourceImplicitsPrim : public UsdImagingDataSourceGprim
                const TfTokenVector &properties,
                const UsdImagingPropertyInvalidationType invalidationType) {
         HdDataSourceLocatorSet locators =
-            _DataSource::Invalidate(
-                subprim, properties);
+            UsdImagingDataSourceMapped::Invalidate(
+                properties, _GetMappings());
 
         locators.insert(
             UsdImagingDataSourceGprim::Invalidate(
@@ -103,11 +64,31 @@ class UsdImagingDataSourceImplicitsPrim : public UsdImagingDataSourceGprim
     }
 
 private:
-    using _DataSource =
-        UsdImagingDataSourceSchemaBased<
-            UsdSchemaType,
-            /* UsdSchemaBaseTypes = */ std::tuple<>,
-            UsdImagingImplicitsSchemaTranslator<HdSchemaType>>;
+    static
+    std::vector<UsdImagingDataSourceMapped::AttributeMapping>
+    _GetAttributeMappings() {
+        std::vector<UsdImagingDataSourceMapped::AttributeMapping> result;
+
+        for (const TfToken &usdName :
+                 UsdSchemaType::GetSchemaAttributeNames(
+                     /* includeInherited = */ false)) {
+            if (usdName == UsdGeomTokens->extent) {
+                // Skip extent since this is already dealt with
+                // in UsdImagingDataSourcePrim::Get. 
+                continue;
+            }
+            result.push_back({ usdName, HdDataSourceLocator(usdName)});
+        }
+        return result;
+    }
+    
+    static
+    const UsdImagingDataSourceMapped::AttributeMappings &
+    _GetMappings() {
+        static const UsdImagingDataSourceMapped::AttributeMappings result(
+            _GetAttributeMappings(), HdSchemaType::GetDefaultLocator());
+        return result;
+    }
 
     // Private constructor, use static New() instead.
     UsdImagingDataSourceImplicitsPrim(
@@ -117,25 +98,6 @@ class UsdImagingDataSourceImplicitsPrim : public UsdImagingDataSourceGprim
       : UsdImagingDataSourceGprim(sceneIndexPath, usdPrim, stageGlobals)
     {
     }
-
-    static 
-    TfToken
-    _GetLocatorTokenUncached() {
-        const HdDataSourceLocator locator =
-            HdSchemaType::GetDefaultLocator();
-        if (locator.GetElementCount() != 1) {
-            TF_CODING_ERROR("Expected data source locator with one element.");
-            return TfToken();
-        }
-        return locator.GetFirstElement();
-    }
-
-    static
-    const TfToken &
-    _GetLocatorToken() {
-        static const TfToken result = _GetLocatorTokenUncached();
-        return result;
-    }
 };
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdImaging/dataSourceMapped.cpp b/pxr/usdImaging/usdImaging/dataSourceMapped.cpp
new file mode 100644
index 0000000000..e0c48651ba
--- /dev/null
+++ b/pxr/usdImaging/usdImaging/dataSourceMapped.cpp
@@ -0,0 +1,235 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usdImaging/usdImaging/dataSourceMapped.h"
+
+#include <variant>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+namespace UsdImagingDataSourceMapped_Impl
+{
+
+// For a given location within UsdImagingDataSourceMapped,
+// information what data source to create.
+//
+// Such a data source is either an HdSampledDataSource giving
+// the value of an Usd attribute. Or a container data source.
+using _DataSourceInfo =
+    std::variant<UsdImagingDataSourceMapped::AttributeMapping,
+                 _ContainerMappingsSharedPtr>;
+
+// Data for a container data source.
+struct _ContainerMappings
+{
+    // Names within the container data source - sorted lexicographically.
+    TfTokenVector hdNames;
+    // What data source should be returned for the above name.
+    // This vector runs in parallel with hdNames.
+    //
+    // _DataSourceInfo can store another _ContainerMappings so this
+    // data structure is a tree mirroring the tree of given data source
+    // locators.
+    std::vector<_DataSourceInfo> dataSourceInfos;
+};
+
+}
+
+using namespace UsdImagingDataSourceMapped_Impl;
+
+UsdImagingDataSourceMapped::UsdImagingDataSourceMapped(
+    UsdPrim const &usdPrim,
+    const SdfPath &sceneIndexPath,
+    const AttributeMappings &mappings,
+    const UsdImagingDataSourceStageGlobals &stageGlobals)
+  : UsdImagingDataSourceMapped(
+      usdPrim,
+      sceneIndexPath,
+      mappings._containerMappings,
+      stageGlobals)
+{
+}
+
+UsdImagingDataSourceMapped::UsdImagingDataSourceMapped(
+    UsdPrim const &usdPrim,
+    const SdfPath &sceneIndexPath,
+    const _ContainerMappingsSharedPtr &containerMappings,
+    const UsdImagingDataSourceStageGlobals &stageGlobals)
+  : _usdPrim(usdPrim)
+  , _sceneIndexPath(sceneIndexPath)
+  , _containerMappings(containerMappings)
+  , _stageGlobals(stageGlobals)
+{
+}
+
+UsdImagingDataSourceMapped::~UsdImagingDataSourceMapped() = default;
+
+TfTokenVector
+UsdImagingDataSourceMapped::GetNames()
+{
+    return _containerMappings->hdNames;
+}
+
+HdDataSourceBaseHandle
+UsdImagingDataSourceMapped::Get(const TfToken &name)
+{
+    // Look for name in hdNames.
+
+    const auto itName = std::lower_bound(
+        _containerMappings->hdNames.begin(),
+        _containerMappings->hdNames.end(),
+        name);
+
+    if (!(itName != _containerMappings->hdNames.end() &&
+          *itName == name)) {
+        return nullptr;
+    }
+    
+    const auto itInfo =
+        _containerMappings->dataSourceInfos.begin() +
+        (itName - _containerMappings->hdNames.begin()); 
+
+    const _DataSourceInfo &info = *itInfo;
+    if (auto const mapping = std::get_if<AttributeMapping>(&info)) {
+        // We create a data source from the UsdAttribute.
+        UsdAttribute attr = _usdPrim.GetAttribute(mapping->usdName);
+        if (!attr) {
+            TF_CODING_ERROR(
+                "Expected usd attribute '%s' on prim '%s' to serve "
+                "data source at locator '%s'.",
+                mapping->usdName.GetText(),
+                _usdPrim.GetPath().GetText(),
+                mapping->hdLocator.GetString().c_str());
+            return nullptr;
+        }
+        return mapping->factory(
+            attr, _stageGlobals, _sceneIndexPath, mapping->hdLocator);
+    } else {
+        // We are in the nested case.
+        return UsdImagingDataSourceMapped::New(
+            _usdPrim,
+            _sceneIndexPath,
+            std::get<_ContainerMappingsSharedPtr>(info),
+            _stageGlobals);
+    }
+}
+
+HdDataSourceLocatorSet
+UsdImagingDataSourceMapped::Invalidate(
+    const TfTokenVector &usdNames, const AttributeMappings &mappings)
+{
+    HdDataSourceLocatorSet locators;
+    
+    for (const TfToken &usdName : usdNames) {
+        for (const AttributeMapping &mapping : mappings._absoluteMappings) {
+            if (mapping.usdName == usdName) {
+                locators.insert(mapping.hdLocator);
+            }
+        }
+    }
+
+    return locators;
+}
+
+// Find or add name as key to given containerMappings - returning the
+// _ContainerMappings at that key.
+_ContainerMappingsSharedPtr
+_FindOrCreateChild(const TfToken &name,
+                  _ContainerMappingsSharedPtr const &containerMappings)
+{
+    const auto itName = std::lower_bound(
+        containerMappings->hdNames.begin(),
+        containerMappings->hdNames.end(),
+        name);
+    const auto itInfo =
+        containerMappings->dataSourceInfos.begin() +
+        (itName - containerMappings->hdNames.begin()); 
+
+    if (itName != containerMappings->hdNames.end() && *itName == name) {
+        const _DataSourceInfo &info = *itInfo;
+        auto * const child = std::get_if<_ContainerMappingsSharedPtr>(&info);
+        if (!child) {
+            const auto &mapping = 
+                std::get<UsdImagingDataSourceMapped::AttributeMapping>(info);
+            TF_CODING_ERROR(
+                "Adding data source locator when there was already an "
+                "ascendant locator added for a Usd attribute with name '%s'.",
+                mapping.usdName.GetText());
+            return nullptr;
+        }
+        return *child;
+    }
+
+    // Create new item.
+    _ContainerMappingsSharedPtr child = std::make_shared<_ContainerMappings>();
+
+    containerMappings->hdNames.insert(itName, name);
+    containerMappings->dataSourceInfos.insert(itInfo, child);
+
+    return child;
+}
+
+// Add mapping to containerMappins at given locator.
+void
+_Add(const HdDataSourceLocator &locator,
+     const UsdImagingDataSourceMapped::AttributeMapping &mapping,
+     _ContainerMappingsSharedPtr containerMappings)
+{
+    const size_t n = locator.GetElementCount();
+    if (n == 0) {
+        TF_CODING_ERROR("Expected non-trivial data source locator for "
+                        "attribute %s.", mapping.usdName.GetText());
+        return;
+    }
+
+    // Find or create the nested container data sources.
+    for (size_t i = 0; i < n - 1; ++i) {
+        const TfToken &hdName = locator.GetElement(i);
+        containerMappings = _FindOrCreateChild(hdName, containerMappings);
+        if (!containerMappings) {
+            return;
+        }
+    }
+
+    const TfToken &name = mapping.hdLocator.GetLastElement();
+    
+    // And add the AttributeMapping as leaf.
+    const auto itName = std::lower_bound(
+        containerMappings->hdNames.begin(),
+        containerMappings->hdNames.end(),
+        name);
+    const auto itInfo =
+        containerMappings->dataSourceInfos.begin() +
+        (itName - containerMappings->hdNames.begin()); 
+
+    containerMappings->hdNames.insert(itName, name);
+    containerMappings->dataSourceInfos.insert(itInfo, mapping);
+}
+
+UsdImagingDataSourceMapped::AttributeMappings::AttributeMappings(
+    const std::vector<AttributeMapping> &mappings,
+    const HdDataSourceLocator &dataSourcePrefix)
+{
+    _absoluteMappings.reserve(mappings.size());
+    _containerMappings = std::make_shared<_ContainerMappings>();
+
+    for (const AttributeMapping &mapping : mappings) {
+        // Making locator absolute.
+        const AttributeMapping absoluteMapping{
+            mapping.usdName,
+            dataSourcePrefix.Append(mapping.hdLocator),
+            mapping.factory};
+
+        _absoluteMappings.push_back(absoluteMapping);
+
+        _Add(mapping.hdLocator, absoluteMapping, _containerMappings);
+    }
+}
+
+UsdImagingDataSourceMapped::AttributeMappings::~AttributeMappings() = default;
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdImaging/dataSourceMapped.h b/pxr/usdImaging/usdImaging/dataSourceMapped.h
new file mode 100644
index 0000000000..49b4a83a37
--- /dev/null
+++ b/pxr/usdImaging/usdImaging/dataSourceMapped.h
@@ -0,0 +1,159 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_MAPPED_H
+#define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_MAPPED_H
+
+#include "pxr/usdImaging/usdImaging/dataSourceAttribute.h"
+#include "pxr/usdImaging/usdImaging/dataSourceStageGlobals.h"
+
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+namespace UsdImagingDataSourceMapped_Impl
+{
+using _ContainerMappingsSharedPtr = std::shared_ptr<struct _ContainerMappings>;
+}
+
+/// \class UsdImagingDataSourceMapped
+///
+/// A data source that is a (potentially nested) container for the values of
+/// the attributes of a given UsdPrim.
+///
+/// That is, this container data source contains `HdSampledDataSource`s giving
+/// the value of an attribute, either directly or in a nested fashion by
+/// containing container data sources itself.
+///
+/// The mapping of attributes to locations in the (nested) container data
+/// source can be specified through AttributeMapping. These locations are
+/// relative to the UsdImagingDataSourceMapped itself. To compute the correct
+/// data source locators for invalidation purposes, the location of the
+/// UsdImagingDataSourceMapped needs to be given to AttributeMappings so that
+/// absolute locators (that is relative to the prim data source) can be
+/// computed.
+///
+class UsdImagingDataSourceMapped : public HdContainerDataSource
+{
+public:
+
+    HD_DECLARE_DATASOURCE(UsdImagingDataSourceMapped);
+
+    /// Signature of function to compute data source from attribute.
+    ///
+    /// This could be generalized to HdDataSourceBaseHandle but we use
+    /// HdSampledDataSourceHandle as result instead so that we can use
+    /// the UsdImagingDataSourceAttributeNew function pointer.
+    ///
+    using DataSourceAttributeFactory =
+        HdSampledDataSourceHandle(const UsdAttribute &,
+                                  const UsdImagingDataSourceStageGlobals &,
+                                  const SdfPath &,
+                                  const HdDataSourceLocator &);
+    using DataSourceAttributeFactoryFn =
+        std::function<DataSourceAttributeFactory>;
+    using DataSourceAttributeFactoryPtr =
+        DataSourceAttributeFactory *;
+
+    /// Specify how one attribute on given Usd prim maps to data source in
+    /// this (nested) container data source.
+    struct AttributeMapping final
+    {
+        /// Name of attribute on Usd Prim.
+        ///
+        TfToken usdName;
+
+        /// Corresponding location in this data source.
+        ///
+        /// Has to be non-empty. If length is greater than one, nested
+        /// container data sources will be created.
+        ///
+        HdDataSourceLocator hdLocator;
+
+        /// Function to compute data source from UsdAttribute.
+        ///
+        /// Defaults to the appropriate overload of
+        /// UsdImagingDataSourceAttributeNew.
+        ///
+        /// Clients can implement custom behavior. For example, following
+        /// the connection of a UsdShadeOutput and return the path of the
+        /// connected prim.
+        ///
+        DataSourceAttributeFactoryFn factory =
+            DataSourceAttributeFactoryPtr(
+                UsdImagingDataSourceAttributeNew);
+    };
+
+    /// Specify how attributes on given Usd prim maps to data sources in
+    /// this (nested) container data source.
+    class AttributeMappings final
+    {
+    public:
+        /// dataSourcePrefix is the location of this
+        /// UsdImagingDataSourceMapped within a prim data source.
+        USDIMAGING_API
+        AttributeMappings(
+            const std::vector<AttributeMapping> &mappings,
+            const HdDataSourceLocator &datasourcePrefix);
+
+        USDIMAGING_API
+        ~AttributeMappings();
+        
+    private:
+        friend class UsdImagingDataSourceMapped;
+
+        using _ContainerMappingsSharedPtr =
+            UsdImagingDataSourceMapped_Impl::_ContainerMappingsSharedPtr;
+
+        // Flat list with absolute locators for invalidation.
+        std::vector<AttributeMapping> _absoluteMappings;
+        // Nested list to implement HdContainerDataSource::Get.
+        _ContainerMappingsSharedPtr _containerMappings;
+    };
+
+    USDIMAGING_API
+    TfTokenVector GetNames() override;
+
+    USDIMAGING_API
+    HdDataSourceBaseHandle Get(const TfToken &name) override;
+
+    USDIMAGING_API
+    static
+    HdDataSourceLocatorSet
+    Invalidate(const TfTokenVector &usdNames,
+               const AttributeMappings &mappings);
+
+    USDIMAGING_API
+    ~UsdImagingDataSourceMapped() override;
+
+private:
+    using _ContainerMappingsSharedPtr =
+        UsdImagingDataSourceMapped_Impl::_ContainerMappingsSharedPtr;
+
+    USDIMAGING_API
+    UsdImagingDataSourceMapped(
+        UsdPrim const &usdPrim,
+        const SdfPath &sceneIndexPath,
+        const AttributeMappings &mappings,
+        const UsdImagingDataSourceStageGlobals &stageGlobals);
+
+    UsdImagingDataSourceMapped(
+        UsdPrim const &usdPrim,
+        const SdfPath &sceneIndexPath,
+        const _ContainerMappingsSharedPtr &containerMappings,
+        const UsdImagingDataSourceStageGlobals &stageGlobals);
+
+    UsdPrim _usdPrim;
+    const SdfPath _sceneIndexPath;
+    _ContainerMappingsSharedPtr const _containerMappings;
+    const UsdImagingDataSourceStageGlobals & _stageGlobals;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/pxr/usdImaging/usdImaging/dataSourceMaterial.cpp b/pxr/usdImaging/usdImaging/dataSourceMaterial.cpp
index c8da30e1c1..d3be543b34 100644
--- a/pxr/usdImaging/usdImaging/dataSourceMaterial.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceMaterial.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceMaterial.h"
 
diff --git a/pxr/usdImaging/usdImaging/dataSourceMaterial.h b/pxr/usdImaging/usdImaging/dataSourceMaterial.h
index 696a171e80..6d986be99c 100644
--- a/pxr/usdImaging/usdImaging/dataSourceMaterial.h
+++ b/pxr/usdImaging/usdImaging/dataSourceMaterial.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_MATERIAL_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_MATERIAL_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceMesh.cpp b/pxr/usdImaging/usdImaging/dataSourceMesh.cpp
index 7197c35533..7b48d61675 100644
--- a/pxr/usdImaging/usdImaging/dataSourceMesh.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceMesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceMesh.h"
 
diff --git a/pxr/usdImaging/usdImaging/dataSourceMesh.h b/pxr/usdImaging/usdImaging/dataSourceMesh.h
index de6c08b449..47fc42d3e6 100644
--- a/pxr/usdImaging/usdImaging/dataSourceMesh.h
+++ b/pxr/usdImaging/usdImaging/dataSourceMesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_MESH_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_MESH_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceNurbsCurves.cpp b/pxr/usdImaging/usdImaging/dataSourceNurbsCurves.cpp
index 5f0a025822..e84ad9f289 100644
--- a/pxr/usdImaging/usdImaging/dataSourceNurbsCurves.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceNurbsCurves.cpp
@@ -1,29 +1,12 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceNurbsCurves.h"
 
-#include "pxr/usdImaging/usdImaging/dataSourceSchemaBased.h"
+#include "pxr/usdImaging/usdImaging/dataSourceMapped.h"
 
 #include "pxr/usd/usdGeom/nurbsCurves.h"
 
@@ -37,38 +20,42 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
 
-struct _NurbsCurvesTranslator
+std::vector<UsdImagingDataSourceMapped::AttributeMapping>
+_GetAttributeMappings()
 {
-    static
-    TfToken
-    UsdAttributeNameToHdName(const TfToken &name)
-    {
-        // Suppress widths from UsdGeomCurves (which is a custom
-        // primvar that UsdImagingDataSourceGprim gives us) and
-        // pointWeights from UsdGeomNurbsCurves (which is a custom
-        // primvar we process in the prim source below).
-        if (name == UsdGeomTokens->widths ||
-            name == UsdGeomTokens->pointWeights) {
-            return TfToken();
+    std::vector<UsdImagingDataSourceMapped::AttributeMapping> result;
+
+    for (const TfToken &usdName :
+             UsdGeomNurbsCurves::GetSchemaAttributeNames(
+                 /* includeInherited = */ false)) {
+        if (usdName == UsdGeomTokens->pointWeights) {
+            // Suppress pointWeights from UsdGeomNurbsCurves (which is a custom
+            // primvar we process in the prim source below).
+            continue;
         }
-
-        return name;
+        result.push_back({ usdName, HdDataSourceLocator(usdName) });
     }
 
-    static
-    HdDataSourceLocator
-    GetContainerLocator()
-    {
-        return HdNurbsCurvesSchema::GetDefaultLocator();
+    for (const TfToken &usdName :
+             UsdGeomCurves::GetSchemaAttributeNames(
+                 /* includeInherited = */ false)) {
+        if (usdName == UsdGeomTokens->widths) {
+            // Suppress widths from UsdGeomCurves (which is a custom
+            // primvar that UsdImagingDataSourceGprim gives us).
+            continue;
+        }
+        result.push_back({ usdName, HdDataSourceLocator(usdName) });
     }
-};
 
-// Data source for locator nurbsCurves
-//
-// Include (non-inherited) attributes of UsdGeomNurbsCurves and
-// of UsdGeomCurves (to pick up curveVertexCounts).
-using _NurbsCurvesDataSource = UsdImagingDataSourceSchemaBased<
-    UsdGeomNurbsCurves, std::tuple<UsdGeomCurves>, _NurbsCurvesTranslator>;
+    return result;
+}
+
+const UsdImagingDataSourceMapped::AttributeMappings &
+_GetMappings() {
+    static const UsdImagingDataSourceMapped::AttributeMappings result(
+        _GetAttributeMappings(), HdNurbsCurvesSchema::GetDefaultLocator());
+    return result;
+}
 
 const UsdImagingDataSourceCustomPrimvars::Mappings &
 _GetCustomPrimvarMappings(const UsdPrim &usdPrim)
@@ -107,9 +94,10 @@ UsdImagingDataSourceNurbsCurvesPrim::Get(const TfToken & name)
 {
     if (name == HdNurbsCurvesSchema::GetSchemaToken()) {
         return
-            _NurbsCurvesDataSource::New(
+            UsdImagingDataSourceMapped::New(
+                _GetUsdPrim(),
                 _GetSceneIndexPath(),
-                UsdGeomNurbsCurves(_GetUsdPrim()),
+                _GetMappings(),
                 _GetStageGlobals());
     }
 
@@ -138,8 +126,8 @@ UsdImagingDataSourceNurbsCurvesPrim::Invalidate(
     TRACE_FUNCTION();
 
     HdDataSourceLocatorSet locators =
-        _NurbsCurvesDataSource::Invalidate(
-            subprim, properties);
+        UsdImagingDataSourceMapped::Invalidate(
+            properties, _GetMappings());
     
     locators.insert(
         UsdImagingDataSourceGprim::Invalidate(
diff --git a/pxr/usdImaging/usdImaging/dataSourceNurbsCurves.h b/pxr/usdImaging/usdImaging/dataSourceNurbsCurves.h
index ff3780eb05..c71103b4d8 100644
--- a/pxr/usdImaging/usdImaging/dataSourceNurbsCurves.h
+++ b/pxr/usdImaging/usdImaging/dataSourceNurbsCurves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_NURBS_CURVES_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceNurbsPatch.cpp b/pxr/usdImaging/usdImaging/dataSourceNurbsPatch.cpp
index dc4ab8c3f7..f2223d31af 100644
--- a/pxr/usdImaging/usdImaging/dataSourceNurbsPatch.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceNurbsPatch.cpp
@@ -1,29 +1,12 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceNurbsPatch.h"
 
-#include "pxr/usdImaging/usdImaging/dataSourceSchemaBased.h"
+#include "pxr/usdImaging/usdImaging/dataSourceMapped.h"
 
 #include "pxr/usd/usdGeom/nurbsPatch.h"
 
@@ -36,78 +19,48 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
 
-// _NurbsPatchDataSource is a container data source for locator
-// nurbsPatch.
-//
-// It contains all non-space USD attributes of the UsdGeomNurbsPatch schema
-// (that is, the name contains no ":"). This means it skips the
-// trimCurve prefixed attributes from UsdGeomNurbsPatch as well as the
-// pointWeights (which is a primvar) and the primvars from UsdGeomGprim.
-//
-struct _NurbsPatchTranslator
+HdDataSourceLocator
+_ToLocator(const TfToken &name)
 {
-    static
-    TfToken
-    UsdAttributeNameToHdName(const TfToken &name)
-    {
-        if (SdfPath::TokenizeIdentifier(name.GetString()).size() != 1) {
-            return TfToken();
-        }
-        if (name == UsdGeomTokens->pointWeights) {
-            return TfToken();
-        }
-
-        return name;
-    }
-
-    static
-    HdDataSourceLocator
-    GetContainerLocator()
-    {
-        return HdNurbsPatchSchema::GetDefaultLocator();
-    }
-};
-
-using _NurbsPatchDataSource = UsdImagingDataSourceSchemaBased<
-    UsdGeomNurbsPatch,
-    /* UsdSchemaBaseTypes = */ std::tuple<UsdGeomGprim>,
-    _NurbsPatchTranslator>;
-
-// _TrimCurveTranslator is a container data source for locator
-// nurbsPatch/trimCurve.
-//
-// It contains all USD attributes in the trimCurve namespace
-// of the UsdGeomNurbsPatch schema (prefixed by trimCurve:).
-//
-struct _TrimCurveTranslator
+    const TfTokenVector tokens = SdfPath::TokenizeIdentifierAsTokens(name);
+    return HdDataSourceLocator(tokens.size(), tokens.data());
+}
+    
+std::vector<UsdImagingDataSourceMapped::AttributeMapping>
+_GetAttributeMappings()
 {
-    static
-    TfToken
-    UsdAttributeNameToHdName(const TfToken &name)
-    {
-        static const TfToken prefix("trimCurve");
-
-        const std::pair<std::string, bool> strippedName =
-            SdfPath::StripPrefixNamespace(name, prefix);
-        if (strippedName.second) {
-            return TfToken(strippedName.first);
+    std::vector<UsdImagingDataSourceMapped::AttributeMapping> result;
+
+    // Pick up from UsdGeomGprim
+    result.push_back(
+        {UsdGeomTokens->doubleSided,
+         HdDataSourceLocator(HdNurbsPatchSchemaTokens->doubleSided)});
+    result.push_back(
+        {UsdGeomTokens->orientation,
+         HdDataSourceLocator(HdNurbsPatchSchemaTokens->orientation)});
+    
+    for (const TfToken &usdName :
+             UsdGeomNurbsPatch::GetSchemaAttributeNames(
+                 /* includeInherited = */ false)) {
+        if (usdName == UsdGeomTokens->pointWeights) {
+            // Suppress pointWeights from UsdGeomNurbsCurves (which is a custom
+            // primvar we process in the prim source below).
+            continue;
         }
-        return TfToken();
-    }
 
-    static
-    HdDataSourceLocator
-    GetContainerLocator()
-    {
-        return HdNurbsPatchTrimCurveSchema::GetDefaultLocator();
+        result.push_back({ usdName, _ToLocator(usdName)});
     }
-};
 
-using _TrimCurveDataSource = UsdImagingDataSourceSchemaBased<
-    UsdGeomNurbsPatch,
-    /* UsdSchemaBaseTypes = */ std::tuple<>,
-    _TrimCurveTranslator>;
+    return result;
+}
 
+const UsdImagingDataSourceMapped::AttributeMappings &
+_GetMappings() {
+    static const UsdImagingDataSourceMapped::AttributeMappings result(
+        _GetAttributeMappings(), HdNurbsPatchSchema::GetDefaultLocator());
+    return result;
+}
+    
 const UsdImagingDataSourceCustomPrimvars::Mappings &
 _GetCustomPrimvarMappings(const UsdPrim &usdPrim)
 {
@@ -145,19 +98,11 @@ UsdImagingDataSourceNurbsPatchPrim::Get(const TfToken & name)
 {
     if (name == HdNurbsPatchSchema::GetSchemaToken()) {
         return
-            HdOverlayContainerDataSource::New(
-                // Container for locator nurbsPatch
-                _NurbsPatchDataSource::New(
-                    _GetSceneIndexPath(),
-                    UsdGeomNurbsPatch(_GetUsdPrim()),
-                    _GetStageGlobals()),
-                HdRetainedContainerDataSource::New(
-                    HdNurbsPatchTrimCurveSchemaTokens->trimCurve,
-                    // Container for locator nurbsPatch/trimCurve
-                    _TrimCurveDataSource::New(
-                        _GetSceneIndexPath(),
-                        UsdGeomNurbsPatch(_GetUsdPrim()),
-                        _GetStageGlobals())));
+            UsdImagingDataSourceMapped::New(
+                _GetUsdPrim(),
+                _GetSceneIndexPath(),
+                _GetMappings(),
+                _GetStageGlobals());
     } 
     if (name == HdPrimvarsSchema::GetSchemaToken()) {
         return
@@ -184,12 +129,8 @@ UsdImagingDataSourceNurbsPatchPrim::Invalidate(
     TRACE_FUNCTION();
 
     HdDataSourceLocatorSet locators =
-        _NurbsPatchDataSource::Invalidate(
-            subprim, properties);
-
-    locators.insert(
-        _TrimCurveDataSource::Invalidate(
-            subprim, properties));
+        UsdImagingDataSourceMapped::Invalidate(
+            properties, _GetMappings());
 
     locators.insert(
         UsdImagingDataSourceGprim::Invalidate(
diff --git a/pxr/usdImaging/usdImaging/dataSourceNurbsPatch.h b/pxr/usdImaging/usdImaging/dataSourceNurbsPatch.h
index 685d999112..3af81a2292 100644
--- a/pxr/usdImaging/usdImaging/dataSourceNurbsPatch.h
+++ b/pxr/usdImaging/usdImaging/dataSourceNurbsPatch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_NURBS_PATCH_H
diff --git a/pxr/usdImaging/usdImaging/dataSourcePointInstancer.cpp b/pxr/usdImaging/usdImaging/dataSourcePointInstancer.cpp
index 1112e42c3a..9ae7dfbdca 100644
--- a/pxr/usdImaging/usdImaging/dataSourcePointInstancer.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourcePointInstancer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourcePointInstancer.h"
 
@@ -181,27 +164,74 @@ UsdImagingDataSourcePointInstancerTopology::GetNames()
     };
 }
 
+static
 UsdImagingDataSourceCustomPrimvars::Mappings
-_GetCustomPrimvarMappings(const UsdPrim &usdPrim)
+_Merge(const UsdImagingDataSourceCustomPrimvars::Mappings &a,
+       const UsdImagingDataSourceCustomPrimvars::Mappings &b)
 {
-    TfToken usdOrientationsToken;
-    UsdGeomPointInstancer instancer(usdPrim);
+    UsdImagingDataSourceCustomPrimvars::Mappings result = a;
+    for (const auto &mapping : b) {
+        result.push_back(mapping);
+    }
+    return result;
+}
 
-    return {
+const UsdImagingDataSourceCustomPrimvars::Mappings &
+_GetCustomPrimvarMappings(const UsdPrim &usdPrim)
+{
+    static const UsdImagingDataSourceCustomPrimvars::Mappings baseMappings = {
         {
             HdInstancerTokens->instanceTranslations,
             UsdGeomTokens->positions,
-            HdPrimvarSchemaTokens->instance },
-        {
-            HdInstancerTokens->instanceRotations,
-            instancer.UsesOrientationsf()
-              ? UsdGeomTokens->orientationsf
-              : UsdGeomTokens->orientations,
-            HdPrimvarSchemaTokens->instance },
+            HdPrimvarSchemaTokens->instance
+        },
         {
             HdInstancerTokens->instanceScales,
             UsdGeomTokens->scales,
-            HdPrimvarSchemaTokens->instance } };
+            HdPrimvarSchemaTokens->instance
+        },
+        {
+            HdTokens->velocities,
+            UsdGeomTokens->velocities,
+            HdPrimvarSchemaTokens->instance
+        },
+        {
+            HdTokens->accelerations,
+            UsdGeomTokens->accelerations,
+            HdPrimvarSchemaTokens->instance
+        },
+        {
+            HdTokens->angularVelocities,
+            UsdGeomTokens->angularVelocities,
+            HdPrimvarSchemaTokens->instance
+        }
+    };
+
+    TfToken usdOrientationsToken;
+    UsdGeomPointInstancer instancer(usdPrim);
+    if (instancer.UsesOrientationsf(&usdOrientationsToken)) {
+        static const UsdImagingDataSourceCustomPrimvars::Mappings
+            mappingsOrientationsf = _Merge(baseMappings,
+            {
+                {
+                    HdInstancerTokens->instanceRotations,
+                    UsdGeomTokens->orientationsf,
+                    HdPrimvarSchemaTokens->instance
+                }
+            });
+        return mappingsOrientationsf;
+    } else {
+        static const UsdImagingDataSourceCustomPrimvars::Mappings
+            mappingsOrientations = _Merge(baseMappings,
+            {
+                {
+                    HdInstancerTokens->instanceRotations,
+                    UsdGeomTokens->orientations,
+                    HdPrimvarSchemaTokens->instance
+                }
+            });
+        return mappingsOrientations;
+    }
 }
 
 HdDataSourceBaseHandle
diff --git a/pxr/usdImaging/usdImaging/dataSourcePointInstancer.h b/pxr/usdImaging/usdImaging/dataSourcePointInstancer.h
index 73d2ede2da..5a7a8f31ef 100644
--- a/pxr/usdImaging/usdImaging/dataSourcePointInstancer.h
+++ b/pxr/usdImaging/usdImaging/dataSourcePointInstancer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_POINT_INSTANCER_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_POINT_INSTANCER_H
diff --git a/pxr/usdImaging/usdImaging/dataSourcePoints.cpp b/pxr/usdImaging/usdImaging/dataSourcePoints.cpp
index c3150c587d..2838d01bc0 100644
--- a/pxr/usdImaging/usdImaging/dataSourcePoints.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourcePoints.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourcePoints.h"
 #include "pxr/usdImaging/usdImaging/dataSourcePrimvars.h"
diff --git a/pxr/usdImaging/usdImaging/dataSourcePoints.h b/pxr/usdImaging/usdImaging/dataSourcePoints.h
index 8333cbaaf1..cf346ca765 100644
--- a/pxr/usdImaging/usdImaging/dataSourcePoints.h
+++ b/pxr/usdImaging/usdImaging/dataSourcePoints.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_POINTS_H
diff --git a/pxr/usdImaging/usdImaging/dataSourcePrim.cpp b/pxr/usdImaging/usdImaging/dataSourcePrim.cpp
index bdd4c98bb6..03f77a947c 100644
--- a/pxr/usdImaging/usdImaging/dataSourcePrim.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourcePrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourcePrim.h"
 #include "pxr/usdImaging/usdImaging/dataSourceAttribute.h"
diff --git a/pxr/usdImaging/usdImaging/dataSourcePrim.h b/pxr/usdImaging/usdImaging/dataSourcePrim.h
index 3105958591..a0521034f9 100644
--- a/pxr/usdImaging/usdImaging/dataSourcePrim.h
+++ b/pxr/usdImaging/usdImaging/dataSourcePrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_PRIM_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_PRIM_H
diff --git a/pxr/usdImaging/usdImaging/dataSourcePrimvars.cpp b/pxr/usdImaging/usdImaging/dataSourcePrimvars.cpp
index 052c9856a1..7f46cefb02 100644
--- a/pxr/usdImaging/usdImaging/dataSourcePrimvars.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourcePrimvars.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/dataSourcePrimvars.h"
@@ -133,9 +116,15 @@ UsdImagingDataSourcePrimvars::Get(const TfToken & name)
     if (nsIt != _namespacedPrimvars.end()) {
         const UsdGeomPrimvar &usdPrimvar = nsIt->second;
         const UsdAttribute &attr = usdPrimvar.GetAttr();
+
+        UsdAttributeQuery valueQuery(attr);
+        if (!valueQuery.HasAuthoredValue()) {
+            return nullptr;
+        }
+
         return UsdImagingDataSourcePrimvar::New(
                 _sceneIndexPath, name, _stageGlobals,
-                /* value = */ UsdAttributeQuery(attr),
+                /* value = */ std::move(valueQuery),
                 /* indices = */ UsdAttributeQuery(usdPrimvar.GetIndicesAttr()),
                 HdPrimvarSchema::BuildInterpolationDataSource(
                     UsdImagingUsdToHdInterpolationToken(
@@ -168,24 +157,20 @@ UsdImagingDataSourceCustomPrimvars::UsdImagingDataSourceCustomPrimvars(
 : _sceneIndexPath(sceneIndexPath)
 , _usdPrim(usdPrim)
 , _stageGlobals(stageGlobals)
+, _mappings(mappings)
 {
-    for (const Mapping& cp : mappings) {
-        UsdAttributeQuery attrQ(
-            _usdPrim.GetPrim().GetAttribute(cp.usdAttrName));
-        if (attrQ.HasAuthoredValue()) {
-            _customPrimvars[cp.primvarName] = { attrQ, cp.interpolation };
-        }
-    }
 }
 
 TfTokenVector
 UsdImagingDataSourceCustomPrimvars::GetNames()
 {
+    TRACE_FUNCTION();
+    
     TfTokenVector result;
-    result.reserve(_customPrimvars.size());
+    result.reserve(_mappings.size());
 
-    for (const auto &entry : _customPrimvars) {
-        result.push_back(entry.first);
+    for (const auto &mapping : _mappings) {
+        result.push_back(mapping.primvarName);
     }
 
     return result;
@@ -194,20 +179,28 @@ UsdImagingDataSourceCustomPrimvars::GetNames()
 HdDataSourceBaseHandle
 UsdImagingDataSourceCustomPrimvars::Get(const TfToken &name)
 {
-    const auto cIt = _customPrimvars.find(name);
-    if (cIt != _customPrimvars.end()) {
-        const UsdAttributeQuery &attrQ = cIt->second.first;
-        const UsdAttribute &attr = attrQ.GetAttribute();
-        const TfToken &interpolation = cIt->second.second;
+    TRACE_FUNCTION();
+    
+    for (const Mapping &mapping : _mappings) {
+        if (mapping.primvarName != name) {
+            continue;
+        }
+
+        const UsdAttribute attr = _usdPrim.GetAttribute(mapping.usdAttrName);
+        UsdAttributeQuery valueQuery(attr);
+
+        if (!valueQuery.HasAuthoredValue()) {
+            return nullptr;
+        }
 
         return UsdImagingDataSourcePrimvar::New(
             _sceneIndexPath, name, _stageGlobals,
-            /* value = */ attrQ,
+            /* value = */ std::move(valueQuery),
             /* indices = */ UsdAttributeQuery(),
             HdPrimvarSchema::BuildInterpolationDataSource(
-                interpolation.IsEmpty()
+                mapping.interpolation.IsEmpty()
                 ? _GetInterpolation(attr)
-                : interpolation),
+                : mapping.interpolation),
             HdPrimvarSchema::BuildRoleDataSource(
                 UsdImagingUsdToHdRole(attr.GetRoleName())));
     }
@@ -316,7 +309,7 @@ UsdImagingDataSourcePrimvar::Get(const TfToken & name)
     if (indexed) {
         if (name == HdPrimvarSchemaTokens->indexedPrimvarValue) {
             return UsdImagingDataSourceAttributeNew(
-                    _valueQuery, _stageGlobals);
+                _valueQuery, _stageGlobals);
         } else if (name == HdPrimvarSchemaTokens->indices) {
             return UsdImagingDataSourceAttributeNew(
                     _indicesQuery, _stageGlobals);
@@ -324,7 +317,7 @@ UsdImagingDataSourcePrimvar::Get(const TfToken & name)
     } else {
         if (name == HdPrimvarSchemaTokens->primvarValue) {
             return UsdImagingDataSourceAttributeNew(
-                    _valueQuery, _stageGlobals);
+                _valueQuery, _stageGlobals);
         }
     }
 
diff --git a/pxr/usdImaging/usdImaging/dataSourcePrimvars.h b/pxr/usdImaging/usdImaging/dataSourcePrimvars.h
index 4f8eb35b46..8cbe2313e7 100644
--- a/pxr/usdImaging/usdImaging/dataSourcePrimvars.h
+++ b/pxr/usdImaging/usdImaging/dataSourcePrimvars.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_PRIMVARS_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_PRIMVARS_H
@@ -123,11 +106,7 @@ class UsdImagingDataSourceCustomPrimvars : public HdContainerDataSource
     // Stage globals handle.
     const UsdImagingDataSourceStageGlobals &_stageGlobals;
 
-    using _CustomPrimvarsMap =
-        std::map<TfToken,
-                 std::pair<UsdAttributeQuery,
-                           TfToken /* forced interpolation */>>;
-    _CustomPrimvarsMap _customPrimvars;
+    const Mappings _mappings;
 };
 
 HD_DECLARE_DATASOURCE_HANDLES(UsdImagingDataSourceCustomPrimvars);
diff --git a/pxr/usdImaging/usdImaging/dataSourceRelationship.cpp b/pxr/usdImaging/usdImaging/dataSourceRelationship.cpp
index 175037dec2..5a88d68b57 100644
--- a/pxr/usdImaging/usdImaging/dataSourceRelationship.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceRelationship.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceRelationship.h"
 
diff --git a/pxr/usdImaging/usdImaging/dataSourceRelationship.h b/pxr/usdImaging/usdImaging/dataSourceRelationship.h
index e048d15d5e..dc2c0f008a 100644
--- a/pxr/usdImaging/usdImaging/dataSourceRelationship.h
+++ b/pxr/usdImaging/usdImaging/dataSourceRelationship.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_RELATIONSHIP_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_RELATIONSHIP_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceRenderPrims.cpp b/pxr/usdImaging/usdImaging/dataSourceRenderPrims.cpp
index cb33fedd90..91caa9114f 100644
--- a/pxr/usdImaging/usdImaging/dataSourceRenderPrims.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceRenderPrims.cpp
@@ -1,18 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License atNAMESPACE
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceRenderPrims.h"
 
@@ -21,11 +11,13 @@
 #include "pxr/usdImaging/usdImaging/usdRenderSettingsSchema.h"
 #include "pxr/usdImaging/usdImaging/usdRenderVarSchema.h"
 
+#include "pxr/usd/usdRender/pass.h"
 #include "pxr/usd/usdRender/product.h"
 #include "pxr/usd/usdRender/settings.h"
 #include "pxr/usd/usdRender/spec.h"
 #include "pxr/usd/usdRender/var.h"
 
+#include "pxr/imaging/hd/renderPassSchema.h"
 #include "pxr/imaging/hd/retainedDataSource.h"
 
 #include "pxr/base/tf/token.h"
@@ -74,6 +66,136 @@ _ComputeNamespacedSettings(const UsdPrim &prim)
 
 }
 
+// ----------------------------------------------------------------------------
+//                               RENDER PASS
+// ----------------------------------------------------------------------------
+namespace {
+
+///
+/// A container data source representing render pass
+///
+class _DataSourceRenderPass : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_DataSourceRenderPass);
+
+    static
+    const TfTokenVector& GetPropertyNames() {
+        // We do not supply all of the UsdRenderPass attributes,
+        // since some are for batch processing purposes.
+        static TfTokenVector names = {
+            UsdRenderTokens->passType,
+            UsdRenderTokens->renderSource };
+        return names;
+    }
+
+    TfTokenVector GetNames() override
+    {
+        return GetPropertyNames();
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        if (name == UsdRenderTokens->passType) {
+            TfToken passType;
+            if (_usdRenderPass.GetPassTypeAttr().Get(&passType)) {
+                return HdRetainedTypedSampledDataSource<TfToken>::New(passType);
+            }
+            return nullptr;
+        } else if (name == UsdRenderTokens->renderSource) {
+            if (UsdRelationship renderSourceRel =
+                _usdRenderPass.GetRenderSourceRel()) {
+                SdfPathVector targets; 
+                renderSourceRel.GetForwardedTargets(&targets);
+                if (!targets.empty()) {
+                    return HdRetainedTypedSampledDataSource<SdfPath>::New(
+                        targets[0]);
+                }
+            }
+            return nullptr;
+        }
+        return nullptr;
+    }
+
+private:
+
+    // Private constructor, use static New() instead.
+    _DataSourceRenderPass(
+            const SdfPath &sceneIndexPath,
+            UsdRenderPass usdRenderPass,
+            const UsdImagingDataSourceStageGlobals &stageGlobals)
+        : _sceneIndexPath(sceneIndexPath)
+        , _usdRenderPass(usdRenderPass)
+        , _stageGlobals(stageGlobals)
+    {}
+
+private:
+    const SdfPath _sceneIndexPath;
+    UsdRenderPass _usdRenderPass;
+    const UsdImagingDataSourceStageGlobals & _stageGlobals;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_DataSourceRenderPass);
+
+}
+
+UsdImagingDataSourceRenderPassPrim::UsdImagingDataSourceRenderPassPrim(
+    const SdfPath &sceneIndexPath,
+    UsdPrim usdPrim,
+    const UsdImagingDataSourceStageGlobals &stageGlobals)
+    : UsdImagingDataSourcePrim(sceneIndexPath, usdPrim, stageGlobals)
+{
+}
+
+TfTokenVector 
+UsdImagingDataSourceRenderPassPrim::GetNames()
+{
+    // Note: Skip properties on UsdImagingDataSourcePrim.
+    return { HdRenderPassSchema::GetSchemaToken() };
+}
+
+HdDataSourceBaseHandle 
+UsdImagingDataSourceRenderPassPrim::Get(const TfToken & name)
+{
+    if (name == HdRenderPassSchema::GetSchemaToken()) {
+        return _DataSourceRenderPass::New(
+                    _GetSceneIndexPath(),
+                    UsdRenderPass(_GetUsdPrim()),
+                    _GetStageGlobals());
+    } 
+
+    // Note: Skip properties on UsdImagingDataSourcePrim.
+    return nullptr;
+}
+
+HdDataSourceLocatorSet
+UsdImagingDataSourceRenderPassPrim::Invalidate(
+    UsdPrim const& prim,
+    const TfToken &subprim,
+    const TfTokenVector &properties,
+    const UsdImagingPropertyInvalidationType invalidationType)
+
+{
+    TRACE_FUNCTION();
+
+    const TfTokenVector &names = _DataSourceRenderPass::GetPropertyNames();
+    static TfToken::HashSet tokensSet(names.begin(), names.end());
+
+    HdDataSourceLocatorSet locators;
+
+    for (const TfToken &propertyName : properties) {
+        if (tokensSet.find(propertyName) != tokensSet.end()) {
+            locators.insert(
+                HdRenderPassSchema::GetDefaultLocator()
+                    .Append(propertyName));
+        }
+        // Note: Skip UsdImagingDataSourcePrim::Invalidate(...)
+        // since none of the "base" set of properties are relevant here.
+    }
+
+    return locators;
+}
+
 // ----------------------------------------------------------------------------
 //                               RENDER SETTINGS
 // ----------------------------------------------------------------------------
diff --git a/pxr/usdImaging/usdImaging/dataSourceRenderPrims.h b/pxr/usdImaging/usdImaging/dataSourceRenderPrims.h
index 7e37130070..138482e67a 100644
--- a/pxr/usdImaging/usdImaging/dataSourceRenderPrims.h
+++ b/pxr/usdImaging/usdImaging/dataSourceRenderPrims.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_RENDER_PRIMS_H
@@ -33,6 +16,41 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
+/// \class UsdImagingDataSourceRenderPassPrim
+///
+/// A prim data source representing UsdRenderPass.
+///
+class UsdImagingDataSourceRenderPassPrim : public UsdImagingDataSourcePrim
+{
+public:
+    HD_DECLARE_DATASOURCE(UsdImagingDataSourceRenderPassPrim);
+
+    USDIMAGING_API
+    TfTokenVector GetNames() override;
+
+    USDIMAGING_API
+    HdDataSourceBaseHandle Get(const TfToken &name) override;
+
+    USDIMAGING_API
+    static
+    HdDataSourceLocatorSet
+    Invalidate(
+        UsdPrim const& prim,
+        const TfToken &subprim,
+        const TfTokenVector &properties,
+        UsdImagingPropertyInvalidationType invalidationType);
+
+private:
+    // Private constructor, use static New() instead.
+    UsdImagingDataSourceRenderPassPrim(
+        const SdfPath &sceneIndexPath,
+        UsdPrim usdPrim,
+        const UsdImagingDataSourceStageGlobals &stageGlobals);
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(UsdImagingDataSourceRenderPassPrim);
+
+
 /// \class UsdImagingDataSourceRenderSettingsPrim
 ///
 /// A prim data source representing UsdRenderSettings.
diff --git a/pxr/usdImaging/usdImaging/dataSourceSchemaBased.h b/pxr/usdImaging/usdImaging/dataSourceSchemaBased.h
deleted file mode 100644
index cc86f4ccfd..0000000000
--- a/pxr/usdImaging/usdImaging/dataSourceSchemaBased.h
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-// Copyright 2022 Pixar
-//
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
-//
-
-#ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_SCHEMA_BASED_H
-#define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_SCHEMA_BASED_H
-
-#include "pxr/usdImaging/usdImaging/dataSourceAttribute.h"
-#include "pxr/usdImaging/usdImaging/dataSourceStageGlobals.h"
-
-#include "pxr/imaging/hd/dataSource.h"
-
-PXR_NAMESPACE_OPEN_SCOPE
-
-namespace UsdImagingDataSourceSchemaBased_Impl
-{
-struct _Mapping;
-};
-
-/// \class UsdImagingDataSourceSchemaBased
-///
-/// A container data source created from a Usd schema and optionally some
-/// of its base classes which accesses the attributes on the underlying Usd
-/// prim performing translation between the Usd attribute name and the key in
-/// the container data source (for implementing Get) or the data source
-/// locator (for implementing Invalidate).
-///
-/// The translation starts by taking the non-inherited attributes from the
-/// the given UsdSchemaType (e.g., UsdGeomSphere) and the given UsdSchemaBaseTypes
-/// and calling Translator::UsdAttributeNameToHdName(usdAttributeName) which
-/// can either return the corresponding hydra token or an empty token if
-/// the usd attribute should not occur in the data source.
-///
-/// UsdSchemaBaseTypes is a std::tuple of the base schema types that should
-/// also be considered and can be std::tuple<> if there is no base schema or
-/// no attribute of a base schema should be included.
-///
-/// The data source locator (relevant for invalidation) will be created
-/// by appending the hydra token to the data source locator returned by
-/// Translator::GetContainerLocator().
-///
-template<typename UsdSchemaType,
-         typename UsdSchemaBaseTypes,
-         typename Translator>
-class UsdImagingDataSourceSchemaBased : public HdContainerDataSource
-{
-public:
-    using This = UsdImagingDataSourceSchemaBased<
-        UsdSchemaType, UsdSchemaBaseTypes, Translator>;
-
-    HD_DECLARE_DATASOURCE(This);
-
-    TfTokenVector GetNames() override;
-
-    HdDataSourceBaseHandle Get(const TfToken &name) override;
-
-    /// Translate usdNames to data source locators.
-    static
-    HdDataSourceLocatorSet
-    Invalidate(const TfToken &subprim, const TfTokenVector &usdNames);
-
-private:
-    // Private constructor, use static New() instead.
-    UsdImagingDataSourceSchemaBased(
-            const SdfPath &sceneIndexPath,
-            UsdSchemaType usdSchema,
-            const UsdImagingDataSourceStageGlobals &stageGlobals);
-
-    using _Mapping = UsdImagingDataSourceSchemaBased_Impl::_Mapping;
-
-    static const std::vector<_Mapping> &_GetMappings();
-
-private:
-    const SdfPath _sceneIndexPath;
-    UsdSchemaType _usdSchema;
-    const UsdImagingDataSourceStageGlobals & _stageGlobals;
-};
-
-/// Implementation
-
-namespace UsdImagingDataSourceSchemaBased_Impl
-{
-
-struct _Mapping
-{
-    TfToken usdAttributeName;
-    TfToken hdName;
-    HdDataSourceLocator locator;
-};
-
-template<typename Translator,
-         typename ThisUsdSchemaType>
-void _FillMappings(std::vector<_Mapping> * const result)
-{
-    for (const TfToken &usdAttributeName :
-             ThisUsdSchemaType::GetSchemaAttributeNames(
-                 /* includeInherited = */ false))
-    {
-        const TfToken hdName =
-            Translator::UsdAttributeNameToHdName(usdAttributeName);
-        if (!hdName.IsEmpty()) {
-            result->push_back(
-                { usdAttributeName,
-                  hdName,
-                  Translator::GetContainerLocator().Append(hdName) });
-        }
-    }
-}
-
-template<typename Translator,
-         typename UsdSchemaBaseTypes>
-struct _MappingsFiller;
-
-template<typename Translator>
-struct _MappingsFiller<Translator, std::tuple<>>
-{
-    static void Fill(std::vector<_Mapping> * const result)
-    {
-    }
-};
-
-template<typename Translator,
-         typename UsdSchemaType,
-         typename ...UsdSchemaTypes>
-struct _MappingsFiller<Translator, std::tuple<UsdSchemaType, UsdSchemaTypes...>>
-{
-    static void Fill(std::vector<_Mapping> * const result)
-    {
-        _FillMappings<Translator, UsdSchemaType>(result);
-        _MappingsFiller<Translator, std::tuple<UsdSchemaTypes...>>::Fill(result);
-    }
-};
-
-template<typename UsdSchemaType,
-         typename UsdSchemaBasesTypes,
-         typename Translator>
-std::vector<_Mapping>
-_GetMappings()
-{
-    std::vector<_Mapping> result;
-    
-    _FillMappings<Translator, UsdSchemaType>(&result);
-    _MappingsFiller<Translator, UsdSchemaBasesTypes>::Fill(&result);
-
-    return result;
-}
-
-TfTokenVector
-inline _GetNames(const std::vector<_Mapping> &mappings)
-{
-    TfTokenVector result;
-    for (const _Mapping &mapping : mappings) {
-        result.push_back(mapping.hdName);
-    }
-    return result;
-}
-
-} // namespace UsdImagingDataSourceSchemaBased_Impl
-
-template<typename UsdSchemaType,
-         typename UsdSchemaBasesTypes,
-         typename Translator>
-TfTokenVector
-UsdImagingDataSourceSchemaBased<UsdSchemaType,UsdSchemaBasesTypes,Translator>::
-GetNames()
-{
-    static const TfTokenVector names =
-        UsdImagingDataSourceSchemaBased_Impl::_GetNames(_GetMappings());
-    return names;
-}
-
-template<typename UsdSchemaType,
-         typename UsdSchemaBasesTypes,
-         typename Translator>
-HdDataSourceBaseHandle
-UsdImagingDataSourceSchemaBased<UsdSchemaType,UsdSchemaBasesTypes,Translator>::
-Get(const TfToken &name)
-{
-    for (const _Mapping &mapping : _GetMappings()) {
-        if (mapping.hdName == name) {
-            if (UsdAttribute attr =
-                    _usdSchema.GetPrim().GetAttribute(
-                        mapping.usdAttributeName)) {
-                return
-                    UsdImagingDataSourceAttributeNew(
-                        attr,
-                        _stageGlobals,
-                        _sceneIndexPath,
-                        mapping.locator);
-            } else {
-                // Has(name) has returned true, but we return
-                // nullptr - an inconsistency.
-                TF_CODING_ERROR(
-                    "Could not get usd attribute '%s' even though "
-                    "it is on the schema.",
-                    mapping.usdAttributeName.GetText());
-                return nullptr;
-            }
-        }
-    }
-    return nullptr;
-}
-
-template<typename UsdSchemaType,
-         typename UsdSchemaBasesTypes,
-         typename Translator>
-HdDataSourceLocatorSet
-UsdImagingDataSourceSchemaBased<UsdSchemaType,UsdSchemaBasesTypes,Translator>::
-Invalidate(
-    const TfToken &subprim,
-    const TfTokenVector &usdNames)
-{
-    HdDataSourceLocatorSet locators;
-    
-    for (const TfToken &usdName : usdNames) {
-        for (const _Mapping &mapping : _GetMappings()) {
-            if (mapping.usdAttributeName == usdName) {
-                locators.insert(mapping.locator);
-            }
-        }
-    }
-    
-    return locators;
-}
-
-template<typename UsdSchemaType,
-         typename UsdSchemaBasesTypes,
-         typename Translator>
-UsdImagingDataSourceSchemaBased<UsdSchemaType,UsdSchemaBasesTypes,Translator>::
-UsdImagingDataSourceSchemaBased(
-    const SdfPath &sceneIndexPath,
-    UsdSchemaType usdSchema,
-    const UsdImagingDataSourceStageGlobals &stageGlobals)
-  : _sceneIndexPath(sceneIndexPath)
-  , _usdSchema(usdSchema)
-  , _stageGlobals(stageGlobals)
-{
-}
-
-template<typename UsdSchemaType,
-         typename UsdSchemaBasesTypes,
-         typename Translator>
-const std::vector<UsdImagingDataSourceSchemaBased_Impl::_Mapping> &
-UsdImagingDataSourceSchemaBased<UsdSchemaType,UsdSchemaBasesTypes,Translator>::
-_GetMappings()
-{
-    static const std::vector<_Mapping> mappings =
-        UsdImagingDataSourceSchemaBased_Impl::
-        _GetMappings<UsdSchemaType, UsdSchemaBasesTypes, Translator>();
-    return mappings;
-}
-
-
-PXR_NAMESPACE_CLOSE_SCOPE
-
-#endif // PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_SCHEMA_BASED_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceStage.cpp b/pxr/usdImaging/usdImaging/dataSourceStage.cpp
index 762d50d498..6be69c4090 100644
--- a/pxr/usdImaging/usdImaging/dataSourceStage.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceStage.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceStage.h"
 
diff --git a/pxr/usdImaging/usdImaging/dataSourceStage.h b/pxr/usdImaging/usdImaging/dataSourceStage.h
index 5cd787c443..8525c7d219 100644
--- a/pxr/usdImaging/usdImaging/dataSourceStage.h
+++ b/pxr/usdImaging/usdImaging/dataSourceStage.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_STAGE_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_STAGE_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceStageGlobals.cpp b/pxr/usdImaging/usdImaging/dataSourceStageGlobals.cpp
index 18ed73753c..1f3fab59ae 100644
--- a/pxr/usdImaging/usdImaging/dataSourceStageGlobals.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceStageGlobals.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/dataSourceStageGlobals.h"
diff --git a/pxr/usdImaging/usdImaging/dataSourceStageGlobals.h b/pxr/usdImaging/usdImaging/dataSourceStageGlobals.h
index d29c6f0452..cfc6b20eb9 100644
--- a/pxr/usdImaging/usdImaging/dataSourceStageGlobals.h
+++ b/pxr/usdImaging/usdImaging/dataSourceStageGlobals.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_STAGE_GLOBALS_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_STAGE_GLOBALS_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceTetMesh.cpp b/pxr/usdImaging/usdImaging/dataSourceTetMesh.cpp
index e018be8651..af2b57fdf6 100644
--- a/pxr/usdImaging/usdImaging/dataSourceTetMesh.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceTetMesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceTetMesh.h"
 
@@ -47,6 +30,7 @@ UsdImagingDataSourceTetMeshTopology::GetNames()
     return {
         HdTetMeshTopologySchemaTokens->orientation,
         HdTetMeshTopologySchemaTokens->tetVertexIndices,
+        HdTetMeshTopologySchemaTokens->surfaceFaceVertexIndices,
     };
 }
 
@@ -59,6 +43,11 @@ UsdImagingDataSourceTetMeshTopology::Get(const TfToken &name)
             _usdTetMesh.GetTetVertexIndicesAttr(),
             _stageGlobals, _sceneIndexPath,
             HdTetMeshTopologySchema::GetTetVertexIndicesLocator());
+    } else if (name == HdTetMeshTopologySchemaTokens->surfaceFaceVertexIndices) {
+        return UsdImagingDataSourceAttribute<VtVec3iArray>::New(
+            _usdTetMesh.GetSurfaceFaceVertexIndicesAttr(),
+            _stageGlobals, _sceneIndexPath,
+            HdTetMeshTopologySchema::GetSurfaceFaceVertexIndicesLocator());
     } else if (name == HdTetMeshTopologySchemaTokens->orientation) {
         return UsdImagingDataSourceAttribute<TfToken>::New(
             _usdTetMesh.GetOrientationAttr(), _stageGlobals);
@@ -146,6 +135,7 @@ UsdImagingDataSourceTetMeshPrim::Invalidate(
 
     for (const TfToken &propertyName : properties) {
         if (propertyName == UsdGeomTokens->tetVertexIndices ||
+            propertyName == UsdGeomTokens->surfaceFaceVertexIndices ||
             propertyName == UsdGeomTokens->orientation) {
             locators.insert(HdTetMeshSchema::GetTopologyLocator());
         }
diff --git a/pxr/usdImaging/usdImaging/dataSourceTetMesh.h b/pxr/usdImaging/usdImaging/dataSourceTetMesh.h
index 22ee15abcd..1cd097131f 100644
--- a/pxr/usdImaging/usdImaging/dataSourceTetMesh.h
+++ b/pxr/usdImaging/usdImaging/dataSourceTetMesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_TET_MESH_H
 #define PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_TET_MESH_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.cpp b/pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.cpp
index 7f16e9a5f2..f74b2186e1 100644
--- a/pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.h"
diff --git a/pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.h b/pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.h
index 28569d985d..be199bbd76 100644
--- a/pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.h
+++ b/pxr/usdImaging/usdImaging/dataSourceUsdPrimInfo.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_USD_PRIM_INFO_H
diff --git a/pxr/usdImaging/usdImaging/dataSourceVolume.cpp b/pxr/usdImaging/usdImaging/dataSourceVolume.cpp
index f132df39b9..bf077b17c4 100644
--- a/pxr/usdImaging/usdImaging/dataSourceVolume.cpp
+++ b/pxr/usdImaging/usdImaging/dataSourceVolume.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/dataSourceVolume.h"
 
diff --git a/pxr/usdImaging/usdImaging/dataSourceVolume.h b/pxr/usdImaging/usdImaging/dataSourceVolume.h
index 0a0d09f50a..646f02d20c 100644
--- a/pxr/usdImaging/usdImaging/dataSourceVolume.h
+++ b/pxr/usdImaging/usdImaging/dataSourceVolume.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DATA_SOURCE_VOLUME_H
diff --git a/pxr/usdImaging/usdImaging/debugCodes.cpp b/pxr/usdImaging/usdImaging/debugCodes.cpp
index 6c9c4a5c56..692845236c 100644
--- a/pxr/usdImaging/usdImaging/debugCodes.cpp
+++ b/pxr/usdImaging/usdImaging/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/debugCodes.h"
 
diff --git a/pxr/usdImaging/usdImaging/debugCodes.h b/pxr/usdImaging/usdImaging/debugCodes.h
index 1524cfd13e..26e6bb7ae2 100644
--- a/pxr/usdImaging/usdImaging/debugCodes.h
+++ b/pxr/usdImaging/usdImaging/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DEBUG_CODES_H
 #define PXR_USD_IMAGING_USD_IMAGING_DEBUG_CODES_H
diff --git a/pxr/usdImaging/usdImaging/delegate.cpp b/pxr/usdImaging/usdImaging/delegate.cpp
index b46268aa2f..f20ce7117c 100644
--- a/pxr/usdImaging/usdImaging/delegate.cpp
+++ b/pxr/usdImaging/usdImaging/delegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/delegate.h"
 
@@ -880,10 +863,13 @@ UsdImagingDelegate::SetTime(UsdTimeCode time)
     // Mark varying attributes as dirty.
     if (_timeVaryingPrimCacheValid) {
         for (SdfPath const& path : _timeVaryingPrimCache) {
-            _HdPrimInfo &primInfo = _hdPrimInfoMap[path];
-            primInfo.adapter->MarkDirty(primInfo.usdPrim,
+            _HdPrimInfoMap::iterator it = _hdPrimInfoMap.find(path);
+            if (it == _hdPrimInfoMap.end()) {
+                continue;
+            }
+            it->second.adapter->MarkDirty(it->second.usdPrim,
                                         path,
-                                        primInfo.timeVaryingBits,
+                                        it->second.timeVaryingBits,
                                         &indexProxy);
         }
     } else {
@@ -1859,8 +1845,8 @@ UsdImagingDelegate::SetSceneLightsEnabled(bool enable)
             const SdfPath &cachePath = pair.first;
             _HdPrimInfo &primInfo = pair.second;
             if (TF_VERIFY(primInfo.adapter, "%s", cachePath.GetText())) {
-                primInfo.adapter->MarkLightParamsDirty(primInfo.usdPrim, 
-                                                       cachePath, &indexProxy);
+                primInfo.adapter->MarkDirty(primInfo.usdPrim, cachePath, 
+                    HdLight::DirtyParams | HdLight::DirtyResource, &indexProxy);
             }
         }
     }
@@ -2787,6 +2773,23 @@ VtArray<TfToken>
 UsdImagingDelegate::GetCategories(SdfPath const &id)
 {
     SdfPath cachePath = ConvertIndexPathToCachePath(id);
+    
+    // XXX: We must not ask the collection cache about instancer prototypes.
+    // When instancer prototypes had property paths, the collection cache
+    // would return an empty list for them. Now that they have prim paths,
+    // the collection cache will return the list of collections inherited by
+    // the prototype from the first instance. If subsequent instances belong to
+    // a conflicting set of collections, we get incorrect results. Since the
+    // collection cache has no way to identify prototype paths, we must do the
+    // check here where we have access to the adapter. Instances will receive
+    // the correct list of collections via GetInstanceCategories().
+    _HdPrimInfo* primInfo = _GetHdPrimInfo(cachePath);
+    if (primInfo &&
+        primInfo->adapter &&
+        primInfo->adapter->IsInstancerAdapter() &&
+        primInfo->adapter->IsChildPath(cachePath)) {
+        return { };
+    }
     return _collectionCache.ComputeCollectionsContainingPath(cachePath);
 }
 
diff --git a/pxr/usdImaging/usdImaging/delegate.h b/pxr/usdImaging/usdImaging/delegate.h
index 5da0ae33e8..d124aa0e5e 100644
--- a/pxr/usdImaging/usdImaging/delegate.h
+++ b/pxr/usdImaging/usdImaging/delegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DELEGATE_H
 #define PXR_USD_IMAGING_USD_IMAGING_DELEGATE_H
diff --git a/pxr/usdImaging/usdImaging/directMaterialBindingSchema.cpp b/pxr/usdImaging/usdImaging/directMaterialBindingSchema.cpp
index 37c8eb289e..e768bbd128 100644
--- a/pxr/usdImaging/usdImaging/directMaterialBindingSchema.cpp
+++ b/pxr/usdImaging/usdImaging/directMaterialBindingSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/directMaterialBindingSchema.h b/pxr/usdImaging/usdImaging/directMaterialBindingSchema.h
index a67c84649a..b4958b8990 100644
--- a/pxr/usdImaging/usdImaging/directMaterialBindingSchema.h
+++ b/pxr/usdImaging/usdImaging/directMaterialBindingSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/directMaterialBindingsSchema.cpp b/pxr/usdImaging/usdImaging/directMaterialBindingsSchema.cpp
index 3b5d496739..3f64aac7f3 100644
--- a/pxr/usdImaging/usdImaging/directMaterialBindingsSchema.cpp
+++ b/pxr/usdImaging/usdImaging/directMaterialBindingsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/directMaterialBindingsSchema.h b/pxr/usdImaging/usdImaging/directMaterialBindingsSchema.h
index 6a4ab5af5c..5cae440e94 100644
--- a/pxr/usdImaging/usdImaging/directMaterialBindingsSchema.h
+++ b/pxr/usdImaging/usdImaging/directMaterialBindingsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/diskLightAdapter.cpp b/pxr/usdImaging/usdImaging/diskLightAdapter.cpp
index 1f1f9afcc4..7df86b4a72 100644
--- a/pxr/usdImaging/usdImaging/diskLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/diskLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/diskLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/diskLightAdapter.h b/pxr/usdImaging/usdImaging/diskLightAdapter.h
index 1df659f3e6..868c7c01d9 100644
--- a/pxr/usdImaging/usdImaging/diskLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/diskLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DISK_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_DISK_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/distantLightAdapter.cpp b/pxr/usdImaging/usdImaging/distantLightAdapter.cpp
index bbbe503aa0..8db5493482 100644
--- a/pxr/usdImaging/usdImaging/distantLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/distantLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/distantLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/distantLightAdapter.h b/pxr/usdImaging/usdImaging/distantLightAdapter.h
index 738574e472..1c6c4e35c6 100644
--- a/pxr/usdImaging/usdImaging/distantLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/distantLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DISTANT_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_DISTANT_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/domeLightAdapter.cpp b/pxr/usdImaging/usdImaging/domeLightAdapter.cpp
index e9ca248d71..af5e25a337 100644
--- a/pxr/usdImaging/usdImaging/domeLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/domeLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/domeLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/domeLightAdapter.h b/pxr/usdImaging/usdImaging/domeLightAdapter.h
index e5b60fdbc3..8f23db8254 100644
--- a/pxr/usdImaging/usdImaging/domeLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/domeLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DOME_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_DOME_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/domeLight_1Adapter.cpp b/pxr/usdImaging/usdImaging/domeLight_1Adapter.cpp
index 03b9d3c35c..eeb60e744a 100644
--- a/pxr/usdImaging/usdImaging/domeLight_1Adapter.cpp
+++ b/pxr/usdImaging/usdImaging/domeLight_1Adapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/domeLight_1Adapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/domeLight_1Adapter.h b/pxr/usdImaging/usdImaging/domeLight_1Adapter.h
index 1923c2ab1f..4f5a549559 100644
--- a/pxr/usdImaging/usdImaging/domeLight_1Adapter.h
+++ b/pxr/usdImaging/usdImaging/domeLight_1Adapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DOME_LIGHT_1_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_DOME_LIGHT_1_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/drawModeAdapter.cpp b/pxr/usdImaging/usdImaging/drawModeAdapter.cpp
index e4bc75781d..48dcaa5973 100644
--- a/pxr/usdImaging/usdImaging/drawModeAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/drawModeAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/drawModeAdapter.h"
 
@@ -37,6 +20,7 @@
 #include "pxr/usd/usdGeom/modelAPI.h"
 #include "pxr/usd/sdr/registry.h"
 #include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/usd/prim.h"
 
 #include "pxr/base/gf/matrix4f.h"
 #include "pxr/base/tf/type.h"
@@ -215,7 +199,10 @@ UsdImagingDrawModeAdapter::Populate(UsdPrim const& prim,
                                     UsdImagingInstancerContext const*
                                        instancerContext)
 {
-    SdfPath cachePath = ResolveCachePath(prim.GetPath(), instancerContext);
+    const SdfPath cachePath = ResolveCachePath(
+        prim.GetPath(), instancerContext);
+    const SdfPath proxyPrimPath = ResolveProxyPrimPath(
+        cachePath, instancerContext);
 
     // The draw mode adapter only supports models or unloaded prims.
     // This is enforced in UsdImagingDelegate::_IsDrawModeApplied.
@@ -244,10 +231,10 @@ UsdImagingDrawModeAdapter::Populate(UsdPrim const& prim,
         instancerContext->instancerAdapter :
         shared_from_this();
 
-    // If this prim isn't instanced, cachePrim will be the same as "prim", but
+    // If this prim isn't instanced, proxyPrim will be the same as "prim", but
     // if it is instanced the instancer adapters expect us to pass in this
     // prim, which should point to the instancer.
-    UsdPrim cachePrim = _GetPrim(cachePath.GetAbsoluteRootOrPrimPath());
+    UsdPrim proxyPrim = _GetPrim(proxyPrimPath);
 
     if (drawMode == UsdGeomTokens->origin ||
         drawMode == UsdGeomTokens->bounds) {
@@ -261,7 +248,7 @@ UsdImagingDrawModeAdapter::Populate(UsdPrim const& prim,
         _drawModeMap.insert({ cachePath, drawMode });
 
         index->InsertRprim(HdPrimTypeTokens->basisCurves,
-            cachePath, cachePrim, rprimAdapter);
+            cachePath, proxyPrim, rprimAdapter);
         HD_PERF_COUNTER_INCR(UsdImagingTokens->usdPopulatedPrimCount);
     } else if (drawMode == UsdGeomTokens->cards) {
         // Cards draw as a mesh
@@ -274,7 +261,7 @@ UsdImagingDrawModeAdapter::Populate(UsdPrim const& prim,
         _drawModeMap.insert({ cachePath, drawMode });
 
         index->InsertRprim(HdPrimTypeTokens->mesh,
-            cachePath, cachePrim, rprimAdapter);
+            cachePath, proxyPrim, rprimAdapter);
         HD_PERF_COUNTER_INCR(UsdImagingTokens->usdPopulatedPrimCount);
     } else {
         TF_CODING_ERROR("Model <%s> has unsupported drawMode '%s'",
@@ -284,17 +271,13 @@ UsdImagingDrawModeAdapter::Populate(UsdPrim const& prim,
 
     // As long as we're passing cachePrim to InsertRprim, we need to fix up
     // the dependency map ourselves. For USD edit purposes, we depend on the
-    // prototype prim ("prim"), rather than the instancer prim.
+    // prototype prim ("prim"), rather than the instancer prim ("proxyPrim").
     // See similar code in GprimAdapter::_AddRprim.
     if (instancerContext != nullptr) {
         index->RemovePrimInfoDependency(cachePath);
         index->AddDependency(cachePath, prim);
     }
 
-    // When instancing, cachePath may have a proto prop part on the end.
-    // This will strip the prop part, leaving primPath as the instancer's path.
-    SdfPath primPath = cachePath.GetAbsoluteRootOrPrimPath();
-
     // Additionally, insert the material.
     if (drawMode == UsdGeomTokens->cards) {
 
diff --git a/pxr/usdImaging/usdImaging/drawModeAdapter.h b/pxr/usdImaging/usdImaging/drawModeAdapter.h
index a37a06d858..2355462c84 100644
--- a/pxr/usdImaging/usdImaging/drawModeAdapter.h
+++ b/pxr/usdImaging/usdImaging/drawModeAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DRAW_MODE_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_DRAW_MODE_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/drawModeSceneIndex.cpp b/pxr/usdImaging/usdImaging/drawModeSceneIndex.cpp
index c2dc70b1b5..7191b8fd9a 100644
--- a/pxr/usdImaging/usdImaging/drawModeSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/drawModeSceneIndex.cpp
@@ -1,32 +1,17 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/usdImaging/usdImaging/drawModeSceneIndex.h"
-#include "pxr/usdImaging/usdImaging/drawModeStandin.h"
 
+#include "pxr/usdImaging/usdImaging/drawModeStandin.h"
 #include "pxr/usdImaging/usdImaging/geomModelSchema.h"
 #include "pxr/usdImaging/usdImaging/usdPrimInfoSchema.h"
 
+#include "pxr/usd/sdf/path.h"
+
 #include "pxr/base/trace/trace.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -161,23 +146,26 @@ UsdImagingDrawModeSceneIndex::GetPrim(
         
         if (relPathLen == 0) {
             // Example
-            // Querried prim is /Foo and the DrawModeStandin is at /Foo.
+            // Queried prim is /Foo and the DrawModeStandin is at /Foo.
             //
-            // We query the DrawmodeStandin for its prim.
+            // We query the DrawmodeStandin for its self, untyped prim.
             return standin->GetPrim();
         }
-        if (relPathLen == 1) {
+        if (relPathLen == 1 || relPathLen == 2) {
             // Example:
-            // Querried prim is /Foo/mesh and the DrawModeStandin is at /Foo.
+            // DrawModeStandin is at /Foo, and queried prim is at
+            //   /Foo/cardsMesh, or
+            //   /Foo/subsetMaterialXPos, or
+            //   /Foo/cardsMesh/subsetXPos
             //
-            // We query the DrawmodeStandin for the child prim mesh.
-            return standin->GetChildPrim(primPath.GetNameToken());
+            // We query the DrawmodeStandin for the descendant prim.
+            return standin->GetDescendantPrim(primPath);
         }
         // Example:
-        // Querried prim is /Foo/A/B and the DrawModeStandin is at /Foo.
+        // Queried prim is /Foo/A/B and the DrawModeStandin is at /Foo.
         //
         // We block everything at this level since draw mode standin's
-        // only have immediate children.
+        // only have children (depth 1) or grandchildren (depth 2).
         return { TfToken(), nullptr };
     }
 
@@ -195,12 +183,21 @@ UsdImagingDrawModeSceneIndex::GetChildPrimPaths(
     size_t relPathLen;
     if (UsdImaging_DrawModeStandinSharedPtr const standin =
             _FindStandinForPrimOrAncestor(primPath, &relPathLen)) {
-        if (relPathLen == 0) {
-            // List immediate children of standin.
-            return standin->GetChildPrimPaths();
+        // standin->GetDescendantPrimPaths() gives all descendants, but
+        // we just want the queried prim's direct children so we only
+        // want the descendant paths with the full queried path as prefix and
+        // exactly one additional path component. This works whether the
+        // queried path is for the typeless container (children: standin prim +
+        // materials), the standin prim (children: subsets), a subset (children:
+        // none), or a material (children: none).
+        SdfPathVector paths;
+        for (const SdfPath& path : standin->GetDescendantPrimPaths()) {
+            if (path.HasPrefix(primPath) && path.GetPathElementCount()
+                - primPath.GetPathElementCount() == 1) {
+                paths.push_back(path);
+            }
         }
-        // Standin only has immediate children. So just block.
-        return {};
+        return paths;
     }
 
     return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
@@ -416,7 +413,7 @@ UsdImagingDrawModeSceneIndex::_PrimsDirtied(
                     // Add new stand-in geometry.
                     standin->ComputePrimAddedEntries(&addedEntries);
                     _prims[path] = std::move(standin);
-                    // Do not traverse ancestors of this prim.
+                    // Do not traverse descendants of this prim.
                     lastPath = path;
                 }
             } else {
@@ -473,7 +470,7 @@ UsdImagingDrawModeSceneIndex::_PrimsDirtied(
         }
 
         if (relPathLen > 0) {
-            // Ancestors of prims with non-default draw mode can be ignored.
+            // Descendants of prims with non-default draw mode can be ignored.
             continue;
         }
         
diff --git a/pxr/usdImaging/usdImaging/drawModeSceneIndex.h b/pxr/usdImaging/usdImaging/drawModeSceneIndex.h
index 33eb18b837..66ecc0195a 100644
--- a/pxr/usdImaging/usdImaging/drawModeSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/drawModeSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DRAW_MODE_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_DRAW_MODE_SCENE_INDEX_H
 
diff --git a/pxr/usdImaging/usdImaging/drawModeStandin.cpp b/pxr/usdImaging/usdImaging/drawModeStandin.cpp
index 8a57ed0699..942c748e91 100644
--- a/pxr/usdImaging/usdImaging/drawModeStandin.cpp
+++ b/pxr/usdImaging/usdImaging/drawModeStandin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/usdImaging/usdImaging/drawModeStandin.h"
 
@@ -28,18 +11,20 @@
 
 #include "pxr/imaging/hd/basisCurvesSchema.h"
 #include "pxr/imaging/hd/basisCurvesTopologySchema.h"
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
 #include "pxr/imaging/hd/extentSchema.h"
+#include "pxr/imaging/hd/geomSubsetSchema.h"
 #include "pxr/imaging/hd/instancedBySchema.h"
 #include "pxr/imaging/hd/legacyDisplayStyleSchema.h"
 #include "pxr/imaging/hd/materialBindingsSchema.h"
 #include "pxr/imaging/hd/materialConnectionSchema.h"
 #include "pxr/imaging/hd/materialNetworkSchema.h"
-#include "pxr/imaging/hd/materialNodeSchema.h"
 #include "pxr/imaging/hd/materialNodeParameterSchema.h"
+#include "pxr/imaging/hd/materialNodeSchema.h"
 #include "pxr/imaging/hd/materialSchema.h"
-#include "pxr/imaging/hd/meshTopologySchema.h"
 #include "pxr/imaging/hd/meshSchema.h"
-#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/meshTopologySchema.h"
 #include "pxr/imaging/hd/primvarSchema.h"
 #include "pxr/imaging/hd/primvarsSchema.h"
 #include "pxr/imaging/hd/purposeSchema.h"
@@ -47,19 +32,20 @@
 #include "pxr/imaging/hd/tokens.h"
 #include "pxr/imaging/hd/visibilitySchema.h"
 #include "pxr/imaging/hd/xformSchema.h"
-#include "pxr/imaging/hio/glslfx.h"
 #include "pxr/imaging/hio/image.h"
 
 #include "pxr/usd/usdGeom/tokens.h"
-#include "pxr/usd/sdr/registry.h"
-#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdf/path.h"
 
 #include "pxr/base/gf/matrix4f.h"
 #include "pxr/base/gf/range3d.h"
+#include "pxr/base/tf/token.h"
+
+#include "pxr/pxr.h"
 
 #include <array>
-#include <functional>
 #include <bitset>
+#include <unordered_map>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -79,19 +65,30 @@ UsdImaging_DrawModeStandin::GetPrim() const
 }
 
 HdSceneIndexPrim
-UsdImaging_DrawModeStandin::GetChildPrim(const TfToken &name) const
+UsdImaging_DrawModeStandin::GetDescendantPrim(const SdfPath& path) const
 {
-    return { _GetChildPrimType(name), _GetChildPrimSource(name) };
+    if (path.IsAbsolutePath() && path.HasPrefix(_path)) {
+        const SdfPath relPath = path.MakeRelativePath(_path);
+        return {
+            _GetDescendantPrimType(relPath),
+            _GetDescendantPrimSource(relPath) };
+    }
+    if (!path.IsAbsolutePath()) {
+        return {
+            _GetDescendantPrimType(path),
+            _GetDescendantPrimSource(path) };
+    }
+    return { TfToken(), nullptr };
 }
 
 SdfPathVector
-UsdImaging_DrawModeStandin::GetChildPrimPaths() const
+UsdImaging_DrawModeStandin::GetDescendantPrimPaths() const
 {
-    const TfTokenVector &childNames = _GetChildNames();
+    const SdfPathVector& relPaths = _GetDescendantPaths();
     SdfPathVector result;
-    result.reserve(childNames.size());
-    for (const TfToken &childName : childNames) {
-        result.push_back(_path.AppendChild(childName));
+    result.reserve(relPaths.size());
+    for (const SdfPath& relPath : relPaths) {
+        result.push_back(_path.AppendPath(relPath));
     }
     return result;
 }
@@ -100,14 +97,26 @@ void
 UsdImaging_DrawModeStandin::ComputePrimAddedEntries(
     HdSceneIndexObserver::AddedPrimEntries * entries) const
 {
-    entries->push_back({_path, TfToken()});
-    const TfTokenVector &childNames = _GetChildNames();
-    for (const TfToken &childName : childNames) {
-        const SdfPath childPath = _path.AppendChild(childName);
-        entries->push_back( { childPath, _GetChildPrimType(childName) });
+    entries->push_back({ _path, TfToken() });
+    const SdfPathVector& relPaths = _GetDescendantPaths();
+    for (const SdfPath& relPath : relPaths) {
+        entries->push_back({
+            _path.AppendPath(relPath),
+            _GetDescendantPrimType(relPath) });
     }
 }
 
+void
+UsdImaging_DrawModeStandin::ComputePrimRemovedEntries(
+    HdSceneIndexObserver::RemovedPrimEntries* entries) const
+{
+    const SdfPathVector& relPaths = _GetDescendantPaths();
+    for (const SdfPath& relPath : relPaths) {
+        entries->push_back({ _path.AppendPath(relPath) });
+    }
+    entries->push_back({ _path });
+}
+
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -624,19 +633,20 @@ class _BoundsStandin : public UsdImaging_DrawModeStandin
     {
     }
 
-    const TfTokenVector
-    _GetChildNames() const override {
-        static const TfTokenVector childNames{ _primNameTokens->boundsCurves };
-        return childNames;
+    const SdfPathVector
+    _GetDescendantPaths() const override {
+        static const SdfPathVector paths {
+            SdfPath(_primNameTokens->boundsCurves) };
+        return paths;
     }
 
     TfToken
-    _GetChildPrimType(const TfToken &name) const override {
+    _GetDescendantPrimType(const SdfPath& /*path*/) const override {
         return HdPrimTypeTokens->basisCurves;
     }
 
     HdContainerDataSourceHandle
-    _GetChildPrimSource(const TfToken &name) const override {
+    _GetDescendantPrimSource(const SdfPath& /*path*/) const override {
         return _BoundsPrimDataSource::New(_primSource);
     }
 
@@ -678,12 +688,12 @@ class _BoundsStandin : public UsdImaging_DrawModeStandin
                         .Append(HdTokens->displayColor);
                 primDirtyLocators.insert(displayColor);
             }
-            for (const SdfPath &path : GetChildPrimPaths()) {
+            for (const SdfPath &path : GetDescendantPrimPaths()) {
                 entries->push_back({path, primDirtyLocators});
             }
         } else {
             // Can just forward the dirty locators to the basis curves prim.
-            for (const SdfPath &path : GetChildPrimPaths()) {
+            for (const SdfPath &path : GetDescendantPrimPaths()) {
                 entries->push_back({path, dirtyLocators});
             }
         }
@@ -842,19 +852,20 @@ class _OriginStandin : public UsdImaging_DrawModeStandin
     {
     }
 
-    const TfTokenVector
-    _GetChildNames() const override {
-        static const TfTokenVector childNames{ _primNameTokens->originCurves };
-        return childNames;
+    const SdfPathVector
+    _GetDescendantPaths() const override {
+        static const SdfPathVector paths {
+            SdfPath(_primNameTokens->originCurves) };
+        return paths;
     }
 
     TfToken
-    _GetChildPrimType(const TfToken &name) const override {
+    _GetDescendantPrimType(const SdfPath& /*path*/) const override {
         return HdPrimTypeTokens->basisCurves;
     }
 
     HdContainerDataSourceHandle
-    _GetChildPrimSource(const TfToken &name) const override {
+    _GetDescendantPrimSource(const SdfPath& /*path*/) const override {
         return _OriginPrimDataSource::New(_primSource);
     }
 
@@ -881,11 +892,11 @@ class _OriginStandin : public UsdImaging_DrawModeStandin
                 HdPrimvarsSchema::GetDefaultLocator()
                     .Append(HdTokens->displayColor);
             primDirtyLocators.insert(displayColorValue);
-            for (const SdfPath &path : GetChildPrimPaths()) {
+            for (const SdfPath &path : GetDescendantPrimPaths()) {
                 entries->push_back({path, primDirtyLocators});
             }
         } else {
-            for (const SdfPath &path : GetChildPrimPaths()) {
+            for (const SdfPath &path : GetDescendantPrimPaths()) {
                 entries->push_back({path, dirtyLocators});
             }
         }
@@ -947,10 +958,10 @@ using _MaterialsDict = std::unordered_map<
 ///
 /// Implements stand-in for cards draw mode.
 ///
-/// It is providing a mesh with a material. The mesh consists of up to 6 quads.
-/// Besides points, it has the vertex-varying cardsUv and face-varying
-/// cardsTexAssgin - determining where to sample which of the up to 6 textures
-/// that can be specified by the UsdImagingGeomModelSchema.
+/// It is providing a mesh with a material. The mesh consists of up to 6 quads,
+/// each assigned to its own geom subset. Up to six materials, each bound to a
+/// geom subset, are also supplied. The parent mesh has the vertex-varying
+/// primvar `cardsUv`, used for correctly sampling any assigned texture.
 ///
 /// Details vary based on the card geometry which is box, cross, or fromTexture.
 ///
@@ -988,9 +999,20 @@ class _CardsDataCache
     HdDataSourceBaseHandle
     GetUVs() { return _GetCardsData()->uvs; }
 
-    /// The individual face geometry subsets.
+    /// An individual face geometry subset.
     HdContainerDataSourceHandle
-    GetGeomSubsets() { return _GetCardsData()->geomSubsets; }
+    GetGeomSubset(const TfToken& name) { 
+        return _GetCardsData()->GetSubset(name);
+    }
+    
+    TfTokenVector
+    GetGeomSubsetNames() {
+        TfTokenVector names;
+        for (const auto& kv :_GetCardsData()->geomSubsets) {
+            names.push_back(kv.first);
+        }
+        return names;
+    }
 
     /// The topology.
     HdContainerDataSourceHandle
@@ -1044,16 +1066,28 @@ class _CardsDataCache
     /// The cached data.
     struct _CardsData
     {
+        using SubsetMap = std::unordered_map<TfToken,
+            HdContainerDataSourceHandle, TfToken::HashFunctor>;
+            
         _CardsData(const _SchemaValues &values, const SdfPath &primPath);
 
         TfToken cardGeometry;
         VtVec3fArray points;
         HdContainerDataSourceHandle extent;
         HdDataSourceBaseHandle uvs;
-        HdContainerDataSourceHandle geomSubsets;
+        SubsetMap geomSubsets;
         HdContainerDataSourceHandle meshTopology;
         _MaterialsDict materials;
         
+        HdContainerDataSourceHandle
+        GetSubset(const TfToken& name) {
+            const auto it = geomSubsets.find(name);
+            if (it != geomSubsets.end()) {
+                return it->second;
+            }
+            return nullptr;
+        }
+        
     private:
         static
         VtVec3fArray
@@ -1062,7 +1096,7 @@ class _CardsDataCache
         VtVec2fArray
         _ComputeUVs(const _SchemaValues &values);
         static
-        HdContainerDataSourceHandle
+        SubsetMap
         _ComputeGeomSubsets(const _SchemaValues &values, 
             const SdfPath &primPath);
         static const
@@ -1397,7 +1431,7 @@ _CardsDataCache::_CardsData::_ComputePoints(const _SchemaValues &values)
     return points;
 }
 
-HdContainerDataSourceHandle
+_CardsDataCache::_CardsData::SubsetMap
 _CardsDataCache::_CardsData::_ComputeGeomSubsets(
     const _SchemaValues &values, const SdfPath &primPath)
 {
@@ -1406,8 +1440,7 @@ _CardsDataCache::_CardsData::_ComputeGeomSubsets(
     static const std::array<TfToken, 6> materialNameTokens = 
         _AddAxesToNames("subsetMaterial", "");
     
-    std::vector<TfToken> subsetNames;
-    std::vector<HdDataSourceBaseHandle> subsets;
+    SubsetMap subsets;
 
     // Do not generate subsets if there are no textures for any face.
     // The entire standin prim will use the renderer's fallback material, which 
@@ -1430,60 +1463,61 @@ _CardsDataCache::_CardsData::_ComputeGeomSubsets(
         
         for (size_t i = 0; i < 6; i++) {
             const size_t vi = (i % 2 == 0 ? 0 : 3) + i / 2;
-            if (values.hasFace[vi]) {
-                static HdTokenDataSourceHandle const typeSource =
-                    HdGeomSubsetSchema::BuildTypeDataSource(
-                        HdGeomSubsetSchemaTokens->typeFaceSet);
-                const int subsetIndex(subsets.size());
-                // use the opposite face's material if no texture for this face
-                const size_t matIndex = values.hasTexture[vi] ? vi : (vi + 3) % 6;
-                static const TfToken purposes[] = {
-                    HdMaterialBindingsSchemaTokens->allPurpose
-                };
-                const SdfPath materialPath =
-                    // geomSubset's materialBinding path must be absolute
-                    primPath.AppendChild(materialNameTokens[matIndex]);
-
-                // Note that we use the hydra material bindings schema here (and
-                // below) rather than UsdImagingDirectMaterialBinding(s)Schema.
-                // We want these bindings to be unaffected by any USD material
-                // bindings up-namespace.
-                //
-                HdDataSourceBaseHandle const materialBindingSources[] = {
-                    HdMaterialBindingSchema::Builder()
-                        .SetPath(
-                            HdRetainedTypedSampledDataSource<SdfPath>::New(
-                                materialPath))
-                        .Build()
-                };
-
-                subsetNames.push_back(subsetNameTokens[vi]);
-                subsets.push_back(
-                    HdOverlayContainerDataSource::New(
-                        HdGeomSubsetSchema::Builder()
-                            .SetType(typeSource)
-                            .SetIndices(
-                                HdRetainedTypedSampledDataSource<VtIntArray>::New(
-                                    { subsetIndex }))
-                            .Build(),
-
-                        HdRetainedContainerDataSource::New(
-                            HdMaterialBindingsSchema::GetSchemaToken(),
-                            HdMaterialBindingsSchema::BuildRetained(
-                                TfArraySize(purposes),
-                                purposes,
-                                materialBindingSources))));
-                        
+            if (!values.hasFace[vi]) {
+                continue;
             }
+            static HdTokenDataSourceHandle const typeSource =
+                HdGeomSubsetSchema::BuildTypeDataSource(
+                    HdGeomSubsetSchemaTokens->typeFaceSet);
+            static const HdBoolDataSourceHandle trueSource =
+                HdRetainedTypedSampledDataSource<bool>::New(true);
+            const int subsetIndex((int)(subsets.size()));
+            // use the opposite face's material if no texture for this face
+            const size_t mi = values.hasTexture[vi] ? vi : (vi + 3) % 6;
+            static const TfToken materialBindingNames[] = {
+                HdMaterialBindingsSchemaTokens->allPurpose
+            };
+            const SdfPath materialPath =
+                // geomSubset's materialBinding path must be absolute
+                primPath.AppendChild(materialNameTokens[mi]);
+
+            // Note that we use the hydra material bindings schema here (and
+            // below) rather than UsdImagingDirectMaterialBinding(s)Schema.
+            // We want these bindings to be unaffected by any USD material
+            // bindings up-namespace.
+            //
+            HdDataSourceBaseHandle const materialBindingSources[] = {
+                HdMaterialBindingSchema::Builder()
+                    .SetPath(HdRetainedTypedSampledDataSource<SdfPath>::New(
+                        materialPath))
+                    .Build()
+            };
+
+            subsets.insert({
+                subsetNameTokens[vi], 
+                HdRetainedContainerDataSource::New(
+                    HdGeomSubsetSchema::GetSchemaToken(),
+                    HdGeomSubsetSchema::Builder()
+                        .SetType(typeSource)
+                        .SetIndices(
+                            HdRetainedTypedSampledDataSource<VtIntArray>::New(
+                                { subsetIndex }))
+                        .Build(),
+
+                    HdVisibilitySchema::GetSchemaToken(),
+                    HdVisibilitySchema::Builder()
+                        .SetVisibility(trueSource)
+                        .Build(),
+
+                    HdMaterialBindingsSchema::GetSchemaToken(),
+                    HdMaterialBindingsSchema::BuildRetained(
+                        TfArraySize(materialBindingNames),
+                        materialBindingNames,
+                        materialBindingSources)) });
         }
     }
 
-    if (subsetNames.empty()) {
-        return nullptr;
-    } else {
-        return HdRetainedContainerDataSource::New(
-            subsetNames.size(), subsetNames.data(), subsets.data());
-    }
+    return subsets;
 }
 
 HdContainerDataSourceHandle
@@ -1955,7 +1989,6 @@ class _CardsPrimDataSource : public _PrimDataSource
                 .SetTopology(_dataCache->GetMeshTopology())
                 .SetDoubleSided(
                     HdRetainedTypedSampledDataSource<bool>::New(false))
-                .SetGeomSubsets(_dataCache->GetGeomSubsets())
                 .Build();
         }
         if (name == HdPrimvarsSchemaTokens->primvars) {
@@ -2020,34 +2053,50 @@ class _CardsStandin : public UsdImaging_DrawModeStandin
     {
     }
 
-    const TfTokenVector
-    _GetChildNames() const override {
-        TfTokenVector names = { _primNameTokens->cardsMesh };
-        const _MaterialsDict mats = _dataCache->GetMaterials();
-        for (const auto &kv : mats) {
-            names.push_back(kv.first);
+    const SdfPathVector
+    _GetDescendantPaths() const override {
+        SdfPathVector paths = { SdfPath(_primNameTokens->cardsMesh) };
+        // materials are siblings of 'cardsMesh'
+        for (const auto &kv : _dataCache->GetMaterials()) {
+            paths.emplace_back(kv.first);
         }
-        return names;
+        // geom subsets are children of 'cardsMesh'
+        for (const TfToken& name : _dataCache->GetGeomSubsetNames()) {
+            paths.push_back(paths.front().AppendChild(name));
+        }
+        return paths;
     }
 
     TfToken
-    _GetChildPrimType(const TfToken &name) const override {
-        if (name == _primNameTokens->cardsMesh) {
+    _GetDescendantPrimType(const SdfPath& path) const override {
+        static const SdfPath cardsMeshPath = SdfPath(_primNameTokens->cardsMesh);
+        if (path == cardsMeshPath) {
             return HdPrimTypeTokens->mesh;
         }
+        if (path.HasPrefix(cardsMeshPath)) {
+            return HdPrimTypeTokens->geomSubset;
+        }
         return HdPrimTypeTokens->material;
     }
 
     HdContainerDataSourceHandle
-    _GetChildPrimSource(const TfToken &name) const override {
+    _GetDescendantPrimSource(const SdfPath& path) const override {
+        static const SdfPath cardsMeshPath = SdfPath(_primNameTokens->cardsMesh);
+        if (path == cardsMeshPath) {
+            return _CardsPrimDataSource::New(_path, _primSource, _dataCache);
+        }
+        if (path.HasPrefix(cardsMeshPath)) {
+            return _dataCache->GetGeomSubset(path.GetNameToken());
+        }
         // We rely on the consumer calling HdSceneIndex::GetPrim()
         // again when we send a prim dirtied for the material prims
         // with an empty data source locators.
         const _MaterialsDict &materials = _dataCache->GetMaterials();
+        const TfToken& name = path.GetNameToken();
         if (materials.count(name)) {
             return materials.at(name);
         }
-        return _CardsPrimDataSource::New(_path, _primSource, _dataCache);
+        return nullptr;
     }
 
     void ProcessDirtyLocators(
@@ -2077,7 +2126,7 @@ class _CardsStandin : public UsdImaging_DrawModeStandin
         // Blast the entire thing.
         if (dirtyLocators.Intersects(cardLocators)) {
             (*needsRefresh) = true;
-            for (const SdfPath &path : GetChildPrimPaths()) {
+            for (const SdfPath &path : GetDescendantPrimPaths()) {
                 static const HdDataSourceLocator empty;
                 entries->push_back({path, empty});
             }
diff --git a/pxr/usdImaging/usdImaging/drawModeStandin.h b/pxr/usdImaging/usdImaging/drawModeStandin.h
index bb360ffdae..b017757d55 100644
--- a/pxr/usdImaging/usdImaging/drawModeStandin.h
+++ b/pxr/usdImaging/usdImaging/drawModeStandin.h
@@ -1,34 +1,22 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_DRAW_MODE_STANDIN_H
 #define PXR_USD_IMAGING_USD_IMAGING_DRAW_MODE_STANDIN_H
 
-#include "pxr/pxr.h"
-
+#include "pxr/imaging/hd/dataSource.h"
 #include "pxr/imaging/hd/sceneIndex.h"
 #include "pxr/imaging/hd/sceneIndexObserver.h"
 
+#include "pxr/usd/sdf/path.h"
+
+#include "pxr/base/tf/token.h"
+
+#include "pxr/pxr.h"
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 /// \class UsdImaging_DrawModeStandin
@@ -44,16 +32,22 @@ class UsdImaging_DrawModeStandin
 
     /// Get prim replacing the original prim.
     ///
-    /// For now, this is just a typeless prim without data source.
+    /// For now, this is just a typeless container prim without data source.
     const HdSceneIndexPrim &GetPrim() const;
 
-    /// Get immediate children of the prim replacing the original prim.
-    SdfPathVector GetChildPrimPaths() const;
-    HdSceneIndexPrim GetChildPrim(const TfToken &name) const;
+    /// Get paths of all descendants of the typeless container.
+    SdfPathVector GetDescendantPrimPaths() const;
+    
+    /// GetDescendant prim by absolute or relative path.
+    HdSceneIndexPrim GetDescendantPrim(const SdfPath& path) const;
 
-    // Compute added entries for the stand-in geometry
+    /// Compute added entries for the stand-in geometry
     void ComputePrimAddedEntries(
         HdSceneIndexObserver::AddedPrimEntries * entries) const;
+    
+    /// Compute removed entries for the stand-in geometry
+    void ComputePrimRemovedEntries(
+        HdSceneIndexObserver::RemovedPrimEntries* entries) const;
 
     /// Given dirty data source locators for the original prim, invalidate
     /// cached data and emit dirty entries for the stand-in geometry.
@@ -63,9 +57,13 @@ class UsdImaging_DrawModeStandin
         bool * needsRefresh) = 0;
 
 protected:
-    virtual const TfTokenVector _GetChildNames() const = 0;
-    virtual TfToken _GetChildPrimType(const TfToken &name) const = 0;
-    virtual HdContainerDataSourceHandle _GetChildPrimSource(const TfToken &name) const = 0;
+    /// returns paths relative to the typeless container.
+    virtual const SdfPathVector _GetDescendantPaths() const = 0;
+    /// accepts paths relative to the typeless container.
+    virtual TfToken _GetDescendantPrimType(const SdfPath& path) const = 0;
+    /// accepts paths relative to the typeless container.
+    virtual HdContainerDataSourceHandle _GetDescendantPrimSource(
+        const SdfPath& path) const = 0;
 
     UsdImaging_DrawModeStandin(
         const SdfPath &path,
diff --git a/pxr/usdImaging/usdImaging/extentResolvingSceneIndex.cpp b/pxr/usdImaging/usdImaging/extentResolvingSceneIndex.cpp
index 5ce7669d04..2575524e9b 100644
--- a/pxr/usdImaging/usdImaging/extentResolvingSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/extentResolvingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/usdImaging/usdImaging/extentResolvingSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/extentResolvingSceneIndex.h b/pxr/usdImaging/usdImaging/extentResolvingSceneIndex.h
index eda49bf51b..f26037f98b 100644
--- a/pxr/usdImaging/usdImaging/extentResolvingSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/extentResolvingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_USD_IMAGING_USD_IMAGING_EXTENT_RESOLVING_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_EXTENT_RESOLVING_SCENE_INDEX_H
 
diff --git a/pxr/usdImaging/usdImaging/extentsHintSchema.cpp b/pxr/usdImaging/usdImaging/extentsHintSchema.cpp
index 5b5ee012e6..a69f722e45 100644
--- a/pxr/usdImaging/usdImaging/extentsHintSchema.cpp
+++ b/pxr/usdImaging/usdImaging/extentsHintSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/extentsHintSchema.h b/pxr/usdImaging/usdImaging/extentsHintSchema.h
index 441f785a4f..6b47cf59de 100644
--- a/pxr/usdImaging/usdImaging/extentsHintSchema.h
+++ b/pxr/usdImaging/usdImaging/extentsHintSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/fieldAdapter.cpp b/pxr/usdImaging/usdImaging/fieldAdapter.cpp
index bdb699328c..f5fb33b97e 100644
--- a/pxr/usdImaging/usdImaging/fieldAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/fieldAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/fieldAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
@@ -84,10 +67,8 @@ UsdImagingFieldAdapter::TrackVariability(UsdPrim const& prim,
 
     // If any of the field attributes is time varying 
     // we will assume all field params are time-varying.
-    const std::vector<UsdAttribute> &attrs = prim.GetAttributes();
-    TF_FOR_ALL(attrIter, attrs) {
-        const UsdAttribute& attr = *attrIter;
-        if (attr.GetNumTimeSamples()>1){
+    for (UsdAttribute const& attr : prim.GetAttributes()) {
+        if (attr.ValueMightBeTimeVarying()) {
             *timeVaryingBits |= HdField::DirtyBits::DirtyParams;
         }
     }
diff --git a/pxr/usdImaging/usdImaging/fieldAdapter.h b/pxr/usdImaging/usdImaging/fieldAdapter.h
index 0437fd6e98..a6524cc307 100644
--- a/pxr/usdImaging/usdImaging/fieldAdapter.h
+++ b/pxr/usdImaging/usdImaging/fieldAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_FIELD_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_FIELD_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/flattenedDataSourceProviders.cpp b/pxr/usdImaging/usdImaging/flattenedDataSourceProviders.cpp
index 304927b7cc..fea6840f4d 100644
--- a/pxr/usdImaging/usdImaging/flattenedDataSourceProviders.cpp
+++ b/pxr/usdImaging/usdImaging/flattenedDataSourceProviders.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/flattenedDataSourceProviders.h"
 
diff --git a/pxr/usdImaging/usdImaging/flattenedDataSourceProviders.h b/pxr/usdImaging/usdImaging/flattenedDataSourceProviders.h
index a384ec45a6..6a8709f1ec 100644
--- a/pxr/usdImaging/usdImaging/flattenedDataSourceProviders.h
+++ b/pxr/usdImaging/usdImaging/flattenedDataSourceProviders.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_FLATTENED_DATA_SOURCE_PROVIDERS_H
 #define PXR_USD_IMAGING_USD_IMAGING_FLATTENED_DATA_SOURCE_PROVIDERS_H
diff --git a/pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.cpp b/pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.cpp
index e14a4423c4..0d3e52ec84 100644
--- a/pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.cpp
+++ b/pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.h"
 
diff --git a/pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.h b/pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.h
index 5aeda6ee78..2bd34238f1 100644
--- a/pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.h
+++ b/pxr/usdImaging/usdImaging/flattenedDirectMaterialBindingsDataSourceProvider.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_FLATTENED_MATERIAL_BINDINGS_DATA_SOURCE_PROVIDER_H
 #define PXR_USD_IMAGING_USD_IMAGING_FLATTENED_MATERIAL_BINDINGS_DATA_SOURCE_PROVIDER_H
diff --git a/pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.cpp b/pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.cpp
index 76fe25c4af..318e1b4095 100644
--- a/pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.cpp
+++ b/pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.h"
 
diff --git a/pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.h b/pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.h
index ff11a22b3b..78a5377712 100644
--- a/pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.h
+++ b/pxr/usdImaging/usdImaging/flattenedGeomModelDataSourceProvider.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_USD_IMAGING_USD_IMAGING_FLATTENED_GEOM_MODEL_DATA_SOURCE_PROVIDER_H
 #define PXR_USD_IMAGING_USD_IMAGING_FLATTENED_GEOM_MODEL_DATA_SOURCE_PROVIDER_H
diff --git a/pxr/usdImaging/usdImaging/geomModelAPIAdapter.cpp b/pxr/usdImaging/usdImaging/geomModelAPIAdapter.cpp
index fbc6410608..352fb17e1d 100644
--- a/pxr/usdImaging/usdImaging/geomModelAPIAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/geomModelAPIAdapter.cpp
@@ -1,29 +1,12 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/geomModelAPIAdapter.h"
 
-#include "pxr/usdImaging/usdImaging/dataSourceSchemaBased.h"
+#include "pxr/usdImaging/usdImaging/dataSourceMapped.h"
 #include "pxr/usdImaging/usdImaging/geomModelSchema.h"
 #include "pxr/usdImaging/usdImaging/tokens.h"
 #include "pxr/imaging/hd/extentSchema.h"
@@ -38,30 +21,34 @@ PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {
 
-struct _GeomModelTranslator
+std::vector<UsdImagingDataSourceMapped::AttributeMapping>
+_GetAttributeMappings()
 {
-    static
-    TfToken
-    UsdAttributeNameToHdName(const TfToken &name)
-    {
-        const std::vector<std::string> tokens =
-            SdfPath::TokenizeIdentifier(name.GetString());
-        if (tokens.size() == 2 && tokens[0] == "model") {
-            return TfToken(tokens[1]);
+    std::vector<UsdImagingDataSourceMapped::AttributeMapping> result;
+
+    for (const TfToken &usdName :
+             UsdGeomModelAPI::GetSchemaAttributeNames(
+                 /* includeInherited = */ false)) {
+
+        const std::pair<std::string, bool> nameAndMatch =
+            SdfPath::StripPrefixNamespace(
+                usdName.GetString(), "model");
+        if (nameAndMatch.second) {
+            result.push_back(
+                { usdName,
+                  HdDataSourceLocator(TfToken(nameAndMatch.first)) });
         }
-        return TfToken();
     }
 
-    static
-    HdDataSourceLocator
-    GetContainerLocator()
-    {
-        return UsdImagingGeomModelSchema::GetDefaultLocator();
-    }
-};    
+    return result;
+}
 
-using _GeomModelDataSource = UsdImagingDataSourceSchemaBased<
-    UsdGeomModelAPI, std::tuple<>, _GeomModelTranslator>;
+const UsdImagingDataSourceMapped::AttributeMappings &
+_GetMappings() {
+    static const UsdImagingDataSourceMapped::AttributeMappings result(
+        _GetAttributeMappings(), UsdImagingGeomModelSchema::GetDefaultLocator());
+    return result;
+}
 
 }
 
@@ -83,27 +70,24 @@ UsdImagingGeomModelAPIAdapter::GetImagingSubprimData(
         return nullptr;
     }
 
-    if (subprim.IsEmpty()) {
-        // Reflect UsdGeomModelAPI as UsdImagingGeomModelSchema.
-        HdContainerDataSourceHandle geomModelDs = _GeomModelDataSource::New(
-            prim.GetPath(), UsdGeomModelAPI(prim), stageGlobals);
-
-        // For model components, overlay applyDrawMode=true.
-        if (UsdModelAPI(prim).IsKind(KindTokens->component)) {
-            static HdContainerDataSourceHandle const applyDrawModeDs =
-                UsdImagingGeomModelSchema::Builder()
-                    .SetApplyDrawMode(
-                        HdRetainedTypedSampledDataSource<bool>::New(true))
-                    .Build();
-            geomModelDs = HdOverlayContainerDataSource::
-                OverlayedContainerDataSources(applyDrawModeDs, geomModelDs);
-        }
-
-        return HdRetainedContainerDataSource::New(
-            UsdImagingGeomModelSchema::GetSchemaToken(), geomModelDs);
+    // Reflect UsdGeomModelAPI as UsdImagingGeomModelSchema.
+    HdContainerDataSourceHandle geomModelDs =
+        UsdImagingDataSourceMapped::New(
+            prim, prim.GetPath(), _GetMappings(), stageGlobals);
+
+    // For model components, overlay applyDrawMode=true.
+    if (UsdModelAPI(prim).IsKind(KindTokens->component)) {
+        static HdContainerDataSourceHandle const applyDrawModeDs =
+            UsdImagingGeomModelSchema::Builder()
+                .SetApplyDrawMode(
+                    HdRetainedTypedSampledDataSource<bool>::New(true))
+                .Build();
+        geomModelDs = HdOverlayContainerDataSource::
+            OverlayedContainerDataSources(applyDrawModeDs, geomModelDs);
     }
-
-    return nullptr;
+    
+    return HdRetainedContainerDataSource::New(
+        UsdImagingGeomModelSchema::GetSchemaToken(), geomModelDs);
 }
 
 
@@ -119,7 +103,8 @@ UsdImagingGeomModelAPIAdapter::InvalidateImagingSubprim(
         return HdDataSourceLocatorSet();
     }
 
-    return _GeomModelDataSource::Invalidate(subprim, properties);
+    return UsdImagingDataSourceMapped::Invalidate(
+        properties, _GetMappings());
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdImaging/geomModelAPIAdapter.h b/pxr/usdImaging/usdImaging/geomModelAPIAdapter.h
index e80e6f720a..a88bfe29b8 100644
--- a/pxr/usdImaging/usdImaging/geomModelAPIAdapter.h
+++ b/pxr/usdImaging/usdImaging/geomModelAPIAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_GEOM_MODEL_API_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_GEOM_MODEL_API_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/geomModelSchema.cpp b/pxr/usdImaging/usdImaging/geomModelSchema.cpp
index f38cd7a182..77e0e2ad71 100644
--- a/pxr/usdImaging/usdImaging/geomModelSchema.cpp
+++ b/pxr/usdImaging/usdImaging/geomModelSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/geomModelSchema.h b/pxr/usdImaging/usdImaging/geomModelSchema.h
index c514521209..bd9ffb3b36 100644
--- a/pxr/usdImaging/usdImaging/geomModelSchema.h
+++ b/pxr/usdImaging/usdImaging/geomModelSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/geomSubsetAdapter.cpp b/pxr/usdImaging/usdImaging/geomSubsetAdapter.cpp
index d35986979e..ae31e6ac87 100644
--- a/pxr/usdImaging/usdImaging/geomSubsetAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/geomSubsetAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/geomSubsetAdapter.h"
 
@@ -34,6 +17,7 @@
 #include "pxr/imaging/hd/dataSourceTypeDefs.h"
 #include "pxr/imaging/hd/geomSubsetSchema.h"
 #include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
 #include "pxr/imaging/hd/tokens.h"
 #include "pxr/imaging/hd/types.h"
 
@@ -157,13 +141,15 @@ UsdImagingGeomSubsetAdapter::GetImagingSubprimData(
     if (subprim.IsEmpty()) {
         UsdGeomSubset subset(prim);
         return HdOverlayContainerDataSource::New(
-            HdGeomSubsetSchema::Builder()
-                .SetIndices(UsdImagingDataSourceAttribute<VtIntArray>::New(
-                    subset.GetIndicesAttr(), stageGlobals))
-                .SetType(_ElementTypeConversionDataSource::New(
-                    UsdImagingDataSourceAttribute<TfToken>::New(
-                        subset.GetElementTypeAttr(), stageGlobals)))
-                .Build(),
+            HdRetainedContainerDataSource::New(
+                HdGeomSubsetSchema::GetSchemaToken(),
+                HdGeomSubsetSchema::Builder()
+                    .SetIndices(UsdImagingDataSourceAttribute<VtIntArray>::New(
+                        subset.GetIndicesAttr(), stageGlobals))
+                    .SetType(_ElementTypeConversionDataSource::New(
+                        UsdImagingDataSourceAttribute<TfToken>::New(
+                            subset.GetElementTypeAttr(), stageGlobals)))
+                    .Build()),
             // The geomSubset must also be a prim so it can
             // pick up existing material binding handling.
             UsdImagingDataSourcePrim::New(
diff --git a/pxr/usdImaging/usdImaging/geomSubsetAdapter.h b/pxr/usdImaging/usdImaging/geomSubsetAdapter.h
index 1dbb2209e9..814d6a1d18 100644
--- a/pxr/usdImaging/usdImaging/geomSubsetAdapter.h
+++ b/pxr/usdImaging/usdImaging/geomSubsetAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_GEOM_SUBSET_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_GEOM_SUBSET_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/geometryLightAdapter.cpp b/pxr/usdImaging/usdImaging/geometryLightAdapter.cpp
index 9e3f10bddc..6367ffeff2 100644
--- a/pxr/usdImaging/usdImaging/geometryLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/geometryLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/geometryLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/geometryLightAdapter.h b/pxr/usdImaging/usdImaging/geometryLightAdapter.h
index 2825f0bd10..5c1abf5960 100644
--- a/pxr/usdImaging/usdImaging/geometryLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/geometryLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_GEOMETRY_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_GEOMETRY_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/gprimAdapter.cpp b/pxr/usdImaging/usdImaging/gprimAdapter.cpp
index 0e11190114..41b3195364 100644
--- a/pxr/usdImaging/usdImaging/gprimAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/gprimAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/gprimAdapter.h"
 
@@ -103,10 +86,8 @@ UsdImagingGprimAdapter::_AddRprim(TfToken const& primType,
 {
     SdfPath cachePath = ResolveCachePath(usdPrim.GetPath(), instancerContext);
 
-    // For an instanced gprim, this is the instancer prim.
-    // For a non-instanced gprim, this is just the gprim.
-    UsdPrim proxyPrim = usdPrim.GetStage()->GetPrimAtPath(
-        cachePath.GetAbsoluteRootOrPrimPath());
+    UsdPrim proxyPrim = _GetPrim(ResolveProxyPrimPath(
+        cachePath, instancerContext));
 
     index->InsertRprim(primType, cachePath, proxyPrim,
         instancerContext ? instancerContext->instancerAdapter
diff --git a/pxr/usdImaging/usdImaging/gprimAdapter.h b/pxr/usdImaging/usdImaging/gprimAdapter.h
index 643ddfdf63..aad7e16017 100644
--- a/pxr/usdImaging/usdImaging/gprimAdapter.h
+++ b/pxr/usdImaging/usdImaging/gprimAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_GPRIM_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_GPRIM_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/hdSchemaDefs.py b/pxr/usdImaging/usdImaging/hdSchemaDefs.py
index 0f55b0d99d..df0160f3d1 100644
--- a/pxr/usdImaging/usdImaging/hdSchemaDefs.py
+++ b/pxr/usdImaging/usdImaging/hdSchemaDefs.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 [
     dict(
diff --git a/pxr/usdImaging/usdImaging/hermiteCurvesAdapter.cpp b/pxr/usdImaging/usdImaging/hermiteCurvesAdapter.cpp
index f343f7dafb..72ea2aeea5 100644
--- a/pxr/usdImaging/usdImaging/hermiteCurvesAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/hermiteCurvesAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/hermiteCurvesAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/hermiteCurvesAdapter.h b/pxr/usdImaging/usdImaging/hermiteCurvesAdapter.h
index 23cc7f7889..d912552497 100644
--- a/pxr/usdImaging/usdImaging/hermiteCurvesAdapter.h
+++ b/pxr/usdImaging/usdImaging/hermiteCurvesAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_HERMITE_CURVES_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_HERMITE_CURVES_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.cpp b/pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.cpp
index 42c8f8b871..a86f0234b2 100644
--- a/pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.cpp
+++ b/pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.h"
 
diff --git a/pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.h b/pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.h
index 9453dd60b1..642cf8c6b0 100644
--- a/pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.h
+++ b/pxr/usdImaging/usdImaging/implicitSurfaceMeshUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_IMPLICIT_SURFACE_MESH_UTILS_H
 #define PXR_USD_IMAGING_USD_IMAGING_IMPLICIT_SURFACE_MESH_UTILS_H
diff --git a/pxr/usdImaging/usdImaging/indexProxy.cpp b/pxr/usdImaging/usdImaging/indexProxy.cpp
index 37e48ceb30..098da95b1c 100644
--- a/pxr/usdImaging/usdImaging/indexProxy.cpp
+++ b/pxr/usdImaging/usdImaging/indexProxy.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/indexProxy.h"
 
diff --git a/pxr/usdImaging/usdImaging/indexProxy.h b/pxr/usdImaging/usdImaging/indexProxy.h
index 5d04423663..93dc8bfc64 100644
--- a/pxr/usdImaging/usdImaging/indexProxy.h
+++ b/pxr/usdImaging/usdImaging/indexProxy.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_INDEX_PROXY_H
 #define PXR_USD_IMAGING_USD_IMAGING_INDEX_PROXY_H
diff --git a/pxr/usdImaging/usdImaging/instanceAdapter.cpp b/pxr/usdImaging/usdImaging/instanceAdapter.cpp
index 8a02125c79..091678c496 100644
--- a/pxr/usdImaging/usdImaging/instanceAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/instanceAdapter.cpp
@@ -1,28 +1,12 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/instanceAdapter.h"
 
+#include "pxr/base/trace/trace.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
 #include "pxr/usdImaging/usdImaging/indexProxy.h"
 #include "pxr/usdImaging/usdImaging/instancerContext.h"
@@ -62,6 +46,7 @@
 
 #include <limits>
 #include <queue>
+#include <regex>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -418,9 +403,9 @@ UsdImagingInstanceAdapter::_Populate(UsdPrim const& prim,
     // We're done modifying data structures for the passed in instance,
     // so now it's safe to re-enter this function to populate the
     // nested instances we discovered.
-    for (UsdPrim &prim : nestedInstances) {
-        _Populate(prim, index, instancerContext, instancerProxyPath);
-        instancerData.nestedInstances.push_back(prim.GetPath());
+    for (UsdPrim &nestedPrim : nestedInstances) {
+        _Populate(nestedPrim, index, instancerContext, instancerProxyPath);
+        instancerData.nestedInstances.push_back(nestedPrim.GetPath());
     }
 
     // Add a dependency on any associated hydra instancers (instancerPath, if
@@ -529,7 +514,8 @@ UsdImagingInstanceAdapter::TrackVariability(UsdPrim const& prim,
 {
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                 cachePath,
                                                 &instancerContext);
         if (!TF_VERIFY(proto.adapter, "%s", cachePath.GetText())) {
@@ -1219,7 +1205,8 @@ UsdImagingInstanceAdapter::UpdateForTime(UsdPrim const& prim,
 
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                 cachePath,
                                                 &instancerContext);
         if (!TF_VERIFY(proto.adapter, "%s", cachePath.GetText())) {
@@ -1263,7 +1250,8 @@ UsdImagingInstanceAdapter::ProcessPropertyChange(UsdPrim const& prim,
     // a native instancing prim), pass the call through.
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
         if (!proto.adapter) {
@@ -1363,7 +1351,7 @@ UsdImagingInstanceAdapter::_ResyncPath(SdfPath const& cachePath,
 void UsdImagingInstanceAdapter::ProcessPrimResync(SdfPath const& cachePath,
                                                   UsdImagingIndexProxy* index)
 {
-    if (cachePath.IsPropertyPath()) {
+    if (IsChildPath(cachePath)) {
         _ResyncPath(cachePath.GetParentPath(), index, /*reload=*/true);
     } else {
         _ResyncPath(cachePath, index, /*reload=*/true);
@@ -1373,7 +1361,7 @@ void UsdImagingInstanceAdapter::ProcessPrimResync(SdfPath const& cachePath,
 void UsdImagingInstanceAdapter::ProcessPrimRemoval(SdfPath const& cachePath,
                                                    UsdImagingIndexProxy* index)
 {
-    if (cachePath.IsPropertyPath()) {
+    if (IsChildPath(cachePath)) {
         _ResyncPath(cachePath.GetParentPath(), index, /*reload=*/false);
     } else {
         _ResyncPath(cachePath, index, /*reload=*/false);
@@ -1388,7 +1376,8 @@ UsdImagingInstanceAdapter::MarkDirty(UsdPrim const& prim,
 {
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
         if (TF_VERIFY(proto.adapter, "%s", cachePath.GetText())) {
@@ -1414,7 +1403,8 @@ UsdImagingInstanceAdapter::MarkRefineLevelDirty(UsdPrim const& prim,
     // so make sure the message gets forwarded
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
 
@@ -1433,7 +1423,8 @@ UsdImagingInstanceAdapter::MarkReprDirty(UsdPrim const& prim,
     // so make sure the message gets forwarded
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
 
@@ -1452,7 +1443,8 @@ UsdImagingInstanceAdapter::MarkCullStyleDirty(UsdPrim const& prim,
     // so make sure the message gets forwarded
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
 
@@ -1471,7 +1463,8 @@ UsdImagingInstanceAdapter::MarkRenderTagDirty(UsdPrim const& prim,
     // so make sure the message gets forwarded
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
 
@@ -1487,7 +1480,8 @@ UsdImagingInstanceAdapter::MarkTransformDirty(UsdPrim const& prim,
 {
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
 
@@ -1513,7 +1507,8 @@ UsdImagingInstanceAdapter::MarkVisibilityDirty(UsdPrim const& prim,
 {
     if (_IsChildPrim(prim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
 
@@ -1599,7 +1594,8 @@ UsdImagingInstanceAdapter::GetInstancerTransform(UsdPrim const& instancerPrim,
     TRACE_FUNCTION();
      UsdImagingInstancerContext instancerContext;
     _ProtoPrim const *proto;
-    if (_GetProtoPrimForChild(instancerPrim, instancerPath, &proto, &instancerContext)) {
+    if (_GetProtoPrimForChild(instancerPrim, instancerPath,
+        &proto, &instancerContext)) {
         return proto->adapter->GetInstancerTransform(
             _GetPrim(proto->path), instancerPath, time);
     }
@@ -1635,7 +1631,8 @@ UsdImagingInstanceAdapter::GetInstancerPrototypes(
 
     if (_IsChildPrim(usdPrim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                 cachePath, &instancerContext);
         if (!TF_VERIFY(proto.adapter, "%s", cachePath.GetText())) {
             return SdfPathVector();
@@ -1693,7 +1690,8 @@ UsdImagingInstanceAdapter::SampleTransform(
         // Note that the proto group in this proto has not yet been
         // updated with new instances at this point.
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
         if (!TF_VERIFY(proto.adapter, "%s", cachePath.GetText())) {
@@ -1730,7 +1728,8 @@ UsdImagingInstanceAdapter::SamplePrimvar(
         // Note that the proto group in this proto has not yet been
         // updated with new instances at this point.
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     cachePath,
                                                     &instancerContext);
         if (!TF_VERIFY(proto.adapter, "%s", cachePath.GetText())) {
@@ -1877,6 +1876,15 @@ UsdImagingInstanceAdapter::GetExtent(UsdPrim const& usdPrim,
     return BaseAdapter::GetExtent(usdPrim, cachePath, time);
 }
 
+bool
+UsdImagingInstanceAdapter::IsChildPath(
+    const SdfPath& path) const
+{
+    TRACE_FUNCTION();
+    static const std::regex regex("^proto_[^.\\/\\s]+_id\\d+$");
+    return std::regex_match(path.GetName(), regex);
+}
+
 /*virtual*/
 bool 
 UsdImagingInstanceAdapter::GetVisible(UsdPrim const& usdPrim, 
@@ -2120,7 +2128,8 @@ UsdImagingInstanceAdapter::Get(UsdPrim const& usdPrim,
 
     if (_IsChildPrim(usdPrim, cachePath)) {
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(),
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                 cachePath,
                                                 &instancerContext);
         if (!TF_VERIFY(proto.adapter, "%s", cachePath.GetText())) {
@@ -2303,8 +2312,8 @@ UsdImagingInstanceAdapter::_GetProtoPrimForChild(
     if (!_IsChildPrim(usdPrim, cachePath)) {
         return false;
     }
-
-    *proto = &_GetProtoPrim(usdPrim.GetPath(),cachePath, ctx);
+    const SdfPath instancerPath = cachePath.GetParentPath();
+    *proto = &_GetProtoPrim(instancerPath, cachePath, ctx);
 
     if (!TF_VERIFY((*proto)->adapter, "%s", cachePath.GetText())) {
         return false;
@@ -2593,9 +2602,9 @@ UsdImagingInstanceAdapter::GetScenePrimPaths(
             "GetScenePrimPaths: instance proto = %s\n", cachePath.GetText());
 
         UsdImagingInstancerContext instancerContext;
+        const SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(
-            cachePath.GetAbsoluteRootOrPrimPath(),
-            cachePath, &instancerContext);
+            instancerPath, cachePath, &instancerContext);
 
         if (!proto.adapter) {
             return SdfPathVector(instanceIndices.size());
@@ -2636,6 +2645,10 @@ UsdImagingInstanceAdapter::GetScenePrimPaths(
                 }
             }
 
+            // Ensure the result vector is the same size as instanceIndices
+            // even if there are no valid instance indices.
+            result.resize(instanceIndices.size());
+
             // at least one index was valid, get the prim paths
             if (validIndices > 0) {
                 // For each valid requested index provide a mapping into the result vector
@@ -2656,7 +2669,6 @@ UsdImagingInstanceAdapter::GetScenePrimPaths(
                     }
                 }
 
-                result.resize(validIndices);
                 _GetScenePrimPathsFn primPathsFn(
                     this, requestedIndicesMap, minIdx, result, proto.path);
                 _RunForAllInstancesToDraw(instancerPrim, &primPathsFn);
@@ -2833,7 +2845,7 @@ struct UsdImagingInstanceAdapter::_PopulateInstanceSelectionFn
         if (selectionCount == selectionPathVec.size()) {
             for (auto const& pair : instrData->primMap) {
                 UsdPrim prefixPrim =
-                    adapter->_GetPrim(pair.first.GetAbsoluteRootOrPrimPath());
+                    adapter->_GetPrim(pair.first.GetParentPath());
                 added |= pair.second.adapter->PopulateSelection(
                     highlightMode, pair.first, prefixPrim,
                     hydraInstanceIndex, instanceIndices, result);
@@ -2859,7 +2871,7 @@ struct UsdImagingInstanceAdapter::_PopulateInstanceSelectionFn
                     // use a prefix prim to fully select the proto, in case
                     // it's a gprim with name mangling.
                     selectionPrim = adapter->_GetPrim(
-                        pair.first.GetAbsoluteRootOrPrimPath());
+                        pair.first.GetParentPath());
                 } else if (!selectionPathVec[selectionCount].HasPrefix(
                            pair.second.path)) {
                     // If the selection path isn't a prefix of the proto,
@@ -2913,9 +2925,9 @@ UsdImagingInstanceAdapter::PopulateSelection(
         // path; this is reflected in the fact that _GetProtoPrim has a case
         // for this to walk all of the instancer datas looking for a match.
         UsdImagingInstancerContext instancerContext;
+        const SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(
-            cachePath.GetAbsoluteRootOrPrimPath(),
-            cachePath, &instancerContext);
+            instancerPath, cachePath, &instancerContext);
 
         if (!proto.adapter) {
             return false;
@@ -3007,7 +3019,8 @@ UsdImagingInstanceAdapter::GetVolumeFieldDescriptors(
     if (IsChildPath(id)) {
         // Delegate to child adapter and USD prim.
         UsdImagingInstancerContext instancerContext;
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(),
+        const SdfPath instancerPath = id.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath,
                                                     id, &instancerContext);
 
         if (!TF_VERIFY(proto.adapter, "%s", usdPrim.GetPath().GetText())) {
diff --git a/pxr/usdImaging/usdImaging/instanceAdapter.h b/pxr/usdImaging/usdImaging/instanceAdapter.h
index 55d6dfeb53..415fc78ae7 100644
--- a/pxr/usdImaging/usdImaging/instanceAdapter.h
+++ b/pxr/usdImaging/usdImaging/instanceAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_INSTANCE_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_INSTANCE_ADAPTER_H
@@ -27,6 +10,7 @@
 /// \file usdImaging/instanceAdapter.h
 
 #include "pxr/pxr.h"
+#include "pxr/usdImaging/usdImaging/api.h"
 #include "pxr/usdImaging/usdImaging/primAdapter.h"
 
 #include "pxr/base/tf/hashmap.h"
@@ -258,6 +242,8 @@ class UsdImagingInstanceAdapter : public UsdImagingPrimAdapter
                         UsdTimeCode time) const override;
 
     USDIMAGING_API
+    bool IsChildPath(const SdfPath& path) const override;
+
     bool GetVisible(UsdPrim const& usdPrim, 
                     SdfPath const& cachePath,
                     UsdTimeCode time) const override;
diff --git a/pxr/usdImaging/usdImaging/instanceablePrimAdapter.cpp b/pxr/usdImaging/usdImaging/instanceablePrimAdapter.cpp
index e345c36a5f..9cb5a890b0 100644
--- a/pxr/usdImaging/usdImaging/instanceablePrimAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/instanceablePrimAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/instanceablePrimAdapter.h"
 
@@ -52,7 +35,7 @@ UsdImagingInstanceablePrimAdapter::ResolveCachePath(
     // for instanced prims, cachePath will be something like:
     //
     // primPath: /__Prototype_1/cube
-    // cachePath: /Models/cube_0.proto_cube_id0
+    // cachePath: /Models/cube_0/proto_cube_id0
     //
     // The name-mangling is so that multiple instancers/adapters can track the
     // same underlying UsdPrim.
@@ -66,10 +49,21 @@ UsdImagingInstanceablePrimAdapter::ResolveCachePath(
             cachePath = instancer;
         }
         if (!childName.IsEmpty()) {
-            cachePath = cachePath.AppendProperty(childName);
+            cachePath = cachePath.AppendChild(childName);
         }
     }
     return cachePath;
 }
 
+SdfPath
+UsdImagingInstanceablePrimAdapter::ResolveProxyPrimPath(
+    const SdfPath& cachePath,
+    const UsdImagingInstancerContext* instancerContext) const
+{
+    if (instancerContext && !instancerContext->instancerCachePath.IsEmpty()) {
+        return instancerContext->instancerCachePath.GetAbsoluteRootOrPrimPath();
+    }
+    return cachePath;
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdImaging/instanceablePrimAdapter.h b/pxr/usdImaging/usdImaging/instanceablePrimAdapter.h
index a9fd2401f0..65f990c82a 100644
--- a/pxr/usdImaging/usdImaging/instanceablePrimAdapter.h
+++ b/pxr/usdImaging/usdImaging/instanceablePrimAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_INSTANCEABLE_PRIM_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_INSTANCEABLE_PRIM_ADAPTER_H
@@ -56,6 +39,14 @@ class UsdImagingInstanceablePrimAdapter : public UsdImagingPrimAdapter
         const SdfPath& usdPath,
         const UsdImagingInstancerContext*
             instancerContext = nullptr) const override;
+    
+    // Given the cachePath and instancerContext, resolve the proxy prim path
+    USDIMAGING_API
+    SdfPath
+    ResolveProxyPrimPath(
+        const SdfPath& cachePath,
+        const UsdImagingInstancerContext*
+            instancerContext = nullptr) const;
 };
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdImaging/instancerContext.cpp b/pxr/usdImaging/usdImaging/instancerContext.cpp
index 2d6269fe50..4f9eadce02 100644
--- a/pxr/usdImaging/usdImaging/instancerContext.cpp
+++ b/pxr/usdImaging/usdImaging/instancerContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/instancerContext.h"
 
diff --git a/pxr/usdImaging/usdImaging/instancerContext.h b/pxr/usdImaging/usdImaging/instancerContext.h
index 86dab4d3bc..f2d631cc98 100644
--- a/pxr/usdImaging/usdImaging/instancerContext.h
+++ b/pxr/usdImaging/usdImaging/instancerContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_INSTANCER_CONTEXT_H
 #define PXR_USD_IMAGING_USD_IMAGING_INSTANCER_CONTEXT_H
diff --git a/pxr/usdImaging/usdImaging/lightAPIAdapter.cpp b/pxr/usdImaging/usdImaging/lightAPIAdapter.cpp
index e83066fcbf..5da776ffd3 100644
--- a/pxr/usdImaging/usdImaging/lightAPIAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/lightAPIAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/lightAPIAdapter.h"
 #include "pxr/usdImaging/usdImaging/primAdapter.h"
@@ -48,24 +31,6 @@ TF_REGISTRY_FUNCTION(TfType)
 namespace
 {
 
-// XXX: Borrowed from collectionCache.cpp. Need to be able to prevent creation
-//      of meaningless categories for light and shadow linking as both an
-//      optimization and to allow lights without linking to work correctly now.
-//      TODO: Remove copy of this code once collection-to-category mechanisms
-//            are defined -- which may mean use of a refactored 
-//            UsdImaging_CollectionCache in which the code is already shared.
-// A query is trivial if it includes everything.
-bool
-_IsQueryTrivial(UsdCollectionAPI::MembershipQuery const& query)
-{
-    // XXX Should be a faster way to do this!
-    UsdCollectionAPI::MembershipQuery::PathExpansionRuleMap ruleMap =
-        query.GetAsPathExpansionRuleMap();
-    return ruleMap.size() == 1 &&
-        ruleMap.begin()->first == SdfPath::AbsoluteRootPath() &&
-        ruleMap.begin()->second == UsdTokens->expandPrims;
-}
-
 class _LightDataSource final : public HdContainerDataSource
 {
 public:
@@ -84,37 +49,12 @@ class _LightDataSource final : public HdContainerDataSource
             SdfPathVector filterPaths;
             _lightApi.GetFiltersRel().GetForwardedTargets(&filterPaths);
             return HdCreateTypedRetainedDataSource(VtValue(filterPaths));
-        } else if (name == HdTokens->lightLink) {
-            // exclude lightLink values for unauthored or collections which
-            // would otherwise match everything
-            UsdCollectionAPI c = _lightApi.GetLightLinkCollectionAPI();
-            if (_IsQueryTrivial(c.ComputeMembershipQuery())) {
-                return nullptr;
-            }
-
-            // NOTE: The value here corresponds to the "category" name
-            //       generated from our linking collection. For USD lights,
-            //       that will be the full property path to the linking
-            //       collection.
-            return HdRetainedTypedSampledDataSource<TfToken>::New(
-                c.GetCollectionPath().GetToken());
-        } else if (name == HdTokens->shadowLink) {
-            // exclude shadowLink values for unauthored or collections which
-            // would otherwise match everything
-            UsdCollectionAPI c = _lightApi.GetShadowLinkCollectionAPI();
-            if (_IsQueryTrivial(c.ComputeMembershipQuery())) {
-                return nullptr;
-            }
 
-            // NOTE: The value here corresponds to the "category" name
-            //       generated from our linking collection. For USD lights,
-            //       that will be the full property path to the linking
-            //       collection.
-            return HdRetainedTypedSampledDataSource<TfToken>::New(
-                c.GetCollectionPath().GetToken());
-        } else if (name == HdTokens->isLight) {
+        }
+        if (name == HdTokens->isLight) {
             return HdRetainedTypedSampledDataSource<bool>::New(true);
-        } else if (name == HdTokens->materialSyncMode) {
+        }
+        if (name == HdTokens->materialSyncMode) {
             if (UsdAttribute attr = _lightApi.GetMaterialSyncModeAttr()) {
                 TfToken v;
                 if (attr.Get(&v)) {
@@ -135,8 +75,6 @@ class _LightDataSource final : public HdContainerDataSource
                     _lightApi.GetPrim().GetPath(),
                     HdLightSchema::GetDefaultLocator().Append(name));
             }
-
-
         }
 
         return nullptr;
@@ -146,10 +84,13 @@ class _LightDataSource final : public HdContainerDataSource
 
     static const TfTokenVector & _GetNames()
     {
+        // Light linking fields 'lightLink' and 'shadowLink' that provide the
+        // category ID for the corresponding collection  are computed by a
+        // scene index downstream.
+        // The collections are transported by collectionAPIAdapter.
+        //
         static const TfTokenVector names = {
             HdTokens->filters,
-            HdTokens->lightLink,
-            HdTokens->shadowLink,
             HdTokens->isLight,
             HdTokens->materialSyncMode,
         };
@@ -227,18 +168,11 @@ UsdImagingLightAPIAdapter::InvalidateImagingSubprim(
             // since we report parameter values in the "light" data source
             // also, we need to invalidate it also
             result.insert(HdLightSchema::GetDefaultLocator());
-            
         }
 
-        // NOTE: Having to make assumptions regarding relevant linking
-        //       parameters as the relevant USD schemas don't offer static
-        //       functions for name comparison without access to the prim
-        //       instance. Let's assume collections defined here are linking
-        //       related.
-        if (!dirtiedLight
-                && (UsdCollectionAPI::CanContainPropertyName(propertyName)
-                    // This will capture other contents of light data source
-                    || TfStringStartsWith(propertyName.GetString(), "light:"))){
+        if (!dirtiedLight && !dirtiedMaterial &&
+            // This will capture other contents of light data source
+            TfStringStartsWith(propertyName.GetString(), "light:")) {
             dirtiedLight = true;
             result.insert(HdLightSchema::GetDefaultLocator());
         }
diff --git a/pxr/usdImaging/usdImaging/lightAPIAdapter.h b/pxr/usdImaging/usdImaging/lightAPIAdapter.h
index cddfb12adb..8aff9ff1f9 100644
--- a/pxr/usdImaging/usdImaging/lightAPIAdapter.h
+++ b/pxr/usdImaging/usdImaging/lightAPIAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_LIGHT_API_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_LIGHT_API_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/lightAdapter.cpp b/pxr/usdImaging/usdImaging/lightAdapter.cpp
index e2d3faede2..7acd957f86 100644
--- a/pxr/usdImaging/usdImaging/lightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/lightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/lightAdapter.h"
 #include "pxr/usdImaging/usdImaging/dataSourcePrim.h"
@@ -273,10 +256,6 @@ UsdImagingLightAdapter::GetMaterialResource(UsdPrim const &prim,
                                             SdfPath const& cachePath, 
                                             UsdTimeCode time) const
 {
-    if (!_GetSceneLightsEnabled()) {
-        return VtValue();
-    }
-
     if (!prim.HasAPI<UsdLuxLightAPI>()) {
         TF_RUNTIME_ERROR("Expected light prim at <%s> to have an applied API "
                          "of type 'UsdLuxLightAPI'; ignoring",
@@ -298,6 +277,14 @@ UsdImagingLightAdapter::GetMaterialResource(UsdPrim const &prim,
         &networkMap,
         time);
 
+    if (!_GetSceneLightsEnabled()) {
+        // When scene lights are disabeled we need to mark them as disabled
+        // by setting the intensity value to 0. This parameter is found on 
+        // the terminal node, which is the last node in the light network.
+        networkMap.map[HdMaterialTerminalTokens->light].nodes.back().
+            parameters[HdLightTokens->intensity] = 0.0f;
+    }
+
     return VtValue(networkMap);
 }
 
@@ -309,11 +296,8 @@ UsdImagingLightAdapter::_AddSprim(
     const UsdImagingInstancerContext* instancerContext)
 {
     SdfPath cachePath = ResolveCachePath(usdPrim.GetPath(), instancerContext);
-
-    // For an instanced light prim, this is the instancer prim.
-    // For a non-instanced light prim, this is just the light prim.
-    UsdPrim proxyPrim = usdPrim.GetStage()->GetPrimAtPath(
-        cachePath.GetAbsoluteRootOrPrimPath());
+    UsdPrim proxyPrim = _GetPrim(ResolveProxyPrimPath(
+        cachePath, instancerContext));
 
     if (instancerContext != nullptr) {
         index->InsertSprim(
diff --git a/pxr/usdImaging/usdImaging/lightAdapter.h b/pxr/usdImaging/usdImaging/lightAdapter.h
index ed9e7c1096..2fa45d076a 100644
--- a/pxr/usdImaging/usdImaging/lightAdapter.h
+++ b/pxr/usdImaging/usdImaging/lightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/lightFilterAdapter.cpp b/pxr/usdImaging/usdImaging/lightFilterAdapter.cpp
index 779341063c..875d768f82 100644
--- a/pxr/usdImaging/usdImaging/lightFilterAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/lightFilterAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/lightFilterAdapter.h"
 
@@ -170,7 +153,8 @@ UsdImagingLightFilterAdapter::MarkVisibilityDirty(UsdPrim const& prim,
                                             SdfPath const& cachePath,
                                             UsdImagingIndexProxy* index)
 {
-    // TBD
+    // "DirtyParam" is the catch-all bit for light params.
+    index->MarkSprimDirty(cachePath, HdLight::DirtyBits::DirtyParams);
 }
 
 VtValue 
diff --git a/pxr/usdImaging/usdImaging/lightFilterAdapter.h b/pxr/usdImaging/usdImaging/lightFilterAdapter.h
index c243b08966..9b3cd5dde4 100644
--- a/pxr/usdImaging/usdImaging/lightFilterAdapter.h
+++ b/pxr/usdImaging/usdImaging/lightFilterAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_LIGHT_FILTER_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_LIGHT_FILTER_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/materialAdapter.cpp b/pxr/usdImaging/usdImaging/materialAdapter.cpp
index 78dc14a2ce..070189a305 100644
--- a/pxr/usdImaging/usdImaging/materialAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/materialAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/materialAdapter.h"
 #include "pxr/usdImaging/usdImaging/dataSourceMaterial.h"
@@ -335,6 +318,11 @@ UsdImagingMaterialAdapter::GetMaterialResource(UsdPrim const &prim,
                                                UsdTimeCode time) const
 {
     TRACE_FUNCTION();
+    if (!prim) {
+        TF_RUNTIME_ERROR("Received prim is null.");
+        return VtValue();
+    }
+
     if (!_GetSceneMaterialsEnabled()) {
         return VtValue();
     }
diff --git a/pxr/usdImaging/usdImaging/materialAdapter.h b/pxr/usdImaging/usdImaging/materialAdapter.h
index 17db5bd66b..d8644d4fb5 100644
--- a/pxr/usdImaging/usdImaging/materialAdapter.h
+++ b/pxr/usdImaging/usdImaging/materialAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_MATERIAL_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_MATERIAL_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/materialBindingAPIAdapter.cpp b/pxr/usdImaging/usdImaging/materialBindingAPIAdapter.cpp
index 031287e356..ae366c7bfa 100644
--- a/pxr/usdImaging/usdImaging/materialBindingAPIAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/materialBindingAPIAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/materialBindingAPIAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/materialBindingAPIAdapter.h b/pxr/usdImaging/usdImaging/materialBindingAPIAdapter.h
index 1c93804a93..e829b4c8d0 100644
--- a/pxr/usdImaging/usdImaging/materialBindingAPIAdapter.h
+++ b/pxr/usdImaging/usdImaging/materialBindingAPIAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_MATERIAL_BINDING_API_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_MATERIAL_BINDING_API_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.cpp b/pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.cpp
index 7981365736..24ebf9ab94 100644
--- a/pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.h"
 
@@ -28,8 +11,6 @@
 #include "pxr/usdImaging/usdImaging/directMaterialBindingSchema.h"
 #include "pxr/usdImaging/usdImaging/directMaterialBindingsSchema.h"
 
-#include "pxr/imaging/hd/geomSubsetSchema.h"
-#include "pxr/imaging/hd/geomSubsetsSchema.h"
 #include "pxr/imaging/hd/materialBindingsSchema.h"
 #include "pxr/imaging/hd/materialBindingSchema.h"
 #include "pxr/imaging/hd/meshSchema.h"
@@ -134,95 +115,6 @@ class _HdMaterialBindingsDataSource final : public HdContainerDataSource
     const SdfPath _primPath;
 };
 
-// Overide that provides the resolved material bindings for a geom subset.
-//
-class _GeomSubsetDataSource final : public HdContainerDataSource
-{
-public:
-    HD_DECLARE_DATASOURCE(_GeomSubsetDataSource);
-
-    _GeomSubsetDataSource(
-        const HdContainerDataSourceHandle &geomSubsetContainer,
-        const HdSceneIndexBaseRefPtr &si,
-        const SdfPath &geomSubsetPath)
-    : _geomSubsetContainer(geomSubsetContainer)
-    , _si(si)
-    , _geomSubsetPath(geomSubsetPath)
-    {}
-
-    TfTokenVector
-    GetNames() override
-    {
-        TfTokenVector names = _geomSubsetContainer->GetNames();
-        names.push_back(HdMaterialBindingsSchema::GetSchemaToken());
-        return names;
-    }
-
-    HdDataSourceBaseHandle
-    Get(const TfToken &name) override
-    {
-        HdDataSourceBaseHandle result = _geomSubsetContainer->Get(name);
-
-        if (name == HdMaterialBindingsSchema::GetSchemaToken()) {
-            // Check if we have direct or collection material bindings to
-            // avoid returning an empty non-null container.
-            if (_HasDirectOrCollectionMaterialBindings(_geomSubsetContainer)) {
-
-                // We don't expect to have hydra material bindings on the
-                // prim container. Use an overlay just in case such that the
-                // existing opinion wins.
-                return
-                    HdOverlayContainerDataSource::New(
-                        HdContainerDataSource::Cast(result),
-                        _HdMaterialBindingsDataSource::New(
-                            _geomSubsetContainer, _si, _geomSubsetPath));
-            }
-        }
-
-        return result;
-    }
-
-private:
-    HdContainerDataSourceHandle _geomSubsetContainer;
-    const HdSceneIndexBaseRefPtr _si;
-    const SdfPath _geomSubsetPath;
-};
-
-class _GeomSubsetsDataSource final : public HdContainerDataSource
-{
-public:
-    HD_DECLARE_DATASOURCE(_GeomSubsetsDataSource);
-
-    _GeomSubsetsDataSource(
-        const HdContainerDataSourceHandle &geomSubsetsContainer,
-        const HdSceneIndexBaseRefPtr &si,
-        const SdfPath &primPath)
-    : _geomSubsetsContainer(geomSubsetsContainer)
-    , _si(si)
-    , _primPath(primPath)
-    {}
-
-    TfTokenVector
-    GetNames() override
-    {
-        return _geomSubsetsContainer->GetNames();
-    }
-
-    HdDataSourceBaseHandle
-    Get(const TfToken &name) override
-    {
-        HdDataSourceBaseHandle result = _geomSubsetsContainer->Get(name);
-        const SdfPath geomSubsetPath = _primPath.AppendChild(name);
-        return _GeomSubsetDataSource::New(
-            HdContainerDataSource::Cast(result), _si, geomSubsetPath);
-    }
-
-private:
-    HdContainerDataSourceHandle _geomSubsetsContainer;
-    const HdSceneIndexBaseRefPtr _si;
-    const SdfPath _primPath;
-};
-
 class _MeshDataSource final : public HdContainerDataSource
 {
 public:
@@ -248,11 +140,6 @@ class _MeshDataSource final : public HdContainerDataSource
     {
         HdDataSourceBaseHandle result = _meshContainer->Get(name);
 
-        if (name == HdGeomSubsetsSchema::GetSchemaToken()) {
-            return _GeomSubsetsDataSource::New(
-                HdContainerDataSource::Cast(result), _si, _primPath);
-        }
-
         return result;
     }
 
@@ -263,8 +150,7 @@ class _MeshDataSource final : public HdContainerDataSource
 };
 
 // Prim container override that provides the resolved hydra material bindings
-// if direct or collection USD material bindings are present. This is done for
-// material bindings on both the prim and any geom subsets.
+// if direct or collection USD material bindings are present.
 // 
 class _PrimDataSource final : public HdContainerDataSource
 {
@@ -293,7 +179,7 @@ class _PrimDataSource final : public HdContainerDataSource
     {
         HdDataSourceBaseHandle result = _primContainer->Get(name);
 
-        // Material bindings on the prim. Geom subsets are handled below.
+        // Material bindings on the prim.
         if (name == HdMaterialBindingsSchema::GetSchemaToken()) {
 
             // Check if we have direct or collection material bindings to
@@ -310,20 +196,6 @@ class _PrimDataSource final : public HdContainerDataSource
             }
         }
 
-
-        // XXX Current geom subsets support is limited to meshes. When that
-        //     changes, this needs to be updated.
-        if (name == HdMeshSchema::GetSchemaToken()) {
-            // Wrap the data source only if we have geom subsets.
-            if (HdContainerDataSourceHandle c =
-                    HdContainerDataSource::Cast(result)) {
-                
-                if (HdGeomSubsetsSchema gs = HdMeshSchema(c).GetGeomSubsets()) {
-                    return _MeshDataSource::New(c, _si, _primPath);
-                }
-            }
-        }
-
         return result;
     }
 
@@ -451,13 +323,12 @@ UsdImagingMaterialBindingsResolvingSceneIndex::_PrimsDirtied(
         if (entry.dirtyLocators.Intersects(usdMaterialBindingLocators)) {
 
             HdDataSourceLocatorSet newLocators(entry.dirtyLocators);
-            newLocators.ReplacePrefix(
+            newLocators = newLocators.ReplacePrefix(
                 UsdImagingDirectMaterialBindingsSchema::GetDefaultLocator(),
                 HdMaterialBindingsSchema::GetDefaultLocator());
-            newLocators.ReplacePrefix(
+            newLocators = newLocators.ReplacePrefix(
                 UsdImagingCollectionMaterialBindingsSchema::GetDefaultLocator(),
                 HdMaterialBindingsSchema::GetDefaultLocator());
-
             newEntries.push_back({entry.primPath, newLocators});
         } else {
             newEntries.push_back(entry);
diff --git a/pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.h b/pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.h
index bf4950a544..5833209dd4 100644
--- a/pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/materialBindingsResolvingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_USD_IMAGING_USD_IMAGING_MATERIAL_BINDINGS_RESOLVING_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_MATERIAL_BINDINGS_RESOLVING_SCENE_INDEX_H
 
diff --git a/pxr/usdImaging/usdImaging/materialParamUtils.cpp b/pxr/usdImaging/usdImaging/materialParamUtils.cpp
index cea038342a..047540597b 100644
--- a/pxr/usdImaging/usdImaging/materialParamUtils.cpp
+++ b/pxr/usdImaging/usdImaging/materialParamUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/materialParamUtils.h"
 
diff --git a/pxr/usdImaging/usdImaging/materialParamUtils.h b/pxr/usdImaging/usdImaging/materialParamUtils.h
index 250c534023..f658cf4170 100644
--- a/pxr/usdImaging/usdImaging/materialParamUtils.h
+++ b/pxr/usdImaging/usdImaging/materialParamUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_MATERIAL_PARAM_UTILS_H
 #define PXR_USD_IMAGING_MATERIAL_PARAM_UTILS_H
diff --git a/pxr/usdImaging/usdImaging/meshAdapter.cpp b/pxr/usdImaging/usdImaging/meshAdapter.cpp
index 7fc3bf5ec8..025c5ac70b 100644
--- a/pxr/usdImaging/usdImaging/meshAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/meshAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/meshAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/meshAdapter.h b/pxr/usdImaging/usdImaging/meshAdapter.h
index e060a8161e..109cf4a694 100644
--- a/pxr/usdImaging/usdImaging/meshAdapter.h
+++ b/pxr/usdImaging/usdImaging/meshAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_MESH_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_MESH_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/modelSchema.cpp b/pxr/usdImaging/usdImaging/modelSchema.cpp
index cd54e578d3..32692e4fcd 100644
--- a/pxr/usdImaging/usdImaging/modelSchema.cpp
+++ b/pxr/usdImaging/usdImaging/modelSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/modelSchema.h b/pxr/usdImaging/usdImaging/modelSchema.h
index e24477e1f7..1835682efe 100644
--- a/pxr/usdImaging/usdImaging/modelSchema.h
+++ b/pxr/usdImaging/usdImaging/modelSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.cpp b/pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.cpp
index 4806b22d1f..c88cf14144 100644
--- a/pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.h b/pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.h
index 16a272ba7c..eee7c57d26 100644
--- a/pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/niInstanceAggregationSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_NI_INSTANCE_AGGREGATION_SCENE_INDEX_H
 #define PXR_USD_IMAGING_NI_INSTANCE_AGGREGATION_SCENE_INDEX_H
diff --git a/pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.cpp b/pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.cpp
index 2feea9a29f..ca6cba7197 100644
--- a/pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.h"
 
@@ -474,6 +457,12 @@ UsdImagingNiPrototypePropagatingSceneIndex::GetInputScenes() const
     }
 }
 
+std::vector<HdSceneIndexBaseRefPtr>
+UsdImagingNiPrototypePropagatingSceneIndex::GetEncapsulatedScenes() const
+{
+    return { _mergingSceneIndex };
+}
+
 HdSceneIndexPrim
 UsdImagingNiPrototypePropagatingSceneIndex::GetPrim(
     const SdfPath &primPath) const
diff --git a/pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.h b/pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.h
index 28a5f7879e..67dcddcb32 100644
--- a/pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/niPrototypePropagatingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_NI_PROTOTYPE_PROPAGATING_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_NI_PROTOTYPE_PROPAGATING_SCENE_INDEX_H
@@ -302,6 +285,7 @@ TF_DECLARE_REF_PTRS(UsdImagingNiPrototypePropagatingSceneIndex);
 ///
 class UsdImagingNiPrototypePropagatingSceneIndex final
                                 : public HdFilteringSceneIndexBase
+                                , public HdEncapsulatingSceneIndexBase
 {
 public:
     using SceneIndexAppendCallback =
@@ -337,6 +321,9 @@ class UsdImagingNiPrototypePropagatingSceneIndex final
     USDIMAGING_API
     std::vector<HdSceneIndexBaseRefPtr> GetInputScenes() const override;
 
+    USDIMAGING_API
+    std::vector<HdSceneIndexBaseRefPtr> GetEncapsulatedScenes() const override;
+
 private:
     class _SceneIndexCache;
     using _SceneIndexCacheSharedPtr =
diff --git a/pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.cpp b/pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.cpp
index a294af4787..05474c3a4c 100644
--- a/pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.h b/pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.h
index de4e42fb2f..93681e4df6 100644
--- a/pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/niPrototypePruningSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_NI_PROTOTYPE_PRUNING_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_NI_PROTOTYPE_PRUNING_SCENE_INDEX_H
diff --git a/pxr/usdImaging/usdImaging/niPrototypeSceneIndex.cpp b/pxr/usdImaging/usdImaging/niPrototypeSceneIndex.cpp
index 5c3a314a26..bd21ae7313 100644
--- a/pxr/usdImaging/usdImaging/niPrototypeSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/niPrototypeSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/niPrototypeSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/niPrototypeSceneIndex.h b/pxr/usdImaging/usdImaging/niPrototypeSceneIndex.h
index 8088391d55..0f203c86fa 100644
--- a/pxr/usdImaging/usdImaging/niPrototypeSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/niPrototypeSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_NI_PROTOTYPE_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_NI_PROTOTYPE_SCENE_INDEX_H
diff --git a/pxr/usdImaging/usdImaging/nurbsCurvesAdapter.cpp b/pxr/usdImaging/usdImaging/nurbsCurvesAdapter.cpp
index 89443c8a27..459b1ca6ff 100644
--- a/pxr/usdImaging/usdImaging/nurbsCurvesAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/nurbsCurvesAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/nurbsCurvesAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/nurbsCurvesAdapter.h b/pxr/usdImaging/usdImaging/nurbsCurvesAdapter.h
index 889ae2687e..a5bb2faba8 100644
--- a/pxr/usdImaging/usdImaging/nurbsCurvesAdapter.h
+++ b/pxr/usdImaging/usdImaging/nurbsCurvesAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_NURBS_CURVES_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_NURBS_CURVES_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/nurbsPatchAdapter.cpp b/pxr/usdImaging/usdImaging/nurbsPatchAdapter.cpp
index de86ffabbc..1f0b72c720 100644
--- a/pxr/usdImaging/usdImaging/nurbsPatchAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/nurbsPatchAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/nurbsPatchAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/nurbsPatchAdapter.h b/pxr/usdImaging/usdImaging/nurbsPatchAdapter.h
index cd6f4b1126..a7e23267c2 100644
--- a/pxr/usdImaging/usdImaging/nurbsPatchAdapter.h
+++ b/pxr/usdImaging/usdImaging/nurbsPatchAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_NURBS_PATCH_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_NURBS_PATCH_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/pch.h b/pxr/usdImaging/usdImaging/pch.h
index 35ea5620ec..662b7fb10d 100644
--- a/pxr/usdImaging/usdImaging/pch.h
+++ b/pxr/usdImaging/usdImaging/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -28,9 +11,19 @@
 #include "pxr/pxr.h"
 #include "pxr/base/arch/defines.h"
 #if defined(ARCH_OS_DARWIN)
+#include <glob.h>
+#include <limits.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <unistd.h>
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <glob.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/statfs.h>
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,14 +31,17 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
+#include <io.h>
+#include <stringapiset.h>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
+#include <cctype>
 #include <cfloat>
 #include <cinttypes>
 #include <cmath>
@@ -56,6 +52,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <deque>
+#include <fcntl.h>
 #include <float.h>
 #include <functional>
 #include <initializer_list>
@@ -69,14 +66,19 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
 #include <ostream>
 #include <queue>
+#include <regex>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
 #include <tuple>
@@ -86,56 +88,8 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/container/flat_map.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
@@ -149,33 +103,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_left_shift.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_unordered_set.h>
@@ -186,7 +116,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.cpp b/pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.cpp
index b4165b9f0d..1af248a547 100644
--- a/pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.h"
 
@@ -659,12 +642,18 @@ std::vector<HdSceneIndexBaseRefPtr>
 UsdImagingPiPrototypePropagatingSceneIndex::GetInputScenes() const
 {
     if (TfGetEnvSetting(USDIMAGING_SHOW_POINT_PROTOTYPE_SCENE_INDICES)) {
-        return { _context->mergingSceneIndex->GetInputScenes() };
+        return _context->mergingSceneIndex->GetInputScenes();
     } else {
         return { _context->inputSceneIndex };
     }
 }
 
+std::vector<HdSceneIndexBaseRefPtr>
+UsdImagingPiPrototypePropagatingSceneIndex::GetEncapsulatedScenes() const
+{
+    return { _context->mergingSceneIndex };
+}
+
 HdSceneIndexPrim
 UsdImagingPiPrototypePropagatingSceneIndex::GetPrim(
     const SdfPath &primPath) const
diff --git a/pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.h b/pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.h
index a2ff405086..8723366467 100644
--- a/pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/piPrototypePropagatingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PI_PROTOTYPE_PROPAGATING_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_PI_PROTOTYPE_PROPAGATING_SCENE_INDEX_H
@@ -365,6 +348,7 @@ using _InstancerObserverUniquePtr = std::unique_ptr<class _InstancerObserver>;
 ///
 class UsdImagingPiPrototypePropagatingSceneIndex final
                                 : public HdFilteringSceneIndexBase
+                                , public HdEncapsulatingSceneIndexBase
 {
 public:
     USDIMAGING_API
@@ -380,6 +364,9 @@ class UsdImagingPiPrototypePropagatingSceneIndex final
     USDIMAGING_API
     std::vector<HdSceneIndexBaseRefPtr> GetInputScenes() const override;
 
+    USDIMAGING_API
+    std::vector<HdSceneIndexBaseRefPtr> GetEncapsulatedScenes() const override;
+
 private:
     UsdImagingPiPrototypePropagatingSceneIndex(
         const HdSceneIndexBaseRefPtr &inputSceneIndex);
diff --git a/pxr/usdImaging/usdImaging/piPrototypeSceneIndex.cpp b/pxr/usdImaging/usdImaging/piPrototypeSceneIndex.cpp
index 00e02b78b3..bc4f5f2c49 100644
--- a/pxr/usdImaging/usdImaging/piPrototypeSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/piPrototypeSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/piPrototypeSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/piPrototypeSceneIndex.h b/pxr/usdImaging/usdImaging/piPrototypeSceneIndex.h
index 3e85c60966..6052c5f570 100644
--- a/pxr/usdImaging/usdImaging/piPrototypeSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/piPrototypeSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PI_PROTOTYPE_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_PI_PROTOTYPE_SCENE_INDEX_H
diff --git a/pxr/usdImaging/usdImaging/planeAdapter.cpp b/pxr/usdImaging/usdImaging/planeAdapter.cpp
index 0719dfeed3..392faac04f 100644
--- a/pxr/usdImaging/usdImaging/planeAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/planeAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/planeAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/planeAdapter.h b/pxr/usdImaging/usdImaging/planeAdapter.h
index 544e89335a..e50fe64f91 100644
--- a/pxr/usdImaging/usdImaging/planeAdapter.h
+++ b/pxr/usdImaging/usdImaging/planeAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PLANE_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_PLANE_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/plugInfo.json b/pxr/usdImaging/usdImaging/plugInfo.json
index 093b4e06c0..19096d48b6 100644
--- a/pxr/usdImaging/usdImaging/plugInfo.json
+++ b/pxr/usdImaging/usdImaging/plugInfo.json
@@ -186,6 +186,13 @@
                         "isInternal": true,
                         "primTypeName": "Sphere"
                     },
+                    "UsdImagingRenderPassAdapter": {
+                        "bases": [
+                            "UsdImagingPrimAdapter"
+                        ],
+                        "isInternal": true,
+                        "primTypeName": "RenderPass"
+                    },
                     "UsdImagingRenderSettingsAdapter": {
                         "bases": [
                             "UsdImagingPrimAdapter"
diff --git a/pxr/usdImaging/usdImaging/pluginLightAdapter.cpp b/pxr/usdImaging/usdImaging/pluginLightAdapter.cpp
index f0aa1731e3..76a9f4fde9 100644
--- a/pxr/usdImaging/usdImaging/pluginLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/pluginLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/pluginLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/pluginLightAdapter.h b/pxr/usdImaging/usdImaging/pluginLightAdapter.h
index fa9cbe708d..463df120d2 100644
--- a/pxr/usdImaging/usdImaging/pluginLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/pluginLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PLUGIN_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_PLUGIN_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/pluginLightFilterAdapter.cpp b/pxr/usdImaging/usdImaging/pluginLightFilterAdapter.cpp
index 2e3e3154a4..02489da236 100644
--- a/pxr/usdImaging/usdImaging/pluginLightFilterAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/pluginLightFilterAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/pluginLightFilterAdapter.h"
 #include "pxr/usdImaging/usdImaging/lightAdapter.h"
diff --git a/pxr/usdImaging/usdImaging/pluginLightFilterAdapter.h b/pxr/usdImaging/usdImaging/pluginLightFilterAdapter.h
index b5dab7109b..e3c66c2896 100644
--- a/pxr/usdImaging/usdImaging/pluginLightFilterAdapter.h
+++ b/pxr/usdImaging/usdImaging/pluginLightFilterAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PLUGIN_LIGHT_FILTER_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_PLUGIN_LIGHT_FILTER_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/pointInstancerAdapter.cpp b/pxr/usdImaging/usdImaging/pointInstancerAdapter.cpp
index a62bc3fcf7..0198e4500f 100644
--- a/pxr/usdImaging/usdImaging/pointInstancerAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/pointInstancerAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/pointInstancerAdapter.h"
 
@@ -51,6 +34,7 @@
 #include <cctype>
 #include <limits>
 #include <atomic>
+#include <regex>
 #include <string>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -531,8 +515,9 @@ UsdImagingPointInstancerAdapter::TrackVariability(UsdPrim const& prim,
     UsdTimeCode time(1.0);
 
     if (IsChildPath(cachePath)) {
+        const SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim& proto =
-            const_cast<_ProtoPrim&>(_GetProtoPrim(prim.GetPath(), cachePath));
+            const_cast<_ProtoPrim&>(_GetProtoPrim(instancerPath, cachePath));
         if (!TF_VERIFY(proto.adapter, "%s", cachePath.GetText())) {
             return;
         }
@@ -652,17 +637,29 @@ UsdImagingPointInstancerAdapter::TrackVariability(UsdPrim const& prim,
                     HdChangeTracker::DirtyPrimvar,
                     HdInstancerTokens->instancer,
                     timeVaryingBits,
+                    false) ||
+            _IsVarying(prim,
+                    UsdGeomTokens->angularVelocities,
+                    HdChangeTracker::DirtyPrimvar,
+                    HdInstancerTokens->instancer,
+                    timeVaryingBits,
                     false);
 
+        // See if any of the inherited primvars are time-dependent.
+        UsdImaging_InheritedPrimvarStrategy::value_type inheritedPrimvarRecord =
+            _GetInheritedPrimvars(prim.GetParent());
+        if (inheritedPrimvarRecord && inheritedPrimvarRecord->variable) {
+            *timeVaryingBits |= HdChangeTracker::DirtyPrimvar;
+            HD_PERF_COUNTER_INCR(UsdImagingTokens->usdVaryingPrimvar);
+        }
+        // See if other local primvars are time-dependent.
         if (!(*timeVaryingBits & HdChangeTracker::DirtyPrimvar)) {
             UsdGeomPrimvarsAPI primvars(prim);
             for (auto const &pv: primvars.GetPrimvarsWithValues()) {
                 TfToken const& interp = pv.GetInterpolation();
-                if (interp != UsdGeomTokens->constant &&
-                    interp != UsdGeomTokens->uniform &&
-                    pv.ValueMightBeTimeVarying()) {
+                if (pv.ValueMightBeTimeVarying()) {
                     *timeVaryingBits |= HdChangeTracker::DirtyPrimvar;
-                    HD_PERF_COUNTER_INCR(HdInstancerTokens->instancer);
+                    HD_PERF_COUNTER_INCR(UsdImagingTokens->usdVaryingPrimvar);
                     break;
                 }
             }
@@ -684,7 +681,7 @@ UsdImagingPointInstancerAdapter::UpdateForTime(UsdPrim const& prim,
         // Allow the prototype's adapter to update, if there's anything left
         // to do.
         if (requestedBits != HdChangeTracker::Clean) {
-            // cachePath : /path/instancerPath.proto_*
+            // cachePath : /path/instancerPath/proto_*
             // instancerPath : /path/instancerPath
             SdfPath instancerPath = cachePath.GetParentPath();
             _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -700,9 +697,8 @@ UsdImagingPointInstancerAdapter::UpdateForTime(UsdPrim const& prim,
                 protoPrim, cachePath, time, requestedBits);
         }
     } else if (_instancerData.find(cachePath) != _instancerData.end()) {
-        // For the instancer itself, we only send translate, rotate, scale,
-        // velocities, and accelerations back as primvars, which all fall into
-        // the DirtyPrimvar bucket currently.
+        // For the instancer itself, we send per-instance transform attributes
+        // back as primvars, which all fall into DirtyPrimvar currently.
         if (requestedBits & HdChangeTracker::DirtyPrimvar) {
             UsdGeomPointInstancer instancer(prim);
 
@@ -764,18 +760,39 @@ UsdImagingPointInstancerAdapter::UpdateForTime(UsdPrim const& prim,
                     HdInterpolationInstance);
             }
 
-            // Convert non-uniform primvars on UsdGeomPointInstancer into
-            // instance-rate primvars. Note: this only gets local primvars.
-            // Inherited primvars don't vary per-instance, so we let the
-            // prototypes pick them up.
-            UsdGeomPrimvarsAPI primvars(instancer);
-            for (auto const &pv: primvars.GetPrimvarsWithValues()) {
-                TfToken const& interp = pv.GetInterpolation();
-                if (interp != UsdGeomTokens->constant &&
-                    interp != UsdGeomTokens->uniform) {
-                    HdInterpolation interp = HdInterpolationInstance;
-                    _ComputeAndMergePrimvar(prim, pv, time, &vPrimvars, &interp);
+            VtVec3fArray angularVelocities;
+            if (instancer.GetAngularVelocitiesAttr()
+                    .Get(&angularVelocities, time)) {
+                _MergePrimvar(
+                    &vPrimvars,
+                    HdTokens->angularVelocities,
+                    HdInterpolationInstance);
+            }
+
+            // Pick up inherited and local constant primvars, and convert
+            // non-constant primvars on UsdGeomPointInstancer into
+            // instance-rate primvars.
+            std::vector<UsdGeomPrimvar> primvars;
+            UsdImaging_InheritedPrimvarStrategy::value_type
+                inheritedPrimvarRecord =
+                    _GetInheritedPrimvars(prim.GetParent());
+            if (inheritedPrimvarRecord) {
+                primvars = inheritedPrimvarRecord->primvars;
+            }
+
+            UsdGeomPrimvarsAPI primvarsApi(instancer);
+            std::vector<UsdGeomPrimvar> local =
+                primvarsApi.GetPrimvarsWithValues();
+            primvars.insert(primvars.end(), local.begin(), local.end());
+
+            for (auto const &pv: primvars) {
+                TfToken const& usdInterp = pv.GetInterpolation();
+                HdInterpolation hdInterp = HdInterpolationInstance;
+                if (usdInterp == UsdGeomTokens->constant || 
+                    usdInterp == UsdGeomTokens->uniform) {
+                    hdInterp = HdInterpolationConstant;
                 }
+                _ComputeAndMergePrimvar(prim, pv, time, &vPrimvars, &hdInterp);
             }
         }
     }
@@ -787,7 +804,8 @@ UsdImagingPointInstancerAdapter::ProcessPropertyChange(UsdPrim const& prim,
                                       TfToken const& propertyName)
 {
     if (IsChildPath(cachePath)) {
-        _ProtoPrim const& proto = _GetProtoPrim(prim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         if (!proto.adapter || (proto.paths.size() <= 0)) {
             // It's possible we'll get multiple USD edits for the same
             // prototype, one of which will cause a resync.  On resync,
@@ -829,7 +847,8 @@ UsdImagingPointInstancerAdapter::ProcessPropertyChange(UsdPrim const& prim,
         propertyName == UsdGeomTokens->orientationsf ||
         propertyName == UsdGeomTokens->scales ||
         propertyName == UsdGeomTokens->velocities ||
-        propertyName == UsdGeomTokens->accelerations) {
+        propertyName == UsdGeomTokens->accelerations ||
+        propertyName == UsdGeomTokens->angularVelocities) {
 
         TfToken primvarName = propertyName;
         if (propertyName == UsdGeomTokens->positions) {
@@ -844,6 +863,8 @@ UsdImagingPointInstancerAdapter::ProcessPropertyChange(UsdPrim const& prim,
             primvarName = HdTokens->velocities;
         } else if (propertyName == UsdGeomTokens->accelerations) {
             primvarName = HdTokens->accelerations;
+        } else if (propertyName == UsdGeomTokens->angularVelocities) {
+            primvarName = HdTokens->angularVelocities;
         }
 
         return _ProcessNonPrefixedPrimvarPropertyChange(
@@ -858,18 +879,8 @@ UsdImagingPointInstancerAdapter::ProcessPropertyChange(UsdPrim const& prim,
 
     // Is the property a primvar?
     if (UsdGeomPrimvarsAPI::CanContainPropertyName(propertyName)) {
-        // Ignore local constant/uniform primvars.
-        UsdGeomPrimvar pv = UsdGeomPrimvarsAPI(prim).GetPrimvar(propertyName);
-        if (pv && (pv.GetInterpolation() == UsdGeomTokens->constant ||
-                   pv.GetInterpolation() == UsdGeomTokens->uniform)) {
-            return HdChangeTracker::Clean;
-        }
-
-        
         return UsdImagingPrimAdapter::_ProcessPrefixedPrimvarPropertyChange(
-            prim, cachePath, propertyName,
-            /*valueChangeDirtyBit*/HdChangeTracker::DirtyPrimvar,
-            /*inherited=*/false);
+            prim, cachePath, propertyName);
     }
 
     // XXX: Treat transform & visibility changes as re-sync, until we untangle
@@ -965,7 +976,7 @@ UsdImagingPointInstancerAdapter::MarkDirty(UsdPrim const& prim,
                                            UsdImagingIndexProxy* index)
 {
     if (IsChildPath(cachePath)) {
-        // cachePath : /path/instancerPath.proto_*
+        // cachePath : /path/instancerPath/proto_*
         // instancerPath : /path/instancerPath
         SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -989,7 +1000,7 @@ UsdImagingPointInstancerAdapter::MarkRefineLevelDirty(
                                                    UsdImagingIndexProxy* index)
 {
     if (IsChildPath(cachePath)) {
-        // cachePath : /path/instancerPath.proto_*
+        // cachePath : /path/instancerPath/proto_*
         // instancerPath : /path/instancerPath
         SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -1004,7 +1015,7 @@ UsdImagingPointInstancerAdapter::MarkReprDirty(UsdPrim const& prim,
                                                UsdImagingIndexProxy* index)
 {
     if (IsChildPath(cachePath)) {
-        // cachePath : /path/instancerPath.proto_*
+        // cachePath : /path/instancerPath/proto_*
         // instancerPath : /path/instancerPath
         SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -1019,7 +1030,7 @@ UsdImagingPointInstancerAdapter::MarkCullStyleDirty(UsdPrim const& prim,
                                                     UsdImagingIndexProxy* index)
 {
     if (IsChildPath(cachePath)) {
-        // cachePath : /path/instancerPath.proto_*
+        // cachePath : /path/instancerPath/proto_*
         // instancerPath : /path/instancerPath
         SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -1034,7 +1045,7 @@ UsdImagingPointInstancerAdapter::MarkRenderTagDirty(UsdPrim const& prim,
                                                     UsdImagingIndexProxy* index)
 {
     if (IsChildPath(cachePath)) {
-        // cachePath : /path/instancerPath.proto_*
+        // cachePath : /path/instancerPath/proto_*
         // instancerPath : /path/instancerPath
         SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -1049,7 +1060,7 @@ UsdImagingPointInstancerAdapter::MarkTransformDirty(UsdPrim const& prim,
                                                     UsdImagingIndexProxy* index)
 {
     if (IsChildPath(cachePath)) {
-        // cachePath : /path/instancerPath.proto_*
+        // cachePath : /path/instancerPath/proto_*
         // instancerPath : /path/instancerPath
         SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -1070,7 +1081,7 @@ UsdImagingPointInstancerAdapter::MarkVisibilityDirty(
                                                     UsdImagingIndexProxy* index)
 {
     if (IsChildPath(cachePath)) {
-        // cachePath : /path/instancerPath.proto_*
+        // cachePath : /path/instancerPath/proto_*
         // instancerPath : /path/instancerPath
         SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -1179,15 +1190,13 @@ UsdImagingPointInstancerAdapter::_GetProtoPrimForChild(
     UsdImagingInstancerContext* ctx) const
 {
     if (IsChildPath(cachePath)) {
-        *proto = &_GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        *proto = &_GetProtoPrim(instancerPath, cachePath);
         if (!TF_VERIFY(*proto)) {
             return false;
         }
         UsdPrim protoPrim = _GetProtoUsdPrim(**proto);
 
-        // The instancer path since IsChildPath is true
-        const SdfPath instancerPath = cachePath.GetParentPath();
-
         ctx->instancerCachePath = instancerPath;
         ctx->childName = cachePath.GetNameToken();
         ctx->instancerMaterialUsdPath = SdfPath();
@@ -1659,7 +1668,8 @@ UsdImagingPointInstancerAdapter::GetInstancerPrototypes(
     HD_TRACE_FUNCTION();
 
     if (IsChildPath(cachePath)) {
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetInstancerPrototypes(protoPrim, cachePath);
     } else {
@@ -1761,7 +1771,7 @@ UsdImagingPointInstancerAdapter::GetTransform(UsdPrim const& prim,
                                         ignoreRootTransform);
     }
 
-    // cachePath : /path/instancerPath.proto_*
+    // cachePath : /path/instancerPath/proto_*
     // instancerPath : /path/instancerPath
     SdfPath instancerPath = cachePath.GetParentPath();
     _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -1835,8 +1845,8 @@ UsdImagingPointInstancerAdapter::SamplePrimvar(
 
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(),
-                                                   cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->SamplePrimvar(
             protoPrim, cachePath, key, time,
@@ -1855,6 +1865,8 @@ UsdImagingPointInstancerAdapter::SamplePrimvar(
             usdKey = UsdGeomTokens->velocities;
         } else if (key == HdTokens->accelerations) {
             usdKey = UsdGeomTokens->accelerations;
+        } else if (key == HdTokens->angularVelocities) {
+            usdKey = UsdGeomTokens->angularVelocities;
         }
         return UsdImagingPrimAdapter::SamplePrimvar(
             usdPrim, cachePath, usdKey, time,
@@ -1862,6 +1874,15 @@ UsdImagingPointInstancerAdapter::SamplePrimvar(
     }
 }
 
+bool
+UsdImagingPointInstancerAdapter::IsChildPath(
+    const SdfPath& path) const
+{
+    TRACE_FUNCTION();
+    static const std::regex regex("^proto\\d+_[^.\\/\\s]+_id\\d+$");
+    return std::regex_match(path.GetName(), regex);
+}
+
 /*virtual*/
 bool 
 UsdImagingPointInstancerAdapter::GetVisible(UsdPrim const& prim, 
@@ -1875,7 +1896,7 @@ UsdImagingPointInstancerAdapter::GetVisible(UsdPrim const& prim,
     if (IsChildPath(cachePath)) {
         bool vis = false;
 
-        // cachePath : /path/instancerPath.proto_*
+        // cachePath : /path/instancerPath/proto_*
         // instancerPath : /path/instancerPath
         SdfPath instancerPath = cachePath.GetParentPath();
         _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
@@ -1932,7 +1953,8 @@ UsdImagingPointInstancerAdapter::GetPurpose(
 {
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoUsdPrim = _GetProtoUsdPrim(proto);
 
         UsdPrim instanceProxyPrim = _GetPrim(_GetPrimPathFromInstancerChain(
@@ -1956,7 +1978,8 @@ UsdImagingPointInstancerAdapter::GetSubdivTags(UsdPrim const& usdPrim,
 {
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetSubdivTags(protoPrim, cachePath, time);
     }
@@ -1971,7 +1994,8 @@ UsdImagingPointInstancerAdapter::GetTopology(UsdPrim const& usdPrim,
 {
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetTopology(protoPrim, cachePath, time);
     }
@@ -1986,7 +2010,8 @@ UsdImagingPointInstancerAdapter::GetCullStyle(UsdPrim const& usdPrim,
 {
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetCullStyle(protoPrim, cachePath, time);
     }
@@ -2001,7 +2026,8 @@ UsdImagingPointInstancerAdapter::GetExtent(UsdPrim const& usdPrim,
 {
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetExtent(protoPrim, cachePath, time);
     }
@@ -2017,7 +2043,8 @@ UsdImagingPointInstancerAdapter::GetDoubleSided(UsdPrim const& usdPrim,
 {
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetDoubleSided(protoPrim, cachePath, time);
     }
@@ -2032,7 +2059,8 @@ UsdImagingPointInstancerAdapter::GetMaterialId(UsdPrim const& usdPrim,
 {
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         SdfPath materialId =
             proto.adapter->GetMaterialId(protoPrim, cachePath, time);
@@ -2057,7 +2085,8 @@ UsdImagingPointInstancerAdapter::GetLightParamValue(
     UsdTimeCode time) const
 {
     if (IsChildPath(cachePath)) {
-        const _ProtoPrim proto = _GetProtoPrim(prim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        const _ProtoPrim proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetLightParamValue(
             protoPrim, cachePath, paramName, time);
@@ -2074,7 +2103,8 @@ UsdImagingPointInstancerAdapter::GetMaterialResource(
 {
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        const _ProtoPrim& proto = _GetProtoPrim(prim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        const _ProtoPrim& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetMaterialResource(protoPrim, cachePath, time);
     }
@@ -2093,7 +2123,8 @@ UsdImagingPointInstancerAdapter::Get(UsdPrim const& usdPrim,
 
     if (IsChildPath(cachePath)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), cachePath);
+        const SdfPath instancerPath = cachePath.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, cachePath);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->Get(protoPrim, cachePath, key, time, outIndices);
 
@@ -2144,18 +2175,33 @@ UsdImagingPointInstancerAdapter::Get(UsdPrim const& usdPrim,
                 return VtValue(accelerations);
             }
 
-        } else {
-            UsdGeomPrimvarsAPI primvars(usdPrim);
-            if (UsdGeomPrimvar pv = primvars.GetPrimvar(key)) {
-                VtValue value;
-                if (outIndices) {
-                    if (pv && pv.Get(&value, time)) {
-                        pv.GetIndices(outIndices, time);
-                        return value;
-                    }
-                } else if (pv && pv.ComputeFlattened(&value, time)) {
+        } else if (key == HdTokens->angularVelocities) {
+            UsdGeomPointInstancer instancer(usdPrim);
+            VtVec3fArray angularVelocities;
+            if (instancer.GetAngularVelocitiesAttr()
+                    .Get(&angularVelocities, time)) {
+                return VtValue(angularVelocities);
+            }
+        } else if (UsdGeomPrimvar pv =
+                UsdGeomPrimvarsAPI(usdPrim).GetPrimvar(key)) {
+            VtValue value;
+            if (outIndices) {
+                if (pv && pv.Get(&value, time)) {
+                    pv.GetIndices(outIndices, time);
+                    return value;
+                }
+            } else if (pv && pv.ComputeFlattened(&value, time)) {
+                return value;
+            }
+        } else if (UsdGeomPrimvar pv = _GetInheritedPrimvar(usdPrim, key)) {
+            VtValue value;
+            if (outIndices) {
+                if (pv && pv.Get(&value, time)) {
+                    pv.GetIndices(outIndices, time);
                     return value;
                 }
+            } else if (pv && pv.ComputeFlattened(&value, time)) {
+                return value;
             }
         }
     }
@@ -2386,7 +2432,7 @@ UsdImagingPointInstancerAdapter::PopulateSelection(
         // (since we've verified the path above), so take the prim at
         // cachePath.GetPrimPath, since that's guaranteed to exist and be a
         // prefix...
-        UsdPrim prefixPrim = _GetPrim(cachePath.GetAbsoluteRootOrPrimPath());
+        UsdPrim prefixPrim = _GetPrim(instancerPath);
         return proto.adapter->PopulateSelection(
             highlightMode, cachePath, prefixPrim,
             hydraInstanceIndex, instanceIndices, result);
@@ -2459,7 +2505,7 @@ UsdImagingPointInstancerAdapter::PopulateSelection(
                     instanceIndices.push_back(foundIndex);
                 }
                 UsdPrim selectionPrim =
-                    _GetPrim(pair.first.GetAbsoluteRootOrPrimPath());
+                    _GetPrim(pair.first.GetParentPath());
 
                 added |= pair.second.adapter->PopulateSelection(
                     highlightMode, pair.first, selectionPrim,
@@ -2505,7 +2551,7 @@ UsdImagingPointInstancerAdapter::PopulateSelection(
                 // If we've accounted for the whole selection path, fully
                 // populate this prototype.
                 selectionPrim =
-                    _GetPrim(pair.first.GetAbsoluteRootOrPrimPath());
+                    _GetPrim(pair.first.GetParentPath());
             }
             else if (selectionCount != 0 &&
                      instanceCount == pair.second.paths.size()) {
@@ -2569,7 +2615,8 @@ UsdImagingPointInstancerAdapter::GetVolumeFieldDescriptors(
 {
     if (IsChildPath(id)) {
         // Delegate to prototype adapter and USD prim.
-        _ProtoPrim const& proto = _GetProtoPrim(usdPrim.GetPath(), id);
+        const SdfPath instancerPath = id.GetParentPath();
+        _ProtoPrim const& proto = _GetProtoPrim(instancerPath, id);
         UsdPrim protoPrim = _GetProtoUsdPrim(proto);
         return proto.adapter->GetVolumeFieldDescriptors(
             protoPrim, id, time);
diff --git a/pxr/usdImaging/usdImaging/pointInstancerAdapter.h b/pxr/usdImaging/usdImaging/pointInstancerAdapter.h
index d41897d8be..fcc4c6d22c 100644
--- a/pxr/usdImaging/usdImaging/pointInstancerAdapter.h
+++ b/pxr/usdImaging/usdImaging/pointInstancerAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_POINT_INSTANCER_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_POINT_INSTANCER_ADAPTER_H
@@ -226,6 +209,8 @@ class UsdImagingPointInstancerAdapter : public UsdImagingInstanceablePrimAdapter
                                   UsdTimeCode time) const override;
 
     USDIMAGING_API
+    bool IsChildPath(const SdfPath& path) const override;
+
     bool GetVisible(UsdPrim const& prim, 
                     SdfPath const& cachePath,
                     UsdTimeCode time) const override;
diff --git a/pxr/usdImaging/usdImaging/pointsAdapter.cpp b/pxr/usdImaging/usdImaging/pointsAdapter.cpp
index df41381c06..9b3b9819e2 100644
--- a/pxr/usdImaging/usdImaging/pointsAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/pointsAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/pointsAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/pointsAdapter.h b/pxr/usdImaging/usdImaging/pointsAdapter.h
index 05742caafe..29e8a641ca 100644
--- a/pxr/usdImaging/usdImaging/pointsAdapter.h
+++ b/pxr/usdImaging/usdImaging/pointsAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_POINTS_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_POINTS_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/portalLightAdapter.cpp b/pxr/usdImaging/usdImaging/portalLightAdapter.cpp
index 0f958eb684..0f1e05eebc 100644
--- a/pxr/usdImaging/usdImaging/portalLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/portalLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/portalLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/portalLightAdapter.h b/pxr/usdImaging/usdImaging/portalLightAdapter.h
index e536d5759c..9472a40b23 100644
--- a/pxr/usdImaging/usdImaging/portalLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/portalLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PORTAL_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_PORTAL_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/primAdapter.cpp b/pxr/usdImaging/usdImaging/primAdapter.cpp
index 742bc0aa03..c587c372ba 100644
--- a/pxr/usdImaging/usdImaging/primAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/primAdapter.cpp
@@ -1,28 +1,13 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/primAdapter.h"
 
+#include "pxr/base/gf/interval.h"
+#include "pxr/usd/usd/attribute.h"
 #include "pxr/usdImaging/usdImaging/dataSourcePrim.h"
 #include "pxr/usdImaging/usdImaging/debugCodes.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
@@ -46,6 +31,8 @@
 #include "pxr/base/tf/staticTokens.h"
 #include "pxr/base/tf/type.h"
 
+#include <algorithm>
+#include <cstddef>
 #include <vector>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -413,6 +400,40 @@ UsdImagingPrimAdapter::GetInstancerPrototypes(
     return SdfPathVector();
 }
 
+static void
+_GetTimeSamplesForInterval(
+    const UsdAttribute& attr,
+    const GfInterval& interval,
+    std::vector<double>* timeSamples)
+{
+    // Start with the times that fall within the interval
+    attr.GetTimeSamplesInInterval(interval, timeSamples);
+    // Add bracketing sample times for the leading and trailing edges of the
+    // interval.
+    double first, ignore, last;
+    bool hasFirst, hasLast;
+    // If hasFirst/hasLast comes back false for an edge, or if both the left and
+    // right bracketing times for the edge are the same, it means there's no
+    // bracketing sample time anywhere beyond that edge, so we fall back to the
+    // interval's edge.
+    attr.GetBracketingTimeSamples(interval.GetMin(), &first, &ignore, &hasFirst);
+    if (!hasFirst || first == ignore) {
+        first = interval.GetMin();
+    }
+    attr.GetBracketingTimeSamples(interval.GetMax(), &ignore, &last, &hasLast);
+    if (!hasLast || last == ignore ) {
+        last = interval.GetMax();
+    }
+    // Add the bracketing sample times only if they actually fall outside the
+    // interval. This maintains ordering and uniqueness.
+    if (timeSamples->empty() || first < timeSamples->front()) {
+        timeSamples->insert(timeSamples->begin(), first);    
+    }
+    if (last > timeSamples->back()) {
+        timeSamples->insert(timeSamples->end(), last);
+    }
+}
+
 /*virtual*/
 size_t
 UsdImagingPrimAdapter::SamplePrimvar(
@@ -440,19 +461,35 @@ UsdImagingPrimAdapter::SamplePrimvar(
     std::vector<double> timeSamples;
 
     if (pv && pv.HasValue()) {
-        if (pv.ValueMightBeTimeVarying()) {
-            pv.GetTimeSamplesInInterval(interval, &timeSamples);
-
-            // Add time samples at the boundary conditions
-            timeSamples.push_back(interval.GetMin());
-            timeSamples.push_back(interval.GetMax());
-
-            // Sort here
-            std::sort(timeSamples.begin(), timeSamples.end());
-            timeSamples.erase(
-                std::unique(timeSamples.begin(), 
-                    timeSamples.end()), 
+        if (pv.ValueMightBeTimeVarying()) { 
+            // Start with the contributing times for value, including any
+            // contributing bracketing times.
+            _GetTimeSamplesForInterval(pv.GetAttr(), interval, &timeSamples);
+            // Only include times derived from the indices if the caller wants
+            // the indices separately. Otherwise we'll use ComputeFlattened, and
+            // the only times we need for that are the ones with authored value.
+            if (sampleIndices && pv.IsIndexed()) {
+                // Index changes during the interval that fall on times with no
+                // authored value are important, so we need to add the sample
+                // times due to indices. We don't need bracketing times though
+                // because indices never interpolate.
+                std::vector<double> indicesTimeSamples;
+                pv.GetIndicesAttr().GetTimeSamplesInInterval(
+                    interval, &indicesTimeSamples);
+                // Combine them, merge and uniquify
+                const size_t mid = timeSamples.size();
+                timeSamples.insert(
+                    timeSamples.end(),
+                    indicesTimeSamples.begin(), indicesTimeSamples.end());
+                // since both sets are already sorted, inplace_merge beats sort
+                std::inplace_merge(
+                    timeSamples.begin(),
+                    timeSamples.begin() + mid,
+                    timeSamples.end());
+                timeSamples.erase(
+                    std::unique(timeSamples.begin(), timeSamples.end()), 
                     timeSamples.end());
+            }
 
             size_t numSamples = timeSamples.size();
 
@@ -497,18 +534,7 @@ UsdImagingPrimAdapter::SamplePrimvar(
     // are considered primvars by Hydra but non-primvar attributes by USD.
     if (UsdAttribute attr = usdPrim.GetAttribute(key)) {
         if (attr.ValueMightBeTimeVarying()) {
-            attr.GetTimeSamplesInInterval(interval, &timeSamples);
-    
-            // Add time samples at the boudary conditions
-            timeSamples.push_back(interval.GetMin());
-            timeSamples.push_back(interval.GetMax());
-
-            // Sort here
-            std::sort(timeSamples.begin(), timeSamples.end());
-            timeSamples.erase(
-                std::unique(timeSamples.begin(), 
-                    timeSamples.end()), 
-                    timeSamples.end());
+            _GetTimeSamplesForInterval(attr, interval, &timeSamples);
 
             size_t numSamples = timeSamples.size();
 
@@ -939,12 +965,16 @@ UsdImagingPrimAdapter::_MergePrimvar(
     bool indexed) const
 {
     HdPrimvarDescriptor primvar(name, interp, role, indexed);
-    HdPrimvarDescriptorVector::iterator it =
-        std::find(vec->begin(), vec->end(), primvar);
-    if (it == vec->end())
-        vec->push_back(primvar);
-    else
-        *it = primvar;
+
+    for (HdPrimvarDescriptorVector::iterator it = vec->begin();
+        it != vec->end(); ++it) {
+        if (it->name == name) {
+            *it =  primvar;
+            return;
+        }
+    }
+
+    vec->push_back(primvar);
 }
 
 void
diff --git a/pxr/usdImaging/usdImaging/primAdapter.h b/pxr/usdImaging/usdImaging/primAdapter.h
index 6101ddd8e6..befc919507 100644
--- a/pxr/usdImaging/usdImaging/primAdapter.h
+++ b/pxr/usdImaging/usdImaging/primAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PRIM_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_PRIM_ADAPTER_H
@@ -494,7 +477,7 @@ class UsdImagingPrimAdapter
     void SetDelegate(UsdImagingDelegate* delegate);
 
     USDIMAGING_API
-    bool IsChildPath(SdfPath const& path) const;
+    virtual bool IsChildPath(const SdfPath& path) const;
     
     /// Returns true if the given prim is visible, taking into account inherited
     /// visibility values. Inherited values are strongest, Usd has no notion of
diff --git a/pxr/usdImaging/usdImaging/primvarDescCache.cpp b/pxr/usdImaging/usdImaging/primvarDescCache.cpp
index 27980d3a94..e8de231bbf 100644
--- a/pxr/usdImaging/usdImaging/primvarDescCache.cpp
+++ b/pxr/usdImaging/usdImaging/primvarDescCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/primvarDescCache.h"
 
diff --git a/pxr/usdImaging/usdImaging/primvarDescCache.h b/pxr/usdImaging/usdImaging/primvarDescCache.h
index 7f376b725d..304c6b67e9 100644
--- a/pxr/usdImaging/usdImaging/primvarDescCache.h
+++ b/pxr/usdImaging/usdImaging/primvarDescCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PRIMVARDESC_CACHE_H
 #define PXR_USD_IMAGING_USD_IMAGING_PRIMVARDESC_CACHE_H
diff --git a/pxr/usdImaging/usdImaging/primvarUtils.cpp b/pxr/usdImaging/usdImaging/primvarUtils.cpp
index 23e5d4eb39..4076e6ccfa 100644
--- a/pxr/usdImaging/usdImaging/primvarUtils.cpp
+++ b/pxr/usdImaging/usdImaging/primvarUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/primvarUtils.h"
 
diff --git a/pxr/usdImaging/usdImaging/primvarUtils.h b/pxr/usdImaging/usdImaging/primvarUtils.h
index d1d50f1678..34f1999380 100644
--- a/pxr/usdImaging/usdImaging/primvarUtils.h
+++ b/pxr/usdImaging/usdImaging/primvarUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_PRIMVAR_UTILS_H
 #define PXR_USD_IMAGING_USD_IMAGING_PRIMVAR_UTILS_H
diff --git a/pxr/usdImaging/usdImaging/rectLightAdapter.cpp b/pxr/usdImaging/usdImaging/rectLightAdapter.cpp
index f6af565db9..2c85898e60 100644
--- a/pxr/usdImaging/usdImaging/rectLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/rectLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/rectLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/rectLightAdapter.h b/pxr/usdImaging/usdImaging/rectLightAdapter.h
index e7740d35e5..628115fd60 100644
--- a/pxr/usdImaging/usdImaging/rectLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/rectLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_RECT_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_RECT_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/renderPassAdapter.cpp b/pxr/usdImaging/usdImaging/renderPassAdapter.cpp
new file mode 100644
index 0000000000..730b747f37
--- /dev/null
+++ b/pxr/usdImaging/usdImaging/renderPassAdapter.cpp
@@ -0,0 +1,158 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/usdImaging/usdImaging/renderPassAdapter.h"
+#include "pxr/usdImaging/usdImaging/dataSourceRenderPrims.h"
+#include "pxr/usdImaging/usdImaging/delegate.h"
+#include "pxr/usdImaging/usdImaging/indexProxy.h"
+#include "pxr/usdImaging/usdImaging/tokens.h"
+
+#include "pxr/imaging/hd/tokens.h"
+
+#include "pxr/usd/usdRender/pass.h"
+
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    typedef UsdImagingRenderPassAdapter Adapter;
+    TfType t = TfType::Define<Adapter, TfType::Bases<Adapter::BaseAdapter> >();
+    t.SetFactory< UsdImagingPrimAdapterFactory<Adapter> >();
+}
+
+UsdImagingRenderPassAdapter::~UsdImagingRenderPassAdapter() 
+{
+}
+
+// -------------------------------------------------------------------------- //
+// 2.0 Prim adapter API
+// -------------------------------------------------------------------------- //
+
+TfTokenVector
+UsdImagingRenderPassAdapter::GetImagingSubprims(UsdPrim const& prim)
+{
+    return { TfToken() };
+}
+
+TfToken
+UsdImagingRenderPassAdapter::GetImagingSubprimType(
+    UsdPrim const& prim,
+    TfToken const& subprim)
+{
+    if (subprim.IsEmpty()) {
+        return HdPrimTypeTokens->renderPass;
+    }
+    return TfToken();
+}
+
+HdContainerDataSourceHandle
+UsdImagingRenderPassAdapter::GetImagingSubprimData(
+    UsdPrim const& prim,
+    TfToken const& subprim,
+    const UsdImagingDataSourceStageGlobals &stageGlobals)
+{
+    if (subprim.IsEmpty()) {
+        return UsdImagingDataSourceRenderPassPrim::New(
+                    prim.GetPath(), prim, stageGlobals);
+    }
+
+    return nullptr;
+}
+
+HdDataSourceLocatorSet
+UsdImagingRenderPassAdapter::InvalidateImagingSubprim(
+    UsdPrim const& prim,
+    TfToken const& subprim,
+    TfTokenVector const& properties,
+    const UsdImagingPropertyInvalidationType invalidationType)
+{
+    if (subprim.IsEmpty()) {
+        return UsdImagingDataSourceRenderPassPrim::Invalidate(
+            prim, subprim, properties, invalidationType);
+    }
+
+    return HdDataSourceLocatorSet();
+}
+
+// -------------------------------------------------------------------------- //
+// 1.0 Prim adapter API
+// -------------------------------------------------------------------------- //
+
+bool
+UsdImagingRenderPassAdapter::IsSupported(
+    UsdImagingIndexProxy const* index) const
+{
+    // Note that we do not plan to implement render pass prims for Hydra 1.0.
+    return false;
+}
+
+SdfPath
+UsdImagingRenderPassAdapter::Populate(
+    UsdPrim const& prim, 
+    UsdImagingIndexProxy* index,
+    UsdImagingInstancerContext const* instancerContext)
+{
+    return SdfPath();
+}
+
+void
+UsdImagingRenderPassAdapter::_RemovePrim(
+    SdfPath const& cachePath,
+    UsdImagingIndexProxy* index)
+{
+}
+
+void 
+UsdImagingRenderPassAdapter::TrackVariability(
+    UsdPrim const& prim,
+    SdfPath const& cachePath,
+    HdDirtyBits* timeVaryingBits,
+    UsdImagingInstancerContext const* instancerContext) const
+{
+}
+
+void 
+UsdImagingRenderPassAdapter::UpdateForTime(
+    UsdPrim const& prim,
+    SdfPath const& cachePath, 
+    UsdTimeCode time,
+    HdDirtyBits requestedBits,
+    UsdImagingInstancerContext const* 
+    instancerContext) const
+{
+}
+
+HdDirtyBits
+UsdImagingRenderPassAdapter::ProcessPropertyChange(
+    UsdPrim const& prim,
+    SdfPath const& cachePath, 
+    TfToken const& propertyName)
+{
+    return HdDirtyBits();
+}
+
+void
+UsdImagingRenderPassAdapter::MarkDirty(
+    UsdPrim const& prim,
+    SdfPath const& cachePath,
+    HdDirtyBits dirty,
+    UsdImagingIndexProxy* index)
+{
+}
+
+VtValue
+UsdImagingRenderPassAdapter::Get(
+    UsdPrim const& prim,
+    SdfPath const& cachePath,
+    TfToken const& key,
+    UsdTimeCode time,
+    VtIntArray *outIndices) const
+{
+    return VtValue();
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdImaging/renderPassAdapter.h b/pxr/usdImaging/usdImaging/renderPassAdapter.h
new file mode 100644
index 0000000000..92a1f2f107
--- /dev/null
+++ b/pxr/usdImaging/usdImaging/renderPassAdapter.h
@@ -0,0 +1,130 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_USD_IMAGING_USD_IMAGING_RENDER_PASS_ADAPTER_H
+#define PXR_USD_IMAGING_USD_IMAGING_RENDER_PASS_ADAPTER_H
+
+/// \file usdImaging/renderPassAdapter.h
+
+#include "pxr/pxr.h"
+#include "pxr/usdImaging/usdImaging/api.h"
+#include "pxr/usdImaging/usdImaging/primAdapter.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class UsdImagingRenderPassAdapter
+///
+/// Delegate support for UsdRenderPass.
+///
+class UsdImagingRenderPassAdapter : public UsdImagingPrimAdapter
+{
+public:
+    using BaseAdapter = UsdImagingPrimAdapter;
+
+    UsdImagingRenderPassAdapter()
+        : UsdImagingPrimAdapter()
+    {}
+
+    USDIMAGING_API
+    ~UsdImagingRenderPassAdapter() override;
+
+    // ---------------------------------------------------------------------- //
+    /// \name Scene Index Support
+    // ---------------------------------------------------------------------- //
+
+    USDIMAGING_API
+    TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;
+
+    USDIMAGING_API
+    TfToken GetImagingSubprimType(
+            UsdPrim const& prim,
+            TfToken const& subprim) override;
+
+    USDIMAGING_API
+    HdContainerDataSourceHandle GetImagingSubprimData(
+            UsdPrim const& prim,
+            TfToken const& subprim,
+            const UsdImagingDataSourceStageGlobals &stageGlobals) override;
+
+    USDIMAGING_API
+    HdDataSourceLocatorSet InvalidateImagingSubprim(
+            UsdPrim const& prim,
+            TfToken const& subprim,
+            TfTokenVector const& properties,
+            UsdImagingPropertyInvalidationType invalidationType) override;
+
+    // ---------------------------------------------------------------------- //
+    /// \name Initialization
+    // ---------------------------------------------------------------------- //
+
+    USDIMAGING_API
+    SdfPath Populate(UsdPrim const& prim,
+                     UsdImagingIndexProxy* index,
+                     UsdImagingInstancerContext const*
+                     instancerContext = nullptr) override;
+
+    USDIMAGING_API
+    bool IsSupported(UsdImagingIndexProxy const* index) const override;
+
+    // ---------------------------------------------------------------------- //
+    /// \name Parallel Setup and Resolve
+    // ---------------------------------------------------------------------- //
+
+    /// Thread Safe.
+    USDIMAGING_API
+    void TrackVariability(UsdPrim const& prim,
+                          SdfPath const& cachePath,
+                          HdDirtyBits* timeVaryingBits,
+                          UsdImagingInstancerContext const* 
+                          instancerContext = nullptr) const override;
+
+
+    /// Thread Safe.
+    USDIMAGING_API
+    void UpdateForTime(UsdPrim const& prim,
+                       SdfPath const& cachePath,
+                       UsdTimeCode time,
+                       HdDirtyBits requestedBits,
+                       UsdImagingInstancerContext const* 
+                       instancerContext = nullptr) const override;
+
+    // ---------------------------------------------------------------------- //
+    /// \name Change Processing 
+    // ---------------------------------------------------------------------- //
+
+    /// Returns a bit mask of attributes to be udpated, or
+    /// HdChangeTracker::AllDirty if the entire prim must be resynchronized.
+    USDIMAGING_API
+    HdDirtyBits ProcessPropertyChange(UsdPrim const& prim,
+                                      SdfPath const& cachePath,
+                                      TfToken const& propertyName) override;
+
+    USDIMAGING_API
+    void MarkDirty(UsdPrim const& prim,
+                   SdfPath const& cachePath,
+                   HdDirtyBits dirty,
+                   UsdImagingIndexProxy* index) override;
+
+    // ---------------------------------------------------------------------- //
+    /// \name Data access
+    // ---------------------------------------------------------------------- //
+
+    USDIMAGING_API
+    VtValue Get(UsdPrim const& prim,
+                SdfPath const& cachePath,
+                TfToken const& key,
+                UsdTimeCode time,
+                VtIntArray *outIndices) const override;
+
+protected:
+    USDIMAGING_API
+    void _RemovePrim(SdfPath const& cachePath,
+                     UsdImagingIndexProxy* index) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_USD_IMAGING_USD_IMAGING_RENDER_PASS_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/renderProductAdapter.cpp b/pxr/usdImaging/usdImaging/renderProductAdapter.cpp
index c6ae6e8b02..52d7f28010 100644
--- a/pxr/usdImaging/usdImaging/renderProductAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/renderProductAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/renderProductAdapter.h"
 #include "pxr/usdImaging/usdImaging/dataSourceRenderPrims.h"
@@ -106,7 +89,10 @@ bool
 UsdImagingRenderProductAdapter::IsSupported(
     UsdImagingIndexProxy const* index) const
 {
-    return false;
+    // Since we flatten products and vars into the targeting settings prim, 1.0
+    // render delegates won't typically support render product prims as such.
+    // Return true to supress warnings that the prim type isn't supported.
+    return true;
 }
 
 SdfPath
diff --git a/pxr/usdImaging/usdImaging/renderProductAdapter.h b/pxr/usdImaging/usdImaging/renderProductAdapter.h
index 9efb249486..51509b3848 100644
--- a/pxr/usdImaging/usdImaging/renderProductAdapter.h
+++ b/pxr/usdImaging/usdImaging/renderProductAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_RENDER_PRODUCT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_RENDER_PRODUCT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/renderSettingsAdapter.cpp b/pxr/usdImaging/usdImaging/renderSettingsAdapter.cpp
index 0d60f2ba58..185158a32a 100644
--- a/pxr/usdImaging/usdImaging/renderSettingsAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/renderSettingsAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/renderSettingsAdapter.h"
 #include "pxr/usdImaging/usdImaging/dataSourceRenderPrims.h"
@@ -232,8 +215,7 @@ UsdImagingRenderSettingsAdapter::UpdateForTime(
     SdfPath const& cachePath, 
     UsdTimeCode time,
     HdDirtyBits requestedBits,
-    UsdImagingInstancerContext const* 
-    instancerContext) const
+    UsdImagingInstancerContext const* instancerContext) const
 {
 }
 
diff --git a/pxr/usdImaging/usdImaging/renderSettingsAdapter.h b/pxr/usdImaging/usdImaging/renderSettingsAdapter.h
index 5eb9a0b92a..5f68ac26ee 100644
--- a/pxr/usdImaging/usdImaging/renderSettingsAdapter.h
+++ b/pxr/usdImaging/usdImaging/renderSettingsAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_RENDER_SETTINGS_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_RENDER_SETTINGS_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.cpp b/pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.cpp
index e0272b3785..dfbdbed9c1 100644
--- a/pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.h b/pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.h
index 753fa221ad..bf0dfe12b9 100644
--- a/pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/renderSettingsFlatteningSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_USD_IMAGING_USD_IMAGING_RENDER_SETTINGS_FLATTENING_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_RENDER_SETTINGS_FLATTENING_SCENE_INDEX_H
 
diff --git a/pxr/usdImaging/usdImaging/renderVarAdapter.cpp b/pxr/usdImaging/usdImaging/renderVarAdapter.cpp
index a359342144..c7d94b8a15 100644
--- a/pxr/usdImaging/usdImaging/renderVarAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/renderVarAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or var names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//`
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/renderVarAdapter.h"
 #include "pxr/usdImaging/usdImaging/dataSourceRenderPrims.h"
@@ -99,7 +82,7 @@ UsdImagingRenderVarAdapter::InvalidateImagingSubprim(
 // -------------------------------------------------------------------------- //
 // 1.0 Prim adapter API
 //
-// \note No hydra prims are added/managed for UsdRenderProduct prims.
+// \note No hydra prims are added/managed for UsdRenderVar prims.
 //       UsdImagingRenderSettingsAdapter handles the flattening of
 //       targeted products and vars.
 // -------------------------------------------------------------------------- //
@@ -108,7 +91,10 @@ bool
 UsdImagingRenderVarAdapter::IsSupported(
     UsdImagingIndexProxy const* index) const
 {
-    return false;
+    // Since we flatten products and vars into the targeting settings prim, 1.0
+    // render delegates won't typically support render var prims as such.
+    // Return true to supress warnings that the prim type isn't supported.
+    return true;
 }
 
 SdfPath
diff --git a/pxr/usdImaging/usdImaging/renderVarAdapter.h b/pxr/usdImaging/usdImaging/renderVarAdapter.h
index e05fac0c39..06241dadf1 100644
--- a/pxr/usdImaging/usdImaging/renderVarAdapter.h
+++ b/pxr/usdImaging/usdImaging/renderVarAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_RENDER_VAR_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_RENDER_VAR_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.cpp b/pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.cpp
index a87e521858..54d189c9f2 100644
--- a/pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.h"
@@ -34,6 +17,12 @@ TF_REGISTRY_FUNCTION(TfType)
     // No factory here, UsdImagingRepresentedByAncestorPrimAdapter is abstract.
 }
 
+TfTokenVector
+UsdImagingRepresentedByAncestorPrimAdapter::GetImagingSubprims(UsdPrim const& prim)
+{
+    return TfTokenVector();
+}
+
 UsdImagingPrimAdapter::PopulationMode
 UsdImagingRepresentedByAncestorPrimAdapter::GetPopulationMode()
 {
@@ -58,4 +47,4 @@ UsdImagingRepresentedByAncestorPrimAdapter::ProcessPropertyChange(
     return HdChangeTracker::Clean;
 }
 
-PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.h b/pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.h
index 57e53b9178..9474faa8c1 100644
--- a/pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.h
+++ b/pxr/usdImaging/usdImaging/representedByAncestorPrimAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_REPRESENTED_BY_ANCESTOR_PRIM_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_REPRESENTED_BY_ANCESTOR_PRIM_ADAPTER_H
@@ -52,6 +35,7 @@ class UsdImagingRepresentedByAncestorPrimAdapter : public UsdImagingPrimAdapter
     /// \name Scene Index Support
     // ---------------------------------------------------------------------- //
 
+    TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;
     PopulationMode GetPopulationMode() override;
 
     // ---------------------------------------------------------------------- //
diff --git a/pxr/usdImaging/usdImaging/rerootingSceneIndex.cpp b/pxr/usdImaging/usdImaging/rerootingSceneIndex.cpp
index 5d944208bb..5d57862e2a 100644
--- a/pxr/usdImaging/usdImaging/rerootingSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/rerootingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/rerootingSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/rerootingSceneIndex.h b/pxr/usdImaging/usdImaging/rerootingSceneIndex.h
index 214f976d89..cb2812e7bb 100644
--- a/pxr/usdImaging/usdImaging/rerootingSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/rerootingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_REROOTING_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_REROOTING_SCENE_INDEX_H
diff --git a/pxr/usdImaging/usdImaging/resolvedAttributeCache.cpp b/pxr/usdImaging/usdImaging/resolvedAttributeCache.cpp
index 6ef3543c2d..874a43b35d 100644
--- a/pxr/usdImaging/usdImaging/resolvedAttributeCache.cpp
+++ b/pxr/usdImaging/usdImaging/resolvedAttributeCache.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/resolvedAttributeCache.h"
 
diff --git a/pxr/usdImaging/usdImaging/resolvedAttributeCache.h b/pxr/usdImaging/usdImaging/resolvedAttributeCache.h
index 0e2e024ad2..df4a7eac73 100644
--- a/pxr/usdImaging/usdImaging/resolvedAttributeCache.h
+++ b/pxr/usdImaging/usdImaging/resolvedAttributeCache.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_RESOLVED_ATTRIBUTE_CACHE_H
 #define PXR_USD_IMAGING_USD_IMAGING_RESOLVED_ATTRIBUTE_CACHE_H
@@ -297,9 +280,23 @@ class UsdImaging_ResolvedAttributeCache
             , version(version_)
         { }
 
+        _Entry(const _Entry &other)
+            : query(other.query)
+            , value(other.value)
+        {
+            version.store(other.version.load());
+        }
+
+        _Entry(_Entry &&other)
+            : query(std::move(other.query))
+            , value(std::move(other.value))
+        {
+            version.store(other.version.load());
+        }
+
         query_type query;
         value_type value;
-        tbb::atomic<unsigned> version;
+        std::atomic<unsigned> version;
     };
 
     // Returns the version number for a valid cache entry
@@ -339,7 +336,7 @@ class UsdImaging_ResolvedAttributeCache
 
     // A serial number indicating the valid state of entries in the cache. When
     // an entry has an equal or greater value, the entry is valid.
-    tbb::atomic<unsigned> _cacheVersion;
+    std::atomic<unsigned> _cacheVersion;
 
     // Value overrides for a set of descendents.
     ValueOverridesMap _valueOverrides;
@@ -358,7 +355,7 @@ UsdImaging_ResolvedAttributeCache<Strategy,ImplData>::_SetCacheEntryForPrim(
     // Note: _cacheVersion is not allowed to change during cache access.
     unsigned v = entry->version;
     if (v < _cacheVersion 
-        && entry->version.compare_and_swap(_cacheVersion, v) == v)
+        && entry->version.compare_exchange_strong(v,_cacheVersion.load()))
     {
         entry->value = value;
         entry->version = _GetValidVersion();
@@ -378,7 +375,7 @@ typename UsdImaging_ResolvedAttributeCache<Strategy, ImplData>::_Entry*
 UsdImaging_ResolvedAttributeCache<Strategy, ImplData>::_GetCacheEntryForPrim(
     const UsdPrim &prim) const
 {
-    typename _CacheMap::const_iterator it = _cache.find(prim);
+    typename _CacheMap::iterator it = _cache.find(prim);
     if (it != _cache.end()) {
         return &it->second;
     }
diff --git a/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.cpp b/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.cpp
index 0c458331e5..a6c091fa15 100644
--- a/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/rootOverridesSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.h b/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.h
index 864fceb4f5..d5939f0416 100644
--- a/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/rootOverridesSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_ROOT_OVERRIDES_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_ROOT_OVERRIDES_SCENE_INDEX_H
diff --git a/pxr/usdImaging/usdImaging/sceneIndices.cpp b/pxr/usdImaging/usdImaging/sceneIndices.cpp
index b326517541..8f223910fc 100644
--- a/pxr/usdImaging/usdImaging/sceneIndices.cpp
+++ b/pxr/usdImaging/usdImaging/sceneIndices.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/sceneIndices.h"
 
@@ -43,6 +26,7 @@
 #include "pxr/imaging/hd/retainedDataSource.h"
 #include "pxr/imaging/hd/tokens.h"
 #include "pxr/imaging/hd/purposeSchema.h"
+#include "pxr/imaging/hd/sceneIndexUtil.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -78,6 +62,20 @@ _ExtentResolvingSceneIndexInputArgs()
                 purposeDataSources));
 }
 
+static
+std::string
+_GetStageName(UsdStageRefPtr const &stage)
+{
+    if (!stage) {
+        return {};
+    }
+    SdfLayerHandle const rootLayer = stage->GetRootLayer();
+    if (!rootLayer) {
+        return {};
+    }
+    return rootLayer->GetIdentifier();
+}
+
 UsdImagingSceneIndices
 UsdImagingCreateSceneIndices(
     const UsdImagingCreateSceneIndicesInfo &createInfo)
@@ -176,6 +174,12 @@ UsdImagingCreateSceneIndices(
     sceneIndex =
         UsdImagingRenderSettingsFlatteningSceneIndex::New(sceneIndex);
 
+    if (TfGetEnvSetting<bool>(HD_USE_ENCAPSULATING_SCENE_INDICES)) {
+        sceneIndex = HdMakeEncapsulatingSceneIndex({}, sceneIndex);
+        sceneIndex->SetDisplayName(
+            "UsdImaging " + _GetStageName(createInfo.stage));
+    }
+
     result.finalSceneIndex = sceneIndex;
 
     return result;
diff --git a/pxr/usdImaging/usdImaging/sceneIndices.h b/pxr/usdImaging/usdImaging/sceneIndices.h
index c1e4401928..aa005c39ee 100644
--- a/pxr/usdImaging/usdImaging/sceneIndices.h
+++ b/pxr/usdImaging/usdImaging/sceneIndices.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_SCENE_INDICES_H
 #define PXR_USD_IMAGING_USD_IMAGING_SCENE_INDICES_H
diff --git a/pxr/usdImaging/usdImaging/selectionSceneIndex.cpp b/pxr/usdImaging/usdImaging/selectionSceneIndex.cpp
index ea1ee7c933..8370c46380 100644
--- a/pxr/usdImaging/usdImaging/selectionSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/selectionSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/selectionSceneIndex.h"
 
@@ -626,7 +609,7 @@ _AppendNameToSceneIndexPrimsAndInstanceIndices(
 //     }
 // }
 //
-// The NI and PI prototype progating scene indices turn this into:
+// The NI and PI prototype propagating scene indices turn this into:
 //
 // /MyInstancer
 //     primType: instancer
@@ -709,7 +692,7 @@ _AppendNameToSceneIndexPrimsAndInstanceIndices(
 //    uniform token[] xformOpOrder = ["xformOp:translate"]
 // }
 //
-// The NI and PI prototype progating scene indices turn this into:
+// The NI and PI prototype propagating scene indices turn this into:
 //
 // /Instance1
 //     primType: ""
@@ -746,7 +729,7 @@ _AppendNameToSceneIndexPrimsAndInstanceIndices(
 //     nestedInstanceIndices: [
 //         instancer: /UsdNiPropagatedPrototypes/NoPrimvars_NoMaterialBindings/__Prototype_1/UsdNiInstancer
 //         prototypeIndex: 0
-//         instanceIndices: [ 0, 1 ]
+//         instanceIndices: [ 0 ]
 //
 // Next, we process Cube from /Instance1/Cube. Since
 // /UsdNiPropagatedPrototypes/NoPrimvars_NoMaterialBindings/__Prototype_1/UsdNiInstancer/UsdNiPrototype/cube
@@ -756,7 +739,7 @@ _AppendNameToSceneIndexPrimsAndInstanceIndices(
 //     nestedInstanceIndices: [
 //         instancer: /UsdNiPropagatedPrototypes/NoPrimvars_NoMaterialBindings/__Prototype_1/UsdNiInstancer
 //         prototypeIndex: 0
-//         instanceIndices: [ 0, 1 ]
+//         instanceIndices: [ 0 ]
 //
 std::vector<_PrimAndNestedInstanceIndices>
 _ComputeSceneIndexPrimsAndInstanceIndices(
@@ -787,9 +770,9 @@ _ComputeSceneIndexPrimsAndInstanceIndices(
     }
 
     TF_DEBUG(USDIMAGING_SELECTION).Msg(
-        "    Traversing ancestors of usdPath\n");
+        "    Traversing descendants of usdPath %s\n", usdPath.GetText());
 
-    // Now add all namespace ancestors of the paths we determined.
+    // Now add all namespace descendants of the paths we determined.
     size_t i = 0;
     while (i < result.size()) {
         TF_DEBUG(USDIMAGING_SELECTION).Msg(
diff --git a/pxr/usdImaging/usdImaging/selectionSceneIndex.h b/pxr/usdImaging/usdImaging/selectionSceneIndex.h
index fb45a11ff2..646c89e6bc 100644
--- a/pxr/usdImaging/usdImaging/selectionSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/selectionSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_SELECTION_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_SELECTION_SCENE_INDEX_H
diff --git a/pxr/usdImaging/usdImaging/sphereAdapter.cpp b/pxr/usdImaging/usdImaging/sphereAdapter.cpp
index 1d446f2006..01da10bf2b 100644
--- a/pxr/usdImaging/usdImaging/sphereAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/sphereAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/sphereAdapter.h"
 
diff --git a/pxr/usdImaging/usdImaging/sphereAdapter.h b/pxr/usdImaging/usdImaging/sphereAdapter.h
index 5b428b45fb..382febada5 100644
--- a/pxr/usdImaging/usdImaging/sphereAdapter.h
+++ b/pxr/usdImaging/usdImaging/sphereAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_SPHERE_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_SPHERE_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/sphereLightAdapter.cpp b/pxr/usdImaging/usdImaging/sphereLightAdapter.cpp
index 17fb39eaa2..2dcef20265 100644
--- a/pxr/usdImaging/usdImaging/sphereLightAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/sphereLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/sphereLightAdapter.h"
 #include "pxr/usdImaging/usdImaging/delegate.h"
diff --git a/pxr/usdImaging/usdImaging/sphereLightAdapter.h b/pxr/usdImaging/usdImaging/sphereLightAdapter.h
index 1489914b72..13faef05f4 100644
--- a/pxr/usdImaging/usdImaging/sphereLightAdapter.h
+++ b/pxr/usdImaging/usdImaging/sphereLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_SPHERE_LIGHT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_SPHERE_LIGHT_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/stageSceneIndex.cpp b/pxr/usdImaging/usdImaging/stageSceneIndex.cpp
index 5f781efc8a..6b06799293 100644
--- a/pxr/usdImaging/usdImaging/stageSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/stageSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/stageSceneIndex.h"
 
@@ -261,6 +244,9 @@ UsdImagingStageSceneIndex::GetPrim(const SdfPath &path) const
     if (prim.IsInstanceProxy()) {
         return s_emptyPrim;
     }
+    if (!_GetPrimPredicate()(prim)) {
+        return s_emptyPrim;
+    }
 
     const TfToken subprim =
         path.IsPropertyPath() ? path.GetNameToken() : TfToken();
@@ -312,7 +298,7 @@ UsdImagingStageSceneIndex::GetChildPrimPaths(
             entry.primAdapter->GetPopulationMode() ==
                 UsdImagingPrimAdapter::RepresentsSelfAndDescendents)) {
         UsdPrimSiblingRange range =
-            prim.GetFilteredChildren(_GetTraversalPredicate());
+            prim.GetFilteredChildren(_GetPrimPredicate());
         for (const UsdPrim &child: range) {
             result.push_back(child.GetPath());
         }
@@ -410,7 +396,7 @@ void UsdImagingStageSceneIndex::_PopulateSubtree(UsdPrim subtreeRoot)
     HdSceneIndexObserver::AddedPrimEntries addedPrims;
     size_t lastEnd = 0;
 
-    UsdPrimRange range(subtreeRoot, _GetTraversalPredicate());
+    UsdPrimRange range(subtreeRoot, _GetPrimPredicate());
 
     for (auto it = range.begin(); it != range.end(); ++it) {
         const UsdPrim &prim = *it;
@@ -460,8 +446,8 @@ void UsdImagingStageSceneIndex::_PopulateSubtree(UsdPrim subtreeRoot)
     _SendPrimsAdded(addedPrims);
 }
 
-Usd_PrimFlagsConjunction
-UsdImagingStageSceneIndex::_GetTraversalPredicate() const
+Usd_PrimFlagsPredicate
+UsdImagingStageSceneIndex::_GetPrimPredicate() const
 {
     // Note that it differs from the UsdPrimDefaultPredicate by not requiring
     // UsdPrimIsDefined. This way, we pick up instance and over's and their
@@ -518,7 +504,7 @@ UsdImagingStageSceneIndex::_OnUsdObjectsChanged(
             _usdPropertiesToResync[it->GetPrimPath()]
                 .push_back(it->GetNameToken());
             TF_DEBUG(USDIMAGING_CHANGES).Msg(
-                    " - Property update due to property resync queued: %s\n",
+                    " - Property resync queued: %s\n",
                     it->GetText());
         }
 
diff --git a/pxr/usdImaging/usdImaging/stageSceneIndex.h b/pxr/usdImaging/usdImaging/stageSceneIndex.h
index 0da7a58918..6fad935c82 100644
--- a/pxr/usdImaging/usdImaging/stageSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/stageSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_STAGE_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_STAGE_SCENE_INDEX_H
@@ -103,7 +86,7 @@ class UsdImagingStageSceneIndex : public HdSceneIndexBase
     USDIMAGING_API
     UsdImagingStageSceneIndex(HdContainerDataSourceHandle const &inputArgs);
 
-    Usd_PrimFlagsConjunction _GetTraversalPredicate() const;
+    Usd_PrimFlagsPredicate _GetPrimPredicate() const;
 
     void _ApplyPendingResyncs();
     void _ComputeDirtiedEntries(
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingDataSourceAttribute.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingDataSourceAttribute.cpp
index 4aa05e4a3c..44b8b81b79 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingDataSourceAttribute.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingDataSourceAttribute.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/dataSourceAttribute.h"
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegate.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegate.cpp
index e64563b571..ef5dc180ac 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegate.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/unitTestHelper.h"
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegate/shader1.glslfx b/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegate/shader1.glslfx
index 6966f25715..ddcf644051 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegate/shader1.glslfx
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegate/shader1.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegateChanges.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegateChanges.cpp
index 25403b7ba1..eecc0fb870 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegateChanges.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingDelegateChanges.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/unitTestHelper.h"
@@ -1364,7 +1347,7 @@ InstanceTransformTest()
     delegate->Populate(stage->GetPseudoRoot());
     delegate->SetTime(0);
     delegate->SyncAll(true);
-    tracker.MarkRprimClean(SdfPath("/geo_1.proto_cube_id0"));
+    tracker.MarkRprimClean(SdfPath("/geo_1/proto_cube_id0"));
 
     // Set /geo/cube transform to translate(0,4,0)
     UsdGeomXformable xf = UsdGeomXformable(stage->GetPrimAtPath(SdfPath("/geo/cube")));
@@ -1376,7 +1359,7 @@ InstanceTransformTest()
     delegate->SetTime(0);
 
     // Verify that /geo_1.cube_id0 has DirtyTransform
-    HdDirtyBits dirtyBits = tracker.GetRprimDirtyBits(SdfPath("/geo_1.proto_cube_id0"));
+    HdDirtyBits dirtyBits = tracker.GetRprimDirtyBits(SdfPath("/geo_1/proto_cube_id0"));
     TF_AXIOM(dirtyBits & HdChangeTracker::DirtyTransform);
     }
 
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingExcluded.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingExcluded.cpp
index d5a778d559..758b190f93 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingExcluded.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingExcluded.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/unitTestHelper.h"
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingMaterialBinding.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingMaterialBinding.cpp
index 61956291ee..acbc073224 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingMaterialBinding.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingMaterialBinding.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/errorMark.h"
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingNestedInstancingCategories.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingNestedInstancingCategories.cpp
index 03cffead04..4d483cfa9c 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingNestedInstancingCategories.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingNestedInstancingCategories.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/tf/errorMark.h"
@@ -105,7 +88,7 @@ TestNestedInstancingCategories()
                                     "/W/LiExBB.collection:lightLink"  } ),
         Instance("/W/B/B/Sphere", { "/W/ShExBA.collection:shadowLink" } ) };
 
-    const SdfPath protoPath = SdfPath("/__Prototype_1/A.proto_Sphere_id0");
+    const SdfPath protoPath = SdfPath("/__Prototype_1/A/proto_Sphere_id0");
     const SdfPath& instancerId = delegate->GetInstancerId(protoPath);
     const std::vector<VtTokenArray> instanceCategories = 
         delegate->GetInstanceCategories(instancerId);
@@ -151,4 +134,4 @@ main()
     } else {
         std::cout << "FAILED" << std::endl;
     }
-}
\ No newline at end of file
+}
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingPrimvarUtils.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingPrimvarUtils.cpp
index d41b3c3e87..d839655205 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingPrimvarUtils.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingPrimvarUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/primvarUtils.h"
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingRerootingSceneIndex.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingRerootingSceneIndex.cpp
index 32546f6f94..9f6eca3137 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingRerootingSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingRerootingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/rerootingSceneIndex.h"
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingRootPrim.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingRootPrim.cpp
index 55e728d87e..b016c58383 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingRootPrim.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingRootPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/unitTestHelper.h"
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingStageSceneIndex.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingStageSceneIndex.cpp
index 884828e3cd..4a207395ef 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingStageSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingStageSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/stageSceneIndex.h"
@@ -29,6 +12,7 @@
 #include "pxr/usd/usd/attribute.h"
 #include "pxr/usd/usd/stage.h"
 #include "pxr/usd/usdGeom/cube.h"
+#include "pxr/usd/usdGeom/points.h"
 
 #include "pxr/imaging/hd/dataSourceTypeDefs.h"
 #include "pxr/imaging/hd/meshTopologySchema.h"
@@ -41,7 +25,6 @@
 #include <queue>
 #include <sstream>
 
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 static std::ostream &
@@ -124,6 +107,11 @@ class PrimListener : public HdSceneIndexObserver
     AddedPrimEntries const& GetAdded() { return _added; }
     DirtiedPrimEntries const& GetDirtied() { return _dirtied; }
 
+    void ResetEntries() {
+        _added.clear();
+        _dirtied.clear();
+    }
+    
 private:
     SdfPathSet _prims;
     AddedPrimEntries _added;
@@ -486,6 +474,242 @@ void AddNonEmptyLayerTest()
     }
 }
 
+bool
+_Contains(const TfTokenVector &vec, const TfToken &t)
+{
+    return std::count(vec.begin(), vec.end(), t);
+}
+
+// A class that caches the data sources related to a primvar on a prim
+// in a scene index.
+//
+// The class is intended to check that sufficient invalidation is send out
+// and that there is no stale state cached somewhere in the scene index.
+//
+// It holds on to each data source and the primvar value and only pulls it
+// again if an explicit notice with a generic enough data source locator
+// was send.
+//
+class _PrimvarDataSourcesCache
+{
+public:
+    _PrimvarDataSourcesCache(HdSceneIndexBaseRefPtr const &sceneIndex,
+                             const SdfPath &primPath,
+                             const TfToken &primvarName)
+      : primvarsSchema(nullptr)
+      , primvarSchema(nullptr)
+      , hasPrimvarName(false)
+      , _sceneIndex(sceneIndex)
+      , _primPath(primPath)
+      , _primvarName(primvarName)
+    {
+        // Initialize data sources if scene index was already populated.
+        _ProcessEntry(_primPath, HdDataSourceLocatorSet::UniversalSet());
+        
+        _sceneIndex->AddObserver(HdSceneIndexObserverPtr(&_primListener));
+    }
+
+    HdContainerDataSourceHandle primSource;
+    HdPrimvarsSchema primvarsSchema;
+    HdPrimvarSchema primvarSchema;
+    HdSampledDataSourceHandle primvarValueSource;
+    VtArray<float> primvarValue;
+
+    // Did the primvar name appear in the result of
+    // HdContainerDataSource::GetNames() for the primvars?
+    bool hasPrimvarName;
+
+    // Pull data in response to invalidation notices.
+    void
+    Pull() {
+        for (const HdSceneIndexObserver::AddedPrimEntry &entry :
+                 _primListener.GetAdded()) {
+            _ProcessEntry(
+                entry.primPath, HdDataSourceLocatorSet::UniversalSet());
+        }
+        for (const HdSceneIndexObserver::DirtiedPrimEntry &entry :
+                 _primListener.GetDirtied()) {
+            _ProcessEntry(
+                entry.primPath, entry.dirtyLocators);
+        }
+
+        _primListener.ResetEntries();
+    }
+
+private:
+    void
+    _ProcessEntry(const SdfPath &primPath,
+                  const HdDataSourceLocatorSet &dirtyLocators)
+    {
+        if (primPath != _primPath) {
+            return;
+        }
+        if (dirtyLocators.Contains(
+                HdDataSourceLocator::EmptyLocator())) {
+            primSource =
+                _sceneIndex->GetPrim(_primPath).dataSource;
+        }
+        if (dirtyLocators.Contains(
+                HdPrimvarsSchema::GetDefaultLocator())) {
+            // Note that Contains is true if dirtyLocators contains
+            // a prefix. So if we refresh the primSource above, we
+            // would automatically refresh primvarsSchema as well.
+            primvarsSchema =
+                HdPrimvarsSchema::GetFromParent(primSource);
+        }
+        if (dirtyLocators.Contains(
+                HdPrimvarsSchema::GetDefaultLocator()
+                    .Append(_primvarName))) {
+
+            primvarSchema =
+                primvarsSchema.GetPrimvar(_primvarName);
+
+            // If a name appears or disappears in
+            // HdContainerDataSource::GetNames() is it sufficient to
+            // send the more specific data source locator for the name
+            // within the data source or should we send out the locator for
+            // the container data source itself?
+            //
+            // We are conservative here and call GetNames() when we
+            // get the specific data source locator (and thus also the more
+            // generic data source locator).
+            //
+            hasPrimvarName = _Contains(
+                primvarsSchema.GetPrimvarNames(), _primvarName);
+        }
+        if (dirtyLocators.Contains(
+                HdPrimvarsSchema::GetDefaultLocator()
+                    .Append(_primvarName)
+                    .Append(HdPrimvarSchemaTokens->primvarValue))) {
+            primvarValueSource =
+                primvarSchema.GetPrimvarValue();
+
+            if (HdFloatArrayDataSourceHandle const typedSource =
+                    HdFloatArrayDataSource::Cast(primvarValueSource)) {
+                primvarValue = typedSource->GetTypedValue(0.0f);
+            } else {
+                primvarValue = {};
+            }
+        }
+    }
+
+    HdSceneIndexBaseRefPtr const _sceneIndex;
+    PrimListener _primListener;
+    const SdfPath _primPath;
+    const TfToken _primvarName;
+};
+
+void CustomPrimvarChangeTest()
+{
+    SdfLayerRefPtr rootLayer = SdfLayer::CreateAnonymous(".usda");
+    UsdStageRefPtr stage = UsdStage::Open(rootLayer);
+    if (!TF_VERIFY(stage)) {
+        return;
+    }
+
+    UsdImagingStageSceneIndexRefPtr inputSceneIndex =
+        UsdImagingStageSceneIndex::New();
+    if (!TF_VERIFY(inputSceneIndex)) {
+        return;
+    }
+
+    inputSceneIndex->SetStage(stage);
+
+    const SdfPath primPath("/points");
+    _PrimvarDataSourcesCache dataSourcesCache(
+        inputSceneIndex, primPath, TfToken("widths"));
+
+    inputSceneIndex->ApplyPendingUpdates();
+    dataSourcesCache.Pull();
+
+    if (!TF_VERIFY(!dataSourcesCache.primSource)) {
+        // Expect no prim since prim has not yet been created.
+        return;
+    }
+    
+    UsdGeomPoints points = UsdGeomPoints::Define(stage, SdfPath("/points"));
+    if (!TF_VERIFY(points)) {
+        return;
+    }
+
+    inputSceneIndex->ApplyPendingUpdates();
+    dataSourcesCache.Pull();
+
+    if (!TF_VERIFY(dataSourcesCache.primSource)) {
+        // Prim has been created.
+        return;
+    }
+
+    // Note that we do not check dataSourcesCache.hasPrimvarName
+    // or dataSourcesCache.primvarSchema.
+    // As long as the primvar value data source is null, the implementation
+    // is correct - whether the primvars container data source lists the
+    // primvar (and whether on top, gives a data source for the primvar
+    // schema).
+
+    if (!TF_VERIFY(!dataSourcesCache.primvarValueSource)) {
+        // Nothing authored, so we do not expect a data source for the value.
+        return;
+    }
+
+    UsdAttribute widthsAttr = points.CreateWidthsAttr();
+    if (!TF_VERIFY(widthsAttr)) {
+        return;
+    }
+
+    inputSceneIndex->ApplyPendingUpdates();
+    dataSourcesCache.Pull();
+        
+    if (!TF_VERIFY(!dataSourcesCache.primvarValueSource)) {
+        // Attribute has been created in authoring layer but has no opinion,
+        // so we still do not expect a data source for the value.
+        return;
+    }
+
+    for (int i = 0; i < 2; ++i) {
+        const VtArray<float> widths{
+            1.0f + 3.0f * i, 2.0f + 3.0f * i, 3.0f + 3.0f * i};
+
+        // Author opinion.
+        if (!TF_VERIFY(widthsAttr.Set(widths))) {
+            return;
+        }
+
+        inputSceneIndex->ApplyPendingUpdates();
+        dataSourcesCache.Pull();
+
+        if (!TF_VERIFY(dataSourcesCache.hasPrimvarName)) {
+            // We expect that the primvar is listed by the
+            // primvars container data source, now that we
+            // have an authored value.
+            return;
+        }
+
+        if (!TF_VERIFY(dataSourcesCache.primvarValueSource)) {
+            // Same for data source for primvar value.
+            return;
+        }
+
+        if (!TF_VERIFY(dataSourcesCache.primvarValue == widths)) {
+            // And the data source better provided the authored
+            // value.
+            return;
+        }
+    }
+
+    // Clear attribute.
+    widthsAttr.Clear();
+
+    inputSceneIndex->ApplyPendingUpdates();
+    dataSourcesCache.Pull();
+
+    if (!TF_VERIFY(!dataSourcesCache.primvarValueSource)) {
+        // Authored opinion is cleared, so we should not a
+        // data source for the prim var value.
+        return;
+    }
+}
+
 int main()
 {
     TfErrorMark mark;
@@ -510,6 +734,8 @@ int main()
     // appropriate resyncs.
     AddNonEmptyLayerTest();
 
+    CustomPrimvarChangeTest();
+
     if (TF_VERIFY(mark.IsClean())) {
         std::cout << "OK" << std::endl;
     } else {
diff --git a/pxr/usdImaging/usdImaging/testenv/testUsdImagingStageSceneIndexContents.cpp b/pxr/usdImaging/usdImaging/testenv/testUsdImagingStageSceneIndexContents.cpp
index fdade497f8..0fa61b8240 100644
--- a/pxr/usdImaging/usdImaging/testenv/testUsdImagingStageSceneIndexContents.cpp
+++ b/pxr/usdImaging/usdImaging/testenv/testUsdImagingStageSceneIndexContents.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/stageSceneIndex.h"
diff --git a/pxr/usdImaging/usdImaging/tetMeshAdapter.cpp b/pxr/usdImaging/usdImaging/tetMeshAdapter.cpp
index d5b34a8782..19db01c431 100644
--- a/pxr/usdImaging/usdImaging/tetMeshAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/tetMeshAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #include "pxr/usdImaging/usdImaging/tetMeshAdapter.h"
 
 #include "pxr/usdImaging/usdImaging/dataSourceTetMesh.h"
@@ -33,7 +16,6 @@
 #include "pxr/imaging/pxOsd/tokens.h"
 
 #include "pxr/base/tf/type.h"
-#include "pxr/usd/usdGeom/tetMesh.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -156,10 +138,11 @@ UsdImagingTetMeshAdapter::GetTopology(UsdPrim const& prim,
     TRACE_FUNCTION();
     HF_MALLOC_TAG_FUNCTION();
 
-    // Compute the surfaceFaceIndices for the Tet Mesh
+    // Get the surfaceFaceIndices attribute for the Tet Mesh
+    const UsdAttribute& surfaceFaceVertexIndicesAttr =
+        UsdGeomTetMesh(prim).GetSurfaceFaceVertexIndicesAttr();
     VtVec3iArray surfaceFaceIndices;
-    UsdGeomTetMesh::ComputeSurfaceFaces(
-        UsdGeomTetMesh(prim), &surfaceFaceIndices, time);
+    surfaceFaceVertexIndicesAttr.Get(&surfaceFaceIndices, time);
 
     // Compute faceVertexIndices and faceVertexCounts for the HdMeshTopology
     const size_t numCounts = surfaceFaceIndices.size();
diff --git a/pxr/usdImaging/usdImaging/tetMeshAdapter.h b/pxr/usdImaging/usdImaging/tetMeshAdapter.h
index 79656ccdc0..00cbe5873f 100644
--- a/pxr/usdImaging/usdImaging/tetMeshAdapter.h
+++ b/pxr/usdImaging/usdImaging/tetMeshAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_TET_MESH_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_TET_MESH_ADAPTER_H
diff --git a/pxr/usdImaging/usdImaging/textureUtils.cpp b/pxr/usdImaging/usdImaging/textureUtils.cpp
index b6d96c2f1f..428c982ac6 100644
--- a/pxr/usdImaging/usdImaging/textureUtils.cpp
+++ b/pxr/usdImaging/usdImaging/textureUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/textureUtils.h"
 
diff --git a/pxr/usdImaging/usdImaging/textureUtils.h b/pxr/usdImaging/usdImaging/textureUtils.h
index 7f1283f886..814b3d756b 100644
--- a/pxr/usdImaging/usdImaging/textureUtils.h
+++ b/pxr/usdImaging/usdImaging/textureUtils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_TEXTURE_UTILS_H
 #define PXR_USD_IMAGING_USD_IMAGING_TEXTURE_UTILS_H
diff --git a/pxr/usdImaging/usdImaging/tokens.cpp b/pxr/usdImaging/usdImaging/tokens.cpp
index 1e9bb4d893..84291300d1 100644
--- a/pxr/usdImaging/usdImaging/tokens.cpp
+++ b/pxr/usdImaging/usdImaging/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImaging/tokens.h"
 
diff --git a/pxr/usdImaging/usdImaging/tokens.h b/pxr/usdImaging/usdImaging/tokens.h
index ab17837b04..4c0b91dd29 100644
--- a/pxr/usdImaging/usdImaging/tokens.h
+++ b/pxr/usdImaging/usdImaging/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_TOKENS_H
 #define PXR_USD_IMAGING_USD_IMAGING_TOKENS_H
diff --git a/pxr/usdImaging/usdImaging/types.h b/pxr/usdImaging/usdImaging/types.h
index 0a7d05442a..531fd571d3 100644
--- a/pxr/usdImaging/usdImaging/types.h
+++ b/pxr/usdImaging/usdImaging/types.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_TYPES_H
 #define PXR_USD_IMAGING_USD_IMAGING_TYPES_H
diff --git a/pxr/usdImaging/usdImaging/unitTestHelper.h b/pxr/usdImaging/usdImaging/unitTestHelper.h
index 376f38c268..14fec69606 100644
--- a/pxr/usdImaging/usdImaging/unitTestHelper.h
+++ b/pxr/usdImaging/usdImaging/unitTestHelper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_UNIT_TEST_HELPER_H
 #define PXR_USD_IMAGING_USD_IMAGING_UNIT_TEST_HELPER_H
diff --git a/pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.cpp b/pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.cpp
index a999d06517..ca879d3d70 100644
--- a/pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.cpp
+++ b/pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.h"
 
diff --git a/pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.h b/pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.h
index 671ac15feb..871c2f3851 100644
--- a/pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.h
+++ b/pxr/usdImaging/usdImaging/unloadedDrawModeSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef PXR_USD_IMAGING_USD_IMAGING_UNLOADED_DRAW_MODE_SCENE_INDEX_H
 #define PXR_USD_IMAGING_USD_IMAGING_UNLOADED_DRAW_MODE_SCENE_INDEX_H
 
diff --git a/pxr/usdImaging/usdImaging/usdPrimInfoSchema.cpp b/pxr/usdImaging/usdImaging/usdPrimInfoSchema.cpp
index 764662d6d2..aa75095fdc 100644
--- a/pxr/usdImaging/usdImaging/usdPrimInfoSchema.cpp
+++ b/pxr/usdImaging/usdImaging/usdPrimInfoSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/usdPrimInfoSchema.h b/pxr/usdImaging/usdImaging/usdPrimInfoSchema.h
index 7b4651b613..4b98f599bb 100644
--- a/pxr/usdImaging/usdImaging/usdPrimInfoSchema.h
+++ b/pxr/usdImaging/usdImaging/usdPrimInfoSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/usdRenderProductSchema.cpp b/pxr/usdImaging/usdImaging/usdRenderProductSchema.cpp
index e6f7a7d1a6..894a0e372d 100644
--- a/pxr/usdImaging/usdImaging/usdRenderProductSchema.cpp
+++ b/pxr/usdImaging/usdImaging/usdRenderProductSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/usdRenderProductSchema.h b/pxr/usdImaging/usdImaging/usdRenderProductSchema.h
index 635469c6be..34633e57b0 100644
--- a/pxr/usdImaging/usdImaging/usdRenderProductSchema.h
+++ b/pxr/usdImaging/usdImaging/usdRenderProductSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/usdRenderSettingsSchema.cpp b/pxr/usdImaging/usdImaging/usdRenderSettingsSchema.cpp
index 26ebfd4e2c..4c865de9ea 100644
--- a/pxr/usdImaging/usdImaging/usdRenderSettingsSchema.cpp
+++ b/pxr/usdImaging/usdImaging/usdRenderSettingsSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/usdRenderSettingsSchema.h b/pxr/usdImaging/usdImaging/usdRenderSettingsSchema.h
index e61bad270a..6c66a54875 100644
--- a/pxr/usdImaging/usdImaging/usdRenderSettingsSchema.h
+++ b/pxr/usdImaging/usdImaging/usdRenderSettingsSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/usdRenderVarSchema.cpp b/pxr/usdImaging/usdImaging/usdRenderVarSchema.cpp
index b4539190f4..f4525c0537 100644
--- a/pxr/usdImaging/usdImaging/usdRenderVarSchema.cpp
+++ b/pxr/usdImaging/usdImaging/usdRenderVarSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/usdRenderVarSchema.h b/pxr/usdImaging/usdImaging/usdRenderVarSchema.h
index 6e532bc830..e3c0d3abc9 100644
--- a/pxr/usdImaging/usdImaging/usdRenderVarSchema.h
+++ b/pxr/usdImaging/usdImaging/usdRenderVarSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImaging/version.h b/pxr/usdImaging/usdImaging/version.h
index fca0150a18..fa1d43d8e3 100644
--- a/pxr/usdImaging/usdImaging/version.h
+++ b/pxr/usdImaging/usdImaging/version.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_VERSION_H
 #define PXR_USD_IMAGING_USD_IMAGING_VERSION_H
diff --git a/pxr/usdImaging/usdImaging/volumeAdapter.cpp b/pxr/usdImaging/usdImaging/volumeAdapter.cpp
index 62fda38727..9ed1f8c313 100644
--- a/pxr/usdImaging/usdImaging/volumeAdapter.cpp
+++ b/pxr/usdImaging/usdImaging/volumeAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImaging/volumeAdapter.h"
diff --git a/pxr/usdImaging/usdImaging/volumeAdapter.h b/pxr/usdImaging/usdImaging/volumeAdapter.h
index 6ac5eee884..0047f981ce 100644
--- a/pxr/usdImaging/usdImaging/volumeAdapter.h
+++ b/pxr/usdImaging/usdImaging/volumeAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_VOLUME_ADAPTER_H
 #define PXR_USD_IMAGING_USD_IMAGING_VOLUME_ADAPTER_H
@@ -76,17 +59,20 @@ class UsdImagingVolumeAdapter : public UsdImagingGprimAdapter {
     /// \name Initialization
     // ---------------------------------------------------------------------- //
 
+    USDIMAGING_API
     virtual SdfPath Populate(UsdPrim const& prim,
                      UsdImagingIndexProxy* index,
                      UsdImagingInstancerContext const*
                      instancerContext = NULL) override;
 
+    USDIMAGING_API
     virtual bool IsSupported(UsdImagingIndexProxy const* index) const override;
 
     // ---------------------------------------------------------------------- //
     /// \name Parallel Setup and Resolve
     // ---------------------------------------------------------------------- //
     /// Thread Safe.
+    USDIMAGING_API
     virtual void TrackVariability(UsdPrim const& prim,
                                   SdfPath const& cachePath,
                                   HdDirtyBits* timeVaryingBits,
@@ -94,6 +80,7 @@ class UsdImagingVolumeAdapter : public UsdImagingGprimAdapter {
                                       instancerContext = NULL) const override;
 
     /// Thread Safe.
+    USDIMAGING_API
     virtual void UpdateForTime(UsdPrim const& prim,
                                SdfPath const& cachePath,
                                UsdTimeCode time,
@@ -101,6 +88,7 @@ class UsdImagingVolumeAdapter : public UsdImagingGprimAdapter {
                                UsdImagingInstancerContext const*
                                    instancerContext = NULL) const override;
 
+    USDIMAGING_API
     virtual HdVolumeFieldDescriptorVector
     GetVolumeFieldDescriptors(UsdPrim const& usdPrim, SdfPath const &id,
                               UsdTimeCode time) const override;
diff --git a/pxr/usdImaging/usdImagingGL/CMakeLists.txt b/pxr/usdImaging/usdImagingGL/CMakeLists.txt
index 0032e2ca1b..f710b3e157 100644
--- a/pxr/usdImaging/usdImagingGL/CMakeLists.txt
+++ b/pxr/usdImaging/usdImagingGL/CMakeLists.txt
@@ -644,6 +644,16 @@ pxr_install_test_dir(
     DEST testUsdImagingGLDomeLightTaskController
 )
 
+pxr_install_test_dir(
+    SRC testenv/testUsdImagingGLVelocityMotion
+    DEST testUsdImagingGLVelocityMotion
+)
+
+pxr_install_test_dir(
+    SRC testenv/testUsdImagingGLVelocityMotion
+    DEST testUsdImagingGLVelocityMotion_SceneIndex
+)
+
 #
 # Register tests that don't depend on build configuration or external libraries
 # (such as MaterialX, OpenVDB, PTEX).
@@ -652,8 +662,8 @@ pxr_register_test(testUsdImagingGLBasicDrawing
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage basicDrawing/basicDrawing.usda -write testUsdImagingGLBasicDrawing.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLBasicDrawing.png
-    FAIL 1
-    FAIL_PERCENT 1
+    FAIL 0.2
+    FAIL_PERCENT 0.5
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     ENV
@@ -691,7 +701,7 @@ pxr_register_test(testUsdImagingGLBasicDrawing_clipped
     IMAGE_DIFF_COMPARE
         testUsdImagingGLBasicDrawing_clipped.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.9
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLBasicDrawing
@@ -783,8 +793,8 @@ pxr_register_test(testUsdImagingGLBasicLighting
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -stage basicDrawing.usda -write testUsdImagingGLBasicLighting.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLBasicLighting.png
-    FAIL 1
-    FAIL_PERCENT 1
+    FAIL 0.5
+    FAIL_PERCENT 0.1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLBasicLighting
@@ -823,56 +833,56 @@ pxr_register_test(testUsdImagingGLCurves_refined
     TESTENV testUsdImagingGLCurves
 )
 
-pxr_register_test(testUsdImagingGL_moreCurves
+pxr_register_test(testUsdImagingGLCurves_moreCurves
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage moreCurves.usda -camlight -shading smooth -write testUsdImagingGL_moreCurves.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGL_moreCurves.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.5
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLCurves
 )
 
-pxr_register_test(testUsdImagingGL_moreCurves_refined
+pxr_register_test(testUsdImagingGLCurves_moreCurves_refined
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.1 -stage moreCurves.usda -camlight -shading smooth -write testUsdImagingGL_moreCurves_refined.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGL_moreCurves_refined.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.9
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLCurves
 )
 
-pxr_register_test(testUsdImagingGL_moreCurves_faketubes
+pxr_register_test(testUsdImagingGLCurves_moreCurves_faketubes
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.2 -stage moreCurves.usda -camlight -shading smooth -write testUsdImagingGL_moreCurves_faketubes.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGL_moreCurves_faketubes.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.9
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLCurves
 )
 
-pxr_register_test(testUsdImagingGL_moreCurves_tubes
+pxr_register_test(testUsdImagingGLCurves_moreCurves_tubes
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.3 -stage moreCurves.usda -camlight  -shading smooth -write testUsdImagingGL_moreCurves_tubes.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGL_moreCurves_tubes.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.9
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLCurves
 )
 
-pxr_register_test(testUsdImagingGL_pinnedCurves
+pxr_register_test(testUsdImagingGLCurves_pinnedCurves
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.3 -stage pinnedCurves.usda -camlight  -shading smooth -write testUsdImagingGL_pinnedCurves.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGL_pinnedCurves.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.2
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLCurves
@@ -883,7 +893,7 @@ pxr_register_test(testUsdImagingGLPoints
     IMAGE_DIFF_COMPARE
         testUsdImagingGLPoints.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.9
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLPoints
@@ -1206,7 +1216,7 @@ pxr_register_test(testUsdImagingGLSubdivisionSchemeNone
     IMAGE_DIFF_COMPARE
         testUsdImagingGLSubdivisionSchemeNone_1.png
         testUsdImagingGLSubdivisionSchemeNone_1.3.png
-    FAIL 1
+    FAIL 0.3
     FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
@@ -1218,7 +1228,7 @@ pxr_register_test(testUsdImagingGLSubdivisionSchemeNone_NoLights
     IMAGE_DIFF_COMPARE
         testUsdImagingGLSubdivisionSchemeNone_NoLights_1.png
         testUsdImagingGLSubdivisionSchemeNone_NoLights_1.3.png
-    FAIL 1
+    FAIL 0.2
     FAIL_PERCENT 1
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
@@ -1306,9 +1316,8 @@ pxr_register_test(testUsdImagingGLFlatShading
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -shading flat -stage primitives.usda -write testUsdImagingGLFlatShading.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLFlatShading.png
-    FAIL 1
+    FAIL 0.1
     FAIL_PERCENT 1
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLFlatShading
 )
@@ -1317,9 +1326,8 @@ pxr_register_test(testUsdImagingGLShadeMaterial
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage coloredCubes.usda -write testUsdImagingGLShadeMaterial.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLShadeMaterial.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
+    FAIL 0.3
+    FAIL_PERCENT 0.9
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLShadeMaterial
     ENV
@@ -1975,7 +1983,6 @@ pxr_register_test(testUsdImagingGLPointInstancer_pi_pi_time
         pi_pi_time_001.png
     FAIL .05
     FAIL_PERCENT .03
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLPointInstancer
 )
@@ -2303,7 +2310,6 @@ pxr_register_test(testUsdImagingGLPointInstancer_SceneIndex_pi_pi_time
         pi_pi_time_001.png
     FAIL .05
     FAIL_PERCENT .03
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLPointInstancer_SceneIndex
     ENV
@@ -2376,7 +2382,6 @@ pxr_register_test(testUsdImagingGLResync
         world_2.png
     FAIL .05
     FAIL_PERCENT .03
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLResync
 )
@@ -2389,7 +2394,6 @@ pxr_register_test(testUsdImagingGLResync_instancer
         instancer_2.png
     FAIL .05
     FAIL_PERCENT .03
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLResync
 )
@@ -2429,9 +2433,8 @@ pxr_register_test(testUsdImagingGLPrimvarSharing_refined
         refined_000.png
         refined_001.png
         refined_002.png
-    FAIL 1
+    FAIL 0.1
     FAIL_PERCENT 1
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLPrimvarSharing
     ENV
@@ -2595,9 +2598,8 @@ pxr_register_test(testUsdImagingGLNormals
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testNormals.usda -write testNormals.png"
     IMAGE_DIFF_COMPARE
         testNormals.png
-    FAIL 1
+    FAIL 0.1
     FAIL_PERCENT 1
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLNormals
 )
@@ -2705,7 +2707,7 @@ pxr_register_test(testUsdImagingGLPreviewSurface_Displacement
     IMAGE_DIFF_COMPARE
         testPreviewSurfaceDisplacement.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.7
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLPreviewSurface
@@ -2985,7 +2987,7 @@ pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Displacement
     IMAGE_DIFF_COMPARE
         testPreviewSurfaceDisplacement.png
     FAIL 1
-    FAIL_PERCENT 1
+    FAIL_PERCENT 0.7
     PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLPreviewSurface
@@ -3544,9 +3546,8 @@ pxr_register_test(testUsdImagingGLUsdLux
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdLux.usda -write usdLux.png"
     IMAGE_DIFF_COMPARE
         usdLux.png
-    FAIL 1
+    FAIL 0.1
     FAIL_PERCENT 1
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLUsdLux
 )
@@ -3674,9 +3675,8 @@ pxr_register_test(testUsdImagingGLUsdSkelExtCompCPU_arm_baked
         usdSkel_arm_baked_001.png
         usdSkel_arm_baked_003.png
         usdSkel_arm_baked_007.png
-    FAIL 1
+    FAIL 0.1
     FAIL_PERCENT 1
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLUsdSkel
     ENV
@@ -3689,9 +3689,8 @@ pxr_register_test(testUsdImagingGLUsdSkelExtCompCPU_arm
         usdSkel_arm_extComp_CPU_001.png
         usdSkel_arm_extComp_CPU_003.png
         usdSkel_arm_extComp_CPU_007.png
-    FAIL 1
+    FAIL 0.1
     FAIL_PERCENT 1
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLUsdSkel
     ENV
@@ -3702,9 +3701,8 @@ pxr_register_test(testUsdImagingGLUsdSkelExtCompCPU_twoBends
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -shading wireOnSurface -stage twoBends.usda -write usdSkel_twoBends_extComp_CPU.png"
     IMAGE_DIFF_COMPARE
         usdSkel_twoBends_extComp_CPU.png
-    FAIL 1
+    FAIL 0.1
     FAIL_PERCENT 1
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLUsdSkel
     ENV
@@ -3717,9 +3715,8 @@ pxr_register_test(testUsdImagingGLUsdSkelExtCompGPU_arm_baked
         usdSkel_arm_baked_001.png
         usdSkel_arm_baked_003.png
         usdSkel_arm_baked_007.png
-    FAIL 1
+    FAIL 0.1
     FAIL_PERCENT 1
-    PERCEPTUAL
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLUsdSkel
     ENV
@@ -3825,7 +3822,6 @@ pxr_register_test(testUsdImagingGLMaterialStrengthOrder
         USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=true
 )
 
-
 pxr_register_test(testUsdImagingGLInstancePrimvars
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage test.usda -write testUsdImagingGLInstancePrimvars.png"
     IMAGE_DIFF_COMPARE
@@ -3984,9 +3980,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_none
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_none.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_none.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.2
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -3996,9 +3991,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_guides
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_guides.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_guides.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.4
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4008,9 +4002,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_render
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose show -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_render.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_render.png
-    FAIL 1
-    FAIL_PERCENT 2
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.4
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4020,9 +4013,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_proxy
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_proxy.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_proxy.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.35
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4032,9 +4024,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_all
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose show -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_all.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_all.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.4
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4046,9 +4037,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_none
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_none.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_none.png
-    FAIL 1
-    FAIL_PERCENT 1.1
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.2
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4058,9 +4048,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_guides
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_guides.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_guides.png
-    FAIL 1
-    FAIL_PERCENT 1.25
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.4
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4070,9 +4059,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_render
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose show -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_render.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_render.png
-    FAIL 1
-    FAIL_PERCENT 1.85
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.4
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4082,9 +4070,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_proxy
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_proxy.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_proxy.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.4
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4094,9 +4081,8 @@ pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_all
     COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose show -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_all.png"
     IMAGE_DIFF_COMPARE
         testUsdImagingGLInheritedPurpose_all.png
-    FAIL 1
-    FAIL_PERCENT 1
-    PERCEPTUAL
+    FAIL 0.1
+    FAIL_PERCENT 0.4
     EXPECTED_RETURN_CODE 0
     TESTENV testUsdImagingGLInheritedPurpose
 )
@@ -4565,6 +4551,32 @@ pxr_register_test(testUsdImagingGLDomeLightTaskController
     TESTENV testUsdImagingGLDomeLightTaskController
 )
 
+pxr_register_test(testUsdImagingGLVelocityMotion
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading wireOnSurface -camera /World/main_cam -stage scene.usda -times 1 2.5 4 -write testUsdImagingGLVelocityMotion.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLVelocityMotion_001.png
+        testUsdImagingGLVelocityMotion_2.5.png
+        testUsdImagingGLVelocityMotion_004.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLVelocityMotion)
+
+pxr_register_test(testUsdImagingGLVelocityMotion_SceneIndex
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading wireOnSurface -camera /World/main_cam -stage scene.usda -times 1 2.5 4 -write testUsdImagingGLVelocityMotion.png"
+    IMAGE_DIFF_COMPARE
+        testUsdImagingGLVelocityMotion_001.png
+        testUsdImagingGLVelocityMotion_2.5.png
+        testUsdImagingGLVelocityMotion_004.png
+    FAIL 1
+    FAIL_PERCENT 1
+    PERCEPTUAL
+    EXPECTED_RETURN_CODE 0
+    TESTENV testUsdImagingGLVelocityMotion_SceneIndex
+    ENV
+        USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX=1)
+
 #
 # Conditionally install and register MaterialX tests
 #
@@ -4578,10 +4590,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxSimple.usda -write mxSimple.png"
         IMAGE_DIFF_COMPARE
             mxSimple.png
-        FAIL 0.5
+        FAIL 0.3
         FAIL_PERCENT 0.005
         WARN 0.05
-        WARN_PERCENT 0.0075
+        WARN_PERCENT 0.03
         EXPECTED_RETURN_CODE 0
         TESTENV testUsdImagingGLMaterialXBasic
     )
@@ -4590,7 +4602,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage standardSurface.usda -write standardSurface.png"
         IMAGE_DIFF_COMPARE
             standardSurface.png
-        FAIL 0.5
+        FAIL 0.3
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.2
@@ -4602,10 +4614,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage standardSurfaceMarble.usda -write standardSurfaceMarble.png"
         IMAGE_DIFF_COMPARE
             standardSurfaceMarble.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
-        WARN_PERCENT 0.02
+        WARN_PERCENT 0.01
         EXPECTED_RETURN_CODE 0
         TESTENV testUsdImagingGLMaterialXBasic
     )
@@ -4614,10 +4626,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage usdPreviewSurface.usda -write usdPreviewSurface.png"
         IMAGE_DIFF_COMPARE
             usdPreviewSurface.png
-        FAIL 0.5
+        FAIL 0.3
         FAIL_PERCENT 0.005
         WARN 0.05
-        WARN_PERCENT 0.06
+        WARN_PERCENT 0.09
         EXPECTED_RETURN_CODE 0
         TESTENV testUsdImagingGLMaterialXBasic
     )
@@ -4626,7 +4638,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxGlass.usda -write mxGlass.png"
         IMAGE_DIFF_COMPARE
             mxGlass.png
-        FAIL 0.5
+        FAIL 0.3
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
@@ -4638,7 +4650,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -stage basicMxYup.usda -camera /FrontCamera -write basicMxYup.png"
         IMAGE_DIFF_COMPARE
             basicMxYup.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.0025
@@ -4650,7 +4662,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -stage basicMxZup.usda -camera /FrontCamera -write basicMxZup.png"
         IMAGE_DIFF_COMPARE
             basicMxZup.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.0025
@@ -4662,7 +4674,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDirectLights.usda -write mxDirectLights.png"
         IMAGE_DIFF_COMPARE
             mxDirectLights.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.0025
@@ -4674,7 +4686,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -camlight -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDirectLights.usda -write mxDirectLightsCameraLight.png"
         IMAGE_DIFF_COMPARE
             mxDirectLightsCameraLight.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.0025
@@ -4686,7 +4698,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxLights.usda -write mxLights.png"
         IMAGE_DIFF_COMPARE
             mxLights.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
@@ -4698,7 +4710,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxColorspaces.usda -write mxColorspaces.png"
         IMAGE_DIFF_COMPARE
             mxColorspaces.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
@@ -4710,10 +4722,10 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxNormalMap.usda -write mxNormalMap.png"
         IMAGE_DIFF_COMPARE
             mxNormalMap.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
-        WARN_PERCENT 0.02
+        WARN_PERCENT 0.03
         EXPECTED_RETURN_CODE 0
         TESTENV testUsdImagingGLMaterialXBasic
     )
@@ -4729,7 +4741,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTextured.usda -write mxTextured.png"
         IMAGE_DIFF_COMPARE
             mxTextured.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.05
@@ -4741,7 +4753,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTextured2.usda -write mxTextured2.png"
         IMAGE_DIFF_COMPARE
             mxTextured2.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.0025
@@ -4753,7 +4765,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxGeomprop.usda -write mxGeomprop.png"
         IMAGE_DIFF_COMPARE
             mxGeomprop.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
@@ -4765,7 +4777,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTexcoord.usda -write mxTexcoord.png"
         IMAGE_DIFF_COMPARE
             mxTexcoord.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
@@ -4801,7 +4813,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage mxDefaultGeompropVal.usda -write mxDefaultGeompropVal.png"
         IMAGE_DIFF_COMPARE
             mxDefaultGeompropVal.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
@@ -4825,7 +4837,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTexColorspaces.usda -write mxTexColorspaces.png"
         IMAGE_DIFF_COMPARE
             mxTexColorspaces.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.02
@@ -5041,7 +5053,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage customMaterial.usda -write customMaterial.png"
         IMAGE_DIFF_COMPARE
             customMaterial.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.2
@@ -5055,7 +5067,7 @@ if (MaterialX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT})
         COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -camera /Camera -stage customColor.usda -write customColor.png"
         IMAGE_DIFF_COMPARE
             customColor.png
-        FAIL 0.5
+        FAIL 0.1
         FAIL_PERCENT 0.005
         WARN 0.05
         WARN_PERCENT 0.2
diff --git a/pxr/usdImaging/usdImagingGL/__init__.py b/pxr/usdImaging/usdImagingGL/__init__.py
index 71d85c6b0e..1fadb021f2 100644
--- a/pxr/usdImaging/usdImagingGL/__init__.py
+++ b/pxr/usdImaging/usdImagingGL/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/pxr/usdImaging/usdImagingGL/api.h b/pxr/usdImaging/usdImagingGL/api.h
index 3ba4bc3846..af56570b56 100644
--- a/pxr/usdImaging/usdImagingGL/api.h
+++ b/pxr/usdImaging/usdImagingGL/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_GL_API_H
 #define PXR_USD_IMAGING_USD_IMAGING_GL_API_H
diff --git a/pxr/usdImaging/usdImagingGL/engine.cpp b/pxr/usdImaging/usdImagingGL/engine.cpp
index 7c6b2cd5dd..12b4bc6610 100644
--- a/pxr/usdImaging/usdImagingGL/engine.cpp
+++ b/pxr/usdImaging/usdImagingGL/engine.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImagingGL/engine.h"
@@ -301,6 +284,7 @@ UsdImagingGLEngine::PrepareBatch(
             _sceneDelegate->SetTime(params.frame);
         }
 
+        _SetSceneGlobalsCurrentFrame(params.frame);
         _PostSetTime(params);
     }
 }
@@ -366,6 +350,10 @@ UsdImagingGLEngine::_SetActiveRenderSettingsPrimFromStageMetadata(
 void
 UsdImagingGLEngine::_UpdateDomeLightCameraVisibility()
 {
+    if (!_renderIndex->IsSprimTypeSupported(HdPrimTypeTokens->domeLight)) {
+        return;
+    }
+
     // Check to see if the dome light camera visibility has changed, and mark
     // the dome light prim as dirty if it has.
     //
@@ -762,6 +750,49 @@ UsdImagingGLEngine::TestIntersection(
     SdfPath *outHitInstancerPath,
     int *outHitInstanceIndex,
     HdInstancerContext *outInstancerContext)
+{
+    PickParams pickParams = { HdxPickTokens->resolveNearestToCenter };
+    IntersectionResultVector results;
+
+    if (TestIntersection(pickParams, viewMatrix, projectionMatrix,
+            root, params, &results)) {
+        if (results.size() != 1) {
+            // Since we are in nearest-hit mode, we expect allHits to have a
+            // single point in it.
+            return false;
+        }
+        IntersectionResult &result = results.front();
+        if (outHitPoint) {
+            *outHitPoint = result.hitPoint;
+        }
+        if (outHitNormal) {
+            *outHitNormal = result.hitNormal;
+        }
+        if (outHitPrimPath) {
+            *outHitPrimPath = result.hitPrimPath;
+        }
+        if (outHitInstancerPath) {
+            *outHitInstancerPath = result.hitInstancerPath;
+        }
+        if (outHitInstanceIndex) {
+            *outHitInstanceIndex = result.hitInstanceIndex;
+        }
+        if (outInstancerContext) {
+            *outInstancerContext = result.instancerContext;
+        }
+        return true;
+    }
+    return false;
+}
+
+bool
+UsdImagingGLEngine::TestIntersection(
+    const PickParams& pickParams,
+    const GfMatrix4d& viewMatrix,
+    const GfMatrix4d& projectionMatrix,
+    const UsdPrim& root,
+    const UsdImagingGLRenderParams& params,
+    IntersectionResultVector* outResults)
 {
     if (ARCH_UNLIKELY(!_renderDelegate)) {
         return false;
@@ -781,58 +812,50 @@ UsdImagingGLEngine::TestIntersection(
     _PrepareRender(params);
 
     HdxPickHitVector allHits;
-    HdxPickTaskContextParams pickParams;
-    pickParams.resolveMode = HdxPickTokens->resolveNearestToCenter;
-    pickParams.viewMatrix = viewMatrix;
-    pickParams.projectionMatrix = projectionMatrix;
-    pickParams.clipPlanes = params.clipPlanes;
-    pickParams.collection = _intersectCollection;
-    pickParams.outHits = &allHits;
-    const VtValue vtPickParams(pickParams);
-
-    _engine->SetTaskContextData(HdxPickTokens->pickParams, vtPickParams);
+    HdxPickTaskContextParams pickCtxParams;
+    pickCtxParams.resolveMode = pickParams.resolveMode;
+    pickCtxParams.viewMatrix = viewMatrix;
+    pickCtxParams.projectionMatrix = projectionMatrix;
+    pickCtxParams.clipPlanes = params.clipPlanes;
+    pickCtxParams.collection = _intersectCollection;
+    pickCtxParams.outHits = &allHits;
+    const VtValue vtPickCtxParams(pickCtxParams);
+
+    _engine->SetTaskContextData(HdxPickTokens->pickParams, vtPickCtxParams);
     _Execute(params, _taskController->GetPickingTasks());
 
-    // Since we are in nearest-hit mode, we expect allHits to have
-    // a single point in it.
-    if (allHits.size() != 1) {
+    // return false if there were no hits
+    if (allHits.size() == 0) {
         return false;
     }
 
-    HdxPickHit &hit = allHits[0];
+    for(HdxPickHit& hit : allHits)
+    {
+        IntersectionResult res;
 
-    if (outHitPoint) {
-        *outHitPoint = hit.worldSpaceHitPoint;
-    }
+        if (_sceneDelegate) {
+            res.hitPrimPath = _sceneDelegate->GetScenePrimPath(
+                    hit.objectId, hit.instanceIndex, &(res.instancerContext));
+            res.hitInstancerPath = _sceneDelegate->ConvertIndexPathToCachePath(
+                    hit.instancerId).GetAbsoluteRootOrPrimPath();
+        } else {
+            const HdxPrimOriginInfo info = HdxPrimOriginInfo::FromPickHit(
+                _renderIndex.get(), hit);
+            res.hitPrimPath = info.GetFullPath();
+            res.hitInstancerPath = hit.instancerId.ReplacePrefix(
+                _sceneDelegateId, SdfPath::AbsoluteRootPath());
+            res.instancerContext = info.ComputeInstancerContext();
+        }
 
-    if (outHitNormal) {
-        *outHitNormal = hit.worldSpaceHitNormal;
-    }
+        res.hitPoint = hit.worldSpaceHitPoint;
+        res.hitNormal = hit.worldSpaceHitNormal;
+        res.hitInstanceIndex = hit.instanceIndex;
 
-    if (_sceneDelegate) {
-        hit.objectId = _sceneDelegate->GetScenePrimPath(
-            hit.objectId, hit.instanceIndex, outInstancerContext);
-        hit.instancerId = _sceneDelegate->ConvertIndexPathToCachePath(
-            hit.instancerId).GetAbsoluteRootOrPrimPath();
-    } else {
-        const HdxPrimOriginInfo info = HdxPrimOriginInfo::FromPickHit(
-            _renderIndex.get(), hit);
-        const SdfPath usdPath = info.GetFullPath();
-        if (!usdPath.IsEmpty()) {
-            hit.objectId = usdPath;
+        if (outResults) {
+            outResults->push_back(res);
         }
     }
 
-    if (outHitPrimPath) {
-        *outHitPrimPath = hit.objectId;
-    }
-    if (outHitInstancerPath) {
-        *outHitInstancerPath = hit.instancerId;
-    }
-    if (outHitInstanceIndex) {
-        *outHitInstanceIndex = hit.instanceIndex;
-    }
-
     return true;
 }
 
@@ -849,30 +872,39 @@ UsdImagingGLEngine::DecodeIntersection(
         return false;
     }
 
-    if (_GetUseSceneIndices()) {
-        // XXX(HYD-2299): picking
-        return false;
-    }
-
-    TF_VERIFY(_sceneDelegate);
-
     const int primId = HdxPickTask::DecodeIDRenderColor(primIdColor);
     const int instanceIdx = HdxPickTask::DecodeIDRenderColor(instanceIdColor);
-    SdfPath primPath =
-        _sceneDelegate->GetRenderIndex().GetRprimPathFromPrimId(primId);
 
+    SdfPath primPath = _renderIndex->GetRprimPathFromPrimId(primId);
     if (primPath.IsEmpty()) {
         return false;
     }
 
     SdfPath delegateId, instancerId;
-    _sceneDelegate->GetRenderIndex().GetSceneDelegateAndInstancerIds(
+    _renderIndex->GetSceneDelegateAndInstancerIds(
         primPath, &delegateId, &instancerId);
 
-    primPath = _sceneDelegate->GetScenePrimPath(
-        primPath, instanceIdx, outInstancerContext);
-    instancerId = _sceneDelegate->ConvertIndexPathToCachePath(instancerId)
-                  .GetAbsoluteRootOrPrimPath();
+    if (_sceneDelegate) {
+        primPath = _sceneDelegate->GetScenePrimPath(
+            primPath, instanceIdx, outInstancerContext);
+        instancerId = _sceneDelegate->ConvertIndexPathToCachePath(instancerId)
+            .GetAbsoluteRootOrPrimPath();
+    } else {
+        HdxPickHit hit;
+        hit.delegateId = delegateId;
+        hit.objectId = primPath;
+        hit.instancerId = instancerId;
+        hit.instanceIndex = instanceIdx;
+
+        const HdxPrimOriginInfo info = HdxPrimOriginInfo::FromPickHit(
+            _renderIndex.get(), hit);
+        primPath = info.GetFullPath();
+        instancerId = instancerId.ReplacePrefix(_sceneDelegateId,
+            SdfPath::AbsoluteRootPath());
+        if (outInstancerContext) {
+            *outInstancerContext = info.ComputeInstancerContext();
+        }
+    }
 
     if (outHitPrimPath) {
         *outHitPrimPath = primPath;
@@ -1354,6 +1386,20 @@ UsdImagingGLEngine::SetRendererSetting(TfToken const& id, VtValue const& value)
     _renderDelegate->SetRenderSetting(id, value);
 }
 
+void
+UsdImagingGLEngine::SetActiveRenderPassPrimPath(SdfPath const &path)
+{
+    if (ARCH_UNLIKELY(!_appSceneIndices)) {
+        return;
+    }
+    auto &sgsi = _appSceneIndices->sceneGlobalsSceneIndex;
+    if (ARCH_UNLIKELY(!sgsi)) {
+        return;
+    }
+
+    sgsi->SetActiveRenderPassPrimPath(path);
+}
+
 void
 UsdImagingGLEngine::SetActiveRenderSettingsPrimPath(SdfPath const &path)
 {
@@ -1368,6 +1414,19 @@ UsdImagingGLEngine::SetActiveRenderSettingsPrimPath(SdfPath const &path)
     sgsi->SetActiveRenderSettingsPrimPath(path);
 }
 
+void UsdImagingGLEngine::_SetSceneGlobalsCurrentFrame(UsdTimeCode const &time)
+{
+    if (ARCH_UNLIKELY(!_appSceneIndices)) {
+        return;
+    }
+    auto &sgsi = _appSceneIndices->sceneGlobalsSceneIndex;
+    if (ARCH_UNLIKELY(!sgsi)) {
+        return;
+    }
+
+    sgsi->SetCurrentFrame(time.GetValue());
+}
+
 /* static */
 SdfPathVector
 UsdImagingGLEngine::GetAvailableRenderSettingsPrimPaths(UsdPrim const& root)
diff --git a/pxr/usdImaging/usdImagingGL/engine.h b/pxr/usdImaging/usdImagingGL/engine.h
index 1ec895af5b..e90410f3cd 100644
--- a/pxr/usdImaging/usdImagingGL/engine.h
+++ b/pxr/usdImaging/usdImagingGL/engine.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 /// \file usdImagingGL/engine.h
@@ -333,6 +316,8 @@ class UsdImagingGLEngine
     /// of that gprim. For nested instancing, outHitInstancerPath points to
     /// the closest instancer.
     ///
+    /// \deprecated Please use the override of TestIntersection that takes
+    /// PickParams and returns an IntersectionResultVector instead!
     USDIMAGINGGL_API
     bool TestIntersection(
         const GfMatrix4d &viewMatrix,
@@ -346,6 +331,53 @@ class UsdImagingGLEngine
         int *outHitInstanceIndex = NULL,
         HdInstancerContext *outInstancerContext = NULL);
 
+    // Pick result
+    struct IntersectionResult
+    {
+        GfVec3d hitPoint;
+        GfVec3d hitNormal;
+        SdfPath hitPrimPath;
+        SdfPath hitInstancerPath;
+        int hitInstanceIndex;
+        HdInstancerContext instancerContext;
+    };
+
+    typedef std::vector<struct IntersectionResult> IntersectionResultVector;
+
+    // Pick params
+    struct PickParams
+    {
+        TfToken resolveMode;
+    };
+
+    /// Perform picking by finding the intersection of objects in the scene with a renderered frustum.
+    /// Depending on the resolve mode it may find all objects intersecting the frustum or the closest 
+    /// point of intersection within the frustum.
+    /// 
+    /// If resolve mode is set to resolveDeep it uses Deep Selection to gather all paths within 
+    /// the frustum even if obscured by other visible objects.
+    /// If resolve mode is set to resolveNearestToCenter it uses a PickRender and 
+    /// a customized depth buffer to find all approximate points of intersection by rendering. 
+    /// This is less accurate than implicit methods or rendering with GL_SELECT, but leverages any 
+    /// data already cached in the renderer.
+    ///
+    /// Returns whether a hit occurred and if so, \p outResults will point to all the 
+    /// gprims selected by the pick as determined by the resolve mode. 
+    /// \p outHitPoint will contain the intersection point in world space 
+    /// (i.e. \p projectionMatrix and \p viewMatrix factored back out of the result)
+    /// \p outHitNormal will contain the world space normal at that point.
+    /// \p hitPrimPath will point to the gprim selected by the pick.
+    /// \p hitInstancerPath will point to the point instancer (if applicable) of each gprim. 
+    ///
+    USDIMAGINGGL_API
+    bool TestIntersection(
+        const PickParams& pickParams,
+        const GfMatrix4d& viewMatrix,
+        const GfMatrix4d& projectionMatrix,
+        const UsdPrim& root,
+        const UsdImagingGLRenderParams& params,
+        IntersectionResultVector* outResults);
+
     /// Decodes a pick result given hydra prim ID/instance ID (like you'd get
     /// from an ID render).
     USDIMAGINGGL_API
@@ -429,10 +461,14 @@ class UsdImagingGLEngine
     /// @}
 
     // ---------------------------------------------------------------------
-    /// \name Render Settings (Scene description driven)
+    /// \name Scene-defined Render Pass and Render Settings
     /// \note Support is WIP.
     /// @{
     // ---------------------------------------------------------------------
+
+    /// Set active render pass prim to use to drive rendering.
+    USDIMAGINGGL_API
+    void SetActiveRenderPassPrimPath(SdfPath const &);
     
     /// Set active render settings prim to use to drive rendering.
     USDIMAGINGGL_API
@@ -629,6 +665,9 @@ class UsdImagingGLEngine
     USDIMAGINGGL_API
     void _SetActiveRenderSettingsPrimFromStageMetadata(UsdStageWeakPtr stage);
 
+    USDIMAGINGGL_API
+    void _SetSceneGlobalsCurrentFrame(UsdTimeCode const &time);
+
     USDIMAGINGGL_API
     void _UpdateDomeLightCameraVisibility();
 
diff --git a/pxr/usdImaging/usdImagingGL/module.cpp b/pxr/usdImaging/usdImagingGL/module.cpp
index e8e1d43aad..ac9c389211 100644
--- a/pxr/usdImaging/usdImagingGL/module.cpp
+++ b/pxr/usdImaging/usdImagingGL/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usdImaging/usdImagingGL/moduleDeps.cpp b/pxr/usdImaging/usdImagingGL/moduleDeps.cpp
index 5b4fbb1f28..d5cb777e59 100644
--- a/pxr/usdImaging/usdImagingGL/moduleDeps.cpp
+++ b/pxr/usdImaging/usdImagingGL/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdImagingGL/pch.h b/pxr/usdImaging/usdImagingGL/pch.h
index b9dfa7e416..c3eb9e0ade 100644
--- a/pxr/usdImaging/usdImagingGL/pch.h
+++ b/pxr/usdImaging/usdImagingGL/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -40,11 +24,10 @@
 
 #include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -58,8 +41,10 @@
 #include <cstring>
 #include <deque>
 #include <float.h>
+#include <fstream>
 #include <functional>
 #include <initializer_list>
+#include <inttypes.h>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -70,12 +55,16 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string>
 #include <sys/types.h>
 #include <thread>
@@ -86,56 +75,8 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/container/flat_map.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -162,32 +103,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_unordered_set.h>
@@ -196,7 +114,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/usdImagingGL/renderParams.cpp b/pxr/usdImaging/usdImagingGL/renderParams.cpp
index 3af33c1214..0a45ed0fda 100644
--- a/pxr/usdImaging/usdImagingGL/renderParams.cpp
+++ b/pxr/usdImaging/usdImagingGL/renderParams.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdImagingGL/renderParams.h"
diff --git a/pxr/usdImaging/usdImagingGL/renderParams.h b/pxr/usdImaging/usdImagingGL/renderParams.h
index d8ad4d0f65..48fac08f35 100644
--- a/pxr/usdImaging/usdImagingGL/renderParams.h
+++ b/pxr/usdImaging/usdImagingGL/renderParams.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 /// \file usdImagingGL/renderParams.h
diff --git a/pxr/usdImaging/usdImagingGL/rendererSettings.h b/pxr/usdImaging/usdImagingGL/rendererSettings.h
index e39bb64199..e9d66c2df1 100644
--- a/pxr/usdImaging/usdImagingGL/rendererSettings.h
+++ b/pxr/usdImaging/usdImagingGL/rendererSettings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 /// \file usdImagingGL/renderSettings.h
diff --git a/pxr/usdImaging/usdImagingGL/testenv/TestUsdImagingGLHdGpProcedurals.cpp b/pxr/usdImaging/usdImagingGL/testenv/TestUsdImagingGLHdGpProcedurals.cpp
index a1dd20407b..53cb5c9bfb 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/TestUsdImagingGLHdGpProcedurals.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/TestUsdImagingGLHdGpProcedurals.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/imaging/hdGp/generativeProceduralPlugin.h"
 #include "pxr/imaging/hdGp/generativeProceduralPluginRegistry.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing.cpp
index 445ce8569e..8fb7b634fa 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/newInputShaderEncoding.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/newInputShaderEncoding.glslfx
index 6ec4495bae..54e7227e88 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/newInputShaderEncoding.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/newInputShaderEncoding.glslfx
@@ -1,5 +1,14 @@
 -- glslfx version 0.1
+
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
+
 {
     "parameters" : {
         "time": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-surface.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-surface.glslfx
index cec0a14257..9a4c2fcacc 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-surface.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-surface.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 --- This is what an import might look like.
 --- #import $TOOLS/hd/shaders/fallbackSurface.glslfx
 
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.glslfx
index c1a70a6438..49a70507e9 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.glslfx
@@ -1,5 +1,13 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2020 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+
 -- configuration
 {
     "textures": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shader1.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shader1.glslfx
index 7d369b37c7..f686286819 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shader1.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shader1.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-surface.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-surface.glslfx
index cec0a14257..9a4c2fcacc 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-surface.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-surface.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 --- This is what an import might look like.
 --- #import $TOOLS/hd/shaders/fallbackSurface.glslfx
 
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBatchedDrawing.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBatchedDrawing.cpp
index 1ba1b7b52f..e50e3e0cef 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBatchedDrawing.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBatchedDrawing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDisplacement/baseline/testUsdImagingGLDisplacement_Adaptive_VeryHigh.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDisplacement/baseline/testUsdImagingGLDisplacement_Adaptive_VeryHigh.png
index 85fc549fdf..e307736369 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDisplacement/baseline/testUsdImagingGLDisplacement_Adaptive_VeryHigh.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDisplacement/baseline/testUsdImagingGLDisplacement_Adaptive_VeryHigh.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLeftHanded_Adaptive_Low.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLeftHanded_Adaptive_Low.png
index 1775bbf9c1..4b987852d4 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLeftHanded_Adaptive_Low.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLeftHanded_Adaptive_Low.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Low.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Low.png
index f1a9dda586..e6d7b60011 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Low.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Low.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Medium.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Medium.png
index a1dd35ff7b..3cbaeca685 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Medium.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Medium.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVarying_Adaptive_Medium.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVarying_Adaptive_Medium.png
index b270ee6f99..b291db01a8 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVarying_Adaptive_Medium.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/baseline/testUsdImagingGLFaceVarying_Adaptive_Medium.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/additive.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/additive.glslfx
index 858f4d6da1..51d42fe0bd 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/additive.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/additive.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/baseline/testUsdImagingGLGeomSubsets_Adaptive.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/baseline/testUsdImagingGLGeomSubsets_Adaptive.png
index 6736d88e94..9057a52672 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/baseline/testUsdImagingGLGeomSubsets_Adaptive.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/baseline/testUsdImagingGLGeomSubsets_Adaptive.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/default.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/default.glslfx
index 9076ba71d9..592f79e8a6 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/default.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/default.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/translucent.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/translucent.glslfx
index 4b330d4052..a2501a1ca2 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/translucent.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLGeomSubsets/translucent.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHdGp.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHdGp.cpp
index 59ba224090..ad8ddbdd91 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHdGp.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHdGp.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/gf/bbox3d.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight.cpp
index 37ba9fee83..3b642b3766 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/shaders-surface.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/shaders-surface.glslfx
index cec0a14257..9a4c2fcacc 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/shaders-surface.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/shaders-surface.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 --- This is what an import might look like.
 --- #import $TOOLS/hd/shaders/fallbackSurface.glslfx
 
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/volumeShaderParameter.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/volumeShaderParameter.glslfx
index 1937abae83..9834477fb7 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/volumeShaderParameter.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/volumeShaderParameter.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInvalidInfoId/invalid_infoid.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInvalidInfoId/invalid_infoid.glslfx
index 383cd87670..38f93f3ed3 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInvalidInfoId/invalid_infoid.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInvalidInfoId/invalid_infoid.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInvalidMaterial/buggyShader.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInvalidMaterial/buggyShader.glslfx
index d6e52e8ca1..6d7b56df57 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInvalidMaterial/buggyShader.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInvalidMaterial/buggyShader.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialTag/shader1.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialTag/shader1.glslfx
index 49d43681c6..499d207591 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialTag/shader1.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialTag/shader1.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/basicMxYup.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/basicMxYup.png
index 215037df55..26cb389c02 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/basicMxYup.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/basicMxYup.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/basicMxZup.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/basicMxZup.png
index d6a8d51457..0cba5f8290 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/basicMxZup.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/basicMxZup.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxGlass.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxGlass.png
index 858cac0084..040dfa6e93 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxGlass.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxGlass.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxNormalMap.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxNormalMap.png
index ec9de9d684..f2d695551d 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxNormalMap.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxNormalMap.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxSimple.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxSimple.png
index c2f2685d20..8014931f03 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxSimple.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/mxSimple.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/standardSurface.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/standardSurface.png
index 74353a1adb..80feb42aa9 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/standardSurface.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/standardSurface.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/standardSurfaceMarble.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/standardSurfaceMarble.png
index 1f74864158..d4e4870852 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/standardSurfaceMarble.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/standardSurfaceMarble.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/usdPreviewSurface.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/usdPreviewSurface.png
index 55d1483da6..0c49c5021a 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/usdPreviewSurface.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/baseline/usdPreviewSurface.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/basicMxYup.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/basicMxYup.usda
index c82f204e62..7c4554c2f1 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/basicMxYup.usda
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/basicMxYup.usda
@@ -25,6 +25,7 @@ def Xform "lights"
 {
     def DomeLight "DomeLight"
     {
+        float inputs:intensity = 2.0
         asset inputs:texture:file = @./StinsonBeach.hdr@
     }
 }
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/basicMxZup.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/basicMxZup.usda
index 0a8f8316ed..5ad7e471a4 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/basicMxZup.usda
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/basicMxZup.usda
@@ -25,6 +25,7 @@ def Xform "lights"
 {
     def DomeLight "DomeLight"
     {
+        float inputs:intensity = 2.0
         asset inputs:texture:file = @./StinsonBeach.hdr@
         float xformOp:rotateX:Zup = 90
         uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"]
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/mxNormalMap.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/mxNormalMap.usda
index 8a69fdfab7..b85f8df5f4 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/mxNormalMap.usda
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXBasic/mxNormalMap.usda
@@ -167,6 +167,7 @@ def Xform "NormalMapTest"
     {
         def DomeLight "DomeLight"
         {
+            float inputs:intensity = 2.0
             asset inputs:texture:file = @./StinsonBeach.hdr@
         }
         def DistantLight "DistantLight"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXTextured/baseline/mxCustomNodeDef.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXTextured/baseline/mxCustomNodeDef.png
index 5c4e4a0eb2..78d293c2bd 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXTextured/baseline/mxCustomNodeDef.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialXTextured/baseline/mxCustomNodeDef.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight.cpp
index fe6c930155..46f86a494a 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h"
@@ -38,6 +21,7 @@
 #include "pxr/imaging/garch/glDebugWindow.h"
 #include "pxr/imaging/hd/mesh.h"
 #include "pxr/imaging/hd/renderIndex.h"
+#include "pxr/imaging/hdx/pickTask.h"
 #include "pxr/usd/usd/stage.h"
 #include "pxr/usd/usdGeom/bboxCache.h"
 #include "pxr/usd/usdGeom/metrics.h"
@@ -58,14 +42,7 @@ PXR_NAMESPACE_USING_DIRECTIVE
 
 using UsdImagingGLEngineSharedPtr = std::shared_ptr<class UsdImagingGLEngine>;
 
-struct OutHit {
-    GfVec3d outHitPoint;
-    GfVec3d outHitNormal;
-    SdfPath outHitPrimPath;
-    SdfPath outHitInstancerPath;
-    int outHitInstanceIndex;
-};
-
+using OutHit = UsdImagingGLEngine::IntersectionResult;
 
 static bool
 _CompareOutHit(OutHit const & lhs, OutHit const & rhs)
@@ -75,16 +52,54 @@ _CompareOutHit(OutHit const & lhs, OutHit const & rhs)
         false);
 
     double const epsilon = 1e-6;
-    return GfIsClose(lhs.outHitPoint[0], rhs.outHitPoint[0], epsilon) &&
-           GfIsClose(lhs.outHitPoint[1], rhs.outHitPoint[1], epsilon) &&
-           GfIsClose(lhs.outHitPoint[2], rhs.outHitPoint[2], epsilon) &&
-           GfIsClose(lhs.outHitNormal[0], rhs.outHitNormal[0], epsilon) &&
-           GfIsClose(lhs.outHitNormal[1], rhs.outHitNormal[1], epsilon) &&
-           GfIsClose(lhs.outHitNormal[2], rhs.outHitNormal[2], epsilon) &&
-           lhs.outHitPrimPath == rhs.outHitPrimPath &&
+    bool compare = GfIsClose(lhs.hitPoint[0], rhs.hitPoint[0], epsilon) &&
+           GfIsClose(lhs.hitPoint[1], rhs.hitPoint[1], epsilon) &&
+           GfIsClose(lhs.hitPoint[2], rhs.hitPoint[2], epsilon) &&
+           GfIsClose(lhs.hitNormal[0], rhs.hitNormal[0], epsilon) &&
+           GfIsClose(lhs.hitNormal[1], rhs.hitNormal[1], epsilon) &&
+           GfIsClose(lhs.hitNormal[2], rhs.hitNormal[2], epsilon) &&
+           lhs.hitPrimPath == rhs.hitPrimPath &&
            (skipInstancerDetails ||
-            (lhs.outHitInstancerPath == rhs.outHitInstancerPath &&
-             lhs.outHitInstanceIndex == rhs.outHitInstanceIndex));
+            (lhs.hitInstancerPath == rhs.hitInstancerPath &&
+             lhs.hitInstanceIndex == rhs.hitInstanceIndex));
+
+    return compare;
+}
+
+
+static bool
+_CompareDeepSelectionResults(
+    UsdImagingGLEngine::IntersectionResultVector const& lhsVector, 
+    UsdImagingGLEngine::IntersectionResultVector const& rhsVector)
+{
+    UsdImagingGLEngine::IntersectionResultVector lhs_sorted = lhsVector;
+    std::sort(lhs_sorted.begin(), lhs_sorted.end(),
+        [](const UsdImagingGLEngine::IntersectionResult &a,
+           const UsdImagingGLEngine::IntersectionResult &b)
+        {
+            return a.hitPrimPath < b.hitPrimPath;
+        });
+    UsdImagingGLEngine::IntersectionResultVector rhs_sorted = rhsVector;
+    std::sort(rhs_sorted.begin(), rhs_sorted.end(),
+        [](const UsdImagingGLEngine::IntersectionResult &a,
+           const UsdImagingGLEngine::IntersectionResult &b)
+        {
+            return a.hitPrimPath < b.hitPrimPath;
+        });
+
+    if (lhs_sorted.size() != rhs_sorted.size()) {
+        return false;
+    }
+
+    for (size_t i = 0; i < lhs_sorted.size(); ++i) {
+        // Note, hitInstancerId and hitInstanceIndex aren't guaranteed to be stable
+        // for native instances, so we don't check them here.
+        if (lhs_sorted[i].hitPrimPath != rhs_sorted[i].hitPrimPath) {
+            return false;
+        }
+    }
+
+    return true;
 }
 
 class My_TestGLDrawing : public UsdImagingGL_UnitTestGLDrawing {
@@ -108,6 +123,7 @@ class My_TestGLDrawing : public UsdImagingGL_UnitTestGLDrawing {
     void Draw(bool render=true);
     void Pick(GfVec2i const &startPos, GfVec2i const &endPos);
     void Pick(GfVec2i const &startPos, GfVec2i const &endPos, OutHit* out);
+    void DeepSelect(GfVec2i const& startPos, GfVec2i const& endPos, UsdImagingGLEngine::IntersectionResultVector& out);
 
 private:
     UsdStageRefPtr _stage;
@@ -194,7 +210,8 @@ My_TestGLDrawing::DrawTest(bool offscreen)
                 SdfPath("/Group/GI1/I1/Mesh1/Plane1"), 
                 _stage->GetPrimAtPath(SdfPath("/Group/GI1/I1")).GetPrototype().
                     GetPath().AppendPath(SdfPath("Mesh1")),
-                2 }
+                2,
+                {} }
         },
         {
             TfToken("HdEmbreeRendererPlugin"), 
@@ -202,7 +219,65 @@ My_TestGLDrawing::DrawTest(bool offscreen)
                 GfVec3d(0, 0, 0),
                 SdfPath("/Instance/I1/Mesh1/Plane1"), 
                 SdfPath::EmptyPath(),
-                0 }
+                0,
+                {} }
+        }
+    };
+
+    const UsdImagingGLEngine::IntersectionResultVector expectedOutputVector = {
+        {
+        GfVec3d(0.0, 0.0, 0.0),
+        GfVec3d(0.0, 0.0, 0.0),
+        SdfPath("/Group/GI1/I1/Mesh1/Plane1"),
+        _stage->GetPrimAtPath(SdfPath("/Group/GI1/I1")).GetPrototype().
+            GetPath().AppendPath(SdfPath("Mesh1")),
+        2,
+        {}
+        },
+        {
+        GfVec3d(0.0, 0.0, 0.0),
+        GfVec3d(0.0, 0.0, 0.0),
+        SdfPath("/Group/GI2/I1/Mesh1/Plane2"),
+        _stage->GetPrimAtPath(SdfPath("/Group/GI2/I1")).GetPrototype().
+            GetPath().AppendPath(SdfPath("Mesh1")),
+        3,
+        {}
+        },
+        {
+        GfVec3d(0.0, 0.0, 0.0),
+        GfVec3d(0.0, 0.0, 0.0),
+        SdfPath("/Instance/I1/Mesh1/Plane1"),
+        _stage->GetPrimAtPath(SdfPath("/Instance/I1")).GetPrototype().
+            GetPath().AppendPath(SdfPath("Mesh1")),
+        0,
+        {}
+        },
+        {
+        GfVec3d(0.0, 0.0, 0.0),
+        GfVec3d(0.0, 0.0, 0.0),
+        SdfPath("/Group/GI2/I1/Mesh1/Plane1"),
+        _stage->GetPrimAtPath(SdfPath("/Group/GI2/I1")).GetPrototype().
+            GetPath().AppendPath(SdfPath("Mesh1")),
+        3,
+        {}
+        },
+        {
+        GfVec3d(0.0, 0.0, 0.0),
+        GfVec3d(0.0, 0.0, 0.0),
+        SdfPath("/Group/GI1/I1/Mesh1/Plane2"),
+        _stage->GetPrimAtPath(SdfPath("/Group/GI1/I1")).GetPrototype().
+            GetPath().AppendPath(SdfPath("Mesh1")),
+        2,
+        {}
+        },
+        {
+        GfVec3d(0.0, 0.0, 0.0),
+        GfVec3d(0.0, 0.0, 0.0),
+        SdfPath("/Instance/I1/Mesh1/Plane2"),
+        _stage->GetPrimAtPath(SdfPath("/Instance/I1")).GetPrototype().
+            GetPath().AppendPath(SdfPath("Mesh1")),
+        0,
+        {}
         }
     };
 
@@ -225,6 +300,22 @@ My_TestGLDrawing::DrawTest(bool offscreen)
     } else {
         Draw();
     }
+
+    // currently only HdStorm supports deep selection
+    static const TfToken _stormRendererPluginName("HdStormRendererPlugin");
+    if (_engine->GetCurrentRendererId() == _stormRendererPluginName)
+    {
+        // Test windowed deep selection
+        UsdImagingGLEngine::IntersectionResultVector testOutVector;
+        DeepSelect(GfVec2i(320, 130), GfVec2i(171, 131), testOutVector);
+        TF_VERIFY(_CompareDeepSelectionResults(testOutVector, expectedOutputVector));
+        Draw();
+
+        // Single pick deep selection
+        testOutVector.clear();
+        DeepSelect(GfVec2i(170, 130), GfVec2i(171, 131), testOutVector);
+        Draw();
+    }
 }
 
 void
@@ -344,6 +435,57 @@ My_TestGLDrawing::Pick(GfVec2i const &startPos, GfVec2i const &endPos) {
     Pick(startPos, endPos, nullptr);
 }
 
+void
+My_TestGLDrawing::DeepSelect(GfVec2i const& startPos, GfVec2i const& endPos,
+    UsdImagingGLEngine::IntersectionResultVector& outResults)
+{
+    GfFrustum frustum = _frustum;
+    float width = GetWidth(), height = GetHeight();
+
+    GfVec2d min(2 * startPos[0] / width - 1, 1 - 2 * startPos[1] / height);
+    GfVec2d max(2 * (endPos[0] + 1) / width - 1, 1 - 2 * (endPos[1] + 1) / height);
+    // scale window
+    GfVec2d origin = frustum.GetWindow().GetMin();
+    GfVec2d scale = frustum.GetWindow().GetMax() - frustum.GetWindow().GetMin();
+    min = origin + GfCompMult(scale, 0.5 * (GfVec2d(1.0, 1.0) + min));
+    max = origin + GfCompMult(scale, 0.5 * (GfVec2d(1.0, 1.0) + max));
+
+    frustum.SetWindow(GfRange2d(min, max));
+
+    // XXX: For a timevarying test need to set timecode for frame param
+    UsdImagingGLRenderParams params;
+    params.enableIdRender = true;
+
+    SdfPathVector selection;
+
+    UsdImagingGLEngine::PickParams pickParams = {
+        HdxPickTokens->resolveDeep
+    };
+
+    if (_engine->TestIntersection(
+        pickParams,
+        _viewMatrix,
+        frustum.ComputeProjectionMatrix(),
+        _stage->GetPseudoRoot(),
+        params,
+        &outResults)) {
+
+        for (size_t i = 0; i < outResults.size(); ++i)
+        {
+            UsdImagingGLEngine::IntersectionResult outHit = outResults[i];
+            std::cout << "Hit "
+                << i << ": "
+                << outHit.hitPrimPath << ", "
+                << outHit.hitInstancerPath << ", "
+                << outHit.hitInstanceIndex << "\n";
+
+            selection.push_back(outHit.hitPrimPath);
+        }
+    }
+
+    _engine->SetSelected(selection);
+}
+
 void
 My_TestGLDrawing::Pick(GfVec2i const &startPos, GfVec2i const &endPos, 
         OutHit* out)
@@ -365,36 +507,42 @@ My_TestGLDrawing::Pick(GfVec2i const &startPos, GfVec2i const &endPos,
     UsdImagingGLRenderParams params;
     params.enableIdRender = true;
 
-    OutHit outHit;
+    UsdImagingGLEngine::IntersectionResultVector outResults;
 
     SdfPathVector selection;
 
+    UsdImagingGLEngine::PickParams pickParams = {
+        HdxPickTokens->resolveNearestToCenter,
+    };
+
     if (_engine->TestIntersection(
+        pickParams,
         _viewMatrix,
         frustum.ComputeProjectionMatrix(),
         _stage->GetPseudoRoot(),
         params,
-        &outHit.outHitPoint,
-        &outHit.outHitNormal,
-        &outHit.outHitPrimPath,
-        &outHit.outHitInstancerPath,
-        &outHit.outHitInstanceIndex)) {
-
-        std::cout << "Hit "
-                  << outHit.outHitPoint << ", "
-                  << outHit.outHitNormal << ", "
-                  << outHit.outHitPrimPath << ", "
-                  << outHit.outHitInstancerPath << ", "
-                  << outHit.outHitInstanceIndex << "\n";
-
-        _engine->SetSelectionColor(GfVec4f(1, 1, 0, 1));
-        selection.push_back(outHit.outHitPrimPath);
-    }
+        &outResults)) {
 
-    if (out) {
-        *out = outHit;
-    } else {
-        _engine->SetSelected(selection);
+        if (outResults.size() == 1)
+        {
+            std::cout << "Hit "
+                << outResults[0].hitPoint << ", "
+                << outResults[0].hitNormal << ", "
+                << outResults[0].hitPrimPath << ", "
+                << outResults[0].hitInstancerPath << ", "
+                << outResults[0].hitInstanceIndex << "\n";
+
+            _engine->SetSelectionColor(GfVec4f(1, 1, 0, 1));
+            selection.push_back(outResults[0].hitPrimPath);
+
+            if (out) {
+                *out = outResults[0];
+            }
+        }
+
+        if (!out) {
+            _engine->SetSelected(selection);
+        }
     }
 }
 
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/baseline/testUsdImagingGLPickAndHighlight_005.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/baseline/testUsdImagingGLPickAndHighlight_005.png
new file mode 100644
index 0000000000..d1931d873d
Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/baseline/testUsdImagingGLPickAndHighlight_005.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/baseline/testUsdImagingGLPickAndHighlight_006.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/baseline/testUsdImagingGLPickAndHighlight_006.png
new file mode 100644
index 0000000000..12524236f1
Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/baseline/testUsdImagingGLPickAndHighlight_006.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPopOut.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPopOut.cpp
index 9bb8c63d6b..1217ab3045 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPopOut.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPopOut.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/imaging/garch/glApi.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarRefinement/baseline/testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarRefinement/baseline/testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png
index 062f738f76..d781511c54 100644
Binary files a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarRefinement/baseline/testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarRefinement/baseline/testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPurpose.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPurpose.cpp
index 455e60ab9f..41634e126b 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPurpose.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPurpose.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/gf/bbox3d.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync.cpp
index 344618810f..171985df81 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/gf/bbox3d.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/surface_texture.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/surface_texture.glslfx
index 4ca1605d75..aadc3eeb66 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/surface_texture.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/surface_texture.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques" : {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBadTexture/shaders-surface.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBadTexture/shaders-surface.glslfx
index 2c61fea9a7..8b32f09804 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBadTexture/shaders-surface.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBadTexture/shaders-surface.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2017 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBool/shadebool.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBool/shadebool.glslfx
index fd273bccd3..daff1b3de0 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBool/shadebool.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBool/shadebool.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2016 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques" : {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSimpleVolumes/constantShader.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSimpleVolumes/constantShader.glslfx
index 4ebc77b5e8..34008db9fa 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSimpleVolumes/constantShader.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSimpleVolumes/constantShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSimpleVolumes/ellipsoidalVolume.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSimpleVolumes/ellipsoidalVolume.glslfx
index a611d92f22..01c1e7796c 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSimpleVolumes/ellipsoidalVolume.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSimpleVolumes/ellipsoidalVolume.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader.cpp
index 5d5f1e71fe..669ec6dd6c 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader/shaders-surface.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader/shaders-surface.glslfx
index 2c61fea9a7..47137e6063 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader/shaders-surface.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader/shaders-surface.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2016 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTaskController.cpp b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTaskController.cpp
index 26b72236f9..34247994b6 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTaskController.cpp
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTaskController.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h"
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTetMesh/tetMesh.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTetMesh/tetMesh.usda
index 00dbe9d1eb..3d497a6625 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTetMesh/tetMesh.usda
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTetMesh/tetMesh.usda
@@ -13,6 +13,10 @@ def Scope "RightHanded" {
             0:  [(0, 0, 0), (2, 0, 0), (0, 2, 0), (0, 0, 2), (0, 0, -2)],
             10: [(0, 0, 3), (2, 0, 3), (0, 2, 3), (0, 0, 5), (0, 0, -3), (2, 0, -3), (0, 2, -3), (0, 0, -5)],
         }
+        int3[] surfaceFaceVertexIndices.timeSamples = {
+            0: [(0, 1, 3), (0, 2, 4), (0, 3, 2), (0, 4, 1), (1, 2, 3), (2, 1, 4)],
+            10: [(0, 1, 3), (0, 2, 1), (0, 3, 2), (1, 2, 3), (4, 5, 6), (4, 6, 7), (4, 7, 5), (6, 5, 7)],
+        }
         int4[] tetVertexIndices.timeSamples = {
             0: [(0, 1, 2, 3), (0, 2, 1, 4)],
             10: [(0, 1, 2, 3), (4, 6, 5, 7)],
@@ -27,6 +31,7 @@ def Scope "RightHanded" {
     {
         color3f[] primvars:displayColor = [(0, 0, 1)]
         point3f[] points = [(0, 0, 0), (2, 0, 0), (0, 2, 0), (0, 0, 2), (0, 0, -2)]
+        int3[] surfaceFaceVertexIndices = [(0, 1, 3), (0, 2, 4), (0, 3, 2), (0, 4, 1), (1, 2, 3), (2, 1, 4)]
         int4[] tetVertexIndices = [(0, 1, 2, 3), (0, 2, 1, 4)]
         
         double3 xformOp:translate = (-2.5, 0, 0)
@@ -66,6 +71,10 @@ def Scope "LeftHanded"
             0: [(0, 0, 0), (-2, 0, 0), (0, 2, 0), (0, 0, 2), (0, 0, -2)],
             10: [(0, 0, 3), (-2, 0, 3), (0, 2, 3), (0, 0, 5), (0, 0, -3), (-2, 0, -3), (0, 2, -3), (0, 0, -5)],
         }
+        int3[] surfaceFaceVertexIndices.timeSamples = {
+            0: [(0, 1, 3), (0, 2, 4), (0, 3, 2), (0, 4, 1), (1, 2, 3), (2, 1, 4)],
+            10: [(0, 1, 3), (0, 2, 1), (0, 3, 2), (1, 2, 3), (4, 5, 6), (4, 6, 7), (4, 7, 5), (6, 5, 7)],
+        }
         int4[] tetVertexIndices.timeSamples = {
             0: [(0, 1, 2, 3), (0, 2, 1, 4)],
             10: [(0, 1, 2, 3), (4, 6, 5, 7)],
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTextureWrap/surface_shader.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTextureWrap/surface_shader.glslfx
index 93e90d4979..db520a477b 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTextureWrap/surface_shader.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTextureWrap/surface_shader.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2018 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques": {
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdUdims/create_symlinks.py b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdUdims/create_symlinks.py
index 00b682212c..1f212d7dcf 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdUdims/create_symlinks.py
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdUdims/create_symlinks.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 # Script to create the symlinks for the usdUdimsSymlinked.usda test case
 
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/checkerboardShader.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/checkerboardShader.glslfx
index 33a4a151b2..191a787b69 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/checkerboardShader.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/checkerboardShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/volumeShaderDensity.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/volumeShaderDensity.glslfx
index 0c0c21c313..259687a42d 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/volumeShaderDensity.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/volumeShaderDensity.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/volumeShaderTwoFields.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/volumeShaderTwoFields.glslfx
index 6b9040ae7d..983f5bd7e9 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/volumeShaderTwoFields.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVdbVolume/volumeShaderTwoFields.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_001.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_001.png
new file mode 100644
index 0000000000..275afcc2ba
Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_001.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_004.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_004.png
new file mode 100644
index 0000000000..5369c65cc6
Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_004.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_2.5.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_2.5.png
new file mode 100644
index 0000000000..124eddb2f8
Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/baseline/testUsdImagingGLVelocityMotion_2.5.png differ
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/scene.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/scene.usda
new file mode 100644
index 0000000000..ac448cab47
--- /dev/null
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVelocityMotion/scene.usda
@@ -0,0 +1,482 @@
+#usda 1.0
+(
+    startTimeCode = 0
+    endTimeCode = 5
+    framesPerSecond = 24
+    upAxis = "Y"
+)
+
+class "_Reference"
+{
+    float3[] extent = [(-0.5, -0.5, 0), (0.5, 0.5, 0.25)]
+    point3f[] points = [
+        (0, 0, 0.25),
+        (0.5, 0.5, 0),
+        (-0.5, 0.5, 0),
+        (-0.5, -0.5, 0),
+        (0.5, -0.5, 0),
+        (0, 0, 0)
+    ]
+    int[] faceVertexCounts = [3, 3, 3, 3, 3, 3, 3, 3]
+    int[] faceVertexIndices = [
+        5,3,2,
+        4,3,5,
+        1,4,5,
+        1,0,4,
+        4,0,3,
+        3,0,2,
+        0,1,5,
+        5,2,0
+    ]
+    uniform token orientation = "leftHanded"
+    uniform token subdivisionScheme = "none"
+    color3f[] primvars:displayColor = [(0, 0, 1)]
+}
+
+
+class "_Pointer"
+{
+    float3[] extent = [(-0.5, 0, 0), (0.5, 0.5, 0.25)]
+    point3f[] points = [
+        (0, 0, 0.25),
+        (0.5, 0.5, 0),
+        (-0.5, 0.5, 0),
+        (0, 0, 0)
+    ]
+    int[] faceVertexCounts = [3, 3, 3, 3]
+    int[] faceVertexIndices = [
+        3, 2, 1,
+        0, 1, 2,
+        1, 0, 3,
+        2, 3, 0]
+    uniform token orientation = "leftHanded"
+    uniform token subdivisionScheme = "none"
+    color3f[] primvars:displayColor = [(0, 1, 1)]
+}
+
+
+def Xform "World"
+{
+    def Camera "main_cam"
+    {
+        float focalLength = 24
+        vector3f xformOp:translate = (2.5, 2.5, 20)
+        uniform token[] xformOpOrder = ["xformOp:translate"]
+    }
+
+    # def Xform "Prototypes"
+    # {
+    #     token visibility = "invisible"
+        
+    #     def Mesh "Reference"
+    #     {
+    #         float3[] extent = [(-0.5, -0.5, 0), (0.5, 0.5, 0.25)]
+    #         point3f[] points = [
+    #             (0, 0, 0.25),
+    #             (0.5, 0.5, 0),
+    #             (-0.5, 0.5, 0),
+    #             (-0.5, -0.5, 0),
+    #             (0.5, -0.5, 0),
+    #             (0, 0, 0)
+    #         ]
+    #         int[] faceVertexCounts = [3, 3, 3, 3, 3, 3, 3, 3]
+    #         int[] faceVertexIndices = [
+    #             5,3,2,
+    #             4,3,5,
+    #             1,4,5,
+    #             1,0,4,
+    #             4,0,3,
+    #             3,0,2,
+    #             0,1,5,
+    #             5,2,0
+    #         ]
+    #         uniform token orientation = "leftHanded"
+    #         uniform token subdivisionScheme = "none"
+    #         color3f[] primvars:displayColor = [(0, 0, 1)]
+    #     }
+        
+    #     def Mesh "Pointer"
+    #     {
+    #         float3[] extent = [(-0.5, 0, 0), (0.5, 0.5, 0.25)]
+    #         point3f[] points = [
+    #             (0, 0, 0.25),
+    #             (0.5, 0.5, 0),
+    #             (-0.5, 0.5, 0),
+    #             (0, 0, 0)
+    #         ]
+    #         int[] faceVertexCounts = [3, 3, 3, 3]
+    #         int[] faceVertexIndices = [
+    #             3, 2, 1,
+    #             0, 1, 2,
+    #             1, 0, 3,
+    #             2, 3, 0]
+    #         uniform token orientation = "leftHanded"
+    #         uniform token subdivisionScheme = "none"
+    #         color3f[] primvars:displayColor = [(0, 1, 1)]
+    #     }
+    # }
+    
+    def Xform "OrientationsVelocity"
+    {
+        def PointInstancer "Reference"
+        {
+            point3f[] positions = [(0, 0, 0)]
+            quath[] orientations.timeSamples = {
+                0: [(1, 0, 0, 0)],
+                1: [(0.809, 0, 0, 0.588)],
+                2: [(0.309, 0, 0, 0.951)],
+                3: [(-0.309, 0, 0, 0.951)],
+                4: [(-0.809, 0, 0, 0.588)],
+                5: [(-1, 0, 0, 0)]
+            }
+            int[] protoIndices = [0]
+            rel prototypes = [</World/OrientationsVelocity/Reference/Prototypes/Reference>]
+            
+            def Xform "Prototypes"
+            {
+                def Mesh "Reference" (
+                    inherits = </_Reference>
+                )
+                { }
+            }
+        }
+        
+        def PointInstancer "Pointer"
+        {
+            point3f[] positions = [(0, 0, 0)]
+            quath[] orientations.timeSamples = {
+                0: [(1, 0, 0, 0)],
+                5: [(-1, 0, 0, 0)]
+            }
+            vector3f[] angularVelocities.timeSamples = {
+                0: [(0, 0, 1728)],
+                5: [(0, 0, 0)]
+            }
+            int[] protoIndices = [0]
+            rel prototypes = [</World/OrientationsVelocity/Pointer/Prototypes/Pointer>]      
+            
+            def Xform "Prototypes"
+            {
+                def Mesh "Pointer" (
+                    inherits = </_Pointer>
+                )
+                { }
+            }      
+        }
+        
+        vector3f xformOp:translate = (2.5, 8, 0)
+        uniform token[] xformOpOrder = ["xformOp:translate"]
+    }
+    
+    def Xform "PointsAcceleration"
+    {
+        def Mesh "Reference"
+        {
+            float3[] extent = [(-0.5, -0.5, 0),(5.5, 0.5, 0.25)]
+            point3f[] points.timeSamples = {
+                0.0: [(0.000, 0, 0), (0.000, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.1: [(0.198, 0, 0), (0.198, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.2: [(0.392, 0, 0), (0.392, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.3: [(0.582, 0, 0), (0.582, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.4: [(0.768, 0, 0), (0.768, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.5: [(0.950, 0, 0), (0.950, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.6: [(1.128, 0, 0), (1.128, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.7: [(1.302, 0, 0), (1.302, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.8: [(1.472, 0, 0), (1.472, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                0.9: [(1.638, 0, 0), (1.638, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.0: [(1.800, 0, 0), (1.800, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.1: [(1.958, 0, 0), (1.958, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.2: [(2.112, 0, 0), (2.112, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.3: [(2.262, 0, 0), (2.262, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.4: [(2.408, 0, 0), (2.408, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.5: [(2.550, 0, 0), (2.550, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.6: [(2.688, 0, 0), (2.688, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.7: [(2.822, 0, 0), (2.822, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.8: [(2.952, 0, 0), (2.952, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1.9: [(3.078, 0, 0), (3.078, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.0: [(3.200, 0, 0), (3.200, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.1: [(3.318, 0, 0), (3.318, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.2: [(3.432, 0, 0), (3.432, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.3: [(3.542, 0, 0), (3.542, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.4: [(3.648, 0, 0), (3.648, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.5: [(3.750, 0, 0), (3.750, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.6: [(3.848, 0, 0), (3.848, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.7: [(3.942, 0, 0), (3.942, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.8: [(4.032, 0, 0), (4.032, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2.9: [(4.118, 0, 0), (4.118, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.0: [(4.200, 0, 0), (4.200, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.1: [(4.278, 0, 0), (4.278, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.2: [(4.352, 0, 0), (4.352, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.3: [(4.422, 0, 0), (4.422, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.4: [(4.488, 0, 0), (4.488, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.5: [(4.550, 0, 0), (4.550, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.6: [(4.608, 0, 0), (4.608, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.7: [(4.662, 0, 0), (4.662, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.8: [(4.712, 0, 0), (4.712, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3.9: [(4.758, 0, 0), (4.758, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.0: [(4.800, 0, 0), (4.800, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.1: [(4.838, 0, 0), (4.838, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.2: [(4.872, 0, 0), (4.872, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.3: [(4.902, 0, 0), (4.902, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.4: [(4.928, 0, 0), (4.928, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.5: [(4.950, 0, 0), (4.950, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.6: [(4.968, 0, 0), (4.968, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.7: [(4.982, 0, 0), (4.982, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.8: [(4.992, 0, 0), (4.992, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4.9: [(4.998, 0, 0), (4.998, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                5.0: [(5.000, 0, 0), (5.000, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)]
+            }
+            int[] faceVertexCounts = [3, 3, 3, 3, 3, 3, 3, 3]
+            int[] faceVertexIndices = [
+                0, 4, 3,
+                2, 0, 3,
+                5, 0, 2,
+                1, 5, 2,
+                3, 4, 1,
+                2, 3, 1,
+                1, 0, 5,
+                4, 0, 1
+            ]
+            uniform token orientation = "leftHanded"
+            uniform token subdivisionScheme = "none"
+            color3f[] primvars:displayColor = [(0, 0, 1)]
+        }
+        
+        def Mesh "Pointer"
+        {
+            float3[] extent = [(0, -0.5, 0), (5.5, 0.5, 0.25)]
+            point3f[] points.timeSamples = {
+                0: [(0, 0, 0), (0, 0, 0.25), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                5: [(0, 0, 0), (0, 0, 0.25), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+            }
+            vector3f[] velocities.timeSamples = {
+                0: [(48, 0, 0), (48, 0, 0), (0, 0, 0), (0, 0, 0)],
+                5: [(0, 0, 0), (0, 0, 0), (0, 0, 0), (0, 0, 0)]
+            }
+            vector3f[] accelerations.timeSamples = {
+                0: [(-230.4, 0, 0), (-230.4, 0, 0), (0, 0, 0), (0, 0, 0)],
+                5: [(0, 0, 0), (0, 0, 0), (0, 0, 0), (0, 0, 0)]
+            }
+            int[] faceVertexCounts = [3, 3, 3, 3]
+            int[] faceVertexIndices = [
+                0, 3, 2,
+                3, 1, 2,
+                3, 0, 1,
+                2, 1, 0
+            ]
+            uniform token orientation = "leftHanded"
+            uniform token subdivisionScheme = "none"
+            color3f[] primvars:displayColor = [(0, 1, 1)]
+        }
+        vector3f xformOp:translate = (0, 6, 0)
+        uniform token[] xformOpOrder = ["xformOp:translate"]
+    }
+    
+    def Xform "PositionsAcceleration"
+    {
+        
+        def PointInstancer "Reference"
+        {
+            float3[] extent = [(-0.5, -0.5, -0.5), (5.5, 0.5, 0.5)]
+            point3f[] positions.timeSamples = {
+                0.0: [(0.000, 0, 0)],
+                0.1: [(0.198, 0, 0)],
+                0.2: [(0.392, 0, 0)],
+                0.3: [(0.582, 0, 0)],
+                0.4: [(0.768, 0, 0)],
+                0.5: [(0.950, 0, 0)],
+                0.6: [(1.128, 0, 0)],
+                0.7: [(1.302, 0, 0)],
+                0.8: [(1.472, 0, 0)],
+                0.9: [(1.638, 0, 0)],
+                1.0: [(1.800, 0, 0)],
+                1.1: [(1.958, 0, 0)],
+                1.2: [(2.112, 0, 0)],
+                1.3: [(2.262, 0, 0)],
+                1.4: [(2.408, 0, 0)],
+                1.5: [(2.550, 0, 0)],
+                1.6: [(2.688, 0, 0)],
+                1.7: [(2.822, 0, 0)],
+                1.8: [(2.952, 0, 0)],
+                1.9: [(3.078, 0, 0)],
+                2.0: [(3.200, 0, 0)],
+                2.1: [(3.318, 0, 0)],
+                2.2: [(3.432, 0, 0)],
+                2.3: [(3.542, 0, 0)],
+                2.4: [(3.648, 0, 0)],
+                2.5: [(3.750, 0, 0)],
+                2.6: [(3.848, 0, 0)],
+                2.7: [(3.942, 0, 0)],
+                2.8: [(4.032, 0, 0)],
+                2.9: [(4.118, 0, 0)],
+                3.0: [(4.200, 0, 0)],
+                3.1: [(4.278, 0, 0)],
+                3.2: [(4.352, 0, 0)],
+                3.3: [(4.422, 0, 0)],
+                3.4: [(4.488, 0, 0)],
+                3.5: [(4.550, 0, 0)],
+                3.6: [(4.608, 0, 0)],
+                3.7: [(4.662, 0, 0)],
+                3.8: [(4.712, 0, 0)],
+                3.9: [(4.758, 0, 0)],
+                4.0: [(4.800, 0, 0)],
+                4.1: [(4.838, 0, 0)],
+                4.2: [(4.872, 0, 0)],
+                4.3: [(4.902, 0, 0)],
+                4.4: [(4.928, 0, 0)],
+                4.5: [(4.950, 0, 0)],
+                4.6: [(4.968, 0, 0)],
+                4.7: [(4.982, 0, 0)],
+                4.8: [(4.992, 0, 0)],
+                4.9: [(4.998, 0, 0)],
+                5.0: [(5.000, 0, 0)]
+            }
+            int[] protoIndices = [0]
+            rel prototypes = [</World/PositionsAcceleration/Reference/Prototypes/Reference>]
+            
+            def Xform "Prototypes"
+            {
+                def Mesh "Reference" (
+                    inherits = </_Reference>
+                )
+                { }
+            }
+        }
+        
+        def PointInstancer "Pointer"
+        {
+            float3[] extent = [(-0.5, -0.5, -0.5), (5.5, 0.5, 0.5)]
+            point3f[] positions.timeSamples = {
+                0: [(0, 0, 0)],
+                5: [(0, 0, 0)]
+            }
+            vector3f[] velocities.timeSamples = {
+                0: [(48, 0, 0)],
+                5: [(0, 0, 0)]
+            }
+            vector3f[] accelerations.timeSamples = {
+                0: [(-230.4, 0, 0)],
+                5: [(0, 0, 0)]
+            }
+            int[] protoIndices = [0]
+            rel prototypes = [</World/PositionsAcceleration/Pointer/Prototypes/Pointer>]
+            
+            def Xform "Prototypes"
+            {
+                def Mesh "Pointer" (
+                    inherits = </_Pointer>
+                )
+                { }
+            }
+        }
+        
+        vector3f xformOp:translate = (0, 4, 0)
+        uniform token[] xformOpOrder = ["xformOp:translate"]
+    }
+    
+    def Xform "PositionsVelocity"
+    {
+        def PointInstancer "Reference"
+        {
+            float3[] extent = [(-0.5, -0.5, -0.5), (5.5, 0.5, 0.5)]
+            point3f[] positions.timeSamples = {
+                0: [(0, 0, 0)],
+                1: [(1, 0, 0)],
+                2: [(2, 0, 0)],
+                3: [(3, 0, 0)],
+                4: [(4, 0, 0)],
+                5: [(5, 0, 0)]
+            }
+            int[] protoIndices = [0]
+            rel prototypes = [</World/PositionsVelocity/Reference/Prototypes/Reference>]
+            
+            def Xform "Prototypes"
+            {
+                def Mesh "Reference" (
+                    inherits = </_Reference>
+                )
+                { }
+            }
+        }
+        
+        def PointInstancer "Pointer"
+        {
+            float3[] extent = [(-0.5, -0.5, -0.5), (5.5, 0.5, 0.5)]
+            point3f[] positions.timeSamples = {
+                0: [(0, 0, 0)],
+                5: [(0, 0, 0)]
+            }
+            vector3f[] velocities.timeSamples = {
+                0: [(24, 0, 0)],
+                5: [(0, 0, 0)]
+            }
+            int[] protoIndices = [0]
+            rel prototypes = [</World/PositionsVelocity/Pointer/Prototypes/Pointer>]
+            
+            def Xform "Prototypes"
+            {
+                def Mesh "Pointer" (
+                    inherits = </_Pointer>
+                )
+                { }
+            }
+        }
+        
+        vector3f xformOp:translate = (0, 2, 0)
+        uniform token[] xformOpOrder = ["xformOp:translate"]
+    }
+    
+    def Xform "PointsVelocity"
+    {
+        def Mesh "Reference"
+        {
+            float3[] extent = [(-0.5, -0.5, 0),(5.5, 0.5, 0.25)]
+            point3f[] points.timeSamples = {
+                0: [(0, 0, 0), (0, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                1: [(1, 0, 0), (1, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                2: [(2, 0, 0), (2, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                3: [(3, 0, 0), (3, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                4: [(4, 0, 0), (4, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                5: [(5, 0, 0), (5, 0, 0.25), (-0.5, 0.5, 0), (-0.5, -0.5, 0), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+            }
+            int[] faceVertexCounts = [3, 3, 3, 3, 3, 3, 3, 3]
+            int[] faceVertexIndices = [
+                0, 4, 3,
+                2, 0, 3,
+                5, 0, 2,
+                1, 5, 2,
+                3, 4, 1,
+                2, 3, 1,
+                1, 0, 5,
+                4, 0, 1
+            ]
+            uniform token orientation = "leftHanded"
+            uniform token subdivisionScheme = "none"
+            color3f[] primvars:displayColor = [(0, 0, 1)]
+        }
+        
+        def Mesh "Pointer"
+        {
+            float3[] extent = [(0, -0.5, 0), (5.5, 0.5, 0.25)]
+            point3f[] points.timeSamples = {
+                0: [(0, 0, 0), (0, 0, 0.25), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+                5: [(0, 0, 0), (0, 0, 0.25), (5.5, -0.5, 0), (5.5, 0.5, 0)],
+            }
+            vector3f[] velocities.timeSamples = {
+                0: [(24, 0, 0), (24, 0, 0), (0, 0, 0), (0, 0, 0)],
+                5: [(0, 0, 0), (0, 0, 0), (0, 0, 0), (0, 0, 0)]
+            }
+            int[] faceVertexCounts = [3, 3, 3, 3]
+            int[] faceVertexIndices = [
+                0, 3, 2,
+                3, 1, 2,
+                3, 0, 1,
+                2, 1, 0
+            ]
+            uniform token orientation = "leftHanded"
+            uniform token subdivisionScheme = "none"
+            color3f[] primvars:displayColor = [(0, 1, 1)]
+        }
+    }
+    
+}
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/checkerboardShader.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/checkerboardShader.glslfx
index 97a5fca6c3..f75a1323fc 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/checkerboardShader.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/checkerboardShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/volumeShaderParameter.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/volumeShaderParameter.glslfx
index a4a7ae99a0..452329f0b5 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/volumeShaderParameter.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/volumeShaderParameter.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/volumeShaderShape.glslfx b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/volumeShaderShape.glslfx
index 326d0eefc7..a74632fcc5 100644
--- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/volumeShaderShape.glslfx
+++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVolumeMaterial/volumeShaderShape.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 -- configuration
diff --git a/pxr/usdImaging/usdImagingGL/unitTestGLDrawing.cpp b/pxr/usdImaging/usdImagingGL/unitTestGLDrawing.cpp
index 1db86cffaa..f6d4a7c70a 100644
--- a/pxr/usdImaging/usdImagingGL/unitTestGLDrawing.cpp
+++ b/pxr/usdImaging/usdImagingGL/unitTestGLDrawing.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 
diff --git a/pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h b/pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h
index f627e7c779..b45d80a19f 100644
--- a/pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h
+++ b/pxr/usdImaging/usdImagingGL/unitTestGLDrawing.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_GL_UNIT_TEST_GLDRAWING_H
 #define PXR_USD_IMAGING_USD_IMAGING_GL_UNIT_TEST_GLDRAWING_H
diff --git a/pxr/usdImaging/usdImagingGL/version.h b/pxr/usdImaging/usdImagingGL/version.h
index 87f82f7e01..9bdc954a6f 100644
--- a/pxr/usdImaging/usdImagingGL/version.h
+++ b/pxr/usdImaging/usdImagingGL/version.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_IMAGING_GL_VERSION_H
 #define PXR_USD_IMAGING_USD_IMAGING_GL_VERSION_H
@@ -33,7 +16,8 @@
 // 6 -> 7: Added UsdImagingGLEngine::_GetTaskController() and _IsUsingLegacyImpl()
 // 7 -> 8: Added outHitNormal parameter to UsdImagingGLEngine::TestIntersection()
 // 8 -> 9: Removed the "HydraDisabled" renderer (i.e. LegacyEngine).
-#define USDIMAGINGGL_API_VERSION 9
+// 9 -> 10: Added new UsdImagingGLEngine::TestIntersection() method with resolve mode
+#define USDIMAGINGGL_API_VERSION 10
 
 #endif // PXR_USD_IMAGING_USD_IMAGING_GL_VERSION_H
 
diff --git a/pxr/usdImaging/usdImagingGL/wrapEngine.cpp b/pxr/usdImaging/usdImagingGL/wrapEngine.cpp
index 6d84e236ab..e4ad0cb7a4 100644
--- a/pxr/usdImaging/usdImagingGL/wrapEngine.cpp
+++ b/pxr/usdImaging/usdImagingGL/wrapEngine.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
@@ -147,6 +130,8 @@ void wrapEngine()
                  return_value_policy< TfPySequenceToList >())
             .def("GetRendererSetting", &UsdImagingGLEngine::GetRendererSetting)
             .def("SetRendererSetting", &UsdImagingGLEngine::SetRendererSetting)
+            .def("SetActiveRenderPassPrimPath",
+                 &UsdImagingGLEngine::SetActiveRenderPassPrimPath)
             .def("SetActiveRenderSettingsPrimPath",
                  &UsdImagingGLEngine::SetActiveRenderSettingsPrimPath)
             .def("GetAvailableRenderSettingsPrimPaths",
@@ -191,6 +176,8 @@ void wrapEngine()
             .def_readwrite("driver", &Parameters::driver)
             .def_readwrite("rendererPluginId", &Parameters::rendererPluginId)
             .def_readwrite("gpuEnabled", &Parameters::gpuEnabled)
+            .def_readwrite("displayUnloadedPrimsWithBounds", 
+                &Parameters::displayUnloadedPrimsWithBounds)
             .def_readwrite("allowAsynchronousSceneProcessing",
                 &Parameters::allowAsynchronousSceneProcessing)
             
diff --git a/pxr/usdImaging/usdImagingGL/wrapRenderParams.cpp b/pxr/usdImaging/usdImagingGL/wrapRenderParams.cpp
index daa28193e2..54b3cacdd9 100644
--- a/pxr/usdImaging/usdImagingGL/wrapRenderParams.cpp
+++ b/pxr/usdImaging/usdImagingGL/wrapRenderParams.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
diff --git a/pxr/usdImaging/usdImagingGL/wrapRendererCommands.cpp b/pxr/usdImaging/usdImagingGL/wrapRendererCommands.cpp
index 8fdc54e520..0c64914178 100644
--- a/pxr/usdImaging/usdImagingGL/wrapRendererCommands.cpp
+++ b/pxr/usdImaging/usdImagingGL/wrapRendererCommands.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
diff --git a/pxr/usdImaging/usdImagingGL/wrapRendererSettings.cpp b/pxr/usdImaging/usdImagingGL/wrapRendererSettings.cpp
index 0bdc2083e8..ab46e91c05 100644
--- a/pxr/usdImaging/usdImagingGL/wrapRendererSettings.cpp
+++ b/pxr/usdImaging/usdImagingGL/wrapRendererSettings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
diff --git a/pxr/usdImaging/usdProcImaging/api.h b/pxr/usdImaging/usdProcImaging/api.h
index ff9e80b016..d12c8761d1 100644
--- a/pxr/usdImaging/usdProcImaging/api.h
+++ b/pxr/usdImaging/usdProcImaging/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_PROC_IMAGING_API_H
 #define PXR_USD_IMAGING_USD_PROC_IMAGING_API_H
diff --git a/pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.cpp b/pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.cpp
index 42647530ef..08a0bb2917 100644
--- a/pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.cpp
+++ b/pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.h"
 #include "pxr/usdImaging/usdImaging/tokens.h"
@@ -35,6 +18,8 @@
 #include "pxr/imaging/hd/primvarsSchema.h"
 #include "pxr/imaging/hd/primvarSchema.h"
 
+#include "pxr/usd/usd/prim.h"
+
 #include "pxr/base/tf/type.h"
 
 
@@ -129,8 +114,8 @@ UsdProcImagingGenerativeProceduralAdapter::Populate(
 {
     const SdfPath cachePath = ResolveCachePath(
         prim.GetPath(), instancerContext);
-    UsdPrim proxyPrim
-        = prim.GetStage()->GetPrimAtPath(cachePath.GetAbsoluteRootOrPrimPath());
+    UsdPrim proxyPrim = _GetPrim(ResolveProxyPrimPath(
+        cachePath, instancerContext));
 
     index->InsertRprim(
         _GetHydraPrimType(prim), cachePath, proxyPrim,
diff --git a/pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.h b/pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.h
index 4745ac2dce..b050a13f5f 100644
--- a/pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.h
+++ b/pxr/usdImaging/usdProcImaging/generativeProceduralAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_PROC_IMAGING_GENERATIVE_PROCEDURAL_ADAPTER_H
 #define PXR_USD_IMAGING_USD_PROC_IMAGING_GENERATIVE_PROCEDURAL_ADAPTER_H
diff --git a/pxr/usdImaging/usdProcImaging/pch.h b/pxr/usdImaging/usdProcImaging/pch.h
index 32358e284a..ae10fe25a5 100644
--- a/pxr/usdImaging/usdProcImaging/pch.h
+++ b/pxr/usdImaging/usdProcImaging/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,9 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-
+#include <Windows.h>
+#include <intrin.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <array>
 #include <atomic>
 #include <bitset>
@@ -57,7 +43,6 @@
 #include <float.h>
 #include <functional>
 #include <initializer_list>
-#include <intrin.h>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -69,6 +54,7 @@
 #include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <ostream>
 #include <set>
 #include <sstream>
@@ -78,59 +64,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/container/flat_map.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
@@ -144,24 +86,7 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
@@ -172,6 +97,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/usdRiPxrImaging/CMakeLists.txt b/pxr/usdImaging/usdRiPxrImaging/CMakeLists.txt
index e4046f5444..16478b37aa 100644
--- a/pxr/usdImaging/usdRiPxrImaging/CMakeLists.txt
+++ b/pxr/usdImaging/usdRiPxrImaging/CMakeLists.txt
@@ -25,6 +25,7 @@ pxr_library(usdRiPxrImaging
         ${TBB_INCLUDE_DIRS}
 
     PUBLIC_CLASSES
+        pxrCameraAPIAdapter
         pxrDisplayFilterAdapter
         pxrIntegratorAdapter
         pxrSampleFilterAdapter
diff --git a/pxr/usdImaging/usdRiPxrImaging/api.h b/pxr/usdImaging/usdRiPxrImaging/api.h
index 8c623a8e62..47df33c07d 100644
--- a/pxr/usdImaging/usdRiPxrImaging/api.h
+++ b/pxr/usdImaging/usdRiPxrImaging/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_API_H
 #define PXR_USD_IMAGING_USD_RI_PXR_IMAGING_API_H
diff --git a/pxr/usdImaging/usdRiPxrImaging/dataSourcePxrRenderTerminalPrims.h b/pxr/usdImaging/usdRiPxrImaging/dataSourcePxrRenderTerminalPrims.h
index a81713bc37..417cb459ca 100644
--- a/pxr/usdImaging/usdRiPxrImaging/dataSourcePxrRenderTerminalPrims.h
+++ b/pxr/usdImaging/usdRiPxrImaging/dataSourcePxrRenderTerminalPrims.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_DATA_SOURCE_RENDER_TERMINAL_PRIMS_H
diff --git a/pxr/usdImaging/usdRiPxrImaging/pch.h b/pxr/usdImaging/usdRiPxrImaging/pch.h
index 6ad2d403bb..ae10fe25a5 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pch.h
+++ b/pxr/usdImaging/usdRiPxrImaging/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,12 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -69,6 +53,9 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,62 +64,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/container/flat_map.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
@@ -146,31 +86,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_unordered_set.h>
@@ -179,7 +97,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/usdRiPxrImaging/plugInfo.json b/pxr/usdImaging/usdRiPxrImaging/plugInfo.json
index 49ebc43448..fa0cb5d88f 100644
--- a/pxr/usdImaging/usdRiPxrImaging/plugInfo.json
+++ b/pxr/usdImaging/usdRiPxrImaging/plugInfo.json
@@ -26,6 +26,13 @@
                         "isInternal": true,
                         "primTypeName": "PxrSampleFilterPluginBase",
                         "includeDerivedPrimTypes" : true 
+                    },
+                    "UsdRiPxrImagingCameraAPIAdapter": {
+                        "bases": [
+                            "UsdImagingAPISchemaAdapter"
+                        ],
+                        "isInternal": true,
+                        "apiSchemaName": "PxrCameraAPI"
                     }
                 }
             },
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrCameraAPIAdapter.cpp b/pxr/usdImaging/usdRiPxrImaging/pxrCameraAPIAdapter.cpp
new file mode 100644
index 0000000000..f942944210
--- /dev/null
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrCameraAPIAdapter.cpp
@@ -0,0 +1,154 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/usdImaging/usdRiPxrImaging/pxrCameraAPIAdapter.h"
+
+#include "pxr/usdImaging/usdImaging/dataSourceMapped.h"
+
+#include "pxr/imaging/hd/cameraSchema.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/usd/usd/primDefinition.h"
+#include "pxr/usd/usd/schemaRegistry.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+namespace
+{
+
+static const char * const _appliedSchemaName = "PxrCameraAPI";
+
+std::pair<TfToken, TfToken>
+_SplitNamespace(const TfToken &name)
+{
+    static const char namespaceDelimiter =
+        SdfPathTokens->namespaceDelimiter.GetText()[0];
+    
+    const std::string &str = name.GetString();
+    const size_t i = str.find(namespaceDelimiter);
+    if (i == std::string::npos) {
+        return { TfToken(), TfToken() };
+    }
+
+    return { TfToken(str.substr(0, i)),
+             TfToken(str.substr(i + 1)) };
+}
+
+HdSampledDataSourceHandle
+_DataSourceAuthoredAttributeNew(
+    const UsdAttribute &usdAttr,
+    const UsdImagingDataSourceStageGlobals &stageGlobals,
+    const SdfPath &sceneIndexPath,
+    const HdDataSourceLocator &timeVaryingFlagLocator)
+{
+    UsdAttributeQuery query(usdAttr);
+    if (!query.HasAuthoredValue()) {
+        return nullptr;
+    }
+    return UsdImagingDataSourceAttributeNew(
+        query, stageGlobals, sceneIndexPath, timeVaryingFlagLocator);
+}
+
+//
+// This method or a generalization of this method might be useful for other
+// adapters. Consider moving it to a more central place such as UsdImaging.
+//
+std::vector<UsdImagingDataSourceMapped::AttributeMapping>
+_GetNamespacedAttributeMappingsForAppliedSchema(
+    const TfToken &appliedSchemaName)
+{
+    std::vector<UsdImagingDataSourceMapped::AttributeMapping> result;
+
+    const UsdPrimDefinition * const primDef =
+        UsdSchemaRegistry::GetInstance().FindAppliedAPIPrimDefinition(
+            appliedSchemaName);
+    if (!primDef) {
+        TF_CODING_ERROR(
+            "Could not find definition for applied schema '%s'.",
+            appliedSchemaName.GetText());
+        return result;
+    }
+
+    for (const TfToken &usdName : primDef->GetPropertyNames()) {
+        const std::pair<TfToken, TfToken> namespaceAndName =
+            _SplitNamespace(usdName);
+        if (namespaceAndName.second.IsEmpty()) {
+            TF_CODING_ERROR(
+                "Expected all attributes on applied schema "
+                "'%s' to be namespaced but attribute '%s' "
+                "schema has no namespace.",
+                appliedSchemaName.GetText(),
+                usdName.GetText());
+            continue;
+        }
+
+        result.push_back(
+            { usdName,
+              HdDataSourceLocator(namespaceAndName.first,
+                                  namespaceAndName.second),
+              _DataSourceAuthoredAttributeNew});
+    }
+
+    return result;
+}
+
+const UsdImagingDataSourceMapped::AttributeMappings &
+_GetMappings() {
+    static const UsdImagingDataSourceMapped::AttributeMappings result(
+        _GetNamespacedAttributeMappingsForAppliedSchema(
+            TfToken(_appliedSchemaName)),
+        HdCameraSchema::GetNamespacedPropertiesLocator());
+    return result;
+}
+
+}
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    using Adapter = UsdRiPxrImagingCameraAPIAdapter;
+    TfType t = TfType::Define<Adapter, TfType::Bases<Adapter::BaseAdapter>>();
+    t.SetFactory<UsdImagingAPISchemaAdapterFactory<Adapter>>();
+}
+
+HdContainerDataSourceHandle
+UsdRiPxrImagingCameraAPIAdapter::GetImagingSubprimData(
+    UsdPrim const& prim,
+    TfToken const& subprim,
+    TfToken const &appliedInstanceName,
+    const UsdImagingDataSourceStageGlobals &stageGlobals)
+{
+    if (!subprim.IsEmpty() || !appliedInstanceName.IsEmpty()) {
+        return nullptr;
+    }
+
+    return
+        HdRetainedContainerDataSource::New(
+            HdCameraSchema::GetSchemaToken(),
+            HdCameraSchema::Builder()
+                .SetNamespacedProperties(
+                    UsdImagingDataSourceMapped::New(
+                        prim, prim.GetPath(), _GetMappings(), stageGlobals))
+                .Build());
+}
+
+HdDataSourceLocatorSet
+UsdRiPxrImagingCameraAPIAdapter::InvalidateImagingSubprim(
+    UsdPrim const& prim,
+    TfToken const& subprim,
+    TfToken const &appliedInstanceName,
+    TfTokenVector const& properties,
+    UsdImagingPropertyInvalidationType invalidationType)
+{
+    if (!subprim.IsEmpty() || !appliedInstanceName.IsEmpty()) {
+        return HdDataSourceLocatorSet();
+    }
+
+    return UsdImagingDataSourceMapped::Invalidate(
+        properties, _GetMappings());
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrCameraAPIAdapter.h b/pxr/usdImaging/usdRiPxrImaging/pxrCameraAPIAdapter.h
new file mode 100644
index 0000000000..f275ffb00d
--- /dev/null
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrCameraAPIAdapter.h
@@ -0,0 +1,49 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_CAMERA_API_ADAPTER_H
+#define PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_CAMERA_API_ADAPTER_H
+
+/// \file
+
+#include "pxr/pxr.h"
+#include "pxr/usdImaging/usdRiPxrImaging/api.h"
+#include "pxr/usdImaging/usdImaging/apiSchemaAdapter.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class UsdRiPxrImagingCameraAPIAdapter
+///
+/// Scene index support for PxrCameraAPI applied USD schema.
+///
+/// The attributes of the schema will be available under
+/// HdCameraSchema::GetNamespacedProperties().
+///
+class UsdRiPxrImagingCameraAPIAdapter : public UsdImagingAPISchemaAdapter
+{
+public:
+
+    using BaseAdapter = UsdImagingAPISchemaAdapter;
+
+    USDRIPXRIMAGING_API
+    HdContainerDataSourceHandle GetImagingSubprimData(
+            UsdPrim const& prim,
+            TfToken const& subprim,
+            TfToken const &appliedInstanceName,
+            const UsdImagingDataSourceStageGlobals &stageGlobals) override;
+
+    USDRIPXRIMAGING_API
+    HdDataSourceLocatorSet InvalidateImagingSubprim(
+            UsdPrim const& prim,
+            TfToken const& subprim,
+            TfToken const &appliedInstanceName,
+            TfTokenVector const& properties,
+            UsdImagingPropertyInvalidationType invalidationType) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.cpp b/pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.cpp
index e45cebfbc5..437f63dc30 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.cpp
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.h"
 #include "pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.h"
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.h b/pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.h
index 2e39a22a7a..461cb89e78 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.h
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrDisplayFilterAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_DISPLAY_FILTER_ADAPTER_H
 #define PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_DISPLAY_FILTER_ADAPTER_H
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.cpp b/pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.cpp
index bb7fe3edef..ff30fa09d6 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.cpp
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.h"
 #include "pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.h"
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.h b/pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.h
index 41134ba302..8b13e5ac9a 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.h
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrIntegratorAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_INTEGRATOR_ADAPTER_H
 #define PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_INTEGRATOR_ADAPTER_H
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.cpp b/pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.cpp
index 1d22b79527..37953a0c53 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.cpp
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.h"
 #include "pxr/usd/usd/attribute.h"
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.h b/pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.h
index 7713977ba0..44034324d8 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.h
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_RENDER_TERMINAL_HELPER_H
 #define PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_RENDER_TERMINAL_HELPER_H
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.cpp b/pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.cpp
index 695b30457e..934ca5ac64 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.cpp
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.h"
 #include "pxr/usdImaging/usdRiPxrImaging/pxrRenderTerminalHelper.h"
diff --git a/pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.h b/pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.h
index 84922c595e..3d7877156f 100644
--- a/pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.h
+++ b/pxr/usdImaging/usdRiPxrImaging/pxrSampleFilterAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_SAMPLE_FILTER_ADAPTER_H
 #define PXR_USD_IMAGING_USD_RI_PXR_IMAGING_PXR_SAMPLE_FILTER_ADAPTER_H
diff --git a/pxr/usdImaging/usdRiPxrImaging/tokens.cpp b/pxr/usdImaging/usdRiPxrImaging/tokens.cpp
index e2b44b2768..499975acc5 100644
--- a/pxr/usdImaging/usdRiPxrImaging/tokens.cpp
+++ b/pxr/usdImaging/usdRiPxrImaging/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdRiPxrImaging/tokens.h"
 
diff --git a/pxr/usdImaging/usdRiPxrImaging/tokens.h b/pxr/usdImaging/usdRiPxrImaging/tokens.h
index 187c8f134d..0289d3a742 100644
--- a/pxr/usdImaging/usdRiPxrImaging/tokens.h
+++ b/pxr/usdImaging/usdRiPxrImaging/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_TOKENS_H
 #define PXR_USD_IMAGING_USD_RI_PXR_IMAGING_TOKENS_H
diff --git a/pxr/usdImaging/usdRiPxrImaging/version.h b/pxr/usdImaging/usdRiPxrImaging/version.h
index 4672729a09..bbe6649873 100644
--- a/pxr/usdImaging/usdRiPxrImaging/version.h
+++ b/pxr/usdImaging/usdRiPxrImaging/version.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_RI_PXR_IMAGING_VERSION_H
 #define PXR_USD_IMAGING_USD_RI_PXR_IMAGING_VERSION_H
diff --git a/pxr/usdImaging/usdSkelImaging/api.h b/pxr/usdImaging/usdSkelImaging/api.h
index 31412c372e..108d61af8d 100644
--- a/pxr/usdImaging/usdSkelImaging/api.h
+++ b/pxr/usdImaging/usdSkelImaging/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_SKEL_IMAGING_API_H
 #define PXR_USD_IMAGING_USD_SKEL_IMAGING_API_H
diff --git a/pxr/usdImaging/usdSkelImaging/package.cpp b/pxr/usdImaging/usdSkelImaging/package.cpp
index e131c42fc9..3f624e974f 100644
--- a/pxr/usdImaging/usdSkelImaging/package.cpp
+++ b/pxr/usdImaging/usdSkelImaging/package.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdSkelImaging/package.h"
 
diff --git a/pxr/usdImaging/usdSkelImaging/package.h b/pxr/usdImaging/usdSkelImaging/package.h
index 534850b4e1..da3ab5be46 100644
--- a/pxr/usdImaging/usdSkelImaging/package.h
+++ b/pxr/usdImaging/usdSkelImaging/package.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_SKEL_IMAGING_PACKAGE_H
 #define PXR_USD_IMAGING_USD_SKEL_IMAGING_PACKAGE_H
diff --git a/pxr/usdImaging/usdSkelImaging/pch.h b/pxr/usdImaging/usdSkelImaging/pch.h
index 69caaac23b..beb4e316bb 100644
--- a/pxr/usdImaging/usdSkelImaging/pch.h
+++ b/pxr/usdImaging/usdSkelImaging/pch.h
@@ -1,25 +1,8 @@
 //
-// Copyright 2018 Pixar
+// Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,12 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -69,6 +53,9 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,62 +64,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/container/flat_map.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
@@ -146,32 +86,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_unordered_set.h>
@@ -182,7 +99,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/usdSkelImaging/shaders/skinning.glslfx b/pxr/usdImaging/usdSkelImaging/shaders/skinning.glslfx
index de24a59d5e..3d0cdb240b 100644
--- a/pxr/usdImaging/usdSkelImaging/shaders/skinning.glslfx
+++ b/pxr/usdImaging/usdSkelImaging/shaders/skinning.glslfx
@@ -1,5 +1,12 @@
 -- glslfx version 0.1
 
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
 -- configuration
 {
     "techniques": {
@@ -23,9 +30,6 @@ const float EPS = 1e-5;
 
 void compute(int index)
 {
-    // model space -> bind space
-    mat4 geomBindXform = HdGet_geomBindXform();
-
     vec3 restP = HdGet_restPoints(index);
 
     // apply blend shapes
@@ -39,11 +43,14 @@ void compute(int index)
             restP += offset.xyz * weight;
         }
     }
-    vec4 initP = geomBindXform * vec4(restP, 1);
-    
+
     int numInfluencesPerComponent = HdGet_numInfluencesPerComponent();
     vec3 p;
     if (numInfluencesPerComponent > 0) {
+        // model space -> bind space
+        mat4 geomBindXform = HdGet_geomBindXform();
+        vec4 initP = geomBindXform * vec4(restP, 1);
+
         p = vec3(0,0,0);
 
         bool constantPointInfluence = HdGet_hasConstantInfluences();
@@ -60,17 +67,17 @@ void compute(int index)
                 p += ((skinningXform * initP) * jointWeight).xyz;
             }
         }
+
+        // skel space -> world space -> model space
+        // XXX: Casts to mat4 below are necessary because the matrices passed
+        // down use doubles and not floats.
+        mat4 skelToPrimLocal = mat4( HdGet_primWorldToLocal() ) *
+                               mat4( HdGet_skelLocalToWorld() );
+        p = (skelToPrimLocal * vec4(p,1)).xyz;
     } else {
-        p = initP.xyz;
+        p = restP;
     }
 
-    // skel space -> world space -> model space
-    // XXX: Casts to mat4 below are necessary because the matrices passed
-    // down use doubles and not floats.
-    mat4 skelToPrimLocal = mat4( HdGet_primWorldToLocal() ) *
-                           mat4( HdGet_skelLocalToWorld() );
-    p = (skelToPrimLocal * vec4(p,1)).xyz;
-
     HdSet_skinnedPoints(index, p);
 }
 
@@ -135,9 +142,6 @@ vec3 GetDualQuaternionTranslation(vec4 real, vec4 dual)
 
 void compute(int index)
 {
-    // model space -> bind space
-    mat4 geomBindXform = HdGet_geomBindXform();
-
     vec3 restP = HdGet_restPoints(index);
 
     // apply blend shapes
@@ -151,11 +155,13 @@ void compute(int index)
             restP += offset.xyz * weight;
         }
     }
-    vec3 initP = (geomBindXform * vec4(restP, 1)).xyz;
 
     int numInfluencesPerComponent = HdGet_numInfluencesPerComponent();
     vec3 p;
     if (numInfluencesPerComponent > 0) {
+        // model space -> bind space
+        mat4 geomBindXform = HdGet_geomBindXform();
+        vec3 initP = (geomBindXform * vec4(restP, 1)).xyz;
 
 #ifdef HD_HAS_skinningScaleXforms
         vec3 scaledP = vec3(0, 0, 0);
@@ -220,17 +226,17 @@ void compute(int index)
         p = TransformByQuaternion(weightedSumDQReal, initP)
             + GetDualQuaternionTranslation(weightedSumDQReal, weightedSumDQDual);
 #endif
+
+        // skel space -> world space -> model space
+        // XXX: Casts to mat4 below are necessary because the matrices passed
+        // down use doubles and not floats.
+        mat4 skelToPrimLocal = mat4(HdGet_primWorldToLocal()) *
+                               mat4(HdGet_skelLocalToWorld());
+        p = (skelToPrimLocal * vec4(p,1)).xyz;
     } else {
-        p = initP;
+        p = restP;
     }
 
-    // skel space -> world space -> model space
-    // XXX: Casts to mat4 below are necessary because the matrices passed
-    // down use doubles and not floats.
-    mat4 skelToPrimLocal = mat4(HdGet_primWorldToLocal()) *
-                           mat4(HdGet_skelLocalToWorld());
-    p = (skelToPrimLocal * vec4(p,1)).xyz;
-
     HdSet_skinnedPoints(index, p);
 }
 
diff --git a/pxr/usdImaging/usdSkelImaging/skelRootAdapter.cpp b/pxr/usdImaging/usdSkelImaging/skelRootAdapter.cpp
index 28eab6981c..584adfcc3b 100644
--- a/pxr/usdImaging/usdSkelImaging/skelRootAdapter.cpp
+++ b/pxr/usdImaging/usdSkelImaging/skelRootAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdSkelImaging/skelRootAdapter.h"
 #include "pxr/usdImaging/usdSkelImaging/skeletonAdapter.h"
diff --git a/pxr/usdImaging/usdSkelImaging/skelRootAdapter.h b/pxr/usdImaging/usdSkelImaging/skelRootAdapter.h
index bbb95f1a31..e77ce489b5 100644
--- a/pxr/usdImaging/usdSkelImaging/skelRootAdapter.h
+++ b/pxr/usdImaging/usdSkelImaging/skelRootAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_SKEL_IMAGING_SKEL_ROOT_ADAPTER_H
 #define PXR_USD_IMAGING_USD_SKEL_IMAGING_SKEL_ROOT_ADAPTER_H
diff --git a/pxr/usdImaging/usdSkelImaging/skeletonAdapter.cpp b/pxr/usdImaging/usdSkelImaging/skeletonAdapter.cpp
index c02c56a93f..675ab7407c 100644
--- a/pxr/usdImaging/usdSkelImaging/skeletonAdapter.cpp
+++ b/pxr/usdImaging/usdSkelImaging/skeletonAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdSkelImaging/skeletonAdapter.h"
 #include "pxr/usdImaging/usdSkelImaging/package.h"
diff --git a/pxr/usdImaging/usdSkelImaging/skeletonAdapter.h b/pxr/usdImaging/usdSkelImaging/skeletonAdapter.h
index 3ff7554cf0..c963c42641 100644
--- a/pxr/usdImaging/usdSkelImaging/skeletonAdapter.h
+++ b/pxr/usdImaging/usdSkelImaging/skeletonAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_SKEL_IMAGING_SKELETON_ADAPTER_H
 #define PXR_USD_IMAGING_USD_SKEL_IMAGING_SKELETON_ADAPTER_H
@@ -209,12 +192,14 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingInstanceablePrimAdapter
                             const UsdImagingInstancerContext *instancerContext) 
                                         const override;
 
+    USDSKELIMAGING_API
     HdExtComputationOutputDescriptorVector
     GetExtComputationOutputs(UsdPrim const& prim,
                              SdfPath const& cachePath,
                              const UsdImagingInstancerContext* instancerContext)
                                     const override;
 
+    USDSKELIMAGING_API
     HdExtComputationPrimvarDescriptorVector
     GetExtComputationPrimvars(
             UsdPrim const& prim,
@@ -222,7 +207,7 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingInstanceablePrimAdapter
             HdInterpolation interpolation,
             const UsdImagingInstancerContext* instancerContext) const override;
 
-    USDIMAGING_API
+    USDSKELIMAGING_API
     VtValue 
     GetExtComputationInput(
             UsdPrim const& prim,
@@ -231,7 +216,7 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingInstanceablePrimAdapter
             UsdTimeCode time,
             const UsdImagingInstancerContext* instancerContext) const override;
 
-    USDIMAGING_API
+    USDSKELIMAGING_API
     size_t
     SampleExtComputationInput(
             UsdPrim const& prim,
@@ -243,7 +228,7 @@ class UsdSkelImagingSkeletonAdapter : public UsdImagingInstanceablePrimAdapter
             float *sampleTimes,
             VtValue *sampleValues) override;
 
-    USDIMAGING_API
+    USDSKELIMAGING_API
     std::string 
     GetExtComputationKernel(
             UsdPrim const& prim,
diff --git a/pxr/usdImaging/usdSkelImaging/utils.cpp b/pxr/usdImaging/usdSkelImaging/utils.cpp
index e51c4f37f7..54666a7624 100644
--- a/pxr/usdImaging/usdSkelImaging/utils.cpp
+++ b/pxr/usdImaging/usdSkelImaging/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdSkelImaging/utils.h"
 
diff --git a/pxr/usdImaging/usdSkelImaging/utils.h b/pxr/usdImaging/usdSkelImaging/utils.h
index 4e9f2cd3c6..648857722f 100644
--- a/pxr/usdImaging/usdSkelImaging/utils.h
+++ b/pxr/usdImaging/usdSkelImaging/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_SKEL_IMAGING_UTILS_H
 #define PXR_USD_IMAGING_USD_SKEL_IMAGING_UTILS_H
diff --git a/pxr/usdImaging/usdVolImaging/api.h b/pxr/usdImaging/usdVolImaging/api.h
index 1f79625eb8..cb001fa7c1 100644
--- a/pxr/usdImaging/usdVolImaging/api.h
+++ b/pxr/usdImaging/usdVolImaging/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_VOL_IMAGING_API_H
 #define PXR_USD_IMAGING_USD_VOL_IMAGING_API_H
diff --git a/pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.cpp b/pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.cpp
index 8efdb042ce..4550672acb 100644
--- a/pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.cpp
+++ b/pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.h"
 #include "pxr/usdImaging/usdImaging/dataSourceAttribute.h"
@@ -141,5 +124,38 @@ UsdImagingDataSourceFieldAssetPrim::Get(const TfToken & name)
     return UsdImagingDataSourcePrim::Get(name);
 }
 
+HdDataSourceLocatorSet
+UsdImagingDataSourceFieldAssetPrim::Invalidate(
+    UsdPrim const& prim,
+    const TfToken &subprim,
+    const TfTokenVector &properties,
+    const UsdImagingPropertyInvalidationType invalidationType)
+{
+    HdDataSourceLocatorSet locators =
+        UsdImagingDataSourcePrim::Invalidate(
+            prim, subprim, properties, invalidationType);
+
+    TfTokenVector fieldNames;
+    if (prim.IsA<UsdVolOpenVDBAsset>()) {
+        fieldNames =
+            _GetStaticUsdAttributeNames<UsdVolOpenVDBAsset>();
+    } else if (prim.IsA<UsdVolField3DAsset>()) {
+        fieldNames =
+            _GetStaticUsdAttributeNames<UsdVolField3DAsset>();
+    } else {
+        TF_CODING_ERROR("Unsupported field type.");
+        return locators;
+    }
+
+    for (const TfToken &propertyName : properties) {
+        if (std::find(fieldNames.begin(), fieldNames.end(), propertyName)
+                != fieldNames.end()) {
+            locators.insert(HdVolumeFieldSchema::GetDefaultLocator());
+            break;
+        }
+    }
+
+    return locators;
+}
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.h b/pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.h
index 0a45d9fec7..c9ff19568e 100644
--- a/pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.h
+++ b/pxr/usdImaging/usdVolImaging/dataSourceFieldAsset.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef PXR_USD_IMAGING_USD_VOL_IMAGING_DATA_SOURCE_FIELD_ASSET_H
@@ -80,6 +63,14 @@ class UsdImagingDataSourceFieldAssetPrim : public UsdImagingDataSourcePrim
     TfTokenVector GetNames() override;
     HdDataSourceBaseHandle Get(const TfToken &name) override;
 
+    static
+    HdDataSourceLocatorSet
+    Invalidate(
+        UsdPrim const& prim,
+        const TfToken &subprim,
+        const TfTokenVector &properties,
+        UsdImagingPropertyInvalidationType invalidationType);
+
 private:
 
     // Private constructor, use static New() instead.
diff --git a/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.cpp b/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.cpp
index ff2e5fe8bd..37c91f4055 100644
--- a/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.cpp
+++ b/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdVolImaging/field3dAssetAdapter.h"
 
@@ -73,6 +56,21 @@ UsdImagingField3DAssetAdapter::GetImagingSubprimData(
     return nullptr;
 }
 
+HdDataSourceLocatorSet
+UsdImagingField3DAssetAdapter::InvalidateImagingSubprim(
+        UsdPrim const& prim,
+        TfToken const& subprim,
+        TfTokenVector const& properties,
+        const UsdImagingPropertyInvalidationType invalidationType)
+{
+    if (subprim.IsEmpty()) {
+        return UsdImagingDataSourceFieldAssetPrim::Invalidate(
+            prim, subprim, properties, invalidationType);
+    }
+
+    return HdDataSourceLocatorSet();
+}
+
 VtValue
 UsdImagingField3DAssetAdapter::Get(
     UsdPrim const& prim,
diff --git a/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.h b/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.h
index 1592a7a558..eb70fcc773 100644
--- a/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.h
+++ b/pxr/usdImaging/usdVolImaging/field3dAssetAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_VOL_IMAGING_FIELD3D_ASSET_ADAPTER_H
 #define PXR_USD_IMAGING_USD_VOL_IMAGING_FIELD3D_ASSET_ADAPTER_H
@@ -54,19 +37,26 @@ class UsdImagingField3DAssetAdapter : public UsdImagingFieldAdapter {
     /// \name Scene Index Support
     // ---------------------------------------------------------------------- //
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     TfToken GetImagingSubprimType(UsdPrim const& prim, TfToken const& subprim)
         override;
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     HdContainerDataSourceHandle GetImagingSubprimData(
             UsdPrim const& prim,
             TfToken const& subprim,
             const UsdImagingDataSourceStageGlobals &stageGlobals) override;
 
+    USDIMAGING_API
+    HdDataSourceLocatorSet InvalidateImagingSubprim(
+            UsdPrim const& prim,
+            TfToken const& subprim,
+            TfTokenVector const& properties,
+            UsdImagingPropertyInvalidationType invalidationType) override;
+
     // ---------------------------------------------------------------------- //
     /// \name Data access
     // ---------------------------------------------------------------------- //
diff --git a/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.cpp b/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.cpp
index 1b395169ac..956c9b4cff 100644
--- a/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.cpp
+++ b/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.h"
 
@@ -73,6 +56,21 @@ UsdImagingOpenVDBAssetAdapter::GetImagingSubprimData(
     return nullptr;
 }
 
+HdDataSourceLocatorSet
+UsdImagingOpenVDBAssetAdapter::InvalidateImagingSubprim(
+        UsdPrim const& prim,
+        TfToken const& subprim,
+        TfTokenVector const& properties,
+        const UsdImagingPropertyInvalidationType invalidationType)
+{
+    if (subprim.IsEmpty()) {
+        return UsdImagingDataSourceFieldAssetPrim::Invalidate(
+            prim, subprim, properties, invalidationType);
+    }
+
+    return HdDataSourceLocatorSet();
+}
+
 VtValue
 UsdImagingOpenVDBAssetAdapter::Get(
     UsdPrim const& prim,
diff --git a/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.h b/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.h
index daaf153f8a..5aae588b3c 100644
--- a/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.h
+++ b/pxr/usdImaging/usdVolImaging/openvdbAssetAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_VOL_IMAGING_OPENVDB_ASSET_ADAPTER_H
 #define PXR_USD_IMAGING_USD_VOL_IMAGING_OPENVDB_ASSET_ADAPTER_H
@@ -54,19 +37,26 @@ class UsdImagingOpenVDBAssetAdapter : public UsdImagingFieldAdapter {
     /// \name Scene Index Support
     // ---------------------------------------------------------------------- //
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     TfTokenVector GetImagingSubprims(UsdPrim const& prim) override;
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     TfToken GetImagingSubprimType(UsdPrim const& prim, TfToken const& subprim)
         override;
 
-    USDIMAGING_API
+    USDVOLIMAGING_API
     HdContainerDataSourceHandle GetImagingSubprimData(
             UsdPrim const& prim,
             TfToken const& subprim,
             const UsdImagingDataSourceStageGlobals &stageGlobals) override;
 
+    USDIMAGING_API
+    HdDataSourceLocatorSet InvalidateImagingSubprim(
+            UsdPrim const& prim,
+            TfToken const& subprim,
+            TfTokenVector const& properties,
+            UsdImagingPropertyInvalidationType invalidationType) override;
+
     // ---------------------------------------------------------------------- //
     /// \name Data access
     // ---------------------------------------------------------------------- //
diff --git a/pxr/usdImaging/usdVolImaging/pch.h b/pxr/usdImaging/usdVolImaging/pch.h
index 0fd54d571b..ae10fe25a5 100644
--- a/pxr/usdImaging/usdVolImaging/pch.h
+++ b/pxr/usdImaging/usdVolImaging/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,12 +22,12 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <Windows.h>
 #include <intrin.h>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
 #endif
 #include <algorithm>
+#include <any>
+#include <array>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -69,6 +53,9 @@
 #include <memory>
 #include <mutex>
 #include <new>
+#include <numeric>
+#include <optional>
+#include <ostream>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -77,61 +64,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/aligned_storage.hpp>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/and.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python/dict.hpp>
 #include <boost/python/extract.hpp>
@@ -145,30 +86,9 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/shared_array.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/type_traits/decay.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_enum.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/unordered_map.hpp>
-#include <boost/utility.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
+#include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
 #include <tbb/concurrent_unordered_map.h>
 #include <tbb/concurrent_unordered_set.h>
@@ -177,7 +97,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
-#include <tbb/task_arena.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/usdVolImaging/tokens.cpp b/pxr/usdImaging/usdVolImaging/tokens.cpp
index 9ee7d27c81..ef293dab5b 100644
--- a/pxr/usdImaging/usdVolImaging/tokens.cpp
+++ b/pxr/usdImaging/usdVolImaging/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdVolImaging/tokens.h"
 
diff --git a/pxr/usdImaging/usdVolImaging/tokens.h b/pxr/usdImaging/usdVolImaging/tokens.h
index 342dd4415e..aa576f315f 100644
--- a/pxr/usdImaging/usdVolImaging/tokens.h
+++ b/pxr/usdImaging/usdVolImaging/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USD_VOL_IMAGING_TOKENS_H
 #define PXR_USD_IMAGING_USD_VOL_IMAGING_TOKENS_H
diff --git a/pxr/usdImaging/usdviewq/README.md b/pxr/usdImaging/usdviewq/README.md
index 0fe1e881f9..4a30847b61 100644
--- a/pxr/usdImaging/usdviewq/README.md
+++ b/pxr/usdImaging/usdviewq/README.md
@@ -2,7 +2,7 @@
 
 ## Modifying GUI
 
-     **Please do not hand edit .ui files, as qt's xml formt is fragile and its
+     **Please do not hand edit .ui files, as qt's xml format is fragile and its
      tools are inconsistent across platforms on tolerance to bad constructs.**
      
      Instead prefer qdesigner5 to make edits to the .ui documents.  If you are 
diff --git a/pxr/usdImaging/usdviewq/__init__.py b/pxr/usdImaging/usdviewq/__init__.py
index 525e21f6c9..3f50d47830 100644
--- a/pxr/usdImaging/usdviewq/__init__.py
+++ b/pxr/usdImaging/usdviewq/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
@@ -83,7 +66,8 @@ def Run(self):
 
                 traceCollector.enabled = True
 
-            self.__LaunchProcess(arg_parse_result)
+            app, appController = self.LaunchPreamble(arg_parse_result)
+            self.LaunchProcess(arg_parse_result, app, appController)
 
         if traceCollector:
             traceCollector.enabled = False
@@ -180,6 +164,10 @@ def RegisterOptions(self, parser):
                             dest='unloaded',
                             help='Do not load payloads')
 
+        parser.add_argument('--bboxStandin', action='store_true',
+                            dest='bboxstandin',
+                            help='Display unloaded prims with bounding boxes')
+
         parser.add_argument('--timing', action='store_true',
                             dest='timing',
                             help='Echo timing stats to console. NOTE: timings will be unreliable when the --memstats option is also in use')
@@ -368,8 +356,12 @@ def GetResolverContext(self, usdFile):
 
         return r.CreateDefaultContextForAsset(usdFile)
 
+    def OverrideMaxSamples(self):
+        # Return True if HdPrman's default max samples should be overridden,
+        # False otherwise.
+        return True
 
-    def LaunchPreamble(self, arg_parse_result, overrideMaxSamples = True):
+    def LaunchPreamble(self, arg_parse_result):
         # Initialize concurrency limit as early as possible so that it is
         # respected by subsequent imports.
         from pxr import Work
@@ -378,7 +370,7 @@ def LaunchPreamble(self, arg_parse_result, overrideMaxSamples = True):
         # XXX Override HdPrman's defaults using the env var.  In the
         # future we expect there may be more formal ways to represent
         # per-app settings for particular Hydra plugins.
-        if overrideMaxSamples:
+        if self.OverrideMaxSamples():
             os.environ.setdefault('HD_PRMAN_MAX_SAMPLES', '1024')
 
         if arg_parse_result.clearSettings:
@@ -392,13 +384,10 @@ def LaunchPreamble(self, arg_parse_result, overrideMaxSamples = True):
 
         return (app, appController)
 
-    def __LaunchProcess(self, arg_parse_result):
+    def LaunchProcess(self, arg_parse_result, app, appController):
         '''
         after the arguments have been parsed, launch the UI in a forked process
         '''
-        # Initialize concurrency limit as early as possible so that it is
-        # respected by subsequent imports.
-        (app, appController) = self.LaunchPreamble(arg_parse_result)
         
         if arg_parse_result.quitAfterStartup:
             # Enqueue event to shutdown application. We don't use quit() because
diff --git a/pxr/usdImaging/usdviewq/adjustDefaultMaterial.py b/pxr/usdImaging/usdviewq/adjustDefaultMaterial.py
index a7989e5688..410fe11715 100644
--- a/pxr/usdImaging/usdviewq/adjustDefaultMaterial.py
+++ b/pxr/usdImaging/usdviewq/adjustDefaultMaterial.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtCore, QtWidgets
 from .adjustDefaultMaterialUI import Ui_AdjustDefaultMaterial
diff --git a/pxr/usdImaging/usdviewq/adjustDefaultMaterialUI.ui b/pxr/usdImaging/usdviewq/adjustDefaultMaterialUI.ui
index 2cce0a6052..b043435cfc 100644
--- a/pxr/usdImaging/usdviewq/adjustDefaultMaterialUI.ui
+++ b/pxr/usdImaging/usdviewq/adjustDefaultMaterialUI.ui
@@ -23,25 +23,8 @@
    <string>
      Copyright 2017 Pixar                                                                   
                                                                                             
-     Licensed under the Apache License, Version 2.0 (the &quot;Apache License&quot;)      
-     with the following modification; you may not use this file except in                   
-     compliance with the Apache License and the following modification to it:               
-     Section 6. Trademarks. is deleted and replaced with:                                   
-                                                                                            
-     6. Trademarks. This License does not grant permission to use the trade                 
-        names, trademarks, service marks, or product names of the Licensor                  
-        and its affiliates, except as required to comply with Section 4(c) of               
-        the License and to reproduce the content of the NOTICE file.                        
-                                                                                            
-     You may obtain a copy of the Apache License at                                         
-                                                                                            
-         http://www.apache.org/licenses/LICENSE-2.0                                         
-                                                                                            
-     Unless required by applicable law or agreed to in writing, software                    
-     distributed under the Apache License with the above modification is                    
-     distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   
-     KIND, either express or implied. See the Apache License for the specific               
-     language governing permissions and limitations under the Apache License.               
+     Licensed under the terms set forth in the LICENSE.txt file available at
+     https://openusd.org/license.
   </string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/pxr/usdImaging/usdviewq/adjustFreeCamera.py b/pxr/usdImaging/usdviewq/adjustFreeCamera.py
index 5ea14a5f9d..44a367aaf9 100644
--- a/pxr/usdImaging/usdviewq/adjustFreeCamera.py
+++ b/pxr/usdImaging/usdviewq/adjustFreeCamera.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2021 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtCore, QtGui, QtWidgets
 from .adjustFreeCameraUI import Ui_AdjustFreeCamera
diff --git a/pxr/usdImaging/usdviewq/adjustFreeCameraUI.ui b/pxr/usdImaging/usdviewq/adjustFreeCameraUI.ui
index 9be6d77871..69d35c6680 100644
--- a/pxr/usdImaging/usdviewq/adjustFreeCameraUI.ui
+++ b/pxr/usdImaging/usdviewq/adjustFreeCameraUI.ui
@@ -17,25 +17,8 @@
    <string>
      Copyright 2016 Pixar                                                                   
                                                                                             
-     Licensed under the Apache License, Version 2.0 (the &quot;Apache License&quot;)      
-     with the following modification; you may not use this file except in                   
-     compliance with the Apache License and the following modification to it:               
-     Section 6. Trademarks. is deleted and replaced with:                                   
-                                                                                            
-     6. Trademarks. This License does not grant permission to use the trade                 
-        names, trademarks, service marks, or product names of the Licensor                  
-        and its affiliates, except as required to comply with Section 4(c) of               
-        the License and to reproduce the content of the NOTICE file.                        
-                                                                                            
-     You may obtain a copy of the Apache License at                                         
-                                                                                            
-         http://www.apache.org/licenses/LICENSE-2.0                                         
-                                                                                            
-     Unless required by applicable law or agreed to in writing, software                    
-     distributed under the Apache License with the above modification is                    
-     distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   
-     KIND, either express or implied. See the Apache License for the specific               
-     language governing permissions and limitations under the Apache License.               
+     Licensed under the terms set forth in the LICENSE.txt file available at
+     https://openusd.org/license.
   </string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/pxr/usdImaging/usdviewq/api.h b/pxr/usdImaging/usdviewq/api.h
index 876e9c02eb..45607880d8 100644
--- a/pxr/usdImaging/usdviewq/api.h
+++ b/pxr/usdImaging/usdviewq/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USDVIEWQ_API_H
 #define PXR_USD_IMAGING_USDVIEWQ_API_H
diff --git a/pxr/usdImaging/usdviewq/appController.py b/pxr/usdImaging/usdviewq/appController.py
index e607e7f8ed..1cc99bcafe 100644
--- a/pxr/usdImaging/usdviewq/appController.py
+++ b/pxr/usdImaging/usdviewq/appController.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # pylint: disable=round-builtin
@@ -394,6 +377,7 @@ def __init__(self, parserData, resolverContextFn):
 
             self._allowViewUpdates = True
             self._allowAsync = parserData.allowAsync
+            self._bboxstandin = parserData.bboxstandin
 
             # When viewer mode is active, the panel sizes are cached so they can
             # be restored later.
@@ -1753,23 +1737,17 @@ def addAction(menu, name):
             action.setCheckable(True)
             return action
 
-        def setColorSpace(action):
+        def setOcioColorSpace(action):
             self._dataModel.viewSettings.setOcioSettings(\
                 colorSpace = str(action.text()))
             self._dataModel.viewSettings.colorCorrectionMode =\
                 ColorCorrectionModes.OPENCOLORIO
 
-        def setOcioConfig(action):
+        def setOcioDisplayView(action):
             display = str(action.parent().title())
             view = str(action.text())
-            if hasattr(config, 'getDisplayViewColorSpaceName'):
-                # OCIO version 2
-                colorSpace = config.getDisplayViewColorSpaceName(display, view)
-            else:
-                # OCIO version 1
-                colorSpace = config.getDisplayColorSpaceName(display, view)
-            self._dataModel.viewSettings.setOcioSettings(colorSpace,\
-                display, view)
+            self._dataModel.viewSettings.setOcioSettings(\
+                display=display, view=view)
             self._dataModel.viewSettings.colorCorrectionMode =\
                 ColorCorrectionModes.OPENCOLORIO
 
@@ -1794,7 +1772,7 @@ def addLabelSeparator(text, parent):
                 for v in config.getViews(d):
                     a = addAction(displayMenu, v)
                     group.addAction(a)
-                group.triggered.connect(setOcioConfig)
+                group.triggered.connect(setOcioDisplayView)
                 ocioMenu.addMenu(displayMenu)
                 self._ui.ocioDisplayMenus.append(displayMenu)
 
@@ -1809,7 +1787,7 @@ def addLabelSeparator(text, parent):
                 colorSpace = cs.getName()
                 a = addAction(ocioMenu, colorSpace)
                 group.addAction(a)
-            group.triggered.connect(setColorSpace)
+            group.triggered.connect(setOcioColorSpace)
             self._ui.ocioColorSpacesActionGroup = group
 
         # TODO Populate looks menu (config.getLooks())
@@ -1853,6 +1831,7 @@ def _reloadVaryingUI(self):
                     makeTimer=self._makeTimer)
 
                 self._stageView.allowAsync = self._allowAsync
+                self._stageView.bboxstandin = self._bboxstandin
 
                 self._stageView.fpsHUDInfo = self._fpsHUDInfo
                 self._stageView.fpsHUDKeys = self._fpsHUDKeys
diff --git a/pxr/usdImaging/usdviewq/appEventFilter.py b/pxr/usdImaging/usdviewq/appEventFilter.py
index 9698476688..89a5cb78a9 100644
--- a/pxr/usdImaging/usdviewq/appEventFilter.py
+++ b/pxr/usdImaging/usdviewq/appEventFilter.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 # Qt Components
 from .qt import QtCore, QtGui, QtWidgets
diff --git a/pxr/usdImaging/usdviewq/arrayAttributeView.py b/pxr/usdImaging/usdviewq/arrayAttributeView.py
index c5f48f1b0d..452cff5864 100644
--- a/pxr/usdImaging/usdviewq/arrayAttributeView.py
+++ b/pxr/usdImaging/usdviewq/arrayAttributeView.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # pylint: disable=map-builtin-not-iterating
diff --git a/pxr/usdImaging/usdviewq/attributeValueEditor.py b/pxr/usdImaging/usdviewq/attributeValueEditor.py
index dd9555795c..4c61edb388 100644
--- a/pxr/usdImaging/usdviewq/attributeValueEditor.py
+++ b/pxr/usdImaging/usdviewq/attributeValueEditor.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Usd
 from .qt import QtCore, QtWidgets
diff --git a/pxr/usdImaging/usdviewq/attributeValueEditorUI.ui b/pxr/usdImaging/usdviewq/attributeValueEditorUI.ui
index dd59a7cac7..e301a294dc 100644
--- a/pxr/usdImaging/usdviewq/attributeValueEditorUI.ui
+++ b/pxr/usdImaging/usdviewq/attributeValueEditorUI.ui
@@ -17,25 +17,8 @@
    <string>
      Copyright 2016 Pixar                                                                   
                                                                                             
-     Licensed under the Apache License, Version 2.0 (the &quot;Apache License&quot;)      
-     with the following modification; you may not use this file except in                   
-     compliance with the Apache License and the following modification to it:               
-     Section 6. Trademarks. is deleted and replaced with:                                   
-                                                                                            
-     6. Trademarks. This License does not grant permission to use the trade                 
-        names, trademarks, service marks, or product names of the Licensor                  
-        and its affiliates, except as required to comply with Section 4(c) of               
-        the License and to reproduce the content of the NOTICE file.                        
-                                                                                            
-     You may obtain a copy of the Apache License at                                         
-                                                                                            
-         http://www.apache.org/licenses/LICENSE-2.0                                         
-                                                                                            
-     Unless required by applicable law or agreed to in writing, software                    
-     distributed under the Apache License with the above modification is                    
-     distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   
-     KIND, either express or implied. See the Apache License for the specific               
-     language governing permissions and limitations under the Apache License.               
+     Licensed under the terms set forth in the LICENSE.txt file available at
+     https://openusd.org/license.
   </string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/pxr/usdImaging/usdviewq/attributeViewContextMenu.py b/pxr/usdImaging/usdviewq/attributeViewContextMenu.py
index c21bb4aeb4..40f4cb9add 100644
--- a/pxr/usdImaging/usdviewq/attributeViewContextMenu.py
+++ b/pxr/usdImaging/usdviewq/attributeViewContextMenu.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from .qt import QtGui, QtWidgets, QtCore
diff --git a/pxr/usdImaging/usdviewq/common.py b/pxr/usdImaging/usdviewq/common.py
index 15734a87bd..af71123b00 100644
--- a/pxr/usdImaging/usdviewq/common.py
+++ b/pxr/usdImaging/usdviewq/common.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # pylint: disable=round-builtin
@@ -376,9 +359,7 @@ def FromMutedLayerIdentifier(cls, identifier, parentLayer, stage, depth=0):
         realPath = ''
         try:
             resolver = Ar.GetResolver()
-            with Ar.ResolverContextBinder(stage.GetPathResolverContext()):
-                realPath = resolver.Resolve(resolver.CreateIdentifier(
-                    identifier, parentLayer.resolvedPath)).GetPathString()
+            realPath = resolver.Resolve(identifier).GetPathString()
         except Exception as e:
             PrintWarning('Failed to resolve identifier {} '
                          .format(identifier), e)
@@ -434,13 +415,6 @@ def GetHierarchicalDisplayString(self):
             Sdf.Layer.GetDisplayNameFromIdentifier(self._identifier))
 
 def _AddLayerTree(stage, layerTree, depth=0):
-    layers = [LayerInfo.FromLayer(
-        layerTree.layer, stage, layerTree.offset, depth)]
-    for child in layerTree.childTrees:
-        layers.extend(_AddLayerTree(stage, child, depth=depth + 1))
-    return layers
-
-def _AddLayerTreeWithMutedSubLayers(stage, layerTree, depth=0):
 
     layers = [LayerInfo.FromLayer(
         layerTree.layer, stage, layerTree.offset, depth)]
@@ -452,31 +426,38 @@ def _AddLayerTreeWithMutedSubLayers(stage, layerTree, depth=0):
     # layers in the correct sublayer position, we go through the sublayer paths
     # parsing either the muted layer or a layer stack tree subtree.
     # 
-    # XXX: It would be nice if we could get this whole layer stack tree with
-    # muted layers and composed offsets without having to cross reference two
-    # different APIs. 
+    # The layer tree will also not have any entries for layers that failed to
+    # load. We need to handle this case as well.
     childTrees = layerTree.childTrees
     subLayerPaths = layerTree.layer.subLayerPaths
     childTreeIter = iter(layerTree.childTrees)
-    numMutedLayers = 0
+    numMissingLayers = 0
     for subLayerPath in subLayerPaths:
-        if stage.IsLayerMuted(subLayerPath):
+        anchoredSubLayerPath = Sdf.ComputeAssetPathRelativeToLayer(
+            layerTree.layer, subLayerPath)
+        if stage.IsLayerMuted(anchoredSubLayerPath):
             # The sublayer path is muted so add muted layer by path. We don't 
             # recurse on sublayers for muted layers.
             layers.append(LayerInfo.FromMutedLayerIdentifier(
-                subLayerPath, layerTree.layer, stage, depth=depth+1))
-            numMutedLayers = numMutedLayers + 1
+                anchoredSubLayerPath, layerTree.layer, stage, depth=depth+1))
+            numMissingLayers = numMissingLayers + 1
+        elif not Sdf.Layer.Find(anchoredSubLayerPath):
+            # Otherwise, the sublayer failed to load for some other reason.
+            # Just skip it to maintain current behavior; in the future, we
+            # may want to show an entry with some annotation to tell the
+            # user about this sublayer.
+            numMissingLayers = numMissingLayers + 1
         else:
             # Otherwise we expect the unmuted sublayer to be the next child
             # tree in the layer stack tree so we recursively add it.
-            layers.extend(_AddLayerTreeWithMutedSubLayers(
+            layers.extend(_AddLayerTree(
                 stage, next(childTreeIter), depth=depth + 1))
 
     # Since we're relying on the correspondence between the unmuted sublayer 
     # paths and the child layer stack trees, report an error if the total number
     # of muted layers and child trees don't match up so we can track if it 
     # becomes an issue.
-    if numMutedLayers + len(childTrees) != len(subLayerPaths):
+    if numMissingLayers + len(childTrees) != len(subLayerPaths):
         print("CODING ERROR: Encountered an unexpected number of muted "
               "sublayers of layer {}. The root layer stack may be "
               "incorrect in the layer stack view".format(
@@ -488,9 +469,7 @@ def GetRootLayerStackInfo(stage):
     primIndex = stage.GetPseudoRoot().GetPrimIndex()
     layerStack = primIndex.rootNode.layerStack
 
-    if layerStack.mutedLayers:
-        return _AddLayerTreeWithMutedSubLayers(stage, layerStack.layerTree)
-    else:
+    with Ar.ResolverContextBinder(stage.GetPathResolverContext()):
         return _AddLayerTree(stage, layerStack.layerTree)
 
 def PrettyFormatSize(sz):
diff --git a/pxr/usdImaging/usdviewq/configController.py b/pxr/usdImaging/usdviewq/configController.py
index e6286e19a3..908ded1768 100644
--- a/pxr/usdImaging/usdviewq/configController.py
+++ b/pxr/usdImaging/usdviewq/configController.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usdImaging/usdviewq/customAttributes.py b/pxr/usdImaging/usdviewq/customAttributes.py
index e214d323ff..b29ab1cd5a 100644
--- a/pxr/usdImaging/usdviewq/customAttributes.py
+++ b/pxr/usdImaging/usdviewq/customAttributes.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd, UsdGeom, UsdShade
diff --git a/pxr/usdImaging/usdviewq/debugCodes.cpp b/pxr/usdImaging/usdviewq/debugCodes.cpp
index cbbb4cb7cf..ef56362e6b 100644
--- a/pxr/usdImaging/usdviewq/debugCodes.cpp
+++ b/pxr/usdImaging/usdviewq/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdviewq/debugCodes.h"
 
diff --git a/pxr/usdImaging/usdviewq/debugCodes.h b/pxr/usdImaging/usdviewq/debugCodes.h
index 9930049072..fbb99e6fdc 100644
--- a/pxr/usdImaging/usdviewq/debugCodes.h
+++ b/pxr/usdImaging/usdviewq/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USDVIEWQ_DEBUG_CODES_H
 #define PXR_USD_IMAGING_USDVIEWQ_DEBUG_CODES_H
diff --git a/pxr/usdImaging/usdviewq/debugFlagsWidget.py b/pxr/usdImaging/usdviewq/debugFlagsWidget.py
index ba8e96734d..c604ed8716 100644
--- a/pxr/usdImaging/usdviewq/debugFlagsWidget.py
+++ b/pxr/usdImaging/usdviewq/debugFlagsWidget.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtCore, QtGui, QtWidgets
 
diff --git a/pxr/usdImaging/usdviewq/frameSlider.py b/pxr/usdImaging/usdviewq/frameSlider.py
index c552bc83ca..c2b55e6908 100644
--- a/pxr/usdImaging/usdviewq/frameSlider.py
+++ b/pxr/usdImaging/usdviewq/frameSlider.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtCore, QtWidgets, QtGui
 
diff --git a/pxr/usdImaging/usdviewq/freeCamera.py b/pxr/usdImaging/usdviewq/freeCamera.py
index fb7f26e517..7362b7479a 100644
--- a/pxr/usdImaging/usdviewq/freeCamera.py
+++ b/pxr/usdImaging/usdviewq/freeCamera.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import division
diff --git a/pxr/usdImaging/usdviewq/headerContextMenu.py b/pxr/usdImaging/usdviewq/headerContextMenu.py
index 36f511ace8..a145227b50 100644
--- a/pxr/usdImaging/usdviewq/headerContextMenu.py
+++ b/pxr/usdImaging/usdviewq/headerContextMenu.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtCore, QtWidgets
 from .usdviewContextMenuItem import UsdviewContextMenuItem
diff --git a/pxr/usdImaging/usdviewq/hydraObserver.cpp b/pxr/usdImaging/usdviewq/hydraObserver.cpp
index e3705543e5..e04a7c809b 100644
--- a/pxr/usdImaging/usdviewq/hydraObserver.cpp
+++ b/pxr/usdImaging/usdviewq/hydraObserver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdviewq/hydraObserver.h"
 #include "pxr/imaging/hd/filteringSceneIndex.h"
diff --git a/pxr/usdImaging/usdviewq/hydraObserver.h b/pxr/usdImaging/usdviewq/hydraObserver.h
index 0b37ed8ab4..a7175be9fb 100644
--- a/pxr/usdImaging/usdviewq/hydraObserver.h
+++ b/pxr/usdImaging/usdviewq/hydraObserver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USDVIEWQ_HYDRA_OBSERVER_H
 #define PXR_USD_IMAGING_USDVIEWQ_HYDRA_OBSERVER_H
diff --git a/pxr/usdImaging/usdviewq/hydraSceneBrowser.py b/pxr/usdImaging/usdviewq/hydraSceneBrowser.py
index d17275b00d..e450b63184 100644
--- a/pxr/usdImaging/usdviewq/hydraSceneBrowser.py
+++ b/pxr/usdImaging/usdviewq/hydraSceneBrowser.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2022 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 '''
diff --git a/pxr/usdImaging/usdviewq/layerStackContextMenu.py b/pxr/usdImaging/usdviewq/layerStackContextMenu.py
index e45e69a1cf..a972ccf91b 100644
--- a/pxr/usdImaging/usdviewq/layerStackContextMenu.py
+++ b/pxr/usdImaging/usdviewq/layerStackContextMenu.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/usdImaging/usdviewq/legendUtil.py b/pxr/usdImaging/usdviewq/legendUtil.py
index c8fe1dd373..7289d25fd7 100644
--- a/pxr/usdImaging/usdviewq/legendUtil.py
+++ b/pxr/usdImaging/usdviewq/legendUtil.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # Functionality for expanding and collapsing legend components in usdview
diff --git a/pxr/usdImaging/usdviewq/mainWindowUI.ui b/pxr/usdImaging/usdviewq/mainWindowUI.ui
index 012dff3651..94c7a01586 100644
--- a/pxr/usdImaging/usdviewq/mainWindowUI.ui
+++ b/pxr/usdImaging/usdviewq/mainWindowUI.ui
@@ -29,25 +29,8 @@
      
      Copyright 2016 Pixar                                                                   
                                                                                             
-     Licensed under the Apache License, Version 2.0 (the &quot;Apache License&quot;)      
-     with the following modification; you may not use this file except in                   
-     compliance with the Apache License and the following modification to it:               
-     Section 6. Trademarks. is deleted and replaced with:                                   
-                                                                                            
-     6. Trademarks. This License does not grant permission to use the trade                 
-        names, trademarks, service marks, or product names of the Licensor                  
-        and its affiliates, except as required to comply with Section 4(c) of               
-        the License and to reproduce the content of the NOTICE file.                        
-                                                                                            
-     You may obtain a copy of the Apache License at                                         
-                                                                                            
-         http://www.apache.org/licenses/LICENSE-2.0                                         
-                                                                                            
-     Unless required by applicable law or agreed to in writing, software                    
-     distributed under the Apache License with the above modification is                    
-     distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   
-     KIND, either express or implied. See the Apache License for the specific               
-     language governing permissions and limitations under the Apache License.               
+     Licensed under the terms set forth in the LICENSE.txt file available at
+     https://openusd.org/license.
   </string>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -1652,7 +1635,7 @@
      <x>0</x>
      <y>0</y>
      <width>1145</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
    <property name="minimumSize">
@@ -1830,6 +1813,9 @@
    <property name="text">
     <string>Reopen Stage</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+R</string>
+   </property>
   </action>
   <action name="actionDump_RIB">
    <property name="text">
diff --git a/pxr/usdImaging/usdviewq/module.cpp b/pxr/usdImaging/usdviewq/module.cpp
index 12600aa8cc..2ae041f902 100644
--- a/pxr/usdImaging/usdviewq/module.cpp
+++ b/pxr/usdImaging/usdviewq/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/tf/pyModule.h"
diff --git a/pxr/usdImaging/usdviewq/moduleDeps.cpp b/pxr/usdImaging/usdviewq/moduleDeps.cpp
index c2ed4afbaf..afa7a37ea4 100644
--- a/pxr/usdImaging/usdviewq/moduleDeps.cpp
+++ b/pxr/usdImaging/usdviewq/moduleDeps.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/pxr/usdImaging/usdviewq/overridableLineEdit.py b/pxr/usdImaging/usdviewq/overridableLineEdit.py
index 074f314143..6f2c9f056b 100644
--- a/pxr/usdImaging/usdviewq/overridableLineEdit.py
+++ b/pxr/usdImaging/usdviewq/overridableLineEdit.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import division
diff --git a/pxr/usdImaging/usdviewq/pch.h b/pxr/usdImaging/usdviewq/pch.h
index 2b6f4d7826..37157ec09f 100644
--- a/pxr/usdImaging/usdviewq/pch.h
+++ b/pxr/usdImaging/usdviewq/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2017 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -31,6 +14,7 @@
 #include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
+#include <unistd.h>
 #include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
@@ -38,9 +22,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-
+#include <Windows.h>
+#include <intrin.h>
 #endif
 #include <algorithm>
+#include <any>
 #include <atomic>
 #include <bitset>
 #include <cfloat>
@@ -56,7 +42,6 @@
 #include <float.h>
 #include <functional>
 #include <initializer_list>
-#include <intrin.h>
 #include <iosfwd>
 #include <iterator>
 #include <limits>
@@ -68,6 +53,7 @@
 #include <mutex>
 #include <new>
 #include <numeric>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -76,58 +62,15 @@
 #include <string>
 #include <sys/types.h>
 #include <thread>
+#include <tuple>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
-#include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/compressed_pair.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/functional/hash_fwd.hpp>
-#include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/reverse_iterator.hpp>
-#include <boost/iterator_adaptors.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/operators.hpp>
-#include <boost/optional.hpp>
-#include <boost/optional/optional_fwd.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/control/expr_iif.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/facilities/expand.hpp>
-#include <boost/preprocessor/list/for_each.hpp>
-#include <boost/preprocessor/list/size.hpp>
-#include <boost/preprocessor/logical/and.hpp>
-#include <boost/preprocessor/logical/not.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/selection/max.hpp>
-#include <boost/preprocessor/seq/filter.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/push_back.hpp>
-#include <boost/preprocessor/seq/seq.hpp>
-#include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/tuple/eat.hpp>
-#include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/tuple/to_list.hpp>
-#include <boost/preprocessor/tuple/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include <boost/python.hpp>
 #include <boost/python/class.hpp>
@@ -149,22 +92,7 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/range/iterator_range.hpp>
-#include <boost/type_traits/add_reference.hpp>
-#include <boost/type_traits/has_trivial_assign.hpp>
-#include <boost/type_traits/has_trivial_constructor.hpp>
-#include <boost/type_traits/has_trivial_copy.hpp>
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/type_traits/is_same.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/variant.hpp>
-#include <boost/vmd/is_empty.hpp>
-#include <boost/vmd/is_tuple.hpp>
-#include <tbb/atomic.h>
+#include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_hash_map.h>
 #include <tbb/concurrent_queue.h>
@@ -174,6 +102,7 @@
 #include <tbb/spin_mutex.h>
 #include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
+#include <tbb/task_group.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/pxr/usdImaging/usdviewq/plugin.py b/pxr/usdImaging/usdviewq/plugin.py
index a1451300ee..09df753b51 100644
--- a/pxr/usdImaging/usdviewq/plugin.py
+++ b/pxr/usdImaging/usdviewq/plugin.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/pxr/usdImaging/usdviewq/preferences.py b/pxr/usdImaging/usdviewq/preferences.py
index 5ccdcbef04..eac4186578 100644
--- a/pxr/usdImaging/usdviewq/preferences.py
+++ b/pxr/usdImaging/usdviewq/preferences.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtCore, QtGui, QtWidgets
 from .preferencesUI import Ui_Preferences
diff --git a/pxr/usdImaging/usdviewq/preferencesUI.ui b/pxr/usdImaging/usdviewq/preferencesUI.ui
index 8bbe89e0bd..849e588600 100644
--- a/pxr/usdImaging/usdviewq/preferencesUI.ui
+++ b/pxr/usdImaging/usdviewq/preferencesUI.ui
@@ -17,25 +17,8 @@
    <string>
      Copyright 2020 Pixar                                                                   
                                                                                             
-     Licensed under the Apache License, Version 2.0 (the &quot;Apache License&quot;)      
-     with the following modification; you may not use this file except in                   
-     compliance with the Apache License and the following modification to it:               
-     Section 6. Trademarks. is deleted and replaced with:                                   
-                                                                                            
-     6. Trademarks. This License does not grant permission to use the trade                 
-        names, trademarks, service marks, or product names of the Licensor                  
-        and its affiliates, except as required to comply with Section 4(c) of               
-        the License and to reproduce the content of the NOTICE file.                        
-                                                                                            
-     You may obtain a copy of the Apache License at                                         
-                                                                                            
-         http://www.apache.org/licenses/LICENSE-2.0                                         
-                                                                                            
-     Unless required by applicable law or agreed to in writing, software                    
-     distributed under the Apache License with the above modification is                    
-     distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   
-     KIND, either express or implied. See the Apache License for the specific               
-     language governing permissions and limitations under the Apache License.               
+     Licensed under the terms set forth in the LICENSE.txt file available at
+     https://openusd.org/license.
   </string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/pxr/usdImaging/usdviewq/prettyPrint.py b/pxr/usdImaging/usdviewq/prettyPrint.py
index 3c2d59ac72..b397151540 100644
--- a/pxr/usdImaging/usdviewq/prettyPrint.py
+++ b/pxr/usdImaging/usdviewq/prettyPrint.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 '''
 Hopefully we can deprecate this since most of the array stuff is handled by the
diff --git a/pxr/usdImaging/usdviewq/primContextMenu.py b/pxr/usdImaging/usdviewq/primContextMenu.py
index e7173c31e4..f3c43bd3d2 100644
--- a/pxr/usdImaging/usdviewq/primContextMenu.py
+++ b/pxr/usdImaging/usdviewq/primContextMenu.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtWidgets
 from .primContextMenuItems import _GetContextMenuItems
diff --git a/pxr/usdImaging/usdviewq/primContextMenuItems.py b/pxr/usdImaging/usdviewq/primContextMenuItems.py
index de5560a3a7..c571ff5e07 100644
--- a/pxr/usdImaging/usdviewq/primContextMenuItems.py
+++ b/pxr/usdImaging/usdviewq/primContextMenuItems.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/usdImaging/usdviewq/primLegend.py b/pxr/usdImaging/usdviewq/primLegend.py
index 3c293f6247..2943fda2a8 100644
--- a/pxr/usdImaging/usdviewq/primLegend.py
+++ b/pxr/usdImaging/usdviewq/primLegend.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtWidgets
 
diff --git a/pxr/usdImaging/usdviewq/primLegendUI.ui b/pxr/usdImaging/usdviewq/primLegendUI.ui
index c439f840ed..f8572e87ef 100644
--- a/pxr/usdImaging/usdviewq/primLegendUI.ui
+++ b/pxr/usdImaging/usdviewq/primLegendUI.ui
@@ -20,25 +20,8 @@
    <string>
      Copyright 2017 Pixar                                                                   
                                                                                             
-     Licensed under the Apache License, Version 2.0 (the &quot;Apache License&quot;)      
-     with the following modification; you may not use this file except in                   
-     compliance with the Apache License and the following modification to it:               
-     Section 6. Trademarks. is deleted and replaced with:                                   
-                                                                                            
-     6. Trademarks. This License does not grant permission to use the trade                 
-        names, trademarks, service marks, or product names of the Licensor                  
-        and its affiliates, except as required to comply with Section 4(c) of               
-        the License and to reproduce the content of the NOTICE file.                        
-                                                                                            
-     You may obtain a copy of the Apache License at                                         
-                                                                                            
-         http://www.apache.org/licenses/LICENSE-2.0                                         
-                                                                                            
-     Unless required by applicable law or agreed to in writing, software                    
-     distributed under the Apache License with the above modification is                    
-     distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   
-     KIND, either express or implied. See the Apache License for the specific               
-     language governing permissions and limitations under the Apache License.               
+     Licensed under the terms set forth in the LICENSE.txt file available at
+     https://openusd.org/license.
   </string>
   </property>
   <layout class="QVBoxLayout" name="primLegendLayoutContainer">
diff --git a/pxr/usdImaging/usdviewq/primTreeWidget.py b/pxr/usdImaging/usdviewq/primTreeWidget.py
index 8e1b466496..578196fc27 100644
--- a/pxr/usdImaging/usdviewq/primTreeWidget.py
+++ b/pxr/usdImaging/usdviewq/primTreeWidget.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtCore, QtGui, QtWidgets
 from pxr.UsdUtils.constantsGroup import ConstantsGroup
diff --git a/pxr/usdImaging/usdviewq/primViewItem.py b/pxr/usdImaging/usdviewq/primViewItem.py
index aa85b0a5f2..cb2a6e5bc5 100644
--- a/pxr/usdImaging/usdviewq/primViewItem.py
+++ b/pxr/usdImaging/usdviewq/primViewItem.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from __future__ import print_function
 
diff --git a/pxr/usdImaging/usdviewq/propertyLegend.py b/pxr/usdImaging/usdviewq/propertyLegend.py
index 900f04437e..e2a94840ef 100644
--- a/pxr/usdImaging/usdviewq/propertyLegend.py
+++ b/pxr/usdImaging/usdviewq/propertyLegend.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 """ This module provides the help dialog(also known as the property legend)
     in Usdview's MainWindow. This provides a key describing the items displayed
diff --git a/pxr/usdImaging/usdviewq/propertyLegendUI.ui b/pxr/usdImaging/usdviewq/propertyLegendUI.ui
index ceda6eb77d..f61afe83f5 100644
--- a/pxr/usdImaging/usdviewq/propertyLegendUI.ui
+++ b/pxr/usdImaging/usdviewq/propertyLegendUI.ui
@@ -23,25 +23,8 @@
    <string>
      Copyright 2017 Pixar                                                                   
                                                                                             
-     Licensed under the Apache License, Version 2.0 (the &quot;Apache License&quot;)      
-     with the following modification; you may not use this file except in                   
-     compliance with the Apache License and the following modification to it:               
-     Section 6. Trademarks. is deleted and replaced with:                                   
-                                                                                            
-     6. Trademarks. This License does not grant permission to use the trade                 
-        names, trademarks, service marks, or product names of the Licensor                  
-        and its affiliates, except as required to comply with Section 4(c) of               
-        the License and to reproduce the content of the NOTICE file.                        
-                                                                                            
-     You may obtain a copy of the Apache License at                                         
-                                                                                            
-         http://www.apache.org/licenses/LICENSE-2.0                                         
-                                                                                            
-     Unless required by applicable law or agreed to in writing, software                    
-     distributed under the Apache License with the above modification is                    
-     distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   
-     KIND, either express or implied. See the Apache License for the specific               
-     language governing permissions and limitations under the Apache License.               
+     Licensed under the terms set forth in the LICENSE.txt file available at
+     https://openusd.org/license.
   </string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
diff --git a/pxr/usdImaging/usdviewq/pythonInterpreter.py b/pxr/usdImaging/usdviewq/pythonInterpreter.py
index e2205f897f..bdf7869397 100644
--- a/pxr/usdImaging/usdviewq/pythonInterpreter.py
+++ b/pxr/usdImaging/usdviewq/pythonInterpreter.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # pylint: disable=dict-keys-not-iterating
diff --git a/pxr/usdImaging/usdviewq/qt.py b/pxr/usdImaging/usdviewq/qt.py
index ee963144b3..220cf5602a 100644
--- a/pxr/usdImaging/usdviewq/qt.py
+++ b/pxr/usdImaging/usdviewq/qt.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 def GetPySideModule():
     """Returns name of PySide module used by usdview,
diff --git a/pxr/usdImaging/usdviewq/rootDataModel.py b/pxr/usdImaging/usdviewq/rootDataModel.py
index 9e9d0c28eb..911caa098b 100644
--- a/pxr/usdImaging/usdviewq/rootDataModel.py
+++ b/pxr/usdImaging/usdviewq/rootDataModel.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from pxr import Usd, UsdGeom, UsdShade
diff --git a/pxr/usdImaging/usdviewq/scalarTypes.py b/pxr/usdImaging/usdviewq/scalarTypes.py
index db09af644f..d776847bd2 100644
--- a/pxr/usdImaging/usdviewq/scalarTypes.py
+++ b/pxr/usdImaging/usdviewq/scalarTypes.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 def GetScalarTypeFromAttr(attr):
     '''
diff --git a/pxr/usdImaging/usdviewq/selectionDataModel.py b/pxr/usdImaging/usdviewq/selectionDataModel.py
index 9f7ba7d5f0..8828241947 100644
--- a/pxr/usdImaging/usdviewq/selectionDataModel.py
+++ b/pxr/usdImaging/usdviewq/selectionDataModel.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from collections import OrderedDict
diff --git a/pxr/usdImaging/usdviewq/settings.py b/pxr/usdImaging/usdviewq/settings.py
index c851998cf7..efaf55f4ff 100644
--- a/pxr/usdImaging/usdviewq/settings.py
+++ b/pxr/usdImaging/usdviewq/settings.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # pylint: disable=unicode-builtin
diff --git a/pxr/usdImaging/usdviewq/stageView.py b/pxr/usdImaging/usdviewq/stageView.py
index 8798997304..e34b1cafef 100644
--- a/pxr/usdImaging/usdviewq/stageView.py
+++ b/pxr/usdImaging/usdviewq/stageView.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 # pylint: disable=dict-keys-not-iterating
@@ -824,6 +807,13 @@ def rendererDisplayName(self):
     def rendererAovName(self):
         return self._rendererAovName
 
+    @property
+    def bboxstandin(self):
+        return self._bboxstandin
+
+    @bboxstandin.setter
+    def bboxstandin(self, value):
+        self._bboxstandin = bool(value)
     
     @property
     def allowAsync(self):
@@ -943,6 +933,7 @@ def __init__(self, parent=None, dataModel=None, makeTimer=Timer):
         self._vao = 0
 
         self._allowAsync = False
+        self._bboxstandin = False
 
         # Update all properties for the current stage.
         self._stageReplaced()
@@ -956,6 +947,7 @@ def _getRenderer(self):
                 if self.isContextInitialised():
                   params = UsdImagingGL.Engine.Parameters()
                   params.allowAsynchronousSceneProcessing = self._allowAsync
+                  params.displayUnloadedPrimsWithBounds = self._bboxstandin
                   self._renderer = UsdImagingGL.Engine(params)
                   self._handleRendererChanged(self.GetCurrentRendererId())
             elif not self._reportedContextError:
@@ -1710,6 +1702,9 @@ def paintGL(self):
             viewProjectionMatrix = Gf.Matrix4f(frustum.ComputeViewMatrix()
                                             * frustum.ComputeProjectionMatrix())
 
+            # Workaround an apparent bug in some recent versions of PySide6
+            GL.glDepthMask(GL.GL_TRUE)
+
             GL.glClear(GL.GL_COLOR_BUFFER_BIT|GL.GL_DEPTH_BUFFER_BIT)
 
             # ensure viewport is right for the camera framing
@@ -1732,6 +1727,7 @@ def paintGL(self):
                         l = Glf.SimpleLight()
                         l.ambient = (0, 0, 0, 0)
                         l.position = (cam_pos[0], cam_pos[1], cam_pos[2], 1)
+                        l.transform = frustum.ComputeViewInverse()
                         lights.append(l)
 
                     # Default Dome Light
@@ -2182,6 +2178,9 @@ def pick(self, pickFrustum):
         # Need a correct OpenGL Rendering context for FBOs
         self.makeCurrent()
 
+        # Workaround an apparent bug in some recent versions of PySide6
+        GL.glDepthMask(GL.GL_TRUE)
+
         # update rendering parameters
         self._renderParams.frame = self._dataModel.currentFrame
         self._renderParams.complexity = self._dataModel.viewSettings.complexity.value
diff --git a/pxr/usdImaging/usdviewq/testenv/testUsdviewqLauncher.py b/pxr/usdImaging/usdviewq/testenv/testUsdviewqLauncher.py
index e6270a8cb9..b1af5f32d0 100644
--- a/pxr/usdImaging/usdviewq/testenv/testUsdviewqLauncher.py
+++ b/pxr/usdImaging/usdviewq/testenv/testUsdviewqLauncher.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import unittest
@@ -53,7 +36,12 @@ def ParseOptions(self, parser):
 
         return parser.parse_args(self._args)
 
-    def _Launcher__LaunchProcess(self, arg_parse_result):
+    def LaunchPreamble(self, arg_parse_result):
+        """Do nothing. We don't want to launch the main application."""
+
+        return (None, None)
+
+    def LaunchProcess(self, arg_parse_result, app, appController):
         """Do nothing. We don't want to launch the main application."""
 
         return
diff --git a/pxr/usdImaging/usdviewq/testenv/testUsdviewqRootDataModel.py b/pxr/usdImaging/usdviewq/testenv/testUsdviewqRootDataModel.py
index d96c789d08..483c0dbe24 100644
--- a/pxr/usdImaging/usdviewq/testenv/testUsdviewqRootDataModel.py
+++ b/pxr/usdImaging/usdviewq/testenv/testUsdviewqRootDataModel.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import unittest
diff --git a/pxr/usdImaging/usdviewq/testenv/testUsdviewqSelectionDataModel.py b/pxr/usdImaging/usdviewq/testenv/testUsdviewqSelectionDataModel.py
index 0dcffea821..b4b3cd26f4 100644
--- a/pxr/usdImaging/usdviewq/testenv/testUsdviewqSelectionDataModel.py
+++ b/pxr/usdImaging/usdviewq/testenv/testUsdviewqSelectionDataModel.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import unittest
diff --git a/pxr/usdImaging/usdviewq/testenv/testUsdviewqSettings.py b/pxr/usdImaging/usdviewq/testenv/testUsdviewqSettings.py
index 7a8fddf96f..72f61b2cf1 100644
--- a/pxr/usdImaging/usdviewq/testenv/testUsdviewqSettings.py
+++ b/pxr/usdImaging/usdviewq/testenv/testUsdviewqSettings.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import unittest
diff --git a/pxr/usdImaging/usdviewq/testenv/testUsdviewqViewSettingsDataModel.py b/pxr/usdImaging/usdviewq/testenv/testUsdviewqViewSettingsDataModel.py
index 040b9c3032..8a68facf35 100644
--- a/pxr/usdImaging/usdviewq/testenv/testUsdviewqViewSettingsDataModel.py
+++ b/pxr/usdImaging/usdviewq/testenv/testUsdviewqViewSettingsDataModel.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 import unittest
diff --git a/pxr/usdImaging/usdviewq/usdviewApi.py b/pxr/usdImaging/usdviewq/usdviewApi.py
index fcc696491e..bd8f019fd4 100644
--- a/pxr/usdImaging/usdviewq/usdviewApi.py
+++ b/pxr/usdImaging/usdviewq/usdviewApi.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to # it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) #    of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY
-# KIND, either express or implied. See the Apache License for the # specific
-# language governing permissions and limitations under the Apache # License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import types
 
diff --git a/pxr/usdImaging/usdviewq/usdviewContextMenuItem.py b/pxr/usdImaging/usdviewq/usdviewContextMenuItem.py
index 3bd9c55d3e..6d19e83ee9 100644
--- a/pxr/usdImaging/usdviewq/usdviewContextMenuItem.py
+++ b/pxr/usdImaging/usdviewq/usdviewContextMenuItem.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2016 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 #
 # A base class for all context menu items.
diff --git a/pxr/usdImaging/usdviewq/utils.cpp b/pxr/usdImaging/usdviewq/utils.cpp
index 11b07a9691..aed6f7164c 100644
--- a/pxr/usdImaging/usdviewq/utils.cpp
+++ b/pxr/usdImaging/usdviewq/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdviewq/utils.h"
 #include "pxr/base/plug/registry.h"
diff --git a/pxr/usdImaging/usdviewq/utils.h b/pxr/usdImaging/usdviewq/utils.h
index 5f515bf7ee..086e803874 100644
--- a/pxr/usdImaging/usdviewq/utils.h
+++ b/pxr/usdImaging/usdviewq/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef PXR_USD_IMAGING_USDVIEWQ_UTILS_H
 #define PXR_USD_IMAGING_USDVIEWQ_UTILS_H
diff --git a/pxr/usdImaging/usdviewq/variantComboBox.py b/pxr/usdImaging/usdviewq/variantComboBox.py
index 77ed95230e..123fdb769b 100644
--- a/pxr/usdImaging/usdviewq/variantComboBox.py
+++ b/pxr/usdImaging/usdviewq/variantComboBox.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2017 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from .qt import QtCore, QtGui, QtWidgets
 
diff --git a/pxr/usdImaging/usdviewq/viewSettingsDataModel.py b/pxr/usdImaging/usdviewq/viewSettingsDataModel.py
index 1d67852cdc..f7db5d6c01 100644
--- a/pxr/usdImaging/usdviewq/viewSettingsDataModel.py
+++ b/pxr/usdImaging/usdviewq/viewSettingsDataModel.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2018 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from .qt import QtCore
diff --git a/pxr/usdImaging/usdviewq/wrapHydraObserver.cpp b/pxr/usdImaging/usdviewq/wrapHydraObserver.cpp
index 99aa8889bb..327aa88eae 100644
--- a/pxr/usdImaging/usdviewq/wrapHydraObserver.cpp
+++ b/pxr/usdImaging/usdviewq/wrapHydraObserver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/usdImaging/usdviewq/hydraObserver.h"
diff --git a/pxr/usdImaging/usdviewq/wrapUtils.cpp b/pxr/usdImaging/usdviewq/wrapUtils.cpp
index 954c961a06..122f1c3b61 100644
--- a/pxr/usdImaging/usdviewq/wrapUtils.cpp
+++ b/pxr/usdImaging/usdviewq/wrapUtils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/usdImaging/usdviewq/utils.h"
 
diff --git a/third_party/renderman-25/plugin/CMakeLists.txt b/third_party/renderman-25/plugin/CMakeLists.txt
index 403e537358..a5e87dbdfd 100644
--- a/third_party/renderman-25/plugin/CMakeLists.txt
+++ b/third_party/renderman-25/plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(rmanArgsParser)
 add_subdirectory(rmanDiscovery)
 add_subdirectory(hdPrman)
-add_subdirectory(rtx_glfImage)
+add_subdirectory(rtx_hioImage)
 add_subdirectory(usdRiPxr)
 # Only build rmanOslParser when sdrOsl is disabled
 # This allows hdPrman to render OSL files without OSL pre-installed
diff --git a/third_party/renderman-25/plugin/hdPrman/CMakeLists.txt b/third_party/renderman-25/plugin/hdPrman/CMakeLists.txt
index bf87efa5d2..262062aa7d 100644
--- a/third_party/renderman-25/plugin/hdPrman/CMakeLists.txt
+++ b/third_party/renderman-25/plugin/hdPrman/CMakeLists.txt
@@ -115,6 +115,7 @@ pxr_plugin(${PXR_PACKAGE}
         rileyFallbackMaterialSceneIndexPlugin
         rileyGeometryInstanceSchema
         rileyGeometryPrototypeSchema
+        rileyGlobalsSchema
         rileyIntegratorSchema
         rileyLightInstanceSchema
         rileyLightShaderSchema
@@ -150,6 +151,8 @@ pxr_plugin(${PXR_PACKAGE}
         renderBuffer
         renderParam
         renderPass
+        renderPassSceneIndex
+        renderPassSceneIndexPlugin
         renderSettingsFilteringSceneIndexPlugin
         renderViewContext
         resourceRegistry
@@ -161,6 +164,7 @@ pxr_plugin(${PXR_PACKAGE}
         rileyDisplayPrim
         rileyGeometryInstancePrim
         rileyGeometryPrototypePrim
+        rileyGlobalsPrim
         rileyIntegratorPrim
         rileyLightInstancePrim
         rileyLightShaderPrim
@@ -191,6 +195,7 @@ pxr_plugin(${PXR_PACKAGE}
         virtualStructConditionalGrammar.tab.h
 
     CPPFILES
+        lightLinkingSceneIndexPlugin.cpp
         rendererPlugin.cpp
         virtualStructConditionalGrammar.lex.cpp
         virtualStructConditionalGrammar.tab.cpp
diff --git a/third_party/renderman-25/plugin/hdPrman/api.h b/third_party/renderman-25/plugin/hdPrman/api.h
index 2a1fc69fd7..c0b72141c7 100644
--- a/third_party/renderman-25/plugin/hdPrman/api.h
+++ b/third_party/renderman-25/plugin/hdPrman/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_API_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_API_H
diff --git a/third_party/renderman-25/plugin/hdPrman/basisCurves.cpp b/third_party/renderman-25/plugin/hdPrman/basisCurves.cpp
index 62e5bbb570..c30d05a65e 100644
--- a/third_party/renderman-25/plugin/hdPrman/basisCurves.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/basisCurves.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <numeric> // for std::iota
 #include "hdPrman/basisCurves.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/basisCurves.h b/third_party/renderman-25/plugin/hdPrman/basisCurves.h
index 1b7f358458..25f8702bb0 100644
--- a/third_party/renderman-25/plugin/hdPrman/basisCurves.h
+++ b/third_party/renderman-25/plugin/hdPrman/basisCurves.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_BASIS_CURVES_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_BASIS_CURVES_H
diff --git a/third_party/renderman-25/plugin/hdPrman/camera.cpp b/third_party/renderman-25/plugin/hdPrman/camera.cpp
index c66b288606..7ce89f71db 100644
--- a/third_party/renderman-25/plugin/hdPrman/camera.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/camera.cpp
@@ -1,31 +1,16 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/camera.h"
 #include "hdPrman/cameraContext.h"
 
 #include "pxr/imaging/hd/sceneDelegate.h"
 
+#include <cmath>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 #if HD_API_VERSION < 52
@@ -51,37 +36,24 @@ TF_DEFINE_PRIVATE_TOKENS(
     ((apertureRoundness, "ri:apertureRoundness"))
 );
 
-namespace {
-
-const HdPrmanCamera::ShutterCurve&
-_GetFallbackShutterCurve(
-    bool interactive)
+static
+std::optional<std::array<float, 8>>
+_ToOptionalFloat8(const VtValue &value)
 {
-    if (interactive) {
-        // Open instantaneously, remain fully open for the duration of the
-        // shutter interval (set via the param RixStr.k_Ri_Shutter) and close
-        // instantaneously.
-        static const HdPrmanCamera::ShutterCurve interactiveFallback = {
-            0.0,
-            1.0,
-            { 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f }};
-
-        return interactiveFallback;
+    if (!value.IsHolding<VtArray<float>>()) {
+        return std::nullopt;
     }
-
-    // Open instantaneously and start closing immediately, rapidly at first
-    // decelerating until the end of the interval.
-    static const HdPrmanCamera::ShutterCurve batchFallback = {
-        0.0,
-        0.0,
-        { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.3f, 0.0f }};
-    
-    return batchFallback;
+    const VtArray<float> array = value.UncheckedGet<VtArray<float>>();
+    if (array.size() != 8) {
+        return std::nullopt;
+    }
+    std::array<float, 8> result;
+    for (size_t i = 0; i < 8; i++) {
+        result[i] = array[i];
+    }
+    return result;
 }
 
-} // anon
-
-
 HdPrmanCamera::HdPrmanCamera(SdfPath const& id)
   : HdCamera(id)
 #if HD_API_VERSION < 52
@@ -92,7 +64,6 @@ HdPrmanCamera::HdPrmanCamera(SdfPath const& id)
   , _lensDistortionAsym(0.0f)
   , _lensDistortionScale(1.0f)
 #endif
-  , _shutterCurve(_GetFallbackShutterCurve(/*isInteractive = */true))
   , _apertureAngle(0.0f)
   , _apertureDensity(0.0f)
   , _apertureNSides(0)
@@ -162,24 +133,23 @@ HdPrmanCamera::Sync(HdSceneDelegate *sceneDelegate,
 
         const VtValue vShutterOpenTime =
             sceneDelegate->GetCameraParamValue(id, _tokens->shutterOpenTime);
+        if (vShutterOpenTime.IsHolding<float>()) {
+            _shutterCurve.shutterOpenTime =
+                vShutterOpenTime.UncheckedGet<float>();
+        } else {
+            _shutterCurve.shutterOpenTime = std::nullopt;
+        }
         const VtValue vShutterCloseTime =
             sceneDelegate->GetCameraParamValue(id, _tokens->shutterCloseTime);
-        const VtValue vShutteropening =
-            sceneDelegate->GetCameraParamValue(id, _tokens->shutteropening);
-        
-        if (vShutterOpenTime.IsHolding<float>() &&
-            vShutterCloseTime.IsHolding<float>() &&
-            vShutteropening.IsHolding<VtArray<float>>()) {
-
-            _shutterCurve = {
-                vShutterOpenTime.UncheckedGet<float>(),
-                vShutterCloseTime.UncheckedGet<float>(),
-                vShutteropening.UncheckedGet<VtArray<float>>()
-            };
-
+        if (vShutterCloseTime.IsHolding<float>()) {
+            _shutterCurve.shutterCloseTime =
+                vShutterCloseTime.UncheckedGet<float>();
         } else {
-            _shutterCurve = _GetFallbackShutterCurve(param->IsInteractive());
+            _shutterCurve.shutterCloseTime = std::nullopt;
         }
+        const VtValue vShutteropening =
+            sceneDelegate->GetCameraParamValue(id, _tokens->shutteropening);
+        _shutterCurve.shutteropening = _ToOptionalFloat8(vShutteropening);
 
         _apertureAngle =
             sceneDelegate->GetCameraParamValue(id, _tokens->apertureAngle)
diff --git a/third_party/renderman-25/plugin/hdPrman/camera.h b/third_party/renderman-25/plugin/hdPrman/camera.h
index ca8d898772..dee7304338 100644
--- a/third_party/renderman-25/plugin/hdPrman/camera.h
+++ b/third_party/renderman-25/plugin/hdPrman/camera.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_H
@@ -32,6 +15,8 @@
 
 #include "pxr/base/vt/array.h"
 
+#include <optional>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 class HdSceneDelegate;
@@ -52,9 +37,9 @@ class HdPrmanCamera final : public HdCamera
     ///
     struct ShutterCurve
     {
-        float shutterOpenTime;
-        float shutterCloseTime;
-        VtArray<float> shutteropening;
+        std::optional<float> shutterOpenTime;
+        std::optional<float> shutterCloseTime;
+        std::optional<std::array<float, 8>> shutteropening;
     };
 
     HDPRMAN_API
diff --git a/third_party/renderman-25/plugin/hdPrman/cameraContext.cpp b/third_party/renderman-25/plugin/hdPrman/cameraContext.cpp
index 4dcfec0656..8ea28e1a10 100644
--- a/third_party/renderman-25/plugin/hdPrman/cameraContext.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/cameraContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/cameraContext.h"
 
@@ -389,13 +372,21 @@ HdPrman_CameraContext::_ComputeCameraParams(
         dynamic_cast<const HdPrmanCamera * const>(camera);
     const HdPrmanCamera::ShutterCurve &shutterCurve
         = hdPrmanCamera->GetShutterCurve();
-        
-    result.SetFloat(RixStr.k_shutterOpenTime, shutterCurve.shutterOpenTime);
-    result.SetFloat(RixStr.k_shutterCloseTime, shutterCurve.shutterCloseTime);
-    result.SetFloatArray(
-        RixStr.k_shutteropening,
-        shutterCurve.shutteropening.data(),
-        shutterCurve.shutteropening.size());
+
+    if (shutterCurve.shutterOpenTime) {
+        result.SetFloat(
+            RixStr.k_shutterOpenTime, *shutterCurve.shutterOpenTime);
+    }
+    if (shutterCurve.shutterCloseTime) {
+        result.SetFloat(
+            RixStr.k_shutterCloseTime, *shutterCurve.shutterCloseTime);
+    }
+    if (shutterCurve.shutteropening) {
+        result.SetFloatArray(
+            RixStr.k_shutteropening,
+            shutterCurve.shutteropening->data(),
+            shutterCurve.shutteropening->size());
+    }
 
     result.SetFloat(RixStr.k_apertureAngle,
                     hdPrmanCamera->GetApertureAngle());
diff --git a/third_party/renderman-25/plugin/hdPrman/cameraContext.h b/third_party/renderman-25/plugin/hdPrman/cameraContext.h
index 0170a7203f..8517826f64 100644
--- a/third_party/renderman-25/plugin/hdPrman/cameraContext.h
+++ b/third_party/renderman-25/plugin/hdPrman/cameraContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_CONTEXT_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_CONTEXT_H
diff --git a/third_party/renderman-25/plugin/hdPrman/codegenTemplates/rileyPrim.cpp b/third_party/renderman-25/plugin/hdPrman/codegenTemplates/rileyPrim.cpp
index 14803f74f4..50f155cf75 100644
--- a/third_party/renderman-25/plugin/hdPrman/codegenTemplates/rileyPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/codegenTemplates/rileyPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/codegenTemplates/rileyPrim.h b/third_party/renderman-25/plugin/hdPrman/codegenTemplates/rileyPrim.h
index 8377f0083f..2db6a73851 100644
--- a/third_party/renderman-25/plugin/hdPrman/codegenTemplates/rileyPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/codegenTemplates/rileyPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/cone.cpp b/third_party/renderman-25/plugin/hdPrman/cone.cpp
index 47e21a3335..3e2493f381 100644
--- a/third_party/renderman-25/plugin/hdPrman/cone.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/cone.cpp
@@ -3,25 +3,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/cone.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/cone.h b/third_party/renderman-25/plugin/hdPrman/cone.h
index 3b7b49bf79..2ab400ff05 100644
--- a/third_party/renderman-25/plugin/hdPrman/cone.h
+++ b/third_party/renderman-25/plugin/hdPrman/cone.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CONE_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CONE_H
diff --git a/third_party/renderman-25/plugin/hdPrman/coordSys.cpp b/third_party/renderman-25/plugin/hdPrman/coordSys.cpp
index d7d007a4d8..2882979709 100644
--- a/third_party/renderman-25/plugin/hdPrman/coordSys.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/coordSys.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/coordSys.h"
 #include "hdPrman/renderParam.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/coordSys.h b/third_party/renderman-25/plugin/hdPrman/coordSys.h
index ba05f81ea7..5b86390d31 100644
--- a/third_party/renderman-25/plugin/hdPrman/coordSys.h
+++ b/third_party/renderman-25/plugin/hdPrman/coordSys.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_COORD_SYS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_COORD_SYS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/coordSysPrimSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/coordSysPrimSceneIndexPlugin.cpp
index 896ce7d5df..e64ea31731 100644
--- a/third_party/renderman-25/plugin/hdPrman/coordSysPrimSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/coordSysPrimSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/coordSysPrimSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/coordSysPrimSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/coordSysPrimSceneIndexPlugin.h
index 398480ae3b..e52f12f9b3 100644
--- a/third_party/renderman-25/plugin/hdPrman/coordSysPrimSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/coordSysPrimSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_HDPRMAN_COORD_SYS_PRIM_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HDPRMAN_COORD_SYS_PRIM_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/cylinder.cpp b/third_party/renderman-25/plugin/hdPrman/cylinder.cpp
index 3b9b95761b..d07f34977e 100644
--- a/third_party/renderman-25/plugin/hdPrman/cylinder.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/cylinder.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/cylinder.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/cylinder.h b/third_party/renderman-25/plugin/hdPrman/cylinder.h
index 09cdbd867f..9c46935555 100644
--- a/third_party/renderman-25/plugin/hdPrman/cylinder.h
+++ b/third_party/renderman-25/plugin/hdPrman/cylinder.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CYLINDER_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CYLINDER_H
diff --git a/third_party/renderman-25/plugin/hdPrman/debugCodes.cpp b/third_party/renderman-25/plugin/hdPrman/debugCodes.cpp
index 013966389a..03211fa400 100644
--- a/third_party/renderman-25/plugin/hdPrman/debugCodes.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/debugCodes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/debugCodes.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/debugCodes.h b/third_party/renderman-25/plugin/hdPrman/debugCodes.h
index efdafcc7d8..058f007196 100644
--- a/third_party/renderman-25/plugin/hdPrman/debugCodes.h
+++ b/third_party/renderman-25/plugin/hdPrman/debugCodes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_CODES_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_CODES_H
diff --git a/third_party/renderman-25/plugin/hdPrman/debugUtil.cpp b/third_party/renderman-25/plugin/hdPrman/debugUtil.cpp
index 20bdfa41c3..0c2862fa14 100644
--- a/third_party/renderman-25/plugin/hdPrman/debugUtil.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/debugUtil.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/debugUtil.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/debugUtil.h b/third_party/renderman-25/plugin/hdPrman/debugUtil.h
index a5373c13b3..0411ff2169 100644
--- a/third_party/renderman-25/plugin/hdPrman/debugUtil.h
+++ b/third_party/renderman-25/plugin/hdPrman/debugUtil.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_UTIL_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_UTIL_H
diff --git a/third_party/renderman-25/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.cpp
index 86c34f79c5..dd3433f1f7 100644
--- a/third_party/renderman-25/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/dependencyForwardingSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.h
index 64f00faaed..22efb671f7 100644
--- a/third_party/renderman-25/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_HDPRMAN_DEPENDENCY_FORWARDING_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HDPRMAN_DEPENDENCY_FORWARDING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/displayFilter.cpp b/third_party/renderman-25/plugin/hdPrman/displayFilter.cpp
index 8b7eefcb13..28e7f54279 100644
--- a/third_party/renderman-25/plugin/hdPrman/displayFilter.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/displayFilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/displayFilter.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/displayFilter.h b/third_party/renderman-25/plugin/hdPrman/displayFilter.h
index f17ef6bd92..0a6f111ddb 100644
--- a/third_party/renderman-25/plugin/hdPrman/displayFilter.h
+++ b/third_party/renderman-25/plugin/hdPrman/displayFilter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DISPLAY_FILTER_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DISPLAY_FILTER_H
diff --git a/third_party/renderman-25/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.cpp
index 6f089660fb..42e0759070 100644
--- a/third_party/renderman-25/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h
index 9123278784..686ac5e6c9 100644
--- a/third_party/renderman-25/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_EXT_COMPUTATION_PRIMVAR_PRUNING_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_EXT_COMPUTATION_PRIMVAR_PRUNING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/framebuffer.cpp b/third_party/renderman-25/plugin/hdPrman/framebuffer.cpp
index 154de99bf4..8454743785 100644
--- a/third_party/renderman-25/plugin/hdPrman/framebuffer.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/framebuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "framebuffer.h"
@@ -567,7 +550,9 @@ class DisplayHydra final : public display::Display
         m_height(0),
         m_surface(nullptr),
         m_alphaOffset(k_invalidOffset),
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
         m_weightsOffset(k_invalidOffset),
+#endif
         m_buf(nullptr)
     {
         int bufferID = 0;
@@ -578,25 +563,31 @@ class DisplayHydra final : public display::Display
     ~DisplayHydra() override = default;
 
     // Display interface
-    bool Rebind(const uint32_t width, const uint32_t height,
-                const char* /*srfaddrhandle*/, const void* srfaddr,
-                const size_t /*srfsizebytes*/, const size_t weightsoffset,
-                const size_t* offsets, const display::RenderOutput* outputs,
+    bool Rebind(const uint32_t width, const uint32_t height, const char* /*srfaddrhandle*/,
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                const void* srfaddr, const size_t /*srfsizebytes*/, const size_t weightsoffset,
+                const size_t* srfoffsets, const display::RenderOutput* outputs,
+#else
+                const void* srfaddr, const size_t /*srfsizebytes*/, const size_t* srfoffsets,
+                const size_t* /*sampleoffsets*/, const display::RenderOutput* outputs,
+#endif
                 const size_t noutputs) override
     {
         m_surface = static_cast<const uint8_t*>(srfaddr);
         m_width = width;
         m_height = height;
 
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
         m_weightsOffset = weightsoffset;
+#endif
         m_offsets.clear();
         m_offsets.reserve(noutputs);
         for (size_t i = 0; i < noutputs; i++)
         {
-            m_offsets.push_back(offsets[i]);
+            m_offsets.push_back(srfoffsets[i]);
             if(outputs[i].name == RixStr.k_a)
             {
-                m_alphaOffset = offsets[i];
+                m_alphaOffset = srfoffsets[i];
             }
         }
 
@@ -642,10 +633,11 @@ class DisplayHydra final : public display::Display
             const HdPrmanFramebuffer::AovDesc &aovDesc =
                 aovBuffer.desc;
 
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
             const float* const srcWeights = m_weightsOffset != k_invalidOffset ? 
                 reinterpret_cast<const float*>(m_surface+m_weightsOffset) : nullptr;
+#endif
             const bool shouldNormalize = aovDesc.ShouldNormalizeBySampleCount();
-
             const int cc = HdGetComponentCount(aovDesc.format);
             const size_t srcOffset = m_offsets[offsetIdx];
             if (aovDesc.format == HdFormatInt32) {
@@ -779,12 +771,17 @@ class DisplayHydra final : public display::Display
                 }
                 else if( cc == 4 ) {
                     WorkParallelForN(m_height,
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                      [this, &aovBuffer, &srcWeights, &srcOffset, shouldNormalize]
+#else
+                                     [this, &aovBuffer, &srcOffset, shouldNormalize]
+#endif
                                      (size_t begin, size_t end) {
 
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                         const float* weights = srcWeights ?
                             srcWeights + begin * m_width : nullptr;
- 
+#endif
                         const float* srcColorR =
                             reinterpret_cast<const float*>(
                                 m_surface + srcOffset)
@@ -806,9 +803,10 @@ class DisplayHydra final : public display::Display
 
                             for (uint32_t x = 0; x < m_width; x++) {
                                 float isc = 1.f;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                 if(weights && shouldNormalize && *weights > 0.f)
                                     isc = 1.f / *weights;
-
+#endif
                                 const float* const srcColorG =
                                     srcColorR + (m_height * m_width);
                                 const float* const srcColorB =
@@ -828,7 +826,9 @@ class DisplayHydra final : public display::Display
                                 aovData += 4;
                                 srcColorR++;
                                 srcColorA++;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                 if (weights) weights++;
+#endif
                             }
                         }
                     });
@@ -840,12 +840,17 @@ class DisplayHydra final : public display::Display
                 }
                 else if (cc == 1) {
                     WorkParallelForN(m_height,
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                      [this, &aovBuffer, &srcWeights, &srcOffset, shouldNormalize]
+#else
+                                     [this, &aovBuffer, &srcOffset, shouldNormalize]
+#endif
                                      (size_t begin, size_t end) {
 
-
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                         const float* weights = srcWeights ?
                             srcWeights + begin * m_width : nullptr;
+#endif
                         const float* srcColorR =
                             reinterpret_cast<const float*>(
                                 m_surface + srcOffset)
@@ -861,14 +866,18 @@ class DisplayHydra final : public display::Display
                             for (uint32_t x = 0; x < m_width; x++)
                             {
                                 float isc = 1.f;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                 if(weights && shouldNormalize && *weights > 0.f)
                                     isc = 1.f / *weights;
+#endif
 
                                 *aovData = *srcColorR * isc;
 
                                 aovData++;
                                 srcColorR++;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                 if (weights) weights++;
+#endif
                             }
                         }
                     });
@@ -876,11 +885,17 @@ class DisplayHydra final : public display::Display
                 else {
                     assert(cc == 3);
                     WorkParallelForN(m_height,
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                      [this, &aovBuffer, &srcWeights, &srcOffset, shouldNormalize]
+#else
+                                     [this, &aovBuffer, &srcOffset, shouldNormalize]
+#endif
                                      (size_t begin, size_t end) {
 
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                         const float* weights = srcWeights ?
                             srcWeights + begin * m_width : nullptr;
+#endif
                         const float* srcColorR =
                             reinterpret_cast<const float*>(
                                 m_surface + srcOffset)
@@ -894,8 +909,10 @@ class DisplayHydra final : public display::Display
 
                             for (uint32_t x = 0; x < m_width; x++) {
                                 float isc = 1.f;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                 if(weights && shouldNormalize && *weights > 0.f)
                                     isc = 1.f / *weights;
+#endif
 
                                 const float* const srcColorG =
                                     srcColorR + (m_height * m_width);
@@ -908,7 +925,9 @@ class DisplayHydra final : public display::Display
 
                                 aovData += 3;
                                 srcColorR++;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
                                 if (weights) weights++;
+#endif
                             }
                         }
                     });
@@ -917,19 +936,33 @@ class DisplayHydra final : public display::Display
         }
     }
 
+#if DISPLAY_INTERFACE_VERSION >= 2
+    uint64_t GetRequirements() const override
+    {
+        return display::Display::k_reqFrameBuffer;
+    }
+#endif
 private:
     uint32_t m_width;
     uint32_t m_height;
     const uint8_t* m_surface;
     size_t m_alphaOffset;
     std::vector<size_t> m_offsets;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
     size_t m_weightsOffset;
+#endif
 
     HdPrmanFramebuffer* m_buf;
 };
 
 }
 
+// Export the current version of the Display API, necessary for binary compatibility with the
+// renderer
+#if DISPLAY_INTERFACE_VERSION >= 1
+DISPLAYEXPORTVERSION
+#endif
+
 extern "C" DISPLAYEXPORT
 display::Display* CreateDisplay(const pxrcore::UString& name,
                                 const pxrcore::ParamList& params,
diff --git a/third_party/renderman-25/plugin/hdPrman/framebuffer.h b/third_party/renderman-25/plugin/hdPrman/framebuffer.h
index 9f4e2fee68..4b85d9970c 100644
--- a/third_party/renderman-25/plugin/hdPrman/framebuffer.h
+++ b/third_party/renderman-25/plugin/hdPrman/framebuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_FRAMEBUFFER_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_FRAMEBUFFER_H
diff --git a/third_party/renderman-25/plugin/hdPrman/gprim.cpp b/third_party/renderman-25/plugin/hdPrman/gprim.cpp
index 4f4192cbfb..8909822cec 100644
--- a/third_party/renderman-25/plugin/hdPrman/gprim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/gprim.cpp
@@ -1,24 +1,7 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/gprim.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/gprim.h b/third_party/renderman-25/plugin/hdPrman/gprim.h
index bed1bd5417..dded31efc0 100644
--- a/third_party/renderman-25/plugin/hdPrman/gprim.h
+++ b/third_party/renderman-25/plugin/hdPrman/gprim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIM_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIM_H
@@ -153,6 +136,23 @@ HdPrman_Gprim<BASE>::Sync(HdSceneDelegate* sceneDelegate,
     HF_MALLOC_TAG_FUNCTION();
     TF_UNUSED(reprToken);
 
+    // Check if there are any relevant dirtyBits.
+    // (See the HdChangeTracker::MarkRprimDirty() note regarding
+    // internalDirtyBits used for internal signaling in Hydra.)
+    static const HdDirtyBits internalDirtyBits = 
+        HdChangeTracker::InitRepr |
+        HdChangeTracker::Varying |
+        HdChangeTracker::NewRepr |
+        HdChangeTracker::CustomBitsMask;
+    // HdPrman does not make use of the repr concept or customBits.
+    *dirtyBits &= ~(HdChangeTracker::NewRepr | HdChangeTracker::CustomBitsMask);
+    // If no relevant dirtyBits remain, return early to avoid acquiring write
+    // access to Riley, which requires a pause and restart of rendering.
+    if (((*dirtyBits & ~internalDirtyBits)
+         & HdChangeTracker::AllSceneDirtyBits) == 0) {
+        return;
+    }
+
     HdPrman_RenderParam *param =
         static_cast<HdPrman_RenderParam*>(renderParam);
 
@@ -208,7 +208,7 @@ HdPrman_Gprim<BASE>::Sync(HdSceneDelegate* sceneDelegate,
     // Hydra dirty bits corresponding to PRMan prototype attributes (also called
     // "primitive variables" but not synonymous with USD primvars). See prman
     // docs at https://rmanwiki.pixar.com/display/REN24/Primitive+Variables.
-    static const int prmanProtoAttrBits = 
+    static const HdDirtyBits prmanProtoAttrBits = 
         HdChangeTracker::DirtyPoints |
         HdChangeTracker::DirtyNormals |
         HdChangeTracker::DirtyWidths |
@@ -216,7 +216,7 @@ HdPrman_Gprim<BASE>::Sync(HdSceneDelegate* sceneDelegate,
 
     // Hydra dirty bits corresponding to prman instance attributes. See prman
     // docs at https://rmanwiki.pixar.com/display/REN24/Instance+Attributes.
-    static const int prmanInstAttrBits =
+    static const HdDirtyBits prmanInstAttrBits =
         HdChangeTracker::DirtyMaterialId |
         HdChangeTracker::DirtyTransform |
         HdChangeTracker::DirtyVisibility |
@@ -338,10 +338,7 @@ HdPrman_Gprim<BASE>::Sync(HdSceneDelegate* sceneDelegate,
     //
     
     // Resolve attributes.
-    bool sceneVisibility = true;
-    RtParamList attrs = param->ConvertAttributes(sceneDelegate, id, true,
-                                                 &sceneVisibility);
-    _sceneVisibility = sceneVisibility;
+    RtParamList attrs = param->ConvertAttributes(sceneDelegate, id, true);
 
     // Add "identifier:id" with the prim id.
     attrs.SetInteger(RixStr.k_identifier_id, primId);
@@ -400,6 +397,10 @@ HdPrman_Gprim<BASE>::Sync(HdSceneDelegate* sceneDelegate,
                 TF_VERIFY(j < subsetMaterialIds.size());
                 instanceMaterialId = subsetMaterialIds[j];
             }
+            
+            // Very last thing: prepend renderTag to grouping:membership
+            param->AddRenderTagToGroupingMembership(
+                sceneDelegate->GetRenderTag(id), finalAttrs);
 
             if (instanceId == riley::GeometryInstanceId::InvalidId()) {
                 TRACE_SCOPE("riley::CreateGeometryInstance");
diff --git a/third_party/renderman-25/plugin/hdPrman/gprimbase.cpp b/third_party/renderman-25/plugin/hdPrman/gprimbase.cpp
index 3fbffd7e35..3cc15c1acf 100644
--- a/third_party/renderman-25/plugin/hdPrman/gprimbase.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/gprimbase.cpp
@@ -1,66 +1,16 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "hdPrman/gprimbase.h"
-#include "hdPrman/rixStrings.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
 
 HdPrman_GprimBase::~HdPrman_GprimBase() = default; 
 
-void
-HdPrman_GprimBase::UpdateInstanceVisibility(bool renderPassVisibility,
-                                            riley::Riley *riley ) const
-{
-    if (_renderPassVisibility == renderPassVisibility) {
-        return;
-    }
-    _renderPassVisibility = renderPassVisibility;
-    if (!_sceneVisibility) {
-        // If the prim is not visible in the scene it cannot be
-        // further affected by render pass state.
-        return;
-    }
-    for(auto instid : _instanceIds) {
-        RtParamList attrs;
-        attrs.SetInteger(RixStr.k_visibility_camera,
-                         static_cast<int>(_renderPassVisibility));
-        attrs.SetInteger(RixStr.k_visibility_indirect,
-                         static_cast<int>(_renderPassVisibility));
-        attrs.SetInteger(RixStr.k_visibility_transmission,
-                         static_cast<int>(_renderPassVisibility));
-        // XXX: HYD-2973: This approach has the unfortunate side-effect
-        // of clearing any other attributes that had been previously set
-        // on this geometry instance.  This can break features that rely
-        // on those attributes, such as subsurface and light-linking.
-        riley->ModifyGeometryInstance(
-            riley::GeometryPrototypeId::InvalidId(),
-            instid, nullptr, nullptr,
-            nullptr, &attrs);
-    }
-}
-
 std::vector<riley::GeometryPrototypeId> 
 HdPrman_GprimBase::GetPrototypeIds() const
 {
diff --git a/third_party/renderman-25/plugin/hdPrman/gprimbase.h b/third_party/renderman-25/plugin/hdPrman/gprimbase.h
index b03ed6ba2e..9477bb8031 100644
--- a/third_party/renderman-25/plugin/hdPrman/gprimbase.h
+++ b/third_party/renderman-25/plugin/hdPrman/gprimbase.h
@@ -1,33 +1,16 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIMBASE_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIMBASE_H
 
 #include "pxr/pxr.h"
-#include "pxr/imaging/hd/rprim.h"
 
-#include "Riley.h"
+#include <Riley.h>
+#include <RileyIds.h>
 
 #include <vector>
 
@@ -40,20 +23,11 @@ class HdPrman_GprimBase
     HdPrman_GprimBase() = default;
     virtual ~HdPrman_GprimBase() = 0;
 
-    /// Update the visibilty of this prim for a render pass.
-    void UpdateInstanceVisibility(bool renderPassVisibility,
-                                  riley::Riley *riley ) const;
-
     std::vector<riley::GeometryPrototypeId> GetPrototypeIds() const;
 
 protected:
     std::vector<riley::GeometryPrototypeId> _prototypeIds;
     std::vector<riley::GeometryInstanceId> _instanceIds;
-    
-    // Visibility state defined by the scene delegate.
-    bool _sceneVisibility:1;
-    // Visibility state defined by the render pass.
-    mutable bool _renderPassVisibility:1;
 };
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-25/plugin/hdPrman/hdPrmanGenParsers.py b/third_party/renderman-25/plugin/hdPrman/hdPrmanGenParsers.py
index 3ac73ec36f..8d4730bdcb 100644
--- a/third_party/renderman-25/plugin/hdPrman/hdPrmanGenParsers.py
+++ b/third_party/renderman-25/plugin/hdPrman/hdPrmanGenParsers.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from __future__ import print_function
diff --git a/third_party/renderman-25/plugin/hdPrman/hdSchemaDefs.py b/third_party/renderman-25/plugin/hdPrman/hdSchemaDefs.py
index 78f08e6cc0..ff1efedfe4 100644
--- a/third_party/renderman-25/plugin/hdPrman/hdSchemaDefs.py
+++ b/third_party/renderman-25/plugin/hdPrman/hdSchemaDefs.py
@@ -1,30 +1,13 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 [
     dict(
         SCHEMA_NAME = 'ALL_SCHEMAS',
-        LIBRARY_PATH = 'ext/rmanpkg/25.0/plugin/renderman/plugin/hdPrman',
+        LIBRARY_PATH = 'ext/rmanpkg/plugin/renderman/plugin/hdPrman',
         INCLUDE_PATH = 'hdPrman',
         VERSION_GUARD_CONST_GETTER = True
     ),
@@ -158,6 +141,25 @@
         ],
     ),
 
+    #--------------------------------------------------------------------------
+    #
+    #
+    # Schema's corresponding to riley globals.
+    #
+    #
+    # hdPrman/rileyGlobals
+    dict(
+        SCHEMA_NAME = 'RileyGlobals',
+        SCHEMA_TOKEN = 'rileyGlobals',
+        ADD_DEFAULT_LOCATOR = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('options', 'HdPrmanRileyParamListSchema', {})
+        ],
+    ),
+
     #--------------------------------------------------------------------------
     #
     #
diff --git a/third_party/renderman-25/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.cpp
index 4a4a8b1b13..662e33a173 100644
--- a/third_party/renderman-25/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/implicitSurfaceSceneIndexPlugin.h"
 
@@ -28,8 +11,14 @@
 #include "pxr/imaging/hd/tokens.h"
 #include "pxr/imaging/hdsi/implicitSurfaceSceneIndex.h"
 
+#include "pxr/base/tf/envSetting.h"
+
 PXR_NAMESPACE_OPEN_SCOPE
 
+TF_DEFINE_ENV_SETTING(HDPRMAN_TESSELLATE_IMPLICIT_SURFACES, false,
+    "Tessellate implicit surfaces into meshes, "
+    "instead of using Renderman implicits");
+
 TF_DEFINE_PRIVATE_TOKENS(
     _tokens,
     ((sceneIndexPluginName, "HdPrman_ImplicitSurfaceSceneIndexPlugin"))
@@ -60,13 +49,29 @@ TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
         HdRetainedTypedSampledDataSource<TfToken>::New(
             HdsiImplicitSurfaceSceneIndexTokens->toMesh);
 
-    HdContainerDataSourceHandle const inputArgs =
-        HdRetainedContainerDataSource::New(
-            HdPrimTypeTokens->cone, axisToTransformSrc,
-            HdPrimTypeTokens->cylinder, axisToTransformSrc,
-            // HdSphereSchema doesn't specify an axis, so it can be omitted.
-            HdPrimTypeTokens->cube, toMeshSrc,
-            HdPrimTypeTokens->capsule, toMeshSrc);
+    static bool tessellate =
+        (TfGetEnvSetting(HDPRMAN_TESSELLATE_IMPLICIT_SURFACES) == true);
+
+    HdContainerDataSourceHandle inputArgs;
+    if (tessellate) {
+        // Tessellate everything (legacy behavior).
+        inputArgs =
+            HdRetainedContainerDataSource::New(
+                HdPrimTypeTokens->sphere, toMeshSrc,
+                HdPrimTypeTokens->cube, toMeshSrc,
+                HdPrimTypeTokens->cone, toMeshSrc,
+                HdPrimTypeTokens->cylinder, toMeshSrc,
+                HdPrimTypeTokens->capsule, toMeshSrc);
+    } else {
+        // Cone and cylinder need transforms updated, and cube and capsule still
+        // need to be tessellated.
+        inputArgs =
+            HdRetainedContainerDataSource::New(
+                HdPrimTypeTokens->cone, axisToTransformSrc,
+                HdPrimTypeTokens->cylinder, axisToTransformSrc,
+                HdPrimTypeTokens->cube, toMeshSrc,
+                HdPrimTypeTokens->capsule, toMeshSrc);
+    }
 
     HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
         _pluginDisplayName,
diff --git a/third_party/renderman-25/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.h
index ff84b432a2..41361094bf 100644
--- a/third_party/renderman-25/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_HDPRMAN_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HDPRMAN_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/instancer.cpp b/third_party/renderman-25/plugin/hdPrman/instancer.cpp
index cd31b82202..588dfb17f5 100644
--- a/third_party/renderman-25/plugin/hdPrman/instancer.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/instancer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/instancer.h"
 
@@ -1055,6 +1038,7 @@ HdPrmanInstancer::_PopulateInstances(
         // Finalize the prototype-derived params & flats
         std::vector<RtParamList> protoParams;
         std::vector<_FlattenData> protoFlats;
+        std::vector<TfToken> protoRenderTags;
 
         _ComposePrototypeData(
             prototypePrimPath,
@@ -1064,8 +1048,9 @@ HdPrmanInstancer::_PopulateInstances(
             prototypePaths,
             prototypeFlats,
             protoParams,
-            protoFlats);
-
+            protoFlats,
+            protoRenderTags);
+        
         // Prepare each instance to be sent to riley
         _ParallelFor(instances.size(), [&](size_t i) {
             const _InstanceData& instance = instances[i];
@@ -1225,6 +1210,9 @@ HdPrmanInstancer::_PopulateInstances(
                             &params);
                     }
                 } else {
+                    // Very last thing: prepend renderTag to grouping:membership
+                    param->AddRenderTagToGroupingMembership(
+                        protoRenderTags[j], params);
                     if (instId.geoInstanceId == riley::GeometryInstanceId::InvalidId()) {
                         TRACE_SCOPE("riley::CreateGeometryInstance");
                         instId.geoInstanceId = riley->CreateGeometryInstance(
@@ -1450,7 +1438,8 @@ HdPrmanInstancer::_ComposePrototypeData(
     const SdfPathVector& subProtoPaths,
     const std::vector<_FlattenData>& subProtoFlats,
     std::vector<RtParamList>& protoParams,
-    std::vector<_FlattenData>& protoFlats)
+    std::vector<_FlattenData>& protoFlats,
+    std::vector<TfToken>& protoRenderTags)
 {
     HD_TRACE_FUNCTION();
     HdSceneDelegate* delegate = GetDelegate();
@@ -1494,15 +1483,21 @@ HdPrmanInstancer::_ComposePrototypeData(
 
     protoParams.resize(count);
     protoFlats.resize(count);
+    protoRenderTags.resize(count);
 
     for (size_t i = 0; i < count; ++i) {
         SetProtoParams(protoPath, protoParams[i], protoFlats[i]);
+        if (!isLight) {
+            protoRenderTags[i] = delegate->GetRenderTag(protoPath);
+        }
 
         // If prototype is a subset, also get the subset params. While geom
         // subsets should not have USD primvars on them, they may be the targets
         // of light linking and thus have categories to deal with. They may also
         // receive visibility params as part of Hydra's handling of invisible
         // faces, even though visibility cannot be authored on them in USD.
+        // XXX: All that is changing in hydra 2, where subsets will be able to
+        // have primvars, visibility, and purpose!
         if (i < subProtoPaths.size() && subProtoPaths[i] != protoPath) {
             RtParamList subsetParams;
             _FlattenData subsetFlats;
diff --git a/third_party/renderman-25/plugin/hdPrman/instancer.h b/third_party/renderman-25/plugin/hdPrman/instancer.h
index efb7e932ce..e9b3c34f6f 100644
--- a/third_party/renderman-25/plugin/hdPrman/instancer.h
+++ b/third_party/renderman-25/plugin/hdPrman/instancer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INSTANCER_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INSTANCER_H
@@ -524,7 +507,8 @@ class HdPrmanInstancer : public HdInstancer
         const SdfPathVector& subProtoPaths,
         const std::vector<_FlattenData>& subProtoFlats,
         std::vector<RtParamList>& protoParams,
-        std::vector<_FlattenData>& protoFlats);
+        std::vector<_FlattenData>& protoFlats,
+        std::vector<TfToken>& protoRenderTags);
 
     // Deletes riley instances owned by this instancer that are of riley
     // geometry prototypes that are no longer associated with the given
diff --git a/third_party/renderman-25/plugin/hdPrman/integrator.cpp b/third_party/renderman-25/plugin/hdPrman/integrator.cpp
index 02bbc82635..136fc886f7 100644
--- a/third_party/renderman-25/plugin/hdPrman/integrator.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/integrator.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/integrator.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/integrator.h b/third_party/renderman-25/plugin/hdPrman/integrator.h
index 6e51ed72c1..e13d66c3d3 100644
--- a/third_party/renderman-25/plugin/hdPrman/integrator.h
+++ b/third_party/renderman-25/plugin/hdPrman/integrator.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INTEGRATOR_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INTEGRATOR_H
diff --git a/third_party/renderman-25/plugin/hdPrman/legacyMeshLightAdapter.cpp b/third_party/renderman-25/plugin/hdPrman/legacyMeshLightAdapter.cpp
index c7fbac11cc..d4b21e3e50 100644
--- a/third_party/renderman-25/plugin/hdPrman/legacyMeshLightAdapter.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/legacyMeshLightAdapter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/legacyMeshLightAdapter.h"
 #include "pxr/usd/usdLux/lightAPI.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/legacyMeshLightAdapter.h b/third_party/renderman-25/plugin/hdPrman/legacyMeshLightAdapter.h
index 349eadc05f..a73e2ab4a4 100644
--- a/third_party/renderman-25/plugin/hdPrman/legacyMeshLightAdapter.h
+++ b/third_party/renderman-25/plugin/hdPrman/legacyMeshLightAdapter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LEGACY_MESHLIGHT_ADAPTER_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LEGACY_MESHLIGHT_ADAPTER_H
 
diff --git a/third_party/renderman-25/plugin/hdPrman/light.cpp b/third_party/renderman-25/plugin/hdPrman/light.cpp
index bb888915d4..5cacba22b5 100644
--- a/third_party/renderman-25/plugin/hdPrman/light.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/light.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/light.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/light.h b/third_party/renderman-25/plugin/hdPrman/light.h
index f5301943a6..7db6b1030a 100644
--- a/third_party/renderman-25/plugin/hdPrman/light.h
+++ b/third_party/renderman-25/plugin/hdPrman/light.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_H
diff --git a/third_party/renderman-25/plugin/hdPrman/lightFilter.cpp b/third_party/renderman-25/plugin/hdPrman/lightFilter.cpp
index 7aac373d9f..ad8d0ca59b 100644
--- a/third_party/renderman-25/plugin/hdPrman/lightFilter.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/lightFilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/lightFilter.h"
 #include "hdPrman/renderParam.h"
@@ -28,7 +11,9 @@
 #include "hdPrman/utils.h"
 #include "pxr/usd/sdf/types.h"
 #include "pxr/base/tf/staticTokens.h"
+#include "pxr/imaging/hd/light.h"
 #include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/version.h"
 #include "pxr/imaging/hf/diagnostic.h"
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -71,11 +56,15 @@ void
 HdPrmanLightFilter::Sync(HdSceneDelegate *sceneDelegate,
                       HdRenderParam   *renderParam,
                       HdDirtyBits     *dirtyBits)
-{  
+{
     HdPrman_RenderParam *param =
         static_cast<HdPrman_RenderParam*>(renderParam);
 
+#if HD_API_VERSION >= 70
+    if (*dirtyBits & HdLight::DirtyTransform) {
+#else
     if (*dirtyBits & HdChangeTracker::DirtyTransform) {
+#endif
         std::lock_guard<std::mutex> lock(_syncToRileyMutex);
         _rileyIsInSync = false;
         _SyncToRileyWithLock(sceneDelegate, param->AcquireRiley());
diff --git a/third_party/renderman-25/plugin/hdPrman/lightFilter.h b/third_party/renderman-25/plugin/hdPrman/lightFilter.h
index 1a5a88bd70..d331ac4960 100644
--- a/third_party/renderman-25/plugin/hdPrman/lightFilter.h
+++ b/third_party/renderman-25/plugin/hdPrman/lightFilter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_22_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_FILTER_H
 #define EXT_RMANPKG_22_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_FILTER_H
diff --git a/third_party/renderman-25/plugin/hdPrman/lightLinkingSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/lightLinkingSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..2e60c2445a
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/lightLinkingSceneIndexPlugin.cpp
@@ -0,0 +1,93 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/imaging/hd/version.h"
+
+// There was no hdsi/version.h before this HD_API_VERSION.
+#if HD_API_VERSION >= 58 
+
+#include "pxr/imaging/hdsi/version.h"
+
+#if HDSI_API_VERSION >= 13
+#define HDPRMAN_USE_LIGHT_LINKING_SCENE_INDEX
+#endif
+
+#endif // #if HD_API_VERSION >= 58
+
+#ifdef HDPRMAN_USE_LIGHT_LINKING_SCENE_INDEX
+
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hdsi/lightLinkingSceneIndex.h"
+
+#include "pxr/base/tf/envSetting.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_LightLinkingSceneIndexPlugin"))
+);
+
+TF_DEFINE_ENV_SETTING(HDPRMAN_ENABLE_LIGHT_LINKING_SCENE_INDEX, true, 
+    "Enable registration for the light linking scene index.");
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registration
+////////////////////////////////////////////////////////////////////////////////
+
+static const char * const _rendererDisplayName = "Prman";
+class HdPrman_LightLinkingSceneIndexPlugin;
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<HdPrman_LightLinkingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    if (TfGetEnvSetting(HDPRMAN_ENABLE_LIGHT_LINKING_SCENE_INDEX)) {
+
+        // XXX Picking an arbitrary phase for now. If a procedural were to
+        //     generate light prims, we'd want this to be after it.
+        //     HdGpSceneIndexPlugin::GetInsertionPhase() currently returns 2.
+        //
+        const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 4;
+
+        HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+            _rendererDisplayName,
+            _tokens->sceneIndexPluginName,
+            // XXX Update inputArgs to provide the list of geometry types
+            //     supported by hdPrman.
+            nullptr, 
+            insertionPhase,
+            HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index Implementation
+////////////////////////////////////////////////////////////////////////////////
+
+class HdPrman_LightLinkingSceneIndexPlugin :
+    public HdSceneIndexPlugin
+{
+public:
+    HdPrman_LightLinkingSceneIndexPlugin() = default;
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override
+    {
+        return HdsiLightLinkingSceneIndex::New(inputScene, inputArgs);
+    }
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // HDPRMAN_USE_LIGHT_LINKING_SCENE_INDEX
\ No newline at end of file
diff --git a/third_party/renderman-25/plugin/hdPrman/material.cpp b/third_party/renderman-25/plugin/hdPrman/material.cpp
index 7cc5441f94..92e7b86ba2 100644
--- a/third_party/renderman-25/plugin/hdPrman/material.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/material.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/material.h"
 #include "hdPrman/debugCodes.h"
@@ -443,6 +426,9 @@ _ConvertNodes(
             if (propType == SdrPropertyTypes->Color) {
                 sn.params.SetColor(name, RtColorRGB(v[0], v[1], v[2]));
                 ok = true;
+            } else if (propType == SdrPropertyTypes->Point) {
+                sn.params.SetPoint(name, RtPoint3(v[0], v[1], v[2]));
+                ok = true;
             }
         } else if (param.second.IsHolding<VtArray<GfVec3d>>()) {
             if (propType == SdrPropertyTypes->Color) {
@@ -454,6 +440,15 @@ _ConvertNodes(
                                       reinterpret_cast<const RtColorRGB*>(v.cdata()),
                                       v.size());
                 ok = true;
+            } else if (propType == SdrPropertyTypes->Point) {
+                const VtArray<GfVec3d>& vd =
+                    param.second.UncheckedGet<VtArray<GfVec3d>>();
+                VtArray<GfVec3f> v = _ConvertToVec3fArray(vd);
+                sn.params.SetPointArray(
+                    name,
+                    reinterpret_cast<const RtPoint3*>(v.cdata()),
+                    v.size());
+                ok = true;
             }
         } else if (param.second.IsHolding<float>()) {
             float v = param.second.UncheckedGet<float>();
diff --git a/third_party/renderman-25/plugin/hdPrman/material.h b/third_party/renderman-25/plugin/hdPrman/material.h
index 454201eb65..df58857fd1 100644
--- a/third_party/renderman-25/plugin/hdPrman/material.h
+++ b/third_party/renderman-25/plugin/hdPrman/material.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_H
diff --git a/third_party/renderman-25/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.cpp
index 78092b4b94..60d003e11d 100644
--- a/third_party/renderman-25/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/materialPrimvarTransferSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.h
index 5712f5bae6..19de2f05f5 100644
--- a/third_party/renderman-25/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/matfiltConvertPreviewMaterial.cpp b/third_party/renderman-25/plugin/hdPrman/matfiltConvertPreviewMaterial.cpp
index 47887f93a0..9be573c89f 100644
--- a/third_party/renderman-25/plugin/hdPrman/matfiltConvertPreviewMaterial.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/matfiltConvertPreviewMaterial.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/matfiltConvertPreviewMaterial.h"
 #include "hdPrman/debugCodes.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/matfiltConvertPreviewMaterial.h b/third_party/renderman-25/plugin/hdPrman/matfiltConvertPreviewMaterial.h
index c8fefa44ee..6c1d5b940d 100644
--- a/third_party/renderman-25/plugin/hdPrman/matfiltConvertPreviewMaterial.h
+++ b/third_party/renderman-25/plugin/hdPrman/matfiltConvertPreviewMaterial.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_CONVERT_PREVIEW_MATERIAL_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_CONVERT_PREVIEW_MATERIAL_H
diff --git a/third_party/renderman-25/plugin/hdPrman/matfiltMaterialX.cpp b/third_party/renderman-25/plugin/hdPrman/matfiltMaterialX.cpp
index 7f0b075401..7438a781ba 100644
--- a/third_party/renderman-25/plugin/hdPrman/matfiltMaterialX.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/matfiltMaterialX.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/matfiltMaterialX.h"
 #include "hdPrman/debugCodes.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/matfiltMaterialX.h b/third_party/renderman-25/plugin/hdPrman/matfiltMaterialX.h
index 3e8ac611c2..617d827d9a 100644
--- a/third_party/renderman-25/plugin/hdPrman/matfiltMaterialX.h
+++ b/third_party/renderman-25/plugin/hdPrman/matfiltMaterialX.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_MATERIALX_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_MATERIALX_H
diff --git a/third_party/renderman-25/plugin/hdPrman/matfiltResolveVstructs.cpp b/third_party/renderman-25/plugin/hdPrman/matfiltResolveVstructs.cpp
index f4a3d9989f..64f142a268 100644
--- a/third_party/renderman-25/plugin/hdPrman/matfiltResolveVstructs.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/matfiltResolveVstructs.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/matfiltResolveVstructs.h"
 #include "hdPrman/debugCodes.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/matfiltResolveVstructs.h b/third_party/renderman-25/plugin/hdPrman/matfiltResolveVstructs.h
index 37b449576b..a334da092d 100644
--- a/third_party/renderman-25/plugin/hdPrman/matfiltResolveVstructs.h
+++ b/third_party/renderman-25/plugin/hdPrman/matfiltResolveVstructs.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_RESOLVE_VSTRUCTS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_RESOLVE_VSTRUCTS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/matfiltSceneIndexPlugins.cpp b/third_party/renderman-25/plugin/hdPrman/matfiltSceneIndexPlugins.cpp
index 9453717aac..8694f62e64 100644
--- a/third_party/renderman-25/plugin/hdPrman/matfiltSceneIndexPlugins.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/matfiltSceneIndexPlugins.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/matfiltSceneIndexPlugins.h"
 #include "hdPrman/material.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/matfiltSceneIndexPlugins.h b/third_party/renderman-25/plugin/hdPrman/matfiltSceneIndexPlugins.h
index 1da8facaff..2a33cf782d 100644
--- a/third_party/renderman-25/plugin/hdPrman/matfiltSceneIndexPlugins.h
+++ b/third_party/renderman-25/plugin/hdPrman/matfiltSceneIndexPlugins.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MAT_FILT_SCENE_INDEX_PLUGINS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MAT_FILT_SCENE_INDEX_PLUGINS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/mesh.cpp b/third_party/renderman-25/plugin/hdPrman/mesh.cpp
index 009cde302c..74748b20be 100644
--- a/third_party/renderman-25/plugin/hdPrman/mesh.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/mesh.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include <numeric> // for std::iota
 #include "hdPrman/mesh.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/mesh.h b/third_party/renderman-25/plugin/hdPrman/mesh.h
index 2114dcc38e..a2bba554a9 100644
--- a/third_party/renderman-25/plugin/hdPrman/mesh.h
+++ b/third_party/renderman-25/plugin/hdPrman/mesh.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESH_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESH_H
diff --git a/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndex.cpp b/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndex.cpp
index b25bd7cf5a..e5f026f022 100644
--- a/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndex.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/meshLightResolvingSceneIndex.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndex.h b/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndex.h
index e5f05bcbce..33b13c5cd2 100644
--- a/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndex.h
+++ b/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_H
 
diff --git a/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.cpp
index b2fa4cc4fb..3eb64b8c73 100644
--- a/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/meshLightResolvingSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.h
index af31c7d9ff..41e9da15dc 100644
--- a/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/motionBlurSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/motionBlurSceneIndexPlugin.cpp
index e4bf123fb7..9c7b7cb924 100644
--- a/third_party/renderman-25/plugin/hdPrman/motionBlurSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/motionBlurSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/motionBlurSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/motionBlurSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/motionBlurSceneIndexPlugin.h
index 7fd5f32c4b..018fdd738e 100644
--- a/third_party/renderman-25/plugin/hdPrman/motionBlurSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/motionBlurSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MOTION_BLUR_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MOTION_BLUR_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.cpp
index 9fb9ec4f4c..c5e5be8e02 100644
--- a/third_party/renderman-25/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/pinnedCurveExpandingSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.h
index ea92954755..029db6a238 100644
--- a/third_party/renderman-25/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PINNED_CURVE_EXPANDING_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PINNED_CURVE_EXPANDING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/plugInfo.json b/third_party/renderman-25/plugin/hdPrman/plugInfo.json
index 1dee1f497a..0fceca244a 100644
--- a/third_party/renderman-25/plugin/hdPrman/plugInfo.json
+++ b/third_party/renderman-25/plugin/hdPrman/plugInfo.json
@@ -63,6 +63,12 @@
                         "priority": 0,
                         "displayName": "Prman ExtComputation Primvar Pruning Scene Index"
                     },
+                    "HdPrman_RenderPassSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Render Pass Scene Index"
+                    },
                     "HdPrman_RenderSettingsFilteringSceneIndexPlugin" : {
                         "bases": ["HdSceneIndexPlugin"],
                         "loadWithRenderer": "Prman",
@@ -98,6 +104,12 @@
                         "loadWithRenderer" : "Prman",
                         "priority": 0,
                         "displayName": "Converts Hydra prims to Riley prims."
+                    },
+                    "HdPrman_LightLinkingSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer" : "Prman",
+                        "priority": 0,
+                        "displayName": "Scene index that implements light linking."
                     }
                 }
             },
diff --git a/third_party/renderman-25/plugin/hdPrman/points.cpp b/third_party/renderman-25/plugin/hdPrman/points.cpp
index 0f52d94a48..36b33cf137 100644
--- a/third_party/renderman-25/plugin/hdPrman/points.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/points.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/points.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/points.h b/third_party/renderman-25/plugin/hdPrman/points.h
index a03266249d..c4be901e0f 100644
--- a/third_party/renderman-25/plugin/hdPrman/points.h
+++ b/third_party/renderman-25/plugin/hdPrman/points.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_POINTS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_POINTS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.cpp
index bda1ade3db..8753940cc3 100644
--- a/third_party/renderman-25/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/portalLightResolvingSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.h
index a91ab9c7a3..c1de45add0 100644
--- a/third_party/renderman-25/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PORTAL_LIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PORTAL_LIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/prmanArchDefs.h b/third_party/renderman-25/plugin/hdPrman/prmanArchDefs.h
index 2b132452a2..bf37567e16 100644
--- a/third_party/renderman-25/plugin/hdPrman/prmanArchDefs.h
+++ b/third_party/renderman-25/plugin/hdPrman/prmanArchDefs.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_ARCH_DEFS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/pxr/base/vt/typeHeaders.h b/third_party/renderman-25/plugin/hdPrman/pxr/base/vt/typeHeaders.h
index 250a5fbf75..7dc9cf99d5 100644
--- a/third_party/renderman-25/plugin/hdPrman/pxr/base/vt/typeHeaders.h
+++ b/third_party/renderman-25/plugin/hdPrman/pxr/base/vt/typeHeaders.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_TYPE_HEADERS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_TYPE_HEADERS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/pxr/base/vt/visitValue.h b/third_party/renderman-25/plugin/hdPrman/pxr/base/vt/visitValue.h
index 72a9ee60f0..3b90b61b5c 100644
--- a/third_party/renderman-25/plugin/hdPrman/pxr/base/vt/visitValue.h
+++ b/third_party/renderman-25/plugin/hdPrman/pxr/base/vt/visitValue.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_VISIT_VALUE_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_VISIT_VALUE_H
diff --git a/third_party/renderman-25/plugin/hdPrman/renderBuffer.cpp b/third_party/renderman-25/plugin/hdPrman/renderBuffer.cpp
index a3ab08bd39..6ecc762bce 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderBuffer.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/renderBuffer.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "renderBuffer.h"
 #include "pxr/base/gf/half.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/renderBuffer.h b/third_party/renderman-25/plugin/hdPrman/renderBuffer.h
index b659b896f0..1e25491ebb 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderBuffer.h
+++ b/third_party/renderman-25/plugin/hdPrman/renderBuffer.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_BUFFER_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_BUFFER_H
diff --git a/third_party/renderman-25/plugin/hdPrman/renderDelegate.cpp b/third_party/renderman-25/plugin/hdPrman/renderDelegate.cpp
index e886dae36f..3f3eb71306 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderDelegate.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/renderDelegate.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/renderDelegate.h"
 #include "hdPrman/basisCurves.h"
@@ -732,10 +715,12 @@ HdPrmanRenderDelegate::SetRenderSetting(TfToken const &key,
         _renderParam->GetCameraContext().MarkCameraInvalid(camPath);
         HdRenderIndex *renderIndex = GetRenderIndex();
         if(renderIndex) {
+            // Needed to trigger call to
+            // param->SetRileyShutterIntervalFromCameraContextCameraPath
+            // from HdPrmanCamera::Sync.
+
             renderIndex->GetChangeTracker().MarkSprimDirty(
                 camPath, HdChangeTracker::DirtyParams);
-            renderIndex->GetChangeTracker().MarkAllRprimsDirty(
-                HdChangeTracker::DirtyPoints);
         }
     }
 }
diff --git a/third_party/renderman-25/plugin/hdPrman/renderDelegate.h b/third_party/renderman-25/plugin/hdPrman/renderDelegate.h
index 14dda5cafc..08b183b6f8 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderDelegate.h
+++ b/third_party/renderman-25/plugin/hdPrman/renderDelegate.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_DELEGATE_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_DELEGATE_H
diff --git a/third_party/renderman-25/plugin/hdPrman/renderParam.cpp b/third_party/renderman-25/plugin/hdPrman/renderParam.cpp
index 809be12718..8c47ff5773 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderParam.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/renderParam.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/renderParam.h"
 
@@ -39,6 +22,15 @@
 #include "hdPrman/tokens.h"
 #include "hdPrman/utils.h"
 
+#include "pxr/imaging/hd/extComputationUtils.h"
+#include "pxr/imaging/hd/renderBuffer.h"
+#include "pxr/imaging/hd/renderThread.h"
+#include "pxr/imaging/hd/rprim.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+
+#include "pxr/usd/sdf/path.h"
+
 #include "pxr/base/arch/library.h"
 #include "pxr/base/plug/plugin.h"
 #include "pxr/base/plug/registry.h"
@@ -46,18 +38,14 @@
 #include "pxr/base/tf/envSetting.h"
 #include "pxr/base/tf/pathUtils.h"  // Extract extension from tf token
 #include "pxr/base/tf/scopeDescription.h"
-#include "pxr/imaging/hd/extComputationUtils.h"
-#include "pxr/imaging/hd/renderBuffer.h"
-#include "pxr/imaging/hd/renderThread.h"
-#include "pxr/imaging/hd/sceneDelegate.h"
-#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
-#include "pxr/usd/sdf/path.h"
+#include "pxr/base/tf/stringUtils.h"
 
-#include "Riley.h"
-#include "RiTypesHelper.h"
-#include "RixRiCtl.h"
-#include "stats/Session.h"
+#include <Riley.h>
+#include <RiTypesHelper.h>
+#include <RixRiCtl.h>
+#include <stats/Session.h>
 
+#include <string>
 #include <thread>
 
 PXR_NAMESPACE_OPEN_SCOPE
@@ -71,10 +59,18 @@ TF_DEFINE_PRIVATE_TOKENS(
     (sourceType)
     (lpe)
 
+    // Product/driver tokens
+    (deepRaster)
+    (deepexr)
+    (openexr)
+    ((riProductType, "ri:productType"))
+
     // See PxrDisplayChannelAPI
     ((riDisplayChannelNamespace,    "ri:displayChannel:"))
     // See PxrDisplayDriverAPI
     ((riDisplayDriverNamespace,     "ri:displayDriver:"))
+    
+    ((renderTagPrefix, "rendertag_"))
 );
 
 TF_DEFINE_PRIVATE_TOKENS(
@@ -644,7 +640,10 @@ _Convert(HdSceneDelegate *sceneDelegate, SdfPath const& id,
             continue;
         }
 
-        if (val.IsArrayValued() && 
+        // For non-constant primvars, check array size to make sure it
+        // matches the expected topology size.
+        if (hdInterp != HdInterpolationConstant &&
+            val.IsArrayValued() && 
             val.GetArraySize() != static_cast<size_t>(expectedSize)) {
             TF_WARN("<%s> %s '%s' size (%zu) did not match "
                     "expected (%d)", id.GetText(), label.c_str(),
@@ -732,8 +731,7 @@ HdPrman_TransferMaterialPrimvarOpinions(HdSceneDelegate *sceneDelegate,
 
 RtParamList
 HdPrman_RenderParam::ConvertAttributes(HdSceneDelegate *sceneDelegate,
-                                   SdfPath const& id, bool isGeometry,
-                                   bool *visible)
+                                   SdfPath const& id, bool isGeometry)
 {
     RtParamList attrs;
 
@@ -750,21 +748,19 @@ HdPrman_RenderParam::ConvertAttributes(HdSceneDelegate *sceneDelegate,
     attrs.SetString(RixStr.k_identifier_name, RtUString(id.GetText()));
 
     // Hydra visibility -> Riley Rix::k_visibility
-    bool vis = sceneDelegate->GetVisible(id);
-    if (visible) {
-        *visible = vis;
-    }
-    if (!vis) {
+    if (!sceneDelegate->GetVisible(id)) {
         attrs.SetInteger(RixStr.k_visibility_camera, 0);
         attrs.SetInteger(RixStr.k_visibility_indirect, 0);
         attrs.SetInteger(RixStr.k_visibility_transmission, 0);
     }
 
-    // Hydra categories -> Riley k_grouping_membership
-    VtArray<TfToken> categories = sceneDelegate->GetCategories(id);
-    ConvertCategoriesToAttributes(id, categories, attrs);
+    if (isGeometry) {
+        // Hydra categories -> Riley k_grouping_membership
+        // Note that lights and light filters also have a grouping membership,
+        // but that comes from the light (linking) params.
+        VtArray<TfToken> categories = sceneDelegate->GetCategories(id);
+        ConvertCategoriesToAttributes(id, categories, attrs);
 
-    if (isGeometry) { 
         // Hydra cullStyle & doubleSided -> Riley k_Ri_Sides
         // Ri:Sides is most analogous to GL culling style. When Ri:Sides = 1,
         // prman will skip intersections on the back, with "back" determined by
@@ -829,10 +825,16 @@ HdPrman_RenderParam::ConvertCategoriesToAttributes(
     RtParamList& attrs)
 {
     if (categories.empty()) {
+        if (!attrs.HasParam( RixStr.k_grouping_membership)) {
+            // Clear any categories that may have been previously tacked on by
+            // explicitly adding an empty string valued attribute.
+            attrs.SetString( RixStr.k_grouping_membership, RtUString("") );
+        }
         attrs.SetString( RixStr.k_lightfilter_subset, RtUString("") );
         attrs.SetString( RixStr.k_lighting_subset, RtUString("default") );
         TF_DEBUG(HDPRMAN_LIGHT_LINKING)
-            .Msg("HdPrman: <%s> no categories; lighting:subset = \"default\"\n",
+            .Msg("HdPrman: <%s> no categories; grouping:membership = \"\"; "
+                 "lighting:subset = \"default\"; lightFilter:subset = \"\"\n",
                  id.GetText());
         return;
     }
@@ -1470,13 +1472,10 @@ _ToRtParamList(VtDictionary const& dict, TfToken prefix=TfToken())
     return params;
 }
 
-// TODO this is not a robust solution
 static
 RtUString
-_GetOutputDisplayDriverType(const TfToken &name)
+_GetOutputDisplayDriverType(const std::string &extension)
 {
-    // get output display driver type
-    // TODO this is not a robust solution
     static const std::map<std::string,TfToken> extToDisplayDriver{
         { std::string("exr"),  TfToken("openexr") },
         { std::string("tif"),  TfToken("tiff") },
@@ -1484,9 +1483,57 @@ _GetOutputDisplayDriverType(const TfToken &name)
         { std::string("png"),  TfToken("png") }
     };
     
+    const auto it = extToDisplayDriver.find(extension);
+    if (it != extToDisplayDriver.end()) {
+        return RtUString(it->second.GetText());
+    }
+
+    TF_WARN(
+        "Could not determine display driver for product filename extension %s."
+        "Falling back to openexr.", extension.c_str());
+
+    return RtUString(_tokens->openexr.GetText());
+}
+
+// Overload used when creating the render view from a renderSpec dict.
+static
+RtUString
+_GetOutputDisplayDriverType(const TfToken &name)
+{
     const std::string outputExt = TfGetExtension(name.GetString());
-    const TfToken displayFormat = extToDisplayDriver.at(outputExt);
-    return RtUString(displayFormat.GetText());
+    return _GetOutputDisplayDriverType(outputExt);
+}
+
+// Overload used when creating the render view from a render settings' product.
+static
+RtUString
+_GetOutputDisplayDriverType(
+    const VtDictionary &productSettings,
+    const TfToken &productName,
+    const TfToken &productType)
+{
+    // Use "ri:productType" from the product's namespaced settings if
+    // available.
+    const TfToken driverName =
+        VtDictionaryGet<TfToken>(
+            productSettings,
+            _tokens->riProductType.GetText(),
+            VtDefault = TfToken());
+
+    if (!driverName.IsEmpty()) {
+        return RtUString(driverName.GetText());
+    }
+
+    // Otherwise, use the extension from the product name and product type
+    // to determine the driver.
+    //
+    const std::string outputExt = TfGetExtension(productName.GetString());
+
+    if (productType == _tokens->deepRaster && outputExt == std::string("exr")) {
+        return RtUString(_tokens->deepexr.GetText());
+    }
+
+    return _GetOutputDisplayDriverType(outputExt);
 }
 
 // Temporary workaround for RMAN-21883:
@@ -1656,7 +1703,8 @@ _ComputeRenderViewDesc(
     displayDesc.name = RtUString(product.name.GetText());
     displayDesc.params = _ToRtParamList(product.namespacedSettings,
         _tokens->riDisplayDriverNamespace);
-    displayDesc.driver = _GetOutputDisplayDriverType(product.name);
+    displayDesc.driver = _GetOutputDisplayDriverType(
+        product.namespacedSettings, product.name, product.type);
 
     // XXX Temporary; see RMAN-21883
     _ApplyOpenexrDriverWorkaround(&displayDesc);
@@ -1920,6 +1968,12 @@ HdPrman_RenderParam::_ComputeIntegratorNode(
                 integratorNodeType.GetString(),
                 rileyIntegratorNode.params);
         }
+        
+        // TODO: Adjust when PxrPathTracer adds support for excludeSubset
+        if (integratorNodeType == HdPrmanIntegratorTokens->PbsPathTracer) {
+            _SetExcludeSubset(_lastExcludedRenderTags,
+                rileyIntegratorNode.params);
+        }
         return rileyIntegratorNode;
     }
 
@@ -1949,6 +2003,12 @@ HdPrman_RenderParam::_ComputeIntegratorNode(
             integratorName,
             _integratorParams);
     }
+    
+    // TODO: Adjust when PxrPathTracer adds support for excludeSubset
+    if (integratorName == HdPrmanIntegratorTokens->PbsPathTracer.GetString()) {
+        _SetExcludeSubset(_lastExcludedRenderTags,
+            _integratorParams);
+    }
 
     return riley::ShadingNode{
         riley::ShadingNode::Type::k_Integrator,
@@ -1977,6 +2037,84 @@ HdPrman_RenderParam::_CreateIntegrator(HdRenderDelegate * const renderDelegate)
     _activeIntegratorId = _integratorId;
 }
 
+void
+HdPrman_RenderParam::SetActiveRenderTags(
+    const TfTokenVector& activeRenderTags,
+    HdRenderIndex* renderIndex)
+{
+    // sort the active tags for set_difference
+    TfTokenVector sortedTags(activeRenderTags);
+    std::sort(sortedTags.begin(), sortedTags.end());
+    
+    // set for uniqueness, ordered for set_difference
+    std::set<TfToken> rprimTags; 
+    for (const SdfPath& id : renderIndex->GetRprimIds()) {
+        const HdRprim* rprim = renderIndex->GetRprim(id);
+        rprimTags.insert(rprim->GetRenderTag());
+    }
+    
+    // fast set for comparison with cached
+    TfToken::Set excludedTags;
+    
+    // All rprim tags not in activeTags should be excluded (rprim - active)
+    std::set_difference(
+        rprimTags.begin(), rprimTags.end(),
+        sortedTags.begin(), sortedTags.end(),
+        std::inserter(excludedTags, excludedTags.begin()));
+    if (excludedTags != _lastExcludedRenderTags) {
+        _lastExcludedRenderTags = excludedTags;
+        UpdateIntegrator(renderIndex);
+    }
+}
+
+void
+HdPrman_RenderParam::AddRenderTagToGroupingMembership(
+    const TfToken& renderTag,
+    RtParamList& params)
+{
+    // XXX: UStrings cannot be concatenated, and the only way to initialize a
+    // UString is with a char*. So things can get a little baroque here. The
+    // temporary variables hopefully help make it readable.
+    if (!renderTag.IsEmpty()) {
+        const std::string renderTagString = TfStringPrintf("%s%s",
+            _tokens->renderTagPrefix.GetText(), renderTag.GetText());
+            
+        RtUString membership;
+        params.GetString(RixStr.k_grouping_membership, membership);
+        
+        if (membership.Empty()) {
+            membership = RtUString(renderTagString.c_str());
+        } else {
+            const std::string membershipString = TfStringPrintf("%s %s",
+                renderTagString.c_str(), membership.CStr());
+            membership = RtUString(membershipString.c_str());
+        }
+        params.SetString(RixStr.k_grouping_membership, membership);
+    }
+}
+
+/* static */
+void
+HdPrman_RenderParam::_SetExcludeSubset(
+    const TfToken::Set& excludedTags,
+    RtParamList& params) {
+    // XXX: excludeSubset is not in RixStr.
+    // (excludesubset is, but we need a capital S.)
+    static const RtUString k_excludeSubset("excludeSubset");
+    std::string exclude;
+    for (const TfToken& tag : excludedTags) {
+        if (tag.IsEmpty()) {
+            continue;
+        }
+        if (!exclude.empty()) {
+            exclude += " ";
+        }
+        exclude += _tokens->renderTagPrefix.GetString() + tag.GetString();
+    }
+    // XXX: This should be the only place anyone sets excludeSubset
+    params.SetString(k_excludeSubset, RtUString(exclude.c_str()));
+}
+
 void
 HdPrman_RenderParam::UpdateIntegrator(const HdRenderIndex * const renderIndex)
 {
@@ -2010,30 +2148,13 @@ HdPrman_RenderParam::_RenderThreadCallback()
         RixStr.k_dice_referencecamera, 
         defaultReferenceCamera);
 
-    bool renderComplete = false;
-    while (!renderComplete) {
-        while (_renderThread->IsPauseRequested()) {
-            if (_renderThread->IsStopRequested()) {
-                break;
-            }
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        }
-        if (_renderThread->IsStopRequested()) {
-            break;
-        }
-
-        HdPrman_RenderViewContext &ctx = GetRenderViewContext();
-
-        const riley::RenderViewId renderViewIds[] = { ctx.GetRenderViewId() };
+    HdPrman_RenderViewContext &ctx = GetRenderViewContext();
+    const riley::RenderViewId renderViewIds[] = { ctx.GetRenderViewId() };
 
-        _riley->Render(
-            { static_cast<uint32_t>(TfArraySize(renderViewIds)),
-              renderViewIds },
-            renderOptions);
-
-        // If a pause was requested, we may have stopped early
-        renderComplete = !_renderThread->IsPauseDirty();
-    }
+    _riley->Render(
+        { static_cast<uint32_t>(TfArraySize(renderViewIds)),
+          renderViewIds },
+        renderOptions);
 }
 
 void 
@@ -2329,19 +2450,19 @@ HdPrman_RenderParam::StopRender(bool blocking)
     //    is a no-op and we need to call it again after we call into Riley.
     // 2. We've occassionally seen cases where Stop() returns successfully,
     //    but the riley threadpools don't shut down right away.
+
+    // Only let one thread try to stop things at once.
+    std::lock_guard<std::mutex> lock(_stopMutex);
+
     while (_renderThread->IsRendering()) {
         {
             TRACE_SCOPE("riley::Stop");
             _riley->Stop();
         }
         using namespace std::chrono_literals;
-        std::this_thread::sleep_for(100us);
-    }
-
-    // Clear out old stats values. TODO: should we be calling this here? 
-    if (_statsSession)
-    {
-        _statsSession->RemoveOldMetricData();
+        if (_renderThread->IsRendering()) {
+            std::this_thread::sleep_for(1ms);
+        }
     }
 }
 
@@ -2354,7 +2475,7 @@ HdPrman_RenderParam::IsRendering()
 bool
 HdPrman_RenderParam::IsPauseRequested()
 {
-    return _renderThread && _renderThread->IsPauseRequested();
+    return false;
 }
 
 void
@@ -2538,7 +2659,9 @@ _GetOutputParamsAndUpdateRmanNames(
                  settingName.GetText(), "driver:parameters:aov:")) {
             RtUString name(TfStringGetSuffix(settingName, ':').c_str());
             if (name == RixStr.k_name) {
-                hdAovName = settingVal.UncheckedGet<TfToken>();
+                hdAovName = settingVal.IsHolding<std::string>() ?
+                    TfToken(settingVal.Get<std::string>().c_str()) :
+                    settingVal.Get<TfToken>();
             } else {
                 HdPrman_Utils::SetParamFromVtValue(name, settingVal,
                     TfToken(), &params);
diff --git a/third_party/renderman-25/plugin/hdPrman/renderParam.h b/third_party/renderman-25/plugin/hdPrman/renderParam.h
index 330d67bc76..3a79b9685e 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderParam.h
+++ b/third_party/renderman-25/plugin/hdPrman/renderParam.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PARAM_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PARAM_H
@@ -92,7 +75,7 @@ class HdPrman_RenderParam : public HdRenderParam
     HDPRMAN_API
     RtParamList
     ConvertAttributes(HdSceneDelegate *sceneDelegate,
-        SdfPath const& id, bool isGeometry, bool *visible=nullptr);
+        SdfPath const& id, bool isGeometry);
 
     // A vector of Riley coordinate system id's.
     using RileyCoordSysIdVec = std::vector<riley::CoordinateSystemId>;
@@ -115,6 +98,12 @@ class HdPrman_RenderParam : public HdRenderParam
         SdfPath const& id,
         VtArray<TfToken> const& categories,
         RtParamList& attrs);
+    
+    /// Prepends the given \p renderTag to grouping:membership in \p params.
+    HDPRMAN_API
+    static void AddRenderTagToGroupingMembership(
+        const TfToken& renderTag,
+        RtParamList& params);
 
     /// Release any coordinate system bindings cached for the given
     /// rprim id.
@@ -215,6 +204,15 @@ class HdPrman_RenderParam : public HdRenderParam
 
     // Invalidate texture at path.
     void InvalidateTexture(const std::string &path);
+    
+    /// Call this from RenderPass to set which render tags should be enabled.
+    /// Calling will always trigger a render index traversal, and may trigger an
+    /// intergrator update, so only call it if you strongly suspect that either
+    /// the set of active render tags or the set of rprim render tags in the
+    /// scene has changed.
+    void SetActiveRenderTags(
+        const TfTokenVector& activeRenderTags,
+        HdRenderIndex* renderIndex);
 
     void UpdateIntegrator(const HdRenderIndex * renderIndex);
 
@@ -416,6 +414,11 @@ class HdPrman_RenderParam : public HdRenderParam
         RtParamList& displayParams, bool isXpu);
     
     void _UpdateShutterInterval(const RtParamList &composedParams);
+    
+    static
+    void _SetExcludeSubset(
+        const TfToken::Set& excludedTags,
+        RtParamList& params);
 
 private:
     // Top-level entrypoint to PRMan.
@@ -437,6 +440,8 @@ class HdPrman_RenderParam : public HdRenderParam
 
     // Riley instance.
     riley::Riley *_riley;
+    // Mutex around riley->Stop(), so as to be well-behaved callers.
+    std::mutex _stopMutex;
 
     std::unique_ptr<class HdRenderThread> _renderThread;
     std::unique_ptr<HdPrmanFramebuffer> _framebuffer;
@@ -470,6 +475,8 @@ class HdPrman_RenderParam : public HdRenderParam
 
     // Fallback material for volumes that don't have materials.
     riley::MaterialId _fallbackVolumeMaterialId;
+    
+    TfToken::Set _lastExcludedRenderTags;
 
     riley::IntegratorId _quickIntegratorId;
     RtParamList _quickIntegratorParams;
diff --git a/third_party/renderman-25/plugin/hdPrman/renderPass.cpp b/third_party/renderman-25/plugin/hdPrman/renderPass.cpp
index b360f40221..ec6f456ca9 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderPass.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/renderPass.cpp
@@ -1,51 +1,31 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
-//
-#include "hdPrman/renderPass.h"
+#include "hdPrman/renderPass.h" 
+
 #include "hdPrman/camera.h"
 #include "hdPrman/debugCodes.h"
 #include "hdPrman/debugUtil.h"
-#include "hdPrman/gprimbase.h"
 #include "hdPrman/framebuffer.h"
-#include "hdPrman/renderParam.h"
 #include "hdPrman/renderBuffer.h"
 #include "hdPrman/renderDelegate.h"
+#include "hdPrman/renderParam.h"
 #include "hdPrman/renderSettings.h"
 #include "hdPrman/rixStrings.h"
 #include "hdPrman/utils.h"
 
 #include "pxr/imaging/hd/perfLog.h"
 #include "pxr/imaging/hd/renderPassState.h"
+#include "pxr/imaging/hd/rprim.h"
 #include "pxr/imaging/hd/utils.h"
 
-#include "pxr/base/gf/vec2f.h"
-#include "pxr/base/gf/rotation.h"
-#include "pxr/base/tf/getenv.h"
 #include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/token.h"
 
-#include "Riley.h"
-#include "RixShadingUtils.h"
-#include "RixPredefinedStrings.hpp"
+#include <Riley.h>
 
 PXR_NAMESPACE_OPEN_SCOPE
 
@@ -245,40 +225,6 @@ _HasLegacyRenderSpec(
     return false;
 }
 
-// Update visibility settings of riley instances for the active render tags.
-//
-// The render pass's _Execute method takes a list of renderTags,
-// and only rprims with those tags should be visible,
-// so we need to figure out the corresponding riley instance ids
-// and update the visibility settings in riley.
-// It might seem like the rprims would receive a Sync call
-// to deal with this, but they only do when they first become visible.
-// After that tag based visibility is a per-pass problem.
-
-void
-_UpdateRprimVisibilityForPass(
-    TfTokenVector const & renderTags,
-    HdRenderIndex *index,
-    riley::Riley *riley )
-{
-    for (auto id : index->GetRprimIds()) {
-        HdRprim const *rprim = index->GetRprim(id);
-        const TfToken tag = rprim->GetRenderTag();
-
-        // If the rprim's render tag is not in the pass's list of tags it's
-        // definitely not visible, but if it is, look at the rprim's visibility.
-        const bool vis =
-            std::count(renderTags.begin(), renderTags.end(), tag) &&
-            rprim->IsVisible();
-
-        HdPrman_GprimBase const * hdprman_rprim =
-                dynamic_cast<HdPrman_GprimBase const *>(rprim);
-        if (hdprman_rprim) {
-            hdprman_rprim->UpdateInstanceVisibility( vis, riley);
-        }
-    }
-}
-
 } // end anonymous namespace
 
 
@@ -374,8 +320,8 @@ HdPrman_RenderPass::_Execute(
                 currentLegacySettingsVersion);
         }
     }
-
-    _UpdateRprimVisibilityFromTaskRenderTags(renderTags);
+    
+    _UpdateActiveRenderTagsIfChanged(renderTags);
 
     // ------------------------------------------------------------------------
     // Determine if we can drive the render pass using the render settings
@@ -696,30 +642,18 @@ HdPrman_RenderPass::_RenderInMainThread()
 // XXX Data flow for purpose is currently using the task's render tags.
 //     Update to factor render settings prim's opinion.
 void
-HdPrman_RenderPass::_UpdateRprimVisibilityFromTaskRenderTags(
-    TfTokenVector const &renderTags)
+HdPrman_RenderPass::_UpdateActiveRenderTagsIfChanged(
+    const TfTokenVector& taskRenderTags)
 {
     const int taskRenderTagsVersion =
         GetRenderIndex()->GetChangeTracker().GetTaskRenderTagsVersion();
     const int rprimRenderTagVersion =
             GetRenderIndex()->GetChangeTracker().GetRenderTagVersion();
- 
-    {
-        // Update visibility settings of riley instances for active render tags.
-        if (!_lastTaskRenderTagsVersion && !_lastRprimRenderTagVersion) {
-            // No need to update the first time, only when the tags change.
-            _lastTaskRenderTagsVersion = taskRenderTagsVersion;
-            _lastRprimRenderTagVersion = rprimRenderTagVersion;
-
-        } else if((taskRenderTagsVersion != _lastTaskRenderTagsVersion) ||
-                (rprimRenderTagVersion != _lastRprimRenderTagVersion)) {
-            // AcquireRiley will stop rendering and increase sceneVersion
-            // so that the render will be re-started below.
-            riley::Riley * const riley = _renderParam->AcquireRiley();
-            _UpdateRprimVisibilityForPass( renderTags, GetRenderIndex(), riley);
-            _lastTaskRenderTagsVersion = taskRenderTagsVersion;
-            _lastRprimRenderTagVersion = rprimRenderTagVersion;
-        }
+    if ((taskRenderTagsVersion != _lastTaskRenderTagsVersion) ||
+        (rprimRenderTagVersion != _lastRprimRenderTagVersion)) {
+        _renderParam->SetActiveRenderTags(taskRenderTags, GetRenderIndex());
+        _lastTaskRenderTagsVersion = taskRenderTagsVersion;
+        _lastRprimRenderTagVersion = rprimRenderTagVersion;
     }
 }
 
diff --git a/third_party/renderman-25/plugin/hdPrman/renderPass.h b/third_party/renderman-25/plugin/hdPrman/renderPass.h
index c4de0ea53f..71e2aaecce 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderPass.h
+++ b/third_party/renderman-25/plugin/hdPrman/renderPass.h
@@ -1,33 +1,17 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_H
 
-#include "pxr/pxr.h"
 #include "pxr/imaging/hd/renderPass.h"
 
-#include "Riley.h"
+#include "pxr/base/tf/token.h"
+
+#include "pxr/pxr.h"
 
 #include <chrono>
 
@@ -65,8 +49,8 @@ class HdPrman_RenderPass final : public HdRenderPass
         const HdRenderPassStateSharedPtr &renderPassState,
         HdPrman_CameraContext *cameraContext);
 
-    void _UpdateRprimVisibilityFromTaskRenderTags(
-        TfTokenVector const &renderTags);
+    void _UpdateActiveRenderTagsIfChanged(
+        const TfTokenVector& taskRenderTags);
 
     HdPrman_RenderSettings* _GetDrivingRenderSettingsPrim() const;
 
diff --git a/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndex.cpp b/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndex.cpp
new file mode 100644
index 0000000000..b62ce89a10
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndex.cpp
@@ -0,0 +1,548 @@
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/renderPassSceneIndex.h"
+#include "hdPrman/tokens.h"
+
+#include "pxr/imaging/hd/version.h"
+
+#include "pxr/base/tf/smallVector.h"
+#include "pxr/imaging/hd/collectionSchema.h"
+#include "pxr/imaging/hd/collectionsSchema.h"
+#include "pxr/imaging/hd/containerDataSourceEditor.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+#include "pxr/imaging/hd/dependenciesSchema.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/primvarsSchema.h"
+#include "pxr/imaging/hd/renderPassSchema.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneGlobalsSchema.h"
+#include "pxr/imaging/hd/sceneIndexPrimView.h"
+#include "pxr/imaging/hd/schema.h" 
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/visibilitySchema.h"
+#include "pxr/imaging/hdsi/utils.h"
+#include "pxr/base/trace/trace.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (renderVisibility)
+    (cameraVisibility)
+    (matte)
+    (prune)
+    ((riAttributesRiMatte, "ri:attributes:Ri:Matte"))
+    ((riAttributesVisibilityCamera, "ri:attributes:visibility:camera"))
+);
+
+/* static */
+HdPrman_RenderPassSceneIndexRefPtr
+HdPrman_RenderPassSceneIndex::New(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    return TfCreateRefPtr(  
+        new HdPrman_RenderPassSceneIndex(inputSceneIndex));
+}
+
+HdPrman_RenderPassSceneIndex::HdPrman_RenderPassSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputSceneIndex)
+: HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+{
+}
+
+static bool
+_IsGeometryType(const TfToken &primType)
+{
+    // Additional gprim types supported by HdPrman, beyond those in
+    // HdPrimTypeIsGprim().
+    static const TfTokenVector extraGeomTypes = {
+        HdPrimTypeTokens->cone,
+        HdPrimTypeTokens->cylinder,
+        HdPrimTypeTokens->sphere,
+        HdPrmanTokens->meshLightSourceMesh,
+        HdPrmanTokens->meshLightSourceVolume
+    };
+    return HdPrimTypeIsGprim(primType) ||
+        std::find(extraGeomTypes.begin(), extraGeomTypes.end(), primType)
+            != extraGeomTypes.end();
+}
+
+// Returns true if the renderVisibility rules apply to this prim type.
+static bool
+_ShouldApplyPassVisibility(const TfToken &primType)
+{
+    return _IsGeometryType(primType) || HdPrimTypeIsLight(primType) ||
+        primType == HdPrimTypeTokens->lightFilter;
+}
+
+static bool
+_IsVisible(const HdContainerDataSourceHandle& primSource)
+{
+    if (const auto visSchema = HdVisibilitySchema::GetFromParent(primSource)) {
+        if (const HdBoolDataSourceHandle visDs = visSchema.GetVisibility()) {
+            return visDs->GetTypedValue(0.0f);
+        }
+    }
+    return true;
+}
+
+static bool
+_IsVisibleToCamera(const HdContainerDataSourceHandle& primSource)
+{
+    // XXX Primvar queries like this might be a good candidate for
+    // helper API in hdsi/utils.h.
+    if (const HdPrimvarsSchema primvarsSchema =
+        HdPrimvarsSchema::GetFromParent(primSource)) {
+        if (HdPrimvarSchema primvarSchema =
+            primvarsSchema.GetPrimvar(_tokens->riAttributesVisibilityCamera)) {
+            if (const auto sampledDataSource =
+                primvarSchema.GetPrimvarValue()) {
+                const VtValue value = sampledDataSource->GetValue(0);
+                if (!value.IsEmpty()) {
+                    if (value.IsHolding<VtArray<bool>>()) {
+                        return value.UncheckedGet<bool>();
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+bool
+HdPrman_RenderPassSceneIndex::_RenderPassState::DoesOverrideMatte(
+    SdfPath const& primPath,
+    HdSceneIndexPrim const& prim) const
+{
+    return matteEval
+        && _IsGeometryType(prim.primType)
+        && matteEval->Match(primPath);
+}
+
+bool
+HdPrman_RenderPassSceneIndex::_RenderPassState::DoesOverrideVis(
+    SdfPath const& primPath,
+    HdSceneIndexPrim const& prim) const
+{
+    return renderVisEval
+        && _ShouldApplyPassVisibility(prim.primType)
+        && !renderVisEval->Match(primPath)
+        && _IsVisible(prim.dataSource);
+}
+
+bool
+HdPrman_RenderPassSceneIndex::_RenderPassState::DoesOverrideCameraVis(
+    SdfPath const& primPath,
+    HdSceneIndexPrim const& prim) const
+{
+    return cameraVisEval
+        && _ShouldApplyPassVisibility(prim.primType)
+        && !cameraVisEval->Match(primPath)
+        && _IsVisibleToCamera(prim.dataSource);
+}
+
+bool
+HdPrman_RenderPassSceneIndex::_RenderPassState::DoesPrune(
+    SdfPath const& primPath) const
+{
+    return pruneEval && pruneEval->Match(primPath);
+}
+
+HdSceneIndexPrim 
+HdPrman_RenderPassSceneIndex::GetPrim(
+    const SdfPath &primPath) const
+{
+    // Pruning
+    //
+    // Note that we also apply pruning in GetChildPrimPaths(), but
+    // this ensures that even if a downstream scene index asks
+    // for a pruned path, it will remain pruned.
+    if (_activeRenderPass.DoesPrune(primPath)) {
+        return HdSceneIndexPrim();
+    }
+
+    HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+
+    // Temp storage for overriding primvars.
+    TfSmallVector<TfToken, 2> primvarNames;
+    TfSmallVector<HdDataSourceBaseHandle, 2> primvarVals;
+
+    // Render Visibility -> HdVisibilitySchema
+    //
+    // Renderable prims that are visible in the upstream scene index,
+    // but excluded from the pass renderVisibility collection, get their
+    // visibility overriden to 0.
+    //
+    if (_activeRenderPass.DoesOverrideVis(primPath, prim)) {
+        static const HdContainerDataSourceHandle invisDs =
+            HdRetainedContainerDataSource::New(
+                HdVisibilitySchema::GetSchemaToken(),
+                HdVisibilitySchema::Builder()
+                    .SetVisibility(
+                        HdRetainedTypedSampledDataSource<bool>::New(0))
+                    .Build());
+        prim.dataSource =
+            HdOverlayContainerDataSource::New(invisDs, prim.dataSource);
+    }
+
+    // Camera Visibility -> ri:visibility:camera
+    //
+    // Renderable prims that are camera-visible in the upstream scene index,
+    // but excluded from the pass cameraVisibility collection, get their
+    // riAttributesVisibilityCamera primvar overriden to 0.
+    //
+    if (_activeRenderPass.DoesOverrideCameraVis(primPath, prim)) {
+        static const HdContainerDataSourceHandle cameraInvisDs =
+            HdPrimvarSchema::Builder()
+                .SetPrimvarValue(
+                    HdRetainedTypedSampledDataSource<int>::New(0))
+                .SetInterpolation(
+                    HdPrimvarSchema::BuildInterpolationDataSource(
+                        HdPrimvarSchemaTokens->constant))
+                .Build();
+        primvarNames.push_back(_tokens->riAttributesVisibilityCamera);
+        primvarVals.push_back(cameraInvisDs);
+    }
+
+    // Matte -> ri:Matte
+    //
+    // If the matte pattern matches this prim, set ri:Matte=1.
+    // Matte only applies to geometry types.
+    // We do not bother to check if the upstream prim already
+    // has matte set since that is essentially never the case.
+    //
+    if (_activeRenderPass.DoesOverrideMatte(primPath, prim)) {
+        static const HdContainerDataSourceHandle matteDs =
+            HdPrimvarSchema::Builder()
+                .SetPrimvarValue(
+                    HdRetainedTypedSampledDataSource<int>::New(1))
+                .SetInterpolation(HdPrimvarSchema::
+                    BuildInterpolationDataSource(
+                        HdPrimvarSchemaTokens->constant))
+                .Build();
+        primvarNames.push_back(_tokens->riAttributesRiMatte);
+        primvarVals.push_back(matteDs);
+    }
+
+    // Apply any accumulated primvar overrides.
+    if (!primvarNames.empty()) {
+        prim.dataSource =
+            HdOverlayContainerDataSource::New(
+                HdRetainedContainerDataSource::New(
+                    HdPrimvarsSchema::GetSchemaToken(),
+                    HdPrimvarsSchema::BuildRetained(
+                        primvarNames.size(),
+                        primvarNames.data(),
+                        primvarVals.data())),
+                prim.dataSource);
+    }
+
+    return prim;
+}
+
+SdfPathVector 
+HdPrman_RenderPassSceneIndex::GetChildPrimPaths(
+    const SdfPath &primPath) const
+{
+    if (_activeRenderPass.pruneEval) {
+        SdfPathVector childPathVec =
+            _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+        HdsiUtilsRemovePrunedChildren(primPath, *_activeRenderPass.pruneEval,
+                                      &childPathVec);
+        return childPathVec;
+    } else {
+        return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+    }
+}
+
+/*
+
+General notes on change processing and invalidation:
+
+- Rather than lazily evaluate the active render pass state,
+  and be prepared to do so from multiple caller threads, we
+  instead greedily set up the active render pass state.
+  Though greedy, this is a small amount of computation,
+  and only triggered on changes to two specific scene locations:
+  the root scope where HdSceneGlobalsSchema lives, and the
+  scope where the designated active render pass lives.
+
+- The list of entries for prims added, dirtied, or removed
+  must be filtered against the active render pass prune collection.
+
+- The list of entries for prims added, dirtied, or removed
+  can imply changes to which render pass is active, or to the
+  contents of the active render pass.  In either case, if the
+  effective render pass state changes, downstream observers
+  must be notified about the effects.
+
+*/
+
+// Helper to scan an entry vector for an entry that
+// could affect the active render pass.
+template <typename ENTRIES>
+inline static bool
+_EntryCouldAffectPass(
+    const ENTRIES &entries,
+    SdfPath const& activeRenderPassPath)
+{
+    for (const auto& entry: entries) {
+        // The prim at the root path contains the HdSceneGlobalsSchema.
+        // The prim at the render pass path controls its behavior.
+        if (entry.primPath.IsAbsoluteRootPath()
+            || entry.primPath == activeRenderPassPath) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// Helper to apply pruning to an entry list.
+// Returns true if any pruning was applied, putting surviving entries
+// into *postPruneEntries.
+template <typename ENTRIES>
+inline static bool
+_PruneEntries(
+    std::optional<HdCollectionExpressionEvaluator> &pruneEval,
+    const ENTRIES &entries, ENTRIES *postPruneEntries)
+{
+    if (!pruneEval) {
+        // No pruning active.
+        return false;
+    }
+    // Pre-pass to see if any prune applies to the list.
+    bool foundEntryToPrune = false;
+    for (const auto& entry: entries) {
+        if (pruneEval->Match(entry.primPath)) {
+            foundEntryToPrune = true;
+            break;
+        }
+    }
+    if (!foundEntryToPrune) {
+        // No entries to prune.
+        return false;
+    } else {
+        // Prune matching entries.
+        for (const auto& entry: entries) {
+            if (!pruneEval->Match(entry.primPath)) {
+                // Accumulate survivors.
+                postPruneEntries->push_back(entry);
+            }
+        }
+        return true;
+    }
+}
+
+void
+HdPrman_RenderPassSceneIndex::_PrimsAdded(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::AddedPrimEntries &entries)
+{    
+    HdSceneIndexObserver::AddedPrimEntries extraAddedEntries;
+    HdSceneIndexObserver::DirtiedPrimEntries extraDirtyEntries;
+    HdSceneIndexObserver::RemovedPrimEntries extraRemovedEntries;
+
+    // Check if any entry could affect the active render pass.
+    if (_EntryCouldAffectPass(entries, _activeRenderPass.renderPassPath)) {
+        _UpdateActiveRenderPassState(
+            &extraAddedEntries, &extraDirtyEntries, &extraRemovedEntries);
+    }
+
+    // Filter entries against any active render pass prune collection.
+    if (!_PruneEntries(_activeRenderPass.pruneEval, entries,
+                       &extraAddedEntries)) {
+        _SendPrimsAdded(entries);
+    }
+
+    _SendPrimsAdded(extraAddedEntries);
+    _SendPrimsRemoved(extraRemovedEntries);
+    _SendPrimsDirtied(extraDirtyEntries);
+}
+
+void 
+HdPrman_RenderPassSceneIndex::_PrimsRemoved(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::RemovedPrimEntries &entries)
+{
+    HdSceneIndexObserver::AddedPrimEntries extraAddedEntries;
+    HdSceneIndexObserver::DirtiedPrimEntries extraDirtyEntries;
+    HdSceneIndexObserver::RemovedPrimEntries extraRemovedEntries;
+
+    // Check if any entry could affect the active render pass.
+    if (_EntryCouldAffectPass(entries, _activeRenderPass.renderPassPath)) {
+        _UpdateActiveRenderPassState(
+            &extraAddedEntries, &extraDirtyEntries, &extraRemovedEntries);
+    }
+
+    // Filter entries against any active render pass prune collection.
+    if (!_PruneEntries(_activeRenderPass.pruneEval, entries,
+                       &extraRemovedEntries)) {
+        _SendPrimsRemoved(entries);
+    }
+
+    _SendPrimsAdded(extraAddedEntries);
+    _SendPrimsRemoved(extraRemovedEntries);
+    _SendPrimsDirtied(extraDirtyEntries);
+}
+
+void
+HdPrman_RenderPassSceneIndex::_PrimsDirtied(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::DirtiedPrimEntries &entries)
+{
+    HdSceneIndexObserver::AddedPrimEntries extraAddedEntries;
+    HdSceneIndexObserver::DirtiedPrimEntries extraDirtyEntries;
+    HdSceneIndexObserver::RemovedPrimEntries extraRemovedEntries;
+
+    // Check if any entry could affect the active render pass.
+    if (_EntryCouldAffectPass(entries, _activeRenderPass.renderPassPath)) {
+        _UpdateActiveRenderPassState(
+            &extraAddedEntries, &extraDirtyEntries, &extraRemovedEntries);
+    }
+
+    // Filter entries against any active render pass prune collection.
+    if (!_PruneEntries(_activeRenderPass.pruneEval, entries,
+                       &extraDirtyEntries)) {
+        _SendPrimsDirtied(entries);
+    }
+
+    _SendPrimsAdded(extraAddedEntries);
+    _SendPrimsRemoved(extraRemovedEntries);
+    _SendPrimsDirtied(extraDirtyEntries);
+}
+
+HdPrman_RenderPassSceneIndex::~HdPrman_RenderPassSceneIndex() = default;
+
+// Helper method to compile a collection evaluator.
+static void
+_CompileCollection(
+    HdCollectionsSchema &collections,
+    TfToken const& collectionName,
+    HdSceneIndexBaseRefPtr const& sceneIndex,
+    SdfPathExpression *expr,
+    std::optional<HdCollectionExpressionEvaluator> *eval)
+{
+    if (HdCollectionSchema collection =
+        collections.GetCollection(collectionName)) {
+        if (HdPathExpressionDataSourceHandle pathExprDs =
+            collection.GetMembershipExpression()) {
+            *expr = pathExprDs->GetTypedValue(0.0);
+            if (!expr->IsEmpty()) {
+                *eval = HdCollectionExpressionEvaluator(sceneIndex, *expr);
+            }
+        }
+    }
+}
+
+void
+HdPrman_RenderPassSceneIndex::_UpdateActiveRenderPassState(
+    HdSceneIndexObserver::AddedPrimEntries *addedEntries,
+    HdSceneIndexObserver::DirtiedPrimEntries *dirtyEntries,
+    HdSceneIndexObserver::RemovedPrimEntries *removedEntries)
+{
+    TRACE_FUNCTION();
+
+    // Swap out the prior pass state to compare against.
+    _RenderPassState &state = _activeRenderPass;
+    _RenderPassState priorState;
+    std::swap(state, priorState);
+
+    // Check upstream scene index for an active render pass.
+    HdSceneIndexBaseRefPtr inputSceneIndex = _GetInputSceneIndex();
+    HdSceneGlobalsSchema globals =
+        HdSceneGlobalsSchema::GetFromSceneIndex(inputSceneIndex);
+    if (HdPathDataSourceHandle pathDs = globals.GetActiveRenderPassPrim()) {
+        state.renderPassPath = pathDs->GetTypedValue(0.0);
+    }
+    if (state.renderPassPath.IsEmpty() && priorState.renderPassPath.IsEmpty()) {
+        // Avoid further work if no render pass was or is active.
+        return;
+    }
+    if (!state.renderPassPath.IsEmpty()) {
+        const HdSceneIndexPrim passPrim =
+            inputSceneIndex->GetPrim(state.renderPassPath);
+        if (HdCollectionsSchema collections =
+            HdCollectionsSchema::GetFromParent(passPrim.dataSource)) {
+            // Prepare evaluators for render pass collections.
+            _CompileCollection(collections, _tokens->matte,
+                               inputSceneIndex,
+                               &state.matteExpr,
+                               &state.matteEval);
+            _CompileCollection(collections, _tokens->renderVisibility,
+                               inputSceneIndex,
+                               &state.renderVisExpr,
+                               &state.renderVisEval);
+            _CompileCollection(collections, _tokens->cameraVisibility,
+                               inputSceneIndex,
+                               &state.cameraVisExpr,
+                               &state.cameraVisEval);
+            _CompileCollection(collections, _tokens->prune,
+                               inputSceneIndex,
+                               &state.pruneExpr,
+                               &state.pruneEval);
+        }
+    }
+
+    // Short-circuit the analysis below based on which patterns changed.
+    const bool visOrMatteExprDidChange =
+        state.matteExpr != priorState.matteExpr ||
+        state.renderVisExpr != priorState.renderVisExpr ||
+        state.cameraVisExpr != priorState.cameraVisExpr;
+
+    if (state.pruneExpr == priorState.pruneExpr && !visOrMatteExprDidChange) {
+        // No patterns changed; nothing to invalidate.
+        return;
+    }
+
+    // Generate change entries for affected prims.
+    // Consider all upstream prims.
+    //
+    // TODO: HdCollectionExpressionEvaluator::PopulateAllMatches()
+    // should be used here instead, since in the future it will handle
+    // instance matches as well as parallel traversal.
+    //
+    for (const SdfPath &path: HdSceneIndexPrimView(_GetInputSceneIndex())) {
+        if (priorState.DoesPrune(path)) {
+            // The prim had been pruned.
+            if (!state.DoesPrune(path)) {
+                // The prim is no longer pruned, so add it back.
+                HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(path);
+                addedEntries->push_back({path, prim.primType});
+            } else {
+                // The prim is still pruned, so nothing to do.
+            }
+        } else if (state.DoesPrune(path)) {
+            // The prim is newly pruned, so remove it.
+            removedEntries->push_back({path});
+        } else if (visOrMatteExprDidChange) {
+            // Determine which (if any) locators on the upstream prim
+            // are dirtied by the change in render pass state.
+            const HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(path);
+            const bool visibilityDidChange =
+                (priorState.DoesOverrideVis(path, prim)
+                 != state.DoesOverrideVis(path, prim));
+            const bool primvarsDidChange =
+                (priorState.DoesOverrideCameraVis(path, prim)
+                 != state.DoesOverrideCameraVis(path, prim)) ||
+                (priorState.DoesOverrideMatte(path, prim)
+                 != state.DoesOverrideMatte(path, prim));
+            if (primvarsDidChange || visibilityDidChange) {
+                HdDataSourceLocatorSet locators;
+                if (primvarsDidChange) {
+                    locators.insert(HdPrimvarsSchema::GetDefaultLocator());
+                }
+                if (visibilityDidChange) {
+                    locators.insert(HdVisibilitySchema::GetDefaultLocator());
+                }
+               dirtyEntries->push_back({path, locators});
+            }
+        }
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndex.h b/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndex.h
new file mode 100644
index 0000000000..23d80cdcb3
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndex.h
@@ -0,0 +1,93 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/collectionExpressionEvaluator.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include <optional>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DECLARE_REF_PTRS(HdPrman_RenderPassSceneIndex);
+
+/// HdPrman_RenderPassSceneIndex applies the active render pass
+/// specified in the HdSceneGlobalsSchema, modifying the scene
+/// contents as needed.
+///
+class HdPrman_RenderPassSceneIndex : 
+    public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static HdPrman_RenderPassSceneIndexRefPtr
+    New(const HdSceneIndexBaseRefPtr& inputSceneIndex);
+
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override;
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override;
+
+protected:
+    HdPrman_RenderPassSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex);
+    ~HdPrman_RenderPassSceneIndex();
+
+    void _PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::AddedPrimEntries &entries) override;
+    void _PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::RemovedPrimEntries &entries) override;
+    void _PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries &entries) override;
+
+private:
+    // State specified by a render pass.
+    // If renderPassPath is the empty path, no render pass is active.
+    // Collection evaluators are set sparsely, corresponding to
+    // the presence of the collection in the render pass schema.
+    struct _RenderPassState {
+        SdfPath renderPassPath;
+
+        // Retain the expressions so we can compare old vs. new state.
+        SdfPathExpression matteExpr;
+        SdfPathExpression renderVisExpr;
+        SdfPathExpression cameraVisExpr;
+        SdfPathExpression pruneExpr;
+
+        // Evalulators for each pattern expression.
+        std::optional<HdCollectionExpressionEvaluator> matteEval;
+        std::optional<HdCollectionExpressionEvaluator> renderVisEval;
+        std::optional<HdCollectionExpressionEvaluator> cameraVisEval;
+        std::optional<HdCollectionExpressionEvaluator> pruneEval;
+
+        bool DoesOverrideMatte(
+            const SdfPath &primPath,
+            HdSceneIndexPrim const& prim) const;
+        bool DoesOverrideVis(
+            const SdfPath &primPath,
+            HdSceneIndexPrim const& prim) const;
+        bool DoesOverrideCameraVis(
+            const SdfPath &primPath,
+            HdSceneIndexPrim const& prim) const;
+        bool DoesPrune(
+            const SdfPath &primPath) const;
+    };
+
+    // Pull on the scene globals schema for the active render pass,
+    // computing and caching its state in _activeRenderPass.
+    void _UpdateActiveRenderPassState(
+        HdSceneIndexObserver::AddedPrimEntries *addedEntries,
+        HdSceneIndexObserver::DirtiedPrimEntries *dirtyEntries,
+        HdSceneIndexObserver::RemovedPrimEntries *removedEntries);
+
+    // State for the active render pass.
+    _RenderPassState _activeRenderPass;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..4a4d34ffaf
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndexPlugin.cpp
@@ -0,0 +1,53 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/renderPassSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "hdPrman/renderPassSceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_RenderPassSceneIndexPlugin"))
+);
+
+static const char * const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry
+        ::Define<HdPrman_RenderPassSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // We need an "insertion point" that's *after* general material resolve.
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 115;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr, // No input args.
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+HdPrman_RenderPassSceneIndexPlugin::
+HdPrman_RenderPassSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_RenderPassSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdPrman_RenderPassSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndexPlugin.h
new file mode 100644
index 0000000000..5cee5b9ab8
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/renderPassSceneIndexPlugin.h
@@ -0,0 +1,34 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_RenderPassSceneIndexPlugin
+///
+/// Applies the active scene index in HdSceneGlobalsSchema
+/// to the scene contents.
+///
+class HdPrman_RenderPassSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_RenderPassSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/third_party/renderman-25/plugin/hdPrman/renderSettings.cpp b/third_party/renderman-25/plugin/hdPrman/renderSettings.cpp
index 37199a2b6c..0127d5ec72 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderSettings.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/renderSettings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/renderSettings.h"
 #include "hdPrman/debugCodes.h"
@@ -192,6 +175,28 @@ _UpdateRileyCamera(
     }
 }
 
+// Update the Frame number from the Stage Global Scene Index
+void
+_UpdateFrame(
+    const HdSceneIndexBaseRefPtr &terminalSi,
+    RtParamList *options)
+{
+    // Get the Frame from the Terminal Scene Index 
+    double frame;
+    if (!HdUtils::GetCurrentFrame(terminalSi, &frame)) {
+        return;
+    }
+
+    // k_Ri_Frame in Riley is an integer, not float.
+    // As an explicit policy choice, round down.
+    const int intFrame(floor(frame));
+
+    // Store on the options list to be used in a later Riley.SetOptions() call 
+    HdPrman_Utils::SetParamFromVtValue(
+        RixStr.k_Ri_Frame, VtValue(intFrame),
+        /* role */ TfToken(), options);
+}
+
 // Create/update the render view and associated resources based on the
 // render product.
 void
@@ -371,7 +376,7 @@ HdPrman_RenderSettings::UpdateAndRender(
             renderIndex,
             product.cameraPath,
             &cameraContext);
-        
+
         const GfVec2f shutter =
             _ResolveShutterInterval(product, cameraContext, renderIndex);
 
@@ -476,6 +481,11 @@ void HdPrman_RenderSettings::_Sync(
         }
     }
 
+    if (*dirtyBits & HdRenderSettings::DirtyFrameNumber ||
+        *dirtyBits & HdRenderSettings::DirtyNamespacedSettings) {
+        _UpdateFrame(terminalSi, &_settingsOptions);
+    }
+
     // XXX Preserve existing data flow for clients that don't populate the
     //     sceneGlobals.activeRenderSettingsPrim locator at the root prim of the
     //     scene index. In this scenario, scene options and render terminals
@@ -495,7 +505,8 @@ void HdPrman_RenderSettings::_Sync(
 
         if (*dirtyBits & HdRenderSettings::DirtyNamespacedSettings ||
             *dirtyBits & HdRenderSettings::DirtyActive ||
-            *dirtyBits & HdRenderSettings::DirtyShutterInterval) {
+            *dirtyBits & HdRenderSettings::DirtyShutterInterval || 
+            *dirtyBits & HdRenderSettings::DirtyFrameNumber) {
             
             // Handle attributes ...
             param->SetRenderSettingsPrimOptions(_settingsOptions);
diff --git a/third_party/renderman-25/plugin/hdPrman/renderSettings.h b/third_party/renderman-25/plugin/hdPrman/renderSettings.h
index 48c207db9d..763e1d10fb 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderSettings.h
+++ b/third_party/renderman-25/plugin/hdPrman/renderSettings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.cpp
index b25d972e31..8ee0ceb3b5 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/renderSettingsFilteringSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.h
index 5f3090c1d9..a1b79145ad 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_FILTERING_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_FILTERING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.cpp
index 5f7e64a9f9..7da73f24c6 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h
index be7b8ed974..30aa155aa7 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef PXR_IMAGING_HDPRMAN_RENDER_TERMINAL_OUTPUT_INVALIDATING_SCENE_INDEX_PLUGIN_H
 #define PXR_IMAGING_HDPRMAN_RENDER_TERMINAL_OUTPUT_INVALIDATING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/renderViewContext.cpp b/third_party/renderman-25/plugin/hdPrman/renderViewContext.cpp
index 8f965427c6..4bead2c578 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderViewContext.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/renderViewContext.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/renderViewContext.h"
 #include "hdPrman/renderDelegate.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/renderViewContext.h b/third_party/renderman-25/plugin/hdPrman/renderViewContext.h
index c9aab190a8..61fa572dc8 100644
--- a/third_party/renderman-25/plugin/hdPrman/renderViewContext.h
+++ b/third_party/renderman-25/plugin/hdPrman/renderViewContext.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_VIEW_CONTEXT_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_VIEW_CONTEXT_H
diff --git a/third_party/renderman-25/plugin/hdPrman/rendererPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/rendererPlugin.cpp
index 43a8f1185e..c5bd745470 100644
--- a/third_party/renderman-25/plugin/hdPrman/rendererPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rendererPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/renderDelegate.h"
 #include "pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/resourceRegistry.cpp b/third_party/renderman-25/plugin/hdPrman/resourceRegistry.cpp
index aa2afd5f49..c559404b0b 100644
--- a/third_party/renderman-25/plugin/hdPrman/resourceRegistry.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/resourceRegistry.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/resourceRegistry.h"
 #include "hdPrman/renderParam.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/resourceRegistry.h b/third_party/renderman-25/plugin/hdPrman/resourceRegistry.h
index 8357f9b1b9..671545f4c7 100644
--- a/third_party/renderman-25/plugin/hdPrman/resourceRegistry.h
+++ b/third_party/renderman-25/plugin/hdPrman/resourceRegistry.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2020 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RESOURCE_REGISTRY_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RESOURCE_REGISTRY_H
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyCameraPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyCameraPrim.cpp
index 38f4583802..e17d65cf38 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyCameraPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyCameraPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyCameraPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyCameraPrim.h
index 2f7513d53b..1ab86d6109 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyCameraPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyCameraPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyCameraSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyCameraSchema.cpp
index b4f5659ee7..e26c1dec44 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyCameraSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyCameraSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyCameraSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyCameraSchema.h
index 7a0690e8d3..37bfffefdb 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyCameraSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyCameraSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyClippingPlanePrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyClippingPlanePrim.cpp
index 297dc2e42a..826a380276 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyClippingPlanePrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyClippingPlanePrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyClippingPlanePrim.h b/third_party/renderman-25/plugin/hdPrman/rileyClippingPlanePrim.h
index 60d074eee6..b9091c357b 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyClippingPlanePrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyClippingPlanePrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyClippingPlaneSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyClippingPlaneSchema.cpp
index 7a55c9d2e6..108a5f4a3b 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyClippingPlaneSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyClippingPlaneSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyClippingPlaneSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyClippingPlaneSchema.h
index cd2fe8c5ea..511420d487 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyClippingPlaneSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyClippingPlaneSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyConversionSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/rileyConversionSceneIndexPlugin.cpp
index 84cdde8b1f..503fadcd65 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyConversionSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyConversionSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/rileyConversionSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyConversionSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/rileyConversionSceneIndexPlugin.h
index 2dccdbd907..8f7974b108 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyConversionSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyConversionSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemPrim.cpp
index 943f585a32..4d21b61d4a 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemPrim.h
index 709ba8fa36..8919ff49fd 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemSchema.cpp
index f7e3b34052..c65b3e05cb 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemSchema.h
index f04e8ef88b..707084e1da 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyCoordinateSystemSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplacementPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyDisplacementPrim.cpp
index b73308ea8c..d354d2a88a 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplacementPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplacementPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplacementPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyDisplacementPrim.h
index 9fd7fc98a7..dad8339e83 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplacementPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplacementPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplacementSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyDisplacementSchema.cpp
index 8042e6b350..cce793cf53 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplacementSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplacementSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplacementSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyDisplacementSchema.h
index 9fced3f5f6..fb6238a181 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplacementSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplacementSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterPrim.cpp
index be036e4b00..f3ba15aa68 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterPrim.h
index 7e640b9a25..eb20dc4ff4 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterSchema.cpp
index 7d68e38cc4..45953add5e 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterSchema.h
index d4949292ba..efa0fe4b58 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplayFilterSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplayPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyDisplayPrim.cpp
index df1e4c88f8..a0f0caaedd 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplayPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplayPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplayPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyDisplayPrim.h
index 82768c8d2d..408546a8f6 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplayPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplayPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplaySchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyDisplaySchema.cpp
index 35c1147b9f..80d9750ea7 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplaySchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplaySchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyDisplaySchema.h b/third_party/renderman-25/plugin/hdPrman/rileyDisplaySchema.h
index e732e0325c..c14d4450fe 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyDisplaySchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyDisplaySchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.cpp
index 892b1a623b..605d19e8b1 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/rileyFallbackMaterialSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.h
index 04a1f7648a..1708bb1a9a 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGenPrim.py b/third_party/renderman-25/plugin/hdPrman/rileyGenPrim.py
index 6c585a2418..6c18c13de9 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGenPrim.py
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGenPrim.py
@@ -3,25 +3,8 @@
 #
 # Copyright 2023 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 
 from jinja2 import Environment, FileSystemLoader, Template, pass_context
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstancePrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstancePrim.cpp
index b9517131b9..80173ce1b5 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstancePrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstancePrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstancePrim.h b/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstancePrim.h
index f4d5d72338..c4a50edf4f 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstancePrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstancePrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstanceSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstanceSchema.cpp
index b852f87196..ee6a761d50 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstanceSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstanceSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstanceSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstanceSchema.h
index 8f9b3b18b2..e2fed02f90 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstanceSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGeometryInstanceSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypePrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypePrim.cpp
index 13b76a3f9d..e4f07a7325 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypePrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypePrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypePrim.h b/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypePrim.h
index f32e135689..6dd81229b5 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypePrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypePrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypeSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypeSchema.cpp
index 740a242d73..4b9b05d4b4 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypeSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypeSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypeSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypeSchema.h
index 2c37faf0e6..8f690342d1 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypeSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGeometryPrototypeSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGlobalsPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyGlobalsPrim.cpp
new file mode 100644
index 0000000000..ca11ec3fa6
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGlobalsPrim.cpp
@@ -0,0 +1,63 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+#include "hdPrman/rileyGlobalsPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyGlobalsSchema.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyGlobalsPrim::HdPrman_RileyGlobalsPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyGlobalsSchema schema =
+        HdPrmanRileyGlobalsSchema::GetFromParent(primSource);
+
+    _SetOptions(schema);
+}
+
+void
+HdPrman_RileyGlobalsPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyGlobalsSchema schema =
+        HdPrmanRileyGlobalsSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyGlobalsSchema::GetOptionsLocator())) {
+        _SetOptions(schema);
+    }
+}
+
+void
+HdPrman_RileyGlobalsPrim::_SetOptions(
+    HdPrmanRileyGlobalsSchema globalsSchema)
+{
+    if (HdPrmanRileyParamListSchema schema = globalsSchema.GetOptions()) {
+        HdPrman_RileyParamList options = HdPrman_RileyParamList(schema);
+        _AcquireRiley()->SetOptions(
+            options.rileyObject);
+    }
+}
+
+HdPrman_RileyGlobalsPrim::~HdPrman_RileyGlobalsPrim() = default;
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGlobalsPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyGlobalsPrim.h
new file mode 100644
index 0000000000..974ea6fdbf
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGlobalsPrim.h
@@ -0,0 +1,54 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GLOBALS_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GLOBALS_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrmanRileyGlobalsSchema;
+using HdPrman_RileyGlobalsPrimHandle =
+    std::shared_ptr<class HdPrman_RileyGlobalsPrim>;
+
+/// \class HdPrman_RileyGlobalsPrim
+///
+/// Set riley global parameters such as options using the
+/// HdPrmanRileyGlobalsSchema.
+///
+class HdPrman_RileyGlobalsPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyGlobalsPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyGlobalsPrim() override;
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+    void _SetOptions(HdPrmanRileyGlobalsSchema);
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGlobalsSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyGlobalsSchema.cpp
new file mode 100644
index 0000000000..7bc7fa5ce9
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGlobalsSchema.cpp
@@ -0,0 +1,118 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyGlobalsSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyGlobalsSchemaTokens,
+    HD_PRMAN_RILEY_GLOBALS_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyGlobalsSchema::GetOptions()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyGlobalsSchemaTokens->options));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyGlobalsSchema::BuildRetained(
+        const HdContainerDataSourceHandle &options
+)
+{
+    TfToken _names[1];
+    HdDataSourceBaseHandle _values[1];
+
+    size_t _count = 0;
+
+    if (options) {
+        _names[_count] = HdPrmanRileyGlobalsSchemaTokens->options;
+        _values[_count++] = options;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyGlobalsSchema::Builder &
+HdPrmanRileyGlobalsSchema::Builder::SetOptions(
+    const HdContainerDataSourceHandle &options)
+{
+    _options = options;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyGlobalsSchema::Builder::Build()
+{
+    return HdPrmanRileyGlobalsSchema::BuildRetained(
+        _options
+    );
+}
+
+/*static*/
+HdPrmanRileyGlobalsSchema
+HdPrmanRileyGlobalsSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyGlobalsSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyGlobalsSchemaTokens->rileyGlobals))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyGlobalsSchema::GetSchemaToken()
+{
+    return HdPrmanRileyGlobalsSchemaTokens->rileyGlobals;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyGlobalsSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGlobalsSchema::GetOptionsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGlobalsSchemaTokens->options);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyGlobalsSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyGlobalsSchema.h
new file mode 100644
index 0000000000..b7a7eca2ef
--- /dev/null
+++ b/third_party/renderman-25/plugin/hdPrman/rileyGlobalsSchema.h
@@ -0,0 +1,156 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GLOBALS_SCHEMA_H
+#define EXT_RMANPKG_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GLOBALS_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_GLOBALS_SCHEMA_TOKENS \
+    (rileyGlobals) \
+    (options) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyGlobalsSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_GLOBALS_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyGlobalsSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyGlobalsSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyGlobals" from the parent container and constructs a
+    /// HdPrmanRileyGlobalsSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyGlobalsSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetOptions()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate options.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetOptionsLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdContainerDataSourceHandle &options
+    );
+
+    /// \class HdPrmanRileyGlobalsSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetOptions(
+            const HdContainerDataSourceHandle &options);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdContainerDataSourceHandle _options;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyIds.h b/third_party/renderman-25/plugin/hdPrman/rileyIds.h
index 3bc0972cb8..1b29981dfa 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyIds.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyIds.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_UTIL_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_UTIL_H
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyIntegratorPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyIntegratorPrim.cpp
index 14e673b741..e03004183c 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyIntegratorPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyIntegratorPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyIntegratorPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyIntegratorPrim.h
index 46e6124fa5..6be3b73a51 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyIntegratorPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyIntegratorPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyIntegratorSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyIntegratorSchema.cpp
index 976ef90545..109adb463e 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyIntegratorSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyIntegratorSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyIntegratorSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyIntegratorSchema.h
index 5f3373bbd7..77c098d820 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyIntegratorSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyIntegratorSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyLightInstancePrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyLightInstancePrim.cpp
index 485e126d87..9ccb837fa7 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyLightInstancePrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyLightInstancePrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyLightInstancePrim.h b/third_party/renderman-25/plugin/hdPrman/rileyLightInstancePrim.h
index 91e7c91d3a..401effb2b7 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyLightInstancePrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyLightInstancePrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyLightInstanceSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyLightInstanceSchema.cpp
index a4dd184afe..83b19d590b 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyLightInstanceSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyLightInstanceSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyLightInstanceSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyLightInstanceSchema.h
index 9c2a1b0499..1de0958e01 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyLightInstanceSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyLightInstanceSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyLightShaderPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyLightShaderPrim.cpp
index 1270db2c90..060f5effb7 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyLightShaderPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyLightShaderPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyLightShaderPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyLightShaderPrim.h
index 251b216326..b40d51dca4 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyLightShaderPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyLightShaderPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyLightShaderSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyLightShaderSchema.cpp
index 09026e05c8..0102d2c61e 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyLightShaderSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyLightShaderSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyLightShaderSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyLightShaderSchema.h
index c6cd817d2d..3e5e295a85 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyLightShaderSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyLightShaderSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyMaterialPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyMaterialPrim.cpp
index ab536a6c78..d5afd91d59 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyMaterialPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyMaterialPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyMaterialPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyMaterialPrim.h
index ed54254e16..69bab059de 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyMaterialPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyMaterialPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyMaterialSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyMaterialSchema.cpp
index 9089ef78f2..e29f9f8e02 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyMaterialSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyMaterialSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyMaterialSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyMaterialSchema.h
index 8e71f8529a..a18e256de5 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyMaterialSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyMaterialSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyParamListSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyParamListSchema.cpp
index a50fd21303..442c05fa1b 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyParamListSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyParamListSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyParamListSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyParamListSchema.h
index f2c2f677e2..d167fcb76b 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyParamListSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyParamListSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyParamSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyParamSchema.cpp
index 1f98aeab1d..9c9e559ee0 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyParamSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyParamSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyParamSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyParamSchema.h
index 64ae010ca0..6e6cf5b124 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyParamSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyParamSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyPrimBase.cpp b/third_party/renderman-25/plugin/hdPrman/rileyPrimBase.cpp
index 27aff75326..2664441ae6 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyPrimBase.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyPrimBase.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "hdPrman/rileyPrimBase.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyPrimBase.h b/third_party/renderman-25/plugin/hdPrman/rileyPrimBase.h
index 18ca6ba14b..0ae3ed81ee 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyPrimBase.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyPrimBase.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_BASE_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_BASE_H
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyPrimFactory.cpp b/third_party/renderman-25/plugin/hdPrman/rileyPrimFactory.cpp
index 1508cb5e2d..79cf597480 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyPrimFactory.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyPrimFactory.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "hdPrman/rileyPrimFactory.h"
@@ -34,6 +17,7 @@
 #include "hdPrman/rileyDisplayFilterPrim.h"
 #include "hdPrman/rileyGeometryInstancePrim.h"
 #include "hdPrman/rileyGeometryPrototypePrim.h"
+#include "hdPrman/rileyGlobalsPrim.h"
 #include "hdPrman/rileyIntegratorPrim.h"
 #include "hdPrman/rileyLightInstancePrim.h"
 #include "hdPrman/rileyLightShaderPrim.h"
@@ -71,6 +55,8 @@ class _RileyPrimTypePriorityFunctor
     {
         /// Dependencies are as follows:
         ///
+        /// Riley::SetOptions needs to be before anything else!
+        ///
         /// lightShader     <----------------------------< lightInstance
         ///                                               /
         /// material      <------------------------------*---< geometryInstance
@@ -92,6 +78,10 @@ class _RileyPrimTypePriorityFunctor
         /// sampleFilter <---------------------*
         ///                                   /
         /// camera  <------------------------*
+        if (primType == HdPrmanRileyPrimTypeTokens->globals) {
+            return 0;
+        }
+
         if (primType == HdPrmanRileyPrimTypeTokens->lightShader ||
             primType == HdPrmanRileyPrimTypeTokens->material ||
             primType == HdPrmanRileyPrimTypeTokens->coordinateSystem ||
@@ -102,27 +92,27 @@ class _RileyPrimTypePriorityFunctor
             primType == HdPrmanRileyPrimTypeTokens->displayFilter||
             primType == HdPrmanRileyPrimTypeTokens->sampleFilter||
             primType == HdPrmanRileyPrimTypeTokens->camera) {
-            return 0;
+            return 1;
         }
 
         if (primType == HdPrmanRileyPrimTypeTokens->geometryPrototype ||
             primType == HdPrmanRileyPrimTypeTokens->renderTarget) {
-            return 1;
+            return 2;
         }
 
         if (primType == HdPrmanRileyPrimTypeTokens->lightInstance ||
             primType == HdPrmanRileyPrimTypeTokens->geometryInstance ||
             primType == HdPrmanRileyPrimTypeTokens->display ||
             primType == HdPrmanRileyPrimTypeTokens->renderView) {
-            return 2;
+            return 3;
         }
 
-        return 3;
+        return 4;
     }
 
     size_t GetNumPriorities() const override
     {
-        return 4;
+        return 5;
     }
 };
 
@@ -195,6 +185,13 @@ HdPrman_RileyPrimFactory::CreatePrim(
             _renderParam);
     }
 
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->globals) {
+        return std::make_shared<HdPrman_RileyGlobalsPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
     if (entry.primType == HdPrmanRileyPrimTypeTokens->integrator) {
         return std::make_shared<HdPrman_RileyIntegratorPrim>(
             _GetPrimSource(observer, entry.primPath),
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyPrimFactory.h b/third_party/renderman-25/plugin/hdPrman/rileyPrimFactory.h
index a0e0496447..09cb21616f 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyPrimFactory.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyPrimFactory.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_FACTORY_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_FACTORY_H
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyPrimvarListSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyPrimvarListSchema.cpp
index a8bf7e8707..6b69137c33 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyPrimvarListSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyPrimvarListSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyPrimvarListSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyPrimvarListSchema.h
index f9045a7b55..156859cefd 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyPrimvarListSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyPrimvarListSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyPrimvarSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyPrimvarSchema.cpp
index 4e062d5ef1..70f3b38e8e 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyPrimvarSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyPrimvarSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyPrimvarSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyPrimvarSchema.h
index 9992ef6f61..92bf80c892 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyPrimvarSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyPrimvarSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputPrim.cpp
index 745e3b9056..747960225e 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputPrim.h
index 2df82a663a..7a66bddd08 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputSchema.cpp
index 4f8d2ae2cf..924699cc15 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputSchema.h
index 707a93fe34..73316521b7 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderOutputSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetPrim.cpp
index 582d343698..4f9188d596 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetPrim.h
index 7c4e3264d7..155fca9393 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetSchema.cpp
index 9f87c25908..92b931e199 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetSchema.h
index 4cb2d24d20..1b11a77b27 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderTargetSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderViewPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileyRenderViewPrim.cpp
index 2e9affd8e9..00e650a1a3 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderViewPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderViewPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderViewPrim.h b/third_party/renderman-25/plugin/hdPrman/rileyRenderViewPrim.h
index a2f1ae48ef..820216617b 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderViewPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderViewPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderViewSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyRenderViewSchema.cpp
index dba6f1a840..fba8397bef 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderViewSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderViewSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyRenderViewSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyRenderViewSchema.h
index dacc57abce..6d330fbbb8 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyRenderViewSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyRenderViewSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileySampleFilterPrim.cpp b/third_party/renderman-25/plugin/hdPrman/rileySampleFilterPrim.cpp
index 3f09f436e7..6aac7d0abb 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileySampleFilterPrim.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileySampleFilterPrim.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileySampleFilterPrim.h b/third_party/renderman-25/plugin/hdPrman/rileySampleFilterPrim.h
index a10b7d5ae8..72e55b55f8 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileySampleFilterPrim.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileySampleFilterPrim.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileySampleFilterSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileySampleFilterSchema.cpp
index a3aec19103..79cd31b763 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileySampleFilterSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileySampleFilterSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileySampleFilterSchema.h b/third_party/renderman-25/plugin/hdPrman/rileySampleFilterSchema.h
index 0210de71df..e7379b7dec 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileySampleFilterSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileySampleFilterSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileySchemaTypeDefs.h b/third_party/renderman-25/plugin/hdPrman/rileySchemaTypeDefs.h
index 8883b5ed81..fcb0690cab 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileySchemaTypeDefs.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileySchemaTypeDefs.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyShadingNodeSchema.cpp b/third_party/renderman-25/plugin/hdPrman/rileyShadingNodeSchema.cpp
index b8ae1af1c7..1b2267f068 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyShadingNodeSchema.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyShadingNodeSchema.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyShadingNodeSchema.h b/third_party/renderman-25/plugin/hdPrman/rileyShadingNodeSchema.h
index ab6896d20c..7e6eb0e55e 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyShadingNodeSchema.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyShadingNodeSchema.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyTypes.cpp b/third_party/renderman-25/plugin/hdPrman/rileyTypes.cpp
index f13dc523dc..6c7040625a 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyTypes.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rileyTypes.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "hdPrman/rileyTypes.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/rileyTypes.h b/third_party/renderman-25/plugin/hdPrman/rileyTypes.h
index 5d2d6cbddc..e562dbe97a 100644
--- a/third_party/renderman-25/plugin/hdPrman/rileyTypes.h
+++ b/third_party/renderman-25/plugin/hdPrman/rileyTypes.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_OBJECT_UTIL_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_OBJECT_UTIL_H
diff --git a/third_party/renderman-25/plugin/hdPrman/rixStrings.cpp b/third_party/renderman-25/plugin/hdPrman/rixStrings.cpp
index 462c0bf239..6e2bd18741 100644
--- a/third_party/renderman-25/plugin/hdPrman/rixStrings.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/rixStrings.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/rixStrings.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/rixStrings.h b/third_party/renderman-25/plugin/hdPrman/rixStrings.h
index 02262b2614..773f3d2306 100644
--- a/third_party/renderman-25/plugin/hdPrman/rixStrings.h
+++ b/third_party/renderman-25/plugin/hdPrman/rixStrings.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RIX_STRINGS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RIX_STRINGS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/sampleFilter.cpp b/third_party/renderman-25/plugin/hdPrman/sampleFilter.cpp
index c38d805df9..66fa027c34 100644
--- a/third_party/renderman-25/plugin/hdPrman/sampleFilter.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/sampleFilter.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/sampleFilter.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/sampleFilter.h b/third_party/renderman-25/plugin/hdPrman/sampleFilter.h
index 3a58066213..0c1baa67e3 100644
--- a/third_party/renderman-25/plugin/hdPrman/sampleFilter.h
+++ b/third_party/renderman-25/plugin/hdPrman/sampleFilter.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SAMPLE_FILTER_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SAMPLE_FILTER_H
diff --git a/third_party/renderman-25/plugin/hdPrman/sceneIndexObserverApi.h b/third_party/renderman-25/plugin/hdPrman/sceneIndexObserverApi.h
index 148ad7f169..e308830e4c 100644
--- a/third_party/renderman-25/plugin/hdPrman/sceneIndexObserverApi.h
+++ b/third_party/renderman-25/plugin/hdPrman/sceneIndexObserverApi.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SCENE_INDEX_OBSERVER_API_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SCENE_INDEX_OBSERVER_API_H
diff --git a/third_party/renderman-25/plugin/hdPrman/sphere.cpp b/third_party/renderman-25/plugin/hdPrman/sphere.cpp
index fda4cf8c01..f935877446 100644
--- a/third_party/renderman-25/plugin/hdPrman/sphere.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/sphere.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/sphere.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/sphere.h b/third_party/renderman-25/plugin/hdPrman/sphere.h
index b6014d34e1..9421b2f9ad 100644
--- a/third_party/renderman-25/plugin/hdPrman/sphere.h
+++ b/third_party/renderman-25/plugin/hdPrman/sphere.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SPHERE_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SPHERE_H
diff --git a/third_party/renderman-25/plugin/hdPrman/terminalSceneIndexObserver.cpp b/third_party/renderman-25/plugin/hdPrman/terminalSceneIndexObserver.cpp
index 4338dfec49..0f5d2992aa 100644
--- a/third_party/renderman-25/plugin/hdPrman/terminalSceneIndexObserver.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/terminalSceneIndexObserver.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "hdPrman/terminalSceneIndexObserver.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/terminalSceneIndexObserver.h b/third_party/renderman-25/plugin/hdPrman/terminalSceneIndexObserver.h
index d59648bfea..731f40b145 100644
--- a/third_party/renderman-25/plugin/hdPrman/terminalSceneIndexObserver.h
+++ b/third_party/renderman-25/plugin/hdPrman/terminalSceneIndexObserver.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TERMINAL_SCENE_INDEX_OBSERVER_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TERMINAL_SCENE_INDEX_OBSERVER_H
diff --git a/third_party/renderman-25/plugin/hdPrman/testenv/testHdPrman.cpp b/third_party/renderman-25/plugin/hdPrman/testenv/testHdPrman.cpp
index 758b36c28b..5b6f5876c5 100644
--- a/third_party/renderman-25/plugin/hdPrman/testenv/testHdPrman.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/testenv/testHdPrman.cpp
@@ -1,77 +1,61 @@
 //
 // Copyright 2018 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
-//
-#include "pxr/pxr.h"
+#include "hdPrman/renderDelegate.h"
 
-#include "pxr/imaging/hd/renderIndex.h"
+#include "pxr/imaging/hd/camera.h"
+#include "pxr/imaging/hd/dataSourceMaterialNetworkInterface.h"
 #include "pxr/imaging/hd/engine.h"
-#include "pxr/imaging/hd/flatteningSceneIndex.h"
-#include "pxr/imaging/hd/rprimCollection.h"
-#include "pxr/imaging/hd/task.h"
+#include "pxr/imaging/hd/lightSchema.h"
+#include "pxr/imaging/hd/materialNetworkSchema.h"
+#include "pxr/imaging/hd/materialSchema.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h"
+#include "pxr/imaging/hd/rendererPluginRegistry.h"
+#include "pxr/imaging/hd/renderIndex.h"
 #include "pxr/imaging/hd/renderPass.h"
 #include "pxr/imaging/hd/renderPassState.h"
-#include "pxr/imaging/hd/rendererPluginRegistry.h"
-#include "pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/rprimCollection.h"
 #include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
-#include "pxr/imaging/hd/camera.h"
+#include "pxr/imaging/hd/task.h"
+#include "pxr/imaging/hd/tokens.h"
 #include "pxr/imaging/hd/utils.h"
-#include "pxr/imaging/hd/overlayContainerDataSource.h"
-#include "pxr/imaging/hd/retainedDataSource.h"
-#include "pxr/imaging/hd/materialNetworkSchema.h"
-#include "pxr/imaging/hd/materialSchema.h"
-#include "pxr/imaging/hd/lightSchema.h"
-#include "pxr/imaging/hd/dataSourceMaterialNetworkInterface.h"
 #include "pxr/imaging/hd/version.h"
 
-#include "pxr/imaging/hdsi/legacyDisplayStyleOverrideSceneIndex.h"
 #include "pxr/imaging/hdsi/sceneGlobalsSceneIndex.h"
 
-#include "pxr/usd/usd/stage.h"
+#include "pxr/usdImaging/usdImaging/delegate.h"
+#include "pxr/usdImaging/usdImaging/sceneIndices.h"
+#include "pxr/usdImaging/usdImaging/stageSceneIndex.h"
+
 #include "pxr/usd/usd/prim.h"
+#include "pxr/usd/usd/stage.h"
 
 #include "pxr/usd/usdGeom/camera.h"
+#include "pxr/usd/usdGeom/tokens.h"
 #include "pxr/usd/usdRender/product.h"
 #include "pxr/usd/usdRender/settings.h"
 #include "pxr/usd/usdRender/spec.h"
 #include "pxr/usd/usdRender/var.h"
 
-#include "pxr/usdImaging/usdImaging/delegate.h"
-#include "pxr/usdImaging/usdImaging/sceneIndices.h"
-#include "pxr/usdImaging/usdImaging/stageSceneIndex.h"
-
+#include "pxr/base/arch/env.h"
+#include "pxr/base/tf/diagnostic.h"
 #include "pxr/base/tf/envSetting.h"
-#include "pxr/base/tf/pathUtils.h"
 #include "pxr/base/tf/stopwatch.h"
-#include "pxr/base/arch/env.h"
+#include "pxr/base/tf/token.h"
 #include "pxr/base/trace/reporter.h"
+#include "pxr/base/vt/types.h"
 #include "pxr/base/work/threadLimits.h"
 
-#include "hdPrman/renderDelegate.h"
+#include "pxr/pxr.h"
 
+#include <cstdio>
 #include <fstream>
-#include <functional>
 #include <memory>
-#include <stdio.h>
 #include <string>
 
 PXR_NAMESPACE_USING_DIRECTIVE
@@ -909,12 +893,9 @@ HydraSetupAndRender(
     // XXX
     // The data flow below needs to be updated to be scene description driven.
     // Specifically:
-    // - "render tags" should be replaced with "includedPurposes" on the
-    //   RenderSettings prim.
     // - "rprim collection" should be replaced with the Usd Collection opinion
     //   on the driving RenderPass prim.
 
-    const TfTokenVector renderTags{HdRenderTagTokens->geometry};
     // The collection of scene contents to render
     HdRprimCollection hdCollection(
         _tokens->testCollection,
@@ -950,12 +931,34 @@ HydraSetupAndRender(
                                     cameraInfo->aspectRatioConformPolicy) });
 #endif
     }
-
-    auto sgsi = appSceneIndices->sceneGlobalsSceneIndex;
-    TF_VERIFY(sgsi);
-    fprintf(stdout, "Setting the active render settings prim path to <%s>.\n",
-            renderSettingsPrimPath.GetText());
-    sgsi->SetActiveRenderSettingsPrimPath(renderSettingsPrimPath);
+    
+    TfTokenVector renderTags;
+    if (!renderSettingsPrimPath.IsEmpty()) {
+        const UsdRenderSettings& settings = UsdRenderSettings(
+            stage->GetPrimAtPath(renderSettingsPrimPath));
+        VtTokenArray purposes;
+        settings.GetIncludedPurposesAttr().Get(&purposes);
+        for (const TfToken& purpose : purposes) {
+            if (purpose == UsdGeomTokens->default_) {
+                renderTags.push_back(HdRenderTagTokens->geometry);
+            } else if (purpose == UsdGeomTokens->guide) {
+                renderTags.push_back(HdRenderTagTokens->guide);
+            } else if (purpose == UsdGeomTokens->render) {
+                renderTags.push_back(HdRenderTagTokens->render);
+            } else if (purpose == UsdGeomTokens->proxy) {
+                renderTags.push_back(HdRenderTagTokens->proxy);
+            } else {
+                TF_CODING_ERROR("Unrecognized purpose: %s", purpose.GetText());
+            }
+        }
+        auto sgsi = appSceneIndices->sceneGlobalsSceneIndex;
+        TF_VERIFY(sgsi);
+        fprintf(stdout, "Setting the active render settings prim path to <%s>.\n",
+                renderSettingsPrimPath.GetText());
+        sgsi->SetActiveRenderSettingsPrimPath(renderSettingsPrimPath);
+    } else {
+        renderTags.push_back(HdRenderTagTokens->geometry);
+    }
 
     // The task execution graph and engine configuration is also simple.
     HdTaskSharedPtrVector tasks = {
@@ -1160,6 +1163,15 @@ int main(int argc, char *argv[])
         // hydra's first-class support for render settings scene description.
         fprintf(stdout, "Rendering using the experimentalRenderSpec dictionary...\n");
         for (auto product: renderSpec.products) {
+
+            if (product.type != TfToken("raster")) {
+                TF_WARN(
+                    "Skipping product %s because product type %s is not"
+                    "supported in the renderSpec path.",
+                    product.name.GetText(), product.type.GetText());
+                
+                continue;
+            }
             printf("Rendering product %s...\n", product.name.GetText());
 
             HydraSetupCameraInfo camInfo = ApplyCommandLineArgsToProduct(
@@ -1172,9 +1184,6 @@ int main(int argc, char *argv[])
             settingsMap[HdPrmanRenderSettingsTokens->experimentalRenderSpec] =
                 CreateRenderSpecDict(renderSpec, product);
 
-            // Only allow "raster" for now.
-            TF_VERIFY(product.type == TfToken("raster"));
-
             AddVisualizerStyle(visualizerStyle, &settingsMap);
             AddNamespacedSettings(product.namespacedSettings, &settingsMap);
             settingsMap[HdRenderSettingsTokens->enableInteractive] = false;
diff --git a/third_party/renderman-25/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.cpp
index 64e4103571..e76f0ec1da 100644
--- a/third_party/renderman-25/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/tetMeshConversionSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.h
index be39609ca6..aa632befa3 100644
--- a/third_party/renderman-25/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2024 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TET_MESH_CONVERSION_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TET_MESH_CONVERSION_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/tokens.cpp b/third_party/renderman-25/plugin/hdPrman/tokens.cpp
index 02e978ad61..1750e9fc2d 100644
--- a/third_party/renderman-25/plugin/hdPrman/tokens.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/tokens.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/tokens.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/tokens.h b/third_party/renderman-25/plugin/hdPrman/tokens.h
index a52e705ef0..f26752308f 100644
--- a/third_party/renderman-25/plugin/hdPrman/tokens.h
+++ b/third_party/renderman-25/plugin/hdPrman/tokens.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2022 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TOKENS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TOKENS_H
@@ -50,6 +33,7 @@ TF_DECLARE_PUBLIC_TOKENS(HdPrmanTokens, HDPRMAN_API, HD_PRMAN_TOKENS);
     ((displayFilter,      "riley:displayFilter"))      \
     ((geometryInstance,   "riley:geometryInstance"))   \
     ((geometryPrototype,  "riley:geometryPrototype"))  \
+    ((globals,            "riley:globals"))            \
     ((integrator,         "riley:integrator"))         \
     ((lightInstance,      "riley:lightInstance"))      \
     ((lightShader,        "riley:lightShader"))        \
diff --git a/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndex.cpp b/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndex.cpp
index 07e50ee34d..0ce8b0dc47 100644
--- a/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndex.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/updateObjectSettingsSceneIndex.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndex.h b/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndex.h
index 1783cb6b15..d28fcd29f3 100644
--- a/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndex.h
+++ b/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_H
 
diff --git a/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.cpp b/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.cpp
index e8ed9c11fd..2f6bbd81b8 100644
--- a/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #include "hdPrman/updateObjectSettingsSceneIndexPlugin.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.h b/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.h
index 0135f39e63..e923e6cc25 100644
--- a/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.h
+++ b/third_party/renderman-25/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_PLUGIN_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-25/plugin/hdPrman/utils.cpp b/third_party/renderman-25/plugin/hdPrman/utils.cpp
index 81f4048bdb..a2f8cf5e25 100644
--- a/third_party/renderman-25/plugin/hdPrman/utils.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/utils.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/utils.h"
 
@@ -515,6 +498,7 @@ _IsNativeRenderManFormat(std::string const &path)
 /// - RMAN_TEXTUREPATH
 /// - RMAN_RIXPLUGINPATH
 /// - RMAN_PROCEDURALPATH
+/// - RMAN_DISPLAYPATH
 ///
 void
 _UpdateSearchPathsFromEnvironment(RtParamList& options)
@@ -623,6 +607,27 @@ _UpdateSearchPathsFromEnvironment(RtParamList& options)
         options.SetString( RixStr.k_searchpath_procedural,
                            RtUString(proceduralpath.c_str()) );
     }
+
+    {
+        std::string displaypath = TfGetenv("RMAN_DISPLAYPATH");
+        NdrStringVec paths;
+        if (!displaypath.empty()) {
+            // RenderMan expects ':' as path separator, regardless of platform
+            for (std::string const& path : TfStringSplit(displaypath,
+                                                         ARCH_PATH_LIST_SEP))
+            {
+                paths.push_back(path);
+            }
+        }
+
+        // Default RenderMan installation under '$RMANTREE/lib/plugins'
+        if (!rmantree.empty()) {
+            paths.push_back(TfStringCatPaths(rmantree, "lib/plugins"));
+        }
+        displaypath = TfStringJoin(paths, ":");
+        options.SetString( RixStr.k_searchpath_display,
+                           RtUString(displaypath.c_str()) );
+    }
 }
 
 }
diff --git a/third_party/renderman-25/plugin/hdPrman/utils.h b/third_party/renderman-25/plugin/hdPrman/utils.h
index 067f91c4c3..42a445ba01 100644
--- a/third_party/renderman-25/plugin/hdPrman/utils.h
+++ b/third_party/renderman-25/plugin/hdPrman/utils.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2023 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UTILS_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UTILS_H
diff --git a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.lex.cpp b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.lex.cpp
index 5243ae18b7..b820fad695 100644
--- a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.lex.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.lex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #line 3 "<stdout>"
@@ -522,7 +505,6 @@ static yyconst flex_int16_t yy_chk[200] =
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
 // with the following modification; you may not use this file except in
 // compliance with the Apache License and the following modification to it:
 // Section 6. Trademarks. is deleted and replaced with:
@@ -540,7 +522,8 @@ static yyconst flex_int16_t yy_chk[200] =
 // distributed under the Apache License with the above modification is
 // distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 // KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/fileSystem.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.ll b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.ll
index 9c1b6c8398..567a733544 100644
--- a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.ll
+++ b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.ll
@@ -2,25 +2,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "pxr/pxr.h"
 #include "pxr/base/arch/fileSystem.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.tab.cpp b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.tab.cpp
index 3bb4987178..2be51903bd 100644
--- a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.tab.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.tab.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 /* A Bison parser, made by GNU Bison 2.4.1.  */
diff --git a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.tab.h b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.tab.h
index e478e84af7..b73e486683 100644
--- a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.tab.h
+++ b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.tab.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 /* A Bison parser, made by GNU Bison 2.4.1.  */
diff --git a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.yy b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.yy
index 8861870f32..386a6b71bc 100644
--- a/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.yy
+++ b/third_party/renderman-25/plugin/hdPrman/virtualStructConditionalGrammar.yy
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 %define api.pure
 %error-verbose
diff --git a/third_party/renderman-25/plugin/hdPrman/virtualStructResolvingSceneIndex.cpp b/third_party/renderman-25/plugin/hdPrman/virtualStructResolvingSceneIndex.cpp
index 376589e323..9f9caa7a12 100644
--- a/third_party/renderman-25/plugin/hdPrman/virtualStructResolvingSceneIndex.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/virtualStructResolvingSceneIndex.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/virtualStructResolvingSceneIndex.h"
 #include "hdPrman/matfiltResolveVstructs.h"
diff --git a/third_party/renderman-25/plugin/hdPrman/virtualStructResolvingSceneIndex.h b/third_party/renderman-25/plugin/hdPrman/virtualStructResolvingSceneIndex.h
index 72ea05c8aa..ccebf0d76d 100644
--- a/third_party/renderman-25/plugin/hdPrman/virtualStructResolvingSceneIndex.h
+++ b/third_party/renderman-25/plugin/hdPrman/virtualStructResolvingSceneIndex.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2021 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VIRTUAL_STRUCT_RESOLVING_SCENE_INDEX_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VIRTUAL_STRUCT_RESOLVING_SCENE_INDEX_H
diff --git a/third_party/renderman-25/plugin/hdPrman/volume.cpp b/third_party/renderman-25/plugin/hdPrman/volume.cpp
index 926995ad81..09ed44bb21 100644
--- a/third_party/renderman-25/plugin/hdPrman/volume.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/volume.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/volume.h"
 
@@ -476,43 +459,50 @@ HdPrman_Volume::_ConvertGeometry(HdPrman_RenderParam *renderParam,
                                  RtUString *primType,
                                  std::vector<HdGeomSubset> *geomSubsets)
 {
-    HdVolumeFieldDescriptorVector fields =
-        sceneDelegate->GetVolumeFieldDescriptors(id);
-
-    if (fields.empty()) {
-        return RtPrimVarList();
-    }
-
-    TfToken fieldPrimType = _DetermineConsistentFieldPrimType(fields);
-    if (fieldPrimType.IsEmpty()) {
-        TF_WARN("The fields on volume %s have inconsistent types and can't be "
-                "emitted as a single volume", id.GetText());
-        return RtPrimVarList();
-    }
-
-    // Based on the field type we determine the function to emit the volume to
-    // Prman
-    _VolumeEmitterMap const& volumeEmitters = _GetVolumeEmitterMap();
-    auto const iter = volumeEmitters.find(fieldPrimType);
-    if (iter == volumeEmitters.end()) {
-        TF_WARN("No volume emitter registered for field type '%s' "
-                "on prim %s", fieldPrimType.GetText(), id.GetText());
-        return RtPrimVarList();
-    }
+    *primType = RixStr.k_Ri_Volume;
 
+    // Dimensions
     int32_t const dims[] = { 0, 0, 0 };
     uint64_t const dim = dims[0] * dims[1] * dims[2];
-
     RtPrimVarList primvars(1, dim, dim, dim);
     primvars.SetIntegerArray(RixStr.k_Ri_dimensions, dims, 3);
 
-    *primType = RixStr.k_Ri_Volume;
+    HdPrman_ConvertPrimvars(
+        sceneDelegate, id, primvars,
+        /* numUniform = */ 1,
+        /* numVertex = */ 0,
+        /* numVarying = */ 0,
+        /* numFaceVarying = */ 0);
 
     // Setup the volume for Prman with the appropriate DSO and its parameters
-    HdPrman_VolumeTypeEmitter emitterFunc = iter->second;
-    emitterFunc(sceneDelegate, id, fields, &primvars);
+    HdVolumeFieldDescriptorVector fields =
+        sceneDelegate->GetVolumeFieldDescriptors(id);
+    if (!fields.empty()) {
+        TfToken fieldPrimType = _DetermineConsistentFieldPrimType(fields);
+        if (fieldPrimType.IsEmpty()) {
+            TF_WARN("The fields on volume %s have inconsistent types and "
+                    "cannot be emitted as a single volume", id.GetText());
+            return RtPrimVarList();
+        }
+
+        // Based on the field type we determine the function to emit the
+        // volume to Prman
+        _VolumeEmitterMap const& volumeEmitters = _GetVolumeEmitterMap();
+        auto const iter = volumeEmitters.find(fieldPrimType);
+        if (iter == volumeEmitters.end()) {
+            TF_WARN("No volume emitter registered for field type '%s' "
+                    "on prim %s", fieldPrimType.GetText(), id.GetText());
+            return RtPrimVarList();
+        }
 
-    HdPrman_ConvertPrimvars(sceneDelegate, id, primvars, 1, dim, dim, dim);
+        HdPrman_VolumeTypeEmitter emitterFunc = iter->second;
+        emitterFunc(sceneDelegate, id, fields, &primvars);
+    } else {
+        // If no fields are found, the volume will be required to
+        // specify Ri:type (ex: "box") and Ri:Bounds.  We do not
+        // check this here because RenderMan will already issue
+        // an appropriate warning.
+    }
 
     return primvars;
 }
diff --git a/third_party/renderman-25/plugin/hdPrman/volume.h b/third_party/renderman-25/plugin/hdPrman/volume.h
index a2370b9bb5..65235fc322 100644
--- a/third_party/renderman-25/plugin/hdPrman/volume.h
+++ b/third_party/renderman-25/plugin/hdPrman/volume.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VOLUME_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VOLUME_H
diff --git a/third_party/renderman-25/plugin/hdPrman/xcpt.cpp b/third_party/renderman-25/plugin/hdPrman/xcpt.cpp
index e23ebcfbdc..47a97e84a2 100644
--- a/third_party/renderman-25/plugin/hdPrman/xcpt.cpp
+++ b/third_party/renderman-25/plugin/hdPrman/xcpt.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #include "hdPrman/xcpt.h"
 
diff --git a/third_party/renderman-25/plugin/hdPrman/xcpt.h b/third_party/renderman-25/plugin/hdPrman/xcpt.h
index 5b6423bc62..a4b2c36956 100644
--- a/third_party/renderman-25/plugin/hdPrman/xcpt.h
+++ b/third_party/renderman-25/plugin/hdPrman/xcpt.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef HDPRMAN_XCPT_H
 #define HDPRMAN_XCPT_H
diff --git a/third_party/renderman-25/plugin/rmanArgsParser/__init__.py b/third_party/renderman-25/plugin/rmanArgsParser/__init__.py
index 362927c080..9e37da7762 100644
--- a/third_party/renderman-25/plugin/rmanArgsParser/__init__.py
+++ b/third_party/renderman-25/plugin/rmanArgsParser/__init__.py
@@ -1,25 +1,8 @@
 #
 # Copyright 2019 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 #
 from pxr import Tf
 Tf.PreparePythonModule()
diff --git a/third_party/renderman-25/plugin/rmanArgsParser/api.h b/third_party/renderman-25/plugin/rmanArgsParser/api.h
index 31d41ac6ac..ce2d7a7689 100644
--- a/third_party/renderman-25/plugin/rmanArgsParser/api.h
+++ b/third_party/renderman-25/plugin/rmanArgsParser/api.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_API_H
 #define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_API_H
diff --git a/third_party/renderman-25/plugin/rmanArgsParser/module.cpp b/third_party/renderman-25/plugin/rmanArgsParser/module.cpp
index d1a0dc1f73..79661e7bf8 100644
--- a/third_party/renderman-25/plugin/rmanArgsParser/module.cpp
+++ b/third_party/renderman-25/plugin/rmanArgsParser/module.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/third_party/renderman-25/plugin/rmanArgsParser/pch.h b/third_party/renderman-25/plugin/rmanArgsParser/pch.h
index 63c182eb75..056e5a3107 100644
--- a/third_party/renderman-25/plugin/rmanArgsParser/pch.h
+++ b/third_party/renderman-25/plugin/rmanArgsParser/pch.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
diff --git a/third_party/renderman-25/plugin/rmanArgsParser/rmanArgsParser.cpp b/third_party/renderman-25/plugin/rmanArgsParser/rmanArgsParser.cpp
index 981214b1df..8134422ac5 100644
--- a/third_party/renderman-25/plugin/rmanArgsParser/rmanArgsParser.cpp
+++ b/third_party/renderman-25/plugin/rmanArgsParser/rmanArgsParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/third_party/renderman-25/plugin/rmanArgsParser/rmanArgsParser.h b/third_party/renderman-25/plugin/rmanArgsParser/rmanArgsParser.h
index 76d1f745b4..be4b749f9e 100644
--- a/third_party/renderman-25/plugin/rmanArgsParser/rmanArgsParser.h
+++ b/third_party/renderman-25/plugin/rmanArgsParser/rmanArgsParser.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_RMAN_ARGS_PARSER_H
diff --git a/third_party/renderman-25/plugin/rmanArgsParser/wrapRmanArgsParser.cpp b/third_party/renderman-25/plugin/rmanArgsParser/wrapRmanArgsParser.cpp
index 77996d744f..8e6744034b 100644
--- a/third_party/renderman-25/plugin/rmanArgsParser/wrapRmanArgsParser.cpp
+++ b/third_party/renderman-25/plugin/rmanArgsParser/wrapRmanArgsParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/pxr.h"
diff --git a/third_party/renderman-25/plugin/rmanDiscovery/rmanDiscovery.cpp b/third_party/renderman-25/plugin/rmanDiscovery/rmanDiscovery.cpp
index e89de74797..7ba9cbfb5f 100644
--- a/third_party/renderman-25/plugin/rmanDiscovery/rmanDiscovery.cpp
+++ b/third_party/renderman-25/plugin/rmanDiscovery/rmanDiscovery.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/arch/fileSystem.h"
diff --git a/third_party/renderman-25/plugin/rmanDiscovery/rmanDiscovery.h b/third_party/renderman-25/plugin/rmanDiscovery/rmanDiscovery.h
index 8805a397cf..7a52aef2a2 100644
--- a/third_party/renderman-25/plugin/rmanDiscovery/rmanDiscovery.h
+++ b/third_party/renderman-25/plugin/rmanDiscovery/rmanDiscovery.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_DISCOVERY_RMAN_DISCOVERY_H
diff --git a/third_party/renderman-25/plugin/rmanOslParser/rmanOslParser.cpp b/third_party/renderman-25/plugin/rmanOslParser/rmanOslParser.cpp
index d56c4bdda7..9766226dc8 100644
--- a/third_party/renderman-25/plugin/rmanOslParser/rmanOslParser.cpp
+++ b/third_party/renderman-25/plugin/rmanOslParser/rmanOslParser.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "pxr/base/arch/fileSystem.h"
diff --git a/third_party/renderman-25/plugin/rmanOslParser/rmanOslParser.h b/third_party/renderman-25/plugin/rmanOslParser/rmanOslParser.h
index 19ea502b23..50e586cfb8 100644
--- a/third_party/renderman-25/plugin/rmanOslParser/rmanOslParser.h
+++ b/third_party/renderman-25/plugin/rmanOslParser/rmanOslParser.h
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_OSL_PARSER_RMAN_OSL_PARSER_H
diff --git a/third_party/renderman-25/plugin/rmanOslParser/testenv/testRmanOslParser.py b/third_party/renderman-25/plugin/rmanOslParser/testenv/testRmanOslParser.py
index 5af340ae8f..a3e363de84 100644
--- a/third_party/renderman-25/plugin/rmanOslParser/testenv/testRmanOslParser.py
+++ b/third_party/renderman-25/plugin/rmanOslParser/testenv/testRmanOslParser.py
@@ -2,25 +2,8 @@
 #
 # Copyright 2020 Pixar
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
 
 import unittest
 
diff --git a/third_party/renderman-25/plugin/rtx_glfImage/CMakeLists.txt b/third_party/renderman-25/plugin/rtx_hioImage/CMakeLists.txt
similarity index 100%
rename from third_party/renderman-25/plugin/rtx_glfImage/CMakeLists.txt
rename to third_party/renderman-25/plugin/rtx_hioImage/CMakeLists.txt
diff --git a/third_party/renderman-25/plugin/rtx_glfImage/main.cpp b/third_party/renderman-25/plugin/rtx_hioImage/main.cpp
similarity index 93%
rename from third_party/renderman-25/plugin/rtx_glfImage/main.cpp
rename to third_party/renderman-25/plugin/rtx_hioImage/main.cpp
index a06a6b5a26..bda9f83c68 100644
--- a/third_party/renderman-25/plugin/rtx_glfImage/main.cpp
+++ b/third_party/renderman-25/plugin/rtx_hioImage/main.cpp
@@ -1,25 +1,8 @@
 //
 // Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 #include "RtxPlugin.h"
diff --git a/third_party/renderman-26/CMakeLists.txt b/third_party/renderman-26/CMakeLists.txt
new file mode 100644
index 0000000000..c99aeee22e
--- /dev/null
+++ b/third_party/renderman-26/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(plugin)
+add_subdirectory(shaders)
diff --git a/third_party/renderman-26/README.md b/third_party/renderman-26/README.md
new file mode 100644
index 0000000000..74d216a17e
--- /dev/null
+++ b/third_party/renderman-26/README.md
@@ -0,0 +1,6 @@
+RenderMan 26 Plugins
+====================
+
+This section contains libraries and plugins for RenderMan 26. 
+
+See the [online documentation](http://openusd.org/docs/RenderMan-USD-Imaging-Plugin.html) for more details.
diff --git a/third_party/renderman-26/plugin/CMakeLists.txt b/third_party/renderman-26/plugin/CMakeLists.txt
new file mode 100644
index 0000000000..a5e87dbdfd
--- /dev/null
+++ b/third_party/renderman-26/plugin/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_subdirectory(rmanArgsParser)
+add_subdirectory(rmanDiscovery)
+add_subdirectory(hdPrman)
+add_subdirectory(rtx_hioImage)
+add_subdirectory(usdRiPxr)
+# Only build rmanOslParser when sdrOsl is disabled
+# This allows hdPrman to render OSL files without OSL pre-installed
+if (NOT PXR_ENABLE_OSL_SUPPORT)
+    add_subdirectory(rmanOslParser)
+endif()
diff --git a/third_party/renderman-26/plugin/hdPrman/CMakeLists.txt b/third_party/renderman-26/plugin/hdPrman/CMakeLists.txt
new file mode 100644
index 0000000000..262062aa7d
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/CMakeLists.txt
@@ -0,0 +1,238 @@
+# To be sure our VtVisitValue polyfill works correctly, the preprocessor must 
+# resolve the #include <pxr/base/vt/visitValue.h> in our identically-named
+# polyfill to the real one in libpxr. But CMAKE_INCLUDE_CURRENT_DIR injects the
+# cpp source directory as the first include search path. The preprocessor
+# therefore finds only our polyfill and stops looking, never getting the chance
+# to find the libpxr one. Setting this to OFF allows the preprocessor to resolve
+# the angle-include to libpxr instead, and does not affect any other part of the
+# hdPrman build. The polyfill will be removed once hdPrman drops support for
+# USD versions older than 22.11.
+set(CMAKE_INCLUDE_CURRENT_DIR OFF)
+
+# Install hdPrman's headers in pxr/imaging alongside other shared
+# libraries for Hydra backends, like hdSt.
+set(PXR_PREFIX pxr/imaging)
+set(PXR_PACKAGE hdPrman)
+
+# RiEntryPoints.h incorrectly makes libloadprman symbols DLL import
+# This is only temporary and will be removed shortly
+add_definitions(-DPRMANBUILDINGAPI)
+
+# TODO The pxr cmake macros don't provide a good way to link prman with link_directories
+# on Linux/OSX without resorting to absolute rpath. For now, simply avoid linking
+# libprman on Linux/OSX.
+set(optionalLibs "")
+if(WIN32)
+    set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libmmd.lib /NODEFAULTLIB:libirc.lib /NODEFAULTLIB:svml_dispmd.lib /NODEFAULTLIB:libdecimal.lib" )
+    list(APPEND optionalLibs ${PXRCORE_LIBRARY})
+    list(APPEND optionalLibs ${PRMAN_LIBRARY})
+    list(APPEND optionalLibs ${PRMAN_STATS_LIBRARY})
+elseif(APPLE)
+    set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -headerpad_max_install_names" )
+endif()
+
+set(optionalIncludeDirs "")
+set(optionalPublicClasses "")
+if (${PXR_ENABLE_MATERIALX_SUPPORT})
+    list(APPEND optionalLibs
+        MaterialXCore
+        MaterialXFormat
+        MaterialXGenShader
+        MaterialXGenOsl
+        MaterialXRender
+        hdMtlx
+    )
+    list(APPEND optionalPublicClasses matfiltMaterialX)
+
+    if (${PXR_ENABLE_OSL_SUPPORT})
+        if (DEFINED OSL_SHADER_INSTALL_DIR)
+            add_compile_definitions(
+              OSL_SHADER_INSTALL_DIR=\"${OSL_SHADER_INSTALL_DIR}\"
+            )
+        endif()
+
+        list(APPEND optionalLibs ${OSL_COMP_LIBRARY})
+        list(APPEND optionalIncludeDirs ${OSL_INCLUDE_DIR})
+    endif()
+endif()
+
+if (${PXR_ENABLE_OPENVDB_SUPPORT})
+    list(APPEND optionalLibs hioOpenVDB)
+endif()
+
+pxr_plugin(${PXR_PACKAGE}
+    LIBRARIES
+        ar
+        arch
+        js
+        plug
+        tf
+        vt
+        gf
+        hd
+        hdsi
+        hio
+        usdRi
+        usdVol
+        usdVolImaging
+        ${optionalLibs}
+
+    INCLUDE_DIRS
+        ${RENDERMAN_INCLUDE_DIR}
+        ${optionalIncludeDirs}
+
+    PUBLIC_CLASSES
+        basisCurves
+        camera
+        cone
+        coordSys
+        coordSysPrimSceneIndexPlugin
+        cylinder
+        debugCodes
+        dependencyForwardingSceneIndexPlugin
+        displayFilter
+        gprim
+        gprimbase
+        instancer
+        integrator
+        light
+        lightFilter
+        material
+        matfiltConvertPreviewMaterial
+        matfiltResolveVstructs
+        mesh
+        renderTerminalOutputInvalidatingSceneIndexPlugin
+        points
+        renderDelegate
+        renderSettings
+        rileyCameraSchema
+        rileyClippingPlaneSchema
+        rileyConversionSceneIndexPlugin
+        rileyCoordinateSystemSchema
+        rileyDisplacementSchema
+        rileyDisplayFilterSchema
+        rileyDisplaySchema
+        rileyFallbackMaterialSceneIndexPlugin
+        rileyGeometryInstanceSchema
+        rileyGeometryPrototypeSchema
+        rileyGlobalsSchema
+        rileyIntegratorSchema
+        rileyLightInstanceSchema
+        rileyLightShaderSchema
+        rileyMaterialSchema
+        rileyParamSchema
+        rileyParamListSchema
+        rileyPrimvarSchema
+        rileyPrimvarListSchema
+        rileyRenderOutputSchema
+        rileyRenderTargetSchema
+        rileyRenderViewSchema
+        rileySampleFilterSchema
+        rileyShadingNodeSchema
+        rixStrings
+        sampleFilter
+        sphere
+        tetMeshConversionSceneIndexPlugin
+        tokens
+        volume
+        xcpt
+        ${optionalPublicClasses}
+
+    PRIVATE_CLASSES
+        cameraContext
+        debugUtil
+        extComputationPrimvarPruningSceneIndexPlugin
+        framebuffer
+        implicitSurfaceSceneIndexPlugin
+        materialPrimvarTransferSceneIndexPlugin
+        matfiltSceneIndexPlugins
+        motionBlurSceneIndexPlugin
+        pinnedCurveExpandingSceneIndexPlugin
+        renderBuffer
+        renderParam
+        renderPass
+        renderPassSceneIndex
+        renderPassSceneIndexPlugin
+        renderSettingsFilteringSceneIndexPlugin
+        renderViewContext
+        resourceRegistry
+        rileyCameraPrim
+        rileyCoordinateSystemPrim
+        rileyClippingPlanePrim
+        rileyDisplacementPrim
+        rileyDisplayFilterPrim
+        rileyDisplayPrim
+        rileyGeometryInstancePrim
+        rileyGeometryPrototypePrim
+        rileyGlobalsPrim
+        rileyIntegratorPrim
+        rileyLightInstancePrim
+        rileyLightShaderPrim
+        rileyMaterialPrim
+        rileyPrimBase
+        rileyPrimFactory
+        rileyRenderOutputPrim
+        rileyRenderTargetPrim
+        rileyRenderViewPrim
+        rileySampleFilterPrim
+        rileyTypes
+        terminalSceneIndexObserver
+        updateObjectSettingsSceneIndex
+        updateObjectSettingsSceneIndexPlugin
+        utils
+        virtualStructResolvingSceneIndex
+
+    PUBLIC_HEADERS
+        api.h
+        rileySchemaTypeDefs.h
+
+    PRIVATE_HEADERS
+        prmanArchDefs.h
+        pxr/base/vt/typeHeaders.h # polyfill until USD 22.08
+        pxr/base/vt/visitValue.h  # polyfill until USD 22.11
+        rileyIds.h
+        sceneIndexObserverApi.h
+        virtualStructConditionalGrammar.tab.h
+
+    CPPFILES
+        lightLinkingSceneIndexPlugin.cpp
+        rendererPlugin.cpp
+        virtualStructConditionalGrammar.lex.cpp
+        virtualStructConditionalGrammar.tab.cpp
+
+    RESOURCE_FILES
+        plugInfo.json
+
+    DISABLE_PRECOMPILED_HEADERS
+)
+
+# Include paths to hdPrman headers within hdPrman itself look like
+# #include "hdPrman/...", so we need to add include/pxr/imaging
+# to the include paths for this library. We use PROJECT_BINARY_DIR
+# to include headers out of the build directory, which is what
+# normally happens in the USD build.
+if(TARGET hdPrman)
+    target_include_directories(${PXR_PACKAGE}
+        PRIVATE
+            "${PROJECT_BINARY_DIR}/include/pxr/imaging"
+    )
+endif()
+
+if(WIN32 AND NOT BUILD_SHARED_LIBS)
+    # XXX: Temporarily disable this test on static Windows builds
+    #      due to symbol visibility issues.
+else()
+    pxr_build_test(testHdPrman
+        LIBRARIES
+            cameraUtil
+            hdPrman
+            hd
+            usd
+            usdImaging
+            usdRender
+            ${PXRCORE_LIBRARY}
+            ${PRMAN_LIBRARY}
+        CPPFILES
+            testenv/testHdPrman.cpp
+    )
+endif()
diff --git a/third_party/renderman-26/plugin/hdPrman/api.h b/third_party/renderman-26/plugin/hdPrman/api.h
new file mode 100644
index 0000000000..c0b72141c7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/api.h
@@ -0,0 +1,30 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_API_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_API_H
+
+#include "pxr/base/arch/export.h"
+
+#if defined(PXR_STATIC)
+#   define HDPRMAN_API
+#   define HDPRMAN_API_TEMPLATE_CLASS(...)
+#   define HDPRMAN_API_TEMPLATE_STRUCT(...)
+#   define HDPRMAN_LOCAL
+#else
+#   if defined(HDPRMAN_EXPORTS)
+#       define HDPRMAN_API ARCH_EXPORT
+#       define HDPRMAN_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__)
+#       define HDPRMAN_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__)
+#   else
+#       define HDPRMAN_API ARCH_IMPORT
+#       define HDPRMAN_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__)
+#       define HDPRMAN_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__)
+#   endif
+#   define HDPRMAN_LOCAL ARCH_HIDDEN
+#endif
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/basisCurves.cpp b/third_party/renderman-26/plugin/hdPrman/basisCurves.cpp
new file mode 100644
index 0000000000..c30d05a65e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/basisCurves.cpp
@@ -0,0 +1,150 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include <numeric> // for std::iota
+#include "hdPrman/basisCurves.h"
+
+#include "hdPrman/renderParam.h"
+#include "hdPrman/material.h"
+#include "hdPrman/rixStrings.h"
+#include "pxr/imaging/hd/basisCurvesTopology.h"
+
+#include "RiTypesHelper.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#if PXR_VERSION > 2011
+HdPrman_BasisCurves::HdPrman_BasisCurves(SdfPath const& id)
+    : BASE(id)
+#else
+HdPrman_BasisCurves::HdPrman_BasisCurves(SdfPath const& id,
+                                         SdfPath const& instancerId)
+    : BASE(id, instancerId)
+#endif
+{
+}
+
+HdDirtyBits
+HdPrman_BasisCurves::GetInitialDirtyBitsMask() const
+{
+    // The initial dirty bits control what data is available on the first
+    // run through _PopulateRtBasisCurves(), so it should list every data item
+    // that _PopluateRtBasisCurves requests.
+    int mask = HdChangeTracker::Clean
+        | HdChangeTracker::DirtyPoints
+        | HdChangeTracker::DirtyTopology
+        | HdChangeTracker::DirtyTransform
+        | HdChangeTracker::DirtyVisibility
+        | HdChangeTracker::DirtyPrimvar
+        | HdChangeTracker::DirtyNormals
+        | HdChangeTracker::DirtyWidths
+        | HdChangeTracker::DirtyInstancer
+        | HdChangeTracker::DirtyMaterialId
+        ;
+
+    return (HdDirtyBits)mask;
+}
+
+RtPrimVarList
+HdPrman_BasisCurves::_ConvertGeometry(HdPrman_RenderParam *renderParam,
+                                      HdSceneDelegate *sceneDelegate,
+                                      const SdfPath &id,
+                                      RtUString *primType,
+                                      std::vector<HdGeomSubset> *geomSubsets)
+{
+    HdBasisCurvesTopology topology =
+        GetBasisCurvesTopology(sceneDelegate);
+    VtIntArray curveVertexCounts = topology.GetCurveVertexCounts();
+    VtIntArray curveIndices = topology.GetCurveIndices();
+    TfToken curveType = topology.GetCurveType();
+    TfToken curveBasis = topology.GetCurveBasis();
+    TfToken curveWrap = topology.GetCurveWrap();
+
+    *primType = RixStr.k_Ri_Curves;
+
+    // Note: 'nowrap' and 'nsegs' terminology below is to match
+    // prman primvar docs, for ease of validation.
+    const int numCurves = curveVertexCounts.size();
+    const int nowrap = (curveWrap == HdTokens->periodic) ? 0 : 1;
+    size_t vertexPrimvarCount = 0;
+    size_t varyingPrimvarCount = 0;
+    size_t facevaryingPrimvarCount = 0;
+    if (curveType == HdTokens->cubic) {
+        const int vstep = (curveBasis == HdTokens->bezier) ? 3 : 1;
+        for (const int &nvertices: curveVertexCounts) {
+            const int nsegs = (curveWrap == HdTokens->periodic) ? 
+                nvertices / vstep : (nvertices - 4) / vstep + 1;
+            varyingPrimvarCount += nsegs + nowrap;
+            vertexPrimvarCount += nvertices;
+            facevaryingPrimvarCount += nsegs + nowrap;
+        }
+    } else if (curveType == HdTokens->linear) {
+        for (const int &nvertices: curveVertexCounts) {
+            varyingPrimvarCount += nvertices;
+            vertexPrimvarCount += nvertices;
+            facevaryingPrimvarCount += nvertices;
+        }
+    } else {
+        TF_CODING_ERROR("Unknown curveType %s\n", curveType.GetText());
+    }
+
+    RtPrimVarList primvars(
+         numCurves, /* uniform */
+         vertexPrimvarCount, /* vertex */
+         varyingPrimvarCount, /* varying */
+         facevaryingPrimvarCount /* facevarying */);
+
+    if (curveType == HdTokens->cubic) {
+        primvars.SetString(RixStr.k_Ri_type, RixStr.k_cubic);
+        if (curveBasis == HdTokens->cubic) {
+            primvars.SetString(RixStr.k_Ri_Basis, RixStr.k_cubic);
+        } else if (curveBasis == HdTokens->bSpline) {
+            primvars.SetString(RixStr.k_Ri_Basis, RixStr.k_bspline);
+        } else if (curveBasis == HdTokens->bezier) {
+            primvars.SetString(RixStr.k_Ri_Basis, RixStr.k_bezier);
+        } else if (curveBasis == HdTokens->catmullRom) {
+            primvars.SetString(RixStr.k_Ri_Basis, RixStr.k_catmullrom);
+        } else {
+            TF_CODING_ERROR("Unknown curveBasis %s\n", curveBasis.GetText());
+        }
+    } else if (curveType == HdTokens->linear) {
+        primvars.SetString(RixStr.k_Ri_type, RixStr.k_linear);
+    } else {
+        TF_CODING_ERROR("Unknown curveType %s\n", curveType.GetText());
+    }
+    if (curveWrap == HdTokens->periodic) {
+        primvars.SetString(RixStr.k_Ri_wrap, RixStr.k_periodic);
+    } else {
+        primvars.SetString(RixStr.k_Ri_wrap, RixStr.k_nonperiodic);
+    }
+
+    // Index data
+    int const *nverticesData = (int const *)(&curveVertexCounts[0]);
+    primvars.SetIntegerDetail(RixStr.k_Ri_nvertices, nverticesData,
+                               RtDetailType::k_uniform);
+
+    // Points
+    HdPrman_ConvertPointsPrimvar(
+        sceneDelegate,
+        id,
+        renderParam->GetShutterInterval(),
+        primvars,
+        vertexPrimvarCount);
+
+    // Set element ID.  Overloaded use of "__faceIndex" to support picking...
+    std::vector<int32_t> elementId(numCurves);
+    std::iota(elementId.begin(), elementId.end(), 0);
+    primvars.SetIntegerDetail(RixStr.k_faceindex, elementId.data(),
+                               RtDetailType::k_uniform);
+
+    HdPrman_ConvertPrimvars(
+        sceneDelegate, id, primvars, numCurves, vertexPrimvarCount,
+        varyingPrimvarCount, facevaryingPrimvarCount);
+
+    return primvars;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/basisCurves.h b/third_party/renderman-26/plugin/hdPrman/basisCurves.h
new file mode 100644
index 0000000000..25f8702bb0
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/basisCurves.h
@@ -0,0 +1,39 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_BASIS_CURVES_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_BASIS_CURVES_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/gprim.h"
+#include "pxr/imaging/hd/basisCurves.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_BasisCurves final : public HdPrman_Gprim<HdBasisCurves>
+{
+public:
+    using BASE = HdPrman_Gprim<HdBasisCurves>;
+
+    HF_MALLOC_TAG_NEW("new HdPrman_BasisCurves");
+
+    HdPrman_BasisCurves(SdfPath const& id);
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+protected:
+    RtPrimVarList
+    _ConvertGeometry(HdPrman_RenderParam *renderParam,
+                     HdSceneDelegate *sceneDelegate,
+                     const SdfPath &id,
+                     RtUString *primType,
+                     std::vector<HdGeomSubset> *geomSubsets) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_BASIS_CURVES_H
diff --git a/third_party/renderman-26/plugin/hdPrman/camera.cpp b/third_party/renderman-26/plugin/hdPrman/camera.cpp
new file mode 100644
index 0000000000..7ce89f71db
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/camera.cpp
@@ -0,0 +1,187 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/camera.h"
+#include "hdPrman/cameraContext.h"
+
+#include "pxr/imaging/hd/sceneDelegate.h"
+
+#include <cmath>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#if HD_API_VERSION < 52
+TF_DEFINE_PRIVATE_TOKENS(
+    _lensDistortionTokens,
+    ((k1,     "lensDistortion:k1"))
+    ((k2,     "lensDistortion:k2"))
+    ((center, "lensDistortion:center"))
+    ((anaSq,  "lensDistortion:anaSq"))
+    ((asym,   "lensDistortion:asym"))
+    ((scale,  "lensDistortion:scale"))
+);
+#endif
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((shutterOpenTime,   "ri:shutterOpenTime"))
+    ((shutterCloseTime,  "ri:shutterCloseTime"))
+    ((shutteropening,    "ri:shutteropening"))
+    ((apertureAngle,     "ri:apertureAngle"))
+    ((apertureDensity,   "ri:apertureDensity"))
+    ((apertureNSides,    "ri:apertureNSides"))
+    ((apertureRoundness, "ri:apertureRoundness"))
+);
+
+static
+std::optional<std::array<float, 8>>
+_ToOptionalFloat8(const VtValue &value)
+{
+    if (!value.IsHolding<VtArray<float>>()) {
+        return std::nullopt;
+    }
+    const VtArray<float> array = value.UncheckedGet<VtArray<float>>();
+    if (array.size() != 8) {
+        return std::nullopt;
+    }
+    std::array<float, 8> result;
+    for (size_t i = 0; i < 8; i++) {
+        result[i] = array[i];
+    }
+    return result;
+}
+
+HdPrmanCamera::HdPrmanCamera(SdfPath const& id)
+  : HdCamera(id)
+#if HD_API_VERSION < 52
+  , _lensDistortionK1(0.0f)
+  , _lensDistortionK2(0.0f)
+  , _lensDistortionCenter(0.0f)
+  , _lensDistortionAnaSq(1.0f)
+  , _lensDistortionAsym(0.0f)
+  , _lensDistortionScale(1.0f)
+#endif
+  , _apertureAngle(0.0f)
+  , _apertureDensity(0.0f)
+  , _apertureNSides(0)
+  , _apertureRoundness(1.0f)
+{
+}
+
+HdPrmanCamera::~HdPrmanCamera() = default;
+
+/* virtual */
+void
+HdPrmanCamera::Sync(HdSceneDelegate *sceneDelegate,
+                    HdRenderParam   *renderParam,
+                    HdDirtyBits     *dirtyBits)
+{  
+    HD_TRACE_FUNCTION();
+    HF_MALLOC_TAG_FUNCTION();
+
+    if (!TF_VERIFY(sceneDelegate)) {
+        return;
+    }
+
+    HdPrman_RenderParam * const param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+
+    SdfPath const &id = GetId();
+    // Save state of dirtyBits before HdCamera::Sync clears them.
+    const HdDirtyBits bits = *dirtyBits;
+
+    if (bits & DirtyTransform) {
+        sceneDelegate->SampleTransform(id, &_sampleXforms);
+    }
+
+    if (bits & AllDirty) {
+        param->GetCameraContext().MarkCameraInvalid(id);
+    }
+
+    HdCamera::Sync(sceneDelegate, renderParam, dirtyBits);
+
+    if (bits & DirtyParams) {
+#if HD_API_VERSION < 52
+        _lensDistortionK1 =
+            sceneDelegate
+                ->GetCameraParamValue(id, _lensDistortionTokens->k1)
+                .GetWithDefault<float>(0.0f);
+        _lensDistortionK2 =
+            sceneDelegate
+                ->GetCameraParamValue(id, _lensDistortionTokens->k2)
+                .GetWithDefault<float>(0.0f);
+        _lensDistortionCenter =
+            sceneDelegate
+                ->GetCameraParamValue(id, _lensDistortionTokens->center)
+                .GetWithDefault<GfVec2f>(GfVec2f(0.0f));
+        _lensDistortionAnaSq =
+            sceneDelegate
+                ->GetCameraParamValue(id, _lensDistortionTokens->anaSq)
+                .GetWithDefault<float>(1.0f);
+        _lensDistortionAsym =
+            sceneDelegate
+                ->GetCameraParamValue(id, _lensDistortionTokens->asym)
+                .GetWithDefault<GfVec2f>(GfVec2f(0.0f));
+        _lensDistortionScale =
+            sceneDelegate
+                ->GetCameraParamValue(id, _lensDistortionTokens->scale)
+                .GetWithDefault<float>(1.0f);
+#endif
+
+        const VtValue vShutterOpenTime =
+            sceneDelegate->GetCameraParamValue(id, _tokens->shutterOpenTime);
+        if (vShutterOpenTime.IsHolding<float>()) {
+            _shutterCurve.shutterOpenTime =
+                vShutterOpenTime.UncheckedGet<float>();
+        } else {
+            _shutterCurve.shutterOpenTime = std::nullopt;
+        }
+        const VtValue vShutterCloseTime =
+            sceneDelegate->GetCameraParamValue(id, _tokens->shutterCloseTime);
+        if (vShutterCloseTime.IsHolding<float>()) {
+            _shutterCurve.shutterCloseTime =
+                vShutterCloseTime.UncheckedGet<float>();
+        } else {
+            _shutterCurve.shutterCloseTime = std::nullopt;
+        }
+        const VtValue vShutteropening =
+            sceneDelegate->GetCameraParamValue(id, _tokens->shutteropening);
+        _shutterCurve.shutteropening = _ToOptionalFloat8(vShutteropening);
+
+        _apertureAngle =
+            sceneDelegate->GetCameraParamValue(id, _tokens->apertureAngle)
+                         .GetWithDefault<float>(0.0f);
+        _apertureDensity =
+            sceneDelegate->GetCameraParamValue(id, _tokens->apertureDensity)
+                         .GetWithDefault<float>(0.0f);
+        _apertureNSides =
+            sceneDelegate->GetCameraParamValue(id, _tokens->apertureNSides)
+                         .GetWithDefault<int>(0);
+        _apertureRoundness =
+            sceneDelegate->GetCameraParamValue(id, _tokens->apertureRoundness)
+                         .GetWithDefault<float>(1.0f);
+
+        if (id == param->GetCameraContext().GetCameraPath()) {
+            // Motion blur in Riley only works correctly if the
+            // shutter interval is set before any rprims are synced
+            // (and the transform of the riley camera is updated).
+            //
+            // See SetRileyShutterIntervalFromCameraContextCameraPath
+            // for additional context.
+            //
+            param->SetRileyShutterIntervalFromCameraContextCameraPath(
+                &sceneDelegate->GetRenderIndex());
+        }
+    }
+
+    // XXX: Should we flip the proj matrix (RHS vs LHS) as well here?
+
+    // We don't need to clear the dirty bits since HdCamera::Sync always clears
+    // all the dirty bits.
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
diff --git a/third_party/renderman-26/plugin/hdPrman/camera.h b/third_party/renderman-26/plugin/hdPrman/camera.h
new file mode 100644
index 0000000000..dee7304338
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/camera.h
@@ -0,0 +1,176 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/renderParam.h"
+#include "pxr/imaging/hd/camera.h"
+#include "pxr/imaging/hd/timeSampleArray.h"
+
+#include "pxr/base/vt/array.h"
+
+#include <optional>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdSceneDelegate;
+
+/// \class HdPrmanCamera
+///
+/// A representation for cameras that pulls on camera parameters used by Riley
+/// cameras.
+/// Note: We do not create a Riley camera per HdCamera because in PRman 22,
+/// it'd require a render target to be created and bound (per camera), which
+/// would be prohibitively expensive in Prman 22.
+///
+class HdPrmanCamera final : public HdCamera
+{
+public:
+    /// See GetShutterCurve() below for a description of what these
+    /// values represent.
+    ///
+    struct ShutterCurve
+    {
+        std::optional<float> shutterOpenTime;
+        std::optional<float> shutterCloseTime;
+        std::optional<std::array<float, 8>> shutteropening;
+    };
+
+    HDPRMAN_API
+    HdPrmanCamera(SdfPath const& id);
+
+    HDPRMAN_API
+    ~HdPrmanCamera() override;
+
+    /// Synchronizes state from the delegate to this object.
+    HDPRMAN_API
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam   *renderParam,
+              HdDirtyBits     *dirtyBits) override;
+    
+    /// Returns the time sampled xforms that were queried during Sync.
+    HDPRMAN_API
+    HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> const&
+    GetTimeSampleXforms() const {
+        return _sampleXforms;
+    }
+
+#if HD_API_VERSION < 52
+    float GetLensDistortionK1() const {
+        return _lensDistortionK1;
+    }
+
+    float GetLensDistortionK2() const {
+        return _lensDistortionK2;
+    }
+
+    const GfVec2f &GetLensDistortionCenter() const {
+        return _lensDistortionCenter;
+    }
+
+    float GetLensDistortionAnaSq() const {
+        return _lensDistortionAnaSq;
+    }
+
+    const GfVec2f &GetLensDistortionAsym() const {
+        return _lensDistortionAsym;
+    }
+
+    float GetLensDistortionScale() const {
+        return _lensDistortionScale;
+    }
+#endif
+
+    /// Get the shutter curve of the camera. This curve determines the
+    /// transparency of the shutter as a function of (normalized)
+    /// time.
+    ///
+    /// Note that the times returned here are relative to the shutter
+    /// interval.
+    ///
+    /// Some more explanation:
+    ///
+    /// The values given here are passed to the Riley camera as options
+    /// RixStr.k_shutterOpenTime, k_shutterCloseTime and k_shutteropening.
+    ///
+    /// (where as the shutter interval is set through the global Riley options
+    /// using Ri:Shutter).
+    ///
+    /// RenderMan computes the shutter curve using constant pieces and
+    /// cubic Bezier interpolation between the following points
+    /// 
+    /// (0, 0), (t1, y1), (t2,y2), (t3, 1), (t4, 1), (t5, y5), (t6, y6), (1, 0)
+    ///
+    /// which are encoded as:
+    ///    t3 is the shutterOpenTime
+    ///    t4 is the shutterCloseTime
+    ///    [t1, y1, t2, y2, t5, y5, t6, y6] is the shutteropening array.
+    ///
+    /// \note The shutter:open and shutter:close attributes of UsdGeomCamera
+    ///       represent the (frame-relative) time the shutter *begins to open*
+    ///       and is *fully closed* respectively.
+    ///
+    ///       The Riley shutterOpenTime and shutterCloseTime represent the
+    ///       (riley shutter-interval relative)  time the shutter is *fully
+    ///       open* and *begins to close* respectively.
+    ///
+    const ShutterCurve& GetShutterCurve() const {
+        return _shutterCurve;
+    }
+
+    float GetApertureAngle() const {
+        return _apertureAngle;
+    }
+
+    float GetApertureDensity() const {
+        return _apertureAngle;
+    }
+
+    float GetApertureNSides() const {
+        return _apertureNSides;
+    }
+
+    float GetApertureRoundness() const {
+        return _apertureRoundness;
+    }
+
+private:
+    HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> _sampleXforms;
+
+#if HD_API_VERSION < 52
+    float _lensDistortionK1;
+    float _lensDistortionK2;
+    GfVec2f _lensDistortionCenter;
+    float _lensDistortionAnaSq;
+    GfVec2f _lensDistortionAsym;
+    float _lensDistortionScale;
+#endif
+
+    /// RenderMan computes the shutter curve using constant pieces and
+    /// cubic Bezier interpolation between the following points
+    /// 
+    /// (0, 0), (t1, y1), (t2,y2), (t3, 1), (t4, 1), (t5, y5), (t6, y6), (1, 0)
+    ///
+    /// which are encoded as:
+    ///    t3 is the shutterOpenTime
+    ///    t4 is the shutterCloseTime
+    ///    [t1, y1, t2, y2, t5, y5, t6, y6] is shutteropeningPoints array.
+    ///
+    ShutterCurve _shutterCurve;
+
+    float _apertureAngle;
+    float _apertureDensity;
+    int _apertureNSides;
+    float _apertureRoundness;
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_H
diff --git a/third_party/renderman-26/plugin/hdPrman/cameraContext.cpp b/third_party/renderman-26/plugin/hdPrman/cameraContext.cpp
new file mode 100644
index 0000000000..8ea28e1a10
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/cameraContext.cpp
@@ -0,0 +1,833 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/cameraContext.h"
+
+#include "hdPrman/camera.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/utils.h"
+
+#include "Riley.h"
+#include "RixShadingUtils.h"
+
+#include "pxr/base/gf/math.h"
+#include "pxr/base/tf/envSetting.h"
+
+#include <cmath>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+static const RtUString s_projectionNodeName("cam_projection");
+
+HdPrman_CameraContext::HdPrman_CameraContext()
+  : _policy(CameraUtilFit)
+  , _disableDepthOfField(false)
+  , _invalid(false)
+{
+}
+
+void
+HdPrman_CameraContext::MarkCameraInvalid(const SdfPath &path)
+{
+    // No need to invalidate if camera that is not the active camera
+    // changed.
+    if (path == _cameraPath) {
+        _invalid = true;
+    }
+}
+
+void
+HdPrman_CameraContext::SetCameraPath(const SdfPath &path)
+{
+    if (_cameraPath != path) {
+        _invalid = true;
+        _cameraPath = path;
+    }
+}
+
+void
+HdPrman_CameraContext::SetFraming(const CameraUtilFraming &framing)
+{
+    if (_framing != framing) {
+        _framing = framing;
+        _invalid = true;
+    }
+}
+
+void
+HdPrman_CameraContext::SetWindowPolicy(
+    const CameraUtilConformWindowPolicy policy)
+{
+    if (_policy != policy) {
+        _policy = policy;
+        _invalid = true;
+    }
+}
+
+void
+HdPrman_CameraContext::SetDisableDepthOfField(bool disableDepthOfField)
+{
+    if (_disableDepthOfField != disableDepthOfField) {
+        _disableDepthOfField = disableDepthOfField;
+        _invalid = true;
+    }
+}
+
+bool
+HdPrman_CameraContext::IsInvalid() const
+{
+    return _invalid;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Screen window space: imagine a plane at in front of the camera (and parallel
+// to the camera) with coordinates such that the square [-1,1]^2 spans a pyramid
+// with angle being the (horizontal) FOV. This is the screen window space and is
+// used to parametrize the rays from the camera.
+//
+// Image space: coordinates of the pixels in the rendered image with the top
+// left pixel having coordinate (0,0), i.e., y-down.
+// The display window from the camera framing is in image space as well
+// as the width and height of the render buffer.
+//
+// We want to map the screen window space to the image space such that the
+// conformed camera frustum from the scene delegate maps to the display window
+// of the CameraUtilFraming. This is achieved by the following code.
+//
+// Compute screen window for given camera.
+//
+static
+GfRange2d
+_GetScreenWindow(const HdCamera * const cam)
+{
+    const GfVec2d size(
+        cam->GetHorizontalAperture(),       cam->GetVerticalAperture());
+    const GfVec2d offset(
+        cam->GetHorizontalApertureOffset(), cam->GetVerticalApertureOffset());
+        
+    const GfRange2d filmbackPlane(-0.5 * size + offset, +0.5 * size + offset);
+
+    if (cam->GetProjection() == HdCamera::Orthographic) {
+        return filmbackPlane;
+    }
+
+    if (cam->GetFocalLength() == 0.0f || cam->GetHorizontalAperture() == 0.0f) {
+        return filmbackPlane;
+    }
+
+    // Note that for perspective projection and with no horizontal aperture,
+    // our screen widndow's x-coordinate are in [-1, 1].
+    // Divide by appropriate factor to get to this.
+    return filmbackPlane / double(0.5 * cam->GetHorizontalAperture());
+}
+
+// Compute the screen window we need to give to RenderMan. This screen
+// window is mapped to the entire render buffer (in image space) by
+// RenderMan.
+//
+// The input is the screenWindowForDisplayWindow: the screen window
+// corresponding to the camera from the scene delegate conformed to match
+// the aspect ratio of the display window.
+//
+// Together with the displayWindow, this input establishes how screen
+// window space is mapped to image space. We know need to take the
+// render buffer rect in image space and convert it to screen window
+// space.
+// 
+static
+GfRange2d
+_ConvertScreenWindowForDisplayWindowToRenderBuffer(
+    const GfRange2d &screenWindowForDisplayWindow,
+    const GfRange2f &displayWindow,
+    const GfVec2i &renderBufferSize)
+{
+    // Scaling factors to go from image space to screen window space.
+    const double screenWindowWidthPerPixel =
+        screenWindowForDisplayWindow.GetSize()[0] /
+        displayWindow.GetSize()[0];
+        
+    const double screenWindowHeightPerPixel =
+        screenWindowForDisplayWindow.GetSize()[1] /
+        displayWindow.GetSize()[1];
+
+    // Assuming an affine mapping between screen window space
+    // and image space, compute what (0,0) corresponds to in
+    // screen window space.
+    const GfVec2d screenWindowMin(
+        screenWindowForDisplayWindow.GetMin()[0]
+        - screenWindowWidthPerPixel * displayWindow.GetMin()[0],
+        // Note that image space is y-Down and screen window
+        // space is y-Up, so this is a bit tricky...
+        screenWindowForDisplayWindow.GetMax()[1]
+        + screenWindowHeightPerPixel * (
+            displayWindow.GetMin()[1] - renderBufferSize[1]));
+        
+    const GfVec2d screenWindowSize(
+        screenWindowWidthPerPixel * renderBufferSize[0],
+        screenWindowHeightPerPixel * renderBufferSize[1]);
+    
+    return GfRange2d(screenWindowMin, screenWindowMin + screenWindowSize);
+}
+
+static
+double
+_SafeDiv(const double a, const double b)
+{
+    if (b == 0) {
+        TF_CODING_ERROR(
+            "Invalid display window in render pass state for hdPrman");
+        return 1.0;
+    }
+    return a / b;
+}
+
+// Compute the aspect ratio of the display window taking the
+// pixel aspect ratio into account.
+static
+double
+_GetDisplayWindowAspect(const CameraUtilFraming &framing)
+{
+    const GfVec2f &size = framing.displayWindow.GetSize();
+    return framing.pixelAspectRatio * _SafeDiv(size[0], size[1]);
+}
+
+// Convert a window into the format expected by RenderMan
+// (xmin, xmax, ymin, ymax).
+static
+GfVec4f
+_ToVec4f(const GfRange2d &window)
+{
+    return { float(window.GetMin()[0]), float(window.GetMax()[0]),
+             float(window.GetMin()[1]), float(window.GetMax()[1]) };
+}
+
+// Get respective projection shader name for projection.
+static
+const RtUString&
+_ComputeProjectionShader(const HdCamera::Projection projection)
+{
+    static const RtUString us_PxrCamera("PxrCamera");
+    static const RtUString us_PxrOrthographic("PxrOrthographic");
+
+    switch (projection) {
+    case HdCamera::Perspective:
+        return us_PxrCamera;
+    case HdCamera::Orthographic:
+        return us_PxrOrthographic;
+    }
+
+    // Make compiler happy.
+    return us_PxrCamera;
+}
+
+// Compute parameters for the camera riley::ShadingNode for perspective camera
+RtParamList
+_ComputePerspectiveNodeParams(
+    const HdPrmanCamera * const camera, bool disableDepthOfField)
+{
+    RtParamList result;
+
+    static const RtUString us_lensType("lensType");
+    // lensType values in PxrProjection.
+    constexpr int lensTypeLensWarp = 2;
+
+    // Pick a PxrProjection lens type that supports depth of field
+    // and lens distortion.
+    result.SetInteger(us_lensType, lensTypeLensWarp);
+
+    // FOV settings.
+    const float focalLength = camera->GetFocalLength();
+    if (focalLength > 0) {
+        result.SetFloat(RixStr.k_focalLength, focalLength);
+        const float r = camera->GetHorizontalAperture() / focalLength;
+        const float fov = 2.0f * GfRadiansToDegrees(std::atan(0.5f * r));
+        result.SetFloat(RixStr.k_fov, fov);
+    } else {
+        // If focal length is bogus, don't set it.
+        // Fallback to sane FOV.
+        result.SetFloat(RixStr.k_fov, 90.0f);
+    }
+
+    // Depth of field settings.
+    const float focusDistance = camera->GetFocusDistance();
+    if (focusDistance > 0.0f) {
+        result.SetFloat(RixStr.k_focalDistance, focusDistance);
+    } else {
+        // If value is bogus, set to sane value.
+        result.SetFloat(RixStr.k_focalDistance, 1000.0f);
+    }
+
+    const float fStop = camera->GetFStop();
+    if (disableDepthOfField || fStop <= 0.0f || focusDistance <= 0.0f) {
+        // If depth of field is disabled or the values are bogus, 
+        // disable depth of field by setting f-Stop to infinity, 
+        // and a sane value for focalDistance. 
+        result.SetFloat(RixStr.k_fStop, RI_INFINITY);
+    } else {
+        result.SetFloat(RixStr.k_fStop, fStop);
+    }
+
+    // Not setting fov frame begin/end - thus we do not support motion blur
+    // due to changing FOV.
+
+    // Some of these names might need to change when switching to PxrCamera.
+    static const RtUString us_radial1("radial1");
+    static const RtUString us_radial2("radial2");
+    static const RtUString us_distortionCtr("distortionCtr");
+    static const RtUString us_lensSqueeze("lensSqueeze");
+    static const RtUString us_lensAsymmetryX("lensAsymmetryX");
+    static const RtUString us_lensAsymmetryY("lensAsymmetryY");
+    static const RtUString us_lensScale("lensScale");
+
+    result.SetFloat(
+        us_radial1,
+        camera->GetLensDistortionK1());
+    result.SetFloat(
+        us_radial2,
+        camera->GetLensDistortionK2());
+    result.SetFloatArray(
+        us_distortionCtr,
+        camera->GetLensDistortionCenter().data(),
+        2);
+    result.SetFloat(
+        us_lensSqueeze,
+        camera->GetLensDistortionAnaSq());
+    result.SetFloat(
+        us_lensAsymmetryX,
+        camera->GetLensDistortionAsym()[0]);
+    result.SetFloat(
+        us_lensAsymmetryY,
+        camera->GetLensDistortionAsym()[1]);
+    result.SetFloat(
+        us_lensScale,
+        camera->GetLensDistortionScale());
+
+    return result;
+}
+
+// Compute parameters for the camera riley::ShadingNode for orthographic camera
+RtParamList
+_ComputeOrthographicNodeParams(const HdPrmanCamera * const camera)
+{
+    return {};
+}
+
+// Compute parameters for the camera riley::ShadingNode
+static
+RtParamList
+_ComputeNodeParams(const HdPrmanCamera * const camera, bool disableDepthOfField)
+{
+    switch(camera->GetProjection()) {
+    case HdCamera::Perspective:
+        return _ComputePerspectiveNodeParams(camera, disableDepthOfField);
+    case HdCamera::Orthographic:
+        return _ComputeOrthographicNodeParams(camera);
+    }
+
+    // Make compiler happy
+    return _ComputePerspectiveNodeParams(camera, disableDepthOfField);
+}
+
+// Compute params given to Riley::ModifyCamera
+RtParamList
+HdPrman_CameraContext::_ComputeCameraParams(
+    const GfRange2d &screenWindow,
+    const HdCamera * const camera) const
+{
+    RtParamList result;
+
+    // Following parameters are currently set on the Riley camera:
+    // 'nearClip' (float): near clipping distance
+    // 'farClip' (float): near clipping distance
+    // 'shutterOpenTime' (float): beginning of normalized shutter interval
+    // 'shutterCloseTime' (float): end of normalized shutter interval
+
+    // Parameters that are not handled (and use their defaults):
+    // 'focusregion' (float):
+    // 'dofaspect' (float): dof aspect ratio
+    // 'apertureNSides' (int):
+    // 'apertureAngle' (float):
+    // 'apertureRoundness' (float):
+    // 'apertureDensity' (float):
+
+    // Parameter that is handled during Riley camera creation:
+    // Rix::k_shutteropening (float[8] [c1 c2 d1 d2 e1 e2 f1 f2): additional
+    // control points
+
+    // Do not use clipping range if scene delegate did not provide one.
+    // Note that we do a sanity check slightly stronger than
+    // GfRange1f::IsEmpty() in that we do not allow the range to contain
+    // only exactly one point.
+    const GfRange1f &clippingRange = camera->GetClippingRange();
+    if (clippingRange.GetMin() < clippingRange.GetMax()) {
+        result.SetFloat(RixStr.k_nearClip, clippingRange.GetMin());
+        result.SetFloat(RixStr.k_farClip, clippingRange.GetMax());
+    }
+
+    const HdPrmanCamera * const hdPrmanCamera =
+        dynamic_cast<const HdPrmanCamera * const>(camera);
+    const HdPrmanCamera::ShutterCurve &shutterCurve
+        = hdPrmanCamera->GetShutterCurve();
+
+    if (shutterCurve.shutterOpenTime) {
+        result.SetFloat(
+            RixStr.k_shutterOpenTime, *shutterCurve.shutterOpenTime);
+    }
+    if (shutterCurve.shutterCloseTime) {
+        result.SetFloat(
+            RixStr.k_shutterCloseTime, *shutterCurve.shutterCloseTime);
+    }
+    if (shutterCurve.shutteropening) {
+        result.SetFloatArray(
+            RixStr.k_shutteropening,
+            shutterCurve.shutteropening->data(),
+            shutterCurve.shutteropening->size());
+    }
+
+    result.SetFloat(RixStr.k_apertureAngle,
+                    hdPrmanCamera->GetApertureAngle());
+    result.SetFloat(RixStr.k_apertureDensity,
+                    hdPrmanCamera->GetApertureDensity());
+    result.SetInteger(RixStr.k_apertureNSides,
+                      hdPrmanCamera->GetApertureNSides());
+    result.SetFloat(RixStr.k_apertureRoundness,
+                    hdPrmanCamera->GetApertureRoundness());
+                    
+
+    const GfVec4f s = _ToVec4f(screenWindow);
+    result.SetFloatArray(RixStr.k_Ri_ScreenWindow, s.data(), 4);
+
+    return result;
+}
+
+// Convert Hydra time sampled matrices to renderman matrices.
+// Optionally flip z-direction.
+static
+TfSmallVector<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES>
+_ToRtMatrices(
+    const HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> &samples,
+    const bool flipZ = false)
+{
+    using _RtMatrices = TfSmallVector<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES>;
+    _RtMatrices matrices(samples.count);
+
+    static const GfMatrix4d flipZMatrix(GfVec4d(1.0, 1.0, -1.0, 1.0));
+    
+    for (size_t i = 0; i < samples.count; ++i) {
+        matrices[i] = HdPrman_Utils::GfMatrixToRtMatrix(
+            flipZ
+                ? flipZMatrix * samples.values[i]
+                : samples.values[i]);
+    }
+
+    return matrices;
+}
+
+GfRange2d
+HdPrman_CameraContext::_ComputeConformedScreenWindow(
+    const HdCamera * const camera) const
+{
+    return
+        CameraUtilConformedWindow(
+            _GetScreenWindow(camera),
+            _policy,
+            _GetDisplayWindowAspect(_framing));
+}
+
+void
+HdPrman_CameraContext::UpdateRileyCameraAndClipPlanes(
+    riley::Riley * const riley,
+    const HdRenderIndex * const renderIndex)
+{
+    const HdPrmanCamera * const camera =
+        GetCamera(renderIndex);
+    if (!camera) {
+        // Bail if no camera.
+        return;
+    }
+
+    const GfRange2d conformedScreenWindow =
+        _ComputeConformedScreenWindow(camera);
+
+    _UpdateRileyCamera(
+        riley,
+        conformedScreenWindow,
+        camera);
+    _UpdateClipPlanes(
+        riley,
+        camera);
+}
+
+void
+HdPrman_CameraContext::UpdateRileyCameraAndClipPlanesInteractive(
+    riley::Riley * const riley,
+    const HdRenderIndex * const renderIndex,
+    const GfVec2i &renderBufferSize)
+{
+    const HdPrmanCamera * const camera =
+        GetCamera(renderIndex);
+    if (!camera) {
+        // Bail if no camera.
+        return;
+    }
+
+    // The screen window we would need to use if we were targeting
+    // the display window.
+    const GfRange2d conformedScreenWindow =
+        _ComputeConformedScreenWindow(camera);
+
+    // But instead, we target the rect of pixels in the render
+    // buffer baking the AOVs, so we need to convert the
+    // screen window.
+    _UpdateRileyCamera(
+        riley,
+        _ConvertScreenWindowForDisplayWindowToRenderBuffer(
+            conformedScreenWindow,
+            _framing.displayWindow,
+            renderBufferSize),
+        camera);
+    _UpdateClipPlanes(
+        riley,
+        camera);
+}
+
+void
+HdPrman_CameraContext::_UpdateRileyCamera(
+    riley::Riley * const riley,
+    const GfRange2d &screenWindow,
+    const HdPrmanCamera * const camera)
+{
+    // The riley camera should have been created before we get here.
+    if (!TF_VERIFY(_cameraId != riley::CameraId::InvalidId())) {
+        return;
+    }
+
+    const riley::ShadingNode node = riley::ShadingNode {
+        riley::ShadingNode::Type::k_Projection,
+        _ComputeProjectionShader(camera->GetProjection()),
+        s_projectionNodeName,
+        _ComputeNodeParams(camera, _disableDepthOfField)
+    };
+
+    const RtParamList params = _ComputeCameraParams(screenWindow, camera);
+
+    // Coordinate system notes.
+    //
+    // # Hydra & USD are right-handed
+    // - Camera space is always Y-up, looking along -Z.
+    // - World space may be either Y-up or Z-up, based on stage metadata.
+    // - Individual prims may be marked to be left-handed, which
+    //   does not affect spatial coordinates, it only flips the
+    //   winding order of polygons.
+    //
+    // # Prman is left-handed
+    // - World is Y-up
+    // - Camera looks along +Z.
+
+    using _HdTimeSamples =
+        HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES>;
+    using _RtMatrices =
+        TfSmallVector<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES>;    
+
+    // Use time sampled transforms authored on the scene camera.
+    const _HdTimeSamples &sampleXforms = camera->GetTimeSampleXforms();
+
+    // Riley camera xform is "move the camera", aka viewToWorld.
+    // Convert right-handed Y-up camera space (USD, Hydra) to
+    // left-handed Y-up (Prman) coordinates.  This just amounts to
+    // flipping the Z axis.
+    const _RtMatrices rtMatrices =
+        _ToRtMatrices(sampleXforms, /* flipZ = */ true);
+
+    const riley::Transform transform{
+        unsigned(sampleXforms.count),
+        rtMatrices.data(),
+        sampleXforms.times.data() };
+
+    // Commit camera.
+    riley->ModifyCamera(
+        _cameraId, 
+        &node,
+        &transform,
+        &params);
+}
+
+// Hydra expresses clipping planes as a plane equation
+// in the camera object space.
+// Riley API expresses clipping planes in terms of a
+// time-sampled transform, a normal, and a point.
+static
+bool
+_ToClipPlaneParams(const GfVec4d &plane, RtParamList * const params)
+{
+    static const RtUString us_planeNormal("planeNormal");
+    static const RtUString us_planeOrigin("planeOrigin");
+    
+    const GfVec3f direction(plane[0], plane[1], plane[2]);
+    const float directionLength = direction.GetLength();
+    if (directionLength == 0.0f) {
+        return false;
+    }
+    // Riley API expects a unit-length normal.
+    const GfVec3f norm = direction / directionLength;
+    params->SetNormal(us_planeNormal,
+                      RtNormal3(norm[0], norm[1], norm[2]));
+    // Determine the distance along the normal
+    // to the plane.
+    const float distance = -plane[3] / directionLength;
+    // The origin can be any point on the plane.
+    const RtPoint3 origin(norm[0] * distance,
+                          norm[1] * distance,
+                          norm[2] * distance);
+    params->SetPoint(us_planeOrigin, origin);
+
+    return true;
+}
+
+void
+HdPrman_CameraContext::_UpdateClipPlanes(
+    riley::Riley * const riley,
+    const HdPrmanCamera * const camera)
+{
+    _DeleteClipPlanes(riley);
+
+    // Create clipping planes
+    const std::vector<GfVec4d> &clipPlanes = camera->GetClipPlanes();
+    if (clipPlanes.empty()) {
+        return;
+    }
+
+    using _HdTimeSamples =
+        HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES>;
+    using _RtMatrices =
+        TfSmallVector<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES>;
+
+    // Use time sampled transforms authored on the scene camera.
+    const _HdTimeSamples &sampleXforms = camera->GetTimeSampleXforms();
+    const _RtMatrices rtMatrices = _ToRtMatrices(sampleXforms);
+
+    const riley::Transform transform {
+        unsigned(sampleXforms.count),
+        rtMatrices.data(),
+        sampleXforms.times.data() };
+
+    for (const GfVec4d &plane: clipPlanes) {
+        RtParamList params;
+        if (_ToClipPlaneParams(plane, &params)) {
+            _clipPlaneIds.push_back(
+                riley->CreateClippingPlane(transform, params));
+        }
+    }
+}
+
+void
+HdPrman_CameraContext::_DeleteClipPlanes(
+    riley::Riley * const riley)
+{
+    for (riley::ClippingPlaneId const& id: _clipPlaneIds) {
+        riley->DeleteClippingPlane(id);
+    }
+    _clipPlaneIds.clear();
+}
+    
+// The crop window for RenderMan.
+//
+// Computed from data window and render buffer size.
+//
+// Recall from the RenderMan API:
+// Only the pixels within the crop window are rendered. Has no
+// affect on how pixels in the image map into the filmback plane.
+// The crop window is relative to the render buffer size, e.g.,
+// the crop window of (0,0,1,1) corresponds to the entire render
+// buffer. The coordinates of the crop window are y-down.
+// Format is (xmin, xmax, ymin, ymax).
+//
+// The limits for the integer locations corresponding to the above crop
+// window are:
+//
+//   rxmin = clamp(ceil( renderbufferwidth*xmin    ), 0, renderbufferwidth - 1)
+//   rxmax = clamp(ceil( renderbufferwidth*xmax - 1), 0, renderbufferwidth - 1)
+//   similar for y
+//
+static
+float
+_DivRoundDown(const float a, const int b)
+{
+    // Note that if the division (performed here)
+    //    float(a) / b
+    // rounds up, then the result (by RenderMan) of
+    //    ceil(b * (float(a) / b))
+    // might be a+1 instead of a.
+    //
+    // We add a slight negative bias to a to avoid this (we could also
+    // set the floating point rounding mode but: how to do this in a
+    // portable way - and on x86 switching the rounding is slow).
+
+    return GfClamp((a - 0.0078125f) / b, 0.0f, 1.0f);
+}
+
+// Compute how the dataWindow sets in a window with upper left corner
+// at camWindowMin and size camWindowSize.
+static
+GfVec4f
+_ComputeCropWindow(
+    const GfRect2i &dataWindow,
+    const GfVec2f &camWindowMin,
+    const GfVec2i &camWindowSize)
+{
+    return GfVec4f(
+        _DivRoundDown(dataWindow.GetMinX() - camWindowMin[0]       ,
+                      camWindowSize[0]),
+        _DivRoundDown(dataWindow.GetMaxX() - camWindowMin[0] + 1.0f,
+                      camWindowSize[0]),
+        _DivRoundDown(dataWindow.GetMinY() - camWindowMin[1]       ,
+                      camWindowSize[1]),
+        _DivRoundDown(dataWindow.GetMaxY() - camWindowMin[1] + 1.0f,
+                      camWindowSize[1]));
+}
+
+GfVec2i
+HdPrman_CameraContext::GetResolutionFromDisplayWindow() const
+{
+    const GfVec2f size = _framing.displayWindow.GetSize();
+
+    return GfVec2i(std::ceil(size[0]), std::ceil(size[1]));
+}
+
+void
+HdPrman_CameraContext::SetRileyOptions(
+    RtParamList * const options) const
+{
+    const GfVec2i res = GetResolutionFromDisplayWindow();
+
+    // Compute how the data window sits in the display window.
+    const GfVec4f cropWindow =
+        _ComputeCropWindow(
+            _framing.dataWindow,
+            _framing.displayWindow.GetMin(),
+            res);
+
+    options->SetFloatArray(
+        RixStr.k_Ri_CropWindow,
+        cropWindow.data(), 4);
+
+    options->SetIntegerArray(
+        RixStr.k_Ri_FormatResolution,
+        res.data(), 2);
+
+    options->SetFloat(
+        RixStr.k_Ri_FormatPixelAspectRatio,
+        _framing.pixelAspectRatio);
+}    
+
+void
+HdPrman_CameraContext::SetRileyOptionsInteractive(
+    RtParamList * const options,
+    const GfVec2i &renderBufferSize) const
+{
+    // Compute how the data window sits in the rect of the render
+    // buffer baking the AOVs.
+
+    const GfVec4f cropWindow =
+        _ComputeCropWindow(
+            _framing.dataWindow,
+            GfVec2f(0.0f),
+            renderBufferSize);
+
+    options->SetFloatArray(
+        RixStr.k_Ri_CropWindow,
+        cropWindow.data(), 4);
+    
+    options->SetFloat(
+        RixStr.k_Ri_FormatPixelAspectRatio,
+        _framing.pixelAspectRatio);
+}
+
+void
+HdPrman_CameraContext::MarkValid()
+{
+    _invalid = false;
+}
+
+void
+HdPrman_CameraContext::CreateRileyCamera(
+    riley::Riley * const riley,
+    const RtUString &cameraName)
+{
+    _cameraName = cameraName;
+
+    RtParamList nodeParams;
+    nodeParams.SetFloat(RixStr.k_fov, 60.0f);
+
+    // Projection
+    const riley::ShadingNode node = riley::ShadingNode {
+        riley::ShadingNode::Type::k_Projection,
+        _ComputeProjectionShader(HdCamera::Perspective),
+        s_projectionNodeName,
+        nodeParams
+    };
+
+    // Camera params
+    RtParamList params;
+
+    // Transform
+    float const zerotime[] = { 0.0f };
+    RtMatrix4x4 matrix[] = {RixConstants::k_IdentityMatrix};
+    matrix[0].Translate(0.f, 0.f, -10.0f);
+    const riley::Transform transform = { 1, matrix, zerotime };
+        
+    _cameraId = riley->CreateCamera(
+        riley::UserId(
+            stats::AddDataLocation(_cameraName.CStr()).GetValue()),
+        _cameraName,
+        node,
+        transform,
+        params);
+
+    // Dicing Camera
+    // XXX This should be moved out if/when we support multiple camera contexts.
+    riley->SetDefaultDicingCamera(_cameraId);
+}
+
+void
+HdPrman_CameraContext::DeleteRileyCameraAndClipPlanes(
+    riley::Riley * const riley)
+{
+    if (_cameraId != riley::CameraId::InvalidId()) {
+        riley->DeleteCamera(_cameraId);
+        _cameraId = riley::CameraId::InvalidId();
+    }
+
+    _DeleteClipPlanes(riley);
+}
+
+const HdPrmanCamera *
+HdPrman_CameraContext::GetCamera(
+    const HdRenderIndex * const renderIndex) const
+{
+    return
+        static_cast<const HdPrmanCamera*>(
+            renderIndex->GetSprim(
+                HdPrimTypeTokens->camera,
+                _cameraPath));
+}
+
+const CameraUtilFraming &
+HdPrman_CameraContext::GetFraming() const
+{
+    return _framing;
+}
+
+/* static */
+RtUString
+HdPrman_CameraContext::GetDefaultReferenceCameraName()
+{
+    const static RtUString name("main_cam");
+    return name;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/cameraContext.h b/third_party/renderman-26/plugin/hdPrman/cameraContext.h
new file mode 100644
index 0000000000..8517826f64
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/cameraContext.h
@@ -0,0 +1,156 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_CONTEXT_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_CONTEXT_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "pxr/usd/sdf/path.h"
+#include "pxr/imaging/cameraUtil/conformWindow.h"
+#include "pxr/imaging/cameraUtil/framing.h"
+
+#include "Riley.h"
+
+#include <atomic>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdRenderIndex;
+class HdCamera;
+class HdPrmanCamera;
+
+/// HdPrman_CameraContext holds all the data necessary to populate the
+/// riley camera and other camera-related riley options. It also keeps
+/// track whether the camera or camera-related settings such as the
+/// framing have changed so that updating riley is necessary.
+///
+class HdPrman_CameraContext final
+{
+public:
+    HdPrman_CameraContext();
+
+    /// Call when hydra changed the transform or parameters of a camera.
+    void MarkCameraInvalid(const SdfPath &path);
+
+    /// Set the active camera. If camera is the same as it used to be,
+    /// context is not marked invalid.
+    void SetCameraPath(const SdfPath &path);
+
+    /// Set the camera framing. Context is only marked invalid if framing
+    /// is different from what it used to be.
+    void SetFraming(const CameraUtilFraming &framing);
+    
+    /// Set window policy. Same comments as for SetFraming apply.
+    void SetWindowPolicy(CameraUtilConformWindowPolicy policy);
+
+    /// If true, some aspect of the camera or related state has changed
+    /// and the riley camera or options need to be updated.
+    bool IsInvalid() const;
+
+    /// Create riley camera (with default settings).
+    void CreateRileyCamera(
+        riley::Riley * riley,
+        const RtUString &cameraName);
+
+    void DeleteRileyCameraAndClipPlanes(riley::Riley * riley);
+
+    /// Get id of riley camera - valid only after Begin.
+    const riley::CameraId &GetCameraId() const { return _cameraId; }
+
+    /// Update the given riley options for offline rendering
+    /// to an image file.
+    ///
+    /// Sets the crop window, format resolution and pixel aspect ratio.
+    void SetRileyOptions(
+        RtParamList * options) const;
+
+    /// Update the given riley options for rendering to AOVs backed by
+    /// render buffers of the given size.
+    ///
+    /// Sets the crop window and pixel aspect ratio.
+    void SetRileyOptionsInteractive(
+        RtParamList * options,
+        const GfVec2i &renderBufferSize) const;
+
+    /// Update riley camera and clipping planes for offline rendering
+    /// to an image file.
+    void UpdateRileyCameraAndClipPlanes(
+        riley::Riley * riley,
+        const HdRenderIndex * renderIndex);
+
+    /// Update riley camera and clipping planes for rendering to AOVs
+    /// baked by render buffers of the given size.
+    void UpdateRileyCameraAndClipPlanesInteractive(
+        riley::Riley * riley,
+        const HdRenderIndex * renderIndex,
+        const GfVec2i &renderBufferSize);
+    
+    /// Mark that riley camera and options are up to date.
+    void MarkValid();
+
+    /// Get resolution for offline rendering.
+    GfVec2i GetResolutionFromDisplayWindow() const;
+
+    /// When depth of field is disabled the fstop is set to infinity.
+    void SetDisableDepthOfField(bool disableDepthOfField);
+
+    /// Path of current camera in render index.
+    const SdfPath &GetCameraPath() const { return _cameraPath; }
+
+    /// Camera name used when creating the riley camera object.
+    const RtUString& GetCameraName() const { return _cameraName; }
+
+    /// For convenience, get camera at camera path from render index.
+    const HdPrmanCamera * GetCamera(const HdRenderIndex *renderIndex) const;
+
+    /// Get the camera framing.
+    const CameraUtilFraming &GetFraming() const;
+
+    static RtUString GetDefaultReferenceCameraName();
+
+private:
+    /// Computes the screen window for the camera and conforms
+    /// it to have the display window's aspect ratio using the
+    /// current conform policy.
+    GfRange2d _ComputeConformedScreenWindow(const HdCamera * camera) const;
+
+    // Compute parameters for Riley::ModifyCamera
+    RtParamList _ComputeCameraParams(
+        const GfRange2d &screenWindow,
+        const HdCamera * camera) const;
+
+    void _UpdateRileyCamera(
+        riley::Riley * const riley,
+        const GfRange2d &screenWindow,
+        const HdPrmanCamera * camera);
+
+    void _UpdateClipPlanes(
+        riley::Riley * riley,
+        const HdPrmanCamera * camera);
+
+    void _DeleteClipPlanes(riley::Riley * riley);
+
+    // Hydra Sprim path in the render index.
+    SdfPath _cameraPath;
+    CameraUtilFraming _framing;
+    CameraUtilConformWindowPolicy _policy;
+    bool _disableDepthOfField;
+    
+    // Save ids of riley clip planes so that we can delete them before
+    // re-creating them to update the clip planes.
+    std::vector<riley::ClippingPlaneId> _clipPlaneIds;
+    riley::CameraId _cameraId;
+    // Riley camera name provided as an argument to CreateRileyCamera.
+    // This needs to be unique across all cameras.
+    RtUString _cameraName;
+    
+    std::atomic_bool _invalid;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CAMERA_CONTEXT_H
diff --git a/third_party/renderman-26/plugin/hdPrman/codegenTemplates/rileyPrim.cpp b/third_party/renderman-26/plugin/hdPrman/codegenTemplates/rileyPrim.cpp
new file mode 100644
index 0000000000..50f155cf75
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/codegenTemplates/rileyPrim.cpp
@@ -0,0 +1,177 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/{{SCHEMA_NAME | uncapitalizeFirst}}Prim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/{{SCHEMA_NAME | uncapitalizeFirst}}Schema.h"
+{%- for t in FORWARD_DECLS %}
+#include "hdPrman/{{t | uncapitalizeFirst}}Prim.h"
+{%- endfor %}
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_{{SCHEMA_NAME}}Prim::HdPrman_{{SCHEMA_NAME}}Prim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    {{SCHEMA_CLASS_NAME}} schema =
+        {{SCHEMA_CLASS_NAME}}::GetFromParent(primSource);
+
+{% for name, type_name, opt_dict in MEMBERS %}
+    {{ opt_dict['RILEY_CONVERTER'] }} {{ name }} =
+        {{ opt_dict['RILEY_CONVERTER'] }}(
+{%- if 'RILEY_NEEDS_OBSERVER' in opt_dict %}
+            observer,
+{%- endif %}
+            schema.Get{{name | capitalizeFirst}}()
+{%- if 'FALLBACK_VALUE' in opt_dict %},
+            /* fallbackValue = */ {{ opt_dict['FALLBACK_VALUE'] }}
+{%- endif -%}
+{%- if 'RILEY_NEEDS_SHUTTER_INTERVAL' in opt_dict %},
+            _GetShutterInterval()
+{%- endif -%}
+    );
+{% endfor %}
+
+    _rileyId = _AcquireRiley()->Create{{RILEY_TYPE}}(
+{%- if not NO_RILEY_USER_ID %}
+        riley::UserId(),
+{% endif -%}
+{%- for name, type_name, opt_dict in MEMBERS %}
+        {{name}}.rileyObject{% if not loop.last %},{% endif %}
+{%- endfor -%}
+        );
+{% for name, type_name, opt_dict in MEMBERS -%}
+{%- if 'RILEY_RELATIONSHIP_TARGET' in opt_dict %}
+{%- if type_name == 'HdPathArrayDataSource' %}
+    _{{name}}Prims = std::move({{name}}.prims);
+{% else %}
+    _{{name}}Prim = std::move({{name}}.prim);
+{% endif -%}
+{%- endif -%}
+{%- endfor %}
+// --(BEGIN CUSTOM CODE: Constructor)--
+{%- if 'Constructor' in CUSTOM_CODE_IMPL %}
+{{ CUSTOM_CODE_IMPL['Constructor'] }}
+{%- endif %}
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_{{SCHEMA_NAME}}Prim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    {{SCHEMA_CLASS_NAME}} schema =
+        {{SCHEMA_CLASS_NAME}}::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+{% for name, type_name, opt_dict in MEMBERS -%}
+{%- if not 'RILEY_NO_MODIFY' in opt_dict %}
+    std::optional<{{ opt_dict['RILEY_CONVERTER'] }}> {{ name }};
+    if (entry.dirtyLocators.Intersects(
+            {{SCHEMA_CLASS_NAME}}::Get{{name | capitalizeFirst}}Locator())) {
+        {{ name }} =
+            {{ opt_dict['RILEY_CONVERTER'] }}(
+{%- if 'RILEY_NEEDS_OBSERVER' in opt_dict %}
+                observer,
+{%- endif %}
+                schema.Get{{name | capitalizeFirst}}()
+{%- if 'FALLBACK_VALUE' in opt_dict %},
+                {{ opt_dict['FALLBACK_VALUE'] }}
+{%- endif -%}
+{%- if 'RILEY_NEEDS_SHUTTER_INTERVAL' in opt_dict %},
+                _GetShutterInterval()
+{%- endif -%}
+        );
+    };
+{% endif -%}
+{%- endfor %}
+
+    _AcquireRiley()->Modify{{RILEY_TYPE}}(
+{%- if not 'Modify' in CUSTOM_CODE_IMPL -%}
+        _rileyId,
+{%- for name, type_name, opt_dict in MEMBERS -%}
+{%- if not 'RILEY_NO_MODIFY' in opt_dict %}
+        HdPrman_GetRileyObjectPtr({{name}}){% if not loop.last %},{% endif %}
+{%- endif -%}
+{%- endfor -%}
+{%- endif %}
+// --(BEGIN CUSTOM CODE: Modify)--
+{%- if 'Modify' in CUSTOM_CODE_IMPL %}
+{{ CUSTOM_CODE_IMPL['Modify'] }}
+{%- endif %}
+// --(END CUSTOM CODE: Modify)--
+        );
+
+{% for name, type_name, opt_dict in MEMBERS -%}
+{%- if 'RILEY_RELATIONSHIP_TARGET' in opt_dict and not 'RILEY_NO_MODIFY' in opt_dict %}
+{%- if type_name == 'HdPathArrayDataSource' %}
+    // Now that the {{RILEY_TYPE}} is using the new
+    // {{opt_dict['RILEY_RELATIONSHIP_TARGET']}}, we can realease the handles
+    // to the old {{opt_dict['RILEY_RELATIONSHIP_TARGET']}}.
+    if ({{name}}) {
+        _{{name}}Prims = std::move({{name}}->prims);
+    }
+{% else %}
+    if ({{name}}) {
+        _{{name}}Prim = std::move({{name}}->prim);
+    }
+{% endif -%}
+{%- endif -%}
+{%- endfor %}
+}
+
+HdPrman_{{SCHEMA_NAME}}Prim::~HdPrman_{{SCHEMA_NAME}}Prim()
+{
+    _AcquireRiley()->Delete{{RILEY_TYPE}}(
+{%- if not 'Delete' in CUSTOM_CODE_IMPL -%}
+_rileyId
+{%- endif %}
+// --(BEGIN CUSTOM CODE: Delete)--
+{%- if 'Delete' in CUSTOM_CODE_IMPL %}
+{{ CUSTOM_CODE_IMPL['Delete'] }}
+{%- endif %}
+// --(END CUSTOM CODE: Delete)--
+        );
+
+{% for name, type_name, opt_dict in MEMBERS -%}
+{%- if 'RILEY_RELATIONSHIP_TARGET' in opt_dict %}
+{%- if type_name == 'HdPathArrayDataSource' %}
+    // _{{name}}Prims gets dropped after the {{RILEY_TYPE}} was
+    // deleted.
+{% else %}
+    // _{{name}}Prim gets dropped after the {{RILEY_TYPE}} was
+    // deleted.
+{% endif -%}
+{%- endif -%}
+{%- endfor -%}
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-26/plugin/hdPrman/codegenTemplates/rileyPrim.h b/third_party/renderman-26/plugin/hdPrman/codegenTemplates/rileyPrim.h
new file mode 100644
index 0000000000..2db6a73851
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/codegenTemplates/rileyPrim.h
@@ -0,0 +1,97 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef {{ HEADER_GUARD|snake }}_{{ FILE_NAME|snake }}_H
+#define {{ HEADER_GUARD|snake }}_{{ FILE_NAME|snake }}_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+{% for t in FORWARD_DECLS -%}
+using HdPrman_{{t}}PrimHandle =
+    std::shared_ptr<class HdPrman_{{t}}Prim>;
+{% endfor %}
+using HdPrman_{{ SCHEMA_NAME }}PrimHandle =
+    std::shared_ptr<class HdPrman_{{ SCHEMA_NAME }}Prim>;
+
+/// \class HdPrman_{{SCHEMA_NAME}}Prim
+///
+/// Wraps a riley {{RILEY_TYPE}} object, initializing or updating it
+/// using the {{SCHEMA_CLASS_NAME}}.
+///
+class HdPrman_{{SCHEMA_NAME}}Prim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_{{SCHEMA_NAME}}Prim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_{{SCHEMA_NAME}}Prim() override;
+
+    using RileyId = riley::{{RILEY_TYPE}}Id;
+{%- if ADD_RILEY_ID_LIST %}
+    using RileyIdList = riley::{{RILEY_TYPE}}List;
+{% endif %}
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+{%- for name, type_name, opt_dict in MEMBERS -%}
+{%- if 'RILEY_RELATIONSHIP_TARGET' in opt_dict %}
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+{%- if type_name == 'HdPathArrayDataSource' %}
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    std::vector<HdPrman_{{opt_dict['RILEY_RELATIONSHIP_TARGET']}}PrimHandle> _{{name}}Prims;
+{% else %}
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_{{opt_dict['RILEY_RELATIONSHIP_TARGET']}}PrimHandle _{{name}}Prim;
+{%- endif -%}
+{%- endif -%}
+{%- endfor %}
+
+// --(BEGIN CUSTOM CODE: Fields)--
+{%- if 'Fields' in CUSTOM_CODE_HEADER %}
+{{ CUSTOM_CODE_HEADER['Fields'] }}
+{%- endif %}
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
+
diff --git a/third_party/renderman-26/plugin/hdPrman/cone.cpp b/third_party/renderman-26/plugin/hdPrman/cone.cpp
new file mode 100644
index 0000000000..3e2493f381
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/cone.cpp
@@ -0,0 +1,79 @@
+#include <iostream>
+
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/cone.h"
+
+#include "hdPrman/renderParam.h"
+#include "hdPrman/instancer.h"
+#include "hdPrman/material.h"
+#include "hdPrman/rixStrings.h"
+#include "pxr/imaging/hd/coneSchema.h"
+#include "pxr/base/gf/matrix4f.h"
+#include "pxr/base/gf/matrix4d.h"
+
+#include "Riley.h"
+#include "RiTypesHelper.h"
+#include "RixShadingUtils.h"
+#include "RixPredefinedStrings.hpp"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_Cone::HdPrman_Cone(SdfPath const& id)
+    : BASE(id)
+{
+}
+
+HdDirtyBits
+HdPrman_Cone::GetInitialDirtyBitsMask() const
+{
+    constexpr int mask = HdChangeTracker::Clean
+        | HdChangeTracker::DirtyTransform
+        | HdChangeTracker::DirtyVisibility
+        | HdChangeTracker::DirtyPrimvar
+        | HdChangeTracker::DirtyMaterialId
+        | HdChangeTracker::DirtyInstancer
+        ;
+
+    return (HdDirtyBits)mask;
+}
+
+TfTokenVector const &
+HdPrman_Cone::GetBuiltinPrimvarNames() const
+{
+    static TfTokenVector result{
+        HdConeSchemaTokens->height,
+        HdConeSchemaTokens->radius };
+    return result;
+}
+
+RtPrimVarList
+HdPrman_Cone::_ConvertGeometry(HdPrman_RenderParam *renderParam,
+                                   HdSceneDelegate *sceneDelegate,
+                                   const SdfPath &id,
+                                   RtUString *primType,
+                                   std::vector<HdGeomSubset> *geomSubsets)
+{
+    RtPrimVarList primvars;
+
+    *primType = RixStr.k_Ri_Cone;
+
+    const float radius =
+        sceneDelegate->Get(id, HdConeSchemaTokens->radius)
+            .GetWithDefault<double>(0.0);
+    const float height =
+        sceneDelegate->Get(id, HdConeSchemaTokens->height)
+            .GetWithDefault<double>(0.0);
+
+    primvars.SetFloat(RixStr.k_Ri_radius, radius);
+    primvars.SetFloat(RixStr.k_Ri_height, height);
+
+    HdPrman_ConvertPrimvars(sceneDelegate, id, primvars, 1, 0, 0, 0);
+    return primvars;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/cone.h b/third_party/renderman-26/plugin/hdPrman/cone.h
new file mode 100644
index 0000000000..2ab400ff05
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/cone.h
@@ -0,0 +1,42 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CONE_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CONE_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/gprim.h"
+#include "pxr/imaging/hd/rprim.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_Cone final : public HdPrman_Gprim<HdRprim>
+{
+public:
+    using BASE = HdPrman_Gprim<HdRprim>;
+
+    HF_MALLOC_TAG_NEW("new HdPrman_Cone");
+
+    HdPrman_Cone(SdfPath const& id);
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+    TfTokenVector const &GetBuiltinPrimvarNames() const override;
+
+protected:
+    RtPrimVarList
+    _ConvertGeometry(HdPrman_RenderParam *renderParam,
+                     HdSceneDelegate *sceneDelegate,
+                     const SdfPath &id,
+                     RtUString *primType,
+                     std::vector<HdGeomSubset> *geomSubsets) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CONE_H
diff --git a/third_party/renderman-26/plugin/hdPrman/coordSys.cpp b/third_party/renderman-26/plugin/hdPrman/coordSys.cpp
new file mode 100644
index 0000000000..2882979709
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/coordSys.cpp
@@ -0,0 +1,110 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/coordSys.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/usd/sdf/types.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hf/diagnostic.h"
+#include "RiTypesHelper.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrmanCoordSys::HdPrmanCoordSys(SdfPath const& id)
+    : HdCoordSys(id)
+    , _coordSysId(riley::CoordinateSystemId::InvalidId())
+{
+    /* NOTHING */
+}
+
+HdPrmanCoordSys::~HdPrmanCoordSys() = default;
+
+void
+HdPrmanCoordSys::Finalize(HdRenderParam *renderParam)
+{
+    HdPrman_RenderParam *param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+    _ResetCoordSys(param);
+}
+
+void
+HdPrmanCoordSys::_ResetCoordSys(HdPrman_RenderParam *param)
+{
+    riley::Riley *riley = param->AcquireRiley();
+    if (_coordSysId != riley::CoordinateSystemId::InvalidId()) {
+        riley->DeleteCoordinateSystem(_coordSysId);
+        _coordSysId = riley::CoordinateSystemId::InvalidId();
+    }
+}
+
+/* virtual */
+void
+HdPrmanCoordSys::Sync(HdSceneDelegate *sceneDelegate,
+                      HdRenderParam   *renderParam,
+                      HdDirtyBits     *dirtyBits)
+{
+    HdPrman_RenderParam *param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+
+    SdfPath id = GetId();
+    // Save state of dirtyBits before HdCoordSys::Sync clears them.
+    const HdDirtyBits bits = *dirtyBits;
+
+    riley::Riley *riley = param->AcquireRiley();
+
+    HdCoordSys::Sync(sceneDelegate, renderParam, dirtyBits);
+
+    if (bits & AllDirty) {
+        // Sample transform
+        HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> xf;
+        sceneDelegate->SampleTransform(id, &xf);
+        TfSmallVector<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES>
+            xf_rt_values(xf.count);
+        for (size_t i=0; i < xf.count; ++i) {
+            xf_rt_values[i] = HdPrman_Utils::GfMatrixToRtMatrix(xf.values[i]);
+        }
+        const riley::Transform xform = {
+            unsigned(xf.count), xf_rt_values.data(), xf.times.data()};
+
+        RtParamList attrs;
+        // The coordSys name is the final component of the id,
+        // after stripping namespaces.
+        RtUString coordSysName(GetName().GetText());
+        attrs.SetString(RixStr.k_name, coordSysName);
+        if (_coordSysId != riley::CoordinateSystemId::InvalidId()) {
+            riley->ModifyCoordinateSystem(_coordSysId, &xform, &attrs);
+        } else {
+          _coordSysId = riley->CreateCoordinateSystem(
+              riley::UserId(
+                  stats::AddDataLocation(id.GetText()).GetValue()),
+              xform, attrs);
+        }
+    }
+
+    *dirtyBits = HdChangeTracker::Clean;
+}
+
+#if HD_API_VERSION < 53
+/* virtual */
+HdDirtyBits
+HdPrmanCoordSys::GetInitialDirtyBitsMask() const
+{
+    return HdChangeTracker::AllDirty;
+}
+#endif
+
+bool
+HdPrmanCoordSys::IsValid() const
+{
+    return _coordSysId != riley::CoordinateSystemId::InvalidId();
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/coordSys.h b/third_party/renderman-26/plugin/hdPrman/coordSys.h
new file mode 100644
index 0000000000..5b86390d31
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/coordSys.h
@@ -0,0 +1,58 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_COORD_SYS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_COORD_SYS_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/coordSys.h"
+#include "pxr/imaging/hd/version.h"
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdSceneDelegate;
+class HdPrman_RenderParam;
+
+/// \class HdPrmanCoordSys
+///
+/// A representation for coordinate systems.
+///
+class HdPrmanCoordSys final : public HdCoordSys 
+{
+public:
+    HdPrmanCoordSys(SdfPath const& id);
+    ~HdPrmanCoordSys() override;
+
+    /// Synchronizes state from the delegate to this object.
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam   *renderParam,
+              HdDirtyBits     *dirtyBits) override;
+    
+#if HD_API_VERSION < 53
+    /// Returns the minimal set of dirty bits to place in the
+    /// change tracker for use in the first sync of this prim.
+    /// Typically this would be all dirty bits.
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+#endif
+
+    riley::CoordinateSystemId GetCoordSysId() const { return _coordSysId; }
+
+    /// Return true if this material is valid.
+    bool IsValid() const;
+
+    void Finalize(HdRenderParam *renderParam) override;
+
+private:
+    void _ResetCoordSys(HdPrman_RenderParam *renderParam);
+
+    riley::CoordinateSystemId _coordSysId;
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_COORD_SYS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/coordSysPrimSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/coordSysPrimSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..e64ea31731
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/coordSysPrimSceneIndexPlugin.cpp
@@ -0,0 +1,52 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/coordSysPrimSceneIndexPlugin.h"
+
+#include "pxr/imaging/hdsi/coordSysPrimSceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+
+#include "pxr/base/tf/envSetting.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_CoordSysPrimSceneIndexPlugin"))
+);
+
+static const char * const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_CoordSysPrimSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 1000;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtEnd);
+}
+
+HdPrman_CoordSysPrimSceneIndexPlugin::
+HdPrman_CoordSysPrimSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_CoordSysPrimSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdsiCoordSysPrimSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/coordSysPrimSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/coordSysPrimSceneIndexPlugin.h
new file mode 100644
index 0000000000..e52f12f9b3
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/coordSysPrimSceneIndexPlugin.h
@@ -0,0 +1,33 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef PXR_IMAGING_HDPRMAN_COORD_SYS_PRIM_SCENE_INDEX_PLUGIN_H
+#define PXR_IMAGING_HDPRMAN_COORD_SYS_PRIM_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_CoordSysPrimSceneIndexPlugin
+///
+/// Plugin adds a scene index that adds coord system prims.
+///
+class HdPrman_CoordSysPrimSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_CoordSysPrimSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HDPRMAN_COORD_SYS_PRIM_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/cylinder.cpp b/third_party/renderman-26/plugin/hdPrman/cylinder.cpp
new file mode 100644
index 0000000000..d07f34977e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/cylinder.cpp
@@ -0,0 +1,78 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/cylinder.h"
+
+#include "hdPrman/renderParam.h"
+#include "hdPrman/instancer.h"
+#include "hdPrman/material.h"
+#include "hdPrman/rixStrings.h"
+#include "pxr/imaging/hd/cylinderSchema.h"
+#include "pxr/base/gf/matrix4f.h"
+#include "pxr/base/gf/matrix4d.h"
+
+#include "Riley.h"
+#include "RiTypesHelper.h"
+#include "RixShadingUtils.h"
+#include "RixPredefinedStrings.hpp"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_Cylinder::HdPrman_Cylinder(SdfPath const& id)
+    : BASE(id)
+{
+}
+
+HdDirtyBits
+HdPrman_Cylinder::GetInitialDirtyBitsMask() const
+{
+    constexpr int mask = HdChangeTracker::Clean
+        | HdChangeTracker::DirtyTransform
+        | HdChangeTracker::DirtyVisibility
+        | HdChangeTracker::DirtyPrimvar
+        | HdChangeTracker::DirtyMaterialId
+        | HdChangeTracker::DirtyInstancer
+        ;
+
+    return (HdDirtyBits)mask;
+}
+
+TfTokenVector const &
+HdPrman_Cylinder::GetBuiltinPrimvarNames() const
+{
+    static TfTokenVector result{
+        HdCylinderSchemaTokens->height,
+        HdCylinderSchemaTokens->radius };
+    return result;
+}
+
+RtPrimVarList
+HdPrman_Cylinder::_ConvertGeometry(HdPrman_RenderParam *renderParam,
+                                   HdSceneDelegate *sceneDelegate,
+                                   const SdfPath &id,
+                                   RtUString *primType,
+                                   std::vector<HdGeomSubset> *geomSubsets)
+{
+    RtPrimVarList primvars;
+
+    *primType = RixStr.k_Ri_Cylinder;
+
+    const float radius =
+        sceneDelegate->Get(id, HdCylinderSchemaTokens->radius)
+            .GetWithDefault<double>(0.0);
+    const float height =
+        sceneDelegate->Get(id, HdCylinderSchemaTokens->height)
+            .GetWithDefault<double>(0.0);
+
+    primvars.SetFloat(RixStr.k_Ri_radius, radius);
+    primvars.SetFloat(RixStr.k_Ri_zmin, -0.5f * height);
+    primvars.SetFloat(RixStr.k_Ri_zmax,  0.5f * height);
+
+    HdPrman_ConvertPrimvars(sceneDelegate, id, primvars, 1, 0, 0, 0);
+    return primvars;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/cylinder.h b/third_party/renderman-26/plugin/hdPrman/cylinder.h
new file mode 100644
index 0000000000..9c46935555
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/cylinder.h
@@ -0,0 +1,42 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CYLINDER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CYLINDER_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/gprim.h"
+#include "pxr/imaging/hd/rprim.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_Cylinder final : public HdPrman_Gprim<HdRprim>
+{
+public:
+    using BASE = HdPrman_Gprim<HdRprim>;
+
+    HF_MALLOC_TAG_NEW("new HdPrman_Cylinder");
+
+    HdPrman_Cylinder(SdfPath const& id);
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+    TfTokenVector const &GetBuiltinPrimvarNames() const override;
+
+protected:
+    RtPrimVarList
+    _ConvertGeometry(HdPrman_RenderParam *renderParam,
+                     HdSceneDelegate *sceneDelegate,
+                     const SdfPath &id,
+                     RtUString *primType,
+                     std::vector<HdGeomSubset> *geomSubsets) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_CYLINDER_H
diff --git a/third_party/renderman-26/plugin/hdPrman/debugCodes.cpp b/third_party/renderman-26/plugin/hdPrman/debugCodes.cpp
new file mode 100644
index 0000000000..03211fa400
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/debugCodes.cpp
@@ -0,0 +1,39 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/debugCodes.h"
+
+#include "pxr/base/tf/registryManager.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_REGISTRY_FUNCTION(TfDebug)
+{
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_PRIMVARS, "Primvars");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_MATERIALS, "Materials");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_DUMP_MATERIALX_OSL_SHADER, 
+        "Print MaterialX Generated Osl Shaders");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_LIGHT_LINKING, "Light linking");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_LIGHT_LIST, "Light list");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_VSTRUCTS, "Vstruct expansion");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_LIGHT_FILTER_LINKING,
+        "Light filter linking");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_IMAGE_ASSET_RESOLVE,
+        "Resolved image asset paths");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_INSTANCERS, "Instancers");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_MESHLIGHT, "Mesh lights");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_RENDER_SETTINGS,
+        "Debug logging for all things render settings.");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_RENDER_PASS,
+        "Debug logging for HdPrman RenderPass dataflow and related Riley "
+        "computations.");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_TERMINAL_SCENE_INDEX_OBSERVER,
+        "Debug logging for HdPrman terminal scene index observer.");
+    TF_DEBUG_ENVIRONMENT_SYMBOL(HDPRMAN_MOTION_BLUR, "Motion blur");
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
diff --git a/third_party/renderman-26/plugin/hdPrman/debugCodes.h b/third_party/renderman-26/plugin/hdPrman/debugCodes.h
new file mode 100644
index 0000000000..058f007196
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/debugCodes.h
@@ -0,0 +1,34 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_CODES_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_CODES_H
+
+#include "pxr/pxr.h"
+#include "pxr/base/tf/debug.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEBUG_CODES(
+    HDPRMAN_PRIMVARS,
+    HDPRMAN_MATERIALS,
+    HDPRMAN_DUMP_MATERIALX_OSL_SHADER,
+    HDPRMAN_LIGHT_LINKING,
+    HDPRMAN_LIGHT_LIST,
+    HDPRMAN_VSTRUCTS,
+    HDPRMAN_LIGHT_FILTER_LINKING,
+    HDPRMAN_IMAGE_ASSET_RESOLVE,
+    HDPRMAN_INSTANCERS,
+    HDPRMAN_MESHLIGHT,
+    HDPRMAN_RENDER_SETTINGS,
+    HDPRMAN_RENDER_PASS,
+    HDPRMAN_TERMINAL_SCENE_INDEX_OBSERVER,
+    HDPRMAN_MOTION_BLUR
+);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_CODES_H
diff --git a/third_party/renderman-26/plugin/hdPrman/debugUtil.cpp b/third_party/renderman-26/plugin/hdPrman/debugUtil.cpp
new file mode 100644
index 0000000000..0c2862fa14
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/debugUtil.cpp
@@ -0,0 +1,632 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/debugUtil.h"
+
+#include "pxr/base/arch/stackTrace.h"
+#include "pxr/base/tf/callContext.h"
+#include "pxr/base/tf/stringUtils.h"
+#include "pxr/usd/sdf/path.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+namespace HdPrmanDebugUtil {
+
+static const int cw = 3; // length of "─"
+static const char empty[] = "";
+static const char line[] = "────────────────────";
+static const char fmt[] = 
+             "%01$+*20$.*17$f  %02$+*21$.*17$f  %03$+*22$.*17$f │ %04$+*23$.*17$f\n"
+    "%19$*18$s%05$+*20$.*17$f  %06$+*21$.*17$f  %07$+*22$.*17$f │ %08$+*23$.*17$f\n"
+    "%19$*18$s%09$+*20$.*17$f  %10$+*21$.*17$f  %11$+*22$.*17$f │ %12$+*23$.*17$f\n"
+    "%19$*18$s%28$.*24$s"   "──%28$.*25$s"   "──%28$.*26$s"   "─┼─%28$.*27$s"   "\n"
+    "%19$*18$s%13$+*20$.*17$f  %14$+*21$.*17$f  %15$+*22$.*17$f │ %16$+*23$.*17$f";
+
+std::string
+MatrixToString(const GfMatrix4d& mat, const int indent, const int precision)
+{
+    int width[4] = {0, 0, 0, 0};
+    for (int i = 0; i < 4; ++i) {
+        for (int j = 0; j < 4; ++j) {
+            width[i] = std::max(width[i],
+                3 + precision + (int)log10(abs(mat[i][j])));
+        }
+    }
+
+    return TfStringPrintf(fmt,
+        mat[0][0], mat[1][0], mat[2][0], mat[3][0],
+        mat[0][1], mat[1][1], mat[2][1], mat[3][1],
+        mat[0][2], mat[1][2], mat[2][2], mat[3][2],
+        mat[0][3], mat[1][3], mat[2][3], mat[3][3], 
+        precision, indent, empty, 
+        width[0], width[1], width[2], width[3],
+        cw * width[0], cw * width[1], cw * width[2], cw * width[3],
+        line);
+}
+
+std::string
+MatrixToString(const RtMatrix4x4& mat, const int indent, const int precision)
+{
+    int width[4] = {0, 0, 0, 0};
+    for (int i = 0; i < 4; ++i) {
+        for (int j = 0; j < 4; ++j) {
+            width[i] = std::max(width[i],
+                3 + precision + (int)log10(abs(mat.m[i][j])));
+        }
+    }
+
+    return TfStringPrintf(fmt,
+        mat.m[0][0], mat.m[1][0], mat.m[2][0], mat.m[3][0],
+        mat.m[0][1], mat.m[1][1], mat.m[2][1], mat.m[3][1],
+        mat.m[0][2], mat.m[1][2], mat.m[2][2], mat.m[3][2],
+        mat.m[0][3], mat.m[1][3], mat.m[2][3], mat.m[3][3], 
+        precision, indent, empty, 
+        width[0], width[1], width[2], width[3],
+        cw * width[0], cw * width[1], cw * width[2], cw * width[3],
+        line);
+}
+
+std::string
+_GetParamPrefix(const RtParamList::ParamInfo& info)
+{
+    std::string out;
+    switch (info.detail) {
+        case RtDetailType::k_constant: out += "constant "; break;
+        case RtDetailType::k_uniform: out += "uniform "; break;
+        case RtDetailType::k_vertex: out += "vertex "; break;
+        case RtDetailType::k_varying: out += "varying "; break;
+        case RtDetailType::k_facevarying: out += "facevarying "; break;
+        case RtDetailType::k_reference: out += "reference "; break;
+        case RtDetailType::k_invalid: out += "invalid "; break;
+    }
+    switch (info.type) {
+        case RtDataType::k_integer: out += "integer"; break;
+        case RtDataType::k_float: out += "float"; break;
+        case RtDataType::k_color: out += "color"; break;
+        case RtDataType::k_point: out += "point"; break;
+        case RtDataType::k_vector: out += "vector"; break;
+        case RtDataType::k_normal: out += "normal"; break;
+        case RtDataType::k_hpoint: out += "hpoint"; break;
+        case RtDataType::k_mpoint: out += "mpoint"; break;
+        case RtDataType::k_matrix: out += "matrix"; break;
+        case RtDataType::k_string: out += "string"; break;
+        case RtDataType::k_bxdf: out += "bxdf"; break;
+        case RtDataType::k_lightfilter: out += "lightfilter"; break;
+        case RtDataType::k_samplefilter: out += "samplefilter"; break;
+        case RtDataType::k_displayfilter: out += "displayfilter"; break;
+        case RtDataType::k_struct: out += "struct"; break;
+    }
+    if (info.array) {
+        out += TfStringPrintf("[%u]", info.length);
+    }
+    out += TfStringPrintf(" %s", info.name.CStr());
+    if (info.detail == RtDetailType::k_reference) {
+        out += ".connect";
+    }
+    if (info.motion) {
+        out += ".timesamples";
+    }
+    out += " = ";
+    return out;
+}
+
+std::string 
+_FormatParam(
+    const RtParamList::ParamInfo& info,
+    const RtParamList& _params,
+    const int indent = 0) {
+
+    static const char* Vec3Fmt = "(%f, %f, %f)";
+    static const char* Vec4Fmt = "(%f, %f, %f, %f)";
+    
+    const std::string prefix = _GetParamPrefix(info);
+    const int fullIndent = indent + (int)prefix.size();
+    RtParamList& params = const_cast<RtParamList&>(_params);
+    std::string val;
+    switch (info.type) {
+        case RtDataType::k_integer: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetIntegerReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetIntegerReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            } else if (info.array) {
+                const int32_t* value = params.GetIntegerArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "(";
+                    }
+                    val += TfStringPrintf("%i", *(value+i));
+                }
+                val += ")";
+            } else {
+                int32_t value;
+                if (params.GetInteger(info.name, value)) {
+                    val = TfStringPrintf("%i", value);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_float: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetFloatReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetFloatReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            } else if (info.array) {
+                const float* value = params.GetFloatArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "(";
+                    }
+                    val += TfStringPrintf("%f", *(value+i));
+                }
+                val += ")";
+            } else {
+                float value;
+                if (params.GetFloat(info.name, value)) {
+                    val = TfStringPrintf("%f", value);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_color: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetColorReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetColorReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            } else if (info.array) {
+                const RtColorRGB* value = params.GetColorArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "(";
+                    }
+                    RtColorRGB color = *(value+i);
+                    val += TfStringPrintf(Vec3Fmt, color.r, color.g, color.b);
+                }
+                val += ")";
+            } else {
+                RtColorRGB value;
+                if (params.GetColor(info.name, value)) {
+                    val = TfStringPrintf(Vec3Fmt, value.r, value.g, value.b);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_point: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetPointReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetPointReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            } else if (info.array) {
+                const RtPoint3* value = params.GetPointArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "(";
+                    }
+                    RtPoint3 point = *(value+i);
+                    val += TfStringPrintf(Vec3Fmt, point.x, point.y, point.z);
+                }
+                val += ")";
+            } else {
+                RtPoint3 value;
+                if (params.GetPoint(info.name, value)) {
+                    val = TfStringPrintf(Vec3Fmt, value.x, value.y, value.z);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_vector: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetVectorReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetVectorReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            } else if (info.array) {
+                const RtVector3* value = params.GetVectorArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "(";
+                    }
+                    RtPoint3 vector = *(value+i);
+                    val += TfStringPrintf(Vec3Fmt, vector.x, vector.y, vector.z);
+                }
+                val += ")";
+            } else {
+                RtVector3 value;
+                if (params.GetVector(info.name, value)) {
+                    val = TfStringPrintf(Vec3Fmt, value.x, value.y, value.z);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_normal: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetNormalReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetNormalReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            } else if (info.array) {
+                const RtNormal3* value = params.GetNormalArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "(";
+                    }
+                    RtNormal3 normal = *(value+i);
+                    val += TfStringPrintf(Vec3Fmt, normal.x, normal.y, normal.z);
+                }
+                val += ")";
+            } else {
+                RtNormal3 value;
+                if (params.GetNormal(info.name, value)) {
+                    val = TfStringPrintf(Vec3Fmt, value.x, value.y, value.z);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_hpoint: {
+            if (info.array) {
+                const RtPoint4* value = params.GetHpointArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "(";
+                    }
+                    RtPoint4 point = *(value+i);
+                    val += TfStringPrintf(
+                        Vec4Fmt, point.x, point.y, point.z, point.w);
+                }
+                val += ")";
+            } else {
+                RtPoint4 value;
+                if (params.GetHpoint(info.name, value)) {
+                    val = TfStringPrintf(
+                        Vec4Fmt, value.x, value.y, value.z, value.w);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_mpoint: {
+            if (info.array) {
+                const RtMatrix4x4* value = params.GetMpointArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += TfStringPrintf(",\n%*s", fullIndent, "");
+                    }
+                    RtMatrix4x4 mpoint = *(value+i);
+                    val += MatrixToString(mpoint, fullIndent);
+                }
+            } else {
+                RtMatrix4x4 value;
+                if (params.GetMpoint(info.name, value)) {
+                    val += MatrixToString(value, fullIndent);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_matrix: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetMatrixReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetMatrixReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            } else if (info.array) {
+                const RtMatrix4x4* value = params.GetMatrixArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += TfStringPrintf(",\n%*s", fullIndent, "");
+                    }
+                    RtMatrix4x4 matrix = *(value+i);
+                    val += MatrixToString(matrix, fullIndent);
+                }
+            } else {
+                RtMatrix4x4 value;
+                if (params.GetMatrix(info.name, value)) {
+                    val += MatrixToString(value, fullIndent);
+                }
+            }
+            break;
+        }
+        case RtDataType::k_string: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetStringReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetStringReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            } else if (info.array) {
+                const RtUString* value = params.GetStringArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "(";
+                    }
+                    val += TfStringPrintf("%s", (*(value+i)).CStr());
+                }
+                val += ")";
+            } else {
+                RtUString value;
+                if (params.GetString(info.name, value)) {
+                    val = TfStringPrintf("%s", value.CStr());
+                }
+            }
+            break;
+        }
+        case RtDataType::k_bxdf: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetBxdfReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetBxdfReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            }
+            break;
+        }
+        case RtDataType::k_lightfilter: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetLightFilterReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetLightFilterReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            }
+            break;
+        }
+        case RtDataType::k_samplefilter: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetSampleFilterReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetSampleFilterReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            }
+            break;
+        }
+        case RtDataType::k_displayfilter: {
+            if (info.array && info.detail == RtDetailType::k_reference) {
+                const RtUString* value = params.GetDisplayFilterReferenceArray(
+                    info.name, info.length);
+                for (uint32_t i = 0; i < info.length; ++i) {
+                    if (!val.empty()) {
+                        val += ", ";
+                    } else {
+                        val += "[";
+                    }
+                    val += TfStringPrintf("<%s>", (*(value+i)).CStr());
+                }
+                val += "]";
+            } else if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetDisplayFilterReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            }
+            break;
+        }
+        case RtDataType::k_struct: 
+        {
+            if (info.detail == RtDetailType::k_reference) {
+                RtUString value;
+                if (params.GetStructReference(info.name, value)) {
+                    val = TfStringPrintf("<%s>", value.CStr());
+                }
+            }
+            break;
+        }
+    }
+    return prefix + val;
+}
+
+std::string
+RtParamListToString(const RtParamList& params, const int indent)
+{
+    unsigned numParams = params.GetNumParams();
+    if (numParams == 0) {
+        return "<empty param list>";
+    }
+
+    std::string out;
+    RtParamList::ParamInfo info;
+    for (unsigned pi = 0; pi < numParams; ++pi) {
+        if (params.GetParamInfo(pi, info)) {
+            if (!out.empty()) {
+                out += "\n";
+            }
+            out += TfStringPrintf(
+                "%*s%s", (pi == 0 ? 0 : indent), "", 
+                _FormatParam(info, params, indent).c_str());
+        }
+    }
+    return out;
+}
+
+std::string
+GetCallerAsString(const TfCallContext& ctx)
+{
+    const std::string locator = TfStringPrintf("%s:%lu",
+        ctx.GetFile(), ctx.GetLine());
+    const std::vector<std::string>& lines = ArchGetStackTrace(10);
+    size_t i = 0;
+    while (i < 9 && lines[i].find(locator) == lines[i].npos) {
+        i++;
+    }
+    if (i < 9) {
+        const std::string& line = lines[i+1];
+        return line.substr(28, line.find_first_of("(") - 28) + " at " + 
+            line.substr(line.find_last_of("/") + 1);
+    }
+    return "*** couldn't find caller ***";
+}
+
+std::string
+SdfPathVecToString(const std::vector<SdfPath>& vec)
+{
+    std::string out;
+    for (const SdfPath& path : vec) {
+        if (!out.empty()) {
+            out += ", ";
+        }
+        out += TfStringPrintf("<%s>", path.GetText());
+    }
+    return out;
+}
+
+}
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/debugUtil.h b/third_party/renderman-26/plugin/hdPrman/debugUtil.h
new file mode 100644
index 0000000000..0411ff2169
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/debugUtil.h
@@ -0,0 +1,65 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_UTIL_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_UTIL_H
+
+#include "pxr/pxr.h"
+
+#include "pxr/base/gf/matrix4d.h"
+
+#include "RiTypesHelper.h"
+
+#include <string>
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class SdfPath;
+class TfCallContext;
+
+namespace HdPrmanDebugUtil {
+
+std::string
+MatrixToString(
+    const GfMatrix4d& mat,
+    const int indent = 0,
+    const int precision = 0);
+
+std::string
+MatrixToString(
+    const RtMatrix4x4& mat,
+    const int indent = 0,
+    const int precision = 0);
+
+std::string
+RtParamListToString(const RtParamList& params, const int indent = 0);
+
+std::string
+GetCallerAsString(const TfCallContext& ctx);
+
+template <typename T>
+std::string
+RileyIdVecToString(const std::vector<T>& vec)
+{
+    std::string out;
+    for (const T& val : vec) {
+        if (!out.empty()) {
+            out += ", ";
+        }
+        out += std::to_string(val.AsUInt32());
+    }
+    return out;
+}
+
+std::string
+SdfPathVecToString(const std::vector<SdfPath>& vec);
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DEBUG_UTIL_H
diff --git a/third_party/renderman-26/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..dd3433f1f7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.cpp
@@ -0,0 +1,50 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/dependencyForwardingSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/dependencyForwardingSceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_DependencyForwardingSceneIndexPlugin"))
+);
+
+static const char * const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_DependencyForwardingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 1000;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtEnd);
+}
+
+HdPrman_DependencyForwardingSceneIndexPlugin::
+HdPrman_DependencyForwardingSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_DependencyForwardingSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdDependencyForwardingSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.h
new file mode 100644
index 0000000000..22efb671f7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/dependencyForwardingSceneIndexPlugin.h
@@ -0,0 +1,34 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef PXR_IMAGING_HDPRMAN_DEPENDENCY_FORWARDING_SCENE_INDEX_PLUGIN_H
+#define PXR_IMAGING_HDPRMAN_DEPENDENCY_FORWARDING_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_DependencyForwardingSceneIndexPlugin
+///
+/// Plugin adds a dependency forwarding scene index to the Prman render
+/// delegate to resolve any dependencies introduced by other scene indices.
+///
+class HdPrman_DependencyForwardingSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_DependencyForwardingSceneIndexPlugin();    
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HDPRMAN_DEPENDENCY_FORWARDING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/displayFilter.cpp b/third_party/renderman-26/plugin/hdPrman/displayFilter.cpp
new file mode 100644
index 0000000000..28e7f54279
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/displayFilter.cpp
@@ -0,0 +1,135 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/displayFilter.h"
+
+#include "hdPrman/renderDelegate.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/usd/sdr/registry.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (resource)
+);
+
+TF_MAKE_STATIC_DATA(NdrTokenVec, _sourceTypes) {
+    *_sourceTypes = { TfToken("OSL"), 
+                      TfToken("RmanCpp"), }; }
+
+HdPrman_DisplayFilter::HdPrman_DisplayFilter(
+    SdfPath const& id)
+    : HdSprim(id)
+{
+}
+
+void
+HdPrman_DisplayFilter::Finalize(HdRenderParam *renderParam)
+{
+}
+
+void 
+HdPrman_DisplayFilter::_CreateRmanDisplayFilter(
+    HdSceneDelegate *sceneDelegate,
+    HdPrman_RenderParam *renderParam,
+    SdfPath const& filterPrimPath,
+    HdMaterialNode2 const& displayFilterNode)
+{
+    // Create Display Filter Riley Node
+    riley::ShadingNode rileyNode;
+    rileyNode.type = riley::ShadingNode::Type::k_DisplayFilter;
+    rileyNode.handle = RtUString(filterPrimPath.GetText());
+
+    // Get the Display Filter ShaderPath from the ShaderRegister
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+    SdrShaderNodeConstPtr sdrEntry = sdrRegistry.GetShaderNodeByIdentifier(
+        displayFilterNode.nodeTypeId, *_sourceTypes);
+    if (!sdrEntry) {
+        TF_WARN("Unknown shader ID '%s' for node <%s>\n",
+                displayFilterNode.nodeTypeId.GetText(), filterPrimPath.GetText());
+        return;
+    }
+    std::string shaderPath = sdrEntry->GetResolvedImplementationURI();
+    if (shaderPath.empty()) {
+        TF_WARN("Shader '%s' did not provide a valid implementation path.",
+                sdrEntry->GetName().c_str());
+        return;
+    }
+    rileyNode.name = RtUString(shaderPath.c_str());
+
+    // Initialize the Display Filter parameters 
+    for (const auto &param : displayFilterNode.parameters) {
+        const SdrShaderProperty* prop = sdrEntry->GetShaderInput(param.first);
+        if (!prop) {
+            TF_WARN("Unknown shaderProperty '%s' for the '%s' "
+                    "shader at '%s', ignoring.\n",
+                    param.first.GetText(), 
+                    displayFilterNode.nodeTypeId.GetText(), 
+                    filterPrimPath.GetText());
+            continue;
+        }
+        HdPrman_Utils::SetParamFromVtValue(
+            RtUString(prop->GetImplementationName().c_str()),
+            param.second, prop->GetType(), &rileyNode.params);
+    }
+    renderParam->AddDisplayFilter(sceneDelegate, filterPrimPath, rileyNode);
+    return;
+}
+
+void
+HdPrman_DisplayFilter::Sync(
+    HdSceneDelegate *sceneDelegate,
+    HdRenderParam *renderParam,
+    HdDirtyBits *dirtyBits)
+{
+    const SdfPath &id = GetId();
+    HdPrman_RenderParam *param = static_cast<HdPrman_RenderParam*>(renderParam);
+
+    if (*dirtyBits & HdChangeTracker::DirtyParams) {
+        // Only Create the DisplayFilter if connected to the RenderSettings
+        // Note that this works because the RenderSettings, being a Bprim,
+        // always gets synced before the DisplayFilter Sprim.
+        const SdfPathVector& connectedFilters =
+            param->GetConnectedDisplayFilterPaths();
+        if (std::find(connectedFilters.begin(), connectedFilters.end(), id)
+            != connectedFilters.end()) {
+            const VtValue displayFilterResourceValue =
+                sceneDelegate->Get(id, _tokens->resource);
+
+            if (displayFilterResourceValue.IsHolding<HdMaterialNode2>()) {
+                HdMaterialNode2 displayFilterNode =
+                    displayFilterResourceValue.UncheckedGet<HdMaterialNode2>();
+                _CreateRmanDisplayFilter(
+                    sceneDelegate, param, id, displayFilterNode);
+            }
+        }
+    } 
+    // the _CreateRmanDisplayFilter() call above regenerates the filter network,
+    // so if DirtyParams was set there's nothing left to do for DirtyVisibility.
+    else if (*dirtyBits & HdChangeTracker::DirtyVisibility) {
+        param->CreateDisplayFilterNetwork(sceneDelegate);
+    }
+
+    *dirtyBits = HdChangeTracker::Clean;
+}
+
+
+HdDirtyBits HdPrman_DisplayFilter::GetInitialDirtyBitsMask() const
+{
+    int mask = 
+        HdChangeTracker::Clean | 
+        HdChangeTracker::DirtyParams | 
+        HdChangeTracker::DirtyVisibility;
+    return (HdDirtyBits)mask;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/displayFilter.h b/third_party/renderman-26/plugin/hdPrman/displayFilter.h
new file mode 100644
index 0000000000..0a6f111ddb
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/displayFilter.h
@@ -0,0 +1,44 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DISPLAY_FILTER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DISPLAY_FILTER_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sprim.h"
+#include "pxr/imaging/hd/material.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_RenderParam;
+
+class HdPrman_DisplayFilter : public HdSprim
+{
+public:
+    HdPrman_DisplayFilter(SdfPath const& id);
+
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam *renderParam,
+              HdDirtyBits *dirtyBits) override;
+
+    void Finalize(HdRenderParam *renderParam) override;
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+private:
+    void _CreateRmanDisplayFilter(HdSceneDelegate *sceneDelegate,
+                                  HdPrman_RenderParam *renderParam,
+                                  SdfPath const& filterPrimPath,
+                                  HdMaterialNode2 const& displayFilterNode);
+
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_DISPLAY_FILTER_H
diff --git a/third_party/renderman-26/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..42e0759070
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.cpp
@@ -0,0 +1,74 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h"
+
+#include "hdPrman/tokens.h"
+
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+
+#include "pxr/pxr.h"
+#if PXR_VERSION >= 2402
+#include "pxr/imaging/hdsi/extComputationPrimvarPruningSceneIndex.h"
+#endif
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin"))
+);
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registrations
+////////////////////////////////////////////////////////////////////////////////
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // Needs to be inserted earlier to allow plugins that follow to transform
+    // primvar data without having to concern themselves about computed
+    // primvars.
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 0;
+
+    // Register the plugins conditionally.
+    for(const auto& rendererDisplayName : HdPrman_GetPluginDisplayNames()) {
+        // Register the plugins conditionally.
+        HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+            rendererDisplayName,
+            _tokens->sceneIndexPluginName,
+            nullptr, // no argument data necessary
+            insertionPhase,
+            HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index Implementations
+////////////////////////////////////////////////////////////////////////////////
+
+HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin::
+HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    TF_UNUSED(inputArgs);
+#if PXR_VERSION >= 2402
+    return HdSiExtComputationPrimvarPruningSceneIndex::New(inputScene);
+#else
+    return inputScene;
+#endif
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h
new file mode 100644
index 0000000000..686ac5e6c9
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/extComputationPrimvarPruningSceneIndexPlugin.h
@@ -0,0 +1,35 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_EXT_COMPUTATION_PRIMVAR_PRUNING_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_EXT_COMPUTATION_PRIMVAR_PRUNING_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin
+///
+/// Prman scene index plugin that filters out computed primvars and presents
+/// them as authored primvars.
+///
+class HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin :
+    public HdSceneIndexPlugin
+{
+public:
+    HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_EXT_COMPUTATION_PRIMVAR_PRUNING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/framebuffer.cpp b/third_party/renderman-26/plugin/hdPrman/framebuffer.cpp
new file mode 100644
index 0000000000..8454743785
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/framebuffer.cpp
@@ -0,0 +1,981 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "framebuffer.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/base/tf/staticData.h"
+#include "pxr/base/tf/tf.h"
+#include "pxr/base/work/loops.h"
+#include "RixDspy.h"
+#include "hdPrman/rixStrings.h"
+#include "display/display.h"
+#include "display/renderoutput.h"
+#include <map>
+#include <unordered_map>
+
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// Note: RixDspy is a singleton API so it's safe to use a static variable
+//       We need to use the virtual API because we don't link to libprman
+static RixDspy* s_dspy = nullptr;
+
+////////////////////////////////////////////////////////////////////////
+// PRMan Display Driver API entrypoints
+//////////////////////////////////otify//////////////////////////////////////
+
+static PtDspyError HydraDspyImageOpen(
+    PtDspyImageHandle* handle_p,
+    const char* drivername,
+    const char* filename,
+    int width, int height,
+    int paramCount,
+    const UserParameter* parameters,
+    int formatCount,
+    PtDspyDevFormat* format,
+    PtFlagStuff* flagstuff)
+{
+    TF_UNUSED(drivername);
+    TF_UNUSED(filename);
+    if ((0 == width)||(0 == height)||(0 == formatCount)) {
+        return PkDspyErrorBadParams;
+    }
+
+    // Request all pixels as F32. Requesting ID as integer seems to break
+    // things? But if it's "integer" in the display channel setup, interpreting
+    // it as integer seems to work.
+    for (int formatIndex = 0; formatIndex < formatCount; ++formatIndex) {
+        format[formatIndex].type = PkDspyFloat32;
+    }
+    flagstuff->flags |= PkDspyFlagsWantsEmptyBuckets;
+
+    // Find the buffer.
+    int bufferID = 0;
+    s_dspy->FindIntInParamList("bufferID", &bufferID, paramCount, parameters);
+    HdPrmanFramebuffer *buf = HdPrmanFramebuffer::GetByID(bufferID);
+    if (!buf) {
+        return PkDspyErrorBadParams;
+    }
+    std::lock_guard<std::mutex> lock(buf->mutex);
+    int count = 2;
+    int origin[2];
+    int originalSize[2];
+    originalSize[0] = 0;
+    originalSize[1] = 0;
+
+    s_dspy->FindIntsInParamList("origin", &count,
+                                origin, paramCount, parameters);
+    s_dspy->FindIntsInParamList("OriginalSize", &count,
+                                originalSize, paramCount, parameters);
+    buf->Resize(originalSize[0], originalSize[1],
+                origin[0], origin[1],
+                width, height);
+
+    *handle_p = buf;
+    return PkDspyErrorNone;
+}
+
+static PtDspyError HydraDspyImageActiveRegion(
+    PtDspyImageHandle handle,
+    int xmin,
+    int xmax_plus_one,
+    int ymin,
+    int ymax_plus_one
+)
+{
+    HdPrmanFramebuffer* buf = reinterpret_cast<HdPrmanFramebuffer*>(handle);
+    // weirdly, no longer need offset once an edit (and this callback) happens
+    buf->cropOrigin[0] = 0;
+    buf->cropOrigin[1] = 0;
+    return PkDspyErrorNone;
+}
+
+// Transform NDC space (-1, 1) depth to window space (0, 1).
+static float _ConvertAovDepth(const GfMatrix4d &m, const float depth) {
+    if (std::isfinite(depth)) {
+        return GfClamp(
+            (m.Transform(GfVec3f(0, 0, -depth))[2] * 0.5) + 0.5, 0, 1); 
+    } else {
+        return 0.f;
+    }
+}
+
+static PtDspyError HydraDspyImageData(
+    PtDspyImageHandle handle,
+    int xmin,
+    int xmax_plusone,
+    int ymin,
+    int ymax_plusone,
+    int entrysize,
+    const unsigned char* data)
+{
+    // XXX: This assumes the AOV list matches what was declared to riley
+    // in hdPrman/renderParam.cpp CreateDisplays
+    int nComponents = entrysize / sizeof(float);
+
+    HdPrmanFramebuffer* buf = reinterpret_cast<HdPrmanFramebuffer*>(handle);
+
+    if (buf->w == 0 || buf->h == 0) {
+        return PkDspyErrorBadParams;
+    }
+
+    if (buf->pendingClear) {
+        buf->pendingClear = false;
+        buf->Clear();
+    }
+
+    int xmin_plusorigin = xmin + buf->cropOrigin[0];
+    int xmax_plusorigin = xmax_plusone + buf->cropOrigin[0];
+    int ymin_plusorigin = ymin + buf->cropOrigin[1];
+    int ymax_plusorigin = ymax_plusone + buf->cropOrigin[1];
+
+    // Looping over aov buffers first (rather than data) reduces
+    // branching and gives more consistant memory access.
+    int dataOffset = 0;
+    HdPrmanFramebuffer::AovBuffer* primAovBuffer = nullptr;
+    for (HdPrmanFramebuffer::AovBuffer& aovBuffer : buf->aovBuffers) {
+        const HdPrmanFramebuffer::AovDesc& aovDesc = aovBuffer.desc;
+        const int cc = HdGetComponentCount(aovDesc.format);
+
+        if (aovDesc.format == HdFormatInt32) {
+            int32_t* data_i32 = (int32_t*)data + dataOffset;
+
+            if (aovDesc.name == HdAovTokens->primId) {
+                primAovBuffer = &aovBuffer;
+
+                for (int y = ymin_plusorigin; y < ymax_plusorigin; y++) {
+                    // Flip y-axis
+                    int offset = (buf->h - 1 - y) * buf->w + xmin_plusorigin;
+                    int32_t* aovData = reinterpret_cast<int32_t*>(
+                        &aovBuffer.pixels[offset * cc]);
+                    for (int x = xmin_plusorigin; x < xmax_plusorigin; x++) {
+                        *aovData = (*data_i32 - 1);
+                        aovData++;
+                        data_i32 += nComponents;
+                    }
+                }
+            }
+
+            else if (
+                (aovDesc.name == HdAovTokens->instanceId
+                 || aovDesc.name == HdAovTokens->elementId)
+                && primAovBuffer) {
+                // There is a dependency on primId being declared before
+                // instance/element Id.
+                for (int y = ymin_plusorigin; y < ymax_plusorigin; y++) {
+                    // Flip y-axis
+                    int offset = (buf->h - 1 - y) * buf->w + xmin_plusorigin;
+                    int32_t* primIdAovData = reinterpret_cast<int32_t*>(
+                        &primAovBuffer->pixels[offset * cc]);
+                    int32_t* aovData = reinterpret_cast<int32_t*>(
+                        &aovBuffer.pixels[offset * cc]);
+                    for (int x = xmin_plusorigin; x < xmax_plusorigin; x++) {
+                        *aovData = (*primIdAovData == -1) ? -1 : *data_i32;
+                        primIdAovData++;
+                        aovData++;
+                        data_i32 += nComponents;
+                    }
+                }
+            }
+
+            else {
+                for (int y = ymin_plusorigin; y < ymax_plusorigin; y++) {
+                    // Flip y-axis
+                    int offset = (buf->h - 1 - y) * buf->w + xmin_plusorigin;
+                    int32_t* aovData = reinterpret_cast<int32_t*>(
+                        &aovBuffer.pixels[offset * cc]);
+                    for (int x = xmin_plusorigin; x < xmax_plusorigin; x++) {
+                        *aovData = *data_i32;
+                        aovData++;
+                        data_i32 += nComponents;
+                    }
+                }
+            }
+        }
+        else {
+            float* data_f32 = (float*)data + dataOffset;
+
+            if (aovDesc.name == HdAovTokens->depth) {
+                for (int y = ymin_plusorigin; y < ymax_plusorigin; y++) {
+                    // Flip y-axis
+                    int offset = (buf->h - 1 - y) * buf->w + xmin_plusorigin;
+                    float* aovData = reinterpret_cast<float*>(
+                        &aovBuffer.pixels[offset * cc]);
+                    for (int x = xmin_plusorigin; x < xmax_plusorigin; x++) {
+                        *aovData = _ConvertAovDepth(
+                            buf->proj, *data_f32);
+                        aovData += cc;
+                        data_f32 += nComponents;
+                    }
+                }
+            }
+
+            else if (cc == 4) {
+                for (int y = ymin_plusorigin; y < ymax_plusorigin; y++) {
+                    // Flip y-axis
+                    int offset = (buf->h - 1 - y) * buf->w + xmin_plusorigin;
+                    float* aovData = reinterpret_cast<float*>(
+                        &aovBuffer.pixels[offset * cc]);
+                    for (int x = xmin_plusorigin; x < xmax_plusorigin; x++) {
+                        // Premultiply color with alpha to blend pixels with
+                        // background.
+                        const float alphaInv = 1.f - data_f32[3];
+                        GfVec4f const& clear
+                            = aovDesc.clearValue.Get<GfVec4f>();
+                        for (int i = 0; i < 3; i++) // RGB
+                            aovData[i] = data_f32[i] + (alphaInv)*clear[i];
+                        aovData[3] = data_f32[3]; // A
+                        aovData += 4;
+                        data_f32 += nComponents;
+                    }
+                }
+            }
+
+            else if (cc == 3) {
+                for (int y = ymin_plusorigin; y < ymax_plusorigin; y++) {
+                    // Flip y-axis
+                    int offset = (buf->h - 1 - y) * buf->w + xmin_plusorigin;
+                    float* aovData = reinterpret_cast<float*>(
+                        &aovBuffer.pixels[offset * cc]);
+                    for (int x = xmin_plusorigin; x < xmax_plusorigin; x++) {
+                        for (int i = 0; i < 3; i++)
+                            aovData[i] = data_f32[i];
+                        aovData += 3;
+                        data_f32 += nComponents;
+                    }
+                }
+            }
+
+            else if (cc == 1) {
+                for (int y = ymin_plusorigin; y < ymax_plusorigin; y++) {
+                    // Flip y-axis
+                    int offset = (buf->h - 1 - y) * buf->w + xmin_plusorigin;
+                    float* aovData = reinterpret_cast<float*>(
+                        &aovBuffer.pixels[offset * cc]);
+                    for (int x = xmin_plusorigin; x < xmax_plusorigin; x++) {
+                        *aovData = *data_f32;
+                        aovData++;
+                        data_f32 += nComponents;
+                    }
+                }
+            }
+        }
+
+        dataOffset += cc;
+    }
+
+    buf->newData = true;
+
+    return PkDspyErrorNone;
+}
+
+static PtDspyError HydraDspyImageClose (
+     PtDspyImageHandle handle)
+{
+    TF_UNUSED(handle);
+    return PkDspyErrorNone;
+}
+
+static PtDspyError HydraDspyImageQuery (
+    PtDspyImageHandle handle,
+    PtDspyQueryType querytype,
+    int datalen,
+    void* data)
+{
+    TF_UNUSED(handle);
+    if (!datalen || !data) {
+        return PkDspyErrorBadParams;
+    }
+    switch (querytype) {
+    case PkSizeQuery:
+        {
+            PtDspySizeInfo sizeInfo;
+            if (size_t(datalen) > sizeof(sizeInfo))
+                datalen = sizeof(sizeInfo);
+            sizeInfo.width = 0;
+            sizeInfo.height = 0;
+            sizeInfo.aspectRatio = 1.0f;
+            memcpy(data, &sizeInfo, datalen);
+            return PkDspyErrorNone;;
+        }
+    case PkOverwriteQuery:
+        {
+            PtDspyOverwriteInfo overwriteInfo;
+            if (size_t(datalen) > sizeof(overwriteInfo))
+                datalen = sizeof(overwriteInfo);
+            overwriteInfo.overwrite = 1;
+            // https://renderman.pixar.com/resources/RenderMan_20/dspyNote.html
+            // say this is not used
+            overwriteInfo.interactive = 1;
+            memcpy(data, &overwriteInfo, datalen);
+            return PkDspyErrorNone;
+        }
+    case PkRedrawQuery:
+        {
+            PtDspyRedrawInfo redrawInfo;
+            if (size_t(datalen) > sizeof(redrawInfo))
+                datalen = sizeof(redrawInfo);
+            redrawInfo.redraw = 1;
+            memcpy(data, &redrawInfo, datalen);
+            return PkDspyErrorNone;
+        }
+    default:
+        return PkDspyErrorUnsupported;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////
+// hdPrman framebuffer utility
+////////////////////////////////////////////////////////////////////////
+
+struct _BufferRegistry
+{
+    // Map of ID's to buffers
+    using IDMap = std::map<int32_t, HdPrmanFramebuffer*>;
+
+    std::mutex mutex;
+    IDMap buffers;
+    int32_t nextID = 0;
+};
+static TfStaticData<_BufferRegistry> _bufferRegistry;
+
+HdPrmanFramebuffer::HdPrmanFramebuffer()
+  : w(0)
+  , h(0)
+  , cropOrigin{0,0}
+  , cropRes{0,0}
+  , pendingClear(true)
+  , newData(false)
+{
+    // Add this buffer to the registry, assigning an id.
+    _BufferRegistry& registry = *_bufferRegistry;
+    {
+        std::lock_guard<std::mutex> lock(registry.mutex);
+        std::pair<_BufferRegistry::IDMap::iterator, bool> entry;
+        do {
+            id = registry.nextID++;
+            entry = registry.buffers.insert( std::make_pair(id, this) );
+        } while(!entry.second);
+    }
+}
+
+HdPrmanFramebuffer::~HdPrmanFramebuffer()
+{
+    _BufferRegistry& registry = *_bufferRegistry;
+    {
+        std::lock_guard<std::mutex> lock(registry.mutex);
+        registry.buffers.erase(id);
+        registry.nextID = 0;
+    }
+}
+
+HdPrmanFramebuffer*
+HdPrmanFramebuffer::GetByID(int32_t id)
+{
+    _BufferRegistry& registry = *_bufferRegistry;
+    {
+        std::lock_guard<std::mutex> lock(registry.mutex);
+        _BufferRegistry::IDMap::const_iterator i = registry.buffers.find(id);
+        if (i == registry.buffers.end()) {
+            TF_CODING_ERROR("HdPrmanFramebuffer: Unknown buffer ID %i\n", id);
+            return nullptr;
+        }
+        return i->second;
+    }
+}
+
+void
+HdPrmanFramebuffer::CreateAovBuffers(const AovDescVector &aovDescs)
+{
+    aovBuffers.clear();
+    aovBuffers.reserve(aovDescs.size());
+
+    for (const AovDesc &aovDesc : aovDescs) {
+        aovBuffers.push_back({aovDesc, {}});
+    }
+
+    // Reset w and h so that pixels will be allocated on the next resize
+    w = 0;
+    h = 0;
+}
+
+void
+HdPrmanFramebuffer::Resize(int width, int height,
+                           int cropXMin, int cropYMin,
+                           int cropWidth, int cropHeight)
+{
+    if (w != width || h != height ||
+        cropOrigin[0] != cropXMin || cropOrigin[1] != cropYMin ||
+        cropRes[0] != cropWidth || cropRes[1] != cropHeight) {
+        w = width;
+        h = height;
+        cropRes[0] = cropWidth;
+        cropRes[1] = cropHeight;
+        cropOrigin[0] = cropXMin;
+        cropOrigin[1] = cropYMin;
+        pendingClear = true;
+        newData = true;
+
+        for(HdPrmanFramebuffer::AovBuffer &aovBuffer : aovBuffers) {
+            const int cc = HdGetComponentCount(aovBuffer.desc.format);
+            aovBuffer.pixels.resize(w*h*cc);
+        }
+    }
+}
+
+void
+HdPrmanFramebuffer::Clear()
+{
+    const int size = w * h;
+
+    for(AovBuffer &aovBuffer : aovBuffers) {
+        const AovDesc &aovDesc = aovBuffer.desc;
+        if(aovDesc.format == HdFormatInt32)
+        {
+            const int32_t clear = aovDesc.clearValue.Get<int32_t>();
+            int32_t * const data = reinterpret_cast<int32_t*>(
+                aovBuffer.pixels.data());
+            for(int i = 0; i < size; i++ )
+            {
+                data[i] = clear;
+            }
+        }
+        else
+        {
+            float * const data = reinterpret_cast<float*>(aovBuffer.pixels.data());
+            const int cc = HdGetComponentCount(aovDesc.format);
+            if(cc == 1)
+            {
+                const float clear = aovDesc.clearValue.Get<float>();
+                for(int i=0; i < size; i++)
+                {
+                    data[i] = clear;
+                }
+            }
+            else if(cc == 3)
+            {
+                GfVec3f const& clear = aovDesc.clearValue.Get<GfVec3f>();
+                for(int i=0; i < size; i++)
+                {
+                    data[i*cc+0] = clear[0];
+                    data[i*cc+1] = clear[1];
+                    data[i*cc+2] = clear[2];
+                }
+            }
+            else if(cc == 4)
+            {
+                GfVec4f const& clear = aovDesc.clearValue.Get<GfVec4f>();
+                for(int i=0; i < size; i++)
+                {
+                    data[i*cc+0] = clear[0];
+                    data[i*cc+1] = clear[1];
+                    data[i*cc+2] = clear[2];
+                    data[i*cc+3] = clear[3];
+                }
+            }
+        }
+    }
+}
+
+void
+HdPrmanFramebuffer::Register(RixContext* ctx)
+{
+    assert(ctx);
+    s_dspy = (RixDspy*)ctx->GetRixInterface(k_RixDspy);
+    assert(s_dspy);
+    PtDspyDriverFunctionTable dt;
+    dt.Version = k_PtDriverCurrentVersion;
+    dt.pOpen = HydraDspyImageOpen;
+    dt.pWrite = HydraDspyImageData;
+    dt.pClose = HydraDspyImageClose;
+    dt.pQuery = HydraDspyImageQuery;
+    dt.pActiveRegion = HydraDspyImageActiveRegion;
+    dt.pMetadata = nullptr;
+    if (s_dspy->RegisterDriverTable("hydra", &dt))
+    {
+        TF_CODING_ERROR("HdPrmanFramebuffer: Failed to register\n");
+    }
+}
+
+HdPrmanFramebuffer::HdPrmanAccumulationRule HdPrmanFramebuffer::ToAccumulationRule(RtUString name)
+{
+    if (name == RtUString("average"))
+    {
+        return k_accumulationRuleAverage;
+    }
+    else if (name == RtUString("min"))
+    {
+        return k_accumulationRuleMin;
+    }
+    else if (name == RtUString("max"))
+    {
+        return k_accumulationRuleMax;
+    }
+    else if (name == RtUString("zmin"))
+    {
+        return k_accumulationRuleZmin;
+    }
+    else if (name == RtUString("zmax"))
+    {
+        return k_accumulationRuleZmax;
+    }
+    else if (name == RtUString("sum"))
+    {
+        return k_accumulationRuleSum;
+    }
+    else
+    {
+        return k_accumulationRuleFilter;
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// XPU Display Driver API entrypoints
+///////////////////////////////////////////////////////////////////////////////
+
+constexpr size_t k_invalidOffset = size_t(-1);
+
+namespace {
+
+class DisplayHydra final : public display::Display
+{
+public:
+    DisplayHydra(const RtUString /*name*/, const pxrcore::ParamList& params) :
+        m_width(0),
+        m_height(0),
+        m_surface(nullptr),
+        m_alphaOffset(k_invalidOffset),
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+        m_weightsOffset(k_invalidOffset),
+#endif
+        m_buf(nullptr)
+    {
+        int bufferID = 0;
+        params.GetInteger(RtUString("bufferID"), bufferID);
+        m_buf = HdPrmanFramebuffer::GetByID(bufferID);
+    }
+
+    ~DisplayHydra() override = default;
+
+    // Display interface
+    bool Rebind(const uint32_t width, const uint32_t height, const char* /*srfaddrhandle*/,
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                const void* srfaddr, const size_t /*srfsizebytes*/, const size_t weightsoffset,
+                const size_t* srfoffsets, const display::RenderOutput* outputs,
+#else
+                const void* srfaddr, const size_t /*srfsizebytes*/, const size_t* srfoffsets,
+                const size_t* /*sampleoffsets*/, const display::RenderOutput* outputs,
+#endif
+                const size_t noutputs) override
+    {
+        m_surface = static_cast<const uint8_t*>(srfaddr);
+        m_width = width;
+        m_height = height;
+
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+        m_weightsOffset = weightsoffset;
+#endif
+        m_offsets.clear();
+        m_offsets.reserve(noutputs);
+        for (size_t i = 0; i < noutputs; i++)
+        {
+            m_offsets.push_back(srfoffsets[i]);
+            if(outputs[i].name == RixStr.k_a)
+            {
+                m_alphaOffset = srfoffsets[i];
+            }
+        }
+
+        m_buf->Resize(width, height);
+        return true;
+    }
+
+    void Close() override
+    {
+    }
+
+    void Notify(const uint32_t /*iteration*/,
+                const uint32_t /*totaliterations*/,
+                const Display::NotifyFlags flags,
+                const pxrcore::ParamList& /*metadata*/) override
+    {
+        // We're only interested in displaying iterations.
+        // renderComplete indicates the last valid set of
+        // pixels and needs to be included 
+        // Clear isn't interesting at all.
+        if (flags != k_notifyIteration && flags != k_notifyRender)
+        {
+            return;
+        }
+        // Copy planar data into buffer
+        std::lock_guard<std::mutex> lock(m_buf->mutex);
+
+        m_buf->newData = true;
+
+        if (m_buf->pendingClear) {
+            m_buf->pendingClear = false;
+            m_buf->Clear();
+        }
+
+        int offsetIdx = 0;
+        int primIdIdx = -1;
+        for(size_t hydraAovIdx = 0;
+            hydraAovIdx < m_buf->aovBuffers.size();
+            hydraAovIdx++, offsetIdx++) {
+
+            HdPrmanFramebuffer::AovBuffer &aovBuffer =
+                m_buf->aovBuffers[hydraAovIdx];
+            const HdPrmanFramebuffer::AovDesc &aovDesc =
+                aovBuffer.desc;
+
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+            const float* const srcWeights = m_weightsOffset != k_invalidOffset ? 
+                reinterpret_cast<const float*>(m_surface+m_weightsOffset) : nullptr;
+#endif
+            const bool shouldNormalize = aovDesc.ShouldNormalizeBySampleCount();
+            const int cc = HdGetComponentCount(aovDesc.format);
+            const size_t srcOffset = m_offsets[offsetIdx];
+            if (aovDesc.format == HdFormatInt32) {
+                const int32_t* srcInt =
+                    reinterpret_cast<const int32_t*>(
+                        m_surface + srcOffset);
+
+                // This code manipulates primId, elementId, and
+                // instanceId values to match similar code in the RIS
+                // version of the dspy driver, further up in this file.
+                // The intention is to subtract one from the primId aov
+                // (which maps to 'id' in prman),
+                // and then when the value is -1, also set the values of
+                // elementId and instanceId to -1
+                // (those are faceindex and id2 in prman).
+                // The primId, elementId, and instanceId names are used
+                // by flow and usdview, and those apps expect the prman
+                // id values to have been manipulated in this way.
+                // NB: There's an assumption here that the primId
+                // aov is processed before elementId and instanceId aovs
+                if (aovDesc.name == HdAovTokens->primId) {
+                    primIdIdx = hydraAovIdx;
+
+                    WorkParallelForN(m_height,
+                                     [this, &srcInt, &aovBuffer]
+                                     (size_t begin, size_t end) {
+
+                        const int32_t* src = srcInt + begin * m_width;
+                        for (size_t y=begin; y<end; ++y) {
+                            int32_t* aovData =
+                                reinterpret_cast<int32_t*>(aovBuffer.pixels.data()) +
+                                ((m_buf->h-1-y)*m_width);
+
+                            for (uint32_t x = 0; x < m_width; x++) {
+                                *aovData = (*src) - 1;
+                                src++;
+                                aovData++;
+                            }
+                        }
+                    });
+
+                    srcInt += m_width * m_height;
+                }
+                else if (aovDesc.name == HdAovTokens->instanceId ||
+                         aovDesc.name == HdAovTokens->elementId) {
+                    WorkParallelForN(m_height,
+                                     [this, &srcInt, &aovBuffer, &primIdIdx]
+                                     (size_t begin, size_t end) {
+                                         
+                                   
+                        const int32_t* src = srcInt + begin * m_width;
+                        for (size_t y=begin; y<end; ++y) {
+                            int32_t* aovData =
+                                reinterpret_cast<int32_t*>(
+                                    aovBuffer.pixels.data()) +
+                                ((m_buf->h-1-y)*m_width);
+
+                            int32_t* primIdData =
+                                reinterpret_cast<int32_t*>(
+                                    m_buf->aovBuffers[primIdIdx].pixels.data()) +
+                                ((m_buf->h-1-y)*m_buf->w);
+
+                            for (uint32_t x = 0; x < m_width; x++)
+                            {
+                                if(*primIdData == -1) {
+                                    *aovData = -1;
+                                }
+                                else {
+                                    *aovData = *src;
+                                }
+                                src++;
+                                aovData++;
+                                primIdData++;
+                            }
+                        }
+                    });
+
+                    srcInt += m_width * m_height;
+                }
+                else {
+                    WorkParallelForN(m_height,
+                                     [this, &srcInt, &aovBuffer]
+                                     (size_t begin, size_t end) {
+                                         
+                        const int32_t* src = srcInt + begin * m_width;
+                        for (size_t y=begin; y<end; ++y) {
+                            int32_t* const aovData = 
+                                reinterpret_cast<int32_t*>(
+                                    aovBuffer.pixels.data()) +
+                                ((m_buf->h-1-y)*m_width);
+                            memcpy(aovData, src, sizeof(int32_t) * m_width);
+                            src += m_width;
+                        }
+                    });
+                }   
+
+                srcInt += m_width * m_height;
+            }
+
+            else {
+                if(aovDesc.name == HdAovTokens->depth) {
+
+                    WorkParallelForN(m_height,
+                                     [this, &aovBuffer, &srcOffset]
+                                     (size_t begin, size_t end) {
+
+                        const float* srcScalar =
+                            reinterpret_cast<const float*>(
+                                m_surface + srcOffset)
+                            + begin * m_width;
+                                       
+                        for (size_t y=begin; y<end; ++y) {
+  
+                            // Flip Y
+                            float* aovData =
+                                reinterpret_cast<float*>(
+                                    aovBuffer.pixels.data()) +
+                                ((m_buf->h-1-y)*m_buf->w);
+
+                            for (uint32_t x = 0; x < m_width; x++)
+                            {
+                                float value = *srcScalar;
+                                value = _ConvertAovDepth(m_buf->proj, value);
+                                *aovData = value;
+                            
+                                aovData++;
+                                srcScalar++;
+                            }
+                        }
+                    });
+                }
+                else if( cc == 4 ) {
+                    WorkParallelForN(m_height,
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                     [this, &aovBuffer, &srcWeights, &srcOffset, shouldNormalize]
+#else
+                                     [this, &aovBuffer, &srcOffset, shouldNormalize]
+#endif
+                                     (size_t begin, size_t end) {
+
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                        const float* weights = srcWeights ?
+                            srcWeights + begin * m_width : nullptr;
+#endif
+                        const float* srcColorR =
+                            reinterpret_cast<const float*>(
+                                m_surface + srcOffset)
+                            + begin * m_width;
+                        const float* srcColorA =
+                            reinterpret_cast<const float*>(
+                                m_surface + m_alphaOffset)
+                            + begin * m_width;
+
+                        const GfVec4f clear =
+                            aovBuffer.desc.clearValue.Get<GfVec4f>();
+
+                        for (size_t y=begin; y<end; ++y) {
+                            // Flip Y and assume RGBA (i.e. 4) color width
+                            float* aovData =
+                                reinterpret_cast<float*>(
+                                    aovBuffer.pixels.data()) +
+                                ((m_buf->h-1-y)*m_buf->w)*4;
+
+                            for (uint32_t x = 0; x < m_width; x++) {
+                                float isc = 1.f;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                if(weights && shouldNormalize && *weights > 0.f)
+                                    isc = 1.f / *weights;
+#endif
+                                const float* const srcColorG =
+                                    srcColorR + (m_height * m_width);
+                                const float* const srcColorB =
+                                    srcColorG + (m_height * m_width);
+
+                                // Premultiply color with alpha
+                                // to blend pixels with background.
+                                const float alphaInv = 1-(*srcColorA * isc);
+                                aovData[0] = *srcColorR * isc +
+                                    (alphaInv) * clear[0]; // R
+                                aovData[1] = *srcColorG * isc +
+                                    (alphaInv) * clear[1]; // G
+                                aovData[2] = *srcColorB * isc +
+                                    (alphaInv) * clear[2]; // B
+                                aovData[3] = *srcColorA * isc; // A
+
+                                aovData += 4;
+                                srcColorR++;
+                                srcColorA++;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                if (weights) weights++;
+#endif
+                            }
+                        }
+                    });
+
+                    // When component count is 4 (rgba) in the hydra aov,
+                    // xpu's aovs will have a rgb aov followed by an alpha,
+                    // so need to do an extra increment to skip past the alpha
+                    offsetIdx++;
+                }
+                else if (cc == 1) {
+                    WorkParallelForN(m_height,
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                     [this, &aovBuffer, &srcWeights, &srcOffset, shouldNormalize]
+#else
+                                     [this, &aovBuffer, &srcOffset, shouldNormalize]
+#endif
+                                     (size_t begin, size_t end) {
+
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                        const float* weights = srcWeights ?
+                            srcWeights + begin * m_width : nullptr;
+#endif
+                        const float* srcColorR =
+                            reinterpret_cast<const float*>(
+                                m_surface + srcOffset)
+                            + begin * m_width;
+                        for (size_t y=begin; y<end; ++y) {
+
+                            // Flip Y
+                            float* aovData =
+                                reinterpret_cast<float*>(
+                                    aovBuffer.pixels.data()) +
+                                ((m_buf->h-1-y)*m_buf->w);
+
+                            for (uint32_t x = 0; x < m_width; x++)
+                            {
+                                float isc = 1.f;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                if(weights && shouldNormalize && *weights > 0.f)
+                                    isc = 1.f / *weights;
+#endif
+
+                                *aovData = *srcColorR * isc;
+
+                                aovData++;
+                                srcColorR++;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                if (weights) weights++;
+#endif
+                            }
+                        }
+                    });
+                }                
+                else {
+                    assert(cc == 3);
+                    WorkParallelForN(m_height,
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                     [this, &aovBuffer, &srcWeights, &srcOffset, shouldNormalize]
+#else
+                                     [this, &aovBuffer, &srcOffset, shouldNormalize]
+#endif
+                                     (size_t begin, size_t end) {
+
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                        const float* weights = srcWeights ?
+                            srcWeights + begin * m_width : nullptr;
+#endif
+                        const float* srcColorR =
+                            reinterpret_cast<const float*>(
+                                m_surface + srcOffset)
+                            + begin * m_width;
+
+                        for (size_t y=begin; y<end; ++y) {
+                            // Flip Y and assume RGBA (i.e. 4) color width
+                            float* aovData =
+                                reinterpret_cast<float*>(aovBuffer.pixels.data()) +
+                                ((m_buf->h-1-y)*m_buf->w)*3;
+
+                            for (uint32_t x = 0; x < m_width; x++) {
+                                float isc = 1.f;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                if(weights && shouldNormalize && *weights > 0.f)
+                                    isc = 1.f / *weights;
+#endif
+
+                                const float* const srcColorG =
+                                    srcColorR + (m_height * m_width);
+                                const float* const srcColorB =
+                                    srcColorG + (m_height * m_width);
+
+                                aovData[0] = *srcColorR * isc;
+                                aovData[1] = *srcColorG * isc;
+                                aovData[2] = *srcColorB * isc;
+
+                                aovData += 3;
+                                srcColorR++;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+                                if (weights) weights++;
+#endif
+                            }
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+#if DISPLAY_INTERFACE_VERSION >= 2
+    uint64_t GetRequirements() const override
+    {
+        return display::Display::k_reqFrameBuffer;
+    }
+#endif
+private:
+    uint32_t m_width;
+    uint32_t m_height;
+    const uint8_t* m_surface;
+    size_t m_alphaOffset;
+    std::vector<size_t> m_offsets;
+#if !defined(DISPLAY_INTERFACE_VERSION) || DISPLAY_INTERFACE_VERSION < 2
+    size_t m_weightsOffset;
+#endif
+
+    HdPrmanFramebuffer* m_buf;
+};
+
+}
+
+// Export the current version of the Display API, necessary for binary compatibility with the
+// renderer
+#if DISPLAY_INTERFACE_VERSION >= 1
+DISPLAYEXPORTVERSION
+#endif
+
+extern "C" DISPLAYEXPORT
+display::Display* CreateDisplay(const pxrcore::UString& name,
+                                const pxrcore::ParamList& params,
+                                const pxrcore::ParamList& /* metadata */)
+{
+    return new DisplayHydra(name, params);
+}
+
+extern "C" DISPLAYEXPORT
+void DestroyDisplay(const display::Display* p)
+{
+    delete p;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
diff --git a/third_party/renderman-26/plugin/hdPrman/framebuffer.h b/third_party/renderman-26/plugin/hdPrman/framebuffer.h
new file mode 100644
index 0000000000..4b85d9970c
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/framebuffer.h
@@ -0,0 +1,107 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_FRAMEBUFFER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_FRAMEBUFFER_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/types.h"
+
+#include "pxr/base/gf/matrix4d.h"
+
+#include "Riley.h"
+
+#include <vector>
+#include <mutex>
+
+class RixContext;
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// A simple framebuffer used to receive display-driver output from PRMan.
+/// This lives in a separate small library so it can be accessible to
+/// both the hdPrman hydra plgin at the d_hydra display driver plugin,
+/// without requiring either to know about the other.
+class HdPrmanFramebuffer 
+{
+public:
+    enum HdPrmanAccumulationRule {
+        k_accumulationRuleFilter,
+        k_accumulationRuleAverage,
+        k_accumulationRuleMin,
+        k_accumulationRuleMax,
+        k_accumulationRuleZmin,
+        k_accumulationRuleZmax,
+        k_accumulationRuleSum
+    };
+
+    struct AovDesc
+    {
+        TfToken name;
+        HdFormat format;
+        VtValue clearValue;
+        HdPrmanAccumulationRule rule;
+
+        bool ShouldNormalizeBySampleCount() const
+        {
+            return format != HdFormatInt32 && rule != k_accumulationRuleMin &&
+                   rule != k_accumulationRuleMax && rule != k_accumulationRuleZmin &&
+                   rule != k_accumulationRuleZmax;
+        }
+    };
+
+    struct AovBuffer
+    {
+        AovDesc desc;
+        std::vector<uint32_t> pixels;
+    };
+
+    using AovDescVector = std::vector<AovDesc>;
+    using AovBufferVector = std::vector<AovBuffer>;
+
+    HdPrmanFramebuffer();
+    ~HdPrmanFramebuffer();
+
+    /// Find a buffer instance with the given ID.
+    /// The expectation is that the buffer will exist, so
+    /// this raises a runtime error if the ID is not found.
+    static HdPrmanFramebuffer* GetByID(int32_t id);
+    static void Register(RixContext*);
+
+    /// Convert the accumulation rule string to the HdPrmanAccumulationRule enum
+    static HdPrmanAccumulationRule ToAccumulationRule(RtUString name);
+
+    /// (Re-)Creates Aov buffers without allocating pixel storage
+    /// (allocated through Resize).
+    void CreateAovBuffers(const AovDescVector &aovDescs);
+
+    /// Resize the buffer.
+    void Resize(int width, int height,
+                int cropXMin=0, int cropYMin=0,
+                int cropWidth=0, int cropHeight=0);
+
+    void Clear();
+
+    std::mutex mutex;
+    AovBufferVector aovBuffers;
+
+    int w, h;
+    int cropOrigin[2];
+    int cropRes[2];
+    int32_t id;
+
+    // Projection matrix (for the depth output).
+    GfMatrix4d proj;
+
+    // Clear functionality.
+    bool pendingClear;
+
+    std::atomic<bool> newData;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_FRAMEBUFFER_H
diff --git a/third_party/renderman-26/plugin/hdPrman/gprim.cpp b/third_party/renderman-26/plugin/hdPrman/gprim.cpp
new file mode 100644
index 0000000000..8909822cec
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/gprim.cpp
@@ -0,0 +1,7 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/gprim.h"
diff --git a/third_party/renderman-26/plugin/hdPrman/gprim.h b/third_party/renderman-26/plugin/hdPrman/gprim.h
new file mode 100644
index 0000000000..dded31efc0
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/gprim.h
@@ -0,0 +1,471 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIM_H
+
+#include "pxr/pxr.h"
+#include "pxr/usd/sdf/types.h"
+#include "pxr/base/gf/matrix4d.h"
+
+#include "hdPrman/gprimbase.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/instancer.h"
+#include "hdPrman/material.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/utils.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// A mix-in template that adds shared gprim behavior to support
+/// various HdRprim types.
+template <typename BASE>
+class HdPrman_Gprim : public BASE, public HdPrman_GprimBase
+{
+public:
+    using BaseType = BASE;
+
+    HdPrman_Gprim(SdfPath const& id)
+        : BaseType(id)
+    {
+    }
+
+    ~HdPrman_Gprim() override = default;
+
+    void
+    Finalize(HdRenderParam *renderParam) override
+    {
+        HdPrman_RenderParam *param =
+            static_cast<HdPrman_RenderParam*>(renderParam);
+        const SdfPath& id = BASE::GetId();
+        riley::Riley *riley = param->AcquireRiley();
+
+        // Release retained conversions of coordSys bindings.
+        param->ReleaseCoordSysBindings(id);
+
+        // Delete instances before deleting the prototypes they use.
+        for (const auto &instId: _instanceIds) {
+            if (instId != riley::GeometryInstanceId::InvalidId()) {
+                riley->DeleteGeometryInstance(
+                    riley::GeometryPrototypeId::InvalidId(), instId);
+            }
+        }
+        _instanceIds.clear();
+
+        // delete instances owned by the instancer.
+        if (HdPrmanInstancer* instancer = param->GetInstancer(
+            BASE::GetInstancerId())) {
+            instancer->Depopulate(renderParam, id);
+        }
+
+        for (const auto &protoId: _prototypeIds) {
+            if (protoId != riley::GeometryPrototypeId::InvalidId()) {
+                riley->DeleteGeometryPrototype(protoId);
+            }
+        }
+        _prototypeIds.clear();
+    }
+
+    void Sync(HdSceneDelegate* sceneDelegate,
+         HdRenderParam*   renderParam,
+         HdDirtyBits*     dirtyBits,
+         TfToken const    &reprToken) override;
+
+protected:
+    HdDirtyBits GetInitialDirtyBitsMask() const override = 0;
+
+    HdDirtyBits
+    _PropagateDirtyBits(HdDirtyBits bits) const override
+    {
+        // By default, just return the same dirty bits we recieved.
+        return bits;
+    }
+
+    void
+    _InitRepr(TfToken const &reprToken,
+              HdDirtyBits *dirtyBits) override
+    {
+        TF_UNUSED(reprToken);
+        TF_UNUSED(dirtyBits);
+        // No-op
+    }
+
+    // We override this member function in mesh.cpp to support the creation
+    // of mesh light prototype geometry.
+    virtual bool
+    _PrototypeOnly()
+    {
+        return false;
+    }
+
+    // Provide a fallback material.  Default grabs _fallbackMaterial
+    // from the context.
+    virtual riley::MaterialId
+    _GetFallbackMaterial(HdPrman_RenderParam *renderParam)
+    {
+        return renderParam->GetFallbackMaterialId();
+    }
+
+    // Populate primType and primvars.
+    virtual RtPrimVarList
+    _ConvertGeometry(HdPrman_RenderParam *renderParam,
+                      HdSceneDelegate *sceneDelegate,
+                      const SdfPath &id,
+                      RtUString *primType,
+                      std::vector<HdGeomSubset> *geomSubsets) = 0;
+
+    // This class does not support copying.
+    HdPrman_Gprim(const HdPrman_Gprim&)             = delete;
+    HdPrman_Gprim &operator =(const HdPrman_Gprim&) = delete;
+
+};
+
+template <typename BASE>
+void
+HdPrman_Gprim<BASE>::Sync(HdSceneDelegate* sceneDelegate,
+                          HdRenderParam*   renderParam,
+                          HdDirtyBits*     dirtyBits,
+                          TfToken const    &reprToken)
+{
+    HD_TRACE_FUNCTION();
+    HF_MALLOC_TAG_FUNCTION();
+    TF_UNUSED(reprToken);
+
+    // Check if there are any relevant dirtyBits.
+    // (See the HdChangeTracker::MarkRprimDirty() note regarding
+    // internalDirtyBits used for internal signaling in Hydra.)
+    static const HdDirtyBits internalDirtyBits = 
+        HdChangeTracker::InitRepr |
+        HdChangeTracker::Varying |
+        HdChangeTracker::NewRepr |
+        HdChangeTracker::CustomBitsMask;
+    // HdPrman does not make use of the repr concept or customBits.
+    *dirtyBits &= ~(HdChangeTracker::NewRepr | HdChangeTracker::CustomBitsMask);
+    // If no relevant dirtyBits remain, return early to avoid acquiring write
+    // access to Riley, which requires a pause and restart of rendering.
+    if (((*dirtyBits & ~internalDirtyBits)
+         & HdChangeTracker::AllSceneDirtyBits) == 0) {
+        return;
+    }
+
+    HdPrman_RenderParam *param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+
+    // Riley API.
+    riley::Riley *riley = param->AcquireRiley();
+
+    // Update instance bindings.
+    BASE::_UpdateInstancer(sceneDelegate, dirtyBits);
+
+    // Prim id
+    SdfPath const& id = BASE::GetId();
+    SdfPath const& instancerId = BASE::GetInstancerId();
+    const bool isHdInstance = !instancerId.IsEmpty();
+    SdfPath primPath = sceneDelegate->GetScenePrimPath(id, 0, nullptr);
+
+    // Prman has a default value for identifier:id of 0 (in case of ray miss),
+    // while Hydra treats id -1 as the clear value.  We map Prman primId as
+    // (Hydra primId + 1) to get around this, here and in
+    // hdPrman/framebuffer.cpp.
+    const int32_t primId = BASE::GetPrimId() + 1;
+
+    // Sample transform
+    HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> xf;
+    sceneDelegate->SampleTransform(id, &xf);
+
+    // Update visibility so thet rprim->IsVisible() will work in render pass
+    if (HdChangeTracker::IsVisibilityDirty(*dirtyBits, id)) {
+        BASE::_UpdateVisibility(sceneDelegate, dirtyBits);
+    }
+
+    // Resolve material binding.  Default to fallbackGprimMaterial.
+    if (*dirtyBits & HdChangeTracker::DirtyMaterialId) {
+#if HD_API_VERSION < 37
+        BASE::_SetMaterialId(sceneDelegate->GetRenderIndex().GetChangeTracker(),
+                             sceneDelegate->GetMaterialId(id));
+#else
+        BASE::SetMaterialId(sceneDelegate->GetMaterialId(id));
+#endif
+    }
+    riley::MaterialId materialId = _GetFallbackMaterial(param);
+    riley::DisplacementId dispId = riley::DisplacementId::InvalidId();
+    const SdfPath & hdMaterialId = BASE::GetMaterialId();
+    HdPrman_ResolveMaterial(sceneDelegate, hdMaterialId, riley, &materialId, &dispId);
+
+    // Convert (and cache) coordinate systems.
+    riley::CoordinateSystemList coordSysList = {0, nullptr};
+    if (HdPrman_RenderParam::RileyCoordSysIdVecRefPtr convertedCoordSys =
+        param->ConvertAndRetainCoordSysBindings(sceneDelegate, id)) {
+        coordSysList.count = convertedCoordSys->size();
+        coordSysList.ids = convertedCoordSys->data();
+    }
+
+    // Hydra dirty bits corresponding to PRMan prototype attributes (also called
+    // "primitive variables" but not synonymous with USD primvars). See prman
+    // docs at https://rmanwiki.pixar.com/display/REN24/Primitive+Variables.
+    static const HdDirtyBits prmanProtoAttrBits = 
+        HdChangeTracker::DirtyPoints |
+        HdChangeTracker::DirtyNormals |
+        HdChangeTracker::DirtyWidths |
+        HdChangeTracker::DirtyTopology;
+
+    // Hydra dirty bits corresponding to prman instance attributes. See prman
+    // docs at https://rmanwiki.pixar.com/display/REN24/Instance+Attributes.
+    static const HdDirtyBits prmanInstAttrBits =
+        HdChangeTracker::DirtyMaterialId |
+        HdChangeTracker::DirtyTransform |
+        HdChangeTracker::DirtyVisibility |
+        HdChangeTracker::DirtyDoubleSided |
+        HdChangeTracker::DirtySubdivTags |
+        HdChangeTracker::DirtyVolumeField |
+        HdChangeTracker::DirtyCategories |
+        HdChangeTracker::DirtyPrimvar;
+
+    //
+    // Create or modify Riley geometry prototype(s).
+    //
+    std::vector<riley::MaterialId> subsetMaterialIds;
+    std::vector<SdfPath> subsetPaths;
+    {
+        RtUString primType;
+        HdGeomSubsets geomSubsets;
+        RtPrimVarList primvars = _ConvertGeometry(param, sceneDelegate, id,
+                         &primType, &geomSubsets);
+
+        // Transfer material opinions of primvars.
+        HdPrman_TransferMaterialPrimvarOpinions(sceneDelegate, hdMaterialId, 
+            primvars);
+
+        // Adjust _prototypeIds array.
+        const size_t oldCount = _prototypeIds.size();
+        const size_t newCount = std::max((size_t) 1, geomSubsets.size());
+        if (newCount != oldCount) {
+            for (const auto &oldPrototypeId: _prototypeIds) {
+                if (oldPrototypeId != riley::GeometryPrototypeId::InvalidId()) {
+                    riley->DeleteGeometryPrototype(oldPrototypeId);
+                }
+            }
+            _prototypeIds.resize(newCount,
+                              riley::GeometryPrototypeId::InvalidId());
+        }
+
+        // Update Riley geom prototypes.
+        if (geomSubsets.empty()) {
+            // Common case: no subsets.
+            TF_VERIFY(newCount == 1);
+            TF_VERIFY(_prototypeIds.size() == 1);
+            primvars.SetString(RixStr.k_stats_prototypeIdentifier,
+                RtUString(primPath.GetText()));
+            if (_prototypeIds[0] == riley::GeometryPrototypeId::InvalidId()) {
+                TRACE_SCOPE("riley::CreateGeometryPrototype");
+                _prototypeIds[0] = riley->CreateGeometryPrototype(
+                    riley::UserId(
+                        stats::AddDataLocation(primPath.GetText()).GetValue()),
+                    primType, dispId, primvars);
+            } else if (*dirtyBits & prmanProtoAttrBits) {
+                TRACE_SCOPE("riley::ModifyGeometryPrototype");
+                riley->ModifyGeometryPrototype(primType, _prototypeIds[0],
+                                               &dispId, &primvars);
+            }
+        } else {
+            // Subsets case.
+            // We resolve materials here, and hold them in subsetMaterialIds:
+            // Displacement networks are passed to the geom prototype;
+            // material networks are passed to the instances.
+            subsetMaterialIds.reserve(geomSubsets.size());
+
+            // We also cache the subset paths for re-use when creating the instances
+            subsetPaths.reserve(geomSubsets.size());
+
+            for (size_t j=0; j < geomSubsets.size(); ++j) {
+                auto& prototypeId = _prototypeIds[j];
+                HdGeomSubset &subset = geomSubsets[j];
+
+                // Convert indices to int32_t and set as k_shade_faceset.
+                std::vector<int32_t> int32Indices(subset.indices.cbegin(),
+                                                  subset.indices.cend());
+                primvars.SetIntegerArray(RixStr.k_shade_faceset,
+                                         int32Indices.data(),
+                                         int32Indices.size());
+                // Look up material override for the subset (if any)
+                riley::MaterialId subsetMaterialId = materialId;
+                riley::DisplacementId subsetDispId = dispId;
+                if (subset.materialId.IsEmpty()) {
+                    subset.materialId = hdMaterialId;
+                }
+                HdPrman_ResolveMaterial(sceneDelegate, subset.materialId,
+                                        riley, &subsetMaterialId, &subsetDispId);
+                subsetMaterialIds.push_back(subsetMaterialId);
+
+                // Look up the path for the subset
+                SdfPath subsetPath = sceneDelegate->GetScenePrimPath(subset.id, 0, nullptr);
+                subsetPaths.push_back(subsetPath);
+                primvars.SetString(RixStr.k_stats_prototypeIdentifier, 
+                    RtUString(subsetPath.GetText()));
+
+                if (prototypeId == riley::GeometryPrototypeId::InvalidId()) {
+                    TRACE_SCOPE("riley::CreateGeometryPrototype");
+                    prototypeId =
+                        riley->CreateGeometryPrototype(
+                            riley::UserId(
+                                stats::AddDataLocation(subsetPath.GetText()).GetValue()),
+                            primType, dispId, primvars);
+                } else if (*dirtyBits & prmanProtoAttrBits) {
+                    TRACE_SCOPE("riley::ModifyGeometryPrototype");
+                    riley->ModifyGeometryPrototype(primType, prototypeId,
+                                                &subsetDispId, &primvars);
+                }
+            }
+        }
+        *dirtyBits &= ~prmanProtoAttrBits;
+    }
+
+    //
+    // Stop here, or also create geometry instances?
+    //
+    if (_PrototypeOnly()) {
+        *dirtyBits &= ~HdChangeTracker::AllSceneDirtyBits;
+        return;
+    }
+
+    //
+    // Create or modify Riley geometry instances.
+    //
+    
+    // Resolve attributes.
+    RtParamList attrs = param->ConvertAttributes(sceneDelegate, id, true);
+
+    // Add "identifier:id" with the prim id.
+    attrs.SetInteger(RixStr.k_identifier_id, primId);
+
+    if (!isHdInstance) {
+        // Simple case: Singleton instance.
+        // Convert transform.
+        TfSmallVector<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES> xf_rt(xf.count);
+        for (size_t i=0; i < xf.count; ++i) {
+            xf_rt[i] = HdPrman_Utils::GfMatrixToRtMatrix(xf.values[i]);
+        }
+        const riley::Transform xform = {
+            unsigned(xf.count), 
+            xf_rt.data(), 
+            xf.times.data()};
+
+        // Add "identifier:id2" with the instance number.
+        // XXX Do we want to distinguish facesets here?
+        attrs.SetInteger(RixStr.k_identifier_id2, 0);
+
+        // Adjust _instanceIds array.
+        const size_t oldCount = _instanceIds.size();
+        const size_t newCount = _prototypeIds.size();
+        if (newCount != oldCount) {
+            for (const auto &oldInstanceId: _instanceIds) {
+                if (oldInstanceId != riley::GeometryInstanceId::InvalidId()) {
+                    riley->DeleteGeometryInstance(
+                        riley::GeometryPrototypeId::InvalidId(), oldInstanceId);
+                }
+            }
+            _instanceIds.resize(
+                newCount,
+                riley::GeometryInstanceId::InvalidId());
+        }
+
+        // Create or modify Riley instances corresponding to a
+        // singleton Hydra instance.
+        TF_VERIFY(_instanceIds.size() == _prototypeIds.size());
+        for (size_t j=0; j < _prototypeIds.size(); ++j) {
+            auto const& prototypeId = _prototypeIds[j];
+            auto& instanceId = _instanceIds[j];
+            auto instanceMaterialId = materialId;
+            RtParamList finalAttrs = attrs; // copy
+
+            // If a subset path was cached, use it. If not, use the prim path.
+            SdfPath* subsetPath(&primPath);
+            if (!subsetPaths.empty()) {
+                subsetPath = &subsetPaths[j];
+            }
+
+            finalAttrs.SetString(RixStr.k_identifier_name,
+                RtUString(subsetPath->GetText()));
+
+            // If a valid subset material was bound, use it.
+            if (!subsetMaterialIds.empty()) {
+                TF_VERIFY(j < subsetMaterialIds.size());
+                instanceMaterialId = subsetMaterialIds[j];
+            }
+            
+            // Very last thing: prepend renderTag to grouping:membership
+            param->AddRenderTagToGroupingMembership(
+                sceneDelegate->GetRenderTag(id), finalAttrs);
+
+            if (instanceId == riley::GeometryInstanceId::InvalidId()) {
+                TRACE_SCOPE("riley::CreateGeometryInstance");
+                instanceId = riley->CreateGeometryInstance(
+                    riley::UserId(
+                        stats::AddDataLocation(subsetPath->GetText()).GetValue()),
+                    riley::GeometryPrototypeId::InvalidId(), prototypeId,
+                    instanceMaterialId, coordSysList, xform, finalAttrs);
+            } else if (*dirtyBits & prmanInstAttrBits) {
+                TRACE_SCOPE("riley::ModifyGeometryInstance");
+                riley->ModifyGeometryInstance(
+                    riley::GeometryPrototypeId::InvalidId(),
+                    instanceId, &instanceMaterialId, &coordSysList, &xform,
+                    &finalAttrs);
+            }
+        }
+        *dirtyBits &= ~prmanInstAttrBits;
+    } else if ((*dirtyBits & prmanInstAttrBits)
+        || HdChangeTracker::IsInstancerDirty(*dirtyBits, instancerId)) {
+        // This gprim is a prototype of a hydra instancer. (It is not itself an 
+        // instancer because it is a gprim.) The riley geometry prototypes have
+        // already been synced above, and those are owned by this gprim instance.
+        // We need to tell the hdprman instancer to sync its riley instances for 
+        // these riley prototypes.
+        //
+        // We won't make any riley instances here. The hdprman instancer will
+        // own the riley instances instead.
+        //
+        // We only need to do this if dirtyBits says the instancer is dirty.
+
+        HdRenderIndex &renderIndex = sceneDelegate->GetRenderIndex();
+
+        // first, sync the hydra instancer and its parents, from the bottom up. 
+        // (note: this is transitional code, it should be done by the render index...)
+        HdInstancer::_SyncInstancerAndParents(renderIndex, instancerId);
+
+        if (subsetMaterialIds.size() == 0) {
+            subsetMaterialIds.push_back(materialId);
+        }
+        if (subsetPaths.size() == 0) {
+            subsetPaths.push_back(primPath);
+        }
+        TF_VERIFY(_prototypeIds.size() == subsetMaterialIds.size() &&
+                  _prototypeIds.size() == subsetPaths.size(),
+                  "size mismatch (%lu, %lu, %lu)\n", _prototypeIds.size(),
+                  subsetMaterialIds.size(), subsetPaths.size());
+
+        // next, tell the hdprman instancer to sync the riley instances
+        HdPrmanInstancer *instancer = static_cast<HdPrmanInstancer*>(
+            renderIndex.GetInstancer(instancerId));
+        if (instancer) {
+            instancer->Populate(
+                renderParam,
+                dirtyBits,
+                id,
+                _prototypeIds,
+                coordSysList,
+                attrs, xf,
+                subsetMaterialIds,
+                subsetPaths);
+        }
+    }
+    *dirtyBits &= ~HdChangeTracker::AllSceneDirtyBits;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIM_H
diff --git a/third_party/renderman-26/plugin/hdPrman/gprimbase.cpp b/third_party/renderman-26/plugin/hdPrman/gprimbase.cpp
new file mode 100644
index 0000000000..3cc15c1acf
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/gprimbase.cpp
@@ -0,0 +1,22 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "hdPrman/gprimbase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_GprimBase::~HdPrman_GprimBase() = default; 
+
+std::vector<riley::GeometryPrototypeId> 
+HdPrman_GprimBase::GetPrototypeIds() const
+{
+    const std::vector<riley::GeometryPrototypeId> ret(_prototypeIds);
+    return ret;
+}
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/gprimbase.h b/third_party/renderman-26/plugin/hdPrman/gprimbase.h
new file mode 100644
index 0000000000..9477bb8031
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/gprimbase.h
@@ -0,0 +1,35 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIMBASE_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIMBASE_H
+
+#include "pxr/pxr.h"
+
+#include <Riley.h>
+#include <RileyIds.h>
+
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// A common base class for HdPrman_Gprim types
+class HdPrman_GprimBase
+{
+public:
+    HdPrman_GprimBase() = default;
+    virtual ~HdPrman_GprimBase() = 0;
+
+    std::vector<riley::GeometryPrototypeId> GetPrototypeIds() const;
+
+protected:
+    std::vector<riley::GeometryPrototypeId> _prototypeIds;
+    std::vector<riley::GeometryInstanceId> _instanceIds;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_GPRIM_H
diff --git a/third_party/renderman-26/plugin/hdPrman/hdPrmanGenParsers.py b/third_party/renderman-26/plugin/hdPrman/hdPrmanGenParsers.py
new file mode 100644
index 0000000000..8d4730bdcb
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/hdPrmanGenParsers.py
@@ -0,0 +1,318 @@
+#!/usr/bin/env python
+#
+# Copyright 2019 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+
+from __future__ import print_function
+
+from tempfile import mkdtemp
+from argparse import ArgumentParser
+from sys import exit, stdout 
+from os import listdir, mkdir, getcwd, chdir, rename, access, W_OK
+from os.path import abspath, basename, join, splitext, isfile, dirname, exists
+from subprocess import call
+from shutil import rmtree, copyfile
+from difflib import unified_diff
+
+# -----------------------------------------------------------------------------
+# Validation functions.
+# This section contains code that will gather/report diffs between the generated
+# code and the installed files as well as installing generating files which
+# pass validation.
+# -----------------------------------------------------------------------------
+def _compareFiles(installedFiles, generatedFiles, configuration):
+    failOnDiff = configuration[VALIDATE]
+
+    if len(installedFiles) != len(generatedFiles):
+        installedNames = set(map(basename, installedFiles))
+        generatedNames = set(map(basename, generatedFiles))
+
+        if (generatedNames - installedNames):
+            exit('*** Unknown files generated, please add them to the list of '
+                 'base files names in hdPrmanGenParsers.py')
+
+        exit('*** Missing files:\n' + '\n'.join(installedNames - generatedNames))
+
+    diffs = {}
+    for i in range(0, len(installedFiles)):
+        installedExists = isfile(installedFiles[i])
+        generatedExists = isfile(generatedFiles[i])
+
+        if installedExists and not generatedExists:
+            diffs[basename(installedFile.name)] = "File not generated"
+            continue
+
+        if not installedExists and generatedExists:
+            diffs[basename(installedFiles[i])] = "Installed file does not exist"
+            continue
+
+        with open(installedFiles[i], 'r') as installedFile,\
+             open(generatedFiles[i], 'r') as generatedFile:
+            
+            installedContent = installedFile.read()
+            generatedContent = generatedFile.read()
+
+            if installedContent != generatedContent:
+                diff = '\n'.join(unified_diff(installedContent.split('\n'),
+                                              generatedContent.split('\n'),
+                                              'Source ' + installedFile.name,
+                                              'Generated ' + generatedFile.name))
+                diffs[basename(installedFile.name)] = diff
+
+    if diffs and failOnDiff:
+        exit('*** Differing Generated Files:\n' + '\n'.join(diffs.values()))
+
+    return diffs
+
+def _copyGeneratedFiles(installedFiles, generatedFiles, diffs):
+    baseNames = [basename(installedFile) for installedFile in installedFiles]
+    for baseName, generatedFile, installedFile in zip(baseNames, 
+                                                      generatedFiles, 
+                                                      installedFiles):
+        if baseName in diffs:
+            print('Changed: ' + baseName)
+            print(diffs[baseName])
+            if isfile(installedFile) and not access(installedFile, W_OK):
+                print('Cannot author ' + installedFile + ', (no write access).')
+            else:
+                copyfile(generatedFile, installedFile) 
+        else:
+            print('Unchanged: ' + baseName)
+
+# -----------------------------------------------------------------------------
+# Code generation functions.
+# This section contains the code that will actually generate the C++ source
+# and headers from the yy/ll source files as well as the code which will
+# curate the generated code.
+# -----------------------------------------------------------------------------
+def _runBisonAndFlexCommands(configuration):
+    # build up collections of all relevant files, these include 
+    # yy/ll source files, as well as the generated C++ header
+    # and source files.
+    srcDir   = configuration[SRC_DIR]
+    destDir  = configuration[DEST_DIR]
+    bases    = configuration[BASES]
+
+    bisonFiles      = [join(srcDir, base + '.yy') for base in bases] 
+    flexFiles       = [join(srcDir, base + '.ll') for base in bases]
+    bisonGenSources = [join(destDir, base + '.tab.cpp') for base in bases]
+    bisonGenHeaders = [join(destDir, base + '.tab.hpp') for base in bases]
+    flexGenSources  = [join(destDir, base + '.lex.cpp') for base in bases]
+
+    sourceFiles    = bisonFiles + flexFiles
+    generatedFiles = bisonGenHeaders + bisonGenSources + flexGenSources
+
+    # generate all components of a flex/bison command, these
+    # include the desired executables, flag settings 
+    bisonFlags = lambda base: ['-d', '-p', base + 'Yy', '-o']
+    flexFlags  = lambda base: ['-P'+ base + "Yy", '-t']  
+
+    bisonExecutable = configuration[BISON_EXE]
+    flexExecutable  = configuration[FLEX_EXE]
+    
+    bisonCommand = lambda index: ([bisonExecutable]
+                                  + bisonFlags(base) 
+                                  + [bisonGenSources[index]] 
+                                  + [bisonFiles[index]])
+
+    flexCommand  = lambda index: ([flexExecutable] 
+                                  + flexFlags(base)
+                                  + [flexFiles[index]])
+    
+    for index, base in enumerate(bases):
+        print('Running bison on %s' % (base + '.yy'))
+        call(bisonCommand(index))
+
+        print('Running flex on %s' % (base + '.ll'))
+        with open(flexGenSources[index], 'w') as outputFile:
+            call(flexCommand(index), stdout=outputFile)
+
+    # prepend license header to all generated files.
+    licenseText = '\n'.join([
+    "//"
+    , "// Copyright 2019 Pixar"
+    , "//"
+    , "// Licensed under the Apache License, Version 2.0 (the \"Apache License\")"
+    , "// with the following modification; you may not use this file except in"
+    , "// compliance with the Apache License and the following modification to it:"
+    , "// Section 6. Trademarks. is deleted and replaced with:"
+    , "//"
+    , "// 6. Trademarks. This License does not grant permission to use the trade"
+    , "//    names, trademarks, service marks, or product names of the Licensor"
+    , "//    and its affiliates, except as required to comply with Section 4(c) of"
+    , "//    the License and to reproduce the content of the NOTICE file."
+    , "//"
+    , "// You may obtain a copy of the Apache License at"
+    , "//"
+    , "//     http://www.apache.org/licenses/LICENSE-2.0"
+    , "//"
+    , "// Unless required by applicable law or agreed to in writing, software"
+    , "// distributed under the Apache License with the above modification is"
+    , "// distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
+    , "// KIND, either express or implied. See the Apache License for the specific"
+    , "// language governing permissions and limitations under the Apache License."
+    , "//\n"])
+
+    for generatedFile in generatedFiles:
+        with open(generatedFile, 'r') as f:
+            lines = f.read()
+        with open(generatedFile, 'w') as f:
+            f.write(licenseText)
+            f.write(lines)
+
+    return sourceFiles, generatedFiles
+
+def _canonicalizeFiles(sourceFiles, generatedFiles):
+    PXR_PREFIX_PATH = 'hdPrman'
+
+    # by default, bison will output hpp header files, we don't want this
+    # as it goes against our convention of .h for headers. More recent
+    # versions of bison support this option directly.
+    #
+    # We also need to update the paths in the generated #line directives
+    # so we can easily diff the generated and installed files.
+
+    # 'renamed' represents the renamed files on disk, whereas the identifiers
+    # are altered paths that will be used in #line directives in the source
+    renamed = list(generatedFiles)
+    identifiers = list(generatedFiles)
+
+    # rename hpp files to h, also update our index of renamed files
+    # and identifiers(these will be used when scrubbing the files' contents)
+    for index, fileName in enumerate(generatedFiles):
+        if 'hpp' in fileName:
+            newName = fileName.replace('.hpp', '.h')
+            rename(fileName, newName)
+            renamed[index] = newName
+            identifiers[index] = newName
+
+    # identifiers includes the sourceFiles(yy,ll files) because 
+    # they are also referred to in line directives
+    identifiers += sourceFiles
+    for index, fileName in enumerate(list(renamed + sourceFiles)):
+        if '/' in fileName:
+            identifiers[index] = join(PXR_PREFIX_PATH, basename(fileName))
+
+    # create a list of pairs, representing the things to replace in our
+    # generated files
+    replacements = [] 
+    for index, fileName in enumerate(list(generatedFiles+sourceFiles)):
+        oldFileName = fileName
+        newFileName = identifiers[index]
+        replacements.append((oldFileName, newFileName))
+
+    for renamedFile in renamed:
+        print('Canonicalizing ' + basename(renamedFile))
+
+        with open(renamedFile, 'r+') as inputFile:
+            data = inputFile.read()
+            
+            # find and replace all generated file names
+            print('... Fixing line directives')
+            for oldFileName, newFileName in replacements:
+                data = data.replace(oldFileName, newFileName)
+
+            # flex versions older than 2.6 emit the register keyword
+            # which is no longer supported as of C++17. To support
+            # these versions, we manually strip 'register' from each
+            # .lex.cpp file. This is hacky, since it could affect 
+            # hand-written parser code that uses the word "register".
+            # In practice, none of our parser code does this.
+            #
+            # XXX: Remove this when we stop supporting older flex versions
+            if renamedFile.endswith('.lex.cpp'):
+                print('... Removing register keyword')
+                data = data.replace("register ", "")
+            
+            # we seek to 0 and truncate as we intend 
+            # to overwrite the existing data in the file
+            inputFile.seek(0)
+            inputFile.write(data)
+            inputFile.truncate()
+
+    return renamed
+
+# -----------------------------------------------------------------------------
+# Configuration info.
+# This section of code discerns all the necessary info the run the parser
+# and lexical analyzer generators over the source files.
+# -----------------------------------------------------------------------------
+def _parseArguments():
+    parser = ArgumentParser(description='Generate Ascii File Parsers for HdPrman')
+    parser.add_argument('--srcDir', required=False, default=getcwd(),
+                        help='The source directory.')
+    parser.add_argument('--bison', required=True, 
+                        help='The location of the bison executable to be used.')
+    parser.add_argument('--flex', required=True,                         
+                        help='The location of the flex executable to be used.')
+    parser.add_argument('--validate', action='store_true',
+                        help='Verify that the source files are unchanged.')
+    parser.add_argument('--bases', nargs='+',
+                        help='Base file identifiers used for generation.')
+    return parser.parse_args()
+
+# Configuration constants
+DEST_DIR   = 0
+SRC_DIR    = 1
+VALIDATE   = 2
+BASES      = 3
+BISON_EXE  = 4
+FLEX_EXE   = 5
+
+def _getConfiguration():
+    arguments = _parseArguments()
+
+    config = { VALIDATE  : arguments.validate,
+               SRC_DIR   : arguments.srcDir,
+               DEST_DIR  : mkdtemp(),
+               BISON_EXE : arguments.bison,
+               FLEX_EXE  : arguments.flex,
+               BASES     : arguments.bases }
+               
+    # Ensure all optional arguments get properly populated
+    if not arguments.bases:
+        allFiles = listdir(arguments.srcDir)
+        validExts = ['.yy', '.ll']
+        relevantFiles = [f for f in allFiles if splitext(f)[1] in validExts]
+        bases = list(set(map(lambda f: splitext(f)[0], relevantFiles)))
+
+        if not bases:
+            exit('*** Unable to find source files for parser. Ensure that they '
+                 'are in the source directory(--srcDir). If unspecified, the '
+                 'source directory is assumed to be the current directory.')
+
+        config[BASES] = bases 
+
+    return config
+
+# -----------------------------------------------------------------------------
+
+def _printSection(sectionInfo):
+    print('+-------------------------------------------------+')
+    print(sectionInfo)
+    print('+-------------------------------------------------+')
+
+if __name__ == '__main__':
+    configuration = _getConfiguration()
+
+    _printSection('Running flex and bison on sources')
+    sourceFiles, generatedFiles = _runBisonAndFlexCommands(configuration)
+
+    _printSection('Canonicalizing generated files')
+    generatedFiles = _canonicalizeFiles(sourceFiles, generatedFiles)
+    
+    diffSectionMsg = 'Checking for diffs'
+    if configuration[VALIDATE]:
+        diffSectionMsg = diffSectionMsg + '(validation on)'
+
+    _printSection(diffSectionMsg)
+    installedFiles = [join(configuration[SRC_DIR], basename(f)) 
+                      for f in generatedFiles]
+
+    diffs = _compareFiles(installedFiles, generatedFiles, configuration)
+    _copyGeneratedFiles(installedFiles, generatedFiles, diffs) 
+    # If validation passed, clean up the generated files
+    rmtree(configuration[DEST_DIR])
diff --git a/third_party/renderman-26/plugin/hdPrman/hdSchemaDefs.py b/third_party/renderman-26/plugin/hdPrman/hdSchemaDefs.py
new file mode 100644
index 0000000000..ff1efedfe4
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/hdSchemaDefs.py
@@ -0,0 +1,499 @@
+#
+# Copyright 2023 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+[
+    dict(
+        SCHEMA_NAME = 'ALL_SCHEMAS',
+        LIBRARY_PATH = 'ext/rmanpkg/plugin/renderman/plugin/hdPrman',
+        INCLUDE_PATH = 'hdPrman',
+        VERSION_GUARD_CONST_GETTER = True
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyParam
+    dict(
+        SCHEMA_NAME = 'RileyParam',
+        MEMBERS = [
+            ('value', T_SAMPLED, {}),
+            ('role', T_TOKEN,
+             dict(DOC = '''
+             Disambiguates what call to RtParamList::SetFOO to use.
+
+             Can take values from HdPrimvarRoleTokens and
+             HdPrmanRileyAdditionalRoleTokens.''')),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyParamList
+    dict(
+        DOC = '''
+        Schema to describe RtParamList.
+
+        To obtain an RtParamList from this schema, we call the appropriate
+        RtParamList::SetFOO(name, value) for each name in the container params.
+
+        The schema {{LIBRARY_NAME}}RileyParamSchema determines what SetFOO
+        method is called with what value. To resolve what SetFOO method to use,
+        the type of the VtValue from the value data source is used as well as
+        the role token if necessary. The value is coming from the value data
+        source.
+        ''',
+        SCHEMA_NAME = 'RileyParamList',
+        SCHEMA_INCLUDES = ['hdPrman/rileySchemaTypeDefs'],
+        MEMBERS = [
+            ('params', 'HdPrmanRileyParamContainerSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyPrimvar
+    dict(
+        SCHEMA_NAME = 'RileyPrimvar',
+        MEMBERS = [
+            ('value', T_SAMPLED, {}),
+            ('detailType', T_TOKEN, {}),
+            ('role', T_TOKEN,
+             dict(DOC = '''
+             Disambiguates what call to RtPrimvarList::SetFOO to use.
+
+             Can take values from HdPrimvarRoleTokens and
+             HdPrmanRileyAdditionalRoleTokens.''')),
+        ],
+
+        STATIC_TOKEN_DATASOURCE_BUILDERS = [
+            ('detailType', ['constant',
+                            'uniform',
+                            'vertex',
+                            'varying',
+                            'facevarying',
+                            'reference']),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyPrimvarList
+    dict(
+        DOC = '''
+        Schema to describe RtPrimvarList.
+
+        To obtain an RtPrimvarList we pass numUniform, numVertex,
+        numVarying, numFaceVarying to the constructor, call
+        RtPrimvarList::SetTimes if "P" (for points) is among the params and has
+        samples and finally call the appropriate
+        RtPrimvarList::SetFOO[Detail](
+            name, value[, detailType[, sampleTimeIndex]]).
+
+        The {{LIBRARY_NAME}}RileyPrimvarSchema determines what SetFOO[Detail]
+        method is valled with what value, detailType or sampleTimeIndex.
+
+        For many data types or when detailType is constant, the behavior is
+        the same as for the {{LIBRARY_NAME}}RileyParamSchema.
+
+        Otherweise, we call SetFooDetail using {{LIBRARY_NAME}}RileyParamSchema
+        similar as we did for {{LIBRARY_NAME}}RileyParamSchema but consuming
+        the detailType data source as well. The value data source is only
+        sampled at time 0.
+
+        The "P" param is treated specially. It is the only param for which take
+        time samples (from the sampled value data source) and always corresponds
+        to a call to RtPrimvarList::SetPointDetail with detailType = vertex.
+        ''',
+        SCHEMA_NAME = 'RileyPrimvarList',
+        SCHEMA_INCLUDES = ['hdPrman/rileySchemaTypeDefs'],
+        MEMBERS = [
+            ('numUniform', T_SIZET, {}),
+            ('numVertex', T_SIZET, {}),
+            ('numVarying', T_SIZET, {}),
+            ('numFaceVarying', T_SIZET, {}),
+            ('params', 'HdPrmanRileyPrimvarContainerSchema', {}),
+        ],
+
+        EXTRA_TOKENS = [
+            'P',
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyShadingNode
+    dict(
+        SCHEMA_NAME = 'RileyShadingNode',
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('type', T_TOKEN, {}),
+            ('name', T_TOKEN, {}),
+            ('handle', T_TOKEN, {}),
+            ('params', 'HdPrmanRileyParamListSchema', {}),
+        ],
+        STATIC_TOKEN_DATASOURCE_BUILDERS = [
+            ('type', ['pattern',
+                      'bxdf',
+                      'integrator',
+                      'light',
+                      'lightFilter',
+                      'projection',
+                      'displacement',
+                      'sampleFilter',
+                      'displayFilter']),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    #
+    #
+    # Schema's corresponding to riley globals.
+    #
+    #
+    # hdPrman/rileyGlobals
+    dict(
+        SCHEMA_NAME = 'RileyGlobals',
+        SCHEMA_TOKEN = 'rileyGlobals',
+        ADD_DEFAULT_LOCATOR = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('options', 'HdPrmanRileyParamListSchema', {})
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    #
+    #
+    # Schema's corresponding to riley prims.
+    #
+    #
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyCamera
+    dict(
+        SCHEMA_NAME = 'RileyCamera',
+        SCHEMA_TOKEN = 'rileyCamera',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyShadingNodeSchema',
+                           'hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('name', T_TOKEN,
+             dict(RILEY_CONVERTER='HdPrman_RileyUniqueString',
+                  RILEY_NO_MODIFY=True)),
+            ('projection', 'HdPrmanRileyShadingNodeSchema', {}),
+            ('xform', T_MATRIX, {}),
+            ('properties', 'HdPrmanRileyParamListSchema', {}),
+        ],
+        EXTRA_TOKENS = [
+            'nearClip',
+            'farClip',
+            'focusregion',
+            'dofaspect',
+            'apertureNSides',
+            'apertureAngle',
+            'apertureRoundness',
+            'apertureDensity',
+            'shutterOpenTime',
+            'shutterCloseTime',
+            'shutteropening',
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyClippingPlane
+    dict(
+        SCHEMA_NAME = 'RileyClippingPlane',
+        SCHEMA_TOKEN = 'rileyClippingPlane',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        NO_RILEY_USER_ID = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('xform', T_MATRIX, {}),
+            ('params', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyCoordinateSystem
+    dict(
+        SCHEMA_NAME = 'RileyCoordinateSystem',
+        SCHEMA_TOKEN = 'rileyCoordinateSystem',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        ADD_RILEY_ID_LIST = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('xform', T_MATRIX, {}),
+            ('attributes', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyDisplacement
+    dict(
+        SCHEMA_NAME = 'RileyDisplacement',
+        SCHEMA_TOKEN = 'rileyDisplacement',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileySchemaTypeDefs',
+                           'hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('displacement', 'HdPrmanRileyShadingNodeVectorSchema', {}),
+            ('attributes', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyDisplay
+    dict(
+        SCHEMA_NAME = 'RileyDisplay',
+        SCHEMA_TOKEN = 'rileyDisplay',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('renderTarget', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyRenderTarget")),
+            ('name', T_TOKEN, {}),
+            ('driver', T_TOKEN, {}),
+            ('renderOutputs', T_PATHARRAY,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyRenderOutput")),
+            ('driverParams', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyDisplayFilter
+    dict(
+        SCHEMA_NAME = 'RileyDisplayFilter',
+        SCHEMA_TOKEN = 'rileyDisplayFilter',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileySchemaTypeDefs',
+                           'hdPrman/rileyParamListSchema'],
+        ADD_RILEY_ID_LIST = True,
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('displayFilter', 'HdPrmanRileyShadingNodeVectorSchema', {}),
+            ('attributes', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyGeometryInstance
+    dict(
+        SCHEMA_NAME = 'RileyGeometryInstance',
+        SCHEMA_TOKEN = 'RileyGeometryInstance',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('groupPrototype', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyGeometryPrototype",
+                  RILEY_NO_MODIFY=True)),
+            ('geoPrototype', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyGeometryPrototype",
+                  RILEY_NO_MODIFY=True)),
+            ('material', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyMaterial")),
+            ('coordsys', T_PATHARRAY,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyCoordinateSystem")),
+            ('xform', T_MATRIX, {}),
+            ('attributes', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyGeometryPrototype
+    dict(
+        SCHEMA_NAME = 'RileyGeometryPrototype',
+        SCHEMA_TOKEN = 'RileyGeometryPrototype',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyPrimvarListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('type', T_TOKEN,
+             dict(RILEY_NO_MODIFY=True)),
+            ('displacement', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyDisplacement")),
+            ('primvars', 'HdPrmanRileyPrimvarListSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyIntegrator
+    dict(
+        SCHEMA_NAME = 'RileyIntegrator',
+        SCHEMA_TOKEN = 'rileyIntegrator',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyShadingNodeSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('integratorNode', 'HdPrmanRileyShadingNodeSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyLightInstance
+    dict(
+        SCHEMA_NAME = 'RileyLightInstance',
+        SCHEMA_TOKEN = 'RileyLightInstance',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('groupPrototype', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyGeometryPrototype",
+                  RILEY_NO_MODIFY=True)),
+            ('geoPrototype', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyGeometryPrototype",
+                  RILEY_NO_MODIFY=True)),
+            ('material', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyMaterial")),
+            ('lightShader', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyLightShader")),
+            ('coordsys', T_PATHARRAY,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyCoordinateSystem")),
+            ('xform', T_MATRIX, {}),
+            ('attributes', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyLightShader
+    dict(
+        SCHEMA_NAME = 'RileyLightShader',
+        SCHEMA_TOKEN = 'rileyLightShader',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileySchemaTypeDefs'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('light', 'HdPrmanRileyShadingNodeVectorSchema', {}),
+            ('lightFilter', 'HdPrmanRileyShadingNodeVectorSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyMaterial
+    dict(
+        SCHEMA_NAME = 'RileyMaterial',
+        SCHEMA_TOKEN = 'rileyMaterial',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileySchemaTypeDefs',
+                           'hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('bxdf', 'HdPrmanRileyShadingNodeVectorSchema', {}),
+            ('attributes', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyRenderOutput
+    dict(
+        SCHEMA_NAME = 'RileyRenderOutput',
+        SCHEMA_TOKEN = 'rileyRenderOutput',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        ADD_RILEY_ID_LIST = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('name', T_TOKEN, {}),
+            ('type', T_TOKEN,
+             dict(RILEY_CONVERTER = "HdPrman_RileyRenderOutputType")),
+            ('source', T_TOKEN, {}),
+            ('accumulationRule', T_TOKEN, {}),
+            ('filter', T_TOKEN, {}),
+            ('filterSize', T_VEC2F,
+             dict(RILEY_CONVERTER = "HdPrman_RileyFilterSize")),
+            ('relativePixelVariance', T_FLOAT,
+             dict(FALLBACK_VALUE = "1.0f")),
+            ('params', 'HdPrmanRileyParamListSchema', {}),
+        ],
+        STATIC_TOKEN_DATASOURCE_BUILDERS = [
+            ('type', ['(float_, "float")', 'integer', 'color', 'vector']),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyRenderTarget
+    dict(
+        SCHEMA_NAME = 'RileyRenderTarget',
+        SCHEMA_TOKEN = 'rileyRenderTarget',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('renderOutputs', T_PATHARRAY,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyRenderOutput")),
+            ('extent', T_VEC3I,
+             dict(RILEY_CONVERTER = "HdPrman_RileyExtent")),
+            ('filterMode', T_TOKEN, {}),
+            ('pixelVariance', T_FLOAT,
+             dict(FALLBACK_VALUE = "1.0f")),
+            ('params', 'HdPrmanRileyParamListSchema', {}),
+        ],
+        STATIC_TOKEN_DATASOURCE_BUILDERS = [
+            ('filterMode', ['importance', 'weighted']),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileyRenderView
+    dict(
+        SCHEMA_NAME = 'RileyRenderView',
+        SCHEMA_TOKEN = 'rileyRenderView',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileyParamListSchema'],
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('renderTarget', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyRenderTarget")),
+            ('camera', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyCamera")),
+            ('integrator', T_PATH,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyIntegrator")),
+            ('displayFilters', T_PATHARRAY,
+             dict(RILEY_RELATIONSHIP_TARGET="RileyDisplayFilter")),
+            ('sampleFilters', T_PATHARRAY,
+             dict(RILEY_RELATIONSHIP_TARGET="RileySampleFilter")),
+            ('params', 'HdPrmanRileyParamListSchema', {}),
+        ],
+        STATIC_TOKEN_DATASOURCE_BUILDERS = [
+            ('filterMode', ['importance', 'weighted']),
+        ],
+    ),
+
+    #--------------------------------------------------------------------------
+    # hdPrman/rileySampleFilter
+    dict(
+        SCHEMA_NAME = 'RileySampleFilter',
+        SCHEMA_TOKEN = 'rileySampleFilter',
+        ADD_DEFAULT_LOCATOR = True,
+        GENERATE_RILEY_PRIM = True,
+        SCHEMA_INCLUDES = ['hdPrman/rileySchemaTypeDefs',
+                           'hdPrman/rileyParamListSchema'],
+        ADD_RILEY_ID_LIST = True,
+        MEMBERS = [
+            ('ALL_MEMBERS', '', dict(ADD_LOCATOR=True)),
+            ('sampleFilter', 'HdPrmanRileyShadingNodeVectorSchema', {}),
+            ('attributes', 'HdPrmanRileyParamListSchema', {}),
+        ],
+    ),
+]
diff --git a/third_party/renderman-26/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..662e33a173
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.cpp
@@ -0,0 +1,95 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/implicitSurfaceSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hdsi/implicitSurfaceSceneIndex.h"
+
+#include "pxr/base/tf/envSetting.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_ENV_SETTING(HDPRMAN_TESSELLATE_IMPLICIT_SURFACES, false,
+    "Tessellate implicit surfaces into meshes, "
+    "instead of using Renderman implicits");
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_ImplicitSurfaceSceneIndexPlugin"))
+);
+
+static const char * const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<HdPrman_ImplicitSurfaceSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 0;
+
+    // Prman natively supports various quadric primitives (including cone,
+    // cylinder and sphere), generating them such that they are rotationally
+    // symmetric about the Z axis. To support other spine axes, configure the
+    // scene index to overload the transform to account for the change of basis.
+    // For unsupported primitives such as capsules and cubes, generate the
+    // mesh instead.
+    // 
+    HdDataSourceBaseHandle const axisToTransformSrc =
+        HdRetainedTypedSampledDataSource<TfToken>::New(
+            HdsiImplicitSurfaceSceneIndexTokens->axisToTransform);
+    HdDataSourceBaseHandle const toMeshSrc =
+        HdRetainedTypedSampledDataSource<TfToken>::New(
+            HdsiImplicitSurfaceSceneIndexTokens->toMesh);
+
+    static bool tessellate =
+        (TfGetEnvSetting(HDPRMAN_TESSELLATE_IMPLICIT_SURFACES) == true);
+
+    HdContainerDataSourceHandle inputArgs;
+    if (tessellate) {
+        // Tessellate everything (legacy behavior).
+        inputArgs =
+            HdRetainedContainerDataSource::New(
+                HdPrimTypeTokens->sphere, toMeshSrc,
+                HdPrimTypeTokens->cube, toMeshSrc,
+                HdPrimTypeTokens->cone, toMeshSrc,
+                HdPrimTypeTokens->cylinder, toMeshSrc,
+                HdPrimTypeTokens->capsule, toMeshSrc);
+    } else {
+        // Cone and cylinder need transforms updated, and cube and capsule still
+        // need to be tessellated.
+        inputArgs =
+            HdRetainedContainerDataSource::New(
+                HdPrimTypeTokens->cone, axisToTransformSrc,
+                HdPrimTypeTokens->cylinder, axisToTransformSrc,
+                HdPrimTypeTokens->cube, toMeshSrc,
+                HdPrimTypeTokens->capsule, toMeshSrc);
+    }
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        inputArgs,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+HdPrman_ImplicitSurfaceSceneIndexPlugin::
+HdPrman_ImplicitSurfaceSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_ImplicitSurfaceSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdsiImplicitSurfaceSceneIndex::New(inputScene, inputArgs);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.h
new file mode 100644
index 0000000000..41361094bf
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/implicitSurfaceSceneIndexPlugin.h
@@ -0,0 +1,36 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef PXR_IMAGING_HDPRMAN_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
+#define PXR_IMAGING_HDPRMAN_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_ImplicitSurfaceSceneIndexPlugin
+///
+/// Prman scene index plugin that configures the implicit surface scene index to
+/// generate meshes for implicit surfaces that aren't natively supported by
+/// Prman, and overload the transform (to account for different spine axes) for
+/// natively supported quadrics.
+///
+class HdPrman_ImplicitSurfaceSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_ImplicitSurfaceSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HDPRMAN_IMPLICIT_SURFACE_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/instancer.cpp b/third_party/renderman-26/plugin/hdPrman/instancer.cpp
new file mode 100644
index 0000000000..588dfb17f5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/instancer.cpp
@@ -0,0 +1,1821 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/instancer.h"
+
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/debugUtil.h"
+#include "hdPrman/light.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/base/gf/matrix4d.h"
+#include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/getenv.h"
+#include "pxr/base/vt/typeHeaders.h"
+#include "pxr/base/vt/visitValue.h"
+#include "pxr/base/work/loops.h"
+#include "pxr/imaging/hd/light.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/tokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_ENV_SETTING(HD_PRMAN_DISABLE_NESTED_INSTANCING, false,
+    "disable riley nested instancing in hdprman");
+
+const int HDPRMAN_MAX_SUPPORTED_NESTING_DEPTH = 4;
+
+// **********************************************
+// **        Internal helper functions         **
+// **********************************************
+namespace {
+
+template <typename T1, typename T2, unsigned int C>
+void _AccumulateSampleTimes(
+    const HdTimeSampleArray<T1,C>& in,
+    HdTimeSampleArray<T2,C>& out)
+{
+    // XXX: This is just a straight copy that works fine in situations where
+    // out's sample range is within in's. But if out's sample range begins
+    // before in's (out.times[0] < in.times[0]) or ends after in's
+    // (out.times[-1] > in.times[-1]), we're gonna lose part of the range.
+    if (in.count > out.count) {
+        out.Resize(in.count);
+        out.times = in.times;
+    }
+}
+
+// Visitor for VtVisitValue; will retrieve the value at the specified
+// index as a VtValue when the visited value is array-typed. Returns
+// empty VtValue when the visited value is not array-typed, or when the
+// index points beyond the end of the array.
+struct _GetValueAtIndex {
+    _GetValueAtIndex(const size_t index) : _index(index) { }
+    template <class T>
+    const VtValue operator()(const VtArray<T>& array) const
+    {
+        if (array.size() > _index) {
+            return VtValue(array[_index]);
+        }
+        return VtValue();
+    }
+    const VtValue operator()(const VtValue& val) const
+    {
+        return VtValue();
+    }
+private:
+    size_t _index;
+};
+
+template <typename M>
+M _ConvertMatrix(GfMatrix4d&& src);
+
+template<>
+GfMatrix4d _ConvertMatrix<GfMatrix4d>(GfMatrix4d&& src) { return src; }
+
+template<>
+RtMatrix4x4 _ConvertMatrix<RtMatrix4x4>(GfMatrix4d&& src) { 
+    return HdPrman_Utils::GfMatrixToRtMatrix(src);
+}
+
+template <typename M, unsigned int C>
+HdTimeSampleArray<M,C> _MultiplyTransforms(
+    const HdTimeSampleArray<GfMatrix4d,C>& lhs,
+    const HdTimeSampleArray<GfMatrix4d,C>& rhs)
+{
+    HdTimeSampleArray<M,C> dest;
+    _AccumulateSampleTimes(lhs, dest);
+    _AccumulateSampleTimes(rhs, dest);
+    if (lhs.count == 0 ||
+        (lhs.count == 1 && lhs.values[0] == GfMatrix4d(1))) {
+        for (size_t j = 0; j < dest.count; ++j) {
+            dest.values[j] = _ConvertMatrix<M>(rhs.Resample(dest.times[j]));
+        }
+    } else if (rhs.count == 0 ||
+        (rhs.count == 1 && rhs.values[0] == GfMatrix4d(1))) {
+        for (size_t j = 0; j < dest.count; ++j) {
+            dest.values[j] = _ConvertMatrix<M>(lhs.Resample(dest.times[j]));
+        }
+    } else {
+        for (size_t j = 0; j < dest.count; ++j) {
+            dest.values[j] = _ConvertMatrix<M>(
+                lhs.Resample(dest.times[j]) * rhs.Resample(dest.times[j]));
+        }
+    }
+    return dest;
+}
+
+void _BuildStatsId(
+    const SdfPath& instancerId, 
+    const int index, 
+    const SdfPath& protoId, 
+    RtParamList& params)
+{
+    // The stats id is a human readable unique identifier in the form:
+    //   </path/to/instancer>[instanceIndex]{prototypeName}
+    // It is used for diagnostic purposes to identify instances in a
+    // Disgust log. It is somewhat costly to construct, so we only do so
+    // when generating a Disgust log.
+    static const bool disabled = TfGetenv("RILEY_CAPTURE").empty();
+    if (disabled) { return; }
+    RtUString val;
+    if (params.HasParam(RixStr.k_stats_identifier)) {
+        params.GetString(RixStr.k_stats_identifier, val);
+        std::string valStr(val.CStr());
+        valStr = TfStringReplace(
+            valStr, 
+            instancerId.GetString(), 
+            TfStringPrintf("%s[%i]", instancerId.GetText(), index));
+        val = RtUString(valStr.c_str());
+    } else {
+        std::string valStr = TfStringPrintf(
+            "%s[%i]{%s}", 
+            instancerId.GetText(), 
+            index, 
+            protoId.GetName().c_str());
+        val = RtUString(valStr.c_str());
+    }
+    params.SetString(RixStr.k_stats_identifier, val);
+}
+
+RtUString
+_FixupParamName(const TfToken& name) {
+    // Instance params with the "ri:attributes:" and "primvars:ri:attributes:"
+    // prefixes correspond to renderman-namespace attributes and have that
+    // prefix stripped. All other params are in the "user:" namespace, so if
+    // they don't have that prefix we need to add it.
+    static const std::string userPrefix("user:");
+    static const std::string riAttrPrefix("ri:attributes:");
+    static const std::string primvarsRiAttrPrefix("primvars:ri:attributes:");
+    RtUString rtname;
+    if (TfStringStartsWith(name.GetString(), userPrefix)) {
+        rtname = RtUString(name.GetText());
+    } else if (TfStringStartsWith(name.GetString(), riAttrPrefix)) {
+        rtname = RtUString(name.GetString()
+            .substr(riAttrPrefix.length()).c_str());
+    } else if (TfStringStartsWith(name.GetString(), primvarsRiAttrPrefix)) {
+        rtname = RtUString(name.GetString()
+            .substr(primvarsRiAttrPrefix.length()).c_str());
+    } else {
+        rtname = RtUString(TfStringPrintf("user:%s", name.GetText()).c_str());
+    }
+    return rtname;
+}
+
+// Save one code indentation level when we don't have anything to
+// amortize across a batch.
+template <typename Fn>
+void
+_ParallelFor(size_t n, Fn &&cb, size_t grainSize = 1) {
+    return WorkParallelForN(n, [&cb](size_t begin, size_t end) {
+        for (size_t i = begin; i < end; ++i) {
+            std::forward<Fn>(cb)(i);
+        }
+    }, grainSize);
+}
+
+} // anonymous namespace
+
+// **********************************************
+// **              Public methods              **
+// **********************************************
+
+HdPrmanInstancer::HdPrmanInstancer(
+    HdSceneDelegate* delegate,
+    SdfPath const& id)
+    : HdInstancer(delegate, id)
+{ }
+
+HdPrmanInstancer::~HdPrmanInstancer() = default;
+
+HdDirtyBits 
+HdPrmanInstancer::GetInitialDirtyBitsMask() const
+{
+    static const HdDirtyBits dirtyBits =
+        HdInstancer::GetInitialDirtyBitsMask() |
+        HdChangeTracker::DirtyVisibility |
+        HdChangeTracker::DirtyCategories;
+    return dirtyBits;
+};
+
+void
+HdPrmanInstancer::Sync(
+    HdSceneDelegate* delegate,
+    HdRenderParam* renderParam,
+    HdDirtyBits* dirtyBits)
+{
+    HD_TRACE_FUNCTION();
+    HF_MALLOC_TAG_FUNCTION();
+
+    const SdfPath& id = GetId();
+
+    if (TfDebug::IsEnabled(HDPRMAN_INSTANCERS)) {
+        using namespace HdPrmanDebugUtil;
+
+        const std::string clr = GetCallerAsString(TF_CALL_CONTEXT);
+        const std::string dbs = HdChangeTracker::StringifyDirtyBits(*dirtyBits);
+        const std::string pro = SdfPathVecToString(delegate->
+            GetInstancerPrototypes(id));
+        std::string dps;
+        if (HdChangeTracker::IsAnyPrimvarDirty(*dirtyBits, id)) {
+            for (HdInterpolation i = HdInterpolationConstant;
+                i != HdInterpolationCount; i = HdInterpolation(i+1)){
+                for (const HdPrimvarDescriptor& primvar : 
+                    delegate->GetPrimvarDescriptors(id, i)) {
+                    if (HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, 
+                        primvar.name)) {
+                        if (dps.empty()) {
+                            dps += "    dirty primvars    : ";
+                        } else {
+                            dps += "                      : ";
+                        }
+                        const VtValue& val = delegate->Get(id, primvar.name);
+                        dps += TfStringPrintf("(%s) (%s) %s\n",
+                            TfEnum::GetName(i).c_str(), 
+                            val.GetTypeName().c_str(),
+                            primvar.name.GetText());
+                    }
+                }
+            }
+        }
+
+        std::string msg;
+        msg += TfStringPrintf("*** Sync called on <%s>\n", id.GetText());
+        msg += TfStringPrintf("    dirtyBits         : %s\n", dbs.c_str());
+        if (!dps.empty()) {
+            msg += dps;
+        }
+        msg += TfStringPrintf("    prototypes        : [%s]\n", pro.c_str());
+        msg += TfStringPrintf("    caller            : %s\n", clr.c_str());
+        TF_DEBUG(HDPRMAN_INSTANCERS).Msg("%s\n", msg.c_str());
+    }
+
+    _UpdateInstancer(delegate, dirtyBits);
+
+    HdPrman_RenderParam *param = static_cast<HdPrman_RenderParam*>(renderParam);
+
+    // Convert (and cache) instancer coordinate systems.
+    if (HdPrman_RenderParam::RileyCoordSysIdVecRefPtr convertedCoordSys =
+        param->ConvertAndRetainCoordSysBindings(delegate, id)) {
+        _coordSysList.count = convertedCoordSys->size();
+        _coordSysList.ids = convertedCoordSys->data();
+    }
+
+    // cache instance primvars
+    _SyncPrimvars(dirtyBits);
+
+    // cache the instancer and instance transforms
+    _SyncTransforms(dirtyBits);
+    
+    // cache the instancer and instance categories
+    _SyncCategories(dirtyBits);
+
+    // cache the instancer visibility
+    _SyncVisibility(dirtyBits);
+
+    // If anything has changed, internally flag all previously-populated
+    // instances as dirty. Since instances are grouped by prototype prim id
+    // and Populate gets called one prototype prim at a time, we set a dirty
+    // flag for each known prototype prim id. Each gets cleared once Populate
+    // has been called with the corresponding prototype prim. This helps avoid
+    // unnecessary updates to riley instances in Populate.
+    if (HdChangeTracker::IsAnyPrimvarDirty(*dirtyBits, id) ||
+        HdChangeTracker::IsTransformDirty(*dirtyBits, id) ||
+        *dirtyBits & HdChangeTracker::DirtyCategories ||
+        HdChangeTracker::IsVisibilityDirty(*dirtyBits, id) ||
+        HdChangeTracker::IsInstanceIndexDirty(*dirtyBits, id)) {
+        _SetPrototypesDirty();
+    }
+}
+
+void
+HdPrmanInstancer::Finalize(HdRenderParam *renderParam)
+{
+    HD_TRACE_FUNCTION();
+    TF_DEBUG(HDPRMAN_INSTANCERS).Msg("*** Finalize called on <%s>\n\n",
+        GetId().GetText());
+    HdPrman_RenderParam *param = static_cast<HdPrman_RenderParam*>(renderParam);
+    riley::Riley *riley = param->AcquireRiley();
+
+    // Release retained conversions of coordSys bindings.
+    param->ReleaseCoordSysBindings(GetId());
+    
+    // Delete all my riley instances
+    _protoMap.citerate([riley](const SdfPath& path, const _ProtoMapEntry& entry) {
+        for (const auto& rp : entry.map) {
+            const _InstanceIdVec& ids = rp.second;
+            _ParallelFor(ids.size(), [&](size_t i) {
+                const _RileyInstanceId& ri = ids[i];
+                if (ri.lightInstanceId != riley::LightInstanceId::InvalidId()) {
+                    riley->DeleteLightInstance(ri.groupId, ri.lightInstanceId);
+                } else if (ri.geoInstanceId != riley::GeometryInstanceId::InvalidId()) {
+                    riley->DeleteGeometryInstance(ri.groupId, ri.geoInstanceId);
+                }
+            });
+        }
+    });
+
+    // Clear my proto map
+    _protoMap.clear();
+
+    // Depopulate instances of my groups
+    HdPrmanInstancer* parent = _GetParentInstancer();
+    if (parent) {
+        parent->Depopulate(renderParam, GetId());
+    }
+
+    // Delete my prototype groups
+    _groupMap.citerate([&](const _FlattenData fd, const riley::GeometryPrototypeId& gp) {
+        if (gp != riley::GeometryPrototypeId::InvalidId()) {
+            riley->DeleteGeometryPrototype(gp);
+        }
+    });
+    
+    // Clear my group map
+    _groupMap.clear();
+    _groupCounters.clear();
+}
+
+void HdPrmanInstancer::Populate(
+    HdRenderParam* renderParam,
+    HdDirtyBits* dirtyBits,
+    const SdfPath& hydraPrototypeId,
+    const std::vector<riley::GeometryPrototypeId>& rileyPrototypeIds,
+    const riley::CoordinateSystemList& coordSysList,
+    const RtParamList protoParams,
+    const HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> protoXform,
+    const std::vector<riley::MaterialId>& rileyMaterialIds,
+    const SdfPathVector& prototypePaths,
+    const riley::LightShaderId& lightShaderId)
+{
+    // This public Populate signature does not accept the last two arguments
+    // that the private _PopulateInstances does; those are only available to 
+    // HdPrmanInstancer. This lets us keep their messy types private.
+    
+    _PopulateInstances(
+        renderParam,
+        dirtyBits,
+        hydraPrototypeId,
+        hydraPrototypeId,
+        rileyPrototypeIds,
+        coordSysList,
+        protoParams,
+        protoXform,
+        rileyMaterialIds,
+        prototypePaths,
+        lightShaderId,
+        { },
+        { });
+}
+
+void HdPrmanInstancer::Depopulate(
+    HdRenderParam* renderParam,
+    const SdfPath& prototypePrimPath,
+    const std::vector<riley::GeometryPrototypeId>& excludedPrototypeIds)
+{
+    HD_TRACE_FUNCTION();
+    if (TfDebug::IsEnabled(HDPRMAN_INSTANCERS)) {
+        TF_DEBUG(HDPRMAN_INSTANCERS).Msg(
+            "*** Depopulate called on Instancer <%s>\n"
+            "    prototypePrimPath : <%s>\n"
+            "    excludedIds       : [%s]\n"
+            "    caller            : %s\n\n",
+            GetId().GetText(), prototypePrimPath.GetText(),
+            HdPrmanDebugUtil::RileyIdVecToString(excludedPrototypeIds).c_str(),
+            HdPrmanDebugUtil::GetCallerAsString(TF_CALL_CONTEXT).c_str());
+    }
+    HdPrman_RenderParam* param = static_cast<HdPrman_RenderParam*>(renderParam);
+    riley::Riley* riley = param->AcquireRiley();
+
+    _RemoveDeadInstances(riley, prototypePrimPath, excludedPrototypeIds);
+    _CleanDisusedGroupIds(param);
+}
+
+// **********************************************
+// **    Private methods called during Sync    **
+// **********************************************
+
+void HdPrmanInstancer::_SyncPrimvars(
+    HdDirtyBits* dirtyBits)
+{
+
+    // This method syncs USD primvars authored on the instancer into a cache.
+    // This cache will later be used to compose riley instance params from the
+    // USD primvars. Under Hydra 1.0, only instance-rate USD primvars are
+    // available, and any authored as "varying", "vertex", or "faceVarying"
+    // have already been converted to "instance". However, in Hydra 2.0, all
+    // interpolation types are available, and none have been converted from
+    // "varying", "vertex", or "faceVarying" to "instance". So we have to query
+    // for each interpolation type to be sure to capture all USD primvars that
+    // should be applied per-instance.
+    //
+    // The exclusion here of "constant" and "uniform" USD primvars is an open
+    // point of controversy insofar as point instancers are concerned. In
+    // theory, those should be inherited by prototypes that are descendants of
+    // the point instancer, and we make an explicit attempt to capture those
+    // elsewhere. But "constant" and "uniform" primvars on the point instancer
+    // cannot be inherited by prototypes that are not also descendants, and in 
+    // that case we will not be able to apply them to instances.
+    //
+    // Some users have requested the ability to use constant primvars authored
+    // on the point instancer to control the renderer-specific behavior of the
+    // point instancer itself, e.g., by setting a ri-specific param on the
+    // point instancer hoping it will be applied to all riley instances the
+    // point instancer creates. But such an approach would violate assumptions
+    // about inheritance in USD. The issue remains in discussion both internally
+    // and in Github issues.
+
+    // XXX: USD Primvars authored on native instances are currently missing
+    // under Hydra 2.0 and are not captured here or anywhere else.
+
+    HdSceneDelegate* delegate = GetDelegate();
+    SdfPath const& id = GetId();
+
+    // XXX: When finally removing these, eliminate the variables. Replace
+    // their usages with the appropriate HdInstancerTokens inline.
+#if HD_API_VERSION < 56  // USD_VERSION < 23.05
+    TfToken instanceTranslationsToken = HdInstancerTokens->translate;
+    TfToken instanceRotationsToken = HdInstancerTokens->rotate;
+    TfToken instanceScalesToken = HdInstancerTokens->scale;
+    TfToken instanceTransformsToken = HdInstancerTokens->instanceTransform;
+#else
+    TfToken instanceTranslationsToken = HdInstancerTokens->instanceTranslations;
+    TfToken instanceRotationsToken = HdInstancerTokens->instanceRotations;
+    TfToken instanceScalesToken = HdInstancerTokens->instanceScales;
+    TfToken instanceTransformsToken = HdInstancerTokens->instanceTransforms;
+#if HD_API_VERSION < 67  // USD_VERSION < 24.05
+    if (TfGetEnvSetting(HD_USE_DEPRECATED_INSTANCER_PRIMVAR_NAMES)) {
+        instanceTranslationsToken = HdInstancerTokens->translate;
+        instanceRotationsToken = HdInstancerTokens->rotate;
+        instanceScalesToken = HdInstancerTokens->scale;
+        instanceTransformsToken = HdInstancerTokens->instanceTransform;
+    }
+#endif
+#endif
+
+    if (HdChangeTracker::IsAnyPrimvarDirty(*dirtyBits, id)) {
+        // Get list of USD primvar names for each interp mode and cache each one
+        // Solaris allows constant primvars so we need to be able to access them.
+        for (HdInterpolation i = HdInterpolationConstant;
+            i != HdInterpolationCount; i = HdInterpolation(i+1)) {
+            for (const HdPrimvarDescriptor& primvar :
+                delegate->GetPrimvarDescriptors(id, i)) {
+                // Skip primvars that have special handling elsewhere.
+                // The transform primvars are all handled in
+                // _SyncTransforms.
+                if (primvar.name == instanceTransformsToken ||
+                    primvar.name == instanceRotationsToken ||
+                    primvar.name == instanceScalesToken ||
+                    primvar.name == instanceTranslationsToken) {
+                    continue;
+                }
+                if (HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, primvar.name)) {
+                    VtValue value = delegate->Get(id, primvar.name);
+                    if (!value.IsEmpty()) {
+                        _PrimvarValue& entry = _primvarMap[primvar.name];
+                        entry.desc = primvar;
+                        std::swap(entry.value, value);
+                    }
+                }
+            }
+        }
+    }
+}
+
+bool UnboxOrientations(
+    HdTimeSampleArray<VtValue, HDPRMAN_MAX_TIME_SAMPLES> const& box,
+    HdTimeSampleArray<VtQuatfArray, HDPRMAN_MAX_TIME_SAMPLES> *outRotates)
+{
+    HdTimeSampleArray<VtQuathArray, HDPRMAN_MAX_TIME_SAMPLES> rotates;
+    if (outRotates->UnboxFrom(box)) {
+        if (outRotates->count > 0 && outRotates->values[0].size() > 0){
+            return true;
+        }
+    }
+    if (rotates.UnboxFrom(box)) {
+        // convert to quatf
+        outRotates->Resize(rotates.count);
+        outRotates->times = rotates.times;
+        for (size_t i=0; i < rotates.count; ++i) {
+            if (rotates.values[i].size() > 0) {
+                VtQuathArray halfs = rotates.values[i];
+                VtQuatfArray floats(halfs.cbegin(), halfs.cend());
+                outRotates->values[i] = floats;
+            }
+        }
+        return true;
+    }   
+    return false;
+}
+
+void
+HdPrmanInstancer::_SyncTransforms(
+    HdDirtyBits* dirtyBits)
+{
+    HdSceneDelegate* delegate = GetDelegate();
+    const SdfPath& id = GetId();
+
+    // XXX: When finally removing these, eliminate the variables. Replace
+    // their usages with the appropriate HdInstancerTokens inline. Don't forget
+    // to reformat the "not ... expected type" warning messages, too!
+#if HD_API_VERSION < 56  // USD_VERSION < 23.05
+    TfToken instanceTranslationsToken = HdInstancerTokens->translate;
+    TfToken instanceRotationsToken = HdInstancerTokens->rotate;
+    TfToken instanceScalesToken = HdInstancerTokens->scale;
+    TfToken instanceTransformsToken = HdInstancerTokens->instanceTransform;
+#else
+    TfToken instanceTranslationsToken = HdInstancerTokens->instanceTranslations;
+    TfToken instanceRotationsToken = HdInstancerTokens->instanceRotations;
+    TfToken instanceScalesToken = HdInstancerTokens->instanceScales;
+    TfToken instanceTransformsToken = HdInstancerTokens->instanceTransforms;
+#if HD_API_VERSION < 67  // USD_VERSION < 24.05
+    if (TfGetEnvSetting(HD_USE_DEPRECATED_INSTANCER_PRIMVAR_NAMES)) {
+        instanceTranslationsToken = HdInstancerTokens->translate;
+        instanceRotationsToken = HdInstancerTokens->rotate;
+        instanceScalesToken = HdInstancerTokens->scale;
+        instanceTransformsToken = HdInstancerTokens->instanceTransform;
+    }
+#endif
+#endif
+
+    // Only include this instancer's own transform if it has no parent. When
+    // there is a parent instancer, the parent instancer will apply this
+    // instancer's transform to the instances it creates of this instancer's
+    // prototype groups.
+    const bool includeInstancerXform = _Depth() == 0;
+
+    if (HdChangeTracker::IsTransformDirty(*dirtyBits, id) ||
+        HdChangeTracker::IsPrimvarDirty(*dirtyBits, id,
+            instanceTransformsToken) ||
+        HdChangeTracker::IsPrimvarDirty(*dirtyBits, id,
+            instanceTranslationsToken) ||
+        HdChangeTracker::IsPrimvarDirty(*dirtyBits, id,
+            instanceRotationsToken) ||
+        HdChangeTracker::IsPrimvarDirty(*dirtyBits, id,
+            instanceScalesToken)) {
+
+        HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> instancerXform;
+        HdTimeSampleArray<VtValue, HDPRMAN_MAX_TIME_SAMPLES>
+            boxedInstanceXforms;
+        HdTimeSampleArray<VtValue, HDPRMAN_MAX_TIME_SAMPLES> boxedTranslates;
+        HdTimeSampleArray<VtValue, HDPRMAN_MAX_TIME_SAMPLES> boxedRotates;
+        HdTimeSampleArray<VtValue, HDPRMAN_MAX_TIME_SAMPLES> boxedScales;
+        if (includeInstancerXform) {
+            delegate->SampleInstancerTransform(id, &instancerXform);
+        }
+        delegate->SamplePrimvar(id, instanceTransformsToken,
+                                &boxedInstanceXforms);
+        delegate->SamplePrimvar(id, instanceTranslationsToken,
+                                &boxedTranslates);
+        delegate->SamplePrimvar(id, instanceScalesToken,
+                                &boxedScales);
+        delegate->SamplePrimvar(id, instanceRotationsToken,
+                                &boxedRotates);
+
+        // Unbox samples held as VtValues
+        HdTimeSampleArray<VtMatrix4dArray, HDPRMAN_MAX_TIME_SAMPLES>
+            instanceXforms;
+        HdTimeSampleArray<VtVec3fArray, HDPRMAN_MAX_TIME_SAMPLES> translates;
+        HdTimeSampleArray<VtQuatfArray, HDPRMAN_MAX_TIME_SAMPLES> rotates;
+        HdTimeSampleArray<VtVec3fArray, HDPRMAN_MAX_TIME_SAMPLES> scales;
+        if (!instanceXforms.UnboxFrom(boxedInstanceXforms)) {
+            TF_WARN("<%s> %s did not have expected type matrix4d[]",
+                instanceTransformsToken.GetText(), id.GetText());
+        }
+        if (!translates.UnboxFrom(boxedTranslates)) {
+            TF_WARN("<%s> %s did not have expected type vec3f[]",
+                instanceTranslationsToken.GetText(), id.GetText());
+        }
+        if (!UnboxOrientations(boxedRotates, &rotates)) {
+            TF_WARN("<%s> %s did not have expected type quath[] or quatf[]",
+                instanceRotationsToken.GetText(), id.GetText());
+        }
+        if (!scales.UnboxFrom(boxedScales)) {
+            TF_WARN("<%s> %s did not have expected type vec3f[]",
+                instanceScalesToken.GetText(), id.GetText());
+        }
+
+        // As a simple resampling strategy, find the input with the max #
+        // of samples and use its sample placement.  In practice we expect
+        // them to all be the same, i.e. to not require resampling.
+        _sa.Resize(0);
+        _AccumulateSampleTimes(instancerXform, _sa);
+        _AccumulateSampleTimes(instanceXforms, _sa);
+        _AccumulateSampleTimes(translates, _sa);
+        _AccumulateSampleTimes(scales, _sa);
+        _AccumulateSampleTimes(rotates, _sa);
+
+        // Resample inputs and concatenate transformations.
+        for (size_t i=0; i < _sa.count; ++i) {
+            const float t = _sa.times[i];
+            GfMatrix4d xf(1);
+            if (instancerXform.count > 0) {
+                xf = instancerXform.Resample(t);
+            }
+            VtMatrix4dArray ixf;
+            if (instanceXforms.count > 0) {
+                ixf = instanceXforms.Resample(t);
+            }
+            VtVec3fArray trans;
+            if (translates.count > 0) {
+                trans = translates.Resample(t);
+            }
+            VtQuatfArray rot;
+            if (rotates.count > 0) {
+                rot = rotates.Resample(t);
+            }
+            VtVec3fArray scale;
+            if (scales.count > 0) {
+                scale = scales.Resample(t);
+            }
+
+            size_t size = std::max({ 
+                ixf.size(), 
+                trans.size(), 
+                rot.size(), 
+                scale.size()
+            });
+
+            // Concatenate transformations.
+            VtMatrix4dArray &ma = _sa.values[i];
+            ma.resize(size);
+            for (size_t j=0; j < size; ++j) {
+                ma[j] = xf;
+                if (trans.size() > j) {
+                    GfMatrix4d t(1);
+                    t.SetTranslate(GfVec3d(trans[j]));
+                    ma[j] = t * ma[j];
+                }
+                if (rot.size() > j) {
+                    GfMatrix4d r(1);
+                    r.SetRotate(GfQuatd(rot[j]));
+                    ma[j] = r * ma[j];
+                }
+                if (scale.size() > j) {
+                    GfMatrix4d s(1);
+                    s.SetScale(GfVec3d(scale[j]));
+                    ma[j] = s * ma[j];
+                }
+                if (ixf.size() > j) {
+                    ma[j] = ixf[j] * ma[j];
+                }
+            }
+        }
+    }
+}
+
+void
+HdPrmanInstancer::_SyncCategories(HdDirtyBits* dirtyBits)
+{
+    // XXX: Instance categories only exist under native instancing, because
+    // point instancer instances are not path-addressable. For point instancers,
+    // we want the instances to take the categories of the instancer itself.
+    // Ideally, this difference would have been smoothed over for us by the
+    // scene delegate, and we would get instance categories for either kind of
+    // instancing using GetInstanceCategories(). For point instancers, the
+    // delegate would give us an appropriately sized vector of identical
+    // category lists pulled from the instancer.
+    //
+    // Unfortunately, GetInstanceCategories() does not handle point instancing
+    // this way. It instead returns an empty vector, leaving it to us to notice
+    // and call GetCategories() for the instancer ourselves, something we
+    // wouldn't otherwise want to do.
+    // 
+    // Under point instancing, once we've called GetCategories(), we don't
+    // bother copying those categories into _instanceCategories, since we don't
+    // really know at this point how many instances we will have; we store them
+    // separately in the instancer-level flatten data instead.
+    //
+    // Under point instancing, _instanceCategories will be an empty vector.
+    // Therefore, all indexing into _instanceCategories must be bounds-checked!
+    //
+    // When we *do* have instance categories (as under native instancing), we
+    // make a little optimization by finding any categories common to all
+    // instances and moving them to the instancer-level flatten data.
+
+    HdSceneDelegate* delegate = GetDelegate();
+    const SdfPath& id = GetId();
+
+    if (*dirtyBits & HdChangeTracker::DirtyCategories) {
+        _instancerFlat.categories.clear();
+        _instanceCategories = delegate->GetInstanceCategories(id);
+        if (_instanceCategories.size() == 0) {
+            // Point instancing; use instancer's categories
+            const VtTokenArray cats = delegate->GetCategories(id);
+            _instancerFlat.categories.insert(cats.begin(), cats.end());
+        } else {
+            // Native instancing; move common categories to instancer
+            VtTokenArray intersection;
+            for (size_t i = 0; i < _instanceCategories.size(); ++i) {
+                VtTokenArray& instCats = _instanceCategories[i];
+                // if any instance has no categories there can be no intersection
+                if (instCats.size() == 0) {
+                    intersection.clear();
+                    break;
+                }
+                std::sort(instCats.begin(), instCats.end());
+                VtTokenArray newIntersection;
+                if (i == 0) {
+                    newIntersection = instCats;
+                } else {
+                    std::set_intersection(
+                        intersection.cbegin(), intersection.cend(),
+                        instCats.cbegin(), instCats.cend(),
+                        std::back_inserter(newIntersection));
+                }
+                if (newIntersection.size() == 0) {
+                    intersection.clear();
+                    break;
+                }
+                intersection = newIntersection;
+            }
+            if (intersection.size() > 0) {
+                for (size_t i = 0; i < _instanceCategories.size(); ++i) {
+                    VtTokenArray instCats = _instanceCategories[i];
+                    // already sorted above
+                    VtTokenArray newCats;
+                    std::set_difference(
+                        instCats.cbegin(), instCats.cend(),
+                        intersection.cbegin(), intersection.cend(),
+                        std::back_inserter(newCats));
+                    instCats = newCats;
+                }
+                _instancerFlat.categories.insert(intersection.cbegin(), 
+                    intersection.cend());
+            }
+        }
+    }
+}
+
+void
+HdPrmanInstancer::_SyncVisibility(HdDirtyBits* dirtyBits)
+{
+    HdSceneDelegate* delegate = GetDelegate();
+    const SdfPath& id = GetId();
+
+    if (HdChangeTracker::IsVisibilityDirty(*dirtyBits, id)) {
+        _instancerFlat.SetVisibility(delegate->GetVisible(id));
+    }
+}
+
+void
+HdPrmanInstancer::_SetPrototypesDirty()
+{
+    HdPrmanInstancer* parent = _GetParentInstancer();
+    if (parent && _Depth() > HDPRMAN_MAX_SUPPORTED_NESTING_DEPTH) {
+        parent->_SetPrototypesDirty();
+    } else {
+        _protoMap.iterate([&](const SdfPath& pp, _ProtoMapEntry& entry) {
+            entry.dirty = true;
+        });
+    }
+}
+
+// **********************************************
+// **  Private methods called during Populate  **
+// **********************************************
+
+void
+HdPrmanInstancer::_PopulateInstancesFromChild(
+    HdRenderParam* renderParam,
+    HdDirtyBits* dirtyBits,
+    const SdfPath& hydraPrototypeId,
+    const SdfPath& prototypePrimPath,
+    const std::vector<riley::GeometryPrototypeId>& rileyPrototypeIds,
+    const riley::CoordinateSystemList& coordSysList,
+    const RtParamList prototypeParams,
+    const HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> prototypeXform,
+    const std::vector<riley::MaterialId>& rileyMaterialIds,
+    const SdfPathVector& prototypePaths,
+    const riley::LightShaderId& lightShaderId,
+    const std::vector<_InstanceData>& subInstances,
+    const std::vector<_FlattenData>& prototypeFlats)
+{
+    // When a child instancer has multiple prototype prims, that child instancer
+    // may call this method simultaneously from different threads. That can lead
+    // to duplicate calls from this instancer to create or delete instances of
+    // the child instancer's prototype groups. Both of those are problematic
+    // when done in parallel. We expect such calls to be identical, so while
+    // we are locked we can throw away any additional calls from the same
+    // child instancer (identified by prototypePrimPath).
+    tbb::spin_rw_mutex& mutex = _childPopulateLocks.get(prototypePrimPath);
+    if (mutex.try_lock()) {
+        _PopulateInstances(renderParam, dirtyBits, hydraPrototypeId,
+            prototypePrimPath, rileyPrototypeIds, coordSysList, prototypeParams,
+            prototypeXform, rileyMaterialIds, prototypePaths, lightShaderId,
+            subInstances, prototypeFlats);
+        _childPopulateLocks.erase(prototypePrimPath);
+        mutex.unlock();
+    }
+}
+
+void
+HdPrmanInstancer::_PopulateInstances(
+    HdRenderParam* renderParam,
+    HdDirtyBits* dirtyBits,
+    const SdfPath& hydraPrototypeId,
+    const SdfPath& prototypePrimPath,
+    const std::vector<riley::GeometryPrototypeId>& rileyPrototypeIds,
+    const riley::CoordinateSystemList& coordSysList,
+    const RtParamList prototypeParams,
+    const HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> prototypeXform,
+    const std::vector<riley::MaterialId>& rileyMaterialIds,
+    const SdfPathVector& prototypePaths,
+    const riley::LightShaderId& lightShaderId,
+    const std::vector<_InstanceData>& subInstances,
+    const std::vector<_FlattenData>& prototypeFlats)
+{
+    HD_TRACE_FUNCTION();
+    HF_MALLOC_TAG_FUNCTION();
+
+    // This is our main workhorse. This method instructs the instancer to
+    // generate riley instances of a given prototype. When coming from the
+    // public Populate method, that prototype is a hydra prototype whose riley
+    // prototypes have already been constructed (see gprim.h). When coming from
+    // a child instancer, that prototype will usually be the child instancer
+    // itself (along with its associated riley geometry prototype groups).
+    // However, if the child instancer is too deep for nested instancing, it
+    // will instead provide the same prototype it was given along with a list
+    // of InstanceData structures, which contain all the information about the
+    // instances the child would have made if it could have. This instancer must
+    // then multiply that list by its own instances, and either create them or
+    // pass them along to *its* parent if it is also too deep.
+    //
+    // Further complicating issues, this method may be called concurrently from
+    // multiple threads, so some actions must be gated behind mutex locks.
+
+    HdPrman_RenderParam* param = static_cast<HdPrman_RenderParam*>(renderParam);
+    riley::Riley* riley = param->AcquireRiley();
+    HdSceneDelegate* delegate = GetDelegate();
+    HdRenderIndex& renderIndex = delegate->GetRenderIndex();
+    const SdfPath& instancerId = GetId();
+    HdPrmanInstancer* parentInstancer = _GetParentInstancer();
+    const int depth = _Depth();
+    bool instancesNeedUpdate = _protoMap.get(prototypePrimPath).dirty
+        || (*dirtyBits & HdChangeTracker::DirtyPrimvar)
+        || (*dirtyBits & HdChangeTracker::DirtyMaterialId)
+        || (*dirtyBits & HdChangeTracker::DirtyTransform)
+        || (*dirtyBits & HdChangeTracker::DirtyVisibility);
+    bool anyGroupIdChanged = false;
+    bool isLight = lightShaderId != riley::LightShaderId::InvalidId();
+
+    if (TfDebug::IsEnabled(HDPRMAN_INSTANCERS)) {
+        using namespace HdPrmanDebugUtil;
+
+        std::string pid = " -none- ";
+        if (parentInstancer) {
+            pid = parentInstancer->GetId().GetAsString();
+        }
+
+        const VtIntArray instanceIndices = delegate->GetInstanceIndices(
+            instancerId, hydraPrototypeId);
+
+        std::string ins = TfStringPrintf("%lu instances ", instanceIndices.size());
+        size_t total = instanceIndices.size();
+        if (subInstances.size() > 0) {
+            ins += TfStringPrintf("of %lu subInstances ", subInstances.size());
+            total *= subInstances.size();
+        }
+        ins += TfStringPrintf("of %lu prototypes ", rileyPrototypeIds.size());
+        total *= rileyPrototypeIds.size();
+        ins += TfStringPrintf("= %lu Riley instances", total);
+
+        std::string lsi = "- none -";
+        if (lightShaderId != riley::LightShaderId::InvalidId()) {
+            lsi = TfStringPrintf("(%u)", lightShaderId.AsUInt32());
+        }
+    
+        const HdDirtyBits instDirtyBits = renderIndex.GetChangeTracker()
+            .GetInstancerDirtyBits(instancerId);
+        const std::string dbs = HdChangeTracker::StringifyDirtyBits(*dirtyBits);
+        const std::string idb = HdChangeTracker::StringifyDirtyBits(instDirtyBits);
+        const std::string pro = RileyIdVecToString(rileyPrototypeIds);
+        const std::string mid = RileyIdVecToString(rileyMaterialIds);
+        const std::string pps = SdfPathVecToString(prototypePaths);
+        const std::string clr = GetCallerAsString(TF_CALL_CONTEXT);
+        const std::string pat = RtParamListToString(prototypeParams, 24);
+        const std::string pxf = MatrixToString(prototypeXform.values[0], 24, 3);
+
+        std::string str;
+        str += TfStringPrintf("*** Populate called on <%s>\n", instancerId.GetText());
+        str += TfStringPrintf("    dirtyBits         : %s\n", dbs.c_str());
+        str += TfStringPrintf("    instDirtyBits     : %s\n", idb.c_str());
+        str += TfStringPrintf("    hydraPrototypeId  : <%s>\n", hydraPrototypeId.GetText());
+        str += TfStringPrintf("    prototypePrimPath : <%s>\n", prototypePrimPath.GetText());
+        str += TfStringPrintf("    rileyPrototypeIds : (%s)\n", pro.c_str());
+        str += TfStringPrintf("    rileyMaterialIds  : (%s)\n", mid.c_str());
+        str += TfStringPrintf("    prototypePaths    : [%s]\n", pps.c_str());
+        str += TfStringPrintf("    lightShaderId     : %s\n", lsi.c_str());
+        str += TfStringPrintf("    prototypeParams   : %s\n", pat.c_str());
+        str += TfStringPrintf("    prototypeXform    : %s\n", pxf.c_str());
+        str += TfStringPrintf("    instances         : %lu\n", instanceIndices.size());
+        str += TfStringPrintf("    subInstances      : %lu\n", subInstances.size());
+        str += TfStringPrintf("    total instances   : %s\n", ins.c_str());
+        str += TfStringPrintf("    parentInstancer   : <%s>\n", pid.c_str());
+        str += TfStringPrintf("    depth             : %i\n", depth);
+        str += TfStringPrintf("    caller            : %s\n", clr.c_str());
+        TF_DEBUG(HDPRMAN_INSTANCERS).Msg("%s\n", str.c_str());
+    }
+
+    TF_VERIFY(
+        rileyMaterialIds.size() == rileyPrototypeIds.size(), 
+        "rileyMaterialIds size mismatch: %lu != %lu", 
+        rileyMaterialIds.size(), rileyPrototypeIds.size());
+    TF_VERIFY(
+        prototypePaths.size() == rileyPrototypeIds.size(),
+        "prototypePaths size mismatch: %lu != %lu",
+        prototypePaths.size(), rileyPrototypeIds.size());
+    TF_VERIFY(
+        prototypeFlats.size() == 0 || 
+        prototypeFlats.size() == rileyPrototypeIds.size(),
+        "prototypeFlats size mismatch: %lu != %lu",
+        prototypeFlats.size(), rileyPrototypeIds.size());
+
+    // For analytic lights only, rileyPrototypeIds may have only a single,
+    // invalid id. In that case, lightData with a valid shader id is required.
+    if (rileyPrototypeIds.size() == 1 &&
+        rileyPrototypeIds[0] == riley::GeometryPrototypeId::InvalidId()) {
+        TF_VERIFY(isLight,
+            "When called with a single invalid "
+            "prototype id, a light shader id is required");
+    }
+    
+    instancesNeedUpdate = _RemoveDeadInstances(riley, prototypePrimPath,
+        rileyPrototypeIds) || instancesNeedUpdate;
+
+    std::vector<_InstanceData> instances;
+
+    // hydraPrototypeId corresponds to the hydra prototype, which might be a
+    // child instancer. prototypePrimPath corresponds to the prim represented by
+    // the rileyPrototypeIds, which could be a child instancer or prototype
+    // geometry. In most cases, they are equal:
+    //  1. Both paths are the same, and point to a geometry prim that is one of
+    //     this instancer's prototypes and has already been represented in riley
+    //     during GPrim::Sync(), resulting in the ids in rileyPrototypeIds which
+    //     are all of a non-group primType; or
+    //  2. Both paths are the same, and point to a child instancer prim that is
+    //     this instancer's prototype and has already been represented in riley
+    //     by the child instancer, resulting in the ids in rileyPrototypeIds
+    //     which are all of primType "Group".
+    // They differ only when the prototype is an instancer and that instancer
+    // was too deep to put its riley instances into a group. In that case, 
+    // hydraPrototypeId will be the instancer below, while prototypePrimPath 
+    // will be the prototype prim path originally given to Populate, because
+    // that's the prim represented by the rileyPrototypeIds we've been given.
+    // We need the former to retrieve instance indices, params, and
+    // transforms for the nested instancer prototype, while we use the latter to
+    // track our riley instances and their prototype ids in _protoMap and
+    // retrieve USD primvars affecting the prototype.
+    
+    // We might receive no instances from the too-deep nested instacer, because
+    // the nested instancer no longer has any instances of this prototype. In
+    // that case, we should not make any instances of this prototype here, and
+    // delete any we already have.
+
+    if (hydraPrototypeId == prototypePrimPath || subInstances.size() > 0) {
+        _ComposeInstances(hydraPrototypeId, subInstances, instances);
+    }
+
+    // TODO: if depth *decreases*, how will no-longer-too-deep-child signal its
+    // parent to release the flattened instances?
+
+    // Check for flattening based on env setting or depth. When this instancer
+    // is too deeply nested for riley nesting support, or when riley nesting
+    // is disabled, we need to pass the bag of composed instances that this
+    // instancer would have pushed to riley up to the parent instancer instead.
+    // The parent instancer will then duplicate each instance in the bag once
+    // for each instance it's expected to generate, effectively multiplying this
+    // instancer's instances by its own.
+    if (parentInstancer &&
+        (TfGetEnvSetting(HD_PRMAN_DISABLE_NESTED_INSTANCING) ||
+            depth > HDPRMAN_MAX_SUPPORTED_NESTING_DEPTH)) {
+
+        // TODO: Instancer params?
+
+        // Ensure the protoMap is clear of instances (perhaps depth increased?)
+        _ResizeProtoMap(riley, prototypePrimPath, rileyPrototypeIds, 0);
+
+        // Sample this instancer's transform. The instance transforms do not
+        // include it. We must multiply the instance transforms by this
+        // instancer's transform.
+        HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> xf;
+        delegate->SampleInstancerTransform(instancerId, &xf);
+        for (_InstanceData& instance : instances) {
+            instance.transform = _MultiplyTransforms<GfMatrix4d>(
+                instance.transform, xf);
+        }
+
+        // Send allInstances up to the parent to populate
+        parentInstancer->_PopulateInstancesFromChild(
+            renderParam,
+            dirtyBits,
+            instancerId,
+            prototypePrimPath,
+            rileyPrototypeIds,
+            coordSysList, 
+            prototypeParams,
+            prototypeXform,
+            rileyMaterialIds,
+            prototypePaths,
+            lightShaderId,
+            instances,
+            { }
+        );
+        return;
+    }
+
+    if (instancesNeedUpdate) {
+        // Allocate the protoMap; this deletes instances if instances is empty
+        _ResizeProtoMap(riley, prototypePrimPath, rileyPrototypeIds, instances.size());
+    }
+
+    if (instancesNeedUpdate && instances.size() > 0) {
+
+        // Finalize the prototype-derived params & flats
+        std::vector<RtParamList> protoParams;
+        std::vector<_FlattenData> protoFlats;
+        std::vector<TfToken> protoRenderTags;
+
+        _ComposePrototypeData(
+            prototypePrimPath,
+            prototypeParams,
+            isLight,
+            rileyPrototypeIds, 
+            prototypePaths,
+            prototypeFlats,
+            protoParams,
+            protoFlats,
+            protoRenderTags);
+        
+        // Prepare each instance to be sent to riley
+        _ParallelFor(instances.size(), [&](size_t i) {
+            const _InstanceData& instance = instances[i];
+
+            // Multiply the prototype transform by the instance transform. If
+            // this is a top-level instancer with no parent, the instance
+            // transform already includes the instancer transform. If this
+            // instancer is nested, the instance transform does not include the
+            // instancer transform; it will be supplied to the parent
+            // instancer separately.
+            _RtMatrixSA xform = _MultiplyTransforms<RtMatrix4x4>(
+                prototypeXform, instance.transform);
+
+            // Convert the matrix array to riley's Transform type
+            const riley::Transform rileyXform = {
+                unsigned(xform.count),
+                xform.values.data(),
+                xform.times.data()
+            };
+
+            // If the hydra prototype prim consists of multiple riley
+            // prototypes (e.g., in the case of GeomSubsets), we must make 
+            // one riley instance for each riley prototype
+            for (size_t j = 0; j < rileyPrototypeIds.size(); ++j) {
+                // This is expected to be InvalidId for analytic lights
+                const riley::GeometryPrototypeId& protoId = 
+                    rileyPrototypeIds[j];
+                
+                riley::MaterialId matId = rileyMaterialIds[j];
+                RtParamList params = instance.params; // a copy
+                // Merge in params derived from the hydra prototype prim, which
+                // are stronger than the instance-derived ones. We use Update
+                // so that the prototype-derived params will overwrite the
+                // instance-derived ones.
+                params.Update(protoParams[j]);
+                
+                // append subset name to stats:identifier
+                if (prototypePaths[j] != hydraPrototypeId) {
+                    std::string protoName = TfStringPrintf(
+                        "{%s}", prototypePaths[j].GetName().c_str());
+                    RtUString sid;
+                    if (params.GetString(RixStr.k_stats_identifier, sid)) {
+                        std::string sidStr(sid.CStr());
+                        if (sidStr.find(protoName) == sidStr.npos) {
+                            sid = RtUString(
+                                (std::string(sid.CStr()) + protoName).c_str());
+                            params.SetString(RixStr.k_stats_identifier, sid);
+                        }
+                    }
+                }
+
+                // compose the final flats
+                _FlattenData flats = instance.flattenData; // a copy
+                
+                // Merge the visibility params derived from the hydra
+                // prototype prim. Because these are either present (and set to
+                // 0, indicating invisibility) or absent, we use Inherit to
+                // obtain the logical OR superset of present params. Inherit
+                // also merges the light linking categories.
+                flats.Inherit(protoFlats[j]);
+
+                // Acquire the id of the prototype group that will house
+                // all instances that share this specific set of flatten data.
+                // This group id will be InvalidId when there is no parent
+                // instancer.
+                riley::GeometryPrototypeId groupId;
+                anyGroupIdChanged |= _AcquireGroupId(param, flats, groupId);
+
+                if (!parentInstancer) {
+                    // If there is no parent, we can safely set the params
+                    // we've been tracking separately in the FlattenData
+                    // structure on the instances we're about to make in riley.
+                    // We use Update because these should not exist yet.
+                    params.Update(flats.params);
+                    // And set the appropriate params based on our collected
+                    // light linking categories.
+                    param->ConvertCategoriesToAttributes(
+                        instancerId,
+                        { flats.categories.cbegin(), flats.categories.cend() },
+                        params);
+                }
+
+                // Retrieve the riley instance id
+                _RileyInstanceId& instId = _protoMap.get(prototypePrimPath)
+                    .map[protoId][i];
+
+                // Check if the instance already exists, and if so, whether
+                // it was created in the right prototype group. We can reuse the
+                // riley instance id only if the group id and geometry prototype
+                // id have not changed. We only need to check the group id;
+                // protomap structure guarantees the prototype id is unchanged.
+                if (instId.geoInstanceId != riley::GeometryInstanceId::InvalidId()
+                    && instId.groupId != groupId) {
+                    // the instanceId is valid but the groupId is different
+                    riley->DeleteGeometryInstance(
+                        instId.groupId, instId.geoInstanceId);
+                    _groupCounters.get(instId.groupId)--;
+                    instId.geoInstanceId = riley::GeometryInstanceId::InvalidId();
+                }
+                if (instId.lightInstanceId != riley::LightInstanceId::InvalidId()
+                    && instId.groupId != groupId) {
+                    // the instanceId is valid but the groupId is different
+                    riley->DeleteLightInstance(
+                        instId.groupId, instId.lightInstanceId);
+                    _groupCounters.get(instId.groupId)--;
+                    instId.lightInstanceId = riley::LightInstanceId::InvalidId();
+                }
+
+                instId.groupId = groupId;
+                _groupCounters.get(instId.groupId)++;
+
+                // Now we branch based on whether we're dealing with lights
+                // or geometry
+
+                // XXX: The stats userId will not be unique in the case of
+                // nested instancing, but this approach preserves prior
+                // behavior in the unnested case.
+
+                const SdfPath instancePath = delegate->GetScenePrimPath(
+                    prototypePaths[j], i, nullptr);
+                riley::UserId userId = riley::UserId(
+                    stats::AddDataLocation(instancePath.GetText()).GetValue());
+
+                if (lightShaderId != riley::LightShaderId::InvalidId()) {
+
+                    // XXX: Temporary workaround for RMAN-20704
+                    // Destroy the light instance so it will be recreated instead
+                    // of being updated, since ModifyLightInstance may crash.
+
+                    if (instId.lightInstanceId != riley::LightInstanceId::InvalidId()) {
+                        riley->DeleteLightInstance(
+                            instId.groupId, instId.lightInstanceId);
+                        instId.lightInstanceId = riley::LightInstanceId::InvalidId();
+                    }
+                    // XXX: End of RMAN-20704 workaround
+
+                    if (instId.lightInstanceId == riley::LightInstanceId::InvalidId()) {
+                        TRACE_SCOPE("riley::CreateLightInstance");
+                        instId.lightInstanceId = riley->CreateLightInstance(
+                            userId,
+                            instId.groupId,
+                            protoId,
+                            matId,
+                            lightShaderId,
+                            coordSysList,
+                            rileyXform,
+                            params);
+                    } else if (*dirtyBits) {
+                        TRACE_SCOPE("riley::ModifyLightInstance");
+                        riley->ModifyLightInstance(
+                            instId.groupId,
+                            instId.lightInstanceId,
+                            &matId,
+                            &lightShaderId,
+                            &coordSysList,
+                            &rileyXform,
+                            &params);
+                    }
+                } else {
+                    // Very last thing: prepend renderTag to grouping:membership
+                    param->AddRenderTagToGroupingMembership(
+                        protoRenderTags[j], params);
+                    if (instId.geoInstanceId == riley::GeometryInstanceId::InvalidId()) {
+                        TRACE_SCOPE("riley::CreateGeometryInstance");
+                        instId.geoInstanceId = riley->CreateGeometryInstance(
+                            userId,
+                            instId.groupId, 
+                            protoId, 
+                            matId, 
+                            coordSysList, 
+                            rileyXform, 
+                            params);
+                    } else if (*dirtyBits) {
+                        TRACE_SCOPE("riley::ModifyGeometryInstance");
+                        riley->ModifyGeometryInstance(
+                            instId.groupId,
+                            instId.geoInstanceId,
+                            &matId,
+                            &coordSysList,
+                            &rileyXform,
+                            &params);
+                    }
+                }
+            }
+        });
+
+        // We have now fully processed all changes from the last time the
+        // instancer was synced down to the riley instances for this particular
+        // hydra prototype prim.
+        _protoMap.get(prototypePrimPath).dirty = false;
+    }
+
+    // clean up disused prototype groups
+    anyGroupIdChanged |= _CleanDisusedGroupIds(param);
+
+    if (parentInstancer && (anyGroupIdChanged || 
+        HdChangeTracker::IsInstancerDirty(*dirtyBits, instancerId))) {
+        // Now we need to tell the parent instancer to make geometry instances
+        // of my groups (my groups, my groups, my lovely proto groups).
+
+        // Sample this instancer's transform. The instance transforms did not
+        // include it. The parent instancer will instead include it on the
+        // instances it makes of this instancer's prototype groups.
+        HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> xf;
+        delegate->SampleInstancerTransform(instancerId, &xf);
+
+        // Get this instancer's params
+        const RtParamList instancerParams = param->ConvertAttributes(
+            delegate, instancerId, false);
+
+        // Build the lists of flatten groups and prototype group ids, and 
+        // prototype prim paths and material ids, these latter two all being
+        // the same for each group.
+        std::vector<_FlattenData> flats;
+        std::vector<riley::GeometryPrototypeId> ids;
+        std::vector<riley::MaterialId> mats;
+        SdfPathVector paths;
+        _groupMap.citerate([&](const _FlattenData& fd, const riley::GeometryPrototypeId& gp) {
+            flats.push_back(fd);
+            ids.push_back(gp);
+            paths.push_back(instancerId);
+            mats.push_back(riley::MaterialId::InvalidId());
+        });
+
+        // Populate the parent using _PopulateInstancesFromChild so that we can
+        // pass the flatten groups up to it.
+        parentInstancer->_PopulateInstancesFromChild(
+            renderParam,
+            dirtyBits,
+            instancerId,
+            instancerId,
+            ids,
+            coordSysList,
+            instancerParams,
+            xf,
+            mats,
+            paths,
+            // If this prototype was a light and we made light instances in a
+            // geometry prototype group, we want the parent instancer to make
+            // *geometry* instances of those geometry prototype groups. So we
+            // pass the invalid light shader id to it.
+            riley::LightShaderId::InvalidId(),
+            { },
+            flats);
+    }
+}
+
+void
+HdPrmanInstancer::_ComposeInstances(
+    const SdfPath& protoId,
+    const std::vector<_InstanceData>& subInstances,
+    std::vector<_InstanceData>& instances)
+{
+    HD_TRACE_FUNCTION();
+    // XXX: Using riley nested instancing breaks selection. Selection depends on
+    // enumerating every instance of a given hydra geometry prototype prim with
+    // a unique id and setting that id in riley as identifier:id2. When using
+    // riley prototype groups, there is no longer a 1:1 correspondence between
+    // hydra instances of a given prototype and riley instances. If instance
+    // picking and selection are required, users should disable riley nested
+    // instancing by setting HD_PRMAN_DISABLE_NESTED_INSTANCING=1. In future,
+    // we may consider adding an instancer id AOV to the picking and selection
+    // flow to support precise instance disambiguation.
+
+    HdSceneDelegate* delegate = GetDelegate();
+    const SdfPath& id = GetId();
+    const VtIntArray indices = delegate->GetInstanceIndices(id, protoId);
+    instances.clear();
+    if (subInstances.empty()) {
+        instances.resize(indices.size());
+        _ParallelFor(indices.size(), [&](size_t i) {
+            const int index = indices[i];
+            _InstanceData& instance = instances[i];
+            _GetInstanceParams(index, instance.params);
+            instance.params.SetInteger(RixStr.k_identifier_id2, int(i));
+            _BuildStatsId(id, index, protoId, instance.params);
+            _ComposeInstanceFlattenData(index, instance.params, instance.flattenData);
+            _GetInstanceTransform(index, instance.transform);
+        });
+    } else {
+        instances.resize(indices.size() * subInstances.size());
+        // Iteration order is critical to selection. identifier:id2 must
+        // increment in subInstance-major order. So we slow-iterate through
+        // this level's instances and fast-iterate through the subInstances.
+        // Note: Just to express things as clearly as possible, since this is
+        // a parallel loop as written now, it is actually the choice of index
+        // for the identifier:id2 parameter and the ordering of the *indexing*
+        // that is critical: the parallel for loop is free to set the values
+        // in whatever temporal order is most efficient/fastest, as long as the
+        // choice we make for the value of identifier:id2 is the same.
+        _ParallelFor(indices.size() * subInstances.size(), [&](size_t ii) {
+            const size_t i = ii / subInstances.size();
+            const size_t index = indices[i];
+            const size_t si = ii % subInstances.size();
+            const _InstanceData& subInstance  = subInstances[si];
+            _InstanceData& instance = instances[ii];
+            _GetInstanceParams(index, instance.params);
+            instance.params.Update(subInstance.params);
+            instance.params.SetInteger(RixStr.k_identifier_id2, int(ii));
+            _BuildStatsId(id, index, protoId, instance.params);
+            _ComposeInstanceFlattenData(
+                index, 
+                instance.params, 
+                instance.flattenData, 
+                subInstance.flattenData);
+            _GetInstanceTransform(
+                index,
+                instance.transform,
+                subInstance.transform);
+        });
+    }
+}
+
+void
+HdPrmanInstancer::_ComposeInstanceFlattenData(
+    const size_t instanceId,
+    RtParamList& instanceParams,
+    _FlattenData& fd,
+    const _FlattenData& fromBelow)
+{
+    _FlattenData instance;
+    if (instanceId < _instanceCategories.size()) {
+        instance = _FlattenData(_instanceCategories[instanceId]);
+    }
+
+    // Capture fine-grained visibility that may have been authored on the point
+    // instancer as instance-varying USD primvars or the native instance; remove
+    // these from instanceParams if they exist.
+    instance.UpdateVisAndFilterParamList(instanceParams);
+    
+    fd.Update(_instancerFlat);
+    fd.Update(instance);
+    fd.Update(fromBelow);
+}
+
+bool
+HdPrmanInstancer::_RemoveDeadInstances(
+    riley::Riley* riley,
+    const SdfPath& prototypePrimPath,
+    const std::vector<riley::GeometryPrototypeId>& protoIds)
+{
+    HD_TRACE_FUNCTION();
+    // Can't do anything with an empty path
+    if (prototypePrimPath.IsEmpty()) { return false; }
+    // Check if the protoMap has this path in it first;
+    // otherwise the call to get() will insert it.
+    if (!_protoMap.has(prototypePrimPath)) { return false; }
+    using ProtoMapPair = std::pair<riley::GeometryPrototypeId, _InstanceIdVec>;
+    const _ProtoInstMap& protoMap = _protoMap.get(prototypePrimPath).map;
+    std::vector<riley::GeometryPrototypeId> oldProtoIds;
+    std::transform(
+        protoMap.begin(), protoMap.end(),
+        std::back_inserter(oldProtoIds),
+        [](const ProtoMapPair& pair) { return pair.first; });
+    std::vector<riley::GeometryPrototypeId> newProtoIds(
+            protoIds.begin(), protoIds.end());
+
+    std::sort(oldProtoIds.begin(), oldProtoIds.end());
+    std::sort(newProtoIds.begin(), newProtoIds.end());
+
+    std::vector<riley::GeometryPrototypeId> toRemove;
+    std::set_difference(
+        oldProtoIds.cbegin(), oldProtoIds.cend(),
+        newProtoIds.cbegin(), newProtoIds.cend(),
+        std::back_inserter(toRemove));
+    if (toRemove.size() > 0) {
+        _ResizeProtoMap(riley, prototypePrimPath, toRemove, 0);
+    }
+
+    // returns true if there are new geometry prototype ids for this prototype
+    std::vector<riley::GeometryPrototypeId> toAdd;
+    std::set_difference(
+        protoIds.cbegin(), protoIds.cend(),
+        oldProtoIds.cbegin(), oldProtoIds.cend(),
+        std::back_inserter(toAdd));
+    return toAdd.size() > 0;
+}
+
+void
+HdPrmanInstancer::_ComposePrototypeData(
+    const SdfPath& protoPath,
+    const RtParamList& globalProtoParams,
+    const bool isLight,
+    const std::vector<riley::GeometryPrototypeId>& protoIds,
+    const SdfPathVector& subProtoPaths,
+    const std::vector<_FlattenData>& subProtoFlats,
+    std::vector<RtParamList>& protoParams,
+    std::vector<_FlattenData>& protoFlats,
+    std::vector<TfToken>& protoRenderTags)
+{
+    HD_TRACE_FUNCTION();
+    HdSceneDelegate* delegate = GetDelegate();
+
+    auto SetProtoParams = [&](
+        const SdfPath& protoPath,
+        RtParamList& params,
+        _FlattenData& flats)
+    {
+        params = globalProtoParams; // copy
+        _GetPrototypeParams(protoPath, params);
+        const VtTokenArray& cats = delegate->GetCategories(protoPath);
+        flats.categories.insert(cats.begin(), cats.end());
+        flats.UpdateVisAndFilterParamList(params); // filters out flatten params
+
+        // XXX: Temporary workaround form RMAN-20703
+        if (isLight) {
+            // Due to limitations in Prman, we currently cannot put light
+            // instances and geometry instances in the same prototype group. To
+            // force the instancer to separate them, we will make use of
+            // _FlattenData::params, the RtParamList we ordinarily just use for
+            // flattening visibility params up the instancing hierarchy. For
+            // lights, we will set a marker param in the flatten group's
+            // param list that will distinguish the flatten group from an
+            // otherwise identical one for geometry. The name we use is not
+            // important, so long as it has no meaning to riley.
+            //
+            // We only set this marker param here, and it is never read
+            // except when computing the flatten group's hash, when it is
+            // picked up by the RtParamList hash functor.
+            //
+            // See https://jira.pixar.com/browse/RMAN-20703
+            flats.params.SetInteger(RtUString("__light"), 1);
+        }
+        // XXX: End of RMAN-20703 workaround
+    };
+
+    // Make at least one set, even when there are no prototype ids,
+    // to cover analytic lights.
+    const size_t count = std::max(size_t(1), protoIds.size());
+
+    protoParams.resize(count);
+    protoFlats.resize(count);
+    protoRenderTags.resize(count);
+
+    for (size_t i = 0; i < count; ++i) {
+        SetProtoParams(protoPath, protoParams[i], protoFlats[i]);
+        if (!isLight) {
+            protoRenderTags[i] = delegate->GetRenderTag(protoPath);
+        }
+
+        // If prototype is a subset, also get the subset params. While geom
+        // subsets should not have USD primvars on them, they may be the targets
+        // of light linking and thus have categories to deal with. They may also
+        // receive visibility params as part of Hydra's handling of invisible
+        // faces, even though visibility cannot be authored on them in USD.
+        // XXX: All that is changing in hydra 2, where subsets will be able to
+        // have primvars, visibility, and purpose!
+        if (i < subProtoPaths.size() && subProtoPaths[i] != protoPath) {
+            RtParamList subsetParams;
+            _FlattenData subsetFlats;
+            SetProtoParams(subProtoPaths[i], subsetParams, subsetFlats);
+            protoParams[i].Update(subsetParams);
+            protoFlats[i].Update(subsetFlats);
+        }
+
+        // Combine any flats received from below for this prototype.
+        if (i < subProtoFlats.size()) {
+            protoFlats[i].Update(subProtoFlats[i]);
+        }
+    }
+}
+
+void
+HdPrmanInstancer::_ResizeProtoMap(
+    riley::Riley* riley,
+    const SdfPath& prototypePrimPath, 
+    const std::vector<riley::GeometryPrototypeId>& rileyPrototypeIds, 
+    const size_t newSize)
+{
+    HD_TRACE_FUNCTION();
+    _ProtoInstMap& protoInstMap = _protoMap.get(prototypePrimPath).map;
+    for (riley::GeometryPrototypeId protoId : rileyPrototypeIds) {
+        _InstanceIdVec& instIdVec = protoInstMap[protoId];
+        const size_t oldSize = instIdVec.size();
+        if (newSize < oldSize) {
+            // XXX: We loop over the range [newSize, oldSize), for a total of
+            // (oldSize - newSize) elements.
+            _ParallelFor(oldSize - newSize, [&](size_t ii) {
+                size_t i = ii + newSize; // Offset the index by 'newSize'
+                const _RileyInstanceId& id = instIdVec[i];
+                if (id.lightInstanceId != riley::LightInstanceId::InvalidId()) {
+                    riley->DeleteLightInstance(id.groupId, id.lightInstanceId);
+                    _groupCounters.get(id.groupId)--;
+                }
+                if (id.geoInstanceId != riley::GeometryInstanceId::InvalidId()) {
+                    riley->DeleteGeometryInstance(id.groupId, id.geoInstanceId);
+                    _groupCounters.get(id.groupId)--;
+                }
+            });
+        }
+        if (oldSize != newSize) {
+            instIdVec.resize(newSize);
+        }
+        if (newSize == 0) {
+            protoInstMap.erase(protoId);
+        }
+    }
+    if (protoInstMap.size() == 0) {
+        _protoMap.erase(prototypePrimPath);
+    }
+}
+
+bool
+HdPrmanInstancer::_CleanDisusedGroupIds(HdPrman_RenderParam* param)
+{
+    HD_TRACE_FUNCTION();
+    tbb::spin_rw_mutex::scoped_lock lock(_groupIdAcquisitionLock, true);
+    riley::Riley* riley = param->AcquireRiley();
+
+    // Gather active and disused
+    std::vector<_FlattenData> toDestroy;
+    std::unordered_set<riley::GeometryPrototypeId, _ProtoIdHash> active;
+    _groupMap.citerate([&](const _FlattenData& fd, const riley::GeometryPrototypeId& gp){
+        if (gp != riley::GeometryPrototypeId::InvalidId()) {
+            if (_groupCounters.get(gp).load() < 1) {
+                toDestroy.push_back(fd);
+            } else {
+                active.insert(gp);
+            }
+        }
+    });
+    // If there are groups to remove and a parent instancer, depopulate the
+    // parent preserving the still-active groups
+    if (toDestroy.size() > 0) {
+        HdPrmanInstancer* parent = _GetParentInstancer();
+        if (parent) {
+            parent->Depopulate(param, GetId(),
+                { active.cbegin(), active.cend() });
+        }
+    }
+    // Destroy the disused prototype groups
+    for (const _FlattenData& fd : toDestroy) {
+        riley::GeometryPrototypeId& groupId = _groupMap.get(fd);
+        if (groupId != riley::GeometryPrototypeId::InvalidId()) {
+            riley->DeleteGeometryPrototype(groupId);
+            groupId = riley::GeometryPrototypeId::InvalidId();
+        }
+        _groupMap.erase(fd);
+        _groupCounters.erase(groupId);
+    }
+    // Return true if any were destroyed
+    return toDestroy.size() > 0;
+}
+
+bool
+HdPrmanInstancer::_AcquireGroupId(
+    HdPrman_RenderParam* param,
+    const _FlattenData& flattenGroup,
+    riley::GeometryPrototypeId& groupId)
+{
+    HD_TRACE_FUNCTION();
+    // Bail before locking if there's no parent instancer
+    if (_Depth() == 0) {
+        groupId = riley::GeometryPrototypeId::InvalidId();
+        return false;
+    }
+
+    // This lock prevents concurrent calls to Populate from creating separate
+    // riley groups for the same set of flatten data.
+    tbb::spin_rw_mutex::scoped_lock lock(_groupIdAcquisitionLock, false);
+    
+    // We use the flatten data to look up whether this instancer has
+    // a riley group that it will use for all instances across all
+    // prototypes that will share that flatten data. When this instancer
+    // tells its parent instancer to make instances of its riley prototype
+    // groups, it will also tell the parent to set the params that make up
+    // the flatten data on those instances (or pass them along to *its*
+    // parent if it is not the outermost instancer). Using the hashable
+    // FlattenData structure as the key to identify a group id allows us to
+    // take maximal advantage of prman's support for nested instancing while
+    // still preserving any incompatable params we may encounter.
+    //
+    // In short, If the instancer detects variability in the flatten data
+    // across its instances, it will put them into separate buckets.
+
+    groupId = _groupMap.get(flattenGroup);
+    if (groupId == riley::GeometryPrototypeId::InvalidId()) {
+
+        bool found = false;
+        if (!lock.upgrade_to_writer()) {
+            groupId = _groupMap.get(flattenGroup);
+            if (groupId != riley::GeometryPrototypeId::InvalidId())
+                found = true;
+        }
+
+        if (!found) {
+            RtPrimVarList groupPrimvars;
+            groupPrimvars.SetString(RixStr.k_stats_prototypeIdentifier,
+                RtUString(GetId().GetText()));
+            groupId = param->AcquireRiley()->CreateGeometryPrototype(
+                riley::UserId(stats::AddDataLocation(GetId().GetText()).GetValue()),
+                RixStr.k_Ri_Group,
+                riley::DisplacementId::InvalidId(),
+                groupPrimvars);
+            _groupMap.set(flattenGroup, groupId);
+            return true;
+        }
+    }
+    return false;
+}
+
+HdPrmanInstancer*
+HdPrmanInstancer::_GetParentInstancer()
+{
+    // XXX: There is no way of knowing at this stage whether a native instancer
+    // is part of a prototype of another instancer, and thus no way to access
+    // the parent instancer for a native instancing-backed HdInstancer. This
+    // will always return nullptr under native instancing, so native instancing
+    // always produces full flattening in riley and takes no advantage of
+    // nesting.
+    //
+    // Note that it is possible for instancers to have multiple parent
+    // instancers! UsdImaging currently hides this behind instancer id munging
+    // for point instancers, while native instancers do not propagate parent
+    // data to hydra at all, so for now we assume only a single parent.
+
+    HdSceneDelegate* delegate = GetDelegate();
+    HdRenderIndex& renderIndex = delegate->GetRenderIndex();
+    SdfPath parentId = GetParentId();
+    while (!parentId.IsEmpty() && !parentId.IsAbsoluteRootPath()) {
+        HdPrmanInstancer* instancer = static_cast<HdPrmanInstancer*>(
+            renderIndex.GetInstancer(parentId));
+        if (instancer) {
+            return instancer;
+        } else {
+            parentId = parentId.GetParentPath();
+        }
+    }
+    return nullptr;
+}
+
+int
+HdPrmanInstancer::_Depth()
+{
+    // XXX: Since there is no way to tell if a native instancer has any parent
+    // instancers, this will always return depth 0 for native instancing. Also
+    // note that while it is technically possible for an instancer to have
+    // multiple parent instancers, and multple depths along various paths to
+    // its outermost ancestor instancers, assuming a single depth works for now
+    // thanks to limitations imposed by UsdImaging.
+
+    int depth = 0;
+    HdPrmanInstancer* parent = _GetParentInstancer();
+    while (parent) {
+        depth++;
+        parent = parent->_GetParentInstancer();
+    }
+    return depth;
+}
+
+void
+HdPrmanInstancer::_GetInstanceParams(
+    const size_t instanceIndex,
+    RtParamList& params)
+{
+    for (auto entry: _primvarMap) {
+        const HdPrimvarDescriptor& primvar = entry.second.desc;
+        
+        // 'constant' and 'uniform' USD primvars are inherited in toto by
+        // instances, while 'varying', 'vertex', and 'faceVarying' USD primvars
+        // (and those marked as instance-rate by hydra) are inherited per
+        // instance by indexing into the value array.
+        // See https://tinyurl.com/hdxya2yk.
+
+        bool isConstantRate = primvar.interpolation == HdInterpolationConstant
+            || primvar.interpolation == HdInterpolationUniform;
+
+        // Confirm that instance-rate USD primvars are array-valued and have
+        // sufficient dimensions.
+        VtValue val = entry.second.value; // *not* a reference!
+        if ((!isConstantRate) && (instanceIndex >= val.GetArraySize())) {
+            TF_WARN("HdPrman: Instance-rate USD primvar has array size %zu; "
+                    "cannot provide a value for instance index %zu\n",
+                    val.GetArraySize(), instanceIndex);
+            continue;
+        }
+
+        // If the interpolation is not constant or uniform and the value is
+        // an array, extract just the value of interest.
+        if ((!isConstantRate) && val.IsArrayValued()) {
+            val = VtVisitValue(val, _GetValueAtIndex(instanceIndex));
+        }
+
+        const RtUString name = _FixupParamName(entry.first);
+        
+        // USD primvars in the "ri:attributes" and "primvars:ri:attributes"
+        // namespaces end up having the same fixed-up param name, potentially
+        // causing collisions in the param list. When both "ri:attributes" and
+        // "primvar:ri:attributes" versions of the same USD primvar exist, the
+        // "primvar:ri:attributes" version should win out.
+        if (TfStringStartsWith(entry.first.GetString(), "ri:attributes:") &&
+            params.HasParam(name)) {
+            continue;
+        }
+        if (!HdPrman_Utils::SetParamFromVtValue(
+                name, val, primvar.role, &params)) {
+            TF_WARN("Unrecognized USD primvar value type at %s.%s",
+                GetId().GetText(), entry.first.GetText());
+        }
+    }
+}
+
+void
+HdPrmanInstancer::_GetPrototypeParams(
+    const SdfPath& protoPath,
+    RtParamList& params)
+{
+    // XXX: With the scene index enabled (Hydra 2.0), this fails to find
+    // constant inherited USD primvars, but picks up displayColor and
+    // displayOpacity, even when those are not authored anywhere on or
+    // above the target prototype.
+
+    HdSceneDelegate* delegate = GetDelegate();
+    // Only get constant and uniform USD primvars
+    for (HdInterpolation i = HdInterpolationConstant;
+        i < HdInterpolationVarying; i = HdInterpolation(i+1)) {
+        for (const HdPrimvarDescriptor& primvar :
+            delegate->GetPrimvarDescriptors(protoPath, i)) {
+            const RtUString name = _FixupParamName(primvar.name);
+
+            // USD primvars in the "ri:attributes" and "primvars:ri:attributes"
+            // namespaces end up having the same fixed-up param name, potentially
+            // causing collisions in the param list. When both "ri:attributes" and
+            // "primvar:ri:attributes" versions of the same USD primvar exist, the
+            // "primvar:ri:attributes" version should win out.
+            if (TfStringStartsWith(primvar.name.GetString(), "ri:attributes") &&
+                params.HasParam(name)) {
+                continue;
+            }
+            const VtValue& val = delegate->Get(protoPath, primvar.name);
+            if (!HdPrman_Utils::SetParamFromVtValue(
+                name, val, primvar.role, &params)) {
+                TF_WARN("Unrecognized USD primvar value type at %s.%s",
+                    protoPath.GetText(), primvar.name.GetText());
+            }
+        }
+    }
+}
+
+void
+HdPrmanInstancer::_GetInstanceTransform(
+    const size_t instanceIndex,
+    _GfMatrixSA& xform,
+    const _GfMatrixSA& left)
+{
+    if (_sa.count > 0 && instanceIndex < _sa.values[0].size()) {
+        if (left.count > 0) {
+            _GfMatrixSA right;
+            _AccumulateSampleTimes(_sa, right);
+            for (size_t i = 0; i < right.count; ++i) {
+                right.values[i] = _sa.values[i][instanceIndex];
+            }
+            _AccumulateSampleTimes(left, xform);
+            _AccumulateSampleTimes(right, xform);
+            for (size_t i = 0; i < xform.count; ++i) {
+                const float t = xform.times[i];
+                xform.values[i] = left.Resample(t) * right.Resample(t);
+            }
+        } else {
+            _AccumulateSampleTimes(_sa, xform);
+            for (size_t i = 0; i < xform.count; ++i) {
+                xform.values[i] = _sa.values[i][instanceIndex];
+            }
+        }
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/instancer.h b/third_party/renderman-26/plugin/hdPrman/instancer.h
new file mode 100644
index 0000000000..e9b3c34f6f
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/instancer.h
@@ -0,0 +1,675 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INSTANCER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INSTANCER_H
+
+#include "pxr/pxr.h"
+
+#include "hdPrman/renderParam.h"
+#include "hdPrman/rixStrings.h"
+
+#include "pxr/imaging/hd/instancer.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/timeSampleArray.h"
+#include "pxr/base/tf/hashmap.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/vt/types.h"
+#include "pxr/base/vt/value.h"
+
+#include "tbb/concurrent_unordered_map.h"
+#include "tbb/spin_rw_mutex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrmanInstancer : public HdInstancer
+{
+
+public:
+
+    HdPrmanInstancer(HdSceneDelegate* delegate, SdfPath const& id);
+
+    /// Destructor.
+    ~HdPrmanInstancer();
+    
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam   *renderParam,
+              HdDirtyBits     *dirtyBits) override;
+
+    void Finalize(HdRenderParam *renderParam) override;
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+    /**
+     * @brief Instructs the instancer to generate riley instances for the given 
+     * prototypes. Caller is responsible for the lifecycle of the riley
+     * prototypes, while the instancer will own the riley instances. This should
+     * only be called with all of the riley prototypes associated with a given
+     * hydra prototype path.
+     * 
+     * @param renderParam
+     * @param dirtyBits The hydra prototype's dirty bits.
+     * @param hydraPrototypeId The path of the hydra prototype prim.
+     * @param rileyPrototypeIds The riley geometry prototype ids associated with
+     *        this hydra prototype prim. There may be more than one, in the case
+     *        of geomSubsets, or when a child instancer has more than one
+     *        prototype group. If this is empty, all previously-populated
+     *        instances associated with this hydraPrototypeId will be destroyed.
+     *        It should not contain invalid prototype ids unless the hydra
+     *        prototype is an analytic light, in which case it must contain
+     *        exactly one invalid geometry prototype id.
+     * @param coordSysList The coordinate system list for the hydra prototype.
+     * @param protoParams The riley instance params derived from the hydra
+     *        prototype. These will be applied to every riley instance except
+     *        where they are overridden by riley instance params derived from
+     *        the instancer. This collection may include visibility params, but
+     *        should not include params used for light linking. These latter
+     *        params will be derived by direct query of the scene delegate
+     *        using hydraPrototypeId (or the appropriate prototypePrimPath, see
+     *        below), and will be ignored and overwritten if they are present
+     *        here. For a full list, see _GetLightLinkParams
+     * @param protoXform The transform of the hydra prototype prim relative to
+     *        the parent of the prototype root. This will be applied to the
+     *        riley instances first, before the transform derived from the
+     *        instancer's instancing mechanism or the instancer's own transform.
+     * @param rileyMaterialIds The riley material ids to be assigned to the
+     *        instances of each of the supplied riley prototypes; this should
+     *        match rileyPrototypeIds in length and indexing.
+     * @param prototypePaths The stage paths of the (sub)prims each riley 
+     *        prototype id represents, e.g., the stage paths to the geomSubsets;
+     *        this should always match prototypeIds in length and indexing.
+     *        These are used for identification purposes and, when they are
+     *        different from hydraPrototypeId, for retrieving light-linking
+     *        categories, so they should (ideally) not be proxy paths.
+     * @param lightShaderId (optional) The riley light shader id associated with
+     *        this hydra prototype. When this is provided, we assume the hydra
+     *        prototype prim is a light. When this is provided,
+     *        rileyPrototypeIds must either have the geometry prototype id(s)
+     *        for a mesh light or have a single invalid id for an analytic light.
+     */
+    void Populate(
+        HdRenderParam* renderParam,
+        HdDirtyBits* dirtyBits,
+        const SdfPath& hydraPrototypeId,
+        const std::vector<riley::GeometryPrototypeId>& rileyPrototypeIds,
+        const riley::CoordinateSystemList& coordSysList,
+        const RtParamList protoParams,
+        const HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> protoXform,
+        const std::vector<riley::MaterialId>& rileyMaterialIds,
+        const SdfPathVector& prototypePaths,
+        const riley::LightShaderId& lightShaderId = riley::LightShaderId::InvalidId());
+
+    /**
+     * @brief Instructs the instancer to destroy any riley instances for the
+     * given hydra prototype prim path, optionally preserving those instances of
+     * a given list of prototype ids.
+     * 
+     * @param renderParam 
+     * @param prototypePrimPath The path of the hydra prototype.
+     * @param excludedPrototypeIds List of riley prototype ids whose instances
+     *        should be preserved. When empty or not provided, all instances of
+     *        all prototypes for the given prototypePrimPath will be destroyed.
+     *        HdPrmanInstancer itself uses this list to preserve instances of
+     *        its own prototype groups when depopulating some instances from a
+     *        parent instancer.
+     */
+    void Depopulate(
+        HdRenderParam* renderParam,
+        const SdfPath& prototypePrimPath,
+        const std::vector<riley::GeometryPrototypeId>& excludedPrototypeIds = {});
+
+private:
+
+    // **********************************************
+    // **              Private Types               **
+    // **********************************************
+
+    using _GfMatrixSA = HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES>;
+    using _RtMatrixSA = HdTimeSampleArray<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES>;
+    
+    struct _RtParamListHashFunctor
+    {
+        size_t operator()(const RtParamList& params) const noexcept
+        {
+            // Wow this sucks, but RtParamList::Hash() is not const!
+            RtParamList copy = params;
+            return std::hash<uint32_t>()(copy.Hash());
+        }
+    };
+
+    struct _RtParamListEqualToFunctor
+    {
+        bool operator()(const RtParamList& lhs, const RtParamList& rhs) const noexcept
+        {
+            return _RtParamListHashFunctor()(lhs) == _RtParamListHashFunctor()(rhs);
+        }
+    };
+
+    struct _PrimvarValue
+    {
+        HdPrimvarDescriptor desc;
+        VtValue value;
+    };
+
+    struct _FlattenData
+    {
+        
+        // The set of light linking categories
+        std::unordered_set<TfToken, TfToken::HashFunctor> categories;
+
+        // We store visibility in an RtParamList to take advantage of that
+        // structure's Inherit and Update methods, and because simply storing
+        // a single boolean would clobber any renderer-specific params that might
+        // have been authored on a given (native) instance.
+        RtParamList params;
+
+        _FlattenData() { }
+        _FlattenData(const VtTokenArray& cats) 
+            : categories(cats.begin(), cats.end()) { }
+        _FlattenData(const VtTokenArray& cats, bool vis)
+            : categories(cats.begin(), cats.end())
+        {
+            SetVisibility(vis);
+        }
+        // Copy constructor
+        _FlattenData(const _FlattenData& other) 
+        : categories(other.categories.cbegin(), other.categories.cend())
+        {
+            params.Update(other.params);
+        }
+
+        // Params that already exist here will not be changed;
+        // categories will be merged
+        void Inherit(const _FlattenData& rhs)
+        {
+            categories.insert(rhs.categories.cbegin(), rhs.categories.cend());
+            params.Inherit(rhs.params);
+        }
+
+        // Params that already exist here will be changed;
+        // categories will be merged
+        void Update(const _FlattenData& rhs)
+        {
+            categories.insert(rhs.categories.cbegin(), rhs.categories.cend());
+            params.Update(rhs.params);
+        }
+
+        // Update this FlattenData's visibility from an RtParamList. Visibility
+        // params that already exist here will be changed; visibility and
+        // light linking params on the RtParamList will be removed from it.
+        void UpdateVisAndFilterParamList(RtParamList& other) {
+            // Move visibility params from the RtParamList to the FlattenData
+            for (const RtUString& param : _GetVisibilityParams()) {
+                int val;
+                if (other.GetInteger(param, val)) {
+                    if (val == 1) {
+                        params.Remove(param);
+                    } else {
+                        params.SetInteger(param, val);
+                    }
+                    other.Remove(param);
+                }
+            }
+
+            // Copy any existing value for grouping:membership into the
+            // flatten data. For lights, this gets a value during light sync,
+            // and ConvertCategoriesToAttributes specifically handles preserving
+            // it. We need to capture the value from light sync here so we can 
+            // and flatten against it. It won't be captured by the categories
+            // because the value set in light sync comes from a different
+            // source. It has to be handled separately from categories.
+            RtUString groupingMembership;
+            if (other.GetString(RixStr.k_grouping_membership, groupingMembership)) {
+                params.SetString(RixStr.k_grouping_membership, groupingMembership);
+            }
+
+            // Remove the light linking params from the RtParamList. Not going
+            // to parse them back out to individual tokens to add to
+            // the FlattenData categories, as they will be captured elsewhere.
+            for (const RtUString& param : _GetLightLinkParams()) {
+                other.Remove(param);
+            }
+        }
+
+        // Sets all visibility params, overwriting current values.)
+        void SetVisibility(bool visible) {
+            if (visible) {
+                for (const RtUString& param : _GetVisibilityParams()) {
+                    params.Remove(param);
+                }
+            } else {
+                for (const RtUString& param : _GetVisibilityParams()) {
+                    params.SetInteger(param, 0);
+                }
+            }
+        }
+
+        // equals operator
+        bool operator==(const _FlattenData& rhs) const noexcept
+        {
+            return categories == rhs.categories &&
+                _RtParamListEqualToFunctor()(params, rhs.params);
+        }
+
+        struct HashFunctor {
+            size_t operator()(const _FlattenData& fd) const noexcept
+            {
+                size_t hash = 0ul;
+
+                // simple order-independent XOR hash aggregation 
+                for (const TfToken& tok : fd.categories) {
+                    hash ^= tok.Hash();
+                }
+                return hash ^ _RtParamListHashFunctor()(fd.params);
+            }
+        };
+
+    private:
+        static std::vector<RtUString> _GetLightLinkParams()
+        {
+            // List of riley instance params pertaining to light-linking that are
+            // not supported on instances inside geometry prototype groups
+            static const std::vector<RtUString> LightLinkParams = {
+                RixStr.k_lightfilter_subset,
+                RixStr.k_lighting_subset,
+                RixStr.k_grouping_membership,
+                RixStr.k_lighting_excludesubset
+            };
+            return LightLinkParams;
+        }
+
+        static std::vector<RtUString> _GetVisibilityParams()
+        {
+            // List of rile instance params pertaining to visibility that are
+            // not supported on instances inside geometry prototype groups
+            static const std::vector<RtUString> VisParams = {
+                RixStr.k_visibility_camera,
+                RixStr.k_visibility_indirect,
+                RixStr.k_visibility_transmission
+            };
+            return VisParams;
+        }
+
+    };
+
+    struct _InstanceData
+    {
+        _FlattenData flattenData;
+        RtParamList params;
+        _GfMatrixSA transform;
+
+        _InstanceData() { }
+        _InstanceData(
+            const VtTokenArray& cats, 
+            bool vis, 
+            const RtParamList& p, 
+            _GfMatrixSA& xform)
+            : transform(xform)
+        {
+            params.Inherit(p);
+        }
+    };
+
+    // A simple concurrent hashmap built from tbb::concurrent_unordered_map but
+    // with a simpler interface. Thread-safe operations (insertion, retrieval,
+    // const iteration) happen under a shared_lock, while unsafe operations
+    // (erase, clear, non-const iteration) use an exclusive lock. This way, the
+    // thread-safe operations can all run concurrently with one another, relying
+    // on tbb::concurrent_unordered_map's thread safety, but will never run
+    // while an unsafe operation is in progress, nor will the unsafe operations
+    // start while a safe one is running.
+    template<
+        typename Key, 
+        typename T, 
+        typename Hash = std::hash<Key>, 
+        typename KeyEqual = std::equal_to<Key>>
+    class _LockingMap
+    {
+    public:
+        // Check whether the map contains the given key; check this call before
+        // calling get() if you want to avoid get's auto-insertion.
+        bool has(const Key& key) const
+        {
+            tbb::spin_rw_mutex::scoped_lock lock(_mutex, false);
+            if (_map.size() == 0) { return false; }
+            return _map.find(key) != _map.end();
+        }
+
+        // Retrieve the value for the given key. If the key is not present in
+        // the map, a default-constructed value will be inserted and returned.
+        // T must have default constructor
+        T& get(const Key& key)
+        {
+            static_assert(std::is_default_constructible<T>::value, 
+                          "T must be default constructible");
+
+            tbb::spin_rw_mutex::scoped_lock lock(_mutex, false);
+            auto it = _map.find(key);
+            if (it == _map.end()) {
+                it = _map.emplace(
+                    std::piecewise_construct,
+                    std::forward_as_tuple(key),
+                    std::tuple<>{}).first;
+            }
+            return it->second;
+        }
+
+        // Set key to value, returns true if the key was newly inserted
+        // T must have copy assignment operator
+        bool set(const Key& key, T& val)
+        {
+            static_assert(std::is_copy_assignable<T>::value, 
+                          "T must be copy-assignable");
+
+            tbb::spin_rw_mutex::scoped_lock lock(_mutex, false);
+            if (_map.size() > 0) {
+                auto it = _map.find(key);
+                if (it != _map.end()) {
+                    it->second = val;
+                    return false;
+                }
+            }
+            _map.insert({key, val});
+            return true;
+        }
+
+        // Iterate the map with a non-const value reference under exclusive lock
+        void iterate(std::function<void(const Key&, T&)> fn)
+        {
+            // exclusive lock
+            tbb::spin_rw_mutex::scoped_lock lock(_mutex, true);
+            for (std::pair<const Key, T>& p : _map) {
+                fn(p.first, p.second);
+            }
+        }
+
+        // Iterate the map with a const value reference under shared lock
+        void citerate(std::function<void(const Key&, const T&)> fn) const
+        {
+            tbb::spin_rw_mutex::scoped_lock lock(_mutex, false);
+            for (const std::pair<const Key, const T>& p : _map) {
+                fn(p.first, p.second);
+            }
+        }
+
+        // Gives the count of keys currently in the map
+        size_t size() const
+        {
+            tbb::spin_rw_mutex::scoped_lock lock(_mutex, false);
+            return _map.size();
+        }
+
+        // Erase the given key from the map under exclusive lock
+        void erase(const Key& key)
+        {
+            // exclusive lock
+            tbb::spin_rw_mutex::scoped_lock lock(_mutex, true);
+            _map.unsafe_erase(key);
+        }
+
+        // Clear all map entries under exclusive lock
+        void clear()
+        {
+            // exclusive lock
+            tbb::spin_rw_mutex::scoped_lock lock(_mutex, true);
+            _map.clear();
+        }
+    private:
+        tbb::concurrent_unordered_map<Key, T, Hash, KeyEqual> _map;
+        mutable tbb::spin_rw_mutex _mutex;
+    };
+
+    using _LockingFlattenGroupMap = _LockingMap<
+        _FlattenData,
+        riley::GeometryPrototypeId,
+        _FlattenData::HashFunctor>;
+
+    struct _RileyInstanceId
+    {
+        riley::GeometryPrototypeId groupId;
+        riley::GeometryInstanceId geoInstanceId;
+        riley::LightInstanceId lightInstanceId;
+    };
+
+    using _InstanceIdVec = std::vector<_RileyInstanceId>;
+    
+    struct _ProtoIdHash
+    {
+        size_t operator()(const riley::GeometryPrototypeId& id) const noexcept
+        { 
+            return std::hash<uint32_t>()(id.AsUInt32());
+        }
+    };
+
+    using _ProtoInstMap = std::unordered_map<
+        riley::GeometryPrototypeId,
+        _InstanceIdVec,
+        _ProtoIdHash>;
+    
+    using _LockingProtoGroupCounterMap = _LockingMap<
+        riley::GeometryPrototypeId,
+        std::atomic<int>,
+        _ProtoIdHash>;
+
+    struct _ProtoMapEntry
+    {
+        _ProtoInstMap map;
+        bool dirty;
+    };
+
+    using _LockingProtoMap = _LockingMap<SdfPath, _ProtoMapEntry, SdfPath::Hash>;
+
+    // **********************************************
+    // **             Private Methods              **
+    // **********************************************    
+
+    // Sync helper; caches instance-rate primvars
+    void _SyncPrimvars(HdDirtyBits* dirtyBits);
+
+    // Sync helper; caches the instancer and instance transforms
+    void _SyncTransforms(HdDirtyBits* dirtyBits);
+
+    // Sync helper; caches instance or instancer categories as appropriate
+    void _SyncCategories(HdDirtyBits* dirtyBits);
+
+    // Sync helper; caches instancer visibility
+    void _SyncVisibility(HdDirtyBits* dirtyBits);
+
+    // Generates InstanceData structures for this instancer's instances;
+    // will multiply those by any supplied subInstances
+    void _ComposeInstances(
+        const SdfPath& protoId,
+        const std::vector<_InstanceData>& subInstances,
+        std::vector<_InstanceData>& instances);
+
+    // Generates FlattenData from a set of instance params by looking for
+    // incompatible params and moving them from the RtParamList to the
+    // FlattenData. Called by _ComposeInstances().
+    void _ComposeInstanceFlattenData(
+        const size_t instanceId,
+        RtParamList& instanceParams,
+        _FlattenData& fd,
+        const _FlattenData& fromBelow = _FlattenData());
+
+    // Generates param sets and flatten data for the given prototype
+    // prim(s). Starts with copies of the prototype params provided to
+    // Populate, and additionally captures constant/uniform params inherited
+    // by the prototype, prototype- and subset-level light linking, and subset
+    // visibility.
+    void _ComposePrototypeData(
+        const SdfPath& protoPath,
+        const RtParamList& globalProtoParams,
+        const bool isLight,
+        const std::vector<riley::GeometryPrototypeId>& protoIds,
+        const SdfPathVector& subProtoPaths,
+        const std::vector<_FlattenData>& subProtoFlats,
+        std::vector<RtParamList>& protoParams,
+        std::vector<_FlattenData>& protoFlats,
+        std::vector<TfToken>& protoRenderTags);
+
+    // Deletes riley instances owned by this instancer that are of riley
+    // geometry prototypes that are no longer associated with the given
+    // prototype prim. Returns true if there are any new riley geometry
+    // prototype ids to associate with this prototype prim path.
+    bool _RemoveDeadInstances(
+        riley::Riley* riley,
+        const SdfPath& prototypePrimPath,
+        const std::vector<riley::GeometryPrototypeId>& protoIds);
+
+    // Flags all previously seen prototype prim paths as needing their instances
+    // updated the next time they show up in a Populate call.
+    void _SetPrototypesDirty();
+
+    // Generates instances of the given prototypes according to the instancer's
+    // instancing configuration. If the instancer is too deep, they get passed
+    // up to this method on the parent instancer. The given prototypes may be
+    // prims (when called through the public Populate method) or may be
+    // child instancers represented by riley geometry prototype groups. In
+    // either case, the caller owns the riley prototypes.
+    void _PopulateInstances(
+        HdRenderParam* renderParam,
+        HdDirtyBits* dirtyBits,
+        const SdfPath& hydraPrototypeId,
+        const SdfPath& prototypePrimPath,
+        const std::vector<riley::GeometryPrototypeId>& rileyPrototypeIds,
+        const riley::CoordinateSystemList& coordSysList,
+        const RtParamList protoParams,
+        const HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> protoXform,
+        const std::vector<riley::MaterialId>& rileyMaterialIds,
+        const SdfPathVector& prototypePaths,
+        const riley::LightShaderId& lightShaderId,
+        const std::vector<_InstanceData>& subInstances,
+        const std::vector<_FlattenData>& prototypeFlats);
+
+    // Locks before calling _PopulateInstances() to prevent duplicated Riley
+    // calls that may arise when Populate() has been called from multiple
+    // threads producing identical population requests from the same child
+    // instancer. Locks are segregated by prototypePrimPath to avoid
+    // over-locking.
+    void _PopulateInstancesFromChild(
+        HdRenderParam* renderParam,
+        HdDirtyBits* dirtyBits,
+        const SdfPath& hydraPrototypeId,
+        const SdfPath& prototypePrimPath,
+        const std::vector<riley::GeometryPrototypeId>& rileyPrototypeIds,
+        const riley::CoordinateSystemList& coordSysList,
+        const RtParamList protoParams,
+        const HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> protoXform,
+        const std::vector<riley::MaterialId>& rileyMaterialIds,
+        const SdfPathVector& prototypePaths,
+        const riley::LightShaderId& lightShaderId,
+        const std::vector<_InstanceData>& subInstances,
+        const std::vector<_FlattenData>& prototypeFlats);
+
+    // Get pointer to parent instancer, if one exists
+    HdPrmanInstancer* _GetParentInstancer();
+    
+    // Resize the instancer's interal state store for tracking riley instances.
+    // Shrinking the number of instances for a given prototype path and id will
+    // delete excess instances from riley. Call with newSize = 0 to kill 'em all.
+    void _ResizeProtoMap(
+        riley::Riley* riley,
+        const SdfPath& prototypePrimPath, 
+        const std::vector<riley::GeometryPrototypeId>& rileyPrototypeIds, 
+        const size_t newSize);
+
+    // Deletes any riley geometry prototype groups that are no longer needed.
+    // Returns true if any groups were deleted.
+    bool _CleanDisusedGroupIds(HdPrman_RenderParam* param);
+
+    // Obtain the riley geometry prototype group id for a given FlattenData.
+    // Returns true if the group had to be created. Gives InvalidId when this
+    // instancer has no parent instancer.
+    bool _AcquireGroupId(
+        HdPrman_RenderParam* param,
+        const _FlattenData& flattenGroup,
+        riley::GeometryPrototypeId& groupId);
+
+    // Retrieves instance-rate params for the given instance index from
+    // the instancer's cache.
+    void _GetInstanceParams(
+        const size_t instanceIndex,
+        RtParamList& params);
+
+    // Gets constant and uniform params for the prototype
+    void _GetPrototypeParams(
+        const SdfPath& protoPath,
+        RtParamList& params
+    );
+
+    // Retrieves the instance transform for the given index from the
+    // instancer's cache.
+    void _GetInstanceTransform(
+        const size_t instanceIndex,
+        _GfMatrixSA& xform,
+        const _GfMatrixSA& left = _GfMatrixSA());
+
+    // Calculates this instancer's depth in the nested instancing hierarchy.
+    // An uninstanced instancer has depth 0. Instancers with depth > 4 cannot
+    // use riley nested instancing and must flatten their instances into their
+    // parents.
+    int _Depth();
+
+
+    // **********************************************
+    // **             Private Members              **
+    // **********************************************   
+
+    // This instancer's cached instance transforms
+    HdTimeSampleArray<VtMatrix4dArray, HDPRMAN_MAX_TIME_SAMPLES> _sa;
+
+    // This instancer's cached coordinate system list
+    riley::CoordinateSystemList _coordSysList = { 0, nullptr };
+
+    // This instancer's cached instance categories; will be empty under point
+    // instancing, so all indexing must be bounds-checked!
+    std::vector<VtTokenArray> _instanceCategories;
+
+    // This instancer's cached visibility and categories
+    _FlattenData _instancerFlat;
+
+    // This instancer's cached USD primvars
+    TfHashMap<TfToken, _PrimvarValue, TfToken::HashFunctor> _primvarMap;
+
+    // Map of FlattenData to GeometryProtoypeId
+    // We use this map to put instances that share values for instance params
+    // that are incompatible with riley nesting into shared prototype groups so
+    // that the incompatible params may be set on the outermost riley
+    // instances of those groups where they are supported. This map may be
+    // written to during Populate, so access must be gated behind a mutex
+    // lock (built into LockingMap).
+    _LockingFlattenGroupMap _groupMap;
+
+    // Counters for tracking number of instances in each prototype group. Used
+    // to speed up empty prototype group removal.
+    _LockingProtoGroupCounterMap _groupCounters;
+
+    // riley geometry prototype groups are created during Populate; these must
+    // be serialized to prevent creating two different groups for the same set
+    // of flatten data.
+    tbb::spin_rw_mutex _groupIdAcquisitionLock;
+    
+    // Main storage for tracking riley instances owned by this instancer.
+    // Instance ids are paired with their containing group id (RileyInstanceId),
+    // then grouped by their riley geometry prototype id (ProtoInstMap). These
+    // are then grouped by id of the prototype prim they represent (which may be
+    // the invalid id in the case of analytic lights). The top level of this
+    // nested structure may be written to during Populate, therefore access to
+    // the top level is gated behind a mutex lock (built into LockingMap).
+    // Deeper levels are only ever written to from within a single call to
+    // Populate, so they do not have gated access.
+    _LockingProtoMap _protoMap;
+
+    // Locks used by _PopulateInstancesFromChild() to serialize (and dedupe)
+    // parallel calls from the same child instancer, which occur when the child
+    // has multiple prototype prims and would otherwise lead to duplicated
+    // Riley calls to Create or Remove instances, both of which are problematic.
+    _LockingMap<SdfPath, tbb::spin_rw_mutex, SdfPath::Hash> _childPopulateLocks;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INSTANCER_H
diff --git a/third_party/renderman-26/plugin/hdPrman/integrator.cpp b/third_party/renderman-26/plugin/hdPrman/integrator.cpp
new file mode 100644
index 0000000000..136fc886f7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/integrator.cpp
@@ -0,0 +1,68 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/integrator.h"
+
+#include "hdPrman/renderDelegate.h"
+#include "hdPrman/renderParam.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (resource)
+);
+
+HdPrman_Integrator::HdPrman_Integrator(
+    SdfPath const& id)
+    : HdSprim(id)
+{
+}
+
+void
+HdPrman_Integrator::Finalize(HdRenderParam *renderParam)
+{
+}
+
+void
+HdPrman_Integrator::Sync(
+    HdSceneDelegate *sceneDelegate,
+    HdRenderParam *renderParam,
+    HdDirtyBits *dirtyBits)
+{
+    const SdfPath &id = GetId();
+    HdPrman_RenderParam *param = static_cast<HdPrman_RenderParam*>(renderParam);
+
+    if (*dirtyBits & HdChangeTracker::DirtyParams) {
+        // Only Create the Integrator if connected to the RenderSettings
+        // Note that this works because the RenderSettings, being a Bprim,
+        // always gets synced before the Integrator Sprim.
+        SdfPath integratorPath = param->GetRenderSettingsIntegratorPath();
+        if (id == integratorPath) {
+            const VtValue integratorResourceValue =
+                sceneDelegate->Get(id, _tokens->resource);
+            if (integratorResourceValue.IsHolding<HdMaterialNode2>()) {
+                HdMaterialNode2 integratorNode =
+                    integratorResourceValue.UncheckedGet<HdMaterialNode2>();
+                param->SetRenderSettingsIntegratorNode(
+                    &sceneDelegate->GetRenderIndex(), integratorNode);
+            }
+        }
+    }
+
+    *dirtyBits = HdChangeTracker::Clean;
+}
+
+
+HdDirtyBits HdPrman_Integrator::GetInitialDirtyBitsMask() const
+{
+    int mask = HdChangeTracker::Clean | HdChangeTracker::DirtyParams;
+    return (HdDirtyBits)mask;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/integrator.h b/third_party/renderman-26/plugin/hdPrman/integrator.h
new file mode 100644
index 0000000000..e13d66c3d3
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/integrator.h
@@ -0,0 +1,37 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INTEGRATOR_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INTEGRATOR_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sprim.h"
+
+#include "Riley.h"
+#include "pxr/imaging/hd/material.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_RenderParam;
+
+class HdPrman_Integrator : public HdSprim
+{
+public:
+    HdPrman_Integrator(SdfPath const& id);
+
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam *renderParam,
+              HdDirtyBits *dirtyBits) override;
+
+    void Finalize(HdRenderParam *renderParam) override;
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_INTEGRATOR_H
diff --git a/third_party/renderman-26/plugin/hdPrman/legacyMeshLightAdapter.cpp b/third_party/renderman-26/plugin/hdPrman/legacyMeshLightAdapter.cpp
new file mode 100644
index 0000000000..d4b21e3e50
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/legacyMeshLightAdapter.cpp
@@ -0,0 +1,101 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/legacyMeshLightAdapter.h"
+#include "pxr/usd/usdLux/lightAPI.h"
+#include "pxr/usdImaging/usdImaging/indexProxy.h"
+#include "pxr/usd/ar/resolverContextBinder.h"
+#include "pxr/usd/ar/resolverScopedCache.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/light.h"
+#include "pxr/usdImaging/usdImaging/materialParamUtils.h"
+#include "pxr/imaging/hd/material.h"
+#include "pxr/imaging/hd/materialSchema.h"
+#include "pxr/imaging/hd/materialNetworkSchema.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (isLight)
+);
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    typedef HdPrman_LegacyMeshLightAdapter Adapter;
+    TfType t = TfType::Define<Adapter, TfType::Bases<Adapter::BaseAdapter> >();
+    t.SetFactory< UsdImagingPrimAdapterFactory<Adapter> >();
+}
+
+void
+HdPrman_LegacyMeshLightAdapter::TrackVariability(
+    UsdPrim const& prim,
+    SdfPath const& cachePath,
+    HdDirtyBits* timeVaryingBits,
+    UsdImagingInstancerContext const* instancerContext) const
+{
+    BaseAdapter::TrackVariability(
+        prim, cachePath, timeVaryingBits, instancerContext);
+
+    UsdLuxLightAPI light(prim);
+    if (TF_VERIFY(light)) {
+        UsdImaging_CollectionCache& collectionCache = _GetCollectionCache();
+        collectionCache.UpdateCollection(light.GetLightLinkCollectionAPI());
+        collectionCache.UpdateCollection(light.GetShadowLinkCollectionAPI());
+        // TODO: When collections change we need to invalidate affected
+        // prims with the DirtyCollections flag.
+    }
+}
+
+HdDirtyBits
+HdPrman_LegacyMeshLightAdapter::ProcessPropertyChange(
+    UsdPrim const& prim, SdfPath const& cachePath, TfToken const& propertyName)
+{
+    HdDirtyBits dirtyBits = BaseAdapter::ProcessPropertyChange(
+        prim, cachePath, propertyName);
+    if (propertyName == _tokens->isLight)
+        dirtyBits |= HdChangeTracker::AllDirty;
+    else if (TfStringStartsWith(propertyName, "inputs:")
+        || TfStringStartsWith(propertyName, "light:")
+        || TfStringStartsWith(propertyName, "collection:"))
+        dirtyBits |= HdChangeTracker::DirtyMaterialId;
+    return dirtyBits;
+}
+
+
+VtValue
+HdPrman_LegacyMeshLightAdapter::GetMaterialResource(
+    UsdPrim const& prim, SdfPath const& cachePath, UsdTimeCode time) const
+{
+    // std::cout << "HdPrman_LegacyMeshLightAdapter::GetMaterialResource" << std::endl;
+    if (!_GetSceneLightsEnabled()) {
+        return VtValue();
+    }
+
+    if (!prim.HasAPI<UsdLuxLightAPI>()) {
+        TF_RUNTIME_ERROR(
+            "Expected light prim at <%s> to have an applied API "
+            "of type 'UsdLuxLightAPI'; ignoring",
+            prim.GetPath().GetText());
+        return VtValue();
+    }
+
+    // Bind the usd stage's resolver context for correct asset resolution.
+    ArResolverContextBinder binder(prim.GetStage()->GetPathResolverContext());
+    ArResolverScopedCache resolverCache;
+
+    HdMaterialNetworkMap networkMap;
+
+    UsdImagingBuildHdMaterialNetworkFromTerminal(
+        prim, HdMaterialTerminalTokens->light, _GetShaderSourceTypes(),
+        _GetMaterialRenderContexts(), &networkMap, time);
+
+    return VtValue(networkMap);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/legacyMeshLightAdapter.h b/third_party/renderman-26/plugin/hdPrman/legacyMeshLightAdapter.h
new file mode 100644
index 0000000000..a73e2ab4a4
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/legacyMeshLightAdapter.h
@@ -0,0 +1,44 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LEGACY_MESHLIGHT_ADAPTER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LEGACY_MESHLIGHT_ADAPTER_H
+
+#include "pxr/usdImaging/usdImaging/meshAdapter.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include <unordered_set>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// Until we transition to a full scene index plugin this adapter allows us to
+// use a PxrMesh instead of a Mesh to gain access to the light data on a mesh
+// inside of HdPrman.
+
+class HdPrman_LegacyMeshLightAdapter : public UsdImagingMeshAdapter
+{
+public:
+    using BaseAdapter = UsdImagingMeshAdapter;
+
+    void TrackVariability(
+        UsdPrim const& prim,
+        SdfPath const& cachePath,
+        HdDirtyBits* timeVaryingBits,
+        UsdImagingInstancerContext const* instancerContext
+        = nullptr) const override;
+
+    HdDirtyBits ProcessPropertyChange(
+        UsdPrim const& prim,
+        SdfPath const& cachePath,
+        TfToken const& propertyName) override;
+
+    VtValue GetMaterialResource(
+        UsdPrim const& prim,
+        SdfPath const& cachePath,
+        UsdTimeCode time) const override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LEGACY_MESHLIGHT_ADAPTER_H
diff --git a/third_party/renderman-26/plugin/hdPrman/light.cpp b/third_party/renderman-26/plugin/hdPrman/light.cpp
new file mode 100644
index 0000000000..5cacba22b5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/light.cpp
@@ -0,0 +1,928 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/light.h"
+
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/instancer.h"
+#include "hdPrman/lightFilter.h"
+#include "hdPrman/material.h"
+#include "hdPrman/mesh.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/tokens.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/base/arch/library.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/usd/ar/resolver.h"
+#include "pxr/usd/sdf/types.h"
+#include "pxr/base/tf/debug.h"
+#include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/imaging/hd/material.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hf/diagnostic.h"
+
+#include "RiTypesHelper.h"
+#include "RixShadingUtils.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrmanLight::HdPrmanLight(SdfPath const& id, TfToken const& lightType)
+    : HdLight(id)
+    , _hdLightType(lightType)
+{
+    /* NOTHING */
+}
+
+HdPrmanLight::~HdPrmanLight() = default;
+
+void
+HdPrmanLight::Finalize(HdRenderParam *renderParam)
+{
+    HdPrman_RenderParam *param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+    riley::Riley* riley = param->AcquireRiley();
+    if (!_lightLink.IsEmpty()) {
+        param->DecrementLightLinkCount(_lightLink);
+        _lightLink = TfToken();
+    }
+    if (!_lightFilterPaths.empty()) {
+        _lightFilterPaths.clear();
+    }
+    if (!_lightFilterLinks.empty()) {
+        for (const TfToken& filterLink : _lightFilterLinks) {
+            param->DecrementLightFilterCount(filterLink);
+        }
+        _lightFilterLinks.clear();
+    }
+
+    // delete instances owned by the instancer.
+    if (HdPrmanInstancer* instancer = param->GetInstancer(
+        GetInstancerId())) {
+        instancer->Depopulate(renderParam, GetId());
+    }
+    
+    if (_instanceId != riley::LightInstanceId::InvalidId()) {
+        TRACE_SCOPE("riley::DeleteLightInstance");
+        riley->DeleteLightInstance(riley::GeometryPrototypeId::InvalidId(),
+            _instanceId);
+        _instanceId = riley::LightInstanceId::InvalidId();
+    }
+    if (_shaderId != riley::LightShaderId::InvalidId()) {
+        TRACE_SCOPE("riley::DeleteLightShader");
+        riley->DeleteLightShader(_shaderId);
+        _shaderId = riley::LightShaderId::InvalidId();
+    }
+    _lightShaderType = RtUString();
+    _geometryPrototypeId = riley::GeometryPrototypeId::InvalidId();
+    _sourceGeomPath = SdfPath();
+    _shadowLink = TfToken();
+}
+
+static bool
+_PopulateNodesFromMaterialResource(HdSceneDelegate *sceneDelegate,
+                                   const SdfPath &id,
+                                   const TfToken &terminalName,
+                                   std::vector<riley::ShadingNode> *result)
+{
+    VtValue hdMatVal = sceneDelegate->GetMaterialResource(id);
+    if (!hdMatVal.IsHolding<HdMaterialNetworkMap>()) {
+        TF_WARN("Could not get HdMaterialNetworkMap for '%s'", id.GetText());
+        return false;
+    }
+
+    // Convert HdMaterial to HdMaterialNetwork2 form.
+    const HdMaterialNetwork2 matNetwork2 = HdConvertToHdMaterialNetwork2(
+            hdMatVal.UncheckedGet<HdMaterialNetworkMap>());
+
+    SdfPath nodePath;
+    for (auto const& terminal: matNetwork2.terminals) {
+        if (terminal.first == terminalName) {
+            nodePath = terminal.second.upstreamNode;
+            break;
+        }
+    }
+
+    if (nodePath.IsEmpty()) {
+        TF_WARN("Could not find terminal '%s' in HdMaterialNetworkMap for '%s'",
+                terminalName.GetText(), id.GetText());
+        return false;
+    }
+
+    result->reserve(matNetwork2.nodes.size());
+    if (!HdPrman_ConvertHdMaterialNetwork2ToRmanNodes(
+            matNetwork2, nodePath, result)) {
+        TF_WARN("Failed to convert HdMaterialNetwork to Renderman shading "
+                "nodes for '%s'", id.GetText());
+        return false;
+    }
+
+    return true;
+}
+
+static void
+_AddLightFilterCombiner(std::vector<riley::ShadingNode>* lightFilterNodes)
+{
+    static RtUString combineMode("combineMode");
+    static RtUString mult("mult");
+    static RtUString max("max");
+    static RtUString min("min");
+    static RtUString screen("screen");
+
+    riley::ShadingNode combiner = riley::ShadingNode {
+        riley::ShadingNode::Type::k_LightFilter,
+        RtUString("PxrCombinerLightFilter"),
+        RtUString("terminal.Lightfilter"),
+        RtParamList()
+    };
+
+    // Build a map of light filter handles grouped by mode.
+    std::unordered_map<RtUString, std::vector<RtUString>> modeMap;
+
+    for (const auto& lightFilterNode : *lightFilterNodes) {       
+        RtUString mode;
+        lightFilterNode.params.GetString(combineMode, mode);
+        if (mode.Empty()) {
+            modeMap[mult].push_back(lightFilterNode.handle);
+        } 
+        else {
+            modeMap[mode].push_back(lightFilterNode.handle);
+        }
+    }
+
+    // Set the combiner light filter reference array for each mode.
+    for (const auto& entry : modeMap) {
+        if (!entry.second.empty()) {
+            combiner.params.SetLightFilterReferenceArray(
+                entry.first, &entry.second[0], entry.second.size());
+        }
+    }
+
+    lightFilterNodes->push_back(combiner);
+}
+
+static void
+_PopulateLightFilterNodes(
+        const SdfPath &lightId,
+        const SdfPathVector &lightFilterPaths,
+        HdSceneDelegate *sceneDelegate,
+        HdRenderParam *renderParam,
+        riley::Riley *riley,
+        std::vector<riley::ShadingNode> *lightFilterNodes,
+        std::vector<riley::CoordinateSystemId> *coordsysIds,
+        std::vector<TfToken> *lightFilterLinks)
+{
+    HdPrman_RenderParam * const param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+
+    if (lightFilterPaths.empty()) {
+        return;
+    }
+
+    int maxFilters = lightFilterPaths.size();
+    if (maxFilters > 1) {
+        maxFilters += 1;  // extra for the combiner filter
+    }
+    lightFilterNodes->reserve(maxFilters);
+    
+    for (const auto& filterPath : lightFilterPaths) {
+        TF_DEBUG(HDPRMAN_LIGHT_FILTER_LINKING)
+            .Msg("HdPrman: Light <%s> filter \"%s\" path \"%s\"\n",
+                lightId.GetText(), filterPath.GetName().c_str(),
+                filterPath.GetText());
+
+        if (!sceneDelegate->GetVisible(filterPath)) {
+            // XXX -- need to get a dependency analysis working here
+            // Invis of a filter works but does not cause the light
+            // to re-sync so one has to tweak the light to see the
+            // effect of the invised filter
+            TF_DEBUG(HDPRMAN_LIGHT_FILTER_LINKING)
+                .Msg("  filter invisible\n");
+            continue;
+        }
+
+        if (!_PopulateNodesFromMaterialResource(
+                sceneDelegate, filterPath,
+                HdMaterialTerminalTokens->lightFilter, 
+                lightFilterNodes)) {
+            continue;
+        }
+
+        riley::ShadingNode *filter = &lightFilterNodes->back();
+        RtUString filterPathAsString = RtUString(filterPath.GetText());
+
+        // To ensure that multiple light filters within a light get
+        // unique names, use the full filter path for the handle.
+        filter->handle = filterPathAsString;
+
+        // Only certain light filters require a coordsys, but we do not
+        // know which, here, so we provide it in all cases.
+        //
+        // TODO: We should be able to look up the SdrShaderNode entry
+        // and query it for the existence of this parameter.
+        filter->params.SetString(RtUString("coordsys"), filterPathAsString);
+
+        // Light filter linking
+        VtValue val = sceneDelegate->GetLightParamValue(filterPath,
+                                        HdTokens->lightFilterLink);
+        TfToken lightFilterLink = TfToken();
+        if (val.IsHolding<TfToken>()) {
+            lightFilterLink = val.UncheckedGet<TfToken>();
+        }
+        if (!lightFilterLink.IsEmpty()) {
+            param->IncrementLightFilterCount(lightFilterLink);
+            lightFilterLinks->push_back(lightFilterLink);
+            // For light filters to link geometry, the light filters must
+            // be assigned a grouping membership, and the
+            // geometry must subscribe to that grouping.
+            filter->params.SetString(RtUString("linkingGroups"),
+                                RtUString(lightFilterLink.GetText()));
+            TF_DEBUG(HDPRMAN_LIGHT_LINKING)
+                .Msg("HdPrman: Light filter <%s> linkingGroups \"%s\"\n",
+                        filterPath.GetText(), lightFilterLink.GetText());
+        }
+
+        // Look up light filter ID
+        if (HdSprim *sprim = sceneDelegate->GetRenderIndex().GetSprim(
+            HdPrimTypeTokens->lightFilter, filterPath)) {
+            if (HdPrmanLightFilter *lightFilter =
+                dynamic_cast<HdPrmanLightFilter*>(sprim)) {
+                lightFilter->SyncToRiley(sceneDelegate, riley);
+                coordsysIds->push_back(lightFilter->GetCoordSysId());
+            }
+        } else {
+            TF_WARN("Did not find expected light filter <%s>",
+                filterPath.GetText());
+        }
+    }
+
+    // Multiple filters requires a PxrCombinerLightFilter to combine results.
+    if (lightFilterNodes->size() > 1) {
+        _AddLightFilterCombiner(lightFilterNodes);
+    }
+}
+
+/* virtual */
+void
+HdPrmanLight::Sync(HdSceneDelegate *sceneDelegate,
+                   HdRenderParam   *renderParam,
+                   HdDirtyBits     *dirtyBits)
+{
+    HD_TRACE_FUNCTION();
+
+    static const RtUString us_PxrDomeLight("PxrDomeLight");
+    static const RtUString us_PxrRectLight("PxrRectLight");
+    static const RtUString us_PxrDiskLight("PxrDiskLight");
+    static const RtUString us_PxrCylinderLight("PxrCylinderLight");
+    static const RtUString us_PxrSphereLight("PxrSphereLight");
+    static const RtUString us_PxrDistantLight("PxrDistantLight");
+    static const RtUString us_PxrMeshLight("PxrMeshLight");
+    static const RtUString us_PxrPortalLight("PxrPortalLight");
+    static const RtUString us_shadowSubset("shadowSubset");
+    static const riley::MaterialId invalidMaterial;
+
+    const SdfPath& id = GetId();
+
+    HdPrman_RenderParam* param =static_cast<HdPrman_RenderParam*>(renderParam);
+    riley::Riley* riley = param->AcquireRiley();
+    HdRenderIndex& renderIndex = sceneDelegate->GetRenderIndex();
+    HdChangeTracker& changeTracker = renderIndex.GetChangeTracker();
+
+    // Light shader nodes will go here, whether we calculate them early during
+    // change tracking or later during shader update.
+    std::vector<riley::ShadingNode> lightNodes;
+    // Any coordinate system ID's used will go here.
+    std::vector<riley::CoordinateSystemId> coordSysIds;
+
+    // Update instance bindings
+    // XXX: This relies on DirtyInstancer having the same value for lights as
+    // it does for rprims. It is the only flag that _UpdateInstancer cares about
+    _UpdateInstancer(sceneDelegate, dirtyBits);
+
+    const SdfPath& instancerId = GetInstancerId();
+    const bool isHdInstance = !instancerId.IsEmpty();
+    SdfPath primPath = sceneDelegate->GetScenePrimPath(id, 0, nullptr);
+
+    // XXX: The following dirtiness detection, and all of the state we have to
+    // maintain to do it, is necessary so that we can use
+    // the riley api for updating existing light shaders/instances, which is
+    // in turn needed so we can split ownership of shaders and instances between
+    // HdPrmanLight and HdPrmanInstancer when lights are instanced. The existing
+    // DirtyBits mechanism for lights is inadequate for tracking changes to the
+    // light shader separately from changes to the light instance.
+    // Note that we do not update our saved state while checking for dirtiness.
+    // We'll do that later, when we're actually updating the light in Riley.
+
+    // The source geom of a geom light has changed in a way that requires us to
+    // destroy and recreate the light instance rather than use
+    // riley->ModifyLightInstance(). Specifically, the riley geometry prototype
+    // id has changed. We don't expect this ever to happen, since a gprim never
+    // changes its prototype id, but it could happen if a scene index downstream
+    // of the mesh light resolving scene index were to alter the source geometry
+    // binding on the mesh light.
+    bool dirtySourceGeom = false;
+
+    // Something changed that invalidates the riley light shader. This could be
+    // DirtyResource, dirty shadow params (which may not be accurately signalled
+    // by DirtyShadowParams), or dirty light filters.
+    bool dirtyLightShader = false;
+
+    // Something changed that invalidates the riley light instance(s) in a way
+    // that we can update with ModifyLightInstance. This could be the transform,
+    // the coordinate system list, or certain attributes.
+    bool dirtyLightInstance = false;
+
+    if (_hdLightType == HdSprimTypeTokens->meshLight) {
+        // Has source geom changed? Is the rprim still there?
+        const VtValue sourceGeom = sceneDelegate->GetLightParamValue(id, 
+            HdPrmanTokens->sourceGeom);
+        if (sourceGeom.IsHolding<SdfPath>()) {
+            const SdfPath sourceGeomPath = sourceGeom.UncheckedGet<SdfPath>();
+            if (sourceGeomPath != _sourceGeomPath) {
+                // source geom path has changed; assume new prototype id
+                dirtySourceGeom = true;
+            }
+            const HdRprim *rprim = 
+                sceneDelegate->GetRenderIndex().GetRprim(sourceGeomPath);
+            if (rprim) {
+
+                // XXX: Temporary workaround for RMAN-20136
+                // Check if the source mesh is scheduled for a prototype
+                // update. If it is, we need to postpone sync in order to avoid
+                // an issue in Prman with simultaneous light shader and
+                // geometry prototype modifications on mesh lights.
+                // See https://jira.pixar.com/browse/RMAN-20136. Delaying here
+                // has the effect of adding an extra call to riley->Render()
+                // between the geometry prototype update and the light shader
+                // update, which has a noticeable effect on performance, so we
+                // will also check to see whether the light shader already
+                // exists. If it does not, it should be safe to make it even
+                // when we have a dirty source mesh geometry.
+                HdDirtyBits sourceDirtyBits = changeTracker
+                    .GetRprimDirtyBits(sourceGeomPath);
+                if (_shaderId != riley::LightShaderId::InvalidId() && (
+                        sourceDirtyBits & (
+                        HdChangeTracker::DirtyPoints |
+                        HdChangeTracker::DirtyNormals |
+                        HdChangeTracker::DirtyWidths |
+                        HdChangeTracker::DirtyTopology))) {
+                    TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("Source geom <%s> for geom "
+                        "light <%s> has dirty geometry; postponing sync.\n",
+                        sourceGeomPath.GetText(), id.GetText());
+                    // Note that we cannot just resync the source mesh here.
+                    // We have to separate updates to the geometry protoype from
+                    // updates to the light shader by a call to Render, and the
+                    // only way to achieve that is to return while the light is
+                    // still dirty. This will be a challenging bug to work
+                    // around in HdPrman 2.0.
+                    return;
+                }
+                // XXX: End of RMAN-20136 workaround
+
+                // check if the prototype id exists, or has changed
+                auto gprim = dynamic_cast<const HdPrman_GprimBase*>(rprim);
+                std::vector<riley::GeometryPrototypeId> prototypeIds = 
+                    gprim->GetPrototypeIds();
+                if (prototypeIds.empty()) {
+                    // XXX: This is our least-ugly workaround for sync ordering.
+                    // We do not expect the source geometry's prototype id to
+                    // change under any normal circumstances, so this only needs
+                    // to happen during the initial sync phase. We reach out to
+                    // the unsynced source geometry and sync it. This is not a
+                    // general solution to sync ordering. It should not be
+                    // replicated elsewhere!
+                    TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("Attempting to sync source "
+                        "geometry <%s> for geom light <%s>\n",
+                        sourceGeomPath.GetText(), id.GetText());
+                    const_cast<HdRprim*>(rprim)->Sync(
+                        sceneDelegate, renderParam, &sourceDirtyBits, TfToken());
+                    prototypeIds = gprim->GetPrototypeIds();
+                }
+                if (prototypeIds.empty()) {
+                    // sync failed to produce riley prototype ids; ignore light
+                    TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("Source geometry <%s> for "
+                        "geom light <%s> still has not been created in riley; "
+                        "the light will be ignored.\n",
+                        sourceGeomPath.GetText(), id.GetText());
+                    *dirtyBits = DirtyBits::Clean;
+                    return;
+                } else if (prototypeIds.size() > 1) {
+                    // XXX: Geom subsets are not yet supported on geom lights;
+                    // the mesh light resolving scene index should strip them
+                    // out of the source geom. If we hit this, something odd
+                    // is going on.
+                    TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("Source geom <%s> for "
+                        "geom light <%s> has more than one geometry "
+                        "prototype id; only one is expected, and only the "
+                        "first will be used.\n", sourceGeomPath.GetText(),
+                        id.GetText());
+                }
+                if (prototypeIds[0] != _geometryPrototypeId) {
+                    // source geom prototype id has changed
+                    // XXX: Again, we do not expect this. The source geometry
+                    // won't change its prototype id because of how gprim sync
+                    // behaves, and a given geom light's source geometry path
+                    // should never change because of how the mesh light
+                    // resolving scene index behaves. The checks are here to
+                    // protect against prman crashes in the event that a scene
+                    // index between the mesh light resolving scene index and
+                    // here messes with things.
+                    dirtySourceGeom = true;
+                }
+            } else {
+                // cannot find the source geom in the render index; ignore light
+                TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("Source geom <%s> for geom "
+                    "light <%s> could not be found; the light will be "
+                    "ignored.\n", sourceGeomPath.GetText(), id.GetText());
+                *dirtyBits = DirtyBits::Clean;
+                return;
+            }
+        } else {
+            // light.sourceGeom was empty, which would indicate a breakdown in
+            // the mesh light resolving scene index.
+            TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("Geom light <%s> has no source "
+                "geometry; this light will be ignored since source geometry is "
+                "required.", id.GetText());
+            *dirtyBits = DirtyBits::Clean;
+            return;
+        }
+    }
+
+    if ((*dirtyBits & DirtyResource)
+        || _shaderId == riley::LightShaderId::InvalidId()) {
+        // The light shader has changed
+        dirtyLightShader = true;
+        if (_hdLightType == HdSprimTypeTokens->pluginLight) {
+            // The material resource [light shader] of a plugin light will
+            // change when the id [name] of the specific shader the light uses
+            // has changed. Which shader the light is using can affect how
+            // input parameters are interpreted to affect the light's transform,
+            // which is instance-invalidating. We keep the name as state so we
+            // can detect when we must also invalidate the instance. But we also
+            // want to avoid calling _PopulateNodesFromMaterialResource more
+            // than necessary.
+            if (_lightShaderType.Empty()) {
+                // Empty state means we've never seen the shader at all, so the
+                // instance will also be dirty.
+                dirtyLightInstance = true;
+            } else {
+                // Early call to _PopulateNodesFromMaterialResource
+                _PopulateNodesFromMaterialResource(
+                    sceneDelegate, id,
+                    HdMaterialTerminalTokens->light, &lightNodes);
+                if ((!lightNodes.empty())
+                    && lightNodes.back().name != _lightShaderType) {
+                    dirtyLightInstance = true;
+                }
+            }
+        }
+    }
+
+    if (*dirtyBits & (DirtyTransform | DirtyInstancer)) {
+        // If the transform has changed or the instancer is dirty, the light
+        // instance (or instances, in the latter case) needs to be refreshed.
+        dirtyLightInstance = true;
+    }
+    
+    if (*dirtyBits & (DirtyParams | DirtyShadowParams | DirtyCollection)) {
+        // Light linking changes are subsumed under changes to the light api,
+        // which are in turn signalled as :
+        //   (DirtyParams | DirtyShadowParams | DirtyCollection)
+        // We can store lightLink locally and compare against that to see if
+        // light links specifically have changed. Light links affect the light's
+        // instance attributes, and do not invalidate the shader!
+        VtValue val = sceneDelegate->GetLightParamValue(id, HdTokens->lightLink);
+        if (val.IsHolding<TfToken>()) {
+            TfToken lightLink = val.UncheckedGet<TfToken>();
+            if (lightLink != _lightLink) {
+                // lightLink has changed
+                dirtyLightInstance = true;
+            }
+        } else if (!_lightLink.IsEmpty()) {
+            // lightLink was not empty before, but is now
+            dirtyLightInstance = true;
+        }
+
+        // Light filter changes are also subsumed under changes to the light
+        // api and signalled the same as light filters. Again, compare against a
+        // local copy to see if they've really changed. Changes to light filters
+        // affect both the shader and the instance, the latter due to potential
+        // changes in the relevant coordinate systems.
+        val = sceneDelegate->GetLightParamValue(id, HdTokens->filters);
+        if (val.IsHolding<SdfPathVector>()) {
+            SdfPathVector lightFilterPaths = val.UncheckedGet<SdfPathVector>();
+            if (lightFilterPaths != _lightFilterPaths) {
+                // light filter paths have changed
+                dirtyLightShader = true;
+                dirtyLightInstance = true;
+            } else {
+                // TODO: check if the filters themselves have changed?
+            }
+        } else if (!_lightFilterPaths.empty()) {
+            // light filter paths were not empty before, but are now
+            dirtyLightShader = true;
+            dirtyLightInstance = true;
+        }
+
+        // DirtyShadowParams may be set even if the shadow params did not
+        // change, due to a lack of granularity in the dirty bits translator.
+        // So we will manually check the shadow params against a local copy
+        // to see if they really changed. Changes to the shadow params
+        // invalidate the light shader.
+        val = sceneDelegate->GetLightParamValue(id, HdTokens->shadowLink);
+        if (val.IsHolding<TfToken>()) {
+            TfToken shadowLink = val.UncheckedGet<TfToken>();
+            if (shadowLink != _shadowLink) {
+                // shadowLink has changed
+                dirtyLightShader = true;
+            }
+        } else if (!_shadowLink.IsEmpty()) {
+            dirtyLightShader = true;
+        }
+
+        // DirtyParams will always dirty the instance
+        if (*dirtyBits & DirtyParams) {
+            dirtyLightInstance = true;
+        }
+    }
+
+    // finally, dirtySourceGeom implies dirtyLightInstance;
+    dirtyLightInstance |= dirtySourceGeom;
+
+    // Now that we know what's actually dirty (the shader and/or the instance),
+    // we can proceed with a modify-aware approach.
+
+    if (dirtyLightShader) {
+        // prepare and create or modify the light shader(s).
+
+        // Only call _PopulateNodesFromMaterialResource if we did not call it
+        // above during dirty checking.
+        if (lightNodes.empty()) {
+            _PopulateNodesFromMaterialResource(
+                sceneDelegate, id,
+                HdMaterialTerminalTokens->light, &lightNodes);
+        }
+
+        if (lightNodes.empty() || lightNodes.back().name.Empty()) {
+            TF_WARN("Could not populate shading nodes for light <%s>. "
+            "The light will be ignored.", id.GetText());
+            *dirtyBits = DirtyBits::Clean;
+            return;
+        }
+
+        _lightShaderType = lightNodes.back().name;
+
+        TF_DEBUG(HDPRMAN_LIGHT_LIST).Msg("HdPrman: Light <%s> lightType '%s', "
+            "shader '%s'\n",
+            id.GetText(), _hdLightType.GetText(), _lightShaderType.CStr());
+        // The terminal light node will be updated with other parameters that
+        // aren't direct inputs of the material resource.
+        riley::ShadingNode& lightNode = lightNodes.back();
+
+        // Shadow linking
+        VtValue shadowLinkVal =
+            sceneDelegate->GetLightParamValue(id, HdTokens->shadowLink);
+        if (shadowLinkVal.IsHolding<TfToken>()) {
+            _shadowLink = shadowLinkVal.UncheckedGet<TfToken>();
+            if (!_shadowLink.IsEmpty()) {
+                lightNode.params.SetString(us_shadowSubset,
+                    RtUString(_shadowLink.GetText()));
+                TF_DEBUG(HDPRMAN_LIGHT_LINKING).Msg("HdPrman: Light <%s> "
+                    "shadowSubset '%s'\n", id.GetText(),
+                    _shadowLink.GetText());
+            }
+        }
+
+        SdfPathVector filters;
+        VtValue filtersVal = sceneDelegate->GetLightParamValue(
+            id, HdTokens->filters);
+        if (filtersVal.IsHolding<SdfPathVector>()) {
+            filters = filtersVal.UncheckedGet<SdfPathVector>();
+        }
+        if (filters != _lightFilterPaths) {
+            // clear and recreate dependencies
+            for (const SdfPath& filterPath : _lightFilterPaths) {
+                changeTracker.RemoveSprimSprimDependency(filterPath, id);
+            }
+            for (const SdfPath& filterPath : filters) {
+                changeTracker.AddSprimSprimDependency(filterPath, id);
+            }
+            _lightFilterPaths = filters;
+        }
+        // Light filter counts get incremented when we call
+        // _PopulateLightFilterNodes, so we don't get the opportunity
+        // to really compare them against state. State here exists so
+        // we can decrement the old filter counts before building
+        // the filter network.
+        for (const TfToken& filterLink : _lightFilterLinks) {
+            param->DecrementLightFilterCount(filterLink);
+        }
+        std::vector<riley::ShadingNode> filterNodes;
+
+        // _PopulateLightFilterNodes also gives us the coordinate systems.
+        // We store them so we can have them on later calls where only the
+        // light instance is dirty. Note above that dirty light filters mean
+        // dirty shader *and* dirty instance; the coordinate systems are why,
+        // and are the only piece of derived state that needs to be shared by
+        // both the shader and instance update branches.
+        _PopulateLightFilterNodes(id, filters, sceneDelegate, renderParam,
+            riley, &filterNodes, &coordSysIds, &_lightFilterLinks);
+
+        const riley::ShadingNetwork light {
+            static_cast<uint32_t>(lightNodes.size()),
+            lightNodes.data()
+        };
+
+        const riley::ShadingNetwork filter {
+            static_cast<uint32_t>(filterNodes.size()),
+            filterNodes.data()
+        };
+
+        // TODO: portals
+        
+        if (_shaderId == riley::LightShaderId::InvalidId()) {
+            const riley::UserId userId(
+                stats::AddDataLocation(id.GetText()).GetValue());
+            TRACE_SCOPE("riley::CreateLightShader");
+            _shaderId = riley->CreateLightShader(userId, light, filter);
+        } else {
+            TRACE_SCOPE("riley::ModifyLightShader");
+            riley->ModifyLightShader(_shaderId, &light, &filter);
+        }
+    }
+
+    if (dirtyLightInstance) {
+    
+        riley::MaterialId materialId;
+        if (_hdLightType == HdSprimTypeTokens->meshLight) {
+            // Checks that these exist have already been done above!
+
+            const SdfPath sourceGeomPath = sceneDelegate->GetLightParamValue(
+                id, HdPrmanTokens->sourceGeom).UncheckedGet<SdfPath>();
+            const HdRprim* rPrim = sceneDelegate->GetRenderIndex()
+                .GetRprim(sourceGeomPath);
+            const auto* gprim = dynamic_cast<const HdPrman_GprimBase*>(rPrim);
+            
+            _geometryPrototypeId = gprim->GetPrototypeIds()[0];
+            _sourceGeomPath = sourceGeomPath;
+        }
+
+        RtParamList attrs = param->ConvertAttributes(sceneDelegate, id, false);
+        if (_lightShaderType == us_PxrDomeLight) {
+            const bool domeLightCamVis = sceneDelegate->GetRenderIndex()
+                .GetRenderDelegate()->GetRenderSetting<bool>(
+                    HdRenderSettingsTokens->domeLightCameraVisibility, true);
+            if (!domeLightCamVis) {
+                attrs.SetInteger(RixStr.k_visibility_camera, 0);
+            }
+        }
+
+        TfToken lightLink;
+        VtValue lightLinkVal = sceneDelegate->GetLightParamValue(
+            id, HdTokens->lightLink);
+        if (lightLinkVal.IsHolding<TfToken>()) {
+            lightLink = lightLinkVal.UncheckedGet<TfToken>();
+        }
+        if (lightLink != _lightLink) {
+            if (!_lightLink.IsEmpty()) {
+                param->DecrementLightLinkCount(_lightLink);
+            }
+            if (!lightLink.IsEmpty()) {
+                param->IncrementLightLinkCount(lightLink);
+            }
+            _lightLink = lightLink;
+        }
+        if (!_lightLink.IsEmpty()) {
+            // For lights to link geometry, the lights must be assigned a
+            // grouping membership and the geometry must subscribe to that
+            // grouping.
+            attrs.SetString(RixStr.k_grouping_membership,
+                RtUString(_lightLink.GetText()));
+            TF_DEBUG(HDPRMAN_LIGHT_LINKING).Msg("HdPrman: Light <%s> grouping "
+                "membership '%s'\n", id.GetText(), _lightLink.GetText());
+        } else {
+            // Default light group
+            attrs.SetString(RixStr.k_grouping_membership, RtUString("default"));
+            TF_DEBUG(HDPRMAN_LIGHT_LINKING).Msg("HdPrman: Light <%s> grouping "
+                "membership 'default'\n", id.GetText());
+        }
+
+        // Convert coordinate system ids to list
+        const riley::CoordinateSystemList coordSysList = {
+            unsigned(coordSysIds.size()), coordSysIds.data()
+        };
+
+        // Sample transform
+        HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> xf;
+        sceneDelegate->SampleTransform(id, &xf);
+
+        GfMatrix4d geomMat(1.0);
+
+        // Some lights have parameters that scale the size of the light.
+        GfVec3d geomScale(1.0f);
+
+        // Type-specific parameters
+        if (_lightShaderType == us_PxrRectLight ||
+            _lightShaderType == us_PxrPortalLight) {
+            // width
+            VtValue width = sceneDelegate->GetLightParamValue(id,
+                HdLightTokens->width);
+            if (width.IsHolding<float>()) {
+                geomScale[0] = width.UncheckedGet<float>();
+            }
+            // height
+            VtValue height = sceneDelegate->GetLightParamValue(id,
+                HdLightTokens->height);
+            if (height.IsHolding<float>()) {
+                geomScale[1] = height.UncheckedGet<float>();
+            }
+        } else if (_lightShaderType == us_PxrDiskLight) {
+            // radius (XY only, default 0.5)
+            VtValue radius = sceneDelegate->GetLightParamValue(id,
+                HdLightTokens->radius);
+            if (radius.IsHolding<float>()) {
+                geomScale[0] *= radius.UncheckedGet<float>() / 0.5;
+                geomScale[1] *= radius.UncheckedGet<float>() / 0.5;
+            }
+        } else if (_lightShaderType == us_PxrCylinderLight) {
+            // radius (YZ only, default 0.5)
+            VtValue radius = sceneDelegate->GetLightParamValue(id,
+                HdLightTokens->radius);
+            if (radius.IsHolding<float>()) {
+                geomScale[1] *= radius.UncheckedGet<float>() / 0.5;
+                geomScale[2] *= radius.UncheckedGet<float>() / 0.5;
+            }
+            // length (X-axis)
+            VtValue length = sceneDelegate->GetLightParamValue(id,
+                HdLightTokens->length);
+            if (length.IsHolding<float>()) {
+                geomScale[0] *= length.UncheckedGet<float>();
+            }
+        } else if (_lightShaderType == us_PxrSphereLight) {
+            // radius (XYZ, default 0.5)
+            VtValue radius = sceneDelegate->GetLightParamValue(id, 
+                HdLightTokens->radius);
+            if (radius.IsHolding<float>()) {
+                geomScale *= radius.UncheckedGet<float>() / 0.5;
+            }
+        } else if (_lightShaderType == us_PxrMeshLight) {
+            // Our mesh light geom should not be visible, and should be one-sided, 
+            // to match the existing Katana behavior.
+            // XXX: these may not be effective for volumes, either at all or
+            // for certain path tracers. Volume light support is still incomplete.
+            // XXX: These will overwrite and ignore what may be authored on the
+            // mesh light, which may not be desirable.
+            attrs.SetInteger(RixStr.k_visibility_camera, 0);
+            attrs.SetInteger(RixStr.k_visibility_transmission, 0);
+            attrs.SetInteger(RixStr.k_visibility_indirect, 0);
+            // XXX: In Xpu, this may be "sides", not "Sides".
+            attrs.SetInteger(RixStr.k_Sides, 1);
+        }
+
+        geomMat.SetScale(geomScale);
+
+        // Adjust orientation to make prman match the USD spec.
+        // TODO: Add another orientMat for PxrEnvDayLight when supported.
+        GfMatrix4d orientMat(1.0);
+        if (_lightShaderType == us_PxrDomeLight) {
+            // Transform Dome to match OpenEXR spec for environment maps
+            // Rotate -90 X, Rotate 90 Y
+            orientMat = GfMatrix4d(0.0, 0.0, -1.0, 0.0, 
+                                -1.0, 0.0, 0.0, 0.0, 
+                                0.0, 1.0, 0.0, 0.0, 
+                                0.0, 0.0, 0.0, 1.0);
+            // Apply domeOffset if present
+            VtValue domeOffset = sceneDelegate->GetLightParamValue(id,
+                HdLightTokens->domeOffset);
+            if (domeOffset.IsHolding<GfMatrix4d>()) {
+                orientMat = orientMat * domeOffset.UncheckedGet<GfMatrix4d>();
+            }
+        } else if (_lightShaderType != us_PxrMeshLight) {
+            // Transform lights to match correct orientation
+            // Scale -1 Z, Rotate 180 Z
+            orientMat = GfMatrix4d(-1.0, 0.0, 0.0, 0.0, 
+                                0.0, -1.0, 0.0, 0.0, 
+                                0.0, 0.0, -1.0, 0.0, 
+                                0.0, 0.0, 0.0, 1.0);
+        }
+        geomMat = orientMat * geomMat;
+        for (size_t i = 0; i < xf.count; ++i) {
+            xf.values[i] = geomMat * xf.values[i];
+        }
+
+        attrs.SetInteger(RixStr.k_lighting_mute, !sceneDelegate->GetVisible(id));
+
+        if (!isHdInstance) {
+            // Singleton case. Create the light instance.
+
+            // convert xform for riley
+            TfSmallVector<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES> 
+                xf_rt_values(xf.count);
+            for (size_t i = 0; i < xf.count; ++i) {
+                xf_rt_values[i] = HdPrman_Utils::GfMatrixToRtMatrix(xf.values[i]);
+            }
+            const riley::Transform xform = {
+                unsigned(xf.count), xf_rt_values.data(), xf.times.data()
+            };
+
+            if (dirtySourceGeom
+                && _instanceId != riley::LightInstanceId::InvalidId()) {
+                riley->DeleteLightInstance(
+                    riley::GeometryPrototypeId::InvalidId(),
+                    _instanceId);
+                _instanceId = riley::LightInstanceId::InvalidId();
+            }
+
+            // XXX: Temporary workaround for RMAN-20704
+            // Destroy the light instance so it will be recreated instead
+            // of being updated, since ModifyLightInstance may crash.
+            if (_instanceId != riley::LightInstanceId::InvalidId()) {
+                riley->DeleteLightInstance(
+                    riley::GeometryPrototypeId::InvalidId(), _instanceId);
+                _instanceId = riley::LightInstanceId::InvalidId();
+            }
+            // XXX: End of RMAN-20704 workaround
+
+            if (_instanceId == riley::LightInstanceId::InvalidId()) {
+                const riley::UserId userId(stats::AddDataLocation(id.GetText())
+                    .GetValue());
+                TRACE_SCOPE("riley::CreateLightInstance");
+                _instanceId = riley->CreateLightInstance(
+                    userId,
+                    riley::GeometryPrototypeId::InvalidId(),
+                    _geometryPrototypeId,
+                    invalidMaterial,
+                    _shaderId,
+                    coordSysList,
+                    xform,
+                    attrs);
+            } else {
+                TRACE_SCOPE("riley::ModifyLightInstance");
+                riley->ModifyLightInstance(
+                    riley::GeometryPrototypeId::InvalidId(),
+                    _instanceId,
+                    &invalidMaterial,
+                    &_shaderId,
+                    &coordSysList,
+                    &xform,
+                    &attrs);
+            }
+        } else {
+            // This light is a prototype of a hydra instancer. The light shader
+            // has already been synced above, and any riley geometry prototypes
+            // (if this is a mesh light) have already been synced as prototype-
+            // only by gprim.h. We need to tell the HdPrmanInstancer to sync
+            // riley light instances.
+            HdInstancer::_SyncInstancerAndParents(renderIndex, instancerId);
+            HdPrmanInstancer *instancer = static_cast<HdPrmanInstancer*>(
+                renderIndex.GetInstancer(instancerId));
+            if (instancer) {
+
+                // if for some reason the source geometry id has changed, we
+                // first have to depopulate the old light instances from the
+                // parent instancer.
+                if (dirtySourceGeom) {
+                    instancer->Depopulate(renderParam, id);
+                }
+            
+                // XXX: The dirtybits we have are not useful to the instancer.
+                // we should translate them, but to do so accurately would
+                // require a lot more state. So we will set DirtyTransform
+                // as a token value to signal to the instancer to update the
+                // instances.
+                HdDirtyBits instanceDirtyBits(
+                    HdChangeTracker::DirtyTransform |
+                    (*dirtyBits & HdChangeTracker::DirtyInstancer));
+                instancer->Populate(
+                    renderParam,
+                    &instanceDirtyBits,
+                    id,
+                    { _geometryPrototypeId },
+                    coordSysList,
+                    attrs, xf,
+                    { invalidMaterial },
+                    { primPath },
+                    _shaderId);
+            }
+        }
+    }
+
+    if (dirtyBits) {
+        *dirtyBits = HdChangeTracker::Clean;
+    }
+}
+
+/* virtual */
+HdDirtyBits
+HdPrmanLight::GetInitialDirtyBitsMask() const
+{
+    return HdLight::AllDirty;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/light.h b/third_party/renderman-26/plugin/hdPrman/light.h
new file mode 100644
index 0000000000..7db6b1030a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/light.h
@@ -0,0 +1,60 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/light.h"
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdSceneDelegate;
+class HdPrman_RenderParam;
+
+/// \class HdPrmanLight
+///
+/// A representation for lights.
+///
+class HdPrmanLight final : public HdLight
+{
+public:
+    HdPrmanLight(SdfPath const& id, TfToken const& lightType);
+    ~HdPrmanLight() override;
+
+    /// Synchronizes state from the delegate to this object.
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam   *renderParam,
+              HdDirtyBits     *dirtyBits) override;
+
+    /// Returns the minimal set of dirty bits to place in the
+    /// change tracker for use in the first sync of this prim.
+    /// Typically this would be all dirty bits.
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+    void Finalize(HdRenderParam *renderParam) override;
+
+private:
+
+    const TfToken _hdLightType;
+    riley::LightShaderId _shaderId;
+    riley::LightInstanceId _instanceId;
+    
+    // state for change tracking
+    riley::GeometryPrototypeId _geometryPrototypeId;
+    SdfPath _sourceGeomPath;
+    RtUString _lightShaderType;
+    TfToken _lightLink;
+    SdfPathVector _lightFilterPaths;
+    std::vector<TfToken> _lightFilterLinks;
+    TfToken _shadowLink;
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_H
diff --git a/third_party/renderman-26/plugin/hdPrman/lightFilter.cpp b/third_party/renderman-26/plugin/hdPrman/lightFilter.cpp
new file mode 100644
index 0000000000..ad8d0ca59b
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/lightFilter.cpp
@@ -0,0 +1,139 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/lightFilter.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/utils.h"
+#include "pxr/usd/sdf/types.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/imaging/hd/light.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/version.h"
+#include "pxr/imaging/hf/diagnostic.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// For now, the procs in this file are boiler plate for when hdPrman needs to
+// have light filters become prime citizens.  This will probably happen when
+// its time to implement shared light filters.  For now, light filters are
+// handled inside the lights in light.cpp.
+//
+// Also, for now base the HdPrmanLightFilter class on HdSprim as there
+// currently is no HdLightFilter class.
+
+HdPrmanLightFilter::HdPrmanLightFilter(SdfPath const& id,
+                                       TfToken const& lightFilterType)
+    : HdSprim(id)
+    , _coordSysId(riley::CoordinateSystemId::InvalidId())
+    , _rileyIsInSync(false)
+{
+    // XXX The lightFilterType parameter is always "lightFilter", so
+    // we ignore it.
+}
+
+HdPrmanLightFilter::~HdPrmanLightFilter() = default;
+
+void
+HdPrmanLightFilter::Finalize(HdRenderParam *renderParam)
+{
+    std::lock_guard<std::mutex> lock(_syncToRileyMutex);
+    HdPrman_RenderParam *param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+    riley::Riley *riley = param->AcquireRiley();
+    if (_coordSysId != riley::CoordinateSystemId::InvalidId()) {
+        riley->DeleteCoordinateSystem(_coordSysId);
+        _coordSysId = riley::CoordinateSystemId::InvalidId();
+    }
+}
+
+/* virtual */
+void
+HdPrmanLightFilter::Sync(HdSceneDelegate *sceneDelegate,
+                      HdRenderParam   *renderParam,
+                      HdDirtyBits     *dirtyBits)
+{
+    HdPrman_RenderParam *param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+
+#if HD_API_VERSION >= 70
+    if (*dirtyBits & HdLight::DirtyTransform) {
+#else
+    if (*dirtyBits & HdChangeTracker::DirtyTransform) {
+#endif
+        std::lock_guard<std::mutex> lock(_syncToRileyMutex);
+        _rileyIsInSync = false;
+        _SyncToRileyWithLock(sceneDelegate, param->AcquireRiley());
+    }
+
+    *dirtyBits = HdChangeTracker::Clean;
+}
+
+void
+HdPrmanLightFilter::SyncToRiley(
+    HdSceneDelegate *sceneDelegate,
+    riley::Riley *riley)
+{
+    std::lock_guard<std::mutex> lock(_syncToRileyMutex);
+    if (!_rileyIsInSync) {
+        _SyncToRileyWithLock(sceneDelegate, riley);
+    }
+}
+
+void
+HdPrmanLightFilter::_SyncToRileyWithLock(
+    HdSceneDelegate *sceneDelegate,
+    riley::Riley *riley)
+{
+    SdfPath const& id = GetId();
+
+    // Sample transform
+    HdTimeSampleArray<GfMatrix4d, HDPRMAN_MAX_TIME_SAMPLES> xf;
+    sceneDelegate->SampleTransform(id, &xf);
+    TfSmallVector<RtMatrix4x4, HDPRMAN_MAX_TIME_SAMPLES>
+        xf_rt_values(xf.count);
+    for (size_t i=0; i < xf.count; ++i) {
+        xf_rt_values[i] = HdPrman_Utils::GfMatrixToRtMatrix(xf.values[i]);
+    }
+    const riley::Transform xform = {
+        unsigned(xf.count), xf_rt_values.data(), xf.times.data()};
+
+    RtParamList attrs;
+
+    // Use the full path to identify this coordinate system, which
+    // is not user-named but implicitly part of the light filter.
+    RtUString coordSysName(id.GetText());
+    attrs.SetString(RixStr.k_name, coordSysName);
+
+    if (_coordSysId == riley::CoordinateSystemId::InvalidId()) {
+        _coordSysId = riley->CreateCoordinateSystem(
+            riley::UserId(stats::AddDataLocation(id.GetText()).GetValue()),
+            xform, attrs);
+    } else {
+        riley->ModifyCoordinateSystem(_coordSysId, &xform, &attrs);
+    }
+
+    _rileyIsInSync = true;
+}
+
+riley::CoordinateSystemId
+HdPrmanLightFilter::GetCoordSysId()
+{
+    std::lock_guard<std::mutex> lock(_syncToRileyMutex);
+    TF_VERIFY(_rileyIsInSync, "Must call SyncToRiley() first");
+    return _coordSysId;
+}
+
+/* virtual */
+HdDirtyBits
+HdPrmanLightFilter::GetInitialDirtyBitsMask() const
+{
+    return HdChangeTracker::AllDirty;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
diff --git a/third_party/renderman-26/plugin/hdPrman/lightFilter.h b/third_party/renderman-26/plugin/hdPrman/lightFilter.h
new file mode 100644
index 0000000000..d331ac4960
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/lightFilter.h
@@ -0,0 +1,71 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_22_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_FILTER_H
+#define EXT_RMANPKG_22_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_FILTER_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sprim.h"
+#include "Riley.h"
+
+#include <mutex>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// For now, the procs in this file are boiler plate for when hdPrman needs to
+// have light filters become prime citizens.  This will probably happen when
+// its time to implement shared light filters.  For now, light filters are
+// handled inside the lights in light.cpp.
+//
+// Also, for now base the HdPrmanLightFilter class on HdSprim as there
+// currently is no HdLightFilter class.
+
+class HdSceneDelegate;
+class HdPrman_RenderParam;
+
+/// \class HdPrmanLightFilter
+///
+/// A representation for light filters.
+///
+class HdPrmanLightFilter final : public HdSprim 
+{
+public:
+    HdPrmanLightFilter(SdfPath const& id, TfToken const& lightFilterType);
+    ~HdPrmanLightFilter() override;
+
+    /// Synchronizes state from the delegate to this object.
+    void Sync(HdSceneDelegate *sceneDelegate,
+                      HdRenderParam   *renderParam,
+                      HdDirtyBits     *dirtyBits) override;
+
+    /// Make sure this material has been updated in Riley.
+    void SyncToRiley(
+        HdSceneDelegate *sceneDelegate,
+        riley::Riley *riley);
+
+    /// Returns the minimal set of dirty bits to place in the
+    /// change tracker for use in the first sync of this prim.
+    /// Typically this would be all dirty bits.
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+    void Finalize(HdRenderParam *renderParam) override;
+
+    riley::CoordinateSystemId GetCoordSysId();
+
+private:
+    void _SyncToRileyWithLock(
+        HdSceneDelegate *sceneDelegate,
+        riley::Riley *riley);
+
+    riley::CoordinateSystemId _coordSysId;
+    mutable std::mutex _syncToRileyMutex;
+    bool _rileyIsInSync;
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  // EXT_RMANPKG_22_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_LIGHT_FILTER_H
diff --git a/third_party/renderman-26/plugin/hdPrman/lightLinkingSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/lightLinkingSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..2e60c2445a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/lightLinkingSceneIndexPlugin.cpp
@@ -0,0 +1,93 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/imaging/hd/version.h"
+
+// There was no hdsi/version.h before this HD_API_VERSION.
+#if HD_API_VERSION >= 58 
+
+#include "pxr/imaging/hdsi/version.h"
+
+#if HDSI_API_VERSION >= 13
+#define HDPRMAN_USE_LIGHT_LINKING_SCENE_INDEX
+#endif
+
+#endif // #if HD_API_VERSION >= 58
+
+#ifdef HDPRMAN_USE_LIGHT_LINKING_SCENE_INDEX
+
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hdsi/lightLinkingSceneIndex.h"
+
+#include "pxr/base/tf/envSetting.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_LightLinkingSceneIndexPlugin"))
+);
+
+TF_DEFINE_ENV_SETTING(HDPRMAN_ENABLE_LIGHT_LINKING_SCENE_INDEX, true, 
+    "Enable registration for the light linking scene index.");
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registration
+////////////////////////////////////////////////////////////////////////////////
+
+static const char * const _rendererDisplayName = "Prman";
+class HdPrman_LightLinkingSceneIndexPlugin;
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<HdPrman_LightLinkingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    if (TfGetEnvSetting(HDPRMAN_ENABLE_LIGHT_LINKING_SCENE_INDEX)) {
+
+        // XXX Picking an arbitrary phase for now. If a procedural were to
+        //     generate light prims, we'd want this to be after it.
+        //     HdGpSceneIndexPlugin::GetInsertionPhase() currently returns 2.
+        //
+        const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 4;
+
+        HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+            _rendererDisplayName,
+            _tokens->sceneIndexPluginName,
+            // XXX Update inputArgs to provide the list of geometry types
+            //     supported by hdPrman.
+            nullptr, 
+            insertionPhase,
+            HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index Implementation
+////////////////////////////////////////////////////////////////////////////////
+
+class HdPrman_LightLinkingSceneIndexPlugin :
+    public HdSceneIndexPlugin
+{
+public:
+    HdPrman_LightLinkingSceneIndexPlugin() = default;
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override
+    {
+        return HdsiLightLinkingSceneIndex::New(inputScene, inputArgs);
+    }
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // HDPRMAN_USE_LIGHT_LINKING_SCENE_INDEX
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/material.cpp b/third_party/renderman-26/plugin/hdPrman/material.cpp
new file mode 100644
index 0000000000..92e7b86ba2
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/material.cpp
@@ -0,0 +1,1132 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/material.h"
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/usd/sdf/types.h"
+#include "pxr/base/tf/getenv.h"
+#include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/scopeDescription.h"
+#include "pxr/base/tf/staticData.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/imaging/hd/light.h"
+#include "pxr/imaging/hd/rprim.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hf/diagnostic.h"
+#include "RiTypesHelper.h"
+
+#include "pxr/usd/sdr/declare.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/usd/sdr/registry.h"
+#include <boost/functional/hash.hpp>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_ENV_SETTING(HD_PRMAN_MATERIALID, true,
+                      "Enable __materialid as hash of material network");
+static bool _enableMaterialID =
+    TfGetEnvSetting(HD_PRMAN_MATERIALID);
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (PxrDisplace)
+    (bxdf)
+    (OSL)
+    (omitFromRender)
+    (material)
+    (surface)
+    ((materialid, "__materialid"))
+    (light)
+    (PrimvarPass)
+);
+
+TF_MAKE_STATIC_DATA(NdrTokenVec, _sourceTypes) {
+    *_sourceTypes = { 
+        TfToken("OSL"), 
+        TfToken("RmanCpp"),    
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
+        TfToken("mtlx") 
+#endif
+    };}
+
+struct _HashMaterial {
+    size_t operator()(const HdMaterialNetwork2 &mat) const
+    {
+        size_t v=0;
+        for (TfToken const& primvarName: mat.primvars) {
+            boost::hash_combine(v, primvarName.Hash());
+        }
+        for (auto const& node: mat.nodes) {
+            boost::hash_combine(v, node.first.GetHash());
+            boost::hash_combine(v, node.second.nodeTypeId.Hash());
+            for (auto const& param: node.second.parameters) {
+                boost::hash_combine(v, param.first.Hash());
+                boost::hash_combine(v, param.second.GetHash());
+            }
+            for (auto const& input: node.second.inputConnections) {
+                boost::hash_combine(v, input.first.Hash());
+                for (auto const& conn: input.second) {
+                    boost::hash_combine(v, conn.upstreamNode.GetHash());
+                    boost::hash_combine(v, conn.upstreamOutputName.Hash());
+                }
+            }
+        }
+        for (auto const& term: mat.terminals) {
+            boost::hash_combine(v, term.first.Hash());
+            boost::hash_combine(v, term.second.upstreamNode.GetHash());
+            boost::hash_combine(v, term.second.upstreamOutputName.Hash());
+        }
+        return v;
+    }
+};
+
+TfTokenVector const&
+HdPrmanMaterial::GetShaderSourceTypes()
+{
+    return *_sourceTypes;
+}
+
+HdMaterialNetwork2 const&
+HdPrmanMaterial::GetMaterialNetwork() const
+{
+    // XXX We could make this API entry point do the sync as needed,
+    // if we passed in the necessary context.  However, we should
+    // remove this and the retained _materialNetwork entirely,
+    // since it is solely used to allow UsdPreviewSurface materials
+    // to supply a PrimvarPass shader that in turn sets a disp bound.
+    // Now that scene indexes are handling UsdPreviewSurface
+    // conversion and material primvar attribute transfer, we should
+    // not need this whole affordance for that case.  In the
+    // meantime, leave this here to guard against mis-usage.
+    std::lock_guard<std::mutex> lock(_syncToRileyMutex);
+    TF_VERIFY(_rileyIsInSync, "Must call SyncToRiley() first");
+
+    return _materialNetwork;
+}
+
+HdPrmanMaterial::HdPrmanMaterial(SdfPath const& id)
+    : HdMaterial(id)
+    , _materialId(riley::MaterialId::InvalidId())
+    , _displacementId(riley::DisplacementId::InvalidId())
+    , _rileyIsInSync(false)
+{
+    /* NOTHING */
+}
+
+HdPrmanMaterial::~HdPrmanMaterial()
+{
+}
+
+void
+HdPrmanMaterial::Finalize(HdRenderParam *renderParam)
+{
+    HdPrman_RenderParam *param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+    riley::Riley *riley = param->AcquireRiley();
+
+    std::lock_guard<std::mutex> lock(_syncToRileyMutex);
+    _ResetMaterialWithLock(riley);
+}
+
+void
+HdPrmanMaterial::_ResetMaterialWithLock(riley::Riley *riley)
+{
+    if (_materialId != riley::MaterialId::InvalidId()) {
+        riley->DeleteMaterial(_materialId);
+        _materialId = riley::MaterialId::InvalidId();
+    }
+    if (_displacementId != riley::DisplacementId::InvalidId()) {
+        riley->DeleteDisplacement(_displacementId);
+        _displacementId = riley::DisplacementId::InvalidId();
+    }
+}
+
+static VtArray<GfVec3f>
+_ConvertToVec3fArray(const VtArray<GfVec3d>& v)
+{
+    VtArray<GfVec3f> out;
+    out.resize(v.size());
+    for (size_t i=0; i<v.size(); ++i) {
+        for (uint8_t e=0; e<3; ++e) {
+            out[i][e] = v[i][e];
+        }
+    }
+    return out;
+}
+
+static int
+_ConvertOptionTokenToInt(
+    const TfToken &option, const NdrOptionVec &options, bool *ok)
+{
+    for (const auto &tokenPair : options) {
+        if (tokenPair.first == option) {
+            *ok = true;
+            return TfUnstringify<int>(tokenPair.second, ok);
+        }
+    }
+    return 0;
+}
+
+using _PathSet = std::unordered_set<SdfPath, SdfPath::Hash>;
+
+// See also TfGetenvBool().
+static bool
+_GetStringAsBool(std::string value, bool defaultValue)
+{
+    if (value.empty()) {
+        return defaultValue;
+    } else {
+        for (char& c: value) {
+            c = tolower(c);
+        }
+        return value == "true" ||
+            value == "yes"  ||
+            value == "on"   ||
+            value == "1";
+    }
+}
+
+// Recursively convert a HdMaterialNode2 and its upstream dependencies
+// to Riley equivalents.  Avoids adding redundant nodes in the case
+// of multi-path dependencies.
+static bool
+_ConvertNodes(
+    HdMaterialNetwork2 const& network,
+    SdfPath const& nodePath,
+    std::vector<riley::ShadingNode> *result,
+    _PathSet* visitedNodes,
+    bool elideDefaults)
+{
+    // Check if we've processed this node before. If we have, we'll just return.
+    // This is not an error, since we often have multiple connection paths
+    // leading to the same upstream node.
+    if (visitedNodes->count(nodePath) > 0) {
+        return true;
+    }
+    visitedNodes->insert(nodePath);
+
+    // Find HdMaterialNetwork2 node.
+    auto iter = network.nodes.find(nodePath);
+    if (iter == network.nodes.end()) {
+        // This could be caused by a bad connection to a non-existent node.
+        TF_WARN("Unknown material node '%s'", nodePath.GetText());
+        return false;
+    }
+    HdMaterialNode2 const& node = iter->second;
+    // Riley expects nodes to be provided in topological dependency order.
+    // Pre-traverse upstream nodes.
+    for (auto const& connEntry: node.inputConnections) {
+        for (auto const& e: connEntry.second) {
+            // This method will just return if we've visited this upstream node
+            // before
+            _ConvertNodes(network, e.upstreamNode, result, visitedNodes,
+                          elideDefaults);
+        }
+    }
+
+    // Ignore nodes of id "PrimvarPass". This node is a workaround for 
+    // UsdPreviewSurface materials and is not a registered shader node.
+    if (node.nodeTypeId == _tokens->PrimvarPass) {
+        return true;
+    }
+
+    // Ignore nodes of id "PxrDisplace" that lack both parameters
+    // and connections.  This can save render startup time by avoiding
+    // creating unnecessary Riley displacement networks.
+    if ((node.nodeTypeId == _tokens->PxrDisplace)
+        && node.parameters.empty()
+        && node.inputConnections.empty()) {
+        return true;
+    }
+
+    // Find shader registry entry.
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+    SdrShaderNodeConstPtr sdrEntry =
+        sdrRegistry.GetShaderNodeByIdentifier(node.nodeTypeId, *_sourceTypes);
+    if (!sdrEntry) {
+        TF_WARN("Unknown shader ID %s for node <%s>\n",
+                node.nodeTypeId.GetText(), nodePath.GetText());
+        return false;
+    }
+    // Create equivalent Riley shading node.
+    riley::ShadingNode sn;
+    if (sdrEntry->GetContext() == _tokens->bxdf ||
+        sdrEntry->GetContext() == SdrNodeContext->Surface ||
+        sdrEntry->GetContext() == SdrNodeContext->Volume) {
+        sn.type = riley::ShadingNode::Type::k_Bxdf;
+    }
+    else if (sdrEntry->GetContext() == SdrNodeContext->Pattern ||
+               sdrEntry->GetContext() == _tokens->OSL)
+    {
+        // In RMAN 24 all patterns are OSL shaders, that is, all patterns we have in Renderman
+        // are going to be flagged as k_Pattern for Riley. In the case of displacement Riley
+        // expects it to be flagged as k_Displacement and to be the last node of a network to
+        // create a specific displacement. So, we need to check if the OSL node that we receive
+        // is PxrDisplace to flag it as a displacement node instead of a general OSL node.
+        // If we don't do that, Riley will check that there is no displacement node in the network
+        // we are using and it will always return an invalid displacement handle to hdPrman.
+        if (node.nodeTypeId == _tokens->PxrDisplace)
+            sn.type = riley::ShadingNode::Type::k_Displacement;
+        else
+            sn.type = riley::ShadingNode::Type::k_Pattern;        
+    }
+    else if (sdrEntry->GetContext() == SdrNodeContext->Displacement)
+    {
+        // We need to keep this for backwards compatibility with C++ patterns in case we
+        // use a version prior to RMAN 24.
+        sn.type = riley::ShadingNode::Type::k_Displacement;
+    } else if (sdrEntry->GetContext() == SdrNodeContext->Light) {
+        sn.type = riley::ShadingNode::Type::k_Light;
+    } else if (sdrEntry->GetContext() == SdrNodeContext->LightFilter) {
+        sn.type = riley::ShadingNode::Type::k_LightFilter;
+    } else {
+        TF_WARN("Unknown shader entry type '%s' for shader '%s'",
+                sdrEntry->GetContext().GetText(), sdrEntry->GetName().c_str());
+        return false;
+    }
+    sn.handle = RtUString(nodePath.GetText());
+    std::string shaderPath = sdrEntry->GetResolvedImplementationURI();
+    if (shaderPath.empty()){
+        TF_WARN("Shader '%s' did not provide a valid implementation path.",
+                sdrEntry->GetName().c_str());
+        return false;
+    }
+    if (sn.type == riley::ShadingNode::Type::k_Displacement ||
+        sn.type == riley::ShadingNode::Type::k_Light || 
+        sn.type == riley::ShadingNode::Type::k_LightFilter) {
+        // Except for Displacement;
+        // in that case let the renderer choose, since RIS
+        // can only use a cpp Displacement shader and XPU
+        // can only use osl.
+        // Lights and light filters let the renderer choose by name too.
+        shaderPath = sdrEntry->GetImplementationName();
+    }
+
+    sn.name = RtUString(shaderPath.c_str());
+    // Convert params
+    for (const auto& param: node.parameters) {
+        const SdrShaderProperty* prop = sdrEntry->GetShaderInput(param.first);
+        if (!prop) {
+            TF_DEBUG(HDPRMAN_MATERIALS)
+                .Msg("Unknown shader property '%s' for "
+                     "shader '%s' at '%s'; ignoring.\n",
+                     param.first.GetText(),
+                     sdrEntry->GetName().c_str(),
+                     nodePath.GetText());
+            continue;
+        }
+        // Skip parameter values that match schema-defined defaults
+        if (elideDefaults && param.second == prop->GetDefaultValue()) {
+            continue;
+        }
+        // Filter by omitFromRender metadata to pre-empt warnings
+        // from RenderMan.
+        std::string omitFromRenderValStr;
+        if (TfMapLookup(prop->GetMetadata(), _tokens->omitFromRender,
+            &omitFromRenderValStr)) {
+            if (_GetStringAsBool(omitFromRenderValStr, false)) {
+                continue;
+            }
+        }
+        TfToken propType = prop->GetType();
+        if (propType.IsEmpty()) {
+            // As a special case, silently ignore these on PxrDisplace.
+            // Automatically promoting the same network for this
+            // case causes a lot of errors.
+            if (node.nodeTypeId == _tokens->PxrDisplace) {
+                continue;
+            }
+            TF_DEBUG(HDPRMAN_MATERIALS)
+                .Msg("Unknown shader entry field type for "
+                     "field '%s' on shader '%s' at '%s'; ignoring.\n",
+                     param.first.GetText(),
+                     sdrEntry->GetName().c_str(),
+                     nodePath.GetText());
+            continue;
+        }
+
+        // Dispatch by propType and VtValue-held type.
+        // Cast value types to match where feasible.
+        bool ok = false;
+        RtUString name(prop->GetImplementationName().c_str());
+        if (propType == SdrPropertyTypes->Struct ||
+            propType == SdrPropertyTypes->Vstruct) {
+            // Ignore structs.  They are only used as ways to
+            // pass data between shaders, not as a way to pass
+            // in parameters.
+            ok = true;
+        } else if (param.second.IsHolding<GfVec2f>()) {
+            GfVec2f v = param.second.UncheckedGet<GfVec2f>();
+            if (propType == SdrPropertyTypes->Float) {
+                sn.params.SetFloatArray(name, v.data(), 2);
+                ok = true;
+            } 
+        } else if (param.second.IsHolding<GfVec3f>()) {
+            GfVec3f v = param.second.UncheckedGet<GfVec3f>();
+            if (propType == SdrPropertyTypes->Color) {
+                sn.params.SetColor(name, RtColorRGB(v[0], v[1], v[2]));
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Vector) {
+                sn.params.SetVector(name, RtVector3(v[0], v[1], v[2]));
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Point) {
+                sn.params.SetPoint(name, RtPoint3(v[0], v[1], v[2]));
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Normal) {
+                sn.params.SetNormal(name, RtNormal3(v[0], v[1], v[2]));
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Float) {
+                sn.params.SetFloatArray(name, v.data(), 3);
+                ok = true;
+            }
+        } else if (param.second.IsHolding<GfVec4f>()) {
+            GfVec4f v = param.second.UncheckedGet<GfVec4f>();
+            if (propType == SdrPropertyTypes->Float) {
+                sn.params.SetFloatArray(name, v.data(), 4);
+                ok = true;
+            } 
+        } else if (param.second.IsHolding<VtArray<GfVec3f>>()) {
+            const VtArray<GfVec3f>& v =
+                param.second.UncheckedGet<VtArray<GfVec3f>>();
+            if (propType == SdrPropertyTypes->Color) {
+                sn.params.SetColorArray(
+                                      name,
+                                      reinterpret_cast<const RtColorRGB*>(v.cdata()),
+                                      v.size());
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Vector) {
+                sn.params.SetVectorArray(
+                                       name,
+                                       reinterpret_cast<const RtVector3*>(v.cdata()),
+                                       v.size());
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Point) {
+                sn.params.SetPointArray(
+                                      name,
+                                      reinterpret_cast<const RtPoint3*>(v.cdata()),
+                                      v.size());
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Normal) {
+                sn.params.SetNormalArray(
+                                       name,
+                                       reinterpret_cast<const RtNormal3*>(v.cdata()),
+                                       v.size());
+                ok = true;
+            }
+        } else if (param.second.IsHolding<GfVec3d>()) {
+            const GfVec3d& v = param.second.UncheckedGet<GfVec3d>();
+            if (propType == SdrPropertyTypes->Color) {
+                sn.params.SetColor(name, RtColorRGB(v[0], v[1], v[2]));
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Point) {
+                sn.params.SetPoint(name, RtPoint3(v[0], v[1], v[2]));
+                ok = true;
+            }
+        } else if (param.second.IsHolding<VtArray<GfVec3d>>()) {
+            if (propType == SdrPropertyTypes->Color) {
+                const VtArray<GfVec3d>& vd =
+                    param.second.UncheckedGet<VtArray<GfVec3d>>();
+                VtArray<GfVec3f> v = _ConvertToVec3fArray(vd);
+                sn.params.SetColorArray(
+                                      name,
+                                      reinterpret_cast<const RtColorRGB*>(v.cdata()),
+                                      v.size());
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Point) {
+                const VtArray<GfVec3d>& vd =
+                    param.second.UncheckedGet<VtArray<GfVec3d>>();
+                VtArray<GfVec3f> v = _ConvertToVec3fArray(vd);
+                sn.params.SetPointArray(
+                    name,
+                    reinterpret_cast<const RtPoint3*>(v.cdata()),
+                    v.size());
+                ok = true;
+            }
+        } else if (param.second.IsHolding<float>()) {
+            float v = param.second.UncheckedGet<float>();
+            if (propType == SdrPropertyTypes->Int) {
+                sn.params.SetInteger(name, int(v));
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Float) {
+                sn.params.SetFloat(name, v);
+                ok = true;
+            }
+        } else if (param.second.IsHolding<VtArray<float>>()) {
+            const VtArray<float>& v =
+                param.second.UncheckedGet<VtArray<float>>();
+            if (propType == SdrPropertyTypes->Float) {
+                sn.params.SetFloatArray(name, v.cdata(), v.size());
+                ok = true;
+            }
+        } else if (param.second.IsHolding<int>()) {
+            int v = param.second.UncheckedGet<int>();
+            if (propType == SdrPropertyTypes->Float) {
+                sn.params.SetFloat(name, v);
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Int) {
+                sn.params.SetInteger(name, v);
+                ok = true;
+            }
+        } else if (param.second.IsHolding<VtArray<int>>()) {
+            if (propType == SdrPropertyTypes->Float) {
+                const VtArray<float>& v =
+                    param.second.UncheckedGet<VtArray<float>>();
+                sn.params.SetFloatArray(name, v.cdata(), v.size());
+                ok = true;
+            } else if (propType == SdrPropertyTypes->Int) {
+                const VtArray<int>& v =
+                    param.second.UncheckedGet<VtArray<int>>();
+                sn.params.SetIntegerArray(name, v.cdata(), v.size());
+                ok = true;
+            }
+        } else if (param.second.IsHolding<TfToken>()) {
+            TfToken v = param.second.UncheckedGet<TfToken>();
+            // A token can represent and enum option for an Int property
+            if (propType == SdrPropertyTypes->Int) {
+                const int value = _ConvertOptionTokenToInt(
+                    v, prop->GetOptions(), &ok);
+                if (ok) {
+                    sn.params.SetInteger(name, value);
+                }
+            } else {
+                sn.params.SetString(name, RtUString(v.GetText()));
+                ok = true;
+            }
+        } else if (param.second.IsHolding<std::string>()) {
+            std::string v = param.second.UncheckedGet<std::string>();
+            // A string can represent and enum option for an Int property
+            if (propType == SdrPropertyTypes->Int) {
+                const int value = _ConvertOptionTokenToInt(
+                    TfToken(v), prop->GetOptions(), &ok);
+                if (ok) {
+                    sn.params.SetInteger(name, value);
+                }
+            } else {
+                sn.params.SetString(name, RtUString(v.c_str()));
+                ok = true;
+            }
+        } else if (param.second.IsHolding<SdfAssetPath>()) {
+            // This code processes nodes for both surface materials
+            // and lights.  RenderMan does not flip light textures
+            // as it does surface textures.
+            bool isLight = (sn.type == riley::ShadingNode::Type::k_Light &&
+                            param.first == HdLightTokens->textureFile);
+
+            RtUString v = HdPrman_Utils::ResolveAssetToRtUString(
+                param.second.UncheckedGet<SdfAssetPath>(),
+                !isLight, // only flip if NOT a light
+                isLight ? _tokens->light.GetText() : 
+                          _tokens->material.GetText());
+
+            sn.params.SetString(name, v);
+            ok = true;
+        } else if (param.second.IsHolding<bool>()) {
+            // RixParamList (specifically, RixDataType) doesn't have
+            // a bool entry; we convert to integer instead.
+            int v = param.second.UncheckedGet<bool>();
+            sn.params.SetInteger(name, v);
+            ok = true;
+        } else if (param.second.IsHolding<GfMatrix4d>()) {
+            if (propType == SdrPropertyTypes->Matrix) {
+                const RtMatrix4x4 v = HdPrman_Utils::GfMatrixToRtMatrix(
+                    param.second.UncheckedGet<GfMatrix4d>());
+                sn.params.SetMatrix(name, v);
+                ok = true;
+            }
+        }
+        if (!ok) {
+            TF_DEBUG(HDPRMAN_MATERIALS)
+                .Msg("Unknown shading parameter type '%s'; skipping "
+                     "parameter '%s' on node '%s'; "
+                     "expected type '%s'\n",
+                     param.second.GetTypeName().c_str(),
+                     param.first.GetText(),
+                     nodePath.GetText(),
+                     propType.GetText());
+        }
+    }
+    // Convert connected inputs.
+    for (auto const& connEntry: node.inputConnections) {
+        // Find the shader properties, so that we can look up
+        // the property implementation names.
+        SdrShaderPropertyConstPtr downstreamProp =
+            sdrEntry->GetShaderInput(connEntry.first);
+        if (!downstreamProp) {
+            TF_WARN("Unknown downstream property %s", connEntry.first.data());
+            continue;
+        }
+        RtUString name(downstreamProp->GetImplementationName().c_str());
+        TfToken const propType = downstreamProp->GetType();
+
+        // Gather input (or inputs, for array-valued inputs) for shader 
+        // property.
+        std::vector<RtUString> inputRefs;
+
+        for (auto const& e: connEntry.second) {
+            // Find the output & input shader nodes of the connection.
+            HdMaterialNode2 const* upstreamNode =
+                TfMapLookupPtr(network.nodes, e.upstreamNode);
+            if (!upstreamNode) {
+                TF_WARN("Unknown upstream node %s", e.upstreamNode.GetText());
+                continue;
+            }
+            // Ignore nodes of id "PrimvarPass". This node is a workaround for 
+            // UsdPreviewSurface materials and is not a registered shader node.
+            if (upstreamNode->nodeTypeId == _tokens->PrimvarPass) {
+                continue;
+            }
+
+            SdrShaderNodeConstPtr upstreamSdrEntry =
+                sdrRegistry.GetShaderNodeByIdentifier(
+                      upstreamNode->nodeTypeId, *_sourceTypes);
+            if (!upstreamSdrEntry) {
+                TF_WARN("Unknown shader for upstream node %s",
+                        e.upstreamNode.GetText());
+                continue;
+            }
+            SdrShaderPropertyConstPtr upstreamProp =
+                upstreamSdrEntry->GetShaderOutput(e.upstreamOutputName);
+            // In the case of terminals there is no upstream output name
+            // since the whole node is referenced as a whole
+            if (!upstreamProp && propType != SdrPropertyTypes->Terminal) {
+                TF_WARN("Unknown upstream property %s",
+                        e.upstreamOutputName.data());
+                continue;
+            }
+            // Prman syntax for parameter references is "handle:param".
+            RtUString inputRef;
+            if (!upstreamProp) {
+                inputRef = RtUString(e.upstreamNode.GetString().c_str());
+            } else {
+                inputRef = RtUString(
+                    (e.upstreamNode.GetString()+":"
+                    + upstreamProp->GetImplementationName().c_str())
+                    .c_str());
+            }
+            inputRefs.push_back(inputRef);
+        }
+        
+        // Establish the Riley connection.
+        size_t const numInputRefs = inputRefs.size();
+        if (numInputRefs > 0) {
+            if (propType == SdrPropertyTypes->Color) {
+                if (numInputRefs == 1) {
+                    sn.params.SetColorReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetColorReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else if (propType == SdrPropertyTypes->Vector) {
+                if (numInputRefs == 1) {
+                    sn.params.SetVectorReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetVectorReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else if (propType == SdrPropertyTypes->Point) {
+                if (numInputRefs == 1) {
+                    sn.params.SetPointReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetPointReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else if (propType == SdrPropertyTypes->Normal) {
+                if (numInputRefs == 1) {
+                    sn.params.SetNormalReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetNormalReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else if (propType == SdrPropertyTypes->Float) {
+                if (numInputRefs == 1) {
+                    sn.params.SetFloatReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetFloatReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else if (propType == SdrPropertyTypes->Int) {
+                if (numInputRefs == 1) {
+                    sn.params.SetIntegerReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetIntegerReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else if (propType == SdrPropertyTypes->String) {
+                if (numInputRefs == 1) {
+                    sn.params.SetStringReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetStringReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else if (propType == SdrPropertyTypes->Struct) {
+                if (numInputRefs == 1) {
+                    sn.params.SetStructReference(name, inputRefs[0]);
+                } else {
+                     TF_WARN("Unsupported type struct array for property '%s' "
+                        "on shader '%s' at '%s'; ignoring.",
+                        connEntry.first.data(),
+                        sdrEntry->GetName().c_str(),
+                        nodePath.GetText());
+                }
+            } else if (propType == SdrPropertyTypes->Terminal) {
+                if (numInputRefs == 1) {
+                    sn.params.SetBxdfReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetBxdfReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else if (propType == SdrPropertyTypes->Matrix) {
+                if (numInputRefs == 1) {
+                    sn.params.SetMatrixReference(name, inputRefs[0]);
+                } else {
+                    sn.params.SetMatrixReferenceArray(
+                        name, inputRefs.data(), numInputRefs);
+                }
+            } else {
+                TF_WARN("Unknown type '%s' for property '%s' "
+                        "on shader '%s' at %s; ignoring.",
+                        propType.GetText(),
+                        connEntry.first.data(),
+                        sdrEntry->GetName().c_str(),
+                        nodePath.GetText());
+            }
+        }
+    }
+
+    result->emplace_back(std::move(sn));
+
+    return true;
+}
+    
+bool
+HdPrman_ConvertHdMaterialNetwork2ToRmanNodes(
+    HdMaterialNetwork2 const& network,
+    SdfPath const& nodePath,
+    std::vector<riley::ShadingNode> *result)
+{
+    // If XPU_INTERACTIVE_SHADER_EDITS is true, do not elide defaults.
+    // This makes it faster to edit parameter values later.
+    // Look this env var up here since it can be changed in-app.
+    bool elideDefaults = !TfGetenvBool("XPU_INTERACTIVE_SHADER_EDITS", false);
+
+    _PathSet visitedNodes;
+    return _ConvertNodes(
+        network, nodePath, result, &visitedNodes, elideDefaults);
+}
+    
+// Debug helper
+void
+HdPrman_DumpNetwork(HdMaterialNetwork2 const& network, SdfPath const& id)
+{
+    printf("material network for %s:\n", id.GetText());
+    for (auto const& nodeEntry: network.nodes) {
+        printf("  --Node--\n");
+        printf("    path: %s\n", nodeEntry.first.GetText());
+        printf("    type: %s\n", nodeEntry.second.nodeTypeId.GetText());
+        for (auto const& paramEntry: nodeEntry.second.parameters) {
+            printf("    param: %s = %s\n",
+                   paramEntry.first.GetText(),
+                   TfStringify(paramEntry.second).c_str());
+        }
+        for (auto const& connEntry: nodeEntry.second.inputConnections) {
+            for (auto const& e: connEntry.second) {
+                printf("    connection: %s <-> %s @ %s\n",
+                       connEntry.first.GetText(),
+                       e.upstreamOutputName.GetText(),
+                       e.upstreamNode.GetText());
+        }
+    }
+}
+    printf("  --Terminals--\n");
+    for (auto const& terminalEntry: network.terminals) {
+        printf("    %s (downstream) <-> %s @ %s (upstream)\n",
+               terminalEntry.first.GetText(),
+               terminalEntry.second.upstreamOutputName.GetText(),
+               terminalEntry.second.upstreamNode.GetText());
+    }
+}
+    
+// Convert given HdMaterialNetwork2 to Riley material and displacement
+// shader networks. If the Riley network exists, it will be modified;
+// otherwise it will be created as needed.
+static void
+_ConvertHdMaterialNetwork2ToRman(
+    HdSceneDelegate *sceneDelegate,
+    riley::Riley *riley,
+    SdfPath const& id,
+    const HdMaterialNetwork2 &network,
+    riley::MaterialId *materialId,
+    riley::DisplacementId *displacementId)
+{
+    HD_TRACE_FUNCTION();
+    std::vector<riley::ShadingNode> nodes;
+    nodes.reserve(network.nodes.size());
+    bool materialFound = false, displacementFound = false;
+
+    for (auto const& terminal: network.terminals) {
+        if (HdPrman_ConvertHdMaterialNetwork2ToRmanNodes(
+                network, terminal.second.upstreamNode, &nodes)) {
+            if (nodes.empty()) {
+                // Already emitted a specific warning.
+                continue;
+            }
+            // Compute a hash of the material network, and pass it as
+            // __materialid on the terminal shader node.  RenderMan uses
+            // this detect and re-use material netowrks, which is valuable
+            // in production scenes where upstream scene instancing did
+            // not already catch the reuse.
+            if (_enableMaterialID) {
+                static RtUString const materialid = RtUString("__materialid");
+                const size_t networkHash = _HashMaterial()(network);
+                nodes.back().params.SetString(
+                    materialid,
+                    RtUString(TfStringify(networkHash).c_str()));
+            }
+            if (terminal.first == HdMaterialTerminalTokens->surface ||
+                terminal.first == HdMaterialTerminalTokens->volume) {
+                // Create or modify Riley material.
+                materialFound = true;
+                TRACE_SCOPE("_ConvertHdMaterialNetwork2ToRman - Update Riley Material");
+                if (*materialId == riley::MaterialId::InvalidId()) {
+                    TRACE_SCOPE("riley::CreateMaterial");
+                    *materialId = riley->CreateMaterial(
+                        riley::UserId(stats::AddDataLocation(id.GetText()).GetValue()),
+                        {static_cast<uint32_t>(nodes.size()), &nodes[0]},
+                        RtParamList());
+                } else {
+                    TRACE_SCOPE("riley::ModifyMaterial");
+                    riley::ShadingNetwork const material = {
+                        static_cast<uint32_t>(nodes.size()), &nodes[0]};
+                    riley->ModifyMaterial(*materialId, &material, nullptr);
+                }
+                if (*materialId == riley::MaterialId::InvalidId()) {
+                    TF_WARN("Failed to create material %s\n",
+                                     id.GetText());
+                }
+            } else if (terminal.first ==
+                       HdMaterialTerminalTokens->displacement) {
+                // Create or modify Riley displacement.
+                TRACE_SCOPE("_ConvertHdMaterialNetwork2ToRman - Update Riley Displacement");
+                displacementFound = true;
+                if (*displacementId == riley::DisplacementId::InvalidId()) {
+                    TRACE_SCOPE("riley::CreateDisplacement");
+                    *displacementId = riley->CreateDisplacement(
+                        riley::UserId(stats::AddDataLocation(id.GetText()).GetValue()),
+                        {static_cast<uint32_t>(nodes.size()), &nodes[0]},
+                        RtParamList());
+                } else {
+                    TRACE_SCOPE("riley::ModifyDisplacement");
+                    riley::ShadingNetwork const displacement = {
+                        static_cast<uint32_t>(nodes.size()), &nodes[0]};
+                    riley::DisplacementResult const result =
+                            riley->ModifyDisplacement(*displacementId,
+                                                      &displacement,
+                                                      nullptr);
+                    if (result == riley::DisplacementResult::k_ResendPrimVars) {
+                        // Mark prims dirty so they pick up new displacement.
+                        HdRenderIndex& index =
+                                sceneDelegate->GetRenderIndex();
+                        HdChangeTracker& changeTracker =
+                                index.GetChangeTracker();
+                        for(auto rprimid : index.GetRprimIds()) {
+                            HdRprim const *rprim = index.GetRprim(rprimid);
+                            if(rprim->GetMaterialId() == id) {
+                                changeTracker.MarkRprimDirty(
+                                    rprimid, HdChangeTracker::DirtyPrimvar);
+                            }
+                        }
+                    }
+                }
+                if (*displacementId == riley::DisplacementId::InvalidId()) {
+                    TF_WARN("Failed to create displacement %s\n",
+                                     id.GetText());
+                }
+            }
+        } else {
+            TF_WARN("Failed to convert nodes for %s\n", id.GetText());
+        }
+        nodes.clear();
+    }
+    // Free dis-used networks.
+    if (!materialFound) {
+        riley->DeleteMaterial(*materialId);
+        *materialId = riley::MaterialId::InvalidId();
+    }
+    if (!displacementFound) {
+        riley->DeleteDisplacement(*displacementId);
+        *displacementId = riley::DisplacementId::InvalidId();
+    }
+}
+
+/* virtual */
+void
+HdPrmanMaterial::Sync(HdSceneDelegate *sceneDelegate,
+                      HdRenderParam   *renderParam,
+                      HdDirtyBits     *dirtyBits)
+{  
+    HD_TRACE_FUNCTION();
+
+    HdPrman_RenderParam *param =
+        static_cast<HdPrman_RenderParam*>(renderParam);
+
+    if ((*dirtyBits & HdMaterial::DirtyResource) ||
+        (*dirtyBits & HdMaterial::DirtyParams)) {
+
+        std::lock_guard<std::mutex> lock(_syncToRileyMutex);
+        if (_rileyIsInSync) {
+            // Material was previously pushed to Riley, so sync
+            // immediately, because we cannot assume there will be
+            // a subsequent gprim update that would pull on this material
+            _rileyIsInSync = false;
+            _SyncToRileyWithLock(sceneDelegate, param->AcquireRiley());
+        } else {
+            // Otherwise, wait until a gprim pulls on this material
+            // to sync it to Riley.  This avoids doing any further
+            // work for unused materials, and moves remaining work
+            // from single-threaded Hydra sprim sync
+            // to multi-threaded Hydra rprim sync.
+        }
+    }
+    *dirtyBits = HdChangeTracker::Clean;
+}
+
+void
+HdPrmanMaterial::SyncToRiley(
+    HdSceneDelegate *sceneDelegate,
+    riley::Riley *riley)
+{
+    {
+        TRACE_SCOPE("HdPrmanMaterial::SyncToRiley - wait for lock");
+        _syncToRileyMutex.lock();
+    }
+    std::lock_guard<std::mutex> lock(_syncToRileyMutex, std::adopt_lock);
+    if (!_rileyIsInSync) {
+        _SyncToRileyWithLock(sceneDelegate, riley);
+    }
+}
+
+void
+HdPrmanMaterial::_SyncToRileyWithLock(
+    HdSceneDelegate *sceneDelegate,
+    riley::Riley *riley)
+{
+    SdfPath const& id = GetId();
+    VtValue hdMatVal = sceneDelegate->GetMaterialResource(id);
+
+    if (hdMatVal.IsHolding<HdMaterialNetworkMap>()) {
+        TF_DESCRIBE_SCOPE("Processing material %s", id.GetName().c_str());
+        // Convert HdMaterial to HdMaterialNetwork2 form.
+        _materialNetwork = HdConvertToHdMaterialNetwork2(
+                hdMatVal.UncheckedGet<HdMaterialNetworkMap>());
+        if (TfDebug::IsEnabled(HDPRMAN_MATERIALS)) {
+            HdPrman_DumpNetwork(_materialNetwork, id);
+        }
+        _ConvertHdMaterialNetwork2ToRman(sceneDelegate,
+                                         riley, id, _materialNetwork,
+                                         &_materialId, &_displacementId);
+    } else {
+        TF_CODING_ERROR("HdPrmanMaterial: Expected material resource "
+            "for <%s> to contain material, but found %s instead.",
+            id.GetText(), hdMatVal.GetTypeName().c_str());
+        _ResetMaterialWithLock(riley);
+    }
+
+    _rileyIsInSync = true;
+}
+
+/* virtual */
+HdDirtyBits
+HdPrmanMaterial::GetInitialDirtyBitsMask() const
+{
+    return HdChangeTracker::AllDirty;
+}
+
+bool
+HdPrmanMaterial::IsValid() const
+{
+    return _materialId != riley::MaterialId::InvalidId();
+}
+
+HdMaterialNetwork2
+HdPrmanMaterial_GetFallbackSurfaceMaterialNetwork()
+{
+    // We expect this to be called once, at init time, but drop a trace
+    // scope in just in case that changes.  Accordingly, we also don't
+    // bother creating static tokens for the single-use cases below.
+    HD_TRACE_FUNCTION();
+
+    const std::map<SdfPath, HdMaterialNode2> nodes = {
+        {
+            // path
+            SdfPath("/Primvar_displayColor"),
+            // node info
+            HdMaterialNode2 {
+                // nodeTypeId
+                TfToken("PxrPrimvar"),
+                // parameters
+                {
+                    { TfToken("varname"),
+                      VtValue(TfToken("displayColor")) },
+                    { TfToken("defaultColor"),
+                      VtValue(GfVec3f(0.5, 0.5, 0.5)) },
+                    { TfToken("type"),
+                      VtValue(TfToken("color")) },
+                },
+            },
+        },
+        {
+            // path
+            SdfPath("/Primvar_displayRoughness"),
+            // node info
+            HdMaterialNode2 {
+                // nodeTypeId
+                TfToken("PxrPrimvar"),
+                // parameters
+                {
+                    { TfToken("varname"),
+                      VtValue(TfToken("displayRoughness")) },
+                    { TfToken("defaultFloat"),
+                      VtValue(1.0f) },
+                    { TfToken("type"),
+                      VtValue(TfToken("float")) },
+                },
+            },
+        },
+        {
+            // path
+            SdfPath("/Primvar_displayOpacity"),
+            // node info
+            HdMaterialNode2 {
+                // nodeTypeId
+                TfToken("PxrPrimvar"),
+                // parameters
+                {
+                    { TfToken("varname"),
+                      VtValue(TfToken("displayOpacity")) },
+                    { TfToken("defaultFloat"),
+                      VtValue(1.0f) },
+                    { TfToken("type"),
+                      VtValue(TfToken("float")) },
+                },
+            },
+        },
+        {
+            // path
+            SdfPath("/Primvar_displayMetallic"),
+            // node info
+            HdMaterialNode2 {
+                // nodeTypeId
+                TfToken("PxrPrimvar"),
+                // parameters
+                {
+                    { TfToken("varname"),
+                      VtValue(TfToken("displayMetallic")) },
+                    { TfToken("defaultFloat"),
+                      VtValue(0.0f) },
+                    { TfToken("type"),
+                      VtValue(TfToken("float")) },
+                },
+            },
+        },
+
+        // UsdPreviewSurfaceParameters
+        {
+            // path
+            SdfPath("/UsdPreviewSurfaceParameters"),
+            // node info
+            HdMaterialNode2 {
+                // nodeTypeId
+                TfToken("UsdPreviewSurfaceParameters"),
+                // parameters
+                {},
+                // connections
+                {
+                    { TfToken("diffuseColor"),
+                      { { SdfPath("/Primvar_displayColor"),
+                            TfToken("resultRGB") } } },
+                    { TfToken("roughness"),
+                      { { SdfPath("/Primvar_displayRoughness"),
+                          TfToken("resultF") } } },
+                    { TfToken("metallic"),
+                      { { SdfPath("/Primvar_displayMetallic"),
+                          TfToken("resultF") } } },
+                    { TfToken("opacity"),
+                      { { SdfPath("/Primvar_displayOpacity"),
+                          TfToken("resultF") } } },
+                },
+            },
+        },
+        // PxrSurface (connected to UsdPreviewSurfaceParameters)
+        {
+            // path
+            SdfPath("/PxrSurface"),
+            // node info
+            HdMaterialNode2 {
+                // nodeTypeId
+                TfToken("PxrSurface"),
+                // parameters
+                {
+                    { TfToken("specularModelType"),
+                      VtValue(int(1)) },
+                    { TfToken("diffuseDoubleSided"),
+                      VtValue(int(1)) },
+                    { TfToken("specularDoubleSided"),
+                      VtValue(int(1)) },
+                    { TfToken("specularFaceColor"),
+                      VtValue(GfVec3f(0.04)) },
+                    { TfToken("specularEdgeColor"),
+                      VtValue(GfVec3f(1.0)) },
+                },
+                // connections
+                {
+                    { TfToken("diffuseColor"),
+                      {{ SdfPath("/UsdPreviewSurfaceParameters"),
+                         TfToken("diffuseColorOut") }} },
+                    { TfToken("diffuseGain"),
+                      {{ SdfPath("/UsdPreviewSurfaceParameters"),
+                         TfToken("diffuseGainOut") }} },
+                    { TfToken("specularFaceColor"),
+                      {{ SdfPath("/UsdPreviewSurfaceParameters"),
+                         TfToken("specularFaceColorOut") }} },
+                    { TfToken("specularEdgeColor"),
+                      {{ SdfPath("/UsdPreviewSurfaceParameters"),
+                         TfToken("specularEdgeColorOut") }} },
+                    { TfToken("specularRoughness"),
+                      {{ SdfPath("/UsdPreviewSurfaceParameters"),
+                         TfToken("specularRoughnessOut") }} },
+                    { TfToken("presence"),
+                      {{ SdfPath("/Primvar_displayOpacity"),
+                         TfToken("resultF") }} },
+                },
+            },
+        },
+    };
+
+    const std::map<TfToken, HdMaterialConnection2> terminals = {
+        { TfToken("surface"),
+          HdMaterialConnection2 {
+            SdfPath("/PxrSurface"),
+            TfToken("outputName") }
+        },
+    };
+
+    const TfTokenVector primvars = {
+        TfToken("displayColor"),
+        TfToken("displayMetallic"),
+        TfToken("displayOpacity"),
+        TfToken("displayRoughness"),
+    };
+
+    return HdMaterialNetwork2{nodes, terminals, primvars};
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
diff --git a/third_party/renderman-26/plugin/hdPrman/material.h b/third_party/renderman-26/plugin/hdPrman/material.h
new file mode 100644
index 0000000000..df58857fd1
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/material.h
@@ -0,0 +1,92 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/material.h"
+#include "Riley.h"
+#include <mutex>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdSceneDelegate;
+class HdPrman_RenderParam;
+
+/// \class HdPrmanMaterial
+///
+/// A representation for materials (including displacement) in prman.
+///
+class HdPrmanMaterial final : public HdMaterial 
+{
+public:
+    HdPrmanMaterial(SdfPath const& id);
+    ~HdPrmanMaterial() override;
+
+    /// Synchronizes state from the delegate to this object.
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam   *renderParam,
+              HdDirtyBits     *dirtyBits) override;
+    
+    /// Returns the minimal set of dirty bits to place in the
+    /// change tracker for use in the first sync of this prim.
+    /// Typically this would be all dirty bits.
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+    riley::MaterialId GetMaterialId() const { return _materialId; }
+    riley::DisplacementId GetDisplacementId() const { return _displacementId; }
+
+    /// Return true if this material is valid.
+    bool IsValid() const;
+
+    void Finalize(HdRenderParam *renderParam) override;
+
+    /// Return the static list of tokens supported.
+    static TfTokenVector const& GetShaderSourceTypes();
+
+    /// Return the material network after filtering.
+    HdMaterialNetwork2 const& GetMaterialNetwork() const;
+
+    /// Make sure this material has been updated in Riley.
+    void SyncToRiley(
+        HdSceneDelegate *sceneDelegate,
+        riley::Riley *riley);
+
+private:
+    void _ResetMaterialWithLock(riley::Riley *riley);
+    void _SyncToRileyWithLock(
+        HdSceneDelegate *sceneDelegate,
+        riley::Riley *riley);
+
+    riley::MaterialId _materialId;
+    riley::DisplacementId _displacementId;
+
+    // XXX only used to set disp bound for UsdPreviewMaterial cases
+    HdMaterialNetwork2 _materialNetwork;
+
+    mutable std::mutex _syncToRileyMutex;
+    bool _rileyIsInSync;
+};
+
+/// Helper function for converting an HdMaterialNetwork into Riley shading
+/// nodes. Lights and light filters, in addition to materials, need to be able
+/// to perform this conversion.
+bool
+HdPrman_ConvertHdMaterialNetwork2ToRmanNodes(
+    HdMaterialNetwork2 const& network,
+    SdfPath const& nodePath,
+    std::vector<riley::ShadingNode> *result);
+
+/// Return the fallback surface material network description.  This network
+/// is meant to resemble Storm's fallback material.  It uses displayColor,
+/// displayRoughness, displayOpacity, and displayMetallic.
+HdMaterialNetwork2
+HdPrmanMaterial_GetFallbackSurfaceMaterialNetwork();
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_H
diff --git a/third_party/renderman-26/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..60d003e11d
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.cpp
@@ -0,0 +1,66 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/materialPrimvarTransferSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hdsi/materialPrimvarTransferSceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_MaterialPrimvarTransferSceneIndexPlugin"))
+);
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registrations
+////////////////////////////////////////////////////////////////////////////////
+
+static const char * const _rendererDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_MaterialPrimvarTransferSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // Should be chained *after* the extComputationPrimvarPruningSceneIndex and
+    // procedural expansion.
+    // Avoiding an additional dependency on hdGp in hdPrman and hardcoding it
+    // for now.
+    const HdSceneIndexPluginRegistry::InsertionPhase
+        insertionPhase = 3; // HdGpSceneIndexPlugin()::GetInsertionPhase() + 1;
+
+    // Register the plugins conditionally.
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _rendererDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr, // no argument data necessary
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index Implementations
+////////////////////////////////////////////////////////////////////////////////
+
+HdPrman_MaterialPrimvarTransferSceneIndexPlugin::
+HdPrman_MaterialPrimvarTransferSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_MaterialPrimvarTransferSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    TF_UNUSED(inputArgs);
+    return HdsiMaterialPrimvarTransferSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.h
new file mode 100644
index 0000000000..19de2f05f5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/materialPrimvarTransferSceneIndexPlugin.h
@@ -0,0 +1,35 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_MaterialPrimvarTransferSceneIndexPlugin
+///
+/// Prman scene index plugin that transfers primvars/attributes
+/// from materials to the geometry that binds the material.
+///
+class HdPrman_MaterialPrimvarTransferSceneIndexPlugin :
+    public HdSceneIndexPlugin
+{
+public:
+    HdPrman_MaterialPrimvarTransferSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATERIAL_PRIMVAR_TRANSFER_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/matfiltConvertPreviewMaterial.cpp b/third_party/renderman-26/plugin/hdPrman/matfiltConvertPreviewMaterial.cpp
new file mode 100644
index 0000000000..9be573c89f
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/matfiltConvertPreviewMaterial.cpp
@@ -0,0 +1,468 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/matfiltConvertPreviewMaterial.h"
+#include "hdPrman/debugCodes.h"
+#include "pxr/usd/sdf/types.h"
+#include "pxr/base/arch/library.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/imaging/hd/materialNetwork2Interface.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+
+#include "pxr/usd/ar/resolver.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// Tokens for converting UsdPreviewSurface
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+
+    // Usd preview shading node types
+    (UsdPreviewSurface)
+    (UsdUVTexture)
+    (UsdTransform2d)
+    (UsdPrimvarReader_float)
+    (UsdPrimvarReader_float2)
+    (UsdPrimvarReader_float3)
+
+    // UsdPreviewSurface tokens
+    (displacement)
+    (file)
+    (normal)
+    (opacityThreshold)
+
+    // UsdPreviewSurface conversion to Pxr nodes
+    (PxrDisplace)
+    (PxrSurface)
+
+    // Usd preview shading nodes osl tokens
+    (UsdPreviewSurfaceParameters)
+    (bumpNormal)
+    (bumpNormalOut)
+    (clearcoatEdgeColor)
+    (clearcoatEdgeColorOut)
+    (clearcoatFaceColor)
+    (clearcoatFaceColorOut)
+    (clearcoatRoughness)
+    (clearcoatRoughnessOut)
+    (diffuseGain)
+    (diffuseGainOut)
+    (diffuseColor)
+    (diffuseColorOut)
+    (dispAmount)
+    (dispAmountOut)
+    (dispScalar)
+    (dispScalarOut)
+    (glassIor)
+    (glassIorOut)
+    (glowGain)
+    (glowGainOut)
+    (glowColor)
+    (glowColorOut)
+    (normalIn)
+    (refractionGain)
+    (refractionGainOut)
+    (specularEdgeColor)
+    (specularEdgeColorOut)
+    (specularFaceColor)
+    (specularFaceColorOut)
+    (specularIor)
+    (specularIorOut)
+    (specularModelType)
+    (specularRoughness)
+    (specularRoughnessOut)
+    (presence)
+    (presenceOut)
+
+    // UsdUVTexture parameters
+    (st)
+    (wrapS)
+    (wrapT)
+    (useMetadata)
+    (sourceColorSpace)
+    (sRGB)
+    (raw)
+    ((colorSpaceAuto, "auto")) 
+
+    // UsdTransform2d parameters
+    (in)
+    (scale)
+    (translation)
+    (result)
+
+    // Dummy node used to express material primvar opinions
+    (PrimvarPass)
+
+    // Primvars set by the material
+    ((displacementBoundSphere, "displacementbound:sphere"))
+
+    // Doublesided PxrSurface parameters
+    (diffuseDoubleSided)
+    (specularDoubleSided)
+    (roughSpecularDoubleSided)
+    (clearcoatDoubleSided)
+);
+
+// Returns a sibling path to nodeName.
+// e.g.: /path/to/foo with suffix _bar would return /path/to/foo_bar
+static TfToken
+_GetSiblingNodeName(std::string const &nodeName, std::string const &suffix)
+{
+    SdfPath nodePath = SdfPath(nodeName);
+    std::string siblingName = nodePath.GetName() + suffix;
+    return
+        nodePath.GetParentPath().AppendChild(TfToken(siblingName)).GetAsToken();
+}
+
+static bool
+_GetParameter(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &nodeName,
+    TfToken const &paramName,
+    VtValue *v)
+{
+    if (!TF_VERIFY(v)) {
+        return false;
+    }
+    *v = netInterface->GetNodeParameterValue(nodeName, paramName);
+    return !v->IsEmpty();
+}
+
+static bool
+_GetInputConnection(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &nodeName,
+    TfToken const &inputName,
+    HdMaterialNetworkInterface::InputConnectionVector *v)
+{
+    if (!TF_VERIFY(v)) {
+        return false;
+    }
+    *v = netInterface->GetNodeInputConnection(nodeName, inputName);
+    // Just check the length of the InputConnectionVector returned.
+    // This skips validation of the upstreamNodeName in each connection.
+    return !v->empty();
+}
+
+
+void
+_ProcessPreviewSurfaceNode(
+    HdMaterialNetworkInterface *netInterface,
+    const TfToken &nodeName,
+    std::vector<std::string> *outputErrorMessages)
+{
+    TF_UNUSED(outputErrorMessages);
+
+    // Modify the node to a UsdPreviewSurfaceParameters node, which
+    // translates the params to outputs that feed a PxrSurface node.
+    netInterface->SetNodeType(nodeName, _tokens->UsdPreviewSurfaceParameters);
+    
+    // Because UsdPreviewSurfaceParameters uses "normalIn" instead of
+    // UsdPreviewSurface's "normal", adjust that here.
+    {
+        VtValue vtNormal;
+        if (_GetParameter(netInterface, nodeName, _tokens->normal, &vtNormal)) {
+            netInterface->SetNodeParameterValue(
+                nodeName, _tokens->normalIn, vtNormal);
+            netInterface->DeleteNodeParameter(nodeName, _tokens->normal);
+        }
+
+        HdMaterialNetworkInterface::InputConnectionVector cvNormal;
+        if (_GetInputConnection(
+                netInterface, nodeName, _tokens->normal, &cvNormal)) {
+            netInterface->SetNodeInputConnection(
+                nodeName, _tokens->normalIn, cvNormal);
+            netInterface->DeleteNodeInputConnection(nodeName, _tokens->normal);
+        }
+    }
+
+    // Insert a PxrSurface and connect it to the above node.
+    TfToken pxrSurfaceNodeName =
+        _GetSiblingNodeName(nodeName.GetString(), "_PxrSurface");
+    netInterface->SetNodeType(pxrSurfaceNodeName, _tokens->PxrSurface);
+    // parameters:
+    {
+        // UsdPreviewSurface uses GGX, not Beckmann
+        netInterface->SetNodeParameterValue(
+            pxrSurfaceNodeName, _tokens->specularModelType, VtValue(int(1)));
+
+        // Set up for backfacing -- the PxrSurface will always expect to shade
+        // both front- and back-facing; UsdPreviewSurfaceParams will determine 
+        // whether it's been called to shade a backface and whether it should.
+        // NB: These parameters are NOT CONNECTABLE, so cannot be switched via
+        // an output from the UsdPreviewSurfaceParameters shader!
+        netInterface->SetNodeParameterValue(
+            pxrSurfaceNodeName, _tokens->diffuseDoubleSided, VtValue(int(1))
+        );
+        netInterface->SetNodeParameterValue(
+            pxrSurfaceNodeName, _tokens->specularDoubleSided, VtValue(int(1))
+        );
+        netInterface->SetNodeParameterValue(
+            pxrSurfaceNodeName, _tokens->roughSpecularDoubleSided, VtValue(int(1))
+        );
+        netInterface->SetNodeParameterValue(
+            pxrSurfaceNodeName, _tokens->clearcoatDoubleSided, VtValue(int(1))
+        );
+
+    }
+    // connections:
+    {
+        using TfTokenPair = std::pair<TfToken, TfToken>;
+        static const std::vector<TfTokenPair> mapping = {
+            {_tokens->bumpNormal, _tokens->bumpNormalOut},
+            {_tokens->diffuseColor, _tokens->diffuseColorOut},
+            {_tokens->diffuseGain, _tokens->diffuseGainOut},
+            {_tokens->glassIor, _tokens->glassIorOut},
+            {_tokens->glowColor, _tokens->glowColorOut},
+            {_tokens->glowGain, _tokens->glowGainOut},
+            {_tokens->specularFaceColor, _tokens->specularFaceColorOut},
+            {_tokens->specularEdgeColor, _tokens->specularEdgeColorOut},
+            {_tokens->specularRoughness, _tokens->specularRoughnessOut},
+            {_tokens->specularIor, _tokens->specularIorOut},
+            {_tokens->clearcoatFaceColor, _tokens->clearcoatFaceColorOut},
+            {_tokens->clearcoatEdgeColor, _tokens->clearcoatEdgeColorOut},
+            {_tokens->clearcoatRoughness, _tokens->clearcoatRoughnessOut},
+            {_tokens->presence, _tokens->presenceOut}
+        };
+
+        for (const auto &inOutPair : mapping) {
+            netInterface->SetNodeInputConnection(
+                pxrSurfaceNodeName, inOutPair.first,
+                {{nodeName, inOutPair.second}});
+        }
+
+        // If opacityThreshold is > 0, do *not* use refraction.
+        VtValue vtOpThres;
+        if (_GetParameter(
+                netInterface, nodeName, _tokens->opacityThreshold,
+                &vtOpThres)) {
+
+            if (vtOpThres.Get<float>() <= 0.0f) {
+                netInterface->SetNodeInputConnection(
+                    pxrSurfaceNodeName, _tokens->refractionGain,
+                    {{nodeName, _tokens->refractionGainOut}});
+            }
+        }
+    }
+
+    // Check for non-zero displacement param or connection
+    TfToken pxrDispNodeName;
+    bool displacement = false;
+    {
+        VtValue vtDisp;
+        if (_GetParameter(
+                netInterface, nodeName, _tokens->displacement, &vtDisp)) {
+            if (vtDisp.Get<float>() != 0.0f) {
+                displacement = true;
+            }
+        }
+        if (!displacement) {
+            const auto connections = netInterface->GetNodeInputConnection(
+                                        nodeName, _tokens->displacement);
+            // Note that we don't validate the connection entries themselves.
+            displacement = !connections.empty();
+        }
+    }
+    // Need additional node, PxrDisplace, for displacement
+    if (displacement) {
+        pxrDispNodeName =
+            _GetSiblingNodeName(nodeName.GetString(), "_PxrDisplace");
+        netInterface->SetNodeType(pxrDispNodeName, _tokens->PxrDisplace);
+        // No parameters, only connections
+        netInterface->SetNodeInputConnection(
+            pxrDispNodeName, _tokens->dispAmount,
+            {{nodeName, _tokens->dispAmountOut}});
+        netInterface->SetNodeInputConnection(
+            pxrDispNodeName, _tokens->dispScalar,
+            {{nodeName, _tokens->dispScalarOut}});
+    }
+
+    // One additional "dummy" node to author primvar opinions on the
+    // material to be passed to the gprim.
+    TfToken primvarPassNodeName =
+        _GetSiblingNodeName(nodeName.GetString(), "_PrimvarPass");
+    netInterface->SetNodeType(primvarPassNodeName, _tokens->PrimvarPass);
+    // Parameters (no connections):
+    // We wish to always set this primvar on meshes using 
+    // UsdPreviewSurface, regardless of the material's displacement value.
+    // The primvar should have no effect if there is no displacement on the
+    // material, and we currently do not have the capabilities to efficiently
+    // resync the mesh if the value of its UsdPreviewSurface's 
+    // displacement input changes.
+    netInterface->SetNodeParameterValue(
+        primvarPassNodeName, _tokens->displacementBoundSphere, VtValue(1.f));
+
+    // XXX Wire the primvarPass node so it isn't pruned during network traversal.
+    netInterface->SetNodeInputConnection(
+        pxrSurfaceNodeName, _tokens->displacementBoundSphere,
+        {{primvarPassNodeName, _tokens->displacementBoundSphere}});
+    
+    // Update network terminals to point to the PxrSurface and PxrDisplacement
+    // nodes that were added.
+    netInterface->SetTerminalConnection(HdMaterialTerminalTokens->surface,
+        {pxrSurfaceNodeName, TfToken()});
+    if (displacement) {
+        netInterface->SetTerminalConnection(
+            HdMaterialTerminalTokens->displacement,
+            {pxrDispNodeName, TfToken()});
+    } else {
+        netInterface->DeleteTerminal(HdMaterialTerminalTokens->displacement);
+    }
+}
+
+// Returns true if the given path is already a RtxPath meaning it is already
+// of the form:
+//  "rtxplugin:<>?filename=<>&wrapS=<>&wrapT=<>&sourceColorSpace=<>s"
+// This function checks if the path contains the "rtxPlugin:" prefix
+static bool
+_RtxPath(std::string path)
+{
+    const std::string pathPrefix = "rtxplugin:";
+    return path.substr(0, pathPrefix.length()) == pathPrefix;
+}
+
+// Update texture nodes that use non-native texture formats
+// to read them via a Renderman texture plugin.
+void
+_ProcessUVTextureNode(
+    HdMaterialNetworkInterface * netInterface,
+    const TfToken &nodeName,
+    std::vector<std::string> *outputErrorMessages)
+{
+    TF_UNUSED(outputErrorMessages);
+
+    bool needInvertT = false;
+    VtValue vtFile;
+    if (_GetParameter(netInterface, nodeName, _tokens->file, &vtFile) &&
+        (vtFile.IsHolding<SdfAssetPath>() || vtFile.IsHolding<std::string>())) {
+
+        std::string path = vtFile.IsHolding<SdfAssetPath>()
+            ? vtFile.Get<SdfAssetPath>().GetResolvedPath()
+            : vtFile.Get<std::string>();
+        std::string ext = ArGetResolver().GetExtension(path);
+
+        if (!ext.empty() && ext != "tex" && ext != "dds" && !_RtxPath(path)) {
+            std::string pluginName = 
+                std::string("RtxHioImage") + ARCH_LIBRARY_SUFFIX;
+            // Check for wrap mode. In Renderman, the
+            // texture asset specifies its wrap mode, so we
+            // must pass this from the shading node into the
+            // texture plugin parameters.
+            VtValue wrapSVal =
+                netInterface->GetNodeParameterValue(nodeName, _tokens->wrapS);
+            VtValue wrapTVal =
+                netInterface->GetNodeParameterValue(nodeName, _tokens->wrapT);
+            TfToken wrapS =
+                wrapSVal.GetWithDefault(_tokens->useMetadata);
+            TfToken wrapT =
+                wrapSVal.GetWithDefault(_tokens->useMetadata);  
+
+            // Check for source colorspace.
+            VtValue sourceColorSpaceVal = netInterface->GetNodeParameterValue(
+                nodeName, _tokens->sourceColorSpace);
+            // XXX: This is a workaround for Presto. If there's no
+            // colorspace token, check if there's a colorspace
+            // string.
+            TfToken sourceColorSpace = 
+                sourceColorSpaceVal.GetWithDefault(TfToken());
+            if (sourceColorSpace.IsEmpty()) {
+                const std::string sourceColorSpaceStr = 
+                    sourceColorSpaceVal.GetWithDefault(
+                        _tokens->colorSpaceAuto.GetString());
+                sourceColorSpace = TfToken(sourceColorSpaceStr);
+            }
+            path =
+                TfStringPrintf("rtxplugin:%s?filename=%s"
+                                "&wrapS=%s&wrapT=%s&"
+                                "sourceColorSpace=%s",
+                                pluginName.c_str(), path.c_str(),
+                                wrapS.GetText(), wrapT.GetText(),
+                                sourceColorSpace.GetText());
+
+            netInterface->SetNodeParameterValue(
+                nodeName, _tokens->file, VtValue(path));
+
+        } else if (ext == "tex") {
+            // USD Preview Materials use a texture coordinate
+            // convention where (0,0) is in the bottom-left;
+            // RenderMan's texture system uses a convention
+            // where (0,0) is in the top-left.
+            needInvertT = true;
+        }
+        TF_DEBUG(HDPRMAN_IMAGE_ASSET_RESOLVE)
+            .Msg("Resolved preview material asset path: %s\n",
+                    path.c_str());
+    } // handle 'file' parameter
+
+    HdMaterialNetworkInterface::InputConnectionVector cvSt;
+    if (needInvertT &&
+        _GetInputConnection(netInterface, nodeName, _tokens->st, &cvSt)) {
+
+        // Invert the T axis by splicing in a UsdTransform2d node.
+        TfToken transform2dNodeName =
+            _GetSiblingNodeName(nodeName.GetString(), "_InvertT");
+        
+        // Add new node.
+        netInterface->SetNodeType(
+            transform2dNodeName, _tokens->UsdTransform2d);
+
+        // parameters:
+        netInterface->SetNodeParameterValue(transform2dNodeName,
+            _tokens->scale, VtValue(GfVec2f(1.0f, -1.0f)));
+        netInterface->SetNodeParameterValue(transform2dNodeName,
+            _tokens->translation, VtValue(GfVec2f(0.0f, 1.0f)));
+
+        // connections:
+        netInterface->SetNodeInputConnection(
+            transform2dNodeName, _tokens->in, cvSt);
+        
+        // Splice it into UsdUvTexture, replacing the existing
+        // connection.
+        netInterface->SetNodeInputConnection(nodeName, _tokens->st,
+            {{ transform2dNodeName, _tokens->result }});
+    }
+}
+
+void
+MatfiltConvertPreviewMaterial(
+    HdMaterialNetworkInterface *netInterface,
+    std::vector<std::string> *outputErrorMessages)
+{
+    if (!netInterface) {
+        return;
+    }
+
+    TfTokenVector nodeNames = netInterface->GetNodeNames();
+    if(nodeNames.size() > 1) {
+        std::unordered_set<TfToken, TfHash> nameSet;
+        nameSet.insert(nodeNames.cbegin(), nodeNames.cend());
+        nodeNames.clear();
+        nodeNames.insert(nodeNames.end(), nameSet.cbegin(), nameSet.cend());
+    }
+
+    bool foundPreviewSurface = false;
+
+    for (TfToken const &nodeName : nodeNames) {
+        const TfToken nodeType = netInterface->GetNodeType(nodeName);
+    
+        if (nodeType == _tokens->UsdPreviewSurface) {
+            if (foundPreviewSurface) {
+                outputErrorMessages->push_back(TfStringPrintf(
+                    "Found multiple UsdPreviewSurface nodes in <%s>",
+                    netInterface->GetMaterialPrimPath().GetText()));
+                continue;
+            }
+            foundPreviewSurface = true;
+            _ProcessPreviewSurfaceNode(
+                netInterface, nodeName, outputErrorMessages);
+
+        } else if (nodeType == _tokens->UsdUVTexture) {
+            _ProcessUVTextureNode(netInterface, nodeName, outputErrorMessages);
+        }
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/matfiltConvertPreviewMaterial.h b/third_party/renderman-26/plugin/hdPrman/matfiltConvertPreviewMaterial.h
new file mode 100644
index 0000000000..6c1d5b940d
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/matfiltConvertPreviewMaterial.h
@@ -0,0 +1,26 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_CONVERT_PREVIEW_MATERIAL_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_CONVERT_PREVIEW_MATERIAL_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/material.h"
+#include "pxr/imaging/hd/materialNetworkInterface.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdMaterialNetworkInterface;
+
+/// Converts USD preview shading nodes to Renderman equivalents.
+void
+MatfiltConvertPreviewMaterial(
+    HdMaterialNetworkInterface *networkInterface,
+    std::vector<std::string> *outputErrorMessages);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_CONVERT_PREVIEW_MATERIAL_H
diff --git a/third_party/renderman-26/plugin/hdPrman/matfiltMaterialX.cpp b/third_party/renderman-26/plugin/hdPrman/matfiltMaterialX.cpp
new file mode 100644
index 0000000000..7438a781ba
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/matfiltMaterialX.cpp
@@ -0,0 +1,974 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/matfiltMaterialX.h"
+#include "hdPrman/debugCodes.h"
+
+#include "pxr/base/arch/hash.h"
+#include "pxr/base/arch/library.h"
+#include "pxr/base/arch/fileSystem.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/base/gf/matrix3d.h"
+#include "pxr/base/gf/matrix4d.h"
+
+#include "pxr/usd/ar/resolver.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/usd/sdr/registry.h"
+
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/materialNetwork2Interface.h"
+#include "pxr/imaging/hdMtlx/hdMtlx.h"
+
+#include <MaterialXCore/Node.h>
+#include <MaterialXCore/Document.h>
+#include <MaterialXFormat/Util.h>
+#include <MaterialXFormat/XmlIo.h>
+#include <MaterialXGenShader/Shader.h>
+#include <MaterialXGenShader/Util.h>
+#include <MaterialXGenOsl/OslShaderGenerator.h>
+#include <MaterialXRender/Util.h>
+
+#ifdef PXR_OSL_SUPPORT_ENABLED
+#include <OSL/oslcomp.h>
+#include <OSL/oslversion.h>
+#include <fstream>
+#endif
+
+#include <mutex>
+
+namespace mx = MaterialX;
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (mtlx)
+
+    // Hydra MaterialX Node Types
+    (ND_standard_surface_surfaceshader)
+    (ND_UsdPreviewSurface_surfaceshader)
+    (ND_displacement_float)
+    (ND_image_vector2)
+    (ND_image_vector3)
+    (ND_image_vector4)
+
+    // MaterialX - OSL Adapter Node names
+    ((SS_Adapter, "StandardSurfaceParameters"))
+    ((USD_Adapter, "UsdPreviewSurfaceParameters"))
+    ((Displacement_Adapter, "DisplacementParameters"))
+
+    // HdPrman Terminal Nodes
+    (PxrSurface)
+    (PxrDisplace)
+
+    // Texture Coordinate Tokens
+    (ND_geompropvalue_vector2)
+    (ND_remap_vector2)
+    (texcoord)
+    (geomprop)
+    (geompropvalue)
+    (in)
+    (inhigh)
+    (inlow)
+    (remap)
+    (vector2)
+    (float2)
+    ((string_type, "string"))
+
+    // Hydra SourceTypes
+    (OSL)       // Adapter Node
+    (RmanCpp)   // PxrSurface Node
+
+    // MaterialX Texture Node input and type
+    (file)
+    (filename)
+
+    // Wrap Modes
+    (black)
+    (clamp)
+    (repeat)
+    (uaddressmode)
+    (vaddressmode)
+
+    // Color Space
+    ((cs_raw, "raw"))
+    ((cs_auto, "auto"))
+    ((cs_srgb, "sRGB"))
+    ((mtlx_srgb, "srgb_texture"))
+);
+
+static bool
+_FindGraphAndNodeByName(
+    mx::DocumentPtr const &mxDoc,
+    std::string const &mxNodeGraphName,
+    std::string const &mxNodeName,
+    mx::NodeGraphPtr * mxNodeGraph,
+    mx::NodePtr * mxNode)
+{
+    // Graph names are uniquified with mxDoc->createValidChildName in hdMtlx,
+    // so attempting to get the graph by the expected name may fail.
+    // Go to some extra effort to find the graph that contains the named node.
+
+    *mxNodeGraph = mxDoc->getNodeGraph(mxNodeGraphName);
+
+    if(*mxNodeGraph) {
+        *mxNode = (*mxNodeGraph)->getNode(mxNodeName);
+    }
+    if(!*mxNode) {
+        std::vector<mx::NodeGraphPtr> graphs = mxDoc->getNodeGraphs();
+        // first try last graph
+        if(graphs.size()) {
+            *mxNode =
+                (*(graphs.rbegin()))->getNode(mxNodeName);
+            if(*mxNode) {
+                *mxNodeGraph = *graphs.rbegin();
+            }
+        }
+        // Sometimes the above approach fails, so go looking
+        // through all the graph nodes for the texture
+        if(!*mxNode) {
+            for(auto graph : graphs) {
+                *mxNode = graph->getNode(mxNodeName);
+                if(*mxNode) {
+                    *mxNodeGraph = graph;
+                    break;
+                }
+            }
+        }
+    }
+    return (*mxNode != nullptr);
+}
+
+// Use the given mxDocument to generate osl source code for the node from the 
+// nodeGraph with the given names.
+static std::string
+_GenMaterialXShaderCode(
+    mx::DocumentPtr const &mxDoc,
+    mx::FileSearchPath const &searchPath,
+    std::string const &shaderName,
+    std::string const &mxNodeName,
+    std::string const &mxNodeGraphName)
+{
+    // Initialize the Context for shaderGen
+    mx::GenContext mxContext = mx::OslShaderGenerator::create();
+#if MATERIALX_MAJOR_VERSION == 1 && MATERIALX_MINOR_VERSION == 38 && MATERIALX_BUILD_VERSION == 3
+    mxContext.registerSourceCodeSearchPath(searchPath);
+#else
+    // Starting from MaterialX 1.38.4 at PR 877, we must remove the "libraries" part:
+    mx::FileSearchPath libSearchPaths;
+    for (const mx::FilePath &path : searchPath) {
+        if (path.getBaseName() == "libraries") {
+            libSearchPaths.append(path.getParentPath());
+        }
+        else {
+            libSearchPaths.append(path);
+        }
+    }
+    mxContext.registerSourceCodeSearchPath(libSearchPaths);
+#endif
+    mxContext.getOptions().fileTextureVerticalFlip = false;
+
+    // Get the Node from the Nodegraph/mxDoc 
+    mx::NodeGraphPtr mxNodeGraph;
+    mx::NodePtr mxNode;
+
+    _FindGraphAndNodeByName(mxDoc,
+                            mxNodeGraphName,
+                            mxNodeName,
+                            &mxNodeGraph,
+                            &mxNode);
+
+    if(!mxNodeGraph) {
+        TF_WARN("NodeGraph '%s' not found in the mxDoc.",
+                mxNodeGraphName.c_str());
+         return mx::EMPTY_STRING;
+   }
+
+    if (!mxNode) {
+        TF_WARN("Node '%s' not found in '%s' nodeGraph.",
+                mxNodeName.c_str(), mxNodeGraphName.c_str());
+        return mx::EMPTY_STRING;
+    }
+
+    // Generate the OslShader for the Node
+    TF_DEBUG(HDPRMAN_MATERIALS)
+        .Msg("Generate a MaterialX Osl shader for '%s' node.\n", 
+             mxNodeName.c_str());
+    mx::ShaderPtr mxShader;
+    try {
+        mxShader = mx::createShader(shaderName, mxContext, mxNode);
+    } catch (mx::Exception& exception) {
+        TF_WARN("Unable to create Osl Shader for node '%s'.\nMxException: %s", 
+                mxNodeName.c_str(), exception.what());
+        return mx::EMPTY_STRING;
+    }
+    if (!mxShader) {
+        TF_WARN("Unable to create Osl Shader for node '%s'.", 
+                mxNodeName.c_str());
+        return mx::EMPTY_STRING;
+    }
+    return mxShader->getSourceCode();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Helpers to update the material network for HdPrman 
+
+// Convert the MaterialX SurfaceShader Token to the MaterialX Adapter Node Type
+static TfToken
+_GetAdapterNodeType(TfToken const &hdNodeType)
+{
+    if (hdNodeType == _tokens->ND_standard_surface_surfaceshader) {
+        return _tokens->SS_Adapter;
+    } 
+    else if (hdNodeType == _tokens->ND_UsdPreviewSurface_surfaceshader) {
+        return _tokens->USD_Adapter;
+    } 
+    else if (hdNodeType == _tokens->ND_displacement_float) {
+        return _tokens->Displacement_Adapter;
+    }
+    else {
+        TF_WARN("Unsupported Node Type '%s'", hdNodeType.GetText());
+        return TfToken();
+    }
+}
+
+// Convert terminal MaterialX shader type to corresponding rman material type.
+static TfToken
+_GetTerminalShaderType(TfToken const &hdNodeType)
+{
+    return (hdNodeType == _tokens->ND_displacement_float) ?
+            _tokens->PxrDisplace : _tokens->PxrSurface;    
+}
+
+// Convert terminal MaterialX shader type to corresponding connection name
+static TfToken
+_GetTerminalConnectionName(TfToken const &hdNodeType)
+{
+    return (hdNodeType == _tokens->ND_displacement_float) ?
+            HdMaterialTerminalTokens->displacement :
+            HdMaterialTerminalTokens->surface;
+}
+
+// Convert the TfToken associated with the input parameters to Adapter Nodes
+// that conflict with OSL reserved words. 
+static TfToken
+_GetUpdatedInputToken(TfToken const &currInputName)
+{
+    static const mx::StringMap conflicts = {
+    // { currInputNname , updatedInputName }
+        {"emission",    "emission_value"},
+        {"subsurface",  "subsurface_value"},
+        {"normal",      "normalIn"}};
+    auto it = conflicts.find(currInputName.GetString());
+    if (it != conflicts.end()) {
+        return TfToken(it->second);
+    }
+    return TfToken();
+}
+
+static bool
+_HasNode(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &nodeName)
+{
+    return !netInterface->GetNodeType(nodeName).IsEmpty();
+}
+
+static void 
+_GatherNodeGraphNodes(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &hdNodeName,
+    std::set<TfToken> *upstreamNodeNames,
+    std::set<TfToken> *visitedNodeNames)
+{
+     TfTokenVector cNames =
+        netInterface->GetNodeInputConnectionNames(hdNodeName);
+
+    // Traverse the upsteam connections to gather the nodeGraph nodes
+    for (TfToken const &cName : cNames) {
+        auto inputConnections =
+            netInterface->GetNodeInputConnection(hdNodeName, cName);
+
+        for (auto const &currConnection : inputConnections) {
+            TfToken const &upstreamNodeName = currConnection.upstreamNodeName;
+
+            if (!_HasNode(netInterface, upstreamNodeName)) {
+                TF_WARN("Unknown material node '%s'",
+                         upstreamNodeName.GetText());
+                continue;
+            }
+            if (visitedNodeNames->count(upstreamNodeName) > 0) {
+                continue;
+            }
+            visitedNodeNames->insert(upstreamNodeName);
+
+            // Gather the nodes uptream from the hdNode
+            _GatherNodeGraphNodes(netInterface, upstreamNodeName, 
+                                  upstreamNodeNames, visitedNodeNames);
+            upstreamNodeNames->insert(upstreamNodeName);
+        }
+    }
+}
+
+// Compile the given oslSource returning the path to the compiled oso code 
+static std::string 
+_CompileOslSource(
+    std::string const &name, 
+    std::string const &oslSource,
+    mx::FileSearchPath const &searchPaths)
+{
+#ifdef PXR_OSL_SUPPORT_ENABLED
+
+    TF_DEBUG(HDPRMAN_DUMP_MATERIALX_OSL_SHADER)
+        .Msg("--------- MaterialX Generated Shader '%s' ----------\n%s"
+             "---------------------------\n\n", name.c_str(), oslSource.c_str());
+
+    // Include the filepath to the MaterialX OSL directory containing mx_funcs.h
+    std::vector<std::string> oslArgs;
+    oslArgs.reserve(searchPaths.size());
+#if MATERIALX_MAJOR_VERSION == 1 && \
+    MATERIALX_MINOR_VERSION == 38 && \
+    MATERIALX_BUILD_VERSION == 3
+    static const mx::FilePath stdlibOslPath = "stdlib/osl";
+#else 
+    // MaterialX v1.38.4 restructured the OSL files and moved mx_funcs.h
+    static const mx::FilePath stdlibOslPath = "stdlib/genosl/include"; 
+#endif
+    for (mx::FilePath const &path : searchPaths) {
+        const mx::FilePath fullPath = path/stdlibOslPath;
+        oslArgs.push_back(fullPath.exists() ? "-I" + fullPath.asString()
+                                            : "-I" + path.asString());
+    }
+
+#if MATERIALX_MAJOR_VERSION == 1 && \
+    MATERIALX_MINOR_VERSION == 38 && \
+    MATERIALX_BUILD_VERSION == 3
+    // Nothing
+#else
+    // MaterialX 1.38.4 removed its copy of stdosl.h and other OSL headers
+    // and requires it to be included from the OSL installation itself.
+    oslArgs.push_back(std::string("-I") + OSL_SHADER_INSTALL_DIR);
+#endif
+
+    // Compile oslSource
+    std::string oslCompiledSource;
+    OSL::OSLCompiler oslCompiler;
+    oslCompiler.compile_buffer(oslSource, oslCompiledSource, oslArgs);
+    if (oslCompiledSource.empty()) {
+        TF_WARN("Unable to compile MaterialX Osl shader for the '%s' "
+                "MaterialX node\n", name.substr(0, name.size()-6).c_str());
+        return mx::EMPTY_STRING;
+    }
+
+    // Save compiled shader
+    std::string compiledFilePath = ArchMakeTmpFileName("MX." + name, ".oso");
+    FILE *compiledShader;
+    compiledShader = fopen((compiledFilePath).c_str(), "w+");
+    if (!compiledShader) {
+        TF_WARN("Unable to save compiled MaterialX Osl shader at '%s'\n",
+                compiledFilePath.c_str());
+        return mx::EMPTY_STRING;
+    }
+    else {
+        fputs(oslCompiledSource.c_str(), compiledShader);
+        fclose(compiledShader);
+        return compiledFilePath;
+    }
+#else
+    TF_WARN("Unable to compile MaterialX generated Osl shader, enable OSL "
+            "support for full MaterialX support in HdPrman.\n");
+    return mx::EMPTY_STRING;
+#endif
+}
+
+static void
+_DeleteAllInputConnections(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &nodeName)
+{
+    TfTokenVector cNames = netInterface->GetNodeInputConnectionNames(nodeName);
+    for (const TfToken &cName : cNames) {
+        netInterface->DeleteNodeInputConnection(nodeName, cName);
+    }
+}
+
+static void
+_DeleteAllParameters(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &nodeName)
+{
+    TfTokenVector pNames =
+        netInterface->GetAuthoredNodeParameterNames(nodeName);
+    for (const TfToken &pName : pNames) {
+        netInterface->DeleteNodeParameter(nodeName, pName);
+    }
+    
+}
+
+// For each of the outputs in the nodegraph create a sdrShaderNode with the
+// compiled osl code generated by MaterialX and update the terminalNode's 
+// input connections
+// Removes the nodes that are not directly connected to the terminal node
+static void
+_UpdateNetwork(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &terminalNodeName,
+    mx::DocumentPtr const &mxDoc,
+    mx::FileSearchPath const &searchPath,
+    std::set<TfToken> nodesToKeep,
+    std::set<TfToken> nodesToRemove)
+{
+    // Gather the nodeGraph nodes
+    std::set<TfToken> visitedNodeNames;
+
+    TfTokenVector terminalConnectionNames =
+        netInterface->GetNodeInputConnectionNames(terminalNodeName);
+
+    for (TfToken const &cName : terminalConnectionNames) {
+        auto inputConnections =
+            netInterface->GetNodeInputConnection(terminalNodeName, cName);
+
+        for (auto const &currConnection : inputConnections) {
+            TfToken const &upstreamNodeName = currConnection.upstreamNodeName;
+            TfToken const &outputName = currConnection.upstreamOutputName;
+
+            if (!_HasNode(netInterface, upstreamNodeName)) {
+                TF_WARN("Unknown material node '%s'",
+                         upstreamNodeName.GetText());
+                continue;
+            }
+            bool newNode = visitedNodeNames.count(upstreamNodeName) == 0;
+            if (!newNode) {
+                // Re-using a node or node output, get the corresponding sdrNode
+                SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+                SdrShaderNodeConstPtr sdrNode = 
+                    sdrRegistry.GetShaderNodeByIdentifier(
+                        netInterface->GetNodeType(upstreamNodeName));
+
+                if(!sdrNode) {
+                    continue;
+                }
+
+                // Update the connection into the terminal node so that the
+                // output makes it into the closure
+                TfToken const &inputName = cName;
+                if (sdrNode->GetOutput(outputName)) {
+                    netInterface->SetNodeInputConnection(
+                        terminalNodeName,
+                        inputName,
+                        { {upstreamNodeName, outputName} });
+                }
+                else {
+                    TF_WARN("Output '%s' not found on node '%s'.",
+                            outputName.GetText(), upstreamNodeName.GetText());
+                }
+                continue;
+            }
+            
+            visitedNodeNames.insert(upstreamNodeName);
+            // Collect nodes further removed from the terminal in nodesToRemove
+            std::set<TfToken> tmpVisitedNodeNames;
+            _GatherNodeGraphNodes(netInterface, upstreamNodeName, 
+                                  &nodesToRemove, &tmpVisitedNodeNames);
+            nodesToKeep.insert(upstreamNodeName);
+
+            // Generate the oslSource code for the connected upstream node
+            SdfPath const nodePath = SdfPath(upstreamNodeName);
+            std::string const &mxNodeName = nodePath.GetName();
+            std::string const &mxNodeGraphName =
+                nodePath.GetParentPath().GetName();
+            std::string shaderName = mxNodeName + "Shader";
+            std::string oslSource = _GenMaterialXShaderCode(
+                mxDoc, searchPath, shaderName, mxNodeName, mxNodeGraphName);
+            
+            if (oslSource.empty()) {
+                continue;
+            }
+
+            // Compile the oslSource
+            std::string compiledShaderPath = 
+                _CompileOslSource(shaderName, oslSource, searchPath);
+            if (compiledShaderPath.empty()) {
+                continue;
+            }
+
+            // Create a new SdrShaderNode with the compiled oslSource
+            SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+            SdrShaderNodeConstPtr sdrNode = 
+                sdrRegistry.GetShaderNodeFromAsset(
+                                SdfAssetPath(compiledShaderPath),
+                                NdrTokenMap(),  // metadata
+                                _tokens->mtlx,  // subId
+                                _tokens->OSL);  // sourceType
+
+            // Update node type to that of the Sdr node.
+            netInterface->SetNodeType(
+                upstreamNodeName, sdrNode->GetIdentifier());
+
+            // Update the connection into the terminal node so that the 
+            // nodegraph outputs make their way into the closure
+            if (sdrNode->GetOutput(outputName)) {
+                TfToken inputName = cName;
+                TfToken updatedInputName = _GetUpdatedInputToken(inputName);
+                bool deletePreviousConnection = false;
+                if (updatedInputName != TfToken()) {
+                    inputName = updatedInputName;
+                    deletePreviousConnection = true;
+                }
+                netInterface->SetNodeInputConnection(
+                    terminalNodeName, inputName,
+                    { {upstreamNodeName, outputName} });
+                if (deletePreviousConnection) {
+                    netInterface->DeleteNodeInputConnection(
+                        terminalNodeName, cName);
+                }
+            }
+            _DeleteAllInputConnections(netInterface, upstreamNodeName);
+            _DeleteAllParameters(netInterface, upstreamNodeName);
+        }
+    }
+}
+
+// Transform the original terminalNode with an Adapter Node which connects to a
+// new PxrSurface or PxrDisplace Node that becomes the surfaceTerminal
+// node in the hdNetwork.
+static void 
+_TransformTerminalNode(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &terminalNodeName)
+{
+    // Create a SdrShaderNode for the Adapter and PxrSurface/PxrDisplace Nodes.
+    TfToken const nodeType = netInterface->GetNodeType(terminalNodeName);
+    TfToken const adapterType = _GetAdapterNodeType( nodeType );
+    TfToken const shaderType = _GetTerminalShaderType( nodeType );
+    TfToken const terminalToken = _GetTerminalConnectionName( nodeType );
+
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+    SdrShaderNodeConstPtr const sdrAdapter = 
+        sdrRegistry.GetShaderNodeByIdentifier(adapterType, {_tokens->OSL});
+    SdrShaderNodeConstPtr const sdrShader = 
+        sdrRegistry.GetShaderNodeByIdentifier(shaderType,
+                                              {_tokens->RmanCpp});
+    if (!sdrAdapter) {
+        TF_WARN("No sdrAdater node of type '%s'", adapterType.GetText());
+        return;
+    }
+
+    // Transform the terminalNode with the appropriate Adapter Node, which
+    // translates the MaterialX parameters into PxrSurface/PxrDisplace inputs.
+    netInterface->SetNodeType(terminalNodeName, adapterType);
+
+    // Update the TfTokens associated with the Adapter Node's input parameters
+    // that conflict with OSL reserved words. 
+    // The corresponding input connection is updated in _UpdateNetwork()
+    TfTokenVector pNames =
+        netInterface->GetAuthoredNodeParameterNames(terminalNodeName);
+    for (TfToken const &pName : pNames) {
+        const TfToken updatedName = _GetUpdatedInputToken(pName);
+        if (!updatedName.IsEmpty()) {
+            const VtValue val = netInterface->GetNodeParameterValue(
+                terminalNodeName, pName);
+            netInterface->SetNodeParameterValue(
+                terminalNodeName, updatedName, val);
+            netInterface->DeleteNodeParameter(terminalNodeName, pName);
+        }
+    }
+    
+    // Create a RenderMan material node (ie. PxrSurface or PxrDisplace)
+    TfToken rmanShaderNodeName =
+        TfToken(terminalNodeName.GetString() + "_" + shaderType.GetString());
+    netInterface->SetNodeType(rmanShaderNodeName, shaderType);
+
+    // Connect the RenderMan material inputs to the Adapter's outputs
+    for (const auto& inParamName: sdrShader->GetInputNames()) {
+
+        if (sdrShader->GetShaderInput(inParamName)) {
+
+            // Convert the parameter name to the "xxxOut" format
+            TfToken adapterOutParam = TfToken(inParamName.GetString() + "Out");
+            
+            // If the shader Input is an Adapter node output add the
+            // inputConnection to the shader Node
+            // Note: not every input has a corresponding output
+            if (sdrAdapter->GetShaderOutput(adapterOutParam)) {
+                netInterface->SetNodeInputConnection(
+                    rmanShaderNodeName, inParamName, 
+                    { {terminalNodeName, adapterOutParam} });
+            }
+        }
+    }
+
+    // Update the network terminals so that the terminal Node is the RenderMan
+    // Node instead of the Adapter Node (previously the mtlx terminal node)
+    netInterface->SetTerminalConnection(
+        terminalToken, { rmanShaderNodeName, TfToken() });
+}
+
+// Get the Hydra equivalent for the given MaterialX input value
+static TfToken
+_GetHdWrapString(
+    TfToken const &hdTextureNodeName,
+    std::string const &mxInputValue)
+{
+    if (mxInputValue == "constant") {
+        TF_WARN("RtxHioImagePlugin: Texture '%s' has unsupported wrap mode "
+            "'constant' using 'black' instead.", hdTextureNodeName.GetText());
+        return _tokens->black;
+    }
+    if (mxInputValue == "clamp") {
+        return _tokens->clamp;
+    }
+    if (mxInputValue == "mirror") {
+        TF_WARN("RtxHioImagePlugin: Texture '%s' has unsupported wrap mode "
+            "'mirror' using 'repeat' instead.", hdTextureNodeName.GetText());
+        return _tokens->repeat;
+    }
+    return _tokens->repeat;
+}
+      
+static void
+_GetWrapModes(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &hdTextureNodeName,
+    TfToken *uWrap,
+    TfToken *vWrap)
+{
+    // For <tiledimage> nodes want to always use "repeat"
+    *uWrap = _tokens->repeat;
+    *vWrap = _tokens->repeat;
+
+    // For <image> nodes:
+    VtValue vUAddrMode = netInterface->GetNodeParameterValue(
+                                    hdTextureNodeName, _tokens->uaddressmode);
+    if (!vUAddrMode.IsEmpty()) {
+        *uWrap = _GetHdWrapString(hdTextureNodeName, 
+                                  vUAddrMode.UncheckedGet<std::string>());
+    }
+    VtValue vVAddrMode = netInterface->GetNodeParameterValue(
+                                    hdTextureNodeName, _tokens->vaddressmode);
+    if (!vVAddrMode.IsEmpty()) {
+        *vWrap = _GetHdWrapString(hdTextureNodeName, 
+                                  vVAddrMode.UncheckedGet<std::string>());
+    }
+}
+
+static TfToken
+_GetColorSpace(
+    HdMaterialNetworkInterface *netInterface,
+    TfToken const &hdTextureNodeName,
+    HdMaterialNetworkInterface::NodeParamData paramData)
+{
+    const TfToken nodeType = netInterface->GetNodeType(hdTextureNodeName);
+    if (nodeType == _tokens->ND_image_vector2 ||
+        nodeType == _tokens->ND_image_vector3 ||
+        nodeType == _tokens->ND_image_vector4 ) {
+        // For images not used as color use "raw" (eg. normal maps)
+        return _tokens->cs_raw;
+    } else {
+        if (paramData.colorSpace == _tokens->mtlx_srgb) {
+            return _tokens->cs_srgb;
+        } else {
+            return _tokens->cs_auto;
+        }
+    }
+}
+
+static void 
+_UpdateTextureNodes(
+    HdMaterialNetworkInterface *netInterface,
+    std::set<SdfPath> const &hdTextureNodePaths,
+    mx::DocumentPtr const &mxDoc)
+{
+    for (SdfPath const &texturePath : hdTextureNodePaths) {
+        TfToken const &textureNodeName = texturePath.GetToken();
+        const TfToken nodeType = netInterface->GetNodeType(textureNodeName);
+        if (nodeType.IsEmpty()) {
+            TF_WARN("Connot find texture node '%s' in material network.",
+                    textureNodeName.GetText());
+            continue;
+        }
+        
+        HdMaterialNetworkInterface::NodeParamData fileParamData =
+            netInterface->GetNodeParameterData(textureNodeName, _tokens->file);
+        const VtValue vFile = fileParamData.value;
+        if (vFile.IsEmpty()) {
+            TF_WARN("File path missing for texture node '%s'.",
+                    textureNodeName.GetText());
+            continue;
+        }
+
+        if (vFile.IsHolding<SdfAssetPath>()) {
+            std::string path = vFile.Get<SdfAssetPath>().GetResolvedPath();
+            std::string ext = ArGetResolver().GetExtension(path);
+
+
+            mx::NodeGraphPtr mxNodeGraph;
+            mx::NodePtr mxTextureNode;
+
+            _FindGraphAndNodeByName(mxDoc,
+                                    texturePath.GetParentPath().GetName(),
+                                    texturePath.GetName(),
+                                    &mxNodeGraph,
+                                    &mxTextureNode);
+
+            if(!mxTextureNode) {
+                continue;
+            }
+
+            // Update texture nodes that use non-native texture formats
+            // to read them via a Renderman texture plugin.
+            bool needInvertT = false;
+            if (!ext.empty() && ext != "tex") {
+
+                // Update the input value to use the Renderman texture plugin
+                const std::string pluginName = 
+                    std::string("RtxHioImage") + ARCH_LIBRARY_SUFFIX;
+
+                TfToken uWrap, vWrap;
+                _GetWrapModes(netInterface, textureNodeName, &uWrap, &vWrap);
+
+                TfToken colorSpace = 
+                    _GetColorSpace(netInterface, textureNodeName, fileParamData);
+
+                std::string const &mxInputValue = TfStringPrintf(
+                    "rtxplugin:%s?filename=%s&wrapS=%s&wrapT=%s&sourceColorSpace=%s",
+                    pluginName.c_str(), path.c_str(), uWrap.GetText(),
+                    vWrap.GetText(), colorSpace.GetText());
+                TF_DEBUG(HDPRMAN_IMAGE_ASSET_RESOLVE)
+                    .Msg("Resolved MaterialX asset path: %s\n",
+                         mxInputValue.c_str());
+
+                // Update the MaterialX Texture Node with the new mxInputValue
+                mxTextureNode->setInputValue(_tokens->file.GetText(), // name
+                                             mxInputValue,            // value
+                                             _tokens->filename.GetText());//type
+            }
+            else {
+                needInvertT = true;
+                // For tex files, update value with resolved path, because prman
+                // may not be able to find a usd relative path.
+                mxTextureNode->setInputValue(_tokens->file.GetText(), // name
+                                             path,                    // value
+                                             _tokens->filename.GetText());//type
+                TF_DEBUG(HDPRMAN_IMAGE_ASSET_RESOLVE)
+                    .Msg("Resolved MaterialX asset path: %s\n",
+                         path.c_str());
+            }
+
+            // If texcoord param isn't connected, make a default connection
+            // to a mtlx geompropvalue node.
+            mx::InputPtr texcoordInput =
+                mxTextureNode->getInput(_tokens->texcoord);
+            if(!texcoordInput) {
+                texcoordInput =
+                    mxTextureNode->addInput(_tokens->texcoord,
+                                            _tokens->vector2);
+                const std::string stNodeName =
+                    textureNodeName.GetString() + "__texcoord";
+
+                // Get the sdr node for the mxTexture node
+                SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+                const SdrShaderNodeConstPtr sdrTextureNode =
+                    sdrRegistry.GetShaderNodeByIdentifierAndType(
+                        nodeType, _tokens->mtlx);
+                // Get the primvarname from the sdrTextureNode metadata
+                auto metadata = sdrTextureNode->GetMetadata();
+                auto primvarName = metadata[SdrNodeMetadata->Primvars];
+
+                mx::NodePtr geompropNode =
+                    mxNodeGraph->addNode(_tokens->geompropvalue,
+                                         stNodeName,
+                                         _tokens->vector2);
+                geompropNode->setInputValue(_tokens->geomprop,
+                                            primvarName, _tokens->string_type);
+                texcoordInput->setConnectedNode(geompropNode);
+                geompropNode->
+                    setNodeDefString(_tokens->ND_geompropvalue_vector2);
+            }
+            if(needInvertT) {
+                texcoordInput =
+                    mxTextureNode->getInput(_tokens->texcoord);
+                if(texcoordInput) {
+                    const std::string remapNodeName =
+                        textureNodeName.GetString() + "__remap";
+                    mx::NodePtr remapNode =
+                        mxNodeGraph->addNode(_tokens->remap,
+                                             remapNodeName,
+                                             _tokens->vector2);
+                    remapNode->
+                        setNodeDefString(_tokens->ND_remap_vector2);
+                    mx::InputPtr inInput =
+                        remapNode->addInput(_tokens->in,
+                                            _tokens->vector2);
+                    const mx::FloatVec inhigh = {1,0};
+                    const mx::FloatVec inlow = {0,1};
+                    remapNode->setInputValue(_tokens->inhigh,
+                                             inhigh,
+                                             _tokens->float2);
+                    remapNode->setInputValue(_tokens->inlow,
+                                             inlow,
+                                             _tokens->float2);
+                    mx::NodePtr primvarNode =
+                        texcoordInput->getConnectedNode();
+                    inInput->setConnectedNode(primvarNode);
+                    texcoordInput->setConnectedNode(remapNode);
+                }
+            }
+        }
+    }
+}
+
+// Texcoord nodes don't work for RenderMan, so convert them
+// to geompropvalue nodes that look up the texture coordinate primvar name.
+static void
+_UpdatePrimvarNodes(
+    HdMaterialNetworkInterface *netInterface,
+    std::set<SdfPath> const &hdPrimvarNodePaths,
+    mx::DocumentPtr const &mxDoc)
+{
+    for (SdfPath const &nodePath : hdPrimvarNodePaths) {
+        TfToken const &nodeName = nodePath.GetToken();
+        std::string mxNodeName = nodePath.GetName();
+        const TfToken nodeType = netInterface->GetNodeType(nodeName);
+        if (nodeType.IsEmpty()) {
+            TF_WARN("Can't find node '%s' in material network.",
+                    nodeName.GetText());
+            continue;
+        }
+
+        mx::NodeGraphPtr mxNodeGraph;
+        mx::NodePtr mxNode;
+
+        _FindGraphAndNodeByName(mxDoc, nodePath.GetParentPath().GetName(),
+                                mxNodeName, &mxNodeGraph, &mxNode);
+
+        // Ignore nodes that aren't "texcoord" nodes
+        if (!mxNode || mxNode->getCategory() != _tokens->texcoord) {
+            continue;
+        }
+        mx::NodeDefPtr mxNodeDef = mxDoc->getNodeDef(
+            _tokens->ND_geompropvalue_vector2.GetText());
+        if (!mxNodeDef) {
+            continue;
+        }
+
+        // Get the sdr node for the texcoord node
+        SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+        const SdrShaderNodeConstPtr sdrTexcoordNode =
+            sdrRegistry.GetShaderNodeByIdentifierAndType(
+                nodeType, _tokens->mtlx);
+        // Get the primvarname from the sdrTexcoordNode metadata
+        auto metadata = sdrTexcoordNode->GetMetadata();
+        auto primvarName = metadata[SdrNodeMetadata->Primvars];
+
+        // Set the category and type of this texcoord node
+        // so that it will become a geompropvalue node
+        // that looks up the texture coordinate primvar name.
+        mxNode->setType(mxNodeDef->getType());
+        mxNode->setCategory(mxNodeDef->getNodeString());
+        mxNode->setNodeDefString(_tokens->ND_geompropvalue_vector2);
+        mxNode->setInputValue(_tokens->geomprop.GetText(),
+                              primvarName,
+                              _tokens->string_type.GetText());
+    }
+}
+
+
+void
+MatfiltMaterialX(
+    HdMaterialNetworkInterface *netInterface,
+    std::vector<std::string> *outputErrorMessages)
+{
+    if (!netInterface) {
+        return;
+    }
+
+    static const std::vector<TfToken> supportedTerminalTokens = {
+        HdMaterialTerminalTokens->surface,
+        HdMaterialTerminalTokens->displacement
+    };
+
+    std::set<TfToken> nodesToKeep;   // nodes directly connected to the terminal
+    std::set<TfToken> nodesToRemove; // nodes further removed from the terminal
+
+    for (auto terminalName : supportedTerminalTokens ) {
+
+        // Check presence of terminal
+        const HdMaterialNetworkInterface::InputConnectionResult res =
+            netInterface->GetTerminalConnection(terminalName);
+        if (!res.first) { // terminal absent
+            return;
+        }
+        const TfToken &terminalNodeName = res.second.upstreamNodeName;
+        const TfToken terminalNodeType =
+            netInterface->GetNodeType(terminalNodeName);
+
+        // Check if the node connected to the terminal is a MaterialX node
+        SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+        const SdrShaderNodeConstPtr mtlxSdrNode = 
+            sdrRegistry.GetShaderNodeByIdentifierAndType(terminalNodeType, 
+                                                         _tokens->mtlx);
+        if (!mtlxSdrNode) {
+            return;
+        }
+
+        TfTokenVector cNames =
+            netInterface->GetNodeInputConnectionNames(terminalNodeName);
+        // If we have a nodegraph (i.e., input into the terminal node)...
+        if (!cNames.empty()) {
+            // Serialize MaterialX usage to avoid crashes.
+            //
+            // XXX It may be the case that a finer-grained locking
+            //     pattern can be used here.  Starting with a coarse
+            //     lock to establish a basic level of safety.
+            //
+            static std::mutex materialXMutex;
+            std::lock_guard<std::mutex> lock(materialXMutex);
+
+            // Get Standard Libraries and SearchPaths (for mxDoc and 
+            // mxShaderGen)
+            mx::DocumentPtr stdLibraries = HdMtlxStdLibraries();
+            mx::FileSearchPath searchPath = HdMtlxSearchPaths();
+
+            // Create the MaterialX Document from the material network
+            HdMtlxTexturePrimvarData hdMtlxData;
+            mx::DocumentPtr mxDoc =
+                HdMtlxCreateMtlxDocumentFromHdMaterialNetworkInterface(
+                    netInterface, terminalNodeName, cNames,
+                    stdLibraries, &hdMtlxData);
+
+            _UpdateTextureNodes(netInterface, hdMtlxData.hdTextureNodes, mxDoc);
+            _UpdatePrimvarNodes(netInterface, hdMtlxData.hdPrimvarNodes, mxDoc);
+
+            // Remove the material and shader nodes from the MaterialX Document
+            // (since we need to use PxrSurface as the closure instead of the 
+            // MaterialX surfaceshader node)
+            SdfPath materialPath = netInterface->GetMaterialPrimPath();
+            mxDoc->removeNode("SR_" + materialPath.GetName());  // Shader Node
+            mxDoc->removeNode(materialPath.GetName());          // Material Node
+
+            // Update nodes directly connected to the terminal node with 
+            // MX generated shaders that capture the rest of the nodegraph
+            _UpdateNetwork(netInterface, terminalNodeName, mxDoc, searchPath,
+                           nodesToKeep, nodesToRemove);
+        }
+
+        // Convert the terminal node to an AdapterNode + PxrSurfaceNode
+        _TransformTerminalNode(netInterface, terminalNodeName);
+    }
+
+    // Remove the nodes not directly connected to the terminal
+    for (const TfToken& nodeName: nodesToRemove) {
+        // As long as the node is not also directly connected to the terminal
+        if (nodesToKeep.find(nodeName) == nodesToKeep.end()) {
+            netInterface->DeleteNode(nodeName);
+        }
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE                        
diff --git a/third_party/renderman-26/plugin/hdPrman/matfiltMaterialX.h b/third_party/renderman-26/plugin/hdPrman/matfiltMaterialX.h
new file mode 100644
index 0000000000..617d827d9a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/matfiltMaterialX.h
@@ -0,0 +1,31 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_MATERIALX_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_MATERIALX_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/material.h"
+#include "pxr/imaging/hd/materialNetworkInterface.h"
+#include "pxr/usd/ndr/declare.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdMaterialNetworkInterface;
+
+/// Processes MaterialX shading node graphs for RenderMan.
+/// 
+/// The terminal nodes are converted to PxrSurface, PxrDisplacement,
+/// and PxrVolume respectively, and any input graphs that use MaterialX
+/// shader code-generation are compiled and replaced with a single node.
+void
+MatfiltMaterialX(
+    HdMaterialNetworkInterface *netInterface,
+    std::vector<std::string> *outputErrorMessages);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_MATERIALX_H
diff --git a/third_party/renderman-26/plugin/hdPrman/matfiltResolveVstructs.cpp b/third_party/renderman-26/plugin/hdPrman/matfiltResolveVstructs.cpp
new file mode 100644
index 0000000000..64f142a268
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/matfiltResolveVstructs.cpp
@@ -0,0 +1,336 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/matfiltResolveVstructs.h"
+#include "hdPrman/debugCodes.h"
+
+#include <memory>
+#include <mutex>
+#include <set>
+#include <unordered_map>
+
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/usd/sdr/registry.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/imaging/hd/materialNetwork2Interface.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (vstructmemberaliases)         \
+);
+
+namespace {
+
+/// For a single vstruct placeholder input/output, this describes mappings from:
+/// 1) associated member input/output -> member name (or names via alias)
+/// 2) member name -> associated member input/output
+/// 3) associated member input/output -> parsed conditional expression
+struct _VstructInfoEntry {
+    typedef std::shared_ptr<_VstructInfoEntry> Ptr;
+
+    typedef std::unordered_map<TfToken, std::vector<TfToken>,
+            TfToken::HashFunctor> MemberMap;
+    typedef std::unordered_map<TfToken, TfToken,
+            TfToken::HashFunctor> ReverseMemberMap;
+    typedef std::unordered_map<TfToken, MatfiltVstructConditionalEvaluator::Ptr,
+            TfToken::HashFunctor> ConditionalMap;
+
+    MemberMap members;
+    ReverseMemberMap reverseMembers;
+    ConditionalMap conditionals;
+};
+
+/// For a single shader, this stores mappings from:
+/// 1) vstruct placeholder input/output -> _VstructInfoEntry
+///
+/// These are typically built once per shader type and cached as it requires
+/// interpretation of metadata which would be wasteful to do repeatedly.
+struct _ShaderInfoEntry {    
+    typedef std::shared_ptr<_ShaderInfoEntry> Ptr;
+    typedef std::map<TfToken, _VstructInfoEntry::Ptr> VstructInfoMap;
+
+    VstructInfoMap vstructs;
+
+    /// Constructs a _ShaderInfoEntry::Ptr for a single shader without caching
+    static Ptr
+    Build(const TfToken &nodeTypeId,
+          const NdrTokenVec &shaderTypePriority)
+    {
+        auto result = Ptr(new _ShaderInfoEntry);
+        if (auto sdrShader =
+                SdrRegistry::GetInstance().GetShaderNodeByIdentifier(
+                        nodeTypeId, shaderTypePriority))
+        {
+            for (const auto &inputName : sdrShader->GetInputNames()) {
+                auto sdrInput = sdrShader->GetShaderInput(inputName);
+                if (!sdrInput) {
+                    continue;
+                }
+                _ProcessProperty(result, sdrInput);
+            }
+            for (const auto &outputName : sdrShader->GetOutputNames()) {
+                auto sdrOutput = sdrShader->GetShaderOutput(outputName);
+                if (!sdrOutput) {
+                    continue;
+                }
+                _ProcessProperty(result, sdrOutput);
+            }
+
+        }
+
+        return result;
+
+    }
+
+    /// Constructs and caches a _ShaderInfoEntry::Ptr for a single shader
+    static Ptr
+    Get(const TfToken &nodeTypeId,
+        const NdrTokenVec &shaderTypePriority)
+    {
+        std::lock_guard<std::mutex> lock(_cachedEntryMutex);
+
+        auto I = _cachedEntries.find(nodeTypeId);
+        if (I == _cachedEntries.end()) {
+            auto result = Build(nodeTypeId, shaderTypePriority);
+            _cachedEntries[nodeTypeId] = result;
+            return result;
+        }
+        return (*I).second;
+    }
+
+
+private:
+    static std::unordered_map<TfToken, Ptr, TfToken::HashFunctor>
+            _cachedEntries;
+    static std::mutex _cachedEntryMutex;
+
+    static void
+    _ProcessProperty(Ptr result, SdrShaderPropertyConstPtr prop)
+    {
+        if (!prop->IsVStructMember()) {
+            return;
+        }
+
+        const TfToken &vsName = prop->GetVStructMemberOf();
+        const TfToken &vsMemberName = prop->GetVStructMemberName();
+        if (vsName.IsEmpty() || vsMemberName.IsEmpty()) {
+            return;
+        }
+
+        _VstructInfoEntry::Ptr entry;
+        auto I = result->vstructs.find(vsName);
+        if (I != result->vstructs.end()) {
+            entry = (*I).second;
+        } else {
+            entry.reset(new _VstructInfoEntry);
+            result->vstructs[vsName] = entry;
+        }
+
+        TfToken vsMemberAlias;
+
+        const auto &metadata = prop->GetMetadata();
+        {
+            auto I = metadata.find(_tokens->vstructmemberaliases);
+            if (I != metadata.end()) {
+                vsMemberAlias = TfToken((*I).second);
+            }
+        }
+
+        auto &memberNames = entry->members[prop->GetName()];
+        memberNames.push_back(vsMemberName);
+        
+        entry->reverseMembers[vsMemberName] = prop->GetName();
+
+        if (!vsMemberAlias.IsEmpty()) {
+            memberNames.push_back(vsMemberAlias);
+            entry->reverseMembers[vsMemberAlias] = prop->GetName();
+        }
+
+        const TfToken &condExpr = prop->GetVStructConditionalExpr();
+
+        if (!condExpr.IsEmpty()) {
+            entry->conditionals[prop->GetName()] =
+                    MatfiltVstructConditionalEvaluator::Parse(condExpr.data());
+        }
+    }
+};
+
+std::unordered_map<TfToken, _ShaderInfoEntry::Ptr, TfToken::HashFunctor>
+        _ShaderInfoEntry::_cachedEntries;
+
+std::mutex _ShaderInfoEntry::_cachedEntryMutex;
+
+} // anonymous namespace
+
+static void
+_ResolveVstructsForNode(
+    HdMaterialNetworkInterface *interface,
+    const TfToken &nodeId,
+    std::set<TfToken> &resolvedNodeNames,
+    const NdrTokenVec &shaderTypePriority,
+    bool enableConditions)
+{
+    if (resolvedNodeNames.find(nodeId) != resolvedNodeNames.end()) {
+        TF_DEBUG(HDPRMAN_VSTRUCTS)
+            .Msg("No resovled node name for %s\n", nodeId.data());
+        return;
+    }
+    
+    resolvedNodeNames.insert(nodeId);
+    auto shaderInfo =
+        _ShaderInfoEntry::Get(interface->GetNodeType(nodeId),
+            shaderTypePriority);
+
+    // don't do anything if the node has no vstruct definitions
+    if (shaderInfo->vstructs.empty()) {
+        TF_DEBUG(HDPRMAN_VSTRUCTS)
+            .Msg("Node %s has no vstructs\n",
+                interface->GetNodeType(nodeId).GetText());
+        return;
+    }
+
+    for (const TfToken &inputName :
+            interface->GetNodeInputConnectionNames(nodeId)) {
+
+        auto I = shaderInfo->vstructs.find(inputName);
+        if (I == shaderInfo->vstructs.end()) {
+            continue;
+        }
+        TF_DEBUG(HDPRMAN_VSTRUCTS)
+            .Msg("Found input %s with a vstruct\n", inputName.GetText());
+
+        const auto &vstructInfo = (*I).second;
+
+        HdMaterialNetworkInterface::InputConnectionVector
+            upstreamConnections =
+                interface->GetNodeInputConnection(nodeId, inputName);
+
+
+
+        if (upstreamConnections.empty()) {
+            TF_DEBUG(HDPRMAN_VSTRUCTS)
+                .Msg("Ignoring since no connection\n");
+            continue;
+        }
+        TF_DEBUG(HDPRMAN_VSTRUCTS)
+            .Msg("Found upstream vstruct connection\n");
+
+        const auto &upstreamConnection = upstreamConnections.front();
+
+        TfToken upstreamTypeId = interface->GetNodeType(
+            upstreamConnection.upstreamNodeName);
+
+        // confirm connected node exists
+        if (upstreamTypeId.IsEmpty()) {
+            continue;
+        }
+
+        // confirm connected upstream output is a vstruct
+        auto upstreamShaderInfo = _ShaderInfoEntry::Get(
+                upstreamTypeId, shaderTypePriority);
+        auto upstreamVstructI = upstreamShaderInfo->vstructs.find(
+                    upstreamConnection.upstreamOutputName);
+        if (upstreamVstructI == upstreamShaderInfo->vstructs.end()) {
+            continue;
+        }
+
+        auto upstreamVstruct = (*upstreamVstructI).second;
+
+        // ensure that all connections/conditions are expanded upstream first
+        _ResolveVstructsForNode(interface, upstreamConnection.upstreamNodeName,
+                resolvedNodeNames, shaderTypePriority, enableConditions);
+
+        // delete the placeholder connection
+        //node.inputConnections.erase(inputName);
+        interface->DeleteNodeInputConnection(nodeId, inputName);
+
+
+        for (auto &memberI : vstructInfo->members) {
+            const TfToken &memberInputName = memberI.first;
+
+            // If there's an existing connection to a member input, skip
+            // expansion as a direct connection has a stronger opinion.
+            if (!interface->GetNodeInputConnection(
+                    nodeId, memberInputName).empty()) {
+                continue;
+            }
+
+            // loop over member names (which may be > 1 due to member aliases)
+            for (const TfToken &memberName : memberI.second) {
+                auto revMemberI =
+                    upstreamVstruct->reverseMembers.find(memberName);
+
+                if (revMemberI == upstreamVstruct->reverseMembers.end()) {
+                    continue;
+                }
+                const TfToken &upstreamMemberOutputName = (*revMemberI).second;
+                
+                // check for condition, otherwise connect
+                auto condI = upstreamVstruct->conditionals.find(
+                        upstreamMemberOutputName);
+                
+                if (enableConditions &&
+                        condI != upstreamVstruct->conditionals.end())
+                {
+                    auto &evaluator = (*condI).second;
+                    evaluator->Evaluate(
+                            nodeId,
+                            memberInputName,
+                            upstreamConnection.upstreamNodeName,
+                            upstreamMemberOutputName,
+                            shaderTypePriority,
+                            interface);
+                } else {
+                    // no condition, just connect
+                    interface->SetNodeInputConnection(nodeId, memberInputName,
+                        {{upstreamConnection.upstreamNodeName,
+                            upstreamMemberOutputName}});
+
+                    TF_DEBUG(HDPRMAN_VSTRUCTS)
+                        .Msg("Connected condition-less %s.%s to %s.%s\n",
+                            nodeId.GetText(),
+                            memberInputName.GetText(),
+                            upstreamConnection.upstreamNodeName.GetText(),
+                            upstreamMemberOutputName.GetText());
+                }  
+                break;
+            }
+        }
+    }
+} 
+
+
+void
+MatfiltResolveVstructs(
+    HdMaterialNetworkInterface *interface,
+    bool enableConditions)
+{
+
+    if (!interface) {
+        return;
+    }
+
+    static const NdrTokenVec shaderTypePriority = {
+        TfToken("OSL"),
+        TfToken("RmanCpp"),
+    };
+
+    std::set<TfToken> resolvedNodeNames;
+
+    for (const TfToken &nodeName : interface->GetNodeNames()) {
+        _ResolveVstructsForNode(
+            interface,
+            nodeName,
+            resolvedNodeNames,
+            shaderTypePriority,
+            enableConditions);
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/matfiltResolveVstructs.h b/third_party/renderman-26/plugin/hdPrman/matfiltResolveVstructs.h
new file mode 100644
index 0000000000..a334da092d
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/matfiltResolveVstructs.h
@@ -0,0 +1,63 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_RESOLVE_VSTRUCTS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_RESOLVE_VSTRUCTS_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/material.h"
+#include "pxr/imaging/hd/materialNetworkInterface.h"
+#include "pxr/usd/ndr/declare.h"
+
+#include <memory>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// Expands "virtual struct" connections for RenderMan.
+/// If requested, conditional actions are evaluated.
+void MatfiltResolveVstructs(
+        HdMaterialNetworkInterface *networkInterface,
+        bool enableConditions = true);
+
+class MatfiltVstructConditionalEvaluatorImpl;
+
+/// \class MatfiltVstructConditionalEvaluator
+///
+/// Parses and evaluates a single expression of "virtual struct conditional
+/// grammar". This is used internally by MatfiltResolveVstructs but is
+/// available to facilitate unit testing.
+class MatfiltVstructConditionalEvaluator
+{
+public:
+    typedef std::shared_ptr<MatfiltVstructConditionalEvaluator> Ptr;
+
+    ~MatfiltVstructConditionalEvaluator();
+
+    static Ptr Parse(const std::string &inputExpr);
+
+    /// Runs the conditional actions specified by the parsed inputExpr.
+    /// 
+    /// Because this evaluates the conditional actions (connect, ignore,
+    /// set constant, copy upstream parameter value), this is sent the context
+    /// of the current connected nodes as well as the mutable network to
+    /// directly change.
+    /// 
+    void Evaluate(
+            const TfToken &nodeId,
+            const TfToken &nodeInputId,
+            const TfToken &upstreamNodeId,
+            const TfToken &upstreamNodeOutput,
+            const NdrTokenVec &shaderTypePriority,
+            HdMaterialNetworkInterface *networkInterface) const;
+private:
+    MatfiltVstructConditionalEvaluator() = default;
+
+    MatfiltVstructConditionalEvaluatorImpl *_impl = nullptr;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MATFILT_RESOLVE_VSTRUCTS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/matfiltSceneIndexPlugins.cpp b/third_party/renderman-26/plugin/hdPrman/matfiltSceneIndexPlugins.cpp
new file mode 100644
index 0000000000..8694f62e64
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/matfiltSceneIndexPlugins.cpp
@@ -0,0 +1,258 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/matfiltSceneIndexPlugins.h"
+#include "hdPrman/material.h"
+#include "hdPrman/matfiltConvertPreviewMaterial.h"
+
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
+#include "hdPrman/matfiltMaterialX.h"
+#endif
+
+#include "hdPrman/virtualStructResolvingSceneIndex.h"
+
+#include "pxr/base/tf/stringUtils.h"
+
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+#include "pxr/imaging/hd/materialFilteringSceneIndexBase.h"
+#include "pxr/imaging/hd/materialNetworkInterface.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+
+#include <string>
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (applyConditionals)
+    ((previewMatPluginName, "HdPrman_PreviewMaterialFilteringSceneIndexPlugin"))
+    ((materialXPluginName,  "HdPrman_MaterialXFilteringSceneIndexPlugin"))
+    ((vstructPluginName,    "HdPrman_VirtualStructResolvingSceneIndexPlugin"))
+);
+
+/// Ordering of the matfilt operations. This is necessary when using scene
+/// index plugins instead of a filter chain which is populated in the required
+/// order.
+enum _MatfiltOrder
+{
+    Start = 0,
+    ConnectionResolve = 100, // vstruct
+    NodeTranslation = 110, // matx, preview surface
+    End = 200,
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registrations
+////////////////////////////////////////////////////////////////////////////////
+
+static const char * const _rendererDisplayName = "Prman";
+// XXX: Hardcoded for now to match the legacy matfilt logic.
+static const bool _resolveVstructsWithConditionals = true;
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_PreviewMaterialFilteringSceneIndexPlugin>();
+    
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_MaterialXFilteringSceneIndexPlugin>();
+    
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_VirtualStructResolvingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _rendererDisplayName,
+        _tokens->previewMatPluginName,
+        nullptr, // no argument data necessary
+        _MatfiltOrder::NodeTranslation,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+    
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _rendererDisplayName,
+        _tokens->materialXPluginName,
+        nullptr, // no argument data necessary
+        _MatfiltOrder::NodeTranslation,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+    
+    HdContainerDataSourceHandle const inputArgs =
+        HdRetainedContainerDataSource::New(
+            _tokens->applyConditionals,
+            HdRetainedTypedSampledDataSource<bool>::New(
+                _resolveVstructsWithConditionals));
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _rendererDisplayName,
+        _tokens->vstructPluginName,
+        inputArgs,                        
+        _MatfiltOrder::ConnectionResolve,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index Implementations
+////////////////////////////////////////////////////////////////////////////////
+
+namespace
+{
+
+void
+_TransformPreviewMaterialNetwork(
+    HdMaterialNetworkInterface *networkInterface)
+{
+    std::vector<std::string> errors;
+    MatfiltConvertPreviewMaterial(networkInterface, &errors);
+    if (!errors.empty()) {
+        TF_RUNTIME_ERROR(
+            "Error filtering preview material network for prim %s: %s\n",
+                networkInterface->GetMaterialPrimPath().GetText(),
+                TfStringJoin(errors).c_str());
+    }
+}
+
+TF_DECLARE_REF_PTRS(_PreviewMaterialFilteringSceneIndex);
+
+class _PreviewMaterialFilteringSceneIndex :
+    public HdMaterialFilteringSceneIndexBase
+{
+public:
+
+    static _PreviewMaterialFilteringSceneIndexRefPtr New(
+        const HdSceneIndexBaseRefPtr &inputScene) 
+    {
+        return TfCreateRefPtr(
+            new _PreviewMaterialFilteringSceneIndex(inputScene));
+    }
+
+protected:
+    _PreviewMaterialFilteringSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputSceneIndex)
+    : HdMaterialFilteringSceneIndexBase(inputSceneIndex)
+    {
+    }
+
+    FilteringFnc _GetFilteringFunction() const override
+    {
+        return _TransformPreviewMaterialNetwork;
+    }
+};
+
+/// ----------------------------------------------------------------------------
+
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
+
+void
+_TransformMaterialXNetwork(
+    HdMaterialNetworkInterface *networkInterface)
+{
+    std::vector<std::string> errors;
+    MatfiltMaterialX(networkInterface, &errors);
+    if (!errors.empty()) {
+        TF_RUNTIME_ERROR(
+            "Error filtering preview material network for prim %s: %s\n",
+                networkInterface->GetMaterialPrimPath().GetText(),
+                TfStringJoin(errors).c_str());
+    }
+}
+
+TF_DECLARE_REF_PTRS(_MaterialXFilteringSceneIndex);
+
+class _MaterialXFilteringSceneIndex :
+    public HdMaterialFilteringSceneIndexBase
+{
+public:
+
+    static _MaterialXFilteringSceneIndexRefPtr New(
+        const HdSceneIndexBaseRefPtr &inputScene) 
+    {
+        return TfCreateRefPtr(
+            new _MaterialXFilteringSceneIndex(inputScene));
+    }
+
+protected:
+    _MaterialXFilteringSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputSceneIndex)
+    : HdMaterialFilteringSceneIndexBase(inputSceneIndex)
+    {
+    }
+
+    FilteringFnc _GetFilteringFunction() const override
+    {
+        return _TransformMaterialXNetwork;
+    }
+};
+
+#endif
+
+/// ----------------------------------------------------------------------------
+
+// Note: HdPrman_VirtualStructResolvingSceneIndex is defined in its own
+// translation unit for unit testing purposes.
+// 
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index Plugin Implementations
+////////////////////////////////////////////////////////////////////////////////
+
+HdPrman_PreviewMaterialFilteringSceneIndexPlugin::
+HdPrman_PreviewMaterialFilteringSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_PreviewMaterialFilteringSceneIndexPlugin::_AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs)
+{
+    TF_UNUSED(inputArgs);
+    return _PreviewMaterialFilteringSceneIndex::New(inputScene);
+}
+
+/// ----------------------------------------------------------------------------
+
+HdPrman_MaterialXFilteringSceneIndexPlugin::
+HdPrman_MaterialXFilteringSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_MaterialXFilteringSceneIndexPlugin::_AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs)
+{
+    TF_UNUSED(inputArgs);
+#if PXR_MATERIALX_SUPPORT_ENABLED
+    return _MaterialXFilteringSceneIndex::New(inputScene);
+#else
+    return inputScene;
+#endif
+}
+
+/// ----------------------------------------------------------------------------
+
+HdPrman_VirtualStructResolvingSceneIndexPlugin::
+HdPrman_VirtualStructResolvingSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_VirtualStructResolvingSceneIndexPlugin::_AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs)
+{
+    bool applyConditionals = false;
+    if (HdBoolDataSourceHandle val = HdBoolDataSource::Cast(
+            inputArgs->Get(_tokens->applyConditionals))) {
+        applyConditionals = val->GetTypedValue(0.0f);
+    } else {
+        TF_CODING_ERROR("Missing argument to plugin %s",
+                        _tokens->vstructPluginName.GetText());
+    }
+    return HdPrman_VirtualStructResolvingSceneIndex::New(
+                inputScene, applyConditionals);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/matfiltSceneIndexPlugins.h b/third_party/renderman-26/plugin/hdPrman/matfiltSceneIndexPlugins.h
new file mode 100644
index 0000000000..2a33cf782d
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/matfiltSceneIndexPlugins.h
@@ -0,0 +1,79 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MAT_FILT_SCENE_INDEX_PLUGINS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MAT_FILT_SCENE_INDEX_PLUGINS_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_PreviewMaterialFilteringSceneIndexPlugin
+///
+/// Plugin that provides a scene index that transforms the underlying material
+/// network into Prman equivalents for each material prim that has a
+/// UsdPreviewSurface node,
+///
+/// This plugin is registered with the scene index plugin registry for Prman.
+///
+class HdPrman_PreviewMaterialFilteringSceneIndexPlugin :
+    public HdSceneIndexPlugin
+{
+public:
+    HdPrman_PreviewMaterialFilteringSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+/// ----------------------------------------------------------------------------
+/// \class HdPrman_MaterialXFilteringSceneIndexPlugin
+///
+/// Plugin that provides a scene index that transforms the underlying material
+/// network into Prman equivalents for each material prim that has a
+/// MaterialX node connected to the 'surface' terminal.
+/// XXX: matFiltMaterialX.h doesn't seem to support other terminals
+///      (displacmeent, volume)
+///
+/// This plugin is registered with the scene index plugin registry for Prman.
+///
+class HdPrman_MaterialXFilteringSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_MaterialXFilteringSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+/// ----------------------------------------------------------------------------
+/// \class HdPrman_VirtualStructResolvingSceneIndexPlugin
+///
+/// Plugin that provides a scene index that expands "virtual struct"
+/// connections, including evaluation of conditional actions.
+///
+/// This plugin is registered with the scene index plugin registry for Prman.
+///
+class HdPrman_VirtualStructResolvingSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_VirtualStructResolvingSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MAT_FILT_SCENE_INDEX_PLUGINS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/mesh.cpp b/third_party/renderman-26/plugin/hdPrman/mesh.cpp
new file mode 100644
index 0000000000..74748b20be
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/mesh.cpp
@@ -0,0 +1,308 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include <numeric> // for std::iota
+#include "hdPrman/mesh.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/coordSys.h"
+#include "hdPrman/material.h"
+#include "hdPrman/rixStrings.h"
+#include "pxr/imaging/hd/meshTopology.h"
+#include "pxr/imaging/pxOsd/subdivTags.h"
+#include "pxr/imaging/pxOsd/tokens.h"
+#include "pxr/usd/usdRi/rmanUtilities.h"
+
+#include "RiTypesHelper.h"
+
+#include <algorithm>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#if PXR_VERSION > 2011
+HdPrman_Mesh::HdPrman_Mesh(SdfPath const& id, const bool isMeshLight)
+    : BASE(id)
+    , _isMeshLight(isMeshLight)
+#else
+HdPrman_Mesh::HdPrman_Mesh(SdfPath const& id,
+                           SdfPath const& instancerId)
+    : BASE(id, instancerId)
+#endif
+{
+}
+
+bool
+HdPrman_Mesh::_PrototypeOnly()
+{
+    return _isMeshLight;
+}
+
+HdDirtyBits
+HdPrman_Mesh::GetInitialDirtyBitsMask() const
+{
+    // The initial dirty bits control what data is available on the first
+    // run through _PopulateRtMesh(), so it should list every data item
+    // that _PopluateRtMesh requests.
+    int mask = HdChangeTracker::Clean
+        | HdChangeTracker::DirtyPoints
+        | HdChangeTracker::DirtyTopology
+        | HdChangeTracker::DirtyTransform
+        | HdChangeTracker::DirtyVisibility
+        | HdChangeTracker::DirtyCullStyle
+        | HdChangeTracker::DirtyDoubleSided
+        | HdChangeTracker::DirtySubdivTags
+        | HdChangeTracker::DirtyPrimvar
+        | HdChangeTracker::DirtyNormals
+        | HdChangeTracker::DirtyMaterialId
+        | HdChangeTracker::DirtyInstancer
+        ;
+
+    return (HdDirtyBits)mask;
+}
+
+static
+VtIntArray
+_Union(const VtIntArray &a, const VtIntArray &b)
+{
+    if (a.empty()) {
+        return b;
+    } else if (b.empty()) {
+        return a;
+    } else {
+        VtIntArray aCopy = a;
+        VtIntArray bCopy = b;
+        std::sort(aCopy.begin(), aCopy.end());
+        std::sort(bCopy.begin(), bCopy.end());
+        VtIntArray merged;
+        std::set_union(aCopy.cbegin(), aCopy.cend(),
+                       bCopy.cbegin(), bCopy.cend(),
+                       std::back_inserter(merged));
+        return merged;
+    }
+}
+
+RtPrimVarList
+HdPrman_Mesh::_ConvertGeometry(HdPrman_RenderParam *renderParam,
+                                HdSceneDelegate *sceneDelegate,
+                                const SdfPath &id,
+                                RtUString *primType,
+                                HdGeomSubsets *geomSubsets)
+{
+    // Pull topology.
+    const HdMeshTopology topology = GetMeshTopology(sceneDelegate);
+    const size_t npoints = topology.GetNumPoints();
+    const VtIntArray verts = topology.GetFaceVertexIndices();
+    const VtIntArray nverts = topology.GetFaceVertexCounts();
+
+    // If the geometry has been partitioned into subsets, add an
+    // additional subset representing anything left over.
+    *geomSubsets = topology.GetGeomSubsets();
+    if (!geomSubsets->empty()) {
+        const int numFaces = topology.GetNumFaces();
+        std::vector<bool> faceMask(numFaces, true);
+        size_t numUnusedFaces = faceMask.size();
+        for (HdGeomSubset const& subset: *geomSubsets) {
+            for (int index: subset.indices) {
+                if (TF_VERIFY(index < numFaces) && faceMask[index]) {
+                    faceMask[index] = false;
+                    numUnusedFaces--;
+                }
+            }
+        }
+        if (numUnusedFaces) {
+            geomSubsets->push_back(HdGeomSubset());
+            HdGeomSubset &unusedSubset = geomSubsets->back();
+            unusedSubset.type = HdGeomSubset::TypeFaceSet;
+            unusedSubset.id = id;
+            // Use an empty material ID as a placeholder to indicate
+            // that we wish to re-use the mesh-level material binding.
+            unusedSubset.materialId = SdfPath();
+            unusedSubset.indices.resize(numUnusedFaces);
+            size_t count = 0;
+            for (size_t i=0;
+                 i < faceMask.size() && count < numUnusedFaces; ++i) {
+                if (faceMask[i]) {
+                    unusedSubset.indices[count] = i;
+                    count++;
+                }
+            }
+        }
+    }
+
+    RtPrimVarList primvars(
+         nverts.size(), /* uniform */
+         npoints, /* vertex */
+         npoints, /* varying */
+         verts.size()  /* facevarying */);
+
+    //
+    // Point positions (P)
+    //
+    HdPrman_ConvertPointsPrimvar(
+        sceneDelegate,
+        id,
+        renderParam->GetShutterInterval(),
+        primvars,
+        npoints);
+    // Topology.
+    primvars.SetIntegerDetail(RixStr.k_Ri_nvertices, nverts.cdata(),
+                              RtDetailType::k_uniform);
+    primvars.SetIntegerDetail(RixStr.k_Ri_vertices, verts.cdata(),
+                              RtDetailType::k_facevarying);
+    if (topology.GetScheme() == PxOsdOpenSubdivTokens->catmullClark) {
+        *primType = RixStr.k_Ri_SubdivisionMesh;
+        primvars.SetString(RixStr.k_Ri_scheme, RixStr.k_catmullclark);
+    } else if (topology.GetScheme() == PxOsdOpenSubdivTokens->loop) {
+        *primType = RixStr.k_Ri_SubdivisionMesh;
+        primvars.SetString(RixStr.k_Ri_scheme, RixStr.k_loop);
+    } else if (topology.GetScheme() == PxOsdOpenSubdivTokens->bilinear) {
+        *primType = RixStr.k_Ri_SubdivisionMesh;
+        primvars.SetString(RixStr.k_Ri_scheme, RixStr.k_bilinear);
+    } else { // if scheme == PxOsdOpenSubdivTokens->none
+        *primType = RixStr.k_Ri_PolygonMesh;
+    }
+
+    // Invisible faces will be handled by treating them as holes.  Since there
+    // may also be explicitly specified hole indices, we use the union of the
+    // two lists as the hole indices for the mesh.
+    const VtIntArray invisibleFaces = topology.GetInvisibleFaces();
+    const VtIntArray explicitHoleIndices = topology.GetHoleIndices();
+    const VtIntArray holeIndices = _Union(invisibleFaces, explicitHoleIndices);
+
+    if (*primType == RixStr.k_Ri_PolygonMesh &&
+        !holeIndices.empty()) {
+        // Poly meshes with holes are promoted to bilinear subdivs, to
+        // make riley respect the holes.
+        *primType = RixStr.k_Ri_SubdivisionMesh;
+        primvars.SetString(RixStr.k_Ri_scheme, RixStr.k_bilinear);
+    }
+  
+    // Orientation, aka winding order.
+    // Because PRMan uses a left-handed coordinate system, and USD/Hydra
+    // use a right-handed coordinate system, the meaning of orientation
+    // also flips when we convert between them.  So LH<->RH.
+    if (topology.GetOrientation() == PxOsdOpenSubdivTokens->leftHanded) {
+        primvars.SetString(RixStr.k_Ri_Orientation, RixStr.k_rh);
+    } else {
+        primvars.SetString(RixStr.k_Ri_Orientation, RixStr.k_lh);
+    }
+
+    // Subdiv tags
+    if (*primType == RixStr.k_Ri_SubdivisionMesh) {
+        std::vector<RtUString> tagNames;
+        std::vector<RtInt> tagArgCounts;
+        std::vector<RtInt> tagIntArgs;
+        std::vector<RtFloat> tagFloatArgs;
+        std::vector<RtToken> tagStringArgs;
+
+        // Holes
+        if (!holeIndices.empty()) {
+            tagNames.push_back(RixStr.k_hole);
+            tagArgCounts.push_back(holeIndices.size()); // num int args
+            tagArgCounts.push_back(0); // num float args
+            tagArgCounts.push_back(0); // num str args
+            tagIntArgs.insert(tagIntArgs.end(),
+                              holeIndices.begin(), holeIndices.end());
+        }
+
+        const PxOsdSubdivTags osdTags = GetSubdivTags(sceneDelegate);
+
+        // Creases
+        const VtIntArray creaseLengths = osdTags.GetCreaseLengths();
+        const VtIntArray creaseIndices = osdTags.GetCreaseIndices();
+        const VtFloatArray creaseWeights = osdTags.GetCreaseWeights();
+        if (!creaseIndices.empty()) {
+            const bool weightPerCrease = 
+                creaseWeights.size() == creaseLengths.size();
+            for (int creaseLength: creaseLengths) {
+                tagNames.push_back(RixStr.k_crease);
+                tagArgCounts.push_back(creaseLength); // num int args
+                if (weightPerCrease) {
+                    // one weight for each crease
+                    tagArgCounts.push_back(1); // num float args
+                } else {
+                    // one weight for each crease edge
+                    tagArgCounts.push_back(creaseLength-1); // num float args
+                }
+                tagArgCounts.push_back(0); // num str args
+            }
+            tagIntArgs.insert(tagIntArgs.end(),
+                    creaseIndices.begin(), creaseIndices.end());
+            tagFloatArgs.insert(tagFloatArgs.end(),
+                    creaseWeights.begin(), creaseWeights.end());
+        }
+
+        // Corners
+        const VtIntArray cornerIndices = osdTags.GetCornerIndices();
+        const VtFloatArray cornerWeights = osdTags.GetCornerWeights();
+        if (cornerIndices.size()) {
+            tagNames.push_back(RixStr.k_corner);
+            tagArgCounts.push_back(cornerIndices.size()); // num int args
+            tagArgCounts.push_back(cornerWeights.size()); // num float args
+            tagArgCounts.push_back(0); // num str args
+            tagIntArgs.insert(tagIntArgs.end(),
+                    cornerIndices.begin(), cornerIndices.end());
+            tagFloatArgs.insert(tagFloatArgs.end(),
+                    cornerWeights.begin(), cornerWeights.end());
+        }
+
+        // Vertex Interpolation (aka interpolateboundary)
+        TfToken vInterp = osdTags.GetVertexInterpolationRule();
+        if (vInterp.IsEmpty()) {
+            vInterp = PxOsdOpenSubdivTokens->edgeAndCorner;
+        }
+        if (UsdRiConvertToRManInterpolateBoundary(vInterp) != 0) {
+            tagNames.push_back(RixStr.k_interpolateboundary);
+            tagArgCounts.push_back(0); // num int args
+            tagArgCounts.push_back(0); // num float args
+            tagArgCounts.push_back(0); // num str args
+        }
+
+        // Face-varying Interpolation (aka facevaryinginterpolateboundary)
+        TfToken fvInterp = osdTags.GetFaceVaryingInterpolationRule();
+        if (fvInterp.IsEmpty()) {
+            fvInterp = PxOsdOpenSubdivTokens->cornersPlus1;
+        }
+        tagNames.push_back(RixStr.k_facevaryinginterpolateboundary);
+        tagArgCounts.push_back(1); // num int args
+        tagArgCounts.push_back(0); // num float args
+        tagArgCounts.push_back(0); // num str args
+        tagIntArgs.push_back(
+                UsdRiConvertToRManFaceVaryingLinearInterpolation(fvInterp));
+
+        // Triangle subdivision rule
+        TfToken triSubdivRule = osdTags.GetTriangleSubdivision();
+        if (triSubdivRule == PxOsdOpenSubdivTokens->smooth) {
+            tagNames.push_back(RixStr.k_smoothtriangles);
+            tagArgCounts.push_back(1); // num int args
+            tagArgCounts.push_back(0); // num float args
+            tagArgCounts.push_back(0); // num str args
+            tagIntArgs.push_back(
+                    UsdRiConvertToRManTriangleSubdivisionRule(triSubdivRule));
+        }
+        primvars.SetStringArray(RixStr.k_Ri_subdivtags,
+                                 &tagNames[0], tagNames.size());
+        primvars.SetIntegerArray(RixStr.k_Ri_subdivtagnargs,
+                                  &tagArgCounts[0], tagArgCounts.size());
+        primvars.SetFloatArray(RixStr.k_Ri_subdivtagfloatargs,
+                                &tagFloatArgs[0], tagFloatArgs.size());
+        primvars.SetIntegerArray(RixStr.k_Ri_subdivtagintargs,
+                                  &tagIntArgs[0], tagIntArgs.size());
+    }
+
+    // Set element ID.
+    std::vector<int32_t> elementId(nverts.size());
+    std::iota(elementId.begin(), elementId.end(), 0);
+    primvars.SetIntegerDetail(RixStr.k_faceindex, elementId.data(),
+                              RtDetailType::k_uniform);
+
+    HdPrman_ConvertPrimvars(
+        sceneDelegate, id, primvars, nverts.size(), npoints, npoints,
+        verts.size());
+
+    return primvars;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/mesh.h b/third_party/renderman-26/plugin/hdPrman/mesh.h
new file mode 100644
index 0000000000..a2bba554a9
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/mesh.h
@@ -0,0 +1,46 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESH_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESH_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/gprim.h"
+#include "pxr/imaging/hd/mesh.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_Mesh final : public HdPrman_Gprim<HdMesh>
+{
+public:
+    using BASE = HdPrman_Gprim<HdMesh>;
+
+    HF_MALLOC_TAG_NEW("new HdPrman_Mesh");
+
+    HdPrman_Mesh(SdfPath const& id, const bool isMeshLight);
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+protected:
+    RtPrimVarList
+    _ConvertGeometry(HdPrman_RenderParam *renderParam,
+                     HdSceneDelegate *sceneDelegate,
+                     const SdfPath &id,
+                     RtUString *primType,
+                     std::vector<HdGeomSubset> *geomSubsets) override;
+
+    bool _PrototypeOnly() override;
+
+
+private:
+    bool _isMeshLight;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESH_H
diff --git a/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndex.cpp b/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndex.cpp
new file mode 100644
index 0000000000..e5f026f022
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndex.cpp
@@ -0,0 +1,1211 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/meshLightResolvingSceneIndex.h"
+
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/tokens.h"
+
+#include "pxr/imaging/hd/version.h"
+
+#include "pxr/imaging/hd/categoriesSchema.h"
+#include "pxr/imaging/hd/containerDataSourceEditor.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
+#include "pxr/imaging/hd/dataSourceMaterialNetworkInterface.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+#include "pxr/imaging/hd/dependenciesSchema.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/instancedBySchema.h"
+#include "pxr/imaging/hd/lightSchema.h"
+#if HD_API_VERSION >= 51
+#include "pxr/imaging/hd/materialBindingsSchema.h"
+#else
+#include "pxr/imaging/hd/materialBindingSchema.h"
+#endif
+#include "pxr/imaging/hd/materialNetworkSchema.h"
+#include "pxr/imaging/hd/materialSchema.h"
+#include "pxr/imaging/hd/meshSchema.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/primvarsSchema.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/schema.h" 
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/visibilitySchema.h"
+#include "pxr/imaging/hd/volumeFieldBindingSchema.h"
+#include "pxr/imaging/hd/xformSchema.h"
+
+#if PXR_VERSION >= 2311
+#include "pxr/usdImaging/usdImaging/modelSchema.h"
+#endif
+
+#include "pxr/usd/usdLux/tokens.h"
+
+#include "pxr/base/tf/debug.h"
+#include "pxr/base/trace/trace.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/** Mesh Lights
+ *
+ * Mesh lights are meshes with the MeshLightAPI applied. They have aspects of
+ * both traditional Rprims and Sprims. Hydra generally treats them as Rprims.
+ * It's up to the render bridge to notice the applied API and do something
+ * about it.
+ * 
+ * For Prman, that means splitting the mesh light into a mesh (Rprim) and a
+ * light (Sprim). The Rprim part is easy enough -- we just take the incoming
+ * prim (called the "origin" prim throughout) and strip off the features
+ * that were added by the Light API. It continues downstream as just an ordinary
+ * mesh. The Sprim part (which I'll call the "meshLight" prim, after its prim
+ * type) is a bit trickier, due to limitations in Prman and other special
+ * considerations.
+ * 
+ * The first issue is that Prman does not allow us to reuse the riley geometry
+ * prototype we create for the stripped-down origin (mesh) prim as the geometry
+ * prototype for the meshLight prim. https://jira.pixar.com/browse/RMAN-19686
+ * We must make a second riley geometry prototype for the meshLight prim.
+ * This required a special, prototype-only path through HdPrman_Gprim::Sync(),
+ * which is triggered by certain gprim prim types. In our case, 
+ * "meshLightSource" will be the prim type of this third prim. (I call this
+ * the "source" prim.) The source prim must be synced before we can fully sync
+ * the meshLight prim, since we need its geometry prototype id to create the
+ * riley light instance for the meshLight. We resolve this by explicitly syncing
+ * the source mesh during sync of the meshLight; see HdPrmanLight::Sync() for
+ * details.
+ * 
+ * The next issue is that there is a parameter in the Light API that controls
+ * the color of the light emitted by the meshLight prim based on the material
+ * bound to the origin prim. This parameter ("materialSyncMode") has three
+ * possible values:
+ * 
+ *   * "materialGlowTintsLight" : The "glow" signal from the bound material
+ *     should be forwarded to the light shader's "textureColor" input. This is
+ *     the default for mesh lights.
+ * 
+ *   * "independent" : The bound material's glow signal and the light's emission
+ *     color are independent of one another, and both affect the scene.
+ * 
+ *   * "noMaterialResponse" : The material bound to the mesh light has no
+ *     contribution to lighting at all. This means that it's not directly
+ *     visible at all, and only the light's emission affects the scene.
+ * 
+ * When set to "materialGlowTintsLight", we have to alter the light shader
+ * we got from the Light API on the incoming origin prim to include the glow
+ * signal from the bound material and any additional shader nodes it requires.
+ * 
+ * When set to "noMaterialResponse", we have to omit (or remove) the stripped-
+ * down origin prim. By not passing it through at all, we achieve the required
+ * visual response.
+ * 
+ * When set to "independent", we do not have to modify anything, since our
+ * overall approach is one of independence. We can just use the light shader
+ * we got from the Light API as-is, and forward the stripped-down origin prim
+ * as normal.
+ * 
+ * The final issue we can work around is that there is another bug in Prman
+ * that causes a crash when the geometry prototype and light shader associated
+ * with a light instance both undergo rapid simultaneous changes. 
+ * https://jira.pixar.com/browse/RMAN-20136. We won't handle that issue here;
+ * see HdPrmanLight::Sync() for details.
+ * 
+ * There are still some caveats. First, mesh lights are not expected to work
+ * without the stage scene index. They are a Hydra-2.0 thing. Backporting them
+ * to legacy hydra would be challenging given the constraints of the scene
+ * delegate interface. Using mesh lights in the prototype of a point instancer
+ * will certainly cause errors if the stage scene index is not enabled, because
+ * there is no way to add the meshLight and source prims as children of a point
+ * instancer prototype in legacy Hydra. Second, geom subsets with different
+ * material bindings will not affect the emission color when materialSyncMode
+ * is set to "materialGlowTintsLight". This is because there is currently no
+ * way to communicate multiple, subset-specific light shader resources through
+ * the scene delegate interface. Material bindings on subsets are ignored. (Note
+ * however that some of the code below anticipates support for geom subsets 
+ * becoming possible in the future.)
+ */
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+
+    // material network tokens
+    (PxrSurface)
+    (PxrVolume)
+    (glowColor)
+    (emitColor)
+    ((textureColor, "ri:light:textureColor"))
+
+    // prim tokens not exported elsewhere
+    (usdCollections)
+
+    // dependency tokens
+    (meshLight_dep_instancedBy)
+    (meshLight_dep_light)
+    (meshLight_dep_material)
+    (meshLight_dep_material_boundMaterial)
+    (meshLight_dep_material_materialBinding)
+    (meshLight_dep_materialBinding)
+    (meshLight_dep_mesh)
+    (meshLight_dep_primvars)
+    (meshLight_dep_usdCollections)
+    (meshLight_dep_visibility)
+    (meshLight_dep_volumeFieldBinding)
+    (meshLight_dep_xform)
+    
+    // synthesized prim names
+    ((meshLightLightName, "__meshLight_light"))
+    ((meshLightSourceName, "__meshLight_sourceMesh"))
+    ((meshLightMeshName, "__meshLight_mesh"))
+
+    // render context / material network selector
+    ((renderContext, "ri"))
+
+    // Legacy Compatibility. Remove when PXR_VERSION > 2308
+    (model)
+
+    // Legacy Compatibility. Remove when PXR_VERSION >= 2308
+    (materialSyncMode)
+
+    // Legacy Compatibility. Remove when PXR_VERSION >= 2302
+    (isLight)
+);
+
+// Internal helpers
+namespace {
+
+bool
+_IsMeshLight(
+    const HdSceneIndexPrim& prim)
+{
+    if ((prim.primType == HdPrimTypeTokens->mesh) ||
+        (prim.primType == HdPrimTypeTokens->volume)) {
+        if (auto lightSchema = HdLightSchema::GetFromParent(prim.dataSource)) {
+            if (auto dataSource = HdBoolDataSource::Cast(
+#if PXR_VERSION < 2302
+                    lightSchema.GetContainer()->Get(_tokens->isLight))) {
+#else
+                    lightSchema.GetContainer()->Get(HdTokens->isLight))) {
+#endif
+                return dataSource->GetTypedValue(0.0f);
+            }
+        }
+    }
+    return false;
+}
+
+bool
+_HasValidMaterialNetwork(
+    const HdSceneIndexPrim& prim)
+{
+#if HD_API_VERSION >= 63
+    HdMaterialNetworkSchema netSchema = 
+        HdMaterialSchema::GetFromParent(prim.dataSource)
+            .GetMaterialNetwork(_tokens->renderContext);
+    return netSchema.GetNodes() && netSchema.GetTerminals();
+#else
+    HdMaterialSchema matSchema = HdMaterialSchema::GetFromParent(prim.dataSource);
+    if (!matSchema.IsDefined()) {
+        return false;
+    }
+    HdContainerDataSourceHandle matDS = matSchema
+        .GetMaterialNetwork(_tokens->renderContext);
+    if (!matDS) {
+        return false;
+    }
+    auto netSchema = HdMaterialNetworkSchema(matDS);
+    if (!netSchema.IsDefined()) {
+        return false;
+    }
+    HdContainerDataSourceHandle nodesDS = netSchema.GetNodes();
+    HdContainerDataSourceHandle terminalsDS = netSchema.GetTerminals();
+    return nodesDS && terminalsDS;
+#endif
+}
+
+TfToken
+_GetMaterialSyncMode(
+    const HdContainerDataSourceHandle& primDs)
+{
+    const static TfToken defaultMaterialSyncMode = UsdLuxTokens->materialGlowTintsLight;
+
+    if (auto lightSchema = HdLightSchema::GetFromParent(primDs)) {
+        if (auto dataSource = HdTokenDataSource::Cast(
+#if PXR_VERSION < 2308
+                lightSchema.GetContainer()->Get(_tokens->materialSyncMode))) {
+#else
+                lightSchema.GetContainer()->Get(HdTokens->materialSyncMode))) {
+#endif
+            const TfToken materialSyncMode = dataSource->GetTypedValue(0.0f);
+            return materialSyncMode.IsEmpty() ? defaultMaterialSyncMode : materialSyncMode;
+        }
+    }
+
+    return defaultMaterialSyncMode;
+}
+
+SdfPath
+_GetBoundMaterialPath(
+    const HdContainerDataSourceHandle& primDS)
+{
+#if HD_API_VERSION >= 51
+    HdMaterialBindingsSchema materialBindings =
+        HdMaterialBindingsSchema::GetFromParent(primDS);
+    HdMaterialBindingSchema materialBinding =
+        materialBindings.GetMaterialBinding();
+    if (HdPathDataSourceHandle const ds = materialBinding.GetPath()) {
+        return ds->GetTypedValue(0.0f);
+    }
+#else
+    if (auto matBindSchema = HdMaterialBindingSchema::GetFromParent(primDS)) {
+        if (auto matBindDS = matBindSchema.GetMaterialBinding()) {
+            return matBindDS->GetTypedValue(0.0f);
+        }
+    }
+#endif
+    return SdfPath();
+}
+
+SdfPathVector
+_GetLightFilterPaths(
+    const HdContainerDataSourceHandle &inputContainer)
+{
+    if (HdLightSchema lightSchema = 
+            HdLightSchema::GetFromParent(inputContainer)) {
+        if (auto dataSource = HdTypedSampledDataSource<SdfPathVector>::Cast(
+                lightSchema.GetContainer()->Get(HdTokens->filters))) {
+            return dataSource->GetTypedValue(0.0f);
+        }
+    }
+    return SdfPathVector();
+}
+
+HdContainerDataSourceHandle
+_BuildLightShaderDataSource(
+    const SdfPath& originPath,
+    const HdSceneIndexPrim& originPrim,
+    const HdContainerDataSourceHandle& bindingSourceDS,
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    // XXX: bindingSourceDS and originPrim.dataSource will typically be the
+    // same. bindingSourceDS exists in case the origin prim and material
+    // binding source are different, as would be the case with geom subsets.
+    // Having different light shaders for each geom subset is not supported yet
+    // as there is no way to squeeze them through the scene delegate interface,
+    // but we do expect to support this in the future.
+
+    const TfToken terminalToken =
+        originPrim.primType == HdPrimTypeTokens->volume
+          ? HdMaterialTerminalTokens->volume
+          : HdMaterialTerminalTokens->surface;
+    const TfToken expectedShader =
+        terminalToken == HdMaterialTerminalTokens->volume
+          ? _tokens->PxrVolume
+          : _tokens->PxrSurface;
+    const TfToken glowParam =
+        expectedShader == _tokens->PxrVolume
+          ? _tokens->emitColor
+          : _tokens->glowColor;
+
+    // Get the original light shader network
+    const HdContainerDataSourceHandle& originalShaderDS = 
+        HdMaterialSchema::GetFromParent(originPrim.dataSource)
+            .GetMaterialNetwork(_tokens->renderContext)
+#if HD_API_VERSION >= 63
+        .GetContainer()
+#endif
+        ;
+
+    // check materialSyncMode
+    if (_GetMaterialSyncMode(originPrim.dataSource) !=
+        UsdLuxTokens->materialGlowTintsLight) {
+        // material does not affect light shader; return unmodified
+        return originalShaderDS;
+    }
+
+    // check the bound material path
+    const SdfPath matPath = _GetBoundMaterialPath(bindingSourceDS);
+    if (matPath.IsEmpty()) {
+        // no material bound to origin prim; return unmodified
+        return originalShaderDS;
+    }
+
+    // retrieve the material prim and get its shader network
+    const HdSceneIndexPrim& matPrim = inputSceneIndex->GetPrim(matPath);
+    const HdContainerDataSourceHandle& matDS =
+        HdMaterialSchema::GetFromParent(matPrim.dataSource)
+        .GetMaterialNetwork(_tokens->renderContext)
+#if HD_API_VERSION >= 63
+        .GetContainer()
+#endif
+        ;
+
+    if (!matDS) {
+        // could not get material shader network from material prim;
+        // return unmodified
+        TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("Could not get material shader network "
+            "from material prim; shader for %s light <%s> will not be "
+            "modified\n", originPrim.primType.GetText(), originPath.GetText());
+        return originalShaderDS;
+    }
+    
+    // interface with the material shader network
+#if PXR_VERSION <= 2308
+    const HdDataSourceMaterialNetworkInterface srcMatNI(matPath, matDS);
+#else
+    const HdDataSourceMaterialNetworkInterface srcMatNI(matPath, matDS,
+                                                        originPrim.dataSource);
+#endif
+    // look up the surface/volume terminal connection
+    const auto& terminalConn = srcMatNI.GetTerminalConnection(terminalToken);
+    if (!terminalConn.first) {
+        // no surface/volume terminal connection; return unmodified
+        TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("Could not locate %s terminal "
+            "connection; shader for %s light <%s> will not be modified\n",
+            terminalToken.GetText(), originPrim.primType.GetText(),
+            originPath.GetText());
+        return originalShaderDS;
+    }
+
+    // check the terminal's upstream node is of a supported type
+    const TfToken& nodeType = srcMatNI.GetNodeType(
+        terminalConn.second.upstreamNodeName);
+    
+    if (nodeType != expectedShader) {
+        // unsupported node type; return unmodified
+        TF_DEBUG(HDPRMAN_MESHLIGHT).Msg("%s terminal upstream node is not "
+            "%s; shader for %s light <%s> will not be modified\n",
+            terminalToken.GetText(), expectedShader.GetText(),
+            originPrim.primType.GetText(), originPath.GetText());
+        return originalShaderDS;
+    }
+
+    // interface with the original light shader network
+#if PXR_VERSION <= 2308
+    HdDataSourceMaterialNetworkInterface shaderNI(originPath, originalShaderDS);
+#else
+    HdDataSourceMaterialNetworkInterface shaderNI(originPath, originalShaderDS,
+                                                  originPrim.dataSource);
+#endif
+    // look up the light terminal connection
+    const auto lightTC = shaderNI.GetTerminalConnection(
+        HdMaterialTerminalTokens->light);
+    
+    // try for material's glow input connection
+    const auto glowIC = srcMatNI.GetNodeInputConnection(
+        terminalConn.second.upstreamNodeName, glowParam);
+    if (!glowIC.empty()) {
+        // glow input connection exists; set as textureColor on
+        // light terminal's upstream node
+        shaderNI.SetNodeInputConnection(
+            lightTC.second.upstreamNodeName,
+            _tokens->textureColor,
+            glowIC);
+        
+        // return the modified light shader
+
+        // XXX: We a local copy of the nodes, since shader networks cannot
+        // reference nodes in other networks. But we are not bothering to walk
+        // the graph and pull only the nodes we actually need. We just copy
+        // over all the nodes.
+        HdContainerDataSourceHandle handles[2] = {
+            shaderNI.Finish(),
+            HdMaterialNetworkSchema::Builder()
+                .SetNodes(
+                    HdMaterialNetworkSchema(matDS).GetNodes()
+#if HD_API_VERSION >= 63
+                        .GetContainer()
+#endif
+                    )
+                .Build()
+        };
+        return HdOverlayContainerDataSource::New(2, handles);
+    }
+    // No glow input connection; try for param value instead
+    const VtValue glowIV = srcMatNI.GetNodeParameterValue(
+        terminalConn.second.upstreamNodeName, glowParam);
+    if (glowIV.IsHolding<GfVec3f>()) {
+        // glow param value exists; set as textureColor on
+        // light terminal's upstream node
+        shaderNI.SetNodeParameterValue(
+            lightTC.second.upstreamNodeName,
+            _tokens->textureColor,
+            glowIV);
+        // return the modified light shader. No need to copy any nodes.
+        return shaderNI.Finish();
+    }
+
+    // No glow param value either; return unmodified
+    return originalShaderDS;
+}
+
+HdContainerDataSourceHandle
+_BuildLightDependenciesDataSource(
+    const SdfPath& originPath,
+    const HdContainerDataSourceHandle& originDS,
+    const SdfPath& bindingSourcePath,
+    const HdContainerDataSourceHandle& bindingSourceDS)
+{
+    // XXX: As with _BuildLightShaderDataSource above, bindingSource will
+    // ordinarily be the same as origin, except in the (not yet supported)
+    // case of geom subsets.
+
+    // Data source locators
+
+    // light
+    static const HdLocatorDataSourceHandle lightDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdLightSchema::GetDefaultLocator());
+    
+    // light.filters
+    static const HdLocatorDataSourceHandle lightFiltersDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdLightSchema::GetDefaultLocator().Append(HdTokens->filters));
+
+    // material
+    static const HdLocatorDataSourceHandle materialDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdMaterialSchema::GetDefaultLocator());
+
+    // material binding
+    static const HdLocatorDataSourceHandle materialBindingsDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+#if HD_API_VERSION >= 51
+            HdMaterialBindingsSchema::GetDefaultLocator());
+#else
+            HdMaterialBindingSchema::GetDefaultLocator());
+#endif
+
+    // usdCollections
+    static const HdLocatorDataSourceHandle usdCollectionsDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdDataSourceLocator(_tokens->usdCollections));
+
+    // visibility
+    static const HdLocatorDataSourceHandle visibilityDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdVisibilitySchema::GetDefaultLocator());
+    
+    // xform
+    static const HdLocatorDataSourceHandle xformDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdXformSchema::GetDefaultLocator());
+    
+    // instanced by
+    static const HdLocatorDataSourceHandle instancedByDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdInstancedBySchema::GetDefaultLocator());
+    
+    // Build dependencies data source
+    
+    // Read "-->" in comments as "depends on"
+
+    std::vector<TfToken> names;
+    std::vector<HdDataSourceBaseHandle> sources;
+
+    const auto originPathDS =
+        HdRetainedTypedSampledDataSource<SdfPath>::New(originPath);
+
+    // meshLight.light --> origin.light
+    names.push_back(_tokens->meshLight_dep_light);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(lightDSL)
+        .SetAffectedDataSourceLocator(lightDSL)
+        .Build());
+
+    // meshLight.material --> origin.material (the light shader)
+    names.push_back(_tokens->meshLight_dep_material);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(materialDSL)
+        .SetAffectedDataSourceLocator(materialDSL)
+        .Build());
+
+    // meshLight.material --> bindingSource.materialBinding
+    names.push_back(_tokens->meshLight_dep_material_materialBinding);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(
+            HdRetainedTypedSampledDataSource<SdfPath>::New(bindingSourcePath))
+        .SetDependedOnDataSourceLocator(materialBindingsDSL)
+        .SetAffectedDataSourceLocator(materialDSL)
+        .Build());
+
+    // meshLight.usdCollections --> origin.usdCollections
+    names.push_back(_tokens->meshLight_dep_usdCollections);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(usdCollectionsDSL)
+        .SetAffectedDataSourceLocator(usdCollectionsDSL)
+        .Build());
+
+    // meshLight.visibility --> origin.visibility
+    names.push_back(_tokens->meshLight_dep_visibility);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(visibilityDSL)
+        .SetAffectedDataSourceLocator(visibilityDSL)
+        .Build());
+    
+    // meshLight.xform --> origin.xform
+    names.push_back(_tokens->meshLight_dep_xform);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(xformDSL)
+        .SetAffectedDataSourceLocator(xformDSL)
+        .Build());
+    
+    // meshLight.instancedBy --> origin.instancedBy
+    names.push_back(_tokens->meshLight_dep_instancedBy);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(instancedByDSL)
+        .SetAffectedDataSourceLocator(instancedByDSL)
+        .Build());
+
+    // meshLight.material --> <bindingSource.materialBinding>.material
+    names.push_back(_tokens->meshLight_dep_material_boundMaterial);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(
+#if HD_API_VERSION >= 51
+            HdMaterialBindingsSchema::GetFromParent(bindingSourceDS)
+                .GetMaterialBinding()
+            .GetPath())
+#else
+            HdMaterialBindingSchema::GetFromParent(bindingSourceDS)
+                .GetMaterialBinding())
+#endif
+        .SetDependedOnDataSourceLocator(materialDSL)
+        .SetAffectedDataSourceLocator(materialDSL)
+        .Build());
+    
+    // XXX: Light filter dependencies *should* look like this:
+    //   meshLight.material --> origin.material,
+    //   origin.material --> origin.light.filters,
+    //   origin.material --> <each filter>
+    // If they did, we would not need any direct dependencies on the
+    // light filter prims here. But light filters are not yet Hydra 2.0 enabled,
+    // so we will put those direct dependencies here. Delete this stuff when
+    // lights and light filters are properly handling the origin.material -->
+    // <each filter> dependencies. (Note that the meshLight.material -->
+    // origin.light.filters dependency is covered by the meshLight.material -->
+    // origin.light dependency.)
+
+    static const std::string prefix = "meshLight_dep_material_filter_";
+    for (const SdfPath& filterPath : _GetLightFilterPaths(originDS)) {
+        names.push_back(TfToken(prefix + filterPath.GetAsString()));
+        sources.push_back(HdDependencySchema::Builder()
+            .SetDependedOnPrimPath(
+                HdRetainedTypedSampledDataSource<SdfPath>::New(filterPath))
+            .SetDependedOnDataSourceLocator(nullptr)
+            .SetAffectedDataSourceLocator(materialDSL)
+            .Build());
+    }
+
+    // And since these dependencies are dynamic, 
+    // meshLight.__dependencies --> origin.light.filters
+    static const TfToken filtersDepToken("meshLight_dep_dependencies_filters");
+    names.push_back(filtersDepToken);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(lightFiltersDSL)
+        .SetAffectedDataSourceLocator(materialDSL)
+        .Build());
+
+    return HdRetainedContainerDataSource::New(
+        names.size(), names.data(), sources.data());
+}
+
+HdContainerDataSourceHandle
+_BuildLightDataSource(
+    const SdfPath& originPath,
+    const HdSceneIndexPrim& originPrim,
+    const SdfPath& bindingSourcePath,
+    const HdContainerDataSourceHandle& bindingSourceDS,
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    const TfToken materialSyncMode = _GetMaterialSyncMode(originPrim.dataSource);
+    std::vector<TfToken> names;
+    std::vector<HdDataSourceBaseHandle> sources;
+
+    // revised light shader network with glow signal from bound material
+    if (materialSyncMode == UsdLuxTokens->materialGlowTintsLight) {
+        names.push_back(HdMaterialSchemaTokens->material);
+        sources.push_back(HdRetainedContainerDataSource::New(
+#if PXR_VERSION < 2308
+            // https://github.com/PixarAnimationStudios/OpenUSD/commit/283b1a6d7fb144f6fb16040fdf689b2c517b7520
+            TfToken(),
+#else
+            _tokens->renderContext,
+#endif
+            _BuildLightShaderDataSource(
+                originPath, originPrim,
+                bindingSourceDS,
+                inputSceneIndex)));
+    }
+      
+    // Add a link to the source mesh
+    names.push_back(HdLightSchemaTokens->light);
+    sources.push_back(HdRetainedContainerDataSource::New(
+        HdPrmanTokens->sourceGeom,
+        HdRetainedTypedSampledDataSource<SdfPath>::New(
+            originPath.AppendChild(_tokens->meshLightSourceName))));
+    
+    // Add dependencies
+    names.push_back(HdDependenciesSchemaTokens->__dependencies);
+    sources.push_back(
+        _BuildLightDependenciesDataSource(
+            originPath, originPrim.dataSource,
+            bindingSourcePath, bindingSourceDS));
+    
+    // Knock out primvars
+    names.push_back(HdPrimvarsSchemaTokens->primvars);
+    sources.push_back(HdBlockDataSource::New());
+
+    // Knock out model
+#if PXR_VERSION >= 2311
+    names.push_back(UsdImagingModelSchemaTokens->model);
+#else
+    names.push_back(_tokens->model);
+#endif
+    sources.push_back(HdBlockDataSource::New());
+
+    // Knock out mesh
+    names.push_back(HdMeshSchemaTokens->mesh);
+    sources.push_back(HdBlockDataSource::New());
+
+    // Knock out material binding
+#if HD_API_VERSION >= 51
+    names.push_back(HdMaterialBindingsSchema::GetSchemaToken());
+#else
+    names.push_back(HdMaterialBindingSchemaTokens->materialBinding);
+#endif
+    sources.push_back(HdBlockDataSource::New());
+
+    // Knock out volume field binding
+    names.push_back(HdVolumeFieldBindingSchemaTokens->volumeFieldBinding);
+    sources.push_back(HdBlockDataSource::New());
+
+    HdContainerDataSourceHandle handles[2] = {
+        HdRetainedContainerDataSource::New(names.size(), names.data(), sources.data()),
+        originPrim.dataSource
+    };
+    return HdOverlayContainerDataSource::New(2, handles);
+}
+
+HdContainerDataSourceHandle
+_BuildSourceDependenciesDataSource(
+    const SdfPath originPath)
+{
+    // Data source locators
+
+    // mesh
+    static const HdLocatorDataSourceHandle meshDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdMeshSchema::GetDefaultLocator());
+
+    // primvars
+    static const HdLocatorDataSourceHandle primvarsDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdPrimvarsSchema::GetDefaultLocator());
+    
+    // material binding
+    static const HdLocatorDataSourceHandle materialBindingsDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+#if HD_API_VERSION >= 51
+            HdMaterialBindingsSchema::GetDefaultLocator());
+#else
+            HdMaterialBindingSchema::GetDefaultLocator());
+#endif
+    
+    // volume field binding
+    static const HdLocatorDataSourceHandle volumeFieldBindingDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdVolumeFieldBindingSchema::GetDefaultLocator());
+
+    // Build dependencies data source
+    
+    // Read "-->" in comments as "depends on"
+
+    std::vector<TfToken> names;
+    std::vector<HdDataSourceBaseHandle> sources;
+
+    const auto originPathDS = HdRetainedTypedSampledDataSource<SdfPath>
+        ::New(originPath);
+    
+    // source.mesh --> origin.mesh
+    names.push_back(_tokens->meshLight_dep_mesh);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(meshDSL)
+        .SetAffectedDataSourceLocator(meshDSL)
+        .Build());
+
+    // source.primvars --> origin.primvars
+    names.push_back(_tokens->meshLight_dep_primvars);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(primvarsDSL)
+        .SetAffectedDataSourceLocator(primvarsDSL)
+        .Build());
+
+    // source.materialBinding --> origin.materialBinding (for displacement)
+    names.push_back(_tokens->meshLight_dep_materialBinding);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(materialBindingsDSL)
+        .SetAffectedDataSourceLocator(materialBindingsDSL)
+        .Build());
+    
+    // source.volumeFieldBinding --> origin.volumeFieldBinding
+    names.push_back(_tokens->meshLight_dep_volumeFieldBinding);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(volumeFieldBindingDSL)
+        .SetAffectedDataSourceLocator(volumeFieldBindingDSL)
+        .Build());
+
+    return HdRetainedContainerDataSource::New(
+        names.size(), names.data(), sources.data());
+}
+
+HdContainerDataSourceHandle
+_BuildSourceDataSource(
+    const SdfPath& originPath,
+    const HdContainerDataSourceHandle& originDS)
+{
+    std::vector<TfToken> names;
+    std::vector<HdDataSourceBaseHandle> sources;
+
+    const auto originPathDS = HdRetainedTypedSampledDataSource<SdfPath>
+        ::New(originPath);
+
+    // Add dependencies
+    names.push_back(HdDependenciesSchemaTokens->__dependencies);
+    sources.push_back(_BuildSourceDependenciesDataSource(originPath));
+
+    // Knock out material
+    names.push_back(HdMaterialSchemaTokens->material);
+    sources.push_back(HdBlockDataSource::New());
+
+    // Knock out light
+    names.push_back(HdLightSchemaTokens->light);
+    sources.push_back(HdBlockDataSource::New());
+
+    // Knock out usdCollections
+    names.push_back(_tokens->usdCollections);
+    sources.push_back(HdBlockDataSource::New());
+
+    // Knock out xform
+    names.push_back(HdXformSchemaTokens->xform);
+    sources.push_back(HdBlockDataSource::New());
+
+    HdContainerDataSourceHandle handles[2] = {
+        HdRetainedContainerDataSource::New(names.size(), names.data(), sources.data()),
+        originDS 
+    };
+    return HdOverlayContainerDataSource::New(2, handles);
+}
+
+HdContainerDataSourceHandle
+_BuildMeshDependenciesDataSource(
+    const SdfPath originPath)
+{
+    // Data source locators
+
+    // mesh
+    static const HdLocatorDataSourceHandle meshDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdMeshSchema::GetDefaultLocator());
+
+    // primvars
+    static const HdLocatorDataSourceHandle primvarsDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdPrimvarsSchema::GetDefaultLocator());
+    
+    // material binding
+    static const HdLocatorDataSourceHandle materialBindingDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+#if HD_API_VERSION >= 51
+            HdMaterialBindingsSchema::GetDefaultLocator());
+#else
+            HdMaterialBindingSchema::GetDefaultLocator());
+#endif
+
+    // visibility
+    static const HdLocatorDataSourceHandle visibilityDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdVisibilitySchema::GetDefaultLocator());
+    
+    // xform
+    static const HdLocatorDataSourceHandle xformDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdXformSchema::GetDefaultLocator());
+
+    // instanced by
+    static const HdLocatorDataSourceHandle instancedByDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdInstancedBySchema::GetDefaultLocator());
+    
+    // volume field binding
+    static const HdLocatorDataSourceHandle volumeFieldBindingDSL =
+        HdRetainedTypedSampledDataSource<HdDataSourceLocator>::New(
+            HdVolumeFieldBindingSchema::GetDefaultLocator());
+
+    // Build dependencies data source
+    
+    // Read "-->" in comments as "depends on"
+
+    std::vector<TfToken> names;
+    std::vector<HdDataSourceBaseHandle> sources;
+
+    const auto originPathDS = HdRetainedTypedSampledDataSource<SdfPath>
+        ::New(originPath);
+    
+    // mesh.mesh --> origin.mesh
+    names.push_back(_tokens->meshLight_dep_mesh);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(meshDSL)
+        .SetAffectedDataSourceLocator(meshDSL)
+        .Build());
+
+    // mesh.primvars --> origin.primvars
+    names.push_back(_tokens->meshLight_dep_primvars);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(primvarsDSL)
+        .SetAffectedDataSourceLocator(primvarsDSL)
+        .Build());
+
+    // mesh.materialBinding --> origin.materialBinding
+    names.push_back(_tokens->meshLight_dep_materialBinding);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(materialBindingDSL)
+        .SetAffectedDataSourceLocator(materialBindingDSL)
+        .Build());
+    
+    // mesh.visibility --> origin.visibility
+    names.push_back(_tokens->meshLight_dep_visibility);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(visibilityDSL)
+        .SetAffectedDataSourceLocator(visibilityDSL)
+        .Build());
+
+    // mesh.xform --> origin.xform
+    names.push_back(_tokens->meshLight_dep_xform);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(xformDSL)
+        .SetAffectedDataSourceLocator(xformDSL)
+        .Build());
+
+    // mesh.instancedBy --> origin.instancedBy
+    names.push_back(_tokens->meshLight_dep_instancedBy);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(instancedByDSL)
+        .SetAffectedDataSourceLocator(instancedByDSL)
+        .Build());
+    
+    // source.volumeFieldBinding --> origin.volumeFieldBinding
+    names.push_back(_tokens->meshLight_dep_volumeFieldBinding);
+    sources.push_back(HdDependencySchema::Builder()
+        .SetDependedOnPrimPath(originPathDS)
+        .SetDependedOnDataSourceLocator(volumeFieldBindingDSL)
+        .SetAffectedDataSourceLocator(volumeFieldBindingDSL)
+        .Build());
+
+    return HdRetainedContainerDataSource::New(
+        names.size(), names.data(), sources.data());
+}
+
+} // anonymous namespace
+
+/* static */
+HdPrmanMeshLightResolvingSceneIndexRefPtr
+HdPrmanMeshLightResolvingSceneIndex::New(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    return TfCreateRefPtr(
+        new HdPrmanMeshLightResolvingSceneIndex(
+            inputSceneIndex));
+}
+
+HdPrmanMeshLightResolvingSceneIndex::HdPrmanMeshLightResolvingSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputSceneIndex)
+    : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+{ }
+
+HdSceneIndexPrim 
+HdPrmanMeshLightResolvingSceneIndex::GetPrim(
+    const SdfPath &primPath) const
+{
+    // The origin prim -> no primType (should only be visible to HSB)
+    if (_meshLights.count(primPath)) {
+        return {
+            TfToken(),
+            _GetInputSceneIndex()->GetPrim(primPath).dataSource
+        };
+    }
+
+    const SdfPath& parentPath = primPath.GetParentPath();
+
+    if (_meshLights.count(parentPath) > 0) {
+        const HdSceneIndexPrim& parentPrim = _GetInputSceneIndex()
+            ->GetPrim(parentPath);
+
+        // The stripped-down origin prim -> "mesh" or "volume"
+        if (primPath.GetNameToken() == _tokens->meshLightMeshName
+            && _meshLights.at(parentPath)) {
+            HdContainerDataSourceHandle handles[2] = { 
+                HdRetainedContainerDataSource::New(
+                    HdLightSchemaTokens->light, HdBlockDataSource::New(),
+                    HdMaterialSchemaTokens->material,
+                    HdBlockDataSource::New(), _tokens->usdCollections,
+                    HdBlockDataSource::New(),
+                    HdDependenciesSchemaTokens->__dependencies,
+                    _BuildMeshDependenciesDataSource(parentPath)),
+                parentPrim.dataSource 
+            };
+            return {
+                parentPrim.primType,
+                HdOverlayContainerDataSource::New(2, handles)
+            };
+        }
+
+        // The light prim -> "meshLight"
+        if (primPath.GetNameToken() == _tokens->meshLightLightName) {
+            return {
+#if PXR_VERSION < 2302
+                HdPrmanTokens->meshLight,
+#else
+                HdPrimTypeTokens->meshLight,
+#endif
+                _BuildLightDataSource(
+                    parentPath, parentPrim,
+                    parentPath, parentPrim.dataSource, // materialBinding source
+                    _GetInputSceneIndex())
+            };
+        }
+
+        // The source mesh -> "meshLightSourceMesh" or "meshLightSourceVolume"
+        if (primPath.GetNameToken() == _tokens->meshLightSourceName) {
+            return {
+                parentPrim.primType == HdPrimTypeTokens->volume
+                  ? HdPrmanTokens->meshLightSourceVolume
+                  : HdPrmanTokens->meshLightSourceMesh,
+                _BuildSourceDataSource(parentPath, parentPrim.dataSource)
+            };
+        }
+    }
+
+    return _GetInputSceneIndex()->GetPrim(primPath);
+}
+
+SdfPathVector 
+HdPrmanMeshLightResolvingSceneIndex::GetChildPrimPaths(
+    const SdfPath &primPath) const
+{
+    SdfPathVector paths = _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+
+    if (_meshLights.count(primPath)) {
+        paths.push_back(primPath.AppendChild(_tokens->meshLightLightName));
+        paths.push_back(primPath.AppendChild(_tokens->meshLightSourceName));
+        if (_meshLights.at(primPath)) {
+            paths.push_back(primPath.AppendChild(_tokens->meshLightMeshName));
+        }
+    }
+    return paths;
+}
+
+void
+HdPrmanMeshLightResolvingSceneIndex::_PrimsAdded(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::AddedPrimEntries &entries)
+{    
+    if (!_IsObserved()) {
+        return;
+    }
+    
+    TRACE_FUNCTION();
+
+    HdSceneIndexObserver::AddedPrimEntries added;
+
+    for (const auto& entry : entries) {
+        if ((entry.primType == HdPrimTypeTokens->mesh) ||
+            (entry.primType == HdPrimTypeTokens->volume)) {
+            HdSceneIndexPrim prim = _GetInputSceneIndex()->
+                GetPrim(entry.primPath);
+            
+            // The prim is a mesh light if light.isLight is true. But a mesh
+            // light also needs a valid light shader network [material
+            // resource], which it won't have when stage scene index is not
+            // enabled.
+            //
+            // Mesh lights are not supported without stage scene index;
+            // we should not insert the light, source, or stripped-down mesh
+            // unless it is enabled. If it is disabled, we should instead
+            // just forward the origin prim along unmodified at its original
+            // path; downstream HdPrman will treat it as the mesh its prim type
+            // declares it to be.
+
+            if (_IsMeshLight(prim) && _HasValidMaterialNetwork(prim)) {
+                const bool meshVisible = _GetMaterialSyncMode(prim.dataSource)
+                    != UsdLuxTokens->noMaterialResponse;
+                _meshLights.insert({ entry.primPath, meshVisible });
+
+                // The light prim
+                added.emplace_back(
+                    entry.primPath.AppendChild(_tokens->meshLightLightName),
+#if PXR_VERSION < 2302
+                    HdPrmanTokens->meshLight);
+#else
+                    HdPrimTypeTokens->meshLight);
+#endif
+                
+                // The source mesh (for the light prim)
+                added.emplace_back(
+                    entry.primPath.AppendChild(_tokens->meshLightSourceName),
+                    entry.primType == HdPrimTypeTokens->volume
+                      ? HdPrmanTokens->meshLightSourceVolume
+                      : HdPrmanTokens->meshLightSourceMesh);
+
+                // The stripped-down origin prim
+                if (meshVisible) {
+                    added.emplace_back(
+                        entry.primPath.AppendChild(_tokens->meshLightMeshName),
+                        entry.primType);
+                }
+
+                // skip fallback insertion
+                continue;
+            }
+        }
+        added.push_back(entry);
+    }
+    _SendPrimsAdded(added);
+}
+
+void 
+HdPrmanMeshLightResolvingSceneIndex::_PrimsRemoved(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::RemovedPrimEntries &entries)
+{
+
+    HdSceneIndexObserver::RemovedPrimEntries removed;
+
+    for (const auto& entry : entries) {
+        if (_meshLights.count(entry.primPath)) {
+
+            // The light prim
+            removed.emplace_back(
+                entry.primPath.AppendChild(_tokens->meshLightLightName));
+
+            // The source mesh (for the light prim)
+            removed.emplace_back(
+                entry.primPath.AppendChild(_tokens->meshLightSourceName));
+
+            // The stripped-down origin prim
+            if (_meshLights.at(entry.primPath)) {
+                removed.emplace_back(
+                    entry.primPath.AppendChild(_tokens->meshLightMeshName));
+            }
+
+            _meshLights.erase(entry.primPath);
+
+            // skip fallback removal
+            continue;
+        }
+        removed.push_back(entry);
+    }
+
+    _SendPrimsRemoved(removed);
+}
+
+void
+HdPrmanMeshLightResolvingSceneIndex::_PrimsDirtied(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::DirtiedPrimEntries &entries)
+{
+    // Dependency Forwarding Scene Index will take care of most everything, but
+    // we do still need to add/remove the stripped-down origin prim when
+    // materialSyncMode changes from/to noMaterialResponse.
+
+    static const HdDataSourceLocator materialSyncModeLocator = { 
+        HdLightSchemaTokens->light,
+#if PXR_VERSION < 2308
+        _tokens->materialSyncMode
+#else
+        HdTokens->materialSyncMode
+#endif
+    };
+
+    for (const auto& entry : entries) {
+        if (_meshLights.count(entry.primPath)
+#if PXR_VERSION < 2208
+            && entry.dirtyLocators.Intersects(materialSyncModeLocator)) {
+#else
+            && entry.dirtyLocators.Contains(materialSyncModeLocator)) {
+#endif
+            const HdSceneIndexPrim& prim = _GetInputSceneIndex()
+                ->GetPrim(entry.primPath);
+            const bool visible = _GetMaterialSyncMode(prim.dataSource)
+                != UsdLuxTokens->noMaterialResponse;
+            if (visible && (!_meshLights.at(entry.primPath))) {
+                // materialSyncMode is no longer noMaterialResponse; insert
+                _meshLights[entry.primPath] = visible;
+                _SendPrimsAdded({{ 
+                    entry.primPath.AppendChild(_tokens->meshLightMeshName),
+                    prim.primType
+                }});
+            } else if ((!visible) && _meshLights.at(entry.primPath)) {
+                // materialSyncMode changed to noMaterialResponse; remove
+                _meshLights[entry.primPath] = visible;
+                _SendPrimsRemoved({{ 
+                    entry.primPath.AppendChild(_tokens->meshLightMeshName)
+                }});
+            }
+        }
+    }
+
+#ifndef PIXAR_ANIM
+    for (const auto& entry : entries) {
+        if (_meshLights.count(entry.primPath)) {
+            // Propogate dirtiness to the meshLight light if applicable.
+            // HdDataSourceLocator::EmptyLocator() == AllDirty in Hydra 1.0
+            if (entry.dirtyLocators.Intersects(HdDataSourceLocator::EmptyLocator())
+            || entry.dirtyLocators.Intersects(HdCategoriesSchema::GetDefaultLocator())
+#if HD_API_VERSION >= 51
+            || entry.dirtyLocators.Intersects(HdMaterialBindingsSchema::GetDefaultLocator())) {
+#else
+            || entry.dirtyLocators.Intersects(HdMaterialBindingSchema::GetDefaultLocator())) {
+#endif
+                _SendPrimsDirtied({{ entry.primPath.AppendChild(_tokens->meshLightLightName), {
+                    HdLightSchema::GetDefaultLocator(), 
+                    HdMaterialSchema::GetDefaultLocator(), 
+                    HdPrimvarsSchema::GetDefaultLocator(),
+                    HdVisibilitySchema::GetDefaultLocator(),
+                    HdXformSchema::GetDefaultLocator()
+                }}});
+            }
+
+            // Propogate all dirtiness to the visible meshLight mesh.
+            if (_meshLights[entry.primPath] == true /* IsVisible */) {
+                _SendPrimsDirtied({{entry.primPath.AppendChild(_tokens->meshLightMeshName), 
+                    entry.dirtyLocators
+                }});
+            }
+        }
+    }
+#endif
+
+    _SendPrimsDirtied(entries);
+}
+
+HdPrmanMeshLightResolvingSceneIndex::~HdPrmanMeshLightResolvingSceneIndex()
+    = default;
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndex.h b/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndex.h
new file mode 100644
index 0000000000..33b13c5cd2
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndex.h
@@ -0,0 +1,51 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DECLARE_REF_PTRS(HdPrmanMeshLightResolvingSceneIndex);
+
+// Pixar-only, Prman-specific Hydra scene index to resolve mesh lights.
+class HdPrmanMeshLightResolvingSceneIndex : 
+    public  HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static HdPrmanMeshLightResolvingSceneIndexRefPtr
+    New(const HdSceneIndexBaseRefPtr& inputSceneIndex);
+
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override;
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override;
+
+protected:
+    HdPrmanMeshLightResolvingSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex);
+    ~HdPrmanMeshLightResolvingSceneIndex();
+
+    void _PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::AddedPrimEntries &entries) override;
+
+    void _PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::RemovedPrimEntries &entries) override;
+
+    void _PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries &entries) override;
+  
+private:
+    std::unordered_map<SdfPath, bool, SdfPath::Hash> _meshLights;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_H
diff --git a/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..3eb64b8c73
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.cpp
@@ -0,0 +1,52 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/meshLightResolvingSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "hdPrman/meshLightResolvingSceneIndex.h"
+#include "hdPrman/tokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_MeshLightResolvingSceneIndexPlugin"))
+);
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<HdPrman_MeshLightResolvingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // We need an "insertion point" that's *after* general material resolve.
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 115;
+    for( auto const& pluginDisplayName : HdPrman_GetPluginDisplayNames() ) {
+        HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+            pluginDisplayName,
+            _tokens->sceneIndexPluginName,
+            nullptr, // No input args.
+            insertionPhase,
+            HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+    }
+}
+
+HdPrman_MeshLightResolvingSceneIndexPlugin::
+HdPrman_MeshLightResolvingSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_MeshLightResolvingSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdPrmanMeshLightResolvingSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.h
new file mode 100644
index 0000000000..41e9da15dc
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/meshLightResolvingSceneIndexPlugin.h
@@ -0,0 +1,33 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_MeshLghtResolvingSceneIndexPlugin
+///
+/// Pixar-only, Prman-specific Hydra scene index to resolve mesh lights.
+///
+class HdPrman_MeshLightResolvingSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_MeshLightResolvingSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MESHLIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/motionBlurSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/motionBlurSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..9c7b7cb924
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/motionBlurSceneIndexPlugin.cpp
@@ -0,0 +1,1433 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/motionBlurSceneIndexPlugin.h"
+
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/tokens.h"
+
+#include "pxr/base/vt/array.h"
+#include "pxr/base/vt/typeHeaders.h"
+#include "pxr/base/vt/visitValue.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/primvarsSchema.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/xformSchema.h"
+
+#include <unordered_set>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (fps)
+    ((mblur,                "ri:object:mblur"))
+    ((vblur,                "ri:object:vblur"))
+    ((vblur_on,             "Velocity Blur"))
+    ((ablur_on,             "Acceleration Blur"))
+    ((vblur_off,            "No Velocity Blur"))
+    ((geosamples,           "ri:object:geosamples"))
+    ((xformsamples,         "ri:object:xformsamples"))
+    (angularVelocities) // XXX: Why is this not in HdTokens?
+);
+
+// XXX: These defaults are pulled from UsdMotionAPI, for which there is not yet
+// a corresponding Hydra schema.
+static const int     _defaultNonlinearSampleCount = 3;
+static const float   _defaultBlurScale            = 1.0f;
+// There is no canonical source for these defaults. They were previously hard-
+// coded in renderParam.cpp.
+static const int     _defaultXformSamples         = 2;
+static const int     _defaultGeoSamples           = 2;
+static const bool    _defaultMblur                = true;
+static const TfToken _defaultVblur                = _tokens->ablur_on;
+
+// XXX: We need to encode the fps in the scene index (in a standard
+// place). Note that fps is called timeCodesPerSecond in USD.
+static const float _fps = 24.0f;
+
+static const float _minimumShutterInterval = 1.0e-10;
+
+// XXX: Set by HdPrman_MotionBlurSceneIndexPlugin::SetShutterInterval()
+// and needed by _MotionBlurHelper. These are part of our shutter
+// interval workaround. See comments on SetShutterInterval() at bottom of file.
+static float _shutterOpen = HDPRMAN_SHUTTEROPEN_DEFAULT;
+static float _shutterClose = HDPRMAN_SHUTTEROPEN_DEFAULT;
+
+using TfTokenSet = std::unordered_set<TfToken, TfToken::HashFunctor>;
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<HdPrman_MotionBlurSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // This plug-in should be inserted *after* the extComp plug-in,
+    // so that disabling of blur, etc. will also affect points from extComp
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 3;
+
+    const HdContainerDataSourceHandle inputArgs =
+        HdRetainedContainerDataSource::New(
+            _tokens->fps,
+            HdRetainedSampledDataSource::New(VtValue(_fps)));
+
+    for(const auto& pluginDisplayName : HdPrman_GetPluginDisplayNames()) {
+        HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+            pluginDisplayName,
+            HdPrmanPluginTokens->motionBlur,
+            inputArgs,
+            insertionPhase,
+            HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+    }
+}
+
+namespace
+{
+
+// Get fps from input arguments data source
+float _GetFps(const HdContainerDataSourceHandle& inputArgs)
+{
+    if (!inputArgs) {
+        return _fps;
+    }
+
+    const auto source = HdSampledDataSource::Cast(inputArgs->Get(_tokens->fps));
+    if (!source) {
+        return _fps;
+    }
+
+    const VtValue &value = source->GetValue(0.0f);
+    if (!value.IsHolding<float>()) {
+        return _fps;
+    }
+
+    return value.UncheckedGet<float>();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _MotionBlurHelper
+///
+/// Helper base class for motion blur. This class carries the implementations
+/// for methods to retrieve motion blur parameters from the prim, to compute
+/// contributing time samples, and to sample the given sampled data source.
+/// This class encapsulates all the logic for transform, velocity, and
+/// deformation motion blur.
+///
+class _MotionBlurHelper
+{
+public:
+    using Time = HdSampledDataSource::Time;
+
+    /// samplesSource: the original data source
+    /// key: identifying name for samplesSource
+    /// primPath: path of sampleSource's parent prim (for diagnostics)
+    /// primType: type of sampleSource's parent prim
+    /// primvarsSource: data source for sampleSource's parent prim's primvars
+    /// inputArgs: data source from scene index plugin
+    _MotionBlurHelper(
+        const HdSampledDataSourceHandle& samplesSource,
+        const TfToken& key,
+        const SdfPath& primPath,
+        const TfToken& primType,
+        const HdContainerDataSourceHandle& primvarsSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _samplesSource(samplesSource)
+      , _key(key)
+      , _primPath(primPath)
+      , _primType(primType)
+      , _primvarsSource(primvarsSource)
+      , _inputArgs(inputArgs)
+    { }
+
+protected:
+    bool
+    _GetContributingSampleTimesForInterval(
+        Time startTime,
+        Time endTime,
+        std::vector<Time>* const outSampleTimes);
+
+    VtValue
+    _GetValue(Time shutterOffset);
+
+private:
+    // Samples the datasource at the given locator relative to the parent prim's
+    // primvars at the given shutter offset. Returns empty VtValue if not found.
+    VtValue _GetPrimvarValue(
+        const HdDataSourceLocator& locator,
+        const Time shutterOffset = 0.0f) const;
+
+    // Samples the underlying data source at the given shutter offset.
+    VtValue _GetSourceValue(const Time shutterOffset) const;
+
+    // Retrieves the value of ri:object:xformsamples or ri:object:geosamples
+    // from the parent prim as appropriate for the kind of data source this is.
+    int _GetLinearSampleCount() const;
+
+    // Retrieves the value of nonlinearSampleCount from the parent prim.
+    int _GetNonlinearSampleCount() const;
+
+    // Retrieves the value of blurScale from the parent prim.
+    float _GetBlurScale() const;
+
+    // Retrieves the value of ri:object:mblur from the parent prim.
+    bool _GetMblur() const;
+
+    // Retrieves the value of ri:object:vblur from the parent prim.
+    TfToken _GetVblur() const;
+
+    // Retrieves the value of velocities (or angularVelocities if the parent
+    // prim is an instancer) from the parent prim.
+    VtValue _GetVelocities() const;
+
+    // Retrieves the value of accelerations from the parent prim.
+    VtValue _GetAccelerations() const;
+
+    // Checks whether the parent prim has non-empty velocities (or
+    // angularVelocities if the parent prim is an instancer) of the
+    // correct type.
+    bool _HasVelocities() const;
+
+    // Checks whether the parent prim has non-empty accelerations of the
+    // correct type.
+    bool _HasAccelerations() const;
+
+    // Returns true if this data source is for instance rotations.
+    bool _IsRotations() const;
+
+    // Returns true if this data source is for a transformable prim's transform.
+    bool _IsTransform() const;
+
+    // Returns true if this data source is for a primvar whose time samples
+    // should contribute to motion blur. Used to ensure that other primvars
+    // only express downstream a single time sample, even if they might have
+    // multiple authored samples within the interval of interest.
+    bool _IsBlurablePrimvar() const;
+
+    // Returns true if this data source is for a primvar that can undergo
+    // velocity motion blur. Currently this is only points on points-based
+    // prims and positions & rotations on point instancers.
+    bool _IsVelocityBlurablePrimvar() const;
+
+    HdSampledDataSourceHandle _samplesSource;
+    TfToken _key;
+    SdfPath _primPath;
+    TfToken _primType;
+    HdContainerDataSourceHandle _primvarsSource;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+VtValue
+_MotionBlurHelper::_GetPrimvarValue(
+    const HdDataSourceLocator& locator,
+    const Time shutterOffset) const
+{
+    if (const auto source = HdSampledDataSource::Cast(
+        HdContainerDataSource::Get(_primvarsSource, locator))) {
+        return source->GetValue(shutterOffset);
+    }
+    return VtValue();
+}
+
+VtValue
+_MotionBlurHelper::_GetSourceValue(const Time shutterOffset) const
+{
+    if (!_samplesSource) {
+        return VtValue();
+    }
+    return _samplesSource->GetValue(shutterOffset);
+}
+
+int
+_MotionBlurHelper::_GetLinearSampleCount() const
+{
+    const TfToken name =
+        _key == HdPrimvarsSchemaTokens->points
+          ? _tokens->geosamples
+          : _tokens->xformsamples;
+    const HdDataSourceLocator locator = {
+        name,
+        HdPrimvarSchemaTokens->primvarValue };
+    const VtValue value = _GetPrimvarValue(locator);
+    if (value.IsHolding<VtArray<int>>() && value.GetArraySize() > 0) {
+        return value.UncheckedGet<VtArray<int>>()[0];
+    }
+    return name == _tokens->geosamples
+        ? _defaultGeoSamples
+        : _defaultXformSamples;
+}
+
+int
+_MotionBlurHelper::_GetNonlinearSampleCount() const
+{
+    static const HdDataSourceLocator locator = {
+        HdTokens->nonlinearSampleCount,
+        HdPrimvarSchemaTokens->primvarValue };
+    return _GetPrimvarValue(locator)
+        .GetWithDefault<int>(_defaultNonlinearSampleCount);
+}
+
+float
+_MotionBlurHelper::_GetBlurScale() const
+{
+    static const HdDataSourceLocator locator = {
+        HdTokens->blurScale,
+        HdPrimvarSchemaTokens->primvarValue };
+    return _GetPrimvarValue(locator)
+        .GetWithDefault<float>(_defaultBlurScale);
+}
+
+bool
+_MotionBlurHelper::_GetMblur() const
+{
+    static const HdDataSourceLocator locator = {
+        _tokens->mblur,
+        HdPrimvarSchemaTokens->primvarValue };
+    const VtValue value = _GetPrimvarValue(locator);
+    if (value.IsHolding<VtArray<bool>>() && value.GetArraySize() > 0) {
+        return value.UncheckedGet<VtArray<bool>>()[0];
+    }
+    return _defaultMblur;
+}
+
+TfToken
+_MotionBlurHelper::_GetVblur() const
+{
+    static const HdDataSourceLocator locator = {
+        _tokens->vblur,
+        HdPrimvarSchemaTokens->primvarValue };
+    return _GetPrimvarValue(locator).GetWithDefault<TfToken>(_defaultVblur);
+}
+
+VtValue
+_MotionBlurHelper::_GetVelocities() const
+{
+
+    if (_IsRotations()) {
+        static const HdDataSourceLocator locator = {
+            _tokens->angularVelocities,
+            HdPrimvarSchemaTokens->primvarValue };
+        return _GetPrimvarValue(locator);
+    } else {
+        static const HdDataSourceLocator locator = {
+            HdTokens->velocities,
+            HdPrimvarSchemaTokens->primvarValue };
+        return _GetPrimvarValue(locator);
+    }
+}
+
+VtValue
+_MotionBlurHelper::_GetAccelerations() const
+{
+    static const HdDataSourceLocator locator = {
+        HdTokens->accelerations,
+        HdPrimvarSchemaTokens->primvarValue };
+    return _GetPrimvarValue(locator);
+}
+
+bool
+_MotionBlurHelper::_HasVelocities() const
+{
+    const VtValue& value = _GetVelocities();
+    return value.IsHolding<VtVec3fArray>() && value.GetArraySize() > 0;
+}
+
+bool
+_MotionBlurHelper::_HasAccelerations() const
+{
+    const VtValue& value = _GetAccelerations();
+    return value.IsHolding<VtVec3fArray>() && value.GetArraySize() > 0;
+}
+
+bool
+_MotionBlurHelper::_IsRotations() const
+{
+#if HD_API_VERSION < 67
+    static const TfTokenSet rotateKeys =
+    {
+        HdInstancerTokens->rotate
+#if HD_API_VERSION >= 56
+        , HdInstancerTokens->instanceRotations
+#endif
+    };
+    return rotateKeys.find(_key) != rotateKeys.end();
+#else
+    return _key == HdInstancerTokens->instanceRotations;
+#endif
+}
+
+bool
+_MotionBlurHelper::_IsTransform() const
+{
+    return _key == HdXformSchemaTokens->matrix;
+}
+
+bool
+_MotionBlurHelper::_IsBlurablePrimvar() const
+{
+    static const TfTokenSet blurables = {
+        HdPrimvarsSchemaTokens->points
+#if HD_API_VERSION < 67
+        , HdInstancerTokens->translate,
+        , HdInstancerTokens->rotate,
+        , HdInstancerTokens->scale,
+        , HdInstancerTokens->instanceTransform
+#endif
+#if HD_API_VERSION >= 56
+        , HdInstancerTokens->instanceTranslations
+        , HdInstancerTokens->instanceRotations
+        , HdInstancerTokens->instanceScales
+        , HdInstancerTokens->instanceTransforms
+#endif
+    };
+    return blurables.find(_key) != blurables.end();
+}
+
+bool
+_MotionBlurHelper::_IsVelocityBlurablePrimvar() const
+{
+    static const TfTokenSet blurables = {
+        HdPrimvarsSchemaTokens->points
+#if HD_API_VERSION < 67
+        , HdInstancerTokens->translate
+        , HdInstancerTokens->rotate
+#endif
+#if HD_API_VERSION >= 56
+        , HdInstancerTokens->instanceTranslations
+        , HdInstancerTokens->instanceRotations
+#endif
+    };
+    return blurables.find(_key) != blurables.end();
+}
+
+bool
+_MotionBlurHelper::_GetContributingSampleTimesForInterval(
+    Time /*givenStartTime*/,   // XXX: We *ONLY* use the interval coming to
+    Time /*givenEndTime*/,     //      us from RenderParam::SetRileyOptions()
+    std::vector<Time>* const outSampleTimes)
+{
+    *outSampleTimes = { 0.0f };
+
+    if (!_samplesSource) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): no underlying source\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText());
+        return false;
+    }
+
+    // Check if shutterOpen and shutterClose are both 0. This is how
+    // HdPrman_RenderSettings communicates that motion blur has been globally
+    // disabled, either at the render product level (see
+    // _ResolveShutterInterval() in renderSettings.cpp) or by environment
+    // variable (see GetRileyOptionsFromEnvironment() in utils.cpp).
+    if (0.0f == _shutterOpen && _shutterOpen == _shutterClose) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): motion blur globally disabled\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText());
+        return false;
+    }
+
+    // Check if this sample source is blurable
+    const bool isTransform = _IsTransform();
+    if (!isTransform && !_IsBlurablePrimvar()) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): not blurable\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText());
+        return false;
+    }
+
+    // Check if motion blur is disabled by ri:object:mblur = [0]
+    if (!_GetMblur()) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): motion blur disabled by ri:object:mblur\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText());
+        return false;
+    }
+
+    // Check if motion blur is disabled by blurScale = 0.0f
+    float blurScale = _GetBlurScale();
+    if (blurScale == 0.0f) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): blurScale is 0\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText());
+        return false;
+    }
+
+    // Check if motion blur is disabled by ri:object:{geo|xform}samples < 2
+    int numSamples = _GetLinearSampleCount();
+    if (numSamples < 2) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): linear sample count < 2\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText());
+        return false;
+    }
+
+    // Check if motion blur is disabled by too small shutter interval
+    if (_shutterClose - _shutterOpen < _minimumShutterInterval) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): interval [%f, %f] is too short\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText(),
+            _shutterOpen, _shutterClose);
+        return false;
+    }
+
+    // Check for velocity blur
+    if (_IsVelocityBlurablePrimvar()) {
+        const TfToken vblur = _GetVblur();
+        if (vblur != _tokens->vblur_off && _HasVelocities()) {
+            const size_t sourceCount = _GetSourceValue(0.0f).GetArraySize();
+            if (sourceCount <= _GetVelocities().GetArraySize()) {
+                // Switch to nonlinear sample count if doing nonlinear velocity
+                // blur. XXX: Velocity blur is always nonlinear for instance
+                // rotations. It is nonlinear for points/positions when:
+                //  * accelerations are present,
+                //  * accelerations are of the expected type,
+                //  * accelerations are at least as numerous as the source, and
+                //  * ri:object:vblur = "Acceleration Blur".
+                // TODO: There is an assumption here that nonlinearSampleCount
+                // has meaning only when we are performing a nonlinear type
+                // of motion blur. We should validate that assumption.
+                if (_IsRotations() ||
+                    (vblur == _tokens->ablur_on && _HasAccelerations() &&
+                        sourceCount <= _GetAccelerations().GetArraySize())) {
+                    numSamples = std::max(numSamples,
+                        _GetNonlinearSampleCount());
+                }
+                // Generate sample times unaffected by blurScale.
+                // XXX: blurScale is applied in GetValue when doing velocity
+                // blur, so we do not include its effect here.
+                const float m(numSamples - 1);
+                outSampleTimes->clear();
+                for (size_t i = 0; i < size_t(numSamples); ++i) {
+                    outSampleTimes->push_back(
+                        (float(m - i) / m) * _shutterOpen +
+                        (float(i    ) / m) * _shutterClose);
+                }
+                if (TfDebug::IsEnabled(HDPRMAN_MOTION_BLUR)) {
+                    std::string s;
+                    for (const float& t : *outSampleTimes) {
+                        if (!s.empty()) {
+                            s += ", ";
+                        }
+                        s += TfStringPrintf("%f", t);
+                    }
+                    TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+                        "<%s.%s> (%s): velocity motion blur sample times: "
+                        "[%s]\n",
+                        _primPath.GetText(), _key.GetText(),
+                        _primType.GetText(), s.c_str());
+                }
+                return true;
+            }
+        }
+    }
+    
+    float startTime = _shutterOpen;
+    float endTime = _shutterClose;
+    
+    // No velocity blur. Fall back to ordinary sampling.
+    // Scale start and end times by blurScale
+    if (blurScale != 1.0f) {
+        startTime *= blurScale;
+        endTime *= blurScale;
+    }
+
+    outSampleTimes->clear();
+
+    // Query the underlying samples source for sample times
+    if (!_samplesSource->GetContributingSampleTimesForInterval(
+        startTime, endTime, outSampleTimes)) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): underlying source has no motion\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText());
+        *outSampleTimes = { 0.0f };
+        return false;
+    }
+
+    // XXX: should not be necesary but some implementations of
+    // GetContributingSampleTimesForInterval() will return true with only a
+    // single sample time.
+    if (outSampleTimes->size() < 2) {
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): underlying source has <2 samples in interval\n",
+            _primPath.GetText(), _key.GetText(), _primType.GetText());
+        *outSampleTimes = { 0.0f };
+        return false;
+    }
+
+    // Check ordinality
+    const size_t count = _GetSourceValue((*outSampleTimes)[0]).GetArraySize();
+    for (size_t i = 1; i < outSampleTimes->size(); ++i) {
+        if (_GetSourceValue((*outSampleTimes)[i]).GetArraySize() != count) {
+            TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+                "<%s.%s> (%s): source array size varies over interval\n",
+                _primPath.GetText(), _key.GetText(), _primType.GetText());
+            *outSampleTimes = { 0.0f };
+            return false;
+        }
+    }
+
+    // If more samples are requested than are authored, re-interpolate times
+    if (static_cast<int>(outSampleTimes->size()) < numSamples) {
+        const Time first = outSampleTimes->front();
+        const Time last = outSampleTimes->back();
+        const float m(numSamples - 1);
+        outSampleTimes->clear();
+        outSampleTimes->reserve(numSamples);
+        for (size_t i = 0; i < size_t(numSamples); ++i) {
+            outSampleTimes->push_back(
+                (float(m - i) / m) * first +
+                (float(i    ) / m) * last);
+        }
+    }
+
+    // rescale times back to requested interval
+    if (blurScale != 1.0f) {
+        const float invBlurScale = 1.0f / blurScale;
+        for (Time& time : *outSampleTimes) {
+            time *= invBlurScale;
+        }
+    }
+
+    if (TfDebug::IsEnabled(HDPRMAN_MOTION_BLUR)) {
+        std::string s;
+        for (const float& t : *outSampleTimes) {
+            if (!s.empty()) {
+                s += ", ";
+            }
+            s += TfStringPrintf("%f", t);
+        }
+        TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg(
+            "<%s.%s> (%s): motion blur sample times: [%s]\n",
+            _primPath.GetText(), _key.GetText(),
+            _primType.GetText(), s.c_str());
+    }
+
+    return true;
+}
+
+VtValue
+_MotionBlurHelper::_GetValue(Time givenShutterOffset)
+{
+    // Shortcut for offset of 0.0f
+    if (givenShutterOffset == 0.0f) {
+        return _GetSourceValue(0.0f);
+    }
+
+    const float blurScale = _GetBlurScale();
+    const Time shutterOffset = givenShutterOffset * blurScale;
+
+    // Shortcut for transform blur
+    if (_IsTransform()) {
+        return _GetSourceValue(shutterOffset);
+    }
+
+    // Due to how GetContributingSampleTimesForInterval works, we only get non-
+    // zero offset here if we have a blurable primvar and motion blur is
+    // enabled. We only need to figure out whether we're doing velocity blur.
+    const TfToken vblur = _GetVblur();
+    if (vblur == _tokens->vblur_off ||          // cheapest
+        !_IsVelocityBlurablePrimvar() ||        // slightly less cheap
+        !_HasVelocities()) {                    // least cheap
+        return _GetSourceValue(shutterOffset);
+    }
+
+    // Do velocity blur!
+    const VtValue sourceValue = _GetSourceValue(0.0f);
+    const size_t sourceCount = sourceValue.GetArraySize();
+    const VtValue velocitiesValue = _GetVelocities();
+    const float fps = _GetFps(_inputArgs);
+    const float scaledTime = shutterOffset / fps;
+    const VtVec3fArray& velocities = velocitiesValue
+        .UncheckedGet<VtVec3fArray>();
+    const bool isRotations = _IsRotations();
+
+    // Check that we have enough velocities.
+    if (velocities.size() != sourceCount) {
+        TF_WARN("Number of %svelocity vectors (%zu) does not "
+            "match number of %s (%zu).",
+            isRotations ? "angular " : "", velocities.size(),
+            isRotations ? "rotations" : "positions", sourceCount);
+        // Be forgiving and only bail if we're short on velocities.
+        if (velocities.size() < sourceCount) {
+            return _GetSourceValue(shutterOffset);
+        }
+    }
+
+    if (isRotations) {
+        // Check the source type
+        if (!sourceValue.IsHolding<VtQuathArray>()) {
+            TF_WARN("Unexpected type encountered for instance "
+                "rotations. Expected VtQuathArray, got %s.",
+                sourceValue.GetTypeName().c_str());
+            return VtValue();
+        }
+
+        // Get the source
+        const VtQuathArray& rotations = sourceValue
+            .UncheckedGet<VtQuathArray>();
+
+        // Apply the angular velocities to the rotations
+        VtQuathArray result(sourceCount);
+        for (size_t i = 0; i < sourceCount; ++i) {
+            GfRotation rotation = GfRotation(rotations[i]);
+            rotation *= GfRotation(velocities[i],
+                scaledTime * velocities[i].GetLength());
+            result[i] = GfQuath(rotation.GetQuat());
+        }
+
+        return VtValue(result);
+    } else {
+        // Check the source type
+        if (!sourceValue.IsHolding<VtVec3fArray>()) {
+            TF_WARN("Unexpected type encountered for points/positions. "
+                "Expected VtVec3fArray, got %s.",
+                sourceValue.GetTypeName().c_str());
+            return VtValue();
+        }
+
+        // Get the source
+        const VtVec3fArray& positions = sourceValue
+            .UncheckedGet<VtVec3fArray>();
+
+        // Check for acceleration blur
+        bool useAccelerations = vblur == _tokens->ablur_on
+            && _GetNonlinearSampleCount() >2
+            && _HasAccelerations();
+        static const VtVec3fArray emptyArray;
+        const VtVec3fArray& accelerations = useAccelerations
+            ? _GetAccelerations().UncheckedGet<VtVec3fArray>()
+            : emptyArray;
+
+        // Check that we have enough accelerations.
+        if (useAccelerations && accelerations.size() != sourceCount) {
+            TF_WARN("Number of acceleration vectors (%zu) does not "
+                "match number of points/positions (%zu).",
+                accelerations.size(), sourceCount);
+            // Be forgiving and only bail on acceleration if we're
+            // short on accelerations.
+            if (accelerations.size() < sourceCount) {
+                useAccelerations = false;
+            }
+        }
+
+        // Apply the velocities and accelerations to the
+        // points/positions.
+        VtVec3fArray result(sourceCount);
+        if (useAccelerations) {
+            const float timeSqrHalf = 0.5f * scaledTime * scaledTime;
+            for (size_t i = 0; i < sourceCount; i++) {
+                result[i] += positions[i]
+                    + scaledTime * velocities[i]
+                    + timeSqrHalf * accelerations[i];
+            }
+        } else {
+            for (size_t i = 0; i < sourceCount; i++) {
+                result[i] += positions[i]
+                    + scaledTime * velocities[i];
+            }
+        }
+        return VtValue(result);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _MotionBlurUntypedSampledDataSource
+///
+/// Data source for untyped sampled sources
+///
+class _MotionBlurUntypedSampledDataSource final
+  : public HdSampledDataSource
+  , private _MotionBlurHelper
+{
+public:
+    using Time = HdSampledDataSource::Time;
+
+    HD_DECLARE_DATASOURCE(_MotionBlurUntypedSampledDataSource);
+
+    /// samplesSource: the original data source
+    /// key: identifying name for samplesSource
+    /// primPath: path of sampleSource's parent prim (for diagnostics)
+    /// primType: type of sampleSource's parent prim
+    /// primvarsSource: data source for sampleSource's parent prim's primvars
+    /// inputArgs: data source from scene index plugin
+    _MotionBlurUntypedSampledDataSource(
+        const HdSampledDataSourceHandle& samplesSource,
+        const TfToken& key,
+        const SdfPath& primPath,
+        const TfToken& primType,
+        const HdContainerDataSourceHandle& primvarsSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _MotionBlurHelper(
+            samplesSource, key, primPath, primType, primvarsSource, inputArgs)
+    { }
+
+    VtValue GetValue(Time shutterOffset) override
+    {
+        return _GetValue(shutterOffset);
+    }
+
+    bool GetContributingSampleTimesForInterval(
+        Time startTime, Time endTime,
+        std::vector<Time>* outSampleTimes) override
+    {
+        return _GetContributingSampleTimesForInterval(
+            startTime, endTime, outSampleTimes);
+    }
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_MotionBlurUntypedSampledDataSource);
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _MotionBlurTypedSampledDataSource
+///
+/// Data source for typed sampled sources
+///
+template <typename T>
+class _MotionBlurTypedSampledDataSource final
+  : public HdTypedSampledDataSource<T>
+  , private _MotionBlurHelper
+{
+public:
+    using Time = HdSampledDataSource::Time;
+
+    HD_DECLARE_DATASOURCE_ABSTRACT(_MotionBlurTypedSampledDataSource<T>);
+
+    /// samplesSource: the original data source
+    /// key: identifying name for samplesSource
+    /// primPath: path of sampleSource's parent prim (for diagnostics)
+    /// primType: type of sampleSource's parent prim
+    /// primvarsSource: data source for sampleSource's parent prim's primvars
+    /// inputArgs: data source from scene index plugin
+    _MotionBlurTypedSampledDataSource(
+        const HdSampledDataSourceHandle& samplesSource,
+        const TfToken& key,
+        const SdfPath& primPath,
+        const TfToken& primType,
+        const HdContainerDataSourceHandle& primvarsSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _MotionBlurHelper(
+            samplesSource, key, primPath, primType, primvarsSource, inputArgs)
+    { }
+
+    VtValue GetValue(Time shutterOffset) override
+    {
+        return _GetValue(shutterOffset);
+    }
+
+    bool GetContributingSampleTimesForInterval(
+        Time startTime, Time endTime,
+        std::vector<Time>* outSampleTimes) override
+    {
+        return _GetContributingSampleTimesForInterval(
+            startTime, endTime, outSampleTimes);
+    }
+
+    T GetTypedValue(Time shutterOffset) override
+    {
+        const VtValue& v = GetValue(shutterOffset);
+        if (v.IsHolding<T>()) {
+            return v.UncheckedGet<T>();
+        }
+        return T();
+    }
+
+    static typename _MotionBlurTypedSampledDataSource<T>::Handle New(
+        const HdSampledDataSourceHandle& samplesSource,
+        const TfToken& key,
+        const SdfPath& primPath,
+        const TfToken& primType,
+        const HdContainerDataSourceHandle& primvarsSource,
+        const HdContainerDataSourceHandle& inputArgs)
+    {
+        return _MotionBlurTypedSampledDataSource<T>::Handle(
+            new _MotionBlurTypedSampledDataSource<T>(
+                samplesSource, key, primPath,
+                primType, primvarsSource, inputArgs));
+    }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _PrimvarDataSource
+///
+/// Serves as data source for locator primvars>{name}
+///
+class _PrimvarDataSource final : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_PrimvarDataSource);
+
+    /// primvarSource: original data source for locator primvars>{primvarName}
+    /// primvarName: name of the primvar
+    /// primPath: path of primvarSource's parent prim (for diagnostics)
+    /// primType: type of primvarSource's parent prim
+    /// primvarsSource: data source for primvarSource's parent prim's primvars
+    /// inputArgs: data source from scene index plugin
+    _PrimvarDataSource(
+        const HdContainerDataSourceHandle& primvarSource,
+        const TfToken& primvarName,
+        const SdfPath& primPath,
+        const TfToken& primType,
+        const HdContainerDataSourceHandle& primvarsSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _primvarSource(primvarSource)
+      , _primvarName(primvarName)
+      , _primPath(primPath)
+      , _primType(primType)
+      , _primvarsSource(primvarsSource)
+      , _inputArgs(inputArgs)
+    { }
+
+    TfTokenVector GetNames() override
+    {
+        if (!_primvarSource) {
+            return {};
+        }
+        return _primvarSource->GetNames();
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override;
+
+#if PXR_VERSION < 2302
+    bool Has(const TfToken &name) override
+    {
+        const TfTokenVector names = GetNames();
+        return std::find(names.begin(), names.end(), name) != names.end();
+    }
+#endif
+
+private:
+    HdContainerDataSourceHandle _primvarSource;
+    TfToken _primvarName;
+    SdfPath _primPath;
+    TfToken _primType;
+    HdContainerDataSourceHandle _primvarsSource;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_PrimvarDataSource);
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _Visitor
+///
+/// VtVisitValue visitor for constructing the right type of typed data source
+///
+struct _Visitor
+{
+    const HdSampledDataSourceHandle samplesSource;
+    const TfToken key;
+    const SdfPath primPath;
+    const TfToken primType;
+    const HdContainerDataSourceHandle primvarsSource;
+    const HdContainerDataSourceHandle inputArgs;
+
+    /// Handler for every type except the fallback VtValue type
+    template <typename T>
+    HdDataSourceBaseHandle
+    operator()(const T&)
+    {
+        return _MotionBlurTypedSampledDataSource<T>::New(
+            samplesSource, key, primPath, primType, primvarsSource, inputArgs);
+    }
+
+    /// Handler for the fallback VtValue type
+    HdDataSourceBaseHandle
+    operator()(const VtValue&)
+    {
+        return _MotionBlurUntypedSampledDataSource::New(
+            samplesSource, key, primPath, primType, primvarsSource, inputArgs);
+    }
+};
+
+HdDataSourceBaseHandle
+_PrimvarDataSource::Get(const TfToken &name)
+{
+    if (!_primvarSource) {
+        return nullptr;
+    }
+
+    const HdDataSourceBaseHandle result = _primvarSource->Get(name);
+
+    if (name == HdPrimvarSchemaTokens->primvarValue) {
+        if (const auto source = HdSampledDataSource::Cast(result)) {
+            return VtVisitValue(source->GetValue(0.0f),
+                _Visitor { source, _primvarName, _primPath,
+                    _primType, _primvarsSource, _inputArgs });
+        }
+    }
+
+    return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _PrimvarsDataSource
+///
+/// Serves as data source for locator primvars
+///
+class _PrimvarsDataSource final : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_PrimvarsDataSource);
+
+    /// primvarsSource: original data source for locator primvars
+    /// primPath: path of primvarsSource's parent prim (for diagnostics)
+    /// primType: type of primvarsSource's parent prim
+    /// inputArgs: source from scene index plugin
+    _PrimvarsDataSource(
+        const HdContainerDataSourceHandle& primvarsSource,
+        const SdfPath& primPath,
+        const TfToken& primType,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _primvarsSource(primvarsSource)
+      , _primPath(primPath)
+      , _primType(primType)
+      , _inputArgs(inputArgs)
+    { }
+
+    TfTokenVector GetNames() override
+    {
+        if (!_primvarsSource) {
+            return {};
+        }
+
+        return _primvarsSource->GetNames();
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override;
+
+#if PXR_VERSION < 2302
+    bool Has(const TfToken &name) override
+    {
+        const TfTokenVector names = GetNames();
+        return std::find(names.begin(), names.end(), name) != names.end();
+    }
+#endif
+
+private:
+    HdContainerDataSourceHandle _primvarsSource;
+    SdfPath _primPath;
+    TfToken _primType;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_PrimvarsDataSource);
+
+HdDataSourceBaseHandle
+_PrimvarsDataSource::Get(const TfToken &name)
+{
+    if (!_primvarsSource) {
+        return nullptr;
+    }
+
+    HdDataSourceBaseHandle const result = _primvarsSource->Get(name);
+
+    // All primvars need to be handled, not just the blurable ones, because any
+    // primvar might have authored time samples, and we need to make sure
+    // that only a single time sample (at offset 0) makes it downstream when
+    // the primvar is not blurable.
+    if (const auto primvarSource = HdContainerDataSource::Cast(result)) {
+        return _PrimvarDataSource::New(
+            primvarSource,
+            name,
+            _primPath,
+            _primType,
+            _primvarsSource,
+            _inputArgs);
+    }
+
+    return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _XformDataSource
+///
+/// Serves as data source for locator xform
+///
+class _XformDataSource final : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_XformDataSource);
+
+    /// xformSource: the original data source for locator xform
+    /// primPath: path of xformSource's parent prim (for diagnostics)
+    /// primType: type of xformSource's parent prim
+    /// primvarsSource: data source for xformSource's parent prim's primvars
+    /// inputArgs: data source from scene index plugin
+    _XformDataSource(
+        const HdContainerDataSourceHandle& xformSource,
+        const SdfPath& primPath,
+        const TfToken& primType,
+        const HdContainerDataSourceHandle& primvarsSource,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _xformSource(xformSource)
+      , _primPath(primPath)
+      , _primType(primType)
+      , _primvarsSource(primvarsSource)
+      , _inputArgs(inputArgs)
+    { }
+
+    TfTokenVector GetNames() override
+    {
+        if (!_xformSource) {
+            return {};
+        }
+        return _xformSource->GetNames();
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken& name) override;
+
+#if PXR_VERSION < 2302
+    bool Has(const TfToken &name) override
+    {
+        const TfTokenVector names = GetNames();
+        return std::find(names.begin(), names.end(), name) != names.end();
+    }
+#endif
+
+private:
+    HdContainerDataSourceHandle _xformSource;
+    SdfPath _primPath;
+    TfToken _primType;
+    HdContainerDataSourceHandle _primvarsSource;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_XformDataSource);
+
+HdDataSourceBaseHandle
+_XformDataSource::Get(const TfToken& name)
+{
+    if (!_xformSource) {
+        return nullptr;
+    }
+
+    const HdDataSourceBaseHandle result = _xformSource->Get(name);
+
+    if (name == HdXformSchemaTokens->matrix) {
+        if (const auto source = HdSampledDataSource::Cast(result)) {
+            return VtVisitValue(source->GetValue(0.0f),
+                _Visitor { source, name, _primPath,
+                    _primType, _primvarsSource, _inputArgs });
+        }
+    }
+    return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _PrimDataSource
+///
+/// Serves as data source for a prim.
+///
+class _PrimDataSource final : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_PrimDataSource);
+
+    /// primSource: original data source for prim
+    /// primPath: path of prim (for diagnostics)
+    /// primType: type of prim
+    /// inputArgs: source from scene index plugin
+    _PrimDataSource(
+        const HdContainerDataSourceHandle& primSource,
+        const SdfPath& primPath,
+        const TfToken& primType,
+        const HdContainerDataSourceHandle& inputArgs)
+      : _primSource(primSource)
+      , _primPath(primPath)
+      , _primType(primType)
+      , _inputArgs(inputArgs)
+    { }
+
+    TfTokenVector GetNames() override
+    {
+        if (!_primSource) {
+            return {};
+        }
+
+        return _primSource->GetNames();
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override;
+
+#if PXR_VERSION < 2302
+    bool Has(const TfToken &name) override
+    {
+        const TfTokenVector names = GetNames();
+        return std::find(names.begin(), names.end(), name) != names.end();
+    }
+#endif
+
+private:
+    HdContainerDataSourceHandle _primSource;
+    SdfPath _primPath;
+    TfToken _primType;
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+HD_DECLARE_DATASOURCE_HANDLES(_PrimDataSource);
+
+HdDataSourceBaseHandle
+_PrimDataSource::Get(const TfToken &name)
+{
+    if (!_primSource) {
+        return nullptr;
+    }
+
+    const HdDataSourceBaseHandle result = _primSource->Get(name);
+
+    if (name == HdPrimvarsSchemaTokens->primvars) {
+        if (const auto primvarsSource = HdContainerDataSource::Cast(result)) {
+            return _PrimvarsDataSource::New(
+                primvarsSource, _primPath, _primType, _inputArgs);
+        }
+    }
+
+    if (name == HdXformSchemaTokens->xform) {
+        if (const auto xformSource = HdContainerDataSource::Cast(result)) {
+            if (const auto primvarsSource = HdContainerDataSource::Cast(
+                _primSource->Get(
+#if PXR_VERSION < 2308
+                    HdPrimvarsSchemaTokens->primvars
+#else
+                    HdPrimvarsSchema::GetSchemaToken()
+#endif
+                ))) {
+                return _XformDataSource::New(
+                    xformSource, _primPath, _primType,
+                    primvarsSource, _inputArgs);
+            }
+        }
+    }
+
+    return result;
+}
+
+TF_DECLARE_REF_PTRS(_HdPrmanMotionBlurSceneIndex);
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/// \class _HdPrmanMotionBlurSceneIndex
+///
+/// The scene index provided by the HdPrman_MotionBlurSceneIndexPlugin
+///
+class _HdPrmanMotionBlurSceneIndex final
+  : public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static _HdPrmanMotionBlurSceneIndexRefPtr New(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex,
+        const HdContainerDataSourceHandle& inputArgs)
+    {
+        return TfCreateRefPtr(
+            new _HdPrmanMotionBlurSceneIndex(
+                inputSceneIndex, inputArgs));
+    }
+
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override
+    {
+        const HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+        if (_PrimIsBlurable(prim)) {
+            return {
+                prim.primType,
+                _PrimDataSource::New(
+                    prim.dataSource, primPath, prim.primType, _inputArgs) };
+        }
+        return prim;
+    }
+
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override
+    {
+        return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+    }
+
+protected:
+    _HdPrmanMotionBlurSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex,
+        const HdContainerDataSourceHandle& inputArgs)
+      : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+      , _inputArgs(inputArgs)
+    { }
+
+    void _PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::AddedPrimEntries &entries) override
+    {
+        if (!_IsObserved()) {
+            return;
+        }
+        _SendPrimsAdded(entries);
+    }
+
+    void _PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::RemovedPrimEntries &entries) override
+    {
+        if (!_IsObserved()) {
+            return;
+        }
+        _SendPrimsRemoved(entries);
+    }
+
+    void _PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries &entries) override;
+
+private:
+    static bool _PrimIsBlurable(const HdSceneIndexPrim& prim)
+    {
+        // Transformables, points-based, and instancers are blurable, but
+        // points-based and instancers are always also transformable so
+        // we only check for the xform schema.
+
+        // XXX: renderSettings and integrator prim types currently leak
+        // through a transformable check, so we also filter out those
+        // specific prim types
+#if PXR_VERSION >= 2208
+        if (prim.primType == HdPrimTypeTokens->renderSettings
+#if PXR_VERSION >= 2308
+            || prim.primType == HdPrimTypeTokens->integrator
+#endif
+        ) {
+            return false;
+        }
+#endif
+        return bool(HdXformSchema::GetFromParent(prim.dataSource));
+    };
+
+    HdContainerDataSourceHandle _inputArgs;
+};
+
+HdDataSourceLocator
+_GetPrimvarValueLocator(const TfToken &name)
+{
+    return HdDataSourceLocator(
+        HdPrimvarsSchemaTokens->primvars,
+        name,
+        HdPrimvarSchemaTokens->primvarValue);
+}
+
+void
+_HdPrmanMotionBlurSceneIndex::_PrimsDirtied(
+    const HdSceneIndexBase& sender,
+    const HdSceneIndexObserver::DirtiedPrimEntries& entries)
+{
+    if (!_IsObserved()) {
+        return;
+    }
+
+    // XXX: Invalidating all primvars is a bit heavy handed, but currently
+    // hdPrman (mostly) refreshes all primvars when any primvar gets
+    // invalidated anyway.
+
+    static const auto primvarsLocator =
+        HdDataSourceLocator(HdPrimvarsSchemaTokens->primvars);
+
+    static const auto xformLocator =
+        HdDataSourceLocator(HdXformSchemaTokens->xform);
+
+    // If any of these changed, we invalidate all primvars
+    static const HdDataSourceLocatorSet primvarsRelevantLocators {
+        _GetPrimvarValueLocator(HdTokens->velocities),
+        _GetPrimvarValueLocator(HdTokens->accelerations),
+        _GetPrimvarValueLocator(_tokens->angularVelocities),
+        _GetPrimvarValueLocator(_tokens->mblur),
+        _GetPrimvarValueLocator(_tokens->geosamples),
+        _GetPrimvarValueLocator(_tokens->xformsamples),
+        _GetPrimvarValueLocator(HdTokens->nonlinearSampleCount),
+        _GetPrimvarValueLocator(HdTokens->blurScale) };
+
+    // If any of these changed, we invalidate the xform
+    static const HdDataSourceLocatorSet xformRelevantLocators {
+        _GetPrimvarValueLocator(_tokens->mblur),
+        _GetPrimvarValueLocator(_tokens->xformsamples),
+        _GetPrimvarValueLocator(HdTokens->blurScale) };
+
+    std::vector<size_t> primvarIndices;
+    std::vector<size_t> xformIndices;
+
+    for (size_t i = 0; i < entries.size(); i++) {
+        const HdDataSourceLocatorSet &locators = entries[i].dirtyLocators;
+        if (locators.Intersects(primvarsRelevantLocators)) {
+            if (!locators.Intersects(primvarsLocator)) {
+                primvarIndices.push_back(i);
+            }
+        }
+        if (locators.Intersects(xformRelevantLocators)) {
+            if (!locators.Intersects(xformLocator)) {
+                xformIndices.push_back(i);
+            }
+        }
+    }
+
+    if (primvarIndices.empty() && xformIndices.empty()) {
+         _SendPrimsDirtied(entries);
+        return;
+    }
+
+    HdSceneIndexObserver::DirtiedPrimEntries newEntries(entries);
+    for (size_t i : primvarIndices) {
+        newEntries[i].dirtyLocators.insert(primvarsLocator);
+    }
+    for (size_t i : xformIndices) {
+        newEntries[i].dirtyLocators.insert(xformLocator);
+    }
+
+    _SendPrimsDirtied(newEntries);
+}
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+// Implementation of HdPrman_MotionBlurSceneIndexPlugin.
+
+HdPrman_MotionBlurSceneIndexPlugin::
+HdPrman_MotionBlurSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_MotionBlurSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr& inputScene,
+    const HdContainerDataSourceHandle& inputArgs)
+{
+    return _HdPrmanMotionBlurSceneIndex::New(inputScene, inputArgs);
+}
+
+// TODO: Query the camera's shutter interval in a better way!
+// This method is called by the camera to update
+// with its shutter interval, which is necessary
+// when we're doing velocity blur and UsdImaging doesn't have the sample times.
+void
+HdPrman_MotionBlurSceneIndexPlugin::SetShutterInterval(
+    float shutterOpen, float shutterClose)
+{
+    TF_DEBUG(HDPRMAN_MOTION_BLUR).Msg("SetShutterInterval(%f, %f)\n",
+        shutterOpen, shutterClose);
+    _shutterOpen = shutterOpen;
+    _shutterClose = shutterClose;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/motionBlurSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/motionBlurSceneIndexPlugin.h
new file mode 100644
index 0000000000..018fdd738e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/motionBlurSceneIndexPlugin.h
@@ -0,0 +1,52 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MOTION_BLUR_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MOTION_BLUR_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_MotionBlurSceneIndexPlugin
+/// 
+/// Plugin provides a scene index that interprets and reshapes the upstream
+/// scene for motion blur according to Prman's capabilities. This scene index
+/// plugin handles all types of motion blur, including:
+///  * transform motion blur, achieved by animating a prim's xform property or
+///    by animating individual instance positions, orientations, scales, or
+///    transforms,
+///  * deformation motion blur, achieved by animating a points-based prim's
+///    points primvar, and
+///  * velocity motion blur, achieved by providing velocities, angular
+///    velocities, and accelerations for a points-based or point instancer prim.
+/// This plugin is exclusively responsible for reshaping data sources for motion
+/// blur. Downstream consumers do not need to consider whether motion blur is
+/// enabled or any other details of whether or how motion blur should be
+/// applied.
+///
+/// Note that the fps (needed because the shutter offset is in frames and
+/// the velocity in length/second) is hard-coded to 24.0.
+///
+/// The plugin is registered with the scene index plugin registry for Prman.
+///
+class HdPrman_MotionBlurSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_MotionBlurSceneIndexPlugin();
+
+    static void SetShutterInterval(float shutterOpen, float shutterClose);
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_MOTION_BLUR_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..c5e5be8e02
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.cpp
@@ -0,0 +1,67 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/pinnedCurveExpandingSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hdsi/pinnedCurveExpandingSceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_PinnedCurveExpandingSceneIndexPlugin"))
+);
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registrations
+////////////////////////////////////////////////////////////////////////////////
+
+static const char * const _rendererDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_PinnedCurveExpandingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // Should be chained *after*:
+    // - extComputationPrimvarPruningSceneIndex (to allow expansion of computed
+    //   primvars on pinned curves) and
+    // - procedural plugin (HdGpSceneIndexPlugin) to allow expansion of
+    //   computed primvars on procedurally generated pinned curves.
+    //
+    const HdSceneIndexPluginRegistry::InsertionPhase
+        insertionPhase = 3; // HdGpSceneIndexPlugin()::GetInsertionPhase() + 1;
+
+    // Register the plugins conditionally.
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _rendererDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr, // no argument data necessary
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index Implementations
+////////////////////////////////////////////////////////////////////////////////
+
+HdPrman_PinnedCurveExpandingSceneIndexPlugin::
+HdPrman_PinnedCurveExpandingSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_PinnedCurveExpandingSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    TF_UNUSED(inputArgs);
+    return HdsiPinnedCurveExpandingSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.h
new file mode 100644
index 0000000000..029db6a238
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/pinnedCurveExpandingSceneIndexPlugin.h
@@ -0,0 +1,35 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PINNED_CURVE_EXPANDING_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PINNED_CURVE_EXPANDING_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_PinnedCurveExpandingSceneIndexPlugin
+///
+/// Prman scene index plugin that expands pinned basis curves by replicating
+/// end values per curve for vertex and varying primvars.
+///
+class HdPrman_PinnedCurveExpandingSceneIndexPlugin :
+    public HdSceneIndexPlugin
+{
+public:
+    HdPrman_PinnedCurveExpandingSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PINNED_CURVE_EXPANDING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/plugInfo.json b/third_party/renderman-26/plugin/hdPrman/plugInfo.json
new file mode 100644
index 0000000000..0fceca244a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/plugInfo.json
@@ -0,0 +1,123 @@
+{
+    "Plugins": [
+        {
+            "Info": {
+                "Types": {
+                    "HdPrman_MotionBlurSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Motion Blur Scene Index"
+                    },
+                    "HdPrman_PreviewMaterialFilteringSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Preview Material Filtering Scene Index"
+                    },
+                    "HdPrman_MaterialXFilteringSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman MaterialX Filtering Scene Index"
+                    },
+                    "HdPrman_VirtualStructResolvingSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Vstruct Resolving Scene Index"
+                    },
+                    "HdPrman_ImplicitSurfaceSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Implicit Surfaces"
+                    },
+                    "HdPrman_DependencyForwardingSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Dependency Forwarding Scene Index"
+                    },
+                    "HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Render Terminal Output Invalidating Scene Index"
+                    },
+                    "HdPrman_MaterialPrimvarTransferSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Material Primvar Transfer Scene Index"
+                    },
+                    "HdPrman_PinnedCurveExpandingSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Pinned Curve Expanding Scene Index"
+                    },
+                    "HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman ExtComputation Primvar Pruning Scene Index"
+                    },
+                    "HdPrman_RenderPassSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Render Pass Scene Index"
+                    },
+                    "HdPrman_RenderSettingsFilteringSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Render Settings Filtering Scene Index"
+                    },
+                    "HdPrman_CoordSysPrimSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Coord Sys Prim Scene Index"
+                    },
+                    "HdPrman_UpdateObjectSettingsSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer": "Prman",
+                        "priority": 0,
+                        "displayName": "Prman Update Object Settings Prim Scene Index"
+                    },
+                    "HdPrman_TetMeshConversionSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer" : "Prman",
+                        "priority": 0,
+                        "displayName": "Scene Index to convert tet meshes into standard triangle based meshes."
+                    },
+                    "HdPrman_RileyFallbackMaterialSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer" : "Prman",
+                        "priority": 0,
+                        "displayName": "Adds fallback material to scene index."
+                    },
+                    "HdPrman_RileyConversionSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer" : "Prman",
+                        "priority": 0,
+                        "displayName": "Converts Hydra prims to Riley prims."
+                    },
+                    "HdPrman_LightLinkingSceneIndexPlugin" : {
+                        "bases": ["HdSceneIndexPlugin"],
+                        "loadWithRenderer" : "Prman",
+                        "priority": 0,
+                        "displayName": "Scene index that implements light linking."
+                    }
+                }
+            },
+            "LibraryPath": "@PLUG_INFO_LIBRARY_PATH@",
+            "Name": "hdPrman",
+            "ResourcePath": "@PLUG_INFO_RESOURCE_PATH@",
+            "Root": "@PLUG_INFO_ROOT@",
+            "Type": "library"
+        }
+    ]
+}
diff --git a/third_party/renderman-26/plugin/hdPrman/points.cpp b/third_party/renderman-26/plugin/hdPrman/points.cpp
new file mode 100644
index 0000000000..36b33cf137
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/points.cpp
@@ -0,0 +1,69 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/points.h"
+
+#include "hdPrman/renderParam.h"
+#include "hdPrman/material.h"
+#include "hdPrman/rixStrings.h"
+
+#include "RiTypesHelper.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#if PXR_VERSION > 2011
+HdPrman_Points::HdPrman_Points(SdfPath const& id)
+    : BASE(id)
+#else
+HdPrman_Points::HdPrman_Points(SdfPath const& id,
+                               SdfPath const& instancerId)
+    : BASE(id, instancerId)
+#endif
+{
+}
+
+HdDirtyBits
+HdPrman_Points::GetInitialDirtyBitsMask() const
+{
+    // The initial dirty bits control what data is available on the first
+    // run through _PopulateRtPoints(), so it should list every data item
+    // that _PopluateRtPoints requests.
+    int mask = HdChangeTracker::Clean
+        | HdChangeTracker::DirtyPoints
+        | HdChangeTracker::DirtyTransform
+        | HdChangeTracker::DirtyVisibility
+        | HdChangeTracker::DirtyPrimvar
+        | HdChangeTracker::DirtyNormals
+        | HdChangeTracker::DirtyWidths
+        | HdChangeTracker::DirtyMaterialId
+        | HdChangeTracker::DirtyInstancer
+        ;
+
+    return (HdDirtyBits)mask;
+}
+
+RtPrimVarList
+HdPrman_Points::_ConvertGeometry(HdPrman_RenderParam *renderParam,
+                                  HdSceneDelegate *sceneDelegate,
+                                  const SdfPath &id,
+                                  RtUString *primType,
+                                  std::vector<HdGeomSubset> *geomSubsets)
+{
+    RtPrimVarList primvars;
+
+    const size_t npoints =
+        HdPrman_ConvertPointsPrimvarForPoints(
+            sceneDelegate, id, renderParam->GetShutterInterval(), primvars);
+
+    *primType = RixStr.k_Ri_Points;
+
+    HdPrman_ConvertPrimvars(sceneDelegate, id, primvars, 1,
+                            npoints, npoints, npoints);
+
+    return primvars;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/points.h b/third_party/renderman-26/plugin/hdPrman/points.h
new file mode 100644
index 0000000000..c4be901e0f
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/points.h
@@ -0,0 +1,40 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_POINTS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_POINTS_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/gprim.h"
+#include "pxr/imaging/hd/points.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_Points final : public HdPrman_Gprim<HdPoints>
+{
+public:
+    using BASE = HdPrman_Gprim<HdPoints>;
+
+    HF_MALLOC_TAG_NEW("new HdPrman_Points");
+
+    HdPrman_Points(SdfPath const& id);
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+protected:
+    RtPrimVarList
+    _ConvertGeometry(HdPrman_RenderParam *renderParam,
+                     HdSceneDelegate *sceneDelegate,
+                     const SdfPath &id,
+                     RtUString *primType,
+                     std::vector<HdGeomSubset> *geomSubsets) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_POINTS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..8753940cc3
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.cpp
@@ -0,0 +1,695 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/portalLightResolvingSceneIndexPlugin.h"
+
+#include "pxr/base/gf/rotation.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/imaging/hd/dataSource.h"
+#include "pxr/imaging/hd/dataSourceMaterialNetworkInterface.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/light.h"
+#include "pxr/imaging/hd/lightSchema.h"
+#include "pxr/imaging/hd/materialSchema.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/version.h"
+#include "pxr/imaging/hd/visibilitySchema.h"
+#include "pxr/imaging/hd/xformSchema.h"
+#include "pxr/usd/sdf/assetPath.h"
+
+#include <boost/functional/hash.hpp>
+
+#include <algorithm>
+#include <iterator>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (PortalLight)
+    (PxrPortalLight)
+    ((sceneIndexPluginName, "HdPrman_PortalLightResolvingSceneIndexPlugin"))
+
+    // material network tokens
+    (color)
+    ((colorMap,                "texture:file"))
+    ((domeColorMap,            "ri:light:domeColorMap"))
+    (exposure)
+    (intensity)
+    ((intensityMult,           "ri:light:intensityMult"))
+    ((portalName,              "ri:light:portalName"))
+    ((portalToDome,            "ri:light:portalToDome"))
+    ((tint,                    "ri:light:tint"))
+
+    // render context / material network selector
+    ((renderContext, "ri"))
+);
+
+// Material parameters for which we should overwrite unauthored values
+// on a portal light with authored values from the portal's dome light.
+TF_DEFINE_PRIVATE_TOKENS(
+    _inheritedAttrTokens,
+
+    (colorEnableTemperature)
+    ((colorMapGamma,           "ri:light:colorMapGamma"))
+    ((colorMapSaturation,      "ri:light:colorMapSaturation"))
+    (colorTemperature)
+    (diffuse)
+    ((importanceMultiplier,    "ri:light:importanceMultiplier"))
+    ((shadowColor,             "shadow:color"))
+    ((shadowDistance,          "shadow:distance"))
+    ((shadowEnable,            "shadow:enable"))
+    ((shadowFalloff,           "shadow:falloff"))
+    ((shadowFalloffGamma,      "shadow:falloffGamma"))
+    (specular)
+    ((thinShadow,              "ri:light:thinShadow"))
+    ((traceLightPaths,         "ri:light:traceLightPaths"))
+    ((visibleInRefractionPath, "ri:light:visibleInRefractionPath"))
+);
+
+static const char* const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_PortalLightResolvingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // We need an insertion point that's *after* general material resolve.
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 115;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+namespace {
+
+bool
+_IsPortalLight(const HdSceneIndexPrim& prim, const SdfPath& primPath)
+{
+    auto matDataSource =
+        HdMaterialSchema::GetFromParent(prim.dataSource)
+            .GetMaterialNetwork(_tokens->renderContext)
+#if HD_API_VERSION >= 63
+            .GetContainer()
+#endif
+        ;
+    HdDataSourceMaterialNetworkInterface matInterface(primPath, matDataSource,
+                                                      prim.dataSource);
+
+    const auto matTerminal =
+        matInterface.GetTerminalConnection(HdMaterialTerminalTokens->light);
+    const auto nodeName = matTerminal.second.upstreamNodeName;
+
+    const TfToken nodeTypeName = matInterface.GetNodeType(nodeName);
+
+    // We accept either the generic UsdLux "PortalLight" or the
+    // RenderMan-specific "PxrPortalLight" here.  (The former can
+    // occur when using Hydra render index emulation.  In that
+    // setup, the scene index chain runs prior to applying the
+    // renderContextNodeIdentifier to individual nodes.)
+    return (nodeTypeName == _tokens->PxrPortalLight
+        || nodeTypeName == _tokens->PortalLight);
+}
+
+// Helper function to extract a value from a light data source.
+template <typename T>
+T
+_GetLightData(
+    const HdContainerDataSourceHandle& primDataSource,
+    const TfToken& name)
+{
+    if (auto lightSchema = HdLightSchema::GetFromParent(primDataSource)) {
+        if (auto dataSource = HdTypedSampledDataSource<T>::Cast(
+                lightSchema.GetContainer()->Get(name))) {
+            return dataSource->GetTypedValue(0.0f);
+        }
+    }
+
+    return {};
+}
+
+SdfPathVector
+_GetPortalPaths(const HdContainerDataSourceHandle& primDataSource)
+{
+    return _GetLightData<SdfPathVector>(primDataSource, HdTokens->portals);
+}
+
+SdfPathVector
+_GetLightFilterPaths(const HdContainerDataSourceHandle& primDataSource)
+{
+    return _GetLightData<SdfPathVector>(primDataSource, HdTokens->filters);
+}
+
+std::string
+_GetPortalName(
+    const std::string& domeColorMap,
+    const GfMatrix4d& domeXform,
+    const GfMatrix4d& portalXform)
+{
+    size_t hashValue = 0;
+    boost::hash_combine(hashValue, domeColorMap);
+    boost::hash_combine(hashValue, domeXform.ExtractRotation());
+    boost::hash_combine(hashValue, portalXform.ExtractRotation());
+
+    return std::to_string(hashValue);
+}
+
+HdContainerDataSourceHandle
+_BuildDomeLightDataSource(
+    const SdfPath& domePrimPath,
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    const auto domePrim = inputSceneIndex->GetPrim(domePrimPath);
+
+    // The dome light has portals, or we wouldn't be calling this function.
+    // Mute the dome light so that it doesn't show up in the render.
+
+    // XXX -- Maybe we should also clear the filters in the dome's light data
+    //        source. These filters will apply directly to the dome's portals
+    //        rather than to the dome (which is muted anyway). However, it
+    //        doesn't appear to be necessary to remove filters from the dome,
+    //        and might require us to store and update dome filter paths in
+    //        the scene index class (lest they be cleared prematurely here)
+    //        so we won't bother for now.
+
+    const HdContainerDataSourceHandle visibilityDataSource =
+        HdVisibilitySchema::Builder()
+            .SetVisibility(HdRetainedTypedSampledDataSource<bool>::New(false))
+            .Build();
+
+    return HdOverlayContainerDataSource::New(
+        HdRetainedContainerDataSource::New(
+            HdVisibilitySchemaTokens->visibility, visibilityDataSource),
+        domePrim.dataSource);
+}
+
+HdContainerDataSourceHandle
+_BuildPortalLightDataSource(
+    const SdfPath& domePrimPath,
+    const SdfPath& portalPrimPath,
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    const auto domePrim   = inputSceneIndex->GetPrim(domePrimPath);
+    const auto portalPrim = inputSceneIndex->GetPrim(portalPrimPath);
+
+    if (!domePrim.dataSource || !_IsPortalLight(portalPrim, portalPrimPath)) {
+        // Without a dome prim there's nothing to do here.
+        return portalPrim.dataSource;
+    }
+
+    // Get data sources for the associated dome light.
+    // -------------------------------------------------------------------------
+    const HdContainerDataSourceHandle domeMatDataSource = 
+        HdMaterialSchema::GetFromParent(domePrim.dataSource)
+            .GetMaterialNetwork(_tokens->renderContext)
+#if HD_API_VERSION >= 63
+            .GetContainer()
+#endif
+        ;
+    HdDataSourceMaterialNetworkInterface domeMatInterface(domePrimPath,
+                                                          domeMatDataSource,
+                                                          domePrim.dataSource);
+
+    const auto domeMatTerminal =
+        domeMatInterface.GetTerminalConnection(HdMaterialTerminalTokens->light);
+
+    HdXformSchema domeXformSchema =
+        HdXformSchema::GetFromParent(domePrim.dataSource);
+
+    // Get some relevant values from the dome light's data sources.
+    // -------------------------------------------------------------------------
+    const auto getDomeMatVal =
+        [&domeMatInterface, &domeMatTerminal](const TfToken& paramName){
+            return domeMatInterface.GetNodeParameterValue(
+                domeMatTerminal.second.upstreamNodeName, paramName);
+        };
+
+    const VtValue domeColorMapVal  = getDomeMatVal(_tokens->colorMap);
+    const VtValue domeColorVal     = getDomeMatVal(_tokens->color);
+    const VtValue domeIntensityVal = getDomeMatVal(_tokens->intensity);
+    const VtValue domeExposureVal  = getDomeMatVal(_tokens->exposure);
+
+    const std::string domeColorMap =
+        domeColorMapVal.IsHolding<SdfAssetPath>()
+            ? domeColorMapVal.UncheckedGet<SdfAssetPath>().GetResolvedPath()
+            : "";
+
+    const auto domeColor     = domeColorVal.GetWithDefault(GfVec3f(1.0f));
+    const auto domeIntensity = domeIntensityVal.GetWithDefault(1.0f);
+    const auto domeExposure  = domeExposureVal.GetWithDefault(0.0f);
+
+    GfMatrix4d domeXform;
+    if (const auto origDomeXform = domeXformSchema.GetMatrix()) {
+        // This matrix encodes a -90 deg rotation about the x-axis and a 90 deg
+        // rotation about the y-axis, which correspond to the transform needed
+        // for prman to convert right handed to left handed.
+        static const GfMatrix4d domeXformAdjustment( 0.0, 0.0, -1.0, 0.0,
+                                                    -1.0, 0.0,  0.0, 0.0,
+                                                     0.0, 1.0,  0.0, 0.0,
+                                                     0.0, 0.0,  0.0, 1.0);
+
+        domeXform = domeXformAdjustment * origDomeXform->GetTypedValue(0.0f);
+    }
+    else {
+        domeXform.SetIdentity();
+    }
+
+    // Get data sources for the portal light.
+    // -------------------------------------------------------------------------
+    const HdContainerDataSourceHandle portalMatDataSource = 
+        HdMaterialSchema::GetFromParent(portalPrim.dataSource)
+            .GetMaterialNetwork(_tokens->renderContext)
+#if HD_API_VERSION >= 63
+            .GetContainer()
+#endif
+        ;
+
+    HdDataSourceMaterialNetworkInterface portalMatInterface(
+        portalPrimPath, portalMatDataSource, portalPrim.dataSource);
+
+    const auto portalMatTerminal =
+        portalMatInterface.GetTerminalConnection(
+            HdMaterialTerminalTokens->light);
+
+    HdXformSchema portalXformSchema =
+        HdXformSchema::GetFromParent(portalPrim.dataSource);
+
+    // Get some relevant values from the portal light's data sources.
+    // -------------------------------------------------------------------------
+    const auto getPortalMatVal =
+        [&portalMatInterface, &portalMatTerminal](const TfToken& paramName){
+            return portalMatInterface.GetNodeParameterValue(
+                portalMatTerminal.second.upstreamNodeName, paramName);
+        };
+
+    const VtValue portalTintVal    = getPortalMatVal(_tokens->tint);
+    const VtValue portalIntMultVal = getPortalMatVal(_tokens->intensityMult);
+
+    const auto portalTint    = portalTintVal.GetWithDefault(GfVec3f(1.0f));
+    const auto portalIntMult = portalIntMultVal.GetWithDefault(1.0f);
+
+    GfMatrix4d portalXform;
+    if (const auto origPortalXform = portalXformSchema.GetMatrix()) {
+        // This matrix encodes a 180 deg rotation about the y-axis and a -1
+        // scale in y, which correspond to the transform needed for prman to
+        // convert right handed to left handed.
+        static const GfMatrix4d portalXformAdjustment(-1.0,  0.0,  0.0, 0.0,
+                                                       0.0, -1.0,  0.0, 0.0,
+                                                       0.0,  0.0, -1.0, 0.0,
+                                                       0.0,  0.0,  0.0, 1.0);
+
+        portalXform = portalXformAdjustment *
+                      origPortalXform->GetTypedValue(0.0f);
+    }
+    else {
+        portalXform.SetIdentity();
+    }
+
+    // Compute new values for the portal's material data source.
+    // -------------------------------------------------------------------------
+    const auto setPortalParamVal =
+        [&portalMatInterface, &portalMatTerminal](
+            const TfToken& paramName, const VtValue& value)
+        {
+            portalMatInterface.SetNodeParameterValue(
+                portalMatTerminal.second.upstreamNodeName, paramName, value);
+        };
+
+    const auto computedPortalColor = GfCompMult(portalTint, domeColor);
+    const auto computedPortalIntensity = portalIntMult * domeIntensity *
+                                         powf(2.0f, domeExposure);
+    const auto computedPortalToDome = portalXform * domeXform.GetInverse();
+    const auto computedPortalName = _GetPortalName(domeColorMap, domeXform,
+                                                   portalXform);
+
+    setPortalParamVal(_tokens->domeColorMap, VtValue(domeColorMap));
+    setPortalParamVal(_tokens->color,        VtValue(computedPortalColor));
+    setPortalParamVal(_tokens->intensity,    VtValue(computedPortalIntensity));
+    setPortalParamVal(_tokens->portalToDome, VtValue(computedPortalToDome));
+    setPortalParamVal(_tokens->portalName,   VtValue(computedPortalName));
+
+    // XXX -- We can probably delete the portal's tint and intensityMult params
+    //        now, since they're not used by the RenderMan light shader.
+
+    // Directly copy a bunch of other params from the dome to the portal.
+    // XXX -- We'd like to do this only for *unauthored* portal params. However,
+    //        there's no obvious way to tell which params are user-authored.
+    for (const auto& attr: _inheritedAttrTokens->allTokens) {
+        setPortalParamVal(attr, getDomeMatVal(attr));
+    }
+
+    // Compute new values for the portal's light data source.
+    // -------------------------------------------------------------------------
+    // All we're going to do is copy the light filter paths from the dome's
+    // light.filters data source to the portal's light.filters data source.
+    // This means that the filter prims will still just exist under the dome
+    // and filter xforms will be relative to the dome, not the portal. That
+    // xform behavior is expected; it matches what happens in Katana.
+    SdfPathVector domeFilters = _GetLightFilterPaths(domePrim.dataSource);
+    SdfPathVector allFilters  = _GetLightFilterPaths(portalPrim.dataSource);
+    allFilters.insert(allFilters.end(),
+                      std::make_move_iterator(domeFilters.begin()),
+                      std::make_move_iterator(domeFilters.end()));
+    const auto computedFiltersDataSource =
+        HdRetainedTypedSampledDataSource<SdfPathVector>::New(allFilters);
+
+    // XXX -- If the portal has an authored shadowLink value, we shouldn't
+    //        overwrite it. (The shadowLink code should be updated when we have
+    //        a good way to tell whether values are authored.)
+    const auto computedShadowLinkDataSource =
+        HdRetainedTypedSampledDataSource<TfToken>::New(
+            _GetLightData<TfToken>(domePrim.dataSource, HdTokens->shadowLink));
+
+    // Assemble the final data source for the portal light.
+    // -------------------------------------------------------------------------
+    std::vector<TfToken> names;
+    std::vector<HdDataSourceBaseHandle> sources;
+
+    names.push_back(HdMaterialSchemaTokens->material);
+    sources.push_back(HdRetainedContainerDataSource::New(
+        _tokens->renderContext, portalMatInterface.Finish()));
+
+    names.push_back(HdLightSchemaTokens->light);
+    sources.push_back(HdRetainedContainerDataSource::New(
+        HdTokens->filters,    computedFiltersDataSource,
+        HdTokens->shadowLink, computedShadowLinkDataSource));
+
+    return HdOverlayContainerDataSource::New(
+        HdRetainedContainerDataSource::New(
+            names.size(), names.data(), sources.data()),
+        portalPrim.dataSource);
+}
+
+//
+// _PortalLightResolvingSceneIndex
+//
+
+TF_DECLARE_REF_PTRS(_PortalLightResolvingSceneIndex);
+
+// Pixar-only, Prman-specific Hydra scene index to resolve portal lights.
+class _PortalLightResolvingSceneIndex
+    : public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static _PortalLightResolvingSceneIndexRefPtr New(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex);
+
+    HdSceneIndexPrim GetPrim(const SdfPath& primPath) const override;
+    SdfPathVector GetChildPrimPaths(const SdfPath& primPath) const override;
+
+protected:
+    _PortalLightResolvingSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex);
+    ~_PortalLightResolvingSceneIndex();
+
+    void _PrimsAdded(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::AddedPrimEntries& entries) override;
+
+    void _PrimsRemoved(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::RemovedPrimEntries& entries) override;
+
+    void _PrimsDirtied(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries& entries) override;
+
+private:
+    SdfPathVector _AddMappingsForDome(const SdfPath& domePrimPath);
+    SdfPathVector _RemoveMappingsForDome(const SdfPath& domePrimPath);
+
+private:
+    // Map dome light paths to flag indicating presence of associated portals.
+    std::unordered_map<SdfPath, bool, SdfPath::Hash> _domesWithPortals;
+
+    // Map portal path to dome path. A previous name for this map was
+    // "_portalToDome", but that conflicts with a material param name.
+    std::unordered_map<SdfPath, SdfPath, SdfPath::Hash> _portalsToDomes;
+};
+
+/* static */
+_PortalLightResolvingSceneIndexRefPtr
+_PortalLightResolvingSceneIndex::New(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    return TfCreateRefPtr(
+        new _PortalLightResolvingSceneIndex(inputSceneIndex));
+}
+
+_PortalLightResolvingSceneIndex::_PortalLightResolvingSceneIndex(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+    : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+{
+    // Do nothing
+}
+
+_PortalLightResolvingSceneIndex::
+~_PortalLightResolvingSceneIndex() = default;
+
+HdSceneIndexPrim 
+_PortalLightResolvingSceneIndex::GetPrim(
+    const SdfPath& primPath) const
+{
+    auto prim = _GetInputSceneIndex()->GetPrim(primPath);
+
+    if (prim.primType != HdPrimTypeTokens->light &&
+        prim.primType != HdPrimTypeTokens->domeLight) {
+        // No special behavior for prims that aren't portals or domes.
+        return prim;
+    }
+
+    // Check for portal
+    const auto portalIt = _portalsToDomes.find(primPath);
+    if (portalIt != _portalsToDomes.end()) {
+        const auto domePrimPath = portalIt->second;
+        return {
+            prim.primType,
+            _BuildPortalLightDataSource(domePrimPath, primPath,
+                                        _GetInputSceneIndex())
+        };
+    }
+
+    // Check for dome
+    const auto domeIt = _domesWithPortals.find(primPath);
+    // If the dome has associated portals, wrap the data source.
+    // Otherwise, pass it through as-is.
+    if (domeIt != _domesWithPortals.end() && domeIt->second) {
+        return {
+            prim.primType,
+            _BuildDomeLightDataSource(primPath, _GetInputSceneIndex())
+        };
+    }
+
+    return prim;
+}
+
+SdfPathVector 
+_PortalLightResolvingSceneIndex::GetChildPrimPaths(
+    const SdfPath& primPath) const
+{
+    return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+}
+
+void
+_PortalLightResolvingSceneIndex::_PrimsAdded(
+    const HdSceneIndexBase& sender,
+    const HdSceneIndexObserver::AddedPrimEntries& entries)
+{    
+    if (!_IsObserved()) {
+        return;
+    }
+
+    for (const auto& entry: entries) {
+        if (entry.primType == HdPrimTypeTokens->domeLight) {
+            _AddMappingsForDome(entry.primPath);
+        }
+    }
+
+    _SendPrimsAdded(entries);
+}
+
+void 
+_PortalLightResolvingSceneIndex::_PrimsRemoved(
+    const HdSceneIndexBase& sender,
+    const HdSceneIndexObserver::RemovedPrimEntries& entries)
+{
+    if (!_IsObserved()) {
+        return;
+    }
+
+    for (const auto& entry: entries) {
+        if (_domesWithPortals.count(entry.primPath)) {
+            _RemoveMappingsForDome(entry.primPath);
+        }
+    }
+
+    _SendPrimsRemoved(entries);
+}
+
+void
+_PortalLightResolvingSceneIndex::_PrimsDirtied(
+    const HdSceneIndexBase& sender,
+    const HdSceneIndexObserver::DirtiedPrimEntries& entries)
+{
+    if (!_IsObserved()) {
+        return;
+    }
+
+    static const auto& lightLocator    = HdLightSchema::GetDefaultLocator();
+    static const auto& materialLocator = HdMaterialSchema::GetDefaultLocator();
+    static const auto& xformLocator    = HdXformSchema::GetDefaultLocator();
+
+    HdSceneIndexObserver::DirtiedPrimEntries dirtied;
+    SdfPathSet dirtiedPortals;
+    for (const auto& entry: entries) {
+        auto domeIt = _domesWithPortals.find(entry.primPath);
+        if (domeIt != _domesWithPortals.end()) {
+            // entry.primPath is a known dome
+            if (entry.dirtyLocators.Contains(lightLocator)) {
+                // The dome's portals may have changed.
+                auto removedPortals =
+                    _RemoveMappingsForDome(entry.primPath);
+                _AddMappingsForDome(entry.primPath);
+
+                dirtiedPortals.insert(
+                    std::make_move_iterator(removedPortals.begin()),
+                    std::make_move_iterator(removedPortals.end()));
+            }
+            if (entry.dirtyLocators.Contains(lightLocator) ||
+                entry.dirtyLocators.Contains(materialLocator) ||
+                entry.dirtyLocators.Contains(xformLocator)) {
+                // Assume that the dome's portals should be considered dirty.
+                for (const auto& [portalPath, domePath]: _portalsToDomes) {
+                    if (domePath == entry.primPath) {
+                        dirtiedPortals.insert(portalPath);
+                    }
+                }
+            }
+            dirtied.push_back(entry);
+        }
+        else if (_portalsToDomes.count(entry.primPath) &&
+                 entry.dirtyLocators.Contains(xformLocator)) {
+            // An xform change will affect portalToDome and portalName,
+            // so we need to make sure the material data source gets dirtied.
+            HdSceneIndexObserver::DirtiedPrimEntry newEntry(entry);
+            newEntry.dirtyLocators.insert(materialLocator);
+            dirtied.push_back(newEntry);
+        }
+        else {
+            dirtied.push_back(entry);
+        }
+    }
+
+    // Check for elements of "dirtiedPortals" that are already in "dirtied".
+    for (auto& entry: dirtied) {
+        if (dirtiedPortals.find(entry.primPath) != dirtiedPortals.end()) {
+            // If the portal is already in the dirtied vector, we don't want to
+            // add it again.
+            dirtiedPortals.erase(entry.primPath);
+
+            // We do, however, want to ensure that the material and light data
+            // sources are considered dirty.
+            entry.dirtyLocators.insert({materialLocator, lightLocator});
+        }
+    }
+
+    for (const auto& portalPath: dirtiedPortals) {
+        dirtied.emplace_back(
+            portalPath,
+            HdDataSourceLocatorSet{materialLocator, lightLocator});
+    }
+
+    _SendPrimsDirtied(dirtied);
+}
+
+SdfPathVector
+_PortalLightResolvingSceneIndex::_AddMappingsForDome(
+    const SdfPath& domePrimPath)
+{
+    const auto domePrim = _GetInputSceneIndex()->GetPrim(domePrimPath);
+
+    if (domePrim.primType != HdPrimTypeTokens->domeLight) {
+        // Caller should have already confirmed this is a dome.
+        TF_CODING_ERROR("_AddMappingsForDome invoked for non-"
+                        "domeLight path <%s>", domePrimPath.GetText());
+        return SdfPathVector();
+    }
+
+    SdfPathVector portalPaths = _GetPortalPaths(domePrim.dataSource);
+
+    _domesWithPortals[domePrimPath] = !portalPaths.empty();
+
+    for (const auto& portalPath: portalPaths) {
+        const auto it = _portalsToDomes.insert({portalPath,domePrimPath}).first;
+        if (it->second != domePrimPath) {
+            TF_WARN("Failed to register <%s> as a portal light for <%s>. "
+                    "The portal is already in use with <%s> and cannot be "
+                    "reused with another dome light.",
+                    portalPath.GetText(), domePrimPath.GetText(),
+                    it->second.GetText());
+        }
+    }
+    return portalPaths;
+}
+
+SdfPathVector
+_PortalLightResolvingSceneIndex::_RemoveMappingsForDome(
+    const SdfPath& domePrimPath)
+{
+    SdfPathVector portalPaths;
+    auto domeIt = _domesWithPortals.find(domePrimPath);
+    if (domeIt != _domesWithPortals.end()) {
+        const bool domeHasPortals = domeIt->second;
+        if (domeHasPortals) {
+            // We successfully found a dome prim to erase, so remove the
+            // corresponding _portalsToDomes entries.
+            for (auto it = _portalsToDomes.begin(); it != _portalsToDomes.end();) {
+                if (it->second == domePrimPath) {
+                    portalPaths.push_back(it->first);
+                    it = _portalsToDomes.erase(it);
+                }
+                else {
+                    it++;
+                }
+            }
+        }
+        _domesWithPortals.erase(domeIt);
+    }
+    return portalPaths;
+}
+
+} // anonymous namespace
+
+//
+// HdPrman_PortalLightResolvingSceneIndexPlugin
+//
+
+HdPrman_PortalLightResolvingSceneIndexPlugin::
+HdPrman_PortalLightResolvingSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_PortalLightResolvingSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr& inputScene,
+    const HdContainerDataSourceHandle& inputArgs)
+{
+    return _PortalLightResolvingSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.h
new file mode 100644
index 0000000000..c1de45add0
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/portalLightResolvingSceneIndexPlugin.h
@@ -0,0 +1,33 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PORTAL_LIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PORTAL_LIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_PortalLightResolvingSceneIndexPlugin
+///
+/// Prman scene index plugin to resolve portal lights.
+///
+class HdPrman_PortalLightResolvingSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_PortalLightResolvingSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputScene,
+        const HdContainerDataSourceHandle& inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PORTAL_LIGHT_RESOLVING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/prmanArchDefs.h b/third_party/renderman-26/plugin/hdPrman/prmanArchDefs.h
new file mode 100644
index 0000000000..bf37567e16
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/prmanArchDefs.h
@@ -0,0 +1,43 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_ARCH_DEFS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_ARCH_DEFS_H
+
+// PRMan depends on a nonstandard set of architecture defines which, when prman
+// is built, are defined in the build script and passed to the compiler as -D
+// commandline params. Some of the header files in rman/libpxrcore expose these
+// dependencies and so we recreate these nonstandard defines here using the more
+// standard architecture defines from pxr/base/arch/defines.h to guide us.
+
+#include "pxr/base/arch/defines.h"
+
+// Platform | Standard Define   | pxr/base Define | Prman Define
+//==========+===================+=================+==============
+// Linux    | __linux__         | ARCH_OS_LINUX   | LINUX
+//----------+-------------------+-----------------+--------------
+// OSX      | __APPLE__ &&      | ARCH_OS_OSX     | OSX
+//          | !TARGET_OS_IPHONE |
+//----------+-------------------+-----------------+--------------
+// Windows  | _WIN32 || _WIN64  | ARCH_OS_WINDOWS | WIN32
+//----------+-------------------+-----------------+--------------
+
+#if defined(ARCH_OS_LINUX)
+    #if !defined(LINUX)
+        #define LINUX
+    #endif
+#elif defined(ARCH_OS_OSX)
+    #if !defined(OSX)
+        #define OSX
+    #endif
+#elif defined(ARCH_OS_WINDOWS)
+    #if !defined(WIN32)
+        #define WIN32
+    #endif
+#endif
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_ARCH_DEFS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/pxr/base/vt/typeHeaders.h b/third_party/renderman-26/plugin/hdPrman/pxr/base/vt/typeHeaders.h
new file mode 100644
index 0000000000..7dc9cf99d5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/pxr/base/vt/typeHeaders.h
@@ -0,0 +1,57 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_TYPE_HEADERS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_TYPE_HEADERS_H
+
+// XXX: Delete this file after hdPrman drops support for USD versions
+// older than 22.08.
+
+#include "pxr/pxr.h" // PXR_VERSION
+// IWYU pragma: begin_exports
+#if PXR_VERSION >= 2208
+#include <pxr/base/vt/typeHeaders.h>
+#else
+#include "pxr/base/gf/frustum.h"
+#include "pxr/base/gf/half.h"
+#include "pxr/base/gf/interval.h"
+#include "pxr/base/gf/matrix2d.h"
+#include "pxr/base/gf/matrix2f.h"
+#include "pxr/base/gf/matrix3d.h"
+#include "pxr/base/gf/matrix3f.h"
+#include "pxr/base/gf/matrix4d.h"
+#include "pxr/base/gf/matrix4f.h"
+#include "pxr/base/gf/multiInterval.h"
+#include "pxr/base/gf/quatd.h"
+#include "pxr/base/gf/quaternion.h"
+#include "pxr/base/gf/quatf.h"
+#include "pxr/base/gf/quath.h"
+#include "pxr/base/gf/range1d.h"
+#include "pxr/base/gf/range1f.h"
+#include "pxr/base/gf/range2d.h"
+#include "pxr/base/gf/range2f.h"
+#include "pxr/base/gf/range3d.h"
+#include "pxr/base/gf/range3f.h"
+#include "pxr/base/gf/rect2i.h"
+#include "pxr/base/gf/vec2d.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/base/gf/vec2h.h"
+#include "pxr/base/gf/vec2i.h"
+#include "pxr/base/gf/vec3d.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/base/gf/vec3h.h"
+#include "pxr/base/gf/vec3i.h"
+#include "pxr/base/gf/vec4d.h"
+#include "pxr/base/gf/vec4f.h"
+#include "pxr/base/gf/vec4h.h"
+#include "pxr/base/gf/vec4i.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/vt/array.h"
+#include <string>
+#endif // PXR_VERSION >= 2211
+// IWYU pragma: end_exports
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_TYPE_HEADERS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/pxr/base/vt/visitValue.h b/third_party/renderman-26/plugin/hdPrman/pxr/base/vt/visitValue.h
new file mode 100644
index 0000000000..3b90b61b5c
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/pxr/base/vt/visitValue.h
@@ -0,0 +1,302 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_VISIT_VALUE_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_VISIT_VALUE_H
+
+// XXX: Delete this file after hdPrman drops support for USD versions
+// older than 22.11.
+// XXX: When this file is deleted, translation units in hdPrman that use
+// VtVisitValue will need to add their own include for pxr/base/vt/typeHeaders.h
+
+#include "pxr/pxr.h" // PXR_VERSION
+#if PXR_VERSION >= 2211
+#include <pxr/base/vt/visitValue.h> // IWYU pragma: export
+#else
+#if PXR_VERSION >= 2208
+#include <pxr/base/vt/typeHeaders.h> // IWYU pragma: export
+#else
+#include "typeHeaders.h"
+#endif
+#include "pxr/base/vt/value.h"
+
+#include <typeindex>
+#include <typeinfo>
+#include <unordered_map>
+#include <utility>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// Polyfill for VtVisitValue.
+//
+// 1. valueHeaders.h was private until 22.08. Since it must be included on
+//    translation units that invoke VtVisitValue, we will have to polyfill it.
+//
+//    1a. The dual quaternion types do not exist until 22.08. We won't polyfill
+//        those, so our polyfills of VtVisitValue and valueHeaders.h will have
+//        to omit them.
+//
+// 2. VtValue::GetKnownValueTypeIndex() does not exist until 22.11, so we will
+//    use an unordered_map<type_index, int> to assign fixed int indices to
+//    types so we can build the switch statement.
+//
+// 3. Boost is not available, so we have to build the full switch table by hand.
+//
+// 3. The whole solution needs to be header-only, so no new source files need
+//    to be added to the build script.
+
+namespace Vt_ValueVisitDetail {
+
+// These two overloads do SFINAE to detect whether the visitor can be invoked
+// with the given held type T.  If the visitor cannot be invoked with T, it is
+// instead invoked with the VtValue itself.
+template <class T, class Visitor,
+    class = decltype(std::declval<Visitor>()(std::declval<T>()))>
+auto
+Visit(VtValue const &val, Visitor &&visitor, int) {
+    return std::forward<Visitor>(visitor)(val.UncheckedGet<T>());
+}
+
+template <class T, class Visitor>
+auto
+Visit(VtValue const &val, Visitor &&visitor, ...) {
+    return std::forward<Visitor>(visitor)(val);
+}
+
+// VtValue::GetKnowValueTypeIndex() does not exist prior to 22.11 so we will
+// hard-code a typeString-to-integer conversion using an unordered_map for
+// fast lookup, then switch on the integer in an attempt to recreate the
+// performance of the real thing.
+static const std::unordered_map<std::type_index, int> types {
+    { std::type_index(typeid(bool)),               0 },
+    { std::type_index(typeid(char)),               1 },
+    { std::type_index(typeid(unsigned char)),      2 },
+    { std::type_index(typeid(short)),              3 },
+    { std::type_index(typeid(unsigned short)),     4 },
+    { std::type_index(typeid(int)),                5 },
+    { std::type_index(typeid(unsigned int)),       6 },
+    { std::type_index(typeid(int64_t)),            7 },
+    { std::type_index(typeid(uint64_t)),           8 },
+    { std::type_index(typeid(double)),             9 },
+    { std::type_index(typeid(float)),             10 },
+    { std::type_index(typeid(GfHalf)),            11 },
+    { std::type_index(typeid(std::string)),       12 },
+    { std::type_index(typeid(TfToken)),           13 },
+    { std::type_index(typeid(VtVec4iArray)),      14 },
+    { std::type_index(typeid(VtVec3iArray)),      15 },
+    { std::type_index(typeid(VtVec2iArray)),      16 },
+    { std::type_index(typeid(VtVec4hArray)),      17 },
+    { std::type_index(typeid(VtVec3hArray)),      18 },
+    { std::type_index(typeid(VtVec2hArray)),      19 },
+    { std::type_index(typeid(VtVec4fArray)),      20 },
+    { std::type_index(typeid(VtVec3fArray)),      21 },
+    { std::type_index(typeid(VtVec2fArray)),      22 },
+    { std::type_index(typeid(VtVec4dArray)),      23 },
+    { std::type_index(typeid(VtVec3dArray)),      24 },
+    { std::type_index(typeid(VtVec2dArray)),      25 },
+    { std::type_index(typeid(VtMatrix4fArray)),   26 },
+    { std::type_index(typeid(VtMatrix3fArray)),   27 },
+    { std::type_index(typeid(VtMatrix2fArray)),   28 },
+    { std::type_index(typeid(VtMatrix4dArray)),   29 },
+    { std::type_index(typeid(VtMatrix3dArray)),   30 },
+    { std::type_index(typeid(VtMatrix2dArray)),   31 },
+    { std::type_index(typeid(VtRange3fArray)),    32 },
+    { std::type_index(typeid(VtRange3dArray)),    33 },
+    { std::type_index(typeid(VtRange2fArray)),    34 },
+    { std::type_index(typeid(VtRange2dArray)),    35 },
+    { std::type_index(typeid(VtRange1fArray)),    36 },
+    { std::type_index(typeid(VtRange1dArray)),    37 },
+    { std::type_index(typeid(VtIntervalArray)),   38 },
+    { std::type_index(typeid(VtRect2iArray)),     39 },
+    { std::type_index(typeid(VtQuathArray)),      40 },
+    { std::type_index(typeid(VtQuatfArray)),      41 },
+    { std::type_index(typeid(VtQuatdArray)),      42 },
+    { std::type_index(typeid(VtQuaternionArray)), 43 },
+#if PXR_VERSION >= 2208
+    { std::type_index(typeid(VtDualQuathArray)),  44 },
+    { std::type_index(typeid(VtDualQuatfArray)),  45 },
+    { std::type_index(typeid(VtDualQuatdArray)),  46 },
+#endif
+    { std::type_index(typeid(VtBoolArray)),       47 },
+    { std::type_index(typeid(VtCharArray)),       48 },
+    { std::type_index(typeid(VtUCharArray)),      49 },
+    { std::type_index(typeid(VtShortArray)),      50 },
+    { std::type_index(typeid(VtUShortArray)),     51 },
+    { std::type_index(typeid(VtIntArray)),        52 },
+    { std::type_index(typeid(VtUIntArray)),       53 },
+    { std::type_index(typeid(VtInt64Array)),      54 },
+    { std::type_index(typeid(VtUInt64Array)),     55 },
+    { std::type_index(typeid(VtDoubleArray)),     56 },
+    { std::type_index(typeid(VtFloatArray)),      57 },
+    { std::type_index(typeid(VtHalfArray)),       58 },
+    { std::type_index(typeid(VtStringArray)),     59 },
+    { std::type_index(typeid(VtTokenArray)),      60 },
+    { std::type_index(typeid(GfVec4i)),           61 },
+    { std::type_index(typeid(GfVec3i)),           62 },
+    { std::type_index(typeid(GfVec2i)),           63 },
+    { std::type_index(typeid(GfVec4h)),           64 },
+    { std::type_index(typeid(GfVec3h)),           65 },
+    { std::type_index(typeid(GfVec2h)),           66 },
+    { std::type_index(typeid(GfVec4f)),           67 },
+    { std::type_index(typeid(GfVec3f)),           68 },
+    { std::type_index(typeid(GfVec2f)),           69 },
+    { std::type_index(typeid(GfVec4d)),           70 },
+    { std::type_index(typeid(GfVec3d)),           71 },
+    { std::type_index(typeid(GfVec2d)),           72 },
+    { std::type_index(typeid(GfMatrix4f)),        73 },
+    { std::type_index(typeid(GfMatrix3f)),        74 },
+    { std::type_index(typeid(GfMatrix2f)),        75 },
+    { std::type_index(typeid(GfMatrix4d)),        76 },
+    { std::type_index(typeid(GfMatrix3d)),        77 },
+    { std::type_index(typeid(GfMatrix2d)),        78 },
+    { std::type_index(typeid(GfRange3f)),         79 },
+    { std::type_index(typeid(GfRange3d)),         80 },
+    { std::type_index(typeid(GfRange2f)),         81 },
+    { std::type_index(typeid(GfRange2d)),         82 },
+    { std::type_index(typeid(GfRange1f)),         83 },
+    { std::type_index(typeid(GfRange1d)),         84 },
+    { std::type_index(typeid(GfInterval)),        85 },
+    { std::type_index(typeid(GfRect2i)),          86 },
+    { std::type_index(typeid(GfQuath)),           87 },
+    { std::type_index(typeid(GfQuatf)),           88 },
+    { std::type_index(typeid(GfQuatd)),           89 },
+    { std::type_index(typeid(GfQuaternion)),      90 },
+#if PXR_VERSION >= 2208
+    { std::type_index(typeid(GfDualQuath)),       91 },
+    { std::type_index(typeid(GfDualQuatf)),       92 },
+    { std::type_index(typeid(GfDualQuatd)),       93 },
+#endif
+    { std::type_index(typeid(GfFrustum)),         94 },
+    { std::type_index(typeid(GfMultiInterval)),   95 },
+    // XXX: For some builds, `long` is not covered by any of the above
+    // TODO: There may be more for other platforms? E.g., `long long`?
+    { std::type_index(typeid(long)),              96 } };
+
+} // namespace Vt_ValueVisitDetail
+
+template <class Visitor>
+auto VtVisitValue(VtValue const &value, Visitor &&visitor)
+{
+    int typeIndex = -1;
+    const std::type_info& typeInfo = value.GetTypeid();
+    const auto it = Vt_ValueVisitDetail::types.find(std::type_index(typeInfo));
+    if (it != Vt_ValueVisitDetail::types.end()) {
+        typeIndex = it->second;
+    }
+
+    // This generally gets the compiler to emit a jump table to dispatch
+    // directly to the code for each known value type.
+    switch (typeIndex) {
+        case  0: return Vt_ValueVisitDetail::Visit<bool>( value, std::forward<Visitor>(visitor), 0); break;
+        case  1: return Vt_ValueVisitDetail::Visit<char>( value, std::forward<Visitor>(visitor), 0); break;
+        case  2: return Vt_ValueVisitDetail::Visit<unsigned char>( value, std::forward<Visitor>(visitor), 0); break;
+        case  3: return Vt_ValueVisitDetail::Visit<short>( value, std::forward<Visitor>(visitor), 0); break;
+        case  4: return Vt_ValueVisitDetail::Visit<unsigned short>( value, std::forward<Visitor>(visitor), 0); break;
+        case  5: return Vt_ValueVisitDetail::Visit<int>( value, std::forward<Visitor>(visitor), 0); break;
+        case  6: return Vt_ValueVisitDetail::Visit<unsigned int>( value, std::forward<Visitor>(visitor), 0); break;
+        case  7: return Vt_ValueVisitDetail::Visit<int64_t>( value, std::forward<Visitor>(visitor), 0); break;
+        case  8: return Vt_ValueVisitDetail::Visit<uint64_t>( value, std::forward<Visitor>(visitor), 0); break;
+        case  9: return Vt_ValueVisitDetail::Visit<double>( value, std::forward<Visitor>(visitor), 0); break;
+        case 10: return Vt_ValueVisitDetail::Visit<float>( value, std::forward<Visitor>(visitor), 0); break;
+        case 11: return Vt_ValueVisitDetail::Visit<GfHalf>( value, std::forward<Visitor>(visitor), 0); break;
+        case 12: return Vt_ValueVisitDetail::Visit<std::string>( value, std::forward<Visitor>(visitor), 0); break;
+        case 13: return Vt_ValueVisitDetail::Visit<TfToken>( value, std::forward<Visitor>(visitor), 0); break;
+        case 14: return Vt_ValueVisitDetail::Visit<VtVec4iArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 15: return Vt_ValueVisitDetail::Visit<VtVec3iArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 16: return Vt_ValueVisitDetail::Visit<VtVec2iArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 17: return Vt_ValueVisitDetail::Visit<VtVec4hArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 18: return Vt_ValueVisitDetail::Visit<VtVec3hArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 19: return Vt_ValueVisitDetail::Visit<VtVec2hArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 20: return Vt_ValueVisitDetail::Visit<VtVec4fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 21: return Vt_ValueVisitDetail::Visit<VtVec3fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 22: return Vt_ValueVisitDetail::Visit<VtVec2fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 23: return Vt_ValueVisitDetail::Visit<VtVec4dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 24: return Vt_ValueVisitDetail::Visit<VtVec3dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 25: return Vt_ValueVisitDetail::Visit<VtVec2dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 26: return Vt_ValueVisitDetail::Visit<VtMatrix4fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 27: return Vt_ValueVisitDetail::Visit<VtMatrix3fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 28: return Vt_ValueVisitDetail::Visit<VtMatrix2fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 29: return Vt_ValueVisitDetail::Visit<VtMatrix4dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 30: return Vt_ValueVisitDetail::Visit<VtMatrix3dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 31: return Vt_ValueVisitDetail::Visit<VtMatrix2dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 32: return Vt_ValueVisitDetail::Visit<VtRange3fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 33: return Vt_ValueVisitDetail::Visit<VtRange3dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 34: return Vt_ValueVisitDetail::Visit<VtRange2fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 35: return Vt_ValueVisitDetail::Visit<VtRange2dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 36: return Vt_ValueVisitDetail::Visit<VtRange1fArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 37: return Vt_ValueVisitDetail::Visit<VtRange1dArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 38: return Vt_ValueVisitDetail::Visit<VtIntervalArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 39: return Vt_ValueVisitDetail::Visit<VtRect2iArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 40: return Vt_ValueVisitDetail::Visit<VtQuathArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 41: return Vt_ValueVisitDetail::Visit<VtQuatfArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 42: return Vt_ValueVisitDetail::Visit<VtQuatdArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 43: return Vt_ValueVisitDetail::Visit<VtQuaternionArray>( value, std::forward<Visitor>(visitor), 0); break;
+    #if PXR_VERSION >= 2208
+        case 44: return Vt_ValueVisitDetail::Visit<VtDualQuathArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 45: return Vt_ValueVisitDetail::Visit<VtDualQuatfArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 46: return Vt_ValueVisitDetail::Visit<VtDualQuatdArray>( value, std::forward<Visitor>(visitor), 0); break;
+    #endif
+        case 47: return Vt_ValueVisitDetail::Visit<VtBoolArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 48: return Vt_ValueVisitDetail::Visit<VtCharArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 49: return Vt_ValueVisitDetail::Visit<VtUCharArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 50: return Vt_ValueVisitDetail::Visit<VtShortArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 51: return Vt_ValueVisitDetail::Visit<VtUShortArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 52: return Vt_ValueVisitDetail::Visit<VtIntArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 53: return Vt_ValueVisitDetail::Visit<VtUIntArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 54: return Vt_ValueVisitDetail::Visit<VtInt64Array>( value, std::forward<Visitor>(visitor), 0); break;
+        case 55: return Vt_ValueVisitDetail::Visit<VtUInt64Array>( value, std::forward<Visitor>(visitor), 0); break;
+        case 56: return Vt_ValueVisitDetail::Visit<VtDoubleArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 57: return Vt_ValueVisitDetail::Visit<VtFloatArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 58: return Vt_ValueVisitDetail::Visit<VtHalfArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 59: return Vt_ValueVisitDetail::Visit<VtStringArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 60: return Vt_ValueVisitDetail::Visit<VtTokenArray>( value, std::forward<Visitor>(visitor), 0); break;
+        case 61: return Vt_ValueVisitDetail::Visit<GfVec4i>( value, std::forward<Visitor>(visitor), 0); break;
+        case 62: return Vt_ValueVisitDetail::Visit<GfVec3i>( value, std::forward<Visitor>(visitor), 0); break;
+        case 63: return Vt_ValueVisitDetail::Visit<GfVec2i>( value, std::forward<Visitor>(visitor), 0); break;
+        case 64: return Vt_ValueVisitDetail::Visit<GfVec4h>( value, std::forward<Visitor>(visitor), 0); break;
+        case 65: return Vt_ValueVisitDetail::Visit<GfVec3h>( value, std::forward<Visitor>(visitor), 0); break;
+        case 66: return Vt_ValueVisitDetail::Visit<GfVec2h>( value, std::forward<Visitor>(visitor), 0); break;
+        case 67: return Vt_ValueVisitDetail::Visit<GfVec4f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 68: return Vt_ValueVisitDetail::Visit<GfVec3f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 69: return Vt_ValueVisitDetail::Visit<GfVec2f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 70: return Vt_ValueVisitDetail::Visit<GfVec4d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 71: return Vt_ValueVisitDetail::Visit<GfVec3d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 72: return Vt_ValueVisitDetail::Visit<GfVec2d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 73: return Vt_ValueVisitDetail::Visit<GfMatrix4f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 74: return Vt_ValueVisitDetail::Visit<GfMatrix3f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 75: return Vt_ValueVisitDetail::Visit<GfMatrix2f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 76: return Vt_ValueVisitDetail::Visit<GfMatrix4d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 77: return Vt_ValueVisitDetail::Visit<GfMatrix3d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 78: return Vt_ValueVisitDetail::Visit<GfMatrix2d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 79: return Vt_ValueVisitDetail::Visit<GfRange3f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 80: return Vt_ValueVisitDetail::Visit<GfRange3d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 81: return Vt_ValueVisitDetail::Visit<GfRange2f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 82: return Vt_ValueVisitDetail::Visit<GfRange2d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 83: return Vt_ValueVisitDetail::Visit<GfRange1f>( value, std::forward<Visitor>(visitor), 0); break;
+        case 84: return Vt_ValueVisitDetail::Visit<GfRange1d>( value, std::forward<Visitor>(visitor), 0); break;
+        case 85: return Vt_ValueVisitDetail::Visit<GfInterval>( value, std::forward<Visitor>(visitor), 0); break;
+        case 86: return Vt_ValueVisitDetail::Visit<GfRect2i>( value, std::forward<Visitor>(visitor), 0); break;
+        case 87: return Vt_ValueVisitDetail::Visit<GfQuath>( value, std::forward<Visitor>(visitor), 0); break;
+        case 88: return Vt_ValueVisitDetail::Visit<GfQuatf>( value, std::forward<Visitor>(visitor), 0); break;
+        case 89: return Vt_ValueVisitDetail::Visit<GfQuatd>( value, std::forward<Visitor>(visitor), 0); break;
+        case 90: return Vt_ValueVisitDetail::Visit<GfQuaternion>( value, std::forward<Visitor>(visitor), 0); break;
+    #if PXR_VERSION >= 2208
+        case 91: return Vt_ValueVisitDetail::Visit<GfDualQuath>( value, std::forward<Visitor>(visitor), 0); break;
+        case 92: return Vt_ValueVisitDetail::Visit<GfDualQuatf>( value, std::forward<Visitor>(visitor), 0); break;
+        case 93: return Vt_ValueVisitDetail::Visit<GfDualQuatd>( value, std::forward<Visitor>(visitor), 0); break;
+    #endif
+        case 94: return Vt_ValueVisitDetail::Visit<GfFrustum>( value, std::forward<Visitor>(visitor), 0); break;
+        case 95: return Vt_ValueVisitDetail::Visit<GfMultiInterval>( value, std::forward<Visitor>(visitor), 0); break;
+        case 96: return Vt_ValueVisitDetail::Visit<long>( value, std::forward<Visitor>(visitor), 0); break;
+        default: return Vt_ValueVisitDetail::Visit<VtValue>(value, std::forward<Visitor>(visitor), 0); break;
+    };
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_VERSION >= 2211
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_PXR_BASE_VT_VISIT_VALUE_H
diff --git a/third_party/renderman-26/plugin/hdPrman/renderBuffer.cpp b/third_party/renderman-26/plugin/hdPrman/renderBuffer.cpp
new file mode 100644
index 0000000000..6ecc762bce
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderBuffer.cpp
@@ -0,0 +1,190 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "renderBuffer.h"
+#include "pxr/base/gf/half.h"
+#include "pxr/base/gf/vec3i.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrmanRenderBuffer::HdPrmanRenderBuffer(SdfPath const& id)
+    : HdRenderBuffer(id)
+    , _width(0)
+    , _height(0)
+    , _format(HdFormatInvalid)
+    , _buffer()
+    , _mappers(0)
+    , _converged(false)
+{
+}
+
+HdPrmanRenderBuffer::~HdPrmanRenderBuffer() = default;
+
+void
+HdPrmanRenderBuffer::_Deallocate()
+{
+    // If the buffer is mapped while we're doing this, there's not a great
+    // recovery path...
+    TF_VERIFY(!IsMapped());
+
+    _width = 0;
+    _height = 0;
+    _format = HdFormatInvalid;
+    _buffer.resize(0);
+    _mappers.store(0);
+    _converged.store(false);
+}
+
+/*static*/
+size_t
+HdPrmanRenderBuffer::_GetBufferSize(GfVec2i const &dims, HdFormat format)
+{
+    return dims[0] * dims[1] * HdDataSizeOfFormat(format);
+}
+
+/*virtual*/
+bool
+HdPrmanRenderBuffer::Allocate(GfVec3i const& dimensions,
+                              HdFormat format,
+                              bool multiSampled)
+{
+    _Deallocate();
+
+    if (dimensions[2] != 1) {
+        TF_WARN("Render buffer allocated with dims <%d, %d, %d> and"
+                " format %s; depth must be 1!",
+                dimensions[0], dimensions[1], dimensions[2],
+                TfEnum::GetName(format).c_str());
+        return false;
+    }
+
+    _width = dimensions[0];
+    _height = dimensions[1];
+    _format = format;
+    _buffer.resize(_GetBufferSize(GfVec2i(_width, _height), format));
+    
+    return true;
+}
+
+template<typename T>
+static void _ConvertPixel(HdFormat dstFormat, uint8_t *dst,
+                          HdFormat srcFormat, uint8_t const *src)
+{
+    HdFormat srcComponentFormat = HdGetComponentFormat(srcFormat);
+    HdFormat dstComponentFormat = HdGetComponentFormat(dstFormat);
+    size_t srcComponentCount = HdGetComponentCount(srcFormat);
+    size_t dstComponentCount = HdGetComponentCount(dstFormat);
+
+    for (size_t c = 0; c < dstComponentCount; ++c) {
+        T readValue = 0;
+        if (c < srcComponentCount) {
+            if (srcComponentFormat == HdFormatInt32) {
+                readValue = ((int32_t*)src)[c];
+            } else if (srcComponentFormat == HdFormatFloat16) {
+                GfHalf half;
+                half.setBits(((uint16_t*)src)[c]);
+                readValue = static_cast<float>(half);
+            } else if (srcComponentFormat == HdFormatFloat32) {
+                readValue = ((float*)src)[c];
+            } else if (srcComponentFormat == HdFormatUNorm8) {
+                readValue = ((uint8_t*)src)[c] / 255.0f;
+            } else if (srcComponentFormat == HdFormatSNorm8) {
+                readValue = ((int8_t*)src)[c] / 127.0f;
+            }
+        }
+
+        if (dstComponentFormat == HdFormatInt32) {
+            ((int32_t*)dst)[c] = readValue;
+        } else if (dstComponentFormat == HdFormatFloat16) {
+            ((uint16_t*)dst)[c] = GfHalf(float(readValue)).bits();
+        } else if (dstComponentFormat == HdFormatFloat32) {
+            ((float*)dst)[c] = readValue;
+        } else if (dstComponentFormat == HdFormatUNorm8) {
+            if (readValue < 0.0f) {
+                ((uint8_t*)dst)[c] = 0;
+            } else if (readValue > 1.0f) {
+                ((uint8_t*)dst)[c] = 255;
+            } else {
+                ((uint8_t*)dst)[c] = uint8_t(readValue *255.0f);
+            }
+        } else if (dstComponentFormat == HdFormatSNorm8) {
+            if (readValue < -1.0f) {
+                ((int8_t*)dst)[c] = -127;
+            } else if (readValue > 1.0f) {
+                ((int8_t*)dst)[c] = 127;
+            } else {
+                ((int8_t*)dst)[c] = int8_t(readValue * 127.0f);
+            }
+        }
+    }
+}
+
+void
+HdPrmanRenderBuffer::Blit(HdFormat format, int width, int height,
+                          uint8_t const* data)
+{
+    // Note: use width (not _width) when indexing into source
+    if (width == 0 || height == 0) {
+        // Nothing to copy from, set to zero
+        std::fill(_buffer.begin(), _buffer.end(), 0);
+    } else if (_format == format) {
+        size_t pixelSize = HdDataSizeOfFormat(_format);
+
+        if (static_cast<unsigned int>(width) == _width 
+            && static_cast<unsigned int>(height) == _height) {
+            // Awesome! Blit line by line.
+            for (unsigned int j = 0; j < _height; ++j) {
+                memcpy(&_buffer[(j * _width) * pixelSize],
+                       &data[(j * width) * pixelSize],
+                       _width * pixelSize);
+            }
+        } else {
+            // Ok...  Blit pixel by pixel, with nearest point sampling.
+            float scalei = width/float(_width);
+            float scalej = height/float(_height);
+            for (unsigned int j = 0; j < _height; ++j) {
+                for (unsigned int i = 0; i < _width; ++i) {
+                    unsigned int ii = scalei * i;
+                    unsigned int jj = scalej * j;
+                    memcpy(&_buffer[(j * _width + i) * pixelSize],
+                           &data[(jj * width + ii) * pixelSize],
+                           pixelSize);
+                }
+            }
+        }
+    } else {
+        // D'oh.  Convert pixel by pixel, with nearest point sampling.
+        // If src and dst are both int-based, don't round trip to float.
+        bool convertAsInt =
+            (HdGetComponentFormat(format) == HdFormatInt32) &&
+            (HdGetComponentFormat(_format) == HdFormatInt32);
+
+        size_t srcPixelSize = HdDataSizeOfFormat(format);
+        size_t dstPixelSize = HdDataSizeOfFormat(_format);
+
+        float scalei = width/float(_width);
+        float scalej = height/float(_height);
+        for (unsigned int j = 0; j < _height; ++j) {
+            for (unsigned int i = 0; i < _width; ++i) {
+                unsigned int ii = scalei * i;
+                unsigned int jj = scalej * j;
+                if (convertAsInt) {
+                    _ConvertPixel<int32_t>(
+                        _format, static_cast<uint8_t*>(
+                            &_buffer[(j * _width + i) * dstPixelSize]),
+                        format, &data[(jj * width + ii) * srcPixelSize]);
+                } else {
+                    _ConvertPixel<float>(
+                        _format, static_cast<uint8_t*>(
+                            &_buffer[(j * _width + i) * dstPixelSize]),
+                        format, &data[(jj * width + ii) * srcPixelSize]);
+                }
+            }
+        }
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderBuffer.h b/third_party/renderman-26/plugin/hdPrman/renderBuffer.h
new file mode 100644
index 0000000000..1e25491ebb
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderBuffer.h
@@ -0,0 +1,76 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_BUFFER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_BUFFER_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/renderBuffer.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrmanRenderBuffer : public HdRenderBuffer
+{
+public:
+    HdPrmanRenderBuffer(SdfPath const& id);
+    ~HdPrmanRenderBuffer() override;
+
+    bool Allocate(GfVec3i const& dimensions,
+                  HdFormat format,
+                  bool multiSampled) override;
+
+    unsigned int GetWidth() const override { return _width; }
+    unsigned int GetHeight() const override { return _height; }
+    unsigned int GetDepth() const override { return 1; }
+    HdFormat GetFormat() const override { return _format; }
+
+    // HdPrman doesn't handle sampling decisions at the hydra level.
+    bool IsMultiSampled() const override { return false; }
+
+    void* Map() override {
+        _mappers++;
+        return _buffer.data();
+    }
+    void Unmap() override {
+        _mappers--;
+    }
+    bool IsMapped() const override {
+        return _mappers.load() != 0;
+    }
+
+    bool IsConverged() const override {
+        return _converged.load();
+    }
+    void SetConverged(bool cv) {
+        _converged.store(cv);
+    }
+
+    void Resolve() override {}
+
+    // ---------------------------------------------------------------------- //
+    /// \name I/O helpers
+    // ---------------------------------------------------------------------- //
+
+    // format is the input format.
+    void Blit(HdFormat format, int width, int height, uint8_t const* data);
+
+private:
+    static size_t _GetBufferSize(GfVec2i const& dims, HdFormat format);
+
+    void _Deallocate() override;
+
+    unsigned int _width;
+    unsigned int _height;
+    HdFormat _format;
+
+    std::vector<uint8_t> _buffer;
+    std::atomic<int> _mappers;
+    std::atomic<bool> _converged;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_BUFFER_H
diff --git a/third_party/renderman-26/plugin/hdPrman/renderDelegate.cpp b/third_party/renderman-26/plugin/hdPrman/renderDelegate.cpp
new file mode 100644
index 0000000000..3f3eb71306
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderDelegate.cpp
@@ -0,0 +1,834 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/renderDelegate.h"
+#include "hdPrman/basisCurves.h"
+#include "hdPrman/camera.h"
+#include "hdPrman/cone.h"
+#include "hdPrman/cylinder.h"
+#include "hdPrman/sphere.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/renderBuffer.h"
+#include "hdPrman/renderSettings.h"
+#include "hdPrman/integrator.h"
+#include "hdPrman/sampleFilter.h"
+#include "hdPrman/displayFilter.h"
+#include "hdPrman/coordSys.h"
+#include "hdPrman/instancer.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/renderPass.h"
+#include "hdPrman/light.h"
+#include "hdPrman/lightFilter.h"
+#include "hdPrman/material.h"
+#include "hdPrman/mesh.h"
+#include "hdPrman/points.h"
+#include "hdPrman/resourceRegistry.h"
+#include "hdPrman/terminalSceneIndexObserver.h"
+#include "hdPrman/tokens.h"
+#include "hdPrman/volume.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+#include "hdPrman/rileyPrimFactory.h"
+#include "pxr/imaging/hdsi/primManagingSceneIndexObserver.h"
+#include "pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.h"
+#endif
+
+#include "pxr/imaging/hd/bprim.h"
+#include "pxr/imaging/hd/camera.h"
+#include "pxr/imaging/hd/extComputation.h"
+#include "pxr/imaging/hd/rprim.h"
+#include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/imaging/hd/sprim.h"
+#include "pxr/imaging/hd/tokens.h"
+#if HD_API_VERSION >= 60
+#include "pxr/imaging/hd/renderCapabilitiesSchema.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#endif
+
+#include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/getenv.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+TF_DEFINE_ENV_SETTING(HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER, false,
+                      "Enable scene index observer calling the Riley API for "
+                      "the prims in the terminal scene index. This is scene "
+                      "index observer is the first step towards a future "
+                      "Hydra 2.0 implementation. "
+                      "See HdPrmanRenderDelegate::_RileySceneIndices for more.");
+
+#endif
+
+// \class HdPrmanRenderDelegate::_RileySceneIndices.
+//
+// Holds the scene indices and scene index observers past the terminal scene
+// index coming from the render index. The Hydra 2.0 implementation also
+// relies on several plugin scene indices inserted by the render index (only if
+// HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER is true).
+//
+// Overall, the scene indices are as follows:
+//
+// 1. HdPrman_RileyFallbackMaterialSceneIndexPlugin
+//    Adds a hard-coded riley material at GetFallbackMaterialPath().
+//
+// 2. HdPrman_RileyConversionSceneIndexPlugin
+//
+//    Converts some hydra prims to riley prims (following, e.g.,
+//    HdPrmanRileyGeometryPrototypeSchema).
+//
+//    Note that we can have some hydra prims be handled by converting them to
+//    riley prims in this scene index and others go through emulation and
+//    the Hydra 1.0 path.
+//
+//    For example, the scene index converts a sphere to a
+//    riley:geometryPrototype and riley:geometryInstance. These prims will
+//    be observed (see later) by
+//    HdPrmanRenderDelegate::_RileySceneIndices::_primManagingSceneIndexObserver
+//    which will issue the corresponding riley Create/Modify/Delete calls.
+//    Because the original sphere has been converted to different prim types,
+//    there is no instantiation of HdPrman_Sphere.
+//    Also, note that we do not report riley:geometryPrototype or
+//    riley:geometryInstance by any
+//    HdPrmanRenderDelegate::GetSupported[RSB]primTypes().
+//
+//    Another example is mesh. The scene index does not convert a mesh.
+//    mesh is reported by HdPrmanRenderDelegate::GetSupportedRprimTypes().
+//    Thus, HdSceneIndexAdapterSceneDelegate will call _InsertRprim for
+//    a mesh and thus we instantiate HdPrman_mesh.
+//
+// The conversion scene index is also the terminal scene index in the render
+// index. However, _RileySceneIndices continues the chain of filtering scene
+// indices and observers as follows:
+//
+// 3. HdsiPrimTypeNoticeBatchingSceneIndex _noticeBatchingSceneIndex
+//
+//    This scene index postpones any prim messages until we sync.
+//    During sync (more precisely, in HdPrmanRenderDelegate::Update()), it
+//    sorts and batches the messages to fulfill dependencies between prims.
+//    E.g. the Riley::CreateGeometryInstance call needs the result of
+//    Riley::CreateGeometryPrototype, so this scene index sends out the
+//    messages for riley:geometryInstance first.
+//
+// 4. HdsiPrimManagingSceneIndexObserver _primManagingSceneIndexObserver
+//
+//    This observer calls, e.g., Riley::Create/Modify/DeleteGeometryInstance
+//    in response to add/modify/delete prim messages.
+//
+struct HdPrmanRenderDelegate::_RileySceneIndices
+{
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+    _RileySceneIndices(
+        HdSceneIndexBaseRefPtr const &terminalSceneIndex,
+        HdPrman_RenderParam * const renderParam)
+      : _noticeBatchingSceneIndex(
+            HdsiPrimTypeNoticeBatchingSceneIndex::New(
+                terminalSceneIndex,
+                HdPrman_RileyPrimFactory::
+                    GetPrimTypeNoticeBatchingSceneIndexInputArgs()))
+      , _primManagingSceneIndexObserver(
+            HdsiPrimManagingSceneIndexObserver::New(
+                _noticeBatchingSceneIndex,
+                _Args(renderParam)))
+    {
+    }
+
+    static
+    HdContainerDataSourceHandle
+    _Args(HdPrman_RenderParam * const renderParam)
+    {
+        using DataSource = 
+            HdRetainedTypedSampledDataSource<
+                HdsiPrimManagingSceneIndexObserver::PrimFactoryBaseHandle>;
+
+        return
+            HdRetainedContainerDataSource::New(
+                HdsiPrimManagingSceneIndexObserverTokens->primFactory,
+                DataSource::New(
+                    std::make_shared<HdPrman_RileyPrimFactory>(renderParam)));
+    }
+
+    void Update()
+    {
+        _noticeBatchingSceneIndex->Flush();
+    }
+
+    HdsiPrimTypeNoticeBatchingSceneIndexRefPtr _noticeBatchingSceneIndex;
+    HdsiPrimManagingSceneIndexObserverRefPtr _primManagingSceneIndexObserver;
+#endif
+};
+
+extern TfEnvSetting<bool> HD_PRMAN_ENABLE_QUICKINTEGRATE;
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (openvdbAsset)
+    (field3dAsset)
+    (ri)
+    ((mtlxRenderContext, "mtlx"))
+    (renderCameraPath)
+);
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRenderSettingsTokens,
+    HDPRMAN_RENDER_SETTINGS_TOKENS);
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanExperimentalRenderSpecTokens,
+    HDPRMAN_EXPERIMENTAL_RENDER_SPEC_TOKENS);
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanIntegratorTokens,
+    HDPRMAN_INTEGRATOR_TOKENS);
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRenderProductTokens,
+    HDPRMAN_RENDER_PRODUCT_TOKENS);
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanAovSettingsTokens,
+    HDPRMAN_AOV_SETTINGS_TOKENS);
+
+
+const TfTokenVector HdPrmanRenderDelegate::SUPPORTED_RPRIM_TYPES =
+{
+    HdPrimTypeTokens->cone,
+    HdPrimTypeTokens->cylinder,
+    HdPrimTypeTokens->sphere,
+    HdPrimTypeTokens->mesh,
+    HdPrimTypeTokens->basisCurves,
+    HdPrimTypeTokens->points,
+    HdPrimTypeTokens->volume,
+
+    // New type, specific to mesh light source geom.
+    HdPrmanTokens->meshLightSourceMesh,
+    HdPrmanTokens->meshLightSourceVolume
+};
+
+const TfTokenVector HdPrmanRenderDelegate::SUPPORTED_SPRIM_TYPES =
+{
+    HdPrimTypeTokens->camera,
+    HdPrimTypeTokens->material,
+    HdPrimTypeTokens->distantLight,
+    HdPrimTypeTokens->domeLight,
+    HdPrimTypeTokens->light,
+    HdPrimTypeTokens->lightFilter,
+    HdPrimTypeTokens->rectLight,
+    HdPrimTypeTokens->diskLight,
+    HdPrimTypeTokens->cylinderLight,
+    HdPrimTypeTokens->sphereLight,
+#if PXR_VERSION < 2302
+    HdPrmanTokens->meshLight,
+#else
+    HdPrimTypeTokens->meshLight,
+#endif
+    HdPrimTypeTokens->pluginLight,
+    HdPrimTypeTokens->extComputation,
+    HdPrimTypeTokens->coordSys,
+    HdPrimTypeTokens->integrator,
+    HdPrimTypeTokens->sampleFilter,
+    HdPrimTypeTokens->displayFilter,
+};
+
+const TfTokenVector HdPrmanRenderDelegate::SUPPORTED_BPRIM_TYPES =
+{
+    HdPrimTypeTokens->renderBuffer,
+    HdPrimTypeTokens->renderSettings,
+    _tokens->openvdbAsset,
+    _tokens->field3dAsset,
+};
+
+static
+std::string
+_ToLower(const std::string &s)
+{
+    std::string result = s;
+    for(auto &c : result) {
+        c = tolower(c);
+    }
+    return result;
+}
+
+static
+std::vector<std::string>
+_GetExtraArgs(const HdRenderSettingsMap &settingsMap)
+{
+    std::string extraArgs;
+
+    auto it = settingsMap.find(HdPrmanRenderSettingsTokens->batchCommandLine);
+    if (it != settingsMap.end()) {
+        // husk's --delegate-options arg allows users to pass an arbitrary
+        // string of args which we pass along to PRManBegin.
+        if (it->second.IsHolding<VtArray<std::string>>()) {
+            const VtArray<std::string>& v =
+                it->second.UncheckedGet<VtArray<std::string>>();
+            for (VtArray<std::string>::const_iterator i = v.cbegin();
+                 i != v.cend(); ++i) {
+                if (*i == "--delegate-options") {
+                    ++i;
+                    if(i != v.cend()) {
+                        extraArgs = *i;
+                    }
+                }
+            }
+        }
+    }
+    return TfStringTokenize(extraArgs, " ");
+}
+
+HdPrmanRenderDelegate::HdPrmanRenderDelegate(
+    HdRenderSettingsMap const& settingsMap)
+  : HdRenderDelegate(settingsMap)
+{
+    std::string rileyVariant = _ToLower(
+              GetRenderSetting<std::string>(
+                  HdPrmanRenderSettingsTokens->rileyVariant,
+                  TfGetenv("RILEY_VARIANT")));
+
+    std::string xpuDevices = GetRenderSetting<std::string>(
+        HdPrmanRenderSettingsTokens->xpuDevices, std::string());
+
+    _renderParam = std::make_unique<HdPrman_RenderParam>(
+        this, rileyVariant, xpuDevices, _GetExtraArgs(settingsMap));
+
+    _Initialize();
+}
+
+bool
+HdPrmanRenderDelegate::IsInteractive() const
+{
+    return GetRenderSetting<bool>(
+        HdRenderSettingsTokens->enableInteractive, true);
+}
+
+void
+HdPrmanRenderDelegate::_Initialize()
+{
+    std::string integrator = HdPrmanIntegratorTokens->PxrPathTracer;
+    std::string integratorEnv = TfGetenv("HD_PRMAN_INTEGRATOR");
+    if (!integratorEnv.empty()) {
+        integrator = integratorEnv;
+    }
+ 
+    const int maxSamples = 64; // 64 samples is RenderMan default
+    const float pixelVariance = 0.001f;
+
+    // Prepare list of render settings descriptors
+    _settingDescriptors.reserve(5);
+
+    _settingDescriptors.push_back({
+        std::string("Integrator"),
+        HdPrmanRenderSettingsTokens->integratorName,
+        VtValue(integrator) 
+    });
+
+    if (TfGetEnvSetting(HD_PRMAN_ENABLE_QUICKINTEGRATE)) {
+        const std::string interactiveIntegrator = 
+            HdPrmanIntegratorTokens->PxrDirectLighting;
+        _settingDescriptors.push_back({
+            std::string("Interactive Integrator"),
+            HdPrmanRenderSettingsTokens->interactiveIntegrator,
+            VtValue(interactiveIntegrator)
+        });
+
+        // If >0, the time in ms that we'll render quick output before switching
+        // to path tracing
+        _settingDescriptors.push_back({
+            std::string("Interactive Integrator Timeout (ms)"),
+            HdPrmanRenderSettingsTokens->interactiveIntegratorTimeout,
+            VtValue(200)
+        });
+    }
+
+    _settingDescriptors.push_back({
+        std::string("Max Samples"),
+        HdRenderSettingsTokens->convergedSamplesPerPixel,
+        VtValue(maxSamples)
+    });
+
+    _settingDescriptors.push_back({
+        std::string("Variance Threshold"),
+        HdRenderSettingsTokens->convergedVariance,
+        VtValue(pixelVariance)
+    });
+
+    _settingDescriptors.push_back({
+        std::string("Riley variant"),
+        HdPrmanRenderSettingsTokens->rileyVariant,
+        VtValue(TfGetenv("RILEY_VARIANT"))
+    });
+
+    _settingDescriptors.push_back({
+        std::string("Disable motion blur"),
+        HdPrmanRenderSettingsTokens->disableMotionBlur,
+        VtValue(false)});
+
+    _PopulateDefaultSettings(_settingDescriptors);
+
+    _renderParam->Begin(this);
+
+    _resourceRegistry = std::make_shared<HdPrman_ResourceRegistry>(
+        _renderParam);
+}
+
+HdPrmanRenderDelegate::~HdPrmanRenderDelegate()
+{
+    _renderParam.reset();
+}
+
+HdRenderSettingsMap
+HdPrmanRenderDelegate::GetRenderSettingsMap() const
+{
+    return _settingsMap;
+}
+
+HdRenderSettingDescriptorList
+HdPrmanRenderDelegate::GetRenderSettingDescriptors() const
+{
+    return _settingDescriptors;
+}
+
+HdRenderParam*
+HdPrmanRenderDelegate::GetRenderParam() const
+{
+    return _renderParam.get();
+}
+
+void
+HdPrmanRenderDelegate::CommitResources(HdChangeTracker *tracker)
+{
+    // Do nothing
+}
+
+TfTokenVector const&
+HdPrmanRenderDelegate::GetSupportedRprimTypes() const
+{
+    return SUPPORTED_RPRIM_TYPES;
+}
+
+TfTokenVector const&
+HdPrmanRenderDelegate::GetSupportedSprimTypes() const
+{
+    return SUPPORTED_SPRIM_TYPES;
+}
+
+TfTokenVector const&
+HdPrmanRenderDelegate::GetSupportedBprimTypes() const
+{
+    return SUPPORTED_BPRIM_TYPES;
+}
+
+HdResourceRegistrySharedPtr
+HdPrmanRenderDelegate::GetResourceRegistry() const
+{
+    return _resourceRegistry;
+}
+
+HdRenderPassSharedPtr
+HdPrmanRenderDelegate::CreateRenderPass(HdRenderIndex *index,
+                                        HdRprimCollection const& collection)
+{
+    if (!_renderPass) {
+        _renderPass = std::make_shared<HdPrman_RenderPass>(
+            index, collection, _renderParam);
+    }
+    return _renderPass;
+}
+
+HdInstancer *
+HdPrmanRenderDelegate::CreateInstancer(HdSceneDelegate *delegate,
+                                       SdfPath const& id)
+{
+    return new HdPrmanInstancer(delegate, id);
+}
+
+void
+HdPrmanRenderDelegate::DestroyInstancer(HdInstancer *instancer)
+{
+    delete instancer;
+}
+
+HdRprim *
+HdPrmanRenderDelegate::CreateRprim(TfToken const& typeId,
+                                    SdfPath const& rprimId)
+{
+    if (typeId == HdPrmanTokens->meshLightSourceMesh) {
+        return new HdPrman_Mesh(rprimId, true /* isMeshLight */);
+    } else if (typeId == HdPrmanTokens->meshLightSourceVolume) {
+        return new HdPrman_Volume(rprimId, true /* isMeshLight */);
+    } else if (typeId == HdPrimTypeTokens->mesh) {
+        return new HdPrman_Mesh(rprimId, false /* isMeshLight */);
+    } else if (typeId == HdPrimTypeTokens->basisCurves) {
+        return new HdPrman_BasisCurves(rprimId);
+    } if (typeId == HdPrimTypeTokens->cone) {
+        return new HdPrman_Cone(rprimId);
+    } if (typeId == HdPrimTypeTokens->cylinder) {
+        return new HdPrman_Cylinder(rprimId);
+    } if (typeId == HdPrimTypeTokens->sphere) {
+        return new HdPrman_Sphere(rprimId);
+    } else if (typeId == HdPrimTypeTokens->points) {
+        return new HdPrman_Points(rprimId);
+    } else if (typeId == HdPrimTypeTokens->volume) {
+        return new HdPrman_Volume(rprimId, false /* isMeshLight */);
+    } else {
+        TF_CODING_ERROR("Unknown Rprim Type %s", typeId.GetText());
+    }
+
+    return nullptr;
+}
+
+void
+HdPrmanRenderDelegate::DestroyRprim(HdRprim *rPrim)
+{
+    delete rPrim;
+}
+
+HdSprim *
+HdPrmanRenderDelegate::CreateSprim(TfToken const& typeId,
+                                    SdfPath const& sprimId)
+{
+    HdSprim* sprim = nullptr;
+    if (typeId == HdPrimTypeTokens->camera) {
+        sprim = new HdPrmanCamera(sprimId);
+    } else if (typeId == HdPrimTypeTokens->material) {
+        sprim = new HdPrmanMaterial(sprimId);
+    } else if (typeId == HdPrimTypeTokens->coordSys) {
+        sprim = new HdPrmanCoordSys(sprimId);
+    } else if (typeId == HdPrimTypeTokens->lightFilter) {
+        sprim = new HdPrmanLightFilter(sprimId, typeId);
+    } else if (typeId == HdPrimTypeTokens->light ||
+               typeId == HdPrimTypeTokens->distantLight ||
+               typeId == HdPrimTypeTokens->domeLight ||
+               typeId == HdPrimTypeTokens->rectLight ||
+               typeId == HdPrimTypeTokens->diskLight ||
+               typeId == HdPrimTypeTokens->cylinderLight ||
+               typeId == HdPrimTypeTokens->sphereLight ||
+#if PXR_VERSION < 2302
+               typeId == HdPrmanTokens->meshLight ||
+#else
+               typeId == HdPrimTypeTokens->meshLight ||
+#endif
+               typeId == HdPrimTypeTokens->pluginLight) {
+        sprim = new HdPrmanLight(sprimId, typeId);
+
+        // Disregard fallback prims in count.
+        if (sprim->GetId() != SdfPath()) {
+            _renderParam->IncreaseSceneLightCount();
+        }
+    } else if (typeId == HdPrimTypeTokens->extComputation) {
+        sprim = new HdExtComputation(sprimId);
+    } else if (typeId == HdPrimTypeTokens->integrator) {
+        sprim = new HdPrman_Integrator(sprimId);
+    } else if (typeId == HdPrimTypeTokens->sampleFilter) {
+        sprim = new HdPrman_SampleFilter(sprimId);
+    } else if (typeId == HdPrimTypeTokens->displayFilter) {
+        sprim = new HdPrman_DisplayFilter(sprimId);
+    } else {
+        TF_CODING_ERROR("Unknown Sprim Type %s", typeId.GetText());
+    }
+
+    return sprim;
+}
+
+HdSprim *
+HdPrmanRenderDelegate::CreateFallbackSprim(TfToken const& typeId)
+{
+    // For fallback sprims, create objects with an empty scene path.
+    // They'll use default values and won't be updated by a scene delegate.
+    if (typeId == HdPrimTypeTokens->camera) {
+        return new HdPrmanCamera(SdfPath::EmptyPath());
+    } else if (typeId == HdPrimTypeTokens->material) {
+        return new HdPrmanMaterial(SdfPath::EmptyPath());
+    } else if (typeId == HdPrimTypeTokens->coordSys) {
+        return new HdPrmanCoordSys(SdfPath::EmptyPath());
+    } else if (typeId == HdPrimTypeTokens->lightFilter) {
+        return new HdPrmanLightFilter(SdfPath::EmptyPath(), typeId);
+    } else if (typeId == HdPrimTypeTokens->light ||
+               typeId == HdPrimTypeTokens->distantLight ||
+               typeId == HdPrimTypeTokens->domeLight ||
+               typeId == HdPrimTypeTokens->rectLight ||
+               typeId == HdPrimTypeTokens->diskLight ||
+               typeId == HdPrimTypeTokens->cylinderLight ||
+               typeId == HdPrimTypeTokens->sphereLight ||
+#if PXR_VERSION < 2302
+               typeId == HdPrmanTokens->meshLight ||
+#else
+               typeId == HdPrimTypeTokens->meshLight ||
+#endif
+               typeId == HdPrimTypeTokens->pluginLight) {
+        return new HdPrmanLight(SdfPath::EmptyPath(), typeId);
+    } else if (typeId == HdPrimTypeTokens->extComputation) {
+        return new HdExtComputation(SdfPath::EmptyPath());
+    } else if (typeId == HdPrimTypeTokens->integrator) {
+        return new HdPrman_Integrator(SdfPath::EmptyPath());
+    } else if (typeId == HdPrimTypeTokens->sampleFilter) {
+        return new HdPrman_SampleFilter(SdfPath::EmptyPath());
+    } else if (typeId == HdPrimTypeTokens->displayFilter) {
+        return new HdPrman_DisplayFilter(SdfPath::EmptyPath());
+    } else {
+        TF_CODING_ERROR("Unknown Sprim Type %s", typeId.GetText());
+    }
+
+    return nullptr;
+}
+
+void
+HdPrmanRenderDelegate::DestroySprim(HdSprim *sprim)
+{
+    // Disregard fallback prims in count.
+    if (sprim->GetId() != SdfPath()) {
+        _renderParam->DecreaseSceneLightCount();
+    }
+    delete sprim;
+}
+
+HdBprim *
+HdPrmanRenderDelegate::CreateBprim(
+    TfToken const& typeId,
+    SdfPath const& bprimId)
+{
+    if (typeId == _tokens->openvdbAsset ||
+        typeId == _tokens->field3dAsset) {
+        return new HdPrman_Field(typeId, bprimId);
+    } else if (typeId == HdPrimTypeTokens->renderBuffer) {
+        return new HdPrmanRenderBuffer(bprimId);
+    } else if (typeId == HdPrimTypeTokens->renderSettings) {
+        return new HdPrman_RenderSettings(bprimId);
+    } else {
+        TF_CODING_ERROR("Unknown Bprim Type %s", typeId.GetText());
+    }
+    return nullptr;
+}
+
+HdBprim *
+HdPrmanRenderDelegate::CreateFallbackBprim(TfToken const& typeId)
+{
+    if (typeId == _tokens->openvdbAsset ||
+        typeId == _tokens->field3dAsset) {
+        return new HdPrman_Field(typeId, SdfPath::EmptyPath());
+    } else if (typeId == HdPrimTypeTokens->renderBuffer) {
+        return new HdPrmanRenderBuffer(SdfPath::EmptyPath());
+    } else if (typeId == HdPrimTypeTokens->renderSettings) {
+        return new HdPrman_RenderSettings(SdfPath::EmptyPath());
+    } else {
+        TF_CODING_ERROR("Unknown Bprim Type %s", typeId.GetText());
+    }
+    return nullptr;
+}
+
+void
+HdPrmanRenderDelegate::DestroyBprim(HdBprim *bPrim)
+{
+    delete bPrim;
+}
+
+HdAovDescriptor
+HdPrmanRenderDelegate::GetDefaultAovDescriptor(
+    TfToken const& name) const
+{
+    if (IsInteractive()) {
+        if (name == HdAovTokens->color) {
+            return HdAovDescriptor(
+                HdFormatFloat32Vec4, 
+                false,
+                VtValue(GfVec4f(0.0f)));
+        } else if (name == HdAovTokens->depth) {
+            return HdAovDescriptor(HdFormatFloat32, false, VtValue(1.0f));
+        } else if (name == HdAovTokens->primId ||
+                   name == HdAovTokens->instanceId ||
+                   name == HdAovTokens->elementId) {
+            return HdAovDescriptor(HdFormatInt32, false, VtValue(-1));
+        }
+        return HdAovDescriptor(
+            HdFormatFloat32Vec3, 
+            false,
+            VtValue(GfVec3f(0.0f)));
+    }
+    return HdAovDescriptor();
+}
+
+TfToken
+HdPrmanRenderDelegate::GetMaterialBindingPurpose() const
+{
+    return HdTokens->full;
+}
+
+#if HD_API_VERSION < 41
+TfToken
+HdPrmanRenderDelegate::GetMaterialNetworkSelector() const
+{
+    return _tokens->ri;
+}
+#else
+TfTokenVector
+HdPrmanRenderDelegate::GetMaterialRenderContexts() const
+{
+#ifdef PXR_MATERIALX_SUPPORT_ENABLED
+    return {_tokens->ri, _tokens->mtlxRenderContext};
+#else
+    return {_tokens->ri};
+#endif
+}
+#endif
+
+TfTokenVector
+HdPrmanRenderDelegate::GetShaderSourceTypes() const
+{
+    return HdPrmanMaterial::GetShaderSourceTypes();
+}
+
+#if HD_API_VERSION > 46
+TfTokenVector
+HdPrmanRenderDelegate::GetRenderSettingsNamespaces() const
+{
+    return {_tokens->ri};
+}
+#endif
+
+#if HD_API_VERSION >= 60
+HdContainerDataSourceHandle
+HdPrmanRenderDelegate::GetCapabilities() const
+{
+    static const HdContainerDataSourceHandle result =
+        HdRenderCapabilitiesSchema::Builder()
+            .SetMotionBlur(
+                HdRetainedTypedSampledDataSource<bool>::New(true))
+            .Build();
+    return result;                       
+}
+#endif
+
+void
+HdPrmanRenderDelegate::SetRenderSetting(TfToken const &key, 
+                                        VtValue const &value)
+{
+    HdRenderDelegate::SetRenderSetting(key, value);
+
+    if(key == _tokens->renderCameraPath)
+    {
+        // Need to know the name of the render camera as soon as possible
+        // so that as cameras are processed (directly after render settings),
+        // the shutter of the active camera can be passed to riley,
+        // prior to handling any geometry.
+        SdfPath camPath = value.UncheckedGet<SdfPath>();
+        _renderParam->GetCameraContext().SetCameraPath(camPath);
+        _renderParam->GetCameraContext().MarkCameraInvalid(camPath);
+        HdRenderIndex *renderIndex = GetRenderIndex();
+        if(renderIndex) {
+            // Needed to trigger call to
+            // param->SetRileyShutterIntervalFromCameraContextCameraPath
+            // from HdPrmanCamera::Sync.
+
+            renderIndex->GetChangeTracker().MarkSprimDirty(
+                camPath, HdChangeTracker::DirtyParams);
+        }
+    }
+}
+
+bool
+HdPrmanRenderDelegate::IsStopSupported() const
+{
+    if (IsInteractive()) {
+        return true;
+    }
+    return false;
+}
+
+bool
+HdPrmanRenderDelegate::IsStopped() const
+{
+    if (IsInteractive()) {
+        return !_renderParam->IsRendering();
+    }
+    return true;
+}
+
+bool
+HdPrmanRenderDelegate::Stop(bool blocking)
+{
+    if (IsInteractive()) {
+        _renderParam->StopRender(blocking);
+        return !_renderParam->IsRendering();
+    }
+    return true;
+}
+
+bool
+HdPrmanRenderDelegate::Restart()
+{
+    if (IsInteractive()) {
+        // Next call into HdPrman_RenderPass::_Execute will do a StartRender
+        _renderParam->sceneVersion++;
+        return true;
+    }
+    return false;
+}
+
+HdRenderIndex*
+HdPrmanRenderDelegate::GetRenderIndex() const
+{
+    if (_renderPass) {
+        return _renderPass->GetRenderIndex();
+    }
+    return nullptr;
+}
+
+#if HD_API_VERSION >= 55
+
+////////////////////////////////////////////////////////////////////////////
+///
+/// Hydra 2.0 API
+///
+////////////////////////////////////////////////////////////////////////////
+
+void
+HdPrmanRenderDelegate::SetTerminalSceneIndex(
+    const HdSceneIndexBaseRefPtr &terminalSceneIndex)
+{
+    if (!_terminalObserver) {
+        _terminalObserver =
+            std::make_unique<HdPrman_TerminalSceneIndexObserver>(
+                _renderParam, terminalSceneIndex);
+    }
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+    if (terminalSceneIndex) {
+        if (TfGetEnvSetting(HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER)) {
+            if (!_rileySceneIndices) {
+                _rileySceneIndices =
+                    std::make_unique<_RileySceneIndices>(
+                        terminalSceneIndex, _renderParam.get());
+            }
+        }
+    }
+#endif
+}
+
+void
+HdPrmanRenderDelegate::Update()
+{
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+    if (_rileySceneIndices) {
+        // We need to set some paths before any riley Create call can
+        // be issued - otherwise, we get a crash.
+        //
+        // TODO: There should be a designated prim in the scene index
+        // to communicate the global riley options.
+        //
+        _renderParam->SetRileyOptions();
+
+        _rileySceneIndices->Update();
+    }
+#endif
+
+    if (!_terminalObserver) {
+        TF_CODING_ERROR("Invalid terminal scene index observer.");
+        return;
+    }
+
+    _terminalObserver->Update();
+}
+
+#endif
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderDelegate.h b/third_party/renderman-26/plugin/hdPrman/renderDelegate.h
new file mode 100644
index 0000000000..08b183b6f8
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderDelegate.h
@@ -0,0 +1,254 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_DELEGATE_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_DELEGATE_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/renderDelegate.h"
+#include "pxr/imaging/hd/version.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#define HDPRMAN_RENDER_SETTINGS_TOKENS                                 \
+    ((rileyVariant,                   "ri:variant"))                   \
+    ((xpuDevices,                     "ri:xpudevices"))                \
+    ((integrator,                     "integrator"))                   \
+    ((integratorName,                 "ri:integrator:name"))           \
+    ((interactiveIntegrator,          "interactiveIntegrator"))        \
+    ((interactiveIntegratorTimeout,   "interactiveIntegratorTimeout")) \
+    ((dataWindowNDC,                  "dataWindowNDC"))                \
+    ((pixelAspectRatio,               "pixelAspectRatio"))             \
+    ((resolution,                     "resolution"))                   \
+                                                                       \
+    /* \deprecated Use disableMotionBlur instead */                    \
+    ((instantaneousShutter,           "instantaneousShutter"))         \
+    ((disableMotionBlur,              "disableMotionBlur"))            \
+    ((shutterOpen,                    "shutter:open"))                 \
+    ((shutterClose,                   "shutter:close"))                \
+    ((experimentalRenderSpec,         "experimental:renderSpec"))      \
+    ((delegateRenderProducts,         "delegateRenderProducts"))       \
+    ((batchCommandLine,               "batchCommandLine"))             \
+    ((houdiniFrame,                   "houdini:frame"))                \
+    ((checkpointInterval,             "ri:checkpoint:interval"))
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRenderSettingsTokens, HDPRMAN_API,
+    HDPRMAN_RENDER_SETTINGS_TOKENS);
+
+#define HDPRMAN_EXPERIMENTAL_RENDER_SPEC_TOKENS \
+    (renderProducts)               \
+    (renderVars)                   \
+    (renderVarIndices)             \
+    (name)                         \
+    (sourceName)                   \
+    (sourceType)                   \
+    (type)                         \
+    (params)                       \
+    (camera)
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanExperimentalRenderSpecTokens, HDPRMAN_API,
+    HDPRMAN_EXPERIMENTAL_RENDER_SPEC_TOKENS);
+
+#define HDPRMAN_INTEGRATOR_TOKENS \
+    (PxrPathTracer)               \
+    (PbsPathTracer)               \
+    (PxrDirectLighting)
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanIntegratorTokens, HDPRMAN_API,
+    HDPRMAN_INTEGRATOR_TOKENS);
+
+#define HDPRMAN_RENDER_PRODUCT_TOKENS \
+    (productName) \
+    (productType) \
+    (orderedVars) \
+    (sourcePrim)
+
+TF_DECLARE_PUBLIC_TOKENS(
+    HdPrmanRenderProductTokens, HDPRMAN_API,
+    HDPRMAN_RENDER_PRODUCT_TOKENS);
+
+#define HDPRMAN_AOV_SETTINGS_TOKENS \
+    ((dataType,                       "dataType"))                   \
+    ((sourceName,                     "sourceName"))                 \
+    ((sourceType,                     "sourceType"))                 \
+    ((format,                         "aovDescriptor.format"))       \
+    ((multiSampled,                   "aovDescriptor.multiSampled")) \
+    ((aovSettings,                    "aovDescriptor.aovSettings"))  \
+    ((clearValue,                     "aovDescriptor.clearValue"))
+
+TF_DECLARE_PUBLIC_TOKENS(
+    HdPrmanAovSettingsTokens, HDPRMAN_API,
+    HDPRMAN_AOV_SETTINGS_TOKENS);
+
+class HdPrmanRenderDelegate : public HdRenderDelegate 
+{
+public:
+    HDPRMAN_API 
+    HdPrmanRenderDelegate(HdRenderSettingsMap const& settingsMap);
+    HDPRMAN_API 
+    ~HdPrmanRenderDelegate() override;
+
+    // ------------------------------------------------------------------------
+    // Satisfying HdRenderDelegate
+    // ------------------------------------------------------------------------
+    HDPRMAN_API
+    HdRenderParam *GetRenderParam() const override;
+    HDPRMAN_API 
+    const TfTokenVector & GetSupportedRprimTypes() const override;
+    HDPRMAN_API 
+    const TfTokenVector & GetSupportedSprimTypes() const override;
+    HDPRMAN_API 
+    const TfTokenVector & GetSupportedBprimTypes() const override;
+    HDPRMAN_API 
+    HdResourceRegistrySharedPtr GetResourceRegistry() const override;
+
+    /// Returns a list of user-configurable render settings.
+    HDPRMAN_API 
+    HdRenderSettingDescriptorList GetRenderSettingDescriptors() const override;
+
+    HDPRMAN_API 
+    HdRenderPassSharedPtr CreateRenderPass(
+                HdRenderIndex *index,
+                HdRprimCollection const& collection) override;
+    HDPRMAN_API 
+    HdInstancer *CreateInstancer(HdSceneDelegate *delegate,
+                                 SdfPath const& id) override;
+    HDPRMAN_API 
+    void DestroyInstancer(HdInstancer *instancer) override;
+    HDPRMAN_API 
+    HdRprim *CreateRprim(TfToken const& typeId,
+                         SdfPath const& rprimId) override;
+    HDPRMAN_API 
+    void DestroyRprim(HdRprim *rPrim) override;
+    HDPRMAN_API 
+    HdSprim *CreateSprim(TfToken const& typeId,
+                         SdfPath const& sprimId) override;
+    HDPRMAN_API 
+    HdSprim *CreateFallbackSprim(TfToken const& typeId) override;
+    HDPRMAN_API 
+    void DestroySprim(HdSprim *sPrim) override;
+    HDPRMAN_API 
+    HdBprim *CreateBprim(TfToken const& typeId,
+                         SdfPath const& bprimId) override;
+    HDPRMAN_API 
+    HdBprim *CreateFallbackBprim(TfToken const& typeId) override;
+    HDPRMAN_API 
+    void DestroyBprim(HdBprim *bPrim) override;
+
+    HDPRMAN_API 
+    HdAovDescriptor GetDefaultAovDescriptor(TfToken const& name) const override;
+
+    HDPRMAN_API 
+    void CommitResources(HdChangeTracker *tracker) override;
+    HDPRMAN_API 
+    TfToken GetMaterialBindingPurpose() const override;
+#if HD_API_VERSION < 41
+    HDPRMAN_API 
+    TfToken GetMaterialNetworkSelector() const override;
+#else
+    HDPRMAN_API 
+    TfTokenVector GetMaterialRenderContexts() const override;
+#endif
+    HDPRMAN_API 
+    TfTokenVector GetShaderSourceTypes() const override;
+
+#if HD_API_VERSION > 46
+    HDPRMAN_API 
+    TfTokenVector GetRenderSettingsNamespaces() const override;
+#endif
+
+#if HD_API_VERSION >= 60
+    HDPRMAN_API
+    HdContainerDataSourceHandle GetCapabilities() const override;
+#endif
+
+    HDPRMAN_API 
+    void SetRenderSetting(TfToken const &key, VtValue const &value) override;
+
+    /// NOTE: RenderMan has no notion of pausing the render threads.
+    ///       We don't return true, because otherwise start/stop causes
+    ///       the renderer to reset to increment zero, which gives a poor
+    ///       user experience and poor peformance. 
+    HDPRMAN_API 
+    bool IsPauseSupported() const override { return false; }
+
+    /// Return true to indicate that stopping and restarting are supported.
+    HDPRMAN_API 
+    bool IsStopSupported() const override;
+
+    /// Return true to indicate whether or not the rendering threads are active.
+    HDPRMAN_API 
+    bool IsStopped() const override;
+
+    /// Stop background rendering threads.
+    HDPRMAN_API 
+    bool Stop(bool blocking) override;
+
+    /// Restart background rendering threads.
+    HDPRMAN_API 
+    bool Restart() override;
+
+#if HD_API_VERSION >= 55
+
+    ////////////////////////////////////////////////////////////////////////////
+    ///
+    /// Hydra 2.0 API
+    ///
+    ////////////////////////////////////////////////////////////////////////////
+
+    HDPRMAN_API
+    void SetTerminalSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputSceneIndex) override;
+
+    HDPRMAN_API
+    void Update() override;
+
+#endif
+
+    // ------------------------------------------------------------------------
+    // Public (non-virtual) API
+    // ------------------------------------------------------------------------
+
+    HDPRMAN_API
+    HdRenderSettingsMap GetRenderSettingsMap() const;    
+
+    HDPRMAN_API
+    bool IsInteractive() const;
+
+    HDPRMAN_API
+    HdRenderIndex* GetRenderIndex() const;
+
+private:
+    // This class does not support copying.
+    HdPrmanRenderDelegate(const HdPrmanRenderDelegate &) = delete;
+    HdPrmanRenderDelegate &operator =(const HdPrmanRenderDelegate &) = delete;
+
+    void _Initialize();
+
+protected:
+    static const TfTokenVector SUPPORTED_RPRIM_TYPES;
+    static const TfTokenVector SUPPORTED_SPRIM_TYPES;
+    static const TfTokenVector SUPPORTED_BPRIM_TYPES;
+
+    std::shared_ptr<class HdPrman_RenderParam> _renderParam;
+
+#if HD_API_VERSION >= 55
+    std::unique_ptr<class HdPrman_TerminalSceneIndexObserver>
+        _terminalObserver;
+#endif
+
+    struct _RileySceneIndices;
+    std::unique_ptr<_RileySceneIndices> _rileySceneIndices;
+
+    HdResourceRegistrySharedPtr _resourceRegistry;
+    HdRenderPassSharedPtr _renderPass;
+    HdRenderSettingDescriptorList _settingDescriptors;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_DELEGATE_H
diff --git a/third_party/renderman-26/plugin/hdPrman/renderParam.cpp b/third_party/renderman-26/plugin/hdPrman/renderParam.cpp
new file mode 100644
index 0000000000..8c47ff5773
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderParam.cpp
@@ -0,0 +1,3718 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/renderParam.h"
+
+#include "hdPrman/camera.h"
+#include "hdPrman/cameraContext.h"
+#include "hdPrman/coordSys.h"
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/debugUtil.h"
+#include "hdPrman/framebuffer.h"
+#include "hdPrman/instancer.h"
+#include "hdPrman/material.h"
+#include "hdPrman/motionBlurSceneIndexPlugin.h"
+#include "hdPrman/prmanArchDefs.h" // required for stats/Session.h
+#include "hdPrman/renderDelegate.h"
+#include "hdPrman/renderSettings.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/tokens.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/extComputationUtils.h"
+#include "pxr/imaging/hd/renderBuffer.h"
+#include "pxr/imaging/hd/renderThread.h"
+#include "pxr/imaging/hd/rprim.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+
+#include "pxr/usd/sdf/path.h"
+
+#include "pxr/base/arch/library.h"
+#include "pxr/base/plug/plugin.h"
+#include "pxr/base/plug/registry.h"
+#include "pxr/base/tf/debug.h"
+#include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/pathUtils.h"  // Extract extension from tf token
+#include "pxr/base/tf/scopeDescription.h"
+#include "pxr/base/tf/stringUtils.h"
+
+#include <Riley.h>
+#include <RiTypesHelper.h>
+#include <RixRiCtl.h>
+#include <stats/Session.h>
+
+#include <string>
+#include <thread>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (percentDone)
+    (PrimvarPass)
+    (name)
+    (sourceName)
+    (sourceType)
+    (lpe)
+
+    // Product/driver tokens
+    (deepRaster)
+    (deepexr)
+    (openexr)
+    ((riProductType, "ri:productType"))
+
+    // See PxrDisplayChannelAPI
+    ((riDisplayChannelNamespace,    "ri:displayChannel:"))
+    // See PxrDisplayDriverAPI
+    ((riDisplayDriverNamespace,     "ri:displayDriver:"))
+    
+    ((renderTagPrefix, "rendertag_"))
+);
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _riOptionsTokens,
+    ((riRiFormatResolution,         "ri:Ri:FormatResolution"))
+    ((riHiderMinSamples,            "ri:hider:minsammples"))
+    ((riHiderMaxSamples,            "ri:hider:maxsamples"))
+    ((riRiPixelVariance,            "ri:Ri:PixelVariance"))
+    ((riRiFormatPixelAspectRatio,   "ri:Ri:FormatPixelAspectRatio"))
+    ((riLimitsThreads,              "ri:limits:threads"))
+);
+
+
+TF_DEFINE_ENV_SETTING(HD_PRMAN_ENABLE_MOTIONBLUR, true,
+                      "Enable motion blur in HdPrman");
+TF_DEFINE_ENV_SETTING(HD_PRMAN_NTHREADS, 0,
+                      "Override number of threads used by HdPrman");
+TF_DEFINE_ENV_SETTING(HD_PRMAN_OSL_VERBOSE, 0,
+                      "Override osl verbose in HdPrman");
+TF_DEFINE_ENV_SETTING(HD_PRMAN_DISABLE_HIDER_JITTER, false,
+                      "Disable hider jitter");
+TF_DEFINE_ENV_SETTING(HD_PRMAN_DEFER_SET_OPTIONS, true,
+                      "Defer first SetOptions call to render settings prim sync.");
+
+extern TfEnvSetting<bool> HD_PRMAN_ENABLE_QUICKINTEGRATE;
+
+static bool _enableQuickIntegrate =
+    TfGetEnvSetting(HD_PRMAN_ENABLE_QUICKINTEGRATE);
+
+// Used when Creating Riley RenderView from the RenderSettings or RenderSpec
+static GfVec2i _fallbackResolution = GfVec2i(512,512);
+
+TF_MAKE_STATIC_DATA(std::vector<HdPrman_RenderParam::IntegratorCameraCallback>,
+                    _integratorCameraCallbacks)
+{
+    _integratorCameraCallbacks->clear();
+}
+
+HdPrman_RenderParam::HdPrman_RenderParam(
+        HdPrmanRenderDelegate* renderDelegate,
+        const std::string &rileyVariant,
+        const std::string &xpuVariant,
+        const std::vector<std::string>& extraArgs) :
+    _rix(nullptr),
+    _ri(nullptr),
+    _mgr(nullptr),
+    _statsSession(nullptr),
+    _progressPercent(0),
+    _riley(nullptr),
+    _sceneLightCount(0),
+    _shutterInterval(HDPRMAN_SHUTTEROPEN_DEFAULT, HDPRMAN_SHUTTERCLOSE_DEFAULT),
+    _initRileyOptions(false),
+    _sampleFiltersId(riley::SampleFilterId::InvalidId()),
+    _displayFiltersId(riley::DisplayFilterId::InvalidId()),
+    _lastLegacySettingsVersion(0),
+    _resolution(0),
+    _renderDelegate(renderDelegate)
+{
+#if _PRMANAPI_VERSION_MAJOR_ < 26
+    // Create the stats session
+    _CreateStatsSession();
+#endif
+
+    // Setup to use the default GPU
+    _xpuGpuConfig.push_back(0);
+
+    TfRegistryManager::GetInstance().SubscribeTo<HdPrman_RenderParam>();
+    _CreateRiley(rileyVariant, xpuVariant, extraArgs);
+    
+    // Register RenderMan display driver
+    HdPrmanFramebuffer::Register(_rix);
+}
+
+HdPrman_RenderParam::~HdPrman_RenderParam()
+{
+    DeleteRenderThread();
+
+    _DeleteInternalPrims();
+
+    _DestroyRiley();
+
+    _DestroyStatsSession();
+}
+
+void
+HdPrman_RenderParam::IncrementLightLinkCount(TfToken const& name)
+{
+    std::lock_guard<std::mutex> lock(_lightLinkMutex);
+    ++_lightLinkRefs[name];
+}
+
+void 
+HdPrman_RenderParam::DecrementLightLinkCount(TfToken const& name)
+{
+    std::lock_guard<std::mutex> lock(_lightLinkMutex);
+    if (--_lightLinkRefs[name] == 0) {
+        _lightLinkRefs.erase(name);
+    }
+}
+
+bool 
+HdPrman_RenderParam::IsLightLinkUsed(TfToken const& name)
+{
+    std::lock_guard<std::mutex> lock(_lightLinkMutex);
+    return _lightLinkRefs.find(name) != _lightLinkRefs.end();
+}
+
+void
+HdPrman_RenderParam::IncrementLightFilterCount(TfToken const& name)
+{
+    std::lock_guard<std::mutex> lock(_lightFilterMutex);
+    ++_lightFilterRefs[name];
+}
+
+void 
+HdPrman_RenderParam::DecrementLightFilterCount(TfToken const& name)
+{
+    std::lock_guard<std::mutex> lock(_lightFilterMutex);
+    if (--_lightFilterRefs[name] == 0) {
+        _lightFilterRefs.erase(name);
+    }
+}
+
+bool 
+HdPrman_RenderParam::IsLightFilterUsed(TfToken const& name)
+{
+    std::lock_guard<std::mutex> lock(_lightFilterMutex);
+    return _lightFilterRefs.find(name) != _lightFilterRefs.end();
+}
+
+static size_t
+_ConvertPointsPrimvar(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const &id,
+    GfVec2f const &shutterInterval,
+    RtPrimVarList& primvars,
+    const size_t * npointsHint)
+{
+    HdExtComputationPrimvarDescriptorVector compPrimvar;
+#if PXR_VERSION < 2402
+    for (auto const& pv : sceneDelegate->GetExtComputationPrimvarDescriptors(
+        id, HdInterpolationVertex)) {
+        if (pv.name == HdTokens->points) {
+            compPrimvar.emplace_back(pv);
+        }
+    }
+#endif
+
+    // Get points time samples
+    HdTimeSampleArray<VtVec3fArray, HDPRMAN_MAX_TIME_SAMPLES> points;
+    {
+        HdTimeSampleArray<VtValue, HDPRMAN_MAX_TIME_SAMPLES> boxedPoints;
+        if (compPrimvar.empty()) {
+            sceneDelegate->SamplePrimvar(id, HdTokens->points, &boxedPoints);
+        } else {
+            HdExtComputationUtils::SampledValueStore<HDPRMAN_MAX_TIME_SAMPLES>
+                compSamples;
+            HdExtComputationUtils::SampleComputedPrimvarValues<
+                HDPRMAN_MAX_TIME_SAMPLES>(
+                    compPrimvar, sceneDelegate, HDPRMAN_MAX_TIME_SAMPLES,
+                    &compSamples);
+            boxedPoints = compSamples[HdTokens->points];
+        }
+        if (!points.UnboxFrom(boxedPoints)) {
+            TF_WARN("<%s> points did not have expected type vec3f[]",
+                    id.GetText());
+        }
+    }
+
+    size_t npoints = 0;
+    if (npointsHint) {
+        npoints = *npointsHint;
+    } else {
+        if (points.count > 0) {
+            npoints = points.values[0].size();
+        }
+        primvars.SetDetail(
+            1,        /* uniform */
+            npoints,  /* vertex */
+            npoints,  /* varying */
+            npoints   /* faceVarying */);
+    }
+
+    primvars.SetTimes(points.count, &points.times[0]);
+    for (size_t i=0; i < points.count; ++i) {
+        if (points.values[i].size() == npoints) {
+            primvars.SetPointDetail(
+                RixStr.k_P, 
+                (RtPoint3*) points.values[i].cdata(),
+                RtDetailType::k_vertex, 
+                i);
+        } else {
+            TF_WARN("<%s> primvar 'points' size (%zu) did not match "
+                    "expected (%zu)",
+                    id.GetText(), 
+                    points.values[i].size(),
+                    npoints);
+        }
+    }
+
+    return npoints;
+}
+
+void
+HdPrman_ConvertPointsPrimvar(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const &id,
+    GfVec2f const &shutterInterval,
+    RtPrimVarList& primvars,
+    const size_t npoints)
+
+{
+    _ConvertPointsPrimvar(
+        sceneDelegate, id, shutterInterval, primvars, &npoints);
+}
+
+size_t
+HdPrman_ConvertPointsPrimvarForPoints(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const &id,
+    GfVec2f const &shutterInterval,
+    RtPrimVarList& primvars)
+{
+    return _ConvertPointsPrimvar(
+        sceneDelegate, id, shutterInterval, primvars, nullptr);
+}
+
+inline static RtDetailType
+_RixDetailForHdInterpolation(HdInterpolation interp)
+{
+    switch (interp) {
+    case HdInterpolationInstance:
+        // Instance-level primvars, aka attributes, must be constant.
+        return RtDetailType::k_constant;
+    case HdInterpolationConstant:
+        return RtDetailType::k_constant;
+    case HdInterpolationUniform:
+        return RtDetailType::k_uniform;
+    case HdInterpolationVertex:
+        return RtDetailType::k_vertex;
+    case HdInterpolationVarying:
+        return RtDetailType::k_varying;
+    case HdInterpolationFaceVarying:
+        return RtDetailType::k_facevarying;
+    default:
+        TF_CODING_ERROR("Unknown HdInterpolation value");
+        return RtDetailType::k_constant;
+    }
+}
+
+static RtUString
+_GetPrmanPrimvarName(TfToken const& hdPrimvarName,
+                     RtDetailType const& /*detail*/)
+{
+    // Handle cases where Hydra built-in primvars map to Renderman
+    // built-in primvars.
+    if (hdPrimvarName == HdTokens->points) {
+        return RixStr.k_P;
+    } else if (hdPrimvarName == HdTokens->normals) {
+        // Hydra "normals" becomes Renderman "N"
+        return RixStr.k_N;
+    } else if (hdPrimvarName == HdTokens->widths) {
+        return RixStr.k_width;
+    }
+
+    return RtUString(hdPrimvarName.GetText());
+}
+
+static HdExtComputationPrimvarDescriptorVector
+_GetComputedPrimvars(HdSceneDelegate* sceneDelegate,
+                     SdfPath const& id,
+                     HdInterpolation interp,
+                     HdDirtyBits dirtyBits)
+{
+    HdExtComputationPrimvarDescriptorVector dirtyCompPrimvars;
+
+    // Get all the dirty computed primvars
+    HdExtComputationPrimvarDescriptorVector compPrimvars;
+    compPrimvars = sceneDelegate->GetExtComputationPrimvarDescriptors
+                                    (id,interp);
+    for (auto const& pv : compPrimvars) {
+        if (HdChangeTracker::IsPrimvarDirty(dirtyBits, id, pv.name)
+            && pv.name != HdTokens->points) {
+            dirtyCompPrimvars.emplace_back(pv);
+        }
+    }
+
+    return dirtyCompPrimvars;
+}
+
+static bool
+_IsPrototypeAttribute(TfToken const& primvarName)
+{
+    // This is a list of names for uniform primvars/attributes that
+    // affect the prototype geometry in Renderman. They need to be
+    // emitted on the prototype as primvars to take effect, instead of
+    // on geometry instances.
+    //
+    // This list was created based on this doc page:
+    //   https://rmanwiki.pixar.com/display/REN23/Primitive+Variables
+    typedef std::unordered_set<TfToken, TfToken::HashFunctor> TfTokenSet;
+    static const TfTokenSet prototypeAttributes = {
+        // Common
+        TfToken("ri:attributes:identifier:object"),
+        // Shading
+        TfToken("ri:attributes:derivatives:extrapolate"),
+        TfToken("ri:attributes:displacement:ignorereferenceinstance"),
+        TfToken("ri:attributes:displacementbound:CoordinateSystem"),
+        TfToken("ri:attributes:displacementbound:offscreen"),
+        TfToken("ri:attributes:displacementbound:sphere"),
+        TfToken("ri:attributes:Ri:Orientation"),
+        TfToken("ri:attributes:trace:autobias"),
+        TfToken("ri:attributes:trace:bias"),
+        TfToken("ri:attributes:trace:sssautobias"),
+        TfToken("ri:attributes:trace:sssbias"),
+        TfToken("ri:attributes:trace:displacements"),
+        // Dicing
+        TfToken("ri:attributes:dice:micropolygonlength"),
+        TfToken("ri:attributes:dice:offscreenstrategy"),
+        TfToken("ri:attributes:dice:rasterorient"),
+        TfToken("ri:attributes:dice:referencecamera"),
+        TfToken("ri:attributes:dice:referenceinstance"),
+        TfToken("ri:attributes:dice:strategy"),
+        TfToken("ri:attributes:dice:worlddistancelength"),
+        TfToken("ri:attributes:Ri:GeometricApproximationFocusFactor"),
+        TfToken("ri:attributes:Ri:GeometricApproximationMotionFactor"),
+        // Points
+        TfToken("ri:attributes:falloffpower"),
+        // Volume
+        TfToken("ri:attributes:dice:minlength"),
+        TfToken("ri:attributes:dice:minlengthspace"),
+        TfToken("ri:attributes:Ri:Bound"),
+        TfToken("ri:attributes:volume:dsominmax"),
+        TfToken("ri:attributes:volume:aggregate"),
+        // SubdivisionMesh
+        TfToken("ri:attributes:dice:pretessellate"),
+        TfToken("ri:attributes:dice:watertight"),
+        TfToken("ri:attributes:shade:faceset"),
+        TfToken("ri:attributes:stitchbound:CoordinateSystem"),
+        TfToken("ri:attributes:stitchbound:sphere"),
+        // NuPatch
+        TfToken("ri:attributes:trimcurve:sense"),
+        // PolygonMesh
+        TfToken("ri:attributes:polygon:concave"),
+        TfToken("ri:attributes:polygon:smoothdisplacement"),
+        TfToken("ri:attributes:polygon:smoothnormals"),
+        // Procedural
+        TfToken("ri:attributes:procedural:immediatesubdivide"),
+        TfToken("ri:attributes:procedural:reentrant")
+    };
+
+    return prototypeAttributes.count(primvarName) > 0;
+}
+
+template <typename T>
+static void
+_Convert(HdSceneDelegate *sceneDelegate, SdfPath const& id,
+         HdInterpolation hdInterp, T& params, int expectedSize,
+         float time = 0.f)
+{
+    static_assert(std::disjunction<
+        std::is_same<RtParamList, T>,
+        std::is_same<RtPrimVarList, T>>::value,
+        "params must be RtParamList or RtPrimVarList");
+        
+    // XXX:TODO: To support array-valued types, we need more
+    // shaping information.  Currently we assume arrays are
+    // simply N scalar values, according to the detail.
+    
+    std::string label;
+    if constexpr (std::is_same<RtPrimVarList, T>()) {
+        label = "primvar";
+    } else {
+        label = "attribute";
+    }
+
+    const RtDetailType detail = _RixDetailForHdInterpolation(hdInterp);
+
+    TF_DEBUG(HDPRMAN_PRIMVARS)
+        .Msg("HdPrman: _Convert called -- <%s> %s %s\n",
+             id.GetText(),
+             TfEnum::GetName(hdInterp).c_str(),
+             label.c_str());
+
+    // Computed primvars
+    if constexpr (std::is_same<RtPrimVarList, T>()) {
+        // XXX: Prman doesn't seem to check dirtyness before pulling a value.
+        // Passing AllDirty until we plumb/respect change tracking.
+        HdExtComputationPrimvarDescriptorVector  computedPrimvars =
+            _GetComputedPrimvars(sceneDelegate, id, hdInterp, 
+                                 HdChangeTracker::AllDirty);
+        if (!computedPrimvars.empty()) {
+            // Execute the computations
+            HdExtComputationUtils::ValueStore valueStore
+                = HdExtComputationUtils::GetComputedPrimvarValues(
+                    computedPrimvars, sceneDelegate);
+        
+            for (auto const& compPrimvar : computedPrimvars) {
+                auto const it = valueStore.find(compPrimvar.name);
+                if (!TF_VERIFY(it != valueStore.end())) {
+                    continue;
+                }
+                VtValue val = it->second;
+                if (val.IsEmpty() ||
+                    (val.IsArrayValued() && val.GetArraySize() == 0)) {
+                    continue;
+                }
+
+                RtUString name = _GetPrmanPrimvarName(compPrimvar.name, detail);
+
+                TF_DEBUG(HDPRMAN_PRIMVARS)
+                    .Msg("HdPrman: <%s> %s primvar "
+                         "Computed Primvar \"%s\" (%s) = \"%s\"\n",
+                         id.GetText(),
+                         TfEnum::GetName(hdInterp).c_str(),
+                         compPrimvar.name.GetText(),
+                         name.CStr(),
+                         TfStringify(val).c_str());
+
+                if (val.IsArrayValued() && 
+                    val.GetArraySize() != static_cast<size_t>(expectedSize)) {
+                    TF_WARN("<%s> primvar '%s' size (%zu) did not match "
+                            "expected (%d)", id.GetText(),
+                            compPrimvar.name.GetText(), val.GetArraySize(),
+                            expectedSize);
+                    continue;
+                }
+
+                if (!HdPrman_Utils::SetPrimVarFromVtValue(name, val, detail,
+                                    compPrimvar.role, &params)) {
+                    TF_WARN("Ignoring unhandled primvar of type %s for %s.%s\n",
+                        val.GetTypeName().c_str(), id.GetText(),
+                        compPrimvar.name.GetText());
+                }
+            }
+        }
+    }
+
+    // Authored primvars
+    for (HdPrimvarDescriptor const& primvar:
+         sceneDelegate->GetPrimvarDescriptors(id, hdInterp))
+    {
+        TF_DEBUG(HDPRMAN_PRIMVARS)
+            .Msg("HdPrman: authored id <%s> hdInterp %s label %s "
+                 "primvar \"%s\"\n",
+                 id.GetText(),
+                 TfEnum::GetName(hdInterp).c_str(),
+                 label.c_str(),
+                 primvar.name.GetText());
+
+        // Skip params with special handling.
+        if (primvar.name == HdTokens->points) {
+            continue;
+        }
+
+        // Constant Hydra primvars become either Riley primvars or attributes,
+        // depending on prefix and the name.
+        // 1.) Constant primvars with the "ri:attributes:" or
+        //     "primvars:ri:attributes:" prefixes have that
+        //     prefix stripped and become primvars for geometry prototype
+        //     "attributes" or attributes for geometry instances.
+        // 2.) Constant primvars with the "user:" prefix become attributes.
+        // 3.) Other constant primvars get set on prototype geometry as
+        //     primvars.
+        RtUString name;
+        if (hdInterp == HdInterpolationConstant) {
+            static const char *userAttrPrefix = "user:";
+            static const char *riAttrPrefix = "ri:attributes:";
+            static const char *primvarsPrefix = "primvars:";
+            bool hasUserPrefix =
+                TfStringStartsWith(primvar.name.GetString(), userAttrPrefix);
+            bool hasRiAttributesPrefix =
+                TfStringStartsWith(primvar.name.GetString(), riAttrPrefix);
+            const bool hasPrimvarRiAttributesPrefix =
+                    TfStringStartsWith(primvar.name.GetString(),primvarsPrefix);
+
+            // Strip "primvars:" from the name
+            TfToken primvarName = primvar.name;
+            if (hasPrimvarRiAttributesPrefix) {
+                const char *strippedName = primvar.name.GetText();
+                strippedName += strlen(primvarsPrefix);
+                primvarName = TfToken(strippedName);
+                hasRiAttributesPrefix =
+                      TfStringStartsWith(primvarName.GetString(), riAttrPrefix);
+            }
+
+            bool skipPrimvar = false;
+            if constexpr (std::is_same<RtParamList, T>()) {
+                // When we're looking for attributes on geometry instances,
+                // they need to have either 'user:' or 'ri:attributes:' as a
+                // prefix.
+                if (!hasUserPrefix && !hasRiAttributesPrefix) {
+                    skipPrimvar = true;
+                } else if (hasRiAttributesPrefix) {
+                    // For 'ri:attributes' we check if the attribute is a
+                    // prototype attribute and if so omit it, since it
+                    // was included with the primvars.
+                    if (_IsPrototypeAttribute(primvarName)) {
+                        skipPrimvar = true;
+                    }
+                }
+            } else {
+                // When we're looking for actual primvars, we skip the ones with
+                // the 'user:' or 'ri:attributes:' prefix. Except for a specific
+                // set of attributes that affect tessellation and dicing of the
+                // prototype geometry and so it becomes part of the primvars.
+                if (hasUserPrefix) {
+                    skipPrimvar = true;
+                } else if (hasRiAttributesPrefix) {
+                    // If this ri attribute does not affect the prototype
+                    // we skip
+                    if (!_IsPrototypeAttribute(primvarName)) {
+                        skipPrimvar = true;
+                    }
+                }
+            }
+
+            if (skipPrimvar) {
+                continue;
+            }
+
+            if (hasRiAttributesPrefix) {
+                const char *strippedName = primvarName.GetText();
+                strippedName += strlen(riAttrPrefix);
+                name = _GetPrmanPrimvarName(TfToken(strippedName), detail);
+            } else {
+                name = _GetPrmanPrimvarName(primvarName, detail);
+            }
+
+            // ri:attributes and primvars:ri:attributes primvars end up having
+            // the same name, potentially causing collisions in the primvar list.
+            // When both ri:attributes and primvar:ri:attributes versions of 
+            // the same primvars exist, the primvar:ri:attributes version should
+            // win out.
+            if (hasRiAttributesPrefix && !hasPrimvarRiAttributesPrefix &&
+                params.HasParam(name)) {
+                continue;
+            }
+        } else {
+            name = _GetPrmanPrimvarName(primvar.name, detail);
+        }
+
+        HdTimeSampleArray<VtValue, HDPRMAN_MAX_TIME_SAMPLES> samples;
+        sceneDelegate->SamplePrimvar(id, primvar.name, &samples);
+        // XXX: The motion blur scene index plugin ensures that only a single
+        // sample at offset 0 is returned for any primvar on which Prman does
+        // not support motion samples. Currently, that's all primvars except P.
+        // We call Resample() here because HdPrman also does not yet support
+        // time-sampled primvars other than P.
+        // HdPrman_Utils::SetPrimVarFromVtValue expects a single VtValue and no
+        // mechanism exists to ensure all primvars are sampled at the same set
+        // of times, which would be a Prman requirement since times are a
+        // property of the whole RtPrimVarList.
+        VtValue val = samples.Resample(time);
+
+        TF_DEBUG(HDPRMAN_PRIMVARS)
+            .Msg("HdPrman: <%s> %s %s \"%s\" (%s) = \"%s\"\n",
+                 id.GetText(),
+                 TfEnum::GetName(hdInterp).c_str(),
+                 label.c_str(),
+                 primvar.name.GetText(),
+                 name.CStr(),
+                 TfStringify(val).c_str());
+
+        if (val.IsEmpty() ||
+            (val.IsArrayValued() && val.GetArraySize() == 0)) {
+            continue;
+        }
+
+        // For non-constant primvars, check array size to make sure it
+        // matches the expected topology size.
+        if (hdInterp != HdInterpolationConstant &&
+            val.IsArrayValued() && 
+            val.GetArraySize() != static_cast<size_t>(expectedSize)) {
+            TF_WARN("<%s> %s '%s' size (%zu) did not match "
+                    "expected (%d)", id.GetText(), label.c_str(),
+                    primvar.name.GetText(), val.GetArraySize(), expectedSize);
+            continue;
+        }
+        if constexpr(std::is_same<RtPrimVarList, T>()) {
+            if (!HdPrman_Utils::SetPrimVarFromVtValue(name, val, detail,
+                primvar.role, &params)) {
+                TF_WARN("Ignoring unhandled primvar of type %s for %s.%s\n",
+                    val.GetTypeName().c_str(), id.GetText(),
+                    primvar.name.GetText());
+            }
+        } else {
+            if (!HdPrman_Utils::SetParamFromVtValue(name, val, primvar.role,
+                &params)) {
+                TF_WARN("Ignoring unhandled attribute of type %s for %s.%s\n",
+                    val.GetTypeName().c_str(), id.GetText(),
+                    primvar.name.GetText());
+            }
+        }
+    }
+}
+
+void
+HdPrman_ConvertPrimvars(HdSceneDelegate *sceneDelegate, SdfPath const& id,
+                        RtPrimVarList& primvars, int numUniform, int numVertex,
+                        int numVarying, int numFaceVarying, float time)
+{
+    const HdInterpolation hdInterpValues[] = {
+        HdInterpolationConstant,
+        HdInterpolationUniform,
+        HdInterpolationVertex,
+        HdInterpolationVarying,
+        HdInterpolationFaceVarying,
+    };
+    // The expected size of each interpolation mode. -1 means any size is
+    // acceptable.
+    const int primvarSizes[] = {
+        1,
+        numUniform,
+        numVertex,
+        numVarying,
+        numFaceVarying
+    };
+    const int modeCount = 5;
+    for (size_t i = 0; i < modeCount; ++i) {
+        _Convert(sceneDelegate, id, hdInterpValues[i], primvars,
+                 primvarSizes[i], time);
+    }
+}
+
+void
+HdPrman_TransferMaterialPrimvarOpinions(HdSceneDelegate *sceneDelegate,
+                                        SdfPath const& materialId,
+                                        RtPrimVarList& primvars)
+{
+    if (!materialId.IsEmpty()) {
+        if (const HdSprim *sprim = sceneDelegate->GetRenderIndex().GetSprim(
+            HdPrimTypeTokens->material, materialId)) {
+            const HdPrmanMaterial *material =
+                dynamic_cast<const HdPrmanMaterial*>(sprim);
+            if (material && material->IsValid()) {
+                const HdMaterialNetwork2 & matNetwork = 
+                    material->GetMaterialNetwork();
+                for (const auto & nodeIt : matNetwork.nodes) {
+                    const HdMaterialNode2 & node = nodeIt.second;
+                    if (node.nodeTypeId == _tokens->PrimvarPass) {
+                        for (const auto &param : node.parameters) {
+                            uint32_t paramId;
+                            RtUString paramName = 
+                                RtUString(param.first.GetText());
+                            if (!primvars.GetParamId(paramName, paramId)) {
+                                HdPrman_Utils::SetPrimVarFromVtValue(paramName,
+                                    param.second, RtDetailType::k_constant,
+                                    /*role*/TfToken(), &primvars);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+RtParamList
+HdPrman_RenderParam::ConvertAttributes(HdSceneDelegate *sceneDelegate,
+                                   SdfPath const& id, bool isGeometry)
+{
+    RtParamList attrs;
+
+    // Convert Hydra instance-rate primvars, and "user:" prefixed
+    // constant  primvars, to Riley attributes.
+    const HdInterpolation hdInterpValues[] = {
+        HdInterpolationConstant,
+    };
+    for (HdInterpolation hdInterp: hdInterpValues) {
+        _Convert(sceneDelegate, id, hdInterp, attrs, 1);
+    }
+
+    // Hydra id -> Riley Rix::k_identifier_name
+    attrs.SetString(RixStr.k_identifier_name, RtUString(id.GetText()));
+
+    // Hydra visibility -> Riley Rix::k_visibility
+    if (!sceneDelegate->GetVisible(id)) {
+        attrs.SetInteger(RixStr.k_visibility_camera, 0);
+        attrs.SetInteger(RixStr.k_visibility_indirect, 0);
+        attrs.SetInteger(RixStr.k_visibility_transmission, 0);
+    }
+
+    if (isGeometry) {
+        // Hydra categories -> Riley k_grouping_membership
+        // Note that lights and light filters also have a grouping membership,
+        // but that comes from the light (linking) params.
+        VtArray<TfToken> categories = sceneDelegate->GetCategories(id);
+        ConvertCategoriesToAttributes(id, categories, attrs);
+
+        // Hydra cullStyle & doubleSided -> Riley k_Ri_Sides
+        // Ri:Sides is most analogous to GL culling style. When Ri:Sides = 1,
+        // prman will skip intersections on the back, with "back" determined by
+        // winding order (Ri:Orientation). Prman's default value for Ri:Sides
+        // is 2. By considering both cullStyle and doubleSided, we can accurately
+        // reproduce all the Hydra cull styles. While usd does not surface cullStyle,
+        // some Hydra constructs rely on cullStyle to achieve their intended looks,
+        // e.g., the cards drawmode adapter.
+
+        // TODO: (tgvarik) Check how Ri:ReverseOrientation interacts with
+        //       displacement. What is intended when front-face culling is applied 
+        //       to a surface with displacement? Should be vanishingly rare.
+
+        const HdCullStyle cullStyle = sceneDelegate->GetCullStyle(id);
+        switch (cullStyle) {
+            case HdCullStyleNothing:
+                attrs.SetInteger(RixStr.k_Ri_Sides, 2);
+                break;
+            case HdCullStyleFront:
+                attrs.SetInteger(RixStr.k_Ri_ReverseOrientation, 1);
+                // fallthrough
+            case HdCullStyleBack:
+                attrs.SetInteger(RixStr.k_Ri_Sides, 1);
+                break;
+            case HdCullStyleFrontUnlessDoubleSided:
+                attrs.SetInteger(RixStr.k_Ri_ReverseOrientation, 
+                    sceneDelegate->GetDoubleSided(id) ? 0 : 1);
+                // fallthrough
+            case HdCullStyleBackUnlessDoubleSided:
+                attrs.SetInteger(RixStr.k_Ri_Sides, 
+                    sceneDelegate->GetDoubleSided(id) ? 2 : 1);
+                break;
+            case HdCullStyleDontCare:
+                // Noop. If the prim has no opinion on the matter,
+                // defer to Prman default by not setting Ri:Sides.
+                break;
+        }
+    
+
+        // Double-sidedness in usd is a property of the gprim for legacy reasons.
+        // Double-sidedness in prman is a property of the material. To achieve
+        // consistency, we need to communicate the gprim's double-sidedness to
+        // the material via an attribute, which allows the material to determine
+        // whether it should shade both sides or just the front.
+
+        // Integer primvars do not exist in prman, which is why we do this on
+        // the attributes instead. Furthermore, all custom attributes like this
+        // must be in the "user:" namespace to be accessible from the shader.
+        attrs.SetInteger(
+            RtUString("user:hydra:doubleSided"),
+            sceneDelegate->GetDoubleSided(id) ? 1 : 0
+        );
+    }
+    
+    return attrs;
+}
+
+void
+HdPrman_RenderParam::ConvertCategoriesToAttributes(
+    SdfPath const& id,
+    VtArray<TfToken> const& categories,
+    RtParamList& attrs)
+{
+    if (categories.empty()) {
+        if (!attrs.HasParam( RixStr.k_grouping_membership)) {
+            // Clear any categories that may have been previously tacked on by
+            // explicitly adding an empty string valued attribute.
+            attrs.SetString( RixStr.k_grouping_membership, RtUString("") );
+        }
+        attrs.SetString( RixStr.k_lightfilter_subset, RtUString("") );
+        attrs.SetString( RixStr.k_lighting_subset, RtUString("default") );
+        TF_DEBUG(HDPRMAN_LIGHT_LINKING)
+            .Msg("HdPrman: <%s> no categories; grouping:membership = \"\"; "
+                 "lighting:subset = \"default\"; lightFilter:subset = \"\"\n",
+                 id.GetText());
+        return;
+    }
+
+    std::string membership;
+    for (TfToken const& category : categories) {
+        if (!membership.empty()) {
+            membership += " ";
+        }
+        membership += category;
+    }
+    // Fetch incoming grouping:membership and tack it onto categories
+    RtUString inputGrouping = RtUString("");
+    attrs.GetString(RixStr.k_grouping_membership, inputGrouping);
+    if (inputGrouping != RtUString("")) {
+        std::string input = inputGrouping.CStr();
+        membership += " " + input;
+    }
+    attrs.SetString( RixStr.k_grouping_membership,
+                     RtUString(membership.c_str()) );
+    TF_DEBUG(HDPRMAN_LIGHT_LINKING)
+        .Msg("HdPrman: <%s> grouping:membership = \"%s\"\n",
+             id.GetText(), membership.c_str());
+
+    // Light linking:
+    // Geometry subscribes to categories of lights illuminating it.
+    // Take any categories used by a light as a lightLink param
+    // and list as k_lighting_subset.
+    std::string lightingSubset = "default";
+    for (TfToken const& category: categories) {
+        if (IsLightLinkUsed(category)) {
+            if (!lightingSubset.empty()) {
+                lightingSubset += " ";
+            }
+            lightingSubset += category;
+        }
+    }
+    attrs.SetString( RixStr.k_lighting_subset,
+                     RtUString(lightingSubset.c_str()) );
+    TF_DEBUG(HDPRMAN_LIGHT_LINKING)
+        .Msg("HdPrman: <%s> lighting:subset = \"%s\"\n",
+             id.GetText(), lightingSubset.c_str());
+
+    // Light filter linking:
+    // Geometry subscribes to categories of light filters applied to it.
+    // Take any categories used by a light filter as a lightFilterLink param
+    // and list as k_lightfilter_subset.
+    std::string lightFilterSubset = "default";
+    for (TfToken const& category: categories) {
+        if (IsLightFilterUsed(category)) {
+            if (!lightFilterSubset.empty()) {
+                lightFilterSubset += " ";
+            }
+            lightFilterSubset += category;
+        }
+    }
+    attrs.SetString( RixStr.k_lightfilter_subset,
+                      RtUString(lightFilterSubset.c_str()) );
+    TF_DEBUG(HDPRMAN_LIGHT_LINKING)
+        .Msg("HdPrman: <%s> lightFilter:subset = \"%s\"\n",
+             id.GetText(), lightFilterSubset.c_str());
+}
+
+bool
+HdPrman_ResolveMaterial(HdSceneDelegate *sceneDelegate,
+                        SdfPath const& hdMaterialId,
+                        riley::Riley *riley,
+                        riley::MaterialId *materialId,
+                        riley::DisplacementId *dispId)
+{
+    if (hdMaterialId != SdfPath()) {
+        if (HdSprim *sprim = sceneDelegate->GetRenderIndex().GetSprim(
+            HdPrimTypeTokens->material, hdMaterialId)) {
+            if (HdPrmanMaterial *material =
+                dynamic_cast<HdPrmanMaterial*>(sprim)) {
+                // Resolving the material indicates that it is
+                // actually in use, so we sync to Riley.
+                material->SyncToRiley(sceneDelegate, riley);
+                if (material->IsValid()) {
+                    *materialId = material->GetMaterialId();
+                    *dispId = material->GetDisplacementId();
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+HdPrman_RenderParam::RileyCoordSysIdVecRefPtr
+HdPrman_RenderParam::ConvertAndRetainCoordSysBindings(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const& id)
+{
+    // Query Hydra coordinate system bindings.
+    HdIdVectorSharedPtr hdIdVecPtr = sceneDelegate->GetCoordSysBindings(id);
+    if (!hdIdVecPtr) {
+        return nullptr;
+    }
+
+    // We have bindings to convert.
+    std::lock_guard<std::mutex> lock(_coordSysMutex);
+    // Check for an existing converted binding vector.
+    _HdToRileyCoordSysMap::const_iterator it =
+        _hdToRileyCoordSysMap.find(hdIdVecPtr);
+    if (it != _hdToRileyCoordSysMap.end()) {
+        // Found an existing conversion.
+        // Record an additional use on this geometry.
+        _geomToHdCoordSysMap[id] = hdIdVecPtr;
+        return it->second;
+    }
+    // Convert Hd ids to Riley id's.
+    RileyCoordSysIdVec rileyIdVec;
+    rileyIdVec.reserve(hdIdVecPtr->size());
+    for (SdfPath const& hdId: *hdIdVecPtr) {
+        // Look up sprim for binding.
+        const HdSprim *sprim = sceneDelegate->GetRenderIndex()
+            .GetSprim(HdPrimTypeTokens->coordSys, hdId);
+        // Expect there to be an sprim with this id.
+        if (TF_VERIFY(sprim)) {
+            // Expect it to be an HdPrmanCoordSys.
+            const HdPrmanCoordSys *prmanSprim =
+                dynamic_cast<const HdPrmanCoordSys*>(sprim);
+            if (TF_VERIFY(prmanSprim) && prmanSprim->IsValid()) {
+                // Use the assigned Riley ID.
+                rileyIdVec.push_back(prmanSprim->GetCoordSysId());
+            }
+        }
+    }
+
+    // Establish a cache entry.
+    RileyCoordSysIdVecRefPtr rileyIdVecPtr =
+        std::make_shared<RileyCoordSysIdVec>(rileyIdVec);
+    _hdToRileyCoordSysMap[hdIdVecPtr] = rileyIdVecPtr;
+    _geomToHdCoordSysMap[id] = hdIdVecPtr;
+    return rileyIdVecPtr;
+}
+
+void
+HdPrman_RenderParam::ReleaseCoordSysBindings(SdfPath const& id)
+{
+    std::lock_guard<std::mutex> lock(_coordSysMutex);
+    _GeomToHdCoordSysMap::iterator geomIt = _geomToHdCoordSysMap.find(id);
+    if (geomIt == _geomToHdCoordSysMap.end()) {
+        // No cached bindings to release.
+        return;
+    }
+    if (TF_VERIFY(geomIt->second) && geomIt->second.use_count() == 1) {
+        // If this is the last geometry using this Riley vector,
+        // we can release the cache entry.  This will free the vector.
+        // (Note that the Riley coordinate system object lifetime
+        // is managed by the HdPrmanCoordSys sprim.)
+        _hdToRileyCoordSysMap.erase(geomIt->second);
+    }
+    _geomToHdCoordSysMap.erase(geomIt);
+}
+
+static bool
+_Contains(
+    HdRenderSettingsMap const &settings,
+    TfToken const &key)
+{
+    return settings.find(key) != settings.end();
+}
+
+void
+HdPrman_RenderParam::UpdateLegacyOptions()
+{
+    const HdRenderSettingsMap renderSettingsMap =
+        _renderDelegate->GetRenderSettingsMap();
+    RtParamList &options = GetLegacyOptions();
+
+    VtValue batchCommandLine;
+
+    for (auto const& entry : renderSettingsMap) {
+        TfToken token = entry.first;
+        VtValue val = entry.second;
+
+        if (TfStringStartsWith(token.GetText(), "ri:")) {
+            // Skip integrator settings.
+            if (TfStringStartsWith(token.GetText(), "ri:integrator")) {
+                continue;
+            }
+
+            // Strip "ri:" namespace from USD.
+            RtUString riName;
+            riName = RtUString(token.GetText()+3);
+
+            // XXX there is currently no way to distinguish the type of a 
+            // float3 setting (color, point, vector).  All float3 settings are
+            // treated as float[3] until we have a way to determine the type. 
+            HdPrman_Utils::SetParamFromVtValue(riName, val, TfToken(), &options);
+        } else {
+            
+            // ri: namespaced settings win over custom settings tokens when
+            // present.
+            if (token == HdRenderSettingsTokens->convergedSamplesPerPixel) {
+                if (!_Contains(renderSettingsMap,
+                        _riOptionsTokens->riHiderMaxSamples)) {
+
+                    VtValue vtInt = val.Cast<int>();
+                    int maxSamples = TF_VERIFY(!vtInt.IsEmpty()) ?
+                        vtInt.UncheckedGet<int>() : 64; // RenderMan default
+                    options.SetInteger(RixStr.k_hider_maxsamples, maxSamples);
+                }
+
+            } else if (token == HdRenderSettingsTokens->convergedVariance) {
+                if (!_Contains(renderSettingsMap,
+                        _riOptionsTokens->riRiPixelVariance)) {
+                    VtValue vtFloat = val.Cast<float>();
+                    float pixelVariance = TF_VERIFY(!vtFloat.IsEmpty()) ?
+                        vtFloat.UncheckedGet<float>() : 0.001f;
+                    options.SetFloat(RixStr.k_Ri_PixelVariance, pixelVariance);
+                }
+
+            } else if (token == HdPrmanRenderSettingsTokens->pixelAspectRatio) {
+                if (!_Contains(renderSettingsMap,
+                        _riOptionsTokens->riRiFormatPixelAspectRatio)) {
+                    options.SetFloat(RixStr.k_Ri_FormatPixelAspectRatio, 
+                                    val.UncheckedGet<float>());
+                }
+
+            } else if (token == HdPrmanRenderSettingsTokens->resolution ) {
+                if (!_Contains(renderSettingsMap,
+                        _riOptionsTokens->riRiFormatResolution)) {
+                    const GfVec2i& res = val.UncheckedGet<GfVec2i>();
+                    options.SetIntegerArray(RixStr.k_Ri_FormatResolution, 
+                                            res.data(), 2);
+                }
+            } else if (token == HdRenderSettingsTokens->threadLimit) {
+                if (!_Contains(renderSettingsMap,
+                        _riOptionsTokens->riLimitsThreads)) {
+                    VtValue vtInt = val.Cast<int>();
+                    if (!vtInt.IsEmpty()) {
+                        options.SetInteger(RixStr.k_limits_threads,
+                            vtInt.UncheckedGet<int>());
+                    }
+                }
+
+            } else if (token == HdPrmanRenderSettingsTokens->batchCommandLine) {
+                batchCommandLine = val;
+            }
+            // Note: HdPrmanRenderSettingsTokens->disableMotionBlur is handled in
+            //       SetRileyShutterIntervalFromCameraContextCameraPath.  
+        }
+    }
+    // Apply the batch command line settings last, so that they can
+    // either intentionally override render settings, or sometimes be skipped
+    // if the equivalent render setting exists, like for checkpointinterval.
+    // Otherwise, since settings are in a hash map, it would be random
+    // whether the command line settings or render settings win.
+    SetBatchCommandLineArgs(batchCommandLine, &options);
+}
+
+void
+HdPrman_RenderParam::SetIntegratorParamsFromRenderSettingsMap(
+    HdPrmanRenderDelegate *renderDelegate,
+    const std::string& integratorName,
+    RtParamList& params)
+{
+    HdRenderSettingsMap renderSettings = renderDelegate->GetRenderSettingsMap();
+
+    TfToken prefix(std::string("ri:integrator:") + integratorName + ":");
+    for (auto const& entry : renderSettings) {
+        if (TfStringStartsWith(entry.first.GetText(), prefix.GetText())) {
+            // Strip namespace prefix from USD.
+            RtUString riName(entry.first.GetText() + prefix.size());
+            HdPrman_Utils::SetParamFromVtValue(riName, entry.second,
+                TfToken(), &params);
+        }
+    }        
+}
+
+void
+HdPrman_RenderParam::SetBatchCommandLineArgs(
+    VtValue const &cmdLine,
+    RtParamList * options)
+{
+    if (!cmdLine.IsHolding<VtArray<std::string>>()) {
+        return;
+    }
+    bool doSnapshot = false;
+    const VtArray<std::string>& v =
+        cmdLine.UncheckedGet<VtArray<std::string>>();
+    for (auto i = v.cbegin(),
+             end = v.cend();
+         i != end; ++i) {
+        if (*i == "--snapshot") {
+            ++i;
+            if(i == end) {
+                TF_WARN("No value found for --snapshot argument\n");
+                break;
+            }
+            RtUString checkpointinterval;
+            options->GetString(RixStr.k_checkpoint_interval,
+                              checkpointinterval);
+            // Checkpoint interval from render settings wins
+            // because normally it's not set, so if it's set the user
+            // chose that, and it accepts more expressive values
+            // than the --snapshot arg. Also, Solaris always puts
+            // the --snapshot arg on the commandline, so even though
+            // it seems like it would make sense for command line to win,
+            // users should simply not set the checkpoint render settings
+            // if they want to use --snapshot.
+            if (checkpointinterval.Empty()) {
+                doSnapshot = true;
+                const std::vector<std::string> toks =
+                    TfStringTokenize(*i, ",");
+                std::vector<RtUString> us;
+                us.reserve(toks.size());
+                std::transform(toks.begin(), toks.end(),
+                               std::back_inserter(us),
+                               [](const std::string& str) -> RtUString
+                               { return RtUString(str.c_str()); } );
+                options->SetStringArray(RixStr.k_checkpoint_interval,
+                                       us.data(), us.size());
+            }
+        }
+        else if (*i == "--threads") {
+            ++i;
+            if(i == end) {
+                TF_WARN("No value found for --threads argument\n");
+                break;
+            }
+            try {
+                const int n = stoi(*i);
+                options->SetInteger(RixStr.k_limits_threads, n);
+            }
+            catch (const std::invalid_argument &e) {
+                TF_WARN("Invalid argument to --threads\n");
+            }
+            catch (const std::out_of_range &e) {
+                TF_WARN("Invalid argument to --threads\n");
+            }
+        } else if (*i == "--timelimit") {
+            ++i;
+            if(i == end) {
+                TF_WARN("No value found for --timelimit argument\n");
+                break;
+            }
+            RtUString exitat;
+            options->GetString(RixStr.k_checkpoint_exitat, exitat);
+            // Checkpoint exitat from render settings wins
+            if (exitat.Empty()) {
+                options->SetString(RixStr.k_checkpoint_exitat,
+                                  RtUString(i->c_str()));
+            }
+        } else if (*i == "--output" || *i == "-o") {
+            ++i;
+            if(i == end) {
+                TF_WARN("No value found for --output argument\n");
+                break;
+            }
+            // Husk accepts comma separated list for multiple outputs
+            _outputNames = TfStringTokenize(i->c_str(), ",");
+        }
+    }
+
+    // Force incremental to be enabled when checkpointing
+    RtUString checkpointinterval;
+    options->GetString(RixStr.k_checkpoint_interval,
+                      checkpointinterval);
+    if(!checkpointinterval.Empty() || doSnapshot) {
+        options->SetInteger(RixStr.k_hider_incremental, 1);
+    }
+}
+
+void
+HdPrman_RenderParam::SetIntegratorParamsFromCamera(
+    HdPrmanRenderDelegate *renderDelegate,
+    const HdPrmanCamera *camera,
+    std::string const& integratorName,
+    RtParamList &integratorParams)
+{
+    for(auto const& cb: *_integratorCameraCallbacks) {
+        cb(renderDelegate, camera, integratorName, integratorParams);
+    }
+}
+
+void 
+HdPrman_RenderParam::RegisterIntegratorCallbackForCamera(
+    IntegratorCameraCallback const& callback)
+{
+   _integratorCameraCallbacks->push_back(callback);
+}
+
+void
+HdPrman_RenderParam::_CreateStatsSession(void)
+{
+    // Set log level for diagnostics relating to initialization.
+    // If we succeed in loading a config file then the log level specified
+    // in the config file will take precedence.
+    stats::Logger::LogLevel statsDebugLevel =
+        stats::GlobalLogger()->DefaultLogLevel();
+    stats::SetGlobalLogLevel(statsDebugLevel);
+    stats::SetGlobalLogLevel(stats::Logger::k_debug);
+
+    // Build default listener plugin search path
+    std::string listenerPath(".");
+    char* rmanTreePath = getenv("RMANTREE");
+    if (rmanTreePath)
+    {
+        listenerPath += ":";
+        listenerPath += rmanTreePath;
+        listenerPath += "/lib/plugins/listeners";
+    }
+
+    stats::SetListenerPluginSearchPath(listenerPath);
+
+    // Create our stats Session config.
+    std::string configFilename("stats.ini");
+    std::string configSearchPathStr;
+    char* configSearchPathOverride = getenv("RMAN_STATS_CONFIG_PATH");
+    if (configSearchPathOverride)
+    {
+        configSearchPathStr = std::string(configSearchPathOverride);
+    }
+
+    // This could eventually come from a GUI so we go through
+    // the motion of checking to see if we have a filename.
+    stats::SessionConfig sessionConfig("HDPRman Stats Session");
+    if (!configFilename.empty() && !configSearchPathStr.empty())
+    {
+        // Try to resolve the file in the given path and load the
+        // configuration data. If it fails to find the config
+        // file we'll just fall back onto the defaults.
+        sessionConfig.LoadConfigFile(configSearchPathStr, configFilename);
+    }
+
+    // Instantiate a stats Session from config object.
+    _statsSession = &stats::AddSession(sessionConfig);
+
+    // Validate and inform
+    _statsSession->LogInfo("HDPRMan", "Created Roz stats session '" +
+                                      _statsSession->GetName() + "'.");
+}
+
+void HdPrman_RenderParam::_PRManSystemBegin(
+    const std::vector<std::string>& extraArgs)
+{
+#if _PRMANAPI_VERSION_MAJOR_ >= 26
+    // Must invoke PRManSystemBegin() and PRManRenderBegin()
+    // before we start using Riley.
+    // Turning off unwanted statistics warnings
+    // TODO: Fix incorrect tear-down handling of these statistics in
+    // interactive contexts as described in PRMAN-2353
+
+    std::vector<std::string> sArgs;
+    sArgs.reserve(3+extraArgs.size());
+    sArgs.push_back(""); // Empty argv[0]: hdPrman will do Xcpt/signal handling
+    sArgs.push_back("-woff");
+    sArgs.push_back("R56008,R56009");
+    sArgs.insert(std::end(sArgs), std::begin(extraArgs), std::end(extraArgs));
+
+    // PRManSystemBegin expects array of char* rather than std::string
+    std::vector<const char*> cArgs;
+    cArgs.reserve(sArgs.size());
+    std::transform(sArgs.begin(), sArgs.end(), std::back_inserter(cArgs),
+                   [](const std::string& str) { return str.c_str();} );
+
+    _ri->PRManSystemBegin(cArgs.size(),
+        const_cast<const char **>(cArgs.data()));
+#endif
+}
+
+int HdPrman_RenderParam::_PRManRenderBegin(
+    const std::vector<std::string>& extraArgs)
+{
+    // Must invoke PRManSystemBegin() and PRManRenderBegin()
+    // before we start using Riley.
+    std::vector<std::string> sArgs;
+#if _PRMANAPI_VERSION_MAJOR_ >= 26
+    sArgs.reserve(2+extraArgs.size());
+#else
+    sArgs.reserve(5+extraArgs.size());
+    sArgs.push_back("hdPrman");  // Empty argv[0]: hdPrman will do Xcpt/signal handling
+    sArgs.push_back("-woff");
+    sArgs.push_back("R56008,R56009");
+#endif
+    sArgs.push_back("-statssession");
+    sArgs.push_back(_statsSession->GetName());
+    sArgs.insert(std::end(sArgs), std::begin(extraArgs), std::end(extraArgs));
+
+    // PRManRenderBegin expects array of char* rather than std::string
+    std::vector<const char*> cArgs;
+    cArgs.reserve(sArgs.size());
+    std::transform(sArgs.begin(), sArgs.end(), std::back_inserter(cArgs),
+                   [](const std::string& str) { return str.c_str();} );
+#if _PRMANAPI_VERSION_MAJOR_ >= 26
+    return _ri->PRManRenderBegin(cArgs.size(),
+        const_cast<const char **>(cArgs.data()));
+#else
+    return _ri->PRManBegin(cArgs.size(), const_cast<char **>(cArgs.data()));
+#endif
+}
+
+void
+HdPrman_RenderParam::_CreateRiley(const std::string &rileyVariant,
+    const std::string &xpuDevices,
+    const std::vector<std::string>& extraArgs)
+{
+    _rix = RixGetContext();
+    if (!_rix) {
+        TF_RUNTIME_ERROR("Could not initialize Rix API.");
+        return;
+    }
+    _ri = (RixRiCtl*)_rix->GetRixInterface(k_RixRiCtl);
+    if (!_ri) {
+        TF_RUNTIME_ERROR("Could not initialize Ri API.");
+        return;
+    }
+
+#if _PRMANAPI_VERSION_MAJOR_ >= 26
+    // Initialize internals of PRMan system
+    _PRManSystemBegin(extraArgs);
+
+    // Create the RenderMan stats session
+    _CreateStatsSession();
+#endif
+
+    // Instantiate PRMan renderer ahead of CreateRiley
+    int err = _PRManRenderBegin(extraArgs);
+    if (err)
+    {
+        TF_RUNTIME_ERROR("Could not initialize Renderer.");
+        return;
+    }
+
+    // Register an Xcpt handler
+    RixXcpt* rix_xcpt = (RixXcpt*)_rix->GetRixInterface(k_RixXcpt);
+    rix_xcpt->Register(&_xcpt);
+
+    // Register progress callback
+     RixEventCallbacks* rix_event_callbacks =
+        (RixEventCallbacks*)_rix->GetRixInterface(k_RixEventCallbacks);
+     rix_event_callbacks->RegisterCallback(RixEventCallbacks::k_Progress,
+                                           _ProgressCallback, this);
+
+    // Populate RixStr struct
+    RixSymbolResolver* sym = (RixSymbolResolver*)_rix->GetRixInterface(
+        k_RixSymbolResolver);
+    sym->ResolvePredefinedStrings(RixStr);
+
+    // Sanity check symbol resolution with a canary symbol, shutterTime.
+    // This can catch accidental linking with incompatible versions.
+    TF_VERIFY(RixStr.k_shutterOpenTime == RtUString("shutterOpenTime"),
+              "Renderman API tokens do not match expected values.  "
+              "There may be a compile/link version mismatch.");
+
+    // Acquire Riley instance.
+    _mgr = (RixRileyManager*)_rix->GetRixInterface(k_RixRileyManager);
+
+    _xpu = (!rileyVariant.empty() ||
+            (rileyVariant.find("xpu") != std::string::npos));
+
+    // Decide whether to use the CPU, GPU, or both
+    RtParamList paramList;
+    if (_xpu && !xpuDevices.empty()) {
+        static const RtUString cpuConfig("xpu:cpuconfig");
+        static const RtUString gpuConfig("xpu:gpuconfig");
+
+        const bool useCpu = xpuDevices.find("cpu") != std::string::npos;
+        paramList.SetInteger(cpuConfig, useCpu ? 1 : 0);
+
+        const bool useGpu = xpuDevices.find("gpu") != std::string::npos;
+        if (useGpu) {
+            paramList.SetIntegerArray(gpuConfig, 
+                                _xpuGpuConfig.data(), _xpuGpuConfig.size());
+        }
+    }
+
+    _riley = _mgr->CreateRiley(RtUString(rileyVariant.c_str()), paramList);
+
+    if(!_riley) {
+        TF_RUNTIME_ERROR("Could not initialize riley API.");
+        return;
+    }
+}
+
+
+static
+riley::RenderOutputType
+_ToRenderOutputType(const TfToken &t)
+{
+    if (t == TfToken("color3f")) {
+        return riley::RenderOutputType::k_Color;
+    } else if (t == TfToken("float3") ||
+               t == TfToken("normal3f") ||
+               t == TfToken("point3f") ||
+               t == TfToken("vector3f")) {
+        return riley::RenderOutputType::k_Vector;
+    } else if (t == TfToken("float")) {
+        return riley::RenderOutputType::k_Float;
+    } else if (t == TfToken("int")) {
+        return riley::RenderOutputType::k_Integer;
+    } else {
+        TF_RUNTIME_ERROR("Unimplemented renderVar dataType '%s'; "
+                         "skipping", t.GetText());
+        return riley::RenderOutputType::k_Integer;
+    }
+}
+
+// Helper to convert a dictionary of Hydra settings to Riley params,
+// stripping the namespace prefix if provided.
+static
+RtParamList
+_ToRtParamList(VtDictionary const& dict, TfToken prefix=TfToken())
+{
+    RtParamList params;
+    for (auto const& entry: dict) {
+        std::string key = entry.first;
+
+        // EXR metadata transformation:
+        // Keys of the format "ri:exrheader:A:B:C"
+        // will be changed to "exrheader_A/B/C"
+        // for use with the d_openexr display driver conventions.
+        if (TfStringStartsWith(key, "ri:exrheader:")) {
+            key = TfStringReplace(key, "ri:exrheader:", "exrheader_");
+            for (char &c: key) {
+                if (c == ':') {
+                    c = '/';
+                }
+            }
+        }
+
+        // Remove namespace prefix
+        if (TfStringStartsWith(key, prefix.GetString())) {
+            key = key.substr(prefix.size());
+        }
+
+        RtUString riName(key.c_str());
+        HdPrman_Utils::SetParamFromVtValue(riName, entry.second,
+                                           /* role = */ TfToken(), &params);
+    }
+    return params;
+}
+
+static
+RtUString
+_GetOutputDisplayDriverType(const std::string &extension)
+{
+    static const std::map<std::string,TfToken> extToDisplayDriver{
+        { std::string("exr"),  TfToken("openexr") },
+        { std::string("tif"),  TfToken("tiff") },
+        { std::string("tiff"), TfToken("tiff") },
+        { std::string("png"),  TfToken("png") }
+    };
+    
+    const auto it = extToDisplayDriver.find(extension);
+    if (it != extToDisplayDriver.end()) {
+        return RtUString(it->second.GetText());
+    }
+
+    TF_WARN(
+        "Could not determine display driver for product filename extension %s."
+        "Falling back to openexr.", extension.c_str());
+
+    return RtUString(_tokens->openexr.GetText());
+}
+
+// Overload used when creating the render view from a renderSpec dict.
+static
+RtUString
+_GetOutputDisplayDriverType(const TfToken &name)
+{
+    const std::string outputExt = TfGetExtension(name.GetString());
+    return _GetOutputDisplayDriverType(outputExt);
+}
+
+// Overload used when creating the render view from a render settings' product.
+static
+RtUString
+_GetOutputDisplayDriverType(
+    const VtDictionary &productSettings,
+    const TfToken &productName,
+    const TfToken &productType)
+{
+    // Use "ri:productType" from the product's namespaced settings if
+    // available.
+    const TfToken driverName =
+        VtDictionaryGet<TfToken>(
+            productSettings,
+            _tokens->riProductType.GetText(),
+            VtDefault = TfToken());
+
+    if (!driverName.IsEmpty()) {
+        return RtUString(driverName.GetText());
+    }
+
+    // Otherwise, use the extension from the product name and product type
+    // to determine the driver.
+    //
+    const std::string outputExt = TfGetExtension(productName.GetString());
+
+    if (productType == _tokens->deepRaster && outputExt == std::string("exr")) {
+        return RtUString(_tokens->deepexr.GetText());
+    }
+
+    return _GetOutputDisplayDriverType(outputExt);
+}
+
+// Temporary workaround for RMAN-21883:
+//
+// The args file for d_openexr says the default for asrgba is 1.
+// The code for d_openexr uses a default of 0.
+//
+// The args default is reflected into the USD Ri schema; consequently,
+// USD app integrations may assume they can skip exporting values that
+// match this value.  The result is that there is no way for users to
+// request that value.
+//
+// Here, we update the default parameters to match the args file.
+// If no value is present, we explicitly set it to 1.
+static void
+_ApplyOpenexrDriverWorkaround(HdPrman_RenderViewDesc::DisplayDesc *display)
+{
+    static const RtUString openexr("openexr");
+    static const RtUString asrgba("asrgba");
+    if (display->driver == openexr) {
+        uint32_t paramId;
+        if (!display->params.GetParamId(asrgba, paramId)) {
+            display->params.SetInteger(asrgba, 1);
+        }
+    }
+}
+
+static
+HdPrman_RenderViewDesc
+_ComputeRenderViewDesc(
+    const VtDictionary &renderSpec,
+    const riley::CameraId cameraId,
+    const riley::IntegratorId integratorId,
+    const riley::SampleFilterList &sampleFilterList,
+    const riley::DisplayFilterList &displayFilterList)
+{
+    HdPrman_RenderViewDesc renderViewDesc;
+
+    renderViewDesc.cameraId = cameraId;
+    renderViewDesc.integratorId = integratorId;
+    renderViewDesc.resolution = _fallbackResolution;
+    renderViewDesc.sampleFilterList = sampleFilterList;
+    renderViewDesc.displayFilterList = displayFilterList;
+
+    const std::vector<VtValue> &renderVars =
+        VtDictionaryGet<std::vector<VtValue>>(
+            renderSpec,
+            HdPrmanExperimentalRenderSpecTokens->renderVars);
+    
+    for (const VtValue &renderVarVal : renderVars) {
+        const VtDictionary renderVar = renderVarVal.Get<VtDictionary>();
+
+        const std::string &nameStr =
+            VtDictionaryGet<std::string>(
+                renderVar,
+                HdPrmanExperimentalRenderSpecTokens->name);
+        const std::string &sourceNameStr =
+            VtDictionaryGet<std::string>(
+                renderVar,
+                HdPrmanExperimentalRenderSpecTokens->sourceName,
+                VtDefault = nameStr);
+        const TfToken sourceType =
+            VtDictionaryGet<TfToken>(
+                renderVar,
+                HdPrmanExperimentalRenderSpecTokens->sourceType,
+                VtDefault = TfToken());
+
+        // Map renderVar to RenderMan AOV name and source.
+        // For LPE's, we use the name of the prim rather than the LPE,
+        // and include an "lpe:" prefix on the source.
+        const RtUString aovName( (sourceType == _tokens->lpe)
+            ? nameStr.c_str()
+            : sourceNameStr.c_str());
+        const RtUString sourceName( (sourceType == _tokens->lpe)
+            ? ("lpe:" + sourceNameStr).c_str()
+            : sourceNameStr.c_str());
+
+        HdPrman_RenderViewDesc::RenderOutputDesc renderOutputDesc;
+        renderOutputDesc.name = aovName;
+        renderOutputDesc.type = _ToRenderOutputType(
+            TfToken(
+                VtDictionaryGet<std::string>(
+                    renderVar,
+                    HdPrmanExperimentalRenderSpecTokens->type)));
+        renderOutputDesc.sourceName = sourceName;
+        renderOutputDesc.rule = RixStr.k_filter;
+        renderOutputDesc.params = _ToRtParamList(
+            VtDictionaryGet<VtDictionary>(
+                renderVar,
+                HdPrmanExperimentalRenderSpecTokens->params,
+                VtDefault = VtDictionary()),
+            _tokens->riDisplayChannelNamespace);
+        renderViewDesc.renderOutputDescs.push_back(renderOutputDesc);
+    }
+    
+    const std::vector<VtValue> & renderProducts =
+        VtDictionaryGet<std::vector<VtValue>>(
+            renderSpec,
+            HdPrmanExperimentalRenderSpecTokens->renderProducts);
+
+    for (const VtValue &renderProductVal : renderProducts) {
+
+        const VtDictionary &renderProduct = renderProductVal.Get<VtDictionary>();
+
+        HdPrman_RenderViewDesc::DisplayDesc displayDesc;
+
+        const TfToken name(
+            VtDictionaryGet<std::string>(
+                renderProduct,
+                HdPrmanExperimentalRenderSpecTokens->name));
+
+        displayDesc.name = RtUString(name.GetText());
+        displayDesc.driver = _GetOutputDisplayDriverType(name);
+        displayDesc.params = _ToRtParamList(
+            VtDictionaryGet<VtDictionary>(
+                renderProduct,
+                HdPrmanExperimentalRenderSpecTokens->params,
+                VtDefault = VtDictionary()),
+            _tokens->riDisplayDriverNamespace);
+
+        // XXX Temporary; see RMAN-21883
+        _ApplyOpenexrDriverWorkaround(&displayDesc);
+
+        const VtIntArray &renderVarIndices =
+            VtDictionaryGet<VtIntArray>(
+                renderProduct,
+                HdPrmanExperimentalRenderSpecTokens->renderVarIndices);
+        for (const int renderVarIndex : renderVarIndices) {
+            displayDesc.renderOutputIndices.push_back(renderVarIndex);
+        }
+        renderViewDesc.displayDescs.push_back(displayDesc);
+    }
+
+    return renderViewDesc;
+}
+
+// Forward declaration of helper to create Render Output in the RenderViewDesc
+static RtUString
+_AddRenderOutput(RtUString aovName, 
+    const TfToken &dataType, HdFormat aovFormat, 
+    RtUString sourceName, const RtParamList &params,
+    std::vector<HdPrman_RenderViewDesc::RenderOutputDesc> *renderOutputDescs,
+    std::vector<size_t> *renderOutputIndices);
+
+static
+HdPrman_RenderViewDesc
+_ComputeRenderViewDesc(
+    HdRenderSettings::RenderProduct const &product,
+    const riley::CameraId cameraId,
+    const riley::IntegratorId integratorId,
+    const riley::SampleFilterList &sampleFilterList,
+    const riley::DisplayFilterList &displayFilterList)
+{
+    HdPrman_RenderViewDesc renderViewDesc;
+    renderViewDesc.cameraId = cameraId;
+    renderViewDesc.integratorId = integratorId;
+    renderViewDesc.sampleFilterList = sampleFilterList;
+    renderViewDesc.displayFilterList = displayFilterList;
+    renderViewDesc.resolution = product.resolution;
+
+    /* RenderProduct */
+    int renderVarIndex = 0;
+    std::map<SdfPath, int> seenRenderVars;
+
+    // Create a DisplayDesc for this RenderProduct
+    HdPrman_RenderViewDesc::DisplayDesc displayDesc;
+    displayDesc.name = RtUString(product.name.GetText());
+    displayDesc.params = _ToRtParamList(product.namespacedSettings,
+        _tokens->riDisplayDriverNamespace);
+    displayDesc.driver = _GetOutputDisplayDriverType(
+        product.namespacedSettings, product.name, product.type);
+
+    // XXX Temporary; see RMAN-21883
+    _ApplyOpenexrDriverWorkaround(&displayDesc);
+
+    /* RenderVar */
+    for (const HdRenderSettings::RenderProduct::RenderVar &renderVar :
+            product.renderVars) {
+        // Store the index to this RenderVar from all the renderOutputDesc's 
+        // saved on this renderViewDesc
+        auto renderVarIt = seenRenderVars.find(renderVar.varPath);
+        if (renderVarIt != seenRenderVars.end()) {
+            displayDesc.renderOutputIndices.push_back(renderVarIt->second);
+            continue;
+        } 
+        seenRenderVars.insert(
+            std::pair<SdfPath, int>(renderVar.varPath, renderVarIndex));
+        displayDesc.renderOutputIndices.push_back(renderVarIndex);
+        renderVarIndex++;
+
+        // Map renderVar to RenderMan AOV name and source.
+        // For LPE's, we use the name of the prim rather than the LPE,
+        // and include an "lpe:" prefix on the source.
+        std::string aovNameStr = (renderVar.sourceType == _tokens->lpe)
+            ? renderVar.varPath.GetName()
+            : renderVar.sourceName;
+        std::string sourceNameStr = (renderVar.sourceType == _tokens->lpe) 
+            ? "lpe:" + renderVar.sourceName
+            : renderVar.sourceName;
+        const RtUString aovName(aovNameStr.c_str());
+        const RtUString sourceName(sourceNameStr.c_str());
+
+        // Create a RenderOutputDesc for this RenderVar and add it to the 
+        // renderViewDesc.
+        // Note that we are not using the renderOutputIndices passed into 
+        // this function, we are instead relying on the indices stored above
+        std::vector<size_t> renderOutputIndices;
+        _AddRenderOutput(aovName, 
+                        renderVar.dataType, 
+                        HdFormatInvalid, // using renderVar.dataType
+                        sourceName, 
+                        _ToRtParamList(renderVar.namespacedSettings,
+                                       _tokens->riDisplayChannelNamespace),
+                        &renderViewDesc.renderOutputDescs,
+                        &renderOutputIndices);
+    }
+    renderViewDesc.displayDescs.push_back(displayDesc);
+
+    return renderViewDesc;
+}
+
+void
+HdPrman_RenderParam::CreateRenderViewFromRenderSpec(
+    const VtDictionary &renderSpec)
+{
+    const HdPrman_RenderViewDesc renderViewDesc =
+        _ComputeRenderViewDesc(
+            renderSpec,
+            GetCameraContext().GetCameraId(),
+            GetActiveIntegratorId(),
+            GetSampleFilterList(),
+            GetDisplayFilterList());
+
+    TF_DEBUG(HDPRMAN_RENDER_PASS)
+        .Msg("Create Riley RenderView from the RenderSpec.\n");
+                
+    GetRenderViewContext().CreateRenderView(renderViewDesc, AcquireRiley());
+}
+
+/// XXX This should eventually replace the above use of the RenderSpec
+void 
+HdPrman_RenderParam::CreateRenderViewFromRenderSettingsProduct(
+    HdRenderSettings::RenderProduct const &product,
+    HdPrman_RenderViewContext *renderViewContext)
+{
+    // XXX Ideally, the render terminals and camera context are provided as
+    //     arguments. They are currently managed by render param.
+    const HdPrman_RenderViewDesc renderViewDesc =
+        _ComputeRenderViewDesc(
+            product,
+            GetCameraContext().GetCameraId(), 
+            GetActiveIntegratorId(), 
+            GetSampleFilterList(),
+            GetDisplayFilterList());
+
+    renderViewContext->CreateRenderView(renderViewDesc, AcquireRiley());
+
+}
+
+void
+HdPrman_RenderParam::_DestroyRiley()
+{
+     RixEventCallbacks* rix_event_callbacks =
+        (RixEventCallbacks*)_rix->GetRixInterface(k_RixEventCallbacks);
+     rix_event_callbacks->UnregisterCallback(RixEventCallbacks::k_Progress,
+                                             _ProgressCallback, this);
+
+    if (_mgr) {
+        if (_riley) {
+            // Riley/RIS crashes if SetOptions hasn't been called prior to
+            // destroying the riley instance.
+            if (!_initRileyOptions) {
+                TF_DEBUG(HDPRMAN_RENDER_SETTINGS).Msg(
+                    "[DestroyRiley] Calling SetOptions to workaround crash.\n");
+                riley::Riley * const riley = AcquireRiley();
+                riley->SetOptions(RtParamList());
+            }
+            _mgr->DestroyRiley(_riley);
+        }
+        if (_ri) {
+            // Tear down renderer
+#if _PRMANAPI_VERSION_MAJOR_ >= 26
+            _ri->PRManRenderEnd();
+#endif
+        }
+        _mgr = nullptr;
+    }
+
+    _riley = nullptr;
+
+    if (_rix) {
+        // Remove our exception handler
+        RixXcpt* rix_xcpt = (RixXcpt*)_rix->GetRixInterface(k_RixXcpt);
+        rix_xcpt->Unregister(&_xcpt);
+    }
+
+#if _PRMANAPI_VERSION_MAJOR_ >= 26
+    if (_statsSession)
+    {
+        // We own the session, it's our responsibility to tell Roz to remove
+        // its reference and free the memory
+        stats::RemoveSession(*_statsSession);
+        _statsSession = nullptr;
+    }
+#endif
+
+    if (_ri) {
+        // Final prman shutdown
+#if _PRMANAPI_VERSION_MAJOR_ >= 26
+        _ri->PRManSystemEnd();
+#else
+        _ri->PRManEnd();
+#endif
+        _ri = nullptr;
+    }
+}
+
+void
+HdPrman_RenderParam::_DestroyStatsSession(void)
+{
+    if (_statsSession)
+    {
+        stats::RemoveSession(*_statsSession);
+        _statsSession = nullptr;
+    }
+}
+
+static
+RtParamList
+_ComputeVolumeNodeParams()
+{
+    static const RtUString us_densityFloatPrimVar("densityFloatPrimVar");
+    static const RtUString us_density("density");
+    static const RtUString us_diffuseColor("diffuseColor");
+
+    RtParamList result;
+    result.SetString(
+        us_densityFloatPrimVar, us_density);
+    // 18% albedo chosen to match Storm's fallback volume shader.
+    result.SetColor(
+        us_diffuseColor, RtColorRGB(0.18, 0.18, 0.18));
+    return result;
+}
+
+void
+HdPrman_RenderParam::_CreateFallbackMaterials()
+{
+    // Default material
+    {
+        std::vector<riley::ShadingNode> materialNodes;
+        HdPrman_ConvertHdMaterialNetwork2ToRmanNodes(
+            HdPrmanMaterial_GetFallbackSurfaceMaterialNetwork(),
+            SdfPath("/PxrSurface"), // We assume this terminal name here
+            &materialNodes
+        );
+        _fallbackMaterialId = _riley->CreateMaterial(
+            riley::UserId(stats::AddDataLocation(materialNodes[0].name.CStr()).GetValue()),
+            {static_cast<uint32_t>(materialNodes.size()), materialNodes.data()},
+            RtParamList());
+    }
+
+    // Volume default material
+    {
+        static const RtUString us_PxrVolume("PxrVolume");
+        static const RtUString us_simpleVolume("simpleVolume");
+
+        const std::vector<riley::ShadingNode> materialNodes{
+            riley::ShadingNode{
+                riley::ShadingNode::Type::k_Bxdf,
+                us_PxrVolume,
+                us_simpleVolume,
+                _ComputeVolumeNodeParams()}};
+        _fallbackVolumeMaterialId = _riley->CreateMaterial(
+            riley::UserId(stats::AddDataLocation(materialNodes[0].name.CStr()).GetValue()),
+            {static_cast<uint32_t>(materialNodes.size()), materialNodes.data()},
+            RtParamList());
+    }
+}
+
+void
+HdPrman_RenderParam::SetLastLegacySettingsVersion(const int version)
+{
+    _lastLegacySettingsVersion = version;
+}
+
+void
+HdPrman_RenderParam::SetResolution(GfVec2i const & resolution)
+{
+    _resolution = resolution;
+}
+
+void
+HdPrman_RenderParam::InvalidateTexture(const std::string &path)
+{
+    AcquireRiley();
+
+    _ri->InvalidateTexture(RtUString(path.c_str()));
+}
+
+riley::ShadingNode
+HdPrman_RenderParam::_ComputeIntegratorNode(
+    HdRenderDelegate * const renderDelegate,
+    const HdPrmanCamera * const cam)
+{
+    // Use the integrator node from a terminal connection on the 
+    // renderSettingsPrim if we can
+    if (!GetRenderSettingsIntegratorPath().IsEmpty()) {
+
+        // Create Integrator Riley Node
+        const TfToken integratorNodeType =
+            GetRenderSettingsIntegratorNode().nodeTypeId;
+        riley::ShadingNode rileyIntegratorNode;
+        rileyIntegratorNode.type = riley::ShadingNode::Type::k_Integrator;
+        rileyIntegratorNode.name = RtUString(integratorNodeType.GetText());
+        rileyIntegratorNode.handle = RtUString(integratorNodeType.GetText());
+
+        // Initialize the Integrator parameters 
+        const TfToken prefix("ri:");
+        for (const auto &param : GetRenderSettingsIntegratorNode().parameters) {
+            // Strip the 'ri' namespace before setting the param
+            if (TfStringStartsWith(param.first.GetText(), prefix.GetText())) {
+                RtUString riName(param.first.GetText() + prefix.size());
+                HdPrman_Utils::SetParamFromVtValue(riName, param.second,
+                    TfToken(), &rileyIntegratorNode.params);
+            }
+        }
+
+        if (cam) {
+            SetIntegratorParamsFromCamera(
+                static_cast<HdPrmanRenderDelegate*>(renderDelegate),
+                cam,
+                integratorNodeType.GetString(),
+                rileyIntegratorNode.params);
+        }
+        
+        // TODO: Adjust when PxrPathTracer adds support for excludeSubset
+        if (integratorNodeType == HdPrmanIntegratorTokens->PbsPathTracer) {
+            _SetExcludeSubset(_lastExcludedRenderTags,
+                rileyIntegratorNode.params);
+        }
+        return rileyIntegratorNode;
+    }
+
+    const std::string &integratorName =
+        renderDelegate->GetRenderSetting<std::string>(
+            HdPrmanRenderSettingsTokens->integratorName,
+            HdPrmanIntegratorTokens->PxrPathTracer.GetString());
+
+    const RtUString rtIntegratorName(integratorName.c_str());
+
+    // If the settings map / env var say to use PbsPathTracer,
+    // we'll turn on volume aggregate rendering.
+    if (integratorName == HdPrmanIntegratorTokens->PbsPathTracer.GetString()) {
+        HdPrman_Utils::SetParamFromVtValue(RtUString("volumeAggregate"),
+            VtValue(4), TfToken(), &_integratorParams);
+    }
+
+    SetIntegratorParamsFromRenderSettingsMap(
+        static_cast<HdPrmanRenderDelegate*>(renderDelegate),
+        integratorName,
+        _integratorParams);
+
+    if (cam) {
+        SetIntegratorParamsFromCamera(
+            static_cast<HdPrmanRenderDelegate*>(renderDelegate),
+            cam,
+            integratorName,
+            _integratorParams);
+    }
+    
+    // TODO: Adjust when PxrPathTracer adds support for excludeSubset
+    if (integratorName == HdPrmanIntegratorTokens->PbsPathTracer.GetString()) {
+        _SetExcludeSubset(_lastExcludedRenderTags,
+            _integratorParams);
+    }
+
+    return riley::ShadingNode{
+        riley::ShadingNode::Type::k_Integrator,
+        rtIntegratorName,
+        rtIntegratorName,
+        _integratorParams};
+}
+
+void
+HdPrman_RenderParam::_CreateIntegrator(HdRenderDelegate * const renderDelegate)
+{
+    // Called before we have access to the camera Sprim, so we ignore
+    // integrator opinions coming from the camera here. They will be
+    // consumed in UpdateIntegrator.
+    static const HdPrmanCamera * const camera = nullptr;
+
+    riley::ShadingNode integratorNode(
+        _ComputeIntegratorNode(renderDelegate, camera));
+    _integratorId = _riley->CreateIntegrator(
+        riley::UserId(
+            stats::AddDataLocation(integratorNode.name.CStr()).GetValue()),
+        integratorNode);
+    
+    TF_VERIFY(_integratorId != riley::IntegratorId::InvalidId());
+
+    _activeIntegratorId = _integratorId;
+}
+
+void
+HdPrman_RenderParam::SetActiveRenderTags(
+    const TfTokenVector& activeRenderTags,
+    HdRenderIndex* renderIndex)
+{
+    // sort the active tags for set_difference
+    TfTokenVector sortedTags(activeRenderTags);
+    std::sort(sortedTags.begin(), sortedTags.end());
+    
+    // set for uniqueness, ordered for set_difference
+    std::set<TfToken> rprimTags; 
+    for (const SdfPath& id : renderIndex->GetRprimIds()) {
+        const HdRprim* rprim = renderIndex->GetRprim(id);
+        rprimTags.insert(rprim->GetRenderTag());
+    }
+    
+    // fast set for comparison with cached
+    TfToken::Set excludedTags;
+    
+    // All rprim tags not in activeTags should be excluded (rprim - active)
+    std::set_difference(
+        rprimTags.begin(), rprimTags.end(),
+        sortedTags.begin(), sortedTags.end(),
+        std::inserter(excludedTags, excludedTags.begin()));
+    if (excludedTags != _lastExcludedRenderTags) {
+        _lastExcludedRenderTags = excludedTags;
+        UpdateIntegrator(renderIndex);
+    }
+}
+
+void
+HdPrman_RenderParam::AddRenderTagToGroupingMembership(
+    const TfToken& renderTag,
+    RtParamList& params)
+{
+    // XXX: UStrings cannot be concatenated, and the only way to initialize a
+    // UString is with a char*. So things can get a little baroque here. The
+    // temporary variables hopefully help make it readable.
+    if (!renderTag.IsEmpty()) {
+        const std::string renderTagString = TfStringPrintf("%s%s",
+            _tokens->renderTagPrefix.GetText(), renderTag.GetText());
+            
+        RtUString membership;
+        params.GetString(RixStr.k_grouping_membership, membership);
+        
+        if (membership.Empty()) {
+            membership = RtUString(renderTagString.c_str());
+        } else {
+            const std::string membershipString = TfStringPrintf("%s %s",
+                renderTagString.c_str(), membership.CStr());
+            membership = RtUString(membershipString.c_str());
+        }
+        params.SetString(RixStr.k_grouping_membership, membership);
+    }
+}
+
+/* static */
+void
+HdPrman_RenderParam::_SetExcludeSubset(
+    const TfToken::Set& excludedTags,
+    RtParamList& params) {
+    // XXX: excludeSubset is not in RixStr.
+    // (excludesubset is, but we need a capital S.)
+    static const RtUString k_excludeSubset("excludeSubset");
+    std::string exclude;
+    for (const TfToken& tag : excludedTags) {
+        if (tag.IsEmpty()) {
+            continue;
+        }
+        if (!exclude.empty()) {
+            exclude += " ";
+        }
+        exclude += _tokens->renderTagPrefix.GetString() + tag.GetString();
+    }
+    // XXX: This should be the only place anyone sets excludeSubset
+    params.SetString(k_excludeSubset, RtUString(exclude.c_str()));
+}
+
+void
+HdPrman_RenderParam::UpdateIntegrator(const HdRenderIndex * const renderIndex)
+{
+    if (!TF_VERIFY(_integratorId != riley::IntegratorId::InvalidId())) {
+        return;
+    }
+
+    const riley::ShadingNode node = _ComputeIntegratorNode(
+        renderIndex->GetRenderDelegate(),
+        _cameraContext.GetCamera(renderIndex));
+
+    AcquireRiley()->ModifyIntegrator(_integratorId, &node);
+}
+
+void 
+HdPrman_RenderParam::_RenderThreadCallback()
+{
+    static RtUString const US_RENDERMODE = RtUString("renderMode");
+    static RtUString const US_INTERACTIVE = RtUString("interactive");
+
+    // Note: this is currently hard-coded because hdprman currently 
+    // creates only one single camera (via the camera context).
+    // When this changes, we will need to make sure 
+    // the correct name is used here.
+    RtUString const &defaultReferenceCamera =
+        GetCameraContext().GetCameraName();
+
+    RtParamList renderOptions;
+    renderOptions.SetString(US_RENDERMODE, US_INTERACTIVE);
+    renderOptions.SetString(
+        RixStr.k_dice_referencecamera, 
+        defaultReferenceCamera);
+
+    HdPrman_RenderViewContext &ctx = GetRenderViewContext();
+    const riley::RenderViewId renderViewIds[] = { ctx.GetRenderViewId() };
+
+    _riley->Render(
+        { static_cast<uint32_t>(TfArraySize(renderViewIds)),
+          renderViewIds },
+        renderOptions);
+}
+
+void 
+HdPrman_RenderParam::_ProgressCallback(RixEventCallbacks::Event,
+                                       RtConstPointer data, RtPointer clientData)
+{
+    int const* pp = static_cast<int const*>(data);
+    HdPrman_RenderParam *param = static_cast<HdPrman_RenderParam*>(clientData);
+    param->_progressPercent = *pp;
+
+    if (!param->IsInteractive()) {
+        // XXX Placeholder to simulate RenderMan's built-in writeProgress
+        // option, until iether HdPrman can pass that in, and/or it gets
+        // replaced with Roz-based client-side progress reporting
+        printf("R90000  %3i%%\n", param->_progressPercent);
+    }
+}
+
+bool 
+HdPrman_RenderParam::IsValid() const
+{
+    return _riley;
+}
+
+void 
+HdPrman_RenderParam::Begin(HdPrmanRenderDelegate *renderDelegate)
+{
+    _envOptions = HdPrman_Utils::GetRileyOptionsFromEnvironment();
+    _fallbackOptions = HdPrman_Utils::GetDefaultRileyOptions();
+    // Initialize legacy options from the render settings map.
+    UpdateLegacyOptions();
+    
+    // Force initialization of Riley scene options.
+    // (see related comments in SetRileyOptions)
+    if (!HdRenderIndex::IsSceneIndexEmulationEnabled() ||
+        !TfGetEnvSetting(HD_PRMAN_DEFER_SET_OPTIONS))
+    {
+        SetRileyOptions();
+    }
+        
+    // Set the camera path before the first sync so that
+    // HdPrmanCamera::Sync can detect whether it is syncing the
+    // current camera and needs to set the riley shutter interval
+    // which needs to be set before any time-sampled primvars are
+    // synced. This is a workaround that is necessary only when a well-formed
+    // render settings prim isn't available.
+    //
+    {
+        const VtDictionary &renderSpec =
+            renderDelegate->GetRenderSetting<VtDictionary>(
+                HdPrmanRenderSettingsTokens->experimentalRenderSpec,
+                VtDictionary());
+        SdfPath cameraPath = VtDictionaryGet<SdfPath>(
+            renderSpec,
+            HdPrmanExperimentalRenderSpecTokens->camera,
+            VtDefault = SdfPath());
+        GetCameraContext().SetCameraPath(cameraPath);
+    }
+}
+
+// See comment in SetRileyOptions on when this function needs to be called.
+void
+HdPrman_RenderParam::_CreateInternalPrims()
+{
+    GetCameraContext().CreateRileyCamera(
+        AcquireRiley(), HdPrman_CameraContext::GetDefaultReferenceCameraName());
+
+    _CreateFallbackMaterials();
+
+    _CreateIntegrator(_renderDelegate);
+    _CreateQuickIntegrator(_renderDelegate);
+    _activeIntegratorId = GetIntegratorId();
+}
+
+static void
+_DeleteAndResetMaterial(
+    riley::Riley * const riley,
+    riley::MaterialId *id)
+{
+    if (*id != riley::MaterialId::InvalidId()) {
+        riley->DeleteMaterial(*id);
+        *id = riley::MaterialId::InvalidId();
+    }
+}
+
+static void
+_DeleteAndResetIntegrator(
+    riley::Riley * const riley,
+    riley::IntegratorId *id)
+{
+    if (*id != riley::IntegratorId::InvalidId()) {
+        riley->DeleteIntegrator(*id);
+        *id = riley::IntegratorId::InvalidId();
+    }
+}
+
+static void
+_DeleteAndResetSampleFilter(
+    riley::Riley * const riley,
+    riley::SampleFilterId *id)
+{
+    if (*id != riley::SampleFilterId::InvalidId()) {
+        riley->DeleteSampleFilter(*id);
+        *id = riley::SampleFilterId::InvalidId();
+    }
+}
+
+static void
+_DeleteAndResetDisplayFilter(
+    riley::Riley * const riley,
+    riley::DisplayFilterId *id)
+{
+    if (*id != riley::DisplayFilterId::InvalidId()) {
+        riley->DeleteDisplayFilter(*id);
+        *id = riley::DisplayFilterId::InvalidId();
+    }
+}
+
+void
+HdPrman_RenderParam::_DeleteInternalPrims()
+{
+    riley::Riley * const riley = AcquireRiley();
+
+    // Renderview has a handle to the camera, so delete it first.
+    GetRenderViewContext().DeleteRenderView(riley);
+    GetCameraContext().DeleteRileyCameraAndClipPlanes(riley);
+
+    _DeleteAndResetMaterial(riley, &_fallbackMaterialId);
+    _DeleteAndResetMaterial(riley, &_fallbackVolumeMaterialId);
+    _DeleteAndResetIntegrator(riley, &_integratorId);
+    _DeleteAndResetIntegrator(riley, &_quickIntegratorId);
+    _DeleteAndResetSampleFilter(riley, &_sampleFiltersId);
+    _DeleteAndResetDisplayFilter(riley, &_displayFiltersId);
+}
+
+void
+HdPrman_RenderParam::SetRenderSettingsPrimOptions(
+    RtParamList const &params)
+{
+    _renderSettingsPrimOptions = params;
+
+    TF_DEBUG(HDPRMAN_RENDER_SETTINGS).Msg(
+        "Updating render settings param list \n %s\n",
+        HdPrmanDebugUtil::RtParamListToString(params).c_str()
+    );
+}
+
+void
+HdPrman_RenderParam::SetDrivingRenderSettingsPrimPath(
+    SdfPath const &path)
+{
+    if (path != _drivingRenderSettingsPrimPath) {
+        _drivingRenderSettingsPrimPath = path;
+        TF_DEBUG(HDPRMAN_RENDER_SETTINGS).Msg(
+            "Driving render settings prim is %s\n", path.GetText());
+    }
+}
+
+SdfPath const&
+HdPrman_RenderParam::GetDrivingRenderSettingsPrimPath() const
+{
+    return _drivingRenderSettingsPrimPath;
+}
+
+void
+HdPrman_RenderParam::SetRileyOptions()
+{
+    // There are a couple of RIS/Riley limitations to call out:
+    // 1. Current Riley implementations require `SetOptions()` to be the first
+    //    call made before any scene manipulation (which includes the creation
+    //    of Riley scene objects).
+    // 2. Several riley settings are immutable and need to be set on the
+    //    first SetOptions call.
+    //
+    // When scene index emulation is enabled, the first SetOptions call is
+    // deferred until HdPrman_RenderSettings::Sync. A fallback render settings
+    // prim is added via HdPrman_RenderSettingsFilteringSceneIndexPlugin to
+    // allow this strategy to work for scenes without one.
+    //
+    // When scene index emulation is disabled, we have no way to know or
+    // guarantee that a render settings prim is present. The first SetOptions
+    // call is called after constructing the Riley instance in
+    // HdPrman_RenderParam::Begin.
+    //
+    {
+        // Compose scene options with the precedence:
+        //     env > render settings prim > legacy settings map > fallback
+        //
+        // XXX: Some riley clients require certain options to be present
+        // on every SetOptions call (e.g. XPU currently needs
+        // ri:searchpath:texture). As a conservative measure, compose
+        // all sources of options for initialization and subsequent updates.
+        // Ideally, the latter would require just the legacy and prim options.
+
+        RtParamList composedParams = HdPrman_Utils::Compose(
+            _envOptions,
+            _renderSettingsPrimOptions, 
+            GetLegacyOptions(),
+            _fallbackOptions);
+
+        RtParamList prunedOptions = HdPrman_Utils::PruneDeprecatedOptions(
+                    composedParams);
+
+        if (_renderDelegate->IsInteractive()) {
+            prunedOptions = HdPrman_Utils::PruneBatchOnlyOptions(prunedOptions);
+        }
+
+        riley::Riley * const riley = AcquireRiley();
+        riley->SetOptions(prunedOptions);
+
+        TF_DEBUG(HDPRMAN_RENDER_SETTINGS).Msg(
+            "SetOptions called on the composed param list:\n  %s\n",
+            HdPrmanDebugUtil::RtParamListToString(
+                prunedOptions, /*indent = */2).c_str());
+        
+        // If we've updated the riley shutter interval in SetOptions above,
+        // make sure to update the cached value.
+        _UpdateShutterInterval(prunedOptions);
+    }
+
+    if (!_initRileyOptions) {
+        _initRileyOptions = true;
+
+        // Safe to create riley objects that aren't backed by the scene.
+        // See limitation (1) above.
+        _CreateInternalPrims();
+    }
+}
+
+void 
+HdPrman_RenderParam::SetActiveIntegratorId(const riley::IntegratorId id)
+{
+    _activeIntegratorId = id;
+
+    riley::Riley * riley = AcquireRiley();
+
+    GetRenderViewContext().SetIntegratorId(id, riley);
+}
+
+void 
+HdPrman_RenderParam::StartRender()
+{
+    // Last chance to set Ri options before starting riley!
+    // Called from HdPrman_RenderPass::_Execute for *interactive* rendering.
+    // NOTE: We don't use a render thread for offline ("batch") rendering. See
+    //       HdPrman_RenderPass::_RenderInMainThread().
+
+    // Prepare Riley state for rendering.
+    // Pass a valid riley callback pointer during IPR
+
+    if (!_renderThread) {
+        _renderThread = std::make_unique<HdRenderThread>();
+        _renderThread->SetRenderCallback(
+            std::bind(
+                &HdPrman_RenderParam::_RenderThreadCallback, this));
+        _renderThread->StartThread();
+    }
+
+    // Clear out old stats values
+    if (_statsSession)
+    {
+        _statsSession->RemoveOldMetricData();
+    }
+
+    _renderThread->StartRender();
+}
+
+void
+HdPrman_RenderParam::StopRender(bool blocking)
+{
+    TRACE_FUNCTION();
+
+    if (!_renderThread || !_renderThread->IsRendering()) {
+        return;
+    }
+
+    TF_DESCRIBE_SCOPE("Waiting for RenderMan to stop");
+
+    if (!blocking) {
+        {
+            TRACE_SCOPE("riley::RequestUpdate");
+            _riley->RequestUpdate();
+        }
+        return;
+    }
+
+    // Note: if we were rendering, when the flag goes low we'll be back in
+    // render thread idle until another StartRender comes in, so we don't need
+    // to manually call renderThread->StopRender. Theoretically
+    // riley->Stop() is blocking, but we need the loop here because:
+    // 1. It's possible that IsRendering() is true because we're in the preamble
+    //    of the render loop, before calling into riley. In that case, Stop()
+    //    is a no-op and we need to call it again after we call into Riley.
+    // 2. We've occassionally seen cases where Stop() returns successfully,
+    //    but the riley threadpools don't shut down right away.
+
+    // Only let one thread try to stop things at once.
+    std::lock_guard<std::mutex> lock(_stopMutex);
+
+    while (_renderThread->IsRendering()) {
+        {
+            TRACE_SCOPE("riley::Stop");
+            _riley->Stop();
+        }
+        using namespace std::chrono_literals;
+        if (_renderThread->IsRendering()) {
+            std::this_thread::sleep_for(1ms);
+        }
+    }
+}
+
+bool
+HdPrman_RenderParam::IsRendering()
+{
+    return _renderThread && _renderThread->IsRendering();
+}
+
+bool
+HdPrman_RenderParam::IsPauseRequested()
+{
+    return false;
+}
+
+void
+HdPrman_RenderParam::DeleteRenderThread()
+{
+    if (_renderThread) {
+        _renderThread->StopThread();
+        _renderThread.reset();
+    }
+}
+
+bool
+HdPrman_RenderParam::_UpdateFramebufferClearValues(
+    const HdRenderPassAovBindingVector& aovBindings)
+{
+    if(_framebuffer->aovBuffers.size() != aovBindings.size()) {
+        // Number of AOVs changed, can't update framebuffer clear values.
+        return false;
+    }
+
+    for(size_t aov = 0; aov < aovBindings.size(); ++aov) {
+        const HdRenderPassAovBinding &aovBinding =
+            aovBindings[aov];
+        HdPrmanFramebuffer::AovDesc &aovDesc =
+            _framebuffer->aovBuffers[aov].desc;
+        if (aovBinding.aovName != aovDesc.name) {
+            // Different AOV, can't update framebuffer clear value.
+            return false;
+        }
+        
+        if(aovBinding.aovName == HdAovTokens->color ||
+           aovBinding.aovName == HdAovTokens->depth) {
+            if (aovDesc.clearValue != aovBinding.clearValue) {
+                // Request a framebuffer clear if the clear value in the aov
+                // has changed from the framebuffer clear value.
+                // We do this before StartRender() to avoid race conditions
+                // where some buckets may get discarded or cleared with
+                // the wrong value.
+                
+                // Stops render and increases sceneVersion to trigger restart.
+                AcquireRiley();
+                
+                _framebuffer->pendingClear = true;
+                aovDesc.clearValue = aovBinding.clearValue;
+            }
+        }
+    }
+
+    return true;
+} 
+
+static riley::RenderOutputType
+_ToRenderOutputTypeFromHdFormat(const HdFormat aovFormat) 
+{
+    // Prman only supports float, color, and integer
+    if(aovFormat == HdFormatFloat32) {
+        return riley::RenderOutputType::k_Float;
+    } else if(aovFormat == HdFormatFloat32Vec4 ||
+              aovFormat == HdFormatFloat32Vec3) {
+        return riley::RenderOutputType::k_Color;
+    } else if(aovFormat == HdFormatInt32) {
+        return riley::RenderOutputType::k_Integer;
+    } else {
+        return riley::RenderOutputType::k_Float;
+    }
+}
+
+// If the aovFormat has 3 or 4 channels, make format Float32
+static void
+_AdjustColorFormat(HdFormat* aovFormat) 
+{
+    // Prman always renders colors as float, so for types with 3 or 4
+    // components, always set the format in our framebuffer to float.
+    // Conversion will take place in the Blit method of renderBuffer.cpp
+    // when it notices that the aovBinding's buffer format doesn't match
+    // our framebuffer's format.
+    const int componentCount = HdGetComponentCount(*aovFormat);
+    if(componentCount == 3) {
+        *aovFormat = HdFormatFloat32Vec3;
+    } else if(componentCount == 4) {
+        *aovFormat = HdFormatFloat32Vec4;
+    }
+}
+
+// Update the given Rman AOV and Source names 
+//  - aovName: Map the given hdAovName to the Prman equivalent
+//  - SourceName: Add 'lpe:' prefix as needed 
+static void
+_UpdateRmanAovAndSourceName(
+    bool isXPU, bool isLPE,
+    const TfToken &hdAovName,
+    RtUString *rmanAovName,
+    RtUString *rmanSourceName)
+{
+    static const RtUString us_st("__st");
+    static const RtUString us_primvars_st("primvars:st");
+
+    // Initialize rmanAovName with the HdAovName
+    if (!hdAovName.GetString().empty()) {
+        *rmanAovName = RtUString(hdAovName.GetText());
+    }
+
+    // If the sourceType hints that the source is an lpe, make sure
+    // it starts with "lpe:" as required by prman.
+    if (isLPE) {
+        std::string sn = rmanSourceName->CStr();
+        sn = (sn.find(RixStr.k_lpe.CStr()) == std::string::npos)
+            ? "lpe:" + std::string(rmanSourceName->CStr())
+            : rmanSourceName->CStr();
+        *rmanSourceName = RtUString(sn.c_str());
+    }
+
+    // Update the Aov and Source names by mapping the HdAovName to an 
+    // equivalent Prman name
+    if (hdAovName == HdAovTokens->color || hdAovName.GetString() == "ci") {
+        *rmanAovName = RixStr.k_Ci;
+        *rmanSourceName = RixStr.k_Ci;
+    } else if (hdAovName == HdAovTokens->depth) {
+        *rmanSourceName = RixStr.k_z;
+    } else if (hdAovName == HdAovTokens->normal) {
+        *rmanSourceName= RixStr.k_Nn;
+    } else if (hdAovName == HdAovTokens->primId) {
+        *rmanAovName = RixStr.k_id;
+        *rmanSourceName = RixStr.k_id;
+    } else if (hdAovName == HdAovTokens->instanceId) {
+        *rmanAovName = RixStr.k_id2;
+        *rmanSourceName = RixStr.k_id2;
+    } else if (hdAovName == HdAovTokens->elementId) {
+        *rmanAovName = RixStr.k_faceindex;
+        *rmanSourceName = RixStr.k_faceindex;
+    } else if (*rmanAovName == us_primvars_st) {
+        *rmanSourceName = us_st;
+    }
+
+    // If no sourceName is specified, assume name is a standard prman aov
+    if (rmanSourceName->Empty()) {
+        *rmanSourceName = *rmanAovName;
+    }
+
+    // XPU is picky about AOV names, it wants only standard names
+    if (isXPU) {
+        *rmanAovName = *rmanSourceName;
+    }
+}
+
+// Return a RtParamList of the driver settings in the given aovSettings
+// and update the Rman Aov and Source Names based on the aovSettings
+static RtParamList
+_GetOutputParamsAndUpdateRmanNames(
+    const HdAovSettingsMap &aovSettings,
+    bool isXPU,
+    RtUString *rmanAovName,
+    RtUString *rmanSourceName)
+{
+    RtParamList params;
+    bool isLPE = false;
+    TfToken hdAovName(rmanAovName->CStr());
+    for (auto const& aovSetting : aovSettings) {
+        const TfToken & settingName = aovSetting.first;
+        const VtValue & settingVal = aovSetting.second;
+
+        // Update hdAovName and rmanSourceName if authored in the aovSettingsMap
+        if (settingName == _tokens->sourceName) {
+            *rmanSourceName =
+                RtUString(settingVal.GetWithDefault<std::string>().c_str());
+        }
+        else if (settingName == _tokens->name) {
+            hdAovName = settingVal.UncheckedGet<TfToken>();
+        }
+
+        // Determine if the output is of type LPE or not
+        else if (settingName == _tokens->sourceType) {
+            const std::string sourceType =
+                settingVal.GetWithDefault<TfToken>().GetString();
+            isLPE = (sourceType == RixStr.k_lpe.CStr());
+        }
+
+        // Gather all properties with the 'driver:parameters:aov' prefix 
+        // into the RtParamList, updating the hdAovName if needed. 
+        else if (TfStringStartsWith(
+                 settingName.GetText(), "driver:parameters:aov:")) {
+            RtUString name(TfStringGetSuffix(settingName, ':').c_str());
+            if (name == RixStr.k_name) {
+                hdAovName = settingVal.IsHolding<std::string>() ?
+                    TfToken(settingVal.Get<std::string>().c_str()) :
+                    settingVal.Get<TfToken>();
+            } else {
+                HdPrman_Utils::SetParamFromVtValue(name, settingVal,
+                    TfToken(), &params);
+            }
+        }
+    }
+
+    _UpdateRmanAovAndSourceName(
+        isXPU, isLPE, hdAovName, rmanAovName, rmanSourceName);
+
+    return params;
+}
+
+void
+HdPrman_RenderParam::_CreateRileyDisplay(
+    const RtUString& productName, const RtUString& productType,
+    HdPrman_RenderViewDesc& renderViewDesc,
+    const std::vector<size_t>& renderOutputIndices,
+    RtParamList& displayParams, bool isXpu)
+{
+    RtUString driver = productType;
+    if(isXpu) {
+        // XPU loads hdPrman as the display plug-in
+        if (productName == RixStr.k_framebuffer) {
+            std::string hdPrmanPath;
+            if (PlugPluginPtr const plugin =
+                PlugRegistry::GetInstance().GetPluginWithName("hdPrman")) {
+                const std::string path = TfGetPathName(plugin->GetPath());
+                if (!path.empty()) {
+                    hdPrmanPath =
+                        TfStringCatPaths(path, "hdPrman" ARCH_LIBRARY_SUFFIX);
+                }
+                driver = RtUString(hdPrmanPath.c_str());
+            } else {
+                TF_WARN("Failed to load xpu display plugin\n");
+            }
+        }
+
+        displayParams.SetString(RixStr.k_Ri_name, productName);
+        displayParams.SetString(RixStr.k_Ri_type, productType);
+        if(_framebuffer) {
+            static const RtUString us_bufferID("bufferID");
+            displayParams.SetInteger(us_bufferID, _framebuffer->id);
+        }
+    }
+
+    {
+        HdPrman_RenderViewDesc::DisplayDesc displayDesc;
+        displayDesc.name = productName;
+        displayDesc.driver = driver;
+        displayDesc.params = displayParams;
+        displayDesc.renderOutputIndices = renderOutputIndices;
+
+        renderViewDesc.displayDescs.push_back(std::move(displayDesc));
+    }
+}
+
+static
+std::string
+_ExpandVarsInProductName(const std::string & productName,
+                         const std::string & sourcePrimName, int frame)
+{
+    std::string expandedName = productName;
+    static const char* formatStrings[] = {
+        "%01d", "%02d", "%03d", "%04d", "%05d", "%d" };
+    const bool hasAngleVars = (expandedName.find('<') != std::string::npos);
+    const bool hasDollarVars = (expandedName.find('$') != std::string::npos);
+    if(hasAngleVars || hasDollarVars) {
+        static const char* frameAngleVarStrings[] = {
+            "<F1>", "<F2>", "<F3>", "<F4>", "<F5>", "<F>" };
+        static const char* frameDollarVarStrings[] = {
+            "$F1", "$F2", "$F3", "$F4", "$F5", "$F" };
+        static const char* frameDollarBraceVarStrings[] = {
+            "${F1}", "${F2}", "${F3}", "${F4}", "${F5}", "${F}" };
+
+        std::string frame_str;
+        for( size_t i=0; i < TfArraySize(formatStrings); ++i) {
+            frame_str = TfStringPrintf(formatStrings[i], frame);
+            if(hasAngleVars) {
+                expandedName =
+                    TfStringReplace(expandedName,
+                                    frameAngleVarStrings[i],
+                                    frame_str);
+            }
+            if(hasDollarVars) {
+                expandedName =
+                    TfStringReplace(expandedName,
+                                    frameDollarVarStrings[i],
+                                    frame_str);
+                expandedName =
+                    TfStringReplace(expandedName,
+                                    frameDollarBraceVarStrings[i],
+                                    frame_str);
+            }
+        }
+        if(hasAngleVars) {
+            expandedName =
+                TfStringReplace(expandedName, "<OS>",
+                                sourcePrimName);
+        }
+        if(hasDollarVars) {
+            expandedName =
+                TfStringReplace(expandedName, "$OS",
+                                sourcePrimName);
+            expandedName =
+                TfStringReplace(expandedName, "${OS}",
+                                sourcePrimName);
+        }
+    }
+    // Support printf style formating in file name, like %04d
+    if(expandedName.find('%') != std::string::npos) {
+        expandedName = TfStringPrintf( expandedName.c_str(), frame);
+    }
+    return expandedName;
+}
+
+static
+RtUString
+_AddRenderOutput(
+    RtUString aovName,
+    const TfToken &dataType,
+    HdFormat aovFormat,
+    RtUString sourceName,
+    const RtParamList& params,
+    std::vector<HdPrman_RenderViewDesc::RenderOutputDesc> * renderOutputDescs,
+    std::vector<size_t> * renderOutputIndices)
+{
+    static RtUString const k_cpuTime("cpuTime");
+    static RtUString const k_sampleCount("sampleCount");
+    static RtUString const k_none("none");
+
+    // Get the Render Type from the given dataType, or aovFormat
+    riley::RenderOutputType rType = (dataType.IsEmpty())
+        ? _ToRenderOutputTypeFromHdFormat(aovFormat)
+        : _ToRenderOutputType(dataType);
+    // Make sure 'Ci' sources use the Color Output type
+    if (sourceName == RixStr.k_Ci) {
+        rType = riley::RenderOutputType::k_Color;
+    }
+
+    // Get the rule, filter, and filterSize from the given RtParamList
+    RtUString rule = RixStr.k_filter;
+    params.GetString(RixStr.k_rule, rule);
+
+    RtUString filter = RixStr.k_box;
+    params.GetString(RixStr.k_filter, filter);
+
+    float filterSize[2] = {1.0f, 1.0f};
+    if(float const* filterwidth =
+       params.GetFloatArray(RixStr.k_filterwidth, 2)) {
+        filterSize[0] = filterwidth[0];
+        filterSize[1] = filterwidth[1];
+    }
+
+    // Adjust the rule/filter/filterSize as needed
+    RtUString value;
+    static const RtUString k_depth("depth");
+    // "cpuTime" and "sampleCount" should use rule "sum"
+    if (aovName == k_cpuTime || aovName == k_sampleCount) {
+        rule = RixStr.k_sum;
+        filter = RixStr.k_box;
+        filterSize[0] = 1;
+        filterSize[1] = 1;
+    // "id", "id2", "z" and "depth" should use rule "zmin"
+    } else if (aovName == RixStr.k_id || aovName == RixStr.k_id2 ||
+              aovName == RixStr.k_z || aovName == k_depth ||
+              rType == riley::RenderOutputType::k_Integer) {
+        rule = RixStr.k_zmin;
+        filter = RixStr.k_box;
+        filterSize[0] = 1;
+        filterSize[1] = 1;
+    // If statistics are set, use that as the rule
+    } else if (params.GetString(RixStr.k_statistics, value) &&
+              !value.Empty() && value != k_none) {
+        rule = value;
+    // Certain filter types need to be converted to rules
+    } else if (filter == RixStr.k_min  || filter == RixStr.k_max  ||
+               filter == RixStr.k_zmin || filter == RixStr.k_zmax ||
+               filter == RixStr.k_sum  || filter == RixStr.k_average) {
+        rule = filter;
+        filter = RixStr.k_box;
+        filterSize[0] = 1;
+        filterSize[1] = 1;
+    }
+
+    // Get the relativePixelVariance and remap from the given RtParamList
+    float relativePixelVariance = 1.0f;
+    params.GetFloat(RixStr.k_relativepixelvariance, relativePixelVariance);
+
+    RtParamList extraParams;
+    float remap[3] = {0.0f, 0.0f, 0.0f};
+    if (float const* remapValue = params.GetFloatArray(RixStr.k_remap, 3)) {
+        remap[0] = remapValue[0];
+        remap[1] = remapValue[1];
+        remap[2] = remapValue[2];
+        extraParams.SetFloatArray(RixStr.k_remap, remap, 3);
+    }
+
+    // Create the RenderOutputDesc for this AOV
+    {
+        HdPrman_RenderViewDesc::RenderOutputDesc renderOutputDesc;
+        renderOutputDesc.name = aovName;
+        renderOutputDesc.type = rType;
+        renderOutputDesc.sourceName = sourceName;
+        renderOutputDesc.rule = rule;
+        renderOutputDesc.filter = filter;
+        renderOutputDesc.filterWidth.Set( filterSize[0], filterSize[1] );
+        renderOutputDesc.relativePixelVariance = relativePixelVariance;
+        renderOutputDesc.params = extraParams;
+
+        TF_DEBUG(HDPRMAN_RENDER_PASS)
+            .Msg("Add RenderOutputDesc: \n - name: '%s'\n - type: '%d'\n"
+                 " - sourceName: '%s'\n - rule: '%s'\n - filter: '%s'\n\n",
+                 aovName.CStr(), int(rType), sourceName.CStr(), 
+                 rule.CStr(), filter.CStr());
+
+        renderOutputDescs->push_back(std::move(renderOutputDesc));
+        renderOutputIndices->push_back(renderOutputDescs->size()-1);
+    }
+
+    // When a float4 color is requested, assume we require alpha as well.
+    // This assumption is reflected in framebuffer.cpp HydraDspyData
+    const int componentCount = HdGetComponentCount(aovFormat);
+    if (rType == riley::RenderOutputType::k_Color && componentCount == 4) {
+        HdPrman_RenderViewDesc::RenderOutputDesc renderOutputDesc;
+        renderOutputDesc.name = RixStr.k_a;
+        renderOutputDesc.type = riley::RenderOutputType::k_Float;
+        renderOutputDesc.sourceName = RixStr.k_a;
+        renderOutputDesc.rule = RixStr.k_filter;
+        renderOutputDesc.filter = RixStr.k_box;
+
+        renderOutputDescs->push_back(std::move(renderOutputDesc));
+        renderOutputIndices->push_back(renderOutputDescs->size()-1);
+    }
+    return rule;
+}
+
+static
+void
+_ComputeRenderOutputAndAovDescs(
+    const HdRenderPassAovBindingVector& aovBindings,
+    bool isXpu,
+    std::vector<HdPrman_RenderViewDesc::RenderOutputDesc> * renderOutputDescs,
+    std::vector<size_t> * renderOutputIndices,
+    HdPrmanFramebuffer::AovDescVector * aovDescs)
+{
+    std::unordered_map<TfToken, RtUString, TfToken::HashFunctor> sourceNames;
+
+    for (const HdRenderPassAovBinding &aovBinding : aovBindings) {
+
+        // RmanAovName
+        RtUString rmanAovName(aovBinding.aovName.GetText());
+
+        // AovFormat
+        HdFormat aovFormat = aovBinding.renderBuffer->GetFormat();
+        _AdjustColorFormat(&aovFormat);
+
+        // Rman Aov and Source Names, and RenderOutputParams
+        RtUString rmanSourceName;
+        RtParamList renderOutputParams =
+            _GetOutputParamsAndUpdateRmanNames(
+                aovBinding.aovSettings,
+                isXpu,
+                &rmanAovName,
+                &rmanSourceName);
+        if (!rmanSourceName.Empty()) {
+            // This is a workaround for an issue where we get an
+            // unexpected duplicate in the aovBindings sometimes,
+            // where the second entry lacks a sourceName.
+            // Can't just skip it because the caller expects
+            // a result in the buffer.
+            sourceNames[aovBinding.aovName] = rmanSourceName;
+        } else {
+            auto it = sourceNames.find(aovBinding.aovName);
+            if (it != sourceNames.end()) {
+                rmanSourceName = it->second;
+            }
+        }
+
+        // Create a RenderOutputDesc from the aovBinding
+        RtUString rule = _AddRenderOutput(rmanAovName,
+                                          TfToken(),
+                                          aovFormat,
+                                          rmanSourceName,
+                                          renderOutputParams, 
+                                          renderOutputDescs,
+                                          renderOutputIndices);
+
+        // Create a AovDesc from the aovBinding
+        {
+            HdPrmanFramebuffer::AovDesc aovDesc;
+            aovDesc.name = aovBinding.aovName;
+            aovDesc.format = aovFormat;
+            aovDesc.clearValue = aovBinding.clearValue;
+            aovDesc.rule = HdPrmanFramebuffer::ToAccumulationRule(rule);
+            
+            aovDescs->push_back(std::move(aovDesc));
+        }
+    }
+}
+
+template <typename T>
+static T _Get(const HdAovSettingsMap & m, const TfToken & key, const T default_val=T())
+{
+    auto v = m.find(key);
+    if(v != m.end() && v->second.IsHolding<T>()) {
+        return v->second.UncheckedGet<T>();
+    }
+    return default_val;
+}
+
+static RtUString
+_GetAsRtUString(const HdAovSettingsMap & m, const TfToken & key)
+{
+    TfToken v = _Get<TfToken>(m, key);
+    return RtUString(v.GetString().c_str());
+}
+
+void
+HdPrman_RenderParam::CreateFramebufferAndRenderViewFromAovs(
+    const HdRenderPassAovBindingVector& aovBindings)
+{
+    if (!_framebuffer) {
+        _framebuffer = std::make_unique<HdPrmanFramebuffer>();
+    }
+
+    if(_UpdateFramebufferClearValues(aovBindings)) {
+        // AOVs are the same and updating the clear values succeeded,
+        // nothing more to do.
+        return;
+    }
+
+    // Proceed with creating displays if the number has changed
+    // or the display names don't match what we have.
+
+    // Stop render and crease sceneVersion to trigger restart.
+    riley::Riley * riley = AcquireRiley();
+
+    std::lock_guard<std::mutex> lock(_framebuffer->mutex);
+
+    // Displays & Display Channels
+    HdPrman_RenderViewDesc renderViewDesc;
+    std::vector<size_t> renderOutputIndices;
+    HdPrmanFramebuffer::AovDescVector aovDescs;
+
+    _ComputeRenderOutputAndAovDescs(
+        aovBindings,
+        IsXpu(),
+        &renderViewDesc.renderOutputDescs,
+        &renderOutputIndices,
+        &aovDescs);
+
+    _framebuffer->CreateAovBuffers(aovDescs);
+
+    RtParamList displayParams;
+    static const RtUString us_hydra("hydra");
+    _CreateRileyDisplay(RixStr.k_framebuffer,
+                        us_hydra,
+                        renderViewDesc,
+                        renderOutputIndices,
+                        displayParams,
+                        IsXpu());
+
+    renderViewDesc.cameraId = GetCameraContext().GetCameraId();
+    renderViewDesc.integratorId = GetActiveIntegratorId();
+    renderViewDesc.sampleFilterList = GetSampleFilterList();
+    renderViewDesc.displayFilterList = GetDisplayFilterList();
+    renderViewDesc.resolution = GetResolution();
+
+    TF_DEBUG(HDPRMAN_RENDER_PASS)
+        .Msg("Create Riley RenderView from AOV bindings.\n");
+    GetRenderViewContext().CreateRenderView(renderViewDesc, riley);
+}
+
+void
+HdPrman_RenderParam::CreateRenderViewFromLegacyProducts(
+    const VtArray<HdRenderSettingsMap>& renderProducts, int frame)
+{
+    // Display edits are not currently supported in HdPrman
+    // RenderMan Display drivers are inteded for use in batch rendering, 
+    // so bail here if Riley has already been started, since this means that
+    // the Displays already exist.
+    if (renderProducts.empty() ||
+        GetRenderViewContext().GetRenderViewId() !=
+            riley::RenderViewId::InvalidId()) {
+        return;
+    }
+
+    // Currently XPU only supports having one Riley Target and View.
+    // Here we loop over the Render Products (a USD concept which corresponds
+    // to a Riley Display), make a list of Riley Displays, and collect a list
+    // of all the outputs (AOVs) used by the Displays.
+    // One Target will be used for all Displays, it needs to be created 
+    // before the Displays, and takes a list of all possible outputs (AOVs).
+    // 
+    // The View and Displays are created, each referencing the Target's id.
+    // 
+    // XXX In the future, when xpu supports it, we may want to change this to 
+    // allow for a different Target/View for each Display.
+
+    HdPrman_RenderViewDesc renderViewDesc;
+
+    unsigned idx = 0;
+    for (const HdRenderSettingsMap& renderProduct : renderProducts) {
+        TfToken productName;
+        TfToken productType;
+        std::string sourcePrimName;
+        VtArray<HdAovSettingsMap> aovs;
+
+        // Note:
+        //  - productType or productName are not guaranteed to exist
+        //  - order of settings is not guaranteed so we save relevant settings
+        //    to the driverParameters
+        std::vector<TfToken> driverParameters;
+        for (auto const& productSetting : renderProduct) {
+            const TfToken& settingName = productSetting.first;
+            VtValue settingVal = productSetting.second;
+            if (settingName == HdPrmanRenderProductTokens->productType) {
+                productType = settingVal.UncheckedGet<TfToken>();
+            } else if (settingName == HdPrmanRenderProductTokens->productName) {
+                productName = settingVal.UncheckedGet<TfToken>();
+            } else if (settingName == HdPrmanRenderProductTokens->orderedVars) {
+                VtArray<HdAovSettingsMap> orderedVars =
+                    settingVal.UncheckedGet<VtArray<HdAovSettingsMap>>();
+                
+                // Find Ci and a Outputs in the RenderVar list
+                int Ci_idx = -1;
+                int a_idx = -1;
+                for (size_t i = 0; i < orderedVars.size(); ++i) {
+                    std::string srcName;
+                    const HdAovSettingsMap &orderedVar = orderedVars[i];
+                    auto it =
+                        orderedVar.find(HdPrmanAovSettingsTokens->sourceName);
+                    if (it != orderedVar.end()) {
+                        srcName = it->second.UncheckedGet<std::string>();
+                    }
+                    if (Ci_idx < 0 && srcName == RixStr.k_Ci.CStr()) {
+                        if (Ci_idx != -1) {
+                            TF_WARN("Multiple Ci outputs found\n");
+                        }
+                        Ci_idx = i;
+                    } else if (a_idx < 0 && srcName == RixStr.k_a.CStr()) {
+                        a_idx = i;
+                    }
+                    if (Ci_idx >= 0 && a_idx >= 0) {
+                        break;
+                    }
+                }
+
+                // Populate the AOVs Array from the RenderVar list making sure
+                // that the Ci and a RenderVars are first. 
+                aovs.reserve(orderedVars.size());
+                if (Ci_idx >= 0 && Ci_idx < static_cast<int>(orderedVars.size())) {
+                    aovs.push_back(orderedVars[Ci_idx]);
+                }
+                if (a_idx >= 0 && a_idx < static_cast<int>(orderedVars.size())) {
+                    aovs.push_back(orderedVars[a_idx]);
+                }
+                for (size_t i = 0; i < orderedVars.size(); ++i) {
+                    const int varIdx = static_cast<int>(i);
+                    if (varIdx != Ci_idx && varIdx != a_idx) {
+                        aovs.push_back(orderedVars[i]);
+                    }
+                }
+            } else if (settingName == HdPrmanRenderProductTokens->sourcePrim) {
+                const SdfPath sourcePrim = settingVal.UncheckedGet<SdfPath>();
+                sourcePrimName = sourcePrim.GetName().c_str();
+            } else if (TfStringStartsWith(settingName.GetText(),
+                                          "driver:parameters:")) {
+                driverParameters.push_back(settingName);
+            }
+        }
+
+        // If an outputName has been specified on command line,
+        // override the product's name.
+        // But if there are multiple products, and only one outputName
+        // has been specified, only use it for products beyond the first
+        // if it contains variables, so we don't just overwrite the first image.
+        std::string outputName;
+        if (idx < _outputNames.size()) {
+            outputName = _outputNames[idx];
+        } else if (!_outputNames.empty() &&
+                    _outputNames[0].find('<') != std::string::npos) {
+            outputName = _outputNames[0];
+        }
+
+        // Expand a few possible variables.
+        // <OS> : source prim (render product node name)
+        // <F>, <F1>, <F2>, <F3>, <F4>, <F5> : frame number, with padding
+        // vars can also be dollar style, braces optional, eg. $F4 ${F4} $OS
+        // or printf style formatting: %04d
+        if (!outputName.empty()) {
+            productName = TfToken(
+                _ExpandVarsInProductName(outputName, sourcePrimName, frame));
+        }
+
+        // Build Display Settings ParamList using the driverParameters gathered 
+        // above from the Render Product Settings
+        RtParamList displayParams;
+        for (const TfToken& paramName : driverParameters) {
+            auto val = renderProduct.find(paramName);
+            if (val != renderProduct.end()) {
+                const RtUString name(TfStringGetSuffix(paramName, ':').c_str());
+                HdPrman_Utils::SetParamFromVtValue(name, val->second,
+                    TfToken(), &displayParams);
+            }
+        }
+
+        // Keep a list of the indices for the Render Outputs (AOVs/RenderVars) 
+        // of this Display (RenderProduct)
+        // renderViewDesc.renderOutputDescs is a list of all Render Outputs
+        // across all Displays, these renderOutputIndices index into that list.
+        std::vector<size_t> renderOutputIndices;
+        for (const HdAovSettingsMap &aov : aovs) {
+
+            // DataType
+            const TfToken dataType =
+                _Get<TfToken>(aov, HdPrmanAovSettingsTokens->dataType);
+
+            // Format
+            HdFormat aovFormat =
+                _Get<HdFormat>(aov,
+                               HdPrmanAovSettingsTokens->format,
+                               HdFormatFloat32);
+            _AdjustColorFormat(&aovFormat);
+
+            // RmanSourceName 
+            RtUString rmanSourceName =
+                _GetAsRtUString(aov, HdPrmanAovSettingsTokens->sourceName);
+
+            // RenderOutputParams and update the Rman Aov and Source Names
+            RtUString rmanAovName = rmanSourceName;
+            const HdAovSettingsMap aovSettings =
+                _Get<HdAovSettingsMap>(aov,
+                                       HdPrmanAovSettingsTokens->aovSettings);
+            RtParamList renderOutputParams =
+                _GetOutputParamsAndUpdateRmanNames(
+                    aovSettings,
+                    IsXpu(),
+                    &rmanAovName,
+                    &rmanSourceName);
+
+            // Create the RenderOutputDesc for this AOV/RenderVar
+            _AddRenderOutput(rmanAovName,
+                             dataType,
+                             aovFormat,
+                             rmanSourceName,
+                             renderOutputParams,
+                             &renderViewDesc.renderOutputDescs,
+                             &renderOutputIndices);
+
+        }
+
+        _CreateRileyDisplay(RtUString(productName.GetText()),
+                            RtUString(productType.GetText()),
+                            renderViewDesc,
+                            renderOutputIndices,
+                            displayParams,
+                            IsXpu());
+        ++idx;
+    }
+
+    renderViewDesc.cameraId = GetCameraContext().GetCameraId();
+    renderViewDesc.integratorId = GetActiveIntegratorId();
+    renderViewDesc.resolution = GetResolution();
+
+    TF_DEBUG(HDPRMAN_RENDER_PASS)
+        .Msg("Create Riley RenderView from the legacy products.\n");
+    GetRenderViewContext().CreateRenderView(renderViewDesc, _riley);
+}
+
+bool
+HdPrman_RenderParam::DeleteFramebuffer()
+{
+    if (_framebuffer) {
+        _framebuffer.reset();
+        return true;
+    }
+    return false;
+}
+
+riley::IntegratorId
+HdPrman_RenderParam::GetActiveIntegratorId()
+{
+    return _activeIntegratorId;
+}
+
+riley::Riley *
+HdPrman_RenderParam::AcquireRiley()
+{
+    // Scene manipulation API can only be called during the "editing" phase
+    // (when Render() is not running).
+    StopRender(/*blocking = true*/);
+    sceneVersion++;
+
+    return _riley;
+}
+
+static const float*
+_GetShutterParam(const RtParamList &params)
+{
+    return params.GetFloatArray(RixStr.k_Ri_Shutter, 2);
+}
+
+void
+HdPrman_RenderParam::_UpdateShutterInterval(const RtParamList &composedParams)
+{
+    if (const float *val = _GetShutterParam(composedParams)) {
+        _shutterInterval = GfVec2f(val[0], val[1]);
+    }
+
+    // When there's only one sample available the motion blur plug-in 
+    // doesn't have access to the correct shutter interval, so this is 
+    // a workaround to provide it.
+    HdPrman_MotionBlurSceneIndexPlugin::SetShutterInterval(
+        _shutterInterval[0], _shutterInterval[1]);
+}
+
+riley::ShadingNode
+HdPrman_RenderParam::_ComputeQuickIntegratorNode(
+    HdRenderDelegate * const renderDelegate,
+    const HdPrmanCamera * const cam)
+{
+    const std::string &integratorName =
+        renderDelegate->GetRenderSetting<std::string>(
+            HdPrmanRenderSettingsTokens->interactiveIntegrator,
+            HdPrmanIntegratorTokens->PxrDirectLighting.GetString());
+
+    const RtUString rtIntegratorName(integratorName.c_str());
+
+    SetIntegratorParamsFromRenderSettingsMap(
+        static_cast<HdPrmanRenderDelegate*>(renderDelegate),
+        integratorName,
+        _quickIntegratorParams);
+
+    if (cam) {
+        SetIntegratorParamsFromCamera(
+            static_cast<HdPrmanRenderDelegate*>(renderDelegate),
+            cam,
+            integratorName,
+            _quickIntegratorParams);
+    }
+
+    static const RtUString numLightSamples("numLightSamples");
+    static const RtUString numBxdfSamples("numBxdfSamples");
+
+    _quickIntegratorParams.SetInteger(numLightSamples, 1);
+    _quickIntegratorParams.SetInteger(numBxdfSamples, 1);        
+
+    return riley::ShadingNode{
+        riley::ShadingNode::Type::k_Integrator,
+        rtIntegratorName,
+        rtIntegratorName,
+        _quickIntegratorParams};
+}
+
+void
+HdPrman_RenderParam::_CreateQuickIntegrator(
+    HdRenderDelegate * const renderDelegate)
+{
+    // See comment in _CreateIntegrator.
+    static const HdPrmanCamera * const camera = nullptr;
+
+    if (_enableQuickIntegrate) {
+        riley::ShadingNode integratorNode(
+          _ComputeQuickIntegratorNode(renderDelegate, camera));
+        _quickIntegratorId = _riley->CreateIntegrator(
+            riley::UserId(
+                stats::AddDataLocation(integratorNode.name.CStr()).GetValue()),
+            integratorNode);
+    
+        TF_VERIFY(_quickIntegratorId != riley::IntegratorId::InvalidId());
+    }
+}
+
+void
+HdPrman_RenderParam::UpdateQuickIntegrator(
+    const HdRenderIndex * const renderIndex)
+{
+    if (_enableQuickIntegrate) {
+        if (!TF_VERIFY(_quickIntegratorId != riley::IntegratorId::InvalidId())) {
+            return;
+        }
+
+        const riley::ShadingNode node =
+            _ComputeQuickIntegratorNode(
+                renderIndex->GetRenderDelegate(),
+                _cameraContext.GetCamera(renderIndex));
+        
+        AcquireRiley()->ModifyIntegrator(
+            _quickIntegratorId,
+            &node);
+    }
+}
+
+// tl;dr: Motion blur is currently supported only if the camera path and/or
+//        disableMotionBlur are set on the legacy render settings map BEFORE
+//        syncing prims.
+//        When using a well-formed render settings prim, the computed unioned
+//        shutter interval may be available (23.11 onwards) which circumvents
+//        the above limitation.
+//
+// Here's the longform story:
+//
+// Riley has a limitation in that the shutter interval scene option param
+// has to be set before any time sampled primvars or transforms are
+// given to Riley.
+//
+// The shutter interval is specified on the camera. In the legacy task based
+// data flow, the camera used to render is known only during render pass
+// execution which happens AFTER prim sync. To circumvent this, we use
+// the legacy render settings map to provide the camera path during render
+// delegate construction. See HdPrmanExperimentalRenderSpecTokens->camera
+// and _tokens->renderCameraPath (latter is used by Solaris).
+//
+// When the said camera is sync'd, we commit its shutter interval IFF it is
+// the one to use for rendering. See HdPrman_Camera::Sync.
+//
+// This "shutter interval discovery" issue may not be relevant when using the
+// render settings prim. If using 23.11 and later, the shutter interval
+// is computed from on the cameras used by the render products. See
+// HdPrman_RenderSettings::Sync.
+//
+// HOWEVER:
+// Changing the camera shutter (either on the camera or changing the camera
+// used) AFTER syncing prims with motion samples (e.g., lights & geometry)
+// requires the prims to be resync'd. This scenario isn't supported currently.
+// XXX Note that updating the render setting _tokens->renderCameraPath currently
+//     results in marking all rprims dirty.
+//     See HdPrmanRenderDelegate::SetRenderSetting. This handling is rather
+//     adhoc and should be cleaned up.
+//
+void
+HdPrman_RenderParam::SetRileyShutterIntervalFromCameraContextCameraPath(
+    const HdRenderIndex * const renderIndex)
+{
+    // Fallback shutter interval.
+    float shutterInterval[2] = {
+        HDPRMAN_SHUTTEROPEN_DEFAULT,
+        HDPRMAN_SHUTTERCLOSE_DEFAULT
+    };
+
+    // Handle legacy render setting.
+    const bool disableMotionBlur =
+        renderIndex->GetRenderDelegate()->GetRenderSetting<bool>(
+            HdPrmanRenderSettingsTokens->disableMotionBlur, false);
+    if (disableMotionBlur) {
+        // Disable motion blur by sampling at current frame only.
+        shutterInterval[0] = 0.0f;
+        shutterInterval[1] = 0.0f;
+
+    } else {
+        // Try to get shutter interval from camera.
+        // Note that shutter open and close times are frame relative and refer 
+        // to the times the shutter begins to open and fully closes
+        // respectively.
+        if (const HdCamera * const camera =
+                _cameraContext.GetCamera(renderIndex)) {
+            shutterInterval[0] = camera->GetShutterOpen();
+            shutterInterval[1] = camera->GetShutterClose();
+        }
+
+        // Deprecated.
+        const bool instantaneousShutter =
+            renderIndex->GetRenderDelegate()->GetRenderSetting<bool>(
+                HdPrmanRenderSettingsTokens->instantaneousShutter, false);
+        if (instantaneousShutter) {
+            // Disable motion blur by making the interval a single point.
+            shutterInterval[1] = shutterInterval[0];
+        }
+    }
+
+    // Update the shutter interval on the *legacy* options param list and
+    // commit the scene options. Note that the legacy options has a weaker
+    // opinion that the env var HD_PRMAN_ENABLE_MOTIONBLUR and the render
+    // settings prim.
+    RtParamList &options = GetLegacyOptions();
+    options.SetFloatArray(RixStr.k_Ri_Shutter, shutterInterval, 2);
+
+    SetRileyOptions();
+}
+
+void
+HdPrman_RenderParam::SetRenderSettingsIntegratorPath(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const &renderSettingsIntegratorPath)
+{
+    if (_renderSettingsIntegratorPath != renderSettingsIntegratorPath) {
+        if (! HdRenderIndex::IsSceneIndexEmulationEnabled()) {
+            // Mark the Integrator Prim Dirty
+            sceneDelegate->GetRenderIndex().GetChangeTracker()
+                .MarkSprimDirty(renderSettingsIntegratorPath, 
+                                HdChangeTracker::DirtyParams);
+        }
+        _renderSettingsIntegratorPath = renderSettingsIntegratorPath;
+
+        // Update the Integrator back to the default when the path is empty
+        if (_renderSettingsIntegratorPath.IsEmpty()) {
+            UpdateIntegrator(&sceneDelegate->GetRenderIndex());
+        }
+    }
+}
+
+void 
+HdPrman_RenderParam::SetRenderSettingsIntegratorNode(
+    HdRenderIndex *renderIndex, HdMaterialNode2 const &integratorNode)
+{
+    if (_renderSettingsIntegratorNode != integratorNode) {
+        // Save the HdMaterialNode2, the riley integrator is created
+        // inside UpdateIntegrator based on this node.
+        _renderSettingsIntegratorNode = integratorNode;
+        UpdateIntegrator(renderIndex);
+    }
+}
+
+void
+HdPrman_RenderParam::SetConnectedSampleFilterPaths(
+    HdSceneDelegate *sceneDelegate,
+    SdfPathVector const &connectedSampleFilterPaths)
+{
+    if (_connectedSampleFilterPaths != connectedSampleFilterPaths) {
+        // Reset the Filter Shading Nodes and update the Connected Paths
+        _sampleFilterNodes.clear();
+        _connectedSampleFilterPaths = connectedSampleFilterPaths;
+
+        if (! HdRenderIndex::IsSceneIndexEmulationEnabled()) {
+            // Mark the SampleFilter Prims Dirty
+            for (const SdfPath &path : connectedSampleFilterPaths) {
+                sceneDelegate->GetRenderIndex().GetChangeTracker()
+                    .MarkSprimDirty(path, HdChangeTracker::DirtyParams);
+            }
+        }
+    }
+
+    // If there are no connected SampleFilters, delete the riley SampleFilter
+    if (_connectedSampleFilterPaths.size() == 0) {
+        if (_sampleFiltersId != riley::SampleFilterId::InvalidId()) {
+            AcquireRiley()->DeleteSampleFilter(_sampleFiltersId);
+            _sampleFiltersId = riley::SampleFilterId::InvalidId();
+        }
+    }
+}
+
+void
+HdPrman_RenderParam::SetConnectedDisplayFilterPaths(
+    HdSceneDelegate *sceneDelegate,
+    SdfPathVector const &connectedDisplayFilterPaths)
+{
+    if (_connectedDisplayFilterPaths != connectedDisplayFilterPaths) {
+        // Reset the Filter Shading Nodes and update the Connected Paths
+        _displayFilterNodes.clear();
+        _connectedDisplayFilterPaths = connectedDisplayFilterPaths;
+
+        if (! HdRenderIndex::IsSceneIndexEmulationEnabled()) {
+            // Mark the DisplayFilter prims Dirty
+            for (const SdfPath &path : connectedDisplayFilterPaths) {
+                sceneDelegate->GetRenderIndex().GetChangeTracker()
+                    .MarkSprimDirty(path, HdChangeTracker::DirtyParams);
+            }
+        }
+    }
+
+    // If there are no connected DisplayFilters, delete the riley DisplayFilter
+    if (_connectedDisplayFilterPaths.size() == 0) {
+        if (_displayFiltersId != riley::DisplayFilterId::InvalidId()) {
+            AcquireRiley()->DeleteDisplayFilter(_displayFiltersId);
+            _displayFiltersId = riley::DisplayFilterId::InvalidId();
+        }
+    }
+}
+
+void
+HdPrman_RenderParam::CreateSampleFilterNetwork(HdSceneDelegate *sceneDelegate)
+{
+    std::vector<riley::ShadingNode> shadingNodes;
+    std::vector<RtUString> filterRefs;
+
+    // Gather shading nodes and reference paths (for combiner) for all connected
+    // and visible SampleFilters. The filterRefs order needs to match the order
+    // of SampleFilters specified in the RenderSettings connection.
+    for (const auto& path : _connectedSampleFilterPaths) {
+        if (sceneDelegate->GetVisible(path)) {
+            const auto it = _sampleFilterNodes.find(path);
+            if (!TF_VERIFY(it != _sampleFilterNodes.end())) {
+                continue;
+            }
+            if (it->second.name) {
+                shadingNodes.push_back(it->second);
+                filterRefs.push_back(RtUString(path.GetText()));
+            }
+        }
+    }
+
+    // If we have multiple SampleFilters, create a SampleFilter Combiner Node
+    if (shadingNodes.size() > 1) {
+        static RtUString filterArrayName("filter");
+        static RtUString pxrSampleFilterCombiner("PxrSampleFilterCombiner");
+
+        riley::ShadingNode combinerNode;
+        combinerNode.type = riley::ShadingNode::Type::k_SampleFilter;
+        combinerNode.handle = pxrSampleFilterCombiner;
+        combinerNode.name = pxrSampleFilterCombiner;
+        combinerNode.params.SetSampleFilterReferenceArray(
+            filterArrayName, filterRefs.data(), filterRefs.size());
+        shadingNodes.push_back(combinerNode);
+    }
+    
+    // Create or update the Riley SampleFilters
+    riley::ShadingNetwork const sampleFilterNetwork = {
+        static_cast<uint32_t>(shadingNodes.size()), &shadingNodes[0] };
+    
+    if (_sampleFiltersId == riley::SampleFilterId::InvalidId()) {
+        _sampleFiltersId = AcquireRiley()->CreateSampleFilter(
+            riley::UserId(stats::AddDataLocation("/sampleFilters").
+                              GetValue()),
+            sampleFilterNetwork, 
+            RtParamList());
+    }
+    else {
+        AcquireRiley()->ModifySampleFilter(
+            _sampleFiltersId, &sampleFilterNetwork, nullptr);
+    }
+
+    if (_sampleFiltersId == riley::SampleFilterId::InvalidId()) {
+        TF_WARN("Failed to create the Sample Filter(s)\n");
+    }
+}
+
+void
+HdPrman_RenderParam::CreateDisplayFilterNetwork(HdSceneDelegate *sceneDelegate)
+{
+    std::vector<riley::ShadingNode> shadingNodes;
+    std::vector<RtUString> filterRefs;
+
+    // Gather shading nodes and reference paths (for combiner) for all connected
+    // and visible DisplayFilters. The filterRefs order needs to match the order
+    // of DisplayFilters specified in the RenderSettings connection.
+    for (const auto& path : _connectedDisplayFilterPaths) {
+        if (sceneDelegate->GetVisible(path)) {
+            const auto it = _displayFilterNodes.find(path);
+            if (!TF_VERIFY(it != _displayFilterNodes.end())) {
+                continue;
+            }
+            if (it->second.name) {
+                shadingNodes.push_back(it->second);
+                filterRefs.push_back(RtUString(path.GetText()));
+            }
+        }
+    }
+
+    // If we have multiple DisplayFilters, create a DisplayFilter Combiner Node
+    if (shadingNodes.size() > 1) {
+        static RtUString filterArrayName("filter");
+        static RtUString pxrDisplayFilterCombiner("PxrDisplayFilterCombiner");
+
+        riley::ShadingNode combinerNode;
+        combinerNode.type = riley::ShadingNode::Type::k_DisplayFilter;
+        combinerNode.handle = pxrDisplayFilterCombiner;
+        combinerNode.name = pxrDisplayFilterCombiner;
+        combinerNode.params.SetDisplayFilterReferenceArray(
+            filterArrayName, filterRefs.data(), filterRefs.size());
+        shadingNodes.push_back(combinerNode);
+    }
+    
+    // Create or update the Riley DisplayFilters
+    riley::ShadingNetwork const displayFilterNetwork = {
+        static_cast<uint32_t>(shadingNodes.size()), &shadingNodes[0] };
+    
+    if (_displayFiltersId == riley::DisplayFilterId::InvalidId()) {
+        _displayFiltersId = AcquireRiley()->CreateDisplayFilter(
+            riley::UserId(stats::AddDataLocation("/displayFilters").
+                              GetValue()),
+            displayFilterNetwork, 
+            RtParamList());
+    }
+    else {
+        AcquireRiley()->ModifyDisplayFilter(
+            _displayFiltersId, &displayFilterNetwork, nullptr);
+    }
+
+    if (_displayFiltersId == riley::DisplayFilterId::InvalidId()) {
+        TF_WARN("Failed to create the Display Filter(s)\n");
+    }
+}
+
+void
+HdPrman_RenderParam::AddSampleFilter(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const& path,
+    riley::ShadingNode const& node)
+{
+    // Update or Add the SampleFilter Shading node
+    const auto filterIt = _sampleFilterNodes.insert( {path, node} );
+    if (!filterIt.second) {
+        filterIt.first->second = node;
+    }
+
+    // If we have all the Shading Nodes, create the SampleFilters in Riley
+    if (_sampleFilterNodes.size() == _connectedSampleFilterPaths.size()) {
+        CreateSampleFilterNetwork(sceneDelegate);
+    }
+}
+
+void
+HdPrman_RenderParam::AddDisplayFilter(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const& path,
+    riley::ShadingNode const& node)
+{
+    // Update or Add the DisplayFilter Shading Node
+    const auto filterIt = _displayFilterNodes.insert({ path, node });
+    if (!filterIt.second) {
+        filterIt.first->second = node;
+    }
+
+    // If we have all the Shading Nodes, creat the DisplayFilters in Riley 
+    if (_displayFilterNodes.size() == _connectedDisplayFilterPaths.size()) {
+        CreateDisplayFilterNetwork(sceneDelegate);
+    }
+}
+
+riley::SampleFilterList
+HdPrman_RenderParam::GetSampleFilterList()
+{
+    return (_sampleFiltersId == riley::SampleFilterId::InvalidId()) 
+        ? riley::SampleFilterList({ 0, nullptr })
+        : riley::SampleFilterList({ 1, &_sampleFiltersId });
+}
+
+riley::DisplayFilterList
+HdPrman_RenderParam::GetDisplayFilterList()
+{
+    return (_displayFiltersId == riley::DisplayFilterId::InvalidId())
+        ? riley::DisplayFilterList({ 0, nullptr })
+        : riley::DisplayFilterList({ 1, &_displayFiltersId });
+}
+
+HdPrmanInstancer*
+HdPrman_RenderParam::GetInstancer(const SdfPath& id)
+{
+    if (id.IsEmpty()) { return nullptr; }
+    if (HdRenderIndex* index = _renderDelegate->GetRenderIndex()) {
+        return static_cast<HdPrmanInstancer*>(index->GetInstancer(id));
+    }
+    return nullptr;
+}
+
+bool
+HdPrman_RenderParam::IsInteractive() const
+{
+    return _renderDelegate->IsInteractive();
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderParam.h b/third_party/renderman-26/plugin/hdPrman/renderParam.h
new file mode 100644
index 0000000000..3a79b9685e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderParam.h
@@ -0,0 +1,602 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PARAM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PARAM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/xcpt.h"
+#include "hdPrman/cameraContext.h"
+#include "hdPrman/renderViewContext.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/renderDelegate.h"
+#include "pxr/imaging/hd/renderSettings.h"
+#include "pxr/imaging/hd/material.h"
+
+#include "Riley.h"
+#include "RixEventCallbacks.h"
+#include <unordered_map>
+#include <mutex>
+
+class RixRiCtl;
+
+namespace stats {
+class Session;
+};
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrmanFramebuffer;
+class HdPrmanCamera;
+class HdPrmanInstancer;
+class HdPrmanRenderDelegate;
+class HdPrman_RenderSettings;
+class SdfAssetPath;
+
+// Compile-time limit on max time samples.
+// The idea is to avoid heap allocation of sample buffers in the Sync()
+// calls by using fixed-size stack arrays with configured capacity.
+// The capacity is indicated to the scene delegate when requesting
+// time samples.
+constexpr int HDPRMAN_MAX_TIME_SAMPLES = 4;
+
+#define HDPRMAN_SHUTTEROPEN_DEFAULT 0.f
+#ifdef PIXAR_ANIM
+#define HDPRMAN_SHUTTERCLOSE_DEFAULT 0.5f
+#else
+#define HDPRMAN_SHUTTERCLOSE_DEFAULT 0.f
+#endif
+
+// Render Param for HdPrman to communicate with an instance of PRMan.
+class HdPrman_RenderParam : public HdRenderParam
+{
+public:
+    HDPRMAN_API
+    HdPrman_RenderParam(
+        HdPrmanRenderDelegate *renderDelegate,
+        const std::string &rileyVariant, 
+        const std::string &xpuDevices,
+        const std::vector<std::string>& extraArgs);
+
+    HDPRMAN_API
+    ~HdPrman_RenderParam() override;
+
+    HDPRMAN_API
+    void Begin(HdPrmanRenderDelegate *renderDelegate); 
+
+    // Convert any Hydra primvars that should be Riley instance attributes.
+    // Stores visibility state in *visible (if provided) in addition to
+    // representing it as attributes in the returned RtParamList.
+    HDPRMAN_API
+    RtParamList
+    ConvertAttributes(HdSceneDelegate *sceneDelegate,
+        SdfPath const& id, bool isGeometry);
+
+    // A vector of Riley coordinate system id's.
+    using RileyCoordSysIdVec = std::vector<riley::CoordinateSystemId>;
+    // A ref-counting ptr to a vector of coordinate systems.
+    using RileyCoordSysIdVecRefPtr = std::shared_ptr<RileyCoordSysIdVec>;
+
+    /// Convert any coordinate system bindings for the given rprim id
+    /// into a Riley equivalent form.  Retain the result internally
+    /// in a cache, so that we may re-use the result with other
+    /// rprims with the same set of bindings.
+    HDPRMAN_API
+    RileyCoordSysIdVecRefPtr ConvertAndRetainCoordSysBindings(
+        HdSceneDelegate *sceneDelegate,
+        SdfPath const& id);
+
+    /// Convert a list of categories returned by Hydra to
+    /// equivalent Prman grouping attributes.
+    HDPRMAN_API
+    void ConvertCategoriesToAttributes(
+        SdfPath const& id,
+        VtArray<TfToken> const& categories,
+        RtParamList& attrs);
+    
+    /// Prepends the given \p renderTag to grouping:membership in \p params.
+    HDPRMAN_API
+    static void AddRenderTagToGroupingMembership(
+        const TfToken& renderTag,
+        RtParamList& params);
+
+    /// Release any coordinate system bindings cached for the given
+    /// rprim id.
+    HDPRMAN_API
+    void ReleaseCoordSysBindings(SdfPath const& id);
+
+    HDPRMAN_API
+    void IncrementLightLinkCount(TfToken const& name);
+
+    HDPRMAN_API
+    void DecrementLightLinkCount(TfToken const& name);
+
+    HDPRMAN_API
+    bool IsLightLinkUsed(TfToken const& name);
+
+    HDPRMAN_API
+    void IncrementLightFilterCount(TfToken const& name);
+
+    HDPRMAN_API
+    void DecrementLightFilterCount(TfToken const& name);
+
+    HDPRMAN_API
+    bool IsLightFilterUsed(TfToken const& name);
+
+    HDPRMAN_API
+    void UpdateLegacyOptions();
+
+    // Set integrator params from the HdRenderSettingsMap
+    HDPRMAN_API
+    void SetIntegratorParamsFromRenderSettingsMap(
+        HdPrmanRenderDelegate *renderDelegate,
+        const std::string& integratorName,
+        RtParamList& params);
+
+    // Set integrator params from the camera.
+    // This invokes any callbacks registered with
+    // RegisterIntegratorCallbackForCamera().
+    HDPRMAN_API
+    void SetIntegratorParamsFromCamera(
+        HdPrmanRenderDelegate *renderDelegate,
+        const HdPrmanCamera *camera,
+        std::string const& integratorName,
+        RtParamList& params);
+
+    HDPRMAN_API
+    void SetBatchCommandLineArgs(
+        VtValue const &cmdLine,
+        RtParamList * options);
+
+    // Callback to convert any camera settings that should become
+    // parameters on the integrator.
+    using IntegratorCameraCallback = void (*)
+        (HdPrmanRenderDelegate *renderDelegate,
+         const HdPrmanCamera *camera,
+         std::string const& integratorName,
+         RtParamList &integratorParams);
+
+    // Register a callback to process integrator settings
+    HDPRMAN_API
+    static void 
+    RegisterIntegratorCallbackForCamera(
+        IntegratorCameraCallback const& callback);
+
+    // Get RIX vs XPU
+    bool IsXpu() const { return _xpu; }
+
+    // Request edit access to the Riley scene and return it.
+    HDPRMAN_API
+    riley::Riley * AcquireRiley();
+
+    // Get the current frame-relative shutter interval.
+    // Note: This function should be called after SetRileyOptions.
+    const GfVec2f& GetShutterInterval() {
+        return _shutterInterval;
+    }
+
+    // Provides external access to resources used to set parameters for
+    // options and the active integrator.
+    riley::IntegratorId GetActiveIntegratorId();
+
+    const riley::MaterialId GetFallbackMaterialId() const {
+        return _fallbackMaterialId;
+    }
+
+    const riley::MaterialId GetFallbackVolumeMaterialId() const {
+        return _fallbackVolumeMaterialId;
+    }
+
+    int GetLastLegacySettingsVersion() const {
+        return _lastLegacySettingsVersion;
+    }
+    void SetLastLegacySettingsVersion(int version);
+
+    // Legacy data flow to resolution from the render pass via render pass
+    // state.
+    GfVec2i const &GetResolution() { return _resolution; }
+    void SetResolution(GfVec2i const & resolution);
+
+    // Invalidate texture at path.
+    void InvalidateTexture(const std::string &path);
+    
+    /// Call this from RenderPass to set which render tags should be enabled.
+    /// Calling will always trigger a render index traversal, and may trigger an
+    /// intergrator update, so only call it if you strongly suspect that either
+    /// the set of active render tags or the set of rprim render tags in the
+    /// scene has changed.
+    void SetActiveRenderTags(
+        const TfTokenVector& activeRenderTags,
+        HdRenderIndex* renderIndex);
+
+    void UpdateIntegrator(const HdRenderIndex * renderIndex);
+
+    riley::IntegratorId GetIntegratorId() const { return _integratorId; }
+
+    RtParamList &GetIntegratorParams() { return _integratorParams; }
+
+    bool HasSceneLights() const { return _sceneLightCount > 0; }
+    void IncreaseSceneLightCount() { ++_sceneLightCount; }
+    void DecreaseSceneLightCount() { --_sceneLightCount; }
+    
+    // Provides external access to resources used to set parameters for
+    // scene options from the render settings map.
+    RtParamList &GetLegacyOptions() { return _legacyOptions; }
+
+    HdPrman_CameraContext &GetCameraContext() { return _cameraContext; }
+
+    HdPrman_RenderViewContext &GetRenderViewContext() {
+        return _renderViewContext;
+    }
+
+    void CreateRenderViewFromRenderSpec(const VtDictionary &renderSpec);
+
+    void CreateRenderViewFromRenderSettingsProduct(
+        HdRenderSettings::RenderProduct const &product,
+        HdPrman_RenderViewContext *renderViewContext);
+
+    // Starts the render thread (if needed), and tells the render thread to
+    // call into riley and start a render.
+    void StartRender();
+
+    // Requests riley stop rendering; if blocking is true, waits until riley
+    // has exited and the render thread is idle before returning.  Note that
+    // after the render stops, the render thread will be running but idle;
+    // to stop the thread itself, call DeleteRenderThread. If the render thread
+    // is not running, this call does nothing.
+    void StopRender(bool blocking = true);
+
+    // Returns whether the render thread is active and rendering currently.
+    // Returns false if the render thread is active but idle (not in riley).
+    bool IsRendering();
+
+    // Returns whether the user has requested pausing the render.
+    bool IsPauseRequested();
+
+    // Deletes the render thread if there is one.
+    void DeleteRenderThread();
+
+    // Checks whether render param was successfully initialized.
+    // ie. riley was created
+    bool IsValid() const;
+
+    // Creates displays in riley based on aovBindings vector together
+    // with HdPrmanFramebuffer to transfer the result between the
+    // render thread and the hydra render buffers.
+    void CreateFramebufferAndRenderViewFromAovs(
+        const HdRenderPassAovBindingVector& aovBindings);
+
+    // Deletes HdPrmanFramebuffer (created with
+    // CreateRenderViewFromAovs). Can be called if there is no frame
+    // buffer (returning false).
+    bool DeleteFramebuffer();
+
+    // Returns HdPrmanFramebuffer
+    HdPrmanFramebuffer * GetFramebuffer() const {
+        return _framebuffer.get();
+    }
+
+    // Creates displays in riley based on rendersettings map
+    void CreateRenderViewFromLegacyProducts(
+        const VtArray<HdRenderSettingsMap>& renderProducts, int frame);
+
+    // Scene version counter.
+    std::atomic<int> sceneVersion;
+
+    // For now, the renderPass needs the render target for each view, for
+    // resolution edits, so we need to keep track of these too.
+    void SetActiveIntegratorId(riley::IntegratorId integratorId);
+
+    void UpdateQuickIntegrator(const HdRenderIndex * renderIndex);
+
+    riley::IntegratorId GetQuickIntegratorId() const {
+        return _quickIntegratorId;
+    }
+
+    // Compute shutter interval from the camera Sprim and legacy render settings
+    // map and update the value on the legacy options param list.
+    // Also invoke SetRileyOptions to commit it.
+    void SetRileyShutterIntervalFromCameraContextCameraPath(
+        const HdRenderIndex * renderIndex);
+
+    // Path to the Integrator from the Render Settings Prim
+    void SetRenderSettingsIntegratorPath(HdSceneDelegate *sceneDelegate,
+        SdfPath const &renderSettingsIntegratorPath);
+    SdfPath GetRenderSettingsIntegratorPath() {
+        return _renderSettingsIntegratorPath;
+    }
+    void SetRenderSettingsIntegratorNode(
+        HdRenderIndex *renderIndex, HdMaterialNode2 const &integratorNode);
+    HdMaterialNode2 GetRenderSettingsIntegratorNode() {
+        return _renderSettingsIntegratorNode;
+    };
+
+    // Path to the connected Sample Filter from the Render Settings Prim
+    void SetConnectedSampleFilterPaths(HdSceneDelegate *sceneDelegate,
+        SdfPathVector const& connectedSampleFilterPaths);
+    SdfPathVector GetConnectedSampleFilterPaths() {
+        return _connectedSampleFilterPaths;
+    }
+
+    // Riley Data from the Sample Filter Prim
+    void AddSampleFilter(
+        HdSceneDelegate *sceneDelegate, 
+        SdfPath const& path, 
+        riley::ShadingNode const& node);
+    void CreateSampleFilterNetwork(HdSceneDelegate *sceneDelegate);
+    riley::SampleFilterList GetSampleFilterList();
+
+    // Path to the connected Display Filter from the Render Settings Prim
+    void SetConnectedDisplayFilterPaths(HdSceneDelegate *sceneDelegate,
+        SdfPathVector const& connectedDisplayFilterPaths);
+    SdfPathVector GetConnectedDisplayFilterPaths() {
+        return _connectedDisplayFilterPaths;
+    }
+
+    // Riley Data from the Display Filter Prim
+    void AddDisplayFilter(
+        HdSceneDelegate *sceneDelegate, 
+        SdfPath const& path, 
+        riley::ShadingNode const& node);
+    void CreateDisplayFilterNetwork(HdSceneDelegate *sceneDelegate);
+    riley::DisplayFilterList GetDisplayFilterList();
+
+    // Instancer by id
+    HdPrmanInstancer* GetInstancer(const SdfPath& id);
+
+    // Cache scene options from the render settings prim.
+    void SetRenderSettingsPrimOptions(RtParamList const &params);
+
+    // Set path of the driving render settings prim.
+    void SetDrivingRenderSettingsPrimPath(SdfPath const &path);
+
+    // Get path of the driving render settings prim.
+    SdfPath const& GetDrivingRenderSettingsPrimPath() const;
+
+    // Set Riley scene options by composing opinion sources.
+    void SetRileyOptions();
+
+    // Returns true if the render delegate in interactive mode (as opposed to
+    // batched/offline mode).
+    bool IsInteractive() const;
+
+private:
+    void _CreateStatsSession();
+    void _CreateRiley(const std::string &rileyVariant, 
+        const std::string &xpuVariant,
+        const std::vector<std::string>& extraArgs);
+
+    // Creation of riley prims that are either not backed by the scene 
+    // (e.g., fallback materials) OR those that are
+    // currently managed by render param (such as the camera, render view and
+    // render terminals).
+    void _CreateInternalPrims();
+    void _DeleteInternalPrims();
+    void _CreateFallbackMaterials();
+    void _CreateIntegrator(HdRenderDelegate * renderDelegate);
+    void _CreateQuickIntegrator(HdRenderDelegate * renderDelegate);
+    
+    void _DestroyRiley();
+    void _DestroyStatsSession();
+
+    // Initialize internals of PRMan system
+    void _PRManSystemBegin(const std::vector<std::string>& extraArgs);
+    // Initialize internals of PRMan renderer
+    int _PRManRenderBegin(const std::vector<std::string>& extraArgs);
+
+    // Updates clear colors of AOV descriptors of framebuffer.
+    // If this is not possible because the set of AOVs changed,
+    // returns false.
+    bool _UpdateFramebufferClearValues(
+        const HdRenderPassAovBindingVector& aovBindings);
+
+    riley::ShadingNode _ComputeIntegratorNode(
+        HdRenderDelegate * renderDelegate,
+        const HdPrmanCamera * cam);
+
+    riley::ShadingNode _ComputeQuickIntegratorNode(
+        HdRenderDelegate * renderDelegate,
+        const HdPrmanCamera * cam);
+
+    void _RenderThreadCallback();
+    static void _ProgressCallback(RixEventCallbacks::Event,
+                                  RtConstPointer data, RtPointer clientData);
+
+    void _CreateRileyDisplay(
+        const RtUString& productName, const RtUString& productType,
+        HdPrman_RenderViewDesc& renderViewDesc,
+        const std::vector<size_t>& renderOutputIndices,
+        RtParamList& displayParams, bool isXpu);
+    
+    void _UpdateShutterInterval(const RtParamList &composedParams);
+    
+    static
+    void _SetExcludeSubset(
+        const TfToken::Set& excludedTags,
+        RtParamList& params);
+
+private:
+    // Top-level entrypoint to PRMan.
+    // Singleton used to access RixInterfaces.
+    RixContext *_rix;
+
+    // RixInterface for PRManBegin/End.
+    RixRiCtl *_ri;
+
+    // RixInterface for Riley.
+    RixRileyManager *_mgr;
+
+    // Xcpt Handler
+    HdPrman_Xcpt _xcpt;
+
+    // Roz stats session
+    stats::Session *_statsSession;
+    int _progressPercent;
+
+    // Riley instance.
+    riley::Riley *_riley;
+    // Mutex around riley->Stop(), so as to be well-behaved callers.
+    std::mutex _stopMutex;
+
+    std::unique_ptr<class HdRenderThread> _renderThread;
+    std::unique_ptr<HdPrmanFramebuffer> _framebuffer;
+
+    int _sceneLightCount;
+
+    // Refcounts for each category mentioned by a light link.
+    // This is used to convey information from lights back to the
+    // geometry -- in Renderman, geometry must subscribe
+    // to the linked lights.
+    std::unordered_map<TfToken, size_t, TfToken::HashFunctor> _lightLinkRefs;
+
+    // Mutex protecting lightLinkRefs.
+    std::mutex _lightLinkMutex;
+
+    std::unordered_map<TfToken, size_t, TfToken::HashFunctor> _lightFilterRefs;
+
+    // Mutex protecting lightFilterRefs.
+    std::mutex _lightFilterMutex;
+
+    // Map from Hydra coordinate system vector pointer to Riley equivalent.
+    using _HdToRileyCoordSysMap =
+        std::unordered_map<HdIdVectorSharedPtr, RileyCoordSysIdVecRefPtr>;
+    // Map from Hydra id to cached, converted coordinate systems.
+    using _GeomToHdCoordSysMap =
+        std::unordered_map<SdfPath, HdIdVectorSharedPtr, SdfPath::Hash>;
+
+    // A fallback material to use for any geometry that
+    // does not have a bound material.
+    riley::MaterialId _fallbackMaterialId;
+
+    // Fallback material for volumes that don't have materials.
+    riley::MaterialId _fallbackVolumeMaterialId;
+    
+    TfToken::Set _lastExcludedRenderTags;
+
+    riley::IntegratorId _quickIntegratorId;
+    RtParamList _quickIntegratorParams;
+
+    // The integrator to use.
+    // Updated from render pass state OR render settings prim.
+    riley::IntegratorId _activeIntegratorId;
+
+    // Coordinate system conversion cache.
+    _GeomToHdCoordSysMap _geomToHdCoordSysMap;
+    _HdToRileyCoordSysMap _hdToRileyCoordSysMap;
+    std::mutex _coordSysMutex;
+
+    HdPrman_CameraContext _cameraContext;
+    HdPrman_RenderViewContext _renderViewContext;
+
+    // Frame-relative shutter window used to determine if motion blur is
+    // enabled.
+    GfVec2f _shutterInterval;
+
+    // Flag to indicate whether Riley scene options were set.
+    bool _initRileyOptions;
+
+    // Environment and fallback scene options.
+    RtParamList _envOptions;
+    RtParamList _fallbackOptions;
+
+    /// ------------------------------------------------------------------------
+    // Render settings prim driven state
+    //
+
+    SdfPath _drivingRenderSettingsPrimPath;
+
+    RtParamList _renderSettingsPrimOptions;
+
+    // Render terminals
+    SdfPath _renderSettingsIntegratorPath;
+    HdMaterialNode2 _renderSettingsIntegratorNode;
+    riley::IntegratorId _integratorId;
+
+    SdfPathVector _connectedSampleFilterPaths;
+    std::map<SdfPath, riley::ShadingNode> _sampleFilterNodes;
+    riley::SampleFilterId _sampleFiltersId;
+
+    SdfPathVector _connectedDisplayFilterPaths;
+    std::map<SdfPath, riley::ShadingNode> _displayFilterNodes;
+    riley::DisplayFilterId _displayFiltersId;
+    /// ------------------------------------------------------------------------
+
+    /// ------------------------------------------------------------------------
+    // Legacy render settings and render pass driven state
+    //
+    // Params from the render settings map.
+    RtParamList _legacyOptions;
+    int _lastLegacySettingsVersion;
+
+    // Resolution for the render pass via render pass state.
+    GfVec2i _resolution;
+
+    RtParamList _integratorParams;
+    /// ------------------------------------------------------------------------
+
+    // RIX or XPU
+    bool _xpu;
+    std::vector<int> _xpuGpuConfig;
+
+
+    std::vector<std::string> _outputNames;
+
+    HdPrmanRenderDelegate* _renderDelegate;
+};
+
+/// Convert Hydra points to Riley point primvar.
+///
+void
+HdPrman_ConvertPointsPrimvar(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const &id,
+    GfVec2f const &shutterInterval,
+    RtPrimVarList& primvars,
+    size_t npoints);
+
+/// Count hydra points to set element count on primvars and then
+/// convert them to Riley point primvar.
+/// 
+size_t
+HdPrman_ConvertPointsPrimvarForPoints(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const &id,
+    GfVec2f const &shutterInterval,
+    RtPrimVarList& primvars);
+
+/// Convert any Hydra primvars that should be Riley primvars.
+void
+HdPrman_ConvertPrimvars(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const& id,
+    RtPrimVarList& primvars,
+    int numUniform,
+    int numVertex,
+    int numVarying,
+    int numFaceVarying,
+    float time = 0.f);
+
+/// Check for any primvar opinions on the material that should be Riley primvars.
+void
+HdPrman_TransferMaterialPrimvarOpinions(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const& hdMaterialId,
+    RtPrimVarList& primvars);
+
+/// Resolve Hd material ID to the corresponding Riley material & displacement
+bool
+HdPrman_ResolveMaterial(
+    HdSceneDelegate *sceneDelegate,
+    SdfPath const& hdMaterialId,
+    riley::Riley *riley,
+    riley::MaterialId *materialId,
+    riley::DisplacementId *dispId);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PARAM_H
diff --git a/third_party/renderman-26/plugin/hdPrman/renderPass.cpp b/third_party/renderman-26/plugin/hdPrman/renderPass.cpp
new file mode 100644
index 0000000000..ec6f456ca9
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderPass.cpp
@@ -0,0 +1,669 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/renderPass.h" 
+
+#include "hdPrman/camera.h"
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/debugUtil.h"
+#include "hdPrman/framebuffer.h"
+#include "hdPrman/renderBuffer.h"
+#include "hdPrman/renderDelegate.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/renderSettings.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/perfLog.h"
+#include "pxr/imaging/hd/renderPassState.h"
+#include "pxr/imaging/hd/rprim.h"
+#include "pxr/imaging/hd/utils.h"
+
+#include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/token.h"
+
+#include <Riley.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_ENV_SETTING(HD_PRMAN_ENABLE_QUICKINTEGRATE, false,
+                      "Enable interactive integrator");
+
+static bool _enableQuickIntegrate =
+    TfGetEnvSetting(HD_PRMAN_ENABLE_QUICKINTEGRATE);
+
+HdPrman_RenderPass::HdPrman_RenderPass(
+    HdRenderIndex *index,
+    HdRprimCollection const &collection,
+    std::shared_ptr<HdPrman_RenderParam> renderParam)
+: HdRenderPass(index, collection)
+, _renderParam(renderParam)
+, _converged(false)
+, _lastRenderedVersion(0)
+, _lastTaskRenderTagsVersion(0)
+, _lastRprimRenderTagVersion(0)
+, _quickIntegrateTime(0.2f)
+{
+    TF_VERIFY(_renderParam);
+}
+
+HdPrman_RenderPass::~HdPrman_RenderPass() = default;
+
+bool
+HdPrman_RenderPass::IsConverged() const
+{
+    return _converged;
+}
+
+namespace {
+
+// Return the seconds between now and then.
+double
+_DiffTimeToNow(std::chrono::steady_clock::time_point const &then)
+{
+    std::chrono::duration<double> diff;
+    diff = std::chrono::duration_cast<std::chrono::duration<double>>
+                                (std::chrono::steady_clock::now()-then);
+    return(diff.count());
+}
+
+void
+_Blit(HdPrmanFramebuffer * const framebuffer,
+      HdRenderPassAovBindingVector const &aovBindings,
+      const bool converged)
+{
+    // Blit from the framebuffer to the currently selected AOVs.
+    // Lock the framebuffer when reading so we don't overlap
+    // with RenderMan's resize/writing.
+    std::lock_guard<std::mutex> lock(framebuffer->mutex);
+
+    const bool newData = framebuffer->newData.exchange(false);
+
+    for(size_t aov = 0; aov < aovBindings.size(); ++aov) {
+        HdPrmanRenderBuffer *const rb =
+            static_cast<HdPrmanRenderBuffer*>(
+                aovBindings[aov].renderBuffer);
+
+        if(!TF_VERIFY(rb)) {
+            continue;
+        }
+
+        if (newData) {
+            rb->Blit(framebuffer->aovBuffers[aov].desc.format,
+                     framebuffer->w,
+                     framebuffer->h,
+                     reinterpret_cast<uint8_t*>(
+                         framebuffer->aovBuffers[aov].pixels.data()));
+        }
+        // Forward convergence state to the render buffers...
+        rb->SetConverged(converged);
+    }
+}
+
+void
+_MarkBindingsAsConverged(
+    HdRenderPassAovBindingVector const &aovBindings,
+    const HdRenderIndex * const renderIndex)
+{
+    for (const HdRenderPassAovBinding& aovBinding : aovBindings) {
+        HdPrmanRenderBuffer * const rb =
+            static_cast<HdPrmanRenderBuffer*>(
+                renderIndex->GetBprim(
+                    HdPrimTypeTokens->renderBuffer, aovBinding.renderBufferId));
+
+        if (!TF_VERIFY(rb)) {
+            continue;
+        }
+        rb->SetConverged(true);
+    }
+}
+
+const HdRenderBuffer *
+_GetRenderBuffer(const HdRenderPassAovBinding &aov,
+                 const HdRenderIndex * const renderIndex)
+{
+    if (aov.renderBuffer) {
+        return aov.renderBuffer;
+    }
+    
+    return dynamic_cast<HdRenderBuffer*>(
+        renderIndex->GetBprim(
+            HdPrimTypeTokens->renderBuffer, aov.renderBufferId));
+}
+
+bool
+_GetRenderBufferSize(const HdRenderPassAovBindingVector &aovBindings,
+                     const HdRenderIndex * const renderIndex,
+                     GfVec2i * const resolution)
+{
+    for (const HdRenderPassAovBinding &aovBinding : aovBindings) {
+        if (const HdRenderBuffer * const renderBuffer =
+                        _GetRenderBuffer(aovBinding, renderIndex)) {
+            (*resolution)[0] = renderBuffer->GetWidth();
+            (*resolution)[1] = renderBuffer->GetHeight();
+            return true;
+        } else {
+            TF_CODING_ERROR("No render buffer available for AOV "
+                            "%s", aovBinding.aovName.GetText());
+        }
+    }
+
+    return false;
+}
+
+GfVec2i
+_ResolveResolution(
+    const HdRenderPassAovBindingVector &aovBindings,
+    const HdRenderIndex * const renderIndex,
+    const HdPrman_CameraContext &cameraContext)
+{
+    GfVec2i resolution(0);
+    if (!aovBindings.empty()) {
+        _GetRenderBufferSize(aovBindings, renderIndex, &resolution);
+    } else if (cameraContext.GetFraming().IsValid()) {
+        // This path is exercised when using the legacy render spec with the
+        // test harness.
+        resolution = cameraContext.GetResolutionFromDisplayWindow();
+    } else {
+        TF_WARN("Failed to resolve resolution.\n");
+    }
+    return resolution;
+}
+
+bool
+_UsesPrimaryIntegrator(const HdRenderDelegate * const renderDelegate)
+{
+    const std::string &integrator =
+        renderDelegate->GetRenderSetting<std::string>(
+            HdPrmanRenderSettingsTokens->integratorName,
+            HdPrmanIntegratorTokens->PxrPathTracer.GetString());
+    return
+        integrator == HdPrmanIntegratorTokens->PxrPathTracer.GetString() ||
+        integrator == HdPrmanIntegratorTokens->PbsPathTracer.GetString();
+}
+
+using _LegacyRenderProducts = VtArray<HdRenderSettingsMap>;
+
+bool
+_HasLegacyRenderProducts(
+    HdPrmanRenderDelegate const * renderDelegate,
+    _LegacyRenderProducts *legacyProducts)
+{
+    if (legacyProducts) {
+        *legacyProducts =
+            renderDelegate->GetRenderSetting<_LegacyRenderProducts>(
+                HdPrmanRenderSettingsTokens->delegateRenderProducts, {});
+
+        for (const auto &legacyProduct : *legacyProducts) {
+            if (!legacyProduct.empty()) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool
+_HasLegacyRenderSpec(
+    HdPrmanRenderDelegate const * renderDelegate,
+    VtDictionary *legacyRenderSpec)
+{
+    if (legacyRenderSpec) {
+        *legacyRenderSpec =
+            renderDelegate->GetRenderSetting<VtDictionary>(
+                HdPrmanRenderSettingsTokens->experimentalRenderSpec, {});
+
+        TF_DEBUG(HDPRMAN_RENDER_PASS).Msg("Has legacy render spec = %d\n",
+            !legacyRenderSpec->empty());
+        return !legacyRenderSpec->empty();
+    }
+
+    return false;
+}
+
+} // end anonymous namespace
+
+
+void
+HdPrman_RenderPass::_UpdateCameraPath(
+    const HdRenderPassStateSharedPtr &renderPassState,
+    HdPrman_CameraContext *cameraContext)
+{
+    if (const HdPrmanCamera * const cam =
+            static_cast<const HdPrmanCamera *>(renderPassState->GetCamera())) {
+        cameraContext->SetCameraPath(cam->GetId());
+    }
+}
+
+// Update the camera framing and window policy from the renderPassState.
+// Return true if the dataWindow has changed.
+bool
+HdPrman_RenderPass::_UpdateCameraFramingAndWindowPolicy(
+    const HdRenderPassStateSharedPtr &renderPassState,
+    HdPrman_CameraContext *cameraContext)
+{
+    cameraContext->SetWindowPolicy(renderPassState->GetWindowPolicy());
+
+    const GfRect2i prevDataWindow = cameraContext->GetFraming().dataWindow;
+
+    if (renderPassState->GetFraming().IsValid()) {
+        // For new clients setting the camera framing.
+        cameraContext->SetFraming(renderPassState->GetFraming());
+    } else {
+        // For old clients using the viewport. This relies on AOV bindings.
+        if (renderPassState->GetAovBindings().empty()) {
+            TF_CODING_ERROR("Failed to resolve framing.\n");
+            return false;
+        }
+
+        GfVec2i resolution;
+        _GetRenderBufferSize(renderPassState->GetAovBindings(),
+                             GetRenderIndex(), 
+                             &resolution);
+
+        const GfVec4f &vp = renderPassState->GetViewport();
+        cameraContext->SetFraming(
+            CameraUtilFraming(
+                GfRect2i(
+                    // Note that the OpenGL-style viewport is y-Up
+                    // but the camera framing is y-Down, so converting here.
+                    GfVec2i(vp[0], resolution[1] - (vp[1] + vp[3])),
+                    vp[2], vp[3])));
+    }
+
+    return cameraContext->GetFraming().dataWindow != prevDataWindow;
+}
+
+
+void
+HdPrman_RenderPass::_Execute(
+    HdRenderPassStateSharedPtr const& renderPassState,
+    TfTokenVector const & renderTags)
+{
+    HD_TRACE_FUNCTION();
+    
+    if (!TF_VERIFY(_renderParam)) {
+        return;
+    }
+
+    HdPrmanRenderDelegate * const renderDelegate =
+        static_cast<HdPrmanRenderDelegate*>(
+            GetRenderIndex()->GetRenderDelegate());
+
+    if (renderDelegate->IsInteractive()) {
+        if (_renderParam->IsPauseRequested()) {
+            // No more updates if pause is pending
+            return;
+        }
+    } else {
+        // Delete the render thread if there is one
+        // (if switching from interactive to offline rendering).
+        _renderParam->DeleteRenderThread();
+    }
+
+    bool legacySettingsChanged = false;
+    {
+        // Legacy settings version tracking.
+        const int currentLegacySettingsVersion =
+            renderDelegate->GetRenderSettingsVersion();
+        legacySettingsChanged = _renderParam->GetLastLegacySettingsVersion() 
+                                != currentLegacySettingsVersion;
+        if (legacySettingsChanged) {
+            // Note: UpdateLegacyOptions() only updates the legacy options
+            //       param list; it does not call SetRileyOptions().
+            _renderParam->UpdateLegacyOptions();
+            _renderParam->SetLastLegacySettingsVersion(
+                currentLegacySettingsVersion);
+        }
+    }
+    
+    _UpdateActiveRenderTagsIfChanged(renderTags);
+
+    // ------------------------------------------------------------------------
+    // Determine if we can drive the render pass using the render settings
+    // prim. The execution diverges from the task / legacy render settings
+    // map data flow and is handled explicitly below.
+    //
+    // NOTE: Current support is limited.
+    //       See HdPrman_RenderSettings::DriveRenderPass.
+    //
+    const HdRenderPassAovBindingVector &aovBindings =
+        renderPassState->GetAovBindings();
+    const bool passHasAovBindings = !aovBindings.empty();
+
+    // Solaris uses the legacy render settings map to specify render products.
+    // Don't use the render settings prim even if we can in this scenario.
+    _LegacyRenderProducts legacyProducts;
+    const bool hasLegacyProducts =
+        _HasLegacyRenderProducts(renderDelegate, &legacyProducts);
+
+    VtDictionary legacyRenderSpec;
+    const bool hasLegacyRenderSpec =
+        _HasLegacyRenderSpec(renderDelegate, &legacyRenderSpec);
+
+    const bool isInteractive = renderDelegate->IsInteractive();
+
+    HdPrman_RenderSettings * const rsPrim =
+        _GetDrivingRenderSettingsPrim();
+    const bool driveWithRenderSettingsPrim =
+        !hasLegacyProducts &&
+        !hasLegacyRenderSpec &&
+        rsPrim &&
+        rsPrim->DriveRenderPass(isInteractive,
+                                passHasAovBindings);
+    
+    if (driveWithRenderSettingsPrim) {
+        HdPrman_RenderParam * const param = _renderParam.get();
+        
+        const bool success =
+            rsPrim->UpdateAndRender(GetRenderIndex(), isInteractive, param);
+
+        // Mark all the associated RenderBuffers as converged since 
+        // they are not being used in favor of the RenderProducts from the
+        // RenderSettings prim.
+        // XXX When we add support to drive interactive rendering with
+        //     render settings, this workaround will need to be addressed.
+        if (success) {
+            if (passHasAovBindings) {
+                _MarkBindingsAsConverged(aovBindings, GetRenderIndex());
+            }
+            _converged = true;
+
+            return;
+        }
+        TF_WARN("Could not drive render pass successfully using render settings"
+                " prim %s. Falling back to legacy (task driven) path.\n",
+                rsPrim->GetId().GetText());
+    }
+
+    //
+    // ------------------------------------------------------------------------
+    // Update framing and window policy on the camera context.
+    // Resolve resolution prior to render view creation below.
+    //
+
+    HdPrman_CameraContext &cameraContext = _renderParam->GetCameraContext();
+    _UpdateCameraPath(renderPassState, &cameraContext);
+    const bool dataWindowChanged = _UpdateCameraFramingAndWindowPolicy(
+        renderPassState, &cameraContext);
+    const bool camChanged = cameraContext.IsInvalid();
+    cameraContext.MarkValid();
+    
+    // Data flow for resolution is a bit convoluted.
+    const GfVec2i resolution = _ResolveResolution(
+        aovBindings, GetRenderIndex(), cameraContext);
+
+    const bool resolutionChanged = _renderParam->GetResolution() != resolution;
+    if (resolutionChanged) {
+        _renderParam->SetResolution(resolution);
+    }
+    //
+    // ------------------------------------------------------------------------
+    // Create/update the Riley RenderView.
+    //
+    // There is divergence in whether the render view (and associated resouces)
+    // are always re-created or updated in the branches below and the
+    // resolution used for the render target. For the latter, we specifically
+    // update the resolution on the render view context below. 
+    //
+    if (hasLegacyProducts) {
+        // Use RenderProducts from the RenderSettingsMap (Solaris)
+        int frame =
+            renderDelegate->GetRenderSetting<int>(
+                HdPrmanRenderSettingsTokens->houdiniFrame, 1);
+        _renderParam->CreateRenderViewFromLegacyProducts(legacyProducts, frame);
+
+    } else if (!passHasAovBindings) {
+        // Note: This handles the case that we are rendering with the 
+        // render spec through the HdPrman test harness.
+
+        if (hasLegacyRenderSpec) {
+            // If we just switched from a render pass state with AOV bindings
+            // to one without, we attempt to create a new render view from
+            // the render spec - and can free the intermediate framebuffer the
+            // AOV display driver writes into.
+            //
+            const bool createRenderView =
+                _renderParam->DeleteFramebuffer() || legacySettingsChanged;
+
+            if (createRenderView) {
+                _renderParam->CreateRenderViewFromRenderSpec(legacyRenderSpec);
+            }
+        } else {
+            TF_WARN("Could not create render view because the render pass "
+                    "has no AOV bindings, driving render settings prim OR "
+                    "legacy render spec.");
+            return;
+        }
+
+    } else {
+        // Use AOV-bindings to create render view with displays that
+        // have drivers writing into the intermediate framebuffer blitted
+        // to the AOVs.
+        _renderParam->CreateFramebufferAndRenderViewFromAovs(aovBindings);
+    }
+
+    HdPrman_RenderViewContext &rvCtx = _renderParam->GetRenderViewContext();
+    if (!TF_VERIFY(rvCtx.GetRenderViewId() != riley::RenderViewId::InvalidId(),
+                   "Render view creation failed.\n")) {
+        return;
+    }
+
+    if (resolutionChanged) {
+        rvCtx.SetResolution(resolution, _renderParam->AcquireRiley());
+    }
+    //
+    // ------------------------------------------------------------------------
+
+    // XXX Integrator params are updated from certain settings on the legacy
+    //     settings map as well as the camera.
+    const bool updateIntegrators = legacySettingsChanged || camChanged;
+    if (updateIntegrators) {
+        _renderParam->UpdateIntegrator(GetRenderIndex());
+        _renderParam->UpdateQuickIntegrator(GetRenderIndex());
+
+        if (_enableQuickIntegrate)
+        {
+            _quickIntegrateTime = renderDelegate->GetRenderSetting<int>(
+                HdPrmanRenderSettingsTokens->interactiveIntegratorTimeout,
+                200) / 1000.f;
+        }
+    }
+
+    if (camChanged || resolutionChanged) {
+        riley::Riley * const riley = _renderParam->AcquireRiley();
+
+        // Resolution affects the data flow to riley in the following ways:
+        // 1. Render target size (associated with the render view)
+        // 2. The "Ri:FormatResolution" and "Ri:CropWindow" scene options
+        // 3. The "Ri:ScreenWindow" param on the riley camera
+        //
+        // (1) was handled earlier.
+        
+        // Handle (2) ...
+        if (resolutionChanged) {
+            _renderParam->GetLegacyOptions().SetIntegerArray(
+                RixStr.k_Ri_FormatResolution,
+                resolution.data(), 2);
+        }
+
+        if (resolutionChanged || dataWindowChanged) {
+            // The data window in the framing may have changed even if
+            // the resolution didn't. This will make sure the Ri:CropWindow
+            // option gets updated.
+            cameraContext.SetRileyOptionsInteractive(
+                &(_renderParam->GetLegacyOptions()),
+                resolution);
+        }
+
+        // and (3).
+        if (aovBindings.empty()) {
+            cameraContext.UpdateRileyCameraAndClipPlanes(
+                riley,
+                GetRenderIndex());
+        } else {
+            // When using AOV-bindings, we setup the camera slightly
+            // differently.
+            cameraContext.UpdateRileyCameraAndClipPlanesInteractive(
+                riley, 
+                GetRenderIndex(),
+                resolution);
+        }
+    }
+
+    // Commit updated scene options.
+    {
+        const bool updateLegacyOptions =
+            legacySettingsChanged || camChanged || resolutionChanged;
+        if (updateLegacyOptions) {
+            _renderParam->SetRileyOptions();
+        }
+    }
+
+    if (HdPrmanFramebuffer * const framebuffer =
+            _renderParam->GetFramebuffer()) {
+        if (const HdCamera * const cam =
+                cameraContext.GetCamera(GetRenderIndex())) {
+            // Update the framebuffer Z scaling
+#if HD_API_VERSION >= 44
+            framebuffer->proj = cam->ComputeProjectionMatrix();
+#else
+            framebuffer->proj = cam->GetProjectionMatrix();
+#endif
+        }
+    }
+
+    if (isInteractive) {
+        // This path uses the render thread to start the render.
+        _RestartRenderIfNecessary(renderDelegate);
+    } else {
+        _RenderInMainThread();
+    }
+    
+    if (HdPrmanFramebuffer * const framebuffer =
+            _renderParam->GetFramebuffer()) {
+        _Blit(framebuffer, aovBindings, _converged);
+    }
+}
+
+void
+HdPrman_RenderPass::_RestartRenderIfNecessary(
+    HdRenderDelegate * const renderDelegate)
+{
+    const bool needsRestart =
+        _renderParam->sceneVersion.load() != _lastRenderedVersion;
+    
+    if (needsRestart) {
+        // NOTE:
+        //
+        // _quickIntegrate enables hdPrman to go into a mode
+        // where it will switch to PxrDirectLighting
+        // integrator for a couple of interations
+        // and then switch back to PxrPathTracer/PbsPathTracer
+        // The thinking is that we want to use PxrDirectLighting for quick
+        // camera tumbles. To enable this mode, the 
+        // HD_PRMAN_ENABLE_QUICKINTEGRATE (bool) env var must be set.
+        
+        // Start renders using the quick integrator if:
+        // - the corresponding env var is enabled
+        // - the time out is positive
+        // - the main integrator is an (expensive) primary integrator.
+        const bool useQuickIntegrator =
+            _enableQuickIntegrate && 
+            _quickIntegrateTime > 0 &&
+            _UsesPrimaryIntegrator(renderDelegate);
+        const riley::IntegratorId integratorId =
+            useQuickIntegrator
+                ? _renderParam->GetQuickIntegratorId()
+                : _renderParam->GetIntegratorId();
+        if (integratorId != _renderParam->GetActiveIntegratorId()) {
+            _renderParam->SetActiveIntegratorId(integratorId);
+        }
+
+        _renderParam->StartRender();
+        _frameStart = std::chrono::steady_clock::now();
+    } else {
+        // If we are using the quick integrator...
+        if (_renderParam->GetActiveIntegratorId() !=
+                _renderParam->GetIntegratorId()) {
+            // ... and the quick integrate time has passed, ...
+            if (_DiffTimeToNow(_frameStart) > _quickIntegrateTime) {
+                // Set the active integrator.
+                // Note that SetActiveIntegrator is stopping the renderer
+                // (implicitly through AcquireRiley).
+                _renderParam->SetActiveIntegratorId(
+                    _renderParam->GetIntegratorId());
+                _renderParam->StartRender();
+            }
+        }
+    }
+
+    // We need to capture the value of sceneVersion here after all
+    // the above calls to AcquireRiley since AcquireRiley increases
+    // the sceneVersion. Note that setting the call to SetActiveIntegratorId
+    // is also implicitly calling AcquireRiley.
+    _lastRenderedVersion = _renderParam->sceneVersion.load();
+
+    _converged =
+        (_renderParam->GetActiveIntegratorId() ==
+         _renderParam->GetIntegratorId())
+        && !_renderParam->IsRendering();
+}
+
+void
+HdPrman_RenderPass::_RenderInMainThread()
+{
+    riley::Riley * const riley = _renderParam->AcquireRiley();
+
+    _renderParam->SetActiveIntegratorId(
+        _renderParam->GetIntegratorId());
+    
+    HdPrman_RenderViewContext &ctx =
+        _renderParam->GetRenderViewContext();
+    
+    const riley::RenderViewId renderViews[] = { ctx.GetRenderViewId() };
+    
+    RtParamList renderOptions;
+    static RtUString const US_RENDERMODE("renderMode");
+    static RtUString const US_BATCH("batch");   
+    renderOptions.SetString(US_RENDERMODE, US_BATCH);   
+    
+    riley->Render(
+        {static_cast<uint32_t>(TfArraySize(renderViews)), renderViews},
+        renderOptions);
+    
+    _converged = true;
+}
+
+// XXX Data flow for purpose is currently using the task's render tags.
+//     Update to factor render settings prim's opinion.
+void
+HdPrman_RenderPass::_UpdateActiveRenderTagsIfChanged(
+    const TfTokenVector& taskRenderTags)
+{
+    const int taskRenderTagsVersion =
+        GetRenderIndex()->GetChangeTracker().GetTaskRenderTagsVersion();
+    const int rprimRenderTagVersion =
+            GetRenderIndex()->GetChangeTracker().GetRenderTagVersion();
+    if ((taskRenderTagsVersion != _lastTaskRenderTagsVersion) ||
+        (rprimRenderTagVersion != _lastRprimRenderTagVersion)) {
+        _renderParam->SetActiveRenderTags(taskRenderTags, GetRenderIndex());
+        _lastTaskRenderTagsVersion = taskRenderTagsVersion;
+        _lastRprimRenderTagVersion = rprimRenderTagVersion;
+    }
+}
+
+HdPrman_RenderSettings*
+HdPrman_RenderPass::_GetDrivingRenderSettingsPrim() const
+{
+    return dynamic_cast<HdPrman_RenderSettings*>(
+        GetRenderIndex()->GetBprim(HdPrimTypeTokens->renderSettings,
+        _renderParam->GetDrivingRenderSettingsPrimPath()));
+}
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderPass.h b/third_party/renderman-26/plugin/hdPrman/renderPass.h
new file mode 100644
index 0000000000..71e2aaecce
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderPass.h
@@ -0,0 +1,69 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_H
+
+#include "pxr/imaging/hd/renderPass.h"
+
+#include "pxr/base/tf/token.h"
+
+#include "pxr/pxr.h"
+
+#include <chrono>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_RenderParam;
+class HdPrman_CameraContext;
+class HdPrman_RenderSettings;
+
+class HdPrman_RenderPass final : public HdRenderPass
+{
+public:
+    HdPrman_RenderPass(
+        HdRenderIndex *index,
+        HdRprimCollection const &collection,
+        std::shared_ptr<HdPrman_RenderParam> renderParam);
+    ~HdPrman_RenderPass() override;
+
+    bool IsConverged() const override;
+
+protected:
+    void _Execute(HdRenderPassStateSharedPtr const &renderPassState,
+                  TfTokenVector const &renderTags) override;
+
+private:
+    void _RenderInMainThread();
+    void _RestartRenderIfNecessary(HdRenderDelegate *renderDelegate);
+
+    // Helpers to update the Camera Context inside _Execute()
+    void _UpdateCameraPath(
+        const HdRenderPassStateSharedPtr &renderPassState,
+        HdPrman_CameraContext *cameraContext);
+    
+    bool _UpdateCameraFramingAndWindowPolicy(
+        const HdRenderPassStateSharedPtr &renderPassState,
+        HdPrman_CameraContext *cameraContext);
+
+    void _UpdateActiveRenderTagsIfChanged(
+        const TfTokenVector& taskRenderTags);
+
+    HdPrman_RenderSettings* _GetDrivingRenderSettingsPrim() const;
+
+    std::shared_ptr<HdPrman_RenderParam> _renderParam;
+    bool _converged;
+    int _lastRenderedVersion;
+    int _lastTaskRenderTagsVersion;
+    int _lastRprimRenderTagVersion;
+
+    std::chrono::steady_clock::time_point _frameStart;
+    float _quickIntegrateTime;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndex.cpp b/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndex.cpp
new file mode 100644
index 0000000000..b62ce89a10
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndex.cpp
@@ -0,0 +1,548 @@
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/renderPassSceneIndex.h"
+#include "hdPrman/tokens.h"
+
+#include "pxr/imaging/hd/version.h"
+
+#include "pxr/base/tf/smallVector.h"
+#include "pxr/imaging/hd/collectionSchema.h"
+#include "pxr/imaging/hd/collectionsSchema.h"
+#include "pxr/imaging/hd/containerDataSourceEditor.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+#include "pxr/imaging/hd/dependenciesSchema.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/primvarsSchema.h"
+#include "pxr/imaging/hd/renderPassSchema.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneGlobalsSchema.h"
+#include "pxr/imaging/hd/sceneIndexPrimView.h"
+#include "pxr/imaging/hd/schema.h" 
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/visibilitySchema.h"
+#include "pxr/imaging/hdsi/utils.h"
+#include "pxr/base/trace/trace.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (renderVisibility)
+    (cameraVisibility)
+    (matte)
+    (prune)
+    ((riAttributesRiMatte, "ri:attributes:Ri:Matte"))
+    ((riAttributesVisibilityCamera, "ri:attributes:visibility:camera"))
+);
+
+/* static */
+HdPrman_RenderPassSceneIndexRefPtr
+HdPrman_RenderPassSceneIndex::New(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    return TfCreateRefPtr(  
+        new HdPrman_RenderPassSceneIndex(inputSceneIndex));
+}
+
+HdPrman_RenderPassSceneIndex::HdPrman_RenderPassSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputSceneIndex)
+: HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+{
+}
+
+static bool
+_IsGeometryType(const TfToken &primType)
+{
+    // Additional gprim types supported by HdPrman, beyond those in
+    // HdPrimTypeIsGprim().
+    static const TfTokenVector extraGeomTypes = {
+        HdPrimTypeTokens->cone,
+        HdPrimTypeTokens->cylinder,
+        HdPrimTypeTokens->sphere,
+        HdPrmanTokens->meshLightSourceMesh,
+        HdPrmanTokens->meshLightSourceVolume
+    };
+    return HdPrimTypeIsGprim(primType) ||
+        std::find(extraGeomTypes.begin(), extraGeomTypes.end(), primType)
+            != extraGeomTypes.end();
+}
+
+// Returns true if the renderVisibility rules apply to this prim type.
+static bool
+_ShouldApplyPassVisibility(const TfToken &primType)
+{
+    return _IsGeometryType(primType) || HdPrimTypeIsLight(primType) ||
+        primType == HdPrimTypeTokens->lightFilter;
+}
+
+static bool
+_IsVisible(const HdContainerDataSourceHandle& primSource)
+{
+    if (const auto visSchema = HdVisibilitySchema::GetFromParent(primSource)) {
+        if (const HdBoolDataSourceHandle visDs = visSchema.GetVisibility()) {
+            return visDs->GetTypedValue(0.0f);
+        }
+    }
+    return true;
+}
+
+static bool
+_IsVisibleToCamera(const HdContainerDataSourceHandle& primSource)
+{
+    // XXX Primvar queries like this might be a good candidate for
+    // helper API in hdsi/utils.h.
+    if (const HdPrimvarsSchema primvarsSchema =
+        HdPrimvarsSchema::GetFromParent(primSource)) {
+        if (HdPrimvarSchema primvarSchema =
+            primvarsSchema.GetPrimvar(_tokens->riAttributesVisibilityCamera)) {
+            if (const auto sampledDataSource =
+                primvarSchema.GetPrimvarValue()) {
+                const VtValue value = sampledDataSource->GetValue(0);
+                if (!value.IsEmpty()) {
+                    if (value.IsHolding<VtArray<bool>>()) {
+                        return value.UncheckedGet<bool>();
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+bool
+HdPrman_RenderPassSceneIndex::_RenderPassState::DoesOverrideMatte(
+    SdfPath const& primPath,
+    HdSceneIndexPrim const& prim) const
+{
+    return matteEval
+        && _IsGeometryType(prim.primType)
+        && matteEval->Match(primPath);
+}
+
+bool
+HdPrman_RenderPassSceneIndex::_RenderPassState::DoesOverrideVis(
+    SdfPath const& primPath,
+    HdSceneIndexPrim const& prim) const
+{
+    return renderVisEval
+        && _ShouldApplyPassVisibility(prim.primType)
+        && !renderVisEval->Match(primPath)
+        && _IsVisible(prim.dataSource);
+}
+
+bool
+HdPrman_RenderPassSceneIndex::_RenderPassState::DoesOverrideCameraVis(
+    SdfPath const& primPath,
+    HdSceneIndexPrim const& prim) const
+{
+    return cameraVisEval
+        && _ShouldApplyPassVisibility(prim.primType)
+        && !cameraVisEval->Match(primPath)
+        && _IsVisibleToCamera(prim.dataSource);
+}
+
+bool
+HdPrman_RenderPassSceneIndex::_RenderPassState::DoesPrune(
+    SdfPath const& primPath) const
+{
+    return pruneEval && pruneEval->Match(primPath);
+}
+
+HdSceneIndexPrim 
+HdPrman_RenderPassSceneIndex::GetPrim(
+    const SdfPath &primPath) const
+{
+    // Pruning
+    //
+    // Note that we also apply pruning in GetChildPrimPaths(), but
+    // this ensures that even if a downstream scene index asks
+    // for a pruned path, it will remain pruned.
+    if (_activeRenderPass.DoesPrune(primPath)) {
+        return HdSceneIndexPrim();
+    }
+
+    HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+
+    // Temp storage for overriding primvars.
+    TfSmallVector<TfToken, 2> primvarNames;
+    TfSmallVector<HdDataSourceBaseHandle, 2> primvarVals;
+
+    // Render Visibility -> HdVisibilitySchema
+    //
+    // Renderable prims that are visible in the upstream scene index,
+    // but excluded from the pass renderVisibility collection, get their
+    // visibility overriden to 0.
+    //
+    if (_activeRenderPass.DoesOverrideVis(primPath, prim)) {
+        static const HdContainerDataSourceHandle invisDs =
+            HdRetainedContainerDataSource::New(
+                HdVisibilitySchema::GetSchemaToken(),
+                HdVisibilitySchema::Builder()
+                    .SetVisibility(
+                        HdRetainedTypedSampledDataSource<bool>::New(0))
+                    .Build());
+        prim.dataSource =
+            HdOverlayContainerDataSource::New(invisDs, prim.dataSource);
+    }
+
+    // Camera Visibility -> ri:visibility:camera
+    //
+    // Renderable prims that are camera-visible in the upstream scene index,
+    // but excluded from the pass cameraVisibility collection, get their
+    // riAttributesVisibilityCamera primvar overriden to 0.
+    //
+    if (_activeRenderPass.DoesOverrideCameraVis(primPath, prim)) {
+        static const HdContainerDataSourceHandle cameraInvisDs =
+            HdPrimvarSchema::Builder()
+                .SetPrimvarValue(
+                    HdRetainedTypedSampledDataSource<int>::New(0))
+                .SetInterpolation(
+                    HdPrimvarSchema::BuildInterpolationDataSource(
+                        HdPrimvarSchemaTokens->constant))
+                .Build();
+        primvarNames.push_back(_tokens->riAttributesVisibilityCamera);
+        primvarVals.push_back(cameraInvisDs);
+    }
+
+    // Matte -> ri:Matte
+    //
+    // If the matte pattern matches this prim, set ri:Matte=1.
+    // Matte only applies to geometry types.
+    // We do not bother to check if the upstream prim already
+    // has matte set since that is essentially never the case.
+    //
+    if (_activeRenderPass.DoesOverrideMatte(primPath, prim)) {
+        static const HdContainerDataSourceHandle matteDs =
+            HdPrimvarSchema::Builder()
+                .SetPrimvarValue(
+                    HdRetainedTypedSampledDataSource<int>::New(1))
+                .SetInterpolation(HdPrimvarSchema::
+                    BuildInterpolationDataSource(
+                        HdPrimvarSchemaTokens->constant))
+                .Build();
+        primvarNames.push_back(_tokens->riAttributesRiMatte);
+        primvarVals.push_back(matteDs);
+    }
+
+    // Apply any accumulated primvar overrides.
+    if (!primvarNames.empty()) {
+        prim.dataSource =
+            HdOverlayContainerDataSource::New(
+                HdRetainedContainerDataSource::New(
+                    HdPrimvarsSchema::GetSchemaToken(),
+                    HdPrimvarsSchema::BuildRetained(
+                        primvarNames.size(),
+                        primvarNames.data(),
+                        primvarVals.data())),
+                prim.dataSource);
+    }
+
+    return prim;
+}
+
+SdfPathVector 
+HdPrman_RenderPassSceneIndex::GetChildPrimPaths(
+    const SdfPath &primPath) const
+{
+    if (_activeRenderPass.pruneEval) {
+        SdfPathVector childPathVec =
+            _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+        HdsiUtilsRemovePrunedChildren(primPath, *_activeRenderPass.pruneEval,
+                                      &childPathVec);
+        return childPathVec;
+    } else {
+        return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+    }
+}
+
+/*
+
+General notes on change processing and invalidation:
+
+- Rather than lazily evaluate the active render pass state,
+  and be prepared to do so from multiple caller threads, we
+  instead greedily set up the active render pass state.
+  Though greedy, this is a small amount of computation,
+  and only triggered on changes to two specific scene locations:
+  the root scope where HdSceneGlobalsSchema lives, and the
+  scope where the designated active render pass lives.
+
+- The list of entries for prims added, dirtied, or removed
+  must be filtered against the active render pass prune collection.
+
+- The list of entries for prims added, dirtied, or removed
+  can imply changes to which render pass is active, or to the
+  contents of the active render pass.  In either case, if the
+  effective render pass state changes, downstream observers
+  must be notified about the effects.
+
+*/
+
+// Helper to scan an entry vector for an entry that
+// could affect the active render pass.
+template <typename ENTRIES>
+inline static bool
+_EntryCouldAffectPass(
+    const ENTRIES &entries,
+    SdfPath const& activeRenderPassPath)
+{
+    for (const auto& entry: entries) {
+        // The prim at the root path contains the HdSceneGlobalsSchema.
+        // The prim at the render pass path controls its behavior.
+        if (entry.primPath.IsAbsoluteRootPath()
+            || entry.primPath == activeRenderPassPath) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// Helper to apply pruning to an entry list.
+// Returns true if any pruning was applied, putting surviving entries
+// into *postPruneEntries.
+template <typename ENTRIES>
+inline static bool
+_PruneEntries(
+    std::optional<HdCollectionExpressionEvaluator> &pruneEval,
+    const ENTRIES &entries, ENTRIES *postPruneEntries)
+{
+    if (!pruneEval) {
+        // No pruning active.
+        return false;
+    }
+    // Pre-pass to see if any prune applies to the list.
+    bool foundEntryToPrune = false;
+    for (const auto& entry: entries) {
+        if (pruneEval->Match(entry.primPath)) {
+            foundEntryToPrune = true;
+            break;
+        }
+    }
+    if (!foundEntryToPrune) {
+        // No entries to prune.
+        return false;
+    } else {
+        // Prune matching entries.
+        for (const auto& entry: entries) {
+            if (!pruneEval->Match(entry.primPath)) {
+                // Accumulate survivors.
+                postPruneEntries->push_back(entry);
+            }
+        }
+        return true;
+    }
+}
+
+void
+HdPrman_RenderPassSceneIndex::_PrimsAdded(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::AddedPrimEntries &entries)
+{    
+    HdSceneIndexObserver::AddedPrimEntries extraAddedEntries;
+    HdSceneIndexObserver::DirtiedPrimEntries extraDirtyEntries;
+    HdSceneIndexObserver::RemovedPrimEntries extraRemovedEntries;
+
+    // Check if any entry could affect the active render pass.
+    if (_EntryCouldAffectPass(entries, _activeRenderPass.renderPassPath)) {
+        _UpdateActiveRenderPassState(
+            &extraAddedEntries, &extraDirtyEntries, &extraRemovedEntries);
+    }
+
+    // Filter entries against any active render pass prune collection.
+    if (!_PruneEntries(_activeRenderPass.pruneEval, entries,
+                       &extraAddedEntries)) {
+        _SendPrimsAdded(entries);
+    }
+
+    _SendPrimsAdded(extraAddedEntries);
+    _SendPrimsRemoved(extraRemovedEntries);
+    _SendPrimsDirtied(extraDirtyEntries);
+}
+
+void 
+HdPrman_RenderPassSceneIndex::_PrimsRemoved(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::RemovedPrimEntries &entries)
+{
+    HdSceneIndexObserver::AddedPrimEntries extraAddedEntries;
+    HdSceneIndexObserver::DirtiedPrimEntries extraDirtyEntries;
+    HdSceneIndexObserver::RemovedPrimEntries extraRemovedEntries;
+
+    // Check if any entry could affect the active render pass.
+    if (_EntryCouldAffectPass(entries, _activeRenderPass.renderPassPath)) {
+        _UpdateActiveRenderPassState(
+            &extraAddedEntries, &extraDirtyEntries, &extraRemovedEntries);
+    }
+
+    // Filter entries against any active render pass prune collection.
+    if (!_PruneEntries(_activeRenderPass.pruneEval, entries,
+                       &extraRemovedEntries)) {
+        _SendPrimsRemoved(entries);
+    }
+
+    _SendPrimsAdded(extraAddedEntries);
+    _SendPrimsRemoved(extraRemovedEntries);
+    _SendPrimsDirtied(extraDirtyEntries);
+}
+
+void
+HdPrman_RenderPassSceneIndex::_PrimsDirtied(
+    const HdSceneIndexBase &sender,
+    const HdSceneIndexObserver::DirtiedPrimEntries &entries)
+{
+    HdSceneIndexObserver::AddedPrimEntries extraAddedEntries;
+    HdSceneIndexObserver::DirtiedPrimEntries extraDirtyEntries;
+    HdSceneIndexObserver::RemovedPrimEntries extraRemovedEntries;
+
+    // Check if any entry could affect the active render pass.
+    if (_EntryCouldAffectPass(entries, _activeRenderPass.renderPassPath)) {
+        _UpdateActiveRenderPassState(
+            &extraAddedEntries, &extraDirtyEntries, &extraRemovedEntries);
+    }
+
+    // Filter entries against any active render pass prune collection.
+    if (!_PruneEntries(_activeRenderPass.pruneEval, entries,
+                       &extraDirtyEntries)) {
+        _SendPrimsDirtied(entries);
+    }
+
+    _SendPrimsAdded(extraAddedEntries);
+    _SendPrimsRemoved(extraRemovedEntries);
+    _SendPrimsDirtied(extraDirtyEntries);
+}
+
+HdPrman_RenderPassSceneIndex::~HdPrman_RenderPassSceneIndex() = default;
+
+// Helper method to compile a collection evaluator.
+static void
+_CompileCollection(
+    HdCollectionsSchema &collections,
+    TfToken const& collectionName,
+    HdSceneIndexBaseRefPtr const& sceneIndex,
+    SdfPathExpression *expr,
+    std::optional<HdCollectionExpressionEvaluator> *eval)
+{
+    if (HdCollectionSchema collection =
+        collections.GetCollection(collectionName)) {
+        if (HdPathExpressionDataSourceHandle pathExprDs =
+            collection.GetMembershipExpression()) {
+            *expr = pathExprDs->GetTypedValue(0.0);
+            if (!expr->IsEmpty()) {
+                *eval = HdCollectionExpressionEvaluator(sceneIndex, *expr);
+            }
+        }
+    }
+}
+
+void
+HdPrman_RenderPassSceneIndex::_UpdateActiveRenderPassState(
+    HdSceneIndexObserver::AddedPrimEntries *addedEntries,
+    HdSceneIndexObserver::DirtiedPrimEntries *dirtyEntries,
+    HdSceneIndexObserver::RemovedPrimEntries *removedEntries)
+{
+    TRACE_FUNCTION();
+
+    // Swap out the prior pass state to compare against.
+    _RenderPassState &state = _activeRenderPass;
+    _RenderPassState priorState;
+    std::swap(state, priorState);
+
+    // Check upstream scene index for an active render pass.
+    HdSceneIndexBaseRefPtr inputSceneIndex = _GetInputSceneIndex();
+    HdSceneGlobalsSchema globals =
+        HdSceneGlobalsSchema::GetFromSceneIndex(inputSceneIndex);
+    if (HdPathDataSourceHandle pathDs = globals.GetActiveRenderPassPrim()) {
+        state.renderPassPath = pathDs->GetTypedValue(0.0);
+    }
+    if (state.renderPassPath.IsEmpty() && priorState.renderPassPath.IsEmpty()) {
+        // Avoid further work if no render pass was or is active.
+        return;
+    }
+    if (!state.renderPassPath.IsEmpty()) {
+        const HdSceneIndexPrim passPrim =
+            inputSceneIndex->GetPrim(state.renderPassPath);
+        if (HdCollectionsSchema collections =
+            HdCollectionsSchema::GetFromParent(passPrim.dataSource)) {
+            // Prepare evaluators for render pass collections.
+            _CompileCollection(collections, _tokens->matte,
+                               inputSceneIndex,
+                               &state.matteExpr,
+                               &state.matteEval);
+            _CompileCollection(collections, _tokens->renderVisibility,
+                               inputSceneIndex,
+                               &state.renderVisExpr,
+                               &state.renderVisEval);
+            _CompileCollection(collections, _tokens->cameraVisibility,
+                               inputSceneIndex,
+                               &state.cameraVisExpr,
+                               &state.cameraVisEval);
+            _CompileCollection(collections, _tokens->prune,
+                               inputSceneIndex,
+                               &state.pruneExpr,
+                               &state.pruneEval);
+        }
+    }
+
+    // Short-circuit the analysis below based on which patterns changed.
+    const bool visOrMatteExprDidChange =
+        state.matteExpr != priorState.matteExpr ||
+        state.renderVisExpr != priorState.renderVisExpr ||
+        state.cameraVisExpr != priorState.cameraVisExpr;
+
+    if (state.pruneExpr == priorState.pruneExpr && !visOrMatteExprDidChange) {
+        // No patterns changed; nothing to invalidate.
+        return;
+    }
+
+    // Generate change entries for affected prims.
+    // Consider all upstream prims.
+    //
+    // TODO: HdCollectionExpressionEvaluator::PopulateAllMatches()
+    // should be used here instead, since in the future it will handle
+    // instance matches as well as parallel traversal.
+    //
+    for (const SdfPath &path: HdSceneIndexPrimView(_GetInputSceneIndex())) {
+        if (priorState.DoesPrune(path)) {
+            // The prim had been pruned.
+            if (!state.DoesPrune(path)) {
+                // The prim is no longer pruned, so add it back.
+                HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(path);
+                addedEntries->push_back({path, prim.primType});
+            } else {
+                // The prim is still pruned, so nothing to do.
+            }
+        } else if (state.DoesPrune(path)) {
+            // The prim is newly pruned, so remove it.
+            removedEntries->push_back({path});
+        } else if (visOrMatteExprDidChange) {
+            // Determine which (if any) locators on the upstream prim
+            // are dirtied by the change in render pass state.
+            const HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(path);
+            const bool visibilityDidChange =
+                (priorState.DoesOverrideVis(path, prim)
+                 != state.DoesOverrideVis(path, prim));
+            const bool primvarsDidChange =
+                (priorState.DoesOverrideCameraVis(path, prim)
+                 != state.DoesOverrideCameraVis(path, prim)) ||
+                (priorState.DoesOverrideMatte(path, prim)
+                 != state.DoesOverrideMatte(path, prim));
+            if (primvarsDidChange || visibilityDidChange) {
+                HdDataSourceLocatorSet locators;
+                if (primvarsDidChange) {
+                    locators.insert(HdPrimvarsSchema::GetDefaultLocator());
+                }
+                if (visibilityDidChange) {
+                    locators.insert(HdVisibilitySchema::GetDefaultLocator());
+                }
+               dirtyEntries->push_back({path, locators});
+            }
+        }
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndex.h b/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndex.h
new file mode 100644
index 0000000000..23d80cdcb3
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndex.h
@@ -0,0 +1,93 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/collectionExpressionEvaluator.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include <optional>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DECLARE_REF_PTRS(HdPrman_RenderPassSceneIndex);
+
+/// HdPrman_RenderPassSceneIndex applies the active render pass
+/// specified in the HdSceneGlobalsSchema, modifying the scene
+/// contents as needed.
+///
+class HdPrman_RenderPassSceneIndex : 
+    public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static HdPrman_RenderPassSceneIndexRefPtr
+    New(const HdSceneIndexBaseRefPtr& inputSceneIndex);
+
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override;
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override;
+
+protected:
+    HdPrman_RenderPassSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex);
+    ~HdPrman_RenderPassSceneIndex();
+
+    void _PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::AddedPrimEntries &entries) override;
+    void _PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::RemovedPrimEntries &entries) override;
+    void _PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries &entries) override;
+
+private:
+    // State specified by a render pass.
+    // If renderPassPath is the empty path, no render pass is active.
+    // Collection evaluators are set sparsely, corresponding to
+    // the presence of the collection in the render pass schema.
+    struct _RenderPassState {
+        SdfPath renderPassPath;
+
+        // Retain the expressions so we can compare old vs. new state.
+        SdfPathExpression matteExpr;
+        SdfPathExpression renderVisExpr;
+        SdfPathExpression cameraVisExpr;
+        SdfPathExpression pruneExpr;
+
+        // Evalulators for each pattern expression.
+        std::optional<HdCollectionExpressionEvaluator> matteEval;
+        std::optional<HdCollectionExpressionEvaluator> renderVisEval;
+        std::optional<HdCollectionExpressionEvaluator> cameraVisEval;
+        std::optional<HdCollectionExpressionEvaluator> pruneEval;
+
+        bool DoesOverrideMatte(
+            const SdfPath &primPath,
+            HdSceneIndexPrim const& prim) const;
+        bool DoesOverrideVis(
+            const SdfPath &primPath,
+            HdSceneIndexPrim const& prim) const;
+        bool DoesOverrideCameraVis(
+            const SdfPath &primPath,
+            HdSceneIndexPrim const& prim) const;
+        bool DoesPrune(
+            const SdfPath &primPath) const;
+    };
+
+    // Pull on the scene globals schema for the active render pass,
+    // computing and caching its state in _activeRenderPass.
+    void _UpdateActiveRenderPassState(
+        HdSceneIndexObserver::AddedPrimEntries *addedEntries,
+        HdSceneIndexObserver::DirtiedPrimEntries *dirtyEntries,
+        HdSceneIndexObserver::RemovedPrimEntries *removedEntries);
+
+    // State for the active render pass.
+    _RenderPassState _activeRenderPass;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..4a4d34ffaf
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndexPlugin.cpp
@@ -0,0 +1,53 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/renderPassSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "hdPrman/renderPassSceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_RenderPassSceneIndexPlugin"))
+);
+
+static const char * const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry
+        ::Define<HdPrman_RenderPassSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // We need an "insertion point" that's *after* general material resolve.
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 115;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr, // No input args.
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+HdPrman_RenderPassSceneIndexPlugin::
+HdPrman_RenderPassSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_RenderPassSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdPrman_RenderPassSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndexPlugin.h
new file mode 100644
index 0000000000..5cee5b9ab8
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderPassSceneIndexPlugin.h
@@ -0,0 +1,34 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_RenderPassSceneIndexPlugin
+///
+/// Applies the active scene index in HdSceneGlobalsSchema
+/// to the scene contents.
+///
+class HdPrman_RenderPassSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_RenderPassSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/renderSettings.cpp b/third_party/renderman-26/plugin/hdPrman/renderSettings.cpp
new file mode 100644
index 0000000000..0127d5ec72
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderSettings.cpp
@@ -0,0 +1,602 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/renderSettings.h"
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/debugUtil.h"
+#include "hdPrman/camera.h"
+#include "hdPrman/cameraContext.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/renderViewContext.h"
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/cameraSchema.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+#include "pxr/imaging/hd/sceneDelegate.h"
+#include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexPrimView.h"
+#include "pxr/imaging/hd/utils.h"
+#include "pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.h"
+
+#include "pxr/base/tf/getenv.h"
+#include "pxr/base/tf/envSetting.h"
+
+#include <string>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// This env var exists only to compare results from driving the render pass 
+// using the task's aov bindings v/s using the render settings prim.
+// This is currently relevant and limited to non-interactive rendering
+// (e.g., in an application like usdrecord).
+//
+// See DriveRenderPass(..) below for more info.
+// 
+TF_DEFINE_ENV_SETTING(HD_PRMAN_RENDER_SETTINGS_DRIVE_RENDER_PASS, false,
+                      "Drive the render pass using the first RenderProduct on "
+                      "the render settings prim when the render pass has "
+                      "AOV bindings.");
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _renderTerminalTokens, // properties in PxrRenderTerminalsAPI
+    ((outputsRiIntegrator, "outputs:ri:integrator"))
+    ((outputsRiSampleFilters, "outputs:ri:sampleFilters"))
+    ((outputsRiDisplayFilters, "outputs:ri:displayFilters"))
+);
+
+
+namespace {
+
+// Translate properties in PxrOptionsAPI to the Riley name.
+RtUString
+_GetRiName(std::string const &propertyName)
+{
+    // strip the "ri:" prefix if present, but don't strip the "Ri:" namespace.
+    // e.g. schema attribute "ri:hider:maxsamples" maps to "hider:maxsamples"
+    //      (or the pre-defined UString Rix::k_hider_maxsamples)
+    //      while "ri:Ri:CropWindow" maps to "Ri:CropWindow" (or
+    //      the UString k_riCropWindow)
+    //
+    if (TfStringStartsWith(propertyName, "ri:")) {
+        return RtUString(propertyName.c_str() + 3);
+    }
+
+    // Unhandled property. This likely indicates an issue with namespace 
+    // filtering upstream.
+    TF_WARN("Could not translate settings property %s to RtUString.",
+            propertyName.c_str());
+    return RtUString(propertyName.c_str());
+}
+
+RtParamList
+_GenerateParamList(VtDictionary const &settings)
+{
+    RtParamList options;
+
+    for (auto const &pair : settings) {
+        // Skip render terminal connections.
+        const std::string &name = pair.first;
+        const TfToken tokenName(name);
+        if (tokenName == _renderTerminalTokens->outputsRiIntegrator    ||
+            tokenName == _renderTerminalTokens->outputsRiSampleFilters ||
+            tokenName == _renderTerminalTokens->outputsRiDisplayFilters) {
+
+            continue;
+        }
+
+        RtUString const riName = _GetRiName(name);
+        VtValue const &val = pair.second;
+        HdPrman_Utils::SetParamFromVtValue(
+            riName, val, /* role */ TfToken(), &options);
+    }
+
+    return options;
+}
+
+GfVec2i
+_MultiplyAndRound(const GfVec2f &a, const GfVec2i &b)
+{
+    return GfVec2i(std::roundf(a[0] * b[0]),
+                   std::roundf(a[1] * b[1]));
+}
+
+bool
+_HasNonFallbackRenderSettingsPrim(const HdSceneIndexBaseRefPtr &si)
+{
+    if (!si) {
+        return false;
+    }
+    
+    const SdfPath &renderScope =
+        HdsiRenderSettingsFilteringSceneIndex::GetRenderScope();
+    const SdfPath &fallbackPrimPath =
+        HdsiRenderSettingsFilteringSceneIndex::GetFallbackPrimPath();
+
+    for (const SdfPath &path : HdSceneIndexPrimView(si, renderScope)) {
+        if (path != fallbackPrimPath &&
+            si->GetPrim(path).primType == HdPrimTypeTokens->renderSettings) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// Update the camera path, framing and shutter curve on the camera context from
+// the render product.
+void
+_UpdateCameraContextFromProduct(
+    HdRenderSettings::RenderProduct const &product,
+    HdPrman_CameraContext *cameraContext)
+{
+    TF_DEBUG(HDPRMAN_RENDER_PASS).Msg(
+        "Updating camera context from product %s\n", product.name.GetText());
+
+    GfVec2i const &resolution = product.resolution;
+    const GfRange2f displayWindow(GfVec2f(0.0f), GfVec2f(resolution));
+    const GfRange2f dataWindowNDC = product.dataWindowNDC;
+    const GfRect2i dataWindow(
+        _MultiplyAndRound(dataWindowNDC.GetMin(), resolution),
+        _MultiplyAndRound(dataWindowNDC.GetMax(), resolution) - GfVec2i(1));
+
+    // Set the camera path to allow UpdateRileyCameraAndClipPlanes to fetch
+    // necessary data from the camera Sprim.
+    cameraContext->SetCameraPath(product.cameraPath);
+    cameraContext->SetFraming(
+        CameraUtilFraming(
+            displayWindow, dataWindow, product.pixelAspectRatio));
+    cameraContext->SetWindowPolicy(
+        HdUtils::ToConformWindowPolicy(product.aspectRatioConformPolicy));
+#if HD_API_VERSION >= 64
+    cameraContext->SetDisableDepthOfField(product.disableDepthOfField);
+#endif
+}
+
+// Update the riley camera params using state on the camera Sprim and the
+// camera context.
+void
+_UpdateRileyCamera(
+    riley::Riley *riley,
+    const HdRenderIndex *renderIndex,
+    const SdfPath &cameraPathFromProduct,
+    HdPrman_CameraContext *cameraContext)
+{
+    if (cameraContext->IsInvalid()) {
+        TF_DEBUG(HDPRMAN_RENDER_PASS).Msg(
+            "Updating riley camera %u using camera prim %s\n",
+            cameraContext->GetCameraId().AsUInt32(),
+            cameraContext->GetCameraPath().GetText());
+
+        cameraContext->UpdateRileyCameraAndClipPlanes(riley, renderIndex);
+        cameraContext->MarkValid();
+    }
+}
+
+// Update the Frame number from the Stage Global Scene Index
+void
+_UpdateFrame(
+    const HdSceneIndexBaseRefPtr &terminalSi,
+    RtParamList *options)
+{
+    // Get the Frame from the Terminal Scene Index 
+    double frame;
+    if (!HdUtils::GetCurrentFrame(terminalSi, &frame)) {
+        return;
+    }
+
+    // k_Ri_Frame in Riley is an integer, not float.
+    // As an explicit policy choice, round down.
+    const int intFrame(floor(frame));
+
+    // Store on the options list to be used in a later Riley.SetOptions() call 
+    HdPrman_Utils::SetParamFromVtValue(
+        RixStr.k_Ri_Frame, VtValue(intFrame),
+        /* role */ TfToken(), options);
+}
+
+// Create/update the render view and associated resources based on the
+// render product.
+void
+_UpdateRenderViewContext(
+    HdRenderSettings::RenderProduct const &product,
+    HdPrman_RenderParam *param,
+    HdPrman_RenderViewContext *renderViewContext)
+{
+    // The (lone) render view is managed by render param currently.
+    param->CreateRenderViewFromRenderSettingsProduct(
+        product, renderViewContext);
+}
+
+// Factor the product's motion blur opinion and camera's shutter.
+GfVec2f
+_ResolveShutterInterval(
+    HdRenderSettings::RenderProduct const &product,
+    HdPrman_CameraContext const &cameraContext,
+    HdRenderIndex const *renderIndex)
+{
+    if (product.disableMotionBlur) {
+        return GfVec2f(0.f);
+    }
+
+    GfVec2f shutter(0.0f, 0.5f); // fallback 180' shutter.
+    if (const HdCamera * const camera =
+            cameraContext.GetCamera(renderIndex)) {
+        shutter[0] = camera->GetShutterOpen();
+        shutter[1] = camera->GetShutterClose();
+    }
+    return shutter;
+}
+
+bool
+_SetOptionsAndRender(
+    const HdPrman_CameraContext &cameraContext,
+    const HdPrman_RenderViewContext &renderViewContext,
+    RtParamList renderSettingsPrimOptions,
+    GfVec2f const &shutter,
+    bool interactive,
+    HdPrman_RenderParam *param)
+{
+    const riley::RenderViewId rvId = renderViewContext.GetRenderViewId();
+    if (rvId == riley::RenderViewId::InvalidId()) {
+        TF_CODING_ERROR("Invalid render view provided.\n");
+        return false;
+    }
+
+    // NOTE: renderSettingsPrimOptions is passed by value on purpose to let us
+    // override the shutter without stomping over the prim's copy.
+    cameraContext.SetRileyOptions(&renderSettingsPrimOptions);
+    renderSettingsPrimOptions.SetFloatArray(
+        RixStr.k_Ri_Shutter, shutter.data(), 2);
+
+    param->SetRenderSettingsPrimOptions(renderSettingsPrimOptions);
+    param->SetRileyOptions();
+
+    const riley::RenderViewId renderViews[] = { rvId };
+    
+    RtParamList renderOptions;
+    static RtUString const US_RENDERMODE("renderMode");
+    static RtUString const US_BATCH("batch");
+    static RtUString const US_INTERACTIVE = RtUString("interactive");
+
+    renderOptions.SetString(
+        US_RENDERMODE, interactive? US_INTERACTIVE : US_BATCH);
+    
+    param->AcquireRiley()->Render(
+        {static_cast<uint32_t>(TfArraySize(renderViews)), renderViews},
+        renderOptions);
+
+    return true;
+}
+
+} // end anonymous namespace
+
+
+HdPrman_RenderSettings::HdPrman_RenderSettings(SdfPath const& id)
+    : HdRenderSettings(id)
+{
+}
+
+HdPrman_RenderSettings::~HdPrman_RenderSettings() = default;
+
+bool
+HdPrman_RenderSettings::DriveRenderPass(
+    bool interactive,
+    bool renderPassHasAovBindings) const
+{
+    // As of this writing, the scenarios where we use the render settings prim
+    // to drive render pass execution are:
+    // 1. In an application like usdrecord wherein the render delegate is
+    //    not interactive and the render task has AOV bindings by enabling the
+    //    setting HD_PRMAN_RENDER_SETTINGS_DRIVE_RENDER_PASS.
+    //
+    // 2. The hdPrman test harness where the task does not have AOV bindings.
+    // 
+    // XXX Interactive viewport rendering using hdPrman currently relies on 
+    // AOV bindings from the task and uses the "hydra" Display Driver to write 
+    // rendered pixels into an intermediate framebuffer which is then blit 
+    // into the Hydra AOVs. Using the render settings prim to drive the render 
+    // pass in an interactive viewport setting is not yet supported.
+    //
+
+    static const bool driveRenderPassWithAovBindings =
+        TfGetEnvSetting(HD_PRMAN_RENDER_SETTINGS_DRIVE_RENDER_PASS);
+
+    const bool result =
+        IsValid() &&
+        (driveRenderPassWithAovBindings || !renderPassHasAovBindings) &&
+        !interactive;
+
+    TF_DEBUG(HDPRMAN_RENDER_PASS).Msg(
+        "Drive with RenderSettingsPrim = %d\n"
+        " - HD_PRMAN_RENDER_SETTINGS_DRIVE_RENDER_PASS = %d\n"
+        " - valid = %d\n"
+        " - interactive renderDelegate %d\n",
+        result, driveRenderPassWithAovBindings, IsValid(), interactive);
+
+    return result;
+}
+
+bool
+HdPrman_RenderSettings::UpdateAndRender(
+    const HdRenderIndex *renderIndex,
+    bool interactive,
+    HdPrman_RenderParam *param)
+{
+    TF_DEBUG(HDPRMAN_RENDER_PASS).Msg(
+        "UpdateAndRender called for render settings prim %s\n.",
+        GetId().GetText());
+
+    if (!IsValid()) {
+        TF_CODING_ERROR(
+            "Render settings prim %s does not have valid render products.\n",
+            GetId().GetText());
+        return false;
+    }
+    if (interactive) {
+        TF_CODING_ERROR(
+            "Support for driving interactive renders using a render settings "
+            "prim is not yet available.\n");
+        return false;
+    }
+
+    bool success = true;
+
+    const size_t numProducts = GetRenderProducts().size();
+
+    // The camera and render view contexts are currently managed by render
+    // param. We have only one instance of each, so we process the products
+    // sequentially, updating the riley resources associated with each of the
+    // contexts, prior to invoking _Render. This isn't a big concern in
+    // non-interactive rendering, but will be for an interactive usage.
+    //
+    // We can avoid thrashing the Riley resources by managing a camera context
+    // and render view context per-product.
+    //
+    HdPrman_CameraContext &cameraContext = param->GetCameraContext();
+    HdPrman_RenderViewContext &renderViewContext =
+        param->GetRenderViewContext();
+
+    for (size_t prodIdx = 0; prodIdx < numProducts; prodIdx++) {
+        auto const &product = GetRenderProducts().at(prodIdx);
+
+        TF_DEBUG(HDPRMAN_RENDER_PASS).Msg(
+            "--- Processing render product %s ...\n", product.name.GetText()); 
+
+        // XXX This can be moved to _Sync once we have a camera context
+        //     per-product.
+        _UpdateCameraContextFromProduct(product, &cameraContext);
+
+        // This _cannot_ be moved to Sync since the camera Sprim wouldn't have
+        // been updated.
+        _UpdateRileyCamera(
+            param->AcquireRiley(),
+            renderIndex,
+            product.cameraPath,
+            &cameraContext);
+
+        const GfVec2f shutter =
+            _ResolveShutterInterval(product, cameraContext, renderIndex);
+
+        // This _cannot_ be moved to Sync either because the render terminal
+        // Sprims wouldn't have been updated.
+        _UpdateRenderViewContext(product, param, &renderViewContext);
+        
+        bool result =
+            _SetOptionsAndRender(
+                cameraContext,
+                renderViewContext,
+                _settingsOptions,
+                shutter,
+                interactive,
+                param);
+        
+        if (TfDebug::IsEnabled(HDPRMAN_RENDER_PASS)) {
+            if (result) {
+                TfDebug::Helper().Msg(
+                    "--- Rendered product %s.\n", product.name.GetText()); 
+            } else {
+                TfDebug::Helper().Msg(
+                    "!!! Did not render product %s.\n", product.name.GetText()); 
+            }
+        }
+
+        success = success && result;
+    }
+
+    return success;
+}
+
+void HdPrman_RenderSettings::Finalize(HdRenderParam *renderParam)
+{
+    HdPrman_RenderParam *param = static_cast<HdPrman_RenderParam*>(renderParam);
+    if (param->GetDrivingRenderSettingsPrimPath() == GetId()) {
+        // Could set it to the fallback, but it isn't well-formed as of this
+        // writing and serves only to set composed scene options.
+        // i.e.
+        // if (HdPrmanRenderParam::HasSceneIndexPlugin(
+        //         HdPrmanPluginTokens->renderSettings)) {
+        //     renderParam->SetDrivingRenderSettingsPrimPath(
+        //         HdsiRenderSettingsFilteringSceneIndex::GetFallbackPrimPath());
+        // }
+
+        // For now, just reset to an empty path.
+        param->SetDrivingRenderSettingsPrimPath(SdfPath::EmptyPath());
+
+        // XXX
+        // Once management of contexts is moved local to the prim, this should
+        // be updated to destroy associated riley resources.
+    }
+}
+
+void HdPrman_RenderSettings::_Sync(
+    HdSceneDelegate *sceneDelegate,
+    HdRenderParam *renderParam,
+    const HdDirtyBits *dirtyBits)
+{
+    TF_DEBUG(HDPRMAN_RENDER_SETTINGS).Msg(
+        "Syncing render settings prim %s (dirty bits = %x)...\n{",
+        GetId().GetText(), *dirtyBits);
+        
+    HdPrman_RenderParam *param = static_cast<HdPrman_RenderParam*>(renderParam);
+
+    HdSceneIndexBaseRefPtr terminalSi =
+        sceneDelegate->GetRenderIndex().GetTerminalSceneIndex();
+
+    // We defer the first SetOptions call to correctly handle immutable scene 
+    // options authored on a render settings prim to below (SetRileyOptions).
+    // To accommodate scenes without a render settings prim, a fallback
+    // prim is always inserted via a scene index plugin.
+    // However, due to the non-deterministic nature of Sync, we need to guard
+    // against the fallback prim's opinion being committed on the first
+    // SetOptions when an authored prim is present.
+    //
+    if (GetId() == HdsiRenderSettingsFilteringSceneIndex::GetFallbackPrimPath()
+        && _HasNonFallbackRenderSettingsPrim(terminalSi)) {
+
+        TF_DEBUG(HDPRMAN_RENDER_SETTINGS).Msg(
+            "Short-circuiting sync for fallback render settings prim %s because"
+            "an authored render setting prim is present.\n", GetId().GetText());
+        
+        return;
+    }
+
+    if (*dirtyBits & HdRenderSettings::DirtyNamespacedSettings) {
+        // Note: We don't get fine-grained invalidation per-setting, so we
+        //       recompute all settings. Since this resets the param list, we
+        //       re-add the shutter interval param explicitly below.
+        _settingsOptions = _GenerateParamList(GetNamespacedSettings());
+    }
+
+    if (*dirtyBits & HdRenderSettings::DirtyShutterInterval ||
+        *dirtyBits & HdRenderSettings::DirtyNamespacedSettings) {
+        if (GetShutterInterval().IsHolding<GfVec2d>()) {
+            HdPrman_Utils::SetParamFromVtValue(
+                RixStr.k_Ri_Shutter,
+                GetShutterInterval(),
+                /* role = */ TfToken(),
+                &_settingsOptions);
+        }
+    }
+
+    if (*dirtyBits & HdRenderSettings::DirtyFrameNumber ||
+        *dirtyBits & HdRenderSettings::DirtyNamespacedSettings) {
+        _UpdateFrame(terminalSi, &_settingsOptions);
+    }
+
+    // XXX Preserve existing data flow for clients that don't populate the
+    //     sceneGlobals.activeRenderSettingsPrim locator at the root prim of the
+    //     scene index. In this scenario, scene options and render terminals
+    //     connected to the render settings prim are used. This works
+    //     only when a single render settings prim is present in the scene
+    //     (not including the fallback prim inserted via the scene index).
+    //
+    //     When multiple render settings prims are present in the scene, because
+    //     the Sync order is non-deterministic, the last sync'd prim's mutable
+    //     opinions and the first sync'd prim's immutable opinions would win.
+    //
+    const bool hasActiveRsp = HdUtils::HasActiveRenderSettingsPrim(terminalSi);
+    
+    if (IsActive() || !hasActiveRsp) {
+
+        param->SetDrivingRenderSettingsPrimPath(GetId());
+
+        if (*dirtyBits & HdRenderSettings::DirtyNamespacedSettings ||
+            *dirtyBits & HdRenderSettings::DirtyActive ||
+            *dirtyBits & HdRenderSettings::DirtyShutterInterval || 
+            *dirtyBits & HdRenderSettings::DirtyFrameNumber) {
+            
+            // Handle attributes ...
+            param->SetRenderSettingsPrimOptions(_settingsOptions);
+            param->SetRileyOptions();
+        }
+
+        // ... and connections.
+        if (*dirtyBits & HdRenderSettings::DirtyNamespacedSettings ||
+            *dirtyBits & HdRenderSettings::DirtyActive) {
+
+            _ProcessRenderTerminals(sceneDelegate, param);
+        }
+
+        if (*dirtyBits & HdRenderSettings::DirtyRenderProducts) {
+            _ProcessRenderProducts(param);
+        }
+    }
+
+    TF_DEBUG(HDPRMAN_RENDER_SETTINGS).Msg(
+        "}\nDone syncing render settings prim %s.\n", GetId().GetText());
+        
+}
+
+void
+HdPrman_RenderSettings::_ProcessRenderTerminals(
+    HdSceneDelegate *sceneDelegate,
+    HdPrman_RenderParam *param)
+{
+    const VtDictionary& namespacedSettings = GetNamespacedSettings();
+
+    // Set the integrator connected to this Render Settings prim
+    {
+        // XXX Should use SdfPath rather than a vector.
+        const SdfPathVector paths = VtDictionaryGet<SdfPathVector>(
+            namespacedSettings,
+            _renderTerminalTokens->outputsRiIntegrator.GetString(),
+            VtDefault = SdfPathVector());
+
+        param->SetRenderSettingsIntegratorPath(sceneDelegate,
+            paths.empty()? SdfPath::EmptyPath() : paths.front());
+    }
+
+    // Set the SampleFilters connected to this Render Settings prim
+    {
+        const SdfPathVector paths = VtDictionaryGet<SdfPathVector>(
+            namespacedSettings,
+            _renderTerminalTokens->outputsRiSampleFilters.GetString(),
+            VtDefault = SdfPathVector());
+
+        param->SetConnectedSampleFilterPaths(sceneDelegate, paths);
+    }
+
+    // Set the DisplayFilters connected to this Render Settings prim
+    {
+        const SdfPathVector paths = VtDictionaryGet<SdfPathVector>(
+            namespacedSettings,
+            _renderTerminalTokens->outputsRiDisplayFilters.GetString(),
+            VtDefault = SdfPathVector());
+
+        param->SetConnectedDisplayFilterPaths(sceneDelegate, paths);
+    }
+}
+
+void
+HdPrman_RenderSettings::_ProcessRenderProducts(HdPrman_RenderParam *param)
+{
+    if (GetRenderProducts().empty()) {
+        return;
+    }
+    // Fallback path for apps using an older version of Hydra wherein 
+    // the computed "unioned shutter interval" on the render settings 
+    // prim via HdsiRenderSettingsFilteringSceneIndex is not available.
+    // In this scenario, the *legacy* scene options param list is updated
+    // with the camera shutter interval of the first render product
+    // during HdPrmanCamera::Sync. The riley shutter interval needs to
+    // be set before any time-sampled primvars are synced.
+    // 
+    if (GetShutterInterval().IsEmpty()) {
+        // Set the camera path here so that HdPrmanCamera::Sync can detect
+        // whether it is syncing the current camera to set the riley shutter
+        // interval. See SetRileyShutterIntervalFromCameraContextCameraPath
+        // for additional context.
+        const SdfPath &cameraPath = GetRenderProducts().at(0).cameraPath;
+        param->GetCameraContext().SetCameraPath(cameraPath);
+    }
+
+    // This will override the f-stop value on the camera
+    param->GetCameraContext().SetDisableDepthOfField(
+        GetRenderProducts().at(0).disableDepthOfField);
+    
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderSettings.h b/third_party/renderman-26/plugin/hdPrman/renderSettings.h
new file mode 100644
index 0000000000..763e1d10fb
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderSettings.h
@@ -0,0 +1,70 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/renderSettings.h"
+
+#include "RiTypesHelper.h" // for RtParamList
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdRenderIndex;
+class HdPrman_RenderParam;
+
+class HdPrman_RenderSettings final : public HdRenderSettings
+{
+public:
+    HdPrman_RenderSettings(SdfPath const& id);
+
+    ~HdPrman_RenderSettings() override;
+
+    /// Public API.
+    ///
+    /// Returns whether the prim can be used to drive render pass execution.
+    /// If false is returned, the render pass uses a combination of the
+    /// legacy render settings map and render pass state to drive execution.
+    //
+    bool DriveRenderPass(
+        bool interactive,
+        bool renderPassHasAovBindings) const;
+
+    // Called during render pass execution.
+    // Updates necessary riley state (camera, render view, scene options) and
+    // invokes riley->Render(..).
+    //
+    // NOTE: Current support is limited to "batch" (i.e., non-interactive)
+    //       rendering.
+    //
+    bool UpdateAndRender(
+        const HdRenderIndex *renderIndex,
+        bool interactive,
+        HdPrman_RenderParam *param);
+
+    /// Virtual API.
+    void Finalize(HdRenderParam *renderParam) override;
+
+    void _Sync(HdSceneDelegate *sceneDelegate,
+               HdRenderParam *renderParam,
+               const HdDirtyBits *dirtyBits) override;
+
+private:
+    void _ProcessRenderTerminals(
+        HdSceneDelegate *sceneDelegate,
+        HdPrman_RenderParam *param);
+
+    void _ProcessRenderProducts(HdPrman_RenderParam *param);
+
+private:
+    RtParamList _settingsOptions;
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VOLUME_H
diff --git a/third_party/renderman-26/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..8ee0ceb3b5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.cpp
@@ -0,0 +1,117 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/renderSettingsFilteringSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/renderSettingsSchema.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hdsi/renderSettingsFilteringSceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_RenderSettingsFilteringSceneIndexPlugin"))
+);
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _namespaceTokens,
+    (ri)
+    ((outputsRi, "outputs:ri"))
+);
+
+namespace {
+
+// Note:
+// In hdPrman, for the first SetOptions call, we compose a small set of default
+// options, settings from the legacy render settings map and those from the
+// environment (see HdPrman_RenderParam::SetRileyOptions).
+// The fallback scene index prim isn't editable and since its opinions compose
+// over those from the legacy map, we return an empty data source for
+// namespaced settings to allow it to be overriden by the legacy render settings
+// map. We'll revisit this in the future as we transition away from the legacy
+// data flow.
+//
+HdContainerDataSourceHandle
+_BuildFallbackSettings()
+{
+    return nullptr;
+}
+
+HdContainerDataSourceHandle
+_BuildFallbackRenderSettingsPrimDataSource()
+{
+    // Return a valid data source to configure the scene index to add the
+    // fallback prim if necessary.
+    // For now, we populate the active field to do so.
+    return
+        HdRenderSettingsSchema::Builder()
+        .SetNamespacedSettings(_BuildFallbackSettings())
+        .SetActive(
+            HdRetainedTypedSampledDataSource<bool>::New(false))
+        // XXX Add fallback render products, color space, purposes, etc.
+        .Build();
+}
+
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registrations
+////////////////////////////////////////////////////////////////////////////////
+
+static const char * const _rendererDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_RenderSettingsFilteringSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 1;
+
+    // Configure the scene index to:
+    // 1. Filter in settings that have either the ri: or outputs:ri namespaces.
+    // 2. Insert a fallback render settings prim.
+    //
+    // (2) is a workaround to address Riley's requirements around scene options.
+    // See HdPrman_RenderParam::SetRileyOptions and
+    //     HdPrman_RenderSettings::_Sync for further info.
+    //
+    const HdContainerDataSourceHandle inputArgs =
+        HdRetainedContainerDataSource::New(
+            HdsiRenderSettingsFilteringSceneIndexTokens->namespacePrefixes,
+            HdRetainedTypedSampledDataSource<VtArray<TfToken>>::New(
+                {_namespaceTokens->ri, _namespaceTokens->outputsRi}),
+            HdsiRenderSettingsFilteringSceneIndexTokens->fallbackPrimDs,
+            _BuildFallbackRenderSettingsPrimDataSource() );
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _rendererDisplayName,
+        _tokens->sceneIndexPluginName,
+        inputArgs,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index Implementations
+////////////////////////////////////////////////////////////////////////////////
+
+HdPrman_RenderSettingsFilteringSceneIndexPlugin::
+HdPrman_RenderSettingsFilteringSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_RenderSettingsFilteringSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdsiRenderSettingsFilteringSceneIndex::New(inputScene, inputArgs);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.h
new file mode 100644
index 0000000000..a1b79145ad
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderSettingsFilteringSceneIndexPlugin.h
@@ -0,0 +1,38 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_FILTERING_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_FILTERING_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_RenderSettingsFilteringSceneIndexPlugin
+///
+/// Prman scene index plugin that
+/// * filters in settings properties based on conventions used in
+///   UsdRiPxr-schemas auto-applied to RenderSettings prims.
+/// * adds a fallback render settings prim (which will be used for scenes
+///   that don't have one).
+///
+class HdPrman_RenderSettingsFilteringSceneIndexPlugin :
+    public HdSceneIndexPlugin
+{
+public:
+    HdPrman_RenderSettingsFilteringSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_SETTINGS_FILTERING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..7da73f24c6
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.cpp
@@ -0,0 +1,238 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/perfLog.h"
+#include "pxr/imaging/hd/renderSettingsSchema.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/integratorSchema.h"
+#include "pxr/imaging/hd/sampleFilterSchema.h"
+#include "pxr/imaging/hd/displayFilterSchema.h"
+#include "pxr/imaging/hd/tokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin"))
+    ((outputsRiIntegrator, "outputs:ri:integrator"))
+    ((outputsRiSampleFilters, "outputs:ri:sampleFilters"))
+    ((outputsRiDisplayFilters, "outputs:ri:displayFilters"))
+);
+
+static const char * const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 1000;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtEnd);
+}
+
+HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin::
+HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin() = default;
+
+
+namespace
+{
+
+VtArray<SdfPath>
+_GetConnectedOutputs(const HdSceneIndexPrim &prim)
+{
+    const HdContainerDataSourceHandle renderSettingsDs =
+        HdContainerDataSource::Cast(prim.dataSource->Get(
+            HdRenderSettingsSchemaTokens->renderSettings));
+    if (!renderSettingsDs) {
+        return VtArray<SdfPath>();
+    }
+    HdRenderSettingsSchema rsSchema = HdRenderSettingsSchema(renderSettingsDs);
+    if (!rsSchema.IsDefined()) {
+        return VtArray<SdfPath>();
+    }
+    HdContainerDataSourceHandle namespacedSettingsDS = 
+        rsSchema.GetNamespacedSettings();
+    if (!namespacedSettingsDS) {
+        return VtArray<SdfPath>();
+    }
+
+    const TfToken outputTokens[] = {
+        _tokens->outputsRiIntegrator,
+        _tokens->outputsRiSampleFilters,
+        _tokens->outputsRiDisplayFilters
+    };
+
+    VtArray<SdfPath> connectedOutputs;
+    for (const auto& outputToken : outputTokens) {
+        const HdSampledDataSourceHandle valueDs =
+            HdSampledDataSource::Cast(namespacedSettingsDS->Get(outputToken));
+        if (!valueDs) {
+            continue;
+        }
+        const VtValue pathsValue = valueDs->GetValue(0);
+        const SdfPathVector paths = pathsValue.GetWithDefault<SdfPathVector>();
+        for (const auto& path : paths) {
+            connectedOutputs.push_back(path);
+        }
+    }
+    
+    return connectedOutputs;
+}
+
+TF_DECLARE_REF_PTRS(_HdPrmanRenderTerminalOutputInvalidatingSceneIndex);
+
+////////////////////////////////////////////////////////////////////////////////
+/// \class _HdPrmanRenderTerminalOutputInvalidatingSceneIndex
+///
+/// The scene index feeding into HdDependencyForwardingSceneIndex and
+/// constructed by the HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin.
+///
+
+class _HdPrmanRenderTerminalOutputInvalidatingSceneIndex
+    : public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static _HdPrmanRenderTerminalOutputInvalidatingSceneIndexRefPtr
+        New(const HdSceneIndexBaseRefPtr &inputSceneIndex)
+    {
+        return TfCreateRefPtr(
+            new _HdPrmanRenderTerminalOutputInvalidatingSceneIndex(
+                inputSceneIndex));
+    }
+
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override
+    {
+        return _GetInputSceneIndex()->GetPrim(primPath);
+    }
+
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override
+    {
+        return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+    }
+
+protected:
+    _HdPrmanRenderTerminalOutputInvalidatingSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputSceneIndex)
+      : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+    {
+    }
+
+    void _PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::AddedPrimEntries &entries) override
+    {
+        if (!_IsObserved()) {
+            return;
+        }
+        
+        // RenderSettings are added when the connected terminals change,
+        // dirty these terminal outputs to make sure we get the correct visual
+        HdSceneIndexObserver::DirtiedPrimEntries outputsToDirty;
+        for(auto const& entry : entries) {
+            if (entry.primType == HdPrimTypeTokens->renderSettings) {
+                const HdSceneIndexPrim prim =
+                    _GetInputSceneIndex()->GetPrim(entry.primPath);
+                if (!prim.dataSource) {
+                    continue;
+                }
+                for (auto const& path : _GetConnectedOutputs(prim)) {
+                    const TfToken outputType = 
+                        _GetInputSceneIndex()->GetPrim(path).primType;
+                    if (outputType == HdPrimTypeTokens->integrator) {
+                        outputsToDirty.emplace_back(path, 
+                            HdIntegratorSchema::GetDefaultLocator());
+                    } else if (outputType == HdPrimTypeTokens->sampleFilter) {
+                        outputsToDirty.emplace_back(path, 
+                            HdSampleFilterSchema::GetDefaultLocator());
+                    } else if (outputType == HdPrimTypeTokens->displayFilter) {
+                        outputsToDirty.emplace_back(path,
+                            HdDisplayFilterSchema::GetDefaultLocator());
+
+                    }
+                }
+            }
+        }
+        _SendPrimsAdded(entries);
+        _SendPrimsDirtied(outputsToDirty);
+    }
+
+    void _PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::RemovedPrimEntries &entries) override
+    {
+        if (!_IsObserved()) {
+            return;
+        }
+
+        _SendPrimsRemoved(entries);
+    }
+
+    void _PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries &entries) override
+    {
+        HD_TRACE_FUNCTION();
+
+        if (!_IsObserved()) {
+            return;
+        }
+
+        // When the Namespaced Settings on a RenderSettings prim is dirtied 
+        // make sure to dirty the connected render terminal outputs as well.
+        HdSceneIndexObserver::DirtiedPrimEntries outputsToDirty;
+        for(auto const &entry : entries) {
+            if (entry.dirtyLocators.Intersects(
+                    HdRenderSettingsSchema::GetNamespacedSettingsLocator())) {
+                const HdSceneIndexPrim prim =
+                    _GetInputSceneIndex()->GetPrim(entry.primPath);
+                if (!prim.dataSource) {
+                    continue;
+                }
+                for (auto const& path : _GetConnectedOutputs(prim)) {
+                    const HdSceneIndexPrim prim =
+                        _GetInputSceneIndex()->GetPrim(path);
+                    if (prim.primType == HdPrimTypeTokens->integrator) {
+                        outputsToDirty.emplace_back(path, 
+                            HdIntegratorSchema::GetDefaultLocator());
+                    } else if (prim.primType == HdPrimTypeTokens->sampleFilter) {
+                        outputsToDirty.emplace_back(path,
+                            HdSampleFilterSchema::GetDefaultLocator());
+                    } else if (prim.primType == HdPrimTypeTokens->displayFilter) {
+                        outputsToDirty.emplace_back(path,
+                            HdDisplayFilterSchema::GetDefaultLocator());
+                    }
+                }
+            }
+
+        }
+        _SendPrimsDirtied(entries);
+        _SendPrimsDirtied(outputsToDirty);
+    }
+};
+
+}
+
+HdSceneIndexBaseRefPtr
+HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return _HdPrmanRenderTerminalOutputInvalidatingSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h
new file mode 100644
index 0000000000..30aa155aa7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderTerminalOutputInvalidatingSceneIndexPlugin.h
@@ -0,0 +1,36 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef PXR_IMAGING_HDPRMAN_RENDER_TERMINAL_OUTPUT_INVALIDATING_SCENE_INDEX_PLUGIN_H
+#define PXR_IMAGING_HDPRMAN_RENDER_TERMINAL_OUTPUT_INVALIDATING_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin
+///
+/// Plugin adds a filtering scene index to the Prman render delegate to
+/// dirty the Integrator, Sample and Display Filters connected to the 
+/// Render Settings Prim when changed.
+///
+class HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin
+    : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_RenderTerminalOutputInvalidatingSceneIndexPlugin();    
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // PXR_IMAGING_HDPRMAN_RENDER_TERMINAL_OUTPUT_INVALIDATING_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/renderViewContext.cpp b/third_party/renderman-26/plugin/hdPrman/renderViewContext.cpp
new file mode 100644
index 0000000000..4bead2c578
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderViewContext.cpp
@@ -0,0 +1,155 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/renderViewContext.h"
+#include "hdPrman/renderDelegate.h"
+
+#include "hdPrman/rixStrings.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RenderViewDesc::RenderOutputDesc::RenderOutputDesc()
+  : type(riley::RenderOutputType::k_Color)
+  , rule(RixStr.k_filter)
+  , filter(RixStr.k_box)
+  , filterWidth(1.0f, 1.0f)
+  , relativePixelVariance(1.0f)
+{ }
+
+HdPrman_RenderViewContext::HdPrman_RenderViewContext() = default;
+
+void
+HdPrman_RenderViewContext::CreateRenderView(
+    const HdPrman_RenderViewDesc &desc,
+    riley::Riley * const riley)
+{
+    DeleteRenderView(riley);
+
+    using RenderOutputDesc = HdPrman_RenderViewDesc::RenderOutputDesc;
+
+    for (const RenderOutputDesc &outputDesc : desc.renderOutputDescs) {
+        const riley::FilterSize filterWidth = { outputDesc.filterWidth[0],
+                                                outputDesc.filterWidth[1] };
+        
+        _renderOutputIds.push_back(
+            riley->CreateRenderOutput(
+                riley::UserId(stats::AddDataLocation(outputDesc.name.CStr()).GetValue()),
+                outputDesc.name,
+                outputDesc.type,
+                outputDesc.sourceName,
+                outputDesc.rule,
+                outputDesc.filter,
+                filterWidth,
+                outputDesc.relativePixelVariance,
+                outputDesc.params));
+    }
+    
+    const riley::Extent rtResolution = {
+        static_cast<uint32_t>(desc.resolution[0]),
+        static_cast<uint32_t>(desc.resolution[1]),
+        1 };
+    
+    static const RtUString rtWeighted("weighted");
+
+    _renderTargetId =
+        riley->CreateRenderTarget(
+            riley::UserId(stats::AddDataLocation("/renderTarget").GetValue()),
+            { static_cast<uint32_t>(_renderOutputIds.size()),
+              _renderOutputIds.data() },
+            rtResolution,
+            rtWeighted,
+            1.0f,
+            RtParamList());
+
+    using DisplayDesc = HdPrman_RenderViewDesc::DisplayDesc;
+    for (const DisplayDesc &displayDesc : desc.displayDescs) {
+        std::vector<riley::RenderOutputId> displayRenderOutputIds;
+        displayRenderOutputIds.reserve(displayDesc.renderOutputIndices.size());
+        for (const size_t renderOutputIndex : displayDesc.renderOutputIndices) {
+            displayRenderOutputIds.push_back(
+                _renderOutputIds[renderOutputIndex]);
+        }
+        _displayIds.push_back(
+            riley->CreateDisplay(
+                riley::UserId(
+                    stats::AddDataLocation(
+                        displayDesc.name.CStr()).GetValue()),
+                _renderTargetId,
+                displayDesc.name,
+                displayDesc.driver,
+                { static_cast<uint32_t>(displayRenderOutputIds.size()),
+                  displayRenderOutputIds.data()},
+                displayDesc.params));
+    }
+    
+    _renderViewId =
+        riley->CreateRenderView(
+            riley::UserId(stats::AddDataLocation("/renderView").GetValue()),
+            _renderTargetId,
+            desc.cameraId,
+            desc.integratorId,
+            desc.displayFilterList,
+            desc.sampleFilterList,
+            RtParamList());
+}
+
+void
+HdPrman_RenderViewContext::DeleteRenderView(
+    riley::Riley * const riley)
+{
+    if (_renderViewId != riley::RenderViewId::InvalidId()) {
+        riley->DeleteRenderView(_renderViewId);
+        _renderViewId = riley::RenderViewId::InvalidId();
+    }
+
+    for (const riley::DisplayId id : _displayIds) {
+        riley->DeleteDisplay(id);
+    }
+    _displayIds.clear();
+    
+    if (_renderTargetId != riley::RenderTargetId::InvalidId()) {
+        riley->DeleteRenderTarget(_renderTargetId);
+        _renderTargetId = riley::RenderTargetId::InvalidId();
+    }
+
+    for (const riley::RenderOutputId id : _renderOutputIds) {
+        riley->DeleteRenderOutput(id);
+    }
+    _renderOutputIds.clear();
+}
+
+void
+HdPrman_RenderViewContext::SetIntegratorId(
+    const riley::IntegratorId id,
+    riley::Riley * const riley)
+{
+    if (_renderViewId == riley::RenderViewId::InvalidId()) {
+        return;
+    }
+    
+    riley->ModifyRenderView(
+        _renderViewId, nullptr, nullptr, &id, nullptr, nullptr, nullptr);        
+}
+
+void
+HdPrman_RenderViewContext::SetResolution(
+    const GfVec2i &resolution,
+    riley::Riley * const riley)
+{
+    if (_renderTargetId == riley::RenderTargetId::InvalidId()) {
+        return;
+    }
+
+    const riley::Extent extent = {
+        static_cast<uint32_t>(resolution[0]),
+        static_cast<uint32_t>(resolution[1]),
+        1 };
+
+    riley->ModifyRenderTarget(
+        _renderTargetId, nullptr, &extent, nullptr, nullptr, nullptr);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/renderViewContext.h b/third_party/renderman-26/plugin/hdPrman/renderViewContext.h
new file mode 100644
index 0000000000..61fa572dc8
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/renderViewContext.h
@@ -0,0 +1,97 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_VIEW_CONTEXT_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_VIEW_CONTEXT_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+
+#include "Riley.h"
+
+#include "pxr/base/gf/vec2i.h"
+#include "pxr/base/gf/vec2f.h"
+
+#include <vector>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// Descriptor to create a render man render view together
+/// with associated render outputs and displays.
+///
+struct HdPrman_RenderViewDesc
+{
+    riley::CameraId cameraId;
+    riley::IntegratorId integratorId;
+    riley::SampleFilterList sampleFilterList;
+    riley::DisplayFilterList displayFilterList;
+    GfVec2i resolution;
+    
+    struct RenderOutputDesc
+    {
+        RenderOutputDesc();
+
+        RtUString name;
+        riley::RenderOutputType type;
+        RtUString sourceName;
+        RtUString rule;
+        RtUString filter;
+        GfVec2f filterWidth;
+        float relativePixelVariance;
+        RtParamList params;
+    };
+
+    std::vector<RenderOutputDesc> renderOutputDescs;
+
+    struct DisplayDesc
+    {
+        RtUString name;
+        RtUString driver;
+        RtParamList params;
+
+        std::vector<size_t> renderOutputIndices;
+    };
+    
+    std::vector<DisplayDesc> displayDescs;
+};
+
+/// Manages a render man render view together with associated
+/// render target, render ouputs and displays.
+///
+class HdPrman_RenderViewContext final
+{
+public:
+    HdPrman_RenderViewContext();
+
+    void CreateRenderView(
+        const HdPrman_RenderViewDesc &desc,
+        riley::Riley * riley);
+
+    void DeleteRenderView(riley::Riley * riley);
+
+    void SetIntegratorId(
+        riley::IntegratorId id,
+        riley::Riley * riley);
+
+    void SetResolution(
+        const GfVec2i &resolution,
+        riley::Riley * riley);
+
+    riley::RenderViewId GetRenderViewId() const { return _renderViewId; }
+
+private:
+    HdPrman_RenderViewContext(const HdPrman_RenderViewContext &) = delete;
+
+    std::vector<riley::RenderOutputId> _renderOutputIds;
+    std::vector<riley::DisplayId> _displayIds;
+    riley::RenderTargetId _renderTargetId;
+    riley::RenderViewId _renderViewId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif  //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_VIEW_CONTEXT_H
+
diff --git a/third_party/renderman-26/plugin/hdPrman/rendererPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/rendererPlugin.cpp
new file mode 100644
index 0000000000..c5bd745470
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rendererPlugin.cpp
@@ -0,0 +1,25 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/renderDelegate.h"
+#include "pxr/imaging/plugin/hdPrmanLoader/rendererPlugin.h"
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+// Macro defined in hdPrmanLoader/rendererPlugin.h to export
+// a symbol here that can be picked up by HdPrmanLoader::Load.
+HDPRMAN_LOADER_CREATE_DELEGATE
+{
+    return new HdPrmanRenderDelegate(settingsMap);
+}
+
+HDPRMAN_LOADER_DELETE_DELEGATE
+{
+    // The HdPrman_RenderParam is owned by delegate and
+    // will be automatically destroyed by ref-counting, shutting
+    // down the attached PRMan instance.
+    delete renderDelegate;
+}
diff --git a/third_party/renderman-26/plugin/hdPrman/resourceRegistry.cpp b/third_party/renderman-26/plugin/hdPrman/resourceRegistry.cpp
new file mode 100644
index 0000000000..c559404b0b
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/resourceRegistry.cpp
@@ -0,0 +1,31 @@
+//
+// Copyright 2020 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/resourceRegistry.h"
+#include "hdPrman/renderParam.h"
+#include "pxr/imaging/hd/tokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_ResourceRegistry::HdPrman_ResourceRegistry(
+    std::shared_ptr<HdPrman_RenderParam> const& renderParam)
+    : _renderParam(renderParam)
+{
+}
+
+HdPrman_ResourceRegistry::~HdPrman_ResourceRegistry() = default;
+
+void
+HdPrman_ResourceRegistry::ReloadResource(
+    TfToken const& resourceType,
+    std::string const& path)
+{
+    if (resourceType == HdResourceTypeTokens->texture) {
+        _renderParam->InvalidateTexture(path);
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/resourceRegistry.h b/third_party/renderman-26/plugin/hdPrman/resourceRegistry.h
new file mode 100644
index 0000000000..671545f4c7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/resourceRegistry.h
@@ -0,0 +1,40 @@
+//
+// Copyright 2020 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RESOURCE_REGISTRY_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RESOURCE_REGISTRY_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/resourceRegistry.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// HdPrman's implementation of the hydra resource registry.
+/// Renderman manages its resources internally, but uses the HdResourceRegistry
+/// to respond to certain resource changes, such as texture reloading.
+class HdPrman_ResourceRegistry final : public HdResourceRegistry 
+{
+public:
+    HDPRMAN_API
+    HdPrman_ResourceRegistry(
+        std::shared_ptr<class HdPrman_RenderParam> const& renderParam);
+
+    HDPRMAN_API
+    ~HdPrman_ResourceRegistry() override;
+
+    HDPRMAN_API
+    void ReloadResource(
+        TfToken const& resourceType,
+        std::string const& path) override;
+
+private:
+    std::shared_ptr<class HdPrman_RenderParam> _renderParam;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RESOURCE_REGISTRY_H
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyCameraPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyCameraPrim.cpp
new file mode 100644
index 0000000000..e17d65cf38
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyCameraPrim.cpp
@@ -0,0 +1,130 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyCameraPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyCameraSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyCameraPrim::HdPrman_RileyCameraPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyCameraSchema schema =
+        HdPrmanRileyCameraSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyUniqueString name =
+        HdPrman_RileyUniqueString(
+            schema.GetName());
+
+    HdPrman_RileyShadingNode projection =
+        HdPrman_RileyShadingNode(
+            schema.GetProjection());
+
+    HdPrman_RileyTransform xform =
+        HdPrman_RileyTransform(
+            schema.GetXform(),
+            _GetShutterInterval());
+
+    HdPrman_RileyParamList properties =
+        HdPrman_RileyParamList(
+            schema.GetProperties());
+
+
+    _rileyId = _AcquireRiley()->CreateCamera(
+        riley::UserId(),
+
+        name.rileyObject,
+        projection.rileyObject,
+        xform.rileyObject,
+        properties.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyCameraPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyCameraSchema schema =
+        HdPrmanRileyCameraSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyShadingNode> projection;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyCameraSchema::GetProjectionLocator())) {
+        projection =
+            HdPrman_RileyShadingNode(
+                schema.GetProjection());
+    };
+
+    std::optional<HdPrman_RileyTransform> xform;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyCameraSchema::GetXformLocator())) {
+        xform =
+            HdPrman_RileyTransform(
+                schema.GetXform(),
+                _GetShutterInterval());
+    };
+
+    std::optional<HdPrman_RileyParamList> properties;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyCameraSchema::GetPropertiesLocator())) {
+        properties =
+            HdPrman_RileyParamList(
+                schema.GetProperties());
+    };
+
+
+    _AcquireRiley()->ModifyCamera(_rileyId,
+        HdPrman_GetRileyObjectPtr(projection),
+        HdPrman_GetRileyObjectPtr(xform),
+        HdPrman_GetRileyObjectPtr(properties)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyCameraPrim::~HdPrman_RileyCameraPrim()
+{
+    _AcquireRiley()->DeleteCamera(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyCameraPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyCameraPrim.h
new file mode 100644
index 0000000000..1ab86d6109
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyCameraPrim.h
@@ -0,0 +1,71 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CAMERA_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CAMERA_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyCameraPrimHandle =
+    std::shared_ptr<class HdPrman_RileyCameraPrim>;
+
+/// \class HdPrman_RileyCameraPrim
+///
+/// Wraps a riley Camera object, initializing or updating it
+/// using the HdPrmanRileyCameraSchema.
+///
+class HdPrman_RileyCameraPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyCameraPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyCameraPrim() override;
+
+    using RileyId = riley::CameraId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyCameraSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyCameraSchema.cpp
new file mode 100644
index 0000000000..e26c1dec44
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyCameraSchema.cpp
@@ -0,0 +1,229 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyCameraSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyCameraSchemaTokens,
+    HD_PRMAN_RILEY_CAMERA_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdTokenDataSourceHandle
+HdPrmanRileyCameraSchema::GetName()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyCameraSchemaTokens->name);
+}
+
+HdPrmanRileyShadingNodeSchema
+HdPrmanRileyCameraSchema::GetProjection()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyShadingNodeSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyCameraSchemaTokens->projection));
+}
+
+HdMatrixDataSourceHandle
+HdPrmanRileyCameraSchema::GetXform()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdMatrixDataSource>(
+        HdPrmanRileyCameraSchemaTokens->xform);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyCameraSchema::GetProperties()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyCameraSchemaTokens->properties));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyCameraSchema::BuildRetained(
+        const HdTokenDataSourceHandle &name,
+        const HdContainerDataSourceHandle &projection,
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &properties
+)
+{
+    TfToken _names[4];
+    HdDataSourceBaseHandle _values[4];
+
+    size_t _count = 0;
+
+    if (name) {
+        _names[_count] = HdPrmanRileyCameraSchemaTokens->name;
+        _values[_count++] = name;
+    }
+
+    if (projection) {
+        _names[_count] = HdPrmanRileyCameraSchemaTokens->projection;
+        _values[_count++] = projection;
+    }
+
+    if (xform) {
+        _names[_count] = HdPrmanRileyCameraSchemaTokens->xform;
+        _values[_count++] = xform;
+    }
+
+    if (properties) {
+        _names[_count] = HdPrmanRileyCameraSchemaTokens->properties;
+        _values[_count++] = properties;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyCameraSchema::Builder &
+HdPrmanRileyCameraSchema::Builder::SetName(
+    const HdTokenDataSourceHandle &name)
+{
+    _name = name;
+    return *this;
+}
+
+HdPrmanRileyCameraSchema::Builder &
+HdPrmanRileyCameraSchema::Builder::SetProjection(
+    const HdContainerDataSourceHandle &projection)
+{
+    _projection = projection;
+    return *this;
+}
+
+HdPrmanRileyCameraSchema::Builder &
+HdPrmanRileyCameraSchema::Builder::SetXform(
+    const HdMatrixDataSourceHandle &xform)
+{
+    _xform = xform;
+    return *this;
+}
+
+HdPrmanRileyCameraSchema::Builder &
+HdPrmanRileyCameraSchema::Builder::SetProperties(
+    const HdContainerDataSourceHandle &properties)
+{
+    _properties = properties;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyCameraSchema::Builder::Build()
+{
+    return HdPrmanRileyCameraSchema::BuildRetained(
+        _name,
+        _projection,
+        _xform,
+        _properties
+    );
+}
+
+/*static*/
+HdPrmanRileyCameraSchema
+HdPrmanRileyCameraSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyCameraSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyCameraSchemaTokens->rileyCamera))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyCameraSchema::GetSchemaToken()
+{
+    return HdPrmanRileyCameraSchemaTokens->rileyCamera;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyCameraSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyCameraSchema::GetNameLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyCameraSchemaTokens->name);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyCameraSchema::GetProjectionLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyCameraSchemaTokens->projection);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyCameraSchema::GetXformLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyCameraSchemaTokens->xform);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyCameraSchema::GetPropertiesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyCameraSchemaTokens->properties);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyCameraSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyCameraSchema.h
new file mode 100644
index 0000000000..37bfffefdb
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyCameraSchema.h
@@ -0,0 +1,225 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CAMERA_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CAMERA_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyShadingNodeSchema.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_CAMERA_SCHEMA_TOKENS \
+    (rileyCamera) \
+    (name) \
+    (projection) \
+    (xform) \
+    (properties) \
+    (nearClip) \
+    (farClip) \
+    (focusregion) \
+    (dofaspect) \
+    (apertureNSides) \
+    (apertureAngle) \
+    (apertureRoundness) \
+    (apertureDensity) \
+    (shutterOpenTime) \
+    (shutterCloseTime) \
+    (shutteropening) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyCameraSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_CAMERA_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyCameraSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyCameraSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyCamera" from the parent container and constructs a
+    /// HdPrmanRileyCameraSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyCameraSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetName()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyShadingNodeSchema GetProjection()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdMatrixDataSourceHandle GetXform()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetProperties()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate name.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetNameLocator();
+
+    /// Prim-level relative data source locator to locate projection.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetProjectionLocator();
+
+    /// Prim-level relative data source locator to locate xform.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetXformLocator();
+
+    /// Prim-level relative data source locator to locate properties.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetPropertiesLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdTokenDataSourceHandle &name,
+        const HdContainerDataSourceHandle &projection,
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &properties
+    );
+
+    /// \class HdPrmanRileyCameraSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetName(
+            const HdTokenDataSourceHandle &name);
+        HDPRMAN_API
+        Builder &SetProjection(
+            const HdContainerDataSourceHandle &projection);
+        HDPRMAN_API
+        Builder &SetXform(
+            const HdMatrixDataSourceHandle &xform);
+        HDPRMAN_API
+        Builder &SetProperties(
+            const HdContainerDataSourceHandle &properties);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdTokenDataSourceHandle _name;
+        HdContainerDataSourceHandle _projection;
+        HdMatrixDataSourceHandle _xform;
+        HdContainerDataSourceHandle _properties;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyClippingPlanePrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyClippingPlanePrim.cpp
new file mode 100644
index 0000000000..826a380276
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyClippingPlanePrim.cpp
@@ -0,0 +1,109 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyClippingPlanePrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyClippingPlaneSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyClippingPlanePrim::HdPrman_RileyClippingPlanePrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyClippingPlaneSchema schema =
+        HdPrmanRileyClippingPlaneSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyTransform xform =
+        HdPrman_RileyTransform(
+            schema.GetXform(),
+            _GetShutterInterval());
+
+    HdPrman_RileyParamList params =
+        HdPrman_RileyParamList(
+            schema.GetParams());
+
+
+    _rileyId = _AcquireRiley()->CreateClippingPlane(
+        xform.rileyObject,
+        params.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyClippingPlanePrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyClippingPlaneSchema schema =
+        HdPrmanRileyClippingPlaneSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyTransform> xform;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyClippingPlaneSchema::GetXformLocator())) {
+        xform =
+            HdPrman_RileyTransform(
+                schema.GetXform(),
+                _GetShutterInterval());
+    };
+
+    std::optional<HdPrman_RileyParamList> params;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyClippingPlaneSchema::GetParamsLocator())) {
+        params =
+            HdPrman_RileyParamList(
+                schema.GetParams());
+    };
+
+
+    _AcquireRiley()->ModifyClippingPlane(_rileyId,
+        HdPrman_GetRileyObjectPtr(xform),
+        HdPrman_GetRileyObjectPtr(params)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyClippingPlanePrim::~HdPrman_RileyClippingPlanePrim()
+{
+    _AcquireRiley()->DeleteClippingPlane(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyClippingPlanePrim.h b/third_party/renderman-26/plugin/hdPrman/rileyClippingPlanePrim.h
new file mode 100644
index 0000000000..b9091c357b
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyClippingPlanePrim.h
@@ -0,0 +1,71 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CLIPPING_PLANE_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CLIPPING_PLANE_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyClippingPlanePrimHandle =
+    std::shared_ptr<class HdPrman_RileyClippingPlanePrim>;
+
+/// \class HdPrman_RileyClippingPlanePrim
+///
+/// Wraps a riley ClippingPlane object, initializing or updating it
+/// using the HdPrmanRileyClippingPlaneSchema.
+///
+class HdPrman_RileyClippingPlanePrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyClippingPlanePrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyClippingPlanePrim() override;
+
+    using RileyId = riley::ClippingPlaneId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyClippingPlaneSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyClippingPlaneSchema.cpp
new file mode 100644
index 0000000000..108a5f4a3b
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyClippingPlaneSchema.cpp
@@ -0,0 +1,155 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyClippingPlaneSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyClippingPlaneSchemaTokens,
+    HD_PRMAN_RILEY_CLIPPING_PLANE_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdMatrixDataSourceHandle
+HdPrmanRileyClippingPlaneSchema::GetXform()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdMatrixDataSource>(
+        HdPrmanRileyClippingPlaneSchemaTokens->xform);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyClippingPlaneSchema::GetParams()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyClippingPlaneSchemaTokens->params));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyClippingPlaneSchema::BuildRetained(
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &params
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (xform) {
+        _names[_count] = HdPrmanRileyClippingPlaneSchemaTokens->xform;
+        _values[_count++] = xform;
+    }
+
+    if (params) {
+        _names[_count] = HdPrmanRileyClippingPlaneSchemaTokens->params;
+        _values[_count++] = params;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyClippingPlaneSchema::Builder &
+HdPrmanRileyClippingPlaneSchema::Builder::SetXform(
+    const HdMatrixDataSourceHandle &xform)
+{
+    _xform = xform;
+    return *this;
+}
+
+HdPrmanRileyClippingPlaneSchema::Builder &
+HdPrmanRileyClippingPlaneSchema::Builder::SetParams(
+    const HdContainerDataSourceHandle &params)
+{
+    _params = params;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyClippingPlaneSchema::Builder::Build()
+{
+    return HdPrmanRileyClippingPlaneSchema::BuildRetained(
+        _xform,
+        _params
+    );
+}
+
+/*static*/
+HdPrmanRileyClippingPlaneSchema
+HdPrmanRileyClippingPlaneSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyClippingPlaneSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyClippingPlaneSchemaTokens->rileyClippingPlane))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyClippingPlaneSchema::GetSchemaToken()
+{
+    return HdPrmanRileyClippingPlaneSchemaTokens->rileyClippingPlane;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyClippingPlaneSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyClippingPlaneSchema::GetXformLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyClippingPlaneSchemaTokens->xform);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyClippingPlaneSchema::GetParamsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyClippingPlaneSchemaTokens->params);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyClippingPlaneSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyClippingPlaneSchema.h
new file mode 100644
index 0000000000..511420d487
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyClippingPlaneSchema.h
@@ -0,0 +1,175 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CLIPPING_PLANE_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CLIPPING_PLANE_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_CLIPPING_PLANE_SCHEMA_TOKENS \
+    (rileyClippingPlane) \
+    (xform) \
+    (params) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyClippingPlaneSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_CLIPPING_PLANE_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyClippingPlaneSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyClippingPlaneSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyClippingPlane" from the parent container and constructs a
+    /// HdPrmanRileyClippingPlaneSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyClippingPlaneSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdMatrixDataSourceHandle GetXform()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetParams()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate xform.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetXformLocator();
+
+    /// Prim-level relative data source locator to locate params.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetParamsLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &params
+    );
+
+    /// \class HdPrmanRileyClippingPlaneSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetXform(
+            const HdMatrixDataSourceHandle &xform);
+        HDPRMAN_API
+        Builder &SetParams(
+            const HdContainerDataSourceHandle &params);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdMatrixDataSourceHandle _xform;
+        HdContainerDataSourceHandle _params;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyConversionSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/rileyConversionSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..503fadcd65
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyConversionSceneIndexPlugin.cpp
@@ -0,0 +1,349 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/rileyConversionSceneIndexPlugin.h"
+
+#include "hdPrman/rileyFallbackMaterialSceneIndexPlugin.h"
+#include "hdPrman/rileyGeometryInstanceSchema.h"
+#include "hdPrman/rileyGeometryPrototypeSchema.h"
+#include "hdPrman/rileyParamSchema.h"
+#include "hdPrman/rileyPrimvarSchema.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+#include "hdPrman/tokens.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/sphereSchema.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/xformSchema.h"
+
+#include "pxr/base/tf/declarePtrs.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_RileyConversionSceneIndexPlugin"))
+
+    ((geometryInstance, "RileyConversionGeometryInstance"))
+    ((riRadius, "Ri:radius"))
+);
+
+static const char * const _rendererDisplayName = "Prman";
+
+namespace {
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+TF_DECLARE_REF_PTRS(_RileyConversionSceneIndex);
+
+class _GeometryPrototypeParamsDataSource : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_GeometryPrototypeParamsDataSource);
+
+    _GeometryPrototypeParamsDataSource(
+        HdContainerDataSourceHandle const &primSource)
+      : _primSource(primSource)
+    {
+    }
+
+    TfTokenVector GetNames() override
+    {
+        return { _tokens->riRadius };
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        if (name == _tokens->riRadius) {
+            return 
+                HdPrmanRileyPrimvarSchema::Builder()
+                    .SetValue(
+                        HdSphereSchema::GetFromParent(_primSource).GetRadius())
+                    .SetDetailType(
+                        HdPrmanRileyPrimvarSchema::BuildDetailTypeDataSource(
+                            HdPrmanRileyPrimvarSchemaTokens->constant))
+                    .Build();
+        }
+        return nullptr;
+    }
+
+    HdContainerDataSourceHandle const _primSource;
+};
+
+class _GeometryInstanceDataSource : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(_GeometryInstanceDataSource);
+
+    _GeometryInstanceDataSource(
+        const SdfPath &protoPrimPath,
+        HdContainerDataSourceHandle const &primSource)
+      : _protoPrimPath(protoPrimPath)
+      , _primSource(primSource)
+    {
+    }
+
+    TfTokenVector GetNames() override
+    {
+        return {
+            HdPrmanRileyGeometryInstanceSchemaTokens->geoPrototype,
+            HdPrmanRileyGeometryInstanceSchemaTokens->material,
+            HdPrmanRileyGeometryInstanceSchemaTokens->xform,
+            HdPrmanRileyGeometryInstanceSchemaTokens->attributes };
+    }
+
+    HdDataSourceBaseHandle Get(const TfToken &name) override
+    {
+        if (name == HdPrmanRileyGeometryInstanceSchemaTokens->geoPrototype) {
+            return HdRetainedTypedSampledDataSource<SdfPath>::New(
+                _protoPrimPath);
+        }
+        if (name == HdPrmanRileyGeometryInstanceSchemaTokens->material) {
+            return HdRetainedTypedSampledDataSource<SdfPath>::New(
+                HdPrman_RileyFallbackMaterialSceneIndexPlugin::
+                GetFallbackMaterialPath());
+        }
+        if (name == HdPrmanRileyGeometryInstanceSchemaTokens->xform) {
+            return HdXformSchema::GetFromParent(_primSource).GetMatrix();
+        }
+        if (name == HdPrmanRileyGeometryInstanceSchemaTokens->attributes) {
+            HdContainerDataSourceHandle const params =
+                HdRetainedContainerDataSource::New(
+                    TfToken("identifierName"),
+                    HdPrmanRileyParamSchema::Builder()
+                        .SetValue(
+                            HdRetainedTypedSampledDataSource<TfToken>::New(
+                                _protoPrimPath.GetToken()))
+                        .Build(),
+                    TfToken("lightfilter:subset"),
+                    HdPrmanRileyParamSchema::Builder()
+                         .SetValue(
+                             HdRetainedTypedSampledDataSource<TfToken>::New(
+                                 TfToken()))
+                         .Build(),
+                    TfToken("lighting:subset"),
+                    HdPrmanRileyParamSchema::Builder()
+                         .SetValue(
+                             HdRetainedTypedSampledDataSource<TfToken>::New(
+                                 TfToken("default")))
+                         .Build(),
+                    TfToken("user:hydra:doubleSided"),
+                    HdPrmanRileyParamSchema::Builder()
+                         .SetValue(
+                             HdRetainedTypedSampledDataSource<int>::New(
+                                 0))
+                         .Build());
+
+            return
+                HdPrmanRileyParamListSchema::Builder()
+                    .SetParams(params)
+                    .Build();
+        }
+        return nullptr;
+    }
+
+private:
+    const SdfPath _protoPrimPath;
+    HdContainerDataSourceHandle const _primSource;
+};
+
+class _RileyConversionSceneIndex : public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static _RileyConversionSceneIndexRefPtr New(
+        HdSceneIndexBaseRefPtr const &inputSceneIndex)
+    {
+        return TfCreateRefPtr(
+            new _RileyConversionSceneIndex(inputSceneIndex));
+    }
+
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override
+    {
+        if (primPath.GetName() == _tokens->geometryInstance) {
+            
+            const SdfPath protoPrimPath = primPath.GetParentPath();
+
+            const HdSceneIndexPrim protoPrim = _GetInputSceneIndex()->GetPrim(protoPrimPath);
+            if (!protoPrim.dataSource) {
+                return protoPrim;
+            }
+
+            return {
+                HdPrmanRileyPrimTypeTokens->geometryInstance,
+                HdRetainedContainerDataSource::New(
+                    HdPrmanRileyGeometryInstanceSchema::GetSchemaToken(),
+                    _GeometryInstanceDataSource::New(
+                        protoPrimPath, protoPrim.dataSource)) };
+        }
+
+        const HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+        if (!prim.dataSource) {
+            return prim;
+        }
+
+        if (prim.primType == HdPrimTypeTokens->sphere) {
+            return {
+                HdPrmanRileyPrimTypeTokens->geometryPrototype,
+                HdRetainedContainerDataSource::New(
+                    HdPrmanRileyGeometryPrototypeSchema::GetSchemaToken(),
+                    HdPrmanRileyGeometryPrototypeSchema::Builder()
+                        .SetType(
+                            HdRetainedTypedSampledDataSource<TfToken>::New(
+                                TfToken("Ri:Sphere")))
+                        .SetPrimvars(
+                            HdPrmanRileyPrimvarListSchema::Builder()
+                                .SetNumUniform(
+                                    HdRetainedTypedSampledDataSource<size_t>::New(
+                                        1))
+                                .SetNumVertex(
+                                    HdRetainedTypedSampledDataSource<size_t>::New(
+                                        1))
+                                .SetNumVarying(
+                                    HdRetainedTypedSampledDataSource<size_t>::New(
+                                        1))
+                                .SetNumFaceVarying(
+                                    HdRetainedTypedSampledDataSource<size_t>::New(
+                                        1))
+                                .SetParams(
+                                    _GeometryPrototypeParamsDataSource::New(
+                                        prim.dataSource))
+                                .Build())
+                        .Build()) };
+        }
+
+        return prim;
+    }
+
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override
+    {
+        SdfPathVector children = _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+
+        const HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+        if (prim.dataSource && prim.primType == HdPrimTypeTokens->sphere) {
+            children.push_back(
+                primPath.AppendChild(
+                    _tokens->geometryInstance));
+        }
+        
+        return children;
+    }
+
+protected:
+    _RileyConversionSceneIndex(
+        HdSceneIndexBaseRefPtr const &inputSceneIndex)
+     : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+    {
+    }
+
+    void _PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::AddedPrimEntries &entries) override
+    {
+        HdSceneIndexObserver::AddedPrimEntries newEntries;
+
+        for (const HdSceneIndexObserver::AddedPrimEntry &entry : entries) {
+            if (entry.primType == HdPrimTypeTokens->sphere) {
+                newEntries.push_back(
+                    { entry.primPath,
+                      HdPrmanRileyPrimTypeTokens->geometryPrototype });
+                newEntries.push_back(
+                    { entry.primPath.AppendChild(
+                            _tokens->geometryInstance),
+                      HdPrmanRileyPrimTypeTokens->geometryInstance });
+            } else {
+                newEntries.push_back(entry);
+            }
+        }
+
+        _SendPrimsAdded(newEntries);
+    }
+
+    void _PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::RemovedPrimEntries &entries) override
+    {
+        _SendPrimsRemoved(entries);
+    }
+
+    void _PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries &entries) override
+    {
+        HdSceneIndexObserver::DirtiedPrimEntries addlEntries;
+
+        for (const HdSceneIndexObserver::DirtiedPrimEntry &entry : entries) {
+            if (entry.dirtyLocators.Intersects(HdXformSchema::GetDefaultLocator())) {
+                addlEntries.push_back(
+                    { entry.primPath.AppendChild(
+                            _tokens->geometryInstance),
+                      HdPrmanRileyGeometryInstanceSchema::GetXformLocator() });
+            }
+            if (entry.dirtyLocators.Intersects(HdSphereSchema::GetDefaultLocator())) {
+                addlEntries.push_back(
+                    { entry.primPath,
+                      HdPrmanRileyGeometryPrototypeSchema::GetPrimvarsLocator() });
+            }
+        }
+
+        _SendPrimsDirtied(entries);
+        if (!addlEntries.empty()) {
+            _SendPrimsDirtied(addlEntries);
+        }
+    }
+};
+
+#endif
+
+} // anonymous namespace
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registrations
+////////////////////////////////////////////////////////////////////////////////
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_RileyConversionSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 101;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _rendererDisplayName,
+        _tokens->sceneIndexPluginName,
+        /* inputArgs = */ nullptr,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtEnd);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index plugin Implementation
+////////////////////////////////////////////////////////////////////////////////
+
+HdPrman_RileyConversionSceneIndexPlugin::
+HdPrman_RileyConversionSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_RileyConversionSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+    if (!TfGetEnvSetting(HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER)) {
+        return inputScene;
+    }
+
+    return _RileyConversionSceneIndex::New(inputScene);
+#else 
+    return inputScene;
+#endif
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyConversionSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/rileyConversionSceneIndexPlugin.h
new file mode 100644
index 0000000000..8f7974b108
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyConversionSceneIndexPlugin.h
@@ -0,0 +1,50 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CONVERSION_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CONVERSION_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_RileyConversionSceneIndexPlugin
+///
+/// Converts hydra prims to riley prims.
+///
+/// The implementation is incomplete and only active
+/// HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER is set to true.
+///
+/// The limitations are as follows:
+/// - it only converts spheres
+/// - it always uses the fallback material
+/// - it ignores instancers
+///
+/// An example: Given a sphere /Sphere, the conversion results in:
+///
+/// /Sphere, type: riley:geometryPrototype
+/// /Sphere/RileyConversionGeometryInstance, type: riley:geometryInstance
+///
+class HdPrman_RileyConversionSceneIndexPlugin
+                                  : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_RileyConversionSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_CONVERSION_SCENE_INDEX_PLUGIN_H
+
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemPrim.cpp
new file mode 100644
index 0000000000..4d21b61d4a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemPrim.cpp
@@ -0,0 +1,111 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyCoordinateSystemPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyCoordinateSystemSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyCoordinateSystemPrim::HdPrman_RileyCoordinateSystemPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyCoordinateSystemSchema schema =
+        HdPrmanRileyCoordinateSystemSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyTransform xform =
+        HdPrman_RileyTransform(
+            schema.GetXform(),
+            _GetShutterInterval());
+
+    HdPrman_RileyParamList attributes =
+        HdPrman_RileyParamList(
+            schema.GetAttributes());
+
+
+    _rileyId = _AcquireRiley()->CreateCoordinateSystem(
+        riley::UserId(),
+
+        xform.rileyObject,
+        attributes.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyCoordinateSystemPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyCoordinateSystemSchema schema =
+        HdPrmanRileyCoordinateSystemSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyTransform> xform;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyCoordinateSystemSchema::GetXformLocator())) {
+        xform =
+            HdPrman_RileyTransform(
+                schema.GetXform(),
+                _GetShutterInterval());
+    };
+
+    std::optional<HdPrman_RileyParamList> attributes;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyCoordinateSystemSchema::GetAttributesLocator())) {
+        attributes =
+            HdPrman_RileyParamList(
+                schema.GetAttributes());
+    };
+
+
+    _AcquireRiley()->ModifyCoordinateSystem(_rileyId,
+        HdPrman_GetRileyObjectPtr(xform),
+        HdPrman_GetRileyObjectPtr(attributes)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyCoordinateSystemPrim::~HdPrman_RileyCoordinateSystemPrim()
+{
+    _AcquireRiley()->DeleteCoordinateSystem(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemPrim.h
new file mode 100644
index 0000000000..8919ff49fd
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemPrim.h
@@ -0,0 +1,73 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_COORDINATE_SYSTEM_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_COORDINATE_SYSTEM_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyCoordinateSystemPrimHandle =
+    std::shared_ptr<class HdPrman_RileyCoordinateSystemPrim>;
+
+/// \class HdPrman_RileyCoordinateSystemPrim
+///
+/// Wraps a riley CoordinateSystem object, initializing or updating it
+/// using the HdPrmanRileyCoordinateSystemSchema.
+///
+class HdPrman_RileyCoordinateSystemPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyCoordinateSystemPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyCoordinateSystemPrim() override;
+
+    using RileyId = riley::CoordinateSystemId;
+    using RileyIdList = riley::CoordinateSystemList;
+
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemSchema.cpp
new file mode 100644
index 0000000000..c65b3e05cb
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemSchema.cpp
@@ -0,0 +1,155 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyCoordinateSystemSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyCoordinateSystemSchemaTokens,
+    HD_PRMAN_RILEY_COORDINATE_SYSTEM_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdMatrixDataSourceHandle
+HdPrmanRileyCoordinateSystemSchema::GetXform()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdMatrixDataSource>(
+        HdPrmanRileyCoordinateSystemSchemaTokens->xform);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyCoordinateSystemSchema::GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyCoordinateSystemSchemaTokens->attributes));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyCoordinateSystemSchema::BuildRetained(
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &attributes
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (xform) {
+        _names[_count] = HdPrmanRileyCoordinateSystemSchemaTokens->xform;
+        _values[_count++] = xform;
+    }
+
+    if (attributes) {
+        _names[_count] = HdPrmanRileyCoordinateSystemSchemaTokens->attributes;
+        _values[_count++] = attributes;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyCoordinateSystemSchema::Builder &
+HdPrmanRileyCoordinateSystemSchema::Builder::SetXform(
+    const HdMatrixDataSourceHandle &xform)
+{
+    _xform = xform;
+    return *this;
+}
+
+HdPrmanRileyCoordinateSystemSchema::Builder &
+HdPrmanRileyCoordinateSystemSchema::Builder::SetAttributes(
+    const HdContainerDataSourceHandle &attributes)
+{
+    _attributes = attributes;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyCoordinateSystemSchema::Builder::Build()
+{
+    return HdPrmanRileyCoordinateSystemSchema::BuildRetained(
+        _xform,
+        _attributes
+    );
+}
+
+/*static*/
+HdPrmanRileyCoordinateSystemSchema
+HdPrmanRileyCoordinateSystemSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyCoordinateSystemSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyCoordinateSystemSchemaTokens->rileyCoordinateSystem))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyCoordinateSystemSchema::GetSchemaToken()
+{
+    return HdPrmanRileyCoordinateSystemSchemaTokens->rileyCoordinateSystem;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyCoordinateSystemSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyCoordinateSystemSchema::GetXformLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyCoordinateSystemSchemaTokens->xform);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyCoordinateSystemSchema::GetAttributesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyCoordinateSystemSchemaTokens->attributes);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemSchema.h
new file mode 100644
index 0000000000..707084e1da
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyCoordinateSystemSchema.h
@@ -0,0 +1,175 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_COORDINATE_SYSTEM_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_COORDINATE_SYSTEM_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_COORDINATE_SYSTEM_SCHEMA_TOKENS \
+    (rileyCoordinateSystem) \
+    (xform) \
+    (attributes) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyCoordinateSystemSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_COORDINATE_SYSTEM_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyCoordinateSystemSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyCoordinateSystemSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyCoordinateSystem" from the parent container and constructs a
+    /// HdPrmanRileyCoordinateSystemSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyCoordinateSystemSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdMatrixDataSourceHandle GetXform()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate xform.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetXformLocator();
+
+    /// Prim-level relative data source locator to locate attributes.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetAttributesLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &attributes
+    );
+
+    /// \class HdPrmanRileyCoordinateSystemSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetXform(
+            const HdMatrixDataSourceHandle &xform);
+        HDPRMAN_API
+        Builder &SetAttributes(
+            const HdContainerDataSourceHandle &attributes);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdMatrixDataSourceHandle _xform;
+        HdContainerDataSourceHandle _attributes;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplacementPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyDisplacementPrim.cpp
new file mode 100644
index 0000000000..d354d2a88a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplacementPrim.cpp
@@ -0,0 +1,109 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyDisplacementPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyDisplacementSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyDisplacementPrim::HdPrman_RileyDisplacementPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyDisplacementSchema schema =
+        HdPrmanRileyDisplacementSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyShadingNetwork displacement =
+        HdPrman_RileyShadingNetwork(
+            schema.GetDisplacement());
+
+    HdPrman_RileyParamList attributes =
+        HdPrman_RileyParamList(
+            schema.GetAttributes());
+
+
+    _rileyId = _AcquireRiley()->CreateDisplacement(
+        riley::UserId(),
+
+        displacement.rileyObject,
+        attributes.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyDisplacementPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyDisplacementSchema schema =
+        HdPrmanRileyDisplacementSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyShadingNetwork> displacement;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplacementSchema::GetDisplacementLocator())) {
+        displacement =
+            HdPrman_RileyShadingNetwork(
+                schema.GetDisplacement());
+    };
+
+    std::optional<HdPrman_RileyParamList> attributes;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplacementSchema::GetAttributesLocator())) {
+        attributes =
+            HdPrman_RileyParamList(
+                schema.GetAttributes());
+    };
+
+
+    _AcquireRiley()->ModifyDisplacement(_rileyId,
+        HdPrman_GetRileyObjectPtr(displacement),
+        HdPrman_GetRileyObjectPtr(attributes)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyDisplacementPrim::~HdPrman_RileyDisplacementPrim()
+{
+    _AcquireRiley()->DeleteDisplacement(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplacementPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyDisplacementPrim.h
new file mode 100644
index 0000000000..dad8339e83
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplacementPrim.h
@@ -0,0 +1,71 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLACEMENT_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLACEMENT_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyDisplacementPrimHandle =
+    std::shared_ptr<class HdPrman_RileyDisplacementPrim>;
+
+/// \class HdPrman_RileyDisplacementPrim
+///
+/// Wraps a riley Displacement object, initializing or updating it
+/// using the HdPrmanRileyDisplacementSchema.
+///
+class HdPrman_RileyDisplacementPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyDisplacementPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyDisplacementPrim() override;
+
+    using RileyId = riley::DisplacementId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplacementSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyDisplacementSchema.cpp
new file mode 100644
index 0000000000..cce793cf53
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplacementSchema.cpp
@@ -0,0 +1,155 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyDisplacementSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyDisplacementSchemaTokens,
+    HD_PRMAN_RILEY_DISPLACEMENT_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyShadingNodeVectorSchema
+HdPrmanRileyDisplacementSchema::GetDisplacement()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyShadingNodeVectorSchema(_GetTypedDataSource<HdVectorDataSource>(
+        HdPrmanRileyDisplacementSchemaTokens->displacement));
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyDisplacementSchema::GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyDisplacementSchemaTokens->attributes));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyDisplacementSchema::BuildRetained(
+        const HdVectorDataSourceHandle &displacement,
+        const HdContainerDataSourceHandle &attributes
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (displacement) {
+        _names[_count] = HdPrmanRileyDisplacementSchemaTokens->displacement;
+        _values[_count++] = displacement;
+    }
+
+    if (attributes) {
+        _names[_count] = HdPrmanRileyDisplacementSchemaTokens->attributes;
+        _values[_count++] = attributes;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyDisplacementSchema::Builder &
+HdPrmanRileyDisplacementSchema::Builder::SetDisplacement(
+    const HdVectorDataSourceHandle &displacement)
+{
+    _displacement = displacement;
+    return *this;
+}
+
+HdPrmanRileyDisplacementSchema::Builder &
+HdPrmanRileyDisplacementSchema::Builder::SetAttributes(
+    const HdContainerDataSourceHandle &attributes)
+{
+    _attributes = attributes;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyDisplacementSchema::Builder::Build()
+{
+    return HdPrmanRileyDisplacementSchema::BuildRetained(
+        _displacement,
+        _attributes
+    );
+}
+
+/*static*/
+HdPrmanRileyDisplacementSchema
+HdPrmanRileyDisplacementSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyDisplacementSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyDisplacementSchemaTokens->rileyDisplacement))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyDisplacementSchema::GetSchemaToken()
+{
+    return HdPrmanRileyDisplacementSchemaTokens->rileyDisplacement;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyDisplacementSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplacementSchema::GetDisplacementLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplacementSchemaTokens->displacement);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplacementSchema::GetAttributesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplacementSchemaTokens->attributes);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplacementSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyDisplacementSchema.h
new file mode 100644
index 0000000000..fb6238a181
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplacementSchema.h
@@ -0,0 +1,176 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLACEMENT_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLACEMENT_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileySchemaTypeDefs.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_DISPLACEMENT_SCHEMA_TOKENS \
+    (rileyDisplacement) \
+    (displacement) \
+    (attributes) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyDisplacementSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_DISPLACEMENT_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyDisplacementSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyDisplacementSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyDisplacement" from the parent container and constructs a
+    /// HdPrmanRileyDisplacementSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyDisplacementSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyShadingNodeVectorSchema GetDisplacement()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate displacement.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDisplacementLocator();
+
+    /// Prim-level relative data source locator to locate attributes.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetAttributesLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdVectorDataSourceHandle &displacement,
+        const HdContainerDataSourceHandle &attributes
+    );
+
+    /// \class HdPrmanRileyDisplacementSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetDisplacement(
+            const HdVectorDataSourceHandle &displacement);
+        HDPRMAN_API
+        Builder &SetAttributes(
+            const HdContainerDataSourceHandle &attributes);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdVectorDataSourceHandle _displacement;
+        HdContainerDataSourceHandle _attributes;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterPrim.cpp
new file mode 100644
index 0000000000..f3ba15aa68
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterPrim.cpp
@@ -0,0 +1,109 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyDisplayFilterPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyDisplayFilterSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyDisplayFilterPrim::HdPrman_RileyDisplayFilterPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyDisplayFilterSchema schema =
+        HdPrmanRileyDisplayFilterSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyShadingNetwork displayFilter =
+        HdPrman_RileyShadingNetwork(
+            schema.GetDisplayFilter());
+
+    HdPrman_RileyParamList attributes =
+        HdPrman_RileyParamList(
+            schema.GetAttributes());
+
+
+    _rileyId = _AcquireRiley()->CreateDisplayFilter(
+        riley::UserId(),
+
+        displayFilter.rileyObject,
+        attributes.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyDisplayFilterPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyDisplayFilterSchema schema =
+        HdPrmanRileyDisplayFilterSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyShadingNetwork> displayFilter;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplayFilterSchema::GetDisplayFilterLocator())) {
+        displayFilter =
+            HdPrman_RileyShadingNetwork(
+                schema.GetDisplayFilter());
+    };
+
+    std::optional<HdPrman_RileyParamList> attributes;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplayFilterSchema::GetAttributesLocator())) {
+        attributes =
+            HdPrman_RileyParamList(
+                schema.GetAttributes());
+    };
+
+
+    _AcquireRiley()->ModifyDisplayFilter(_rileyId,
+        HdPrman_GetRileyObjectPtr(displayFilter),
+        HdPrman_GetRileyObjectPtr(attributes)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyDisplayFilterPrim::~HdPrman_RileyDisplayFilterPrim()
+{
+    _AcquireRiley()->DeleteDisplayFilter(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterPrim.h
new file mode 100644
index 0000000000..eb20dc4ff4
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterPrim.h
@@ -0,0 +1,73 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLAY_FILTER_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLAY_FILTER_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyDisplayFilterPrimHandle =
+    std::shared_ptr<class HdPrman_RileyDisplayFilterPrim>;
+
+/// \class HdPrman_RileyDisplayFilterPrim
+///
+/// Wraps a riley DisplayFilter object, initializing or updating it
+/// using the HdPrmanRileyDisplayFilterSchema.
+///
+class HdPrman_RileyDisplayFilterPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyDisplayFilterPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyDisplayFilterPrim() override;
+
+    using RileyId = riley::DisplayFilterId;
+    using RileyIdList = riley::DisplayFilterList;
+
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterSchema.cpp
new file mode 100644
index 0000000000..45953add5e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterSchema.cpp
@@ -0,0 +1,155 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyDisplayFilterSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyDisplayFilterSchemaTokens,
+    HD_PRMAN_RILEY_DISPLAY_FILTER_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyShadingNodeVectorSchema
+HdPrmanRileyDisplayFilterSchema::GetDisplayFilter()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyShadingNodeVectorSchema(_GetTypedDataSource<HdVectorDataSource>(
+        HdPrmanRileyDisplayFilterSchemaTokens->displayFilter));
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyDisplayFilterSchema::GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyDisplayFilterSchemaTokens->attributes));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyDisplayFilterSchema::BuildRetained(
+        const HdVectorDataSourceHandle &displayFilter,
+        const HdContainerDataSourceHandle &attributes
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (displayFilter) {
+        _names[_count] = HdPrmanRileyDisplayFilterSchemaTokens->displayFilter;
+        _values[_count++] = displayFilter;
+    }
+
+    if (attributes) {
+        _names[_count] = HdPrmanRileyDisplayFilterSchemaTokens->attributes;
+        _values[_count++] = attributes;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyDisplayFilterSchema::Builder &
+HdPrmanRileyDisplayFilterSchema::Builder::SetDisplayFilter(
+    const HdVectorDataSourceHandle &displayFilter)
+{
+    _displayFilter = displayFilter;
+    return *this;
+}
+
+HdPrmanRileyDisplayFilterSchema::Builder &
+HdPrmanRileyDisplayFilterSchema::Builder::SetAttributes(
+    const HdContainerDataSourceHandle &attributes)
+{
+    _attributes = attributes;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyDisplayFilterSchema::Builder::Build()
+{
+    return HdPrmanRileyDisplayFilterSchema::BuildRetained(
+        _displayFilter,
+        _attributes
+    );
+}
+
+/*static*/
+HdPrmanRileyDisplayFilterSchema
+HdPrmanRileyDisplayFilterSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyDisplayFilterSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyDisplayFilterSchemaTokens->rileyDisplayFilter))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyDisplayFilterSchema::GetSchemaToken()
+{
+    return HdPrmanRileyDisplayFilterSchemaTokens->rileyDisplayFilter;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyDisplayFilterSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplayFilterSchema::GetDisplayFilterLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplayFilterSchemaTokens->displayFilter);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplayFilterSchema::GetAttributesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplayFilterSchemaTokens->attributes);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterSchema.h
new file mode 100644
index 0000000000..efa0fe4b58
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplayFilterSchema.h
@@ -0,0 +1,176 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLAY_FILTER_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLAY_FILTER_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileySchemaTypeDefs.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_DISPLAY_FILTER_SCHEMA_TOKENS \
+    (rileyDisplayFilter) \
+    (displayFilter) \
+    (attributes) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyDisplayFilterSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_DISPLAY_FILTER_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyDisplayFilterSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyDisplayFilterSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyDisplayFilter" from the parent container and constructs a
+    /// HdPrmanRileyDisplayFilterSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyDisplayFilterSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyShadingNodeVectorSchema GetDisplayFilter()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate displayFilter.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDisplayFilterLocator();
+
+    /// Prim-level relative data source locator to locate attributes.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetAttributesLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdVectorDataSourceHandle &displayFilter,
+        const HdContainerDataSourceHandle &attributes
+    );
+
+    /// \class HdPrmanRileyDisplayFilterSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetDisplayFilter(
+            const HdVectorDataSourceHandle &displayFilter);
+        HDPRMAN_API
+        Builder &SetAttributes(
+            const HdContainerDataSourceHandle &attributes);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdVectorDataSourceHandle _displayFilter;
+        HdContainerDataSourceHandle _attributes;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplayPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyDisplayPrim.cpp
new file mode 100644
index 0000000000..a0f0caaedd
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplayPrim.cpp
@@ -0,0 +1,178 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyDisplayPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyDisplaySchema.h"
+#include "hdPrman/rileyRenderOutputPrim.h"
+#include "hdPrman/rileyRenderTargetPrim.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyDisplayPrim::HdPrman_RileyDisplayPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyDisplaySchema schema =
+        HdPrmanRileyDisplaySchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyId<HdPrman_RileyRenderTargetPrim> renderTarget =
+        HdPrman_RileyId<HdPrman_RileyRenderTargetPrim>(
+            observer,
+            schema.GetRenderTarget());
+
+    HdPrman_RileyString name =
+        HdPrman_RileyString(
+            schema.GetName());
+
+    HdPrman_RileyString driver =
+        HdPrman_RileyString(
+            schema.GetDriver());
+
+    HdPrman_RileyIdList<HdPrman_RileyRenderOutputPrim> renderOutputs =
+        HdPrman_RileyIdList<HdPrman_RileyRenderOutputPrim>(
+            observer,
+            schema.GetRenderOutputs());
+
+    HdPrman_RileyParamList driverParams =
+        HdPrman_RileyParamList(
+            schema.GetDriverParams());
+
+
+    _rileyId = _AcquireRiley()->CreateDisplay(
+        riley::UserId(),
+
+        renderTarget.rileyObject,
+        name.rileyObject,
+        driver.rileyObject,
+        renderOutputs.rileyObject,
+        driverParams.rileyObject);
+
+    _renderTargetPrim = std::move(renderTarget.prim);
+
+    _renderOutputsPrims = std::move(renderOutputs.prims);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyDisplayPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyDisplaySchema schema =
+        HdPrmanRileyDisplaySchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyId<HdPrman_RileyRenderTargetPrim>> renderTarget;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplaySchema::GetRenderTargetLocator())) {
+        renderTarget =
+            HdPrman_RileyId<HdPrman_RileyRenderTargetPrim>(
+                observer,
+                schema.GetRenderTarget());
+    };
+
+    std::optional<HdPrman_RileyString> name;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplaySchema::GetNameLocator())) {
+        name =
+            HdPrman_RileyString(
+                schema.GetName());
+    };
+
+    std::optional<HdPrman_RileyString> driver;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplaySchema::GetDriverLocator())) {
+        driver =
+            HdPrman_RileyString(
+                schema.GetDriver());
+    };
+
+    std::optional<HdPrman_RileyIdList<HdPrman_RileyRenderOutputPrim>> renderOutputs;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplaySchema::GetRenderOutputsLocator())) {
+        renderOutputs =
+            HdPrman_RileyIdList<HdPrman_RileyRenderOutputPrim>(
+                observer,
+                schema.GetRenderOutputs());
+    };
+
+    std::optional<HdPrman_RileyParamList> driverParams;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyDisplaySchema::GetDriverParamsLocator())) {
+        driverParams =
+            HdPrman_RileyParamList(
+                schema.GetDriverParams());
+    };
+
+
+    _AcquireRiley()->ModifyDisplay(_rileyId,
+        HdPrman_GetRileyObjectPtr(renderTarget),
+        HdPrman_GetRileyObjectPtr(name),
+        HdPrman_GetRileyObjectPtr(driver),
+        HdPrman_GetRileyObjectPtr(renderOutputs),
+        HdPrman_GetRileyObjectPtr(driverParams)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+    if (renderTarget) {
+        _renderTargetPrim = std::move(renderTarget->prim);
+    }
+
+    // Now that the Display is using the new
+    // RileyRenderOutput, we can realease the handles
+    // to the old RileyRenderOutput.
+    if (renderOutputs) {
+        _renderOutputsPrims = std::move(renderOutputs->prims);
+    }
+
+}
+
+HdPrman_RileyDisplayPrim::~HdPrman_RileyDisplayPrim()
+{
+    _AcquireRiley()->DeleteDisplay(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+
+    // _renderTargetPrim gets dropped after the Display was
+    // deleted.
+
+    // _renderOutputsPrims gets dropped after the Display was
+    // deleted.
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplayPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyDisplayPrim.h
new file mode 100644
index 0000000000..408546a8f6
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplayPrim.h
@@ -0,0 +1,88 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLAY_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLAY_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using HdPrman_RileyRenderOutputPrimHandle =
+    std::shared_ptr<class HdPrman_RileyRenderOutputPrim>;
+using HdPrman_RileyRenderTargetPrimHandle =
+    std::shared_ptr<class HdPrman_RileyRenderTargetPrim>;
+
+using HdPrman_RileyDisplayPrimHandle =
+    std::shared_ptr<class HdPrman_RileyDisplayPrim>;
+
+/// \class HdPrman_RileyDisplayPrim
+///
+/// Wraps a riley Display object, initializing or updating it
+/// using the HdPrmanRileyDisplaySchema.
+///
+class HdPrman_RileyDisplayPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyDisplayPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyDisplayPrim() override;
+
+    using RileyId = riley::DisplayId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyRenderTargetPrimHandle _renderTargetPrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    std::vector<HdPrman_RileyRenderOutputPrimHandle> _renderOutputsPrims;
+
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplaySchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyDisplaySchema.cpp
new file mode 100644
index 0000000000..80d9750ea7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplaySchema.cpp
@@ -0,0 +1,266 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyDisplaySchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyDisplaySchemaTokens,
+    HD_PRMAN_RILEY_DISPLAY_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPathDataSourceHandle
+HdPrmanRileyDisplaySchema::GetRenderTarget()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyDisplaySchemaTokens->renderTarget);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyDisplaySchema::GetName()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyDisplaySchemaTokens->name);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyDisplaySchema::GetDriver()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyDisplaySchemaTokens->driver);
+}
+
+HdPathArrayDataSourceHandle
+HdPrmanRileyDisplaySchema::GetRenderOutputs()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathArrayDataSource>(
+        HdPrmanRileyDisplaySchemaTokens->renderOutputs);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyDisplaySchema::GetDriverParams()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyDisplaySchemaTokens->driverParams));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyDisplaySchema::BuildRetained(
+        const HdPathDataSourceHandle &renderTarget,
+        const HdTokenDataSourceHandle &name,
+        const HdTokenDataSourceHandle &driver,
+        const HdPathArrayDataSourceHandle &renderOutputs,
+        const HdContainerDataSourceHandle &driverParams
+)
+{
+    TfToken _names[5];
+    HdDataSourceBaseHandle _values[5];
+
+    size_t _count = 0;
+
+    if (renderTarget) {
+        _names[_count] = HdPrmanRileyDisplaySchemaTokens->renderTarget;
+        _values[_count++] = renderTarget;
+    }
+
+    if (name) {
+        _names[_count] = HdPrmanRileyDisplaySchemaTokens->name;
+        _values[_count++] = name;
+    }
+
+    if (driver) {
+        _names[_count] = HdPrmanRileyDisplaySchemaTokens->driver;
+        _values[_count++] = driver;
+    }
+
+    if (renderOutputs) {
+        _names[_count] = HdPrmanRileyDisplaySchemaTokens->renderOutputs;
+        _values[_count++] = renderOutputs;
+    }
+
+    if (driverParams) {
+        _names[_count] = HdPrmanRileyDisplaySchemaTokens->driverParams;
+        _values[_count++] = driverParams;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyDisplaySchema::Builder &
+HdPrmanRileyDisplaySchema::Builder::SetRenderTarget(
+    const HdPathDataSourceHandle &renderTarget)
+{
+    _renderTarget = renderTarget;
+    return *this;
+}
+
+HdPrmanRileyDisplaySchema::Builder &
+HdPrmanRileyDisplaySchema::Builder::SetName(
+    const HdTokenDataSourceHandle &name)
+{
+    _name = name;
+    return *this;
+}
+
+HdPrmanRileyDisplaySchema::Builder &
+HdPrmanRileyDisplaySchema::Builder::SetDriver(
+    const HdTokenDataSourceHandle &driver)
+{
+    _driver = driver;
+    return *this;
+}
+
+HdPrmanRileyDisplaySchema::Builder &
+HdPrmanRileyDisplaySchema::Builder::SetRenderOutputs(
+    const HdPathArrayDataSourceHandle &renderOutputs)
+{
+    _renderOutputs = renderOutputs;
+    return *this;
+}
+
+HdPrmanRileyDisplaySchema::Builder &
+HdPrmanRileyDisplaySchema::Builder::SetDriverParams(
+    const HdContainerDataSourceHandle &driverParams)
+{
+    _driverParams = driverParams;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyDisplaySchema::Builder::Build()
+{
+    return HdPrmanRileyDisplaySchema::BuildRetained(
+        _renderTarget,
+        _name,
+        _driver,
+        _renderOutputs,
+        _driverParams
+    );
+}
+
+/*static*/
+HdPrmanRileyDisplaySchema
+HdPrmanRileyDisplaySchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyDisplaySchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyDisplaySchemaTokens->rileyDisplay))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyDisplaySchema::GetSchemaToken()
+{
+    return HdPrmanRileyDisplaySchemaTokens->rileyDisplay;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyDisplaySchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplaySchema::GetRenderTargetLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplaySchemaTokens->renderTarget);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplaySchema::GetNameLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplaySchemaTokens->name);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplaySchema::GetDriverLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplaySchemaTokens->driver);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplaySchema::GetRenderOutputsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplaySchemaTokens->renderOutputs);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyDisplaySchema::GetDriverParamsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyDisplaySchemaTokens->driverParams);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyDisplaySchema.h b/third_party/renderman-26/plugin/hdPrman/rileyDisplaySchema.h
new file mode 100644
index 0000000000..c14d4450fe
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyDisplaySchema.h
@@ -0,0 +1,232 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLAY_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_DISPLAY_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_DISPLAY_SCHEMA_TOKENS \
+    (rileyDisplay) \
+    (renderTarget) \
+    (name) \
+    (driver) \
+    (renderOutputs) \
+    (driverParams) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyDisplaySchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_DISPLAY_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyDisplaySchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyDisplaySchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyDisplay" from the parent container and constructs a
+    /// HdPrmanRileyDisplaySchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyDisplaySchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetRenderTarget()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetName()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetDriver()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathArrayDataSourceHandle GetRenderOutputs()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetDriverParams()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate renderTarget.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetRenderTargetLocator();
+
+    /// Prim-level relative data source locator to locate name.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetNameLocator();
+
+    /// Prim-level relative data source locator to locate driver.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDriverLocator();
+
+    /// Prim-level relative data source locator to locate renderOutputs.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetRenderOutputsLocator();
+
+    /// Prim-level relative data source locator to locate driverParams.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDriverParamsLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdPathDataSourceHandle &renderTarget,
+        const HdTokenDataSourceHandle &name,
+        const HdTokenDataSourceHandle &driver,
+        const HdPathArrayDataSourceHandle &renderOutputs,
+        const HdContainerDataSourceHandle &driverParams
+    );
+
+    /// \class HdPrmanRileyDisplaySchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetRenderTarget(
+            const HdPathDataSourceHandle &renderTarget);
+        HDPRMAN_API
+        Builder &SetName(
+            const HdTokenDataSourceHandle &name);
+        HDPRMAN_API
+        Builder &SetDriver(
+            const HdTokenDataSourceHandle &driver);
+        HDPRMAN_API
+        Builder &SetRenderOutputs(
+            const HdPathArrayDataSourceHandle &renderOutputs);
+        HDPRMAN_API
+        Builder &SetDriverParams(
+            const HdContainerDataSourceHandle &driverParams);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdPathDataSourceHandle _renderTarget;
+        HdTokenDataSourceHandle _name;
+        HdTokenDataSourceHandle _driver;
+        HdPathArrayDataSourceHandle _renderOutputs;
+        HdContainerDataSourceHandle _driverParams;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..605d19e8b1
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.cpp
@@ -0,0 +1,433 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/rileyFallbackMaterialSceneIndexPlugin.h"
+
+#include "hdPrman/rileyMaterialSchema.h"
+#include "hdPrman/rileyParamSchema.h"
+#include "hdPrman/rileyShadingNodeSchema.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+#include "hdPrman/tokens.h"
+
+#include "pxr/usd/sdr/declare.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/usd/sdr/registry.h"
+
+#include "pxr/imaging/hd/mergingSceneIndex.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/retainedSceneIndex.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_RileyFallbackMaterialSceneIndexPlugin"))
+);
+
+static const char * const _rendererDisplayName = "Prman";
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+static
+HdContainerDataSourceHandle
+_MaterialNodeDataSource(
+    const TfToken &rileyShadingNodeType,
+    const NdrIdentifier &identifier,
+    const TfToken &rileyHandle,
+    const HdContainerDataSourceHandle &params)
+{
+    static const NdrTokenVec sourceTypes = {
+        TfToken("OSL"),
+        TfToken("RmanCpp")
+    };
+
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+    SdrShaderNodeConstPtr sdrEntry =
+        sdrRegistry.GetShaderNodeByIdentifier(identifier, sourceTypes);
+
+    if (!sdrEntry) {
+        TF_CODING_ERROR("Cannot create fallback material. This is because "
+                        "the shader identifier %s for node <%s> is unknown.\n",
+                        identifier.GetText(), rileyHandle.GetText());
+        return nullptr;
+    }
+
+    return
+        HdPrmanRileyShadingNodeSchema::Builder()
+            .SetType(
+                HdPrmanRileyShadingNodeSchema::BuildTypeDataSource(
+                    rileyShadingNodeType))
+            .SetName(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    TfToken(sdrEntry->GetResolvedImplementationURI())))
+            .SetHandle(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    rileyHandle))
+            .SetParams(
+                HdPrmanRileyParamListSchema::Builder()
+                    .SetParams(params)
+                    .Build())
+           .Build();
+}
+
+static
+HdContainerDataSourceHandle
+_PxrSurfaceParams()
+{
+    static const TfToken names[] = {
+        TfToken("specularModelType"),
+        TfToken("diffuseDoubleSided"),
+        TfToken("specularDoubleSided"),
+
+        TfToken("diffuseColor"),
+        TfToken("diffuseGain"),
+        TfToken("specularFaceColor"),
+        TfToken("specularEdgeColor"),
+        TfToken("specularRoughness"),
+        TfToken("presence")
+    };
+
+    static HdDataSourceBaseHandle const params[] = {
+        /* specularModelType */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<int>::New(1))
+            .Build(),
+
+        /* diffuseDoubleSided */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<int>::New(1))
+            .Build(),
+
+        /* specularDoubleSided */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<int>::New(1))
+            .Build(),
+
+
+        /* diffuseColor */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    TfToken("/UsdPreviewSurfaceParameters:diffuseColorOut")))
+            .SetRole(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    HdPrmanRileyAdditionalRoleTokens->colorReference))
+            .Build(),
+
+        /* diffuseGain */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    TfToken("/UsdPreviewSurfaceParameters:diffuseGainOut")))
+            .SetRole(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    HdPrmanRileyAdditionalRoleTokens->floatReference))
+            .Build(),
+
+        /* specularFaceColor */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    TfToken("/UsdPreviewSurfaceParameters:specularFaceColorOut")))
+            .SetRole(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    HdPrmanRileyAdditionalRoleTokens->colorReference))
+            .Build(),
+
+        /* specularEdgeColor */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    TfToken("/UsdPreviewSurfaceParameters:specularEdgeColorOut")))
+            .SetRole(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    HdPrmanRileyAdditionalRoleTokens->colorReference))
+            .Build(),
+
+        /* specularRoughness */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    TfToken("/UsdPreviewSurfaceParameters:specularRoughnessOut")))
+            .SetRole(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    HdPrmanRileyAdditionalRoleTokens->floatReference))
+            .Build(),
+
+        /* presence */
+        HdPrmanRileyParamSchema::Builder()
+            .SetValue(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    TfToken("/Primvar_displayOpacity:resultF")))
+            .SetRole(
+                HdRetainedTypedSampledDataSource<TfToken>::New(
+                    HdPrmanRileyAdditionalRoleTokens->floatReference))
+            .Build()
+    };
+
+    static_assert(TfArraySize(names) == TfArraySize(params));
+
+    return HdPrmanRileyParamContainerSchema::BuildRetained(
+        TfArraySize(names), names, params);
+}
+
+static
+HdContainerDataSourceHandle
+_UsdPreviewSurfaceParametersParams()
+{
+    return
+        HdRetainedContainerDataSource::New(
+            TfToken("diffuseColor"),
+            HdPrmanRileyParamSchema::Builder()
+                .SetValue(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        TfToken("/Primvar_displayColor:resultRGB")))
+                .SetRole(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        HdPrmanRileyAdditionalRoleTokens->colorReference))
+                .Build(),
+            TfToken("roughness"),
+            HdPrmanRileyParamSchema::Builder()
+                .SetValue(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        TfToken("/Primvar_displayRoughness:resultF")))
+                .SetRole(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        HdPrmanRileyAdditionalRoleTokens->floatReference))
+                .Build(),
+            TfToken("metallic"),
+            HdPrmanRileyParamSchema::Builder()
+                .SetValue(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        TfToken("/Primvar_displayMetallic:resultF")))
+                .SetRole(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        HdPrmanRileyAdditionalRoleTokens->floatReference))
+                .Build(),
+            TfToken("opacity"),
+            HdPrmanRileyParamSchema::Builder()
+                .SetValue(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        TfToken("/Primvar_displayOpacity:resultF")))
+                .SetRole(
+                    HdRetainedTypedSampledDataSource<TfToken>::New(
+                        HdPrmanRileyAdditionalRoleTokens->floatReference))
+                .Build()
+        );
+}
+
+static
+HdContainerDataSourceHandle
+_ColorPrimvarReader(
+    const TfToken &rileyHandle,
+    const TfToken &primvarName,
+    const GfVec3f &defaultColor)
+{
+    return
+        _MaterialNodeDataSource(
+            HdPrmanRileyShadingNodeSchemaTokens->pattern,
+            TfToken("PxrPrimvar"),
+            rileyHandle,
+            HdRetainedContainerDataSource::New(
+                TfToken("type"),
+                HdPrmanRileyParamSchema::Builder()
+                    .SetValue(
+                        HdRetainedTypedSampledDataSource<TfToken>::New(
+                            TfToken("color")))
+                    .Build(),
+                TfToken("varname"),
+                HdPrmanRileyParamSchema::Builder()
+                   .SetValue(
+                       HdRetainedTypedSampledDataSource<TfToken>::New(
+                           primvarName))
+                   .Build(),
+                TfToken("defaultColor"),
+                HdPrmanRileyParamSchema::Builder()
+                   .SetValue(
+                       HdRetainedTypedSampledDataSource<GfVec3f>::New(
+                           defaultColor))
+                   .SetRole(
+                       HdRetainedTypedSampledDataSource<TfToken>::New(
+                           HdPrimvarRoleTokens->color))
+                   .Build()));
+}
+
+static
+HdContainerDataSourceHandle
+_FloatPrimvarReader(
+    const TfToken &rileyHandle,
+    const TfToken &primvarName,
+    const float defaultFloat)
+{
+    return
+        _MaterialNodeDataSource(
+            HdPrmanRileyShadingNodeSchemaTokens->pattern,
+            TfToken("PxrPrimvar"),
+            rileyHandle,
+            HdRetainedContainerDataSource::New(
+                TfToken("type"),
+                HdPrmanRileyParamSchema::Builder()
+                    .SetValue(
+                        HdRetainedTypedSampledDataSource<TfToken>::New(
+                            TfToken("float")))
+                    .Build(),
+                TfToken("varname"),
+                HdPrmanRileyParamSchema::Builder()
+                   .SetValue(
+                       HdRetainedTypedSampledDataSource<TfToken>::New(
+                           primvarName))
+                   .Build(),
+                TfToken("defaultFloat"),
+                HdPrmanRileyParamSchema::Builder()
+                    .SetValue(
+                        HdRetainedTypedSampledDataSource<float>::New(
+                            defaultFloat))
+                    .Build()));
+}
+
+// This is an unrolled version of the fallback material from material.cpp
+// translated to HdPrmanRileyMaterialSchema.
+//
+// This should really be an HdMaterialNetworkSchema that is translated
+// to a HdPrmanRileyMaterialSchema.
+//
+// However, we do not have implemented yet the conversion function and scene
+// index translating HdMaterialNetworkSchema to HdPrmanRileyMaterialSchema.
+//
+static
+HdContainerDataSourceHandle
+_FallbackMaterialDataSource()
+{
+    HdDataSourceBaseHandle const nodes[] = {
+        _ColorPrimvarReader(
+            TfToken("/Primvar_displayColor"),
+            TfToken("displayColor"),
+            {0.5, 0.5, 0.5}),
+
+        _FloatPrimvarReader(
+            TfToken("/Primvar_displayMetallic"),
+            TfToken("displayMetallic"),
+            0.0f),
+
+        _FloatPrimvarReader(
+            TfToken("/Primvar_displayOpacity"),
+            TfToken("displayOpacity"),
+            1.0f),
+
+        _FloatPrimvarReader(
+            TfToken("/Primvar_displayRoughness"),
+            TfToken("displayRoughness"),
+            1.0f
+            ),
+
+        _MaterialNodeDataSource(
+            HdPrmanRileyShadingNodeSchemaTokens->pattern,
+            TfToken("UsdPreviewSurfaceParameters"),
+            TfToken("/UsdPreviewSurfaceParameters"),
+            _UsdPreviewSurfaceParametersParams()),
+
+        _MaterialNodeDataSource(
+            HdPrmanRileyShadingNodeSchemaTokens->bxdf,
+            TfToken("PxrSurface"),
+            TfToken("/PxrSurface"),
+            _PxrSurfaceParams())
+    };
+
+    return
+        HdPrmanRileyMaterialSchema::Builder()
+            .SetBxdf(
+                HdPrmanRileyShadingNodeVectorSchema::BuildRetained(
+                    TfArraySize(nodes),
+                    nodes))
+            .Build();
+}
+
+static
+HdSceneIndexBaseRefPtr
+_FallbackMaterialScene()
+{
+    HdRetainedSceneIndexRefPtr const scene = HdRetainedSceneIndex::New();
+
+    scene->AddPrims(
+        { { HdPrman_RileyFallbackMaterialSceneIndexPlugin::
+                GetFallbackMaterialPath(),
+            HdPrmanRileyPrimTypeTokens->material,
+            HdRetainedContainerDataSource::New(
+                HdPrmanRileyMaterialSchema::GetSchemaToken(),
+                _FallbackMaterialDataSource()) } });
+
+    return scene;
+}
+
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Plugin registrations
+////////////////////////////////////////////////////////////////////////////////
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<
+        HdPrman_RileyFallbackMaterialSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 100;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _rendererDisplayName,
+        _tokens->sceneIndexPluginName,
+        /* inputArgs = */ nullptr,
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtEnd);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Scene Index plugin Implementation
+////////////////////////////////////////////////////////////////////////////////
+
+HdPrman_RileyFallbackMaterialSceneIndexPlugin::
+HdPrman_RileyFallbackMaterialSceneIndexPlugin() = default;
+
+const SdfPath &
+HdPrman_RileyFallbackMaterialSceneIndexPlugin::GetFallbackMaterialPath()
+{
+    static const SdfPath result("/__RileyFallbackMaterial");
+    return result;
+}
+
+HdSceneIndexBaseRefPtr
+HdPrman_RileyFallbackMaterialSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+    if (!TfGetEnvSetting(HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER)) {
+        return inputScene;
+    }
+
+    HdMergingSceneIndexRefPtr const result = HdMergingSceneIndex::New();
+
+    result->AddInputScene(inputScene, SdfPath::AbsoluteRootPath());
+
+    static HdSceneIndexBaseRefPtr fallbackMaterialScene =
+        _FallbackMaterialScene();
+    result->AddInputScene(fallbackMaterialScene, GetFallbackMaterialPath());
+
+    return result;
+#else 
+    return inputScene;
+#endif
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.h
new file mode 100644
index 0000000000..1708bb1a9a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyFallbackMaterialSceneIndexPlugin.h
@@ -0,0 +1,42 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_FALLBACK_MATERIAL_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_FALLBACK_MATERIAL_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_RileyFallbackMaterialSceneIndexPlugin
+///
+/// Prman scene index adding hard-coded fallback material.
+///
+/// Only active if HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER is set to
+/// true.
+///
+class HdPrman_RileyFallbackMaterialSceneIndexPlugin
+                                  : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_RileyFallbackMaterialSceneIndexPlugin();
+
+    static const SdfPath &GetFallbackMaterialPath();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_FALLBACK_MATERIAL_SCENE_INDEX_PLUGIN_H
+
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGenPrim.py b/third_party/renderman-26/plugin/hdPrman/rileyGenPrim.py
new file mode 100644
index 0000000000..6c18c13de9
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGenPrim.py
@@ -0,0 +1,338 @@
+#!/usr/bin/env python
+#
+#
+# Copyright 2023 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+
+from jinja2 import Environment, FileSystemLoader, Template, pass_context
+import re
+import os
+import sys
+import textwrap
+from argparse import ArgumentParser
+
+#------------------------------------------------------------------------------
+
+# DATA SOURCE TYPE ALIASES
+T_CONTAINER = "HdContainerDataSource"
+T_INT = "HdIntDataSource"
+T_INTARRAY = "HdIntArrayDataSource"
+T_FLOAT = "HdFloatDataSource"
+T_FLOATARRAY = "HdFloatArrayDataSource"
+T_DOUBLE = "HdDoubleDataSource"
+T_DOUBLEARRAY = "HdDoubleArrayDataSource"
+T_BOOL = "HdBoolDataSource"
+T_BOOLARRAY = "HdBoolArrayDataSource"
+T_TOKEN = "HdTokenDataSource"
+T_TOKENARRAY = "HdTokenArrayDataSource"
+T_PATH = "HdPathDataSource"
+T_PATHARRAY = "HdPathArrayDataSource"
+T_ASSETPATH = "HdAssetPathDataSource"
+T_VEC2I = "HdVec2iDataSource"
+T_VEC2F = "HdVec2fDataSource"
+T_VEC2D = "HdVec2dDataSource"
+T_VEC2FARRAY = "HdVec2fArrayDataSource"
+T_VEC2DARRAY = "HdVec2dArrayDataSource"
+T_VEC3I = "HdVec3iDataSource"
+T_VEC3F = "HdVec3fDataSource"
+T_VEC3D = "HdVec3dDataSource"
+T_VEC3FARRAY = "HdVec3fArrayDataSource"
+T_VEC3DARRAY = "HdVec3dArrayDataSource"
+T_VEC4I = "HdVec4iDataSource"
+T_VEC4F = "HdVec4fDataSource"
+T_VEC4D = "HdVec4dDataSource"
+T_VEC4DARRAY = "HdVec4dArrayDataSource"
+T_MATRIX = "HdMatrixDataSource"
+T_MATRIXARRAY = "HdMatrixArrayDataSource"
+T_LOCATOR = "HdLocatorDataSource"
+T_FORMAT = "HdFormatDataSource"
+T_SAMPLED = "HdSampledDataSource"
+T_TUPLE = "HdTupleTypeDataSource"
+T_SIZET = "HdSizetDataSource"
+T_BASE = "HdDataSourceBase"
+T_STRING = "HdStringDataSource"
+T_VECTOR = "HdVectorDataSource"
+T_RESOLVERCONTEXT = "HdResolverContextDataSource"
+
+#------------------------------------------------------------------------------
+# Filters
+
+def CapitalizeFirstLetter(s):
+    return s[0].upper() + s[1:]
+
+def UncapitalizeFirstLetter(s):
+    return s[0].lower() + s[1:]
+
+def CamelCaseToSnakeCase(name):
+    nameTokens = []
+    for s in re.compile(r'([A-Z])').split(name):
+        if not s:
+            continue
+        if nameTokens and nameTokens[-1].isupper():
+            nameTokens[-1] = nameTokens[-1] + s
+        else:
+            nameTokens.append(s)
+
+    return '_'.join(nameTokens).upper()
+
+def PathCamelCaseToSnakeCase(path):
+    s = '_'.join(CamelCaseToSnakeCase(name)
+                 for name in path.split('/'))
+    return s.replace('.', '_')
+
+def ToUnderlyingDataSource(dataSourceTypeOrSchemaName):
+    if dataSourceTypeOrSchemaName.endswith('Schema'):
+        if dataSourceTypeOrSchemaName.endswith('VectorSchema'):
+            return 'HdVectorDataSource'
+        else:
+            return 'HdContainerDataSource'
+    else:
+        return dataSourceTypeOrSchemaName
+
+def ToComment(text, indent = 0):
+    result = ''
+
+    for paragraph in re.split(r'\n\s*\n', text, re.DOTALL):
+        for line in textwrap.wrap(' '.join(paragraph.split()),
+                                  width = 75 - indent):
+            result += indent * ' ' + '// ' + line + '\n'
+        result += indent * ' ' + '//' + '\n'
+
+    return result
+
+def ToTokenName(text : str):
+    """
+    Given a string starting with '(' such as '(class_, "class")', returns 'class_'.
+    
+    Otherwise, just returns the input.
+    """
+
+    if not text.startswith('('):
+        return text
+    if not text.endswith(')'):
+        raise RuntimeError(
+            'Expected token specifier that start with "(" to end with ")". '
+            'Got "%s".' % text)
+    parts = text[1:-1].split(',')
+    if not len(parts) == 2:
+        raise RuntimeError(
+            'Expected token specifier to have two parts. Got "%s".' % text)
+    return parts[0].strip()
+
+@pass_context
+def Expand(context, text):
+    return Template(text).render(**context)
+
+#------------------------------------------------------------------------------
+
+bin_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+
+defaultSchemadefsDir = os.path.join(bin_path, 'codegenTemplates')
+
+env = Environment(loader=FileSystemLoader(defaultSchemadefsDir))
+env.filters['capitalizeFirst'] = CapitalizeFirstLetter
+env.filters['uncapitalizeFirst'] = UncapitalizeFirstLetter
+env.filters['snake'] = PathCamelCaseToSnakeCase
+env.filters['underlyingDataSource'] = ToUnderlyingDataSource
+env.filters['makeComment'] = ToComment
+env.filters['tokenName'] = ToTokenName
+env.filters['expand'] = Expand
+
+headerTemplate = env.get_template("rileyPrim.h")
+implTemplate = env.get_template("rileyPrim.cpp")
+
+#------------------------------------------------------------------------------
+
+customCodeRegEx = r'// --\(BEGIN CUSTOM CODE: (?P<word>[\w ]+)\)--\n(.*)\n// --\(END CUSTOM CODE: (?P=word)\)--'
+
+def ExtractCustomCode(path):
+    if not os.path.isfile(path):
+        return {}
+    with open(path, 'r') as f:
+        contents = f.read()
+    return dict((key, text) for key, text in re.findall(customCodeRegEx, contents, re.DOTALL)
+                if text.strip())
+
+def ApplyUnderlayToMembers(members):
+    global_member_opt_dict = {}
+    for name, type_name, opt_dict in members:
+        if name == 'ALL_MEMBERS':
+            global_member_opt_dict = opt_dict
+            break
+
+    return [ (name, type_name, global_member_opt_dict | opt_dict)
+             for name, type_name, opt_dict in members
+             if name != 'ALL_MEMBERS' ]
+
+def ProcessEntry(dstDir, **args):
+    fields = dict(args)
+
+    library_path = fields['LIBRARY_PATH']
+    include_path = fields.setdefault('INCLUDE_PATH', library_path)
+    header_guard = fields.setdefault('HEADER_GUARD', library_path)
+    library_name = fields.setdefault('LIBRARY_NAME', CapitalizeFirstLetter(library_path.split('/')[-1]))
+    fields.setdefault('LIBRARY_API', '%s_API' % library_name.upper())
+
+    schema_name = fields['SCHEMA_NAME']
+    fields.setdefault('SCHEMA_CLASS_NAME', library_name + schema_name + 'Schema')
+
+    fields.setdefault('RILEY_TYPE', schema_name.removeprefix('Riley'))
+    
+    baseName = fields.setdefault('FILE_NAME', UncapitalizeFirstLetter(schema_name) + 'Prim')
+
+    headerName = baseName + '.h'
+    headerPath = os.path.join(dstDir, headerName)
+    implName = baseName + '.cpp'
+    implPath = os.path.join(dstDir, implName)
+
+    fields['CUSTOM_CODE_HEADER'] = ExtractCustomCode(headerPath)
+    fields['CUSTOM_CODE_IMPL'] = ExtractCustomCode(implPath)
+
+    if 'MEMBERS' in fields:
+        fields['MEMBERS'] = ApplyUnderlayToMembers(fields['MEMBERS'])
+
+    fields['FORWARD_DECLS'] = sorted(set(
+        opt_dict['RILEY_RELATIONSHIP_TARGET']
+        for name, type_name, opt_dict in fields['MEMBERS']
+        if 'RILEY_RELATIONSHIP_TARGET' in opt_dict))
+
+    for name, type_name, opt_dict in fields['MEMBERS']:
+        if 'RILEY_RELATIONSHIP_TARGET' in opt_dict:
+            opt_dict.setdefault('RILEY_NEEDS_OBSERVER', True)
+            if type_name == T_PATHARRAY:
+                opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyIdList<HdPrman_' + opt_dict['RILEY_RELATIONSHIP_TARGET'] + 'Prim>')
+            else:
+                opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyId<HdPrman_' + opt_dict['RILEY_RELATIONSHIP_TARGET'] + 'Prim>')
+        elif 'RILEY_IS_NAME' in opt_dict:
+            opt_dict.setdefault('RILEY_CONVERTER', '')
+        elif type_name == T_FLOAT:
+            opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyFloat')
+        elif type_name == T_TOKEN:
+            opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyString')
+            opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyParamList')
+        elif type_name == T_MATRIX:
+            opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyTransform')
+            opt_dict.setdefault('RILEY_NEEDS_SHUTTER_INTERVAL', True)
+        elif type_name == 'HdPrmanRileyShadingNodeSchema':
+            opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyShadingNode')
+        elif type_name == 'HdPrmanRileyShadingNodeVectorSchema':
+            opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyShadingNetwork')
+        elif type_name == 'HdPrmanRileyParamListSchema':
+            opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyParamList')
+        elif type_name == 'HdPrmanRileyPrimvarListSchema':
+            opt_dict.setdefault('RILEY_CONVERTER', 'HdPrman_RileyPrimvarList')
+            opt_dict.setdefault('RILEY_NEEDS_SHUTTER_INTERVAL', True)
+
+    if 'HEADER_TEMPLATE_NAME' in fields:
+        localHeaderTemplate = env.get_template(fields['HEADER_TEMPLATE_NAME'])
+    else:
+        localHeaderTemplate = headerTemplate
+
+    with open(headerPath, 'w') as f:
+        f.write(localHeaderTemplate.render(**fields))
+
+    print ('wrote:', headerName)
+
+    if 'IMPL_TEMPLATE_NAME' in fields:
+        localImplTemplate = env.get_template(fields['IMPL_TEMPLATE_NAME'])
+    else:
+        localImplTemplate = implTemplate
+
+    with open(os.path.join(dstDir, implName), 'w') as f:
+        f.write(localImplTemplate.render(**fields))
+
+    print ('wrote:', implName)
+
+def ProcessEntries(dstDir, entries, names):
+    for entry in entries:
+        if names and entry.get('SCHEMA_NAME') not in names:
+            continue
+        ProcessEntry(dstDir, **entry)
+
+#------------------------------------------------------------------------------
+
+def ValidateFiles(srcDir, dstDir):
+    import difflib
+    missing = []
+    diffs = []
+    for dstFile in [os.path.join(dstDir, f) for f in os.listdir(dstDir)
+                    if os.path.isfile(os.path.join(dstDir, f))]:
+        srcFile = os.path.join(srcDir, os.path.basename(dstFile))
+        if not os.path.isfile(srcFile):
+            missing.append(srcFile)
+            continue
+        dstContent, srcContent = open(dstFile).read(), open(srcFile).read()
+        if dstContent != srcContent:
+            diff = '\n'.join(difflib.unified_diff(
+                srcContent.split('\n'),
+                dstContent.split('\n'),
+                'Source ' + os.path.basename(srcFile),
+                'Generated ' + os.path.basename(dstFile)))
+            diffs.append(diff)
+            continue
+
+    if missing or diffs:
+        msg = []
+        if missing:
+            msg.append('*** Missing Generated Files: ' + ', '.join(missing))
+        if diffs:
+            msg.append('*** Differing Generated Files:\n' + '\n'.join(diffs))
+        raise RuntimeError('\n' + '\n'.join(msg))
+    else:
+        print ('validation succeeded')
+
+
+#------------------------------------------------------------------------------
+
+if __name__ == '__main__':
+    ap = ArgumentParser(
+        description='Generate source code schemas.\n'
+            'Use either --all or --names NAME1,NAME2')
+    ap.add_argument('--schemaFile', default='hdSchemaDefs.py')
+    ap.add_argument('--dstDir', default=os.curdir)
+    ap.add_argument('--all', action='store_true')
+    ap.add_argument('--list', action='store_true')
+    ap.add_argument('--names')
+    ap.add_argument('--validate', action='store_true')
+
+    args = ap.parse_args()
+
+    names = []
+    if isinstance(args.names, str):
+        names.extend(args.names.split(','))
+
+    if not names and not args.all and not args.list:
+        ap.print_help()
+        sys.exit(-1)
+
+    entries = eval(open(args.schemaFile).read())
+    if not isinstance(entries, list):
+        raise TypeError(
+            "got unexpected result type from eval('{}'): "
+            "expected dict or list, found {}".format(args.schemaFile, type(v)))
+
+    global_entry = {}
+    for entry in entries:
+        if entry['SCHEMA_NAME'] == 'ALL_SCHEMAS':
+            global_entry = entry
+            break
+
+    entries = [ global_entry | entry
+                for entry in entries 
+                if entry['SCHEMA_NAME'] != 'ALL_SCHEMAS' and entry.get('GENERATE_RILEY_PRIM') ]
+
+    if args.list:
+        for entry in entries:
+            print(entry.get('SCHEMA_NAME'))
+        sys.exit(0)
+
+    if args.validate:
+        import tempfile
+        with tempfile.TemporaryDirectory() as tmpdir:
+            ProcessEntries(tmpdir, entries, names)
+            ValidateFiles(os.curdir, tmpdir)
+    else:
+        ProcessEntries(args.dstDir, entries, names)
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstancePrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstancePrim.cpp
new file mode 100644
index 0000000000..80173ce1b5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstancePrim.cpp
@@ -0,0 +1,194 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyGeometryInstancePrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyGeometryInstanceSchema.h"
+#include "hdPrman/rileyCoordinateSystemPrim.h"
+#include "hdPrman/rileyGeometryPrototypePrim.h"
+#include "hdPrman/rileyMaterialPrim.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyGeometryInstancePrim::HdPrman_RileyGeometryInstancePrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyGeometryInstanceSchema schema =
+        HdPrmanRileyGeometryInstanceSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyId<HdPrman_RileyGeometryPrototypePrim> groupPrototype =
+        HdPrman_RileyId<HdPrman_RileyGeometryPrototypePrim>(
+            observer,
+            schema.GetGroupPrototype());
+
+    HdPrman_RileyId<HdPrman_RileyGeometryPrototypePrim> geoPrototype =
+        HdPrman_RileyId<HdPrman_RileyGeometryPrototypePrim>(
+            observer,
+            schema.GetGeoPrototype());
+
+    HdPrman_RileyId<HdPrman_RileyMaterialPrim> material =
+        HdPrman_RileyId<HdPrman_RileyMaterialPrim>(
+            observer,
+            schema.GetMaterial());
+
+    HdPrman_RileyIdList<HdPrman_RileyCoordinateSystemPrim> coordsys =
+        HdPrman_RileyIdList<HdPrman_RileyCoordinateSystemPrim>(
+            observer,
+            schema.GetCoordsys());
+
+    HdPrman_RileyTransform xform =
+        HdPrman_RileyTransform(
+            schema.GetXform(),
+            _GetShutterInterval());
+
+    HdPrman_RileyParamList attributes =
+        HdPrman_RileyParamList(
+            schema.GetAttributes());
+
+
+    _rileyId = _AcquireRiley()->CreateGeometryInstance(
+        riley::UserId(),
+
+        groupPrototype.rileyObject,
+        geoPrototype.rileyObject,
+        material.rileyObject,
+        coordsys.rileyObject,
+        xform.rileyObject,
+        attributes.rileyObject);
+
+    _groupPrototypePrim = std::move(groupPrototype.prim);
+
+    _geoPrototypePrim = std::move(geoPrototype.prim);
+
+    _materialPrim = std::move(material.prim);
+
+    _coordsysPrims = std::move(coordsys.prims);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyGeometryInstancePrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyGeometryInstanceSchema schema =
+        HdPrmanRileyGeometryInstanceSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyId<HdPrman_RileyMaterialPrim>> material;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyGeometryInstanceSchema::GetMaterialLocator())) {
+        material =
+            HdPrman_RileyId<HdPrman_RileyMaterialPrim>(
+                observer,
+                schema.GetMaterial());
+    };
+
+    std::optional<HdPrman_RileyIdList<HdPrman_RileyCoordinateSystemPrim>> coordsys;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyGeometryInstanceSchema::GetCoordsysLocator())) {
+        coordsys =
+            HdPrman_RileyIdList<HdPrman_RileyCoordinateSystemPrim>(
+                observer,
+                schema.GetCoordsys());
+    };
+
+    std::optional<HdPrman_RileyTransform> xform;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyGeometryInstanceSchema::GetXformLocator())) {
+        xform =
+            HdPrman_RileyTransform(
+                schema.GetXform(),
+                _GetShutterInterval());
+    };
+
+    std::optional<HdPrman_RileyParamList> attributes;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyGeometryInstanceSchema::GetAttributesLocator())) {
+        attributes =
+            HdPrman_RileyParamList(
+                schema.GetAttributes());
+    };
+
+
+    _AcquireRiley()->ModifyGeometryInstance(
+// --(BEGIN CUSTOM CODE: Modify)--
+        _groupPrototypePrim ? _groupPrototypePrim->GetRileyId() : riley::GeometryPrototypeId::InvalidId(),
+        _rileyId,
+
+        HdPrman_GetRileyObjectPtr(material),
+        HdPrman_GetRileyObjectPtr(coordsys),
+        HdPrman_GetRileyObjectPtr(xform),
+        HdPrman_GetRileyObjectPtr(attributes)
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+    if (material) {
+        _materialPrim = std::move(material->prim);
+    }
+
+    // Now that the GeometryInstance is using the new
+    // RileyCoordinateSystem, we can realease the handles
+    // to the old RileyCoordinateSystem.
+    if (coordsys) {
+        _coordsysPrims = std::move(coordsys->prims);
+    }
+
+}
+
+HdPrman_RileyGeometryInstancePrim::~HdPrman_RileyGeometryInstancePrim()
+{
+    _AcquireRiley()->DeleteGeometryInstance(
+// --(BEGIN CUSTOM CODE: Delete)--
+        _groupPrototypePrim ? _groupPrototypePrim->GetRileyId() : riley::GeometryPrototypeId::InvalidId(),
+        _rileyId
+// --(END CUSTOM CODE: Delete)--
+        );
+
+
+    // _groupPrototypePrim gets dropped after the GeometryInstance was
+    // deleted.
+
+    // _geoPrototypePrim gets dropped after the GeometryInstance was
+    // deleted.
+
+    // _materialPrim gets dropped after the GeometryInstance was
+    // deleted.
+
+    // _coordsysPrims gets dropped after the GeometryInstance was
+    // deleted.
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstancePrim.h b/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstancePrim.h
new file mode 100644
index 0000000000..c4a50edf4f
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstancePrim.h
@@ -0,0 +1,102 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GEOMETRY_INSTANCE_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GEOMETRY_INSTANCE_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using HdPrman_RileyCoordinateSystemPrimHandle =
+    std::shared_ptr<class HdPrman_RileyCoordinateSystemPrim>;
+using HdPrman_RileyGeometryPrototypePrimHandle =
+    std::shared_ptr<class HdPrman_RileyGeometryPrototypePrim>;
+using HdPrman_RileyMaterialPrimHandle =
+    std::shared_ptr<class HdPrman_RileyMaterialPrim>;
+
+using HdPrman_RileyGeometryInstancePrimHandle =
+    std::shared_ptr<class HdPrman_RileyGeometryInstancePrim>;
+
+/// \class HdPrman_RileyGeometryInstancePrim
+///
+/// Wraps a riley GeometryInstance object, initializing or updating it
+/// using the HdPrmanRileyGeometryInstanceSchema.
+///
+class HdPrman_RileyGeometryInstancePrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyGeometryInstancePrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyGeometryInstancePrim() override;
+
+    using RileyId = riley::GeometryInstanceId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyGeometryPrototypePrimHandle _groupPrototypePrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyGeometryPrototypePrimHandle _geoPrototypePrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyMaterialPrimHandle _materialPrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    std::vector<HdPrman_RileyCoordinateSystemPrimHandle> _coordsysPrims;
+
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstanceSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstanceSchema.cpp
new file mode 100644
index 0000000000..ee6a761d50
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstanceSchema.cpp
@@ -0,0 +1,303 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyGeometryInstanceSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyGeometryInstanceSchemaTokens,
+    HD_PRMAN_RILEY_GEOMETRY_INSTANCE_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPathDataSourceHandle
+HdPrmanRileyGeometryInstanceSchema::GetGroupPrototype()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyGeometryInstanceSchemaTokens->groupPrototype);
+}
+
+HdPathDataSourceHandle
+HdPrmanRileyGeometryInstanceSchema::GetGeoPrototype()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyGeometryInstanceSchemaTokens->geoPrototype);
+}
+
+HdPathDataSourceHandle
+HdPrmanRileyGeometryInstanceSchema::GetMaterial()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyGeometryInstanceSchemaTokens->material);
+}
+
+HdPathArrayDataSourceHandle
+HdPrmanRileyGeometryInstanceSchema::GetCoordsys()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathArrayDataSource>(
+        HdPrmanRileyGeometryInstanceSchemaTokens->coordsys);
+}
+
+HdMatrixDataSourceHandle
+HdPrmanRileyGeometryInstanceSchema::GetXform()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdMatrixDataSource>(
+        HdPrmanRileyGeometryInstanceSchemaTokens->xform);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyGeometryInstanceSchema::GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyGeometryInstanceSchemaTokens->attributes));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyGeometryInstanceSchema::BuildRetained(
+        const HdPathDataSourceHandle &groupPrototype,
+        const HdPathDataSourceHandle &geoPrototype,
+        const HdPathDataSourceHandle &material,
+        const HdPathArrayDataSourceHandle &coordsys,
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &attributes
+)
+{
+    TfToken _names[6];
+    HdDataSourceBaseHandle _values[6];
+
+    size_t _count = 0;
+
+    if (groupPrototype) {
+        _names[_count] = HdPrmanRileyGeometryInstanceSchemaTokens->groupPrototype;
+        _values[_count++] = groupPrototype;
+    }
+
+    if (geoPrototype) {
+        _names[_count] = HdPrmanRileyGeometryInstanceSchemaTokens->geoPrototype;
+        _values[_count++] = geoPrototype;
+    }
+
+    if (material) {
+        _names[_count] = HdPrmanRileyGeometryInstanceSchemaTokens->material;
+        _values[_count++] = material;
+    }
+
+    if (coordsys) {
+        _names[_count] = HdPrmanRileyGeometryInstanceSchemaTokens->coordsys;
+        _values[_count++] = coordsys;
+    }
+
+    if (xform) {
+        _names[_count] = HdPrmanRileyGeometryInstanceSchemaTokens->xform;
+        _values[_count++] = xform;
+    }
+
+    if (attributes) {
+        _names[_count] = HdPrmanRileyGeometryInstanceSchemaTokens->attributes;
+        _values[_count++] = attributes;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyGeometryInstanceSchema::Builder &
+HdPrmanRileyGeometryInstanceSchema::Builder::SetGroupPrototype(
+    const HdPathDataSourceHandle &groupPrototype)
+{
+    _groupPrototype = groupPrototype;
+    return *this;
+}
+
+HdPrmanRileyGeometryInstanceSchema::Builder &
+HdPrmanRileyGeometryInstanceSchema::Builder::SetGeoPrototype(
+    const HdPathDataSourceHandle &geoPrototype)
+{
+    _geoPrototype = geoPrototype;
+    return *this;
+}
+
+HdPrmanRileyGeometryInstanceSchema::Builder &
+HdPrmanRileyGeometryInstanceSchema::Builder::SetMaterial(
+    const HdPathDataSourceHandle &material)
+{
+    _material = material;
+    return *this;
+}
+
+HdPrmanRileyGeometryInstanceSchema::Builder &
+HdPrmanRileyGeometryInstanceSchema::Builder::SetCoordsys(
+    const HdPathArrayDataSourceHandle &coordsys)
+{
+    _coordsys = coordsys;
+    return *this;
+}
+
+HdPrmanRileyGeometryInstanceSchema::Builder &
+HdPrmanRileyGeometryInstanceSchema::Builder::SetXform(
+    const HdMatrixDataSourceHandle &xform)
+{
+    _xform = xform;
+    return *this;
+}
+
+HdPrmanRileyGeometryInstanceSchema::Builder &
+HdPrmanRileyGeometryInstanceSchema::Builder::SetAttributes(
+    const HdContainerDataSourceHandle &attributes)
+{
+    _attributes = attributes;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyGeometryInstanceSchema::Builder::Build()
+{
+    return HdPrmanRileyGeometryInstanceSchema::BuildRetained(
+        _groupPrototype,
+        _geoPrototype,
+        _material,
+        _coordsys,
+        _xform,
+        _attributes
+    );
+}
+
+/*static*/
+HdPrmanRileyGeometryInstanceSchema
+HdPrmanRileyGeometryInstanceSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyGeometryInstanceSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyGeometryInstanceSchemaTokens->RileyGeometryInstance))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyGeometryInstanceSchema::GetSchemaToken()
+{
+    return HdPrmanRileyGeometryInstanceSchemaTokens->RileyGeometryInstance;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyGeometryInstanceSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryInstanceSchema::GetGroupPrototypeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryInstanceSchemaTokens->groupPrototype);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryInstanceSchema::GetGeoPrototypeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryInstanceSchemaTokens->geoPrototype);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryInstanceSchema::GetMaterialLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryInstanceSchemaTokens->material);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryInstanceSchema::GetCoordsysLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryInstanceSchemaTokens->coordsys);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryInstanceSchema::GetXformLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryInstanceSchemaTokens->xform);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryInstanceSchema::GetAttributesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryInstanceSchemaTokens->attributes);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstanceSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstanceSchema.h
new file mode 100644
index 0000000000..e2fed02f90
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGeometryInstanceSchema.h
@@ -0,0 +1,251 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GEOMETRY_INSTANCE_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GEOMETRY_INSTANCE_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_GEOMETRY_INSTANCE_SCHEMA_TOKENS \
+    (RileyGeometryInstance) \
+    (groupPrototype) \
+    (geoPrototype) \
+    (material) \
+    (coordsys) \
+    (xform) \
+    (attributes) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyGeometryInstanceSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_GEOMETRY_INSTANCE_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyGeometryInstanceSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyGeometryInstanceSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "RileyGeometryInstance" from the parent container and constructs a
+    /// HdPrmanRileyGeometryInstanceSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyGeometryInstanceSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetGroupPrototype()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetGeoPrototype()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetMaterial()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathArrayDataSourceHandle GetCoordsys()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdMatrixDataSourceHandle GetXform()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate groupPrototype.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetGroupPrototypeLocator();
+
+    /// Prim-level relative data source locator to locate geoPrototype.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetGeoPrototypeLocator();
+
+    /// Prim-level relative data source locator to locate material.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetMaterialLocator();
+
+    /// Prim-level relative data source locator to locate coordsys.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetCoordsysLocator();
+
+    /// Prim-level relative data source locator to locate xform.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetXformLocator();
+
+    /// Prim-level relative data source locator to locate attributes.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetAttributesLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdPathDataSourceHandle &groupPrototype,
+        const HdPathDataSourceHandle &geoPrototype,
+        const HdPathDataSourceHandle &material,
+        const HdPathArrayDataSourceHandle &coordsys,
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &attributes
+    );
+
+    /// \class HdPrmanRileyGeometryInstanceSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetGroupPrototype(
+            const HdPathDataSourceHandle &groupPrototype);
+        HDPRMAN_API
+        Builder &SetGeoPrototype(
+            const HdPathDataSourceHandle &geoPrototype);
+        HDPRMAN_API
+        Builder &SetMaterial(
+            const HdPathDataSourceHandle &material);
+        HDPRMAN_API
+        Builder &SetCoordsys(
+            const HdPathArrayDataSourceHandle &coordsys);
+        HDPRMAN_API
+        Builder &SetXform(
+            const HdMatrixDataSourceHandle &xform);
+        HDPRMAN_API
+        Builder &SetAttributes(
+            const HdContainerDataSourceHandle &attributes);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdPathDataSourceHandle _groupPrototype;
+        HdPathDataSourceHandle _geoPrototype;
+        HdPathDataSourceHandle _material;
+        HdPathArrayDataSourceHandle _coordsys;
+        HdMatrixDataSourceHandle _xform;
+        HdContainerDataSourceHandle _attributes;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypePrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypePrim.cpp
new file mode 100644
index 0000000000..e4f07a7325
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypePrim.cpp
@@ -0,0 +1,131 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyGeometryPrototypePrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyGeometryPrototypeSchema.h"
+#include "hdPrman/rileyDisplacementPrim.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyGeometryPrototypePrim::HdPrman_RileyGeometryPrototypePrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyGeometryPrototypeSchema schema =
+        HdPrmanRileyGeometryPrototypeSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyString type =
+        HdPrman_RileyString(
+            schema.GetType());
+
+    HdPrman_RileyId<HdPrman_RileyDisplacementPrim> displacement =
+        HdPrman_RileyId<HdPrman_RileyDisplacementPrim>(
+            observer,
+            schema.GetDisplacement());
+
+    HdPrman_RileyPrimvarList primvars =
+        HdPrman_RileyPrimvarList(
+            schema.GetPrimvars(),
+            _GetShutterInterval());
+
+
+    _rileyId = _AcquireRiley()->CreateGeometryPrototype(
+        riley::UserId(),
+
+        type.rileyObject,
+        displacement.rileyObject,
+        primvars.rileyObject);
+
+    _displacementPrim = std::move(displacement.prim);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+    _type = type.rileyObject;
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyGeometryPrototypePrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyGeometryPrototypeSchema schema =
+        HdPrmanRileyGeometryPrototypeSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyId<HdPrman_RileyDisplacementPrim>> displacement;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyGeometryPrototypeSchema::GetDisplacementLocator())) {
+        displacement =
+            HdPrman_RileyId<HdPrman_RileyDisplacementPrim>(
+                observer,
+                schema.GetDisplacement());
+    };
+
+    std::optional<HdPrman_RileyPrimvarList> primvars;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyGeometryPrototypeSchema::GetPrimvarsLocator())) {
+        primvars =
+            HdPrman_RileyPrimvarList(
+                schema.GetPrimvars(),
+                _GetShutterInterval());
+    };
+
+
+    _AcquireRiley()->ModifyGeometryPrototype(
+// --(BEGIN CUSTOM CODE: Modify)--
+        _type,
+        _rileyId,
+        HdPrman_GetRileyObjectPtr(displacement),
+        HdPrman_GetRileyObjectPtr(primvars)
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+    if (displacement) {
+        _displacementPrim = std::move(displacement->prim);
+    }
+
+}
+
+HdPrman_RileyGeometryPrototypePrim::~HdPrman_RileyGeometryPrototypePrim()
+{
+    _AcquireRiley()->DeleteGeometryPrototype(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+
+    // _displacementPrim gets dropped after the GeometryPrototype was
+    // deleted.
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypePrim.h b/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypePrim.h
new file mode 100644
index 0000000000..6dd81229b5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypePrim.h
@@ -0,0 +1,80 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GEOMETRY_PROTOTYPE_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GEOMETRY_PROTOTYPE_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using HdPrman_RileyDisplacementPrimHandle =
+    std::shared_ptr<class HdPrman_RileyDisplacementPrim>;
+
+using HdPrman_RileyGeometryPrototypePrimHandle =
+    std::shared_ptr<class HdPrman_RileyGeometryPrototypePrim>;
+
+/// \class HdPrman_RileyGeometryPrototypePrim
+///
+/// Wraps a riley GeometryPrototype object, initializing or updating it
+/// using the HdPrmanRileyGeometryPrototypeSchema.
+///
+class HdPrman_RileyGeometryPrototypePrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyGeometryPrototypePrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyGeometryPrototypePrim() override;
+
+    using RileyId = riley::GeometryPrototypeId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyDisplacementPrimHandle _displacementPrim;
+
+// --(BEGIN CUSTOM CODE: Fields)--
+    RtUString _type;
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypeSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypeSchema.cpp
new file mode 100644
index 0000000000..4b9b05d4b4
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypeSchema.cpp
@@ -0,0 +1,192 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyGeometryPrototypeSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyGeometryPrototypeSchemaTokens,
+    HD_PRMAN_RILEY_GEOMETRY_PROTOTYPE_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdTokenDataSourceHandle
+HdPrmanRileyGeometryPrototypeSchema::GetType()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyGeometryPrototypeSchemaTokens->type);
+}
+
+HdPathDataSourceHandle
+HdPrmanRileyGeometryPrototypeSchema::GetDisplacement()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyGeometryPrototypeSchemaTokens->displacement);
+}
+
+HdPrmanRileyPrimvarListSchema
+HdPrmanRileyGeometryPrototypeSchema::GetPrimvars()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyPrimvarListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyGeometryPrototypeSchemaTokens->primvars));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyGeometryPrototypeSchema::BuildRetained(
+        const HdTokenDataSourceHandle &type,
+        const HdPathDataSourceHandle &displacement,
+        const HdContainerDataSourceHandle &primvars
+)
+{
+    TfToken _names[3];
+    HdDataSourceBaseHandle _values[3];
+
+    size_t _count = 0;
+
+    if (type) {
+        _names[_count] = HdPrmanRileyGeometryPrototypeSchemaTokens->type;
+        _values[_count++] = type;
+    }
+
+    if (displacement) {
+        _names[_count] = HdPrmanRileyGeometryPrototypeSchemaTokens->displacement;
+        _values[_count++] = displacement;
+    }
+
+    if (primvars) {
+        _names[_count] = HdPrmanRileyGeometryPrototypeSchemaTokens->primvars;
+        _values[_count++] = primvars;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyGeometryPrototypeSchema::Builder &
+HdPrmanRileyGeometryPrototypeSchema::Builder::SetType(
+    const HdTokenDataSourceHandle &type)
+{
+    _type = type;
+    return *this;
+}
+
+HdPrmanRileyGeometryPrototypeSchema::Builder &
+HdPrmanRileyGeometryPrototypeSchema::Builder::SetDisplacement(
+    const HdPathDataSourceHandle &displacement)
+{
+    _displacement = displacement;
+    return *this;
+}
+
+HdPrmanRileyGeometryPrototypeSchema::Builder &
+HdPrmanRileyGeometryPrototypeSchema::Builder::SetPrimvars(
+    const HdContainerDataSourceHandle &primvars)
+{
+    _primvars = primvars;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyGeometryPrototypeSchema::Builder::Build()
+{
+    return HdPrmanRileyGeometryPrototypeSchema::BuildRetained(
+        _type,
+        _displacement,
+        _primvars
+    );
+}
+
+/*static*/
+HdPrmanRileyGeometryPrototypeSchema
+HdPrmanRileyGeometryPrototypeSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyGeometryPrototypeSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyGeometryPrototypeSchemaTokens->RileyGeometryPrototype))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyGeometryPrototypeSchema::GetSchemaToken()
+{
+    return HdPrmanRileyGeometryPrototypeSchemaTokens->RileyGeometryPrototype;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyGeometryPrototypeSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryPrototypeSchema::GetTypeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryPrototypeSchemaTokens->type);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryPrototypeSchema::GetDisplacementLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryPrototypeSchemaTokens->displacement);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGeometryPrototypeSchema::GetPrimvarsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGeometryPrototypeSchemaTokens->primvars);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypeSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypeSchema.h
new file mode 100644
index 0000000000..8f690342d1
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGeometryPrototypeSchema.h
@@ -0,0 +1,194 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GEOMETRY_PROTOTYPE_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GEOMETRY_PROTOTYPE_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyPrimvarListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_GEOMETRY_PROTOTYPE_SCHEMA_TOKENS \
+    (RileyGeometryPrototype) \
+    (type) \
+    (displacement) \
+    (primvars) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyGeometryPrototypeSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_GEOMETRY_PROTOTYPE_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyGeometryPrototypeSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyGeometryPrototypeSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "RileyGeometryPrototype" from the parent container and constructs a
+    /// HdPrmanRileyGeometryPrototypeSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyGeometryPrototypeSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetType()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetDisplacement()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyPrimvarListSchema GetPrimvars()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate type.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetTypeLocator();
+
+    /// Prim-level relative data source locator to locate displacement.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDisplacementLocator();
+
+    /// Prim-level relative data source locator to locate primvars.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetPrimvarsLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdTokenDataSourceHandle &type,
+        const HdPathDataSourceHandle &displacement,
+        const HdContainerDataSourceHandle &primvars
+    );
+
+    /// \class HdPrmanRileyGeometryPrototypeSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetType(
+            const HdTokenDataSourceHandle &type);
+        HDPRMAN_API
+        Builder &SetDisplacement(
+            const HdPathDataSourceHandle &displacement);
+        HDPRMAN_API
+        Builder &SetPrimvars(
+            const HdContainerDataSourceHandle &primvars);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdTokenDataSourceHandle _type;
+        HdPathDataSourceHandle _displacement;
+        HdContainerDataSourceHandle _primvars;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGlobalsPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyGlobalsPrim.cpp
new file mode 100644
index 0000000000..ca11ec3fa6
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGlobalsPrim.cpp
@@ -0,0 +1,63 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+#include "hdPrman/rileyGlobalsPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyGlobalsSchema.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyGlobalsPrim::HdPrman_RileyGlobalsPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyGlobalsSchema schema =
+        HdPrmanRileyGlobalsSchema::GetFromParent(primSource);
+
+    _SetOptions(schema);
+}
+
+void
+HdPrman_RileyGlobalsPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyGlobalsSchema schema =
+        HdPrmanRileyGlobalsSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyGlobalsSchema::GetOptionsLocator())) {
+        _SetOptions(schema);
+    }
+}
+
+void
+HdPrman_RileyGlobalsPrim::_SetOptions(
+    HdPrmanRileyGlobalsSchema globalsSchema)
+{
+    if (HdPrmanRileyParamListSchema schema = globalsSchema.GetOptions()) {
+        HdPrman_RileyParamList options = HdPrman_RileyParamList(schema);
+        _AcquireRiley()->SetOptions(
+            options.rileyObject);
+    }
+}
+
+HdPrman_RileyGlobalsPrim::~HdPrman_RileyGlobalsPrim() = default;
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGlobalsPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyGlobalsPrim.h
new file mode 100644
index 0000000000..974ea6fdbf
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGlobalsPrim.h
@@ -0,0 +1,54 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GLOBALS_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GLOBALS_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrmanRileyGlobalsSchema;
+using HdPrman_RileyGlobalsPrimHandle =
+    std::shared_ptr<class HdPrman_RileyGlobalsPrim>;
+
+/// \class HdPrman_RileyGlobalsPrim
+///
+/// Set riley global parameters such as options using the
+/// HdPrmanRileyGlobalsSchema.
+///
+class HdPrman_RileyGlobalsPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyGlobalsPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyGlobalsPrim() override;
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+    void _SetOptions(HdPrmanRileyGlobalsSchema);
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGlobalsSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyGlobalsSchema.cpp
new file mode 100644
index 0000000000..7bc7fa5ce9
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGlobalsSchema.cpp
@@ -0,0 +1,118 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyGlobalsSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyGlobalsSchemaTokens,
+    HD_PRMAN_RILEY_GLOBALS_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyGlobalsSchema::GetOptions()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyGlobalsSchemaTokens->options));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyGlobalsSchema::BuildRetained(
+        const HdContainerDataSourceHandle &options
+)
+{
+    TfToken _names[1];
+    HdDataSourceBaseHandle _values[1];
+
+    size_t _count = 0;
+
+    if (options) {
+        _names[_count] = HdPrmanRileyGlobalsSchemaTokens->options;
+        _values[_count++] = options;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyGlobalsSchema::Builder &
+HdPrmanRileyGlobalsSchema::Builder::SetOptions(
+    const HdContainerDataSourceHandle &options)
+{
+    _options = options;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyGlobalsSchema::Builder::Build()
+{
+    return HdPrmanRileyGlobalsSchema::BuildRetained(
+        _options
+    );
+}
+
+/*static*/
+HdPrmanRileyGlobalsSchema
+HdPrmanRileyGlobalsSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyGlobalsSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyGlobalsSchemaTokens->rileyGlobals))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyGlobalsSchema::GetSchemaToken()
+{
+    return HdPrmanRileyGlobalsSchemaTokens->rileyGlobals;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyGlobalsSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyGlobalsSchema::GetOptionsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyGlobalsSchemaTokens->options);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyGlobalsSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyGlobalsSchema.h
new file mode 100644
index 0000000000..b7a7eca2ef
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyGlobalsSchema.h
@@ -0,0 +1,156 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GLOBALS_SCHEMA_H
+#define EXT_RMANPKG_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_GLOBALS_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_GLOBALS_SCHEMA_TOKENS \
+    (rileyGlobals) \
+    (options) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyGlobalsSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_GLOBALS_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyGlobalsSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyGlobalsSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyGlobals" from the parent container and constructs a
+    /// HdPrmanRileyGlobalsSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyGlobalsSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetOptions()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate options.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetOptionsLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdContainerDataSourceHandle &options
+    );
+
+    /// \class HdPrmanRileyGlobalsSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetOptions(
+            const HdContainerDataSourceHandle &options);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdContainerDataSourceHandle _options;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyIds.h b/third_party/renderman-26/plugin/hdPrman/rileyIds.h
new file mode 100644
index 0000000000..1b29981dfa
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyIds.h
@@ -0,0 +1,145 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_UTIL_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_UTIL_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "pxr/imaging/hdsi/primManagingSceneIndexObserver.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \name Path conversions to riley ids
+///
+/// Conversion of a path or an array of paths to scene index prims
+/// to a riley type such as riley::RenderTargetId or RenderOutputList.
+/// @{
+
+/// A (RAII) helper struct to retrieve riley prims managed by a prim managing
+/// scene index observer and identified by a path from a data source.
+///
+/// The struct contains both the wrapping object of type PrimType 
+/// (subclassing from HdPrman_RileyPrimBase) as well as the (non-RAII) riley
+/// prim.
+///
+template<typename PrimType>
+struct HdPrman_RileyId
+{
+    /// A riley id, e.g., riley::RenderTargetId. It is essentially just an
+    /// integer.
+    ///
+    /// This will be passed to calls such as Riley::RenderTarget.
+    /// It is the non-RAII object.
+    ///
+    using RileyType = typename PrimType::RileyId;
+
+    /// Handle to subclass of HdPrman_RileyPrimBase
+    using PrimHandle = std::shared_ptr<PrimType>;
+
+    /// C'tor takes observerer managing the prims and data source
+    /// identifying prims by paths.
+    ///
+    HdPrman_RileyId(
+        const HdsiPrimManagingSceneIndexObserver * const observer,
+        HdPathDataSourceHandle const &ds)
+    {
+        if (!ds) {
+            return;
+        }
+
+        const SdfPath path = ds->GetTypedValue(0.0f);
+        if (path.IsEmpty()) {
+            return;
+        }
+
+        prim = observer->GetTypedPrim<PrimType>(path);
+        if (prim) {
+            rileyObject = prim->GetRileyId();
+        }
+    }
+
+    /// The prims wrapping the riley prims, subclass of HdPrman_RileyPrimBase.
+    PrimHandle prim;
+    /// The rileyId.
+    RileyType rileyObject;
+};
+
+/// A (RAII) helper struct to retrieve riley prims managed by a prim managing
+/// scene index observer and identified by paths from a data source.
+///
+/// The struct contains both the wrapping objects of type PrimType 
+/// (subclassing from HdPrman_RileyPrimBase) as well as the riley prim
+/// ids packaged in (the non-RAII) riley::RenderOutputList or similar.
+///
+template<typename PrimType>
+struct HdPrman_RileyIdList
+{
+    /// List of riley ids, e.g., riley::RenderOutputList.
+    ///
+    /// This will be passed to calls such as Riley::CreateRenderTarget.
+    /// It is the non-RAII object.
+    ///
+    /// Example for a RileyType:
+    /// struct RenderOutputList
+    /// {
+    ///      uint32_t count;
+    ///      RenderOutputId const *ids; // raw-pointer making it non-RAII
+    /// };
+    using RileyType = typename PrimType::RileyIdList;
+
+    /// Handle to subclass of HdPrman_RileyPrimBase
+    using PrimHandle = std::shared_ptr<PrimType>;
+    /// Corresponding riley id, e.g., riley::RenderOutputId
+    using RileyId = typename PrimType::RileyId;
+
+    /// C'tor takes observerer managing the prims and data source
+    /// identifying prims by paths.
+    ///
+    HdPrman_RileyIdList(
+        const HdsiPrimManagingSceneIndexObserver * const observer,
+        HdPathArrayDataSourceHandle const &ds)
+      : rileyObject{0, nullptr}
+    {
+        if (!ds) {
+            return;
+        }
+
+        const VtArray<SdfPath> paths = ds->GetTypedValue(0.0f);
+        prims.reserve(paths.size());
+        rileyIds.reserve(paths.size());
+        for (const SdfPath &path : paths) {
+            const PrimHandle prim = observer->GetTypedPrim<PrimType>(path);
+            prims.push_back(prim);
+            if (prim) {
+                rileyIds.push_back(prim->GetRileyId());
+            }
+        }
+        rileyObject.count = static_cast<uint32_t>(rileyIds.size());
+        rileyObject.ids = rileyIds.data();
+    }
+
+    /// The prims wrapping the riley prims, subclass of HdPrman_RileyPrimBase.
+    std::vector<PrimHandle> prims;
+    /// Corresponding riley ids, e.g., riley::RenderOutputId.
+    /// Does not include (invalid) riley ids for invalid PrimHandle's.
+    std::vector<RileyId> rileyIds;
+    /// Same information as rileyIds but as, e.g., riley::RenderOutputList
+    /// (with pointers pointing into rileyIds).
+    RileyType rileyObject;
+};
+
+/// @}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyIntegratorPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyIntegratorPrim.cpp
new file mode 100644
index 0000000000..e03004183c
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyIntegratorPrim.cpp
@@ -0,0 +1,95 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyIntegratorPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyIntegratorSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyIntegratorPrim::HdPrman_RileyIntegratorPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyIntegratorSchema schema =
+        HdPrmanRileyIntegratorSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyShadingNode integratorNode =
+        HdPrman_RileyShadingNode(
+            schema.GetIntegratorNode());
+
+
+    _rileyId = _AcquireRiley()->CreateIntegrator(
+        riley::UserId(),
+
+        integratorNode.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyIntegratorPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyIntegratorSchema schema =
+        HdPrmanRileyIntegratorSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyShadingNode> integratorNode;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyIntegratorSchema::GetIntegratorNodeLocator())) {
+        integratorNode =
+            HdPrman_RileyShadingNode(
+                schema.GetIntegratorNode());
+    };
+
+
+    _AcquireRiley()->ModifyIntegrator(_rileyId,
+        HdPrman_GetRileyObjectPtr(integratorNode)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyIntegratorPrim::~HdPrman_RileyIntegratorPrim()
+{
+    _AcquireRiley()->DeleteIntegrator(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyIntegratorPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyIntegratorPrim.h
new file mode 100644
index 0000000000..6be3b73a51
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyIntegratorPrim.h
@@ -0,0 +1,71 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_INTEGRATOR_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_INTEGRATOR_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyIntegratorPrimHandle =
+    std::shared_ptr<class HdPrman_RileyIntegratorPrim>;
+
+/// \class HdPrman_RileyIntegratorPrim
+///
+/// Wraps a riley Integrator object, initializing or updating it
+/// using the HdPrmanRileyIntegratorSchema.
+///
+class HdPrman_RileyIntegratorPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyIntegratorPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyIntegratorPrim() override;
+
+    using RileyId = riley::IntegratorId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyIntegratorSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyIntegratorSchema.cpp
new file mode 100644
index 0000000000..109adb463e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyIntegratorSchema.cpp
@@ -0,0 +1,118 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyIntegratorSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyIntegratorSchemaTokens,
+    HD_PRMAN_RILEY_INTEGRATOR_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyShadingNodeSchema
+HdPrmanRileyIntegratorSchema::GetIntegratorNode()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyShadingNodeSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyIntegratorSchemaTokens->integratorNode));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyIntegratorSchema::BuildRetained(
+        const HdContainerDataSourceHandle &integratorNode
+)
+{
+    TfToken _names[1];
+    HdDataSourceBaseHandle _values[1];
+
+    size_t _count = 0;
+
+    if (integratorNode) {
+        _names[_count] = HdPrmanRileyIntegratorSchemaTokens->integratorNode;
+        _values[_count++] = integratorNode;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyIntegratorSchema::Builder &
+HdPrmanRileyIntegratorSchema::Builder::SetIntegratorNode(
+    const HdContainerDataSourceHandle &integratorNode)
+{
+    _integratorNode = integratorNode;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyIntegratorSchema::Builder::Build()
+{
+    return HdPrmanRileyIntegratorSchema::BuildRetained(
+        _integratorNode
+    );
+}
+
+/*static*/
+HdPrmanRileyIntegratorSchema
+HdPrmanRileyIntegratorSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyIntegratorSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyIntegratorSchemaTokens->rileyIntegrator))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyIntegratorSchema::GetSchemaToken()
+{
+    return HdPrmanRileyIntegratorSchemaTokens->rileyIntegrator;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyIntegratorSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyIntegratorSchema::GetIntegratorNodeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyIntegratorSchemaTokens->integratorNode);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyIntegratorSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyIntegratorSchema.h
new file mode 100644
index 0000000000..77c098d820
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyIntegratorSchema.h
@@ -0,0 +1,156 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_INTEGRATOR_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_INTEGRATOR_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyShadingNodeSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_INTEGRATOR_SCHEMA_TOKENS \
+    (rileyIntegrator) \
+    (integratorNode) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyIntegratorSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_INTEGRATOR_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyIntegratorSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyIntegratorSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyIntegrator" from the parent container and constructs a
+    /// HdPrmanRileyIntegratorSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyIntegratorSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyShadingNodeSchema GetIntegratorNode()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate integratorNode.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetIntegratorNodeLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdContainerDataSourceHandle &integratorNode
+    );
+
+    /// \class HdPrmanRileyIntegratorSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetIntegratorNode(
+            const HdContainerDataSourceHandle &integratorNode);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdContainerDataSourceHandle _integratorNode;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyLightInstancePrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyLightInstancePrim.cpp
new file mode 100644
index 0000000000..9ccb837fa7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyLightInstancePrim.cpp
@@ -0,0 +1,220 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyLightInstancePrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyLightInstanceSchema.h"
+#include "hdPrman/rileyCoordinateSystemPrim.h"
+#include "hdPrman/rileyGeometryPrototypePrim.h"
+#include "hdPrman/rileyLightShaderPrim.h"
+#include "hdPrman/rileyMaterialPrim.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyLightInstancePrim::HdPrman_RileyLightInstancePrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyLightInstanceSchema schema =
+        HdPrmanRileyLightInstanceSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyId<HdPrman_RileyGeometryPrototypePrim> groupPrototype =
+        HdPrman_RileyId<HdPrman_RileyGeometryPrototypePrim>(
+            observer,
+            schema.GetGroupPrototype());
+
+    HdPrman_RileyId<HdPrman_RileyGeometryPrototypePrim> geoPrototype =
+        HdPrman_RileyId<HdPrman_RileyGeometryPrototypePrim>(
+            observer,
+            schema.GetGeoPrototype());
+
+    HdPrman_RileyId<HdPrman_RileyMaterialPrim> material =
+        HdPrman_RileyId<HdPrman_RileyMaterialPrim>(
+            observer,
+            schema.GetMaterial());
+
+    HdPrman_RileyId<HdPrman_RileyLightShaderPrim> lightShader =
+        HdPrman_RileyId<HdPrman_RileyLightShaderPrim>(
+            observer,
+            schema.GetLightShader());
+
+    HdPrman_RileyIdList<HdPrman_RileyCoordinateSystemPrim> coordsys =
+        HdPrman_RileyIdList<HdPrman_RileyCoordinateSystemPrim>(
+            observer,
+            schema.GetCoordsys());
+
+    HdPrman_RileyTransform xform =
+        HdPrman_RileyTransform(
+            schema.GetXform(),
+            _GetShutterInterval());
+
+    HdPrman_RileyParamList attributes =
+        HdPrman_RileyParamList(
+            schema.GetAttributes());
+
+
+    _rileyId = _AcquireRiley()->CreateLightInstance(
+        riley::UserId(),
+
+        groupPrototype.rileyObject,
+        geoPrototype.rileyObject,
+        material.rileyObject,
+        lightShader.rileyObject,
+        coordsys.rileyObject,
+        xform.rileyObject,
+        attributes.rileyObject);
+
+    _groupPrototypePrim = std::move(groupPrototype.prim);
+
+    _geoPrototypePrim = std::move(geoPrototype.prim);
+
+    _materialPrim = std::move(material.prim);
+
+    _lightShaderPrim = std::move(lightShader.prim);
+
+    _coordsysPrims = std::move(coordsys.prims);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyLightInstancePrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyLightInstanceSchema schema =
+        HdPrmanRileyLightInstanceSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyId<HdPrman_RileyMaterialPrim>> material;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyLightInstanceSchema::GetMaterialLocator())) {
+        material =
+            HdPrman_RileyId<HdPrman_RileyMaterialPrim>(
+                observer,
+                schema.GetMaterial());
+    };
+
+    std::optional<HdPrman_RileyId<HdPrman_RileyLightShaderPrim>> lightShader;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyLightInstanceSchema::GetLightShaderLocator())) {
+        lightShader =
+            HdPrman_RileyId<HdPrman_RileyLightShaderPrim>(
+                observer,
+                schema.GetLightShader());
+    };
+
+    std::optional<HdPrman_RileyIdList<HdPrman_RileyCoordinateSystemPrim>> coordsys;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyLightInstanceSchema::GetCoordsysLocator())) {
+        coordsys =
+            HdPrman_RileyIdList<HdPrman_RileyCoordinateSystemPrim>(
+                observer,
+                schema.GetCoordsys());
+    };
+
+    std::optional<HdPrman_RileyTransform> xform;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyLightInstanceSchema::GetXformLocator())) {
+        xform =
+            HdPrman_RileyTransform(
+                schema.GetXform(),
+                _GetShutterInterval());
+    };
+
+    std::optional<HdPrman_RileyParamList> attributes;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyLightInstanceSchema::GetAttributesLocator())) {
+        attributes =
+            HdPrman_RileyParamList(
+                schema.GetAttributes());
+    };
+
+
+    _AcquireRiley()->ModifyLightInstance(
+// --(BEGIN CUSTOM CODE: Modify)--
+        _groupPrototypePrim ? _groupPrototypePrim->GetRileyId() : riley::GeometryPrototypeId::InvalidId(),
+        _rileyId,
+
+        HdPrman_GetRileyObjectPtr(material),
+        HdPrman_GetRileyObjectPtr(lightShader),
+        HdPrman_GetRileyObjectPtr(coordsys),
+        HdPrman_GetRileyObjectPtr(xform),
+        HdPrman_GetRileyObjectPtr(attributes)
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+    if (material) {
+        _materialPrim = std::move(material->prim);
+    }
+
+    if (lightShader) {
+        _lightShaderPrim = std::move(lightShader->prim);
+    }
+
+    // Now that the LightInstance is using the new
+    // RileyCoordinateSystem, we can realease the handles
+    // to the old RileyCoordinateSystem.
+    if (coordsys) {
+        _coordsysPrims = std::move(coordsys->prims);
+    }
+
+}
+
+HdPrman_RileyLightInstancePrim::~HdPrman_RileyLightInstancePrim()
+{
+    _AcquireRiley()->DeleteLightInstance(
+// --(BEGIN CUSTOM CODE: Delete)--
+        _groupPrototypePrim ? _groupPrototypePrim->GetRileyId() : riley::GeometryPrototypeId::InvalidId(),
+        _rileyId
+// --(END CUSTOM CODE: Delete)--
+        );
+
+
+    // _groupPrototypePrim gets dropped after the LightInstance was
+    // deleted.
+
+    // _geoPrototypePrim gets dropped after the LightInstance was
+    // deleted.
+
+    // _materialPrim gets dropped after the LightInstance was
+    // deleted.
+
+    // _lightShaderPrim gets dropped after the LightInstance was
+    // deleted.
+
+    // _coordsysPrims gets dropped after the LightInstance was
+    // deleted.
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyLightInstancePrim.h b/third_party/renderman-26/plugin/hdPrman/rileyLightInstancePrim.h
new file mode 100644
index 0000000000..401effb2b7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyLightInstancePrim.h
@@ -0,0 +1,110 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_LIGHT_INSTANCE_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_LIGHT_INSTANCE_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using HdPrman_RileyCoordinateSystemPrimHandle =
+    std::shared_ptr<class HdPrman_RileyCoordinateSystemPrim>;
+using HdPrman_RileyGeometryPrototypePrimHandle =
+    std::shared_ptr<class HdPrman_RileyGeometryPrototypePrim>;
+using HdPrman_RileyLightShaderPrimHandle =
+    std::shared_ptr<class HdPrman_RileyLightShaderPrim>;
+using HdPrman_RileyMaterialPrimHandle =
+    std::shared_ptr<class HdPrman_RileyMaterialPrim>;
+
+using HdPrman_RileyLightInstancePrimHandle =
+    std::shared_ptr<class HdPrman_RileyLightInstancePrim>;
+
+/// \class HdPrman_RileyLightInstancePrim
+///
+/// Wraps a riley LightInstance object, initializing or updating it
+/// using the HdPrmanRileyLightInstanceSchema.
+///
+class HdPrman_RileyLightInstancePrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyLightInstancePrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyLightInstancePrim() override;
+
+    using RileyId = riley::LightInstanceId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyGeometryPrototypePrimHandle _groupPrototypePrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyGeometryPrototypePrimHandle _geoPrototypePrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyMaterialPrimHandle _materialPrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyLightShaderPrimHandle _lightShaderPrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    std::vector<HdPrman_RileyCoordinateSystemPrimHandle> _coordsysPrims;
+
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyLightInstanceSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyLightInstanceSchema.cpp
new file mode 100644
index 0000000000..83b19d590b
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyLightInstanceSchema.cpp
@@ -0,0 +1,340 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyLightInstanceSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyLightInstanceSchemaTokens,
+    HD_PRMAN_RILEY_LIGHT_INSTANCE_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPathDataSourceHandle
+HdPrmanRileyLightInstanceSchema::GetGroupPrototype()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyLightInstanceSchemaTokens->groupPrototype);
+}
+
+HdPathDataSourceHandle
+HdPrmanRileyLightInstanceSchema::GetGeoPrototype()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyLightInstanceSchemaTokens->geoPrototype);
+}
+
+HdPathDataSourceHandle
+HdPrmanRileyLightInstanceSchema::GetMaterial()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyLightInstanceSchemaTokens->material);
+}
+
+HdPathDataSourceHandle
+HdPrmanRileyLightInstanceSchema::GetLightShader()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyLightInstanceSchemaTokens->lightShader);
+}
+
+HdPathArrayDataSourceHandle
+HdPrmanRileyLightInstanceSchema::GetCoordsys()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathArrayDataSource>(
+        HdPrmanRileyLightInstanceSchemaTokens->coordsys);
+}
+
+HdMatrixDataSourceHandle
+HdPrmanRileyLightInstanceSchema::GetXform()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdMatrixDataSource>(
+        HdPrmanRileyLightInstanceSchemaTokens->xform);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyLightInstanceSchema::GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyLightInstanceSchemaTokens->attributes));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyLightInstanceSchema::BuildRetained(
+        const HdPathDataSourceHandle &groupPrototype,
+        const HdPathDataSourceHandle &geoPrototype,
+        const HdPathDataSourceHandle &material,
+        const HdPathDataSourceHandle &lightShader,
+        const HdPathArrayDataSourceHandle &coordsys,
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &attributes
+)
+{
+    TfToken _names[7];
+    HdDataSourceBaseHandle _values[7];
+
+    size_t _count = 0;
+
+    if (groupPrototype) {
+        _names[_count] = HdPrmanRileyLightInstanceSchemaTokens->groupPrototype;
+        _values[_count++] = groupPrototype;
+    }
+
+    if (geoPrototype) {
+        _names[_count] = HdPrmanRileyLightInstanceSchemaTokens->geoPrototype;
+        _values[_count++] = geoPrototype;
+    }
+
+    if (material) {
+        _names[_count] = HdPrmanRileyLightInstanceSchemaTokens->material;
+        _values[_count++] = material;
+    }
+
+    if (lightShader) {
+        _names[_count] = HdPrmanRileyLightInstanceSchemaTokens->lightShader;
+        _values[_count++] = lightShader;
+    }
+
+    if (coordsys) {
+        _names[_count] = HdPrmanRileyLightInstanceSchemaTokens->coordsys;
+        _values[_count++] = coordsys;
+    }
+
+    if (xform) {
+        _names[_count] = HdPrmanRileyLightInstanceSchemaTokens->xform;
+        _values[_count++] = xform;
+    }
+
+    if (attributes) {
+        _names[_count] = HdPrmanRileyLightInstanceSchemaTokens->attributes;
+        _values[_count++] = attributes;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyLightInstanceSchema::Builder &
+HdPrmanRileyLightInstanceSchema::Builder::SetGroupPrototype(
+    const HdPathDataSourceHandle &groupPrototype)
+{
+    _groupPrototype = groupPrototype;
+    return *this;
+}
+
+HdPrmanRileyLightInstanceSchema::Builder &
+HdPrmanRileyLightInstanceSchema::Builder::SetGeoPrototype(
+    const HdPathDataSourceHandle &geoPrototype)
+{
+    _geoPrototype = geoPrototype;
+    return *this;
+}
+
+HdPrmanRileyLightInstanceSchema::Builder &
+HdPrmanRileyLightInstanceSchema::Builder::SetMaterial(
+    const HdPathDataSourceHandle &material)
+{
+    _material = material;
+    return *this;
+}
+
+HdPrmanRileyLightInstanceSchema::Builder &
+HdPrmanRileyLightInstanceSchema::Builder::SetLightShader(
+    const HdPathDataSourceHandle &lightShader)
+{
+    _lightShader = lightShader;
+    return *this;
+}
+
+HdPrmanRileyLightInstanceSchema::Builder &
+HdPrmanRileyLightInstanceSchema::Builder::SetCoordsys(
+    const HdPathArrayDataSourceHandle &coordsys)
+{
+    _coordsys = coordsys;
+    return *this;
+}
+
+HdPrmanRileyLightInstanceSchema::Builder &
+HdPrmanRileyLightInstanceSchema::Builder::SetXform(
+    const HdMatrixDataSourceHandle &xform)
+{
+    _xform = xform;
+    return *this;
+}
+
+HdPrmanRileyLightInstanceSchema::Builder &
+HdPrmanRileyLightInstanceSchema::Builder::SetAttributes(
+    const HdContainerDataSourceHandle &attributes)
+{
+    _attributes = attributes;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyLightInstanceSchema::Builder::Build()
+{
+    return HdPrmanRileyLightInstanceSchema::BuildRetained(
+        _groupPrototype,
+        _geoPrototype,
+        _material,
+        _lightShader,
+        _coordsys,
+        _xform,
+        _attributes
+    );
+}
+
+/*static*/
+HdPrmanRileyLightInstanceSchema
+HdPrmanRileyLightInstanceSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyLightInstanceSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyLightInstanceSchemaTokens->RileyLightInstance))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyLightInstanceSchema::GetSchemaToken()
+{
+    return HdPrmanRileyLightInstanceSchemaTokens->RileyLightInstance;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyLightInstanceSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightInstanceSchema::GetGroupPrototypeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightInstanceSchemaTokens->groupPrototype);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightInstanceSchema::GetGeoPrototypeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightInstanceSchemaTokens->geoPrototype);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightInstanceSchema::GetMaterialLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightInstanceSchemaTokens->material);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightInstanceSchema::GetLightShaderLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightInstanceSchemaTokens->lightShader);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightInstanceSchema::GetCoordsysLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightInstanceSchemaTokens->coordsys);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightInstanceSchema::GetXformLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightInstanceSchemaTokens->xform);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightInstanceSchema::GetAttributesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightInstanceSchemaTokens->attributes);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyLightInstanceSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyLightInstanceSchema.h
new file mode 100644
index 0000000000..1de0958e01
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyLightInstanceSchema.h
@@ -0,0 +1,270 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_LIGHT_INSTANCE_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_LIGHT_INSTANCE_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_LIGHT_INSTANCE_SCHEMA_TOKENS \
+    (RileyLightInstance) \
+    (groupPrototype) \
+    (geoPrototype) \
+    (material) \
+    (lightShader) \
+    (coordsys) \
+    (xform) \
+    (attributes) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyLightInstanceSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_LIGHT_INSTANCE_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyLightInstanceSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyLightInstanceSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "RileyLightInstance" from the parent container and constructs a
+    /// HdPrmanRileyLightInstanceSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyLightInstanceSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetGroupPrototype()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetGeoPrototype()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetMaterial()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetLightShader()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathArrayDataSourceHandle GetCoordsys()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdMatrixDataSourceHandle GetXform()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate groupPrototype.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetGroupPrototypeLocator();
+
+    /// Prim-level relative data source locator to locate geoPrototype.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetGeoPrototypeLocator();
+
+    /// Prim-level relative data source locator to locate material.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetMaterialLocator();
+
+    /// Prim-level relative data source locator to locate lightShader.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetLightShaderLocator();
+
+    /// Prim-level relative data source locator to locate coordsys.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetCoordsysLocator();
+
+    /// Prim-level relative data source locator to locate xform.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetXformLocator();
+
+    /// Prim-level relative data source locator to locate attributes.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetAttributesLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdPathDataSourceHandle &groupPrototype,
+        const HdPathDataSourceHandle &geoPrototype,
+        const HdPathDataSourceHandle &material,
+        const HdPathDataSourceHandle &lightShader,
+        const HdPathArrayDataSourceHandle &coordsys,
+        const HdMatrixDataSourceHandle &xform,
+        const HdContainerDataSourceHandle &attributes
+    );
+
+    /// \class HdPrmanRileyLightInstanceSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetGroupPrototype(
+            const HdPathDataSourceHandle &groupPrototype);
+        HDPRMAN_API
+        Builder &SetGeoPrototype(
+            const HdPathDataSourceHandle &geoPrototype);
+        HDPRMAN_API
+        Builder &SetMaterial(
+            const HdPathDataSourceHandle &material);
+        HDPRMAN_API
+        Builder &SetLightShader(
+            const HdPathDataSourceHandle &lightShader);
+        HDPRMAN_API
+        Builder &SetCoordsys(
+            const HdPathArrayDataSourceHandle &coordsys);
+        HDPRMAN_API
+        Builder &SetXform(
+            const HdMatrixDataSourceHandle &xform);
+        HDPRMAN_API
+        Builder &SetAttributes(
+            const HdContainerDataSourceHandle &attributes);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdPathDataSourceHandle _groupPrototype;
+        HdPathDataSourceHandle _geoPrototype;
+        HdPathDataSourceHandle _material;
+        HdPathDataSourceHandle _lightShader;
+        HdPathArrayDataSourceHandle _coordsys;
+        HdMatrixDataSourceHandle _xform;
+        HdContainerDataSourceHandle _attributes;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyLightShaderPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyLightShaderPrim.cpp
new file mode 100644
index 0000000000..060f5effb7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyLightShaderPrim.cpp
@@ -0,0 +1,109 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyLightShaderPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyLightShaderSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyLightShaderPrim::HdPrman_RileyLightShaderPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyLightShaderSchema schema =
+        HdPrmanRileyLightShaderSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyShadingNetwork light =
+        HdPrman_RileyShadingNetwork(
+            schema.GetLight());
+
+    HdPrman_RileyShadingNetwork lightFilter =
+        HdPrman_RileyShadingNetwork(
+            schema.GetLightFilter());
+
+
+    _rileyId = _AcquireRiley()->CreateLightShader(
+        riley::UserId(),
+
+        light.rileyObject,
+        lightFilter.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyLightShaderPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyLightShaderSchema schema =
+        HdPrmanRileyLightShaderSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyShadingNetwork> light;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyLightShaderSchema::GetLightLocator())) {
+        light =
+            HdPrman_RileyShadingNetwork(
+                schema.GetLight());
+    };
+
+    std::optional<HdPrman_RileyShadingNetwork> lightFilter;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyLightShaderSchema::GetLightFilterLocator())) {
+        lightFilter =
+            HdPrman_RileyShadingNetwork(
+                schema.GetLightFilter());
+    };
+
+
+    _AcquireRiley()->ModifyLightShader(_rileyId,
+        HdPrman_GetRileyObjectPtr(light),
+        HdPrman_GetRileyObjectPtr(lightFilter)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyLightShaderPrim::~HdPrman_RileyLightShaderPrim()
+{
+    _AcquireRiley()->DeleteLightShader(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyLightShaderPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyLightShaderPrim.h
new file mode 100644
index 0000000000..b40d51dca4
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyLightShaderPrim.h
@@ -0,0 +1,71 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_LIGHT_SHADER_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_LIGHT_SHADER_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyLightShaderPrimHandle =
+    std::shared_ptr<class HdPrman_RileyLightShaderPrim>;
+
+/// \class HdPrman_RileyLightShaderPrim
+///
+/// Wraps a riley LightShader object, initializing or updating it
+/// using the HdPrmanRileyLightShaderSchema.
+///
+class HdPrman_RileyLightShaderPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyLightShaderPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyLightShaderPrim() override;
+
+    using RileyId = riley::LightShaderId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyLightShaderSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyLightShaderSchema.cpp
new file mode 100644
index 0000000000..0102d2c61e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyLightShaderSchema.cpp
@@ -0,0 +1,155 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyLightShaderSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyLightShaderSchemaTokens,
+    HD_PRMAN_RILEY_LIGHT_SHADER_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyShadingNodeVectorSchema
+HdPrmanRileyLightShaderSchema::GetLight()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyShadingNodeVectorSchema(_GetTypedDataSource<HdVectorDataSource>(
+        HdPrmanRileyLightShaderSchemaTokens->light));
+}
+
+HdPrmanRileyShadingNodeVectorSchema
+HdPrmanRileyLightShaderSchema::GetLightFilter()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyShadingNodeVectorSchema(_GetTypedDataSource<HdVectorDataSource>(
+        HdPrmanRileyLightShaderSchemaTokens->lightFilter));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyLightShaderSchema::BuildRetained(
+        const HdVectorDataSourceHandle &light,
+        const HdVectorDataSourceHandle &lightFilter
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (light) {
+        _names[_count] = HdPrmanRileyLightShaderSchemaTokens->light;
+        _values[_count++] = light;
+    }
+
+    if (lightFilter) {
+        _names[_count] = HdPrmanRileyLightShaderSchemaTokens->lightFilter;
+        _values[_count++] = lightFilter;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyLightShaderSchema::Builder &
+HdPrmanRileyLightShaderSchema::Builder::SetLight(
+    const HdVectorDataSourceHandle &light)
+{
+    _light = light;
+    return *this;
+}
+
+HdPrmanRileyLightShaderSchema::Builder &
+HdPrmanRileyLightShaderSchema::Builder::SetLightFilter(
+    const HdVectorDataSourceHandle &lightFilter)
+{
+    _lightFilter = lightFilter;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyLightShaderSchema::Builder::Build()
+{
+    return HdPrmanRileyLightShaderSchema::BuildRetained(
+        _light,
+        _lightFilter
+    );
+}
+
+/*static*/
+HdPrmanRileyLightShaderSchema
+HdPrmanRileyLightShaderSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyLightShaderSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyLightShaderSchemaTokens->rileyLightShader))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyLightShaderSchema::GetSchemaToken()
+{
+    return HdPrmanRileyLightShaderSchemaTokens->rileyLightShader;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyLightShaderSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightShaderSchema::GetLightLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightShaderSchemaTokens->light);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyLightShaderSchema::GetLightFilterLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyLightShaderSchemaTokens->lightFilter);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyLightShaderSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyLightShaderSchema.h
new file mode 100644
index 0000000000..3e5e295a85
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyLightShaderSchema.h
@@ -0,0 +1,175 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_LIGHT_SHADER_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_LIGHT_SHADER_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileySchemaTypeDefs.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_LIGHT_SHADER_SCHEMA_TOKENS \
+    (rileyLightShader) \
+    (light) \
+    (lightFilter) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyLightShaderSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_LIGHT_SHADER_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyLightShaderSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyLightShaderSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyLightShader" from the parent container and constructs a
+    /// HdPrmanRileyLightShaderSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyLightShaderSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyShadingNodeVectorSchema GetLight()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyShadingNodeVectorSchema GetLightFilter()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate light.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetLightLocator();
+
+    /// Prim-level relative data source locator to locate lightFilter.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetLightFilterLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdVectorDataSourceHandle &light,
+        const HdVectorDataSourceHandle &lightFilter
+    );
+
+    /// \class HdPrmanRileyLightShaderSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetLight(
+            const HdVectorDataSourceHandle &light);
+        HDPRMAN_API
+        Builder &SetLightFilter(
+            const HdVectorDataSourceHandle &lightFilter);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdVectorDataSourceHandle _light;
+        HdVectorDataSourceHandle _lightFilter;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyMaterialPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyMaterialPrim.cpp
new file mode 100644
index 0000000000..d5afd91d59
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyMaterialPrim.cpp
@@ -0,0 +1,109 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyMaterialPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyMaterialSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyMaterialPrim::HdPrman_RileyMaterialPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyMaterialSchema schema =
+        HdPrmanRileyMaterialSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyShadingNetwork bxdf =
+        HdPrman_RileyShadingNetwork(
+            schema.GetBxdf());
+
+    HdPrman_RileyParamList attributes =
+        HdPrman_RileyParamList(
+            schema.GetAttributes());
+
+
+    _rileyId = _AcquireRiley()->CreateMaterial(
+        riley::UserId(),
+
+        bxdf.rileyObject,
+        attributes.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyMaterialPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyMaterialSchema schema =
+        HdPrmanRileyMaterialSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyShadingNetwork> bxdf;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyMaterialSchema::GetBxdfLocator())) {
+        bxdf =
+            HdPrman_RileyShadingNetwork(
+                schema.GetBxdf());
+    };
+
+    std::optional<HdPrman_RileyParamList> attributes;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyMaterialSchema::GetAttributesLocator())) {
+        attributes =
+            HdPrman_RileyParamList(
+                schema.GetAttributes());
+    };
+
+
+    _AcquireRiley()->ModifyMaterial(_rileyId,
+        HdPrman_GetRileyObjectPtr(bxdf),
+        HdPrman_GetRileyObjectPtr(attributes)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyMaterialPrim::~HdPrman_RileyMaterialPrim()
+{
+    _AcquireRiley()->DeleteMaterial(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyMaterialPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyMaterialPrim.h
new file mode 100644
index 0000000000..69bab059de
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyMaterialPrim.h
@@ -0,0 +1,71 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_MATERIAL_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_MATERIAL_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyMaterialPrimHandle =
+    std::shared_ptr<class HdPrman_RileyMaterialPrim>;
+
+/// \class HdPrman_RileyMaterialPrim
+///
+/// Wraps a riley Material object, initializing or updating it
+/// using the HdPrmanRileyMaterialSchema.
+///
+class HdPrman_RileyMaterialPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyMaterialPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyMaterialPrim() override;
+
+    using RileyId = riley::MaterialId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyMaterialSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyMaterialSchema.cpp
new file mode 100644
index 0000000000..e29f9f8e02
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyMaterialSchema.cpp
@@ -0,0 +1,155 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyMaterialSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyMaterialSchemaTokens,
+    HD_PRMAN_RILEY_MATERIAL_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyShadingNodeVectorSchema
+HdPrmanRileyMaterialSchema::GetBxdf()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyShadingNodeVectorSchema(_GetTypedDataSource<HdVectorDataSource>(
+        HdPrmanRileyMaterialSchemaTokens->bxdf));
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyMaterialSchema::GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyMaterialSchemaTokens->attributes));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyMaterialSchema::BuildRetained(
+        const HdVectorDataSourceHandle &bxdf,
+        const HdContainerDataSourceHandle &attributes
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (bxdf) {
+        _names[_count] = HdPrmanRileyMaterialSchemaTokens->bxdf;
+        _values[_count++] = bxdf;
+    }
+
+    if (attributes) {
+        _names[_count] = HdPrmanRileyMaterialSchemaTokens->attributes;
+        _values[_count++] = attributes;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyMaterialSchema::Builder &
+HdPrmanRileyMaterialSchema::Builder::SetBxdf(
+    const HdVectorDataSourceHandle &bxdf)
+{
+    _bxdf = bxdf;
+    return *this;
+}
+
+HdPrmanRileyMaterialSchema::Builder &
+HdPrmanRileyMaterialSchema::Builder::SetAttributes(
+    const HdContainerDataSourceHandle &attributes)
+{
+    _attributes = attributes;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyMaterialSchema::Builder::Build()
+{
+    return HdPrmanRileyMaterialSchema::BuildRetained(
+        _bxdf,
+        _attributes
+    );
+}
+
+/*static*/
+HdPrmanRileyMaterialSchema
+HdPrmanRileyMaterialSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyMaterialSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyMaterialSchemaTokens->rileyMaterial))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyMaterialSchema::GetSchemaToken()
+{
+    return HdPrmanRileyMaterialSchemaTokens->rileyMaterial;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyMaterialSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyMaterialSchema::GetBxdfLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyMaterialSchemaTokens->bxdf);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyMaterialSchema::GetAttributesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyMaterialSchemaTokens->attributes);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyMaterialSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyMaterialSchema.h
new file mode 100644
index 0000000000..a18e256de5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyMaterialSchema.h
@@ -0,0 +1,176 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_MATERIAL_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_MATERIAL_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileySchemaTypeDefs.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_MATERIAL_SCHEMA_TOKENS \
+    (rileyMaterial) \
+    (bxdf) \
+    (attributes) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyMaterialSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_MATERIAL_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyMaterialSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyMaterialSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyMaterial" from the parent container and constructs a
+    /// HdPrmanRileyMaterialSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyMaterialSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyShadingNodeVectorSchema GetBxdf()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate bxdf.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetBxdfLocator();
+
+    /// Prim-level relative data source locator to locate attributes.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetAttributesLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdVectorDataSourceHandle &bxdf,
+        const HdContainerDataSourceHandle &attributes
+    );
+
+    /// \class HdPrmanRileyMaterialSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetBxdf(
+            const HdVectorDataSourceHandle &bxdf);
+        HDPRMAN_API
+        Builder &SetAttributes(
+            const HdContainerDataSourceHandle &attributes);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdVectorDataSourceHandle _bxdf;
+        HdContainerDataSourceHandle _attributes;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyParamListSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyParamListSchema.cpp
new file mode 100644
index 0000000000..442c05fa1b
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyParamListSchema.cpp
@@ -0,0 +1,81 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyParamListSchemaTokens,
+    HD_PRMAN_RILEY_PARAM_LIST_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyParamContainerSchema
+HdPrmanRileyParamListSchema::GetParams()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamContainerSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyParamListSchemaTokens->params));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyParamListSchema::BuildRetained(
+        const HdContainerDataSourceHandle &params
+)
+{
+    TfToken _names[1];
+    HdDataSourceBaseHandle _values[1];
+
+    size_t _count = 0;
+
+    if (params) {
+        _names[_count] = HdPrmanRileyParamListSchemaTokens->params;
+        _values[_count++] = params;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyParamListSchema::Builder &
+HdPrmanRileyParamListSchema::Builder::SetParams(
+    const HdContainerDataSourceHandle &params)
+{
+    _params = params;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyParamListSchema::Builder::Build()
+{
+    return HdPrmanRileyParamListSchema::BuildRetained(
+        _params
+    );
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyParamListSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyParamListSchema.h
new file mode 100644
index 0000000000..d167fcb76b
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyParamListSchema.h
@@ -0,0 +1,127 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PARAM_LIST_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PARAM_LIST_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileySchemaTypeDefs.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_PARAM_LIST_SCHEMA_TOKENS \
+    (params) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyParamListSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_PARAM_LIST_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+// Schema to describe RtParamList.
+//
+// To obtain an RtParamList from this schema, we call the appropriate
+// RtParamList::SetFOO(name, value) for each name in the container params.
+//
+// The schema HdPrmanRileyParamSchema determines what SetFOO method is called
+// with what value. To resolve what SetFOO method to use, the type of the
+// VtValue from the value data source is used as well as the role token if
+// necessary. The value is coming from the value data source.
+//
+
+class HdPrmanRileyParamListSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyParamListSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyParamContainerSchema GetParams()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdContainerDataSourceHandle &params
+    );
+
+    /// \class HdPrmanRileyParamListSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetParams(
+            const HdContainerDataSourceHandle &params);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdContainerDataSourceHandle _params;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyParamSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyParamSchema.cpp
new file mode 100644
index 0000000000..9c9e559ee0
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyParamSchema.cpp
@@ -0,0 +1,108 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyParamSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyParamSchemaTokens,
+    HD_PRMAN_RILEY_PARAM_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdSampledDataSourceHandle
+HdPrmanRileyParamSchema::GetValue()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdSampledDataSource>(
+        HdPrmanRileyParamSchemaTokens->value);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyParamSchema::GetRole()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyParamSchemaTokens->role);
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyParamSchema::BuildRetained(
+        const HdSampledDataSourceHandle &value,
+        const HdTokenDataSourceHandle &role
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (value) {
+        _names[_count] = HdPrmanRileyParamSchemaTokens->value;
+        _values[_count++] = value;
+    }
+
+    if (role) {
+        _names[_count] = HdPrmanRileyParamSchemaTokens->role;
+        _values[_count++] = role;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyParamSchema::Builder &
+HdPrmanRileyParamSchema::Builder::SetValue(
+    const HdSampledDataSourceHandle &value)
+{
+    _value = value;
+    return *this;
+}
+
+HdPrmanRileyParamSchema::Builder &
+HdPrmanRileyParamSchema::Builder::SetRole(
+    const HdTokenDataSourceHandle &role)
+{
+    _role = role;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyParamSchema::Builder::Build()
+{
+    return HdPrmanRileyParamSchema::BuildRetained(
+        _value,
+        _role
+    );
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyParamSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyParamSchema.h
new file mode 100644
index 0000000000..6e6cf5b124
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyParamSchema.h
@@ -0,0 +1,133 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PARAM_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PARAM_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_PARAM_SCHEMA_TOKENS \
+    (value) \
+    (role) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyParamSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_PARAM_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyParamSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyParamSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdSampledDataSourceHandle GetValue()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    /// Disambiguates what call to RtParamList::SetFOO to use. Can take values
+    /// from HdPrimvarRoleTokens and HdPrmanRileyAdditionalRoleTokens.
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetRole()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdSampledDataSourceHandle &value,
+        const HdTokenDataSourceHandle &role
+    );
+
+    /// \class HdPrmanRileyParamSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetValue(
+            const HdSampledDataSourceHandle &value);
+        HDPRMAN_API
+        Builder &SetRole(
+            const HdTokenDataSourceHandle &role);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdSampledDataSourceHandle _value;
+        HdTokenDataSourceHandle _role;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyPrimBase.cpp b/third_party/renderman-26/plugin/hdPrman/rileyPrimBase.cpp
new file mode 100644
index 0000000000..2664441ae6
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyPrimBase.cpp
@@ -0,0 +1,36 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "hdPrman/rileyPrimBase.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/renderParam.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyPrimBase::HdPrman_RileyPrimBase(
+    HdPrman_RenderParam * const renderParam)
+  : _renderParam(renderParam)
+{
+}
+
+riley::Riley *
+HdPrman_RileyPrimBase::_AcquireRiley()
+{
+    return _renderParam->AcquireRiley();
+}
+
+const GfVec2f &
+HdPrman_RileyPrimBase::_GetShutterInterval()
+{
+    return _renderParam->GetShutterInterval();
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyPrimBase.h b/third_party/renderman-26/plugin/hdPrman/rileyPrimBase.h
new file mode 100644
index 0000000000..0ae3ed81ee
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyPrimBase.h
@@ -0,0 +1,51 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_BASE_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_BASE_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "pxr/imaging/hdsi/primManagingSceneIndexObserver.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_RenderParam;
+
+/// \class HdPrman_RileyPrimBase
+///
+/// A base class for prims wrapping Riley objects. It provides access
+/// to Riley so that subclasses can call Riley::Create/Modify/DeleteFoo.
+///
+class HdPrman_RileyPrimBase
+   : public HdsiPrimManagingSceneIndexObserver::PrimBase
+{
+protected:
+    // HdPrman_RenderParam needed to get Riley.
+    HdPrman_RileyPrimBase(HdPrman_RenderParam * renderParam);
+
+    // Does necessary things (such as stopping the render) so that
+    // calls to, e.g., Riley::Create are safe.
+    riley::Riley * _AcquireRiley();
+
+    const GfVec2f &_GetShutterInterval();
+
+private:
+    HdPrman_RenderParam * const _renderParam;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
+
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyPrimFactory.cpp b/third_party/renderman-26/plugin/hdPrman/rileyPrimFactory.cpp
new file mode 100644
index 0000000000..79cf597480
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyPrimFactory.cpp
@@ -0,0 +1,272 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "hdPrman/rileyPrimFactory.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyCameraPrim.h"
+#include "hdPrman/rileyClippingPlanePrim.h"
+#include "hdPrman/rileyCoordinateSystemPrim.h"
+#include "hdPrman/rileyDisplacementPrim.h"
+#include "hdPrman/rileyDisplayPrim.h"
+#include "hdPrman/rileyDisplayFilterPrim.h"
+#include "hdPrman/rileyGeometryInstancePrim.h"
+#include "hdPrman/rileyGeometryPrototypePrim.h"
+#include "hdPrman/rileyGlobalsPrim.h"
+#include "hdPrman/rileyIntegratorPrim.h"
+#include "hdPrman/rileyLightInstancePrim.h"
+#include "hdPrman/rileyLightShaderPrim.h"
+#include "hdPrman/rileyMaterialPrim.h"
+#include "hdPrman/rileyRenderOutputPrim.h"
+#include "hdPrman/rileyRenderTargetPrim.h"
+#include "hdPrman/rileyRenderViewPrim.h"
+#include "hdPrman/rileySampleFilterPrim.h"
+
+#include "hdPrman/tokens.h"
+
+#include "pxr/imaging/hdsi/primTypeNoticeBatchingSceneIndex.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+namespace
+{
+
+HdContainerDataSourceHandle
+_GetPrimSource(
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    const SdfPath &path)
+{
+    return observer->GetSceneIndex()->GetPrim(path).dataSource;
+}
+
+class _RileyPrimTypePriorityFunctor
+    : public HdsiPrimTypeNoticeBatchingSceneIndex::PrimTypePriorityFunctor
+{
+    size_t GetPriorityForPrimType(
+        const TfToken &primType) const override
+    {
+        /// Dependencies are as follows:
+        ///
+        /// Riley::SetOptions needs to be before anything else!
+        ///
+        /// lightShader     <----------------------------< lightInstance
+        ///                                               /
+        /// material      <------------------------------*---< geometryInstance
+        ///                                             /
+        /// coordinateSystem  <------------------------*
+        ///                                           /
+        /// displacement  <----< geometryPrototype <-*
+        ///
+        /// clippingPlane
+        ///
+        /// renderOutput <-------------------------------< display
+        ///             \                                 / 
+        ///              *-----<  renderTarget <---------*
+        ///                                   \                            _
+        /// integrator <-----------------------*
+        ///                                     \                          _
+        /// displayFilter <----------------------*---------< renderView
+        ///                                     /
+        /// sampleFilter <---------------------*
+        ///                                   /
+        /// camera  <------------------------*
+        if (primType == HdPrmanRileyPrimTypeTokens->globals) {
+            return 0;
+        }
+
+        if (primType == HdPrmanRileyPrimTypeTokens->lightShader ||
+            primType == HdPrmanRileyPrimTypeTokens->material ||
+            primType == HdPrmanRileyPrimTypeTokens->coordinateSystem ||
+            primType == HdPrmanRileyPrimTypeTokens->displacement ||
+            primType == HdPrmanRileyPrimTypeTokens->clippingPlane ||
+            primType == HdPrmanRileyPrimTypeTokens->renderOutput ||
+            primType == HdPrmanRileyPrimTypeTokens->integrator||
+            primType == HdPrmanRileyPrimTypeTokens->displayFilter||
+            primType == HdPrmanRileyPrimTypeTokens->sampleFilter||
+            primType == HdPrmanRileyPrimTypeTokens->camera) {
+            return 1;
+        }
+
+        if (primType == HdPrmanRileyPrimTypeTokens->geometryPrototype ||
+            primType == HdPrmanRileyPrimTypeTokens->renderTarget) {
+            return 2;
+        }
+
+        if (primType == HdPrmanRileyPrimTypeTokens->lightInstance ||
+            primType == HdPrmanRileyPrimTypeTokens->geometryInstance ||
+            primType == HdPrmanRileyPrimTypeTokens->display ||
+            primType == HdPrmanRileyPrimTypeTokens->renderView) {
+            return 3;
+        }
+
+        return 4;
+    }
+
+    size_t GetNumPriorities() const override
+    {
+        return 5;
+    }
+};
+
+}
+
+HdPrman_RileyPrimFactory::HdPrman_RileyPrimFactory(
+    HdPrman_RenderParam * const renderParam)
+  : _renderParam(renderParam)
+{
+}
+
+HdsiPrimManagingSceneIndexObserver::PrimBaseHandle
+HdPrman_RileyPrimFactory::CreatePrim(
+    const HdSceneIndexObserver::AddedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->camera) {
+        return std::make_shared<HdPrman_RileyCameraPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->clippingPlane) {
+        return std::make_shared<HdPrman_RileyClippingPlanePrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->coordinateSystem) {
+        return std::make_shared<HdPrman_RileyCoordinateSystemPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->displacement) {
+        return std::make_shared<HdPrman_RileyDisplacementPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->display) {
+        return std::make_shared<HdPrman_RileyDisplayPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->displayFilter) {
+        return std::make_shared<HdPrman_RileyDisplayFilterPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->geometryInstance) {
+        return std::make_shared<HdPrman_RileyGeometryInstancePrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->geometryPrototype) {
+        return std::make_shared<HdPrman_RileyGeometryPrototypePrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->globals) {
+        return std::make_shared<HdPrman_RileyGlobalsPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->integrator) {
+        return std::make_shared<HdPrman_RileyIntegratorPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->lightInstance) {
+        return std::make_shared<HdPrman_RileyLightInstancePrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->lightShader) {
+        return std::make_shared<HdPrman_RileyLightShaderPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->material) {
+        return std::make_shared<HdPrman_RileyMaterialPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->renderOutput) {
+        return std::make_shared<HdPrman_RileyRenderOutputPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->renderTarget) {
+        return std::make_shared<HdPrman_RileyRenderTargetPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->renderView) {
+        return std::make_shared<HdPrman_RileyRenderViewPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    if (entry.primType == HdPrmanRileyPrimTypeTokens->sampleFilter) {
+        return std::make_shared<HdPrman_RileySampleFilterPrim>(
+            _GetPrimSource(observer, entry.primPath),
+            observer,
+            _renderParam);
+    }
+
+    return nullptr;
+}
+
+const HdContainerDataSourceHandle &
+HdPrman_RileyPrimFactory::GetPrimTypeNoticeBatchingSceneIndexInputArgs()
+{
+    using PriorityFunctorHandle =
+        HdsiPrimTypeNoticeBatchingSceneIndex::PrimTypePriorityFunctorHandle;
+
+    static const HdContainerDataSourceHandle result =
+        HdRetainedContainerDataSource::New(
+            HdsiPrimTypeNoticeBatchingSceneIndexTokens
+                                ->primTypePriorityFunctor,
+            HdRetainedTypedSampledDataSource<PriorityFunctorHandle>::New(
+                std::make_shared<_RileyPrimTypePriorityFunctor>()));
+    
+    return result;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyPrimFactory.h b/third_party/renderman-26/plugin/hdPrman/rileyPrimFactory.h
new file mode 100644
index 0000000000..09cb21616f
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyPrimFactory.h
@@ -0,0 +1,56 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_FACTORY_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIM_FACTORY_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "pxr/imaging/hdsi/primManagingSceneIndexObserver.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_RenderParam;
+
+using HdPrman_RileyPrimFactoryHandle =
+    std::shared_ptr<class HdPrman_RileyPrimFactory>;
+
+/// \class HdPrman_RileyPrimFactory
+///
+/// Implements HdsiPrimManagingSceneIndexObserver::PrimFactoryBase
+/// to translate scene index prims into Riley::Create/Modify/DeleteFoo
+/// calls.
+///
+class HdPrman_RileyPrimFactory
+   : public HdsiPrimManagingSceneIndexObserver::PrimFactoryBase
+{
+public:
+    /// HdPrman_RenderParam's needed to access Riley.
+    HdPrman_RileyPrimFactory(
+        HdPrman_RenderParam * renderParam);
+
+    HdsiPrimManagingSceneIndexObserver::PrimBaseHandle
+    CreatePrim(
+        const HdSceneIndexObserver::AddedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+    static const HdContainerDataSourceHandle &
+    GetPrimTypeNoticeBatchingSceneIndexInputArgs();
+
+private:
+    HdPrman_RenderParam * const _renderParam;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
+
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyPrimvarListSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyPrimvarListSchema.cpp
new file mode 100644
index 0000000000..6b69137c33
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyPrimvarListSchema.cpp
@@ -0,0 +1,189 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyPrimvarListSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyPrimvarListSchemaTokens,
+    HD_PRMAN_RILEY_PRIMVAR_LIST_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdSizetDataSourceHandle
+HdPrmanRileyPrimvarListSchema::GetNumUniform()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdSizetDataSource>(
+        HdPrmanRileyPrimvarListSchemaTokens->numUniform);
+}
+
+HdSizetDataSourceHandle
+HdPrmanRileyPrimvarListSchema::GetNumVertex()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdSizetDataSource>(
+        HdPrmanRileyPrimvarListSchemaTokens->numVertex);
+}
+
+HdSizetDataSourceHandle
+HdPrmanRileyPrimvarListSchema::GetNumVarying()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdSizetDataSource>(
+        HdPrmanRileyPrimvarListSchemaTokens->numVarying);
+}
+
+HdSizetDataSourceHandle
+HdPrmanRileyPrimvarListSchema::GetNumFaceVarying()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdSizetDataSource>(
+        HdPrmanRileyPrimvarListSchemaTokens->numFaceVarying);
+}
+
+HdPrmanRileyPrimvarContainerSchema
+HdPrmanRileyPrimvarListSchema::GetParams()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyPrimvarContainerSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyPrimvarListSchemaTokens->params));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyPrimvarListSchema::BuildRetained(
+        const HdSizetDataSourceHandle &numUniform,
+        const HdSizetDataSourceHandle &numVertex,
+        const HdSizetDataSourceHandle &numVarying,
+        const HdSizetDataSourceHandle &numFaceVarying,
+        const HdContainerDataSourceHandle &params
+)
+{
+    TfToken _names[5];
+    HdDataSourceBaseHandle _values[5];
+
+    size_t _count = 0;
+
+    if (numUniform) {
+        _names[_count] = HdPrmanRileyPrimvarListSchemaTokens->numUniform;
+        _values[_count++] = numUniform;
+    }
+
+    if (numVertex) {
+        _names[_count] = HdPrmanRileyPrimvarListSchemaTokens->numVertex;
+        _values[_count++] = numVertex;
+    }
+
+    if (numVarying) {
+        _names[_count] = HdPrmanRileyPrimvarListSchemaTokens->numVarying;
+        _values[_count++] = numVarying;
+    }
+
+    if (numFaceVarying) {
+        _names[_count] = HdPrmanRileyPrimvarListSchemaTokens->numFaceVarying;
+        _values[_count++] = numFaceVarying;
+    }
+
+    if (params) {
+        _names[_count] = HdPrmanRileyPrimvarListSchemaTokens->params;
+        _values[_count++] = params;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyPrimvarListSchema::Builder &
+HdPrmanRileyPrimvarListSchema::Builder::SetNumUniform(
+    const HdSizetDataSourceHandle &numUniform)
+{
+    _numUniform = numUniform;
+    return *this;
+}
+
+HdPrmanRileyPrimvarListSchema::Builder &
+HdPrmanRileyPrimvarListSchema::Builder::SetNumVertex(
+    const HdSizetDataSourceHandle &numVertex)
+{
+    _numVertex = numVertex;
+    return *this;
+}
+
+HdPrmanRileyPrimvarListSchema::Builder &
+HdPrmanRileyPrimvarListSchema::Builder::SetNumVarying(
+    const HdSizetDataSourceHandle &numVarying)
+{
+    _numVarying = numVarying;
+    return *this;
+}
+
+HdPrmanRileyPrimvarListSchema::Builder &
+HdPrmanRileyPrimvarListSchema::Builder::SetNumFaceVarying(
+    const HdSizetDataSourceHandle &numFaceVarying)
+{
+    _numFaceVarying = numFaceVarying;
+    return *this;
+}
+
+HdPrmanRileyPrimvarListSchema::Builder &
+HdPrmanRileyPrimvarListSchema::Builder::SetParams(
+    const HdContainerDataSourceHandle &params)
+{
+    _params = params;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyPrimvarListSchema::Builder::Build()
+{
+    return HdPrmanRileyPrimvarListSchema::BuildRetained(
+        _numUniform,
+        _numVertex,
+        _numVarying,
+        _numFaceVarying,
+        _params
+    );
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyPrimvarListSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyPrimvarListSchema.h
new file mode 100644
index 0000000000..156859cefd
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyPrimvarListSchema.h
@@ -0,0 +1,200 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIMVAR_LIST_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIMVAR_LIST_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileySchemaTypeDefs.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_PRIMVAR_LIST_SCHEMA_TOKENS \
+    (numUniform) \
+    (numVertex) \
+    (numVarying) \
+    (numFaceVarying) \
+    (params) \
+    (P) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyPrimvarListSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_PRIMVAR_LIST_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+// Schema to describe RtPrimvarList.
+//
+// To obtain an RtPrimvarList we pass numUniform, numVertex, numVarying,
+// numFaceVarying to the constructor, call RtPrimvarList::SetTimes if "P" (for
+// points) is among the params and has samples and finally call the
+// appropriate RtPrimvarList::SetFOO[Detail]( name, value[, detailType[,
+// sampleTimeIndex]]).
+//
+// The HdPrmanRileyPrimvarSchema determines what SetFOO[Detail] method is
+// valled with what value, detailType or sampleTimeIndex.
+//
+// For many data types or when detailType is constant, the behavior is the
+// same as for the HdPrmanRileyParamSchema.
+//
+// Otherweise, we call SetFooDetail using HdPrmanRileyParamSchema similar as
+// we did for HdPrmanRileyParamSchema but consuming the detailType data source
+// as well. The value data source is only sampled at time 0.
+//
+// The "P" param is treated specially. It is the only param for which take
+// time samples (from the sampled value data source) and always corresponds to
+// a call to RtPrimvarList::SetPointDetail with detailType = vertex.
+//
+
+class HdPrmanRileyPrimvarListSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyPrimvarListSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdSizetDataSourceHandle GetNumUniform()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdSizetDataSourceHandle GetNumVertex()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdSizetDataSourceHandle GetNumVarying()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdSizetDataSourceHandle GetNumFaceVarying()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyPrimvarContainerSchema GetParams()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdSizetDataSourceHandle &numUniform,
+        const HdSizetDataSourceHandle &numVertex,
+        const HdSizetDataSourceHandle &numVarying,
+        const HdSizetDataSourceHandle &numFaceVarying,
+        const HdContainerDataSourceHandle &params
+    );
+
+    /// \class HdPrmanRileyPrimvarListSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetNumUniform(
+            const HdSizetDataSourceHandle &numUniform);
+        HDPRMAN_API
+        Builder &SetNumVertex(
+            const HdSizetDataSourceHandle &numVertex);
+        HDPRMAN_API
+        Builder &SetNumVarying(
+            const HdSizetDataSourceHandle &numVarying);
+        HDPRMAN_API
+        Builder &SetNumFaceVarying(
+            const HdSizetDataSourceHandle &numFaceVarying);
+        HDPRMAN_API
+        Builder &SetParams(
+            const HdContainerDataSourceHandle &params);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdSizetDataSourceHandle _numUniform;
+        HdSizetDataSourceHandle _numVertex;
+        HdSizetDataSourceHandle _numVarying;
+        HdSizetDataSourceHandle _numFaceVarying;
+        HdContainerDataSourceHandle _params;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyPrimvarSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyPrimvarSchema.cpp
new file mode 100644
index 0000000000..70f3b38e8e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyPrimvarSchema.cpp
@@ -0,0 +1,175 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyPrimvarSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyPrimvarSchemaTokens,
+    HD_PRMAN_RILEY_PRIMVAR_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdSampledDataSourceHandle
+HdPrmanRileyPrimvarSchema::GetValue()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdSampledDataSource>(
+        HdPrmanRileyPrimvarSchemaTokens->value);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyPrimvarSchema::GetDetailType()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyPrimvarSchemaTokens->detailType);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyPrimvarSchema::GetRole()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyPrimvarSchemaTokens->role);
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyPrimvarSchema::BuildRetained(
+        const HdSampledDataSourceHandle &value,
+        const HdTokenDataSourceHandle &detailType,
+        const HdTokenDataSourceHandle &role
+)
+{
+    TfToken _names[3];
+    HdDataSourceBaseHandle _values[3];
+
+    size_t _count = 0;
+
+    if (value) {
+        _names[_count] = HdPrmanRileyPrimvarSchemaTokens->value;
+        _values[_count++] = value;
+    }
+
+    if (detailType) {
+        _names[_count] = HdPrmanRileyPrimvarSchemaTokens->detailType;
+        _values[_count++] = detailType;
+    }
+
+    if (role) {
+        _names[_count] = HdPrmanRileyPrimvarSchemaTokens->role;
+        _values[_count++] = role;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyPrimvarSchema::Builder &
+HdPrmanRileyPrimvarSchema::Builder::SetValue(
+    const HdSampledDataSourceHandle &value)
+{
+    _value = value;
+    return *this;
+}
+
+HdPrmanRileyPrimvarSchema::Builder &
+HdPrmanRileyPrimvarSchema::Builder::SetDetailType(
+    const HdTokenDataSourceHandle &detailType)
+{
+    _detailType = detailType;
+    return *this;
+}
+
+HdPrmanRileyPrimvarSchema::Builder &
+HdPrmanRileyPrimvarSchema::Builder::SetRole(
+    const HdTokenDataSourceHandle &role)
+{
+    _role = role;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyPrimvarSchema::Builder::Build()
+{
+    return HdPrmanRileyPrimvarSchema::BuildRetained(
+        _value,
+        _detailType,
+        _role
+    );
+}
+
+/*static*/
+HdTokenDataSourceHandle
+HdPrmanRileyPrimvarSchema::BuildDetailTypeDataSource(
+    const TfToken &detailType)
+{
+
+    if (detailType == HdPrmanRileyPrimvarSchemaTokens->constant) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(detailType);
+        return ds;
+    }
+    if (detailType == HdPrmanRileyPrimvarSchemaTokens->uniform) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(detailType);
+        return ds;
+    }
+    if (detailType == HdPrmanRileyPrimvarSchemaTokens->vertex) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(detailType);
+        return ds;
+    }
+    if (detailType == HdPrmanRileyPrimvarSchemaTokens->varying) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(detailType);
+        return ds;
+    }
+    if (detailType == HdPrmanRileyPrimvarSchemaTokens->facevarying) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(detailType);
+        return ds;
+    }
+    if (detailType == HdPrmanRileyPrimvarSchemaTokens->reference) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(detailType);
+        return ds;
+    }
+    // fallback for unknown token
+    return HdRetainedTypedSampledDataSource<TfToken>::New(detailType);
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyPrimvarSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyPrimvarSchema.h
new file mode 100644
index 0000000000..92bf80c892
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyPrimvarSchema.h
@@ -0,0 +1,168 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIMVAR_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_PRIMVAR_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_PRIMVAR_SCHEMA_TOKENS \
+    (value) \
+    (detailType) \
+    (role) \
+    (constant) \
+    (uniform) \
+    (vertex) \
+    (varying) \
+    (facevarying) \
+    (reference) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyPrimvarSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_PRIMVAR_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyPrimvarSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyPrimvarSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdSampledDataSourceHandle GetValue()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetDetailType()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    /// Disambiguates what call to RtPrimvarList::SetFOO to use. Can take
+    /// values from HdPrimvarRoleTokens and HdPrmanRileyAdditionalRoleTokens.
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetRole()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdSampledDataSourceHandle &value,
+        const HdTokenDataSourceHandle &detailType,
+        const HdTokenDataSourceHandle &role
+    );
+
+    /// \class HdPrmanRileyPrimvarSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetValue(
+            const HdSampledDataSourceHandle &value);
+        HDPRMAN_API
+        Builder &SetDetailType(
+            const HdTokenDataSourceHandle &detailType);
+        HDPRMAN_API
+        Builder &SetRole(
+            const HdTokenDataSourceHandle &role);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdSampledDataSourceHandle _value;
+        HdTokenDataSourceHandle _detailType;
+        HdTokenDataSourceHandle _role;
+
+    };
+
+    /// Returns token data source for use as detailType value.
+    ///
+    /// The following values will be stored statically and reused for future
+    /// calls:
+    /// - HdPrmanRileyPrimvarSchemaTokens->constant
+    /// - HdPrmanRileyPrimvarSchemaTokens->uniform
+    /// - HdPrmanRileyPrimvarSchemaTokens->vertex
+    /// - HdPrmanRileyPrimvarSchemaTokens->varying
+    /// - HdPrmanRileyPrimvarSchemaTokens->facevarying
+    /// - HdPrmanRileyPrimvarSchemaTokens->reference
+    HDPRMAN_API
+    static HdTokenDataSourceHandle BuildDetailTypeDataSource(
+        const TfToken &detailType);
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputPrim.cpp
new file mode 100644
index 0000000000..747960225e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputPrim.cpp
@@ -0,0 +1,195 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyRenderOutputPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyRenderOutputSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyRenderOutputPrim::HdPrman_RileyRenderOutputPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyRenderOutputSchema schema =
+        HdPrmanRileyRenderOutputSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyString name =
+        HdPrman_RileyString(
+            schema.GetName());
+
+    HdPrman_RileyRenderOutputType type =
+        HdPrman_RileyRenderOutputType(
+            schema.GetType());
+
+    HdPrman_RileyString source =
+        HdPrman_RileyString(
+            schema.GetSource());
+
+    HdPrman_RileyString accumulationRule =
+        HdPrman_RileyString(
+            schema.GetAccumulationRule());
+
+    HdPrman_RileyString filter =
+        HdPrman_RileyString(
+            schema.GetFilter());
+
+    HdPrman_RileyFilterSize filterSize =
+        HdPrman_RileyFilterSize(
+            schema.GetFilterSize());
+
+    HdPrman_RileyFloat relativePixelVariance =
+        HdPrman_RileyFloat(
+            schema.GetRelativePixelVariance(),
+            /* fallbackValue = */ 1.0f);
+
+    HdPrman_RileyParamList params =
+        HdPrman_RileyParamList(
+            schema.GetParams());
+
+
+    _rileyId = _AcquireRiley()->CreateRenderOutput(
+        riley::UserId(),
+
+        name.rileyObject,
+        type.rileyObject,
+        source.rileyObject,
+        accumulationRule.rileyObject,
+        filter.rileyObject,
+        filterSize.rileyObject,
+        relativePixelVariance.rileyObject,
+        params.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyRenderOutputPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyRenderOutputSchema schema =
+        HdPrmanRileyRenderOutputSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyString> name;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderOutputSchema::GetNameLocator())) {
+        name =
+            HdPrman_RileyString(
+                schema.GetName());
+    };
+
+    std::optional<HdPrman_RileyRenderOutputType> type;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderOutputSchema::GetTypeLocator())) {
+        type =
+            HdPrman_RileyRenderOutputType(
+                schema.GetType());
+    };
+
+    std::optional<HdPrman_RileyString> source;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderOutputSchema::GetSourceLocator())) {
+        source =
+            HdPrman_RileyString(
+                schema.GetSource());
+    };
+
+    std::optional<HdPrman_RileyString> accumulationRule;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderOutputSchema::GetAccumulationRuleLocator())) {
+        accumulationRule =
+            HdPrman_RileyString(
+                schema.GetAccumulationRule());
+    };
+
+    std::optional<HdPrman_RileyString> filter;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderOutputSchema::GetFilterLocator())) {
+        filter =
+            HdPrman_RileyString(
+                schema.GetFilter());
+    };
+
+    std::optional<HdPrman_RileyFilterSize> filterSize;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderOutputSchema::GetFilterSizeLocator())) {
+        filterSize =
+            HdPrman_RileyFilterSize(
+                schema.GetFilterSize());
+    };
+
+    std::optional<HdPrman_RileyFloat> relativePixelVariance;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderOutputSchema::GetRelativePixelVarianceLocator())) {
+        relativePixelVariance =
+            HdPrman_RileyFloat(
+                schema.GetRelativePixelVariance(),
+                1.0f);
+    };
+
+    std::optional<HdPrman_RileyParamList> params;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderOutputSchema::GetParamsLocator())) {
+        params =
+            HdPrman_RileyParamList(
+                schema.GetParams());
+    };
+
+
+    _AcquireRiley()->ModifyRenderOutput(_rileyId,
+        HdPrman_GetRileyObjectPtr(name),
+        HdPrman_GetRileyObjectPtr(type),
+        HdPrman_GetRileyObjectPtr(source),
+        HdPrman_GetRileyObjectPtr(accumulationRule),
+        HdPrman_GetRileyObjectPtr(filter),
+        HdPrman_GetRileyObjectPtr(filterSize),
+        HdPrman_GetRileyObjectPtr(relativePixelVariance),
+        HdPrman_GetRileyObjectPtr(params)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileyRenderOutputPrim::~HdPrman_RileyRenderOutputPrim()
+{
+    _AcquireRiley()->DeleteRenderOutput(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputPrim.h
new file mode 100644
index 0000000000..7a66bddd08
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputPrim.h
@@ -0,0 +1,73 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_OUTPUT_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_OUTPUT_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileyRenderOutputPrimHandle =
+    std::shared_ptr<class HdPrman_RileyRenderOutputPrim>;
+
+/// \class HdPrman_RileyRenderOutputPrim
+///
+/// Wraps a riley RenderOutput object, initializing or updating it
+/// using the HdPrmanRileyRenderOutputSchema.
+///
+class HdPrman_RileyRenderOutputPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyRenderOutputPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyRenderOutputPrim() override;
+
+    using RileyId = riley::RenderOutputId;
+    using RileyIdList = riley::RenderOutputList;
+
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputSchema.cpp
new file mode 100644
index 0000000000..924699cc15
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputSchema.cpp
@@ -0,0 +1,407 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyRenderOutputSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyRenderOutputSchemaTokens,
+    HD_PRMAN_RILEY_RENDER_OUTPUT_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdTokenDataSourceHandle
+HdPrmanRileyRenderOutputSchema::GetName()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyRenderOutputSchemaTokens->name);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyRenderOutputSchema::GetType()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyRenderOutputSchemaTokens->type);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyRenderOutputSchema::GetSource()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyRenderOutputSchemaTokens->source);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyRenderOutputSchema::GetAccumulationRule()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyRenderOutputSchemaTokens->accumulationRule);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyRenderOutputSchema::GetFilter()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyRenderOutputSchemaTokens->filter);
+}
+
+HdVec2fDataSourceHandle
+HdPrmanRileyRenderOutputSchema::GetFilterSize()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdVec2fDataSource>(
+        HdPrmanRileyRenderOutputSchemaTokens->filterSize);
+}
+
+HdFloatDataSourceHandle
+HdPrmanRileyRenderOutputSchema::GetRelativePixelVariance()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdFloatDataSource>(
+        HdPrmanRileyRenderOutputSchemaTokens->relativePixelVariance);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyRenderOutputSchema::GetParams()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyRenderOutputSchemaTokens->params));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyRenderOutputSchema::BuildRetained(
+        const HdTokenDataSourceHandle &name,
+        const HdTokenDataSourceHandle &type,
+        const HdTokenDataSourceHandle &source,
+        const HdTokenDataSourceHandle &accumulationRule,
+        const HdTokenDataSourceHandle &filter,
+        const HdVec2fDataSourceHandle &filterSize,
+        const HdFloatDataSourceHandle &relativePixelVariance,
+        const HdContainerDataSourceHandle &params
+)
+{
+    TfToken _names[8];
+    HdDataSourceBaseHandle _values[8];
+
+    size_t _count = 0;
+
+    if (name) {
+        _names[_count] = HdPrmanRileyRenderOutputSchemaTokens->name;
+        _values[_count++] = name;
+    }
+
+    if (type) {
+        _names[_count] = HdPrmanRileyRenderOutputSchemaTokens->type;
+        _values[_count++] = type;
+    }
+
+    if (source) {
+        _names[_count] = HdPrmanRileyRenderOutputSchemaTokens->source;
+        _values[_count++] = source;
+    }
+
+    if (accumulationRule) {
+        _names[_count] = HdPrmanRileyRenderOutputSchemaTokens->accumulationRule;
+        _values[_count++] = accumulationRule;
+    }
+
+    if (filter) {
+        _names[_count] = HdPrmanRileyRenderOutputSchemaTokens->filter;
+        _values[_count++] = filter;
+    }
+
+    if (filterSize) {
+        _names[_count] = HdPrmanRileyRenderOutputSchemaTokens->filterSize;
+        _values[_count++] = filterSize;
+    }
+
+    if (relativePixelVariance) {
+        _names[_count] = HdPrmanRileyRenderOutputSchemaTokens->relativePixelVariance;
+        _values[_count++] = relativePixelVariance;
+    }
+
+    if (params) {
+        _names[_count] = HdPrmanRileyRenderOutputSchemaTokens->params;
+        _values[_count++] = params;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyRenderOutputSchema::Builder &
+HdPrmanRileyRenderOutputSchema::Builder::SetName(
+    const HdTokenDataSourceHandle &name)
+{
+    _name = name;
+    return *this;
+}
+
+HdPrmanRileyRenderOutputSchema::Builder &
+HdPrmanRileyRenderOutputSchema::Builder::SetType(
+    const HdTokenDataSourceHandle &type)
+{
+    _type = type;
+    return *this;
+}
+
+HdPrmanRileyRenderOutputSchema::Builder &
+HdPrmanRileyRenderOutputSchema::Builder::SetSource(
+    const HdTokenDataSourceHandle &source)
+{
+    _source = source;
+    return *this;
+}
+
+HdPrmanRileyRenderOutputSchema::Builder &
+HdPrmanRileyRenderOutputSchema::Builder::SetAccumulationRule(
+    const HdTokenDataSourceHandle &accumulationRule)
+{
+    _accumulationRule = accumulationRule;
+    return *this;
+}
+
+HdPrmanRileyRenderOutputSchema::Builder &
+HdPrmanRileyRenderOutputSchema::Builder::SetFilter(
+    const HdTokenDataSourceHandle &filter)
+{
+    _filter = filter;
+    return *this;
+}
+
+HdPrmanRileyRenderOutputSchema::Builder &
+HdPrmanRileyRenderOutputSchema::Builder::SetFilterSize(
+    const HdVec2fDataSourceHandle &filterSize)
+{
+    _filterSize = filterSize;
+    return *this;
+}
+
+HdPrmanRileyRenderOutputSchema::Builder &
+HdPrmanRileyRenderOutputSchema::Builder::SetRelativePixelVariance(
+    const HdFloatDataSourceHandle &relativePixelVariance)
+{
+    _relativePixelVariance = relativePixelVariance;
+    return *this;
+}
+
+HdPrmanRileyRenderOutputSchema::Builder &
+HdPrmanRileyRenderOutputSchema::Builder::SetParams(
+    const HdContainerDataSourceHandle &params)
+{
+    _params = params;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyRenderOutputSchema::Builder::Build()
+{
+    return HdPrmanRileyRenderOutputSchema::BuildRetained(
+        _name,
+        _type,
+        _source,
+        _accumulationRule,
+        _filter,
+        _filterSize,
+        _relativePixelVariance,
+        _params
+    );
+}
+
+/*static*/
+HdPrmanRileyRenderOutputSchema
+HdPrmanRileyRenderOutputSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyRenderOutputSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyRenderOutputSchemaTokens->rileyRenderOutput))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyRenderOutputSchema::GetSchemaToken()
+{
+    return HdPrmanRileyRenderOutputSchemaTokens->rileyRenderOutput;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetNameLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderOutputSchemaTokens->name);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetTypeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderOutputSchemaTokens->type);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetSourceLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderOutputSchemaTokens->source);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetAccumulationRuleLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderOutputSchemaTokens->accumulationRule);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetFilterLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderOutputSchemaTokens->filter);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetFilterSizeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderOutputSchemaTokens->filterSize);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetRelativePixelVarianceLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderOutputSchemaTokens->relativePixelVariance);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderOutputSchema::GetParamsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderOutputSchemaTokens->params);
+    return locator;
+}
+
+/*static*/
+HdTokenDataSourceHandle
+HdPrmanRileyRenderOutputSchema::BuildTypeDataSource(
+    const TfToken &type)
+{
+
+    if (type == HdPrmanRileyRenderOutputSchemaTokens->float_) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyRenderOutputSchemaTokens->integer) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyRenderOutputSchemaTokens->color) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyRenderOutputSchemaTokens->vector) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    // fallback for unknown token
+    return HdRetainedTypedSampledDataSource<TfToken>::New(type);
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputSchema.h
new file mode 100644
index 0000000000..73316521b7
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderOutputSchema.h
@@ -0,0 +1,305 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_OUTPUT_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_OUTPUT_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_RENDER_OUTPUT_SCHEMA_TOKENS \
+    (rileyRenderOutput) \
+    (name) \
+    (type) \
+    (source) \
+    (accumulationRule) \
+    (filter) \
+    (filterSize) \
+    (relativePixelVariance) \
+    (params) \
+    ((float_, "float")) \
+    (integer) \
+    (color) \
+    (vector) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyRenderOutputSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_RENDER_OUTPUT_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyRenderOutputSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyRenderOutputSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyRenderOutput" from the parent container and constructs a
+    /// HdPrmanRileyRenderOutputSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyRenderOutputSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetName()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetType()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetSource()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetAccumulationRule()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetFilter()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdVec2fDataSourceHandle GetFilterSize()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdFloatDataSourceHandle GetRelativePixelVariance()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetParams()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate name.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetNameLocator();
+
+    /// Prim-level relative data source locator to locate type.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetTypeLocator();
+
+    /// Prim-level relative data source locator to locate source.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetSourceLocator();
+
+    /// Prim-level relative data source locator to locate accumulationRule.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetAccumulationRuleLocator();
+
+    /// Prim-level relative data source locator to locate filter.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetFilterLocator();
+
+    /// Prim-level relative data source locator to locate filterSize.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetFilterSizeLocator();
+
+    /// Prim-level relative data source locator to locate relativePixelVariance.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetRelativePixelVarianceLocator();
+
+    /// Prim-level relative data source locator to locate params.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetParamsLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdTokenDataSourceHandle &name,
+        const HdTokenDataSourceHandle &type,
+        const HdTokenDataSourceHandle &source,
+        const HdTokenDataSourceHandle &accumulationRule,
+        const HdTokenDataSourceHandle &filter,
+        const HdVec2fDataSourceHandle &filterSize,
+        const HdFloatDataSourceHandle &relativePixelVariance,
+        const HdContainerDataSourceHandle &params
+    );
+
+    /// \class HdPrmanRileyRenderOutputSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetName(
+            const HdTokenDataSourceHandle &name);
+        HDPRMAN_API
+        Builder &SetType(
+            const HdTokenDataSourceHandle &type);
+        HDPRMAN_API
+        Builder &SetSource(
+            const HdTokenDataSourceHandle &source);
+        HDPRMAN_API
+        Builder &SetAccumulationRule(
+            const HdTokenDataSourceHandle &accumulationRule);
+        HDPRMAN_API
+        Builder &SetFilter(
+            const HdTokenDataSourceHandle &filter);
+        HDPRMAN_API
+        Builder &SetFilterSize(
+            const HdVec2fDataSourceHandle &filterSize);
+        HDPRMAN_API
+        Builder &SetRelativePixelVariance(
+            const HdFloatDataSourceHandle &relativePixelVariance);
+        HDPRMAN_API
+        Builder &SetParams(
+            const HdContainerDataSourceHandle &params);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdTokenDataSourceHandle _name;
+        HdTokenDataSourceHandle _type;
+        HdTokenDataSourceHandle _source;
+        HdTokenDataSourceHandle _accumulationRule;
+        HdTokenDataSourceHandle _filter;
+        HdVec2fDataSourceHandle _filterSize;
+        HdFloatDataSourceHandle _relativePixelVariance;
+        HdContainerDataSourceHandle _params;
+
+    };
+
+    /// Returns token data source for use as type value.
+    ///
+    /// The following values will be stored statically and reused for future
+    /// calls:
+    /// - HdPrmanRileyRenderOutputSchemaTokens->float_
+    /// - HdPrmanRileyRenderOutputSchemaTokens->integer
+    /// - HdPrmanRileyRenderOutputSchemaTokens->color
+    /// - HdPrmanRileyRenderOutputSchemaTokens->vector
+    HDPRMAN_API
+    static HdTokenDataSourceHandle BuildTypeDataSource(
+        const TfToken &type);
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetPrim.cpp
new file mode 100644
index 0000000000..4f9188d596
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetPrim.cpp
@@ -0,0 +1,168 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyRenderTargetPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyRenderTargetSchema.h"
+#include "hdPrman/rileyRenderOutputPrim.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyRenderTargetPrim::HdPrman_RileyRenderTargetPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyRenderTargetSchema schema =
+        HdPrmanRileyRenderTargetSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyIdList<HdPrman_RileyRenderOutputPrim> renderOutputs =
+        HdPrman_RileyIdList<HdPrman_RileyRenderOutputPrim>(
+            observer,
+            schema.GetRenderOutputs());
+
+    HdPrman_RileyExtent extent =
+        HdPrman_RileyExtent(
+            schema.GetExtent());
+
+    HdPrman_RileyString filterMode =
+        HdPrman_RileyString(
+            schema.GetFilterMode());
+
+    HdPrman_RileyFloat pixelVariance =
+        HdPrman_RileyFloat(
+            schema.GetPixelVariance(),
+            /* fallbackValue = */ 1.0f);
+
+    HdPrman_RileyParamList params =
+        HdPrman_RileyParamList(
+            schema.GetParams());
+
+
+    _rileyId = _AcquireRiley()->CreateRenderTarget(
+        riley::UserId(),
+
+        renderOutputs.rileyObject,
+        extent.rileyObject,
+        filterMode.rileyObject,
+        pixelVariance.rileyObject,
+        params.rileyObject);
+
+    _renderOutputsPrims = std::move(renderOutputs.prims);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyRenderTargetPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyRenderTargetSchema schema =
+        HdPrmanRileyRenderTargetSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyIdList<HdPrman_RileyRenderOutputPrim>> renderOutputs;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderTargetSchema::GetRenderOutputsLocator())) {
+        renderOutputs =
+            HdPrman_RileyIdList<HdPrman_RileyRenderOutputPrim>(
+                observer,
+                schema.GetRenderOutputs());
+    };
+
+    std::optional<HdPrman_RileyExtent> extent;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderTargetSchema::GetExtentLocator())) {
+        extent =
+            HdPrman_RileyExtent(
+                schema.GetExtent());
+    };
+
+    std::optional<HdPrman_RileyString> filterMode;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderTargetSchema::GetFilterModeLocator())) {
+        filterMode =
+            HdPrman_RileyString(
+                schema.GetFilterMode());
+    };
+
+    std::optional<HdPrman_RileyFloat> pixelVariance;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderTargetSchema::GetPixelVarianceLocator())) {
+        pixelVariance =
+            HdPrman_RileyFloat(
+                schema.GetPixelVariance(),
+                1.0f);
+    };
+
+    std::optional<HdPrman_RileyParamList> params;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderTargetSchema::GetParamsLocator())) {
+        params =
+            HdPrman_RileyParamList(
+                schema.GetParams());
+    };
+
+
+    _AcquireRiley()->ModifyRenderTarget(_rileyId,
+        HdPrman_GetRileyObjectPtr(renderOutputs),
+        HdPrman_GetRileyObjectPtr(extent),
+        HdPrman_GetRileyObjectPtr(filterMode),
+        HdPrman_GetRileyObjectPtr(pixelVariance),
+        HdPrman_GetRileyObjectPtr(params)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+    // Now that the RenderTarget is using the new
+    // RileyRenderOutput, we can realease the handles
+    // to the old RileyRenderOutput.
+    if (renderOutputs) {
+        _renderOutputsPrims = std::move(renderOutputs->prims);
+    }
+
+}
+
+HdPrman_RileyRenderTargetPrim::~HdPrman_RileyRenderTargetPrim()
+{
+    _AcquireRiley()->DeleteRenderTarget(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+
+    // _renderOutputsPrims gets dropped after the RenderTarget was
+    // deleted.
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetPrim.h
new file mode 100644
index 0000000000..155fca9393
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetPrim.h
@@ -0,0 +1,80 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_TARGET_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_TARGET_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using HdPrman_RileyRenderOutputPrimHandle =
+    std::shared_ptr<class HdPrman_RileyRenderOutputPrim>;
+
+using HdPrman_RileyRenderTargetPrimHandle =
+    std::shared_ptr<class HdPrman_RileyRenderTargetPrim>;
+
+/// \class HdPrman_RileyRenderTargetPrim
+///
+/// Wraps a riley RenderTarget object, initializing or updating it
+/// using the HdPrmanRileyRenderTargetSchema.
+///
+class HdPrman_RileyRenderTargetPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyRenderTargetPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyRenderTargetPrim() override;
+
+    using RileyId = riley::RenderTargetId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    std::vector<HdPrman_RileyRenderOutputPrimHandle> _renderOutputsPrims;
+
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetSchema.cpp
new file mode 100644
index 0000000000..92b931e199
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetSchema.cpp
@@ -0,0 +1,286 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyRenderTargetSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyRenderTargetSchemaTokens,
+    HD_PRMAN_RILEY_RENDER_TARGET_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPathArrayDataSourceHandle
+HdPrmanRileyRenderTargetSchema::GetRenderOutputs()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathArrayDataSource>(
+        HdPrmanRileyRenderTargetSchemaTokens->renderOutputs);
+}
+
+HdVec3iDataSourceHandle
+HdPrmanRileyRenderTargetSchema::GetExtent()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdVec3iDataSource>(
+        HdPrmanRileyRenderTargetSchemaTokens->extent);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyRenderTargetSchema::GetFilterMode()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyRenderTargetSchemaTokens->filterMode);
+}
+
+HdFloatDataSourceHandle
+HdPrmanRileyRenderTargetSchema::GetPixelVariance()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdFloatDataSource>(
+        HdPrmanRileyRenderTargetSchemaTokens->pixelVariance);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyRenderTargetSchema::GetParams()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyRenderTargetSchemaTokens->params));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyRenderTargetSchema::BuildRetained(
+        const HdPathArrayDataSourceHandle &renderOutputs,
+        const HdVec3iDataSourceHandle &extent,
+        const HdTokenDataSourceHandle &filterMode,
+        const HdFloatDataSourceHandle &pixelVariance,
+        const HdContainerDataSourceHandle &params
+)
+{
+    TfToken _names[5];
+    HdDataSourceBaseHandle _values[5];
+
+    size_t _count = 0;
+
+    if (renderOutputs) {
+        _names[_count] = HdPrmanRileyRenderTargetSchemaTokens->renderOutputs;
+        _values[_count++] = renderOutputs;
+    }
+
+    if (extent) {
+        _names[_count] = HdPrmanRileyRenderTargetSchemaTokens->extent;
+        _values[_count++] = extent;
+    }
+
+    if (filterMode) {
+        _names[_count] = HdPrmanRileyRenderTargetSchemaTokens->filterMode;
+        _values[_count++] = filterMode;
+    }
+
+    if (pixelVariance) {
+        _names[_count] = HdPrmanRileyRenderTargetSchemaTokens->pixelVariance;
+        _values[_count++] = pixelVariance;
+    }
+
+    if (params) {
+        _names[_count] = HdPrmanRileyRenderTargetSchemaTokens->params;
+        _values[_count++] = params;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyRenderTargetSchema::Builder &
+HdPrmanRileyRenderTargetSchema::Builder::SetRenderOutputs(
+    const HdPathArrayDataSourceHandle &renderOutputs)
+{
+    _renderOutputs = renderOutputs;
+    return *this;
+}
+
+HdPrmanRileyRenderTargetSchema::Builder &
+HdPrmanRileyRenderTargetSchema::Builder::SetExtent(
+    const HdVec3iDataSourceHandle &extent)
+{
+    _extent = extent;
+    return *this;
+}
+
+HdPrmanRileyRenderTargetSchema::Builder &
+HdPrmanRileyRenderTargetSchema::Builder::SetFilterMode(
+    const HdTokenDataSourceHandle &filterMode)
+{
+    _filterMode = filterMode;
+    return *this;
+}
+
+HdPrmanRileyRenderTargetSchema::Builder &
+HdPrmanRileyRenderTargetSchema::Builder::SetPixelVariance(
+    const HdFloatDataSourceHandle &pixelVariance)
+{
+    _pixelVariance = pixelVariance;
+    return *this;
+}
+
+HdPrmanRileyRenderTargetSchema::Builder &
+HdPrmanRileyRenderTargetSchema::Builder::SetParams(
+    const HdContainerDataSourceHandle &params)
+{
+    _params = params;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyRenderTargetSchema::Builder::Build()
+{
+    return HdPrmanRileyRenderTargetSchema::BuildRetained(
+        _renderOutputs,
+        _extent,
+        _filterMode,
+        _pixelVariance,
+        _params
+    );
+}
+
+/*static*/
+HdPrmanRileyRenderTargetSchema
+HdPrmanRileyRenderTargetSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyRenderTargetSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyRenderTargetSchemaTokens->rileyRenderTarget))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyRenderTargetSchema::GetSchemaToken()
+{
+    return HdPrmanRileyRenderTargetSchemaTokens->rileyRenderTarget;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyRenderTargetSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderTargetSchema::GetRenderOutputsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderTargetSchemaTokens->renderOutputs);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderTargetSchema::GetExtentLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderTargetSchemaTokens->extent);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderTargetSchema::GetFilterModeLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderTargetSchemaTokens->filterMode);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderTargetSchema::GetPixelVarianceLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderTargetSchemaTokens->pixelVariance);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderTargetSchema::GetParamsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderTargetSchemaTokens->params);
+    return locator;
+}
+
+/*static*/
+HdTokenDataSourceHandle
+HdPrmanRileyRenderTargetSchema::BuildFilterModeDataSource(
+    const TfToken &filterMode)
+{
+
+    if (filterMode == HdPrmanRileyRenderTargetSchemaTokens->importance) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(filterMode);
+        return ds;
+    }
+    if (filterMode == HdPrmanRileyRenderTargetSchemaTokens->weighted) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(filterMode);
+        return ds;
+    }
+    // fallback for unknown token
+    return HdRetainedTypedSampledDataSource<TfToken>::New(filterMode);
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetSchema.h
new file mode 100644
index 0000000000..1b11a77b27
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderTargetSchema.h
@@ -0,0 +1,244 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_TARGET_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_TARGET_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_RENDER_TARGET_SCHEMA_TOKENS \
+    (rileyRenderTarget) \
+    (renderOutputs) \
+    (extent) \
+    (filterMode) \
+    (pixelVariance) \
+    (params) \
+    (importance) \
+    (weighted) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyRenderTargetSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_RENDER_TARGET_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyRenderTargetSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyRenderTargetSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyRenderTarget" from the parent container and constructs a
+    /// HdPrmanRileyRenderTargetSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyRenderTargetSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPathArrayDataSourceHandle GetRenderOutputs()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdVec3iDataSourceHandle GetExtent()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetFilterMode()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdFloatDataSourceHandle GetPixelVariance()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetParams()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate renderOutputs.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetRenderOutputsLocator();
+
+    /// Prim-level relative data source locator to locate extent.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetExtentLocator();
+
+    /// Prim-level relative data source locator to locate filterMode.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetFilterModeLocator();
+
+    /// Prim-level relative data source locator to locate pixelVariance.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetPixelVarianceLocator();
+
+    /// Prim-level relative data source locator to locate params.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetParamsLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdPathArrayDataSourceHandle &renderOutputs,
+        const HdVec3iDataSourceHandle &extent,
+        const HdTokenDataSourceHandle &filterMode,
+        const HdFloatDataSourceHandle &pixelVariance,
+        const HdContainerDataSourceHandle &params
+    );
+
+    /// \class HdPrmanRileyRenderTargetSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetRenderOutputs(
+            const HdPathArrayDataSourceHandle &renderOutputs);
+        HDPRMAN_API
+        Builder &SetExtent(
+            const HdVec3iDataSourceHandle &extent);
+        HDPRMAN_API
+        Builder &SetFilterMode(
+            const HdTokenDataSourceHandle &filterMode);
+        HDPRMAN_API
+        Builder &SetPixelVariance(
+            const HdFloatDataSourceHandle &pixelVariance);
+        HDPRMAN_API
+        Builder &SetParams(
+            const HdContainerDataSourceHandle &params);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdPathArrayDataSourceHandle _renderOutputs;
+        HdVec3iDataSourceHandle _extent;
+        HdTokenDataSourceHandle _filterMode;
+        HdFloatDataSourceHandle _pixelVariance;
+        HdContainerDataSourceHandle _params;
+
+    };
+
+    /// Returns token data source for use as filterMode value.
+    ///
+    /// The following values will be stored statically and reused for future
+    /// calls:
+    /// - HdPrmanRileyRenderTargetSchemaTokens->importance
+    /// - HdPrmanRileyRenderTargetSchemaTokens->weighted
+    HDPRMAN_API
+    static HdTokenDataSourceHandle BuildFilterModeDataSource(
+        const TfToken &filterMode);
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderViewPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileyRenderViewPrim.cpp
new file mode 100644
index 0000000000..00e650a1a3
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderViewPrim.cpp
@@ -0,0 +1,231 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyRenderViewPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileyRenderViewSchema.h"
+#include "hdPrman/rileyCameraPrim.h"
+#include "hdPrman/rileyDisplayFilterPrim.h"
+#include "hdPrman/rileyIntegratorPrim.h"
+#include "hdPrman/rileyRenderTargetPrim.h"
+#include "hdPrman/rileySampleFilterPrim.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileyRenderViewPrim::HdPrman_RileyRenderViewPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileyRenderViewSchema schema =
+        HdPrmanRileyRenderViewSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyId<HdPrman_RileyRenderTargetPrim> renderTarget =
+        HdPrman_RileyId<HdPrman_RileyRenderTargetPrim>(
+            observer,
+            schema.GetRenderTarget());
+
+    HdPrman_RileyId<HdPrman_RileyCameraPrim> camera =
+        HdPrman_RileyId<HdPrman_RileyCameraPrim>(
+            observer,
+            schema.GetCamera());
+
+    HdPrman_RileyId<HdPrman_RileyIntegratorPrim> integrator =
+        HdPrman_RileyId<HdPrman_RileyIntegratorPrim>(
+            observer,
+            schema.GetIntegrator());
+
+    HdPrman_RileyIdList<HdPrman_RileyDisplayFilterPrim> displayFilters =
+        HdPrman_RileyIdList<HdPrman_RileyDisplayFilterPrim>(
+            observer,
+            schema.GetDisplayFilters());
+
+    HdPrman_RileyIdList<HdPrman_RileySampleFilterPrim> sampleFilters =
+        HdPrman_RileyIdList<HdPrman_RileySampleFilterPrim>(
+            observer,
+            schema.GetSampleFilters());
+
+    HdPrman_RileyParamList params =
+        HdPrman_RileyParamList(
+            schema.GetParams());
+
+
+    _rileyId = _AcquireRiley()->CreateRenderView(
+        riley::UserId(),
+
+        renderTarget.rileyObject,
+        camera.rileyObject,
+        integrator.rileyObject,
+        displayFilters.rileyObject,
+        sampleFilters.rileyObject,
+        params.rileyObject);
+
+    _renderTargetPrim = std::move(renderTarget.prim);
+
+    _cameraPrim = std::move(camera.prim);
+
+    _integratorPrim = std::move(integrator.prim);
+
+    _displayFiltersPrims = std::move(displayFilters.prims);
+
+    _sampleFiltersPrims = std::move(sampleFilters.prims);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileyRenderViewPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileyRenderViewSchema schema =
+        HdPrmanRileyRenderViewSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyId<HdPrman_RileyRenderTargetPrim>> renderTarget;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderViewSchema::GetRenderTargetLocator())) {
+        renderTarget =
+            HdPrman_RileyId<HdPrman_RileyRenderTargetPrim>(
+                observer,
+                schema.GetRenderTarget());
+    };
+
+    std::optional<HdPrman_RileyId<HdPrman_RileyCameraPrim>> camera;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderViewSchema::GetCameraLocator())) {
+        camera =
+            HdPrman_RileyId<HdPrman_RileyCameraPrim>(
+                observer,
+                schema.GetCamera());
+    };
+
+    std::optional<HdPrman_RileyId<HdPrman_RileyIntegratorPrim>> integrator;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderViewSchema::GetIntegratorLocator())) {
+        integrator =
+            HdPrman_RileyId<HdPrman_RileyIntegratorPrim>(
+                observer,
+                schema.GetIntegrator());
+    };
+
+    std::optional<HdPrman_RileyIdList<HdPrman_RileyDisplayFilterPrim>> displayFilters;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderViewSchema::GetDisplayFiltersLocator())) {
+        displayFilters =
+            HdPrman_RileyIdList<HdPrman_RileyDisplayFilterPrim>(
+                observer,
+                schema.GetDisplayFilters());
+    };
+
+    std::optional<HdPrman_RileyIdList<HdPrman_RileySampleFilterPrim>> sampleFilters;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderViewSchema::GetSampleFiltersLocator())) {
+        sampleFilters =
+            HdPrman_RileyIdList<HdPrman_RileySampleFilterPrim>(
+                observer,
+                schema.GetSampleFilters());
+    };
+
+    std::optional<HdPrman_RileyParamList> params;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileyRenderViewSchema::GetParamsLocator())) {
+        params =
+            HdPrman_RileyParamList(
+                schema.GetParams());
+    };
+
+
+    _AcquireRiley()->ModifyRenderView(_rileyId,
+        HdPrman_GetRileyObjectPtr(renderTarget),
+        HdPrman_GetRileyObjectPtr(camera),
+        HdPrman_GetRileyObjectPtr(integrator),
+        HdPrman_GetRileyObjectPtr(displayFilters),
+        HdPrman_GetRileyObjectPtr(sampleFilters),
+        HdPrman_GetRileyObjectPtr(params)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+    if (renderTarget) {
+        _renderTargetPrim = std::move(renderTarget->prim);
+    }
+
+    if (camera) {
+        _cameraPrim = std::move(camera->prim);
+    }
+
+    if (integrator) {
+        _integratorPrim = std::move(integrator->prim);
+    }
+
+    // Now that the RenderView is using the new
+    // RileyDisplayFilter, we can realease the handles
+    // to the old RileyDisplayFilter.
+    if (displayFilters) {
+        _displayFiltersPrims = std::move(displayFilters->prims);
+    }
+
+    // Now that the RenderView is using the new
+    // RileySampleFilter, we can realease the handles
+    // to the old RileySampleFilter.
+    if (sampleFilters) {
+        _sampleFiltersPrims = std::move(sampleFilters->prims);
+    }
+
+}
+
+HdPrman_RileyRenderViewPrim::~HdPrman_RileyRenderViewPrim()
+{
+    _AcquireRiley()->DeleteRenderView(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+
+    // _renderTargetPrim gets dropped after the RenderView was
+    // deleted.
+
+    // _cameraPrim gets dropped after the RenderView was
+    // deleted.
+
+    // _integratorPrim gets dropped after the RenderView was
+    // deleted.
+
+    // _displayFiltersPrims gets dropped after the RenderView was
+    // deleted.
+
+    // _sampleFiltersPrims gets dropped after the RenderView was
+    // deleted.
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderViewPrim.h b/third_party/renderman-26/plugin/hdPrman/rileyRenderViewPrim.h
new file mode 100644
index 0000000000..820216617b
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderViewPrim.h
@@ -0,0 +1,113 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_VIEW_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_VIEW_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using HdPrman_RileyCameraPrimHandle =
+    std::shared_ptr<class HdPrman_RileyCameraPrim>;
+using HdPrman_RileyDisplayFilterPrimHandle =
+    std::shared_ptr<class HdPrman_RileyDisplayFilterPrim>;
+using HdPrman_RileyIntegratorPrimHandle =
+    std::shared_ptr<class HdPrman_RileyIntegratorPrim>;
+using HdPrman_RileyRenderTargetPrimHandle =
+    std::shared_ptr<class HdPrman_RileyRenderTargetPrim>;
+using HdPrman_RileySampleFilterPrimHandle =
+    std::shared_ptr<class HdPrman_RileySampleFilterPrim>;
+
+using HdPrman_RileyRenderViewPrimHandle =
+    std::shared_ptr<class HdPrman_RileyRenderViewPrim>;
+
+/// \class HdPrman_RileyRenderViewPrim
+///
+/// Wraps a riley RenderView object, initializing or updating it
+/// using the HdPrmanRileyRenderViewSchema.
+///
+class HdPrman_RileyRenderViewPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileyRenderViewPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileyRenderViewPrim() override;
+
+    using RileyId = riley::RenderViewId;
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyRenderTargetPrimHandle _renderTargetPrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyCameraPrimHandle _cameraPrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    HdPrman_RileyIntegratorPrimHandle _integratorPrim;
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    std::vector<HdPrman_RileyDisplayFilterPrimHandle> _displayFiltersPrims;
+
+    // If there is a riley render target constructed from a riley render
+    // output, the render target needs to be deleted before the render
+    // output is deleted.
+    // To ensure this, we keep handles to the prims wrapping the render
+    // outputs here.
+    std::vector<HdPrman_RileySampleFilterPrimHandle> _sampleFiltersPrims;
+
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderViewSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyRenderViewSchema.cpp
new file mode 100644
index 0000000000..fba8397bef
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderViewSchema.cpp
@@ -0,0 +1,323 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyRenderViewSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyRenderViewSchemaTokens,
+    HD_PRMAN_RILEY_RENDER_VIEW_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPathDataSourceHandle
+HdPrmanRileyRenderViewSchema::GetRenderTarget()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyRenderViewSchemaTokens->renderTarget);
+}
+
+HdPathDataSourceHandle
+HdPrmanRileyRenderViewSchema::GetCamera()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyRenderViewSchemaTokens->camera);
+}
+
+HdPathDataSourceHandle
+HdPrmanRileyRenderViewSchema::GetIntegrator()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathDataSource>(
+        HdPrmanRileyRenderViewSchemaTokens->integrator);
+}
+
+HdPathArrayDataSourceHandle
+HdPrmanRileyRenderViewSchema::GetDisplayFilters()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathArrayDataSource>(
+        HdPrmanRileyRenderViewSchemaTokens->displayFilters);
+}
+
+HdPathArrayDataSourceHandle
+HdPrmanRileyRenderViewSchema::GetSampleFilters()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdPathArrayDataSource>(
+        HdPrmanRileyRenderViewSchemaTokens->sampleFilters);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyRenderViewSchema::GetParams()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyRenderViewSchemaTokens->params));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyRenderViewSchema::BuildRetained(
+        const HdPathDataSourceHandle &renderTarget,
+        const HdPathDataSourceHandle &camera,
+        const HdPathDataSourceHandle &integrator,
+        const HdPathArrayDataSourceHandle &displayFilters,
+        const HdPathArrayDataSourceHandle &sampleFilters,
+        const HdContainerDataSourceHandle &params
+)
+{
+    TfToken _names[6];
+    HdDataSourceBaseHandle _values[6];
+
+    size_t _count = 0;
+
+    if (renderTarget) {
+        _names[_count] = HdPrmanRileyRenderViewSchemaTokens->renderTarget;
+        _values[_count++] = renderTarget;
+    }
+
+    if (camera) {
+        _names[_count] = HdPrmanRileyRenderViewSchemaTokens->camera;
+        _values[_count++] = camera;
+    }
+
+    if (integrator) {
+        _names[_count] = HdPrmanRileyRenderViewSchemaTokens->integrator;
+        _values[_count++] = integrator;
+    }
+
+    if (displayFilters) {
+        _names[_count] = HdPrmanRileyRenderViewSchemaTokens->displayFilters;
+        _values[_count++] = displayFilters;
+    }
+
+    if (sampleFilters) {
+        _names[_count] = HdPrmanRileyRenderViewSchemaTokens->sampleFilters;
+        _values[_count++] = sampleFilters;
+    }
+
+    if (params) {
+        _names[_count] = HdPrmanRileyRenderViewSchemaTokens->params;
+        _values[_count++] = params;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyRenderViewSchema::Builder &
+HdPrmanRileyRenderViewSchema::Builder::SetRenderTarget(
+    const HdPathDataSourceHandle &renderTarget)
+{
+    _renderTarget = renderTarget;
+    return *this;
+}
+
+HdPrmanRileyRenderViewSchema::Builder &
+HdPrmanRileyRenderViewSchema::Builder::SetCamera(
+    const HdPathDataSourceHandle &camera)
+{
+    _camera = camera;
+    return *this;
+}
+
+HdPrmanRileyRenderViewSchema::Builder &
+HdPrmanRileyRenderViewSchema::Builder::SetIntegrator(
+    const HdPathDataSourceHandle &integrator)
+{
+    _integrator = integrator;
+    return *this;
+}
+
+HdPrmanRileyRenderViewSchema::Builder &
+HdPrmanRileyRenderViewSchema::Builder::SetDisplayFilters(
+    const HdPathArrayDataSourceHandle &displayFilters)
+{
+    _displayFilters = displayFilters;
+    return *this;
+}
+
+HdPrmanRileyRenderViewSchema::Builder &
+HdPrmanRileyRenderViewSchema::Builder::SetSampleFilters(
+    const HdPathArrayDataSourceHandle &sampleFilters)
+{
+    _sampleFilters = sampleFilters;
+    return *this;
+}
+
+HdPrmanRileyRenderViewSchema::Builder &
+HdPrmanRileyRenderViewSchema::Builder::SetParams(
+    const HdContainerDataSourceHandle &params)
+{
+    _params = params;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyRenderViewSchema::Builder::Build()
+{
+    return HdPrmanRileyRenderViewSchema::BuildRetained(
+        _renderTarget,
+        _camera,
+        _integrator,
+        _displayFilters,
+        _sampleFilters,
+        _params
+    );
+}
+
+/*static*/
+HdPrmanRileyRenderViewSchema
+HdPrmanRileyRenderViewSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileyRenderViewSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileyRenderViewSchemaTokens->rileyRenderView))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileyRenderViewSchema::GetSchemaToken()
+{
+    return HdPrmanRileyRenderViewSchemaTokens->rileyRenderView;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileyRenderViewSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderViewSchema::GetRenderTargetLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderViewSchemaTokens->renderTarget);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderViewSchema::GetCameraLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderViewSchemaTokens->camera);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderViewSchema::GetIntegratorLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderViewSchemaTokens->integrator);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderViewSchema::GetDisplayFiltersLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderViewSchemaTokens->displayFilters);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderViewSchema::GetSampleFiltersLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderViewSchemaTokens->sampleFilters);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileyRenderViewSchema::GetParamsLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileyRenderViewSchemaTokens->params);
+    return locator;
+}
+
+/*static*/
+HdTokenDataSourceHandle
+HdPrmanRileyRenderViewSchema::BuildFilterModeDataSource(
+    const TfToken &filterMode)
+{
+
+    if (filterMode == HdPrmanRileyRenderViewSchemaTokens->importance) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(filterMode);
+        return ds;
+    }
+    if (filterMode == HdPrmanRileyRenderViewSchemaTokens->weighted) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(filterMode);
+        return ds;
+    }
+    // fallback for unknown token
+    return HdRetainedTypedSampledDataSource<TfToken>::New(filterMode);
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyRenderViewSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyRenderViewSchema.h
new file mode 100644
index 0000000000..6d330fbbb8
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyRenderViewSchema.h
@@ -0,0 +1,263 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_VIEW_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_RENDER_VIEW_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_RENDER_VIEW_SCHEMA_TOKENS \
+    (rileyRenderView) \
+    (renderTarget) \
+    (camera) \
+    (integrator) \
+    (displayFilters) \
+    (sampleFilters) \
+    (params) \
+    (importance) \
+    (weighted) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyRenderViewSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_RENDER_VIEW_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyRenderViewSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyRenderViewSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileyRenderView" from the parent container and constructs a
+    /// HdPrmanRileyRenderViewSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileyRenderViewSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetRenderTarget()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetCamera()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathDataSourceHandle GetIntegrator()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathArrayDataSourceHandle GetDisplayFilters()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPathArrayDataSourceHandle GetSampleFilters()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetParams()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate renderTarget.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetRenderTargetLocator();
+
+    /// Prim-level relative data source locator to locate camera.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetCameraLocator();
+
+    /// Prim-level relative data source locator to locate integrator.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetIntegratorLocator();
+
+    /// Prim-level relative data source locator to locate displayFilters.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDisplayFiltersLocator();
+
+    /// Prim-level relative data source locator to locate sampleFilters.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetSampleFiltersLocator();
+
+    /// Prim-level relative data source locator to locate params.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetParamsLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdPathDataSourceHandle &renderTarget,
+        const HdPathDataSourceHandle &camera,
+        const HdPathDataSourceHandle &integrator,
+        const HdPathArrayDataSourceHandle &displayFilters,
+        const HdPathArrayDataSourceHandle &sampleFilters,
+        const HdContainerDataSourceHandle &params
+    );
+
+    /// \class HdPrmanRileyRenderViewSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetRenderTarget(
+            const HdPathDataSourceHandle &renderTarget);
+        HDPRMAN_API
+        Builder &SetCamera(
+            const HdPathDataSourceHandle &camera);
+        HDPRMAN_API
+        Builder &SetIntegrator(
+            const HdPathDataSourceHandle &integrator);
+        HDPRMAN_API
+        Builder &SetDisplayFilters(
+            const HdPathArrayDataSourceHandle &displayFilters);
+        HDPRMAN_API
+        Builder &SetSampleFilters(
+            const HdPathArrayDataSourceHandle &sampleFilters);
+        HDPRMAN_API
+        Builder &SetParams(
+            const HdContainerDataSourceHandle &params);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdPathDataSourceHandle _renderTarget;
+        HdPathDataSourceHandle _camera;
+        HdPathDataSourceHandle _integrator;
+        HdPathArrayDataSourceHandle _displayFilters;
+        HdPathArrayDataSourceHandle _sampleFilters;
+        HdContainerDataSourceHandle _params;
+
+    };
+
+    /// Returns token data source for use as filterMode value.
+    ///
+    /// The following values will be stored statically and reused for future
+    /// calls:
+    /// - HdPrmanRileyRenderViewSchemaTokens->importance
+    /// - HdPrmanRileyRenderViewSchemaTokens->weighted
+    HDPRMAN_API
+    static HdTokenDataSourceHandle BuildFilterModeDataSource(
+        const TfToken &filterMode);
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileySampleFilterPrim.cpp b/third_party/renderman-26/plugin/hdPrman/rileySampleFilterPrim.cpp
new file mode 100644
index 0000000000..6aac7d0abb
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileySampleFilterPrim.cpp
@@ -0,0 +1,109 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileySampleFilterPrim.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyIds.h"
+#include "hdPrman/rileyTypes.h"
+
+#include "hdPrman/rileySampleFilterSchema.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/imaging/hd/sceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_RileySampleFilterPrim::HdPrman_RileySampleFilterPrim(
+    HdContainerDataSourceHandle const &primSource,
+    const HdsiPrimManagingSceneIndexObserver * const observer,
+    HdPrman_RenderParam * const renderParam)
+  : HdPrman_RileyPrimBase(renderParam)
+{
+    HdPrmanRileySampleFilterSchema schema =
+        HdPrmanRileySampleFilterSchema::GetFromParent(primSource);
+
+
+    HdPrman_RileyShadingNetwork sampleFilter =
+        HdPrman_RileyShadingNetwork(
+            schema.GetSampleFilter());
+
+    HdPrman_RileyParamList attributes =
+        HdPrman_RileyParamList(
+            schema.GetAttributes());
+
+
+    _rileyId = _AcquireRiley()->CreateSampleFilter(
+        riley::UserId(),
+
+        sampleFilter.rileyObject,
+        attributes.rileyObject);
+
+// --(BEGIN CUSTOM CODE: Constructor)--
+// --(END CUSTOM CODE: Constructor)--
+}
+
+void
+HdPrman_RileySampleFilterPrim::_Dirty(
+    const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+    const HdsiPrimManagingSceneIndexObserver * const observer)
+{
+    HdPrmanRileySampleFilterSchema schema =
+        HdPrmanRileySampleFilterSchema::GetFromParent(
+            observer->GetSceneIndex()->GetPrim(entry.primPath).dataSource);
+
+
+    std::optional<HdPrman_RileyShadingNetwork> sampleFilter;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileySampleFilterSchema::GetSampleFilterLocator())) {
+        sampleFilter =
+            HdPrman_RileyShadingNetwork(
+                schema.GetSampleFilter());
+    };
+
+    std::optional<HdPrman_RileyParamList> attributes;
+    if (entry.dirtyLocators.Intersects(
+            HdPrmanRileySampleFilterSchema::GetAttributesLocator())) {
+        attributes =
+            HdPrman_RileyParamList(
+                schema.GetAttributes());
+    };
+
+
+    _AcquireRiley()->ModifySampleFilter(_rileyId,
+        HdPrman_GetRileyObjectPtr(sampleFilter),
+        HdPrman_GetRileyObjectPtr(attributes)
+// --(BEGIN CUSTOM CODE: Modify)--
+// --(END CUSTOM CODE: Modify)--
+        );
+
+
+}
+
+HdPrman_RileySampleFilterPrim::~HdPrman_RileySampleFilterPrim()
+{
+    _AcquireRiley()->DeleteSampleFilter(_rileyId
+// --(BEGIN CUSTOM CODE: Delete)--
+// --(END CUSTOM CODE: Delete)--
+        );
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileySampleFilterPrim.h b/third_party/renderman-26/plugin/hdPrman/rileySampleFilterPrim.h
new file mode 100644
index 0000000000..72e55b55f8
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileySampleFilterPrim.h
@@ -0,0 +1,73 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_SAMPLE_FILTER_PRIM_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_SAMPLE_FILTER_PRIM_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyPrimBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+
+using HdPrman_RileySampleFilterPrimHandle =
+    std::shared_ptr<class HdPrman_RileySampleFilterPrim>;
+
+/// \class HdPrman_RileySampleFilterPrim
+///
+/// Wraps a riley SampleFilter object, initializing or updating it
+/// using the HdPrmanRileySampleFilterSchema.
+///
+class HdPrman_RileySampleFilterPrim : public HdPrman_RileyPrimBase
+{
+public:
+    HdPrman_RileySampleFilterPrim(
+        HdContainerDataSourceHandle const &primSource,
+        const HdsiPrimManagingSceneIndexObserver *observer,
+        HdPrman_RenderParam * renderParam);
+
+    ~HdPrman_RileySampleFilterPrim() override;
+
+    using RileyId = riley::SampleFilterId;
+    using RileyIdList = riley::SampleFilterList;
+
+
+    const RileyId &GetRileyId() const { return _rileyId; }
+
+protected:
+    void _Dirty(
+        const HdSceneIndexObserver::DirtiedPrimEntry &entry,
+        const HdsiPrimManagingSceneIndexObserver * observer) override;
+
+private:
+
+// --(BEGIN CUSTOM CODE: Fields)--
+// --(END CUSTOM CODE: Fields)--
+
+    RileyId _rileyId;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileySampleFilterSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileySampleFilterSchema.cpp
new file mode 100644
index 0000000000..79cd31b763
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileySampleFilterSchema.cpp
@@ -0,0 +1,155 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileySampleFilterSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileySampleFilterSchemaTokens,
+    HD_PRMAN_RILEY_SAMPLE_FILTER_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdPrmanRileyShadingNodeVectorSchema
+HdPrmanRileySampleFilterSchema::GetSampleFilter()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyShadingNodeVectorSchema(_GetTypedDataSource<HdVectorDataSource>(
+        HdPrmanRileySampleFilterSchemaTokens->sampleFilter));
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileySampleFilterSchema::GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileySampleFilterSchemaTokens->attributes));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileySampleFilterSchema::BuildRetained(
+        const HdVectorDataSourceHandle &sampleFilter,
+        const HdContainerDataSourceHandle &attributes
+)
+{
+    TfToken _names[2];
+    HdDataSourceBaseHandle _values[2];
+
+    size_t _count = 0;
+
+    if (sampleFilter) {
+        _names[_count] = HdPrmanRileySampleFilterSchemaTokens->sampleFilter;
+        _values[_count++] = sampleFilter;
+    }
+
+    if (attributes) {
+        _names[_count] = HdPrmanRileySampleFilterSchemaTokens->attributes;
+        _values[_count++] = attributes;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileySampleFilterSchema::Builder &
+HdPrmanRileySampleFilterSchema::Builder::SetSampleFilter(
+    const HdVectorDataSourceHandle &sampleFilter)
+{
+    _sampleFilter = sampleFilter;
+    return *this;
+}
+
+HdPrmanRileySampleFilterSchema::Builder &
+HdPrmanRileySampleFilterSchema::Builder::SetAttributes(
+    const HdContainerDataSourceHandle &attributes)
+{
+    _attributes = attributes;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileySampleFilterSchema::Builder::Build()
+{
+    return HdPrmanRileySampleFilterSchema::BuildRetained(
+        _sampleFilter,
+        _attributes
+    );
+}
+
+/*static*/
+HdPrmanRileySampleFilterSchema
+HdPrmanRileySampleFilterSchema::GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer)
+{
+    return HdPrmanRileySampleFilterSchema(
+        fromParentContainer
+        ? HdContainerDataSource::Cast(fromParentContainer->Get(
+                HdPrmanRileySampleFilterSchemaTokens->rileySampleFilter))
+        : nullptr);
+}
+
+/*static*/
+const TfToken &
+HdPrmanRileySampleFilterSchema::GetSchemaToken()
+{
+    return HdPrmanRileySampleFilterSchemaTokens->rileySampleFilter;
+}
+
+/*static*/
+const HdDataSourceLocator &
+HdPrmanRileySampleFilterSchema::GetDefaultLocator()
+{
+    static const HdDataSourceLocator locator(GetSchemaToken());
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileySampleFilterSchema::GetSampleFilterLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileySampleFilterSchemaTokens->sampleFilter);
+    return locator;
+}
+
+/* static */
+const HdDataSourceLocator &
+HdPrmanRileySampleFilterSchema::GetAttributesLocator()
+{
+    static const HdDataSourceLocator locator =
+        GetDefaultLocator().Append(
+            HdPrmanRileySampleFilterSchemaTokens->attributes);
+    return locator;
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileySampleFilterSchema.h b/third_party/renderman-26/plugin/hdPrman/rileySampleFilterSchema.h
new file mode 100644
index 0000000000..e7379b7dec
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileySampleFilterSchema.h
@@ -0,0 +1,176 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_SAMPLE_FILTER_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_SAMPLE_FILTER_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileySchemaTypeDefs.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_SAMPLE_FILTER_SCHEMA_TOKENS \
+    (rileySampleFilter) \
+    (sampleFilter) \
+    (attributes) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileySampleFilterSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_SAMPLE_FILTER_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileySampleFilterSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileySampleFilterSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// Retrieves a container data source with the schema's default name token
+    /// "rileySampleFilter" from the parent container and constructs a
+    /// HdPrmanRileySampleFilterSchema instance.
+    /// Because the requested container data source may not exist, the result
+    /// should be checked with IsDefined() or a bool comparison before use.
+    HDPRMAN_API
+    static HdPrmanRileySampleFilterSchema GetFromParent(
+        const HdContainerDataSourceHandle &fromParentContainer);
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdPrmanRileyShadingNodeVectorSchema GetSampleFilter()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetAttributes()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @}
+
+    /// \name Schema location
+    /// @{
+
+    /// Returns a token where the container representing this schema is found in
+    /// a container by default.
+    HDPRMAN_API
+    static const TfToken &GetSchemaToken();
+
+    /// Returns an HdDataSourceLocator (relative to the prim-level data source)
+    /// where the container representing this schema is found by default.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetDefaultLocator();
+
+    /// @}
+
+    /// \name Data source locators for members
+    ///
+    /// The following methods return an HdDataSourceLocator (relative to the
+    /// prim-level data source) where the data source for a member can be found.
+    ///
+    /// This is often useful for checking intersection against the
+    /// HdDataSourceLocatorSet sent with HdDataSourceObserver::PrimsDirtied.
+    /// @{
+
+    /// Prim-level relative data source locator to locate sampleFilter.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetSampleFilterLocator();
+
+    /// Prim-level relative data source locator to locate attributes.
+    HDPRMAN_API
+    static const HdDataSourceLocator &GetAttributesLocator();
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdVectorDataSourceHandle &sampleFilter,
+        const HdContainerDataSourceHandle &attributes
+    );
+
+    /// \class HdPrmanRileySampleFilterSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetSampleFilter(
+            const HdVectorDataSourceHandle &sampleFilter);
+        HDPRMAN_API
+        Builder &SetAttributes(
+            const HdContainerDataSourceHandle &attributes);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdVectorDataSourceHandle _sampleFilter;
+        HdContainerDataSourceHandle _attributes;
+
+    };
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileySchemaTypeDefs.h b/third_party/renderman-26/plugin/hdPrman/rileySchemaTypeDefs.h
new file mode 100644
index 0000000000..fcb0690cab
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileySchemaTypeDefs.h
@@ -0,0 +1,35 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* ** This file is generated by a script.  Do not edit directly.  Edit     ** */
+/* ** defs.py or the (*)Schema.template.h files to make changes.           ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_SCHEMA_TYPEDEFS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_SCHEMA_TYPEDEFS_H
+
+#include "hdPrman/api.h"
+
+#include "pxr/imaging/hd/containerSchema.h"
+#include "pxr/imaging/hd/vectorSchema.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using HdPrmanRileyShadingNodeVectorSchema =
+    HdSchemaBasedVectorSchema<class HdPrmanRileyShadingNodeSchema>;
+
+using HdPrmanRileyPrimvarContainerSchema =
+    HdSchemaBasedContainerSchema<class HdPrmanRileyPrimvarSchema>;
+
+using HdPrmanRileyParamContainerSchema =
+    HdSchemaBasedContainerSchema<class HdPrmanRileyParamSchema>;
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyShadingNodeSchema.cpp b/third_party/renderman-26/plugin/hdPrman/rileyShadingNodeSchema.cpp
new file mode 100644
index 0000000000..1b2267f068
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyShadingNodeSchema.cpp
@@ -0,0 +1,217 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#include "hdPrman/rileyShadingNodeSchema.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+
+#include "pxr/base/trace/trace.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyShadingNodeSchemaTokens,
+    HD_PRMAN_RILEY_SHADING_NODE_SCHEMA_TOKENS);
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+HdTokenDataSourceHandle
+HdPrmanRileyShadingNodeSchema::GetType()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyShadingNodeSchemaTokens->type);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyShadingNodeSchema::GetName()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyShadingNodeSchemaTokens->name);
+}
+
+HdTokenDataSourceHandle
+HdPrmanRileyShadingNodeSchema::GetHandle()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return _GetTypedDataSource<HdTokenDataSource>(
+        HdPrmanRileyShadingNodeSchemaTokens->handle);
+}
+
+HdPrmanRileyParamListSchema
+HdPrmanRileyShadingNodeSchema::GetParams()
+#if HD_API_VERSION >= 66
+                                            const
+#else
+                                                 
+#endif
+{
+    return HdPrmanRileyParamListSchema(_GetTypedDataSource<HdContainerDataSource>(
+        HdPrmanRileyShadingNodeSchemaTokens->params));
+}
+
+/*static*/
+HdContainerDataSourceHandle
+HdPrmanRileyShadingNodeSchema::BuildRetained(
+        const HdTokenDataSourceHandle &type,
+        const HdTokenDataSourceHandle &name,
+        const HdTokenDataSourceHandle &handle,
+        const HdContainerDataSourceHandle &params
+)
+{
+    TfToken _names[4];
+    HdDataSourceBaseHandle _values[4];
+
+    size_t _count = 0;
+
+    if (type) {
+        _names[_count] = HdPrmanRileyShadingNodeSchemaTokens->type;
+        _values[_count++] = type;
+    }
+
+    if (name) {
+        _names[_count] = HdPrmanRileyShadingNodeSchemaTokens->name;
+        _values[_count++] = name;
+    }
+
+    if (handle) {
+        _names[_count] = HdPrmanRileyShadingNodeSchemaTokens->handle;
+        _values[_count++] = handle;
+    }
+
+    if (params) {
+        _names[_count] = HdPrmanRileyShadingNodeSchemaTokens->params;
+        _values[_count++] = params;
+    }
+    return HdRetainedContainerDataSource::New(_count, _names, _values);
+}
+
+HdPrmanRileyShadingNodeSchema::Builder &
+HdPrmanRileyShadingNodeSchema::Builder::SetType(
+    const HdTokenDataSourceHandle &type)
+{
+    _type = type;
+    return *this;
+}
+
+HdPrmanRileyShadingNodeSchema::Builder &
+HdPrmanRileyShadingNodeSchema::Builder::SetName(
+    const HdTokenDataSourceHandle &name)
+{
+    _name = name;
+    return *this;
+}
+
+HdPrmanRileyShadingNodeSchema::Builder &
+HdPrmanRileyShadingNodeSchema::Builder::SetHandle(
+    const HdTokenDataSourceHandle &handle)
+{
+    _handle = handle;
+    return *this;
+}
+
+HdPrmanRileyShadingNodeSchema::Builder &
+HdPrmanRileyShadingNodeSchema::Builder::SetParams(
+    const HdContainerDataSourceHandle &params)
+{
+    _params = params;
+    return *this;
+}
+
+HdContainerDataSourceHandle
+HdPrmanRileyShadingNodeSchema::Builder::Build()
+{
+    return HdPrmanRileyShadingNodeSchema::BuildRetained(
+        _type,
+        _name,
+        _handle,
+        _params
+    );
+}
+
+/*static*/
+HdTokenDataSourceHandle
+HdPrmanRileyShadingNodeSchema::BuildTypeDataSource(
+    const TfToken &type)
+{
+
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->pattern) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->bxdf) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->integrator) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->light) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->lightFilter) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->projection) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->displacement) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->sampleFilter) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    if (type == HdPrmanRileyShadingNodeSchemaTokens->displayFilter) {
+        static const HdRetainedTypedSampledDataSource<TfToken>::Handle ds =
+            HdRetainedTypedSampledDataSource<TfToken>::New(type);
+        return ds;
+    }
+    // fallback for unknown token
+    return HdRetainedTypedSampledDataSource<TfToken>::New(type);
+} 
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyShadingNodeSchema.h b/third_party/renderman-26/plugin/hdPrman/rileyShadingNodeSchema.h
new file mode 100644
index 0000000000..7e6eb0e55e
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyShadingNodeSchema.h
@@ -0,0 +1,188 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+////////////////////////////////////////////////////////////////////////
+
+/* ************************************************************************** */
+/* **                                                                      ** */
+/* ** This file is generated by a script.                                  ** */
+/* **                                                                      ** */
+/* ** Do not edit it directly (unless it is within a CUSTOM CODE section)! ** */
+/* ** Edit hdSchemaDefs.py instead to make changes.                        ** */
+/* **                                                                      ** */
+/* ************************************************************************** */
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_SHADING_NODE_SCHEMA_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_SHADING_NODE_SCHEMA_H
+
+/// \file
+
+#include "hdPrman/api.h"
+#include "hdPrman/rileyParamListSchema.h"
+
+#include "pxr/imaging/hd/schema.h"
+#include "pxr/imaging/hd/version.h"
+
+// --(BEGIN CUSTOM CODE: Includes)--
+// --(END CUSTOM CODE: Includes)--
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// --(BEGIN CUSTOM CODE: Declares)--
+// --(END CUSTOM CODE: Declares)--
+
+#define HD_PRMAN_RILEY_SHADING_NODE_SCHEMA_TOKENS \
+    (type) \
+    (name) \
+    (handle) \
+    (params) \
+    (pattern) \
+    (bxdf) \
+    (integrator) \
+    (light) \
+    (lightFilter) \
+    (projection) \
+    (displacement) \
+    (sampleFilter) \
+    (displayFilter) \
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyShadingNodeSchemaTokens, HDPRMAN_API,
+    HD_PRMAN_RILEY_SHADING_NODE_SCHEMA_TOKENS);
+
+//-----------------------------------------------------------------------------
+
+
+class HdPrmanRileyShadingNodeSchema : public HdSchema
+{
+public:
+    /// \name Schema retrieval
+    /// @{
+
+    HdPrmanRileyShadingNodeSchema(HdContainerDataSourceHandle container)
+      : HdSchema(container) {}
+
+    /// @}
+
+// --(BEGIN CUSTOM CODE: Schema Methods)--
+// --(END CUSTOM CODE: Schema Methods)--
+
+    /// \name Member accessor
+    /// @{
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetType()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetName()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdTokenDataSourceHandle GetHandle()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+
+
+    HDPRMAN_API
+    HdPrmanRileyParamListSchema GetParams()
+#if HD_API_VERSION >= 66
+                                            const;
+#else
+                                                 ;
+#endif
+ 
+
+    /// @} 
+
+    /// \name Schema construction
+    /// @{
+
+    /// \deprecated Use Builder instead.
+    ///
+    /// Builds a container data source which includes the provided child data
+    /// sources. Parameters with nullptr values are excluded. This is a
+    /// low-level interface. For cases in which it's desired to define
+    /// the container with a sparse set of child fields, the Builder class
+    /// is often more convenient and readable.
+    HDPRMAN_API
+    static HdContainerDataSourceHandle
+    BuildRetained(
+        const HdTokenDataSourceHandle &type,
+        const HdTokenDataSourceHandle &name,
+        const HdTokenDataSourceHandle &handle,
+        const HdContainerDataSourceHandle &params
+    );
+
+    /// \class HdPrmanRileyShadingNodeSchema::Builder
+    /// 
+    /// Utility class for setting sparse sets of child data source fields to be
+    /// filled as arguments into BuildRetained. Because all setter methods
+    /// return a reference to the instance, this can be used in the "builder
+    /// pattern" form.
+    class Builder
+    {
+    public:
+        HDPRMAN_API
+        Builder &SetType(
+            const HdTokenDataSourceHandle &type);
+        HDPRMAN_API
+        Builder &SetName(
+            const HdTokenDataSourceHandle &name);
+        HDPRMAN_API
+        Builder &SetHandle(
+            const HdTokenDataSourceHandle &handle);
+        HDPRMAN_API
+        Builder &SetParams(
+            const HdContainerDataSourceHandle &params);
+
+        /// Returns a container data source containing the members set thus far.
+        HDPRMAN_API
+        HdContainerDataSourceHandle Build();
+
+    private:
+        HdTokenDataSourceHandle _type;
+        HdTokenDataSourceHandle _name;
+        HdTokenDataSourceHandle _handle;
+        HdContainerDataSourceHandle _params;
+
+    };
+
+    /// Returns token data source for use as type value.
+    ///
+    /// The following values will be stored statically and reused for future
+    /// calls:
+    /// - HdPrmanRileyShadingNodeSchemaTokens->pattern
+    /// - HdPrmanRileyShadingNodeSchemaTokens->bxdf
+    /// - HdPrmanRileyShadingNodeSchemaTokens->integrator
+    /// - HdPrmanRileyShadingNodeSchemaTokens->light
+    /// - HdPrmanRileyShadingNodeSchemaTokens->lightFilter
+    /// - HdPrmanRileyShadingNodeSchemaTokens->projection
+    /// - HdPrmanRileyShadingNodeSchemaTokens->displacement
+    /// - HdPrmanRileyShadingNodeSchemaTokens->sampleFilter
+    /// - HdPrmanRileyShadingNodeSchemaTokens->displayFilter
+    HDPRMAN_API
+    static HdTokenDataSourceHandle BuildTypeDataSource(
+        const TfToken &type);
+
+    /// @}
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyTypes.cpp b/third_party/renderman-26/plugin/hdPrman/rileyTypes.cpp
new file mode 100644
index 0000000000..6c7040625a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyTypes.cpp
@@ -0,0 +1,383 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "hdPrman/rileyTypes.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileyRenderOutputSchema.h"
+#include "hdPrman/rileyShadingNodeSchema.h"
+#include "hdPrman/rileyPrimvarSchema.h"
+#include "hdPrman/rileySchemaTypeDefs.h"
+#include "hdPrman/rileyParamSchema.h"
+#include "hdPrman/rileyPrimvarSchema.h"
+
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/utils.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+static
+TfToken
+_Extract(HdTokenDataSourceHandle const &ds)
+{
+    if (ds) {
+        return ds->GetTypedValue(0.0f);
+    } else {
+        return {};
+    }
+}
+
+static
+size_t
+_Extract(HdSizetDataSourceHandle const &ds)
+{
+    if (ds) {
+        return ds->GetTypedValue(0.0f);
+    } else {
+        return 0;
+    }
+}
+
+HdPrman_RileyParamList::HdPrman_RileyParamList(
+    HdPrmanRileyParamListSchema schema)
+{
+    HdPrmanRileyParamContainerSchema containerSchema =
+        schema.GetParams();
+
+    for (const TfToken &name : containerSchema.GetNames()) {
+        HdPrmanRileyParamSchema paramSchema = containerSchema.Get(name);
+        HdSampledDataSourceHandle const ds = paramSchema.GetValue();
+        if (!ds) {
+            continue;
+        }
+
+        // TODO:
+        //
+        // SetParamFromVtValue is never calling, e.g.,
+        // SetFloatReference or SetFloatReferenceArray
+        // which is used to set connections between shading nodes by
+        // name.
+        //
+        // We need to designate "role" tokens for these and then
+        // add dispatching in SetParamFromVtValue.
+        //
+
+        HdPrman_Utils::SetParamFromVtValue(
+            RtUString(name.GetText()),
+            ds->GetValue(0.0f),
+            _Extract(paramSchema.GetRole()),
+            &rileyObject);
+    }
+}
+
+static
+RtDetailType
+_ToDetailType(const TfToken &t)
+{
+    if (t == HdPrmanRileyPrimvarSchemaTokens->constant) {
+        return RtDetailType::k_constant;
+    }
+
+    if (t == HdPrmanRileyPrimvarSchemaTokens->uniform) {
+        return RtDetailType::k_uniform;
+    }
+
+    if (t == HdPrmanRileyPrimvarSchemaTokens->vertex) {
+        return RtDetailType::k_vertex;
+    }
+
+    if (t == HdPrmanRileyPrimvarSchemaTokens->facevarying) {
+        return RtDetailType::k_facevarying;
+    }
+
+    if (t == HdPrmanRileyPrimvarSchemaTokens->varying) {
+        return RtDetailType::k_varying;
+    }
+
+    if (t == HdPrmanRileyPrimvarSchemaTokens->reference) {
+        return RtDetailType::k_reference;
+    }
+
+    return RtDetailType::k_invalid;
+}
+
+HdPrman_RileyDetailType::HdPrman_RileyDetailType(
+    HdTokenDataSourceHandle const &ds)
+    : rileyObject(ds
+                  ? _ToDetailType(ds->GetTypedValue(0.0f))
+                  : RtDetailType::k_constant)
+{
+}
+
+HdPrman_RileyPrimvarList::HdPrman_RileyPrimvarList(
+    HdPrmanRileyPrimvarListSchema schema,
+    const GfVec2f &shutterInterval)
+  : rileyObject(
+      _Extract(schema.GetNumUniform()),
+      _Extract(schema.GetNumVertex()),
+      _Extract(schema.GetNumVarying()),
+      _Extract(schema.GetNumFaceVarying()))
+{
+    HdPrmanRileyPrimvarContainerSchema containerSchema =
+        schema.GetParams();
+
+    if (HdSampledDataSourceHandle const pointsValueDs =
+            containerSchema.Get(HdPrmanRileyPrimvarListSchemaTokens->P)
+                           .GetValue()) {
+        std::vector<HdSampledDataSource::Time> sampleTimes;
+        if (pointsValueDs->GetContributingSampleTimesForInterval(
+                shutterInterval[0], shutterInterval[1], &sampleTimes)) {
+            rileyObject.SetTimes(sampleTimes.size(), sampleTimes.data());
+        } else {
+            sampleTimes = { 0.0f };
+        }
+
+        constexpr RtDetailType detailType = RtDetailType::k_vertex;
+
+        const size_t n = rileyObject.GetNumDetail(detailType);
+
+        for (size_t i = 0; i < sampleTimes.size(); ++i) {
+            const VtValue pointsValue = pointsValueDs->GetValue(sampleTimes[i]);
+            if (!pointsValue.IsHolding<VtVec3fArray>()) {
+                TF_WARN("Primvar 'points' does not contain VtVec3fArray");
+                continue;
+            }
+
+            const VtVec3fArray pointsArray =
+                pointsValue.UncheckedGet<VtVec3fArray>();
+            if (pointsArray.size() != n) {
+                TF_WARN("Primvar 'points' size (%zu) did not match expected "
+                        "expected (%zu)",
+                        pointsArray.size(),
+                        n);
+                continue;
+            }
+
+            rileyObject.SetPointDetail(
+                RixStr.k_P,
+                (RtPoint3*) pointsArray.data(),
+                detailType,
+                i);
+        }
+    }
+
+    for (const TfToken &name : containerSchema.GetNames()) {
+        if (name == HdPrmanRileyPrimvarListSchemaTokens->P) {
+            continue;
+        }
+
+        HdPrmanRileyPrimvarSchema primvarSchema = containerSchema.Get(name);
+        HdSampledDataSourceHandle const ds = primvarSchema.GetValue();
+        if (!ds) {
+            continue;
+        }
+
+        HdPrman_Utils::SetPrimVarFromVtValue(
+            RtUString(name.GetText()),
+            ds->GetValue(0.0f),
+            HdPrman_RileyDetailType(primvarSchema.GetDetailType()).rileyObject,
+            _Extract(primvarSchema.GetRole()),
+            &rileyObject);
+    }
+}
+
+static
+riley::ShadingNode::Type
+_ToShadingNodeType(const TfToken &t)
+{
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->pattern) {
+        return riley::ShadingNode::Type::k_Pattern;
+    }
+
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->bxdf) {
+        return riley::ShadingNode::Type::k_Bxdf;
+    }
+
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->integrator) {
+        return riley::ShadingNode::Type::k_Integrator;
+    }
+
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->light) {
+        return riley::ShadingNode::Type::k_Light;
+    }
+
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->lightFilter) {
+        return riley::ShadingNode::Type::k_LightFilter;
+    }
+
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->projection) {
+        return riley::ShadingNode::Type::k_Projection;
+    }
+
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->displacement) {
+        return riley::ShadingNode::Type::k_Displacement;
+    }
+
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->sampleFilter) {
+        return riley::ShadingNode::Type::k_SampleFilter;
+    }
+
+    if (t == HdPrmanRileyShadingNodeSchemaTokens->displayFilter) {
+        return riley::ShadingNode::Type::k_DisplayFilter;
+    }
+
+    return riley::ShadingNode::Type::k_Invalid;
+}
+
+HdPrman_RileyShadingNodeType::HdPrman_RileyShadingNodeType(
+    HdTokenDataSourceHandle const &ds)
+  : rileyObject(ds
+                ? _ToShadingNodeType(ds->GetTypedValue(0.0f))
+                : riley::ShadingNode::Type::k_Invalid)
+{
+}
+
+HdPrman_RileyShadingNode::HdPrman_RileyShadingNode(
+    HdPrmanRileyShadingNodeSchema schema)
+  : rileyObject{
+      HdPrman_RileyShadingNodeType(schema.GetType()).rileyObject,
+      HdPrman_RileyString(schema.GetName()).rileyObject,
+      HdPrman_RileyString(schema.GetHandle()).rileyObject,
+      HdPrman_RileyParamList(schema.GetParams()).rileyObject}
+{
+}
+
+HdPrman_RileyShadingNetwork::HdPrman_RileyShadingNetwork(
+    HdPrmanRileyShadingNodeVectorSchema schema)
+{
+    const size_t n = schema.GetNumElements();
+    shadingNodes.reserve(n);
+
+    for (size_t i = 0; i < n; ++i) {
+        shadingNodes.push_back(
+            HdPrman_RileyShadingNode(schema.GetElement(i))
+                .rileyObject);
+    }
+
+    rileyObject.nodeCount = n;
+    rileyObject.nodes = shadingNodes.data();
+}
+
+HdPrman_RileyTransform::HdPrman_RileyTransform(
+    HdMatrixDataSourceHandle const &ds,
+    const GfVec2f &shutterInterval)
+{
+    if (!ds) {
+        static const RtMatrix4x4 matrix[] = {
+            HdPrman_Utils::GfMatrixToRtMatrix(GfMatrix4d(1.0))
+        };
+        static const float time[] = {
+            0.0f
+        };
+        rileyObject.samples = static_cast<uint32_t>(std::size(matrix));
+        rileyObject.matrix = matrix;
+        rileyObject.time = time;
+        return;
+    }
+
+    ds->GetContributingSampleTimesForInterval(
+        shutterInterval[0], shutterInterval[1], &time);
+    if (time.empty()) {
+        time = { 0.0f };
+    }
+
+    matrix.reserve(time.size());
+    for (const float t : time) {
+        matrix.push_back(
+            HdPrman_Utils::GfMatrixToRtMatrix(ds->GetTypedValue(t)));
+    }
+
+    rileyObject.samples = time.size();
+    rileyObject.matrix = matrix.data();
+    rileyObject.time = time.data();
+}
+
+HdPrman_RileyFloat::HdPrman_RileyFloat(
+    HdFloatDataSourceHandle const &ds,
+    const float fallbackValue)
+  : rileyObject(ds ? ds->GetTypedValue(0.0f) : fallbackValue)
+{
+}
+
+HdPrman_RileyString::HdPrman_RileyString(
+    HdTokenDataSourceHandle const &ds)
+{
+    if (ds) {
+        rileyObject = RtUString(ds->GetTypedValue(0.0f).GetText());
+    }
+}
+
+HdPrman_RileyExtent::HdPrman_RileyExtent(
+    HdVec3iDataSourceHandle const &ds)
+  : rileyObject{ 1, 1, 0}
+{
+    if (ds) {
+        const GfVec3i v = ds->GetTypedValue(0.0f);
+        rileyObject = { static_cast<uint32_t>(std::max(v[0], 0)),
+                        static_cast<uint32_t>(std::max(v[1], 0)),
+                        static_cast<uint32_t>(std::max(v[2], 0)) };
+    }
+}
+
+static
+riley::RenderOutputType
+_ToRenderOutputType(const TfToken &t)
+{
+    if (t == HdPrmanRileyRenderOutputSchemaTokens->float_) {
+        return riley::RenderOutputType::k_Float;
+    }
+    if (t == HdPrmanRileyRenderOutputSchemaTokens->integer) {
+        return riley::RenderOutputType::k_Integer;
+    }
+    if (t == HdPrmanRileyRenderOutputSchemaTokens->color) {
+        return riley::RenderOutputType::k_Color;
+    }
+    if (t == HdPrmanRileyRenderOutputSchemaTokens->vector) {
+        return riley::RenderOutputType::k_Vector;
+    }
+
+    return riley::RenderOutputType::k_Float;
+}
+
+HdPrman_RileyRenderOutputType::HdPrman_RileyRenderOutputType(
+    HdTokenDataSourceHandle const &ds)
+  : rileyObject(ds
+                ? _ToRenderOutputType(ds->GetTypedValue(0.0f))
+                : riley::RenderOutputType::k_Float)
+{
+}
+
+HdPrman_RileyFilterSize::HdPrman_RileyFilterSize(
+    HdVec2fDataSourceHandle const &ds)
+    : rileyObject{1.0f, 1.0f}
+{
+    if (ds) {
+        const GfVec2f v = ds->GetTypedValue(0.0f);
+        rileyObject = { v[0], v[1] };
+    }
+}
+
+HdPrman_RileyUniqueString::HdPrman_RileyUniqueString(
+    HdTokenDataSourceHandle const &ds)
+{
+    std::string name;
+    if (ds) {
+        name = ds->GetTypedValue(0.0f);
+    }
+
+    name += "_";
+
+    static std::atomic_uint_fast64_t id = 0;
+    name += std::to_string(id++);
+
+    rileyObject = RtUString(name.c_str());
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
diff --git a/third_party/renderman-26/plugin/hdPrman/rileyTypes.h b/third_party/renderman-26/plugin/hdPrman/rileyTypes.h
new file mode 100644
index 0000000000..e562dbe97a
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rileyTypes.h
@@ -0,0 +1,228 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_OBJECT_UTIL_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RILEY_OBJECT_UTIL_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/sceneIndexObserverApi.h"
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/rileySchemaTypeDefs.h"
+#include "hdPrman/rileyPrimvarListSchema.h"
+#include "hdPrman/rileyParamListSchema.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+
+#include "Riley.h"
+
+#include <optional>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \name (Non-path) Conversions to riley types
+///
+/// Conversions of data sources in a scene index to riley types such as
+/// RtUString, riley::Transform or RtParamList.
+///
+/// The conversions are provided as RAII wrappers wrapping a riley type.
+///
+/// Recall that some riley API expects non-RAII objects, e.g., riley::Transform
+/// has a raw pointer to an array of RtMatrix4x4's and its d'tor does
+/// not free that array.
+///
+/// In hdPrman, we wrap such an object in an RAII object T with
+/// T::rileyObject being the non-RAII object pointing to, e.g., the
+/// data of a std::vector<riley::RtMatrix4x4> in T.
+///
+/// @{
+
+///
+/// Extract T::rileyObject as pointer from std::optional<T>.
+///
+/// Use as a helper to extract the non-RAII object from a std::optional<T>
+/// where T is the RAII wrapper.
+///
+/// Similar to HdPrman_GetPtr, can be used as argument to Riley::ModifyFoo.
+///
+template<typename T>
+auto HdPrman_GetRileyObjectPtr(
+    /* non-const because ModifyRenderOutput takes
+       non-const relativePixelVariance */
+        /* const */ std::optional<T> &v) -> decltype(&(v->rileyObject))
+{
+    if (!v) {
+        return nullptr;
+    }
+    return &(v->rileyObject);
+}
+
+struct HdPrman_RileyParamList
+{
+    using RileyType = RtParamList;
+
+    HdPrman_RileyParamList(
+        HdPrmanRileyParamListSchema schema);
+
+    RileyType rileyObject;
+};
+
+struct HdPrman_RileyDetailType
+{
+    using RileyType = RtDetailType;
+
+    HdPrman_RileyDetailType(
+        HdTokenDataSourceHandle const &ds);
+    
+    RileyType rileyObject;
+};
+
+struct HdPrman_RileyPrimvarList
+{
+    using RileyType = RtPrimVarList;
+
+    HdPrman_RileyPrimvarList(
+        HdPrmanRileyPrimvarListSchema schema,
+        const GfVec2f &shutterInterval);
+
+    RileyType rileyObject;
+};
+
+struct HdPrman_RileyShadingNodeType
+{
+    using RileyType = riley::ShadingNode::Type;
+
+    HdPrman_RileyShadingNodeType(
+        HdTokenDataSourceHandle const &ds);
+
+    RileyType rileyObject;
+};
+
+struct HdPrman_RileyShadingNode
+{
+    using RileyType = riley::ShadingNode;
+    
+    HdPrman_RileyShadingNode(
+        HdPrmanRileyShadingNodeSchema schema);
+
+    RileyType rileyObject;
+};
+
+struct HdPrman_RileyShadingNetwork
+{
+    using RileyType = riley::ShadingNetwork;
+
+    HdPrman_RileyShadingNetwork(
+        HdPrmanRileyShadingNodeVectorSchema schema);
+
+    std::vector<riley::ShadingNode> shadingNodes;
+
+    RileyType rileyObject;
+};
+
+/// A (RAII) object for transform samples extracted from matrix data
+/// source.
+///
+struct HdPrman_RileyTransform
+{
+    using RileyType = riley::Transform;
+
+    HdPrman_RileyTransform(
+        HdMatrixDataSourceHandle const &ds,
+        const GfVec2f &shutterInterval);
+
+    std::vector<RtMatrix4x4> matrix;
+    std::vector<float> time;
+
+    // (Non-RAII) object that can be passed to, e.g.,
+    // Riley::CreateCoordinateSystem.
+    RileyType rileyObject;
+};
+
+struct HdPrman_RileyFloat
+{
+    using RileyType = float;
+    
+    HdPrman_RileyFloat(
+        HdFloatDataSourceHandle const &ds,
+        float fallbackValue = 0.0f);
+
+    RileyType rileyObject;
+};
+
+/// Converts token to riley string.
+///
+struct HdPrman_RileyString
+{
+    using RileyType = RtUString;
+
+    HdPrman_RileyString(
+        HdTokenDataSourceHandle const &ds);
+
+    RileyType rileyObject;
+};
+
+struct HdPrman_RileyExtent
+{
+    using RileyType = riley::Extent;
+
+    HdPrman_RileyExtent(
+        HdVec3iDataSourceHandle const &ds);
+
+    RileyType rileyObject;
+};
+
+/// Converts token data source to riley enum type RenderOutputType.
+///
+struct HdPrman_RileyRenderOutputType
+{
+    using RileyType = riley::RenderOutputType;
+
+    HdPrman_RileyRenderOutputType(
+        HdTokenDataSourceHandle const &ds);
+
+    RileyType rileyObject;
+};
+
+struct HdPrman_RileyFilterSize
+{
+    using RileyType = riley::FilterSize;
+
+    HdPrman_RileyFilterSize(
+        HdVec2fDataSourceHandle const &ds);
+
+    RileyType rileyObject;
+};
+
+/// Similar to HdPrman_RileyString but adds a unique suffix to ensure
+/// uniqueness.
+///
+/// Recall that Riley::CreateCamera(..., name, ...) requires name to be unique
+/// across all cameras. This method can be used to ensure this.
+///
+/// Note that even if the scene index the prim managing scene index observer
+/// is observing provides unique names, we can end up with brief moments of
+/// non-unique names without this method. This can happen if, e.g., we resync
+/// a camera while an HdPrman_RileyRenderViewPrim is still holding on to the
+/// old HdPrman_RileyCameraPrim.
+///
+struct HdPrman_RileyUniqueString
+{
+    using RileyType = RtUString;
+
+    HdPrman_RileyUniqueString(
+        HdTokenDataSourceHandle const &ds);
+
+    RileyType rileyObject;
+};
+
+/// @}
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // #ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif
diff --git a/third_party/renderman-26/plugin/hdPrman/rixStrings.cpp b/third_party/renderman-26/plugin/hdPrman/rixStrings.cpp
new file mode 100644
index 0000000000..6e2bd18741
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rixStrings.cpp
@@ -0,0 +1,10 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/rixStrings.h"
+
+RiPredefinedStrings RixStr;
+
diff --git a/third_party/renderman-26/plugin/hdPrman/rixStrings.h b/third_party/renderman-26/plugin/hdPrman/rixStrings.h
new file mode 100644
index 0000000000..773f3d2306
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/rixStrings.h
@@ -0,0 +1,17 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RIX_STRINGS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RIX_STRINGS_H
+
+#include "hdPrman/api.h"
+#include "ri.hpp"
+
+class RixContext;
+
+extern HDPRMAN_API RiPredefinedStrings RixStr;
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RIX_STRINGS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/sampleFilter.cpp b/third_party/renderman-26/plugin/hdPrman/sampleFilter.cpp
new file mode 100644
index 0000000000..66fa027c34
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/sampleFilter.cpp
@@ -0,0 +1,135 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/sampleFilter.h"
+
+#include "hdPrman/renderDelegate.h"
+#include "hdPrman/renderParam.h"
+#include "hdPrman/utils.h"
+
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/usd/sdr/registry.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (resource)
+);
+
+TF_MAKE_STATIC_DATA(NdrTokenVec, _sourceTypes) {
+    *_sourceTypes = { TfToken("OSL"), 
+                      TfToken("RmanCpp"), }; }
+
+HdPrman_SampleFilter::HdPrman_SampleFilter(
+    SdfPath const& id)
+    : HdSprim(id)
+{
+}
+
+void
+HdPrman_SampleFilter::Finalize(HdRenderParam *renderParam)
+{
+}
+
+void 
+HdPrman_SampleFilter::_CreateRmanSampleFilter(
+    HdSceneDelegate *sceneDelegate,
+    HdPrman_RenderParam *renderParam,
+    SdfPath const& filterPrimPath,
+    HdMaterialNode2 const& sampleFilterNode)
+{
+    // Create Sample Filter Riley Node
+    riley::ShadingNode rileyNode;
+    rileyNode.type = riley::ShadingNode::Type::k_SampleFilter;
+    rileyNode.handle = RtUString(filterPrimPath.GetText());
+
+    // Get the Sample Filter ShaderPath from the ShaderRegister
+    SdrRegistry &sdrRegistry = SdrRegistry::GetInstance();
+    SdrShaderNodeConstPtr sdrEntry = sdrRegistry.GetShaderNodeByIdentifier(
+        sampleFilterNode.nodeTypeId, *_sourceTypes);
+    if (!sdrEntry) {
+        TF_WARN("Unknown shader ID '%s' for node <%s>\n",
+                sampleFilterNode.nodeTypeId.GetText(), filterPrimPath.GetText());
+        return;
+    }
+    std::string shaderPath = sdrEntry->GetResolvedImplementationURI();
+    if (shaderPath.empty()) {
+        TF_WARN("Shader '%s' did not provide a valid implementation path.",
+                sdrEntry->GetName().c_str());
+        return;
+    }
+    rileyNode.name = RtUString(shaderPath.c_str());
+
+    // Initialize the Sample Filter parameters 
+    for (const auto &param : sampleFilterNode.parameters) {
+        const SdrShaderProperty* prop = sdrEntry->GetShaderInput(param.first);
+        if (!prop) {
+            TF_WARN("Unknown shaderProperty '%s' for the '%s' "
+                    "shader at '%s', ignoring.\n",
+                    param.first.GetText(), 
+                    sampleFilterNode.nodeTypeId.GetText(), 
+                    filterPrimPath.GetText());
+            continue;
+        }
+        HdPrman_Utils::SetParamFromVtValue(
+            RtUString(prop->GetImplementationName().c_str()),
+            param.second, prop->GetType(), &rileyNode.params);
+    }
+    renderParam->AddSampleFilter(sceneDelegate, filterPrimPath, rileyNode);
+    return;
+}
+
+void
+HdPrman_SampleFilter::Sync(
+    HdSceneDelegate *sceneDelegate,
+    HdRenderParam *renderParam,
+    HdDirtyBits *dirtyBits)
+{
+    const SdfPath &id = GetId();
+    HdPrman_RenderParam *param = static_cast<HdPrman_RenderParam*>(renderParam);
+
+    if (*dirtyBits & HdChangeTracker::DirtyParams) {
+        // Only Create the SampleFilter if connected to the RenderSettings
+        // Note that this works because the RenderSettings, being a Bprim,
+        // always gets synced before the SampleFilter Sprim.
+        const SdfPathVector& connectedFilters =
+            param->GetConnectedSampleFilterPaths();
+        if (std::find(connectedFilters.begin(), connectedFilters.end(), id)
+            != connectedFilters.end()) {
+            const VtValue sampleFilterResourceValue =
+                sceneDelegate->Get(id, _tokens->resource);
+
+            if (sampleFilterResourceValue.IsHolding<HdMaterialNode2>()) {
+                HdMaterialNode2 sampleFilterNode =
+                    sampleFilterResourceValue.UncheckedGet<HdMaterialNode2>();
+                _CreateRmanSampleFilter(
+                    sceneDelegate, param, id, sampleFilterNode);
+            }
+        }
+    } 
+    // the _CreateRmanSampleFilter() call above regenerates the filter network,
+    // so if DirtyParams was set there's nothing left to do for DirtyVisibility.
+    else if (*dirtyBits & HdChangeTracker::DirtyVisibility) {
+        param->CreateSampleFilterNetwork(sceneDelegate);
+    }
+
+    *dirtyBits = HdChangeTracker::Clean;
+}
+
+
+HdDirtyBits HdPrman_SampleFilter::GetInitialDirtyBitsMask() const
+{
+    int mask = 
+        HdChangeTracker::Clean | 
+        HdChangeTracker::DirtyParams | 
+        HdChangeTracker::DirtyVisibility;
+    return (HdDirtyBits)mask;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/sampleFilter.h b/third_party/renderman-26/plugin/hdPrman/sampleFilter.h
new file mode 100644
index 0000000000..0c1baa67e3
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/sampleFilter.h
@@ -0,0 +1,44 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SAMPLE_FILTER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SAMPLE_FILTER_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sprim.h"
+#include "pxr/imaging/hd/material.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_RenderParam;
+
+class HdPrman_SampleFilter : public HdSprim
+{
+public:
+    HdPrman_SampleFilter(SdfPath const& id);
+
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam *renderParam,
+              HdDirtyBits *dirtyBits) override;
+
+    void Finalize(HdRenderParam *renderParam) override;
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+private:
+    void _CreateRmanSampleFilter(HdSceneDelegate *sceneDelegate,
+                                 HdPrman_RenderParam *renderParam,
+                                 SdfPath const& filterPrimPath,
+                                 HdMaterialNode2 const& sampleFilterNode);
+
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SAMPLE_FILTER_H
diff --git a/third_party/renderman-26/plugin/hdPrman/sceneIndexObserverApi.h b/third_party/renderman-26/plugin/hdPrman/sceneIndexObserverApi.h
new file mode 100644
index 0000000000..e308830e4c
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/sceneIndexObserverApi.h
@@ -0,0 +1,46 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SCENE_INDEX_OBSERVER_API_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SCENE_INDEX_OBSERVER_API_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/version.h"
+
+// There was no hdsi/version.h before this HD_API_VERSION.
+#if HD_API_VERSION >= 58 
+
+#include "pxr/imaging/hdsi/version.h"
+
+// HDPRMAN_USE_SCENE_INDEX_OBSERVER controls whether hdPrman uses the new
+// HdsiPrimManagingSceneIndexObserver and other new API for the implementation
+// as a scene index observer.
+//
+// We can only use for late enough versions of USD.
+//
+#if HDSI_API_VERSION >= 12
+#define HDPRMAN_USE_SCENE_INDEX_OBSERVER
+#endif
+
+#endif // #if HD_API_VERSION >= 58
+
+// Using HdsiPrimManagingSceneIndexObserver is controlled by env var
+// HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER.
+
+#ifdef HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#include "hdPrman/api.h"
+#include "pxr/base/tf/envSetting.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+extern HDPRMAN_API TfEnvSetting<bool> HD_PRMAN_EXPERIMENTAL_RILEY_SCENE_INDEX_OBSERVER;
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // HDPRMAN_USE_SCENE_INDEX_OBSERVER
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SCENE_INDEX_OBSERVER_API_H
diff --git a/third_party/renderman-26/plugin/hdPrman/sphere.cpp b/third_party/renderman-26/plugin/hdPrman/sphere.cpp
new file mode 100644
index 0000000000..f935877446
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/sphere.cpp
@@ -0,0 +1,72 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/sphere.h"
+
+#include "hdPrman/renderParam.h"
+#include "hdPrman/instancer.h"
+#include "hdPrman/material.h"
+#include "hdPrman/rixStrings.h"
+#include "pxr/imaging/hd/sphereSchema.h"
+#include "pxr/base/gf/matrix4f.h"
+#include "pxr/base/gf/matrix4d.h"
+
+#include "Riley.h"
+#include "RiTypesHelper.h"
+#include "RixShadingUtils.h"
+#include "RixPredefinedStrings.hpp"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_Sphere::HdPrman_Sphere(SdfPath const& id)
+    : BASE(id)
+{
+}
+
+HdDirtyBits
+HdPrman_Sphere::GetInitialDirtyBitsMask() const
+{
+    constexpr int mask = HdChangeTracker::Clean
+        | HdChangeTracker::DirtyTransform
+        | HdChangeTracker::DirtyVisibility
+        | HdChangeTracker::DirtyPrimvar
+        | HdChangeTracker::DirtyMaterialId
+        | HdChangeTracker::DirtyInstancer
+        ;
+
+    return (HdDirtyBits)mask;
+}
+
+TfTokenVector const &
+HdPrman_Sphere::GetBuiltinPrimvarNames() const
+{
+    static TfTokenVector result{
+        HdSphereSchemaTokens->radius };
+    return result;
+}
+
+RtPrimVarList
+HdPrman_Sphere::_ConvertGeometry(HdPrman_RenderParam *renderParam,
+                                   HdSceneDelegate *sceneDelegate,
+                                   const SdfPath &id,
+                                   RtUString *primType,
+                                   std::vector<HdGeomSubset> *geomSubsets)
+{
+    RtPrimVarList primvars;
+
+    *primType = RixStr.k_Ri_Sphere;
+
+    const float radius =
+        sceneDelegate->Get(id, HdSphereSchemaTokens->radius)
+            .GetWithDefault<double>(0.0);
+
+    primvars.SetFloat(RixStr.k_Ri_radius, radius);
+
+    HdPrman_ConvertPrimvars(sceneDelegate, id, primvars, 1, 0, 0, 0);
+    return primvars;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/sphere.h b/third_party/renderman-26/plugin/hdPrman/sphere.h
new file mode 100644
index 0000000000..9421b2f9ad
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/sphere.h
@@ -0,0 +1,42 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SPHERE_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SPHERE_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/gprim.h"
+#include "pxr/imaging/hd/rprim.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_Sphere final : public HdPrman_Gprim<HdRprim>
+{
+public:
+    using BASE = HdPrman_Gprim<HdRprim>;
+
+    HF_MALLOC_TAG_NEW("new HdPrman_Sphere");
+
+    HdPrman_Sphere(SdfPath const& id);
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+    TfTokenVector const &GetBuiltinPrimvarNames() const override;
+
+protected:
+    RtPrimVarList
+    _ConvertGeometry(HdPrman_RenderParam *renderParam,
+                     HdSceneDelegate *sceneDelegate,
+                     const SdfPath &id,
+                     RtUString *primType,
+                     std::vector<HdGeomSubset> *geomSubsets) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_SPHERE_H
diff --git a/third_party/renderman-26/plugin/hdPrman/terminalSceneIndexObserver.cpp b/third_party/renderman-26/plugin/hdPrman/terminalSceneIndexObserver.cpp
new file mode 100644
index 0000000000..0f5d2992aa
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/terminalSceneIndexObserver.cpp
@@ -0,0 +1,103 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "hdPrman/terminalSceneIndexObserver.h"
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/renderParam.h"
+
+#include "pxr/usd/sdf/path.h"
+#include "pxr/imaging/hd/sceneIndex.h"
+#include "pxr/imaging/hd/perfLog.h"
+#include "pxr/imaging/hd/tokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_TerminalSceneIndexObserver::HdPrman_TerminalSceneIndexObserver(
+    HdPrman_RenderParamSharedPtr const &renderParam,
+    HdSceneIndexBaseRefPtr const &inputSceneIndex)
+: _renderParam(renderParam)
+, _terminalSi(inputSceneIndex)
+, _initialized(false)
+{
+    if (!renderParam) {
+        TF_CODING_ERROR("Invalid render param provided.");
+    }
+
+    if (!inputSceneIndex) {
+        TF_CODING_ERROR("Invalid input (terminal) scene index provided.\n");
+    } else {
+        inputSceneIndex->AddObserver(HdSceneIndexObserverPtr(this));
+    }
+}
+
+HdPrman_TerminalSceneIndexObserver::~HdPrman_TerminalSceneIndexObserver()
+    = default;
+
+// ------------------------------------------------------------------------
+// Public API
+// ------------------------------------------------------------------------
+
+void
+HdPrman_TerminalSceneIndexObserver::Update()
+{
+    HD_TRACE_FUNCTION();
+
+    if (!_initialized) {
+        TF_DEBUG(HDPRMAN_TERMINAL_SCENE_INDEX_OBSERVER).Msg(
+            "HdPrman_TerminalSceneIndexObserver::Update -- Initialization..\n");
+
+        // TODO
+        // * Move riley scene options initialization here.
+        // * Walk the scene and process populated prims.
+        //   Start with the active (or available) render settings prim and
+        //   connected prims (cameras, render terminals).
+        //
+
+        _initialized = true;
+    } else {
+        // TODO
+        // * Process change notices received since the last Update call.
+    }
+}
+
+// ------------------------------------------------------------------------
+// HdSceneIndexObserver virtual API
+// ------------------------------------------------------------------------
+
+void
+HdPrman_TerminalSceneIndexObserver::PrimsAdded(
+    const HdSceneIndexBase &sender,
+    const AddedPrimEntries &entries)
+{
+    
+}
+
+void
+HdPrman_TerminalSceneIndexObserver::PrimsRemoved(
+    const HdSceneIndexBase &sender,
+    const RemovedPrimEntries &entries)
+{
+
+}
+
+void
+HdPrman_TerminalSceneIndexObserver::PrimsDirtied(
+    const HdSceneIndexBase &sender,
+    const DirtiedPrimEntries &entries)
+{
+
+}
+
+void
+HdPrman_TerminalSceneIndexObserver::PrimsRenamed(
+    const HdSceneIndexBase &sender,
+    const RenamedPrimEntries &entries)
+{
+
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/terminalSceneIndexObserver.h b/third_party/renderman-26/plugin/hdPrman/terminalSceneIndexObserver.h
new file mode 100644
index 0000000000..731f40b145
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/terminalSceneIndexObserver.h
@@ -0,0 +1,73 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TERMINAL_SCENE_INDEX_OBSERVER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TERMINAL_SCENE_INDEX_OBSERVER_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexObserver.h"
+
+#include <memory>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using HdPrman_RenderParamSharedPtr = std::shared_ptr<class HdPrman_RenderParam>;
+
+/// Observes and processes notices from the terminal scene index (which is
+/// currently managed by the render index during emulation).
+///
+class HdPrman_TerminalSceneIndexObserver : public HdSceneIndexObserver
+{
+public:
+    HdPrman_TerminalSceneIndexObserver(
+        const HdPrman_RenderParamSharedPtr &renderParam,
+        const HdSceneIndexBaseRefPtr &inputSceneIndex);
+
+    ~HdPrman_TerminalSceneIndexObserver() override;
+
+    // ------------------------------------------------------------------------
+    // Public API
+    // ------------------------------------------------------------------------
+    
+    // Process change notices that were aggregated since the last Update call.
+    // This method mimics the intent of "Sync" in Hydra 1.0
+    // 
+    void Update();
+ 
+ protected:
+
+    // ------------------------------------------------------------------------
+    // Satisfying HdSceneIndexObserver
+    // ------------------------------------------------------------------------
+
+    void PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const AddedPrimEntries &entries) override;
+
+    void PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const RemovedPrimEntries &entries) override;
+
+    void PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const DirtiedPrimEntries &entries) override;
+
+    void PrimsRenamed(
+        const HdSceneIndexBase &sender,
+        const RenamedPrimEntries &entries) override;
+
+private:
+
+    // Need a handle to renderParam since it manages the riley instance and
+    // the render thread.
+    std::shared_ptr<class HdPrman_RenderParam> _renderParam;
+    HdSceneIndexBaseRefPtr const _terminalSi;
+    bool _initialized;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TERMINAL_SCENE_INDEX_OBSERVER_H
\ No newline at end of file
diff --git a/third_party/renderman-26/plugin/hdPrman/testenv/testHdPrman.cpp b/third_party/renderman-26/plugin/hdPrman/testenv/testHdPrman.cpp
new file mode 100644
index 0000000000..5b6f5876c5
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/testenv/testHdPrman.cpp
@@ -0,0 +1,1224 @@
+//
+// Copyright 2018 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/renderDelegate.h"
+
+#include "pxr/imaging/hd/camera.h"
+#include "pxr/imaging/hd/dataSourceMaterialNetworkInterface.h"
+#include "pxr/imaging/hd/engine.h"
+#include "pxr/imaging/hd/lightSchema.h"
+#include "pxr/imaging/hd/materialNetworkSchema.h"
+#include "pxr/imaging/hd/materialSchema.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/pluginRenderDelegateUniqueHandle.h"
+#include "pxr/imaging/hd/rendererPluginRegistry.h"
+#include "pxr/imaging/hd/renderIndex.h"
+#include "pxr/imaging/hd/renderPass.h"
+#include "pxr/imaging/hd/renderPassState.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/rprimCollection.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/task.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hd/utils.h"
+#include "pxr/imaging/hd/version.h"
+
+#include "pxr/imaging/hdsi/sceneGlobalsSceneIndex.h"
+
+#include "pxr/usdImaging/usdImaging/delegate.h"
+#include "pxr/usdImaging/usdImaging/sceneIndices.h"
+#include "pxr/usdImaging/usdImaging/stageSceneIndex.h"
+
+#include "pxr/usd/usd/prim.h"
+#include "pxr/usd/usd/stage.h"
+
+#include "pxr/usd/usdGeom/camera.h"
+#include "pxr/usd/usdGeom/tokens.h"
+#include "pxr/usd/usdRender/product.h"
+#include "pxr/usd/usdRender/settings.h"
+#include "pxr/usd/usdRender/spec.h"
+#include "pxr/usd/usdRender/var.h"
+
+#include "pxr/base/arch/env.h"
+#include "pxr/base/tf/diagnostic.h"
+#include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/stopwatch.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/trace/reporter.h"
+#include "pxr/base/vt/types.h"
+#include "pxr/base/work/threadLimits.h"
+
+#include "pxr/pxr.h"
+
+#include <cstdio>
+#include <fstream>
+#include <memory>
+#include <string>
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+
+    // Collection Names
+    (testCollection)
+
+    ((renderContext, "ri"))
+    ((fixedSampleCount, "ri:light:fixedSampleCount"))
+    ((threads, "ri:limits:threads"))
+    ((jitter, "ri:hider:jitter"))
+    ((minSamples, "ri:hider:minsamples"))
+    ((maxSamples, "ri:hider:maxsamples"))
+    ((pixelVariance, "ri:Ri:PixelVariance"))
+);
+
+TF_DEFINE_ENV_SETTING(TEST_HD_PRMAN_ENABLE_SCENE_INDEX, false,
+                      "Use Scene Index API for testHdPrman.");
+
+TF_DEFINE_ENV_SETTING(TEST_HD_PRMAN_USE_RENDER_SETTINGS_PRIM, true,
+                      "Use the Render Settings Prim instead of the "
+                      "UsdRenderSpec for testHdPrman.");
+
+TF_DECLARE_REF_PTRS(_FixedLightSamplesSceneIndex);
+/// \class _FixedLightSamplesSceneIndex
+///
+/// Scene index for setting fixed sample count on all lights that do not have
+/// an authored value. This helps eliminate variability between test runs.
+///
+class _FixedLightSamplesSceneIndex: public HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static _FixedLightSamplesSceneIndexRefPtr New(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex)
+    {
+        return TfCreateRefPtr(
+            new _FixedLightSamplesSceneIndex(inputSceneIndex));
+    }
+    HdSceneIndexPrim GetPrim(const SdfPath& primPath) const override
+    {
+        const HdSceneIndexPrim& prim = _GetInputSceneIndex()->GetPrim(primPath);
+        
+        // XXX: Conditions are in the negative to save indent space
+
+        // Return unmodified if not a light
+        if (!HdPrimTypeIsLight(prim.primType) && !_IsMeshLight(prim)) { 
+            return prim;
+        }
+
+        // Get the light shader network
+        const HdContainerDataSourceHandle& shaderDS = 
+            HdMaterialSchema::GetFromParent(prim.dataSource)
+            .GetMaterialNetwork(_tokens->renderContext)
+#if HD_API_VERSION >= 63
+            .GetContainer()
+#endif
+            ;
+        
+        // Return unmodified if no light shader network
+        if (!shaderDS) {
+            return prim;
+        }
+
+        // Interface with the light shader network
+        HdDataSourceMaterialNetworkInterface shaderNI(
+            primPath, shaderDS, prim.dataSource);
+        
+        // look up the light terminal connection
+        const auto lightTC = shaderNI.GetTerminalConnection(
+            HdMaterialTerminalTokens->light);
+        
+        // Return unmodified if no light terminal connection
+        if (!lightTC.first) { 
+            return prim;
+        }
+
+        // Get authored names
+        const TfTokenVector authoredNames = shaderNI
+            .GetAuthoredNodeParameterNames(lightTC.second.upstreamNodeName);
+        
+        // Return unmodified if authored
+        if (std::find(authoredNames.begin(), authoredNames.end(),
+            _tokens->fixedSampleCount) != authoredNames.end()) {
+            return prim;
+        }
+
+        // We have a valid light shader network with no authored value for
+        // inputs:ri:light:fixedSampleCount. Set it to 1.
+        shaderNI.SetNodeParameterValue(
+            lightTC.second.upstreamNodeName,
+            _tokens->fixedSampleCount,
+            VtValue(1));
+
+        // return the overlay
+        return {
+            prim.primType,
+            HdOverlayContainerDataSource::New(
+                HdRetainedContainerDataSource::New(
+                    HdMaterialSchemaTokens->material,
+                    HdRetainedContainerDataSource::New(
+                        _tokens->renderContext,
+                        shaderNI.Finish())),
+                prim.dataSource)
+        };
+    }
+    SdfPathVector GetChildPrimPaths(const SdfPath& primPath) const override
+    {
+        return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+    }
+protected:
+    _FixedLightSamplesSceneIndex(const HdSceneIndexBaseRefPtr& inputSceneIndex)
+        : HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+    { }
+    void _PrimsAdded(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::AddedPrimEntries& entries) override
+    {
+        _SendPrimsAdded(entries);
+    }
+    void _PrimsRemoved(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::RemovedPrimEntries& entries) override
+    {
+        _SendPrimsRemoved(entries);
+    }
+    void _PrimsDirtied(
+        const HdSceneIndexBase& sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries& entries) override
+    {
+        _SendPrimsDirtied(entries);
+    }
+private:
+    static bool _IsMeshLight(const HdSceneIndexPrim& prim)
+    {
+        if ((prim.primType == HdPrimTypeTokens->mesh) ||
+            (prim.primType == HdPrimTypeTokens->volume)) {
+            if (auto lightS = HdLightSchema::GetFromParent(prim.dataSource)) {
+                if (auto isLightDS = HdBoolDataSource::Cast(
+                    lightS.GetContainer()->Get(HdTokens->isLight))) {
+                    return isLightDS->GetTypedValue(0.0f);
+                }
+            }
+        }
+        return false;
+    }
+};
+
+static TfStopwatch s_timer_prmanRender;
+static const GfVec2i s_fallbackResolution(512, 512);
+static const TfToken s_fallbackConformPolicy(
+    UsdRenderTokens->adjustApertureWidth);
+
+// Struct that holds application scene indices created via the
+// scene index plugin registration callback facility. While this isn't
+// necessary for the simple use-case of the test harness, it is used to serve
+// as an example.
+//
+struct _AppSceneIndices {
+    HdsiSceneGlobalsSceneIndexRefPtr sceneGlobalsSceneIndex;
+    _FixedLightSamplesSceneIndexRefPtr fixedLightSamplesSceneIndex;
+};
+
+using _AppSceneIndicesSharedPtr = std::shared_ptr<_AppSceneIndices>;
+using _RenderInstanceAppSceneIndicesTracker =
+    HdUtils::RenderInstanceTracker<_AppSceneIndices>;
+TfStaticData<_RenderInstanceAppSceneIndicesTracker>
+    s_renderInstanceTracker;
+
+// -----------------------------------------------------------------------------
+
+// Simple Hydra task to Sync and Render the data provided to this test.
+class Hd_DrawTask final : public HdTask
+{
+public:
+    Hd_DrawTask(HdRenderPassSharedPtr const &renderPass,
+                HdRenderPassStateSharedPtr const &renderPassState,
+                TfTokenVector const &renderTags)
+    : HdTask(SdfPath::EmptyPath())
+    , _renderPass(renderPass)
+    , _renderPassState(renderPassState)
+    , _renderTags(renderTags)
+    {
+    }
+
+    void Sync(HdSceneDelegate* delegate,
+              HdTaskContext* ctx,
+              HdDirtyBits* dirtyBits) override
+    {
+        _renderPass->Sync();
+        *dirtyBits = HdChangeTracker::Clean;
+    }
+
+    void Prepare(HdTaskContext* ctx,
+                 HdRenderIndex* renderIndex) override
+    {
+        _renderPassState->Prepare(renderIndex->GetResourceRegistry());
+    }
+
+    void Execute(HdTaskContext* ctx) override
+    {
+        s_timer_prmanRender.Start();
+        _renderPass->Execute(_renderPassState, _renderTags);
+        s_timer_prmanRender.Stop();
+    }
+
+    const TfTokenVector &GetRenderTags() const override
+    {
+        return _renderTags;
+    }
+
+private:
+    HdRenderPassSharedPtr _renderPass;
+    HdRenderPassStateSharedPtr _renderPassState;
+    TfTokenVector _renderTags;
+};
+
+// -----------------------------------------------------------------------------
+
+struct HydraSetupCameraInfo
+{
+    SdfPath cameraPath;
+    GfVec2i resolution;
+    float pixelAspectRatio;
+    TfToken aspectRatioConformPolicy;
+    GfRange2f dataWindowNDC;
+};
+
+static
+bool
+UseRenderSettingsPrim()
+{
+    static const bool useRenderSettingsPrim =
+        TfGetEnvSetting(TEST_HD_PRMAN_USE_RENDER_SETTINGS_PRIM);
+    return useRenderSettingsPrim;
+}
+
+// This function also exists in HdPrman_RenderPass
+GfVec2i
+MultiplyAndRound(const GfVec2f &a, const GfVec2i &b)
+{
+    return GfVec2i(std::roundf(a[0] * b[0]),
+                   std::roundf(a[1] * b[1]));
+}
+
+CameraUtilFraming
+ComputeFraming(const HydraSetupCameraInfo &cameraInfo)
+{
+    const GfRange2f displayWindow(GfVec2f(0.0f), GfVec2f(cameraInfo.resolution));
+
+    // We use rounding to nearest integer when computing the dataWindow
+    // from the dataWindowNDC. This is to conform about the UsdRenderSpec's
+    // specification of the pixels that make up the data window, namely it
+    // is exactly those pixels whose centers are contained in the dataWindowNDC
+    // in NDC space.
+    //
+    // Note that we subtract 1 from the maximum - that's because of GfRect2i's
+    // unusual API.
+    const GfRect2i dataWindow(
+        MultiplyAndRound(
+            cameraInfo.dataWindowNDC.GetMin(), cameraInfo.resolution),
+        MultiplyAndRound(
+            cameraInfo.dataWindowNDC.GetMax(), cameraInfo.resolution) - GfVec2i(1));
+
+    return CameraUtilFraming(
+        displayWindow, dataWindow, cameraInfo.pixelAspectRatio);
+}
+
+void
+PopulateFallbackRenderSpec(
+    std::string const& outputFilename, UsdRenderSpec *renderSpec) 
+{   
+    *renderSpec = {
+        /* products */
+        {
+            UsdRenderSpec::Product {
+                SdfPath("/Render/Products/Fallback"),   // product path
+                TfToken("raster"),                      // type
+                TfToken(outputFilename),                // name
+                SdfPath(),                              // camera path
+                false,                                  // disableMotionBlur
+                false,                                  // disableDepthOfField
+                s_fallbackResolution,                   // resolution
+                1.0f,                                   // PixelAspectRatio
+                s_fallbackConformPolicy,                // aspectRatioConformPolicy 
+                GfVec2f(2.0, 2.0),                      // aperture size
+                GfRange2f(GfVec2f(0.0f), GfVec2f(1.0f)),// data window
+                { 0, 1 },                               // renderVarIndices
+            },
+        },
+        /* renderVars */
+        {
+            UsdRenderSpec::RenderVar {
+                SdfPath("/Render/Vars/Ci"),     // renderVarPath
+                TfToken("color3f"),             // dataType
+                TfToken("Ci")                   // sourceName
+            },
+            UsdRenderSpec::RenderVar {
+                SdfPath("/Render/Vars/Alpha"),  // renderVarPath
+                TfToken("float"),               // dataType
+                TfToken("a")                    // sourceName
+            }
+        }
+    };
+}
+
+UsdGeomCamera
+CreateFallbackCamera(
+    UsdStageRefPtr const &stage,
+    SdfPath const &fallbackCameraPath)
+{
+    UsdGeomCamera fallbackCamera =
+        UsdGeomCamera::Define(stage, fallbackCameraPath);
+
+    const GfMatrix4d m =
+        GfMatrix4d().SetDiagonal(GfVec4d(1.0, 1.0, -1.0, 1.0)) *
+        GfMatrix4d().SetTranslate(GfVec3d(0,0,-10));
+    fallbackCamera.AddTransformOp(UsdGeomXformOp::PrecisionFloat).Set(VtValue(m));
+
+    fallbackCamera.CreateFocalLengthAttr(VtValue(1.0f));
+    const float apertureSize = 2.0f * tan(GfDegreesToRadians(60.0f) / 2.0f);
+    fallbackCamera.CreateHorizontalApertureAttr(VtValue(apertureSize));
+    fallbackCamera.CreateVerticalApertureAttr(VtValue(apertureSize));
+    return fallbackCamera;
+}
+
+template <typename T>
+bool
+_SetFallbackValueIfUnauthored(
+    TfToken const &attrName,
+    UsdPrim prim,
+    T value)
+{
+    UsdAttribute attr = prim.GetAttribute(attrName);
+    if (!attr.HasAuthoredValue()) {
+        fprintf(stdout, "   Set fallback value for attribute %s\n",
+                attrName.GetText());
+        return attr.Set(value);
+    }
+
+    return false;
+}
+
+// Add Fallback values needed for the test, if they are not already authored.
+void
+PopulateFallbackRenderSettings(
+    UsdStageRefPtr const &stage,
+    std::string const &outputFilename,
+    std::string const &visualizerStyle,
+    SdfPath const &sceneCamPath,
+    UsdRenderSettings *settings)
+{
+    // If no renderSettings prim was found create a fallback prim.
+    if (settings->GetPath().IsEmpty()) {
+        const SdfPath fallbackRenderSettingsPath("/Render/Settings/Fallback");
+        *settings = 
+            UsdRenderSettings::Define(stage, fallbackRenderSettingsPath);
+
+        fprintf(stdout, "Populate fallback RenderSettings Prim %s ."
+                        "\n", fallbackRenderSettingsPath.GetText());
+    } else {
+        fprintf(stdout, "Populate RenderSettings Prim %s with fallback values."
+                        "\n", settings->GetPath().GetText());
+    }
+    
+    // Set the fallback Resolution and Aspect Ratio Conform Policy. These are
+    // schema attributes.
+    {
+        if (!settings->GetResolutionAttr().HasAuthoredValue()) {
+            settings->CreateResolutionAttr(VtValue(s_fallbackResolution));
+        }
+        if (!settings->GetAspectRatioConformPolicyAttr().HasAuthoredValue()) {
+            settings->CreateAspectRatioConformPolicyAttr(
+                VtValue(s_fallbackConformPolicy));
+        }
+    }
+
+    // Set fallback values for namespaced settings if the attribute wasn't
+    // authored. This should match the list in AddNamespacedSettings.
+    {
+        UsdPrim prim = settings->GetPrim();
+        _SetFallbackValueIfUnauthored(_tokens->jitter, prim, false);
+        _SetFallbackValueIfUnauthored(_tokens->minSamples, prim, 4);
+        _SetFallbackValueIfUnauthored(_tokens->maxSamples, prim, 4);
+        _SetFallbackValueIfUnauthored(_tokens->pixelVariance, prim, 0.f);
+    }
+
+
+    // Set the Camera
+    {
+        SdfPathVector cameraTargets; 
+        settings->GetCameraRel().GetForwardedTargets(&cameraTargets);
+        if (cameraTargets.empty()) {
+            if (sceneCamPath.IsEmpty()) {
+                SdfPath fallbackCameraPath("/Fallback/Camera");
+                UsdGeomCamera fallbackCamera = 
+                    CreateFallbackCamera(stage, fallbackCameraPath);
+                settings->GetCameraRel().AddTarget(fallbackCameraPath);
+            }
+            else {
+                settings->GetCameraRel().AddTarget(sceneCamPath);
+            }
+        }
+    }
+
+    // Set the Integrator
+    {
+        UsdAttribute riIntegratorAttr = stage->GetAttributeAtPath(
+            settings->GetPath().AppendProperty(
+                TfToken("outputs:ri:integrator")));
+        if (!riIntegratorAttr.HasAuthoredConnections()) {
+            fprintf(stdout, "   Add an Integrator Prim.\n");
+
+            UsdPrim pxrIntegrator;
+            const SdfPath fallbackIntegratorPath("/Render/Integrator");
+            if (visualizerStyle.empty()) {
+                pxrIntegrator = stage->DefinePrim(
+                    fallbackIntegratorPath, TfToken("PxrPathTracer"));
+            }
+            else {
+                pxrIntegrator = stage->DefinePrim(
+                    fallbackIntegratorPath, TfToken("PxrVisualizer"));
+                UsdAttribute wireframeAttr = stage->GetAttributeAtPath(
+                    pxrIntegrator.GetPath().AppendProperty(
+                        TfToken("inputs:ri:wireframe")));
+                wireframeAttr.Set(VtValue(true));
+                UsdAttribute styleAttr = stage->GetAttributeAtPath(
+                    pxrIntegrator.GetPath().AppendProperty(
+                        TfToken("inputs:ri:style")));
+                styleAttr.Set(VtValue(TfToken(visualizerStyle)));
+            }
+            UsdAttribute integratorOutputAttr = stage->GetAttributeAtPath(
+                pxrIntegrator.GetPath().AppendProperty(
+                    TfToken("outputs:result")));
+
+            const SdfPathVector integratorOutputPath = 
+                { integratorOutputAttr.GetPath() };
+            riIntegratorAttr.SetConnections(integratorOutputPath);
+        }
+    }
+
+    // Check if there are any authored Render Products connected
+    SdfPathVector renderProductTargets; 
+    settings->GetProductsRel().GetForwardedTargets(&renderProductTargets);
+    if (!renderProductTargets.empty()) {
+        return;
+    }
+
+    {
+        fprintf(stdout, "   Adding Fallback Render Product and Vars.\n");
+        // Create the fallback Render Product using the outputFilename
+        SdfPath fallbackProductPath("/Render/Products/Fallback");
+        UsdRenderProduct fallbackProduct =
+            UsdRenderProduct::Define(stage, fallbackProductPath);
+        fallbackProduct.CreateProductNameAttr(VtValue(TfToken(outputFilename)));
+        settings->GetProductsRel().AddTarget(fallbackProductPath);
+
+        // Create the fallback Render Vars
+        SdfPath fallbackVarCiPath("/Render/Vars/Ci");
+        UsdRenderVar fallbackVarCi =
+            UsdRenderVar::Define(stage, fallbackVarCiPath);
+        fallbackVarCi.CreateDataTypeAttr(VtValue(TfToken("color3f")));
+        fallbackVarCi.CreateSourceNameAttr(VtValue(std::string("Ci")));
+        fallbackProduct.GetOrderedVarsRel().AddTarget(fallbackVarCiPath);
+
+        SdfPath fallbackVarAlphaPath("/Render/Vars/Alpha");
+        UsdRenderVar fallbackVarAlpha =
+            UsdRenderVar::Define(stage, fallbackVarAlphaPath);
+        fallbackVarAlpha.CreateDataTypeAttr(VtValue(TfToken("float")));
+        fallbackVarAlpha.CreateSourceNameAttr(VtValue(std::string("a")));
+        fallbackProduct.GetOrderedVarsRel().AddTarget(fallbackVarAlphaPath);
+    }
+}
+
+VtDictionary
+CreateRenderSpecDict(
+    UsdRenderSpec const &renderSpec, UsdRenderSpec::Product const &product)
+{
+    // RenderSpecDict contains: camera, renderVars, and renderProducts
+    VtDictionary renderSpecDict;
+
+    // Camera
+    renderSpecDict[HdPrmanExperimentalRenderSpecTokens->camera] =
+        product.cameraPath;
+    // Render Vars
+    {
+        std::vector<VtValue> renderVarDicts;
+
+        // Displays & Display Channels
+        for (size_t index: product.renderVarIndices) {
+            auto const& renderVar = renderSpec.renderVars[index];
+
+            VtDictionary renderVarDict;
+            renderVarDict[HdPrmanExperimentalRenderSpecTokens->name] =
+                renderVar.renderVarPath.GetName();
+            renderVarDict[HdPrmanExperimentalRenderSpecTokens->sourceName] =
+                renderVar.sourceName;
+            renderVarDict[HdPrmanExperimentalRenderSpecTokens->sourceType] =
+                renderVar.sourceType;
+            renderVarDict[HdPrmanExperimentalRenderSpecTokens->type] =
+                renderVar.dataType.GetString();
+            renderVarDict[HdPrmanExperimentalRenderSpecTokens->params] =
+                renderVar.namespacedSettings;
+
+            renderVarDicts.push_back(VtValue(renderVarDict));
+        }
+        
+        renderSpecDict[HdPrmanExperimentalRenderSpecTokens->renderVars] =
+            renderVarDicts;
+    }
+    // Render Products
+    {
+        std::vector<VtValue> renderProducts;
+        {
+            VtDictionary renderProduct;
+            renderProduct[HdPrmanExperimentalRenderSpecTokens->name] =
+                product.name.GetString();
+            renderProduct[HdPrmanExperimentalRenderSpecTokens->params] =
+                product.namespacedSettings;
+            {
+                VtIntArray renderVarIndices;
+                const size_t num = product.renderVarIndices.size();
+                for (size_t i = 0; i < num; i++) {
+                    renderVarIndices.push_back(i);
+                }
+                renderProduct[
+                    HdPrmanExperimentalRenderSpecTokens->renderVarIndices] =
+                    renderVarIndices;
+            }
+            renderProducts.push_back(VtValue(renderProduct));
+        }
+        renderSpecDict[HdPrmanExperimentalRenderSpecTokens->renderProducts]=
+            renderProducts;
+    }
+    return renderSpecDict;
+}
+
+// Add the integratorName and any associated values to the settingsMap based 
+// on the VisualizerStyle
+void
+AddVisualizerStyle(
+    std::string const &visualizerStyle, HdRenderSettingsMap *settingsMap)
+{
+    if (!visualizerStyle.empty()) {
+        const std::string integratorName("PxrVisualizer");
+
+        // Note that this can now be represented as an integrator prim that 
+        // is connected to the RenderSettings prim through the 
+        // 'outputs:ri:integrator' terminal 
+        (*settingsMap)[HdPrmanRenderSettingsTokens->integratorName] =
+            integratorName;
+
+        // This prefix is used in HdPrman_RenderParam to get these
+        // parameters. The Integrator prim just has the 'ri' namespace.
+        const std::string prefix = "ri:integrator:" + integratorName + ":";
+        
+        (*settingsMap)[TfToken(prefix + "wireframe")] = 1;
+        (*settingsMap)[TfToken(prefix + "style")] = visualizerStyle;
+    } else {
+        const std::string integratorName("PxrPathTracer");
+        (*settingsMap)[HdPrmanRenderSettingsTokens->integratorName] =
+            integratorName;
+    }
+}
+
+// Add the Namespaced Settings to the settingsMap making sure to add the 
+// fallback settings specific to testHdPrman
+void 
+AddNamespacedSettings(
+    VtDictionary const &namespacedSettings, HdRenderSettingsMap *settingsMap)
+{
+    // Add fallback settings specific to testHdPrman 
+    (*settingsMap)[_tokens->jitter] = false;
+    (*settingsMap)[_tokens->minSamples] = 4;
+    (*settingsMap)[_tokens->maxSamples] = 4;
+    (*settingsMap)[_tokens->pixelVariance] = 0.f;
+
+    // Set namespaced settings 
+    for (const auto &item : namespacedSettings) {
+        (*settingsMap)[TfToken(item.first)] = item.second;
+    }
+}
+
+// Apply Command line overrides to the RenderSpec's product since it will 
+// be used to create the Riley RenderView in HdPrman_RenderPass.
+HydraSetupCameraInfo
+ApplyCommandLineArgsToProduct(
+    SdfPath const &sceneCamPath,
+    float const sceneCamAspect,
+    UsdRenderSpec::Product *product)
+{
+    // Apply Command line overrides to the product since it will be used to 
+    // create the RenderSpecDict that HdPrman_RenderPass will use.
+    if (!sceneCamPath.IsEmpty()) {
+        product->cameraPath = sceneCamPath;
+    }
+    if (sceneCamAspect > 0.0) {
+        product->resolution[1] = (int)(product->resolution[0]/sceneCamAspect);
+        product->apertureSize[1] = product->apertureSize[0]/sceneCamAspect;
+    }
+
+    HydraSetupCameraInfo camInfo;
+    camInfo.cameraPath = product->cameraPath;
+    camInfo.resolution = product->resolution;
+    camInfo.pixelAspectRatio = product->pixelAspectRatio;
+    camInfo.aspectRatioConformPolicy = product->aspectRatioConformPolicy;
+    camInfo.dataWindowNDC = product->dataWindowNDC;
+
+    return camInfo;
+}
+
+// Apply Command line overrides to the RenderProduct since it will be used to 
+// create the Riley RenderView in HdPrman_RenderPass.
+SdfPath
+ApplyCommandLineArgsToProduct(
+    SdfPath const &sceneCamPath,
+    float const sceneCamAspect,
+    UsdStageRefPtr const &stage,
+    UsdRenderSettings const &settings)
+{
+    SdfPath cameraPath;
+
+    // Override the values on the first RenderProduct 
+    // Note that at this point there should always be at least one RenderProduct
+    SdfPathVector productPaths;
+    settings.GetProductsRel().GetForwardedTargets(&productPaths);
+    if (!productPaths.empty()) {
+        UsdRenderProduct product(stage->GetPrimAtPath(productPaths[0]));
+
+        // Update the Product's CameraRel and store the cameraPath
+        if (!sceneCamPath.IsEmpty()) {
+            cameraPath = sceneCamPath;
+            product.GetCameraRel().SetTargets({sceneCamPath});
+        } else {
+            SdfPathVector cameraPaths;
+            product.GetCameraRel().GetForwardedTargets(&cameraPaths);
+            if (!cameraPaths.empty()) {
+                cameraPath = cameraPaths[0];
+            }
+        }
+        // Update the Product's Resolution
+        if (sceneCamAspect > 0.0) {
+            GfVec2i resolution;
+            if (product.GetResolutionAttr().IsAuthored()) {
+                product.GetResolutionAttr().Get(&resolution);
+            } else {
+                resolution = s_fallbackResolution;
+            }
+            resolution[1] = (int)(resolution[0]/sceneCamAspect);
+            product.CreateResolutionAttr(VtValue(resolution));
+        }
+    }
+
+    return cameraPath;
+}
+
+HdSceneIndexBaseRefPtr
+_AppendSceneGlobalsSceneIndexCallback(
+        const std::string &renderInstanceId,
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs)
+{
+    _AppSceneIndicesSharedPtr appSceneIndices =
+        s_renderInstanceTracker->GetInstance(renderInstanceId);
+    
+    if (appSceneIndices) {
+        auto &sgsi = appSceneIndices->sceneGlobalsSceneIndex;
+        sgsi = HdsiSceneGlobalsSceneIndex::New(inputScene);
+        sgsi->SetDisplayName("Scene Globals Scene Index");
+        return sgsi;
+    }
+
+    TF_CODING_ERROR("Did not find appSceneIndices instance for %s,",
+                    renderInstanceId.c_str());
+    return inputScene;
+}
+
+HdSceneIndexBaseRefPtr
+_AppendFixedLightSamplesSceneIndexCallback(
+    const std::string& renderInstanceId,
+    const HdSceneIndexBaseRefPtr& inputScene,
+    const HdContainerDataSourceHandle& inputArgs)
+{
+    _AppSceneIndicesSharedPtr appSceneIndices =
+        s_renderInstanceTracker->GetInstance(renderInstanceId);
+    
+    if (appSceneIndices) {
+        auto& flssi = appSceneIndices->fixedLightSamplesSceneIndex;
+        flssi = _FixedLightSamplesSceneIndex::New(inputScene);
+        flssi->SetDisplayName("Fixed Light Samples Scene Index");
+        return flssi;
+    }
+    TF_CODING_ERROR("Did not find appSceneIndices instance for %s",
+        renderInstanceId.c_str());
+    return inputScene;
+}
+
+void
+_RegisterApplicationSceneIndices()
+{
+    // SGSI
+    {
+        // Insert earlier so downstream scene indices can query and be notified
+        // of changes and also declare their dependencies (e.g., to support
+        // rendering color spaces).
+        const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 0;
+
+        // Note:
+        // The pattern used below registers the static member fn as a callback,
+        // which retreives the scene index instance using the
+        // renderInstanceId argument of the callback.
+
+        HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+            std::string(), // empty string implies all renderers
+            _AppendSceneGlobalsSceneIndexCallback,
+            /* inputArgs = */ nullptr,
+            insertionPhase,
+            HdSceneIndexPluginRegistry::InsertionOrderAtStart
+        );
+    }
+
+    // FLSSI
+    {
+        // After mesh light resolving scene index
+        const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 115;
+        HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+            std::string(),
+            _AppendFixedLightSamplesSceneIndexCallback,
+            /* inputArgs = */ nullptr,
+            insertionPhase,
+            HdSceneIndexPluginRegistry::InsertionOrderAtEnd
+        );
+    }
+}
+
+void
+HydraSetupAndRender(
+    HdRenderSettingsMap const &settingsMap,
+    SdfPath const &renderSettingsPrimPath,
+    const HydraSetupCameraInfo * const cameraInfo,
+    SdfPath const &cameraPath,
+    const std::string &cullStyle,
+    UsdStageRefPtr const &stage,
+    const int frameNum, 
+    TfStopwatch *timer_hydra)
+{
+    // Hydra setup
+    //
+    // Assemble a Hydra pipeline to feed USD data to Riley. 
+    // Scene data flows left-to-right:
+    //
+    //     => UsdStage
+    //       => UsdImagingDelegate (hydra "frontend")
+    //         => HdRenderIndex
+    //           => HdPrmanRenderDelegate (hydra "backend")
+    //             => Riley
+    //
+    // Note that Hydra is flexible, but that means it takes a few steps
+    // to configure the details. This might seem out of proportion in a
+    // simple usage example like this, if you don't consider the range of
+    // other scenarios Hydra is meant to handle.
+
+    // Create the RenderDelegate, passing in the HdRenderSettingsMap
+    // In order to pick up the plugin scene indices, we need to instantiate
+    // the HdPrmanRenderDelegate through the renderer plugin registry.
+    HdPluginRenderDelegateUniqueHandle const renderDelegate =
+        HdRendererPluginRegistry::GetInstance().CreateRenderDelegate(
+            TfToken("HdPrmanLoaderRendererPlugin"),
+            settingsMap);
+
+    const std::string renderInstanceId =
+        TfStringPrintf("testHdPrman_%s_%p",
+            renderDelegate.GetPluginId().GetText(),
+            (void *) renderDelegate.Get());
+
+    // Register application managed scene indices via the callback
+    // facility which will be invoked during render index construction.
+    {
+        static std::once_flag registerOnce;
+        std::call_once(registerOnce, _RegisterApplicationSceneIndices);
+    }
+
+    _AppSceneIndicesSharedPtr appSceneIndices
+        = std::make_shared<_AppSceneIndices>();
+
+    // Register the app scene indices with the render instance id
+    // that is provided to the render index constructor below. This allows
+    // the callback to update the associated instance.
+    s_renderInstanceTracker->RegisterInstance(
+        renderInstanceId, appSceneIndices);
+
+    std::unique_ptr<HdRenderIndex> const hdRenderIndex(
+        HdRenderIndex::New(
+            renderDelegate.Get(), HdDriverVector(), renderInstanceId));
+
+    std::unique_ptr<UsdImagingDelegate> hdUsdFrontend;
+
+    if (TfGetEnvSetting(TEST_HD_PRMAN_ENABLE_SCENE_INDEX)) {
+        UsdImagingCreateSceneIndicesInfo createInfo;
+        createInfo.stage = stage;
+        UsdImagingSceneIndices sceneIndices =
+            UsdImagingCreateSceneIndices(createInfo);
+        sceneIndices.stageSceneIndex->SetTime(frameNum);
+        hdRenderIndex->InsertSceneIndex(
+            sceneIndices.finalSceneIndex, SdfPath::AbsoluteRootPath());
+    } else {
+        hdUsdFrontend = std::make_unique<UsdImagingDelegate>(
+            hdRenderIndex.get(),
+            SdfPath::AbsoluteRootPath());
+        hdUsdFrontend->Populate(stage->GetPseudoRoot());
+        hdUsdFrontend->SetTime(frameNum);
+        hdUsdFrontend->SetRefineLevelFallback(8); // max refinement
+        if (!cameraPath.IsEmpty()) {
+            hdUsdFrontend->SetCameraForSampling(cameraPath);
+        }
+        if (!cullStyle.empty()) {
+            if (cullStyle == "none") {
+                hdUsdFrontend->SetCullStyleFallback(HdCullStyleNothing);
+            } else if (cullStyle == "back") {
+                hdUsdFrontend->SetCullStyleFallback(HdCullStyleBack);
+            } else if (cullStyle == "front") {
+                hdUsdFrontend->SetCullStyleFallback(HdCullStyleFront);
+            } else if (cullStyle == "backUnlessDoubleSided") {
+                hdUsdFrontend->SetCullStyleFallback(
+                    HdCullStyleBackUnlessDoubleSided);
+            } else if (cullStyle == "frontUnlessDoubleSided") {
+                hdUsdFrontend->SetCullStyleFallback(
+                    HdCullStyleFrontUnlessDoubleSided);
+            }
+        }
+    }
+
+    // XXX
+    // The data flow below needs to be updated to be scene description driven.
+    // Specifically:
+    // - "rprim collection" should be replaced with the Usd Collection opinion
+    //   on the driving RenderPass prim.
+
+    // The collection of scene contents to render
+    HdRprimCollection hdCollection(
+        _tokens->testCollection,
+        HdReprSelector(HdReprTokens->smoothHull));
+    HdChangeTracker &tracker = hdRenderIndex->GetChangeTracker();
+    tracker.AddCollection(_tokens->testCollection);
+
+    // We don't need multi-pass rendering with a pathtracer
+    // so we use a single, simple render pass.
+    HdRenderPassSharedPtr const hdRenderPass =
+        renderDelegate->CreateRenderPass(hdRenderIndex.get(),
+                                            hdCollection);
+    HdRenderPassStateSharedPtr const hdRenderPassState =
+        renderDelegate->CreateRenderPassState();
+
+    // The camera/framing information only needs to be set for the RenderSpec 
+    // pathway, when using RenderSettings, HdPrman_RenderPass will get the 
+    // camera information directly from the RenderProducts.
+    if (cameraInfo) {
+        const HdCamera * const camera = 
+            dynamic_cast<const HdCamera*>(
+                hdRenderIndex->GetSprim(
+                    HdTokens->camera, cameraInfo->cameraPath));
+
+        hdRenderPassState->SetCamera(camera);
+        hdRenderPassState->SetFraming(ComputeFraming(*cameraInfo));
+        hdRenderPassState->SetOverrideWindowPolicy(
+#if HD_API_VERSION >= 57
+            HdUtils::ToConformWindowPolicy(
+                cameraInfo->aspectRatioConformPolicy));
+#else
+            { true, HdUtils::ToConformWindowPolicy(
+                                    cameraInfo->aspectRatioConformPolicy) });
+#endif
+    }
+    
+    TfTokenVector renderTags;
+    if (!renderSettingsPrimPath.IsEmpty()) {
+        const UsdRenderSettings& settings = UsdRenderSettings(
+            stage->GetPrimAtPath(renderSettingsPrimPath));
+        VtTokenArray purposes;
+        settings.GetIncludedPurposesAttr().Get(&purposes);
+        for (const TfToken& purpose : purposes) {
+            if (purpose == UsdGeomTokens->default_) {
+                renderTags.push_back(HdRenderTagTokens->geometry);
+            } else if (purpose == UsdGeomTokens->guide) {
+                renderTags.push_back(HdRenderTagTokens->guide);
+            } else if (purpose == UsdGeomTokens->render) {
+                renderTags.push_back(HdRenderTagTokens->render);
+            } else if (purpose == UsdGeomTokens->proxy) {
+                renderTags.push_back(HdRenderTagTokens->proxy);
+            } else {
+                TF_CODING_ERROR("Unrecognized purpose: %s", purpose.GetText());
+            }
+        }
+        auto sgsi = appSceneIndices->sceneGlobalsSceneIndex;
+        TF_VERIFY(sgsi);
+        fprintf(stdout, "Setting the active render settings prim path to <%s>.\n",
+                renderSettingsPrimPath.GetText());
+        sgsi->SetActiveRenderSettingsPrimPath(renderSettingsPrimPath);
+    } else {
+        renderTags.push_back(HdRenderTagTokens->geometry);
+    }
+
+    // The task execution graph and engine configuration is also simple.
+    HdTaskSharedPtrVector tasks = {
+        std::make_shared<Hd_DrawTask>(hdRenderPass,
+                                      hdRenderPassState,
+                                      renderTags)
+    };
+    HdEngine hdEngine;
+    timer_hydra->Start();
+    hdEngine.Execute(hdRenderIndex.get(), &tasks);
+    timer_hydra->Stop();
+
+    s_renderInstanceTracker->UnregisterInstance(renderInstanceId);
+}
+
+
+void
+PrintUsage(const char* cmd, const char *err=nullptr)
+{
+    if (err) {
+        fprintf(stderr, "%s\n", err);
+    }
+    fprintf(stderr, "Usage: %s INPUT.usd "
+            "[--out|-o OUTPUT] [--frame|-f FRAME] [--env|-e NAME=VALUE]"
+            "[--sceneCamPath|-c CAM_PATH] [--settings|-s RENDERSETTINGS_PATH] "
+            "[--sceneCamAspect|-a aspectRatio] [--cullStyle|-k CULL_STYLE] "
+            "[--visualize|-z STYLE] [--perf|-p PERF] [--trace|-t TRACE]\n"
+            "Single-hyphen options still need a space before the value!\n"
+            "OUTPUT defaults to UsdRenderSettings if not specified.\n"
+            "FRAME defaults to 0 if not specified.\n"
+            "NAME & VALUE are an environment variable and value to set with "
+            "ArchSetEnv; use multiple --env tags to set multiple variables\n"
+            "CAM_PATH defaults to empty path if not specified\n"
+            "RENDERSETTINGS_PATH defaults to empty path is not specified\n"
+            "STYLE indicates a PxrVisualizer style to use instead of "
+            "the default integrator\n"
+            "PERF indicates a json file to record performance measurements\n"
+            "TRACE indicates a text file to record trace measurements\n"
+            "CULL_STYLE selects the fallback cull style and may be one of: "
+            "none|back|front|backUnlessDoubleSided|frontUnlessDoubleSided\n",
+            cmd);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+int main(int argc, char *argv[])
+{
+    //////////////////////////////////////////////////////////////////////// 
+    //
+    // Parse args
+    //
+    if (argc < 2) {
+        PrintUsage(argv[0]);
+        return -1;
+    }
+
+    std::string inputFilename(argv[1]);
+    std::string outputFilename;
+    std::string perfOutput, traceOutput;
+    std::string cullStyle;
+
+    int frameNum = 0;
+    SdfPath sceneCamPath, renderSettingsPath;
+    float sceneCamAspect = -1.0;
+    std::string visualizerStyle;
+    std::vector<std::pair<std::string, std::string>> env;
+
+    for (int i=2; i<argc-1; ++i) {
+        const std::string arg(argv[i]);
+        if (arg == "--frame" || arg == "-f") {
+            frameNum = atoi(argv[++i]);
+        } else if (arg == "--sceneCamPath" || arg == "-c") {
+            sceneCamPath = SdfPath(argv[++i]);
+        } else if (arg == "--sceneCamAspect" || arg == "-a") {
+            sceneCamAspect = atof(argv[++i]);
+        } else if (arg == "--out" || arg == "-o") {
+            outputFilename = argv[++i];
+        } else if (arg == "--settings" || arg == "-s") {
+            renderSettingsPath = SdfPath(argv[++i]);
+        } else if (arg == "--visualize" || arg == "-z") {
+            visualizerStyle = argv[++i];
+        } else if (arg == "--perf" || arg == "-p") {
+            perfOutput = argv[++i];
+        } else if (arg == "--trace" || arg == "-t") {
+            traceOutput = argv[++i];
+        } else if (arg == "--cullStyle" || arg == "-k") {
+            cullStyle = argv[++i];
+        } else if (arg == "--env" || arg == "-e") {
+            std::vector<std::string> parts = TfStringSplit(argv[++i], "=");
+            env.push_back({parts[0], parts[1]});
+        }
+    }
+
+    if (!env.empty()) {
+        for (auto p : env) {
+            ArchSetEnv(p.first, p.second, true);
+        }
+    }
+
+    if (!traceOutput.empty()) {
+        TraceCollector::GetInstance().SetEnabled(true);
+    }
+
+    //////////////////////////////////////////////////////////////////////// 
+    //
+    // USD setup
+    //
+
+    TfStopwatch timer_usdOpen;
+    timer_usdOpen.Start();
+    // Load USD file
+    UsdStageRefPtr stage = UsdStage::Open(inputFilename);
+    if (!stage) {
+        PrintUsage(argv[0], "could not load input file");
+        return -1;
+    }
+    timer_usdOpen.Stop();
+
+    //////////////////////////////////////////////////////////////////////// 
+    // Render settings
+    //
+
+    UsdRenderSettings settings;
+    if (renderSettingsPath.IsEmpty()) {
+        // Get the RenderSettings prim indicated in the stage metadata
+        fprintf(stdout, "Looking for Render Settings based on the metadata.\n");
+        settings = UsdRenderSettings::GetStageRenderSettings(stage);
+    } else {
+        // If a path was specified, try to use the requested settings prim.
+        fprintf(stdout, "Looking for Render Settings at the path <%s>.\n",
+                renderSettingsPath.GetText());
+        settings = UsdRenderSettings(stage->GetPrimAtPath(renderSettingsPath));
+    }
+    if (settings) {
+        fprintf(stdout, "Found the Render Settings Prim <%s>.\n", 
+                settings.GetPath().GetText());
+    }
+
+    // If we want to use the Render Settings, make sure it is fully populated
+    if (UseRenderSettingsPrim()) {
+        PopulateFallbackRenderSettings(
+            stage, outputFilename, visualizerStyle, sceneCamPath, &settings);
+    }
+
+    UsdRenderSpec renderSpec;
+    if (!UseRenderSettingsPrim()) {
+        if (settings) {
+            // Create the RenderSpec from the Render Settings Prim 
+            fprintf(stdout, "Create a UsdRenderSpec from the Render Settings "
+                    "Prim <%s>.\n", settings.GetPath().GetText());
+            renderSpec =
+                UsdRenderComputeSpec(settings, {_tokens->renderContext});
+        } else {
+            // Otherwise, provide a built-in render specification.
+            fprintf(stdout, "Create the Fallback UsdRenderSpec.\n");
+            PopulateFallbackRenderSpec(outputFilename, &renderSpec);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////// 
+    //
+    // Diagnostic aids
+    //
+
+    // These are meant to help keep an eye on how much available
+    // concurrency is being used, within an automated test environment.
+    printf("Current concurrency limit:  %u\n", WorkGetConcurrencyLimit());
+    printf("Physical concurrency limit: %u\n",
+        WorkGetPhysicalConcurrencyLimit());
+
+    //////////////////////////////////////////////////////////////////////// 
+    //
+    // Render
+    //
+
+    TfStopwatch timer_hydra;
+
+    if (settings && UseRenderSettingsPrim()) {
+        printf("Rendering using the render settings prim <%s>...\n",
+               settings.GetPath().GetText());
+
+        SdfPath cameraPath = ApplyCommandLineArgsToProduct(
+            sceneCamPath, sceneCamAspect, stage, settings);
+
+        // Create HdRenderSettingsMap for the RenderDelegate
+        HdRenderSettingsMap settingsMap;
+
+        settingsMap[HdRenderSettingsTokens->enableInteractive] = false;
+
+        HydraSetupAndRender(
+            settingsMap, settings.GetPath(),
+            nullptr /* camInfo */, cameraPath, cullStyle, stage, 
+            frameNum, &timer_hydra);
+
+        printf("Rendered <%s>\n", settings.GetPath().GetText());
+    }
+    else {
+        // When using the Render Spec dictionary in the legacy render settings
+        // map to plumb settings, we specify the settings per product. For 
+        // simplicity, we recreate the riley and hydra setup for each product. 
+        // Eventually, this path will be deprecated and removed to leverage 
+        // hydra's first-class support for render settings scene description.
+        fprintf(stdout, "Rendering using the experimentalRenderSpec dictionary...\n");
+        for (auto product: renderSpec.products) {
+
+            if (product.type != TfToken("raster")) {
+                TF_WARN(
+                    "Skipping product %s because product type %s is not"
+                    "supported in the renderSpec path.",
+                    product.name.GetText(), product.type.GetText());
+                
+                continue;
+            }
+            printf("Rendering product %s...\n", product.name.GetText());
+
+            HydraSetupCameraInfo camInfo = ApplyCommandLineArgsToProduct(
+                sceneCamPath, sceneCamAspect, &product);
+
+            // Create HdRenderSettingsMap for the RenderDelegate
+            HdRenderSettingsMap settingsMap;
+
+            // Create and save the RenderSpecDict to the HdRenderSettingsMap
+            settingsMap[HdPrmanRenderSettingsTokens->experimentalRenderSpec] =
+                CreateRenderSpecDict(renderSpec, product);
+
+            AddVisualizerStyle(visualizerStyle, &settingsMap);
+            AddNamespacedSettings(product.namespacedSettings, &settingsMap);
+            settingsMap[HdRenderSettingsTokens->enableInteractive] = false;
+
+            HydraSetupAndRender(
+                settingsMap, /* renderSettingsPrimPath */ SdfPath::EmptyPath(),
+                &camInfo, camInfo.cameraPath, cullStyle, stage, 
+                frameNum, &timer_hydra);
+
+            printf("Rendered %s\n", product.name.GetText());
+        }
+    }
+
+    if (!traceOutput.empty()) {
+        std::ofstream outFile(traceOutput);
+        TraceCollector::GetInstance().SetEnabled(false);
+        TraceReporter::GetGlobalReporter()->Report(outFile);
+    }
+
+    if (!perfOutput.empty()) {
+        std::ofstream perfResults(perfOutput);
+        perfResults << "{'profile': 'usdOpen',"
+            << " 'metric': 'time',"
+            << " 'value': " << timer_usdOpen.GetSeconds() << ","
+            << " 'samples': 1"
+            << " }\n";
+        perfResults << "{'profile': 'hydraExecute',"
+            << " 'metric': 'time',"
+            << " 'value': " << timer_hydra.GetSeconds() << ","
+            << " 'samples': 1"
+            << " }\n";
+        perfResults << "{'profile': 'prmanRender',"
+            << " 'metric': 'time',"
+            << " 'value': " << s_timer_prmanRender.GetSeconds() << ","
+            << " 'samples': 1"
+            << " }\n";
+    }
+}
diff --git a/third_party/renderman-26/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..e76f0ec1da
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.cpp
@@ -0,0 +1,56 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/tetMeshConversionSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hdsi/tetMeshConversionSceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_TetMeshConversionSceneIndexPlugin"))
+);
+
+static const char * const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry::Define<HdPrman_TetMeshConversionSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 0;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr, // No input args.
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+// Implementation of HdPrman_TetMeshConversionSceneIndexPlugin
+
+HdPrman_TetMeshConversionSceneIndexPlugin::
+HdPrman_TetMeshConversionSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_TetMeshConversionSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdsiTetMeshConversionSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.h
new file mode 100644
index 0000000000..aa632befa3
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/tetMeshConversionSceneIndexPlugin.h
@@ -0,0 +1,34 @@
+//
+// Copyright 2024 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TET_MESH_CONVERSION_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TET_MESH_CONVERSION_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_TetMeshConversionSceneIndexPlugin
+///
+/// Prman scene index plugin that configures the Tet Mesh Conversion scene index
+/// to generate meshes for Tet Meshes.
+///
+class HdPrman_TetMeshConversionSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_TetMeshConversionSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TET_MESH_CONVERSION_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/tokens.cpp b/third_party/renderman-26/plugin/hdPrman/tokens.cpp
new file mode 100644
index 0000000000..1750e9fc2d
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/tokens.cpp
@@ -0,0 +1,32 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/tokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanTokens, HD_PRMAN_TOKENS);
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyPrimTypeTokens,
+                        HD_PRMAN_RILEY_PRIM_TYPE_TOKENS);
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanRileyAdditionalRoleTokens,
+                        HD_PRMAN_RILEY_ADDITIONAL_ROLE_TOKENS);
+TF_DEFINE_PUBLIC_TOKENS(HdPrmanPluginTokens, HD_PRMAN_PLUGIN_TOKENS);
+
+TF_MAKE_STATIC_DATA(std::vector<std::string>, _pluginDisplayNameTokens) {
+    _pluginDisplayNameTokens->push_back("Prman");
+    _pluginDisplayNameTokens->push_back("RenderMan RIS");
+    _pluginDisplayNameTokens->push_back("RenderMan XPU");
+    _pluginDisplayNameTokens->push_back("RenderMan XPU - CPU");
+    _pluginDisplayNameTokens->push_back("RenderMan XPU - GPU");
+}
+
+const std::vector<std::string>& HdPrman_GetPluginDisplayNames() {
+    return *_pluginDisplayNameTokens;
+}
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
diff --git a/third_party/renderman-26/plugin/hdPrman/tokens.h b/third_party/renderman-26/plugin/hdPrman/tokens.h
new file mode 100644
index 0000000000..f26752308f
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/tokens.h
@@ -0,0 +1,66 @@
+//
+// Copyright 2022 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TOKENS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TOKENS_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "pxr/base/tf/staticTokens.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+#define HD_PRMAN_TOKENS                         \
+    (meshLight)                                 \
+    (meshLightSourceMesh)                       \
+    (meshLightSourceVolume)                     \
+    (sourceGeom)
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanTokens, HDPRMAN_API, HD_PRMAN_TOKENS);
+
+///
+/// HdPrmanRileyPrimTypeTokens correspond to Riley::Create/Modify/Delete calls.
+///
+#define HD_PRMAN_RILEY_PRIM_TYPE_TOKENS                \
+    ((camera,             "riley:camera"))             \
+    ((clippingPlane,      "riley:clippingPlane"))      \
+    ((coordinateSystem,   "riley:coordinateSystem"))   \
+    ((displacement,       "riley:displacement"))      \
+    ((display,            "riley:display"))            \
+    ((displayFilter,      "riley:displayFilter"))      \
+    ((geometryInstance,   "riley:geometryInstance"))   \
+    ((geometryPrototype,  "riley:geometryPrototype"))  \
+    ((globals,            "riley:globals"))            \
+    ((integrator,         "riley:integrator"))         \
+    ((lightInstance,      "riley:lightInstance"))      \
+    ((lightShader,        "riley:lightShader"))        \
+    ((material,           "riley:material"))           \
+    ((renderOutput,       "riley:renderOutput"))       \
+    ((renderTarget,       "riley:renderTarget"))       \
+    ((renderView,         "riley:renderView"))         \
+    ((sampleFilter,       "riley:sampleFilter"))
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyPrimTypeTokens, HDPRMAN_API,
+                         HD_PRMAN_RILEY_PRIM_TYPE_TOKENS);
+
+#define HD_PRMAN_RILEY_ADDITIONAL_ROLE_TOKENS         \
+    (colorReference)                                  \
+    (floatReference)
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanRileyAdditionalRoleTokens, HDPRMAN_API,
+                         HD_PRMAN_RILEY_ADDITIONAL_ROLE_TOKENS);
+
+#define HD_PRMAN_PLUGIN_TOKENS \
+    ((motionBlur,       "HdPrman_MotionBlurSceneIndexPlugin")) \
+    ((extComp,          "HdPrman_ExtComputationPrimvarPruningSceneIndexPlugin"))
+
+TF_DECLARE_PUBLIC_TOKENS(HdPrmanPluginTokens, HD_PRMAN_PLUGIN_TOKENS);
+
+const std::vector<std::string>& HdPrman_GetPluginDisplayNames();
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_TOKENS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndex.cpp b/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndex.cpp
new file mode 100644
index 0000000000..0ce8b0dc47
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndex.cpp
@@ -0,0 +1,234 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/updateObjectSettingsSceneIndex.h"
+
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/tokens.h"
+
+#include "pxr/imaging/hd/version.h"
+
+#include "pxr/imaging/hd/containerDataSourceEditor.h"
+#include "pxr/imaging/hd/dataSourceLocator.h"
+#include "pxr/imaging/hd/dataSourceMaterialNetworkInterface.h"
+#include "pxr/imaging/hd/dataSourceTypeDefs.h"
+#include "pxr/imaging/hd/dependenciesSchema.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+#include "pxr/imaging/hd/overlayContainerDataSource.h"
+#include "pxr/imaging/hd/primvarsSchema.h"
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/schema.h" 
+#include "pxr/imaging/hd/tokens.h"
+
+#include "pxr/usdImaging/usdImaging/modelSchema.h"
+
+#include "pxr/base/tf/debug.h"
+#include "pxr/base/trace/trace.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+
+    ((riAttributesDiceMicropolyonLength,
+        "ri:attributes:dice:micropolygonlength"))
+    ((riAttributesDiceRasterOrient,
+        "ri:attributes:dice:rasterorient"))
+    ((riAttributesShadeShadingRate,
+        "ri:attributes:shade:shadingrate"))
+    ((riAttributesTraceDisplacements,
+        "ri:attributes:trace:displacements"))
+);
+
+
+static HdDataSourceBaseHandle
+_UpdatePrimvars(HdPrimvarsSchema primvars)
+{
+    HdContainerDataSourceEditor primvarsEditor(primvars.GetContainer());
+
+    // boolean attributes that migrated from string to int
+    // XXX array loop
+    if (HdPrimvarSchema primvar  =
+        primvars.GetPrimvar(_tokens->riAttributesDiceRasterOrient)) {
+        if (HdStringDataSourceHandle strDs =
+            HdStringDataSource::Cast(primvar.GetPrimvarValue())) {
+            std::string strVal = strDs->GetTypedValue(0.0f);
+            bool boolVal = (strVal == "Yes");
+            // Overlay boolean value
+            primvarsEditor.Overlay(
+                HdDataSourceLocator(
+                    _tokens->riAttributesDiceRasterOrient),
+                HdPrimvarSchema::Builder()
+                    .SetPrimvarValue(
+                        HdRetainedTypedSampledDataSource<bool>::New(boolVal))
+                    .Build());
+        }
+    }
+
+    // shade:shadingrate -> dice:micropolygonlength
+    if (HdPrimvarSchema shadingRate =
+        primvars.GetPrimvar(_tokens->riAttributesShadeShadingRate)) {
+        if (primvars.GetPrimvar(_tokens->riAttributesDiceMicropolyonLength)) {
+            // If micropolygonlength is already set, leave as-is.
+        } else {
+            // Convert shadingrate to micropolygonlength
+            if (HdFloatArrayDataSourceHandle rateDs =
+                HdFloatArrayDataSource::Cast(shadingRate.GetPrimvarValue())) {
+                VtArray<float> rateVal = rateDs->GetTypedValue(0.0f);
+                if (rateVal.size() == 2) {
+                    // Use 1st component only
+                    float shadingRate_0 = rateVal[0];
+                    // micropolygonlength = sqrt(shadingRate[0])
+                    float micropolygonLength = sqrt(shadingRate_0);
+                    primvarsEditor.Overlay(
+                        HdDataSourceLocator(
+                            _tokens->riAttributesDiceMicropolyonLength),
+                        HdPrimvarSchema::Builder()
+                            .SetPrimvarValue(
+                              HdRetainedTypedSampledDataSource<float>::New(
+                                micropolygonLength))
+                            .SetInterpolation(
+                                HdPrimvarSchema::BuildInterpolationDataSource(
+                                    HdPrimvarSchemaTokens->constant))
+                            .Build());
+                }
+            }
+        }
+        // Erase shadingrate
+        primvarsEditor.Set(
+            HdDataSourceLocator(_tokens->riAttributesShadeShadingRate),
+            HdBlockDataSource::New());
+    }
+
+    // trace:displacements:
+    // Values above 1 are deprecated, and are now equivalent to 1.
+    if (HdPrimvarSchema traceDisplacements =
+        primvars.GetPrimvar(_tokens->riAttributesTraceDisplacements)) {
+        if (HdIntDataSourceHandle intDs =
+            HdIntDataSource::Cast(traceDisplacements.GetPrimvarValue())) {
+            if (intDs->GetTypedValue(0) > 1) {
+                // Overlay a new value of 1
+                primvarsEditor.Overlay(
+                    HdDataSourceLocator(
+                        _tokens->riAttributesTraceDisplacements),
+                    HdPrimvarSchema::Builder()
+                        .SetPrimvarValue(
+                            HdRetainedTypedSampledDataSource<int>::New(1))
+                        .Build());
+            }
+        }
+    }
+
+    return primvarsEditor.Finish();
+}
+
+/// This data source returns a custom "primvars" data source when queried
+class HdPrman_UpdateObjectSettings_DataSource
+    : public HdContainerDataSource
+{
+public:
+    HD_DECLARE_DATASOURCE(HdPrman_UpdateObjectSettings_DataSource);
+
+    TfTokenVector
+    GetNames() override
+    {
+        TfTokenVector result;
+        if (_inputPrimDs) {
+            result = _inputPrimDs->GetNames();
+        }
+        return result;
+    }
+
+    HdDataSourceBaseHandle
+    Get(const TfToken &name) override
+    {
+        HdDataSourceBaseHandle result;
+        if (_inputPrimDs) {
+            result = _inputPrimDs->Get(name);
+        }
+        if (name == HdPrimvarsSchemaTokens->primvars) {
+            if (HdPrimvarsSchema primvars =
+                HdPrimvarsSchema::GetFromParent(_inputPrimDs)) {
+                result = _UpdatePrimvars(primvars);
+            }
+        }
+        return result;
+    }
+
+protected:
+    HdPrman_UpdateObjectSettings_DataSource(
+        HdContainerDataSourceHandle const& inputDs)
+    : _inputPrimDs(inputDs)
+    {
+    }
+
+private:
+    HdContainerDataSourceHandle _inputPrimDs;
+};
+
+
+
+/* static */
+HdPrman_UpdateObjectSettingsSceneIndexRefPtr
+HdPrman_UpdateObjectSettingsSceneIndex::New(
+    const HdSceneIndexBaseRefPtr& inputSceneIndex)
+{
+    return TfCreateRefPtr(  
+        new HdPrman_UpdateObjectSettingsSceneIndex(inputSceneIndex));
+}
+
+HdPrman_UpdateObjectSettingsSceneIndex::HdPrman_UpdateObjectSettingsSceneIndex(
+                                                                             const HdSceneIndexBaseRefPtr &inputSceneIndex)
+: HdSingleInputFilteringSceneIndexBase(inputSceneIndex)
+{ }
+
+HdSceneIndexPrim 
+HdPrman_UpdateObjectSettingsSceneIndex::GetPrim(
+                                               const SdfPath &primPath) const
+{
+    const HdSceneIndexPrim prim = _GetInputSceneIndex()->GetPrim(primPath);
+    return {
+        prim.primType,
+        HdPrman_UpdateObjectSettings_DataSource::New(prim.dataSource)
+    };
+}
+
+SdfPathVector 
+HdPrman_UpdateObjectSettingsSceneIndex::GetChildPrimPaths(
+                                                         const SdfPath &primPath) const
+{
+    return _GetInputSceneIndex()->GetChildPrimPaths(primPath);
+}
+
+void
+HdPrman_UpdateObjectSettingsSceneIndex::_PrimsAdded(
+                                                   const HdSceneIndexBase &sender,
+                                                   const HdSceneIndexObserver::AddedPrimEntries &entries)
+{    
+    _SendPrimsAdded(entries);
+}
+
+void 
+HdPrman_UpdateObjectSettingsSceneIndex::_PrimsRemoved(
+                                                     const HdSceneIndexBase &sender,
+                                                     const HdSceneIndexObserver::RemovedPrimEntries &entries)
+{
+    _SendPrimsRemoved(entries);
+}
+
+void
+HdPrman_UpdateObjectSettingsSceneIndex::_PrimsDirtied(
+                                                     const HdSceneIndexBase &sender,
+                                                     const HdSceneIndexObserver::DirtiedPrimEntries &entries)
+{
+    // XXX transfer primvar dirtiness
+    _SendPrimsDirtied(entries);
+}
+
+HdPrman_UpdateObjectSettingsSceneIndex::~HdPrman_UpdateObjectSettingsSceneIndex()
+= default;
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndex.h b/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndex.h
new file mode 100644
index 0000000000..d28fcd29f3
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndex.h
@@ -0,0 +1,51 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/filteringSceneIndex.h"
+
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DECLARE_REF_PTRS(HdPrman_UpdateObjectSettingsSceneIndex);
+
+/// This scene index is similar to PRManUpdateObjectSettingsOp in
+/// RenderMan-for-Katana: it migrates object settings to track
+/// changes in conventions between RenderMan releases.
+///
+class HdPrman_UpdateObjectSettingsSceneIndex : 
+    public  HdSingleInputFilteringSceneIndexBase
+{
+public:
+    static HdPrman_UpdateObjectSettingsSceneIndexRefPtr
+    New(const HdSceneIndexBaseRefPtr& inputSceneIndex);
+
+    HdSceneIndexPrim GetPrim(const SdfPath &primPath) const override;
+    SdfPathVector GetChildPrimPaths(const SdfPath &primPath) const override;
+
+protected:
+    HdPrman_UpdateObjectSettingsSceneIndex(
+        const HdSceneIndexBaseRefPtr& inputSceneIndex);
+    ~HdPrman_UpdateObjectSettingsSceneIndex();
+
+    void _PrimsAdded(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::AddedPrimEntries &entries) override;
+
+    void _PrimsRemoved(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::RemovedPrimEntries &entries) override;
+
+    void _PrimsDirtied(
+        const HdSceneIndexBase &sender,
+        const HdSceneIndexObserver::DirtiedPrimEntries &entries) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_H
diff --git a/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.cpp b/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.cpp
new file mode 100644
index 0000000000..2f6bbd81b8
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.cpp
@@ -0,0 +1,53 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#include "hdPrman/updateObjectSettingsSceneIndexPlugin.h"
+
+#include "pxr/imaging/hd/retainedDataSource.h"
+#include "pxr/imaging/hd/sceneIndexPluginRegistry.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "hdPrman/updateObjectSettingsSceneIndex.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    ((sceneIndexPluginName, "HdPrman_UpdateObjectSettingsSceneIndexPlugin"))
+);
+
+static const char * const _pluginDisplayName = "Prman";
+
+TF_REGISTRY_FUNCTION(TfType)
+{
+    HdSceneIndexPluginRegistry
+        ::Define<HdPrman_UpdateObjectSettingsSceneIndexPlugin>();
+}
+
+TF_REGISTRY_FUNCTION(HdSceneIndexPlugin)
+{
+    // We need an "insertion point" that's *after* general material resolve.
+    const HdSceneIndexPluginRegistry::InsertionPhase insertionPhase = 115;
+
+    HdSceneIndexPluginRegistry::GetInstance().RegisterSceneIndexForRenderer(
+        _pluginDisplayName,
+        _tokens->sceneIndexPluginName,
+        nullptr, // No input args.
+        insertionPhase,
+        HdSceneIndexPluginRegistry::InsertionOrderAtStart);
+}
+
+HdPrman_UpdateObjectSettingsSceneIndexPlugin::
+HdPrman_UpdateObjectSettingsSceneIndexPlugin() = default;
+
+HdSceneIndexBaseRefPtr
+HdPrman_UpdateObjectSettingsSceneIndexPlugin::_AppendSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputScene,
+    const HdContainerDataSourceHandle &inputArgs)
+{
+    return HdPrman_UpdateObjectSettingsSceneIndex::New(inputScene);
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.h b/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.h
new file mode 100644
index 0000000000..e923e6cc25
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/updateObjectSettingsSceneIndexPlugin.h
@@ -0,0 +1,33 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_PLUGIN_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_PLUGIN_H
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/sceneIndexPlugin.h"
+#include "hdPrman/api.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class HdPrman_MeshLghtResolvingSceneIndexPlugin
+///
+/// Pixar-only, Prman-specific Hydra scene index to resolve mesh lights.
+///
+class HdPrman_UpdateObjectSettingsSceneIndexPlugin : public HdSceneIndexPlugin
+{
+public:
+    HdPrman_UpdateObjectSettingsSceneIndexPlugin();
+
+protected:
+    HdSceneIndexBaseRefPtr _AppendSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputScene,
+        const HdContainerDataSourceHandle &inputArgs) override;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UPDATE_OBJECT_SETTINGS_SCENE_INDEX_PLUGIN_H
diff --git a/third_party/renderman-26/plugin/hdPrman/utils.cpp b/third_party/renderman-26/plugin/hdPrman/utils.cpp
new file mode 100644
index 0000000000..a2f8cf5e25
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/utils.cpp
@@ -0,0 +1,835 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/utils.h"
+
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/renderParam.h" // HDPRMAN_SHUTTER{OPEN,CLOSE}_DEFAULT
+#include "hdPrman/rixStrings.h"
+#include "hdPrman/tokens.h"
+
+#include "pxr/base/arch/env.h"
+#include "pxr/base/arch/library.h"
+#include "pxr/base/gf/matrix4f.h"
+#include "pxr/base/gf/vec2d.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/base/gf/vec3d.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/base/gf/vec4d.h"
+#include "pxr/base/gf/vec4f.h"
+#include "pxr/base/plug/plugin.h"
+#include "pxr/base/plug/registry.h"
+#include "pxr/base/tf/envSetting.h"
+#include "pxr/base/tf/getenv.h"
+#include "pxr/base/tf/pathUtils.h"  // ARCH_PATH_LIST_SEP
+#include "pxr/base/tf/stringUtils.h"
+#include "pxr/base/tf/token.h"
+#include "pxr/base/vt/array.h"
+#include "pxr/base/vt/value.h"
+#include "pxr/base/vt/visitValue.h"
+#include "pxr/base/work/threadLimits.h"
+#include "pxr/imaging/hd/tokens.h"
+#include "pxr/imaging/hio/imageRegistry.h"
+#include "pxr/usd/ar/resolver.h"
+#include "pxr/usd/ndr/declare.h"
+#include "pxr/usd/sdf/assetPath.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+    (primvar)
+);
+
+extern TfEnvSetting<bool> HD_PRMAN_DISABLE_HIDER_JITTER;
+extern TfEnvSetting<bool> HD_PRMAN_ENABLE_MOTIONBLUR;
+extern TfEnvSetting<int> HD_PRMAN_NTHREADS;
+extern TfEnvSetting<int> HD_PRMAN_OSL_VERBOSE;
+
+namespace {
+
+// _VtValueToRtParamList is a helper used with VtVisitValue to handle
+// type dispatch for converting VtValues to RtParamList entries.
+struct _VtValueToRtParamList
+{
+    RtUString const& name;
+    TfToken const& role;
+    RtParamList *params;
+
+    //
+    // Scalars
+    //
+    bool operator()(const int &v) {
+        return params->SetInteger(name, v);
+    }
+    bool operator()(const float &v) {
+        return params->SetFloat(name, v);
+    }
+    bool operator()(const long &v) {
+        return params->SetInteger(name, static_cast<int>(v));
+    }
+    bool operator()(const double &v) {
+        return params->SetFloat(name, static_cast<float>(v));
+    }
+
+    //
+    // Gf types
+    //
+    bool operator()(const GfVec2i &v) {
+        return params->SetIntegerArray(name, v.data(), 2); 
+    }
+    bool operator()(const GfVec2f &v) {
+        return params->SetFloatArray(name, v.data(), 2); 
+    }
+    bool operator()(const GfVec2d &vd) {
+        return (*this)(GfVec2f(vd));
+    }
+    bool operator()(const GfVec3i &v) {
+        return params->SetIntegerArray(name, v.data(), 3); 
+    }
+    bool operator()(const GfVec3f &v) {
+        if (role == HdPrimvarRoleTokens->color) {
+            return params->SetColor(name, RtColorRGB(v[0], v[1], v[2]));
+        } else if (role == HdPrimvarRoleTokens->point) {
+            return params->SetPoint(name, RtPoint3(v[0], v[1], v[2]));
+        } else if (role == HdPrimvarRoleTokens->normal) {
+            return params->SetNormal(name, RtNormal3(v[0], v[1], v[2]));
+        } else if (role == HdPrimvarRoleTokens->vector) {
+            return params->SetVector(name, RtVector3(v[0], v[1], v[2]));
+        } else {
+            return params->SetFloatArray(name, v.data(), 3);
+        }
+    }
+    bool operator()(const GfVec3d &vd) {
+        return (*this)(GfVec3f(vd));
+    }
+    bool operator()(const GfVec4i &v) {
+        return params->SetIntegerArray(name, v.data(), 4); 
+    }
+    bool operator()(const GfVec4f &v) {
+        return params->SetFloatArray(name, v.data(), 4);
+    }
+    bool operator()(const GfVec4d &vd) {
+        return (*this)(GfVec4f(vd));
+    }
+    bool operator()(const GfMatrix4d &v) {
+        return params->SetMatrix(name,   HdPrman_Utils::GfMatrixToRtMatrix(v));
+    }
+
+    //
+    // Arrays of scalars
+    //
+    bool operator()(const VtArray<bool> &vb) {
+        // bool->integer
+        VtArray<int> v;
+        v.resize(vb.size());
+        for (size_t i=0,n=vb.size(); i<n; ++i) {
+            v[i] = int(vb[i]);
+        }
+        return (*this)(v);
+    }
+    bool operator()(const VtArray<int> &v) {
+        return params->SetIntegerArray(name, v.cdata(), v.size());
+    }
+    bool operator()(const VtArray<float> &v) {
+        return params->SetFloatArray(name, v.cdata(), v.size());
+    }
+    bool operator()(const VtArray<long> &vl) {
+        // convert long->int
+        VtArray<int> v;
+        v.resize(vl.size());
+        for (size_t i=0,n=vl.size(); i<n; ++i) {
+            v[i] = int(vl[i]);
+        }
+        return (*this)(v);
+    }
+    bool operator()(const VtArray<double> &vd) {
+        // Convert double->float
+        VtArray<float> v;
+        v.resize(vd.size());
+        for (size_t i=0,n=vd.size(); i<n; ++i) {
+            v[i] = float(vd[i]);
+        }
+        return (*this)(v);
+    }
+
+    //
+    // Arrays of Gf types
+    //
+    bool operator()(const VtArray<GfVec2f> &v) {
+        return params->SetFloatArray(name,   
+            reinterpret_cast<const float*>(v.cdata()), 2*v.size());
+    }
+    bool operator()(const VtArray<GfVec2d> &vd) {
+        // Convert double->float
+        VtArray<GfVec2f> v;
+        v.resize(vd.size());
+        for (size_t i=0,n=vd.size(); i<n; ++i) {
+            v[i] = GfVec2f(vd[i]);
+        }
+        return (*this)(v);
+    }
+    bool operator()(const VtArray<GfVec3f> &v) {
+        if (role == HdPrimvarRoleTokens->color) {
+            return params->SetColorArray(
+                name, reinterpret_cast<const RtColorRGB*>(v.cdata()),
+                v.size());
+        } else if (role == HdPrimvarRoleTokens->point) {
+            return params->SetPointArray(
+                name, reinterpret_cast<const RtPoint3*>(v.cdata()),
+                v.size());
+        } else if (role == HdPrimvarRoleTokens->normal) {
+            return params->SetNormalArray(
+                name, reinterpret_cast<const RtNormal3*>(v.cdata()),
+                v.size());
+        } else if (role == HdPrimvarRoleTokens->vector) {
+            return params->SetVectorArray(
+                name, reinterpret_cast<const RtVector3*>(v.cdata()),
+                v.size());
+        } else {
+            return params->SetFloatArray(
+                name, reinterpret_cast<const float*>(v.cdata()),
+                3*v.size());
+        }
+    }
+    bool operator()(const VtArray<GfVec3d> &vd) {
+        // double->float
+        VtArray<GfVec3f> v;
+        v.resize(vd.size());
+        for (size_t i=0,n=vd.size(); i<n; ++i) {
+            v[i] = GfVec3f(vd[i]);
+        }
+        return (*this)(v);
+    }
+    bool operator()(const VtArray<GfVec4f> &v) {
+        return params->SetFloatArray(
+            name, reinterpret_cast<const float*>(v.cdata()), 4*v.size());
+    }
+    bool operator()(const VtArray<GfVec4d> &vd) {
+        // double->float
+        VtArray<GfVec4f> v;
+        v.resize(vd.size());
+        for (size_t i=0,n=vd.size(); i<n; ++i) {
+            v[i] = GfVec4f(vd[i]);
+        }
+        return (*this)(v);
+    }
+
+    //
+    // String-like types
+    //
+    bool operator()(const TfToken &v) {
+        if (role == HdPrmanRileyAdditionalRoleTokens->colorReference) {
+            return params->SetColorReference(name, RtUString(v.GetText()));
+        } else if (role == HdPrmanRileyAdditionalRoleTokens->floatReference) {
+            return params->SetFloatReference(name, RtUString(v.GetText()));
+        } else {
+            return params->SetString(name, RtUString(v.GetText()));
+        }
+    }
+    bool operator()(const std::string &v) {
+        return params->SetString(name, RtUString(v.c_str()));
+    }
+    bool operator()(const SdfAssetPath &assetPath) {
+        // Since we can't know how the texture will be consumed,
+        // go with the default of flipping textures
+        const bool flipTexture = true;
+        RtUString v = HdPrman_Utils::ResolveAssetToRtUString(
+            assetPath, flipTexture, _tokens->primvar.GetText());
+        return params->SetString(name, v);
+    }
+    
+    //
+    // Arrays of string-like types
+    //
+    bool operator()(const std::vector<RtUString> &us) {
+        return params->SetStringArray(name, us.data(), us.size());
+    }
+    bool operator()(const VtArray<TfToken> &v) {
+        // Convert to RtUString.
+        std::vector<RtUString> us;
+        us.reserve(v.size());
+        for (TfToken const& s: v) {
+            us.push_back(RtUString(s.GetText()));
+        }
+        return (*this)(us);
+    }
+    bool operator()(const VtArray<std::string> &v) {
+        // Convert to RtUString.
+        std::vector<RtUString> us;
+        us.reserve(v.size());
+        for (std::string const& s: v) {
+            us.push_back(RtUString(s.c_str()));
+        }
+        return (*this)(us);
+    }
+    bool operator()(const VtArray<SdfAssetPath> &v) {
+        // Convert to RtUString.
+        // Since we can't know how the texture will be consumed,
+        // go with the default of flipping textures
+        const bool flipTexture = true;
+        std::vector<RtUString> us;
+        us.reserve(v.size());
+        for (SdfAssetPath const& asset: v) {
+            us.push_back(HdPrman_Utils::ResolveAssetToRtUString(asset, flipTexture,
+                                                   _tokens->primvar.GetText()));
+        }
+        return (*this)(us);
+    }
+
+    bool operator()(const VtValue &val) {
+        // Dispatch for types that are not part of VT_VALUE_TYPES
+        // because they are defined downstream of Vt.
+        if (val.IsHolding<SdfAssetPath>()) {
+            return (*this)(val.UncheckedGet<SdfAssetPath>());
+        } else if (val.IsHolding<VtArray<SdfAssetPath>>()) {
+            return (*this)(val.UncheckedGet<VtArray<SdfAssetPath>>());
+        } else if (val.IsHolding<std::vector<RtUString>>()) {
+            return (*this)(val.UncheckedGet<std::vector<RtUString>>());
+        } else {
+            TF_CODING_ERROR("Cannot handle type %s\n", val.GetTypeName().c_str());
+            return false;
+        }
+    }
+};
+
+
+// _VtValueToRtPrimVar derives from _VtValueToRtParamList, corresponding
+// to how RtPrimVarList derives from RtParamList.  In both cases, the
+// key addition is the concept of 'detail', which specifies how array
+// values should be handled across topology.
+struct _VtValueToRtPrimVar : _VtValueToRtParamList
+{
+    RtDetailType detail;
+    RtPrimVarList *primvars;
+
+    _VtValueToRtPrimVar(RtUString const& name_,
+                        RtDetailType detail_,
+                        TfToken const& role_,
+                        RtPrimVarList *primvars_)
+        : _VtValueToRtParamList{name_, role_, primvars_}
+        , detail(detail_)
+        , primvars(primvars_)
+    {}
+
+    // Make operator() for the underlying _VtValueToRtPrimVar
+    // visible here.
+    using _VtValueToRtParamList::operator();
+
+    //
+    // Arrays of scalars
+    //
+    bool operator()(const VtArray<bool> &vb) {
+        // bool->integer
+        VtArray<int> v;
+        v.resize(vb.size());
+        for (size_t i=0,n=vb.size(); i<n; ++i) {
+            v[i] = int(vb[i]);
+        }
+        return (*this)(v);
+    }
+    bool operator()(const VtArray<int> &v) {
+        if (detail == RtDetailType::k_constant) {
+            return primvars->SetIntegerArray(name, v.cdata(), v.size());
+        } else {
+            return primvars->SetIntegerDetail(name, v.cdata(), detail);
+        }
+    }
+    bool operator()(const VtArray<float> &v) {
+        if (detail == RtDetailType::k_constant) {
+            return primvars->SetFloatArray(name, v.cdata(), v.size());
+        } else {
+            return primvars->SetFloatDetail(name, v.cdata(), detail);
+        }
+    }
+    bool operator()(const VtArray<long> &vl) {
+        // Convert double->int
+        VtArray<int> v;
+        v.resize(vl.size());
+        for (size_t i=0,n=vl.size(); i<n; ++i) {
+            v[i] = int(vl[i]);
+        }
+        return (*this)(v);
+    }
+    bool operator()(const VtArray<double> &vd) {
+        // Convert double->float
+        VtArray<float> v;
+        v.resize(vd.size());
+        for (size_t i=0,n=vd.size(); i<n; ++i) {
+            v[i] = float(vd[i]);
+        }
+        return (*this)(v);
+    }
+
+    //
+    // Arrays of Gf types
+    //
+    bool operator()(const VtArray<GfVec2f> &v) {
+        return primvars->SetFloatArrayDetail(name,
+            reinterpret_cast<const float*>(v.cdata()), 2, detail);
+    }
+    bool operator()(const VtArray<GfVec2d> &vd) {
+        // Convert double->float
+        VtArray<GfVec2f> v;
+        v.resize(vd.size());
+        for (size_t i=0,n=vd.size(); i<n; ++i) {
+            v[i] = GfVec2f(vd[i]);
+        }
+        return (*this)(v);
+    }
+    bool operator()(const VtArray<GfVec3f> &v) {
+        if (role == HdPrimvarRoleTokens->color) {
+            return primvars->SetColorDetail(
+                name, reinterpret_cast<const RtColorRGB*>(v.cdata()),
+                detail);
+        } else if (role == HdPrimvarRoleTokens->point) {
+            return primvars->SetPointDetail(
+                name, reinterpret_cast<const RtPoint3*>(v.cdata()),
+                detail);
+        } else if (role == HdPrimvarRoleTokens->normal) {
+            return primvars->SetNormalDetail(
+                name, reinterpret_cast<const RtNormal3*>(v.cdata()),
+                detail);
+        } else if (role == HdPrimvarRoleTokens->vector) {
+            return primvars->SetVectorDetail(
+                name, reinterpret_cast<const RtVector3*>(v.cdata()),
+                detail);
+        } else {
+            return primvars->SetFloatArrayDetail(
+                name, reinterpret_cast<const float*>(v.cdata()),
+                3, detail);
+        }
+    }
+    bool operator()(const VtArray<GfVec3d> &vd) {
+        // double->float
+        VtArray<GfVec3f> v;
+        v.resize(vd.size());
+        for (size_t i=0,n=vd.size(); i<n; ++i) {
+            v[i] = GfVec3f(vd[i]);
+        }
+        return (*this)(v);
+    }
+    bool operator()(const VtArray<GfVec4f> &v) {
+        return primvars->SetFloatArrayDetail(
+            name, reinterpret_cast<const float*>(v.cdata()), 4, detail);
+    }
+    bool operator()(const VtArray<GfVec4d> &vd) {
+        // double->float
+        VtArray<GfVec4f> v;
+        v.resize(vd.size());
+        for (size_t i=0,n=vd.size(); i<n; ++i) {
+            v[i] = GfVec4f(vd[i]);
+        }
+        return (*this)(v);
+    }
+
+    //
+    // Arrays of string-like types
+    //
+    bool operator()(const std::vector<RtUString> &us) {
+        if (detail == RtDetailType::k_constant) {
+            return primvars->SetStringArray(name, us.data(), us.size());
+        } else {
+            return primvars->SetStringDetail(name, us.data(), detail);
+        }
+    }
+    bool operator()(const VtArray<TfToken> &v) {
+        // Convert to RtUString.
+        std::vector<RtUString> us;
+        us.reserve(v.size());
+        for (TfToken const& s: v) {
+            us.push_back(RtUString(s.GetText()));
+        }
+        return (*this)(us);
+    }
+    bool operator()(const VtArray<std::string> &v) {
+        // Convert to RtUString.
+        std::vector<RtUString> us;
+        us.reserve(v.size());
+        for (std::string const& s: v) {
+            us.push_back(RtUString(s.c_str()));
+        }
+        return (*this)(us);
+    }
+    bool operator()(const VtArray<SdfAssetPath> &v) {
+        // Convert to RtUString.
+        // Since we can't know how the texture will be consumed,
+        // go with the default of flipping textures
+        const bool flipTexture = true;
+        std::vector<RtUString> us;
+        us.reserve(v.size());
+        for (SdfAssetPath const& asset: v) {
+            us.push_back(HdPrman_Utils::ResolveAssetToRtUString(asset, flipTexture,
+                                                   _tokens->primvar.GetText()));
+        }
+        return (*this)(us);
+    }
+
+    bool operator()(const VtValue &val) {
+        // Dispatch for types that are not part of VT_VALUE_TYPES
+        // because they are defined downstream of Vt.
+        if (val.IsHolding<SdfAssetPath>()) {
+            return (*this)(val.UncheckedGet<SdfAssetPath>());
+        } else if (val.IsHolding<VtArray<SdfAssetPath>>()) {
+            return (*this)(val.UncheckedGet<VtArray<SdfAssetPath>>());
+        } else if (val.IsHolding<std::vector<RtUString>>()) {
+            return (*this)(val.UncheckedGet<std::vector<RtUString>>());
+        } else {
+            TF_CODING_ERROR("Cannot handle type %s\n", val.GetTypeName().c_str());
+            return false;
+        }
+    }
+};
+
+bool
+_IsNativeRenderManFormat(std::string const &path)
+{
+    const std::string ext = ArGetResolver().GetExtension(path);
+    return (ext == "tex") || (ext == "bkm") || (ext == "ptc") || (ext == "ies");
+}
+
+/// Update the supplied list of options using searchpaths
+/// pulled from envrionment variables:
+///
+/// - RMAN_SHADERPATH
+/// - RMAN_TEXTUREPATH
+/// - RMAN_RIXPLUGINPATH
+/// - RMAN_PROCEDURALPATH
+/// - RMAN_DISPLAYPATH
+///
+void
+_UpdateSearchPathsFromEnvironment(RtParamList& options)
+{
+    // Default RenderMan installation under '$RMANTREE/lib/shaders'
+    std::string rmantree = TfGetenv("RMANTREE");
+    // Default hdPrman installation under 'plugins/usd/resources/shaders'
+    PlugPluginPtr plugin =
+        PlugRegistry::GetInstance().GetPluginWithName("hdPrmanLoader");
+
+    {
+        // searchpath:shader contains OSL (.oso)
+        std::string shaderpath = TfGetenv("RMAN_SHADERPATH");
+        NdrStringVec paths;
+        if (!shaderpath.empty()) {
+            // RenderMan expects ':' as path separator, regardless of platform
+            for (auto path : TfStringSplit(shaderpath, ARCH_PATH_LIST_SEP))
+            {
+                paths.push_back(path);
+            }
+        }
+        if (!rmantree.empty()) {
+            paths.push_back(TfStringCatPaths(rmantree, "lib/shaders"));
+        }
+        if (plugin)
+        {
+            std::string path = TfGetPathName(plugin->GetPath());
+            if (!path.empty()) {
+                paths.push_back(TfStringCatPaths(path, "resources/shaders"));
+            }
+        }
+        shaderpath = TfStringJoin(paths, ":");
+        options.SetString( RixStr.k_searchpath_shader,
+                           RtUString(shaderpath.c_str()) );
+    }
+
+    {
+        // searchpath:rixplugin contains C++ (.so) plugins
+        std::string rixpluginpath = TfGetenv("RMAN_RIXPLUGINPATH");
+        NdrStringVec paths;
+        if (!rixpluginpath.empty()) {
+            // RenderMan expects ':' as path separator, regardless of platform
+            for (auto path : TfStringSplit(rixpluginpath, ARCH_PATH_LIST_SEP))
+            {
+                paths.push_back(path);
+            }
+        }
+        // Default RenderMan installation under '$RMANTREE/lib/plugins'
+        if (!rmantree.empty()) {
+            paths.push_back(TfStringCatPaths(rmantree, "lib/plugins"));
+        }
+        rixpluginpath = TfStringJoin(paths, ":");
+        options.SetString( RixStr.k_searchpath_rixplugin,
+                           RtUString(rixpluginpath.c_str()) );
+    }
+
+    {
+        // searchpath:texture contains textures (.tex) and Rtx plugins (.so)
+        std::string texturepath = TfGetenv("RMAN_TEXTUREPATH");
+        NdrStringVec paths;
+        if (!texturepath.empty()) {
+            // RenderMan expects ':' as path separator, regardless of platform
+            for (auto path : TfStringSplit(texturepath, ARCH_PATH_LIST_SEP))
+            {
+                paths.push_back(path);
+            }
+        }
+        // Default RenderMan installation under '$RMANTREE/lib/textures'
+        // and '$RMANTREE/lib/plugins'
+        if (!rmantree.empty()) {
+            paths.push_back(TfStringCatPaths(rmantree, "lib/textures"));
+            paths.push_back(TfStringCatPaths(rmantree, "lib/plugins"));
+        }
+        // Default hdPrman installation under 'plugins/usd'
+        // We need the path to RtxHioImage and we assume that it lives in the
+        // same directory as hdPrmanLoader
+        if (plugin)
+        {
+            std::string path = TfGetPathName(plugin->GetPath());
+            if (!path.empty()) {
+                paths.push_back(path);
+            }
+        }
+        texturepath = TfStringJoin(paths, ":");
+        options.SetString( RixStr.k_searchpath_texture,
+                           RtUString(texturepath.c_str()) );
+    }
+
+    {
+        std::string proceduralpath = TfGetenv("RMAN_PROCEDURALPATH");
+        NdrStringVec paths;
+        if (!proceduralpath.empty()) {
+            // RenderMan expects ':' as path separator, regardless of platform
+            for (std::string const& path : TfStringSplit(proceduralpath,
+                                                         ARCH_PATH_LIST_SEP))
+            {
+                paths.push_back(path);
+            }
+        }
+
+        // Default RenderMan installation under '$RMANTREE/lib/plugins'
+        if (!rmantree.empty()) {
+            paths.push_back(TfStringCatPaths(rmantree, "lib/plugins"));
+        }
+        proceduralpath = TfStringJoin(paths, ":");
+        options.SetString( RixStr.k_searchpath_procedural,
+                           RtUString(proceduralpath.c_str()) );
+    }
+
+    {
+        std::string displaypath = TfGetenv("RMAN_DISPLAYPATH");
+        NdrStringVec paths;
+        if (!displaypath.empty()) {
+            // RenderMan expects ':' as path separator, regardless of platform
+            for (std::string const& path : TfStringSplit(displaypath,
+                                                         ARCH_PATH_LIST_SEP))
+            {
+                paths.push_back(path);
+            }
+        }
+
+        // Default RenderMan installation under '$RMANTREE/lib/plugins'
+        if (!rmantree.empty()) {
+            paths.push_back(TfStringCatPaths(rmantree, "lib/plugins"));
+        }
+        displaypath = TfStringJoin(paths, ":");
+        options.SetString( RixStr.k_searchpath_display,
+                           RtUString(displaypath.c_str()) );
+    }
+}
+
+}
+
+// -----------------------------------------------------------------------------
+
+namespace HdPrman_Utils {
+
+bool
+SetParamFromVtValue(
+    RtUString const& name,
+    VtValue const& val,
+    TfToken const& role,
+    RtParamList *params)
+{
+    if (ARCH_UNLIKELY(!params)) {
+        return false;
+    }
+    return VtVisitValue(val, _VtValueToRtParamList{name, role, params});
+}
+
+bool
+SetPrimVarFromVtValue(
+    RtUString const& name,
+    VtValue const& val,
+    RtDetailType const& detail,
+    TfToken const& role,
+    RtPrimVarList *params)
+{
+    if (ARCH_UNLIKELY(!params)) {
+        return false;
+    }
+    return VtVisitValue(val, _VtValueToRtPrimVar(
+        name, detail, role, params));
+}
+
+RtUString
+ResolveAssetToRtUString(
+    SdfAssetPath const &asset,
+    bool flipTexture,
+    char const *debugNodeType /* = nullptr*/)
+{
+
+    static HioImageRegistry& imageRegistry =
+        HioImageRegistry::GetInstance();
+
+    std::string v = asset.GetResolvedPath();
+    if (v.empty()) {
+        v = asset.GetAssetPath();
+    }
+
+    // Use the RtxHioImage plugin for resolved paths that are not
+    // native RenderMan formats, but which Hio can read.
+    // Note: we cannot read tex files from USDZ until we add support
+    // to RtxHioImage (or another Rtx plugin) for this.
+    // FUTURE NOTE: When we want to support primvar substitutions with
+    // the use of non-tex textures, the following clause can no longer
+    // be an "else if" (because such paths won't ArResolve), and we may 
+    // not be able to even do an extension check...
+    else if (!_IsNativeRenderManFormat(v) &&
+             imageRegistry.IsSupportedImageFile(v)) {
+        v = "rtxplugin:RtxHioImage" ARCH_LIBRARY_SUFFIX
+            "?filename=" + v + (flipTexture ? "" : "&flipped=false");
+    }
+
+    TF_DEBUG(HDPRMAN_IMAGE_ASSET_RESOLVE)
+        .Msg("Resolved %s asset path: %s\n", 
+             debugNodeType ? debugNodeType : "image",
+             v.c_str());
+
+    return RtUString(v.c_str());
+}
+
+RtParamList
+PruneDeprecatedOptions(
+    const RtParamList &options)
+{
+    // The following should not be given to Riley::SetOptions() anymore.
+    static std::vector<RtUString> const _deprecatedRileyOptions = {
+        RixStr.k_Ri_PixelFilterName, 
+        RixStr.k_hider_pixelfiltermode, 
+        RixStr.k_Ri_PixelFilterWidth,
+        RixStr.k_Ri_ScreenWindow};
+
+    RtParamList prunedOptions = options;
+    for (auto name : _deprecatedRileyOptions) {
+        uint32_t paramId;
+        if (prunedOptions.GetParamId(name, paramId)) {
+            prunedOptions.Remove(paramId);
+        }
+    }
+
+    return prunedOptions;
+}
+
+RtParamList
+PruneBatchOnlyOptions(
+    const RtParamList &options)
+{
+    // The following should not be given to Riley::SetOptions()
+    // when doing an interactive render.
+    //
+    // XXX We use an explicit list here, but would it be better
+    // to do a prefix-check instead?
+    static std::vector<RtUString> const _batchOnlyRileyOptions = {
+        RixStr.k_checkpoint,
+        RixStr.k_checkpoint_asfinal,
+        RixStr.k_checkpoint_command,
+        RixStr.k_checkpoint_exitat,
+        RixStr.k_checkpoint_interval,
+        RixStr.k_checkpoint_keepfiles,
+        RixStr.k_exitat,
+        RixStr.k_statistics,
+        RixStr.k_statistics_displaceratios,
+        RixStr.k_statistics_endofframe,
+        RixStr.k_statistics_filename,
+        RixStr.k_statistics_level,
+        RixStr.k_statistics_maxdispwarnings,
+        RixStr.k_statistics_shaderprofile,
+        RixStr.k_statistics_stylesheet,
+        RixStr.k_statistics_texturestatslevel,
+        RixStr.k_statistics_xmlfilename
+        };
+
+    RtParamList prunedOptions = options;
+    for (auto name : _batchOnlyRileyOptions) {
+        uint32_t paramId;
+        if (prunedOptions.GetParamId(name, paramId)) {
+            prunedOptions.Remove(paramId);
+        }
+    }
+
+    return prunedOptions;
+}
+
+RtParamList
+GetDefaultRileyOptions()
+{
+    RtParamList options;
+
+    // Set default thread limit for Renderman. Leave a few threads for app.
+    {
+        const unsigned appThreads = 4;
+        const unsigned nThreads =
+            std::max(WorkGetConcurrencyLimit()-appThreads, 1u);
+        options.SetInteger(RixStr.k_limits_threads, nThreads);
+    }
+
+    // Path tracer default configuration. Values below may be overriden by
+    // those in the legacy render settings map and/or prim.
+    options.SetInteger(RixStr.k_hider_minsamples, 1);
+    options.SetInteger(RixStr.k_hider_maxsamples, 16);
+    options.SetInteger(RixStr.k_hider_incremental, 1);
+    options.SetInteger(RixStr.k_trace_maxdepth, 10);
+    options.SetFloat(RixStr.k_Ri_FormatPixelAspectRatio, 1.0f);
+    options.SetFloat(RixStr.k_Ri_PixelVariance, 0.001f);
+    options.SetString(RixStr.k_bucket_order, RtUString("circle"));
+    
+    float shutterInterval[2] = {
+        HDPRMAN_SHUTTEROPEN_DEFAULT,
+        HDPRMAN_SHUTTERCLOSE_DEFAULT
+    };
+    options.SetFloatArray(RixStr.k_Ri_Shutter, shutterInterval, 2);
+
+    return options;
+}
+
+RtParamList
+GetRileyOptionsFromEnvironment()
+{
+    RtParamList options;
+
+    const unsigned nThreadsEnv = TfGetEnvSetting(HD_PRMAN_NTHREADS);
+    if (nThreadsEnv > 0) {
+        options.SetInteger(RixStr.k_limits_threads, nThreadsEnv);
+    }
+
+    if (!TfGetEnvSetting(HD_PRMAN_ENABLE_MOTIONBLUR)) {
+        float shutterInterval[2] = { 0.0f, 0.0f };
+        options.SetFloatArray(RixStr.k_Ri_Shutter, shutterInterval, 2);
+    }
+
+    // OSL verbose
+    const int oslVerbose = TfGetEnvSetting(HD_PRMAN_OSL_VERBOSE);
+    if (oslVerbose > 0) {
+        options.SetInteger(RtUString("user:osl:verbose"), oslVerbose);
+    }
+
+    const bool disableJitter = TfGetEnvSetting(HD_PRMAN_DISABLE_HIDER_JITTER);
+    options.SetInteger(RixStr.k_hider_jitter, !disableJitter);
+
+    if (ArchHasEnv("HD_PRMAN_MAX_SAMPLES")) {
+        const int maxSamples = TfGetenvInt("HD_PRMAN_MAX_SAMPLES", 64);
+        options.SetInteger(RixStr.k_hider_maxsamples, maxSamples);
+    }
+
+    // Searchpaths (TEXTUREPATH, etc)
+    _UpdateSearchPathsFromEnvironment(options);
+
+    return options;
+}
+
+} // namespace HdPrman_Utils
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/utils.h b/third_party/renderman-26/plugin/hdPrman/utils.h
new file mode 100644
index 0000000000..42a445ba01
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/utils.h
@@ -0,0 +1,148 @@
+//
+// Copyright 2023 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UTILS_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UTILS_H
+
+#include "pxr/pxr.h"
+#include "pxr/base/gf/matrix4d.h"
+
+#include "pxr/imaging/hd/dataSource.h"
+
+#include "RiTypesHelper.h" // for RtParamList
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class TfToken;
+class SdfAssetPath;
+class VtValue;
+
+namespace HdPrman_Utils {
+
+/// Adds (or updates) a VtValue parameter to \p params and returns true if
+/// the parameter was set.
+bool
+SetParamFromVtValue(
+    RtUString const& name,
+    VtValue const& val,
+    TfToken const& role,
+    RtParamList *params);
+
+/// Similar to the function above, with the addition of \p detail, which 
+/// specifies how array values should be handled across topology.
+bool
+SetPrimVarFromVtValue(
+    RtUString const& name,
+    VtValue const& val,
+    RtDetailType const& detail,
+    TfToken const& role,
+    RtPrimVarList *params);
+
+/// Helper to convert matrix types, handling double->float conversion.
+inline RtMatrix4x4
+GfMatrixToRtMatrix(const GfMatrix4d &m)
+{
+    const double *d = m.GetArray();
+    return RtMatrix4x4(
+        d[0], d[1], d[2], d[3],
+        d[4], d[5], d[6], d[7],
+        d[8], d[9], d[10], d[11],
+        d[12], d[13], d[14], d[15]);
+}
+
+/// Helper to convert matrix types, handling float->double conversion.
+inline GfMatrix4d
+RtMatrixToGfMatrix(const RtMatrix4x4 &m)
+{
+    return GfMatrix4d(
+        m.m[0][0], m.m[0][1], m.m[0][2], m.m[0][3],
+        m.m[1][0], m.m[1][1], m.m[1][2], m.m[1][3],
+        m.m[2][0], m.m[2][1], m.m[2][2], m.m[2][3],
+        m.m[3][0], m.m[3][1], m.m[3][2], m.m[3][3]);
+}
+
+/// Attempt to extract a useful texture identifier from the given \p asset.
+/// If \p asset is determined to not be a .tex file, attempt to use the Hio
+/// based Rtx plugin to load the texture.  If \p asset is non-empty, we will
+/// always return _something_
+RtUString
+ResolveAssetToRtUString(
+    SdfAssetPath const &asset,
+    bool flipTexture = true,
+    char const *debugNodeType = nullptr);
+
+/// Some quantites previously given as options now need to be provided
+/// through different Riley APIs. This method returns a pruned
+/// copy of the options, to be provided to SetOptions().
+RtParamList
+PruneDeprecatedOptions(
+    const RtParamList &options);
+
+/// Some options, such as exitat, should only apply to a batch-mode render.
+/// This method returns a pruned copy of the options, removing those
+/// that should only be used in batch rendering.
+RtParamList
+PruneBatchOnlyOptions(
+    const RtParamList &options);
+
+/// Returns a small set of options for default path tracer configuration.
+RtParamList
+GetDefaultRileyOptions();
+
+/// Returns the options driven by environment variables.
+RtParamList
+GetRileyOptionsFromEnvironment();
+
+/// Missing from std until C++20
+template<typename T>
+struct remove_cvref
+{
+    typedef std::remove_cv_t<std::remove_reference_t<T>> type;
+};
+
+/// Missing from std until C++20
+template< class T >
+using remove_cvref_t = typename remove_cvref<T>::type;
+
+/// Return a new ParamList (or PrimVarList) by composing together all the given
+/// \p args, which must be of the same type. Where a given param or primvar is
+/// present in multiple lists in \p args, the opinion from the earliest such
+/// list wins. Each input list in \p args must be passable by reference and may
+/// be const or non-const.
+template <
+    typename ...Ts,
+    typename T = remove_cvref_t<std::tuple_element_t<0,std::tuple<Ts...>>>>
+T
+Compose(Ts&& ...args)
+{
+    static_assert(
+        std::conjunction<
+            std::disjunction<
+                std::is_same<RtParamList, T>, std::is_same<RtPrimVarList, T>>,
+            std::is_reference<Ts>...,
+            std::is_same<T, remove_cvref_t<Ts>>...>::value,
+        "Arguments must be all RtParamList& or all RtPrimVarList&");
+    const size_t n = sizeof...(Ts);
+    T result;
+    if (n == 0) {
+        return result;
+    }
+    std::vector<std::reference_wrapper<const T>> list
+        { std::forward<Ts>(args)... };
+    std::reverse(list.begin(), list.end());
+    for (const T& b : list) {
+        if (b.GetNumParams() != 0) {
+            result.Update(b);
+        }
+    }
+    return result;
+}
+
+} // namespace HdPrman_Utils
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_UTILS_H
diff --git a/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.lex.cpp b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.lex.cpp
new file mode 100644
index 0000000000..b820fad695
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.lex.cpp
@@ -0,0 +1,2186 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#line 3 "<stdout>"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 39
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* An opaque pointer. */
+#ifndef YY_TYPEDEF_YY_SCANNER_T
+#define YY_TYPEDEF_YY_SCANNER_T
+typedef void* yyscan_t;
+#endif
+
+/* For convenience, these vars (plus the bison vars far below)
+   are macros in the reentrant scanner. */
+#define yyin yyg->yyin_r
+#define yyout yyg->yyout_r
+#define yyextra yyg->yyextra_r
+#define yyleng yyg->yyleng_r
+#define yytext yyg->yytext_r
+#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
+#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
+#define yy_flex_debug yyg->yy_flex_debug_r
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN yyg->yy_start = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START ((yyg->yy_start - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE virtualStructConditionalGrammarYyrestart(yyin ,yyscanner )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = yyg->yy_hold_char; \
+		YY_RESTORE_YY_MORE_OFFSET \
+		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via virtualStructConditionalGrammarYyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
+                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
+
+void virtualStructConditionalGrammarYyrestart (FILE *input_file ,yyscan_t yyscanner );
+void virtualStructConditionalGrammarYy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
+void virtualStructConditionalGrammarYy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
+void virtualStructConditionalGrammarYy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
+void virtualStructConditionalGrammarYypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+void virtualStructConditionalGrammarYypop_buffer_state (yyscan_t yyscanner );
+
+static void virtualStructConditionalGrammarYyensure_buffer_stack (yyscan_t yyscanner );
+static void virtualStructConditionalGrammarYy_load_buffer_state (yyscan_t yyscanner );
+static void virtualStructConditionalGrammarYy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
+
+#define YY_FLUSH_BUFFER virtualStructConditionalGrammarYy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
+
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
+
+void *virtualStructConditionalGrammarYyalloc (yy_size_t ,yyscan_t yyscanner );
+void *virtualStructConditionalGrammarYyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
+void virtualStructConditionalGrammarYyfree (void * ,yyscan_t yyscanner );
+
+#define yy_new_buffer virtualStructConditionalGrammarYy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        virtualStructConditionalGrammarYyensure_buffer_stack (yyscanner); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            virtualStructConditionalGrammarYy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        virtualStructConditionalGrammarYyensure_buffer_stack (yyscanner); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            virtualStructConditionalGrammarYy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+typedef unsigned char YY_CHAR;
+
+typedef int yy_state_type;
+
+#define yytext_ptr yytext_r
+
+static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
+static int yy_get_next_buffer (yyscan_t yyscanner );
+static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	yyg->yytext_ptr = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	yyg->yy_hold_char = *yy_cp; \
+	*yy_cp = '\0'; \
+	yyg->yy_c_buf_p = yy_cp;
+
+#define YY_NUM_RULES 27
+#define YY_END_OF_BUFFER 28
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[86] =
+    {   0,
+        0,    0,   28,   26,   25,   25,   26,   26,   26,   17,
+       18,   26,   26,   12,   22,   26,   21,   16,   16,   16,
+       16,   16,   16,   16,   20,    0,   14,    0,    0,   13,
+        0,    0,   12,   12,   12,    0,   24,   19,   23,   16,
+        0,   16,   16,   16,    4,   16,    1,    3,   16,    0,
+       12,    0,    0,   12,    0,    2,   16,   16,   16,   16,
+        0,    9,    0,   12,    0,    0,   12,   15,   16,    8,
+        5,   16,    0,    0,   12,   16,   16,    0,   16,   10,
+        7,   11,   16,    6,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        2,    2,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    4,    5,    6,    1,    1,    1,    1,    7,    8,
+        9,    1,   10,    1,   11,   12,    1,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,    1,    1,   14,
+       15,   16,    1,    1,   17,   17,   17,   17,   18,   17,
+       17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
+       17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
+       19,   20,   21,    1,   17,    1,   22,   17,   23,   24,
+
+       25,   26,   27,   17,   28,   17,   17,   29,   17,   30,
+       31,   32,   17,   33,   34,   35,   17,   17,   17,   17,
+       36,   17,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[37] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    2,    1,    1,    1,    2,    2,    2,    1,
+        1,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,    2,    2
+    } ;
+
+static yyconst flex_int16_t yy_base[89] =
+    {   0,
+        0,    0,  162,  163,  163,  163,  146,   31,   32,  163,
+      163,   28,  147,   30,  144,  143,  142,  137,   19,   25,
+       28,   27,   26,   39,  163,   54,  163,  152,   43,  163,
+      151,  140,   53,   54,   55,   71,  163,  163,  163,  133,
+      138,   51,   57,   43,  131,   64,   81,  130,   67,   80,
+       79,   85,  135,  134,   86,  127,   82,   69,   84,   87,
+      115,  125,  130,  129,  100,  128,  127,  163,   89,  115,
+      114,   96,  101,  118,  115,   97,   98,   91,  100,  105,
+      163,  102,  106,  103,  163,  135,  137,   67
+    } ;
+
+static yyconst flex_int16_t yy_def[89] =
+    {   0,
+       85,    1,   85,   85,   85,   85,   85,   86,   87,   85,
+       85,   85,   85,   85,   85,   85,   85,   88,   88,   88,
+       88,   88,   88,   88,   85,   86,   85,   86,   87,   85,
+       87,   85,   85,   85,   85,   85,   85,   85,   85,   88,
+       85,   88,   88,   88,   88,   88,   88,   88,   88,   85,
+       85,   85,   85,   85,   85,   88,   88,   88,   88,   88,
+       85,   88,   85,   85,   85,   85,   85,   85,   88,   88,
+       88,   88,   85,   85,   85,   88,   88,   85,   88,   88,
+       85,   88,   88,   88,    0,   85,   85,   85
+    } ;
+
+static yyconst flex_int16_t yy_nxt[200] =
+    {   0,
+        4,    5,    6,    5,    7,    8,    9,   10,   11,    4,
+       12,   13,   14,   15,   16,   17,   18,   18,    4,    4,
+        4,   19,   20,   18,   21,   18,   18,   22,   18,   18,
+       23,   18,   18,   24,   18,   18,   27,   41,   30,   32,
+       33,   35,   33,   41,   41,   41,   41,   36,   42,   30,
+       28,   31,   45,   46,   36,   43,   44,   41,   48,   27,
+       47,   41,   31,   49,   35,   33,   34,   51,   40,   41,
+       36,   50,   52,   28,   56,   41,   59,   36,   50,   52,
+       53,   53,   41,   54,   61,   41,   57,   41,   58,   63,
+       63,   51,   64,   60,   66,   66,   65,   67,   55,   41,
+
+       41,   62,   41,   65,   70,   41,   68,   41,   71,   74,
+       74,   69,   75,   76,   41,   41,   41,   72,   41,   79,
+       41,   41,   80,   41,   41,   81,   83,   75,   77,   84,
+       75,   78,   41,   41,   82,   26,   26,   29,   29,   67,
+       67,   64,   64,   41,   73,   41,   54,   54,   41,   41,
+       55,   41,   34,   85,   85,   41,   39,   38,   37,   34,
+       25,   85,    3,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85
+
+    } ;
+
+static yyconst flex_int16_t yy_chk[200] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    8,   19,    9,   12,
+       12,   14,   14,   20,   23,   22,   21,   14,   19,   29,
+        8,    9,   22,   22,   14,   20,   21,   24,   23,   26,
+       22,   44,   29,   24,   33,   33,   34,   35,   88,   42,
+       33,   34,   35,   26,   42,   43,   44,   33,   34,   35,
+       36,   36,   46,   36,   47,   49,   43,   58,   43,   50,
+       50,   51,   50,   46,   52,   52,   51,   52,   55,   47,
+
+       57,   49,   59,   51,   58,   60,   55,   69,   59,   65,
+       65,   57,   65,   69,   72,   76,   77,   60,   79,   76,
+       82,   84,   77,   80,   83,   78,   82,   75,   72,   83,
+       74,   73,   71,   70,   79,   86,   86,   87,   87,   67,
+       66,   64,   63,   62,   61,   56,   54,   53,   48,   45,
+       41,   40,   32,   31,   28,   18,   17,   16,   15,   13,
+        7,    3,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   85,   85,   85
+
+    } ;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+#line 1 "hdPrman/virtualStructConditionalGrammar.ll"
+#line 2 "hdPrman/virtualStructConditionalGrammar.ll"
+//
+// Copyright 2019 Pixar
+//
+// with the following modification; you may not use this file except in
+// compliance with the Apache License and the following modification to it:
+// Section 6. Trademarks. is deleted and replaced with:
+//
+// 6. Trademarks. This License does not grant permission to use the trade
+//    names, trademarks, service marks, or product names of the Licensor
+//    and its affiliates, except as required to comply with Section 4(c) of
+//    the License and to reproduce the content of the NOTICE file.
+//
+// You may obtain a copy of the Apache License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Apache License with the above modification is
+// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the Apache License for the specific
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/pxr.h"
+#include "pxr/base/arch/fileSystem.h"
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+
+#include "virtualStructConditionalGrammar.tab.h"
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+struct _VSCGParserData;
+
+#ifndef fileno
+#define fileno(fd) ArchFileNo(fd)
+#endif
+#ifndef isatty
+#define isatty(fd) ArchFileIsaTTY(fd)
+#endif
+
+#line 543 "<stdout>"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* Holds the entire state of the reentrant scanner. */
+struct yyguts_t
+    {
+
+    /* User-defined. Not touched by flex. */
+    YY_EXTRA_TYPE yyextra_r;
+
+    /* The rest are the same as the globals declared in the non-reentrant scanner. */
+    FILE *yyin_r, *yyout_r;
+    size_t yy_buffer_stack_top; /**< index of top of stack. */
+    size_t yy_buffer_stack_max; /**< capacity of stack. */
+    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
+    char yy_hold_char;
+    yy_size_t yy_n_chars;
+    yy_size_t yyleng_r;
+    char *yy_c_buf_p;
+    int yy_init;
+    int yy_start;
+    int yy_did_buffer_switch_on_eof;
+    int yy_start_stack_ptr;
+    int yy_start_stack_depth;
+    int *yy_start_stack;
+    yy_state_type yy_last_accepting_state;
+    char* yy_last_accepting_cpos;
+
+    int yylineno_r;
+    int yy_flex_debug_r;
+
+    char *yytext_r;
+    int yy_more_flag;
+    int yy_more_len;
+
+    YYSTYPE * yylval_r;
+
+    YYLTYPE * yylloc_r;
+
+    }; /* end struct yyguts_t */
+
+static int yy_init_globals (yyscan_t yyscanner );
+
+    /* This must go here because YYSTYPE and YYLTYPE are included
+     * from bison output in section 1.*/
+    #    define yylval yyg->yylval_r
+    
+    #    define yylloc yyg->yylloc_r
+    
+int virtualStructConditionalGrammarYylex_init (yyscan_t* scanner);
+
+int virtualStructConditionalGrammarYylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int virtualStructConditionalGrammarYylex_destroy (yyscan_t yyscanner );
+
+int virtualStructConditionalGrammarYyget_debug (yyscan_t yyscanner );
+
+void virtualStructConditionalGrammarYyset_debug (int debug_flag ,yyscan_t yyscanner );
+
+YY_EXTRA_TYPE virtualStructConditionalGrammarYyget_extra (yyscan_t yyscanner );
+
+void virtualStructConditionalGrammarYyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
+
+FILE *virtualStructConditionalGrammarYyget_in (yyscan_t yyscanner );
+
+void virtualStructConditionalGrammarYyset_in  (FILE * in_str ,yyscan_t yyscanner );
+
+FILE *virtualStructConditionalGrammarYyget_out (yyscan_t yyscanner );
+
+void virtualStructConditionalGrammarYyset_out  (FILE * out_str ,yyscan_t yyscanner );
+
+yy_size_t virtualStructConditionalGrammarYyget_leng (yyscan_t yyscanner );
+
+char *virtualStructConditionalGrammarYyget_text (yyscan_t yyscanner );
+
+int virtualStructConditionalGrammarYyget_lineno (yyscan_t yyscanner );
+
+void virtualStructConditionalGrammarYyset_lineno (int line_number ,yyscan_t yyscanner );
+
+int virtualStructConditionalGrammarYyget_column  (yyscan_t yyscanner );
+
+void virtualStructConditionalGrammarYyset_column (int column_no ,yyscan_t yyscanner );
+
+YYSTYPE * virtualStructConditionalGrammarYyget_lval (yyscan_t yyscanner );
+
+void virtualStructConditionalGrammarYyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
+
+       YYLTYPE *virtualStructConditionalGrammarYyget_lloc (yyscan_t yyscanner );
+    
+        void virtualStructConditionalGrammarYyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
+    
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int virtualStructConditionalGrammarYywrap (yyscan_t yyscanner );
+#else
+extern int virtualStructConditionalGrammarYywrap (yyscan_t yyscanner );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (yyscan_t yyscanner );
+#else
+static int input (yyscan_t yyscanner );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( yyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int virtualStructConditionalGrammarYylex \
+               (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
+
+#define YY_DECL int virtualStructConditionalGrammarYylex \
+               (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+    yylval = yylval_param;
+
+    yylloc = yylloc_param;
+
+	if ( !yyg->yy_init )
+		{
+		yyg->yy_init = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! yyg->yy_start )
+			yyg->yy_start = 1;	/* first start state */
+
+		if ( ! yyin )
+			yyin = stdin;
+
+		if ( ! yyout )
+			yyout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			virtualStructConditionalGrammarYyensure_buffer_stack (yyscanner);
+			YY_CURRENT_BUFFER_LVALUE =
+				virtualStructConditionalGrammarYy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+		}
+
+		virtualStructConditionalGrammarYy_load_buffer_state(yyscanner );
+		}
+
+	{
+#line 60 "hdPrman/virtualStructConditionalGrammar.ll"
+
+
+#line 820 "<stdout>"
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = yyg->yy_c_buf_p;
+
+		/* Support of yytext. */
+		*yy_cp = yyg->yy_hold_char;
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = yyg->yy_start;
+yy_match:
+		do
+			{
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+			if ( yy_accept[yy_current_state] )
+				{
+				yyg->yy_last_accepting_state = yy_current_state;
+				yyg->yy_last_accepting_cpos = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 86 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 163 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = yyg->yy_last_accepting_cpos;
+			yy_current_state = yyg->yy_last_accepting_state;
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = yyg->yy_hold_char;
+			yy_cp = yyg->yy_last_accepting_cpos;
+			yy_current_state = yyg->yy_last_accepting_state;
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 62 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_IS;}
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 63 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_AND;}
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 64 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_OR;}
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 66 "hdPrman/virtualStructConditionalGrammar.ll"
+{return KW_IF;}
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 67 "hdPrman/virtualStructConditionalGrammar.ll"
+{return KW_ELSE;}
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 68 "hdPrman/virtualStructConditionalGrammar.ll"
+{return KW_CONNECTED;}
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 70 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_ISNOT;}
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 72 "hdPrman/virtualStructConditionalGrammar.ll"
+{return KW_COPY;}
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 73 "hdPrman/virtualStructConditionalGrammar.ll"
+{return KW_SET;}
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 74 "hdPrman/virtualStructConditionalGrammar.ll"
+{return KW_IGNORE;}
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 75 "hdPrman/virtualStructConditionalGrammar.ll"
+{return KW_CONNECT;}
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 80 "hdPrman/virtualStructConditionalGrammar.ll"
+{
+    yylval->string = strdup(virtualStructConditionalGrammarYyget_text(yyscanner));
+    return NUMBER;
+}
+	YY_BREAK
+case 13:
+/* rule 13 can match eol */
+YY_RULE_SETUP
+#line 85 "hdPrman/virtualStructConditionalGrammar.ll"
+{
+    char * str = virtualStructConditionalGrammarYyget_text(yyscanner);
+    yylval->string = strdup(str+1);
+    yylval->string[strlen(str)-2] = '\0';
+    return STRING;
+}
+	YY_BREAK
+case 14:
+/* rule 14 can match eol */
+YY_RULE_SETUP
+#line 92 "hdPrman/virtualStructConditionalGrammar.ll"
+{
+    char * str = virtualStructConditionalGrammarYyget_text(yyscanner);
+    yylval->string = strdup(str+1);
+    yylval->string[strlen(str)-2] = '\0';
+    return STRING;
+}
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 99 "hdPrman/virtualStructConditionalGrammar.ll"
+{
+    yylval->string = strdup(virtualStructConditionalGrammarYyget_text(yyscanner));
+    return PARAM;
+}
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 104 "hdPrman/virtualStructConditionalGrammar.ll"
+{
+    yylval->string = strdup(virtualStructConditionalGrammarYyget_text(yyscanner));
+    return PARAM;
+}
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 109 "hdPrman/virtualStructConditionalGrammar.ll"
+{return LPAR;}
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 110 "hdPrman/virtualStructConditionalGrammar.ll"
+{return RPAR;}
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 112 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_EQ;}
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 113 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_NOTEQ;}
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 114 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_GT;}
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 115 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_LT;}
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 116 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_GTEQ;}
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 117 "hdPrman/virtualStructConditionalGrammar.ll"
+{return OP_LTEQ;}
+	YY_BREAK
+case 25:
+/* rule 25 can match eol */
+YY_RULE_SETUP
+#line 119 "hdPrman/virtualStructConditionalGrammar.ll"
+{}
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 121 "hdPrman/virtualStructConditionalGrammar.ll"
+{return UNRECOGNIZED_TOKEN;}
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 123 "hdPrman/virtualStructConditionalGrammar.ll"
+ECHO;
+	YY_BREAK
+#line 1034 "<stdout>"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = yyg->yy_hold_char;
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyin at a new source and called
+			 * virtualStructConditionalGrammarYylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state( yyscanner );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
+
+			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++yyg->yy_c_buf_p;
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = yyg->yy_c_buf_p;
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer( yyscanner ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				yyg->yy_did_buffer_switch_on_eof = 0;
+
+				if ( virtualStructConditionalGrammarYywrap(yyscanner ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! yyg->yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				yyg->yy_c_buf_p =
+					yyg->yytext_ptr + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state( yyscanner );
+
+				yy_cp = yyg->yy_c_buf_p;
+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				yyg->yy_c_buf_p =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
+
+				yy_current_state = yy_get_previous_state( yyscanner );
+
+				yy_cp = yyg->yy_c_buf_p;
+				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+	} /* end of user's declarations */
+} /* end of virtualStructConditionalGrammarYylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = yyg->yytext_ptr;
+	int number_to_move, i;
+	int ret_val;
+
+	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+			int yy_c_buf_p_offset =
+				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					virtualStructConditionalGrammarYyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			yyg->yy_n_chars, num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	if ( yyg->yy_n_chars == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			virtualStructConditionalGrammarYyrestart(yyin  ,yyscanner);
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) virtualStructConditionalGrammarYyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	yyg->yy_n_chars += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+
+	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
+{
+	yy_state_type yy_current_state;
+	char *yy_cp;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	yy_current_state = yyg->yy_start;
+
+	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
+		{
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			yyg->yy_last_accepting_state = yy_current_state;
+			yyg->yy_last_accepting_cpos = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 86 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
+{
+	int yy_is_jam;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
+	char *yy_cp = yyg->yy_c_buf_p;
+
+	YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		yyg->yy_last_accepting_state = yy_current_state;
+		yyg->yy_last_accepting_cpos = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 86 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 85);
+
+	(void)yyg;
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (yyscan_t yyscanner)
+#else
+    static int input  (yyscan_t yyscanner)
+#endif
+
+{
+	int c;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	*yyg->yy_c_buf_p = yyg->yy_hold_char;
+
+	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+			/* This was really a NUL. */
+			*yyg->yy_c_buf_p = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+			++yyg->yy_c_buf_p;
+
+			switch ( yy_get_next_buffer( yyscanner ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					virtualStructConditionalGrammarYyrestart(yyin ,yyscanner);
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( virtualStructConditionalGrammarYywrap(yyscanner ) )
+						return EOF;
+
+					if ( ! yyg->yy_did_buffer_switch_on_eof )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput(yyscanner);
+#else
+					return input(yyscanner);
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
+	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
+	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * @param yyscanner The scanner object.
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void virtualStructConditionalGrammarYyrestart  (FILE * input_file , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if ( ! YY_CURRENT_BUFFER ){
+        virtualStructConditionalGrammarYyensure_buffer_stack (yyscanner);
+		YY_CURRENT_BUFFER_LVALUE =
+            virtualStructConditionalGrammarYy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+	}
+
+	virtualStructConditionalGrammarYy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
+	virtualStructConditionalGrammarYy_load_buffer_state(yyscanner );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * @param yyscanner The scanner object.
+ */
+    void virtualStructConditionalGrammarYy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		virtualStructConditionalGrammarYypop_buffer_state();
+	 *		virtualStructConditionalGrammarYypush_buffer_state(new_buffer);
+     */
+	virtualStructConditionalGrammarYyensure_buffer_stack (yyscanner);
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*yyg->yy_c_buf_p = yyg->yy_hold_char;
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	virtualStructConditionalGrammarYy_load_buffer_state(yyscanner );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (virtualStructConditionalGrammarYywrap()) processing, but the only time this flag
+	 * is looked at is after virtualStructConditionalGrammarYywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	yyg->yy_did_buffer_switch_on_eof = 1;
+}
+
+static void virtualStructConditionalGrammarYy_load_buffer_state  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	yyg->yy_hold_char = *yyg->yy_c_buf_p;
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * @param yyscanner The scanner object.
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE virtualStructConditionalGrammarYy_create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) virtualStructConditionalGrammarYyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in virtualStructConditionalGrammarYy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) virtualStructConditionalGrammarYyalloc(b->yy_buf_size + 2 ,yyscanner );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in virtualStructConditionalGrammarYy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	virtualStructConditionalGrammarYy_init_buffer(b,file ,yyscanner);
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with virtualStructConditionalGrammarYy_create_buffer()
+ * @param yyscanner The scanner object.
+ */
+    void virtualStructConditionalGrammarYy_delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		virtualStructConditionalGrammarYyfree((void *) b->yy_ch_buf ,yyscanner );
+
+	virtualStructConditionalGrammarYyfree((void *) b ,yyscanner );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a virtualStructConditionalGrammarYyrestart() or at EOF.
+ */
+    static void virtualStructConditionalGrammarYy_init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
+
+{
+	int oerrno = errno;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	virtualStructConditionalGrammarYy_flush_buffer(b ,yyscanner);
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then virtualStructConditionalGrammarYy_init_buffer was _probably_
+     * called from virtualStructConditionalGrammarYyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * @param yyscanner The scanner object.
+ */
+    void virtualStructConditionalGrammarYy_flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		virtualStructConditionalGrammarYy_load_buffer_state(yyscanner );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  @param yyscanner The scanner object.
+ */
+void virtualStructConditionalGrammarYypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if (new_buffer == NULL)
+		return;
+
+	virtualStructConditionalGrammarYyensure_buffer_stack(yyscanner);
+
+	/* This block is copied from virtualStructConditionalGrammarYy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*yyg->yy_c_buf_p = yyg->yy_hold_char;
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		yyg->yy_buffer_stack_top++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from virtualStructConditionalGrammarYy_switch_to_buffer. */
+	virtualStructConditionalGrammarYy_load_buffer_state(yyscanner );
+	yyg->yy_did_buffer_switch_on_eof = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  @param yyscanner The scanner object.
+ */
+void virtualStructConditionalGrammarYypop_buffer_state (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+	if (!YY_CURRENT_BUFFER)
+		return;
+
+	virtualStructConditionalGrammarYy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if (yyg->yy_buffer_stack_top > 0)
+		--yyg->yy_buffer_stack_top;
+
+	if (YY_CURRENT_BUFFER) {
+		virtualStructConditionalGrammarYy_load_buffer_state(yyscanner );
+		yyg->yy_did_buffer_switch_on_eof = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void virtualStructConditionalGrammarYyensure_buffer_stack (yyscan_t yyscanner)
+{
+	yy_size_t num_to_alloc;
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+	if (!yyg->yy_buffer_stack) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		yyg->yy_buffer_stack = (struct yy_buffer_state**)virtualStructConditionalGrammarYyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								, yyscanner);
+		if ( ! yyg->yy_buffer_stack )
+			YY_FATAL_ERROR( "out of dynamic memory in virtualStructConditionalGrammarYyensure_buffer_stack()" );
+								  
+		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		yyg->yy_buffer_stack_max = num_to_alloc;
+		yyg->yy_buffer_stack_top = 0;
+		return;
+	}
+
+	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
+		yyg->yy_buffer_stack = (struct yy_buffer_state**)virtualStructConditionalGrammarYyrealloc
+								(yyg->yy_buffer_stack,
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								, yyscanner);
+		if ( ! yyg->yy_buffer_stack )
+			YY_FATAL_ERROR( "out of dynamic memory in virtualStructConditionalGrammarYyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
+		yyg->yy_buffer_stack_max = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) virtualStructConditionalGrammarYyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in virtualStructConditionalGrammarYy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	virtualStructConditionalGrammarYy_switch_to_buffer(b ,yyscanner );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to virtualStructConditionalGrammarYylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       virtualStructConditionalGrammarYy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
+{
+    
+	return virtualStructConditionalGrammarYy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to virtualStructConditionalGrammarYylex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yyscanner The scanner object.
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len , yyscan_t yyscanner)
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	yy_size_t i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) virtualStructConditionalGrammarYyalloc(n ,yyscanner );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in virtualStructConditionalGrammarYy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = virtualStructConditionalGrammarYy_scan_buffer(buf,n ,yyscanner);
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in virtualStructConditionalGrammarYy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = yyg->yy_hold_char; \
+		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
+		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
+		*yyg->yy_c_buf_p = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the user-defined data for this scanner.
+ * @param yyscanner The scanner object.
+ */
+YY_EXTRA_TYPE virtualStructConditionalGrammarYyget_extra  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyextra;
+}
+
+/** Get the current line number.
+ * @param yyscanner The scanner object.
+ */
+int virtualStructConditionalGrammarYyget_lineno  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    
+        if (! YY_CURRENT_BUFFER)
+            return 0;
+    
+    return yylineno;
+}
+
+/** Get the current column number.
+ * @param yyscanner The scanner object.
+ */
+int virtualStructConditionalGrammarYyget_column  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    
+        if (! YY_CURRENT_BUFFER)
+            return 0;
+    
+    return yycolumn;
+}
+
+/** Get the input stream.
+ * @param yyscanner The scanner object.
+ */
+FILE *virtualStructConditionalGrammarYyget_in  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyin;
+}
+
+/** Get the output stream.
+ * @param yyscanner The scanner object.
+ */
+FILE *virtualStructConditionalGrammarYyget_out  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyout;
+}
+
+/** Get the length of the current token.
+ * @param yyscanner The scanner object.
+ */
+yy_size_t virtualStructConditionalGrammarYyget_leng  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yyleng;
+}
+
+/** Get the current token.
+ * @param yyscanner The scanner object.
+ */
+
+char *virtualStructConditionalGrammarYyget_text  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yytext;
+}
+
+/** Set the user-defined data. This data is never touched by the scanner.
+ * @param user_defined The data to be associated with this scanner.
+ * @param yyscanner The scanner object.
+ */
+void virtualStructConditionalGrammarYyset_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyextra = user_defined ;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * @param yyscanner The scanner object.
+ */
+void virtualStructConditionalGrammarYyset_lineno (int  line_number , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+        /* lineno is only valid if an input buffer exists. */
+        if (! YY_CURRENT_BUFFER )
+           YY_FATAL_ERROR( "virtualStructConditionalGrammarYyset_lineno called with no buffer" );
+    
+    yylineno = line_number;
+}
+
+/** Set the current column.
+ * @param line_number
+ * @param yyscanner The scanner object.
+ */
+void virtualStructConditionalGrammarYyset_column (int  column_no , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+        /* column is only valid if an input buffer exists. */
+        if (! YY_CURRENT_BUFFER )
+           YY_FATAL_ERROR( "virtualStructConditionalGrammarYyset_column called with no buffer" );
+    
+    yycolumn = column_no;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * @param yyscanner The scanner object.
+ * @see virtualStructConditionalGrammarYy_switch_to_buffer
+ */
+void virtualStructConditionalGrammarYyset_in (FILE *  in_str , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyin = in_str ;
+}
+
+void virtualStructConditionalGrammarYyset_out (FILE *  out_str , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yyout = out_str ;
+}
+
+int virtualStructConditionalGrammarYyget_debug  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yy_flex_debug;
+}
+
+void virtualStructConditionalGrammarYyset_debug (int  bdebug , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yy_flex_debug = bdebug ;
+}
+
+/* Accessor methods for yylval and yylloc */
+
+YYSTYPE * virtualStructConditionalGrammarYyget_lval  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yylval;
+}
+
+void virtualStructConditionalGrammarYyset_lval (YYSTYPE *  yylval_param , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yylval = yylval_param;
+}
+
+YYLTYPE *virtualStructConditionalGrammarYyget_lloc  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    return yylloc;
+}
+    
+void virtualStructConditionalGrammarYyset_lloc (YYLTYPE *  yylloc_param , yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    yylloc = yylloc_param;
+}
+    
+/* User-visible API */
+
+/* virtualStructConditionalGrammarYylex_init is special because it creates the scanner itself, so it is
+ * the ONLY reentrant function that doesn't take the scanner as the last argument.
+ * That's why we explicitly handle the declaration, instead of using our macros.
+ */
+
+int virtualStructConditionalGrammarYylex_init(yyscan_t* ptr_yy_globals)
+
+{
+    if (ptr_yy_globals == NULL){
+        errno = EINVAL;
+        return 1;
+    }
+
+    *ptr_yy_globals = (yyscan_t) virtualStructConditionalGrammarYyalloc ( sizeof( struct yyguts_t ), NULL );
+
+    if (*ptr_yy_globals == NULL){
+        errno = ENOMEM;
+        return 1;
+    }
+
+    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
+
+    return yy_init_globals ( *ptr_yy_globals );
+}
+
+/* virtualStructConditionalGrammarYylex_init_extra has the same functionality as virtualStructConditionalGrammarYylex_init, but follows the
+ * convention of taking the scanner as the last argument. Note however, that
+ * this is a *pointer* to a scanner, as it will be allocated by this call (and
+ * is the reason, too, why this function also must handle its own declaration).
+ * The user defined value in the first argument will be available to virtualStructConditionalGrammarYyalloc in
+ * the yyextra field.
+ */
+
+int virtualStructConditionalGrammarYylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
+
+{
+    struct yyguts_t dummy_yyguts;
+
+    virtualStructConditionalGrammarYyset_extra (yy_user_defined, &dummy_yyguts);
+
+    if (ptr_yy_globals == NULL){
+        errno = EINVAL;
+        return 1;
+    }
+	
+    *ptr_yy_globals = (yyscan_t) virtualStructConditionalGrammarYyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
+	
+    if (*ptr_yy_globals == NULL){
+        errno = ENOMEM;
+        return 1;
+    }
+    
+    /* By setting to 0xAA, we expose bugs in
+    yy_init_globals. Leave at 0x00 for releases. */
+    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
+    
+    virtualStructConditionalGrammarYyset_extra (yy_user_defined, *ptr_yy_globals);
+    
+    return yy_init_globals ( *ptr_yy_globals );
+}
+
+static int yy_init_globals (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+    /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from virtualStructConditionalGrammarYylex_destroy(), so don't allocate here.
+     */
+
+    yyg->yy_buffer_stack = 0;
+    yyg->yy_buffer_stack_top = 0;
+    yyg->yy_buffer_stack_max = 0;
+    yyg->yy_c_buf_p = (char *) 0;
+    yyg->yy_init = 0;
+    yyg->yy_start = 0;
+
+    yyg->yy_start_stack_ptr = 0;
+    yyg->yy_start_stack_depth = 0;
+    yyg->yy_start_stack =  NULL;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * virtualStructConditionalGrammarYylex_init()
+     */
+    return 0;
+}
+
+/* virtualStructConditionalGrammarYylex_destroy is for both reentrant and non-reentrant scanners. */
+int virtualStructConditionalGrammarYylex_destroy  (yyscan_t yyscanner)
+{
+    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		virtualStructConditionalGrammarYy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		virtualStructConditionalGrammarYypop_buffer_state(yyscanner);
+	}
+
+	/* Destroy the stack itself. */
+	virtualStructConditionalGrammarYyfree(yyg->yy_buffer_stack ,yyscanner);
+	yyg->yy_buffer_stack = NULL;
+
+    /* Destroy the start condition stack. */
+        virtualStructConditionalGrammarYyfree(yyg->yy_start_stack ,yyscanner );
+        yyg->yy_start_stack = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * virtualStructConditionalGrammarYylex() is called, initialization will occur. */
+    yy_init_globals( yyscanner);
+
+    /* Destroy the main struct (reentrant only). */
+    virtualStructConditionalGrammarYyfree ( yyscanner , yyscanner );
+    yyscanner = NULL;
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
+{
+	int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
+{
+	int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *virtualStructConditionalGrammarYyalloc (yy_size_t  size , yyscan_t yyscanner)
+{
+	return (void *) malloc( size );
+}
+
+void *virtualStructConditionalGrammarYyrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void virtualStructConditionalGrammarYyfree (void * ptr , yyscan_t yyscanner)
+{
+	free( (char *) ptr );	/* see virtualStructConditionalGrammarYyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 123 "hdPrman/virtualStructConditionalGrammar.ll"
+
+
+
+int virtualStructConditionalGrammarYywrap(yyscan_t yyscanner)
+{
+    return 1;
+}
+
diff --git a/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.ll b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.ll
new file mode 100644
index 0000000000..567a733544
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.ll
@@ -0,0 +1,111 @@
+%{
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "pxr/pxr.h"
+#include "pxr/base/arch/fileSystem.h"
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+
+#include "virtualStructConditionalGrammar.tab.h"
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+struct _VSCGParserData;
+
+#ifndef fileno
+#define fileno(fd) ArchFileNo(fd)
+#endif
+#ifndef isatty
+#define isatty(fd) ArchFileIsaTTY(fd)
+#endif
+
+%}
+
+%option noyy_top_state
+%option reentrant
+%option bison-bridge bison-locations
+%option nounput
+%option prefix="virtualStructConditionalGrammarYy"
+
+D           [0-9]
+L           [a-zA-Z_]
+H           [a-fA-F0-9]
+E           [Ee][+-]?{D}+
+
+ID           ({L}({L}|{D})*)
+
+%%
+
+"is"    {return OP_IS;}
+"and"   {return OP_AND;}
+"or"    {return OP_OR;}
+
+"if"        {return KW_IF;}
+"else"      {return KW_ELSE;}
+"connected" {return KW_CONNECTED;}
+
+"is not" {return OP_ISNOT;}
+
+"copy" {return KW_COPY;}
+"set" {return KW_SET;}
+"ignore" {return KW_IGNORE;}
+"connect" {return KW_CONNECT;}
+
+
+
+
+-?{D}+|-?{D}+{E}|-?{D}*"."{D}+({E})?|-?{D}+"."{D}*({E})?  {
+    yylval->string = strdup(yyget_text(yyscanner));
+    return NUMBER;
+}
+
+'(\\.|[^\\'])*'   {
+    char * str = yyget_text(yyscanner);
+    yylval->string = strdup(str+1);
+    yylval->string[strlen(str)-2] = '\0';
+    return STRING;
+}
+
+\"(\\.|[^\\"])*\" {
+    char * str = yyget_text(yyscanner);
+    yylval->string = strdup(str+1);
+    yylval->string[strlen(str)-2] = '\0';
+    return STRING;
+}
+
+{ID}\[{D}+\] {
+    yylval->string = strdup(yyget_text(yyscanner));
+    return PARAM;
+}
+
+{ID} {
+    yylval->string = strdup(yyget_text(yyscanner));
+    return PARAM;
+}
+
+"(" {return LPAR;}
+")" {return RPAR;}
+
+"==" {return OP_EQ;}
+"!=" {return OP_NOTEQ;}
+">" {return OP_GT;}
+"<" {return OP_LT;}
+">=" {return OP_GTEQ;}
+"<=" {return OP_LTEQ;}
+
+[ \t\v\n\f]     {}
+
+. {return UNRECOGNIZED_TOKEN;}
+
+%%
+
+int virtualStructConditionalGrammarYywrap(yyscan_t yyscanner)
+{
+    return 1;
+}
diff --git a/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.tab.cpp b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.tab.cpp
new file mode 100644
index 0000000000..2be51903bd
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.tab.cpp
@@ -0,0 +1,4077 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.4.1"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 1
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+/* Using locations.  */
+#define YYLSP_NEEDED 1
+
+/* Substitute the variable and function names.  */
+#define yyparse         virtualStructConditionalGrammarYyparse
+#define yylex           virtualStructConditionalGrammarYylex
+#define yyerror         virtualStructConditionalGrammarYyerror
+#define yylval          virtualStructConditionalGrammarYylval
+#define yychar          virtualStructConditionalGrammarYychar
+#define yydebug         virtualStructConditionalGrammarYydebug
+#define yynerrs         virtualStructConditionalGrammarYynerrs
+#define yylloc          virtualStructConditionalGrammarYylloc
+
+/* Copy the first part of user declarations.  */
+
+/* Line 189 of yacc.c  */
+#line 30 "hdPrman/virtualStructConditionalGrammar.yy"
+
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <math.h>
+#include <iostream>
+#include <sstream>
+#include <vector>
+
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/matfiltResolveVstructs.h"
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/material.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/usd/sdr/registry.h"
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+// ---------------------------------------------------------------------------
+
+struct _VSCGConditionalBase
+{
+    virtual ~_VSCGConditionalBase() = default;
+    
+    typedef std::shared_ptr<_VSCGConditionalBase> Ptr;
+
+    virtual bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) = 0;
+};
+
+// ---------------------------------------------------------------------------
+
+namespace // anonymous
+{
+
+struct ConditionalParamBase : public _VSCGConditionalBase
+{
+    ConditionalParamBase(const TfToken & name)
+    : paramName(name)
+    {}
+
+    TfToken paramName;
+};
+
+struct ConditionalParamIsConnected : public ConditionalParamBase
+{
+    ConditionalParamIsConnected(const TfToken & name)
+    : ConditionalParamBase(name) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return !interface->GetNodeInputConnection(nodeName, paramName).empty();
+    }
+};
+
+struct ConditionalParamIsNotConnected : public ConditionalParamBase
+{
+    ConditionalParamIsNotConnected(const TfToken & name)
+    : ConditionalParamBase(name) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return interface->GetNodeInputConnection(nodeName, paramName).empty();
+    }
+};
+
+struct ConditionalParamIsSet : public ConditionalParamBase
+{
+    ConditionalParamIsSet(const TfToken & name)
+    : ConditionalParamBase(name) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return !interface->GetNodeParameterValue(nodeName, paramName).IsEmpty();
+    }
+};
+
+struct ConditionalParamIsNotSet : public ConditionalParamBase
+{
+    ConditionalParamIsNotSet(const TfToken & name)
+    : ConditionalParamBase(name) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return interface->GetNodeParameterValue(nodeName, paramName).IsEmpty();
+    }
+};
+
+struct ConditionalParamCmpBase : public ConditionalParamBase
+{
+    ConditionalParamCmpBase(const TfToken & name, const VtValue & v)
+    : ConditionalParamBase(name) , value(v) {}
+
+    VtValue value;
+
+    static bool ValueAsNumber(const VtValue v, double * result) {
+        if (v.IsHolding<float>()) {
+            *result = v.UncheckedGet<float>();
+            return true;
+        }
+        
+        if (v.IsHolding<int>()) {
+            *result = v.UncheckedGet<int>();
+            return true;
+        }
+
+        if (v.IsHolding<double>()) {
+            *result = v.UncheckedGet<double>();
+            return true;
+        }
+
+        if (v.IsHolding<bool>()) {
+            *result = v.UncheckedGet<bool>();
+            return true;
+        }
+
+        // TODO check color?
+
+        return false;
+    }
+
+    static bool GetParameterValue(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const TfToken & paramName,
+        const NdrTokenVec & shaderTypePriority,
+        VtValue * result)
+    {
+        
+        *result = interface->GetNodeParameterValue(nodeName, paramName);
+
+        if (!result->IsEmpty()) {
+            return true;
+        }
+
+        // check for a default
+        auto& reg = SdrRegistry::GetInstance();
+
+        if (SdrShaderNodeConstPtr sdrNode = reg.GetShaderNodeByIdentifier(
+                interface->GetNodeType(nodeName), shaderTypePriority)) {
+            if (NdrPropertyConstPtr ndrProp = sdrNode->GetInput(paramName)) {
+                *result = ndrProp->GetDefaultValue();
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool CompareNumber(double v1, double v2) = 0;
+    virtual bool CompareString(
+            const std::string & v1, const std::string & v2) = 0;
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        VtValue paramValue;
+        if (!GetParameterValue(interface,
+                nodeName, paramName, shaderTypePriority, &paramValue)) {
+            return false;
+        }
+
+        if (value.IsHolding<std::string>()) {
+            if (paramValue.IsHolding<std::string>()) {
+                return CompareString(value.UncheckedGet<std::string>(),
+                        paramValue.UncheckedGet<std::string>());
+            }
+            return false;
+        }
+
+        double d1 = 0, d2 = 0;
+
+        if (ValueAsNumber(paramValue, &d1) && ValueAsNumber(value, &d2)) {    
+            
+            //std::cerr << d1 << " " << d2 << std::endl;
+            return CompareNumber(d1, d2);
+        }
+
+        return false;
+    }
+
+};
+
+
+struct ConditionalParamCmpEqualTo : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpEqualTo(const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+    
+    bool CompareNumber(double v1, double v2) override {
+        return v1 == v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return v1 == v2;
+    }
+};
+
+struct ConditionalParamCmpNotEqualTo : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpNotEqualTo(const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 != v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return v1 != v2;
+    }
+};
+
+
+struct ConditionalParamCmpGreaterThan : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpGreaterThan(const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {
+    }
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 > v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return false;
+    }
+};
+
+struct ConditionalParamCmpLessThan : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpLessThan(const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 < v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return false;
+    }
+};
+
+struct ConditionalParamCmpGreaterThanOrEqualTo
+    : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpGreaterThanOrEqualTo(
+            const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 >= v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return false;
+    }
+};
+
+
+struct ConditionalParamCmpLessThanOrEqualTo : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpLessThanOrEqualTo(
+            const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 <= v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return false;
+    }
+};
+
+struct ConditionalAnd : _VSCGConditionalBase
+{
+    ConditionalAnd(_VSCGConditionalBase * left, _VSCGConditionalBase * right)
+    : _VSCGConditionalBase(), left(left), right(right) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return (left && left->Eval(interface, nodeName, shaderTypePriority))
+                && (right && right->Eval(
+                    interface, nodeName, shaderTypePriority)); 
+    }
+
+    ~ConditionalAnd() {
+        delete left;
+        delete right;
+    }
+
+    _VSCGConditionalBase * left;
+    _VSCGConditionalBase * right;
+};
+
+struct ConditionalOr : _VSCGConditionalBase
+{
+    ConditionalOr(_VSCGConditionalBase * left, _VSCGConditionalBase * right)
+    : _VSCGConditionalBase(), left(left), right(right) {}
+
+    ~ConditionalOr() {
+        delete left;
+        delete right;
+    }
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return (left && left->Eval(interface, nodeName, shaderTypePriority))
+                || (right && right->Eval(
+                    interface, nodeName, shaderTypePriority)); 
+    }
+
+    _VSCGConditionalBase * left;
+    _VSCGConditionalBase * right;
+};
+
+
+//----------------------------------------------------------------------------
+
+
+} // namespace anonymous
+
+
+struct _VSCGValueContainer
+{
+    _VSCGValueContainer(const VtValue & v)
+    : value(v) {}
+
+    VtValue value;
+};
+
+struct _VSCGAction {
+
+    enum Action
+    {
+        Connect,
+        Ignore,
+        SetConstant,
+        CopyParam,
+    };
+
+    _VSCGAction(Action action)
+    : action(action) {}
+    _VSCGAction(Action action, const VtValue & value)
+    : action(action), value(value) {}
+
+    Action action;
+    VtValue value;
+};
+
+
+struct _VSCGParserData {
+
+    // flex scanner
+    void * yyscanner;
+    std::string parseError;
+
+    _VSCGAction * action = nullptr;
+    _VSCGAction * fallbackAction = nullptr;
+    
+    std::set<_VSCGConditionalBase *> _intermediateConditions;
+
+    _VSCGConditionalBase * NewCondition(_VSCGConditionalBase * condition) {
+        _intermediateConditions.insert(condition);
+        return condition;
+    }
+
+    _VSCGConditionalBase * ClaimCondition(_VSCGConditionalBase * condition) {
+        _intermediateConditions.erase(condition);
+        return condition;
+    }
+
+    _VSCGConditionalBase * rootCondition = nullptr;
+
+    ~_VSCGParserData() {
+        delete action;
+        delete fallbackAction;
+
+        for (auto c : _intermediateConditions) {
+            delete c;
+        }
+        _intermediateConditions.clear();
+    }
+};
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class MatfiltVstructConditionalEvaluatorImpl
+{
+public:
+
+    ~MatfiltVstructConditionalEvaluatorImpl() {
+        delete condition;
+        delete action;
+        delete fallbackAction;
+    }
+
+    _VSCGConditionalBase * condition = nullptr;
+    _VSCGAction * action = nullptr;
+    _VSCGAction * fallbackAction = nullptr;
+    
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#include "virtualStructConditionalGrammar.tab.h"
+ 
+
+
+/* Line 189 of yacc.c  */
+#line 521 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 1
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     NUMBER = 258,
+     STRING = 259,
+     PARAM = 260,
+     LPAR = 261,
+     RPAR = 262,
+     OP_EQ = 263,
+     OP_NOTEQ = 264,
+     OP_GT = 265,
+     OP_LT = 266,
+     OP_GTEQ = 267,
+     OP_LTEQ = 268,
+     OP_IS = 269,
+     OP_ISNOT = 270,
+     OP_AND = 271,
+     OP_OR = 272,
+     KW_IF = 273,
+     KW_ELSE = 274,
+     KW_CONNECTED = 275,
+     KW_CONNECT = 276,
+     KW_IGNORE = 277,
+     KW_COPY = 278,
+     KW_SET = 279,
+     UNRECOGNIZED_TOKEN = 280
+   };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 214 of yacc.c  */
+#line 469 "hdPrman/virtualStructConditionalGrammar.yy"
+
+  double number;
+  char * string;
+  struct _VSCGConditionalBase * condition;
+  struct _VSCGAction * action;
+  struct _VSCGValueContainer * value;
+
+
+
+/* Line 214 of yacc.c  */
+#line 592 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
+typedef struct YYLTYPE
+{
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;
+} YYLTYPE;
+# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
+# define YYLTYPE_IS_DECLARED 1
+# define YYLTYPE_IS_TRIVIAL 1
+#endif
+
+
+/* Copy the second part of user declarations.  */
+
+/* Line 264 of yacc.c  */
+#line 502 "hdPrman/virtualStructConditionalGrammar.yy"
+
+int virtualStructConditionalGrammarYylex(
+        YYSTYPE * lvalp, YYLTYPE *llocp, void * yyscanner);
+void virtualStructConditionalGrammarYyerror(
+        YYLTYPE *llocp, _VSCGParserData * data, const char *s);
+
+/*This macro is to hack around the fact that
+%lex-param ends up getting cut off, for example:
+%lex-param { void * data->yyscanner}
+Really ends up passing in yyscanner in the YYLEX macro
+*/
+#define MACRO_YYSCANNER data->yyscanner
+
+
+/* Line 264 of yacc.c  */
+#line 632 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
+#endif
+{
+  return yyi;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
+	     && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+  YYLTYPE yyls_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+      + 2 * YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  117
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   328
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  26
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  5
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  126
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  243
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   280
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     5,     7,    11,    15,    19,    23,    27,
+      31,    35,    39,    43,    47,    51,    55,    59,    63,    67,
+      71,    75,    79,    83,    87,    91,    95,    99,   103,   107,
+     111,   115,   119,   123,   127,   131,   135,   139,   143,   147,
+     151,   155,   159,   163,   167,   171,   175,   179,   183,   187,
+     191,   195,   199,   203,   207,   211,   215,   219,   223,   227,
+     231,   235,   239,   243,   247,   251,   255,   259,   263,   267,
+     271,   275,   279,   283,   287,   291,   295,   299,   303,   307,
+     311,   315,   319,   323,   327,   331,   335,   339,   343,   347,
+     351,   355,   359,   363,   367,   371,   375,   379,   383,   387,
+     391,   395,   399,   403,   407,   411,   415,   419,   423,   427,
+     431,   435,   439,   443,   447,   451,   455,   459,   462,   464,
+     466,   469,   472,   478,   482,   487,   489
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      30,     0,    -1,     4,    -1,     3,    -1,     5,     8,    27,
+      -1,    16,     8,    27,    -1,    17,     8,    27,    -1,    14,
+       8,    27,    -1,    18,     8,    27,    -1,    19,     8,    27,
+      -1,    20,     8,    27,    -1,    21,     8,    27,    -1,    22,
+       8,    27,    -1,    23,     8,    27,    -1,    24,     8,    27,
+      -1,     5,     9,    27,    -1,    16,     9,    27,    -1,    17,
+       9,    27,    -1,    14,     9,    27,    -1,    18,     9,    27,
+      -1,    19,     9,    27,    -1,    20,     9,    27,    -1,    21,
+       9,    27,    -1,    22,     9,    27,    -1,    23,     9,    27,
+      -1,    24,     9,    27,    -1,     5,    10,    27,    -1,    16,
+      10,    27,    -1,    17,    10,    27,    -1,    14,    10,    27,
+      -1,    18,    10,    27,    -1,    19,    10,    27,    -1,    20,
+      10,    27,    -1,    21,    10,    27,    -1,    22,    10,    27,
+      -1,    23,    10,    27,    -1,    24,    10,    27,    -1,     5,
+      11,    27,    -1,    16,    11,    27,    -1,    17,    11,    27,
+      -1,    14,    11,    27,    -1,    18,    11,    27,    -1,    19,
+      11,    27,    -1,    20,    11,    27,    -1,    21,    11,    27,
+      -1,    22,    11,    27,    -1,    23,    11,    27,    -1,    24,
+      11,    27,    -1,     5,    12,    27,    -1,    16,    12,    27,
+      -1,    17,    12,    27,    -1,    14,    12,    27,    -1,    18,
+      12,    27,    -1,    19,    12,    27,    -1,    20,    12,    27,
+      -1,    21,    12,    27,    -1,    22,    12,    27,    -1,    23,
+      12,    27,    -1,    24,    12,    27,    -1,     5,    13,    27,
+      -1,    16,    13,    27,    -1,    17,    13,    27,    -1,    14,
+      13,    27,    -1,    18,    13,    27,    -1,    19,    13,    27,
+      -1,    20,    13,    27,    -1,    21,    13,    27,    -1,    22,
+      13,    27,    -1,    23,    13,    27,    -1,    24,    13,    27,
+      -1,     5,    14,    20,    -1,    16,    14,    20,    -1,    17,
+      14,    20,    -1,    14,    14,    20,    -1,    18,    14,    20,
+      -1,    19,    14,    20,    -1,    20,    14,    20,    -1,    21,
+      14,    20,    -1,    22,    14,    20,    -1,    23,    14,    20,
+      -1,    24,    14,    20,    -1,     5,    15,    20,    -1,    16,
+      15,    20,    -1,    17,    15,    20,    -1,    14,    15,    20,
+      -1,    18,    15,    20,    -1,    19,    15,    20,    -1,    20,
+      15,    20,    -1,    21,    15,    20,    -1,    22,    15,    20,
+      -1,    23,    15,    20,    -1,    24,    15,    20,    -1,     5,
+      14,    24,    -1,    16,    14,    24,    -1,    17,    14,    24,
+      -1,    14,    14,    24,    -1,    18,    14,    24,    -1,    19,
+      14,    24,    -1,    20,    14,    24,    -1,    21,    14,    24,
+      -1,    22,    14,    24,    -1,    23,    14,    24,    -1,    24,
+      14,    24,    -1,     5,    15,    24,    -1,    16,    15,    24,
+      -1,    17,    15,    24,    -1,    14,    15,    24,    -1,    18,
+      15,    24,    -1,    19,    15,    24,    -1,    20,    15,    24,
+      -1,    21,    15,    24,    -1,    22,    15,    24,    -1,    23,
+      15,    24,    -1,    24,    15,    24,    -1,     6,    28,     7,
+      -1,    28,    16,    28,    -1,    28,    17,    28,    -1,    23,
+       5,    -1,    21,    -1,    22,    -1,    24,     4,    -1,    24,
+       3,    -1,    29,    18,    28,    19,    29,    -1,    29,    18,
+      28,    -1,    18,    28,    19,    29,    -1,    29,    -1,    28,
+      -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   538,   538,   542,   555,   563,   569,   575,   582,   588,
+     594,   600,   606,   612,   618,   626,   634,   640,   646,   653,
+     659,   665,   672,   678,   684,   690,   699,   707,   713,   719,
+     726,   732,   738,   745,   751,   757,   763,   772,   780,   786,
+     792,   799,   805,   811,   817,   823,   829,   835,   843,   852,
+     859,   866,   874,   881,   888,   895,   902,   909,   916,   926,
+     935,   942,   949,   957,   964,   971,   978,   985,   992,   999,
+    1010,  1015,  1019,  1023,  1028,  1032,  1036,  1041,  1046,  1051,
+    1055,  1062,  1067,  1072,  1077,  1083,  1088,  1093,  1098,  1103,
+    1108,  1113,  1122,  1127,  1131,  1135,  1140,  1144,  1148,  1152,
+    1156,  1160,  1164,  1171,  1176,  1180,  1184,  1189,  1193,  1197,
+    1202,  1206,  1210,  1214,  1221,  1224,  1229,  1235,  1243,  1247,
+    1250,  1256,  1266,  1271,  1282,  1292,  1295
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "NUMBER", "STRING", "PARAM", "LPAR",
+  "RPAR", "OP_EQ", "OP_NOTEQ", "OP_GT", "OP_LT", "OP_GTEQ", "OP_LTEQ",
+  "OP_IS", "OP_ISNOT", "OP_AND", "OP_OR", "KW_IF", "KW_ELSE",
+  "KW_CONNECTED", "KW_CONNECT", "KW_IGNORE", "KW_COPY", "KW_SET",
+  "UNRECOGNIZED_TOKEN", "$accept", "value", "expr", "action", "statement", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    26,    27,    27,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
+      28,    28,    28,    28,    28,    28,    28,    29,    29,    29,
+      29,    29,    30,    30,    30,    30,    30
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     1,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     2,     1,     1,
+       2,     2,     5,     3,     4,     1,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   118,
+     119,     0,     0,   126,   125,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   117,     0,     0,     0,     0,
+       0,     0,     0,     0,   121,   120,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     1,     3,     2,
+       4,    15,    26,    37,    48,    59,    70,    92,    81,   103,
+       0,   114,     7,    18,    29,    40,    51,    62,    73,    95,
+      84,   106,     5,    16,    27,    38,    49,    60,    71,    93,
+      82,   104,     6,    17,    28,    39,    50,    61,    72,    94,
+      83,   105,     8,    19,    30,    41,    52,    63,    74,    96,
+      85,   107,     0,     9,    20,    31,    42,    53,    64,    75,
+      97,    86,   108,    10,    21,    32,    43,    54,    65,    76,
+      98,    87,   109,    11,    22,    33,    44,    55,    66,    77,
+      99,    88,   110,    12,    23,    34,    45,    56,    67,    78,
+     100,    89,   111,    13,    24,    35,    46,    57,    68,    79,
+     101,    90,   112,    14,    25,    36,    47,    58,    69,    80,
+     102,    91,   113,   115,   116,   123,   118,   119,     0,     0,
+     124,     0,   122
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,   120,    13,    14,    15
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -161
+static const yytype_int16 yypact[] =
+{
+      86,   184,   130,   192,   200,   208,   110,   216,   224,   232,
+     240,   176,   165,   -14,    14,    16,    11,    11,    11,    11,
+      11,    11,    -7,   117,   248,   232,   240,   256,   264,    -6,
+      11,    11,    11,    11,    11,    11,   118,   119,    11,    11,
+      11,    11,    11,    11,   146,   260,    11,    11,    11,    11,
+      11,    11,   261,   262,    11,    11,    11,    11,    11,    11,
+     147,   263,   305,    11,    11,    11,    11,    11,    11,   268,
+     269,    11,    11,    11,    11,    11,    11,   270,   271,    11,
+      11,    11,    11,    11,    11,   276,   277,    11,    11,    11,
+      11,    11,    11,   278,   279,  -161,    11,    11,    11,    11,
+      11,    11,   284,   285,  -161,  -161,    11,    11,    11,    11,
+      11,    11,   286,   287,   130,   130,   130,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+     292,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,   296,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,  -161,
+    -161,  -161,  -161,  -161,    17,   309,  -161,  -161,    35,    21,
+    -161,   296,  -161
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -161,   -12,    -2,  -160,  -161
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const yytype_uint8 yytable[] =
+{
+      29,   131,   114,   115,    62,   121,   122,   123,   124,   125,
+     114,   115,   240,   126,   118,   119,   117,   127,   132,   133,
+     134,   135,   136,   137,   104,   105,   142,   143,   144,   145,
+     146,   147,   116,   114,   152,   153,   154,   155,   156,   157,
+      95,     0,   162,   163,   164,   165,   166,   167,     0,     0,
+       0,   173,   174,   175,   176,   177,   178,     0,     0,   183,
+     184,   185,   186,   187,   188,     0,     0,   193,   194,   195,
+     196,   197,   198,     0,     0,   203,   204,   205,   206,   207,
+     208,   242,     0,     0,   213,   214,   215,   216,   217,   218,
+       0,     1,     2,     0,   223,   224,   225,   226,   227,   228,
+       3,     0,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,     0,   233,   234,   235,     1,     2,     0,    54,    55,
+      56,    57,    58,    59,    60,    61,     4,     5,    24,     7,
+       8,    25,    26,    27,    28,     1,     2,   128,   138,   140,
+       0,   129,   139,   141,     3,     0,     4,     5,    24,     7,
+       8,    25,    26,    27,    28,    30,    31,    32,    33,    34,
+      35,    36,    37,     0,     0,     0,   148,   168,   104,   105,
+     149,   169,     0,   106,   107,   108,   109,   110,   111,   112,
+     113,    95,     0,     0,    96,    97,    98,    99,   100,   101,
+     102,   103,    16,    17,    18,    19,    20,    21,    22,    23,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    63,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    54,    55,    56,    57,
+      58,    59,   130,    61,    96,    97,    98,    99,   100,   101,
+     102,   103,   106,   107,   108,   109,   110,   111,   112,   113,
+     150,   158,   160,   170,   151,   159,   161,   171,   179,   181,
+     189,   191,   180,   182,   190,   192,   199,   201,   209,   211,
+     200,   202,   210,   212,   219,   221,   229,   231,   220,   222,
+     230,   232,   168,     0,     0,     0,   169,   236,   237,   238,
+     239,   114,   115,     0,   172,   114,   115,     0,   241
+};
+
+static const yytype_int16 yycheck[] =
+{
+       2,     7,    16,    17,     6,    17,    18,    19,    20,    21,
+      16,    17,   172,    20,     3,     4,     0,    24,    30,    31,
+      32,    33,    34,    35,     3,     4,    38,    39,    40,    41,
+      42,    43,    18,    16,    46,    47,    48,    49,    50,    51,
+       5,    -1,    54,    55,    56,    57,    58,    59,    -1,    -1,
+      -1,    63,    64,    65,    66,    67,    68,    -1,    -1,    71,
+      72,    73,    74,    75,    76,    -1,    -1,    79,    80,    81,
+      82,    83,    84,    -1,    -1,    87,    88,    89,    90,    91,
+      92,   241,    -1,    -1,    96,    97,    98,    99,   100,   101,
+      -1,     5,     6,    -1,   106,   107,   108,   109,   110,   111,
+      14,    -1,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    -1,   114,   115,   116,     5,     6,    -1,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,     5,     6,    20,    20,    20,
+      -1,    24,    24,    24,    14,    -1,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,     8,     9,    10,    11,    12,
+      13,    14,    15,    -1,    -1,    -1,    20,    20,     3,     4,
+      24,    24,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,     5,    -1,    -1,     8,     9,    10,    11,    12,    13,
+      14,    15,     8,     9,    10,    11,    12,    13,    14,    15,
+       8,     9,    10,    11,    12,    13,    14,    15,     8,     9,
+      10,    11,    12,    13,    14,    15,     8,     9,    10,    11,
+      12,    13,    14,    15,     8,     9,    10,    11,    12,    13,
+      14,    15,     8,     9,    10,    11,    12,    13,    14,    15,
+       8,     9,    10,    11,    12,    13,    14,    15,     8,     9,
+      10,    11,    12,    13,    14,    15,     8,     9,    10,    11,
+      12,    13,    14,    15,     8,     9,    10,    11,    12,    13,
+      14,    15,     8,     9,    10,    11,    12,    13,    14,    15,
+      20,    20,    20,    20,    24,    24,    24,    24,    20,    20,
+      20,    20,    24,    24,    24,    24,    20,    20,    20,    20,
+      24,    24,    24,    24,    20,    20,    20,    20,    24,    24,
+      24,    24,    20,    -1,    -1,    -1,    24,    21,    22,    23,
+      24,    16,    17,    -1,    19,    16,    17,    -1,    19
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     5,     6,    14,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    28,    29,    30,     8,     9,    10,    11,
+      12,    13,    14,    15,    18,    21,    22,    23,    24,    28,
+       8,     9,    10,    11,    12,    13,    14,    15,     8,     9,
+      10,    11,    12,    13,    14,    15,     8,     9,    10,    11,
+      12,    13,    14,    15,     8,     9,    10,    11,    12,    13,
+      14,    15,    28,     8,     9,    10,    11,    12,    13,    14,
+      15,     8,     9,    10,    11,    12,    13,    14,    15,     8,
+       9,    10,    11,    12,    13,    14,    15,     8,     9,    10,
+      11,    12,    13,    14,    15,     5,     8,     9,    10,    11,
+      12,    13,    14,    15,     3,     4,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,     0,     3,     4,
+      27,    27,    27,    27,    27,    27,    20,    24,    20,    24,
+      14,     7,    27,    27,    27,    27,    27,    27,    20,    24,
+      20,    24,    27,    27,    27,    27,    27,    27,    20,    24,
+      20,    24,    27,    27,    27,    27,    27,    27,    20,    24,
+      20,    24,    27,    27,    27,    27,    27,    27,    20,    24,
+      20,    24,    19,    27,    27,    27,    27,    27,    27,    20,
+      24,    20,    24,    27,    27,    27,    27,    27,    27,    20,
+      24,    20,    24,    27,    27,    27,    27,    27,    27,    20,
+      24,    20,    24,    27,    27,    27,    27,    27,    27,    20,
+      24,    20,    24,    27,    27,    27,    27,    27,    27,    20,
+      24,    20,    24,    27,    27,    27,    27,    27,    27,    20,
+      24,    20,    24,    28,    28,    28,    21,    22,    23,    24,
+      29,    19,    29
+};
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (&yylloc, data, YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval, &yylloc, MACRO_YYSCANNER)
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value, Location, data); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, _VSCGParserData * data)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, data)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+    YYLTYPE const * const yylocationp;
+    _VSCGParserData * data;
+#endif
+{
+  if (!yyvaluep)
+    return;
+  YYUSE (yylocationp);
+  YYUSE (data);
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, _VSCGParserData * data)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, data)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+    YYLTYPE const * const yylocationp;
+    _VSCGParserData * data;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  YY_LOCATION_PRINT (yyoutput, *yylocationp);
+  YYFPRINTF (yyoutput, ": ");
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, data);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, _VSCGParserData * data)
+#else
+static void
+yy_reduce_print (yyvsp, yylsp, yyrule, data)
+    YYSTYPE *yyvsp;
+    YYLTYPE *yylsp;
+    int yyrule;
+    _VSCGParserData * data;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       , &(yylsp[(yyi + 1) - (yynrhs)])		       , data);
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, yylsp, Rule, data); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, _VSCGParserData * data)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep, yylocationp, data)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+    YYLTYPE *yylocationp;
+    _VSCGParserData * data;
+#endif
+{
+  YYUSE (yyvaluep);
+  YYUSE (yylocationp);
+  YYUSE (data);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+      case 3: /* "NUMBER" */
+
+/* Line 1000 of yacc.c  */
+#line 477 "hdPrman/virtualStructConditionalGrammar.yy"
+	{
+  if ((yyvaluep->string))
+  {
+      free((yyvaluep->string));
+  }
+  (yyvaluep->string) = 0;
+};
+
+/* Line 1000 of yacc.c  */
+#line 1776 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+	break;
+      case 4: /* "STRING" */
+
+/* Line 1000 of yacc.c  */
+#line 477 "hdPrman/virtualStructConditionalGrammar.yy"
+	{
+  if ((yyvaluep->string))
+  {
+      free((yyvaluep->string));
+  }
+  (yyvaluep->string) = 0;
+};
+
+/* Line 1000 of yacc.c  */
+#line 1791 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+	break;
+      case 5: /* "PARAM" */
+
+/* Line 1000 of yacc.c  */
+#line 477 "hdPrman/virtualStructConditionalGrammar.yy"
+	{
+  if ((yyvaluep->string))
+  {
+      free((yyvaluep->string));
+  }
+  (yyvaluep->string) = 0;
+};
+
+/* Line 1000 of yacc.c  */
+#line 1806 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+	break;
+      case 27: /* "value" */
+
+/* Line 1000 of yacc.c  */
+#line 493 "hdPrman/virtualStructConditionalGrammar.yy"
+	{
+  if ((yyvaluep->value))
+  {
+      delete (yyvaluep->value);
+  }
+  (yyvaluep->value) = 0;
+};
+
+/* Line 1000 of yacc.c  */
+#line 1821 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+	break;
+      case 29: /* "action" */
+
+/* Line 1000 of yacc.c  */
+#line 485 "hdPrman/virtualStructConditionalGrammar.yy"
+	{
+  if ((yyvaluep->action))
+  {
+      delete (yyvaluep->action);
+  }
+  (yyvaluep->action) = 0;
+};
+
+/* Line 1000 of yacc.c  */
+#line 1836 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+	break;
+
+      default:
+	break;
+    }
+}
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (_VSCGParserData * data);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (_VSCGParserData * data)
+#else
+int
+yyparse (data)
+    _VSCGParserData * data;
+#endif
+#endif
+{
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Location data for the lookahead symbol.  */
+YYLTYPE yylloc;
+
+    /* Number of syntax errors so far.  */
+    int yynerrs;
+
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+       `yyls': related to locations.
+
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    /* The location stack.  */
+    YYLTYPE yylsa[YYINITDEPTH];
+    YYLTYPE *yyls;
+    YYLTYPE *yylsp;
+
+    /* The locations where the error started and ended.  */
+    YYLTYPE yyerror_range[2];
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+  YYLTYPE yyloc;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yyls = yylsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+  yyssp = yyss;
+  yyvsp = yyvs;
+  yylsp = yyls;
+
+#if YYLTYPE_IS_TRIVIAL
+  /* Initialize the default location before parsing starts.  */
+  yylloc.first_line   = yylloc.last_line   = 1;
+  yylloc.first_column = yylloc.last_column = 1;
+#endif
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+	YYLTYPE *yyls1 = yyls;
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yyls1, yysize * sizeof (*yylsp),
+		    &yystacksize);
+
+	yyls = yyls1;
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyls_alloc, yyls);
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+      yylsp = yyls + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+  *++yylsp = yylloc;
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+  /* Default location.  */
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+
+/* Line 1455 of yacc.c  */
+#line 538 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    (yyval.value) = new _VSCGValueContainer(VtValue((yyvsp[(1) - (1)].string)));
+    free((yyvsp[(1) - (1)].string));
+;}
+    break;
+
+  case 3:
+
+/* Line 1455 of yacc.c  */
+#line 542 "hdPrman/virtualStructConditionalGrammar.yy"
+    {    
+    (yyval.value) = new _VSCGValueContainer(VtValue(atof((yyvsp[(1) - (1)].string))));
+    free((yyvsp[(1) - (1)].string));
+;}
+    break;
+
+  case 4:
+
+/* Line 1455 of yacc.c  */
+#line 555 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken((yyvsp[(1) - (3)].string)), (yyvsp[(3) - (3)].value)->value));
+
+    free((yyvsp[(1) - (3)].string));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 5:
+
+/* Line 1455 of yacc.c  */
+#line 563 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("and"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 6:
+
+/* Line 1455 of yacc.c  */
+#line 569 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("or"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 7:
+
+/* Line 1455 of yacc.c  */
+#line 575 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("is"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 8:
+
+/* Line 1455 of yacc.c  */
+#line 582 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("if"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 9:
+
+/* Line 1455 of yacc.c  */
+#line 588 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("else"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 10:
+
+/* Line 1455 of yacc.c  */
+#line 594 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("connected"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 11:
+
+/* Line 1455 of yacc.c  */
+#line 600 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("connect"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 12:
+
+/* Line 1455 of yacc.c  */
+#line 606 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("ignore"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 13:
+
+/* Line 1455 of yacc.c  */
+#line 612 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("copy"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 14:
+
+/* Line 1455 of yacc.c  */
+#line 618 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("set"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 15:
+
+/* Line 1455 of yacc.c  */
+#line 626 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken((yyvsp[(1) - (3)].string)), (yyvsp[(3) - (3)].value)->value));
+
+    free((yyvsp[(1) - (3)].string));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 16:
+
+/* Line 1455 of yacc.c  */
+#line 634 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("and"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 17:
+
+/* Line 1455 of yacc.c  */
+#line 640 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("or"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 18:
+
+/* Line 1455 of yacc.c  */
+#line 646 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("is"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 19:
+
+/* Line 1455 of yacc.c  */
+#line 653 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("if"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 20:
+
+/* Line 1455 of yacc.c  */
+#line 659 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("else"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 21:
+
+/* Line 1455 of yacc.c  */
+#line 665 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(
+                    TfToken("connected"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 22:
+
+/* Line 1455 of yacc.c  */
+#line 672 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("connect"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 23:
+
+/* Line 1455 of yacc.c  */
+#line 678 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("ignore"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 24:
+
+/* Line 1455 of yacc.c  */
+#line 684 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("copy"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 25:
+
+/* Line 1455 of yacc.c  */
+#line 690 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("set"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 26:
+
+/* Line 1455 of yacc.c  */
+#line 699 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken((yyvsp[(1) - (3)].string)), (yyvsp[(3) - (3)].value)->value));
+
+    free((yyvsp[(1) - (3)].string));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 27:
+
+/* Line 1455 of yacc.c  */
+#line 707 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("and"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 28:
+
+/* Line 1455 of yacc.c  */
+#line 713 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("or"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 29:
+
+/* Line 1455 of yacc.c  */
+#line 719 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("is"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 30:
+
+/* Line 1455 of yacc.c  */
+#line 726 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("if"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 31:
+
+/* Line 1455 of yacc.c  */
+#line 732 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("else"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 32:
+
+/* Line 1455 of yacc.c  */
+#line 738 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(
+                    TfToken("connected"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 33:
+
+/* Line 1455 of yacc.c  */
+#line 745 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("connect"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 34:
+
+/* Line 1455 of yacc.c  */
+#line 751 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("ignore"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 35:
+
+/* Line 1455 of yacc.c  */
+#line 757 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("copy"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 36:
+
+/* Line 1455 of yacc.c  */
+#line 763 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("set"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 37:
+
+/* Line 1455 of yacc.c  */
+#line 772 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken((yyvsp[(1) - (3)].string)), (yyvsp[(3) - (3)].value)->value));
+
+    free((yyvsp[(1) - (3)].string));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 38:
+
+/* Line 1455 of yacc.c  */
+#line 780 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("and"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 39:
+
+/* Line 1455 of yacc.c  */
+#line 786 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("or"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 40:
+
+/* Line 1455 of yacc.c  */
+#line 792 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("is"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 41:
+
+/* Line 1455 of yacc.c  */
+#line 799 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("if"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 42:
+
+/* Line 1455 of yacc.c  */
+#line 805 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("else"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 43:
+
+/* Line 1455 of yacc.c  */
+#line 811 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("connected"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 44:
+
+/* Line 1455 of yacc.c  */
+#line 817 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("connect"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 45:
+
+/* Line 1455 of yacc.c  */
+#line 823 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("ignore"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 46:
+
+/* Line 1455 of yacc.c  */
+#line 829 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("copy"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 47:
+
+/* Line 1455 of yacc.c  */
+#line 835 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("set"), (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 48:
+
+/* Line 1455 of yacc.c  */
+#line 843 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken((yyvsp[(1) - (3)].string)),
+                    (yyvsp[(3) - (3)].value)->value));
+
+    free((yyvsp[(1) - (3)].string));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 49:
+
+/* Line 1455 of yacc.c  */
+#line 852 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("and"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 50:
+
+/* Line 1455 of yacc.c  */
+#line 859 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("or"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 51:
+
+/* Line 1455 of yacc.c  */
+#line 866 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("is"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 52:
+
+/* Line 1455 of yacc.c  */
+#line 874 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("if"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 53:
+
+/* Line 1455 of yacc.c  */
+#line 881 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("else"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 54:
+
+/* Line 1455 of yacc.c  */
+#line 888 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("connected"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 55:
+
+/* Line 1455 of yacc.c  */
+#line 895 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("connect"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 56:
+
+/* Line 1455 of yacc.c  */
+#line 902 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("ignore"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 57:
+
+/* Line 1455 of yacc.c  */
+#line 909 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("copy"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 58:
+
+/* Line 1455 of yacc.c  */
+#line 916 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("set"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 59:
+
+/* Line 1455 of yacc.c  */
+#line 926 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken((yyvsp[(1) - (3)].string)),
+                    (yyvsp[(3) - (3)].value)->value));
+
+    free((yyvsp[(1) - (3)].string));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 60:
+
+/* Line 1455 of yacc.c  */
+#line 935 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("and"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 61:
+
+/* Line 1455 of yacc.c  */
+#line 942 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("or"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 62:
+
+/* Line 1455 of yacc.c  */
+#line 949 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("is"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 63:
+
+/* Line 1455 of yacc.c  */
+#line 957 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("if"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 64:
+
+/* Line 1455 of yacc.c  */
+#line 964 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("else"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 65:
+
+/* Line 1455 of yacc.c  */
+#line 971 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("connected"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 66:
+
+/* Line 1455 of yacc.c  */
+#line 978 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("connect"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 67:
+
+/* Line 1455 of yacc.c  */
+#line 985 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("ignore"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 68:
+
+/* Line 1455 of yacc.c  */
+#line 992 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("copy"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 69:
+
+/* Line 1455 of yacc.c  */
+#line 999 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("set"),
+                    (yyvsp[(3) - (3)].value)->value));
+    delete (yyvsp[(3) - (3)].value);
+;}
+    break;
+
+  case 70:
+
+/* Line 1455 of yacc.c  */
+#line 1010 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(TfToken((yyvsp[(1) - (3)].string))));
+    free((yyvsp[(1) - (3)].string));
+;}
+    break;
+
+  case 71:
+
+/* Line 1455 of yacc.c  */
+#line 1015 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(TfToken("and")));
+;}
+    break;
+
+  case 72:
+
+/* Line 1455 of yacc.c  */
+#line 1019 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(TfToken("or")));
+;}
+    break;
+
+  case 73:
+
+/* Line 1455 of yacc.c  */
+#line 1023 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(TfToken("is")));
+;}
+    break;
+
+  case 74:
+
+/* Line 1455 of yacc.c  */
+#line 1028 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(TfToken("if")));
+;}
+    break;
+
+  case 75:
+
+/* Line 1455 of yacc.c  */
+#line 1032 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(TfToken("else")));
+;}
+    break;
+
+  case 76:
+
+/* Line 1455 of yacc.c  */
+#line 1036 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(
+            TfToken("connected")));
+;}
+    break;
+
+  case 77:
+
+/* Line 1455 of yacc.c  */
+#line 1041 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(
+            TfToken("connect")));
+;}
+    break;
+
+  case 78:
+
+/* Line 1455 of yacc.c  */
+#line 1046 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(
+            TfToken("ignore")));
+;}
+    break;
+
+  case 79:
+
+/* Line 1455 of yacc.c  */
+#line 1051 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(TfToken("copy")));
+;}
+    break;
+
+  case 80:
+
+/* Line 1455 of yacc.c  */
+#line 1055 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsConnected(TfToken("set")));
+;}
+    break;
+
+  case 81:
+
+/* Line 1455 of yacc.c  */
+#line 1062 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(TfToken((yyvsp[(1) - (3)].string))));
+    free((yyvsp[(1) - (3)].string));
+;}
+    break;
+
+  case 82:
+
+/* Line 1455 of yacc.c  */
+#line 1067 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("and")));
+;}
+    break;
+
+  case 83:
+
+/* Line 1455 of yacc.c  */
+#line 1072 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("or")));
+;}
+    break;
+
+  case 84:
+
+/* Line 1455 of yacc.c  */
+#line 1077 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("is")));
+;}
+    break;
+
+  case 85:
+
+/* Line 1455 of yacc.c  */
+#line 1083 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("if")));
+;}
+    break;
+
+  case 86:
+
+/* Line 1455 of yacc.c  */
+#line 1088 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("else")));
+;}
+    break;
+
+  case 87:
+
+/* Line 1455 of yacc.c  */
+#line 1093 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("connected")));
+;}
+    break;
+
+  case 88:
+
+/* Line 1455 of yacc.c  */
+#line 1098 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("connect")));
+;}
+    break;
+
+  case 89:
+
+/* Line 1455 of yacc.c  */
+#line 1103 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("ignore")));
+;}
+    break;
+
+  case 90:
+
+/* Line 1455 of yacc.c  */
+#line 1108 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("copy")));
+;}
+    break;
+
+  case 91:
+
+/* Line 1455 of yacc.c  */
+#line 1113 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("set")));
+;}
+    break;
+
+  case 92:
+
+/* Line 1455 of yacc.c  */
+#line 1122 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken((yyvsp[(1) - (3)].string))));
+    free((yyvsp[(1) - (3)].string));
+;}
+    break;
+
+  case 93:
+
+/* Line 1455 of yacc.c  */
+#line 1127 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("and")));
+;}
+    break;
+
+  case 94:
+
+/* Line 1455 of yacc.c  */
+#line 1131 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("or")));
+;}
+    break;
+
+  case 95:
+
+/* Line 1455 of yacc.c  */
+#line 1135 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("is")));
+;}
+    break;
+
+  case 96:
+
+/* Line 1455 of yacc.c  */
+#line 1140 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("if")));
+;}
+    break;
+
+  case 97:
+
+/* Line 1455 of yacc.c  */
+#line 1144 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("else")));
+;}
+    break;
+
+  case 98:
+
+/* Line 1455 of yacc.c  */
+#line 1148 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("connected")));
+;}
+    break;
+
+  case 99:
+
+/* Line 1455 of yacc.c  */
+#line 1152 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("connect")));
+;}
+    break;
+
+  case 100:
+
+/* Line 1455 of yacc.c  */
+#line 1156 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("ignore")));
+;}
+    break;
+
+  case 101:
+
+/* Line 1455 of yacc.c  */
+#line 1160 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("copy")));
+;}
+    break;
+
+  case 102:
+
+/* Line 1455 of yacc.c  */
+#line 1164 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsSet(TfToken("set")));
+;}
+    break;
+
+  case 103:
+
+/* Line 1455 of yacc.c  */
+#line 1171 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken((yyvsp[(1) - (3)].string))));
+    free((yyvsp[(1) - (3)].string));
+;}
+    break;
+
+  case 104:
+
+/* Line 1455 of yacc.c  */
+#line 1176 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'and', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("and")));
+;}
+    break;
+
+  case 105:
+
+/* Line 1455 of yacc.c  */
+#line 1180 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'or', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("or")));
+;}
+    break;
+
+  case 106:
+
+/* Line 1455 of yacc.c  */
+#line 1184 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'is', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("is")));
+;}
+    break;
+
+  case 107:
+
+/* Line 1455 of yacc.c  */
+#line 1189 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'if', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("if")));
+;}
+    break;
+
+  case 108:
+
+/* Line 1455 of yacc.c  */
+#line 1193 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'else', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("else")));
+;}
+    break;
+
+  case 109:
+
+/* Line 1455 of yacc.c  */
+#line 1197 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connected', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(
+            TfToken("connected")));
+;}
+    break;
+
+  case 110:
+
+/* Line 1455 of yacc.c  */
+#line 1202 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    /* PARAM named 'connect', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("connect")));
+;}
+    break;
+
+  case 111:
+
+/* Line 1455 of yacc.c  */
+#line 1206 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'ignore', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("ignore")));
+;}
+    break;
+
+  case 112:
+
+/* Line 1455 of yacc.c  */
+#line 1210 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'copy', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("copy")));
+;}
+    break;
+
+  case 113:
+
+/* Line 1455 of yacc.c  */
+#line 1214 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+        /* PARAM named 'set', special case */
+    (yyval.condition) = data->NewCondition(new ConditionalParamIsNotSet(TfToken("set")));
+;}
+    break;
+
+  case 114:
+
+/* Line 1455 of yacc.c  */
+#line 1221 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    (yyval.condition) = (yyvsp[(2) - (3)].condition);
+ ;}
+    break;
+
+  case 115:
+
+/* Line 1455 of yacc.c  */
+#line 1224 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    (yyval.condition) = data->NewCondition(new ConditionalAnd(
+            data->ClaimCondition((yyvsp[(1) - (3)].condition)),
+            data->ClaimCondition((yyvsp[(3) - (3)].condition))));
+ ;}
+    break;
+
+  case 116:
+
+/* Line 1455 of yacc.c  */
+#line 1229 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    (yyval.condition) = data->NewCondition(new ConditionalOr(
+            data->ClaimCondition((yyvsp[(1) - (3)].condition)),
+            data->ClaimCondition((yyvsp[(3) - (3)].condition)))); 
+ ;}
+    break;
+
+  case 117:
+
+/* Line 1455 of yacc.c  */
+#line 1235 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    TfToken paramName((yyvsp[(2) - (2)].string));
+    free((yyvsp[(2) - (2)].string));
+
+    (yyval.action) = new _VSCGAction(_VSCGAction::CopyParam, VtValue(paramName));
+
+;}
+    break;
+
+  case 118:
+
+/* Line 1455 of yacc.c  */
+#line 1243 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    (yyval.action) = new _VSCGAction(_VSCGAction::Connect);
+   
+;}
+    break;
+
+  case 119:
+
+/* Line 1455 of yacc.c  */
+#line 1247 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+   (yyval.action) = new _VSCGAction(_VSCGAction::Ignore);
+;}
+    break;
+
+  case 120:
+
+/* Line 1455 of yacc.c  */
+#line 1250 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+
+    std::string value((yyvsp[(2) - (2)].string));
+    free((yyvsp[(2) - (2)].string));
+    (yyval.action) = new _VSCGAction(_VSCGAction::SetConstant, VtValue(value));
+;}
+    break;
+
+  case 121:
+
+/* Line 1455 of yacc.c  */
+#line 1256 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    (yyval.action) = new _VSCGAction(_VSCGAction::SetConstant, VtValue(atof((yyvsp[(2) - (2)].string))));
+   free((yyvsp[(2) - (2)].string));
+;}
+    break;
+
+  case 122:
+
+/* Line 1455 of yacc.c  */
+#line 1266 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    data->action = (yyvsp[(1) - (5)].action);
+    data->rootCondition = data->ClaimCondition((yyvsp[(3) - (5)].condition));
+    data->fallbackAction = (yyvsp[(5) - (5)].action);
+ ;}
+    break;
+
+  case 123:
+
+/* Line 1455 of yacc.c  */
+#line 1271 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    data->action = (yyvsp[(1) - (3)].action);
+    data->rootCondition = data->ClaimCondition((yyvsp[(3) - (3)].condition));
+
+    if ((yyvsp[(1) - (3)].action)->action == _VSCGAction::Ignore) {
+        data->fallbackAction = new _VSCGAction(_VSCGAction::Connect);
+    } else {
+        data->fallbackAction = new _VSCGAction(_VSCGAction::Ignore);
+    }
+ 
+ ;}
+    break;
+
+  case 124:
+
+/* Line 1455 of yacc.c  */
+#line 1282 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    
+    data->action = new _VSCGAction(_VSCGAction::Connect);
+
+    data->rootCondition = data->ClaimCondition((yyvsp[(2) - (4)].condition));
+
+
+    data->fallbackAction = (yyvsp[(4) - (4)].action);
+    
+ ;}
+    break;
+
+  case 125:
+
+/* Line 1455 of yacc.c  */
+#line 1292 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    data->action = (yyvsp[(1) - (1)].action);
+ ;}
+    break;
+
+  case 126:
+
+/* Line 1455 of yacc.c  */
+#line 1295 "hdPrman/virtualStructConditionalGrammar.yy"
+    {
+    data->action = new _VSCGAction(_VSCGAction::Connect);
+    data->rootCondition = data->ClaimCondition((yyvsp[(1) - (1)].condition));
+    data->fallbackAction = new _VSCGAction(_VSCGAction::Ignore);
+ ;}
+    break;
+
+
+
+/* Line 1455 of yacc.c  */
+#line 3624 "hdPrman/virtualStructConditionalGrammar.tab.cpp"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+  *++yylsp = yyloc;
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (&yylloc, data, YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (&yylloc, data, yymsg);
+	  }
+	else
+	  {
+	    yyerror (&yylloc, data, YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
+
+  yyerror_range[0] = yylloc;
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval, &yylloc, data);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  yyerror_range[0] = yylsp[1-yylen];
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+      yyerror_range[0] = *yylsp;
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp, yylsp, data);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  *++yyvsp = yylval;
+
+  yyerror_range[1] = yylloc;
+  /* Using YYLLOC is tempting, but would change the location of
+     the lookahead.  YYLOC is available though.  */
+  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+  *++yylsp = yyloc;
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined(yyoverflow) || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (&yylloc, data, YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval, &yylloc, data);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp, yylsp, data);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+
+/* Line 1675 of yacc.c  */
+#line 1302 "hdPrman/virtualStructConditionalGrammar.yy"
+
+
+
+ 
+
+/* Called by yyparse on error */
+void virtualStructConditionalGrammarYyerror(
+        YYLTYPE *llocp, _VSCGParserData * data, const char *s)
+{
+    data->parseError = s;
+}
+
+typedef struct yy_buffer_state * YY_BUFFER_STATE;
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_scan_string(
+        const char *, void * );
+void virtualStructConditionalGrammarYy_delete_buffer(
+        YY_BUFFER_STATE, void * );
+int virtualStructConditionalGrammarYylex_init (void ** yyscanner);
+int virtualStructConditionalGrammarYylex_destroy (void * yyscanner);
+
+
+
+//----------------------------------------------------------------------------
+
+MatfiltVstructConditionalEvaluator::Ptr
+MatfiltVstructConditionalEvaluator::Parse(const std::string & inputExpr)
+{
+    _VSCGParserData data;
+    if (virtualStructConditionalGrammarYylex_init(&data.yyscanner)) {
+        TF_CODING_ERROR("_VSCGParser: error initializing scanner");
+        return nullptr;
+    }
+    YY_BUFFER_STATE bufferstate =
+        virtualStructConditionalGrammarYy_scan_string(
+                inputExpr.c_str(), data.yyscanner);
+    MatfiltVstructConditionalEvaluator::Ptr result(
+            new MatfiltVstructConditionalEvaluator);
+    if (virtualStructConditionalGrammarYyparse(&data) == 0) {
+        //hintsAttr = data.getHints(prefix, secondaryPrefix);
+        
+        result->_impl = new MatfiltVstructConditionalEvaluatorImpl;
+
+        result->_impl->condition = data.rootCondition;
+        result->_impl->action = data.action;
+        result->_impl->fallbackAction = data.fallbackAction;
+
+        data.rootCondition = nullptr;
+        data.action = nullptr;
+        data.fallbackAction = nullptr;
+    } else {
+        TF_CODING_ERROR("_VSCGParser: Error parsing '%s'", inputExpr.c_str());
+    }
+    if (!data.parseError.empty()) {
+        TF_CODING_ERROR("_VSCGParser: Error parsing '%s': %s",
+                inputExpr.c_str(),
+                data.parseError.c_str());
+    }
+
+    virtualStructConditionalGrammarYy_delete_buffer(
+            bufferstate, data.yyscanner);
+    virtualStructConditionalGrammarYylex_destroy(data.yyscanner);
+
+    // TODO
+    return result;
+}
+
+void MatfiltVstructConditionalEvaluator::Evaluate(
+    const TfToken & nodeId,
+    const TfToken & nodeInputId,
+    const TfToken & upstreamNodeId,
+    const TfToken & upstreamNodeOutput,
+    const NdrTokenVec & shaderTypePriority,
+    HdMaterialNetworkInterface *interface) const
+{
+    if (!_impl) {
+        TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: No impl");
+        return;
+    }
+
+    // if it's already connected explicitly, don't do anything
+    if (!interface->GetNodeInputConnection(nodeId, nodeInputId).empty()) {
+        return;
+    }
+
+    _VSCGAction * chosenAction = nullptr;
+
+    // confirm upstream node
+    if (interface->GetNodeType(upstreamNodeId).IsEmpty()) {
+        // No upstream node; silently ignore
+        return;
+    }
+
+
+    // Decide action to perform.
+    if (_impl->condition) {
+        if (_impl->condition->Eval(interface, upstreamNodeId,
+                shaderTypePriority)) {
+            chosenAction = _impl->action;
+        } else {
+            chosenAction = _impl->fallbackAction;
+        }            
+    } else {
+        chosenAction = _impl->action;
+    }
+    if (!chosenAction) {
+        TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: NULL action");
+        return;
+    }
+
+    // Execute action.
+    switch (chosenAction->action) {
+    case _VSCGAction::Ignore:
+        break;
+    case _VSCGAction::Connect:
+        interface->SetNodeInputConnection(nodeId, nodeInputId, {{
+            upstreamNodeId, upstreamNodeOutput}});
+        break;
+    case _VSCGAction::SetConstant:
+    {
+        // convert the constant to the expected type    
+        auto& reg = SdrRegistry::GetInstance();
+        SdrShaderNodeConstPtr sdrNode = 
+                reg.GetShaderNodeByIdentifier(
+                        interface->GetNodeType(nodeId), shaderTypePriority);
+        if (!sdrNode) {
+            // TODO, warn
+            break;
+        }
+        NdrPropertyConstPtr ndrProp = sdrNode->GetInput(nodeInputId);
+        if (!ndrProp) {
+            // TODO, warn
+            break;
+        }
+        VtValue value = chosenAction->value;
+        TfToken inputType = ndrProp->GetType();
+        if (value.IsHolding<std::string>()) {
+            if (inputType == SdrPropertyTypes->String) {
+                interface->SetNodeParameterValue(nodeId, nodeInputId, value);
+                //node.parameters[nodeInput] = value;
+            } else {
+                TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: "
+                        "Expected string but found %s\n",
+                        inputType.GetText());
+                break;
+            }
+        } else if (value.IsHolding<double>()) {
+            // parser always stores numbers as double.
+            double doubleValue = value.UncheckedGet<double>();
+            VtValue resultValue;
+            if (inputType == SdrPropertyTypes->Int) {
+                resultValue = VtValue(static_cast<int>(doubleValue));
+            } else if (inputType == SdrPropertyTypes->Float) {
+                resultValue = VtValue(static_cast<float>(doubleValue));
+            }
+            if (!resultValue.IsEmpty()) {
+                interface->SetNodeParameterValue(
+                    nodeId, nodeInputId, resultValue);
+            } else {
+                TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: "
+                        "Empty result");
+            }
+            break;
+        } else {
+            TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: "
+                    "Unhandled type %s\n",
+                    value.GetTypeName().c_str());
+            break;
+        }
+        break;
+    }
+    case _VSCGAction::CopyParam:
+    {
+        if (chosenAction->value.IsHolding<TfToken>()) {
+            const TfToken & copyParamName =
+                    chosenAction->value.UncheckedGet<TfToken>();
+            // confirm that parameter types are equivalent
+            // via Sdr                            
+            auto& reg = SdrRegistry::GetInstance();
+            SdrShaderNodeConstPtr sdrNode = 
+                    reg.GetShaderNodeByIdentifier(
+                            interface->GetNodeType(nodeId), shaderTypePriority);
+            SdrShaderNodeConstPtr sdrUpstreamNode = 
+                    reg.GetShaderNodeByIdentifier(
+                            interface->GetNodeType(upstreamNodeId),
+                            shaderTypePriority);
+            if (!sdrNode || !sdrUpstreamNode) {
+                // TODO warn?
+                break;
+            }
+            NdrPropertyConstPtr ndrProp =
+                    sdrNode->GetInput(nodeInputId);
+
+            NdrPropertyConstPtr ndrUpstreamProp =
+                    sdrUpstreamNode->GetInput(copyParamName);
+
+            if (!ndrProp || !ndrUpstreamProp) {
+                // TODO warn?
+                break;
+            }
+
+            // TODO, convert between int and float
+            if (ndrProp->GetType() == ndrUpstreamProp->GetType()) {
+
+                VtValue value =
+                    interface->GetNodeParameterValue(
+                        upstreamNodeId, copyParamName);
+
+                if (!value.IsEmpty()) {
+                    interface->SetNodeParameterValue(
+                        nodeId, nodeInputId, value);
+                } else {
+                    // use default
+                    interface->SetNodeParameterValue(
+                        nodeId, nodeInputId, ndrUpstreamProp->GetDefaultValue());
+                }
+            } else {
+                // TODO warn?
+            }
+        }
+        break;
+    }
+    }
+    // TODO
+}
+
+MatfiltVstructConditionalEvaluator::~MatfiltVstructConditionalEvaluator() {
+    delete _impl;
+}
+
diff --git a/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.tab.h b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.tab.h
new file mode 100644
index 0000000000..b73e486683
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.tab.h
@@ -0,0 +1,115 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     NUMBER = 258,
+     STRING = 259,
+     PARAM = 260,
+     LPAR = 261,
+     RPAR = 262,
+     OP_EQ = 263,
+     OP_NOTEQ = 264,
+     OP_GT = 265,
+     OP_LT = 266,
+     OP_GTEQ = 267,
+     OP_LTEQ = 268,
+     OP_IS = 269,
+     OP_ISNOT = 270,
+     OP_AND = 271,
+     OP_OR = 272,
+     KW_IF = 273,
+     KW_ELSE = 274,
+     KW_CONNECTED = 275,
+     KW_CONNECT = 276,
+     KW_IGNORE = 277,
+     KW_COPY = 278,
+     KW_SET = 279,
+     UNRECOGNIZED_TOKEN = 280
+   };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 1676 of yacc.c  */
+#line 469 "hdPrman/virtualStructConditionalGrammar.yy"
+
+  double number;
+  char * string;
+  struct _VSCGConditionalBase * condition;
+  struct _VSCGAction * action;
+  struct _VSCGValueContainer * value;
+
+
+
+/* Line 1676 of yacc.c  */
+#line 87 "hdPrman/virtualStructConditionalGrammar.tab.h"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
+typedef struct YYLTYPE
+{
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;
+} YYLTYPE;
+# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
+# define YYLTYPE_IS_DECLARED 1
+# define YYLTYPE_IS_TRIVIAL 1
+#endif
+
+
+
diff --git a/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.yy b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.yy
new file mode 100644
index 0000000000..386a6b71bc
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/virtualStructConditionalGrammar.yy
@@ -0,0 +1,1512 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+%define api.pure
+%error-verbose
+%locations
+%parse-param { _VSCGParserData * data  }
+%lex-param { void * MACRO_YYSCANNER }
+
+%{
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <math.h>
+#include <iostream>
+#include <sstream>
+#include <vector>
+
+#include "hdPrman/debugCodes.h"
+#include "hdPrman/matfiltResolveVstructs.h"
+
+#include "pxr/pxr.h"
+#include "pxr/imaging/hd/material.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "pxr/usd/sdr/registry.h"
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+// ---------------------------------------------------------------------------
+
+struct _VSCGConditionalBase
+{
+    virtual ~_VSCGConditionalBase() = default;
+    
+    typedef std::shared_ptr<_VSCGConditionalBase> Ptr;
+
+    virtual bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) = 0;
+};
+
+// ---------------------------------------------------------------------------
+
+namespace // anonymous
+{
+
+struct ConditionalParamBase : public _VSCGConditionalBase
+{
+    ConditionalParamBase(const TfToken & name)
+    : paramName(name)
+    {}
+
+    TfToken paramName;
+};
+
+struct ConditionalParamIsConnected : public ConditionalParamBase
+{
+    ConditionalParamIsConnected(const TfToken & name)
+    : ConditionalParamBase(name) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return !interface->GetNodeInputConnection(nodeName, paramName).empty();
+    }
+};
+
+struct ConditionalParamIsNotConnected : public ConditionalParamBase
+{
+    ConditionalParamIsNotConnected(const TfToken & name)
+    : ConditionalParamBase(name) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return interface->GetNodeInputConnection(nodeName, paramName).empty();
+    }
+};
+
+struct ConditionalParamIsSet : public ConditionalParamBase
+{
+    ConditionalParamIsSet(const TfToken & name)
+    : ConditionalParamBase(name) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return !interface->GetNodeParameterValue(nodeName, paramName).IsEmpty();
+    }
+};
+
+struct ConditionalParamIsNotSet : public ConditionalParamBase
+{
+    ConditionalParamIsNotSet(const TfToken & name)
+    : ConditionalParamBase(name) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return interface->GetNodeParameterValue(nodeName, paramName).IsEmpty();
+    }
+};
+
+struct ConditionalParamCmpBase : public ConditionalParamBase
+{
+    ConditionalParamCmpBase(const TfToken & name, const VtValue & v)
+    : ConditionalParamBase(name) , value(v) {}
+
+    VtValue value;
+
+    static bool ValueAsNumber(const VtValue v, double * result) {
+        if (v.IsHolding<float>()) {
+            *result = v.UncheckedGet<float>();
+            return true;
+        }
+        
+        if (v.IsHolding<int>()) {
+            *result = v.UncheckedGet<int>();
+            return true;
+        }
+
+        if (v.IsHolding<double>()) {
+            *result = v.UncheckedGet<double>();
+            return true;
+        }
+
+        if (v.IsHolding<bool>()) {
+            *result = v.UncheckedGet<bool>();
+            return true;
+        }
+
+        // TODO check color?
+
+        return false;
+    }
+
+    static bool GetParameterValue(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const TfToken & paramName,
+        const NdrTokenVec & shaderTypePriority,
+        VtValue * result)
+    {
+        
+        *result = interface->GetNodeParameterValue(nodeName, paramName);
+
+        if (!result->IsEmpty()) {
+            return true;
+        }
+
+        // check for a default
+        auto& reg = SdrRegistry::GetInstance();
+
+        if (SdrShaderNodeConstPtr sdrNode = reg.GetShaderNodeByIdentifier(
+                interface->GetNodeType(nodeName), shaderTypePriority)) {
+            if (NdrPropertyConstPtr ndrProp = sdrNode->GetInput(paramName)) {
+                *result = ndrProp->GetDefaultValue();
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    virtual bool CompareNumber(double v1, double v2) = 0;
+    virtual bool CompareString(
+            const std::string & v1, const std::string & v2) = 0;
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        VtValue paramValue;
+        if (!GetParameterValue(interface,
+                nodeName, paramName, shaderTypePriority, &paramValue)) {
+            return false;
+        }
+
+        if (value.IsHolding<std::string>()) {
+            if (paramValue.IsHolding<std::string>()) {
+                return CompareString(value.UncheckedGet<std::string>(),
+                        paramValue.UncheckedGet<std::string>());
+            }
+            return false;
+        }
+
+        double d1 = 0, d2 = 0;
+
+        if (ValueAsNumber(paramValue, &d1) && ValueAsNumber(value, &d2)) {    
+            
+            //std::cerr << d1 << " " << d2 << std::endl;
+            return CompareNumber(d1, d2);
+        }
+
+        return false;
+    }
+
+};
+
+
+struct ConditionalParamCmpEqualTo : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpEqualTo(const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+    
+    bool CompareNumber(double v1, double v2) override {
+        return v1 == v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return v1 == v2;
+    }
+};
+
+struct ConditionalParamCmpNotEqualTo : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpNotEqualTo(const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 != v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return v1 != v2;
+    }
+};
+
+
+struct ConditionalParamCmpGreaterThan : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpGreaterThan(const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {
+    }
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 > v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return false;
+    }
+};
+
+struct ConditionalParamCmpLessThan : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpLessThan(const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 < v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return false;
+    }
+};
+
+struct ConditionalParamCmpGreaterThanOrEqualTo
+    : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpGreaterThanOrEqualTo(
+            const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 >= v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return false;
+    }
+};
+
+
+struct ConditionalParamCmpLessThanOrEqualTo : public ConditionalParamCmpBase
+{
+    ConditionalParamCmpLessThanOrEqualTo(
+            const TfToken & name, const VtValue & v)
+    : ConditionalParamCmpBase(name, v) {}
+
+    bool CompareNumber(double v1, double v2) override {
+        return v1 <= v2;
+    }
+
+    bool CompareString(const std::string & v1, const std::string & v2)
+            override {
+        return false;
+    }
+};
+
+struct ConditionalAnd : _VSCGConditionalBase
+{
+    ConditionalAnd(_VSCGConditionalBase * left, _VSCGConditionalBase * right)
+    : _VSCGConditionalBase(), left(left), right(right) {}
+
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return (left && left->Eval(interface, nodeName, shaderTypePriority))
+                && (right && right->Eval(
+                    interface, nodeName, shaderTypePriority)); 
+    }
+
+    ~ConditionalAnd() {
+        delete left;
+        delete right;
+    }
+
+    _VSCGConditionalBase * left;
+    _VSCGConditionalBase * right;
+};
+
+struct ConditionalOr : _VSCGConditionalBase
+{
+    ConditionalOr(_VSCGConditionalBase * left, _VSCGConditionalBase * right)
+    : _VSCGConditionalBase(), left(left), right(right) {}
+
+    ~ConditionalOr() {
+        delete left;
+        delete right;
+    }
+    bool Eval(
+        const HdMaterialNetworkInterface *interface,
+        const TfToken &nodeName,
+        const NdrTokenVec & shaderTypePriority) override
+    {
+        return (left && left->Eval(interface, nodeName, shaderTypePriority))
+                || (right && right->Eval(
+                    interface, nodeName, shaderTypePriority)); 
+    }
+
+    _VSCGConditionalBase * left;
+    _VSCGConditionalBase * right;
+};
+
+
+//----------------------------------------------------------------------------
+
+
+} // namespace anonymous
+
+
+struct _VSCGValueContainer
+{
+    _VSCGValueContainer(const VtValue & v)
+    : value(v) {}
+
+    VtValue value;
+};
+
+struct _VSCGAction {
+
+    enum Action
+    {
+        Connect,
+        Ignore,
+        SetConstant,
+        CopyParam,
+    };
+
+    _VSCGAction(Action action)
+    : action(action) {}
+    _VSCGAction(Action action, const VtValue & value)
+    : action(action), value(value) {}
+
+    Action action;
+    VtValue value;
+};
+
+
+struct _VSCGParserData {
+
+    // flex scanner
+    void * yyscanner;
+    std::string parseError;
+
+    _VSCGAction * action = nullptr;
+    _VSCGAction * fallbackAction = nullptr;
+    
+    std::set<_VSCGConditionalBase *> _intermediateConditions;
+
+    _VSCGConditionalBase * NewCondition(_VSCGConditionalBase * condition) {
+        _intermediateConditions.insert(condition);
+        return condition;
+    }
+
+    _VSCGConditionalBase * ClaimCondition(_VSCGConditionalBase * condition) {
+        _intermediateConditions.erase(condition);
+        return condition;
+    }
+
+    _VSCGConditionalBase * rootCondition = nullptr;
+
+    ~_VSCGParserData() {
+        delete action;
+        delete fallbackAction;
+
+        for (auto c : _intermediateConditions) {
+            delete c;
+        }
+        _intermediateConditions.clear();
+    }
+};
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class MatfiltVstructConditionalEvaluatorImpl
+{
+public:
+
+    ~MatfiltVstructConditionalEvaluatorImpl() {
+        delete condition;
+        delete action;
+        delete fallbackAction;
+    }
+
+    _VSCGConditionalBase * condition = nullptr;
+    _VSCGAction * action = nullptr;
+    _VSCGAction * fallbackAction = nullptr;
+    
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#include "virtualStructConditionalGrammar.tab.h"
+ 
+%}
+
+%union {
+  double number;
+  char * string;
+  struct _VSCGConditionalBase * condition;
+  struct _VSCGAction * action;
+  struct _VSCGValueContainer * value;
+};
+
+%destructor {
+  if ($$)
+  {
+      free($$);
+  }
+  $$ = 0;
+} <string>
+
+%destructor {
+  if ($$)
+  {
+      delete $$;
+  }
+  $$ = 0;
+} <action>
+
+%destructor {
+  if ($$)
+  {
+      delete $$;
+  }
+  $$ = 0;
+} <value>
+
+
+%{
+int virtualStructConditionalGrammarYylex(
+        YYSTYPE * lvalp, YYLTYPE *llocp, void * yyscanner);
+void virtualStructConditionalGrammarYyerror(
+        YYLTYPE *llocp, _VSCGParserData * data, const char *s);
+
+/*This macro is to hack around the fact that
+%lex-param ends up getting cut off, for example:
+%lex-param { void * data->yyscanner}
+Really ends up passing in yyscanner in the YYLEX macro
+*/
+#define MACRO_YYSCANNER data->yyscanner
+%}
+ 
+%start statement
+%token <string> NUMBER
+%token <string> STRING
+%token <string> PARAM
+%token LPAR RPAR
+%token OP_EQ OP_NOTEQ
+%token OP_GT OP_LT OP_GTEQ OP_LTEQ
+%token OP_IS OP_ISNOT
+%token OP_AND OP_OR
+%token KW_IF KW_ELSE KW_CONNECTED KW_CONNECT KW_IGNORE KW_COPY KW_SET
+%token UNRECOGNIZED_TOKEN
+
+%type <value> value
+%type <condition> expr statement
+%type <action> action
+
+
+%left OP_OR
+%left OP_AND
+
+%%
+
+value : STRING  {
+    $$ = new _VSCGValueContainer(VtValue($1));
+    free($1);
+}
+| NUMBER {    
+    $$ = new _VSCGValueContainer(VtValue(atof($1)));
+    free($1);
+}
+
+// op : OP_EQ      {data->curEq = "paramEqualTo";}
+//  | OP_NOTEQ     {data->curEq = "paramNotEqualTo";}
+//  | OP_GT        {data->curEq = "paramGreaterThan";}
+//  | OP_LT        {data->curEq = "paramLessThan";}
+//  | OP_GTEQ      {data->curEq = "paramGreaterThanOrEqualTo";}
+//  | OP_LTEQ      {data->curEq = "paramLessThanOrEqualTo";}
+
+// TODO, operators
+expr: PARAM OP_EQ value {
+
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken($1), $3->value));
+
+    free($1);
+    delete $3;
+}
+| OP_AND OP_EQ value {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("and"), $3->value));
+    delete $3;
+}
+| OP_OR OP_EQ value {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("or"), $3->value));
+    delete $3;
+}
+| OP_IS OP_EQ value {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("is"), $3->value));
+    delete $3;
+}
+
+| KW_IF OP_EQ value {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("if"), $3->value));
+    delete $3;
+}
+| KW_ELSE OP_EQ value {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("else"), $3->value));
+    delete $3;
+}
+| KW_CONNECTED OP_EQ value {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("connected"), $3->value));
+    delete $3;
+}
+| KW_CONNECT OP_EQ value {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("connect"), $3->value));
+    delete $3;
+}
+| KW_IGNORE OP_EQ value {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("ignore"), $3->value));
+    delete $3;
+} 
+| KW_COPY OP_EQ value {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("copy"), $3->value));
+    delete $3;
+} 
+| KW_SET OP_EQ value {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpEqualTo(TfToken("set"), $3->value));
+    delete $3;
+}
+
+//--- NOTEQ
+| PARAM OP_NOTEQ value {
+
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken($1), $3->value));
+
+    free($1);
+    delete $3;
+}
+| OP_AND OP_NOTEQ value {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("and"), $3->value));
+    delete $3;
+}
+| OP_OR OP_NOTEQ value {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("or"), $3->value));
+    delete $3;
+}
+| OP_IS OP_NOTEQ value {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("is"), $3->value));
+    delete $3;
+}
+
+| KW_IF OP_NOTEQ value {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("if"), $3->value));
+    delete $3;
+}
+| KW_ELSE OP_NOTEQ value {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("else"), $3->value));
+    delete $3;
+}
+| KW_CONNECTED OP_NOTEQ value {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(
+                    TfToken("connected"), $3->value));
+    delete $3;
+}
+| KW_CONNECT OP_NOTEQ value {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("connect"), $3->value));
+    delete $3;
+}
+| KW_IGNORE OP_NOTEQ value {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("ignore"), $3->value));
+    delete $3;
+} 
+| KW_COPY OP_NOTEQ value {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("copy"), $3->value));
+    delete $3;
+} 
+| KW_SET OP_NOTEQ value {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpNotEqualTo(TfToken("set"), $3->value));
+    delete $3;
+}
+
+
+//--- GT
+| PARAM OP_GT value {
+
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken($1), $3->value));
+
+    free($1);
+    delete $3;
+}
+| OP_AND OP_GT value {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("and"), $3->value));
+    delete $3;
+}
+| OP_OR OP_GT value {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("or"), $3->value));
+    delete $3;
+}
+| OP_IS OP_GT value {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("is"), $3->value));
+    delete $3;
+}
+
+| KW_IF OP_GT value {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("if"), $3->value));
+    delete $3;
+}
+| KW_ELSE OP_GT value {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("else"), $3->value));
+    delete $3;
+}
+| KW_CONNECTED OP_GT value {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(
+                    TfToken("connected"), $3->value));
+    delete $3;
+}
+| KW_CONNECT OP_GT value {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("connect"), $3->value));
+    delete $3;
+}
+| KW_IGNORE OP_GT value {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("ignore"), $3->value));
+    delete $3;
+} 
+| KW_COPY OP_GT value {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("copy"), $3->value));
+    delete $3;
+} 
+| KW_SET OP_GT value {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThan(TfToken("set"), $3->value));
+    delete $3;
+}
+
+
+//--- LT
+| PARAM OP_LT value {
+
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken($1), $3->value));
+
+    free($1);
+    delete $3;
+}
+| OP_AND OP_LT value {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("and"), $3->value));
+    delete $3;
+}
+| OP_OR OP_LT value {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("or"), $3->value));
+    delete $3;
+}
+| OP_IS OP_LT value {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("is"), $3->value));
+    delete $3;
+}
+
+| KW_IF OP_LT value {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("if"), $3->value));
+    delete $3;
+}
+| KW_ELSE OP_LT value {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("else"), $3->value));
+    delete $3;
+}
+| KW_CONNECTED OP_LT value {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("connected"), $3->value));
+    delete $3;
+}
+| KW_CONNECT OP_LT value {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("connect"), $3->value));
+    delete $3;
+}
+| KW_IGNORE OP_LT value {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("ignore"), $3->value));
+    delete $3;
+} 
+| KW_COPY OP_LT value {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("copy"), $3->value));
+    delete $3;
+} 
+| KW_SET OP_LT value {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThan(TfToken("set"), $3->value));
+    delete $3;
+}
+
+//--- GTEQ
+| PARAM OP_GTEQ value {
+
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken($1),
+                    $3->value));
+
+    free($1);
+    delete $3;
+}
+| OP_AND OP_GTEQ value {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("and"),
+                    $3->value));
+    delete $3;
+}
+| OP_OR OP_GTEQ value {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("or"),
+                    $3->value));
+    delete $3;
+}
+| OP_IS OP_GTEQ value {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("is"),
+                    $3->value));
+    delete $3;
+}
+
+| KW_IF OP_GTEQ value {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("if"),
+                    $3->value));
+    delete $3;
+}
+| KW_ELSE OP_GTEQ value {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("else"),
+                    $3->value));
+    delete $3;
+}
+| KW_CONNECTED OP_GTEQ value {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("connected"),
+                    $3->value));
+    delete $3;
+}
+| KW_CONNECT OP_GTEQ value {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("connect"),
+                    $3->value));
+    delete $3;
+}
+| KW_IGNORE OP_GTEQ value {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("ignore"),
+                    $3->value));
+    delete $3;
+} 
+| KW_COPY OP_GTEQ value {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("copy"),
+                    $3->value));
+    delete $3;
+} 
+| KW_SET OP_GTEQ value {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpGreaterThanOrEqualTo(TfToken("set"),
+                    $3->value));
+    delete $3;
+}
+
+
+//--- LTEQ
+| PARAM OP_LTEQ value {
+
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken($1),
+                    $3->value));
+
+    free($1);
+    delete $3;
+}
+| OP_AND OP_LTEQ value {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("and"),
+                    $3->value));
+    delete $3;
+}
+| OP_OR OP_LTEQ value {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("or"),
+                    $3->value));
+    delete $3;
+}
+| OP_IS OP_LTEQ value {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("is"),
+                    $3->value));
+    delete $3;
+}
+
+| KW_IF OP_LTEQ value {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("if"),
+                    $3->value));
+    delete $3;
+}
+| KW_ELSE OP_LTEQ value {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("else"),
+                    $3->value));
+    delete $3;
+}
+| KW_CONNECTED OP_LTEQ value {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("connected"),
+                    $3->value));
+    delete $3;
+}
+| KW_CONNECT OP_LTEQ value {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("connect"),
+                    $3->value));
+    delete $3;
+}
+| KW_IGNORE OP_LTEQ value {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("ignore"),
+                    $3->value));
+    delete $3;
+} 
+| KW_COPY OP_LTEQ value {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("copy"),
+                    $3->value));
+    delete $3;
+} 
+| KW_SET OP_LTEQ value {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(
+            new ConditionalParamCmpLessThanOrEqualTo(TfToken("set"),
+                    $3->value));
+    delete $3;
+}
+
+
+
+//--- ISCONNECTED
+| PARAM OP_IS KW_CONNECTED  {
+
+    $$ = data->NewCondition(new ConditionalParamIsConnected(TfToken($1)));
+    free($1);
+}
+| OP_AND OP_IS KW_CONNECTED  {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(TfToken("and")));
+}
+| OP_OR OP_IS KW_CONNECTED  {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(TfToken("or")));
+}
+| OP_IS OP_IS KW_CONNECTED  {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(TfToken("is")));
+}
+
+| KW_IF OP_IS KW_CONNECTED  {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(TfToken("if")));
+}
+| KW_ELSE OP_IS KW_CONNECTED  {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(TfToken("else")));
+}
+| KW_CONNECTED OP_IS KW_CONNECTED  {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(
+            TfToken("connected")));
+}
+| KW_CONNECT OP_IS KW_CONNECTED  {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(
+            TfToken("connect")));
+}
+| KW_IGNORE OP_IS KW_CONNECTED  {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(
+            TfToken("ignore")));
+} 
+| KW_COPY OP_IS KW_CONNECTED  {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(TfToken("copy")));
+} 
+| KW_SET OP_IS KW_CONNECTED  {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(new ConditionalParamIsConnected(TfToken("set")));
+}
+
+
+//--- IS NOT CONNECTED
+| PARAM OP_ISNOT KW_CONNECTED  {
+
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(TfToken($1)));
+    free($1);
+}
+| OP_AND OP_ISNOT KW_CONNECTED  {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("and")));
+}
+| OP_OR OP_ISNOT KW_CONNECTED  {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("or")));
+}
+| OP_IS OP_ISNOT KW_CONNECTED  {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("is")));
+}
+
+| KW_IF OP_ISNOT KW_CONNECTED  {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("if")));
+}
+| KW_ELSE OP_ISNOT KW_CONNECTED  {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("else")));
+}
+| KW_CONNECTED OP_ISNOT KW_CONNECTED  {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("connected")));
+}
+| KW_CONNECT OP_ISNOT KW_CONNECTED  {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("connect")));
+}
+| KW_IGNORE OP_ISNOT KW_CONNECTED  {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("ignore")));
+} 
+| KW_COPY OP_ISNOT KW_CONNECTED  {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("copy")));
+} 
+| KW_SET OP_ISNOT KW_CONNECTED  {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotConnected(
+            TfToken("set")));
+}
+
+
+
+//--- IS SET
+| PARAM OP_IS KW_SET  {
+
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken($1)));
+    free($1);
+}
+| OP_AND OP_IS KW_SET  {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("and")));
+}
+| OP_OR OP_IS KW_SET  {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("or")));
+}
+| OP_IS OP_IS KW_SET  {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("is")));
+}
+
+| KW_IF OP_IS KW_SET  {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("if")));
+}
+| KW_ELSE OP_IS KW_SET  {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("else")));
+}
+| KW_CONNECTED OP_IS KW_SET  {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("connected")));
+}
+| KW_CONNECT OP_IS KW_SET  {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("connect")));
+}
+| KW_IGNORE OP_IS KW_SET  {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("ignore")));
+} 
+| KW_COPY OP_IS KW_SET  {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("copy")));
+} 
+| KW_SET OP_IS KW_SET  {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(new ConditionalParamIsSet(TfToken("set")));
+}
+
+
+//--- IS NOT SET
+| PARAM OP_ISNOT KW_SET  {
+
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken($1)));
+    free($1);
+}
+| OP_AND OP_ISNOT KW_SET  {
+    /* PARAM named 'and', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("and")));
+}
+| OP_OR OP_ISNOT KW_SET  {
+    /* PARAM named 'or', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("or")));
+}
+| OP_IS OP_ISNOT KW_SET  {
+    /* PARAM named 'is', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("is")));
+}
+
+| KW_IF OP_ISNOT KW_SET  {
+    /* PARAM named 'if', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("if")));
+}
+| KW_ELSE OP_ISNOT KW_SET  {
+    /* PARAM named 'else', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("else")));
+}
+| KW_CONNECTED OP_ISNOT KW_SET  {
+    /* PARAM named 'connected', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(
+            TfToken("connected")));
+}
+| KW_CONNECT OP_ISNOT KW_SET  {
+    /* PARAM named 'connect', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("connect")));
+}
+| KW_IGNORE OP_ISNOT KW_SET  {
+        /* PARAM named 'ignore', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("ignore")));
+} 
+| KW_COPY OP_ISNOT KW_SET  {
+        /* PARAM named 'copy', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("copy")));
+} 
+| KW_SET OP_ISNOT KW_SET  {
+        /* PARAM named 'set', special case */
+    $$ = data->NewCondition(new ConditionalParamIsNotSet(TfToken("set")));
+}
+
+
+
+ | LPAR expr RPAR {
+    $$ = $2;
+ }
+ | expr OP_AND expr {
+    $$ = data->NewCondition(new ConditionalAnd(
+            data->ClaimCondition($1),
+            data->ClaimCondition($3)));
+ }
+ | expr OP_OR expr {
+
+    $$ = data->NewCondition(new ConditionalOr(
+            data->ClaimCondition($1),
+            data->ClaimCondition($3))); 
+ }
+action : KW_COPY PARAM {
+
+    TfToken paramName($2);
+    free($2);
+
+    $$ = new _VSCGAction(_VSCGAction::CopyParam, VtValue(paramName));
+
+} 
+| KW_CONNECT {
+    $$ = new _VSCGAction(_VSCGAction::Connect);
+   
+}
+| KW_IGNORE {
+   $$ = new _VSCGAction(_VSCGAction::Ignore);
+}
+| KW_SET STRING {
+
+    std::string value($2);
+    free($2);
+    $$ = new _VSCGAction(_VSCGAction::SetConstant, VtValue(value));
+}
+| KW_SET NUMBER {
+    $$ = new _VSCGAction(_VSCGAction::SetConstant, VtValue(atof($2)));
+   free($2);
+}
+    
+    
+    
+
+
+
+statement : action KW_IF expr KW_ELSE action {
+    data->action = $1;
+    data->rootCondition = data->ClaimCondition($3);
+    data->fallbackAction = $5;
+ }
+ | action KW_IF expr {
+    data->action = $1;
+    data->rootCondition = data->ClaimCondition($3);
+
+    if ($1->action == _VSCGAction::Ignore) {
+        data->fallbackAction = new _VSCGAction(_VSCGAction::Connect);
+    } else {
+        data->fallbackAction = new _VSCGAction(_VSCGAction::Ignore);
+    }
+ 
+ }
+ | KW_IF expr KW_ELSE action {
+    
+    data->action = new _VSCGAction(_VSCGAction::Connect);
+
+    data->rootCondition = data->ClaimCondition($2);
+
+
+    data->fallbackAction = $4;
+    
+ }
+ | action  {
+    data->action = $1;
+ }
+ | expr {
+    data->action = new _VSCGAction(_VSCGAction::Connect);
+    data->rootCondition = data->ClaimCondition($1);
+    data->fallbackAction = new _VSCGAction(_VSCGAction::Ignore);
+ }
+ 
+
+%%
+
+
+ 
+
+/* Called by yyparse on error */
+void virtualStructConditionalGrammarYyerror(
+        YYLTYPE *llocp, _VSCGParserData * data, const char *s)
+{
+    data->parseError = s;
+}
+
+typedef struct yy_buffer_state * YY_BUFFER_STATE;
+YY_BUFFER_STATE virtualStructConditionalGrammarYy_scan_string(
+        const char *, void * );
+void virtualStructConditionalGrammarYy_delete_buffer(
+        YY_BUFFER_STATE, void * );
+int virtualStructConditionalGrammarYylex_init (void ** yyscanner);
+int virtualStructConditionalGrammarYylex_destroy (void * yyscanner);
+
+
+
+//----------------------------------------------------------------------------
+
+MatfiltVstructConditionalEvaluator::Ptr
+MatfiltVstructConditionalEvaluator::Parse(const std::string & inputExpr)
+{
+    _VSCGParserData data;
+    if (virtualStructConditionalGrammarYylex_init(&data.yyscanner)) {
+        TF_CODING_ERROR("_VSCGParser: error initializing scanner");
+        return nullptr;
+    }
+    YY_BUFFER_STATE bufferstate =
+        virtualStructConditionalGrammarYy_scan_string(
+                inputExpr.c_str(), data.yyscanner);
+    MatfiltVstructConditionalEvaluator::Ptr result(
+            new MatfiltVstructConditionalEvaluator);
+    if (virtualStructConditionalGrammarYyparse(&data) == 0) {
+        //hintsAttr = data.getHints(prefix, secondaryPrefix);
+        
+        result->_impl = new MatfiltVstructConditionalEvaluatorImpl;
+
+        result->_impl->condition = data.rootCondition;
+        result->_impl->action = data.action;
+        result->_impl->fallbackAction = data.fallbackAction;
+
+        data.rootCondition = nullptr;
+        data.action = nullptr;
+        data.fallbackAction = nullptr;
+    } else {
+        TF_CODING_ERROR("_VSCGParser: Error parsing '%s'", inputExpr.c_str());
+    }
+    if (!data.parseError.empty()) {
+        TF_CODING_ERROR("_VSCGParser: Error parsing '%s': %s",
+                inputExpr.c_str(),
+                data.parseError.c_str());
+    }
+
+    virtualStructConditionalGrammarYy_delete_buffer(
+            bufferstate, data.yyscanner);
+    virtualStructConditionalGrammarYylex_destroy(data.yyscanner);
+
+    // TODO
+    return result;
+}
+
+void MatfiltVstructConditionalEvaluator::Evaluate(
+    const TfToken & nodeId,
+    const TfToken & nodeInputId,
+    const TfToken & upstreamNodeId,
+    const TfToken & upstreamNodeOutput,
+    const NdrTokenVec & shaderTypePriority,
+    HdMaterialNetworkInterface *interface) const
+{
+    if (!_impl) {
+        TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: No impl");
+        return;
+    }
+
+    // if it's already connected explicitly, don't do anything
+    if (!interface->GetNodeInputConnection(nodeId, nodeInputId).empty()) {
+        return;
+    }
+
+    _VSCGAction * chosenAction = nullptr;
+
+    // confirm upstream node
+    if (interface->GetNodeType(upstreamNodeId).IsEmpty()) {
+        // No upstream node; silently ignore
+        return;
+    }
+
+
+    // Decide action to perform.
+    if (_impl->condition) {
+        if (_impl->condition->Eval(interface, upstreamNodeId,
+                shaderTypePriority)) {
+            chosenAction = _impl->action;
+        } else {
+            chosenAction = _impl->fallbackAction;
+        }            
+    } else {
+        chosenAction = _impl->action;
+    }
+    if (!chosenAction) {
+        TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: NULL action");
+        return;
+    }
+
+    // Execute action.
+    switch (chosenAction->action) {
+    case _VSCGAction::Ignore:
+        break;
+    case _VSCGAction::Connect:
+        interface->SetNodeInputConnection(nodeId, nodeInputId, {{
+            upstreamNodeId, upstreamNodeOutput}});
+        break;
+    case _VSCGAction::SetConstant:
+    {
+        // convert the constant to the expected type    
+        auto& reg = SdrRegistry::GetInstance();
+        SdrShaderNodeConstPtr sdrNode = 
+                reg.GetShaderNodeByIdentifier(
+                        interface->GetNodeType(nodeId), shaderTypePriority);
+        if (!sdrNode) {
+            // TODO, warn
+            break;
+        }
+        NdrPropertyConstPtr ndrProp = sdrNode->GetInput(nodeInputId);
+        if (!ndrProp) {
+            // TODO, warn
+            break;
+        }
+        VtValue value = chosenAction->value;
+        TfToken inputType = ndrProp->GetType();
+        if (value.IsHolding<std::string>()) {
+            if (inputType == SdrPropertyTypes->String) {
+                interface->SetNodeParameterValue(nodeId, nodeInputId, value);
+                //node.parameters[nodeInput] = value;
+            } else {
+                TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: "
+                        "Expected string but found %s\n",
+                        inputType.GetText());
+                break;
+            }
+        } else if (value.IsHolding<double>()) {
+            // parser always stores numbers as double.
+            double doubleValue = value.UncheckedGet<double>();
+            VtValue resultValue;
+            if (inputType == SdrPropertyTypes->Int) {
+                resultValue = VtValue(static_cast<int>(doubleValue));
+            } else if (inputType == SdrPropertyTypes->Float) {
+                resultValue = VtValue(static_cast<float>(doubleValue));
+            }
+            if (!resultValue.IsEmpty()) {
+                interface->SetNodeParameterValue(
+                    nodeId, nodeInputId, resultValue);
+            } else {
+                TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: "
+                        "Empty result");
+            }
+            break;
+        } else {
+            TF_CODING_ERROR("MatfiltVstructConditionalEvaluator: "
+                    "Unhandled type %s\n",
+                    value.GetTypeName().c_str());
+            break;
+        }
+        break;
+    }
+    case _VSCGAction::CopyParam:
+    {
+        if (chosenAction->value.IsHolding<TfToken>()) {
+            const TfToken & copyParamName =
+                    chosenAction->value.UncheckedGet<TfToken>();
+            // confirm that parameter types are equivalent
+            // via Sdr                            
+            auto& reg = SdrRegistry::GetInstance();
+            SdrShaderNodeConstPtr sdrNode = 
+                    reg.GetShaderNodeByIdentifier(
+                            interface->GetNodeType(nodeId), shaderTypePriority);
+            SdrShaderNodeConstPtr sdrUpstreamNode = 
+                    reg.GetShaderNodeByIdentifier(
+                            interface->GetNodeType(upstreamNodeId),
+                            shaderTypePriority);
+            if (!sdrNode || !sdrUpstreamNode) {
+                // TODO warn?
+                break;
+            }
+            NdrPropertyConstPtr ndrProp =
+                    sdrNode->GetInput(nodeInputId);
+
+            NdrPropertyConstPtr ndrUpstreamProp =
+                    sdrUpstreamNode->GetInput(copyParamName);
+
+            if (!ndrProp || !ndrUpstreamProp) {
+                // TODO warn?
+                break;
+            }
+
+            // TODO, convert between int and float
+            if (ndrProp->GetType() == ndrUpstreamProp->GetType()) {
+
+                VtValue value =
+                    interface->GetNodeParameterValue(
+                        upstreamNodeId, copyParamName);
+
+                if (!value.IsEmpty()) {
+                    interface->SetNodeParameterValue(
+                        nodeId, nodeInputId, value);
+                } else {
+                    // use default
+                    interface->SetNodeParameterValue(
+                        nodeId, nodeInputId, ndrUpstreamProp->GetDefaultValue());
+                }
+            } else {
+                // TODO warn?
+            }
+        }
+        break;
+    }
+    }
+    // TODO
+}
+
+MatfiltVstructConditionalEvaluator::~MatfiltVstructConditionalEvaluator() {
+    delete _impl;
+}
diff --git a/third_party/renderman-26/plugin/hdPrman/virtualStructResolvingSceneIndex.cpp b/third_party/renderman-26/plugin/hdPrman/virtualStructResolvingSceneIndex.cpp
new file mode 100644
index 0000000000..9f9caa7a12
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/virtualStructResolvingSceneIndex.cpp
@@ -0,0 +1,45 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/virtualStructResolvingSceneIndex.h"
+#include "hdPrman/matfiltResolveVstructs.h"
+#include "pxr/imaging/hd/materialNetworkInterface.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+static void
+_ResolveVirtualStructsWithConditionals(
+    HdMaterialNetworkInterface *networkInterface)
+{
+    MatfiltResolveVstructs(networkInterface, true);
+}
+
+static void
+_ResolveVirtualStructsWithoutConditionals(
+    HdMaterialNetworkInterface *networkInterface)
+{
+    MatfiltResolveVstructs(networkInterface, false);
+}
+
+HdPrman_VirtualStructResolvingSceneIndex::HdPrman_VirtualStructResolvingSceneIndex(
+    const HdSceneIndexBaseRefPtr &inputSceneIndex, bool applyConditionals)
+: HdMaterialFilteringSceneIndexBase(inputSceneIndex)
+, _applyConditionals(applyConditionals)
+{
+}
+
+HdMaterialFilteringSceneIndexBase::FilteringFnc
+HdPrman_VirtualStructResolvingSceneIndex::_GetFilteringFunction() const
+{
+    // could capture _applyCondition but instead use wrapper function
+    if (_applyConditionals) {
+        return _ResolveVirtualStructsWithConditionals;
+    } else {
+        return _ResolveVirtualStructsWithoutConditionals;
+    }
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/virtualStructResolvingSceneIndex.h b/third_party/renderman-26/plugin/hdPrman/virtualStructResolvingSceneIndex.h
new file mode 100644
index 0000000000..ccebf0d76d
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/virtualStructResolvingSceneIndex.h
@@ -0,0 +1,41 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VIRTUAL_STRUCT_RESOLVING_SCENE_INDEX_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VIRTUAL_STRUCT_RESOLVING_SCENE_INDEX_H
+
+#include "pxr/imaging/hd/materialFilteringSceneIndexBase.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DECLARE_WEAK_AND_REF_PTRS(HdPrman_VirtualStructResolvingSceneIndex);
+
+class HdPrman_VirtualStructResolvingSceneIndex :
+    public HdMaterialFilteringSceneIndexBase
+{
+public:
+
+    static HdPrman_VirtualStructResolvingSceneIndexRefPtr New(
+        const HdSceneIndexBaseRefPtr &inputScene, bool applyConditionals=true) 
+    {
+        return TfCreateRefPtr(
+            new HdPrman_VirtualStructResolvingSceneIndex(
+                inputScene, applyConditionals));
+    }
+
+protected:
+    HdPrman_VirtualStructResolvingSceneIndex(
+        const HdSceneIndexBaseRefPtr &inputSceneIndex, bool applyConditionals);
+
+    FilteringFnc _GetFilteringFunction() const override;
+
+private:
+    bool _applyConditionals;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif //EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VIRTUAL_STRUCT_RESOLVING_SCENE_INDEX_H
diff --git a/third_party/renderman-26/plugin/hdPrman/volume.cpp b/third_party/renderman-26/plugin/hdPrman/volume.cpp
new file mode 100644
index 0000000000..09ed44bb21
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/volume.cpp
@@ -0,0 +1,510 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/volume.h"
+
+#include "hdPrman/renderParam.h"
+#include "hdPrman/instancer.h"
+#include "hdPrman/material.h"
+#include "hdPrman/rixStrings.h"
+#include "pxr/usd/sdf/types.h"
+#include "pxr/usd/usdVol/tokens.h"
+#include "pxr/usdImaging/usdVolImaging/tokens.h"
+#include "pxr/base/gf/matrix4f.h"
+#include "pxr/base/gf/matrix4d.h"
+#include "pxr/base/js/json.h"
+#include "pxr/base/js/types.h"
+#include "pxr/base/js/value.h"
+#include "pxr/base/tf/fileUtils.h"
+
+#ifdef PXR_OPENVDB_SUPPORT_ENABLED
+#include "pxr/imaging/hioOpenVDB/utils.h"
+#endif
+
+#include "Riley.h"
+#include "RiTypesHelper.h"
+#include "RixShadingUtils.h"
+#include "RixPredefinedStrings.hpp"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+HdPrman_Field::HdPrman_Field(TfToken const& typeId, SdfPath const& id)
+    : HdField(id), _typeId(typeId)
+{
+}
+
+void HdPrman_Field::Sync(HdSceneDelegate *sceneDelegate,
+                         HdRenderParam *renderParam,
+                         HdDirtyBits *dirtyBits)
+{
+    if (*dirtyBits & DirtyParams) {
+        // Force volume prim to pick up the new field resources -
+        // in the same way as in HdStField::Sync.
+        //
+        // Ideally, this would be more fine-grained than blasting all
+        // rprims.
+        HdChangeTracker& changeTracker =
+            sceneDelegate->GetRenderIndex().GetChangeTracker();
+        changeTracker.MarkAllRprimsDirty(HdChangeTracker::DirtyVolumeField);
+    }
+
+    *dirtyBits = Clean;
+}
+
+void HdPrman_Field::Finalize(HdRenderParam *renderParam)
+{
+}
+
+HdDirtyBits HdPrman_Field::GetInitialDirtyBitsMask() const
+{
+    // The initial dirty bits control what data is available on the first
+    // run through _PopulateRtVolume(), so it should list every data item
+    // that _PopluateRtVolume requests.
+    int mask = HdChangeTracker::Clean
+        | HdChangeTracker::DirtyTransform
+        | HdChangeTracker::DirtyVisibility
+        | HdChangeTracker::DirtyPrimvar
+        | HdChangeTracker::DirtyMaterialId
+        ;
+    return (HdDirtyBits)mask;
+}
+
+HdPrman_Volume::HdPrman_Volume(SdfPath const& id, const bool isMeshLight)
+    : BASE(id)
+    , _isMeshLight(isMeshLight)
+{
+}
+
+bool HdPrman_Volume::_PrototypeOnly()
+{
+    return _isMeshLight;
+}
+
+HdDirtyBits
+HdPrman_Volume::GetInitialDirtyBitsMask() const
+{
+    // The initial dirty bits control what data is available on the first
+    // run through _PopulateRtVolume(), so it should list every data item
+    // that _PopluateRtVolume requests.
+    int mask = HdChangeTracker::Clean
+        | HdChangeTracker::DirtyTransform
+        | HdChangeTracker::DirtyVisibility
+        | HdChangeTracker::DirtyPrimvar
+        | HdChangeTracker::DirtyMaterialId
+        | HdChangeTracker::DirtyInstancer
+        ;
+
+    return (HdDirtyBits)mask;
+}
+
+namespace { // anonymous namespace
+
+HdPrman_Volume::FieldType
+_DetermineOpenVDBFieldType(HdSceneDelegate *sceneDelegate,
+                           SdfPath const& fieldId)
+{
+    VtValue fieldDataTypeValue =
+        sceneDelegate->Get(fieldId, UsdVolTokens->fieldDataType);
+    if (!fieldDataTypeValue.IsHolding<TfToken>()) {
+        TF_WARN("Missing fieldDataType attribute on volume field prim %s. "
+                "Assuming float.", fieldId.GetText());
+        return HdPrman_Volume::FieldType::FloatType;
+    }
+    const TfToken& fieldDataType = fieldDataTypeValue.UncheckedGet<TfToken>();
+
+    if (fieldDataType == UsdVolTokens->half ||
+        fieldDataType == UsdVolTokens->float_ ||
+        fieldDataType == UsdVolTokens->double_) {
+        return HdPrman_Volume::FieldType::FloatType;
+    }
+
+    if (fieldDataType == UsdVolTokens->int_ ||
+        fieldDataType == UsdVolTokens->uint ||
+        fieldDataType == UsdVolTokens->int64) {
+        // Not yet supported by impl_openvdb plugin
+        return HdPrman_Volume::FieldType::IntType;
+    }
+
+    if (fieldDataType == UsdVolTokens->half2 ||
+        fieldDataType == UsdVolTokens->float2 ||
+        fieldDataType == UsdVolTokens->double2) {
+        // Not yet supported by impl_openvdb plugin
+        return HdPrman_Volume::FieldType::Float2Type;
+    }
+
+    if (fieldDataType == UsdVolTokens->int2) {
+        // Not yet supported by impl_openvdb plugin
+        return HdPrman_Volume::FieldType::Int2Type;
+    }
+
+    if (fieldDataType == UsdVolTokens->half3 ||
+        fieldDataType == UsdVolTokens->float3 ||
+        fieldDataType == UsdVolTokens->double3) {
+
+        // The role hint for vector data is optional
+        TfToken vectorDataRoleHint;
+        VtValue roleHint =
+            sceneDelegate->Get(fieldId, UsdVolTokens->vectorDataRoleHint);
+        if (roleHint.IsHolding<TfToken>()) {
+            vectorDataRoleHint = roleHint.UncheckedGet<TfToken>();
+        }
+
+        if (vectorDataRoleHint == UsdVolTokens->Color) {
+            return HdPrman_Volume::FieldType::ColorType;
+        } else if (vectorDataRoleHint == UsdVolTokens->Point) {
+            return HdPrman_Volume::FieldType::PointType;
+        } else if (vectorDataRoleHint == UsdVolTokens->Normal) {
+            return HdPrman_Volume::FieldType::NormalType;
+        } else if (vectorDataRoleHint == UsdVolTokens->Vector) {
+            return HdPrman_Volume::FieldType::VectorType;
+        } else if (vectorDataRoleHint == UsdVolTokens->None_) {
+            // Fall through
+        } else if (!vectorDataRoleHint.IsEmpty()) {
+            TF_WARN("Unknown vectorDataRoleHint value '%s' on volume field prim"
+                    " %s. Treating it as a regular float3 field.",
+                    vectorDataRoleHint.GetText(), fieldId.GetText());
+        }
+
+        return HdPrman_Volume::FieldType::Float3Type;
+    }
+
+    if (fieldDataType == UsdVolTokens->int3) {
+        // Not yet supported by impl_openvdb plugin
+        return HdPrman_Volume::FieldType::Int3Type;
+    }
+
+    if (fieldDataType == UsdVolTokens->matrix3d ||
+        fieldDataType == UsdVolTokens->matrix4d) {
+        // Not yet supported by impl_openvdb plugin
+        return HdPrman_Volume::FieldType::MatrixType;
+    }
+
+    if (fieldDataType == UsdVolTokens->quatd) {
+        // Not yet supported by impl_openvdb plugin
+        return HdPrman_Volume::FieldType::Float4Type;
+    }
+
+    if (fieldDataType == UsdVolTokens->bool_ ||
+        fieldDataType == UsdVolTokens->mask) {
+        // Not yet supported by impl_openvdb plugin
+        return HdPrman_Volume::FieldType::IntType;
+    }
+
+    if (fieldDataType == UsdVolTokens->string) {
+        // Not yet supported by impl_openvdb plugin
+        return HdPrman_Volume::FieldType::StringType;
+    }
+
+    TF_WARN("Unsupported OpenVDB fieldDataType value '%s' on volume field "
+            "prim %s. Assuming float.",
+            fieldDataType.GetText(), fieldId.GetText());
+
+    return HdPrman_Volume::FieldType::FloatType;
+}
+
+void
+_EmitOpenVDBVolume(HdSceneDelegate *sceneDelegate,
+                   const SdfPath& id,
+                   const HdVolumeFieldDescriptorVector& fields,
+                   RtPrimVarList* primvars)
+{
+    static const RtUString blobbydsoImplOpenVDB("blobbydso:impl_openvdb");
+
+    if (fields.empty()) {
+        return;
+    }
+
+    auto const& firstfield = fields[0];
+
+    // There is an implicit assumption that all the fields on this volume are
+    // extracted from the same .vdb file, which is determined once from the
+    // first field.
+    const VtValue filePath = sceneDelegate->Get(firstfield.fieldId,
+                                                HdFieldTokens->filePath);
+    const SdfAssetPath &fileAssetPath = filePath.Get<SdfAssetPath>();
+
+    std::string volumeAssetPath = fileAssetPath.GetResolvedPath();
+    if (volumeAssetPath.empty()) {
+        volumeAssetPath = fileAssetPath.GetAssetPath();
+    }
+
+    // This will be the first of the string args supplied to the blobbydso. 
+    std::string vdbSource;
+    // JSON args.
+    JsObject jsonData;
+
+#ifndef PXR_OPENVDB_SUPPORT_ENABLED
+    vdbSource = volumeAssetPath;
+#else
+    // If volumeAssetPath is an actual file path, copy it into the vdbSource
+    // string, prepended with a "file:" tag.
+    if (TfIsFile(volumeAssetPath)) {
+        vdbSource = "file:" + volumeAssetPath;
+
+    } else {
+        // volumeAssetPath is not a file path. Attempt to resolve
+        // it as an ArAsset and retrieve vdb grids from that asset.
+        openvdb::GridPtrVecPtr gridVecPtr =
+            HioOpenVDBGridsFromAsset(volumeAssetPath);
+
+        if (!gridVecPtr) {
+            TF_WARN("Failed to retrieve VDB grids from %s.",
+                    volumeAssetPath.c_str());
+            return;
+        }
+
+        // Allocate a new vector of vdb grid pointers on the heap. The contents
+        // are copied from gridVecPtr. (This copy should be fairly cheap since
+        // the elements are just shared pointers).
+        openvdb::GridPtrVec* grids = new openvdb::GridPtrVec(*gridVecPtr);
+
+        // Ownership of this new vector is given to RixStorage, which
+        // will take care of clean-up when rendering is complete.
+        RixContext* context = RixGetContext();
+        RixStorage* storage =
+            static_cast<RixStorage*>(context->GetRixInterface(k_RixGlobalData));
+        if (!storage) {
+            TF_WARN("Failed to access RixStorage interface.");
+            return;
+        }
+
+        // Create a unique RixStorage key by combining the id
+        // and the raw pointer address of the grids vector.
+        std::stringstream stream;
+        stream << id << "@" << static_cast<void*>(grids);
+        const std::string key(stream.str());
+
+        // Store the grids vector in RixStorage.
+        // This will allow the impl_openvdb blobbydso to retrieve it.
+        storage->Lock();
+        storage->Set(RtUString(key.c_str()), grids,
+            [](RixContext* context, void* data) // clean-up function
+            {
+                if (auto grids = static_cast<openvdb::GridPtrVec*>(data)) {
+                    grids->clear();
+                    delete grids;
+                }
+            });
+        storage->Unlock();
+
+        // Copy key into the vdbSource string, prepended with a "key:" tag.
+        vdbSource = "key:" + key;
+
+        // Build up JSON args for grid groups. For now we assume all grids in
+        // the VDB provided should be included.
+        std::map<std::string, JsArray> indexMap;
+        for (const auto& grid : *grids) {
+            if (auto meta = grid->getMetadata<openvdb::TypedMetadata<int>>("index")) {
+                indexMap[grid->getName()].emplace_back(meta->value());
+            }
+        }
+
+        if (!indexMap.empty()) {
+            JsArray gridGroups;
+            for (const auto& entry : indexMap) {
+                gridGroups.emplace_back(JsObject {
+                    { "name", JsValue(entry.first) },
+                    { "indices", entry.second },
+                });
+            }
+
+            jsonData["gridGroups"] = std::move(gridGroups);
+        }
+    }
+#endif
+
+    const VtValue fieldNameVal = sceneDelegate->Get(firstfield.fieldId,
+                                                    HdFieldTokens->fieldName);
+    const TfToken &fieldName = fieldNameVal.Get<TfToken>();
+
+    const std::string jsonOpts = JsWriteToString(JsValue(std::move(jsonData)));
+
+    primvars->SetString(RixStr.k_Ri_type, blobbydsoImplOpenVDB);
+
+    const std::array<RtUString, 4> sa = {
+        RtUString(vdbSource.c_str()),
+        RtUString(fieldName.GetText()),
+        RtUString(""),
+        RtUString(jsonOpts.c_str())
+    };
+    primvars->SetStringArray(RixStr.k_blobbydso_stringargs, sa.data(), sa.size());
+
+    // The individual fields of this volume need to be declared as primvars
+    for (HdVolumeFieldDescriptor const& field : fields) {
+        HdPrman_Volume::DeclareFieldPrimvar(
+            primvars,
+            RtUString(field.fieldName.GetText()),
+            _DetermineOpenVDBFieldType(sceneDelegate, field.fieldId));
+    }
+}
+
+// Returns the prim type token of a list of fields, if all the fields have the
+// same type. If there are no fields or the types are inconsistent it returns
+// the empty token.
+TfToken
+_DetermineConsistentFieldPrimType(const HdVolumeFieldDescriptorVector& fields)
+{
+    if (fields.empty()) {
+        return TfToken();
+    }
+
+    HdVolumeFieldDescriptorVector::const_iterator iter = fields.begin();
+    TfToken const& fieldPrimType = iter->fieldPrimType;
+    ++iter;
+
+    for (; iter != fields.end(); ++iter) {
+        if (iter->fieldPrimType != fieldPrimType) {
+            return TfToken();
+        }
+    }
+
+    return fieldPrimType;
+}
+
+} // end anonymous namespace
+
+/* static */
+HdPrman_Volume::_VolumeEmitterMap&
+HdPrman_Volume::_GetVolumeEmitterMap()
+{
+    // Note, the volumeEmitters map is static inside of this method to ensure
+    // that it will be initialized the first time this method is called.
+    // Initialization of static members of classes or globals is less clearly
+    // defined.
+    static _VolumeEmitterMap volumeEmitters = {
+        // Pre-populate the map with the default implementation for OpenVDB
+        {UsdVolImagingTokens->openvdbAsset, _EmitOpenVDBVolume}
+    };
+
+    return volumeEmitters;
+}
+
+/* static */
+bool
+HdPrman_Volume::AddVolumeTypeEmitter(TfToken const& fieldPrimType,
+                                     HdPrman_VolumeTypeEmitter emitterFunc,
+                                     bool overrideExisting)
+{
+    auto pair = _GetVolumeEmitterMap().insert({fieldPrimType, emitterFunc});
+    // Set entry if overriding and there was a previous entry
+    if (overrideExisting || pair.second) {
+        pair.first->second = emitterFunc;
+        return true;
+    }
+
+    return false;
+}
+
+/* static */
+void
+HdPrman_Volume::DeclareFieldPrimvar(RtPrimVarList* primvars,
+                                    RtUString const& fieldName,
+                                    FieldType type)
+{
+    RtDetailType detailType = RtDetailType::k_varying;
+
+    // Note, the Set*Detail calls below declare a primvar for each field,
+    // but do not provide the data. The data itself has to be provided by
+    // the plugin that extracts the actual data from the volume files.
+    switch (type) {
+        case FloatType:
+            primvars->SetFloatDetail(fieldName, nullptr, detailType);
+            break;
+        case IntType:
+            primvars->SetIntegerArrayDetail(fieldName, nullptr, 1, detailType);
+            break;
+        case Float2Type:
+            primvars->SetFloatArrayDetail(fieldName, nullptr, 2, detailType);
+            break;
+        case Int2Type:
+            primvars->SetIntegerArrayDetail(fieldName, nullptr, 2, detailType);
+            break;
+        case Float3Type:
+            primvars->SetFloatArrayDetail(fieldName, nullptr, 3, detailType);
+            break;
+        case Int3Type:
+            primvars->SetIntegerArrayDetail(fieldName, nullptr, 3, detailType);
+            break;
+        case ColorType:
+            primvars->SetColorDetail(fieldName, nullptr, detailType);
+            break;
+        case PointType:
+            primvars->SetPointDetail(fieldName, nullptr, detailType);
+            break;
+        case NormalType:
+            primvars->SetNormalDetail(fieldName, nullptr, detailType);
+            break;
+        case VectorType:
+            primvars->SetVectorDetail(fieldName, nullptr, detailType);
+            break;
+        case Float4Type:
+            primvars->SetFloatArrayDetail(fieldName, nullptr, 4, detailType);
+            break;
+        case MatrixType:
+            primvars->SetMatrixDetail(fieldName, nullptr, detailType);
+            break;
+        case StringType:
+            primvars->SetStringDetail(fieldName, nullptr, detailType);
+            break;
+    }
+}
+
+RtPrimVarList
+HdPrman_Volume::_ConvertGeometry(HdPrman_RenderParam *renderParam,
+                                 HdSceneDelegate *sceneDelegate,
+                                 const SdfPath &id,
+                                 RtUString *primType,
+                                 std::vector<HdGeomSubset> *geomSubsets)
+{
+    *primType = RixStr.k_Ri_Volume;
+
+    // Dimensions
+    int32_t const dims[] = { 0, 0, 0 };
+    uint64_t const dim = dims[0] * dims[1] * dims[2];
+    RtPrimVarList primvars(1, dim, dim, dim);
+    primvars.SetIntegerArray(RixStr.k_Ri_dimensions, dims, 3);
+
+    HdPrman_ConvertPrimvars(
+        sceneDelegate, id, primvars,
+        /* numUniform = */ 1,
+        /* numVertex = */ 0,
+        /* numVarying = */ 0,
+        /* numFaceVarying = */ 0);
+
+    // Setup the volume for Prman with the appropriate DSO and its parameters
+    HdVolumeFieldDescriptorVector fields =
+        sceneDelegate->GetVolumeFieldDescriptors(id);
+    if (!fields.empty()) {
+        TfToken fieldPrimType = _DetermineConsistentFieldPrimType(fields);
+        if (fieldPrimType.IsEmpty()) {
+            TF_WARN("The fields on volume %s have inconsistent types and "
+                    "cannot be emitted as a single volume", id.GetText());
+            return RtPrimVarList();
+        }
+
+        // Based on the field type we determine the function to emit the
+        // volume to Prman
+        _VolumeEmitterMap const& volumeEmitters = _GetVolumeEmitterMap();
+        auto const iter = volumeEmitters.find(fieldPrimType);
+        if (iter == volumeEmitters.end()) {
+            TF_WARN("No volume emitter registered for field type '%s' "
+                    "on prim %s", fieldPrimType.GetText(), id.GetText());
+            return RtPrimVarList();
+        }
+
+        HdPrman_VolumeTypeEmitter emitterFunc = iter->second;
+        emitterFunc(sceneDelegate, id, fields, &primvars);
+    } else {
+        // If no fields are found, the volume will be required to
+        // specify Ri:type (ex: "box") and Ri:Bounds.  We do not
+        // check this here because RenderMan will already issue
+        // an appropriate warning.
+    }
+
+    return primvars;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/volume.h b/third_party/renderman-26/plugin/hdPrman/volume.h
new file mode 100644
index 0000000000..65235fc322
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/volume.h
@@ -0,0 +1,120 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VOLUME_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VOLUME_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/gprim.h"
+#include "pxr/imaging/hd/field.h"
+#include "pxr/imaging/hd/volume.h"
+
+#include "Riley.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class HdPrman_Field final : public HdField
+{
+public:
+    HdPrman_Field(TfToken const& typeId, SdfPath const& id);
+    void Sync(HdSceneDelegate *sceneDelegate,
+              HdRenderParam *renderParam,
+              HdDirtyBits *dirtyBits) override;
+    void Finalize(HdRenderParam *renderParam) override;
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+private:
+    TfToken const _typeId;
+};
+
+class HdPrman_Volume final : public HdPrman_Gprim<HdVolume>
+{
+public:
+    using BASE = HdPrman_Gprim<HdVolume>;
+public:
+
+    HF_MALLOC_TAG_NEW("new HdPrman_Volume");
+
+    HdPrman_Volume(SdfPath const& id, const bool isMeshLight);
+
+    HdDirtyBits GetInitialDirtyBitsMask() const override;
+
+    /// The types of volumes that can be emitted to Prman are extensible, since
+    /// volumes are emitted via blobbydsos, which themselves are plugins to
+    /// Prman. So we allow the registration of handlers for volumes of different
+    /// types. The volumes are identified by the prim type of their fields.
+    /// Currently Hydra knows of two such types:
+    ///
+    ///    UsdVolImagingTokens->openvdbAsset
+    ///    UsdVolImagingTokens->field3dAsset
+    ///
+    /// Note, since a Volume prim can have multiple fields associated with it,
+    /// we require that all associated fields are of the same type. The code
+    /// rejects a volume if that is not the case and issues a warning.
+    ///
+    /// The emitter functions that can be registered are responsible to fill in
+    /// the RtParamList list with the k_Ri_type (name of the blobbydso) and any
+    /// parameters to this plugin (k_blobbydso_stringargs). The function is also
+    /// responsible for declaring the primvar for each field.
+    using HdPrman_VolumeTypeEmitter =
+                        void (*)(HdSceneDelegate *sceneDelegate,
+                                 SdfPath const& id,
+                                 HdVolumeFieldDescriptorVector const& fields,
+                                 RtPrimVarList* primvars);
+
+    /// Registers a new volume emitter. Returns true if the handler was
+    /// registered as the new handler. When \p overrideExisting is false, then
+    /// a new handler for a previously registered emitter will not be accepted.
+    static bool AddVolumeTypeEmitter(TfToken const& fieldPrimType,
+                                     HdPrman_VolumeTypeEmitter emitterFunc,
+                                     bool overrideExisting = false);
+
+    /// Specialized subset of primvar types for volume fields
+    enum FieldType {
+        FloatType = 0,
+        IntType,
+        Float2Type,
+        Int2Type,
+        Float3Type,
+        Int3Type,
+        ColorType,
+        PointType,
+        NormalType,
+        VectorType,
+        Float4Type,
+        MatrixType,
+        StringType
+    };
+
+    /// Helper method for emitter functions to declare a primvar for a field
+    static void DeclareFieldPrimvar(RtPrimVarList* primvars,
+                                    RtUString const& fieldName,
+                                    FieldType type);
+
+protected:
+    RtPrimVarList
+    _ConvertGeometry(HdPrman_RenderParam *renderParam,
+                     HdSceneDelegate *sceneDelegate,
+                     const SdfPath &id,
+                     RtUString *primType,
+                     std::vector<HdGeomSubset> *geomSubsets) override;
+
+    riley::MaterialId
+    _GetFallbackMaterial(HdPrman_RenderParam *renderParam) override {
+        return renderParam->GetFallbackVolumeMaterialId();
+    }
+
+    bool _PrototypeOnly() override;
+
+    using _VolumeEmitterMap = std::map<TfToken, HdPrman_VolumeTypeEmitter>;
+    static _VolumeEmitterMap& _GetVolumeEmitterMap();
+
+private:
+    bool _isMeshLight;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_VOLUME_H
diff --git a/third_party/renderman-26/plugin/hdPrman/xcpt.cpp b/third_party/renderman-26/plugin/hdPrman/xcpt.cpp
new file mode 100644
index 0000000000..47a97e84a2
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/xcpt.cpp
@@ -0,0 +1,38 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#include "hdPrman/xcpt.h"
+
+#include "pxr/base/tf/token.h"
+
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+void HdPrman_Xcpt::HandleXcpt(int /*code*/, int severity, const char* msg)
+{
+    switch (severity)
+    {
+    case RIE_INFO:
+        TF_STATUS("%s", msg);
+        break;
+    default:
+    case RIE_WARNING:
+        TF_WARN("%s", msg);
+        break;
+    case RIE_ERROR:
+    case RIE_SEVERE:
+        TF_RUNTIME_ERROR("%s", msg);
+        break;
+    }
+}
+
+void HdPrman_Xcpt::HandleExitRequest(int /*code*/)
+{
+    // This empty callback prevents prman attempting to exit the application
+    return;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/hdPrman/xcpt.h b/third_party/renderman-26/plugin/hdPrman/xcpt.h
new file mode 100644
index 0000000000..a4b2c36956
--- /dev/null
+++ b/third_party/renderman-26/plugin/hdPrman/xcpt.h
@@ -0,0 +1,30 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef HDPRMAN_XCPT_H
+#define HDPRMAN_XCPT_H
+
+#include "pxr/pxr.h"
+#include "hdPrman/api.h"
+#include "ri.hpp"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// Defines an XcptHander for hdPrman.  This allows us to direct
+/// Xcpt messages from prman appropriately and to intercept severe errors
+/// rather than accept prman's default exit behavior.
+
+class HdPrman_Xcpt : public RixXcpt::XcptHandler
+{
+public:
+    HDPRMAN_API virtual void HandleXcpt(int code, int severity,
+                                        const char* msg);
+    HDPRMAN_API virtual void HandleExitRequest(int code);
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // HDPRMAN_XCPT_H
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/CMakeLists.txt b/third_party/renderman-26/plugin/rmanArgsParser/CMakeLists.txt
new file mode 100644
index 0000000000..fae498d58c
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/CMakeLists.txt
@@ -0,0 +1,34 @@
+set(PXR_PREFIX "")
+set(PXR_PACKAGE rmanArgsParser)
+
+pxr_plugin(rmanArgsParser
+    LIBRARIES
+        arch
+        gf
+        tf
+        vt
+        ar
+        ndr
+        sdr
+
+    PRIVATE_CLASSES
+        rmanArgsParser
+
+    CPPFILES
+        pugixml/pugixml.cpp
+    
+    PRIVATE_HEADERS
+        api.h
+        pugixml/pugiconfig.hpp
+        pugixml/pugixml.hpp
+
+    PYMODULE_CPPFILES
+        module.cpp
+        wrapRmanArgsParser.cpp
+
+    PYMODULE_FILES
+        __init__.py
+
+    RESOURCE_FILES
+        plugInfo.json
+)
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/__init__.py b/third_party/renderman-26/plugin/rmanArgsParser/__init__.py
new file mode 100644
index 0000000000..9e37da7762
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/__init__.py
@@ -0,0 +1,9 @@
+#
+# Copyright 2019 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+#
+from pxr import Tf
+Tf.PreparePythonModule()
+del Tf
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/api.h b/third_party/renderman-26/plugin/rmanArgsParser/api.h
new file mode 100644
index 0000000000..ce2d7a7689
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/api.h
@@ -0,0 +1,30 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_API_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_API_H
+
+#include "pxr/base/arch/export.h"
+
+#if defined(PXR_STATIC)
+#   define RMAN_ARGS_PARSER_API
+#   define RMAN_ARGS_PARSER_API_TEMPLATE_CLASS(...)
+#   define RMAN_ARGS_PARSER_API_TEMPLATE_STRUCT(...)
+#   define RMAN_ARGS_PARSER_LOCAL
+#else
+#   if defined(RMAN_ARGS_PARSER_EXPORTS)
+#       define RMAN_ARGS_PARSER_API ARCH_EXPORT
+#       define RMAN_ARGS_PARSER_API_TEMPLATE_CLASS(...) ARCH_EXPORT_TEMPLATE(class, __VA_ARGS__)
+#       define RMAN_ARGS_PARSER_API_TEMPLATE_STRUCT(...) ARCH_EXPORT_TEMPLATE(struct, __VA_ARGS__)
+#   else
+#       define RMAN_ARGS_PARSER_API ARCH_IMPORT
+#       define RMAN_ARGS_PARSER_API_TEMPLATE_CLASS(...) ARCH_IMPORT_TEMPLATE(class, __VA_ARGS__)
+#       define RMAN_ARGS_PARSER_API_TEMPLATE_STRUCT(...) ARCH_IMPORT_TEMPLATE(struct, __VA_ARGS__)
+#   endif
+#   define RMAN_ARGS_PARSER_LOCAL ARCH_HIDDEN
+#endif
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_API_H
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/module.cpp b/third_party/renderman-26/plugin/rmanArgsParser/module.cpp
new file mode 100644
index 0000000000..79661e7bf8
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/module.cpp
@@ -0,0 +1,16 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/base/tf/pyModule.h"
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+TF_WRAP_MODULE
+{
+    TF_WRAP( RmanArgsParser );
+}
diff --git a/pxr/imaging/hgiMetal/pch.h b/third_party/renderman-26/plugin/rmanArgsParser/pch.h
similarity index 70%
rename from pxr/imaging/hgiMetal/pch.h
rename to third_party/renderman-26/plugin/rmanArgsParser/pch.h
index 877bc45ee5..056e5a3107 100644
--- a/pxr/imaging/hgiMetal/pch.h
+++ b/third_party/renderman-26/plugin/rmanArgsParser/pch.h
@@ -1,25 +1,8 @@
 //
-// Copyright 2020 Pixar
+// Copyright 2019 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 // WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
 //
@@ -45,7 +28,6 @@
 #endif
 #include <algorithm>
 #include <atomic>
-#include <cfloat>
 #include <cinttypes>
 #include <cmath>
 #include <cstdarg>
@@ -58,7 +40,6 @@
 #include <functional>
 #include <initializer_list>
 #include <iosfwd>
-#include <iterator>
 #include <limits>
 #include <list>
 #include <locale>
@@ -66,7 +47,6 @@
 #include <math.h>
 #include <memory>
 #include <mutex>
-#include <new>
 #include <set>
 #include <sstream>
 #include <stdarg.h>
@@ -74,7 +54,6 @@
 #include <stdint.h>
 #include <string>
 #include <sys/types.h>
-#include <thread>
 #include <type_traits>
 #include <typeindex>
 #include <typeinfo>
@@ -84,12 +63,11 @@
 #include <vector>
 #include <boost/aligned_storage.hpp>
 #include <boost/any.hpp>
-#include <boost/call_traits.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/functional/hash_fwd.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/iterator/reverse_iterator.hpp>
+#include <boost/iterator_adaptors.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/or.hpp>
@@ -120,6 +98,9 @@
 #include <boost/preprocessor/tuple/to_list.hpp>
 #include <boost/preprocessor/tuple/to_seq.hpp>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <boost/python.hpp>
+#include <boost/python/dict.hpp>
+#include <boost/python/module.hpp>
 #include <boost/python/object_fwd.hpp>
 #include <boost/python/object_operators.hpp>
 #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h.
@@ -127,7 +108,6 @@
 #undef toupper
 #endif
 #endif // PXR_PYTHON_SUPPORT_ENABLED
-#include <boost/shared_ptr.hpp>
 #include <boost/type_traits/decay.hpp>
 #include <boost/type_traits/has_trivial_assign.hpp>
 #include <boost/type_traits/has_trivial_constructor.hpp>
@@ -138,13 +118,7 @@
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/is_enum.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/unordered_map.hpp>
 #include <boost/utility/enable_if.hpp>
-#include <boost/weak_ptr.hpp>
-#include <tbb/atomic.h>
-#include <tbb/cache_aligned_allocator.h>
-#include <tbb/concurrent_queue.h>
-#include <tbb/spin_mutex.h>
 #ifdef PXR_PYTHON_SUPPORT_ENABLED
 #include "pxr/base/tf/pySafePython.h"
 #endif // PXR_PYTHON_SUPPORT_ENABLED
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/plugInfo.json b/third_party/renderman-26/plugin/rmanArgsParser/plugInfo.json
new file mode 100644
index 0000000000..b2c2d894c8
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/plugInfo.json
@@ -0,0 +1,19 @@
+{
+    "Plugins": [
+        {
+            "Type": "library",
+            "Name": "rmanArgsParser",
+            "Root": "@PLUG_INFO_ROOT@",
+            "LibraryPath": "@PLUG_INFO_LIBRARY_PATH@",
+            "ResourcePath": "@PLUG_INFO_RESOURCE_PATH@",
+            "Info": {
+                "Types": {
+                    "RmanArgsParserPlugin" : {
+                        "bases": ["NdrParserPlugin"],
+                        "displayName": "RenderMan .args Node Parser"
+                    }
+                }
+            }
+        }
+    ]
+}
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugiconfig.hpp b/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugiconfig.hpp
new file mode 100644
index 0000000000..d7ac67c1ca
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugiconfig.hpp
@@ -0,0 +1,74 @@
+/**
+ * pugixml parser - version 1.9
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at http://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef EXT_RMANPKG_24_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_PUGIXML_PUGICONFIG_HPP
+#define EXT_RMANPKG_24_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_PUGIXML_PUGICONFIG_HPP
+
+// Uncomment this to enable wchar_t mode
+// #define PUGIXML_WCHAR_MODE
+
+// Uncomment this to enable compact mode
+// #define PUGIXML_COMPACT
+
+// Uncomment this to disable XPath
+// #define PUGIXML_NO_XPATH
+
+// Uncomment this to disable STL
+// #define PUGIXML_NO_STL
+
+// Uncomment this to disable exceptions
+// #define PUGIXML_NO_EXCEPTIONS
+
+// Set this to control attributes for public classes/functions, i.e.:
+// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
+// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
+// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
+// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
+
+// Tune these constants to adjust memory-related behavior
+// #define PUGIXML_MEMORY_PAGE_SIZE 32768
+// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
+// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
+
+// Uncomment this to switch to header-only version
+// #define PUGIXML_HEADER_ONLY
+
+// Uncomment this to enable long long support
+// #define PUGIXML_HAS_LONG_LONG
+
+#endif
+
+/**
+ * Copyright (c) 2006-2018 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugixml.cpp b/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugixml.cpp
new file mode 100644
index 0000000000..2afff09dd7
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugixml.cpp
@@ -0,0 +1,12796 @@
+/**
+ * pugixml parser - version 1.9
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at http://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef SOURCE_PUGIXML_CPP
+#define SOURCE_PUGIXML_CPP
+
+#include "pugixml.hpp"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <limits.h>
+
+#ifdef PUGIXML_WCHAR_MODE
+#	include <wchar.h>
+#endif
+
+#ifndef PUGIXML_NO_XPATH
+#	include <math.h>
+#	include <float.h>
+#endif
+
+#ifndef PUGIXML_NO_STL
+#	include <istream>
+#	include <ostream>
+#	include <string>
+#endif
+
+// For placement new
+#include <new>
+
+#ifdef _MSC_VER
+#	pragma warning(push)
+#	pragma warning(disable: 4127) // conditional expression is constant
+#	pragma warning(disable: 4324) // structure was padded due to __declspec(align())
+#	pragma warning(disable: 4702) // unreachable code
+#	pragma warning(disable: 4996) // this function or variable may be unsafe
+#endif
+
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic push
+#	pragma clang diagnostic ignored "-Wdeprecated" // this function or variable may be unsafe
+#endif
+
+#ifdef __INTEL_COMPILER
+#	pragma warning(disable: 177) // function was declared but never referenced
+#	pragma warning(disable: 279) // controlling expression is constant
+#	pragma warning(disable: 1478 1786) // function was declared "deprecated"
+#	pragma warning(disable: 1684) // conversion from pointer to same-sized integral type
+#endif
+
+#if defined(__BORLANDC__) && defined(PUGIXML_HEADER_ONLY)
+#	pragma warn -8080 // symbol is declared but never used; disabling this inside push/pop bracket does not make the warning go away
+#endif
+
+#ifdef __BORLANDC__
+#	pragma option push
+#	pragma warn -8008 // condition is always false
+#	pragma warn -8066 // unreachable code
+#endif
+
+#ifdef __SNC__
+// Using diag_push/diag_pop does not disable the warnings inside templates due to a compiler bug
+#	pragma diag_suppress=178 // function was declared but never referenced
+#	pragma diag_suppress=237 // controlling expression is constant
+#endif
+
+#ifdef __TI_COMPILER_VERSION__
+#	pragma diag_suppress 179 // function was declared but never referenced
+#endif
+
+// Inlining controls
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#	define PUGI__NO_INLINE __declspec(noinline)
+#elif defined(__GNUC__)
+#	define PUGI__NO_INLINE __attribute__((noinline))
+#else
+#	define PUGI__NO_INLINE
+#endif
+
+// Branch weight controls
+#if defined(__GNUC__) && !defined(__c2__)
+#	define PUGI__UNLIKELY(cond) __builtin_expect(cond, 0)
+#else
+#	define PUGI__UNLIKELY(cond) (cond)
+#endif
+
+// Simple static assertion
+#define PUGI__STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; }
+
+// Digital Mars C++ bug workaround for passing char loaded from memory via stack
+#ifdef __DMC__
+#	define PUGI__DMC_VOLATILE volatile
+#else
+#	define PUGI__DMC_VOLATILE
+#endif
+
+// Integer sanitizer workaround; we only apply this for clang since gcc8 has no_sanitize but not unsigned-integer-overflow and produces "attribute directive ignored" warnings
+#if defined(__clang__) && defined(__has_attribute)
+#	if __has_attribute(no_sanitize)
+#		define PUGI__UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow")))
+#	else
+#		define PUGI__UNSIGNED_OVERFLOW
+#	endif
+#else
+#	define PUGI__UNSIGNED_OVERFLOW
+#endif
+
+// Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all)
+#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST)
+using std::memcpy;
+using std::memmove;
+using std::memset;
+#endif
+
+// Some MinGW/GCC versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions from limits.h in some configurations
+#if defined(PUGIXML_HAS_LONG_LONG) && defined(__GNUC__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX)
+#	define LLONG_MIN (-LLONG_MAX - 1LL)
+#	define LLONG_MAX __LONG_LONG_MAX__
+#	define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+#endif
+
+// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
+#if defined(_MSC_VER) && !defined(__S3E__)
+#	define PUGI__MSVC_CRT_VERSION _MSC_VER
+#endif
+
+// Not all platforms have snprintf; we define a wrapper that uses snprintf if possible. This only works with buffers with a known size.
+#if __cplusplus >= 201103
+#	define PUGI__SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
+#elif defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
+#	define PUGI__SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__)
+#else
+#	define PUGI__SNPRINTF sprintf
+#endif
+
+// We put implementation details into an anonymous namespace in source mode, but have to keep it in non-anonymous namespace in header-only mode to prevent binary bloat.
+#ifdef PUGIXML_HEADER_ONLY
+#	define PUGI__NS_BEGIN namespace pugi { namespace impl {
+#	define PUGI__NS_END } }
+#	define PUGI__FN inline
+#	define PUGI__FN_NO_INLINE inline
+#else
+#	if defined(_MSC_VER) && _MSC_VER < 1300 // MSVC6 seems to have an amusing bug with anonymous namespaces inside namespaces
+#		define PUGI__NS_BEGIN namespace pugi { namespace impl {
+#		define PUGI__NS_END } }
+#	else
+#		define PUGI__NS_BEGIN namespace pugi { namespace impl { namespace {
+#		define PUGI__NS_END } } }
+#	endif
+#	define PUGI__FN
+#	define PUGI__FN_NO_INLINE PUGI__NO_INLINE
+#endif
+
+// uintptr_t
+#if (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(__BORLANDC__) && __BORLANDC__ < 0x561)
+namespace pugi
+{
+#	ifndef _UINTPTR_T_DEFINED
+	typedef size_t uintptr_t;
+#	endif
+
+	typedef unsigned __int8 uint8_t;
+	typedef unsigned __int16 uint16_t;
+	typedef unsigned __int32 uint32_t;
+}
+#else
+#	include <stdint.h>
+#endif
+
+// Memory allocation
+PUGI__NS_BEGIN
+	PUGI__FN void* default_allocate(size_t size)
+	{
+		return malloc(size);
+	}
+
+	PUGI__FN void default_deallocate(void* ptr)
+	{
+		free(ptr);
+	}
+
+	template <typename T>
+	struct xml_memory_management_function_storage
+	{
+		static allocation_function allocate;
+		static deallocation_function deallocate;
+	};
+
+	// Global allocation functions are stored in class statics so that in header mode linker deduplicates them
+	// Without a template<> we'll get multiple definitions of the same static
+	template <typename T> allocation_function xml_memory_management_function_storage<T>::allocate = default_allocate;
+	template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate;
+
+	typedef xml_memory_management_function_storage<int> xml_memory;
+PUGI__NS_END
+
+// String utilities
+PUGI__NS_BEGIN
+	// Get string length
+	PUGI__FN size_t strlength(const char_t* s)
+	{
+		assert(s);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcslen(s);
+	#else
+		return strlen(s);
+	#endif
+	}
+
+	// Compare two strings
+	PUGI__FN bool strequal(const char_t* src, const char_t* dst)
+	{
+		assert(src && dst);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcscmp(src, dst) == 0;
+	#else
+		return strcmp(src, dst) == 0;
+	#endif
+	}
+
+	// Compare lhs with [rhs_begin, rhs_end)
+	PUGI__FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count)
+	{
+		for (size_t i = 0; i < count; ++i)
+			if (lhs[i] != rhs[i])
+				return false;
+
+		return lhs[count] == 0;
+	}
+
+	// Get length of wide string, even if CRT lacks wide character support
+	PUGI__FN size_t strlength_wide(const wchar_t* s)
+	{
+		assert(s);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcslen(s);
+	#else
+		const wchar_t* end = s;
+		while (*end) end++;
+		return static_cast<size_t>(end - s);
+	#endif
+	}
+PUGI__NS_END
+
+// auto_ptr-like object for exception recovery
+PUGI__NS_BEGIN
+	template <typename T> struct auto_deleter
+	{
+		typedef void (*D)(T*);
+
+		T* data;
+		D deleter;
+
+		auto_deleter(T* data_, D deleter_): data(data_), deleter(deleter_)
+		{
+		}
+
+		~auto_deleter()
+		{
+			if (data) deleter(data);
+		}
+
+		T* release()
+		{
+			T* result = data;
+			data = 0;
+			return result;
+		}
+	};
+PUGI__NS_END
+
+#ifdef PUGIXML_COMPACT
+PUGI__NS_BEGIN
+	class compact_hash_table
+	{
+	public:
+		compact_hash_table(): _items(0), _capacity(0), _count(0)
+		{
+		}
+
+		void clear()
+		{
+			if (_items)
+			{
+				xml_memory::deallocate(_items);
+				_items = 0;
+				_capacity = 0;
+				_count = 0;
+			}
+		}
+
+		void* find(const void* key)
+		{
+			if (_capacity == 0) return 0;
+
+			item_t* item = get_item(key);
+			assert(item);
+			assert(item->key == key || (item->key == 0 && item->value == 0));
+
+			return item->value;
+		}
+
+		void insert(const void* key, void* value)
+		{
+			assert(_capacity != 0 && _count < _capacity - _capacity / 4);
+
+			item_t* item = get_item(key);
+			assert(item);
+
+			if (item->key == 0)
+			{
+				_count++;
+				item->key = key;
+			}
+
+			item->value = value;
+		}
+
+		bool reserve(size_t extra = 16)
+		{
+			if (_count + extra >= _capacity - _capacity / 4)
+				return rehash(_count + extra);
+
+			return true;
+		}
+
+	private:
+		struct item_t
+		{
+			const void* key;
+			void* value;
+		};
+
+		item_t* _items;
+		size_t _capacity;
+
+		size_t _count;
+
+		bool rehash(size_t count);
+
+		item_t* get_item(const void* key)
+		{
+			assert(key);
+			assert(_capacity > 0);
+
+			size_t hashmod = _capacity - 1;
+			size_t bucket = hash(key) & hashmod;
+
+			for (size_t probe = 0; probe <= hashmod; ++probe)
+			{
+				item_t& probe_item = _items[bucket];
+
+				if (probe_item.key == key || probe_item.key == 0)
+					return &probe_item;
+
+				// hash collision, quadratic probing
+				bucket = (bucket + probe + 1) & hashmod;
+			}
+
+			assert(false && "Hash table is full"); // unreachable
+			return 0;
+		}
+
+		static PUGI__UNSIGNED_OVERFLOW unsigned int hash(const void* key)
+		{
+			unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key));
+
+			// MurmurHash3 32-bit finalizer
+			h ^= h >> 16;
+			h *= 0x85ebca6bu;
+			h ^= h >> 13;
+			h *= 0xc2b2ae35u;
+			h ^= h >> 16;
+
+			return h;
+		}
+	};
+
+	PUGI__FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
+	{
+		size_t capacity = 32;
+		while (count >= capacity - capacity / 4)
+			capacity *= 2;
+
+		compact_hash_table rt;
+		rt._capacity = capacity;
+		rt._items = static_cast<item_t*>(xml_memory::allocate(sizeof(item_t) * capacity));
+
+		if (!rt._items)
+			return false;
+
+		memset(rt._items, 0, sizeof(item_t) * capacity);
+
+		for (size_t i = 0; i < _capacity; ++i)
+			if (_items[i].key)
+				rt.insert(_items[i].key, _items[i].value);
+
+		if (_items)
+			xml_memory::deallocate(_items);
+
+		_capacity = capacity;
+		_items = rt._items;
+
+		assert(_count == rt._count);
+
+		return true;
+	}
+
+PUGI__NS_END
+#endif
+
+PUGI__NS_BEGIN
+#ifdef PUGIXML_COMPACT
+	static const uintptr_t xml_memory_block_alignment = 4;
+#else
+	static const uintptr_t xml_memory_block_alignment = sizeof(void*);
+#endif
+
+	// extra metadata bits
+	static const uintptr_t xml_memory_page_contents_shared_mask = 64;
+	static const uintptr_t xml_memory_page_name_allocated_mask = 32;
+	static const uintptr_t xml_memory_page_value_allocated_mask = 16;
+	static const uintptr_t xml_memory_page_type_mask = 15;
+
+	// combined masks for string uniqueness
+	static const uintptr_t xml_memory_page_name_allocated_or_shared_mask = xml_memory_page_name_allocated_mask | xml_memory_page_contents_shared_mask;
+	static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask;
+
+#ifdef PUGIXML_COMPACT
+	#define PUGI__GETHEADER_IMPL(object, page, flags) // unused
+	#define PUGI__GETPAGE_IMPL(header) (header).get_page()
+#else
+	#define PUGI__GETHEADER_IMPL(object, page, flags) (((reinterpret_cast<char*>(object) - reinterpret_cast<char*>(page)) << 8) | (flags))
+	// this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
+	#define PUGI__GETPAGE_IMPL(header) static_cast<impl::xml_memory_page*>(const_cast<void*>(static_cast<const void*>(reinterpret_cast<const char*>(&header) - (header >> 8))))
+#endif
+
+	#define PUGI__GETPAGE(n) PUGI__GETPAGE_IMPL((n)->header)
+	#define PUGI__NODETYPE(n) static_cast<xml_node_type>((n)->header & impl::xml_memory_page_type_mask)
+
+	struct xml_allocator;
+
+	struct xml_memory_page
+	{
+		static xml_memory_page* construct(void* memory)
+		{
+			xml_memory_page* result = static_cast<xml_memory_page*>(memory);
+
+			result->allocator = 0;
+			result->prev = 0;
+			result->next = 0;
+			result->busy_size = 0;
+			result->freed_size = 0;
+
+		#ifdef PUGIXML_COMPACT
+			result->compact_string_base = 0;
+			result->compact_shared_parent = 0;
+			result->compact_page_marker = 0;
+		#endif
+
+			return result;
+		}
+
+		xml_allocator* allocator;
+
+		xml_memory_page* prev;
+		xml_memory_page* next;
+
+		size_t busy_size;
+		size_t freed_size;
+
+	#ifdef PUGIXML_COMPACT
+		char_t* compact_string_base;
+		void* compact_shared_parent;
+		uint32_t* compact_page_marker;
+	#endif
+	};
+
+	static const size_t xml_memory_page_size =
+	#ifdef PUGIXML_MEMORY_PAGE_SIZE
+		(PUGIXML_MEMORY_PAGE_SIZE)
+	#else
+		32768
+	#endif
+		- sizeof(xml_memory_page);
+
+	struct xml_memory_string_header
+	{
+		uint16_t page_offset; // offset from page->data
+		uint16_t full_size; // 0 if string occupies whole page
+	};
+
+	struct xml_allocator
+	{
+		xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size)
+		{
+		#ifdef PUGIXML_COMPACT
+			_hash = 0;
+		#endif
+		}
+
+		xml_memory_page* allocate_page(size_t data_size)
+		{
+			size_t size = sizeof(xml_memory_page) + data_size;
+
+			// allocate block with some alignment, leaving memory for worst-case padding
+			void* memory = xml_memory::allocate(size);
+			if (!memory) return 0;
+
+			// prepare page structure
+			xml_memory_page* page = xml_memory_page::construct(memory);
+			assert(page);
+
+			page->allocator = _root->allocator;
+
+			return page;
+		}
+
+		static void deallocate_page(xml_memory_page* page)
+		{
+			xml_memory::deallocate(page);
+		}
+
+		void* allocate_memory_oob(size_t size, xml_memory_page*& out_page);
+
+		void* allocate_memory(size_t size, xml_memory_page*& out_page)
+		{
+			if (PUGI__UNLIKELY(_busy_size + size > xml_memory_page_size))
+				return allocate_memory_oob(size, out_page);
+
+			void* buf = reinterpret_cast<char*>(_root) + sizeof(xml_memory_page) + _busy_size;
+
+			_busy_size += size;
+
+			out_page = _root;
+
+			return buf;
+		}
+
+	#ifdef PUGIXML_COMPACT
+		void* allocate_object(size_t size, xml_memory_page*& out_page)
+		{
+			void* result = allocate_memory(size + sizeof(uint32_t), out_page);
+			if (!result) return 0;
+
+			// adjust for marker
+			ptrdiff_t offset = static_cast<char*>(result) - reinterpret_cast<char*>(out_page->compact_page_marker);
+
+			if (PUGI__UNLIKELY(static_cast<uintptr_t>(offset) >= 256 * xml_memory_block_alignment))
+			{
+				// insert new marker
+				uint32_t* marker = static_cast<uint32_t*>(result);
+
+				*marker = static_cast<uint32_t>(reinterpret_cast<char*>(marker) - reinterpret_cast<char*>(out_page));
+				out_page->compact_page_marker = marker;
+
+				// since we don't reuse the page space until we reallocate it, we can just pretend that we freed the marker block
+				// this will make sure deallocate_memory correctly tracks the size
+				out_page->freed_size += sizeof(uint32_t);
+
+				return marker + 1;
+			}
+			else
+			{
+				// roll back uint32_t part
+				_busy_size -= sizeof(uint32_t);
+
+				return result;
+			}
+		}
+	#else
+		void* allocate_object(size_t size, xml_memory_page*& out_page)
+		{
+			return allocate_memory(size, out_page);
+		}
+	#endif
+
+		void deallocate_memory(void* ptr, size_t size, xml_memory_page* page)
+		{
+			if (page == _root) page->busy_size = _busy_size;
+
+			assert(ptr >= reinterpret_cast<char*>(page) + sizeof(xml_memory_page) && ptr < reinterpret_cast<char*>(page) + sizeof(xml_memory_page) + page->busy_size);
+			(void)!ptr;
+
+			page->freed_size += size;
+			assert(page->freed_size <= page->busy_size);
+
+			if (page->freed_size == page->busy_size)
+			{
+				if (page->next == 0)
+				{
+					assert(_root == page);
+
+					// top page freed, just reset sizes
+					page->busy_size = 0;
+					page->freed_size = 0;
+
+				#ifdef PUGIXML_COMPACT
+					// reset compact state to maximize efficiency
+					page->compact_string_base = 0;
+					page->compact_shared_parent = 0;
+					page->compact_page_marker = 0;
+				#endif
+
+					_busy_size = 0;
+				}
+				else
+				{
+					assert(_root != page);
+					assert(page->prev);
+
+					// remove from the list
+					page->prev->next = page->next;
+					page->next->prev = page->prev;
+
+					// deallocate
+					deallocate_page(page);
+				}
+			}
+		}
+
+		char_t* allocate_string(size_t length)
+		{
+			static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment;
+
+			PUGI__STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset);
+
+			// allocate memory for string and header block
+			size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t);
+
+			// round size up to block alignment boundary
+			size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1);
+
+			xml_memory_page* page;
+			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(allocate_memory(full_size, page));
+
+			if (!header) return 0;
+
+			// setup header
+			ptrdiff_t page_offset = reinterpret_cast<char*>(header) - reinterpret_cast<char*>(page) - sizeof(xml_memory_page);
+
+			assert(page_offset % xml_memory_block_alignment == 0);
+			assert(page_offset >= 0 && static_cast<size_t>(page_offset) < max_encoded_offset);
+			header->page_offset = static_cast<uint16_t>(static_cast<size_t>(page_offset) / xml_memory_block_alignment);
+
+			// full_size == 0 for large strings that occupy the whole page
+			assert(full_size % xml_memory_block_alignment == 0);
+			assert(full_size < max_encoded_offset || (page->busy_size == full_size && page_offset == 0));
+			header->full_size = static_cast<uint16_t>(full_size < max_encoded_offset ? full_size / xml_memory_block_alignment : 0);
+
+			// round-trip through void* to avoid 'cast increases required alignment of target type' warning
+			// header is guaranteed a pointer-sized alignment, which should be enough for char_t
+			return static_cast<char_t*>(static_cast<void*>(header + 1));
+		}
+
+		void deallocate_string(char_t* string)
+		{
+			// this function casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
+			// we're guaranteed the proper (pointer-sized) alignment on the input string if it was allocated via allocate_string
+
+			// get header
+			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(static_cast<void*>(string)) - 1;
+			assert(header);
+
+			// deallocate
+			size_t page_offset = sizeof(xml_memory_page) + header->page_offset * xml_memory_block_alignment;
+			xml_memory_page* page = reinterpret_cast<xml_memory_page*>(static_cast<void*>(reinterpret_cast<char*>(header) - page_offset));
+
+			// if full_size == 0 then this string occupies the whole page
+			size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * xml_memory_block_alignment;
+
+			deallocate_memory(header, full_size, page);
+		}
+
+		bool reserve()
+		{
+		#ifdef PUGIXML_COMPACT
+			return _hash->reserve();
+		#else
+			return true;
+		#endif
+		}
+
+		xml_memory_page* _root;
+		size_t _busy_size;
+
+	#ifdef PUGIXML_COMPACT
+		compact_hash_table* _hash;
+	#endif
+	};
+
+	PUGI__FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page)
+	{
+		const size_t large_allocation_threshold = xml_memory_page_size / 4;
+
+		xml_memory_page* page = allocate_page(size <= large_allocation_threshold ? xml_memory_page_size : size);
+		out_page = page;
+
+		if (!page) return 0;
+
+		if (size <= large_allocation_threshold)
+		{
+			_root->busy_size = _busy_size;
+
+			// insert page at the end of linked list
+			page->prev = _root;
+			_root->next = page;
+			_root = page;
+
+			_busy_size = size;
+		}
+		else
+		{
+			// insert page before the end of linked list, so that it is deleted as soon as possible
+			// the last page is not deleted even if it's empty (see deallocate_memory)
+			assert(_root->prev);
+
+			page->prev = _root->prev;
+			page->next = _root;
+
+			_root->prev->next = page;
+			_root->prev = page;
+
+			page->busy_size = size;
+		}
+
+		return reinterpret_cast<char*>(page) + sizeof(xml_memory_page);
+	}
+PUGI__NS_END
+
+#ifdef PUGIXML_COMPACT
+PUGI__NS_BEGIN
+	static const uintptr_t compact_alignment_log2 = 2;
+	static const uintptr_t compact_alignment = 1 << compact_alignment_log2;
+
+	class compact_header
+	{
+	public:
+		compact_header(xml_memory_page* page, unsigned int flags)
+		{
+			PUGI__STATIC_ASSERT(xml_memory_block_alignment == compact_alignment);
+
+			ptrdiff_t offset = (reinterpret_cast<char*>(this) - reinterpret_cast<char*>(page->compact_page_marker));
+			assert(offset % compact_alignment == 0 && static_cast<uintptr_t>(offset) < 256 * compact_alignment);
+
+			_page = static_cast<unsigned char>(offset >> compact_alignment_log2);
+			_flags = static_cast<unsigned char>(flags);
+		}
+
+		void operator&=(uintptr_t mod)
+		{
+			_flags &= static_cast<unsigned char>(mod);
+		}
+
+		void operator|=(uintptr_t mod)
+		{
+			_flags |= static_cast<unsigned char>(mod);
+		}
+
+		uintptr_t operator&(uintptr_t mod) const
+		{
+			return _flags & mod;
+		}
+
+		xml_memory_page* get_page() const
+		{
+			// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+			const char* page_marker = reinterpret_cast<const char*>(this) - (_page << compact_alignment_log2);
+			const char* page = page_marker - *reinterpret_cast<const uint32_t*>(static_cast<const void*>(page_marker));
+
+			return const_cast<xml_memory_page*>(reinterpret_cast<const xml_memory_page*>(static_cast<const void*>(page)));
+		}
+
+	private:
+		unsigned char _page;
+		unsigned char _flags;
+	};
+
+	PUGI__FN xml_memory_page* compact_get_page(const void* object, int header_offset)
+	{
+		const compact_header* header = reinterpret_cast<const compact_header*>(static_cast<const char*>(object) - header_offset);
+
+		return header->get_page();
+	}
+
+	template <int header_offset, typename T> PUGI__FN_NO_INLINE T* compact_get_value(const void* object)
+	{
+		return static_cast<T*>(compact_get_page(object, header_offset)->allocator->_hash->find(object));
+	}
+
+	template <int header_offset, typename T> PUGI__FN_NO_INLINE void compact_set_value(const void* object, T* value)
+	{
+		compact_get_page(object, header_offset)->allocator->_hash->insert(object, value);
+	}
+
+	template <typename T, int header_offset, int start = -126> class compact_pointer
+	{
+	public:
+		compact_pointer(): _data(0)
+		{
+		}
+
+		void operator=(const compact_pointer& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(T* value)
+		{
+			if (value)
+			{
+				// value is guaranteed to be compact-aligned; 'this' is not
+				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
+				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
+				// compensate for arithmetic shift rounding for negative values
+				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
+				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) - start;
+
+				if (static_cast<uintptr_t>(offset) <= 253)
+					_data = static_cast<unsigned char>(offset + 1);
+				else
+				{
+					compact_set_value<header_offset>(this, value);
+
+					_data = 255;
+				}
+			}
+			else
+				_data = 0;
+		}
+
+		operator T*() const
+		{
+			if (_data)
+			{
+				if (_data < 255)
+				{
+					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
+
+					return reinterpret_cast<T*>(base + (_data - 1 + start) * compact_alignment);
+				}
+				else
+					return compact_get_value<header_offset, T>(this);
+			}
+			else
+				return 0;
+		}
+
+		T* operator->() const
+		{
+			return *this;
+		}
+
+	private:
+		unsigned char _data;
+	};
+
+	template <typename T, int header_offset> class compact_pointer_parent
+	{
+	public:
+		compact_pointer_parent(): _data(0)
+		{
+		}
+
+		void operator=(const compact_pointer_parent& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(T* value)
+		{
+			if (value)
+			{
+				// value is guaranteed to be compact-aligned; 'this' is not
+				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
+				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
+				// compensate for arithmetic shift behavior for negative values
+				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
+				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) + 65533;
+
+				if (static_cast<uintptr_t>(offset) <= 65533)
+				{
+					_data = static_cast<unsigned short>(offset + 1);
+				}
+				else
+				{
+					xml_memory_page* page = compact_get_page(this, header_offset);
+
+					if (PUGI__UNLIKELY(page->compact_shared_parent == 0))
+						page->compact_shared_parent = value;
+
+					if (page->compact_shared_parent == value)
+					{
+						_data = 65534;
+					}
+					else
+					{
+						compact_set_value<header_offset>(this, value);
+
+						_data = 65535;
+					}
+				}
+			}
+			else
+			{
+				_data = 0;
+			}
+		}
+
+		operator T*() const
+		{
+			if (_data)
+			{
+				if (_data < 65534)
+				{
+					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
+
+					return reinterpret_cast<T*>(base + (_data - 1 - 65533) * compact_alignment);
+				}
+				else if (_data == 65534)
+					return static_cast<T*>(compact_get_page(this, header_offset)->compact_shared_parent);
+				else
+					return compact_get_value<header_offset, T>(this);
+			}
+			else
+				return 0;
+		}
+
+		T* operator->() const
+		{
+			return *this;
+		}
+
+	private:
+		uint16_t _data;
+	};
+
+	template <int header_offset, int base_offset> class compact_string
+	{
+	public:
+		compact_string(): _data(0)
+		{
+		}
+
+		void operator=(const compact_string& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(char_t* value)
+		{
+			if (value)
+			{
+				xml_memory_page* page = compact_get_page(this, header_offset);
+
+				if (PUGI__UNLIKELY(page->compact_string_base == 0))
+					page->compact_string_base = value;
+
+				ptrdiff_t offset = value - page->compact_string_base;
+
+				if (static_cast<uintptr_t>(offset) < (65535 << 7))
+				{
+					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+					uint16_t* base = reinterpret_cast<uint16_t*>(static_cast<void*>(reinterpret_cast<char*>(this) - base_offset));
+
+					if (*base == 0)
+					{
+						*base = static_cast<uint16_t>((offset >> 7) + 1);
+						_data = static_cast<unsigned char>((offset & 127) + 1);
+					}
+					else
+					{
+						ptrdiff_t remainder = offset - ((*base - 1) << 7);
+
+						if (static_cast<uintptr_t>(remainder) <= 253)
+						{
+							_data = static_cast<unsigned char>(remainder + 1);
+						}
+						else
+						{
+							compact_set_value<header_offset>(this, value);
+
+							_data = 255;
+						}
+					}
+				}
+				else
+				{
+					compact_set_value<header_offset>(this, value);
+
+					_data = 255;
+				}
+			}
+			else
+			{
+				_data = 0;
+			}
+		}
+
+		operator char_t*() const
+		{
+			if (_data)
+			{
+				if (_data < 255)
+				{
+					xml_memory_page* page = compact_get_page(this, header_offset);
+
+					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+					const uint16_t* base = reinterpret_cast<const uint16_t*>(static_cast<const void*>(reinterpret_cast<const char*>(this) - base_offset));
+					assert(*base);
+
+					ptrdiff_t offset = ((*base - 1) << 7) + (_data - 1);
+
+					return page->compact_string_base + offset;
+				}
+				else
+				{
+					return compact_get_value<header_offset, char_t>(this);
+				}
+			}
+			else
+				return 0;
+		}
+
+	private:
+		unsigned char _data;
+	};
+PUGI__NS_END
+#endif
+
+#ifdef PUGIXML_COMPACT
+namespace pugi
+{
+	struct xml_attribute_struct
+	{
+		xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0)
+		{
+			PUGI__STATIC_ASSERT(sizeof(xml_attribute_struct) == 8);
+		}
+
+		impl::compact_header header;
+
+		uint16_t namevalue_base;
+
+		impl::compact_string<4, 2> name;
+		impl::compact_string<5, 3> value;
+
+		impl::compact_pointer<xml_attribute_struct, 6> prev_attribute_c;
+		impl::compact_pointer<xml_attribute_struct, 7, 0> next_attribute;
+	};
+
+	struct xml_node_struct
+	{
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0)
+		{
+			PUGI__STATIC_ASSERT(sizeof(xml_node_struct) == 12);
+		}
+
+		impl::compact_header header;
+
+		uint16_t namevalue_base;
+
+		impl::compact_string<4, 2> name;
+		impl::compact_string<5, 3> value;
+
+		impl::compact_pointer_parent<xml_node_struct, 6> parent;
+
+		impl::compact_pointer<xml_node_struct, 8, 0> first_child;
+
+		impl::compact_pointer<xml_node_struct,  9>    prev_sibling_c;
+		impl::compact_pointer<xml_node_struct, 10, 0> next_sibling;
+
+		impl::compact_pointer<xml_attribute_struct, 11, 0> first_attribute;
+	};
+}
+#else
+namespace pugi
+{
+	struct xml_attribute_struct
+	{
+		xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0)
+		{
+			header = PUGI__GETHEADER_IMPL(this, page, 0);
+		}
+
+		uintptr_t header;
+
+		char_t*	name;
+		char_t*	value;
+
+		xml_attribute_struct* prev_attribute_c;
+		xml_attribute_struct* next_attribute;
+	};
+
+	struct xml_node_struct
+	{
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0)
+		{
+			header = PUGI__GETHEADER_IMPL(this, page, type);
+		}
+
+		uintptr_t header;
+
+		char_t* name;
+		char_t* value;
+
+		xml_node_struct* parent;
+
+		xml_node_struct* first_child;
+
+		xml_node_struct* prev_sibling_c;
+		xml_node_struct* next_sibling;
+
+		xml_attribute_struct* first_attribute;
+	};
+}
+#endif
+
+PUGI__NS_BEGIN
+	struct xml_extra_buffer
+	{
+		char_t* buffer;
+		xml_extra_buffer* next;
+	};
+
+	struct xml_document_struct: public xml_node_struct, public xml_allocator
+	{
+		xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0)
+		{
+		}
+
+		const char_t* buffer;
+
+		xml_extra_buffer* extra_buffers;
+
+	#ifdef PUGIXML_COMPACT
+		compact_hash_table hash;
+	#endif
+	};
+
+	template <typename Object> inline xml_allocator& get_allocator(const Object* object)
+	{
+		assert(object);
+
+		return *PUGI__GETPAGE(object)->allocator;
+	}
+
+	template <typename Object> inline xml_document_struct& get_document(const Object* object)
+	{
+		assert(object);
+
+		return *static_cast<xml_document_struct*>(PUGI__GETPAGE(object)->allocator);
+	}
+PUGI__NS_END
+
+// Low-level DOM operations
+PUGI__NS_BEGIN
+	inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc)
+	{
+		xml_memory_page* page;
+		void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page);
+		if (!memory) return 0;
+
+		return new (memory) xml_attribute_struct(page);
+	}
+
+	inline xml_node_struct* allocate_node(xml_allocator& alloc, xml_node_type type)
+	{
+		xml_memory_page* page;
+		void* memory = alloc.allocate_object(sizeof(xml_node_struct), page);
+		if (!memory) return 0;
+
+		return new (memory) xml_node_struct(page, type);
+	}
+
+	inline void destroy_attribute(xml_attribute_struct* a, xml_allocator& alloc)
+	{
+		if (a->header & impl::xml_memory_page_name_allocated_mask)
+			alloc.deallocate_string(a->name);
+
+		if (a->header & impl::xml_memory_page_value_allocated_mask)
+			alloc.deallocate_string(a->value);
+
+		alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI__GETPAGE(a));
+	}
+
+	inline void destroy_node(xml_node_struct* n, xml_allocator& alloc)
+	{
+		if (n->header & impl::xml_memory_page_name_allocated_mask)
+			alloc.deallocate_string(n->name);
+
+		if (n->header & impl::xml_memory_page_value_allocated_mask)
+			alloc.deallocate_string(n->value);
+
+		for (xml_attribute_struct* attr = n->first_attribute; attr; )
+		{
+			xml_attribute_struct* next = attr->next_attribute;
+
+			destroy_attribute(attr, alloc);
+
+			attr = next;
+		}
+
+		for (xml_node_struct* child = n->first_child; child; )
+		{
+			xml_node_struct* next = child->next_sibling;
+
+			destroy_node(child, alloc);
+
+			child = next;
+		}
+
+		alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI__GETPAGE(n));
+	}
+
+	inline void append_node(xml_node_struct* child, xml_node_struct* node)
+	{
+		child->parent = node;
+
+		xml_node_struct* head = node->first_child;
+
+		if (head)
+		{
+			xml_node_struct* tail = head->prev_sibling_c;
+
+			tail->next_sibling = child;
+			child->prev_sibling_c = tail;
+			head->prev_sibling_c = child;
+		}
+		else
+		{
+			node->first_child = child;
+			child->prev_sibling_c = child;
+		}
+	}
+
+	inline void prepend_node(xml_node_struct* child, xml_node_struct* node)
+	{
+		child->parent = node;
+
+		xml_node_struct* head = node->first_child;
+
+		if (head)
+		{
+			child->prev_sibling_c = head->prev_sibling_c;
+			head->prev_sibling_c = child;
+		}
+		else
+			child->prev_sibling_c = child;
+
+		child->next_sibling = head;
+		node->first_child = child;
+	}
+
+	inline void insert_node_after(xml_node_struct* child, xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		child->parent = parent;
+
+		if (node->next_sibling)
+			node->next_sibling->prev_sibling_c = child;
+		else
+			parent->first_child->prev_sibling_c = child;
+
+		child->next_sibling = node->next_sibling;
+		child->prev_sibling_c = node;
+
+		node->next_sibling = child;
+	}
+
+	inline void insert_node_before(xml_node_struct* child, xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		child->parent = parent;
+
+		if (node->prev_sibling_c->next_sibling)
+			node->prev_sibling_c->next_sibling = child;
+		else
+			parent->first_child = child;
+
+		child->prev_sibling_c = node->prev_sibling_c;
+		child->next_sibling = node;
+
+		node->prev_sibling_c = child;
+	}
+
+	inline void remove_node(xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		if (node->next_sibling)
+			node->next_sibling->prev_sibling_c = node->prev_sibling_c;
+		else
+			parent->first_child->prev_sibling_c = node->prev_sibling_c;
+
+		if (node->prev_sibling_c->next_sibling)
+			node->prev_sibling_c->next_sibling = node->next_sibling;
+		else
+			parent->first_child = node->next_sibling;
+
+		node->parent = 0;
+		node->prev_sibling_c = 0;
+		node->next_sibling = 0;
+	}
+
+	inline void append_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* head = node->first_attribute;
+
+		if (head)
+		{
+			xml_attribute_struct* tail = head->prev_attribute_c;
+
+			tail->next_attribute = attr;
+			attr->prev_attribute_c = tail;
+			head->prev_attribute_c = attr;
+		}
+		else
+		{
+			node->first_attribute = attr;
+			attr->prev_attribute_c = attr;
+		}
+	}
+
+	inline void prepend_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* head = node->first_attribute;
+
+		if (head)
+		{
+			attr->prev_attribute_c = head->prev_attribute_c;
+			head->prev_attribute_c = attr;
+		}
+		else
+			attr->prev_attribute_c = attr;
+
+		attr->next_attribute = head;
+		node->first_attribute = attr;
+	}
+
+	inline void insert_attribute_after(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
+	{
+		if (place->next_attribute)
+			place->next_attribute->prev_attribute_c = attr;
+		else
+			node->first_attribute->prev_attribute_c = attr;
+
+		attr->next_attribute = place->next_attribute;
+		attr->prev_attribute_c = place;
+		place->next_attribute = attr;
+	}
+
+	inline void insert_attribute_before(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
+	{
+		if (place->prev_attribute_c->next_attribute)
+			place->prev_attribute_c->next_attribute = attr;
+		else
+			node->first_attribute = attr;
+
+		attr->prev_attribute_c = place->prev_attribute_c;
+		attr->next_attribute = place;
+		place->prev_attribute_c = attr;
+	}
+
+	inline void remove_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		if (attr->next_attribute)
+			attr->next_attribute->prev_attribute_c = attr->prev_attribute_c;
+		else
+			node->first_attribute->prev_attribute_c = attr->prev_attribute_c;
+
+		if (attr->prev_attribute_c->next_attribute)
+			attr->prev_attribute_c->next_attribute = attr->next_attribute;
+		else
+			node->first_attribute = attr->next_attribute;
+
+		attr->prev_attribute_c = 0;
+		attr->next_attribute = 0;
+	}
+
+	PUGI__FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element)
+	{
+		if (!alloc.reserve()) return 0;
+
+		xml_node_struct* child = allocate_node(alloc, type);
+		if (!child) return 0;
+
+		append_node(child, node);
+
+		return child;
+	}
+
+	PUGI__FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc)
+	{
+		if (!alloc.reserve()) return 0;
+
+		xml_attribute_struct* attr = allocate_attribute(alloc);
+		if (!attr) return 0;
+
+		append_attribute(attr, node);
+
+		return attr;
+	}
+PUGI__NS_END
+
+// Helper classes for code generation
+PUGI__NS_BEGIN
+	struct opt_false
+	{
+		enum { value = 0 };
+	};
+
+	struct opt_true
+	{
+		enum { value = 1 };
+	};
+PUGI__NS_END
+
+// Unicode utilities
+PUGI__NS_BEGIN
+	inline uint16_t endian_swap(uint16_t value)
+	{
+		return static_cast<uint16_t>(((value & 0xff) << 8) | (value >> 8));
+	}
+
+	inline uint32_t endian_swap(uint32_t value)
+	{
+		return ((value & 0xff) << 24) | ((value & 0xff00) << 8) | ((value & 0xff0000) >> 8) | (value >> 24);
+	}
+
+	struct utf8_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			// U+0000..U+007F
+			if (ch < 0x80) return result + 1;
+			// U+0080..U+07FF
+			else if (ch < 0x800) return result + 2;
+			// U+0800..U+FFFF
+			else return result + 3;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			// U+10000..U+10FFFF
+			return result + 4;
+		}
+	};
+
+	struct utf8_writer
+	{
+		typedef uint8_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			// U+0000..U+007F
+			if (ch < 0x80)
+			{
+				*result = static_cast<uint8_t>(ch);
+				return result + 1;
+			}
+			// U+0080..U+07FF
+			else if (ch < 0x800)
+			{
+				result[0] = static_cast<uint8_t>(0xC0 | (ch >> 6));
+				result[1] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+				return result + 2;
+			}
+			// U+0800..U+FFFF
+			else
+			{
+				result[0] = static_cast<uint8_t>(0xE0 | (ch >> 12));
+				result[1] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
+				result[2] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+				return result + 3;
+			}
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			// U+10000..U+10FFFF
+			result[0] = static_cast<uint8_t>(0xF0 | (ch >> 18));
+			result[1] = static_cast<uint8_t>(0x80 | ((ch >> 12) & 0x3F));
+			result[2] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
+			result[3] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+			return result + 4;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
+		}
+	};
+
+	struct utf16_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			return result + 2;
+		}
+	};
+
+	struct utf16_writer
+	{
+		typedef uint16_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = static_cast<uint16_t>(ch);
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			uint32_t msh = static_cast<uint32_t>(ch - 0x10000) >> 10;
+			uint32_t lsh = static_cast<uint32_t>(ch - 0x10000) & 0x3ff;
+
+			result[0] = static_cast<uint16_t>(0xD800 + msh);
+			result[1] = static_cast<uint16_t>(0xDC00 + lsh);
+
+			return result + 2;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
+		}
+	};
+
+	struct utf32_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+	};
+
+	struct utf32_writer
+	{
+		typedef uint32_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+	};
+
+	struct latin1_writer
+	{
+		typedef uint8_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = static_cast<uint8_t>(ch > 255 ? '?' : ch);
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			(void)ch;
+
+			*result = '?';
+
+			return result + 1;
+		}
+	};
+
+	struct utf8_decoder
+	{
+		typedef uint8_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			const uint8_t utf8_byte_mask = 0x3f;
+
+			while (size)
+			{
+				uint8_t lead = *data;
+
+				// 0xxxxxxx -> U+0000..U+007F
+				if (lead < 0x80)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+
+					// process aligned single-byte (ascii) blocks
+					if ((reinterpret_cast<uintptr_t>(data) & 3) == 0)
+					{
+						// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+						while (size >= 4 && (*static_cast<const uint32_t*>(static_cast<const void*>(data)) & 0x80808080) == 0)
+						{
+							result = Traits::low(result, data[0]);
+							result = Traits::low(result, data[1]);
+							result = Traits::low(result, data[2]);
+							result = Traits::low(result, data[3]);
+							data += 4;
+							size -= 4;
+						}
+					}
+				}
+				// 110xxxxx -> U+0080..U+07FF
+				else if (static_cast<unsigned int>(lead - 0xC0) < 0x20 && size >= 2 && (data[1] & 0xc0) == 0x80)
+				{
+					result = Traits::low(result, ((lead & ~0xC0) << 6) | (data[1] & utf8_byte_mask));
+					data += 2;
+					size -= 2;
+				}
+				// 1110xxxx -> U+0800-U+FFFF
+				else if (static_cast<unsigned int>(lead - 0xE0) < 0x10 && size >= 3 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80)
+				{
+					result = Traits::low(result, ((lead & ~0xE0) << 12) | ((data[1] & utf8_byte_mask) << 6) | (data[2] & utf8_byte_mask));
+					data += 3;
+					size -= 3;
+				}
+				// 11110xxx -> U+10000..U+10FFFF
+				else if (static_cast<unsigned int>(lead - 0xF0) < 0x08 && size >= 4 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80 && (data[3] & 0xc0) == 0x80)
+				{
+					result = Traits::high(result, ((lead & ~0xF0) << 18) | ((data[1] & utf8_byte_mask) << 12) | ((data[2] & utf8_byte_mask) << 6) | (data[3] & utf8_byte_mask));
+					data += 4;
+					size -= 4;
+				}
+				// 10xxxxxx or 11111xxx -> invalid
+				else
+				{
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	template <typename opt_swap> struct utf16_decoder
+	{
+		typedef uint16_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint16_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				uint16_t lead = opt_swap::value ? endian_swap(*data) : *data;
+
+				// U+0000..U+D7FF
+				if (lead < 0xD800)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// U+E000..U+FFFF
+				else if (static_cast<unsigned int>(lead - 0xE000) < 0x2000)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// surrogate pair lead
+				else if (static_cast<unsigned int>(lead - 0xD800) < 0x400 && size >= 2)
+				{
+					uint16_t next = opt_swap::value ? endian_swap(data[1]) : data[1];
+
+					if (static_cast<unsigned int>(next - 0xDC00) < 0x400)
+					{
+						result = Traits::high(result, 0x10000 + ((lead & 0x3ff) << 10) + (next & 0x3ff));
+						data += 2;
+						size -= 2;
+					}
+					else
+					{
+						data += 1;
+						size -= 1;
+					}
+				}
+				else
+				{
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	template <typename opt_swap> struct utf32_decoder
+	{
+		typedef uint32_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint32_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				uint32_t lead = opt_swap::value ? endian_swap(*data) : *data;
+
+				// U+0000..U+FFFF
+				if (lead < 0x10000)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// U+10000..U+10FFFF
+				else
+				{
+					result = Traits::high(result, lead);
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	struct latin1_decoder
+	{
+		typedef uint8_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				result = Traits::low(result, *data);
+				data += 1;
+				size -= 1;
+			}
+
+			return result;
+		}
+	};
+
+	template <size_t size> struct wchar_selector;
+
+	template <> struct wchar_selector<2>
+	{
+		typedef uint16_t type;
+		typedef utf16_counter counter;
+		typedef utf16_writer writer;
+		typedef utf16_decoder<opt_false> decoder;
+	};
+
+	template <> struct wchar_selector<4>
+	{
+		typedef uint32_t type;
+		typedef utf32_counter counter;
+		typedef utf32_writer writer;
+		typedef utf32_decoder<opt_false> decoder;
+	};
+
+	typedef wchar_selector<sizeof(wchar_t)>::counter wchar_counter;
+	typedef wchar_selector<sizeof(wchar_t)>::writer wchar_writer;
+
+	struct wchar_decoder
+	{
+		typedef wchar_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits)
+		{
+			typedef wchar_selector<sizeof(wchar_t)>::decoder decoder;
+
+			return decoder::process(reinterpret_cast<const typename decoder::type*>(data), size, result, traits);
+		}
+	};
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length)
+	{
+		for (size_t i = 0; i < length; ++i)
+			result[i] = static_cast<wchar_t>(endian_swap(static_cast<wchar_selector<sizeof(wchar_t)>::type>(data[i])));
+	}
+#endif
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	enum chartype_t
+	{
+		ct_parse_pcdata = 1,	// \0, &, \r, <
+		ct_parse_attr = 2,		// \0, &, \r, ', "
+		ct_parse_attr_ws = 4,	// \0, &, \r, ', ", \n, tab
+		ct_space = 8,			// \r, \n, space, tab
+		ct_parse_cdata = 16,	// \0, ], >, \r
+		ct_parse_comment = 32,	// \0, -, >, \r
+		ct_symbol = 64,			// Any symbol > 127, a-z, A-Z, 0-9, _, :, -, .
+		ct_start_symbol = 128	// Any symbol > 127, a-z, A-Z, _, :
+	};
+
+	static const unsigned char chartype_table[256] =
+	{
+		55,  0,   0,   0,   0,   0,   0,   0,      0,   12,  12,  0,   0,   63,  0,   0,   // 0-15
+		0,   0,   0,   0,   0,   0,   0,   0,      0,   0,   0,   0,   0,   0,   0,   0,   // 16-31
+		8,   0,   6,   0,   0,   0,   7,   6,      0,   0,   0,   0,   0,   96,  64,  0,   // 32-47
+		64,  64,  64,  64,  64,  64,  64,  64,     64,  64,  192, 0,   1,   0,   48,  0,   // 48-63
+		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 64-79
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0,   0,   16,  0,   192, // 80-95
+		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 96-111
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0, 0, 0, 0, 0,           // 112-127
+
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 128+
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192
+	};
+
+	enum chartypex_t
+	{
+		ctx_special_pcdata = 1,   // Any symbol >= 0 and < 32 (except \t, \r, \n), &, <, >
+		ctx_special_attr = 2,     // Any symbol >= 0 and < 32 (except \t), &, <, >, "
+		ctx_start_symbol = 4,	  // Any symbol > 127, a-z, A-Z, _
+		ctx_digit = 8,			  // 0-9
+		ctx_symbol = 16			  // Any symbol > 127, a-z, A-Z, 0-9, _, -, .
+	};
+
+	static const unsigned char chartypex_table[256] =
+	{
+		3,  3,  3,  3,  3,  3,  3,  3,     3,  0,  2,  3,  3,  2,  3,  3,     // 0-15
+		3,  3,  3,  3,  3,  3,  3,  3,     3,  3,  3,  3,  3,  3,  3,  3,     // 16-31
+		0,  0,  2,  0,  0,  0,  3,  0,     0,  0,  0,  0,  0, 16, 16,  0,     // 32-47
+		24, 24, 24, 24, 24, 24, 24, 24,    24, 24, 0,  0,  3,  0,  3,  0,     // 48-63
+
+		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 64-79
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  20,    // 80-95
+		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 96-111
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  0,     // 112-127
+
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 128+
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20
+	};
+
+#ifdef PUGIXML_WCHAR_MODE
+	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) ((static_cast<unsigned int>(c) < 128 ? table[static_cast<unsigned int>(c)] : table[128]) & (ct))
+#else
+	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast<unsigned char>(c)] & (ct))
+#endif
+
+	#define PUGI__IS_CHARTYPE(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartype_table)
+	#define PUGI__IS_CHARTYPEX(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartypex_table)
+
+	PUGI__FN bool is_little_endian()
+	{
+		unsigned int ui = 1;
+
+		return *reinterpret_cast<unsigned char*>(&ui) == 1;
+	}
+
+	PUGI__FN xml_encoding get_wchar_encoding()
+	{
+		PUGI__STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4);
+
+		if (sizeof(wchar_t) == 2)
+			return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+		else
+			return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+	}
+
+	PUGI__FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length)
+	{
+	#define PUGI__SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; }
+	#define PUGI__SCANCHARTYPE(ct) { while (offset < size && PUGI__IS_CHARTYPE(data[offset], ct)) offset++; }
+
+		// check if we have a non-empty XML declaration
+		if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI__IS_CHARTYPE(data[5], ct_space)))
+			return false;
+
+		// scan XML declaration until the encoding field
+		for (size_t i = 6; i + 1 < size; ++i)
+		{
+			// declaration can not contain ? in quoted values
+			if (data[i] == '?')
+				return false;
+
+			if (data[i] == 'e' && data[i + 1] == 'n')
+			{
+				size_t offset = i;
+
+				// encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed
+				PUGI__SCANCHAR('e'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('c'); PUGI__SCANCHAR('o');
+				PUGI__SCANCHAR('d'); PUGI__SCANCHAR('i'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('g');
+
+				// S? = S?
+				PUGI__SCANCHARTYPE(ct_space);
+				PUGI__SCANCHAR('=');
+				PUGI__SCANCHARTYPE(ct_space);
+
+				// the only two valid delimiters are ' and "
+				uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\'';
+
+				PUGI__SCANCHAR(delimiter);
+
+				size_t start = offset;
+
+				out_encoding = data + offset;
+
+				PUGI__SCANCHARTYPE(ct_symbol);
+
+				out_length = offset - start;
+
+				PUGI__SCANCHAR(delimiter);
+
+				return true;
+			}
+		}
+
+		return false;
+
+	#undef PUGI__SCANCHAR
+	#undef PUGI__SCANCHARTYPE
+	}
+
+	PUGI__FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size)
+	{
+		// skip encoding autodetection if input buffer is too small
+		if (size < 4) return encoding_utf8;
+
+		uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3];
+
+		// look for BOM in first few bytes
+		if (d0 == 0 && d1 == 0 && d2 == 0xfe && d3 == 0xff) return encoding_utf32_be;
+		if (d0 == 0xff && d1 == 0xfe && d2 == 0 && d3 == 0) return encoding_utf32_le;
+		if (d0 == 0xfe && d1 == 0xff) return encoding_utf16_be;
+		if (d0 == 0xff && d1 == 0xfe) return encoding_utf16_le;
+		if (d0 == 0xef && d1 == 0xbb && d2 == 0xbf) return encoding_utf8;
+
+		// look for <, <? or <?xm in various encodings
+		if (d0 == 0 && d1 == 0 && d2 == 0 && d3 == 0x3c) return encoding_utf32_be;
+		if (d0 == 0x3c && d1 == 0 && d2 == 0 && d3 == 0) return encoding_utf32_le;
+		if (d0 == 0 && d1 == 0x3c && d2 == 0 && d3 == 0x3f) return encoding_utf16_be;
+		if (d0 == 0x3c && d1 == 0 && d2 == 0x3f && d3 == 0) return encoding_utf16_le;
+
+		// look for utf16 < followed by node name (this may fail, but is better than utf8 since it's zero terminated so early)
+		if (d0 == 0 && d1 == 0x3c) return encoding_utf16_be;
+		if (d0 == 0x3c && d1 == 0) return encoding_utf16_le;
+
+		// no known BOM detected; parse declaration
+		const uint8_t* enc = 0;
+		size_t enc_length = 0;
+
+		if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d && parse_declaration_encoding(data, size, enc, enc_length))
+		{
+			// iso-8859-1 (case-insensitive)
+			if (enc_length == 10
+				&& (enc[0] | ' ') == 'i' && (enc[1] | ' ') == 's' && (enc[2] | ' ') == 'o'
+				&& enc[3] == '-' && enc[4] == '8' && enc[5] == '8' && enc[6] == '5' && enc[7] == '9'
+				&& enc[8] == '-' && enc[9] == '1')
+				return encoding_latin1;
+
+			// latin1 (case-insensitive)
+			if (enc_length == 6
+				&& (enc[0] | ' ') == 'l' && (enc[1] | ' ') == 'a' && (enc[2] | ' ') == 't'
+				&& (enc[3] | ' ') == 'i' && (enc[4] | ' ') == 'n'
+				&& enc[5] == '1')
+				return encoding_latin1;
+		}
+
+		return encoding_utf8;
+	}
+
+	PUGI__FN xml_encoding get_buffer_encoding(xml_encoding encoding, const void* contents, size_t size)
+	{
+		// replace wchar encoding with utf implementation
+		if (encoding == encoding_wchar) return get_wchar_encoding();
+
+		// replace utf16 encoding with utf16 with specific endianness
+		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+		// replace utf32 encoding with utf32 with specific endianness
+		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+		// only do autodetection if no explicit encoding is requested
+		if (encoding != encoding_auto) return encoding;
+
+		// try to guess encoding (based on XML specification, Appendix F.1)
+		const uint8_t* data = static_cast<const uint8_t*>(contents);
+
+		return guess_buffer_encoding(data, size);
+	}
+
+	PUGI__FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		size_t length = size / sizeof(char_t);
+
+		if (is_mutable)
+		{
+			out_buffer = static_cast<char_t*>(const_cast<void*>(contents));
+			out_length = length;
+		}
+		else
+		{
+			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!buffer) return false;
+
+			if (contents)
+				memcpy(buffer, contents, length * sizeof(char_t));
+			else
+				assert(length == 0);
+
+			buffer[length] = 0;
+
+			out_buffer = buffer;
+			out_length = length + 1;
+		}
+
+		return true;
+	}
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re)
+	{
+		return (le == encoding_utf16_be && re == encoding_utf16_le) || (le == encoding_utf16_le && re == encoding_utf16_be) ||
+			   (le == encoding_utf32_be && re == encoding_utf32_le) || (le == encoding_utf32_le && re == encoding_utf32_be);
+	}
+
+	PUGI__FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		const char_t* data = static_cast<const char_t*>(contents);
+		size_t length = size / sizeof(char_t);
+
+		if (is_mutable)
+		{
+			char_t* buffer = const_cast<char_t*>(data);
+
+			convert_wchar_endian_swap(buffer, data, length);
+
+			out_buffer = buffer;
+			out_length = length;
+		}
+		else
+		{
+			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!buffer) return false;
+
+			convert_wchar_endian_swap(buffer, data, length);
+			buffer[length] = 0;
+
+			out_buffer = buffer;
+			out_length = length + 1;
+		}
+
+		return true;
+	}
+
+	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	{
+		const typename D::type* data = static_cast<const typename D::type*>(contents);
+		size_t data_length = size / sizeof(typename D::type);
+
+		// first pass: get length in wchar_t units
+		size_t length = D::process(data, data_length, 0, wchar_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert utf16 input to wchar_t
+		wchar_writer::value_type obegin = reinterpret_cast<wchar_writer::value_type>(buffer);
+		wchar_writer::value_type oend = D::process(data, data_length, obegin, wchar_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	{
+		// get native encoding
+		xml_encoding wchar_encoding = get_wchar_encoding();
+
+		// fast path: no conversion required
+		if (encoding == wchar_encoding)
+			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// only endian-swapping is required
+		if (need_endian_swap_utf(encoding, wchar_encoding))
+			return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable);
+
+		// source encoding is utf8
+		if (encoding == encoding_utf8)
+			return convert_buffer_generic(out_buffer, out_length, contents, size, utf8_decoder());
+
+		// source encoding is utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
+		}
+
+		// source encoding is utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
+		}
+
+		// source encoding is latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return false;
+	}
+#else
+	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	{
+		const typename D::type* data = static_cast<const typename D::type*>(contents);
+		size_t data_length = size / sizeof(typename D::type);
+
+		// first pass: get length in utf8 units
+		size_t length = D::process(data, data_length, 0, utf8_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert utf16 input to utf8
+		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* oend = D::process(data, data_length, obegin, utf8_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
+	{
+		for (size_t i = 0; i < size; ++i)
+			if (data[i] > 127)
+				return i;
+
+		return size;
+	}
+
+	PUGI__FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		const uint8_t* data = static_cast<const uint8_t*>(contents);
+		size_t data_length = size;
+
+		// get size of prefix that does not need utf8 conversion
+		size_t prefix_length = get_latin1_7bit_prefix_length(data, data_length);
+		assert(prefix_length <= data_length);
+
+		const uint8_t* postfix = data + prefix_length;
+		size_t postfix_length = data_length - prefix_length;
+
+		// if no conversion is needed, just return the original buffer
+		if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// first pass: get length in utf8 units
+		size_t length = prefix_length + latin1_decoder::process(postfix, postfix_length, 0, utf8_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert latin1 input to utf8
+		memcpy(buffer, data, prefix_length);
+
+		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* oend = latin1_decoder::process(postfix, postfix_length, obegin + prefix_length, utf8_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	{
+		// fast path: no conversion required
+		if (encoding == encoding_utf8)
+			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// source encoding is utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
+		}
+
+		// source encoding is utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
+		}
+
+		// source encoding is latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable);
+
+		assert(false && "Invalid encoding"); // unreachable
+		return false;
+	}
+#endif
+
+	PUGI__FN size_t as_utf8_begin(const wchar_t* str, size_t length)
+	{
+		// get length in utf8 characters
+		return wchar_decoder::process(str, length, 0, utf8_counter());
+	}
+
+	PUGI__FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length)
+	{
+		// convert to utf8
+		uint8_t* begin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer());
+
+		assert(begin + size == end);
+		(void)!end;
+		(void)!size;
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN std::string as_utf8_impl(const wchar_t* str, size_t length)
+	{
+		// first pass: get length in utf8 characters
+		size_t size = as_utf8_begin(str, length);
+
+		// allocate resulting string
+		std::string result;
+		result.resize(size);
+
+		// second pass: convert to utf8
+		if (size > 0) as_utf8_end(&result[0], size, str, length);
+
+		return result;
+	}
+
+	PUGI__FN std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
+	{
+		const uint8_t* data = reinterpret_cast<const uint8_t*>(str);
+
+		// first pass: get length in wchar_t units
+		size_t length = utf8_decoder::process(data, size, 0, wchar_counter());
+
+		// allocate resulting string
+		std::basic_string<wchar_t> result;
+		result.resize(length);
+
+		// second pass: convert to wchar_t
+		if (length > 0)
+		{
+			wchar_writer::value_type begin = reinterpret_cast<wchar_writer::value_type>(&result[0]);
+			wchar_writer::value_type end = utf8_decoder::process(data, size, begin, wchar_writer());
+
+			assert(begin + length == end);
+			(void)!end;
+		}
+
+		return result;
+	}
+#endif
+
+	template <typename Header>
+	inline bool strcpy_insitu_allow(size_t length, const Header& header, uintptr_t header_mask, char_t* target)
+	{
+		// never reuse shared memory
+		if (header & xml_memory_page_contents_shared_mask) return false;
+
+		size_t target_length = strlength(target);
+
+		// always reuse document buffer memory if possible
+		if ((header & header_mask) == 0) return target_length >= length;
+
+		// reuse heap memory if waste is not too great
+		const size_t reuse_threshold = 32;
+
+		return target_length >= length && (target_length < reuse_threshold || target_length - length < target_length / 2);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length)
+	{
+		if (source_length == 0)
+		{
+			// empty string and null pointer are equivalent, so just deallocate old memory
+			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
+
+			if (header & header_mask) alloc->deallocate_string(dest);
+
+			// mark the string as not allocated
+			dest = 0;
+			header &= ~header_mask;
+
+			return true;
+		}
+		else if (dest && strcpy_insitu_allow(source_length, header, header_mask, dest))
+		{
+			// we can reuse old buffer, so just copy the new data (including zero terminator)
+			memcpy(dest, source, source_length * sizeof(char_t));
+			dest[source_length] = 0;
+
+			return true;
+		}
+		else
+		{
+			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
+
+			if (!alloc->reserve()) return false;
+
+			// allocate new buffer
+			char_t* buf = alloc->allocate_string(source_length + 1);
+			if (!buf) return false;
+
+			// copy the string (including zero terminator)
+			memcpy(buf, source, source_length * sizeof(char_t));
+			buf[source_length] = 0;
+
+			// deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures)
+			if (header & header_mask) alloc->deallocate_string(dest);
+
+			// the string is now allocated, so set the flag
+			dest = buf;
+			header |= header_mask;
+
+			return true;
+		}
+	}
+
+	struct gap
+	{
+		char_t* end;
+		size_t size;
+
+		gap(): end(0), size(0)
+		{
+		}
+
+		// Push new gap, move s count bytes further (skipping the gap).
+		// Collapse previous gap.
+		void push(char_t*& s, size_t count)
+		{
+			if (end) // there was a gap already; collapse it
+			{
+				// Move [old_gap_end, new_gap_start) to [old_gap_start, ...)
+				assert(s >= end);
+				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+			}
+
+			s += count; // end of current gap
+
+			// "merge" two gaps
+			end = s;
+			size += count;
+		}
+
+		// Collapse all gaps, return past-the-end pointer
+		char_t* flush(char_t* s)
+		{
+			if (end)
+			{
+				// Move [old_gap_end, current_pos) to [old_gap_start, ...)
+				assert(s >= end);
+				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+
+				return s - size;
+			}
+			else return s;
+		}
+	};
+
+	PUGI__FN char_t* strconv_escape(char_t* s, gap& g)
+	{
+		char_t* stre = s + 1;
+
+		switch (*stre)
+		{
+			case '#':	// &#...
+			{
+				unsigned int ucsc = 0;
+
+				if (stre[1] == 'x') // &#x... (hex code)
+				{
+					stre += 2;
+
+					char_t ch = *stre;
+
+					if (ch == ';') return stre;
+
+					for (;;)
+					{
+						if (static_cast<unsigned int>(ch - '0') <= 9)
+							ucsc = 16 * ucsc + (ch - '0');
+						else if (static_cast<unsigned int>((ch | ' ') - 'a') <= 5)
+							ucsc = 16 * ucsc + ((ch | ' ') - 'a' + 10);
+						else if (ch == ';')
+							break;
+						else // cancel
+							return stre;
+
+						ch = *++stre;
+					}
+
+					++stre;
+				}
+				else	// &#... (dec code)
+				{
+					char_t ch = *++stre;
+
+					if (ch == ';') return stre;
+
+					for (;;)
+					{
+						if (static_cast<unsigned int>(ch - '0') <= 9)
+							ucsc = 10 * ucsc + (ch - '0');
+						else if (ch == ';')
+							break;
+						else // cancel
+							return stre;
+
+						ch = *++stre;
+					}
+
+					++stre;
+				}
+
+			#ifdef PUGIXML_WCHAR_MODE
+				s = reinterpret_cast<char_t*>(wchar_writer::any(reinterpret_cast<wchar_writer::value_type>(s), ucsc));
+			#else
+				s = reinterpret_cast<char_t*>(utf8_writer::any(reinterpret_cast<uint8_t*>(s), ucsc));
+			#endif
+
+				g.push(s, stre - s);
+				return stre;
+			}
+
+			case 'a':	// &a
+			{
+				++stre;
+
+				if (*stre == 'm') // &am
+				{
+					if (*++stre == 'p' && *++stre == ';') // &amp;
+					{
+						*s++ = '&';
+						++stre;
+
+						g.push(s, stre - s);
+						return stre;
+					}
+				}
+				else if (*stre == 'p') // &ap
+				{
+					if (*++stre == 'o' && *++stre == 's' && *++stre == ';') // &apos;
+					{
+						*s++ = '\'';
+						++stre;
+
+						g.push(s, stre - s);
+						return stre;
+					}
+				}
+				break;
+			}
+
+			case 'g': // &g
+			{
+				if (*++stre == 't' && *++stre == ';') // &gt;
+				{
+					*s++ = '>';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			case 'l': // &l
+			{
+				if (*++stre == 't' && *++stre == ';') // &lt;
+				{
+					*s++ = '<';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			case 'q': // &q
+			{
+				if (*++stre == 'u' && *++stre == 'o' && *++stre == 't' && *++stre == ';') // &quot;
+				{
+					*s++ = '"';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			default:
+				break;
+		}
+
+		return stre;
+	}
+
+	// Parser utilities
+	#define PUGI__ENDSWITH(c, e)        ((c) == (e) || ((c) == 0 && endch == (e)))
+	#define PUGI__SKIPWS()              { while (PUGI__IS_CHARTYPE(*s, ct_space)) ++s; }
+	#define PUGI__OPTSET(OPT)           ( optmsk & (OPT) )
+	#define PUGI__PUSHNODE(TYPE)        { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI__THROW_ERROR(status_out_of_memory, s); }
+	#define PUGI__POPNODE()             { cursor = cursor->parent; }
+	#define PUGI__SCANFOR(X)            { while (*s != 0 && !(X)) ++s; }
+	#define PUGI__SCANWHILE(X)          { while (X) ++s; }
+	#define PUGI__SCANWHILE_UNROLL(X)   { for (;;) { char_t ss = s[0]; if (PUGI__UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI__UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI__UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI__UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
+	#define PUGI__ENDSEG()              { ch = *s; *s = 0; ++s; }
+	#define PUGI__THROW_ERROR(err, m)   return error_offset = m, error_status = err, static_cast<char_t*>(0)
+	#define PUGI__CHECK_ERROR(err, m)   { if (*s == 0) PUGI__THROW_ERROR(err, m); }
+
+	PUGI__FN char_t* strconv_comment(char_t* s, char_t endch)
+	{
+		gap g;
+
+		while (true)
+		{
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_comment));
+
+			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+			{
+				*s++ = '\n'; // replace first one with 0x0a
+
+				if (*s == '\n') g.push(s, 1);
+			}
+			else if (s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>')) // comment ends here
+			{
+				*g.flush(s) = 0;
+
+				return s + (s[2] == '>' ? 3 : 2);
+			}
+			else if (*s == 0)
+			{
+				return 0;
+			}
+			else ++s;
+		}
+	}
+
+	PUGI__FN char_t* strconv_cdata(char_t* s, char_t endch)
+	{
+		gap g;
+
+		while (true)
+		{
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_cdata));
+
+			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+			{
+				*s++ = '\n'; // replace first one with 0x0a
+
+				if (*s == '\n') g.push(s, 1);
+			}
+			else if (s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')) // CDATA ends here
+			{
+				*g.flush(s) = 0;
+
+				return s + 1;
+			}
+			else if (*s == 0)
+			{
+				return 0;
+			}
+			else ++s;
+		}
+	}
+
+	typedef char_t* (*strconv_pcdata_t)(char_t*);
+
+	template <typename opt_trim, typename opt_eol, typename opt_escape> struct strconv_pcdata_impl
+	{
+		static char_t* parse(char_t* s)
+		{
+			gap g;
+
+			char_t* begin = s;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_pcdata));
+
+				if (*s == '<') // PCDATA ends here
+				{
+					char_t* end = g.flush(s);
+
+					if (opt_trim::value)
+						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
+							--end;
+
+					*end = 0;
+
+					return s + 1;
+				}
+				else if (opt_eol::value && *s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+				{
+					*s++ = '\n'; // replace first one with 0x0a
+
+					if (*s == '\n') g.push(s, 1);
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (*s == 0)
+				{
+					char_t* end = g.flush(s);
+
+					if (opt_trim::value)
+						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
+							--end;
+
+					*end = 0;
+
+					return s;
+				}
+				else ++s;
+			}
+		}
+	};
+
+	PUGI__FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask)
+	{
+		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800);
+
+		switch (((optmask >> 4) & 3) | ((optmask >> 9) & 4)) // get bitmask for flags (eol escapes trim)
+		{
+		case 0: return strconv_pcdata_impl<opt_false, opt_false, opt_false>::parse;
+		case 1: return strconv_pcdata_impl<opt_false, opt_false, opt_true>::parse;
+		case 2: return strconv_pcdata_impl<opt_false, opt_true, opt_false>::parse;
+		case 3: return strconv_pcdata_impl<opt_false, opt_true, opt_true>::parse;
+		case 4: return strconv_pcdata_impl<opt_true, opt_false, opt_false>::parse;
+		case 5: return strconv_pcdata_impl<opt_true, opt_false, opt_true>::parse;
+		case 6: return strconv_pcdata_impl<opt_true, opt_true, opt_false>::parse;
+		case 7: return strconv_pcdata_impl<opt_true, opt_true, opt_true>::parse;
+		default: assert(false); return 0; // unreachable
+		}
+	}
+
+	typedef char_t* (*strconv_attribute_t)(char_t*, char_t);
+
+	template <typename opt_escape> struct strconv_attribute_impl
+	{
+		static char_t* parse_wnorm(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			// trim leading whitespaces
+			if (PUGI__IS_CHARTYPE(*s, ct_space))
+			{
+				char_t* str = s;
+
+				do ++str;
+				while (PUGI__IS_CHARTYPE(*str, ct_space));
+
+				g.push(s, str - s);
+			}
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space));
+
+				if (*s == end_quote)
+				{
+					char_t* str = g.flush(s);
+
+					do *str-- = 0;
+					while (PUGI__IS_CHARTYPE(*str, ct_space));
+
+					return s + 1;
+				}
+				else if (PUGI__IS_CHARTYPE(*s, ct_space))
+				{
+					*s++ = ' ';
+
+					if (PUGI__IS_CHARTYPE(*s, ct_space))
+					{
+						char_t* str = s + 1;
+						while (PUGI__IS_CHARTYPE(*str, ct_space)) ++str;
+
+						g.push(s, str - s);
+					}
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_wconv(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (PUGI__IS_CHARTYPE(*s, ct_space))
+				{
+					if (*s == '\r')
+					{
+						*s++ = ' ';
+
+						if (*s == '\n') g.push(s, 1);
+					}
+					else *s++ = ' ';
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_eol(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (*s == '\r')
+				{
+					*s++ = '\n';
+
+					if (*s == '\n') g.push(s, 1);
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_simple(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+	};
+
+	PUGI__FN strconv_attribute_t get_strconv_attribute(unsigned int optmask)
+	{
+		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
+
+		switch ((optmask >> 4) & 15) // get bitmask for flags (wconv wnorm eol escapes)
+		{
+		case 0:  return strconv_attribute_impl<opt_false>::parse_simple;
+		case 1:  return strconv_attribute_impl<opt_true>::parse_simple;
+		case 2:  return strconv_attribute_impl<opt_false>::parse_eol;
+		case 3:  return strconv_attribute_impl<opt_true>::parse_eol;
+		case 4:  return strconv_attribute_impl<opt_false>::parse_wconv;
+		case 5:  return strconv_attribute_impl<opt_true>::parse_wconv;
+		case 6:  return strconv_attribute_impl<opt_false>::parse_wconv;
+		case 7:  return strconv_attribute_impl<opt_true>::parse_wconv;
+		case 8:  return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 9:  return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 10: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 11: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 12: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 13: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 14: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 15: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		default: assert(false); return 0; // unreachable
+		}
+	}
+
+	inline xml_parse_result make_parse_result(xml_parse_status status, ptrdiff_t offset = 0)
+	{
+		xml_parse_result result;
+		result.status = status;
+		result.offset = offset;
+
+		return result;
+	}
+
+	struct xml_parser
+	{
+		xml_allocator* alloc;
+		char_t* error_offset;
+		xml_parse_status error_status;
+
+		xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok)
+		{
+		}
+
+		// DOCTYPE consists of nested sections of the following possible types:
+		// <!-- ... -->, <? ... ?>, "...", '...'
+		// <![...]]>
+		// <!...>
+		// First group can not contain nested groups
+		// Second group can contain nested groups of the same type
+		// Third group can contain all other groups
+		char_t* parse_doctype_primitive(char_t* s)
+		{
+			if (*s == '"' || *s == '\'')
+			{
+				// quoted string
+				char_t ch = *s++;
+				PUGI__SCANFOR(*s == ch);
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s++;
+			}
+			else if (s[0] == '<' && s[1] == '?')
+			{
+				// <? ... ?>
+				s += 2;
+				PUGI__SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s += 2;
+			}
+			else if (s[0] == '<' && s[1] == '!' && s[2] == '-' && s[3] == '-')
+			{
+				s += 4;
+				PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s += 3;
+			}
+			else PUGI__THROW_ERROR(status_bad_doctype, s);
+
+			return s;
+		}
+
+		char_t* parse_doctype_ignore(char_t* s)
+		{
+			size_t depth = 0;
+
+			assert(s[0] == '<' && s[1] == '!' && s[2] == '[');
+			s += 3;
+
+			while (*s)
+			{
+				if (s[0] == '<' && s[1] == '!' && s[2] == '[')
+				{
+					// nested ignore section
+					s += 3;
+					depth++;
+				}
+				else if (s[0] == ']' && s[1] == ']' && s[2] == '>')
+				{
+					// ignore section end
+					s += 3;
+
+					if (depth == 0)
+						return s;
+
+					depth--;
+				}
+				else s++;
+			}
+
+			PUGI__THROW_ERROR(status_bad_doctype, s);
+		}
+
+		char_t* parse_doctype_group(char_t* s, char_t endch)
+		{
+			size_t depth = 0;
+
+			assert((s[0] == '<' || s[0] == 0) && s[1] == '!');
+			s += 2;
+
+			while (*s)
+			{
+				if (s[0] == '<' && s[1] == '!' && s[2] != '-')
+				{
+					if (s[2] == '[')
+					{
+						// ignore
+						s = parse_doctype_ignore(s);
+						if (!s) return s;
+					}
+					else
+					{
+						// some control group
+						s += 2;
+						depth++;
+					}
+				}
+				else if (s[0] == '<' || s[0] == '"' || s[0] == '\'')
+				{
+					// unknown tag (forbidden), or some primitive group
+					s = parse_doctype_primitive(s);
+					if (!s) return s;
+				}
+				else if (*s == '>')
+				{
+					if (depth == 0)
+						return s;
+
+					depth--;
+					s++;
+				}
+				else s++;
+			}
+
+			if (depth != 0 || endch != '>') PUGI__THROW_ERROR(status_bad_doctype, s);
+
+			return s;
+		}
+
+		char_t* parse_exclamation(char_t* s, xml_node_struct* cursor, unsigned int optmsk, char_t endch)
+		{
+			// parse node contents, starting with exclamation mark
+			++s;
+
+			if (*s == '-') // '<!-...'
+			{
+				++s;
+
+				if (*s == '-') // '<!--...'
+				{
+					++s;
+
+					if (PUGI__OPTSET(parse_comments))
+					{
+						PUGI__PUSHNODE(node_comment); // Append a new node on the tree.
+						cursor->value = s; // Save the offset.
+					}
+
+					if (PUGI__OPTSET(parse_eol) && PUGI__OPTSET(parse_comments))
+					{
+						s = strconv_comment(s, endch);
+
+						if (!s) PUGI__THROW_ERROR(status_bad_comment, cursor->value);
+					}
+					else
+					{
+						// Scan for terminating '-->'.
+						PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>'));
+						PUGI__CHECK_ERROR(status_bad_comment, s);
+
+						if (PUGI__OPTSET(parse_comments))
+							*s = 0; // Zero-terminate this segment at the first terminating '-'.
+
+						s += (s[2] == '>' ? 3 : 2); // Step over the '\0->'.
+					}
+				}
+				else PUGI__THROW_ERROR(status_bad_comment, s);
+			}
+			else if (*s == '[')
+			{
+				// '<![CDATA[...'
+				if (*++s=='C' && *++s=='D' && *++s=='A' && *++s=='T' && *++s=='A' && *++s == '[')
+				{
+					++s;
+
+					if (PUGI__OPTSET(parse_cdata))
+					{
+						PUGI__PUSHNODE(node_cdata); // Append a new node on the tree.
+						cursor->value = s; // Save the offset.
+
+						if (PUGI__OPTSET(parse_eol))
+						{
+							s = strconv_cdata(s, endch);
+
+							if (!s) PUGI__THROW_ERROR(status_bad_cdata, cursor->value);
+						}
+						else
+						{
+							// Scan for terminating ']]>'.
+							PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
+							PUGI__CHECK_ERROR(status_bad_cdata, s);
+
+							*s++ = 0; // Zero-terminate this segment.
+						}
+					}
+					else // Flagged for discard, but we still have to scan for the terminator.
+					{
+						// Scan for terminating ']]>'.
+						PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
+						PUGI__CHECK_ERROR(status_bad_cdata, s);
+
+						++s;
+					}
+
+					s += (s[1] == '>' ? 2 : 1); // Step over the last ']>'.
+				}
+				else PUGI__THROW_ERROR(status_bad_cdata, s);
+			}
+			else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI__ENDSWITH(s[6], 'E'))
+			{
+				s -= 2;
+
+				if (cursor->parent) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				char_t* mark = s + 9;
+
+				s = parse_doctype_group(s, endch);
+				if (!s) return s;
+
+				assert((*s == 0 && endch == '>') || *s == '>');
+				if (*s) *s++ = 0;
+
+				if (PUGI__OPTSET(parse_doctype))
+				{
+					while (PUGI__IS_CHARTYPE(*mark, ct_space)) ++mark;
+
+					PUGI__PUSHNODE(node_doctype);
+
+					cursor->value = mark;
+				}
+			}
+			else if (*s == 0 && endch == '-') PUGI__THROW_ERROR(status_bad_comment, s);
+			else if (*s == 0 && endch == '[') PUGI__THROW_ERROR(status_bad_cdata, s);
+			else PUGI__THROW_ERROR(status_unrecognized_tag, s);
+
+			return s;
+		}
+
+		char_t* parse_question(char_t* s, xml_node_struct*& ref_cursor, unsigned int optmsk, char_t endch)
+		{
+			// load into registers
+			xml_node_struct* cursor = ref_cursor;
+			char_t ch = 0;
+
+			// parse node contents, starting with question mark
+			++s;
+
+			// read PI target
+			char_t* target = s;
+
+			if (!PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_pi, s);
+
+			PUGI__SCANWHILE(PUGI__IS_CHARTYPE(*s, ct_symbol));
+			PUGI__CHECK_ERROR(status_bad_pi, s);
+
+			// determine node type; stricmp / strcasecmp is not portable
+			bool declaration = (target[0] | ' ') == 'x' && (target[1] | ' ') == 'm' && (target[2] | ' ') == 'l' && target + 3 == s;
+
+			if (declaration ? PUGI__OPTSET(parse_declaration) : PUGI__OPTSET(parse_pi))
+			{
+				if (declaration)
+				{
+					// disallow non top-level declarations
+					if (cursor->parent) PUGI__THROW_ERROR(status_bad_pi, s);
+
+					PUGI__PUSHNODE(node_declaration);
+				}
+				else
+				{
+					PUGI__PUSHNODE(node_pi);
+				}
+
+				cursor->name = target;
+
+				PUGI__ENDSEG();
+
+				// parse value/attributes
+				if (ch == '?')
+				{
+					// empty node
+					if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_pi, s);
+					s += (*s == '>');
+
+					PUGI__POPNODE();
+				}
+				else if (PUGI__IS_CHARTYPE(ch, ct_space))
+				{
+					PUGI__SKIPWS();
+
+					// scan for tag end
+					char_t* value = s;
+
+					PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
+					PUGI__CHECK_ERROR(status_bad_pi, s);
+
+					if (declaration)
+					{
+						// replace ending ? with / so that 'element' terminates properly
+						*s = '/';
+
+						// we exit from this function with cursor at node_declaration, which is a signal to parse() to go to LOC_ATTRIBUTES
+						s = value;
+					}
+					else
+					{
+						// store value and step over >
+						cursor->value = value;
+
+						PUGI__POPNODE();
+
+						PUGI__ENDSEG();
+
+						s += (*s == '>');
+					}
+				}
+				else PUGI__THROW_ERROR(status_bad_pi, s);
+			}
+			else
+			{
+				// scan for tag end
+				PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
+				PUGI__CHECK_ERROR(status_bad_pi, s);
+
+				s += (s[1] == '>' ? 2 : 1);
+			}
+
+			// store from registers
+			ref_cursor = cursor;
+
+			return s;
+		}
+
+		char_t* parse_tree(char_t* s, xml_node_struct* root, unsigned int optmsk, char_t endch)
+		{
+			strconv_attribute_t strconv_attribute = get_strconv_attribute(optmsk);
+			strconv_pcdata_t strconv_pcdata = get_strconv_pcdata(optmsk);
+
+			char_t ch = 0;
+			xml_node_struct* cursor = root;
+			char_t* mark = s;
+
+			while (*s != 0)
+			{
+				if (*s == '<')
+				{
+					++s;
+
+				LOC_TAG:
+					if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // '<#...'
+					{
+						PUGI__PUSHNODE(node_element); // Append a new node to the tree.
+
+						cursor->name = s;
+
+						PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+						PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
+
+						if (ch == '>')
+						{
+							// end of tag
+						}
+						else if (PUGI__IS_CHARTYPE(ch, ct_space))
+						{
+						LOC_ATTRIBUTES:
+							while (true)
+							{
+								PUGI__SKIPWS(); // Eat any whitespace.
+
+								if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // <... #...
+								{
+									xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute.
+									if (!a) PUGI__THROW_ERROR(status_out_of_memory, s);
+
+									a->name = s; // Save the offset.
+
+									PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+									PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
+
+									if (PUGI__IS_CHARTYPE(ch, ct_space))
+									{
+										PUGI__SKIPWS(); // Eat any whitespace.
+
+										ch = *s;
+										++s;
+									}
+
+									if (ch == '=') // '<... #=...'
+									{
+										PUGI__SKIPWS(); // Eat any whitespace.
+
+										if (*s == '"' || *s == '\'') // '<... #="...'
+										{
+											ch = *s; // Save quote char to avoid breaking on "''" -or- '""'.
+											++s; // Step over the quote.
+											a->value = s; // Save the offset.
+
+											s = strconv_attribute(s, ch);
+
+											if (!s) PUGI__THROW_ERROR(status_bad_attribute, a->value);
+
+											// After this line the loop continues from the start;
+											// Whitespaces, / and > are ok, symbols and EOF are wrong,
+											// everything else will be detected
+											if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_attribute, s);
+										}
+										else PUGI__THROW_ERROR(status_bad_attribute, s);
+									}
+									else PUGI__THROW_ERROR(status_bad_attribute, s);
+								}
+								else if (*s == '/')
+								{
+									++s;
+
+									if (*s == '>')
+									{
+										PUGI__POPNODE();
+										s++;
+										break;
+									}
+									else if (*s == 0 && endch == '>')
+									{
+										PUGI__POPNODE();
+										break;
+									}
+									else PUGI__THROW_ERROR(status_bad_start_element, s);
+								}
+								else if (*s == '>')
+								{
+									++s;
+
+									break;
+								}
+								else if (*s == 0 && endch == '>')
+								{
+									break;
+								}
+								else PUGI__THROW_ERROR(status_bad_start_element, s);
+							}
+
+							// !!!
+						}
+						else if (ch == '/') // '<#.../'
+						{
+							if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_start_element, s);
+
+							PUGI__POPNODE(); // Pop.
+
+							s += (*s == '>');
+						}
+						else if (ch == 0)
+						{
+							// we stepped over null terminator, backtrack & handle closing tag
+							--s;
+
+							if (endch != '>') PUGI__THROW_ERROR(status_bad_start_element, s);
+						}
+						else PUGI__THROW_ERROR(status_bad_start_element, s);
+					}
+					else if (*s == '/')
+					{
+						++s;
+
+						mark = s;
+
+						char_t* name = cursor->name;
+						if (!name) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+
+						while (PUGI__IS_CHARTYPE(*s, ct_symbol))
+						{
+							if (*s++ != *name++) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+						}
+
+						if (*name)
+						{
+							if (*s == 0 && name[0] == endch && name[1] == 0) PUGI__THROW_ERROR(status_bad_end_element, s);
+							else PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+						}
+
+						PUGI__POPNODE(); // Pop.
+
+						PUGI__SKIPWS();
+
+						if (*s == 0)
+						{
+							if (endch != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
+						}
+						else
+						{
+							if (*s != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
+							++s;
+						}
+					}
+					else if (*s == '?') // '<?...'
+					{
+						s = parse_question(s, cursor, optmsk, endch);
+						if (!s) return s;
+
+						assert(cursor);
+						if (PUGI__NODETYPE(cursor) == node_declaration) goto LOC_ATTRIBUTES;
+					}
+					else if (*s == '!') // '<!...'
+					{
+						s = parse_exclamation(s, cursor, optmsk, endch);
+						if (!s) return s;
+					}
+					else if (*s == 0 && endch == '?') PUGI__THROW_ERROR(status_bad_pi, s);
+					else PUGI__THROW_ERROR(status_unrecognized_tag, s);
+				}
+				else
+				{
+					mark = s; // Save this offset while searching for a terminator.
+
+					PUGI__SKIPWS(); // Eat whitespace if no genuine PCDATA here.
+
+					if (*s == '<' || !*s)
+					{
+						// We skipped some whitespace characters because otherwise we would take the tag branch instead of PCDATA one
+						assert(mark != s);
+
+						if (!PUGI__OPTSET(parse_ws_pcdata | parse_ws_pcdata_single) || PUGI__OPTSET(parse_trim_pcdata))
+						{
+							continue;
+						}
+						else if (PUGI__OPTSET(parse_ws_pcdata_single))
+						{
+							if (s[0] != '<' || s[1] != '/' || cursor->first_child) continue;
+						}
+					}
+
+					if (!PUGI__OPTSET(parse_trim_pcdata))
+						s = mark;
+
+					if (cursor->parent || PUGI__OPTSET(parse_fragment))
+					{
+						if (PUGI__OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value)
+						{
+							cursor->value = s; // Save the offset.
+						}
+						else
+						{
+							PUGI__PUSHNODE(node_pcdata); // Append a new node on the tree.
+
+							cursor->value = s; // Save the offset.
+
+							PUGI__POPNODE(); // Pop since this is a standalone.
+						}
+
+						s = strconv_pcdata(s);
+
+						if (!*s) break;
+					}
+					else
+					{
+						PUGI__SCANFOR(*s == '<'); // '...<'
+						if (!*s) break;
+
+						++s;
+					}
+
+					// We're after '<'
+					goto LOC_TAG;
+				}
+			}
+
+			// check that last tag is closed
+			if (cursor != root) PUGI__THROW_ERROR(status_end_element_mismatch, s);
+
+			return s;
+		}
+
+	#ifdef PUGIXML_WCHAR_MODE
+		static char_t* parse_skip_bom(char_t* s)
+		{
+			unsigned int bom = 0xfeff;
+			return (s[0] == static_cast<wchar_t>(bom)) ? s + 1 : s;
+		}
+	#else
+		static char_t* parse_skip_bom(char_t* s)
+		{
+			return (s[0] == '\xef' && s[1] == '\xbb' && s[2] == '\xbf') ? s + 3 : s;
+		}
+	#endif
+
+		static bool has_element_node_siblings(xml_node_struct* node)
+		{
+			while (node)
+			{
+				if (PUGI__NODETYPE(node) == node_element) return true;
+
+				node = node->next_sibling;
+			}
+
+			return false;
+		}
+
+		static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk)
+		{
+			// early-out for empty documents
+			if (length == 0)
+				return make_parse_result(PUGI__OPTSET(parse_fragment) ? status_ok : status_no_document_element);
+
+			// get last child of the root before parsing
+			xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0;
+
+			// create parser on stack
+			xml_parser parser(static_cast<xml_allocator*>(xmldoc));
+
+			// save last character and make buffer zero-terminated (speeds up parsing)
+			char_t endch = buffer[length - 1];
+			buffer[length - 1] = 0;
+
+			// skip BOM to make sure it does not end up as part of parse output
+			char_t* buffer_data = parse_skip_bom(buffer);
+
+			// perform actual parsing
+			parser.parse_tree(buffer_data, root, optmsk, endch);
+
+			xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0);
+			assert(result.offset >= 0 && static_cast<size_t>(result.offset) <= length);
+
+			if (result)
+			{
+				// since we removed last character, we have to handle the only possible false positive (stray <)
+				if (endch == '<')
+					return make_parse_result(status_unrecognized_tag, length - 1);
+
+				// check if there are any element nodes parsed
+				xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0;
+
+				if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
+					return make_parse_result(status_no_document_element, length - 1);
+			}
+			else
+			{
+				// roll back offset if it occurs on a null terminator in the source buffer
+				if (result.offset > 0 && static_cast<size_t>(result.offset) == length - 1 && endch == 0)
+					result.offset--;
+			}
+
+			return result;
+		}
+	};
+
+	// Output facilities
+	PUGI__FN xml_encoding get_write_native_encoding()
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return get_wchar_encoding();
+	#else
+		return encoding_utf8;
+	#endif
+	}
+
+	PUGI__FN xml_encoding get_write_encoding(xml_encoding encoding)
+	{
+		// replace wchar encoding with utf implementation
+		if (encoding == encoding_wchar) return get_wchar_encoding();
+
+		// replace utf16 encoding with utf16 with specific endianness
+		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+		// replace utf32 encoding with utf32 with specific endianness
+		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+		// only do autodetection if no explicit encoding is requested
+		if (encoding != encoding_auto) return encoding;
+
+		// assume utf8 encoding
+		return encoding_utf8;
+	}
+
+	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T)
+	{
+		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+
+		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
+
+		return static_cast<size_t>(end - dest) * sizeof(*dest);
+	}
+
+	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap)
+	{
+		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+
+		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
+
+		if (opt_swap)
+		{
+			for (typename T::value_type i = dest; i != end; ++i)
+				*i = endian_swap(*i);
+		}
+
+		return static_cast<size_t>(end - dest) * sizeof(*dest);
+	}
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
+	{
+		if (length < 1) return 0;
+
+		// discard last character if it's the lead of a surrogate pair
+		return (sizeof(wchar_t) == 2 && static_cast<unsigned int>(static_cast<uint16_t>(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length;
+	}
+
+	PUGI__FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	{
+		// only endian-swapping is required
+		if (need_endian_swap_utf(encoding, get_wchar_encoding()))
+		{
+			convert_wchar_endian_swap(r_char, data, length);
+
+			return length * sizeof(char_t);
+		}
+
+		// convert to utf8
+		if (encoding == encoding_utf8)
+			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer());
+
+		// convert to utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return convert_buffer_output_generic(r_u16, data, length, wchar_decoder(), utf16_writer(), native_encoding != encoding);
+		}
+
+		// convert to utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return convert_buffer_output_generic(r_u32, data, length, wchar_decoder(), utf32_writer(), native_encoding != encoding);
+		}
+
+		// convert to latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return 0;
+	}
+#else
+	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
+	{
+		if (length < 5) return 0;
+
+		for (size_t i = 1; i <= 4; ++i)
+		{
+			uint8_t ch = static_cast<uint8_t>(data[length - i]);
+
+			// either a standalone character or a leading one
+			if ((ch & 0xc0) != 0x80) return length - i;
+		}
+
+		// there are four non-leading characters at the end, sequence tail is broken so might as well process the whole chunk
+		return length;
+	}
+
+	PUGI__FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	{
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return convert_buffer_output_generic(r_u16, data, length, utf8_decoder(), utf16_writer(), native_encoding != encoding);
+		}
+
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return convert_buffer_output_generic(r_u32, data, length, utf8_decoder(), utf32_writer(), native_encoding != encoding);
+		}
+
+		if (encoding == encoding_latin1)
+			return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return 0;
+	}
+#endif
+
+	class xml_buffered_writer
+	{
+		xml_buffered_writer(const xml_buffered_writer&);
+		xml_buffered_writer& operator=(const xml_buffered_writer&);
+
+	public:
+		xml_buffered_writer(xml_writer& writer_, xml_encoding user_encoding): writer(writer_), bufsize(0), encoding(get_write_encoding(user_encoding))
+		{
+			PUGI__STATIC_ASSERT(bufcapacity >= 8);
+		}
+
+		size_t flush()
+		{
+			flush(buffer, bufsize);
+			bufsize = 0;
+			return 0;
+		}
+
+		void flush(const char_t* data, size_t size)
+		{
+			if (size == 0) return;
+
+			// fast path, just write data
+			if (encoding == get_write_native_encoding())
+				writer.write(data, size * sizeof(char_t));
+			else
+			{
+				// convert chunk
+				size_t result = convert_buffer_output(scratch.data_char, scratch.data_u8, scratch.data_u16, scratch.data_u32, data, size, encoding);
+				assert(result <= sizeof(scratch));
+
+				// write data
+				writer.write(scratch.data_u8, result);
+			}
+		}
+
+		void write_direct(const char_t* data, size_t length)
+		{
+			// flush the remaining buffer contents
+			flush();
+
+			// handle large chunks
+			if (length > bufcapacity)
+			{
+				if (encoding == get_write_native_encoding())
+				{
+					// fast path, can just write data chunk
+					writer.write(data, length * sizeof(char_t));
+					return;
+				}
+
+				// need to convert in suitable chunks
+				while (length > bufcapacity)
+				{
+					// get chunk size by selecting such number of characters that are guaranteed to fit into scratch buffer
+					// and form a complete codepoint sequence (i.e. discard start of last codepoint if necessary)
+					size_t chunk_size = get_valid_length(data, bufcapacity);
+					assert(chunk_size);
+
+					// convert chunk and write
+					flush(data, chunk_size);
+
+					// iterate
+					data += chunk_size;
+					length -= chunk_size;
+				}
+
+				// small tail is copied below
+				bufsize = 0;
+			}
+
+			memcpy(buffer + bufsize, data, length * sizeof(char_t));
+			bufsize += length;
+		}
+
+		void write_buffer(const char_t* data, size_t length)
+		{
+			size_t offset = bufsize;
+
+			if (offset + length <= bufcapacity)
+			{
+				memcpy(buffer + offset, data, length * sizeof(char_t));
+				bufsize = offset + length;
+			}
+			else
+			{
+				write_direct(data, length);
+			}
+		}
+
+		void write_string(const char_t* data)
+		{
+			// write the part of the string that fits in the buffer
+			size_t offset = bufsize;
+
+			while (*data && offset < bufcapacity)
+				buffer[offset++] = *data++;
+
+			// write the rest
+			if (offset < bufcapacity)
+			{
+				bufsize = offset;
+			}
+			else
+			{
+				// backtrack a bit if we have split the codepoint
+				size_t length = offset - bufsize;
+				size_t extra = length - get_valid_length(data - length, length);
+
+				bufsize = offset - extra;
+
+				write_direct(data - extra, strlength(data) + extra);
+			}
+		}
+
+		void write(char_t d0)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 1) offset = flush();
+
+			buffer[offset + 0] = d0;
+			bufsize = offset + 1;
+		}
+
+		void write(char_t d0, char_t d1)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 2) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			bufsize = offset + 2;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 3) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			bufsize = offset + 3;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 4) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			bufsize = offset + 4;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 5) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			buffer[offset + 4] = d4;
+			bufsize = offset + 5;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4, char_t d5)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 6) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			buffer[offset + 4] = d4;
+			buffer[offset + 5] = d5;
+			bufsize = offset + 6;
+		}
+
+		// utf8 maximum expansion: x4 (-> utf32)
+		// utf16 maximum expansion: x2 (-> utf32)
+		// utf32 maximum expansion: x1
+		enum
+		{
+			bufcapacitybytes =
+			#ifdef PUGIXML_MEMORY_OUTPUT_STACK
+				PUGIXML_MEMORY_OUTPUT_STACK
+			#else
+				10240
+			#endif
+			,
+			bufcapacity = bufcapacitybytes / (sizeof(char_t) + 4)
+		};
+
+		char_t buffer[bufcapacity];
+
+		union
+		{
+			uint8_t data_u8[4 * bufcapacity];
+			uint16_t data_u16[2 * bufcapacity];
+			uint32_t data_u32[bufcapacity];
+			char_t data_char[bufcapacity];
+		} scratch;
+
+		xml_writer& writer;
+		size_t bufsize;
+		xml_encoding encoding;
+	};
+
+	PUGI__FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type)
+	{
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// While *s is a usual symbol
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPEX(ss, type));
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			switch (*s)
+			{
+				case 0: break;
+				case '&':
+					writer.write('&', 'a', 'm', 'p', ';');
+					++s;
+					break;
+				case '<':
+					writer.write('&', 'l', 't', ';');
+					++s;
+					break;
+				case '>':
+					writer.write('&', 'g', 't', ';');
+					++s;
+					break;
+				case '"':
+					writer.write('&', 'q', 'u', 'o', 't', ';');
+					++s;
+					break;
+				default: // s is not a usual symbol
+				{
+					unsigned int ch = static_cast<unsigned int>(*s++);
+					assert(ch < 32);
+
+					writer.write('&', '#', static_cast<char_t>((ch / 10) + '0'), static_cast<char_t>((ch % 10) + '0'), ';');
+				}
+			}
+		}
+	}
+
+	PUGI__FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
+	{
+		if (flags & format_no_escapes)
+			writer.write_string(s);
+		else
+			text_output_escaped(writer, s, type);
+	}
+
+	PUGI__FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s)
+	{
+		do
+		{
+			writer.write('<', '!', '[', 'C', 'D');
+			writer.write('A', 'T', 'A', '[');
+
+			const char_t* prev = s;
+
+			// look for ]]> sequence - we can't output it as is since it terminates CDATA
+			while (*s && !(s[0] == ']' && s[1] == ']' && s[2] == '>')) ++s;
+
+			// skip ]] if we stopped at ]]>, > will go to the next CDATA section
+			if (*s) s += 2;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			writer.write(']', ']', '>');
+		}
+		while (*s);
+	}
+
+	PUGI__FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth)
+	{
+		switch (indent_length)
+		{
+		case 1:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0]);
+			break;
+		}
+
+		case 2:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1]);
+			break;
+		}
+
+		case 3:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1], indent[2]);
+			break;
+		}
+
+		case 4:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1], indent[2], indent[3]);
+			break;
+		}
+
+		default:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write_buffer(indent, indent_length);
+		}
+		}
+	}
+
+	PUGI__FN void node_output_comment(xml_buffered_writer& writer, const char_t* s)
+	{
+		writer.write('<', '!', '-', '-');
+
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// look for -\0 or -- sequence - we can't output it since -- is illegal in comment body
+			while (*s && !(s[0] == '-' && (s[1] == '-' || s[1] == 0))) ++s;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			if (*s)
+			{
+				assert(*s == '-');
+
+				writer.write('-', ' ');
+				++s;
+			}
+		}
+
+		writer.write('-', '-', '>');
+	}
+
+	PUGI__FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s)
+	{
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// look for ?> sequence - we can't output it since ?> terminates PI
+			while (*s && !(s[0] == '?' && s[1] == '>')) ++s;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			if (*s)
+			{
+				assert(s[0] == '?' && s[1] == '>');
+
+				writer.write('?', ' ', '>');
+				s += 2;
+			}
+		}
+	}
+
+	PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+
+		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
+		{
+			if ((flags & (format_indent_attributes | format_raw)) == format_indent_attributes)
+			{
+				writer.write('\n');
+
+				text_output_indent(writer, indent, indent_length, depth + 1);
+			}
+			else
+			{
+				writer.write(' ');
+			}
+
+			writer.write_string(a->name ? a->name + 0 : default_name);
+			writer.write('=', '"');
+
+			if (a->value)
+				text_output(writer, a->value, ctx_special_attr, flags);
+
+			writer.write('"');
+		}
+	}
+
+	PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t* name = node->name ? node->name + 0 : default_name;
+
+		writer.write('<');
+		writer.write_string(name);
+
+		if (node->first_attribute)
+			node_output_attributes(writer, node, indent, indent_length, flags, depth);
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (!node->value)
+		{
+			if (!node->first_child)
+			{
+				if (flags & format_no_empty_element_tags)
+				{
+					writer.write('>', '<', '/');
+					writer.write_string(name);
+					writer.write('>');
+
+					return false;
+				}
+				else
+				{
+					if ((flags & format_raw) == 0)
+						writer.write(' ');
+
+					writer.write('/', '>');
+
+					return false;
+				}
+			}
+			else
+			{
+				writer.write('>');
+
+				return true;
+			}
+		}
+		else
+		{
+			writer.write('>');
+
+			text_output(writer, node->value, ctx_special_pcdata, flags);
+
+			if (!node->first_child)
+			{
+				writer.write('<', '/');
+				writer.write_string(name);
+				writer.write('>');
+
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
+
+	PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t* name = node->name ? node->name + 0 : default_name;
+
+		writer.write('<', '/');
+		writer.write_string(name);
+		writer.write('>');
+	}
+
+	PUGI__FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+
+		switch (PUGI__NODETYPE(node))
+		{
+			case node_pcdata:
+				text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags);
+				break;
+
+			case node_cdata:
+				text_output_cdata(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
+				break;
+
+			case node_comment:
+				node_output_comment(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
+				break;
+
+			case node_pi:
+				writer.write('<', '?');
+				writer.write_string(node->name ? node->name + 0 : default_name);
+
+				if (node->value)
+				{
+					writer.write(' ');
+					node_output_pi_value(writer, node->value);
+				}
+
+				writer.write('?', '>');
+				break;
+
+			case node_declaration:
+				writer.write('<', '?');
+				writer.write_string(node->name ? node->name + 0 : default_name);
+				node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0);
+				writer.write('?', '>');
+				break;
+
+			case node_doctype:
+				writer.write('<', '!', 'D', 'O', 'C');
+				writer.write('T', 'Y', 'P', 'E');
+
+				if (node->value)
+				{
+					writer.write(' ');
+					writer.write_string(node->value);
+				}
+
+				writer.write('>');
+				break;
+
+			default:
+				assert(false && "Invalid node type"); // unreachable
+		}
+	}
+
+	enum indent_flags_t
+	{
+		indent_newline = 1,
+		indent_indent = 2
+	};
+
+	PUGI__FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
+	{
+		size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0;
+		unsigned int indent_flags = indent_indent;
+
+		xml_node_struct* node = root;
+
+		do
+		{
+			assert(node);
+
+			// begin writing current node
+			if (PUGI__NODETYPE(node) == node_pcdata || PUGI__NODETYPE(node) == node_cdata)
+			{
+				node_output_simple(writer, node, flags);
+
+				indent_flags = 0;
+			}
+			else
+			{
+				if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+					writer.write('\n');
+
+				if ((indent_flags & indent_indent) && indent_length)
+					text_output_indent(writer, indent, indent_length, depth);
+
+				if (PUGI__NODETYPE(node) == node_element)
+				{
+					indent_flags = indent_newline | indent_indent;
+
+					if (node_output_start(writer, node, indent, indent_length, flags, depth))
+					{
+						// element nodes can have value if parse_embed_pcdata was used
+						if (node->value)
+							indent_flags = 0;
+
+						node = node->first_child;
+						depth++;
+						continue;
+					}
+				}
+				else if (PUGI__NODETYPE(node) == node_document)
+				{
+					indent_flags = indent_indent;
+
+					if (node->first_child)
+					{
+						node = node->first_child;
+						continue;
+					}
+				}
+				else
+				{
+					node_output_simple(writer, node, flags);
+
+					indent_flags = indent_newline | indent_indent;
+				}
+			}
+
+			// continue to the next node
+			while (node != root)
+			{
+				if (node->next_sibling)
+				{
+					node = node->next_sibling;
+					break;
+				}
+
+				node = node->parent;
+
+				// write closing node
+				if (PUGI__NODETYPE(node) == node_element)
+				{
+					depth--;
+
+					if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+						writer.write('\n');
+
+					if ((indent_flags & indent_indent) && indent_length)
+						text_output_indent(writer, indent, indent_length, depth);
+
+					node_output_end(writer, node);
+
+					indent_flags = indent_newline | indent_indent;
+				}
+			}
+		}
+		while (node != root);
+
+		if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+			writer.write('\n');
+	}
+
+	PUGI__FN bool has_declaration(xml_node_struct* node)
+	{
+		for (xml_node_struct* child = node->first_child; child; child = child->next_sibling)
+		{
+			xml_node_type type = PUGI__NODETYPE(child);
+
+			if (type == node_declaration) return true;
+			if (type == node_element) return false;
+		}
+
+		return false;
+	}
+
+	PUGI__FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
+			if (a == attr)
+				return true;
+
+		return false;
+	}
+
+	PUGI__FN bool allow_insert_attribute(xml_node_type parent)
+	{
+		return parent == node_element || parent == node_declaration;
+	}
+
+	PUGI__FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
+	{
+		if (parent != node_document && parent != node_element) return false;
+		if (child == node_document || child == node_null) return false;
+		if (parent != node_document && (child == node_declaration || child == node_doctype)) return false;
+
+		return true;
+	}
+
+	PUGI__FN bool allow_move(xml_node parent, xml_node child)
+	{
+		// check that child can be a child of parent
+		if (!allow_insert_child(parent.type(), child.type()))
+			return false;
+
+		// check that node is not moved between documents
+		if (parent.root() != child.root())
+			return false;
+
+		// check that new parent is not in the child subtree
+		xml_node cur = parent;
+
+		while (cur)
+		{
+			if (cur == child)
+				return false;
+
+			cur = cur.parent();
+		}
+
+		return true;
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc)
+	{
+		assert(!dest && (header & header_mask) == 0);
+
+		if (source)
+		{
+			if (alloc && (source_header & header_mask) == 0)
+			{
+				dest = source;
+
+				// since strcpy_insitu can reuse document buffer memory we need to mark both source and dest as shared
+				header |= xml_memory_page_contents_shared_mask;
+				source_header |= xml_memory_page_contents_shared_mask;
+			}
+			else
+				strcpy_insitu(dest, header, header_mask, source, strlength(source));
+		}
+	}
+
+	PUGI__FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc)
+	{
+		node_copy_string(dn->name, dn->header, xml_memory_page_name_allocated_mask, sn->name, sn->header, shared_alloc);
+		node_copy_string(dn->value, dn->header, xml_memory_page_value_allocated_mask, sn->value, sn->header, shared_alloc);
+
+		for (xml_attribute_struct* sa = sn->first_attribute; sa; sa = sa->next_attribute)
+		{
+			xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn));
+
+			if (da)
+			{
+				node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
+				node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
+			}
+		}
+	}
+
+	PUGI__FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn)
+	{
+		xml_allocator& alloc = get_allocator(dn);
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : 0;
+
+		node_copy_contents(dn, sn, shared_alloc);
+
+		xml_node_struct* dit = dn;
+		xml_node_struct* sit = sn->first_child;
+
+		while (sit && sit != sn)
+		{
+			// when a tree is copied into one of the descendants, we need to skip that subtree to avoid an infinite loop
+			if (sit != dn)
+			{
+				xml_node_struct* copy = append_new_node(dit, alloc, PUGI__NODETYPE(sit));
+
+				if (copy)
+				{
+					node_copy_contents(copy, sit, shared_alloc);
+
+					if (sit->first_child)
+					{
+						dit = copy;
+						sit = sit->first_child;
+						continue;
+					}
+				}
+			}
+
+			// continue to the next node
+			do
+			{
+				if (sit->next_sibling)
+				{
+					sit = sit->next_sibling;
+					break;
+				}
+
+				sit = sit->parent;
+				dit = dit->parent;
+			}
+			while (sit != sn);
+		}
+	}
+
+	PUGI__FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa)
+	{
+		xml_allocator& alloc = get_allocator(da);
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0;
+
+		node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
+		node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
+	}
+
+	inline bool is_text_node(xml_node_struct* node)
+	{
+		xml_node_type type = PUGI__NODETYPE(node);
+
+		return type == node_pcdata || type == node_cdata;
+	}
+
+	// get value with conversion functions
+	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv)
+	{
+		U result = 0;
+		const char_t* s = value;
+
+		while (PUGI__IS_CHARTYPE(*s, ct_space))
+			s++;
+
+		bool negative = (*s == '-');
+
+		s += (*s == '+' || *s == '-');
+
+		bool overflow = false;
+
+		if (s[0] == '0' && (s[1] | ' ') == 'x')
+		{
+			s += 2;
+
+			// since overflow detection relies on length of the sequence skip leading zeros
+			while (*s == '0')
+				s++;
+
+			const char_t* start = s;
+
+			for (;;)
+			{
+				if (static_cast<unsigned>(*s - '0') < 10)
+					result = result * 16 + (*s - '0');
+				else if (static_cast<unsigned>((*s | ' ') - 'a') < 6)
+					result = result * 16 + ((*s | ' ') - 'a' + 10);
+				else
+					break;
+
+				s++;
+			}
+
+			size_t digits = static_cast<size_t>(s - start);
+
+			overflow = digits > sizeof(U) * 2;
+		}
+		else
+		{
+			// since overflow detection relies on length of the sequence skip leading zeros
+			while (*s == '0')
+				s++;
+
+			const char_t* start = s;
+
+			for (;;)
+			{
+				if (static_cast<unsigned>(*s - '0') < 10)
+					result = result * 10 + (*s - '0');
+				else
+					break;
+
+				s++;
+			}
+
+			size_t digits = static_cast<size_t>(s - start);
+
+			PUGI__STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2);
+
+			const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5;
+			const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6';
+			const size_t high_bit = sizeof(U) * 8 - 1;
+
+			overflow = digits >= max_digits10 && !(digits == max_digits10 && (*start < max_lead || (*start == max_lead && result >> high_bit)));
+		}
+
+		if (negative)
+		{
+			// Workaround for crayc++ CC-3059: Expected no overflow in routine.
+		#ifdef _CRAYC
+			return (overflow || result > ~minv + 1) ? minv : ~result + 1;
+		#else
+			return (overflow || result > 0 - minv) ? minv : 0 - result;
+		#endif
+		}
+		else
+			return (overflow || result > maxv) ? maxv : result;
+	}
+
+	PUGI__FN int get_value_int(const char_t* value)
+	{
+		return string_to_integer<unsigned int>(value, static_cast<unsigned int>(INT_MIN), INT_MAX);
+	}
+
+	PUGI__FN unsigned int get_value_uint(const char_t* value)
+	{
+		return string_to_integer<unsigned int>(value, 0, UINT_MAX);
+	}
+
+	PUGI__FN double get_value_double(const char_t* value)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcstod(value, 0);
+	#else
+		return strtod(value, 0);
+	#endif
+	}
+
+	PUGI__FN float get_value_float(const char_t* value)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return static_cast<float>(wcstod(value, 0));
+	#else
+		return static_cast<float>(strtod(value, 0));
+	#endif
+	}
+
+	PUGI__FN bool get_value_bool(const char_t* value)
+	{
+		// only look at first char
+		char_t first = *value;
+
+		// 1*, t* (true), T* (True), y* (yes), Y* (YES)
+		return (first == '1' || first == 't' || first == 'T' || first == 'y' || first == 'Y');
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long get_value_llong(const char_t* value)
+	{
+		return string_to_integer<unsigned long long>(value, static_cast<unsigned long long>(LLONG_MIN), LLONG_MAX);
+	}
+
+	PUGI__FN unsigned long long get_value_ullong(const char_t* value)
+	{
+		return string_to_integer<unsigned long long>(value, 0, ULLONG_MAX);
+	}
+#endif
+
+	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative)
+	{
+		char_t* result = end - 1;
+		U rest = negative ? 0 - value : value;
+
+		do
+		{
+			*result-- = static_cast<char_t>('0' + (rest % 10));
+			rest /= 10;
+		}
+		while (rest);
+
+		assert(result >= begin);
+		(void)begin;
+
+		*result = '-';
+
+		return result + !negative;
+	}
+
+	// set value with conversion functions
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		char_t wbuf[128];
+		assert(strlen(buf) < sizeof(wbuf) / sizeof(wbuf[0]));
+
+		size_t offset = 0;
+		for (; buf[offset]; ++offset) wbuf[offset] = buf[offset];
+
+		return strcpy_insitu(dest, header, header_mask, wbuf, offset);
+	#else
+		return strcpy_insitu(dest, header, header_mask, buf, strlen(buf));
+	#endif
+	}
+
+	template <typename U, typename String, typename Header>
+	PUGI__FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative)
+	{
+		char_t buf[64];
+		char_t* end = buf + sizeof(buf) / sizeof(buf[0]);
+		char_t* begin = integer_to_string(buf, end, value, negative);
+
+		return strcpy_insitu(dest, header, header_mask, begin, end - begin);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value)
+	{
+		char buf[128];
+		PUGI__SNPRINTF(buf, "%.9g", value);
+
+		return set_value_ascii(dest, header, header_mask, buf);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value)
+	{
+		char buf[128];
+		PUGI__SNPRINTF(buf, "%.17g", value);
+
+		return set_value_ascii(dest, header, header_mask, buf);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value)
+	{
+		return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5);
+	}
+
+	PUGI__FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer)
+	{
+		// check input buffer
+		if (!contents && size) return make_parse_result(status_io_error);
+
+		// get actual encoding
+		xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size);
+
+		// get private buffer
+		char_t* buffer = 0;
+		size_t length = 0;
+
+		if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory);
+
+		// delete original buffer if we performed a conversion
+		if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents);
+
+		// grab onto buffer if it's our buffer, user is responsible for deallocating contents himself
+		if (own || buffer != contents) *out_buffer = buffer;
+
+		// store buffer for offset_debug
+		doc->buffer = buffer;
+
+		// parse
+		xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options);
+
+		// remember encoding
+		res.encoding = buffer_encoding;
+
+		return res;
+	}
+
+	// we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick
+	PUGI__FN xml_parse_status get_file_size(FILE* file, size_t& out_result)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 && !defined(_WIN32_WCE)
+		// there are 64-bit versions of fseek/ftell, let's use them
+		typedef __int64 length_type;
+
+		_fseeki64(file, 0, SEEK_END);
+		length_type length = _ftelli64(file);
+		_fseeki64(file, 0, SEEK_SET);
+	#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))
+		// there are 64-bit versions of fseek/ftell, let's use them
+		typedef off64_t length_type;
+
+		fseeko64(file, 0, SEEK_END);
+		length_type length = ftello64(file);
+		fseeko64(file, 0, SEEK_SET);
+	#else
+		// if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway.
+		typedef long length_type;
+
+		fseek(file, 0, SEEK_END);
+		length_type length = ftell(file);
+		fseek(file, 0, SEEK_SET);
+	#endif
+
+		// check for I/O errors
+		if (length < 0) return status_io_error;
+
+		// check for overflow
+		size_t result = static_cast<size_t>(length);
+
+		if (static_cast<length_type>(result) != length) return status_out_of_memory;
+
+		// finalize
+		out_result = result;
+
+		return status_ok;
+	}
+
+	// This function assumes that buffer has extra sizeof(char_t) writable bytes after size
+	PUGI__FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding)
+	{
+		// We only need to zero-terminate if encoding conversion does not do it for us
+	#ifdef PUGIXML_WCHAR_MODE
+		xml_encoding wchar_encoding = get_wchar_encoding();
+
+		if (encoding == wchar_encoding || need_endian_swap_utf(encoding, wchar_encoding))
+		{
+			size_t length = size / sizeof(char_t);
+
+			static_cast<char_t*>(buffer)[length] = 0;
+			return (length + 1) * sizeof(char_t);
+		}
+	#else
+		if (encoding == encoding_utf8)
+		{
+			static_cast<char*>(buffer)[size] = 0;
+			return size + 1;
+		}
+	#endif
+
+		return size;
+	}
+
+	PUGI__FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	{
+		if (!file) return make_parse_result(status_file_not_found);
+
+		// get file size (can result in I/O errors)
+		size_t size = 0;
+		xml_parse_status size_status = get_file_size(file, size);
+		if (size_status != status_ok) return make_parse_result(size_status);
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// allocate buffer for the whole file
+		char* contents = static_cast<char*>(xml_memory::allocate(size + max_suffix_size));
+		if (!contents) return make_parse_result(status_out_of_memory);
+
+		// read file in memory
+		size_t read_size = fread(contents, 1, size, file);
+
+		if (read_size != size)
+		{
+			xml_memory::deallocate(contents);
+			return make_parse_result(status_io_error);
+		}
+
+		xml_encoding real_encoding = get_buffer_encoding(encoding, contents, size);
+
+		return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer);
+	}
+
+	PUGI__FN void close_file(FILE* file)
+	{
+		fclose(file);
+	}
+
+#ifndef PUGIXML_NO_STL
+	template <typename T> struct xml_stream_chunk
+	{
+		static xml_stream_chunk* create()
+		{
+			void* memory = xml_memory::allocate(sizeof(xml_stream_chunk));
+			if (!memory) return 0;
+
+			return new (memory) xml_stream_chunk();
+		}
+
+		static void destroy(xml_stream_chunk* chunk)
+		{
+			// free chunk chain
+			while (chunk)
+			{
+				xml_stream_chunk* next_ = chunk->next;
+
+				xml_memory::deallocate(chunk);
+
+				chunk = next_;
+			}
+		}
+
+		xml_stream_chunk(): next(0), size(0)
+		{
+		}
+
+		xml_stream_chunk* next;
+		size_t size;
+
+		T data[xml_memory_page_size / sizeof(T)];
+	};
+
+	template <typename T> PUGI__FN xml_parse_status load_stream_data_noseek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	{
+		auto_deleter<xml_stream_chunk<T> > chunks(0, xml_stream_chunk<T>::destroy);
+
+		// read file to a chunk list
+		size_t total = 0;
+		xml_stream_chunk<T>* last = 0;
+
+		while (!stream.eof())
+		{
+			// allocate new chunk
+			xml_stream_chunk<T>* chunk = xml_stream_chunk<T>::create();
+			if (!chunk) return status_out_of_memory;
+
+			// append chunk to list
+			if (last) last = last->next = chunk;
+			else chunks.data = last = chunk;
+
+			// read data to chunk
+			stream.read(chunk->data, static_cast<std::streamsize>(sizeof(chunk->data) / sizeof(T)));
+			chunk->size = static_cast<size_t>(stream.gcount()) * sizeof(T);
+
+			// read may set failbit | eofbit in case gcount() is less than read length, so check for other I/O errors
+			if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
+
+			// guard against huge files (chunk size is small enough to make this overflow check work)
+			if (total + chunk->size < total) return status_out_of_memory;
+			total += chunk->size;
+		}
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// copy chunk list to a contiguous buffer
+		char* buffer = static_cast<char*>(xml_memory::allocate(total + max_suffix_size));
+		if (!buffer) return status_out_of_memory;
+
+		char* write = buffer;
+
+		for (xml_stream_chunk<T>* chunk = chunks.data; chunk; chunk = chunk->next)
+		{
+			assert(write + chunk->size <= buffer + total);
+			memcpy(write, chunk->data, chunk->size);
+			write += chunk->size;
+		}
+
+		assert(write == buffer + total);
+
+		// return buffer
+		*out_buffer = buffer;
+		*out_size = total;
+
+		return status_ok;
+	}
+
+	template <typename T> PUGI__FN xml_parse_status load_stream_data_seek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	{
+		// get length of remaining data in stream
+		typename std::basic_istream<T>::pos_type pos = stream.tellg();
+		stream.seekg(0, std::ios::end);
+		std::streamoff length = stream.tellg() - pos;
+		stream.seekg(pos);
+
+		if (stream.fail() || pos < 0) return status_io_error;
+
+		// guard against huge files
+		size_t read_length = static_cast<size_t>(length);
+
+		if (static_cast<std::streamsize>(read_length) != length || length < 0) return status_out_of_memory;
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// read stream data into memory (guard against stream exceptions with buffer holder)
+		auto_deleter<void> buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate);
+		if (!buffer.data) return status_out_of_memory;
+
+		stream.read(static_cast<T*>(buffer.data), static_cast<std::streamsize>(read_length));
+
+		// read may set failbit | eofbit in case gcount() is less than read_length (i.e. line ending conversion), so check for other I/O errors
+		if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
+
+		// return buffer
+		size_t actual_length = static_cast<size_t>(stream.gcount());
+		assert(actual_length <= read_length);
+
+		*out_buffer = buffer.release();
+		*out_size = actual_length * sizeof(T);
+
+		return status_ok;
+	}
+
+	template <typename T> PUGI__FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream<T>& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	{
+		void* buffer = 0;
+		size_t size = 0;
+		xml_parse_status status = status_ok;
+
+		// if stream has an error bit set, bail out (otherwise tellg() can fail and we'll clear error bits)
+		if (stream.fail()) return make_parse_result(status_io_error);
+
+		// load stream to memory (using seek-based implementation if possible, since it's faster and takes less memory)
+		if (stream.tellg() < 0)
+		{
+			stream.clear(); // clear error flags that could be set by a failing tellg
+			status = load_stream_data_noseek(stream, &buffer, &size);
+		}
+		else
+			status = load_stream_data_seek(stream, &buffer, &size);
+
+		if (status != status_ok) return make_parse_result(status);
+
+		xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size);
+
+		return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer);
+	}
+#endif
+
+#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)))
+	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	{
+		return _wfopen(path, mode);
+	}
+#else
+	PUGI__FN char* convert_path_heap(const wchar_t* str)
+	{
+		assert(str);
+
+		// first pass: get length in utf8 characters
+		size_t length = strlength_wide(str);
+		size_t size = as_utf8_begin(str, length);
+
+		// allocate resulting string
+		char* result = static_cast<char*>(xml_memory::allocate(size + 1));
+		if (!result) return 0;
+
+		// second pass: convert to utf8
+		as_utf8_end(result, size, str, length);
+
+		// zero-terminate
+		result[size] = 0;
+
+		return result;
+	}
+
+	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	{
+		// there is no standard function to open wide paths, so our best bet is to try utf8 path
+		char* path_utf8 = convert_path_heap(path);
+		if (!path_utf8) return 0;
+
+		// convert mode to ASCII (we mirror _wfopen interface)
+		char mode_ascii[4] = {0};
+		for (size_t i = 0; mode[i]; ++i) mode_ascii[i] = static_cast<char>(mode[i]);
+
+		// try to open the utf8 path
+		FILE* result = fopen(path_utf8, mode_ascii);
+
+		// free dummy buffer
+		xml_memory::deallocate(path_utf8);
+
+		return result;
+	}
+#endif
+
+	PUGI__FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding)
+	{
+		if (!file) return false;
+
+		xml_writer_file writer(file);
+		doc.save(writer, indent, flags, encoding);
+
+		return ferror(file) == 0;
+	}
+
+	struct name_null_sentry
+	{
+		xml_node_struct* node;
+		char_t* name;
+
+		name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name)
+		{
+			node->name = 0;
+		}
+
+		~name_null_sentry()
+		{
+			node->name = name;
+		}
+	};
+PUGI__NS_END
+
+namespace pugi
+{
+	PUGI__FN xml_writer_file::xml_writer_file(void* file_): file(file_)
+	{
+	}
+
+	PUGI__FN void xml_writer_file::write(const void* data, size_t size)
+	{
+		size_t result = fwrite(data, 1, size, static_cast<FILE*>(file));
+		(void)!result; // unfortunately we can't do proper error handling here
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream): narrow_stream(&stream), wide_stream(0)
+	{
+	}
+
+	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream): narrow_stream(0), wide_stream(&stream)
+	{
+	}
+
+	PUGI__FN void xml_writer_stream::write(const void* data, size_t size)
+	{
+		if (narrow_stream)
+		{
+			assert(!wide_stream);
+			narrow_stream->write(reinterpret_cast<const char*>(data), static_cast<std::streamsize>(size));
+		}
+		else
+		{
+			assert(wide_stream);
+			assert(size % sizeof(wchar_t) == 0);
+
+			wide_stream->write(reinterpret_cast<const wchar_t*>(data), static_cast<std::streamsize>(size / sizeof(wchar_t)));
+		}
+	}
+#endif
+
+	PUGI__FN xml_tree_walker::xml_tree_walker(): _depth(0)
+	{
+	}
+
+	PUGI__FN xml_tree_walker::~xml_tree_walker()
+	{
+	}
+
+	PUGI__FN int xml_tree_walker::depth() const
+	{
+		return _depth;
+	}
+
+	PUGI__FN bool xml_tree_walker::begin(xml_node&)
+	{
+		return true;
+	}
+
+	PUGI__FN bool xml_tree_walker::end(xml_node&)
+	{
+		return true;
+	}
+
+	PUGI__FN xml_attribute::xml_attribute(): _attr(0)
+	{
+	}
+
+	PUGI__FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_attribute(xml_attribute***)
+	{
+	}
+
+	PUGI__FN xml_attribute::operator xml_attribute::unspecified_bool_type() const
+	{
+		return _attr ? unspecified_bool_xml_attribute : 0;
+	}
+
+	PUGI__FN bool xml_attribute::operator!() const
+	{
+		return !_attr;
+	}
+
+	PUGI__FN bool xml_attribute::operator==(const xml_attribute& r) const
+	{
+		return (_attr == r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator!=(const xml_attribute& r) const
+	{
+		return (_attr != r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator<(const xml_attribute& r) const
+	{
+		return (_attr < r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator>(const xml_attribute& r) const
+	{
+		return (_attr > r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator<=(const xml_attribute& r) const
+	{
+		return (_attr <= r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator>=(const xml_attribute& r) const
+	{
+		return (_attr >= r._attr);
+	}
+
+	PUGI__FN xml_attribute xml_attribute::next_attribute() const
+	{
+		return _attr ? xml_attribute(_attr->next_attribute) : xml_attribute();
+	}
+
+	PUGI__FN xml_attribute xml_attribute::previous_attribute() const
+	{
+		return _attr && _attr->prev_attribute_c->next_attribute ? xml_attribute(_attr->prev_attribute_c) : xml_attribute();
+	}
+
+	PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const
+	{
+		return (_attr && _attr->value) ? _attr->value + 0 : def;
+	}
+
+	PUGI__FN int xml_attribute::as_int(int def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_int(_attr->value) : def;
+	}
+
+	PUGI__FN unsigned int xml_attribute::as_uint(unsigned int def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_uint(_attr->value) : def;
+	}
+
+	PUGI__FN double xml_attribute::as_double(double def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_double(_attr->value) : def;
+	}
+
+	PUGI__FN float xml_attribute::as_float(float def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_float(_attr->value) : def;
+	}
+
+	PUGI__FN bool xml_attribute::as_bool(bool def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_bool(_attr->value) : def;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long xml_attribute::as_llong(long long def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_llong(_attr->value) : def;
+	}
+
+	PUGI__FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_ullong(_attr->value) : def;
+	}
+#endif
+
+	PUGI__FN bool xml_attribute::empty() const
+	{
+		return !_attr;
+	}
+
+	PUGI__FN const char_t* xml_attribute::name() const
+	{
+		return (_attr && _attr->name) ? _attr->name + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_attribute::value() const
+	{
+		return (_attr && _attr->value) ? _attr->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN size_t xml_attribute::hash_value() const
+	{
+		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_attr) / sizeof(xml_attribute_struct));
+	}
+
+	PUGI__FN xml_attribute_struct* xml_attribute::internal_object() const
+	{
+		return _attr;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(const char_t* rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(int rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned int rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(double rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(float rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(bool rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN xml_attribute& xml_attribute::operator=(long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI__FN bool xml_attribute::set_name(const char_t* rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_attribute::set_value(const char_t* rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_attribute::set_value(int rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned int rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(double rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(float rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(bool rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_bool(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN bool xml_attribute::set_value(long long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned long long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+#endif
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_attribute& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_attribute& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_node::xml_node(): _root(0)
+	{
+	}
+
+	PUGI__FN xml_node::xml_node(xml_node_struct* p): _root(p)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_node(xml_node***)
+	{
+	}
+
+	PUGI__FN xml_node::operator xml_node::unspecified_bool_type() const
+	{
+		return _root ? unspecified_bool_xml_node : 0;
+	}
+
+	PUGI__FN bool xml_node::operator!() const
+	{
+		return !_root;
+	}
+
+	PUGI__FN xml_node::iterator xml_node::begin() const
+	{
+		return iterator(_root ? _root->first_child + 0 : 0, _root);
+	}
+
+	PUGI__FN xml_node::iterator xml_node::end() const
+	{
+		return iterator(0, _root);
+	}
+
+	PUGI__FN xml_node::attribute_iterator xml_node::attributes_begin() const
+	{
+		return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root);
+	}
+
+	PUGI__FN xml_node::attribute_iterator xml_node::attributes_end() const
+	{
+		return attribute_iterator(0, _root);
+	}
+
+	PUGI__FN xml_object_range<xml_node_iterator> xml_node::children() const
+	{
+		return xml_object_range<xml_node_iterator>(begin(), end());
+	}
+
+	PUGI__FN xml_object_range<xml_named_node_iterator> xml_node::children(const char_t* name_) const
+	{
+		return xml_object_range<xml_named_node_iterator>(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(0, _root, name_));
+	}
+
+	PUGI__FN xml_object_range<xml_attribute_iterator> xml_node::attributes() const
+	{
+		return xml_object_range<xml_attribute_iterator>(attributes_begin(), attributes_end());
+	}
+
+	PUGI__FN bool xml_node::operator==(const xml_node& r) const
+	{
+		return (_root == r._root);
+	}
+
+	PUGI__FN bool xml_node::operator!=(const xml_node& r) const
+	{
+		return (_root != r._root);
+	}
+
+	PUGI__FN bool xml_node::operator<(const xml_node& r) const
+	{
+		return (_root < r._root);
+	}
+
+	PUGI__FN bool xml_node::operator>(const xml_node& r) const
+	{
+		return (_root > r._root);
+	}
+
+	PUGI__FN bool xml_node::operator<=(const xml_node& r) const
+	{
+		return (_root <= r._root);
+	}
+
+	PUGI__FN bool xml_node::operator>=(const xml_node& r) const
+	{
+		return (_root >= r._root);
+	}
+
+	PUGI__FN bool xml_node::empty() const
+	{
+		return !_root;
+	}
+
+	PUGI__FN const char_t* xml_node::name() const
+	{
+		return (_root && _root->name) ? _root->name + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN xml_node_type xml_node::type() const
+	{
+		return _root ? PUGI__NODETYPE(_root) : node_null;
+	}
+
+	PUGI__FN const char_t* xml_node::value() const
+	{
+		return (_root && _root->value) ? _root->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN xml_node xml_node::child(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_) const
+	{
+		if (!_root) return xml_attribute();
+
+		for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute)
+			if (i->name && impl::strequal(name_, i->name))
+				return xml_attribute(i);
+
+		return xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::next_sibling(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::next_sibling() const
+	{
+		return _root ? xml_node(_root->next_sibling) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::previous_sibling(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const
+	{
+		xml_attribute_struct* hint = hint_._attr;
+
+		// if hint is not an attribute of node, behavior is not defined
+		assert(!hint || (_root && impl::is_attribute_of(hint, _root)));
+
+		if (!_root) return xml_attribute();
+
+		// optimistically search from hint up until the end
+		for (xml_attribute_struct* i = hint; i; i = i->next_attribute)
+			if (i->name && impl::strequal(name_, i->name))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = i->next_attribute;
+
+				return xml_attribute(i);
+			}
+
+		// wrap around and search from the first attribute until the hint
+		// 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails
+		for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute)
+			if (j->name && impl::strequal(name_, j->name))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = j->next_attribute;
+
+				return xml_attribute(j);
+			}
+
+		return xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::previous_sibling() const
+	{
+		if (!_root) return xml_node();
+
+		if (_root->prev_sibling_c->next_sibling) return xml_node(_root->prev_sibling_c);
+		else return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::parent() const
+	{
+		return _root ? xml_node(_root->parent) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::root() const
+	{
+		return _root ? xml_node(&impl::get_document(_root)) : xml_node();
+	}
+
+	PUGI__FN xml_text xml_node::text() const
+	{
+		return xml_text(_root);
+	}
+
+	PUGI__FN const char_t* xml_node::child_value() const
+	{
+		if (!_root) return PUGIXML_TEXT("");
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (PUGI__NODETYPE(_root) == node_element && _root->value)
+			return _root->value;
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (impl::is_text_node(i) && i->value)
+				return i->value;
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_node::child_value(const char_t* name_) const
+	{
+		return child(name_).child_value();
+	}
+
+	PUGI__FN xml_attribute xml_node::first_attribute() const
+	{
+		return _root ? xml_attribute(_root->first_attribute) : xml_attribute();
+	}
+
+	PUGI__FN xml_attribute xml_node::last_attribute() const
+	{
+		return _root && _root->first_attribute ? xml_attribute(_root->first_attribute->prev_attribute_c) : xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::first_child() const
+	{
+		return _root ? xml_node(_root->first_child) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::last_child() const
+	{
+		return _root && _root->first_child ? xml_node(_root->first_child->prev_sibling_c) : xml_node();
+	}
+
+	PUGI__FN bool xml_node::set_name(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+
+		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
+			return false;
+
+		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_node::set_value(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+
+		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
+			return false;
+
+		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::append_copy(const xml_attribute& proto)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_node xml_node::append_child(xml_node_type type_)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::append_node(n._root, _root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_child(xml_node_type type_)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::prepend_node(n._root, _root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_before(n._root, node._root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_after(n._root, node._root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::append_child(const char_t* name_)
+	{
+		xml_node result = append_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_child(const char_t* name_)
+	{
+		xml_node result = prepend_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node)
+	{
+		xml_node result = insert_child_after(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node)
+	{
+		xml_node result = insert_child_before(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::append_copy(const xml_node& proto)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::append_node(n._root, _root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_copy(const xml_node& proto)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::prepend_node(n._root, _root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_after(n._root, node._root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_before(n._root, node._root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::append_move(const xml_node& moved)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::append_node(moved._root, _root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_move(const xml_node& moved)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::prepend_node(moved._root, _root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+		if (moved._root == node._root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::insert_node_after(moved._root, node._root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+		if (moved._root == node._root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::insert_node_before(moved._root, node._root);
+
+		return moved;
+	}
+
+	PUGI__FN bool xml_node::remove_attribute(const char_t* name_)
+	{
+		return remove_attribute(attribute(name_));
+	}
+
+	PUGI__FN bool xml_node::remove_attribute(const xml_attribute& a)
+	{
+		if (!_root || !a._attr) return false;
+		if (!impl::is_attribute_of(a._attr, _root)) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		impl::remove_attribute(a._attr, _root);
+		impl::destroy_attribute(a._attr, alloc);
+
+		return true;
+	}
+
+	PUGI__FN bool xml_node::remove_child(const char_t* name_)
+	{
+		return remove_child(child(name_));
+	}
+
+	PUGI__FN bool xml_node::remove_child(const xml_node& n)
+	{
+		if (!_root || !n._root || n._root->parent != _root) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		impl::remove_node(n._root);
+		impl::destroy_node(n._root, alloc);
+
+		return true;
+	}
+
+	PUGI__FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		// append_buffer is only valid for elements/documents
+		if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root);
+
+		// get document node
+		impl::xml_document_struct* doc = &impl::get_document(_root);
+
+		// disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense
+		doc->header |= impl::xml_memory_page_contents_shared_mask;
+
+		// get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later)
+		impl::xml_memory_page* page = 0;
+		impl::xml_extra_buffer* extra = static_cast<impl::xml_extra_buffer*>(doc->allocate_memory(sizeof(impl::xml_extra_buffer) + sizeof(void*), page));
+		(void)page;
+
+		if (!extra) return impl::make_parse_result(status_out_of_memory);
+
+	#ifdef PUGIXML_COMPACT
+		// align the memory block to a pointer boundary; this is required for compact mode where memory allocations are only 4b aligned
+		// note that this requires up to sizeof(void*)-1 additional memory, which the allocation above takes into account
+		extra = reinterpret_cast<impl::xml_extra_buffer*>((reinterpret_cast<uintptr_t>(extra) + (sizeof(void*) - 1)) & ~(sizeof(void*) - 1));
+	#endif
+
+		// add extra buffer to the list
+		extra->buffer = 0;
+		extra->next = doc->extra_buffers;
+		doc->extra_buffers = extra;
+
+		// name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level
+		impl::name_null_sentry sentry(_root);
+
+		return impl::load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer);
+	}
+
+	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name))
+			{
+				for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
+					if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT("")))
+						return xml_node(i);
+			}
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
+				if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT("")))
+					return xml_node(i);
+
+		return xml_node();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN string_t xml_node::path(char_t delimiter) const
+	{
+		if (!_root) return string_t();
+
+		size_t offset = 0;
+
+		for (xml_node_struct* i = _root; i; i = i->parent)
+		{
+			offset += (i != _root);
+			offset += i->name ? impl::strlength(i->name) : 0;
+		}
+
+		string_t result;
+		result.resize(offset);
+
+		for (xml_node_struct* j = _root; j; j = j->parent)
+		{
+			if (j != _root)
+				result[--offset] = delimiter;
+
+			if (j->name)
+			{
+				size_t length = impl::strlength(j->name);
+
+				offset -= length;
+				memcpy(&result[offset], j->name, length * sizeof(char_t));
+			}
+		}
+
+		assert(offset == 0);
+
+		return result;
+	}
+#endif
+
+	PUGI__FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
+	{
+		xml_node found = *this; // Current search context.
+
+		if (!_root || !path_[0]) return found;
+
+		if (path_[0] == delimiter)
+		{
+			// Absolute path; e.g. '/foo/bar'
+			found = found.root();
+			++path_;
+		}
+
+		const char_t* path_segment = path_;
+
+		while (*path_segment == delimiter) ++path_segment;
+
+		const char_t* path_segment_end = path_segment;
+
+		while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end;
+
+		if (path_segment == path_segment_end) return found;
+
+		const char_t* next_segment = path_segment_end;
+
+		while (*next_segment == delimiter) ++next_segment;
+
+		if (*path_segment == '.' && path_segment + 1 == path_segment_end)
+			return found.first_element_by_path(next_segment, delimiter);
+		else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end)
+			return found.parent().first_element_by_path(next_segment, delimiter);
+		else
+		{
+			for (xml_node_struct* j = found._root->first_child; j; j = j->next_sibling)
+			{
+				if (j->name && impl::strequalrange(j->name, path_segment, static_cast<size_t>(path_segment_end - path_segment)))
+				{
+					xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter);
+
+					if (subsearch) return subsearch;
+				}
+			}
+
+			return xml_node();
+		}
+	}
+
+	PUGI__FN bool xml_node::traverse(xml_tree_walker& walker)
+	{
+		walker._depth = -1;
+
+		xml_node arg_begin(_root);
+		if (!walker.begin(arg_begin)) return false;
+
+		xml_node_struct* cur = _root ? _root->first_child + 0 : 0;
+
+		if (cur)
+		{
+			++walker._depth;
+
+			do
+			{
+				xml_node arg_for_each(cur);
+				if (!walker.for_each(arg_for_each))
+					return false;
+
+				if (cur->first_child)
+				{
+					++walker._depth;
+					cur = cur->first_child;
+				}
+				else if (cur->next_sibling)
+					cur = cur->next_sibling;
+				else
+				{
+					while (!cur->next_sibling && cur != _root && cur->parent)
+					{
+						--walker._depth;
+						cur = cur->parent;
+					}
+
+					if (cur != _root)
+						cur = cur->next_sibling;
+				}
+			}
+			while (cur && cur != _root);
+		}
+
+		assert(walker._depth == -1);
+
+		xml_node arg_end(_root);
+		return walker.end(arg_end);
+	}
+
+	PUGI__FN size_t xml_node::hash_value() const
+	{
+		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_root) / sizeof(xml_node_struct));
+	}
+
+	PUGI__FN xml_node_struct* xml_node::internal_object() const
+	{
+		return _root;
+	}
+
+	PUGI__FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	{
+		if (!_root) return;
+
+		impl::xml_buffered_writer buffered_writer(writer, encoding);
+
+		impl::node_output(buffered_writer, _root, indent, flags, depth);
+
+		buffered_writer.flush();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN void xml_node::print(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	{
+		xml_writer_stream writer(stream);
+
+		print(writer, indent, flags, encoding, depth);
+	}
+
+	PUGI__FN void xml_node::print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags, unsigned int depth) const
+	{
+		xml_writer_stream writer(stream);
+
+		print(writer, indent, flags, encoding_wchar, depth);
+	}
+#endif
+
+	PUGI__FN ptrdiff_t xml_node::offset_debug() const
+	{
+		if (!_root) return -1;
+
+		impl::xml_document_struct& doc = impl::get_document(_root);
+
+		// we can determine the offset reliably only if there is exactly once parse buffer
+		if (!doc.buffer || doc.extra_buffers) return -1;
+
+		switch (type())
+		{
+		case node_document:
+			return 0;
+
+		case node_element:
+		case node_declaration:
+		case node_pi:
+			return _root->name && (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0 ? _root->name - doc.buffer : -1;
+
+		case node_pcdata:
+		case node_cdata:
+		case node_comment:
+		case node_doctype:
+			return _root->value && (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0 ? _root->value - doc.buffer : -1;
+
+		default:
+			assert(false && "Invalid node type"); // unreachable
+			return -1;
+		}
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_node& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_node& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_text::xml_text(xml_node_struct* root): _root(root)
+	{
+	}
+
+	PUGI__FN xml_node_struct* xml_text::_data() const
+	{
+		if (!_root || impl::is_text_node(_root)) return _root;
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (PUGI__NODETYPE(_root) == node_element && _root->value)
+			return _root;
+
+		for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling)
+			if (impl::is_text_node(node))
+				return node;
+
+		return 0;
+	}
+
+	PUGI__FN xml_node_struct* xml_text::_data_new()
+	{
+		xml_node_struct* d = _data();
+		if (d) return d;
+
+		return xml_node(_root).append_child(node_pcdata).internal_object();
+	}
+
+	PUGI__FN xml_text::xml_text(): _root(0)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_text(xml_text***)
+	{
+	}
+
+	PUGI__FN xml_text::operator xml_text::unspecified_bool_type() const
+	{
+		return _data() ? unspecified_bool_xml_text : 0;
+	}
+
+	PUGI__FN bool xml_text::operator!() const
+	{
+		return !_data();
+	}
+
+	PUGI__FN bool xml_text::empty() const
+	{
+		return _data() == 0;
+	}
+
+	PUGI__FN const char_t* xml_text::get() const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? d->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_text::as_string(const char_t* def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? d->value + 0 : def;
+	}
+
+	PUGI__FN int xml_text::as_int(int def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_int(d->value) : def;
+	}
+
+	PUGI__FN unsigned int xml_text::as_uint(unsigned int def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_uint(d->value) : def;
+	}
+
+	PUGI__FN double xml_text::as_double(double def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_double(d->value) : def;
+	}
+
+	PUGI__FN float xml_text::as_float(float def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_float(d->value) : def;
+	}
+
+	PUGI__FN bool xml_text::as_bool(bool def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_bool(d->value) : def;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long xml_text::as_llong(long long def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_llong(d->value) : def;
+	}
+
+	PUGI__FN unsigned long long xml_text::as_ullong(unsigned long long def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_ullong(d->value) : def;
+	}
+#endif
+
+	PUGI__FN bool xml_text::set(const char_t* rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false;
+	}
+
+	PUGI__FN bool xml_text::set(int rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned int rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+
+	PUGI__FN bool xml_text::set(long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+
+	PUGI__FN bool xml_text::set(float rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+	}
+
+	PUGI__FN bool xml_text::set(double rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+	}
+
+	PUGI__FN bool xml_text::set(bool rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_bool(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN bool xml_text::set(long long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned long long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+#endif
+
+	PUGI__FN xml_text& xml_text::operator=(const char_t* rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(int rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned int rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(double rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(float rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(bool rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN xml_text& xml_text::operator=(long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI__FN xml_node xml_text::data() const
+	{
+		return xml_node(_data());
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_text& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_text& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_node_iterator::xml_node_iterator()
+	{
+	}
+
+	PUGI__FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent())
+	{
+	}
+
+	PUGI__FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	{
+	}
+
+	PUGI__FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const
+	{
+		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const
+	{
+		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_node& xml_node_iterator::operator*() const
+	{
+		assert(_wrap._root);
+		return _wrap;
+	}
+
+	PUGI__FN xml_node* xml_node_iterator::operator->() const
+	{
+		assert(_wrap._root);
+		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_node_iterator& xml_node_iterator::operator++()
+	{
+		assert(_wrap._root);
+		_wrap._root = _wrap._root->next_sibling;
+		return *this;
+	}
+
+	PUGI__FN xml_node_iterator xml_node_iterator::operator++(int)
+	{
+		xml_node_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_node_iterator& xml_node_iterator::operator--()
+	{
+		_wrap = _wrap._root ? _wrap.previous_sibling() : _parent.last_child();
+		return *this;
+	}
+
+	PUGI__FN xml_node_iterator xml_node_iterator::operator--(int)
+	{
+		xml_node_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator()
+	{
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent)
+	{
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	{
+	}
+
+	PUGI__FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const
+	{
+		return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const
+	{
+		return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute_iterator::operator*() const
+	{
+		assert(_wrap._attr);
+		return _wrap;
+	}
+
+	PUGI__FN xml_attribute* xml_attribute_iterator::operator->() const
+	{
+		assert(_wrap._attr);
+		return const_cast<xml_attribute*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator++()
+	{
+		assert(_wrap._attr);
+		_wrap._attr = _wrap._attr->next_attribute;
+		return *this;
+	}
+
+	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator++(int)
+	{
+		xml_attribute_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator--()
+	{
+		_wrap = _wrap._attr ? _wrap.previous_attribute() : _parent.last_attribute();
+		return *this;
+	}
+
+	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator--(int)
+	{
+		xml_attribute_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(): _name(0)
+	{
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name)
+	{
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name)
+	{
+	}
+
+	PUGI__FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const
+	{
+		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const
+	{
+		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_node& xml_named_node_iterator::operator*() const
+	{
+		assert(_wrap._root);
+		return _wrap;
+	}
+
+	PUGI__FN xml_node* xml_named_node_iterator::operator->() const
+	{
+		assert(_wrap._root);
+		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator++()
+	{
+		assert(_wrap._root);
+		_wrap = _wrap.next_sibling(_name);
+		return *this;
+	}
+
+	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator++(int)
+	{
+		xml_named_node_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator--()
+	{
+		if (_wrap._root)
+			_wrap = _wrap.previous_sibling(_name);
+		else
+		{
+			_wrap = _parent.last_child();
+
+			if (!impl::strequal(_wrap.name(), _name))
+				_wrap = _wrap.previous_sibling(_name);
+		}
+
+		return *this;
+	}
+
+	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator--(int)
+	{
+		xml_named_node_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto)
+	{
+	}
+
+	PUGI__FN xml_parse_result::operator bool() const
+	{
+		return status == status_ok;
+	}
+
+	PUGI__FN const char* xml_parse_result::description() const
+	{
+		switch (status)
+		{
+		case status_ok: return "No error";
+
+		case status_file_not_found: return "File was not found";
+		case status_io_error: return "Error reading from file/stream";
+		case status_out_of_memory: return "Could not allocate memory";
+		case status_internal_error: return "Internal error occurred";
+
+		case status_unrecognized_tag: return "Could not determine tag type";
+
+		case status_bad_pi: return "Error parsing document declaration/processing instruction";
+		case status_bad_comment: return "Error parsing comment";
+		case status_bad_cdata: return "Error parsing CDATA section";
+		case status_bad_doctype: return "Error parsing document type declaration";
+		case status_bad_pcdata: return "Error parsing PCDATA section";
+		case status_bad_start_element: return "Error parsing start element tag";
+		case status_bad_attribute: return "Error parsing element attribute";
+		case status_bad_end_element: return "Error parsing end element tag";
+		case status_end_element_mismatch: return "Start-end tags mismatch";
+
+		case status_append_invalid_root: return "Unable to append nodes: root is not an element or document";
+
+		case status_no_document_element: return "No document element found";
+
+		default: return "Unknown error";
+		}
+	}
+
+	PUGI__FN xml_document::xml_document(): _buffer(0)
+	{
+		_create();
+	}
+
+	PUGI__FN xml_document::~xml_document()
+	{
+		_destroy();
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(0)
+	{
+		_create();
+		_move(rhs);
+	}
+
+	PUGI__FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	{
+		if (this == &rhs) return *this;
+
+		_destroy();
+		_create();
+		_move(rhs);
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN void xml_document::reset()
+	{
+		_destroy();
+		_create();
+	}
+
+	PUGI__FN void xml_document::reset(const xml_document& proto)
+	{
+		reset();
+
+		for (xml_node cur = proto.first_child(); cur; cur = cur.next_sibling())
+			append_copy(cur);
+	}
+
+	PUGI__FN void xml_document::_create()
+	{
+		assert(!_root);
+
+	#ifdef PUGIXML_COMPACT
+		// space for page marker for the first page (uint32_t), rounded up to pointer size; assumes pointers are at least 32-bit
+		const size_t page_offset = sizeof(void*);
+	#else
+		const size_t page_offset = 0;
+	#endif
+
+		// initialize sentinel page
+		PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory));
+
+		// prepare page structure
+		impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory);
+		assert(page);
+
+		page->busy_size = impl::xml_memory_page_size;
+
+		// setup first page marker
+	#ifdef PUGIXML_COMPACT
+		// round-trip through void* to avoid 'cast increases required alignment of target type' warning
+		page->compact_page_marker = reinterpret_cast<uint32_t*>(static_cast<void*>(reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page)));
+		*page->compact_page_marker = sizeof(impl::xml_memory_page);
+	#endif
+
+		// allocate new root
+		_root = new (reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page) + page_offset) impl::xml_document_struct(page);
+		_root->prev_sibling_c = _root;
+
+		// setup sentinel page
+		page->allocator = static_cast<impl::xml_document_struct*>(_root);
+
+		// setup hash table pointer in allocator
+	#ifdef PUGIXML_COMPACT
+		page->allocator->_hash = &static_cast<impl::xml_document_struct*>(_root)->hash;
+	#endif
+
+		// verify the document allocation
+		assert(reinterpret_cast<char*>(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory));
+	}
+
+	PUGI__FN void xml_document::_destroy()
+	{
+		assert(_root);
+
+		// destroy static storage
+		if (_buffer)
+		{
+			impl::xml_memory::deallocate(_buffer);
+			_buffer = 0;
+		}
+
+		// destroy extra buffers (note: no need to destroy linked list nodes, they're allocated using document allocator)
+		for (impl::xml_extra_buffer* extra = static_cast<impl::xml_document_struct*>(_root)->extra_buffers; extra; extra = extra->next)
+		{
+			if (extra->buffer) impl::xml_memory::deallocate(extra->buffer);
+		}
+
+		// destroy dynamic storage, leave sentinel page (it's in static memory)
+		impl::xml_memory_page* root_page = PUGI__GETPAGE(_root);
+		assert(root_page && !root_page->prev);
+		assert(reinterpret_cast<char*>(root_page) >= _memory && reinterpret_cast<char*>(root_page) < _memory + sizeof(_memory));
+
+		for (impl::xml_memory_page* page = root_page->next; page; )
+		{
+			impl::xml_memory_page* next = page->next;
+
+			impl::xml_allocator::deallocate_page(page);
+
+			page = next;
+		}
+
+	#ifdef PUGIXML_COMPACT
+		// destroy hash table
+		static_cast<impl::xml_document_struct*>(_root)->hash.clear();
+	#endif
+
+		_root = 0;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	{
+		impl::xml_document_struct* doc = static_cast<impl::xml_document_struct*>(_root);
+		impl::xml_document_struct* other = static_cast<impl::xml_document_struct*>(rhs._root);
+
+		// save first child pointer for later; this needs hash access
+		xml_node_struct* other_first_child = other->first_child;
+
+	#ifdef PUGIXML_COMPACT
+		// reserve space for the hash table up front; this is the only operation that can fail
+		// if it does, we have no choice but to throw (if we have exceptions)
+		if (other_first_child)
+		{
+			size_t other_children = 0;
+			for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
+				other_children++;
+
+			// in compact mode, each pointer assignment could result in a hash table request
+			// during move, we have to relocate document first_child and parents of all children
+			// normally there's just one child and its parent has a pointerless encoding but
+			// we assume the worst here
+			if (!other->_hash->reserve(other_children + 1))
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				return;
+			#else
+				throw std::bad_alloc();
+			#endif
+			}
+		}
+	#endif
+
+		// move allocation state
+		doc->_root = other->_root;
+		doc->_busy_size = other->_busy_size;
+
+		// move buffer state
+		doc->buffer = other->buffer;
+		doc->extra_buffers = other->extra_buffers;
+		_buffer = rhs._buffer;
+
+	#ifdef PUGIXML_COMPACT
+		// move compact hash; note that the hash table can have pointers to other but they will be "inactive", similarly to nodes removed with remove_child
+		doc->hash = other->hash;
+		doc->_hash = &doc->hash;
+
+		// make sure we don't access other hash up until the end when we reinitialize other document
+		other->_hash = 0;
+	#endif
+
+		// move page structure
+		impl::xml_memory_page* doc_page = PUGI__GETPAGE(doc);
+		assert(doc_page && !doc_page->prev && !doc_page->next);
+
+		impl::xml_memory_page* other_page = PUGI__GETPAGE(other);
+		assert(other_page && !other_page->prev);
+
+		// relink pages since root page is embedded into xml_document
+		if (impl::xml_memory_page* page = other_page->next)
+		{
+			assert(page->prev == other_page);
+
+			page->prev = doc_page;
+
+			doc_page->next = page;
+			other_page->next = 0;
+		}
+
+		// make sure pages point to the correct document state
+		for (impl::xml_memory_page* page = doc_page->next; page; page = page->next)
+		{
+			assert(page->allocator == other);
+
+			page->allocator = doc;
+
+		#ifdef PUGIXML_COMPACT
+			// this automatically migrates most children between documents and prevents ->parent assignment from allocating
+			if (page->compact_shared_parent == other)
+				page->compact_shared_parent = doc;
+		#endif
+		}
+
+		// move tree structure
+		assert(!doc->first_child);
+
+		doc->first_child = other_first_child;
+
+		for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
+		{
+		#ifdef PUGIXML_COMPACT
+			// most children will have migrated when we reassigned compact_shared_parent
+			assert(node->parent == other || node->parent == doc);
+
+			node->parent = doc;
+		#else
+			assert(node->parent == other);
+			node->parent = doc;
+		#endif
+		}
+
+		// reset other document
+		new (other) impl::xml_document_struct(PUGI__GETPAGE(other));
+		rhs._buffer = 0;
+	}
+#endif
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options)
+	{
+		reset();
+
+		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding_wchar, &_buffer);
+	}
+#endif
+
+	PUGI__FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
+	{
+		// Force native encoding (skip autodetection)
+	#ifdef PUGIXML_WCHAR_MODE
+		xml_encoding encoding = encoding_wchar;
+	#else
+		xml_encoding encoding = encoding_utf8;
+	#endif
+
+		return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
+	{
+		return load_string(contents, options);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(fopen(path_, "rb"), impl::close_file);
+
+		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file_wide(path_, L"rb"), impl::close_file);
+
+		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer);
+	}
+
+	PUGI__FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		impl::xml_buffered_writer buffered_writer(writer, encoding);
+
+		if ((flags & format_write_bom) && encoding != encoding_latin1)
+		{
+			// BOM always represents the codepoint U+FEFF, so just write it in native encoding
+		#ifdef PUGIXML_WCHAR_MODE
+			unsigned int bom = 0xfeff;
+			buffered_writer.write(static_cast<wchar_t>(bom));
+		#else
+			buffered_writer.write('\xef', '\xbb', '\xbf');
+		#endif
+		}
+
+		if (!(flags & format_no_declaration) && !impl::has_declaration(_root))
+		{
+			buffered_writer.write_string(PUGIXML_TEXT("<?xml version=\"1.0\""));
+			if (encoding == encoding_latin1) buffered_writer.write_string(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
+			buffered_writer.write('?', '>');
+			if (!(flags & format_raw)) buffered_writer.write('\n');
+		}
+
+		impl::node_output(buffered_writer, _root, indent, flags, 0);
+
+		buffered_writer.flush();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN void xml_document::save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		xml_writer_stream writer(stream);
+
+		save(writer, indent, flags, encoding);
+	}
+
+	PUGI__FN void xml_document::save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags) const
+	{
+		xml_writer_stream writer(stream);
+
+		save(writer, indent, flags, encoding_wchar);
+	}
+#endif
+
+	PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file);
+
+		return impl::save_file_impl(*this, file.data, indent, flags, encoding);
+	}
+
+	PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file);
+
+		return impl::save_file_impl(*this, file.data, indent, flags, encoding);
+	}
+
+	PUGI__FN xml_node xml_document::document_element() const
+	{
+		assert(_root);
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (PUGI__NODETYPE(i) == node_element)
+				return xml_node(i);
+
+		return xml_node();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str)
+	{
+		assert(str);
+
+		return impl::as_utf8_impl(str, impl::strlength_wide(str));
+	}
+
+	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
+	{
+		return impl::as_utf8_impl(str.c_str(), str.size());
+	}
+
+	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
+	{
+		assert(str);
+
+		return impl::as_wide_impl(str, strlen(str));
+	}
+
+	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
+	{
+		return impl::as_wide_impl(str.c_str(), str.size());
+	}
+#endif
+
+	PUGI__FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate)
+	{
+		impl::xml_memory::allocate = allocate;
+		impl::xml_memory::deallocate = deallocate;
+	}
+
+	PUGI__FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function()
+	{
+		return impl::xml_memory::allocate;
+	}
+
+	PUGI__FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function()
+	{
+		return impl::xml_memory::deallocate;
+	}
+}
+
+#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+}
+#endif
+
+#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+}
+#endif
+
+#ifndef PUGIXML_NO_XPATH
+// STL replacements
+PUGI__NS_BEGIN
+	struct equal_to
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs == rhs;
+		}
+	};
+
+	struct not_equal_to
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs != rhs;
+		}
+	};
+
+	struct less
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs < rhs;
+		}
+	};
+
+	struct less_equal
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs <= rhs;
+		}
+	};
+
+	template <typename T> void swap(T& lhs, T& rhs)
+	{
+		T temp = lhs;
+		lhs = rhs;
+		rhs = temp;
+	}
+
+	template <typename I, typename Pred> I min_element(I begin, I end, const Pred& pred)
+	{
+		I result = begin;
+
+		for (I it = begin + 1; it != end; ++it)
+			if (pred(*it, *result))
+				result = it;
+
+		return result;
+	}
+
+	template <typename I> void reverse(I begin, I end)
+	{
+		while (end - begin > 1) swap(*begin++, *--end);
+	}
+
+	template <typename I> I unique(I begin, I end)
+	{
+		// fast skip head
+		while (end - begin > 1 && *begin != *(begin + 1)) begin++;
+
+		if (begin == end) return begin;
+
+		// last written element
+		I write = begin++;
+
+		// merge unique elements
+		while (begin != end)
+		{
+			if (*begin != *write)
+				*++write = *begin++;
+			else
+				begin++;
+		}
+
+		// past-the-end (write points to live element)
+		return write + 1;
+	}
+
+	template <typename T, typename Pred> void insertion_sort(T* begin, T* end, const Pred& pred)
+	{
+		if (begin == end)
+			return;
+
+		for (T* it = begin + 1; it != end; ++it)
+		{
+			T val = *it;
+			T* hole = it;
+
+			// move hole backwards
+			while (hole > begin && pred(val, *(hole - 1)))
+			{
+				*hole = *(hole - 1);
+				hole--;
+			}
+
+			// fill hole with element
+			*hole = val;
+		}
+	}
+
+	template <typename I, typename Pred> I median3(I first, I middle, I last, const Pred& pred)
+	{
+		if (pred(*middle, *first)) swap(middle, first);
+		if (pred(*last, *middle)) swap(last, middle);
+		if (pred(*middle, *first)) swap(middle, first);
+
+		return middle;
+	}
+
+	template <typename T, typename Pred> void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
+	{
+		// invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups)
+		T* eq = begin;
+		T* lt = begin;
+		T* gt = end;
+
+		while (lt < gt)
+		{
+			if (pred(*lt, pivot))
+				lt++;
+			else if (*lt == pivot)
+				swap(*eq++, *lt++);
+			else
+				swap(*lt, *--gt);
+		}
+
+		// we now have just 4 groups: = < >; move equal elements to the middle
+		T* eqbeg = gt;
+
+		for (T* it = begin; it != eq; ++it)
+			swap(*it, *--eqbeg);
+
+		*out_eqbeg = eqbeg;
+		*out_eqend = gt;
+	}
+
+	template <typename I, typename Pred> void sort(I begin, I end, const Pred& pred)
+	{
+		// sort large chunks
+		while (end - begin > 16)
+		{
+			// find median element
+			I middle = begin + (end - begin) / 2;
+			I median = median3(begin, middle, end - 1, pred);
+
+			// partition in three chunks (< = >)
+			I eqbeg, eqend;
+			partition3(begin, end, *median, pred, &eqbeg, &eqend);
+
+			// loop on larger half
+			if (eqbeg - begin > end - eqend)
+			{
+				sort(eqend, end, pred);
+				end = eqbeg;
+			}
+			else
+			{
+				sort(begin, eqbeg, pred);
+				begin = eqend;
+			}
+		}
+
+		// insertion sort small chunk
+		insertion_sort(begin, end, pred);
+	}
+PUGI__NS_END
+
+// Allocator used for AST and evaluation stacks
+PUGI__NS_BEGIN
+	static const size_t xpath_memory_page_size =
+	#ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE
+		PUGIXML_MEMORY_XPATH_PAGE_SIZE
+	#else
+		4096
+	#endif
+		;
+
+	static const uintptr_t xpath_memory_block_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*);
+
+	struct xpath_memory_block
+	{
+		xpath_memory_block* next;
+		size_t capacity;
+
+		union
+		{
+			char data[xpath_memory_page_size];
+			double alignment;
+		};
+	};
+
+	struct xpath_allocator
+	{
+		xpath_memory_block* _root;
+		size_t _root_size;
+		bool* _error;
+
+		xpath_allocator(xpath_memory_block* root, bool* error = 0): _root(root), _root_size(0), _error(error)
+		{
+		}
+
+		void* allocate(size_t size)
+		{
+			// round size up to block alignment boundary
+			size = (size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+
+			if (_root_size + size <= _root->capacity)
+			{
+				void* buf = &_root->data[0] + _root_size;
+				_root_size += size;
+				return buf;
+			}
+			else
+			{
+				// make sure we have at least 1/4th of the page free after allocation to satisfy subsequent allocation requests
+				size_t block_capacity_base = sizeof(_root->data);
+				size_t block_capacity_req = size + block_capacity_base / 4;
+				size_t block_capacity = (block_capacity_base > block_capacity_req) ? block_capacity_base : block_capacity_req;
+
+				size_t block_size = block_capacity + offsetof(xpath_memory_block, data);
+
+				xpath_memory_block* block = static_cast<xpath_memory_block*>(xml_memory::allocate(block_size));
+				if (!block)
+				{
+					if (_error) *_error = true;
+					return 0;
+				}
+
+				block->next = _root;
+				block->capacity = block_capacity;
+
+				_root = block;
+				_root_size = size;
+
+				return block->data;
+			}
+		}
+
+		void* reallocate(void* ptr, size_t old_size, size_t new_size)
+		{
+			// round size up to block alignment boundary
+			old_size = (old_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+			new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+
+			// we can only reallocate the last object
+			assert(ptr == 0 || static_cast<char*>(ptr) + old_size == &_root->data[0] + _root_size);
+
+			// try to reallocate the object inplace
+			if (ptr && _root_size - old_size + new_size <= _root->capacity)
+			{
+				_root_size = _root_size - old_size + new_size;
+				return ptr;
+			}
+
+			// allocate a new block
+			void* result = allocate(new_size);
+			if (!result) return 0;
+
+			// we have a new block
+			if (ptr)
+			{
+				// copy old data (we only support growing)
+				assert(new_size >= old_size);
+				memcpy(result, ptr, old_size);
+
+				// free the previous page if it had no other objects
+				assert(_root->data == result);
+				assert(_root->next);
+
+				if (_root->next->data == ptr)
+				{
+					// deallocate the whole page, unless it was the first one
+					xpath_memory_block* next = _root->next->next;
+
+					if (next)
+					{
+						xml_memory::deallocate(_root->next);
+						_root->next = next;
+					}
+				}
+			}
+
+			return result;
+		}
+
+		void revert(const xpath_allocator& state)
+		{
+			// free all new pages
+			xpath_memory_block* cur = _root;
+
+			while (cur != state._root)
+			{
+				xpath_memory_block* next = cur->next;
+
+				xml_memory::deallocate(cur);
+
+				cur = next;
+			}
+
+			// restore state
+			_root = state._root;
+			_root_size = state._root_size;
+		}
+
+		void release()
+		{
+			xpath_memory_block* cur = _root;
+			assert(cur);
+
+			while (cur->next)
+			{
+				xpath_memory_block* next = cur->next;
+
+				xml_memory::deallocate(cur);
+
+				cur = next;
+			}
+		}
+	};
+
+	struct xpath_allocator_capture
+	{
+		xpath_allocator_capture(xpath_allocator* alloc): _target(alloc), _state(*alloc)
+		{
+		}
+
+		~xpath_allocator_capture()
+		{
+			_target->revert(_state);
+		}
+
+		xpath_allocator* _target;
+		xpath_allocator _state;
+	};
+
+	struct xpath_stack
+	{
+		xpath_allocator* result;
+		xpath_allocator* temp;
+	};
+
+	struct xpath_stack_data
+	{
+		xpath_memory_block blocks[2];
+		xpath_allocator result;
+		xpath_allocator temp;
+		xpath_stack stack;
+		bool oom;
+
+		xpath_stack_data(): result(blocks + 0, &oom), temp(blocks + 1, &oom), oom(false)
+		{
+			blocks[0].next = blocks[1].next = 0;
+			blocks[0].capacity = blocks[1].capacity = sizeof(blocks[0].data);
+
+			stack.result = &result;
+			stack.temp = &temp;
+		}
+
+		~xpath_stack_data()
+		{
+			result.release();
+			temp.release();
+		}
+	};
+PUGI__NS_END
+
+// String class
+PUGI__NS_BEGIN
+	class xpath_string
+	{
+		const char_t* _buffer;
+		bool _uses_heap;
+		size_t _length_heap;
+
+		static char_t* duplicate_string(const char_t* string, size_t length, xpath_allocator* alloc)
+		{
+			char_t* result = static_cast<char_t*>(alloc->allocate((length + 1) * sizeof(char_t)));
+			if (!result) return 0;
+
+			memcpy(result, string, length * sizeof(char_t));
+			result[length] = 0;
+
+			return result;
+		}
+
+		xpath_string(const char_t* buffer, bool uses_heap_, size_t length_heap): _buffer(buffer), _uses_heap(uses_heap_), _length_heap(length_heap)
+		{
+		}
+
+	public:
+		static xpath_string from_const(const char_t* str)
+		{
+			return xpath_string(str, false, 0);
+		}
+
+		static xpath_string from_heap_preallocated(const char_t* begin, const char_t* end)
+		{
+			assert(begin <= end && *end == 0);
+
+			return xpath_string(begin, true, static_cast<size_t>(end - begin));
+		}
+
+		static xpath_string from_heap(const char_t* begin, const char_t* end, xpath_allocator* alloc)
+		{
+			assert(begin <= end);
+
+			if (begin == end)
+				return xpath_string();
+
+			size_t length = static_cast<size_t>(end - begin);
+			const char_t* data = duplicate_string(begin, length, alloc);
+
+			return data ? xpath_string(data, true, length) : xpath_string();
+		}
+
+		xpath_string(): _buffer(PUGIXML_TEXT("")), _uses_heap(false), _length_heap(0)
+		{
+		}
+
+		void append(const xpath_string& o, xpath_allocator* alloc)
+		{
+			// skip empty sources
+			if (!*o._buffer) return;
+
+			// fast append for constant empty target and constant source
+			if (!*_buffer && !_uses_heap && !o._uses_heap)
+			{
+				_buffer = o._buffer;
+			}
+			else
+			{
+				// need to make heap copy
+				size_t target_length = length();
+				size_t source_length = o.length();
+				size_t result_length = target_length + source_length;
+
+				// allocate new buffer
+				char_t* result = static_cast<char_t*>(alloc->reallocate(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
+				if (!result) return;
+
+				// append first string to the new buffer in case there was no reallocation
+				if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t));
+
+				// append second string to the new buffer
+				memcpy(result + target_length, o._buffer, source_length * sizeof(char_t));
+				result[result_length] = 0;
+
+				// finalize
+				_buffer = result;
+				_uses_heap = true;
+				_length_heap = result_length;
+			}
+		}
+
+		const char_t* c_str() const
+		{
+			return _buffer;
+		}
+
+		size_t length() const
+		{
+			return _uses_heap ? _length_heap : strlength(_buffer);
+		}
+
+		char_t* data(xpath_allocator* alloc)
+		{
+			// make private heap copy
+			if (!_uses_heap)
+			{
+				size_t length_ = strlength(_buffer);
+				const char_t* data_ = duplicate_string(_buffer, length_, alloc);
+
+				if (!data_) return 0;
+
+				_buffer = data_;
+				_uses_heap = true;
+				_length_heap = length_;
+			}
+
+			return const_cast<char_t*>(_buffer);
+		}
+
+		bool empty() const
+		{
+			return *_buffer == 0;
+		}
+
+		bool operator==(const xpath_string& o) const
+		{
+			return strequal(_buffer, o._buffer);
+		}
+
+		bool operator!=(const xpath_string& o) const
+		{
+			return !strequal(_buffer, o._buffer);
+		}
+
+		bool uses_heap() const
+		{
+			return _uses_heap;
+		}
+	};
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	PUGI__FN bool starts_with(const char_t* string, const char_t* pattern)
+	{
+		while (*pattern && *string == *pattern)
+		{
+			string++;
+			pattern++;
+		}
+
+		return *pattern == 0;
+	}
+
+	PUGI__FN const char_t* find_char(const char_t* s, char_t c)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcschr(s, c);
+	#else
+		return strchr(s, c);
+	#endif
+	}
+
+	PUGI__FN const char_t* find_substring(const char_t* s, const char_t* p)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		// MSVC6 wcsstr bug workaround (if s is empty it always returns 0)
+		return (*p == 0) ? s : wcsstr(s, p);
+	#else
+		return strstr(s, p);
+	#endif
+	}
+
+	// Converts symbol to lower case, if it is an ASCII one
+	PUGI__FN char_t tolower_ascii(char_t ch)
+	{
+		return static_cast<unsigned int>(ch - 'A') < 26 ? static_cast<char_t>(ch | ' ') : ch;
+	}
+
+	PUGI__FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc)
+	{
+		if (na.attribute())
+			return xpath_string::from_const(na.attribute().value());
+		else
+		{
+			xml_node n = na.node();
+
+			switch (n.type())
+			{
+			case node_pcdata:
+			case node_cdata:
+			case node_comment:
+			case node_pi:
+				return xpath_string::from_const(n.value());
+
+			case node_document:
+			case node_element:
+			{
+				xpath_string result;
+
+				// element nodes can have value if parse_embed_pcdata was used
+				if (n.value()[0])
+					result.append(xpath_string::from_const(n.value()), alloc);
+
+				xml_node cur = n.first_child();
+
+				while (cur && cur != n)
+				{
+					if (cur.type() == node_pcdata || cur.type() == node_cdata)
+						result.append(xpath_string::from_const(cur.value()), alloc);
+
+					if (cur.first_child())
+						cur = cur.first_child();
+					else if (cur.next_sibling())
+						cur = cur.next_sibling();
+					else
+					{
+						while (!cur.next_sibling() && cur != n)
+							cur = cur.parent();
+
+						if (cur != n) cur = cur.next_sibling();
+					}
+				}
+
+				return result;
+			}
+
+			default:
+				return xpath_string();
+			}
+		}
+	}
+
+	PUGI__FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn)
+	{
+		assert(ln->parent == rn->parent);
+
+		// there is no common ancestor (the shared parent is null), nodes are from different documents
+		if (!ln->parent) return ln < rn;
+
+		// determine sibling order
+		xml_node_struct* ls = ln;
+		xml_node_struct* rs = rn;
+
+		while (ls && rs)
+		{
+			if (ls == rn) return true;
+			if (rs == ln) return false;
+
+			ls = ls->next_sibling;
+			rs = rs->next_sibling;
+		}
+
+		// if rn sibling chain ended ln must be before rn
+		return !rs;
+	}
+
+	PUGI__FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn)
+	{
+		// find common ancestor at the same depth, if any
+		xml_node_struct* lp = ln;
+		xml_node_struct* rp = rn;
+
+		while (lp && rp && lp->parent != rp->parent)
+		{
+			lp = lp->parent;
+			rp = rp->parent;
+		}
+
+		// parents are the same!
+		if (lp && rp) return node_is_before_sibling(lp, rp);
+
+		// nodes are at different depths, need to normalize heights
+		bool left_higher = !lp;
+
+		while (lp)
+		{
+			lp = lp->parent;
+			ln = ln->parent;
+		}
+
+		while (rp)
+		{
+			rp = rp->parent;
+			rn = rn->parent;
+		}
+
+		// one node is the ancestor of the other
+		if (ln == rn) return left_higher;
+
+		// find common ancestor... again
+		while (ln->parent != rn->parent)
+		{
+			ln = ln->parent;
+			rn = rn->parent;
+		}
+
+		return node_is_before_sibling(ln, rn);
+	}
+
+	PUGI__FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node)
+	{
+		while (node && node != parent) node = node->parent;
+
+		return parent && node == parent;
+	}
+
+	PUGI__FN const void* document_buffer_order(const xpath_node& xnode)
+	{
+		xml_node_struct* node = xnode.node().internal_object();
+
+		if (node)
+		{
+			if ((get_document(node).header & xml_memory_page_contents_shared_mask) == 0)
+			{
+				if (node->name && (node->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return node->name;
+				if (node->value && (node->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return node->value;
+			}
+
+			return 0;
+		}
+
+		xml_attribute_struct* attr = xnode.attribute().internal_object();
+
+		if (attr)
+		{
+			if ((get_document(attr).header & xml_memory_page_contents_shared_mask) == 0)
+			{
+				if ((attr->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return attr->name;
+				if ((attr->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return attr->value;
+			}
+
+			return 0;
+		}
+
+		return 0;
+	}
+
+	struct document_order_comparator
+	{
+		bool operator()(const xpath_node& lhs, const xpath_node& rhs) const
+		{
+			// optimized document order based check
+			const void* lo = document_buffer_order(lhs);
+			const void* ro = document_buffer_order(rhs);
+
+			if (lo && ro) return lo < ro;
+
+			// slow comparison
+			xml_node ln = lhs.node(), rn = rhs.node();
+
+			// compare attributes
+			if (lhs.attribute() && rhs.attribute())
+			{
+				// shared parent
+				if (lhs.parent() == rhs.parent())
+				{
+					// determine sibling order
+					for (xml_attribute a = lhs.attribute(); a; a = a.next_attribute())
+						if (a == rhs.attribute())
+							return true;
+
+					return false;
+				}
+
+				// compare attribute parents
+				ln = lhs.parent();
+				rn = rhs.parent();
+			}
+			else if (lhs.attribute())
+			{
+				// attributes go after the parent element
+				if (lhs.parent() == rhs.node()) return false;
+
+				ln = lhs.parent();
+			}
+			else if (rhs.attribute())
+			{
+				// attributes go after the parent element
+				if (rhs.parent() == lhs.node()) return true;
+
+				rn = rhs.parent();
+			}
+
+			if (ln == rn) return false;
+
+			if (!ln || !rn) return ln < rn;
+
+			return node_is_before(ln.internal_object(), rn.internal_object());
+		}
+	};
+
+	struct duplicate_comparator
+	{
+		bool operator()(const xpath_node& lhs, const xpath_node& rhs) const
+		{
+			if (lhs.attribute()) return rhs.attribute() ? lhs.attribute() < rhs.attribute() : true;
+			else return rhs.attribute() ? false : lhs.node() < rhs.node();
+		}
+	};
+
+	PUGI__FN double gen_nan()
+	{
+	#if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24))
+		PUGI__STATIC_ASSERT(sizeof(float) == sizeof(uint32_t));
+		typedef uint32_t UI; // BCC5 workaround
+		union { float f; UI i; } u;
+		u.i = 0x7fc00000;
+		return u.f;
+	#else
+		// fallback
+		const volatile double zero = 0.0;
+		return zero / zero;
+	#endif
+	}
+
+	PUGI__FN bool is_nan(double value)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
+		return !!_isnan(value);
+	#elif defined(fpclassify) && defined(FP_NAN)
+		return fpclassify(value) == FP_NAN;
+	#else
+		// fallback
+		const volatile double v = value;
+		return v != v;
+	#endif
+	}
+
+	PUGI__FN const char_t* convert_number_to_string_special(double value)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
+		if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0;
+		if (_isnan(value)) return PUGIXML_TEXT("NaN");
+		return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+	#elif defined(fpclassify) && defined(FP_NAN) && defined(FP_INFINITE) && defined(FP_ZERO)
+		switch (fpclassify(value))
+		{
+		case FP_NAN:
+			return PUGIXML_TEXT("NaN");
+
+		case FP_INFINITE:
+			return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+
+		case FP_ZERO:
+			return PUGIXML_TEXT("0");
+
+		default:
+			return 0;
+		}
+	#else
+		// fallback
+		const volatile double v = value;
+
+		if (v == 0) return PUGIXML_TEXT("0");
+		if (v != v) return PUGIXML_TEXT("NaN");
+		if (v * 2 == v) return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+		return 0;
+	#endif
+	}
+
+	PUGI__FN bool convert_number_to_boolean(double value)
+	{
+		return (value != 0 && !is_nan(value));
+	}
+
+	PUGI__FN void truncate_zeros(char* begin, char* end)
+	{
+		while (begin != end && end[-1] == '0') end--;
+
+		*end = 0;
+	}
+
+	// gets mantissa digits in the form of 0.xxxxx with 0. implied and the exponent
+#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 && !defined(_WIN32_WCE)
+	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	{
+		// get base values
+		int sign, exponent;
+		_ecvt_s(buffer, sizeof(buffer), value, DBL_DIG + 1, &exponent, &sign);
+
+		// truncate redundant zeros
+		truncate_zeros(buffer, buffer + strlen(buffer));
+
+		// fill results
+		*out_mantissa = buffer;
+		*out_exponent = exponent;
+	}
+#else
+	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	{
+		// get a scientific notation value with IEEE DBL_DIG decimals
+		PUGI__SNPRINTF(buffer, "%.*e", DBL_DIG, value);
+
+		// get the exponent (possibly negative)
+		char* exponent_string = strchr(buffer, 'e');
+		assert(exponent_string);
+
+		int exponent = atoi(exponent_string + 1);
+
+		// extract mantissa string: skip sign
+		char* mantissa = buffer[0] == '-' ? buffer + 1 : buffer;
+		assert(mantissa[0] != '0' && mantissa[1] == '.');
+
+		// divide mantissa by 10 to eliminate integer part
+		mantissa[1] = mantissa[0];
+		mantissa++;
+		exponent++;
+
+		// remove extra mantissa digits and zero-terminate mantissa
+		truncate_zeros(mantissa, exponent_string);
+
+		// fill results
+		*out_mantissa = mantissa;
+		*out_exponent = exponent;
+	}
+#endif
+
+	PUGI__FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc)
+	{
+		// try special number conversion
+		const char_t* special = convert_number_to_string_special(value);
+		if (special) return xpath_string::from_const(special);
+
+		// get mantissa + exponent form
+		char mantissa_buffer[32];
+
+		char* mantissa;
+		int exponent;
+		convert_number_to_mantissa_exponent(value, mantissa_buffer, &mantissa, &exponent);
+
+		// allocate a buffer of suitable length for the number
+		size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4;
+		char_t* result = static_cast<char_t*>(alloc->allocate(sizeof(char_t) * result_size));
+		if (!result) return xpath_string();
+
+		// make the number!
+		char_t* s = result;
+
+		// sign
+		if (value < 0) *s++ = '-';
+
+		// integer part
+		if (exponent <= 0)
+		{
+			*s++ = '0';
+		}
+		else
+		{
+			while (exponent > 0)
+			{
+				assert(*mantissa == 0 || static_cast<unsigned int>(*mantissa - '0') <= 9);
+				*s++ = *mantissa ? *mantissa++ : '0';
+				exponent--;
+			}
+		}
+
+		// fractional part
+		if (*mantissa)
+		{
+			// decimal point
+			*s++ = '.';
+
+			// extra zeroes from negative exponent
+			while (exponent < 0)
+			{
+				*s++ = '0';
+				exponent++;
+			}
+
+			// extra mantissa digits
+			while (*mantissa)
+			{
+				assert(static_cast<unsigned int>(*mantissa - '0') <= 9);
+				*s++ = *mantissa++;
+			}
+		}
+
+		// zero-terminate
+		assert(s < result + result_size);
+		*s = 0;
+
+		return xpath_string::from_heap_preallocated(result, s);
+	}
+
+	PUGI__FN bool check_string_to_number_format(const char_t* string)
+	{
+		// parse leading whitespace
+		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
+
+		// parse sign
+		if (*string == '-') ++string;
+
+		if (!*string) return false;
+
+		// if there is no integer part, there should be a decimal part with at least one digit
+		if (!PUGI__IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI__IS_CHARTYPEX(string[1], ctx_digit))) return false;
+
+		// parse integer part
+		while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
+
+		// parse decimal part
+		if (*string == '.')
+		{
+			++string;
+
+			while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
+		}
+
+		// parse trailing whitespace
+		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
+
+		return *string == 0;
+	}
+
+	PUGI__FN double convert_string_to_number(const char_t* string)
+	{
+		// check string format
+		if (!check_string_to_number_format(string)) return gen_nan();
+
+		// parse string
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcstod(string, 0);
+	#else
+		return strtod(string, 0);
+	#endif
+	}
+
+	PUGI__FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result)
+	{
+		size_t length = static_cast<size_t>(end - begin);
+		char_t* scratch = buffer;
+
+		if (length >= sizeof(buffer) / sizeof(buffer[0]))
+		{
+			// need to make dummy on-heap copy
+			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!scratch) return false;
+		}
+
+		// copy string to zero-terminated buffer and perform conversion
+		memcpy(scratch, begin, length * sizeof(char_t));
+		scratch[length] = 0;
+
+		*out_result = convert_string_to_number(scratch);
+
+		// free dummy buffer
+		if (scratch != buffer) xml_memory::deallocate(scratch);
+
+		return true;
+	}
+
+	PUGI__FN double round_nearest(double value)
+	{
+		return floor(value + 0.5);
+	}
+
+	PUGI__FN double round_nearest_nzero(double value)
+	{
+		// same as round_nearest, but returns -0 for [-0.5, -0]
+		// ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0)
+		return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5);
+	}
+
+	PUGI__FN const char_t* qualified_name(const xpath_node& node)
+	{
+		return node.attribute() ? node.attribute().name() : node.node().name();
+	}
+
+	PUGI__FN const char_t* local_name(const xpath_node& node)
+	{
+		const char_t* name = qualified_name(node);
+		const char_t* p = find_char(name, ':');
+
+		return p ? p + 1 : name;
+	}
+
+	struct namespace_uri_predicate
+	{
+		const char_t* prefix;
+		size_t prefix_length;
+
+		namespace_uri_predicate(const char_t* name)
+		{
+			const char_t* pos = find_char(name, ':');
+
+			prefix = pos ? name : 0;
+			prefix_length = pos ? static_cast<size_t>(pos - name) : 0;
+		}
+
+		bool operator()(xml_attribute a) const
+		{
+			const char_t* name = a.name();
+
+			if (!starts_with(name, PUGIXML_TEXT("xmlns"))) return false;
+
+			return prefix ? name[5] == ':' && strequalrange(name + 6, prefix, prefix_length) : name[5] == 0;
+		}
+	};
+
+	PUGI__FN const char_t* namespace_uri(xml_node node)
+	{
+		namespace_uri_predicate pred = node.name();
+
+		xml_node p = node;
+
+		while (p)
+		{
+			xml_attribute a = p.find_attribute(pred);
+
+			if (a) return a.value();
+
+			p = p.parent();
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* namespace_uri(xml_attribute attr, xml_node parent)
+	{
+		namespace_uri_predicate pred = attr.name();
+
+		// Default namespace does not apply to attributes
+		if (!pred.prefix) return PUGIXML_TEXT("");
+
+		xml_node p = parent;
+
+		while (p)
+		{
+			xml_attribute a = p.find_attribute(pred);
+
+			if (a) return a.value();
+
+			p = p.parent();
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* namespace_uri(const xpath_node& node)
+	{
+		return node.attribute() ? namespace_uri(node.attribute(), node.parent()) : namespace_uri(node.node());
+	}
+
+	PUGI__FN char_t* normalize_space(char_t* buffer)
+	{
+		char_t* write = buffer;
+
+		for (char_t* it = buffer; *it; )
+		{
+			char_t ch = *it++;
+
+			if (PUGI__IS_CHARTYPE(ch, ct_space))
+			{
+				// replace whitespace sequence with single space
+				while (PUGI__IS_CHARTYPE(*it, ct_space)) it++;
+
+				// avoid leading spaces
+				if (write != buffer) *write++ = ' ';
+			}
+			else *write++ = ch;
+		}
+
+		// remove trailing space
+		if (write != buffer && PUGI__IS_CHARTYPE(write[-1], ct_space)) write--;
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	PUGI__FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length)
+	{
+		char_t* write = buffer;
+
+		while (*buffer)
+		{
+			PUGI__DMC_VOLATILE char_t ch = *buffer++;
+
+			const char_t* pos = find_char(from, ch);
+
+			if (!pos)
+				*write++ = ch; // do not process
+			else if (static_cast<size_t>(pos - from) < to_length)
+				*write++ = to[pos - from]; // replace
+		}
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	PUGI__FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to)
+	{
+		unsigned char table[128] = {0};
+
+		while (*from)
+		{
+			unsigned int fc = static_cast<unsigned int>(*from);
+			unsigned int tc = static_cast<unsigned int>(*to);
+
+			if (fc >= 128 || tc >= 128)
+				return 0;
+
+			// code=128 means "skip character"
+			if (!table[fc])
+				table[fc] = static_cast<unsigned char>(tc ? tc : 128);
+
+			from++;
+			if (tc) to++;
+		}
+
+		for (int i = 0; i < 128; ++i)
+			if (!table[i])
+				table[i] = static_cast<unsigned char>(i);
+
+		void* result = alloc->allocate(sizeof(table));
+		if (!result) return 0;
+
+		memcpy(result, table, sizeof(table));
+
+		return static_cast<unsigned char*>(result);
+	}
+
+	PUGI__FN char_t* translate_table(char_t* buffer, const unsigned char* table)
+	{
+		char_t* write = buffer;
+
+		while (*buffer)
+		{
+			char_t ch = *buffer++;
+			unsigned int index = static_cast<unsigned int>(ch);
+
+			if (index < 128)
+			{
+				unsigned char code = table[index];
+
+				// code=128 means "skip character" (table size is 128 so 128 can be a special value)
+				// this code skips these characters without extra branches
+				*write = static_cast<char_t>(code);
+				write += 1 - (code >> 7);
+			}
+			else
+			{
+				*write++ = ch;
+			}
+		}
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	inline bool is_xpath_attribute(const char_t* name)
+	{
+		return !(starts_with(name, PUGIXML_TEXT("xmlns")) && (name[5] == 0 || name[5] == ':'));
+	}
+
+	struct xpath_variable_boolean: xpath_variable
+	{
+		xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false)
+		{
+		}
+
+		bool value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_number: xpath_variable
+	{
+		xpath_variable_number(): xpath_variable(xpath_type_number), value(0)
+		{
+		}
+
+		double value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_string: xpath_variable
+	{
+		xpath_variable_string(): xpath_variable(xpath_type_string), value(0)
+		{
+		}
+
+		~xpath_variable_string()
+		{
+			if (value) xml_memory::deallocate(value);
+		}
+
+		char_t* value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_node_set: xpath_variable
+	{
+		xpath_variable_node_set(): xpath_variable(xpath_type_node_set)
+		{
+		}
+
+		xpath_node_set value;
+		char_t name[1];
+	};
+
+	static const xpath_node_set dummy_node_set;
+
+	PUGI__FN PUGI__UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
+	{
+		// Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time)
+		unsigned int result = 0;
+
+		while (*str)
+		{
+			result += static_cast<unsigned int>(*str++);
+			result += result << 10;
+			result ^= result >> 6;
+		}
+
+		result += result << 3;
+		result ^= result >> 11;
+		result += result << 15;
+
+		return result;
+	}
+
+	template <typename T> PUGI__FN T* new_xpath_variable(const char_t* name)
+	{
+		size_t length = strlength(name);
+		if (length == 0) return 0; // empty variable names are invalid
+
+		// $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters
+		void* memory = xml_memory::allocate(sizeof(T) + length * sizeof(char_t));
+		if (!memory) return 0;
+
+		T* result = new (memory) T();
+
+		memcpy(result->name, name, (length + 1) * sizeof(char_t));
+
+		return result;
+	}
+
+	PUGI__FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name)
+	{
+		switch (type)
+		{
+		case xpath_type_node_set:
+			return new_xpath_variable<xpath_variable_node_set>(name);
+
+		case xpath_type_number:
+			return new_xpath_variable<xpath_variable_number>(name);
+
+		case xpath_type_string:
+			return new_xpath_variable<xpath_variable_string>(name);
+
+		case xpath_type_boolean:
+			return new_xpath_variable<xpath_variable_boolean>(name);
+
+		default:
+			return 0;
+		}
+	}
+
+	template <typename T> PUGI__FN void delete_xpath_variable(T* var)
+	{
+		var->~T();
+		xml_memory::deallocate(var);
+	}
+
+	PUGI__FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var)
+	{
+		switch (type)
+		{
+		case xpath_type_node_set:
+			delete_xpath_variable(static_cast<xpath_variable_node_set*>(var));
+			break;
+
+		case xpath_type_number:
+			delete_xpath_variable(static_cast<xpath_variable_number*>(var));
+			break;
+
+		case xpath_type_string:
+			delete_xpath_variable(static_cast<xpath_variable_string*>(var));
+			break;
+
+		case xpath_type_boolean:
+			delete_xpath_variable(static_cast<xpath_variable_boolean*>(var));
+			break;
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+		}
+	}
+
+	PUGI__FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs)
+	{
+		switch (rhs->type())
+		{
+		case xpath_type_node_set:
+			return lhs->set(static_cast<const xpath_variable_node_set*>(rhs)->value);
+
+		case xpath_type_number:
+			return lhs->set(static_cast<const xpath_variable_number*>(rhs)->value);
+
+		case xpath_type_string:
+			return lhs->set(static_cast<const xpath_variable_string*>(rhs)->value);
+
+		case xpath_type_boolean:
+			return lhs->set(static_cast<const xpath_variable_boolean*>(rhs)->value);
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+			return false;
+		}
+	}
+
+	PUGI__FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result)
+	{
+		size_t length = static_cast<size_t>(end - begin);
+		char_t* scratch = buffer;
+
+		if (length >= sizeof(buffer) / sizeof(buffer[0]))
+		{
+			// need to make dummy on-heap copy
+			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!scratch) return false;
+		}
+
+		// copy string to zero-terminated buffer and perform lookup
+		memcpy(scratch, begin, length * sizeof(char_t));
+		scratch[length] = 0;
+
+		*out_result = set->get(scratch);
+
+		// free dummy buffer
+		if (scratch != buffer) xml_memory::deallocate(scratch);
+
+		return true;
+	}
+PUGI__NS_END
+
+// Internal node set class
+PUGI__NS_BEGIN
+	PUGI__FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end)
+	{
+		if (end - begin < 2)
+			return xpath_node_set::type_sorted;
+
+		document_order_comparator cmp;
+
+		bool first = cmp(begin[0], begin[1]);
+
+		for (const xpath_node* it = begin + 1; it + 1 < end; ++it)
+			if (cmp(it[0], it[1]) != first)
+				return xpath_node_set::type_unsorted;
+
+		return first ? xpath_node_set::type_sorted : xpath_node_set::type_sorted_reverse;
+	}
+
+	PUGI__FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
+	{
+		xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
+
+		if (type == xpath_node_set::type_unsorted)
+		{
+			xpath_node_set::type_t sorted = xpath_get_order(begin, end);
+
+			if (sorted == xpath_node_set::type_unsorted)
+			{
+				sort(begin, end, document_order_comparator());
+
+				type = xpath_node_set::type_sorted;
+			}
+			else
+				type = sorted;
+		}
+
+		if (type != order) reverse(begin, end);
+
+		return order;
+	}
+
+	PUGI__FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type)
+	{
+		if (begin == end) return xpath_node();
+
+		switch (type)
+		{
+		case xpath_node_set::type_sorted:
+			return *begin;
+
+		case xpath_node_set::type_sorted_reverse:
+			return *(end - 1);
+
+		case xpath_node_set::type_unsorted:
+			return *min_element(begin, end, document_order_comparator());
+
+		default:
+			assert(false && "Invalid node set type"); // unreachable
+			return xpath_node();
+		}
+	}
+
+	class xpath_node_set_raw
+	{
+		xpath_node_set::type_t _type;
+
+		xpath_node* _begin;
+		xpath_node* _end;
+		xpath_node* _eos;
+
+	public:
+		xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(0), _end(0), _eos(0)
+		{
+		}
+
+		xpath_node* begin() const
+		{
+			return _begin;
+		}
+
+		xpath_node* end() const
+		{
+			return _end;
+		}
+
+		bool empty() const
+		{
+			return _begin == _end;
+		}
+
+		size_t size() const
+		{
+			return static_cast<size_t>(_end - _begin);
+		}
+
+		xpath_node first() const
+		{
+			return xpath_first(_begin, _end, _type);
+		}
+
+		void push_back_grow(const xpath_node& node, xpath_allocator* alloc);
+
+		void push_back(const xpath_node& node, xpath_allocator* alloc)
+		{
+			if (_end != _eos)
+				*_end++ = node;
+			else
+				push_back_grow(node, alloc);
+		}
+
+		void append(const xpath_node* begin_, const xpath_node* end_, xpath_allocator* alloc)
+		{
+			if (begin_ == end_) return;
+
+			size_t size_ = static_cast<size_t>(_end - _begin);
+			size_t capacity = static_cast<size_t>(_eos - _begin);
+			size_t count = static_cast<size_t>(end_ - begin_);
+
+			if (size_ + count > capacity)
+			{
+				// reallocate the old array or allocate a new one
+				xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node)));
+				if (!data) return;
+
+				// finalize
+				_begin = data;
+				_end = data + size_;
+				_eos = data + size_ + count;
+			}
+
+			memcpy(_end, begin_, count * sizeof(xpath_node));
+			_end += count;
+		}
+
+		void sort_do()
+		{
+			_type = xpath_sort(_begin, _end, _type, false);
+		}
+
+		void truncate(xpath_node* pos)
+		{
+			assert(_begin <= pos && pos <= _end);
+
+			_end = pos;
+		}
+
+		void remove_duplicates()
+		{
+			if (_type == xpath_node_set::type_unsorted)
+				sort(_begin, _end, duplicate_comparator());
+
+			_end = unique(_begin, _end);
+		}
+
+		xpath_node_set::type_t type() const
+		{
+			return _type;
+		}
+
+		void set_type(xpath_node_set::type_t value)
+		{
+			_type = value;
+		}
+	};
+
+	PUGI__FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc)
+	{
+		size_t capacity = static_cast<size_t>(_eos - _begin);
+
+		// get new capacity (1.5x rule)
+		size_t new_capacity = capacity + capacity / 2 + 1;
+
+		// reallocate the old array or allocate a new one
+		xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node)));
+		if (!data) return;
+
+		// finalize
+		_begin = data;
+		_end = data + capacity;
+		_eos = data + new_capacity;
+
+		// push
+		*_end++ = node;
+	}
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	struct xpath_context
+	{
+		xpath_node n;
+		size_t position, size;
+
+		xpath_context(const xpath_node& n_, size_t position_, size_t size_): n(n_), position(position_), size(size_)
+		{
+		}
+	};
+
+	enum lexeme_t
+	{
+		lex_none = 0,
+		lex_equal,
+		lex_not_equal,
+		lex_less,
+		lex_greater,
+		lex_less_or_equal,
+		lex_greater_or_equal,
+		lex_plus,
+		lex_minus,
+		lex_multiply,
+		lex_union,
+		lex_var_ref,
+		lex_open_brace,
+		lex_close_brace,
+		lex_quoted_string,
+		lex_number,
+		lex_slash,
+		lex_double_slash,
+		lex_open_square_brace,
+		lex_close_square_brace,
+		lex_string,
+		lex_comma,
+		lex_axis_attribute,
+		lex_dot,
+		lex_double_dot,
+		lex_double_colon,
+		lex_eof
+	};
+
+	struct xpath_lexer_string
+	{
+		const char_t* begin;
+		const char_t* end;
+
+		xpath_lexer_string(): begin(0), end(0)
+		{
+		}
+
+		bool operator==(const char_t* other) const
+		{
+			size_t length = static_cast<size_t>(end - begin);
+
+			return strequalrange(other, begin, length);
+		}
+	};
+
+	class xpath_lexer
+	{
+		const char_t* _cur;
+		const char_t* _cur_lexeme_pos;
+		xpath_lexer_string _cur_lexeme_contents;
+
+		lexeme_t _cur_lexeme;
+
+	public:
+		explicit xpath_lexer(const char_t* query): _cur(query)
+		{
+			next();
+		}
+
+		const char_t* state() const
+		{
+			return _cur;
+		}
+
+		void next()
+		{
+			const char_t* cur = _cur;
+
+			while (PUGI__IS_CHARTYPE(*cur, ct_space)) ++cur;
+
+			// save lexeme position for error reporting
+			_cur_lexeme_pos = cur;
+
+			switch (*cur)
+			{
+			case 0:
+				_cur_lexeme = lex_eof;
+				break;
+
+			case '>':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_greater_or_equal;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_greater;
+				}
+				break;
+
+			case '<':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_less_or_equal;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_less;
+				}
+				break;
+
+			case '!':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_not_equal;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+				break;
+
+			case '=':
+				cur += 1;
+				_cur_lexeme = lex_equal;
+
+				break;
+
+			case '+':
+				cur += 1;
+				_cur_lexeme = lex_plus;
+
+				break;
+
+			case '-':
+				cur += 1;
+				_cur_lexeme = lex_minus;
+
+				break;
+
+			case '*':
+				cur += 1;
+				_cur_lexeme = lex_multiply;
+
+				break;
+
+			case '|':
+				cur += 1;
+				_cur_lexeme = lex_union;
+
+				break;
+
+			case '$':
+				cur += 1;
+
+				if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+
+					if (cur[0] == ':' && PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // qname
+					{
+						cur++; // :
+
+						while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_var_ref;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+
+				break;
+
+			case '(':
+				cur += 1;
+				_cur_lexeme = lex_open_brace;
+
+				break;
+
+			case ')':
+				cur += 1;
+				_cur_lexeme = lex_close_brace;
+
+				break;
+
+			case '[':
+				cur += 1;
+				_cur_lexeme = lex_open_square_brace;
+
+				break;
+
+			case ']':
+				cur += 1;
+				_cur_lexeme = lex_close_square_brace;
+
+				break;
+
+			case ',':
+				cur += 1;
+				_cur_lexeme = lex_comma;
+
+				break;
+
+			case '/':
+				if (*(cur+1) == '/')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_slash;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_slash;
+				}
+				break;
+
+			case '.':
+				if (*(cur+1) == '.')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_dot;
+				}
+				else if (PUGI__IS_CHARTYPEX(*(cur+1), ctx_digit))
+				{
+					_cur_lexeme_contents.begin = cur; // .
+
+					++cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_number;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_dot;
+				}
+				break;
+
+			case '@':
+				cur += 1;
+				_cur_lexeme = lex_axis_attribute;
+
+				break;
+
+			case '"':
+			case '\'':
+			{
+				char_t terminator = *cur;
+
+				++cur;
+
+				_cur_lexeme_contents.begin = cur;
+				while (*cur && *cur != terminator) cur++;
+				_cur_lexeme_contents.end = cur;
+
+				if (!*cur)
+					_cur_lexeme = lex_none;
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_quoted_string;
+				}
+
+				break;
+			}
+
+			case ':':
+				if (*(cur+1) == ':')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_colon;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+				break;
+
+			default:
+				if (PUGI__IS_CHARTYPEX(*cur, ctx_digit))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+
+					if (*cur == '.')
+					{
+						cur++;
+
+						while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_number;
+				}
+				else if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+
+					if (cur[0] == ':')
+					{
+						if (cur[1] == '*') // namespace test ncname:*
+						{
+							cur += 2; // :*
+						}
+						else if (PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname
+						{
+							cur++; // :
+
+							while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+						}
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_string;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+			}
+
+			_cur = cur;
+		}
+
+		lexeme_t current() const
+		{
+			return _cur_lexeme;
+		}
+
+		const char_t* current_pos() const
+		{
+			return _cur_lexeme_pos;
+		}
+
+		const xpath_lexer_string& contents() const
+		{
+			assert(_cur_lexeme == lex_var_ref || _cur_lexeme == lex_number || _cur_lexeme == lex_string || _cur_lexeme == lex_quoted_string);
+
+			return _cur_lexeme_contents;
+		}
+	};
+
+	enum ast_type_t
+	{
+		ast_unknown,
+		ast_op_or,						// left or right
+		ast_op_and,						// left and right
+		ast_op_equal,					// left = right
+		ast_op_not_equal,				// left != right
+		ast_op_less,					// left < right
+		ast_op_greater,					// left > right
+		ast_op_less_or_equal,			// left <= right
+		ast_op_greater_or_equal,		// left >= right
+		ast_op_add,						// left + right
+		ast_op_subtract,				// left - right
+		ast_op_multiply,				// left * right
+		ast_op_divide,					// left / right
+		ast_op_mod,						// left % right
+		ast_op_negate,					// left - right
+		ast_op_union,					// left | right
+		ast_predicate,					// apply predicate to set; next points to next predicate
+		ast_filter,						// select * from left where right
+		ast_string_constant,			// string constant
+		ast_number_constant,			// number constant
+		ast_variable,					// variable
+		ast_func_last,					// last()
+		ast_func_position,				// position()
+		ast_func_count,					// count(left)
+		ast_func_id,					// id(left)
+		ast_func_local_name_0,			// local-name()
+		ast_func_local_name_1,			// local-name(left)
+		ast_func_namespace_uri_0,		// namespace-uri()
+		ast_func_namespace_uri_1,		// namespace-uri(left)
+		ast_func_name_0,				// name()
+		ast_func_name_1,				// name(left)
+		ast_func_string_0,				// string()
+		ast_func_string_1,				// string(left)
+		ast_func_concat,				// concat(left, right, siblings)
+		ast_func_starts_with,			// starts_with(left, right)
+		ast_func_contains,				// contains(left, right)
+		ast_func_substring_before,		// substring-before(left, right)
+		ast_func_substring_after,		// substring-after(left, right)
+		ast_func_substring_2,			// substring(left, right)
+		ast_func_substring_3,			// substring(left, right, third)
+		ast_func_string_length_0,		// string-length()
+		ast_func_string_length_1,		// string-length(left)
+		ast_func_normalize_space_0,		// normalize-space()
+		ast_func_normalize_space_1,		// normalize-space(left)
+		ast_func_translate,				// translate(left, right, third)
+		ast_func_boolean,				// boolean(left)
+		ast_func_not,					// not(left)
+		ast_func_true,					// true()
+		ast_func_false,					// false()
+		ast_func_lang,					// lang(left)
+		ast_func_number_0,				// number()
+		ast_func_number_1,				// number(left)
+		ast_func_sum,					// sum(left)
+		ast_func_floor,					// floor(left)
+		ast_func_ceiling,				// ceiling(left)
+		ast_func_round,					// round(left)
+		ast_step,						// process set left with step
+		ast_step_root,					// select root node
+
+		ast_opt_translate_table,		// translate(left, right, third) where right/third are constants
+		ast_opt_compare_attribute		// @name = 'string'
+	};
+
+	enum axis_t
+	{
+		axis_ancestor,
+		axis_ancestor_or_self,
+		axis_attribute,
+		axis_child,
+		axis_descendant,
+		axis_descendant_or_self,
+		axis_following,
+		axis_following_sibling,
+		axis_namespace,
+		axis_parent,
+		axis_preceding,
+		axis_preceding_sibling,
+		axis_self
+	};
+
+	enum nodetest_t
+	{
+		nodetest_none,
+		nodetest_name,
+		nodetest_type_node,
+		nodetest_type_comment,
+		nodetest_type_pi,
+		nodetest_type_text,
+		nodetest_pi,
+		nodetest_all,
+		nodetest_all_in_namespace
+	};
+
+	enum predicate_t
+	{
+		predicate_default,
+		predicate_posinv,
+		predicate_constant,
+		predicate_constant_one
+	};
+
+	enum nodeset_eval_t
+	{
+		nodeset_eval_all,
+		nodeset_eval_any,
+		nodeset_eval_first
+	};
+
+	template <axis_t N> struct axis_to_type
+	{
+		static const axis_t axis;
+	};
+
+	template <axis_t N> const axis_t axis_to_type<N>::axis = N;
+
+	class xpath_ast_node
+	{
+	private:
+		// node type
+		char _type;
+		char _rettype;
+
+		// for ast_step
+		char _axis;
+
+		// for ast_step/ast_predicate/ast_filter
+		char _test;
+
+		// tree node structure
+		xpath_ast_node* _left;
+		xpath_ast_node* _right;
+		xpath_ast_node* _next;
+
+		union
+		{
+			// value for ast_string_constant
+			const char_t* string;
+			// value for ast_number_constant
+			double number;
+			// variable for ast_variable
+			xpath_variable* variable;
+			// node test for ast_step (node name/namespace/node type/pi target)
+			const char_t* nodetest;
+			// table for ast_opt_translate_table
+			const unsigned char* table;
+		} _data;
+
+		xpath_ast_node(const xpath_ast_node&);
+		xpath_ast_node& operator=(const xpath_ast_node&);
+
+		template <class Comp> static bool compare_eq(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
+		{
+			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
+
+			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
+			{
+				if (lt == xpath_type_boolean || rt == xpath_type_boolean)
+					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
+				else if (lt == xpath_type_number || rt == xpath_type_number)
+					return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
+				else if (lt == xpath_type_string || rt == xpath_type_string)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					xpath_string ls = lhs->eval_string(c, stack);
+					xpath_string rs = rhs->eval_string(c, stack);
+
+					return comp(ls, rs);
+				}
+			}
+			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(string_value(*li, stack.result), string_value(*ri, stack.result)))
+							return true;
+					}
+
+				return false;
+			}
+			else
+			{
+				if (lt == xpath_type_node_set)
+				{
+					swap(lhs, rhs);
+					swap(lt, rt);
+				}
+
+				if (lt == xpath_type_boolean)
+					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
+				else if (lt == xpath_type_number)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					double l = lhs->eval_number(c, stack);
+					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+							return true;
+					}
+
+					return false;
+				}
+				else if (lt == xpath_type_string)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					xpath_string l = lhs->eval_string(c, stack);
+					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(l, string_value(*ri, stack.result)))
+							return true;
+					}
+
+					return false;
+				}
+			}
+
+			assert(false && "Wrong types"); // unreachable
+			return false;
+		}
+
+		static bool eval_once(xpath_node_set::type_t type, nodeset_eval_t eval)
+		{
+			return type == xpath_node_set::type_sorted ? eval != nodeset_eval_all : eval == nodeset_eval_any;
+		}
+
+		template <class Comp> static bool compare_rel(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
+		{
+			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
+
+			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
+				return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
+			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					double l = convert_string_to_number(string_value(*li, stack.result).c_str());
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture crii(stack.result);
+
+						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+							return true;
+					}
+				}
+
+				return false;
+			}
+			else if (lt != xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				double l = lhs->eval_number(c, stack);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+						return true;
+				}
+
+				return false;
+			}
+			else if (lt == xpath_type_node_set && rt != xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				double r = rhs->eval_number(c, stack);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					if (comp(convert_string_to_number(string_value(*li, stack.result).c_str()), r))
+						return true;
+				}
+
+				return false;
+			}
+			else
+			{
+				assert(false && "Wrong types"); // unreachable
+				return false;
+			}
+		}
+
+		static void apply_predicate_boolean(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() != xpath_type_number);
+
+			size_t i = 1;
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			// remove_if... or well, sort of
+			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
+			{
+				xpath_context c(*it, i, size);
+
+				if (expr->eval_boolean(c, stack))
+				{
+					*last++ = *it;
+
+					if (once) break;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		static void apply_predicate_number(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() == xpath_type_number);
+
+			size_t i = 1;
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			// remove_if... or well, sort of
+			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
+			{
+				xpath_context c(*it, i, size);
+
+				if (expr->eval_number(c, stack) == i)
+				{
+					*last++ = *it;
+
+					if (once) break;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		static void apply_predicate_number_const(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() == xpath_type_number);
+
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			xpath_context c(xpath_node(), 1, size);
+
+			double er = expr->eval_number(c, stack);
+
+			if (er >= 1.0 && er <= size)
+			{
+				size_t eri = static_cast<size_t>(er);
+
+				if (er == eri)
+				{
+					xpath_node r = last[eri - 1];
+
+					*last++ = r;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		void apply_predicate(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, bool once)
+		{
+			if (ns.size() == first) return;
+
+			assert(_type == ast_filter || _type == ast_predicate);
+
+			if (_test == predicate_constant || _test == predicate_constant_one)
+				apply_predicate_number_const(ns, first, _right, stack);
+			else if (_right->rettype() == xpath_type_number)
+				apply_predicate_number(ns, first, _right, stack, once);
+			else
+				apply_predicate_boolean(ns, first, _right, stack, once);
+		}
+
+		void apply_predicates(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, nodeset_eval_t eval)
+		{
+			if (ns.size() == first) return;
+
+			bool last_once = eval_once(ns.type(), eval);
+
+			for (xpath_ast_node* pred = _right; pred; pred = pred->_next)
+				pred->apply_predicate(ns, first, stack, !pred->_next && last_once);
+		}
+
+		bool step_push(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* parent, xpath_allocator* alloc)
+		{
+			assert(a);
+
+			const char_t* name = a->name ? a->name + 0 : PUGIXML_TEXT("");
+
+			switch (_test)
+			{
+			case nodetest_name:
+				if (strequal(name, _data.nodetest) && is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_node:
+			case nodetest_all:
+				if (is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all_in_namespace:
+				if (starts_with(name, _data.nodetest) && is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			default:
+				;
+			}
+
+			return false;
+		}
+
+		bool step_push(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc)
+		{
+			assert(n);
+
+			xml_node_type type = PUGI__NODETYPE(n);
+
+			switch (_test)
+			{
+			case nodetest_name:
+				if (type == node_element && n->name && strequal(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_node:
+				ns.push_back(xml_node(n), alloc);
+				return true;
+
+			case nodetest_type_comment:
+				if (type == node_comment)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_text:
+				if (type == node_pcdata || type == node_cdata)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_pi:
+				if (type == node_pi)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_pi:
+				if (type == node_pi && n->name && strequal(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all:
+				if (type == node_element)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all_in_namespace:
+				if (type == node_element && n->name && starts_with(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			default:
+				assert(false && "Unknown axis"); // unreachable
+			}
+
+			return false;
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc, bool once, T)
+		{
+			const axis_t axis = T::axis;
+
+			switch (axis)
+			{
+			case axis_attribute:
+			{
+				for (xml_attribute_struct* a = n->first_attribute; a; a = a->next_attribute)
+					if (step_push(ns, a, n, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_child:
+			{
+				for (xml_node_struct* c = n->first_child; c; c = c->next_sibling)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_descendant:
+			case axis_descendant_or_self:
+			{
+				if (axis == axis_descendant_or_self)
+					if (step_push(ns, n, alloc) & once)
+						return;
+
+				xml_node_struct* cur = n->first_child;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (cur == n) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+				}
+
+				break;
+			}
+
+			case axis_following_sibling:
+			{
+				for (xml_node_struct* c = n->next_sibling; c; c = c->next_sibling)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_preceding_sibling:
+			{
+				for (xml_node_struct* c = n->prev_sibling_c; c->next_sibling; c = c->prev_sibling_c)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_following:
+			{
+				xml_node_struct* cur = n;
+
+				// exit from this node so that we don't include descendants
+				while (!cur->next_sibling)
+				{
+					cur = cur->parent;
+
+					if (!cur) return;
+				}
+
+				cur = cur->next_sibling;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+				}
+
+				break;
+			}
+
+			case axis_preceding:
+			{
+				xml_node_struct* cur = n;
+
+				// exit from this node so that we don't include descendants
+				while (!cur->prev_sibling_c->next_sibling)
+				{
+					cur = cur->parent;
+
+					if (!cur) return;
+				}
+
+				cur = cur->prev_sibling_c;
+
+				while (cur)
+				{
+					if (cur->first_child)
+						cur = cur->first_child->prev_sibling_c;
+					else
+					{
+						// leaf node, can't be ancestor
+						if (step_push(ns, cur, alloc) & once)
+							return;
+
+						while (!cur->prev_sibling_c->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+
+							if (!node_is_ancestor(cur, n))
+								if (step_push(ns, cur, alloc) & once)
+									return;
+						}
+
+						cur = cur->prev_sibling_c;
+					}
+				}
+
+				break;
+			}
+
+			case axis_ancestor:
+			case axis_ancestor_or_self:
+			{
+				if (axis == axis_ancestor_or_self)
+					if (step_push(ns, n, alloc) & once)
+						return;
+
+				xml_node_struct* cur = n->parent;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					cur = cur->parent;
+				}
+
+				break;
+			}
+
+			case axis_self:
+			{
+				step_push(ns, n, alloc);
+
+				break;
+			}
+
+			case axis_parent:
+			{
+				if (n->parent)
+					step_push(ns, n->parent, alloc);
+
+				break;
+			}
+
+			default:
+				assert(false && "Unimplemented axis"); // unreachable
+			}
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* p, xpath_allocator* alloc, bool once, T v)
+		{
+			const axis_t axis = T::axis;
+
+			switch (axis)
+			{
+			case axis_ancestor:
+			case axis_ancestor_or_self:
+			{
+				if (axis == axis_ancestor_or_self && _test == nodetest_type_node) // reject attributes based on principal node type test
+					if (step_push(ns, a, p, alloc) & once)
+						return;
+
+				xml_node_struct* cur = p;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					cur = cur->parent;
+				}
+
+				break;
+			}
+
+			case axis_descendant_or_self:
+			case axis_self:
+			{
+				if (_test == nodetest_type_node) // reject attributes based on principal node type test
+					step_push(ns, a, p, alloc);
+
+				break;
+			}
+
+			case axis_following:
+			{
+				xml_node_struct* cur = p;
+
+				while (cur)
+				{
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+
+					if (step_push(ns, cur, alloc) & once)
+						return;
+				}
+
+				break;
+			}
+
+			case axis_parent:
+			{
+				step_push(ns, p, alloc);
+
+				break;
+			}
+
+			case axis_preceding:
+			{
+				// preceding:: axis does not include attribute nodes and attribute ancestors (they are the same as parent's ancestors), so we can reuse node preceding
+				step_fill(ns, p, alloc, once, v);
+				break;
+			}
+
+			default:
+				assert(false && "Unimplemented axis"); // unreachable
+			}
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, const xpath_node& xn, xpath_allocator* alloc, bool once, T v)
+		{
+			const axis_t axis = T::axis;
+			const bool axis_has_attributes = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_descendant_or_self || axis == axis_following || axis == axis_parent || axis == axis_preceding || axis == axis_self);
+
+			if (xn.node())
+				step_fill(ns, xn.node().internal_object(), alloc, once, v);
+			else if (axis_has_attributes && xn.attribute() && xn.parent())
+				step_fill(ns, xn.attribute().internal_object(), xn.parent().internal_object(), alloc, once, v);
+		}
+
+		template <class T> xpath_node_set_raw step_do(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval, T v)
+		{
+			const axis_t axis = T::axis;
+			const bool axis_reverse = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_preceding || axis == axis_preceding_sibling);
+			const xpath_node_set::type_t axis_type = axis_reverse ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
+
+			bool once =
+				(axis == axis_attribute && _test == nodetest_name) ||
+				(!_right && eval_once(axis_type, eval)) ||
+				(_right && !_right->_next && _right->_test == predicate_constant_one);
+
+			xpath_node_set_raw ns;
+			ns.set_type(axis_type);
+
+			if (_left)
+			{
+				xpath_node_set_raw s = _left->eval_node_set(c, stack, nodeset_eval_all);
+
+				// self axis preserves the original order
+				if (axis == axis_self) ns.set_type(s.type());
+
+				for (const xpath_node* it = s.begin(); it != s.end(); ++it)
+				{
+					size_t size = ns.size();
+
+					// in general, all axes generate elements in a particular order, but there is no order guarantee if axis is applied to two nodes
+					if (axis != axis_self && size != 0) ns.set_type(xpath_node_set::type_unsorted);
+
+					step_fill(ns, *it, stack.result, once, v);
+					if (_right) apply_predicates(ns, size, stack, eval);
+				}
+			}
+			else
+			{
+				step_fill(ns, c.n, stack.result, once, v);
+				if (_right) apply_predicates(ns, 0, stack, eval);
+			}
+
+			// child, attribute and self axes always generate unique set of nodes
+			// for other axis, if the set stayed sorted, it stayed unique because the traversal algorithms do not visit the same node twice
+			if (axis != axis_child && axis != axis_attribute && axis != axis_self && ns.type() == xpath_node_set::type_unsorted)
+				ns.remove_duplicates();
+
+			return ns;
+		}
+
+	public:
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_string_constant);
+			_data.string = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, double value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_number_constant);
+			_data.number = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_variable);
+			_data.variable = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0)
+		{
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents):
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(static_cast<char>(axis)), _test(static_cast<char>(test)), _left(left), _right(0), _next(0)
+		{
+			assert(type == ast_step);
+			_data.nodetest = contents;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test):
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast<char>(test)), _left(left), _right(right), _next(0)
+		{
+			assert(type == ast_filter || type == ast_predicate);
+		}
+
+		void set_next(xpath_ast_node* value)
+		{
+			_next = value;
+		}
+
+		void set_right(xpath_ast_node* value)
+		{
+			_right = value;
+		}
+
+		bool eval_boolean(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_op_or:
+				return _left->eval_boolean(c, stack) || _right->eval_boolean(c, stack);
+
+			case ast_op_and:
+				return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack);
+
+			case ast_op_equal:
+				return compare_eq(_left, _right, c, stack, equal_to());
+
+			case ast_op_not_equal:
+				return compare_eq(_left, _right, c, stack, not_equal_to());
+
+			case ast_op_less:
+				return compare_rel(_left, _right, c, stack, less());
+
+			case ast_op_greater:
+				return compare_rel(_right, _left, c, stack, less());
+
+			case ast_op_less_or_equal:
+				return compare_rel(_left, _right, c, stack, less_equal());
+
+			case ast_op_greater_or_equal:
+				return compare_rel(_right, _left, c, stack, less_equal());
+
+			case ast_func_starts_with:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lr = _left->eval_string(c, stack);
+				xpath_string rr = _right->eval_string(c, stack);
+
+				return starts_with(lr.c_str(), rr.c_str());
+			}
+
+			case ast_func_contains:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lr = _left->eval_string(c, stack);
+				xpath_string rr = _right->eval_string(c, stack);
+
+				return find_substring(lr.c_str(), rr.c_str()) != 0;
+			}
+
+			case ast_func_boolean:
+				return _left->eval_boolean(c, stack);
+
+			case ast_func_not:
+				return !_left->eval_boolean(c, stack);
+
+			case ast_func_true:
+				return true;
+
+			case ast_func_false:
+				return false;
+
+			case ast_func_lang:
+			{
+				if (c.n.attribute()) return false;
+
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lang = _left->eval_string(c, stack);
+
+				for (xml_node n = c.n.node(); n; n = n.parent())
+				{
+					xml_attribute a = n.attribute(PUGIXML_TEXT("xml:lang"));
+
+					if (a)
+					{
+						const char_t* value = a.value();
+
+						// strnicmp / strncasecmp is not portable
+						for (const char_t* lit = lang.c_str(); *lit; ++lit)
+						{
+							if (tolower_ascii(*lit) != tolower_ascii(*value)) return false;
+							++value;
+						}
+
+						return *value == 0 || *value == '-';
+					}
+				}
+
+				return false;
+			}
+
+			case ast_opt_compare_attribute:
+			{
+				const char_t* value = (_right->_type == ast_string_constant) ? _right->_data.string : _right->_data.variable->get_string();
+
+				xml_attribute attr = c.n.node().attribute(_left->_data.nodetest);
+
+				return attr && strequal(attr.value(), value) && is_xpath_attribute(attr.name());
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_boolean)
+					return _data.variable->get_boolean();
+			}
+
+			// fallthrough
+			default:
+			{
+				switch (_rettype)
+				{
+				case xpath_type_number:
+					return convert_number_to_boolean(eval_number(c, stack));
+
+				case xpath_type_string:
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					return !eval_string(c, stack).empty();
+				}
+
+				case xpath_type_node_set:
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					return !eval_node_set(c, stack, nodeset_eval_any).empty();
+				}
+
+				default:
+					assert(false && "Wrong expression for return type boolean"); // unreachable
+					return false;
+				}
+			}
+			}
+		}
+
+		double eval_number(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_op_add:
+				return _left->eval_number(c, stack) + _right->eval_number(c, stack);
+
+			case ast_op_subtract:
+				return _left->eval_number(c, stack) - _right->eval_number(c, stack);
+
+			case ast_op_multiply:
+				return _left->eval_number(c, stack) * _right->eval_number(c, stack);
+
+			case ast_op_divide:
+				return _left->eval_number(c, stack) / _right->eval_number(c, stack);
+
+			case ast_op_mod:
+				return fmod(_left->eval_number(c, stack), _right->eval_number(c, stack));
+
+			case ast_op_negate:
+				return -_left->eval_number(c, stack);
+
+			case ast_number_constant:
+				return _data.number;
+
+			case ast_func_last:
+				return static_cast<double>(c.size);
+
+			case ast_func_position:
+				return static_cast<double>(c.position);
+
+			case ast_func_count:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(_left->eval_node_set(c, stack, nodeset_eval_all).size());
+			}
+
+			case ast_func_string_length_0:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(string_value(c.n, stack.result).length());
+			}
+
+			case ast_func_string_length_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(_left->eval_string(c, stack).length());
+			}
+
+			case ast_func_number_0:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return convert_string_to_number(string_value(c.n, stack.result).c_str());
+			}
+
+			case ast_func_number_1:
+				return _left->eval_number(c, stack);
+
+			case ast_func_sum:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				double r = 0;
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* it = ns.begin(); it != ns.end(); ++it)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					r += convert_string_to_number(string_value(*it, stack.result).c_str());
+				}
+
+				return r;
+			}
+
+			case ast_func_floor:
+			{
+				double r = _left->eval_number(c, stack);
+
+				return r == r ? floor(r) : r;
+			}
+
+			case ast_func_ceiling:
+			{
+				double r = _left->eval_number(c, stack);
+
+				return r == r ? ceil(r) : r;
+			}
+
+			case ast_func_round:
+				return round_nearest_nzero(_left->eval_number(c, stack));
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_number)
+					return _data.variable->get_number();
+			}
+
+			// fallthrough
+			default:
+			{
+				switch (_rettype)
+				{
+				case xpath_type_boolean:
+					return eval_boolean(c, stack) ? 1 : 0;
+
+				case xpath_type_string:
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					return convert_string_to_number(eval_string(c, stack).c_str());
+				}
+
+				case xpath_type_node_set:
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					return convert_string_to_number(eval_string(c, stack).c_str());
+				}
+
+				default:
+					assert(false && "Wrong expression for return type number"); // unreachable
+					return 0;
+				}
+
+			}
+			}
+		}
+
+		xpath_string eval_string_concat(const xpath_context& c, const xpath_stack& stack)
+		{
+			assert(_type == ast_func_concat);
+
+			xpath_allocator_capture ct(stack.temp);
+
+			// count the string number
+			size_t count = 1;
+			for (xpath_ast_node* nc = _right; nc; nc = nc->_next) count++;
+
+			// allocate a buffer for temporary string objects
+			xpath_string* buffer = static_cast<xpath_string*>(stack.temp->allocate(count * sizeof(xpath_string)));
+			if (!buffer) return xpath_string();
+
+			// evaluate all strings to temporary stack
+			xpath_stack swapped_stack = {stack.temp, stack.result};
+
+			buffer[0] = _left->eval_string(c, swapped_stack);
+
+			size_t pos = 1;
+			for (xpath_ast_node* n = _right; n; n = n->_next, ++pos) buffer[pos] = n->eval_string(c, swapped_stack);
+			assert(pos == count);
+
+			// get total length
+			size_t length = 0;
+			for (size_t i = 0; i < count; ++i) length += buffer[i].length();
+
+			// create final string
+			char_t* result = static_cast<char_t*>(stack.result->allocate((length + 1) * sizeof(char_t)));
+			if (!result) return xpath_string();
+
+			char_t* ri = result;
+
+			for (size_t j = 0; j < count; ++j)
+				for (const char_t* bi = buffer[j].c_str(); *bi; ++bi)
+					*ri++ = *bi;
+
+			*ri = 0;
+
+			return xpath_string::from_heap_preallocated(result, ri);
+		}
+
+		xpath_string eval_string(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_string_constant:
+				return xpath_string::from_const(_data.string);
+
+			case ast_func_local_name_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(local_name(na));
+			}
+
+			case ast_func_local_name_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(local_name(na));
+			}
+
+			case ast_func_name_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(qualified_name(na));
+			}
+
+			case ast_func_name_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(qualified_name(na));
+			}
+
+			case ast_func_namespace_uri_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(namespace_uri(na));
+			}
+
+			case ast_func_namespace_uri_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(namespace_uri(na));
+			}
+
+			case ast_func_string_0:
+				return string_value(c.n, stack.result);
+
+			case ast_func_string_1:
+				return _left->eval_string(c, stack);
+
+			case ast_func_concat:
+				return eval_string_concat(c, stack);
+
+			case ast_func_substring_before:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				xpath_string p = _right->eval_string(c, swapped_stack);
+
+				const char_t* pos = find_substring(s.c_str(), p.c_str());
+
+				return pos ? xpath_string::from_heap(s.c_str(), pos, stack.result) : xpath_string();
+			}
+
+			case ast_func_substring_after:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				xpath_string p = _right->eval_string(c, swapped_stack);
+
+				const char_t* pos = find_substring(s.c_str(), p.c_str());
+				if (!pos) return xpath_string();
+
+				const char_t* rbegin = pos + p.length();
+				const char_t* rend = s.c_str() + s.length();
+
+				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
+			}
+
+			case ast_func_substring_2:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				size_t s_length = s.length();
+
+				double first = round_nearest(_right->eval_number(c, stack));
+
+				if (is_nan(first)) return xpath_string(); // NaN
+				else if (first >= s_length + 1) return xpath_string();
+
+				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
+				assert(1 <= pos && pos <= s_length + 1);
+
+				const char_t* rbegin = s.c_str() + (pos - 1);
+				const char_t* rend = s.c_str() + s.length();
+
+				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
+			}
+
+			case ast_func_substring_3:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				size_t s_length = s.length();
+
+				double first = round_nearest(_right->eval_number(c, stack));
+				double last = first + round_nearest(_right->_next->eval_number(c, stack));
+
+				if (is_nan(first) || is_nan(last)) return xpath_string();
+				else if (first >= s_length + 1) return xpath_string();
+				else if (first >= last) return xpath_string();
+				else if (last < 1) return xpath_string();
+
+				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
+				size_t end = last >= s_length + 1 ? s_length + 1 : static_cast<size_t>(last);
+
+				assert(1 <= pos && pos <= end && end <= s_length + 1);
+				const char_t* rbegin = s.c_str() + (pos - 1);
+				const char_t* rend = s.c_str() + (end - 1);
+
+				return (end == s_length + 1 && !s.uses_heap()) ? xpath_string::from_const(rbegin) : xpath_string::from_heap(rbegin, rend, stack.result);
+			}
+
+			case ast_func_normalize_space_0:
+			{
+				xpath_string s = string_value(c.n, stack.result);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = normalize_space(begin);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_func_normalize_space_1:
+			{
+				xpath_string s = _left->eval_string(c, stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = normalize_space(begin);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_func_translate:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, stack);
+				xpath_string from = _right->eval_string(c, swapped_stack);
+				xpath_string to = _right->_next->eval_string(c, swapped_stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = translate(begin, from.c_str(), to.c_str(), to.length());
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_opt_translate_table:
+			{
+				xpath_string s = _left->eval_string(c, stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = translate_table(begin, _data.table);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_string)
+					return xpath_string::from_const(_data.variable->get_string());
+			}
+
+			// fallthrough
+			default:
+			{
+				switch (_rettype)
+				{
+				case xpath_type_boolean:
+					return xpath_string::from_const(eval_boolean(c, stack) ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"));
+
+				case xpath_type_number:
+					return convert_number_to_string(eval_number(c, stack), stack.result);
+
+				case xpath_type_node_set:
+				{
+					xpath_allocator_capture cr(stack.temp);
+
+					xpath_stack swapped_stack = {stack.temp, stack.result};
+
+					xpath_node_set_raw ns = eval_node_set(c, swapped_stack, nodeset_eval_first);
+					return ns.empty() ? xpath_string() : string_value(ns.first(), stack.result);
+				}
+
+				default:
+					assert(false && "Wrong expression for return type string"); // unreachable
+					return xpath_string();
+				}
+			}
+			}
+		}
+
+		xpath_node_set_raw eval_node_set(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval)
+		{
+			switch (_type)
+			{
+			case ast_op_union:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_node_set_raw ls = _left->eval_node_set(c, swapped_stack, eval);
+				xpath_node_set_raw rs = _right->eval_node_set(c, stack, eval);
+
+				// we can optimize merging two sorted sets, but this is a very rare operation, so don't bother
+				rs.set_type(xpath_node_set::type_unsorted);
+
+				rs.append(ls.begin(), ls.end(), stack.result);
+				rs.remove_duplicates();
+
+				return rs;
+			}
+
+			case ast_filter:
+			{
+				xpath_node_set_raw set = _left->eval_node_set(c, stack, _test == predicate_constant_one ? nodeset_eval_first : nodeset_eval_all);
+
+				// either expression is a number or it contains position() call; sort by document order
+				if (_test != predicate_posinv) set.sort_do();
+
+				bool once = eval_once(set.type(), eval);
+
+				apply_predicate(set, 0, stack, once);
+
+				return set;
+			}
+
+			case ast_func_id:
+				return xpath_node_set_raw();
+
+			case ast_step:
+			{
+				switch (_axis)
+				{
+				case axis_ancestor:
+					return step_do(c, stack, eval, axis_to_type<axis_ancestor>());
+
+				case axis_ancestor_or_self:
+					return step_do(c, stack, eval, axis_to_type<axis_ancestor_or_self>());
+
+				case axis_attribute:
+					return step_do(c, stack, eval, axis_to_type<axis_attribute>());
+
+				case axis_child:
+					return step_do(c, stack, eval, axis_to_type<axis_child>());
+
+				case axis_descendant:
+					return step_do(c, stack, eval, axis_to_type<axis_descendant>());
+
+				case axis_descendant_or_self:
+					return step_do(c, stack, eval, axis_to_type<axis_descendant_or_self>());
+
+				case axis_following:
+					return step_do(c, stack, eval, axis_to_type<axis_following>());
+
+				case axis_following_sibling:
+					return step_do(c, stack, eval, axis_to_type<axis_following_sibling>());
+
+				case axis_namespace:
+					// namespaced axis is not supported
+					return xpath_node_set_raw();
+
+				case axis_parent:
+					return step_do(c, stack, eval, axis_to_type<axis_parent>());
+
+				case axis_preceding:
+					return step_do(c, stack, eval, axis_to_type<axis_preceding>());
+
+				case axis_preceding_sibling:
+					return step_do(c, stack, eval, axis_to_type<axis_preceding_sibling>());
+
+				case axis_self:
+					return step_do(c, stack, eval, axis_to_type<axis_self>());
+
+				default:
+					assert(false && "Unknown axis"); // unreachable
+					return xpath_node_set_raw();
+				}
+			}
+
+			case ast_step_root:
+			{
+				assert(!_right); // root step can't have any predicates
+
+				xpath_node_set_raw ns;
+
+				ns.set_type(xpath_node_set::type_sorted);
+
+				if (c.n.node()) ns.push_back(c.n.node().root(), stack.result);
+				else if (c.n.attribute()) ns.push_back(c.n.parent().root(), stack.result);
+
+				return ns;
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_node_set)
+				{
+					const xpath_node_set& s = _data.variable->get_node_set();
+
+					xpath_node_set_raw ns;
+
+					ns.set_type(s.type());
+					ns.append(s.begin(), s.end(), stack.result);
+
+					return ns;
+				}
+			}
+
+			// fallthrough
+			default:
+				assert(false && "Wrong expression for return type node set"); // unreachable
+				return xpath_node_set_raw();
+			}
+		}
+
+		void optimize(xpath_allocator* alloc)
+		{
+			if (_left)
+				_left->optimize(alloc);
+
+			if (_right)
+				_right->optimize(alloc);
+
+			if (_next)
+				_next->optimize(alloc);
+
+			optimize_self(alloc);
+		}
+
+		void optimize_self(xpath_allocator* alloc)
+		{
+			// Rewrite [position()=expr] with [expr]
+			// Note that this step has to go before classification to recognize [position()=1]
+			if ((_type == ast_filter || _type == ast_predicate) &&
+				_right->_type == ast_op_equal && _right->_left->_type == ast_func_position && _right->_right->_rettype == xpath_type_number)
+			{
+				_right = _right->_right;
+			}
+
+			// Classify filter/predicate ops to perform various optimizations during evaluation
+			if (_type == ast_filter || _type == ast_predicate)
+			{
+				assert(_test == predicate_default);
+
+				if (_right->_type == ast_number_constant && _right->_data.number == 1.0)
+					_test = predicate_constant_one;
+				else if (_right->_rettype == xpath_type_number && (_right->_type == ast_number_constant || _right->_type == ast_variable || _right->_type == ast_func_last))
+					_test = predicate_constant;
+				else if (_right->_rettype != xpath_type_number && _right->is_posinv_expr())
+					_test = predicate_posinv;
+			}
+
+			// Rewrite descendant-or-self::node()/child::foo with descendant::foo
+			// The former is a full form of //foo, the latter is much faster since it executes the node test immediately
+			// Do a similar kind of rewrite for self/descendant/descendant-or-self axes
+			// Note that we only rewrite positionally invariant steps (//foo[1] != /descendant::foo[1])
+			if (_type == ast_step && (_axis == axis_child || _axis == axis_self || _axis == axis_descendant || _axis == axis_descendant_or_self) && _left &&
+				_left->_type == ast_step && _left->_axis == axis_descendant_or_self && _left->_test == nodetest_type_node && !_left->_right &&
+				is_posinv_step())
+			{
+				if (_axis == axis_child || _axis == axis_descendant)
+					_axis = axis_descendant;
+				else
+					_axis = axis_descendant_or_self;
+
+				_left = _left->_left;
+			}
+
+			// Use optimized lookup table implementation for translate() with constant arguments
+			if (_type == ast_func_translate && _right->_type == ast_string_constant && _right->_next->_type == ast_string_constant)
+			{
+				unsigned char* table = translate_table_generate(alloc, _right->_data.string, _right->_next->_data.string);
+
+				if (table)
+				{
+					_type = ast_opt_translate_table;
+					_data.table = table;
+				}
+			}
+
+			// Use optimized path for @attr = 'value' or @attr = $value
+			if (_type == ast_op_equal &&
+				_left->_type == ast_step && _left->_axis == axis_attribute && _left->_test == nodetest_name && !_left->_left && !_left->_right &&
+				(_right->_type == ast_string_constant || (_right->_type == ast_variable && _right->_rettype == xpath_type_string)))
+			{
+				_type = ast_opt_compare_attribute;
+			}
+		}
+
+		bool is_posinv_expr() const
+		{
+			switch (_type)
+			{
+			case ast_func_position:
+			case ast_func_last:
+				return false;
+
+			case ast_string_constant:
+			case ast_number_constant:
+			case ast_variable:
+				return true;
+
+			case ast_step:
+			case ast_step_root:
+				return true;
+
+			case ast_predicate:
+			case ast_filter:
+				return true;
+
+			default:
+				if (_left && !_left->is_posinv_expr()) return false;
+
+				for (xpath_ast_node* n = _right; n; n = n->_next)
+					if (!n->is_posinv_expr()) return false;
+
+				return true;
+			}
+		}
+
+		bool is_posinv_step() const
+		{
+			assert(_type == ast_step);
+
+			for (xpath_ast_node* n = _right; n; n = n->_next)
+			{
+				assert(n->_type == ast_predicate);
+
+				if (n->_test != predicate_posinv)
+					return false;
+			}
+
+			return true;
+		}
+
+		xpath_value_type rettype() const
+		{
+			return static_cast<xpath_value_type>(_rettype);
+		}
+	};
+
+	struct xpath_parser
+	{
+		xpath_allocator* _alloc;
+		xpath_lexer _lexer;
+
+		const char_t* _query;
+		xpath_variable_set* _variables;
+
+		xpath_parse_result* _result;
+
+		char_t _scratch[32];
+
+		xpath_ast_node* error(const char* message)
+		{
+			_result->error = message;
+			_result->offset = _lexer.current_pos() - _query;
+
+			return 0;
+		}
+
+		xpath_ast_node* error_oom()
+		{
+			assert(_alloc->_error);
+			*_alloc->_error = true;
+
+			return 0;
+		}
+
+		void* alloc_node()
+		{
+			return _alloc->allocate(sizeof(xpath_ast_node));
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, const char_t* value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, double value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_variable* value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = 0, xpath_ast_node* right = 0)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, left, right, test) : 0;
+		}
+
+		const char_t* alloc_string(const xpath_lexer_string& value)
+		{
+			if (!value.begin)
+				return PUGIXML_TEXT("");
+
+			size_t length = static_cast<size_t>(value.end - value.begin);
+
+			char_t* c = static_cast<char_t*>(_alloc->allocate((length + 1) * sizeof(char_t)));
+			if (!c) return 0;
+
+			memcpy(c, value.begin, length * sizeof(char_t));
+			c[length] = 0;
+
+			return c;
+		}
+
+		xpath_ast_node* parse_function(const xpath_lexer_string& name, size_t argc, xpath_ast_node* args[2])
+		{
+			switch (name.begin[0])
+			{
+			case 'b':
+				if (name == PUGIXML_TEXT("boolean") && argc == 1)
+					return alloc_node(ast_func_boolean, xpath_type_boolean, args[0]);
+
+				break;
+
+			case 'c':
+				if (name == PUGIXML_TEXT("count") && argc == 1)
+				{
+					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(ast_func_count, xpath_type_number, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("contains") && argc == 2)
+					return alloc_node(ast_func_contains, xpath_type_boolean, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("concat") && argc >= 2)
+					return alloc_node(ast_func_concat, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("ceiling") && argc == 1)
+					return alloc_node(ast_func_ceiling, xpath_type_number, args[0]);
+
+				break;
+
+			case 'f':
+				if (name == PUGIXML_TEXT("false") && argc == 0)
+					return alloc_node(ast_func_false, xpath_type_boolean);
+				else if (name == PUGIXML_TEXT("floor") && argc == 1)
+					return alloc_node(ast_func_floor, xpath_type_number, args[0]);
+
+				break;
+
+			case 'i':
+				if (name == PUGIXML_TEXT("id") && argc == 1)
+					return alloc_node(ast_func_id, xpath_type_node_set, args[0]);
+
+				break;
+
+			case 'l':
+				if (name == PUGIXML_TEXT("last") && argc == 0)
+					return alloc_node(ast_func_last, xpath_type_number);
+				else if (name == PUGIXML_TEXT("lang") && argc == 1)
+					return alloc_node(ast_func_lang, xpath_type_boolean, args[0]);
+				else if (name == PUGIXML_TEXT("local-name") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_local_name_0 : ast_func_local_name_1, xpath_type_string, args[0]);
+				}
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("name") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_name_0 : ast_func_name_1, xpath_type_string, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("namespace-uri") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_namespace_uri_0 : ast_func_namespace_uri_1, xpath_type_string, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("normalize-space") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_normalize_space_0 : ast_func_normalize_space_1, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("not") && argc == 1)
+					return alloc_node(ast_func_not, xpath_type_boolean, args[0]);
+				else if (name == PUGIXML_TEXT("number") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_number_0 : ast_func_number_1, xpath_type_number, args[0]);
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("position") && argc == 0)
+					return alloc_node(ast_func_position, xpath_type_number);
+
+				break;
+
+			case 'r':
+				if (name == PUGIXML_TEXT("round") && argc == 1)
+					return alloc_node(ast_func_round, xpath_type_number, args[0]);
+
+				break;
+
+			case 's':
+				if (name == PUGIXML_TEXT("string") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_string_0 : ast_func_string_1, xpath_type_string, args[0]);
+				else if (name == PUGIXML_TEXT("string-length") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_string_length_0 : ast_func_string_length_1, xpath_type_number, args[0]);
+				else if (name == PUGIXML_TEXT("starts-with") && argc == 2)
+					return alloc_node(ast_func_starts_with, xpath_type_boolean, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring-before") && argc == 2)
+					return alloc_node(ast_func_substring_before, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring-after") && argc == 2)
+					return alloc_node(ast_func_substring_after, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring") && (argc == 2 || argc == 3))
+					return alloc_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("sum") && argc == 1)
+				{
+					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(ast_func_sum, xpath_type_number, args[0]);
+				}
+
+				break;
+
+			case 't':
+				if (name == PUGIXML_TEXT("translate") && argc == 3)
+					return alloc_node(ast_func_translate, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("true") && argc == 0)
+					return alloc_node(ast_func_true, xpath_type_boolean);
+
+				break;
+
+			default:
+				break;
+			}
+
+			return error("Unrecognized function or wrong parameter count");
+		}
+
+		axis_t parse_axis_name(const xpath_lexer_string& name, bool& specified)
+		{
+			specified = true;
+
+			switch (name.begin[0])
+			{
+			case 'a':
+				if (name == PUGIXML_TEXT("ancestor"))
+					return axis_ancestor;
+				else if (name == PUGIXML_TEXT("ancestor-or-self"))
+					return axis_ancestor_or_self;
+				else if (name == PUGIXML_TEXT("attribute"))
+					return axis_attribute;
+
+				break;
+
+			case 'c':
+				if (name == PUGIXML_TEXT("child"))
+					return axis_child;
+
+				break;
+
+			case 'd':
+				if (name == PUGIXML_TEXT("descendant"))
+					return axis_descendant;
+				else if (name == PUGIXML_TEXT("descendant-or-self"))
+					return axis_descendant_or_self;
+
+				break;
+
+			case 'f':
+				if (name == PUGIXML_TEXT("following"))
+					return axis_following;
+				else if (name == PUGIXML_TEXT("following-sibling"))
+					return axis_following_sibling;
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("namespace"))
+					return axis_namespace;
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("parent"))
+					return axis_parent;
+				else if (name == PUGIXML_TEXT("preceding"))
+					return axis_preceding;
+				else if (name == PUGIXML_TEXT("preceding-sibling"))
+					return axis_preceding_sibling;
+
+				break;
+
+			case 's':
+				if (name == PUGIXML_TEXT("self"))
+					return axis_self;
+
+				break;
+
+			default:
+				break;
+			}
+
+			specified = false;
+			return axis_child;
+		}
+
+		nodetest_t parse_node_test_type(const xpath_lexer_string& name)
+		{
+			switch (name.begin[0])
+			{
+			case 'c':
+				if (name == PUGIXML_TEXT("comment"))
+					return nodetest_type_comment;
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("node"))
+					return nodetest_type_node;
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("processing-instruction"))
+					return nodetest_type_pi;
+
+				break;
+
+			case 't':
+				if (name == PUGIXML_TEXT("text"))
+					return nodetest_type_text;
+
+				break;
+
+			default:
+				break;
+			}
+
+			return nodetest_none;
+		}
+
+		// PrimaryExpr ::= VariableReference | '(' Expr ')' | Literal | Number | FunctionCall
+		xpath_ast_node* parse_primary_expression()
+		{
+			switch (_lexer.current())
+			{
+			case lex_var_ref:
+			{
+				xpath_lexer_string name = _lexer.contents();
+
+				if (!_variables)
+					return error("Unknown variable: variable set is not provided");
+
+				xpath_variable* var = 0;
+				if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var))
+					return error_oom();
+
+				if (!var)
+					return error("Unknown variable: variable set does not contain the given name");
+
+				_lexer.next();
+
+				return alloc_node(ast_variable, var->type(), var);
+			}
+
+			case lex_open_brace:
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = parse_expression();
+				if (!n) return 0;
+
+				if (_lexer.current() != lex_close_brace)
+					return error("Expected ')' to match an opening '('");
+
+				_lexer.next();
+
+				return n;
+			}
+
+			case lex_quoted_string:
+			{
+				const char_t* value = alloc_string(_lexer.contents());
+				if (!value) return 0;
+
+				_lexer.next();
+
+				return alloc_node(ast_string_constant, xpath_type_string, value);
+			}
+
+			case lex_number:
+			{
+				double value = 0;
+
+				if (!convert_string_to_number_scratch(_scratch, _lexer.contents().begin, _lexer.contents().end, &value))
+					return error_oom();
+
+				_lexer.next();
+
+				return alloc_node(ast_number_constant, xpath_type_number, value);
+			}
+
+			case lex_string:
+			{
+				xpath_ast_node* args[2] = {0};
+				size_t argc = 0;
+
+				xpath_lexer_string function = _lexer.contents();
+				_lexer.next();
+
+				xpath_ast_node* last_arg = 0;
+
+				if (_lexer.current() != lex_open_brace)
+					return error("Unrecognized function call");
+				_lexer.next();
+
+				while (_lexer.current() != lex_close_brace)
+				{
+					if (argc > 0)
+					{
+						if (_lexer.current() != lex_comma)
+							return error("No comma between function arguments");
+						_lexer.next();
+					}
+
+					xpath_ast_node* n = parse_expression();
+					if (!n) return 0;
+
+					if (argc < 2) args[argc] = n;
+					else last_arg->set_next(n);
+
+					argc++;
+					last_arg = n;
+				}
+
+				_lexer.next();
+
+				return parse_function(function, argc, args);
+			}
+
+			default:
+				return error("Unrecognizable primary expression");
+			}
+		}
+
+		// FilterExpr ::= PrimaryExpr | FilterExpr Predicate
+		// Predicate ::= '[' PredicateExpr ']'
+		// PredicateExpr ::= Expr
+		xpath_ast_node* parse_filter_expression()
+		{
+			xpath_ast_node* n = parse_primary_expression();
+			if (!n) return 0;
+
+			while (_lexer.current() == lex_open_square_brace)
+			{
+				_lexer.next();
+
+				if (n->rettype() != xpath_type_node_set)
+					return error("Predicate has to be applied to node set");
+
+				xpath_ast_node* expr = parse_expression();
+				if (!expr) return 0;
+
+				n = alloc_node(ast_filter, n, expr, predicate_default);
+				if (!n) return 0;
+
+				if (_lexer.current() != lex_close_square_brace)
+					return error("Expected ']' to match an opening '['");
+
+				_lexer.next();
+			}
+
+			return n;
+		}
+
+		// Step ::= AxisSpecifier NodeTest Predicate* | AbbreviatedStep
+		// AxisSpecifier ::= AxisName '::' | '@'?
+		// NodeTest ::= NameTest | NodeType '(' ')' | 'processing-instruction' '(' Literal ')'
+		// NameTest ::= '*' | NCName ':' '*' | QName
+		// AbbreviatedStep ::= '.' | '..'
+		xpath_ast_node* parse_step(xpath_ast_node* set)
+		{
+			if (set && set->rettype() != xpath_type_node_set)
+				return error("Step has to be applied to node set");
+
+			bool axis_specified = false;
+			axis_t axis = axis_child; // implied child axis
+
+			if (_lexer.current() == lex_axis_attribute)
+			{
+				axis = axis_attribute;
+				axis_specified = true;
+
+				_lexer.next();
+			}
+			else if (_lexer.current() == lex_dot)
+			{
+				_lexer.next();
+
+				if (_lexer.current() == lex_open_square_brace)
+					return error("Predicates are not allowed after an abbreviated step");
+
+				return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0);
+			}
+			else if (_lexer.current() == lex_double_dot)
+			{
+				_lexer.next();
+
+				if (_lexer.current() == lex_open_square_brace)
+					return error("Predicates are not allowed after an abbreviated step");
+
+				return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0);
+			}
+
+			nodetest_t nt_type = nodetest_none;
+			xpath_lexer_string nt_name;
+
+			if (_lexer.current() == lex_string)
+			{
+				// node name test
+				nt_name = _lexer.contents();
+				_lexer.next();
+
+				// was it an axis name?
+				if (_lexer.current() == lex_double_colon)
+				{
+					// parse axis name
+					if (axis_specified)
+						return error("Two axis specifiers in one step");
+
+					axis = parse_axis_name(nt_name, axis_specified);
+
+					if (!axis_specified)
+						return error("Unknown axis");
+
+					// read actual node test
+					_lexer.next();
+
+					if (_lexer.current() == lex_multiply)
+					{
+						nt_type = nodetest_all;
+						nt_name = xpath_lexer_string();
+						_lexer.next();
+					}
+					else if (_lexer.current() == lex_string)
+					{
+						nt_name = _lexer.contents();
+						_lexer.next();
+					}
+					else
+					{
+						return error("Unrecognized node test");
+					}
+				}
+
+				if (nt_type == nodetest_none)
+				{
+					// node type test or processing-instruction
+					if (_lexer.current() == lex_open_brace)
+					{
+						_lexer.next();
+
+						if (_lexer.current() == lex_close_brace)
+						{
+							_lexer.next();
+
+							nt_type = parse_node_test_type(nt_name);
+
+							if (nt_type == nodetest_none)
+								return error("Unrecognized node type");
+
+							nt_name = xpath_lexer_string();
+						}
+						else if (nt_name == PUGIXML_TEXT("processing-instruction"))
+						{
+							if (_lexer.current() != lex_quoted_string)
+								return error("Only literals are allowed as arguments to processing-instruction()");
+
+							nt_type = nodetest_pi;
+							nt_name = _lexer.contents();
+							_lexer.next();
+
+							if (_lexer.current() != lex_close_brace)
+								return error("Unmatched brace near processing-instruction()");
+							_lexer.next();
+						}
+						else
+						{
+							return error("Unmatched brace near node type test");
+						}
+					}
+					// QName or NCName:*
+					else
+					{
+						if (nt_name.end - nt_name.begin > 2 && nt_name.end[-2] == ':' && nt_name.end[-1] == '*') // NCName:*
+						{
+							nt_name.end--; // erase *
+
+							nt_type = nodetest_all_in_namespace;
+						}
+						else
+						{
+							nt_type = nodetest_name;
+						}
+					}
+				}
+			}
+			else if (_lexer.current() == lex_multiply)
+			{
+				nt_type = nodetest_all;
+				_lexer.next();
+			}
+			else
+			{
+				return error("Unrecognized node test");
+			}
+
+			const char_t* nt_name_copy = alloc_string(nt_name);
+			if (!nt_name_copy) return 0;
+
+			xpath_ast_node* n = alloc_node(ast_step, set, axis, nt_type, nt_name_copy);
+			if (!n) return 0;
+
+			xpath_ast_node* last = 0;
+
+			while (_lexer.current() == lex_open_square_brace)
+			{
+				_lexer.next();
+
+				xpath_ast_node* expr = parse_expression();
+				if (!expr) return 0;
+
+				xpath_ast_node* pred = alloc_node(ast_predicate, 0, expr, predicate_default);
+				if (!pred) return 0;
+
+				if (_lexer.current() != lex_close_square_brace)
+					return error("Expected ']' to match an opening '['");
+				_lexer.next();
+
+				if (last) last->set_next(pred);
+				else n->set_right(pred);
+
+				last = pred;
+			}
+
+			return n;
+		}
+
+		// RelativeLocationPath ::= Step | RelativeLocationPath '/' Step | RelativeLocationPath '//' Step
+		xpath_ast_node* parse_relative_location_path(xpath_ast_node* set)
+		{
+			xpath_ast_node* n = parse_step(set);
+			if (!n) return 0;
+
+			while (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
+			{
+				lexeme_t l = _lexer.current();
+				_lexer.next();
+
+				if (l == lex_double_slash)
+				{
+					n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+					if (!n) return 0;
+				}
+
+				n = parse_step(n);
+				if (!n) return 0;
+			}
+
+			return n;
+		}
+
+		// LocationPath ::= RelativeLocationPath | AbsoluteLocationPath
+		// AbsoluteLocationPath ::= '/' RelativeLocationPath? | '//' RelativeLocationPath
+		xpath_ast_node* parse_location_path()
+		{
+			if (_lexer.current() == lex_slash)
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
+				if (!n) return 0;
+
+				// relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path
+				lexeme_t l = _lexer.current();
+
+				if (l == lex_string || l == lex_axis_attribute || l == lex_dot || l == lex_double_dot || l == lex_multiply)
+					return parse_relative_location_path(n);
+				else
+					return n;
+			}
+			else if (_lexer.current() == lex_double_slash)
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
+				if (!n) return 0;
+
+				n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+				if (!n) return 0;
+
+				return parse_relative_location_path(n);
+			}
+
+			// else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1
+			return parse_relative_location_path(0);
+		}
+
+		// PathExpr ::= LocationPath
+		//				| FilterExpr
+		//				| FilterExpr '/' RelativeLocationPath
+		//				| FilterExpr '//' RelativeLocationPath
+		// UnionExpr ::= PathExpr | UnionExpr '|' PathExpr
+		// UnaryExpr ::= UnionExpr | '-' UnaryExpr
+		xpath_ast_node* parse_path_or_unary_expression()
+		{
+			// Clarification.
+			// PathExpr begins with either LocationPath or FilterExpr.
+			// FilterExpr begins with PrimaryExpr
+			// PrimaryExpr begins with '$' in case of it being a variable reference,
+			// '(' in case of it being an expression, string literal, number constant or
+			// function call.
+			if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace ||
+				_lexer.current() == lex_quoted_string || _lexer.current() == lex_number ||
+				_lexer.current() == lex_string)
+			{
+				if (_lexer.current() == lex_string)
+				{
+					// This is either a function call, or not - if not, we shall proceed with location path
+					const char_t* state = _lexer.state();
+
+					while (PUGI__IS_CHARTYPE(*state, ct_space)) ++state;
+
+					if (*state != '(')
+						return parse_location_path();
+
+					// This looks like a function call; however this still can be a node-test. Check it.
+					if (parse_node_test_type(_lexer.contents()) != nodetest_none)
+						return parse_location_path();
+				}
+
+				xpath_ast_node* n = parse_filter_expression();
+				if (!n) return 0;
+
+				if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
+				{
+					lexeme_t l = _lexer.current();
+					_lexer.next();
+
+					if (l == lex_double_slash)
+					{
+						if (n->rettype() != xpath_type_node_set)
+							return error("Step has to be applied to node set");
+
+						n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+						if (!n) return 0;
+					}
+
+					// select from location path
+					return parse_relative_location_path(n);
+				}
+
+				return n;
+			}
+			else if (_lexer.current() == lex_minus)
+			{
+				_lexer.next();
+
+				// precedence 7+ - only parses union expressions
+				xpath_ast_node* n = parse_expression(7);
+				if (!n) return 0;
+
+				return alloc_node(ast_op_negate, xpath_type_number, n);
+			}
+			else
+			{
+				return parse_location_path();
+			}
+		}
+
+		struct binary_op_t
+		{
+			ast_type_t asttype;
+			xpath_value_type rettype;
+			int precedence;
+
+			binary_op_t(): asttype(ast_unknown), rettype(xpath_type_none), precedence(0)
+			{
+			}
+
+			binary_op_t(ast_type_t asttype_, xpath_value_type rettype_, int precedence_): asttype(asttype_), rettype(rettype_), precedence(precedence_)
+			{
+			}
+
+			static binary_op_t parse(xpath_lexer& lexer)
+			{
+				switch (lexer.current())
+				{
+				case lex_string:
+					if (lexer.contents() == PUGIXML_TEXT("or"))
+						return binary_op_t(ast_op_or, xpath_type_boolean, 1);
+					else if (lexer.contents() == PUGIXML_TEXT("and"))
+						return binary_op_t(ast_op_and, xpath_type_boolean, 2);
+					else if (lexer.contents() == PUGIXML_TEXT("div"))
+						return binary_op_t(ast_op_divide, xpath_type_number, 6);
+					else if (lexer.contents() == PUGIXML_TEXT("mod"))
+						return binary_op_t(ast_op_mod, xpath_type_number, 6);
+					else
+						return binary_op_t();
+
+				case lex_equal:
+					return binary_op_t(ast_op_equal, xpath_type_boolean, 3);
+
+				case lex_not_equal:
+					return binary_op_t(ast_op_not_equal, xpath_type_boolean, 3);
+
+				case lex_less:
+					return binary_op_t(ast_op_less, xpath_type_boolean, 4);
+
+				case lex_greater:
+					return binary_op_t(ast_op_greater, xpath_type_boolean, 4);
+
+				case lex_less_or_equal:
+					return binary_op_t(ast_op_less_or_equal, xpath_type_boolean, 4);
+
+				case lex_greater_or_equal:
+					return binary_op_t(ast_op_greater_or_equal, xpath_type_boolean, 4);
+
+				case lex_plus:
+					return binary_op_t(ast_op_add, xpath_type_number, 5);
+
+				case lex_minus:
+					return binary_op_t(ast_op_subtract, xpath_type_number, 5);
+
+				case lex_multiply:
+					return binary_op_t(ast_op_multiply, xpath_type_number, 6);
+
+				case lex_union:
+					return binary_op_t(ast_op_union, xpath_type_node_set, 7);
+
+				default:
+					return binary_op_t();
+				}
+			}
+		};
+
+		xpath_ast_node* parse_expression_rec(xpath_ast_node* lhs, int limit)
+		{
+			binary_op_t op = binary_op_t::parse(_lexer);
+
+			while (op.asttype != ast_unknown && op.precedence >= limit)
+			{
+				_lexer.next();
+
+				xpath_ast_node* rhs = parse_path_or_unary_expression();
+				if (!rhs) return 0;
+
+				binary_op_t nextop = binary_op_t::parse(_lexer);
+
+				while (nextop.asttype != ast_unknown && nextop.precedence > op.precedence)
+				{
+					rhs = parse_expression_rec(rhs, nextop.precedence);
+					if (!rhs) return 0;
+
+					nextop = binary_op_t::parse(_lexer);
+				}
+
+				if (op.asttype == ast_op_union && (lhs->rettype() != xpath_type_node_set || rhs->rettype() != xpath_type_node_set))
+					return error("Union operator has to be applied to node sets");
+
+				lhs = alloc_node(op.asttype, op.rettype, lhs, rhs);
+				if (!lhs) return 0;
+
+				op = binary_op_t::parse(_lexer);
+			}
+
+			return lhs;
+		}
+
+		// Expr ::= OrExpr
+		// OrExpr ::= AndExpr | OrExpr 'or' AndExpr
+		// AndExpr ::= EqualityExpr | AndExpr 'and' EqualityExpr
+		// EqualityExpr ::= RelationalExpr
+		//					| EqualityExpr '=' RelationalExpr
+		//					| EqualityExpr '!=' RelationalExpr
+		// RelationalExpr ::= AdditiveExpr
+		//					  | RelationalExpr '<' AdditiveExpr
+		//					  | RelationalExpr '>' AdditiveExpr
+		//					  | RelationalExpr '<=' AdditiveExpr
+		//					  | RelationalExpr '>=' AdditiveExpr
+		// AdditiveExpr ::= MultiplicativeExpr
+		//					| AdditiveExpr '+' MultiplicativeExpr
+		//					| AdditiveExpr '-' MultiplicativeExpr
+		// MultiplicativeExpr ::= UnaryExpr
+		//						  | MultiplicativeExpr '*' UnaryExpr
+		//						  | MultiplicativeExpr 'div' UnaryExpr
+		//						  | MultiplicativeExpr 'mod' UnaryExpr
+		xpath_ast_node* parse_expression(int limit = 0)
+		{
+			xpath_ast_node* n = parse_path_or_unary_expression();
+			if (!n) return 0;
+
+			return parse_expression_rec(n, limit);
+		}
+
+		xpath_parser(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result): _alloc(alloc), _lexer(query), _query(query), _variables(variables), _result(result)
+		{
+		}
+
+		xpath_ast_node* parse()
+		{
+			xpath_ast_node* n = parse_expression();
+			if (!n) return 0;
+
+			// check if there are unparsed tokens left
+			if (_lexer.current() != lex_eof)
+				return error("Incorrect query");
+
+			return n;
+		}
+
+		static xpath_ast_node* parse(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result)
+		{
+			xpath_parser parser(query, variables, alloc, result);
+
+			return parser.parse();
+		}
+	};
+
+	struct xpath_query_impl
+	{
+		static xpath_query_impl* create()
+		{
+			void* memory = xml_memory::allocate(sizeof(xpath_query_impl));
+			if (!memory) return 0;
+
+			return new (memory) xpath_query_impl();
+		}
+
+		static void destroy(xpath_query_impl* impl)
+		{
+			// free all allocated pages
+			impl->alloc.release();
+
+			// free allocator memory (with the first page)
+			xml_memory::deallocate(impl);
+		}
+
+		xpath_query_impl(): root(0), alloc(&block, &oom), oom(false)
+		{
+			block.next = 0;
+			block.capacity = sizeof(block.data);
+		}
+
+		xpath_ast_node* root;
+		xpath_allocator alloc;
+		xpath_memory_block block;
+		bool oom;
+	};
+
+	PUGI__FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl)
+	{
+		if (!impl) return 0;
+
+		if (impl->root->rettype() != xpath_type_node_set)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return 0;
+		#else
+			xpath_parse_result res;
+			res.error = "Expression does not evaluate to node set";
+
+			throw xpath_exception(res);
+		#endif
+		}
+
+		return impl->root;
+	}
+PUGI__NS_END
+
+namespace pugi
+{
+#ifndef PUGIXML_NO_EXCEPTIONS
+	PUGI__FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_)
+	{
+		assert(_result.error);
+	}
+
+	PUGI__FN const char* xpath_exception::what() const throw()
+	{
+		return _result.error;
+	}
+
+	PUGI__FN const xpath_parse_result& xpath_exception::result() const
+	{
+		return _result;
+	}
+#endif
+
+	PUGI__FN xpath_node::xpath_node()
+	{
+	}
+
+	PUGI__FN xpath_node::xpath_node(const xml_node& node_): _node(node_)
+	{
+	}
+
+	PUGI__FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_)
+	{
+	}
+
+	PUGI__FN xml_node xpath_node::node() const
+	{
+		return _attribute ? xml_node() : _node;
+	}
+
+	PUGI__FN xml_attribute xpath_node::attribute() const
+	{
+		return _attribute;
+	}
+
+	PUGI__FN xml_node xpath_node::parent() const
+	{
+		return _attribute ? _node : _node.parent();
+	}
+
+	PUGI__FN static void unspecified_bool_xpath_node(xpath_node***)
+	{
+	}
+
+	PUGI__FN xpath_node::operator xpath_node::unspecified_bool_type() const
+	{
+		return (_node || _attribute) ? unspecified_bool_xpath_node : 0;
+	}
+
+	PUGI__FN bool xpath_node::operator!() const
+	{
+		return !(_node || _attribute);
+	}
+
+	PUGI__FN bool xpath_node::operator==(const xpath_node& n) const
+	{
+		return _node == n._node && _attribute == n._attribute;
+	}
+
+	PUGI__FN bool xpath_node::operator!=(const xpath_node& n) const
+	{
+		return _node != n._node || _attribute != n._attribute;
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xpath_node& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xpath_node& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_)
+	{
+		assert(begin_ <= end_);
+
+		size_t size_ = static_cast<size_t>(end_ - begin_);
+
+		if (size_ <= 1)
+		{
+			// deallocate old buffer
+			if (_begin != &_storage) impl::xml_memory::deallocate(_begin);
+
+			// use internal buffer
+			if (begin_ != end_) _storage = *begin_;
+
+			_begin = &_storage;
+			_end = &_storage + size_;
+			_type = type_;
+		}
+		else
+		{
+			// make heap copy
+			xpath_node* storage = static_cast<xpath_node*>(impl::xml_memory::allocate(size_ * sizeof(xpath_node)));
+
+			if (!storage)
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				return;
+			#else
+				throw std::bad_alloc();
+			#endif
+			}
+
+			memcpy(storage, begin_, size_ * sizeof(xpath_node));
+
+			// deallocate old buffer
+			if (_begin != &_storage) impl::xml_memory::deallocate(_begin);
+
+			// finalize
+			_begin = storage;
+			_end = storage + size_;
+			_type = type_;
+		}
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT
+	{
+		_type = rhs._type;
+		_storage = rhs._storage;
+		_begin = (rhs._begin == &rhs._storage) ? &_storage : rhs._begin;
+		_end = _begin + (rhs._end - rhs._begin);
+
+		rhs._type = type_unsorted;
+		rhs._begin = &rhs._storage;
+		rhs._end = rhs._begin;
+	}
+#endif
+
+	PUGI__FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(&_storage), _end(&_storage)
+	{
+	}
+
+	PUGI__FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(&_storage), _end(&_storage)
+	{
+		_assign(begin_, end_, type_);
+	}
+
+	PUGI__FN xpath_node_set::~xpath_node_set()
+	{
+		if (_begin != &_storage)
+			impl::xml_memory::deallocate(_begin);
+	}
+
+	PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(&_storage), _end(&_storage)
+	{
+		_assign(ns._begin, ns._end, ns._type);
+	}
+
+	PUGI__FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns)
+	{
+		if (this == &ns) return *this;
+
+		_assign(ns._begin, ns._end, ns._type);
+
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(&_storage), _end(&_storage)
+	{
+		_move(rhs);
+	}
+
+	PUGI__FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		if (this == &rhs) return *this;
+
+		if (_begin != &_storage)
+			impl::xml_memory::deallocate(_begin);
+
+		_move(rhs);
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN xpath_node_set::type_t xpath_node_set::type() const
+	{
+		return _type;
+	}
+
+	PUGI__FN size_t xpath_node_set::size() const
+	{
+		return _end - _begin;
+	}
+
+	PUGI__FN bool xpath_node_set::empty() const
+	{
+		return _begin == _end;
+	}
+
+	PUGI__FN const xpath_node& xpath_node_set::operator[](size_t index) const
+	{
+		assert(index < size());
+		return _begin[index];
+	}
+
+	PUGI__FN xpath_node_set::const_iterator xpath_node_set::begin() const
+	{
+		return _begin;
+	}
+
+	PUGI__FN xpath_node_set::const_iterator xpath_node_set::end() const
+	{
+		return _end;
+	}
+
+	PUGI__FN void xpath_node_set::sort(bool reverse)
+	{
+		_type = impl::xpath_sort(_begin, _end, _type, reverse);
+	}
+
+	PUGI__FN xpath_node xpath_node_set::first() const
+	{
+		return impl::xpath_first(_begin, _end, _type);
+	}
+
+	PUGI__FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0)
+	{
+	}
+
+	PUGI__FN xpath_parse_result::operator bool() const
+	{
+		return error == 0;
+	}
+
+	PUGI__FN const char* xpath_parse_result::description() const
+	{
+		return error ? error : "No error";
+	}
+
+	PUGI__FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0)
+	{
+	}
+
+	PUGI__FN const char_t* xpath_variable::name() const
+	{
+		switch (_type)
+		{
+		case xpath_type_node_set:
+			return static_cast<const impl::xpath_variable_node_set*>(this)->name;
+
+		case xpath_type_number:
+			return static_cast<const impl::xpath_variable_number*>(this)->name;
+
+		case xpath_type_string:
+			return static_cast<const impl::xpath_variable_string*>(this)->name;
+
+		case xpath_type_boolean:
+			return static_cast<const impl::xpath_variable_boolean*>(this)->name;
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+			return 0;
+		}
+	}
+
+	PUGI__FN xpath_value_type xpath_variable::type() const
+	{
+		return _type;
+	}
+
+	PUGI__FN bool xpath_variable::get_boolean() const
+	{
+		return (_type == xpath_type_boolean) ? static_cast<const impl::xpath_variable_boolean*>(this)->value : false;
+	}
+
+	PUGI__FN double xpath_variable::get_number() const
+	{
+		return (_type == xpath_type_number) ? static_cast<const impl::xpath_variable_number*>(this)->value : impl::gen_nan();
+	}
+
+	PUGI__FN const char_t* xpath_variable::get_string() const
+	{
+		const char_t* value = (_type == xpath_type_string) ? static_cast<const impl::xpath_variable_string*>(this)->value : 0;
+		return value ? value : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const xpath_node_set& xpath_variable::get_node_set() const
+	{
+		return (_type == xpath_type_node_set) ? static_cast<const impl::xpath_variable_node_set*>(this)->value : impl::dummy_node_set;
+	}
+
+	PUGI__FN bool xpath_variable::set(bool value)
+	{
+		if (_type != xpath_type_boolean) return false;
+
+		static_cast<impl::xpath_variable_boolean*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(double value)
+	{
+		if (_type != xpath_type_number) return false;
+
+		static_cast<impl::xpath_variable_number*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(const char_t* value)
+	{
+		if (_type != xpath_type_string) return false;
+
+		impl::xpath_variable_string* var = static_cast<impl::xpath_variable_string*>(this);
+
+		// duplicate string
+		size_t size = (impl::strlength(value) + 1) * sizeof(char_t);
+
+		char_t* copy = static_cast<char_t*>(impl::xml_memory::allocate(size));
+		if (!copy) return false;
+
+		memcpy(copy, value, size);
+
+		// replace old string
+		if (var->value) impl::xml_memory::deallocate(var->value);
+		var->value = copy;
+
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(const xpath_node_set& value)
+	{
+		if (_type != xpath_type_node_set) return false;
+
+		static_cast<impl::xpath_variable_node_set*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN xpath_variable_set::xpath_variable_set()
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_data[i] = 0;
+	}
+
+	PUGI__FN xpath_variable_set::~xpath_variable_set()
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_destroy(_data[i]);
+	}
+
+	PUGI__FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs)
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_data[i] = 0;
+
+		_assign(rhs);
+	}
+
+	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs)
+	{
+		if (this == &rhs) return *this;
+
+		_assign(rhs);
+
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			_data[i] = rhs._data[i];
+			rhs._data[i] = 0;
+		}
+	}
+
+	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			_destroy(_data[i]);
+
+			_data[i] = rhs._data[i];
+			rhs._data[i] = 0;
+		}
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN void xpath_variable_set::_assign(const xpath_variable_set& rhs)
+	{
+		xpath_variable_set temp;
+
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			if (rhs._data[i] && !_clone(rhs._data[i], &temp._data[i]))
+				return;
+
+		_swap(temp);
+	}
+
+	PUGI__FN void xpath_variable_set::_swap(xpath_variable_set& rhs)
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			xpath_variable* chain = _data[i];
+
+			_data[i] = rhs._data[i];
+			rhs._data[i] = chain;
+		}
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::_find(const char_t* name) const
+	{
+		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
+		size_t hash = impl::hash_string(name) % hash_size;
+
+		// look for existing variable
+		for (xpath_variable* var = _data[hash]; var; var = var->_next)
+			if (impl::strequal(var->name(), name))
+				return var;
+
+		return 0;
+	}
+
+	PUGI__FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result)
+	{
+		xpath_variable* last = 0;
+
+		while (var)
+		{
+			// allocate storage for new variable
+			xpath_variable* nvar = impl::new_xpath_variable(var->_type, var->name());
+			if (!nvar) return false;
+
+			// link the variable to the result immediately to handle failures gracefully
+			if (last)
+				last->_next = nvar;
+			else
+				*out_result = nvar;
+
+			last = nvar;
+
+			// copy the value; this can fail due to out-of-memory conditions
+			if (!impl::copy_xpath_variable(nvar, var)) return false;
+
+			var = var->_next;
+		}
+
+		return true;
+	}
+
+	PUGI__FN void xpath_variable_set::_destroy(xpath_variable* var)
+	{
+		while (var)
+		{
+			xpath_variable* next = var->_next;
+
+			impl::delete_xpath_variable(var->_type, var);
+
+			var = next;
+		}
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type)
+	{
+		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
+		size_t hash = impl::hash_string(name) % hash_size;
+
+		// look for existing variable
+		for (xpath_variable* var = _data[hash]; var; var = var->_next)
+			if (impl::strequal(var->name(), name))
+				return var->type() == type ? var : 0;
+
+		// add new variable
+		xpath_variable* result = impl::new_xpath_variable(type, name);
+
+		if (result)
+		{
+			result->_next = _data[hash];
+
+			_data[hash] = result;
+		}
+
+		return result;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, bool value)
+	{
+		xpath_variable* var = add(name, xpath_type_boolean);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, double value)
+	{
+		xpath_variable* var = add(name, xpath_type_number);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, const char_t* value)
+	{
+		xpath_variable* var = add(name, xpath_type_string);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value)
+	{
+		xpath_variable* var = add(name, xpath_type_node_set);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::get(const char_t* name)
+	{
+		return _find(name);
+	}
+
+	PUGI__FN const xpath_variable* xpath_variable_set::get(const char_t* name) const
+	{
+		return _find(name);
+	}
+
+	PUGI__FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0)
+	{
+		impl::xpath_query_impl* qimpl = impl::xpath_query_impl::create();
+
+		if (!qimpl)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			_result.error = "Out of memory";
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+		else
+		{
+			using impl::auto_deleter; // MSVC7 workaround
+			auto_deleter<impl::xpath_query_impl> impl(qimpl, impl::xpath_query_impl::destroy);
+
+			qimpl->root = impl::xpath_parser::parse(query, variables, &qimpl->alloc, &_result);
+
+			if (qimpl->root)
+			{
+				qimpl->root->optimize(&qimpl->alloc);
+
+				_impl = impl.release();
+				_result.error = 0;
+			}
+			else
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				if (qimpl->oom) _result.error = "Out of memory";
+			#else
+				if (qimpl->oom) throw std::bad_alloc();
+				throw xpath_exception(_result);
+			#endif
+			}
+		}
+	}
+
+	PUGI__FN xpath_query::xpath_query(): _impl(0)
+	{
+	}
+
+	PUGI__FN xpath_query::~xpath_query()
+	{
+		if (_impl)
+			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	{
+		_impl = rhs._impl;
+		_result = rhs._result;
+		rhs._impl = 0;
+		rhs._result = xpath_parse_result();
+	}
+
+	PUGI__FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	{
+		if (this == &rhs) return *this;
+
+		if (_impl)
+			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
+
+		_impl = rhs._impl;
+		_result = rhs._result;
+		rhs._impl = 0;
+		rhs._result = xpath_parse_result();
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN xpath_value_type xpath_query::return_type() const
+	{
+		if (!_impl) return xpath_type_none;
+
+		return static_cast<impl::xpath_query_impl*>(_impl)->root->rettype();
+	}
+
+	PUGI__FN bool xpath_query::evaluate_boolean(const xpath_node& n) const
+	{
+		if (!_impl) return false;
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		bool r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_boolean(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return false;
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r;
+	}
+
+	PUGI__FN double xpath_query::evaluate_number(const xpath_node& n) const
+	{
+		if (!_impl) return impl::gen_nan();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		double r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_number(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return impl::gen_nan();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r;
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN string_t xpath_query::evaluate_string(const xpath_node& n) const
+	{
+		if (!_impl) return string_t();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_string r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return string_t();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return string_t(r.c_str(), r.length());
+	}
+#endif
+
+	PUGI__FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const
+	{
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_string r = _impl ? static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack) : impl::xpath_string();
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			r = impl::xpath_string();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		size_t full_size = r.length() + 1;
+
+		if (capacity > 0)
+		{
+			size_t size = (full_size < capacity) ? full_size : capacity;
+			assert(size > 0);
+
+			memcpy(buffer, r.c_str(), (size - 1) * sizeof(char_t));
+			buffer[size - 1] = 0;
+		}
+
+		return full_size;
+	}
+
+	PUGI__FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const
+	{
+		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
+		if (!root) return xpath_node_set();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_all);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return xpath_node_set();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return xpath_node_set(r.begin(), r.end(), r.type());
+	}
+
+	PUGI__FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const
+	{
+		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
+		if (!root) return xpath_node();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_first);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return xpath_node();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r.first();
+	}
+
+	PUGI__FN const xpath_parse_result& xpath_query::result() const
+	{
+		return _result;
+	}
+
+	PUGI__FN static void unspecified_bool_xpath_query(xpath_query***)
+	{
+	}
+
+	PUGI__FN xpath_query::operator xpath_query::unspecified_bool_type() const
+	{
+		return _impl ? unspecified_bool_xpath_query : 0;
+	}
+
+	PUGI__FN bool xpath_query::operator!() const
+	{
+		return !_impl;
+	}
+
+	PUGI__FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_node(const xpath_query& query) const
+	{
+		return query.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node_set(*this);
+	}
+
+	PUGI__FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const
+	{
+		return query.evaluate_node_set(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_single_node(const xpath_query& query) const
+	{
+		return query.evaluate_node(*this);
+	}
+}
+
+#endif
+
+#ifdef __BORLANDC__
+#	pragma option pop
+#endif
+
+// Intel C++ does not properly keep warning state for function templates,
+// so popping warning state at the end of translation unit leads to warnings in the middle.
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#	pragma warning(pop)
+#endif
+
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic pop
+#endif
+
+// Undefine all local macros (makes sure we're not leaking macros in header-only mode)
+#undef PUGI__NO_INLINE
+#undef PUGI__UNLIKELY
+#undef PUGI__STATIC_ASSERT
+#undef PUGI__DMC_VOLATILE
+#undef PUGI__UNSIGNED_OVERFLOW
+#undef PUGI__MSVC_CRT_VERSION
+#undef PUGI__SNPRINTF
+#undef PUGI__NS_BEGIN
+#undef PUGI__NS_END
+#undef PUGI__FN
+#undef PUGI__FN_NO_INLINE
+#undef PUGI__GETHEADER_IMPL
+#undef PUGI__GETPAGE_IMPL
+#undef PUGI__GETPAGE
+#undef PUGI__NODETYPE
+#undef PUGI__IS_CHARTYPE_IMPL
+#undef PUGI__IS_CHARTYPE
+#undef PUGI__IS_CHARTYPEX
+#undef PUGI__ENDSWITH
+#undef PUGI__SKIPWS
+#undef PUGI__OPTSET
+#undef PUGI__PUSHNODE
+#undef PUGI__POPNODE
+#undef PUGI__SCANFOR
+#undef PUGI__SCANWHILE
+#undef PUGI__SCANWHILE_UNROLL
+#undef PUGI__ENDSEG
+#undef PUGI__THROW_ERROR
+#undef PUGI__CHECK_ERROR
+
+#endif
+
+/**
+ * Copyright (c) 2006-2018 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugixml.hpp b/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugixml.hpp
new file mode 100644
index 0000000000..d07dc42137
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/pugixml/pugixml.hpp
@@ -0,0 +1,1461 @@
+/**
+ * pugixml parser - version 1.9
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2018, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at http://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef EXT_RMANPKG_24_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_PUGIXML_PUGIXML_HPP
+// Define version macro; evaluates to major * 100 + minor so that it's safe to use in less-than comparisons
+#	define EXT_RMANPKG_24_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_PUGIXML_PUGIXML_HPP 190
+#endif
+
+// Include user configuration file (this can define various configuration macros)
+#include "pugiconfig.hpp"
+
+#ifndef HEADER_PUGIXML_HPP
+#define HEADER_PUGIXML_HPP
+
+// Include stddef.h for size_t and ptrdiff_t
+#include <stddef.h>
+
+// Include exception header for XPath
+#if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS)
+#	include <exception>
+#endif
+
+// Include STL headers
+#ifndef PUGIXML_NO_STL
+#	include <iterator>
+#	include <iosfwd>
+#	include <string>
+#endif
+
+// Macro for deprecated features
+#ifndef PUGIXML_DEPRECATED
+#	if defined(__GNUC__)
+#		define PUGIXML_DEPRECATED __attribute__((deprecated))
+#	elif defined(_MSC_VER) && _MSC_VER >= 1300
+#		define PUGIXML_DEPRECATED __declspec(deprecated)
+#	else
+#		define PUGIXML_DEPRECATED
+#	endif
+#endif
+
+// If no API is defined, assume default
+#ifndef PUGIXML_API
+#	define PUGIXML_API
+#endif
+
+// If no API for classes is defined, assume default
+#ifndef PUGIXML_CLASS
+#	define PUGIXML_CLASS PUGIXML_API
+#endif
+
+// If no API for functions is defined, assume default
+#ifndef PUGIXML_FUNCTION
+#	define PUGIXML_FUNCTION PUGIXML_API
+#endif
+
+// If the platform is known to have long long support, enable long long functions
+#ifndef PUGIXML_HAS_LONG_LONG
+#	if __cplusplus >= 201103
+#		define PUGIXML_HAS_LONG_LONG
+#	elif defined(_MSC_VER) && _MSC_VER >= 1400
+#		define PUGIXML_HAS_LONG_LONG
+#	endif
+#endif
+
+// If the platform is known to have move semantics support, compile move ctor/operator implementation
+#ifndef PUGIXML_HAS_MOVE
+#	if __cplusplus >= 201103
+#		define PUGIXML_HAS_MOVE
+#	elif defined(_MSC_VER) && _MSC_VER >= 1600
+#		define PUGIXML_HAS_MOVE
+#	endif
+#endif
+
+// If C++ is 2011 or higher, add 'noexcept' specifiers
+#ifndef PUGIXML_NOEXCEPT
+#	if __cplusplus >= 201103
+#		define PUGIXML_NOEXCEPT noexcept
+#	elif defined(_MSC_VER) && _MSC_VER >= 1900
+#		define PUGIXML_NOEXCEPT noexcept
+#	else
+#		define PUGIXML_NOEXCEPT
+#	endif
+#endif
+
+// Some functions can not be noexcept in compact mode
+#ifdef PUGIXML_COMPACT
+#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+#else
+#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT
+#endif
+
+// If C++ is 2011 or higher, add 'override' qualifiers
+#ifndef PUGIXML_OVERRIDE
+#	if __cplusplus >= 201103
+#		define PUGIXML_OVERRIDE override
+#	elif defined(_MSC_VER) && _MSC_VER >= 1700
+#		define PUGIXML_OVERRIDE override
+#	else
+#		define PUGIXML_OVERRIDE
+#	endif
+#endif
+
+// Character interface macros
+#ifdef PUGIXML_WCHAR_MODE
+#	define PUGIXML_TEXT(t) L ## t
+#	define PUGIXML_CHAR wchar_t
+#else
+#	define PUGIXML_TEXT(t) t
+#	define PUGIXML_CHAR char
+#endif
+
+namespace pugi
+{
+	// Character type used for all internal storage and operations; depends on PUGIXML_WCHAR_MODE
+	typedef PUGIXML_CHAR char_t;
+
+#ifndef PUGIXML_NO_STL
+	// String type used for operations that work with STL string; depends on PUGIXML_WCHAR_MODE
+	typedef std::basic_string<PUGIXML_CHAR, std::char_traits<PUGIXML_CHAR>, std::allocator<PUGIXML_CHAR> > string_t;
+#endif
+}
+
+// The PugiXML namespace
+namespace pugi
+{
+	// Tree node types
+	enum xml_node_type
+	{
+		node_null,			// Empty (null) node handle
+		node_document,		// A document tree's absolute root
+		node_element,		// Element tag, i.e. '<node/>'
+		node_pcdata,		// Plain character data, i.e. 'text'
+		node_cdata,			// Character data, i.e. '<![CDATA[text]]>'
+		node_comment,		// Comment tag, i.e. '<!-- text -->'
+		node_pi,			// Processing instruction, i.e. '<?name?>'
+		node_declaration,	// Document declaration, i.e. '<?xml version="1.0"?>'
+		node_doctype		// Document type declaration, i.e. '<!DOCTYPE doc>'
+	};
+
+	// Parsing options
+
+	// Minimal parsing mode (equivalent to turning all other flags off).
+	// Only elements and PCDATA sections are added to the DOM tree, no text conversions are performed.
+	const unsigned int parse_minimal = 0x0000;
+
+	// This flag determines if processing instructions (node_pi) are added to the DOM tree. This flag is off by default.
+	const unsigned int parse_pi = 0x0001;
+
+	// This flag determines if comments (node_comment) are added to the DOM tree. This flag is off by default.
+	const unsigned int parse_comments = 0x0002;
+
+	// This flag determines if CDATA sections (node_cdata) are added to the DOM tree. This flag is on by default.
+	const unsigned int parse_cdata = 0x0004;
+
+	// This flag determines if plain character data (node_pcdata) that consist only of whitespace are added to the DOM tree.
+	// This flag is off by default; turning it on usually results in slower parsing and more memory consumption.
+	const unsigned int parse_ws_pcdata = 0x0008;
+
+	// This flag determines if character and entity references are expanded during parsing. This flag is on by default.
+	const unsigned int parse_escapes = 0x0010;
+
+	// This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default.
+	const unsigned int parse_eol = 0x0020;
+
+	// This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default.
+	const unsigned int parse_wconv_attribute = 0x0040;
+
+	// This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default.
+	const unsigned int parse_wnorm_attribute = 0x0080;
+
+	// This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default.
+	const unsigned int parse_declaration = 0x0100;
+
+	// This flag determines if document type declaration (node_doctype) is added to the DOM tree. This flag is off by default.
+	const unsigned int parse_doctype = 0x0200;
+
+	// This flag determines if plain character data (node_pcdata) that is the only child of the parent node and that consists only
+	// of whitespace is added to the DOM tree.
+	// This flag is off by default; turning it on may result in slower parsing and more memory consumption.
+	const unsigned int parse_ws_pcdata_single = 0x0400;
+
+	// This flag determines if leading and trailing whitespace is to be removed from plain character data. This flag is off by default.
+	const unsigned int parse_trim_pcdata = 0x0800;
+
+	// This flag determines if plain character data that does not have a parent node is added to the DOM tree, and if an empty document
+	// is a valid document. This flag is off by default.
+	const unsigned int parse_fragment = 0x1000;
+
+	// This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of
+	// the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments.
+	// This flag is off by default.
+	const unsigned int parse_embed_pcdata = 0x2000;
+
+	// The default parsing mode.
+	// Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded,
+	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
+	const unsigned int parse_default = parse_cdata | parse_escapes | parse_wconv_attribute | parse_eol;
+
+	// The full parsing mode.
+	// Nodes of all types are added to the DOM tree, character/reference entities are expanded,
+	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
+	const unsigned int parse_full = parse_default | parse_pi | parse_comments | parse_declaration | parse_doctype;
+
+	// These flags determine the encoding of input data for XML document
+	enum xml_encoding
+	{
+		encoding_auto,		// Auto-detect input encoding using BOM or < / <? detection; use UTF8 if BOM is not found
+		encoding_utf8,		// UTF8 encoding
+		encoding_utf16_le,	// Little-endian UTF16
+		encoding_utf16_be,	// Big-endian UTF16
+		encoding_utf16,		// UTF16 with native endianness
+		encoding_utf32_le,	// Little-endian UTF32
+		encoding_utf32_be,	// Big-endian UTF32
+		encoding_utf32,		// UTF32 with native endianness
+		encoding_wchar,		// The same encoding wchar_t has (either UTF16 or UTF32)
+		encoding_latin1
+	};
+
+	// Formatting flags
+
+	// Indent the nodes that are written to output stream with as many indentation strings as deep the node is in DOM tree. This flag is on by default.
+	const unsigned int format_indent = 0x01;
+
+	// Write encoding-specific BOM to the output stream. This flag is off by default.
+	const unsigned int format_write_bom = 0x02;
+
+	// Use raw output mode (no indentation and no line breaks are written). This flag is off by default.
+	const unsigned int format_raw = 0x04;
+
+	// Omit default XML declaration even if there is no declaration in the document. This flag is off by default.
+	const unsigned int format_no_declaration = 0x08;
+
+	// Don't escape attribute values and PCDATA contents. This flag is off by default.
+	const unsigned int format_no_escapes = 0x10;
+
+	// Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default.
+	const unsigned int format_save_file_text = 0x20;
+
+	// Write every attribute on a new line with appropriate indentation. This flag is off by default.
+	const unsigned int format_indent_attributes = 0x40;
+
+	// Don't output empty element tags, instead writing an explicit start and end tag even if there are no children. This flag is off by default.
+	const unsigned int format_no_empty_element_tags = 0x80;
+
+	// The default set of formatting flags.
+	// Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none.
+	const unsigned int format_default = format_indent;
+
+	// Forward declarations
+	struct xml_attribute_struct;
+	struct xml_node_struct;
+
+	class xml_node_iterator;
+	class xml_attribute_iterator;
+	class xml_named_node_iterator;
+
+	class xml_tree_walker;
+
+	struct xml_parse_result;
+
+	class xml_node;
+
+	class xml_text;
+
+	#ifndef PUGIXML_NO_XPATH
+	class xpath_node;
+	class xpath_node_set;
+	class xpath_query;
+	class xpath_variable_set;
+	#endif
+
+	// Range-based for loop support
+	template <typename It> class xml_object_range
+	{
+	public:
+		typedef It const_iterator;
+		typedef It iterator;
+
+		xml_object_range(It b, It e): _begin(b), _end(e)
+		{
+		}
+
+		It begin() const { return _begin; }
+		It end() const { return _end; }
+
+	private:
+		It _begin, _end;
+	};
+
+	// Writer interface for node printing (see xml_node::print)
+	class PUGIXML_CLASS xml_writer
+	{
+	public:
+		virtual ~xml_writer() {}
+
+		// Write memory chunk into stream/file/whatever
+		virtual void write(const void* data, size_t size) = 0;
+	};
+
+	// xml_writer implementation for FILE*
+	class PUGIXML_CLASS xml_writer_file: public xml_writer
+	{
+	public:
+		// Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio
+		xml_writer_file(void* file);
+
+		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+
+	private:
+		void* file;
+	};
+
+	#ifndef PUGIXML_NO_STL
+	// xml_writer implementation for streams
+	class PUGIXML_CLASS xml_writer_stream: public xml_writer
+	{
+	public:
+		// Construct writer from an output stream object
+		xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
+		xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);
+
+		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+
+	private:
+		std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
+		std::basic_ostream<wchar_t, std::char_traits<wchar_t> >* wide_stream;
+	};
+	#endif
+
+	// A light-weight handle for manipulating attributes in DOM tree
+	class PUGIXML_CLASS xml_attribute
+	{
+		friend class xml_attribute_iterator;
+		friend class xml_node;
+
+	private:
+		xml_attribute_struct* _attr;
+
+		typedef void (*unspecified_bool_type)(xml_attribute***);
+
+	public:
+		// Default constructor. Constructs an empty attribute.
+		xml_attribute();
+
+		// Constructs attribute from internal pointer
+		explicit xml_attribute(xml_attribute_struct* attr);
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators (compares wrapped attribute pointers)
+		bool operator==(const xml_attribute& r) const;
+		bool operator!=(const xml_attribute& r) const;
+		bool operator<(const xml_attribute& r) const;
+		bool operator>(const xml_attribute& r) const;
+		bool operator<=(const xml_attribute& r) const;
+		bool operator>=(const xml_attribute& r) const;
+
+		// Check if attribute is empty
+		bool empty() const;
+
+		// Get attribute name/value, or "" if attribute is empty
+		const char_t* name() const;
+		const char_t* value() const;
+
+		// Get attribute value, or the default value if attribute is empty
+		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
+
+		// Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty
+		int as_int(int def = 0) const;
+		unsigned int as_uint(unsigned int def = 0) const;
+		double as_double(double def = 0) const;
+		float as_float(float def = 0) const;
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		long long as_llong(long long def = 0) const;
+		unsigned long long as_ullong(unsigned long long def = 0) const;
+	#endif
+
+		// Get attribute value as bool (returns true if first character is in '1tTyY' set), or the default value if attribute is empty
+		bool as_bool(bool def = false) const;
+
+		// Set attribute name/value (returns false if attribute is empty or there is not enough memory)
+		bool set_name(const char_t* rhs);
+		bool set_value(const char_t* rhs);
+
+		// Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
+		bool set_value(int rhs);
+		bool set_value(unsigned int rhs);
+		bool set_value(long rhs);
+		bool set_value(unsigned long rhs);
+		bool set_value(double rhs);
+		bool set_value(float rhs);
+		bool set_value(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		bool set_value(long long rhs);
+		bool set_value(unsigned long long rhs);
+	#endif
+
+		// Set attribute value (equivalent to set_value without error checking)
+		xml_attribute& operator=(const char_t* rhs);
+		xml_attribute& operator=(int rhs);
+		xml_attribute& operator=(unsigned int rhs);
+		xml_attribute& operator=(long rhs);
+		xml_attribute& operator=(unsigned long rhs);
+		xml_attribute& operator=(double rhs);
+		xml_attribute& operator=(float rhs);
+		xml_attribute& operator=(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		xml_attribute& operator=(long long rhs);
+		xml_attribute& operator=(unsigned long long rhs);
+	#endif
+
+		// Get next/previous attribute in the attribute list of the parent node
+		xml_attribute next_attribute() const;
+		xml_attribute previous_attribute() const;
+
+		// Get hash value (unique for handles to the same object)
+		size_t hash_value() const;
+
+		// Get internal pointer
+		xml_attribute_struct* internal_object() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_attribute& lhs, bool rhs);
+#endif
+
+	// A light-weight handle for manipulating nodes in DOM tree
+	class PUGIXML_CLASS xml_node
+	{
+		friend class xml_attribute_iterator;
+		friend class xml_node_iterator;
+		friend class xml_named_node_iterator;
+
+	protected:
+		xml_node_struct* _root;
+
+		typedef void (*unspecified_bool_type)(xml_node***);
+
+	public:
+		// Default constructor. Constructs an empty node.
+		xml_node();
+
+		// Constructs node from internal pointer
+		explicit xml_node(xml_node_struct* p);
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators (compares wrapped node pointers)
+		bool operator==(const xml_node& r) const;
+		bool operator!=(const xml_node& r) const;
+		bool operator<(const xml_node& r) const;
+		bool operator>(const xml_node& r) const;
+		bool operator<=(const xml_node& r) const;
+		bool operator>=(const xml_node& r) const;
+
+		// Check if node is empty.
+		bool empty() const;
+
+		// Get node type
+		xml_node_type type() const;
+
+		// Get node name, or "" if node is empty or it has no name
+		const char_t* name() const;
+
+		// Get node value, or "" if node is empty or it has no value
+		// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.
+		const char_t* value() const;
+
+		// Get attribute list
+		xml_attribute first_attribute() const;
+		xml_attribute last_attribute() const;
+
+		// Get children list
+		xml_node first_child() const;
+		xml_node last_child() const;
+
+		// Get next/previous sibling in the children list of the parent node
+		xml_node next_sibling() const;
+		xml_node previous_sibling() const;
+
+		// Get parent node
+		xml_node parent() const;
+
+		// Get root of DOM tree this node belongs to
+		xml_node root() const;
+
+		// Get text object for the current node
+		xml_text text() const;
+
+		// Get child, attribute or next/previous sibling with the specified name
+		xml_node child(const char_t* name) const;
+		xml_attribute attribute(const char_t* name) const;
+		xml_node next_sibling(const char_t* name) const;
+		xml_node previous_sibling(const char_t* name) const;
+
+		// Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast)
+		xml_attribute attribute(const char_t* name, xml_attribute& hint) const;
+
+		// Get child value of current node; that is, value of the first child node of type PCDATA/CDATA
+		const char_t* child_value() const;
+
+		// Get child value of child with specified name. Equivalent to child(name).child_value().
+		const char_t* child_value(const char_t* name) const;
+
+		// Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value)
+		bool set_name(const char_t* rhs);
+		bool set_value(const char_t* rhs);
+
+		// Add attribute with specified name. Returns added attribute, or empty attribute on errors.
+		xml_attribute append_attribute(const char_t* name);
+		xml_attribute prepend_attribute(const char_t* name);
+		xml_attribute insert_attribute_after(const char_t* name, const xml_attribute& attr);
+		xml_attribute insert_attribute_before(const char_t* name, const xml_attribute& attr);
+
+		// Add a copy of the specified attribute. Returns added attribute, or empty attribute on errors.
+		xml_attribute append_copy(const xml_attribute& proto);
+		xml_attribute prepend_copy(const xml_attribute& proto);
+		xml_attribute insert_copy_after(const xml_attribute& proto, const xml_attribute& attr);
+		xml_attribute insert_copy_before(const xml_attribute& proto, const xml_attribute& attr);
+
+		// Add child node with specified type. Returns added node, or empty node on errors.
+		xml_node append_child(xml_node_type type = node_element);
+		xml_node prepend_child(xml_node_type type = node_element);
+		xml_node insert_child_after(xml_node_type type, const xml_node& node);
+		xml_node insert_child_before(xml_node_type type, const xml_node& node);
+
+		// Add child element with specified name. Returns added node, or empty node on errors.
+		xml_node append_child(const char_t* name);
+		xml_node prepend_child(const char_t* name);
+		xml_node insert_child_after(const char_t* name, const xml_node& node);
+		xml_node insert_child_before(const char_t* name, const xml_node& node);
+
+		// Add a copy of the specified node as a child. Returns added node, or empty node on errors.
+		xml_node append_copy(const xml_node& proto);
+		xml_node prepend_copy(const xml_node& proto);
+		xml_node insert_copy_after(const xml_node& proto, const xml_node& node);
+		xml_node insert_copy_before(const xml_node& proto, const xml_node& node);
+
+		// Move the specified node to become a child of this node. Returns moved node, or empty node on errors.
+		xml_node append_move(const xml_node& moved);
+		xml_node prepend_move(const xml_node& moved);
+		xml_node insert_move_after(const xml_node& moved, const xml_node& node);
+		xml_node insert_move_before(const xml_node& moved, const xml_node& node);
+
+		// Remove specified attribute
+		bool remove_attribute(const xml_attribute& a);
+		bool remove_attribute(const char_t* name);
+
+		// Remove specified child
+		bool remove_child(const xml_node& n);
+		bool remove_child(const char_t* name);
+
+		// Parses buffer as an XML document fragment and appends all nodes as children of the current node.
+		// Copies/converts the buffer, so it may be deleted or changed after the function returns.
+		// Note: append_buffer allocates memory that has the lifetime of the owning document; removing the appended nodes does not immediately reclaim that memory.
+		xml_parse_result append_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Find attribute using predicate. Returns first attribute for which predicate returned true.
+		template <typename Predicate> xml_attribute find_attribute(Predicate pred) const
+		{
+			if (!_root) return xml_attribute();
+
+			for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute())
+				if (pred(attrib))
+					return attrib;
+
+			return xml_attribute();
+		}
+
+		// Find child node using predicate. Returns first child for which predicate returned true.
+		template <typename Predicate> xml_node find_child(Predicate pred) const
+		{
+			if (!_root) return xml_node();
+
+			for (xml_node node = first_child(); node; node = node.next_sibling())
+				if (pred(node))
+					return node;
+
+			return xml_node();
+		}
+
+		// Find node from subtree using predicate. Returns first node from subtree (depth-first), for which predicate returned true.
+		template <typename Predicate> xml_node find_node(Predicate pred) const
+		{
+			if (!_root) return xml_node();
+
+			xml_node cur = first_child();
+
+			while (cur._root && cur._root != _root)
+			{
+				if (pred(cur)) return cur;
+
+				if (cur.first_child()) cur = cur.first_child();
+				else if (cur.next_sibling()) cur = cur.next_sibling();
+				else
+				{
+					while (!cur.next_sibling() && cur._root != _root) cur = cur.parent();
+
+					if (cur._root != _root) cur = cur.next_sibling();
+				}
+			}
+
+			return xml_node();
+		}
+
+		// Find child node by attribute name/value
+		xml_node find_child_by_attribute(const char_t* name, const char_t* attr_name, const char_t* attr_value) const;
+		xml_node find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Get the absolute node path from root as a text string.
+		string_t path(char_t delimiter = '/') const;
+	#endif
+
+		// Search for a node by path consisting of node names and . or .. elements.
+		xml_node first_element_by_path(const char_t* path, char_t delimiter = '/') const;
+
+		// Recursively traverse subtree with xml_tree_walker
+		bool traverse(xml_tree_walker& walker);
+
+	#ifndef PUGIXML_NO_XPATH
+		// Select single node by evaluating XPath query. Returns first node from the resulting node set.
+		xpath_node select_node(const char_t* query, xpath_variable_set* variables = 0) const;
+		xpath_node select_node(const xpath_query& query) const;
+
+		// Select node set by evaluating XPath query
+		xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = 0) const;
+		xpath_node_set select_nodes(const xpath_query& query) const;
+
+		// (deprecated: use select_node instead) Select single node by evaluating XPath query.
+		PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = 0) const;
+		PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const;
+
+	#endif
+
+		// Print subtree using a writer object
+		void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Print subtree to stream
+		void print(std::basic_ostream<char, std::char_traits<char> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+		void print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const;
+	#endif
+
+		// Child nodes iterators
+		typedef xml_node_iterator iterator;
+
+		iterator begin() const;
+		iterator end() const;
+
+		// Attribute iterators
+		typedef xml_attribute_iterator attribute_iterator;
+
+		attribute_iterator attributes_begin() const;
+		attribute_iterator attributes_end() const;
+
+		// Range-based for support
+		xml_object_range<xml_node_iterator> children() const;
+		xml_object_range<xml_named_node_iterator> children(const char_t* name) const;
+		xml_object_range<xml_attribute_iterator> attributes() const;
+
+		// Get node offset in parsed file/string (in char_t units) for debugging purposes
+		ptrdiff_t offset_debug() const;
+
+		// Get hash value (unique for handles to the same object)
+		size_t hash_value() const;
+
+		// Get internal pointer
+		xml_node_struct* internal_object() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_node& lhs, bool rhs);
+#endif
+
+	// A helper for working with text inside PCDATA nodes
+	class PUGIXML_CLASS xml_text
+	{
+		friend class xml_node;
+
+		xml_node_struct* _root;
+
+		typedef void (*unspecified_bool_type)(xml_text***);
+
+		explicit xml_text(xml_node_struct* root);
+
+		xml_node_struct* _data_new();
+		xml_node_struct* _data() const;
+
+	public:
+		// Default constructor. Constructs an empty object.
+		xml_text();
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Check if text object is empty
+		bool empty() const;
+
+		// Get text, or "" if object is empty
+		const char_t* get() const;
+
+		// Get text, or the default value if object is empty
+		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
+
+		// Get text as a number, or the default value if conversion did not succeed or object is empty
+		int as_int(int def = 0) const;
+		unsigned int as_uint(unsigned int def = 0) const;
+		double as_double(double def = 0) const;
+		float as_float(float def = 0) const;
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		long long as_llong(long long def = 0) const;
+		unsigned long long as_ullong(unsigned long long def = 0) const;
+	#endif
+
+		// Get text as bool (returns true if first character is in '1tTyY' set), or the default value if object is empty
+		bool as_bool(bool def = false) const;
+
+		// Set text (returns false if object is empty or there is not enough memory)
+		bool set(const char_t* rhs);
+
+		// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
+		bool set(int rhs);
+		bool set(unsigned int rhs);
+		bool set(long rhs);
+		bool set(unsigned long rhs);
+		bool set(double rhs);
+		bool set(float rhs);
+		bool set(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		bool set(long long rhs);
+		bool set(unsigned long long rhs);
+	#endif
+
+		// Set text (equivalent to set without error checking)
+		xml_text& operator=(const char_t* rhs);
+		xml_text& operator=(int rhs);
+		xml_text& operator=(unsigned int rhs);
+		xml_text& operator=(long rhs);
+		xml_text& operator=(unsigned long rhs);
+		xml_text& operator=(double rhs);
+		xml_text& operator=(float rhs);
+		xml_text& operator=(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		xml_text& operator=(long long rhs);
+		xml_text& operator=(unsigned long long rhs);
+	#endif
+
+		// Get the data node (node_pcdata or node_cdata) for this object
+		xml_node data() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_text& lhs, bool rhs);
+#endif
+
+	// Child node iterator (a bidirectional iterator over a collection of xml_node)
+	class PUGIXML_CLASS xml_node_iterator
+	{
+		friend class xml_node;
+
+	private:
+		mutable xml_node _wrap;
+		xml_node _parent;
+
+		xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent);
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_node value_type;
+		typedef xml_node* pointer;
+		typedef xml_node& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_node_iterator();
+
+		// Construct an iterator which points to the specified node
+		xml_node_iterator(const xml_node& node);
+
+		// Iterator operators
+		bool operator==(const xml_node_iterator& rhs) const;
+		bool operator!=(const xml_node_iterator& rhs) const;
+
+		xml_node& operator*() const;
+		xml_node* operator->() const;
+
+		const xml_node_iterator& operator++();
+		xml_node_iterator operator++(int);
+
+		const xml_node_iterator& operator--();
+		xml_node_iterator operator--(int);
+	};
+
+	// Attribute iterator (a bidirectional iterator over a collection of xml_attribute)
+	class PUGIXML_CLASS xml_attribute_iterator
+	{
+		friend class xml_node;
+
+	private:
+		mutable xml_attribute _wrap;
+		xml_node _parent;
+
+		xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent);
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_attribute value_type;
+		typedef xml_attribute* pointer;
+		typedef xml_attribute& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_attribute_iterator();
+
+		// Construct an iterator which points to the specified attribute
+		xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent);
+
+		// Iterator operators
+		bool operator==(const xml_attribute_iterator& rhs) const;
+		bool operator!=(const xml_attribute_iterator& rhs) const;
+
+		xml_attribute& operator*() const;
+		xml_attribute* operator->() const;
+
+		const xml_attribute_iterator& operator++();
+		xml_attribute_iterator operator++(int);
+
+		const xml_attribute_iterator& operator--();
+		xml_attribute_iterator operator--(int);
+	};
+
+	// Named node range helper
+	class PUGIXML_CLASS xml_named_node_iterator
+	{
+		friend class xml_node;
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_node value_type;
+		typedef xml_node* pointer;
+		typedef xml_node& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_named_node_iterator();
+
+		// Construct an iterator which points to the specified node
+		xml_named_node_iterator(const xml_node& node, const char_t* name);
+
+		// Iterator operators
+		bool operator==(const xml_named_node_iterator& rhs) const;
+		bool operator!=(const xml_named_node_iterator& rhs) const;
+
+		xml_node& operator*() const;
+		xml_node* operator->() const;
+
+		const xml_named_node_iterator& operator++();
+		xml_named_node_iterator operator++(int);
+
+		const xml_named_node_iterator& operator--();
+		xml_named_node_iterator operator--(int);
+
+	private:
+		mutable xml_node _wrap;
+		xml_node _parent;
+		const char_t* _name;
+
+		xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name);
+	};
+
+	// Abstract tree walker class (see xml_node::traverse)
+	class PUGIXML_CLASS xml_tree_walker
+	{
+		friend class xml_node;
+
+	private:
+		int _depth;
+
+	protected:
+		// Get current traversal depth
+		int depth() const;
+
+	public:
+		xml_tree_walker();
+		virtual ~xml_tree_walker();
+
+		// Callback that is called when traversal begins
+		virtual bool begin(xml_node& node);
+
+		// Callback that is called for each node traversed
+		virtual bool for_each(xml_node& node) = 0;
+
+		// Callback that is called when traversal ends
+		virtual bool end(xml_node& node);
+	};
+
+	// Parsing status, returned as part of xml_parse_result object
+	enum xml_parse_status
+	{
+		status_ok = 0,				// No error
+
+		status_file_not_found,		// File was not found during load_file()
+		status_io_error,			// Error reading from file/stream
+		status_out_of_memory,		// Could not allocate memory
+		status_internal_error,		// Internal error occurred
+
+		status_unrecognized_tag,	// Parser could not determine tag type
+
+		status_bad_pi,				// Parsing error occurred while parsing document declaration/processing instruction
+		status_bad_comment,			// Parsing error occurred while parsing comment
+		status_bad_cdata,			// Parsing error occurred while parsing CDATA section
+		status_bad_doctype,			// Parsing error occurred while parsing document type declaration
+		status_bad_pcdata,			// Parsing error occurred while parsing PCDATA section
+		status_bad_start_element,	// Parsing error occurred while parsing start element tag
+		status_bad_attribute,		// Parsing error occurred while parsing element attribute
+		status_bad_end_element,		// Parsing error occurred while parsing end element tag
+		status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag)
+
+		status_append_invalid_root,	// Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer)
+
+		status_no_document_element	// Parsing resulted in a document without element nodes
+	};
+
+	// Parsing result
+	struct PUGIXML_CLASS xml_parse_result
+	{
+		// Parsing status (see xml_parse_status)
+		xml_parse_status status;
+
+		// Last parsed offset (in char_t units from start of input data)
+		ptrdiff_t offset;
+
+		// Source document encoding
+		xml_encoding encoding;
+
+		// Default constructor, initializes object to failed state
+		xml_parse_result();
+
+		// Cast to bool operator
+		operator bool() const;
+
+		// Get error description
+		const char* description() const;
+	};
+
+	// Document class (DOM tree root)
+	class PUGIXML_CLASS xml_document: public xml_node
+	{
+	private:
+		char_t* _buffer;
+
+		char _memory[192];
+
+		// Non-copyable semantics
+		xml_document(const xml_document&);
+		xml_document& operator=(const xml_document&);
+
+		void _create();
+		void _destroy();
+		void _move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+
+	public:
+		// Default constructor, makes empty document
+		xml_document();
+
+		// Destructor, invalidates all node/attribute handles to this document
+		~xml_document();
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+		xml_document& operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+	#endif
+
+		// Removes all nodes, leaving the empty document
+		void reset();
+
+		// Removes all nodes, then copies the entire contents of the specified document
+		void reset(const xml_document& proto);
+
+	#ifndef PUGIXML_NO_STL
+		// Load document from stream.
+		xml_parse_result load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default);
+	#endif
+
+		// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
+		PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
+
+		// Load document from zero-terminated string. No encoding conversions are applied.
+		xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default);
+
+		// Load document from file
+		xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load_file(const wchar_t* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer. Copies/converts the buffer, so it may be deleted or changed after the function returns.
+		xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
+		// You should ensure that buffer data will persist throughout the document's lifetime, and free the buffer memory manually once document is destroyed.
+		xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
+		// You should allocate the buffer with pugixml allocation function; document will free the buffer when it is no longer needed (you can't use it anymore).
+		xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Save XML document to writer (semantics is slightly different from xml_node::print, see documentation for details).
+		void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Save XML document to stream (semantics is slightly different from xml_node::print, see documentation for details).
+		void save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		void save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const;
+	#endif
+
+		// Save XML to file
+		bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		bool save_file(const wchar_t* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+
+		// Get document element
+		xml_node document_element() const;
+	};
+
+#ifndef PUGIXML_NO_XPATH
+	// XPath query return type
+	enum xpath_value_type
+	{
+		xpath_type_none,	  // Unknown type (query failed to compile)
+		xpath_type_node_set,  // Node set (xpath_node_set)
+		xpath_type_number,	  // Number
+		xpath_type_string,	  // String
+		xpath_type_boolean	  // Boolean
+	};
+
+	// XPath parsing result
+	struct PUGIXML_CLASS xpath_parse_result
+	{
+		// Error message (0 if no error)
+		const char* error;
+
+		// Last parsed offset (in char_t units from string start)
+		ptrdiff_t offset;
+
+		// Default constructor, initializes object to failed state
+		xpath_parse_result();
+
+		// Cast to bool operator
+		operator bool() const;
+
+		// Get error description
+		const char* description() const;
+	};
+
+	// A single XPath variable
+	class PUGIXML_CLASS xpath_variable
+	{
+		friend class xpath_variable_set;
+
+	protected:
+		xpath_value_type _type;
+		xpath_variable* _next;
+
+		xpath_variable(xpath_value_type type);
+
+		// Non-copyable semantics
+		xpath_variable(const xpath_variable&);
+		xpath_variable& operator=(const xpath_variable&);
+
+	public:
+		// Get variable name
+		const char_t* name() const;
+
+		// Get variable type
+		xpath_value_type type() const;
+
+		// Get variable value; no type conversion is performed, default value (false, NaN, empty string, empty node set) is returned on type mismatch error
+		bool get_boolean() const;
+		double get_number() const;
+		const char_t* get_string() const;
+		const xpath_node_set& get_node_set() const;
+
+		// Set variable value; no type conversion is performed, false is returned on type mismatch error
+		bool set(bool value);
+		bool set(double value);
+		bool set(const char_t* value);
+		bool set(const xpath_node_set& value);
+	};
+
+	// A set of XPath variables
+	class PUGIXML_CLASS xpath_variable_set
+	{
+	private:
+		xpath_variable* _data[64];
+
+		void _assign(const xpath_variable_set& rhs);
+		void _swap(xpath_variable_set& rhs);
+
+		xpath_variable* _find(const char_t* name) const;
+
+		static bool _clone(xpath_variable* var, xpath_variable** out_result);
+		static void _destroy(xpath_variable* var);
+
+	public:
+		// Default constructor/destructor
+		xpath_variable_set();
+		~xpath_variable_set();
+
+		// Copy constructor/assignment operator
+		xpath_variable_set(const xpath_variable_set& rhs);
+		xpath_variable_set& operator=(const xpath_variable_set& rhs);
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_variable_set& operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Add a new variable or get the existing one, if the types match
+		xpath_variable* add(const char_t* name, xpath_value_type type);
+
+		// Set value of an existing variable; no type conversion is performed, false is returned if there is no such variable or if types mismatch
+		bool set(const char_t* name, bool value);
+		bool set(const char_t* name, double value);
+		bool set(const char_t* name, const char_t* value);
+		bool set(const char_t* name, const xpath_node_set& value);
+
+		// Get existing variable by name
+		xpath_variable* get(const char_t* name);
+		const xpath_variable* get(const char_t* name) const;
+	};
+
+	// A compiled XPath query object
+	class PUGIXML_CLASS xpath_query
+	{
+	private:
+		void* _impl;
+		xpath_parse_result _result;
+
+		typedef void (*unspecified_bool_type)(xpath_query***);
+
+		// Non-copyable semantics
+		xpath_query(const xpath_query&);
+		xpath_query& operator=(const xpath_query&);
+
+	public:
+		// Construct a compiled object from XPath expression.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors.
+		explicit xpath_query(const char_t* query, xpath_variable_set* variables = 0);
+
+		// Constructor
+		xpath_query();
+
+		// Destructor
+		~xpath_query();
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+		xpath_query& operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Get query expression return type
+		xpath_value_type return_type() const;
+
+		// Evaluate expression as boolean value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		bool evaluate_boolean(const xpath_node& n) const;
+
+		// Evaluate expression as double value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		double evaluate_number(const xpath_node& n) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		string_t evaluate_string(const xpath_node& n) const;
+	#endif
+
+		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
+		// At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero).
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty  set instead.
+		size_t evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const;
+
+		// Evaluate expression as node set in the specified context.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node set instead.
+		xpath_node_set evaluate_node_set(const xpath_node& n) const;
+
+		// Evaluate expression as node set in the specified context.
+		// Return first node in document order, or empty node if node set is empty.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node instead.
+		xpath_node evaluate_node(const xpath_node& n) const;
+
+		// Get parsing result (used to get compilation errors in PUGIXML_NO_EXCEPTIONS mode)
+		const xpath_parse_result& result() const;
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+	};
+
+	#ifndef PUGIXML_NO_EXCEPTIONS
+	// XPath exception class
+	class PUGIXML_CLASS xpath_exception: public std::exception
+	{
+	private:
+		xpath_parse_result _result;
+
+	public:
+		// Construct exception from parse result
+		explicit xpath_exception(const xpath_parse_result& result);
+
+		// Get error message
+		virtual const char* what() const throw() PUGIXML_OVERRIDE;
+
+		// Get parse result
+		const xpath_parse_result& result() const;
+	};
+	#endif
+
+	// XPath node class (either xml_node or xml_attribute)
+	class PUGIXML_CLASS xpath_node
+	{
+	private:
+		xml_node _node;
+		xml_attribute _attribute;
+
+		typedef void (*unspecified_bool_type)(xpath_node***);
+
+	public:
+		// Default constructor; constructs empty XPath node
+		xpath_node();
+
+		// Construct XPath node from XML node/attribute
+		xpath_node(const xml_node& node);
+		xpath_node(const xml_attribute& attribute, const xml_node& parent);
+
+		// Get node/attribute, if any
+		xml_node node() const;
+		xml_attribute attribute() const;
+
+		// Get parent of contained node/attribute
+		xml_node parent() const;
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators
+		bool operator==(const xpath_node& n) const;
+		bool operator!=(const xpath_node& n) const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xpath_node& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xpath_node& lhs, bool rhs);
+#endif
+
+	// A fixed-size collection of XPath nodes
+	class PUGIXML_CLASS xpath_node_set
+	{
+	public:
+		// Collection type
+		enum type_t
+		{
+			type_unsorted,			// Not ordered
+			type_sorted,			// Sorted by document order (ascending)
+			type_sorted_reverse		// Sorted by document order (descending)
+		};
+
+		// Constant iterator type
+		typedef const xpath_node* const_iterator;
+
+		// We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work
+		typedef const xpath_node* iterator;
+
+		// Default constructor. Constructs empty set.
+		xpath_node_set();
+
+		// Constructs a set from iterator range; data is not checked for duplicates and is not sorted according to provided type, so be careful
+		xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted);
+
+		// Destructor
+		~xpath_node_set();
+
+		// Copy constructor/assignment operator
+		xpath_node_set(const xpath_node_set& ns);
+		xpath_node_set& operator=(const xpath_node_set& ns);
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_node_set& operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Get collection type
+		type_t type() const;
+
+		// Get collection size
+		size_t size() const;
+
+		// Indexing operator
+		const xpath_node& operator[](size_t index) const;
+
+		// Collection iterators
+		const_iterator begin() const;
+		const_iterator end() const;
+
+		// Sort the collection in ascending/descending order by document order
+		void sort(bool reverse = false);
+
+		// Get first node in the collection by document order
+		xpath_node first() const;
+
+		// Check if collection is empty
+		bool empty() const;
+
+	private:
+		type_t _type;
+
+		xpath_node _storage;
+
+		xpath_node* _begin;
+		xpath_node* _end;
+
+		void _assign(const_iterator begin, const_iterator end, type_t type);
+		void _move(xpath_node_set& rhs) PUGIXML_NOEXCEPT;
+	};
+#endif
+
+#ifndef PUGIXML_NO_STL
+	// Convert wide string to UTF8
+	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const wchar_t* str);
+	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >& str);
+
+	// Convert UTF8 to wide string
+	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const char* str);
+	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& str);
+#endif
+
+	// Memory allocation function interface; returns pointer to allocated memory or NULL on failure
+	typedef void* (*allocation_function)(size_t size);
+
+	// Memory deallocation function interface
+	typedef void (*deallocation_function)(void* ptr);
+
+	// Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions.
+	void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate);
+
+	// Get current memory management functions
+	allocation_function PUGIXML_FUNCTION get_memory_allocation_function();
+	deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function();
+}
+
+#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_named_node_iterator&);
+}
+#endif
+
+#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_node_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_named_node_iterator&);
+}
+#endif
+
+#endif
+
+// Make sure implementation is included in header-only mode
+// Use macro expansion in #include to work around QMake (QTBUG-11923)
+#if defined(PUGIXML_HEADER_ONLY) && !defined(PUGIXML_SOURCE)
+#	define PUGIXML_SOURCE "pugixml.cpp"
+#	include PUGIXML_SOURCE
+#endif
+
+/**
+ * Copyright (c) 2006-2018 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/rmanArgsParser.cpp b/third_party/renderman-26/plugin/rmanArgsParser/rmanArgsParser.cpp
new file mode 100644
index 0000000000..8134422ac5
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/rmanArgsParser.cpp
@@ -0,0 +1,1140 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/base/arch/fileSystem.h"
+#include "pxr/base/arch/library.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/base/gf/vec4f.h"
+#include "pxr/base/gf/matrix4d.h"
+#include "pxr/base/tf/pathUtils.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/tf/stringUtils.h"
+#include "pxr/base/tf/weakPtr.h"
+#include "pxr/base/vt/types.h"
+#include "pxr/base/vt/array.h"
+#include "pxr/usd/ar/ar.h"
+#include "pxr/usd/ar/asset.h"
+#include "pxr/usd/ar/resolvedPath.h"
+#include "pxr/usd/ar/resolver.h"
+#include "pxr/usd/ndr/debugCodes.h"
+#include "pxr/usd/ndr/nodeDiscoveryResult.h"
+#include "pxr/usd/sdf/assetPath.h"
+#include "pxr/usd/sdf/path.h"
+#include "pxr/usd/sdr/shaderMetadataHelpers.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "rmanArgsParser/rmanArgsParser.h"
+#include "rmanArgsParser/pugixml/pugixml.hpp"
+
+using namespace pugi;
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using ShaderMetadataHelpers::CreateStringFromStringVec;
+using ShaderMetadataHelpers::IsPropertyAnAssetIdentifier;
+using ShaderMetadataHelpers::IsPropertyATerminal;
+using ShaderMetadataHelpers::IsTruthy;
+using ShaderMetadataHelpers::OptionVecVal;
+
+NDR_REGISTER_PARSER_PLUGIN(RmanArgsParserPlugin)
+
+namespace {
+    // Pre-constructed xml char strings to make things easier to read
+    const char* nameStr = "name";
+    const char* paramStr = "param";
+    const char* outputStr = "output";
+    const char* helpStr = "help";
+    const char* hintdictStr = "hintdict";
+    const char* hintlistStr = "hintlist";
+    const char* optionsStr = "options";
+    const char* valueStr = "value";
+    const char* tagStr = "tag";
+    const char* tagsStr = "tags";
+    const char* pageStr = "page";
+    const char* primvarsStr = "primvars";
+    const char* departmentsStr = "departments";
+    const char* shaderTypeStr = "shaderType";
+    const char* typeTagStr = "typeTag";
+    const char* usdSchemaDefStr = "usdSchemaDef";
+    const char* apiSchemaAutoApplyToStr = "apiSchemaAutoApplyTo";
+    const char* apiSchemaCanOnlyApplyToStr = "apiSchemaCanOnlyApplyTo";
+    const char* apiSchemasForAttrPruningStr = "apiSchemasForAttrPruning";
+    const char* sdrGlobalConfigStr = "sdrGlobalConfig";
+
+    // Helper to make comparisons of `const char*` easier to read; there are
+    // lots of these comparisons
+    inline bool EQUALS(const char* x, const char* y) {
+        return strcmp(x, y) == 0;
+    }
+}
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+
+    ((discoveryType, "args"))
+    ((sourceType, "RmanCpp"))
+    ((bxdfType, "bxdf"))
+);
+
+// XML attribute names (as they come from the args file). Many attributes are
+// named exactly like the metadata on the node/property, and are not included
+// here because the node and property classes have their own tokens for these.
+TF_DEFINE_PRIVATE_TOKENS(
+    _xmlAttributeNames,
+
+    ((nameAttr, "name"))
+    ((typeAttr, "type"))
+    ((arraySizeAttr, "arraySize"))
+    ((defaultAttr, "default"))
+    ((inputAttr, "input"))
+    ((tagAttr, "tag"))
+    ((vstructmemberAttr, "vstructmember"))
+    ((sdrDefinitionNameAttr, "sdrDefinitionName"))
+);
+
+// Data that represents an SdrShaderNode before it is turned into one. The
+// args file parsing happens recursively, and this is used to pass around a
+// shader node being incrementally constructed.
+struct SdrShaderRepresentation
+{
+    SdrShaderRepresentation(const NdrNodeDiscoveryResult& discoveryResult)
+        : hasSdrDefinitionNameProperty(false), name(discoveryResult.name) {}
+
+    bool hasSdrDefinitionNameProperty;
+    std::string name;
+    std::string helpText;
+    TfToken sdrDefinitionNameFallbackPrefix;
+    NdrStringVec primvars;
+    NdrStringVec departments;
+    NdrStringVec pages;
+    NdrPropertyUniquePtrVec properties;
+    NdrTokenMap metadata;
+
+    // This is the type that the shader declares itself as; this is NOT the
+    // source type
+    TfToken type = SdrPropertyTypes->Unknown;
+};
+
+// Gets a common type + array size (if array) from the property attributes
+static std::tuple<TfToken, size_t> _GetTypeName(
+    const NdrTokenMap& attributes);
+
+// Gets a VtValue instance from a string value and a type, array, metadata
+// hint
+static VtValue _GetVtValue(
+    const std::string& stringValue,
+    TfToken& type,
+    size_t arraySize,
+    const NdrTokenMap& metadata);
+
+// Emits a deprecation warning to the log
+static void _OutputDeprecationWarning(
+    const TfToken& attrName, const SdrShaderRepresentation& shaderRep,
+    const TfToken& propName);
+
+// Parses the given child's data as a preparation to be handed off to
+// `_CreateProperty` to actually be created
+static SdrShaderPropertyUniquePtr _ParseChildElem(
+    const SdrShaderRepresentation& shaderRep, bool isOutput,
+    pugi::xml_node childElement, const std::string& parentPage);
+
+// Creates a SdrShaderProperty with the given inputs
+static SdrShaderPropertyUniquePtr _CreateProperty(
+    const SdrShaderRepresentation& entry, bool isOutput,
+    NdrTokenMap& attributes, NdrStringVec& validConnectionTypes,
+    NdrOptionVec& options);
+
+// Injects any metadata that is generated by the parser. This type of
+// metadata provides additional hints to the property.
+static void _InjectParserMetadata(NdrTokenMap& metadata,
+    const TfToken& typeName);
+
+// Recursively builds up the shaderRep as the shader is parsed
+static void _Parse(SdrShaderRepresentation& shaderRep, pugi::xml_node parent,
+    const std::string& parentPage);
+
+// For each child under the specified parent, get the value of the
+// specified attribute
+static NdrStringVec _GetAttributeValuesFromChildren(
+    pugi::xml_node parent, const char* attrName);
+
+// Helper methods to get a value out of the attr map (or the default value
+// if the key doesn't exist on the map)
+static TfToken _Get(const NdrTokenMap& map, const TfToken& key,
+    TfToken defaultValue);
+
+static int _Get(const NdrTokenMap& map, const TfToken& key,
+    int defaultValue);
+
+static std::string _GetDsoPathFromArgsPath(const std::string &argsPath);
+
+RmanArgsParserPlugin::RmanArgsParserPlugin()
+{
+    // Nothing yet
+}
+
+RmanArgsParserPlugin::~RmanArgsParserPlugin()
+{
+    // Nothing yet
+}
+
+const NdrTokenVec& 
+RmanArgsParserPlugin::GetDiscoveryTypes() const 
+{
+    static const NdrTokenVec discoveryTypes = {_tokens->discoveryType};
+    return discoveryTypes;
+}
+
+const TfToken& 
+RmanArgsParserPlugin::GetSourceType() const
+{
+    return _tokens->sourceType;
+}
+
+static
+bool
+_LoadXmlDoc(const NdrNodeDiscoveryResult& discoveryResult,
+            xml_document *doc)
+{
+    if (!discoveryResult.resolvedUri.empty()) {
+        std::shared_ptr<const char> buffer;
+        std::shared_ptr<ArAsset> asset = ArGetResolver().OpenAsset(
+            ArResolvedPath(discoveryResult.resolvedUri));
+        if (asset) {
+            buffer = asset->GetBuffer();
+        }
+
+        if (!buffer) {
+            TF_WARN("Could not open the args file at URI [%s] (%s). "
+                    "An invalid Sdr node definition will be created.",
+                    discoveryResult.uri.c_str(),
+                    discoveryResult.resolvedUri.c_str());
+                
+            return false;
+        }
+            
+        const xml_parse_result result =
+            doc->load_buffer(buffer.get(), asset->GetSize());
+
+        if (!result) {
+            TF_WARN("Could not parse args file at URI [%s] because the file "
+                    "could not be opened or was malformed. An invalid Sdr node "
+                    "definition will be created. (Error: %s)",
+                    discoveryResult.uri.c_str(),
+                    result.description());
+
+            return false; 
+        }
+
+    } else if (!discoveryResult.sourceCode.empty()) {
+        const xml_parse_result result = 
+            doc->load_string(discoveryResult.sourceCode.c_str());
+
+        if (!result) {
+            TF_WARN("Could not parse given source code for node with identifier"
+                    "'%s' because it was malformed. An invalid Sdr node "
+                    "definition will be created. (Error: %s)", 
+                    discoveryResult.identifier.GetText(),
+                    result.description());
+            return false;
+        }
+
+    } else {
+        TF_WARN("Invalid NdrNodeDiscoveryResult with identifier '%s': both "
+            "resolvedUri and sourceCode fields are empty.", 
+            discoveryResult.identifier.GetText());
+        return false;
+    }
+
+    return true;
+}
+
+// Typically we can use the shaderType as the SdrShaderNode's context, but
+// for these filter types the rman all lower case convention doesn't match
+// our standard camel-case convention. We map these shader types to the correct
+// Sdr context token here.
+static TfToken 
+_GetSdrContextFromShaderType(const TfToken &shaderType)
+{
+    static const std::unordered_map<TfToken, TfToken, TfHash> contextMapping({
+        { TfToken("displayfilter"), SdrNodeContext->DisplayFilter },
+        { TfToken("lightfilter"), SdrNodeContext->LightFilter },
+        { TfToken("pixelfilter"), SdrNodeContext->PixelFilter },
+        { TfToken("samplefilter"), SdrNodeContext->SampleFilter }
+    });
+
+    const auto it = contextMapping.find(shaderType);
+    return it == contextMapping.end() ? shaderType : it->second;
+}
+
+NdrNodeUniquePtr
+RmanArgsParserPlugin::Parse(const NdrNodeDiscoveryResult& discoveryResult)
+{
+    xml_document doc;
+
+    if (!_LoadXmlDoc(discoveryResult, &doc)) {
+        return NdrParserPlugin::GetInvalidNode(discoveryResult);
+    }
+
+    xml_node rootElem = doc.first_child();
+    SdrShaderRepresentation shaderRepresentation(discoveryResult);
+
+    //
+    // Parse the node
+    //
+    _Parse(shaderRepresentation, rootElem, /* page = */ "");
+
+    NdrTokenMap metadata = discoveryResult.metadata;
+    metadata.insert(shaderRepresentation.metadata.begin(), 
+            shaderRepresentation.metadata.end());
+
+    if (!shaderRepresentation.departments.empty()) {
+        metadata[SdrNodeMetadata->Departments] = 
+            CreateStringFromStringVec(shaderRepresentation.departments);
+    }
+
+    if (!shaderRepresentation.pages.empty()) {
+        metadata[SdrNodeMetadata->Pages] = 
+            CreateStringFromStringVec(shaderRepresentation.pages);
+    }
+
+    if (!shaderRepresentation.primvars.empty()) {
+        metadata[SdrNodeMetadata->Primvars] = 
+            CreateStringFromStringVec(shaderRepresentation.primvars);
+    }
+
+    if (!shaderRepresentation.helpText.empty()) {
+        metadata[SdrNodeMetadata->Help] = shaderRepresentation.helpText;
+    }
+
+    return SdrShaderNodeUniquePtr(
+        new SdrShaderNode(
+            discoveryResult.identifier,
+            discoveryResult.version,
+            shaderRepresentation.name,
+            discoveryResult.family,
+            _GetSdrContextFromShaderType(shaderRepresentation.type),
+            _tokens->sourceType,
+            discoveryResult.resolvedUri,
+            _GetDsoPathFromArgsPath(discoveryResult.resolvedUri),
+            std::move(shaderRepresentation.properties),
+            metadata,
+            discoveryResult.sourceCode)
+    );
+}
+
+static std::string
+_GetDsoPathFromArgsPath(const std::string &argsPath)
+{
+    // We assume:
+    // - both the args file at argsPath and the .so it describes are 
+    //   filesystem accessible
+    // -  Given: /path/to/plugins/Args/somePlugin.args ,
+    //    we will locate its dso as:
+    //    /path/to/plugins/somePlugin.so
+    
+    const std::string argsExt(".args");
+    const std::string dsoExt(ARCH_PLUGIN_SUFFIX);
+    
+    std::vector<std::string> pathElts = TfStringSplit(TfNormPath(argsPath), "/");
+
+    if (pathElts.size() < 3 || 
+        !TfStringEndsWith(argsPath, argsExt) ||
+        pathElts[pathElts.size()-2] != "Args") {
+
+        if (pathElts.size() > 1 && pathElts[pathElts.size()-2] != "Args") {
+            TF_DEBUG(NDR_PARSING).Msg("Args file being parsed does not "
+                "live in \"Args\" named parent directory. No "
+                "implementation will be set for the sdr node.\n");
+            return std::string();
+        }
+
+        TF_WARN("Unexpected path for RenderMan args file: %s - "
+                "expected a form like /path/to/plugins/Args/somePlugin.args",
+                argsPath.c_str());
+        return std::string();
+    }
+    
+    std::string  pluginFileName = TfStringReplace(pathElts.back(),
+                                                  argsExt,
+                                                  dsoExt);
+    pathElts.pop_back();
+    pathElts.back() = pluginFileName;
+    
+    return TfStringJoin(pathElts, ARCH_PATH_SEP);
+}
+
+static SdrShaderPropertyUniquePtr
+_ParseChildElem(
+    const SdrShaderRepresentation& shaderRep, bool isOutput,
+    xml_node childElement, const std::string& parentPage)
+{
+    // The bits of data that will later be turned into the shader property
+    NdrTokenMap attributes;
+    NdrOptionVec options;
+    NdrStringVec validConnectionTypes;
+
+    xml_attribute attribute = childElement.first_attribute();
+
+    // Extract all XML properties that exist on this element into the
+    // attributes map. This general collection of attributes will be translated
+    // into data on the SdrShaderProperty at the end of the parse process.
+    // -------------------------------------------------------------------------
+    while (attribute) {
+        attributes.emplace(
+            TfToken(attribute.name()),
+            attribute.value()
+        );
+
+        attribute = attribute.next_attribute();
+    }
+
+    // If page wasn't found in the attributes, use the parent page that was
+    // found via a <page> element
+    if (!parentPage.empty()) {
+        attributes.insert({
+            SdrPropertyMetadata->Page,
+            parentPage
+        });
+    }
+
+    // The properties in the element have been extracted. The next step is
+    // iterating over all of the sub elements to extract more attributes
+    // and/or data (some values need to be extracted into specialized variables
+    // because they are not strings).
+    // -------------------------------------------------------------------------
+    xml_node attrChild = childElement.first_child();
+    while (attrChild) {
+        // Help text
+        // -------------------
+        if (EQUALS(helpStr, attrChild.name())) {
+            // The help element's value might contain HTML, and the HTML should
+            // be included in the value of the help text. Getting the element's
+            // value will cut off anything after the first HTML tag, so instead
+            // capture the raw value of the element via "print". "print" has the
+            // downside that the <help> and </help> tags are included in the
+            // value, so those need to be manually removed. This is a bit of a
+            // sloppy solution, but getting the raw value of the element with
+            // the HTML intact seems to be quite difficult with pugixml. Note
+            // that the "format_no_escapes" option is given so that pugixml does
+            // not change, for example, ">" into "&gt;".
+            std::ostringstream helpStream;
+            attrChild.print(helpStream, /*indent=*/"\t",
+                pugi::format_default | pugi::format_no_escapes);
+            std::string helpText = TfStringTrim(helpStream.str());
+
+            // Not using TfStringReplace() here -- which replaces all
+            // occurrences -- since it _is_ possible that someone decides to
+            // include a <help> tag in the help text itself
+            if (TfStringStartsWith(helpText, "<help>")) {
+                helpText = helpText.substr(6);
+            }
+
+            if (TfStringEndsWith(helpText, "</help>")) {
+                helpText = helpText.substr(0, helpText.size() - 7);
+            }
+
+            attributes[TfToken(helpStr)] = helpText.c_str();
+        }
+
+        // Hint dictionary
+        // -------------------
+        else if (EQUALS(hintdictStr, attrChild.name())) {
+            xml_attribute nameAttr = attrChild.attribute(nameStr);
+
+            if (EQUALS(optionsStr, nameAttr.value())) {
+                xml_node optChild = attrChild.first_child();
+
+                while (optChild) {
+                    const TfToken name(optChild.attribute(nameStr).value());
+                    const TfToken value(optChild.attribute(valueStr).value());
+                    options.emplace_back(std::make_pair(name, value));
+
+                    optChild = optChild.next_sibling();
+                }
+            }
+        }
+
+        // Hint list
+        // -------------------
+        else if (EQUALS(hintlistStr, attrChild.name())) {
+            xml_attribute nameAttr = attrChild.attribute(nameStr);
+
+            if (EQUALS(optionsStr, nameAttr.value())) {
+                xml_node optChild = attrChild.first_child();
+
+                while (optChild) {
+                    const TfToken value(optChild.attribute(valueStr).value());
+                    options.emplace_back(std::make_pair(value, TfToken()));
+
+                    optChild = optChild.next_sibling();
+                }
+            }
+        }
+
+        // Tags
+        // -------------------
+        else if (EQUALS(tagsStr, attrChild.name())) {
+            NdrStringVec connTypes =
+                _GetAttributeValuesFromChildren(attrChild, "value");
+
+            for (const auto& connType : connTypes) {
+                validConnectionTypes.push_back(connType);
+            }
+        }
+
+        attrChild = attrChild.next_sibling();
+    } // end while
+
+
+    // Conform connection types into the standard string-based format that can
+    // be consumed by the shader node
+    // -------------------------------------------------------------------------
+    bool hasTagAttr = attributes.count(_xmlAttributeNames->tagAttr);
+    if (validConnectionTypes.size() || hasTagAttr) {
+        // Merge the tag attr into valid connection types
+        if (hasTagAttr) {
+            validConnectionTypes.push_back(
+                attributes.at(_xmlAttributeNames->tagAttr));
+        }
+
+        attributes.emplace(
+            SdrPropertyMetadata->ValidConnectionTypes,
+            CreateStringFromStringVec(validConnectionTypes)
+        );
+    }
+
+
+    // Manipulate the attributes as needed
+    // -------------------------------------------------------------------------
+    if (attributes.count(SdrPropertyMetadata->Options)) {
+        // Extract any options that were specified as attributes into the
+        // options vector, and remove from the attributes
+
+        NdrOptionVec opts = OptionVecVal(
+            attributes.at(SdrPropertyMetadata->Options)
+        );
+
+        for (const auto& opt : opts) {
+            options.push_back(opt);
+        }
+
+        attributes.erase(SdrPropertyMetadata->Options);
+    }
+
+
+    // Sub elements have been processed. If a type doesn't exist at this point,
+    // make a last-ditch effort to determine what it is.
+    // -------------------------------------------------------------------------
+    if (attributes.count(_xmlAttributeNames->typeAttr) == 0) {
+        // Try to infer it from the valid connection types
+        if (validConnectionTypes.size() > 0) {
+            // Use the first valid type only
+            attributes.emplace(
+                _xmlAttributeNames->typeAttr,
+                validConnectionTypes[0]
+            );
+        }
+    }
+
+    return _CreateProperty(
+        shaderRep, isOutput, attributes, validConnectionTypes, options
+    );
+}
+
+static void
+_Parse(
+    SdrShaderRepresentation& shaderRep, xml_node parent,
+    const std::string& parentPage)
+{
+    xml_node childElement = parent.first_child();
+
+    // Iterate over all children elements
+    // -------------------------------------------------------------------------
+    while (childElement) {
+        bool isInput = EQUALS(paramStr, childElement.name());
+        bool isOutput = EQUALS(outputStr, childElement.name());
+
+        // Handle input/output elements first. They can have sub-elements that
+        // must be accounted for as well. Inputs and outputs at this level do
+        // not belong to a page.
+        // <param> and <output>
+        // ---------------------------------------------------------------------
+        if (isInput || isOutput) {
+            shaderRep.properties.emplace_back(
+                _ParseChildElem(shaderRep, isOutput, childElement, parentPage)
+            );
+            // Query the emplaced property to see if ImplementationName metadata
+            // is added, which would imply sdrDefinitionName was set for this
+            // property, if so save the information in shaderRep. 
+            const NdrTokenMap& propMetadata = 
+                shaderRep.properties.back()->GetMetadata();
+            if (propMetadata.find(SdrPropertyMetadata->ImplementationName) != 
+                    propMetadata.end()) {
+                // We do this here so as to maintain constness for shaderRep in
+                // _ParseChildElem
+                shaderRep.hasSdrDefinitionNameProperty = true;
+            }
+        }
+
+        // SdrGlobalConfig
+        // <sdrGlobalConfig> with named sdr node metadata, example
+        // <sdrDefinitionNameFallbackPrefix>, etc
+        // Note that its assumed that such config will be placed in the 
+        // beginning of an args file. And if this element is found after any
+        // parameter which specified an sdrDefinitionName then we will issue an
+        // error, reporting malformed args file.
+        else if (EQUALS(sdrGlobalConfigStr, childElement.name())) {
+            if (shaderRep.hasSdrDefinitionNameProperty) {
+                TF_CODING_ERROR("Malformed args file: "
+                        "sdrDefinitionNameFallbackPrefix needs to be specified"
+                        "before any parameter's sdrDefinitionName is "
+                        "specified/parsed.");
+                return;
+            }
+            xml_node attrChild = childElement.first_child();
+            while (attrChild) {
+                xml_attribute attrValue = attrChild.attribute(valueStr);
+                shaderRep.metadata.emplace(TfToken(attrChild.name()),
+                        attrValue.value());
+                if (EQUALS(SdrNodeMetadata->SdrDefinitionNameFallbackPrefix
+                            .GetText(), attrChild.name())) {
+                    // Cache sdrDefinitionNameFallbackPrefix token, instead of
+                    // creating a token from sdrNodeMetafdata everytime
+                    // sdrDefinitionNameFallbackPrefix gets used.
+                    shaderRep.sdrDefinitionNameFallbackPrefix = 
+                        TfToken(attrValue.value());
+                }
+                attrChild = attrChild.next_sibling();
+            }
+        }
+
+        // Page
+        // <page name="...">
+        // Pages have inputs (<param> elements) as children; pages can also
+        // have more <page> elements as children
+        // ---------------------------------------------------------------------
+        else if (EQUALS(pageStr, childElement.name())) {
+            const std::string pageName(childElement.attribute(nameStr).value());
+
+            if (parentPage.empty()) {
+                _Parse(shaderRep, childElement, pageName);
+            } else {
+                _Parse(shaderRep, childElement, 
+                        parentPage + 
+                        SdrPropertyTokens->PageDelimiter.GetString() + pageName);
+            }
+        }
+
+        // Help
+        // <help>
+        // ---------------------------------------------------------------------
+        else if (EQUALS(helpStr, childElement.name())) {
+            const char* helpText = childElement.child_value();
+            shaderRep.helpText = helpText;
+        }
+
+        // Primvars
+        // <primvars> with <primvar name="..."> children
+        // ---------------------------------------------------------------------
+        else if (EQUALS(primvarsStr, childElement.name())) {
+            shaderRep.primvars =
+                _GetAttributeValuesFromChildren(childElement, "name");
+        }
+
+        // Departments
+        // <departments> with <department name="..."> children
+        // ---------------------------------------------------------------------
+        else if (EQUALS(departmentsStr, childElement.name())) {
+            shaderRep.departments =
+                _GetAttributeValuesFromChildren(childElement, "name");
+        }
+
+        // Shader type
+        // <shaderType name="..."> OR
+        // <shaderType> with <tag value="..."> children
+        // ---------------------------------------------------------------------
+        else if (EQUALS(shaderTypeStr, childElement.name())) {
+            xml_attribute nameAttr = childElement.attribute(nameStr);
+
+            if (nameAttr) {
+                shaderRep.type = TfToken(nameAttr.value());
+            } else {
+                xml_node attrChild = childElement.first_child();
+
+                if (attrChild && EQUALS(tagStr, attrChild.name())) {
+                    nameAttr = attrChild.attribute(valueStr);
+                    shaderRep.type = TfToken(nameAttr.value());
+                }
+            }
+        }
+
+        // Type tag
+        // <typeTag> with <tag value="..."> children
+        // ---------------------------------------------------------------------
+        else if (EQUALS(typeTagStr, childElement.name())) {
+            xml_node attrChild = childElement.first_child();
+
+            if (attrChild && EQUALS(tagStr, attrChild.name())) {
+                xml_attribute attr = attrChild.attribute(valueStr);
+                shaderRep.type = TfToken(attr.value());
+
+                TF_DEBUG(NDR_PARSING).Msg(
+                    "Deprecated 'typeTag' on shader [%s]", 
+                    shaderRep.name.c_str());
+            }
+
+        }
+
+
+        // UsdSchemaDef
+        // <usdSchemaDef> with named metadata, example
+        // <schemaName>, <schemaKind>, <schemaBase>, <apiSchemaAutoApplyTo>
+        // <apiSchemaAutoApplyTo> is a list of autoApplyTo names (schemas).
+        // <apiSchemaCanOnlyApplyToStr> is a list of autoApplyTo names (schemas).
+        // <apiSchemasForAttrPruning> is a list of apiSchema names (schemas).
+        else if (EQUALS(usdSchemaDefStr, childElement.name())) {
+            xml_node attrChild = childElement.first_child();
+            while(attrChild) {
+                if (EQUALS(apiSchemaAutoApplyToStr, attrChild.name())) {
+                    NdrStringVec apiSchemas = 
+                        _GetAttributeValuesFromChildren(attrChild, "name");
+                    shaderRep.metadata.emplace(
+                            TfToken(apiSchemaAutoApplyToStr),
+                            CreateStringFromStringVec(apiSchemas));
+                } else if (
+                        EQUALS(apiSchemaCanOnlyApplyToStr, attrChild.name())) {
+                    NdrStringVec apiSchemas =
+                        _GetAttributeValuesFromChildren(attrChild, "name");
+                    shaderRep.metadata.emplace(
+                            TfToken(apiSchemaCanOnlyApplyToStr),
+                            CreateStringFromStringVec(apiSchemas));
+                } else if (
+                        EQUALS(apiSchemasForAttrPruningStr, attrChild.name())) {
+                    NdrStringVec apiSchemas =
+                        _GetAttributeValuesFromChildren(attrChild, "name");
+                    shaderRep.metadata.emplace(
+                            TfToken(apiSchemasForAttrPruningStr),
+                            CreateStringFromStringVec(apiSchemas));
+                } else {
+                    xml_attribute attrValue = attrChild.attribute(valueStr);
+                    shaderRep.metadata.emplace(TfToken(attrChild.name()),
+                            attrValue.value());
+                }
+                attrChild = attrChild.next_sibling();
+            }
+        }
+
+        childElement = childElement.next_sibling();
+    }
+}
+
+static std::tuple<TfToken, size_t>
+_GetTypeName(
+    const NdrTokenMap& attributes)
+{
+    // Determine arraySize
+    // -------------------------------------------------------------------------
+    size_t arraySize = _Get(attributes, _xmlAttributeNames->arraySizeAttr, 0);
+
+    // Determine type
+    // -------------------------------------------------------------------------
+    TfToken typeName =
+        _Get(attributes, _xmlAttributeNames->typeAttr, TfToken());
+
+    // 'bxdf' typed attributes are cast to the terminal type of the Sdr library
+    if (typeName == _tokens->bxdfType) {
+        typeName = SdrPropertyTypes->Terminal;
+    }
+    // If the attributes indicates the property is a terminal, then the property
+    // should be SdrPropertyTypes->Terminal
+    else if (IsPropertyATerminal(attributes)) {
+        typeName = SdrPropertyTypes->Terminal;
+    }
+
+    return std::make_tuple(typeName, arraySize);
+}
+
+static VtValue
+_GetVtValue(
+    const std::string& stringValue,
+    TfToken& type,
+    size_t arraySize,
+    const NdrTokenMap& metadata)
+{
+    // Determine array-ness
+    // -------------------------------------------------------------------------
+    int isDynamicArray =
+        IsTruthy(SdrPropertyMetadata->IsDynamicArray, metadata);
+    bool isArray = (arraySize > 0) || isDynamicArray;
+
+    // INT and INT ARRAY
+    // -------------------------------------------------------------------------
+    if (type == SdrPropertyTypes->Int) {
+        if (!isArray) {
+            // If the conversion fails, we get zero
+            return VtValue(atoi(stringValue.c_str()));
+        } else {
+            NdrStringVec parts = TfStringTokenize(stringValue, " ,");
+            int numValues = parts.size();
+            VtIntArray ints(numValues);
+
+            for (int i = 0; i < numValues; ++i) {
+                ints[i] = atoi(parts[i].c_str());
+            }
+
+            return VtValue::Take(ints);
+        }
+    }
+
+    // STRING and STRING ARRAY
+    // -------------------------------------------------------------------------
+    else if (type == SdrPropertyTypes->String) {
+        // Handle non-array
+        if (!isArray) {
+            return VtValue(stringValue);
+        } else {
+            // Handle array
+            VtStringArray array;
+            std::vector<std::string> tokens =
+                TfStringTokenize(stringValue, " ,");
+            array.reserve(tokens.size());
+
+            for (const std::string& token : tokens) {
+                array.push_back(token);
+            }
+
+            return VtValue::Take(array);
+        }
+    }
+
+    // FLOAT and FLOAT ARRAY
+    // -------------------------------------------------------------------------
+    else if (type == SdrPropertyTypes->Float) {
+        if (!isArray) {
+            // If the conversion fails, we get zero
+            return VtValue(static_cast<float>(atof(stringValue.c_str())));
+        } else {
+            NdrStringVec parts = TfStringTokenize(stringValue, " ,");
+            int numValues = parts.size();
+
+            VtFloatArray floats(numValues);
+            for (int i = 0; i < numValues; ++i) {
+                floats[i] = static_cast<float>(atof(parts[i].c_str()));
+            }
+
+            return VtValue::Take(floats);
+        }
+    }
+
+    // VECTOR TYPES and VECTOR TYPE ARRAYS
+    // -------------------------------------------------------------------------
+    else if (type == SdrPropertyTypes->Color  ||
+             type == SdrPropertyTypes->Point  ||
+             type == SdrPropertyTypes->Normal ||
+             type == SdrPropertyTypes->Vector) {
+
+        NdrStringVec parts = TfStringTokenize(stringValue, " ,");
+
+        if (!isArray) {
+            if (parts.size() == 3) {
+                return VtValue(
+                    GfVec3f(atof(parts[0].c_str()),
+                            atof(parts[1].c_str()),
+                            atof(parts[2].c_str()))
+                );
+            } else {
+                TF_DEBUG(NDR_PARSING).Msg(
+                    "float3 default value [%s] has %zd values; should "
+                    "have three.", stringValue.c_str(), parts.size());
+
+                return VtValue(GfVec3f(0.0, 0.0, 0.0));
+            }
+        } else if (isArray && parts.size() % 3 == 0) {
+            int numElements = parts.size() / 3;
+            VtVec3fArray array(numElements);
+
+            for (int i = 0; i < numElements; ++i) {
+                array[i] = GfVec3f(atof(parts[3*i + 0].c_str()),
+                                   atof(parts[3*i + 1].c_str()),
+                                   atof(parts[3*i + 2].c_str()));
+            }
+
+            return VtValue::Take(array);
+        }
+    }
+
+    // MATRIX
+    // -------------------------------------------------------------------------
+    else if (type == SdrPropertyTypes->Matrix) {
+        NdrStringVec parts = TfStringTokenize(stringValue, " ,");
+
+        // XXX no matrix array support
+        if (!isArray && parts.size() == 16) {
+            GfMatrix4d mat;
+            double* values = mat.GetArray();
+
+            for (int i = 0; i < 16; ++i) {
+                values[i] = atof(parts[i].c_str());
+            }
+
+            return VtValue::Take(mat);
+        }
+
+    }
+
+    // STRUCT, TERMINAL, VSTRUCT
+    // -------------------------------------------------------------------------
+    else if (type == SdrPropertyTypes->Struct ||
+             type == SdrPropertyTypes->Terminal ||
+             type == SdrPropertyTypes->Vstruct) {
+        // We return an empty VtValue for Struct, Terminal, and Vstruct
+        // properties because their value may rely on being computed within the
+        // renderer, or we might not have a reasonable way to represent their
+        // value within Sdr
+        return VtValue();
+    }
+
+    // Didn't find a supported type
+    return VtValue();
+}
+
+static void
+_OutputDeprecationWarning(
+    const TfToken& attrName, const SdrShaderRepresentation& shaderRep,
+    const TfToken& propName)
+{
+    TF_DEBUG(NDR_PARSING).Msg(
+        "Deprecated '%s' attribute on shader [%s] on property [%s]",
+        attrName.GetText(), shaderRep.name.c_str(), propName.GetText());
+}
+
+static SdrShaderPropertyUniquePtr
+_CreateProperty(
+    const SdrShaderRepresentation& shaderRep, bool isOutput,
+    NdrTokenMap& attributes, NdrStringVec& validConnectionTypes,
+    NdrOptionVec& options)
+{
+    TfToken propName =
+        _Get(attributes,
+             _xmlAttributeNames->nameAttr,
+             TfToken("NAME UNSPECIFIED"));
+    TfToken definitionName;
+
+    // Get type name, and determine the size of the array (if an array)
+    TfToken typeName;
+    size_t arraySize;
+    std::tie(typeName, arraySize) = _GetTypeName(attributes);
+
+    if (typeName.IsEmpty()) {
+        typeName = SdrPropertyTypes->Unknown;
+
+        TF_DEBUG(NDR_PARSING).Msg(
+            "Property [%s] doesn't have a valid type. "
+            "Neither an explicit type nor a validConnectionType was specified.",
+            propName.GetText());
+    } else {
+        if (isOutput) {
+            _OutputDeprecationWarning(
+                _xmlAttributeNames->typeAttr, shaderRep, propName);
+        }
+    }
+    
+    // The 'tag' attr is deprecated
+    // -------------------------------------------------------------------------
+    if (attributes.count(_xmlAttributeNames->tagAttr)) {
+        _OutputDeprecationWarning(
+            _xmlAttributeNames->tagAttr, shaderRep, propName);
+
+        // Rename to 'validConnectionTypes'
+        attributes.insert({
+            SdrPropertyMetadata->ValidConnectionTypes,
+            attributes.at(_xmlAttributeNames->tagAttr)
+        });
+        attributes.erase(_xmlAttributeNames->tagAttr);
+    }
+
+
+    // More deprecation warnings
+    // -------------------------------------------------------------------------
+    if (attributes.count(_xmlAttributeNames->inputAttr)) {
+        // Just output a warning here; it will be inserted into the hints map
+        // later on
+        _OutputDeprecationWarning(
+            _xmlAttributeNames->inputAttr, shaderRep, propName);
+    }
+
+
+    // Handle vstruct information
+    // -------------------------------------------------------------------------
+    if (attributes.count(_xmlAttributeNames->vstructmemberAttr)) {
+        std::string vstructMember =
+            attributes.at(_xmlAttributeNames->vstructmemberAttr);
+
+        if (!vstructMember.empty()) {
+            // Find the dot that splits struct from member name
+            size_t dotPos = vstructMember.find('.');
+
+            if (dotPos != std::string::npos) {
+                // Add member of to attributes
+                attributes.insert({
+                    SdrPropertyMetadata->VstructMemberOf,
+                    vstructMember.substr(0, dotPos)
+                });
+
+                // Add member name to attributes
+                attributes.insert({
+                    SdrPropertyMetadata->VstructMemberName,
+                    vstructMember.substr(dotPos + 1)
+                });
+            } else {
+                TF_DEBUG(NDR_PARSING).Msg(
+                    "Bad virtual structure member in %s.%s:%s",
+                    shaderRep.name.c_str(), propName.GetText(),
+                    vstructMember.c_str());
+            }
+        }
+    }
+
+    // Handle definitionName, which requires changing propName
+    // -------------------------------------------------------------------------
+    if (attributes.count(_xmlAttributeNames->sdrDefinitionNameAttr)) {
+        TfToken definitionName =
+            TfToken(attributes.at(_xmlAttributeNames->sdrDefinitionNameAttr));
+        
+        attributes[SdrPropertyMetadata->ImplementationName] = propName;
+        propName = definitionName;
+        attributes.erase(_xmlAttributeNames->sdrDefinitionNameAttr);
+    } else if (!shaderRep.sdrDefinitionNameFallbackPrefix.IsEmpty()) {
+        // Args files author should have placed such sdr node metadata before
+        // any sdr shader parameter. Hence we should have this metadata parsed
+        // and available to be used here.
+        TfToken definitionName = TfToken(SdfPath::JoinIdentifier(
+                    shaderRep.sdrDefinitionNameFallbackPrefix, propName));
+        attributes[SdrPropertyMetadata->ImplementationName] = propName;
+        propName = definitionName;
+    }
+ 
+
+    // Put any uncategorized attributes into hints
+    // -------------------------------------------------------------------------
+    NdrTokenMap hints;
+    for (const auto& pair : attributes) {
+        const TfToken attrName = pair.first;
+        const std::string attrValue = pair.second;
+
+        if (std::find(SdrPropertyMetadata->allTokens.begin(),
+                      SdrPropertyMetadata->allTokens.end(),
+                      attrName) != SdrPropertyMetadata->allTokens.end()){
+            continue;
+        }
+
+        if (std::find(_xmlAttributeNames->allTokens.begin(),
+                      _xmlAttributeNames->allTokens.end(),
+                      attrName) != _xmlAttributeNames->allTokens.end()){
+            continue;
+        }
+
+        // Attribute hasn't been handled yet, so put it into the hints dict
+        hints.insert({attrName, attrValue});
+    }
+
+    // Inject any parser-specific metadata into the metadata map
+    _InjectParserMetadata(attributes, typeName);
+
+    // Determine the default value; leave empty if a default isn't found
+    // -------------------------------------------------------------------------
+    const VtValue defaultValue =
+        attributes.count(_xmlAttributeNames->defaultAttr)
+        ? _GetVtValue(attributes.at(_xmlAttributeNames->defaultAttr),
+                      typeName,
+                      arraySize,
+                      attributes)
+        : VtValue();
+
+    return SdrShaderPropertyUniquePtr(
+        new SdrShaderProperty(
+            propName,
+            typeName,
+            defaultValue,
+            isOutput,
+            arraySize,
+            attributes,
+            hints,
+            options
+        )
+    );
+}
+
+static void
+_InjectParserMetadata(NdrTokenMap& metadata,
+                                           const TfToken& typeName)
+{
+    if (typeName == SdrPropertyTypes->String) {
+        if (IsPropertyAnAssetIdentifier(metadata)) {
+            metadata[SdrPropertyMetadata->IsAssetIdentifier] = "";
+        }
+    }
+}
+
+static NdrStringVec
+_GetAttributeValuesFromChildren(
+    xml_node parent, const char* attrName)
+{
+    xml_node child = parent.first_child();
+    NdrStringVec childAttrValues;
+
+    // Iterate over all children and get the attr value
+    while (child) {
+        xml_attribute attr = child.attribute(attrName);
+        childAttrValues.emplace_back(attr.value());
+        child = child.next_sibling();
+    }
+
+    return childAttrValues;
+}
+
+static TfToken
+_Get(
+    const NdrTokenMap& map, const TfToken& key, TfToken defaultValue)
+{
+    typename NdrTokenMap::const_iterator it = map.find(key);
+
+    if (it != map.end()) {
+        return TfToken(it->second);
+    }
+
+    return defaultValue;
+}
+
+static int
+_Get(
+    const NdrTokenMap& map, const TfToken& key, int defaultValue)
+{
+    typename NdrTokenMap::const_iterator it = map.find(key);
+
+    if (it != map.end()) {
+        int value = defaultValue;
+
+        try {
+            value = stoi(it->second);
+        } catch (...) {
+            TF_DEBUG(NDR_PARSING).Msg(
+                "Attribute [%s] with string value [%s] "
+                "couldn't be converted to int.", 
+                key.GetText(), it->second.c_str());
+        }
+
+        return value;
+    }
+
+    return defaultValue;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/rmanArgsParser.h b/third_party/renderman-26/plugin/rmanArgsParser/rmanArgsParser.h
new file mode 100644
index 0000000000..be4b749f9e
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/rmanArgsParser.h
@@ -0,0 +1,122 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_RMAN_ARGS_PARSER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_RMAN_ARGS_PARSER_H
+
+/// \file rmanArgsParser/rmanArgsParser.h
+
+#include "pxr/pxr.h"
+#include "rmanArgsParser/api.h"
+#include "pxr/usd/ndr/parserPlugin.h"
+
+#include <map>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class RmanArgsParserPlugin
+///
+/// Parses Args files. For more information on parser plugins, see the
+/// documentation for `NdrParserPlugin`.
+///
+/// \section schema Schema
+/// The following elements, along with their attributes (italics) and child
+/// elements, are respected in this parser:
+///
+/// * <param> and <output>
+///   * <help>
+///   * <hintdict>
+///     * <string>
+///       * _name_
+///       * _value_
+///     * _name_
+///   * <hintlist>
+///     * <string>
+///       * _value_
+///     * _name_
+///   * <tags>
+///     * <tag>
+///       * _value_
+///   * _name_
+///   * _type_ *!* (deprecated on outputs only)
+///   * _default_
+///   * _label_
+///   * _widget_
+///   * _arraySize_
+///   * _isDynamicArray_
+///   * _connectable_
+///   * _options_
+///   * _page_
+///   * _input_ *!*
+///   * _help_
+///   * _tag_ *!*
+///   * _validConnectionTypes_
+///   * _vstructmember_
+///   * _sdrDefinitionName_ (renames parameter, sends original args param name to
+///                          SdrShaderProperty::GetImplementationName())
+///   * Note: other uncategorized attributes are available via NdrNode::GetHints()
+/// * <page> _Can be nested_
+///   * _name_
+/// * <help>
+/// * <primvars>
+///   * <primvar>
+///     * _name_
+/// * <departments>
+/// * <shaderType>
+///   * _name_
+///   * <tag>
+///     * _value_
+/// * <typeTag> *!*
+///   * <tag>
+///     * _value_
+/// * <usdSchemaDef>
+///   * <metadataKey> (this specified a metadata key with an appropriate
+///                    value, example "schemaName", schemaKind", etc. Refer
+///                    UsdUtilsUpdateSchemaFromSdr for all valid metadata keys 
+///                    for usdSchemaDef)
+///     * _value_
+///   * <apiSchemaAutoApplyTo>
+///     * <autoApplyTo>
+///       * _value_
+///   * <apiSchemaCanOnlyApplyTo>
+///     * <autoApplyTo>
+///       * _value_
+///   * <apiSchemasForAttrPruning>
+///     * <apiSchema>
+///       * _value_
+/// * <sdrGlobalConfig>
+///   * <sdrDefinitionNameFallbackPrefix> (Used as a prefix for parameters that
+///                                        do not have an explicit
+///                                        _sdrDefinitionName_ provided.)
+///     * _value_
+///
+/// For more information on the specifics of what any of these elements or
+/// attributes mean, see the Renderman documentation on the Args format. Items
+/// marked with a '!' are deprecated and will output a warning.
+///
+class RmanArgsParserPlugin : public NdrParserPlugin
+{
+public:
+    RMAN_ARGS_PARSER_API
+    RmanArgsParserPlugin();
+    RMAN_ARGS_PARSER_API
+    ~RmanArgsParserPlugin();
+
+    RMAN_ARGS_PARSER_API
+    NdrNodeUniquePtr Parse(const NdrNodeDiscoveryResult& discoveryRes) override;
+
+    RMAN_ARGS_PARSER_API
+    const NdrTokenVec& GetDiscoveryTypes() const override;
+
+    RMAN_ARGS_PARSER_API
+    const TfToken& GetSourceType() const override;
+};
+
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_ARGS_PARSER_RMAN_ARGS_PARSER_H
diff --git a/third_party/renderman-26/plugin/rmanArgsParser/wrapRmanArgsParser.cpp b/third_party/renderman-26/plugin/rmanArgsParser/wrapRmanArgsParser.cpp
new file mode 100644
index 0000000000..8e6744034b
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanArgsParser/wrapRmanArgsParser.cpp
@@ -0,0 +1,43 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/pxr.h"
+#include "pxr/usd/ndr/node.h"
+#include "pxr/usd/ndr/nodeDiscoveryResult.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "rmanArgsParser/rmanArgsParser.h"
+
+#include <boost/python.hpp>
+
+using namespace boost::python;
+
+PXR_NAMESPACE_USING_DIRECTIVE
+
+// Expose the unique_ptr returned from `Parse()` as a raw ptr. The Python side
+// will be responsible for managing this object.
+SdrShaderNodePtr
+_Parse(RmanArgsParserPlugin& self, const NdrNodeDiscoveryResult& discoveryResult)
+{
+    return dynamic_cast<SdrShaderNodePtr>(
+        self.Parse(discoveryResult).release()
+    );
+}
+
+// Note that this parser is only wrapped for testing purposes. In real-world
+// scenarios, it should not be used directly.
+void wrapRmanArgsParser()
+{
+    typedef RmanArgsParserPlugin This;
+
+    return_value_policy<copy_const_reference> copyRefPolicy;
+
+    class_<This, boost::noncopyable>("RmanArgsParser")
+        .def("Parse", &_Parse, return_value_policy<manage_new_object>())
+        .def("GetDiscoveryTypes", &This::GetDiscoveryTypes, copyRefPolicy)
+        .def("GetSourceType", &This::GetSourceType, copyRefPolicy)
+        ;
+}
diff --git a/third_party/renderman-26/plugin/rmanDiscovery/CMakeLists.txt b/third_party/renderman-26/plugin/rmanDiscovery/CMakeLists.txt
new file mode 100644
index 0000000000..b03fbdaace
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanDiscovery/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(PXR_PREFIX "")
+set(PXR_PACKAGE rmanDiscovery)
+
+pxr_plugin(rmanDiscovery
+    LIBRARIES
+        gf
+        plug
+        tf
+        vt
+        ar
+        ndr
+        sdr
+
+    PRIVATE_CLASSES
+        rmanDiscovery
+
+    RESOURCE_FILES
+        plugInfo.json
+)
diff --git a/third_party/renderman-26/plugin/rmanDiscovery/plugInfo.json b/third_party/renderman-26/plugin/rmanDiscovery/plugInfo.json
new file mode 100644
index 0000000000..57afdc16d3
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanDiscovery/plugInfo.json
@@ -0,0 +1,19 @@
+{
+    "Plugins": [
+        {
+            "Info": {
+                "Types": {
+                    "RmanDiscoveryPlugin" : {
+                        "bases": ["NdrDiscoveryPlugin"],
+                        "displayName": "RenderMan .args/.osl Discovery"
+                    }
+                }
+            },
+            "LibraryPath": "@PLUG_INFO_LIBRARY_PATH@", 
+            "Name": "rmanDiscovery", 
+            "ResourcePath": "@PLUG_INFO_RESOURCE_PATH@", 
+            "Root": "@PLUG_INFO_ROOT@", 
+            "Type": "library"
+        }
+    ]
+}
diff --git a/third_party/renderman-26/plugin/rmanDiscovery/rmanDiscovery.cpp b/third_party/renderman-26/plugin/rmanDiscovery/rmanDiscovery.cpp
new file mode 100644
index 0000000000..7ba9cbfb5f
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanDiscovery/rmanDiscovery.cpp
@@ -0,0 +1,135 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/base/arch/fileSystem.h"
+#include "pxr/base/tf/getenv.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/tf/stringUtils.h"
+#include "pxr/base/plug/registry.h"
+#include "pxr/base/plug/plugin.h"
+#include "rmanDiscovery.h"
+#include "pxr/usd/ndr/filesystemDiscoveryHelpers.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _allowedExtensionTokens,
+    (args)
+    (oso)
+);
+
+NDR_REGISTER_DISCOVERY_PLUGIN(RmanDiscoveryPlugin)
+
+static NdrStringVec computeDefaultSearchPaths()
+{
+    NdrStringVec searchPaths;
+
+    // RMAN_SHADERPATH contains OSL (.oso)
+    std::string shaderpath = TfGetenv("RMAN_SHADERPATH");
+    if (!shaderpath.empty()) {
+        NdrStringVec paths = TfStringSplit(shaderpath, ARCH_PATH_LIST_SEP);
+        for (std::string const& path : paths)
+            searchPaths.push_back(path);
+    } 
+    // Default RenderMan installation under '$RMANTREE/lib/shaders'
+    std::string rmantree = TfGetenv("RMANTREE");
+    if (!rmantree.empty()) {
+        searchPaths.push_back(TfStringCatPaths(rmantree, "lib/shaders"));
+    }
+    // Default hdPrman installation under 'plugins/usd/resources/shaders'
+    PlugPluginPtr plugin =
+        PlugRegistry::GetInstance().GetPluginWithName("hdPrmanLoader");
+    if (plugin) {
+        std::string path = TfGetPathName(plugin->GetPath());
+        if (!path.empty()) {
+            searchPaths.push_back(
+                TfStringCatPaths(path, "resources/shaders"));
+        }
+    }
+
+    // RMAN_RIXPLUGINPATH contains Args (.args) metadata
+    std::string rixpluginpath = TfGetenv("RMAN_RIXPLUGINPATH");
+    if (!rixpluginpath.empty()) {
+        // Assume that args files are under an 'Args' directory
+        NdrStringVec paths = TfStringSplit(rixpluginpath, ARCH_PATH_LIST_SEP);
+        for (std::string const& path : paths) {
+            searchPaths.push_back(TfStringCatPaths(path, "Args"));
+        }
+    } 
+    // Default RenderMan installation under '$RMANTREE/lib/plugins/Args'
+    if (!rmantree.empty()) {
+        searchPaths.push_back(
+            TfStringCatPaths(rmantree, "lib/plugins/Args"));
+    }
+    return searchPaths;
+}
+
+static NdrStringVec &
+RmanDiscoveryPlugin_GetDefaultSearchPaths()
+{
+    static NdrStringVec defaultSearchPaths = computeDefaultSearchPaths();
+    return defaultSearchPaths;
+}
+
+void
+RmanDiscoveryPlugin_SetDefaultSearchPaths(const NdrStringVec &paths)
+{
+    RmanDiscoveryPlugin_GetDefaultSearchPaths() = paths;
+}
+
+static bool &
+RmanDiscoveryPlugin_GetDefaultFollowSymlinks()
+{
+    static bool defaultFollowSymlinks = true;
+    return defaultFollowSymlinks;
+}
+
+void
+RmanDiscoveryPlugin_SetDefaultFollowSymlinks(bool followSymlinks)
+{
+    RmanDiscoveryPlugin_GetDefaultFollowSymlinks() = followSymlinks;
+}
+
+RmanDiscoveryPlugin::RmanDiscoveryPlugin()
+{
+    _searchPaths = RmanDiscoveryPlugin_GetDefaultSearchPaths();
+    _allowedExtensions = TfToStringVector(_allowedExtensionTokens->allTokens);
+    _followSymlinks = RmanDiscoveryPlugin_GetDefaultFollowSymlinks();
+}
+
+RmanDiscoveryPlugin::RmanDiscoveryPlugin(Filter filter)
+    : RmanDiscoveryPlugin()
+{
+    _filter = std::move(filter);
+}
+
+RmanDiscoveryPlugin::~RmanDiscoveryPlugin() = default;
+
+NdrNodeDiscoveryResultVec
+RmanDiscoveryPlugin::DiscoverNodes(const Context& context)
+{
+    auto result = NdrFsHelpersDiscoverNodes(
+        _searchPaths, _allowedExtensions, _followSymlinks, &context
+    );
+
+    // Filter results.
+    if (_filter) {
+        result.erase(std::remove_if(result.begin(), result.end(), 
+            [this](NdrNodeDiscoveryResult &dr) { return !this->_filter(dr); }), 
+            result.end());
+    }
+
+    return result;
+}
+
+const NdrStringVec& 
+RmanDiscoveryPlugin::GetSearchURIs() const
+{
+    return _searchPaths;
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/rmanDiscovery/rmanDiscovery.h b/third_party/renderman-26/plugin/rmanDiscovery/rmanDiscovery.h
new file mode 100644
index 0000000000..7a52aef2a2
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanDiscovery/rmanDiscovery.h
@@ -0,0 +1,73 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_DISCOVERY_RMAN_DISCOVERY_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_DISCOVERY_RMAN_DISCOVERY_H
+
+/// \file rmanDiscovery/rmanDiscovery.h
+
+#include "pxr/pxr.h"
+#include "pxr/usd/ndr/discoveryPlugin.h"
+#include <functional>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+/// \class RmanDiscoveryPlugin
+///
+/// Discovers nodes supported by the HdPrman render delegate.
+///
+class RmanDiscoveryPlugin final : public NdrDiscoveryPlugin
+{
+public:
+    /// A filter for discovered nodes.  If the function returns false
+    /// then the discovered node is discarded.  Otherwise the function
+    /// can modify the discovery result.
+    using Filter = std::function<bool(NdrNodeDiscoveryResult&)>;
+
+    /// Constructor.
+    RmanDiscoveryPlugin();
+
+    /// DiscoverNodes() will pass each result to the given function for
+    /// modification.  If the function returns false then the result is
+    /// discarded.
+    RmanDiscoveryPlugin(Filter filter);
+
+    /// Virtual destructor
+    ~RmanDiscoveryPlugin();
+
+    /// Discover all of the nodes that appear within the the search paths
+    /// provided and match the extensions provided.
+    NdrNodeDiscoveryResultVec DiscoverNodes(const Context&) override;
+
+    /// Gets the paths that this plugin is searching for nodes in.
+    const NdrStringVec& GetSearchURIs() const override;
+
+private:
+    /// The paths (abs) indicating where the plugin should search for nodes.
+    NdrStringVec _searchPaths;
+
+    /// The extensions (excluding leading '.') that signify a valid node file.
+    /// The extension will be used as the `type` member in the resulting
+    /// `NdrNodeDiscoveryResult` instance.
+    NdrStringVec _allowedExtensions;
+
+    /// Whether or not to follow symlinks while scanning directories for files.
+    bool _followSymlinks;
+
+    // The filter to run on the results.
+    Filter _filter;
+};
+
+void
+RmanDiscoveryPlugin_SetDefaultSearchPaths(const NdrStringVec &paths);
+
+void
+RmanDiscoveryPlugin_SetDefaultFollowSymlinks(bool followSymlinks);
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_DISCOVERY_RMAN_DISCOVERY_H
diff --git a/third_party/renderman-26/plugin/rmanOslParser/CMakeLists.txt b/third_party/renderman-26/plugin/rmanOslParser/CMakeLists.txt
new file mode 100644
index 0000000000..a8c4cbe3c2
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanOslParser/CMakeLists.txt
@@ -0,0 +1,52 @@
+set(PXR_PREFIX "")
+set(PXR_PACKAGE rmanOslParser)
+add_definitions(-DPRMANBUILDINGAPI)
+
+if(WIN32)
+    set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libmmd.lib /NODEFAULTLIB:libirc.lib /NODEFAULTLIB:svml_dispmd.lib /NODEFAULTLIB:libdecimal.lib" )
+endif()
+
+pxr_plugin(rmanOslParser
+    LIBRARIES
+        gf
+        tf
+        vt
+        ar
+        ndr
+        sdr
+        ${PXRCORE_LIBRARY}
+        ${PRMAN_LIBRARY}        
+
+    INCLUDE_DIRS
+        ${RENDERMAN_INCLUDE_DIR}
+
+    PRIVATE_CLASSES
+        rmanOslParser
+
+    RESOURCE_FILES
+        plugInfo.json
+)
+
+# Need to set RMANTREE and RMAN_SHADERPATH environment variable when running
+# tests.
+#
+# XXX: RMAN_SHADERPATH is only necessary for the monolithic build; in all
+# other cases, the shaders accessed by the test are automatically found
+# relative to libHdPrmanLoader. We may be able to remove this if we made
+# it so this library wasn't embedded in the monolithic library.
+get_filename_component(RMANTREE_PATH "${RENDERMAN_INCLUDE_DIR}/.." ABSOLUTE)
+get_filename_component(RMANSHADER_PATH "${CMAKE_INSTALL_PREFIX}/plugin/usd/resources/shaders" ABSOLUTE)
+
+pxr_test_scripts(
+    testenv/testRmanOslParser.py
+)
+
+pxr_register_test(testRmanOslParser
+    PYTHON
+    COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testRmanOslParser"
+    EXPECTED_RETURN_CODE 0
+    ENV
+      RMANTREE=${RMANTREE_PATH}
+      RMAN_SHADERPATH=${RMANSHADER_PATH}
+)
+
diff --git a/third_party/renderman-26/plugin/rmanOslParser/plugInfo.json b/third_party/renderman-26/plugin/rmanOslParser/plugInfo.json
new file mode 100644
index 0000000000..65d309f846
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanOslParser/plugInfo.json
@@ -0,0 +1,19 @@
+{
+    "Plugins": [
+        {
+            "Type": "library",
+            "Name": "rmanOslParser",
+            "Root": "@PLUG_INFO_ROOT@",
+            "LibraryPath": "@PLUG_INFO_LIBRARY_PATH@",
+            "ResourcePath": "@PLUG_INFO_RESOURCE_PATH@",
+            "Info": {
+                "Types": {
+                    "RmanOslParserPlugin" : {
+                        "bases": ["NdrParserPlugin"],
+                        "displayName": "RenderMan .osl Node Parser"
+                    }                    
+                }
+            }
+        }
+    ]
+}
diff --git a/third_party/renderman-26/plugin/rmanOslParser/rmanOslParser.cpp b/third_party/renderman-26/plugin/rmanOslParser/rmanOslParser.cpp
new file mode 100644
index 0000000000..9766226dc8
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanOslParser/rmanOslParser.cpp
@@ -0,0 +1,574 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "pxr/base/arch/fileSystem.h"
+#include "pxr/base/gf/vec2f.h"
+#include "pxr/base/gf/vec3f.h"
+#include "pxr/base/gf/vec4f.h"
+#include "pxr/base/gf/matrix4d.h"
+#include "pxr/base/tf/errorMark.h"
+#include "pxr/base/tf/fileUtils.h"
+#include "pxr/base/tf/scoped.h"
+#include "pxr/base/tf/staticTokens.h"
+#include "pxr/base/tf/stringUtils.h"
+#include "pxr/base/tf/weakPtr.h"
+#include "pxr/base/vt/types.h"
+#include "pxr/base/vt/array.h"
+#include "pxr/usd/ar/ar.h"
+#include "pxr/usd/ar/asset.h"
+#include "pxr/usd/ar/resolvedPath.h"
+#include "pxr/usd/ar/resolver.h"
+#include "pxr/usd/ndr/debugCodes.h"
+#include "pxr/usd/ndr/nodeDiscoveryResult.h"
+#include "pxr/usd/sdf/assetPath.h"
+#include "pxr/usd/sdr/shaderMetadataHelpers.h"
+#include "pxr/usd/sdr/shaderNode.h"
+#include "pxr/usd/sdr/shaderProperty.h"
+#include "rmanOslParser/rmanOslParser.h"
+
+#include <tuple>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+using ShaderMetadataHelpers::IsPropertyAnAssetIdentifier;
+using ShaderMetadataHelpers::IsPropertyATerminal;
+using ShaderMetadataHelpers::IsTruthy;
+using ShaderMetadataHelpers::OptionVecVal;
+
+NDR_REGISTER_PARSER_PLUGIN(RmanOslParserPlugin)
+
+TF_DEFINE_PRIVATE_TOKENS(
+    _tokens,
+
+    ((arraySize, "arraySize"))
+    ((pageStr, "page"))
+    ((oslPageDelimiter, "."))
+    ((vstructMember, "vstructmember"))
+    (sdrDefinitionName)
+
+    // Discovery and source type
+    ((discoveryType, "oso"))
+    ((sourceType, "OSL"))
+);
+
+const NdrTokenVec& 
+RmanOslParserPlugin::GetDiscoveryTypes() const
+{
+    static const NdrTokenVec _DiscoveryTypes = {_tokens->discoveryType};
+    return _DiscoveryTypes;
+}
+
+const TfToken& 
+RmanOslParserPlugin::GetSourceType() const
+{
+    return _tokens->sourceType;
+}
+
+static std::unique_ptr<RixShaderQuery>
+_getShaderQuery()
+{
+    RixContext* ctx = RixGetContextViaRMANTREE();
+    if (!ctx)
+    {
+        return nullptr; 
+    }
+
+    RixShaderInfo* si = (RixShaderInfo*)ctx->GetRixInterface(k_RixShaderInfo);
+    if (!si)
+    {
+        return nullptr;  
+    }
+    return std::unique_ptr<RixShaderQuery>(si->CreateQuery());
+}
+
+RmanOslParserPlugin::RmanOslParserPlugin()
+{
+}
+
+RmanOslParserPlugin::~RmanOslParserPlugin()
+{
+    // Nothing yet
+}
+
+static std::string
+_WriteOSLToTempFile(
+    const std::shared_ptr<const char>& buffer, size_t numBytes)
+{
+    // Note that the OSL libraries require files to have a .oso extension.
+    std::string tmpFilePath = ArchMakeTmpFileName("rmanOslParser", ".oso");
+    FILE* f = fopen(tmpFilePath.c_str(), "w");
+
+    if (!f) {
+        TF_WARN("Failed to open temp file %s for writing", tmpFilePath.c_str());
+        return std::string();
+    }
+
+    TfScoped<> fcloser([f]() { fclose(f); });
+
+    if (fwrite(buffer.get(), sizeof(char), numBytes, f) != numBytes) {
+        TF_WARN("Failed to write OSL to temp file %s", tmpFilePath.c_str());
+        return std::string();
+    }
+
+    return tmpFilePath;
+}
+
+NdrNodeUniquePtr
+RmanOslParserPlugin::Parse(const NdrNodeDiscoveryResult& discoveryResult)
+{
+    std::unique_ptr<RixShaderQuery> sq = _getShaderQuery();
+    if (!sq)
+    {
+        TF_WARN("Could not obtain an instance of RixShaderQuery");
+        return NdrParserPlugin::GetInvalidNode(discoveryResult);
+    }
+
+    bool hasErrors = false;
+
+    if (!discoveryResult.uri.empty()) {
+        if (TfIsFile(discoveryResult.resolvedUri.c_str())) {
+            // Attempt to parse the node
+            hasErrors = sq->Open(discoveryResult.resolvedUri.c_str(), ""); 
+        }
+        else {
+            std::shared_ptr<const char> buffer;
+            std::shared_ptr<ArAsset> asset = ArGetResolver().OpenAsset(
+                ArResolvedPath(discoveryResult.resolvedUri));
+            if (asset) {
+                buffer = asset->GetBuffer();
+            }
+
+            if (!buffer) {
+                TF_WARN("Could not open the OSL file at URI [%s] (%s). "
+                        "An invalid Sdr node definition will be created.",
+                        discoveryResult.uri.c_str(),
+                        discoveryResult.resolvedUri.c_str());
+                
+                return NdrParserPlugin::GetInvalidNode(discoveryResult);
+            }
+
+            // RixShaderQuery currently does not have API to read from
+            // a buffer, so we need to write the OSL to a temporary file.
+            const std::string tmpFile =
+                _WriteOSLToTempFile(buffer, asset->GetSize());
+            hasErrors = tmpFile.empty() || sq->Open(tmpFile.c_str(), "");
+
+            // Attempt to delete the temporary file to avoid accumulation.
+            // Since these are just temporary files we'll ignore errors if
+            // we can't clean them up to avoid spewage and disrupting things.
+            TfErrorMark m;
+            TfDeleteFile(tmpFile);
+            m.Clear();
+        }
+
+    }
+    else {
+        TF_WARN("Invalid NdrNodeDiscoveryResult with identifier %s: both uri "
+            "and sourceCode are empty.", discoveryResult.identifier.GetText());
+        return NdrParserPlugin::GetInvalidNode(discoveryResult);
+    }
+
+    std::string errors = sq->LastError();
+    if (hasErrors || !errors.empty()) {
+        TF_WARN("Could not parse OSL shader at URI [%s]. An invalid Sdr node "
+                "definition will be created. %s%s",
+                discoveryResult.uri.c_str(),
+                (errors.empty() ? "" : "Errors from OSL parser: "),
+                (errors.empty() ?
+                    "" : TfStringReplace(errors, "\n", "; ").c_str()));
+
+        return NdrParserPlugin::GetInvalidNode(discoveryResult);
+    }
+
+    return NdrNodeUniquePtr(
+        new SdrShaderNode(
+            discoveryResult.identifier,
+            discoveryResult.version,
+            discoveryResult.name,
+            discoveryResult.family,
+            _tokens->sourceType,
+            _tokens->sourceType,    // OSL shaders don't declare different types
+                                    // so use the same type as the source type
+            discoveryResult.resolvedUri,
+            discoveryResult.resolvedUri,    // Definitive assertion that the
+                                            // implementation is the same asset
+                                            // as the definition
+            _getNodeProperties(sq.get(), discoveryResult),
+            _getNodeMetadata(sq.get(), discoveryResult.metadata),
+            discoveryResult.sourceCode
+        )
+    );
+}
+
+NdrPropertyUniquePtrVec
+RmanOslParserPlugin::_getNodeProperties(
+    const RixShaderQuery* sq,
+    const NdrNodeDiscoveryResult& discoveryResult) const
+{
+    NdrPropertyUniquePtrVec properties;
+    const int nParams = sq->ParameterCount();
+
+    RixShaderParameter const * const *params = sq->Parameters();
+
+    for (int i = 0; i < nParams; ++i) {
+        const RixShaderParameter* param = params[i]; 
+        std::string propName = param->Name();
+
+        // Struct members are not supported
+        if (propName.find('.') != std::string::npos) {
+            continue;
+        }
+
+        // Extract metadata
+        NdrTokenMap metadata = _getPropertyMetadata(param, discoveryResult);
+
+        // Get type name, and determine the size of the array (if an array)
+        TfToken typeName;
+        size_t arraySize;
+        std::tie(typeName, arraySize) = _getTypeName(param, metadata);
+
+        _injectParserMetadata(metadata, typeName);
+
+        // Non-standard properties in the metadata are considered hints
+        NdrTokenMap hints;
+        std::string  definitionName;
+        for (auto metaIt = metadata.cbegin(); metaIt != metadata.cend(); ) {
+            if (std::find(SdrPropertyMetadata->allTokens.begin(),
+                          SdrPropertyMetadata->allTokens.end(),
+                          metaIt->first) != SdrPropertyMetadata->allTokens.end()){
+                metaIt++;
+                continue;
+            }
+
+            if (metaIt->first == _tokens->sdrDefinitionName){
+                definitionName = metaIt->second;
+                metaIt = metadata.erase(metaIt);
+                continue;
+            }
+            
+            // The metadata sometimes incorrectly specifies array size; this
+            // value is not respected
+            if (metaIt->first == _tokens->arraySize) {
+                TF_DEBUG(NDR_PARSING).Msg(
+                    "Ignoring bad 'arraySize' attribute on property [%s] "
+                    "on OSL shader [%s]",
+                    propName.c_str(), discoveryResult.name.c_str());
+                metaIt = metadata.erase(metaIt);
+                continue;
+            }
+
+            hints.insert(*metaIt++);
+        }
+
+        // If we found 'definitionName' metadata, we actually need to 
+        // change the name of the property to match, using the OSL
+        // parameter name as the ImplementationName
+        if (!definitionName.empty()){
+            metadata[SdrPropertyMetadata->ImplementationName] = TfToken(propName);
+            propName = definitionName;
+        }
+
+        // Extract options
+        NdrOptionVec options;
+        if (metadata.count(SdrPropertyMetadata->Options)) {
+            options = OptionVecVal(metadata.at(SdrPropertyMetadata->Options));
+        }
+
+        properties.emplace_back(
+            SdrShaderPropertyUniquePtr(
+                new SdrShaderProperty(
+                    TfToken(propName),
+                    typeName,
+                    _getDefaultValue(
+                        param,
+                        typeName,
+                        arraySize,
+                        metadata),
+                    param->IsOutput(),
+                    arraySize,
+                    metadata,
+                    hints,
+                    options
+                )
+            )
+        );
+    }
+
+    return properties;
+}
+
+NdrTokenMap
+RmanOslParserPlugin::_getPropertyMetadata(const RixShaderParameter* param,
+    const NdrNodeDiscoveryResult& discoveryResult) const
+{
+    NdrTokenMap metadata;
+
+    RixShaderParameter const* const *metaData = param->MetaData();
+    for (int i = 0; i < param->MetaDataSize(); ++i) {
+        const RixShaderParameter* metaParam = metaData[i];
+        TfToken entryName = TfToken(metaParam->Name());
+
+        // Vstruct metadata needs to be specially parsed; otherwise, just stuff
+        // the value into the map
+        if (entryName == _tokens->vstructMember) {
+            std::string vstruct(*metaParam->DefaultS()); 
+
+            if (!vstruct.empty()) {
+                // A dot splits struct from member name
+                size_t dotPos = vstruct.find('.');
+
+                if (dotPos != std::string::npos) {
+                    metadata[SdrPropertyMetadata->VstructMemberOf] =
+                        vstruct.substr(0, dotPos);
+
+                    metadata[SdrPropertyMetadata->VstructMemberName] =
+                        vstruct.substr(dotPos + 1);
+                } else {
+                TF_DEBUG(NDR_PARSING).Msg(
+                    "Bad virtual structure member in %s.%s:%s",
+                    discoveryResult.name.c_str(), param->Name(),
+                    vstruct.c_str());
+                }
+            }
+        } else if (entryName == _tokens->pageStr) {
+            // Replace OslPageDelimiter with SdrShaderProperty's Page Delimiter
+            metadata[entryName] = TfStringReplace(
+                    std::string(*metaParam->DefaultS()),
+                    _tokens->oslPageDelimiter, 
+                    SdrPropertyTokens->PageDelimiter.GetString());
+        } else if (metaParam->Type() == RixShaderParameter::k_String) {
+            metadata[entryName] = std::string(*metaParam->DefaultS());
+        }
+    }
+
+    return metadata;
+}
+
+void
+RmanOslParserPlugin::_injectParserMetadata(NdrTokenMap& metadata,
+                                          const TfToken& typeName) const
+{
+    if (typeName == SdrPropertyTypes->String) {
+        if (IsPropertyAnAssetIdentifier(metadata)) {
+            metadata[SdrPropertyMetadata->IsAssetIdentifier] = "";
+        }
+    }
+}
+
+NdrTokenMap
+RmanOslParserPlugin::_getNodeMetadata(
+    const RixShaderQuery* sq,
+    const NdrTokenMap &baseMetadata) const
+{
+    NdrTokenMap nodeMetadata = baseMetadata;
+
+    // Convert the OSL metadata to a dict. 
+    const int nParams = sq->MetaDataCount();
+    RixShaderParameter const * const *metaData = sq->MetaData();
+
+    for (int i = 0; i < nParams; ++i) {
+        const RixShaderParameter* md = metaData[i]; 
+        TfToken entryName = TfToken(md->Name());
+        nodeMetadata[entryName] = std::string(md->Name()); 
+    }
+
+    return nodeMetadata;
+}
+
+std::tuple<TfToken, size_t>
+RmanOslParserPlugin::_getTypeName(
+    const RixShaderParameter* param,
+    const NdrTokenMap& metadata) const
+{
+    // Exit early if this param is known to be a struct
+    if (param->IsStruct()) {
+        return std::make_tuple(SdrPropertyTypes->Struct, /* array size = */ 0);
+    }
+
+    // Exit early if the param's metadata indicates the param is a terminal type
+    if (IsPropertyATerminal(metadata)) {
+        return std::make_tuple(
+            SdrPropertyTypes->Terminal, /* array size = */ 0);
+    }
+
+    // Otherwise, continue on to determine the type (and possibly array size)
+    //std::string typeName = std::string(param->type.c_str());
+    size_t arraySize = 0;
+    if (param->IsArray())
+    {
+        arraySize = (size_t) param->ArrayLength();
+    }
+
+    std::string typeName("");
+    switch(param->Type())
+    {
+        case RixShaderParameter::k_Int:
+            typeName = SdrPropertyTypes->Int;
+            break;
+        case RixShaderParameter::k_Float:
+            typeName = SdrPropertyTypes->Float;
+            break;
+        case RixShaderParameter::k_String:
+            typeName = SdrPropertyTypes->String;
+            break;
+        case RixShaderParameter::k_Color:
+            typeName = SdrPropertyTypes->Color;
+            break;
+        case RixShaderParameter::k_Point:
+            typeName = SdrPropertyTypes->Point;
+            break;
+        case RixShaderParameter::k_Normal:
+            typeName = SdrPropertyTypes->Normal;
+            break;
+        case RixShaderParameter::k_Vector:
+            typeName = SdrPropertyTypes->Vector;
+            break;
+        case RixShaderParameter::k_Matrix:
+            typeName = SdrPropertyTypes->Matrix;
+            break;
+        default:
+            break;
+    }
+
+    return std::make_tuple(TfToken(typeName), arraySize);
+}
+
+VtValue
+RmanOslParserPlugin::_getDefaultValue(
+    const RixShaderParameter* param, 
+    const std::string& oslType,
+    size_t arraySize,
+    const NdrTokenMap& metadata) const
+{
+    // Determine array-ness
+    bool isDynamicArray =
+        IsTruthy(SdrPropertyMetadata->IsDynamicArray, metadata);
+    bool isArray = (arraySize > 0) || isDynamicArray;
+
+    // INT and INT ARRAY
+    // -------------------------------------------------------------------------
+    if (oslType == SdrPropertyTypes->Int) {
+        const int* dflts = param->DefaultI();
+        if (!isArray && param->DefaultSize() == 1) {
+            return VtValue( *dflts );
+        }
+
+        VtIntArray array;
+        array.reserve( (size_t) param->ArrayLength() );
+        for (int i = 0; i <  param->ArrayLength(); ++i)
+        {
+            array.push_back( dflts[i] );
+        }
+
+        return VtValue::Take(array);
+    }
+
+    // STRING and STRING ARRAY
+    // -------------------------------------------------------------------------
+    else if (oslType == SdrPropertyTypes->String) {
+        const char** dflts = param->DefaultS();
+
+        // Handle non-array
+        if (!isArray && param->DefaultSize() == 1) {
+            return VtValue( std::string( *dflts) );
+        }
+
+        // Handle array
+        VtStringArray array;
+        array.reserve( (size_t) param->ArrayLength() );
+        for (int i = 0; i <  param->ArrayLength(); ++i)
+        {
+            array.push_back( std::string( dflts[i] ) );
+        }
+        return VtValue::Take(array);
+    }
+
+    // FLOAT and FLOAT ARRAY
+    // -------------------------------------------------------------------------
+    else if (oslType == SdrPropertyTypes->Float) {
+        const float* dflts = param->DefaultF();
+
+        if (!isArray && param->DefaultSize() == 1) {
+            return VtValue( *dflts );
+        }
+
+        VtFloatArray array;
+        array.reserve( (size_t) param->ArrayLength() );
+        for (int i = 0; i <  param->ArrayLength(); ++i)
+        {
+            array.push_back( dflts[i] ); 
+        }
+
+        return VtValue::Take(array);
+    }
+
+    // VECTOR TYPES and VECTOR TYPE ARRAYS
+    // -------------------------------------------------------------------------
+    else if (oslType == SdrPropertyTypes->Color  ||
+             oslType == SdrPropertyTypes->Point  ||
+             oslType == SdrPropertyTypes->Normal ||
+             oslType == SdrPropertyTypes->Vector) {
+
+        const float* dflts = param->DefaultF();
+        int dflt_size = param->DefaultSize();
+
+
+        if (!isArray && dflt_size == 3) {
+            return VtValue(
+                GfVec3f(dflts[0],
+                        dflts[1],
+                        dflts[2])
+            );
+        } else if (isArray && dflt_size % 3 == 0) {
+            int numElements = dflt_size / 3;
+            VtVec3fArray array(numElements);
+
+            for (int i = 0; i < numElements; ++i) {
+                array[i] = GfVec3f(dflts[3*i + 0],
+                                   dflts[3*i + 1],
+                                   dflts[3*i + 2]);
+            }
+
+            return VtValue::Take(array);
+        }
+    }
+
+    // MATRIX
+    // -------------------------------------------------------------------------
+    else if (oslType == SdrPropertyTypes->Matrix) {
+        // XXX: No matrix array support
+        if (!isArray && param->DefaultSize() == 16) {
+            GfMatrix4d mat;
+            double* values = mat.GetArray();
+            const float* dflts = param->DefaultF();
+
+            for (int i = 0; i < 16; ++i) {
+                values[i] = static_cast<double>(dflts[i]);
+            }
+
+            return VtValue::Take(mat);
+        }
+    }
+
+    // STRUCT, TERMINAL, VSTRUCT
+    // -------------------------------------------------------------------------
+    else if (oslType == SdrPropertyTypes->Struct ||
+             oslType == SdrPropertyTypes->Terminal ||
+             oslType == SdrPropertyTypes->Vstruct) {
+        // We return an empty VtValue for Struct, Terminal, and Vstruct
+        // properties because their value may rely on being computed within the
+        // renderer, or we might not have a reasonable way to represent their
+        // value within Sdr
+        return VtValue();
+    }
+
+
+    // Didn't find a supported type
+    return VtValue();
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/third_party/renderman-26/plugin/rmanOslParser/rmanOslParser.h b/third_party/renderman-26/plugin/rmanOslParser/rmanOslParser.h
new file mode 100644
index 0000000000..50e586cfb8
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanOslParser/rmanOslParser.h
@@ -0,0 +1,144 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#ifndef EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_OSL_PARSER_RMAN_OSL_PARSER_H
+#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_OSL_PARSER_RMAN_OSL_PARSER_H
+
+/// \file rmanOslParser/rmanOslParser.h
+
+#include "pxr/pxr.h"
+#include "pxr/base/vt/value.h"
+#include "pxr/usd/ndr/parserPlugin.h"
+#include "pxr/usd/sdr/declare.h"
+#include "RixShaderInfo.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+// Forward declarations
+class NdrNode;
+struct NdrNodeDiscoveryResult;
+
+/// \class RmanOslParserPlugin
+///
+/// Parses OSL nodes. For more information on parser plugins, see the
+/// documentation for `NdrParserPlugin`.
+///
+/// \section metadata_schema Metadata Schema
+/// The following metadata is pulled out of the shader and available on the
+/// destination as outlined below.
+///
+/// \subsection node_metadata Node Metadata
+///
+/// OSL Metadata Key      | Destination
+/// --------------------- | ------------
+/// category              | GetCategory()
+/// departments           | GetDepartments()
+/// help                  | GetHelp()
+/// label                 | GetLabel()
+/// \ref pvars "primvars" | GetPrimvars(), GetAdditionalPrimvarProperties()
+/// _everything else_     | GetMetadata()
+///
+///
+/// \subsection property_metadata Property Metadata
+///
+/// OSL Metadata Key    | Destination
+/// ------------------- | ------------
+/// connectable         | IsConnectable()
+/// sdrDefinitionName   | renames parameter, sends original osl param name to 
+///                     | SdrShaderProperty::GetImplementationName()
+/// page                | GetPage()
+/// help                | GetHelp()
+/// label               | GetLabel()
+/// isDynamicArray      | IsDynamicArray()
+/// \ref opts "options" | GetOptions()
+/// vstructMemberName   | GetVStructMemberName()
+/// vstructMemberOf     | GetVStructMemberOf()
+/// _everything else_   | GetMetadata()
+///
+///
+/// \subsection opts Options Format
+/// Multiple options are separated with the pipe '|' character; options can be
+/// specified in one of two ways:
+/// <ul>
+///     <li>
+///         key1|key2|key3|...
+///     </li>
+///     <li>
+///         key1:value1|key2:value2|...
+///     </li>
+/// </ul>
+///
+/// In the first case, where the values are not specified, the value of the
+/// option will be available on the node as an empty string.
+///
+///
+/// \subsection pvars Primvar Format
+/// Multiple primvars are separated with the pipe '|' character; primvars can be
+/// specified in one of two ways:
+/// <ul>
+///     <li>
+///         A string _not_ prefixed with a '$'; this indicates a normal primvar
+///     </li>
+///     <li>
+///         A string prefixed with '$'; the part after the '$' indicates the
+///         name of a string-typed input on the node whose value contains
+///         additional primvars
+///     </li>
+/// </ul>
+///
+class RmanOslParserPlugin : public NdrParserPlugin
+{
+public:
+    RmanOslParserPlugin();
+    ~RmanOslParserPlugin();
+
+    NdrNodeUniquePtr Parse(const NdrNodeDiscoveryResult& discoveryResult) 
+        override;
+
+    const NdrTokenVec& GetDiscoveryTypes() const override;
+
+    const TfToken& GetSourceType() const override;
+
+private:
+    // Gets a vector of properties that are present on the specified OSL
+    // query object
+    NdrPropertyUniquePtrVec _getNodeProperties(
+        const RixShaderQuery* sq,
+        const NdrNodeDiscoveryResult& discoveryResult) const;
+
+    // Gets all metadata for the node that's present on the specified OSL
+    // query object
+    NdrTokenMap _getNodeMetadata(
+        const RixShaderQuery* sq,
+        const NdrTokenMap &baseMetadata) const;
+
+    // Gets all metadata for the specified OSL parameter
+    NdrTokenMap _getPropertyMetadata(const RixShaderParameter* param,
+        const NdrNodeDiscoveryResult& discoveryResult) const;
+
+    // Injects any metadata that is generated by the parser. This type of
+    // metadata provides additional hints to the property.
+    void _injectParserMetadata(NdrTokenMap& metadata,
+        const TfToken& typeName) const;
+
+    // Gets a common type + array size (if array) from the OSL parameter
+    std::tuple<TfToken, size_t> _getTypeName(
+        const RixShaderParameter* param,
+        const NdrTokenMap& metadata) const;
+
+    // Gets the default value of the specified param.
+    VtValue _getDefaultValue(
+        const RixShaderParameter* param,
+        const std::string& oslType,
+        size_t arraySize,
+        const NdrTokenMap& metadata
+    ) const;
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif // EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_RMAN_OSL_PARSER_RMAN_OSL_PARSER_H
diff --git a/third_party/renderman-26/plugin/rmanOslParser/testenv/testRmanOslParser.py b/third_party/renderman-26/plugin/rmanOslParser/testenv/testRmanOslParser.py
new file mode 100644
index 0000000000..a3e363de84
--- /dev/null
+++ b/third_party/renderman-26/plugin/rmanOslParser/testenv/testRmanOslParser.py
@@ -0,0 +1,29 @@
+#!/pxrpythonsubst
+#
+# Copyright 2020 Pixar
+#
+# Licensed under the terms set forth in the LICENSE.txt file available at
+# https://openusd.org/license.
+
+import unittest
+
+from pxr import Sdr
+
+class TestRmanOslParser(unittest.TestCase):
+    def test_Basic(self):
+        r = Sdr.Registry()
+
+        uvTextureNode = r.GetNodeByName('UsdUVTexture', ['OSL'])
+        self.assertTrue(uvTextureNode)
+        self.assertEqual(
+            uvTextureNode.GetInputNames(),
+            ['file', 'st', 'wrapS', 'wrapT', 'fallback', 'scale', 'bias'])
+
+        primvarReaderNode = r.GetNodeByName('UsdPrimvarReader_float', ['OSL'])
+        self.assertTrue(primvarReaderNode)
+        self.assertEqual(
+            primvarReaderNode.GetInputNames(),
+            ['varname', 'fallback'])
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/third_party/renderman-26/plugin/rtx_hioImage/CMakeLists.txt b/third_party/renderman-26/plugin/rtx_hioImage/CMakeLists.txt
new file mode 100644
index 0000000000..99c6f8f2ce
--- /dev/null
+++ b/third_party/renderman-26/plugin/rtx_hioImage/CMakeLists.txt
@@ -0,0 +1,24 @@
+set(PXR_PREFIX "")
+set(PXR_PACKAGE RtxHioImage)
+
+pxr_plugin(${PXR_PACKAGE}
+
+    LIBRARIES
+        tf
+        glf
+        ${PXRCORE_LIBRARY}
+        ${PRMAN_LIBRARY}
+
+    INCLUDE_DIRS
+        ${GLEW_INCLUDE_DIR}    
+        ${RENDERMAN_INCLUDE_DIR}
+
+    CPPFILES
+        main.cpp 
+
+    PRIVATE_HEADERS
+
+    RESOURCE_FILES
+
+    DISABLE_PRECOMPILED_HEADERS
+)
diff --git a/third_party/renderman-26/plugin/rtx_hioImage/main.cpp b/third_party/renderman-26/plugin/rtx_hioImage/main.cpp
new file mode 100644
index 0000000000..bda9f83c68
--- /dev/null
+++ b/third_party/renderman-26/plugin/rtx_hioImage/main.cpp
@@ -0,0 +1,419 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
+//
+
+#include "RtxPlugin.h"
+#include "RixInterfaces.h"
+#include "pxr/imaging/hio/image.h"
+#include "pxr/imaging/hio/types.h"
+#include "pxr/base/gf/gamma.h"
+#include "pxr/base/gf/half.h"
+#include "pxr/base/trace/trace.h"
+
+#include <mutex>
+
+class RixContext;
+
+// We want to use some pxr namespace types here, while staying in
+// the top-level namespace so that prman can find the expected symbols.
+PXR_NAMESPACE_USING_DIRECTIVE
+
+namespace {
+
+// Per TextureCtx user data.
+struct RtxHioImagePluginUserData {
+    HioImageSharedPtr image;
+    bool flipped;
+
+    std::mutex mipLevelsMutex;
+    std::vector<HioImage::StorageSpec> mipLevels;
+};
+
+/// A Renderman Rtx texture plugin that uses HioImage to read files,
+/// allowing support for additional file types beyond .tex.
+class RtxHioImagePlugin : public RtxPlugin {
+public:
+    RtxHioImagePlugin(RixContext* rixCtx, const char* pluginName);
+    ~RtxHioImagePlugin() override;
+
+    // Convenience to get the user data as a RtxHioImagePluginUserData*.
+    RtxHioImagePluginUserData* data(TextureCtx& tCtx) {
+        return static_cast<RtxHioImagePluginUserData*>(tCtx.userData);
+    }
+
+    // RtxPlugin overrides
+    int Open(TextureCtx& tCtx) override;
+    int Fill(TextureCtx& tCtx, FillRequest& fillReq) override;
+    int Close(TextureCtx& userData) override;
+
+private:
+    RixMessages* m_msgHandler;
+};
+
+RtxHioImagePlugin::RtxHioImagePlugin(RixContext *rixCtx, const char *pluginName) :
+    m_msgHandler(rixCtx ? (RixMessages *)rixCtx->GetRixInterface(k_RixMessages) : nullptr)
+{
+}
+
+RtxHioImagePlugin::~RtxHioImagePlugin()
+{
+    // Do nothing
+}
+
+static bool
+_ConvertWrapMode(HioAddressMode hioWrapMode, RixMessages *msgs,
+                 const std::string &filename,
+                 RtxPlugin::TextureCtx::WrapMode *rmanWrapMode)
+{
+    switch(hioWrapMode) {
+    case HioAddressModeRepeat:
+        *rmanWrapMode = RtxPlugin::TextureCtx::k_Periodic;
+        return true;
+    case HioAddressModeMirrorRepeat:
+        if(msgs) {
+            msgs->ErrorAlways(
+                "RtxHioImagePlugin: "
+                "Texture %s has unsupported HioAddressModeMirrorRepeat; using "
+                "k_Periodic instead.",
+                filename.c_str());
+        }
+        *rmanWrapMode = RtxPlugin::TextureCtx::k_Periodic;
+        return true;
+    case HioAddressModeClampToEdge:
+        *rmanWrapMode = RtxPlugin::TextureCtx::k_Clamp;
+        return true;
+    case HioAddressModeClampToBorderColor:
+        if(msgs) {
+            msgs->ErrorAlways(
+                "RtxHioImagePlugin: "
+                "Texture %s has unsupported HioAddressModeClampToBorderColor; using "
+                "k_Black instead.",
+                filename.c_str());
+        }
+        *rmanWrapMode = RtxPlugin::TextureCtx::k_Black;
+        return true;
+    default:
+        return false;
+    }
+}
+
+template <class T>
+static void
+_ConvertSRGBtoLinear(T *dest, unsigned nPixels, 
+                     unsigned nChannels, unsigned channelOffset)
+{
+    const bool hasAlphaChannel = (channelOffset + nChannels == 4);
+
+    T *s = dest;
+    for (unsigned i=0; i<(nPixels*nChannels); i++) {
+
+        // The alpha channel is generally linear already -- skip pixel
+        const bool isAlphaChannel = 
+            hasAlphaChannel && ((i + 1) % nChannels == 0);
+        if (!isAlphaChannel) {
+            *s = GfConvertDisplayToLinear(*s);
+        }
+
+        s++;
+    }
+}
+
+template<class T>
+static void
+_ConvertToFloatAndFill(
+    const HioImage::StorageSpec& level, 
+    RtxPlugin::FillRequest& fillReq)
+{
+    TRACE_FUNCTION();
+    
+    const int numImageChannels = HioGetComponentCount(level.format);
+
+    const int startX = fillReq.tile.offset.X * fillReq.tile.size.X;
+    const int startY = fillReq.tile.offset.Y * fillReq.tile.size.Y;
+    const int endY = startY + fillReq.tile.size.Y;
+
+    const T *src = reinterpret_cast<const T*>(level.data) 
+        + (startY * level.width + startX) * numImageChannels
+        + (fillReq.channelOffset);
+    float *dest = (float*) fillReq.tileData;
+
+    // Get all channels in image.
+    if (fillReq.channelOffset == 0 && fillReq.numChannels == numImageChannels) {
+        for (int y = startY; y < endY; y++) {
+            const T *s = src;
+            for (int x = 0; x < numImageChannels * fillReq.tile.size.X; 
+                 x++, s++, dest++) {
+                *dest = static_cast<float>(*s);
+            }
+            src += numImageChannels * level.width;
+        }
+    } else {
+        for (int y = startY; y < endY; y++) {
+            const T *s = src;
+            for (int x = 0; x < fillReq.tile.size.X; x++) {
+                for (int i = 0; i < fillReq.numChannels; i++, s++, dest++) {
+                    *dest = static_cast<float>(*s);
+                }
+                s += numImageChannels - fillReq.numChannels;
+            }
+            src += numImageChannels * level.width;
+        }
+    }
+}
+
+int
+RtxHioImagePlugin::Open(TextureCtx& tCtx)
+{
+    tCtx.userData = nullptr;
+
+    // Parse args.
+    std::string filename;
+    std::string wrapS, wrapT;
+    std::string flipped;
+    HioImage::SourceColorSpace sourceColorSpace = HioImage::Auto;
+    for (unsigned int i = 0; i < tCtx.argc; i += 2) {
+        if (strcmp(tCtx.argv[i], "filename") == 0) {
+            filename = tCtx.argv[i + 1];
+        } else if (strcmp(tCtx.argv[i], "wrapS") == 0) {
+            wrapS = tCtx.argv[i + 1];
+        } else if (strcmp(tCtx.argv[i], "wrapT") == 0) {
+            wrapT = tCtx.argv[i + 1];
+        } else if (strcmp(tCtx.argv[i], "flipped") == 0) {
+            flipped = tCtx.argv[i + 1];
+        } else if (strcmp(tCtx.argv[i], "sourceColorSpace") == 0) {
+            if (strcmp(tCtx.argv[i + 1], "sRGB") == 0) {
+                sourceColorSpace = HioImage::SRGB;
+            } else if (strcmp(tCtx.argv[i + 1], "raw") == 0) {
+                sourceColorSpace = HioImage::Raw;
+            }
+        }
+    }
+
+    // Open HioImage.
+    HioImageSharedPtr image = HioImage::OpenForReading(filename, 0, 0, 
+        sourceColorSpace);
+    if (!image) {
+        if(m_msgHandler) {
+            m_msgHandler->ErrorAlways(
+                "RtxHioImagePlugin %p: "
+                "failed to open '%s'\n", this, filename.c_str());
+        }
+        return 1;
+    }
+
+    // Set up Renderman texture context.
+    tCtx.isLocked = false;
+    tCtx.retryOnError = true;
+    tCtx.numLayers = 1;
+    tCtx.pyramidType = TextureCtx::k_MIP;
+    tCtx.minRes.X = 1;
+    tCtx.minRes.Y = 1;
+    tCtx.maxRes.X = image->GetWidth();
+    tCtx.maxRes.Y = image->GetHeight();
+    tCtx.numChannels = HioGetComponentCount(image->GetFormat());
+    // Component data type.
+    HioType channelType = HioGetHioType(image->GetFormat());
+    switch (channelType) {
+    case HioTypeSignedByte:
+    case HioTypeUnsignedShort:
+    case HioTypeSignedShort:
+    case HioTypeUnsignedInt:
+    case HioTypeInt:
+    case HioTypeHalfFloat:
+    case HioTypeFloat:
+    case HioTypeDouble:
+        // If not float, will convert data to float during Fill
+        tCtx.dataType = TextureCtx::k_Float;
+        break;
+    case HioTypeUnsignedByte:
+        tCtx.dataType = TextureCtx::k_Byte;
+        break;
+    default:
+        if(m_msgHandler) {
+            m_msgHandler->ErrorAlways(
+                "RtxHioImagePlugin %p: "
+                "unsupported data type for %s\n", this, filename.c_str());
+        }
+        return 1;
+    }
+    // Wrapping mode.
+    // The wrap mode can be specified in the plugin arguments.
+    // If "useMetadata" is given, or nothing is specified, then
+    // fall back to check metadata in the texture asset.
+    tCtx.sWrap = TextureCtx::k_Black;
+    tCtx.tWrap = TextureCtx::k_Black;
+    HioAddressMode wrapModeS, wrapModeT;
+    if (wrapS.empty() || wrapS == "useMetadata") {
+        if (image->GetSamplerMetadata(HioAddressDimensionU, &wrapModeS)) {
+            _ConvertWrapMode(wrapModeS, m_msgHandler, filename, &tCtx.sWrap);
+        }
+    } else if (wrapS == "black") {
+        tCtx.sWrap = RtxPlugin::TextureCtx::k_Black;
+    } else if (wrapS == "clamp") {
+        tCtx.sWrap = RtxPlugin::TextureCtx::k_Clamp;
+    } else if (wrapS == "repeat") {
+        tCtx.sWrap = RtxPlugin::TextureCtx::k_Periodic;
+    }
+    if (wrapT.empty() || wrapT == "useMetadata") {
+        if (image->GetSamplerMetadata(HioAddressDimensionV, &wrapModeT)) {
+            _ConvertWrapMode(wrapModeT, m_msgHandler, filename, &tCtx.tWrap);
+        }
+    } else if (wrapT == "black") {
+        tCtx.tWrap = RtxPlugin::TextureCtx::k_Black;
+    } else if (wrapT == "clamp") {
+        tCtx.tWrap = RtxPlugin::TextureCtx::k_Clamp;
+    } else if (wrapT == "repeat") {
+        tCtx.tWrap = RtxPlugin::TextureCtx::k_Periodic;
+    }
+
+    // Allocate storage for this context.  Renderman will
+    // request as tiles, which we will service from this buffer.
+    RtxHioImagePluginUserData* data = new RtxHioImagePluginUserData();
+    tCtx.userData = data;
+    data->image = image;
+
+    // Flip vertically. The default is true.
+    data->flipped = (flipped != "false");
+
+    return 0;
+}
+
+int
+RtxHioImagePlugin::Fill(TextureCtx& tCtx, FillRequest& fillReq)
+{
+    RtxHioImagePluginUserData* data = this->data(tCtx);
+    assert(nullptr != data);
+
+    // Find (or create) appropriate MIP level.
+    HioImage::StorageSpec level;
+    level.flipped = data->flipped;
+    {
+        // Lock mutex while scanning or modifying mipLevels.
+        std::lock_guard<std::mutex> lock(data->mipLevelsMutex);
+        for (HioImage::StorageSpec &cachedLevel: data->mipLevels) {
+            if (cachedLevel.width == fillReq.imgRes.X &&
+                cachedLevel.height == fillReq.imgRes.Y) {
+                level = cachedLevel;
+                break;
+            }
+        }
+        if (!level.data) {
+            // Allocate a new MIP level.
+            level.width = fillReq.imgRes.X;
+            level.height = fillReq.imgRes.Y;
+            level.depth = data->image->GetBytesPerPixel();
+            level.format = data->image->GetFormat();
+
+            if (tCtx.dataType != TextureCtx::k_Byte && 
+                tCtx.dataType != TextureCtx::k_Float) {
+                if(m_msgHandler) {
+                    m_msgHandler->ErrorAlways(
+                        "RtxHioImagePlugin %p: unsupported data type\n", this);
+                }
+                return 1;
+            }
+
+            const int numBytes = level.width * level.height * level.depth;
+            level.data = new char[numBytes];
+            data->image->Read(level);
+            data->mipLevels.push_back(level);
+        }
+    }
+
+    const HioType channelType = HioGetHioType(data->image->GetFormat());
+
+    if (channelType == HioTypeSignedByte) {
+        _ConvertToFloatAndFill<signed char>(level, fillReq);
+    } else if (channelType == HioTypeUnsignedShort) {
+        _ConvertToFloatAndFill<uint16_t>(level, fillReq);
+    } else if (channelType == HioTypeSignedShort) {
+        _ConvertToFloatAndFill<int16_t>(level, fillReq);
+    } else if (channelType == HioTypeUnsignedInt) {
+        _ConvertToFloatAndFill<uint32_t>(level, fillReq);
+    } else if (channelType == HioTypeInt) {
+        _ConvertToFloatAndFill<int32_t>(level, fillReq);
+    } else if (channelType == HioTypeDouble) {
+        _ConvertToFloatAndFill<double>(level, fillReq);
+    } else if (channelType == HioTypeHalfFloat) {
+        _ConvertToFloatAndFill<GfHalf>(level, fillReq);
+    } else {
+        const int numImageChannels = HioGetComponentCount(level.format);
+        const int bytesPerChannel = HioGetDataSizeOfType(channelType);
+
+        // Copy out tile data, one row at a time.
+        const int bytesPerImagePixel = level.depth;
+        const int bytesPerImageRow = bytesPerImagePixel * level.width;
+        const int bytesPerTilePixel = bytesPerChannel * fillReq.numChannels;
+        const int bytesPerTileRow = bytesPerTilePixel * fillReq.tile.size.X;
+        const int startX = fillReq.tile.offset.X * fillReq.tile.size.X;
+        const int startY = fillReq.tile.offset.Y * fillReq.tile.size.Y;
+        const int endY = startY + fillReq.tile.size.Y;
+        char *src = (char*) level.data
+            + (startY * level.width + startX) * bytesPerImagePixel
+            + (fillReq.channelOffset * bytesPerChannel);
+        char *dest = (char*) fillReq.tileData;
+
+        // If fill request wants all channels in the image, just memcpy each row.
+        // Otherwise we need to iterate over each pixel and copy just the 
+        // requested channels.
+        if (fillReq.channelOffset == 0 && 
+            fillReq.numChannels == numImageChannels) {
+
+            for (int y = startY; y < endY; y++) {
+                memcpy(dest, src, bytesPerTileRow);
+                src += bytesPerImageRow;
+                dest += bytesPerTileRow;
+            }
+        }
+        else {
+            for (int y = startY; y < endY; y++) {
+                for (char *d = dest, *dEnd = dest + bytesPerTileRow, *s = src; 
+                    d != dEnd; d += bytesPerTilePixel, s += bytesPerImagePixel) {
+                    memcpy(d, s, bytesPerTilePixel);
+                }
+                src += bytesPerImageRow;
+                dest += bytesPerTileRow;
+            }
+        }
+    }
+
+    // Make sure texture data is linear
+    if (data->image->IsColorSpaceSRGB()) {
+        if (tCtx.dataType == TextureCtx::k_Float) {
+            _ConvertSRGBtoLinear(
+                (float*)fillReq.tileData, 
+                fillReq.tile.size.X * fillReq.tile.size.Y,
+                fillReq.numChannels, fillReq.channelOffset);
+        } else if (tCtx.dataType == TextureCtx::k_Byte) {
+            _ConvertSRGBtoLinear(
+                (unsigned char*)fillReq.tileData, 
+                fillReq.tile.size.X * fillReq.tile.size.Y,
+                fillReq.numChannels, fillReq.channelOffset);
+        }
+    }
+
+    return 0;
+}
+
+int
+RtxHioImagePlugin::Close(TextureCtx& tCtx)
+{
+    RtxHioImagePluginUserData* data = this->data(tCtx);
+    if (nullptr != data) {
+        for (HioImage::StorageSpec &cachedLevel: data->mipLevels) {
+            delete [] (char*) cachedLevel.data;
+        }
+        delete data;
+    }
+    return 0;
+}
+
+}
+
+RTXPLUGINCREATE
+{
+    return new RtxHioImagePlugin(rixCtx, pluginName);
+}
diff --git a/third_party/renderman-26/plugin/usdRiPxr/CMakeLists.txt b/third_party/renderman-26/plugin/usdRiPxr/CMakeLists.txt
new file mode 100644
index 0000000000..e5cf49f854
--- /dev/null
+++ b/third_party/renderman-26/plugin/usdRiPxr/CMakeLists.txt
@@ -0,0 +1,22 @@
+set(PXR_PREFIX pxr/imaging)
+set(PXR_PACKAGE usdRiPxr)
+
+# Conditional logic based on RenderMan version
+if (RENDERMAN_VERSION VERSION_LESS "26.2")
+    pxr_library(usdRiPxr
+        RESOURCE_FILES
+        plugInfo.json
+        generatedSchema.usda
+        schema.usda:usdRiPxr/schema.usda
+    )
+else()
+    # Get the usdRiPxr plugin files from renderman itself
+    # usdRiPxr schemas are known to be installed under the following path:
+    # ${RENDERMAN_LOCATION}/lib/usd_plugins/usdRiPxr/Resources
+    pxr_library(usdRiPxr
+        RESOURCE_FILES
+        ${RENDERMAN_LOCATION}/lib/usd_plugins/usdRiPxr/Resources/plugInfo.json:plugInfo.json
+        ${RENDERMAN_LOCATION}/lib/usd_plugins/usdRiPxr/Resources/generatedSchema.usda:generatedSchema.usda
+        ${RENDERMAN_LOCATION}/lib/usd_plugins/usdRiPxr/Resources/usdRiPxr/schema.usda:usdRiPxr/schema.usda
+    )
+endif()
diff --git a/third_party/renderman-26/plugin/usdRiPxr/README.md b/third_party/renderman-26/plugin/usdRiPxr/README.md
new file mode 100644
index 0000000000..bf3bf06efe
--- /dev/null
+++ b/third_party/renderman-26/plugin/usdRiPxr/README.md
@@ -0,0 +1,29 @@
+
+The files ("schema.usda", "generatedSchema.usda" and
+"plugInfo.json") in this directory are auto generated using 
+usdgenschemafromsdr utility.
+
+A schema.usda is populated using sdrNodes which are specified in a
+json config. usdGenSchema is then run on this auto populated schema 
+(with skipCodeGeneration set to True) to output a 
+generatedSchema.usda and plugInfo.json.
+
+The json config can provide sdrNodes either using sourceType and
+identifiers or using explicit paths via sourceAssetNodes. Note that
+if explicit paths contain any environment variables, then the user 
+is required to set these prior to running the script. Example:
+"$RMANTREE/lib/defaults/PRManAttribute.args", will require setting
+the RMANTREE environment variable before running the script.
+
+If regenerating schemas, it's recommended to set the
+USD_DISABLE_AUTO_APPLY_API_SCHEMAS environment variable to true in 
+order to prevent any previously generated auto-apply API schemas 
+from being applied to the specified schema bases which can result 
+in extra properties being pruned.
+
+Note that since users of this script have less control on direct
+authoring of schema.usda, "useLiteralIdentifier" is unconditionally
+set to true in schema.usda, which means the default camelCase token 
+names will be overriden and usdGenSchema will try keep the token 
+names as-is unless these are invalid.
+
diff --git a/third_party/renderman-26/plugin/usdRiPxr/generatedSchema.usda b/third_party/renderman-26/plugin/usdRiPxr/generatedSchema.usda
new file mode 100644
index 0000000000..553a9ed71a
--- /dev/null
+++ b/third_party/renderman-26/plugin/usdRiPxr/generatedSchema.usda
@@ -0,0 +1,10333 @@
+#usda 1.0
+(
+    "WARNING: THIS FILE IS GENERATED BY usdGenSchema.  DO NOT EDIT."
+)
+
+class "PxrProjectionPluginBase" (
+    doc = """Base Schema class which other PxrProjection plugins will inherit.
+    It also provides UsdShade connectability for all classes that derive from
+    it."""
+)
+{
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+}
+
+class "PxrSampleFilterPluginBase" (
+    doc = """Base Schema class which other PxrSampleFilter plugins will inherit. 
+    It also provides UsdShade connectability for all classes that derive from
+    it."""
+)
+{
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class "PxrDisplayFilterPluginBase" (
+    doc = """Base Schema class which other PxrDisplayFilter plugins will inherit.
+    It also provides UsdShade connectability for all classes that derive from
+    it."""
+)
+{
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class "PxrIntegratorPluginBase" (
+    doc = """Base Schema class which other PxrIntegrator plugins will inherit.
+    It also provides UsdShade connectability for all classes that derive from
+    it."""
+)
+{
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+}
+
+class "PxrRenderTerminalsAPI" (
+    doc = """API schema that provides a means of connecting a sample filter,
+    display filter and an integrator. The API can be applied to provide hooks to
+    the same for rman settings."""
+)
+{
+    token outputs:ri:displayFilters (
+        displayGroup = "OutputFilters"
+        doc = """Represents the display filter terminals for a render setting. A
+        display filter inheriting PxrDisplayFilterPluginBase can be connected to
+        this terminal."""
+    )
+    token outputs:ri:integrator (
+        doc = """Represents the integrator terminal for a render setting. A
+        integrator inheriting PxrIntegratorPluginBase can be connected to this
+        terminal."""
+    )
+    token outputs:ri:sampleFilters (
+        displayGroup = "OutputFilters"
+        doc = """Represents the sample filter terminals for a render setting. A
+        sample filter inheriting PxrSampleFilterPluginBase can be connected to
+        this terminal."""
+    )
+}
+
+class "PxrCameraProjectionAPI" (
+    doc = """API schema that is auto-applied _only_ to UsdGeomCamera and 
+    provides a RenderMan-specific projection output terminal to UsdGeomCamera
+    """
+)
+{
+    token outputs:ri:projection (
+        displayGroup = "Outputs"
+        doc = "Represents the projection output terminal on a camera prim."
+    )
+}
+
+class "PxrAttributesAPI"
+{
+    string primvars:ri:attributes:bake:activeudims = "" (
+        displayGroup = "Common"
+        displayName = "Active Udims"
+        doc = '''
+                Active udims for Integrator baking of texture atlases.  Lists and ranges of udims 
+                can be provided in the string, for example:
+                  Attribute "bake" "string activeudims" "1001,1003,1005-1006".
+                The default is "" which means all udims get baked.
+            '''
+    )
+    string primvars:ri:attributes:bake:udimresolutions = "" (
+        displayGroup = "Common"
+        displayName = "Udim Resolutions"
+        doc = '''
+                Udim texure resolutions for Integrator baking of texture atlases.  Lists and ranges
+                of udims can be provided in the string, for example:
+                Attribute "bake" "string udimresolutions" "1001 512 512  1002,1003 64 32  1005-1006 16 16"
+                If the string is empty (the default) then the Display Format resolution will be used.
+            '''
+    )
+    int primvars:ri:attributes:curves:widthaffectscurvature = 1 (
+        displayGroup = "Shading"
+        displayName = "Width Affects Curvature"
+        doc = """
+                Indicates whether curve width should be used when computing curve curvature.
+                If turned off, only the curvature along the curve spline will be calculated.
+            """
+    )
+    int primvars:ri:attributes:grouping:id = 0 (
+        displayGroup = "Common"
+        displayName = "Grouping Id"
+        doc = """
+                Grouping id used for raytrace disambiguation purposes.
+            """
+    )
+    string primvars:ri:attributes:grouping:membership = "" (
+        displayGroup = "Common"
+        displayName = "Membership"
+        doc = """
+                Grouping membership used for linking.
+            """
+    )
+    int primvars:ri:attributes:identifier:id = 0 (
+        displayGroup = "Common"
+        displayName = "Identifier Id"
+        doc = """
+                Lower 32 bits of 64 bit object id.
+            """
+    )
+    int primvars:ri:attributes:identifier:id2 = 0 (
+        displayGroup = "Common"
+        displayName = "Identifier Id 2"
+        doc = """
+                Upper 32 bits of 64 bit object id.
+            """
+    )
+    string primvars:ri:attributes:identifier:lpegroup = "" (
+        displayGroup = "Common"
+        displayName = "Identifier LPE Group"
+        doc = """
+                Grouping membership used for light path expressions.
+            """
+    )
+    string primvars:ri:attributes:identifier:name = "" (
+        displayGroup = "Common"
+        displayName = "Identifier Name"
+        doc = """
+                Object instance name.
+            """
+    )
+    string primvars:ri:attributes:lightfilter:subset = "" (
+        displayGroup = "Shading"
+        displayName = "Light Filter Subset"
+        doc = """
+                Active light filter groups in lighting.
+            """
+    )
+    string primvars:ri:attributes:lighting:excludesubset = "" (
+        displayGroup = "Shading"
+        displayName = "Lighting Excludesubset"
+        doc = """
+                Exclude light groups from lighting.
+            """
+    )
+    int primvars:ri:attributes:lighting:mute = 0 (
+        displayGroup = "Shading"
+        displayName = "Lighting Mute"
+        doc = """
+                Mutes light emission.
+            """
+    )
+    string primvars:ri:attributes:lighting:subset = "" (
+        displayGroup = "Shading"
+        displayName = "Lighting Subset"
+        doc = """
+                Light groups active in lighting.
+            """
+    )
+    int primvars:ri:attributes:Ri:Matte = 0 (
+        displayGroup = "Shading"
+        displayName = "Matte"
+        doc = """
+                Indicates matte object.
+            """
+    )
+    int primvars:ri:attributes:Ri:ReverseOrientation = 0 (
+        displayGroup = "Shading"
+        displayName = "Reverse Orientation"
+        doc = """
+                Flip shading normals.
+            """
+    )
+    int primvars:ri:attributes:Ri:Sides = 2 (
+        displayGroup = "Shading"
+        displayName = "Sides"
+        doc = """
+                Geometry can be one or two sided.
+            """
+    )
+    float primvars:ri:attributes:shade:indexofrefraction = -1 (
+        displayGroup = "Shading"
+        displayName = "Index Of Refraction"
+        doc = """
+                Override material IOR for nested dielectrics.
+            """
+    )
+    int primvars:ri:attributes:shade:minsamples = 1 (
+        displayGroup = "Shading"
+        displayName = "Min Samples"
+        doc = """
+                Min Pixel Samples.  For fine-tuning adaptive sampling.
+            """
+    )
+    float primvars:ri:attributes:shade:relativepixelvariance = 1 (
+        displayGroup = "Shading"
+        displayName = "Relative Pixel Variance"
+        doc = """
+                PixelVariance multiplier for camera visible objects.  For fine-tuning adaptive sampling.
+            """
+    )
+    string primvars:ri:attributes:stats:identifier = "" (
+        displayGroup = "Common"
+        displayName = "Stats Identifier"
+        doc = """
+                Identifier string used by the stats system when referring to this instance.
+            """
+    )
+    int primvars:ri:attributes:trace:holdout = 0 (
+        displayGroup = "Shading"
+        displayName = "Holdout"
+        doc = """
+                Indicates holdout object.
+            """
+    )
+    int primvars:ri:attributes:trace:intersectpriority = 0 (
+        displayGroup = "Shading"
+        displayName = "Intersect Priority"
+        doc = """
+                Raytrace intersection priority for nested dielectrics.
+            """
+    )
+    int primvars:ri:attributes:trace:maxdiffusedepth = 1 (
+        displayGroup = "Shading"
+        displayName = "Max Diffuse Depth"
+        doc = """
+                Maximum diffuse light bounces.
+            """
+    )
+    int primvars:ri:attributes:trace:maxspeculardepth = 2 (
+        displayGroup = "Shading"
+        displayName = "Max Specular Depth"
+        doc = """
+                Maximum specular light bounces.
+            """
+    )
+    string primvars:ri:attributes:trace:reflectexcludesubset = "" (
+        displayGroup = "Shading"
+        displayName = "Reflect Exclude Subset"
+        doc = """
+                Exclude object groups from relections.
+            """
+    )
+    string primvars:ri:attributes:trace:reflectsubset = "" (
+        displayGroup = "Shading"
+        displayName = "Reflect Subset"
+        doc = """
+                Object groups visible to reflections.
+            """
+    )
+    string primvars:ri:attributes:trace:shadowexcludesubset = "" (
+        displayGroup = "Shading"
+        displayName = "Shadow Exclude Subset"
+        doc = """
+                Exclude object groups from casting shadows.
+            """
+    )
+    string primvars:ri:attributes:trace:shadowsubset = "" (
+        displayGroup = "Shading"
+        displayName = "Shadow Subset"
+        doc = """
+                Object groups active in shadows.
+            """
+    )
+    string primvars:ri:attributes:trace:transmitexcludesubset = "" (
+        displayGroup = "Shading"
+        displayName = "Transmit Exclude Subset"
+        doc = """
+                Exclude object groups from refractions.
+            """
+    )
+    string primvars:ri:attributes:trace:transmitsubset = "" (
+        displayGroup = "Shading"
+        displayName = "Transmit Subset"
+        doc = """
+                Object groups visible to refractions.
+            """
+    )
+    int primvars:ri:attributes:visibility:camera = 1 (
+        displayGroup = "Shading"
+        displayName = "Camera Visibility"
+        doc = """
+                Indicates if object is visible to camera rays.
+            """
+    )
+    int primvars:ri:attributes:visibility:indirect = 1 (
+        displayGroup = "Shading"
+        displayName = "Indirect Visibility"
+        doc = """
+                Indicates if object is visible to indirect (reflection and refraction) rays.
+            """
+    )
+    int primvars:ri:attributes:visibility:transmission = 1 (
+        displayGroup = "Shading"
+        displayName = "Transmission Visibility"
+        doc = """
+                Indicates if object is visible to shadow rays.
+            """
+    )
+}
+
+class "PxrCameraAPI"
+{
+    float ri:apertureAngle = 0 (
+        displayGroup = "Common"
+        displayName = "Aperture Angle"
+        doc = "<help />"
+    )
+    float ri:apertureDensity = 0 (
+        displayGroup = "Common"
+        displayName = "Aperture Density"
+        doc = "<help />"
+    )
+    int ri:apertureNSides = 0 (
+        displayGroup = "Common"
+        displayName = "Aperture Number Of Sides"
+        doc = "<help />"
+    )
+    float ri:apertureRoundness = 1 (
+        displayGroup = "Common"
+        displayName = "Aperture Roundness"
+        doc = "<help />"
+    )
+    float ri:dofaspect = 1 (
+        displayGroup = "Common"
+        displayName = "DOF Aspect"
+        doc = """
+                Depth of field aspect.
+            """
+    )
+    float ri:shutterCloseTime = 1 (
+        displayGroup = "Common"
+        displayName = "Shutter Close Time"
+        doc = "<help />"
+    )
+    float[] ri:shutteropening = [0, 0, 0, 0, 1, 1, 1, 1] (
+        displayGroup = "Common"
+        displayName = "Shutter Opening"
+        doc = "<help />"
+    )
+    float ri:shutterOpenTime = 0 (
+        displayGroup = "Common"
+        displayName = "Shutter Open Time"
+        doc = "<help />"
+    )
+    float[] ri:stereoplanedepths = [] (
+        displayGroup = "Common"
+        displayName = "Stereo Plane Depths"
+        doc = '''
+                Control "ray bending" to enable multi-stereo camera workflows. Each depth element
+                defines a depth plane where camera rays bend by a horizontal (camera x) offset.
+                Every depth element must have a corresponding offset element. Values should be
+                positive and in increasing order.
+            '''
+    )
+    float[] ri:stereoplaneoffsets = [] (
+        displayGroup = "Common"
+        displayName = "Stereo Plane Offsets"
+        doc = '''
+                Control "ray bending" to enable multi-stereo camera workflows. Each offset element
+                defines a horizontal offset (camera x) of a virtual camera origin that bends rays
+                at the corresponding depth plane. Every offset element must have a corresponding
+                depth element.
+            '''
+    )
+}
+
+class "PxrDisplayChannelAPI"
+{
+    token ri:displayChannel:filter = "filter" (
+        allowedTokens = ["filter", "min", "max", "average", "zmin", "zmax", "sum"]
+        displayGroup = "Common"
+        displayName = "Accumulation Rule"
+        doc = """
+                Reconstruction rule.
+            """
+    )
+    float ri:displayChannel:relativepixelvariance = 0 (
+        displayGroup = "Common"
+        displayName = "Relative Pixel Variance"
+        doc = "<help />"
+    )
+    float3 ri:displayChannel:remap = (0, 0, 0) (
+        displayGroup = "Common"
+        displayName = "Remap"
+        doc = "<help />"
+    )
+    float ri:displayChannel:shadowthreshold = 0.01 (
+        displayGroup = "Common"
+        displayName = "Shadow Threshold"
+        doc = """
+                Threshold used to compute shadowing contributions in LPEs containing 
+                the 'shadow' token. 
+                If the shadow is cut, lower the threshold. 
+                If there are white pixels in shadowed areas, raise the threshold.
+            """
+    )
+    token ri:displayChannel:statistics = "none" (
+        allowedTokens = ["none", "variance", "mse", "even", "odd"]
+        displayGroup = "Common"
+        displayName = "Statistics"
+        doc = "<help />"
+    )
+}
+
+class "PxrOptionsAPI"
+{
+    token ri:bucket:order = "horizontal" (
+        allowedTokens = ["horizontal", "vertical", "zigzag-x", "zigzag-y", "spacefill", "random", "spiral", "circle"]
+        displayGroup = "Display"
+        displayName = "Bucket Order"
+        doc = """
+                Render bucket order.
+            """
+    )
+    int2 ri:bucket:orderorigin = (0, 0) (
+        displayGroup = "Display"
+        displayName = "Bucket Origin"
+        doc = '''
+                First bucket for "spiral" and "circle" order. Image center is [-1 -1].
+            '''
+    )
+    bool ri:checkpoint:asfinal = 0 (
+        displayGroup = "Display"
+        displayName = "Checkpoint As Final"
+        doc = """
+                When enabled, this keeps the extra channels and the
+                checkpoint tag when writing the final image for the render.
+                The final image will be identical to any other checkpoint,
+                rather than a slimmed down image. This means that once your
+                image has reached the quality you've set and it completes,
+                it can always be restarted by the user later.
+            """
+    )
+    string ri:checkpoint:command = "" (
+        displayGroup = "Display"
+        displayName = "Checkpoint Command"
+        doc = """
+                System command to be called after checkpoint.  If
+                system calls are enabled, then after a checkpoint has been
+                written, the specified command will be called.  This is
+                synchronous; the rendering threads are quiescent while this
+                runs and will not resume again until the process returns,
+                avoiding possible race conditions if the command takes a
+                token %i will be replaced with the current increment,
+                zero-padded to 5 digits.  The token %e will be replaced
+                with the elapsed time in seconds, zero-padded to 6 digits.
+                The token %r will be replaced with the reason for this
+                update to the checkpoint files (either completely
+                `finished`, `exiting` early due to exitat option, or a
+                normal `checkpoint`).  Literal % characters may be inserted
+                with %%.
+            """
+    )
+    string ri:checkpoint:exitat = "" (
+        displayGroup = "Display"
+        displayName = "Checkpoint Exit At"
+        doc = '''
+                How long render should run before writing a final
+                checkpoint and terminating.  Value can also be a string such
+                as "10m" or "0.5h". Set to 0 or empty to disable.
+            '''
+    )
+    string ri:checkpoint:interval = "" (
+        displayGroup = "Display"
+        displayName = "Checkpoint Interval"
+        doc = '''
+                Write framebuffers to disk every N progressive steps.
+                If value is positive the units will be interpreted as
+                seconds.  If value is negative its units will be
+                interpreted as increments.  Value can also be a string such
+                as "10m" or "0.5h".  Setting option to 0 or empty will disable
+                checkpoints.
+            '''
+    )
+    bool ri:checkpoint:keepfiles = 0 (
+        displayGroup = "Display"
+        displayName = "Keep Files"
+        doc = """
+                If set to true then prman will write to a new,
+                numbered image for each checkpoint.  Note:  This will
+                disable the final write of a checkpoint file which means
+                the render cannot be recovered using the 'recover' option.
+            """
+    )
+    float ri:curve:minwidth = 0 (
+        displayGroup = "Dicing"
+        displayName = "Min Width"
+        doc = """
+                Minimum curve width in raster coordinates.
+            """
+    )
+    int ri:deep:flagvolumes = 1 (
+        displayGroup = "Display"
+        displayName = "Deep Flag Volumes"
+        doc = """
+                Auto is off for dtex, on otherwise.
+            """
+    )
+    float ri:dice:offscreenmultiplier = 1 (
+        displayGroup = "Dicing"
+        displayName = "Dice Off Screen Multiplier"
+        doc = """
+                Dicing rate multiplier for objects outside the viewing frustum.
+            """
+    )
+    token ri:dice:triangle = "trim" (
+        allowedTokens = ["trim", "blp"]
+        displayGroup = "Dicing"
+        displayName = "Dice Triangle"
+        doc = '''
+                The method used for dicing "triangles". The default method "trim" renders
+                triangles by trimming a quad. The "blp" method renders a quad with two points
+                being coincident.
+            '''
+    )
+    bool ri:hider:adaptall = 0 (
+        displayGroup = "Common"
+        displayName = "Adapt All"
+        doc = '''
+                Enable adaptive sampling of all AOVs. When enabled, all channels (beauty pass +
+                AOVs) are considered when deciding if a pixel is converging. The default (off)
+                will ignore the AOVs and only the beauty pass is considered for pixel
+                convergence. So turning off "adaptall" may speed up your render if some of
+                your AOVs never reach the specified variance threshold.
+            '''
+    )
+    token ri:hider:adaptivemetric = "variance" (
+        allowedTokens = ["contrast", "variance", "halfbuffer", "contrast-v22", "variance-v22"]
+        displayGroup = "Common"
+        displayName = "Adaptive Metric"
+        doc = '''
+                Specifies the metric used to drive adaptive sampling.
+                "contrast" measures the contrast between samples in a pixel.
+                "variance" measures the variance of the samples in a pixel.
+                "halfbuffer" splits the samples into two classes and measures the
+                  difference between the average of each of the two sample classes.
+                "contrast-v22" uses the relative contrast computation of RenderMan 22 and older.
+                "variance-v22" uses the relative variance computation of RenderMan 22 and older.
+            '''
+    )
+    point3f ri:hider:bakebboxmax = (1e30, 1e30, 1e30) (
+        displayGroup = "Baking"
+        displayName = "Baking bbox max"
+        doc = '''
+                Bounding box max for "integrator" baking of 3D point clouds (and for the integrator
+                part of "all" baking.  In world space.  Ignored for "pattern" baking and for 2D baking.
+            '''
+    )
+    point3f ri:hider:bakebboxmin = (-1e30, -1e30, -1e30) (
+        displayGroup = "Baking"
+        displayName = "Baking bbox min"
+        doc = '''
+                Bounding box min for "integrator" baking of 3D point clouds (and for the integrator
+                part of "all" baking.  In world space.  Ignored for "pattern" baking and for 2D baking.
+            '''
+    )
+    token ri:hider:bakemode = "pattern" (
+        allowedTokens = ["pattern", "integrator", "all"]
+        displayGroup = "Baking"
+        displayName = "Bake Mode"
+        doc = """
+                Specifies whether the renderer should bake Pattern results or Integrator results
+                or both.
+            """
+    )
+    int ri:hider:bakeudimoffset = 0 (
+        displayGroup = "Baking"
+        displayName = "Baking udim offset"
+        doc = """
+                Offset when baking for a subset of udims.  Used together with bakeudimstride.
+                Default 0 means bake all udims when bakeudimstride is 1.
+            """
+    )
+    int ri:hider:bakeudimstride = 1 (
+        displayGroup = "Baking"
+        displayName = "Baking udim stride"
+        doc = """
+                Stride when baking for a subset of udims.  Default 1 means bake all udims.
+            """
+    )
+    bool ri:hider:bluenoise = 1 (
+        displayGroup = "Common"
+        displayName = "Blue Noise Samples"
+        doc = """
+                Setting to control whether the samples should have a visually
+                pleasing blue noise distribution or not.  Default is 1 (on).
+                Set to 0 (off) if the samples in adjacent pixels need to be
+                completely decorrelated.
+            """
+    )
+    float ri:hider:darkfalloff = 0.025 (
+        displayGroup = "Common"
+        displayName = "Dark Falloff"
+        doc = """
+                De-prioritize low luminance samples in the adaptive sampler.
+                Use this parameter to avoid oversampling dark areas while maintaining
+                overall image quality. Higher values cull more samples, speeding
+                up render time while increasing noise in darker areas.
+            """
+    )
+    int ri:hider:decidither = 0 (
+        displayGroup = "Common"
+        displayName = "Interactive Refinement"
+        doc = """
+                Maximum allowed pixel decimation rate for interactive
+                rendering.  When making rapid edits to heavy scenes and
+                this setting is non-zero, the renderer will try to reduce
+                tearing by updating the whole screen progressively with a
+                dissolve-like effect.  Set this to zero to disable this and
+                force it to fully update the buckets that it can get to.
+            """
+    )
+    float2 ri:hider:exposurebracket = (-1, 1) (
+        displayGroup = "Common"
+        displayName = "Exposure Bracket"
+        doc = """
+                Intended exposure Bracket [min max] in post-production to help inform
+                the adaptive sampling.
+            """
+    )
+    bool ri:hider:extrememotiondof = 0 (
+        displayGroup = "Common"
+        displayName = "Extreme Motion DOF"
+        doc = """
+                Enable improved sampling accuracy. In some cases where a large amount of
+                motion blur is used with depth of field, sampling artifacts could cause an
+                undesirable result. This flag causes a slower but more accurate sampling
+                method to be used to alleviate the artifacts. Due to the performance
+                degradations of this sampling method, this flag should only be used when
+                necessary.
+            """
+    )
+    bool ri:hider:geomShadowTermBias = 1 (
+        displayGroup = "Common"
+        displayName = "Geometric Shadow Terminator on Poly Meshes"
+        doc = """
+                This setting will control when to compute and apply a bias to Poly Meshes
+                to avoid the geometric shadow terminator artifacts that appear for shading points
+                when they are visible from a light wrt their shading normal, but not visible wrt
+                their geometric normal. The default value is 1 (on). Set to 0 (off) if you don't
+                want this bias to be applied to the Poly Meshes in your scene.
+            """
+    )
+    bool ri:hider:incremental = 0 (
+        displayGroup = "Common"
+        displayName = "Incremental"
+        doc = """
+                Enables the progressive display of results (rather than bucketed results).
+            """
+    )
+    bool ri:hider:invert = 1 (
+        displayGroup = "Baking"
+        displayName = "Baking Invert T"
+        doc = """
+                Specifies whether or not to invert the T texture coordinate when baking integrator
+                results.
+            """
+    )
+    bool ri:hider:jitter = 1 (
+        displayGroup = "Common"
+        displayName = "Jitter"
+        doc = """
+                This option toggles the jitter (variation) in camera samples.
+                By default, this hider option is enabled (set to 1), meaning that camera samples
+                will be placed randomly in a pixel location. When it is turned off,
+                camera rays are placed in the center of the pixel. When turned off, 
+                surface edges will appear aliased and jagged.
+            """
+    )
+    int ri:hider:maxsamples = 0 (
+        displayGroup = "Common"
+        displayName = "Max Samples"
+        doc = """
+                An explicit limit for the number of samples. If maxsamples is equal to its
+                default then the maximum number of samples will be set equal to 64.
+                Note that minsamples defaults to the square root of the maxsamples setting.
+            """
+    )
+    int ri:hider:minextrasamples = -1 (
+        displayGroup = "Common"
+        displayName = "Min Extra Samples"
+        doc = """
+                This is the minimum number of extra samples that a pixel
+                should continue shooting with after a sample fails to meet
+                its convergence test with the adaptive sampler.
+                Defaults to matching minsamples.
+            """
+    )
+    int ri:hider:minsamples = -1 (
+        displayGroup = "Common"
+        displayName = "Min Samples"
+        doc = """
+                Specifies the minimum number of samples for adaptive sampling. The default value
+                is the square root of maxsamples.
+            """
+    )
+    string[] ri:hider:primvar = ["st"] (
+        displayGroup = "Baking"
+        displayName = "Baking PrimVars"
+        doc = """
+                Specifies dicing manifold used when baking integrator results.
+            """
+    )
+    bool ri:hider:raytracebaketesselation = 0 (
+        displayGroup = "Baking"
+        displayName = "Raytrace Bake Tesselation"
+        doc = """
+                Force the tesselation to be the same as the baking tesselation when raytracing 
+                (for example when using a PxrOcclusion or PxrDirt shader). 
+                This can reduce self intersections and give cleaner results but may increase the 
+                density of polygons when raytracing.
+                If you have multiple pattern bakes at different resolutions, the highest resolution 
+                will be chosen. Don't attempt to use this option alongside interactive rendering.
+            """
+    )
+    bool ri:hider:samplemotion = 1 (
+        displayGroup = "Common"
+        displayName = "Sample Motion"
+        doc = """
+                This option toggles the sampling of motion blurred micropolygon in the
+                hider, and is thus only meaningful if motion blur is being used in your scene.
+                By default, this hider option is enabled (set to 1), meaning that micropolygons
+                will be blurred and sampled in the hider. When disabled (set to 0),
+                micropolygons will no longer be blurred before sampling; however, the dPdtime
+                variable will still be computed for all objects. This variable can be output
+                into a separate image using an arbitrary output variable (aov) and used to
+                perform motion blur as a postprocess.
+            """
+    )
+    int ri:hider:sampleoffset = 0 (
+        displayGroup = "Common"
+        displayName = "Sample Offset"
+        doc = """
+                This allows several images to be rendered in parallel (with different
+                sampleoffset values) and then combined.
+
+                With non-adaptive sampling:
+                Let's say you render four images with 256 samples each, with
+                sampleoffsets 0, 256, 512, and 768. If you combine those four images,
+                you'll get exactly the same image as if you had rendered a single image
+                with 1024 samples.
+
+                With adaptive sampling:
+                Let's say you again render four images, each with \"maxsamples\" 256,
+                with sampleoffsets 0, 256, 512, and 768. Let's say that due to
+                adaptive sampling, some given pixel only gets 64 pixel samples in each
+                of the four images. Then the combined image has been rendered with
+                sample numbers 0-63, 256-319, 512-575, and 768-831. Due to the
+                stratification of the samples, this is not quite as good as if you had
+                rendered a single image with 256 consecutive samples.  However, it
+                is still better than rendering a single image with only 64 samples.
+            """
+    )
+    int ri:hider:samplestride = 1 (
+        displayGroup = "Common"
+        displayName = "Sample Stride"
+        doc = """
+                This facilitates rendering several images in parallel (with the same 
+                aamplestride but different sampleoffset) and then combine them 
+                incrementally during interactive rendering.  Default value is 1.
+
+                With non-adaptive sampling:
+                Let's say you render four images with 256 samples each, with
+                samplestride 4 and sampleoffsets 0, 1, 2, and 3.  If you combine those
+                four images, you'll get exactly the same image as if you had rendered
+                a single image with 1024 samples, and during incremental/interactive
+                rendering you'll get the benefit of best use of the stratified
+                progressive sample sequences.  If you can \"assemble\" images with
+                samples 0-3, 4-7, 8-12, etc during interactive rendering, you've
+                got the benefits of faster rendering without jumping to high samples
+                early on.
+
+                With adaptive sampling:
+                Let's say you again render four images, each with \"maxsamples\" 256,
+                with samplestride 4 and sampleoffsets 0, 1, 2, and 3.  This time with
+                adaptive sampling (PixelVariance > 0).  Since each of the four images
+                is more noisy than the combined image, the adaptive sampling will use
+                more samples before deciding that the image error is acceptable than
+                if it had been rendered as a single image.  So the PixelVariance 
+                setting may need to be adjusted.
+            """
+    )
+    token ri:hider:type = "raytrace" (
+        allowedTokens = ["raytrace", "bake"]
+        displayGroup = "Common"
+        displayName = "Hider Type"
+        doc = """
+                Render mode.
+            """
+    )
+    float ri:lighting:minimumestimate = 0.000001 (
+        displayGroup = "Shading"
+        displayName = "Light Minimum Estimate"
+        doc = """
+                Minimum estimate for light selection. Local lights whose estimate 
+                falls below this value will be ignored. Increasing this value may 
+                help speed up direct lighting at the expense of accuracy.
+            """
+    )
+    bool ri:lighting:selectionlearningscheme = 1 (
+        displayGroup = "Shading"
+        displayName = "Light Learning Scheme"
+        doc = """
+                Employs a machine learning algorithm to more accurately importance
+                sample lights, taking into account occlusion and light filters.
+            """
+    )
+    int ri:limits:brickmemory = 2097152 (
+        displayGroup = "Configuration"
+        displayName = "Brick Memory Limit"
+        doc = """
+                Brickmap cache size in kB.
+            """
+    )
+    int2 ri:limits:bucketsize = (0, 0) (
+        displayGroup = "Configuration"
+        displayName = "Bucket Size Limit"
+        doc = """
+                Size of render buckets in pixels.
+            """
+    )
+    float ri:limits:deepshadowerror = 0.01 (
+        displayGroup = "Configuration"
+        displayName = "Deep Shadow Error Limit"
+        doc = """
+                Control lossy compression scheme to reduce file size of deep output. Setting to
+                a high value will result in lower numbers of samples stored for each pixel.
+            """
+    )
+    int ri:limits:geocachememory = 2097152 (
+        displayGroup = "Configuration"
+        displayName = "Geo Cache Memory Limit"
+        doc = """
+                Geometry cache size in kB.
+            """
+    )
+    int ri:limits:gridsize = 289 (
+        displayGroup = "Configuration"
+        displayName = "Grid Size Limit"
+        doc = "<help />"
+    )
+    int ri:limits:matrixcachememory = 0 (
+        displayGroup = "Configuration"
+        displayName = "Matrix Cache Memory"
+        doc = """
+                Matrix cache in kB.
+            """
+    )
+    int ri:limits:nurbcurvaturedicefactor = 3 (
+        displayGroup = "Configuration"
+        displayName = "Nurb Curvature Dice Factor Limit"
+        doc = """
+                NURBs max curvature multiplier.
+            """
+    )
+    int ri:limits:octreememory = 20480 (
+        displayGroup = "Configuration"
+        displayName = "Octree Memory Limit"
+        doc = """
+                None cache size in kB.
+            """
+    )
+    int ri:limits:opacitycachememory = 1048576 (
+        displayGroup = "Configuration"
+        displayName = "Opacity Cache Memory Limit"
+        doc = """
+                Opacity cache in kB.
+            """
+    )
+    float3 ri:limits:othreshold = (0.99609375, 0.99609375, 0.99609375) (
+        displayGroup = "Configuration"
+        displayName = "Opacity Threshold Limit"
+        doc = """
+                Opacity Culling: When rendering scenes with a large number
+                of semi-transparent layered objects (e.g. hair), the opacity
+                culling threshold can be set for a significant time and memory savings.
+                Essentially, a stack of visible points whose accumulated opacity is
+                greater (in each channel) than the specified limit will be considered
+                fully opaque by the hider, and objects behind the stack will be culled.
+            """
+    )
+    int ri:limits:pointmemory = 20480 (
+        displayGroup = "Configuration"
+        displayName = "Point Memory Limit"
+        doc = """
+                Point cache size in kB.
+            """
+    )
+    int ri:limits:proceduralbakingclumpsize = 0 (
+        displayGroup = "Configuration"
+        displayName = "Procedural Baking Clump Size Limit"
+        doc = "<help />"
+    )
+    int ri:limits:ptexturemaxfiles = 128 (
+        displayGroup = "Configuration"
+        displayName = "Ptex Max Files Limit"
+        doc = "<help />"
+    )
+    int ri:limits:ptexturememory = 32768 (
+        displayGroup = "Configuration"
+        displayName = "Ptex Memory Limit"
+        doc = """
+                PTex cache size in kB.
+            """
+    )
+    float ri:limits:rendermemory = 0 (
+        displayGroup = "Configuration"
+        displayName = "Render Memory Limit"
+        doc = """
+                Memory limit as percentage of machine memory.
+            """
+    )
+    int ri:limits:rendertime = 0 (
+        displayGroup = "Configuration"
+        displayName = "Render Time Limit"
+        doc = """
+                Maximum render time in minutes.
+            """
+    )
+    int ri:limits:shadesize = 289 (
+        displayGroup = "Configuration"
+        displayName = "Shade Size Limit"
+        doc = """
+                The maximum number of vertices, not grid.
+            """
+    )
+    int ri:limits:texturememory = 2097152 (
+        displayGroup = "Configuration"
+        displayName = "Texture Memory Limit"
+        doc = """
+                Texture cache size in kB.
+            """
+    )
+    float ri:limits:textureperthreadmemoryratio = 0.5 (
+        displayGroup = "Configuration"
+        displayName = "Texture Per Thread Memory Ratio"
+        doc = "<help />"
+    )
+    int ri:limits:threads = 0 (
+        displayGroup = "Configuration"
+        displayName = "Thread Limit"
+        doc = """
+                Set the number of threads that the renderer uses. If a value of 0 is specified
+                then all CPUs will be utilized for rendering.  If a negative value '-N' is
+                specified then prman will use all but N CPUs for rendering.
+            """
+    )
+    bool ri:osl:batched = 1 (
+        displayGroup = "OSL"
+        displayName = "SIMD Execution"
+        doc = """
+                Enable OSL optimizations that allow execution of multiple shading points
+                via vectorized instructions on supported processors (AVX, AVX2, AVX512).
+            """
+    )
+    int ri:osl:statisticslevel = 0 (
+        displayGroup = "OSL"
+        displayName = "Statistics Output Level"
+        doc = """
+                Set the level of OSL statistics to track. Level 2 and above
+                introduces timing which can have a small effect on performance.
+                Level 4 and above includes internal OSL statistics.
+                Level 5 includes statistics per shader. Other levels reserved
+                for future use.
+            """
+    )
+    int ri:osl:verbose = 4 (
+        displayGroup = "OSL"
+        displayName = "Message Verbosity"
+        doc = """
+               Sets the level of OSL messages to pass through.
+            """
+    )
+    float4 ri:Ri:CropWindow = (0, 1, 0, 1) (
+        displayGroup = "Display"
+        displayName = "Crop Window"
+        doc = """
+                Crop window [left right top bottom] in NDC space.
+            """
+    )
+    float ri:Ri:FormatPixelAspectRatio = 1 (
+        displayGroup = "Display"
+        displayName = "Pixel Aspect Ratio"
+        doc = """
+                Output image pixel aspect ratio.
+            """
+    )
+    int2 ri:Ri:FormatResolution = (0, 0) (
+        displayGroup = "Display"
+        displayName = "Resolution"
+        doc = """
+                Output image resolution.
+            """
+    )
+    int ri:Ri:Frame = 0 (
+        displayGroup = "Common"
+        displayName = "Frame Number"
+        doc = """
+                Frame number.
+            """
+    )
+    float ri:Ri:FrameAspectRatio = -1 (
+        displayGroup = "Display"
+        displayName = "Frame Aspect Ratio"
+        doc = """
+                Output image aspect ratio.
+            """
+    )
+    token ri:Ri:PixelFilterName = "gaussian" (
+        allowedTokens = ["gaussian", "box", "triangle", "catmull-rom", "separable-catmull-rom", "mitchell", "blackman-harris", "sinc", "bessel", "disk", "lanczos"]
+        displayGroup = "Common"
+        displayName = " Pixel Filter"
+        doc = """
+                 Distribution of camera ray directions for each pixel. In other words, the filter determines how the pixel samples are warped in screen space around the pixel center.
+            """
+    )
+    float2 ri:Ri:PixelFilterWidth = (2, 2) (
+        displayGroup = "Common"
+        displayName = "Filter Width"
+        doc = """
+                Width of the distribution of camera ray directions for each pixel.
+            """
+    )
+    float ri:Ri:PixelVariance = 0.015 (
+        displayGroup = "Common"
+        displayName = "Pixel Variance"
+        doc = """
+                Controls adaptive sampling. This sets the upper bound on the acceptable estimated
+                variance of the pixel values from the true pixel values.
+            """
+    )
+    float4 ri:Ri:ScreenWindow = (0, 0, 0, 0) (
+        displayGroup = "Display"
+        displayName = "Screen Window"
+        doc = """
+                Screen window [left right top bottom] in screen space.
+            """
+    )
+    float ri:shade:chiangCompatibilityVersion = 24 (
+        displayGroup = "Statistics"
+        displayName = "PxrChiangHair compatibility version"
+        doc = """
+                Setting to allow PxrChiang to work in compatibility mode for older versions
+                of the Bxdf, so renders from different versions can match their results.
+                The default value is 24.0.
+            """
+    )
+    bool ri:shade:debug = 0 (
+        displayGroup = "Statistics"
+        displayName = "Enable Shader Debug"
+        doc = """
+                Shading debug level.
+            """
+    )
+    bool ri:shade:incorrectPointOpacityCalculation = 0 (
+        displayGroup = "Statistics"
+        displayName = "Use old (incorrect) RiPoints opacity and falloff calculation"
+        doc = """
+                Use old method of combining RiPoint falloff with presence or opacity. This has been fixed
+                in R25. Setting this option will fall back to the old, incorrect, behavior for compatibility
+                purposes. This option will be removed in R26 and the new, correct, method will always be used.
+            """
+    )
+    float ri:shade:roughnessmollification = 1 (
+        displayGroup = "Statistics"
+        displayName = "Specular Roughness Mollification"
+        doc = """
+                Specular Roughness Mollification.  This selectively increases material
+                roughness on secondary bounces after diffuse or broad glossy reflections
+                and on highly curved surfaces.  This reduces noise and fireflies, but can
+                also make caustics blurrier or disappear entirely.  Set this value to 0.0
+                when you want to render ground-truth caustics.  The default value is 1.0.
+            """
+    )
+    bool ri:shade:shadowBumpTerminator = 1 (
+        displayGroup = "Statistics"
+        displayName = "Shadow bump terminator"
+        doc = """
+                Setting to control whether bump shadow terminators are smoothed in non-hair bxdfs.
+            """
+    )
+    bool ri:shade:subsurfaceTypeDefaultFromVersion24 = 0 (
+        displayGroup = "Statistics"
+        displayName = "Use old subsurfaceType default (0) in PxrSurface bxdf"
+        doc = """
+                Use old default value for PxrSurface 'surfaceType' parameter.  Old default is 0 (Jensen
+                dipole diffusion), new default is 5 (path-traced subsurface scattering).
+            """
+    )
+    float ri:Shutter:offset = 0 (
+        displayGroup = "Common"
+        displayName = "Shutter Offset"
+        doc = """
+                Offset shutter open/close.
+            """
+    )
+    float2 ri:statistics:displace_ratios = (0.1, 1) (
+        displayGroup = "Statistics"
+        displayName = "Displace Ratios"
+        doc = """
+                Suppress reporting of displacements that, when divided by the max
+                displacement, fall in the specified range.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:filename = "" (
+        displayGroup = "Statistics"
+        displayName = "Legacy Filename"
+        doc = """
+                File name for summary statistics reported in plain text.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:jsonFilename = "" (
+        displayGroup = "Statistics"
+        displayName = "JSON Filename"
+        doc = """File name for raw statistics JSON report.
+            """
+    )
+    bool ri:statistics:level = 0 (
+        displayGroup = "Statistics"
+        displayName = "Enable Statistics"
+        doc = """
+                Enable statistics reporting.
+                (Legacy Stats)
+            """
+    )
+    int ri:statistics:maxdispwarnings = 100 (
+        displayGroup = "Statistics"
+        displayName = "Max Displace Warnings"
+        doc = """
+                Modify the maximum reported displacement issues. If the value is set to 0,
+                then all displacements issues are reported.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:shaderprofile = "" (
+        displayGroup = "Statistics"
+        displayName = "Shader Profile"
+        doc = """
+                Shader profile filename.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:stylesheet = "" (
+        displayGroup = "Statistics"
+        displayName = "Style Sheet"
+        doc = """
+                Stylesheet for XML detailed statistics.
+                (Legacy Stats)
+            """
+    )
+    bool ri:statistics:texturestatslevel = 0 (
+        displayGroup = "Statistics"
+        displayName = "Enable Texture Statistics"
+        doc = """
+                Enable texture statistics reporting.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:xmlfilename = "" (
+        displayGroup = "Statistics"
+        displayName = "Legacy XML Filename"
+        doc = """
+                File name for detailed statistics reported as XML.
+                (Legacy Stats)
+            """
+    )
+    bool ri:stitch:refwarning = 1 (
+        displayGroup = "Dicing"
+        displayName = "Enable Stitch Ref Warning"
+        doc = """
+                Enable stitch warnings.
+            """
+    )
+    float ri:trace:bvhcompression = 0 (
+        displayGroup = "Shading"
+        displayName = "BVH Compression"
+        doc = """
+                Provides a hint to the system to favor memory utilization versus speed when
+                constructing the ray accelerator. Valid values are in the range [0, 1], where
+                the higher the values the more compact the memory representation.
+                The control behaves almost lineraly with some discontinuities in the compression
+                rate as different strategies are activated. The result obtained is likely to be
+                scene dependent.
+                As a rule of thumb, leave this control to 0 unless you need to reduce memory
+                utilization in order to render a given scene or sequence. When tuning, set the
+                control to 1 at first to see how much memory can be saved through compression and
+                what time overhead is generated, then dial the number back to a lower value (if
+                possible) and reach the deired balance between speed and memory usage.
+            """
+    )
+    bool ri:trace:incorrectCurveBias = 0 (
+        displayGroup = "Shading"
+        displayName = "Use old (incorrect) trace bias for reflection and shadow rays from round cubic curves"
+        doc = """
+                Use old (large) trace bias value for reflection and shadow rays from round cubic curves.
+                This has been fixed in R26. Setting this option will fall back to the old, incorrect, 
+                behavior for compatibility purposes.
+            """
+    )
+    float3 ri:trace:worldoffset = (0, 0, 0) (
+        displayGroup = "Shading"
+        displayName = "World Offset"
+        doc = '''
+                Used as the origin when the worldorigin option is set to "worldoffset".
+            '''
+    )
+    token ri:trace:worldorigin = "camera" (
+        allowedTokens = ["world", "worldoffset", "camera"]
+        displayGroup = "Shading"
+        displayName = "World Origin"
+        doc = """
+                Set a new world origin to give better floating point precision.
+            """
+    )
+    string ri:volume:aggregatespace = "world" (
+        displayGroup = "Volumes"
+        displayName = "Aggregate space"
+        doc = '''
+                Space in which to compute aggregate volume metadata. Valid spaces are
+                "world" and "camera". Generally the space should be chosen to minimize
+                the range of motion of the volumes.
+            '''
+    )
+}
+
+class "PxrPrimvarsAPI"
+{
+    int primvars:ri:curve:opacitysamples = 0 (
+        displayGroup = "Curves"
+        displayName = "Opacity Samples"
+        doc = """
+                number of opacity/presence shading samples along a curve for opacity caching, if equal to zero then the value is determined using the dicing oracle and the length of each curve.
+            """
+    )
+    bool primvars:ri:curve:widthaffectscurvature = 1 (
+        displayGroup = "Curves"
+        displayName = "Width Affects Curvature"
+        doc = """
+                When true the curve width of round curves is taken into account in the computation of the tube curvature, otherwise only the curvature along the curve is. This control does not affect curve ribbons.
+            """
+    )
+    bool primvars:ri:derivatives:extrapolate = 1 (
+        displayGroup = "Shading"
+        displayName = "derivatives:extrapolate"
+        doc = """
+                Extrapolated smooth normals across grid boundaries.
+            """
+    )
+    float primvars:ri:dice:micropolygonlength = 1 (
+        displayGroup = "Dicing"
+        displayName = "Micropolygon Length"
+        doc = '''
+                Micropolygon distance in raster space for "instanceprojection" dicing. Values
+                are expressed in pixel size.
+            '''
+    )
+    float primvars:ri:dice:minlength = -1 (
+        displayGroup = "Volume"
+        displayName = "Min Length"
+        doc = """
+                Volume minimum dice length. Negative indicates to automatically compute this value.
+            """
+    )
+    string primvars:ri:dice:minlengthspace = "" (
+        displayGroup = "Volume"
+        displayName = "Min Length Space"
+        doc = """
+                Coordinate space of dice:minlength.
+            """
+    )
+    float primvars:ri:dice:offscreenmultiplier = -1 (
+        displayGroup = "Dicing"
+        displayName = "Dice Off Screen Multiplier"
+        doc = """
+                Dicing rate multiplier for objects outside the viewing frustum. If a value
+                less than zero is specified, the value from the Option with the same name 
+                will be used instead.
+            """
+    )
+    token primvars:ri:dice:offscreenstrategy = "viewfrustumdistance" (
+        allowedTokens = ["viewfrustumdistance", "worlddistance", "objectdistance", "planarprojection", "sphericalprojection"]
+        displayGroup = "Dicing"
+        displayName = "Off Screen Dicing Strategy"
+        doc = """
+                Dicing method of objects outside the viewing frustum.
+            """
+    )
+    bool primvars:ri:dice:pretessellate = 1 (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Pretessellate"
+        doc = """
+                Pre-tessellate subdivision geometry to polygons.
+            """
+    )
+    bool primvars:ri:dice:rasterorient = 1 (
+        displayGroup = "Dicing"
+        displayName = "Raster Oriented Dicing"
+        doc = """
+                Turning this off enables non-oriented dicing, a mode of dicing that
+                computes micropolygon sizes using non-oriented raster space rather than
+                screen-aligned raster space. Non-oriented dicing is useful for displacement
+                around edges where projected micropolygon distance can be arbitrarily small.
+            """
+    )
+    string primvars:ri:dice:referencecamera = "" (
+        displayGroup = "Dicing"
+        displayName = "Reference Camera"
+        doc = """
+                Specify the camera used for dicing. If no reference camera is specified, RenderMan
+                will use the primary camera.
+            """
+    )
+    string primvars:ri:dice:referenceinstance = "" (
+        displayGroup = "Dicing"
+        displayName = "Reference Instance"
+        doc = """
+                Specify the reference instance used for dicing and displacement shading.
+                The reference instance is used to drive dicing and displacement based on its
+                position, scale, user attributes, and scoped coordinate systems. Reference
+                instances are specified by its identifier:name attribute (instance name). If no
+                reference instance is specified, RenderMan will automatically pick the nearest
+                instance inside the primary camera's view frustum.
+            """
+    )
+    token primvars:ri:dice:strategy = "instanceprojection" (
+        allowedTokens = ["instanceprojection", "worlddistance", "objectdistance", "sphericalprojection"]
+        displayGroup = "Dicing"
+        displayName = "Dicing strategy"
+        doc = """
+                Dicing method of objects within the viewing frustum.
+            """
+    )
+    bool primvars:ri:dice:watertight = 0 (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Watertight"
+        doc = """
+                Tessellate geometry with no holes. Watertight geometry requires less raytrace bias.
+            """
+    )
+    float primvars:ri:dice:worlddistancelength = -1 (
+        displayGroup = "Dicing"
+        displayName = "Dicing Distance Length"
+        doc = '''
+                Micropolygon distance in world space for "worlddistance" dicing or object space for
+                "objectdistance" dicing.
+            '''
+    )
+    int primvars:ri:displacement:ignorereferenceinstance = 0 (
+        displayGroup = "Shading"
+        displayName = "Displacement Ignores Reference Instance"
+        doc = """
+                Indicates if displacement shading should ignore properties of the reference instance.
+            """
+    )
+    string primvars:ri:displacementbound:CoordinateSystem = "object" (
+        displayGroup = "Shading"
+        displayName = "displacement Bound Coordinate System"
+        doc = """
+                The name of the coordinate system that the displacement bound is measured in.
+            """
+    )
+    int primvars:ri:displacementbound:offscreen = 0 (
+        displayGroup = "Shading"
+        displayName = "Displacement Bound Off Screen"
+        doc = """
+                Apply displacementbound to offscreen geometry when dicing. Geometry that is
+                entirely offscreen, but displaces into view may be prone to undertessellation
+                because of the offscreen dicing strategy. This can be corrected by enabling this
+                control and setting a reasonable displacementbound. Doing so will incur a
+                performance penalty commensurate with the size of the displacement bound.
+            """
+    )
+    float primvars:ri:displacementbound:sphere = 0 (
+        displayGroup = "Shading"
+        displayName = "Displacement Bound Radius"
+        doc = """
+                Maximum displacement distance used to compute object bounds. This value should
+                be as tight as possible.
+            """
+    )
+    float primvars:ri:falloffpower = 0 (
+        displayGroup = "Points"
+        displayName = "Falloff Power"
+        doc = '''
+                For use with points, if not supplied, or set to zero, the points will have a hard edge. A value of 1 is a "reasonable" value that emulates the usual cosine based falloff; this will likely be the goto value for most people doing volumetric particle effects. Values between 0 and 1 makes the falloff faster, eroding the point faster - point has "less presence". Values higher than 1 (up to infinity) makes the falloff slower to the point of being non-existent.
+            '''
+    )
+    string primvars:ri:identifier:object = "" (
+        displayGroup = "Common"
+        displayName = "Identifier Object"
+        doc = """
+                Object shape name.
+            """
+    )
+    bool primvars:ri:polygon:concave = 1 (
+        displayGroup = "PolygonMesh"
+        displayName = "Concave"
+        doc = """
+                Allow concave polygons.
+            """
+    )
+    bool primvars:ri:polygon:smoothdisplacement = 0 (
+        displayGroup = "PolygonMesh"
+        displayName = "Prevent Polygon Cracking"
+        doc = """
+                Output smoothed (per-vertex) normals as Ndsp primvar, if
+                polygon:smoothnormals hasn't already inserted smooth normals.
+            """
+    )
+    bool primvars:ri:polygon:smoothnormals = 0 (
+        displayGroup = "PolygonMesh"
+        displayName = "Smooth Normals"
+        doc = """
+                Smooth (per-vertex) normals if not provided.
+            """
+    )
+    int primvars:ri:procedural:immediatesubdivide = 0 (
+        displayGroup = "Procedural"
+        displayName = "Immediate Subdivide"
+        doc = """
+                Used by RiProcedural to compel a procedural to immediately subdivide (behavior 
+                supported via the __immediatesubdivide meta-parameter in RiProcedural2). This 
+                attribute is \"special\" in that it is not inherited into sub-procedural contexts - 
+                meaning parent immediate-subdivide procedurals don't accidentally trigger 
+                immediate-subdivide children. A value of 0 (the default) disables, 1 enables, and 2 
+                forces all child procedurals to crack immediately.
+            """
+    )
+    bool primvars:ri:procedural:reentrant = 0 (
+        displayGroup = "Procedural"
+        displayName = "Reentrant"
+        doc = """
+                Enabling this attribute will cause any subsequent procedural to not lock the global 
+                mutex. Note that this requires that the procedural be thread safe. This attribute is
+                disabled by default, i.e. all procedurals remain locked.
+            """
+    )
+    float[] primvars:ri:Ri:Bound = [0, 0, 0, 0, 0, 0] (
+        displayGroup = "Volume"
+        displayName = "Bound"
+        doc = """
+                Volume bounds.
+            """
+    )
+    float primvars:ri:Ri:GeometricApproximationFocusFactor = 0 (
+        displayGroup = "Dicing"
+        displayName = "Focus Factor"
+        doc = """
+                Allows the renderer to use more coarse dicing for blurry objects due to
+                depth of field.
+            """
+    )
+    token primvars:ri:Ri:Orientation = "outside" (
+        allowedTokens = ["inside", "outside"]
+        displayGroup = "Shading"
+        displayName = "Orientation"
+        doc = """
+                Geometry winding order that determines surface normal. This attribute effects
+                lighting and displacement.
+            """
+    )
+    int[] primvars:ri:shade:faceset = [] (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Face Set"
+        doc = """
+                Active geometry face indexes.
+            """
+    )
+    string primvars:ri:stats:prototypeIdentifier = "" (
+        displayGroup = "Common"
+        displayName = "Stats Prototype Identifier"
+        doc = """
+                Identifier string used by the stats system when referring to this prototype.
+            """
+    )
+    string primvars:ri:stitchbound:CoordinateSystem = "" (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Stitch Bound Coordinate System"
+        doc = "<help />"
+    )
+    float primvars:ri:stitchbound:sphere = 0 (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Stitch Bound Radius"
+        doc = "<help />"
+    )
+    bool primvars:ri:trace:autobias = 1 (
+        displayGroup = "Shading"
+        displayName = "Auto Trace Bias"
+        doc = """
+                Enable automatic raytrace bias.
+            """
+    )
+    float primvars:ri:trace:bias = 0.01 (
+        displayGroup = "Shading"
+        displayName = "Trace Bias"
+        doc = """
+                Manual raytrace bias in object space. Small values should be used to avoid
+                artifacts such as shadow acne.
+            """
+    )
+    bool primvars:ri:trace:displacements = 1 (
+        displayGroup = "Shading"
+        displayName = "Enable Displacement"
+        doc = """
+                Enable displacement shading.
+            """
+    )
+    bool primvars:ri:trace:sssautobias = 1 (
+        displayGroup = "Shading"
+        displayName = "Auto Trace Bias for Subsurface scattering"
+        doc = """
+                Enable automatic raytrace bias for subsurface scattering rays.
+            """
+    )
+    float primvars:ri:trace:sssbias = 0.0001 (
+        displayGroup = "Shading"
+        displayName = "Trace Bias for Subsurface scattering"
+        doc = """
+                Manual raytrace bias (in object space) for subsurface scattering rays.
+                Small values should be used to avoid artifacts such as surface acne.
+            """
+    )
+    token primvars:ri:trimcurve:sense = "inside" (
+        allowedTokens = ["inside", "outside"]
+        displayGroup = "NuPatch"
+        displayName = "Trim Curve Sense"
+        doc = "<help />"
+    )
+    string primvars:ri:volume:aggregate = "globalVolumeAggregate" (
+        displayGroup = "Volume"
+        displayName = "Aggregate"
+        doc = """
+                The name of the volume aggregate to which a volume
+                belongs. If non-empty, the volume will only be
+                rendered if the integrator explicitly uses that named
+                aggregate, or if a surface shader such as PxrSurface
+                binds the named aggregate to its interior.
+            """
+    )
+    bool primvars:ri:volume:aggregaterespectvisibility = 1 (
+        displayGroup = "Volume"
+        displayName = "Aggregate Respect Visibility"
+        doc = """
+                If set to 1, standard visibility attributes will be respected by
+                the volume if it is part of an aggregate. If set to 0, the visibility 
+                attributes will be ignored and only the integrator visibility settings
+                will apply.
+            """
+    )
+    bool primvars:ri:volume:dsominmax = 1 (
+        displayGroup = "Volume"
+        displayName = "DSO Min/Max"
+        doc = """
+                Currently only used for aggregate volumes, and only
+                for volumes that use an ImplicitField DSO. If set to
+                1, the DSO may be able to use stored information from
+                the file directly to compute the minimum and maximum
+                values within the volume. This may allow the renderer to
+                avoid shading the volume up front, greatly decreasing
+                time to first pixel. This can only be enabled if the
+                density signal from the volume is used directly, or if
+                the density signal is modulated only by the DSO
+                itself. Any shading modifications of the density
+                signal requires setting this parameter to off.
+            """
+    )
+    bool primvars:ri:volume:dsovelocity = 0 (
+        displayGroup = "Volume"
+        displayName = "DSO Velocity"
+        doc = """
+                Used only for aggregate volumes that use an ImplicitField DSO. If set to 1,
+                the DSO can provide velocity bounds to the renderer directly via the BoxMotion
+                call. This can allow the renderer to avoid upfront shading of the volume's
+                velocity data when using Eulerian velocity, improving render time and time to
+                first pixel greatly. This can only be enabled if the velocity signal from the DSO
+                is used directly.
+            """
+    )
+    float primvars:ri:volume:fps = 1 (
+        displayGroup = "Volume"
+        displayName = "Velocity frames per second"
+        doc = """
+                The frames per second for volumetric velocity data. The 
+                velocity data will be divided by this quantity to derive
+                the velocity for the frame.
+            """
+    )
+    float primvars:ri:volume:shutteroffset = 1 (
+        displayGroup = "Volume"
+        displayName = "Shutter offset"
+        doc = """
+                The shutter offset used to interpret volumetric velocity.
+                A value of 1 will use the current position of the 
+                object and the position of the object on the next frame 
+                as the time interval to use for motion blur. A value of -1 
+                will use the position of the object on the previous frame 
+                and the current position of the object as the time. A value 
+                of 0 will generate an interval which begins halfway through 
+                the previous frame and ends halfway into the next frame.
+            """
+    )
+    bool primvars:ri:volume:velocityshuttercorrection = 0 (
+        displayGroup = "Volume"
+        displayName = "Velocity Shutter Correction"
+        doc = """
+                If set to 1, volumetric velocity data for Eulerian motion 
+                blur will be assumed to be relative to the entire frame, 
+                and will be corrected to match the current shutter interval.
+                If set to 0, no correction will be made.
+            """
+    )
+}
+
+class PxrUnified "PxrUnified"
+{
+    bool inputs:ri:accumOpacity = 1 (
+        displayName = "Accumulate Opacity"
+        doc = "When enabled, refractive objects produce partial alpha.\\nWhen disabled, refractive objects produce full alpha."
+    )
+    int inputs:ri:allowMultilobeIndirect = 0 (
+        displayGroup = "Sampling"
+        displayName = "Multi-Lobe Indirect"
+        doc = "if enabled, Hair may converge faster but this might break any LPE related operations."
+    )
+    float inputs:ri:catchAllLights = 0 (
+        displayName = "Catch Light on last Hit"
+        doc = """
+           On a path's last hit, the lights can be evaluated without shadowing to avoid a black contribution.
+           This parameter scales the last hit's intensity from 0 (no light evaluation) and 1 (light evaluation).
+        """
+    )
+    float inputs:ri:causticClamp = 1000000 (
+        displayGroup = "Sampling:Intensity Clamping"
+        displayName = "Max Caustics Value"
+        doc = "Maximum value of caustics samples."
+    )
+    float inputs:ri:directClamp = 1000000 (
+        displayGroup = "Sampling:Intensity Clamping"
+        displayName = "Max Direct Lighting Value"
+        doc = "Maximum value of direct lighting samples."
+    )
+    float inputs:ri:emissionMultiplier = 1 (
+        displayName = "Emission Multiplier"
+        doc = "Internally multiplies all emission values (light/glow) during lighting integration."
+    )
+    bool inputs:ri:enableSampleTimers = 0 (
+        displayGroup = "Diagnostic"
+        displayName = "Enable Sample Timers"
+        doc = "enable the timers that track pixel sample iteration cost"
+    )
+    bool inputs:ri:enableShadingTimers = 0 (
+        displayGroup = "Diagnostic"
+        displayName = "Enable Shading Timers"
+        doc = "enable the timers that will track shading cost grouped by the profileGroup user attribute"
+    )
+    bool inputs:ri:enableVolumeCaustics = 0 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Enable Volume Caustics"
+        doc = '''
+                Enable volume integrator when evaluating throughput along the caustic path.
+                Volume GPrims need to be member of the group "mw_volume_include_subset".
+                If this is turned on, shadow computation will be more expensive.
+                Should only be used when necessary.
+            '''
+    )
+    float inputs:ri:indirectClamp = 8 (
+        displayGroup = "Sampling:Intensity Clamping"
+        displayName = "Max Indirect Value"
+        doc = "Maximum value of indirect samples."
+    )
+    float inputs:ri:indirectDirectionalBlurRadius = 0 (
+        displayGroup = "IndirectGuiding"
+        displayName = "Directional Blur Radius"
+        doc = """
+                Blurs the node contributions of the directional tree.
+                This only affects the sampling distribution.
+            """
+    )
+    int inputs:ri:indirectOversampling = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "IndirectGuiding"
+        displayName = "Oversampling"
+        doc = """
+                Oversample the tree lookups for better estimates.
+            """
+    )
+    float inputs:ri:indirectSpatialBlurRadius = 0.25 (
+        displayGroup = "IndirectGuiding"
+        displayName = "Spatial Blur Radius"
+        doc = """
+                Blurs the node contributions of the spatial tree to hide node boundaries.
+                This only affects the sampling distribution.
+            """
+    )
+    int inputs:ri:indirectTrainingSamples = 0 (
+        displayGroup = "IndirectGuiding"
+        displayName = "Training Samples"
+        doc = """
+                The number of samples used to learn the scene's illumination.
+                This number should never be larger than minsamples and represent 10-20% of maxsamples.
+                64 training samples is a bare minimum and you will get better results with larger numbers.
+            """
+    )
+    bool inputs:ri:manifoldWalk = 0 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Enable Manifold Walk"
+        doc = "Enable Manifold Walk"
+    )
+    int inputs:ri:maxIndirectBounces = 8 (
+        displayName = "Max Indirect Bounces"
+        doc = '''
+            The maximum number of bounces of indirect illumination in your scene.
+            0 means direct illumination only, 1 means one bounce of indirect, etc.
+            Note: this parameter used to be called "maxPathLength" -- the new name
+            is more descriptive, but the effect is the same.
+        '''
+    )
+    int inputs:ri:maxInterfaces = 2 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Max Number of Interfaces"
+        doc = """
+                Maximum number of transmitive interfaces in the caustic sub-path found by the manifold walk.
+            """
+    )
+    int inputs:ri:maxIterations = 10 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Max Iterations"
+        doc = """
+                Maximum number of iterations before the walk gives up on a caustic path.
+            """
+    )
+    int inputs:ri:maxNonStochasticOpacityEvents = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Stochastic Opacity Depth"
+        doc = '''
+    Defines the camera ray depth for which opacity
+    calculations are computed with no noise (using
+    continuation rays). Once this depth is exceeded,
+    the opacity computation will switch to a stochastic
+    "presence" style of opacity, which may introduce
+    noise.
+    The default is 0.
+        '''
+    )
+    float inputs:ri:maxRayDistance = 10000 (
+        displayName = "Max Ray Distance"
+        doc = "Objects beyond that distance will NOT be hit."
+    )
+    int inputs:ri:numBxdfSamples = 1 (
+        displayGroup = "Sampling"
+        displayName = "BxDF Samples"
+        doc = "Number of BxDF samples for each iteration."
+    )
+    int inputs:ri:numIndirectSamples = 1 (
+        displayGroup = "Sampling"
+        displayName = "Indirect Samples"
+        doc = "Number of indirect samples for each iteration."
+    )
+    int inputs:ri:numLightSamples = 1 (
+        displayGroup = "Sampling"
+        displayName = "Light Samples"
+        doc = "Number of light samples for each iteration."
+    )
+    int inputs:ri:numVolumeAggregateSamples = 1 (
+        displayGroup = "Sampling"
+        displayName = "Volume Aggregate Samples"
+        doc = "Number of volume aggregate samples for each iteration."
+    )
+    bool inputs:ri:photonAdaptive = 0 (
+        displayGroup = "Photons"
+        displayName = "Adaptive Photons"
+        doc = "Enables robust progressive photon mapping"
+    )
+    int inputs:ri:photonEstimationNumber = 64 (
+        displayGroup = "Photons"
+        displayName = "Estimation Number"
+        doc = "Estimation Number"
+    )
+    float inputs:ri:photonEstimationRadius = 0 (
+        displayGroup = "Photons"
+        displayName = "Estimation Radius"
+        doc = "in scene units"
+    )
+    bool inputs:ri:photonVisibilityRod = 0 (
+        displayGroup = "Photons"
+        displayName = "Visibility Rod"
+        doc = "Visibility Rod"
+    )
+    float inputs:ri:photonVisibilityRodDirectProb = 0 (
+        displayGroup = "Photons"
+        displayName = "Visibility Rod Probability"
+        doc = "Visibility Rod Probability"
+    )
+    point3f inputs:ri:photonVisibilityRodMax = (0, 0, 0) (
+        displayGroup = "Photons"
+        displayName = "Visibility Rod Max"
+        doc = "Visibility Rod Max"
+    )
+    point3f inputs:ri:photonVisibilityRodMin = (0, 0, 0) (
+        displayGroup = "Photons"
+        displayName = "Visibility Rod Min"
+        doc = "Visibility Rod Min"
+    )
+    bool inputs:ri:risPathGuiding = 0 (
+        displayGroup = "Sampling"
+        displayName = "RIS path guiding"
+        doc = "Use learnt results to guide indirect path sampling. Requires light learning to be enabled"
+    )
+    int inputs:ri:rouletteDepth = 1 (
+        displayGroup = "Sampling:Russian Roulette"
+        displayName = "Start Depth"
+        doc = """
+                    The path length at which the integrator will begin performing Russian roulette (a method of probabilistically terminating a ray path).
+                    Decreasing this setting will lead to shorter paths and faster renders, but will result in more noise.
+                """
+    )
+    int inputs:ri:rouletteLightDepth = 1 (
+        displayGroup = "Sampling:Russian Roulette"
+        displayName = "Light Start Depth"
+        doc = """
+                    Path length at which the integrator will start to drop low contribution lights.
+                    Only available during bidirectional integration.
+                """
+    )
+    float inputs:ri:rouletteThreshold = 0.2 (
+        displayGroup = "Sampling:Russian Roulette"
+        displayName = "Threshold"
+        doc = """
+                    The path throughput threshold below which Russian roulette is applied.
+                    It is usually preferable to apply Russian roulette only to paths of low importance in order to avoid noise.
+                    Increasing this setting will apply Russian roulette to more paths and thus increase the speed of the render, but may also increase noise.
+                """
+    )
+    int inputs:ri:sssOversampling = 8 (
+        displayGroup = "Sampling"
+        displayName = "SubSurface Over-Sampling"
+        doc = "Number of importance-resampled samples taken for subsurface scattering events."
+    )
+    int inputs:ri:suppressNaNs = 0 (
+        displayGroup = "Diagnostic"
+        displayName = "Suppress NaNs"
+        doc = "Suppresses individual invalid samples (NaN or inf), preventing them from reaching the final image. Be aware that there is a cost to checking for this, and it should not be enabled broadly or blindly."
+    )
+    int inputs:ri:traceLightPaths = 0 (
+        displayName = "Trace Light Paths"
+        doc = """
+        PxrUnified has 4 integration modes:
+        - Off: unidirectional path tracing
+        - On: bidirectional path tracing
+        - Photons Only: progressive photon mapping
+        - UPS/VCM: bidirectional path tracing with vertex connection and merging.
+        """
+    )
+    bool inputs:ri:useTraceDepth = 0 (
+        displayName = "Use Trace Depth"
+        doc = """
+           When enabled, the trace:maxdiffusedepth and
+           trace:maxspeculardepth attributes are also used to limit
+           the ray depth. When disabled, only the maxPathLength
+           parameter is used.
+        """
+    )
+    float inputs:ri:walkThreshold = 0.005 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Threshold"
+        doc = """
+                Convergence threshold for the manifold walk algorithm.
+            """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrUnified" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrAovLight "PxrAovLight" (
+    apiSchemas = ["LightAPI"]
+)
+{
+    string inputs:ri:light:aovName = "" (
+        connectability = "interfaceOnly"
+        displayName = "AOV Name"
+        doc = """
+            The name of the AOV to write to.
+        """
+    )
+    bool inputs:ri:light:inPrimaryHit = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "In Primary Hit"
+        doc = """
+                If this is on, the usual mask of the illuminated objects is
+                generated. If this is off, you can get a mask of only in
+                the refraction or reflection.
+            """
+    )
+    bool inputs:ri:light:inReflection = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "In Reflection"
+        doc = """
+                If this is on, the rays are traced through the specular reflections to get
+                the masking signal.
+
+                Warning: this will require some amount of samples to get a clean mask.
+            """
+    )
+    bool inputs:ri:light:inRefraction = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "In Refraction"
+        doc = """
+                If this is on, the rays are traced through the glass refractions
+                to get the masking signal.
+
+                Warning: this will require some amount of samples to get a clean mask.
+            """
+    )
+    bool inputs:ri:light:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Invert"
+        doc = """
+                If this is on, it inverts the signal for the AOV.
+            """
+    )
+    bool inputs:ri:light:onVolumeBoundaries = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "On Volume Boundaries"
+        doc = """
+                If this is on, the bounding box or shape of volumes will appear in
+                the mask. Since this is not always desirable, this can be turned off.
+            """
+    )
+    bool inputs:ri:light:useColor = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Use Color"
+        doc = """
+                If this is on, it outputs a RGB color image instead of a float image
+                for the AOV.
+            """
+    )
+    bool inputs:ri:light:useThroughput = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Use Throughput"
+        doc = """
+                If this is on, the values in the mask for the reflected or refracted
+                rays will be affected by the strength of the reflection or refraction.
+                This can lead to values below and above 1.0. Turn this off if you
+                want a more solid mask.
+            """
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:light:shaderId = "PxrAovLight" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+    uniform token[] xformOpOrder (
+        doc = """Encodes the sequence of transformation operations in the
+        order in which they should be pushed onto a transform stack while
+        visiting a UsdStage's prims in a graph traversal that will effect
+        the desired positioning for this prim and its descendant prims.
+        
+        You should rarely, if ever, need to manipulate this attribute directly.
+        It is managed by the AddXformOp(), SetResetXformStack(), and
+        SetXformOpOrder(), and consulted by GetOrderedXformOps() and
+        GetLocalTransformation()."""
+    )
+}
+
+class "PxrCylinderLightAPI"
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. It's recommended to leave this at the default unless
+                you experience unsolvable noise from the light.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and the light
+                at which the sample doesn't get brighter. This may help you avoid hot spots and
+                sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface. 
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrCylinderLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrDiskLightAPI"
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator.  It's recommended to leave this at the default unless
+                you experience unsolvable noise from the light.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and
+                the light at which the sample doesn't get brighter. This may help you
+                avoid hot spots and sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrDiskLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrDistantLightAPI"
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used
+                to prevent occlusion during the search of caustic paths.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. You might find need for this if you have
+                unsolvable noise from this light and need more samples.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is
+                useful to generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrDistantLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrDomeLightAPI"
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float3 inputs:ri:light:colorMapGamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Gamma"
+        doc = """
+                colorMapGamma: Gamma-correct the texture.
+            """
+    )
+    float inputs:ri:light:colorMapSaturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Saturation"
+        doc = """
+                colorMapSaturation: Adjust the texture's saturation.
+            """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. It's recommended to leave this at the
+                default unless you experience unsolvable noise from the light.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrDomeLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrEnvDayLight "PxrEnvDayLight" (
+    apiSchemas = ["LightAPI"]
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    int inputs:ri:light:day = 20 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Day"
+        doc = """
+                day: Day of the month, 1 through 31.
+
+                This is ignored if month is 0.
+            """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. You might find need for this if you have
+                unsolvable noise from this light and need more samples.
+            """
+    )
+    color3f inputs:ri:light:groundColor = (0.18, 0.18, 0.18) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Ground Color"
+        doc = """
+              groundColor: A flat color for the diffuse ground floor.
+            """
+    )
+    int inputs:ri:light:groundMode = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Ground Mode"
+        doc = """
+              Legacy: Old behavior,
+              Horizon Clamping: Smear horizon values on the virtual ground plane,
+              Diffuse Ground: A fake infinite ground plane with diffuse color
+            """
+    )
+    float inputs:ri:light:haziness = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Haziness"
+        doc = """
+              haziness: The turbidity of the sky.  The lower limit of the model is 1.7 for
+              an exceptionally clear sky, and 10, for an inversion, is the upper
+              limit.
+            """
+    )
+    float inputs:ri:light:hour = 14.633333 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Hour"
+        doc = """
+              hour: Hours since midnight, local standard time.  May be fractional to
+              include minutes and seconds.  If daylight saving time is in effect,
+              subtract 1 to correct to standard time.
+
+              This is ignored if month is 0.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:latitude = 47.6019 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Latitude"
+        doc = """
+                latitude: Latitude in degrees.  Positive for north, negative for south.  Ranges frmo -90 to +90 degrees.
+
+                This is ignored if month is 0.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:longitude = -122.3318 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Longitude"
+        doc = """
+                longitude: Longitude in degrees.  Positive for east, negative for west.  Ranges frmo -180 to +180 degrees.
+
+                This is ignored if month is 0.
+            """
+    )
+    int inputs:ri:light:month = 11 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Month"
+        doc = """
+                month: Month of the year, 1 through 12.
+                The default, 0, means to use the explicitly given sun direction
+                instead of automatically computing it.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:skyTint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Sky Tint"
+        doc = """
+              skyTint: Tweak the sky's contribution and color.  The default, white (1,1,1),
+              gives results based on measured physical values.
+            """
+    )
+    vector3f inputs:ri:light:sunDirection = (0, 1, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Direction"
+        doc = """
+              sunDirection: The *apparent* direction towards the center of
+              the sun.  The zenith is at +Y (for noon light) and the
+              horizon is in the XZ plane (for sunrise/set).  Note that the
+              Y component must non-negative.  Ignored if a month is given.
+            """
+    )
+    float inputs:ri:light:sunSize = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Sun Size"
+        doc = """
+              sunSize: Scale the apparent size of the sun in the sky.  Leave at 1 for a
+              realistic sun size with an 0.55 degree angular diameter.
+            """
+    )
+    color3f inputs:ri:light:sunTint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Sun Tint"
+        doc = """
+              sunTint: Tweak the sun's contribution and color.  The default, white (1,1,1),
+              gives results based on measured physical values. Setting this to black removes the
+              sun contribution.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    int inputs:ri:light:year = 2014 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Year"
+        doc = """
+              year: Four-digit year.
+
+              This is ignored if month is 0.
+            """
+    )
+    float inputs:ri:light:zone = -8 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Time Zone"
+        doc = """
+                zone: Standard time zone offset from GMT/UTC in hours.  Positive for east,
+                negative for west.  For example, this would be -8 for Pacific time.
+
+                This is ignored if month is 0.
+            """
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:light:shaderId = "PxrEnvDayLight" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+    uniform token[] xformOpOrder (
+        doc = """Encodes the sequence of transformation operations in the
+        order in which they should be pushed onto a transform stack while
+        visiting a UsdStage's prims in a graph traversal that will effect
+        the desired positioning for this prim and its descendant prims.
+        
+        You should rarely, if ever, need to manipulate this attribute directly.
+        It is managed by the AddXformOp(), SetResetXformStack(), and
+        SetXformOpOrder(), and consulted by GetOrderedXformOps() and
+        GetLocalTransformation()."""
+    )
+}
+
+class "PxrMeshLightAPI"
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic path.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and the light
+                at which the sample doesn't get brighter. This may help you avoid hot spots and
+                sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup: Specify the light group name used for light group LPEs. This is useful to generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Cheap Caustics is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrMeshLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrPortalLightAPI"
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float3 inputs:ri:light:colorMapGamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Gamma"
+        doc = """
+                colorMapGamma: Gamma-correct the texture.
+            """
+    )
+    float inputs:ri:light:colorMapSaturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Saturation"
+        doc = """
+                colorMapSaturation: Adjust the texture's saturation.
+            """
+    )
+    string inputs:ri:light:domeColorMap = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        hidden = true
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. You might find need for this if you have
+                unsolvable noise from this light and need more samples.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityMult = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Intensity Multiplier"
+        doc = """
+                intensityMult:  Intensity adjustment relative to the dome intensity. This gets
+                multiplied by the parent dome light's intensity and power.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful
+                to generate per-light AOVs for later adjustment in compositing
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    string inputs:ri:light:portalName (
+        displayGroup = "Advanced"
+        hidden = true
+    )
+    matrix4d inputs:ri:light:portalToDome (
+        displayGroup = "Advanced"
+        hidden = true
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    color3f inputs:ri:light:tint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Color Tint"
+        doc = """
+               tint: This parameter tints the color from the dome texture.
+            """
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrPortalLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrRectLightAPI"
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float3 inputs:ri:light:colorMapGamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Gamma"
+        doc = """
+                colorMapGamma: Gamma-correct the texture.
+            """
+    )
+    float inputs:ri:light:colorMapSaturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Saturation"
+        doc = """
+                colorMapSaturation: Adjust the texture's saturation.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator and can result in a performance impact. For scenes that
+                have lots of lights, resulting in some lights that are under-sampled, you may want to set it
+                to non-zero.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and the light
+                at which the sample doesn't get brighter. This may help you avoid hot spots and
+                sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface. 
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrRectLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrSphereLightAPI"
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Caustics Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. It's recommended to leave this at the default unless
+                you experience unsolvable noise from the light.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and the light
+                at which the sample doesn't get brighter. This may help you avoid hot spots and
+                sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrSphereLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrBarnLightFilter "PxrBarnLightFilter" (
+    apiSchemas = ["CollectionAPI:filterLink"]
+    customData = {
+        token[] apiSchemaOverridePropertyNames = ["collection:filterLink:includeRoot"]
+    }
+)
+{
+    uniform bool collection:filterLink:includeRoot = 1
+    float inputs:ri:lightFilter:apex = 25 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Apex"
+        doc = """apex: Distance between center of barn and center of projection.
+            """
+    )
+    int inputs:ri:lightFilter:barnMode = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Barn Mode"
+        doc = """barnMode:
+
+        In 'physical' mode the barn behaves like an open window through which
+        light falls. The falloff and blur are determined by the size of the
+        light, the distance to the light and distance from the barn.
+
+        In 'analytic' mode, the barn has a fixed projection and manual
+        falloff controls.
+        """
+    )
+    float inputs:ri:lightFilter:bottom = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Refine Shape"
+        displayName = "Bottom"
+        doc = "bottom: Additional offset of the bottom region (-y axis)."
+    )
+    float inputs:ri:lightFilter:bottomEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale Edges"
+        displayName = "Bottom Edge"
+        doc = """
+                    bottomEdge: When edge is > 0, this scales the edge of the bottom region (-y axis).
+                """
+    )
+    int inputs:ri:lightFilter:colorRamp = 4 (
+        displayGroup = "Color Ramp"
+        doc = """colorRamp: This is Optional.  This sets the color gradient 
+                  for the transition.
+            """
+    )
+    color3f[] inputs:ri:lightFilter:colorRamp_Colors = [(1, 1, 1), (1, 1, 1), (1, 1, 1), (1, 1, 1)] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:colorRamp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:colorRamp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (Technically, they are applied one after the other.)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = "density: How much effect the component has (0-1)."
+    )
+    float inputs:ri:lightFilter:densityFar = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Far"
+        doc = "densityFar: Distance from the barn where the density interpolation ends."
+    )
+    float inputs:ri:lightFilter:densityFarVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Far Val"
+        doc = "densityFarVal: Density multiplier where the blur interpolation ends."
+    )
+    float inputs:ri:lightFilter:densityNear = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Near"
+        doc = "densityNear: Distance from the barn where the density interpolation starts."
+    )
+    float inputs:ri:lightFilter:densityNearVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Near Val"
+        doc = "densityNearVal: Density multiplier where the blur interpolation starts."
+    )
+    float inputs:ri:lightFilter:densityPow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Exponent"
+        doc = "densityPow: Exponent of the density interpolation."
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    bool inputs:ri:lightFilter:directional = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Directional"
+        doc = """directional: Whether or not the light projects along a direction or
+            out from a point.
+            """
+    )
+    float inputs:ri:lightFilter:edge = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Edge Thickness"
+        doc = """edge: Thickness of the edge region.  Greater value will add
+                  more softness to the edges of the barn shape.
+            """
+    )
+    float inputs:ri:lightFilter:height = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Height"
+        doc = "height: Height of the inner region of the barn (y axis)."
+    )
+    float inputs:ri:lightFilter:intensity = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = """intensity: Multiplier for both the diffuse and specular result.
+            """
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = """invert: When this is on, invert the entire effect of the light
+                  filter.
+            """
+    )
+    float inputs:ri:lightFilter:left = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Refine Shape"
+        displayName = "Left"
+        doc = "left: Additional offset of the left region (-x axis)."
+    )
+    float inputs:ri:lightFilter:leftEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale Edges"
+        displayName = "Left Edge"
+        doc = """
+                    leftEdge: When edge is > 0, this scales the edge of the left region (-x axis).
+                """
+    )
+    int inputs:ri:lightFilter:preBarn = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Pre Barn Effect"
+        doc = "preBarn: The effect on the light before it reaches the barn."
+    )
+    float inputs:ri:lightFilter:radius = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Radius"
+        doc = "radius: Radius of the corners of the inner barn square."
+    )
+    float inputs:ri:lightFilter:right = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Refine Shape"
+        displayName = "Right"
+        doc = "right: Additional offset of the right region (+x axis)."
+    )
+    float inputs:ri:lightFilter:rightEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale Edges"
+        displayName = "Right Edge"
+        doc = """
+                    rightEdge: When edge is > 0, this scales the edge of the right region (+x axis).
+                """
+    )
+    float inputs:ri:lightFilter:scaleHeight = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale"
+        displayName = "Scale Height"
+        doc = """
+                   scaleHeight: Scale the height of the inner barn shape (y axis).
+                   This includes scaling the radius.
+                """
+    )
+    float inputs:ri:lightFilter:scaleWidth = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale"
+        displayName = "Scale Width"
+        doc = """
+                    scaleWidth: Scale the width of the inner barn shape (x axis).
+                    This includes scaling the radius.
+                """
+    )
+    float inputs:ri:lightFilter:shearX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Shear X"
+        doc = "shearX: Shear the projection along the x-axis."
+    )
+    float inputs:ri:lightFilter:shearY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Shear Y"
+        doc = "shearY: Shear the projection along the y-axis."
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    float inputs:ri:lightFilter:top = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Refine Shape"
+        displayName = "Top"
+        doc = "top: Additional offset of the top region (+y axis)."
+    )
+    float inputs:ri:lightFilter:topEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale Edges"
+        displayName = "Top Edge"
+        doc = """
+                    topEdge: When edge is > 0, this scales the edge of the top region (+y axis).
+                """
+    )
+    bool inputs:ri:lightFilter:useLightDirection = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Use Light Direction"
+        doc = """ useLightDirection: If checked the projection direction
+                   is determined by the position of the center of the light source.
+                   Otherwise it only follows the orientation of the cookie.
+                   WARNING: this does not work with dome and geometric area lights.
+            """
+    )
+    float inputs:ri:lightFilter:width = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Width"
+        doc = "width: Width of the inner region of the barn (x axis)."
+    )
+    uniform token lightFilter:shaderId = "" (
+        displayGroup = "Internal"
+        doc = """Default ID for the light filter's shader. 
+        This defines the shader ID for this light filter when a render context 
+        specific shader ID is not available. 
+
+        \\see GetShaderId
+        \\see GetShaderIdAttrForRenderContext
+        \\see SdrRegistry::GetShaderNodeByIdentifier
+        \\see SdrRegistry::GetShaderNodeByIdentifierAndType
+        """
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:lightFilter:shaderId = "PxrBarnLightFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+    uniform token[] xformOpOrder (
+        doc = """Encodes the sequence of transformation operations in the
+        order in which they should be pushed onto a transform stack while
+        visiting a UsdStage's prims in a graph traversal that will effect
+        the desired positioning for this prim and its descendant prims.
+        
+        You should rarely, if ever, need to manipulate this attribute directly.
+        It is managed by the AddXformOp(), SetResetXformStack(), and
+        SetXformOpOrder(), and consulted by GetOrderedXformOps() and
+        GetLocalTransformation()."""
+    )
+}
+
+class PxrCombinerLightFilter "PxrCombinerLightFilter" (
+    apiSchemas = ["CollectionAPI:filterLink"]
+    customData = {
+        token[] apiSchemaOverridePropertyNames = ["collection:filterLink:includeRoot"]
+    }
+)
+{
+    uniform bool collection:filterLink:includeRoot = 1
+    bool inputs:ri:lightFilter:combineShadows = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Combine shadows"
+        doc = """
+            Enables the shadow manipulation abilities of any connected light filters.
+        """
+    )
+    token inputs:ri:lightFilter:max (
+        displayName = "Max"
+        doc = """
+            max: Combining light filters by returning the maximum result.
+        """
+    )
+    token inputs:ri:lightFilter:min (
+        displayName = "Min"
+        doc = """
+            min: Combining light filters by returning the mininum result.
+        """
+    )
+    token inputs:ri:lightFilter:mult (
+        displayName = "Mult"
+        doc = """
+            mult: Combining light filters by multiplying.
+        """
+    )
+    token inputs:ri:lightFilter:screen (
+        displayName = "Screen"
+        doc = '''
+            screen: Combining light filters by returning the "screen" result.
+            Screen operation is similar to the max operation, but it combines gradients
+            in a smoother way.
+        '''
+    )
+    uniform token lightFilter:shaderId = "" (
+        displayGroup = "Internal"
+        doc = """Default ID for the light filter's shader. 
+        This defines the shader ID for this light filter when a render context 
+        specific shader ID is not available. 
+
+        \\see GetShaderId
+        \\see GetShaderIdAttrForRenderContext
+        \\see SdrRegistry::GetShaderNodeByIdentifier
+        \\see SdrRegistry::GetShaderNodeByIdentifierAndType
+        """
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:lightFilter:shaderId = "PxrCombinerLightFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+    uniform token[] xformOpOrder (
+        doc = """Encodes the sequence of transformation operations in the
+        order in which they should be pushed onto a transform stack while
+        visiting a UsdStage's prims in a graph traversal that will effect
+        the desired positioning for this prim and its descendant prims.
+        
+        You should rarely, if ever, need to manipulate this attribute directly.
+        It is managed by the AddXformOp(), SetResetXformStack(), and
+        SetXformOpOrder(), and consulted by GetOrderedXformOps() and
+        GetLocalTransformation()."""
+    )
+}
+
+class PxrCookieLightFilter "PxrCookieLightFilter" (
+    apiSchemas = ["CollectionAPI:filterLink"]
+    customData = {
+        token[] apiSchemaOverridePropertyNames = ["collection:filterLink:includeRoot"]
+    }
+)
+{
+    uniform bool collection:filterLink:includeRoot = 1
+    float inputs:ri:lightFilter:apex = 25 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Apex"
+        doc = """apex: Distance between the center of cookie and the center of projection.
+            """
+    )
+    float inputs:ri:lightFilter:blur = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur"
+        doc = """
+                blur: Blurriness of texture (0-1, multiplied by blurNear/blurFar interp).
+            """
+    )
+    float inputs:ri:lightFilter:blurFarDist = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Far Dist"
+        doc = "blurFarDist: Distance from the cookie where the blur interpolation ends."
+    )
+    float inputs:ri:lightFilter:blurFarVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Far Value"
+        doc = "blurFarVal: Blur multiplier where the blur interpolation ends."
+    )
+    float inputs:ri:lightFilter:blurMidpoint = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Midpoint"
+        doc = "blurMidpoint: Distance between near and far, where the midValue is located."
+    )
+    float inputs:ri:lightFilter:blurMidVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Mid Value"
+        doc = "blurMidVal: Blur multiplier in the middle of the blur interpolation."
+    )
+    float inputs:ri:lightFilter:blurNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Near Dist"
+        doc = "blurNearDist: Distance from the cookie where the blur interpolation starts."
+    )
+    float inputs:ri:lightFilter:blurNearVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Near Value"
+        doc = "blurNearVal: Blur multiplier where the blur interpolation starts."
+    )
+    float inputs:ri:lightFilter:blurPow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Exponent"
+        doc = "blurPow: Exponent of the blur interpolation."
+    )
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (technically: they are applied one after the other)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:contrast = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "Contrast"
+        doc = """
+                contrast: Contrast control (less than 1 = contrast reduction,
+                larger than 1 = contrast increase).
+            """
+    )
+    int inputs:ri:lightFilter:cookieMode = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Cookie Mode"
+        doc = """
+            cookieMode:
+
+            In 'physical' mode the cookie behaves like a stained glass window
+            through which light falls. The falloff and blur are determined by the
+            size of the light, the distance to the light and distance from the
+            cookie.
+
+            In 'analytic' mode, the cookie has a fixed projection and manual
+            blur and falloff controls.
+        """
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = "density: Controls the strength of the projected effect."
+    )
+    float inputs:ri:lightFilter:densityFarDist = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Far Dist"
+        doc = "densityFarDist: Distance from the cookie where the density interpolation ends."
+    )
+    float inputs:ri:lightFilter:densityFarVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Far Value"
+        doc = "densityFarVal: Density multiplier where the blur interpolation ends."
+    )
+    float inputs:ri:lightFilter:densityMidpoint = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Midpoint"
+        doc = "densityMidpoint: Distance between near and far, where the midValue is located."
+    )
+    float inputs:ri:lightFilter:densityMidVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Mid Value"
+        doc = "densityMidVal: Density multiplier in the middle of the density interpolation."
+    )
+    float inputs:ri:lightFilter:densityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Near Dist"
+        doc = "densityNearDist: Distance from the cookie where the density interpolation starts."
+    )
+    float inputs:ri:lightFilter:densityNearVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Near Value"
+        doc = "densityNearVal: Density multiplier where the blur interpolation starts."
+    )
+    float inputs:ri:lightFilter:densityPow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Exponent"
+        doc = "densityPow: Exponent of the density interpolation."
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    bool inputs:ri:lightFilter:directional = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Directional"
+        doc = """directional:  When this is on, the texture projects along a
+                  direction using the orthographic projection. When it is off,
+                  the texture projects using a focal point specified by the Apex.
+            """
+    )
+    color3f inputs:ri:lightFilter:fillColor = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Fill Color"
+        doc = """
+                fillColor: If the texture is not repeating, this specifies the
+                color for the region outside of and behind the projected rectangle.
+            """
+    )
+    float inputs:ri:lightFilter:height = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Height"
+        doc = "height: Height of the rect the light is shining through."
+    )
+    float inputs:ri:lightFilter:intensity = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = """intensity: Multiplier for both the diffuse and specular result.
+            """
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = """invert: When this is on, the texture will be inverted before it is applied.
+            """
+    )
+    bool inputs:ri:lightFilter:invertU = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Invert U"
+        doc = "invertU: flip the texture from left to right."
+    )
+    bool inputs:ri:lightFilter:invertV = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Invert V"
+        doc = "invertV: flip the texture from bottom to top."
+    )
+    bool inputs:ri:lightFilter:linearize = 0 (
+        displayGroup = "Map"
+        displayName = "Linearize"
+        doc = "Linearize the texture, assuming an sRGB transfer function."
+    )
+    asset inputs:ri:lightFilter:map = @ratGrid.tex@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Map"
+        doc = "map: Filename of the projected texture."
+    )
+    float inputs:ri:lightFilter:midpoint = 0.18 (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "Midpoint"
+        doc = "midpoint: Midpoint for the contrast control."
+    )
+    float inputs:ri:lightFilter:offsetU = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Offset U"
+        doc = "offsetU: Offset of the texture in the U direction"
+    )
+    float inputs:ri:lightFilter:offsetV = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Offset V"
+        doc = "offsetV: Offset of the texture in the V direction"
+    )
+    bool inputs:ri:lightFilter:premultipliedAlpha = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Premultiplied Alpha"
+        doc = """
+                premultipliedAlpha: Textures are usually premultiplied by their alpha. If this not
+                the case, uncheck this.
+            """
+    )
+    int inputs:ri:lightFilter:refreshMap = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        doc = """
+                Press this button to force a refresh of the texture during
+                Live Rendering.
+            """
+    )
+    float inputs:ri:lightFilter:saturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "Saturation"
+        doc = """
+                saturation: Saturation of the result (0=greyscale,1=normal,>1=boosted colors).
+            """
+    )
+    float inputs:ri:lightFilter:sBlurMult = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "S Blur Mult"
+        doc = "sBlurMult: Blur multiplier in S direction."
+    )
+    float inputs:ri:lightFilter:scaleU = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Scale U"
+        doc = "scaleU: Scale of the texture in the U direction"
+    )
+    float inputs:ri:lightFilter:scaleV = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Scale V"
+        doc = "scaleV: Scale of the texture in the V direction"
+    )
+    float inputs:ri:lightFilter:shearX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Shear X"
+        doc = "shearX: Shear the projection along the x-axis."
+    )
+    float inputs:ri:lightFilter:shearY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Shear Y"
+        doc = "shearY: Shear the projection along the y-axis."
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    bool inputs:ri:lightFilter:spherical = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Spherical"
+        doc = """spherical:  When this is on, the texture projects to a sphere
+            instead of to a plane.
+            """
+    )
+    float inputs:ri:lightFilter:tBlurMult = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "T Blur Mult"
+        doc = "tBlurMult: Blur multiplier in T direction."
+    )
+    int inputs:ri:lightFilter:tileMode = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Tile Mode"
+        doc = '''tileMode:
+                "No Repeat"   - texture does not repeat.
+                "Edge Extent" - extends the color of the edge to infinity.
+                "Tile"        - texture repeats (tileable texture).
+            '''
+    )
+    color3f inputs:ri:lightFilter:tint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "Tint"
+        doc = "tint: Tint of the resulting color after saturation, contrast and clamp."
+    )
+    int inputs:ri:lightFilter:useAlpha = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Use Alpha"
+        doc = """
+                useAlpha: This should always be on otherwise it will create hard edges
+                from the cookie.  This parameter is hidden in case we need to
+                expose it later.
+
+                When on, if there is no alpha channel in the projected texture, it will
+                use the installed $RMANTREEE/lib/textures/white.tex for blending
+                with the fill color. Otherwise, it will use the alpha channel.
+            """
+        hidden = true
+    )
+    bool inputs:ri:lightFilter:useLightDirection = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Use Light Direction"
+        doc = """
+                useLightDirection: When this is on, the projection direction is determined by the
+                position of the center of the light source. Otherwise, it only
+                follows the orientation of the cookie.
+
+                WARNING: This does not work with lights that have no direction such as
+                PxrDomeLight and PxrMeshLight.
+            """
+    )
+    float inputs:ri:lightFilter:whitepoint = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "White Point"
+        doc = "whitepoint: White point for the contrast control if (contrast > 1.0)."
+    )
+    float inputs:ri:lightFilter:width = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Width"
+        doc = "width: Width of the rect the light is shining through."
+    )
+    uniform token lightFilter:shaderId = "" (
+        displayGroup = "Internal"
+        doc = """Default ID for the light filter's shader. 
+        This defines the shader ID for this light filter when a render context 
+        specific shader ID is not available. 
+
+        \\see GetShaderId
+        \\see GetShaderIdAttrForRenderContext
+        \\see SdrRegistry::GetShaderNodeByIdentifier
+        \\see SdrRegistry::GetShaderNodeByIdentifierAndType
+        """
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:lightFilter:shaderId = "PxrCookieLightFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+    uniform token[] xformOpOrder (
+        doc = """Encodes the sequence of transformation operations in the
+        order in which they should be pushed onto a transform stack while
+        visiting a UsdStage's prims in a graph traversal that will effect
+        the desired positioning for this prim and its descendant prims.
+        
+        You should rarely, if ever, need to manipulate this attribute directly.
+        It is managed by the AddXformOp(), SetResetXformStack(), and
+        SetXformOpOrder(), and consulted by GetOrderedXformOps() and
+        GetLocalTransformation()."""
+    )
+}
+
+class PxrIntMultLightFilter "PxrIntMultLightFilter" (
+    apiSchemas = ["CollectionAPI:filterLink"]
+    customData = {
+        token[] apiSchemaOverridePropertyNames = ["collection:filterLink:includeRoot"]
+    }
+)
+{
+    uniform bool collection:filterLink:includeRoot = 1
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (technically: they are applied one after the other)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = """density: How much effect the filter has (0-1).
+            """
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    float inputs:ri:lightFilter:exposure = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Exposure"
+        doc = "exposure: Exposure control for the multiplier."
+    )
+    float inputs:ri:lightFilter:intensity = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = "intensity: Multiplier for the light intensity."
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = """
+                invert: When this is on, invert the multiplier.  For instance, if we
+                set the light filter's intensity to 2, the final light's intensity
+                will be divided by (instead of multiplied by) the light filter's
+                intensity.
+            """
+    )
+    float inputs:ri:lightFilter:saturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Color Saturation"
+        doc = """Saturation of the light before hitting the surface
+                  (0=greyscale,1=normal,>1=boosted colors).
+            """
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    color3f inputs:ri:lightFilter:tint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Tint"
+        doc = "Tint of the light color after saturation."
+    )
+    uniform token lightFilter:shaderId = "" (
+        displayGroup = "Internal"
+        doc = """Default ID for the light filter's shader. 
+        This defines the shader ID for this light filter when a render context 
+        specific shader ID is not available. 
+
+        \\see GetShaderId
+        \\see GetShaderIdAttrForRenderContext
+        \\see SdrRegistry::GetShaderNodeByIdentifier
+        \\see SdrRegistry::GetShaderNodeByIdentifierAndType
+        """
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:lightFilter:shaderId = "PxrIntMultLightFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+    uniform token[] xformOpOrder (
+        doc = """Encodes the sequence of transformation operations in the
+        order in which they should be pushed onto a transform stack while
+        visiting a UsdStage's prims in a graph traversal that will effect
+        the desired positioning for this prim and its descendant prims.
+        
+        You should rarely, if ever, need to manipulate this attribute directly.
+        It is managed by the AddXformOp(), SetResetXformStack(), and
+        SetXformOpOrder(), and consulted by GetOrderedXformOps() and
+        GetLocalTransformation()."""
+    )
+}
+
+class PxrRampLightFilter "PxrRampLightFilter" (
+    apiSchemas = ["CollectionAPI:filterLink"]
+    customData = {
+        token[] apiSchemaOverridePropertyNames = ["collection:filterLink:includeRoot"]
+    }
+)
+{
+    uniform bool collection:filterLink:includeRoot = 1
+    float inputs:ri:lightFilter:beginDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Ramp Direction"
+        displayName = "Begin Distance"
+        doc = "beginDist: Distance where the ramp starts."
+    )
+    int inputs:ri:lightFilter:colorRamp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Color Ramp"
+        displayName = "Color Ramp"
+        doc = "Color Ramp"
+    )
+    color3f[] inputs:ri:lightFilter:colorRamp_Colors = [(1, 1, 1), (1, 1, 1), (1, 1, 1), (1, 1, 1)] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:colorRamp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:colorRamp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (technically: they are applied one after the other)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = "density: How much effect the filter has (0-1)."
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    float inputs:ri:lightFilter:endDist = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Ramp Direction"
+        displayName = "End Distance"
+        doc = "endDist: Distance where the ramp ends."
+    )
+    float inputs:ri:lightFilter:intensity = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = "intensity: Multiplier for both the diffuse and specular result."
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = "invert: If the multipliers should be inverted"
+    )
+    int inputs:ri:lightFilter:ramp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Float Ramp"
+        displayName = "Ramp"
+        doc = "Ramp"
+    )
+    float[] inputs:ri:lightFilter:ramp_Floats = [0, 0, 1, 1] (
+        displayGroup = "Float Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:ramp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Float Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:ramp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Float Ramp"
+        hidden = true
+    )
+    int inputs:ri:lightFilter:rampType = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Ramp Direction"
+        displayName = "Ramp Type"
+        doc = "rampType: In which direction the ramp is applied."
+    )
+    float inputs:ri:lightFilter:saturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Saturation"
+        doc = """saturation: Saturation of the light before hitting the surface
+                  (0=greyscale,1=normal,>1=boosted colors). From Begin to End Distance, the value will ramp between the original light color and the Saturation adjusted color (and opposite if the ramp is inverted)."""
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    uniform token lightFilter:shaderId = "" (
+        displayGroup = "Internal"
+        doc = """Default ID for the light filter's shader. 
+        This defines the shader ID for this light filter when a render context 
+        specific shader ID is not available. 
+
+        \\see GetShaderId
+        \\see GetShaderIdAttrForRenderContext
+        \\see SdrRegistry::GetShaderNodeByIdentifier
+        \\see SdrRegistry::GetShaderNodeByIdentifierAndType
+        """
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:lightFilter:shaderId = "PxrRampLightFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+    uniform token[] xformOpOrder (
+        doc = """Encodes the sequence of transformation operations in the
+        order in which they should be pushed onto a transform stack while
+        visiting a UsdStage's prims in a graph traversal that will effect
+        the desired positioning for this prim and its descendant prims.
+        
+        You should rarely, if ever, need to manipulate this attribute directly.
+        It is managed by the AddXformOp(), SetResetXformStack(), and
+        SetXformOpOrder(), and consulted by GetOrderedXformOps() and
+        GetLocalTransformation()."""
+    )
+}
+
+class PxrRodLightFilter "PxrRodLightFilter" (
+    apiSchemas = ["CollectionAPI:filterLink"]
+    customData = {
+        token[] apiSchemaOverridePropertyNames = ["collection:filterLink:includeRoot"]
+    }
+)
+{
+    uniform bool collection:filterLink:includeRoot = 1
+    float inputs:ri:lightFilter:back = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Back"
+        doc = "back: Additional size of the back region (-Z axis)."
+    )
+    float inputs:ri:lightFilter:backEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Back Edge"
+        doc = """
+                    backEdge: When edge is > 0, this scales the back edge up or down (-z axis).
+                """
+    )
+    float inputs:ri:lightFilter:bottom = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Bottom"
+        doc = "bottom: Additional size of the bottom region (-Y axis)."
+    )
+    float inputs:ri:lightFilter:bottomEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Bottom Edge"
+        doc = """
+                    bottomEdge: When edge is > 0, this scales the bottom edge up or down (-y axis).
+                """
+    )
+    int inputs:ri:lightFilter:colorRamp = 4 (
+        displayGroup = "Color Ramp"
+        doc = """colorRamp: This is Optional.  This sets the color gradient
+                  for the transition.
+            """
+    )
+    color3f[] inputs:ri:lightFilter:colorRamp_Colors = [(1, 1, 1), (1, 1, 1), (1, 1, 1), (1, 1, 1)] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:colorRamp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:colorRamp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (Technically, they are applied one after the other.)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = "density: How much effect the filter has (0-1)."
+    )
+    float inputs:ri:lightFilter:depth = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Depth"
+        doc = "depth: Depth of the inner region of the rod (Z-axis)."
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    float inputs:ri:lightFilter:edge = 0.25 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Edge Thickness"
+        doc = "edge: Thickness of the edge region."
+    )
+    int inputs:ri:lightFilter:falloff = 6 (
+        connectability = "interfaceOnly"
+        displayGroup = "Falloff"
+        doc = "falloff: Controls the transition from the core to the edge."
+    )
+    float[] inputs:ri:lightFilter:falloff_Floats = [0, 0, 0.2, 0.8, 1, 1] (
+        displayGroup = "Falloff"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:falloff_Interpolation = "bspline" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Falloff"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:falloff_Knots = [0, 0, 0.3, 0.7, 1, 1] (
+        displayGroup = "Falloff"
+        hidden = true
+    )
+    float inputs:ri:lightFilter:front = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Front"
+        doc = "front: Additional size of the frontal region (+Z axis)."
+    )
+    float inputs:ri:lightFilter:frontEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Front Edge"
+        doc = """
+                    frontEdge: When edge is > 0, this scales the frontal edge up or down (+z axis).
+                """
+    )
+    float inputs:ri:lightFilter:height = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Height"
+        doc = "height: Height of the inner region of the rod (Y-axis)."
+    )
+    float inputs:ri:lightFilter:intensity = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = """intensity: Multiplier for both the diffuse and specular result.
+            """
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = "invert: Inverts the entire effect of the filter."
+    )
+    float inputs:ri:lightFilter:left = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Left"
+        doc = "left: Additional size of the left region (-X axis)."
+    )
+    float inputs:ri:lightFilter:leftEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Left Edge"
+        doc = """
+                   leftEdge: When edge is > 0, this scales the left edge up or down (-x axis).
+                """
+    )
+    float inputs:ri:lightFilter:radius = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Radius"
+        doc = "radius: Radius of the corners of the inner rod box."
+    )
+    float inputs:ri:lightFilter:right = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Right"
+        doc = "right: Additional size of the right region (+X axis)."
+    )
+    float inputs:ri:lightFilter:rightEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Right Edge"
+        doc = """
+                    rightEdge: When edge is > 0, this scales the right edge up or down (+x axis).
+                """
+    )
+    float inputs:ri:lightFilter:saturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Color Saturation"
+        doc = """saturation: Saturation of the light before hitting the surface
+                  (0=greyscale,1=normal,>1=boosted colors)."""
+    )
+    float inputs:ri:lightFilter:scaleDepth = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale"
+        displayName = "Scale Depth"
+        doc = "scaleDepth: Scale the depth of the inner rod shape (Z axis)."
+    )
+    float inputs:ri:lightFilter:scaleHeight = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale"
+        displayName = "Scale Height"
+        doc = "scaleHeight: Scale the height of the inner rod shape (Y axis)."
+    )
+    float inputs:ri:lightFilter:scaleWidth = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale"
+        displayName = "Scale Width"
+        doc = "scaleWidth: Scale the width of the inner rod shape (X axis)."
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    float inputs:ri:lightFilter:top = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Top"
+        doc = "top: Additional size of the top region (+Y axis)."
+    )
+    float inputs:ri:lightFilter:topEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Top Edge"
+        doc = """
+                    topEdge: When edge is > 0, this scales the top edge up or down (+y axis).
+                """
+    )
+    float inputs:ri:lightFilter:width = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Width"
+        doc = "width: Width of the inner region of the rod (X-axis)."
+    )
+    uniform token lightFilter:shaderId = "" (
+        displayGroup = "Internal"
+        doc = """Default ID for the light filter's shader. 
+        This defines the shader ID for this light filter when a render context 
+        specific shader ID is not available. 
+
+        \\see GetShaderId
+        \\see GetShaderIdAttrForRenderContext
+        \\see SdrRegistry::GetShaderNodeByIdentifier
+        \\see SdrRegistry::GetShaderNodeByIdentifierAndType
+        """
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:lightFilter:shaderId = "PxrRodLightFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+    uniform token[] xformOpOrder (
+        doc = """Encodes the sequence of transformation operations in the
+        order in which they should be pushed onto a transform stack while
+        visiting a UsdStage's prims in a graph traversal that will effect
+        the desired positioning for this prim and its descendant prims.
+        
+        You should rarely, if ever, need to manipulate this attribute directly.
+        It is managed by the AddXformOp(), SetResetXformStack(), and
+        SetXformOpOrder(), and consulted by GetOrderedXformOps() and
+        GetLocalTransformation()."""
+    )
+}
+
+class PxrCamera "PxrCamera" (
+    doc = """
+    A camera model that approximates a number of real world physical
+    effects.  This supports all of the traditional prman perspective camera
+    settings including shaped motion blur and bokeh.
+  """
+)
+{
+    float inputs:ri:assymX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Asymmetric Distortion X"
+        doc = """
+        Distortion applied only in the X direction.  Horizontal lines will
+        remain straight.  Positive values produce pincushion-like
+        distortion.  Negative values produce barrel-like distortion.
+      """
+        hidden = true
+    )
+    float inputs:ri:assymY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Asymmetric Distortion Y"
+        doc = """
+        Distortion applied only in the Y direction.  Vertical lines will
+        remain straight.  Positive values produce pincushion-like
+        distortion.  Negative values produce barrel-like distortion.
+      """
+        hidden = true
+    )
+    color3f inputs:ri:axial = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Chromatic Aberration"
+        displayName = "Axial"
+        doc = """
+        Axial (or longitudinal) chromatic aberration.  This specifies the
+        chromatic focal shift for the red, green, and blue primaries
+        respectively.  When unequal, this can produce a tinge on bokeh and
+        out of focus objects.  It will increase color noise, however.
+      """
+    )
+    asset inputs:ri:cocTexture (
+        displayGroup = "DOF Distortion"
+        displayName = "Circle of Confusion Texture"
+        doc = "If set, this overrides the lens's circle of confusion. (Not implemented in XPU)"
+    )
+    float inputs:ri:detail = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Detail Bias"
+        doc = """
+        Detail bias.  Positive values will shift all texture lookups
+        towards coarser, lower resolution, MIP map levels than would
+        normally be used.  Negative values will shift them towards finer,
+        higher resolution, levels.  Also affects the level-of-detail
+        selected for geometry.
+      """
+    )
+    float2 inputs:ri:distortionCtr = (0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Distortion Center"
+        doc = """
+        Controls the center of the applied distortion. This is applied to
+        the anchored screen window space coordinates, where anchored 
+        screen window space is the natural space for comupting lens effects.
+      """
+    )
+    float inputs:ri:dofMult = 1 (
+        displayGroup = "DOF Distortion"
+        displayName = "Depth of Field Multipler"
+        doc = " Global multiplier on depth of field. "
+    )
+    float3 inputs:ri:dofPivotCenter = (0, 0, 0) (
+        displayGroup = "DOF Distortion"
+        displayName = "Pivot Center"
+        doc = " Point (relative to focal plane and center-of-frame) where no dof distorion occurrs. "
+    )
+    float inputs:ri:dofRadiusFalloff = 1 (
+        displayGroup = "DOF Distortion"
+        displayName = "Radius Falloff"
+        doc = " Sharpness of depth of field radial effect. "
+    )
+    float inputs:ri:dofRadiusStrength = 0 (
+        displayGroup = "DOF Distortion"
+        displayName = "Radius Strength"
+        doc = " Strength of depth of field radial effect. "
+    )
+    float inputs:ri:dofSqAnamorph = 1 (
+        displayGroup = "DOF Distortion"
+        displayName = "Squeeze Anamorph"
+        doc = ' Anamorphic aspect ratio of radial dof "squeeze" effect. '
+    )
+    float3 inputs:ri:dofSqCtr = (0, 0, 0) (
+        displayGroup = "DOF Distortion"
+        displayName = "Squeeze Center"
+        doc = " Point (relative to focal plane and center-of-frame) corresponding to the center of the DOF squeeze effect. "
+    )
+    float inputs:ri:dofSqFalloff = 1 (
+        displayGroup = "DOF Distortion"
+        displayName = "Squeeze Falloff"
+        doc = ' Radial strength falloff of the DOF "squeeze" effect. Larger numbers correspond to sharper falloff. Negative values are valid. '
+    )
+    float inputs:ri:dofSqStrength = 0 (
+        displayGroup = "DOF Distortion"
+        displayName = "Squeeze Strength"
+        doc = ' Strength of DOF "squeeze" effect. Positive values squeeze along the circumference; negative values squeeze along the radius. 0 is off.'
+    )
+    float inputs:ri:duration = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Shutter"
+        displayName = "Duration"
+        doc = """
+        Exposure duration.  Zero means an ideal rolling shutter where each
+        line is exposed instantaneously when read.  The default, one, is
+        equivalent to a global shutter where all lines are exposed and read
+        at the same time. (Not implemented in XPU)
+      """
+    )
+    float3 inputs:ri:enhance = (0, 0, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Enhancement"
+        doc = """
+        Enhancement.  Embiggens the region around a pixel (X,Y) by zoom
+        factor Z for trouble-shooting.  The magnified pixel will remain
+        anchored in place relative to the image.  Camera effects such as
+        vignetting will be scaled accordingly.  Intentionally does not
+        affect level-of-detail, dicing, displacement, or MIP map levels.
+      """
+    )
+    bool inputs:ri:enhanceDiffAdjust = 0 (
+        displayGroup = "Enhance"
+        displayName = "Adjust differentials in enhance"
+        doc = " Should enhance mode use the ray differentials of the un-enhanced image (unchecked), or adjust them to reflect the smaller size of each pixel in the enhanced image (checked)? The former shows the true contents of the un-enhanced pixels, the latter lets you resolve  "
+    )
+    bool inputs:ri:enhanceDisableDOF = 0 (
+        displayGroup = "Enhance"
+        displayName = "Disable DOF in enhance"
+        doc = " Disable modification of ray origins in enhance mode. Renderman still thinks DOF is enabled, so focus factor will apply to geometry tessellation, but DOF-related blurring will not occur. This option and the one below enable you to get a fully accurate enhanced view of the geometry, without lens effects obscuring it. "
+    )
+    bool inputs:ri:enhanceDisableMoBlur = 0 (
+        displayGroup = "Enhance"
+        displayName = "Disable Motion Blur in enhance"
+        doc = " Disable distribution of samples over time in enhance mode. Renderman still thinks motion blur is enabled, so motion factor will apply to geometry tessellation, but blurring due to motion blur will not occur. "
+    )
+    float inputs:ri:focalDistance = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "Focal Distance"
+        doc = """
+         Distance at which objects will be in focus.  This should be in
+         units of distance along the view direction in camera coordinates.
+         Effectively ignored if F-stop is huge.
+      """
+    )
+    float inputs:ri:focalLength = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "Focal Length"
+        doc = """
+         Focal length of the camera lens.  Used to determine depth of
+         field and defocus.  This should be in units of distance along the
+         view direction in camera coordinates.  Effectively ignored if
+         F-stop is huge.
+      """
+    )
+    point3f inputs:ri:focus1 = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Focus 1"
+        doc = """
+        First point to keep in focus.  Specified in world space.  If all
+        three focus points are set then the tilt angles and focal distance
+        will be automatically solved to match the plane of focus they
+        define.  Note that there may not be a solution.
+      """
+    )
+    point3f inputs:ri:focus2 = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Focus 2"
+        doc = """
+        Second point to keep in focus.  Specified in world space.  If all
+        three focus points are set then the tilt angles and focal distance
+        will be automatically solved to match the plane of focus they
+        define.  Note that there may not be a solution.
+      """
+    )
+    point3f inputs:ri:focus3 = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Focus 3"
+        doc = """
+        Third point to keep in focus.  Specified in world space.  If all
+        three focus points are set then the tilt angles and focal distance
+        will be automatically solved to match the plane of focus they
+        define.  Note that there may not be a solution.
+      """
+    )
+    float inputs:ri:fov = 90 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "Field of View"
+        doc = """
+        Field of view (FOV) in degrees at the beginning of the frame.  For
+        rectangular images this is normally the FOV along the narrower
+        image dimension.
+      """
+    )
+    float inputs:ri:fovEnd = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "Field of View (End)"
+        doc = """
+        Field of view (FOV) in degrees at the end of the frame.  Used to
+        motion blur very fast zooms.  The default, zero, means to assume it
+        is the same as at the beginning of the frame.
+      """
+    )
+    float inputs:ri:fStop = 16 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "F-stop"
+        doc = """
+        F-stop or aperture number.  Used to determine depth of field and
+        defocus.  This determines the lens diameter.  If the f-stop is a
+        huge number, then effectively a pin-hole camera is used and depth
+        of field is turned off.
+      """
+    )
+    float inputs:ri:lensAsymmetryX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Asymmetric Distortion X"
+        doc = """
+        Distortion applied only in the X direction.  Horizontal lines will
+        remain straight.  Positive values produce pincushion-like
+        distortion.  Negative values produce barrel-like distortion.
+      """
+    )
+    float inputs:ri:lensAsymmetryY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Asymmetric Distortion Y"
+        doc = """
+        Distortion applied only in the Y direction.  Vertical lines will
+        remain straight.  Positive values produce pincushion-like
+        distortion.  Negative values produce barrel-like distortion.
+      """
+    )
+    float inputs:ri:lensScale = 1 (
+        displayGroup = "Lens Distortion"
+        displayName = "Lens Scale"
+        doc = " Scale of lens distortion effect. "
+    )
+    int inputs:ri:lensType = 2 (
+        displayName = "Lens Type"
+        doc = " Lens model type. "
+    )
+    asset inputs:ri:matte = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Matte file"
+        doc = """
+        Matte file.  An EXR image that cuts away parts of the render.  If
+        it is a deep image, it removes anything in the render that is
+        farther away than opaque objects in the matte file, leaving behind
+        transparent holes.  If it is a shallow image, it removes parts of
+        the render where the matte file is opaque. (Not implemented in XPU)
+      """
+    )
+    float inputs:ri:natural = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Vignetting"
+        displayName = "Natural"
+        doc = """
+        Natural vignetting.  When one, directions off of the primary camera
+        axis will be darkened realistically.  Wide-angle perspectives will
+        show this effect more strongly.  Setting to zero disables this and
+        intermediate values will blend accordingly.
+      """
+    )
+    int inputs:ri:numSplitDiopters = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Number of Split Diopters"
+        doc = " Number of split diopters lens (minimum 0, maximum 2) being enabled. "
+    )
+    float inputs:ri:optical = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Vignetting"
+        displayName = "Optical"
+        doc = """
+        Optical vignetting.  Simulates light blockage due to a hood or
+        other additional lens elements.  With depth of field enabled, this
+        creates cat's eye bokeh.  However, it also increases image noise.
+      """
+    )
+    float inputs:ri:radial1 = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Radial Distortion 1"
+        doc = """
+        Quadratic radial lens distortion coefficient.  Positive values
+        produce pincushion distortion.  Negative values produce barrel
+        distortion.
+      """
+    )
+    float inputs:ri:radial2 = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Radial Distortion 2"
+        doc = """
+        Quartic radial lens distortion coefficient.  Positive values
+        produce pincushion distortion.  Negative values produce barrel
+        distortion.
+      """
+    )
+    float inputs:ri:roll = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Roll Angle"
+        doc = """
+        Roll the lens clockwise.  If the lens tilt is non-zero this can be
+        used to rotate the plane of focus around the image center.  Ignored
+        if focus points are set.
+      """
+    )
+    float inputs:ri:shiftX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Shift X"
+        doc = """
+        Shift the lens horizontally.  This can be used to correct for
+        perspective distortion.  Positive values shift towards the right.
+      """
+    )
+    float inputs:ri:shiftY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Shift Y"
+        doc = '''
+        Shift the lens vertically.  This can be used to correct for
+        perspective distortion "keystone" effects.  To keep vertical lines
+        parallel, aim the camera horizontally and adjust this to include
+        the subject.  Positive values shift towards the top.
+      '''
+    )
+    float inputs:ri:splitDiopterAngle = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Angle"
+        doc = " Angle of the split diopter line(s), CW from the up-axis. "
+    )
+    float inputs:ri:splitDiopterFocusDistance1 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Focus Distance 1"
+        doc = " Focal distance for the first split diopter region, in world space. "
+    )
+    float inputs:ri:splitDiopterFocusDistance2 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Focus Distance 2"
+        doc = " Focal distance for the second split diopter region, in world space. "
+    )
+    float inputs:ri:splitDiopterOffset1 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Offset 1"
+        doc = " Distance of the first split diopter line from the image center, perpendicular to the split diopter axis. Unit is such that distance from the image center to the left (or right) edge is 1. "
+    )
+    float inputs:ri:splitDiopterOffset2 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Offset 2"
+        doc = " Distance of the second split diopter line from the image center, perpendicular to the split diopter axis. Unit is such that distance from the image center to the left (or right) edge is 1. "
+    )
+    float inputs:ri:splitDiopterWidth1 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Width 1"
+        doc = " Width of the band between the center and first split diopter region, perpendicular to the split diopter axis, where the focal distance is smoothly interpolated. Unit is such that distance from the image center to the left (or right) edge is 1. "
+    )
+    float inputs:ri:splitDiopterWidth2 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Width 2"
+        doc = " Width of the band between the center and second split diopter region, perpendicular to the split diopter axis, where the focal distance is smoothly interpolated. Unit is such that distance from the image center to the left (or right) edge is 1. "
+    )
+    float inputs:ri:squeeze = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Anamorphic Squeeze"
+        doc = """
+        Anamorphic lens squeeze.  Values greater than one decrease the
+        effect of the lens distortion in the X direction.  Values less than
+        one increase it.
+      """
+    )
+    token inputs:ri:sweep = "down" (
+        allowedTokens = ["down", "right", "up", "left"]
+        connectability = "interfaceOnly"
+        displayGroup = "Shutter"
+        displayName = "Sweep"
+        doc = """
+        Shutter direction.  Specifies the direction that the shutter
+        sweeps.  The default, down, is the most common direction for
+        rolling shutters. (Not implemented in XPU)
+      """
+    )
+    float inputs:ri:tilt = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Tilt Angle"
+        doc = """
+        Angle in degrees to tilt the lens.  Makes the plane of focus
+        non-parallel to the image plane.  Has no effect unless depth of
+        field is enabled.  Positive tilts up, bringing the focus in the top
+        of the image closer and pushing the focus in the bottom further.
+        Negative does the reverse.  Ignored if focus points are set.
+      """
+    )
+    color3f inputs:ri:transverse = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Chromatic Aberration"
+        displayName = "Transverse"
+        doc = """
+        Transverse (or lateral) chromatic aberration.  This specifies the
+        magnification factors for the red, green, and blue primaries
+        respectively.  When unequal, this can produce a tinge which is most
+        pronounced near the image edges.  It will increase color noise,
+        however.
+      """
+    )
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+    uniform token ri:projection:shaderId = "PxrCamera" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrCylinderCamera "PxrCylinderCamera" (
+    doc = """
+    A simple camera model that projects through a section of a cylinder
+    from the point at the cylinder's center.  For very wide aspect images,
+    this may be useful for rendering a circular panorama.
+  """
+)
+{
+    float inputs:ri:hsweep = 360 (
+        connectability = "interfaceOnly"
+        displayName = "Horizontal Sweep"
+        doc = """
+      The horizontal angle of the cylinder subtended by the image.  The
+      default, 360, means that the image wraps all the way around and the
+      left and right edges of the image align.
+    """
+    )
+    float inputs:ri:vsweep = 90 (
+        connectability = "interfaceOnly"
+        displayName = "Vertical Sweep"
+        doc = """
+      The vertical field of view of the image.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+    uniform token ri:projection:shaderId = "PxrCylinderCamera" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrLightProbe "PxrLightProbe" (
+    doc = """
+    A simple camera model that renders an image as though photographing a
+    perfectly specular mirrored ball.  Note that the view direction is
+    flipped and the image mirrored compared to a real ball so that the
+    orientation appears similar to other projections.
+  """
+)
+{
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+    uniform token ri:projection:shaderId = "PxrLightProbe" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrOrthographic "PxrOrthographic" (
+    doc = """
+    A simple parallel projection camera.
+  """
+)
+{
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+    uniform token ri:projection:shaderId = "PxrOrthographic" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrPanini "PxrPanini" (
+    doc = """
+    The Panini projection is designed for producing ultra-wide angle images
+    with large fields of view.  It can be particularly effective for
+    architectural scenes.  Like the traditional rectilinear perspective
+    projection, vertical lines remain vertical when the view direction is
+    horizontal, and radial lines that converge towards the vanishing point
+    also remain straight.  However, it can do this while accommodating wide
+    angles up to 180 degrees and beyond.
+  """
+)
+{
+    float inputs:ri:compression = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Compression"
+        doc = """
+      Determines the type of projection and the amount of compression at
+      the peripheriphy.  At 0.0, this produces the equivalent of the
+      traditional perspective projection and the FOV is limited to less
+      than 180 degrees.  At 1.0, this produces the full Panini projection
+      and allows the FOV to go up to almost 360 degrees.
+    """
+    )
+    float inputs:ri:fov = 90 (
+        connectability = "interfaceOnly"
+        displayName = "Field of View"
+        doc = """
+      Field of view (FOV) in degrees.  For rectangular images this is
+      normally the FOV along the wider image dimension.  Note that the
+      actual FOV may be limited to somewhere between 180 and 360 depending
+      on the Compression setting.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+    uniform token ri:projection:shaderId = "PxrPanini" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrPerspective "PxrPerspective" (
+    doc = """
+    A simple pinhole camera.
+  """
+)
+{
+    float inputs:ri:focalDistance = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Focal Distance"
+        doc = """
+       Distance at which objects will be in focus.  This should be in
+       units of distance along the view direction in camera coordinates.
+       Effectively ignored if F-stop is huge.
+    """
+    )
+    float inputs:ri:focalLength = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Focal Length"
+        doc = """
+       Focal length of the camera lens.  Used to determine depth of
+       field and defocus.  This should be in units of distance along the
+       view direction in camera coordinates.  Effectively ignored if
+       F-stop is huge.
+    """
+    )
+    float inputs:ri:fov = 90 (
+        connectability = "interfaceOnly"
+        displayName = "Field of View"
+        doc = """
+      Field of view (FOV) in degrees.  For rectangular images this is
+      normally the FOV along the narrower image dimension.
+    """
+    )
+    float inputs:ri:fovEnd = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Field of View (End)"
+        doc = """
+      Field of view (FOV) in degrees at the end of the frame.  Used to
+      motion blur very fast zooms.  The default, zero, means to assume it
+      is the same as at the beginning of the frame.
+    """
+    )
+    float inputs:ri:fStop = 16 (
+        connectability = "interfaceOnly"
+        displayName = "F-stop"
+        doc = """
+      F-stop or aperture number.  Used to determine depth of field and
+      defocus.  This determines the lens diameter.  If the f-stop is a
+      huge number, then effectively a pin-hole camera is used and depth
+      of field is turned off.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+    uniform token ri:projection:shaderId = "PxrPerspective" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrSphereCamera "PxrSphereCamera" (
+    doc = """
+    A simple camera model that projects through a section of a sphere from
+    the point at the sphere's center.  With its default settings, this may
+    be useful for rendering a latlong environment map.
+  """
+)
+{
+    float inputs:ri:hsweep = 360 (
+        connectability = "interfaceOnly"
+        displayName = "Horizontal Sweep"
+        doc = """
+      The horizontal angle of the sphere subtended by the image.  The
+      default, 360, means that the image wraps all the way around and the
+      left and right edges of the image align.
+    """
+    )
+    float inputs:ri:vsweep = 180 (
+        connectability = "interfaceOnly"
+        displayName = "Vertical Sweep"
+        doc = """
+      The vertical angle of the sphere subtended by the image.  The
+      default, 180, means that the top and bottom of the image shows the
+      through the sphere's poles directly above and below the camera.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+    uniform token ri:projection:shaderId = "PxrSphereCamera" (
+        displayGroup = "Internal"
+    )
+}
+
+class OmnidirectionalStereo "OmnidirectionalStereo" (
+    doc = """
+        This camera projection renders the scene as a stereo pair of 360 degree
+        projections. It is intended to be rendered in a square format with
+        the top half as the left eye and the bottom half as the right eye.
+
+        Author: Mach Kobayashi
+  """
+)
+{
+    float inputs:ri:interpupilaryDistance = 0.0635 (
+        connectability = "interfaceOnly"
+        displayName = "Interpupilary Distance"
+        doc = """
+        The distance between the two eyes. The default, 0.0635, should work if
+        your scene is measured in meters.
+      """
+    )
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+    uniform token ri:projection:shaderId = "OmnidirectionalStereo" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrBackgroundDisplayFilter "PxrBackgroundDisplayFilter" (
+    doc = """
+    Display filter plugin to color the background.
+  """
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    string inputs:ri:aovAlpha = "a" (
+        connectability = "interfaceOnly"
+        displayName = "Alpha"
+        doc = "Name of AOV to get alpha values from."
+    )
+    color3f inputs:ri:backgroundColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Background Color"
+        doc = """
+        Color of the background.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrBackgroundDisplayFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrCopyAOVDisplayFilter "PxrCopyAOVDisplayFilter" (
+    doc = """
+    Display filter plugin to look up a named AOV and copy it
+    to Ci.
+  """
+)
+{
+    string inputs:ri:readAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Read AOV"
+        doc = "Name of AOV to read from."
+    )
+    string inputs:ri:writeAov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "Write AOV"
+        doc = "Name of AOV to write to."
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrCopyAOVDisplayFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrDisplayFilterCombiner "PxrDisplayFilterCombiner" (
+    doc = """
+        Display filter combiner.
+    """
+)
+{
+    token inputs:ri:filter (
+        displayName = "Display Filter"
+        doc = """
+            Display filters.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrDisplayFilterCombiner" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrEdgeDetect "PxrEdgeDetect" (
+    doc = """
+    A small example display filter that demonstrates image processing.
+    This filter replaces the image in the beauty pass (or any other AOV)
+    with its gradient magnitude computed from a Sobel edge-detection
+    filter.
+  """
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = """
+      Name of a color AOV to do edge detection on.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrEdgeDetect" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrFilmicTonemapperDisplayFilter "PxrFilmicTonemapperDisplayFilter" (
+    doc = """
+        Display filter plugin based on Naughty Dog's Filmic Tonemapper from GDC Uncharted 2 HDR Lighting presentation.
+    """
+)
+{
+    float inputs:ri:A = 0.22 (
+        connectability = "interfaceOnly"
+        displayName = "Shoulder"
+        doc = """
+            Shoulder strength.
+        """
+    )
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    float inputs:ri:B = 0.3 (
+        connectability = "interfaceOnly"
+        displayName = "Linear"
+        doc = """
+            Linear strength.
+        """
+    )
+    float inputs:ri:C = 0.1 (
+        connectability = "interfaceOnly"
+        displayName = "Linear Angle"
+        doc = """
+            Linear angle.
+        """
+    )
+    float inputs:ri:D = 0.2 (
+        connectability = "interfaceOnly"
+        displayName = "Toe"
+        doc = """
+            Toe strength.
+        """
+    )
+    float inputs:ri:E = 0.01 (
+        connectability = "interfaceOnly"
+        displayName = "Toe Numerator"
+        doc = """
+            Toe numerator.
+        """
+    )
+    float inputs:ri:exposureAdjust = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Exposure Adjustment"
+        doc = """
+            Exposure adjustment. This parameter is multiplied by the incoming
+            pixel.
+        """
+    )
+    float inputs:ri:F = 0.3 (
+        connectability = "interfaceOnly"
+        displayName = "Toe Denominator"
+        doc = """
+            Toe denominator.
+        """
+    )
+    float inputs:ri:linearWhitePoint = 11.2 (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Linear white point value.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrFilmicTonemapperDisplayFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrGradeDisplayFilter "PxrGradeDisplayFilter" (
+    doc = """
+        Nuke-like grade display filter. Allows simple grading of the beauty pass.
+    """
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    color3f inputs:ri:blackPoint = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Black Point"
+        doc = """
+            Ci is remapped so that this color becomes 0.
+        """
+    )
+    bool inputs:ri:clampBlack = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Clamp Black"
+        doc = """
+            Clamp Ci so that no value is less than 0. This is useful for compositing so that adding channels will not result in unexpected results.
+        """
+    )
+    bool inputs:ri:clampWhite = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Clamp White"
+        doc = """
+            Clamp Ci so that no value exceeds 1.
+        """
+    )
+    color3f inputs:ri:gain = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Gain"
+        doc = """
+            Multiply Ci by this color.
+        """
+    )
+    color3f inputs:ri:gamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Gamma"
+        doc = """
+            Gamma Ci by this color.
+        """
+    )
+    color3f inputs:ri:lift = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Lift"
+        doc = """
+            Add this value to Ci.
+        """
+    )
+    color3f inputs:ri:mask = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Mask"
+        doc = """
+            Mask the color correction result with this color.
+        """
+    )
+    color3f inputs:ri:multiply = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Multiply"
+        doc = """
+            Multiply Ci by this color.
+        """
+    )
+    color3f inputs:ri:offset = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Offset"
+        doc = """
+            Offset Ci (Ci + offset) by this color.
+        """
+    )
+    color3f inputs:ri:whitePoint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Ci is remapped so that this color becomes 1.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrGradeDisplayFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrHalfBufferErrorFilter "PxrHalfBufferErrorFilter" (
+    doc = """
+    Estimate the error of an image by comparing two half buffers.  If two
+    statistically-independent images are each produced from half the camera
+    samples, then we can estimate the mean-squared-error between the ground
+    truth and their average and as one-quarter of the squared difference of
+    the two.  The AOVs may be either all scalar or all color.
+  """
+)
+{
+    string inputs:ri:aov1 = "even" (
+        connectability = "interfaceOnly"
+        displayName = "AOV 1"
+        doc = """
+      Name of the first half-buffer AOV to read from.
+    """
+    )
+    string inputs:ri:aov2 = "odd" (
+        connectability = "interfaceOnly"
+        displayName = "AOV 2"
+        doc = """
+      Name of the second half-buffer AOV to read from.
+    """
+    )
+    string inputs:ri:result = "mse" (
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = """
+      Name of the AOV to write the estimated error to.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrHalfBufferErrorFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrImageDisplayFilter "PxrImageDisplayFilter" (
+    doc = "Display filter plugin to render image planes including holdouts."
+)
+{
+    color3f inputs:ri:colorGain = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Color Gain"
+        doc = "Color gain."
+    )
+    color3f inputs:ri:colorOffset = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Color Offset"
+        doc = "Color offset."
+    )
+    asset inputs:ri:filename = @@ (
+        connectability = "interfaceOnly"
+        displayName = "Filename"
+        doc = "The name of the plate image to display."
+    )
+    float inputs:ri:filmMaxX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Right"
+        doc = "Film window max X"
+    )
+    float inputs:ri:filmMaxY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Top"
+        doc = "Film window max Y"
+    )
+    float inputs:ri:filmMinX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Left"
+        doc = "Film window min X"
+    )
+    float inputs:ri:filmMinY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Bottom"
+        doc = "Film window min Y"
+    )
+    int inputs:ri:fit = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Fit"
+        doc = "Fit image to display."
+    )
+    string inputs:ri:holdoutShadowAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Holdout Shadow AOV"
+        doc = "The name of the holdout shadow AOV to look up."
+    )
+    bool inputs:ri:linearize = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Linearize"
+        doc = "Linearize"
+    )
+    float inputs:ri:offsetX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset X"
+        doc = "Offset in X."
+    )
+    float inputs:ri:offsetY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset Y"
+        doc = "Offset in Y."
+    )
+    float inputs:ri:rotate = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Rotate"
+        doc = "Rotation."
+    )
+    float inputs:ri:scaleX = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale X"
+        doc = "Scale in X."
+    )
+    float inputs:ri:scaleY = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale Y"
+        doc = "Scale in Y."
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrImageDisplayFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrLightSaturation "PxrLightSaturation" (
+    doc = """
+    A small example display filter that changes the color saturation in the
+    beauty pass (or any other AOV) according to whether a region is lit or
+    shadowed by particular light group.
+  """
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = """
+      Name of a color AOV to adjust saturation in.
+    """
+    )
+    bool inputs:ri:invert = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Invert?"
+        doc = """
+      If unset then areas lit by the light will be modified and areas fully
+      in shadow will be left alone.  Set this to invert that and change the
+      saturation of the shadows of this light.
+    """
+    )
+    string inputs:ri:light = "" (
+        connectability = "interfaceOnly"
+        displayName = "Light AOV"
+        doc = """
+      Name of the color AOV with the contribution from the light group.
+      The AOV should be populated using a direct-lighting LPE such as:
+      <p>
+        Display \"+satlighttiny\" \"null\" \"color lpe:C[DGS]<L.'tiny'>\"
+      </p>
+      in which case the value of this parameter would be \"satlighttiny\".
+      This AOV shows direct illumination from any lights with parameter:
+      <p>
+        \"string __group\" \"tiny\"
+      </p>
+    """
+    )
+    float inputs:ri:shift = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Shift"
+        doc = """
+      Amount and direction to shift saturation.  Positive values increase
+      saturation, negative values desaturate.  Recommended range is -2.0 to
+      2.0.
+    """
+    )
+    float inputs:ri:threshold = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Threshold"
+        doc = """
+      Luminance in the light AOV less than this is considered shadowed.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrLightSaturation" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrShadowDisplayFilter "PxrShadowDisplayFilter" (
+    doc = "Display filter plugin to calculate shadow AOV output from occluded and unoccluded AOV inputs."
+)
+{
+    string inputs:ri:occludedAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Occluded AOV"
+        doc = "The name of the occluded AOV to look up."
+    )
+    string inputs:ri:shadowAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Shadow AOV"
+        doc = "The name of the shadow AOV to write to."
+    )
+    float inputs:ri:shadowThreshold = 0.01 (
+        connectability = "interfaceOnly"
+        displayName = "Shadow Threshold"
+        doc = "Reduce shadow noise by ignoring small differences illumination."
+    )
+    string inputs:ri:unoccludedAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Unoccluded AOV"
+        doc = "The name of the unoccluded AOV to look up."
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrShadowDisplayFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrStylizedCanvas "PxrStylizedCanvas" (
+    doc = """
+        Required AOVs: 
+  """
+)
+{
+    string inputs:ri:canvas_aov_string = "diffuse" (
+        connectability = "interfaceOnly"
+        displayName = "Canvas AOV"
+        doc = """
+      Name of a color AOV to use for this Layer. This AOV has to be setup in Maya/Katana/Houdini or this Canvas DisplayFilter will exit.
+    """
+    )
+    color3f inputs:ri:Canvas_Color = (1, 1, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Canvas Color"
+        doc = """
+      Background color outside of alpha
+    """
+    )
+    asset inputs:ri:Canvas_Texture = @StylizedLooks/pxrStylized-woven/pxrStylized-woven-08.tex@ (
+        connectability = "interfaceOnly"
+        displayName = "Canvas Texture"
+        doc = "Provide BG texture for outside alpha, if blank uses BG Color"
+    )
+    token inputs:ri:Comp_Mode = "bg" (
+        allowedTokens = ["bg", "multiply", "screen"]
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Comp Mode"
+        doc = """ Comp on Color or previous layer (BG)
+    """
+    )
+    float inputs:ri:Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Gamma"
+        doc = """
+        Gamma (Contrast)
+    """
+    )
+    bool inputs:ri:Ignore_Alpha_Switch = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Ignore Alpha"
+        doc = """
+        Put BG Color or Texture on everything under Canvas, ignoring alpha
+    """
+    )
+    token inputs:ri:Layer = "color" (
+        allowedTokens = ["texture", "color", "albedo", "NPRalbedo", "NPRtoonOut", "NPRhatchOut", "NPRlineOut", "NPRlineOutAlpha", "aov"]
+        connectability = "interfaceOnly"
+        displayName = "Layer"
+        doc = "<help />"
+    )
+    float inputs:ri:Mix = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mix"
+        doc = """0: disables this Canvas Node and shows previous node if daisy chained, or original beauty if no previous Stylized Looks nodes. 1: full Canvas from this node.
+  """
+    )
+    token inputs:ri:visualizer = "canvasFinal" (
+        allowedTokens = ["disable", "canvasFinal", "separator"]
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = """
+      Color Blend Signal: replace tex1-tex8 with RED, ORANGE, YELLOW, GREEN, BLUE, INDIGO, VIOLET, TORQOISE for previewing blending
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrStylizedCanvas" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrStylizedHatching "PxrStylizedHatching" (
+    doc = """
+        Required AOVs: 
+        P 
+        Nn
+        diffuse
+        albedo
+        directSpecular
+        NPRalbedo
+        NPRlineAlbedo
+        NPRtextureCoords
+        NPRPtriplanar
+        NPRNtriplanar
+  """
+)
+{
+    bool inputs:ri:alpha_black_hatch_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Hatch Mask"
+        doc = """
+        When using Light Mask, black areas of hatch are transparent to previously daisy-chained or physically based layers
+    """
+    )
+    bool inputs:ri:BG_Ignore_Alpha_Switch = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing:Canvas"
+        displayName = "Ignore Alpha"
+        doc = """
+        But BG Color or Texture on everything under Hatching, ignoring alpha
+    """
+    )
+    color3f inputs:ri:BGColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing:Canvas"
+        displayName = "Canvas Color"
+        doc = """
+      Background color outside of alpha
+    """
+    )
+    asset inputs:ri:BGTex = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing:Canvas"
+        displayName = "Canvas Texture"
+        doc = "Provide BG texture for outside alpha, if blank uses BG Color"
+    )
+    bool inputs:ri:blending_black = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "Last Texture is Black"
+        doc = """
+      After the darkest texture, tex8, add solid color black
+    """
+    )
+    float inputs:ri:blending_hold = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "Hold"
+        doc = """ Hold texture full value
+    """
+    )
+    token inputs:ri:blending_mode = "weighted" (
+        allowedTokens = ["mix", "weighted"]
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "Blending Mode"
+        doc = "<help />"
+    )
+    float inputs:ri:blending_overlap = 0.125 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "Overlap"
+        doc = """ Overlap of the Bell Curve weighting function. 0.125 is minimum and blends 2 textures, higher values blend more up to 8 textures.
+"""
+    )
+    bool inputs:ri:blending_white = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "First Texture is White"
+        doc = """
+          After the lightest texture, tex1, add solid color white
+        """
+    )
+    bool inputs:ri:camera_range_mask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Camera Range Mask Switch"
+        doc = """
+        Mask out regular hatching (When Visualizer on Hatching On Color, Hatching Final) by Camera Range defined by Z_min and Z_max below
+    """
+    )
+    bool inputs:ri:Enable_Facing_Ratio_Frequency_Scale = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Frequency Scale by PxrStylizedControl"
+        doc = """
+            Frequency Scaling by facing ratio, UV, ... controlled in PxrStylizedControl.
+            Works on Screen and Triplanar projections with 1val Frequency Mode.
+            Facing Ratio/UV scaling saved in BLUE channel of NPRdistort from PxrStylizedControl.
+        """
+    )
+    float inputs:ri:Facing_Ratio_Frequency_Scale = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Frequency Scale"
+        doc = """
+        Scale Frequency by scaling set in PxrStylizedControl.
+        NPRdistort BLUE channel has scaling data.
+    """
+    )
+    float inputs:ri:Facing_Ratio_Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Frequency Scale Gamma"
+        doc = """
+        Apply Gamma to scaling data.
+    """
+    )
+    bool inputs:ri:flip_min_max = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Flip Min Max"
+        doc = """
+        Flip Cam Dist Z Min Max
+    """
+    )
+    bool inputs:ri:flip_tex = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Flip"
+        doc = "Flip"
+    )
+    float inputs:ri:Hatch_Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Gamma"
+        doc = """
+        Gamma (Contrast)
+    """
+    )
+    token inputs:ri:Hatch_On = "bg" (
+        allowedTokens = ["color", "bg", "multiply", "screen"]
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mode"
+        doc = """ Hatch on Color or previous layer (BG)
+    """
+    )
+    color3f inputs:ri:hatchColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Color"
+        displayName = "Color"
+        doc = """
+      Hatching color
+    """
+    )
+    token inputs:ri:hatchColorFrom = "colorSwatch" (
+        allowedTokens = ["colorSwatch", "NPRalbedoAOV", "albedoAOV", "NPRlineAlbedoAOV", "texture"]
+        connectability = "interfaceOnly"
+        displayGroup = "Color"
+        displayName = "Color From"
+        doc = """Select which AOV to determine the coloring of the hatching
+    """
+    )
+    token inputs:ri:hatching_aov_channel = "green" (
+        allowedTokens = ["red", "green", "blue"]
+        connectability = "interfaceOnly"
+        displayGroup = "Output"
+        displayName = "Channel"
+        doc = """Which channel to write grayscale hatching output to
+    """
+    )
+    string inputs:ri:hatching_aov_string = "NPRhatchOut" (
+        connectability = "interfaceOnly"
+        displayGroup = "Output"
+        displayName = "AOV"
+        doc = """
+      Name of a color AOV to use for this specific Hatching node. Default goes to GREEN channel of NPRhatchOut, use this for additional AOV support for use in compositing.
+    """
+    )
+    float inputs:ri:hatching_freq = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Frequency"
+        doc = """
+        Higher numbers = higher frequency. 
+        For screen start at 1. 
+        For triplanar start at 0.005.
+    """
+    )
+    token inputs:ri:hatching_freq_mode = "8Values" (
+        allowedTokens = ["1Value", "8Values", "camdistRange", "lightSignalRange"]
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Mode"
+        doc = "<help />"
+    )
+    float inputs:ri:hatching_freq_tex1 = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 1"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex2 = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 2"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex3 = 2.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 3"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex4 = 3 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 4"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex5 = 3.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 5"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex6 = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 6"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex7 = 4.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 7"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex8 = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 8"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    bool inputs:ri:hatchingMask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "PxrStylizedControl Mask"
+        doc = """Mult by hatching mask from PxrStylizedControl node in AOV NPRlineMask GREEN channel
+  """
+    )
+    asset inputs:ri:hatchingTex1 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 1"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex2 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 2"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex3 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 3"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex4 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 4"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex5 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 5"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex6 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 6"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex7 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 7"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex8 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 8"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTexSetCustom = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Texture Set"
+        doc = """Provide Texture Set Directory
+        A texture set is the name of a directory of pre-organized textures.
+        We don't actually go searching the texture path for the files to validate, we
+        just rely on the naming convention for the eight filenames when they are a set.
+
+        For set named \"myset\" we assume that there is a directory on the
+        texture path named \"myset\" containing myset-01.tex, myset-02.tex, etc.
+        
+        Stock texture sets are like
+        [rmantree/lib/textures/]StylizedLooks/pxrStylized-woven/pxrStylized-woven-01.tex
+    """
+    )
+    token inputs:ri:hatchingTexSetStock = "StylizedLooks/pxrStylized-woven" (
+        allowedTokens = ["StylizedLooks/pxrStylized-aquatint", "StylizedLooks/pxrStylized-charcoal", "StylizedLooks/pxrStylized-crosshatch", "StylizedLooks/pxrStylized-curl", "StylizedLooks/pxrStylized-halftone", "StylizedLooks/pxrStylized-patches", "StylizedLooks/pxrStylized-random", "StylizedLooks/pxrStylized-scumble", "StylizedLooks/pxrStylized-splatter", "StylizedLooks/pxrStylized-stipple", "StylizedLooks/pxrStylized-wash", "StylizedLooks/pxrStylized-woven"]
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Texture Set"
+        doc = """
+    Select a hatching texture set from the built-in predefined collection.
+    """
+    )
+    token inputs:ri:hatchingTexType = "texSetStock" (
+        allowedTokens = ["texSetStock", "texSetCustom", "texIndividualFiles"]
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Type"
+        doc = """
+    Select the source for hatching textures.
+    """
+    )
+    color3f inputs:ri:HatchOnColor = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Hatch On Color"
+        doc = """
+      Ignore albedo color for base color, use this color on all objects
+    """
+    )
+    bool inputs:ri:hatchTex_invert_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Invert"
+        doc = """
+          Invert order of progression of hatch texture lookups. For diffuse signals, typically left OFF (default)
+      """
+    )
+    float inputs:ri:hatchTexClr_mix = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatch Tex Color Mix"
+        doc = "<help />"
+    )
+    bool inputs:ri:Invert_Signal = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Invert Signal"
+        doc = """
+        Invert Signal Energy
+    """
+    )
+    bool inputs:ri:light_mask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Input Mask"
+        doc = """
+        Use light aov defined in signal_aov_string above as mask for previously daisy-chained Stylized shaders and/or physically based lighting
+    """
+    )
+    float inputs:ri:Light_max_freq = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Light Max Hatch Frequency"
+        doc = "<help />"
+    )
+    float inputs:ri:Light_min_freq = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Light Min Hatch Frequency"
+        doc = "<help />"
+    )
+    float inputs:ri:NPR_mix = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mix"
+        doc = """0: disables this Hatching Node and shows previous node if daisy chained, or original beauty if no previous Stylized Looks nodes. 1: full Hatching from this node.
+  """
+    )
+    bool inputs:ri:progressive_tex_switch = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Progressive"
+        doc = """
+    Composites textures on top of each other if not originally created that way (each texture progressively is added to the previous one). 
+    <br />
+\t<br />
+    Useful when using 8-val frequency mode.
+  """
+    )
+    token inputs:ri:projection = "screen" (
+        allowedTokens = ["screen", "triplanar", "NPRtextureCoordsAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Projection"
+        doc = "<help />"
+    )
+    int inputs:ri:ramp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Input Remap"
+        displayName = "Ramp"
+        doc = "Ramp"
+    )
+    float[] inputs:ri:ramp_Floats = [0, 0, 1, 1] (
+        displayGroup = "Input:Input Remap"
+        hidden = true
+    )
+    token inputs:ri:ramp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Input:Input Remap"
+        hidden = true
+    )
+    float[] inputs:ri:ramp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Input:Input Remap"
+        hidden = true
+    )
+    bool inputs:ri:remapSplineSwitch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Input Remap"
+        displayName = "Enable Ramp"
+        doc = "Enable Ramp"
+    )
+    token inputs:ri:signal = "diffuse" (
+        allowedTokens = ["beauty", "diffuse", "directSpecular", "cameraRange", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal"
+        doc = """
+        Choose the input signal to run the hatching algorithm on. Typically light signals like diffuse, directSpecular. 
+        Camera Range - uses camera min and max depth set in paremeters below instead.
+        Custom AOV - type in color AOV in Signal String below.
+    """
+    )
+    string inputs:ri:signal_aov_string = "diffuse" (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal String"
+        doc = """
+      Name of a color AOV to use for the signal to hatching. Typically diffuse, can put any light AOV here. This AOV has to be setup in Maya/Katana/Houdini or DisplayFilter will exit.
+    """
+    )
+    float inputs:ri:Signal_Pre_Gain = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Input Remap"
+        displayName = "Gain"
+        doc = """ Gain on incoming signal
+    """
+    )
+    float inputs:ri:Signal_Pre_Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Input Remap"
+        displayName = "Gamma"
+        doc = """ Gamma on incoming signal
+    """
+    )
+    bool inputs:ri:Toon_Colors_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Toon Mode"
+        doc = "Toon Mode"
+    )
+    float inputs:ri:triplanar_blending = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar Blending"
+        doc = """0 - no blending, 1 - full blending
+    """
+    )
+    token inputs:ri:triplanar_N = "NPRNtriplanar" (
+        allowedTokens = ["NPRNtriplanar", "Nn", "__Nref", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar N"
+        doc = """
+      NPRNtriplanar - set with PxrStylizedControl
+      N - factory RenderMan N, make sure AOV exists in render
+      __Nref - normal rest position, must be set (Maya: Texture Reference Object) and AOV exists in render
+      string - custom string to use any N AOV that exists in render
+    """
+    )
+    string inputs:ri:triplanar_N_aov_string = "NPRNtriplanar" (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar N String"
+        doc = '''
+      Name of a color AOV to use for the triplanar blending of N. If set to "NPRNtriplanar": need to plug PxrManifold3d into PxrStylizedControl node to provide custom co-ordinate system. Can also be factory "N" "__Nref" if those AOVs are setup.
+    '''
+    )
+    token inputs:ri:triplanar_P = "NPRPtriplanar" (
+        allowedTokens = ["NPRPtriplanar", "P", "__Pref", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar P"
+        doc = '''
+      NPRPtriplanar - set with PxrStylizedControl to be P in "object" space
+      P - factory RenderMan P, make sure AOV exists in render
+      __Pref - rest position, must be set (Maya: Texture Reference Object) and AOV exists in render
+      string - custom string to use any P AOV that exists in render
+    '''
+    )
+    string inputs:ri:triplanar_P_aov_string = "NPRPtriplanar" (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar P String"
+        doc = '''
+      Name of a color AOV to use for the triplanar blending of P. If set to "NPRPtriplanar": need to plug PxrManifold3d into PxrStylizedControl node to provide custom co-ordinate system. Can also be factory "P" "__Pref" "Pworld" if those AOVs are setup.
+    '''
+    )
+    token inputs:ri:visualizer = "hatchingFinal" (
+        allowedTokens = ["beauty", "hatchingFinal", "separator", "hatchingBlend", "diffuseEnergy", "triplanarTestColors", "colorBlendSignal"]
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = """
+      Color Blend Signal: replace tex1-tex8 with RED, ORANGE, YELLOW, GREEN, BLUE, INDIGO, VIOLET, TORQOISE for previewing blending
+    """
+    )
+    token inputs:ri:whiteShader = "albedoAOV" (
+        allowedTokens = ["signalAovMono", "signalAovAverage", "albedoAOV", "NPRalbedoAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Mode"
+        doc = """ Under the hood a white shader approximation is created based off the Signal AOV to drive the Hatching. By default using average of RGB components of Signal AOV, but can also divide Signal AOV lighting results with a pure albedo from NPRalbedo AOV or albedo AOV. If NPRalbedo AOV chosen, must set Albedo Color in Stylized Controller Pattern node.
+    """
+    )
+    token inputs:ri:z_depth_mode = "lineNZAOV" (
+        allowedTokens = ["lineNZAOV", "PAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Z Depth Mode"
+        doc = """ Slightly different Z depth data from these 2 sources
+      """
+    )
+    float inputs:ri:Z_max = 200 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Cam Dist Z Max"
+        doc = """ Linstep Max on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:Z_max_freq = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Z Max Hatch Frequency"
+        doc = "<help />"
+    )
+    float inputs:ri:Z_min = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Cam Dist Z Min"
+        doc = """ Linstep Min on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:Z_min_freq = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Z Min Hatch Frequency"
+        doc = "<help />"
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrStylizedHatching" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrStylizedLines "PxrStylizedLines" (
+    doc = """
+        Required AOVs:
+
+         1) NPRoutline
+         2) NPRsections
+         3) NPRlineNZ
+         4) NPRlineCamdist
+         5) NPRalbedo
+         6) NPRlineAlbedo
+         7) NPRmask
+         8) NPRlineWidth
+         9) diffuse
+        10) albedo
+        11) NPRlineOut
+        12) NPRlineOutAlpha
+        13) sampleCount
+        14) NPRcurvature
+        15) NPRdistort
+"""
+)
+{
+    token inputs:ri:activation_function = "none" (
+        allowedTokens = ["none", "spline", "sigmoid", "slopeThreshold"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Activation"
+        doc = """Activation for line detection algorithm
+    """
+    )
+    float inputs:ri:Activation_Slope = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Slope"
+        doc = """Line Detection - Hardness of the line. Higher slope is harder line. See https://www.desmos.com/calculator/djcxrcxchc and modify t for threhold, s for slope
+    """
+    )
+    float inputs:ri:Activation_Threshold = 0.05 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Threshold"
+        doc = """Line Detection - Threshold to consider an edge. Default 0.05. See https://www.desmos.com/calculator/djcxrcxchc and modify t for threhold, s for slope
+    """
+    )
+    string inputs:ri:aov = "NPRsections" (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Data AOV"
+        doc = """
+      Name of a color AOV to do line detection on. Manually set if you want to test on your AOV.
+    """
+    )
+    bool inputs:ri:camdist_linstep_switch = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Linstep Switch"
+        doc = """ 
+        Use linstep Min Max values below on Z (blue channel from lineNZ)
+      """
+    )
+    float inputs:ri:camdist_Zmax = 100 (
+        connectability = "interfaceOnly"
+        displayName = "Cam Dist Z Max"
+        doc = """ Linstep Max on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:camdist_Zmin = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Cam Dist Z Min"
+        doc = """ Linstep Min on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:camdist_zscale = 0.04 (
+        connectability = "interfaceOnly"
+        displayName = "Z Scale"
+        doc = """ Scale Z (from lineNZ blue channel) for line detect
+    """
+    )
+    bool inputs:ri:camdist_zscale_switch = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Z Scale Switch"
+        doc = """ Use Z Scale
+      """
+    )
+    float inputs:ri:compModeMix = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mix"
+        doc = """
+    Mix this node to previous result
+  """
+    )
+    token inputs:ri:daisy_chain_comp = "over" (
+        allowedTokens = ["over", "plus", "multiply", "screen"]
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mode"
+        doc = """ Comp mode over previous result (if have previous daisy-chained Stylized nodes, or beauty)
+    """
+    )
+    bool inputs:ri:Dilate_Sort_Alpha_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Use Alpha"
+        doc = """ If object has alpha, the zero alpha on camera depth will be incorrect, switch to ON to mix between camera depth of object and Dilate_Sort_Max_Depth based on alpha
+      """
+    )
+    float inputs:ri:Dilate_Sort_Depth_Scale = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Depth Scale"
+        doc = """
+      Scale Z depth for sorting based on scene scale
+    """
+    )
+    float inputs:ri:Dilate_Sort_Max_Depth = 1000 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Dilate Sort Max Depth"
+        doc = """
+      Max Depth to consider for outside of alpha
+    """
+    )
+    float inputs:ri:Dilate_Sort_Radius = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Radius"
+        doc = """
+      How big of a radius to dilate Z-sorted signal. Larger values = longer render time. MAX size of 6: will clamp if over.
+    """
+    )
+    bool inputs:ri:Dilate_Sort_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Enable"
+        doc = """ If using signals to drive line thickness/color, need to dilate and sort by z depth to pickup correct signal since line detection goes half off geo.
+      """
+    )
+    token inputs:ri:Dilate_Sort_Weight_Type = "Bell Curve" (
+        allowedTokens = ["Bell Curve", "Hermite", "Clamp"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Weight"
+        doc = """ During dilate sort, weighting
+      """
+    )
+    token inputs:ri:Distort_Filtering = "2x2" (
+        allowedTokens = ["off", "2x2"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Distort"
+        displayName = "Distort Filtering"
+        doc = "<help />"
+    )
+    bool inputs:ri:Distort_Negative_Remap = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Distort"
+        displayName = "Remap"
+        doc = """Assumes incoming signal to Distort UV is [0..1], remaps to [-1..1]
+  """
+    )
+    bool inputs:ri:Distort_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Distort"
+        displayName = "Enable"
+        doc = """Distort lines using Distort U V fractal plugged into PxrStylizedControl
+  """
+    )
+    float inputs:ri:Distort_UV_Scale = 15 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Distort"
+        displayName = "Offset"
+        doc = """
+  Scale UV Offsets from NPRdistort AOV
+"""
+    )
+    vector3f inputs:ri:HSV_Albedo = (0, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "HSV Albedo"
+        doc = """
+          HSV tint on Albedo color used to color lines
+      """
+    )
+    vector3f inputs:ri:HSV_Dark = (0, 1, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "HSV Dark"
+        doc = """
+          HSV
+      """
+    )
+    vector3f inputs:ri:HSV_Light = (0, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "HSV Light"
+        doc = """
+          HSV
+      """
+    )
+    bool inputs:ri:light_mask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Input Mask"
+        doc = """
+        Use AOV defined in Input Signal as mask for previously daisy-chained Stylized shaders and/or physically based lighting
+    """
+    )
+    float inputs:ri:Light_max_thickness = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "High Mult"
+        doc = """ Scale (multiply) Line Thickness by this value in light areas. Use Line Thickness From Lighting in Visualizer dropdown to preview signal.
+    """
+    )
+    bool inputs:ri:Light_min_max_thickness_invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Invert"
+        doc = """ Invert min max above: so thicker in shadows
+      """
+    )
+    float inputs:ri:Light_min_thickness = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Low Mult"
+        doc = """ Scale (multiply) Line Thickness by this value in shadows. Use Line Thickness From Lighting in Visualizer dropdown to preview signal.
+    """
+    )
+    token inputs:ri:light_response = "none" (
+        allowedTokens = ["none", "HSVLightDark", "lineColorShadow"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "Light Tint"
+        doc = """ Color lines by lighting
+    """
+    )
+    float inputs:ri:Light_thickness_gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Gamma"
+        doc = "<help />"
+    )
+    float inputs:ri:Line_Detect_Mutliplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Line Detect Multiplier"
+        doc = """ For Float Spline Ramp Activation of line detection, multiply user spline values
+    """
+    )
+    float inputs:ri:line_thickness_scale = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "PxrStylizedControl Scale"
+        doc = """
+      Globally scale line thickness. If you have line thickness set per object and they are all different values, and you up the resolution of the render, use this global scale to increase or decrease line thickness of all lines, since they are based on pixel width.
+    """
+    )
+    color3f inputs:ri:lineColor = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "Line Color"
+        doc = """
+      Lines color
+    """
+    )
+    token inputs:ri:lineColorFrom = "colorSwatch" (
+        allowedTokens = ["colorSwatch", "patternShader", "NPRalbedoAOV", "albedoAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "From"
+        doc = "<help />"
+    )
+    color3f inputs:ri:lineColorShadow = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "Line Color Shadow"
+        doc = """
+      Line color in dark/shadow areas
+    """
+    )
+    bool inputs:ri:lineMask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "PxrStylizedControl Mask"
+        doc = """ Mult by line mask from PxrStylizedControl pattern node in AOV NPRmask
+  """
+    )
+    float inputs:ri:linesGamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Gamma"
+        doc = """
+    After line detection happens, runs gamma on final lines.
+  """
+    )
+    bool inputs:ri:linesInside_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Lines Inside Alpha"
+        doc = """ Mult by alpha for only inside lines from line detect, don't go off geo. Premult.
+  """
+    )
+    float inputs:ri:lineThickness = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness"
+        displayName = "Thickness"
+        doc = """
+        Master Line Thickness, based on pixels
+    """
+    )
+    token inputs:ri:lineType = "sections" (
+        allowedTokens = ["outline", "sections", "lineNZ", "curvature", "camdist", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Type"
+        doc = """
+      outline - line on alpha of object
+      sections - line on random id
+      lineNZ - line on combination of X Y components of surface normal and Z depth, good for unit scale
+      curvature - line on change in surface normal
+      camdist - line on change in camera distance
+      aov - custom AOV defined below
+    """
+    )
+    bool inputs:ri:overwriteDataAOV = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Write To Type AOV"
+        doc = """
+        OFF: edge detection results go into NPRlineOutAlpha and NPRlineOut. ON: overwrite original signal, example writes back to NPRlineNZ/NPRsections/etc
+    """
+    )
+    int inputs:ri:ramp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection:Activation Spline Ramp"
+        displayName = "Ramp"
+        doc = "Ramp"
+    )
+    float[] inputs:ri:ramp_Floats = [0, 0, 1, 1] (
+        displayGroup = "Line Detection:Activation Spline Ramp"
+        hidden = true
+    )
+    token inputs:ri:ramp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Line Detection:Activation Spline Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:ramp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Line Detection:Activation Spline Ramp"
+        hidden = true
+    )
+    string inputs:ri:shaderNotes = "Lines Stylization Display Filter" (
+        connectability = "interfaceOnly"
+        displayGroup = "Notes"
+        displayName = "Note"
+        doc = """
+        Required AOVs:
+
+         1) NPRoutline
+         2) NPRsections
+         3) NPRlineNZ
+         4) NPRlineCamdist
+         5) NPRalbedo
+         6) NPRlineAlbedo
+         7) NPRmask
+         8) NPRlineWidth
+         9) diffuse
+        10) albedo
+        11) NPRlineOut
+        12) NPRlineOutAlpha
+        13) sampleCount
+        14) NPRcurvature
+        15) NPRdistort
+    """
+    )
+    float inputs:ri:sigmoid_activation_offset = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Sigmoid Offset"
+        doc = """ See: https://www.desmos.com/calculator/1agy4wsmrh and modify offset variable o
+    """
+    )
+    float inputs:ri:sigmoid_activation_sharpness = 25 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Sigmoid Sharpness"
+        doc = """ See: https://www.desmos.com/calculator/1agy4wsmrh and modify sharpness variable a
+    """
+    )
+    float inputs:ri:sigmoid_offset = 0.3 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Sigmoid Offset"
+        doc = """ Offset from the midpoint for each sigmoid. Used for line thickness, the bigger the offset the thicker the weighting. See: https://www.desmos.com/calculator/g4jbxcvtqz and modify variable o
+    """
+    )
+    float inputs:ri:sigmoid_sharpness = 17 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Sigmoid Sharpness"
+        doc = """ Sharpness of the sigmoid pair. Used for softening/hardening the line edge. See: https://www.desmos.com/calculator/g4jbxcvtqz and modify variable a
+    """
+    )
+    token inputs:ri:signal = "diffuse" (
+        allowedTokens = ["beauty", "diffuse", "directSpecular", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal"
+        doc = """
+        Choose the input signal to use for the light signal to line color and line thickness by lighting. Typically diffuse, can put any light AOV here.
+        Camera Range - uses camera min and max depth set in paremeters below instead.
+        Custom AOV - type in color AOV in Signal String below.
+    """
+    )
+    string inputs:ri:signal_aov_string = "diffuse" (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal String"
+        doc = """
+      Name of a color AOV to use for the light signal to line color and line thickness by lighting. Typically diffuse, can put any light AOV here. This AOV has to be setup in Maya/Katana/Houdini or DisplayFilter will exit.
+    """
+    )
+    bool inputs:ri:thickness_from_lighting_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "by Lighting"
+        doc = """
+            Hot tips here!
+        """
+    )
+    bool inputs:ri:thickness_from_pattern_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "by PxrStylizedControl"
+        doc = """
+            Multiply Line Thickness by set here by Line Thickness set on PxrStylizedControl per object
+        """
+    )
+    bool inputs:ri:thickness_from_zdepth_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "by Z Depth"
+        doc = """
+            Hot tips here!
+        """
+    )
+    token inputs:ri:visualizer = "finalLinesBeauty" (
+        allowedTokens = ["beauty", "finalLinesBeauty", "separator", "finalLines", "finalLinesInvert", "finalLinesAlpha", "lineThicknessFromPattern", "lineThicknessFromLighting", "diffuseEnergy", "zCamdist", "distortFiltering"]
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = "<help />"
+    )
+    token inputs:ri:weight_type = "bellCurve" (
+        allowedTokens = ["bellCurve", "hermite", "doubleSigmoid"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Weight"
+        doc = """ During line detection weighting to get variance
+    """
+    )
+    token inputs:ri:whiteShader = "signalAovAverage" (
+        allowedTokens = ["signalAovAverage", "albedoAOV", "NPRalbedoAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Mode"
+        doc = """ 
+        Under the hood a white shader approximation is created based off the Signal AOV to drive the Hatching. By default using average of RGB components of Signal AOV, but can also divide Signal AOV lighting results with a pure albedo from NPRalbedo AOV or albedo AOV. If NPRalbedo AOV chosen, must set Albedo Color in PxrStylizedControl node.
+    """
+    )
+    float inputs:ri:Zmax = 200 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Cam Dist Z Max"
+        doc = """ Linstep Max on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:Zmax_thickness = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Z Max Thickness Scale"
+        doc = "<help />"
+    )
+    float inputs:ri:Zmin = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Cam Dist Z Min"
+        doc = """ Linstep Min on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:Zmin_thickness = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Z Min Thickness Scale"
+        doc = "<help />"
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrStylizedLines" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrStylizedToon "PxrStylizedToon" (
+    doc = """
+        Required AOVs: diffuse albedo directSpecular NPRtoonOut NPRalbedo
+    """
+)
+{
+    int inputs:ri:Artistic_Pattern = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Artistic From PxrStylizedControl"
+        doc = "Artistic From PxrStylizedControl"
+    )
+    vector3f inputs:ri:Artistic_Pos = (0, 1, 0) (
+        displayGroup = "Input"
+        displayName = "Rotation"
+        doc = """
+        Phsyical - reads sampled light Signal for Toon Stepping. 
+        Artistic - reads artistic ramp from PxrStylizedControl for Toon Stepping.
+    """
+    )
+    color3f inputs:ri:backgroundColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "BG Color"
+        doc = """
+      BG Color
+  """
+    )
+    int inputs:ri:colorRamp = 4 (
+        displayGroup = "Stepping"
+        displayName = "Color Spline Ramp"
+        doc = "Color Spline Ramp"
+    )
+    color3f[] inputs:ri:colorRamp_Colors = [(1, 1, 1), (1, 1, 1), (1, 1, 1), (1, 1, 1)] (
+        displayGroup = "Stepping"
+        hidden = true
+    )
+    token inputs:ri:colorRamp_Interpolation = "catmull-rom" (
+        allowedTokens = ["catmull-rom", "linear"]
+        displayGroup = "Stepping"
+        hidden = true
+    )
+    float[] inputs:ri:colorRamp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Stepping"
+        hidden = true
+    )
+    token inputs:ri:daisy_chain_comp = "over" (
+        allowedTokens = ["over", "plus", "multiply", "screen"]
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mode"
+        doc = """ Comp mode over previous result (if have previous daisy-chained Stylized nodes, or beauty)
+    """
+    )
+    color3f inputs:ri:darks = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Darks Color"
+        doc = """
+      Color to step to
+    """
+    )
+    float inputs:ri:HSV_Albedo_Darks_Hue = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Darks Hue"
+        doc = """
+            Tint Albedo Darks to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Darks_Sat = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Darks Sat"
+        doc = """
+            Tint Albedo Darks to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Darks_Val = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Darks Val"
+        doc = """
+            Tint Albedo Darks to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Lights_Hue = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Lights Hue"
+        doc = """
+            Tint Albedo Lights to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Lights_Sat = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Lights Sat"
+        doc = """
+            Tint Albedo Lights to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Lights_Val = 1.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Lights Val"
+        doc = """
+            Tint Albedo Lights to match a shadow color
+        """
+    )
+    int inputs:ri:light_mask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Input Mask"
+        doc = """
+        Use light aov defined in signal_aov_string above as mask for previously daisy-chained Stylized shaders and/or physically based lighting.
+    """
+    )
+    int inputs:ri:ramp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Float Ramp"
+        doc = "Float Ramp"
+    )
+    float[] inputs:ri:ramp_Floats = [0, 0, 1, 1] (
+        displayGroup = "Input Remap"
+        hidden = true
+    )
+    token inputs:ri:ramp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Input Remap"
+        hidden = true
+    )
+    float[] inputs:ri:ramp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Input Remap"
+        hidden = true
+    )
+    token inputs:ri:Signal = "diffuse" (
+        allowedTokens = ["artistic", "diffuse", "occlusionIntegrator", "beauty", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal"
+        doc = ''' Signal to use for Toon Stepping
+        When Occlusion Integrator chosen - switch to PxrOcclusion in RenderMan Integrator
+        Custom AOV - name of a color AOV to use for the signal to toon shading. Typically "diffuse", can put any light AOV here. This AOV has to be setup in Maya/Katana/Houdini or DisplayFilter will exit.
+    '''
+    )
+    string inputs:ri:signal_aov_string = "diffuse" (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Custom AOV"
+        doc = """
+      Name of a color AOV to use for the signal to toon shading. Typically diffuse, can put any light AOV here. This AOV has to be setup in Maya/Katana/Houdini or DisplayFilter will exit.
+    """
+    )
+    float inputs:ri:Signal_Energy_Threshold_Max = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Threshold Max"
+        doc = """ 1 is off, values smaller than one remap the difference between Signal Energy and Albedo Color to be darker
+    """
+    )
+    float inputs:ri:Signal_Energy_Threshold_Min = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Threshold Min"
+        doc = """ 0 is off, values greater than 0 ignore small differences between Signal Energy and Albedo Color
+    """
+    )
+    float inputs:ri:Signal_Max = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Signal Max"
+        doc = """ Remap signal (lighting, artistic angle, ...) for steps
+    """
+    )
+    float inputs:ri:Signal_Min = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Signal Min"
+        doc = """ Remap signal (lighting, artistic angle, ...) for steps
+    """
+    )
+    float inputs:ri:Signal_Pre_Gain = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Gain"
+        doc = """ Gain on incoming signal
+        """
+    )
+    float inputs:ri:Signal_Pre_Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Gamma"
+        doc = """ Gamma on incoming signal
+        """
+    )
+    float inputs:ri:Smooth = 0.1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Smooth"
+        doc = """ Antialiasing between steps. Use on Physical or Artistic. Ignored on Artistic from PxrStylizedControl option (not needed).
+    """
+    )
+    int inputs:ri:Spline_Ramp_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Enable Float Ramp"
+        doc = "Enable Float Ramp"
+    )
+    token inputs:ri:Step_Mode = "albedo" (
+        allowedTokens = ["albedo", "lightToAlbedo", "darks", "stepModeColorRamp", "stepModeColorRampAlbedo"]
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Step Mode"
+        doc = "<help />"
+    )
+    bool inputs:ri:Toon_Mask_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Stylized Control Mask"
+        doc = """Mult by Toon mask from PxrStylizedControl node in AOV NPRlineMask BLUE channel
+  """
+    )
+    int inputs:ri:Toon_Steps = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Steps"
+        doc = """
+        Number of steps to quantize signal (lighting or artistic angle)
+    """
+    )
+    token inputs:ri:visualizer = "toonDiffuseFinal" (
+        allowedTokens = ["beauty", "toonDiffuseFinal", "separator", "toonRamp", "diffuseEnergy", "albedo"]
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = "<help />"
+    )
+    token inputs:ri:whiteShader = "albedoAOV" (
+        allowedTokens = ["signalAovAverage", "albedoAOV", "NPRalbedoAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Grayscale Mode"
+        doc = """ Under the hood a white shader approximation is created based off the Signal AOV to drive the Toon response. 
+        By default using average of RGB components of Signal AOV, but can also extract Signal AOV lighting results with a pure albedo from NPRalbedo AOV or albedo AOV. 
+        If NPRalbedo AOV chosen, must set Albedo Color in Stylized Controller Pattern node. 
+        Ignored when using PxrOcclusion integrator.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrStylizedToon" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrWhitePointDisplayFilter "PxrWhitePointDisplayFilter" (
+    doc = """
+        This display filter allows you to adjust the output colors so that the given color temperature is considered white.
+    """
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    color3f inputs:ri:manualWhitePoint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Adjust the image so that this color becomes the white value.
+        """
+    )
+    float inputs:ri:temperature = 6500 (
+        connectability = "interfaceOnly"
+        displayName = "Temperature"
+        doc = """
+            Allow the user to choose the color temperature of the light.
+            Unlike the basic light color this allows the user to easily
+            pick plausible light colors based on standard temperature
+            measurements.
+        """
+    )
+    bool inputs:ri:useManualWhitePoint = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Manual White Point?"
+        doc = """
+           This switch enables using the White Point below rather than rely on
+           color temperature for white balance.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:displayFilter:shaderId = "PxrWhitePointDisplayFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrDebugShadingContext "PxrDebugShadingContext" (
+    doc = '''
+        This integrator is used to visualize data in the shading
+        context, such as normals and texture coordinates. It is not
+        designed to produce "final-quality" images.
+    '''
+)
+{
+    token inputs:ri:viewchannel = "Nn" (
+        allowedTokens = ["Nn", "Vn", "VLen", "Tn", "InsideOutside", "st", "dsdu_dtdv", "dsdv_dtdu", "uv", "dudv", "LightLeaks", "P", "dPdu", "dPdv", "dPdtime", "id", "Ngn", "Po", "NoN", "mpSize"]
+        connectability = "interfaceOnly"
+        doc = """
+\t   The data to visualize from the shading context.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrDebugShadingContext" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrDefault "PxrDefault" (
+    doc = '''
+        Even simpler than PxrDirectLighting, the default integrator
+        places a virtual light at the camera (the "headlamp
+        integrator"). No shadows or indirect lighting are evaluated. A
+        good option when all is black - this integrator can help
+        narrow down where a problem is occurring (for example, when
+        the fault is in the lighting, particularly). Like
+        PxrDirectLighting, it is not designed to produce
+        "final-quality" images.
+    '''
+)
+{
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrDefault" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrDirectLighting "PxrDirectLighting" (
+    doc = """
+        This is a debugging or \"draft-quality\" integrator that
+        implements only the direct lighting portion of the light
+        transport. It is not designed to produce \"final-quality\"
+        images. Since it doesn't implement indirect lighting paths it
+        cannot produce reflections, refractions, or other global
+        illumination effects, nor can it handle any effects that
+        require a volume integrator.
+    """
+)
+{
+    int inputs:ri:numBxdfSamples = 4 (
+        connectability = "interfaceOnly"
+        doc = """
+    Controls the number of Bxdf samples for direct illumination per
+    camera hit point. The default is 4.
+        """
+    )
+    int inputs:ri:numLightSamples = 4 (
+        connectability = "interfaceOnly"
+        doc = """
+    Controls the number of light samples for direct illumination per
+    camera hit point. The default is 4.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrDirectLighting" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrOcclusion "PxrOcclusion" (
+    doc = """
+        Render occlusion.
+    """
+)
+{
+    float inputs:ri:cosineSpread = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Cosine Spread"
+        doc = """
+            Sample spread for cosine distribution. The default of 1 gives Lambertian distribution.
+        """
+    )
+    int inputs:ri:distribution = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Sample Distribution"
+        doc = """
+            Sample distribution can be uniform, cosine, or reflection. Reflection means that
+            the sample directions are generated by the Bxdfs. The default is cosine.
+        """
+    )
+    float inputs:ri:falloff = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Falloff"
+        doc = """
+            Falloff values greater than zero create a softer look. The default is 0.
+        """
+    )
+    float inputs:ri:maxDistance = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Max Distance"
+        doc = """
+            The max distance at which objects may occlude. The default of 0 is infinite.
+        """
+    )
+    int inputs:ri:numSamples = 4 (
+        connectability = "interfaceOnly"
+        displayName = "Num Samples"
+        doc = """
+            Controls the number of occlusion samples per camera hit point. The default is 4.
+        """
+    )
+    bool inputs:ri:useAlbedo = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Use Albedo"
+        doc = """
+            Tint occlusion by material albedo. The default is 0 (off).
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrOcclusion" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrPathTracer "PxrPathTracer"
+{
+    bool inputs:ri:accumOpacity = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Accumulate Opacity"
+        doc = """
+        Controls whether or not the path tracer
+        will keep track of accumulated opacity
+        along the path. The default is off. (Not implemented in XPU.)
+        """
+    )
+    bool inputs:ri:allowCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Allow Caustics"
+        doc = """
+        Controls whether illumination from
+        caustic light paths (that is, specular
+        illumination onto diffuse surfaces) is
+        allowed or disallowed.
+        The default is off.
+        """
+    )
+    int inputs:ri:clampDepth = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Indirect Clamping"
+        displayName = "Depth"
+        doc = """
+            If a value for the clampLuminance parameter is specified, then
+            clampDepth controls the ray depth at which to begin clamping
+            based on the per-ray luminance. For example, setting this
+            parameter to 2 and also specifying a value of 4 for
+            clampLuminance will ensure that the luminance of each ray's
+            contribution is no more than 4 for all indirect illumination,
+            without affecting or clamping the direct illumination. The
+            default is 2. (Not implemented in XPU.)
+            """
+    )
+    float inputs:ri:clampLuminance = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Indirect Clamping"
+        displayName = "Luminance"
+        doc = """
+            By default the PxrPathTracer integrator clamps the luminance
+            of each per-ray contribution to be at most 10.0. However, it
+            is possible to change this behavior by specifying a different
+            value for the clampLuminance parameter. Specifying a
+            relatively low value for the clampLuminance parameter (for
+            example, between 2 and 20) can greatly speed up convergence
+            and, in many cases, will make PxrPathTracer converge more
+            quickly than the more sophisticated PxrVCM integrator. In some
+            cases, indirect illumination lights paths may be noticeably
+            dimmer due to clamping; this may be an acceptable trade-off in
+            certain cases. Setting this parameter to a very large number
+            (such as 1e30) will effectively disable all clamping. The
+            default is 10.0. (Not implemented in XPU.)
+            """
+    )
+    bool inputs:ri:jointSampling = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Joint Sampling"
+        doc = """
+                Enables joint importance sampling of visibility and light sources.
+                This should be enabled for scenes with light sources near volumes and for scenes with non-thick volumes (alpha < 0.99).
+                For thick volumes (alpha near 1) lit only by distant light sources, there is a performance benefit to disabling joint sampling. (Not implemented in XPU.)
+            """
+    )
+    float inputs:ri:jointScatteringBias = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Joint Scattering Bias"
+        doc = """
+                By default, the joint sampling method will choose to scatter light proportionally to the opacity of each ray. This probability can be increased by raising the bias value (which does not bias the render itself), at the cost of undersampling objects behind the volume. For renders containing only volumes, this can be set to 1.0 to force a scatter event on all rays, even for thin volumes. (Not implemented in XPU.)
+            """
+    )
+    int inputs:ri:maxContinuationLength = -1 (
+        connectability = "interfaceOnly"
+        displayName = "Continuation Depth"
+        doc = """
+    Similar to maxIndirectBounces, this controls the upper bound on the
+    maximum ray depth -- but including continuation rays. Any negative value
+    will cause the path tracer to use an empirical heuristic to bound
+    the ray depth. A positive value will override this heuristic and
+    cause the path tracer to use the parameter value directly as the
+    maximum ray depth. Continuation rays are normally produced by
+    volumes when no density exists within subsections of them. If there
+    are many such zero density subsections overlapping then it is
+    possible to quickly hit the maximum continuation depth quickly,
+    resulting in black regions within your render.
+    The default is -1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:maxIndirectBounces = 8 (
+        connectability = "interfaceOnly"
+        displayName = "Max Indirect Bounces"
+        doc = '''
+            The maximum number of bounces of indirect illumination in your scene.
+            0 means direct illumination only, 1 means one bounce of indirect, etc.
+            Note: this parameter is one less than the old PxrPathTracer parameter
+            called "maxPathLength" -- the new name is more descriptive, and is
+            consistent with other integrators.
+            The default is 8.
+        '''
+    )
+    int inputs:ri:maxNonStochasticOpacityEvents = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Stochastic Opacity Depth"
+        doc = '''
+    Defines the camera ray depth for which opacity
+    calculations are computed with no noise (using
+    continuation rays). Once this depth is exceeded,
+    the opacity computation will switch to a stochastic
+    "presence" style of opacity, which may introduce
+    noise.
+    The default is 0. (Not implemented in XPU.)
+        '''
+    )
+    int inputs:ri:numBxdfSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "BXDF Samples"
+        doc = """
+    Controls the number of Bxdf samples for direct
+    illumination per camera hit point.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numDiffuseSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Diffuse Samples"
+        doc = """
+    When sampleMode is set to manual, controls the
+    number of indirect diffuse reflection rays to
+    spawn per camera hit point. Ignored when
+    sampleMode is set to Bxdf.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numIndirectSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Indirect Samples"
+        doc = """
+    When sampleMode is set to Bxdf this parameter
+    controls the total number of indirect rays to
+    spawn per camera hit point. When sampleMode is
+    set to manual the value of this parameter is
+    ignored.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numLightSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Light Samples"
+        doc = """
+    Controls the number of light samples for direct
+    illumination per camera hit point.
+    The default is 1.
+        """
+    )
+    int inputs:ri:numRefractionSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Refraction Samples"
+        doc = """
+    When sampleMode is set to manual, controls
+    the number of refraction/transmission rays
+    to spawn per camera hit point. Ignored when
+    sampleMode is set to Bxdf.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numSpecularSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Specular Samples"
+        doc = """
+    When sampleMode is set to manual, controls
+    the number of indirect specular/glossy
+    reflection rays to spawn per camera hit
+    point. Ignored when sampleMode is set to
+    Bxdf.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numSubsurfaceSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Subsurface Samples"
+        doc = """
+    When sampleMode is set to manual, controls
+    the number of subsurface rays to spawn per
+    camera hit point. Ignored when sampleMode
+    is set to Bxdf.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numVolumeAggregateSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Volume Aggregate Samples"
+        doc = """
+    Controls the number of volume aggregate samples for direct
+    illumination taken on the first ray segment.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    bool inputs:ri:risPathGuiding = 0 (
+        connectability = "interfaceOnly"
+        displayName = "RIS path guiding"
+        doc = """
+        Uses learned results to guide directions
+        for indirect path sampling. Can only be
+        used if light selection learning is also on
+        The default is off. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:rouletteDepth = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Russian Roulette"
+        displayName = "Depth"
+        doc = """
+            The path length at which the integrator will begin
+            performing Russian roulette (a method of probabilistically
+            terminating a ray path). Decreasing this setting will lead
+            to shorter paths and faster renders, but will result in
+            more noise.
+            """
+    )
+    float inputs:ri:rouletteThreshold = 0.2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Russian Roulette"
+        displayName = "Threshold"
+        doc = """
+            The path throughput threshold below which Russian roulette
+            is applied. It is usually preferable to apply Russian
+            roulette only to paths of low importance in order to avoid
+            noise. Increasing this setting will apply Russian roulette
+            to more paths and thus increase the speed of the render,
+            but will also increase noise.
+            """
+    )
+    token inputs:ri:sampleMode = "bxdf" (
+        allowedTokens = ["manual", "bxdf"]
+        connectability = "interfaceOnly"
+        displayName = "Sample Mode"
+        doc = '''
+    Controls the strategy for how indirect ray counts are apportioned
+    between diffuse vs. glossy vs. specular Bxdf lobes. Valid values
+    for this parameter are: "bxdf" or "manual". If "sampleMode" is set
+    to "bxdf", then the Bxdf is responsible for balancing the number
+    of indirect rays that will be spawned at each camera hit point
+    between the diffuse vs. glossy vs. specular lobes, and the total
+    number of indirect rays spawned at each camera hit point will be
+    controlled by the numIndirectSamples parameter. If "sampleMode" is
+    set to "manual" the user is responsible for explicitly specifying
+    the number of indirect rays to spawn per Bxdf lobe at each camera
+    hit point via the numDiffuseSamples, numSpecularSamples,
+    numSubsurfaceSamples, and numRefractionSamples parameters.
+    The default is "bxdf". (Not implemented in XPU.)
+        '''
+    )
+    string inputs:ri:volumeAggregate = "globalVolumeAggregate" (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Volume Aggregate Name"
+        doc = "Specifies the name of the global volume aggregate to use for rendering."
+    )
+    string inputs:ri:volumeAggregateCamera = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Camera Aggregate Override"
+        doc = "Overrides the global aggregate name for camera rays. If left empty, the global volume aggregate will be used."
+    )
+    string inputs:ri:volumeAggregateIndirect = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Indirect Aggregate Override"
+        doc = "Overrides the global aggregate name for indirect rays. If left empty, the global volume aggregate will be used."
+    )
+    string inputs:ri:volumeAggregateTransmission = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Transmission Aggregate Override"
+        doc = "Overrides the global aggregate name for transmission rays. If left empty, the global volume aggregate will be used."
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrPathTracer" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrVCM "PxrVCM"
+{
+    int inputs:ri:clampDepth = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Indirect Clamping"
+        doc = """
+          If a value for the clampLuminance parameter is specified, then
+          clampDepth controls the ray depth at which to begin clamping
+          based on the per-ray luminance. For example, setting this
+          parameter to 2 and also specifying a value of 4 for
+          clampLuminance will ensure that the luminance of each ray's
+          contribution is no more than 4 for all indirect illumination,
+          without affecting or clamping the direct illumination. The
+          default is 2.
+        """
+    )
+    float inputs:ri:clampLuminance = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Indirect Clamping"
+        doc = """
+          By default the PxrPathTracer integrator clamps the luminance
+          of each per-ray contribution to be at most 10.0. However, it
+          is possible to change this behavior by specifying a different
+          value for the clampLuminance parameter. Specifying a
+          relatively low value for the clampLuminance parameter (for
+          example, between 2 and 20) can speed up convergence. In some
+          cases, indirect illumination lights paths may be noticeably
+          dimmer due to clamping; this may be an acceptable trade-off in
+          certain cases. Setting this parameter to a very large number
+          (such as 1e30) will effectively disable all clamping. The
+          default is 10.0.
+          Note that changing the mergeRadius will/can change the smoothness
+          of the illumination and hence the clamping.
+        """
+    )
+    bool inputs:ri:connectPaths = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        When on, bidirectional path tracing is enabled;
+        otherwise, VCM will operate as a forward path tracer (if
+        merging is also disabled). Recommended for most scenes,
+        especially interior scenes with significant indirect
+        illumination.  On by default.
+      """
+    )
+    int inputs:ri:maxIndirectBounces = 8 (
+        connectability = "interfaceOnly"
+        displayName = "Max Indirect Bounces"
+        doc = '''
+            The maximum number of bounces of indirect illumination in your scene.
+            0 means direct illumination only, 1 means one bounce of indirect, etc.
+            Note: this parameter is one less than the old PxrVCM parameter
+            called "maxPathLength" -- the new name is more descriptive, and is
+            consistent with other integrators.
+            The default is 8.
+        '''
+    )
+    bool inputs:ri:mergePaths = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        Controls vertex merging, which improves the convergence of
+        specular-diffuse-specular (caustic) lighting. Enabling
+        vertex merging is generally recommended but may result in
+        additional time and memory overhead for photons, and in
+        scenes with little specular-diffuse-specular transport,
+        may be unnecessary.  On by default.
+      """
+    )
+    float inputs:ri:mergeRadius = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Vertex Merging"
+        doc = """
+          Initial radius used in vertex merging.  It is measured in screen
+          space pixels (not world space).  Increasing this radius will lead to
+          increased blurring of the photons, which is helpful in reducing
+          noisy caustics. However, this will also slow down merging,
+          and will also require more iterations in order to arrive at
+          a bias-free result.
+        """
+    )
+    int inputs:ri:numBxdfSamples = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        The number of bxdf samples taken when computing direct
+        illumination. The default is ``1``.
+      """
+    )
+    int inputs:ri:numLightSamples = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        The number of light samples taken when computing direct
+        illumination. The default is ``1``.
+      """
+    )
+    float inputs:ri:photonGuiding = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Photon Guiding"
+        doc = """
+          Sets the probability of using photon guiding during photon emission.
+          A value of 0.0 turns off photon guiding.  A value between 0.0 and
+          1.0 will cause a combination of photon guiding and standard photon
+          emission. Finally, a value of 1 means that only photon
+          guiding will be used -- in that case photons will be emitted only
+          towards the specified bounding box, which may result in rendering of
+          biased images. The default value is 0.0.
+        """
+    )
+    point3f inputs:ri:photonGuidingBBoxMax = (-1e30, -1e30, -1e30) (
+        connectability = "interfaceOnly"
+        displayGroup = "Photon Guiding"
+        doc = """
+          These two parameters can be used to explicitly specify the bounding
+          box (in world space coordinates) towards which more photons should be
+          emitted. If this bounding box is
+          not specified, it will be computed automatically as a (slightly loose)
+          bounding box of the directly visible parts of the scene.
+        """
+    )
+    point3f inputs:ri:photonGuidingBBoxMin = (1e30, 1e30, 1e30) (
+        connectability = "interfaceOnly"
+        displayGroup = "Photon Guiding"
+    )
+    int inputs:ri:rouletteDepth = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Russian Roulette"
+        doc = """
+          The path length at which the integrator will begin
+          performing Russian roulette (a method of probabilistically
+          terminating a ray path). Decreasing this setting will lead
+          to shorter paths and faster renders, but will result in
+          more noise.
+        """
+    )
+    float inputs:ri:rouletteThreshold = 0.2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Russian Roulette"
+        doc = """
+          The path throughput threshold below which Russian roulette
+          is applied. It is usually preferable to apply Russian
+          roulette only to paths of low importance in order to avoid
+          noise. Increasing this setting will apply Russian roulette
+          to more paths and thus increase the speed of the render,
+          but will also increase noise.
+        """
+    )
+    float inputs:ri:timeRadius = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Vertex Merging"
+        doc = """
+          Specifies the maximum interval in time (as a fraction of
+          the shutter) over which photons are merged. The default
+          value of 1.0 may cause smearing for caustics involving
+          moving objects. Decreasing the timeRadius will lead to
+          more accurate results/decreased smearing for motion
+          blurred caustics, at the cost of static objects requiring
+          more photons in order to resolve caustics.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrVCM" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrValidateBxdf "PxrValidateBxdf" (
+    doc = """
+       This integrator serves mainly as a debugging tool to authors of
+       Bxdf plugins. The 3 channels of the output are the luminance
+       results for total hemispherical reflectance, computed in three
+       different ways: the red channel gives the results of using the
+       Bxdf's GenerateSample method to sample the bxdf; the green
+       channel gives the results of running the Bxdf's EvaluateSample
+       (or EvaluateSamplesAtIndex) method using the same generated
+       samples, and only accumulating them if they agree with the
+       values returned by GenerateSample; and the blue channel gives
+       the results of integrating a set of hemispherical samples
+       generated with a cosine weighting using the EvaluateSample
+       method on the bxdf. Ideally, this will converge to the other
+       two results.
+
+       If the Bxdf is given \"white\" values and is correct, the
+       resulting image should converge to all white pixels. Energy
+       lost (either due to explicit absorption or due to the bxdf
+       model losing energy) or gained shows up as non-white
+       pixels. Bxdf authors should take care to observe what happens
+       at grazing angles, as that can be a good place to lose energy.
+    """
+)
+{
+    int inputs:ri:numSamples = 4 (
+        connectability = "interfaceOnly"
+        doc = """
+    Controls the number of Bxdf samples to generate and evaluate per ray. The default is 4.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrValidateBxdf" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrVisualizer "PxrVisualizer" (
+    doc = """
+        A utility integrator to navigate and inspect large scenes interactively.
+        Can also be used for modeling or animation turntables and in general to
+        detect geometric problems in your scenes.
+    """
+)
+{
+    asset inputs:ri:matCap = @@ (
+        connectability = "interfaceOnly"
+        displayName = "MatCap Texture"
+        doc = '''
+        Material capture environment map used when style is "matcap".
+        The surface normal is used to look up a color in this texture. 
+        (Not implemented in XPU.)
+        '''
+    )
+    bool inputs:ri:normalCheck = 0 (
+        connectability = "interfaceOnly"
+        doc = """
+        Colors geometry with inverted normals bright orange.
+        """
+    )
+    bool inputs:ri:normalMap = 0 (
+        connectability = "interfaceOnly"
+        doc = """
+        Maps normal's coordinates from [-1;1] to [0;1] to avoid black colors.
+        """
+    )
+    string inputs:ri:shadedPrimVar = "displayColor" (
+        connectability = "interfaceOnly"
+        displayName = "Shaded PrimVar"
+        doc = '''
+        Tint color for "shaded" style. (Not implemented in XPU.)
+        '''
+    )
+    token inputs:ri:style = "shaded" (
+        allowedTokens = ["bxdf", "shaded", "flat", "normals", "objectnormals", "st", "matcap"]
+        connectability = "interfaceOnly"
+        doc = """
+        bxdf: renders the scene as if the scene was lit with a single light at
+          the camera's position.
+        shaded: Simple N dot V shading. Normals are flipped if inverted.
+          (In RIS it is shadedColor * |VdotN| + 0.025 with default shadedColor = 0.7.
+           In XPU it is simply |VdotN|.)
+        flat: Uses a random flat color based on the object's id.
+        normals: displays normals in camera space.
+        objectnormals: displays normals in object space.
+        st: normalized st coordinates. Handy to visualize UDIM tiles.
+        matcap: material capture. Uses the surface normal to look up color in
+          an environment map.
+        """
+    )
+    bool inputs:ri:wireframe = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        Overlays wireframe. The default is on.
+        """
+    )
+    color3f inputs:ri:wireframeColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Wireframe Settings"
+        displayName = "Wireframe Color"
+        doc = "Wireframe Color"
+    )
+    float inputs:ri:wireframeOpacity = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Wireframe Settings"
+        displayName = "Wireframe Opacity"
+        doc = "Wireframe Opacity"
+    )
+    float inputs:ri:wireframeWidth = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Wireframe Settings"
+        displayName = "Wireframe Width"
+        doc = "Wireframe Width"
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+    uniform token ri:integrator:shaderId = "PxrVisualizer" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrBackgroundSampleFilter "PxrBackgroundSampleFilter" (
+    doc = """
+    Sample filter plugin to color the background.
+  """
+)
+{
+    color3f inputs:ri:backgroundColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Background Color"
+        doc = """
+        Color of the background.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrBackgroundSampleFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrCopyAOVSampleFilter "PxrCopyAOVSampleFilter" (
+    doc = """
+    Sample filter plugin to look up a named AOV and copy it
+    to Ci.
+  """
+)
+{
+    string inputs:ri:readAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Read AOV"
+        doc = "Name of AOV to read from."
+    )
+    string inputs:ri:writeAov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "Write AOV"
+        doc = "Name of AOV to write to."
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrCopyAOVSampleFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrCryptomatte "PxrCryptomatte" (
+    doc = """
+    Sample filter to generate Cryptomatte files for easy creation of
+    keyable ID mattes.  See https://github.com/Psyop/Cryptomatte for tools
+    and details.
+  """
+)
+{
+    int inputs:ri:accuracy = 4 (
+        connectability = "interfaceOnly"
+        displayName = "Accuracy"
+        doc = """
+      The number of extra id/coverage pairs computed but not stored.  Up to
+      a point, increasing this produces a better estimate for pixels where
+      there are many objects, but it does so at the expense of memory.
+    """
+    )
+    string inputs:ri:attribute = "" (
+        connectability = "interfaceOnly"
+        displayName = "Attribute"
+        doc = '''
+      Name of the string attribute used to group objects and identify them
+      in the manifest.  This will also be used to name the layer in the
+      Cryptomatte file.  Only has an effect when "Layer" is set to
+      "Attribute".
+    '''
+    )
+    string inputs:ri:filename = "cryptomatte.exr" (
+        connectability = "interfaceOnly"
+        displayName = "Filename"
+        doc = """
+      Name of the EXR file to write the Cryptomatte to.
+    """
+    )
+    token inputs:ri:layer = "identifier:name" (
+        allowedTokens = ["identifier:object", "identifier:name", "user:__materialid", "Attribute"]
+        connectability = "interfaceOnly"
+        displayName = "Layer"
+        doc = """
+      What property to use to group objects and identify them in the
+      manifest.  This will also be used to name the layer in the
+      Cryptomatte file.
+    """
+    )
+    int inputs:ri:levels = 6 (
+        connectability = "interfaceOnly"
+        displayName = "Levels"
+        doc = """
+      The number of id/coverage pairs to store in the Cryptomatte file.
+    """
+    )
+    token inputs:ri:manifest = "header" (
+        allowedTokens = ["none", "header", "sidecar"]
+        connectability = "interfaceOnly"
+        displayName = "Manifest"
+        doc = """
+      Where to store the object manifest.  Select 'None' if you do not wish
+      to store a manifest at all.
+    """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrCryptomatte" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrFilmicTonemapperSampleFilter "PxrFilmicTonemapperSampleFilter" (
+    doc = """
+        Sample filter plugin based on Naughty Dog's Filmic Tonemapper from GDC Uncharted 2 HDR Lighting presentation.
+    """
+)
+{
+    float inputs:ri:A = 0.22 (
+        connectability = "interfaceOnly"
+        displayName = "Shoulder"
+        doc = """
+            Shoulder strength.
+        """
+    )
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    float inputs:ri:B = 0.3 (
+        connectability = "interfaceOnly"
+        displayName = "Linear"
+        doc = """
+            Linear strength.
+        """
+    )
+    float inputs:ri:C = 0.1 (
+        connectability = "interfaceOnly"
+        displayName = "Linear Angle"
+        doc = """
+            Linear angle.
+        """
+    )
+    float inputs:ri:D = 0.2 (
+        connectability = "interfaceOnly"
+        displayName = "Toe"
+        doc = """
+            Toe strength.
+        """
+    )
+    float inputs:ri:E = 0.01 (
+        connectability = "interfaceOnly"
+        displayName = "Toe Numerator"
+        doc = """
+            Toe numerator.
+        """
+    )
+    float inputs:ri:exposureAdjust = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Exposure Adjustment"
+        doc = """
+            Exposure adjustment. This parameter is multiplied by the incoming
+            pixel.
+        """
+    )
+    float inputs:ri:F = 0.3 (
+        connectability = "interfaceOnly"
+        displayName = "Toe Denominator"
+        doc = """
+            Toe denominator.
+        """
+    )
+    float inputs:ri:linearWhitePoint = 11.2 (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Linear white point value.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrFilmicTonemapperSampleFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrGradeSampleFilter "PxrGradeSampleFilter" (
+    doc = """
+        Nuke-like grade sample filter. Allows simple grading of the beauty pass.
+    """
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    color3f inputs:ri:blackPoint = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Black Point"
+        doc = """
+            Ci is remapped so that this color becomes 0.
+        """
+    )
+    bool inputs:ri:clampBlack = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Clamp Black"
+        doc = """
+            Clamp Ci so that no value is less than 0. This is useful for compositing so that adding channels will not result in unexpected results.
+        """
+    )
+    bool inputs:ri:clampWhite = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Clamp White"
+        doc = """
+            Clamp Ci so that no value exceeds 1.
+        """
+    )
+    color3f inputs:ri:gain = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Gain"
+        doc = """
+            Multiply Ci by this color.
+        """
+    )
+    color3f inputs:ri:gamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Gamma"
+        doc = """
+            Gamma Ci by this color.
+        """
+    )
+    color3f inputs:ri:lift = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Lift"
+        doc = """
+            Add this value to Ci.
+        """
+    )
+    color3f inputs:ri:mask = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Mask"
+        doc = """
+            Mask the color correction result with this color.
+        """
+    )
+    color3f inputs:ri:multiply = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Multiply"
+        doc = """
+            Multiply Ci by this color.
+        """
+    )
+    color3f inputs:ri:offset = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Offset"
+        doc = """
+            Offset Ci (Ci + offset) by this color.
+        """
+    )
+    color3f inputs:ri:whitePoint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Ci is remapped so that this color becomes 1.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrGradeSampleFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrImagePlaneFilter "PxrImagePlaneFilter" (
+    doc = "Sample filter plugin to render image planes including holdouts."
+)
+{
+    color3f inputs:ri:colorGain = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Color Gain"
+        doc = "Color gain."
+    )
+    color3f inputs:ri:colorOffset = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Color Offset"
+        doc = "Color offset."
+    )
+    asset inputs:ri:filename = @@ (
+        connectability = "interfaceOnly"
+        displayName = "Filename"
+        doc = "The name of the plate image to display."
+    )
+    float inputs:ri:filmMaxX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Right"
+        doc = "Film window max X"
+    )
+    float inputs:ri:filmMaxY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Top"
+        doc = "Film window max Y"
+    )
+    float inputs:ri:filmMinX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Left"
+        doc = "Film window min X"
+    )
+    float inputs:ri:filmMinY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Bottom"
+        doc = "Film window min Y"
+    )
+    int inputs:ri:fit = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Fit"
+        doc = "Fit image to display."
+    )
+    string inputs:ri:holdoutShadowAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Holdout Shadow AOV"
+        doc = "The name of the holdout shadow AOV to look up."
+    )
+    bool inputs:ri:linearize = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Linearize"
+        doc = "Linearize"
+    )
+    float inputs:ri:offsetX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset X"
+        doc = "Offset in X."
+    )
+    float inputs:ri:offsetY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset Y"
+        doc = "Offset in Y."
+    )
+    float inputs:ri:rotate = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Rotate"
+        doc = "Rotation."
+    )
+    float inputs:ri:scaleX = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale X"
+        doc = "Scale in X."
+    )
+    float inputs:ri:scaleY = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale Y"
+        doc = "Scale in Y."
+    )
+    bool inputs:ri:useAlpha = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Use Alpha"
+        doc = "Applies alpha from the image plane to the beauty image"
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrImagePlaneFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrSampleFilterCombiner "PxrSampleFilterCombiner" (
+    doc = """
+        Sample filter combiner.
+    """
+)
+{
+    token inputs:ri:filter (
+        displayName = "Sample Filter"
+        doc = """
+            Sample filters.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrSampleFilterCombiner" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrShadowFilter "PxrShadowFilter" (
+    doc = "Sample filter plugin to calculate shadow AOV output from occluded and unoccluded AOV inputs."
+)
+{
+    string inputs:ri:occludedAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Occluded AOV"
+        doc = "The name of the occluded AOV to look up."
+    )
+    string inputs:ri:shadowAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Shadow AOV"
+        doc = "The name of the shadow AOV to write to."
+    )
+    string inputs:ri:unoccludedAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Unoccluded AOV"
+        doc = "The name of the unoccluded AOV to look up."
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrShadowFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrWatermarkFilter "PxrWatermarkFilter" (
+    doc = "Sample filter plugin to add watermarks to renders."
+)
+{
+    asset inputs:ri:filename = @@ (
+        connectability = "interfaceOnly"
+        displayName = "Filename"
+        doc = "The name of the plate image to display."
+    )
+    int inputs:ri:fit = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Fit"
+        doc = "Fit image to display."
+    )
+    bool inputs:ri:linearize = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Linearize"
+        doc = "Linearize"
+    )
+    int inputs:ri:mode = 3 (
+        connectability = "interfaceOnly"
+        displayName = "Mode"
+        doc = "Watermark blend modes."
+    )
+    float inputs:ri:offsetX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset X"
+        doc = "Offset in X."
+    )
+    float inputs:ri:offsetY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset Y"
+        doc = "Offset in Y."
+    )
+    float inputs:ri:rotate = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Rotate"
+        doc = "Rotation."
+    )
+    float inputs:ri:scaleX = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale X"
+        doc = "Scale in X."
+    )
+    float inputs:ri:scaleY = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale Y"
+        doc = "Scale in Y."
+    )
+    float inputs:ri:transparency = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Transparency"
+        doc = "Transparency"
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrWatermarkFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class PxrWhitePointSampleFilter "PxrWhitePointSampleFilter" (
+    doc = """
+        This sample filter allows you to adjust the output colors so that the given color temperature is considered white.
+    """
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    color3f inputs:ri:manualWhitePoint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Adjust the image so that this color becomes the white value.
+        """
+    )
+    float inputs:ri:temperature = 6500 (
+        connectability = "interfaceOnly"
+        displayName = "Temperature"
+        doc = """
+            Allow the user to choose the color temperature of the light.
+            Unlike the basic light color this allows the user to easily
+            pick plausible light colors based on standard temperature
+            measurements.
+        """
+    )
+    bool inputs:ri:useManualWhitePoint = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Manual White Point?"
+        doc = """
+           This switch enables using the White Point below rather than rely on
+           color temperature for white balance.
+        """
+    )
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+    rel proxyPrim (
+        doc = '''The proxyPrim relationship allows us to link a
+        prim whose purpose is "render" to its (single target)
+        purpose="proxy" prim.  This is entirely optional, but can be
+        useful in several scenarios:
+        
+        - In a pipeline that does pruning (for complexity management)
+        by deactivating prims composed from asset references, when we
+        deactivate a purpose="render" prim, we will be able to discover
+        and additionally deactivate its associated purpose="proxy" prim,
+        so that preview renders reflect the pruning accurately.
+        
+        - DCC importers may be able to make more aggressive optimizations
+        for interactive processing and display if they can discover the proxy
+        for a given render prim.
+        
+        - With a little more work, a Hydra-based application will be able
+        to map a picked proxy prim back to its render geometry for selection.
+
+        \\note It is only valid to author the proxyPrim relationship on
+        prims whose purpose is "render".'''
+    )
+    uniform token purpose = "default" (
+        allowedTokens = ["default", "render", "proxy", "guide"]
+        doc = """Purpose is a classification of geometry into categories that 
+        can each be independently included or excluded from traversals of prims 
+        on a stage, such as rendering or bounding-box computation traversals.
+
+        See for more detail about how 
+        purpose is computed and used."""
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrWhitePointSampleFilter" (
+        displayGroup = "Internal"
+    )
+    token visibility = "inherited" (
+        allowedTokens = ["inherited", "invisible"]
+        doc = '''Visibility is meant to be the simplest form of "pruning" 
+        visibility that is supported by most DCC apps.  Visibility is 
+        animatable, allowing a sub-tree of geometry to be present for some 
+        segment of a shot, and absent from others; unlike the action of 
+        deactivating geometry prims, invisible geometry is still 
+        available for inspection, for positioning, for defining volumes, etc.'''
+    )
+}
+
+class "PxrDspyDeepExrAPI" (
+    doc = """
+        Saves the image to a deep OpenEXR file.
+    """
+)
+{
+    int ri:displayDriver:asrgba = 1 (
+        displayName = "As RGBA"
+        doc = "As RGBA"
+    )
+    token ri:displayDriver:compression = "zips" (
+        allowedTokens = ["none", "rle", "zips"]
+        displayName = "Compression"
+        doc = "Compression"
+    )
+    float ri:displayDriver:forcepar = 0 (
+        displayName = "Force PAR"
+        doc = "Force PAR"
+    )
+    int ri:displayDriver:metadatacount = 0
+    token ri:displayDriver:storage = "scanline" (
+        allowedTokens = ["tiled", "scanline"]
+        displayName = "Storage"
+        doc = "Storage"
+    )
+    token ri:displayDriver:type = "half" (
+        allowedTokens = ["half", "float"]
+        displayName = "Type"
+        doc = "Type"
+    )
+}
+
+class "PxrDspyItAPI" (
+    doc = '''
+        Render to the "it" framebuffer.
+    '''
+)
+{
+}
+
+class "PxrDspyNullAPI" (
+    doc = """
+        Null display driver. No image will be written. 
+    """
+)
+{
+}
+
+class "PxrDspyOpenExrAPI" (
+    doc = """
+        Saves the image to an OpenEXR file.
+    """
+)
+{
+    int ri:displayDriver:asrgba = 1 (
+        displayName = "As RGBA"
+        doc = '''
+            If turned on, this flag causes the driver to try to rename a subset of the channels to RGBAZ. Try using this if your image viewer or compositing software swaps around channels (such as red or blue) incorrectly. The driver will rename any input channel named "Ci" to "RGB", any input channel named "a" to "A", and any input channel named "z" to "Z". If no such input channels exist with those names, the first four channels will be renamed to "RGBA". Use the "asgrbacolorchannel" and "asrgbaaplhachannel" parameters to choose which input channels get renamed.
+        '''
+    )
+    string ri:displayDriver:asrgbaalphachannel = "" (
+        displayName = '"A" float channel'
+        doc = '''
+            If set, this parameter causes the driver to rename the input channel of that name to "A". Setting this value will also cause "asrgba" to be assumed to be on.
+        '''
+    )
+    string ri:displayDriver:asrgbacolorchannel = "" (
+        displayName = '"RGB" color channel'
+        doc = '''
+            If set, this parameter causes the driver to rename the input channel of that name to "RGB". Setting this value will also cause "asrgba" to be assumed to be on.
+        '''
+    )
+    token ri:displayDriver:autocrop = "false" (
+        allowedTokens = ["false", "true"]
+        displayName = "Autocrop"
+        doc = "Autocrop"
+    )
+    token ri:displayDriver:compression = "zips" (
+        allowedTokens = ["none", "rle", "zip", "zips", "piz", "pixar", "b44", "b44a", "dwaa", "dwab"]
+        displayName = "Compression"
+        doc = "Compression"
+    )
+    float ri:displayDriver:compressionlevel = 45 (
+        displayName = "Compression Level"
+        doc = "Compression Level"
+    )
+    token ri:displayDriver:exrpixeltype = "half" (
+        allowedTokens = ["half", "float"]
+        displayName = "Type"
+        doc = "Type"
+    )
+    float ri:displayDriver:forcepar = 0 (
+        displayName = "Force PAR"
+        doc = "Force PAR"
+    )
+    int ri:displayDriver:metadatacount = 0
+    token ri:displayDriver:storage = "scanline" (
+        allowedTokens = ["scanline", "tiled"]
+        displayName = "Storage"
+        doc = "Storage"
+    )
+}
+
+class "PxrDspyPngAPI" (
+    doc = """
+        Saves the image to a PNG file.
+    """
+)
+{
+    int ri:displayDriver:quantize = 1 (
+        displayName = "Quantize"
+        doc = "Quantize"
+    )
+}
+
+class "PxrDspyPointCloudAPI" (
+    doc = """
+        Render to a RenderMan pointcloud file.
+    """
+)
+{
+}
+
+class "PxrDspyTargaAPI" (
+    doc = """
+        Saves the image to a TARGA file.
+    """
+)
+{
+    int ri:displayDriver:quantize = 1 (
+        displayName = "Quantize"
+        doc = "Quantize"
+    )
+}
+
+class "PxrDspyTextureAPI" (
+    doc = """
+        Saves the image to a texture file.
+        - Images rendered using this display driver must have power of two
+          dimensions - no attempt will be made to resize the image when using
+          this driver.
+    """
+)
+{
+    token ri:displayDriver:compression = "lossless" (
+        allowedTokens = ["none", "lossless", "lossy"]
+        displayName = "Compression"
+        doc = "Compression"
+    )
+    token ri:displayDriver:exrcompression = "DWAa" (
+        allowedTokens = ["none", "rle", "zip", "zips", "piz", "pixar", "B44", "B44A", "DWAa", "DWAb"]
+        displayName = "EXR Compression"
+        doc = "EXR Compression"
+    )
+    float ri:displayDriver:exrcompressionlevel = 45 (
+        displayName = "EXR Compression Level"
+        doc = "EXR Compression Level"
+    )
+    token ri:displayDriver:exrpixeltype = "half" (
+        allowedTokens = ["half", "float"]
+        displayName = "EXR Bit Depth"
+        doc = "EXR Bit Depth"
+    )
+    token ri:displayDriver:format = "pixar" (
+        allowedTokens = ["pixar", "openexr", "tiff"]
+        displayName = "Texture Format"
+        doc = "Texture Format"
+    )
+    token ri:displayDriver:smode = "black" (
+        allowedTokens = ["black", "clamp", "periodic"]
+        displayName = "S Wrap Mode"
+        doc = "S Wrap Mode"
+    )
+    token ri:displayDriver:tmode = "black" (
+        allowedTokens = ["black", "clamp", "periodic"]
+        displayName = "T Wrap Mode"
+        doc = "T Wrap Mode"
+    )
+    token ri:displayDriver:type = "byte" (
+        allowedTokens = ["byte", "short", "float"]
+        displayName = "Bit Depth"
+        doc = "Bit Depth"
+    )
+}
+
+class "PxrDspyTiffAPI" (
+    doc = '''
+        Saves the image to a Tagged Image File Format (TIFF).
+        It can be used to store "r", "rgb", "rgba", "rgbz", and "rgbaz" images
+        in 8, 16, or floating point 32-bit-per-component resolutions.
+    '''
+)
+{
+    token ri:displayDriver:compression = "lzw" (
+        allowedTokens = ["none", "lzw", "packbits", "deflate", "pixarlog"]
+        displayName = "Compression"
+        doc = "Compression"
+    )
+    token ri:displayDriver:format = "float32" (
+        allowedTokens = ["uint8", "uint16", "float32"]
+        displayName = "Format"
+        doc = "Format"
+    )
+    int ri:displayDriver:quantize = 1 (
+        displayName = "Quantize"
+        doc = "Quantize"
+    )
+    token ri:displayDriver:resolution (
+        displayGroup = "Advanced"
+        displayName = "Resolution"
+        doc = "Resolution"
+    )
+    token ri:displayDriver:resolutionunit = "none" (
+        allowedTokens = ["none", "centimeters", "inches"]
+        displayGroup = "Advanced"
+    )
+}
+
diff --git a/third_party/renderman-26/plugin/usdRiPxr/overview.dox b/third_party/renderman-26/plugin/usdRiPxr/overview.dox
new file mode 100644
index 0000000000..a17e95ad86
--- /dev/null
+++ b/third_party/renderman-26/plugin/usdRiPxr/overview.dox
@@ -0,0 +1,8 @@
+/*!
+\page usdRiPxr_page_front UsdRiPxr : USD Renderman Pxr Plugins Schemas
+(codeless)
+
+\section usdRiPxr_overview Overview
+
+UsdRiPxr provide USD codeless schemas for Renderman Pxr plugins. Most of the
+schema classes are generated using usdgenschemafromsdr.
diff --git a/third_party/renderman-26/plugin/usdRiPxr/plugInfo.json b/third_party/renderman-26/plugin/usdRiPxr/plugInfo.json
new file mode 100644
index 0000000000..7a0493b118
--- /dev/null
+++ b/third_party/renderman-26/plugin/usdRiPxr/plugInfo.json
@@ -0,0 +1,890 @@
+# Portions of this file auto-generated by usdGenSchema.
+# Edits will survive regeneration except for comments and
+# changes to types with autoGenerated=true.
+{
+    "Plugins": [
+        {
+            "Info": {
+                "Types": {
+                    "UsdRiPxrAovLight": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrAovLight"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdLuxNonboundableLightBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrAttributesAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrAttributesAPI"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrBackgroundDisplayFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrBackgroundDisplayFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrBackgroundSampleFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrBackgroundSampleFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrBarnLightFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrBarnLightFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdLuxLightFilter"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrCamera": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCamera"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrProjectionPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrCameraAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCameraAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "Camera"
+                        ], 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "Camera"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrCameraProjectionAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCameraProjectionAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "Camera"
+                        ], 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "Camera"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "isUsdShadeContainer": false, 
+                        "providesUsdShadeConnectableAPIBehavior": true, 
+                        "requiresUsdShadeEncapsulation": false, 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrCombinerLightFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCombinerLightFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdLuxLightFilter"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrCookieLightFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCookieLightFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdLuxLightFilter"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrCopyAOVDisplayFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCopyAOVDisplayFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrCopyAOVSampleFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCopyAOVSampleFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrCryptomatte": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCryptomatte"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrCylinderCamera": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCylinderCamera"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrProjectionPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrCylinderLightAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrCylinderLightAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "CylinderLight"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDebugShadingContext": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDebugShadingContext"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrDefault": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDefault"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrDirectLighting": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDirectLighting"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrDiskLightAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDiskLightAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "DiskLight"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDisplayChannelAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDisplayChannelAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "RenderVar"
+                        ], 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderVar"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDisplayFilterCombiner": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDisplayFilterCombiner"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrDisplayFilterPluginBase": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDisplayFilterPluginBase"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdGeomImageable"
+                        ], 
+                        "providesUsdShadeConnectableAPIBehavior": true, 
+                        "schemaKind": "abstractTyped"
+                    }, 
+                    "UsdRiPxrDistantLightAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDistantLightAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "DistantLight"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDomeLightAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDomeLightAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "DomeLight", 
+                            "DomeLight_1"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyDeepExrAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyDeepExrAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyItAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyItAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyNullAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyNullAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyOpenExrAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyOpenExrAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyPngAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyPngAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyPointCloudAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyPointCloudAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyTargaAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyTargaAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyTextureAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyTextureAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrDspyTiffAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrDspyTiffAPI"
+                        }, 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderProduct"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrEdgeDetect": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrEdgeDetect"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrEnvDayLight": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrEnvDayLight"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdLuxNonboundableLightBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrFilmicTonemapperDisplayFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrFilmicTonemapperDisplayFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrFilmicTonemapperSampleFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrFilmicTonemapperSampleFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrGradeDisplayFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrGradeDisplayFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrGradeSampleFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrGradeSampleFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrHalfBufferErrorFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrHalfBufferErrorFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrImageDisplayFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrImageDisplayFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrImagePlaneFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrImagePlaneFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrIntMultLightFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrIntMultLightFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdLuxLightFilter"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrIntegratorPluginBase": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrIntegratorPluginBase"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdTyped"
+                        ], 
+                        "providesUsdShadeConnectableAPIBehavior": true, 
+                        "schemaKind": "abstractTyped"
+                    }, 
+                    "UsdRiPxrLightProbe": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrLightProbe"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrProjectionPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrLightSaturation": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrLightSaturation"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrMeshLightAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrMeshLightAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "MeshLightAPI", 
+                            "VolumeLightAPI"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrOcclusion": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrOcclusion"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrOmnidirectionalStereo": {
+                        "alias": {
+                            "UsdSchemaBase": "OmnidirectionalStereo"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrProjectionPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrOptionsAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrOptionsAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "RenderSettings"
+                        ], 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderSettings"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrOrthographic": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrOrthographic"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrProjectionPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrPanini": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrPanini"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrProjectionPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrPathTracer": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrPathTracer"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrPerspective": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrPerspective"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrProjectionPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrPortalLightAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrPortalLightAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "PortalLight"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrPrimvarsAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrPrimvarsAPI"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrProjectionPluginBase": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrProjectionPluginBase"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdTyped"
+                        ], 
+                        "providesUsdShadeConnectableAPIBehavior": true, 
+                        "schemaKind": "abstractTyped"
+                    }, 
+                    "UsdRiPxrRampLightFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrRampLightFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdLuxLightFilter"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrRectLightAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrRectLightAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "RectLight"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrRenderTerminalsAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrRenderTerminalsAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "RenderSettings"
+                        ], 
+                        "apiSchemaCanOnlyApplyTo": [
+                            "RenderSettings"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "providesUsdShadeConnectableAPIBehavior": true, 
+                        "requiresUsdShadeEncapsulation": false, 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrRodLightFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrRodLightFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdLuxLightFilter"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrSampleFilterCombiner": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrSampleFilterCombiner"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrSampleFilterPluginBase": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrSampleFilterPluginBase"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdGeomImageable"
+                        ], 
+                        "providesUsdShadeConnectableAPIBehavior": true, 
+                        "schemaKind": "abstractTyped"
+                    }, 
+                    "UsdRiPxrShadowDisplayFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrShadowDisplayFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrShadowFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrShadowFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrSphereCamera": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrSphereCamera"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrProjectionPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrSphereLightAPI": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrSphereLightAPI"
+                        }, 
+                        "apiSchemaAutoApplyTo": [
+                            "SphereLight"
+                        ], 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdAPISchemaBase"
+                        ], 
+                        "schemaKind": "singleApplyAPI"
+                    }, 
+                    "UsdRiPxrStylizedCanvas": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrStylizedCanvas"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrStylizedHatching": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrStylizedHatching"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrStylizedLines": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrStylizedLines"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrStylizedToon": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrStylizedToon"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrUnified": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrUnified"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrVCM": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrVCM"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrValidateBxdf": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrValidateBxdf"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrVisualizer": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrVisualizer"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrIntegratorPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrWatermarkFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrWatermarkFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrWhitePointDisplayFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrWhitePointDisplayFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrDisplayFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }, 
+                    "UsdRiPxrWhitePointSampleFilter": {
+                        "alias": {
+                            "UsdSchemaBase": "PxrWhitePointSampleFilter"
+                        }, 
+                        "autoGenerated": true, 
+                        "bases": [
+                            "UsdRiPxrSampleFilterPluginBase"
+                        ], 
+                        "schemaKind": "concreteTyped"
+                    }
+                }
+            }, 
+            "LibraryPath": "@PLUG_INFO_LIBRARY_PATH@", 
+            "Name": "usdRiPxr", 
+            "ResourcePath": "@PLUG_INFO_RESOURCE_PATH@", 
+            "Root": "@PLUG_INFO_ROOT@", 
+            "Type": "resource"
+        }
+    ]
+}
diff --git a/third_party/renderman-26/plugin/usdRiPxr/schema.usda b/third_party/renderman-26/plugin/usdRiPxr/schema.usda
new file mode 100644
index 0000000000..b6383b3d45
--- /dev/null
+++ b/third_party/renderman-26/plugin/usdRiPxr/schema.usda
@@ -0,0 +1,9013 @@
+#usda 1.0
+(
+    subLayers = [
+        @usdGeom/schema.usda@,
+        @usdLux/schema.usda@,
+        @usd/schema.usda@
+    ]
+)
+
+over "GLOBAL" (
+    customData = {
+        string libraryName = "usdRiPxr"
+        bool skipCodeGeneration = 1
+        bool useLiteralIdentifier = 1
+    }
+)
+{
+}
+
+class "PxrProjectionPluginBase" (
+    customData = {
+        string className = "ProjectionPluginBase"
+        dictionary extraPlugInfo = {
+            bool providesUsdShadeConnectableAPIBehavior = 1
+        }
+    }
+    doc = """Base Schema class which other PxrProjection plugins will inherit.
+    It also provides UsdShade connectability for all classes that derive from
+    it."""
+    inherits = </Typed>
+)
+{
+    token outputs:result (
+        doc = """Connect PxrCameraProjectionAPI's outputs:ri:projection terminal
+        to this output"""
+    )
+}
+
+class "PxrSampleFilterPluginBase" (
+    customData = {
+        string className = "SampleFilterPluginBase"
+        dictionary extraPlugInfo = {
+            bool providesUsdShadeConnectableAPIBehavior = 1
+        }
+    }
+    doc = """Base Schema class which other PxrSampleFilter plugins will inherit. 
+    It also provides UsdShade connectability for all classes that derive from
+    it."""
+    inherits = </Imageable>
+)
+{
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:sampleFilters
+        terminal to this output to add the filter for processing."""
+    )
+}
+
+class "PxrDisplayFilterPluginBase" (
+    customData = {
+        string className = "DisplayFilterPluginBase"
+        dictionary extraPlugInfo = {
+            bool providesUsdShadeConnectableAPIBehavior = 1
+        }
+    }
+    doc = """Base Schema class which other PxrDisplayFilter plugins will inherit.
+    It also provides UsdShade connectability for all classes that derive from
+    it."""
+    inherits = </Imageable>
+)
+{
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:displayFilters
+        terminal to this output to add the filter for processing."""
+    )
+}
+
+class "PxrIntegratorPluginBase" (
+    customData = {
+        string className = "IntegratorPluginBase"
+        dictionary extraPlugInfo = {
+            bool providesUsdShadeConnectableAPIBehavior = 1
+        }
+    }
+    doc = """Base Schema class which other PxrIntegrator plugins will inherit.
+    It also provides UsdShade connectability for all classes that derive from
+    it."""
+    inherits = </Typed>
+)
+{
+    token outputs:result (
+        doc = """Connect PxrRenderTerminalsAPI's outputs:ri:integrator
+        terminal to this output to add the integrator for processing."""
+    )
+}
+
+class "PxrRenderTerminalsAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["RenderSettings"]
+        token[] apiSchemaCanOnlyApplyTo = ["RenderSettings"]
+        string className = "RenderTerminalsAPI"
+        dictionary extraPlugInfo = {
+            bool providesUsdShadeConnectableAPIBehavior = 1
+            bool requiresUsdShadeEncapsulation = 0
+        }
+        dictionary schemaTokens = {
+            dictionary displayFilters = {
+                string doc = "Terminal for connecting display filters"
+            }
+            dictionary integrator = {
+                string doc = "Terminal for connecting an integrator"
+            }
+            dictionary sampleFilters = {
+                string doc = "Terminal for connecting sample filters"
+            }
+        }
+    }
+    doc = """API schema that provides a means of connecting a sample filter,
+    display filter and an integrator. The API can be applied to provide hooks to
+    the same for rman settings."""
+    inherits = </APISchemaBase>
+)
+{
+    token outputs:ri:displayFilters (
+        customData = {
+            string apiName = "displayFilters"
+        }
+        displayGroup = "OutputFilters"
+        doc = """Represents the display filter terminals for a render setting. A
+        display filter inheriting PxrDisplayFilterPluginBase can be connected to
+        this terminal."""
+    )
+    token outputs:ri:integrator (
+        customData = {
+            string apiName = "integrator"
+        }
+        doc = """Represents the integrator terminal for a render setting. A
+        integrator inheriting PxrIntegratorPluginBase can be connected to this
+        terminal."""
+    )
+    token outputs:ri:sampleFilters (
+        customData = {
+            string apiName = "sampleFilters"
+        }
+        displayGroup = "OutputFilters"
+        doc = """Represents the sample filter terminals for a render setting. A
+        sample filter inheriting PxrSampleFilterPluginBase can be connected to
+        this terminal."""
+    )
+}
+
+class "PxrCameraProjectionAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["Camera"]
+        token[] apiSchemaCanOnlyApplyTo = ["Camera"]
+        string className = "CameraProjectionAPI"
+        dictionary extraPlugInfo = {
+            bool isUsdShadeContainer = 0
+            bool providesUsdShadeConnectableAPIBehavior = 1
+            bool requiresUsdShadeEncapsulation = 0
+        }
+        dictionary schemaTokens = {
+            dictionary projection = {
+                string doc = "Describes the <i>projection</i> output terminal"
+            }
+        }
+    }
+    doc = """API schema that is auto-applied _only_ to UsdGeomCamera and 
+    provides a RenderMan-specific projection output terminal to UsdGeomCamera
+    """
+    inherits = </APISchemaBase>
+)
+{
+    token outputs:ri:projection (
+        customData = {
+            string apiName = "projection"
+        }
+        displayGroup = "Outputs"
+        doc = "Represents the projection output terminal on a camera prim."
+    )
+}
+
+class "PxrAttributesAPI" (
+    customData = {
+        string apiSchemaType = "singleApply"
+        string className = "AttributesAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    string primvars:ri:attributes:bake:activeudims = "" (
+        displayGroup = "Common"
+        displayName = "Active Udims"
+        doc = '''
+                Active udims for Integrator baking of texture atlases.  Lists and ranges of udims 
+                can be provided in the string, for example:
+                  Attribute "bake" "string activeudims" "1001,1003,1005-1006".
+                The default is "" which means all udims get baked.
+            '''
+    )
+    string primvars:ri:attributes:bake:udimresolutions = "" (
+        displayGroup = "Common"
+        displayName = "Udim Resolutions"
+        doc = '''
+                Udim texure resolutions for Integrator baking of texture atlases.  Lists and ranges
+                of udims can be provided in the string, for example:
+                Attribute "bake" "string udimresolutions" "1001 512 512  1002,1003 64 32  1005-1006 16 16"
+                If the string is empty (the default) then the Display Format resolution will be used.
+            '''
+    )
+    int primvars:ri:attributes:curves:widthaffectscurvature = 1 (
+        displayGroup = "Shading"
+        displayName = "Width Affects Curvature"
+        doc = """
+                Indicates whether curve width should be used when computing curve curvature.
+                If turned off, only the curvature along the curve spline will be calculated.
+            """
+    )
+    int primvars:ri:attributes:grouping:id = 0 (
+        displayGroup = "Common"
+        displayName = "Grouping Id"
+        doc = """
+                Grouping id used for raytrace disambiguation purposes.
+            """
+    )
+    string primvars:ri:attributes:grouping:membership = "" (
+        displayGroup = "Common"
+        displayName = "Membership"
+        doc = """
+                Grouping membership used for linking.
+            """
+    )
+    int primvars:ri:attributes:identifier:id = 0 (
+        displayGroup = "Common"
+        displayName = "Identifier Id"
+        doc = """
+                Lower 32 bits of 64 bit object id.
+            """
+    )
+    int primvars:ri:attributes:identifier:id2 = 0 (
+        displayGroup = "Common"
+        displayName = "Identifier Id 2"
+        doc = """
+                Upper 32 bits of 64 bit object id.
+            """
+    )
+    string primvars:ri:attributes:identifier:lpegroup = "" (
+        displayGroup = "Common"
+        displayName = "Identifier LPE Group"
+        doc = """
+                Grouping membership used for light path expressions.
+            """
+    )
+    string primvars:ri:attributes:identifier:name = "" (
+        displayGroup = "Common"
+        displayName = "Identifier Name"
+        doc = """
+                Object instance name.
+            """
+    )
+    string primvars:ri:attributes:lightfilter:subset = "" (
+        displayGroup = "Shading"
+        displayName = "Light Filter Subset"
+        doc = """
+                Active light filter groups in lighting.
+            """
+    )
+    string primvars:ri:attributes:lighting:excludesubset = "" (
+        displayGroup = "Shading"
+        displayName = "Lighting Excludesubset"
+        doc = """
+                Exclude light groups from lighting.
+            """
+    )
+    int primvars:ri:attributes:lighting:mute = 0 (
+        displayGroup = "Shading"
+        displayName = "Lighting Mute"
+        doc = """
+                Mutes light emission.
+            """
+    )
+    string primvars:ri:attributes:lighting:subset = "" (
+        displayGroup = "Shading"
+        displayName = "Lighting Subset"
+        doc = """
+                Light groups active in lighting.
+            """
+    )
+    int primvars:ri:attributes:Ri:Matte = 0 (
+        displayGroup = "Shading"
+        displayName = "Matte"
+        doc = """
+                Indicates matte object.
+            """
+    )
+    int primvars:ri:attributes:Ri:ReverseOrientation = 0 (
+        displayGroup = "Shading"
+        displayName = "Reverse Orientation"
+        doc = """
+                Flip shading normals.
+            """
+    )
+    int primvars:ri:attributes:Ri:Sides = 2 (
+        displayGroup = "Shading"
+        displayName = "Sides"
+        doc = """
+                Geometry can be one or two sided.
+            """
+    )
+    float primvars:ri:attributes:shade:indexofrefraction = -1 (
+        displayGroup = "Shading"
+        displayName = "Index Of Refraction"
+        doc = """
+                Override material IOR for nested dielectrics.
+            """
+    )
+    int primvars:ri:attributes:shade:minsamples = 1 (
+        displayGroup = "Shading"
+        displayName = "Min Samples"
+        doc = """
+                Min Pixel Samples.  For fine-tuning adaptive sampling.
+            """
+    )
+    float primvars:ri:attributes:shade:relativepixelvariance = 1 (
+        displayGroup = "Shading"
+        displayName = "Relative Pixel Variance"
+        doc = """
+                PixelVariance multiplier for camera visible objects.  For fine-tuning adaptive sampling.
+            """
+    )
+    string primvars:ri:attributes:stats:identifier = "" (
+        displayGroup = "Common"
+        displayName = "Stats Identifier"
+        doc = """
+                Identifier string used by the stats system when referring to this instance.
+            """
+    )
+    int primvars:ri:attributes:trace:holdout = 0 (
+        displayGroup = "Shading"
+        displayName = "Holdout"
+        doc = """
+                Indicates holdout object.
+            """
+    )
+    int primvars:ri:attributes:trace:intersectpriority = 0 (
+        displayGroup = "Shading"
+        displayName = "Intersect Priority"
+        doc = """
+                Raytrace intersection priority for nested dielectrics.
+            """
+    )
+    int primvars:ri:attributes:trace:maxdiffusedepth = 1 (
+        displayGroup = "Shading"
+        displayName = "Max Diffuse Depth"
+        doc = """
+                Maximum diffuse light bounces.
+            """
+    )
+    int primvars:ri:attributes:trace:maxspeculardepth = 2 (
+        displayGroup = "Shading"
+        displayName = "Max Specular Depth"
+        doc = """
+                Maximum specular light bounces.
+            """
+    )
+    string primvars:ri:attributes:trace:reflectexcludesubset = "" (
+        displayGroup = "Shading"
+        displayName = "Reflect Exclude Subset"
+        doc = """
+                Exclude object groups from relections.
+            """
+    )
+    string primvars:ri:attributes:trace:reflectsubset = "" (
+        displayGroup = "Shading"
+        displayName = "Reflect Subset"
+        doc = """
+                Object groups visible to reflections.
+            """
+    )
+    string primvars:ri:attributes:trace:shadowexcludesubset = "" (
+        displayGroup = "Shading"
+        displayName = "Shadow Exclude Subset"
+        doc = """
+                Exclude object groups from casting shadows.
+            """
+    )
+    string primvars:ri:attributes:trace:shadowsubset = "" (
+        displayGroup = "Shading"
+        displayName = "Shadow Subset"
+        doc = """
+                Object groups active in shadows.
+            """
+    )
+    string primvars:ri:attributes:trace:transmitexcludesubset = "" (
+        displayGroup = "Shading"
+        displayName = "Transmit Exclude Subset"
+        doc = """
+                Exclude object groups from refractions.
+            """
+    )
+    string primvars:ri:attributes:trace:transmitsubset = "" (
+        displayGroup = "Shading"
+        displayName = "Transmit Subset"
+        doc = """
+                Object groups visible to refractions.
+            """
+    )
+    int primvars:ri:attributes:visibility:camera = 1 (
+        displayGroup = "Shading"
+        displayName = "Camera Visibility"
+        doc = """
+                Indicates if object is visible to camera rays.
+            """
+    )
+    int primvars:ri:attributes:visibility:indirect = 1 (
+        displayGroup = "Shading"
+        displayName = "Indirect Visibility"
+        doc = """
+                Indicates if object is visible to indirect (reflection and refraction) rays.
+            """
+    )
+    int primvars:ri:attributes:visibility:transmission = 1 (
+        displayGroup = "Shading"
+        displayName = "Transmission Visibility"
+        doc = """
+                Indicates if object is visible to shadow rays.
+            """
+    )
+}
+
+class "PxrCameraAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["Camera"]
+        token[] apiSchemaCanOnlyApplyTo = ["Camera"]
+        string apiSchemaType = "singleApply"
+        string className = "CameraAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    float ri:apertureAngle = 0 (
+        displayGroup = "Common"
+        displayName = "Aperture Angle"
+        doc = "<help />"
+    )
+    float ri:apertureDensity = 0 (
+        displayGroup = "Common"
+        displayName = "Aperture Density"
+        doc = "<help />"
+    )
+    int ri:apertureNSides = 0 (
+        displayGroup = "Common"
+        displayName = "Aperture Number Of Sides"
+        doc = "<help />"
+    )
+    float ri:apertureRoundness = 1 (
+        displayGroup = "Common"
+        displayName = "Aperture Roundness"
+        doc = "<help />"
+    )
+    float ri:dofaspect = 1 (
+        displayGroup = "Common"
+        displayName = "DOF Aspect"
+        doc = """
+                Depth of field aspect.
+            """
+    )
+    float ri:shutterCloseTime = 1 (
+        displayGroup = "Common"
+        displayName = "Shutter Close Time"
+        doc = "<help />"
+    )
+    float[] ri:shutteropening = [0, 0, 0, 0, 1, 1, 1, 1] (
+        displayGroup = "Common"
+        displayName = "Shutter Opening"
+        doc = "<help />"
+    )
+    float ri:shutterOpenTime = 0 (
+        displayGroup = "Common"
+        displayName = "Shutter Open Time"
+        doc = "<help />"
+    )
+    float[] ri:stereoplanedepths = [] (
+        displayGroup = "Common"
+        displayName = "Stereo Plane Depths"
+        doc = '''
+                Control "ray bending" to enable multi-stereo camera workflows. Each depth element
+                defines a depth plane where camera rays bend by a horizontal (camera x) offset.
+                Every depth element must have a corresponding offset element. Values should be
+                positive and in increasing order.
+            '''
+    )
+    float[] ri:stereoplaneoffsets = [] (
+        displayGroup = "Common"
+        displayName = "Stereo Plane Offsets"
+        doc = '''
+                Control "ray bending" to enable multi-stereo camera workflows. Each offset element
+                defines a horizontal offset (camera x) of a virtual camera origin that bends rays
+                at the corresponding depth plane. Every offset element must have a corresponding
+                depth element.
+            '''
+    )
+}
+
+class "PxrDisplayChannelAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["RenderVar"]
+        token[] apiSchemaCanOnlyApplyTo = ["RenderVar"]
+        string apiSchemaType = "singleApply"
+        string className = "DisplayChannelAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    token ri:displayChannel:filter = "filter" (
+        allowedTokens = ["filter", "min", "max", "average", "zmin", "zmax", "sum"]
+        displayGroup = "Common"
+        displayName = "Accumulation Rule"
+        doc = """
+                Reconstruction rule.
+            """
+    )
+    float ri:displayChannel:relativepixelvariance = 0 (
+        displayGroup = "Common"
+        displayName = "Relative Pixel Variance"
+        doc = "<help />"
+    )
+    float3 ri:displayChannel:remap = (0, 0, 0) (
+        displayGroup = "Common"
+        displayName = "Remap"
+        doc = "<help />"
+    )
+    float ri:displayChannel:shadowthreshold = 0.01 (
+        displayGroup = "Common"
+        displayName = "Shadow Threshold"
+        doc = """
+                Threshold used to compute shadowing contributions in LPEs containing 
+                the 'shadow' token. 
+                If the shadow is cut, lower the threshold. 
+                If there are white pixels in shadowed areas, raise the threshold.
+            """
+    )
+    token ri:displayChannel:statistics = "none" (
+        allowedTokens = ["none", "variance", "mse", "even", "odd"]
+        displayGroup = "Common"
+        displayName = "Statistics"
+        doc = "<help />"
+    )
+}
+
+class "PxrOptionsAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["RenderSettings"]
+        token[] apiSchemaCanOnlyApplyTo = ["RenderSettings"]
+        string apiSchemaType = "singleApply"
+        string className = "OptionsAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    token ri:bucket:order = "horizontal" (
+        allowedTokens = ["horizontal", "vertical", "zigzag-x", "zigzag-y", "spacefill", "random", "spiral", "circle"]
+        displayGroup = "Display"
+        displayName = "Bucket Order"
+        doc = """
+                Render bucket order.
+            """
+    )
+    int2 ri:bucket:orderorigin = (0, 0) (
+        displayGroup = "Display"
+        displayName = "Bucket Origin"
+        doc = '''
+                First bucket for "spiral" and "circle" order. Image center is [-1 -1].
+            '''
+    )
+    bool ri:checkpoint:asfinal = 0 (
+        displayGroup = "Display"
+        displayName = "Checkpoint As Final"
+        doc = """
+                When enabled, this keeps the extra channels and the
+                checkpoint tag when writing the final image for the render.
+                The final image will be identical to any other checkpoint,
+                rather than a slimmed down image. This means that once your
+                image has reached the quality you've set and it completes,
+                it can always be restarted by the user later.
+            """
+    )
+    string ri:checkpoint:command = "" (
+        displayGroup = "Display"
+        displayName = "Checkpoint Command"
+        doc = """
+                System command to be called after checkpoint.  If
+                system calls are enabled, then after a checkpoint has been
+                written, the specified command will be called.  This is
+                synchronous; the rendering threads are quiescent while this
+                runs and will not resume again until the process returns,
+                avoiding possible race conditions if the command takes a
+                token %i will be replaced with the current increment,
+                zero-padded to 5 digits.  The token %e will be replaced
+                with the elapsed time in seconds, zero-padded to 6 digits.
+                The token %r will be replaced with the reason for this
+                update to the checkpoint files (either completely
+                `finished`, `exiting` early due to exitat option, or a
+                normal `checkpoint`).  Literal % characters may be inserted
+                with %%.
+            """
+    )
+    string ri:checkpoint:exitat = "" (
+        displayGroup = "Display"
+        displayName = "Checkpoint Exit At"
+        doc = '''
+                How long render should run before writing a final
+                checkpoint and terminating.  Value can also be a string such
+                as "10m" or "0.5h". Set to 0 or empty to disable.
+            '''
+    )
+    string ri:checkpoint:interval = "" (
+        displayGroup = "Display"
+        displayName = "Checkpoint Interval"
+        doc = '''
+                Write framebuffers to disk every N progressive steps.
+                If value is positive the units will be interpreted as
+                seconds.  If value is negative its units will be
+                interpreted as increments.  Value can also be a string such
+                as "10m" or "0.5h".  Setting option to 0 or empty will disable
+                checkpoints.
+            '''
+    )
+    bool ri:checkpoint:keepfiles = 0 (
+        displayGroup = "Display"
+        displayName = "Keep Files"
+        doc = """
+                If set to true then prman will write to a new,
+                numbered image for each checkpoint.  Note:  This will
+                disable the final write of a checkpoint file which means
+                the render cannot be recovered using the 'recover' option.
+            """
+    )
+    float ri:curve:minwidth = 0 (
+        displayGroup = "Dicing"
+        displayName = "Min Width"
+        doc = """
+                Minimum curve width in raster coordinates.
+            """
+    )
+    int ri:deep:flagvolumes = 1 (
+        displayGroup = "Display"
+        displayName = "Deep Flag Volumes"
+        doc = """
+                Auto is off for dtex, on otherwise.
+            """
+    )
+    float ri:dice:offscreenmultiplier = 1 (
+        displayGroup = "Dicing"
+        displayName = "Dice Off Screen Multiplier"
+        doc = """
+                Dicing rate multiplier for objects outside the viewing frustum.
+            """
+    )
+    token ri:dice:triangle = "trim" (
+        allowedTokens = ["trim", "blp"]
+        displayGroup = "Dicing"
+        displayName = "Dice Triangle"
+        doc = '''
+                The method used for dicing "triangles". The default method "trim" renders
+                triangles by trimming a quad. The "blp" method renders a quad with two points
+                being coincident.
+            '''
+    )
+    bool ri:hider:adaptall = 0 (
+        displayGroup = "Common"
+        displayName = "Adapt All"
+        doc = '''
+                Enable adaptive sampling of all AOVs. When enabled, all channels (beauty pass +
+                AOVs) are considered when deciding if a pixel is converging. The default (off)
+                will ignore the AOVs and only the beauty pass is considered for pixel
+                convergence. So turning off "adaptall" may speed up your render if some of
+                your AOVs never reach the specified variance threshold.
+            '''
+    )
+    token ri:hider:adaptivemetric = "variance" (
+        allowedTokens = ["contrast", "variance", "halfbuffer", "contrast-v22", "variance-v22"]
+        displayGroup = "Common"
+        displayName = "Adaptive Metric"
+        doc = '''
+                Specifies the metric used to drive adaptive sampling.
+                "contrast" measures the contrast between samples in a pixel.
+                "variance" measures the variance of the samples in a pixel.
+                "halfbuffer" splits the samples into two classes and measures the
+                  difference between the average of each of the two sample classes.
+                "contrast-v22" uses the relative contrast computation of RenderMan 22 and older.
+                "variance-v22" uses the relative variance computation of RenderMan 22 and older.
+            '''
+    )
+    point3f ri:hider:bakebboxmax = (1e30, 1e30, 1e30) (
+        displayGroup = "Baking"
+        displayName = "Baking bbox max"
+        doc = '''
+                Bounding box max for "integrator" baking of 3D point clouds (and for the integrator
+                part of "all" baking.  In world space.  Ignored for "pattern" baking and for 2D baking.
+            '''
+    )
+    point3f ri:hider:bakebboxmin = (-1e30, -1e30, -1e30) (
+        displayGroup = "Baking"
+        displayName = "Baking bbox min"
+        doc = '''
+                Bounding box min for "integrator" baking of 3D point clouds (and for the integrator
+                part of "all" baking.  In world space.  Ignored for "pattern" baking and for 2D baking.
+            '''
+    )
+    token ri:hider:bakemode = "pattern" (
+        allowedTokens = ["pattern", "integrator", "all"]
+        displayGroup = "Baking"
+        displayName = "Bake Mode"
+        doc = """
+                Specifies whether the renderer should bake Pattern results or Integrator results
+                or both.
+            """
+    )
+    int ri:hider:bakeudimoffset = 0 (
+        displayGroup = "Baking"
+        displayName = "Baking udim offset"
+        doc = """
+                Offset when baking for a subset of udims.  Used together with bakeudimstride.
+                Default 0 means bake all udims when bakeudimstride is 1.
+            """
+    )
+    int ri:hider:bakeudimstride = 1 (
+        displayGroup = "Baking"
+        displayName = "Baking udim stride"
+        doc = """
+                Stride when baking for a subset of udims.  Default 1 means bake all udims.
+            """
+    )
+    bool ri:hider:bluenoise = 1 (
+        displayGroup = "Common"
+        displayName = "Blue Noise Samples"
+        doc = """
+                Setting to control whether the samples should have a visually
+                pleasing blue noise distribution or not.  Default is 1 (on).
+                Set to 0 (off) if the samples in adjacent pixels need to be
+                completely decorrelated.
+            """
+    )
+    float ri:hider:darkfalloff = 0.025 (
+        displayGroup = "Common"
+        displayName = "Dark Falloff"
+        doc = """
+                De-prioritize low luminance samples in the adaptive sampler.
+                Use this parameter to avoid oversampling dark areas while maintaining
+                overall image quality. Higher values cull more samples, speeding
+                up render time while increasing noise in darker areas.
+            """
+    )
+    int ri:hider:decidither = 0 (
+        displayGroup = "Common"
+        displayName = "Interactive Refinement"
+        doc = """
+                Maximum allowed pixel decimation rate for interactive
+                rendering.  When making rapid edits to heavy scenes and
+                this setting is non-zero, the renderer will try to reduce
+                tearing by updating the whole screen progressively with a
+                dissolve-like effect.  Set this to zero to disable this and
+                force it to fully update the buckets that it can get to.
+            """
+    )
+    float2 ri:hider:exposurebracket = (-1, 1) (
+        displayGroup = "Common"
+        displayName = "Exposure Bracket"
+        doc = """
+                Intended exposure Bracket [min max] in post-production to help inform
+                the adaptive sampling.
+            """
+    )
+    bool ri:hider:extrememotiondof = 0 (
+        displayGroup = "Common"
+        displayName = "Extreme Motion DOF"
+        doc = """
+                Enable improved sampling accuracy. In some cases where a large amount of
+                motion blur is used with depth of field, sampling artifacts could cause an
+                undesirable result. This flag causes a slower but more accurate sampling
+                method to be used to alleviate the artifacts. Due to the performance
+                degradations of this sampling method, this flag should only be used when
+                necessary.
+            """
+    )
+    bool ri:hider:geomShadowTermBias = 1 (
+        displayGroup = "Common"
+        displayName = "Geometric Shadow Terminator on Poly Meshes"
+        doc = """
+                This setting will control when to compute and apply a bias to Poly Meshes
+                to avoid the geometric shadow terminator artifacts that appear for shading points
+                when they are visible from a light wrt their shading normal, but not visible wrt
+                their geometric normal. The default value is 1 (on). Set to 0 (off) if you don't
+                want this bias to be applied to the Poly Meshes in your scene.
+            """
+    )
+    bool ri:hider:incremental = 0 (
+        displayGroup = "Common"
+        displayName = "Incremental"
+        doc = """
+                Enables the progressive display of results (rather than bucketed results).
+            """
+    )
+    bool ri:hider:invert = 1 (
+        displayGroup = "Baking"
+        displayName = "Baking Invert T"
+        doc = """
+                Specifies whether or not to invert the T texture coordinate when baking integrator
+                results.
+            """
+    )
+    bool ri:hider:jitter = 1 (
+        displayGroup = "Common"
+        displayName = "Jitter"
+        doc = """
+                This option toggles the jitter (variation) in camera samples.
+                By default, this hider option is enabled (set to 1), meaning that camera samples
+                will be placed randomly in a pixel location. When it is turned off,
+                camera rays are placed in the center of the pixel. When turned off, 
+                surface edges will appear aliased and jagged.
+            """
+    )
+    int ri:hider:maxsamples = 0 (
+        displayGroup = "Common"
+        displayName = "Max Samples"
+        doc = """
+                An explicit limit for the number of samples. If maxsamples is equal to its
+                default then the maximum number of samples will be set equal to 64.
+                Note that minsamples defaults to the square root of the maxsamples setting.
+            """
+    )
+    int ri:hider:minextrasamples = -1 (
+        displayGroup = "Common"
+        displayName = "Min Extra Samples"
+        doc = """
+                This is the minimum number of extra samples that a pixel
+                should continue shooting with after a sample fails to meet
+                its convergence test with the adaptive sampler.
+                Defaults to matching minsamples.
+            """
+    )
+    int ri:hider:minsamples = -1 (
+        displayGroup = "Common"
+        displayName = "Min Samples"
+        doc = """
+                Specifies the minimum number of samples for adaptive sampling. The default value
+                is the square root of maxsamples.
+            """
+    )
+    string[] ri:hider:primvar = ["st"] (
+        displayGroup = "Baking"
+        displayName = "Baking PrimVars"
+        doc = """
+                Specifies dicing manifold used when baking integrator results.
+            """
+    )
+    bool ri:hider:raytracebaketesselation = 0 (
+        displayGroup = "Baking"
+        displayName = "Raytrace Bake Tesselation"
+        doc = """
+                Force the tesselation to be the same as the baking tesselation when raytracing 
+                (for example when using a PxrOcclusion or PxrDirt shader). 
+                This can reduce self intersections and give cleaner results but may increase the 
+                density of polygons when raytracing.
+                If you have multiple pattern bakes at different resolutions, the highest resolution 
+                will be chosen. Don't attempt to use this option alongside interactive rendering.
+            """
+    )
+    bool ri:hider:samplemotion = 1 (
+        displayGroup = "Common"
+        displayName = "Sample Motion"
+        doc = """
+                This option toggles the sampling of motion blurred micropolygon in the
+                hider, and is thus only meaningful if motion blur is being used in your scene.
+                By default, this hider option is enabled (set to 1), meaning that micropolygons
+                will be blurred and sampled in the hider. When disabled (set to 0),
+                micropolygons will no longer be blurred before sampling; however, the dPdtime
+                variable will still be computed for all objects. This variable can be output
+                into a separate image using an arbitrary output variable (aov) and used to
+                perform motion blur as a postprocess.
+            """
+    )
+    int ri:hider:sampleoffset = 0 (
+        displayGroup = "Common"
+        displayName = "Sample Offset"
+        doc = """
+                This allows several images to be rendered in parallel (with different
+                sampleoffset values) and then combined.
+
+                With non-adaptive sampling:
+                Let's say you render four images with 256 samples each, with
+                sampleoffsets 0, 256, 512, and 768. If you combine those four images,
+                you'll get exactly the same image as if you had rendered a single image
+                with 1024 samples.
+
+                With adaptive sampling:
+                Let's say you again render four images, each with \"maxsamples\" 256,
+                with sampleoffsets 0, 256, 512, and 768. Let's say that due to
+                adaptive sampling, some given pixel only gets 64 pixel samples in each
+                of the four images. Then the combined image has been rendered with
+                sample numbers 0-63, 256-319, 512-575, and 768-831. Due to the
+                stratification of the samples, this is not quite as good as if you had
+                rendered a single image with 256 consecutive samples.  However, it
+                is still better than rendering a single image with only 64 samples.
+            """
+    )
+    int ri:hider:samplestride = 1 (
+        displayGroup = "Common"
+        displayName = "Sample Stride"
+        doc = """
+                This facilitates rendering several images in parallel (with the same 
+                aamplestride but different sampleoffset) and then combine them 
+                incrementally during interactive rendering.  Default value is 1.
+
+                With non-adaptive sampling:
+                Let's say you render four images with 256 samples each, with
+                samplestride 4 and sampleoffsets 0, 1, 2, and 3.  If you combine those
+                four images, you'll get exactly the same image as if you had rendered
+                a single image with 1024 samples, and during incremental/interactive
+                rendering you'll get the benefit of best use of the stratified
+                progressive sample sequences.  If you can \"assemble\" images with
+                samples 0-3, 4-7, 8-12, etc during interactive rendering, you've
+                got the benefits of faster rendering without jumping to high samples
+                early on.
+
+                With adaptive sampling:
+                Let's say you again render four images, each with \"maxsamples\" 256,
+                with samplestride 4 and sampleoffsets 0, 1, 2, and 3.  This time with
+                adaptive sampling (PixelVariance > 0).  Since each of the four images
+                is more noisy than the combined image, the adaptive sampling will use
+                more samples before deciding that the image error is acceptable than
+                if it had been rendered as a single image.  So the PixelVariance 
+                setting may need to be adjusted.
+            """
+    )
+    token ri:hider:type = "raytrace" (
+        allowedTokens = ["raytrace", "bake"]
+        displayGroup = "Common"
+        displayName = "Hider Type"
+        doc = """
+                Render mode.
+            """
+    )
+    float ri:lighting:minimumestimate = 0.000001 (
+        displayGroup = "Shading"
+        displayName = "Light Minimum Estimate"
+        doc = """
+                Minimum estimate for light selection. Local lights whose estimate 
+                falls below this value will be ignored. Increasing this value may 
+                help speed up direct lighting at the expense of accuracy.
+            """
+    )
+    bool ri:lighting:selectionlearningscheme = 1 (
+        displayGroup = "Shading"
+        displayName = "Light Learning Scheme"
+        doc = """
+                Employs a machine learning algorithm to more accurately importance
+                sample lights, taking into account occlusion and light filters.
+            """
+    )
+    int ri:limits:brickmemory = 2097152 (
+        displayGroup = "Configuration"
+        displayName = "Brick Memory Limit"
+        doc = """
+                Brickmap cache size in kB.
+            """
+    )
+    int2 ri:limits:bucketsize = (0, 0) (
+        displayGroup = "Configuration"
+        displayName = "Bucket Size Limit"
+        doc = """
+                Size of render buckets in pixels.
+            """
+    )
+    float ri:limits:deepshadowerror = 0.01 (
+        displayGroup = "Configuration"
+        displayName = "Deep Shadow Error Limit"
+        doc = """
+                Control lossy compression scheme to reduce file size of deep output. Setting to
+                a high value will result in lower numbers of samples stored for each pixel.
+            """
+    )
+    int ri:limits:geocachememory = 2097152 (
+        displayGroup = "Configuration"
+        displayName = "Geo Cache Memory Limit"
+        doc = """
+                Geometry cache size in kB.
+            """
+    )
+    int ri:limits:gridsize = 289 (
+        displayGroup = "Configuration"
+        displayName = "Grid Size Limit"
+        doc = "<help />"
+    )
+    int ri:limits:matrixcachememory = 0 (
+        displayGroup = "Configuration"
+        displayName = "Matrix Cache Memory"
+        doc = """
+                Matrix cache in kB.
+            """
+    )
+    int ri:limits:nurbcurvaturedicefactor = 3 (
+        displayGroup = "Configuration"
+        displayName = "Nurb Curvature Dice Factor Limit"
+        doc = """
+                NURBs max curvature multiplier.
+            """
+    )
+    int ri:limits:octreememory = 20480 (
+        displayGroup = "Configuration"
+        displayName = "Octree Memory Limit"
+        doc = """
+                None cache size in kB.
+            """
+    )
+    int ri:limits:opacitycachememory = 1048576 (
+        displayGroup = "Configuration"
+        displayName = "Opacity Cache Memory Limit"
+        doc = """
+                Opacity cache in kB.
+            """
+    )
+    float3 ri:limits:othreshold = (0.99609375, 0.99609375, 0.99609375) (
+        displayGroup = "Configuration"
+        displayName = "Opacity Threshold Limit"
+        doc = """
+                Opacity Culling: When rendering scenes with a large number
+                of semi-transparent layered objects (e.g. hair), the opacity
+                culling threshold can be set for a significant time and memory savings.
+                Essentially, a stack of visible points whose accumulated opacity is
+                greater (in each channel) than the specified limit will be considered
+                fully opaque by the hider, and objects behind the stack will be culled.
+            """
+    )
+    int ri:limits:pointmemory = 20480 (
+        displayGroup = "Configuration"
+        displayName = "Point Memory Limit"
+        doc = """
+                Point cache size in kB.
+            """
+    )
+    int ri:limits:proceduralbakingclumpsize = 0 (
+        displayGroup = "Configuration"
+        displayName = "Procedural Baking Clump Size Limit"
+        doc = "<help />"
+    )
+    int ri:limits:ptexturemaxfiles = 128 (
+        displayGroup = "Configuration"
+        displayName = "Ptex Max Files Limit"
+        doc = "<help />"
+    )
+    int ri:limits:ptexturememory = 32768 (
+        displayGroup = "Configuration"
+        displayName = "Ptex Memory Limit"
+        doc = """
+                PTex cache size in kB.
+            """
+    )
+    float ri:limits:rendermemory = 0 (
+        displayGroup = "Configuration"
+        displayName = "Render Memory Limit"
+        doc = """
+                Memory limit as percentage of machine memory.
+            """
+    )
+    int ri:limits:rendertime = 0 (
+        displayGroup = "Configuration"
+        displayName = "Render Time Limit"
+        doc = """
+                Maximum render time in minutes.
+            """
+    )
+    int ri:limits:shadesize = 289 (
+        displayGroup = "Configuration"
+        displayName = "Shade Size Limit"
+        doc = """
+                The maximum number of vertices, not grid.
+            """
+    )
+    int ri:limits:texturememory = 2097152 (
+        displayGroup = "Configuration"
+        displayName = "Texture Memory Limit"
+        doc = """
+                Texture cache size in kB.
+            """
+    )
+    float ri:limits:textureperthreadmemoryratio = 0.5 (
+        displayGroup = "Configuration"
+        displayName = "Texture Per Thread Memory Ratio"
+        doc = "<help />"
+    )
+    int ri:limits:threads = 0 (
+        displayGroup = "Configuration"
+        displayName = "Thread Limit"
+        doc = """
+                Set the number of threads that the renderer uses. If a value of 0 is specified
+                then all CPUs will be utilized for rendering.  If a negative value '-N' is
+                specified then prman will use all but N CPUs for rendering.
+            """
+    )
+    bool ri:osl:batched = 1 (
+        displayGroup = "OSL"
+        displayName = "SIMD Execution"
+        doc = """
+                Enable OSL optimizations that allow execution of multiple shading points
+                via vectorized instructions on supported processors (AVX, AVX2, AVX512).
+            """
+    )
+    int ri:osl:statisticslevel = 0 (
+        displayGroup = "OSL"
+        displayName = "Statistics Output Level"
+        doc = """
+                Set the level of OSL statistics to track. Level 2 and above
+                introduces timing which can have a small effect on performance.
+                Level 4 and above includes internal OSL statistics.
+                Level 5 includes statistics per shader. Other levels reserved
+                for future use.
+            """
+    )
+    int ri:osl:verbose = 4 (
+        displayGroup = "OSL"
+        displayName = "Message Verbosity"
+        doc = """
+               Sets the level of OSL messages to pass through.
+            """
+    )
+    float4 ri:Ri:CropWindow = (0, 1, 0, 1) (
+        displayGroup = "Display"
+        displayName = "Crop Window"
+        doc = """
+                Crop window [left right top bottom] in NDC space.
+            """
+    )
+    float ri:Ri:FormatPixelAspectRatio = 1 (
+        displayGroup = "Display"
+        displayName = "Pixel Aspect Ratio"
+        doc = """
+                Output image pixel aspect ratio.
+            """
+    )
+    int2 ri:Ri:FormatResolution = (0, 0) (
+        displayGroup = "Display"
+        displayName = "Resolution"
+        doc = """
+                Output image resolution.
+            """
+    )
+    int ri:Ri:Frame = 0 (
+        displayGroup = "Common"
+        displayName = "Frame Number"
+        doc = """
+                Frame number.
+            """
+    )
+    float ri:Ri:FrameAspectRatio = -1 (
+        displayGroup = "Display"
+        displayName = "Frame Aspect Ratio"
+        doc = """
+                Output image aspect ratio.
+            """
+    )
+    token ri:Ri:PixelFilterName = "gaussian" (
+        allowedTokens = ["gaussian", "box", "triangle", "catmull-rom", "separable-catmull-rom", "mitchell", "blackman-harris", "sinc", "bessel", "disk", "lanczos"]
+        displayGroup = "Common"
+        displayName = " Pixel Filter"
+        doc = """
+                 Distribution of camera ray directions for each pixel. In other words, the filter determines how the pixel samples are warped in screen space around the pixel center.
+            """
+    )
+    float2 ri:Ri:PixelFilterWidth = (2, 2) (
+        displayGroup = "Common"
+        displayName = "Filter Width"
+        doc = """
+                Width of the distribution of camera ray directions for each pixel.
+            """
+    )
+    float ri:Ri:PixelVariance = 0.015 (
+        displayGroup = "Common"
+        displayName = "Pixel Variance"
+        doc = """
+                Controls adaptive sampling. This sets the upper bound on the acceptable estimated
+                variance of the pixel values from the true pixel values.
+            """
+    )
+    float4 ri:Ri:ScreenWindow = (0, 0, 0, 0) (
+        displayGroup = "Display"
+        displayName = "Screen Window"
+        doc = """
+                Screen window [left right top bottom] in screen space.
+            """
+    )
+    float ri:shade:chiangCompatibilityVersion = 24 (
+        displayGroup = "Statistics"
+        displayName = "PxrChiangHair compatibility version"
+        doc = """
+                Setting to allow PxrChiang to work in compatibility mode for older versions
+                of the Bxdf, so renders from different versions can match their results.
+                The default value is 24.0.
+            """
+    )
+    bool ri:shade:debug = 0 (
+        displayGroup = "Statistics"
+        displayName = "Enable Shader Debug"
+        doc = """
+                Shading debug level.
+            """
+    )
+    bool ri:shade:incorrectPointOpacityCalculation = 0 (
+        displayGroup = "Statistics"
+        displayName = "Use old (incorrect) RiPoints opacity and falloff calculation"
+        doc = """
+                Use old method of combining RiPoint falloff with presence or opacity. This has been fixed
+                in R25. Setting this option will fall back to the old, incorrect, behavior for compatibility
+                purposes. This option will be removed in R26 and the new, correct, method will always be used.
+            """
+    )
+    float ri:shade:roughnessmollification = 1 (
+        displayGroup = "Statistics"
+        displayName = "Specular Roughness Mollification"
+        doc = """
+                Specular Roughness Mollification.  This selectively increases material
+                roughness on secondary bounces after diffuse or broad glossy reflections
+                and on highly curved surfaces.  This reduces noise and fireflies, but can
+                also make caustics blurrier or disappear entirely.  Set this value to 0.0
+                when you want to render ground-truth caustics.  The default value is 1.0.
+            """
+    )
+    bool ri:shade:shadowBumpTerminator = 1 (
+        displayGroup = "Statistics"
+        displayName = "Shadow bump terminator"
+        doc = """
+                Setting to control whether bump shadow terminators are smoothed in non-hair bxdfs.
+            """
+    )
+    bool ri:shade:subsurfaceTypeDefaultFromVersion24 = 0 (
+        displayGroup = "Statistics"
+        displayName = "Use old subsurfaceType default (0) in PxrSurface bxdf"
+        doc = """
+                Use old default value for PxrSurface 'surfaceType' parameter.  Old default is 0 (Jensen
+                dipole diffusion), new default is 5 (path-traced subsurface scattering).
+            """
+    )
+    float ri:Shutter:offset = 0 (
+        displayGroup = "Common"
+        displayName = "Shutter Offset"
+        doc = """
+                Offset shutter open/close.
+            """
+    )
+    float2 ri:statistics:displace_ratios = (0.1, 1) (
+        displayGroup = "Statistics"
+        displayName = "Displace Ratios"
+        doc = """
+                Suppress reporting of displacements that, when divided by the max
+                displacement, fall in the specified range.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:filename = "" (
+        displayGroup = "Statistics"
+        displayName = "Legacy Filename"
+        doc = """
+                File name for summary statistics reported in plain text.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:jsonFilename = "" (
+        displayGroup = "Statistics"
+        displayName = "JSON Filename"
+        doc = """File name for raw statistics JSON report.
+            """
+    )
+    bool ri:statistics:level = 0 (
+        displayGroup = "Statistics"
+        displayName = "Enable Statistics"
+        doc = """
+                Enable statistics reporting.
+                (Legacy Stats)
+            """
+    )
+    int ri:statistics:maxdispwarnings = 100 (
+        displayGroup = "Statistics"
+        displayName = "Max Displace Warnings"
+        doc = """
+                Modify the maximum reported displacement issues. If the value is set to 0,
+                then all displacements issues are reported.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:shaderprofile = "" (
+        displayGroup = "Statistics"
+        displayName = "Shader Profile"
+        doc = """
+                Shader profile filename.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:stylesheet = "" (
+        displayGroup = "Statistics"
+        displayName = "Style Sheet"
+        doc = """
+                Stylesheet for XML detailed statistics.
+                (Legacy Stats)
+            """
+    )
+    bool ri:statistics:texturestatslevel = 0 (
+        displayGroup = "Statistics"
+        displayName = "Enable Texture Statistics"
+        doc = """
+                Enable texture statistics reporting.
+                (Legacy Stats)
+            """
+    )
+    string ri:statistics:xmlfilename = "" (
+        displayGroup = "Statistics"
+        displayName = "Legacy XML Filename"
+        doc = """
+                File name for detailed statistics reported as XML.
+                (Legacy Stats)
+            """
+    )
+    bool ri:stitch:refwarning = 1 (
+        displayGroup = "Dicing"
+        displayName = "Enable Stitch Ref Warning"
+        doc = """
+                Enable stitch warnings.
+            """
+    )
+    float ri:trace:bvhcompression = 0 (
+        displayGroup = "Shading"
+        displayName = "BVH Compression"
+        doc = """
+                Provides a hint to the system to favor memory utilization versus speed when
+                constructing the ray accelerator. Valid values are in the range [0, 1], where
+                the higher the values the more compact the memory representation.
+                The control behaves almost lineraly with some discontinuities in the compression
+                rate as different strategies are activated. The result obtained is likely to be
+                scene dependent.
+                As a rule of thumb, leave this control to 0 unless you need to reduce memory
+                utilization in order to render a given scene or sequence. When tuning, set the
+                control to 1 at first to see how much memory can be saved through compression and
+                what time overhead is generated, then dial the number back to a lower value (if
+                possible) and reach the deired balance between speed and memory usage.
+            """
+    )
+    bool ri:trace:incorrectCurveBias = 0 (
+        displayGroup = "Shading"
+        displayName = "Use old (incorrect) trace bias for reflection and shadow rays from round cubic curves"
+        doc = """
+                Use old (large) trace bias value for reflection and shadow rays from round cubic curves.
+                This has been fixed in R26. Setting this option will fall back to the old, incorrect, 
+                behavior for compatibility purposes.
+            """
+    )
+    float3 ri:trace:worldoffset = (0, 0, 0) (
+        displayGroup = "Shading"
+        displayName = "World Offset"
+        doc = '''
+                Used as the origin when the worldorigin option is set to "worldoffset".
+            '''
+    )
+    token ri:trace:worldorigin = "camera" (
+        allowedTokens = ["world", "worldoffset", "camera"]
+        displayGroup = "Shading"
+        displayName = "World Origin"
+        doc = """
+                Set a new world origin to give better floating point precision.
+            """
+    )
+    string ri:volume:aggregatespace = "world" (
+        displayGroup = "Volumes"
+        displayName = "Aggregate space"
+        doc = '''
+                Space in which to compute aggregate volume metadata. Valid spaces are
+                "world" and "camera". Generally the space should be chosen to minimize
+                the range of motion of the volumes.
+            '''
+    )
+}
+
+class "PxrPrimvarsAPI" (
+    customData = {
+        string apiSchemaType = "singleApply"
+        string className = "PrimvarsAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    int primvars:ri:curve:opacitysamples = 0 (
+        displayGroup = "Curves"
+        displayName = "Opacity Samples"
+        doc = """
+                number of opacity/presence shading samples along a curve for opacity caching, if equal to zero then the value is determined using the dicing oracle and the length of each curve.
+            """
+    )
+    bool primvars:ri:curve:widthaffectscurvature = 1 (
+        displayGroup = "Curves"
+        displayName = "Width Affects Curvature"
+        doc = """
+                When true the curve width of round curves is taken into account in the computation of the tube curvature, otherwise only the curvature along the curve is. This control does not affect curve ribbons.
+            """
+    )
+    bool primvars:ri:derivatives:extrapolate = 1 (
+        displayGroup = "Shading"
+        displayName = "derivatives:extrapolate"
+        doc = """
+                Extrapolated smooth normals across grid boundaries.
+            """
+    )
+    float primvars:ri:dice:micropolygonlength = 1 (
+        displayGroup = "Dicing"
+        displayName = "Micropolygon Length"
+        doc = '''
+                Micropolygon distance in raster space for "instanceprojection" dicing. Values
+                are expressed in pixel size.
+            '''
+    )
+    float primvars:ri:dice:minlength = -1 (
+        displayGroup = "Volume"
+        displayName = "Min Length"
+        doc = """
+                Volume minimum dice length. Negative indicates to automatically compute this value.
+            """
+    )
+    string primvars:ri:dice:minlengthspace = "" (
+        displayGroup = "Volume"
+        displayName = "Min Length Space"
+        doc = """
+                Coordinate space of dice:minlength.
+            """
+    )
+    float primvars:ri:dice:offscreenmultiplier = -1 (
+        displayGroup = "Dicing"
+        displayName = "Dice Off Screen Multiplier"
+        doc = """
+                Dicing rate multiplier for objects outside the viewing frustum. If a value
+                less than zero is specified, the value from the Option with the same name 
+                will be used instead.
+            """
+    )
+    token primvars:ri:dice:offscreenstrategy = "viewfrustumdistance" (
+        allowedTokens = ["viewfrustumdistance", "worlddistance", "objectdistance", "planarprojection", "sphericalprojection"]
+        displayGroup = "Dicing"
+        displayName = "Off Screen Dicing Strategy"
+        doc = """
+                Dicing method of objects outside the viewing frustum.
+            """
+    )
+    bool primvars:ri:dice:pretessellate = 1 (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Pretessellate"
+        doc = """
+                Pre-tessellate subdivision geometry to polygons.
+            """
+    )
+    bool primvars:ri:dice:rasterorient = 1 (
+        displayGroup = "Dicing"
+        displayName = "Raster Oriented Dicing"
+        doc = """
+                Turning this off enables non-oriented dicing, a mode of dicing that
+                computes micropolygon sizes using non-oriented raster space rather than
+                screen-aligned raster space. Non-oriented dicing is useful for displacement
+                around edges where projected micropolygon distance can be arbitrarily small.
+            """
+    )
+    string primvars:ri:dice:referencecamera = "" (
+        displayGroup = "Dicing"
+        displayName = "Reference Camera"
+        doc = """
+                Specify the camera used for dicing. If no reference camera is specified, RenderMan
+                will use the primary camera.
+            """
+    )
+    string primvars:ri:dice:referenceinstance = "" (
+        displayGroup = "Dicing"
+        displayName = "Reference Instance"
+        doc = """
+                Specify the reference instance used for dicing and displacement shading.
+                The reference instance is used to drive dicing and displacement based on its
+                position, scale, user attributes, and scoped coordinate systems. Reference
+                instances are specified by its identifier:name attribute (instance name). If no
+                reference instance is specified, RenderMan will automatically pick the nearest
+                instance inside the primary camera's view frustum.
+            """
+    )
+    token primvars:ri:dice:strategy = "instanceprojection" (
+        allowedTokens = ["instanceprojection", "worlddistance", "objectdistance", "sphericalprojection"]
+        displayGroup = "Dicing"
+        displayName = "Dicing strategy"
+        doc = """
+                Dicing method of objects within the viewing frustum.
+            """
+    )
+    bool primvars:ri:dice:watertight = 0 (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Watertight"
+        doc = """
+                Tessellate geometry with no holes. Watertight geometry requires less raytrace bias.
+            """
+    )
+    float primvars:ri:dice:worlddistancelength = -1 (
+        displayGroup = "Dicing"
+        displayName = "Dicing Distance Length"
+        doc = '''
+                Micropolygon distance in world space for "worlddistance" dicing or object space for
+                "objectdistance" dicing.
+            '''
+    )
+    int primvars:ri:displacement:ignorereferenceinstance = 0 (
+        displayGroup = "Shading"
+        displayName = "Displacement Ignores Reference Instance"
+        doc = """
+                Indicates if displacement shading should ignore properties of the reference instance.
+            """
+    )
+    string primvars:ri:displacementbound:CoordinateSystem = "object" (
+        displayGroup = "Shading"
+        displayName = "displacement Bound Coordinate System"
+        doc = """
+                The name of the coordinate system that the displacement bound is measured in.
+            """
+    )
+    int primvars:ri:displacementbound:offscreen = 0 (
+        displayGroup = "Shading"
+        displayName = "Displacement Bound Off Screen"
+        doc = """
+                Apply displacementbound to offscreen geometry when dicing. Geometry that is
+                entirely offscreen, but displaces into view may be prone to undertessellation
+                because of the offscreen dicing strategy. This can be corrected by enabling this
+                control and setting a reasonable displacementbound. Doing so will incur a
+                performance penalty commensurate with the size of the displacement bound.
+            """
+    )
+    float primvars:ri:displacementbound:sphere = 0 (
+        displayGroup = "Shading"
+        displayName = "Displacement Bound Radius"
+        doc = """
+                Maximum displacement distance used to compute object bounds. This value should
+                be as tight as possible.
+            """
+    )
+    float primvars:ri:falloffpower = 0 (
+        displayGroup = "Points"
+        displayName = "Falloff Power"
+        doc = '''
+                For use with points, if not supplied, or set to zero, the points will have a hard edge. A value of 1 is a "reasonable" value that emulates the usual cosine based falloff; this will likely be the goto value for most people doing volumetric particle effects. Values between 0 and 1 makes the falloff faster, eroding the point faster - point has "less presence". Values higher than 1 (up to infinity) makes the falloff slower to the point of being non-existent.
+            '''
+    )
+    string primvars:ri:identifier:object = "" (
+        displayGroup = "Common"
+        displayName = "Identifier Object"
+        doc = """
+                Object shape name.
+            """
+    )
+    bool primvars:ri:polygon:concave = 1 (
+        displayGroup = "PolygonMesh"
+        displayName = "Concave"
+        doc = """
+                Allow concave polygons.
+            """
+    )
+    bool primvars:ri:polygon:smoothdisplacement = 0 (
+        displayGroup = "PolygonMesh"
+        displayName = "Prevent Polygon Cracking"
+        doc = """
+                Output smoothed (per-vertex) normals as Ndsp primvar, if
+                polygon:smoothnormals hasn't already inserted smooth normals.
+            """
+    )
+    bool primvars:ri:polygon:smoothnormals = 0 (
+        displayGroup = "PolygonMesh"
+        displayName = "Smooth Normals"
+        doc = """
+                Smooth (per-vertex) normals if not provided.
+            """
+    )
+    int primvars:ri:procedural:immediatesubdivide = 0 (
+        displayGroup = "Procedural"
+        displayName = "Immediate Subdivide"
+        doc = """
+                Used by RiProcedural to compel a procedural to immediately subdivide (behavior 
+                supported via the __immediatesubdivide meta-parameter in RiProcedural2). This 
+                attribute is \"special\" in that it is not inherited into sub-procedural contexts - 
+                meaning parent immediate-subdivide procedurals don't accidentally trigger 
+                immediate-subdivide children. A value of 0 (the default) disables, 1 enables, and 2 
+                forces all child procedurals to crack immediately.
+            """
+    )
+    bool primvars:ri:procedural:reentrant = 0 (
+        displayGroup = "Procedural"
+        displayName = "Reentrant"
+        doc = """
+                Enabling this attribute will cause any subsequent procedural to not lock the global 
+                mutex. Note that this requires that the procedural be thread safe. This attribute is
+                disabled by default, i.e. all procedurals remain locked.
+            """
+    )
+    float[] primvars:ri:Ri:Bound = [0, 0, 0, 0, 0, 0] (
+        displayGroup = "Volume"
+        displayName = "Bound"
+        doc = """
+                Volume bounds.
+            """
+    )
+    float primvars:ri:Ri:GeometricApproximationFocusFactor = 0 (
+        displayGroup = "Dicing"
+        displayName = "Focus Factor"
+        doc = """
+                Allows the renderer to use more coarse dicing for blurry objects due to
+                depth of field.
+            """
+    )
+    token primvars:ri:Ri:Orientation = "outside" (
+        allowedTokens = ["inside", "outside"]
+        displayGroup = "Shading"
+        displayName = "Orientation"
+        doc = """
+                Geometry winding order that determines surface normal. This attribute effects
+                lighting and displacement.
+            """
+    )
+    int[] primvars:ri:shade:faceset = [] (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Face Set"
+        doc = """
+                Active geometry face indexes.
+            """
+    )
+    string primvars:ri:stats:prototypeIdentifier = "" (
+        displayGroup = "Common"
+        displayName = "Stats Prototype Identifier"
+        doc = """
+                Identifier string used by the stats system when referring to this prototype.
+            """
+    )
+    string primvars:ri:stitchbound:CoordinateSystem = "" (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Stitch Bound Coordinate System"
+        doc = "<help />"
+    )
+    float primvars:ri:stitchbound:sphere = 0 (
+        displayGroup = "SubdivisionMesh"
+        displayName = "Stitch Bound Radius"
+        doc = "<help />"
+    )
+    bool primvars:ri:trace:autobias = 1 (
+        displayGroup = "Shading"
+        displayName = "Auto Trace Bias"
+        doc = """
+                Enable automatic raytrace bias.
+            """
+    )
+    float primvars:ri:trace:bias = 0.01 (
+        displayGroup = "Shading"
+        displayName = "Trace Bias"
+        doc = """
+                Manual raytrace bias in object space. Small values should be used to avoid
+                artifacts such as shadow acne.
+            """
+    )
+    bool primvars:ri:trace:displacements = 1 (
+        displayGroup = "Shading"
+        displayName = "Enable Displacement"
+        doc = """
+                Enable displacement shading.
+            """
+    )
+    bool primvars:ri:trace:sssautobias = 1 (
+        displayGroup = "Shading"
+        displayName = "Auto Trace Bias for Subsurface scattering"
+        doc = """
+                Enable automatic raytrace bias for subsurface scattering rays.
+            """
+    )
+    float primvars:ri:trace:sssbias = 0.0001 (
+        displayGroup = "Shading"
+        displayName = "Trace Bias for Subsurface scattering"
+        doc = """
+                Manual raytrace bias (in object space) for subsurface scattering rays.
+                Small values should be used to avoid artifacts such as surface acne.
+            """
+    )
+    token primvars:ri:trimcurve:sense = "inside" (
+        allowedTokens = ["inside", "outside"]
+        displayGroup = "NuPatch"
+        displayName = "Trim Curve Sense"
+        doc = "<help />"
+    )
+    string primvars:ri:volume:aggregate = "globalVolumeAggregate" (
+        displayGroup = "Volume"
+        displayName = "Aggregate"
+        doc = """
+                The name of the volume aggregate to which a volume
+                belongs. If non-empty, the volume will only be
+                rendered if the integrator explicitly uses that named
+                aggregate, or if a surface shader such as PxrSurface
+                binds the named aggregate to its interior.
+            """
+    )
+    bool primvars:ri:volume:aggregaterespectvisibility = 1 (
+        displayGroup = "Volume"
+        displayName = "Aggregate Respect Visibility"
+        doc = """
+                If set to 1, standard visibility attributes will be respected by
+                the volume if it is part of an aggregate. If set to 0, the visibility 
+                attributes will be ignored and only the integrator visibility settings
+                will apply.
+            """
+    )
+    bool primvars:ri:volume:dsominmax = 1 (
+        displayGroup = "Volume"
+        displayName = "DSO Min/Max"
+        doc = """
+                Currently only used for aggregate volumes, and only
+                for volumes that use an ImplicitField DSO. If set to
+                1, the DSO may be able to use stored information from
+                the file directly to compute the minimum and maximum
+                values within the volume. This may allow the renderer to
+                avoid shading the volume up front, greatly decreasing
+                time to first pixel. This can only be enabled if the
+                density signal from the volume is used directly, or if
+                the density signal is modulated only by the DSO
+                itself. Any shading modifications of the density
+                signal requires setting this parameter to off.
+            """
+    )
+    bool primvars:ri:volume:dsovelocity = 0 (
+        displayGroup = "Volume"
+        displayName = "DSO Velocity"
+        doc = """
+                Used only for aggregate volumes that use an ImplicitField DSO. If set to 1,
+                the DSO can provide velocity bounds to the renderer directly via the BoxMotion
+                call. This can allow the renderer to avoid upfront shading of the volume's
+                velocity data when using Eulerian velocity, improving render time and time to
+                first pixel greatly. This can only be enabled if the velocity signal from the DSO
+                is used directly.
+            """
+    )
+    float primvars:ri:volume:fps = 1 (
+        displayGroup = "Volume"
+        displayName = "Velocity frames per second"
+        doc = """
+                The frames per second for volumetric velocity data. The 
+                velocity data will be divided by this quantity to derive
+                the velocity for the frame.
+            """
+    )
+    float primvars:ri:volume:shutteroffset = 1 (
+        displayGroup = "Volume"
+        displayName = "Shutter offset"
+        doc = """
+                The shutter offset used to interpret volumetric velocity.
+                A value of 1 will use the current position of the 
+                object and the position of the object on the next frame 
+                as the time interval to use for motion blur. A value of -1 
+                will use the position of the object on the previous frame 
+                and the current position of the object as the time. A value 
+                of 0 will generate an interval which begins halfway through 
+                the previous frame and ends halfway into the next frame.
+            """
+    )
+    bool primvars:ri:volume:velocityshuttercorrection = 0 (
+        displayGroup = "Volume"
+        displayName = "Velocity Shutter Correction"
+        doc = """
+                If set to 1, volumetric velocity data for Eulerian motion 
+                blur will be assumed to be relative to the entire frame, 
+                and will be corrected to match the current shutter interval.
+                If set to 0, no correction will be made.
+            """
+    )
+}
+
+class PxrUnified "PxrUnified" (
+    customData = {
+        string className = "Unified"
+    }
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    bool inputs:ri:accumOpacity = 1 (
+        displayName = "Accumulate Opacity"
+        doc = "When enabled, refractive objects produce partial alpha.\\nWhen disabled, refractive objects produce full alpha."
+    )
+    int inputs:ri:allowMultilobeIndirect = 0 (
+        displayGroup = "Sampling"
+        displayName = "Multi-Lobe Indirect"
+        doc = "if enabled, Hair may converge faster but this might break any LPE related operations."
+    )
+    float inputs:ri:catchAllLights = 0 (
+        displayName = "Catch Light on last Hit"
+        doc = """
+           On a path's last hit, the lights can be evaluated without shadowing to avoid a black contribution.
+           This parameter scales the last hit's intensity from 0 (no light evaluation) and 1 (light evaluation).
+        """
+    )
+    float inputs:ri:causticClamp = 1000000 (
+        displayGroup = "Sampling:Intensity Clamping"
+        displayName = "Max Caustics Value"
+        doc = "Maximum value of caustics samples."
+    )
+    float inputs:ri:directClamp = 1000000 (
+        displayGroup = "Sampling:Intensity Clamping"
+        displayName = "Max Direct Lighting Value"
+        doc = "Maximum value of direct lighting samples."
+    )
+    float inputs:ri:emissionMultiplier = 1 (
+        displayName = "Emission Multiplier"
+        doc = "Internally multiplies all emission values (light/glow) during lighting integration."
+    )
+    bool inputs:ri:enableSampleTimers = 0 (
+        displayGroup = "Diagnostic"
+        displayName = "Enable Sample Timers"
+        doc = "enable the timers that track pixel sample iteration cost"
+    )
+    bool inputs:ri:enableShadingTimers = 0 (
+        displayGroup = "Diagnostic"
+        displayName = "Enable Shading Timers"
+        doc = "enable the timers that will track shading cost grouped by the profileGroup user attribute"
+    )
+    bool inputs:ri:enableVolumeCaustics = 0 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Enable Volume Caustics"
+        doc = '''
+                Enable volume integrator when evaluating throughput along the caustic path.
+                Volume GPrims need to be member of the group "mw_volume_include_subset".
+                If this is turned on, shadow computation will be more expensive.
+                Should only be used when necessary.
+            '''
+    )
+    float inputs:ri:indirectClamp = 8 (
+        displayGroup = "Sampling:Intensity Clamping"
+        displayName = "Max Indirect Value"
+        doc = "Maximum value of indirect samples."
+    )
+    float inputs:ri:indirectDirectionalBlurRadius = 0 (
+        displayGroup = "IndirectGuiding"
+        displayName = "Directional Blur Radius"
+        doc = """
+                Blurs the node contributions of the directional tree.
+                This only affects the sampling distribution.
+            """
+    )
+    int inputs:ri:indirectOversampling = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "IndirectGuiding"
+        displayName = "Oversampling"
+        doc = """
+                Oversample the tree lookups for better estimates.
+            """
+    )
+    float inputs:ri:indirectSpatialBlurRadius = 0.25 (
+        displayGroup = "IndirectGuiding"
+        displayName = "Spatial Blur Radius"
+        doc = """
+                Blurs the node contributions of the spatial tree to hide node boundaries.
+                This only affects the sampling distribution.
+            """
+    )
+    int inputs:ri:indirectTrainingSamples = 0 (
+        displayGroup = "IndirectGuiding"
+        displayName = "Training Samples"
+        doc = """
+                The number of samples used to learn the scene's illumination.
+                This number should never be larger than minsamples and represent 10-20% of maxsamples.
+                64 training samples is a bare minimum and you will get better results with larger numbers.
+            """
+    )
+    bool inputs:ri:manifoldWalk = 0 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Enable Manifold Walk"
+        doc = "Enable Manifold Walk"
+    )
+    int inputs:ri:maxIndirectBounces = 8 (
+        displayName = "Max Indirect Bounces"
+        doc = '''
+            The maximum number of bounces of indirect illumination in your scene.
+            0 means direct illumination only, 1 means one bounce of indirect, etc.
+            Note: this parameter used to be called "maxPathLength" -- the new name
+            is more descriptive, but the effect is the same.
+        '''
+    )
+    int inputs:ri:maxInterfaces = 2 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Max Number of Interfaces"
+        doc = """
+                Maximum number of transmitive interfaces in the caustic sub-path found by the manifold walk.
+            """
+    )
+    int inputs:ri:maxIterations = 10 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Max Iterations"
+        doc = """
+                Maximum number of iterations before the walk gives up on a caustic path.
+            """
+    )
+    int inputs:ri:maxNonStochasticOpacityEvents = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Stochastic Opacity Depth"
+        doc = '''
+    Defines the camera ray depth for which opacity
+    calculations are computed with no noise (using
+    continuation rays). Once this depth is exceeded,
+    the opacity computation will switch to a stochastic
+    "presence" style of opacity, which may introduce
+    noise.
+    The default is 0.
+        '''
+    )
+    float inputs:ri:maxRayDistance = 10000 (
+        displayName = "Max Ray Distance"
+        doc = "Objects beyond that distance will NOT be hit."
+    )
+    int inputs:ri:numBxdfSamples = 1 (
+        displayGroup = "Sampling"
+        displayName = "BxDF Samples"
+        doc = "Number of BxDF samples for each iteration."
+    )
+    int inputs:ri:numIndirectSamples = 1 (
+        displayGroup = "Sampling"
+        displayName = "Indirect Samples"
+        doc = "Number of indirect samples for each iteration."
+    )
+    int inputs:ri:numLightSamples = 1 (
+        displayGroup = "Sampling"
+        displayName = "Light Samples"
+        doc = "Number of light samples for each iteration."
+    )
+    int inputs:ri:numVolumeAggregateSamples = 1 (
+        displayGroup = "Sampling"
+        displayName = "Volume Aggregate Samples"
+        doc = "Number of volume aggregate samples for each iteration."
+    )
+    bool inputs:ri:photonAdaptive = 0 (
+        displayGroup = "Photons"
+        displayName = "Adaptive Photons"
+        doc = "Enables robust progressive photon mapping"
+    )
+    int inputs:ri:photonEstimationNumber = 64 (
+        displayGroup = "Photons"
+        displayName = "Estimation Number"
+        doc = "Estimation Number"
+    )
+    float inputs:ri:photonEstimationRadius = 0 (
+        displayGroup = "Photons"
+        displayName = "Estimation Radius"
+        doc = "in scene units"
+    )
+    bool inputs:ri:photonVisibilityRod = 0 (
+        displayGroup = "Photons"
+        displayName = "Visibility Rod"
+        doc = "Visibility Rod"
+    )
+    float inputs:ri:photonVisibilityRodDirectProb = 0 (
+        displayGroup = "Photons"
+        displayName = "Visibility Rod Probability"
+        doc = "Visibility Rod Probability"
+    )
+    point3f inputs:ri:photonVisibilityRodMax = (0, 0, 0) (
+        displayGroup = "Photons"
+        displayName = "Visibility Rod Max"
+        doc = "Visibility Rod Max"
+    )
+    point3f inputs:ri:photonVisibilityRodMin = (0, 0, 0) (
+        displayGroup = "Photons"
+        displayName = "Visibility Rod Min"
+        doc = "Visibility Rod Min"
+    )
+    bool inputs:ri:risPathGuiding = 0 (
+        displayGroup = "Sampling"
+        displayName = "RIS path guiding"
+        doc = "Use learnt results to guide indirect path sampling. Requires light learning to be enabled"
+    )
+    int inputs:ri:rouletteDepth = 1 (
+        displayGroup = "Sampling:Russian Roulette"
+        displayName = "Start Depth"
+        doc = """
+                    The path length at which the integrator will begin performing Russian roulette (a method of probabilistically terminating a ray path).
+                    Decreasing this setting will lead to shorter paths and faster renders, but will result in more noise.
+                """
+    )
+    int inputs:ri:rouletteLightDepth = 1 (
+        displayGroup = "Sampling:Russian Roulette"
+        displayName = "Light Start Depth"
+        doc = """
+                    Path length at which the integrator will start to drop low contribution lights.
+                    Only available during bidirectional integration.
+                """
+    )
+    float inputs:ri:rouletteThreshold = 0.2 (
+        displayGroup = "Sampling:Russian Roulette"
+        displayName = "Threshold"
+        doc = """
+                    The path throughput threshold below which Russian roulette is applied.
+                    It is usually preferable to apply Russian roulette only to paths of low importance in order to avoid noise.
+                    Increasing this setting will apply Russian roulette to more paths and thus increase the speed of the render, but may also increase noise.
+                """
+    )
+    int inputs:ri:sssOversampling = 8 (
+        displayGroup = "Sampling"
+        displayName = "SubSurface Over-Sampling"
+        doc = "Number of importance-resampled samples taken for subsurface scattering events."
+    )
+    int inputs:ri:suppressNaNs = 0 (
+        displayGroup = "Diagnostic"
+        displayName = "Suppress NaNs"
+        doc = "Suppresses individual invalid samples (NaN or inf), preventing them from reaching the final image. Be aware that there is a cost to checking for this, and it should not be enabled broadly or blindly."
+    )
+    int inputs:ri:traceLightPaths = 0 (
+        displayName = "Trace Light Paths"
+        doc = """
+        PxrUnified has 4 integration modes:
+        - Off: unidirectional path tracing
+        - On: bidirectional path tracing
+        - Photons Only: progressive photon mapping
+        - UPS/VCM: bidirectional path tracing with vertex connection and merging.
+        """
+    )
+    bool inputs:ri:useTraceDepth = 0 (
+        displayName = "Use Trace Depth"
+        doc = """
+           When enabled, the trace:maxdiffusedepth and
+           trace:maxspeculardepth attributes are also used to limit
+           the ray depth. When disabled, only the maxPathLength
+           parameter is used.
+        """
+    )
+    float inputs:ri:walkThreshold = 0.005 (
+        displayGroup = "ManifoldWalk"
+        displayName = "Threshold"
+        doc = """
+                Convergence threshold for the manifold walk algorithm.
+            """
+    )
+    uniform token ri:integrator:shaderId = "PxrUnified" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrAovLight "PxrAovLight" (
+    customData = {
+        string className = "AovLight"
+    }
+    inherits = </NonboundableLightBase>
+)
+{
+    string inputs:ri:light:aovName = "" (
+        connectability = "interfaceOnly"
+        displayName = "AOV Name"
+        doc = """
+            The name of the AOV to write to.
+        """
+    )
+    bool inputs:ri:light:inPrimaryHit = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "In Primary Hit"
+        doc = """
+                If this is on, the usual mask of the illuminated objects is
+                generated. If this is off, you can get a mask of only in
+                the refraction or reflection.
+            """
+    )
+    bool inputs:ri:light:inReflection = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "In Reflection"
+        doc = """
+                If this is on, the rays are traced through the specular reflections to get
+                the masking signal.
+
+                Warning: this will require some amount of samples to get a clean mask.
+            """
+    )
+    bool inputs:ri:light:inRefraction = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "In Refraction"
+        doc = """
+                If this is on, the rays are traced through the glass refractions
+                to get the masking signal.
+
+                Warning: this will require some amount of samples to get a clean mask.
+            """
+    )
+    bool inputs:ri:light:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Invert"
+        doc = """
+                If this is on, it inverts the signal for the AOV.
+            """
+    )
+    bool inputs:ri:light:onVolumeBoundaries = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "On Volume Boundaries"
+        doc = """
+                If this is on, the bounding box or shape of volumes will appear in
+                the mask. Since this is not always desirable, this can be turned off.
+            """
+    )
+    bool inputs:ri:light:useColor = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Use Color"
+        doc = """
+                If this is on, it outputs a RGB color image instead of a float image
+                for the AOV.
+            """
+    )
+    bool inputs:ri:light:useThroughput = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Use Throughput"
+        doc = """
+                If this is on, the values in the mask for the reflected or refracted
+                rays will be affected by the strength of the reflection or refraction.
+                This can lead to values below and above 1.0. Turn this off if you
+                want a more solid mask.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrAovLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrCylinderLightAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["CylinderLight"]
+        string apiSchemaType = "singleApply"
+        string className = "CylinderLightAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. It's recommended to leave this at the default unless
+                you experience unsolvable noise from the light.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and the light
+                at which the sample doesn't get brighter. This may help you avoid hot spots and
+                sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface. 
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrCylinderLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrDiskLightAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["DiskLight"]
+        string apiSchemaType = "singleApply"
+        string className = "DiskLightAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator.  It's recommended to leave this at the default unless
+                you experience unsolvable noise from the light.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and
+                the light at which the sample doesn't get brighter. This may help you
+                avoid hot spots and sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrDiskLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrDistantLightAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["DistantLight"]
+        string apiSchemaType = "singleApply"
+        string className = "DistantLightAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used
+                to prevent occlusion during the search of caustic paths.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. You might find need for this if you have
+                unsolvable noise from this light and need more samples.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is
+                useful to generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrDistantLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrDomeLightAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["DomeLight", "DomeLight_1"]
+        string apiSchemaType = "singleApply"
+        string className = "DomeLightAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float3 inputs:ri:light:colorMapGamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Gamma"
+        doc = """
+                colorMapGamma: Gamma-correct the texture.
+            """
+    )
+    float inputs:ri:light:colorMapSaturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Saturation"
+        doc = """
+                colorMapSaturation: Adjust the texture's saturation.
+            """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. It's recommended to leave this at the
+                default unless you experience unsolvable noise from the light.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrDomeLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrEnvDayLight "PxrEnvDayLight" (
+    customData = {
+        string className = "EnvDayLight"
+    }
+    inherits = </NonboundableLightBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    int inputs:ri:light:day = 20 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Day"
+        doc = """
+                day: Day of the month, 1 through 31.
+
+                This is ignored if month is 0.
+            """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. You might find need for this if you have
+                unsolvable noise from this light and need more samples.
+            """
+    )
+    color3f inputs:ri:light:groundColor = (0.18, 0.18, 0.18) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Ground Color"
+        doc = """
+              groundColor: A flat color for the diffuse ground floor.
+            """
+    )
+    int inputs:ri:light:groundMode = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Ground Mode"
+        doc = """
+              Legacy: Old behavior,
+              Horizon Clamping: Smear horizon values on the virtual ground plane,
+              Diffuse Ground: A fake infinite ground plane with diffuse color
+            """
+    )
+    float inputs:ri:light:haziness = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Haziness"
+        doc = """
+              haziness: The turbidity of the sky.  The lower limit of the model is 1.7 for
+              an exceptionally clear sky, and 10, for an inversion, is the upper
+              limit.
+            """
+    )
+    float inputs:ri:light:hour = 14.633333 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Hour"
+        doc = """
+              hour: Hours since midnight, local standard time.  May be fractional to
+              include minutes and seconds.  If daylight saving time is in effect,
+              subtract 1 to correct to standard time.
+
+              This is ignored if month is 0.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:latitude = 47.6019 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Latitude"
+        doc = """
+                latitude: Latitude in degrees.  Positive for north, negative for south.  Ranges frmo -90 to +90 degrees.
+
+                This is ignored if month is 0.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:longitude = -122.3318 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Longitude"
+        doc = """
+                longitude: Longitude in degrees.  Positive for east, negative for west.  Ranges frmo -180 to +180 degrees.
+
+                This is ignored if month is 0.
+            """
+    )
+    int inputs:ri:light:month = 11 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Month"
+        doc = """
+                month: Month of the year, 1 through 12.
+                The default, 0, means to use the explicitly given sun direction
+                instead of automatically computing it.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:skyTint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Sky Tint"
+        doc = """
+              skyTint: Tweak the sky's contribution and color.  The default, white (1,1,1),
+              gives results based on measured physical values.
+            """
+    )
+    vector3f inputs:ri:light:sunDirection = (0, 1, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Direction"
+        doc = """
+              sunDirection: The *apparent* direction towards the center of
+              the sun.  The zenith is at +Y (for noon light) and the
+              horizon is in the XZ plane (for sunrise/set).  Note that the
+              Y component must non-negative.  Ignored if a month is given.
+            """
+    )
+    float inputs:ri:light:sunSize = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Sun Size"
+        doc = """
+              sunSize: Scale the apparent size of the sun in the sky.  Leave at 1 for a
+              realistic sun size with an 0.55 degree angular diameter.
+            """
+    )
+    color3f inputs:ri:light:sunTint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Sun Tint"
+        doc = """
+              sunTint: Tweak the sun's contribution and color.  The default, white (1,1,1),
+              gives results based on measured physical values. Setting this to black removes the
+              sun contribution.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    int inputs:ri:light:year = 2014 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Year"
+        doc = """
+              year: Four-digit year.
+
+              This is ignored if month is 0.
+            """
+    )
+    float inputs:ri:light:zone = -8 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Time Zone"
+        doc = """
+                zone: Standard time zone offset from GMT/UTC in hours.  Positive for east,
+                negative for west.  For example, this would be -8 for Pacific time.
+
+                This is ignored if month is 0.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrEnvDayLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrMeshLightAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["MeshLightAPI", "VolumeLightAPI"]
+        string apiSchemaType = "singleApply"
+        string className = "MeshLightAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic path.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and the light
+                at which the sample doesn't get brighter. This may help you avoid hot spots and
+                sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup: Specify the light group name used for light group LPEs. This is useful to generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Cheap Caustics is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrMeshLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrPortalLightAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["PortalLight"]
+        string apiSchemaType = "singleApply"
+        string className = "PortalLightAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float3 inputs:ri:light:colorMapGamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Gamma"
+        doc = """
+                colorMapGamma: Gamma-correct the texture.
+            """
+    )
+    float inputs:ri:light:colorMapSaturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Saturation"
+        doc = """
+                colorMapSaturation: Adjust the texture's saturation.
+            """
+    )
+    string inputs:ri:light:domeColorMap = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        hidden = true
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. You might find need for this if you have
+                unsolvable noise from this light and need more samples.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityMult = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Intensity Multiplier"
+        doc = """
+                intensityMult:  Intensity adjustment relative to the dome intensity. This gets
+                multiplied by the parent dome light's intensity and power.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful
+                to generate per-light AOVs for later adjustment in compositing
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    string inputs:ri:light:portalName (
+        displayGroup = "Advanced"
+        hidden = true
+    )
+    matrix4d inputs:ri:light:portalToDome (
+        displayGroup = "Advanced"
+        hidden = true
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    color3f inputs:ri:light:tint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Color Tint"
+        doc = """
+               tint: This parameter tints the color from the dome texture.
+            """
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrPortalLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrRectLightAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["RectLight"]
+        string apiSchemaType = "singleApply"
+        string className = "RectLightAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float3 inputs:ri:light:colorMapGamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Gamma"
+        doc = """
+                colorMapGamma: Gamma-correct the texture.
+            """
+    )
+    float inputs:ri:light:colorMapSaturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Basic"
+        displayName = "Map Saturation"
+        doc = """
+                colorMapSaturation: Adjust the texture's saturation.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator and can result in a performance impact. For scenes that
+                have lots of lights, resulting in some lights that are under-sampled, you may want to set it
+                to non-zero.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and the light
+                at which the sample doesn't get brighter. This may help you avoid hot spots and
+                sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface. 
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrRectLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrSphereLightAPI" (
+    customData = {
+        token[] apiSchemaAutoApplyTo = ["SphereLight"]
+        string apiSchemaType = "singleApply"
+        string className = "SphereLightAPI"
+    }
+    inherits = </APISchemaBase>
+)
+{
+    bool inputs:ri:light:cheapCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk"
+        doc = """
+                Enable manifold walk computation and disable thin shadow for this light.
+                This parameter will be ignored if Trace Light Paths is enabled.
+            """
+    )
+    string inputs:ri:light:cheapCausticsExcludeGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Manifold Walk Caustics Exclude Group"
+        doc = """
+                Specifies the exclude shadow subset for manifold walk. Will be used to prevent occlusion during the search of caustic paths.
+            """
+    )
+    float inputs:ri:light:diffuseNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Diffuse Near Dist"
+        doc = """
+                diffuseNearDist: Near distance between the point with diffuse shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a diffuse surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:emissionFocusNormalize = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Emission Focus Normalize"
+        doc = """
+                 When normalize is enabled, the emissionFocus will scale itself so that it
+                 does not change the total energy output of the light.
+                 (Note that there is no way to set emissionFocusTint in this mode).
+             """
+    )
+    int inputs:ri:light:fixedSampleCount = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Samples"
+        doc = """
+                fixedSampleCount: Specifies an override of the number of light samples to be taken for this
+                light source. If set to something other than zero, it will override the
+                sampling performed by the integrator. It's recommended to leave this at the default unless
+                you experience unsolvable noise from the light.
+            """
+    )
+    float inputs:ri:light:importanceMultiplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Importance Multiplier"
+        doc = """
+                Importance of this light for noise control.
+            """
+    )
+    float inputs:ri:light:intensityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Intensity Near Dist"
+        doc = """
+                intensityNearDist: Near distance between the point being illuminated and the light
+                at which the sample doesn't get brighter. This may help you avoid hot spots and
+                sampling issues where a light is near a surface.
+            """
+    )
+    string inputs:ri:light:lightGroup = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Light Group"
+        doc = """
+                lightGroup:  Specify the light group name used for light group LPEs. This is useful to
+                generate per-light AOVs for later adjustment in compositing.
+            """
+    )
+    float inputs:ri:light:msApprox = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "Multi-Scattering Approx."
+        doc = """
+                msApprox: Enable multi-scattering approximation. When enabled, multi-scattering approximation mimics
+                the effect of multi-scattering in aggregate volumes.
+
+                NOTE: Values other than 0 or 1 may produce incorrect results.
+            """
+    )
+    color3f inputs:ri:light:msApproxBleed = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Bleed"
+        doc = """
+                msApproxBleed: The color of the light bleed from multi-scattering approximation. Controls how much
+                light bleeds into the volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    color3f inputs:ri:light:msApproxContribution = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multi-Scattering Approx"
+        displayName = "MS Approx Contribution"
+        doc = """
+                msApproxContribution: The color of the contribution of light from multi-scattering approximation.
+                Controls how much the light bleed contributes to the brightness of volumes illuminated by this light.
+                Has no effect if msApprox is set to 0.
+            """
+    )
+    float inputs:ri:light:specularNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Refine"
+        displayName = "Specular Near Dist"
+        doc = """
+                specularNearDist: Near distance between the point with specular shading being illuminated 
+                and the light at which the sample doesn't get brighter. This may help you 
+                avoid hot spots and sampling issues where a light is near a specular surface.
+                Note that this value will not apply to lights as seen from the camera.
+            """
+    )
+    bool inputs:ri:light:thinShadow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Thin Shadow"
+        doc = '''
+                thinShadow: Enable thin shadow and disable refraction caustics for this light.
+                This parameter will be ignored if Trace Light Paths is enabled. This is a
+                non-physical control that creates "fake" colored shadows for transmissive
+                objects without needing to generate photons for caustics.
+                Also for the paths where Cheap Caustics is enabled (surfaces marked "MWWalkable"),
+                then thinShadow is ignored as well.
+            '''
+    )
+    bool inputs:ri:light:traceLightPaths = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Trace Light Paths"
+        doc = """
+                Enables light and photon tracing from this light. This value enforces a 
+                physically-based light and as a side-effect disables thinShadow and 
+                visibleInRefractionPath. Users may use this feature to selectively decide 
+                which lights emit photons when using the PxrVCM or PxrUnified Integrators. 
+                Because it will automatically disable thin shadows, this should not be 
+                enabled when using the PxrPathTracer integrator.
+            """
+    )
+    bool inputs:ri:light:visibleInRefractionPath = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Visible In Refraction"
+        doc = """
+                visibleInRefractionPath: Make this light source visible in refraction paths.
+                This parameter will be ignored if Manifold Walk is enabled.
+            """
+    )
+    uniform token ri:light:shaderId = "PxrSphereLight" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrBarnLightFilter "PxrBarnLightFilter" (
+    customData = {
+        string className = "BarnLightFilter"
+    }
+    inherits = </LightFilter>
+)
+{
+    float inputs:ri:lightFilter:apex = 25 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Apex"
+        doc = """apex: Distance between center of barn and center of projection.
+            """
+    )
+    int inputs:ri:lightFilter:barnMode = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Barn Mode"
+        doc = """barnMode:
+
+        In 'physical' mode the barn behaves like an open window through which
+        light falls. The falloff and blur are determined by the size of the
+        light, the distance to the light and distance from the barn.
+
+        In 'analytic' mode, the barn has a fixed projection and manual
+        falloff controls.
+        """
+    )
+    float inputs:ri:lightFilter:bottom = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Refine Shape"
+        displayName = "Bottom"
+        doc = "bottom: Additional offset of the bottom region (-y axis)."
+    )
+    float inputs:ri:lightFilter:bottomEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale Edges"
+        displayName = "Bottom Edge"
+        doc = """
+                    bottomEdge: When edge is > 0, this scales the edge of the bottom region (-y axis).
+                """
+    )
+    int inputs:ri:lightFilter:colorRamp = 4 (
+        displayGroup = "Color Ramp"
+        doc = """colorRamp: This is Optional.  This sets the color gradient 
+                  for the transition.
+            """
+    )
+    color3f[] inputs:ri:lightFilter:colorRamp_Colors = [(1, 1, 1), (1, 1, 1), (1, 1, 1), (1, 1, 1)] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:colorRamp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:colorRamp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (Technically, they are applied one after the other.)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = "density: How much effect the component has (0-1)."
+    )
+    float inputs:ri:lightFilter:densityFar = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Far"
+        doc = "densityFar: Distance from the barn where the density interpolation ends."
+    )
+    float inputs:ri:lightFilter:densityFarVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Far Val"
+        doc = "densityFarVal: Density multiplier where the blur interpolation ends."
+    )
+    float inputs:ri:lightFilter:densityNear = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Near"
+        doc = "densityNear: Distance from the barn where the density interpolation starts."
+    )
+    float inputs:ri:lightFilter:densityNearVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Near Val"
+        doc = "densityNearVal: Density multiplier where the blur interpolation starts."
+    )
+    float inputs:ri:lightFilter:densityPow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Exponent"
+        doc = "densityPow: Exponent of the density interpolation."
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    bool inputs:ri:lightFilter:directional = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Directional"
+        doc = """directional: Whether or not the light projects along a direction or
+            out from a point.
+            """
+    )
+    float inputs:ri:lightFilter:edge = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Edge Thickness"
+        doc = """edge: Thickness of the edge region.  Greater value will add
+                  more softness to the edges of the barn shape.
+            """
+    )
+    float inputs:ri:lightFilter:height = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Height"
+        doc = "height: Height of the inner region of the barn (y axis)."
+    )
+    float inputs:ri:lightFilter:intensity = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = """intensity: Multiplier for both the diffuse and specular result.
+            """
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = """invert: When this is on, invert the entire effect of the light
+                  filter.
+            """
+    )
+    float inputs:ri:lightFilter:left = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Refine Shape"
+        displayName = "Left"
+        doc = "left: Additional offset of the left region (-x axis)."
+    )
+    float inputs:ri:lightFilter:leftEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale Edges"
+        displayName = "Left Edge"
+        doc = """
+                    leftEdge: When edge is > 0, this scales the edge of the left region (-x axis).
+                """
+    )
+    int inputs:ri:lightFilter:preBarn = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Pre Barn Effect"
+        doc = "preBarn: The effect on the light before it reaches the barn."
+    )
+    float inputs:ri:lightFilter:radius = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Radius"
+        doc = "radius: Radius of the corners of the inner barn square."
+    )
+    float inputs:ri:lightFilter:right = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Refine Shape"
+        displayName = "Right"
+        doc = "right: Additional offset of the right region (+x axis)."
+    )
+    float inputs:ri:lightFilter:rightEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale Edges"
+        displayName = "Right Edge"
+        doc = """
+                    rightEdge: When edge is > 0, this scales the edge of the right region (+x axis).
+                """
+    )
+    float inputs:ri:lightFilter:scaleHeight = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale"
+        displayName = "Scale Height"
+        doc = """
+                   scaleHeight: Scale the height of the inner barn shape (y axis).
+                   This includes scaling the radius.
+                """
+    )
+    float inputs:ri:lightFilter:scaleWidth = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale"
+        displayName = "Scale Width"
+        doc = """
+                    scaleWidth: Scale the width of the inner barn shape (x axis).
+                    This includes scaling the radius.
+                """
+    )
+    float inputs:ri:lightFilter:shearX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Shear X"
+        doc = "shearX: Shear the projection along the x-axis."
+    )
+    float inputs:ri:lightFilter:shearY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Shear Y"
+        doc = "shearY: Shear the projection along the y-axis."
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    float inputs:ri:lightFilter:top = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Refine Shape"
+        displayName = "Top"
+        doc = "top: Additional offset of the top region (+y axis)."
+    )
+    float inputs:ri:lightFilter:topEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape:Scale Edges"
+        displayName = "Top Edge"
+        doc = """
+                    topEdge: When edge is > 0, this scales the edge of the top region (+y axis).
+                """
+    )
+    bool inputs:ri:lightFilter:useLightDirection = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Use Light Direction"
+        doc = """ useLightDirection: If checked the projection direction
+                   is determined by the position of the center of the light source.
+                   Otherwise it only follows the orientation of the cookie.
+                   WARNING: this does not work with dome and geometric area lights.
+            """
+    )
+    float inputs:ri:lightFilter:width = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Barn Shape"
+        displayName = "Width"
+        doc = "width: Width of the inner region of the barn (x axis)."
+    )
+    uniform token ri:lightFilter:shaderId = "PxrBarnLightFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrCombinerLightFilter "PxrCombinerLightFilter" (
+    customData = {
+        string className = "CombinerLightFilter"
+    }
+    inherits = </LightFilter>
+)
+{
+    bool inputs:ri:lightFilter:combineShadows = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Combine shadows"
+        doc = """
+            Enables the shadow manipulation abilities of any connected light filters.
+        """
+    )
+    token inputs:ri:lightFilter:max (
+        displayName = "Max"
+        doc = """
+            max: Combining light filters by returning the maximum result.
+        """
+    )
+    token inputs:ri:lightFilter:min (
+        displayName = "Min"
+        doc = """
+            min: Combining light filters by returning the mininum result.
+        """
+    )
+    token inputs:ri:lightFilter:mult (
+        displayName = "Mult"
+        doc = """
+            mult: Combining light filters by multiplying.
+        """
+    )
+    token inputs:ri:lightFilter:screen (
+        displayName = "Screen"
+        doc = '''
+            screen: Combining light filters by returning the "screen" result.
+            Screen operation is similar to the max operation, but it combines gradients
+            in a smoother way.
+        '''
+    )
+    uniform token ri:lightFilter:shaderId = "PxrCombinerLightFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrCookieLightFilter "PxrCookieLightFilter" (
+    customData = {
+        string className = "CookieLightFilter"
+    }
+    inherits = </LightFilter>
+)
+{
+    float inputs:ri:lightFilter:apex = 25 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Apex"
+        doc = """apex: Distance between the center of cookie and the center of projection.
+            """
+    )
+    float inputs:ri:lightFilter:blur = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur"
+        doc = """
+                blur: Blurriness of texture (0-1, multiplied by blurNear/blurFar interp).
+            """
+    )
+    float inputs:ri:lightFilter:blurFarDist = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Far Dist"
+        doc = "blurFarDist: Distance from the cookie where the blur interpolation ends."
+    )
+    float inputs:ri:lightFilter:blurFarVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Far Value"
+        doc = "blurFarVal: Blur multiplier where the blur interpolation ends."
+    )
+    float inputs:ri:lightFilter:blurMidpoint = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Midpoint"
+        doc = "blurMidpoint: Distance between near and far, where the midValue is located."
+    )
+    float inputs:ri:lightFilter:blurMidVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Mid Value"
+        doc = "blurMidVal: Blur multiplier in the middle of the blur interpolation."
+    )
+    float inputs:ri:lightFilter:blurNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Near Dist"
+        doc = "blurNearDist: Distance from the cookie where the blur interpolation starts."
+    )
+    float inputs:ri:lightFilter:blurNearVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Near Value"
+        doc = "blurNearVal: Blur multiplier where the blur interpolation starts."
+    )
+    float inputs:ri:lightFilter:blurPow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "Blur Exponent"
+        doc = "blurPow: Exponent of the blur interpolation."
+    )
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (technically: they are applied one after the other)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:contrast = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "Contrast"
+        doc = """
+                contrast: Contrast control (less than 1 = contrast reduction,
+                larger than 1 = contrast increase).
+            """
+    )
+    int inputs:ri:lightFilter:cookieMode = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Cookie Mode"
+        doc = """
+            cookieMode:
+
+            In 'physical' mode the cookie behaves like a stained glass window
+            through which light falls. The falloff and blur are determined by the
+            size of the light, the distance to the light and distance from the
+            cookie.
+
+            In 'analytic' mode, the cookie has a fixed projection and manual
+            blur and falloff controls.
+        """
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = "density: Controls the strength of the projected effect."
+    )
+    float inputs:ri:lightFilter:densityFarDist = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Far Dist"
+        doc = "densityFarDist: Distance from the cookie where the density interpolation ends."
+    )
+    float inputs:ri:lightFilter:densityFarVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Far Value"
+        doc = "densityFarVal: Density multiplier where the blur interpolation ends."
+    )
+    float inputs:ri:lightFilter:densityMidpoint = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Midpoint"
+        doc = "densityMidpoint: Distance between near and far, where the midValue is located."
+    )
+    float inputs:ri:lightFilter:densityMidVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Mid Value"
+        doc = "densityMidVal: Density multiplier in the middle of the density interpolation."
+    )
+    float inputs:ri:lightFilter:densityNearDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Near Dist"
+        doc = "densityNearDist: Distance from the cookie where the density interpolation starts."
+    )
+    float inputs:ri:lightFilter:densityNearVal = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Near Value"
+        doc = "densityNearVal: Density multiplier where the blur interpolation starts."
+    )
+    float inputs:ri:lightFilter:densityPow = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Density Falloff"
+        displayName = "Density Exponent"
+        doc = "densityPow: Exponent of the density interpolation."
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    bool inputs:ri:lightFilter:directional = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Directional"
+        doc = """directional:  When this is on, the texture projects along a
+                  direction using the orthographic projection. When it is off,
+                  the texture projects using a focal point specified by the Apex.
+            """
+    )
+    color3f inputs:ri:lightFilter:fillColor = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Fill Color"
+        doc = """
+                fillColor: If the texture is not repeating, this specifies the
+                color for the region outside of and behind the projected rectangle.
+            """
+    )
+    float inputs:ri:lightFilter:height = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Height"
+        doc = "height: Height of the rect the light is shining through."
+    )
+    float inputs:ri:lightFilter:intensity = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = """intensity: Multiplier for both the diffuse and specular result.
+            """
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = """invert: When this is on, the texture will be inverted before it is applied.
+            """
+    )
+    bool inputs:ri:lightFilter:invertU = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Invert U"
+        doc = "invertU: flip the texture from left to right."
+    )
+    bool inputs:ri:lightFilter:invertV = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Invert V"
+        doc = "invertV: flip the texture from bottom to top."
+    )
+    bool inputs:ri:lightFilter:linearize = 0 (
+        displayGroup = "Map"
+        displayName = "Linearize"
+        doc = "Linearize the texture, assuming an sRGB transfer function."
+    )
+    asset inputs:ri:lightFilter:map = @ratGrid.tex@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Map"
+        doc = "map: Filename of the projected texture."
+    )
+    float inputs:ri:lightFilter:midpoint = 0.18 (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "Midpoint"
+        doc = "midpoint: Midpoint for the contrast control."
+    )
+    float inputs:ri:lightFilter:offsetU = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Offset U"
+        doc = "offsetU: Offset of the texture in the U direction"
+    )
+    float inputs:ri:lightFilter:offsetV = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Offset V"
+        doc = "offsetV: Offset of the texture in the V direction"
+    )
+    bool inputs:ri:lightFilter:premultipliedAlpha = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Premultiplied Alpha"
+        doc = """
+                premultipliedAlpha: Textures are usually premultiplied by their alpha. If this not
+                the case, uncheck this.
+            """
+    )
+    int inputs:ri:lightFilter:refreshMap = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        doc = """
+                Press this button to force a refresh of the texture during
+                Live Rendering.
+            """
+    )
+    float inputs:ri:lightFilter:saturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "Saturation"
+        doc = """
+                saturation: Saturation of the result (0=greyscale,1=normal,>1=boosted colors).
+            """
+    )
+    float inputs:ri:lightFilter:sBlurMult = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "S Blur Mult"
+        doc = "sBlurMult: Blur multiplier in S direction."
+    )
+    float inputs:ri:lightFilter:scaleU = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Scale U"
+        doc = "scaleU: Scale of the texture in the U direction"
+    )
+    float inputs:ri:lightFilter:scaleV = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Scale V"
+        doc = "scaleV: Scale of the texture in the V direction"
+    )
+    float inputs:ri:lightFilter:shearX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Shear X"
+        doc = "shearX: Shear the projection along the x-axis."
+    )
+    float inputs:ri:lightFilter:shearY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Shear Y"
+        doc = "shearY: Shear the projection along the y-axis."
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    bool inputs:ri:lightFilter:spherical = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Spherical"
+        doc = """spherical:  When this is on, the texture projects to a sphere
+            instead of to a plane.
+            """
+    )
+    float inputs:ri:lightFilter:tBlurMult = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blur"
+        displayName = "T Blur Mult"
+        doc = "tBlurMult: Blur multiplier in T direction."
+    )
+    int inputs:ri:lightFilter:tileMode = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Texture Mapping"
+        displayName = "Tile Mode"
+        doc = '''tileMode:
+                "No Repeat"   - texture does not repeat.
+                "Edge Extent" - extends the color of the edge to infinity.
+                "Tile"        - texture repeats (tileable texture).
+            '''
+    )
+    color3f inputs:ri:lightFilter:tint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "Tint"
+        doc = "tint: Tint of the resulting color after saturation, contrast and clamp."
+    )
+    int inputs:ri:lightFilter:useAlpha = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Use Alpha"
+        doc = """
+                useAlpha: This should always be on otherwise it will create hard edges
+                from the cookie.  This parameter is hidden in case we need to
+                expose it later.
+
+                When on, if there is no alpha channel in the projected texture, it will
+                use the installed $RMANTREEE/lib/textures/white.tex for blending
+                with the fill color. Otherwise, it will use the alpha channel.
+            """
+        hidden = true
+    )
+    bool inputs:ri:lightFilter:useLightDirection = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Use Light Direction"
+        doc = """
+                useLightDirection: When this is on, the projection direction is determined by the
+                position of the center of the light source. Otherwise, it only
+                follows the orientation of the cookie.
+
+                WARNING: This does not work with lights that have no direction such as
+                PxrDomeLight and PxrMeshLight.
+            """
+    )
+    float inputs:ri:lightFilter:whitepoint = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Saturation/Contrast/Tint"
+        displayName = "White Point"
+        doc = "whitepoint: White point for the contrast control if (contrast > 1.0)."
+    )
+    float inputs:ri:lightFilter:width = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Map"
+        displayName = "Width"
+        doc = "width: Width of the rect the light is shining through."
+    )
+    uniform token ri:lightFilter:shaderId = "PxrCookieLightFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrIntMultLightFilter "PxrIntMultLightFilter" (
+    customData = {
+        string className = "IntMultLightFilter"
+    }
+    inherits = </LightFilter>
+)
+{
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (technically: they are applied one after the other)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = """density: How much effect the filter has (0-1).
+            """
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    float inputs:ri:lightFilter:exposure = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Exposure"
+        doc = "exposure: Exposure control for the multiplier."
+    )
+    float inputs:ri:lightFilter:intensity = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = "intensity: Multiplier for the light intensity."
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = """
+                invert: When this is on, invert the multiplier.  For instance, if we
+                set the light filter's intensity to 2, the final light's intensity
+                will be divided by (instead of multiplied by) the light filter's
+                intensity.
+            """
+    )
+    float inputs:ri:lightFilter:saturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Color Saturation"
+        doc = """Saturation of the light before hitting the surface
+                  (0=greyscale,1=normal,>1=boosted colors).
+            """
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    color3f inputs:ri:lightFilter:tint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Tint"
+        doc = "Tint of the light color after saturation."
+    )
+    uniform token ri:lightFilter:shaderId = "PxrIntMultLightFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrRampLightFilter "PxrRampLightFilter" (
+    customData = {
+        string className = "RampLightFilter"
+    }
+    inherits = </LightFilter>
+)
+{
+    float inputs:ri:lightFilter:beginDist = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Ramp Direction"
+        displayName = "Begin Distance"
+        doc = "beginDist: Distance where the ramp starts."
+    )
+    int inputs:ri:lightFilter:colorRamp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Color Ramp"
+        displayName = "Color Ramp"
+        doc = "Color Ramp"
+    )
+    color3f[] inputs:ri:lightFilter:colorRamp_Colors = [(1, 1, 1), (1, 1, 1), (1, 1, 1), (1, 1, 1)] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:colorRamp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:colorRamp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (technically: they are applied one after the other)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = "density: How much effect the filter has (0-1)."
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    float inputs:ri:lightFilter:endDist = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Ramp Direction"
+        displayName = "End Distance"
+        doc = "endDist: Distance where the ramp ends."
+    )
+    float inputs:ri:lightFilter:intensity = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = "intensity: Multiplier for both the diffuse and specular result."
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = "invert: If the multipliers should be inverted"
+    )
+    int inputs:ri:lightFilter:ramp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Float Ramp"
+        displayName = "Ramp"
+        doc = "Ramp"
+    )
+    float[] inputs:ri:lightFilter:ramp_Floats = [0, 0, 1, 1] (
+        displayGroup = "Float Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:ramp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Float Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:ramp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Float Ramp"
+        hidden = true
+    )
+    int inputs:ri:lightFilter:rampType = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Ramp Direction"
+        displayName = "Ramp Type"
+        doc = "rampType: In which direction the ramp is applied."
+    )
+    float inputs:ri:lightFilter:saturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Saturation"
+        doc = """saturation: Saturation of the light before hitting the surface
+                  (0=greyscale,1=normal,>1=boosted colors). From Begin to End Distance, the value will ramp between the original light color and the Saturation adjusted color (and opposite if the ramp is inverted)."""
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    uniform token ri:lightFilter:shaderId = "PxrRampLightFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrRodLightFilter "PxrRodLightFilter" (
+    customData = {
+        string className = "RodLightFilter"
+    }
+    inherits = </LightFilter>
+)
+{
+    float inputs:ri:lightFilter:back = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Back"
+        doc = "back: Additional size of the back region (-Z axis)."
+    )
+    float inputs:ri:lightFilter:backEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Back Edge"
+        doc = """
+                    backEdge: When edge is > 0, this scales the back edge up or down (-z axis).
+                """
+    )
+    float inputs:ri:lightFilter:bottom = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Bottom"
+        doc = "bottom: Additional size of the bottom region (-Y axis)."
+    )
+    float inputs:ri:lightFilter:bottomEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Bottom Edge"
+        doc = """
+                    bottomEdge: When edge is > 0, this scales the bottom edge up or down (-y axis).
+                """
+    )
+    int inputs:ri:lightFilter:colorRamp = 4 (
+        displayGroup = "Color Ramp"
+        doc = """colorRamp: This is Optional.  This sets the color gradient
+                  for the transition.
+            """
+    )
+    color3f[] inputs:ri:lightFilter:colorRamp_Colors = [(1, 1, 1), (1, 1, 1), (1, 1, 1), (1, 1, 1)] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:colorRamp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:colorRamp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Color Ramp"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:combineMode = "mult" (
+        allowedTokens = ["mult", "max", "min", "screen"]
+        connectability = "interfaceOnly"
+        displayName = "Combine Mode"
+        doc = """
+\t<p>
+        combineMode: Light filters on a light are grouped by their combine mode. Light filters
+        in the same group are executed together and combined by the corresponding
+        operation:
+        </p>
+\t<ol>
+\t\t<li>max: the maximum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>min: the minimum result from all filters is used.
+              This works best for grey scale light filters.</li>
+\t\t<li>screen: similar to the max operation, but it combines gradients
+              in a smoother way. This works best for grey scale light filters.</li>
+\t\t<li>mult (default): the results of all the filters are multiplied together
+              (Technically, they are applied one after the other.)</li>
+\t</ol>
+\t<p>
+        The groups are executed in the above order and are multiplied together,
+        which means a filter that turns things black in the mult group will zero out
+        all other filters.
+        </p>
+"""
+    )
+    float inputs:ri:lightFilter:density = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Density"
+        doc = "density: How much effect the filter has (0-1)."
+    )
+    float inputs:ri:lightFilter:depth = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Depth"
+        doc = "depth: Depth of the inner region of the rod (Z-axis)."
+    )
+    float inputs:ri:lightFilter:diffuse = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Diffuse"
+        doc = "diffuse: How much this light filter affects diffuse lighting."
+    )
+    float inputs:ri:lightFilter:edge = 0.25 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Edge Thickness"
+        doc = "edge: Thickness of the edge region."
+    )
+    int inputs:ri:lightFilter:falloff = 6 (
+        connectability = "interfaceOnly"
+        displayGroup = "Falloff"
+        doc = "falloff: Controls the transition from the core to the edge."
+    )
+    float[] inputs:ri:lightFilter:falloff_Floats = [0, 0, 0.2, 0.8, 1, 1] (
+        displayGroup = "Falloff"
+        hidden = true
+    )
+    token inputs:ri:lightFilter:falloff_Interpolation = "bspline" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Falloff"
+        hidden = true
+    )
+    float[] inputs:ri:lightFilter:falloff_Knots = [0, 0, 0.3, 0.7, 1, 1] (
+        displayGroup = "Falloff"
+        hidden = true
+    )
+    float inputs:ri:lightFilter:front = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Front"
+        doc = "front: Additional size of the frontal region (+Z axis)."
+    )
+    float inputs:ri:lightFilter:frontEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Front Edge"
+        doc = """
+                    frontEdge: When edge is > 0, this scales the frontal edge up or down (+z axis).
+                """
+    )
+    float inputs:ri:lightFilter:height = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Height"
+        doc = "height: Height of the inner region of the rod (Y-axis)."
+    )
+    float inputs:ri:lightFilter:intensity = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Intensity"
+        doc = """intensity: Multiplier for both the diffuse and specular result.
+            """
+    )
+    bool inputs:ri:lightFilter:invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Invert"
+        doc = "invert: Inverts the entire effect of the filter."
+    )
+    float inputs:ri:lightFilter:left = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Left"
+        doc = "left: Additional size of the left region (-X axis)."
+    )
+    float inputs:ri:lightFilter:leftEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Left Edge"
+        doc = """
+                   leftEdge: When edge is > 0, this scales the left edge up or down (-x axis).
+                """
+    )
+    float inputs:ri:lightFilter:radius = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Radius"
+        doc = "radius: Radius of the corners of the inner rod box."
+    )
+    float inputs:ri:lightFilter:right = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Right"
+        doc = "right: Additional size of the right region (+X axis)."
+    )
+    float inputs:ri:lightFilter:rightEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Right Edge"
+        doc = """
+                    rightEdge: When edge is > 0, this scales the right edge up or down (+x axis).
+                """
+    )
+    float inputs:ri:lightFilter:saturation = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Color Saturation"
+        doc = """saturation: Saturation of the light before hitting the surface
+                  (0=greyscale,1=normal,>1=boosted colors)."""
+    )
+    float inputs:ri:lightFilter:scaleDepth = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale"
+        displayName = "Scale Depth"
+        doc = "scaleDepth: Scale the depth of the inner rod shape (Z axis)."
+    )
+    float inputs:ri:lightFilter:scaleHeight = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale"
+        displayName = "Scale Height"
+        doc = "scaleHeight: Scale the height of the inner rod shape (Y axis)."
+    )
+    float inputs:ri:lightFilter:scaleWidth = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale"
+        displayName = "Scale Width"
+        doc = "scaleWidth: Scale the width of the inner rod shape (X axis)."
+    )
+    float inputs:ri:lightFilter:specular = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Multiplier"
+        displayName = "Specular"
+        doc = "specular: How much this light filter affects specular lighting."
+    )
+    float inputs:ri:lightFilter:top = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Refine Shape"
+        displayName = "Top"
+        doc = "top: Additional size of the top region (+Y axis)."
+    )
+    float inputs:ri:lightFilter:topEdge = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape:Scale Edges"
+        displayName = "Top Edge"
+        doc = """
+                    topEdge: When edge is > 0, this scales the top edge up or down (+y axis).
+                """
+    )
+    float inputs:ri:lightFilter:width = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Rod Shape"
+        displayName = "Width"
+        doc = "width: Width of the inner region of the rod (X-axis)."
+    )
+    uniform token ri:lightFilter:shaderId = "PxrRodLightFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrCamera "PxrCamera" (
+    customData = {
+        string className = "Camera"
+    }
+    doc = """
+    A camera model that approximates a number of real world physical
+    effects.  This supports all of the traditional prman perspective camera
+    settings including shaped motion blur and bokeh.
+  """
+    inherits = </PxrProjectionPluginBase>
+)
+{
+    float inputs:ri:assymX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Asymmetric Distortion X"
+        doc = """
+        Distortion applied only in the X direction.  Horizontal lines will
+        remain straight.  Positive values produce pincushion-like
+        distortion.  Negative values produce barrel-like distortion.
+      """
+        hidden = true
+    )
+    float inputs:ri:assymY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Asymmetric Distortion Y"
+        doc = """
+        Distortion applied only in the Y direction.  Vertical lines will
+        remain straight.  Positive values produce pincushion-like
+        distortion.  Negative values produce barrel-like distortion.
+      """
+        hidden = true
+    )
+    color3f inputs:ri:axial = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Chromatic Aberration"
+        displayName = "Axial"
+        doc = """
+        Axial (or longitudinal) chromatic aberration.  This specifies the
+        chromatic focal shift for the red, green, and blue primaries
+        respectively.  When unequal, this can produce a tinge on bokeh and
+        out of focus objects.  It will increase color noise, however.
+      """
+    )
+    asset inputs:ri:cocTexture (
+        displayGroup = "DOF Distortion"
+        displayName = "Circle of Confusion Texture"
+        doc = "If set, this overrides the lens's circle of confusion. (Not implemented in XPU)"
+    )
+    float inputs:ri:detail = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Detail Bias"
+        doc = """
+        Detail bias.  Positive values will shift all texture lookups
+        towards coarser, lower resolution, MIP map levels than would
+        normally be used.  Negative values will shift them towards finer,
+        higher resolution, levels.  Also affects the level-of-detail
+        selected for geometry.
+      """
+    )
+    float2 inputs:ri:distortionCtr = (0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Distortion Center"
+        doc = """
+        Controls the center of the applied distortion. This is applied to
+        the anchored screen window space coordinates, where anchored 
+        screen window space is the natural space for comupting lens effects.
+      """
+    )
+    float inputs:ri:dofMult = 1 (
+        displayGroup = "DOF Distortion"
+        displayName = "Depth of Field Multipler"
+        doc = " Global multiplier on depth of field. "
+    )
+    float3 inputs:ri:dofPivotCenter = (0, 0, 0) (
+        displayGroup = "DOF Distortion"
+        displayName = "Pivot Center"
+        doc = " Point (relative to focal plane and center-of-frame) where no dof distorion occurrs. "
+    )
+    float inputs:ri:dofRadiusFalloff = 1 (
+        displayGroup = "DOF Distortion"
+        displayName = "Radius Falloff"
+        doc = " Sharpness of depth of field radial effect. "
+    )
+    float inputs:ri:dofRadiusStrength = 0 (
+        displayGroup = "DOF Distortion"
+        displayName = "Radius Strength"
+        doc = " Strength of depth of field radial effect. "
+    )
+    float inputs:ri:dofSqAnamorph = 1 (
+        displayGroup = "DOF Distortion"
+        displayName = "Squeeze Anamorph"
+        doc = ' Anamorphic aspect ratio of radial dof "squeeze" effect. '
+    )
+    float3 inputs:ri:dofSqCtr = (0, 0, 0) (
+        displayGroup = "DOF Distortion"
+        displayName = "Squeeze Center"
+        doc = " Point (relative to focal plane and center-of-frame) corresponding to the center of the DOF squeeze effect. "
+    )
+    float inputs:ri:dofSqFalloff = 1 (
+        displayGroup = "DOF Distortion"
+        displayName = "Squeeze Falloff"
+        doc = ' Radial strength falloff of the DOF "squeeze" effect. Larger numbers correspond to sharper falloff. Negative values are valid. '
+    )
+    float inputs:ri:dofSqStrength = 0 (
+        displayGroup = "DOF Distortion"
+        displayName = "Squeeze Strength"
+        doc = ' Strength of DOF "squeeze" effect. Positive values squeeze along the circumference; negative values squeeze along the radius. 0 is off.'
+    )
+    float inputs:ri:duration = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Shutter"
+        displayName = "Duration"
+        doc = """
+        Exposure duration.  Zero means an ideal rolling shutter where each
+        line is exposed instantaneously when read.  The default, one, is
+        equivalent to a global shutter where all lines are exposed and read
+        at the same time. (Not implemented in XPU)
+      """
+    )
+    float3 inputs:ri:enhance = (0, 0, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Enhancement"
+        doc = """
+        Enhancement.  Embiggens the region around a pixel (X,Y) by zoom
+        factor Z for trouble-shooting.  The magnified pixel will remain
+        anchored in place relative to the image.  Camera effects such as
+        vignetting will be scaled accordingly.  Intentionally does not
+        affect level-of-detail, dicing, displacement, or MIP map levels.
+      """
+    )
+    bool inputs:ri:enhanceDiffAdjust = 0 (
+        displayGroup = "Enhance"
+        displayName = "Adjust differentials in enhance"
+        doc = " Should enhance mode use the ray differentials of the un-enhanced image (unchecked), or adjust them to reflect the smaller size of each pixel in the enhanced image (checked)? The former shows the true contents of the un-enhanced pixels, the latter lets you resolve  "
+    )
+    bool inputs:ri:enhanceDisableDOF = 0 (
+        displayGroup = "Enhance"
+        displayName = "Disable DOF in enhance"
+        doc = " Disable modification of ray origins in enhance mode. Renderman still thinks DOF is enabled, so focus factor will apply to geometry tessellation, but DOF-related blurring will not occur. This option and the one below enable you to get a fully accurate enhanced view of the geometry, without lens effects obscuring it. "
+    )
+    bool inputs:ri:enhanceDisableMoBlur = 0 (
+        displayGroup = "Enhance"
+        displayName = "Disable Motion Blur in enhance"
+        doc = " Disable distribution of samples over time in enhance mode. Renderman still thinks motion blur is enabled, so motion factor will apply to geometry tessellation, but blurring due to motion blur will not occur. "
+    )
+    float inputs:ri:focalDistance = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "Focal Distance"
+        doc = """
+         Distance at which objects will be in focus.  This should be in
+         units of distance along the view direction in camera coordinates.
+         Effectively ignored if F-stop is huge.
+      """
+    )
+    float inputs:ri:focalLength = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "Focal Length"
+        doc = """
+         Focal length of the camera lens.  Used to determine depth of
+         field and defocus.  This should be in units of distance along the
+         view direction in camera coordinates.  Effectively ignored if
+         F-stop is huge.
+      """
+    )
+    point3f inputs:ri:focus1 = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Focus 1"
+        doc = """
+        First point to keep in focus.  Specified in world space.  If all
+        three focus points are set then the tilt angles and focal distance
+        will be automatically solved to match the plane of focus they
+        define.  Note that there may not be a solution.
+      """
+    )
+    point3f inputs:ri:focus2 = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Focus 2"
+        doc = """
+        Second point to keep in focus.  Specified in world space.  If all
+        three focus points are set then the tilt angles and focal distance
+        will be automatically solved to match the plane of focus they
+        define.  Note that there may not be a solution.
+      """
+    )
+    point3f inputs:ri:focus3 = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Focus 3"
+        doc = """
+        Third point to keep in focus.  Specified in world space.  If all
+        three focus points are set then the tilt angles and focal distance
+        will be automatically solved to match the plane of focus they
+        define.  Note that there may not be a solution.
+      """
+    )
+    float inputs:ri:fov = 90 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "Field of View"
+        doc = """
+        Field of view (FOV) in degrees at the beginning of the frame.  For
+        rectangular images this is normally the FOV along the narrower
+        image dimension.
+      """
+    )
+    float inputs:ri:fovEnd = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "Field of View (End)"
+        doc = """
+        Field of view (FOV) in degrees at the end of the frame.  Used to
+        motion blur very fast zooms.  The default, zero, means to assume it
+        is the same as at the beginning of the frame.
+      """
+    )
+    float inputs:ri:fStop = 16 (
+        connectability = "interfaceOnly"
+        displayGroup = "Standard Perspective"
+        displayName = "F-stop"
+        doc = """
+        F-stop or aperture number.  Used to determine depth of field and
+        defocus.  This determines the lens diameter.  If the f-stop is a
+        huge number, then effectively a pin-hole camera is used and depth
+        of field is turned off.
+      """
+    )
+    float inputs:ri:lensAsymmetryX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Asymmetric Distortion X"
+        doc = """
+        Distortion applied only in the X direction.  Horizontal lines will
+        remain straight.  Positive values produce pincushion-like
+        distortion.  Negative values produce barrel-like distortion.
+      """
+    )
+    float inputs:ri:lensAsymmetryY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Asymmetric Distortion Y"
+        doc = """
+        Distortion applied only in the Y direction.  Vertical lines will
+        remain straight.  Positive values produce pincushion-like
+        distortion.  Negative values produce barrel-like distortion.
+      """
+    )
+    float inputs:ri:lensScale = 1 (
+        displayGroup = "Lens Distortion"
+        displayName = "Lens Scale"
+        doc = " Scale of lens distortion effect. "
+    )
+    int inputs:ri:lensType = 2 (
+        displayName = "Lens Type"
+        doc = " Lens model type. "
+    )
+    asset inputs:ri:matte = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Advanced"
+        displayName = "Matte file"
+        doc = """
+        Matte file.  An EXR image that cuts away parts of the render.  If
+        it is a deep image, it removes anything in the render that is
+        farther away than opaque objects in the matte file, leaving behind
+        transparent holes.  If it is a shallow image, it removes parts of
+        the render where the matte file is opaque. (Not implemented in XPU)
+      """
+    )
+    float inputs:ri:natural = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Vignetting"
+        displayName = "Natural"
+        doc = """
+        Natural vignetting.  When one, directions off of the primary camera
+        axis will be darkened realistically.  Wide-angle perspectives will
+        show this effect more strongly.  Setting to zero disables this and
+        intermediate values will blend accordingly.
+      """
+    )
+    int inputs:ri:numSplitDiopters = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Number of Split Diopters"
+        doc = " Number of split diopters lens (minimum 0, maximum 2) being enabled. "
+    )
+    float inputs:ri:optical = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Vignetting"
+        displayName = "Optical"
+        doc = """
+        Optical vignetting.  Simulates light blockage due to a hood or
+        other additional lens elements.  With depth of field enabled, this
+        creates cat's eye bokeh.  However, it also increases image noise.
+      """
+    )
+    float inputs:ri:radial1 = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Radial Distortion 1"
+        doc = """
+        Quadratic radial lens distortion coefficient.  Positive values
+        produce pincushion distortion.  Negative values produce barrel
+        distortion.
+      """
+    )
+    float inputs:ri:radial2 = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Radial Distortion 2"
+        doc = """
+        Quartic radial lens distortion coefficient.  Positive values
+        produce pincushion distortion.  Negative values produce barrel
+        distortion.
+      """
+    )
+    float inputs:ri:roll = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Roll Angle"
+        doc = """
+        Roll the lens clockwise.  If the lens tilt is non-zero this can be
+        used to rotate the plane of focus around the image center.  Ignored
+        if focus points are set.
+      """
+    )
+    float inputs:ri:shiftX = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Shift X"
+        doc = """
+        Shift the lens horizontally.  This can be used to correct for
+        perspective distortion.  Positive values shift towards the right.
+      """
+    )
+    float inputs:ri:shiftY = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Shift Y"
+        doc = '''
+        Shift the lens vertically.  This can be used to correct for
+        perspective distortion "keystone" effects.  To keep vertical lines
+        parallel, aim the camera horizontally and adjust this to include
+        the subject.  Positive values shift towards the top.
+      '''
+    )
+    float inputs:ri:splitDiopterAngle = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Angle"
+        doc = " Angle of the split diopter line(s), CW from the up-axis. "
+    )
+    float inputs:ri:splitDiopterFocusDistance1 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Focus Distance 1"
+        doc = " Focal distance for the first split diopter region, in world space. "
+    )
+    float inputs:ri:splitDiopterFocusDistance2 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Focus Distance 2"
+        doc = " Focal distance for the second split diopter region, in world space. "
+    )
+    float inputs:ri:splitDiopterOffset1 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Offset 1"
+        doc = " Distance of the first split diopter line from the image center, perpendicular to the split diopter axis. Unit is such that distance from the image center to the left (or right) edge is 1. "
+    )
+    float inputs:ri:splitDiopterOffset2 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Offset 2"
+        doc = " Distance of the second split diopter line from the image center, perpendicular to the split diopter axis. Unit is such that distance from the image center to the left (or right) edge is 1. "
+    )
+    float inputs:ri:splitDiopterWidth1 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Width 1"
+        doc = " Width of the band between the center and first split diopter region, perpendicular to the split diopter axis, where the focal distance is smoothly interpolated. Unit is such that distance from the image center to the left (or right) edge is 1. "
+    )
+    float inputs:ri:splitDiopterWidth2 = 0 (
+        displayGroup = "Split Diopter"
+        displayName = "Split Diopter Width 2"
+        doc = " Width of the band between the center and second split diopter region, perpendicular to the split diopter axis, where the focal distance is smoothly interpolated. Unit is such that distance from the image center to the left (or right) edge is 1. "
+    )
+    float inputs:ri:squeeze = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Lens Distortion"
+        displayName = "Anamorphic Squeeze"
+        doc = """
+        Anamorphic lens squeeze.  Values greater than one decrease the
+        effect of the lens distortion in the X direction.  Values less than
+        one increase it.
+      """
+    )
+    token inputs:ri:sweep = "down" (
+        allowedTokens = ["down", "right", "up", "left"]
+        connectability = "interfaceOnly"
+        displayGroup = "Shutter"
+        displayName = "Sweep"
+        doc = """
+        Shutter direction.  Specifies the direction that the shutter
+        sweeps.  The default, down, is the most common direction for
+        rolling shutters. (Not implemented in XPU)
+      """
+    )
+    float inputs:ri:tilt = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Tilt-Shift"
+        displayName = "Tilt Angle"
+        doc = """
+        Angle in degrees to tilt the lens.  Makes the plane of focus
+        non-parallel to the image plane.  Has no effect unless depth of
+        field is enabled.  Positive tilts up, bringing the focus in the top
+        of the image closer and pushing the focus in the bottom further.
+        Negative does the reverse.  Ignored if focus points are set.
+      """
+    )
+    color3f inputs:ri:transverse = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Chromatic Aberration"
+        displayName = "Transverse"
+        doc = """
+        Transverse (or lateral) chromatic aberration.  This specifies the
+        magnification factors for the red, green, and blue primaries
+        respectively.  When unequal, this can produce a tinge which is most
+        pronounced near the image edges.  It will increase color noise,
+        however.
+      """
+    )
+    uniform token ri:projection:shaderId = "PxrCamera" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrCylinderCamera "PxrCylinderCamera" (
+    customData = {
+        string className = "CylinderCamera"
+    }
+    doc = """
+    A simple camera model that projects through a section of a cylinder
+    from the point at the cylinder's center.  For very wide aspect images,
+    this may be useful for rendering a circular panorama.
+  """
+    inherits = </PxrProjectionPluginBase>
+)
+{
+    float inputs:ri:hsweep = 360 (
+        connectability = "interfaceOnly"
+        displayName = "Horizontal Sweep"
+        doc = """
+      The horizontal angle of the cylinder subtended by the image.  The
+      default, 360, means that the image wraps all the way around and the
+      left and right edges of the image align.
+    """
+    )
+    float inputs:ri:vsweep = 90 (
+        connectability = "interfaceOnly"
+        displayName = "Vertical Sweep"
+        doc = """
+      The vertical field of view of the image.
+    """
+    )
+    uniform token ri:projection:shaderId = "PxrCylinderCamera" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrLightProbe "PxrLightProbe" (
+    customData = {
+        string className = "LightProbe"
+    }
+    doc = """
+    A simple camera model that renders an image as though photographing a
+    perfectly specular mirrored ball.  Note that the view direction is
+    flipped and the image mirrored compared to a real ball so that the
+    orientation appears similar to other projections.
+  """
+    inherits = </PxrProjectionPluginBase>
+)
+{
+    uniform token ri:projection:shaderId = "PxrLightProbe" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrOrthographic "PxrOrthographic" (
+    customData = {
+        string className = "Orthographic"
+    }
+    doc = """
+    A simple parallel projection camera.
+  """
+    inherits = </PxrProjectionPluginBase>
+)
+{
+    uniform token ri:projection:shaderId = "PxrOrthographic" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrPanini "PxrPanini" (
+    customData = {
+        string className = "Panini"
+    }
+    doc = """
+    The Panini projection is designed for producing ultra-wide angle images
+    with large fields of view.  It can be particularly effective for
+    architectural scenes.  Like the traditional rectilinear perspective
+    projection, vertical lines remain vertical when the view direction is
+    horizontal, and radial lines that converge towards the vanishing point
+    also remain straight.  However, it can do this while accommodating wide
+    angles up to 180 degrees and beyond.
+  """
+    inherits = </PxrProjectionPluginBase>
+)
+{
+    float inputs:ri:compression = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Compression"
+        doc = """
+      Determines the type of projection and the amount of compression at
+      the peripheriphy.  At 0.0, this produces the equivalent of the
+      traditional perspective projection and the FOV is limited to less
+      than 180 degrees.  At 1.0, this produces the full Panini projection
+      and allows the FOV to go up to almost 360 degrees.
+    """
+    )
+    float inputs:ri:fov = 90 (
+        connectability = "interfaceOnly"
+        displayName = "Field of View"
+        doc = """
+      Field of view (FOV) in degrees.  For rectangular images this is
+      normally the FOV along the wider image dimension.  Note that the
+      actual FOV may be limited to somewhere between 180 and 360 depending
+      on the Compression setting.
+    """
+    )
+    uniform token ri:projection:shaderId = "PxrPanini" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrPerspective "PxrPerspective" (
+    customData = {
+        string className = "Perspective"
+    }
+    doc = """
+    A simple pinhole camera.
+  """
+    inherits = </PxrProjectionPluginBase>
+)
+{
+    float inputs:ri:focalDistance = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Focal Distance"
+        doc = """
+       Distance at which objects will be in focus.  This should be in
+       units of distance along the view direction in camera coordinates.
+       Effectively ignored if F-stop is huge.
+    """
+    )
+    float inputs:ri:focalLength = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Focal Length"
+        doc = """
+       Focal length of the camera lens.  Used to determine depth of
+       field and defocus.  This should be in units of distance along the
+       view direction in camera coordinates.  Effectively ignored if
+       F-stop is huge.
+    """
+    )
+    float inputs:ri:fov = 90 (
+        connectability = "interfaceOnly"
+        displayName = "Field of View"
+        doc = """
+      Field of view (FOV) in degrees.  For rectangular images this is
+      normally the FOV along the narrower image dimension.
+    """
+    )
+    float inputs:ri:fovEnd = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Field of View (End)"
+        doc = """
+      Field of view (FOV) in degrees at the end of the frame.  Used to
+      motion blur very fast zooms.  The default, zero, means to assume it
+      is the same as at the beginning of the frame.
+    """
+    )
+    float inputs:ri:fStop = 16 (
+        connectability = "interfaceOnly"
+        displayName = "F-stop"
+        doc = """
+      F-stop or aperture number.  Used to determine depth of field and
+      defocus.  This determines the lens diameter.  If the f-stop is a
+      huge number, then effectively a pin-hole camera is used and depth
+      of field is turned off.
+    """
+    )
+    uniform token ri:projection:shaderId = "PxrPerspective" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrSphereCamera "PxrSphereCamera" (
+    customData = {
+        string className = "SphereCamera"
+    }
+    doc = """
+    A simple camera model that projects through a section of a sphere from
+    the point at the sphere's center.  With its default settings, this may
+    be useful for rendering a latlong environment map.
+  """
+    inherits = </PxrProjectionPluginBase>
+)
+{
+    float inputs:ri:hsweep = 360 (
+        connectability = "interfaceOnly"
+        displayName = "Horizontal Sweep"
+        doc = """
+      The horizontal angle of the sphere subtended by the image.  The
+      default, 360, means that the image wraps all the way around and the
+      left and right edges of the image align.
+    """
+    )
+    float inputs:ri:vsweep = 180 (
+        connectability = "interfaceOnly"
+        displayName = "Vertical Sweep"
+        doc = """
+      The vertical angle of the sphere subtended by the image.  The
+      default, 180, means that the top and bottom of the image shows the
+      through the sphere's poles directly above and below the camera.
+    """
+    )
+    uniform token ri:projection:shaderId = "PxrSphereCamera" (
+        displayGroup = "Internal"
+    )
+}
+
+class OmnidirectionalStereo "OmnidirectionalStereo" (
+    customData = {
+        string className = "OmnidirectionalStereo"
+    }
+    doc = """
+        This camera projection renders the scene as a stereo pair of 360 degree
+        projections. It is intended to be rendered in a square format with
+        the top half as the left eye and the bottom half as the right eye.
+
+        Author: Mach Kobayashi
+  """
+    inherits = </PxrProjectionPluginBase>
+)
+{
+    float inputs:ri:interpupilaryDistance = 0.0635 (
+        connectability = "interfaceOnly"
+        displayName = "Interpupilary Distance"
+        doc = """
+        The distance between the two eyes. The default, 0.0635, should work if
+        your scene is measured in meters.
+      """
+    )
+    uniform token ri:projection:shaderId = "OmnidirectionalStereo" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrBackgroundDisplayFilter "PxrBackgroundDisplayFilter" (
+    customData = {
+        string className = "BackgroundDisplayFilter"
+    }
+    doc = """
+    Display filter plugin to color the background.
+  """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    string inputs:ri:aovAlpha = "a" (
+        connectability = "interfaceOnly"
+        displayName = "Alpha"
+        doc = "Name of AOV to get alpha values from."
+    )
+    color3f inputs:ri:backgroundColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Background Color"
+        doc = """
+        Color of the background.
+    """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrBackgroundDisplayFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrCopyAOVDisplayFilter "PxrCopyAOVDisplayFilter" (
+    customData = {
+        string className = "CopyAOVDisplayFilter"
+    }
+    doc = """
+    Display filter plugin to look up a named AOV and copy it
+    to Ci.
+  """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:readAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Read AOV"
+        doc = "Name of AOV to read from."
+    )
+    string inputs:ri:writeAov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "Write AOV"
+        doc = "Name of AOV to write to."
+    )
+    uniform token ri:displayFilter:shaderId = "PxrCopyAOVDisplayFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrDisplayFilterCombiner "PxrDisplayFilterCombiner" (
+    customData = {
+        string className = "DisplayFilterCombiner"
+    }
+    doc = """
+        Display filter combiner.
+    """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    token inputs:ri:filter (
+        displayName = "Display Filter"
+        doc = """
+            Display filters.
+        """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrDisplayFilterCombiner" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrEdgeDetect "PxrEdgeDetect" (
+    customData = {
+        string className = "EdgeDetect"
+    }
+    doc = """
+    A small example display filter that demonstrates image processing.
+    This filter replaces the image in the beauty pass (or any other AOV)
+    with its gradient magnitude computed from a Sobel edge-detection
+    filter.
+  """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = """
+      Name of a color AOV to do edge detection on.
+    """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrEdgeDetect" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrFilmicTonemapperDisplayFilter "PxrFilmicTonemapperDisplayFilter" (
+    customData = {
+        string className = "FilmicTonemapperDisplayFilter"
+    }
+    doc = """
+        Display filter plugin based on Naughty Dog's Filmic Tonemapper from GDC Uncharted 2 HDR Lighting presentation.
+    """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    float inputs:ri:A = 0.22 (
+        connectability = "interfaceOnly"
+        displayName = "Shoulder"
+        doc = """
+            Shoulder strength.
+        """
+    )
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    float inputs:ri:B = 0.3 (
+        connectability = "interfaceOnly"
+        displayName = "Linear"
+        doc = """
+            Linear strength.
+        """
+    )
+    float inputs:ri:C = 0.1 (
+        connectability = "interfaceOnly"
+        displayName = "Linear Angle"
+        doc = """
+            Linear angle.
+        """
+    )
+    float inputs:ri:D = 0.2 (
+        connectability = "interfaceOnly"
+        displayName = "Toe"
+        doc = """
+            Toe strength.
+        """
+    )
+    float inputs:ri:E = 0.01 (
+        connectability = "interfaceOnly"
+        displayName = "Toe Numerator"
+        doc = """
+            Toe numerator.
+        """
+    )
+    float inputs:ri:exposureAdjust = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Exposure Adjustment"
+        doc = """
+            Exposure adjustment. This parameter is multiplied by the incoming
+            pixel.
+        """
+    )
+    float inputs:ri:F = 0.3 (
+        connectability = "interfaceOnly"
+        displayName = "Toe Denominator"
+        doc = """
+            Toe denominator.
+        """
+    )
+    float inputs:ri:linearWhitePoint = 11.2 (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Linear white point value.
+        """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrFilmicTonemapperDisplayFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrGradeDisplayFilter "PxrGradeDisplayFilter" (
+    customData = {
+        string className = "GradeDisplayFilter"
+    }
+    doc = """
+        Nuke-like grade display filter. Allows simple grading of the beauty pass.
+    """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    color3f inputs:ri:blackPoint = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Black Point"
+        doc = """
+            Ci is remapped so that this color becomes 0.
+        """
+    )
+    bool inputs:ri:clampBlack = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Clamp Black"
+        doc = """
+            Clamp Ci so that no value is less than 0. This is useful for compositing so that adding channels will not result in unexpected results.
+        """
+    )
+    bool inputs:ri:clampWhite = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Clamp White"
+        doc = """
+            Clamp Ci so that no value exceeds 1.
+        """
+    )
+    color3f inputs:ri:gain = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Gain"
+        doc = """
+            Multiply Ci by this color.
+        """
+    )
+    color3f inputs:ri:gamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Gamma"
+        doc = """
+            Gamma Ci by this color.
+        """
+    )
+    color3f inputs:ri:lift = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Lift"
+        doc = """
+            Add this value to Ci.
+        """
+    )
+    color3f inputs:ri:mask = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Mask"
+        doc = """
+            Mask the color correction result with this color.
+        """
+    )
+    color3f inputs:ri:multiply = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Multiply"
+        doc = """
+            Multiply Ci by this color.
+        """
+    )
+    color3f inputs:ri:offset = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Offset"
+        doc = """
+            Offset Ci (Ci + offset) by this color.
+        """
+    )
+    color3f inputs:ri:whitePoint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Ci is remapped so that this color becomes 1.
+        """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrGradeDisplayFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrHalfBufferErrorFilter "PxrHalfBufferErrorFilter" (
+    customData = {
+        string className = "HalfBufferErrorFilter"
+    }
+    doc = """
+    Estimate the error of an image by comparing two half buffers.  If two
+    statistically-independent images are each produced from half the camera
+    samples, then we can estimate the mean-squared-error between the ground
+    truth and their average and as one-quarter of the squared difference of
+    the two.  The AOVs may be either all scalar or all color.
+  """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:aov1 = "even" (
+        connectability = "interfaceOnly"
+        displayName = "AOV 1"
+        doc = """
+      Name of the first half-buffer AOV to read from.
+    """
+    )
+    string inputs:ri:aov2 = "odd" (
+        connectability = "interfaceOnly"
+        displayName = "AOV 2"
+        doc = """
+      Name of the second half-buffer AOV to read from.
+    """
+    )
+    string inputs:ri:result = "mse" (
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = """
+      Name of the AOV to write the estimated error to.
+    """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrHalfBufferErrorFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrImageDisplayFilter "PxrImageDisplayFilter" (
+    customData = {
+        string className = "ImageDisplayFilter"
+    }
+    doc = "Display filter plugin to render image planes including holdouts."
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    color3f inputs:ri:colorGain = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Color Gain"
+        doc = "Color gain."
+    )
+    color3f inputs:ri:colorOffset = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Color Offset"
+        doc = "Color offset."
+    )
+    asset inputs:ri:filename = @@ (
+        connectability = "interfaceOnly"
+        displayName = "Filename"
+        doc = "The name of the plate image to display."
+    )
+    float inputs:ri:filmMaxX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Right"
+        doc = "Film window max X"
+    )
+    float inputs:ri:filmMaxY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Top"
+        doc = "Film window max Y"
+    )
+    float inputs:ri:filmMinX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Left"
+        doc = "Film window min X"
+    )
+    float inputs:ri:filmMinY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Bottom"
+        doc = "Film window min Y"
+    )
+    int inputs:ri:fit = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Fit"
+        doc = "Fit image to display."
+    )
+    string inputs:ri:holdoutShadowAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Holdout Shadow AOV"
+        doc = "The name of the holdout shadow AOV to look up."
+    )
+    bool inputs:ri:linearize = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Linearize"
+        doc = "Linearize"
+    )
+    float inputs:ri:offsetX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset X"
+        doc = "Offset in X."
+    )
+    float inputs:ri:offsetY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset Y"
+        doc = "Offset in Y."
+    )
+    float inputs:ri:rotate = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Rotate"
+        doc = "Rotation."
+    )
+    float inputs:ri:scaleX = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale X"
+        doc = "Scale in X."
+    )
+    float inputs:ri:scaleY = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale Y"
+        doc = "Scale in Y."
+    )
+    uniform token ri:displayFilter:shaderId = "PxrImageDisplayFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrLightSaturation "PxrLightSaturation" (
+    customData = {
+        string className = "LightSaturation"
+    }
+    doc = """
+    A small example display filter that changes the color saturation in the
+    beauty pass (or any other AOV) according to whether a region is lit or
+    shadowed by particular light group.
+  """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = """
+      Name of a color AOV to adjust saturation in.
+    """
+    )
+    bool inputs:ri:invert = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Invert?"
+        doc = """
+      If unset then areas lit by the light will be modified and areas fully
+      in shadow will be left alone.  Set this to invert that and change the
+      saturation of the shadows of this light.
+    """
+    )
+    string inputs:ri:light = "" (
+        connectability = "interfaceOnly"
+        displayName = "Light AOV"
+        doc = """
+      Name of the color AOV with the contribution from the light group.
+      The AOV should be populated using a direct-lighting LPE such as:
+      <p>
+        Display \"+satlighttiny\" \"null\" \"color lpe:C[DGS]<L.'tiny'>\"
+      </p>
+      in which case the value of this parameter would be \"satlighttiny\".
+      This AOV shows direct illumination from any lights with parameter:
+      <p>
+        \"string __group\" \"tiny\"
+      </p>
+    """
+    )
+    float inputs:ri:shift = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Shift"
+        doc = """
+      Amount and direction to shift saturation.  Positive values increase
+      saturation, negative values desaturate.  Recommended range is -2.0 to
+      2.0.
+    """
+    )
+    float inputs:ri:threshold = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Threshold"
+        doc = """
+      Luminance in the light AOV less than this is considered shadowed.
+    """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrLightSaturation" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrShadowDisplayFilter "PxrShadowDisplayFilter" (
+    customData = {
+        string className = "ShadowDisplayFilter"
+    }
+    doc = "Display filter plugin to calculate shadow AOV output from occluded and unoccluded AOV inputs."
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:occludedAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Occluded AOV"
+        doc = "The name of the occluded AOV to look up."
+    )
+    string inputs:ri:shadowAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Shadow AOV"
+        doc = "The name of the shadow AOV to write to."
+    )
+    float inputs:ri:shadowThreshold = 0.01 (
+        connectability = "interfaceOnly"
+        displayName = "Shadow Threshold"
+        doc = "Reduce shadow noise by ignoring small differences illumination."
+    )
+    string inputs:ri:unoccludedAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Unoccluded AOV"
+        doc = "The name of the unoccluded AOV to look up."
+    )
+    uniform token ri:displayFilter:shaderId = "PxrShadowDisplayFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrStylizedCanvas "PxrStylizedCanvas" (
+    customData = {
+        string className = "StylizedCanvas"
+    }
+    doc = """
+        Required AOVs: 
+  """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:canvas_aov_string = "diffuse" (
+        connectability = "interfaceOnly"
+        displayName = "Canvas AOV"
+        doc = """
+      Name of a color AOV to use for this Layer. This AOV has to be setup in Maya/Katana/Houdini or this Canvas DisplayFilter will exit.
+    """
+    )
+    color3f inputs:ri:Canvas_Color = (1, 1, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Canvas Color"
+        doc = """
+      Background color outside of alpha
+    """
+    )
+    asset inputs:ri:Canvas_Texture = @StylizedLooks/pxrStylized-woven/pxrStylized-woven-08.tex@ (
+        connectability = "interfaceOnly"
+        displayName = "Canvas Texture"
+        doc = "Provide BG texture for outside alpha, if blank uses BG Color"
+    )
+    token inputs:ri:Comp_Mode = "bg" (
+        allowedTokens = ["bg", "multiply", "screen"]
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Comp Mode"
+        doc = """ Comp on Color or previous layer (BG)
+    """
+    )
+    float inputs:ri:Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Gamma"
+        doc = """
+        Gamma (Contrast)
+    """
+    )
+    bool inputs:ri:Ignore_Alpha_Switch = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Ignore Alpha"
+        doc = """
+        Put BG Color or Texture on everything under Canvas, ignoring alpha
+    """
+    )
+    token inputs:ri:Layer = "color" (
+        allowedTokens = ["texture", "color", "albedo", "NPRalbedo", "NPRtoonOut", "NPRhatchOut", "NPRlineOut", "NPRlineOutAlpha", "aov"]
+        connectability = "interfaceOnly"
+        displayName = "Layer"
+        doc = "<help />"
+    )
+    float inputs:ri:Mix = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mix"
+        doc = """0: disables this Canvas Node and shows previous node if daisy chained, or original beauty if no previous Stylized Looks nodes. 1: full Canvas from this node.
+  """
+    )
+    token inputs:ri:visualizer = "canvasFinal" (
+        allowedTokens = ["disable", "canvasFinal", "separator"]
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = """
+      Color Blend Signal: replace tex1-tex8 with RED, ORANGE, YELLOW, GREEN, BLUE, INDIGO, VIOLET, TORQOISE for previewing blending
+    """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrStylizedCanvas" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrStylizedHatching "PxrStylizedHatching" (
+    customData = {
+        string className = "StylizedHatching"
+    }
+    doc = """
+        Required AOVs: 
+        P 
+        Nn
+        diffuse
+        albedo
+        directSpecular
+        NPRalbedo
+        NPRlineAlbedo
+        NPRtextureCoords
+        NPRPtriplanar
+        NPRNtriplanar
+  """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    bool inputs:ri:alpha_black_hatch_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Hatch Mask"
+        doc = """
+        When using Light Mask, black areas of hatch are transparent to previously daisy-chained or physically based layers
+    """
+    )
+    bool inputs:ri:BG_Ignore_Alpha_Switch = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing:Canvas"
+        displayName = "Ignore Alpha"
+        doc = """
+        But BG Color or Texture on everything under Hatching, ignoring alpha
+    """
+    )
+    color3f inputs:ri:BGColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing:Canvas"
+        displayName = "Canvas Color"
+        doc = """
+      Background color outside of alpha
+    """
+    )
+    asset inputs:ri:BGTex = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing:Canvas"
+        displayName = "Canvas Texture"
+        doc = "Provide BG texture for outside alpha, if blank uses BG Color"
+    )
+    bool inputs:ri:blending_black = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "Last Texture is Black"
+        doc = """
+      After the darkest texture, tex8, add solid color black
+    """
+    )
+    float inputs:ri:blending_hold = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "Hold"
+        doc = """ Hold texture full value
+    """
+    )
+    token inputs:ri:blending_mode = "weighted" (
+        allowedTokens = ["mix", "weighted"]
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "Blending Mode"
+        doc = "<help />"
+    )
+    float inputs:ri:blending_overlap = 0.125 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "Overlap"
+        doc = """ Overlap of the Bell Curve weighting function. 0.125 is minimum and blends 2 textures, higher values blend more up to 8 textures.
+"""
+    )
+    bool inputs:ri:blending_white = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Blending"
+        displayName = "First Texture is White"
+        doc = """
+          After the lightest texture, tex1, add solid color white
+        """
+    )
+    bool inputs:ri:camera_range_mask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Camera Range Mask Switch"
+        doc = """
+        Mask out regular hatching (When Visualizer on Hatching On Color, Hatching Final) by Camera Range defined by Z_min and Z_max below
+    """
+    )
+    bool inputs:ri:Enable_Facing_Ratio_Frequency_Scale = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Frequency Scale by PxrStylizedControl"
+        doc = """
+            Frequency Scaling by facing ratio, UV, ... controlled in PxrStylizedControl.
+            Works on Screen and Triplanar projections with 1val Frequency Mode.
+            Facing Ratio/UV scaling saved in BLUE channel of NPRdistort from PxrStylizedControl.
+        """
+    )
+    float inputs:ri:Facing_Ratio_Frequency_Scale = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Frequency Scale"
+        doc = """
+        Scale Frequency by scaling set in PxrStylizedControl.
+        NPRdistort BLUE channel has scaling data.
+    """
+    )
+    float inputs:ri:Facing_Ratio_Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Frequency Scale Gamma"
+        doc = """
+        Apply Gamma to scaling data.
+    """
+    )
+    bool inputs:ri:flip_min_max = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Flip Min Max"
+        doc = """
+        Flip Cam Dist Z Min Max
+    """
+    )
+    bool inputs:ri:flip_tex = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Flip"
+        doc = "Flip"
+    )
+    float inputs:ri:Hatch_Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Gamma"
+        doc = """
+        Gamma (Contrast)
+    """
+    )
+    token inputs:ri:Hatch_On = "bg" (
+        allowedTokens = ["color", "bg", "multiply", "screen"]
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mode"
+        doc = """ Hatch on Color or previous layer (BG)
+    """
+    )
+    color3f inputs:ri:hatchColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Color"
+        displayName = "Color"
+        doc = """
+      Hatching color
+    """
+    )
+    token inputs:ri:hatchColorFrom = "colorSwatch" (
+        allowedTokens = ["colorSwatch", "NPRalbedoAOV", "albedoAOV", "NPRlineAlbedoAOV", "texture"]
+        connectability = "interfaceOnly"
+        displayGroup = "Color"
+        displayName = "Color From"
+        doc = """Select which AOV to determine the coloring of the hatching
+    """
+    )
+    token inputs:ri:hatching_aov_channel = "green" (
+        allowedTokens = ["red", "green", "blue"]
+        connectability = "interfaceOnly"
+        displayGroup = "Output"
+        displayName = "Channel"
+        doc = """Which channel to write grayscale hatching output to
+    """
+    )
+    string inputs:ri:hatching_aov_string = "NPRhatchOut" (
+        connectability = "interfaceOnly"
+        displayGroup = "Output"
+        displayName = "AOV"
+        doc = """
+      Name of a color AOV to use for this specific Hatching node. Default goes to GREEN channel of NPRhatchOut, use this for additional AOV support for use in compositing.
+    """
+    )
+    float inputs:ri:hatching_freq = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Frequency"
+        doc = """
+        Higher numbers = higher frequency. 
+        For screen start at 1. 
+        For triplanar start at 0.005.
+    """
+    )
+    token inputs:ri:hatching_freq_mode = "8Values" (
+        allowedTokens = ["1Value", "8Values", "camdistRange", "lightSignalRange"]
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Mode"
+        doc = "<help />"
+    )
+    float inputs:ri:hatching_freq_tex1 = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 1"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex2 = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 2"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex3 = 2.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 3"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex4 = 3 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 4"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex5 = 3.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 5"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex6 = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 6"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex7 = 4.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 7"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    float inputs:ri:hatching_freq_tex8 = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Hatching Freq Tex 8"
+        doc = """Higher numbers, higher frequency. For screen start at 1. For triplanar start at 0.005.
+    """
+    )
+    bool inputs:ri:hatchingMask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "PxrStylizedControl Mask"
+        doc = """Mult by hatching mask from PxrStylizedControl node in AOV NPRlineMask GREEN channel
+  """
+    )
+    asset inputs:ri:hatchingTex1 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 1"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex2 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 2"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex3 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 3"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex4 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 4"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex5 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 5"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex6 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 6"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex7 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 7"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTex8 = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatching Texture 8"
+        doc = "Provide COLOR texture"
+    )
+    asset inputs:ri:hatchingTexSetCustom = @@ (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Texture Set"
+        doc = """Provide Texture Set Directory
+        A texture set is the name of a directory of pre-organized textures.
+        We don't actually go searching the texture path for the files to validate, we
+        just rely on the naming convention for the eight filenames when they are a set.
+
+        For set named \"myset\" we assume that there is a directory on the
+        texture path named \"myset\" containing myset-01.tex, myset-02.tex, etc.
+        
+        Stock texture sets are like
+        [rmantree/lib/textures/]StylizedLooks/pxrStylized-woven/pxrStylized-woven-01.tex
+    """
+    )
+    token inputs:ri:hatchingTexSetStock = "StylizedLooks/pxrStylized-woven" (
+        allowedTokens = ["StylizedLooks/pxrStylized-aquatint", "StylizedLooks/pxrStylized-charcoal", "StylizedLooks/pxrStylized-crosshatch", "StylizedLooks/pxrStylized-curl", "StylizedLooks/pxrStylized-halftone", "StylizedLooks/pxrStylized-patches", "StylizedLooks/pxrStylized-random", "StylizedLooks/pxrStylized-scumble", "StylizedLooks/pxrStylized-splatter", "StylizedLooks/pxrStylized-stipple", "StylizedLooks/pxrStylized-wash", "StylizedLooks/pxrStylized-woven"]
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Texture Set"
+        doc = """
+    Select a hatching texture set from the built-in predefined collection.
+    """
+    )
+    token inputs:ri:hatchingTexType = "texSetStock" (
+        allowedTokens = ["texSetStock", "texSetCustom", "texIndividualFiles"]
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Type"
+        doc = """
+    Select the source for hatching textures.
+    """
+    )
+    color3f inputs:ri:HatchOnColor = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Hatch On Color"
+        doc = """
+      Ignore albedo color for base color, use this color on all objects
+    """
+    )
+    bool inputs:ri:hatchTex_invert_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Invert"
+        doc = """
+          Invert order of progression of hatch texture lookups. For diffuse signals, typically left OFF (default)
+      """
+    )
+    float inputs:ri:hatchTexClr_mix = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Hatch Tex Color Mix"
+        doc = "<help />"
+    )
+    bool inputs:ri:Invert_Signal = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Invert Signal"
+        doc = """
+        Invert Signal Energy
+    """
+    )
+    bool inputs:ri:light_mask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Input Mask"
+        doc = """
+        Use light aov defined in signal_aov_string above as mask for previously daisy-chained Stylized shaders and/or physically based lighting
+    """
+    )
+    float inputs:ri:Light_max_freq = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Light Max Hatch Frequency"
+        doc = "<help />"
+    )
+    float inputs:ri:Light_min_freq = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Light Min Hatch Frequency"
+        doc = "<help />"
+    )
+    float inputs:ri:NPR_mix = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mix"
+        doc = """0: disables this Hatching Node and shows previous node if daisy chained, or original beauty if no previous Stylized Looks nodes. 1: full Hatching from this node.
+  """
+    )
+    bool inputs:ri:progressive_tex_switch = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Progressive"
+        doc = """
+    Composites textures on top of each other if not originally created that way (each texture progressively is added to the previous one). 
+    <br />
+\t<br />
+    Useful when using 8-val frequency mode.
+  """
+    )
+    token inputs:ri:projection = "screen" (
+        allowedTokens = ["screen", "triplanar", "NPRtextureCoordsAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Projection"
+        doc = "<help />"
+    )
+    int inputs:ri:ramp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Input Remap"
+        displayName = "Ramp"
+        doc = "Ramp"
+    )
+    float[] inputs:ri:ramp_Floats = [0, 0, 1, 1] (
+        displayGroup = "Input:Input Remap"
+        hidden = true
+    )
+    token inputs:ri:ramp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Input:Input Remap"
+        hidden = true
+    )
+    float[] inputs:ri:ramp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Input:Input Remap"
+        hidden = true
+    )
+    bool inputs:ri:remapSplineSwitch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Input Remap"
+        displayName = "Enable Ramp"
+        doc = "Enable Ramp"
+    )
+    token inputs:ri:signal = "diffuse" (
+        allowedTokens = ["beauty", "diffuse", "directSpecular", "cameraRange", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal"
+        doc = """
+        Choose the input signal to run the hatching algorithm on. Typically light signals like diffuse, directSpecular. 
+        Camera Range - uses camera min and max depth set in paremeters below instead.
+        Custom AOV - type in color AOV in Signal String below.
+    """
+    )
+    string inputs:ri:signal_aov_string = "diffuse" (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal String"
+        doc = """
+      Name of a color AOV to use for the signal to hatching. Typically diffuse, can put any light AOV here. This AOV has to be setup in Maya/Katana/Houdini or DisplayFilter will exit.
+    """
+    )
+    float inputs:ri:Signal_Pre_Gain = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Input Remap"
+        displayName = "Gain"
+        doc = """ Gain on incoming signal
+    """
+    )
+    float inputs:ri:Signal_Pre_Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Input Remap"
+        displayName = "Gamma"
+        doc = """ Gamma on incoming signal
+    """
+    )
+    bool inputs:ri:Toon_Colors_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Textures"
+        displayName = "Toon Mode"
+        doc = "Toon Mode"
+    )
+    float inputs:ri:triplanar_blending = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar Blending"
+        doc = """0 - no blending, 1 - full blending
+    """
+    )
+    token inputs:ri:triplanar_N = "NPRNtriplanar" (
+        allowedTokens = ["NPRNtriplanar", "Nn", "__Nref", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar N"
+        doc = """
+      NPRNtriplanar - set with PxrStylizedControl
+      N - factory RenderMan N, make sure AOV exists in render
+      __Nref - normal rest position, must be set (Maya: Texture Reference Object) and AOV exists in render
+      string - custom string to use any N AOV that exists in render
+    """
+    )
+    string inputs:ri:triplanar_N_aov_string = "NPRNtriplanar" (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar N String"
+        doc = '''
+      Name of a color AOV to use for the triplanar blending of N. If set to "NPRNtriplanar": need to plug PxrManifold3d into PxrStylizedControl node to provide custom co-ordinate system. Can also be factory "N" "__Nref" if those AOVs are setup.
+    '''
+    )
+    token inputs:ri:triplanar_P = "NPRPtriplanar" (
+        allowedTokens = ["NPRPtriplanar", "P", "__Pref", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar P"
+        doc = '''
+      NPRPtriplanar - set with PxrStylizedControl to be P in "object" space
+      P - factory RenderMan P, make sure AOV exists in render
+      __Pref - rest position, must be set (Maya: Texture Reference Object) and AOV exists in render
+      string - custom string to use any P AOV that exists in render
+    '''
+    )
+    string inputs:ri:triplanar_P_aov_string = "NPRPtriplanar" (
+        connectability = "interfaceOnly"
+        displayGroup = "Projection"
+        displayName = "Triplanar P String"
+        doc = '''
+      Name of a color AOV to use for the triplanar blending of P. If set to "NPRPtriplanar": need to plug PxrManifold3d into PxrStylizedControl node to provide custom co-ordinate system. Can also be factory "P" "__Pref" "Pworld" if those AOVs are setup.
+    '''
+    )
+    token inputs:ri:visualizer = "hatchingFinal" (
+        allowedTokens = ["beauty", "hatchingFinal", "separator", "hatchingBlend", "diffuseEnergy", "triplanarTestColors", "colorBlendSignal"]
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = """
+      Color Blend Signal: replace tex1-tex8 with RED, ORANGE, YELLOW, GREEN, BLUE, INDIGO, VIOLET, TORQOISE for previewing blending
+    """
+    )
+    token inputs:ri:whiteShader = "albedoAOV" (
+        allowedTokens = ["signalAovMono", "signalAovAverage", "albedoAOV", "NPRalbedoAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Mode"
+        doc = """ Under the hood a white shader approximation is created based off the Signal AOV to drive the Hatching. By default using average of RGB components of Signal AOV, but can also divide Signal AOV lighting results with a pure albedo from NPRalbedo AOV or albedo AOV. If NPRalbedo AOV chosen, must set Albedo Color in Stylized Controller Pattern node.
+    """
+    )
+    token inputs:ri:z_depth_mode = "lineNZAOV" (
+        allowedTokens = ["lineNZAOV", "PAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Z Depth Mode"
+        doc = """ Slightly different Z depth data from these 2 sources
+      """
+    )
+    float inputs:ri:Z_max = 200 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Cam Dist Z Max"
+        doc = """ Linstep Max on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:Z_max_freq = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Z Max Hatch Frequency"
+        doc = "<help />"
+    )
+    float inputs:ri:Z_min = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Cam Dist Z Min"
+        doc = """ Linstep Min on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:Z_min_freq = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Camera Range"
+        displayName = "Z Min Hatch Frequency"
+        doc = "<help />"
+    )
+    uniform token ri:displayFilter:shaderId = "PxrStylizedHatching" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrStylizedLines "PxrStylizedLines" (
+    customData = {
+        string className = "StylizedLines"
+    }
+    doc = """
+        Required AOVs:
+
+         1) NPRoutline
+         2) NPRsections
+         3) NPRlineNZ
+         4) NPRlineCamdist
+         5) NPRalbedo
+         6) NPRlineAlbedo
+         7) NPRmask
+         8) NPRlineWidth
+         9) diffuse
+        10) albedo
+        11) NPRlineOut
+        12) NPRlineOutAlpha
+        13) sampleCount
+        14) NPRcurvature
+        15) NPRdistort
+"""
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    token inputs:ri:activation_function = "none" (
+        allowedTokens = ["none", "spline", "sigmoid", "slopeThreshold"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Activation"
+        doc = """Activation for line detection algorithm
+    """
+    )
+    float inputs:ri:Activation_Slope = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Slope"
+        doc = """Line Detection - Hardness of the line. Higher slope is harder line. See https://www.desmos.com/calculator/djcxrcxchc and modify t for threhold, s for slope
+    """
+    )
+    float inputs:ri:Activation_Threshold = 0.05 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Threshold"
+        doc = """Line Detection - Threshold to consider an edge. Default 0.05. See https://www.desmos.com/calculator/djcxrcxchc and modify t for threhold, s for slope
+    """
+    )
+    string inputs:ri:aov = "NPRsections" (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Data AOV"
+        doc = """
+      Name of a color AOV to do line detection on. Manually set if you want to test on your AOV.
+    """
+    )
+    bool inputs:ri:camdist_linstep_switch = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Linstep Switch"
+        doc = """ 
+        Use linstep Min Max values below on Z (blue channel from lineNZ)
+      """
+    )
+    float inputs:ri:camdist_Zmax = 100 (
+        connectability = "interfaceOnly"
+        displayName = "Cam Dist Z Max"
+        doc = """ Linstep Max on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:camdist_Zmin = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Cam Dist Z Min"
+        doc = """ Linstep Min on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:camdist_zscale = 0.04 (
+        connectability = "interfaceOnly"
+        displayName = "Z Scale"
+        doc = """ Scale Z (from lineNZ blue channel) for line detect
+    """
+    )
+    bool inputs:ri:camdist_zscale_switch = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Z Scale Switch"
+        doc = """ Use Z Scale
+      """
+    )
+    float inputs:ri:compModeMix = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mix"
+        doc = """
+    Mix this node to previous result
+  """
+    )
+    token inputs:ri:daisy_chain_comp = "over" (
+        allowedTokens = ["over", "plus", "multiply", "screen"]
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mode"
+        doc = """ Comp mode over previous result (if have previous daisy-chained Stylized nodes, or beauty)
+    """
+    )
+    bool inputs:ri:Dilate_Sort_Alpha_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Use Alpha"
+        doc = """ If object has alpha, the zero alpha on camera depth will be incorrect, switch to ON to mix between camera depth of object and Dilate_Sort_Max_Depth based on alpha
+      """
+    )
+    float inputs:ri:Dilate_Sort_Depth_Scale = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Depth Scale"
+        doc = """
+      Scale Z depth for sorting based on scene scale
+    """
+    )
+    float inputs:ri:Dilate_Sort_Max_Depth = 1000 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Dilate Sort Max Depth"
+        doc = """
+      Max Depth to consider for outside of alpha
+    """
+    )
+    float inputs:ri:Dilate_Sort_Radius = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Radius"
+        doc = """
+      How big of a radius to dilate Z-sorted signal. Larger values = longer render time. MAX size of 6: will clamp if over.
+    """
+    )
+    bool inputs:ri:Dilate_Sort_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Enable"
+        doc = """ If using signals to drive line thickness/color, need to dilate and sort by z depth to pickup correct signal since line detection goes half off geo.
+      """
+    )
+    token inputs:ri:Dilate_Sort_Weight_Type = "Bell Curve" (
+        allowedTokens = ["Bell Curve", "Hermite", "Clamp"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input:Dilation Sorting"
+        displayName = "Weight"
+        doc = """ During dilate sort, weighting
+      """
+    )
+    token inputs:ri:Distort_Filtering = "2x2" (
+        allowedTokens = ["off", "2x2"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Distort"
+        displayName = "Distort Filtering"
+        doc = "<help />"
+    )
+    bool inputs:ri:Distort_Negative_Remap = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Distort"
+        displayName = "Remap"
+        doc = """Assumes incoming signal to Distort UV is [0..1], remaps to [-1..1]
+  """
+    )
+    bool inputs:ri:Distort_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Distort"
+        displayName = "Enable"
+        doc = """Distort lines using Distort U V fractal plugged into PxrStylizedControl
+  """
+    )
+    float inputs:ri:Distort_UV_Scale = 15 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Distort"
+        displayName = "Offset"
+        doc = """
+  Scale UV Offsets from NPRdistort AOV
+"""
+    )
+    vector3f inputs:ri:HSV_Albedo = (0, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "HSV Albedo"
+        doc = """
+          HSV tint on Albedo color used to color lines
+      """
+    )
+    vector3f inputs:ri:HSV_Dark = (0, 1, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "HSV Dark"
+        doc = """
+          HSV
+      """
+    )
+    vector3f inputs:ri:HSV_Light = (0, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "HSV Light"
+        doc = """
+          HSV
+      """
+    )
+    bool inputs:ri:light_mask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Input Mask"
+        doc = """
+        Use AOV defined in Input Signal as mask for previously daisy-chained Stylized shaders and/or physically based lighting
+    """
+    )
+    float inputs:ri:Light_max_thickness = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "High Mult"
+        doc = """ Scale (multiply) Line Thickness by this value in light areas. Use Line Thickness From Lighting in Visualizer dropdown to preview signal.
+    """
+    )
+    bool inputs:ri:Light_min_max_thickness_invert = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Invert"
+        doc = """ Invert min max above: so thicker in shadows
+      """
+    )
+    float inputs:ri:Light_min_thickness = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Low Mult"
+        doc = """ Scale (multiply) Line Thickness by this value in shadows. Use Line Thickness From Lighting in Visualizer dropdown to preview signal.
+    """
+    )
+    token inputs:ri:light_response = "none" (
+        allowedTokens = ["none", "HSVLightDark", "lineColorShadow"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "Light Tint"
+        doc = """ Color lines by lighting
+    """
+    )
+    float inputs:ri:Light_thickness_gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Gamma"
+        doc = "<help />"
+    )
+    float inputs:ri:Line_Detect_Mutliplier = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Line Detect Multiplier"
+        doc = """ For Float Spline Ramp Activation of line detection, multiply user spline values
+    """
+    )
+    float inputs:ri:line_thickness_scale = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "PxrStylizedControl Scale"
+        doc = """
+      Globally scale line thickness. If you have line thickness set per object and they are all different values, and you up the resolution of the render, use this global scale to increase or decrease line thickness of all lines, since they are based on pixel width.
+    """
+    )
+    color3f inputs:ri:lineColor = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "Line Color"
+        doc = """
+      Lines color
+    """
+    )
+    token inputs:ri:lineColorFrom = "colorSwatch" (
+        allowedTokens = ["colorSwatch", "patternShader", "NPRalbedoAOV", "albedoAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "From"
+        doc = "<help />"
+    )
+    color3f inputs:ri:lineColorShadow = (0.5, 0.5, 0.5) (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Color"
+        displayName = "Line Color Shadow"
+        doc = """
+      Line color in dark/shadow areas
+    """
+    )
+    bool inputs:ri:lineMask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "PxrStylizedControl Mask"
+        doc = """ Mult by line mask from PxrStylizedControl pattern node in AOV NPRmask
+  """
+    )
+    float inputs:ri:linesGamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Gamma"
+        doc = """
+    After line detection happens, runs gamma on final lines.
+  """
+    )
+    bool inputs:ri:linesInside_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Lines Inside Alpha"
+        doc = """ Mult by alpha for only inside lines from line detect, don't go off geo. Premult.
+  """
+    )
+    float inputs:ri:lineThickness = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness"
+        displayName = "Thickness"
+        doc = """
+        Master Line Thickness, based on pixels
+    """
+    )
+    token inputs:ri:lineType = "sections" (
+        allowedTokens = ["outline", "sections", "lineNZ", "curvature", "camdist", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Type"
+        doc = """
+      outline - line on alpha of object
+      sections - line on random id
+      lineNZ - line on combination of X Y components of surface normal and Z depth, good for unit scale
+      curvature - line on change in surface normal
+      camdist - line on change in camera distance
+      aov - custom AOV defined below
+    """
+    )
+    bool inputs:ri:overwriteDataAOV = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Write To Type AOV"
+        doc = """
+        OFF: edge detection results go into NPRlineOutAlpha and NPRlineOut. ON: overwrite original signal, example writes back to NPRlineNZ/NPRsections/etc
+    """
+    )
+    int inputs:ri:ramp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection:Activation Spline Ramp"
+        displayName = "Ramp"
+        doc = "Ramp"
+    )
+    float[] inputs:ri:ramp_Floats = [0, 0, 1, 1] (
+        displayGroup = "Line Detection:Activation Spline Ramp"
+        hidden = true
+    )
+    token inputs:ri:ramp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Line Detection:Activation Spline Ramp"
+        hidden = true
+    )
+    float[] inputs:ri:ramp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Line Detection:Activation Spline Ramp"
+        hidden = true
+    )
+    string inputs:ri:shaderNotes = "Lines Stylization Display Filter" (
+        connectability = "interfaceOnly"
+        displayGroup = "Notes"
+        displayName = "Note"
+        doc = """
+        Required AOVs:
+
+         1) NPRoutline
+         2) NPRsections
+         3) NPRlineNZ
+         4) NPRlineCamdist
+         5) NPRalbedo
+         6) NPRlineAlbedo
+         7) NPRmask
+         8) NPRlineWidth
+         9) diffuse
+        10) albedo
+        11) NPRlineOut
+        12) NPRlineOutAlpha
+        13) sampleCount
+        14) NPRcurvature
+        15) NPRdistort
+    """
+    )
+    float inputs:ri:sigmoid_activation_offset = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Sigmoid Offset"
+        doc = """ See: https://www.desmos.com/calculator/1agy4wsmrh and modify offset variable o
+    """
+    )
+    float inputs:ri:sigmoid_activation_sharpness = 25 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Sigmoid Sharpness"
+        doc = """ See: https://www.desmos.com/calculator/1agy4wsmrh and modify sharpness variable a
+    """
+    )
+    float inputs:ri:sigmoid_offset = 0.3 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Sigmoid Offset"
+        doc = """ Offset from the midpoint for each sigmoid. Used for line thickness, the bigger the offset the thicker the weighting. See: https://www.desmos.com/calculator/g4jbxcvtqz and modify variable o
+    """
+    )
+    float inputs:ri:sigmoid_sharpness = 17 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Sigmoid Sharpness"
+        doc = """ Sharpness of the sigmoid pair. Used for softening/hardening the line edge. See: https://www.desmos.com/calculator/g4jbxcvtqz and modify variable a
+    """
+    )
+    token inputs:ri:signal = "diffuse" (
+        allowedTokens = ["beauty", "diffuse", "directSpecular", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal"
+        doc = """
+        Choose the input signal to use for the light signal to line color and line thickness by lighting. Typically diffuse, can put any light AOV here.
+        Camera Range - uses camera min and max depth set in paremeters below instead.
+        Custom AOV - type in color AOV in Signal String below.
+    """
+    )
+    string inputs:ri:signal_aov_string = "diffuse" (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal String"
+        doc = """
+      Name of a color AOV to use for the light signal to line color and line thickness by lighting. Typically diffuse, can put any light AOV here. This AOV has to be setup in Maya/Katana/Houdini or DisplayFilter will exit.
+    """
+    )
+    bool inputs:ri:thickness_from_lighting_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "by Lighting"
+        doc = """
+            Hot tips here!
+        """
+    )
+    bool inputs:ri:thickness_from_pattern_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "by PxrStylizedControl"
+        doc = """
+            Multiply Line Thickness by set here by Line Thickness set on PxrStylizedControl per object
+        """
+    )
+    bool inputs:ri:thickness_from_zdepth_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "by Z Depth"
+        doc = """
+            Hot tips here!
+        """
+    )
+    token inputs:ri:visualizer = "finalLinesBeauty" (
+        allowedTokens = ["beauty", "finalLinesBeauty", "separator", "finalLines", "finalLinesInvert", "finalLinesAlpha", "lineThicknessFromPattern", "lineThicknessFromLighting", "diffuseEnergy", "zCamdist", "distortFiltering"]
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = "<help />"
+    )
+    token inputs:ri:weight_type = "bellCurve" (
+        allowedTokens = ["bellCurve", "hermite", "doubleSigmoid"]
+        connectability = "interfaceOnly"
+        displayGroup = "Line Detection"
+        displayName = "Weight"
+        doc = """ During line detection weighting to get variance
+    """
+    )
+    token inputs:ri:whiteShader = "signalAovAverage" (
+        allowedTokens = ["signalAovAverage", "albedoAOV", "NPRalbedoAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Mode"
+        doc = """ 
+        Under the hood a white shader approximation is created based off the Signal AOV to drive the Hatching. By default using average of RGB components of Signal AOV, but can also divide Signal AOV lighting results with a pure albedo from NPRalbedo AOV or albedo AOV. If NPRalbedo AOV chosen, must set Albedo Color in PxrStylizedControl node.
+    """
+    )
+    float inputs:ri:Zmax = 200 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Cam Dist Z Max"
+        doc = """ Linstep Max on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:Zmax_thickness = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Z Max Thickness Scale"
+        doc = "<help />"
+    )
+    float inputs:ri:Zmin = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Cam Dist Z Min"
+        doc = """ Linstep Min on Z (blue channel from lineNZ)
+    """
+    )
+    float inputs:ri:Zmin_thickness = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Line Thickness:Line Thickness Remap"
+        displayName = "Z Min Thickness Scale"
+        doc = "<help />"
+    )
+    uniform token ri:displayFilter:shaderId = "PxrStylizedLines" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrStylizedToon "PxrStylizedToon" (
+    customData = {
+        string className = "StylizedToon"
+    }
+    doc = """
+        Required AOVs: diffuse albedo directSpecular NPRtoonOut NPRalbedo
+    """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    int inputs:ri:Artistic_Pattern = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Artistic From PxrStylizedControl"
+        doc = "Artistic From PxrStylizedControl"
+    )
+    vector3f inputs:ri:Artistic_Pos = (0, 1, 0) (
+        displayGroup = "Input"
+        displayName = "Rotation"
+        doc = """
+        Phsyical - reads sampled light Signal for Toon Stepping. 
+        Artistic - reads artistic ramp from PxrStylizedControl for Toon Stepping.
+    """
+    )
+    color3f inputs:ri:backgroundColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "BG Color"
+        doc = """
+      BG Color
+  """
+    )
+    int inputs:ri:colorRamp = 4 (
+        displayGroup = "Stepping"
+        displayName = "Color Spline Ramp"
+        doc = "Color Spline Ramp"
+    )
+    color3f[] inputs:ri:colorRamp_Colors = [(1, 1, 1), (1, 1, 1), (1, 1, 1), (1, 1, 1)] (
+        displayGroup = "Stepping"
+        hidden = true
+    )
+    token inputs:ri:colorRamp_Interpolation = "catmull-rom" (
+        allowedTokens = ["catmull-rom", "linear"]
+        displayGroup = "Stepping"
+        hidden = true
+    )
+    float[] inputs:ri:colorRamp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Stepping"
+        hidden = true
+    )
+    token inputs:ri:daisy_chain_comp = "over" (
+        allowedTokens = ["over", "plus", "multiply", "screen"]
+        connectability = "interfaceOnly"
+        displayGroup = "Compositing"
+        displayName = "Mode"
+        doc = """ Comp mode over previous result (if have previous daisy-chained Stylized nodes, or beauty)
+    """
+    )
+    color3f inputs:ri:darks = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Darks Color"
+        doc = """
+      Color to step to
+    """
+    )
+    float inputs:ri:HSV_Albedo_Darks_Hue = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Darks Hue"
+        doc = """
+            Tint Albedo Darks to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Darks_Sat = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Darks Sat"
+        doc = """
+            Tint Albedo Darks to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Darks_Val = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Darks Val"
+        doc = """
+            Tint Albedo Darks to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Lights_Hue = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Lights Hue"
+        doc = """
+            Tint Albedo Lights to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Lights_Sat = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Lights Sat"
+        doc = """
+            Tint Albedo Lights to match a shadow color
+        """
+    )
+    float inputs:ri:HSV_Albedo_Lights_Val = 1.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Lights Val"
+        doc = """
+            Tint Albedo Lights to match a shadow color
+        """
+    )
+    int inputs:ri:light_mask_switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Input Mask"
+        doc = """
+        Use light aov defined in signal_aov_string above as mask for previously daisy-chained Stylized shaders and/or physically based lighting.
+    """
+    )
+    int inputs:ri:ramp = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Float Ramp"
+        doc = "Float Ramp"
+    )
+    float[] inputs:ri:ramp_Floats = [0, 0, 1, 1] (
+        displayGroup = "Input Remap"
+        hidden = true
+    )
+    token inputs:ri:ramp_Interpolation = "linear" (
+        allowedTokens = ["linear", "catmull-rom", "bspline", "constant"]
+        displayGroup = "Input Remap"
+        hidden = true
+    )
+    float[] inputs:ri:ramp_Knots = [0, 0, 1, 1] (
+        displayGroup = "Input Remap"
+        hidden = true
+    )
+    token inputs:ri:Signal = "diffuse" (
+        allowedTokens = ["artistic", "diffuse", "occlusionIntegrator", "beauty", "aov"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Signal"
+        doc = ''' Signal to use for Toon Stepping
+        When Occlusion Integrator chosen - switch to PxrOcclusion in RenderMan Integrator
+        Custom AOV - name of a color AOV to use for the signal to toon shading. Typically "diffuse", can put any light AOV here. This AOV has to be setup in Maya/Katana/Houdini or DisplayFilter will exit.
+    '''
+    )
+    string inputs:ri:signal_aov_string = "diffuse" (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Custom AOV"
+        doc = """
+      Name of a color AOV to use for the signal to toon shading. Typically diffuse, can put any light AOV here. This AOV has to be setup in Maya/Katana/Houdini or DisplayFilter will exit.
+    """
+    )
+    float inputs:ri:Signal_Energy_Threshold_Max = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Threshold Max"
+        doc = """ 1 is off, values smaller than one remap the difference between Signal Energy and Albedo Color to be darker
+    """
+    )
+    float inputs:ri:Signal_Energy_Threshold_Min = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Threshold Min"
+        doc = """ 0 is off, values greater than 0 ignore small differences between Signal Energy and Albedo Color
+    """
+    )
+    float inputs:ri:Signal_Max = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Signal Max"
+        doc = """ Remap signal (lighting, artistic angle, ...) for steps
+    """
+    )
+    float inputs:ri:Signal_Min = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Signal Min"
+        doc = """ Remap signal (lighting, artistic angle, ...) for steps
+    """
+    )
+    float inputs:ri:Signal_Pre_Gain = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Gain"
+        doc = """ Gain on incoming signal
+        """
+    )
+    float inputs:ri:Signal_Pre_Gamma = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Gamma"
+        doc = """ Gamma on incoming signal
+        """
+    )
+    float inputs:ri:Smooth = 0.1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Smooth"
+        doc = """ Antialiasing between steps. Use on Physical or Artistic. Ignored on Artistic from PxrStylizedControl option (not needed).
+    """
+    )
+    int inputs:ri:Spline_Ramp_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Input Remap"
+        displayName = "Enable Float Ramp"
+        doc = "Enable Float Ramp"
+    )
+    token inputs:ri:Step_Mode = "albedo" (
+        allowedTokens = ["albedo", "lightToAlbedo", "darks", "stepModeColorRamp", "stepModeColorRampAlbedo"]
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Step Mode"
+        doc = "<help />"
+    )
+    bool inputs:ri:Toon_Mask_Switch = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Mask"
+        displayName = "Stylized Control Mask"
+        doc = """Mult by Toon mask from PxrStylizedControl node in AOV NPRlineMask BLUE channel
+  """
+    )
+    int inputs:ri:Toon_Steps = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Stepping"
+        displayName = "Steps"
+        doc = """
+        Number of steps to quantize signal (lighting or artistic angle)
+    """
+    )
+    token inputs:ri:visualizer = "toonDiffuseFinal" (
+        allowedTokens = ["beauty", "toonDiffuseFinal", "separator", "toonRamp", "diffuseEnergy", "albedo"]
+        connectability = "interfaceOnly"
+        displayName = "Result"
+        doc = "<help />"
+    )
+    token inputs:ri:whiteShader = "albedoAOV" (
+        allowedTokens = ["signalAovAverage", "albedoAOV", "NPRalbedoAOV"]
+        connectability = "interfaceOnly"
+        displayGroup = "Input"
+        displayName = "Grayscale Mode"
+        doc = """ Under the hood a white shader approximation is created based off the Signal AOV to drive the Toon response. 
+        By default using average of RGB components of Signal AOV, but can also extract Signal AOV lighting results with a pure albedo from NPRalbedo AOV or albedo AOV. 
+        If NPRalbedo AOV chosen, must set Albedo Color in Stylized Controller Pattern node. 
+        Ignored when using PxrOcclusion integrator.
+    """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrStylizedToon" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrWhitePointDisplayFilter "PxrWhitePointDisplayFilter" (
+    customData = {
+        string className = "WhitePointDisplayFilter"
+    }
+    doc = """
+        This display filter allows you to adjust the output colors so that the given color temperature is considered white.
+    """
+    inherits = </PxrDisplayFilterPluginBase>
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    color3f inputs:ri:manualWhitePoint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Adjust the image so that this color becomes the white value.
+        """
+    )
+    float inputs:ri:temperature = 6500 (
+        connectability = "interfaceOnly"
+        displayName = "Temperature"
+        doc = """
+            Allow the user to choose the color temperature of the light.
+            Unlike the basic light color this allows the user to easily
+            pick plausible light colors based on standard temperature
+            measurements.
+        """
+    )
+    bool inputs:ri:useManualWhitePoint = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Manual White Point?"
+        doc = """
+           This switch enables using the White Point below rather than rely on
+           color temperature for white balance.
+        """
+    )
+    uniform token ri:displayFilter:shaderId = "PxrWhitePointDisplayFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrDebugShadingContext "PxrDebugShadingContext" (
+    customData = {
+        string className = "DebugShadingContext"
+    }
+    doc = '''
+        This integrator is used to visualize data in the shading
+        context, such as normals and texture coordinates. It is not
+        designed to produce "final-quality" images.
+    '''
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    token inputs:ri:viewchannel = "Nn" (
+        allowedTokens = ["Nn", "Vn", "VLen", "Tn", "InsideOutside", "st", "dsdu_dtdv", "dsdv_dtdu", "uv", "dudv", "LightLeaks", "P", "dPdu", "dPdv", "dPdtime", "id", "Ngn", "Po", "NoN", "mpSize"]
+        connectability = "interfaceOnly"
+        doc = """
+\t   The data to visualize from the shading context.
+        """
+    )
+    uniform token ri:integrator:shaderId = "PxrDebugShadingContext" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrDefault "PxrDefault" (
+    customData = {
+        string className = "Default"
+    }
+    doc = '''
+        Even simpler than PxrDirectLighting, the default integrator
+        places a virtual light at the camera (the "headlamp
+        integrator"). No shadows or indirect lighting are evaluated. A
+        good option when all is black - this integrator can help
+        narrow down where a problem is occurring (for example, when
+        the fault is in the lighting, particularly). Like
+        PxrDirectLighting, it is not designed to produce
+        "final-quality" images.
+    '''
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    uniform token ri:integrator:shaderId = "PxrDefault" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrDirectLighting "PxrDirectLighting" (
+    customData = {
+        string className = "DirectLighting"
+    }
+    doc = """
+        This is a debugging or \"draft-quality\" integrator that
+        implements only the direct lighting portion of the light
+        transport. It is not designed to produce \"final-quality\"
+        images. Since it doesn't implement indirect lighting paths it
+        cannot produce reflections, refractions, or other global
+        illumination effects, nor can it handle any effects that
+        require a volume integrator.
+    """
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    int inputs:ri:numBxdfSamples = 4 (
+        connectability = "interfaceOnly"
+        doc = """
+    Controls the number of Bxdf samples for direct illumination per
+    camera hit point. The default is 4.
+        """
+    )
+    int inputs:ri:numLightSamples = 4 (
+        connectability = "interfaceOnly"
+        doc = """
+    Controls the number of light samples for direct illumination per
+    camera hit point. The default is 4.
+        """
+    )
+    uniform token ri:integrator:shaderId = "PxrDirectLighting" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrOcclusion "PxrOcclusion" (
+    customData = {
+        string className = "Occlusion"
+    }
+    doc = """
+        Render occlusion.
+    """
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    float inputs:ri:cosineSpread = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Cosine Spread"
+        doc = """
+            Sample spread for cosine distribution. The default of 1 gives Lambertian distribution.
+        """
+    )
+    int inputs:ri:distribution = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Sample Distribution"
+        doc = """
+            Sample distribution can be uniform, cosine, or reflection. Reflection means that
+            the sample directions are generated by the Bxdfs. The default is cosine.
+        """
+    )
+    float inputs:ri:falloff = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Falloff"
+        doc = """
+            Falloff values greater than zero create a softer look. The default is 0.
+        """
+    )
+    float inputs:ri:maxDistance = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Max Distance"
+        doc = """
+            The max distance at which objects may occlude. The default of 0 is infinite.
+        """
+    )
+    int inputs:ri:numSamples = 4 (
+        connectability = "interfaceOnly"
+        displayName = "Num Samples"
+        doc = """
+            Controls the number of occlusion samples per camera hit point. The default is 4.
+        """
+    )
+    bool inputs:ri:useAlbedo = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Use Albedo"
+        doc = """
+            Tint occlusion by material albedo. The default is 0 (off).
+        """
+    )
+    uniform token ri:integrator:shaderId = "PxrOcclusion" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrPathTracer "PxrPathTracer" (
+    customData = {
+        string className = "PathTracer"
+    }
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    bool inputs:ri:accumOpacity = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Accumulate Opacity"
+        doc = """
+        Controls whether or not the path tracer
+        will keep track of accumulated opacity
+        along the path. The default is off. (Not implemented in XPU.)
+        """
+    )
+    bool inputs:ri:allowCaustics = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Allow Caustics"
+        doc = """
+        Controls whether illumination from
+        caustic light paths (that is, specular
+        illumination onto diffuse surfaces) is
+        allowed or disallowed.
+        The default is off.
+        """
+    )
+    int inputs:ri:clampDepth = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Indirect Clamping"
+        displayName = "Depth"
+        doc = """
+            If a value for the clampLuminance parameter is specified, then
+            clampDepth controls the ray depth at which to begin clamping
+            based on the per-ray luminance. For example, setting this
+            parameter to 2 and also specifying a value of 4 for
+            clampLuminance will ensure that the luminance of each ray's
+            contribution is no more than 4 for all indirect illumination,
+            without affecting or clamping the direct illumination. The
+            default is 2. (Not implemented in XPU.)
+            """
+    )
+    float inputs:ri:clampLuminance = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Indirect Clamping"
+        displayName = "Luminance"
+        doc = """
+            By default the PxrPathTracer integrator clamps the luminance
+            of each per-ray contribution to be at most 10.0. However, it
+            is possible to change this behavior by specifying a different
+            value for the clampLuminance parameter. Specifying a
+            relatively low value for the clampLuminance parameter (for
+            example, between 2 and 20) can greatly speed up convergence
+            and, in many cases, will make PxrPathTracer converge more
+            quickly than the more sophisticated PxrVCM integrator. In some
+            cases, indirect illumination lights paths may be noticeably
+            dimmer due to clamping; this may be an acceptable trade-off in
+            certain cases. Setting this parameter to a very large number
+            (such as 1e30) will effectively disable all clamping. The
+            default is 10.0. (Not implemented in XPU.)
+            """
+    )
+    bool inputs:ri:jointSampling = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Joint Sampling"
+        doc = """
+                Enables joint importance sampling of visibility and light sources.
+                This should be enabled for scenes with light sources near volumes and for scenes with non-thick volumes (alpha < 0.99).
+                For thick volumes (alpha near 1) lit only by distant light sources, there is a performance benefit to disabling joint sampling. (Not implemented in XPU.)
+            """
+    )
+    float inputs:ri:jointScatteringBias = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Joint Scattering Bias"
+        doc = """
+                By default, the joint sampling method will choose to scatter light proportionally to the opacity of each ray. This probability can be increased by raising the bias value (which does not bias the render itself), at the cost of undersampling objects behind the volume. For renders containing only volumes, this can be set to 1.0 to force a scatter event on all rays, even for thin volumes. (Not implemented in XPU.)
+            """
+    )
+    int inputs:ri:maxContinuationLength = -1 (
+        connectability = "interfaceOnly"
+        displayName = "Continuation Depth"
+        doc = """
+    Similar to maxIndirectBounces, this controls the upper bound on the
+    maximum ray depth -- but including continuation rays. Any negative value
+    will cause the path tracer to use an empirical heuristic to bound
+    the ray depth. A positive value will override this heuristic and
+    cause the path tracer to use the parameter value directly as the
+    maximum ray depth. Continuation rays are normally produced by
+    volumes when no density exists within subsections of them. If there
+    are many such zero density subsections overlapping then it is
+    possible to quickly hit the maximum continuation depth quickly,
+    resulting in black regions within your render.
+    The default is -1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:maxIndirectBounces = 8 (
+        connectability = "interfaceOnly"
+        displayName = "Max Indirect Bounces"
+        doc = '''
+            The maximum number of bounces of indirect illumination in your scene.
+            0 means direct illumination only, 1 means one bounce of indirect, etc.
+            Note: this parameter is one less than the old PxrPathTracer parameter
+            called "maxPathLength" -- the new name is more descriptive, and is
+            consistent with other integrators.
+            The default is 8.
+        '''
+    )
+    int inputs:ri:maxNonStochasticOpacityEvents = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Stochastic Opacity Depth"
+        doc = '''
+    Defines the camera ray depth for which opacity
+    calculations are computed with no noise (using
+    continuation rays). Once this depth is exceeded,
+    the opacity computation will switch to a stochastic
+    "presence" style of opacity, which may introduce
+    noise.
+    The default is 0. (Not implemented in XPU.)
+        '''
+    )
+    int inputs:ri:numBxdfSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "BXDF Samples"
+        doc = """
+    Controls the number of Bxdf samples for direct
+    illumination per camera hit point.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numDiffuseSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Diffuse Samples"
+        doc = """
+    When sampleMode is set to manual, controls the
+    number of indirect diffuse reflection rays to
+    spawn per camera hit point. Ignored when
+    sampleMode is set to Bxdf.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numIndirectSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Indirect Samples"
+        doc = """
+    When sampleMode is set to Bxdf this parameter
+    controls the total number of indirect rays to
+    spawn per camera hit point. When sampleMode is
+    set to manual the value of this parameter is
+    ignored.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numLightSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Light Samples"
+        doc = """
+    Controls the number of light samples for direct
+    illumination per camera hit point.
+    The default is 1.
+        """
+    )
+    int inputs:ri:numRefractionSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Refraction Samples"
+        doc = """
+    When sampleMode is set to manual, controls
+    the number of refraction/transmission rays
+    to spawn per camera hit point. Ignored when
+    sampleMode is set to Bxdf.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numSpecularSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Specular Samples"
+        doc = """
+    When sampleMode is set to manual, controls
+    the number of indirect specular/glossy
+    reflection rays to spawn per camera hit
+    point. Ignored when sampleMode is set to
+    Bxdf.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numSubsurfaceSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Subsurface Samples"
+        doc = """
+    When sampleMode is set to manual, controls
+    the number of subsurface rays to spawn per
+    camera hit point. Ignored when sampleMode
+    is set to Bxdf.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:numVolumeAggregateSamples = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Volume Aggregate Samples"
+        doc = """
+    Controls the number of volume aggregate samples for direct
+    illumination taken on the first ray segment.
+    The default is 1. (Not implemented in XPU.)
+        """
+    )
+    bool inputs:ri:risPathGuiding = 0 (
+        connectability = "interfaceOnly"
+        displayName = "RIS path guiding"
+        doc = """
+        Uses learned results to guide directions
+        for indirect path sampling. Can only be
+        used if light selection learning is also on
+        The default is off. (Not implemented in XPU.)
+        """
+    )
+    int inputs:ri:rouletteDepth = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Russian Roulette"
+        displayName = "Depth"
+        doc = """
+            The path length at which the integrator will begin
+            performing Russian roulette (a method of probabilistically
+            terminating a ray path). Decreasing this setting will lead
+            to shorter paths and faster renders, but will result in
+            more noise.
+            """
+    )
+    float inputs:ri:rouletteThreshold = 0.2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Russian Roulette"
+        displayName = "Threshold"
+        doc = """
+            The path throughput threshold below which Russian roulette
+            is applied. It is usually preferable to apply Russian
+            roulette only to paths of low importance in order to avoid
+            noise. Increasing this setting will apply Russian roulette
+            to more paths and thus increase the speed of the render,
+            but will also increase noise.
+            """
+    )
+    token inputs:ri:sampleMode = "bxdf" (
+        allowedTokens = ["manual", "bxdf"]
+        connectability = "interfaceOnly"
+        displayName = "Sample Mode"
+        doc = '''
+    Controls the strategy for how indirect ray counts are apportioned
+    between diffuse vs. glossy vs. specular Bxdf lobes. Valid values
+    for this parameter are: "bxdf" or "manual". If "sampleMode" is set
+    to "bxdf", then the Bxdf is responsible for balancing the number
+    of indirect rays that will be spawned at each camera hit point
+    between the diffuse vs. glossy vs. specular lobes, and the total
+    number of indirect rays spawned at each camera hit point will be
+    controlled by the numIndirectSamples parameter. If "sampleMode" is
+    set to "manual" the user is responsible for explicitly specifying
+    the number of indirect rays to spawn per Bxdf lobe at each camera
+    hit point via the numDiffuseSamples, numSpecularSamples,
+    numSubsurfaceSamples, and numRefractionSamples parameters.
+    The default is "bxdf". (Not implemented in XPU.)
+        '''
+    )
+    string inputs:ri:volumeAggregate = "globalVolumeAggregate" (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Volume Aggregate Name"
+        doc = "Specifies the name of the global volume aggregate to use for rendering."
+    )
+    string inputs:ri:volumeAggregateCamera = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Camera Aggregate Override"
+        doc = "Overrides the global aggregate name for camera rays. If left empty, the global volume aggregate will be used."
+    )
+    string inputs:ri:volumeAggregateIndirect = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Indirect Aggregate Override"
+        doc = "Overrides the global aggregate name for indirect rays. If left empty, the global volume aggregate will be used."
+    )
+    string inputs:ri:volumeAggregateTransmission = "" (
+        connectability = "interfaceOnly"
+        displayGroup = "Aggregate Volumes"
+        displayName = "Transmission Aggregate Override"
+        doc = "Overrides the global aggregate name for transmission rays. If left empty, the global volume aggregate will be used."
+    )
+    uniform token ri:integrator:shaderId = "PxrPathTracer" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrVCM "PxrVCM" (
+    customData = {
+        string className = "VCM"
+    }
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    int inputs:ri:clampDepth = 2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Indirect Clamping"
+        doc = """
+          If a value for the clampLuminance parameter is specified, then
+          clampDepth controls the ray depth at which to begin clamping
+          based on the per-ray luminance. For example, setting this
+          parameter to 2 and also specifying a value of 4 for
+          clampLuminance will ensure that the luminance of each ray's
+          contribution is no more than 4 for all indirect illumination,
+          without affecting or clamping the direct illumination. The
+          default is 2.
+        """
+    )
+    float inputs:ri:clampLuminance = 10 (
+        connectability = "interfaceOnly"
+        displayGroup = "Indirect Clamping"
+        doc = """
+          By default the PxrPathTracer integrator clamps the luminance
+          of each per-ray contribution to be at most 10.0. However, it
+          is possible to change this behavior by specifying a different
+          value for the clampLuminance parameter. Specifying a
+          relatively low value for the clampLuminance parameter (for
+          example, between 2 and 20) can speed up convergence. In some
+          cases, indirect illumination lights paths may be noticeably
+          dimmer due to clamping; this may be an acceptable trade-off in
+          certain cases. Setting this parameter to a very large number
+          (such as 1e30) will effectively disable all clamping. The
+          default is 10.0.
+          Note that changing the mergeRadius will/can change the smoothness
+          of the illumination and hence the clamping.
+        """
+    )
+    bool inputs:ri:connectPaths = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        When on, bidirectional path tracing is enabled;
+        otherwise, VCM will operate as a forward path tracer (if
+        merging is also disabled). Recommended for most scenes,
+        especially interior scenes with significant indirect
+        illumination.  On by default.
+      """
+    )
+    int inputs:ri:maxIndirectBounces = 8 (
+        connectability = "interfaceOnly"
+        displayName = "Max Indirect Bounces"
+        doc = '''
+            The maximum number of bounces of indirect illumination in your scene.
+            0 means direct illumination only, 1 means one bounce of indirect, etc.
+            Note: this parameter is one less than the old PxrVCM parameter
+            called "maxPathLength" -- the new name is more descriptive, and is
+            consistent with other integrators.
+            The default is 8.
+        '''
+    )
+    bool inputs:ri:mergePaths = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        Controls vertex merging, which improves the convergence of
+        specular-diffuse-specular (caustic) lighting. Enabling
+        vertex merging is generally recommended but may result in
+        additional time and memory overhead for photons, and in
+        scenes with little specular-diffuse-specular transport,
+        may be unnecessary.  On by default.
+      """
+    )
+    float inputs:ri:mergeRadius = 5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Vertex Merging"
+        doc = """
+          Initial radius used in vertex merging.  It is measured in screen
+          space pixels (not world space).  Increasing this radius will lead to
+          increased blurring of the photons, which is helpful in reducing
+          noisy caustics. However, this will also slow down merging,
+          and will also require more iterations in order to arrive at
+          a bias-free result.
+        """
+    )
+    int inputs:ri:numBxdfSamples = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        The number of bxdf samples taken when computing direct
+        illumination. The default is ``1``.
+      """
+    )
+    int inputs:ri:numLightSamples = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        The number of light samples taken when computing direct
+        illumination. The default is ``1``.
+      """
+    )
+    float inputs:ri:photonGuiding = 0 (
+        connectability = "interfaceOnly"
+        displayGroup = "Photon Guiding"
+        doc = """
+          Sets the probability of using photon guiding during photon emission.
+          A value of 0.0 turns off photon guiding.  A value between 0.0 and
+          1.0 will cause a combination of photon guiding and standard photon
+          emission. Finally, a value of 1 means that only photon
+          guiding will be used -- in that case photons will be emitted only
+          towards the specified bounding box, which may result in rendering of
+          biased images. The default value is 0.0.
+        """
+    )
+    point3f inputs:ri:photonGuidingBBoxMax = (-1e30, -1e30, -1e30) (
+        connectability = "interfaceOnly"
+        displayGroup = "Photon Guiding"
+        doc = """
+          These two parameters can be used to explicitly specify the bounding
+          box (in world space coordinates) towards which more photons should be
+          emitted. If this bounding box is
+          not specified, it will be computed automatically as a (slightly loose)
+          bounding box of the directly visible parts of the scene.
+        """
+    )
+    point3f inputs:ri:photonGuidingBBoxMin = (1e30, 1e30, 1e30) (
+        connectability = "interfaceOnly"
+        displayGroup = "Photon Guiding"
+    )
+    int inputs:ri:rouletteDepth = 4 (
+        connectability = "interfaceOnly"
+        displayGroup = "Russian Roulette"
+        doc = """
+          The path length at which the integrator will begin
+          performing Russian roulette (a method of probabilistically
+          terminating a ray path). Decreasing this setting will lead
+          to shorter paths and faster renders, but will result in
+          more noise.
+        """
+    )
+    float inputs:ri:rouletteThreshold = 0.2 (
+        connectability = "interfaceOnly"
+        displayGroup = "Russian Roulette"
+        doc = """
+          The path throughput threshold below which Russian roulette
+          is applied. It is usually preferable to apply Russian
+          roulette only to paths of low importance in order to avoid
+          noise. Increasing this setting will apply Russian roulette
+          to more paths and thus increase the speed of the render,
+          but will also increase noise.
+        """
+    )
+    float inputs:ri:timeRadius = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Vertex Merging"
+        doc = """
+          Specifies the maximum interval in time (as a fraction of
+          the shutter) over which photons are merged. The default
+          value of 1.0 may cause smearing for caustics involving
+          moving objects. Decreasing the timeRadius will lead to
+          more accurate results/decreased smearing for motion
+          blurred caustics, at the cost of static objects requiring
+          more photons in order to resolve caustics.
+        """
+    )
+    uniform token ri:integrator:shaderId = "PxrVCM" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrValidateBxdf "PxrValidateBxdf" (
+    customData = {
+        string className = "ValidateBxdf"
+    }
+    doc = """
+       This integrator serves mainly as a debugging tool to authors of
+       Bxdf plugins. The 3 channels of the output are the luminance
+       results for total hemispherical reflectance, computed in three
+       different ways: the red channel gives the results of using the
+       Bxdf's GenerateSample method to sample the bxdf; the green
+       channel gives the results of running the Bxdf's EvaluateSample
+       (or EvaluateSamplesAtIndex) method using the same generated
+       samples, and only accumulating them if they agree with the
+       values returned by GenerateSample; and the blue channel gives
+       the results of integrating a set of hemispherical samples
+       generated with a cosine weighting using the EvaluateSample
+       method on the bxdf. Ideally, this will converge to the other
+       two results.
+
+       If the Bxdf is given \"white\" values and is correct, the
+       resulting image should converge to all white pixels. Energy
+       lost (either due to explicit absorption or due to the bxdf
+       model losing energy) or gained shows up as non-white
+       pixels. Bxdf authors should take care to observe what happens
+       at grazing angles, as that can be a good place to lose energy.
+    """
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    int inputs:ri:numSamples = 4 (
+        connectability = "interfaceOnly"
+        doc = """
+    Controls the number of Bxdf samples to generate and evaluate per ray. The default is 4.
+        """
+    )
+    uniform token ri:integrator:shaderId = "PxrValidateBxdf" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrVisualizer "PxrVisualizer" (
+    customData = {
+        string className = "Visualizer"
+    }
+    doc = """
+        A utility integrator to navigate and inspect large scenes interactively.
+        Can also be used for modeling or animation turntables and in general to
+        detect geometric problems in your scenes.
+    """
+    inherits = </PxrIntegratorPluginBase>
+)
+{
+    asset inputs:ri:matCap = @@ (
+        connectability = "interfaceOnly"
+        displayName = "MatCap Texture"
+        doc = '''
+        Material capture environment map used when style is "matcap".
+        The surface normal is used to look up a color in this texture. 
+        (Not implemented in XPU.)
+        '''
+    )
+    bool inputs:ri:normalCheck = 0 (
+        connectability = "interfaceOnly"
+        doc = """
+        Colors geometry with inverted normals bright orange.
+        """
+    )
+    bool inputs:ri:normalMap = 0 (
+        connectability = "interfaceOnly"
+        doc = """
+        Maps normal's coordinates from [-1;1] to [0;1] to avoid black colors.
+        """
+    )
+    string inputs:ri:shadedPrimVar = "displayColor" (
+        connectability = "interfaceOnly"
+        displayName = "Shaded PrimVar"
+        doc = '''
+        Tint color for "shaded" style. (Not implemented in XPU.)
+        '''
+    )
+    token inputs:ri:style = "shaded" (
+        allowedTokens = ["bxdf", "shaded", "flat", "normals", "objectnormals", "st", "matcap"]
+        connectability = "interfaceOnly"
+        doc = """
+        bxdf: renders the scene as if the scene was lit with a single light at
+          the camera's position.
+        shaded: Simple N dot V shading. Normals are flipped if inverted.
+          (In RIS it is shadedColor * |VdotN| + 0.025 with default shadedColor = 0.7.
+           In XPU it is simply |VdotN|.)
+        flat: Uses a random flat color based on the object's id.
+        normals: displays normals in camera space.
+        objectnormals: displays normals in object space.
+        st: normalized st coordinates. Handy to visualize UDIM tiles.
+        matcap: material capture. Uses the surface normal to look up color in
+          an environment map.
+        """
+    )
+    bool inputs:ri:wireframe = 1 (
+        connectability = "interfaceOnly"
+        doc = """
+        Overlays wireframe. The default is on.
+        """
+    )
+    color3f inputs:ri:wireframeColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayGroup = "Wireframe Settings"
+        displayName = "Wireframe Color"
+        doc = "Wireframe Color"
+    )
+    float inputs:ri:wireframeOpacity = 0.5 (
+        connectability = "interfaceOnly"
+        displayGroup = "Wireframe Settings"
+        displayName = "Wireframe Opacity"
+        doc = "Wireframe Opacity"
+    )
+    float inputs:ri:wireframeWidth = 1 (
+        connectability = "interfaceOnly"
+        displayGroup = "Wireframe Settings"
+        displayName = "Wireframe Width"
+        doc = "Wireframe Width"
+    )
+    uniform token ri:integrator:shaderId = "PxrVisualizer" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrBackgroundSampleFilter "PxrBackgroundSampleFilter" (
+    customData = {
+        string className = "BackgroundSampleFilter"
+    }
+    doc = """
+    Sample filter plugin to color the background.
+  """
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    color3f inputs:ri:backgroundColor = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Background Color"
+        doc = """
+        Color of the background.
+    """
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrBackgroundSampleFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrCopyAOVSampleFilter "PxrCopyAOVSampleFilter" (
+    customData = {
+        string className = "CopyAOVSampleFilter"
+    }
+    doc = """
+    Sample filter plugin to look up a named AOV and copy it
+    to Ci.
+  """
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    string inputs:ri:readAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Read AOV"
+        doc = "Name of AOV to read from."
+    )
+    string inputs:ri:writeAov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "Write AOV"
+        doc = "Name of AOV to write to."
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrCopyAOVSampleFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrCryptomatte "PxrCryptomatte" (
+    customData = {
+        string className = "Cryptomatte"
+    }
+    doc = """
+    Sample filter to generate Cryptomatte files for easy creation of
+    keyable ID mattes.  See https://github.com/Psyop/Cryptomatte for tools
+    and details.
+  """
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    int inputs:ri:accuracy = 4 (
+        connectability = "interfaceOnly"
+        displayName = "Accuracy"
+        doc = """
+      The number of extra id/coverage pairs computed but not stored.  Up to
+      a point, increasing this produces a better estimate for pixels where
+      there are many objects, but it does so at the expense of memory.
+    """
+    )
+    string inputs:ri:attribute = "" (
+        connectability = "interfaceOnly"
+        displayName = "Attribute"
+        doc = '''
+      Name of the string attribute used to group objects and identify them
+      in the manifest.  This will also be used to name the layer in the
+      Cryptomatte file.  Only has an effect when "Layer" is set to
+      "Attribute".
+    '''
+    )
+    string inputs:ri:filename = "cryptomatte.exr" (
+        connectability = "interfaceOnly"
+        displayName = "Filename"
+        doc = """
+      Name of the EXR file to write the Cryptomatte to.
+    """
+    )
+    token inputs:ri:layer = "identifier:name" (
+        allowedTokens = ["identifier:object", "identifier:name", "user:__materialid", "Attribute"]
+        connectability = "interfaceOnly"
+        displayName = "Layer"
+        doc = """
+      What property to use to group objects and identify them in the
+      manifest.  This will also be used to name the layer in the
+      Cryptomatte file.
+    """
+    )
+    int inputs:ri:levels = 6 (
+        connectability = "interfaceOnly"
+        displayName = "Levels"
+        doc = """
+      The number of id/coverage pairs to store in the Cryptomatte file.
+    """
+    )
+    token inputs:ri:manifest = "header" (
+        allowedTokens = ["none", "header", "sidecar"]
+        connectability = "interfaceOnly"
+        displayName = "Manifest"
+        doc = """
+      Where to store the object manifest.  Select 'None' if you do not wish
+      to store a manifest at all.
+    """
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrCryptomatte" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrFilmicTonemapperSampleFilter "PxrFilmicTonemapperSampleFilter" (
+    customData = {
+        string className = "FilmicTonemapperSampleFilter"
+    }
+    doc = """
+        Sample filter plugin based on Naughty Dog's Filmic Tonemapper from GDC Uncharted 2 HDR Lighting presentation.
+    """
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    float inputs:ri:A = 0.22 (
+        connectability = "interfaceOnly"
+        displayName = "Shoulder"
+        doc = """
+            Shoulder strength.
+        """
+    )
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    float inputs:ri:B = 0.3 (
+        connectability = "interfaceOnly"
+        displayName = "Linear"
+        doc = """
+            Linear strength.
+        """
+    )
+    float inputs:ri:C = 0.1 (
+        connectability = "interfaceOnly"
+        displayName = "Linear Angle"
+        doc = """
+            Linear angle.
+        """
+    )
+    float inputs:ri:D = 0.2 (
+        connectability = "interfaceOnly"
+        displayName = "Toe"
+        doc = """
+            Toe strength.
+        """
+    )
+    float inputs:ri:E = 0.01 (
+        connectability = "interfaceOnly"
+        displayName = "Toe Numerator"
+        doc = """
+            Toe numerator.
+        """
+    )
+    float inputs:ri:exposureAdjust = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Exposure Adjustment"
+        doc = """
+            Exposure adjustment. This parameter is multiplied by the incoming
+            pixel.
+        """
+    )
+    float inputs:ri:F = 0.3 (
+        connectability = "interfaceOnly"
+        displayName = "Toe Denominator"
+        doc = """
+            Toe denominator.
+        """
+    )
+    float inputs:ri:linearWhitePoint = 11.2 (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Linear white point value.
+        """
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrFilmicTonemapperSampleFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrGradeSampleFilter "PxrGradeSampleFilter" (
+    customData = {
+        string className = "GradeSampleFilter"
+    }
+    doc = """
+        Nuke-like grade sample filter. Allows simple grading of the beauty pass.
+    """
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    color3f inputs:ri:blackPoint = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Black Point"
+        doc = """
+            Ci is remapped so that this color becomes 0.
+        """
+    )
+    bool inputs:ri:clampBlack = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Clamp Black"
+        doc = """
+            Clamp Ci so that no value is less than 0. This is useful for compositing so that adding channels will not result in unexpected results.
+        """
+    )
+    bool inputs:ri:clampWhite = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Clamp White"
+        doc = """
+            Clamp Ci so that no value exceeds 1.
+        """
+    )
+    color3f inputs:ri:gain = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Gain"
+        doc = """
+            Multiply Ci by this color.
+        """
+    )
+    color3f inputs:ri:gamma = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Gamma"
+        doc = """
+            Gamma Ci by this color.
+        """
+    )
+    color3f inputs:ri:lift = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Lift"
+        doc = """
+            Add this value to Ci.
+        """
+    )
+    color3f inputs:ri:mask = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Mask"
+        doc = """
+            Mask the color correction result with this color.
+        """
+    )
+    color3f inputs:ri:multiply = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Multiply"
+        doc = """
+            Multiply Ci by this color.
+        """
+    )
+    color3f inputs:ri:offset = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Offset"
+        doc = """
+            Offset Ci (Ci + offset) by this color.
+        """
+    )
+    color3f inputs:ri:whitePoint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Ci is remapped so that this color becomes 1.
+        """
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrGradeSampleFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrImagePlaneFilter "PxrImagePlaneFilter" (
+    customData = {
+        string className = "ImagePlaneFilter"
+    }
+    doc = "Sample filter plugin to render image planes including holdouts."
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    color3f inputs:ri:colorGain = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "Color Gain"
+        doc = "Color gain."
+    )
+    color3f inputs:ri:colorOffset = (0, 0, 0) (
+        connectability = "interfaceOnly"
+        displayName = "Color Offset"
+        doc = "Color offset."
+    )
+    asset inputs:ri:filename = @@ (
+        connectability = "interfaceOnly"
+        displayName = "Filename"
+        doc = "The name of the plate image to display."
+    )
+    float inputs:ri:filmMaxX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Right"
+        doc = "Film window max X"
+    )
+    float inputs:ri:filmMaxY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Top"
+        doc = "Film window max Y"
+    )
+    float inputs:ri:filmMinX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Left"
+        doc = "Film window min X"
+    )
+    float inputs:ri:filmMinY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Film Window Bottom"
+        doc = "Film window min Y"
+    )
+    int inputs:ri:fit = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Fit"
+        doc = "Fit image to display."
+    )
+    string inputs:ri:holdoutShadowAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Holdout Shadow AOV"
+        doc = "The name of the holdout shadow AOV to look up."
+    )
+    bool inputs:ri:linearize = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Linearize"
+        doc = "Linearize"
+    )
+    float inputs:ri:offsetX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset X"
+        doc = "Offset in X."
+    )
+    float inputs:ri:offsetY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset Y"
+        doc = "Offset in Y."
+    )
+    float inputs:ri:rotate = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Rotate"
+        doc = "Rotation."
+    )
+    float inputs:ri:scaleX = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale X"
+        doc = "Scale in X."
+    )
+    float inputs:ri:scaleY = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale Y"
+        doc = "Scale in Y."
+    )
+    bool inputs:ri:useAlpha = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Use Alpha"
+        doc = "Applies alpha from the image plane to the beauty image"
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrImagePlaneFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrSampleFilterCombiner "PxrSampleFilterCombiner" (
+    customData = {
+        string className = "SampleFilterCombiner"
+    }
+    doc = """
+        Sample filter combiner.
+    """
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    token inputs:ri:filter (
+        displayName = "Sample Filter"
+        doc = """
+            Sample filters.
+        """
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrSampleFilterCombiner" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrShadowFilter "PxrShadowFilter" (
+    customData = {
+        string className = "ShadowFilter"
+    }
+    doc = "Sample filter plugin to calculate shadow AOV output from occluded and unoccluded AOV inputs."
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    string inputs:ri:occludedAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Occluded AOV"
+        doc = "The name of the occluded AOV to look up."
+    )
+    string inputs:ri:shadowAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Shadow AOV"
+        doc = "The name of the shadow AOV to write to."
+    )
+    string inputs:ri:unoccludedAov = "" (
+        connectability = "interfaceOnly"
+        displayName = "Unoccluded AOV"
+        doc = "The name of the unoccluded AOV to look up."
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrShadowFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrWatermarkFilter "PxrWatermarkFilter" (
+    customData = {
+        string className = "WatermarkFilter"
+    }
+    doc = "Sample filter plugin to add watermarks to renders."
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    asset inputs:ri:filename = @@ (
+        connectability = "interfaceOnly"
+        displayName = "Filename"
+        doc = "The name of the plate image to display."
+    )
+    int inputs:ri:fit = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Fit"
+        doc = "Fit image to display."
+    )
+    bool inputs:ri:linearize = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Linearize"
+        doc = "Linearize"
+    )
+    int inputs:ri:mode = 3 (
+        connectability = "interfaceOnly"
+        displayName = "Mode"
+        doc = "Watermark blend modes."
+    )
+    float inputs:ri:offsetX = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset X"
+        doc = "Offset in X."
+    )
+    float inputs:ri:offsetY = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Offset Y"
+        doc = "Offset in Y."
+    )
+    float inputs:ri:rotate = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Rotate"
+        doc = "Rotation."
+    )
+    float inputs:ri:scaleX = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale X"
+        doc = "Scale in X."
+    )
+    float inputs:ri:scaleY = 1 (
+        connectability = "interfaceOnly"
+        displayName = "Scale Y"
+        doc = "Scale in Y."
+    )
+    float inputs:ri:transparency = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Transparency"
+        doc = "Transparency"
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrWatermarkFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class PxrWhitePointSampleFilter "PxrWhitePointSampleFilter" (
+    customData = {
+        string className = "WhitePointSampleFilter"
+    }
+    doc = """
+        This sample filter allows you to adjust the output colors so that the given color temperature is considered white.
+    """
+    inherits = </PxrSampleFilterPluginBase>
+)
+{
+    string inputs:ri:aov = "Ci" (
+        connectability = "interfaceOnly"
+        displayName = "AOV"
+        doc = "Name of AOV to apply filter to."
+    )
+    color3f inputs:ri:manualWhitePoint = (1, 1, 1) (
+        connectability = "interfaceOnly"
+        displayName = "White Point"
+        doc = """
+            Adjust the image so that this color becomes the white value.
+        """
+    )
+    float inputs:ri:temperature = 6500 (
+        connectability = "interfaceOnly"
+        displayName = "Temperature"
+        doc = """
+            Allow the user to choose the color temperature of the light.
+            Unlike the basic light color this allows the user to easily
+            pick plausible light colors based on standard temperature
+            measurements.
+        """
+    )
+    bool inputs:ri:useManualWhitePoint = 0 (
+        connectability = "interfaceOnly"
+        displayName = "Manual White Point?"
+        doc = """
+           This switch enables using the White Point below rather than rely on
+           color temperature for white balance.
+        """
+    )
+    uniform token ri:sampleFilter:shaderId = "PxrWhitePointSampleFilter" (
+        displayGroup = "Internal"
+    )
+}
+
+class "PxrDspyDeepExrAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyDeepExrAPI"
+    }
+    doc = """
+        Saves the image to a deep OpenEXR file.
+    """
+    inherits = </APISchemaBase>
+)
+{
+    int ri:displayDriver:asrgba = 1 (
+        displayName = "As RGBA"
+        doc = "As RGBA"
+    )
+    token ri:displayDriver:compression = "zips" (
+        allowedTokens = ["none", "rle", "zips"]
+        displayName = "Compression"
+        doc = "Compression"
+    )
+    float ri:displayDriver:forcepar = 0 (
+        displayName = "Force PAR"
+        doc = "Force PAR"
+    )
+    int ri:displayDriver:metadatacount = 0
+    token ri:displayDriver:storage = "scanline" (
+        allowedTokens = ["tiled", "scanline"]
+        displayName = "Storage"
+        doc = "Storage"
+    )
+    token ri:displayDriver:type = "half" (
+        allowedTokens = ["half", "float"]
+        displayName = "Type"
+        doc = "Type"
+    )
+}
+
+class "PxrDspyItAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyItAPI"
+    }
+    doc = '''
+        Render to the "it" framebuffer.
+    '''
+    inherits = </APISchemaBase>
+)
+{
+}
+
+class "PxrDspyNullAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyNullAPI"
+    }
+    doc = """
+        Null display driver. No image will be written. 
+    """
+    inherits = </APISchemaBase>
+)
+{
+}
+
+class "PxrDspyOpenExrAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyOpenExrAPI"
+    }
+    doc = """
+        Saves the image to an OpenEXR file.
+    """
+    inherits = </APISchemaBase>
+)
+{
+    int ri:displayDriver:asrgba = 1 (
+        displayName = "As RGBA"
+        doc = '''
+            If turned on, this flag causes the driver to try to rename a subset of the channels to RGBAZ. Try using this if your image viewer or compositing software swaps around channels (such as red or blue) incorrectly. The driver will rename any input channel named "Ci" to "RGB", any input channel named "a" to "A", and any input channel named "z" to "Z". If no such input channels exist with those names, the first four channels will be renamed to "RGBA". Use the "asgrbacolorchannel" and "asrgbaaplhachannel" parameters to choose which input channels get renamed.
+        '''
+    )
+    string ri:displayDriver:asrgbaalphachannel = "" (
+        displayName = '"A" float channel'
+        doc = '''
+            If set, this parameter causes the driver to rename the input channel of that name to "A". Setting this value will also cause "asrgba" to be assumed to be on.
+        '''
+    )
+    string ri:displayDriver:asrgbacolorchannel = "" (
+        displayName = '"RGB" color channel'
+        doc = '''
+            If set, this parameter causes the driver to rename the input channel of that name to "RGB". Setting this value will also cause "asrgba" to be assumed to be on.
+        '''
+    )
+    token ri:displayDriver:autocrop = "false" (
+        allowedTokens = ["false", "true"]
+        displayName = "Autocrop"
+        doc = "Autocrop"
+    )
+    token ri:displayDriver:compression = "zips" (
+        allowedTokens = ["none", "rle", "zip", "zips", "piz", "pixar", "b44", "b44a", "dwaa", "dwab"]
+        displayName = "Compression"
+        doc = "Compression"
+    )
+    float ri:displayDriver:compressionlevel = 45 (
+        displayName = "Compression Level"
+        doc = "Compression Level"
+    )
+    token ri:displayDriver:exrpixeltype = "half" (
+        allowedTokens = ["half", "float"]
+        displayName = "Type"
+        doc = "Type"
+    )
+    float ri:displayDriver:forcepar = 0 (
+        displayName = "Force PAR"
+        doc = "Force PAR"
+    )
+    int ri:displayDriver:metadatacount = 0
+    token ri:displayDriver:storage = "scanline" (
+        allowedTokens = ["scanline", "tiled"]
+        displayName = "Storage"
+        doc = "Storage"
+    )
+}
+
+class "PxrDspyPngAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyPngAPI"
+    }
+    doc = """
+        Saves the image to a PNG file.
+    """
+    inherits = </APISchemaBase>
+)
+{
+    int ri:displayDriver:quantize = 1 (
+        displayName = "Quantize"
+        doc = "Quantize"
+    )
+}
+
+class "PxrDspyPointCloudAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyPointCloudAPI"
+    }
+    doc = """
+        Render to a RenderMan pointcloud file.
+    """
+    inherits = </APISchemaBase>
+)
+{
+}
+
+class "PxrDspyTargaAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyTargaAPI"
+    }
+    doc = """
+        Saves the image to a TARGA file.
+    """
+    inherits = </APISchemaBase>
+)
+{
+    int ri:displayDriver:quantize = 1 (
+        displayName = "Quantize"
+        doc = "Quantize"
+    )
+}
+
+class "PxrDspyTextureAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyTextureAPI"
+    }
+    doc = """
+        Saves the image to a texture file.
+        - Images rendered using this display driver must have power of two
+          dimensions - no attempt will be made to resize the image when using
+          this driver.
+    """
+    inherits = </APISchemaBase>
+)
+{
+    token ri:displayDriver:compression = "lossless" (
+        allowedTokens = ["none", "lossless", "lossy"]
+        displayName = "Compression"
+        doc = "Compression"
+    )
+    token ri:displayDriver:exrcompression = "DWAa" (
+        allowedTokens = ["none", "rle", "zip", "zips", "piz", "pixar", "B44", "B44A", "DWAa", "DWAb"]
+        displayName = "EXR Compression"
+        doc = "EXR Compression"
+    )
+    float ri:displayDriver:exrcompressionlevel = 45 (
+        displayName = "EXR Compression Level"
+        doc = "EXR Compression Level"
+    )
+    token ri:displayDriver:exrpixeltype = "half" (
+        allowedTokens = ["half", "float"]
+        displayName = "EXR Bit Depth"
+        doc = "EXR Bit Depth"
+    )
+    token ri:displayDriver:format = "pixar" (
+        allowedTokens = ["pixar", "openexr", "tiff"]
+        displayName = "Texture Format"
+        doc = "Texture Format"
+    )
+    token ri:displayDriver:smode = "black" (
+        allowedTokens = ["black", "clamp", "periodic"]
+        displayName = "S Wrap Mode"
+        doc = "S Wrap Mode"
+    )
+    token ri:displayDriver:tmode = "black" (
+        allowedTokens = ["black", "clamp", "periodic"]
+        displayName = "T Wrap Mode"
+        doc = "T Wrap Mode"
+    )
+    token ri:displayDriver:type = "byte" (
+        allowedTokens = ["byte", "short", "float"]
+        displayName = "Bit Depth"
+        doc = "Bit Depth"
+    )
+}
+
+class "PxrDspyTiffAPI" (
+    customData = {
+        token[] apiSchemaCanOnlyApplyTo = ["RenderProduct"]
+        string apiSchemaType = "singleApply"
+        string className = "DspyTiffAPI"
+    }
+    doc = '''
+        Saves the image to a Tagged Image File Format (TIFF).
+        It can be used to store "r", "rgb", "rgba", "rgbz", and "rgbaz" images
+        in 8, 16, or floating point 32-bit-per-component resolutions.
+    '''
+    inherits = </APISchemaBase>
+)
+{
+    token ri:displayDriver:compression = "lzw" (
+        allowedTokens = ["none", "lzw", "packbits", "deflate", "pixarlog"]
+        displayName = "Compression"
+        doc = "Compression"
+    )
+    token ri:displayDriver:format = "float32" (
+        allowedTokens = ["uint8", "uint16", "float32"]
+        displayName = "Format"
+        doc = "Format"
+    )
+    int ri:displayDriver:quantize = 1 (
+        displayName = "Quantize"
+        doc = "Quantize"
+    )
+    token ri:displayDriver:resolution (
+        displayGroup = "Advanced"
+        displayName = "Resolution"
+        doc = "Resolution"
+    )
+    token ri:displayDriver:resolutionunit = "none" (
+        allowedTokens = ["none", "centimeters", "inches"]
+        displayGroup = "Advanced"
+    )
+}
+
diff --git a/third_party/renderman-26/shaders/CMakeLists.txt b/third_party/renderman-26/shaders/CMakeLists.txt
new file mode 100644
index 0000000000..0def89445a
--- /dev/null
+++ b/third_party/renderman-26/shaders/CMakeLists.txt
@@ -0,0 +1,35 @@
+if(NOT TARGET hdPrman)
+  message(STATUS "Skipping RenderMan shaders, hdPrman required")
+  return()
+endif()
+
+set(PXR_INSTALL_SUBDIR "plugin/usd/resources")
+
+function(prman_osl SHADER_NAME SHADER_DIR)
+    set(infile ${SHADER_DIR}/${SHADER_NAME}.osl)
+    set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${SHADER_NAME}.oso)
+    add_custom_command(
+        OUTPUT ${outfile}
+        COMMAND ${RENDERMAN_BINARY_DIR}/oslc -o ${outfile} ${infile}
+        MAIN_DEPENDENCY ${infile}
+        VERBATIM
+    )
+    add_custom_target(${SHADER_NAME}_target DEPENDS ${outfile})
+    add_dependencies(hdPrman ${SHADER_NAME}_target)
+    install(
+        PROGRAMS ${outfile}
+        DESTINATION ${PXR_INSTALL_SUBDIR}/shaders
+    )
+endfunction()
+
+set(shader_dir "${PROJECT_SOURCE_DIR}/pxr/usdImaging/plugin/usdShaders/shaders")
+prman_osl(UsdPreviewSurfaceParameters ${CMAKE_CURRENT_SOURCE_DIR})
+if (${PXR_ENABLE_MATERIALX_SUPPORT})
+prman_osl(StandardSurfaceParameters ${CMAKE_CURRENT_SOURCE_DIR})
+prman_osl(DisplacementParameters ${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+prman_osl(UsdUVTexture ${shader_dir})
+prman_osl(UsdPrimvarReader_float ${shader_dir})
+prman_osl(UsdPrimvarReader_float2 ${shader_dir})
+prman_osl(UsdPrimvarReader_float3 ${shader_dir})
+
diff --git a/pxr/base/vt/functions.cpp b/third_party/renderman-26/shaders/DisplacementParameters.osl
similarity index 70%
rename from pxr/base/vt/functions.cpp
rename to third_party/renderman-26/shaders/DisplacementParameters.osl
index 780c2fc359..3021e26e57 100644
--- a/pxr/base/vt/functions.cpp
+++ b/third_party/renderman-26/shaders/DisplacementParameters.osl
@@ -1,5 +1,5 @@
 //
-// Copyright 2016 Pixar
+// Copyright 2022 Pixar
 //
 // Licensed under the Apache License, Version 2.0 (the "Apache License")
 // with the following modification; you may not use this file except in
@@ -21,4 +21,23 @@
 // KIND, either express or implied. See the Apache License for the specific
 // language governing permissions and limitations under the Apache License.
 //
-#include "pxr/base/vt/functions.h"
+shader DisplacementParameters
+(
+    // Inputs
+    float displacement = 0.0,
+    float scale = 1.0,
+
+    // Displacement output
+    output float dispAmountOut = 0.0
+        [[ string widget = "null" ]],
+    output float dispScalarOut = 0.0
+        [[ string widget = "null" ]],
+)
+{
+    // Displacement
+    if (displacement != 0.0)
+    {
+        dispAmountOut = scale;
+        dispScalarOut = displacement;
+    }
+}
diff --git a/third_party/renderman-26/shaders/StandardSurfaceParameters.osl b/third_party/renderman-26/shaders/StandardSurfaceParameters.osl
new file mode 100644
index 0000000000..b4e3219441
--- /dev/null
+++ b/third_party/renderman-26/shaders/StandardSurfaceParameters.osl
@@ -0,0 +1,416 @@
+//
+// Copyright 2021 Pixar
+//
+// Licensed under the Apache License, Version 2.0 (the "Apache License")
+// with the following modification; you may not use this file except in
+// compliance with the Apache License and the following modification to it:
+// Section 6. Trademarks. is deleted and replaced with:
+//
+// 6. Trademarks. This License does not grant permission to use the trade
+//    names, trademarks, service marks, or product names of the Licensor
+//    and its affiliates, except as required to comply with Section 4(c) of
+//    the License and to reproduce the content of the NOTICE file.
+//
+// You may obtain a copy of the Apache License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Apache License with the above modification is
+// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the Apache License for the specific
+// language governing permissions and limitations under the Apache License.
+//
+
+////////////////////////////////////////////////////////////////////////////////
+// MaterialX OSL Functions
+
+void mx_artistic_to_complex_ior(
+    color reflectivity, 
+    color edge_color, 
+    output vector ior, 
+    output vector extinction)
+{
+    color r = clamp(reflectivity, 0.0, 0.99);
+    color r_sqrt = sqrt(r);
+    color n_min = (1.0 - r) / (1.0 + r);
+    color n_max = (1.0 + r_sqrt) / (1.0 - r_sqrt);
+    ior = mix(n_max, n_min, edge_color);
+
+    color np1 = ior + 1.0;
+    color nm1 = ior - 1.0;
+    color k2 = (np1*np1 * r - nm1*nm1) / (1.0 - r);
+    k2 = max(k2, 0.0);
+    extinction = sqrt(k2);
+}
+
+void mx_luminance_color3(color in, color lumacoeffs, output color result)
+{
+    result = dot(in, lumacoeffs);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Standard Surface Adapter 
+shader StandardSurfaceParameters
+(
+    // Inputs
+    float base = 0.8,
+    color base_color = color(1.0, 1.0, 1.0),
+    float diffuse_roughness = 0.0,
+    
+    float metalness = 0.0,
+    float specular = 1.0,
+    color specular_color = color(1.0, 1.0, 1.0),
+    float specular_roughness = 0.2,
+    float specular_IOR = 1.5,
+    float specular_anisotropy = 0.0,
+    float specular_rotation = 0.0,
+
+    float transmission = 0.0,
+    color transmission_color = color(1.0, 1.0, 1.0),
+    float transmission_depth = 0.0,
+    color transmission_scatter = color(0.0, 0.0, 0.0),
+    float transmission_scatter_anisotropy = 0.0,
+    color opacity = color(1.0, 1.0, 1.0),
+
+    float subsurface_value = 0.0,
+    color subsurface_color = color(1.0, 1.0, 1.0),
+    color subsurface_radius = color(1.0, 1.0, 1.0),
+    float subsurface_scale = 1.0,
+    float subsurface_anisotropy = 0.0,
+    int thin_walled = 0
+        [[ string widget = "boolean" ]],
+
+    float sheen = 0.0,
+    color sheen_color = color(1.0, 1.0, 1.0),
+    float sheen_roughness = 0.3,
+
+    float coat = 0.0,
+    color coat_color = color(1.0, 1.0, 1.0),
+    float coat_roughness = 0.1,
+    float coat_anisotropy = 0.0,
+    float coat_rotation = 0.0,
+    float coat_IOR = 1.5,
+    float coat_affect_color = 0.0,
+    float coat_affect_roughness = 0.0,
+
+    float thin_film_thickness = 0.0,
+    float thin_film_IOR = 1.5,
+
+    float emission_value = 0.0,
+    color emission_color = color(1.0, 1.0, 1.0),
+
+    normal normalIn = normal(0.0, 0.0, 0.0),
+
+    // Diffuse outputs
+    output float diffuseGainOut = 0.0
+        [[ string widget = "null" ]],
+    output color diffuseColorOut = color(1.0,1.0,1.0)
+        [[ string widget = "null" ]],
+    output float diffuseRoughnessOut = 0.0
+        [[ string widget = "null" ]],
+
+    // Specular outputs
+    output int specularFresnelModeOut = 1   // "Physical"
+        [[ string widget = "null" ]],
+    output int specularModelTypeOut = 1     // "GGX"
+        [[ string widget = "null" ]],
+    output color specularFaceColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output color specularEdgeColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output float specularRoughnessOut = 0.0
+        [[ string widget = "null" ]],
+    output color specularIorOut = color(0.0)
+        [[ string widget = "null" ]],
+    output color specularExtinctionCoeffOut = color(0.0)
+        [[ string widget = "null" ]],
+    output float specularAnisotropyOut = 0.0
+        [[ string widget = "null" ]],
+
+    // Clearcoat outputs - clearCoatFresnelMode defaults to "Artistic"
+    output int clearcoatModelTypeOut = 1 // "GGX"
+        [[ string widget = "null" ]],
+    output color clearcoatFaceColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output color clearcoatEdgeColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output float clearcoatRoughnessOut = 0.0
+        [[ string widget = "null" ]],
+    output float clearcoatAnisotropyOut = 0.0
+        [[ string widget = "null" ]],
+
+    // Emissive outputs
+    output float glowGainOut = 0.0
+        [[ string widget = "null" ]],
+    output color glowColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+
+    // Transmission outputs
+    output float reflectionGainOut = 0.0
+        [[ string widget = "null" ]],
+    output float refractionGainOut = 0.0
+        [[ string widget = "null" ]],
+    output color refractionColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output float glassIorOut = 0.0
+        [[ string widget = "null" ]],
+    output float glassRoughnessOut = 0.1
+        [[ string widget = "null" ]],
+    output float glassAnisotropyOut = 0.0
+        [[ string widget = "null" ]],
+    output int thinGlassOut = 0
+        [[ string widget = "null" ]],
+    output color ssAlbedoOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output color extinctionOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output float g0Out = 0.0
+        [[ string widget = "null" ]],
+
+    // Subsurface outputs
+    output float subsurfaceGainOut = 0.0
+        [[ string widget = "null" ]],
+    output color subsurfaceColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output float subsurfaceDmfpOut = 10.0
+        [[ string widget = "null" ]],
+    output color subsurfaceDmfpColorOut = color(1.0,1.0,1.0)
+        [[ string widget = "null" ]],
+    output float subsurfaceDirectionalityOut = 0.0
+        [[ string widget = "null" ]],
+    output float diffuseTransmitGainOut = 0.0
+        [[ string widget = "null" ]],
+    output color diffuseTransmitColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output int diffuseDoubleSidedOut = 0
+        [[ string widget = "null" ]],
+    
+    // Fuzz outputs
+    output float fuzzGainOut = 0.0
+        [[ string widget = "null" ]],
+    output color fuzzColorOut = color(1.0,1.0,1.0)
+        [[ string widget = "null" ]],
+    output float fuzzConeAngleOut = 8.0
+        [[ string widget = "null" ]],
+
+    // Iridescence outputs
+    output int iridescenceModeOut = 1 // Physical
+        [[ string widget = "null" ]],
+    output float iridescenceFaceGainOut = 0.0
+        [[ string widget = "null" ]],
+    output float iridescenceEdgeGainOut = 0.0
+        [[ string widget = "null" ]],
+    output float iridescenceThicknessOut = 0.0
+        [[ string widget = "null" ]],
+
+    // Normal outputs
+    output normal bumpNormalOut = normal(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+)
+{
+    color base_color_out = base_color;
+    color specular_color_out = specular_color;
+    color subsurface_color_out = subsurface_color;
+    color emission_color_out = emission_color;
+    float specular_roughness_out = specular_roughness;
+    float specular_IOR_out = specular_IOR;
+
+    // Clearcoat
+    if (coat > 0.0 && (coat_color[0] > 0.0 ||
+                       coat_color[1] > 0.0 ||
+                       coat_color[2] > 0.0)) 
+    {
+        float r = (1.0 - coat_IOR) / (1.0 + coat_IOR);
+        color coat_attenuation = mix(color(1.0, 1.0, 1.0), coat_color, coat);
+        clearcoatFaceColorOut = coat * r * r * coat_attenuation;
+        clearcoatEdgeColorOut = coat * coat_attenuation;
+        clearcoatRoughnessOut = coat_roughness;
+
+        // StandardSurface applies coat_attenuation to the base/specular layers
+        // and emission
+        base_color_out *= coat_attenuation;
+        emission_color_out *= coat_attenuation;
+
+        // Optional Parameters
+        clearcoatAnisotropyOut = coat_anisotropy;
+
+        // Saturate the deeper layers with the coat_affect_color parameter
+        base_color_out = pow(base_color_out, 1.0 + (coat * coat_affect_color));
+        subsurface_color_out = pow(subsurface_color_out, 
+                                   1.0 + (coat * coat_affect_color));
+
+        // Increase the roughness with the coat_affect_roughness parameter
+        specular_roughness_out = mix(specular_roughness_out, 
+                                 1.0, 
+                                 coat * coat_affect_roughness * coat_roughness);
+    }
+
+    // Iridescence
+    if (thin_film_thickness > 0.0 && thin_walled == 0)
+    {
+        iridescenceFaceGainOut = 1.0;
+        iridescenceEdgeGainOut = 1.0;
+        iridescenceThicknessOut = thin_film_thickness;
+        specular_IOR_out = thin_film_IOR;
+    }
+
+    // Emission 
+    if (emission_value > 0.0 && (emission_color_out[0] > 0.0 ||
+                                 emission_color_out[1] > 0.0 ||
+                                 emission_color_out[2] > 0.0))
+    {
+        glowGainOut = emission_value;
+        glowColorOut = emission_color_out;
+    }
+
+    // Diffuse
+    if (base_color_out[0] > 0.0 || 
+        base_color_out[1] > 0.0 || 
+        base_color_out[2] > 0.0)
+    {
+        diffuseGainOut = base;
+        diffuseColorOut = base_color_out;
+        diffuseRoughnessOut = diffuse_roughness;
+    }
+
+    // Specular
+    if (specular_color_out[0] > 0.0 ||
+        specular_color_out[1] > 0.0 ||
+        specular_color_out[2] > 0.0) 
+    {
+        float metal = clamp(metalness, 0.0, 1.0);
+        float r = (1.0 - specular_IOR_out) / (1.0 + specular_IOR_out);
+        
+        // StandardSurface uses the specular color as the edge color for 
+        // non-metals, relies on the ior/extinction values for metals 
+        specularEdgeColorOut = mix(specular * specular_color_out,
+                                   color(1.0),
+                                   metal);
+        specularFaceColorOut = base * base_color_out;
+        specularFaceColorOut *= mix(r * r, 1.0, metal);
+        specularRoughnessOut = specular_roughness_out;
+
+        // Specular Ior and Extinction
+        color artistic_ior_ior = color(0.0);
+        color artistic_ior_extinction = color(0.0);
+        mx_artistic_to_complex_ior(base_color_out * base, 
+                                   specular_color_out * specular,
+                                   artistic_ior_ior, artistic_ior_extinction);
+        specularIorOut = mix( color(specular_IOR_out), 
+                              artistic_ior_ior, 
+                              metal);
+        specular_IOR_out = specularIorOut[0];
+        specularExtinctionCoeffOut = mix( color(0.0),
+                                          artistic_ior_extinction, 
+                                          metal);
+
+        // Optional StandardSurface Anisotropy Parameters
+        // XXX ignoring specular_rotation
+        // specular_anisotropy range: 0 to 1
+        // PxrSurface anisotropy range: -1 to 1
+        specularAnisotropyOut = specular_anisotropy;
+        diffuseGainOut *= (1.0 - metal);
+    }
+
+    // Subsurface
+    if (subsurface_value > 0 && (subsurface_color_out[0] > 0.0 ||
+                                 subsurface_color_out[1] > 0.0 ||
+                                 subsurface_color_out[2] > 0.0)) 
+    {
+        // Diffuse Transmission 
+        diffuseDoubleSidedOut = 1;
+        diffuseTransmitGainOut = subsurface_value;
+        diffuseTransmitColorOut = subsurface_color_out;
+
+        // Subsurface Scattering when thin_walled is off 
+        if (!thin_walled) {
+            subsurfaceGainOut = subsurface_value;
+            subsurfaceColorOut = subsurface_color_out;
+            subsurfaceDmfpColorOut = subsurface_radius;
+            subsurfaceDmfpOut = subsurface_scale;
+            subsurfaceDirectionalityOut = subsurface_anisotropy;
+        }
+
+        // Scale back the diffuseGain by the subsurface_value
+        diffuseGainOut *= (1.0 - subsurface_value);
+    }
+
+    // Sheen
+    if (sheen > 0 && (sheen_color[0] > 0.0 ||
+                      sheen_color[1] > 0.0 ||
+                      sheen_color[2] > 0.0)) 
+    {
+        fuzzGainOut = sheen;
+        fuzzColorOut = sheen_color;
+
+        // XXX This is an inaccurate translation from sheen_roughness to 
+        // fuzzConeAngle since the corresponding calculations use different 
+        // formulas, and there is no simple mapping between the parameters. 
+        // sheen_roughness range: 0 to 1, fuzzConeAngle range: 0 to 32
+        fuzzConeAngleOut = 32 * sheen_roughness;
+
+        // Subsurface layer intensity reduced by the Sheen
+        diffuseTransmitGainOut *= (1 - sheen);
+        subsurfaceGainOut *= (1 - sheen);
+    }
+
+    // Transmission
+    if (transmission > 0 && (transmission_color[0] > 0.0 ||
+                              transmission_color[1] > 0.0 ||
+                              transmission_color[2] > 0.0))
+    {
+        color transmission_color_out = (transmission_depth == 0) 
+                                        ? transmission_color : color(1.0);
+        reflectionGainOut = transmission;
+        refractionGainOut =  transmission;
+        refractionColorOut = transmission_color_out;
+
+        // Glass Parameters
+        glassRoughnessOut = specular_roughness_out;
+        glassIorOut = specular_IOR_out;
+        glassAnisotropyOut = specular_anisotropy;
+        thinGlassOut = thin_walled;
+
+        // Optional (Scatter) Parameters
+        if (transmission_scatter[0] > 0.0 || 
+            transmission_scatter[1] > 0.0 ||
+            transmission_scatter[2] > 0.0) 
+        {
+            ssAlbedoOut = transmission * transmission_scatter;
+            extinctionOut = color(1.0); // should not be black for ssAlbedo to work
+            g0Out = transmission_scatter_anisotropy;   // directionality of scattering
+        }
+
+        // Opacity
+        color opacity_luminance_out = color(0.0);
+        mx_luminance_color3(opacity, color(0.272229, 0.674082, 0.0536895),
+                            opacity_luminance_out);
+        float opacity_weight = clamp(opacity_luminance_out[0], 0.0, 1.0);
+        diffuseGainOut *= (1.0 - opacity_weight);
+        refractionGainOut *= opacity_weight;
+    }
+
+    // Normal map
+    {
+        // Get the geometric normal
+        normal Ngn = N;
+        getattribute("builtin", "Ngn", Ngn);
+
+        // If we do not have a valid normalIn set the bumpNormal to the 
+        // geometric normal
+        if (dot(normalIn, normalIn) <= 0.0) {
+            bumpNormalOut = Ngn;
+        }
+        // Otherwise use the given normalIn
+        else {
+	        bumpNormalOut = normalize(normalIn);
+
+            // Is it backwards from the geometric normal
+            if (dot(Ngn, bumpNormalOut) < 0.0) {
+                bumpNormalOut = -bumpNormalOut;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/third_party/renderman-26/shaders/UsdPreviewSurfaceParameters.osl b/third_party/renderman-26/shaders/UsdPreviewSurfaceParameters.osl
new file mode 100644
index 0000000000..25a65809f9
--- /dev/null
+++ b/third_party/renderman-26/shaders/UsdPreviewSurfaceParameters.osl
@@ -0,0 +1,212 @@
+//
+// Copyright 2019 Pixar
+//
+// Licensed under the Apache License, Version 2.0 (the "Apache License")
+// with the following modification; you may not use this file except in
+// compliance with the Apache License and the following modification to it:
+// Section 6. Trademarks. is deleted and replaced with:
+//
+// 6. Trademarks. This License does not grant permission to use the trade
+//    names, trademarks, service marks, or product names of the Licensor
+//    and its affiliates, except as required to comply with Section 4(c) of
+//    the License and to reproduce the content of the NOTICE file.
+//
+// You may obtain a copy of the Apache License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the Apache License with the above modification is
+// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the Apache License for the specific
+// language governing permissions and limitations under the Apache License.
+//
+shader UsdPreviewSurfaceParameters
+(
+    // Inputs
+    color diffuseColor = color(0.18, 0.18, 0.18),
+    color emissiveColor = color(0.0, 0.0, 0.0),
+    int useSpecularWorkflow = 0,
+    color specularColor = color(0.0, 0.0, 0.0),
+    float metallic = 0.0,
+    float roughness = 0.5,
+    float clearcoat = 0.0,
+    float clearcoatRoughness = 0.01,
+    float opacity = 1.0,
+    float opacityThreshold = 0.0,
+    float ior = 1.5,
+    normal normalIn = normal(0.0, 0.0, 1.0),
+    float displacement = 0.0,
+    float occlusion = 1.0,
+
+    // Diffuse outputs
+    output float diffuseGainOut = 0.0
+        [[ string widget = "null" ]],
+    output color diffuseColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+
+    // Specular outputs
+    output color specularFaceColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output color specularEdgeColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output float specularRoughnessOut = 0.0
+        [[ string widget = "null" ]],
+    output color specularIorOut = color(0.0)
+        [[ string widget = "null" ]],
+
+    // Clearcoat outputs
+    output color clearcoatFaceColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output color clearcoatEdgeColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+    output float clearcoatRoughnessOut = 0.0
+        [[ string widget = "null" ]],
+
+    // Emissive outputs
+    output float glowGainOut = 0.0
+        [[ string widget = "null" ]],
+    output color glowColorOut = color(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+
+    // Normal outputs
+    output normal bumpNormalOut = normal(0.0,0.0,0.0)
+        [[ string widget = "null" ]],
+
+    // Opacity
+    output float refractionGainOut = 0.0
+        [[ string widget = "null" ]],
+    output float glassIorOut= 0.0
+        [[ string widget = "null" ]],
+
+    // Presence output    
+    output float presenceOut = 1.0
+        [[ string widget = "null" ]],
+    
+    // Displacement output
+    output float dispAmountOut = 0.0
+        [[ string widget = "null" ]],
+    output float dispScalarOut = 0.0
+        [[ string widget = "null" ]],
+)
+{
+    // To achieve double-sided materials from a geometry-level property,
+    // we set a special user:hydra:doubleSided attribute during renderParam
+    // setup (see hdPrman/renderParam.cpp) and read that here. We also check 
+    // whether we are shading the front or back based on backfacing().
+    // 
+    // NB: We have to do this test in the shader because the *DoubleSided
+    // parameters of PxrSurface are NOT CONNECTABLE, so we cannot just switch
+    // them based on an output from this shader. We have to make the backface-
+    // shading decision here.
+    
+    int isDoubleSided = 0;
+    getattribute("user:hydra:doubleSided", isDoubleSided);
+    int isFrontSide = !backfacing();
+
+    if (isDoubleSided || isFrontSide) {
+
+        // Normal map
+        // Convert tangent space normalIn to bumpNormalOut
+        {
+            vector Tn = vector (1.0,0.0,0.0);
+            getattribute("builtin", "Tn", Tn);
+            vector Bn = normalize(cross(N, Tn));
+
+            // Convert from tangent-space normal to current space
+            bumpNormalOut = Tn * normalIn[0] +
+                            Bn * normalIn[1] + 
+                            N * normalIn[2];
+            bumpNormalOut = normalize(bumpNormalOut);
+
+            // Avoid artifacts along edges where bump normals might face away from camera.
+            if (isFrontSide) {
+                // Adjust bump normals that are facing away from the camera
+                vector Vn = normalize(-I);
+                float VdotN = dot(Vn, bumpNormalOut);
+                if (VdotN <= 0)
+                {
+                    // If the input normal faces away from camera, nudge it back
+                    // pad an extra 1% towards V
+                    bumpNormalOut -= 1.01 * VdotN * Vn;
+                    bumpNormalOut = normalize(bumpNormalOut);
+                }
+            }
+        }
+
+        // This check ensures that the permuted shading normal hasn't altered
+        // the surface's orientation relative to the incident ray. If it has,
+        // we skip shading (except for bumpNormalOut and displacement).
+        int isFrontFacing = (isFrontSide == (dot(bumpNormalOut, I) < 0.0));
+        if (isFrontFacing) {
+        
+            // Diffuse
+            if (diffuseColor[0] > 0.0 ||
+                diffuseColor[1] > 0.0 ||
+                diffuseColor[2] > 0.0)
+            {
+                diffuseGainOut = 1.0;
+                diffuseColorOut = diffuseColor;
+            }
+
+            // Opacity Threshold
+            float opacityAdjusted = opacity;
+            if (opacityThreshold > 0.0) {
+                if (opacity < opacityThreshold) {
+                    opacityAdjusted = 0.0;
+                } else {
+                    opacityAdjusted = 1.0;
+                }
+            }
+
+            // Opacity
+            if (opacityAdjusted < 1.0) {
+                glassIorOut = ior;
+                refractionGainOut = 1.0 - opacityAdjusted;
+                diffuseGainOut *= opacityAdjusted;
+                presenceOut = opacityAdjusted;
+            }
+
+            // Specular
+            // Assumes "Physical" for both Specular and Rough Specular
+            float r = (1.0 - ior) / (1.0 + ior);
+            if (useSpecularWorkflow) {
+                specularFaceColorOut = specularColor;
+                specularEdgeColorOut = color(1.0,1.0,1.0);
+            } else {
+                float metal = clamp(metallic, 0.0, 1.0); 
+                color spec = mix(color(1.0,1.0,1.0), diffuseColor, metal);
+                specularFaceColorOut = mix(r * r * spec, spec, metal);
+                specularEdgeColorOut = spec;
+
+                diffuseGainOut *= 1.0 - metal;
+            }
+            specularIorOut = color(ior);
+            specularRoughnessOut = roughness;
+
+            // Clearcoat
+            if (clearcoat > 0.0) {
+                color clearcoatColor = color(1.0, 1.0, 1.0);
+                clearcoatFaceColorOut = clearcoat * r * r * clearcoatColor;
+                clearcoatEdgeColorOut = clearcoat * clearcoatColor;
+                clearcoatRoughnessOut = clearcoatRoughness;
+            }
+
+            // Emissive
+            if (emissiveColor[0] > 0.0 ||
+                emissiveColor[1] > 0.0 ||
+                emissiveColor[2] > 0.0)
+            {
+                glowGainOut = 1.0;
+                glowColorOut = emissiveColor;
+            }
+        }
+
+        // Displacement
+        if (displacement != 0.0)
+        {
+            dispAmountOut = 0.1;
+            dispScalarOut = displacement;
+        }
+    }
+}